diff --git a/README.md b/README.md
index b57a42ff..70d32b70 100644
--- a/README.md
+++ b/README.md
@@ -8,14 +8,14 @@
    
     * Cmake of Windows version
    
-    * visual studio 2013 
+    * visual studio 2015(also support vs2013 and vs2017)
     
-    * QT 5.8(msvc2013) if you need UI
+    * QT 5.9.2(msvc2015, any version QT adjust to visual studio version) if you need UI
 
 * Version
 
-    * agora sdk windows version 2.2.1 and above(x86).
-    * obs studio 21.1b and above(x86).
+    * agora sdk windows version 2.9.0 and above(x86), also support x64.
+    * obs studio 21.1b and above(x86), also support x64.
     
 * Build project with CMake-gui：
 
@@ -24,10 +24,10 @@
     * Set variables in windows environment:
         * DepsPath 
 
-               The path where win32 is located after decompressing dedependencies2013.zip 
+               The path where win32 or win64 is located after decompressing dedependencies2015.zip(dedependencies2013.zip or dedependencies2017.zip). dedependencies2013 not support win64. 
         * QTDir
 
-               The path where win32 is loacted after installed QT 5.8
+               The path where win32 is loacted after installed QT 5.9.2
         * Uncheck ENABLE\_SCRIPTING
 
         * After configure is ok,then click generate, vs project can be generated.
@@ -148,7 +148,7 @@ You can reference setupRemoteVideo, it's implemented in obs\_service\_agora\_set
 After calling some apis, you'll receive agora callbacks. Sometimes you must first  receive callbacks, then you can call other agora apis. For example, after receiving onUserJoined callback, you can call setupRemoteVideo to show remote video.
 
 * In the file obs-service.c, in constant character array service_signals, add callbacks correspond to signals, including return type and function name.
-* agorartcengine.cpp，声网回调函数想应用层发出signal，调用signal_handler_signal，通过calldata结构体设置多个参数。
+* agorartcengine.cpp，agora sdk callback send signal to app, call signal_handler_signal. you can set parameters with calldata structure.
 
 what to do int the application:
 
diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
index 9ed21844..4974fe88 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
@@ -450,11 +450,13 @@ Basic.Main.Connecting="Connecting..."
 Basic.Main.StartRecording="Start Recording"
 Basic.Main.StartReplayBuffer="Start Replay Buffer"
 Basic.Main.StartStreaming="Start Streaming"
+Basic.Main.StartAgoraStreaming="Start to Agora Streaming"
 Basic.Main.StopRecording="Stop Recording"
 Basic.Main.StoppingRecording="Stopping Recording..."
 Basic.Main.StopReplayBuffer="Stop Replay Buffer"
 Basic.Main.StoppingReplayBuffer="Stopping Replay Buffer..."
 Basic.Main.StopStreaming="Stop Streaming"
+Basic.Main.StopAgoraStreaming="Stop to Agora Streaming"
 Basic.Main.StoppingStreaming="Stopping Stream..."
 Basic.Main.ForceStopStreaming="Stop Streaming (discard delay)"
 
diff --git a/UI/data/locale/zh-CN.ini b/UI/data/locale/zh-CN.ini
index 87fb7513..995fe980 100644
--- a/UI/data/locale/zh-CN.ini
+++ b/UI/data/locale/zh-CN.ini
@@ -398,12 +398,14 @@ Basic.Main.Connecting="连接中..."
 Basic.Main.StartRecording="开始录制"
 Basic.Main.StartReplayBuffer="开始回放缓存"
 Basic.Main.StartStreaming="开始推流"
+Basic.Main.StartAgoraStreaming="开始推流到声网"
 Basic.Main.StopRecording="停止录制"
 Basic.Main.StoppingRecording="停止录制..."
 Basic.Main.StopReplayBuffer="停止回放缓存"
 Basic.Main.StoppingReplayBuffer="正在停止回放缓存..."
 Basic.Main.StopStreaming="停止推流"
 Basic.Main.StoppingStreaming="停止推流..."
+Basic.Main.StopAgoraStreaming="停止推流到声网"
 Basic.Main.ForceStopStreaming="停止流 (放弃延迟)"
 
 Basic.MainMenu.File="文件(&F)"
diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui
index 4f995798..376fbf9d 100644
--- a/UI/forms/OBSBasic.ui
+++ b/UI/forms/OBSBasic.ui
@@ -997,7 +997,7 @@
      <item>
       <widget class="QPushButton" name="agoraPKButton">
        <property name="text">
-        <string>agora PK</string>
+        <string>Basic.Main.StartAgoraStreaming</string>
        </property>
       </widget>
      </item>
diff --git a/UI/installer/mp-installer.nsi b/UI/installer/mp-installer.nsi
index 5d5a471c..8fe1fc4a 100644
--- a/UI/installer/mp-installer.nsi
+++ b/UI/installer/mp-installer.nsi
@@ -8,7 +8,7 @@ Unicode true
 !ifndef APPVERSION
 !define APPVERSION "21.1.0"
 !define SHORTVERSION "21.1.0"
-!define AGORASDKVERSION "2.2.1"
+!define AGORASDKVERSION "2.9.0"
 !endif
 
 !define APPNAMEANDVERSION "OBS Studio ${SHORTVERSION}"
@@ -47,7 +47,7 @@ RequestExecutionLevel admin
 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE PreReqCheck
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "D:\project\AgoraIO\obs-studio\OBS\UI\data\license\gplv2.txt"
+!insertmacro MUI_PAGE_LICENSE "..\data\license\gplv2.txt"
 !insertmacro MUI_PAGE_DIRECTORY
 !ifdef FULL
 	!insertmacro MUI_PAGE_COMPONENTS
@@ -201,11 +201,11 @@ Section "OBS Studio" SecCore
 	SetOutPath "$INSTDIR"
 	OBSInstallerUtils::KillProcess "obs-plugins\32bit\cef-bootstrap.exe"
 	OBSInstallerUtils::KillProcess "obs-plugins\64bit\cef-bootstrap.exe"
-	File /r "D:\project\AgoraIO\obs-studio\OBS\vs2013\rundir\Release\data"
+	File /r "..\..\vs2013\rundir\Release\data"
 	SetOutPath "$INSTDIR\bin"
-	File /r "D:\project\AgoraIO\obs-studio\OBS\vs2013\rundir\Release\bin\32bit"
+	File /r "..\..\vs2013\rundir\Release\bin\32bit"
 	SetOutPath "$INSTDIR\obs-plugins"
-	File /r "D:\project\AgoraIO\obs-studio\OBS\vs2013\rundir\Release\obs-plugins\32bit"
+	File /r "..\..\vs2013\rundir\Release\obs-plugins\32bit"
 
 	ClearErrors
 
diff --git a/UI/installer/mp-installer_vs2015.nsi b/UI/installer/mp-installer_vs2015.nsi
new file mode 100644
index 00000000..96635d75
--- /dev/null
+++ b/UI/installer/mp-installer_vs2015.nsi
@@ -0,0 +1,367 @@
+; Script generated with the Venis Install Wizard
+
+Unicode true
+
+; Define your application name
+!define APPNAME "OBS Studio"
+
+!ifndef APPVERSION
+!define APPVERSION "21.1.0"
+!define SHORTVERSION "21.1.0"
+!define AGORASDKVERSION "2.9.0"
+!endif
+
+!define APPNAMEANDVERSION "OBS Studio ${SHORTVERSION}"
+; !define FULL
+!define REALSENSE_PLUGIN
+
+; Additional script dependencies
+!include WinVer.nsh
+!include x64.nsh
+
+; Main Install settings
+Name "${APPNAMEANDVERSION}"
+InstallDir "$PROGRAMFILES32\obs-studio"
+InstallDirRegKey HKLM "Software\${APPNAME}" ""
+
+!ifdef FULL
+OutFile "OBS-Studio-${SHORTVERSION}-2015-Full-with-Agora-${AGORASDKVERSION}-Installer.exe"
+!else
+OutFile "OBS-Studio-${SHORTVERSION}-Small-2015-with-Agora-${AGORASDKVERSION}-Installer.exe"
+!endif
+
+; Use compression
+SetCompressor /SOLID LZMA
+
+; Need Admin
+RequestExecutionLevel admin
+
+; Modern interface settings
+!include "MUI.nsh"
+
+!define MUI_ABORTWARNING
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_TEXT "Launch OBS Studio ${SHORTVERSION}"
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchOBS"
+
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE PreReqCheck
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "..\data\license\gplv2.txt"
+!insertmacro MUI_PAGE_DIRECTORY
+!ifdef FULL
+	!insertmacro MUI_PAGE_COMPONENTS
+!endif
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+;!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_COMPONENTS
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Set languages (first is default language)
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+Function PreReqCheck
+	; Abort on XP or lower
+	${If} ${AtMostWinXP}
+		MessageBox MB_OK|MB_ICONSTOP "Due to extensive use of DirectX 10 features, ${APPNAME} requires Windows Vista SP2 or higher and cannot be installed on this version of Windows."
+		Quit
+	${EndIf}
+
+	; Vista specific checks
+	${If} ${IsWinVista}
+		; Check Vista SP2
+		${If} ${AtMostServicePack} 1
+			MessageBox MB_YESNO|MB_ICONEXCLAMATION "${APPNAME} requires Service Pack 2 when running on Vista. Would you like to download it?" IDYES sptrue IDNO spfalse
+			sptrue:
+				ExecShell "open" "http://windows.microsoft.com/en-US/windows-vista/Learn-how-to-install-Windows-Vista-Service-Pack-2-SP2"
+			spfalse:
+			Quit
+		${EndIf}
+
+		; Check Vista Platform Update
+		nsexec::exectostack "$SYSDIR\wbem\wmic.exe qfe where HotFixID='KB971512' get HotFixID /Format:list"
+		pop $0
+		pop $0
+		strcpy $1 $0 17 6
+		strcmps $1 "HotFixID=KB971512" gotPatch
+			MessageBox MB_YESNO|MB_ICONEXCLAMATION "${APPNAME} requires the Windows Vista Platform Update. Would you like to download it?" IDYES putrue IDNO pufalse
+			putrue:
+				; 32 bit
+			    ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=3274"
+			pufalse:
+			Quit
+		gotPatch:
+	${EndIf}
+
+	; DirectX Version Check
+	ClearErrors
+	GetDLLVersion "D3DCompiler_33.dll" $R0 $R1
+	IfErrors dxMissing33 dxOK
+	dxMissing33:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_34.dll" $R0 $R1
+	IfErrors dxMissing34 dxOK
+	dxMissing34:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_35.dll" $R0 $R1
+	IfErrors dxMissing35 dxOK
+	dxMissing35:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_36.dll" $R0 $R1
+	IfErrors dxMissing36 dxOK
+	dxMissing36:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_37.dll" $R0 $R1
+	IfErrors dxMissing37 dxOK
+	dxMissing37:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_38.dll" $R0 $R1
+	IfErrors dxMissing38 dxOK
+	dxMissing38:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_39.dll" $R0 $R1
+	IfErrors dxMissing39 dxOK
+	dxMissing39:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_40.dll" $R0 $R1
+	IfErrors dxMissing40 dxOK
+	dxMissing40:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_41.dll" $R0 $R1
+	IfErrors dxMissing41 dxOK
+	dxMissing41:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_42.dll" $R0 $R1
+	IfErrors dxMissing42 dxOK
+	dxMissing42:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_43.dll" $R0 $R1
+	IfErrors dxMissing43 dxOK
+	dxMissing43:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_47.dll" $R0 $R1
+	IfErrors dxMissing47 dxOK
+	dxMissing47:
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing DirectX components that ${APPNAME} requires. Would you like to download them?" IDYES dxtrue IDNO dxfalse
+	dxtrue:
+		ExecShell "open" "https://obsproject.com/go/dxwebsetup"
+	dxfalse:
+	Quit
+	dxOK:
+	ClearErrors
+
+	; Check previous instance
+
+	OBSInstallerUtils::IsProcessRunning "obs32.exe"
+	IntCmp $R0 1 0 notRunning1
+		MessageBox MB_OK|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDOK
+		Quit
+	notRunning1:
+
+
+	OBSInstallerUtils::IsProcessRunning "obs64.exe"
+	IntCmp $R0 1 0 notRunning2
+		MessageBox MB_OK|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDOK
+		Quit
+	notRunning2:
+
+	OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook32.dll"
+	OBSInstallerUtils::GetAppNameForInUseFiles
+	StrCmp $R0 "" gameCaptureNotRunning
+		MessageBox MB_OK|MB_ICONEXCLAMATION "Game Capture is still in use by the following applications:$\r$\n$\r$\n$R0$\r$\nPlease close these applications before installing a new version of OBS." /SD IDOK
+		Quit
+	gameCaptureNotRunning:
+FunctionEnd
+
+Function filesInUse
+	MessageBox MB_OK|MB_ICONEXCLAMATION "Some files were not able to be installed. If this is the first time you are installing OBS, please disable any anti-virus or other security software and try again. If you are re-installing or updating OBS, close any applications that may be have been hooked, or reboot and try again."  /SD IDOK
+FunctionEnd
+
+Function LaunchOBS
+
+	Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk"'
+	
+FunctionEnd
+
+Var outputErrors
+
+Section "OBS Studio" SecCore
+
+	; Set Section properties
+	SectionIn RO
+	SetOverwrite on
+	AllowSkipFiles off
+
+	SetShellVarContext all
+
+	; Set Section Files and Shortcuts
+	SetOutPath "$INSTDIR"
+	OBSInstallerUtils::KillProcess "obs-plugins\32bit\cef-bootstrap.exe"
+	OBSInstallerUtils::KillProcess "obs-plugins\64bit\cef-bootstrap.exe"
+	File /r "..\..\vs2015\rundir\Release\data"
+	SetOutPath "$INSTDIR\bin"
+	File /r "..\..\vs2015\rundir\Release\bin\32bit"
+	SetOutPath "$INSTDIR\obs-plugins"
+	File /r "..\..\vs2015\rundir\Release\obs-plugins\32bit"
+
+	ClearErrors
+
+	IfErrors 0 +2
+		StrCpy $outputErrors "yes"
+
+	WriteUninstaller "$INSTDIR\uninstall.exe"
+
+	; Delete Old "Multiplatform" Shortcuts
+	Delete "$DESKTOP\OBS Multiplatform.lnk"
+	Delete "$SMPROGRAMS\OBS Multiplatform\OBS Multiplatform (32bit).lnk"
+	Delete "$SMPROGRAMS\OBS Multiplatform\Uninstall.lnk"
+	${if} ${RunningX64}
+		Delete "$SMPROGRAMS\OBS Multiplatform\OBS Multiplatform (64bit).lnk"
+	${endif}
+    ;only 32bit
+	SetOutPath "$INSTDIR\bin\32bit"
+	CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\32bit\obs32.exe"
+
+	SetOutPath "$INSTDIR\bin\32bit"
+	CreateDirectory "$SMPROGRAMS\OBS Studio"
+	CreateShortCut "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk" "$INSTDIR\bin\32bit\obs32.exe"
+	CreateShortCut "$SMPROGRAMS\OBS Studio\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+	SetOutPath "$INSTDIR\bin\32bit"
+
+	StrCmp $outputErrors "yes" 0 +2
+		Call filesInUse
+SectionEnd
+
+!ifdef FULL
+SectionGroup /e "Plugins" SecPlugins
+	Section "Browser Source" SecPlugins_Browser
+		; Set Section properties
+		SetOverwrite on
+		AllowSkipFiles off
+		SetShellVarContext all
+
+		SetOutPath "$INSTDIR\obs-plugins"
+		OBSInstallerUtils::KillProcess "32bit\cef-bootstrap.exe"
+		File /r "new\obs-browser\obs-plugins\32bit"
+
+		SetOutPath "$INSTDIR\bin\32bit"
+	SectionEnd
+
+	!ifdef REALSENSE_PLUGIN
+	Section /o "Realsense Source" SecPlugins_Realsense
+		SetOverwrite on
+		AllowSkipFiles off
+		SetShellVarContext all
+
+		SetOutPath "$INSTDIR\obs-plugins"
+		File /r "new\realsense\obs-plugins\32bit"
+
+		SetOutPath "$INSTDIR\data\obs-plugins"
+		File /r "new\realsense\data\obs-plugins\win-ivcam"
+
+		ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /UnregServer'
+		ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /RegServer'
+
+		ReadRegStr $0 HKLM "Software\Intel\RSSDK\Dispatch" "Core"
+		${if} ${Errors}
+			ReadRegStr $0 HKLM "Software\Intel\RSSDK\v10\Dispatch" "Core"
+		${endif}
+
+		${if} ${Errors}
+			InitPluginsDir
+			SetOutPath "$PLUGINSDIR\realsense"
+
+			File "intel_rs_sdk_runtime_websetup_10.0.26.0396.exe"
+			ExecWait '"$PLUGINSDIR\realsense\intel_rs_sdk_runtime_websetup_10.0.26.0396.exe" --finstall=personify --fnone=all'
+		${endif}
+
+		SetOutPath "$INSTDIR\bin\32bit"
+	SectionEnd
+	!endif
+SectionGroupEnd
+!endif
+
+Section -FinishSection
+
+	WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "ProductID" "d16d2409-3151-4331-a9b1-dfd8cf3f0d9c"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\bin\32bit\obs32.exe"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "OBS Project"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "HelpLink" "https://obsproject.com"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${APPVERSION}"
+
+SectionEnd
+
+; Modern install component descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "Core OBS Studio files"
+	!ifdef FULL
+		!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Optional Plugins"
+		!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins_Browser} "Browser plugin (a source you can add to your scenes that displays web pages)"
+		!ifdef REALSENSE_PLUGIN
+			!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins_Realsense} "Plugin for Realsense cameras"
+		!endif
+	!endif
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;Uninstall section
+Section "un.obs-studio Program Files" UninstallSection1
+
+	SectionIn RO
+
+	;Remove from registry...
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+	DeleteRegKey HKLM "SOFTWARE\${APPNAME}"
+
+	; Delete self
+	Delete "$INSTDIR\uninstall.exe"
+
+	; Delete Shortcuts
+	Delete "$DESKTOP\OBS Studio.lnk"
+	Delete "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk"
+	Delete "$SMPROGRAMS\OBS Studio\Uninstall.lnk"
+	${if} ${RunningX64}
+		Delete "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"
+	${endif}
+
+	IfFileExists "$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" UnregisterSegService SkipUnreg
+	UnregisterSegService:
+	ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /UnregServer'
+	SkipUnreg:
+
+	; Clean up OBS Studio
+	RMDir /r "$INSTDIR\bin"
+	RMDir /r "$INSTDIR\data"
+	RMDir /r "$INSTDIR\obs-plugins"
+	RMDir "$INSTDIR"
+
+	; Remove remaining directories
+	RMDir "$SMPROGRAMS\OBS Studio"
+	RMDir "$INSTDIR\OBS Studio"
+SectionEnd
+
+Section /o "un.User Settings" UninstallSection2
+	RMDir /R "$APPDATA\obs-studio"
+SectionEnd
+
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection1} "Remove the OBS program files."
+	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection2} "Removes all settings, plugins, scenes and sources, profiles, log files and other application data."
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
+; Version information
+VIProductVersion "${APPVERSION}.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "OBS Studio"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "obsproject.com"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "(c) 2012-2016"
+; FileDescription is what shows in the UAC elevation prompt when signed
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "OBS Studio"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.0"
+
+; eof
diff --git a/UI/installer/mp-installer_vs2017.nsi b/UI/installer/mp-installer_vs2017.nsi
new file mode 100644
index 00000000..5672c9b7
--- /dev/null
+++ b/UI/installer/mp-installer_vs2017.nsi
@@ -0,0 +1,367 @@
+; Script generated with the Venis Install Wizard
+
+Unicode true
+
+; Define your application name
+!define APPNAME "OBS Studio"
+
+!ifndef APPVERSION
+!define APPVERSION "21.1.0"
+!define SHORTVERSION "21.1.0"
+!define AGORASDKVERSION "2.9.0"
+!endif
+
+!define APPNAMEANDVERSION "OBS Studio ${SHORTVERSION}"
+; !define FULL
+!define REALSENSE_PLUGIN
+
+; Additional script dependencies
+!include WinVer.nsh
+!include x64.nsh
+
+; Main Install settings
+Name "${APPNAMEANDVERSION}"
+InstallDir "$PROGRAMFILES32\obs-studio"
+InstallDirRegKey HKLM "Software\${APPNAME}" ""
+
+!ifdef FULL
+OutFile "OBS-Studio-${SHORTVERSION}-Full-2017-with-Agora-${AGORASDKVERSION}-Installer.exe"
+!else
+OutFile "OBS-Studio-${SHORTVERSION}-Small-2017-with-Agora-${AGORASDKVERSION}-Installer.exe"
+!endif
+
+; Use compression
+SetCompressor /SOLID LZMA
+
+; Need Admin
+RequestExecutionLevel admin
+
+; Modern interface settings
+!include "MUI.nsh"
+
+!define MUI_ABORTWARNING
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_TEXT "Launch OBS Studio ${SHORTVERSION}"
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchOBS"
+
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE PreReqCheck
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "..\data\license\gplv2.txt"
+!insertmacro MUI_PAGE_DIRECTORY
+!ifdef FULL
+	!insertmacro MUI_PAGE_COMPONENTS
+!endif
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+;!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_COMPONENTS
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Set languages (first is default language)
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+Function PreReqCheck
+	; Abort on XP or lower
+	${If} ${AtMostWinXP}
+		MessageBox MB_OK|MB_ICONSTOP "Due to extensive use of DirectX 10 features, ${APPNAME} requires Windows Vista SP2 or higher and cannot be installed on this version of Windows."
+		Quit
+	${EndIf}
+
+	; Vista specific checks
+	${If} ${IsWinVista}
+		; Check Vista SP2
+		${If} ${AtMostServicePack} 1
+			MessageBox MB_YESNO|MB_ICONEXCLAMATION "${APPNAME} requires Service Pack 2 when running on Vista. Would you like to download it?" IDYES sptrue IDNO spfalse
+			sptrue:
+				ExecShell "open" "http://windows.microsoft.com/en-US/windows-vista/Learn-how-to-install-Windows-Vista-Service-Pack-2-SP2"
+			spfalse:
+			Quit
+		${EndIf}
+
+		; Check Vista Platform Update
+		nsexec::exectostack "$SYSDIR\wbem\wmic.exe qfe where HotFixID='KB971512' get HotFixID /Format:list"
+		pop $0
+		pop $0
+		strcpy $1 $0 17 6
+		strcmps $1 "HotFixID=KB971512" gotPatch
+			MessageBox MB_YESNO|MB_ICONEXCLAMATION "${APPNAME} requires the Windows Vista Platform Update. Would you like to download it?" IDYES putrue IDNO pufalse
+			putrue:
+				; 32 bit
+			    ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=3274"
+			pufalse:
+			Quit
+		gotPatch:
+	${EndIf}
+
+	; DirectX Version Check
+	ClearErrors
+	GetDLLVersion "D3DCompiler_33.dll" $R0 $R1
+	IfErrors dxMissing33 dxOK
+	dxMissing33:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_34.dll" $R0 $R1
+	IfErrors dxMissing34 dxOK
+	dxMissing34:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_35.dll" $R0 $R1
+	IfErrors dxMissing35 dxOK
+	dxMissing35:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_36.dll" $R0 $R1
+	IfErrors dxMissing36 dxOK
+	dxMissing36:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_37.dll" $R0 $R1
+	IfErrors dxMissing37 dxOK
+	dxMissing37:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_38.dll" $R0 $R1
+	IfErrors dxMissing38 dxOK
+	dxMissing38:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_39.dll" $R0 $R1
+	IfErrors dxMissing39 dxOK
+	dxMissing39:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_40.dll" $R0 $R1
+	IfErrors dxMissing40 dxOK
+	dxMissing40:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_41.dll" $R0 $R1
+	IfErrors dxMissing41 dxOK
+	dxMissing41:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_42.dll" $R0 $R1
+	IfErrors dxMissing42 dxOK
+	dxMissing42:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_43.dll" $R0 $R1
+	IfErrors dxMissing43 dxOK
+	dxMissing43:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_47.dll" $R0 $R1
+	IfErrors dxMissing47 dxOK
+	dxMissing47:
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing DirectX components that ${APPNAME} requires. Would you like to download them?" IDYES dxtrue IDNO dxfalse
+	dxtrue:
+		ExecShell "open" "https://obsproject.com/go/dxwebsetup"
+	dxfalse:
+	Quit
+	dxOK:
+	ClearErrors
+
+	; Check previous instance
+
+	OBSInstallerUtils::IsProcessRunning "obs32.exe"
+	IntCmp $R0 1 0 notRunning1
+		MessageBox MB_OK|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDOK
+		Quit
+	notRunning1:
+
+
+	OBSInstallerUtils::IsProcessRunning "obs64.exe"
+	IntCmp $R0 1 0 notRunning2
+		MessageBox MB_OK|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDOK
+		Quit
+	notRunning2:
+
+	OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook32.dll"
+	OBSInstallerUtils::GetAppNameForInUseFiles
+	StrCmp $R0 "" gameCaptureNotRunning
+		MessageBox MB_OK|MB_ICONEXCLAMATION "Game Capture is still in use by the following applications:$\r$\n$\r$\n$R0$\r$\nPlease close these applications before installing a new version of OBS." /SD IDOK
+		Quit
+	gameCaptureNotRunning:
+FunctionEnd
+
+Function filesInUse
+	MessageBox MB_OK|MB_ICONEXCLAMATION "Some files were not able to be installed. If this is the first time you are installing OBS, please disable any anti-virus or other security software and try again. If you are re-installing or updating OBS, close any applications that may be have been hooked, or reboot and try again."  /SD IDOK
+FunctionEnd
+
+Function LaunchOBS
+
+	Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk"'
+	
+FunctionEnd
+
+Var outputErrors
+
+Section "OBS Studio" SecCore
+
+	; Set Section properties
+	SectionIn RO
+	SetOverwrite on
+	AllowSkipFiles off
+
+	SetShellVarContext all
+
+	; Set Section Files and Shortcuts
+	SetOutPath "$INSTDIR"
+	OBSInstallerUtils::KillProcess "obs-plugins\32bit\cef-bootstrap.exe"
+	OBSInstallerUtils::KillProcess "obs-plugins\64bit\cef-bootstrap.exe"
+	File /r "..\..\vs2017\rundir\Release\data"
+	SetOutPath "$INSTDIR\bin"
+	File /r "..\..\vs2017\rundir\Release\bin\32bit"
+	SetOutPath "$INSTDIR\obs-plugins"
+	File /r "..\..\vs2017\rundir\Release\obs-plugins\32bit"
+
+	ClearErrors
+
+	IfErrors 0 +2
+		StrCpy $outputErrors "yes"
+
+	WriteUninstaller "$INSTDIR\uninstall.exe"
+
+	; Delete Old "Multiplatform" Shortcuts
+	Delete "$DESKTOP\OBS Multiplatform.lnk"
+	Delete "$SMPROGRAMS\OBS Multiplatform\OBS Multiplatform (32bit).lnk"
+	Delete "$SMPROGRAMS\OBS Multiplatform\Uninstall.lnk"
+	${if} ${RunningX64}
+		Delete "$SMPROGRAMS\OBS Multiplatform\OBS Multiplatform (64bit).lnk"
+	${endif}
+    ;only 32bit
+	SetOutPath "$INSTDIR\bin\32bit"
+	CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\32bit\obs32.exe"
+
+	SetOutPath "$INSTDIR\bin\32bit"
+	CreateDirectory "$SMPROGRAMS\OBS Studio"
+	CreateShortCut "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk" "$INSTDIR\bin\32bit\obs32.exe"
+	CreateShortCut "$SMPROGRAMS\OBS Studio\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+	SetOutPath "$INSTDIR\bin\32bit"
+
+	StrCmp $outputErrors "yes" 0 +2
+		Call filesInUse
+SectionEnd
+
+!ifdef FULL
+SectionGroup /e "Plugins" SecPlugins
+	Section "Browser Source" SecPlugins_Browser
+		; Set Section properties
+		SetOverwrite on
+		AllowSkipFiles off
+		SetShellVarContext all
+
+		SetOutPath "$INSTDIR\obs-plugins"
+		OBSInstallerUtils::KillProcess "32bit\cef-bootstrap.exe"
+		File /r "new\obs-browser\obs-plugins\32bit"
+
+		SetOutPath "$INSTDIR\bin\32bit"
+	SectionEnd
+
+	!ifdef REALSENSE_PLUGIN
+	Section /o "Realsense Source" SecPlugins_Realsense
+		SetOverwrite on
+		AllowSkipFiles off
+		SetShellVarContext all
+
+		SetOutPath "$INSTDIR\obs-plugins"
+		File /r "new\realsense\obs-plugins\32bit"
+
+		SetOutPath "$INSTDIR\data\obs-plugins"
+		File /r "new\realsense\data\obs-plugins\win-ivcam"
+
+		ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /UnregServer'
+		ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /RegServer'
+
+		ReadRegStr $0 HKLM "Software\Intel\RSSDK\Dispatch" "Core"
+		${if} ${Errors}
+			ReadRegStr $0 HKLM "Software\Intel\RSSDK\v10\Dispatch" "Core"
+		${endif}
+
+		${if} ${Errors}
+			InitPluginsDir
+			SetOutPath "$PLUGINSDIR\realsense"
+
+			File "intel_rs_sdk_runtime_websetup_10.0.26.0396.exe"
+			ExecWait '"$PLUGINSDIR\realsense\intel_rs_sdk_runtime_websetup_10.0.26.0396.exe" --finstall=personify --fnone=all'
+		${endif}
+
+		SetOutPath "$INSTDIR\bin\32bit"
+	SectionEnd
+	!endif
+SectionGroupEnd
+!endif
+
+Section -FinishSection
+
+	WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "ProductID" "d16d2409-3151-4331-a9b1-dfd8cf3f0d9c"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\bin\32bit\obs32.exe"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "OBS Project"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "HelpLink" "https://obsproject.com"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${APPVERSION}"
+
+SectionEnd
+
+; Modern install component descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "Core OBS Studio files"
+	!ifdef FULL
+		!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Optional Plugins"
+		!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins_Browser} "Browser plugin (a source you can add to your scenes that displays web pages)"
+		!ifdef REALSENSE_PLUGIN
+			!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins_Realsense} "Plugin for Realsense cameras"
+		!endif
+	!endif
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;Uninstall section
+Section "un.obs-studio Program Files" UninstallSection1
+
+	SectionIn RO
+
+	;Remove from registry...
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+	DeleteRegKey HKLM "SOFTWARE\${APPNAME}"
+
+	; Delete self
+	Delete "$INSTDIR\uninstall.exe"
+
+	; Delete Shortcuts
+	Delete "$DESKTOP\OBS Studio.lnk"
+	Delete "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk"
+	Delete "$SMPROGRAMS\OBS Studio\Uninstall.lnk"
+	${if} ${RunningX64}
+		Delete "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"
+	${endif}
+
+	IfFileExists "$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" UnregisterSegService SkipUnreg
+	UnregisterSegService:
+	ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /UnregServer'
+	SkipUnreg:
+
+	; Clean up OBS Studio
+	RMDir /r "$INSTDIR\bin"
+	RMDir /r "$INSTDIR\data"
+	RMDir /r "$INSTDIR\obs-plugins"
+	RMDir "$INSTDIR"
+
+	; Remove remaining directories
+	RMDir "$SMPROGRAMS\OBS Studio"
+	RMDir "$INSTDIR\OBS Studio"
+SectionEnd
+
+Section /o "un.User Settings" UninstallSection2
+	RMDir /R "$APPDATA\obs-studio"
+SectionEnd
+
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection1} "Remove the OBS program files."
+	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection2} "Removes all settings, plugins, scenes and sources, profiles, log files and other application data."
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
+; Version information
+VIProductVersion "${APPVERSION}.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "OBS Studio"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "obsproject.com"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "(c) 2012-2016"
+; FileDescription is what shows in the UAC elevation prompt when signed
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "OBS Studio"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.0"
+
+; eof
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 9668d415..8ea80b63 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -1496,10 +1496,6 @@ void OBSBasic::OBSInit()
 		throw "Failed to initialize service";
 
 	InitAgoraService();
-// 	const char* mainServiceType = obs_service_get_type(service);
-// 	if (mainServiceType && strcmp(mainServiceType, "rtmp_custom")){
-// 		ui->agoraPKButton->setEnabled(false);
-// 	}
 
 	InitPrimitives();
 
@@ -6266,17 +6262,17 @@ void OBSBasic::InitAgoraServiceSettings()
 {
 	obs_data_t* settings = obs_service_get_settings(agoraService);
 	std::string rtmpcustom = "rtmp_custonm";
-	if (rtmpcustom.compare( obs_service_get_type(service) )== 0)
+	if (rtmpcustom.compare(obs_service_get_type(service)) == 0)
 	{
 		obs_data_set_string(settings, "agora_url", obs_service_get_url(service));
 		obs_data_set_string(settings, "agora_key", obs_service_get_key(service));
 	}
-	
+
 	obs_data_set_int(settings, "agora_video_bitrate", 2400);
 
 	int out_cx = config_get_uint(basicConfig, "Video", "OutputCX");
 	int out_cy = config_get_uint(basicConfig, "Video", "OutputCY");
-	
+
 	obs_data_set_int(settings, "agora_out_cx", out_cx);
 	obs_data_set_int(settings, "agora_out_cy", out_cy);
 
@@ -6312,51 +6308,55 @@ void OBSBasic::MuteAudioDevice(bool bMute)
 
 void OBSBasic::on_agoraPKButton_clicked()
 {
-	if (agoraOutputHandler->AgoraActive()){
-		std::string rtmp_url = "";
-		if (GetObsRtmpUrl(rtmp_url) && !rtmp_url.empty()){
-			obs_service_agora_remove_publish_stream_url(GetAgoraService(), rtmp_url.c_str());
-		}
-		agoraOutputHandler->StopAgora();
-		ClearRemoteVideos();
-		m_lstUids.clear();
-		m_lstRemoteVideoUids.clear();
-		SetControlWhenPK(false);
-		MuteAudioDevice(false);
-		SetPreviewPK(false);
-	}
-	else{
-		AgoraInitWidget agoraWidget(this);
-		int ret = agoraWidget.exec();
-		if (QDialog::Accepted != ret){
-			return;
-		}
-		
-		loacal_uid = agoraWidget.uid;
-		agora_channel = agoraWidget.channel;
-		agora_appid = agoraWidget.app_id;
-
-		InitAgoraServiceSettings();
-		
-		if (outputHandler->StreamingActive()){
-			StopStreaming();
-		}
-			
-		if (IsPreviewProgramMode()){
-			on_modeSwitch_clicked();
-		}
-	
-		ui->agoraPKButton->setText(QTStr("Starting PK"));
-		SetControlWhenPK(true);
-		MuteAudioDevice(true);
-		if (!agoraOutputHandler->StartAgora(agoraService))
-			ui->agoraPKButton->setText(QTStr("Agora PK"));
-		//for test
-		//UpdateAgoraClientRole(2);
-		//QString strLogFile = QString("D:/agora_sdk_log.log");
-		//UpdateAgoraLogPath(QT_TO_UTF8(strLogFile));
-		// end
-	}
+    if (agoraOutputHandler->AgoraActive()) {
+        std::string rtmp_url = "";
+        if (GetObsRtmpUrl(rtmp_url) && !rtmp_url.empty()) {
+            obs_service_agora_remove_publish_stream_url(GetAgoraService(), rtmp_url.c_str());
+        }
+        agoraOutputHandler->StopAgora();
+        ClearRemoteVideos();
+        m_lstUids.clear();
+        m_lstRemoteVideoUids.clear();
+        SetControlWhenPK(false);
+        MuteAudioDevice(false);
+        SetPreviewPK(false);
+    }
+    else {
+        AgoraInitWidget agoraWidget(this);
+        int ret = agoraWidget.exec();
+        if (QDialog::Accepted != ret) {
+            return;
+        }
+
+        loacal_uid = agoraWidget.uid;
+        agora_channel = agoraWidget.channel;
+        agora_appid = agoraWidget.app_id;
+
+        InitAgoraServiceSettings();
+
+        if (outputHandler->StreamingActive()) {
+            StopStreaming();
+        }
+
+        if (IsPreviewProgramMode()) {
+            on_modeSwitch_clicked();
+        }
+
+        ui->agoraPKButton->setText(QTStr("Basic.Main.StartAgoraStreaming"));
+        SetControlWhenPK(true);
+        MuteAudioDevice(true);
+        if (!agoraOutputHandler->StartAgora(agoraService)) {
+            SetControlWhenPK(false);
+            ui->agoraPKButton->setText(QTStr("Basic.Main.StopAgoraStreaming"));
+
+        }
+
+        //for test
+        //UpdateAgoraClientRole(2);
+        //QString strLogFile = QString("D:/agora_sdk_log.log");
+        //UpdateAgoraLogPath(QT_TO_UTF8(strLogFile));
+        // end
+    }
 }
 
 void OBSBasic::UpdateAgoraClientRole(int role)
@@ -6395,30 +6395,30 @@ void OBSBasic::SetPreviewPK(bool bPK)
 
 void OBSBasic::SetControlWhenPK(bool bPK)
 {
-	ui->streamButton->setEnabled(!bPK);
-	ui->modeSwitch->setEnabled(!bPK);
-	//ui->recordButton->setEnabled(!bPK);
+    ui->streamButton->setEnabled(!bPK);
+    ui->modeSwitch->setEnabled(!bPK);
+    //ui->recordButton->setEnabled(!bPK);
 
-	if (bPK){
-		calldata_t params = { 0 };
-		signal_handler_connect(obs_service_get_signal_handler(agoraService), "initRtcEngineFailed", AgoraInitRtcEngineFailed, &params);
-		signal_handler_connect(obs_service_get_signal_handler(agoraService), "firstRemoteVideoDecoded", AgoraFirstRemoteVideoDecoded, &params);
-		signal_handler_connect(obs_service_get_signal_handler(agoraService), "userJoined", AgoraUserJoined, &params);
-		signal_handler_connect(obs_service_get_signal_handler(agoraService), "userOffline", AgoraUserOffline, &params);
-		signal_handler_connect(obs_service_get_signal_handler(agoraService), "joinChannelSuccess", AgoraJoinChannelSuccess, &params);
-		
-		obsColorFormatReplacedByAgora = config_get_string(basicConfig, "Video", "ColorFormat");
-		if (obsColorFormatReplacedByAgora.empty())
-			obsColorFormatReplacedByAgora = "NV12";
-		config_set_string(basicConfig, "Video", "ColorFormat", agoraColorFormat.c_str());
-		ui->agoraPKButton->setText(QTStr("Stop PK"));
-	}
-	else{
-		config_set_string(basicConfig, "Video", "ColorFormat", obsColorFormatReplacedByAgora.c_str());
-		ui->agoraPKButton->setText(QTStr("Agora PK"));
-	}
+    if (bPK) {
+        calldata_t params = { 0 };
+        signal_handler_connect(obs_service_get_signal_handler(agoraService), "initRtcEngineFailed", AgoraInitRtcEngineFailed, &params);
+        signal_handler_connect(obs_service_get_signal_handler(agoraService), "firstRemoteVideoDecoded", AgoraFirstRemoteVideoDecoded, &params);
+        signal_handler_connect(obs_service_get_signal_handler(agoraService), "userJoined", AgoraUserJoined, &params);
+        signal_handler_connect(obs_service_get_signal_handler(agoraService), "userOffline", AgoraUserOffline, &params);
+        signal_handler_connect(obs_service_get_signal_handler(agoraService), "joinChannelSuccess", AgoraJoinChannelSuccess, &params);
+
+        obsColorFormatReplacedByAgora = config_get_string(basicConfig, "Video", "ColorFormat");
+        if (obsColorFormatReplacedByAgora.empty())
+            obsColorFormatReplacedByAgora = "NV12";
+        config_set_string(basicConfig, "Video", "ColorFormat", agoraColorFormat.c_str());
+        ui->agoraPKButton->setText(QTStr("Basic.Main.StopAgoraStreaming"));
+    }
+    else {
+        config_set_string(basicConfig, "Video", "ColorFormat", obsColorFormatReplacedByAgora.c_str());
+        ui->agoraPKButton->setText(QTStr("Basic.Main.StartAgoraStreaming"));
+    }
 
-	ResetVideo();
+    ResetVideo();
 }
 
 bool OBSBasic::GetObsRtmpUrl(std::string& rtmp_url)
@@ -6761,4 +6761,4 @@ void OBSBasic::OnJoinChannelSuccess(QString channel, long long uid, long long el
 void OBSBasic::OnError(int err, const char* msg)
 {
 
-}
\ No newline at end of file
+}
diff --git a/UI/window-init-agora-widget.cpp b/UI/window-init-agora-widget.cpp
index fc67d68d..533fa864 100644
--- a/UI/window-init-agora-widget.cpp
+++ b/UI/window-init-agora-widget.cpp
@@ -14,6 +14,10 @@ AgoraInitWidget::AgoraInitWidget(QWidget *parent)
 	
 	installEventFilter(CreateShortcutFilter());
 	
+ ui->textEdit_uid->setText(QString(""));
+ ui->textEdit_appid->setText(QString(""));
+ ui->textEdit_channel->setText(QString(""));
+
 // 	ui->textEdit_appid->setText(app_id);
 // 	ui->textEdit_channel->setText(QT_UTF8(channel));
 // 	ui->textEdit_uid->setText(QT_UTF8(text_uid.c_str()));
@@ -28,6 +32,7 @@ void AgoraInitWidget::on_saveButton_clicked()
 	QString strUid = ui->textEdit_uid->text();
 	QString strAppid = ui->textEdit_appid->text();
 	QString strChannel = ui->textEdit_channel->text();
+
 	strUid.trimmed();
 	strAppid.trimmed();
 	strChannel.trimmed();
@@ -40,7 +45,7 @@ void AgoraInitWidget::on_saveButton_clicked()
 		QMessageBox::warning(this, QString("agora warning"), QString("please input agora channel"));
 	}
 	else if (input_appid.empty()){
-		QMessageBox::warning(this, QString("agora warning"), QString("please input agora channel"));
+		QMessageBox::warning(this, QString("agora warning"), QString("please input agora appid"));
 	}
 	else{
 		app_id = input_appid;
diff --git a/dependencies2013.zip b/dependencies2013.zip
index 1eee3a4a..38920ecd 100644
Binary files a/dependencies2013.zip and b/dependencies2013.zip differ
diff --git a/dependencies2013/win32/bin/agora_rtc_sdk.dll b/dependencies2013/win32/bin/agora_rtc_sdk.dll
deleted file mode 100644
index d201b5c5..00000000
Binary files a/dependencies2013/win32/bin/agora_rtc_sdk.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/agora_rtc_sdk.lib b/dependencies2013/win32/bin/agora_rtc_sdk.lib
deleted file mode 100644
index 62c39fb2..00000000
Binary files a/dependencies2013/win32/bin/agora_rtc_sdk.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/agora_sig_sdk.dll b/dependencies2013/win32/bin/agora_sig_sdk.dll
deleted file mode 100644
index 6c14aec7..00000000
Binary files a/dependencies2013/win32/bin/agora_sig_sdk.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/avcodec-57.dll b/dependencies2013/win32/bin/avcodec-57.dll
deleted file mode 100644
index baa77325..00000000
Binary files a/dependencies2013/win32/bin/avcodec-57.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/avcodec.lib b/dependencies2013/win32/bin/avcodec.lib
deleted file mode 100644
index cbe145ab..00000000
Binary files a/dependencies2013/win32/bin/avcodec.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/avdevice-57.dll b/dependencies2013/win32/bin/avdevice-57.dll
deleted file mode 100644
index d3945cd8..00000000
Binary files a/dependencies2013/win32/bin/avdevice-57.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/avdevice.lib b/dependencies2013/win32/bin/avdevice.lib
deleted file mode 100644
index bf45a4a2..00000000
Binary files a/dependencies2013/win32/bin/avdevice.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/avfilter-6.dll b/dependencies2013/win32/bin/avfilter-6.dll
deleted file mode 100644
index 80c640ea..00000000
Binary files a/dependencies2013/win32/bin/avfilter-6.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/avfilter.lib b/dependencies2013/win32/bin/avfilter.lib
deleted file mode 100644
index c42473f5..00000000
Binary files a/dependencies2013/win32/bin/avfilter.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/avformat-57.dll b/dependencies2013/win32/bin/avformat-57.dll
deleted file mode 100644
index 1b9852a6..00000000
Binary files a/dependencies2013/win32/bin/avformat-57.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/avformat.lib b/dependencies2013/win32/bin/avformat.lib
deleted file mode 100644
index 7c5a346d..00000000
Binary files a/dependencies2013/win32/bin/avformat.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/avutil-55.dll b/dependencies2013/win32/bin/avutil-55.dll
deleted file mode 100644
index 1bbeee06..00000000
Binary files a/dependencies2013/win32/bin/avutil-55.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/avutil.lib b/dependencies2013/win32/bin/avutil.lib
deleted file mode 100644
index c878bcdd..00000000
Binary files a/dependencies2013/win32/bin/avutil.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/freetype.lib b/dependencies2013/win32/bin/freetype.lib
deleted file mode 100644
index a9f67e12..00000000
Binary files a/dependencies2013/win32/bin/freetype.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/libcurl.dll b/dependencies2013/win32/bin/libcurl.dll
deleted file mode 100644
index a962806d..00000000
Binary files a/dependencies2013/win32/bin/libcurl.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libcurl.lib b/dependencies2013/win32/bin/libcurl.lib
deleted file mode 100644
index 40cb8812..00000000
Binary files a/dependencies2013/win32/bin/libcurl.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/libogg-0.dll b/dependencies2013/win32/bin/libogg-0.dll
deleted file mode 100644
index ff169e78..00000000
Binary files a/dependencies2013/win32/bin/libogg-0.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libopus-0.dll b/dependencies2013/win32/bin/libopus-0.dll
deleted file mode 100644
index b4db1d33..00000000
Binary files a/dependencies2013/win32/bin/libopus-0.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libpng16-16.dll b/dependencies2013/win32/bin/libpng16-16.dll
deleted file mode 100644
index aca1b704..00000000
Binary files a/dependencies2013/win32/bin/libpng16-16.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libpng16-config b/dependencies2013/win32/bin/libpng16-config
deleted file mode 100644
index 4f287f34..00000000
--- a/dependencies2013/win32/bin/libpng16-config
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-
-# libpng-config
-# provides configuration info for libpng.
-
-# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Modeled after libxml-config.
-
-version="1.6.30"
-prefix="/home/jim/packages/win32"
-exec_prefix="${prefix}"
-libdir="${exec_prefix}/lib"
-includedir="${prefix}/include/libpng16"
-libs="-lpng16"
-all_libs="-lpng16 -lz "
-I_opts="-I${includedir}"
-L_opts="-L${libdir}"
-R_opts=""
-cppflags=""
-ccopts=""
-ldopts=""
-
-usage()
-{
-    cat <<EOF
-Usage: $0 [OPTION] ...
-
-Known values for OPTION are:
-
-  --prefix        print libpng prefix
-  --libdir        print path to directory containing library
-  --libs          print library linking information
-  --ccopts        print compiler options
-  --cppflags      print pre-processor flags
-  --cflags        print preprocessor flags, I_opts, and compiler options
-  --I_opts        print "-I" include options
-  --L_opts        print linker "-L" flags for dynamic linking
-  --R_opts        print dynamic linker "-R" or "-rpath" flags
-  --ldopts        print linker options
-  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)
-  --static        revise subsequent outputs for static linking
-  --help          print this help and exit
-  --version       print version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-while test $# -gt 0; do
-    case "$1" in
-
-    --prefix)
-        echo ${prefix}
-        ;;
-
-    --version)
-        echo ${version}
-        exit 0
-        ;;
-
-    --help)
-        usage 0
-        ;;
-
-    --ccopts)
-        echo ${ccopts}
-        ;;
-
-    --cppflags)
-        echo ${cppflags}
-        ;;
-
-    --cflags)
-        echo ${I_opts} ${cppflags} ${ccopts}
-        ;;
-
-    --libdir)
-        echo ${libdir}
-        ;;
-
-    --libs)
-        echo ${libs}
-        ;;
-
-    --I_opts)
-        echo ${I_opts}
-        ;;
-
-    --L_opts)
-        echo ${L_opts}
-        ;;
-
-    --R_opts)
-        echo ${R_opts}
-        ;;
-
-    --ldopts)
-        echo ${ldopts}
-        ;;
-
-    --ldflags)
-        echo ${ldopts} ${L_opts} ${R_opts} ${libs}
-        ;;
-
-    --static)
-        R_opts=""
-        libs=${all_libs}
-        ;;
-
-    *)
-        usage
-        exit 1
-        ;;
-    esac
-    shift
-done
-
-exit 0
diff --git a/dependencies2013/win32/bin/libvorbis-0.dll b/dependencies2013/win32/bin/libvorbis-0.dll
deleted file mode 100644
index 9eeb1174..00000000
Binary files a/dependencies2013/win32/bin/libvorbis-0.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libvorbisenc-2.dll b/dependencies2013/win32/bin/libvorbisenc-2.dll
deleted file mode 100644
index 0fdce860..00000000
Binary files a/dependencies2013/win32/bin/libvorbisenc-2.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libvorbisfile-3.dll b/dependencies2013/win32/bin/libvorbisfile-3.dll
deleted file mode 100644
index fcb41bd0..00000000
Binary files a/dependencies2013/win32/bin/libvorbisfile-3.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libvpx-1.dll b/dependencies2013/win32/bin/libvpx-1.dll
deleted file mode 100644
index 9f6c3f3b..00000000
Binary files a/dependencies2013/win32/bin/libvpx-1.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/libx264-152.dll b/dependencies2013/win32/bin/libx264-152.dll
deleted file mode 100644
index 38efea6b..00000000
Binary files a/dependencies2013/win32/bin/libx264-152.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/lua51.dll b/dependencies2013/win32/bin/lua51.dll
deleted file mode 100644
index 2e71e4b2..00000000
Binary files a/dependencies2013/win32/bin/lua51.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/luajit.lib b/dependencies2013/win32/bin/luajit.lib
deleted file mode 100644
index 28f6e079..00000000
Binary files a/dependencies2013/win32/bin/luajit.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/python3.lib b/dependencies2013/win32/bin/python3.lib
deleted file mode 100644
index 59ca275e..00000000
Binary files a/dependencies2013/win32/bin/python3.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/python36.lib b/dependencies2013/win32/bin/python36.lib
deleted file mode 100644
index 7459d93b..00000000
Binary files a/dependencies2013/win32/bin/python36.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/speexdsp.lib b/dependencies2013/win32/bin/speexdsp.lib
deleted file mode 100644
index a1141fa5..00000000
Binary files a/dependencies2013/win32/bin/speexdsp.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/swresample-2.dll b/dependencies2013/win32/bin/swresample-2.dll
deleted file mode 100644
index d6687c9f..00000000
Binary files a/dependencies2013/win32/bin/swresample-2.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/swresample.lib b/dependencies2013/win32/bin/swresample.lib
deleted file mode 100644
index 8c839dc8..00000000
Binary files a/dependencies2013/win32/bin/swresample.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/swscale-4.dll b/dependencies2013/win32/bin/swscale-4.dll
deleted file mode 100644
index c8853043..00000000
Binary files a/dependencies2013/win32/bin/swscale-4.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/swscale.lib b/dependencies2013/win32/bin/swscale.lib
deleted file mode 100644
index 84c2fbe1..00000000
Binary files a/dependencies2013/win32/bin/swscale.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/vpx.lib b/dependencies2013/win32/bin/vpx.lib
deleted file mode 100644
index 941fb8fa..00000000
Binary files a/dependencies2013/win32/bin/vpx.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/x264.def b/dependencies2013/win32/bin/x264.def
deleted file mode 100644
index 5ff309e5..00000000
--- a/dependencies2013/win32/bin/x264.def
+++ /dev/null
@@ -1,1081 +0,0 @@
-; i686-w64-mingw32-dlltool -z /home/jim/packages/win32/bin/x264.orig.def --export-all-symbols /home/jim/packages/win32/bin/libx264-152.dll
-EXPORTS
-	x264_adaptive_quant_frame
-	x264_add16x16_idct8_avx
-	x264_add16x16_idct8_mmx
-	x264_add16x16_idct8_sse2
-	x264_add16x16_idct_avx
-	x264_add16x16_idct_avx2
-	x264_add16x16_idct_dc_avx
-	x264_add16x16_idct_dc_avx2
-	x264_add16x16_idct_dc_mmx2
-	x264_add16x16_idct_dc_sse2
-	x264_add16x16_idct_dc_ssse3
-	x264_add16x16_idct_mmx
-	x264_add16x16_idct_sse2
-	x264_add4x4_idct_avx
-	x264_add4x4_idct_mmx
-	x264_add4x4_idct_sse4
-	x264_add8x8_idct8_avx
-	x264_add8x8_idct8_mmx
-	x264_add8x8_idct8_sse2
-	x264_add8x8_idct_avx
-	x264_add8x8_idct_avx2
-	x264_add8x8_idct_avx512
-	x264_add8x8_idct_dc_mmx2
-	x264_add8x8_idct_dc_ssse3
-	x264_add8x8_idct_mmx
-	x264_add8x8_idct_sse2
-	x264_analyse_free_costs
-	x264_analyse_init_costs
-	x264_analyse_weight_frame
-	x264_bitstream_init
-	x264_cabac_block_residual_8x8_rd_c
-	x264_cabac_block_residual_c
-	x264_cabac_block_residual_rd_c
-	x264_cabac_context_init
-	x264_cabac_encode_bypass_asm
-	x264_cabac_encode_bypass_c
-	x264_cabac_encode_decision_asm
-	x264_cabac_encode_decision_c
-	x264_cabac_encode_flush
-	x264_cabac_encode_init
-	x264_cabac_encode_init_core
-	x264_cabac_encode_terminal_asm
-	x264_cabac_encode_terminal_c
-	x264_cabac_encode_ue_bypass
-	x264_cabac_init
-	x264_cabac_mb_skip
-	x264_cavlc_init
-	x264_coeff_last15_avx512
-	x264_coeff_last15_lzcnt
-	x264_coeff_last15_mmx2
-	x264_coeff_last15_sse2
-	x264_coeff_last16_avx512
-	x264_coeff_last16_lzcnt
-	x264_coeff_last16_mmx2
-	x264_coeff_last16_sse2
-	x264_coeff_last4_lzcnt
-	x264_coeff_last4_mmx2
-	x264_coeff_last64_avx2
-	x264_coeff_last64_avx512
-	x264_coeff_last64_lzcnt
-	x264_coeff_last64_mmx2
-	x264_coeff_last64_sse2
-	x264_coeff_last8_avx512
-	x264_coeff_last8_lzcnt
-	x264_coeff_last8_mmx2
-	x264_coeff_level_run15_avx2
-	x264_coeff_level_run15_lzcnt
-	x264_coeff_level_run15_mmx2
-	x264_coeff_level_run15_sse2
-	x264_coeff_level_run15_ssse3
-	x264_coeff_level_run15_ssse3_lzcnt
-	x264_coeff_level_run16_avx2
-	x264_coeff_level_run16_lzcnt
-	x264_coeff_level_run16_mmx2
-	x264_coeff_level_run16_sse2
-	x264_coeff_level_run16_ssse3
-	x264_coeff_level_run16_ssse3_lzcnt
-	x264_coeff_level_run4_lzcnt
-	x264_coeff_level_run4_mmx2
-	x264_coeff_level_run4_ssse3
-	x264_coeff_level_run4_ssse3_lzcnt
-	x264_coeff_level_run8_lzcnt
-	x264_coeff_level_run8_mmx2
-	x264_coeff_level_run8_ssse3
-	x264_coeff_level_run8_ssse3_lzcnt
-	x264_copy_column8
-	x264_cpu_cpuid
-	x264_cpu_cpuid_test
-	x264_cpu_detect
-	x264_cpu_num_processors
-	x264_cpu_sfence
-	x264_cpu_xgetbv
-	x264_cqm_delete
-	x264_cqm_init
-	x264_cqm_parse_file
-	x264_dct2x4dc_mmx2
-	x264_dct4x4dc_mmx2
-	x264_dct_init
-	x264_deblock_h_chroma_422_avx
-	x264_deblock_h_chroma_422_intra_avx
-	x264_deblock_h_chroma_422_intra_mmx2
-	x264_deblock_h_chroma_422_intra_sse2
-	x264_deblock_h_chroma_422_mmx2
-	x264_deblock_h_chroma_422_sse2
-	x264_deblock_h_chroma_avx
-	x264_deblock_h_chroma_intra_avx
-	x264_deblock_h_chroma_intra_mbaff_mmx2
-	x264_deblock_h_chroma_intra_mmx2
-	x264_deblock_h_chroma_intra_sse2
-	x264_deblock_h_chroma_mbaff_mmx2
-	x264_deblock_h_chroma_mbaff_sse2
-	x264_deblock_h_chroma_mmx2
-	x264_deblock_h_chroma_sse2
-	x264_deblock_h_luma_avx
-	x264_deblock_h_luma_intra_avx
-	x264_deblock_h_luma_intra_mmx2
-	x264_deblock_h_luma_intra_sse2
-	x264_deblock_h_luma_mmx2
-	x264_deblock_h_luma_sse2
-	x264_deblock_init
-	x264_deblock_strength_avx
-	x264_deblock_strength_avx2
-	x264_deblock_strength_avx512
-	x264_deblock_strength_sse2
-	x264_deblock_strength_ssse3
-	x264_deblock_v8_luma_intra_mmx2
-	x264_deblock_v8_luma_mmx2
-	x264_deblock_v_chroma_avx
-	x264_deblock_v_chroma_intra_avx
-	x264_deblock_v_chroma_intra_mmx2
-	x264_deblock_v_chroma_intra_sse2
-	x264_deblock_v_chroma_mmx2
-	x264_deblock_v_chroma_sse2
-	x264_deblock_v_luma_avx
-	x264_deblock_v_luma_intra_avx
-	x264_deblock_v_luma_intra_sse2
-	x264_deblock_v_luma_sse2
-	x264_decimate_score15_avx512
-	x264_decimate_score15_sse2
-	x264_decimate_score15_ssse3
-	x264_decimate_score16_avx512
-	x264_decimate_score16_sse2
-	x264_decimate_score16_ssse3
-	x264_decimate_score64_avx2
-	x264_decimate_score64_avx512
-	x264_decimate_score64_sse2
-	x264_decimate_score64_ssse3
-	x264_denoise_dct_avx
-	x264_denoise_dct_avx2
-	x264_denoise_dct_mmx
-	x264_denoise_dct_sse2
-	x264_denoise_dct_ssse3
-	x264_dequant_4x4_avx
-	x264_dequant_4x4_avx2
-	x264_dequant_4x4_avx512
-	x264_dequant_4x4_flat16_avx2
-	x264_dequant_4x4_flat16_mmx
-	x264_dequant_4x4_flat16_sse2
-	x264_dequant_4x4_mmx
-	x264_dequant_4x4_sse2
-	x264_dequant_4x4_xop
-	x264_dequant_4x4dc_avx
-	x264_dequant_4x4dc_avx2
-	x264_dequant_4x4dc_mmx2
-	x264_dequant_4x4dc_sse2
-	x264_dequant_8x8_avx
-	x264_dequant_8x8_avx2
-	x264_dequant_8x8_avx512
-	x264_dequant_8x8_flat16_avx2
-	x264_dequant_8x8_flat16_avx512
-	x264_dequant_8x8_flat16_mmx
-	x264_dequant_8x8_flat16_sse2
-	x264_dequant_8x8_mmx
-	x264_dequant_8x8_sse2
-	x264_dequant_8x8_xop
-	x264_encoder_close
-	x264_encoder_delayed_frames
-	x264_encoder_encode
-	x264_encoder_headers
-	x264_encoder_intra_refresh
-	x264_encoder_invalidate_reference
-	x264_encoder_maximum_delayed_frames
-	x264_encoder_open_152
-	x264_encoder_parameters
-	x264_encoder_reconfig
-	x264_encoder_reconfig_apply
-	x264_expand_border_mbpair
-	x264_field_vsad
-	x264_filler_write
-	x264_fopen
-	x264_frame_cond_broadcast
-	x264_frame_cond_wait
-	x264_frame_copy_picture
-	x264_frame_deblock_row
-	x264_frame_delete
-	x264_frame_delete_list
-	x264_frame_expand_border
-	x264_frame_expand_border_chroma
-	x264_frame_expand_border_filtered
-	x264_frame_expand_border_lowres
-	x264_frame_expand_border_mod16
-	x264_frame_filter
-	x264_frame_init_lowres
-	x264_frame_init_lowres_core_avx
-	x264_frame_init_lowres_core_avx2
-	x264_frame_init_lowres_core_cache32_mmx2
-	x264_frame_init_lowres_core_mmx2
-	x264_frame_init_lowres_core_sse2
-	x264_frame_init_lowres_core_ssse3
-	x264_frame_init_lowres_core_xop
-	x264_frame_new_slice
-	x264_frame_pop
-	x264_frame_pop_blank_unused
-	x264_frame_pop_unused
-	x264_frame_push
-	x264_frame_push_blank_unused
-	x264_frame_push_unused
-	x264_frame_shift
-	x264_frame_unshift
-	x264_free
-	x264_hpel_filter_c_avx
-	x264_hpel_filter_c_avx2
-	x264_hpel_filter_c_mmx2
-	x264_hpel_filter_c_sse2
-	x264_hpel_filter_c_ssse3
-	x264_hpel_filter_h_avx
-	x264_hpel_filter_h_avx2
-	x264_hpel_filter_h_mmx2
-	x264_hpel_filter_h_sse2
-	x264_hpel_filter_h_ssse3
-	x264_hpel_filter_v_avx
-	x264_hpel_filter_v_avx2
-	x264_hpel_filter_v_mmx2
-	x264_hpel_filter_v_sse2
-	x264_hpel_filter_v_ssse3
-	x264_hrd_fullness
-	x264_idct4x4dc_mmx
-	x264_idct_dequant_2x4_dc_avx
-	x264_idct_dequant_2x4_dc_sse2
-	x264_idct_dequant_2x4_dconly_avx
-	x264_idct_dequant_2x4_dconly_sse2
-	x264_integral_init4h_avx2
-	x264_integral_init4h_sse4
-	x264_integral_init4v_avx2
-	x264_integral_init4v_mmx
-	x264_integral_init4v_sse2
-	x264_integral_init4v_ssse3
-	x264_integral_init8h_avx
-	x264_integral_init8h_avx2
-	x264_integral_init8h_sse4
-	x264_integral_init8v_avx2
-	x264_integral_init8v_mmx
-	x264_integral_init8v_sse2
-	x264_intra_sa8d_x3_8x8
-	x264_intra_sa8d_x3_8x8_mmx2
-	x264_intra_sad_x3_16x16
-	x264_intra_sad_x3_16x16_avx2
-	x264_intra_sad_x3_16x16_mmx2
-	x264_intra_sad_x3_16x16_sse2
-	x264_intra_sad_x3_16x16_ssse3
-	x264_intra_sad_x3_4x4
-	x264_intra_sad_x3_4x4_mmx2
-	x264_intra_sad_x3_8x16c
-	x264_intra_sad_x3_8x16c_mmx2
-	x264_intra_sad_x3_8x16c_sse2
-	x264_intra_sad_x3_8x8
-	x264_intra_sad_x3_8x8_mmx2
-	x264_intra_sad_x3_8x8c
-	x264_intra_sad_x3_8x8c_avx2
-	x264_intra_sad_x3_8x8c_mmx2
-	x264_intra_sad_x3_8x8c_ssse3
-	x264_intra_sad_x9_4x4_avx
-	x264_intra_sad_x9_4x4_sse4
-	x264_intra_sad_x9_4x4_ssse3
-	x264_intra_sad_x9_8x8_avx
-	x264_intra_sad_x9_8x8_avx2
-	x264_intra_sad_x9_8x8_sse4
-	x264_intra_sad_x9_8x8_ssse3
-	x264_intra_satd_x3_16x16
-	x264_intra_satd_x3_16x16_mmx2
-	x264_intra_satd_x3_16x16_ssse3
-	x264_intra_satd_x3_4x4
-	x264_intra_satd_x3_4x4_mmx2
-	x264_intra_satd_x3_8x16c
-	x264_intra_satd_x3_8x16c_avx
-	x264_intra_satd_x3_8x16c_mmx2
-	x264_intra_satd_x3_8x16c_sse2
-	x264_intra_satd_x3_8x16c_sse4
-	x264_intra_satd_x3_8x16c_ssse3
-	x264_intra_satd_x3_8x16c_xop
-	x264_intra_satd_x3_8x8c
-	x264_intra_satd_x3_8x8c_mmx2
-	x264_intra_satd_x3_8x8c_ssse3
-	x264_intra_satd_x9_4x4_avx
-	x264_intra_satd_x9_4x4_sse4
-	x264_intra_satd_x9_4x4_ssse3
-	x264_intra_satd_x9_4x4_xop
-	x264_is_pipe
-	x264_load_deinterleave_chroma_fdec_sse2
-	x264_load_deinterleave_chroma_fdec_ssse3
-	x264_load_deinterleave_chroma_fenc_avx2
-	x264_load_deinterleave_chroma_fenc_sse2
-	x264_load_deinterleave_chroma_fenc_ssse3
-	x264_log
-	x264_lookahead_delete
-	x264_lookahead_get_frames
-	x264_lookahead_init
-	x264_lookahead_is_empty
-	x264_lookahead_put_frame
-	x264_macroblock_analyse
-	x264_macroblock_bipred_init
-	x264_macroblock_cache_allocate
-	x264_macroblock_cache_free
-	x264_macroblock_cache_load_interlaced
-	x264_macroblock_cache_load_progressive
-	x264_macroblock_cache_save
-	x264_macroblock_deblock
-	x264_macroblock_deblock_strength
-	x264_macroblock_encode
-	x264_macroblock_encode_p4x4
-	x264_macroblock_encode_p8x8
-	x264_macroblock_probe_skip
-	x264_macroblock_slice_init
-	x264_macroblock_thread_allocate
-	x264_macroblock_thread_free
-	x264_macroblock_thread_init
-	x264_macroblock_tree_read
-	x264_macroblock_write_cabac
-	x264_macroblock_write_cavlc
-	x264_malloc
-	x264_mb_encode_chroma
-	x264_mb_mc
-	x264_mb_mc_8x8
-	x264_mb_predict_mv
-	x264_mb_predict_mv_16x16
-	x264_mb_predict_mv_direct16x16
-	x264_mb_predict_mv_pskip
-	x264_mb_predict_mv_ref16x16
-	x264_mbtree_fix8_pack_avx2
-	x264_mbtree_fix8_pack_ssse3
-	x264_mbtree_fix8_unpack_avx2
-	x264_mbtree_fix8_unpack_ssse3
-	x264_mbtree_propagate_cost_avx
-	x264_mbtree_propagate_cost_avx2
-	x264_mbtree_propagate_cost_avx512
-	x264_mbtree_propagate_cost_fma4
-	x264_mbtree_propagate_cost_sse2
-	x264_mbtree_propagate_list_internal_avx
-	x264_mbtree_propagate_list_internal_avx2
-	x264_mbtree_propagate_list_internal_ssse3
-	x264_mc_chroma_avx
-	x264_mc_chroma_avx2
-	x264_mc_chroma_cache64_ssse3
-	x264_mc_chroma_mmx2
-	x264_mc_chroma_sse2
-	x264_mc_chroma_ssse3
-	x264_mc_copy_w16_aligned_sse
-	x264_mc_copy_w16_mmx
-	x264_mc_copy_w16_sse
-	x264_mc_copy_w4_mmx
-	x264_mc_copy_w8_mmx
-	x264_mc_init
-	x264_mc_init_mmx
-	x264_mc_offsetadd_w12_mmx2
-	x264_mc_offsetadd_w16_mmx2
-	x264_mc_offsetadd_w16_sse2
-	x264_mc_offsetadd_w20_mmx2
-	x264_mc_offsetadd_w20_sse2
-	x264_mc_offsetadd_w4_mmx2
-	x264_mc_offsetadd_w8_mmx2
-	x264_mc_offsetsub_w12_mmx2
-	x264_mc_offsetsub_w16_mmx2
-	x264_mc_offsetsub_w16_sse2
-	x264_mc_offsetsub_w20_mmx2
-	x264_mc_offsetsub_w20_sse2
-	x264_mc_offsetsub_w4_mmx2
-	x264_mc_offsetsub_w8_mmx2
-	x264_mc_weight_w12_mmx2
-	x264_mc_weight_w16_avx2
-	x264_mc_weight_w16_mmx2
-	x264_mc_weight_w16_sse2
-	x264_mc_weight_w16_ssse3
-	x264_mc_weight_w20_avx2
-	x264_mc_weight_w20_mmx2
-	x264_mc_weight_w20_sse2
-	x264_mc_weight_w20_ssse3
-	x264_mc_weight_w4_mmx2
-	x264_mc_weight_w4_ssse3
-	x264_mc_weight_w8_avx2
-	x264_mc_weight_w8_mmx2
-	x264_mc_weight_w8_sse2
-	x264_mc_weight_w8_ssse3
-	x264_mdate
-	x264_me_refine_bidir_rd
-	x264_me_refine_bidir_satd
-	x264_me_refine_qpel
-	x264_me_refine_qpel_rd
-	x264_me_refine_qpel_refdupe
-	x264_me_search_ref
-	x264_memcpy_aligned_avx
-	x264_memcpy_aligned_avx512
-	x264_memcpy_aligned_sse
-	x264_memzero_aligned_avx
-	x264_memzero_aligned_avx512
-	x264_memzero_aligned_sse
-	x264_nal_encode
-	x264_nal_escape_mmx2
-	x264_nal_escape_sse2
-	x264_noise_reduction_update
-	x264_opencl_close_library
-	x264_opencl_finalize_cost
-	x264_opencl_flush
-	x264_opencl_frame_delete
-	x264_opencl_load_library
-	x264_opencl_lookahead_delete
-	x264_opencl_lookahead_init
-	x264_opencl_lowres_init
-	x264_opencl_motionsearch
-	x264_opencl_precalculate_frame_cost
-	x264_opencl_slicetype_end
-	x264_opencl_slicetype_prep
-	x264_optimize_chroma_2x2_dc_avx
-	x264_optimize_chroma_2x2_dc_sse2
-	x264_optimize_chroma_2x2_dc_sse4
-	x264_optimize_chroma_2x2_dc_ssse3
-	x264_param2string
-	x264_param_apply_fastfirstpass
-	x264_param_apply_profile
-	x264_param_default
-	x264_param_default_preset
-	x264_param_parse
-	x264_picture_alloc
-	x264_picture_clean
-	x264_picture_init
-	x264_pixel_ads1_avx
-	x264_pixel_ads1_avx2
-	x264_pixel_ads1_mmx2
-	x264_pixel_ads1_sse2
-	x264_pixel_ads1_ssse3
-	x264_pixel_ads2_avx
-	x264_pixel_ads2_avx2
-	x264_pixel_ads2_mmx2
-	x264_pixel_ads2_sse2
-	x264_pixel_ads2_ssse3
-	x264_pixel_ads4_avx
-	x264_pixel_ads4_avx2
-	x264_pixel_ads4_mmx2
-	x264_pixel_ads4_sse2
-	x264_pixel_ads4_ssse3
-	x264_pixel_asd8_sse2
-	x264_pixel_asd8_ssse3
-	x264_pixel_avg2_w12_cache32_mmx2
-	x264_pixel_avg2_w12_cache64_mmx2
-	x264_pixel_avg2_w12_mmx2
-	x264_pixel_avg2_w16_cache32_mmx2
-	x264_pixel_avg2_w16_cache64_mmx2
-	x264_pixel_avg2_w16_cache64_sse2
-	x264_pixel_avg2_w16_cache64_ssse3
-	x264_pixel_avg2_w16_mmx2
-	x264_pixel_avg2_w16_sse2
-	x264_pixel_avg2_w20_avx2
-	x264_pixel_avg2_w20_cache32_mmx2
-	x264_pixel_avg2_w20_cache64_mmx2
-	x264_pixel_avg2_w20_cache64_sse2
-	x264_pixel_avg2_w20_mmx2
-	x264_pixel_avg2_w20_sse2
-	x264_pixel_avg2_w4_mmx2
-	x264_pixel_avg2_w8_cache32_mmx2
-	x264_pixel_avg2_w8_cache64_mmx2
-	x264_pixel_avg2_w8_mmx2
-	x264_pixel_avg_16x16_avx2
-	x264_pixel_avg_16x16_avx512
-	x264_pixel_avg_16x16_mmx2
-	x264_pixel_avg_16x16_sse2
-	x264_pixel_avg_16x16_ssse3
-	x264_pixel_avg_16x8_avx2
-	x264_pixel_avg_16x8_avx512
-	x264_pixel_avg_16x8_mmx2
-	x264_pixel_avg_16x8_sse2
-	x264_pixel_avg_16x8_ssse3
-	x264_pixel_avg_4x16_mmx2
-	x264_pixel_avg_4x16_ssse3
-	x264_pixel_avg_4x2_mmx2
-	x264_pixel_avg_4x2_ssse3
-	x264_pixel_avg_4x4_mmx2
-	x264_pixel_avg_4x4_ssse3
-	x264_pixel_avg_4x8_mmx2
-	x264_pixel_avg_4x8_ssse3
-	x264_pixel_avg_8x16_avx512
-	x264_pixel_avg_8x16_mmx2
-	x264_pixel_avg_8x16_sse2
-	x264_pixel_avg_8x16_ssse3
-	x264_pixel_avg_8x4_avx512
-	x264_pixel_avg_8x4_mmx2
-	x264_pixel_avg_8x4_sse2
-	x264_pixel_avg_8x4_ssse3
-	x264_pixel_avg_8x8_avx512
-	x264_pixel_avg_8x8_mmx2
-	x264_pixel_avg_8x8_sse2
-	x264_pixel_avg_8x8_ssse3
-	x264_pixel_hadamard_ac_16x16_avx
-	x264_pixel_hadamard_ac_16x16_avx2
-	x264_pixel_hadamard_ac_16x16_mmx2
-	x264_pixel_hadamard_ac_16x16_sse2
-	x264_pixel_hadamard_ac_16x16_sse4
-	x264_pixel_hadamard_ac_16x16_ssse3
-	x264_pixel_hadamard_ac_16x16_ssse3_atom
-	x264_pixel_hadamard_ac_16x16_xop
-	x264_pixel_hadamard_ac_16x8_avx
-	x264_pixel_hadamard_ac_16x8_avx2
-	x264_pixel_hadamard_ac_16x8_mmx2
-	x264_pixel_hadamard_ac_16x8_sse2
-	x264_pixel_hadamard_ac_16x8_sse4
-	x264_pixel_hadamard_ac_16x8_ssse3
-	x264_pixel_hadamard_ac_16x8_ssse3_atom
-	x264_pixel_hadamard_ac_16x8_xop
-	x264_pixel_hadamard_ac_8x16_avx
-	x264_pixel_hadamard_ac_8x16_mmx2
-	x264_pixel_hadamard_ac_8x16_sse2
-	x264_pixel_hadamard_ac_8x16_sse4
-	x264_pixel_hadamard_ac_8x16_ssse3
-	x264_pixel_hadamard_ac_8x16_ssse3_atom
-	x264_pixel_hadamard_ac_8x16_xop
-	x264_pixel_hadamard_ac_8x8_avx
-	x264_pixel_hadamard_ac_8x8_mmx2
-	x264_pixel_hadamard_ac_8x8_sse2
-	x264_pixel_hadamard_ac_8x8_sse4
-	x264_pixel_hadamard_ac_8x8_ssse3
-	x264_pixel_hadamard_ac_8x8_ssse3_atom
-	x264_pixel_hadamard_ac_8x8_xop
-	x264_pixel_init
-	x264_pixel_sa8d_16x16_avx
-	x264_pixel_sa8d_16x16_mmx2
-	x264_pixel_sa8d_16x16_sse2
-	x264_pixel_sa8d_16x16_sse4
-	x264_pixel_sa8d_16x16_ssse3
-	x264_pixel_sa8d_16x16_ssse3_atom
-	x264_pixel_sa8d_16x16_xop
-	x264_pixel_sa8d_8x8_avx
-	x264_pixel_sa8d_8x8_avx2
-	x264_pixel_sa8d_8x8_avx512
-	x264_pixel_sa8d_8x8_mmx2
-	x264_pixel_sa8d_8x8_sse2
-	x264_pixel_sa8d_8x8_sse4
-	x264_pixel_sa8d_8x8_ssse3
-	x264_pixel_sa8d_8x8_ssse3_atom
-	x264_pixel_sa8d_8x8_xop
-	x264_pixel_sad_16x16_avx512
-	x264_pixel_sad_16x16_cache32_mmx2
-	x264_pixel_sad_16x16_cache64_mmx2
-	x264_pixel_sad_16x16_cache64_sse2
-	x264_pixel_sad_16x16_cache64_ssse3
-	x264_pixel_sad_16x16_mmx2
-	x264_pixel_sad_16x16_sse2
-	x264_pixel_sad_16x16_sse2_aligned
-	x264_pixel_sad_16x16_sse3
-	x264_pixel_sad_16x8_avx512
-	x264_pixel_sad_16x8_cache32_mmx2
-	x264_pixel_sad_16x8_cache64_mmx2
-	x264_pixel_sad_16x8_cache64_sse2
-	x264_pixel_sad_16x8_cache64_ssse3
-	x264_pixel_sad_16x8_mmx2
-	x264_pixel_sad_16x8_sse2
-	x264_pixel_sad_16x8_sse2_aligned
-	x264_pixel_sad_16x8_sse3
-	x264_pixel_sad_4x16_avx512
-	x264_pixel_sad_4x16_mmx2
-	x264_pixel_sad_4x4_avx512
-	x264_pixel_sad_4x4_mmx2
-	x264_pixel_sad_4x8_avx512
-	x264_pixel_sad_4x8_mmx2
-	x264_pixel_sad_8x16_avx512
-	x264_pixel_sad_8x16_cache32_mmx2
-	x264_pixel_sad_8x16_cache64_mmx2
-	x264_pixel_sad_8x16_mmx2
-	x264_pixel_sad_8x16_sse2
-	x264_pixel_sad_8x4_avx512
-	x264_pixel_sad_8x4_cache32_mmx2
-	x264_pixel_sad_8x4_cache64_mmx2
-	x264_pixel_sad_8x4_mmx2
-	x264_pixel_sad_8x8_avx512
-	x264_pixel_sad_8x8_cache32_mmx2
-	x264_pixel_sad_8x8_cache64_mmx2
-	x264_pixel_sad_8x8_mmx2
-	x264_pixel_sad_x3_16x16_avx
-	x264_pixel_sad_x3_16x16_avx2
-	x264_pixel_sad_x3_16x16_avx512
-	x264_pixel_sad_x3_16x16_cache32_mmx2
-	x264_pixel_sad_x3_16x16_cache64_mmx2
-	x264_pixel_sad_x3_16x16_cache64_sse2
-	x264_pixel_sad_x3_16x16_cache64_ssse3
-	x264_pixel_sad_x3_16x16_mmx2
-	x264_pixel_sad_x3_16x16_sse2
-	x264_pixel_sad_x3_16x16_sse3
-	x264_pixel_sad_x3_16x16_ssse3
-	x264_pixel_sad_x3_16x8_avx
-	x264_pixel_sad_x3_16x8_avx2
-	x264_pixel_sad_x3_16x8_avx512
-	x264_pixel_sad_x3_16x8_cache32_mmx2
-	x264_pixel_sad_x3_16x8_cache64_mmx2
-	x264_pixel_sad_x3_16x8_cache64_sse2
-	x264_pixel_sad_x3_16x8_cache64_ssse3
-	x264_pixel_sad_x3_16x8_mmx2
-	x264_pixel_sad_x3_16x8_sse2
-	x264_pixel_sad_x3_16x8_sse3
-	x264_pixel_sad_x3_16x8_ssse3
-	x264_pixel_sad_x3_4x4_avx512
-	x264_pixel_sad_x3_4x4_mmx2
-	x264_pixel_sad_x3_4x8_avx512
-	x264_pixel_sad_x3_4x8_mmx2
-	x264_pixel_sad_x3_8x16_avx512
-	x264_pixel_sad_x3_8x16_cache32_mmx2
-	x264_pixel_sad_x3_8x16_cache64_mmx2
-	x264_pixel_sad_x3_8x16_cache64_sse2
-	x264_pixel_sad_x3_8x16_mmx2
-	x264_pixel_sad_x3_8x16_sse2
-	x264_pixel_sad_x3_8x4_avx512
-	x264_pixel_sad_x3_8x4_mmx2
-	x264_pixel_sad_x3_8x4_sse2
-	x264_pixel_sad_x3_8x8_avx512
-	x264_pixel_sad_x3_8x8_cache32_mmx2
-	x264_pixel_sad_x3_8x8_cache64_mmx2
-	x264_pixel_sad_x3_8x8_mmx2
-	x264_pixel_sad_x3_8x8_sse2
-	x264_pixel_sad_x4_16x16_avx
-	x264_pixel_sad_x4_16x16_avx2
-	x264_pixel_sad_x4_16x16_avx512
-	x264_pixel_sad_x4_16x16_cache32_mmx2
-	x264_pixel_sad_x4_16x16_cache64_mmx2
-	x264_pixel_sad_x4_16x16_cache64_sse2
-	x264_pixel_sad_x4_16x16_cache64_ssse3
-	x264_pixel_sad_x4_16x16_mmx2
-	x264_pixel_sad_x4_16x16_sse2
-	x264_pixel_sad_x4_16x16_sse3
-	x264_pixel_sad_x4_16x16_ssse3
-	x264_pixel_sad_x4_16x8_avx
-	x264_pixel_sad_x4_16x8_avx2
-	x264_pixel_sad_x4_16x8_avx512
-	x264_pixel_sad_x4_16x8_cache32_mmx2
-	x264_pixel_sad_x4_16x8_cache64_mmx2
-	x264_pixel_sad_x4_16x8_cache64_sse2
-	x264_pixel_sad_x4_16x8_cache64_ssse3
-	x264_pixel_sad_x4_16x8_mmx2
-	x264_pixel_sad_x4_16x8_sse2
-	x264_pixel_sad_x4_16x8_sse3
-	x264_pixel_sad_x4_16x8_ssse3
-	x264_pixel_sad_x4_4x4_avx512
-	x264_pixel_sad_x4_4x4_mmx2
-	x264_pixel_sad_x4_4x8_avx512
-	x264_pixel_sad_x4_4x8_mmx2
-	x264_pixel_sad_x4_8x16_avx512
-	x264_pixel_sad_x4_8x16_cache32_mmx2
-	x264_pixel_sad_x4_8x16_cache64_mmx2
-	x264_pixel_sad_x4_8x16_cache64_sse2
-	x264_pixel_sad_x4_8x16_mmx2
-	x264_pixel_sad_x4_8x16_sse2
-	x264_pixel_sad_x4_8x16_ssse3
-	x264_pixel_sad_x4_8x4_avx512
-	x264_pixel_sad_x4_8x4_mmx2
-	x264_pixel_sad_x4_8x4_sse2
-	x264_pixel_sad_x4_8x4_ssse3
-	x264_pixel_sad_x4_8x8_avx512
-	x264_pixel_sad_x4_8x8_cache32_mmx2
-	x264_pixel_sad_x4_8x8_cache64_mmx2
-	x264_pixel_sad_x4_8x8_mmx2
-	x264_pixel_sad_x4_8x8_sse2
-	x264_pixel_sad_x4_8x8_ssse3
-	x264_pixel_satd_16x16_avx
-	x264_pixel_satd_16x16_avx2
-	x264_pixel_satd_16x16_avx512
-	x264_pixel_satd_16x16_mmx2
-	x264_pixel_satd_16x16_sse2
-	x264_pixel_satd_16x16_sse4
-	x264_pixel_satd_16x16_ssse3
-	x264_pixel_satd_16x16_ssse3_atom
-	x264_pixel_satd_16x16_xop
-	x264_pixel_satd_16x8_avx
-	x264_pixel_satd_16x8_avx2
-	x264_pixel_satd_16x8_avx512
-	x264_pixel_satd_16x8_mmx2
-	x264_pixel_satd_16x8_sse2
-	x264_pixel_satd_16x8_sse4
-	x264_pixel_satd_16x8_ssse3
-	x264_pixel_satd_16x8_ssse3_atom
-	x264_pixel_satd_16x8_xop
-	x264_pixel_satd_4x16_avx
-	x264_pixel_satd_4x16_avx512
-	x264_pixel_satd_4x16_mmx2
-	x264_pixel_satd_4x16_sse2
-	x264_pixel_satd_4x16_sse4
-	x264_pixel_satd_4x16_ssse3
-	x264_pixel_satd_4x16_ssse3_atom
-	x264_pixel_satd_4x4_avx
-	x264_pixel_satd_4x4_avx512
-	x264_pixel_satd_4x4_mmx2
-	x264_pixel_satd_4x4_sse4
-	x264_pixel_satd_4x4_ssse3
-	x264_pixel_satd_4x4_xop
-	x264_pixel_satd_4x8_avx
-	x264_pixel_satd_4x8_avx512
-	x264_pixel_satd_4x8_mmx2
-	x264_pixel_satd_4x8_sse2
-	x264_pixel_satd_4x8_sse4
-	x264_pixel_satd_4x8_ssse3
-	x264_pixel_satd_4x8_ssse3_atom
-	x264_pixel_satd_4x8_xop
-	x264_pixel_satd_8x16_avx
-	x264_pixel_satd_8x16_avx2
-	x264_pixel_satd_8x16_avx512
-	x264_pixel_satd_8x16_mmx2
-	x264_pixel_satd_8x16_sse2
-	x264_pixel_satd_8x16_sse4
-	x264_pixel_satd_8x16_ssse3
-	x264_pixel_satd_8x16_ssse3_atom
-	x264_pixel_satd_8x16_xop
-	x264_pixel_satd_8x4_avx
-	x264_pixel_satd_8x4_avx512
-	x264_pixel_satd_8x4_mmx2
-	x264_pixel_satd_8x4_sse2
-	x264_pixel_satd_8x4_sse4
-	x264_pixel_satd_8x4_ssse3
-	x264_pixel_satd_8x4_ssse3_atom
-	x264_pixel_satd_8x4_xop
-	x264_pixel_satd_8x8_avx
-	x264_pixel_satd_8x8_avx2
-	x264_pixel_satd_8x8_avx512
-	x264_pixel_satd_8x8_mmx2
-	x264_pixel_satd_8x8_sse2
-	x264_pixel_satd_8x8_sse4
-	x264_pixel_satd_8x8_ssse3
-	x264_pixel_satd_8x8_ssse3_atom
-	x264_pixel_satd_8x8_xop
-	x264_pixel_ssd_16x16_avx
-	x264_pixel_ssd_16x16_avx2
-	x264_pixel_ssd_16x16_mmx
-	x264_pixel_ssd_16x16_sse2
-	x264_pixel_ssd_16x16_sse2slow
-	x264_pixel_ssd_16x16_ssse3
-	x264_pixel_ssd_16x16_xop
-	x264_pixel_ssd_16x8_avx
-	x264_pixel_ssd_16x8_avx2
-	x264_pixel_ssd_16x8_mmx
-	x264_pixel_ssd_16x8_sse2
-	x264_pixel_ssd_16x8_sse2slow
-	x264_pixel_ssd_16x8_ssse3
-	x264_pixel_ssd_16x8_xop
-	x264_pixel_ssd_4x16_mmx
-	x264_pixel_ssd_4x16_ssse3
-	x264_pixel_ssd_4x4_mmx
-	x264_pixel_ssd_4x4_ssse3
-	x264_pixel_ssd_4x8_mmx
-	x264_pixel_ssd_4x8_ssse3
-	x264_pixel_ssd_8x16_avx
-	x264_pixel_ssd_8x16_mmx
-	x264_pixel_ssd_8x16_sse2
-	x264_pixel_ssd_8x16_sse2slow
-	x264_pixel_ssd_8x16_ssse3
-	x264_pixel_ssd_8x16_xop
-	x264_pixel_ssd_8x4_avx
-	x264_pixel_ssd_8x4_mmx
-	x264_pixel_ssd_8x4_sse2
-	x264_pixel_ssd_8x4_sse2slow
-	x264_pixel_ssd_8x4_ssse3
-	x264_pixel_ssd_8x4_xop
-	x264_pixel_ssd_8x8_avx
-	x264_pixel_ssd_8x8_mmx
-	x264_pixel_ssd_8x8_sse2
-	x264_pixel_ssd_8x8_sse2slow
-	x264_pixel_ssd_8x8_ssse3
-	x264_pixel_ssd_8x8_xop
-	x264_pixel_ssd_nv12
-	x264_pixel_ssd_nv12_core_avx
-	x264_pixel_ssd_nv12_core_avx2
-	x264_pixel_ssd_nv12_core_sse2
-	x264_pixel_ssd_nv12_core_xop
-	x264_pixel_ssd_wxh
-	x264_pixel_ssim_4x4x2_core_avx
-	x264_pixel_ssim_4x4x2_core_mmx2
-	x264_pixel_ssim_4x4x2_core_sse2
-	x264_pixel_ssim_end4_avx
-	x264_pixel_ssim_end4_sse2
-	x264_pixel_ssim_wxh
-	x264_pixel_var2_8x16_avx2
-	x264_pixel_var2_8x16_avx512
-	x264_pixel_var2_8x16_sse2
-	x264_pixel_var2_8x16_ssse3
-	x264_pixel_var2_8x8_avx2
-	x264_pixel_var2_8x8_avx512
-	x264_pixel_var2_8x8_sse2
-	x264_pixel_var2_8x8_ssse3
-	x264_pixel_var_16x16_avx
-	x264_pixel_var_16x16_avx2
-	x264_pixel_var_16x16_avx512
-	x264_pixel_var_16x16_sse2
-	x264_pixel_var_8x16_avx
-	x264_pixel_var_8x16_avx512
-	x264_pixel_var_8x16_sse2
-	x264_pixel_var_8x8_avx
-	x264_pixel_var_8x8_avx512
-	x264_pixel_var_8x8_sse2
-	x264_pixel_vsad_mmx2
-	x264_pixel_vsad_sse2
-	x264_plane_copy_c
-	x264_plane_copy_core_avx
-	x264_plane_copy_core_sse
-	x264_plane_copy_deinterleave_avx2
-	x264_plane_copy_deinterleave_c
-	x264_plane_copy_deinterleave_rgb_avx2
-	x264_plane_copy_deinterleave_rgb_sse2
-	x264_plane_copy_deinterleave_rgb_ssse3
-	x264_plane_copy_deinterleave_sse2
-	x264_plane_copy_deinterleave_ssse3
-	x264_plane_copy_interleave_c
-	x264_plane_copy_interleave_core_mmx2
-	x264_plane_copy_interleave_core_sse2
-	x264_plane_copy_swap_c
-	x264_plane_copy_swap_core_avx2
-	x264_plane_copy_swap_core_ssse3
-	x264_pps_init
-	x264_pps_write
-	x264_predict_16x16_dc_avx2
-	x264_predict_16x16_dc_c
-	x264_predict_16x16_dc_left_avx2
-	x264_predict_16x16_dc_left_sse2
-	x264_predict_16x16_dc_sse2
-	x264_predict_16x16_dc_top_avx2
-	x264_predict_16x16_dc_top_sse2
-	x264_predict_16x16_h_c
-	x264_predict_16x16_h_mmx2
-	x264_predict_16x16_h_ssse3
-	x264_predict_16x16_init
-	x264_predict_16x16_init_mmx
-	x264_predict_16x16_p_c
-	x264_predict_16x16_p_core_avx
-	x264_predict_16x16_p_core_avx2
-	x264_predict_16x16_p_core_mmx2
-	x264_predict_16x16_p_core_sse2
-	x264_predict_16x16_v_c
-	x264_predict_16x16_v_mmx2
-	x264_predict_16x16_v_sse
-	x264_predict_4x4_dc_c
-	x264_predict_4x4_dc_mmx2
-	x264_predict_4x4_ddl_mmx2
-	x264_predict_4x4_ddr_mmx2
-	x264_predict_4x4_ddr_ssse3
-	x264_predict_4x4_h_c
-	x264_predict_4x4_hd_mmx2
-	x264_predict_4x4_hd_ssse3
-	x264_predict_4x4_hu_mmx2
-	x264_predict_4x4_init
-	x264_predict_4x4_init_mmx
-	x264_predict_4x4_v_c
-	x264_predict_4x4_vl_mmx2
-	x264_predict_4x4_vr_cache64_ssse3
-	x264_predict_4x4_vr_mmx2
-	x264_predict_4x4_vr_ssse3
-	x264_predict_8x16c_dc_c
-	x264_predict_8x16c_dc_mmx2
-	x264_predict_8x16c_dc_top_mmx2
-	x264_predict_8x16c_h_c
-	x264_predict_8x16c_h_mmx2
-	x264_predict_8x16c_h_ssse3
-	x264_predict_8x16c_init
-	x264_predict_8x16c_init_mmx
-	x264_predict_8x16c_p_c
-	x264_predict_8x16c_p_core_avx
-	x264_predict_8x16c_p_core_avx2
-	x264_predict_8x16c_p_core_mmx2
-	x264_predict_8x16c_p_core_sse2
-	x264_predict_8x16c_v_c
-	x264_predict_8x16c_v_mmx
-	x264_predict_8x8_dc_c
-	x264_predict_8x8_dc_left_mmx2
-	x264_predict_8x8_dc_mmx2
-	x264_predict_8x8_dc_top_mmx2
-	x264_predict_8x8_ddl_avx
-	x264_predict_8x8_ddl_mmx2
-	x264_predict_8x8_ddl_sse2
-	x264_predict_8x8_ddl_ssse3
-	x264_predict_8x8_ddr_avx
-	x264_predict_8x8_ddr_mmx2
-	x264_predict_8x8_ddr_sse2
-	x264_predict_8x8_filter_mmx2
-	x264_predict_8x8_filter_ssse3
-	x264_predict_8x8_h_c
-	x264_predict_8x8_h_mmx2
-	x264_predict_8x8_hd_avx
-	x264_predict_8x8_hd_mmx2
-	x264_predict_8x8_hd_sse2
-	x264_predict_8x8_hu_mmx2
-	x264_predict_8x8_hu_sse2
-	x264_predict_8x8_hu_ssse3
-	x264_predict_8x8_init
-	x264_predict_8x8_init_mmx
-	x264_predict_8x8_v_c
-	x264_predict_8x8_v_mmx2
-	x264_predict_8x8_vl_avx
-	x264_predict_8x8_vl_mmx2
-	x264_predict_8x8_vl_sse2
-	x264_predict_8x8_vr_avx
-	x264_predict_8x8_vr_mmx2
-	x264_predict_8x8_vr_sse2
-	x264_predict_8x8_vr_ssse3
-	x264_predict_8x8c_dc_c
-	x264_predict_8x8c_dc_mmx2
-	x264_predict_8x8c_dc_top_mmx2
-	x264_predict_8x8c_h_c
-	x264_predict_8x8c_h_mmx2
-	x264_predict_8x8c_h_ssse3
-	x264_predict_8x8c_init
-	x264_predict_8x8c_init_mmx
-	x264_predict_8x8c_p_c
-	x264_predict_8x8c_p_core_avx
-	x264_predict_8x8c_p_core_avx2
-	x264_predict_8x8c_p_core_mmx2
-	x264_predict_8x8c_p_core_sse2
-	x264_predict_8x8c_v_c
-	x264_predict_8x8c_v_mmx
-	x264_predict_lossless_16x16
-	x264_predict_lossless_4x4
-	x264_predict_lossless_8x8
-	x264_predict_lossless_chroma
-	x264_prefetch_fenc
-	x264_prefetch_fenc_420_mmx2
-	x264_prefetch_fenc_422_mmx2
-	x264_prefetch_ref_mmx2
-	x264_pthread_cond_broadcast
-	x264_pthread_cond_destroy
-	x264_pthread_cond_init
-	x264_pthread_cond_signal
-	x264_pthread_cond_wait
-	x264_pthread_create
-	x264_pthread_join
-	x264_pthread_mutex_destroy
-	x264_pthread_mutex_init
-	x264_pthread_mutex_lock
-	x264_pthread_mutex_unlock
-	x264_pthread_num_processors_np
-	x264_quant_2x2_dc_mmx2
-	x264_quant_2x2_dc_ssse3
-	x264_quant_4x4_avx2
-	x264_quant_4x4_dc_avx2
-	x264_quant_4x4_dc_mmx2
-	x264_quant_4x4_dc_sse2
-	x264_quant_4x4_dc_sse4
-	x264_quant_4x4_dc_ssse3
-	x264_quant_4x4_mmx2
-	x264_quant_4x4_sse2
-	x264_quant_4x4_sse4
-	x264_quant_4x4_ssse3
-	x264_quant_4x4_trellis
-	x264_quant_4x4x4_avx2
-	x264_quant_4x4x4_sse2
-	x264_quant_4x4x4_ssse3
-	x264_quant_8x8_avx2
-	x264_quant_8x8_mmx2
-	x264_quant_8x8_sse2
-	x264_quant_8x8_sse4
-	x264_quant_8x8_ssse3
-	x264_quant_8x8_trellis
-	x264_quant_chroma_dc_trellis
-	x264_quant_init
-	x264_quant_luma_dc_trellis
-	x264_ratecontrol_delete
-	x264_ratecontrol_end
-	x264_ratecontrol_init_reconfigurable
-	x264_ratecontrol_mb
-	x264_ratecontrol_mb_qp
-	x264_ratecontrol_new
-	x264_ratecontrol_qp
-	x264_ratecontrol_set_weights
-	x264_ratecontrol_slice_type
-	x264_ratecontrol_start
-	x264_ratecontrol_summary
-	x264_ratecontrol_zone_init
-	x264_rc_analyse_slice
-	x264_rd_cost_part
-	x264_rdo_init
-	x264_reduce_fraction
-	x264_reduce_fraction64
-	x264_reference_build_list_optimal
-	x264_rename
-	x264_sei_avcintra_umid_write
-	x264_sei_avcintra_vanc_write
-	x264_sei_buffering_period_write
-	x264_sei_dec_ref_pic_marking_write
-	x264_sei_frame_packing_write
-	x264_sei_pic_timing_write
-	x264_sei_recovery_point_write
-	x264_sei_version_write
-	x264_sei_write
-	x264_slicetype_analyse
-	x264_slicetype_decide
-	x264_slurp_file
-	x264_sps_init
-	x264_sps_init_reconfigurable
-	x264_sps_write
-	x264_stack_align
-	x264_stat
-	x264_store_interleave_chroma_mmx2
-	x264_store_interleave_chroma_sse2
-	x264_sub16x16_dct8_avx
-	x264_sub16x16_dct8_mmx
-	x264_sub16x16_dct8_sse2
-	x264_sub16x16_dct8_ssse3
-	x264_sub16x16_dct_avx
-	x264_sub16x16_dct_avx2
-	x264_sub16x16_dct_avx512
-	x264_sub16x16_dct_mmx
-	x264_sub16x16_dct_sse2
-	x264_sub16x16_dct_ssse3
-	x264_sub16x16_dct_xop
-	x264_sub4x4_dct_avx512
-	x264_sub4x4_dct_mmx
-	x264_sub4x4_dct_ssse3
-	x264_sub8x16_dct_dc_avx512
-	x264_sub8x16_dct_dc_sse2
-	x264_sub8x16_dct_dc_ssse3
-	x264_sub8x8_dct8_avx
-	x264_sub8x8_dct8_mmx
-	x264_sub8x8_dct8_sse2
-	x264_sub8x8_dct8_ssse3
-	x264_sub8x8_dct_avx
-	x264_sub8x8_dct_avx2
-	x264_sub8x8_dct_avx512
-	x264_sub8x8_dct_dc_avx512
-	x264_sub8x8_dct_dc_mmx2
-	x264_sub8x8_dct_dc_sse2
-	x264_sub8x8_dct_mmx
-	x264_sub8x8_dct_sse2
-	x264_sub8x8_dct_ssse3
-	x264_sub8x8_dct_xop
-	x264_sync_frame_list_delete
-	x264_sync_frame_list_init
-	x264_sync_frame_list_pop
-	x264_sync_frame_list_push
-	x264_thread_sync_ratecontrol
-	x264_threading_init
-	x264_threadpool_delete
-	x264_threadpool_init
-	x264_threadpool_run
-	x264_threadpool_wait
-	x264_threads_distribute_ratecontrol
-	x264_threads_merge_ratecontrol
-	x264_threadslice_cond_broadcast
-	x264_threadslice_cond_wait
-	x264_validate_levels
-	x264_vfprintf
-	x264_weight_scale_plane
-	x264_weights_analyse
-	x264_win32_threading_destroy
-	x264_win32_threading_init
-	x264_zigzag_init
-	x264_zigzag_interleave_8x8_cavlc_avx
-	x264_zigzag_interleave_8x8_cavlc_avx2
-	x264_zigzag_interleave_8x8_cavlc_avx512
-	x264_zigzag_interleave_8x8_cavlc_mmx
-	x264_zigzag_interleave_8x8_cavlc_sse2
-	x264_zigzag_scan_4x4_field_avx512
-	x264_zigzag_scan_4x4_field_sse
-	x264_zigzag_scan_4x4_frame_avx
-	x264_zigzag_scan_4x4_frame_avx512
-	x264_zigzag_scan_4x4_frame_mmx
-	x264_zigzag_scan_4x4_frame_ssse3
-	x264_zigzag_scan_4x4_frame_xop
-	x264_zigzag_scan_8x8_field_avx512
-	x264_zigzag_scan_8x8_field_mmx2
-	x264_zigzag_scan_8x8_field_xop
-	x264_zigzag_scan_8x8_frame_avx512
-	x264_zigzag_scan_8x8_frame_mmx2
-	x264_zigzag_scan_8x8_frame_sse2
-	x264_zigzag_scan_8x8_frame_ssse3
-	x264_zigzag_scan_8x8_frame_xop
-	x264_zigzag_sub_4x4_field_avx
-	x264_zigzag_sub_4x4_field_ssse3
-	x264_zigzag_sub_4x4_frame_avx
-	x264_zigzag_sub_4x4_frame_ssse3
-	x264_zigzag_sub_4x4ac_field_ssse3
-	x264_zigzag_sub_4x4ac_frame_ssse3
diff --git a/dependencies2013/win32/bin/x264.lib b/dependencies2013/win32/bin/x264.lib
deleted file mode 100644
index 5767d60e..00000000
Binary files a/dependencies2013/win32/bin/x264.lib and /dev/null differ
diff --git a/dependencies2013/win32/bin/x264.orig.def b/dependencies2013/win32/bin/x264.orig.def
deleted file mode 100644
index 76429712..00000000
--- a/dependencies2013/win32/bin/x264.orig.def
+++ /dev/null
@@ -1,1688 +0,0 @@
-; i686-w64-mingw32-dlltool -z /home/jim/packages/win32/bin/x264.orig.def --export-all-symbols /home/jim/packages/win32/bin/libx264-152.dll
-EXPORTS
-	CloseHandle@4 @ 1 DATA
-	CreateEventW@16 @ 2 DATA
-	CreateSemaphoreW@16 @ 3 DATA
-	DeleteCriticalSection@4 @ 4 DATA
-	DllEntryPoint@12 @ 5
-	DllMainCRTStartup@12 @ 6
-	EnterCriticalSection@4 @ 7 DATA
-	FreeLibrary@4 @ 8 DATA
-	GetConsoleMode@8 @ 9 DATA
-	GetCurrentProcess@0 @ 10 DATA
-	GetCurrentProcessId@0 @ 11 DATA
-	GetCurrentThread@0 @ 12 DATA
-	GetCurrentThreadId@0 @ 13 DATA
-	GetLastError@0 @ 14 DATA
-	GetModuleFileNameW@12 @ 15 DATA
-	GetModuleHandleW@4 @ 16 DATA
-	GetProcAddress@8 @ 17 DATA
-	GetProcessAffinityMask@12 @ 18 DATA
-	GetStdHandle@4 @ 19 DATA
-	GetSystemTimeAsFileTime@4 @ 20 DATA
-	GetThreadPriority@4 @ 21 DATA
-	GetTickCount@0 @ 22 DATA
-	InitializeCriticalSection@4 @ 23 DATA
-	InitializeCriticalSectionAndSpinCount@8 @ 24 DATA
-	IsDBCSLeadByteEx@8 @ 25 DATA
-	LeaveCriticalSection@4 @ 26 DATA
-	LoadLibraryW@4 @ 27 DATA
-	MessageBoxW@16 @ 28 DATA
-	MultiByteToWideChar@24 @ 29 DATA
-	QueryPerformanceCounter@4 @ 30 DATA
-	ReleaseSemaphore@12 @ 31 DATA
-	SetEvent@4 @ 32 DATA
-	SetThreadPriority@8 @ 33 DATA
-	SetUnhandledExceptionFilter@4 @ 34 DATA
-	Sleep@4 @ 35 DATA
-	TerminateProcess@8 @ 36 DATA
-	TlsGetValue@4 @ 37 DATA
-	UnhandledExceptionFilter@4 @ 38 DATA
-	VirtualProtect@16 @ 39 DATA
-	VirtualQuery@12 @ 40 DATA
-	WaitForSingleObject@8 @ 41 DATA
-	WaitNamedPipeW@8 @ 42 DATA
-	WideCharToMultiByte@32 @ 43 DATA
-	WriteConsoleW@20 @ 44 DATA
-	_CRT_INIT@12 @ 45
-	_CRT_MT @ 46 DATA
-	_CTOR_LIST__ @ 47 DATA
-	_DTOR_LIST__ @ 48 DATA
-	_FindPESection @ 49
-	_FindPESectionByName @ 50
-	_FindPESectionExec @ 51
-	_GetPEImageBase @ 52
-	_IAT_end__ @ 53 DATA
-	_IAT_start__ @ 54 DATA
-	_IsNonwritableInCurrentImage @ 55
-	_RUNTIME_PSEUDO_RELOC_LIST_END__ @ 56 DATA
-	_RUNTIME_PSEUDO_RELOC_LIST__ @ 57 DATA
-	_ValidateImageBase @ 58
-	__Balloc_D2A @ 59
-	__Bfree_D2A @ 60
-	__CTOR_LIST__ @ 61 DATA
-	__DTOR_LIST__ @ 62 DATA
-	__ImageBase @ 63 DATA
-	__RUNTIME_PSEUDO_RELOC_LIST_END__ @ 64 DATA
-	__RUNTIME_PSEUDO_RELOC_LIST__ @ 65 DATA
-	___lc_codepage_func @ 66
-	___w64_mingwthr_add_key_dtor @ 67
-	___w64_mingwthr_remove_key_dtor @ 68
-	__any_on_D2A @ 69
-	__b2d_D2A @ 70
-	__bigtens_D2A @ 71 DATA
-	__chkstk_ms @ 72 DATA
-	__cmp_D2A @ 73
-	__copybits_D2A @ 74
-	__crt_xc_end__ @ 75 DATA
-	__crt_xc_start__ @ 76 DATA
-	__crt_xi_end__ @ 77 DATA
-	__crt_xi_start__ @ 78 DATA
-	__crt_xl_start__ @ 79 DATA
-	__crt_xp_end__ @ 80 DATA
-	__crt_xp_start__ @ 81 DATA
-	__crt_xt_end__ @ 82 DATA
-	__crt_xt_start__ @ 83 DATA
-	__d2b_D2A @ 84
-	__decrement_D2A @ 85
-	__diff_D2A @ 86
-	__divdi3 @ 87
-	__dllonexit @ 88
-	__do_global_ctors @ 89
-	__do_global_dtors @ 90
-	__doserrno @ 91
-	__dyn_tls_init@12 @ 92
-	__dyn_tls_init_callback @ 93 DATA
-	__freedtoa @ 94
-	__gcc_deregister_frame @ 95
-	__gcc_register_frame @ 96
-	__gdtoa @ 97
-	__gethex_D2A @ 98
-	__hexdig_D2A @ 99 DATA
-	__hexnan_D2A @ 100
-	__i2b_D2A @ 101
-	__increment_D2A @ 102
-	__logl_internal @ 103
-	__lshift_D2A @ 104
-	__main @ 105
-	__match_D2A @ 106
-	__mingw_GetSectionCount @ 107
-	__mingw_GetSectionForAddress @ 108
-	__mingw_TLScallback @ 109
-	__mingw_enum_import_library_names @ 110
-	__mingw_hexdig_init_D2A @ 111
-	__mingw_pformat @ 112
-	__mingw_raise_matherr @ 113
-	__mingw_setusermatherr @ 114
-	__mingw_strtod @ 115
-	__mingw_strtof @ 116
-	__mingw_strtold @ 117
-	__mingw_vfprintf @ 118
-	__mingw_vfscanf @ 119
-	__mingw_vsnprintf @ 120
-	__mingw_vsprintf @ 121
-	__mingw_vsscanf @ 122
-	__mult_D2A @ 123
-	__multadd_D2A @ 124
-	__native_dllmain_reason @ 125 DATA
-	__native_startup_lock @ 126 DATA
-	__native_startup_state @ 127 DATA
-	__native_vcclrit_reason @ 128 DATA
-	__nrv_alloc_D2A @ 129
-	__onexitbegin @ 130 DATA
-	__onexitend @ 131 DATA
-	__pow5mult_D2A @ 132
-	__powi @ 133
-	__quorem_D2A @ 134
-	__ratio_D2A @ 135
-	__report_gsfailure @ 136
-	__rshift_D2A @ 137
-	__rv_alloc_D2A @ 138
-	__s2b_D2A @ 139
-	__security_cookie @ 140 DATA
-	__security_cookie_complement @ 141 DATA
-	__security_init_cookie @ 142
-	__set_ones_D2A @ 143
-	__setusermatherr @ 144
-	__strcp_D2A @ 145
-	__strtod @ 146
-	__strtodg @ 147
-	__strtof @ 148
-	__strtold @ 149
-	__sum_D2A @ 150
-	__tens_D2A @ 151 DATA
-	__tinytens_D2A @ 152 DATA
-	__tlregdtor @ 153
-	__tls_end__ @ 154 DATA
-	__tls_start__ @ 155 DATA
-	__trailz_D2A @ 156
-	__udivdi3 @ 157
-	__umoddi3 @ 158
-	__xc_a @ 159 DATA
-	__xc_z @ 160 DATA
-	__xi_a @ 161 DATA
-	__xi_z @ 162 DATA
-	__xl_a @ 163 DATA
-	__xl_c @ 164 DATA
-	__xl_d @ 165 DATA
-	__xl_z @ 166 DATA
-	_amsg_exit @ 167
-	_assert @ 168
-	_beginthreadex @ 169 DATA
-	_bss_end__ @ 170 DATA
-	_bss_start__ @ 171 DATA
-	_data_end__ @ 172 DATA
-	_data_start__ @ 173 DATA
-	_decode_pointer @ 174
-	_dll__ @ 175 DATA
-	_dll_characteristics__ @ 176 DATA
-	_encode_pointer @ 177
-	_errno @ 178
-	_exit @ 179
-	_file_alignment__ @ 180 DATA
-	_filelengthi64 @ 181
-	_fileno @ 182
-	_flush @ 183
-	_fpreset @ 184
-	_fseeki64 @ 185
-	_fstati64 @ 186 DATA
-	_ftelli64 @ 187
-	_ftime @ 188 DATA
-	_get_output_format @ 189
-	_head_lib32_libkernel32_a @ 190 DATA
-	_head_lib32_libmsvcrt_a @ 191 DATA
-	_head_lib32_libuser32_a @ 192 DATA
-	_image_base__ @ 193 DATA
-	_imp__CloseHandle@4 @ 194 DATA
-	_imp__CreateEventW@16 @ 195 DATA
-	_imp__CreateSemaphoreW@16 @ 196 DATA
-	_imp__DeleteCriticalSection@4 @ 197 DATA
-	_imp__EnterCriticalSection@4 @ 198 DATA
-	_imp__FreeLibrary@4 @ 199 DATA
-	_imp__GetConsoleMode@8 @ 200 DATA
-	_imp__GetCurrentProcess@0 @ 201 DATA
-	_imp__GetCurrentProcessId@0 @ 202 DATA
-	_imp__GetCurrentThread@0 @ 203 DATA
-	_imp__GetCurrentThreadId@0 @ 204 DATA
-	_imp__GetLastError@0 @ 205 DATA
-	_imp__GetModuleFileNameW@12 @ 206 DATA
-	_imp__GetModuleHandleW@4 @ 207 DATA
-	_imp__GetProcAddress@8 @ 208 DATA
-	_imp__GetProcessAffinityMask@12 @ 209 DATA
-	_imp__GetStdHandle@4 @ 210 DATA
-	_imp__GetSystemTimeAsFileTime@4 @ 211 DATA
-	_imp__GetThreadPriority@4 @ 212 DATA
-	_imp__GetTickCount@0 @ 213 DATA
-	_imp__InitializeCriticalSection@4 @ 214 DATA
-	_imp__InitializeCriticalSectionAndSpinCount@8 @ 215 DATA
-	_imp__IsDBCSLeadByteEx@8 @ 216 DATA
-	_imp__LeaveCriticalSection@4 @ 217 DATA
-	_imp__LoadLibraryW@4 @ 218 DATA
-	_imp__MessageBoxW@16 @ 219 DATA
-	_imp__MultiByteToWideChar@24 @ 220 DATA
-	_imp__QueryPerformanceCounter@4 @ 221 DATA
-	_imp__ReleaseSemaphore@12 @ 222 DATA
-	_imp__SetEvent@4 @ 223 DATA
-	_imp__SetThreadPriority@8 @ 224 DATA
-	_imp__SetUnhandledExceptionFilter@4 @ 225 DATA
-	_imp__Sleep@4 @ 226 DATA
-	_imp__TerminateProcess@8 @ 227 DATA
-	_imp__TlsGetValue@4 @ 228 DATA
-	_imp__UnhandledExceptionFilter@4 @ 229 DATA
-	_imp__VirtualProtect@16 @ 230 DATA
-	_imp__VirtualQuery@12 @ 231 DATA
-	_imp__WaitForSingleObject@8 @ 232 DATA
-	_imp__WaitNamedPipeW@8 @ 233 DATA
-	_imp__WideCharToMultiByte@32 @ 234 DATA
-	_imp__WriteConsoleW@20 @ 235 DATA
-	_imp_____lc_codepage_func @ 236 DATA
-	_imp____dllonexit @ 237 DATA
-	_imp____doserrno @ 238 DATA
-	_imp____mb_cur_max @ 239 DATA
-	_imp____pioinfo @ 240 DATA
-	_imp____setusermatherr @ 241 DATA
-	_imp___amsg_exit @ 242 DATA
-	_imp___beginthreadex @ 243 DATA
-	_imp___errno @ 244 DATA
-	_imp___exit @ 245 DATA
-	_imp___filelengthi64 @ 246 DATA
-	_imp___fileno @ 247 DATA
-	_imp___fstati64 @ 248 DATA
-	_imp___ftime @ 249 DATA
-	_imp___get_output_format @ 250 DATA
-	_imp___initterm @ 251 DATA
-	_imp___iob @ 252 DATA
-	_imp___lock @ 253 DATA
-	_imp___lock_file @ 254 DATA
-	_imp___lseeki64 @ 255 DATA
-	_imp___onexit @ 256 DATA
-	_imp___set_output_format @ 257 DATA
-	_imp___snwprintf @ 258 DATA
-	_imp___stricmp @ 259 DATA
-	_imp___strnicmp @ 260 DATA
-	_imp___unlock @ 261 DATA
-	_imp___unlock_file @ 262 DATA
-	_imp___wfopen @ 263 DATA
-	_imp___wrename @ 264 DATA
-	_imp___write @ 265 DATA
-	_imp___wstati64 @ 266 DATA
-	_imp___wunlink @ 267 DATA
-	_imp__abort @ 268 DATA
-	_imp__atoi @ 269 DATA
-	_imp__calloc @ 270 DATA
-	_imp__fclose @ 271 DATA
-	_imp__fflush @ 272 DATA
-	_imp__fgetpos @ 273 DATA
-	_imp__fileno @ 274 DATA
-	_imp__fprintf @ 275 DATA
-	_imp__fputc @ 276 DATA
-	_imp__fputs @ 277 DATA
-	_imp__fread @ 278 DATA
-	_imp__free @ 279 DATA
-	_imp__fsetpos @ 280 DATA
-	_imp__fwprintf @ 281 DATA
-	_imp__fwrite @ 282 DATA
-	_imp__getc @ 283 DATA
-	_imp__getenv @ 284 DATA
-	_imp__islower @ 285 DATA
-	_imp__isspace @ 286 DATA
-	_imp__isupper @ 287 DATA
-	_imp__isxdigit @ 288 DATA
-	_imp__localeconv @ 289 DATA
-	_imp__log10 @ 290 DATA
-	_imp__malloc @ 291 DATA
-	_imp__memcmp @ 292 DATA
-	_imp__memcpy @ 293 DATA
-	_imp__memmove @ 294 DATA
-	_imp__memset @ 295 DATA
-	_imp__raise @ 296 DATA
-	_imp__realloc @ 297 DATA
-	_imp__rewind @ 298 DATA
-	_imp__setlocale @ 299 DATA
-	_imp__strchr @ 300 DATA
-	_imp__strcmp @ 301 DATA
-	_imp__strcpy @ 302 DATA
-	_imp__strcspn @ 303 DATA
-	_imp__strdup @ 304 DATA
-	_imp__strerror @ 305 DATA
-	_imp__strlen @ 306 DATA
-	_imp__strncmp @ 307 DATA
-	_imp__strpbrk @ 308 DATA
-	_imp__strstr @ 309 DATA
-	_imp__strtok @ 310 DATA
-	_imp__strtol @ 311 DATA
-	_imp__strtoul @ 312 DATA
-	_imp__tolower @ 313 DATA
-	_imp__ungetc @ 314 DATA
-	_imp__vfprintf @ 315 DATA
-	_imp__wcscpy @ 316 DATA
-	_imp__wcslen @ 317 DATA
-	_initterm @ 318
-	_lib32_libkernel32_a_iname @ 319 DATA
-	_lib32_libmsvcrt_a_iname @ 320 DATA
-	_lib32_libuser32_a_iname @ 321 DATA
-	_loader_flags__ @ 322 DATA
-	_lock @ 323
-	_lock_file @ 324
-	_lseeki64 @ 325
-	_major_image_version__ @ 326 DATA
-	_major_os_version__ @ 327 DATA
-	_major_subsystem_version__ @ 328 DATA
-	_matherr @ 329
-	_minor_image_version__ @ 330 DATA
-	_minor_os_version__ @ 331 DATA
-	_minor_subsystem_version__ @ 332 DATA
-	_pei386_runtime_relocator @ 333
-	_rt_psrelocs_end @ 334 DATA
-	_rt_psrelocs_size @ 335 DATA
-	_rt_psrelocs_start @ 336 DATA
-	_section_alignment__ @ 337 DATA
-	_set_output_format @ 338
-	_size_of_heap_commit__ @ 339 DATA
-	_size_of_heap_reserve__ @ 340 DATA
-	_size_of_stack_commit__ @ 341 DATA
-	_size_of_stack_reserve__ @ 342 DATA
-	_snwprintf @ 343
-	_stricmp @ 344 DATA
-	_strnicmp @ 345 DATA
-	_subsystem__ @ 346 DATA
-	_tls_end @ 347 DATA
-	_tls_index @ 348 DATA
-	_tls_start @ 349 DATA
-	_tls_used @ 350 DATA
-	_unlock @ 351
-	_unlock_file @ 352
-	_wassert @ 353
-	_wfopen @ 354 DATA
-	_wrename @ 355 DATA
-	_write @ 356
-	_wstati64 @ 357 DATA
-	_wunlink @ 358 DATA
-	abort @ 359
-	atexit @ 360
-	atoi @ 361
-	calloc @ 362
-	exp @ 363
-	exp2l @ 364
-	fclose @ 365
-	fflush @ 366
-	fgetpos @ 367
-	fileno @ 368
-	fpreset @ 369
-	fprintf @ 370
-	fputc @ 371
-	fputs @ 372
-	fread @ 373
-	free @ 374
-	fseeko64 @ 375
-	fsetpos @ 376
-	ftello64 @ 377
-	fwprintf @ 378
-	fwrite @ 379
-	getc @ 380
-	getenv @ 381
-	islower @ 382
-	isspace @ 383
-	isupper @ 384
-	isxdigit @ 385
-	ldexp @ 386
-	localeconv @ 387
-	log @ 388
-	log10 @ 389
-	log2 @ 390
-	log2f @ 391
-	log2l @ 392
-	malloc @ 393
-	mbrlen @ 394
-	mbrtowc @ 395
-	mbsrtowcs @ 396
-	memcmp @ 397
-	memcpy @ 398
-	memmove @ 399
-	memset @ 400
-	mingw_app_type @ 401 DATA
-	mingw_dosmaperr @ 402
-	mingw_initltsdrot_force @ 403 DATA
-	mingw_initltsdyn_force @ 404 DATA
-	mingw_initltssuo_force @ 405 DATA
-	mingw_onexit @ 406
-	pcinit @ 407 DATA
-	pow @ 408
-	raise @ 409
-	realloc @ 410
-	rewind @ 411
-	setlocale @ 412
-	strchr @ 413
-	strcmp @ 414
-	strcpy @ 415
-	strcspn @ 416
-	strdup @ 417
-	strerror @ 418
-	strlen @ 419
-	strncmp @ 420
-	strnlen @ 421
-	strpbrk @ 422
-	strstr @ 423
-	strtoimax @ 424
-	strtok @ 425
-	strtol @ 426
-	strtoll @ 427
-	strtoul @ 428
-	strtoull @ 429
-	strtoumax @ 430
-	tolower @ 431
-	ungetc @ 432
-	vfprintf @ 433
-	wcrtomb @ 434
-	wcscpy @ 435
-	wcslen @ 436
-	wcsnlen @ 437
-	wcsrtombs @ 438
-	x264_adaptive_quant_frame @ 439
-	x264_add16x16_idct8_avx @ 440
-	x264_add16x16_idct8_mmx @ 441
-	x264_add16x16_idct8_sse2 @ 442
-	x264_add16x16_idct_avx @ 443
-	x264_add16x16_idct_avx2 @ 444
-	x264_add16x16_idct_dc_avx @ 445
-	x264_add16x16_idct_dc_avx2 @ 446
-	x264_add16x16_idct_dc_mmx2 @ 447
-	x264_add16x16_idct_dc_sse2 @ 448
-	x264_add16x16_idct_dc_ssse3 @ 449
-	x264_add16x16_idct_mmx @ 450
-	x264_add16x16_idct_sse2 @ 451
-	x264_add4x4_idct_avx @ 452
-	x264_add4x4_idct_mmx @ 453
-	x264_add4x4_idct_sse4 @ 454
-	x264_add8x8_idct8_avx @ 455
-	"x264_add8x8_idct8_avx.skip_prologue" @ 456 DATA
-	x264_add8x8_idct8_mmx @ 457
-	"x264_add8x8_idct8_mmx.skip_prologue" @ 458 DATA
-	x264_add8x8_idct8_sse2 @ 459
-	"x264_add8x8_idct8_sse2.skip_prologue" @ 460 DATA
-	x264_add8x8_idct_avx @ 461
-	"x264_add8x8_idct_avx.skip_prologue" @ 462 DATA
-	x264_add8x8_idct_avx2 @ 463
-	"x264_add8x8_idct_avx2.skip_prologue" @ 464 DATA
-	x264_add8x8_idct_avx512 @ 465
-	x264_add8x8_idct_dc_mmx2 @ 466
-	x264_add8x8_idct_dc_ssse3 @ 467
-	x264_add8x8_idct_mmx @ 468
-	x264_add8x8_idct_sse2 @ 469
-	"x264_add8x8_idct_sse2.skip_prologue" @ 470 DATA
-	x264_analyse_free_costs @ 471
-	x264_analyse_init_costs @ 472
-	x264_analyse_weight_frame @ 473
-	x264_bit_depth @ 474 DATA
-	x264_bitstream_init @ 475
-	x264_cabac_block_residual_8x8_rd_c @ 476
-	x264_cabac_block_residual_c @ 477
-	x264_cabac_block_residual_rd_c @ 478
-	x264_cabac_context_init @ 479
-	x264_cabac_contexts @ 480 DATA
-	x264_cabac_encode_bypass_asm @ 481
-	x264_cabac_encode_bypass_bmi2 @ 482 DATA
-	x264_cabac_encode_bypass_c @ 483
-	x264_cabac_encode_decision_asm @ 484
-	x264_cabac_encode_decision_bmi2 @ 485 DATA
-	x264_cabac_encode_decision_c @ 486
-	x264_cabac_encode_flush @ 487
-	x264_cabac_encode_init @ 488
-	x264_cabac_encode_init_core @ 489
-	x264_cabac_encode_terminal_asm @ 490
-	x264_cabac_encode_terminal_c @ 491
-	x264_cabac_encode_ue_bypass @ 492
-	x264_cabac_entropy @ 493 DATA
-	x264_cabac_init @ 494
-	x264_cabac_mb_skip @ 495
-	x264_cabac_range_lps @ 496 DATA
-	x264_cabac_renorm_shift @ 497 DATA
-	x264_cabac_size_unary @ 498 DATA
-	x264_cabac_transition @ 499 DATA
-	x264_cabac_transition_unary @ 500 DATA
-	x264_cache_mv_func_table @ 501 DATA
-	x264_cache_mvd_func_table @ 502 DATA
-	x264_cache_ref_func_table @ 503 DATA
-	x264_cavlc_init @ 504
-	x264_chroma_format @ 505 DATA
-	x264_chroma_inter_body_avx @ 506 DATA
-	x264_chroma_inter_body_mmx2 @ 507 DATA
-	x264_chroma_inter_body_sse2 @ 508 DATA
-	x264_chroma_intra_body_avx @ 509 DATA
-	x264_chroma_intra_body_mmx2 @ 510 DATA
-	x264_chroma_intra_body_sse2 @ 511 DATA
-	x264_coeff0_token @ 512 DATA
-	x264_coeff_abs_level_m1_offset @ 513 DATA
-	x264_coeff_flag_offset_chroma_422_dc @ 514 DATA
-	x264_coeff_last15_avx512 @ 515
-	x264_coeff_last15_lzcnt @ 516
-	x264_coeff_last15_mmx2 @ 517
-	x264_coeff_last15_sse2 @ 518
-	x264_coeff_last16_avx512 @ 519
-	x264_coeff_last16_lzcnt @ 520
-	x264_coeff_last16_mmx2 @ 521
-	x264_coeff_last16_sse2 @ 522
-	x264_coeff_last4_lzcnt @ 523
-	x264_coeff_last4_mmx2 @ 524
-	x264_coeff_last64_avx2 @ 525
-	x264_coeff_last64_avx512 @ 526
-	x264_coeff_last64_lzcnt @ 527
-	x264_coeff_last64_mmx2 @ 528
-	x264_coeff_last64_sse2 @ 529
-	x264_coeff_last8_avx512 @ 530
-	x264_coeff_last8_lzcnt @ 531
-	x264_coeff_last8_mmx2 @ 532
-	x264_coeff_level_run15_avx2 @ 533
-	x264_coeff_level_run15_lzcnt @ 534
-	x264_coeff_level_run15_mmx2 @ 535
-	x264_coeff_level_run15_sse2 @ 536
-	x264_coeff_level_run15_ssse3 @ 537
-	x264_coeff_level_run15_ssse3_lzcnt @ 538
-	x264_coeff_level_run16_avx2 @ 539
-	x264_coeff_level_run16_lzcnt @ 540
-	x264_coeff_level_run16_mmx2 @ 541
-	x264_coeff_level_run16_sse2 @ 542
-	x264_coeff_level_run16_ssse3 @ 543
-	x264_coeff_level_run16_ssse3_lzcnt @ 544
-	x264_coeff_level_run4_lzcnt @ 545
-	x264_coeff_level_run4_mmx2 @ 546
-	x264_coeff_level_run4_ssse3 @ 547
-	x264_coeff_level_run4_ssse3_lzcnt @ 548
-	x264_coeff_level_run8_lzcnt @ 549
-	x264_coeff_level_run8_mmx2 @ 550
-	x264_coeff_level_run8_ssse3 @ 551
-	x264_coeff_level_run8_ssse3_lzcnt @ 552
-	x264_coeff_token @ 553 DATA
-	x264_copy_column8 @ 554
-	x264_count_cat_m1 @ 555 DATA
-	x264_cpu_cpuid @ 556
-	x264_cpu_cpuid_test @ 557
-	x264_cpu_detect @ 558
-	x264_cpu_emms @ 559 DATA
-	x264_cpu_names @ 560 DATA
-	x264_cpu_num_processors @ 561
-	x264_cpu_sfence @ 562
-	x264_cpu_xgetbv @ 563
-	x264_cqm_delete @ 564
-	x264_cqm_init @ 565
-	x264_cqm_parse_file @ 566
-	x264_dct2x4dc_mmx2 @ 567
-	x264_dct4_weight2_tab @ 568 DATA
-	x264_dct4_weight_tab @ 569 DATA
-	x264_dct4x4dc_mmx2 @ 570
-	x264_dct4x4x4_internal_avx512 @ 571 DATA
-	x264_dct8_mmx @ 572 DATA
-	x264_dct8_weight2_tab @ 573 DATA
-	x264_dct8_weight_tab @ 574 DATA
-	x264_dct_init @ 575
-	x264_deblock_h_chroma_422_avx @ 576
-	x264_deblock_h_chroma_422_intra_avx @ 577
-	x264_deblock_h_chroma_422_intra_mmx2 @ 578
-	x264_deblock_h_chroma_422_intra_sse2 @ 579
-	x264_deblock_h_chroma_422_mmx2 @ 580
-	x264_deblock_h_chroma_422_sse2 @ 581
-	x264_deblock_h_chroma_avx @ 582
-	x264_deblock_h_chroma_intra_avx @ 583
-	x264_deblock_h_chroma_intra_mbaff_mmx2 @ 584
-	x264_deblock_h_chroma_intra_mmx2 @ 585
-	x264_deblock_h_chroma_intra_sse2 @ 586
-	x264_deblock_h_chroma_mbaff_mmx2 @ 587
-	x264_deblock_h_chroma_mbaff_sse2 @ 588
-	x264_deblock_h_chroma_mmx2 @ 589
-	x264_deblock_h_chroma_sse2 @ 590
-	x264_deblock_h_luma_avx @ 591
-	x264_deblock_h_luma_intra_avx @ 592
-	x264_deblock_h_luma_intra_mmx2 @ 593
-	x264_deblock_h_luma_intra_sse2 @ 594
-	x264_deblock_h_luma_mmx2 @ 595
-	x264_deblock_h_luma_sse2 @ 596
-	x264_deblock_init @ 597
-	x264_deblock_strength_avx @ 598
-	x264_deblock_strength_avx2 @ 599
-	x264_deblock_strength_avx512 @ 600
-	x264_deblock_strength_sse2 @ 601
-	x264_deblock_strength_ssse3 @ 602
-	x264_deblock_v8_luma_intra_mmx2 @ 603
-	x264_deblock_v8_luma_mmx2 @ 604
-	x264_deblock_v_chroma_avx @ 605
-	x264_deblock_v_chroma_intra_avx @ 606
-	x264_deblock_v_chroma_intra_mmx2 @ 607
-	x264_deblock_v_chroma_intra_sse2 @ 608
-	x264_deblock_v_chroma_mmx2 @ 609
-	x264_deblock_v_chroma_sse2 @ 610
-	x264_deblock_v_luma_avx @ 611
-	x264_deblock_v_luma_intra_avx @ 612
-	x264_deblock_v_luma_intra_sse2 @ 613
-	x264_deblock_v_luma_sse2 @ 614
-	x264_decimate_score15_avx512 @ 615
-	x264_decimate_score15_sse2 @ 616
-	x264_decimate_score15_ssse3 @ 617
-	x264_decimate_score16_avx512 @ 618
-	x264_decimate_score16_sse2 @ 619
-	x264_decimate_score16_ssse3 @ 620
-	x264_decimate_score64_avx2 @ 621
-	x264_decimate_score64_avx512 @ 622
-	x264_decimate_score64_sse2 @ 623
-	x264_decimate_score64_ssse3 @ 624
-	x264_decimate_table4 @ 625 DATA
-	x264_decimate_table8 @ 626 DATA
-	x264_deinterleave_shufd @ 627 DATA
-	x264_denoise_dct_avx @ 628
-	x264_denoise_dct_avx2 @ 629
-	x264_denoise_dct_mmx @ 630
-	x264_denoise_dct_sse2 @ 631
-	x264_denoise_dct_ssse3 @ 632
-	x264_dequant_4x4_avx @ 633
-	x264_dequant_4x4_avx2 @ 634
-	x264_dequant_4x4_avx512 @ 635
-	x264_dequant_4x4_flat16_avx2 @ 636
-	x264_dequant_4x4_flat16_mmx @ 637
-	x264_dequant_4x4_flat16_sse2 @ 638
-	x264_dequant_4x4_mmx @ 639
-	x264_dequant_4x4_sse2 @ 640
-	x264_dequant_4x4_xop @ 641
-	x264_dequant_4x4dc_avx @ 642
-	x264_dequant_4x4dc_avx2 @ 643
-	x264_dequant_4x4dc_mmx2 @ 644
-	x264_dequant_4x4dc_sse2 @ 645
-	x264_dequant_8x8_avx @ 646
-	x264_dequant_8x8_avx2 @ 647
-	x264_dequant_8x8_avx512 @ 648
-	x264_dequant_8x8_flat16_avx2 @ 649
-	x264_dequant_8x8_flat16_avx512 @ 650
-	x264_dequant_8x8_flat16_mmx @ 651
-	x264_dequant_8x8_flat16_sse2 @ 652
-	x264_dequant_8x8_mmx @ 653
-	x264_dequant_8x8_sse2 @ 654
-	x264_dequant_8x8_xop @ 655
-	x264_encoder_close @ 656
-	x264_encoder_delayed_frames @ 657
-	x264_encoder_encode @ 658
-	x264_encoder_headers @ 659
-	x264_encoder_intra_refresh @ 660
-	x264_encoder_invalidate_reference @ 661
-	x264_encoder_maximum_delayed_frames @ 662
-	x264_encoder_open_152 @ 663
-	x264_encoder_parameters @ 664
-	x264_encoder_reconfig @ 665
-	x264_encoder_reconfig_apply @ 666
-	x264_exp2_lut @ 667 DATA
-	x264_expand_border_mbpair @ 668
-	x264_field_vsad @ 669
-	x264_filler_write @ 670
-	x264_fopen @ 671
-	x264_frame_cond_broadcast @ 672
-	x264_frame_cond_wait @ 673
-	x264_frame_copy_picture @ 674
-	x264_frame_deblock_row @ 675
-	x264_frame_delete @ 676
-	x264_frame_delete_list @ 677
-	x264_frame_expand_border @ 678
-	x264_frame_expand_border_chroma @ 679
-	x264_frame_expand_border_filtered @ 680
-	x264_frame_expand_border_lowres @ 681
-	x264_frame_expand_border_mod16 @ 682
-	x264_frame_filter @ 683
-	x264_frame_init_lowres @ 684
-	x264_frame_init_lowres_core_avx @ 685
-	x264_frame_init_lowres_core_avx2 @ 686
-	x264_frame_init_lowres_core_cache32_mmx2 @ 687
-	x264_frame_init_lowres_core_mmx2 @ 688
-	x264_frame_init_lowres_core_sse2 @ 689
-	x264_frame_init_lowres_core_ssse3 @ 690
-	x264_frame_init_lowres_core_xop @ 691
-	x264_frame_new_slice @ 692
-	x264_frame_pop @ 693
-	x264_frame_pop_blank_unused @ 694
-	x264_frame_pop_unused @ 695
-	x264_frame_push @ 696
-	x264_frame_push_blank_unused @ 697
-	x264_frame_push_unused @ 698
-	x264_frame_shift @ 699
-	x264_frame_unshift @ 700
-	x264_free @ 701
-	x264_hadamard_ac_2x2max_mmx2 @ 702 DATA
-	x264_hadamard_ac_4x4_mmx2 @ 703 DATA
-	x264_hadamard_ac_8x8_avx @ 704 DATA
-	x264_hadamard_ac_8x8_avx2 @ 705 DATA
-	x264_hadamard_ac_8x8_mmx2 @ 706 DATA
-	x264_hadamard_ac_8x8_sse2 @ 707 DATA
-	x264_hadamard_ac_8x8_sse4 @ 708 DATA
-	x264_hadamard_ac_8x8_ssse3 @ 709 DATA
-	x264_hadamard_ac_8x8_ssse3_atom @ 710 DATA
-	x264_hadamard_ac_8x8_xop @ 711 DATA
-	x264_hadamard_load @ 712 DATA
-	x264_hpel_filter_c_avx @ 713
-	x264_hpel_filter_c_avx2 @ 714
-	x264_hpel_filter_c_mmx2 @ 715
-	x264_hpel_filter_c_sse2 @ 716
-	x264_hpel_filter_c_ssse3 @ 717
-	x264_hpel_filter_h_avx @ 718
-	x264_hpel_filter_h_avx2 @ 719
-	x264_hpel_filter_h_mmx2 @ 720
-	x264_hpel_filter_h_sse2 @ 721
-	x264_hpel_filter_h_ssse3 @ 722
-	x264_hpel_filter_v_avx @ 723
-	x264_hpel_filter_v_avx2 @ 724
-	x264_hpel_filter_v_mmx2 @ 725
-	x264_hpel_filter_v_sse2 @ 726
-	x264_hpel_filter_v_ssse3 @ 727
-	x264_hpel_ref0 @ 728 DATA
-	x264_hpel_ref1 @ 729 DATA
-	x264_hrd_fullness @ 730
-	x264_hsub_mul @ 731 DATA
-	x264_idct4x4dc_mmx @ 732
-	x264_idct8_mmx @ 733 DATA
-	x264_idct_dequant_2x4_dc_avx @ 734
-	x264_idct_dequant_2x4_dc_sse2 @ 735
-	x264_idct_dequant_2x4_dconly_avx @ 736
-	x264_idct_dequant_2x4_dconly_sse2 @ 737
-	x264_integral_init4h_avx2 @ 738
-	x264_integral_init4h_sse4 @ 739
-	x264_integral_init4v_avx2 @ 740
-	x264_integral_init4v_mmx @ 741
-	x264_integral_init4v_sse2 @ 742
-	x264_integral_init4v_ssse3 @ 743
-	x264_integral_init8h_avx @ 744
-	x264_integral_init8h_avx2 @ 745
-	x264_integral_init8h_sse4 @ 746
-	x264_integral_init8v_avx2 @ 747
-	x264_integral_init8v_mmx @ 748
-	x264_integral_init8v_sse2 @ 749
-	x264_intra_sa8d_x3_8x8 @ 750
-	x264_intra_sa8d_x3_8x8_mmx2 @ 751
-	x264_intra_sad_x3_16x16 @ 752
-	x264_intra_sad_x3_16x16_avx2 @ 753
-	x264_intra_sad_x3_16x16_mmx2 @ 754
-	x264_intra_sad_x3_16x16_sse2 @ 755
-	x264_intra_sad_x3_16x16_ssse3 @ 756
-	x264_intra_sad_x3_4x4 @ 757
-	x264_intra_sad_x3_4x4_mmx2 @ 758
-	x264_intra_sad_x3_8x16c @ 759
-	x264_intra_sad_x3_8x16c_mmx2 @ 760
-	x264_intra_sad_x3_8x16c_sse2 @ 761
-	x264_intra_sad_x3_8x8 @ 762
-	x264_intra_sad_x3_8x8_mmx2 @ 763
-	x264_intra_sad_x3_8x8c @ 764
-	x264_intra_sad_x3_8x8c_avx2 @ 765
-	x264_intra_sad_x3_8x8c_mmx2 @ 766
-	x264_intra_sad_x3_8x8c_ssse3 @ 767
-	x264_intra_sad_x9_4x4_avx @ 768
-	x264_intra_sad_x9_4x4_sse4 @ 769
-	x264_intra_sad_x9_4x4_ssse3 @ 770
-	x264_intra_sad_x9_8x8_avx @ 771
-	x264_intra_sad_x9_8x8_avx2 @ 772
-	x264_intra_sad_x9_8x8_sse4 @ 773
-	x264_intra_sad_x9_8x8_ssse3 @ 774
-	x264_intra_satd_x3_16x16 @ 775
-	x264_intra_satd_x3_16x16_mmx2 @ 776
-	x264_intra_satd_x3_16x16_ssse3 @ 777
-	x264_intra_satd_x3_4x4 @ 778
-	x264_intra_satd_x3_4x4_mmx2 @ 779
-	x264_intra_satd_x3_4x4_ssse3 @ 780 DATA
-	x264_intra_satd_x3_8x16c @ 781
-	x264_intra_satd_x3_8x16c_avx @ 782
-	x264_intra_satd_x3_8x16c_mmx2 @ 783
-	x264_intra_satd_x3_8x16c_sse2 @ 784
-	x264_intra_satd_x3_8x16c_sse4 @ 785
-	x264_intra_satd_x3_8x16c_ssse3 @ 786
-	x264_intra_satd_x3_8x16c_xop @ 787
-	x264_intra_satd_x3_8x8c @ 788
-	x264_intra_satd_x3_8x8c_mmx2 @ 789
-	x264_intra_satd_x3_8x8c_ssse3 @ 790
-	x264_intra_satd_x9_4x4_avx @ 791
-	x264_intra_satd_x9_4x4_sse4 @ 792
-	x264_intra_satd_x9_4x4_ssse3 @ 793
-	x264_intra_satd_x9_4x4_xop @ 794
-	x264_is_pipe @ 795
-	x264_iter_kludge @ 796 DATA
-	x264_lambda2_tab @ 797 DATA
-	x264_lambda_tab @ 798 DATA
-	x264_last_coeff_flag_offset @ 799 DATA
-	x264_last_coeff_flag_offset_8x8 @ 800 DATA
-	x264_level_token @ 801 DATA
-	x264_levels @ 802 DATA
-	x264_load_deinterleave_chroma_fdec_sse2 @ 803
-	x264_load_deinterleave_chroma_fdec_ssse3 @ 804
-	x264_load_deinterleave_chroma_fenc_avx2 @ 805
-	x264_load_deinterleave_chroma_fenc_sse2 @ 806
-	x264_load_deinterleave_chroma_fenc_ssse3 @ 807
-	x264_log @ 808
-	x264_log2_lut @ 809 DATA
-	x264_log2_lz_lut @ 810 DATA
-	x264_lookahead_delete @ 811
-	x264_lookahead_get_frames @ 812
-	x264_lookahead_init @ 813
-	x264_lookahead_is_empty @ 814
-	x264_lookahead_put_frame @ 815
-	x264_macroblock_analyse @ 816
-	x264_macroblock_bipred_init @ 817
-	x264_macroblock_cache_allocate @ 818
-	x264_macroblock_cache_free @ 819
-	x264_macroblock_cache_load_interlaced @ 820
-	x264_macroblock_cache_load_progressive @ 821
-	x264_macroblock_cache_save @ 822
-	x264_macroblock_deblock @ 823
-	x264_macroblock_deblock_strength @ 824
-	x264_macroblock_encode @ 825
-	x264_macroblock_encode_p4x4 @ 826
-	x264_macroblock_encode_p8x8 @ 827
-	x264_macroblock_probe_skip @ 828
-	x264_macroblock_slice_init @ 829
-	x264_macroblock_thread_allocate @ 830
-	x264_macroblock_thread_free @ 831
-	x264_macroblock_thread_init @ 832
-	x264_macroblock_tree_read @ 833
-	x264_macroblock_write_cabac @ 834
-	x264_macroblock_write_cavlc @ 835
-	x264_malloc @ 836
-	x264_mb_encode_chroma @ 837
-	x264_mb_mc @ 838
-	x264_mb_mc_8x8 @ 839
-	x264_mb_predict_mv @ 840
-	x264_mb_predict_mv_16x16 @ 841
-	x264_mb_predict_mv_direct16x16 @ 842
-	x264_mb_predict_mv_pskip @ 843
-	x264_mb_predict_mv_ref16x16 @ 844
-	x264_mbtree_fix8_pack_avx2 @ 845
-	x264_mbtree_fix8_pack_ssse3 @ 846
-	x264_mbtree_fix8_unpack_avx2 @ 847
-	x264_mbtree_fix8_unpack_ssse3 @ 848
-	x264_mbtree_propagate_cost_avx @ 849
-	x264_mbtree_propagate_cost_avx2 @ 850
-	x264_mbtree_propagate_cost_avx512 @ 851
-	x264_mbtree_propagate_cost_fma4 @ 852
-	x264_mbtree_propagate_cost_sse2 @ 853
-	x264_mbtree_propagate_list_internal_avx @ 854
-	x264_mbtree_propagate_list_internal_avx2 @ 855
-	x264_mbtree_propagate_list_internal_ssse3 @ 856
-	x264_mc_chroma_avx @ 857
-	x264_mc_chroma_avx2 @ 858
-	x264_mc_chroma_cache64_ssse3 @ 859
-	x264_mc_chroma_mmx2 @ 860
-	x264_mc_chroma_sse2 @ 861
-	x264_mc_chroma_ssse3 @ 862
-	x264_mc_copy_w16_aligned_sse @ 863
-	x264_mc_copy_w16_mmx @ 864
-	x264_mc_copy_w16_sse @ 865
-	x264_mc_copy_w4_mmx @ 866
-	x264_mc_copy_w8_mmx @ 867
-	x264_mc_init @ 868
-	x264_mc_init_mmx @ 869
-	x264_mc_offsetadd_w12_mmx2 @ 870
-	x264_mc_offsetadd_w12_sse2 @ 871 DATA
-	x264_mc_offsetadd_w16_mmx2 @ 872
-	x264_mc_offsetadd_w16_sse2 @ 873
-	x264_mc_offsetadd_w20_mmx2 @ 874
-	x264_mc_offsetadd_w20_sse2 @ 875
-	x264_mc_offsetadd_w4_mmx2 @ 876
-	x264_mc_offsetadd_w8_mmx2 @ 877
-	x264_mc_offsetsub_w12_mmx2 @ 878
-	x264_mc_offsetsub_w12_sse2 @ 879 DATA
-	x264_mc_offsetsub_w16_mmx2 @ 880
-	x264_mc_offsetsub_w16_sse2 @ 881
-	x264_mc_offsetsub_w20_mmx2 @ 882
-	x264_mc_offsetsub_w20_sse2 @ 883
-	x264_mc_offsetsub_w4_mmx2 @ 884
-	x264_mc_offsetsub_w8_mmx2 @ 885
-	x264_mc_weight_w12_mmx2 @ 886
-	x264_mc_weight_w16_avx2 @ 887
-	x264_mc_weight_w16_mmx2 @ 888
-	x264_mc_weight_w16_sse2 @ 889
-	x264_mc_weight_w16_ssse3 @ 890
-	x264_mc_weight_w20_avx2 @ 891
-	x264_mc_weight_w20_mmx2 @ 892
-	x264_mc_weight_w20_sse2 @ 893
-	x264_mc_weight_w20_ssse3 @ 894
-	x264_mc_weight_w4_mmx2 @ 895
-	x264_mc_weight_w4_ssse3 @ 896
-	x264_mc_weight_w8_avx2 @ 897
-	x264_mc_weight_w8_mmx2 @ 898
-	x264_mc_weight_w8_sse2 @ 899
-	x264_mc_weight_w8_ssse3 @ 900
-	x264_mdate @ 901
-	x264_me_refine_bidir_rd @ 902
-	x264_me_refine_bidir_satd @ 903
-	x264_me_refine_qpel @ 904
-	x264_me_refine_qpel_rd @ 905
-	x264_me_refine_qpel_refdupe @ 906
-	x264_me_search_ref @ 907
-	x264_memcpy_aligned_avx @ 908
-	x264_memcpy_aligned_avx512 @ 909
-	x264_memcpy_aligned_sse @ 910
-	x264_memzero_aligned_avx @ 911
-	x264_memzero_aligned_avx512 @ 912
-	x264_memzero_aligned_sse @ 913
-	x264_nal_encode @ 914
-	x264_nal_escape_mmx2 @ 915
-	x264_nal_escape_sse2 @ 916
-	x264_noise_reduction_update @ 917
-	x264_opencl_close_library @ 918
-	x264_opencl_finalize_cost @ 919
-	x264_opencl_flush @ 920
-	x264_opencl_frame_delete @ 921
-	x264_opencl_load_library @ 922
-	x264_opencl_lookahead_delete @ 923
-	x264_opencl_lookahead_init @ 924
-	x264_opencl_lowres_init @ 925
-	x264_opencl_motionsearch @ 926
-	x264_opencl_precalculate_frame_cost @ 927
-	x264_opencl_slicetype_end @ 928
-	x264_opencl_slicetype_prep @ 929
-	x264_optimize_chroma_2x2_dc_avx @ 930
-	x264_optimize_chroma_2x2_dc_sse2 @ 931
-	x264_optimize_chroma_2x2_dc_sse4 @ 932
-	x264_optimize_chroma_2x2_dc_ssse3 @ 933
-	x264_param2string @ 934
-	x264_param_apply_fastfirstpass @ 935
-	x264_param_apply_profile @ 936
-	x264_param_default @ 937
-	x264_param_default_preset @ 938
-	x264_param_parse @ 939
-	x264_pb_0 @ 940 DATA
-	x264_pb_01 @ 941 DATA
-	x264_pb_1 @ 942 DATA
-	x264_pb_3 @ 943 DATA
-	x264_pb_a1 @ 944 DATA
-	x264_pb_shuf8x8c @ 945 DATA
-	x264_pb_unpackbd1 @ 946 DATA
-	x264_pb_unpackbd2 @ 947 DATA
-	x264_pd_0123 @ 948 DATA
-	x264_pd_1 @ 949 DATA
-	x264_pd_1024 @ 950 DATA
-	x264_pd_32 @ 951 DATA
-	x264_pd_4567 @ 952 DATA
-	x264_pd_8 @ 953 DATA
-	x264_pd_ffff @ 954 DATA
-	x264_picture_alloc @ 955
-	x264_picture_clean @ 956
-	x264_picture_init @ 957
-	x264_pixel_ads1_avx @ 958
-	x264_pixel_ads1_avx2 @ 959
-	x264_pixel_ads1_mmx2 @ 960
-	x264_pixel_ads1_sse2 @ 961
-	x264_pixel_ads1_ssse3 @ 962
-	x264_pixel_ads2_avx @ 963
-	x264_pixel_ads2_avx2 @ 964
-	x264_pixel_ads2_mmx2 @ 965
-	x264_pixel_ads2_sse2 @ 966
-	x264_pixel_ads2_ssse3 @ 967
-	x264_pixel_ads4_avx @ 968
-	x264_pixel_ads4_avx2 @ 969
-	x264_pixel_ads4_mmx2 @ 970
-	x264_pixel_ads4_sse2 @ 971
-	x264_pixel_ads4_ssse3 @ 972
-	x264_pixel_ads_mvs_mmx @ 973 DATA
-	x264_pixel_ads_mvs_ssse3 @ 974 DATA
-	x264_pixel_asd8_sse2 @ 975
-	x264_pixel_asd8_ssse3 @ 976
-	x264_pixel_avg2_w12_cache32_mmx2 @ 977
-	x264_pixel_avg2_w12_cache64_mmx2 @ 978
-	x264_pixel_avg2_w12_mmx2 @ 979
-	x264_pixel_avg2_w16_cache32_mmx2 @ 980
-	x264_pixel_avg2_w16_cache64_mmx2 @ 981
-	x264_pixel_avg2_w16_cache64_sse2 @ 982
-	x264_pixel_avg2_w16_cache64_ssse3 @ 983
-	x264_pixel_avg2_w16_mmx2 @ 984
-	x264_pixel_avg2_w16_sse2 @ 985
-	x264_pixel_avg2_w20_avx2 @ 986
-	x264_pixel_avg2_w20_cache32_mmx2 @ 987
-	x264_pixel_avg2_w20_cache64_mmx2 @ 988
-	x264_pixel_avg2_w20_cache64_sse2 @ 989
-	x264_pixel_avg2_w20_mmx2 @ 990
-	x264_pixel_avg2_w20_sse2 @ 991
-	x264_pixel_avg2_w4_mmx2 @ 992
-	x264_pixel_avg2_w8_cache32_mmx2 @ 993
-	x264_pixel_avg2_w8_cache64_mmx2 @ 994
-	x264_pixel_avg2_w8_mmx2 @ 995
-	x264_pixel_avg_16x16_avx2 @ 996
-	x264_pixel_avg_16x16_avx512 @ 997
-	x264_pixel_avg_16x16_mmx2 @ 998
-	x264_pixel_avg_16x16_sse2 @ 999
-	x264_pixel_avg_16x16_ssse3 @ 1000
-	x264_pixel_avg_16x8_avx2 @ 1001
-	x264_pixel_avg_16x8_avx512 @ 1002
-	x264_pixel_avg_16x8_mmx2 @ 1003
-	x264_pixel_avg_16x8_sse2 @ 1004
-	x264_pixel_avg_16x8_ssse3 @ 1005
-	x264_pixel_avg_4x16_mmx2 @ 1006
-	x264_pixel_avg_4x16_ssse3 @ 1007
-	x264_pixel_avg_4x2_mmx2 @ 1008
-	x264_pixel_avg_4x2_ssse3 @ 1009
-	x264_pixel_avg_4x4_mmx2 @ 1010
-	x264_pixel_avg_4x4_ssse3 @ 1011
-	x264_pixel_avg_4x8_mmx2 @ 1012
-	x264_pixel_avg_4x8_ssse3 @ 1013
-	x264_pixel_avg_8x16_avx512 @ 1014
-	x264_pixel_avg_8x16_mmx2 @ 1015
-	x264_pixel_avg_8x16_sse2 @ 1016
-	x264_pixel_avg_8x16_ssse3 @ 1017
-	x264_pixel_avg_8x4_avx512 @ 1018
-	x264_pixel_avg_8x4_mmx2 @ 1019
-	x264_pixel_avg_8x4_sse2 @ 1020
-	x264_pixel_avg_8x4_ssse3 @ 1021
-	x264_pixel_avg_8x8_avx512 @ 1022
-	x264_pixel_avg_8x8_mmx2 @ 1023
-	x264_pixel_avg_8x8_sse2 @ 1024
-	x264_pixel_avg_8x8_ssse3 @ 1025
-	x264_pixel_avg_w16_avx2 @ 1026 DATA
-	x264_pixel_avg_w16_mmx2 @ 1027 DATA
-	x264_pixel_avg_w16_sse2 @ 1028 DATA
-	x264_pixel_avg_w4_mmx2 @ 1029 DATA
-	x264_pixel_avg_w8_mmx2 @ 1030 DATA
-	x264_pixel_avg_weight_w16_avx2 @ 1031 DATA
-	x264_pixel_avg_weight_w16_avx512 @ 1032 DATA
-	x264_pixel_avg_weight_w16_mmx2 @ 1033 DATA
-	x264_pixel_avg_weight_w16_sse2 @ 1034 DATA
-	x264_pixel_avg_weight_w16_ssse3 @ 1035 DATA
-	x264_pixel_avg_weight_w4_mmx2 @ 1036 DATA
-	x264_pixel_avg_weight_w4_ssse3 @ 1037 DATA
-	x264_pixel_avg_weight_w8_avx512 @ 1038 DATA
-	x264_pixel_avg_weight_w8_mmx2 @ 1039 DATA
-	x264_pixel_avg_weight_w8_sse2 @ 1040 DATA
-	x264_pixel_avg_weight_w8_ssse3 @ 1041 DATA
-	x264_pixel_hadamard_ac_16x16_avx @ 1042
-	x264_pixel_hadamard_ac_16x16_avx2 @ 1043
-	x264_pixel_hadamard_ac_16x16_mmx2 @ 1044
-	x264_pixel_hadamard_ac_16x16_sse2 @ 1045
-	x264_pixel_hadamard_ac_16x16_sse4 @ 1046
-	x264_pixel_hadamard_ac_16x16_ssse3 @ 1047
-	x264_pixel_hadamard_ac_16x16_ssse3_atom @ 1048
-	x264_pixel_hadamard_ac_16x16_xop @ 1049
-	x264_pixel_hadamard_ac_16x8_avx @ 1050
-	x264_pixel_hadamard_ac_16x8_avx2 @ 1051
-	x264_pixel_hadamard_ac_16x8_mmx2 @ 1052
-	x264_pixel_hadamard_ac_16x8_sse2 @ 1053
-	x264_pixel_hadamard_ac_16x8_sse4 @ 1054
-	x264_pixel_hadamard_ac_16x8_ssse3 @ 1055
-	x264_pixel_hadamard_ac_16x8_ssse3_atom @ 1056
-	x264_pixel_hadamard_ac_16x8_xop @ 1057
-	x264_pixel_hadamard_ac_8x16_avx @ 1058
-	x264_pixel_hadamard_ac_8x16_mmx2 @ 1059
-	x264_pixel_hadamard_ac_8x16_sse2 @ 1060
-	x264_pixel_hadamard_ac_8x16_sse4 @ 1061
-	x264_pixel_hadamard_ac_8x16_ssse3 @ 1062
-	x264_pixel_hadamard_ac_8x16_ssse3_atom @ 1063
-	x264_pixel_hadamard_ac_8x16_xop @ 1064
-	x264_pixel_hadamard_ac_8x8_avx @ 1065
-	x264_pixel_hadamard_ac_8x8_mmx2 @ 1066
-	x264_pixel_hadamard_ac_8x8_sse2 @ 1067
-	x264_pixel_hadamard_ac_8x8_sse4 @ 1068
-	x264_pixel_hadamard_ac_8x8_ssse3 @ 1069
-	x264_pixel_hadamard_ac_8x8_ssse3_atom @ 1070
-	x264_pixel_hadamard_ac_8x8_xop @ 1071
-	x264_pixel_init @ 1072
-	x264_pixel_sa8d_16x16_avx @ 1073
-	x264_pixel_sa8d_16x16_mmx2 @ 1074
-	x264_pixel_sa8d_16x16_sse2 @ 1075
-	x264_pixel_sa8d_16x16_sse4 @ 1076
-	x264_pixel_sa8d_16x16_ssse3 @ 1077
-	x264_pixel_sa8d_16x16_ssse3_atom @ 1078
-	x264_pixel_sa8d_16x16_xop @ 1079
-	x264_pixel_sa8d_8x8_avx @ 1080
-	x264_pixel_sa8d_8x8_avx2 @ 1081
-	x264_pixel_sa8d_8x8_avx512 @ 1082
-	x264_pixel_sa8d_8x8_internal_avx @ 1083 DATA
-	x264_pixel_sa8d_8x8_internal_avx2 @ 1084 DATA
-	x264_pixel_sa8d_8x8_internal_mmx2 @ 1085 DATA
-	x264_pixel_sa8d_8x8_internal_sse2 @ 1086 DATA
-	x264_pixel_sa8d_8x8_internal_sse4 @ 1087 DATA
-	x264_pixel_sa8d_8x8_internal_ssse3 @ 1088 DATA
-	x264_pixel_sa8d_8x8_internal_ssse3_atom @ 1089 DATA
-	x264_pixel_sa8d_8x8_internal_xop @ 1090 DATA
-	x264_pixel_sa8d_8x8_mmx2 @ 1091
-	x264_pixel_sa8d_8x8_sse2 @ 1092
-	x264_pixel_sa8d_8x8_sse4 @ 1093
-	x264_pixel_sa8d_8x8_ssse3 @ 1094
-	x264_pixel_sa8d_8x8_ssse3_atom @ 1095
-	x264_pixel_sa8d_8x8_xop @ 1096
-	x264_pixel_sad_16x16_avx512 @ 1097
-	x264_pixel_sad_16x16_cache32_mmx2 @ 1098
-	x264_pixel_sad_16x16_cache64_mmx2 @ 1099
-	x264_pixel_sad_16x16_cache64_sse2 @ 1100
-	x264_pixel_sad_16x16_cache64_ssse3 @ 1101
-	x264_pixel_sad_16x16_mmx2 @ 1102
-	x264_pixel_sad_16x16_sse2 @ 1103
-	x264_pixel_sad_16x16_sse2_aligned @ 1104
-	x264_pixel_sad_16x16_sse3 @ 1105
-	x264_pixel_sad_16x8_avx512 @ 1106
-	x264_pixel_sad_16x8_cache32_mmx2 @ 1107
-	x264_pixel_sad_16x8_cache64_mmx2 @ 1108
-	x264_pixel_sad_16x8_cache64_sse2 @ 1109
-	x264_pixel_sad_16x8_cache64_ssse3 @ 1110
-	x264_pixel_sad_16x8_mmx2 @ 1111
-	x264_pixel_sad_16x8_sse2 @ 1112
-	x264_pixel_sad_16x8_sse2_aligned @ 1113
-	x264_pixel_sad_16x8_sse3 @ 1114
-	x264_pixel_sad_4x16_avx512 @ 1115
-	x264_pixel_sad_4x16_mmx2 @ 1116
-	x264_pixel_sad_4x4_avx512 @ 1117
-	x264_pixel_sad_4x4_mmx2 @ 1118
-	x264_pixel_sad_4x8_avx512 @ 1119
-	x264_pixel_sad_4x8_mmx2 @ 1120
-	x264_pixel_sad_8x16_avx512 @ 1121
-	x264_pixel_sad_8x16_cache32_mmx2 @ 1122
-	x264_pixel_sad_8x16_cache64_mmx2 @ 1123
-	x264_pixel_sad_8x16_mmx2 @ 1124
-	x264_pixel_sad_8x16_sse2 @ 1125
-	x264_pixel_sad_8x4_avx512 @ 1126
-	x264_pixel_sad_8x4_cache32_mmx2 @ 1127
-	x264_pixel_sad_8x4_cache64_mmx2 @ 1128
-	x264_pixel_sad_8x4_mmx2 @ 1129
-	x264_pixel_sad_8x8_avx512 @ 1130
-	x264_pixel_sad_8x8_cache32_mmx2 @ 1131
-	x264_pixel_sad_8x8_cache64_mmx2 @ 1132
-	x264_pixel_sad_8x8_mmx2 @ 1133
-	x264_pixel_sad_x3_16x16_avx @ 1134
-	x264_pixel_sad_x3_16x16_avx2 @ 1135
-	x264_pixel_sad_x3_16x16_avx512 @ 1136
-	x264_pixel_sad_x3_16x16_cache32_mmx2 @ 1137
-	x264_pixel_sad_x3_16x16_cache64_mmx2 @ 1138
-	x264_pixel_sad_x3_16x16_cache64_sse2 @ 1139
-	x264_pixel_sad_x3_16x16_cache64_ssse3 @ 1140
-	x264_pixel_sad_x3_16x16_mmx2 @ 1141
-	x264_pixel_sad_x3_16x16_sse2 @ 1142
-	x264_pixel_sad_x3_16x16_sse3 @ 1143
-	x264_pixel_sad_x3_16x16_ssse3 @ 1144
-	x264_pixel_sad_x3_16x8_avx @ 1145
-	x264_pixel_sad_x3_16x8_avx2 @ 1146
-	x264_pixel_sad_x3_16x8_avx512 @ 1147
-	x264_pixel_sad_x3_16x8_cache32_mmx2 @ 1148
-	x264_pixel_sad_x3_16x8_cache64_mmx2 @ 1149
-	x264_pixel_sad_x3_16x8_cache64_sse2 @ 1150
-	x264_pixel_sad_x3_16x8_cache64_ssse3 @ 1151
-	x264_pixel_sad_x3_16x8_mmx2 @ 1152
-	x264_pixel_sad_x3_16x8_sse2 @ 1153
-	x264_pixel_sad_x3_16x8_sse3 @ 1154
-	x264_pixel_sad_x3_16x8_ssse3 @ 1155
-	x264_pixel_sad_x3_4x4_avx512 @ 1156
-	x264_pixel_sad_x3_4x4_mmx2 @ 1157
-	x264_pixel_sad_x3_4x8_avx512 @ 1158
-	x264_pixel_sad_x3_4x8_mmx2 @ 1159
-	x264_pixel_sad_x3_8x16_avx512 @ 1160
-	x264_pixel_sad_x3_8x16_cache32_mmx2 @ 1161
-	x264_pixel_sad_x3_8x16_cache64_mmx2 @ 1162
-	x264_pixel_sad_x3_8x16_cache64_sse2 @ 1163
-	x264_pixel_sad_x3_8x16_mmx2 @ 1164
-	x264_pixel_sad_x3_8x16_sse2 @ 1165
-	x264_pixel_sad_x3_8x4_avx512 @ 1166
-	x264_pixel_sad_x3_8x4_mmx2 @ 1167
-	x264_pixel_sad_x3_8x4_sse2 @ 1168
-	x264_pixel_sad_x3_8x8_avx512 @ 1169
-	x264_pixel_sad_x3_8x8_cache32_mmx2 @ 1170
-	x264_pixel_sad_x3_8x8_cache64_mmx2 @ 1171
-	x264_pixel_sad_x3_8x8_mmx2 @ 1172
-	x264_pixel_sad_x3_8x8_sse2 @ 1173
-	x264_pixel_sad_x4_16x16_avx @ 1174
-	x264_pixel_sad_x4_16x16_avx2 @ 1175
-	x264_pixel_sad_x4_16x16_avx512 @ 1176
-	x264_pixel_sad_x4_16x16_cache32_mmx2 @ 1177
-	x264_pixel_sad_x4_16x16_cache64_mmx2 @ 1178
-	x264_pixel_sad_x4_16x16_cache64_sse2 @ 1179
-	x264_pixel_sad_x4_16x16_cache64_ssse3 @ 1180
-	x264_pixel_sad_x4_16x16_mmx2 @ 1181
-	x264_pixel_sad_x4_16x16_sse2 @ 1182
-	x264_pixel_sad_x4_16x16_sse3 @ 1183
-	x264_pixel_sad_x4_16x16_ssse3 @ 1184
-	x264_pixel_sad_x4_16x8_avx @ 1185
-	x264_pixel_sad_x4_16x8_avx2 @ 1186
-	x264_pixel_sad_x4_16x8_avx512 @ 1187
-	x264_pixel_sad_x4_16x8_cache32_mmx2 @ 1188
-	x264_pixel_sad_x4_16x8_cache64_mmx2 @ 1189
-	x264_pixel_sad_x4_16x8_cache64_sse2 @ 1190
-	x264_pixel_sad_x4_16x8_cache64_ssse3 @ 1191
-	x264_pixel_sad_x4_16x8_mmx2 @ 1192
-	x264_pixel_sad_x4_16x8_sse2 @ 1193
-	x264_pixel_sad_x4_16x8_sse3 @ 1194
-	x264_pixel_sad_x4_16x8_ssse3 @ 1195
-	x264_pixel_sad_x4_4x4_avx512 @ 1196
-	x264_pixel_sad_x4_4x4_mmx2 @ 1197
-	x264_pixel_sad_x4_4x8_avx512 @ 1198
-	x264_pixel_sad_x4_4x8_mmx2 @ 1199
-	x264_pixel_sad_x4_8x16_avx512 @ 1200
-	x264_pixel_sad_x4_8x16_cache32_mmx2 @ 1201
-	x264_pixel_sad_x4_8x16_cache64_mmx2 @ 1202
-	x264_pixel_sad_x4_8x16_cache64_sse2 @ 1203
-	x264_pixel_sad_x4_8x16_mmx2 @ 1204
-	x264_pixel_sad_x4_8x16_sse2 @ 1205
-	x264_pixel_sad_x4_8x16_ssse3 @ 1206
-	x264_pixel_sad_x4_8x4_avx512 @ 1207
-	x264_pixel_sad_x4_8x4_mmx2 @ 1208
-	x264_pixel_sad_x4_8x4_sse2 @ 1209
-	x264_pixel_sad_x4_8x4_ssse3 @ 1210
-	x264_pixel_sad_x4_8x8_avx512 @ 1211
-	x264_pixel_sad_x4_8x8_cache32_mmx2 @ 1212
-	x264_pixel_sad_x4_8x8_cache64_mmx2 @ 1213
-	x264_pixel_sad_x4_8x8_mmx2 @ 1214
-	x264_pixel_sad_x4_8x8_sse2 @ 1215
-	x264_pixel_sad_x4_8x8_ssse3 @ 1216
-	x264_pixel_satd_16x16_avx @ 1217
-	x264_pixel_satd_16x16_avx2 @ 1218
-	x264_pixel_satd_16x16_avx512 @ 1219
-	x264_pixel_satd_16x16_mmx2 @ 1220
-	x264_pixel_satd_16x16_sse2 @ 1221
-	x264_pixel_satd_16x16_sse4 @ 1222
-	x264_pixel_satd_16x16_ssse3 @ 1223
-	x264_pixel_satd_16x16_ssse3_atom @ 1224
-	x264_pixel_satd_16x16_xop @ 1225
-	x264_pixel_satd_16x4_internal_mmx2 @ 1226 DATA
-	x264_pixel_satd_16x8_avx @ 1227
-	x264_pixel_satd_16x8_avx2 @ 1228
-	x264_pixel_satd_16x8_avx512 @ 1229
-	x264_pixel_satd_16x8_internal_avx2 @ 1230 DATA
-	x264_pixel_satd_16x8_internal_avx512 @ 1231 DATA
-	x264_pixel_satd_16x8_mmx2 @ 1232
-	x264_pixel_satd_16x8_sse2 @ 1233
-	x264_pixel_satd_16x8_sse4 @ 1234
-	x264_pixel_satd_16x8_ssse3 @ 1235
-	x264_pixel_satd_16x8_ssse3_atom @ 1236
-	x264_pixel_satd_16x8_xop @ 1237
-	x264_pixel_satd_4x16_avx @ 1238
-	x264_pixel_satd_4x16_avx512 @ 1239
-	x264_pixel_satd_4x16_mmx2 @ 1240
-	x264_pixel_satd_4x16_sse2 @ 1241
-	x264_pixel_satd_4x16_sse4 @ 1242
-	x264_pixel_satd_4x16_ssse3 @ 1243
-	x264_pixel_satd_4x16_ssse3_atom @ 1244
-	x264_pixel_satd_4x16_xop @ 1245 DATA
-	x264_pixel_satd_4x4_avx @ 1246
-	x264_pixel_satd_4x4_avx512 @ 1247
-	x264_pixel_satd_4x4_mmx2 @ 1248
-	x264_pixel_satd_4x4_sse4 @ 1249
-	x264_pixel_satd_4x4_ssse3 @ 1250
-	x264_pixel_satd_4x4_xop @ 1251
-	x264_pixel_satd_4x8_avx @ 1252
-	x264_pixel_satd_4x8_avx512 @ 1253
-	x264_pixel_satd_4x8_internal_avx512 @ 1254 DATA
-	x264_pixel_satd_4x8_mmx2 @ 1255
-	x264_pixel_satd_4x8_sse2 @ 1256
-	x264_pixel_satd_4x8_sse4 @ 1257
-	x264_pixel_satd_4x8_ssse3 @ 1258
-	x264_pixel_satd_4x8_ssse3_atom @ 1259
-	x264_pixel_satd_4x8_xop @ 1260
-	x264_pixel_satd_8x16_avx @ 1261
-	x264_pixel_satd_8x16_avx2 @ 1262
-	x264_pixel_satd_8x16_avx512 @ 1263
-	x264_pixel_satd_8x16_mmx2 @ 1264
-	x264_pixel_satd_8x16_sse2 @ 1265
-	x264_pixel_satd_8x16_sse4 @ 1266
-	x264_pixel_satd_8x16_ssse3 @ 1267
-	x264_pixel_satd_8x16_ssse3_atom @ 1268
-	x264_pixel_satd_8x16_xop @ 1269
-	x264_pixel_satd_8x4_avx @ 1270
-	x264_pixel_satd_8x4_avx512 @ 1271
-	x264_pixel_satd_8x4_mmx2 @ 1272
-	x264_pixel_satd_8x4_sse2 @ 1273
-	x264_pixel_satd_8x4_sse4 @ 1274
-	x264_pixel_satd_8x4_ssse3 @ 1275
-	x264_pixel_satd_8x4_ssse3_atom @ 1276
-	x264_pixel_satd_8x4_xop @ 1277
-	x264_pixel_satd_8x8_avx @ 1278
-	x264_pixel_satd_8x8_avx2 @ 1279
-	x264_pixel_satd_8x8_avx512 @ 1280
-	x264_pixel_satd_8x8_internal_avx @ 1281 DATA
-	x264_pixel_satd_8x8_internal_avx2 @ 1282 DATA
-	x264_pixel_satd_8x8_internal_avx512 @ 1283 DATA
-	x264_pixel_satd_8x8_internal_mmx2 @ 1284 DATA
-	x264_pixel_satd_8x8_internal_sse2 @ 1285 DATA
-	x264_pixel_satd_8x8_internal_sse4 @ 1286 DATA
-	x264_pixel_satd_8x8_internal_ssse3 @ 1287 DATA
-	x264_pixel_satd_8x8_internal_ssse3_atom @ 1288 DATA
-	x264_pixel_satd_8x8_internal_xop @ 1289 DATA
-	x264_pixel_satd_8x8_mmx2 @ 1290
-	x264_pixel_satd_8x8_sse2 @ 1291
-	x264_pixel_satd_8x8_sse4 @ 1292
-	x264_pixel_satd_8x8_ssse3 @ 1293
-	x264_pixel_satd_8x8_ssse3_atom @ 1294
-	x264_pixel_satd_8x8_xop @ 1295
-	x264_pixel_ssd_16x16_avx @ 1296
-	x264_pixel_ssd_16x16_avx2 @ 1297
-	x264_pixel_ssd_16x16_mmx @ 1298
-	x264_pixel_ssd_16x16_sse2 @ 1299
-	x264_pixel_ssd_16x16_sse2slow @ 1300
-	x264_pixel_ssd_16x16_ssse3 @ 1301
-	x264_pixel_ssd_16x16_xop @ 1302
-	x264_pixel_ssd_16x8_avx @ 1303
-	x264_pixel_ssd_16x8_avx2 @ 1304
-	x264_pixel_ssd_16x8_mmx @ 1305
-	x264_pixel_ssd_16x8_sse2 @ 1306
-	x264_pixel_ssd_16x8_sse2slow @ 1307
-	x264_pixel_ssd_16x8_ssse3 @ 1308
-	x264_pixel_ssd_16x8_xop @ 1309
-	x264_pixel_ssd_4x16_mmx @ 1310
-	x264_pixel_ssd_4x16_ssse3 @ 1311
-	x264_pixel_ssd_4x4_mmx @ 1312
-	x264_pixel_ssd_4x4_ssse3 @ 1313
-	x264_pixel_ssd_4x8_mmx @ 1314
-	x264_pixel_ssd_4x8_ssse3 @ 1315
-	x264_pixel_ssd_8x16_avx @ 1316
-	x264_pixel_ssd_8x16_mmx @ 1317
-	x264_pixel_ssd_8x16_sse2 @ 1318
-	x264_pixel_ssd_8x16_sse2slow @ 1319
-	x264_pixel_ssd_8x16_ssse3 @ 1320
-	x264_pixel_ssd_8x16_xop @ 1321
-	x264_pixel_ssd_8x4_avx @ 1322
-	x264_pixel_ssd_8x4_mmx @ 1323
-	x264_pixel_ssd_8x4_sse2 @ 1324
-	x264_pixel_ssd_8x4_sse2slow @ 1325
-	x264_pixel_ssd_8x4_ssse3 @ 1326
-	x264_pixel_ssd_8x4_xop @ 1327
-	x264_pixel_ssd_8x8_avx @ 1328
-	x264_pixel_ssd_8x8_mmx @ 1329
-	x264_pixel_ssd_8x8_sse2 @ 1330
-	x264_pixel_ssd_8x8_sse2slow @ 1331
-	x264_pixel_ssd_8x8_ssse3 @ 1332
-	x264_pixel_ssd_8x8_xop @ 1333
-	x264_pixel_ssd_nv12 @ 1334
-	x264_pixel_ssd_nv12_core_avx @ 1335
-	x264_pixel_ssd_nv12_core_avx2 @ 1336
-	x264_pixel_ssd_nv12_core_sse2 @ 1337
-	x264_pixel_ssd_nv12_core_xop @ 1338
-	x264_pixel_ssd_wxh @ 1339
-	x264_pixel_ssim_4x4x2_core_avx @ 1340
-	x264_pixel_ssim_4x4x2_core_mmx2 @ 1341
-	x264_pixel_ssim_4x4x2_core_sse2 @ 1342
-	x264_pixel_ssim_end4_avx @ 1343
-	x264_pixel_ssim_end4_sse2 @ 1344
-	x264_pixel_ssim_wxh @ 1345
-	x264_pixel_var2_8x16_avx2 @ 1346
-	x264_pixel_var2_8x16_avx512 @ 1347
-	x264_pixel_var2_8x16_sse2 @ 1348
-	x264_pixel_var2_8x16_ssse3 @ 1349
-	x264_pixel_var2_8x8_avx2 @ 1350
-	x264_pixel_var2_8x8_avx512 @ 1351
-	x264_pixel_var2_8x8_sse2 @ 1352
-	x264_pixel_var2_8x8_ssse3 @ 1353
-	x264_pixel_var2_internal_ssse3 @ 1354 DATA
-	x264_pixel_var_16x16_avx @ 1355
-	x264_pixel_var_16x16_avx2 @ 1356
-	x264_pixel_var_16x16_avx512 @ 1357
-	x264_pixel_var_16x16_sse2 @ 1358
-	x264_pixel_var_8x16_avx @ 1359
-	x264_pixel_var_8x16_avx512 @ 1360
-	x264_pixel_var_8x16_sse2 @ 1361
-	x264_pixel_var_8x8_avx @ 1362
-	x264_pixel_var_8x8_avx512 @ 1363
-	x264_pixel_var_8x8_sse2 @ 1364
-	x264_pixel_vsad_mmx2 @ 1365
-	x264_pixel_vsad_sse2 @ 1366
-	x264_plane_copy_c @ 1367
-	x264_plane_copy_core_avx @ 1368
-	x264_plane_copy_core_sse @ 1369
-	x264_plane_copy_deinterleave_avx2 @ 1370
-	x264_plane_copy_deinterleave_c @ 1371
-	x264_plane_copy_deinterleave_rgb_avx2 @ 1372
-	x264_plane_copy_deinterleave_rgb_sse2 @ 1373
-	x264_plane_copy_deinterleave_rgb_ssse3 @ 1374
-	x264_plane_copy_deinterleave_sse2 @ 1375
-	x264_plane_copy_deinterleave_ssse3 @ 1376
-	x264_plane_copy_interleave_c @ 1377
-	x264_plane_copy_interleave_core_mmx2 @ 1378
-	x264_plane_copy_interleave_core_sse2 @ 1379
-	x264_plane_copy_swap_c @ 1380
-	x264_plane_copy_swap_core_avx2 @ 1381
-	x264_plane_copy_swap_core_ssse3 @ 1382
-	x264_popcnt_table @ 1383 DATA
-	x264_pps_init @ 1384
-	x264_pps_write @ 1385
-	x264_predict_16x16_dc_avx2 @ 1386
-	x264_predict_16x16_dc_c @ 1387
-	x264_predict_16x16_dc_left_avx2 @ 1388
-	x264_predict_16x16_dc_left_internal @ 1389 DATA
-	x264_predict_16x16_dc_left_sse2 @ 1390
-	x264_predict_16x16_dc_sse2 @ 1391
-	x264_predict_16x16_dc_top_avx2 @ 1392
-	x264_predict_16x16_dc_top_sse2 @ 1393
-	x264_predict_16x16_h_c @ 1394
-	x264_predict_16x16_h_mmx2 @ 1395
-	x264_predict_16x16_h_ssse3 @ 1396
-	x264_predict_16x16_init @ 1397
-	x264_predict_16x16_init_mmx @ 1398
-	x264_predict_16x16_p_c @ 1399
-	x264_predict_16x16_p_core_avx @ 1400
-	x264_predict_16x16_p_core_avx2 @ 1401
-	x264_predict_16x16_p_core_mmx2 @ 1402
-	x264_predict_16x16_p_core_sse2 @ 1403
-	x264_predict_16x16_v_c @ 1404
-	x264_predict_16x16_v_mmx2 @ 1405
-	x264_predict_16x16_v_sse @ 1406
-	x264_predict_4x4_dc_c @ 1407
-	x264_predict_4x4_dc_mmx2 @ 1408
-	x264_predict_4x4_ddl_mmx2 @ 1409
-	x264_predict_4x4_ddr_mmx2 @ 1410
-	x264_predict_4x4_ddr_ssse3 @ 1411
-	x264_predict_4x4_h_c @ 1412
-	x264_predict_4x4_hd_mmx2 @ 1413
-	x264_predict_4x4_hd_ssse3 @ 1414
-	x264_predict_4x4_hu_mmx2 @ 1415
-	x264_predict_4x4_init @ 1416
-	x264_predict_4x4_init_mmx @ 1417
-	x264_predict_4x4_v_c @ 1418
-	x264_predict_4x4_vl_mmx2 @ 1419
-	x264_predict_4x4_vr_cache64_ssse3 @ 1420
-	x264_predict_4x4_vr_mmx2 @ 1421
-	x264_predict_4x4_vr_ssse3 @ 1422
-	x264_predict_8x16c_dc_c @ 1423
-	x264_predict_8x16c_dc_mmx2 @ 1424
-	x264_predict_8x16c_dc_top_mmx2 @ 1425
-	x264_predict_8x16c_h_c @ 1426
-	x264_predict_8x16c_h_mmx2 @ 1427
-	x264_predict_8x16c_h_ssse3 @ 1428
-	x264_predict_8x16c_init @ 1429
-	x264_predict_8x16c_init_mmx @ 1430
-	x264_predict_8x16c_p_c @ 1431
-	x264_predict_8x16c_p_core_avx @ 1432
-	x264_predict_8x16c_p_core_avx2 @ 1433
-	x264_predict_8x16c_p_core_mmx2 @ 1434
-	x264_predict_8x16c_p_core_sse2 @ 1435
-	x264_predict_8x16c_v_c @ 1436
-	x264_predict_8x16c_v_mmx @ 1437
-	x264_predict_8x8_dc_c @ 1438
-	x264_predict_8x8_dc_left_mmx2 @ 1439
-	x264_predict_8x8_dc_mmx2 @ 1440
-	x264_predict_8x8_dc_top_mmx2 @ 1441
-	x264_predict_8x8_ddl_avx @ 1442
-	x264_predict_8x8_ddl_mmx2 @ 1443
-	x264_predict_8x8_ddl_sse2 @ 1444
-	x264_predict_8x8_ddl_ssse3 @ 1445
-	x264_predict_8x8_ddr_avx @ 1446
-	x264_predict_8x8_ddr_mmx2 @ 1447
-	x264_predict_8x8_ddr_sse2 @ 1448
-	x264_predict_8x8_filter_mmx2 @ 1449
-	x264_predict_8x8_filter_ssse3 @ 1450
-	x264_predict_8x8_h_c @ 1451
-	x264_predict_8x8_h_mmx2 @ 1452
-	x264_predict_8x8_hd_avx @ 1453
-	x264_predict_8x8_hd_mmx2 @ 1454
-	x264_predict_8x8_hd_sse2 @ 1455
-	x264_predict_8x8_hu_mmx2 @ 1456
-	x264_predict_8x8_hu_sse2 @ 1457
-	x264_predict_8x8_hu_ssse3 @ 1458
-	x264_predict_8x8_init @ 1459
-	x264_predict_8x8_init_mmx @ 1460
-	x264_predict_8x8_v_c @ 1461
-	x264_predict_8x8_v_mmx2 @ 1462
-	x264_predict_8x8_vl_avx @ 1463
-	x264_predict_8x8_vl_mmx2 @ 1464
-	x264_predict_8x8_vl_sse2 @ 1465
-	x264_predict_8x8_vr_avx @ 1466
-	x264_predict_8x8_vr_mmx2 @ 1467
-	x264_predict_8x8_vr_sse2 @ 1468
-	x264_predict_8x8_vr_ssse3 @ 1469
-	x264_predict_8x8c_dc_c @ 1470
-	x264_predict_8x8c_dc_mmx2 @ 1471
-	x264_predict_8x8c_dc_top_mmx2 @ 1472
-	x264_predict_8x8c_h_c @ 1473
-	x264_predict_8x8c_h_mmx2 @ 1474
-	x264_predict_8x8c_h_ssse3 @ 1475
-	x264_predict_8x8c_init @ 1476
-	x264_predict_8x8c_init_mmx @ 1477
-	x264_predict_8x8c_p_c @ 1478
-	x264_predict_8x8c_p_core_avx @ 1479
-	x264_predict_8x8c_p_core_avx2 @ 1480
-	x264_predict_8x8c_p_core_mmx2 @ 1481
-	x264_predict_8x8c_p_core_sse2 @ 1482
-	x264_predict_8x8c_v_c @ 1483
-	x264_predict_8x8c_v_mmx @ 1484
-	x264_predict_lossless_16x16 @ 1485
-	x264_predict_lossless_4x4 @ 1486
-	x264_predict_lossless_8x8 @ 1487
-	x264_predict_lossless_chroma @ 1488
-	x264_prefetch_fenc @ 1489
-	x264_prefetch_fenc_420_mmx2 @ 1490
-	x264_prefetch_fenc_422_mmx2 @ 1491
-	x264_prefetch_ref_mmx2 @ 1492
-	x264_pthread_cond_broadcast @ 1493
-	x264_pthread_cond_destroy @ 1494
-	x264_pthread_cond_init @ 1495
-	x264_pthread_cond_signal @ 1496
-	x264_pthread_cond_wait @ 1497
-	x264_pthread_create @ 1498
-	x264_pthread_join @ 1499
-	x264_pthread_mutex_destroy @ 1500
-	x264_pthread_mutex_init @ 1501
-	x264_pthread_mutex_lock @ 1502
-	x264_pthread_mutex_unlock @ 1503
-	x264_pthread_num_processors_np @ 1504
-	x264_pw_00ff @ 1505 DATA
-	x264_pw_0to15 @ 1506 DATA
-	x264_pw_1 @ 1507 DATA
-	x264_pw_16 @ 1508 DATA
-	x264_pw_2 @ 1509 DATA
-	x264_pw_256 @ 1510 DATA
-	x264_pw_32 @ 1511 DATA
-	x264_pw_32_0 @ 1512 DATA
-	x264_pw_3fff @ 1513 DATA
-	x264_pw_4 @ 1514 DATA
-	x264_pw_512 @ 1515 DATA
-	x264_pw_64 @ 1516 DATA
-	x264_pw_8 @ 1517 DATA
-	x264_pw_8000 @ 1518 DATA
-	x264_pw_ff00 @ 1519 DATA
-	x264_pw_m2 @ 1520 DATA
-	x264_pw_pixel_max @ 1521 DATA
-	x264_pw_pmmpzzzz @ 1522 DATA
-	x264_pw_pmpmpmpm @ 1523 DATA
-	x264_pw_ppmmppmm @ 1524 DATA
-	x264_pw_ppppmmmm @ 1525 DATA
-	x264_quant_2x2_dc_mmx2 @ 1526
-	x264_quant_2x2_dc_ssse3 @ 1527
-	x264_quant_4x4_avx2 @ 1528
-	x264_quant_4x4_dc_avx2 @ 1529
-	x264_quant_4x4_dc_mmx2 @ 1530
-	x264_quant_4x4_dc_sse2 @ 1531
-	x264_quant_4x4_dc_sse4 @ 1532
-	x264_quant_4x4_dc_ssse3 @ 1533
-	x264_quant_4x4_mmx2 @ 1534
-	x264_quant_4x4_sse2 @ 1535
-	x264_quant_4x4_sse4 @ 1536
-	x264_quant_4x4_ssse3 @ 1537
-	x264_quant_4x4_trellis @ 1538
-	x264_quant_4x4x4_avx2 @ 1539
-	x264_quant_4x4x4_sse2 @ 1540
-	x264_quant_4x4x4_ssse3 @ 1541
-	x264_quant_8x8_avx2 @ 1542
-	x264_quant_8x8_mmx2 @ 1543
-	x264_quant_8x8_sse2 @ 1544
-	x264_quant_8x8_sse4 @ 1545
-	x264_quant_8x8_ssse3 @ 1546
-	x264_quant_8x8_trellis @ 1547
-	x264_quant_chroma_dc_trellis @ 1548
-	x264_quant_init @ 1549
-	x264_quant_luma_dc_trellis @ 1550
-	x264_ratecontrol_delete @ 1551
-	x264_ratecontrol_end @ 1552
-	x264_ratecontrol_init_reconfigurable @ 1553
-	x264_ratecontrol_mb @ 1554
-	x264_ratecontrol_mb_qp @ 1555
-	x264_ratecontrol_new @ 1556
-	x264_ratecontrol_qp @ 1557
-	x264_ratecontrol_set_weights @ 1558
-	x264_ratecontrol_slice_type @ 1559
-	x264_ratecontrol_start @ 1560
-	x264_ratecontrol_summary @ 1561
-	x264_ratecontrol_zone_init @ 1562
-	x264_rc_analyse_slice @ 1563
-	x264_rd_cost_part @ 1564
-	x264_rdo_init @ 1565
-	x264_reduce_fraction @ 1566
-	x264_reduce_fraction64 @ 1567
-	x264_reference_build_list_optimal @ 1568
-	x264_rename @ 1569
-	x264_run_before @ 1570 DATA
-	x264_sei_avcintra_umid_write @ 1571
-	x264_sei_avcintra_vanc_write @ 1572
-	x264_sei_buffering_period_write @ 1573
-	x264_sei_dec_ref_pic_marking_write @ 1574
-	x264_sei_frame_packing_write @ 1575
-	x264_sei_pic_timing_write @ 1576
-	x264_sei_recovery_point_write @ 1577
-	x264_sei_version_write @ 1578
-	x264_sei_write @ 1579
-	x264_significant_coeff_flag_offset @ 1580 DATA
-	x264_significant_coeff_flag_offset_8x8 @ 1581 DATA
-	x264_slicetype_analyse @ 1582
-	x264_slicetype_decide @ 1583
-	x264_slurp_file @ 1584
-	x264_sps_init @ 1585
-	x264_sps_init_reconfigurable @ 1586
-	x264_sps_write @ 1587
-	x264_stack_align @ 1588
-	x264_stat @ 1589
-	x264_store_interleave_chroma_mmx2 @ 1590
-	x264_store_interleave_chroma_sse2 @ 1591
-	x264_sub16x16_dct8_avx @ 1592
-	x264_sub16x16_dct8_mmx @ 1593
-	x264_sub16x16_dct8_sse2 @ 1594
-	x264_sub16x16_dct8_ssse3 @ 1595
-	x264_sub16x16_dct_avx @ 1596
-	x264_sub16x16_dct_avx2 @ 1597
-	x264_sub16x16_dct_avx512 @ 1598
-	x264_sub16x16_dct_mmx @ 1599
-	x264_sub16x16_dct_sse2 @ 1600
-	x264_sub16x16_dct_ssse3 @ 1601
-	x264_sub16x16_dct_xop @ 1602
-	x264_sub4x4_dct_avx512 @ 1603
-	x264_sub4x4_dct_mmx @ 1604
-	x264_sub4x4_dct_ssse3 @ 1605
-	x264_sub8x16_dct_dc_avx512 @ 1606
-	x264_sub8x16_dct_dc_sse2 @ 1607
-	x264_sub8x16_dct_dc_ssse3 @ 1608
-	x264_sub8x8_dct8_avx @ 1609
-	"x264_sub8x8_dct8_avx.skip_prologue" @ 1610 DATA
-	x264_sub8x8_dct8_mmx @ 1611
-	"x264_sub8x8_dct8_mmx.skip_prologue" @ 1612 DATA
-	x264_sub8x8_dct8_sse2 @ 1613
-	"x264_sub8x8_dct8_sse2.skip_prologue" @ 1614 DATA
-	x264_sub8x8_dct8_ssse3 @ 1615
-	"x264_sub8x8_dct8_ssse3.skip_prologue" @ 1616 DATA
-	x264_sub8x8_dct8_xop @ 1617 DATA
-	"x264_sub8x8_dct8_xop.skip_prologue" @ 1618 DATA
-	x264_sub8x8_dct_avx @ 1619
-	"x264_sub8x8_dct_avx.skip_prologue" @ 1620 DATA
-	x264_sub8x8_dct_avx2 @ 1621
-	x264_sub8x8_dct_avx512 @ 1622
-	x264_sub8x8_dct_dc_avx512 @ 1623
-	x264_sub8x8_dct_dc_mmx2 @ 1624
-	x264_sub8x8_dct_dc_sse2 @ 1625
-	x264_sub8x8_dct_mmx @ 1626
-	x264_sub8x8_dct_sse2 @ 1627
-	"x264_sub8x8_dct_sse2.skip_prologue" @ 1628 DATA
-	x264_sub8x8_dct_ssse3 @ 1629
-	"x264_sub8x8_dct_ssse3.skip_prologue" @ 1630 DATA
-	x264_sub8x8_dct_xop @ 1631
-	"x264_sub8x8_dct_xop.skip_prologue" @ 1632 DATA
-	x264_sw_64 @ 1633 DATA
-	x264_sync_frame_list_delete @ 1634
-	x264_sync_frame_list_init @ 1635
-	x264_sync_frame_list_pop @ 1636
-	x264_sync_frame_list_push @ 1637
-	x264_thread_sync_ratecontrol @ 1638
-	x264_threading_init @ 1639
-	x264_threadpool_delete @ 1640
-	x264_threadpool_init @ 1641
-	x264_threadpool_run @ 1642
-	x264_threadpool_wait @ 1643
-	x264_threads_distribute_ratecontrol @ 1644
-	x264_threads_merge_ratecontrol @ 1645
-	x264_threadslice_cond_broadcast @ 1646
-	x264_threadslice_cond_wait @ 1647
-	x264_total_zeros @ 1648 DATA
-	x264_total_zeros_2x2_dc @ 1649 DATA
-	x264_total_zeros_2x4_dc @ 1650 DATA
-	x264_validate_levels @ 1651
-	x264_vfprintf @ 1652
-	x264_weight_none @ 1653 DATA
-	x264_weight_scale_plane @ 1654
-	x264_weights_analyse @ 1655
-	x264_win32_threading_destroy @ 1656
-	x264_win32_threading_init @ 1657
-	x264_zigzag_init @ 1658
-	x264_zigzag_interleave_8x8_cavlc_avx @ 1659
-	x264_zigzag_interleave_8x8_cavlc_avx2 @ 1660
-	x264_zigzag_interleave_8x8_cavlc_avx512 @ 1661
-	x264_zigzag_interleave_8x8_cavlc_mmx @ 1662
-	x264_zigzag_interleave_8x8_cavlc_sse2 @ 1663
-	x264_zigzag_scan_4x4_field_avx512 @ 1664
-	x264_zigzag_scan_4x4_field_sse @ 1665
-	x264_zigzag_scan_4x4_frame_avx @ 1666
-	x264_zigzag_scan_4x4_frame_avx512 @ 1667
-	x264_zigzag_scan_4x4_frame_mmx @ 1668
-	x264_zigzag_scan_4x4_frame_ssse3 @ 1669
-	x264_zigzag_scan_4x4_frame_xop @ 1670
-	x264_zigzag_scan_8x8_field_avx512 @ 1671
-	x264_zigzag_scan_8x8_field_mmx2 @ 1672
-	x264_zigzag_scan_8x8_field_xop @ 1673
-	x264_zigzag_scan_8x8_frame_avx512 @ 1674
-	x264_zigzag_scan_8x8_frame_mmx2 @ 1675
-	x264_zigzag_scan_8x8_frame_sse2 @ 1676
-	x264_zigzag_scan_8x8_frame_ssse3 @ 1677
-	x264_zigzag_scan_8x8_frame_xop @ 1678
-	x264_zigzag_sub_4x4_field_avx @ 1679
-	x264_zigzag_sub_4x4_field_ssse3 @ 1680
-	x264_zigzag_sub_4x4_frame_avx @ 1681
-	x264_zigzag_sub_4x4_frame_ssse3 @ 1682
-	x264_zigzag_sub_4x4ac_field_avx @ 1683 DATA
-	x264_zigzag_sub_4x4ac_field_ssse3 @ 1684
-	x264_zigzag_sub_4x4ac_frame_avx @ 1685 DATA
-	x264_zigzag_sub_4x4ac_frame_ssse3 @ 1686
diff --git a/dependencies2013/win32/bin/zlib.def b/dependencies2013/win32/bin/zlib.def
deleted file mode 100644
index a2188b00..00000000
--- a/dependencies2013/win32/bin/zlib.def
+++ /dev/null
@@ -1,94 +0,0 @@
-; zlib data compression library
-EXPORTS
-; basic functions
-    zlibVersion
-    deflate
-    deflateEnd
-    inflate
-    inflateEnd
-; advanced functions
-    deflateSetDictionary
-    deflateGetDictionary
-    deflateCopy
-    deflateReset
-    deflateParams
-    deflateTune
-    deflateBound
-    deflatePending
-    deflatePrime
-    deflateSetHeader
-    inflateSetDictionary
-    inflateGetDictionary
-    inflateSync
-    inflateCopy
-    inflateReset
-    inflateReset2
-    inflatePrime
-    inflateMark
-    inflateGetHeader
-    inflateBack
-    inflateBackEnd
-    zlibCompileFlags
-; utility functions
-    compress
-    compress2
-    compressBound
-    uncompress
-    uncompress2
-    gzopen
-    gzdopen
-    gzbuffer
-    gzsetparams
-    gzread
-    gzfread
-    gzwrite
-    gzfwrite
-    gzprintf
-    gzvprintf
-    gzputs
-    gzgets
-    gzputc
-    gzgetc
-    gzungetc
-    gzflush
-    gzseek
-    gzrewind
-    gztell
-    gzoffset
-    gzeof
-    gzdirect
-    gzclose
-    gzclose_r
-    gzclose_w
-    gzerror
-    gzclearerr
-; large file functions
-    gzopen64
-    gzseek64
-    gztell64
-    gzoffset64
-    adler32_combine64
-    crc32_combine64
-; checksum functions
-    adler32
-    adler32_z
-    crc32
-    crc32_z
-    adler32_combine
-    crc32_combine
-; various hacks, don't look :)
-    deflateInit_
-    deflateInit2_
-    inflateInit_
-    inflateInit2_
-    inflateBackInit_
-    gzgetc_
-    zError
-    inflateSyncPoint
-    get_crc_table
-    inflateUndermine
-    inflateValidate
-    inflateCodesUsed
-    inflateResetKeep
-    deflateResetKeep
-    gzopen_w
diff --git a/dependencies2013/win32/bin/zlib.dll b/dependencies2013/win32/bin/zlib.dll
deleted file mode 100644
index 39e58e5f..00000000
Binary files a/dependencies2013/win32/bin/zlib.dll and /dev/null differ
diff --git a/dependencies2013/win32/bin/zlib.lib b/dependencies2013/win32/bin/zlib.lib
deleted file mode 100644
index 5384b8c1..00000000
Binary files a/dependencies2013/win32/bin/zlib.lib and /dev/null differ
diff --git a/dependencies2013/win32/include/agora/AgoraBase.h b/dependencies2013/win32/include/agora/AgoraBase.h
deleted file mode 100644
index 8ed49c50..00000000
--- a/dependencies2013/win32/include/agora/AgoraBase.h
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-//  Agora Engine SDK
-//
-//  Created by Sting Feng in 2017-11.
-//  Copyright (c) 2017 Agora.io. All rights reserved.
-//
-
-#ifndef AGORA_BASE_H
-#define AGORA_BASE_H
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#define AGORA_CALL __cdecl
-#if defined(AGORARTC_EXPORT)
-#define AGORA_API extern "C" __declspec(dllexport)
-#else
-#define AGORA_API extern "C" __declspec(dllimport)
-#endif
-#elif defined(__APPLE__)
-#define AGORA_API __attribute__((visibility("default"))) extern "C"
-#define AGORA_CALL
-#elif defined(__ANDROID__) || defined(__linux__)
-#define AGORA_API extern "C" __attribute__((visibility("default")))
-#define AGORA_CALL
-#else
-#define AGORA_API extern "C"
-#define AGORA_CALL
-#endif
-
-namespace agora {
-namespace util {
-
-template<class T>
-class AutoPtr {
-    typedef T value_type;
-    typedef T* pointer_type;
-public:
-    AutoPtr(pointer_type p=0)
-        :ptr_(p)
-    {}
-    ~AutoPtr() {
-        if (ptr_)
-            ptr_->release();
-    }
-    operator bool() const { return ptr_ != (pointer_type)0; }
-    value_type& operator*() const {
-        return *get();
-    }
-
-    pointer_type operator->() const {
-        return get();
-    }
-
-    pointer_type get() const {
-        return ptr_;
-    }
-
-    pointer_type release() {
-        pointer_type tmp = ptr_;
-        ptr_ = 0;
-        return tmp;
-    }
-
-    void reset(pointer_type ptr = 0) {
-        if (ptr != ptr_ && ptr_)
-            ptr_->release();
-        ptr_ = ptr;
-    }
-    template<class C1, class C2>
-    bool queryInterface(C1* c, C2 iid) {
-        pointer_type p = NULL;
-        if (c && !c->queryInterface(iid, (void**)&p))
-        {
-            reset(p);
-        }
-        return p != NULL;
-	}
-private:
-    AutoPtr(const AutoPtr&);
-    AutoPtr& operator=(const AutoPtr&);
-private:
-    pointer_type ptr_;
-};
-class IString {
-public:
-    virtual bool empty() const = 0;
-    virtual const char* c_str() = 0;
-    virtual const char* data() = 0;
-    virtual size_t length() = 0;
-    virtual void release() = 0;
-};
-typedef AutoPtr<IString> AString;
-
-}//namespace util
-
-enum INTERFACE_ID_TYPE
-{
-    AGORA_IID_AUDIO_DEVICE_MANAGER = 1,
-    AGORA_IID_VIDEO_DEVICE_MANAGER = 2,
-    AGORA_IID_RTC_ENGINE_PARAMETER = 3,
-    AGORA_IID_MEDIA_ENGINE = 4,
-    AGORA_IID_SIGNALING_ENGINE = 8,
-};
-
-enum WARN_CODE_TYPE
-{
-    WARN_INVALID_VIEW = 8,
-    WARN_INIT_VIDEO = 16,
-    WARN_PENDING = 20,
-    WARN_NO_AVAILABLE_CHANNEL = 103,
-    WARN_LOOKUP_CHANNEL_TIMEOUT = 104,
-    WARN_LOOKUP_CHANNEL_REJECTED = 105,
-    WARN_OPEN_CHANNEL_TIMEOUT = 106,
-    WARN_OPEN_CHANNEL_REJECTED = 107,
-
-    // sdk: 100~1000
-    WARN_SWITCH_LIVE_VIDEO_TIMEOUT = 111,
-    WARN_SET_CLIENT_ROLE_TIMEOUT = 118,
-    WARN_OPEN_CHANNEL_INVALID_TICKET = 121,
-    WARN_OPEN_CHANNEL_TRY_NEXT_VOS = 122,
-    WARN_AUDIO_MIXING_OPEN_ERROR = 701,
-
-    WARN_ADM_RUNTIME_PLAYOUT_WARNING = 1014,
-    WARN_ADM_RUNTIME_RECORDING_WARNING = 1016,
-    WARN_ADM_RECORD_AUDIO_SILENCE = 1019,
-    WARN_ADM_PLAYOUT_MALFUNCTION = 1020,
-    WARN_ADM_RECORD_MALFUNCTION = 1021,
-    WARN_ADM_IOS_CATEGORY_NOT_PLAYANDRECORD = 1029,
-    WARN_ADM_IOS_SAMPLERATE_CHANGE = 1030,
-    WARN_ADM_RECORD_AUDIO_LOWLEVEL = 1031,
-    WARN_ADM_PLAYOUT_AUDIO_LOWLEVEL = 1032,
-    WARN_ADM_WINDOWS_NO_DATA_READY_EVENT = 1040,
-    WARN_APM_HOWLING = 1051,
-    WARN_ADM_GLITCH_STATE = 1052,
-    WARN_ADM_IMPROPER_SETTINGS = 1053,
-    WARN_ADM_WIN_CORE_NO_RECORDING_DEVICE = 1322,
-    WARN_ADM_WIN_CORE_NO_PLAYOUT_DEVICE = 1323,
-    WARN_ADM_WIN_CORE_IMPROPER_CAPTURE_RELEASE = 1324,
-};
-
-enum ERROR_CODE_TYPE
-{
-    ERR_OK = 0,
-    //1~1000
-    ERR_FAILED = 1,
-    ERR_INVALID_ARGUMENT = 2,
-    ERR_NOT_READY = 3,
-    ERR_NOT_SUPPORTED = 4,
-    ERR_REFUSED = 5,
-    ERR_BUFFER_TOO_SMALL = 6,
-    ERR_NOT_INITIALIZED = 7,
-    ERR_NO_PERMISSION = 9,
-    ERR_TIMEDOUT = 10,
-    ERR_CANCELED = 11,
-    ERR_TOO_OFTEN = 12,
-    ERR_BIND_SOCKET = 13,
-    ERR_NET_DOWN = 14,
-    ERR_NET_NOBUFS = 15,
-    ERR_JOIN_CHANNEL_REJECTED = 17,
-    ERR_LEAVE_CHANNEL_REJECTED = 18,
-    ERR_ALREADY_IN_USE = 19,
-    ERR_ABORTED = 20,
-    ERR_INIT_NET_ENGINE = 21,
-    ERR_RESOURCE_LIMITED = 22,
-    ERR_INVALID_APP_ID = 101,
-    ERR_INVALID_CHANNEL_NAME = 102,
-    ERR_TOKEN_EXPIRED = 109,
-    ERR_INVALID_TOKEN = 110,
-    ERR_CONNECTION_INTERRUPTED = 111, // only used in web sdk
-    ERR_CONNECTION_LOST = 112, // only used in web sdk
-
-    ERR_NOT_IN_CHANNEL = 113,
-    ERR_SIZE_TOO_LARGE = 114,
-    ERR_BITRATE_LIMIT = 115,
-    ERR_TOO_MANY_DATA_STREAMS = 116,
-    ERR_STREAM_MESSAGE_TIMEOUT = 117,
-    ERR_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
-    ERR_DECRYPTION_FAILED = 120,
-    ERR_CLIENT_IS_BANNED_BY_SERVER = 123,
-    
-    ERR_WATERMARK_PARAM = 124,
-    ERR_WATERMARK_PATH = 125,
-    ERR_WATERMARK_PNG = 126,
-    ERR_WATERMARKR_INFO = 127,
-    ERR_WATERMARK_ARGB = 128,
-    ERR_WATERMARK_READ = 129,
-
-    ERR_ENCRYPTED_STREAM_NOT_ALLOWED_PUBLISH = 130,
-
-    //signaling: 400~600
-    ERR_LOGOUT_OTHER = 400,  //
-    ERR_LOGOUT_USER = 401,  // logout by user
-    ERR_LOGOUT_NET = 402,  // network failure
-    ERR_LOGOUT_KICKED = 403,  // login in other device
-    ERR_LOGOUT_PACKET = 404,  //
-    ERR_LOGOUT_TOKEN_EXPIRED = 405,  // token expired
-    ERR_LOGOUT_OLDVERSION = 406,  // 
-    ERR_LOGOUT_TOKEN_WRONG = 407,
-    ERR_LOGOUT_ALREADY_LOGOUT = 408,
-
-    ERR_LOGIN_OTHER = 420,
-    ERR_LOGIN_NET = 421,
-    ERR_LOGIN_FAILED = 422,
-    ERR_LOGIN_CANCELED = 423,
-    ERR_LOGIN_TOKEN_EXPIRED = 424,
-    ERR_LOGIN_OLD_VERSION = 425,
-    ERR_LOGIN_TOKEN_WRONG = 426,
-    ERR_LOGIN_TOKEN_KICKED = 427,
-    ERR_LOGIN_ALREADY_LOGIN = 428,
-
-    ERR_JOIN_CHANNEL_OTHER = 440,
-
-    ERR_SEND_MESSAGE_OTHER = 440,
-    ERR_SEND_MESSAGE_TIMEOUT = 441,
-
-    ERR_QUERY_USERNUM_OTHER = 450,
-    ERR_QUERY_USERNUM_TIMEOUT = 451,
-    ERR_QUERY_USERNUM_BYUSER = 452,
-
-    ERR_LEAVE_CHANNEL_OTHER = 460,
-    ERR_LEAVE_CHANNEL_KICKED = 461,
-    ERR_LEAVE_CHANNEL_BYUSER = 462,
-    ERR_LEAVE_CHANNEL_LOGOUT = 463,
-    ERR_LEAVE_CHANNEL_DISCONNECTED = 464,
-
-    ERR_INVITE_OTHER = 470,
-    ERR_INVITE_REINVITE = 471,
-    ERR_INVITE_NET = 472,
-    ERR_INVITE_PEER_OFFLINE = 473,
-    ERR_INVITE_TIMEOUT = 474,
-    ERR_INVITE_CANT_RECV = 475,
-
-
-    //1001~2000
-    ERR_LOAD_MEDIA_ENGINE = 1001,
-    ERR_START_CALL = 1002,
-    ERR_START_CAMERA = 1003,
-    ERR_START_VIDEO_RENDER = 1004,
-    ERR_ADM_GENERAL_ERROR = 1005,
-    ERR_ADM_JAVA_RESOURCE = 1006,
-    ERR_ADM_SAMPLE_RATE = 1007,
-    ERR_ADM_INIT_PLAYOUT = 1008,
-    ERR_ADM_START_PLAYOUT = 1009,
-    ERR_ADM_STOP_PLAYOUT = 1010,
-    ERR_ADM_INIT_RECORDING = 1011,
-    ERR_ADM_START_RECORDING = 1012,
-    ERR_ADM_STOP_RECORDING = 1013,
-    ERR_ADM_RUNTIME_PLAYOUT_ERROR = 1015,
-    ERR_ADM_RUNTIME_RECORDING_ERROR = 1017,
-    ERR_ADM_RECORD_AUDIO_FAILED = 1018,
-    ERR_ADM_INIT_LOOPBACK = 1022,
-    ERR_ADM_START_LOOPBACK = 1023,
-    ERR_ADM_NO_PERMISSION = 1027,
-    ERR_ADM_RECORD_AUDIO_IS_ACTIVE = 1033,
-    ERR_ADM_ANDROID_JNI_JAVA_RESOURCE = 1101,
-    ERR_ADM_ANDROID_JNI_NO_RECORD_FREQUENCY = 1108,
-    ERR_ADM_ANDROID_JNI_NO_PLAYBACK_FREQUENCY = 1109,
-    ERR_ADM_ANDROID_JNI_JAVA_START_RECORD = 1111,
-    ERR_ADM_ANDROID_JNI_JAVA_START_PLAYBACK = 1112,
-    ERR_ADM_ANDROID_JNI_JAVA_RECORD_ERROR = 1115,
-    ERR_ADM_ANDROID_OPENSL_CREATE_ENGINE = 1151,
-    ERR_ADM_ANDROID_OPENSL_CREATE_AUDIO_RECORDER = 1153,
-    ERR_ADM_ANDROID_OPENSL_START_RECORDER_THREAD = 1156,
-    ERR_ADM_ANDROID_OPENSL_CREATE_AUDIO_PLAYER = 1157,
-    ERR_ADM_ANDROID_OPENSL_START_PLAYER_THREAD = 1160,
-    ERR_ADM_IOS_INPUT_NOT_AVAILABLE = 1201,
-    ERR_ADM_IOS_ACTIVATE_SESSION_FAIL = 1206,
-    ERR_ADM_IOS_VPIO_INIT_FAIL = 1210,
-    ERR_ADM_IOS_VPIO_REINIT_FAIL = 1213,
-    ERR_ADM_IOS_VPIO_RESTART_FAIL = 1214,
-    ERR_ADM_IOS_SET_RENDER_CALLBACK_FAIL = 1219,
-    ERR_ADM_IOS_SESSION_SAMPLERATR_ZERO = 1221,
-    ERR_ADM_WIN_CORE_INIT = 1301,
-    ERR_ADM_WIN_CORE_INIT_RECORDING = 1303,
-    ERR_ADM_WIN_CORE_INIT_PLAYOUT = 1306,
-    ERR_ADM_WIN_CORE_INIT_PLAYOUT_NULL = 1307,
-    ERR_ADM_WIN_CORE_START_RECORDING = 1309,
-    ERR_ADM_WIN_CORE_CREATE_REC_THREAD = 1311,
-    ERR_ADM_WIN_CORE_CAPTURE_NOT_STARTUP = 1314,
-    ERR_ADM_WIN_CORE_CREATE_RENDER_THREAD = 1319,
-    ERR_ADM_WIN_CORE_RENDER_NOT_STARTUP = 1320,
-    ERR_ADM_WIN_CORE_NO_RECORDING_DEVICE = 1322,
-    ERR_ADM_WIN_CORE_NO_PLAYOUT_DEVICE = 1323,
-    ERR_ADM_WIN_WAVE_INIT = 1351,
-    ERR_ADM_WIN_WAVE_INIT_RECORDING = 1353,
-    ERR_ADM_WIN_WAVE_INIT_MICROPHONE = 1354,
-    ERR_ADM_WIN_WAVE_INIT_PLAYOUT = 1355,
-    ERR_ADM_WIN_WAVE_INIT_SPEAKER = 1356,
-    ERR_ADM_WIN_WAVE_START_RECORDING = 1357,
-    ERR_ADM_WIN_WAVE_START_PLAYOUT = 1358,
-    ERR_ADM_NO_RECORDING_DEVICE = 1359,
-    ERR_ADM_NO_PLAYOUT_DEVICE = 1360,
-
-    // VDM error code starts from 1500
-    ERR_VDM_CAMERA_NOT_AUTHORIZED = 1501,
-
-    // VCM error code starts from 1600
-    ERR_VCM_UNKNOWN_ERROR = 1600,
-    ERR_VCM_ENCODER_INIT_ERROR = 1601,
-    ERR_VCM_ENCODER_ENCODE_ERROR = 1602,
-    ERR_VCM_ENCODER_SET_ERROR = 1603,
-};
-
-enum LOG_FILTER_TYPE
-{
-    LOG_FILTER_OFF = 0,
-    LOG_FILTER_DEBUG = 0x080f,
-    LOG_FILTER_INFO = 0x000f,
-    LOG_FILTER_WARN = 0x000e,
-    LOG_FILTER_ERROR = 0x000c,
-    LOG_FILTER_CRITICAL = 0x0008,
-    LOG_FILTER_MASK = 0x80f,
-};
-} // namespace agora
-
-#endif
diff --git a/dependencies2013/win32/include/agora/IAgoraLiveEngine.h b/dependencies2013/win32/include/agora/IAgoraLiveEngine.h
deleted file mode 100644
index c5954f57..00000000
--- a/dependencies2013/win32/include/agora/IAgoraLiveEngine.h
+++ /dev/null
@@ -1,277 +0,0 @@
-//
-//  Agora Rtc Engine SDK
-//
-//  Created by Sting Feng in 2015-02.
-//  Copyright (c) 2015 Agora IO. All rights reserved.
-//
-
-#ifndef AGORA_RTC_LIVE_ENGINE_H
-#define AGORA_RTC_LIVE_ENGINE_H
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "IAgoraRtcEngine.h"
-#include "IAgoraLivePublisher.h"
-#include "IAgoraLiveSubscriber.h"
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#define AGORA_CALL __cdecl
-#if defined(AGORARTC_EXPORT)
-#define AGORA_API extern "C" __declspec(dllexport)
-#else
-#define AGORA_API extern "C" __declspec(dllimport)
-#endif
-#elif defined(__APPLE__)
-#define AGORA_API __attribute__((visibility("default"))) extern "C"
-#define AGORA_CALL
-#elif defined(__ANDROID__) || defined(__linux__)
-#define AGORA_API extern "C" __attribute__((visibility("default")))
-#define AGORA_CALL
-#else
-#define AGORA_API extern "C"
-#define AGORA_CALL
-#endif
-namespace agora {
-
-namespace rtc {
-
-/*
-* meida type of stream 
-*/
-enum MEDIA_TYPE
-{
-	/*
-	* No audio and video
-	*/
-    MEDIA_TYPE_NONE = 0,
-	/*
-	* Audio only
-	*/
-    MEDIA_TYPE_AUDIO_ONLY = 1,
-	/*
-	* Video only
-	*/
-    MEDIA_TYPE_VIDEO_ONLY = 2,
-	/*
-	* Audio and Video
-	*/
-    MEDIA_TYPE_AUDIO_AND_VIDEO = 3
-};
-
-/*
-* Channel configuration
-*/
-struct LiveChannelConfig {
-    bool videoEnabled;
-};
-
-/*
-* stream statitics
-*/
-typedef RtcStats LiveStats;
-
-/**
-* the event call back interface
-*/
-class ILiveEngineEventHandler
-{
-public:
-    virtual ~ILiveEngineEventHandler() {}
-
-    /**
-     * when warning message coming, the function will be called
-     * @param [in] warn
-     *        warning code
-     * @param [in] msg
-     *        the warning message
-     */
-    virtual void onWarning(int warn) {
-        (void)warn;
-    }
-
-    /**
-     * when error message come, the function will be called
-     * @param [in] err
-     *        error code
-     * @param [in] msg
-     *        the error message
-     */
-    virtual void onError(int err) {
-        (void)err;
-    }
-
-    /**
-    * when join channel success, the function will be called
-    * @param [in] channel
-    *        the channel name you have joined
-    * @param [in] uid
-    *        the UID of you in this channel
-    * @param [in] elapsed
-    *        the time elapsed in ms from the joinChannel been called to joining completed
-    */
-    virtual void onJoinChannelSuccess(const char* channel, uid_t uid, int elapsed) {
-        (void)channel;
-        (void)uid;
-        (void)elapsed;
-    }
-
-    /**
-    * when re-join channel success, the function will be called
-    * @param [in] channel
-    *        the channel name you have joined
-    * @param [in] uid
-    *        the UID of you in this channel
-    * @param [in] elapsed
-    *        the time elapsed in ms elapsed
-    */
-    virtual void onRejoinChannelSuccess(const char* channel, uid_t uid, int elapsed) {
-        (void)channel;
-        (void)uid;
-        (void)elapsed;
-    }
-
-	/*
-	* When leave channel success, the function will be called.
-	*/
-    virtual void onLeaveChannel() {
-    }
-
-    /**
-    * when the information of the RTC engine stats come, the function will be called
-    * @param [in] stats
-    *        the RTC engine stats
-    */
-    virtual void onLiveStats(const LiveStats& stats) {
-        (void)stats;
-    }
-
-    /**
-    * report the network quality
-	* @param [in] uid
-	*        the UID of the remote user
-	* @param [in] txQuality
-    *        the score of the send network quality 0~5 the higher the better
-	* @param [in] rxQuality
-	*        the score of the recv network quality 0~5 the higher the better
-	*/
-    virtual void onNetworkQuality(uid_t uid, int txQuality, int rxQuality) {
-		(void)uid;
-		(void)txQuality;
-		(void)rxQuality;
-    }
-
-    /**
-    * when the network can not worked well, the function will be called
-    */
-    virtual void onConnectionLost() {}
-
-    /**
-    * when local user disconnected by accident, the function will be called(then SDK will try to reconnect itself)
-    */
-    virtual void onConnectionInterrupted() {}
-    
-    /**
-    * when token is enabled, and specified token is invalid or expired, this function will be called.
-    * APP should request a new token and call renewToken() to refresh the token.
-    * NOTE: to be compatible with previous version, ERR_TOKEN_EXPIRED and ERR_INVALID_TOKEN are also reported via onError() callback.
-    * You should move renew of token logic into this callback.
-    */
-    virtual void onRequestToken() {
-    }
-
-};
-
-class ILiveEngine
-{
-public:
-
-    /**
-     * initialize the engine
-     * @param [in] context
-     *        the RTC engine context
-     * @return return 0 if success or an error code
-     */
-    virtual int initialize(const char *appId) = 0;
-
-    /**
-     * get the version information of the SDK
-     * @param [in, out] build
-     *        the build number
-     * @return return the version number string in char format
-     */
-    virtual const char* getVersion(int* build) = 0;
-
-	/*
-	* Get IRtcEngine interface
-	*/
-    virtual IRtcEngine* getRtcEngine() = 0;
-
-
-    /**
-    * release the engine resource
-    * @param [in] sync
-    *        true: release the engine resources and return after all resources have been destroyed.
-    *              APP should try not to call release(true) in the engine's callbacks, call it this way in a separate thread instead.
-    *        false: notify engine to release its resources and returns without waiting for resources are really destroyed
-    */
-    virtual void release(bool sync=false) = 0;
-
-	/*
-	* Set event handler for ILiveEngine
-	*/
-    virtual int setEventHandler(ILiveEngineEventHandler* eventHandler) = 0;
-
-    /**
-    * join the channel, if the channel have not been created, it will been created automatically
-  * @param [in] token
-    *        the token, if you have initialized the engine with an available APP ID, it can be null here. If you enable token on the dashboard, specify token here
-    * @param [in] channelId
-    *        the channel Id
-  * @param [in] info
-    *        the additional information, it can be null here
-    * @param [in] uid
-    *        the uid of you, if 0 the system will automatically allocate one for you
-    * @return return 0 if success or an error code
-    */
-    virtual int joinChannel(const char* token, const char* channelId, struct LiveChannelConfig *config, uid_t uid) = 0;
-
-    /**
-    * leave the current channel
-    * @return return 0 if success or an error code
-    */
-    virtual int leaveChannel() = 0;
-
-    /**
-    * renew the token for the current channel
-    * @param [in] token the renewed token, if old token expired.
-    * @return return 0 if success or an error code
-    */
-    virtual int renewToken(const char* token) = 0;
-
-    /**
-    * start the local video previewing
-    * @return return 0 if success or an error code
-    */
-    virtual int startPreview(view_t view, RENDER_MODE_TYPE type) = 0;
-
-    /**
-    * stop the local video previewing
-    * @return return 0 if success or an error code
-    */
-    virtual int stopPreview() = 0;
-};
-
-
-} //namespace rtc
-} // namespace agora
-
-/**
-* create the RTC live engine object and return the pointer
-* @return returns the pointer of the RTC engine object
-*/
-AGORA_API agora::rtc::ILiveEngine* AGORA_CALL createAgoraLiveEngine();
-
-#endif
diff --git a/dependencies2013/win32/include/agora/IAgoraMediaEngine.h b/dependencies2013/win32/include/agora/IAgoraMediaEngine.h
deleted file mode 100644
index 265268c1..00000000
--- a/dependencies2013/win32/include/agora/IAgoraMediaEngine.h
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifndef AGORA_MEDIA_ENGINE_H
-#define AGORA_MEDIA_ENGINE_H
-#if defined _WIN32 || defined __CYGWIN__
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-namespace agora
-{
-namespace media
-{
-
-enum MEDIA_SOURCE_TYPE {
-    AUDIO_PLAYOUT_SOURCE = 0,
-    AUDIO_RECORDING_SOURCE = 1,
-};
-
-class IAudioFrameObserver
-{
-public:
-  enum AUDIO_FRAME_TYPE {
-    FRAME_TYPE_PCM16 = 0,  //PCM 16bit little endian
-  };
-  struct AudioFrame {
-    AUDIO_FRAME_TYPE type;
-    int samples;  //number of samples in this frame
-    int bytesPerSample;  //number of bytes per sample: 2 for PCM16
-    int channels;  //number of channels (data are interleaved if stereo)
-    int samplesPerSec;  //sampling rate
-    void* buffer;  //data buffer
-    int64_t renderTimeMs;
-  };
-public:
-  virtual bool onRecordAudioFrame(AudioFrame& audioFrame) = 0;
-  virtual bool onPlaybackAudioFrame(AudioFrame& audioFrame) = 0;
-  virtual bool onMixedAudioFrame(AudioFrame& audioFrame) = 0;
-  virtual bool onPlaybackAudioFrameBeforeMixing(unsigned int uid, AudioFrame& audioFrame) = 0;
-};
-
-class IVideoFrameObserver
-{
-public:
-  enum VIDEO_FRAME_TYPE {
-    FRAME_TYPE_YUV420 = 0,  //YUV 420 format
-  };
-  struct VideoFrame {
-    VIDEO_FRAME_TYPE type;
-    int width;  //width of video frame
-    int height;  //height of video frame
-    int yStride;  //stride of Y data buffer
-    int uStride;  //stride of U data buffer
-    int vStride;  //stride of V data buffer
-    void* yBuffer;  //Y data buffer
-    void* uBuffer;  //U data buffer
-    void* vBuffer;  //V data buffer
-    int rotation; // rotation of this frame (0, 90, 180, 270)
-    int64_t renderTimeMs;
-  };
-public:
-  virtual bool onCaptureVideoFrame(VideoFrame& videoFrame) = 0;
-  virtual bool onRenderVideoFrame(unsigned int uid, VideoFrame& videoFrame) = 0;
-};
-
-class IVideoFrame
-{
-public:
-  enum PLANE_TYPE {
-    Y_PLANE = 0,
-    U_PLANE = 1,
-    V_PLANE = 2,
-    NUM_OF_PLANES = 3
-  };
-  enum VIDEO_TYPE {
-    VIDEO_TYPE_UNKNOWN = 0,
-    VIDEO_TYPE_I420 = 1,
-    VIDEO_TYPE_IYUV = 2,
-    VIDEO_TYPE_RGB24 = 3,
-    VIDEO_TYPE_ABGR = 4,
-    VIDEO_TYPE_ARGB = 5,
-    VIDEO_TYPE_ARGB4444 = 6,
-    VIDEO_TYPE_RGB565 = 7,
-    VIDEO_TYPE_ARGB1555 = 8,
-    VIDEO_TYPE_YUY2 = 9,
-    VIDEO_TYPE_YV12 = 10,
-    VIDEO_TYPE_UYVY = 11,
-    VIDEO_TYPE_MJPG = 12,
-    VIDEO_TYPE_NV21 = 13,
-    VIDEO_TYPE_NV12 = 14,
-    VIDEO_TYPE_BGRA = 15,
-    VIDEO_TYPE_RGBA = 16,
-  };
-  virtual void release() = 0;
-  virtual const unsigned char* buffer(PLANE_TYPE type) const = 0;
-
-  // Copy frame: If required size is bigger than allocated one, new buffers of
-  // adequate size will be allocated.
-  // Return value: 0 on success ,-1 on error.
-  virtual int copyFrame(IVideoFrame** dest_frame) const = 0;
-
-  // Convert frame
-  // Input:
-  //   - src_frame        : Reference to a source frame.
-  //   - dst_video_type   : Type of output video.
-  //   - dst_sample_size  : Required only for the parsing of MJPG.
-  //   - dst_frame        : Pointer to a destination frame.
-  // Return value: 0 if OK, < 0 otherwise.
-  // It is assumed that source and destination have equal height.
-  virtual int convertFrame(VIDEO_TYPE dst_video_type, int dst_sample_size, unsigned char* dst_frame) const = 0;
-
-  // Get allocated size per plane.
-  virtual int allocated_size(PLANE_TYPE type) const = 0;
-
-  // Get allocated stride per plane.
-  virtual int stride(PLANE_TYPE type) const = 0;
-
-  // Get frame width.
-  virtual int width() const = 0;
-
-  // Get frame height.
-  virtual int height() const = 0;
-
-  // Get frame timestamp (90kHz).
-  virtual unsigned int timestamp() const = 0;
-
-  // Get render time in milliseconds.
-  virtual int64_t render_time_ms() const = 0;
-
-  // Return true if underlying plane buffers are of zero size, false if not.
-  virtual bool IsZeroSize() const = 0;
-};
-
-class IExternalVideoRenderCallback
-{
-public:
-  virtual void onViewSizeChanged(int width, int height) = 0;
-  virtual void onViewDestroyed() = 0;
-};
-
-struct ExternalVideoRenerContext
-{
-  IExternalVideoRenderCallback* renderCallback;
-  void* view;
-  int renderMode;
-  int zOrder;
-  float left;
-  float top;
-  float right;
-  float bottom;
-};
-
-class IExternalVideoRender
-{
-public:
-  virtual void release() = 0;
-  virtual int initialize() = 0;
-  virtual int deliverFrame(const IVideoFrame& videoFrame, int rotation, bool mirrored) = 0;
-};
-
-class IExternalVideoRenderFactory
-{
-public:
-  virtual IExternalVideoRender* createRenderInstance(const ExternalVideoRenerContext& context) = 0;
-};
-
-class IMediaEngine
-{
-public:
-  virtual void release() = 0;
-  virtual int registerAudioFrameObserver(IAudioFrameObserver* observer) = 0;
-  virtual int registerVideoFrameObserver(IVideoFrameObserver* observer) = 0;
-  virtual int registerVideoRenderFactory(IExternalVideoRenderFactory* factory) = 0;
-  virtual int pushAudioFrame(MEDIA_SOURCE_TYPE type, IAudioFrameObserver::AudioFrame *frame, bool wrap = false){ return -1; }
-};
-
-} //media
-
-} //agora
-
-#endif //AGORA_MEDIA_ENGINE_H
diff --git a/dependencies2013/win32/include/agora/IAgoraRtcEngine.h b/dependencies2013/win32/include/agora/IAgoraRtcEngine.h
deleted file mode 100644
index b21de8f6..00000000
--- a/dependencies2013/win32/include/agora/IAgoraRtcEngine.h
+++ /dev/null
@@ -1,2451 +0,0 @@
-//
-//  Agora Rtc Engine SDK
-//
-//  Created by Sting Feng in 2015-02.
-//  Copyright (c) 2015 Agora IO. All rights reserved.
-//
-
-#ifndef AGORA_RTC_ENGINE_H
-#define AGORA_RTC_ENGINE_H
-#include "AgoraBase.h"
-#include "IAgoraService.h"
-
-namespace agora {
-namespace rtc {
-    typedef unsigned int uid_t;
-    typedef void* view_t;
-
-enum MAX_DEVICE_ID_LENGTH_TYPE
-{
-    MAX_DEVICE_ID_LENGTH = 512
-};
-
-enum QUALITY_REPORT_FORMAT_TYPE
-{
-    QUALITY_REPORT_JSON = 0,
-    QUALITY_REPORT_HTML = 1,
-};
-
-enum MEDIA_ENGINE_EVENT_CODE_TYPE
-{
-    MEDIA_ENGINE_RECORDING_ERROR = 0,
-    MEDIA_ENGINE_PLAYOUT_ERROR = 1,
-    MEDIA_ENGINE_RECORDING_WARNING = 2,
-    MEDIA_ENGINE_PLAYOUT_WARNING = 3,
-    MEDIA_ENGINE_AUDIO_FILE_MIX_FINISH = 10,
-    MEDIA_ENGINE_AUDIO_FAREND_MUSIC_BEGINS = 12,
-    MEDIA_ENGINE_AUDIO_FAREND_MUSIC_ENDS = 13,
-    // media engine role changed
-    MEDIA_ENGINE_ROLE_BROADCASTER_SOLO = 20,
-    MEDIA_ENGINE_ROLE_BROADCASTER_INTERACTIVE = 21,
-    MEDIA_ENGINE_ROLE_AUDIENCE = 22,
-    MEDIA_ENGINE_ROLE_COMM_PEER = 23,
-    MEDIA_ENGINE_ROLE_GAME_PEER = 24,
-    // iOS adm sample rate changed
-    MEDIA_ENGINE_AUDIO_ADM_REQUIRE_RESTART = 110,
-    MEDIA_ENGINE_AUDIO_ADM_SPECIAL_RESTART = 111,
-};
-
-enum MEDIA_DEVICE_STATE_TYPE
-{
-    MEDIA_DEVICE_STATE_ACTIVE = 1,
-    MEDIA_DEVICE_STATE_DISABLED = 2,
-    MEDIA_DEVICE_STATE_NOT_PRESENT = 4,
-    MEDIA_DEVICE_STATE_UNPLUGGED = 8
-};
-
-enum MEDIA_DEVICE_TYPE
-{
-    UNKNOWN_AUDIO_DEVICE = -1,
-    AUDIO_PLAYOUT_DEVICE = 0,
-    AUDIO_RECORDING_DEVICE = 1,
-    VIDEO_RENDER_DEVICE = 2,
-    VIDEO_CAPTURE_DEVICE = 3,
-    AUDIO_APPLICATION_PLAYOUT_DEVICE = 4,
-};
-
-enum AUDIO_RECORDING_QUALITY_TYPE
-{
-    AUDIO_RECORDING_QUALITY_LOW = 0,
-    AUDIO_RECORDING_QUALITY_MEDIUM = 1,
-    AUDIO_RECORDING_QUALITY_HIGH = 2,
-};
-
-enum QUALITY_TYPE
-{
-    QUALITY_UNKNOWN = 0,
-    QUALITY_EXCELLENT = 1,
-    QUALITY_GOOD = 2,
-    QUALITY_POOR = 3,
-    QUALITY_BAD = 4,
-    QUALITY_VBAD = 5,
-    QUALITY_DOWN = 6,
-    QUALITY_UNSUPPORTED = 7,
-};
-
-enum RENDER_MODE_TYPE
-{
-    RENDER_MODE_HIDDEN = 1,
-    RENDER_MODE_FIT = 2,
-    RENDER_MODE_ADAPTIVE = 3,
-};
-
-enum VIDEO_MIRROR_MODE_TYPE
-{
-    VIDEO_MIRROR_MODE_AUTO = 0,//determined by SDK
-    VIDEO_MIRROR_MODE_ENABLED = 1,//enabled mirror
-    VIDEO_MIRROR_MODE_DISABLED = 2,//disable mirror
-};
-
-enum VIDEO_PROFILE_TYPE
-{                                             // res       fps
-    VIDEO_PROFILE_LANDSCAPE_120P = 0,         // 160x120   15
-    VIDEO_PROFILE_LANDSCAPE_120P_3 = 2,       // 120x120   15
-    VIDEO_PROFILE_LANDSCAPE_180P = 10,        // 320x180   15
-    VIDEO_PROFILE_LANDSCAPE_180P_3 = 12,      // 180x180   15
-    VIDEO_PROFILE_LANDSCAPE_180P_4 = 13,      // 240x180   15
-    VIDEO_PROFILE_LANDSCAPE_240P = 20,        // 320x240   15
-    VIDEO_PROFILE_LANDSCAPE_240P_3 = 22,      // 240x240   15
-    VIDEO_PROFILE_LANDSCAPE_240P_4 = 23,      // 424x240   15
-    VIDEO_PROFILE_LANDSCAPE_360P = 30,        // 640x360   15
-    VIDEO_PROFILE_LANDSCAPE_360P_3 = 32,      // 360x360   15
-    VIDEO_PROFILE_LANDSCAPE_360P_4 = 33,      // 640x360   30
-    VIDEO_PROFILE_LANDSCAPE_360P_6 = 35,      // 360x360   30
-    VIDEO_PROFILE_LANDSCAPE_360P_7 = 36,      // 480x360   15
-    VIDEO_PROFILE_LANDSCAPE_360P_8 = 37,      // 480x360   30
-    VIDEO_PROFILE_LANDSCAPE_360P_9 = 38,      // 640x360   15
-    VIDEO_PROFILE_LANDSCAPE_360P_10 = 39,     // 640x360   24
-    VIDEO_PROFILE_LANDSCAPE_360P_11 = 100,    // 640x360   24
-    VIDEO_PROFILE_LANDSCAPE_480P = 40,        // 640x480   15
-    VIDEO_PROFILE_LANDSCAPE_480P_3 = 42,      // 480x480   15
-    VIDEO_PROFILE_LANDSCAPE_480P_4 = 43,      // 640x480   30
-    VIDEO_PROFILE_LANDSCAPE_480P_6 = 45,      // 480x480   30
-    VIDEO_PROFILE_LANDSCAPE_480P_8 = 47,      // 848x480   15
-    VIDEO_PROFILE_LANDSCAPE_480P_9 = 48,      // 848x480   30
-    VIDEO_PROFILE_LANDSCAPE_480P_10 = 49,     // 640x480   10
-    VIDEO_PROFILE_LANDSCAPE_720P = 50,        // 1280x720  15
-    VIDEO_PROFILE_LANDSCAPE_720P_3 = 52,      // 1280x720  30
-    VIDEO_PROFILE_LANDSCAPE_720P_5 = 54,      // 960x720   15
-    VIDEO_PROFILE_LANDSCAPE_720P_6 = 55,      // 960x720   30
-    VIDEO_PROFILE_LANDSCAPE_1080P = 60,       // 1920x1080 15
-    VIDEO_PROFILE_LANDSCAPE_1080P_3 = 62,     // 1920x1080 30
-    VIDEO_PROFILE_LANDSCAPE_1080P_5 = 64,     // 1920x1080 60
-    VIDEO_PROFILE_LANDSCAPE_1440P = 66,       // 2560x1440 30
-    VIDEO_PROFILE_LANDSCAPE_1440P_2 = 67,     // 2560x1440 60
-    VIDEO_PROFILE_LANDSCAPE_4K = 70,          // 3840x2160 30
-    VIDEO_PROFILE_LANDSCAPE_4K_3 = 72,        // 3840x2160 60
-
-    VIDEO_PROFILE_PORTRAIT_120P = 1000,       // 120x160   15
-    VIDEO_PROFILE_PORTRAIT_120P_3 = 1002,     // 120x120   15
-    VIDEO_PROFILE_PORTRAIT_180P = 1010,       // 180x320   15
-    VIDEO_PROFILE_PORTRAIT_180P_3 = 1012,     // 180x180   15
-    VIDEO_PROFILE_PORTRAIT_180P_4 = 1013,     // 180x240   15
-    VIDEO_PROFILE_PORTRAIT_240P = 1020,       // 240x320   15
-    VIDEO_PROFILE_PORTRAIT_240P_3 = 1022,     // 240x240   15
-    VIDEO_PROFILE_PORTRAIT_240P_4 = 1023,     // 240x424   15
-    VIDEO_PROFILE_PORTRAIT_360P = 1030,       // 360x640   15
-    VIDEO_PROFILE_PORTRAIT_360P_3 = 1032,     // 360x360   15
-    VIDEO_PROFILE_PORTRAIT_360P_4 = 1033,     // 360x640   30
-    VIDEO_PROFILE_PORTRAIT_360P_6 = 1035,     // 360x360   30
-    VIDEO_PROFILE_PORTRAIT_360P_7 = 1036,     // 360x480   15
-    VIDEO_PROFILE_PORTRAIT_360P_8 = 1037,     // 360x480   30
-    VIDEO_PROFILE_PORTRAIT_360P_9 = 1038,     // 360x640   15
-    VIDEO_PROFILE_PORTRAIT_360P_10 = 1039,    // 360x640   24
-    VIDEO_PROFILE_PORTRAIT_360P_11 = 1100,    // 360x640   24
-    VIDEO_PROFILE_PORTRAIT_480P = 1040,       // 480x640   15
-    VIDEO_PROFILE_PORTRAIT_480P_3 = 1042,     // 480x480   15
-    VIDEO_PROFILE_PORTRAIT_480P_4 = 1043,     // 480x640   30
-    VIDEO_PROFILE_PORTRAIT_480P_6 = 1045,     // 480x480   30
-    VIDEO_PROFILE_PORTRAIT_480P_8 = 1047,     // 480x848   15
-    VIDEO_PROFILE_PORTRAIT_480P_9 = 1048,     // 480x848   30
-    VIDEO_PROFILE_PORTRAIT_480P_10 = 1049,    // 480x640   10
-    VIDEO_PROFILE_PORTRAIT_720P = 1050,       // 720x1280  15
-    VIDEO_PROFILE_PORTRAIT_720P_3 = 1052,     // 720x1280  30
-    VIDEO_PROFILE_PORTRAIT_720P_5 = 1054,     // 720x960   15
-    VIDEO_PROFILE_PORTRAIT_720P_6 = 1055,     // 720x960   30
-    VIDEO_PROFILE_PORTRAIT_1080P = 1060,      // 1080x1920 15
-    VIDEO_PROFILE_PORTRAIT_1080P_3 = 1062,    // 1080x1920 30
-    VIDEO_PROFILE_PORTRAIT_1080P_5 = 1064,    // 1080x1920 60
-    VIDEO_PROFILE_PORTRAIT_1440P = 1066,      // 1440x2560 30
-    VIDEO_PROFILE_PORTRAIT_1440P_2 = 1067,    // 1440x2560 60
-    VIDEO_PROFILE_PORTRAIT_4K = 1070,         // 2160x3840 30
-    VIDEO_PROFILE_PORTRAIT_4K_3 = 1072,       // 2160x3840 60
-    VIDEO_PROFILE_DEFAULT = VIDEO_PROFILE_LANDSCAPE_360P,
-};
-
-enum AUDIO_PROFILE_TYPE // sample rate, bit rate, mono/stereo, speech/music codec
-{
-    AUDIO_PROFILE_DEFAULT = 0, // use default settings
-    AUDIO_PROFILE_SPEECH_STANDARD = 1, // 32Khz, 18kbps, mono, speech
-    AUDIO_PROFILE_MUSIC_STANDARD = 2, // 48Khz, 48kbps, mono, music
-    AUDIO_PROFILE_MUSIC_STANDARD_STEREO = 3, // 48Khz, 56kbps, stereo, music
-    AUDIO_PROFILE_MUSIC_HIGH_QUALITY = 4, // 48Khz, 128kbps, mono, music
-    AUDIO_PROFILE_MUSIC_HIGH_QUALITY_STEREO = 5, // 48Khz, 192kbps, stereo, music
-    AUDIO_PROFILE_NUM = 6,
-};
-
-enum AUDIO_SCENARIO_TYPE // set a suitable scenario for your app type
-{
-    AUDIO_SCENARIO_DEFAULT = 0,
-    AUDIO_SCENARIO_CHATROOM_ENTERTAINMENT = 1,
-    AUDIO_SCENARIO_EDUCATION = 2,
-    AUDIO_SCENARIO_GAME_STREAMING = 3,
-    AUDIO_SCENARIO_SHOWROOM = 4,
-    AUDIO_SCENARIO_CHATROOM_GAMING = 5,
-    AUDIO_SCENARIO_NUM = 6,
-};
-
-enum CHANNEL_PROFILE_TYPE
-{
-	CHANNEL_PROFILE_COMMUNICATION = 0,
-	CHANNEL_PROFILE_LIVE_BROADCASTING = 1,
-    CHANNEL_PROFILE_GAME = 2,
-};
-
-enum CLIENT_ROLE_TYPE
-{
-    CLIENT_ROLE_BROADCASTER = 1,
-    CLIENT_ROLE_AUDIENCE = 2,
-};
-
-enum USER_OFFLINE_REASON_TYPE
-{
-    USER_OFFLINE_QUIT = 0,
-    USER_OFFLINE_DROPPED = 1,
-    USER_OFFLINE_BECOME_AUDIENCE = 2,
-};
-
-enum INJECT_STREAM_STATUS
-{
-    INJECT_STREAM_STATUS_START_SUCCESS = 0,
-    INJECT_STREAM_STATUS_START_ALREADY_EXISTS = 1,
-    INJECT_STREAM_STATUS_START_UNAUTHORIZED = 2,
-    INJECT_STREAM_STATUS_START_TIMEDOUT = 3,
-    INJECT_STREAM_STATUS_START_FAILED = 4,
-    INJECT_STREAM_STATUS_STOP_SUCCESS = 5,
-    INJECT_STREAM_STATUS_STOP_NOT_FOUND = 6,
-    INJECT_STREAM_STATUS_STOP_UNAUTHORIZED = 7,
-    INJECT_STREAM_STATUS_STOP_TIMEDOUT = 8,
-    INJECT_STREAM_STATUS_STOP_FAILED = 9,
-    INJECT_STREAM_STATUS_BROKEN = 10,
-};
-
-enum REMOTE_VIDEO_STREAM_TYPE
-{
-    REMOTE_VIDEO_STREAM_HIGH = 0,
-    REMOTE_VIDEO_STREAM_LOW = 1,
-};
-
-enum RAW_AUDIO_FRAME_OP_MODE_TYPE
-{
-    RAW_AUDIO_FRAME_OP_MODE_READ_ONLY = 0,
-    RAW_AUDIO_FRAME_OP_MODE_WRITE_ONLY = 1,
-    RAW_AUDIO_FRAME_OP_MODE_READ_WRITE = 2,
-};
-
-
-enum AUDIO_SAMPLE_RATE_TYPE
-{
-    AUDIO_SAMPLE_RATE_32000 = 32000,
-    AUDIO_SAMPLE_RATE_44100 = 44100,
-    AUDIO_SAMPLE_RATE_48000 = 48000,
-};
-
-
-enum VIDEO_CODEC_PROFILE_TYPE
-{
-    VIDEO_CODEC_PROFILE_BASELINE = 66,
-    VIDEO_CODEC_PROFILE_MAIN = 77,
-    VIDEO_CODEC_PROFILE_HIGH = 100,
-};
-
-enum AUDIO_EQUALIZATION_BAND_FREQUENCY
-{
-    AUDIO_EQUALIZATION_BAND_31 = 0,
-    AUDIO_EQUALIZATION_BAND_62 = 1,
-    AUDIO_EQUALIZATION_BAND_125 = 2,
-    AUDIO_EQUALIZATION_BAND_250 = 3,
-    AUDIO_EQUALIZATION_BAND_500 = 4,
-    AUDIO_EQUALIZATION_BAND_1K = 5,
-    AUDIO_EQUALIZATION_BAND_2K = 6,
-    AUDIO_EQUALIZATION_BAND_4K = 7,
-    AUDIO_EQUALIZATION_BAND_8K = 8,
-    AUDIO_EQUALIZATION_BAND_16K = 9,
-};
-
-enum AUDIO_REVERB_TYPE
-{
-    AUDIO_REVERB_DRY_LEVEL = 0, // (dB, [-20,10]), the level of the dry signal
-    AUDIO_REVERB_WET_LEVEL = 1, // (dB, [-20,10]), the level of the early reflection signal (wet signal)
-    AUDIO_REVERB_ROOM_SIZE = 2, // ([0, 100]), the room size of the reflection
-    AUDIO_REVERB_WET_DELAY = 3, // (ms, [0, 200]), the length of the initial delay of the wet signal in ms
-    AUDIO_REVERB_STRENGTH = 4, // ([0, 100]), the strength of the late reverberation
-};
-    
-enum REMOTE_VIDEO_STATE
-{
-    // REMOTE_VIDEO_STATE_STOPPED is not used at this version. Ignore this value.
-    // REMOTE_VIDEO_STATE_STOPPED = 0,  // Default state, video is started or remote user disabled/muted video stream
-    REMOTE_VIDEO_STATE_RUNNING = 1,  // Running state, remote video can be displayed normally
-    REMOTE_VIDEO_STATE_FROZEN = 2,    // Remote video is frozen, probably due to network issue.
-};
-
-struct AudioVolumeInfo
-{
-    uid_t uid;
-    unsigned int volume; // [0,255]
-};
-
-struct RtcStats
-{
-    unsigned int duration;
-    unsigned int txBytes;
-    unsigned int rxBytes;
-    unsigned short txKBitRate;
-    unsigned short rxKBitRate;
-
-    unsigned short rxAudioKBitRate;
-    unsigned short txAudioKBitRate;
-
-    unsigned short rxVideoKBitRate;
-    unsigned short txVideoKBitRate;
-    unsigned int userCount;
-    double cpuAppUsage;
-    double cpuTotalUsage;
-};
-
-struct LocalVideoStats
-{
-    int sentBitrate;
-    int sentFrameRate;
-};
-
-struct RemoteVideoStats
-{
-    uid_t uid;
-    int delay;  // obsolete
-	int width;
-	int height;
-	int receivedBitrate;
-	int receivedFrameRate;
-    REMOTE_VIDEO_STREAM_TYPE rxStreamType;
-};
-
-struct VideoCompositingLayout
-{
-    struct Region {
-        uid_t uid;
-        double x;//[0,1]
-        double y;//[0,1]
-        double width;//[0,1]
-        double height;//[0,1]
-        int zOrder; //optional, [0, 100] //0 (default): bottom most, 100: top most
-
-        //  Optional
-        //  [0, 1.0] where 0 denotes throughly transparent, 1.0 opaque
-        double alpha;
-
-        RENDER_MODE_TYPE renderMode;//RENDER_MODE_HIDDEN: Crop, RENDER_MODE_FIT: Zoom to fit
-        Region()
-            :uid(0)
-            , x(0)
-            , y(0)
-            , width(0)
-            , height(0)
-            , zOrder(0)
-            , alpha(1.0)
-            , renderMode(RENDER_MODE_HIDDEN)
-        {}
-
-    };
-    int canvasWidth;
-    int canvasHeight;
-    const char* backgroundColor;//e.g. "#C0C0C0" in RGB
-    const Region* regions;
-    int regionCount;
-    const char* appData;
-    int appDataLength;
-    VideoCompositingLayout()
-        :canvasWidth(0)
-        ,canvasHeight(0)
-        ,backgroundColor(NULL)
-        ,regions(NULL)
-        , regionCount(0)
-        , appData(NULL)
-        , appDataLength(0)
-    {}
-};
-
-typedef struct Rect {
-    int top;
-    int left;
-    int bottom;
-    int right;
-
-    Rect(): top(0), left(0), bottom(0), right(0) {}
-    Rect(int t, int l, int b, int r): top(t), left(l), bottom(b), right(r) {}
-} Rect;
-
-
-typedef struct TranscodingUser {
-    uid_t uid;
-
-    int x;
-    int y;
-    int width;
-    int height;
-
-    int zOrder;
-    double alpha;
-    int audioChannel;
-    TranscodingUser()
-        : uid(0)
-        , x(0)
-        , y(0)
-        , width(0)
-        , height(0)
-        , zOrder(0)
-        , alpha(1.0)
-        , audioChannel(0)
-    {}
-
-} TranscodingUser;
-    
-typedef struct RtcImage {
-    RtcImage() :
-       url(nullptr),
-       x(0),
-       y(0),
-       width(0),
-       height(0)
-    {}
-    const char* url;
-    int x;
-    int y;
-    int width;
-    int height;
-} RtcImage;
-
-typedef struct LiveTranscoding {
-    int width;
-    int height;
-    int videoBitrate;
-    int videoFramerate;
-
-    bool lowLatency;
-
-    int videoGop;
-    VIDEO_CODEC_PROFILE_TYPE videoCodecProfile;
-    unsigned int backgroundColor;
-    unsigned int userCount;
-    TranscodingUser *transcodingUsers;
-    const char *transcodingExtraInfo;
-    RtcImage* watermark;
-
-    AUDIO_SAMPLE_RATE_TYPE audioSampleRate;
-    int audioBitrate;
-    int audioChannels;
-    
-    LiveTranscoding()
-        : width(360)
-        , height(640)
-        , videoBitrate(400)
-        , videoFramerate(15)
-        , lowLatency(false)
-        , backgroundColor(0x000000)
-        , videoGop(30)
-        , videoCodecProfile(VIDEO_CODEC_PROFILE_HIGH)
-        , userCount(0)
-        , transcodingUsers(nullptr)
-        , transcodingExtraInfo(nullptr)
-        , watermark(nullptr)
-        , audioSampleRate(AUDIO_SAMPLE_RATE_48000)
-        , audioBitrate(48)
-        , audioChannels(1)
-    {}
-} LiveTranscoding;
-
-struct InjectStreamConfig {
-    int width;
-    int height;
-    int videoGop;
-    int videoFramerate;
-    int videoBitrate;
-    AUDIO_SAMPLE_RATE_TYPE audioSampleRate;
-    int audioBitrate;
-    int audioChannels;
-
-    // width / height default set to 0 means pull the stream with its original resolution
-    InjectStreamConfig()
-        : width(0)
-        , height(0)
-        , videoGop(30)
-        , videoFramerate(15)
-        , videoBitrate(400)
-        , audioSampleRate(AUDIO_SAMPLE_RATE_48000)
-        , audioBitrate(48)
-        , audioChannels(1)
-    {}
-};
-
-enum RTMP_STREAM_LIFE_CYCLE_TYPE
-{
-	RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL = 1,
-	RTMP_STREAM_LIFE_CYCLE_BIND2OWNER = 2,
-};
-
-struct PublisherConfiguration {
-	int width;
-	int height;
-	int framerate;
-	int bitrate;
-	int defaultLayout;
-	int lifecycle;
-	bool owner;
-	int injectStreamWidth;
-	int injectStreamHeight;
-	const char* injectStreamUrl;
-	const char* publishUrl;
-	const char* rawStreamUrl;
-	const char* extraInfo;
-
-
-	PublisherConfiguration()
-		: width(640)
-		, height(360)
-		, framerate(15)
-		, bitrate(500)
-		, defaultLayout(1)
-		, lifecycle(RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL)
-		, owner(true)
-		, injectStreamWidth(0)
-		, injectStreamHeight(0)
-		, injectStreamUrl(NULL)
-		, publishUrl(NULL)
-		, rawStreamUrl(NULL)
-		, extraInfo(NULL)
-	{}
-
-};
-
-#if !defined(__ANDROID__)
-struct VideoCanvas
-{
-    view_t view;
-    int renderMode;
-    uid_t uid;
-    void *priv; // private data (underlying video engine denotes it)
-
-    VideoCanvas()
-        : view(NULL)
-        , renderMode(RENDER_MODE_HIDDEN)
-        , uid(0)
-        , priv(NULL)
-    {}
-    VideoCanvas(view_t v, int m, uid_t u)
-        : view(v)
-        , renderMode(m)
-        , uid(u)
-        , priv(NULL)
-    {}
-};
-#else
-struct VideoCanvas;
-#endif
-
-class IPacketObserver
-{
-public:
-
-	struct Packet
-	{
-		const unsigned char* buffer;
-		unsigned int size;
-	};
-	/**
-	* called by sdk before the audio packet is sent to other participants
-	* @param [in,out] packet
-	*      buffer *buffer points the data to be sent
-	*      size of buffer data to be sent
-	* @return returns true to send out the packet, returns false to discard the packet
-	*/
-	virtual bool onSendAudioPacket(Packet& packet) = 0;
-	/**
-	* called by sdk before the video packet is sent to other participants
-	* @param [in,out] packet
-	*      buffer *buffer points the data to be sent
-	*      size of buffer data to be sent
-	* @return returns true to send out the packet, returns false to discard the packet
-	*/
-	virtual bool onSendVideoPacket(Packet& packet) = 0;
-	/**
-	* called by sdk when the audio packet is received from other participants
-	* @param [in,out] packet
-	*      buffer *buffer points the data to be sent
-	*      size of buffer data to be sent
-	* @return returns true to process the packet, returns false to discard the packet
-	*/
-	virtual bool onReceiveAudioPacket(Packet& packet) = 0;
-	/**
-	* called by sdk when the video packet is received from other participants
-	* @param [in,out] packet
-	*      buffer *buffer points the data to be sent
-	*      size of buffer data to be sent
-	* @return returns true to process the packet, returns false to discard the packet
-	*/
-	virtual bool onReceiveVideoPacket(Packet& packet) = 0;
-};
-
-
-/**
-* the event call back interface
-*/
-class IRtcEngineEventHandler
-{
-public:
-    virtual ~IRtcEngineEventHandler() {}
-
-    /**
-    * when join channel success, the function will be called
-    * @param [in] channel
-    *        the channel name you have joined
-    * @param [in] uid
-    *        the UID of you in this channel
-    * @param [in] elapsed
-    *        the time elapsed in ms from the joinChannel been called to joining completed
-    */
-    virtual void onJoinChannelSuccess(const char* channel, uid_t uid, int elapsed) {
-        (void)channel;
-        (void)uid;
-        (void)elapsed;
-    }
-
-    /**
-    * when join channel success, the function will be called
-    * @param [in] channel
-    *        the channel name you have joined
-    * @param [in] uid
-    *        the UID of you in this channel
-    * @param [in] elapsed
-    *        the time elapsed in ms elapsed
-    */
-    virtual void onRejoinChannelSuccess(const char* channel, uid_t uid, int elapsed) {
-        (void)channel;
-        (void)uid;
-        (void)elapsed;
-    }
-
-    /**
-    * when warning message coming, the function will be called
-    * @param [in] warn
-    *        warning code
-    * @param [in] msg
-    *        the warning message
-    */
-    virtual void onWarning(int warn, const char* msg) {
-        (void)warn;
-        (void)msg;
-    }
-
-    /**
-    * when error message come, the function will be called
-    * @param [in] err
-    *        error code
-    * @param [in] msg
-    *        the error message
-    */
-    virtual void onError(int err, const char* msg) {
-        (void)err;
-        (void)msg;
-    }
-
-    /**
-    * when audio quality message come, the function will be called
-    * @param [in] uid
-    *        the uid of the peer
-    * @param [in] quality
-    *        the quality of the user, see QUALITY_TYPE for value definition
-    * @param [in] delay
-    *        the average time of the audio packages delayed
-    * @param [in] lost
-    *        the rate of the audio packages lost
-    */
-    virtual void onAudioQuality(uid_t uid, int quality, unsigned short delay, unsigned short lost) {
-        (void)uid;
-        (void)quality;
-        (void)delay;
-        (void)lost;
-    }
-
-    /**
-    * when the audio volume information come, the function will be called
-    * @param [in] speakers
-    *        the array of the speakers' audio volume information
-    * @param [in] speakerNumber
-    *        the count of speakers in this array
-    * @param [in] totalVolume
-    *        the total volume of all users
-    */
-    virtual void onAudioVolumeIndication(const AudioVolumeInfo* speakers, unsigned int speakerNumber, int totalVolume) {
-        (void)speakers;
-        (void)speakerNumber;
-        (void)totalVolume;
-    }
-
-    /**
-    * when the audio volume information come, the function will be called
-    * @param [in] stats
-    *        the statistics of the call
-    */
-    virtual void onLeaveChannel(const RtcStats& stats) {
-        (void)stats;
-    }
-
-    /**
-    * when the information of the RTC engine stats come, the function will be called
-    * @param [in] stats
-    *        the RTC engine stats
-    */
-    virtual void onRtcStats(const RtcStats& stats) {
-        (void)stats;
-    }
-
-    /**
-    * when the audio device state changed(plugged or removed), the function will be called
-    * @param [in] deviceId
-    *        the ID of the state changed audio device
-    * @param [in] deviceType
-    *        the type of the audio device(playout device or record device)
-    * @param [in] deviceState
-    *        the device is been removed or added
-    */
-    virtual void onAudioDeviceStateChanged(const char* deviceId, int deviceType, int deviceState) {
-        (void)deviceId;
-        (void)deviceType;
-        (void)deviceState;
-    }
-
-    /**
-     * When audio mixing file playback finished, this function will be called
-     */
-    virtual void onAudioMixingFinished() {
-    }
-
-    /**
-     * When far-end rhythm begins/ends, these functions will be called
-     */
-    virtual void onRemoteAudioMixingBegin() {
-    }
-    virtual void onRemoteAudioMixingEnd() {
-    }
-
-    /**
-    * When audio effect playback finished, this function will be called
-    */
-    virtual void onAudioEffectFinished(int soundId) {
-    }
-
-    /**
-    * when the video device state changed(plugged or removed), the function will be called
-    * @param [in] deviceId
-    *        the ID of the state changed video device
-    * @param [in] deviceType
-    *        not used
-    * @param [in] deviceState
-    *        the device is been removed or added
-    */
-    virtual void onVideoDeviceStateChanged(const char* deviceId, int deviceType, int deviceState) {
-        (void)deviceId;
-        (void)deviceType;
-        (void)deviceState;
-    }
-
-    /**
-    * report the network quality
-	* @param [in] uid
-	*        the UID of the remote user
-	* @param [in] txQuality
-    *        the score of the send network quality 0~5 the higher the better
-	* @param [in] rxQuality
-	*        the score of the recv network quality 0~5 the higher the better
-	*/
-    virtual void onNetworkQuality(uid_t uid, int txQuality, int rxQuality) {
-		(void)uid;
-		(void)txQuality;
-		(void)rxQuality;
-    }
-
-    /**
-    * report the last-mile test network quality
-    * @param [in] quality
-    *        the score of the network quality 0~5 the higher the better
-    */
-    virtual void onLastmileQuality(int quality) {
-        (void)quality;
-    }
-
-    /**
-    * when the first local video frame displayed, the function will be called
-    * @param [in] width
-    *        the width of the video frame
-    * @param [in] height
-    *        the height of the video frame
-    * @param [in] elapsed
-    *        the time elapsed from channel joined in ms
-    */
-    virtual void onFirstLocalVideoFrame(int width, int height, int elapsed) {
-        (void)width;
-        (void)height;
-        (void)elapsed;
-    }
-
-    /**
-    * when the first remote video frame decoded, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] width
-    *        the width of the video frame
-    * @param [in] height
-    *        the height of the video frame
-    * @param [in] elapsed
-    *        the time elapsed from channel joined in ms
-    */
-    virtual void onFirstRemoteVideoDecoded(uid_t uid, int width, int height, int elapsed) {
-        (void)uid;
-        (void)width;
-        (void)height;
-        (void)elapsed;
-    }
-
-    /**
-     * when video size changed or rotation changed, the function will be called
-     * @param [in] uid
-     *        the UID of the remote user or local user (0)
-     * @param [in] width
-     *        the new width of the video
-     * @param [in] height
-     *        the new height of the video
-     * @param [in] rotation
-     *        the rotation of the video
-     */
-    virtual void onVideoSizeChanged(uid_t uid, int width, int height, int rotation) {
-        (void)uid;
-        (void)width;
-        (void)height;
-        (void)rotation;
-    }
-    
-    virtual void onRemoteVideoStateChanged(uid_t uid, REMOTE_VIDEO_STATE state) {
-        (void)uid;
-        (void)state;
-    }
-
-    /**
-    * when the first remote video frame displayed, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] width
-    *        the width of the video frame
-    * @param [in] height
-    *        the height of the video frame
-    * @param [in] elapsed
-    *        the time elapsed from remote user called joinChannel in ms
-    */
-    virtual void onFirstRemoteVideoFrame(uid_t uid, int width, int height, int elapsed) {
-        (void)uid;
-        (void)width;
-        (void)height;
-        (void)elapsed;
-    }
-
-    /**
-    * when any other user joined in the same channel, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] elapsed
-    *        the time elapsed from remote used called joinChannel to joining completed in ms
-    */
-    virtual void onUserJoined(uid_t uid, int elapsed) {
-        (void)uid;
-        (void)elapsed;
-    }
-
-    /**
-    * when user offline(exit channel or offline by accident), the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    */
-    virtual void onUserOffline(uid_t uid, USER_OFFLINE_REASON_TYPE reason) {
-        (void)uid;
-        (void)reason;
-    }
-
-    /**
-    * when remote user muted the audio stream, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] muted
-    *        true: the remote user muted the audio stream, false: the remote user unmuted the audio stream
-    */
-    virtual void onUserMuteAudio(uid_t uid, bool muted) {
-        (void)uid;
-        (void)muted;
-    }
-
-    /**
-    * when remote user muted the video stream, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] muted
-    *        true: the remote user muted the video stream, false: the remote user unmuted the video stream
-    */
-    virtual void onUserMuteVideo(uid_t uid, bool muted) {
-        (void)uid;
-        (void)muted;
-    }
-
-	/**
-	* when remote user enable video function, the function will be called
-	* @param [in] uid
-	*        the UID of the remote user
-	* @param [in] enabled
-	*        true: the remote user has enabled video function, false: the remote user has disabled video function
-	*/
-	virtual void onUserEnableVideo(uid_t uid, bool enabled) {
-		(void)uid;
-		(void)enabled;
-	}
-	
-	/**
-    * when remote user enable local video function, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] enabled
-    *        true: the remote user has enabled local video function, false: the remote user has disabled local video function
-    */
-    virtual void onUserEnableLocalVideo(uid_t uid, bool enabled) {
-        (void)uid;
-        (void)enabled;
-    }
-    
-    /**
-    * when api call executed completely, the function will be called
-    * @param [in] api
-    *        the api name
-    * @param [in] err
-    *        error code while 0 means OK
-    */
-    virtual void onApiCallExecuted(int err, const char* api, const char* result) {
-        (void)err;
-        (void)api;
-        (void)result;
-    }
-
-    /**
-	* reported local video stats
-	* @param [in] stats
-    *        the latest local video stats
-    */
-	virtual void onLocalVideoStats(const LocalVideoStats& stats) {
-		(void)stats;
-    }
-
-    /**
-    * reported remote video stats
-    * @param [in] stats
-	*        the latest remote video stats
-	*/
-	virtual void onRemoteVideoStats(const RemoteVideoStats& stats) {
-		(void)stats;
-    }
-
-    /**
-    * when the camera is ready to work, the function will be called
-    */
-    virtual void onCameraReady() {}
-
-    virtual void onCameraFocusAreaChanged(int x, int y, int width, int height) {
-        (void)x;
-        (void)y;
-        (void)width;
-        (void)height;
-    }
-
-    /**
-    * when all video stopped, the function will be called then you can repaint the video windows
-    */
-    virtual void onVideoStopped() {}
-
-    /**
-    * when the network can not worked well, the function will be called
-    */
-    virtual void onConnectionLost() {}
-
-    /**
-    * when local user disconnected by accident, the function will be called(then SDK will try to reconnect itself)
-    */
-    virtual void onConnectionInterrupted() {}
-    
-    /**
-     * when local user is banned by the server, the function will be called
-     */
-    virtual void onConnectionBanned() {}
-    
-    virtual void onRefreshRecordingServiceStatus(int status) {
-        (void)status;
-    }
-
-//    virtual void onStreamError(int streamId, int code, int parameter, const char* message, size_t length) {}
-    /**
-    * when stream message received, the function will be called
-    * @param [in] uid
-    *        UID of the peer who sends the message
-    * @param [in] streamId
-    *        APP can create multiple streams for sending messages of different purposes
-    * @param [in] data
-    *        the message data
-    * @param [in] length
-    *        the message length, in bytes
-    *        frame rate
-    */
-    virtual void onStreamMessage(uid_t uid, int streamId, const char* data, size_t length) {
-        (void)uid;
-        (void)streamId;
-        (void)data;
-        (void)length;
-    }
-
-	/**
-	* 
-	*/
-	virtual void onStreamMessageError(uid_t uid, int streamId, int code, int missed, int cached) {
-        (void)uid;
-        (void)streamId;
-        (void)code;
-        (void)missed;
-        (void)cached;
-    }
-
-    virtual void onMediaEngineLoadSuccess() {
-    }
-    virtual void onMediaEngineStartCallSuccess() {
-    }
-    /**
-    * when token is enabled, and specified token is invalid or expired, this function will be called.
-    * APP should generate a new token and call renewToken() to refresh the token.
-    * NOTE: to be compatible with previous version, ERR_TOKEN_EXPIRED and ERR_INVALID_TOKEN are also reported via onError() callback.
-    * You should move renew of token logic into this callback.
-    */
-    virtual void onRequestToken() {
-    }
-
-    /**
-    * when the first local audio frame generated, the function will be called
-    * @param [in] elapsed
-    *        the time elapsed from remote user called joinChannel in ms
-    */
-    virtual void onFirstLocalAudioFrame(int elapsed) {
-        (void)elapsed;
-    }
-
-    /**
-    * when the first remote audio frame arrived, the function will be called
-    * @param [in] uid
-    *        the UID of the remote user
-    * @param [in] elapsed
-    *        the time elapsed from remote user called joinChannel in ms
-    */
-    virtual void onFirstRemoteAudioFrame(uid_t uid, int elapsed) {
-        (void)uid;
-        (void)elapsed;
-    }
-    /** @param [in] uid
-    *        the speaker uid who is talking in the channel
-    */
-    virtual void onActiveSpeaker(uid_t uid) {
-        (void)uid;
-    }
-
-    /**
-    * when client role is successfully changed, the function will be called
-    */
-    virtual void onClientRoleChanged(CLIENT_ROLE_TYPE oldRole, CLIENT_ROLE_TYPE newRole) {
-    }
-
-    virtual void onAudioDeviceVolumeChanged(MEDIA_DEVICE_TYPE deviceType, int volume, bool muted) {
-        (void)deviceType;
-        (void)volume;
-        (void)muted;
-    }
-
-    virtual void onStreamPublished(const char *url, int error) {
-        (void)url;
-        (void)error;
-    }
-
-    virtual void onStreamUnpublished(const char *url) {
-        (void)url;
-    }
-
-    virtual void onTranscodingUpdated() {
-    }
-
-    virtual void onStreamInjectedStatus(const char* url, uid_t uid, int status) {
-        (void)url;
-        (void)uid;
-        (void)status;
-    }
-
-};
-
-/**
-* the video device collection interface
-*/
-class IVideoDeviceCollection
-{
-public:
-    /**
-    * get the audio device count
-    * @return returns the audio device count
-    */
-    virtual int getCount() = 0;
-
-    /**
-    * get audio device information
-    * @param [in] index
-    *        the index of the device in the device list
-    * @param [in, out] deviceName
-    *        the device name, UTF8 format
-    * @param [in, out] deviceId
-    *        the device ID, UTF8 format
-    * @return return 0 if success or an error code
-    */
-    virtual int getDevice(int index, char deviceName[MAX_DEVICE_ID_LENGTH], char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * set current active audio device
-    * @param [in] deviceId
-    *        the deviceId of the device you want to active currently
-    * @return return 0 if success or an error code
-    */
-    virtual int setDevice(const char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * release the resource
-    */
-    virtual void release() = 0;
-};
-
-class IVideoDeviceManager
-{
-public:
-
-    /**
-    * create the IVideoDeviceCollection interface pointer
-    * @return return the IVideoDeviceCollection interface or nullptr if failed
-    */
-    virtual IVideoDeviceCollection* enumerateVideoDevices() = 0;
-
-    /**
-    * active the video device for current using
-    * @param [in] deviceId
-    *        the deviceId of the device you want to active currently
-    * @return return 0 if success or the error code.
-    */
-    virtual int setDevice(const char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * get the current active video device
-    * @param [in, out] deviceId
-    *        the device id of the current active video device
-    * @return return 0 if success or an error code
-    */
-    virtual int getDevice(char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * test the video capture device to know whether it can worked well
-    * @param [in] hwnd
-    *        the HWND of the video-display window
-    * @return return 0 if success or an error code
-    */
-    virtual int startDeviceTest(view_t hwnd) = 0;
-
-    /**
-    * stop the video device testing
-    * @return return 0 if success or an error code
-    */
-    virtual int stopDeviceTest() = 0;
-
-    /**
-    * release the resource
-    */
-    virtual void release() = 0;
-};
-
-class IAudioDeviceCollection
-{
-public:
-    /**
-    * get the available devices count
-    * @return return the device count
-    */
-    virtual int getCount() = 0;
-
-    /**
-    * get video device information
-    * @param [in] index
-    *        the index of the device in the device list
-    * @param [in, out] deviceName
-    *        the device name, UTF8 format
-    * @param [in, out] deviceId
-    *        the device ID, UTF8 format
-    * @return return 0 if success or an error code
-    */
-    virtual int getDevice(int index, char deviceName[MAX_DEVICE_ID_LENGTH], char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * active the device for current using
-    * @param [in] deviceId
-    *        the deviceId of the device you want to active currently
-    * @return return 0 if success or the error code.
-    */
-    virtual int setDevice(const char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    virtual int setApplicationVolume(int volume) = 0;
-    virtual int getApplicationVolume(int& volume) = 0;
-    virtual int setApplicationMute(bool mute) = 0;
-    virtual int isApplicationMute(bool& mute) = 0;
-    /**
-    * release the resource
-    */
-    virtual void release() = 0;
-};
-
-class IAudioDeviceManager
-{
-public:
-    /**
-    * create the IAudioDeviceCollection interface pointer of the playback devices
-    * @return return the IVideoDeviceCollection interface or nullptr if failed
-    */
-    virtual IAudioDeviceCollection* enumeratePlaybackDevices() = 0;
-
-    /**
-    * create the IAudioDeviceCollection interface pointer of the Recording devices
-    * @return return the IVideoDeviceCollection interface or nullptr if failed
-    */
-    virtual IAudioDeviceCollection* enumerateRecordingDevices() = 0;
-
-    /**
-    * active the playback device for current using
-    * @param [in] deviceId
-    *        the deviceId of the playback device you want to active currently
-    * @return return 0 if success or the error code.
-    */
-    virtual int setPlaybackDevice(const char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * get the current active playback device
-    * @param [in, out] deviceId
-    *        the device id of the current active video device
-    * @return return 0 if success or an error code
-    */
-    virtual int getPlaybackDevice(char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * set current playback device volume
-    * @param [in] volume
-    *        the volume you want to set 0-255
-    * @return return 0 if success or an error code
-    */
-    virtual int setPlaybackDeviceVolume(int volume) = 0;
-
-    /**
-    * get current playback device volume
-    * @param [in, out] volume
-    *        the current playback device volume 0-255
-    * @return return 0 if success or an error code
-    */
-    virtual int getPlaybackDeviceVolume(int *volume) = 0;
-
-    /**
-    * active the recording audio device for current using
-    * @param [in] deviceId
-    *        the deviceId of the recording audio device you want to active currently
-    * @return return 0 if success or the error code.
-    */
-    virtual int setRecordingDevice(const char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * get the current active recording device
-    * @param [in, out] deviceId
-    *        the device id of the current active recording audio device
-    * @return return 0 if success or an error code
-    */
-    virtual int getRecordingDevice(char deviceId[MAX_DEVICE_ID_LENGTH]) = 0;
-
-    /**
-    * set current recording device volume
-    * @param [in] volume
-    *        the volume you want to set 0-255
-    * @return return 0 if success or an error code
-    */
-    virtual int setRecordingDeviceVolume(int volume) = 0;
-
-    /**
-    * get current recording device volume
-    * @param [in, out] volume
-    *        the current recording device volume 0-255
-    * @return return 0 if success or an error code
-    */
-    virtual int getRecordingDeviceVolume(int *volume) = 0;
-
-    virtual int setPlaybackDeviceMute(bool mute) = 0;
-    virtual int getPlaybackDeviceMute(bool *mute) = 0;
-    virtual int setRecordingDeviceMute(bool mute) = 0;
-    virtual int getRecordingDeviceMute(bool *mute) = 0;
-
-    /**
-    * test the playback audio device to know whether it can worked well
-    * @param [in] testAudioFilePath
-    *        the path of the .wav file
-    * @return return 0 if success and you can hear the sound of the .wav file or an error code.
-    */
-    virtual int startPlaybackDeviceTest(const char* testAudioFilePath) = 0;
-
-    /**
-    * stop the playback audio device testing
-    * @return return 0 if success or an error code
-    */
-    virtual int stopPlaybackDeviceTest() = 0;
-
-    /**
-    * test the recording audio device to know whether it can worked well
-    * @param [in] indicationInterval
-    *        the period in ms of the call back cycle
-    * @return return 0 if success or an error code
-    */
-    virtual int startRecordingDeviceTest(int indicationInterval) = 0;
-
-    /**
-    * stop the recording audio device testing
-    * @return return 0 if success or an error code
-    */
-    virtual int stopRecordingDeviceTest() = 0;
-
-    /**
-    * release the resource
-    */
-    virtual void release() = 0;
-};
-
-struct RtcEngineContext
-{
-    IRtcEngineEventHandler* eventHandler;
-    const char* appId;
-    RtcEngineContext()
-    :eventHandler(NULL)
-    ,appId(NULL)
-    {}
-};
-
-class IRtcEngine
-{
-public:
-    /**
-    * release the engine resource
-    * @param [in] sync
-    *        true: release the engine resources and return after all resources have been destroyed.
-    *              APP should try not to call release(true) in the engine's callbacks, call it this way in a separate thread instead.
-    *        false: notify engine to release its resources and returns without waiting for resources are really destroyed
-    */
-    virtual void release(bool sync=false) = 0;
-	
-	/**
-    * initialize the engine
-    * @param [in] context
-    *        the RTC engine context
-    * @return return 0 if success or an error code
-    */
-    virtual int initialize(const RtcEngineContext& context) = 0;
-
-    /**
-    * get the pointer of the device manager object.
-    * @param [in] iid
-    *        the iid of the interface you want to get
-    * @param [in, out] inter
-    *       the pointer of the pointer you want to point to DeviceManager object
-    * @return return 0 if success or an error code
-    */
-    virtual int queryInterface(INTERFACE_ID_TYPE iid, void** inter) = 0;
-
-    /**
-    * get the version information of the SDK
-    * @param [in, out] build
-    *        the build number
-    * @return return the version number string in char format
-    */
-    virtual const char* getVersion(int* build) = 0;
-
-    /**
-    * get the version information of the SDK
-    * @param [in, out] code
-    *        the build number
-    * @return return the version number string in char format
-    */
-    virtual const char* getErrorDescription(int code) = 0;
-
-    /**
-    * join the channel, if the channel have not been created, it will been created automatically
-  * @param [in] token
-    *        the token, if you have initialized the engine with an available APP ID, it can be null here. If you enable token on the dashboard, specify token here
-    * @param [in] channelId
-    *        the channel id
-  * @param [in] info
-    *        the additional information, it can be null here
-    * @param [in] uid
-    *        the uid of you, if 0 the system will automatically allocate one for you
-    * @return return 0 if success or an error code
-    */
-    virtual int joinChannel(const char* token, const char* channelId, const char* info, uid_t uid) = 0;
-
-    /**
-    * leave the current channel
-    * @return return 0 if success or an error code
-    */
-    virtual int leaveChannel() = 0;
-
-    /**
-    * renew the token for the current channel
-    * @param [in] token the renewed token, if old token expired.
-    * @return return 0 if success or an error code
-    */
-    virtual int renewToken(const char* token) = 0;
-
-    virtual int setChannelProfile(CHANNEL_PROFILE_TYPE profile) = 0;
-    virtual int setClientRole(CLIENT_ROLE_TYPE role) = 0;
-
-    /**
-    * start the echo testing, if every thing goes well you can hear your echo from the server
-    * @return return 0 if success or an error code
-    */
-    virtual int startEchoTest() = 0;
-
-    /**
-    * stop the echo testing
-    * @return return 0 if success or an error code
-    */
-    virtual int stopEchoTest() = 0;
-
-    /**
-    * start the network testing
-    * @return return 0 if success or an error code
-    */
-    virtual int enableLastmileTest() = 0;
-
-    /**
-    * stop the network testing
-    * @return return 0 if success or an error code
-    */
-    virtual int disableLastmileTest() = 0;
-
-    /**
-    * enable video function
-    * @return return 0 if success or an error code
-    */
-    virtual int enableVideo() = 0;
-
-    /**
-    * disable video function
-    * @return return 0 if success or an error code
-    */
-    virtual int disableVideo() = 0;
-
-    /**
-    * start the local video previewing
-    * @return return 0 if success or an error code
-    */
-    virtual int startPreview() = 0;
-
-    /**
-    * stop the local video previewing
-    * @return return 0 if success or an error code
-    */
-    virtual int stopPreview() = 0;
-
-    virtual int setVideoProfile(VIDEO_PROFILE_TYPE profile, bool swapWidthAndHeight) = 0;
-    /**
-    * set the remote video canvas
-    * @param [in] canvas
-    *        the canvas information
-    * @return return 0 if success or an error code
-    */
-    virtual int setupRemoteVideo(const VideoCanvas& canvas) = 0;
-
-    /**
-    * set the local video canvas
-    * @param [in] canvas
-    *        the canvas information
-    * @return return 0 if success or an error code
-    */
-    virtual int setupLocalVideo(const VideoCanvas& canvas) = 0;
-
-    /**
-    * enable audio function, which is enabled by deault.
-    * @return return 0 if success or an error code
-    */
-    virtual int enableAudio() = 0;
-
-    /**
-    * disable audio function
-    * @return return 0 if success or an error code
-    */
-    virtual int disableAudio() = 0;
-
-    virtual int setAudioProfile(AUDIO_PROFILE_TYPE profile, AUDIO_SCENARIO_TYPE scenario) = 0;
-
-#if defined(__APPLE__) || defined(_WIN32)
-
-#if defined(__APPLE__)
-  typedef unsigned int WindowIDType;
-#elif defined(_WIN32)
-  typedef HWND WindowIDType;
-#endif
-  /**
-   * start screen/windows capture
-   *
-   *  @param windowId screen capture, if windowId is 0; windows capture if windowsId isn't 0;
-   *  @param rect     valid when windowId is 0; whole screen if rect is NULL.
-   *
-   *  @return return 0 if success or an error code
-   */
-  virtual int startScreenCapture(WindowIDType windowId, int captureFreq, const Rect *rect, int bitrate) = 0;
-  
-  /**
-   * stop screen capture
-   * @return return 0 if success or an error code
-   */
-  virtual int stopScreenCapture() = 0;
-  
-  /**
-   * update screen capture region
-   *
-   *  @param rect     valid when windowId is 0; whole screen if rect is NULL.
-   *
-   *  @return return 0 if success or an error code
-   */
-  virtual int updateScreenCaptureRegion(const Rect *rect) = 0;
-#endif
-
-    /**
-    * get self call id in the current channel
-    * @param [in, out] callId
-    *        the self call Id
-    * @return return 0 if success or an error code
-    */
-    virtual int getCallId(agora::util::AString& callId) = 0;
-
-    virtual int rate(const char* callId, int rating, const char* description) = 0; // 0~10
-    virtual int complain(const char* callId, const char* description) = 0;
-
-    /**
-    * register a packet observer while the packet arrived or ready to be sent, the observer can touch the packet data
-    * @param [in] observer
-    *        the pointer of the observer object
-    * @return return 0 if success or an error code
-    */
-    virtual int registerPacketObserver(IPacketObserver* observer) = 0;
-
-	/**
-	* Specify encryption mode of AES encryption algorithm.
-	* @param [in] encryptionMode
-	*        encryption mode of AES algorithm, could be one of the following:
-	*          "aes-128-xts", "aes-256-xts".
-	*          The default value is "aes-128-xts". specify NULL value will use default encryption mode.
-	* @return return 0 if success or an error code
-	*/
-	virtual int setEncryptionMode(const char* encryptionMode) = 0;
-	/**
-	* Specify encryption secret enables built-in encryption function. Leaving channel will clear the secret specified in last channel
-	* @param [in] secret
-	*        secret to enable encryption
-	* @return return 0 if success or an error code
-	*/
-	virtual int setEncryptionSecret(const char* secret) = 0;
-
-    virtual int createDataStream(int* streamId, bool reliable, bool ordered) = 0;
-    virtual int sendStreamMessage(int streamId, const char* data, size_t length) = 0;
-
-    virtual int setVideoCompositingLayout(const VideoCompositingLayout& sei) = 0;
-    virtual int clearVideoCompositingLayout() = 0;
-	virtual int configPublisher(const PublisherConfiguration& config) = 0;
-
-    virtual int addPublishStreamUrl(const char *url, bool transcodingEnabled) = 0;
-    virtual int removePublishStreamUrl(const char *url) = 0;
-    virtual int setLiveTranscoding(const LiveTranscoding &transcoding) = 0;
-    
-    virtual int addVideoWatermark(const RtcImage& watermark) = 0;
-    virtual int clearVideoWatermarks() = 0;
-
-    virtual int addInjectStreamUrl(const char* url, const InjectStreamConfig& config) = 0;
-    virtual int removeInjectStreamUrl(const char* url) = 0;
-
-    virtual bool registerEventHandler(IRtcEngineEventHandler *eventHandler) = 0;
-    virtual bool unregisterEventHandler(IRtcEngineEventHandler *eventHandler) = 0;
-};
-
-
-class IRtcEngineParameter
-{
-public:
-    /**
-    * release the resource
-    */
-    virtual void release() = 0;
-
-    /**
-    * set bool value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int setBool(const char* key, bool value) = 0;
-
-    /**
-    * set int value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int setInt(const char* key, int value) = 0;
-
-    /**
-    * set unsigned int value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int setUInt(const char* key, unsigned int value) = 0;
-
-    /**
-    * set double value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int setNumber(const char* key, double value) = 0;
-
-    /**
-    * set string value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int setString(const char* key, const char* value) = 0;
-
-    /**
-    * set object value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int setObject(const char* key, const char* value) = 0;
-
-    /**
-    * get bool value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getBool(const char* key, bool& value) = 0;
-
-    /**
-    * get int value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getInt(const char* key, int& value) = 0;
-
-    /**
-    * get unsigned int value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getUInt(const char* key, unsigned int& value) = 0;
-
-    /**
-    * get double value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getNumber(const char* key, double& value) = 0;
-
-    /**
-    * get string value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getString(const char* key, agora::util::AString& value) = 0;
-
-    /**
-    * get a child object value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getObject(const char* key, agora::util::AString& value) = 0;
-
-    /**
-    * get array value of the json
-    * @param [in] key
-    *        the key name
-    * @param [in, out] value
-    *        the value
-    * @return return 0 if success or an error code
-    */
-    virtual int getArray(const char* key, agora::util::AString& value) = 0;
-
-    /**
-    * set parameters of the sdk or engine
-    * @param [in] parameters
-    *        the parameters
-    * @return return 0 if success or an error code
-    */
-    virtual int setParameters(const char* parameters) = 0;
-
-    /**
-    * set profile to control the RTC engine
-    * @param [in] profile
-    *        the profile
-    * @param [in] merge
-    *        if merge with the original value
-    * @return return 0 if success or an error code
-    */
-    virtual int setProfile(const char* profile, bool merge) = 0;
-
-	virtual int convertPath(const char* filePath, agora::util::AString& value) = 0;
-};
-
-class AAudioDeviceManager : public agora::util::AutoPtr<IAudioDeviceManager>
-{
-public:
-    AAudioDeviceManager(IRtcEngine* engine)
-    {
-		queryInterface(engine, AGORA_IID_AUDIO_DEVICE_MANAGER);
-    }
-};
-
-class AVideoDeviceManager : public agora::util::AutoPtr<IVideoDeviceManager>
-{
-public:
-    AVideoDeviceManager(IRtcEngine* engine)
-    {
-		queryInterface(engine, AGORA_IID_VIDEO_DEVICE_MANAGER);
-    }
-};
-
-class AParameter : public agora::util::AutoPtr<IRtcEngineParameter>
-{
-public:
-    AParameter(IRtcEngine& engine) { initialize(&engine); }
-    AParameter(IRtcEngine* engine) { initialize(engine); }
-    AParameter(IRtcEngineParameter* p) :agora::util::AutoPtr<IRtcEngineParameter>(p) {}
-private:
-    bool initialize(IRtcEngine* engine)
-    {
-        IRtcEngineParameter* p = NULL;
-        if (engine && !engine->queryInterface(AGORA_IID_RTC_ENGINE_PARAMETER, (void**)&p))
-            reset(p);
-        return p != NULL;
-    }
-};
-
-class RtcEngineParameters
-{
-public:
-    RtcEngineParameters(IRtcEngine& engine)
-        :m_parameter(&engine){}
-    RtcEngineParameters(IRtcEngine* engine)
-        :m_parameter(engine){}
-
-    /**
-    * mute/unmute the local stream capturing
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int muteLocalAudioStream(bool mute) {
-        return setParameters("{\"rtc.audio.mute_me\":%s,\"che.audio.mute_me\":%s}", mute ? "true" : "false", mute ? "true" : "false");
-    }
-    // mute/unmute all peers. unmute will clear all muted peers specified mutePeer() interface
-  /**
-    * mute/unmute all the remote audio stream receiving
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int muteAllRemoteAudioStreams(bool mute) {
-        return m_parameter ? m_parameter->setBool("rtc.audio.mute_peers", mute) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * set default mute/unmute all the remote audio stream receiving
-    * default value is false
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int setDefaultMuteAllRemoteAudioStreams(bool mute) {
-        return m_parameter ? m_parameter->setBool("rtc.audio.set_default_mute_peers", mute) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * mute/unmute one remote audio stream receiving
-    * @param [in] uid
-    *        the uid of the remote user you want to mute/unmute
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int muteRemoteAudioStream(uid_t uid, bool mute) {
-        return setObject("rtc.audio.mute_peer", "{\"uid\":%u,\"mute\":%s}", uid, mute?"true":"false");
-    }
-
-    /**
-    * mute/unmute local video stream sending
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int muteLocalVideoStream(bool mute) {
-        return setParameters("{\"rtc.video.mute_me\":%s,\"che.video.local.send\":%s}", mute ? "true" : "false", mute ? "false" : "true");
-    }
-	
-	int enableLocalVideo(bool enabled) {
-		return setParameters("{\"rtc.video.capture\":%s,\"che.video.local.capture\":%s,\"che.video.local.render\":%s,\"che.video.local.send\":%s}", enabled ? "true" : "false", enabled ? "true" : "false", enabled ? "true" : "false", enabled ? "true" : "false");
-	}
-    /**
-    * mute/unmute all the remote video stream receiving
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int muteAllRemoteVideoStreams(bool mute) {
-        return m_parameter ? m_parameter->setBool("rtc.video.mute_peers", mute) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * set default mute/unmute all the remote video stream receiving
-    * default value is false
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int setDefaultMuteAllRemoteVideoStreams(bool mute) {
-        return m_parameter ? m_parameter->setBool("rtc.video.set_default_mute_peers", mute) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * mute/unmute one remote video stream receiving
-    * @param [in] uid
-    *        the uid of the remote user you want to mute/unmute
-    * @param [in] mute
-    *        true:  mute
-    *       false: unmute
-    * @return return 0 if success or an error code
-    */
-    int muteRemoteVideoStream(uid_t uid, bool mute) {
-        return setObject("rtc.video.mute_peer", "{\"uid\":%u,\"mute\":%s}", uid, mute ? "true" : "false");
-    }
-
-    int setRemoteVideoStreamType(uid_t uid, REMOTE_VIDEO_STREAM_TYPE streamType) {
-        return setParameters("{\"rtc.video.set_remote_video_stream\":{\"uid\":%u,\"stream\":%d}, \"che.video.setstream\":{\"uid\":%u,\"stream\":%d}}", uid, streamType, uid, streamType);
-//        return setObject("rtc.video.set_remote_video_stream", "{\"uid\":%u,\"stream\":%d}", uid, streamType);
-    }
-
-    int setRemoteDefaultVideoStreamType(REMOTE_VIDEO_STREAM_TYPE streamType) {
-        return m_parameter ? m_parameter->setInt("rtc.video.set_remote_default_video_stream_type", streamType) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * set play sound volume
-    * @param [in] volume
-    *        the volume 0~255
-    * @return return 0 if success or an error code
-    */
-    int setPlaybackDeviceVolume(int volume) {// [0,255]
-        return m_parameter ? m_parameter->setInt("che.audio.output.volume", volume) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * enable or disable the audio volume indication
-    * @param [in] interval
-    *        the period of the call back cycle, in ms
-    *        interval <= 0: disable
-    *        interval >  0: enable
-    * @param [in] smooth
-    *        the smooth parameter
-    * @return return 0 if success or an error code
-    */
-    int enableAudioVolumeIndication(int interval, int smooth) { // in ms: <= 0: disable, > 0: enable, interval in ms
-        if (interval < 0)
-            interval = 0;
-        return setObject("che.audio.volume_indication", "{\"interval\":%d,\"smooth\":%d}", interval, smooth);
-    }
-
-    /**
-    * start recording the audio stream
-    * @param [in] filePath
-    *        the .wav file path you want to saved
-    * @return return 0 if success or an error code
-    */
-    int startAudioRecording(const char* filePath, AUDIO_RECORDING_QUALITY_TYPE quality) {
-        if (!m_parameter) return -ERR_NOT_INITIALIZED;
-#if defined(_WIN32)
-        util::AString path;
-        if (!m_parameter->convertPath(filePath, path))
-            filePath = path->c_str();
-        else
-            return -ERR_INVALID_ARGUMENT;
-#endif
-        return setObject("che.audio.start_recording", "{\"filePath\":\"%s\",\"quality\":%d}", filePath, quality);
-    }
-
-    /**
-    * stop recording the audio stream
-    * @return return 0 if success or an error code
-    */
-    int stopAudioRecording() {
-        return m_parameter ? m_parameter->setBool("che.audio.stop_recording", true) : -ERR_NOT_INITIALIZED;
-    }
-
-	/**
-	* mix microphone and local audio file into the audio stream
-	* @param [in] filePath
-	*        specify the path and file name of the audio file to be played
-	* @param [in] loopback
-	*        specify if local and remote participant can hear the audio file.
-	*        false (default): both local and remote party can hear the the audio file
-	*        true: only the local party can hear the audio file
-	* @param [in] replace
-	*        false (default): mix the local microphone captured voice with the audio file
-	*        true: replace the microphone captured voice with the audio file
-	* @param [in] cycle
-	*        specify the number of cycles to play
-	*        -1, infinite loop playback
-	* @return return 0 if success or an error code
-	*/
-	int startAudioMixing(const char* filePath, bool loopback, bool replace, int cycle) {
-        if (!m_parameter) return -ERR_NOT_INITIALIZED;
-#if defined(_WIN32)
-		util::AString path;
-		if (!m_parameter->convertPath(filePath, path))
-			filePath = path->c_str();
-		else
-			return -ERR_INVALID_ARGUMENT;
-#endif
-		return setObject("che.audio.start_file_as_playout", "{\"filePath\":\"%s\",\"loopback\":%s,\"replace\":%s,\"cycle\":%d}",
-					filePath,
-					loopback?"true":"false",
-					replace?"true":"false",
-					cycle);
-	}
-	/**
-	* stop mixing the local audio stream
-	* @return return 0 if success or an error code
-	*/
-	int stopAudioMixing() {
-        return m_parameter ? m_parameter->setBool("che.audio.stop_file_as_playout", true) : -ERR_NOT_INITIALIZED;
-	}
-
-    int pauseAudioMixing() {
-        return m_parameter ? m_parameter->setBool("che.audio.pause_file_as_playout", true) : -ERR_NOT_INITIALIZED;
-    }
-
-    int resumeAudioMixing() {
-        return m_parameter ? m_parameter->setBool("che.audio.pause_file_as_playout", false) : -ERR_NOT_INITIALIZED;
-    }
-
-    int adjustAudioMixingVolume(int volume) {
-        return m_parameter ? m_parameter->setInt("che.audio.set_file_as_playout_volume", volume) : -ERR_NOT_INITIALIZED;
-    }
-    int getAudioMixingDuration() {
-        int duration = 0;
-        int r = m_parameter ? m_parameter->getInt("che.audio.get_mixing_file_length_ms", duration) : -ERR_NOT_INITIALIZED;
-        if (r == 0)
-            r = duration;
-        return r;
-    }
-    int getAudioMixingCurrentPosition() {
-        if (!m_parameter) return -ERR_NOT_INITIALIZED;
-        int pos = 0;
-        int r = m_parameter->getInt("che.audio.get_mixing_file_played_ms", pos);
-        if (r == 0)
-            r = pos;
-        return r;
-    }
-    int setAudioMixingPosition(int pos /*in ms*/) {
-        return m_parameter ? m_parameter->setInt("che.audio.mixing.file.position", pos) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * Get audio effect volume.
-     * @return return audio effect volume on success, or one value less than 0 otherwise.
-     */
-    int getEffectsVolume() {
-        if (!m_parameter) return -ERR_NOT_INITIALIZED;
-        int volume = 0;
-        int r = m_parameter->getInt("che.audio.game_get_effects_volume", volume);
-        if (r == 0)
-            r = volume;
-        return r;
-    }
-
-    /**
-     * Set audio effect volume.
-     * param [in] volume
-             The volume to be set.
-     * @return return 0 on success or error number otherwise.
-     */
-    int setEffectsVolume(int volume) {
-        return m_parameter ? m_parameter->setInt("che.audio.game_set_effects_volume", volume) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * Set audio effect volume for effect with id : soundId
-     * @param [in] soundId
-              The soundId of the effect to be set.
-     * @param [in] volume
-              The volume value to be set
-     * @return return 0 on success, and error number otherwise.
-     */
-    int setVolumeOfEffect(int soundId, int volume) {
-        return setObject(
-            "che.audio.game_adjust_effect_volume",
-            "{\"soundId\":%d,\"gain\":%d}",
-            soundId, volume);
-    }
-    
-    /**
-     * To play effect
-     * @param [in] soundId
-     *        effect id
-     * @param [in] filePath
-     *        effect file path
-     * @param [in] loopCount
-     *        if loopCount
-     * @param [in] sendToFar
-     *        if send the effect to remote
-     * @param [in] pitch
-     *        sound pitch
-     * @param [in] pan
-     *        sound pan
-     * @param [in] gain
-     *        sound gain
-     * @param [in] publish
-     *        true  indicates that when this sound effect is played locally,
-     *              it is also published to Agora Could, so it can be heard by remote audience.
-     *
-     *        false indicates that when any sound effect is only heard locally without published to Agora Cloud.
-     * @return return 0 on success, error code otherwise.
-     *      
-     */
-    int playEffect(int soundId, const char* filePath, int loopCount, double pitch, double pan, int gain, bool publish = false) {
-#if defined(_WIN32)
-        util::AString path;
-        if (!m_parameter->convertPath(filePath, path))
-            filePath = path->c_str();
-        else if (!filePath)
-            filePath = "";
-#endif
-        return setObject(
-            "che.audio.game_play_effect",
-            "{\"soundId\":%d,\"filePath\":\"%s\",\"loopCount\":%d, \"pitch\":%lf,\"pan\":%lf,\"gain\":%d, \"send2far\":%d}",
-            soundId, filePath, loopCount, pitch, pan, gain, publish);
-    }
-
-    /**
-     * To stop effect
-     * @param [in] soundId
-     *        The effect's soundId
-     * @return return 0 on success, error code otherwise
-     */
-    int stopEffect(int soundId) {
-        return m_parameter ? m_parameter->setInt(
-            "che.audio.game_stop_effect", soundId) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * To stop all effects
-     * @return return 0 on success, error code otherwise
-     */
-    int stopAllEffects() {
-        return m_parameter ? m_parameter->setBool(
-            "che.audio.game_stop_all_effects", true) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * To preload effect
-     * @param [in] sound Id
-     *        effect sound id
-     * @param [in] filepath
-     *        effect file path
-     * @return return 0 on success or error code otherwise
-     */
-    int preloadEffect(int soundId, char* filePath) {
-        return setObject(
-            "che.audio.game_preload_effect",
-            "{\"soundId\":%d,\"filePath\":\"%s\"}",
-            soundId, filePath);
-    }
-
-    /**
-     * To unload effect
-     * @param [in] soundId
-     *        effect id
-     * @return return 0 on success, error code otherwise
-     */
-    int unloadEffect(int soundId) {
-        return m_parameter ? m_parameter->setInt(
-            "che.audio.game_unload_effect", soundId) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * To pause effect
-     * @param [in] soundId
-     *        effect id
-     * @return return 0 on success, error code otherwise.
-     */
-    int pauseEffect(int soundId) {
-        return m_parameter ? m_parameter->setInt(
-            "che.audio.game_pause_effect", soundId) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * To pause all effects
-     * @return return 0 on success, error code otherwise.
-     */
-    int pauseAllEffects() {
-        return m_parameter ? m_parameter->setBool(
-            "che.audio.game_pause_all_effects", true) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * To resume effect
-     * @param [in] soundId
-     *        effect id
-     * @return return 0 on success, error code otherwise
-     */
-    int resumeEffect(int soundId) {
-        return m_parameter ? m_parameter->setInt(
-            "che.audio.game_resume_effect", soundId) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * To resume all effects
-     * @return return 0 on success, error code otherwise.
-     */
-    int resumeAllEffects() {
-        return m_parameter ? m_parameter->setBool(
-            "che.audio.game_resume_all_effects", true) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * Change the pitch of local speaker's voice
-     * @param [in] pitch
-     *        frequency, in the range of [0.5..2.0], default value is 1.0
-     *
-     * @return return 0 if success or an error code
-     */
-    int setLocalVoicePitch(double pitch) {
-        return m_parameter ? m_parameter->setInt(
-            "che.audio.morph.pitch_shift",
-            static_cast<int>(pitch * 100)) : -ERR_NOT_INITIALIZED;
-    }
-    int setLocalVoiceEqualization(AUDIO_EQUALIZATION_BAND_FREQUENCY bandFrequency, int bandGain) {
-        return setObject(
-            "che.audio.morph.equalization",
-            "{\"index\":%d,\"gain\":%d}",
-            static_cast<int>(bandFrequency), bandGain);
-    }
-    int setLocalVoiceReverb(AUDIO_REVERB_TYPE reverbKey, int value) {
-        return setObject(
-            "che.audio.morph.reverb",
-            "{\"key\":%d,\"value\":%d}",
-            static_cast<int>(reverbKey), value);
-    }
-    /**
-     * Set the audio ears back's volume and effect
-     * @param [in] volume
-     *        set volume of audio ears back, in the range of [0..100], default value is 100
-     *
-     * @return return 0 if success or an error code
-     */
-    int setInEarMonitoringVolume(int volume) {
-        return m_parameter ? m_parameter->setInt("che.audio.headset.monitoring.parameter", volume) : -ERR_NOT_INITIALIZED;
-    }
-    /**
-     *  set audio profile and scenario
-     *  including sample rate, bit rate, mono/stereo, speech/music codec
-     *
-     *  @param [in] profile
-     *              enumeration definition about the audio's samplerate, bitrate, mono/stereo, speech/music codec
-     *  @param [in] scenario
-     *              enumeration definition about the audio scenario
-     *
-     *  @return 0 when executed successfully. return negative value if failed.
-     */
-    int setAudioProfile(AUDIO_PROFILE_TYPE profile, AUDIO_SCENARIO_TYPE scenario) {
-        return setObject(
-            "che.audio.profile",
-            "{\"config\":%d,\"scenario\":%d}",
-            static_cast<int>(profile), static_cast<int>(scenario));
-    }
-
-    /**
-     * disable audio function in channel, which will be recovered when leave channel.
-     * @return return 0 if success or an error code
-     */
-    int pauseAudio() {
-        return m_parameter ? m_parameter->setBool("che.pause.audio", true) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     * resume audio function in channel.
-     * @return return 0 if success or an error code
-     */
-    int resumeAudio() {
-        return m_parameter ? m_parameter->setBool("che.pause.audio", false) : -ERR_NOT_INITIALIZED;
-    }
-
-    int setExternalAudioSource(bool enabled, int sampleRate, int channels) {
-        if (enabled)
-            return setParameters("{\"che.audio.external_capture\":true,\"che.audio.external_capture.push\":true,\"che.audio.set_capture_raw_audio_format\":{\"sampleRate\":%d,\"channelCnt\":%d,\"mode\":%d}}", sampleRate, channels, RAW_AUDIO_FRAME_OP_MODE_TYPE::RAW_AUDIO_FRAME_OP_MODE_READ_WRITE);
-        else
-            return setParameters("{\"che.audio.external_capture\":false,\"che.audio.external_capture.push\":false}");
-    }
-
-    /**
-    * set path to save the log file
-    * @param [in] filePath
-    *        the .log file path you want to saved
-    * @return return 0 if success or an error code
-    */
-    int setLogFile(const char* filePath) {
-        if (!m_parameter) return -ERR_NOT_INITIALIZED;
-#if defined(_WIN32)
-		util::AString path;
-		if (!m_parameter->convertPath(filePath, path))
-			filePath = path->c_str();
-		else if (!filePath)
-			filePath = "";
-#endif
-		return m_parameter->setString("rtc.log_file", filePath);
-    }
-
-    /**
-    * set the log information filter level
-    * @param [in] filter
-    *        the filter level
-    * @return return 0 if success or an error code
-    */
-    int setLogFilter(unsigned int filter) {
-        return m_parameter ? m_parameter->setUInt("rtc.log_filter", filter&LOG_FILTER_MASK) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-    * set local video render mode
-    * @param [in] renderMode
-    *        the render mode
-    * @return return 0 if success or an error code
-    */
-    int setLocalRenderMode(RENDER_MODE_TYPE renderMode) {
-        return setRemoteRenderMode(0, renderMode);
-    }
-
-    /**
-    * set remote video render mode
-    * @param [in] renderMode
-    *        the render mode
-    * @return return 0 if success or an error code
-    */
-    int setRemoteRenderMode(uid_t uid, RENDER_MODE_TYPE renderMode) {
-        return setObject("che.video.render_mode", "{\"uid\":%u,\"mode\":%d}", uid, renderMode);
-    }
-    
-    int setLocalVideoMirrorMode(VIDEO_MIRROR_MODE_TYPE mirrorMode) {
-        if (!m_parameter) return -ERR_NOT_INITIALIZED;
-        const char *value;
-        switch (mirrorMode) {
-        case VIDEO_MIRROR_MODE_AUTO:
-            value = "default";
-            break;
-        case VIDEO_MIRROR_MODE_ENABLED:
-            value = "forceMirror";
-            break;
-        case VIDEO_MIRROR_MODE_DISABLED:
-            value = "disableMirror";
-            break;
-        default:
-            return -ERR_INVALID_ARGUMENT;
-        }
-        return m_parameter->setString("che.video.localViewMirrorSetting", value);
-    }
-	int startRecordingService(const char* recordingKey) {
-        return m_parameter ? m_parameter->setString("rtc.api.start_recording_service", recordingKey) : -ERR_NOT_INITIALIZED;
-    }
-    
-    int stopRecordingService(const char* recordingKey) {
-        return m_parameter ? m_parameter->setString("rtc.api.stop_recording_service", recordingKey) : -ERR_NOT_INITIALIZED;
-    }
-    
-    int refreshRecordingServiceStatus() {
-        return m_parameter ? m_parameter->setBool("rtc.api.query_recording_service_status", true) : -ERR_NOT_INITIALIZED;
-    }
-
-    int enableDualStreamMode(bool enabled) {
-        return setParameters("{\"rtc.dual_stream_mode\":%s,\"che.video.enableLowBitRateStream\":%d}", enabled ? "true" : "false", enabled ? 1 : 0);
-    }
-
-    int setRecordingAudioFrameParameters(int sampleRate, int channel, RAW_AUDIO_FRAME_OP_MODE_TYPE mode, int samplesPerCall) {
-        return setObject("che.audio.set_capture_raw_audio_format", "{\"sampleRate\":%d,\"channelCnt\":%d,\"mode\":%d,\"samplesPerCall\":%d}", sampleRate, channel, mode, samplesPerCall);
-    }
-    int setPlaybackAudioFrameParameters(int sampleRate, int channel, RAW_AUDIO_FRAME_OP_MODE_TYPE mode, int samplesPerCall) {
-        return setObject("che.audio.set_render_raw_audio_format", "{\"sampleRate\":%d,\"channelCnt\":%d,\"mode\":%d,\"samplesPerCall\":%d}", sampleRate, channel, mode, samplesPerCall);
-    }
-    int setMixedAudioFrameParameters(int sampleRate, int samplesPerCall) {
-        return setObject("che.audio.set_mixed_raw_audio_format", "{\"sampleRate\":%d,\"samplesPerCall\":%d}", sampleRate, samplesPerCall);
-    }
-  
-    int adjustRecordingSignalVolume(int volume) {//[0, 400]: e.g. 50~0.5x 100~1x 400~4x
-        if (volume < 0)
-            volume = 0;
-        else if (volume > 400)
-            volume = 400;
-        return m_parameter ? m_parameter->setInt("che.audio.record.signal.volume", volume) : -ERR_NOT_INITIALIZED;
-    }
-    int adjustPlaybackSignalVolume(int volume) {//[0, 400]
-        if (volume < 0)
-            volume = 0;
-        else if (volume > 400)
-            volume = 400;
-        return m_parameter ? m_parameter->setInt("che.audio.playout.signal.volume", volume) : -ERR_NOT_INITIALIZED;
-    }
-    /**
-     * @Deprecated. Agora does not recommend using this method.
-     * If you want to set the audio profile, see Set the Audio Profile (setAudioProfile).
-     */
-    int setHighQualityAudioParameters(bool fullband, bool stereo, bool fullBitrate) {
-        return setObject("che.audio.codec.hq", "{\"fullband\":%s,\"stereo\":%s,\"fullBitrate\":%s}", fullband ? "true" : "false", stereo ? "true" : "false", fullBitrate ? "true" : "false");
-    }
-    int enableWebSdkInteroperability(bool enabled) {//enable interoperability with zero-plugin web sdk
-        return setParameters("{\"rtc.video.web_h264_interop_enable\":%s,\"che.video.web_h264_interop_enable\":%s}", enabled ? "true" : "false", enabled ? "true" : "false");
-    }
-    //only for live broadcasting
-    int setVideoQualityParameters(bool preferFrameRateOverImageQuality) {
-        return setParameters("{\"rtc.video.prefer_frame_rate\":%s,\"che.video.prefer_frame_rate\":%s}", preferFrameRateOverImageQuality ? "true" : "false", preferFrameRateOverImageQuality ? "true" : "false");
-    }
-
-	int enableLoopbackRecording(bool enabled) {
-		return setParameters("{\"che.audio.loopback.recording\":%s}", enabled ? "true" : "false");
-	}
-
-protected:
-    AParameter& parameter() {
-        return m_parameter;
-    }
-    int setParameters(const char* format, ...) {
-        char buf[512];
-        va_list args;
-        va_start(args, format);
-        vsnprintf(buf, sizeof(buf)-1, format, args);
-        va_end(args);
-        return m_parameter ? m_parameter->setParameters(buf) : -ERR_NOT_INITIALIZED;
-    }
-    int setObject(const char* key, const char* format, ...) {
-        char buf[512];
-        va_list args;
-        va_start(args, format);
-        vsnprintf(buf, sizeof(buf)-1, format, args);
-        va_end(args);
-        return m_parameter ? m_parameter->setObject(key, buf) : -ERR_NOT_INITIALIZED;
-    }
-    int enableLocalVideoCapture(bool enabled) {
-        return m_parameter ? m_parameter->setBool("che.video.local.capture", enabled) : -ERR_NOT_INITIALIZED;
-    }
-    int enableLocalVideoRender(bool enabled) {
-        return m_parameter ? m_parameter->setBool("che.video.local.render", enabled) : -ERR_NOT_INITIALIZED;
-    }
-    int enableLocalVideoSend(bool enabled) {
-        return muteLocalVideoStream(!enabled);
-    }
-    int stopAllRemoteVideo() {
-        return m_parameter ? m_parameter->setBool("che.video.peer.stop_render", true) : -ERR_NOT_INITIALIZED;
-    }
-private:
-    AParameter m_parameter;
-};
-
-} //namespace rtc
-} // namespace agora
-
-
-/**
-* to get the version number of the SDK
-* @param [in, out] build
-*        the build number of Agora SDK
-* @return returns the string of the version of the SDK
-*/
-#define getAgoraRtcEngineVersion getAgoraSdkVersion
-
-/**
-* create the RTC engine object and return the pointer
-* @return returns the pointer of the RTC engine object
-*/
-AGORA_API agora::rtc::IRtcEngine* AGORA_CALL createAgoraRtcEngine();
-
-/**
-* create the RTC engine object and return the pointer
-* @param [in] err
-*        the error code
-* @return returns the description of the error code
-*/
-#define getAgoraRtcEngineErrorDescription getAgoraSdkErrorDescription
-#define setAgoraRtcEngineExternalSymbolLoader setAgoraSdkExternalSymbolLoader
-
-#endif
diff --git a/dependencies2013/win32/include/agora/IAgoraRtcEngine2.h b/dependencies2013/win32/include/agora/IAgoraRtcEngine2.h
deleted file mode 100644
index c6c80203..00000000
--- a/dependencies2013/win32/include/agora/IAgoraRtcEngine2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  Agora Media SDK
-//
-//  Created by Sting Feng in 2015-05.
-//  Copyright (c) 2015 Agora IO. All rights reserved.
-//
-#pragma once
-#include "IAgoraRtcEngine.h"
-
-namespace agora {
-namespace rtc {
-
-class IRtcEngine2 : public IRtcEngine
-{
-public:
-    /**
-    * Specify video stream parameters based on video profile
-    * @param [in] width
-    *        width of video resolution in pixel
-    * @param [in] height
-    *        height of video resolution in pixel
-    * @param [in] frameRate
-    *        frame rate in fps
-    * @param [in] bitrate
-    *        bit rate in kbps
-    * @return return 0 if success or an error code
-    */
-    virtual int setVideoProfileEx(int width, int height, int frameRate, int bitrate) = 0;
-};
-
-}}
diff --git a/dependencies2013/win32/include/agora/IAgoraService.h b/dependencies2013/win32/include/agora/IAgoraService.h
deleted file mode 100644
index e459f715..00000000
--- a/dependencies2013/win32/include/agora/IAgoraService.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  Agora SDK
-//
-//  Created by Sting Feng in 2017-11.
-//  Copyright (c) 2017 Agora.io. All rights reserved.
-//
-
-#ifndef AGORA_SERVICE_H
-#define AGORA_SERVICE_H
-#include "AgoraBase.h"
-
-namespace agora {
-    namespace rtc {
-        class IRtcEngine;
-    }
-    namespace signaling {
-        class ISignalingEngine;
-    }
-namespace base {
-
-struct AgoraServiceContext
-{
-};
-
-
-class IAgoraService
-{
-public:
-    virtual void release() = 0;
-	
-	/**
-    * initialize the engine
-    * @param [in] context
-    *        the RTC engine context
-    * @return return 0 if success or an error code
-    */
-    virtual int initialize(const AgoraServiceContext& context) = 0;
-
-    /**
-    * get the version information of the SDK
-    * @param [in, out] build
-    *        the build number
-    * @return return the version number string in char format
-    */
-    virtual const char* getVersion(int* build) = 0;
-
-    virtual rtc::IRtcEngine* createRtcEngine() = 0;
-    virtual signaling::ISignalingEngine* createSignalingEngine() = 0;
-};
-
-} //namespace base
-} // namespace agora
-
-/**
-* to get the version number of the SDK
-* @param [in, out] build
-*        the build number of Agora SDK
-* @return returns the string of the version of the SDK
-*/
-AGORA_API const char* AGORA_CALL getAgoraSdkVersion(int* build);
-
-/**
-* create the RTC engine object and return the pointer
-* @param [in] err
-*        the error code
-* @return returns the description of the error code
-*/
-AGORA_API const char* AGORA_CALL getAgoraSdkErrorDescription(int err);
-
-/**
-* create the Agora Service object and return the pointer
-* @return returns pointer of the Agora Service object
-*/
-AGORA_API agora::base::IAgoraService* AGORA_CALL createAgoraService();
-
-AGORA_API int AGORA_CALL setAgoraSdkExternalSymbolLoader(void* (*func)(const char* symname));
-
-#endif
diff --git a/dependencies2013/win32/include/curl/curl.h b/dependencies2013/win32/include/curl/curl.h
deleted file mode 100644
index 1df50841..00000000
--- a/dependencies2013/win32/include/curl/curl.h
+++ /dev/null
@@ -1,2429 +0,0 @@
-#ifndef __CURL_CURL_H
-#define __CURL_CURL_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/*
- * If you have libcurl problems, all docs and details are found here:
- *   https://curl.haxx.se/libcurl/
- *
- * curl-library mailing list subscription and unsubscription web interface:
- *   https://cool.haxx.se/mailman/listinfo/curl-library/
- */
-
-#include "curlver.h"         /* libcurl version defines   */
-#include "curlbuild.h"       /* libcurl build definitions */
-#include "curlrules.h"       /* libcurl rules enforcement */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && \
-     !defined(WIN32) && !defined(__SYMBIAN32__)
-#define WIN32
-#endif
-
-#include <stdio.h>
-#include <limits.h>
-
-#if defined(__FreeBSD__) && (__FreeBSD__ >= 2)
-/* Needed for __FreeBSD_version symbol definition */
-#include <osreldate.h>
-#endif
-
-/* The include stuff here below is mainly for time_t! */
-#include <sys/types.h>
-#include <time.h>
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
-      defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
-/* The check above prevents the winsock2 inclusion if winsock.h already was
-   included, since they can't co-exist without problems */
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-#endif
-
-/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
-   libc5-based Linux systems. Only include it on systems that are known to
-   require it! */
-#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
-    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
-    defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
-   (defined(__FreeBSD_version) && (__FreeBSD_version < 800000))
-#include <sys/select.h>
-#endif
-
-#if !defined(WIN32) && !defined(_WIN32_WCE)
-#include <sys/socket.h>
-#endif
-
-#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__)
-#include <sys/time.h>
-#endif
-
-#ifdef __BEOS__
-#include <support/SupportDefs.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURL;
-
-/*
- * libcurl external API function linkage decorations.
- */
-
-#ifdef CURL_STATICLIB
-#  define CURL_EXTERN
-#elif defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)
-#  if defined(BUILDING_LIBCURL)
-#    define CURL_EXTERN  __declspec(dllexport)
-#  else
-#    define CURL_EXTERN  __declspec(dllimport)
-#  endif
-#elif defined(BUILDING_LIBCURL) && defined(CURL_HIDDEN_SYMBOLS)
-#  define CURL_EXTERN CURL_EXTERN_SYMBOL
-#else
-#  define CURL_EXTERN
-#endif
-
-#ifndef curl_socket_typedef
-/* socket typedef */
-#if defined(WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
-typedef SOCKET curl_socket_t;
-#define CURL_SOCKET_BAD INVALID_SOCKET
-#else
-typedef int curl_socket_t;
-#define CURL_SOCKET_BAD -1
-#endif
-#define curl_socket_typedef
-#endif /* curl_socket_typedef */
-
-struct curl_httppost {
-  struct curl_httppost *next;       /* next entry in the list */
-  char *name;                       /* pointer to allocated name */
-  long namelength;                  /* length of name length */
-  char *contents;                   /* pointer to allocated data contents */
-  long contentslength;              /* length of contents field, see also
-                                       CURL_HTTPPOST_LARGE */
-  char *buffer;                     /* pointer to allocated buffer contents */
-  long bufferlength;                /* length of buffer field */
-  char *contenttype;                /* Content-Type */
-  struct curl_slist* contentheader; /* list of extra headers for this form */
-  struct curl_httppost *more;       /* if one field name has more than one
-                                       file, this link should link to following
-                                       files */
-  long flags;                       /* as defined below */
-
-/* specified content is a file name */
-#define CURL_HTTPPOST_FILENAME (1<<0)
-/* specified content is a file name */
-#define CURL_HTTPPOST_READFILE (1<<1)
-/* name is only stored pointer do not free in formfree */
-#define CURL_HTTPPOST_PTRNAME (1<<2)
-/* contents is only stored pointer do not free in formfree */
-#define CURL_HTTPPOST_PTRCONTENTS (1<<3)
-/* upload file from buffer */
-#define CURL_HTTPPOST_BUFFER (1<<4)
-/* upload file from pointer contents */
-#define CURL_HTTPPOST_PTRBUFFER (1<<5)
-/* upload file contents by using the regular read callback to get the data and
-   pass the given pointer as custom pointer */
-#define CURL_HTTPPOST_CALLBACK (1<<6)
-/* use size in 'contentlen', added in 7.46.0 */
-#define CURL_HTTPPOST_LARGE (1<<7)
-
-  char *showfilename;               /* The file name to show. If not set, the
-                                       actual file name will be used (if this
-                                       is a file part) */
-  void *userp;                      /* custom pointer used for
-                                       HTTPPOST_CALLBACK posts */
-  curl_off_t contentlen;            /* alternative length of contents
-                                       field. Used if CURL_HTTPPOST_LARGE is
-                                       set. Added in 7.46.0 */
-};
-
-/* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered
-   deprecated but was the only choice up until 7.31.0 */
-typedef int (*curl_progress_callback)(void *clientp,
-                                      double dltotal,
-                                      double dlnow,
-                                      double ultotal,
-                                      double ulnow);
-
-/* This is the CURLOPT_XFERINFOFUNCTION callback proto. It was introduced in
-   7.32.0, it avoids floating point and provides more detailed information. */
-typedef int (*curl_xferinfo_callback)(void *clientp,
-                                      curl_off_t dltotal,
-                                      curl_off_t dlnow,
-                                      curl_off_t ultotal,
-                                      curl_off_t ulnow);
-
-#ifndef CURL_MAX_WRITE_SIZE
-  /* Tests have proven that 20K is a very bad buffer size for uploads on
-     Windows, while 16K for some odd reason performed a lot better.
-     We do the ifndef check to allow this value to easier be changed at build
-     time for those who feel adventurous. The practical minimum is about
-     400 bytes since libcurl uses a buffer of this size as a scratch area
-     (unrelated to network send operations). */
-#define CURL_MAX_WRITE_SIZE 16384
-#endif
-
-#ifndef CURL_MAX_HTTP_HEADER
-/* The only reason to have a max limit for this is to avoid the risk of a bad
-   server feeding libcurl with a never-ending header that will cause reallocs
-   infinitely */
-#define CURL_MAX_HTTP_HEADER (100*1024)
-#endif
-
-/* This is a magic return code for the write callback that, when returned,
-   will signal libcurl to pause receiving on the current transfer. */
-#define CURL_WRITEFUNC_PAUSE 0x10000001
-
-typedef size_t (*curl_write_callback)(char *buffer,
-                                      size_t size,
-                                      size_t nitems,
-                                      void *outstream);
-
-
-
-/* enumeration of file types */
-typedef enum {
-  CURLFILETYPE_FILE = 0,
-  CURLFILETYPE_DIRECTORY,
-  CURLFILETYPE_SYMLINK,
-  CURLFILETYPE_DEVICE_BLOCK,
-  CURLFILETYPE_DEVICE_CHAR,
-  CURLFILETYPE_NAMEDPIPE,
-  CURLFILETYPE_SOCKET,
-  CURLFILETYPE_DOOR, /* is possible only on Sun Solaris now */
-
-  CURLFILETYPE_UNKNOWN /* should never occur */
-} curlfiletype;
-
-#define CURLFINFOFLAG_KNOWN_FILENAME    (1<<0)
-#define CURLFINFOFLAG_KNOWN_FILETYPE    (1<<1)
-#define CURLFINFOFLAG_KNOWN_TIME        (1<<2)
-#define CURLFINFOFLAG_KNOWN_PERM        (1<<3)
-#define CURLFINFOFLAG_KNOWN_UID         (1<<4)
-#define CURLFINFOFLAG_KNOWN_GID         (1<<5)
-#define CURLFINFOFLAG_KNOWN_SIZE        (1<<6)
-#define CURLFINFOFLAG_KNOWN_HLINKCOUNT  (1<<7)
-
-/* Content of this structure depends on information which is known and is
-   achievable (e.g. by FTP LIST parsing). Please see the url_easy_setopt(3) man
-   page for callbacks returning this structure -- some fields are mandatory,
-   some others are optional. The FLAG field has special meaning. */
-struct curl_fileinfo {
-  char *filename;
-  curlfiletype filetype;
-  time_t time;
-  unsigned int perm;
-  int uid;
-  int gid;
-  curl_off_t size;
-  long int hardlinks;
-
-  struct {
-    /* If some of these fields is not NULL, it is a pointer to b_data. */
-    char *time;
-    char *perm;
-    char *user;
-    char *group;
-    char *target; /* pointer to the target filename of a symlink */
-  } strings;
-
-  unsigned int flags;
-
-  /* used internally */
-  char * b_data;
-  size_t b_size;
-  size_t b_used;
-};
-
-/* return codes for CURLOPT_CHUNK_BGN_FUNCTION */
-#define CURL_CHUNK_BGN_FUNC_OK      0
-#define CURL_CHUNK_BGN_FUNC_FAIL    1 /* tell the lib to end the task */
-#define CURL_CHUNK_BGN_FUNC_SKIP    2 /* skip this chunk over */
-
-/* if splitting of data transfer is enabled, this callback is called before
-   download of an individual chunk started. Note that parameter "remains" works
-   only for FTP wildcard downloading (for now), otherwise is not used */
-typedef long (*curl_chunk_bgn_callback)(const void *transfer_info,
-                                        void *ptr,
-                                        int remains);
-
-/* return codes for CURLOPT_CHUNK_END_FUNCTION */
-#define CURL_CHUNK_END_FUNC_OK      0
-#define CURL_CHUNK_END_FUNC_FAIL    1 /* tell the lib to end the task */
-
-/* If splitting of data transfer is enabled this callback is called after
-   download of an individual chunk finished.
-   Note! After this callback was set then it have to be called FOR ALL chunks.
-   Even if downloading of this chunk was skipped in CHUNK_BGN_FUNC.
-   This is the reason why we don't need "transfer_info" parameter in this
-   callback and we are not interested in "remains" parameter too. */
-typedef long (*curl_chunk_end_callback)(void *ptr);
-
-/* return codes for FNMATCHFUNCTION */
-#define CURL_FNMATCHFUNC_MATCH    0 /* string corresponds to the pattern */
-#define CURL_FNMATCHFUNC_NOMATCH  1 /* pattern doesn't match the string */
-#define CURL_FNMATCHFUNC_FAIL     2 /* an error occurred */
-
-/* callback type for wildcard downloading pattern matching. If the
-   string matches the pattern, return CURL_FNMATCHFUNC_MATCH value, etc. */
-typedef int (*curl_fnmatch_callback)(void *ptr,
-                                     const char *pattern,
-                                     const char *string);
-
-/* These are the return codes for the seek callbacks */
-#define CURL_SEEKFUNC_OK       0
-#define CURL_SEEKFUNC_FAIL     1 /* fail the entire transfer */
-#define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking can't be done, so
-                                    libcurl might try other means instead */
-typedef int (*curl_seek_callback)(void *instream,
-                                  curl_off_t offset,
-                                  int origin); /* 'whence' */
-
-/* This is a return code for the read callback that, when returned, will
-   signal libcurl to immediately abort the current transfer. */
-#define CURL_READFUNC_ABORT 0x10000000
-/* This is a return code for the read callback that, when returned, will
-   signal libcurl to pause sending data on the current transfer. */
-#define CURL_READFUNC_PAUSE 0x10000001
-
-typedef size_t (*curl_read_callback)(char *buffer,
-                                      size_t size,
-                                      size_t nitems,
-                                      void *instream);
-
-typedef enum  {
-  CURLSOCKTYPE_IPCXN,  /* socket created for a specific IP connection */
-  CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */
-  CURLSOCKTYPE_LAST    /* never use */
-} curlsocktype;
-
-/* The return code from the sockopt_callback can signal information back
-   to libcurl: */
-#define CURL_SOCKOPT_OK 0
-#define CURL_SOCKOPT_ERROR 1 /* causes libcurl to abort and return
-                                CURLE_ABORTED_BY_CALLBACK */
-#define CURL_SOCKOPT_ALREADY_CONNECTED 2
-
-typedef int (*curl_sockopt_callback)(void *clientp,
-                                     curl_socket_t curlfd,
-                                     curlsocktype purpose);
-
-struct curl_sockaddr {
-  int family;
-  int socktype;
-  int protocol;
-  unsigned int addrlen; /* addrlen was a socklen_t type before 7.18.0 but it
-                           turned really ugly and painful on the systems that
-                           lack this type */
-  struct sockaddr addr;
-};
-
-typedef curl_socket_t
-(*curl_opensocket_callback)(void *clientp,
-                            curlsocktype purpose,
-                            struct curl_sockaddr *address);
-
-typedef int
-(*curl_closesocket_callback)(void *clientp, curl_socket_t item);
-
-typedef enum {
-  CURLIOE_OK,            /* I/O operation successful */
-  CURLIOE_UNKNOWNCMD,    /* command was unknown to callback */
-  CURLIOE_FAILRESTART,   /* failed to restart the read */
-  CURLIOE_LAST           /* never use */
-} curlioerr;
-
-typedef enum  {
-  CURLIOCMD_NOP,         /* no operation */
-  CURLIOCMD_RESTARTREAD, /* restart the read stream from start */
-  CURLIOCMD_LAST         /* never use */
-} curliocmd;
-
-typedef curlioerr (*curl_ioctl_callback)(CURL *handle,
-                                         int cmd,
-                                         void *clientp);
-
-/*
- * The following typedef's are signatures of malloc, free, realloc, strdup and
- * calloc respectively.  Function pointers of these types can be passed to the
- * curl_global_init_mem() function to set user defined memory management
- * callback routines.
- */
-typedef void *(*curl_malloc_callback)(size_t size);
-typedef void (*curl_free_callback)(void *ptr);
-typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
-typedef char *(*curl_strdup_callback)(const char *str);
-typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
-
-#define CURL_DID_MEMORY_FUNC_TYPEDEFS
-
-/* the kind of data that is passed to information_callback*/
-typedef enum {
-  CURLINFO_TEXT = 0,
-  CURLINFO_HEADER_IN,    /* 1 */
-  CURLINFO_HEADER_OUT,   /* 2 */
-  CURLINFO_DATA_IN,      /* 3 */
-  CURLINFO_DATA_OUT,     /* 4 */
-  CURLINFO_SSL_DATA_IN,  /* 5 */
-  CURLINFO_SSL_DATA_OUT, /* 6 */
-  CURLINFO_END
-} curl_infotype;
-
-typedef int (*curl_debug_callback)
-       (CURL *handle,      /* the handle/transfer this concerns */
-        curl_infotype type, /* what kind of data */
-        char *data,        /* points to the data */
-        size_t size,       /* size of the data pointed to */
-        void *userptr);    /* whatever the user please */
-
-/* All possible error codes from all sorts of curl functions. Future versions
-   may return other values, stay prepared.
-
-   Always add new return codes last. Never *EVER* remove any. The return
-   codes must remain the same!
- */
-
-typedef enum {
-  CURLE_OK = 0,
-  CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
-  CURLE_FAILED_INIT,             /* 2 */
-  CURLE_URL_MALFORMAT,           /* 3 */
-  CURLE_NOT_BUILT_IN,            /* 4 - [was obsoleted in August 2007 for
-                                    7.17.0, reused in April 2011 for 7.21.5] */
-  CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
-  CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
-  CURLE_COULDNT_CONNECT,         /* 7 */
-  CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */
-  CURLE_REMOTE_ACCESS_DENIED,    /* 9 a service was denied by the server
-                                    due to lack of access - when login fails
-                                    this is not returned. */
-  CURLE_FTP_ACCEPT_FAILED,       /* 10 - [was obsoleted in April 2006 for
-                                    7.15.4, reused in Dec 2011 for 7.24.0]*/
-  CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */
-  CURLE_FTP_ACCEPT_TIMEOUT,      /* 12 - timeout occurred accepting server
-                                    [was obsoleted in August 2007 for 7.17.0,
-                                    reused in Dec 2011 for 7.24.0]*/
-  CURLE_FTP_WEIRD_PASV_REPLY,    /* 13 */
-  CURLE_FTP_WEIRD_227_FORMAT,    /* 14 */
-  CURLE_FTP_CANT_GET_HOST,       /* 15 */
-  CURLE_HTTP2,                   /* 16 - A problem in the http2 framing layer.
-                                    [was obsoleted in August 2007 for 7.17.0,
-                                    reused in July 2014 for 7.38.0] */
-  CURLE_FTP_COULDNT_SET_TYPE,    /* 17 */
-  CURLE_PARTIAL_FILE,            /* 18 */
-  CURLE_FTP_COULDNT_RETR_FILE,   /* 19 */
-  CURLE_OBSOLETE20,              /* 20 - NOT USED */
-  CURLE_QUOTE_ERROR,             /* 21 - quote command failure */
-  CURLE_HTTP_RETURNED_ERROR,     /* 22 */
-  CURLE_WRITE_ERROR,             /* 23 */
-  CURLE_OBSOLETE24,              /* 24 - NOT USED */
-  CURLE_UPLOAD_FAILED,           /* 25 - failed upload "command" */
-  CURLE_READ_ERROR,              /* 26 - couldn't open/read from file */
-  CURLE_OUT_OF_MEMORY,           /* 27 */
-  /* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
-           instead of a memory allocation error if CURL_DOES_CONVERSIONS
-           is defined
-  */
-  CURLE_OPERATION_TIMEDOUT,      /* 28 - the timeout time was reached */
-  CURLE_OBSOLETE29,              /* 29 - NOT USED */
-  CURLE_FTP_PORT_FAILED,         /* 30 - FTP PORT operation failed */
-  CURLE_FTP_COULDNT_USE_REST,    /* 31 - the REST command failed */
-  CURLE_OBSOLETE32,              /* 32 - NOT USED */
-  CURLE_RANGE_ERROR,             /* 33 - RANGE "command" didn't work */
-  CURLE_HTTP_POST_ERROR,         /* 34 */
-  CURLE_SSL_CONNECT_ERROR,       /* 35 - wrong when connecting with SSL */
-  CURLE_BAD_DOWNLOAD_RESUME,     /* 36 - couldn't resume download */
-  CURLE_FILE_COULDNT_READ_FILE,  /* 37 */
-  CURLE_LDAP_CANNOT_BIND,        /* 38 */
-  CURLE_LDAP_SEARCH_FAILED,      /* 39 */
-  CURLE_OBSOLETE40,              /* 40 - NOT USED */
-  CURLE_FUNCTION_NOT_FOUND,      /* 41 */
-  CURLE_ABORTED_BY_CALLBACK,     /* 42 */
-  CURLE_BAD_FUNCTION_ARGUMENT,   /* 43 */
-  CURLE_OBSOLETE44,              /* 44 - NOT USED */
-  CURLE_INTERFACE_FAILED,        /* 45 - CURLOPT_INTERFACE failed */
-  CURLE_OBSOLETE46,              /* 46 - NOT USED */
-  CURLE_TOO_MANY_REDIRECTS,      /* 47 - catch endless re-direct loops */
-  CURLE_UNKNOWN_OPTION,          /* 48 - User specified an unknown option */
-  CURLE_TELNET_OPTION_SYNTAX,    /* 49 - Malformed telnet option */
-  CURLE_OBSOLETE50,              /* 50 - NOT USED */
-  CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint
-                                     wasn't verified fine */
-  CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */
-  CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */
-  CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as
-                                    default */
-  CURLE_SEND_ERROR,              /* 55 - failed sending network data */
-  CURLE_RECV_ERROR,              /* 56 - failure in receiving network data */
-  CURLE_OBSOLETE57,              /* 57 - NOT IN USE */
-  CURLE_SSL_CERTPROBLEM,         /* 58 - problem with the local certificate */
-  CURLE_SSL_CIPHER,              /* 59 - couldn't use specified cipher */
-  CURLE_SSL_CACERT,              /* 60 - problem with the CA cert (path?) */
-  CURLE_BAD_CONTENT_ENCODING,    /* 61 - Unrecognized/bad encoding */
-  CURLE_LDAP_INVALID_URL,        /* 62 - Invalid LDAP URL */
-  CURLE_FILESIZE_EXCEEDED,       /* 63 - Maximum file size exceeded */
-  CURLE_USE_SSL_FAILED,          /* 64 - Requested FTP SSL level failed */
-  CURLE_SEND_FAIL_REWIND,        /* 65 - Sending the data requires a rewind
-                                    that failed */
-  CURLE_SSL_ENGINE_INITFAILED,   /* 66 - failed to initialise ENGINE */
-  CURLE_LOGIN_DENIED,            /* 67 - user, password or similar was not
-                                    accepted and we failed to login */
-  CURLE_TFTP_NOTFOUND,           /* 68 - file not found on server */
-  CURLE_TFTP_PERM,               /* 69 - permission problem on server */
-  CURLE_REMOTE_DISK_FULL,        /* 70 - out of disk space on server */
-  CURLE_TFTP_ILLEGAL,            /* 71 - Illegal TFTP operation */
-  CURLE_TFTP_UNKNOWNID,          /* 72 - Unknown transfer ID */
-  CURLE_REMOTE_FILE_EXISTS,      /* 73 - File already exists */
-  CURLE_TFTP_NOSUCHUSER,         /* 74 - No such user */
-  CURLE_CONV_FAILED,             /* 75 - conversion failed */
-  CURLE_CONV_REQD,               /* 76 - caller must register conversion
-                                    callbacks using curl_easy_setopt options
-                                    CURLOPT_CONV_FROM_NETWORK_FUNCTION,
-                                    CURLOPT_CONV_TO_NETWORK_FUNCTION, and
-                                    CURLOPT_CONV_FROM_UTF8_FUNCTION */
-  CURLE_SSL_CACERT_BADFILE,      /* 77 - could not load CACERT file, missing
-                                    or wrong format */
-  CURLE_REMOTE_FILE_NOT_FOUND,   /* 78 - remote file not found */
-  CURLE_SSH,                     /* 79 - error from the SSH layer, somewhat
-                                    generic so the error message will be of
-                                    interest when this has happened */
-
-  CURLE_SSL_SHUTDOWN_FAILED,     /* 80 - Failed to shut down the SSL
-                                    connection */
-  CURLE_AGAIN,                   /* 81 - socket is not ready for send/recv,
-                                    wait till it's ready and try again (Added
-                                    in 7.18.2) */
-  CURLE_SSL_CRL_BADFILE,         /* 82 - could not load CRL file, missing or
-                                    wrong format (Added in 7.19.0) */
-  CURLE_SSL_ISSUER_ERROR,        /* 83 - Issuer check failed.  (Added in
-                                    7.19.0) */
-  CURLE_FTP_PRET_FAILED,         /* 84 - a PRET command failed */
-  CURLE_RTSP_CSEQ_ERROR,         /* 85 - mismatch of RTSP CSeq numbers */
-  CURLE_RTSP_SESSION_ERROR,      /* 86 - mismatch of RTSP Session Ids */
-  CURLE_FTP_BAD_FILE_LIST,       /* 87 - unable to parse FTP file list */
-  CURLE_CHUNK_FAILED,            /* 88 - chunk callback reported error */
-  CURLE_NO_CONNECTION_AVAILABLE, /* 89 - No connection available, the
-                                    session will be queued */
-  CURLE_SSL_PINNEDPUBKEYNOTMATCH, /* 90 - specified pinned public key did not
-                                     match */
-  CURLE_SSL_INVALIDCERTSTATUS,   /* 91 - invalid certificate status */
-  CURLE_HTTP2_STREAM,            /* 92 - stream error in HTTP/2 framing layer
-                                    */
-  CURL_LAST /* never use! */
-} CURLcode;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Previously obsolete error code re-used in 7.38.0 */
-#define CURLE_OBSOLETE16 CURLE_HTTP2
-
-/* Previously obsolete error codes re-used in 7.24.0 */
-#define CURLE_OBSOLETE10 CURLE_FTP_ACCEPT_FAILED
-#define CURLE_OBSOLETE12 CURLE_FTP_ACCEPT_TIMEOUT
-
-/*  compatibility with older names */
-#define CURLOPT_ENCODING CURLOPT_ACCEPT_ENCODING
-
-/* The following were added in 7.21.5, April 2011 */
-#define CURLE_UNKNOWN_TELNET_OPTION CURLE_UNKNOWN_OPTION
-
-/* The following were added in 7.17.1 */
-/* These are scheduled to disappear by 2009 */
-#define CURLE_SSL_PEER_CERTIFICATE CURLE_PEER_FAILED_VERIFICATION
-
-/* The following were added in 7.17.0 */
-/* These are scheduled to disappear by 2009 */
-#define CURLE_OBSOLETE CURLE_OBSOLETE50 /* no one should be using this! */
-#define CURLE_BAD_PASSWORD_ENTERED CURLE_OBSOLETE46
-#define CURLE_BAD_CALLING_ORDER CURLE_OBSOLETE44
-#define CURLE_FTP_USER_PASSWORD_INCORRECT CURLE_OBSOLETE10
-#define CURLE_FTP_CANT_RECONNECT CURLE_OBSOLETE16
-#define CURLE_FTP_COULDNT_GET_SIZE CURLE_OBSOLETE32
-#define CURLE_FTP_COULDNT_SET_ASCII CURLE_OBSOLETE29
-#define CURLE_FTP_WEIRD_USER_REPLY CURLE_OBSOLETE12
-#define CURLE_FTP_WRITE_ERROR CURLE_OBSOLETE20
-#define CURLE_LIBRARY_NOT_FOUND CURLE_OBSOLETE40
-#define CURLE_MALFORMAT_USER CURLE_OBSOLETE24
-#define CURLE_SHARE_IN_USE CURLE_OBSOLETE57
-#define CURLE_URL_MALFORMAT_USER CURLE_NOT_BUILT_IN
-
-#define CURLE_FTP_ACCESS_DENIED CURLE_REMOTE_ACCESS_DENIED
-#define CURLE_FTP_COULDNT_SET_BINARY CURLE_FTP_COULDNT_SET_TYPE
-#define CURLE_FTP_QUOTE_ERROR CURLE_QUOTE_ERROR
-#define CURLE_TFTP_DISKFULL CURLE_REMOTE_DISK_FULL
-#define CURLE_TFTP_EXISTS CURLE_REMOTE_FILE_EXISTS
-#define CURLE_HTTP_RANGE_ERROR CURLE_RANGE_ERROR
-#define CURLE_FTP_SSL_FAILED CURLE_USE_SSL_FAILED
-
-/* The following were added earlier */
-
-#define CURLE_OPERATION_TIMEOUTED CURLE_OPERATION_TIMEDOUT
-
-#define CURLE_HTTP_NOT_FOUND CURLE_HTTP_RETURNED_ERROR
-#define CURLE_HTTP_PORT_FAILED CURLE_INTERFACE_FAILED
-#define CURLE_FTP_COULDNT_STOR_FILE CURLE_UPLOAD_FAILED
-
-#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
-#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME
-
-/* This was the error code 50 in 7.7.3 and a few earlier versions, this
-   is no longer used by libcurl but is instead #defined here only to not
-   make programs break */
-#define CURLE_ALREADY_COMPLETE 99999
-
-/* Provide defines for really old option names */
-#define CURLOPT_FILE CURLOPT_WRITEDATA /* name changed in 7.9.7 */
-#define CURLOPT_INFILE CURLOPT_READDATA /* name changed in 7.9.7 */
-#define CURLOPT_WRITEHEADER CURLOPT_HEADERDATA
-
-/* Since long deprecated options with no code in the lib that does anything
-   with them. */
-#define CURLOPT_WRITEINFO CURLOPT_OBSOLETE40
-#define CURLOPT_CLOSEPOLICY CURLOPT_OBSOLETE72
-
-#endif /*!CURL_NO_OLDIES*/
-
-/* This prototype applies to all conversion callbacks */
-typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length);
-
-typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl,    /* easy handle */
-                                          void *ssl_ctx, /* actually an
-                                                            OpenSSL SSL_CTX */
-                                          void *userptr);
-
-typedef enum {
-  CURLPROXY_HTTP = 0,   /* added in 7.10, new in 7.19.4 default is to use
-                           CONNECT HTTP/1.1 */
-  CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT
-                               HTTP/1.0  */
-  CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already
-                           in 7.10 */
-  CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
-  CURLPROXY_SOCKS4A = 6, /* added in 7.18.0 */
-  CURLPROXY_SOCKS5_HOSTNAME = 7 /* Use the SOCKS5 protocol but pass along the
-                                   host name rather than the IP address. added
-                                   in 7.18.0 */
-} curl_proxytype;  /* this enum was added in 7.10 */
-
-/*
- * Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options:
- *
- * CURLAUTH_NONE         - No HTTP authentication
- * CURLAUTH_BASIC        - HTTP Basic authentication (default)
- * CURLAUTH_DIGEST       - HTTP Digest authentication
- * CURLAUTH_NEGOTIATE    - HTTP Negotiate (SPNEGO) authentication
- * CURLAUTH_GSSNEGOTIATE - Alias for CURLAUTH_NEGOTIATE (deprecated)
- * CURLAUTH_NTLM         - HTTP NTLM authentication
- * CURLAUTH_DIGEST_IE    - HTTP Digest authentication with IE flavour
- * CURLAUTH_NTLM_WB      - HTTP NTLM authentication delegated to winbind helper
- * CURLAUTH_ONLY         - Use together with a single other type to force no
- *                         authentication or just that single type
- * CURLAUTH_ANY          - All fine types set
- * CURLAUTH_ANYSAFE      - All fine types except Basic
- */
-
-#define CURLAUTH_NONE         ((unsigned long)0)
-#define CURLAUTH_BASIC        (((unsigned long)1)<<0)
-#define CURLAUTH_DIGEST       (((unsigned long)1)<<1)
-#define CURLAUTH_NEGOTIATE    (((unsigned long)1)<<2)
-/* Deprecated since the advent of CURLAUTH_NEGOTIATE */
-#define CURLAUTH_GSSNEGOTIATE CURLAUTH_NEGOTIATE
-#define CURLAUTH_NTLM         (((unsigned long)1)<<3)
-#define CURLAUTH_DIGEST_IE    (((unsigned long)1)<<4)
-#define CURLAUTH_NTLM_WB      (((unsigned long)1)<<5)
-#define CURLAUTH_ONLY         (((unsigned long)1)<<31)
-#define CURLAUTH_ANY          (~CURLAUTH_DIGEST_IE)
-#define CURLAUTH_ANYSAFE      (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE))
-
-#define CURLSSH_AUTH_ANY       ~0     /* all types supported by the server */
-#define CURLSSH_AUTH_NONE      0      /* none allowed, silly but complete */
-#define CURLSSH_AUTH_PUBLICKEY (1<<0) /* public/private key files */
-#define CURLSSH_AUTH_PASSWORD  (1<<1) /* password */
-#define CURLSSH_AUTH_HOST      (1<<2) /* host key files */
-#define CURLSSH_AUTH_KEYBOARD  (1<<3) /* keyboard interactive */
-#define CURLSSH_AUTH_AGENT     (1<<4) /* agent (ssh-agent, pageant...) */
-#define CURLSSH_AUTH_DEFAULT CURLSSH_AUTH_ANY
-
-#define CURLGSSAPI_DELEGATION_NONE        0      /* no delegation (default) */
-#define CURLGSSAPI_DELEGATION_POLICY_FLAG (1<<0) /* if permitted by policy */
-#define CURLGSSAPI_DELEGATION_FLAG        (1<<1) /* delegate always */
-
-#define CURL_ERROR_SIZE 256
-
-enum curl_khtype {
-  CURLKHTYPE_UNKNOWN,
-  CURLKHTYPE_RSA1,
-  CURLKHTYPE_RSA,
-  CURLKHTYPE_DSS
-};
-
-struct curl_khkey {
-  const char *key; /* points to a zero-terminated string encoded with base64
-                      if len is zero, otherwise to the "raw" data */
-  size_t len;
-  enum curl_khtype keytype;
-};
-
-/* this is the set of return values expected from the curl_sshkeycallback
-   callback */
-enum curl_khstat {
-  CURLKHSTAT_FINE_ADD_TO_FILE,
-  CURLKHSTAT_FINE,
-  CURLKHSTAT_REJECT, /* reject the connection, return an error */
-  CURLKHSTAT_DEFER,  /* do not accept it, but we can't answer right now so
-                        this causes a CURLE_DEFER error but otherwise the
-                        connection will be left intact etc */
-  CURLKHSTAT_LAST    /* not for use, only a marker for last-in-list */
-};
-
-/* this is the set of status codes pass in to the callback */
-enum curl_khmatch {
-  CURLKHMATCH_OK,       /* match */
-  CURLKHMATCH_MISMATCH, /* host found, key mismatch! */
-  CURLKHMATCH_MISSING,  /* no matching host/key found */
-  CURLKHMATCH_LAST      /* not for use, only a marker for last-in-list */
-};
-
-typedef int
-  (*curl_sshkeycallback) (CURL *easy,     /* easy handle */
-                          const struct curl_khkey *knownkey, /* known */
-                          const struct curl_khkey *foundkey, /* found */
-                          enum curl_khmatch, /* libcurl's view on the keys */
-                          void *clientp); /* custom pointer passed from app */
-
-/* parameter for the CURLOPT_USE_SSL option */
-typedef enum {
-  CURLUSESSL_NONE,    /* do not attempt to use SSL */
-  CURLUSESSL_TRY,     /* try using SSL, proceed anyway otherwise */
-  CURLUSESSL_CONTROL, /* SSL for the control connection or fail */
-  CURLUSESSL_ALL,     /* SSL for all communication or fail */
-  CURLUSESSL_LAST     /* not an option, never use */
-} curl_usessl;
-
-/* Definition of bits for the CURLOPT_SSL_OPTIONS argument: */
-
-/* - ALLOW_BEAST tells libcurl to allow the BEAST SSL vulnerability in the
-   name of improving interoperability with older servers. Some SSL libraries
-   have introduced work-arounds for this flaw but those work-arounds sometimes
-   make the SSL communication fail. To regain functionality with those broken
-   servers, a user can this way allow the vulnerability back. */
-#define CURLSSLOPT_ALLOW_BEAST (1<<0)
-
-/* - NO_REVOKE tells libcurl to disable certificate revocation checks for those
-   SSL backends where such behavior is present. */
-#define CURLSSLOPT_NO_REVOKE (1<<1)
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-/* These are scheduled to disappear by 2009 */
-
-#define CURLFTPSSL_NONE CURLUSESSL_NONE
-#define CURLFTPSSL_TRY CURLUSESSL_TRY
-#define CURLFTPSSL_CONTROL CURLUSESSL_CONTROL
-#define CURLFTPSSL_ALL CURLUSESSL_ALL
-#define CURLFTPSSL_LAST CURLUSESSL_LAST
-#define curl_ftpssl curl_usessl
-#endif /*!CURL_NO_OLDIES*/
-
-/* parameter for the CURLOPT_FTP_SSL_CCC option */
-typedef enum {
-  CURLFTPSSL_CCC_NONE,    /* do not send CCC */
-  CURLFTPSSL_CCC_PASSIVE, /* Let the server initiate the shutdown */
-  CURLFTPSSL_CCC_ACTIVE,  /* Initiate the shutdown */
-  CURLFTPSSL_CCC_LAST     /* not an option, never use */
-} curl_ftpccc;
-
-/* parameter for the CURLOPT_FTPSSLAUTH option */
-typedef enum {
-  CURLFTPAUTH_DEFAULT, /* let libcurl decide */
-  CURLFTPAUTH_SSL,     /* use "AUTH SSL" */
-  CURLFTPAUTH_TLS,     /* use "AUTH TLS" */
-  CURLFTPAUTH_LAST /* not an option, never use */
-} curl_ftpauth;
-
-/* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */
-typedef enum {
-  CURLFTP_CREATE_DIR_NONE,  /* do NOT create missing dirs! */
-  CURLFTP_CREATE_DIR,       /* (FTP/SFTP) if CWD fails, try MKD and then CWD
-                               again if MKD succeeded, for SFTP this does
-                               similar magic */
-  CURLFTP_CREATE_DIR_RETRY, /* (FTP only) if CWD fails, try MKD and then CWD
-                               again even if MKD failed! */
-  CURLFTP_CREATE_DIR_LAST   /* not an option, never use */
-} curl_ftpcreatedir;
-
-/* parameter for the CURLOPT_FTP_FILEMETHOD option */
-typedef enum {
-  CURLFTPMETHOD_DEFAULT,   /* let libcurl pick */
-  CURLFTPMETHOD_MULTICWD,  /* single CWD operation for each path part */
-  CURLFTPMETHOD_NOCWD,     /* no CWD at all */
-  CURLFTPMETHOD_SINGLECWD, /* one CWD to full dir, then work on file */
-  CURLFTPMETHOD_LAST       /* not an option, never use */
-} curl_ftpmethod;
-
-/* bitmask defines for CURLOPT_HEADEROPT */
-#define CURLHEADER_UNIFIED  0
-#define CURLHEADER_SEPARATE (1<<0)
-
-/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
-#define CURLPROTO_HTTP   (1<<0)
-#define CURLPROTO_HTTPS  (1<<1)
-#define CURLPROTO_FTP    (1<<2)
-#define CURLPROTO_FTPS   (1<<3)
-#define CURLPROTO_SCP    (1<<4)
-#define CURLPROTO_SFTP   (1<<5)
-#define CURLPROTO_TELNET (1<<6)
-#define CURLPROTO_LDAP   (1<<7)
-#define CURLPROTO_LDAPS  (1<<8)
-#define CURLPROTO_DICT   (1<<9)
-#define CURLPROTO_FILE   (1<<10)
-#define CURLPROTO_TFTP   (1<<11)
-#define CURLPROTO_IMAP   (1<<12)
-#define CURLPROTO_IMAPS  (1<<13)
-#define CURLPROTO_POP3   (1<<14)
-#define CURLPROTO_POP3S  (1<<15)
-#define CURLPROTO_SMTP   (1<<16)
-#define CURLPROTO_SMTPS  (1<<17)
-#define CURLPROTO_RTSP   (1<<18)
-#define CURLPROTO_RTMP   (1<<19)
-#define CURLPROTO_RTMPT  (1<<20)
-#define CURLPROTO_RTMPE  (1<<21)
-#define CURLPROTO_RTMPTE (1<<22)
-#define CURLPROTO_RTMPS  (1<<23)
-#define CURLPROTO_RTMPTS (1<<24)
-#define CURLPROTO_GOPHER (1<<25)
-#define CURLPROTO_SMB    (1<<26)
-#define CURLPROTO_SMBS   (1<<27)
-#define CURLPROTO_ALL    (~0) /* enable everything */
-
-/* long may be 32 or 64 bits, but we should never depend on anything else
-   but 32 */
-#define CURLOPTTYPE_LONG          0
-#define CURLOPTTYPE_OBJECTPOINT   10000
-#define CURLOPTTYPE_STRINGPOINT   10000
-#define CURLOPTTYPE_FUNCTIONPOINT 20000
-#define CURLOPTTYPE_OFF_T         30000
-
-/* *STRINGPOINT is an alias for OBJECTPOINT to allow tools to extract the
-   string options from the header file */
-
-/* name is uppercase CURLOPT_<name>,
-   type is one of the defined CURLOPTTYPE_<type>
-   number is unique identifier */
-#ifdef CINIT
-#undef CINIT
-#endif
-
-#ifdef CURL_ISOCPP
-#define CINIT(na,t,nu) CURLOPT_ ## na = CURLOPTTYPE_ ## t + nu
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define STRINGPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLOPT_/**/name = type + number
-#endif
-
-/*
- * This macro-mania below setups the CURLOPT_[what] enum, to be used with
- * curl_easy_setopt(). The first argument in the CINIT() macro is the [what]
- * word.
- */
-
-typedef enum {
-  /* This is the FILE * or void * the regular output should be written to. */
-  CINIT(WRITEDATA, OBJECTPOINT, 1),
-
-  /* The full URL to get/put */
-  CINIT(URL, STRINGPOINT, 2),
-
-  /* Port number to connect to, if other than default. */
-  CINIT(PORT, LONG, 3),
-
-  /* Name of proxy to use. */
-  CINIT(PROXY, STRINGPOINT, 4),
-
-  /* "user:password;options" to use when fetching. */
-  CINIT(USERPWD, STRINGPOINT, 5),
-
-  /* "user:password" to use with proxy. */
-  CINIT(PROXYUSERPWD, STRINGPOINT, 6),
-
-  /* Range to get, specified as an ASCII string. */
-  CINIT(RANGE, STRINGPOINT, 7),
-
-  /* not used */
-
-  /* Specified file stream to upload from (use as input): */
-  CINIT(READDATA, OBJECTPOINT, 9),
-
-  /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
-   * bytes big. If this is not used, error messages go to stderr instead: */
-  CINIT(ERRORBUFFER, OBJECTPOINT, 10),
-
-  /* Function that will be called to store the output (instead of fwrite). The
-   * parameters will use fwrite() syntax, make sure to follow them. */
-  CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
-
-  /* Function that will be called to read the input (instead of fread). The
-   * parameters will use fread() syntax, make sure to follow them. */
-  CINIT(READFUNCTION, FUNCTIONPOINT, 12),
-
-  /* Time-out the read operation after this amount of seconds */
-  CINIT(TIMEOUT, LONG, 13),
-
-  /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
-   * how large the file being sent really is. That allows better error
-   * checking and better verifies that the upload was successful. -1 means
-   * unknown size.
-   *
-   * For large file support, there is also a _LARGE version of the key
-   * which takes an off_t type, allowing platforms with larger off_t
-   * sizes to handle larger files.  See below for INFILESIZE_LARGE.
-   */
-  CINIT(INFILESIZE, LONG, 14),
-
-  /* POST static input fields. */
-  CINIT(POSTFIELDS, OBJECTPOINT, 15),
-
-  /* Set the referrer page (needed by some CGIs) */
-  CINIT(REFERER, STRINGPOINT, 16),
-
-  /* Set the FTP PORT string (interface name, named or numerical IP address)
-     Use i.e '-' to use default address. */
-  CINIT(FTPPORT, STRINGPOINT, 17),
-
-  /* Set the User-Agent string (examined by some CGIs) */
-  CINIT(USERAGENT, STRINGPOINT, 18),
-
-  /* If the download receives less than "low speed limit" bytes/second
-   * during "low speed time" seconds, the operations is aborted.
-   * You could i.e if you have a pretty high speed connection, abort if
-   * it is less than 2000 bytes/sec during 20 seconds.
-   */
-
-  /* Set the "low speed limit" */
-  CINIT(LOW_SPEED_LIMIT, LONG, 19),
-
-  /* Set the "low speed time" */
-  CINIT(LOW_SPEED_TIME, LONG, 20),
-
-  /* Set the continuation offset.
-   *
-   * Note there is also a _LARGE version of this key which uses
-   * off_t types, allowing for large file offsets on platforms which
-   * use larger-than-32-bit off_t's.  Look below for RESUME_FROM_LARGE.
-   */
-  CINIT(RESUME_FROM, LONG, 21),
-
-  /* Set cookie in request: */
-  CINIT(COOKIE, STRINGPOINT, 22),
-
-  /* This points to a linked list of headers, struct curl_slist kind. This
-     list is also used for RTSP (in spite of its name) */
-  CINIT(HTTPHEADER, OBJECTPOINT, 23),
-
-  /* This points to a linked list of post entries, struct curl_httppost */
-  CINIT(HTTPPOST, OBJECTPOINT, 24),
-
-  /* name of the file keeping your private SSL-certificate */
-  CINIT(SSLCERT, STRINGPOINT, 25),
-
-  /* password for the SSL or SSH private key */
-  CINIT(KEYPASSWD, STRINGPOINT, 26),
-
-  /* send TYPE parameter? */
-  CINIT(CRLF, LONG, 27),
-
-  /* send linked-list of QUOTE commands */
-  CINIT(QUOTE, OBJECTPOINT, 28),
-
-  /* send FILE * or void * to store headers to, if you use a callback it
-     is simply passed to the callback unmodified */
-  CINIT(HEADERDATA, OBJECTPOINT, 29),
-
-  /* point to a file to read the initial cookies from, also enables
-     "cookie awareness" */
-  CINIT(COOKIEFILE, STRINGPOINT, 31),
-
-  /* What version to specifically try to use.
-     See CURL_SSLVERSION defines below. */
-  CINIT(SSLVERSION, LONG, 32),
-
-  /* What kind of HTTP time condition to use, see defines */
-  CINIT(TIMECONDITION, LONG, 33),
-
-  /* Time to use with the above condition. Specified in number of seconds
-     since 1 Jan 1970 */
-  CINIT(TIMEVALUE, LONG, 34),
-
-  /* 35 = OBSOLETE */
-
-  /* Custom request, for customizing the get command like
-     HTTP: DELETE, TRACE and others
-     FTP: to use a different list command
-     */
-  CINIT(CUSTOMREQUEST, STRINGPOINT, 36),
-
-  /* FILE handle to use instead of stderr */
-  CINIT(STDERR, OBJECTPOINT, 37),
-
-  /* 38 is not used */
-
-  /* send linked-list of post-transfer QUOTE commands */
-  CINIT(POSTQUOTE, OBJECTPOINT, 39),
-
-  CINIT(OBSOLETE40, OBJECTPOINT, 40), /* OBSOLETE, do not use! */
-
-  CINIT(VERBOSE, LONG, 41),      /* talk a lot */
-  CINIT(HEADER, LONG, 42),       /* throw the header out too */
-  CINIT(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
-  CINIT(NOBODY, LONG, 44),       /* use HEAD to get http document */
-  CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 400 */
-  CINIT(UPLOAD, LONG, 46),       /* this is an upload */
-  CINIT(POST, LONG, 47),         /* HTTP POST method */
-  CINIT(DIRLISTONLY, LONG, 48),  /* bare names when listing directories */
-
-  CINIT(APPEND, LONG, 50),       /* Append instead of overwrite on upload! */
-
-  /* Specify whether to read the user+password from the .netrc or the URL.
-   * This must be one of the CURL_NETRC_* enums below. */
-  CINIT(NETRC, LONG, 51),
-
-  CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
-
-  CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
-  CINIT(PUT, LONG, 54),          /* HTTP PUT */
-
-  /* 55 = OBSOLETE */
-
-  /* DEPRECATED
-   * Function that will be called instead of the internal progress display
-   * function. This function should be defined as the curl_progress_callback
-   * prototype defines. */
-  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
-
-  /* Data passed to the CURLOPT_PROGRESSFUNCTION and CURLOPT_XFERINFOFUNCTION
-     callbacks */
-  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
-#define CURLOPT_XFERINFODATA CURLOPT_PROGRESSDATA
-
-  /* We want the referrer field set automatically when following locations */
-  CINIT(AUTOREFERER, LONG, 58),
-
-  /* Port of the proxy, can be set in the proxy string as well with:
-     "[host]:[port]" */
-  CINIT(PROXYPORT, LONG, 59),
-
-  /* size of the POST input data, if strlen() is not good to use */
-  CINIT(POSTFIELDSIZE, LONG, 60),
-
-  /* tunnel non-http operations through a HTTP proxy */
-  CINIT(HTTPPROXYTUNNEL, LONG, 61),
-
-  /* Set the interface string to use as outgoing network interface */
-  CINIT(INTERFACE, STRINGPOINT, 62),
-
-  /* Set the krb4/5 security level, this also enables krb4/5 awareness.  This
-   * is a string, 'clear', 'safe', 'confidential' or 'private'.  If the string
-   * is set but doesn't match one of these, 'private' will be used.  */
-  CINIT(KRBLEVEL, STRINGPOINT, 63),
-
-  /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
-  CINIT(SSL_VERIFYPEER, LONG, 64),
-
-  /* The CApath or CAfile used to validate the peer certificate
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(CAINFO, STRINGPOINT, 65),
-
-  /* 66 = OBSOLETE */
-  /* 67 = OBSOLETE */
-
-  /* Maximum number of http redirects to follow */
-  CINIT(MAXREDIRS, LONG, 68),
-
-  /* Pass a long set to 1 to get the date of the requested document (if
-     possible)! Pass a zero to shut it off. */
-  CINIT(FILETIME, LONG, 69),
-
-  /* This points to a linked list of telnet options */
-  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
-
-  /* Max amount of cached alive connections */
-  CINIT(MAXCONNECTS, LONG, 71),
-
-  CINIT(OBSOLETE72, LONG, 72), /* OBSOLETE, do not use! */
-
-  /* 73 = OBSOLETE */
-
-  /* Set to explicitly use a new connection for the upcoming transfer.
-     Do not use this unless you're absolutely sure of this, as it makes the
-     operation slower and is less friendly for the network. */
-  CINIT(FRESH_CONNECT, LONG, 74),
-
-  /* Set to explicitly forbid the upcoming transfer's connection to be re-used
-     when done. Do not use this unless you're absolutely sure of this, as it
-     makes the operation slower and is less friendly for the network. */
-  CINIT(FORBID_REUSE, LONG, 75),
-
-  /* Set to a file name that contains random data for libcurl to use to
-     seed the random engine when doing SSL connects. */
-  CINIT(RANDOM_FILE, STRINGPOINT, 76),
-
-  /* Set to the Entropy Gathering Daemon socket pathname */
-  CINIT(EGDSOCKET, STRINGPOINT, 77),
-
-  /* Time-out connect operations after this amount of seconds, if connects are
-     OK within this time, then fine... This only aborts the connect phase. */
-  CINIT(CONNECTTIMEOUT, LONG, 78),
-
-  /* Function that will be called to store headers (instead of fwrite). The
-   * parameters will use fwrite() syntax, make sure to follow them. */
-  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
-
-  /* Set this to force the HTTP request to get back to GET. Only really usable
-     if POST, PUT or a custom request have been used first.
-   */
-  CINIT(HTTPGET, LONG, 80),
-
-  /* Set if we should verify the Common name from the peer certificate in ssl
-   * handshake, set 1 to check existence, 2 to ensure that it matches the
-   * provided hostname. */
-  CINIT(SSL_VERIFYHOST, LONG, 81),
-
-  /* Specify which file name to write all known cookies in after completed
-     operation. Set file name to "-" (dash) to make it go to stdout. */
-  CINIT(COOKIEJAR, STRINGPOINT, 82),
-
-  /* Specify which SSL ciphers to use */
-  CINIT(SSL_CIPHER_LIST, STRINGPOINT, 83),
-
-  /* Specify which HTTP version to use! This must be set to one of the
-     CURL_HTTP_VERSION* enums set below. */
-  CINIT(HTTP_VERSION, LONG, 84),
-
-  /* Specifically switch on or off the FTP engine's use of the EPSV command. By
-     default, that one will always be attempted before the more traditional
-     PASV command. */
-  CINIT(FTP_USE_EPSV, LONG, 85),
-
-  /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
-  CINIT(SSLCERTTYPE, STRINGPOINT, 86),
-
-  /* name of the file keeping your private SSL-key */
-  CINIT(SSLKEY, STRINGPOINT, 87),
-
-  /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
-  CINIT(SSLKEYTYPE, STRINGPOINT, 88),
-
-  /* crypto engine for the SSL-sub system */
-  CINIT(SSLENGINE, STRINGPOINT, 89),
-
-  /* set the crypto engine for the SSL-sub system as default
-     the param has no meaning...
-   */
-  CINIT(SSLENGINE_DEFAULT, LONG, 90),
-
-  /* Non-zero value means to use the global dns cache */
-  CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91), /* DEPRECATED, do not use! */
-
-  /* DNS cache timeout */
-  CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
-
-  /* send linked-list of pre-transfer QUOTE commands */
-  CINIT(PREQUOTE, OBJECTPOINT, 93),
-
-  /* set the debug function */
-  CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
-
-  /* set the data for the debug function */
-  CINIT(DEBUGDATA, OBJECTPOINT, 95),
-
-  /* mark this as start of a cookie session */
-  CINIT(COOKIESESSION, LONG, 96),
-
-  /* The CApath directory used to validate the peer certificate
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(CAPATH, STRINGPOINT, 97),
-
-  /* Instruct libcurl to use a smaller receive buffer */
-  CINIT(BUFFERSIZE, LONG, 98),
-
-  /* Instruct libcurl to not use any signal/alarm handlers, even when using
-     timeouts. This option is useful for multi-threaded applications.
-     See libcurl-the-guide for more background information. */
-  CINIT(NOSIGNAL, LONG, 99),
-
-  /* Provide a CURLShare for mutexing non-ts data */
-  CINIT(SHARE, OBJECTPOINT, 100),
-
-  /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default),
-     CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */
-  CINIT(PROXYTYPE, LONG, 101),
-
-  /* Set the Accept-Encoding string. Use this to tell a server you would like
-     the response to be compressed. Before 7.21.6, this was known as
-     CURLOPT_ENCODING */
-  CINIT(ACCEPT_ENCODING, STRINGPOINT, 102),
-
-  /* Set pointer to private data */
-  CINIT(PRIVATE, OBJECTPOINT, 103),
-
-  /* Set aliases for HTTP 200 in the HTTP Response header */
-  CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
-
-  /* Continue to send authentication (user+password) when following locations,
-     even when hostname changed. This can potentially send off the name
-     and password to whatever host the server decides. */
-  CINIT(UNRESTRICTED_AUTH, LONG, 105),
-
-  /* Specifically switch on or off the FTP engine's use of the EPRT command (
-     it also disables the LPRT attempt). By default, those ones will always be
-     attempted before the good old traditional PORT command. */
-  CINIT(FTP_USE_EPRT, LONG, 106),
-
-  /* Set this to a bitmask value to enable the particular authentications
-     methods you like. Use this in combination with CURLOPT_USERPWD.
-     Note that setting multiple bits may cause extra network round-trips. */
-  CINIT(HTTPAUTH, LONG, 107),
-
-  /* Set the ssl context callback function, currently only for OpenSSL ssl_ctx
-     in second argument. The function must be matching the
-     curl_ssl_ctx_callback proto. */
-  CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
-
-  /* Set the userdata for the ssl context callback function's third
-     argument */
-  CINIT(SSL_CTX_DATA, OBJECTPOINT, 109),
-
-  /* FTP Option that causes missing dirs to be created on the remote server.
-     In 7.19.4 we introduced the convenience enums for this option using the
-     CURLFTP_CREATE_DIR prefix.
-  */
-  CINIT(FTP_CREATE_MISSING_DIRS, LONG, 110),
-
-  /* Set this to a bitmask value to enable the particular authentications
-     methods you like. Use this in combination with CURLOPT_PROXYUSERPWD.
-     Note that setting multiple bits may cause extra network round-trips. */
-  CINIT(PROXYAUTH, LONG, 111),
-
-  /* FTP option that changes the timeout, in seconds, associated with
-     getting a response.  This is different from transfer timeout time and
-     essentially places a demand on the FTP server to acknowledge commands
-     in a timely manner. */
-  CINIT(FTP_RESPONSE_TIMEOUT, LONG, 112),
-#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
-
-  /* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
-     tell libcurl to resolve names to those IP versions only. This only has
-     affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */
-  CINIT(IPRESOLVE, LONG, 113),
-
-  /* Set this option to limit the size of a file that will be downloaded from
-     an HTTP or FTP server.
-
-     Note there is also _LARGE version which adds large file support for
-     platforms which have larger off_t sizes.  See MAXFILESIZE_LARGE below. */
-  CINIT(MAXFILESIZE, LONG, 114),
-
-  /* See the comment for INFILESIZE above, but in short, specifies
-   * the size of the file being uploaded.  -1 means unknown.
-   */
-  CINIT(INFILESIZE_LARGE, OFF_T, 115),
-
-  /* Sets the continuation offset.  There is also a LONG version of this;
-   * look above for RESUME_FROM.
-   */
-  CINIT(RESUME_FROM_LARGE, OFF_T, 116),
-
-  /* Sets the maximum size of data that will be downloaded from
-   * an HTTP or FTP server.  See MAXFILESIZE above for the LONG version.
-   */
-  CINIT(MAXFILESIZE_LARGE, OFF_T, 117),
-
-  /* Set this option to the file name of your .netrc file you want libcurl
-     to parse (using the CURLOPT_NETRC option). If not set, libcurl will do
-     a poor attempt to find the user's home directory and check for a .netrc
-     file in there. */
-  CINIT(NETRC_FILE, STRINGPOINT, 118),
-
-  /* Enable SSL/TLS for FTP, pick one of:
-     CURLUSESSL_TRY     - try using SSL, proceed anyway otherwise
-     CURLUSESSL_CONTROL - SSL for the control connection or fail
-     CURLUSESSL_ALL     - SSL for all communication or fail
-  */
-  CINIT(USE_SSL, LONG, 119),
-
-  /* The _LARGE version of the standard POSTFIELDSIZE option */
-  CINIT(POSTFIELDSIZE_LARGE, OFF_T, 120),
-
-  /* Enable/disable the TCP Nagle algorithm */
-  CINIT(TCP_NODELAY, LONG, 121),
-
-  /* 122 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 123 OBSOLETE. Gone in 7.16.0 */
-  /* 124 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 125 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 126 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 127 OBSOLETE. Gone in 7.16.0 */
-  /* 128 OBSOLETE. Gone in 7.16.0 */
-
-  /* When FTP over SSL/TLS is selected (with CURLOPT_USE_SSL), this option
-     can be used to change libcurl's default action which is to first try
-     "AUTH SSL" and then "AUTH TLS" in this order, and proceed when a OK
-     response has been received.
-
-     Available parameters are:
-     CURLFTPAUTH_DEFAULT - let libcurl decide
-     CURLFTPAUTH_SSL     - try "AUTH SSL" first, then TLS
-     CURLFTPAUTH_TLS     - try "AUTH TLS" first, then SSL
-  */
-  CINIT(FTPSSLAUTH, LONG, 129),
-
-  CINIT(IOCTLFUNCTION, FUNCTIONPOINT, 130),
-  CINIT(IOCTLDATA, OBJECTPOINT, 131),
-
-  /* 132 OBSOLETE. Gone in 7.16.0 */
-  /* 133 OBSOLETE. Gone in 7.16.0 */
-
-  /* zero terminated string for pass on to the FTP server when asked for
-     "account" info */
-  CINIT(FTP_ACCOUNT, STRINGPOINT, 134),
-
-  /* feed cookie into cookie engine */
-  CINIT(COOKIELIST, STRINGPOINT, 135),
-
-  /* ignore Content-Length */
-  CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
-
-  /* Set to non-zero to skip the IP address received in a 227 PASV FTP server
-     response. Typically used for FTP-SSL purposes but is not restricted to
-     that. libcurl will then instead use the same IP address it used for the
-     control connection. */
-  CINIT(FTP_SKIP_PASV_IP, LONG, 137),
-
-  /* Select "file method" to use when doing FTP, see the curl_ftpmethod
-     above. */
-  CINIT(FTP_FILEMETHOD, LONG, 138),
-
-  /* Local port number to bind the socket to */
-  CINIT(LOCALPORT, LONG, 139),
-
-  /* Number of ports to try, including the first one set with LOCALPORT.
-     Thus, setting it to 1 will make no additional attempts but the first.
-  */
-  CINIT(LOCALPORTRANGE, LONG, 140),
-
-  /* no transfer, set up connection and let application use the socket by
-     extracting it with CURLINFO_LASTSOCKET */
-  CINIT(CONNECT_ONLY, LONG, 141),
-
-  /* Function that will be called to convert from the
-     network encoding (instead of using the iconv calls in libcurl) */
-  CINIT(CONV_FROM_NETWORK_FUNCTION, FUNCTIONPOINT, 142),
-
-  /* Function that will be called to convert to the
-     network encoding (instead of using the iconv calls in libcurl) */
-  CINIT(CONV_TO_NETWORK_FUNCTION, FUNCTIONPOINT, 143),
-
-  /* Function that will be called to convert from UTF8
-     (instead of using the iconv calls in libcurl)
-     Note that this is used only for SSL certificate processing */
-  CINIT(CONV_FROM_UTF8_FUNCTION, FUNCTIONPOINT, 144),
-
-  /* if the connection proceeds too quickly then need to slow it down */
-  /* limit-rate: maximum number of bytes per second to send or receive */
-  CINIT(MAX_SEND_SPEED_LARGE, OFF_T, 145),
-  CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
-
-  /* Pointer to command string to send if USER/PASS fails. */
-  CINIT(FTP_ALTERNATIVE_TO_USER, STRINGPOINT, 147),
-
-  /* callback function for setting socket options */
-  CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
-  CINIT(SOCKOPTDATA, OBJECTPOINT, 149),
-
-  /* set to 0 to disable session ID re-use for this transfer, default is
-     enabled (== 1) */
-  CINIT(SSL_SESSIONID_CACHE, LONG, 150),
-
-  /* allowed SSH authentication methods */
-  CINIT(SSH_AUTH_TYPES, LONG, 151),
-
-  /* Used by scp/sftp to do public/private key authentication */
-  CINIT(SSH_PUBLIC_KEYFILE, STRINGPOINT, 152),
-  CINIT(SSH_PRIVATE_KEYFILE, STRINGPOINT, 153),
-
-  /* Send CCC (Clear Command Channel) after authentication */
-  CINIT(FTP_SSL_CCC, LONG, 154),
-
-  /* Same as TIMEOUT and CONNECTTIMEOUT, but with ms resolution */
-  CINIT(TIMEOUT_MS, LONG, 155),
-  CINIT(CONNECTTIMEOUT_MS, LONG, 156),
-
-  /* set to zero to disable the libcurl's decoding and thus pass the raw body
-     data to the application even when it is encoded/compressed */
-  CINIT(HTTP_TRANSFER_DECODING, LONG, 157),
-  CINIT(HTTP_CONTENT_DECODING, LONG, 158),
-
-  /* Permission used when creating new files and directories on the remote
-     server for protocols that support it, SFTP/SCP/FILE */
-  CINIT(NEW_FILE_PERMS, LONG, 159),
-  CINIT(NEW_DIRECTORY_PERMS, LONG, 160),
-
-  /* Set the behaviour of POST when redirecting. Values must be set to one
-     of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */
-  CINIT(POSTREDIR, LONG, 161),
-
-  /* used by scp/sftp to verify the host's public key */
-  CINIT(SSH_HOST_PUBLIC_KEY_MD5, STRINGPOINT, 162),
-
-  /* Callback function for opening socket (instead of socket(2)). Optionally,
-     callback is able change the address or refuse to connect returning
-     CURL_SOCKET_BAD.  The callback should have type
-     curl_opensocket_callback */
-  CINIT(OPENSOCKETFUNCTION, FUNCTIONPOINT, 163),
-  CINIT(OPENSOCKETDATA, OBJECTPOINT, 164),
-
-  /* POST volatile input fields. */
-  CINIT(COPYPOSTFIELDS, OBJECTPOINT, 165),
-
-  /* set transfer mode (;type=<a|i>) when doing FTP via an HTTP proxy */
-  CINIT(PROXY_TRANSFER_MODE, LONG, 166),
-
-  /* Callback function for seeking in the input stream */
-  CINIT(SEEKFUNCTION, FUNCTIONPOINT, 167),
-  CINIT(SEEKDATA, OBJECTPOINT, 168),
-
-  /* CRL file */
-  CINIT(CRLFILE, STRINGPOINT, 169),
-
-  /* Issuer certificate */
-  CINIT(ISSUERCERT, STRINGPOINT, 170),
-
-  /* (IPv6) Address scope */
-  CINIT(ADDRESS_SCOPE, LONG, 171),
-
-  /* Collect certificate chain info and allow it to get retrievable with
-     CURLINFO_CERTINFO after the transfer is complete. */
-  CINIT(CERTINFO, LONG, 172),
-
-  /* "name" and "pwd" to use when fetching. */
-  CINIT(USERNAME, STRINGPOINT, 173),
-  CINIT(PASSWORD, STRINGPOINT, 174),
-
-    /* "name" and "pwd" to use with Proxy when fetching. */
-  CINIT(PROXYUSERNAME, STRINGPOINT, 175),
-  CINIT(PROXYPASSWORD, STRINGPOINT, 176),
-
-  /* Comma separated list of hostnames defining no-proxy zones. These should
-     match both hostnames directly, and hostnames within a domain. For
-     example, local.com will match local.com and www.local.com, but NOT
-     notlocal.com or www.notlocal.com. For compatibility with other
-     implementations of this, .local.com will be considered to be the same as
-     local.com. A single * is the only valid wildcard, and effectively
-     disables the use of proxy. */
-  CINIT(NOPROXY, STRINGPOINT, 177),
-
-  /* block size for TFTP transfers */
-  CINIT(TFTP_BLKSIZE, LONG, 178),
-
-  /* Socks Service */
-  CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179), /* DEPRECATED, do not use! */
-
-  /* Socks Service */
-  CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
-
-  /* set the bitmask for the protocols that are allowed to be used for the
-     transfer, which thus helps the app which takes URLs from users or other
-     external inputs and want to restrict what protocol(s) to deal
-     with. Defaults to CURLPROTO_ALL. */
-  CINIT(PROTOCOLS, LONG, 181),
-
-  /* set the bitmask for the protocols that libcurl is allowed to follow to,
-     as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs
-     to be set in both bitmasks to be allowed to get redirected to. Defaults
-     to all protocols except FILE and SCP. */
-  CINIT(REDIR_PROTOCOLS, LONG, 182),
-
-  /* set the SSH knownhost file name to use */
-  CINIT(SSH_KNOWNHOSTS, STRINGPOINT, 183),
-
-  /* set the SSH host key callback, must point to a curl_sshkeycallback
-     function */
-  CINIT(SSH_KEYFUNCTION, FUNCTIONPOINT, 184),
-
-  /* set the SSH host key callback custom pointer */
-  CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
-
-  /* set the SMTP mail originator */
-  CINIT(MAIL_FROM, STRINGPOINT, 186),
-
-  /* set the list of SMTP mail receiver(s) */
-  CINIT(MAIL_RCPT, OBJECTPOINT, 187),
-
-  /* FTP: send PRET before PASV */
-  CINIT(FTP_USE_PRET, LONG, 188),
-
-  /* RTSP request method (OPTIONS, SETUP, PLAY, etc...) */
-  CINIT(RTSP_REQUEST, LONG, 189),
-
-  /* The RTSP session identifier */
-  CINIT(RTSP_SESSION_ID, STRINGPOINT, 190),
-
-  /* The RTSP stream URI */
-  CINIT(RTSP_STREAM_URI, STRINGPOINT, 191),
-
-  /* The Transport: header to use in RTSP requests */
-  CINIT(RTSP_TRANSPORT, STRINGPOINT, 192),
-
-  /* Manually initialize the client RTSP CSeq for this handle */
-  CINIT(RTSP_CLIENT_CSEQ, LONG, 193),
-
-  /* Manually initialize the server RTSP CSeq for this handle */
-  CINIT(RTSP_SERVER_CSEQ, LONG, 194),
-
-  /* The stream to pass to INTERLEAVEFUNCTION. */
-  CINIT(INTERLEAVEDATA, OBJECTPOINT, 195),
-
-  /* Let the application define a custom write method for RTP data */
-  CINIT(INTERLEAVEFUNCTION, FUNCTIONPOINT, 196),
-
-  /* Turn on wildcard matching */
-  CINIT(WILDCARDMATCH, LONG, 197),
-
-  /* Directory matching callback called before downloading of an
-     individual file (chunk) started */
-  CINIT(CHUNK_BGN_FUNCTION, FUNCTIONPOINT, 198),
-
-  /* Directory matching callback called after the file (chunk)
-     was downloaded, or skipped */
-  CINIT(CHUNK_END_FUNCTION, FUNCTIONPOINT, 199),
-
-  /* Change match (fnmatch-like) callback for wildcard matching */
-  CINIT(FNMATCH_FUNCTION, FUNCTIONPOINT, 200),
-
-  /* Let the application define custom chunk data pointer */
-  CINIT(CHUNK_DATA, OBJECTPOINT, 201),
-
-  /* FNMATCH_FUNCTION user pointer */
-  CINIT(FNMATCH_DATA, OBJECTPOINT, 202),
-
-  /* send linked-list of name:port:address sets */
-  CINIT(RESOLVE, OBJECTPOINT, 203),
-
-  /* Set a username for authenticated TLS */
-  CINIT(TLSAUTH_USERNAME, STRINGPOINT, 204),
-
-  /* Set a password for authenticated TLS */
-  CINIT(TLSAUTH_PASSWORD, STRINGPOINT, 205),
-
-  /* Set authentication type for authenticated TLS */
-  CINIT(TLSAUTH_TYPE, STRINGPOINT, 206),
-
-  /* Set to 1 to enable the "TE:" header in HTTP requests to ask for
-     compressed transfer-encoded responses. Set to 0 to disable the use of TE:
-     in outgoing requests. The current default is 0, but it might change in a
-     future libcurl release.
-
-     libcurl will ask for the compressed methods it knows of, and if that
-     isn't any, it will not ask for transfer-encoding at all even if this
-     option is set to 1.
-
-  */
-  CINIT(TRANSFER_ENCODING, LONG, 207),
-
-  /* Callback function for closing socket (instead of close(2)). The callback
-     should have type curl_closesocket_callback */
-  CINIT(CLOSESOCKETFUNCTION, FUNCTIONPOINT, 208),
-  CINIT(CLOSESOCKETDATA, OBJECTPOINT, 209),
-
-  /* allow GSSAPI credential delegation */
-  CINIT(GSSAPI_DELEGATION, LONG, 210),
-
-  /* Set the name servers to use for DNS resolution */
-  CINIT(DNS_SERVERS, STRINGPOINT, 211),
-
-  /* Time-out accept operations (currently for FTP only) after this amount
-     of miliseconds. */
-  CINIT(ACCEPTTIMEOUT_MS, LONG, 212),
-
-  /* Set TCP keepalive */
-  CINIT(TCP_KEEPALIVE, LONG, 213),
-
-  /* non-universal keepalive knobs (Linux, AIX, HP-UX, more) */
-  CINIT(TCP_KEEPIDLE, LONG, 214),
-  CINIT(TCP_KEEPINTVL, LONG, 215),
-
-  /* Enable/disable specific SSL features with a bitmask, see CURLSSLOPT_* */
-  CINIT(SSL_OPTIONS, LONG, 216),
-
-  /* Set the SMTP auth originator */
-  CINIT(MAIL_AUTH, STRINGPOINT, 217),
-
-  /* Enable/disable SASL initial response */
-  CINIT(SASL_IR, LONG, 218),
-
-  /* Function that will be called instead of the internal progress display
-   * function. This function should be defined as the curl_xferinfo_callback
-   * prototype defines. (Deprecates CURLOPT_PROGRESSFUNCTION) */
-  CINIT(XFERINFOFUNCTION, FUNCTIONPOINT, 219),
-
-  /* The XOAUTH2 bearer token */
-  CINIT(XOAUTH2_BEARER, STRINGPOINT, 220),
-
-  /* Set the interface string to use as outgoing network
-   * interface for DNS requests.
-   * Only supported by the c-ares DNS backend */
-  CINIT(DNS_INTERFACE, STRINGPOINT, 221),
-
-  /* Set the local IPv4 address to use for outgoing DNS requests.
-   * Only supported by the c-ares DNS backend */
-  CINIT(DNS_LOCAL_IP4, STRINGPOINT, 222),
-
-  /* Set the local IPv4 address to use for outgoing DNS requests.
-   * Only supported by the c-ares DNS backend */
-  CINIT(DNS_LOCAL_IP6, STRINGPOINT, 223),
-
-  /* Set authentication options directly */
-  CINIT(LOGIN_OPTIONS, STRINGPOINT, 224),
-
-  /* Enable/disable TLS NPN extension (http2 over ssl might fail without) */
-  CINIT(SSL_ENABLE_NPN, LONG, 225),
-
-  /* Enable/disable TLS ALPN extension (http2 over ssl might fail without) */
-  CINIT(SSL_ENABLE_ALPN, LONG, 226),
-
-  /* Time to wait for a response to a HTTP request containing an
-   * Expect: 100-continue header before sending the data anyway. */
-  CINIT(EXPECT_100_TIMEOUT_MS, LONG, 227),
-
-  /* This points to a linked list of headers used for proxy requests only,
-     struct curl_slist kind */
-  CINIT(PROXYHEADER, OBJECTPOINT, 228),
-
-  /* Pass in a bitmask of "header options" */
-  CINIT(HEADEROPT, LONG, 229),
-
-  /* The public key in DER form used to validate the peer public key
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(PINNEDPUBLICKEY, STRINGPOINT, 230),
-
-  /* Path to Unix domain socket */
-  CINIT(UNIX_SOCKET_PATH, STRINGPOINT, 231),
-
-  /* Set if we should verify the certificate status. */
-  CINIT(SSL_VERIFYSTATUS, LONG, 232),
-
-  /* Set if we should enable TLS false start. */
-  CINIT(SSL_FALSESTART, LONG, 233),
-
-  /* Do not squash dot-dot sequences */
-  CINIT(PATH_AS_IS, LONG, 234),
-
-  /* Proxy Service Name */
-  CINIT(PROXY_SERVICE_NAME, STRINGPOINT, 235),
-
-  /* Service Name */
-  CINIT(SERVICE_NAME, STRINGPOINT, 236),
-
-  /* Wait/don't wait for pipe/mutex to clarify */
-  CINIT(PIPEWAIT, LONG, 237),
-
-  /* Set the protocol used when curl is given a URL without a protocol */
-  CINIT(DEFAULT_PROTOCOL, STRINGPOINT, 238),
-
-  /* Set stream weight, 1 - 256 (default is 16) */
-  CINIT(STREAM_WEIGHT, LONG, 239),
-
-  /* Set stream dependency on another CURL handle */
-  CINIT(STREAM_DEPENDS, OBJECTPOINT, 240),
-
-  /* Set E-xclusive stream dependency on another CURL handle */
-  CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),
-
-  /* Do not send any tftp option requests to the server */
-  CINIT(TFTP_NO_OPTIONS, LONG, 242),
-
-  /* Linked-list of host:port:connect-to-host:connect-to-port,
-     overrides the URL's host:port (only for the network layer) */
-  CINIT(CONNECT_TO, STRINGPOINT, 243),
-
-  CURLOPT_LASTENTRY /* the last unused */
-} CURLoption;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-/* These are scheduled to disappear by 2011 */
-
-/* This was added in version 7.19.1 */
-#define CURLOPT_POST301 CURLOPT_POSTREDIR
-
-/* These are scheduled to disappear by 2009 */
-
-/* The following were added in 7.17.0 */
-#define CURLOPT_SSLKEYPASSWD CURLOPT_KEYPASSWD
-#define CURLOPT_FTPAPPEND CURLOPT_APPEND
-#define CURLOPT_FTPLISTONLY CURLOPT_DIRLISTONLY
-#define CURLOPT_FTP_SSL CURLOPT_USE_SSL
-
-/* The following were added earlier */
-
-#define CURLOPT_SSLCERTPASSWD CURLOPT_KEYPASSWD
-#define CURLOPT_KRB4LEVEL CURLOPT_KRBLEVEL
-
-#else
-/* This is set if CURL_NO_OLDIES is defined at compile-time */
-#undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */
-#endif
-
-
-  /* Below here follows defines for the CURLOPT_IPRESOLVE option. If a host
-     name resolves addresses using more than one IP protocol version, this
-     option might be handy to force libcurl to use a specific IP version. */
-#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP
-                                     versions that your system allows */
-#define CURL_IPRESOLVE_V4       1 /* resolve to IPv4 addresses */
-#define CURL_IPRESOLVE_V6       2 /* resolve to IPv6 addresses */
-
-  /* three convenient "aliases" that follow the name scheme better */
-#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
-
-  /* These enums are for use with the CURLOPT_HTTP_VERSION option. */
-enum {
-  CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd
-                             like the library to choose the best possible
-                             for us! */
-  CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
-  CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
-  CURL_HTTP_VERSION_2_0,  /* please use HTTP 2 in the request */
-  CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
-  CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE,  /* please use HTTP 2 without HTTP/1.1
-                                           Upgrade */
-
-  CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
-};
-
-/* Convenience definition simple because the name of the version is HTTP/2 and
-   not 2.0. The 2_0 version of the enum name was set while the version was
-   still planned to be 2.0 and we stick to it for compatibility. */
-#define CURL_HTTP_VERSION_2 CURL_HTTP_VERSION_2_0
-
-/*
- * Public API enums for RTSP requests
- */
-enum {
-    CURL_RTSPREQ_NONE, /* first in list */
-    CURL_RTSPREQ_OPTIONS,
-    CURL_RTSPREQ_DESCRIBE,
-    CURL_RTSPREQ_ANNOUNCE,
-    CURL_RTSPREQ_SETUP,
-    CURL_RTSPREQ_PLAY,
-    CURL_RTSPREQ_PAUSE,
-    CURL_RTSPREQ_TEARDOWN,
-    CURL_RTSPREQ_GET_PARAMETER,
-    CURL_RTSPREQ_SET_PARAMETER,
-    CURL_RTSPREQ_RECORD,
-    CURL_RTSPREQ_RECEIVE,
-    CURL_RTSPREQ_LAST /* last in list */
-};
-
-  /* These enums are for use with the CURLOPT_NETRC option. */
-enum CURL_NETRC_OPTION {
-  CURL_NETRC_IGNORED,     /* The .netrc will never be read.
-                           * This is the default. */
-  CURL_NETRC_OPTIONAL,    /* A user:password in the URL will be preferred
-                           * to one in the .netrc. */
-  CURL_NETRC_REQUIRED,    /* A user:password in the URL will be ignored.
-                           * Unless one is set programmatically, the .netrc
-                           * will be queried. */
-  CURL_NETRC_LAST
-};
-
-enum {
-  CURL_SSLVERSION_DEFAULT,
-  CURL_SSLVERSION_TLSv1, /* TLS 1.x */
-  CURL_SSLVERSION_SSLv2,
-  CURL_SSLVERSION_SSLv3,
-  CURL_SSLVERSION_TLSv1_0,
-  CURL_SSLVERSION_TLSv1_1,
-  CURL_SSLVERSION_TLSv1_2,
-
-  CURL_SSLVERSION_LAST /* never use, keep last */
-};
-
-enum CURL_TLSAUTH {
-  CURL_TLSAUTH_NONE,
-  CURL_TLSAUTH_SRP,
-  CURL_TLSAUTH_LAST /* never use, keep last */
-};
-
-/* symbols to use with CURLOPT_POSTREDIR.
-   CURL_REDIR_POST_301, CURL_REDIR_POST_302 and CURL_REDIR_POST_303
-   can be bitwise ORed so that CURL_REDIR_POST_301 | CURL_REDIR_POST_302
-   | CURL_REDIR_POST_303 == CURL_REDIR_POST_ALL */
-
-#define CURL_REDIR_GET_ALL  0
-#define CURL_REDIR_POST_301 1
-#define CURL_REDIR_POST_302 2
-#define CURL_REDIR_POST_303 4
-#define CURL_REDIR_POST_ALL \
-    (CURL_REDIR_POST_301|CURL_REDIR_POST_302|CURL_REDIR_POST_303)
-
-typedef enum {
-  CURL_TIMECOND_NONE,
-
-  CURL_TIMECOND_IFMODSINCE,
-  CURL_TIMECOND_IFUNMODSINCE,
-  CURL_TIMECOND_LASTMOD,
-
-  CURL_TIMECOND_LAST
-} curl_TimeCond;
-
-
-/* curl_strequal() and curl_strnequal() are subject for removal in a future
-   libcurl, see lib/README.curlx for details */
-CURL_EXTERN int (curl_strequal)(const char *s1, const char *s2);
-CURL_EXTERN int (curl_strnequal)(const char *s1, const char *s2, size_t n);
-
-/* name is uppercase CURLFORM_<name> */
-#ifdef CFINIT
-#undef CFINIT
-#endif
-
-#ifdef CURL_ISOCPP
-#define CFINIT(name) CURLFORM_ ## name
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define CFINIT(name) CURLFORM_/**/name
-#endif
-
-typedef enum {
-  CFINIT(NOTHING),        /********* the first one is unused ************/
-
-  /*  */
-  CFINIT(COPYNAME),
-  CFINIT(PTRNAME),
-  CFINIT(NAMELENGTH),
-  CFINIT(COPYCONTENTS),
-  CFINIT(PTRCONTENTS),
-  CFINIT(CONTENTSLENGTH),
-  CFINIT(FILECONTENT),
-  CFINIT(ARRAY),
-  CFINIT(OBSOLETE),
-  CFINIT(FILE),
-
-  CFINIT(BUFFER),
-  CFINIT(BUFFERPTR),
-  CFINIT(BUFFERLENGTH),
-
-  CFINIT(CONTENTTYPE),
-  CFINIT(CONTENTHEADER),
-  CFINIT(FILENAME),
-  CFINIT(END),
-  CFINIT(OBSOLETE2),
-
-  CFINIT(STREAM),
-  CFINIT(CONTENTLEN), /* added in 7.46.0, provide a curl_off_t length */
-
-  CURLFORM_LASTENTRY /* the last unused */
-} CURLformoption;
-
-#undef CFINIT /* done */
-
-/* structure to be used as parameter for CURLFORM_ARRAY */
-struct curl_forms {
-  CURLformoption option;
-  const char     *value;
-};
-
-/* use this for multipart formpost building */
-/* Returns code for curl_formadd()
- *
- * Returns:
- * CURL_FORMADD_OK             on success
- * CURL_FORMADD_MEMORY         if the FormInfo allocation fails
- * CURL_FORMADD_OPTION_TWICE   if one option is given twice for one Form
- * CURL_FORMADD_NULL           if a null pointer was given for a char
- * CURL_FORMADD_MEMORY         if the allocation of a FormInfo struct failed
- * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
- * CURL_FORMADD_INCOMPLETE     if the some FormInfo is not complete (or error)
- * CURL_FORMADD_MEMORY         if a curl_httppost struct cannot be allocated
- * CURL_FORMADD_MEMORY         if some allocation for string copying failed.
- * CURL_FORMADD_ILLEGAL_ARRAY  if an illegal option is used in an array
- *
- ***************************************************************************/
-typedef enum {
-  CURL_FORMADD_OK, /* first, no error */
-
-  CURL_FORMADD_MEMORY,
-  CURL_FORMADD_OPTION_TWICE,
-  CURL_FORMADD_NULL,
-  CURL_FORMADD_UNKNOWN_OPTION,
-  CURL_FORMADD_INCOMPLETE,
-  CURL_FORMADD_ILLEGAL_ARRAY,
-  CURL_FORMADD_DISABLED, /* libcurl was built with this disabled */
-
-  CURL_FORMADD_LAST /* last */
-} CURLFORMcode;
-
-/*
- * NAME curl_formadd()
- *
- * DESCRIPTION
- *
- * Pretty advanced function for building multi-part formposts. Each invoke
- * adds one part that together construct a full post. Then use
- * CURLOPT_HTTPPOST to send it off to libcurl.
- */
-CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost,
-                                      struct curl_httppost **last_post,
-                                      ...);
-
-/*
- * callback function for curl_formget()
- * The void *arg pointer will be the one passed as second argument to
- *   curl_formget().
- * The character buffer passed to it must not be freed.
- * Should return the buffer length passed to it as the argument "len" on
- *   success.
- */
-typedef size_t (*curl_formget_callback)(void *arg, const char *buf,
-                                        size_t len);
-
-/*
- * NAME curl_formget()
- *
- * DESCRIPTION
- *
- * Serialize a curl_httppost struct built with curl_formadd().
- * Accepts a void pointer as second argument which will be passed to
- * the curl_formget_callback function.
- * Returns 0 on success.
- */
-CURL_EXTERN int curl_formget(struct curl_httppost *form, void *arg,
-                             curl_formget_callback append);
-/*
- * NAME curl_formfree()
- *
- * DESCRIPTION
- *
- * Free a multipart formpost previously built with curl_formadd().
- */
-CURL_EXTERN void curl_formfree(struct curl_httppost *form);
-
-/*
- * NAME curl_getenv()
- *
- * DESCRIPTION
- *
- * Returns a malloc()'ed string that MUST be curl_free()ed after usage is
- * complete. DEPRECATED - see lib/README.curlx
- */
-CURL_EXTERN char *curl_getenv(const char *variable);
-
-/*
- * NAME curl_version()
- *
- * DESCRIPTION
- *
- * Returns a static ascii string of the libcurl version.
- */
-CURL_EXTERN char *curl_version(void);
-
-/*
- * NAME curl_easy_escape()
- *
- * DESCRIPTION
- *
- * Escapes URL strings (converts all letters consider illegal in URLs to their
- * %XX versions). This function returns a new allocated string or NULL if an
- * error occurred.
- */
-CURL_EXTERN char *curl_easy_escape(CURL *handle,
-                                   const char *string,
-                                   int length);
-
-/* the previous version: */
-CURL_EXTERN char *curl_escape(const char *string,
-                              int length);
-
-
-/*
- * NAME curl_easy_unescape()
- *
- * DESCRIPTION
- *
- * Unescapes URL encoding in strings (converts all %XX codes to their 8bit
- * versions). This function returns a new allocated string or NULL if an error
- * occurred.
- * Conversion Note: On non-ASCII platforms the ASCII %XX codes are
- * converted into the host encoding.
- */
-CURL_EXTERN char *curl_easy_unescape(CURL *handle,
-                                     const char *string,
-                                     int length,
-                                     int *outlength);
-
-/* the previous version */
-CURL_EXTERN char *curl_unescape(const char *string,
-                                int length);
-
-/*
- * NAME curl_free()
- *
- * DESCRIPTION
- *
- * Provided for de-allocation in the same translation unit that did the
- * allocation. Added in libcurl 7.10
- */
-CURL_EXTERN void curl_free(void *p);
-
-/*
- * NAME curl_global_init()
- *
- * DESCRIPTION
- *
- * curl_global_init() should be invoked exactly once for each application that
- * uses libcurl and before any call of other libcurl functions.
- *
- * This function is not thread-safe!
- */
-CURL_EXTERN CURLcode curl_global_init(long flags);
-
-/*
- * NAME curl_global_init_mem()
- *
- * DESCRIPTION
- *
- * curl_global_init() or curl_global_init_mem() should be invoked exactly once
- * for each application that uses libcurl.  This function can be used to
- * initialize libcurl and set user defined memory management callback
- * functions.  Users can implement memory management routines to check for
- * memory leaks, check for mis-use of the curl library etc.  User registered
- * callback routines with be invoked by this library instead of the system
- * memory management routines like malloc, free etc.
- */
-CURL_EXTERN CURLcode curl_global_init_mem(long flags,
-                                          curl_malloc_callback m,
-                                          curl_free_callback f,
-                                          curl_realloc_callback r,
-                                          curl_strdup_callback s,
-                                          curl_calloc_callback c);
-
-/*
- * NAME curl_global_cleanup()
- *
- * DESCRIPTION
- *
- * curl_global_cleanup() should be invoked exactly once for each application
- * that uses libcurl
- */
-CURL_EXTERN void curl_global_cleanup(void);
-
-/* linked-list structure for the CURLOPT_QUOTE option (and other) */
-struct curl_slist {
-  char *data;
-  struct curl_slist *next;
-};
-
-/*
- * NAME curl_slist_append()
- *
- * DESCRIPTION
- *
- * Appends a string to a linked list. If no list exists, it will be created
- * first. Returns the new list, after appending.
- */
-CURL_EXTERN struct curl_slist *curl_slist_append(struct curl_slist *,
-                                                 const char *);
-
-/*
- * NAME curl_slist_free_all()
- *
- * DESCRIPTION
- *
- * free a previously built curl_slist.
- */
-CURL_EXTERN void curl_slist_free_all(struct curl_slist *);
-
-/*
- * NAME curl_getdate()
- *
- * DESCRIPTION
- *
- * Returns the time, in seconds since 1 Jan 1970 of the time string given in
- * the first argument. The time argument in the second parameter is unused
- * and should be set to NULL.
- */
-CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);
-
-/* info about the certificate chain, only for OpenSSL builds. Asked
-   for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
-struct curl_certinfo {
-  int num_of_certs;             /* number of certificates with information */
-  struct curl_slist **certinfo; /* for each index in this array, there's a
-                                   linked list with textual information in the
-                                   format "name: value" */
-};
-
-/* enum for the different supported SSL backends */
-typedef enum {
-  CURLSSLBACKEND_NONE = 0,
-  CURLSSLBACKEND_OPENSSL = 1,
-  CURLSSLBACKEND_GNUTLS = 2,
-  CURLSSLBACKEND_NSS = 3,
-  CURLSSLBACKEND_OBSOLETE4 = 4,  /* Was QSOSSL. */
-  CURLSSLBACKEND_GSKIT = 5,
-  CURLSSLBACKEND_POLARSSL = 6,
-  CURLSSLBACKEND_CYASSL = 7,
-  CURLSSLBACKEND_SCHANNEL = 8,
-  CURLSSLBACKEND_DARWINSSL = 9,
-  CURLSSLBACKEND_AXTLS = 10,
-  CURLSSLBACKEND_MBEDTLS = 11
-} curl_sslbackend;
-
-/* Information about the SSL library used and the respective internal SSL
-   handle, which can be used to obtain further information regarding the
-   connection. Asked for with CURLINFO_TLS_SSL_PTR or CURLINFO_TLS_SESSION. */
-struct curl_tlssessioninfo {
-  curl_sslbackend backend;
-  void *internals;
-};
-
-#define CURLINFO_STRING   0x100000
-#define CURLINFO_LONG     0x200000
-#define CURLINFO_DOUBLE   0x300000
-#define CURLINFO_SLIST    0x400000
-#define CURLINFO_SOCKET   0x500000
-#define CURLINFO_MASK     0x0fffff
-#define CURLINFO_TYPEMASK 0xf00000
-
-typedef enum {
-  CURLINFO_NONE, /* first, never use this */
-  CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
-  CURLINFO_RESPONSE_CODE    = CURLINFO_LONG   + 2,
-  CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
-  CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
-  CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
-  CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6,
-  CURLINFO_SIZE_UPLOAD      = CURLINFO_DOUBLE + 7,
-  CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,
-  CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,
-  CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,
-  CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,
-  CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,
-  CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG   + 13,
-  CURLINFO_FILETIME         = CURLINFO_LONG   + 14,
-  CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
-  CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
-  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
-  CURLINFO_CONTENT_TYPE     = CURLINFO_STRING + 18,
-  CURLINFO_REDIRECT_TIME    = CURLINFO_DOUBLE + 19,
-  CURLINFO_REDIRECT_COUNT   = CURLINFO_LONG   + 20,
-  CURLINFO_PRIVATE          = CURLINFO_STRING + 21,
-  CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG   + 22,
-  CURLINFO_HTTPAUTH_AVAIL   = CURLINFO_LONG   + 23,
-  CURLINFO_PROXYAUTH_AVAIL  = CURLINFO_LONG   + 24,
-  CURLINFO_OS_ERRNO         = CURLINFO_LONG   + 25,
-  CURLINFO_NUM_CONNECTS     = CURLINFO_LONG   + 26,
-  CURLINFO_SSL_ENGINES      = CURLINFO_SLIST  + 27,
-  CURLINFO_COOKIELIST       = CURLINFO_SLIST  + 28,
-  CURLINFO_LASTSOCKET       = CURLINFO_LONG   + 29,
-  CURLINFO_FTP_ENTRY_PATH   = CURLINFO_STRING + 30,
-  CURLINFO_REDIRECT_URL     = CURLINFO_STRING + 31,
-  CURLINFO_PRIMARY_IP       = CURLINFO_STRING + 32,
-  CURLINFO_APPCONNECT_TIME  = CURLINFO_DOUBLE + 33,
-  CURLINFO_CERTINFO         = CURLINFO_SLIST  + 34,
-  CURLINFO_CONDITION_UNMET  = CURLINFO_LONG   + 35,
-  CURLINFO_RTSP_SESSION_ID  = CURLINFO_STRING + 36,
-  CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG   + 37,
-  CURLINFO_RTSP_SERVER_CSEQ = CURLINFO_LONG   + 38,
-  CURLINFO_RTSP_CSEQ_RECV   = CURLINFO_LONG   + 39,
-  CURLINFO_PRIMARY_PORT     = CURLINFO_LONG   + 40,
-  CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,
-  CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,
-  CURLINFO_TLS_SESSION      = CURLINFO_SLIST  + 43,
-  CURLINFO_ACTIVESOCKET     = CURLINFO_SOCKET + 44,
-  CURLINFO_TLS_SSL_PTR      = CURLINFO_SLIST  + 45,
-  /* Fill in new entries below here! */
-
-  CURLINFO_LASTONE          = 45
-} CURLINFO;
-
-/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
-   CURLINFO_HTTP_CODE */
-#define CURLINFO_HTTP_CODE CURLINFO_RESPONSE_CODE
-
-typedef enum {
-  CURLCLOSEPOLICY_NONE, /* first, never use this */
-
-  CURLCLOSEPOLICY_OLDEST,
-  CURLCLOSEPOLICY_LEAST_RECENTLY_USED,
-  CURLCLOSEPOLICY_LEAST_TRAFFIC,
-  CURLCLOSEPOLICY_SLOWEST,
-  CURLCLOSEPOLICY_CALLBACK,
-
-  CURLCLOSEPOLICY_LAST /* last, never use this */
-} curl_closepolicy;
-
-#define CURL_GLOBAL_SSL (1<<0)
-#define CURL_GLOBAL_WIN32 (1<<1)
-#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
-#define CURL_GLOBAL_NOTHING 0
-#define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL
-#define CURL_GLOBAL_ACK_EINTR (1<<2)
-
-
-/*****************************************************************************
- * Setup defines, protos etc for the sharing stuff.
- */
-
-/* Different data locks for a single share */
-typedef enum {
-  CURL_LOCK_DATA_NONE = 0,
-  /*  CURL_LOCK_DATA_SHARE is used internally to say that
-   *  the locking is just made to change the internal state of the share
-   *  itself.
-   */
-  CURL_LOCK_DATA_SHARE,
-  CURL_LOCK_DATA_COOKIE,
-  CURL_LOCK_DATA_DNS,
-  CURL_LOCK_DATA_SSL_SESSION,
-  CURL_LOCK_DATA_CONNECT,
-  CURL_LOCK_DATA_LAST
-} curl_lock_data;
-
-/* Different lock access types */
-typedef enum {
-  CURL_LOCK_ACCESS_NONE = 0,   /* unspecified action */
-  CURL_LOCK_ACCESS_SHARED = 1, /* for read perhaps */
-  CURL_LOCK_ACCESS_SINGLE = 2, /* for write perhaps */
-  CURL_LOCK_ACCESS_LAST        /* never use */
-} curl_lock_access;
-
-typedef void (*curl_lock_function)(CURL *handle,
-                                   curl_lock_data data,
-                                   curl_lock_access locktype,
-                                   void *userptr);
-typedef void (*curl_unlock_function)(CURL *handle,
-                                     curl_lock_data data,
-                                     void *userptr);
-
-typedef void CURLSH;
-
-typedef enum {
-  CURLSHE_OK,  /* all is fine */
-  CURLSHE_BAD_OPTION, /* 1 */
-  CURLSHE_IN_USE,     /* 2 */
-  CURLSHE_INVALID,    /* 3 */
-  CURLSHE_NOMEM,      /* 4 out of memory */
-  CURLSHE_NOT_BUILT_IN, /* 5 feature not present in lib */
-  CURLSHE_LAST        /* never use */
-} CURLSHcode;
-
-typedef enum {
-  CURLSHOPT_NONE,  /* don't use */
-  CURLSHOPT_SHARE,   /* specify a data type to share */
-  CURLSHOPT_UNSHARE, /* specify which data type to stop sharing */
-  CURLSHOPT_LOCKFUNC,   /* pass in a 'curl_lock_function' pointer */
-  CURLSHOPT_UNLOCKFUNC, /* pass in a 'curl_unlock_function' pointer */
-  CURLSHOPT_USERDATA,   /* pass in a user data pointer used in the lock/unlock
-                           callback functions */
-  CURLSHOPT_LAST  /* never use */
-} CURLSHoption;
-
-CURL_EXTERN CURLSH *curl_share_init(void);
-CURL_EXTERN CURLSHcode curl_share_setopt(CURLSH *, CURLSHoption option, ...);
-CURL_EXTERN CURLSHcode curl_share_cleanup(CURLSH *);
-
-/****************************************************************************
- * Structures for querying information about the curl library at runtime.
- */
-
-typedef enum {
-  CURLVERSION_FIRST,
-  CURLVERSION_SECOND,
-  CURLVERSION_THIRD,
-  CURLVERSION_FOURTH,
-  CURLVERSION_LAST /* never actually use this */
-} CURLversion;
-
-/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by
-   basically all programs ever that want to get version information. It is
-   meant to be a built-in version number for what kind of struct the caller
-   expects. If the struct ever changes, we redefine the NOW to another enum
-   from above. */
-#define CURLVERSION_NOW CURLVERSION_FOURTH
-
-typedef struct {
-  CURLversion age;          /* age of the returned struct */
-  const char *version;      /* LIBCURL_VERSION */
-  unsigned int version_num; /* LIBCURL_VERSION_NUM */
-  const char *host;         /* OS/host/cpu/machine when configured */
-  int features;             /* bitmask, see defines below */
-  const char *ssl_version;  /* human readable string */
-  long ssl_version_num;     /* not used anymore, always 0 */
-  const char *libz_version; /* human readable string */
-  /* protocols is terminated by an entry with a NULL protoname */
-  const char * const *protocols;
-
-  /* The fields below this were added in CURLVERSION_SECOND */
-  const char *ares;
-  int ares_num;
-
-  /* This field was added in CURLVERSION_THIRD */
-  const char *libidn;
-
-  /* These field were added in CURLVERSION_FOURTH */
-
-  /* Same as '_libiconv_version' if built with HAVE_ICONV */
-  int iconv_ver_num;
-
-  const char *libssh_version; /* human readable string */
-
-} curl_version_info_data;
-
-#define CURL_VERSION_IPV6         (1<<0)  /* IPv6-enabled */
-#define CURL_VERSION_KERBEROS4    (1<<1)  /* Kerberos V4 auth is supported
-                                             (deprecated) */
-#define CURL_VERSION_SSL          (1<<2)  /* SSL options are present */
-#define CURL_VERSION_LIBZ         (1<<3)  /* libz features are present */
-#define CURL_VERSION_NTLM         (1<<4)  /* NTLM auth is supported */
-#define CURL_VERSION_GSSNEGOTIATE (1<<5)  /* Negotiate auth is supported
-                                             (deprecated) */
-#define CURL_VERSION_DEBUG        (1<<6)  /* Built with debug capabilities */
-#define CURL_VERSION_ASYNCHDNS    (1<<7)  /* Asynchronous DNS resolves */
-#define CURL_VERSION_SPNEGO       (1<<8)  /* SPNEGO auth is supported */
-#define CURL_VERSION_LARGEFILE    (1<<9)  /* Supports files larger than 2GB */
-#define CURL_VERSION_IDN          (1<<10) /* Internationized Domain Names are
-                                             supported */
-#define CURL_VERSION_SSPI         (1<<11) /* Built against Windows SSPI */
-#define CURL_VERSION_CONV         (1<<12) /* Character conversions supported */
-#define CURL_VERSION_CURLDEBUG    (1<<13) /* Debug memory tracking supported */
-#define CURL_VERSION_TLSAUTH_SRP  (1<<14) /* TLS-SRP auth is supported */
-#define CURL_VERSION_NTLM_WB      (1<<15) /* NTLM delegation to winbind helper
-                                             is suported */
-#define CURL_VERSION_HTTP2        (1<<16) /* HTTP2 support built-in */
-#define CURL_VERSION_GSSAPI       (1<<17) /* Built against a GSS-API library */
-#define CURL_VERSION_KERBEROS5    (1<<18) /* Kerberos V5 auth is supported */
-#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
-#define CURL_VERSION_PSL          (1<<20) /* Mozilla's Public Suffix List, used
-                                             for cookie domain verification */
-
- /*
- * NAME curl_version_info()
- *
- * DESCRIPTION
- *
- * This function returns a pointer to a static copy of the version info
- * struct. See above.
- */
-CURL_EXTERN curl_version_info_data *curl_version_info(CURLversion);
-
-/*
- * NAME curl_easy_strerror()
- *
- * DESCRIPTION
- *
- * The curl_easy_strerror function may be used to turn a CURLcode value
- * into the equivalent human readable error string.  This is useful
- * for printing meaningful error messages.
- */
-CURL_EXTERN const char *curl_easy_strerror(CURLcode);
-
-/*
- * NAME curl_share_strerror()
- *
- * DESCRIPTION
- *
- * The curl_share_strerror function may be used to turn a CURLSHcode value
- * into the equivalent human readable error string.  This is useful
- * for printing meaningful error messages.
- */
-CURL_EXTERN const char *curl_share_strerror(CURLSHcode);
-
-/*
- * NAME curl_easy_pause()
- *
- * DESCRIPTION
- *
- * The curl_easy_pause function pauses or unpauses transfers. Select the new
- * state by setting the bitmask, use the convenience defines below.
- *
- */
-CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
-
-#define CURLPAUSE_RECV      (1<<0)
-#define CURLPAUSE_RECV_CONT (0)
-
-#define CURLPAUSE_SEND      (1<<2)
-#define CURLPAUSE_SEND_CONT (0)
-
-#define CURLPAUSE_ALL       (CURLPAUSE_RECV|CURLPAUSE_SEND)
-#define CURLPAUSE_CONT      (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT)
-
-#ifdef  __cplusplus
-}
-#endif
-
-/* unfortunately, the easy.h and multi.h include files need options and info
-  stuff before they can be included! */
-#include "easy.h" /* nothing in curl is fun without the easy stuff */
-#include "multi.h"
-
-/* the typechecker doesn't work in C++ (yet) */
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \
-    ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && \
-    !defined(__cplusplus) && !defined(CURL_DISABLE_TYPECHECK)
-#include "typecheck-gcc.h"
-#else
-#if defined(__STDC__) && (__STDC__ >= 1)
-/* This preprocessor magic that replaces a call with the exact same call is
-   only done to make sure application authors pass exactly three arguments
-   to these functions. */
-#define curl_easy_setopt(handle,opt,param) curl_easy_setopt(handle,opt,param)
-#define curl_easy_getinfo(handle,info,arg) curl_easy_getinfo(handle,info,arg)
-#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
-#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
-#endif /* __STDC__ >= 1 */
-#endif /* gcc >= 4.3 && !__cplusplus */
-
-#endif /* __CURL_CURL_H */
diff --git a/dependencies2013/win32/include/curl/curlbuild.h b/dependencies2013/win32/include/curl/curlbuild.h
deleted file mode 100644
index 58323d06..00000000
--- a/dependencies2013/win32/include/curl/curlbuild.h
+++ /dev/null
@@ -1,586 +0,0 @@
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * See file include/curl/curlbuild.h.in, run configure, and forget
- * that this file exists it is only used for non-configure systems.
- * But you can keep reading if you want ;-)
- *
- */
-
-/* ================================================================ */
-/*                 NOTES FOR NON-CONFIGURE SYSTEMS                  */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * Try to keep one section per platform, compiler and architecture,
- * otherwise, if an existing section is reused for a different one and
- * later on the original is adjusted, probably the piggybacking one can
- * be adversely changed.
- *
- * In order to differentiate between platforms/compilers/architectures
- * use only compiler built in predefined preprocessor symbols.
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * For any given platform/compiler curl_off_t must be typedef'ed to a
- * 64-bit wide signed integral data type. The width of this data type
- * must remain constant and independent of any possible large file
- * support settings.
- *
- * As an exception to the above, curl_off_t shall be typedef'ed to a
- * 32-bit wide signed integral data type if there is no 64-bit type.
- *
- * As a general rule, curl_off_t shall not be mapped to off_t. This
- * rule shall only be violated if off_t is the only 64-bit data type
- * available and the size of off_t is independent of large file support
- * settings. Keep your build on the safe side avoiding an off_t gating.
- * If you have a 64-bit off_t then take for sure that another 64-bit
- * data type exists, dig deeper and you will find it.
- *
- * NOTE 3:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.dist or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h
- * when the libcurl source code distribution archive file is created.
- *
- * File include/curl/curlbuild.h.dist is not included in the distribution
- * archive. File include/curl/curlbuild.h is not present in the git tree.
- *
- * The distributed include/curl/curlbuild.h file is only intended to be used
- * on systems which can not run the also distributed configure script.
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- * If you check out from git on a non-configure platform, you must run the
- * appropriate buildconf* script to set up curlbuild.h and other local files.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*    EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY    */
-/* ================================================================ */
-
-#if defined(__DJGPP__) || defined(__GO32__)
-#  if defined(__DJGPP__) && (__DJGPP__ > 1)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  else
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     4
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__SALFORDC__)
-#  define CURL_SIZEOF_LONG           4
-#  define CURL_TYPEOF_CURL_OFF_T     long
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
-#  define CURL_FORMAT_OFF_T          "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T     4
-#  define CURL_SUFFIX_CURL_OFF_T     L
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__BORLANDC__)
-#  if (__BORLANDC__ < 0x520)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     4
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  else
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
-#    define CURL_FORMAT_OFF_T          "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     i64
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__TURBOC__)
-#  define CURL_SIZEOF_LONG           4
-#  define CURL_TYPEOF_CURL_OFF_T     long
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
-#  define CURL_FORMAT_OFF_T          "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T     4
-#  define CURL_SUFFIX_CURL_OFF_T     L
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__WATCOMC__)
-#  if defined(__386__)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
-#    define CURL_FORMAT_OFF_T          "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     i64
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  else
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     4
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__POCC__)
-#  if (__POCC__ < 280)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     4
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  elif defined(_MSC_VER)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
-#    define CURL_FORMAT_OFF_T          "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     i64
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  else
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__LCC__)
-#  define CURL_SIZEOF_LONG           4
-#  define CURL_TYPEOF_CURL_OFF_T     long
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
-#  define CURL_FORMAT_OFF_T          "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T     4
-#  define CURL_SUFFIX_CURL_OFF_T     L
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__SYMBIAN32__)
-#  if defined(__EABI__)  /* Treat all ARM compilers equally */
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  elif defined(__CW32__)
-#    pragma longlong on
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  elif defined(__VC32__)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__MWERKS__)
-#  define CURL_SIZEOF_LONG           4
-#  define CURL_TYPEOF_CURL_OFF_T     long long
-#  define CURL_FORMAT_CURL_OFF_T     "lld"
-#  define CURL_FORMAT_CURL_OFF_TU    "llu"
-#  define CURL_FORMAT_OFF_T          "%lld"
-#  define CURL_SIZEOF_CURL_OFF_T     8
-#  define CURL_SUFFIX_CURL_OFF_T     LL
-#  define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(_WIN32_WCE)
-#  define CURL_SIZEOF_LONG           4
-#  define CURL_TYPEOF_CURL_OFF_T     __int64
-#  define CURL_FORMAT_CURL_OFF_T     "I64d"
-#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
-#  define CURL_FORMAT_OFF_T          "%I64d"
-#  define CURL_SIZEOF_CURL_OFF_T     8
-#  define CURL_SUFFIX_CURL_OFF_T     i64
-#  define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__MINGW32__)
-#  define CURL_SIZEOF_LONG           4
-#  define CURL_TYPEOF_CURL_OFF_T     long long
-#  define CURL_FORMAT_CURL_OFF_T     "I64d"
-#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
-#  define CURL_FORMAT_OFF_T          "%I64d"
-#  define CURL_SIZEOF_CURL_OFF_T     8
-#  define CURL_SUFFIX_CURL_OFF_T     LL
-#  define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__VMS)
-#  if defined(__VAX)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     4
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  else
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-#elif defined(__OS400__)
-#  if defined(__ILEC400__)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
-#    define CURL_PULL_SYS_TYPES_H      1
-#    define CURL_PULL_SYS_SOCKET_H     1
-#  endif
-
-#elif defined(__MVS__)
-#  if defined(__IBMC__) || defined(__IBMCPP__)
-#    if defined(_ILP32)
-#      define CURL_SIZEOF_LONG           4
-#    elif defined(_LP64)
-#      define CURL_SIZEOF_LONG           8
-#    endif
-#    if defined(_LONG_LONG)
-#      define CURL_TYPEOF_CURL_OFF_T     long long
-#      define CURL_FORMAT_CURL_OFF_T     "lld"
-#      define CURL_FORMAT_CURL_OFF_TU    "llu"
-#      define CURL_FORMAT_OFF_T          "%lld"
-#      define CURL_SIZEOF_CURL_OFF_T     8
-#      define CURL_SUFFIX_CURL_OFF_T     LL
-#      define CURL_SUFFIX_CURL_OFF_TU    ULL
-#    elif defined(_LP64)
-#      define CURL_TYPEOF_CURL_OFF_T     long
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
-#      define CURL_FORMAT_OFF_T          "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T     8
-#      define CURL_SUFFIX_CURL_OFF_T     L
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
-#    else
-#      define CURL_TYPEOF_CURL_OFF_T     long
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
-#      define CURL_FORMAT_OFF_T          "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T     4
-#      define CURL_SUFFIX_CURL_OFF_T     L
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
-#    endif
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
-#    define CURL_PULL_SYS_TYPES_H      1
-#    define CURL_PULL_SYS_SOCKET_H     1
-#  endif
-
-#elif defined(__370__)
-#  if defined(__IBMC__) || defined(__IBMCPP__)
-#    if defined(_ILP32)
-#      define CURL_SIZEOF_LONG           4
-#    elif defined(_LP64)
-#      define CURL_SIZEOF_LONG           8
-#    endif
-#    if defined(_LONG_LONG)
-#      define CURL_TYPEOF_CURL_OFF_T     long long
-#      define CURL_FORMAT_CURL_OFF_T     "lld"
-#      define CURL_FORMAT_CURL_OFF_TU    "llu"
-#      define CURL_FORMAT_OFF_T          "%lld"
-#      define CURL_SIZEOF_CURL_OFF_T     8
-#      define CURL_SUFFIX_CURL_OFF_T     LL
-#      define CURL_SUFFIX_CURL_OFF_TU    ULL
-#    elif defined(_LP64)
-#      define CURL_TYPEOF_CURL_OFF_T     long
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
-#      define CURL_FORMAT_OFF_T          "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T     8
-#      define CURL_SUFFIX_CURL_OFF_T     L
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
-#    else
-#      define CURL_TYPEOF_CURL_OFF_T     long
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
-#      define CURL_FORMAT_OFF_T          "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T     4
-#      define CURL_SUFFIX_CURL_OFF_T     L
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
-#    endif
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
-#    define CURL_PULL_SYS_TYPES_H      1
-#    define CURL_PULL_SYS_SOCKET_H     1
-#  endif
-
-#elif defined(TPF)
-#  define CURL_SIZEOF_LONG           8
-#  define CURL_TYPEOF_CURL_OFF_T     long
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
-#  define CURL_FORMAT_OFF_T          "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T     8
-#  define CURL_SUFFIX_CURL_OFF_T     L
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-/* ===================================== */
-/*    KEEP MSVC THE PENULTIMATE ENTRY    */
-/* ===================================== */
-
-#elif defined(_MSC_VER)
-#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
-#    define CURL_FORMAT_OFF_T          "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     i64
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  else
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     4
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-/* ===================================== */
-/*    KEEP GENERIC GCC THE LAST ENTRY    */
-/* ===================================== */
-
-#elif defined(__GNUC__)
-#  if defined(__ILP32__) || \
-      defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
-      defined(__sparc__) || defined(__mips__) || defined(__sh__)
-#    define CURL_SIZEOF_LONG           4
-#    define CURL_TYPEOF_CURL_OFF_T     long long
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
-#    define CURL_FORMAT_OFF_T          "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     LL
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  elif defined(__LP64__) || \
-        defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
-#    define CURL_SIZEOF_LONG           8
-#    define CURL_TYPEOF_CURL_OFF_T     long
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
-#    define CURL_FORMAT_OFF_T          "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T     8
-#    define CURL_SUFFIX_CURL_OFF_T     L
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
-#  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
-#  define CURL_PULL_SYS_TYPES_H      1
-#  define CURL_PULL_SYS_SOCKET_H     1
-
-#else
-#  error "Unknown non-configure build target!"
-   Error Compilation_aborted_Unknown_non_configure_build_target
-#endif
-
-/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
-/* sys/types.h is required here to properly make type definitions below. */
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file  */
-/* sys/socket.h is required here to properly make type definitions below. */
-#ifdef CURL_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* Data type definition of curl_socklen_t. */
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-  typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-#endif
-
-/* Data type definition of curl_off_t. */
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-  typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-#endif
-
-#endif /* __CURL_CURLBUILD_H */
diff --git a/dependencies2013/win32/include/curl/curlrules.h b/dependencies2013/win32/include/curl/curlrules.h
deleted file mode 100644
index 55d21f68..00000000
--- a/dependencies2013/win32/include/curl/curlrules.h
+++ /dev/null
@@ -1,262 +0,0 @@
-#ifndef __CURL_CURLRULES_H
-#define __CURL_CURLRULES_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*                    COMPILE TIME SANITY CHECKS                    */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * All checks done in this file are intentionally placed in a public
- * header file which is pulled by curl/curl.h when an application is
- * being built using an already built libcurl library. Additionally
- * this file is also included and used when building the library.
- *
- * If compilation fails on this file it is certainly sure that the
- * problem is elsewhere. It could be a problem in the curlbuild.h
- * header file, or simply that you are using different compilation
- * settings than those used to build the library.
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * Do not deactivate any check, these are done to make sure that the
- * library is properly built and used.
- *
- * You can find further help on the libcurl development mailing list:
- * https://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * NOTE 2
- * ------
- *
- * Some of the following compile time checks are based on the fact
- * that the dimension of a constant array can not be a negative one.
- * In this way if the compile time verification fails, the compilation
- * will fail issuing an error. The error description wording is compiler
- * dependent but it will be quite similar to one of the following:
- *
- *   "negative subscript or subscript is too large"
- *   "array must have at least one element"
- *   "-1 is an illegal array size"
- *   "size of array is negative"
- *
- * If you are building an application which tries to use an already
- * built libcurl library and you are getting this kind of errors on
- * this file, it is a clear indication that there is a mismatch between
- * how the library was built and how you are trying to use it for your
- * application. Your already compiled or binary library provider is the
- * only one who can give you the details you need to properly use it.
- */
-
-/*
- * Verify that some macros are actually defined.
- */
-
-#ifndef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing
-#endif
-
-#ifndef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing
-#endif
-
-#ifndef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing
-#endif
-
-#ifndef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing
-#endif
-
-#ifndef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU definition is missing!"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing
-#endif
-
-/*
- * Macros private to this header file.
- */
-
-#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1
-
-#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
-
-/*
- * Verify that the size previously defined and expected for long
- * is the same as the one reported by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_01__
-    [CurlchkszEQ(long, CURL_SIZEOF_LONG)];
-
-/*
- * Verify that the size previously defined and expected for
- * curl_off_t is actually the the same as the one reported
- * by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_02__
-    [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)];
-
-/*
- * Verify at compile time that the size of curl_off_t as reported
- * by sizeof() is greater or equal than the one reported for long
- * for the current compilation.
- */
-
-typedef char
-  __curl_rule_03__
-    [CurlchkszGE(curl_off_t, long)];
-
-/*
- * Verify that the size previously defined and expected for
- * curl_socklen_t is actually the the same as the one reported
- * by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_04__
-    [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)];
-
-/*
- * Verify at compile time that the size of curl_socklen_t as reported
- * by sizeof() is greater or equal than the one reported for int for
- * the current compilation.
- */
-
-typedef char
-  __curl_rule_05__
-    [CurlchkszGE(curl_socklen_t, int)];
-
-/* ================================================================ */
-/*          EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS           */
-/* ================================================================ */
-
-/*
- * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
- * these to be visible and exported by the external libcurl interface API,
- * while also making them visible to the library internals, simply including
- * curl_setup.h, without actually needing to include curl.h internally.
- * If some day this section would grow big enough, all this should be moved
- * to its own header file.
- */
-
-/*
- * Figure out if we can use the ## preprocessor operator, which is supported
- * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
- * or  __cplusplus so we need to carefully check for them too.
- */
-
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
-  defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
-  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
-  defined(__ILEC400__)
-  /* This compiler is believed to have an ISO compatible preprocessor */
-#define CURL_ISOCPP
-#else
-  /* This compiler is believed NOT to have an ISO compatible preprocessor */
-#undef CURL_ISOCPP
-#endif
-
-/*
- * Macros for minimum-width signed and unsigned curl_off_t integer constants.
- */
-
-#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
-#  define __CURL_OFF_T_C_HLPR2(x) x
-#  define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x)
-#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val) ## \
-                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
-#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
-                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
-#else
-#  ifdef CURL_ISOCPP
-#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
-#  else
-#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
-#  endif
-#  define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix)
-#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
-#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
-#endif
-
-/*
- * Get rid of macros private to this header file.
- */
-
-#undef CurlchkszEQ
-#undef CurlchkszGE
-
-/*
- * Get rid of macros not intended to exist beyond this point.
- */
-
-#undef CURL_PULL_WS2TCPIP_H
-#undef CURL_PULL_SYS_TYPES_H
-#undef CURL_PULL_SYS_SOCKET_H
-#undef CURL_PULL_SYS_POLL_H
-#undef CURL_PULL_STDINT_H
-#undef CURL_PULL_INTTYPES_H
-
-#undef CURL_TYPEOF_CURL_SOCKLEN_T
-#undef CURL_TYPEOF_CURL_OFF_T
-
-#ifdef CURL_NO_OLDIES
-#undef CURL_FORMAT_OFF_T /* not required since 7.19.0 - obsoleted in 7.20.0 */
-#endif
-
-#endif /* __CURL_CURLRULES_H */
diff --git a/dependencies2013/win32/include/curl/curlver.h b/dependencies2013/win32/include/curl/curlver.h
deleted file mode 100644
index 5d756b3f..00000000
--- a/dependencies2013/win32/include/curl/curlver.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __CURL_CURLVER_H
-#define __CURL_CURLVER_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* This header file contains nothing but libcurl version info, generated by
-   a script at release-time. This was made its own header file in 7.11.2 */
-
-/* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <daniel@haxx.se>."
-
-/* This is the version number of the libcurl package from which this header
-   file origins: */
-#define LIBCURL_VERSION "7.49.0-DEV"
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 49
-#define LIBCURL_VERSION_PATCH 0
-
-/* This is the numeric version of the libcurl version number, meant for easier
-   parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
-   always follow this syntax:
-
-         0xXXYYZZ
-
-   Where XX, YY and ZZ are the main version, release and patch numbers in
-   hexadecimal (using 8 bits each). All three numbers are always represented
-   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
-   appears as "0x090b07".
-
-   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
-   and it is always a greater number in a more recent release. It makes
-   comparisons with greater than and less than work.
-
-   Note: This define is the full hex number and _does not_ use the
-   CURL_VERSION_BITS() macro since curl's own configure script greps for it
-   and needs it to contain the full number.
-*/
-#define LIBCURL_VERSION_NUM 0x073100
-
-/*
- * This is the date and time when the full source package was created. The
- * timestamp is not stored in git, as the timestamp is properly set in the
- * tarballs by the maketgz script.
- *
- * The format of the date should follow this template:
- *
- * "Mon Feb 12 11:35:33 UTC 2007"
- */
-#define LIBCURL_TIMESTAMP "DEV"
-
-#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
-#define CURL_AT_LEAST_VERSION(x,y,z) \
-  (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
-
-#endif /* __CURL_CURLVER_H */
diff --git a/dependencies2013/win32/include/curl/easy.h b/dependencies2013/win32/include/curl/easy.h
deleted file mode 100644
index afc766cd..00000000
--- a/dependencies2013/win32/include/curl/easy.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __CURL_EASY_H
-#define __CURL_EASY_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN CURL *curl_easy_init(void);
-CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
-CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
-CURL_EXTERN void curl_easy_cleanup(CURL *curl);
-
-/*
- * NAME curl_easy_getinfo()
- *
- * DESCRIPTION
- *
- * Request internal information from the curl session with this function.  The
- * third argument MUST be a pointer to a long, a pointer to a char * or a
- * pointer to a double (as the documentation describes elsewhere).  The data
- * pointed to will be filled in accordingly and can be relied upon only if the
- * function returns CURLE_OK.  This function is intended to get used *AFTER* a
- * performed transfer, all results from this function are undefined until the
- * transfer is completed.
- */
-CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
-
-
-/*
- * NAME curl_easy_duphandle()
- *
- * DESCRIPTION
- *
- * Creates a new curl session handle with the same options set for the handle
- * passed in. Duplicating a handle could only be a matter of cloning data and
- * options, internal state info and things like persistent connections cannot
- * be transferred. It is useful in multithreaded applications when you can run
- * curl_easy_duphandle() for each new thread to avoid a series of identical
- * curl_easy_setopt() invokes in every thread.
- */
-CURL_EXTERN CURL* curl_easy_duphandle(CURL *curl);
-
-/*
- * NAME curl_easy_reset()
- *
- * DESCRIPTION
- *
- * Re-initializes a CURL handle to the default values. This puts back the
- * handle to the same state as it was in when it was just created.
- *
- * It does keep: live connections, the Session ID cache, the DNS cache and the
- * cookies.
- */
-CURL_EXTERN void curl_easy_reset(CURL *curl);
-
-/*
- * NAME curl_easy_recv()
- *
- * DESCRIPTION
- *
- * Receives data from the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
-                                    size_t *n);
-
-/*
- * NAME curl_easy_send()
- *
- * DESCRIPTION
- *
- * Sends data over the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
-                                    size_t buflen, size_t *n);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/curl/mprintf.h b/dependencies2013/win32/include/curl/mprintf.h
deleted file mode 100644
index e20f546e..00000000
--- a/dependencies2013/win32/include/curl/mprintf.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __CURL_MPRINTF_H
-#define __CURL_MPRINTF_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h> /* needed for FILE */
-#include "curl.h"  /* for CURL_EXTERN */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN int curl_mprintf(const char *format, ...);
-CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
-CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
-CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
-                               const char *format, ...);
-CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
-CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
-CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
-CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
-                                const char *format, va_list args);
-CURL_EXTERN char *curl_maprintf(const char *format, ...);
-CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* __CURL_MPRINTF_H */
diff --git a/dependencies2013/win32/include/curl/multi.h b/dependencies2013/win32/include/curl/multi.h
deleted file mode 100644
index 0fbbd96f..00000000
--- a/dependencies2013/win32/include/curl/multi.h
+++ /dev/null
@@ -1,435 +0,0 @@
-#ifndef __CURL_MULTI_H
-#define __CURL_MULTI_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-/*
-  This is an "external" header file. Don't give away any internals here!
-
-  GOALS
-
-  o Enable a "pull" interface. The application that uses libcurl decides where
-    and when to ask libcurl to get/send data.
-
-  o Enable multiple simultaneous transfers in the same thread without making it
-    complicated for the application.
-
-  o Enable the application to select() on its own file descriptors and curl's
-    file descriptors simultaneous easily.
-
-*/
-
-/*
- * This header file should not really need to include "curl.h" since curl.h
- * itself includes this file and we expect user applications to do #include
- * <curl/curl.h> without the need for especially including multi.h.
- *
- * For some reason we added this include here at one point, and rather than to
- * break existing (wrongly written) libcurl applications, we leave it as-is
- * but with this warning attached.
- */
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURLM;
-
-typedef enum {
-  CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
-                                    curl_multi_socket*() soon */
-  CURLM_OK,
-  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
-  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
-  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
-  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
-  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */
-  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */
-  CURLM_ADDED_ALREADY,   /* an easy handle already added to a multi handle was
-                            attempted to get added - again */
-  CURLM_LAST
-} CURLMcode;
-
-/* just to make code nicer when using curl_multi_socket() you can now check
-   for CURLM_CALL_MULTI_SOCKET too in the same style it works for
-   curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
-#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
-
-/* bitmask bits for CURLMOPT_PIPELINING */
-#define CURLPIPE_NOTHING   0L
-#define CURLPIPE_HTTP1     1L
-#define CURLPIPE_MULTIPLEX 2L
-
-typedef enum {
-  CURLMSG_NONE, /* first, not used */
-  CURLMSG_DONE, /* This easy handle has completed. 'result' contains
-                   the CURLcode of the transfer */
-  CURLMSG_LAST /* last, not used */
-} CURLMSG;
-
-struct CURLMsg {
-  CURLMSG msg;       /* what this message means */
-  CURL *easy_handle; /* the handle it concerns */
-  union {
-    void *whatever;    /* message-specific data */
-    CURLcode result;   /* return code for transfer */
-  } data;
-};
-typedef struct CURLMsg CURLMsg;
-
-/* Based on poll(2) structure and values.
- * We don't use pollfd and POLL* constants explicitly
- * to cover platforms without poll(). */
-#define CURL_WAIT_POLLIN    0x0001
-#define CURL_WAIT_POLLPRI   0x0002
-#define CURL_WAIT_POLLOUT   0x0004
-
-struct curl_waitfd {
-  curl_socket_t fd;
-  short events;
-  short revents; /* not supported yet */
-};
-
-/*
- * Name:    curl_multi_init()
- *
- * Desc:    inititalize multi-style curl usage
- *
- * Returns: a new CURLM handle to use in all 'curl_multi' functions.
- */
-CURL_EXTERN CURLM *curl_multi_init(void);
-
-/*
- * Name:    curl_multi_add_handle()
- *
- * Desc:    add a standard curl handle to the multi stack
- *
- * Returns: CURLMcode type, general multi error code.
- */
-CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
-                                            CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_remove_handle()
-  *
-  * Desc:    removes a curl handle from the multi stack again
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-                                               CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_fdset()
-  *
-  * Desc:    Ask curl for its fd_set sets. The app can use these to select() or
-  *          poll() on. We want curl_multi_perform() called as soon as one of
-  *          them are ready.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
-                                       fd_set *read_fd_set,
-                                       fd_set *write_fd_set,
-                                       fd_set *exc_fd_set,
-                                       int *max_fd);
-
-/*
- * Name:     curl_multi_wait()
- *
- * Desc:     Poll on all fds within a CURLM set as well as any
- *           additional fds passed to the function.
- *
- * Returns:  CURLMcode type, general multi error code.
- */
-CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle,
-                                      struct curl_waitfd extra_fds[],
-                                      unsigned int extra_nfds,
-                                      int timeout_ms,
-                                      int *ret);
-
- /*
-  * Name:    curl_multi_perform()
-  *
-  * Desc:    When the app thinks there's data available for curl it calls this
-  *          function to read/write whatever there is right now. This returns
-  *          as soon as the reads and writes are done. This function does not
-  *          require that there actually is data available for reading or that
-  *          data can be written, it can be called just in case. It returns
-  *          the number of handles that still transfer data in the second
-  *          argument's integer-pointer.
-  *
-  * Returns: CURLMcode type, general multi error code. *NOTE* that this only
-  *          returns errors etc regarding the whole multi stack. There might
-  *          still have occurred problems on invidual transfers even when this
-  *          returns OK.
-  */
-CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
-                                         int *running_handles);
-
- /*
-  * Name:    curl_multi_cleanup()
-  *
-  * Desc:    Cleans up and removes a whole multi stack. It does not free or
-  *          touch any individual easy handles in any way. We need to define
-  *          in what state those handles will be if this function is called
-  *          in the middle of a transfer.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
-
-/*
- * Name:    curl_multi_info_read()
- *
- * Desc:    Ask the multi handle if there's any messages/informationals from
- *          the individual transfers. Messages include informationals such as
- *          error code from the transfer or just the fact that a transfer is
- *          completed. More details on these should be written down as well.
- *
- *          Repeated calls to this function will return a new struct each
- *          time, until a special "end of msgs" struct is returned as a signal
- *          that there is no more to get at this point.
- *
- *          The data the returned pointer points to will not survive calling
- *          curl_multi_cleanup().
- *
- *          The 'CURLMsg' struct is meant to be very simple and only contain
- *          very basic informations. If more involved information is wanted,
- *          we will provide the particular "transfer handle" in that struct
- *          and that should/could/would be used in subsequent
- *          curl_easy_getinfo() calls (or similar). The point being that we
- *          must never expose complex structs to applications, as then we'll
- *          undoubtably get backwards compatibility problems in the future.
- *
- * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
- *          of structs. It also writes the number of messages left in the
- *          queue (after this read) in the integer the second argument points
- *          to.
- */
-CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
-                                          int *msgs_in_queue);
-
-/*
- * Name:    curl_multi_strerror()
- *
- * Desc:    The curl_multi_strerror function may be used to turn a CURLMcode
- *          value into the equivalent human readable error string.  This is
- *          useful for printing meaningful error messages.
- *
- * Returns: A pointer to a zero-terminated error message.
- */
-CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
-
-/*
- * Name:    curl_multi_socket() and
- *          curl_multi_socket_all()
- *
- * Desc:    An alternative version of curl_multi_perform() that allows the
- *          application to pass in one of the file descriptors that have been
- *          detected to have "action" on them and let libcurl perform.
- *          See man page for details.
- */
-#define CURL_POLL_NONE   0
-#define CURL_POLL_IN     1
-#define CURL_POLL_OUT    2
-#define CURL_POLL_INOUT  3
-#define CURL_POLL_REMOVE 4
-
-#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
-
-#define CURL_CSELECT_IN   0x01
-#define CURL_CSELECT_OUT  0x02
-#define CURL_CSELECT_ERR  0x04
-
-typedef int (*curl_socket_callback)(CURL *easy,      /* easy handle */
-                                    curl_socket_t s, /* socket */
-                                    int what,        /* see above */
-                                    void *userp,     /* private callback
-                                                        pointer */
-                                    void *socketp);  /* private socket
-                                                        pointer */
-/*
- * Name:    curl_multi_timer_callback
- *
- * Desc:    Called by libcurl whenever the library detects a change in the
- *          maximum number of milliseconds the app is allowed to wait before
- *          curl_multi_socket() or curl_multi_perform() must be called
- *          (to allow libcurl's timed events to take place).
- *
- * Returns: The callback should return zero.
- */
-typedef int (*curl_multi_timer_callback)(CURLM *multi,    /* multi handle */
-                                         long timeout_ms, /* see above */
-                                         void *userp);    /* private callback
-                                                             pointer */
-
-CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
-                                        int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
-                                               curl_socket_t s,
-                                               int ev_bitmask,
-                                               int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
-                                            int *running_handles);
-
-#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
-/* This macro below was added in 7.16.3 to push users who recompile to use
-   the new curl_multi_socket_action() instead of the old curl_multi_socket()
-*/
-#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
-#endif
-
-/*
- * Name:    curl_multi_timeout()
- *
- * Desc:    Returns the maximum number of milliseconds the app is allowed to
- *          wait before curl_multi_socket() or curl_multi_perform() must be
- *          called (to allow libcurl's timed events to take place).
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
-                                         long *milliseconds);
-
-#undef CINIT /* re-using the same name as in curl.h */
-
-#ifdef CURL_ISOCPP
-#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
-#endif
-
-typedef enum {
-  /* This is the socket callback function pointer */
-  CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
-
-  /* This is the argument passed to the socket callback */
-  CINIT(SOCKETDATA, OBJECTPOINT, 2),
-
-    /* set to 1 to enable pipelining for this multi handle */
-  CINIT(PIPELINING, LONG, 3),
-
-   /* This is the timer callback function pointer */
-  CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
-
-  /* This is the argument passed to the timer callback */
-  CINIT(TIMERDATA, OBJECTPOINT, 5),
-
-  /* maximum number of entries in the connection cache */
-  CINIT(MAXCONNECTS, LONG, 6),
-
-  /* maximum number of (pipelining) connections to one host */
-  CINIT(MAX_HOST_CONNECTIONS, LONG, 7),
-
-  /* maximum number of requests in a pipeline */
-  CINIT(MAX_PIPELINE_LENGTH, LONG, 8),
-
-  /* a connection with a content-length longer than this
-     will not be considered for pipelining */
-  CINIT(CONTENT_LENGTH_PENALTY_SIZE, OFF_T, 9),
-
-  /* a connection with a chunk length longer than this
-     will not be considered for pipelining */
-  CINIT(CHUNK_LENGTH_PENALTY_SIZE, OFF_T, 10),
-
-  /* a list of site names(+port) that are blacklisted from
-     pipelining */
-  CINIT(PIPELINING_SITE_BL, OBJECTPOINT, 11),
-
-  /* a list of server types that are blacklisted from
-     pipelining */
-  CINIT(PIPELINING_SERVER_BL, OBJECTPOINT, 12),
-
-  /* maximum number of open connections in total */
-  CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
-
-   /* This is the server push callback function pointer */
-  CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
-
-  /* This is the argument passed to the server push callback */
-  CINIT(PUSHDATA, OBJECTPOINT, 15),
-
-  CURLMOPT_LASTENTRY /* the last unused */
-} CURLMoption;
-
-
-/*
- * Name:    curl_multi_setopt()
- *
- * Desc:    Sets options for the multi handle.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
-                                        CURLMoption option, ...);
-
-
-/*
- * Name:    curl_multi_assign()
- *
- * Desc:    This function sets an association in the multi handle between the
- *          given socket and a private pointer of the application. This is
- *          (only) useful for curl_multi_socket uses.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
-                                        curl_socket_t sockfd, void *sockp);
-
-
-/*
- * Name: curl_push_callback
- *
- * Desc: This callback gets called when a new stream is being pushed by the
- *       server. It approves or denies the new stream.
- *
- * Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
- */
-#define CURL_PUSH_OK   0
-#define CURL_PUSH_DENY 1
-
-struct curl_pushheaders;  /* forward declaration only */
-
-CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
-                                        size_t num);
-CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
-                                         const char *name);
-
-typedef int (*curl_push_callback)(CURL *parent,
-                                  CURL *easy,
-                                  size_t num_headers,
-                                  struct curl_pushheaders *headers,
-                                  void *userp);
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/curl/stdcheaders.h b/dependencies2013/win32/include/curl/stdcheaders.h
deleted file mode 100644
index 6f0f7f34..00000000
--- a/dependencies2013/win32/include/curl/stdcheaders.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __STDC_HEADERS_H
-#define __STDC_HEADERS_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <sys/types.h>
-
-size_t fread (void *, size_t, size_t, FILE *);
-size_t fwrite (const void *, size_t, size_t, FILE *);
-
-int strcasecmp(const char *, const char *);
-int strncasecmp(const char *, const char *, size_t);
-
-#endif /* __STDC_HEADERS_H */
diff --git a/dependencies2013/win32/include/curl/typecheck-gcc.h b/dependencies2013/win32/include/curl/typecheck-gcc.h
deleted file mode 100644
index 6ec8bcfd..00000000
--- a/dependencies2013/win32/include/curl/typecheck-gcc.h
+++ /dev/null
@@ -1,622 +0,0 @@
-#ifndef __CURL_TYPECHECK_GCC_H
-#define __CURL_TYPECHECK_GCC_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* wraps curl_easy_setopt() with typechecking */
-
-/* To add a new kind of warning, add an
- *   if(_curl_is_sometype_option(_curl_opt))
- *     if(!_curl_is_sometype(value))
- *       _curl_easy_setopt_err_sometype();
- * block and define _curl_is_sometype_option, _curl_is_sometype and
- * _curl_easy_setopt_err_sometype below
- *
- * NOTE: We use two nested 'if' statements here instead of the && operator, in
- *       order to work around gcc bug #32061.  It affects only gcc 4.3.x/4.4.x
- *       when compiling with -Wlogical-op.
- *
- * To add an option that uses the same type as an existing option, you'll just
- * need to extend the appropriate _curl_*_option macro
- */
-#define curl_easy_setopt(handle, option, value)                               \
-__extension__ ({                                                              \
-  __typeof__ (option) _curl_opt = option;                                     \
-  if(__builtin_constant_p(_curl_opt)) {                                       \
-    if(_curl_is_long_option(_curl_opt))                                       \
-      if(!_curl_is_long(value))                                               \
-        _curl_easy_setopt_err_long();                                         \
-    if(_curl_is_off_t_option(_curl_opt))                                      \
-      if(!_curl_is_off_t(value))                                              \
-        _curl_easy_setopt_err_curl_off_t();                                   \
-    if(_curl_is_string_option(_curl_opt))                                     \
-      if(!_curl_is_string(value))                                             \
-        _curl_easy_setopt_err_string();                                       \
-    if(_curl_is_write_cb_option(_curl_opt))                                   \
-      if(!_curl_is_write_cb(value))                                           \
-        _curl_easy_setopt_err_write_callback();                               \
-    if((_curl_opt) == CURLOPT_READFUNCTION)                                   \
-      if(!_curl_is_read_cb(value))                                            \
-        _curl_easy_setopt_err_read_cb();                                      \
-    if((_curl_opt) == CURLOPT_IOCTLFUNCTION)                                  \
-      if(!_curl_is_ioctl_cb(value))                                           \
-        _curl_easy_setopt_err_ioctl_cb();                                     \
-    if((_curl_opt) == CURLOPT_SOCKOPTFUNCTION)                                \
-      if(!_curl_is_sockopt_cb(value))                                         \
-        _curl_easy_setopt_err_sockopt_cb();                                   \
-    if((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION)                             \
-      if(!_curl_is_opensocket_cb(value))                                      \
-        _curl_easy_setopt_err_opensocket_cb();                                \
-    if((_curl_opt) == CURLOPT_PROGRESSFUNCTION)                               \
-      if(!_curl_is_progress_cb(value))                                        \
-        _curl_easy_setopt_err_progress_cb();                                  \
-    if((_curl_opt) == CURLOPT_DEBUGFUNCTION)                                  \
-      if(!_curl_is_debug_cb(value))                                           \
-        _curl_easy_setopt_err_debug_cb();                                     \
-    if((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION)                               \
-      if(!_curl_is_ssl_ctx_cb(value))                                         \
-        _curl_easy_setopt_err_ssl_ctx_cb();                                   \
-    if(_curl_is_conv_cb_option(_curl_opt))                                    \
-      if(!_curl_is_conv_cb(value))                                            \
-        _curl_easy_setopt_err_conv_cb();                                      \
-    if((_curl_opt) == CURLOPT_SEEKFUNCTION)                                   \
-      if(!_curl_is_seek_cb(value))                                            \
-        _curl_easy_setopt_err_seek_cb();                                      \
-    if(_curl_is_cb_data_option(_curl_opt))                                    \
-      if(!_curl_is_cb_data(value))                                            \
-        _curl_easy_setopt_err_cb_data();                                      \
-    if((_curl_opt) == CURLOPT_ERRORBUFFER)                                    \
-      if(!_curl_is_error_buffer(value))                                       \
-        _curl_easy_setopt_err_error_buffer();                                 \
-    if((_curl_opt) == CURLOPT_STDERR)                                         \
-      if(!_curl_is_FILE(value))                                               \
-        _curl_easy_setopt_err_FILE();                                         \
-    if(_curl_is_postfields_option(_curl_opt))                                 \
-      if(!_curl_is_postfields(value))                                         \
-        _curl_easy_setopt_err_postfields();                                   \
-    if((_curl_opt) == CURLOPT_HTTPPOST)                                       \
-      if(!_curl_is_arr((value), struct curl_httppost))                        \
-        _curl_easy_setopt_err_curl_httpost();                                 \
-    if(_curl_is_slist_option(_curl_opt))                                      \
-      if(!_curl_is_arr((value), struct curl_slist))                           \
-        _curl_easy_setopt_err_curl_slist();                                   \
-    if((_curl_opt) == CURLOPT_SHARE)                                          \
-      if(!_curl_is_ptr((value), CURLSH))                                      \
-        _curl_easy_setopt_err_CURLSH();                                       \
-  }                                                                           \
-  curl_easy_setopt(handle, _curl_opt, value);                                 \
-})
-
-/* wraps curl_easy_getinfo() with typechecking */
-/* FIXME: don't allow const pointers */
-#define curl_easy_getinfo(handle, info, arg)                                  \
-__extension__ ({                                                              \
-  __typeof__ (info) _curl_info = info;                                        \
-  if(__builtin_constant_p(_curl_info)) {                                      \
-    if(_curl_is_string_info(_curl_info))                                      \
-      if(!_curl_is_arr((arg), char *))                                        \
-        _curl_easy_getinfo_err_string();                                      \
-    if(_curl_is_long_info(_curl_info))                                        \
-      if(!_curl_is_arr((arg), long))                                          \
-        _curl_easy_getinfo_err_long();                                        \
-    if(_curl_is_double_info(_curl_info))                                      \
-      if(!_curl_is_arr((arg), double))                                        \
-        _curl_easy_getinfo_err_double();                                      \
-    if(_curl_is_slist_info(_curl_info))                                       \
-      if(!_curl_is_arr((arg), struct curl_slist *))                           \
-        _curl_easy_getinfo_err_curl_slist();                                  \
-  }                                                                           \
-  curl_easy_getinfo(handle, _curl_info, arg);                                 \
-})
-
-/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(),
- * for now just make sure that the functions are called with three
- * arguments
- */
-#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
-#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
-
-
-/* the actual warnings, triggered by calling the _curl_easy_setopt_err*
- * functions */
-
-/* To define a new warning, use _CURL_WARNING(identifier, "message") */
-#define _CURL_WARNING(id, message)                                            \
-  static void __attribute__((__warning__(message)))                           \
-  __attribute__((__unused__)) __attribute__((__noinline__))                   \
-  id(void) { __asm__(""); }
-
-_CURL_WARNING(_curl_easy_setopt_err_long,
-  "curl_easy_setopt expects a long argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,
-  "curl_easy_setopt expects a curl_off_t argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_string,
-              "curl_easy_setopt expects a "
-              "string (char* or char[]) argument for this option"
-  )
-_CURL_WARNING(_curl_easy_setopt_err_write_callback,
-  "curl_easy_setopt expects a curl_write_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_read_cb,
-  "curl_easy_setopt expects a curl_read_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb,
-  "curl_easy_setopt expects a curl_ioctl_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,
-  "curl_easy_setopt expects a curl_sockopt_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,
-              "curl_easy_setopt expects a "
-              "curl_opensocket_callback argument for this option"
-  )
-_CURL_WARNING(_curl_easy_setopt_err_progress_cb,
-  "curl_easy_setopt expects a curl_progress_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
-  "curl_easy_setopt expects a curl_debug_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb,
-  "curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_conv_cb,
-  "curl_easy_setopt expects a curl_conv_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_seek_cb,
-  "curl_easy_setopt expects a curl_seek_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_cb_data,
-              "curl_easy_setopt expects a "
-              "private data pointer as argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_error_buffer,
-              "curl_easy_setopt expects a "
-              "char buffer of CURL_ERROR_SIZE as argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_FILE,
-  "curl_easy_setopt expects a FILE* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_postfields,
-  "curl_easy_setopt expects a void* or char* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_httpost,
-  "curl_easy_setopt expects a struct curl_httppost* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_slist,
-  "curl_easy_setopt expects a struct curl_slist* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_CURLSH,
-  "curl_easy_setopt expects a CURLSH* argument for this option")
-
-_CURL_WARNING(_curl_easy_getinfo_err_string,
-  "curl_easy_getinfo expects a pointer to char * for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_long,
-  "curl_easy_getinfo expects a pointer to long for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_double,
-  "curl_easy_getinfo expects a pointer to double for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
-  "curl_easy_getinfo expects a pointer to struct curl_slist * for this info")
-
-/* groups of curl_easy_setops options that take the same type of argument */
-
-/* To add a new option to one of the groups, just add
- *   (option) == CURLOPT_SOMETHING
- * to the or-expression. If the option takes a long or curl_off_t, you don't
- * have to do anything
- */
-
-/* evaluates to true if option takes a long argument */
-#define _curl_is_long_option(option)                                          \
-  (0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT)
-
-#define _curl_is_off_t_option(option)                                         \
-  ((option) > CURLOPTTYPE_OFF_T)
-
-/* evaluates to true if option takes a char* argument */
-#define _curl_is_string_option(option)                                        \
-  ((option) == CURLOPT_ACCEPT_ENCODING ||                                     \
-   (option) == CURLOPT_CAINFO ||                                              \
-   (option) == CURLOPT_CAPATH ||                                              \
-   (option) == CURLOPT_COOKIE ||                                              \
-   (option) == CURLOPT_COOKIEFILE ||                                          \
-   (option) == CURLOPT_COOKIEJAR ||                                           \
-   (option) == CURLOPT_COOKIELIST ||                                          \
-   (option) == CURLOPT_CRLFILE ||                                             \
-   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
-   (option) == CURLOPT_DEFAULT_PROTOCOL ||                                    \
-   (option) == CURLOPT_DNS_INTERFACE ||                                       \
-   (option) == CURLOPT_DNS_LOCAL_IP4 ||                                       \
-   (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \
-   (option) == CURLOPT_DNS_SERVERS ||                                         \
-   (option) == CURLOPT_EGDSOCKET ||                                           \
-   (option) == CURLOPT_FTPPORT ||                                             \
-   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
-   (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
-   (option) == CURLOPT_INTERFACE ||                                           \
-   (option) == CURLOPT_ISSUERCERT ||                                          \
-   (option) == CURLOPT_KEYPASSWD ||                                           \
-   (option) == CURLOPT_KRBLEVEL ||                                            \
-   (option) == CURLOPT_LOGIN_OPTIONS ||                                       \
-   (option) == CURLOPT_MAIL_AUTH ||                                           \
-   (option) == CURLOPT_MAIL_FROM ||                                           \
-   (option) == CURLOPT_NETRC_FILE ||                                          \
-   (option) == CURLOPT_NOPROXY ||                                             \
-   (option) == CURLOPT_PASSWORD ||                                            \
-   (option) == CURLOPT_PINNEDPUBLICKEY ||                                     \
-   (option) == CURLOPT_PROXY ||                                               \
-   (option) == CURLOPT_PROXYPASSWORD ||                                       \
-   (option) == CURLOPT_PROXYUSERNAME ||                                       \
-   (option) == CURLOPT_PROXYUSERPWD ||                                        \
-   (option) == CURLOPT_PROXY_SERVICE_NAME ||                                  \
-   (option) == CURLOPT_RANDOM_FILE ||                                         \
-   (option) == CURLOPT_RANGE ||                                               \
-   (option) == CURLOPT_REFERER ||                                             \
-   (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
-   (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
-   (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
-   (option) == CURLOPT_SERVICE_NAME ||                                        \
-   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
-   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
-   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
-   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
-   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
-   (option) == CURLOPT_SSLCERT ||                                             \
-   (option) == CURLOPT_SSLCERTTYPE ||                                         \
-   (option) == CURLOPT_SSLENGINE ||                                           \
-   (option) == CURLOPT_SSLKEY ||                                              \
-   (option) == CURLOPT_SSLKEYTYPE ||                                          \
-   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
-   (option) == CURLOPT_TLSAUTH_PASSWORD ||                                    \
-   (option) == CURLOPT_TLSAUTH_TYPE ||                                        \
-   (option) == CURLOPT_TLSAUTH_USERNAME ||                                    \
-   (option) == CURLOPT_UNIX_SOCKET_PATH ||                                    \
-   (option) == CURLOPT_URL ||                                                 \
-   (option) == CURLOPT_USERAGENT ||                                           \
-   (option) == CURLOPT_USERNAME ||                                            \
-   (option) == CURLOPT_USERPWD ||                                             \
-   (option) == CURLOPT_XOAUTH2_BEARER ||                                      \
-   0)
-
-/* evaluates to true if option takes a curl_write_callback argument */
-#define _curl_is_write_cb_option(option)                                      \
-  ((option) == CURLOPT_HEADERFUNCTION ||                                      \
-   (option) == CURLOPT_WRITEFUNCTION)
-
-/* evaluates to true if option takes a curl_conv_callback argument */
-#define _curl_is_conv_cb_option(option)                                       \
-  ((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION ||                            \
-   (option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION ||                          \
-   (option) == CURLOPT_CONV_FROM_UTF8_FUNCTION)
-
-/* evaluates to true if option takes a data argument to pass to a callback */
-#define _curl_is_cb_data_option(option)                                       \
-  ((option) == CURLOPT_CHUNK_DATA ||                                          \
-   (option) == CURLOPT_CLOSESOCKETDATA ||                                     \
-   (option) == CURLOPT_DEBUGDATA ||                                           \
-   (option) == CURLOPT_FNMATCH_DATA ||                                        \
-   (option) == CURLOPT_HEADERDATA ||                                          \
-   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
-   (option) == CURLOPT_IOCTLDATA ||                                           \
-   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
-   (option) == CURLOPT_PRIVATE ||                                             \
-   (option) == CURLOPT_PROGRESSDATA ||                                        \
-   (option) == CURLOPT_READDATA ||                                            \
-   (option) == CURLOPT_SEEKDATA ||                                            \
-   (option) == CURLOPT_SOCKOPTDATA ||                                         \
-   (option) == CURLOPT_SSH_KEYDATA ||                                         \
-   (option) == CURLOPT_SSL_CTX_DATA ||                                        \
-   (option) == CURLOPT_WRITEDATA ||                                           \
-   0)
-
-/* evaluates to true if option takes a POST data argument (void* or char*) */
-#define _curl_is_postfields_option(option)                                    \
-  ((option) == CURLOPT_POSTFIELDS ||                                          \
-   (option) == CURLOPT_COPYPOSTFIELDS ||                                      \
-   0)
-
-/* evaluates to true if option takes a struct curl_slist * argument */
-#define _curl_is_slist_option(option)                                         \
-  ((option) == CURLOPT_HTTP200ALIASES ||                                      \
-   (option) == CURLOPT_HTTPHEADER ||                                          \
-   (option) == CURLOPT_MAIL_RCPT ||                                           \
-   (option) == CURLOPT_POSTQUOTE ||                                           \
-   (option) == CURLOPT_PREQUOTE ||                                            \
-   (option) == CURLOPT_PROXYHEADER ||                                         \
-   (option) == CURLOPT_QUOTE ||                                               \
-   (option) == CURLOPT_RESOLVE ||                                             \
-   (option) == CURLOPT_TELNETOPTIONS ||                                       \
-   0)
-
-/* groups of curl_easy_getinfo infos that take the same type of argument */
-
-/* evaluates to true if info expects a pointer to char * argument */
-#define _curl_is_string_info(info)                                            \
-  (CURLINFO_STRING < (info) && (info) < CURLINFO_LONG)
-
-/* evaluates to true if info expects a pointer to long argument */
-#define _curl_is_long_info(info)                                              \
-  (CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE)
-
-/* evaluates to true if info expects a pointer to double argument */
-#define _curl_is_double_info(info)                                            \
-  (CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
-
-/* true if info expects a pointer to struct curl_slist * argument */
-#define _curl_is_slist_info(info)                                             \
-  (CURLINFO_SLIST < (info))
-
-
-/* typecheck helpers -- check whether given expression has requested type*/
-
-/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros,
- * otherwise define a new macro. Search for __builtin_types_compatible_p
- * in the GCC manual.
- * NOTE: these macros MUST NOT EVALUATE their arguments! The argument is
- * the actual expression passed to the curl_easy_setopt macro. This
- * means that you can only apply the sizeof and __typeof__ operators, no
- * == or whatsoever.
- */
-
-/* XXX: should evaluate to true iff expr is a pointer */
-#define _curl_is_any_ptr(expr)                                                \
-  (sizeof(expr) == sizeof(void*))
-
-/* evaluates to true if expr is NULL */
-/* XXX: must not evaluate expr, so this check is not accurate */
-#define _curl_is_NULL(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL)))
-
-/* evaluates to true if expr is type*, const type* or NULL */
-#define _curl_is_ptr(expr, type)                                              \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), type *) ||                  \
-   __builtin_types_compatible_p(__typeof__(expr), const type *))
-
-/* evaluates to true if expr is one of type[], type*, NULL or const type* */
-#define _curl_is_arr(expr, type)                                              \
-  (_curl_is_ptr((expr), type) ||                                              \
-   __builtin_types_compatible_p(__typeof__(expr), type []))
-
-/* evaluates to true if expr is a string */
-#define _curl_is_string(expr)                                                 \
-  (_curl_is_arr((expr), char) ||                                              \
-   _curl_is_arr((expr), signed char) ||                                       \
-   _curl_is_arr((expr), unsigned char))
-
-/* evaluates to true if expr is a long (no matter the signedness)
- * XXX: for now, int is also accepted (and therefore short and char, which
- * are promoted to int when passed to a variadic function) */
-#define _curl_is_long(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), long) ||                    \
-   __builtin_types_compatible_p(__typeof__(expr), signed long) ||             \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned long) ||           \
-   __builtin_types_compatible_p(__typeof__(expr), int) ||                     \
-   __builtin_types_compatible_p(__typeof__(expr), signed int) ||              \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned int) ||            \
-   __builtin_types_compatible_p(__typeof__(expr), short) ||                   \
-   __builtin_types_compatible_p(__typeof__(expr), signed short) ||            \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned short) ||          \
-   __builtin_types_compatible_p(__typeof__(expr), char) ||                    \
-   __builtin_types_compatible_p(__typeof__(expr), signed char) ||             \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned char))
-
-/* evaluates to true if expr is of type curl_off_t */
-#define _curl_is_off_t(expr)                                                  \
-  (__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
-
-/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
-/* XXX: also check size of an char[] array? */
-#define _curl_is_error_buffer(expr)                                           \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), char *) ||                  \
-   __builtin_types_compatible_p(__typeof__(expr), char[]))
-
-/* evaluates to true if expr is of type (const) void* or (const) FILE* */
-#if 0
-#define _curl_is_cb_data(expr)                                                \
-  (_curl_is_ptr((expr), void) ||                                              \
-   _curl_is_ptr((expr), FILE))
-#else /* be less strict */
-#define _curl_is_cb_data(expr)                                                \
-  _curl_is_any_ptr(expr)
-#endif
-
-/* evaluates to true if expr is of type FILE* */
-#define _curl_is_FILE(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), FILE *))
-
-/* evaluates to true if expr can be passed as POST data (void* or char*) */
-#define _curl_is_postfields(expr)                                             \
-  (_curl_is_ptr((expr), void) ||                                              \
-   _curl_is_arr((expr), char))
-
-/* FIXME: the whole callback checking is messy...
- * The idea is to tolerate char vs. void and const vs. not const
- * pointers in arguments at least
- */
-/* helper: __builtin_types_compatible_p distinguishes between functions and
- * function pointers, hide it */
-#define _curl_callback_compatible(func, type)                                 \
-  (__builtin_types_compatible_p(__typeof__(func), type) ||                    \
-   __builtin_types_compatible_p(__typeof__(func), type*))
-
-/* evaluates to true if expr is of type curl_read_callback or "similar" */
-#define _curl_is_read_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fread)) ||       \
-   __builtin_types_compatible_p(__typeof__(expr), curl_read_callback) ||      \
-   _curl_callback_compatible((expr), _curl_read_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback2) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback3) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback4) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback5) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback6))
-typedef size_t (_curl_read_callback1)(char *, size_t, size_t, void*);
-typedef size_t (_curl_read_callback2)(char *, size_t, size_t, const void*);
-typedef size_t (_curl_read_callback3)(char *, size_t, size_t, FILE*);
-typedef size_t (_curl_read_callback4)(void *, size_t, size_t, void*);
-typedef size_t (_curl_read_callback5)(void *, size_t, size_t, const void*);
-typedef size_t (_curl_read_callback6)(void *, size_t, size_t, FILE*);
-
-/* evaluates to true if expr is of type curl_write_callback or "similar" */
-#define _curl_is_write_cb(expr)                                               \
-  (_curl_is_read_cb(expr) ||                                            \
-   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fwrite)) ||      \
-   __builtin_types_compatible_p(__typeof__(expr), curl_write_callback) ||     \
-   _curl_callback_compatible((expr), _curl_write_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback4) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback5) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback6))
-typedef size_t (_curl_write_callback1)(const char *, size_t, size_t, void*);
-typedef size_t (_curl_write_callback2)(const char *, size_t, size_t,
-                                       const void*);
-typedef size_t (_curl_write_callback3)(const char *, size_t, size_t, FILE*);
-typedef size_t (_curl_write_callback4)(const void *, size_t, size_t, void*);
-typedef size_t (_curl_write_callback5)(const void *, size_t, size_t,
-                                       const void*);
-typedef size_t (_curl_write_callback6)(const void *, size_t, size_t, FILE*);
-
-/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
-#define _curl_is_ioctl_cb(expr)                                         \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_ioctl_callback) ||     \
-   _curl_callback_compatible((expr), _curl_ioctl_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback4))
-typedef curlioerr (_curl_ioctl_callback1)(CURL *, int, void*);
-typedef curlioerr (_curl_ioctl_callback2)(CURL *, int, const void*);
-typedef curlioerr (_curl_ioctl_callback3)(CURL *, curliocmd, void*);
-typedef curlioerr (_curl_ioctl_callback4)(CURL *, curliocmd, const void*);
-
-/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */
-#define _curl_is_sockopt_cb(expr)                                       \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_sockopt_callback) ||   \
-   _curl_callback_compatible((expr), _curl_sockopt_callback1) ||              \
-   _curl_callback_compatible((expr), _curl_sockopt_callback2))
-typedef int (_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);
-typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t,
-                                      curlsocktype);
-
-/* evaluates to true if expr is of type curl_opensocket_callback or
-   "similar" */
-#define _curl_is_opensocket_cb(expr)                                    \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_opensocket_callback) ||\
-   _curl_callback_compatible((expr), _curl_opensocket_callback1) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback2) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback3) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback4))
-typedef curl_socket_t (_curl_opensocket_callback1)
-  (void *, curlsocktype, struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback2)
-  (void *, curlsocktype, const struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback3)
-  (const void *, curlsocktype, struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback4)
-  (const void *, curlsocktype, const struct curl_sockaddr *);
-
-/* evaluates to true if expr is of type curl_progress_callback or "similar" */
-#define _curl_is_progress_cb(expr)                                      \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_progress_callback) ||  \
-   _curl_callback_compatible((expr), _curl_progress_callback1) ||             \
-   _curl_callback_compatible((expr), _curl_progress_callback2))
-typedef int (_curl_progress_callback1)(void *,
-    double, double, double, double);
-typedef int (_curl_progress_callback2)(const void *,
-    double, double, double, double);
-
-/* evaluates to true if expr is of type curl_debug_callback or "similar" */
-#define _curl_is_debug_cb(expr)                                         \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_debug_callback) ||     \
-   _curl_callback_compatible((expr), _curl_debug_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback4) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback5) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback6) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback7) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback8))
-typedef int (_curl_debug_callback1) (CURL *,
-    curl_infotype, char *, size_t, void *);
-typedef int (_curl_debug_callback2) (CURL *,
-    curl_infotype, char *, size_t, const void *);
-typedef int (_curl_debug_callback3) (CURL *,
-    curl_infotype, const char *, size_t, void *);
-typedef int (_curl_debug_callback4) (CURL *,
-    curl_infotype, const char *, size_t, const void *);
-typedef int (_curl_debug_callback5) (CURL *,
-    curl_infotype, unsigned char *, size_t, void *);
-typedef int (_curl_debug_callback6) (CURL *,
-    curl_infotype, unsigned char *, size_t, const void *);
-typedef int (_curl_debug_callback7) (CURL *,
-    curl_infotype, const unsigned char *, size_t, void *);
-typedef int (_curl_debug_callback8) (CURL *,
-    curl_infotype, const unsigned char *, size_t, const void *);
-
-/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */
-/* this is getting even messier... */
-#define _curl_is_ssl_ctx_cb(expr)                                       \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_ssl_ctx_callback) ||   \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback1) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback2) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback3) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback4) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback5) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback6) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback7) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback8))
-typedef CURLcode (_curl_ssl_ctx_callback1)(CURL *, void *, void *);
-typedef CURLcode (_curl_ssl_ctx_callback2)(CURL *, void *, const void *);
-typedef CURLcode (_curl_ssl_ctx_callback3)(CURL *, const void *, void *);
-typedef CURLcode (_curl_ssl_ctx_callback4)(CURL *, const void *, const void *);
-#ifdef HEADER_SSL_H
-/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
- * this will of course break if we're included before OpenSSL headers...
- */
-typedef CURLcode (_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
-typedef CURLcode (_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
-typedef CURLcode (_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
-typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,
-                                           const void *);
-#else
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8;
-#endif
-
-/* evaluates to true if expr is of type curl_conv_callback or "similar" */
-#define _curl_is_conv_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_conv_callback) ||      \
-   _curl_callback_compatible((expr), _curl_conv_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback2) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback3) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback4))
-typedef CURLcode (*_curl_conv_callback1)(char *, size_t length);
-typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length);
-typedef CURLcode (*_curl_conv_callback3)(void *, size_t length);
-typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length);
-
-/* evaluates to true if expr is of type curl_seek_callback or "similar" */
-#define _curl_is_seek_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_seek_callback) ||      \
-   _curl_callback_compatible((expr), _curl_seek_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_seek_callback2))
-typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int);
-typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int);
-
-
-#endif /* __CURL_TYPECHECK_GCC_H */
diff --git a/dependencies2013/win32/include/freetype/config/ftconfig.h b/dependencies2013/win32/include/freetype/config/ftconfig.h
deleted file mode 100644
index 157a704f..00000000
--- a/dependencies2013/win32/include/freetype/config/ftconfig.h
+++ /dev/null
@@ -1,473 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftconfig.h                                                             */
-/*                                                                         */
-/*    ANSI-specific configuration file (specification only).               */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This header file contains a number of macro definitions that are used */
-  /* by the rest of the engine.  Most of the macros here are automatically */
-  /* determined at compile time, and you should not need to change it to   */
-  /* port FreeType, except to compile the library with a non-ANSI          */
-  /* compiler.                                                             */
-  /*                                                                       */
-  /* Note however that if some specific modifications are needed, we       */
-  /* advise you to place a modified copy in your build directory.          */
-  /*                                                                       */
-  /* The build directory is usually `builds/<system>', and contains        */
-  /* system-specific files that are always included first when building    */
-  /* the library.                                                          */
-  /*                                                                       */
-  /* This ANSI version should stay in `include/config/'.                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifndef FTCONFIG_H_
-#define FTCONFIG_H_
-
-#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
-#include FT_CONFIG_STANDARD_LIBRARY_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* These macros can be toggled to suit a specific system.  The current   */
-  /* ones are defaults used to compile FreeType in an ANSI C environment   */
-  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `builds/<system>' directory, and edit it to port the engine.          */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* There are systems (like the Texas Instruments 'C54x) where a `char' */
-  /* has 16 bits.  ANSI C says that sizeof(char) is always 1.  Since an  */
-  /* `int' has 16 bits also for this system, sizeof(int) gives 1 which   */
-  /* is probably unexpected.                                             */
-  /*                                                                     */
-  /* `CHAR_BIT' (defined in limits.h) gives the number of bits in a      */
-  /* `char' type.                                                        */
-
-#ifndef FT_CHAR_BIT
-#define FT_CHAR_BIT  CHAR_BIT
-#endif
-
-
-  /* The size of an `int' type.  */
-#if                                 FT_UINT_MAX == 0xFFFFUL
-#define FT_SIZEOF_INT  (16 / FT_CHAR_BIT)
-#elif                               FT_UINT_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_INT  (32 / FT_CHAR_BIT)
-#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_INT  (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `int' type!"
-#endif
-
-  /* The size of a `long' type.  A five-byte `long' (as used e.g. on the */
-  /* DM642) is recognized but avoided.                                   */
-#if                                  FT_ULONG_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
-#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_LONG  (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `long' type!"
-#endif
-
-
-  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
-  /* used -- this is only used to get rid of unpleasant compiler warnings */
-#ifndef FT_UNUSED
-#define FT_UNUSED( arg )  ( (arg) = (arg) )
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     AUTOMATIC CONFIGURATION MACROS                    */
-  /*                                                                       */
-  /* These macros are computed from the ones defined above.  Don't touch   */
-  /* their definition, unless you know precisely what you are doing.  No   */
-  /* porter should need to mess with them.                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Mac support                                                           */
-  /*                                                                       */
-  /*   This is the only necessary change, so it is defined here instead    */
-  /*   providing a new configuration file.                                 */
-  /*                                                                       */
-#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
-  /* no Carbon frameworks for 64bit 10.4.x */
-  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
-  /* so guess the system version by maximum errno before inclusion */
-#include <errno.h>
-#ifdef ECANCELED /* defined since 10.2 */
-#include "AvailabilityMacros.h"
-#endif
-#if defined( __LP64__ ) && \
-    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#undef FT_MACINTOSH
-#endif
-
-#elif defined( __SC__ ) || defined( __MRC__ )
-  /* Classic MacOS compilers */
-#include "ConditionalMacros.h"
-#if TARGET_OS_MAC
-#define FT_MACINTOSH 1
-#endif
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int16                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 16bit signed integer type.                         */
-  /*                                                                       */
-  typedef signed short  FT_Int16;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt16                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 16bit unsigned integer type.                       */
-  /*                                                                       */
-  typedef unsigned short  FT_UInt16;
-
-  /* */
-
-
-  /* this #if 0 ... #endif clause is for documentation purposes */
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int32                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 32bit signed integer type.  The size depends on    */
-  /*    the configuration.                                                 */
-  /*                                                                       */
-  typedef signed XXX  FT_Int32;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt32                                                          */
-  /*                                                                       */
-  /*    A typedef for a 32bit unsigned integer type.  The size depends on  */
-  /*    the configuration.                                                 */
-  /*                                                                       */
-  typedef unsigned XXX  FT_UInt32;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int64                                                           */
-  /*                                                                       */
-  /*    A typedef for a 64bit signed integer type.  The size depends on    */
-  /*    the configuration.  Only defined if there is real 64bit support;   */
-  /*    otherwise, it gets emulated with a structure (if necessary).       */
-  /*                                                                       */
-  typedef signed XXX  FT_Int64;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt64                                                          */
-  /*                                                                       */
-  /*    A typedef for a 64bit unsigned integer type.  The size depends on  */
-  /*    the configuration.  Only defined if there is real 64bit support;   */
-  /*    otherwise, it gets emulated with a structure (if necessary).       */
-  /*                                                                       */
-  typedef unsigned XXX  FT_UInt64;
-
-  /* */
-
-#endif
-
-#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
-
-  typedef signed int      FT_Int32;
-  typedef unsigned int    FT_UInt32;
-
-#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
-
-  typedef signed long     FT_Int32;
-  typedef unsigned long   FT_UInt32;
-
-#else
-#error "no 32bit type found -- please check your configuration files"
-#endif
-
-
-  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
-
-  typedef int            FT_Fast;
-  typedef unsigned int   FT_UFast;
-
-#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
-
-  typedef long           FT_Fast;
-  typedef unsigned long  FT_UFast;
-
-#endif
-
-
-  /* determine whether we have a 64-bit int type for platforms without */
-  /* Autoconf                                                          */
-#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
-
-  /* FT_LONG64 must be defined if a 64-bit type is available */
-#define FT_LONG64
-#define FT_INT64   long
-#define FT_UINT64  unsigned long
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A 64-bit data type may create compilation problems if you compile     */
-  /* in strict ANSI mode.  To avoid them, we disable other 64-bit data     */
-  /* types if __STDC__ is defined.  You can however ignore this rule       */
-  /* by defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro.     */
-  /*                                                                       */
-#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
-
-#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
-
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64   __int64
-#define FT_UINT64  unsigned __int64
-
-#elif defined( __BORLANDC__ )  /* Borland C++ */
-
-  /* XXXX: We should probably check the value of __BORLANDC__ in order */
-  /*       to test the compiler version.                               */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64   __int64
-#define FT_UINT64  unsigned __int64
-
-#elif defined( __WATCOMC__ )   /* Watcom C++ */
-
-  /* Watcom doesn't provide 64-bit data types */
-
-#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
-
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#elif defined( __GNUC__ )
-
-  /* GCC provides the `long long' type */
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#endif /* __STDC_VERSION__ >= 199901L */
-
-#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
-
-#ifdef FT_LONG64
-  typedef FT_INT64   FT_Int64;
-  typedef FT_UINT64  FT_UInt64;
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* miscellaneous                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define FT_BEGIN_STMNT  do {
-#define FT_END_STMNT    } while ( 0 )
-#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
-
-
-  /* typeof condition taken from gnulib's `intprops.h' header file */
-#if ( __GNUC__ >= 2                         || \
-      defined( __IBM__TYPEOF__ )            || \
-      ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define FT_TYPEOF( type )  (__typeof__ (type))
-#else
-#define FT_TYPEOF( type )  /* empty */
-#endif
-
-
-#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
-
-#define FT_LOCAL( x )      static  x
-#define FT_LOCAL_DEF( x )  static  x
-
-#else
-
-#ifdef __cplusplus
-#define FT_LOCAL( x )      extern "C"  x
-#define FT_LOCAL_DEF( x )  extern "C"  x
-#else
-#define FT_LOCAL( x )      extern  x
-#define FT_LOCAL_DEF( x )  x
-#endif
-
-#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
-
-#define FT_LOCAL_ARRAY( x )      extern const  x
-#define FT_LOCAL_ARRAY_DEF( x )  const  x
-
-
-#ifndef FT_BASE
-
-#ifdef __cplusplus
-#define FT_BASE( x )  extern "C"  x
-#else
-#define FT_BASE( x )  extern  x
-#endif
-
-#endif /* !FT_BASE */
-
-
-#ifndef FT_BASE_DEF
-
-#ifdef __cplusplus
-#define FT_BASE_DEF( x )  x
-#else
-#define FT_BASE_DEF( x )  x
-#endif
-
-#endif /* !FT_BASE_DEF */
-
-
-#ifndef FT_EXPORT
-
-#ifdef __cplusplus
-#define FT_EXPORT( x )  extern "C"  x
-#else
-#define FT_EXPORT( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT */
-
-
-#ifndef FT_EXPORT_DEF
-
-#ifdef __cplusplus
-#define FT_EXPORT_DEF( x )  extern "C"  x
-#else
-#define FT_EXPORT_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_DEF */
-
-
-#ifndef FT_EXPORT_VAR
-
-#ifdef __cplusplus
-#define FT_EXPORT_VAR( x )  extern "C"  x
-#else
-#define FT_EXPORT_VAR( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_VAR */
-
-  /* The following macros are needed to compile the library with a   */
-  /* C++ compiler and with 16bit compilers.                          */
-  /*                                                                 */
-
-  /* This is special.  Within C++, you must specify `extern "C"' for */
-  /* functions which are used via function pointers, and you also    */
-  /* must do that for structures which contain function pointers to  */
-  /* assure C linkage -- it's not possible to have (local) anonymous */
-  /* functions which are accessed by (global) function pointers.     */
-  /*                                                                 */
-  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
-  /* contains pointers to callback functions.                        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
-  /* that contains pointers to callback functions.                   */
-  /*                                                                 */
-  /*                                                                 */
-  /* Some 16bit compilers have to redefine these macros to insert    */
-  /* the infamous `_cdecl' or `__fastcall' declarations.             */
-  /*                                                                 */
-#ifndef FT_CALLBACK_DEF
-#ifdef __cplusplus
-#define FT_CALLBACK_DEF( x )  extern "C"  x
-#else
-#define FT_CALLBACK_DEF( x )  static  x
-#endif
-#endif /* FT_CALLBACK_DEF */
-
-#ifndef FT_CALLBACK_TABLE
-#ifdef __cplusplus
-#define FT_CALLBACK_TABLE      extern "C"
-#define FT_CALLBACK_TABLE_DEF  extern "C"
-#else
-#define FT_CALLBACK_TABLE      extern
-#define FT_CALLBACK_TABLE_DEF  /* nothing */
-#endif
-#endif /* FT_CALLBACK_TABLE */
-
-
-FT_END_HEADER
-
-
-#endif /* FTCONFIG_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/config/ftheader.h b/dependencies2013/win32/include/freetype/config/ftheader.h
deleted file mode 100644
index 68e14834..00000000
--- a/dependencies2013/win32/include/freetype/config/ftheader.h
+++ /dev/null
@@ -1,833 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftheader.h                                                             */
-/*                                                                         */
-/*    Build macros of the FreeType 2 library.                              */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-#ifndef FTHEADER_H_
-#define FTHEADER_H_
-
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_BEGIN_HEADER                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used in association with @FT_END_HEADER in header    */
-  /*    files to ensure that the declarations within are properly          */
-  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
-  /*    C++ compiler.                                                      */
-  /*                                                                       */
-#ifdef __cplusplus
-#define FT_BEGIN_HEADER  extern "C" {
-#else
-#define FT_BEGIN_HEADER  /* nothing */
-#endif
-
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_END_HEADER                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used in association with @FT_BEGIN_HEADER in header  */
-  /*    files to ensure that the declarations within are properly          */
-  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
-  /*    C++ compiler.                                                      */
-  /*                                                                       */
-#ifdef __cplusplus
-#define FT_END_HEADER  }
-#else
-#define FT_END_HEADER  /* nothing */
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Aliases for the FreeType 2 public and configuration files.            */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    header_file_macros                                                 */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Header File Macros                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Macro definitions used to #include specific header files.          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following macros are defined to the name of specific           */
-  /*    FreeType~2 header files.  They can be used directly in #include    */
-  /*    statements as in:                                                  */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #include FT_FREETYPE_H                                           */
-  /*      #include FT_MULTIPLE_MASTERS_H                                   */
-  /*      #include FT_GLYPH_H                                              */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    There are several reasons why we are now using macros to name      */
-  /*    public header files.  The first one is that such macros are not    */
-  /*    limited to the infamous 8.3~naming rule required by DOS (and       */
-  /*    `FT_MULTIPLE_MASTERS_H' is a lot more meaningful than `ftmm.h').   */
-  /*                                                                       */
-  /*    The second reason is that it allows for more flexibility in the    */
-  /*    way FreeType~2 is installed on a given system.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* configuration files */
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_CONFIG_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   FreeType~2 configuration data.
-   *
-   */
-#ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
-#endif
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_STANDARD_LIBRARY_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   FreeType~2 interface to the standard C library functions.
-   *
-   */
-#ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
-#endif
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_OPTIONS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   FreeType~2 project-specific configuration options.
-   *
-   */
-#ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
-#endif
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CONFIG_MODULES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list of FreeType~2 modules that are statically linked to new library
-   *   instances in @FT_Init_FreeType.
-   *
-   */
-#ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
-#endif
-
-  /* */
-
-  /* public headers */
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_FREETYPE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   base FreeType~2 API.
-   *
-   */
-#define FT_FREETYPE_H  <freetype/freetype.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ERRORS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list of FreeType~2 error codes (and messages).
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_ERRORS_H  <freetype/fterrors.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MODULE_ERRORS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list of FreeType~2 module error offsets (and messages).
-   *
-   */
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SYSTEM_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 interface to low-level operations (i.e., memory management
-   *   and stream i/o).
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IMAGE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing type
-   *   definitions related to glyph images (i.e., bitmaps, outlines,
-   *   scan-converter parameters).
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_IMAGE_H  <freetype/ftimage.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TYPES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   basic data types defined by FreeType~2.
-   *
-   *   It is included by @FT_FREETYPE_H.
-   *
-   */
-#define FT_TYPES_H  <freetype/fttypes.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_LIST_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   list management API of FreeType~2.
-   *
-   *   (Most applications will never need to include this file.)
-   *
-   */
-#define FT_LIST_H  <freetype/ftlist.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_OUTLINE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   scalable outline management API of FreeType~2.
-   *
-   */
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SIZES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API which manages multiple @FT_Size objects per face.
-   *
-   */
-#define FT_SIZES_H  <freetype/ftsizes.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MODULE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   module management API of FreeType~2.
-   *
-   */
-#define FT_MODULE_H  <freetype/ftmodapi.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_RENDER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   renderer module management API of FreeType~2.
-   *
-   */
-#define FT_RENDER_H  <freetype/ftrender.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_AUTOHINTER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   structures and macros related to the auto-hinting module.
-   *
-   */
-#define FT_AUTOHINTER_H  <freetype/ftautoh.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CFF_DRIVER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   structures and macros related to the CFF driver module.
-   *
-   */
-#define FT_CFF_DRIVER_H  <freetype/ftcffdrv.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_DRIVER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing
-   *   structures and macros related to the TrueType driver module.
-   *
-   */
-#define FT_TRUETYPE_DRIVER_H  <freetype/ftttdrv.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TYPE1_TABLES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   types and API specific to the Type~1 format.
-   *
-   */
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_IDS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   enumeration values which identify name strings, languages, encodings,
-   *   etc.  This file really contains a _large_ set of constant macro
-   *   definitions, taken from the TrueType and OpenType specifications.
-   *
-   */
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_TABLES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   types and API specific to the TrueType (as well as OpenType) format.
-   *
-   */
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRUETYPE_TAGS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of TrueType four-byte `tags' which identify blocks in
-   *   SFNT-based font formats (i.e., TrueType and OpenType).
-   *
-   */
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BDF_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which accesses BDF-specific strings from a
-   *   face.
-   *
-   */
-#define FT_BDF_H  <freetype/ftbdf.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CID_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which access CID font information from a
-   *   face.
-   *
-   */
-#define FT_CID_H  <freetype/ftcid.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GZIP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports gzip-compressed files.
-   *
-   */
-#define FT_GZIP_H  <freetype/ftgzip.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_LZW_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports LZW-compressed files.
-   *
-   */
-#define FT_LZW_H  <freetype/ftlzw.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BZIP2_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports bzip2-compressed files.
-   *
-   */
-#define FT_BZIP2_H  <freetype/ftbzip2.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_WINFONTS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   definitions of an API which supports Windows FNT files.
-   *
-   */
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GLYPH_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional glyph management component.
-   *
-   */
-#define FT_GLYPH_H  <freetype/ftglyph.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BITMAP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional bitmap conversion component.
-   *
-   */
-#define FT_BITMAP_H  <freetype/ftbitmap.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_BBOX_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional exact bounding box computation routines.
-   *
-   */
-#define FT_BBOX_H  <freetype/ftbbox.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   API of the optional FreeType~2 cache sub-system.
-   *
-   */
-#define FT_CACHE_H  <freetype/ftcache.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_IMAGE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   `glyph image' API of the FreeType~2 cache sub-system.
-   *
-   *   It is used to define a cache for @FT_Glyph elements.  You can also
-   *   use the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need to
-   *   store small glyph bitmaps, as it will use less memory.
-   *
-   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
-   *   glyph image-related cache declarations.
-   *
-   */
-#define FT_CACHE_IMAGE_H  FT_CACHE_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_SMALL_BITMAPS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   `small bitmaps' API of the FreeType~2 cache sub-system.
-   *
-   *   It is used to define a cache for small glyph bitmaps in a relatively
-   *   memory-efficient way.  You can also use the API defined in
-   *   @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images,
-   *   including scalable outlines.
-   *
-   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
-   *   small bitmaps-related cache declarations.
-   *
-   */
-#define FT_CACHE_SMALL_BITMAPS_H  FT_CACHE_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_CACHE_CHARMAP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   `charmap' API of the FreeType~2 cache sub-system.
-   *
-   *   This macro is deprecated.  Simply include @FT_CACHE_H to have all
-   *   charmap-based cache declarations.
-   *
-   */
-#define FT_CACHE_CHARMAP_H  FT_CACHE_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MAC_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   Macintosh-specific FreeType~2 API.  The latter is used to access
-   *   fonts embedded in resource forks.
-   *
-   *   This header file must be explicitly included by client applications
-   *   compiled on the Mac (note that the base API still works though).
-   *
-   */
-#define FT_MAC_H  <freetype/ftmac.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_MULTIPLE_MASTERS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional multiple-masters management API of FreeType~2.
-   *
-   */
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SFNT_NAMES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional FreeType~2 API which accesses embedded `name' strings in
-   *   SFNT-based font formats (i.e., TrueType and OpenType).
-   *
-   */
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_OPENTYPE_VALIDATE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional FreeType~2 API which validates OpenType tables (BASE, GDEF,
-   *   GPOS, GSUB, JSTF).
-   *
-   */
-#define FT_OPENTYPE_VALIDATE_H  <freetype/ftotval.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GX_VALIDATE_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   optional FreeType~2 API which validates TrueTypeGX/AAT tables (feat,
-   *   mort, morx, bsln, just, kern, opbd, trak, prop).
-   *
-   */
-#define FT_GX_VALIDATE_H  <freetype/ftgxval.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_PFR_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which accesses PFR-specific data.
-   *
-   */
-#define FT_PFR_H  <freetype/ftpfr.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_STROKER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which provides functions to stroke outline paths.
-   */
-#define FT_STROKER_H  <freetype/ftstroke.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SYNTHESIS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs artificial obliquing and emboldening.
-   */
-#define FT_SYNTHESIS_H  <freetype/ftsynth.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_FONT_FORMATS_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which provides functions specific to font formats.
-   */
-#define FT_FONT_FORMATS_H  <freetype/ftfntfmt.h>
-
-  /* deprecated */
-#define FT_XFREE86_H  FT_FONT_FORMATS_H
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_TRIGONOMETRY_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs trigonometric computations (e.g.,
-   *   cosines and arc tangents).
-   */
-#define FT_TRIGONOMETRY_H  <freetype/fttrigon.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_LCD_FILTER_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs color filtering for subpixel rendering.
-   */
-#define FT_LCD_FILTER_H  <freetype/ftlcdfil.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_UNPATENTED_HINTING_H
-   *
-   * @description:
-   *   Deprecated.
-   */
-#define FT_UNPATENTED_HINTING_H  <freetype/ttunpat.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_INCREMENTAL_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which performs incremental glyph loading.
-   */
-#define FT_INCREMENTAL_H  <freetype/ftincrem.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_GASP_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which returns entries from the TrueType GASP table.
-   */
-#define FT_GASP_H  <freetype/ftgasp.h>
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ADVANCES_H
-   *
-   * @description:
-   *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which returns individual and ranged glyph advances.
-   */
-#define FT_ADVANCES_H  <freetype/ftadvanc.h>
-
-
-  /* */
-
-#define FT_ERROR_DEFINITIONS_H  <freetype/fterrdef.h>
-
-
-  /* The internals of the cache sub-system are no longer exposed.  We */
-  /* default to FT_CACHE_H at the moment just in case, but we know of */
-  /* no rogue client that uses them.                                  */
-  /*                                                                  */
-#define FT_CACHE_MANAGER_H           <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MRU_H      <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MANAGER_H  <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_CACHE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_GLYPH_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_IMAGE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_SBITS_H    <freetype/ftcache.h>
-
-
-#define FT_INCREMENTAL_H          <freetype/ftincrem.h>
-
-#define FT_TRUETYPE_UNPATENTED_H  <freetype/ttunpat.h>
-
-
-  /*
-   * Include internal headers definitions from <internal/...>
-   * only when building the library.
-   */
-#ifdef FT2_BUILD_LIBRARY
-#define  FT_INTERNAL_INTERNAL_H  <freetype/internal/internal.h>
-#include FT_INTERNAL_INTERNAL_H
-#endif /* FT2_BUILD_LIBRARY */
-
-
-#endif /* FTHEADER_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/config/ftmodule.h b/dependencies2013/win32/include/freetype/config/ftmodule.h
deleted file mode 100644
index 76d271a7..00000000
--- a/dependencies2013/win32/include/freetype/config/ftmodule.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This file registers the FreeType modules compiled into the library.
- *
- *  If you use GNU make, this file IS NOT USED!  Instead, it is created in
- *  the objects directory (normally `<topdir>/objs/') based on information
- *  from `<topdir>/modules.cfg'.
- *
- *  Please read `docs/INSTALL.ANY' and `docs/CUSTOMIZE' how to compile
- *  FreeType without GNU make.
- *
- */
-
-FT_USE_MODULE( FT_Module_Class, autofit_module_class )
-FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
-FT_USE_MODULE( FT_Module_Class, psaux_module_class )
-FT_USE_MODULE( FT_Module_Class, psnames_module_class )
-FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
-FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
-FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
-
-/* EOF */
diff --git a/dependencies2013/win32/include/freetype/config/ftoption.h b/dependencies2013/win32/include/freetype/config/ftoption.h
deleted file mode 100644
index a8097feb..00000000
--- a/dependencies2013/win32/include/freetype/config/ftoption.h
+++ /dev/null
@@ -1,851 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftoption.h                                                             */
-/*                                                                         */
-/*    User-selectable configuration macros (specification only).           */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTOPTION_H_
-#define FTOPTION_H_
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                 USER-SELECTABLE CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* This file contains the default configuration macro definitions for    */
-  /* a standard build of the FreeType library.  There are three ways to    */
-  /* use this file to build project-specific versions of the library:      */
-  /*                                                                       */
-  /*  - You can modify this file by hand, but this is not recommended in   */
-  /*    cases where you would like to build several versions of the        */
-  /*    library from a single source directory.                            */
-  /*                                                                       */
-  /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
-  /*                                                                       */
-  /*    The default FreeType Makefiles and Jamfiles use the build          */
-  /*    directory `builds/<system>' by default, but you can easily change  */
-  /*    that for your own projects.                                        */
-  /*                                                                       */
-  /*  - Copy the file <ft2build.h> to `$BUILD/ft2build.h' and modify it    */
-  /*    slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to       */
-  /*    locate this file during the build.  For example,                   */
-  /*                                                                       */
-  /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
-  /*                                                                       */
-  /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
-  /*    definitions.                                                       */
-  /*                                                                       */
-  /*    Note also that you can similarly pre-define the macro              */
-  /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
-  /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
-  /*                                                                       */
-  /* We highly recommend using the third method whenever possible.         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /**** G E N E R A L   F R E E T Y P E   2   C O N F I G U R A T I O N ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Uncomment the line below if you want to activate sub-pixel rendering  */
-  /* (a.k.a. LCD rendering, or ClearType) in this build of the library.    */
-  /*                                                                       */
-  /* Note that this feature is covered by several Microsoft patents        */
-  /* and should not be activated in any default build of the library.      */
-  /*                                                                       */
-  /* This macro has no impact on the FreeType API, only on its             */
-  /* _implementation_.  For example, using FT_RENDER_MODE_LCD when calling */
-  /* FT_Render_Glyph still generates a bitmap that is 3 times wider than   */
-  /* the original size in case this macro isn't defined; however, each     */
-  /* triplet of subpixels has R=G=B.                                       */
-  /*                                                                       */
-  /* This is done to allow FreeType clients to run unmodified, forcing     */
-  /* them to display normal gray-level anti-aliased glyphs.                */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
-  /* by FreeType to speed up some computations.  However, this will create */
-  /* some problems when compiling the library in strict ANSI mode.         */
-  /*                                                                       */
-  /* For this reason, the use of 64-bit integers is normally disabled when */
-  /* the __STDC__ macro is defined.  You can however disable this by       */
-  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
-  /*                                                                       */
-  /* For most compilers, this will only create compilation warnings when   */
-  /* building the library.                                                 */
-  /*                                                                       */
-  /* ObNote: The compiler-specific 64-bit integers are detected in the     */
-  /*         file `ftconfig.h' either statically or through the            */
-  /*         `configure' script on supported platforms.                    */
-  /*                                                                       */
-#undef FT_CONFIG_OPTION_FORCE_INT64
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* If this macro is defined, do not try to use an assembler version of   */
-  /* performance-critical functions (e.g. FT_MulFix).  You should only do  */
-  /* that to verify that the assembler function works properly, or to      */
-  /* execute benchmark tests of the various implementations.               */
-/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* If this macro is defined, try to use an inlined assembler version of  */
-  /* the `FT_MulFix' function, which is a `hotspot' when loading and       */
-  /* hinting glyphs, and which should be executed as fast as possible.     */
-  /*                                                                       */
-  /* Note that if your compiler or CPU is not supported, this will default */
-  /* to the standard and portable implementation found in `ftcalc.c'.      */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_INLINE_MULFIX
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* LZW-compressed file support.                                          */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   `compress' program.  This is mostly used to parse many of the PCF   */
-  /*   files that come with various X11 distributions.  The implementation */
-  /*   uses NetBSD's `zopen' to partially uncompress the file on the fly   */
-  /*   (see src/lzw/ftgzip.c).                                             */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_USE_LZW
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Gzip-compressed file support.                                         */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   `gzip' program.  This is mostly used to parse many of the PCF files */
-  /*   that come with XFree86.  The implementation uses `zlib' to          */
-  /*   partially uncompress the file on the fly (see src/gzip/ftgzip.c).   */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.  See also   */
-  /*   the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below.                       */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_USE_ZLIB
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* ZLib library selection                                                */
-  /*                                                                       */
-  /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
-  /*   It allows FreeType's `ftgzip' component to link to the system's     */
-  /*   installation of the ZLib library.  This is useful on systems like   */
-  /*   Unix or VMS where it generally is already available.                */
-  /*                                                                       */
-  /*   If you let it undefined, the component will use its own copy        */
-  /*   of the zlib sources instead.  These have been modified to be        */
-  /*   included directly within the component and *not* export external    */
-  /*   function names.  This allows you to link any program with FreeType  */
-  /*   _and_ ZLib without linking conflicts.                               */
-  /*                                                                       */
-  /*   Do not #undef this macro here since the build system might define   */
-  /*   it for certain configurations only.                                 */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Bzip2-compressed file support.                                        */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   `bzip2' program.  This is mostly used to parse many of the PCF      */
-  /*   files that come with XFree86.  The implementation uses `libbz2' to  */
-  /*   partially uncompress the file on the fly (see src/bzip2/ftbzip2.c). */
-  /*   Contrary to gzip, bzip2 currently is not included and need to use   */
-  /*   the system available bzip2 implementation.                          */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_USE_BZIP2 */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define to disable the use of file stream functions and types, FILE,   */
-  /* fopen() etc.  Enables the use of smaller system libraries on embedded */
-  /* systems that have multiple system libraries, some with or without     */
-  /* file stream support, in the cases where file stream support is not    */
-  /* necessary such as memory loading of font files.                       */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* PNG bitmap support.                                                   */
-  /*                                                                       */
-  /*   FreeType now handles loading color bitmap glyphs in the PNG format. */
-  /*   This requires help from the external libpng library.  Uncompressed  */
-  /*   color bitmaps do not need any external libraries and will be        */
-  /*   supported regardless of this configuration.                         */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_USE_PNG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* HarfBuzz support.                                                     */
-  /*                                                                       */
-  /*   FreeType uses the HarfBuzz library to improve auto-hinting of       */
-  /*   OpenType fonts.  If available, many glyphs not directly addressable */
-  /*   by a font's character map will be hinted also.                      */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this `feature'.             */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* DLL export compilation                                                */
-  /*                                                                       */
-  /*   When compiling FreeType as a DLL, some systems/compilers need a     */
-  /*   special keyword in front OR after the return type of function       */
-  /*   declarations.                                                       */
-  /*                                                                       */
-  /*   Two macros are used within the FreeType source code to define       */
-  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
-  /*                                                                       */
-  /*     FT_EXPORT( return_type )                                          */
-  /*                                                                       */
-  /*       is used in a function declaration, as in                        */
-  /*                                                                       */
-  /*         FT_EXPORT( FT_Error )                                         */
-  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
-  /*                                                                       */
-  /*                                                                       */
-  /*     FT_EXPORT_DEF( return_type )                                      */
-  /*                                                                       */
-  /*       is used in a function definition, as in                         */
-  /*                                                                       */
-  /*         FT_EXPORT_DEF( FT_Error )                                     */
-  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
-  /*         {                                                             */
-  /*           ... some code ...                                           */
-  /*           return FT_Err_Ok;                                           */
-  /*         }                                                             */
-  /*                                                                       */
-  /*   You can provide your own implementation of FT_EXPORT and            */
-  /*   FT_EXPORT_DEF here if you want.  If you leave them undefined, they  */
-  /*   will be later automatically defined as `extern return_type' to      */
-  /*   allow normal compilation.                                           */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_EXPORT(x)      extern x */
-/* #define FT_EXPORT_DEF(x)  x */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Glyph Postscript Names handling                                       */
-  /*                                                                       */
-  /*   By default, FreeType 2 is compiled with the `psnames' module.  This */
-  /*   module is in charge of converting a glyph name string into a        */
-  /*   Unicode value, or return a Macintosh standard glyph name for the    */
-  /*   use with the TrueType `post' table.                                 */
-  /*                                                                       */
-  /*   Undefine this macro if you do not want `psnames' compiled in your   */
-  /*   build of FreeType.  This has the following effects:                 */
-  /*                                                                       */
-  /*   - The TrueType driver will provide its own set of glyph names,      */
-  /*     if you build it to support postscript names in the TrueType       */
-  /*     `post' table.                                                     */
-  /*                                                                       */
-  /*   - The Type 1 driver will not be able to synthesize a Unicode        */
-  /*     charmap out of the glyphs found in the fonts.                     */
-  /*                                                                       */
-  /*   You would normally undefine this configuration macro when building  */
-  /*   a version of FreeType that doesn't contain a Type 1 or CFF driver.  */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Postscript Names to Unicode Values support                            */
-  /*                                                                       */
-  /*   By default, FreeType 2 is built with the `PSNames' module compiled  */
-  /*   in.  Among other things, the module is used to convert a glyph name */
-  /*   into a Unicode value.  This is especially useful in order to        */
-  /*   synthesize on the fly a Unicode charmap from the CFF/Type 1 driver  */
-  /*   through a big table named the `Adobe Glyph List' (AGL).             */
-  /*                                                                       */
-  /*   Undefine this macro if you do not want the Adobe Glyph List         */
-  /*   compiled in your `PSNames' module.  The Type 1 driver will not be   */
-  /*   able to synthesize a Unicode charmap out of the glyphs found in the */
-  /*   fonts.                                                              */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Support for Mac fonts                                                 */
-  /*                                                                       */
-  /*   Define this macro if you want support for outline fonts in Mac      */
-  /*   format (mac dfont, mac resource, macbinary containing a mac         */
-  /*   resource) on non-Mac platforms.                                     */
-  /*                                                                       */
-  /*   Note that the `FOND' resource isn't checked.                        */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_MAC_FONTS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Guessing methods to access embedded resource forks                    */
-  /*                                                                       */
-  /*   Enable extra Mac fonts support on non-Mac platforms (e.g.           */
-  /*   GNU/Linux).                                                         */
-  /*                                                                       */
-  /*   Resource forks which include fonts data are stored sometimes in     */
-  /*   locations which users or developers don't expected.  In some cases, */
-  /*   resource forks start with some offset from the head of a file.  In  */
-  /*   other cases, the actual resource fork is stored in file different   */
-  /*   from what the user specifies.  If this option is activated,         */
-  /*   FreeType tries to guess whether such offsets or different file      */
-  /*   names must be used.                                                 */
-  /*                                                                       */
-  /*   Note that normal, direct access of resource forks is controlled via */
-  /*   the FT_CONFIG_OPTION_MAC_FONTS option.                              */
-  /*                                                                       */
-#ifdef FT_CONFIG_OPTION_MAC_FONTS
-#define FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Allow the use of FT_Incremental_Interface to load typefaces that      */
-  /* contain no glyph data, but supply it via a callback function.         */
-  /* This is required by clients supporting document formats which         */
-  /* supply font data incrementally as the document is parsed, such        */
-  /* as the Ghostscript interpreter for the PostScript language.           */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_INCREMENTAL
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The size in bytes of the render pool used by the scan-line converter  */
-  /* to do all of its work.                                                */
-  /*                                                                       */
-#define FT_RENDER_POOL_SIZE  16384L
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* FT_MAX_MODULES                                                        */
-  /*                                                                       */
-  /*   The maximum number of modules that can be registered in a single    */
-  /*   FreeType library object.  32 is the default.                        */
-  /*                                                                       */
-#define FT_MAX_MODULES  32
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Debug level                                                           */
-  /*                                                                       */
-  /*   FreeType can be compiled in debug or trace mode.  In debug mode,    */
-  /*   errors are reported through the `ftdebug' component.  In trace      */
-  /*   mode, additional messages are sent to the standard output during    */
-  /*   execution.                                                          */
-  /*                                                                       */
-  /*   Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode.     */
-  /*   Define FT_DEBUG_LEVEL_TRACE to build it in trace mode.              */
-  /*                                                                       */
-  /*   Don't define any of these macros to compile in `release' mode!      */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Autofitter debugging                                                  */
-  /*                                                                       */
-  /*   If FT_DEBUG_AUTOFIT is defined, FreeType provides some means to     */
-  /*   control the autofitter behaviour for debugging purposes with global */
-  /*   boolean variables (consequently, you should *never* enable this     */
-  /*   while compiling in `release' mode):                                 */
-  /*                                                                       */
-  /*     _af_debug_disable_horz_hints                                      */
-  /*     _af_debug_disable_vert_hints                                      */
-  /*     _af_debug_disable_blue_hints                                      */
-  /*                                                                       */
-  /*   Additionally, the following functions provide dumps of various      */
-  /*   internal autofit structures to stdout (using `printf'):             */
-  /*                                                                       */
-  /*     af_glyph_hints_dump_points                                        */
-  /*     af_glyph_hints_dump_segments                                      */
-  /*     af_glyph_hints_dump_edges                                         */
-  /*     af_glyph_hints_get_num_segments                                   */
-  /*     af_glyph_hints_get_segment_offset                                 */
-  /*                                                                       */
-  /*   As an argument, they use another global variable:                   */
-  /*                                                                       */
-  /*     _af_debug_hints                                                   */
-  /*                                                                       */
-  /*   Please have a look at the `ftgrid' demo program to see how those    */
-  /*   variables and macros should be used.                                */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_DEBUG_AUTOFIT */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Memory Debugging                                                      */
-  /*                                                                       */
-  /*   FreeType now comes with an integrated memory debugger that is       */
-  /*   capable of detecting simple errors like memory leaks or double      */
-  /*   deletes.  To compile it within your build of the library, you       */
-  /*   should define FT_DEBUG_MEMORY here.                                 */
-  /*                                                                       */
-  /*   Note that the memory debugger is only activated at runtime when     */
-  /*   when the _environment_ variable `FT2_DEBUG_MEMORY' is defined also! */
-  /*                                                                       */
-  /*   Do not #undef this macro here since the build system might define   */
-  /*   it for certain configurations only.                                 */
-  /*                                                                       */
-/* #define FT_DEBUG_MEMORY */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Module errors                                                         */
-  /*                                                                       */
-  /*   If this macro is set (which is _not_ the default), the higher byte  */
-  /*   of an error code gives the module in which the error has occurred,  */
-  /*   while the lower byte is the real error code.                        */
-  /*                                                                       */
-  /*   Setting this macro makes sense for debugging purposes only, since   */
-  /*   it would break source compatibility of certain programs that use    */
-  /*   FreeType 2.                                                         */
-  /*                                                                       */
-  /*   More details can be found in the files ftmoderr.h and fterrors.h.   */
-  /*                                                                       */
-#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Position Independent Code                                             */
-  /*                                                                       */
-  /*   If this macro is set (which is _not_ the default), FreeType2 will   */
-  /*   avoid creating constants that require address fixups.  Instead the  */
-  /*   constants will be moved into a struct and additional intialization  */
-  /*   code will be used.                                                  */
-  /*                                                                       */
-  /*   Setting this macro is needed for systems that prohibit address      */
-  /*   fixups, such as BREW.                                               */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_PIC */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****        S F N T   D R I V E R    C O N F I G U R A T I O N       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support       */
-  /* embedded bitmaps in all formats using the SFNT module (namely         */
-  /* TrueType & OpenType).                                                 */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to    */
-  /* load and enumerate the glyph Postscript names in a TrueType or        */
-  /* OpenType file.                                                        */
-  /*                                                                       */
-  /* Note that when you do not compile the `PSNames' module by undefining  */
-  /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will   */
-  /* contain additional code used to read the PS Names table from a font.  */
-  /*                                                                       */
-  /* (By default, the module uses `PSNames' to extract glyph names.)       */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to       */
-  /* access the internal name table in a SFNT-based format like TrueType   */
-  /* or OpenType.  The name table contains various strings used to         */
-  /* describe the font, like family name, copyright, version, etc.  It     */
-  /* does not contain any glyph name though.                               */
-  /*                                                                       */
-  /* Accessing SFNT names is done through the functions declared in        */
-  /* `ftsnames.h'.                                                         */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_SFNT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* TrueType CMap support                                                 */
-  /*                                                                       */
-  /*   Here you can fine-tune which TrueType CMap table format shall be    */
-  /*   supported.                                                          */
-#define TT_CONFIG_CMAP_FORMAT_0
-#define TT_CONFIG_CMAP_FORMAT_2
-#define TT_CONFIG_CMAP_FORMAT_4
-#define TT_CONFIG_CMAP_FORMAT_6
-#define TT_CONFIG_CMAP_FORMAT_8
-#define TT_CONFIG_CMAP_FORMAT_10
-#define TT_CONFIG_CMAP_FORMAT_12
-#define TT_CONFIG_CMAP_FORMAT_13
-#define TT_CONFIG_CMAP_FORMAT_14
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****    T R U E T Y P E   D R I V E R    C O N F I G U R A T I O N   ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile   */
-  /* a bytecode interpreter in the TrueType driver.                        */
-  /*                                                                       */
-  /* By undefining this, you will only compile the code necessary to load  */
-  /* TrueType glyphs without hinting.                                      */
-  /*                                                                       */
-  /*   Do not #undef this macro here, since the build system might         */
-  /*   define it for certain configurations only.                          */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile       */
-  /* EXPERIMENTAL subpixel hinting support into the TrueType driver.  This */
-  /* replaces the native TrueType hinting mechanism when anything but      */
-  /* FT_RENDER_MODE_MONO is requested.                                     */
-  /*                                                                       */
-  /* Enabling this causes the TrueType driver to ignore instructions under */
-  /* certain conditions.  This is done in accordance with the guide here,  */
-  /* with some minor differences:                                          */
-  /*                                                                       */
-  /*  http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
-  /*                                                                       */
-  /* By undefining this, you only compile the code necessary to hint       */
-  /* TrueType glyphs with native TT hinting.                               */
-  /*                                                                       */
-  /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
-  /*   defined.                                                            */
-  /*                                                                       */
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the        */
-  /* TrueType glyph loader to use Apple's definition of how to handle      */
-  /* component offsets in composite glyphs.                                */
-  /*                                                                       */
-  /* Apple and MS disagree on the default behavior of component offsets    */
-  /* in composites.  Apple says that they should be scaled by the scaling  */
-  /* factors in the transformation matrix (roughly, it's more complex)     */
-  /* while MS says they should not.  OpenType defines two bits in the      */
-  /* composite flags array which can be used to disambiguate, but old      */
-  /* fonts will not have them.                                             */
-  /*                                                                       */
-  /*   http://www.microsoft.com/typography/otspec/glyf.htm                 */
-  /*   https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html */
-  /*                                                                       */
-#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_GX_VAR_SUPPORT if you want to include         */
-  /* support for Apple's distortable font technology (fvar, gvar, cvar,    */
-  /* and avar tables).  This has many similarities to Type 1 Multiple      */
-  /* Masters support.                                                      */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_BDF if you want to include support for        */
-  /* an embedded `BDF ' table within SFNT-based bitmap formats.            */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_BDF
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Option TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES controls the maximum     */
-  /* number of bytecode instructions executed for a single run of the      */
-  /* bytecode interpreter, needed to prevent infinite loops.  You don't    */
-  /* want to change this except for very special situations (e.g., making  */
-  /* a library fuzzer spend less time to handle broken fonts).             */
-  /*                                                                       */
-  /* It is not expected that this value is ever modified by a configuring  */
-  /* script; instead, it gets surrounded with #ifndef ... #endif so that   */
-  /* the value can be set as a preprocessor option on the compiler's       */
-  /* command line.                                                         */
-  /*                                                                       */
-#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES
-#define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES  1000000L
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_DICT_DEPTH is the maximum depth of nest dictionaries and       */
-  /* arrays in the Type 1 stream (see t1load.c).  A minimum of 4 is        */
-  /* required.                                                             */
-  /*                                                                       */
-#define T1_MAX_DICT_DEPTH  5
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
-  /* calls during glyph loading.                                           */
-  /*                                                                       */
-#define T1_MAX_SUBRS_CALLS  16
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
-  /* minimum of 16 is required.                                            */
-  /*                                                                       */
-  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
-  /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  256
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define this configuration macro if you want to prevent the            */
-  /* compilation of `t1afm', which is in charge of reading Type 1 AFM      */
-  /* files into an existing face.  Note that if set, the T1 driver will be */
-  /* unable to produce kerning distances.                                  */
-  /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_AFM
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define this configuration macro if you want to prevent the            */
-  /* compilation of the Multiple Masters font support in the Type 1        */
-  /* driver.                                                               */
-  /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****         C F F   D R I V E R    C O N F I G U R A T I O N        ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} it is      */
-  /* possible to set up the default values of the four control points that */
-  /* define the stem darkening behaviour of the (new) CFF engine.  For     */
-  /* more details please read the documentation of the                     */
-  /* `darkening-parameters' property of the cff driver module (file        */
-  /* `ftcffdrv.h'), which allows the control at run-time.                  */
-  /*                                                                       */
-  /* Do *not* undefine these macros!                                       */
-  /*                                                                       */
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1   500
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1   400
-
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2  1000
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2   275
-
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3  1667
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3   275
-
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4  2333
-#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4     0
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF       */
-  /* engine gets compiled into FreeType.  If defined, it is possible to    */
-  /* switch between the two engines using the `hinting-engine' property of */
-  /* the cff driver module.                                                */
-  /*                                                                       */
-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Compile autofit module with CJK (Chinese, Japanese, Korean) script    */
-  /* support.                                                              */
-  /*                                                                       */
-#define AF_CONFIG_OPTION_CJK
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Compile autofit module with Indic script support.                     */
-  /*                                                                       */
-#define AF_CONFIG_OPTION_INDIC
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Compile autofit module with warp hinting.  The idea of the warping    */
-  /* code is to slightly scale and shift a glyph within a single dimension */
-  /* so that as much of its segments are aligned (more or less) on the     */
-  /* grid.  To find out the optimal scaling and shifting value, various    */
-  /* parameter combinations are tried and scored.                          */
-  /*                                                                       */
-  /* This experimental option is active only if the rendering mode is      */
-  /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the      */
-  /* `warping' property of the auto-hinter (see file `ftautoh.h' for more  */
-  /* information; by default it is switched off).                          */
-  /*                                                                       */
-#define AF_CONFIG_OPTION_USE_WARPER
-
-  /* */
-
-
-  /*
-   * This macro is obsolete.  Support has been removed in FreeType
-   * version 2.5.
-   */
-/* #define FT_CONFIG_OPTION_OLD_INTERNALS */
-
-
-  /*
-   * This macro is defined if native TrueType hinting is requested by the
-   * definitions above.
-   */
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-#define  TT_USE_BYTECODE_INTERPRETER
-#endif
-
-
-  /*
-   * Check CFF darkening parameters.  The checks are the same as in function
-   * `cff_property_set' in file `cffdrivr.c'.
-   */
-#if CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 < 0   || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 < 0   || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 < 0   || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 < 0   || \
-                                                      \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 < 0   || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 < 0   || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 < 0   || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 < 0   || \
-                                                      \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 >        \
-      CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2     || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 >        \
-      CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3     || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 >        \
-      CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4     || \
-                                                      \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 > 500 || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 > 500 || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 > 500 || \
-    CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 > 500
-#error "Invalid CFF darkening parameters!"
-#endif
-
-FT_END_HEADER
-
-
-#endif /* FTOPTION_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/config/ftstdlib.h b/dependencies2013/win32/include/freetype/config/ftstdlib.h
deleted file mode 100644
index 9daea56f..00000000
--- a/dependencies2013/win32/include/freetype/config/ftstdlib.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstdlib.h                                                             */
-/*                                                                         */
-/*    ANSI-specific library and header configuration file (specification   */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to group all #includes to the ANSI C library that   */
-  /* FreeType normally requires.  It also defines macros to rename the     */
-  /* standard functions within the FreeType source code.                   */
-  /*                                                                       */
-  /* Load a file which defines FTSTDLIB_H_ before this one to override it. */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTSTDLIB_H_
-#define FTSTDLIB_H_
-
-
-#include <stddef.h>
-
-#define ft_ptrdiff_t  ptrdiff_t
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                           integer limits                           */
-  /*                                                                    */
-  /* UINT_MAX and ULONG_MAX are used to automatically compute the size  */
-  /* of `int' and `long' in bytes at compile-time.  So far, this works  */
-  /* for all platforms the library has been tested on.                  */
-  /*                                                                    */
-  /* Note that on the extremely rare platforms that do not provide      */
-  /* integer types that are _exactly_ 16 and 32 bits wide (e.g. some    */
-  /* old Crays where `int' is 36 bits), we do not make any guarantee    */
-  /* about the correct behaviour of FT2 with all fonts.                 */
-  /*                                                                    */
-  /* In these case, `ftconfig.h' will refuse to compile anyway with a   */
-  /* message like `couldn't find 32-bit type' or something similar.     */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <limits.h>
-
-#define FT_CHAR_BIT    CHAR_BIT
-#define FT_USHORT_MAX  USHRT_MAX
-#define FT_INT_MAX     INT_MAX
-#define FT_INT_MIN     INT_MIN
-#define FT_UINT_MAX    UINT_MAX
-#define FT_LONG_MAX    LONG_MAX
-#define FT_ULONG_MAX   ULONG_MAX
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                 character and string processing                    */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <string.h>
-
-#define ft_memchr   memchr
-#define ft_memcmp   memcmp
-#define ft_memcpy   memcpy
-#define ft_memmove  memmove
-#define ft_memset   memset
-#define ft_strcat   strcat
-#define ft_strcmp   strcmp
-#define ft_strcpy   strcpy
-#define ft_strlen   strlen
-#define ft_strncmp  strncmp
-#define ft_strncpy  strncpy
-#define ft_strrchr  strrchr
-#define ft_strstr   strstr
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                           file handling                            */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <stdio.h>
-
-#define FT_FILE     FILE
-#define ft_fclose   fclose
-#define ft_fopen    fopen
-#define ft_fread    fread
-#define ft_fseek    fseek
-#define ft_ftell    ftell
-#define ft_sprintf  sprintf
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                             sorting                                */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <stdlib.h>
-
-#define ft_qsort  qsort
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                        memory allocation                           */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#define ft_scalloc   calloc
-#define ft_sfree     free
-#define ft_smalloc   malloc
-#define ft_srealloc  realloc
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                          miscellaneous                             */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#define ft_atol  atol
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                         execution control                          */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <setjmp.h>
-
-#define ft_jmp_buf     jmp_buf  /* note: this cannot be a typedef since */
-                                /*       jmp_buf is defined as a macro  */
-                                /*       on certain platforms           */
-
-#define ft_longjmp     longjmp
-#define ft_setjmp( b ) setjmp( *(ft_jmp_buf*) &(b) ) /* same thing here */
-
-
-  /* the following is only used for debugging purposes, i.e., if */
-  /* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined    */
-
-#include <stdarg.h>
-
-
-#endif /* FTSTDLIB_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/freetype.h b/dependencies2013/win32/include/freetype/freetype.h
deleted file mode 100644
index 250f405f..00000000
--- a/dependencies2013/win32/include/freetype/freetype.h
+++ /dev/null
@@ -1,4272 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  freetype.h                                                             */
-/*                                                                         */
-/*    FreeType high-level API and common types (specification only).       */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FREETYPE_H_
-#define FREETYPE_H_
-
-
-#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error "  #include <ft2build.h>"
-#error "  #include FT_FREETYPE_H"
-#endif
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_TYPES_H
-#include FT_ERRORS_H
-
-
-FT_BEGIN_HEADER
-
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    header_inclusion                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    FreeType's header inclusion scheme                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How client applications should include FreeType header files.      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    To be as flexible as possible (and for historical reasons),        */
-  /*    FreeType uses a very special inclusion scheme to load header       */
-  /*    files, for example                                                 */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #include <ft2build.h>                                            */
-  /*                                                                       */
-  /*      #include FT_FREETYPE_H                                           */
-  /*      #include FT_OUTLINE_H                                            */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    A compiler and its preprocessor only needs an include path to find */
-  /*    the file `ft2build.h'; the exact locations and names of the other  */
-  /*    FreeType header files are hidden by preprocessor macro names,      */
-  /*    loaded by `ft2build.h'.  The API documentation always gives the    */
-  /*    header macro name needed for a particular function.                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    user_allocation                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    User allocation                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How client applications should allocate FreeType data structures.  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType assumes that structures allocated by the user and passed  */
-  /*    as arguments are zeroed out except for the actual data.  In other  */
-  /*    words, it is recommended to use `calloc' (or variants of it)       */
-  /*    instead of `malloc' for allocation.                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                        B A S I C   T Y P E S                          */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    base_interface                                                     */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Base Interface                                                     */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The FreeType~2 base font interface.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section describes the most important public high-level API    */
-  /*    functions of FreeType~2.                                           */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Library                                                         */
-  /*    FT_Face                                                            */
-  /*    FT_Size                                                            */
-  /*    FT_GlyphSlot                                                       */
-  /*    FT_CharMap                                                         */
-  /*    FT_Encoding                                                        */
-  /*    FT_ENC_TAG                                                         */
-  /*                                                                       */
-  /*    FT_FaceRec                                                         */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_SCALABLE                                              */
-  /*    FT_FACE_FLAG_FIXED_SIZES                                           */
-  /*    FT_FACE_FLAG_FIXED_WIDTH                                           */
-  /*    FT_FACE_FLAG_HORIZONTAL                                            */
-  /*    FT_FACE_FLAG_VERTICAL                                              */
-  /*    FT_FACE_FLAG_COLOR                                                 */
-  /*    FT_FACE_FLAG_SFNT                                                  */
-  /*    FT_FACE_FLAG_CID_KEYED                                             */
-  /*    FT_FACE_FLAG_TRICKY                                                */
-  /*    FT_FACE_FLAG_KERNING                                               */
-  /*    FT_FACE_FLAG_MULTIPLE_MASTERS                                      */
-  /*    FT_FACE_FLAG_GLYPH_NAMES                                           */
-  /*    FT_FACE_FLAG_EXTERNAL_STREAM                                       */
-  /*    FT_FACE_FLAG_HINTER                                                */
-  /*                                                                       */
-  /*    FT_HAS_HORIZONTAL                                                  */
-  /*    FT_HAS_VERTICAL                                                    */
-  /*    FT_HAS_KERNING                                                     */
-  /*    FT_HAS_FIXED_SIZES                                                 */
-  /*    FT_HAS_GLYPH_NAMES                                                 */
-  /*    FT_HAS_MULTIPLE_MASTERS                                            */
-  /*    FT_HAS_COLOR                                                       */
-  /*                                                                       */
-  /*    FT_IS_SFNT                                                         */
-  /*    FT_IS_SCALABLE                                                     */
-  /*    FT_IS_FIXED_WIDTH                                                  */
-  /*    FT_IS_CID_KEYED                                                    */
-  /*    FT_IS_TRICKY                                                       */
-  /*                                                                       */
-  /*    FT_STYLE_FLAG_BOLD                                                 */
-  /*    FT_STYLE_FLAG_ITALIC                                               */
-  /*                                                                       */
-  /*    FT_SizeRec                                                         */
-  /*    FT_Size_Metrics                                                    */
-  /*                                                                       */
-  /*    FT_GlyphSlotRec                                                    */
-  /*    FT_Glyph_Metrics                                                   */
-  /*    FT_SubGlyph                                                        */
-  /*                                                                       */
-  /*    FT_Bitmap_Size                                                     */
-  /*                                                                       */
-  /*    FT_Init_FreeType                                                   */
-  /*    FT_Done_FreeType                                                   */
-  /*                                                                       */
-  /*    FT_New_Face                                                        */
-  /*    FT_Done_Face                                                       */
-  /*    FT_Reference_Face                                                  */
-  /*    FT_New_Memory_Face                                                 */
-  /*    FT_Open_Face                                                       */
-  /*    FT_Open_Args                                                       */
-  /*    FT_Parameter                                                       */
-  /*    FT_Attach_File                                                     */
-  /*    FT_Attach_Stream                                                   */
-  /*                                                                       */
-  /*    FT_Set_Char_Size                                                   */
-  /*    FT_Set_Pixel_Sizes                                                 */
-  /*    FT_Request_Size                                                    */
-  /*    FT_Select_Size                                                     */
-  /*    FT_Size_Request_Type                                               */
-  /*    FT_Size_RequestRec                                                 */
-  /*    FT_Size_Request                                                    */
-  /*    FT_Set_Transform                                                   */
-  /*    FT_Load_Glyph                                                      */
-  /*    FT_Get_Char_Index                                                  */
-  /*    FT_Get_First_Char                                                  */
-  /*    FT_Get_Next_Char                                                   */
-  /*    FT_Get_Name_Index                                                  */
-  /*    FT_Load_Char                                                       */
-  /*                                                                       */
-  /*    FT_OPEN_MEMORY                                                     */
-  /*    FT_OPEN_STREAM                                                     */
-  /*    FT_OPEN_PATHNAME                                                   */
-  /*    FT_OPEN_DRIVER                                                     */
-  /*    FT_OPEN_PARAMS                                                     */
-  /*                                                                       */
-  /*    FT_LOAD_DEFAULT                                                    */
-  /*    FT_LOAD_RENDER                                                     */
-  /*    FT_LOAD_MONOCHROME                                                 */
-  /*    FT_LOAD_LINEAR_DESIGN                                              */
-  /*    FT_LOAD_NO_SCALE                                                   */
-  /*    FT_LOAD_NO_HINTING                                                 */
-  /*    FT_LOAD_NO_BITMAP                                                  */
-  /*    FT_LOAD_NO_AUTOHINT                                                */
-  /*    FT_LOAD_COLOR                                                      */
-  /*                                                                       */
-  /*    FT_LOAD_VERTICAL_LAYOUT                                            */
-  /*    FT_LOAD_IGNORE_TRANSFORM                                           */
-  /*    FT_LOAD_FORCE_AUTOHINT                                             */
-  /*    FT_LOAD_NO_RECURSE                                                 */
-  /*    FT_LOAD_PEDANTIC                                                   */
-  /*                                                                       */
-  /*    FT_LOAD_TARGET_NORMAL                                              */
-  /*    FT_LOAD_TARGET_LIGHT                                               */
-  /*    FT_LOAD_TARGET_MONO                                                */
-  /*    FT_LOAD_TARGET_LCD                                                 */
-  /*    FT_LOAD_TARGET_LCD_V                                               */
-  /*                                                                       */
-  /*    FT_LOAD_TARGET_MODE                                                */
-  /*                                                                       */
-  /*    FT_Render_Glyph                                                    */
-  /*    FT_Render_Mode                                                     */
-  /*    FT_Get_Kerning                                                     */
-  /*    FT_Kerning_Mode                                                    */
-  /*    FT_Get_Track_Kerning                                               */
-  /*    FT_Get_Glyph_Name                                                  */
-  /*    FT_Get_Postscript_Name                                             */
-  /*                                                                       */
-  /*    FT_CharMapRec                                                      */
-  /*    FT_Select_Charmap                                                  */
-  /*    FT_Set_Charmap                                                     */
-  /*    FT_Get_Charmap_Index                                               */
-  /*                                                                       */
-  /*    FT_Get_FSType_Flags                                                */
-  /*    FT_Get_SubGlyph_Info                                               */
-  /*                                                                       */
-  /*    FT_Face_Internal                                                   */
-  /*    FT_Size_Internal                                                   */
-  /*    FT_Slot_Internal                                                   */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_XXX                                                   */
-  /*    FT_STYLE_FLAG_XXX                                                  */
-  /*    FT_OPEN_XXX                                                        */
-  /*    FT_LOAD_XXX                                                        */
-  /*    FT_LOAD_TARGET_XXX                                                 */
-  /*    FT_SUBGLYPH_FLAG_XXX                                               */
-  /*    FT_FSTYPE_XXX                                                      */
-  /*                                                                       */
-  /*    FT_HAS_FAST_GLYPHS                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Glyph_Metrics                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the metrics of a single glyph.  The      */
-  /*    values are expressed in 26.6 fractional pixel format; if the flag  */
-  /*    @FT_LOAD_NO_SCALE has been used while loading the glyph, values    */
-  /*    are expressed in font units instead.                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    width ::                                                           */
-  /*      The glyph's width.                                               */
-  /*                                                                       */
-  /*    height ::                                                          */
-  /*      The glyph's height.                                              */
-  /*                                                                       */
-  /*    horiBearingX ::                                                    */
-  /*      Left side bearing for horizontal layout.                         */
-  /*                                                                       */
-  /*    horiBearingY ::                                                    */
-  /*      Top side bearing for horizontal layout.                          */
-  /*                                                                       */
-  /*    horiAdvance ::                                                     */
-  /*      Advance width for horizontal layout.                             */
-  /*                                                                       */
-  /*    vertBearingX ::                                                    */
-  /*      Left side bearing for vertical layout.                           */
-  /*                                                                       */
-  /*    vertBearingY ::                                                    */
-  /*      Top side bearing for vertical layout.  Larger positive values    */
-  /*      mean further below the vertical glyph origin.                    */
-  /*                                                                       */
-  /*    vertAdvance ::                                                     */
-  /*      Advance height for vertical layout.  Positive values mean the    */
-  /*      glyph has a positive advance downward.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If not disabled with @FT_LOAD_NO_HINTING, the values represent     */
-  /*    dimensions of the hinted glyph (in case hinting is applicable).    */
-  /*                                                                       */
-  /*    Stroking a glyph with an outside border does not increase          */
-  /*    `horiAdvance' or `vertAdvance'; you have to manually adjust these  */
-  /*    values to account for the added width and height.                  */
-  /*                                                                       */
-  typedef struct  FT_Glyph_Metrics_
-  {
-    FT_Pos  width;
-    FT_Pos  height;
-
-    FT_Pos  horiBearingX;
-    FT_Pos  horiBearingY;
-    FT_Pos  horiAdvance;
-
-    FT_Pos  vertBearingX;
-    FT_Pos  vertBearingY;
-    FT_Pos  vertAdvance;
-
-  } FT_Glyph_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Bitmap_Size                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure models the metrics of a bitmap strike (i.e., a set  */
-  /*    of glyphs for a given point size and resolution) in a bitmap font. */
-  /*    It is used for the `available_sizes' field of @FT_Face.            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height :: The vertical distance, in pixels, between two            */
-  /*              consecutive baselines.  It is always positive.           */
-  /*                                                                       */
-  /*    width  :: The average width, in pixels, of all glyphs in the       */
-  /*              strike.                                                  */
-  /*                                                                       */
-  /*    size   :: The nominal size of the strike in 26.6 fractional        */
-  /*              points.  This field is not very useful.                  */
-  /*                                                                       */
-  /*    x_ppem :: The horizontal ppem (nominal width) in 26.6 fractional   */
-  /*              pixels.                                                  */
-  /*                                                                       */
-  /*    y_ppem :: The vertical ppem (nominal height) in 26.6 fractional    */
-  /*              pixels.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Windows FNT:                                                       */
-  /*      The nominal size given in a FNT font is not reliable.  Thus when */
-  /*      the driver finds it incorrect, it sets `size' to some calculated */
-  /*      values and sets `x_ppem' and `y_ppem' to the pixel width and     */
-  /*      height given in the font, respectively.                          */
-  /*                                                                       */
-  /*    TrueType embedded bitmaps:                                         */
-  /*      `size', `width', and `height' values are not contained in the    */
-  /*      bitmap strike itself.  They are computed from the global font    */
-  /*      parameters.                                                      */
-  /*                                                                       */
-  typedef struct  FT_Bitmap_Size_
-  {
-    FT_Short  height;
-    FT_Short  width;
-
-    FT_Pos    size;
-
-    FT_Pos    x_ppem;
-    FT_Pos    y_ppem;
-
-  } FT_Bitmap_Size;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     O B J E C T   C L A S S E S                       */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Library                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a FreeType library instance.  Each `library' is        */
-  /*    completely independent from the others; it is the `root' of a set  */
-  /*    of objects like fonts, faces, sizes, etc.                          */
-  /*                                                                       */
-  /*    It also embeds a memory manager (see @FT_Memory), as well as a     */
-  /*    scan-line converter object (see @FT_Raster).                       */
-  /*                                                                       */
-  /*    In multi-threaded applications it is easiest to use one            */
-  /*    `FT_Library' object per thread.  In case this is too cumbersome,   */
-  /*    a single `FT_Library' object across threads is possible also       */
-  /*    (since FreeType version 2.5.6), as long as a mutex lock is used    */
-  /*    around @FT_New_Face and @FT_Done_Face.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Library objects are normally created by @FT_Init_FreeType, and     */
-  /*    destroyed with @FT_Done_FreeType.  If you need reference-counting  */
-  /*    (cf. @FT_Reference_Library), use @FT_New_Library and               */
-  /*    @FT_Done_Library.                                                  */
-  /*                                                                       */
-  typedef struct FT_LibraryRec_  *FT_Library;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Module                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType module object.  Each module can be a  */
-  /*    font driver, a renderer, or anything else that provides services   */
-  /*    to the formers.                                                    */
-  /*                                                                       */
-  typedef struct FT_ModuleRec_*  FT_Module;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Driver                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType font driver object.  Each font driver */
-  /*    is a special module capable of creating faces from font files.     */
-  /*                                                                       */
-  typedef struct FT_DriverRec_*  FT_Driver;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Renderer                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType renderer.  A renderer is a special    */
-  /*    module in charge of converting a glyph image to a bitmap, when     */
-  /*    necessary.  Each renderer supports a given glyph image format, and */
-  /*    one or more target surface depths.                                 */
-  /*                                                                       */
-  typedef struct FT_RendererRec_*  FT_Renderer;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    base_interface                                                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given typographic face object.  A face object models */
-  /*    a given typeface, in a given style.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Each face object also owns a single @FT_GlyphSlot object, as well  */
-  /*    as one or more @FT_Size objects.                                   */
-  /*                                                                       */
-  /*    Use @FT_New_Face or @FT_Open_Face to create a new face object from */
-  /*    a given filepathname or a custom input stream.                     */
-  /*                                                                       */
-  /*    Use @FT_Done_Face to destroy it (along with its slot and sizes).   */
-  /*                                                                       */
-  /*    An `FT_Face' object can only be safely used from one thread at a   */
-  /*    time.  Similarly, creation and destruction of `FT_Face' with the   */
-  /*    same @FT_Library object can only be done from one thread at a      */
-  /*    time.  On the other hand, functions like @FT_Load_Glyph and its    */
-  /*    siblings are thread-safe and do not need the lock to be held as    */
-  /*    long as the same `FT_Face' object is not used from multiple        */
-  /*    threads at the same time.                                          */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_FaceRec for the publicly accessible fields of a given face */
-  /*    object.                                                            */
-  /*                                                                       */
-  typedef struct FT_FaceRec_*  FT_Face;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Size                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model a face scaled to a given       */
-  /*    character size.                                                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Each @FT_Face has an _active_ @FT_Size object that is used by      */
-  /*    functions like @FT_Load_Glyph to determine the scaling             */
-  /*    transformation that in turn is used to load and hint glyphs and    */
-  /*    metrics.                                                           */
-  /*                                                                       */
-  /*    You can use @FT_Set_Char_Size, @FT_Set_Pixel_Sizes,                */
-  /*    @FT_Request_Size or even @FT_Select_Size to change the content     */
-  /*    (i.e., the scaling values) of the active @FT_Size.                 */
-  /*                                                                       */
-  /*    You can use @FT_New_Size to create additional size objects for a   */
-  /*    given @FT_Face, but they won't be used by other functions until    */
-  /*    you activate it through @FT_Activate_Size.  Only one size can be   */
-  /*    activated at any given time per face.                              */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_SizeRec for the publicly accessible fields of a given size */
-  /*    object.                                                            */
-  /*                                                                       */
-  typedef struct FT_SizeRec_*  FT_Size;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_GlyphSlot                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given `glyph slot'.  A slot is a container where it  */
-  /*    is possible to load any of the glyphs contained in its parent      */
-  /*    face.                                                              */
-  /*                                                                       */
-  /*    In other words, each time you call @FT_Load_Glyph or               */
-  /*    @FT_Load_Char, the slot's content is erased by the new glyph data, */
-  /*    i.e., the glyph's metrics, its image (bitmap or outline), and      */
-  /*    other control information.                                         */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_GlyphSlotRec for the publicly accessible glyph fields.     */
-  /*                                                                       */
-  typedef struct FT_GlyphSlotRec_*  FT_GlyphSlot;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_CharMap                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given character map.  A charmap is used to translate */
-  /*    character codes in a given encoding into glyph indexes for its     */
-  /*    parent's face.  Some font formats may provide several charmaps per */
-  /*    font.                                                              */
-  /*                                                                       */
-  /*    Each face object owns zero or more charmaps, but only one of them  */
-  /*    can be `active' and used by @FT_Get_Char_Index or @FT_Load_Char.   */
-  /*                                                                       */
-  /*    The list of available charmaps in a face is available through the  */
-  /*    `face->num_charmaps' and `face->charmaps' fields of @FT_FaceRec.   */
-  /*                                                                       */
-  /*    The currently active charmap is available as `face->charmap'.      */
-  /*    You should call @FT_Set_Charmap to change it.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    When a new face is created (either through @FT_New_Face or         */
-  /*    @FT_Open_Face), the library looks for a Unicode charmap within     */
-  /*    the list and automatically activates it.                           */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    See @FT_CharMapRec for the publicly accessible fields of a given   */
-  /*    character map.                                                     */
-  /*                                                                       */
-  typedef struct FT_CharMapRec_*  FT_CharMap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_ENC_TAG                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four-letter tags into an unsigned long.  It is */
-  /*    used to define `encoding' identifiers (see @FT_Encoding).          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since many 16-bit compilers don't like 32-bit enumerations, you    */
-  /*    should redefine this macro in case of problems to something like   */
-  /*    this:                                                              */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #define FT_ENC_TAG( value, a, b, c, d )  value                   */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    to get a simple enumeration without assigning special numbers.     */
-  /*                                                                       */
-
-#ifndef FT_ENC_TAG
-#define FT_ENC_TAG( value, a, b, c, d )         \
-          value = ( ( (FT_UInt32)(a) << 24 ) |  \
-                    ( (FT_UInt32)(b) << 16 ) |  \
-                    ( (FT_UInt32)(c) <<  8 ) |  \
-                      (FT_UInt32)(d)         )
-
-#endif /* FT_ENC_TAG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Encoding                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify character sets supported by         */
-  /*    charmaps.  Used in the @FT_Select_Charmap API function.            */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Despite the name, this enumeration lists specific character        */
-  /*    repertories (i.e., charsets), and not text encoding methods (e.g., */
-  /*    UTF-8, UTF-16, etc.).                                              */
-  /*                                                                       */
-  /*    Other encodings might be defined in the future.                    */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_ENCODING_NONE ::                                                */
-  /*      The encoding value~0 is reserved.                                */
-  /*                                                                       */
-  /*    FT_ENCODING_UNICODE ::                                             */
-  /*      Corresponds to the Unicode character set.  This value covers     */
-  /*      all versions of the Unicode repertoire, including ASCII and      */
-  /*      Latin-1.  Most fonts include a Unicode charmap, but not all      */
-  /*      of them.                                                         */
-  /*                                                                       */
-  /*      For example, if you want to access Unicode value U+1F028 (and    */
-  /*      the font contains it), use value 0x1F028 as the input value for  */
-  /*      @FT_Get_Char_Index.                                              */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_SYMBOL ::                                           */
-  /*      Corresponds to the Microsoft Symbol encoding, used to encode     */
-  /*      mathematical symbols and wingdings.  For more information, see   */
-  /*      `http://www.microsoft.com/typography/otspec/recom.htm',          */
-  /*      `http://www.kostis.net/charsets/symbol.htm', and                 */
-  /*      `http://www.kostis.net/charsets/wingding.htm'.                   */
-  /*                                                                       */
-  /*      This encoding uses character codes from the PUA (Private Unicode */
-  /*      Area) in the range U+F020-U+F0FF.                                */
-  /*                                                                       */
-  /*    FT_ENCODING_SJIS ::                                                */
-  /*      Corresponds to Japanese SJIS encoding.  More info at             */
-  /*      at `http://en.wikipedia.org/wiki/Shift_JIS'.                     */
-  /*      See note on multi-byte encodings below.                          */
-  /*                                                                       */
-  /*    FT_ENCODING_GB2312 ::                                              */
-  /*      Corresponds to an encoding system for Simplified Chinese as used */
-  /*      used in mainland China.                                          */
-  /*                                                                       */
-  /*    FT_ENCODING_BIG5 ::                                                */
-  /*      Corresponds to an encoding system for Traditional Chinese as     */
-  /*      used in Taiwan and Hong Kong.                                    */
-  /*                                                                       */
-  /*    FT_ENCODING_WANSUNG ::                                             */
-  /*      Corresponds to the Korean encoding system known as Wansung.      */
-  /*      For more information see                                         */
-  /*      `https://msdn.microsoft.com/en-US/goglobal/cc305154'.            */
-  /*                                                                       */
-  /*    FT_ENCODING_JOHAB ::                                               */
-  /*      The Korean standard character set (KS~C 5601-1992), which        */
-  /*      corresponds to MS Windows code page 1361.  This character set    */
-  /*      includes all possible Hangeul character combinations.            */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_LATIN_1 ::                                       */
-  /*      Corresponds to a Latin-1 encoding as defined in a Type~1         */
-  /*      PostScript font.  It is limited to 256 character codes.          */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_STANDARD ::                                      */
-  /*      Corresponds to the Adobe Standard encoding, as found in Type~1,  */
-  /*      CFF, and OpenType/CFF fonts.  It is limited to 256 character     */
-  /*      codes.                                                           */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_EXPERT ::                                        */
-  /*      Corresponds to the Adobe Expert encoding, as found in Type~1,    */
-  /*      CFF, and OpenType/CFF fonts.  It is limited to 256 character     */
-  /*      codes.                                                           */
-  /*                                                                       */
-  /*    FT_ENCODING_ADOBE_CUSTOM ::                                        */
-  /*      Corresponds to a custom encoding, as found in Type~1, CFF, and   */
-  /*      OpenType/CFF fonts.  It is limited to 256 character codes.       */
-  /*                                                                       */
-  /*    FT_ENCODING_APPLE_ROMAN ::                                         */
-  /*      Corresponds to the 8-bit Apple roman encoding.  Many TrueType    */
-  /*      and OpenType fonts contain a charmap for this encoding, since    */
-  /*      older versions of Mac OS are able to use it.                     */
-  /*                                                                       */
-  /*    FT_ENCODING_OLD_LATIN_2 ::                                         */
-  /*      This value is deprecated and was never used nor reported by      */
-  /*      FreeType.  Don't use or test for it.                             */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_SJIS ::                                             */
-  /*      Same as FT_ENCODING_SJIS.  Deprecated.                           */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_GB2312 ::                                           */
-  /*      Same as FT_ENCODING_GB2312.  Deprecated.                         */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_BIG5 ::                                             */
-  /*      Same as FT_ENCODING_BIG5.  Deprecated.                           */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_WANSUNG ::                                          */
-  /*      Same as FT_ENCODING_WANSUNG.  Deprecated.                        */
-  /*                                                                       */
-  /*    FT_ENCODING_MS_JOHAB ::                                            */
-  /*      Same as FT_ENCODING_JOHAB.  Deprecated.                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    By default, FreeType automatically synthesizes a Unicode charmap   */
-  /*    for PostScript fonts, using their glyph names dictionaries.        */
-  /*    However, it also reports the encodings defined explicitly in the   */
-  /*    font file, for the cases when they are needed, with the Adobe      */
-  /*    values as well.                                                    */
-  /*                                                                       */
-  /*    FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap  */
-  /*    is neither Unicode nor ISO-8859-1 (otherwise it is set to          */
-  /*    FT_ENCODING_UNICODE).  Use @FT_Get_BDF_Charset_ID to find out      */
-  /*    which encoding is really present.  If, for example, the            */
-  /*    `cs_registry' field is `KOI8' and the `cs_encoding' field is `R',  */
-  /*    the font is encoded in KOI8-R.                                     */
-  /*                                                                       */
-  /*    FT_ENCODING_NONE is always set (with a single exception) by the    */
-  /*    winfonts driver.  Use @FT_Get_WinFNT_Header and examine the        */
-  /*    `charset' field of the @FT_WinFNT_HeaderRec structure to find out  */
-  /*    which encoding is really present.  For example,                    */
-  /*    @FT_WinFNT_ID_CP1251 (204) means Windows code page 1251 (for       */
-  /*    Russian).                                                          */
-  /*                                                                       */
-  /*    FT_ENCODING_NONE is set if `platform_id' is @TT_PLATFORM_MACINTOSH */
-  /*    and `encoding_id' is not @TT_MAC_ID_ROMAN (otherwise it is set to  */
-  /*    FT_ENCODING_APPLE_ROMAN).                                          */
-  /*                                                                       */
-  /*    If `platform_id' is @TT_PLATFORM_MACINTOSH, use the function       */
-  /*    @FT_Get_CMap_Language_ID to query the Mac language ID that may     */
-  /*    be needed to be able to distinguish Apple encoding variants.  See  */
-  /*                                                                       */
-  /*      http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/Readme.txt  */
-  /*                                                                       */
-  /*    to get an idea how to do that.  Basically, if the language ID      */
-  /*    is~0, don't use it, otherwise subtract 1 from the language ID.     */
-  /*    Then examine `encoding_id'.  If, for example, `encoding_id' is     */
-  /*    @TT_MAC_ID_ROMAN and the language ID (minus~1) is                  */
-  /*    `TT_MAC_LANGID_GREEK', it is the Greek encoding, not Roman.        */
-  /*    @TT_MAC_ID_ARABIC with `TT_MAC_LANGID_FARSI' means the Farsi       */
-  /*    variant the Arabic encoding.                                       */
-  /*                                                                       */
-  typedef enum  FT_Encoding_
-  {
-    FT_ENC_TAG( FT_ENCODING_NONE, 0, 0, 0, 0 ),
-
-    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL, 's', 'y', 'm', 'b' ),
-    FT_ENC_TAG( FT_ENCODING_UNICODE,   'u', 'n', 'i', 'c' ),
-
-    FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
-    FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
-    FT_ENC_TAG( FT_ENCODING_BIG5,    'b', 'i', 'g', '5' ),
-    FT_ENC_TAG( FT_ENCODING_WANSUNG, 'w', 'a', 'n', 's' ),
-    FT_ENC_TAG( FT_ENCODING_JOHAB,   'j', 'o', 'h', 'a' ),
-
-    /* for backwards compatibility */
-    FT_ENCODING_MS_SJIS    = FT_ENCODING_SJIS,
-    FT_ENCODING_MS_GB2312  = FT_ENCODING_GB2312,
-    FT_ENCODING_MS_BIG5    = FT_ENCODING_BIG5,
-    FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG,
-    FT_ENCODING_MS_JOHAB   = FT_ENCODING_JOHAB,
-
-    FT_ENC_TAG( FT_ENCODING_ADOBE_STANDARD, 'A', 'D', 'O', 'B' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_EXPERT,   'A', 'D', 'B', 'E' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_CUSTOM,   'A', 'D', 'B', 'C' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_LATIN_1,  'l', 'a', 't', '1' ),
-
-    FT_ENC_TAG( FT_ENCODING_OLD_LATIN_2, 'l', 'a', 't', '2' ),
-
-    FT_ENC_TAG( FT_ENCODING_APPLE_ROMAN, 'a', 'r', 'm', 'n' )
-
-  } FT_Encoding;
-
-
-  /* these constants are deprecated; use the corresponding `FT_Encoding' */
-  /* values instead                                                      */
-#define ft_encoding_none            FT_ENCODING_NONE
-#define ft_encoding_unicode         FT_ENCODING_UNICODE
-#define ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
-#define ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
-#define ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
-#define ft_encoding_sjis            FT_ENCODING_SJIS
-#define ft_encoding_gb2312          FT_ENCODING_GB2312
-#define ft_encoding_big5            FT_ENCODING_BIG5
-#define ft_encoding_wansung         FT_ENCODING_WANSUNG
-#define ft_encoding_johab           FT_ENCODING_JOHAB
-
-#define ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
-#define ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
-#define ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
-#define ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_CharMapRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The base charmap structure.                                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face        :: A handle to the parent face object.                 */
-  /*                                                                       */
-  /*    encoding    :: An @FT_Encoding tag identifying the charmap.  Use   */
-  /*                   this with @FT_Select_Charmap.                       */
-  /*                                                                       */
-  /*    platform_id :: An ID number describing the platform for the        */
-  /*                   following encoding ID.  This comes directly from    */
-  /*                   the TrueType specification and should be emulated   */
-  /*                   for other formats.                                  */
-  /*                                                                       */
-  /*    encoding_id :: A platform specific encoding number.  This also     */
-  /*                   comes from the TrueType specification and should be */
-  /*                   emulated similarly.                                 */
-  /*                                                                       */
-  typedef struct  FT_CharMapRec_
-  {
-    FT_Face      face;
-    FT_Encoding  encoding;
-    FT_UShort    platform_id;
-    FT_UShort    encoding_id;
-
-  } FT_CharMapRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                 B A S E   O B J E C T   C L A S S E S                 */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Face_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an `FT_Face_InternalRec' structure, used to    */
-  /*    model private data of a given @FT_Face object.                     */
-  /*                                                                       */
-  /*    This structure might change between releases of FreeType~2 and is  */
-  /*    not generally available to client applications.                    */
-  /*                                                                       */
-  typedef struct FT_Face_InternalRec_*  FT_Face_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_FaceRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root face class structure.  A face object models a        */
-  /*    typeface in a font file.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_faces           :: The number of faces in the font file.  Some */
-  /*                           font formats can have multiple faces in     */
-  /*                           a font file.                                */
-  /*                                                                       */
-  /*    face_index          :: This field holds two different values.      */
-  /*                           Bits 0-15 are the index of the face in the  */
-  /*                           font file (starting with value~0).  They    */
-  /*                           are set to~0 if there is only one face in   */
-  /*                           the font file.                              */
-  /*                                                                       */
-  /*                           Bits 16-30 are relevant to GX variation     */
-  /*                           fonts only, holding the named instance      */
-  /*                           index for the current face index (starting  */
-  /*                           with value~1; value~0 indicates font access */
-  /*                           without GX variation data).  For non-GX     */
-  /*                           fonts, bits 16-30 are ignored.  If we have  */
-  /*                           the third named instance of face~4, say,    */
-  /*                           `face_index' is set to 0x00030004.          */
-  /*                                                                       */
-  /*                           Bit 31 is always zero (this is,             */
-  /*                           `face_index' is always a positive value).   */
-  /*                                                                       */
-  /*    face_flags          :: A set of bit flags that give important      */
-  /*                           information about the face; see             */
-  /*                           @FT_FACE_FLAG_XXX for the details.          */
-  /*                                                                       */
-  /*    style_flags         :: The lower 16~bits contain a set of bit      */
-  /*                           flags indicating the style of the face; see */
-  /*                           @FT_STYLE_FLAG_XXX for the details.  Bits   */
-  /*                           16-30 hold the number of named instances    */
-  /*                           available for the current face if we have a */
-  /*                           GX variation (sub)font.  Bit 31 is always   */
-  /*                           zero (this is, `style_flags' is always a    */
-  /*                           positive value).                            */
-  /*                                                                       */
-  /*    num_glyphs          :: The number of glyphs in the face.  If the   */
-  /*                           face is scalable and has sbits (see         */
-  /*                           `num_fixed_sizes'), it is set to the number */
-  /*                           of outline glyphs.                          */
-  /*                                                                       */
-  /*                           For CID-keyed fonts, this value gives the   */
-  /*                           highest CID used in the font.               */
-  /*                                                                       */
-  /*    family_name         :: The face's family name.  This is an ASCII   */
-  /*                           string, usually in English, that describes  */
-  /*                           the typeface's family (like `Times New      */
-  /*                           Roman', `Bodoni', `Garamond', etc).  This   */
-  /*                           is a least common denominator used to list  */
-  /*                           fonts.  Some formats (TrueType & OpenType)  */
-  /*                           provide localized and Unicode versions of   */
-  /*                           this string.  Applications should use the   */
-  /*                           format specific interface to access them.   */
-  /*                           Can be NULL (e.g., in fonts embedded in a   */
-  /*                           PDF file).                                  */
-  /*                                                                       */
-  /*                           In case the font doesn't provide a specific */
-  /*                           family name entry, FreeType tries to        */
-  /*                           synthesize one, deriving it from other name */
-  /*                           entries.                                    */
-  /*                                                                       */
-  /*    style_name          :: The face's style name.  This is an ASCII    */
-  /*                           string, usually in English, that describes  */
-  /*                           the typeface's style (like `Italic',        */
-  /*                           `Bold', `Condensed', etc).  Not all font    */
-  /*                           formats provide a style name, so this field */
-  /*                           is optional, and can be set to NULL.  As    */
-  /*                           for `family_name', some formats provide     */
-  /*                           localized and Unicode versions of this      */
-  /*                           string.  Applications should use the format */
-  /*                           specific interface to access them.          */
-  /*                                                                       */
-  /*    num_fixed_sizes     :: The number of bitmap strikes in the face.   */
-  /*                           Even if the face is scalable, there might   */
-  /*                           still be bitmap strikes, which are called   */
-  /*                           `sbits' in that case.                       */
-  /*                                                                       */
-  /*    available_sizes     :: An array of @FT_Bitmap_Size for all bitmap  */
-  /*                           strikes in the face.  It is set to NULL if  */
-  /*                           there is no bitmap strike.                  */
-  /*                                                                       */
-  /*    num_charmaps        :: The number of charmaps in the face.         */
-  /*                                                                       */
-  /*    charmaps            :: An array of the charmaps of the face.       */
-  /*                                                                       */
-  /*    generic             :: A field reserved for client uses.  See the  */
-  /*                           @FT_Generic type description.               */
-  /*                                                                       */
-  /*    bbox                :: The font bounding box.  Coordinates are     */
-  /*                           expressed in font units (see                */
-  /*                           `units_per_EM').  The box is large enough   */
-  /*                           to contain any glyph from the font.  Thus,  */
-  /*                           `bbox.yMax' can be seen as the `maximum     */
-  /*                           ascender', and `bbox.yMin' as the `minimum  */
-  /*                           descender'.  Only relevant for scalable     */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*                           Note that the bounding box might be off by  */
-  /*                           (at least) one pixel for hinted fonts.  See */
-  /*                           @FT_Size_Metrics for further discussion.    */
-  /*                                                                       */
-  /*    units_per_EM        :: The number of font units per EM square for  */
-  /*                           this face.  This is typically 2048 for      */
-  /*                           TrueType fonts, and 1000 for Type~1 fonts.  */
-  /*                           Only relevant for scalable formats.         */
-  /*                                                                       */
-  /*    ascender            :: The typographic ascender of the face,       */
-  /*                           expressed in font units.  For font formats  */
-  /*                           not having this information, it is set to   */
-  /*                           `bbox.yMax'.  Only relevant for scalable    */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*    descender           :: The typographic descender of the face,      */
-  /*                           expressed in font units.  For font formats  */
-  /*                           not having this information, it is set to   */
-  /*                           `bbox.yMin'.  Note that this field is       */
-  /*                           usually negative.  Only relevant for        */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    height              :: This value is the vertical distance         */
-  /*                           between two consecutive baselines,          */
-  /*                           expressed in font units.  It is always      */
-  /*                           positive.  Only relevant for scalable       */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*                           If you want the global glyph height, use    */
-  /*                           `ascender - descender'.                     */
-  /*                                                                       */
-  /*    max_advance_width   :: The maximum advance width, in font units,   */
-  /*                           for all glyphs in this face.  This can be   */
-  /*                           used to make word wrapping computations     */
-  /*                           faster.  Only relevant for scalable         */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*    max_advance_height  :: The maximum advance height, in font units,  */
-  /*                           for all glyphs in this face.  This is only  */
-  /*                           relevant for vertical layouts, and is set   */
-  /*                           to `height' for fonts that do not provide   */
-  /*                           vertical metrics.  Only relevant for        */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    underline_position  :: The position, in font units, of the         */
-  /*                           underline line for this face.  It is the    */
-  /*                           center of the underlining stem.  Only       */
-  /*                           relevant for scalable formats.              */
-  /*                                                                       */
-  /*    underline_thickness :: The thickness, in font units, of the        */
-  /*                           underline for this face.  Only relevant for */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    glyph               :: The face's associated glyph slot(s).        */
-  /*                                                                       */
-  /*    size                :: The current active size for this face.      */
-  /*                                                                       */
-  /*    charmap             :: The current active charmap for this face.   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Fields may be changed after a call to @FT_Attach_File or           */
-  /*    @FT_Attach_Stream.                                                 */
-  /*                                                                       */
-  typedef struct  FT_FaceRec_
-  {
-    FT_Long           num_faces;
-    FT_Long           face_index;
-
-    FT_Long           face_flags;
-    FT_Long           style_flags;
-
-    FT_Long           num_glyphs;
-
-    FT_String*        family_name;
-    FT_String*        style_name;
-
-    FT_Int            num_fixed_sizes;
-    FT_Bitmap_Size*   available_sizes;
-
-    FT_Int            num_charmaps;
-    FT_CharMap*       charmaps;
-
-    FT_Generic        generic;
-
-    /*# The following member variables (down to `underline_thickness') */
-    /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
-    /*# for bitmap fonts.                                              */
-    FT_BBox           bbox;
-
-    FT_UShort         units_per_EM;
-    FT_Short          ascender;
-    FT_Short          descender;
-    FT_Short          height;
-
-    FT_Short          max_advance_width;
-    FT_Short          max_advance_height;
-
-    FT_Short          underline_position;
-    FT_Short          underline_thickness;
-
-    FT_GlyphSlot      glyph;
-    FT_Size           size;
-    FT_CharMap        charmap;
-
-    /*@private begin */
-
-    FT_Driver         driver;
-    FT_Memory         memory;
-    FT_Stream         stream;
-
-    FT_ListRec        sizes_list;
-
-    FT_Generic        autohint;   /* face-specific auto-hinter data */
-    void*             extensions; /* unused                         */
-
-    FT_Face_Internal  internal;
-
-    /*@private end */
-
-  } FT_FaceRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_FACE_FLAG_XXX                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flags used in the `face_flags' field of the          */
-  /*    @FT_FaceRec structure.  They inform client applications of         */
-  /*    properties of the corresponding face.                              */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_FACE_FLAG_SCALABLE ::                                           */
-  /*      Indicates that the face contains outline glyphs.  This doesn't   */
-  /*      prevent bitmap strikes, i.e., a face can have both this and      */
-  /*      and @FT_FACE_FLAG_FIXED_SIZES set.                               */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FIXED_SIZES ::                                        */
-  /*      Indicates that the face contains bitmap strikes.  See also the   */
-  /*      `num_fixed_sizes' and `available_sizes' fields of @FT_FaceRec.   */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FIXED_WIDTH ::                                        */
-  /*      Indicates that the face contains fixed-width characters (like    */
-  /*      Courier, Lucido, MonoType, etc.).                                */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_SFNT ::                                               */
-  /*      Indicates that the face uses the `sfnt' storage scheme.  For     */
-  /*      now, this means TrueType and OpenType.                           */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_HORIZONTAL ::                                         */
-  /*      Indicates that the face contains horizontal glyph metrics.  This */
-  /*      should be set for all common formats.                            */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_VERTICAL ::                                           */
-  /*      Indicates that the face contains vertical glyph metrics.  This   */
-  /*      is only available in some formats, not all of them.              */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_KERNING ::                                            */
-  /*      Indicates that the face contains kerning information.  If set,   */
-  /*      the kerning distance can be retrieved through the function       */
-  /*      @FT_Get_Kerning.  Otherwise the function always return the       */
-  /*      vector (0,0).  Note that FreeType doesn't handle kerning data    */
-  /*      from the `GPOS' table (as present in some OpenType fonts).       */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FAST_GLYPHS ::                                        */
-  /*      THIS FLAG IS DEPRECATED.  DO NOT USE OR TEST IT.                 */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_MULTIPLE_MASTERS ::                                   */
-  /*      Indicates that the font contains multiple masters and is capable */
-  /*      of interpolating between them.  See the multiple-masters         */
-  /*      specific API for details.                                        */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_GLYPH_NAMES ::                                        */
-  /*      Indicates that the font contains glyph names that can be         */
-  /*      retrieved through @FT_Get_Glyph_Name.  Note that some TrueType   */
-  /*      fonts contain broken glyph name tables.  Use the function        */
-  /*      @FT_Has_PS_Glyph_Names when needed.                              */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_EXTERNAL_STREAM ::                                    */
-  /*      Used internally by FreeType to indicate that a face's stream was */
-  /*      provided by the client application and should not be destroyed   */
-  /*      when @FT_Done_Face is called.  Don't read or test this flag.     */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_HINTER ::                                             */
-  /*      Set if the font driver has a hinting machine of its own.  For    */
-  /*      example, with TrueType fonts, it makes sense to use data from    */
-  /*      the SFNT `gasp' table only if the native TrueType hinting engine */
-  /*      (with the bytecode interpreter) is available and active.         */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_CID_KEYED ::                                          */
-  /*      Set if the font is CID-keyed.  In that case, the font is not     */
-  /*      accessed by glyph indices but by CID values.  For subsetted      */
-  /*      CID-keyed fonts this has the consequence that not all index      */
-  /*      values are a valid argument to FT_Load_Glyph.  Only the CID      */
-  /*      values for which corresponding glyphs in the subsetted font      */
-  /*      exist make FT_Load_Glyph return successfully; in all other cases */
-  /*      you get an `FT_Err_Invalid_Argument' error.                      */
-  /*                                                                       */
-  /*      Note that CID-keyed fonts that are in an SFNT wrapper don't      */
-  /*      have this flag set since the glyphs are accessed in the normal   */
-  /*      way (using contiguous indices); the `CID-ness' isn't visible to  */
-  /*      the application.                                                 */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_TRICKY ::                                             */
-  /*      Set if the font is `tricky', this is, it always needs the        */
-  /*      font format's native hinting engine to get a reasonable result.  */
-  /*      A typical example is the Chinese font `mingli.ttf' that uses     */
-  /*      TrueType bytecode instructions to move and scale all of its      */
-  /*      subglyphs.                                                       */
-  /*                                                                       */
-  /*      It is not possible to auto-hint such fonts using                 */
-  /*      @FT_LOAD_FORCE_AUTOHINT; it will also ignore                     */
-  /*      @FT_LOAD_NO_HINTING.  You have to set both @FT_LOAD_NO_HINTING   */
-  /*      and @FT_LOAD_NO_AUTOHINT to really disable hinting; however, you */
-  /*      probably never want this except for demonstration purposes.      */
-  /*                                                                       */
-  /*      Currently, there are about a dozen TrueType fonts in the list of */
-  /*      tricky fonts; they are hard-coded in file `ttobjs.c'.            */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_COLOR ::                                              */
-  /*      Set if the font has color glyph tables.  To access color glyphs  */
-  /*      use @FT_LOAD_COLOR.                                              */
-  /*                                                                       */
-#define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
-#define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
-#define FT_FACE_FLAG_FIXED_WIDTH       ( 1L <<  2 )
-#define FT_FACE_FLAG_SFNT              ( 1L <<  3 )
-#define FT_FACE_FLAG_HORIZONTAL        ( 1L <<  4 )
-#define FT_FACE_FLAG_VERTICAL          ( 1L <<  5 )
-#define FT_FACE_FLAG_KERNING           ( 1L <<  6 )
-#define FT_FACE_FLAG_FAST_GLYPHS       ( 1L <<  7 )
-#define FT_FACE_FLAG_MULTIPLE_MASTERS  ( 1L <<  8 )
-#define FT_FACE_FLAG_GLYPH_NAMES       ( 1L <<  9 )
-#define FT_FACE_FLAG_EXTERNAL_STREAM   ( 1L << 10 )
-#define FT_FACE_FLAG_HINTER            ( 1L << 11 )
-#define FT_FACE_FLAG_CID_KEYED         ( 1L << 12 )
-#define FT_FACE_FLAG_TRICKY            ( 1L << 13 )
-#define FT_FACE_FLAG_COLOR             ( 1L << 14 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_HORIZONTAL( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains
-   *   horizontal metrics (this is true for all font formats though).
-   *
-   * @also:
-   *   @FT_HAS_VERTICAL can be used to check for vertical metrics.
-   *
-   */
-#define FT_HAS_HORIZONTAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_HORIZONTAL )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_VERTICAL( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains real
-   *   vertical metrics (and not only synthesized ones).
-   *
-   */
-#define FT_HAS_VERTICAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_VERTICAL )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_KERNING( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains kerning
-   *   data that can be accessed with @FT_Get_Kerning.
-   *
-   */
-#define FT_HAS_KERNING( face ) \
-          ( face->face_flags & FT_FACE_FLAG_KERNING )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_SCALABLE( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a scalable
-   *   font face (true for TrueType, Type~1, Type~42, CID, OpenType/CFF,
-   *   and PFR font formats.
-   *
-   */
-#define FT_IS_SCALABLE( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SCALABLE )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_SFNT( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a font
-   *   whose format is based on the SFNT storage scheme.  This usually
-   *   means: TrueType fonts, OpenType fonts, as well as SFNT-based embedded
-   *   bitmap fonts.
-   *
-   *   If this macro is true, all functions defined in @FT_SFNT_NAMES_H and
-   *   @FT_TRUETYPE_TABLES_H are available.
-   *
-   */
-#define FT_IS_SFNT( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SFNT )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_FIXED_WIDTH( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a font face
-   *   that contains fixed-width (or `monospace', `fixed-pitch', etc.)
-   *   glyphs.
-   *
-   */
-#define FT_IS_FIXED_WIDTH( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_WIDTH )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_FIXED_SIZES( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains some
-   *   embedded bitmaps.  See the `available_sizes' field of the
-   *   @FT_FaceRec structure.
-   *
-   */
-#define FT_HAS_FIXED_SIZES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_FAST_GLYPHS( face )
-   *
-   * @description:
-   *   Deprecated.
-   *
-   */
-#define FT_HAS_FAST_GLYPHS( face )  0
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_GLYPH_NAMES( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains some glyph
-   *   names that can be accessed through @FT_Get_Glyph_Name.
-   *
-   */
-#define FT_HAS_GLYPH_NAMES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_MULTIPLE_MASTERS( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains some
-   *   multiple masters.  The functions provided by @FT_MULTIPLE_MASTERS_H
-   *   are then available to choose the exact design you want.
-   *
-   */
-#define FT_HAS_MULTIPLE_MASTERS( face ) \
-          ( face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_CID_KEYED( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains a CID-keyed
-   *   font.  See the discussion of @FT_FACE_FLAG_CID_KEYED for more
-   *   details.
-   *
-   *   If this macro is true, all functions defined in @FT_CID_H are
-   *   available.
-   *
-   */
-#define FT_IS_CID_KEYED( face ) \
-          ( face->face_flags & FT_FACE_FLAG_CID_KEYED )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_IS_TRICKY( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face represents a `tricky' font.
-   *   See the discussion of @FT_FACE_FLAG_TRICKY for more details.
-   *
-   */
-#define FT_IS_TRICKY( face ) \
-          ( face->face_flags & FT_FACE_FLAG_TRICKY )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_HAS_COLOR( face )
-   *
-   * @description:
-   *   A macro that returns true whenever a face object contains
-   *   tables for color glyphs.
-   *
-   */
-#define FT_HAS_COLOR( face ) \
-          ( face->face_flags & FT_FACE_FLAG_COLOR )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    FT_STYLE_FLAG_XXX                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flags used to indicate the style of a given face.    */
-  /*    These are used in the `style_flags' field of @FT_FaceRec.          */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_STYLE_FLAG_ITALIC ::                                            */
-  /*      Indicates that a given face style is italic or oblique.          */
-  /*                                                                       */
-  /*    FT_STYLE_FLAG_BOLD ::                                              */
-  /*      Indicates that a given face is bold.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The style information as provided by FreeType is very basic.  More */
-  /*    details are beyond the scope and should be done on a higher level  */
-  /*    (for example, by analyzing various fields of the `OS/2' table in   */
-  /*    SFNT based fonts).                                                 */
-  /*                                                                       */
-#define FT_STYLE_FLAG_ITALIC  ( 1 << 0 )
-#define FT_STYLE_FLAG_BOLD    ( 1 << 1 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Size_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an `FT_Size_InternalRec' structure, used to    */
-  /*    model private data of a given @FT_Size object.                     */
-  /*                                                                       */
-  typedef struct FT_Size_InternalRec_*  FT_Size_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_Metrics                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The size metrics structure gives the metrics of a size object.     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x_ppem       :: The width of the scaled EM square in pixels, hence */
-  /*                    the term `ppem' (pixels per EM).  It is also       */
-  /*                    referred to as `nominal width'.                    */
-  /*                                                                       */
-  /*    y_ppem       :: The height of the scaled EM square in pixels,      */
-  /*                    hence the term `ppem' (pixels per EM).  It is also */
-  /*                    referred to as `nominal height'.                   */
-  /*                                                                       */
-  /*    x_scale      :: A 16.16 fractional scaling value used to convert   */
-  /*                    horizontal metrics from font units to 26.6         */
-  /*                    fractional pixels.  Only relevant for scalable     */
-  /*                    font formats.                                      */
-  /*                                                                       */
-  /*    y_scale      :: A 16.16 fractional scaling value used to convert   */
-  /*                    vertical metrics from font units to 26.6           */
-  /*                    fractional pixels.  Only relevant for scalable     */
-  /*                    font formats.                                      */
-  /*                                                                       */
-  /*    ascender     :: The ascender in 26.6 fractional pixels.  See       */
-  /*                    @FT_FaceRec for the details.                       */
-  /*                                                                       */
-  /*    descender    :: The descender in 26.6 fractional pixels.  See      */
-  /*                    @FT_FaceRec for the details.                       */
-  /*                                                                       */
-  /*    height       :: The height in 26.6 fractional pixels.  See         */
-  /*                    @FT_FaceRec for the details.                       */
-  /*                                                                       */
-  /*    max_advance  :: The maximum advance width in 26.6 fractional       */
-  /*                    pixels.  See @FT_FaceRec for the details.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The scaling values, if relevant, are determined first during a     */
-  /*    size changing operation.  The remaining fields are then set by the */
-  /*    driver.  For scalable formats, they are usually set to scaled      */
-  /*    values of the corresponding fields in @FT_FaceRec.                 */
-  /*                                                                       */
-  /*    Note that due to glyph hinting, these values might not be exact    */
-  /*    for certain fonts.  Thus they must be treated as unreliable        */
-  /*    with an error margin of at least one pixel!                        */
-  /*                                                                       */
-  /*    Indeed, the only way to get the exact metrics is to render _all_   */
-  /*    glyphs.  As this would be a definite performance hit, it is up to  */
-  /*    client applications to perform such computations.                  */
-  /*                                                                       */
-  /*    The FT_Size_Metrics structure is valid for bitmap fonts also.      */
-  /*                                                                       */
-  typedef struct  FT_Size_Metrics_
-  {
-    FT_UShort  x_ppem;      /* horizontal pixels per EM               */
-    FT_UShort  y_ppem;      /* vertical pixels per EM                 */
-
-    FT_Fixed   x_scale;     /* scaling values used to convert font    */
-    FT_Fixed   y_scale;     /* units to 26.6 fractional pixels        */
-
-    FT_Pos     ascender;    /* ascender in 26.6 frac. pixels          */
-    FT_Pos     descender;   /* descender in 26.6 frac. pixels         */
-    FT_Pos     height;      /* text height in 26.6 frac. pixels       */
-    FT_Pos     max_advance; /* max horizontal advance, in 26.6 pixels */
-
-  } FT_Size_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SizeRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root size class structure.  A size object models a face   */
-  /*    object at a given size.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face    :: Handle to the parent face object.                       */
-  /*                                                                       */
-  /*    generic :: A typeless pointer, unused by the FreeType library or   */
-  /*               any of its drivers.  It can be used by client           */
-  /*               applications to link their own data to each size        */
-  /*               object.                                                 */
-  /*                                                                       */
-  /*    metrics :: Metrics for this size object.  This field is read-only. */
-  /*                                                                       */
-  typedef struct  FT_SizeRec_
-  {
-    FT_Face           face;      /* parent face object              */
-    FT_Generic        generic;   /* generic pointer for client uses */
-    FT_Size_Metrics   metrics;   /* size metrics                    */
-    FT_Size_Internal  internal;
-
-  } FT_SizeRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SubGlyph                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The subglyph structure is an internal object used to describe      */
-  /*    subglyphs (for example, in the case of composites).                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The subglyph implementation is not part of the high-level API,     */
-  /*    hence the forward structure declaration.                           */
-  /*                                                                       */
-  /*    You can however retrieve subglyph information with                 */
-  /*    @FT_Get_SubGlyph_Info.                                             */
-  /*                                                                       */
-  typedef struct FT_SubGlyphRec_*  FT_SubGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Slot_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an `FT_Slot_InternalRec' structure, used to    */
-  /*    model private data of a given @FT_GlyphSlot object.                */
-  /*                                                                       */
-  typedef struct FT_Slot_InternalRec_*  FT_Slot_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphSlotRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root glyph slot class structure.  A glyph slot is a       */
-  /*    container where individual glyphs can be loaded, be they in        */
-  /*    outline or bitmap format.                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library           :: A handle to the FreeType library instance     */
-  /*                         this slot belongs to.                         */
-  /*                                                                       */
-  /*    face              :: A handle to the parent face object.           */
-  /*                                                                       */
-  /*    next              :: In some cases (like some font tools), several */
-  /*                         glyph slots per face object can be a good     */
-  /*                         thing.  As this is rare, the glyph slots are  */
-  /*                         listed through a direct, single-linked list   */
-  /*                         using its `next' field.                       */
-  /*                                                                       */
-  /*    generic           :: A typeless pointer unused by the FreeType     */
-  /*                         library or any of its drivers.  It can be     */
-  /*                         used by client applications to link their own */
-  /*                         data to each glyph slot object.               */
-  /*                                                                       */
-  /*    metrics           :: The metrics of the last loaded glyph in the   */
-  /*                         slot.  The returned values depend on the last */
-  /*                         load flags (see the @FT_Load_Glyph API        */
-  /*                         function) and can be expressed either in 26.6 */
-  /*                         fractional pixels or font units.              */
-  /*                                                                       */
-  /*                         Note that even when the glyph image is        */
-  /*                         transformed, the metrics are not.             */
-  /*                                                                       */
-  /*    linearHoriAdvance :: The advance width of the unhinted glyph.      */
-  /*                         Its value is expressed in 16.16 fractional    */
-  /*                         pixels, unless @FT_LOAD_LINEAR_DESIGN is set  */
-  /*                         when loading the glyph.  This field can be    */
-  /*                         important to perform correct WYSIWYG layout.  */
-  /*                         Only relevant for outline glyphs.             */
-  /*                                                                       */
-  /*    linearVertAdvance :: The advance height of the unhinted glyph.     */
-  /*                         Its value is expressed in 16.16 fractional    */
-  /*                         pixels, unless @FT_LOAD_LINEAR_DESIGN is set  */
-  /*                         when loading the glyph.  This field can be    */
-  /*                         important to perform correct WYSIWYG layout.  */
-  /*                         Only relevant for outline glyphs.             */
-  /*                                                                       */
-  /*    advance           :: This shorthand is, depending on               */
-  /*                         @FT_LOAD_IGNORE_TRANSFORM, the transformed    */
-  /*                         (hinted) advance width for the glyph, in 26.6 */
-  /*                         fractional pixel format.  As specified with   */
-  /*                         @FT_LOAD_VERTICAL_LAYOUT, it uses either the  */
-  /*                         `horiAdvance' or the `vertAdvance' value of   */
-  /*                         `metrics' field.                              */
-  /*                                                                       */
-  /*    format            :: This field indicates the format of the image  */
-  /*                         contained in the glyph slot.  Typically       */
-  /*                         @FT_GLYPH_FORMAT_BITMAP,                      */
-  /*                         @FT_GLYPH_FORMAT_OUTLINE, or                  */
-  /*                         @FT_GLYPH_FORMAT_COMPOSITE, but others are    */
-  /*                         possible.                                     */
-  /*                                                                       */
-  /*    bitmap            :: This field is used as a bitmap descriptor     */
-  /*                         when the slot format is                       */
-  /*                         @FT_GLYPH_FORMAT_BITMAP.  Note that the       */
-  /*                         address and content of the bitmap buffer can  */
-  /*                         change between calls of @FT_Load_Glyph and a  */
-  /*                         few other functions.                          */
-  /*                                                                       */
-  /*    bitmap_left       :: The bitmap's left bearing expressed in        */
-  /*                         integer pixels.  Only valid if the format is  */
-  /*                         @FT_GLYPH_FORMAT_BITMAP, this is, if the      */
-  /*                         glyph slot contains a bitmap.                 */
-  /*                                                                       */
-  /*    bitmap_top        :: The bitmap's top bearing expressed in integer */
-  /*                         pixels.  Remember that this is the distance   */
-  /*                         from the baseline to the top-most glyph       */
-  /*                         scanline, upwards y~coordinates being         */
-  /*                         *positive*.                                   */
-  /*                                                                       */
-  /*    outline           :: The outline descriptor for the current glyph  */
-  /*                         image if its format is                        */
-  /*                         @FT_GLYPH_FORMAT_OUTLINE.  Once a glyph is    */
-  /*                         loaded, `outline' can be transformed,         */
-  /*                         distorted, embolded, etc.  However, it must   */
-  /*                         not be freed.                                 */
-  /*                                                                       */
-  /*    num_subglyphs     :: The number of subglyphs in a composite glyph. */
-  /*                         This field is only valid for the composite    */
-  /*                         glyph format that should normally only be     */
-  /*                         loaded with the @FT_LOAD_NO_RECURSE flag.     */
-  /*                                                                       */
-  /*    subglyphs         :: An array of subglyph descriptors for          */
-  /*                         composite glyphs.  There are `num_subglyphs'  */
-  /*                         elements in there.  Currently internal to     */
-  /*                         FreeType.                                     */
-  /*                                                                       */
-  /*    control_data      :: Certain font drivers can also return the      */
-  /*                         control data for a given glyph image (e.g.    */
-  /*                         TrueType bytecode, Type~1 charstrings, etc.). */
-  /*                         This field is a pointer to such data.         */
-  /*                                                                       */
-  /*    control_len       :: This is the length in bytes of the control    */
-  /*                         data.                                         */
-  /*                                                                       */
-  /*    other             :: Really wicked formats can use this pointer to */
-  /*                         present their own glyph image to client       */
-  /*                         applications.  Note that the application      */
-  /*                         needs to know about the image format.         */
-  /*                                                                       */
-  /*    lsb_delta         :: The difference between hinted and unhinted    */
-  /*                         left side bearing while auto-hinting is       */
-  /*                         active.  Zero otherwise.                      */
-  /*                                                                       */
-  /*    rsb_delta         :: The difference between hinted and unhinted    */
-  /*                         right side bearing while auto-hinting is      */
-  /*                         active.  Zero otherwise.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If @FT_Load_Glyph is called with default flags (see                */
-  /*    @FT_LOAD_DEFAULT) the glyph image is loaded in the glyph slot in   */
-  /*    its native format (e.g., an outline glyph for TrueType and Type~1  */
-  /*    formats).                                                          */
-  /*                                                                       */
-  /*    This image can later be converted into a bitmap by calling         */
-  /*    @FT_Render_Glyph.  This function finds the current renderer for    */
-  /*    the native image's format, then invokes it.                        */
-  /*                                                                       */
-  /*    The renderer is in charge of transforming the native image through */
-  /*    the slot's face transformation fields, then converting it into a   */
-  /*    bitmap that is returned in `slot->bitmap'.                         */
-  /*                                                                       */
-  /*    Note that `slot->bitmap_left' and `slot->bitmap_top' are also used */
-  /*    to specify the position of the bitmap relative to the current pen  */
-  /*    position (e.g., coordinates (0,0) on the baseline).  Of course,    */
-  /*    `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Here is a small pseudo code fragment that shows how to use         */
-  /*    `lsb_delta' and `rsb_delta':                                       */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_Pos  origin_x       = 0;                                      */
-  /*      FT_Pos  prev_rsb_delta = 0;                                      */
-  /*                                                                       */
-  /*                                                                       */
-  /*      for all glyphs do                                                */
-  /*        <compute kern between current and previous glyph and add it to */
-  /*         `origin_x'>                                                   */
-  /*                                                                       */
-  /*        <load glyph with `FT_Load_Glyph'>                              */
-  /*                                                                       */
-  /*        if ( prev_rsb_delta - face->glyph->lsb_delta >= 32 )           */
-  /*          origin_x -= 64;                                              */
-  /*        else if ( prev_rsb_delta - face->glyph->lsb_delta < -32 )      */
-  /*          origin_x += 64;                                              */
-  /*                                                                       */
-  /*        prev_rsb_delta = face->glyph->rsb_delta;                       */
-  /*                                                                       */
-  /*        <save glyph image, or render glyph, or ...>                    */
-  /*                                                                       */
-  /*        origin_x += face->glyph->advance.x;                            */
-  /*      endfor                                                           */
-  /*    }                                                                  */
-  /*                                                                       */
-  typedef struct  FT_GlyphSlotRec_
-  {
-    FT_Library        library;
-    FT_Face           face;
-    FT_GlyphSlot      next;
-    FT_UInt           reserved;       /* retained for binary compatibility */
-    FT_Generic        generic;
-
-    FT_Glyph_Metrics  metrics;
-    FT_Fixed          linearHoriAdvance;
-    FT_Fixed          linearVertAdvance;
-    FT_Vector         advance;
-
-    FT_Glyph_Format   format;
-
-    FT_Bitmap         bitmap;
-    FT_Int            bitmap_left;
-    FT_Int            bitmap_top;
-
-    FT_Outline        outline;
-
-    FT_UInt           num_subglyphs;
-    FT_SubGlyph       subglyphs;
-
-    void*             control_data;
-    long              control_len;
-
-    FT_Pos            lsb_delta;
-    FT_Pos            rsb_delta;
-
-    void*             other;
-
-    FT_Slot_Internal  internal;
-
-  } FT_GlyphSlotRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                         F U N C T I O N S                             */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Init_FreeType                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Initialize a new FreeType library object.  The set of modules      */
-  /*    that are registered by this function is determined at build time.  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    alibrary :: A handle to a new library object.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    In case you want to provide your own memory allocating routines,   */
-  /*    use @FT_New_Library instead, followed by a call to                 */
-  /*    @FT_Add_Default_Modules (or a series of calls to @FT_Add_Module).  */
-  /*                                                                       */
-  /*    See the documentation of @FT_Library and @FT_Face for              */
-  /*    multi-threading issues.                                            */
-  /*                                                                       */
-  /*    If you need reference-counting (cf. @FT_Reference_Library), use    */
-  /*    @FT_New_Library and @FT_Done_Library.                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Init_FreeType( FT_Library  *alibrary );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_FreeType                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a given FreeType library object and all of its children,   */
-  /*    including resources, drivers, faces, sizes, etc.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the target library object.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_FreeType( FT_Library  library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_OPEN_XXX                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit field constants used within the `flags' field of the */
-  /*    @FT_Open_Args structure.                                           */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_OPEN_MEMORY   :: This is a memory-based stream.                 */
-  /*                                                                       */
-  /*    FT_OPEN_STREAM   :: Copy the stream from the `stream' field.       */
-  /*                                                                       */
-  /*    FT_OPEN_PATHNAME :: Create a new input stream from a C~path        */
-  /*                        name.                                          */
-  /*                                                                       */
-  /*    FT_OPEN_DRIVER   :: Use the `driver' field.                        */
-  /*                                                                       */
-  /*    FT_OPEN_PARAMS   :: Use the `num_params' and `params' fields.      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME'     */
-  /*    flags are mutually exclusive.                                      */
-  /*                                                                       */
-#define FT_OPEN_MEMORY    0x1
-#define FT_OPEN_STREAM    0x2
-#define FT_OPEN_PATHNAME  0x4
-#define FT_OPEN_DRIVER    0x8
-#define FT_OPEN_PARAMS    0x10
-
-
-  /* these constants are deprecated; use the corresponding `FT_OPEN_XXX' */
-  /* values instead                                                      */
-#define ft_open_memory    FT_OPEN_MEMORY
-#define ft_open_stream    FT_OPEN_STREAM
-#define ft_open_pathname  FT_OPEN_PATHNAME
-#define ft_open_driver    FT_OPEN_DRIVER
-#define ft_open_params    FT_OPEN_PARAMS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Parameter                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to pass more or less generic parameters to */
-  /*    @FT_Open_Face.                                                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tag  :: A four-byte identification tag.                            */
-  /*                                                                       */
-  /*    data :: A pointer to the parameter data.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The ID and function of parameters are driver-specific.  See the    */
-  /*    various FT_PARAM_TAG_XXX flags for more information.               */
-  /*                                                                       */
-  typedef struct  FT_Parameter_
-  {
-    FT_ULong    tag;
-    FT_Pointer  data;
-
-  } FT_Parameter;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Open_Args                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to indicate how to open a new font file or        */
-  /*    stream.  A pointer to such a structure can be used as a parameter  */
-  /*    for the functions @FT_Open_Face and @FT_Attach_Stream.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    flags       :: A set of bit flags indicating how to use the        */
-  /*                   structure.                                          */
-  /*                                                                       */
-  /*    memory_base :: The first byte of the file in memory.               */
-  /*                                                                       */
-  /*    memory_size :: The size in bytes of the file in memory.            */
-  /*                                                                       */
-  /*    pathname    :: A pointer to an 8-bit file pathname.                */
-  /*                                                                       */
-  /*    stream      :: A handle to a source stream object.                 */
-  /*                                                                       */
-  /*    driver      :: This field is exclusively used by @FT_Open_Face;    */
-  /*                   it simply specifies the font driver to use to open  */
-  /*                   the face.  If set to~0, FreeType tries to load the  */
-  /*                   face with each one of the drivers in its list.      */
-  /*                                                                       */
-  /*    num_params  :: The number of extra parameters.                     */
-  /*                                                                       */
-  /*    params      :: Extra parameters passed to the font driver when     */
-  /*                   opening a new face.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream type is determined by the contents of `flags' that      */
-  /*    are tested in the following order by @FT_Open_Face:                */
-  /*                                                                       */
-  /*    If the @FT_OPEN_MEMORY bit is set, assume that this is a           */
-  /*    memory file of `memory_size' bytes, located at `memory_address'.   */
-  /*    The data are are not copied, and the client is responsible for     */
-  /*    releasing and destroying them _after_ the corresponding call to    */
-  /*    @FT_Done_Face.                                                     */
-  /*                                                                       */
-  /*    Otherwise, if the @FT_OPEN_STREAM bit is set, assume that a        */
-  /*    custom input stream `stream' is used.                              */
-  /*                                                                       */
-  /*    Otherwise, if the @FT_OPEN_PATHNAME bit is set, assume that this   */
-  /*    is a normal file and use `pathname' to open it.                    */
-  /*                                                                       */
-  /*    If the @FT_OPEN_DRIVER bit is set, @FT_Open_Face only tries to     */
-  /*    open the file with the driver whose handler is in `driver'.        */
-  /*                                                                       */
-  /*    If the @FT_OPEN_PARAMS bit is set, the parameters given by         */
-  /*    `num_params' and `params' is used.  They are ignored otherwise.    */
-  /*                                                                       */
-  /*    Ideally, both the `pathname' and `params' fields should be tagged  */
-  /*    as `const'; this is missing for API backwards compatibility.  In   */
-  /*    other words, applications should treat them as read-only.          */
-  /*                                                                       */
-  typedef struct  FT_Open_Args_
-  {
-    FT_UInt         flags;
-    const FT_Byte*  memory_base;
-    FT_Long         memory_size;
-    FT_String*      pathname;
-    FT_Stream       stream;
-    FT_Module       driver;
-    FT_Int          num_params;
-    FT_Parameter*   params;
-
-  } FT_Open_Args;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Open_Face to open a font by its pathname.  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    pathname   :: A path to the font file.                             */
-  /*                                                                       */
-  /*    face_index :: See @FT_Open_Face for a detailed description of this */
-  /*                  parameter.                                           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.  If `face_index' is   */
-  /*                  greater than or equal to zero, it must be non-NULL.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use @FT_Done_Face to destroy the created @FT_Face object (along    */
-  /*    with its slot and sizes).                                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face( FT_Library   library,
-               const char*  filepathname,
-               FT_Long      face_index,
-               FT_Face     *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Memory_Face                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Open_Face to open a font that has been     */
-  /*    loaded into memory.                                                */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    file_base  :: A pointer to the beginning of the font data.         */
-  /*                                                                       */
-  /*    file_size  :: The size of the memory chunk used by the font data.  */
-  /*                                                                       */
-  /*    face_index :: See @FT_Open_Face for a detailed description of this */
-  /*                  parameter.                                           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.  If `face_index' is   */
-  /*                  greater than or equal to zero, it must be non-NULL.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You must not deallocate the memory before calling @FT_Done_Face.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Memory_Face( FT_Library      library,
-                      const FT_Byte*  file_base,
-                      FT_Long         file_size,
-                      FT_Long         face_index,
-                      FT_Face        *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Open_Face                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a face object from a given resource described by            */
-  /*    @FT_Open_Args.                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    args       :: A pointer to an `FT_Open_Args' structure that must   */
-  /*                  be filled by the caller.                             */
-  /*                                                                       */
-  /*    face_index :: This field holds two different values.  Bits 0-15    */
-  /*                  are the index of the face in the font file (starting */
-  /*                  with value~0).  Set it to~0 if there is only one     */
-  /*                  face in the font file.                               */
-  /*                                                                       */
-  /*                  Bits 16-30 are relevant to GX variation fonts only,  */
-  /*                  specifying the named instance index for the current  */
-  /*                  face index (starting with value~1; value~0 makes     */
-  /*                  FreeType ignore named instances).  For non-GX fonts, */
-  /*                  bits 16-30 are ignored.  Assuming that you want to   */
-  /*                  access the third named instance in face~4,           */
-  /*                  `face_index' should be set to 0x00030004.  If you    */
-  /*                  want to access face~4 without GX variation handling, */
-  /*                  simply set `face_index' to value~4.                  */
-  /*                                                                       */
-  /*                  FT_Open_Face and its siblings can be used to quickly */
-  /*                  check whether the font format of a given font        */
-  /*                  resource is supported by FreeType.  In general, if   */
-  /*                  the `face_index' argument is negative, the           */
-  /*                  function's return value is~0 if the font format is   */
-  /*                  recognized, or non-zero otherwise.  The function     */
-  /*                  allocates a more or less empty face handle in        */
-  /*                  `*aface' (if `aface' isn't NULL); the only two       */
-  /*                  useful fields in this special case are               */
-  /*                  `face->num_faces' and `face->style_flags'.  For any  */
-  /*                  negative value of `face_index', `face->num_faces'    */
-  /*                  gives the number of faces within the font file.  For */
-  /*                  the negative value `-(N+1)' (with `N' a 16-bit       */
-  /*                  value), bits 16-30 in `face->style_flags' give the   */
-  /*                  number of named instances in face `N' if we have a   */
-  /*                  GX variation font (or zero otherwise).  After        */
-  /*                  examination, the returned @FT_Face structure should  */
-  /*                  be deallocated with a call to @FT_Done_Face.         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.  If `face_index' is   */
-  /*                  greater than or equal to zero, it must be non-NULL.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
-  /*    slot for the face object that can be accessed directly through     */
-  /*    `face->glyph'.                                                     */
-  /*                                                                       */
-  /*    Each new face object created with this function also owns a        */
-  /*    default @FT_Size object, accessible as `face->size'.               */
-  /*                                                                       */
-  /*    One @FT_Library instance can have multiple face objects, this is,  */
-  /*    @FT_Open_Face and its siblings can be called multiple times using  */
-  /*    the same `library' argument.                                       */
-  /*                                                                       */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Face.                                                */
-  /*                                                                       */
-  /*    To loop over all faces, use code similar to the following snippet  */
-  /*    (omitting the error handling).                                     */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      ...                                                              */
-  /*      FT_Face  face;                                                   */
-  /*      FT_Long  i, num_faces;                                           */
-  /*                                                                       */
-  /*                                                                       */
-  /*      error = FT_Open_Face( library, args, -1, &face );                */
-  /*      if ( error ) { ... }                                             */
-  /*                                                                       */
-  /*      num_faces = face->num_faces;                                     */
-  /*      FT_Done_Face( face );                                            */
-  /*                                                                       */
-  /*      for ( i = 0; i < num_faces; i++ )                                */
-  /*      {                                                                */
-  /*        ...                                                            */
-  /*        error = FT_Open_Face( library, args, i, &face );               */
-  /*        ...                                                            */
-  /*        FT_Done_Face( face );                                          */
-  /*        ...                                                            */
-  /*      }                                                                */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    To loop over all valid values for `face_index', use something      */
-  /*    similar to the following snippet, again without error handling.    */
-  /*    The code accesses all faces immediately (thus only a single call   */
-  /*    of `FT_Open_Face' within the do-loop), with and without named      */
-  /*    instances.                                                         */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      ...                                                              */
-  /*      FT_Face  face;                                                   */
-  /*                                                                       */
-  /*      FT_Long  num_faces     = 0;                                      */
-  /*      FT_Long  num_instances = 0;                                      */
-  /*                                                                       */
-  /*      FT_Long  face_idx     = 0;                                       */
-  /*      FT_Long  instance_idx = 0;                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*      do                                                               */
-  /*      {                                                                */
-  /*        FT_Long  id = ( instance_idx << 16 ) + face_idx;               */
-  /*                                                                       */
-  /*                                                                       */
-  /*        error = FT_Open_Face( library, args, id, &face );              */
-  /*        if ( error ) { ... }                                           */
-  /*                                                                       */
-  /*        num_faces     = face->num_faces;                               */
-  /*        num_instances = face->style_flags >> 16;                       */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        FT_Done_Face( face );                                          */
-  /*                                                                       */
-  /*        if ( instance_idx < num_instances )                            */
-  /*          instance_idx++;                                              */
-  /*        else                                                           */
-  /*        {                                                              */
-  /*          face_idx++;                                                  */
-  /*          instance_idx = 0;                                            */
-  /*        }                                                              */
-  /*                                                                       */
-  /*      } while ( face_idx < num_faces )                                 */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Open_Face( FT_Library           library,
-                const FT_Open_Args*  args,
-                FT_Long              face_index,
-                FT_Face             *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Attach_File                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Attach_Stream to attach a file.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: The target face object.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    filepathname :: The pathname.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Attach_File( FT_Face      face,
-                  const char*  filepathname );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Attach_Stream                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    `Attach' data to a face object.  Normally, this is used to read    */
-  /*    additional information for the face object.  For example, you can  */
-  /*    attach an AFM file that comes with a Type~1 font to get the        */
-  /*    kerning values and other metrics.                                  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: The target face object.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    parameters :: A pointer to @FT_Open_Args that must be filled by    */
-  /*                  the caller.                                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The meaning of the `attach' (i.e., what really happens when the    */
-  /*    new file is read) is not fixed by FreeType itself.  It really      */
-  /*    depends on the font format (and thus the font driver).             */
-  /*                                                                       */
-  /*    Client applications are expected to know what they are doing       */
-  /*    when invoking this function.  Most drivers simply do not implement */
-  /*    file attachments.                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Attach_Stream( FT_Face        face,
-                    FT_Open_Args*  parameters );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Reference_Face                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A counter gets initialized to~1 at the time an @FT_Face structure  */
-  /*    is created.  This function increments the counter.  @FT_Done_Face  */
-  /*    then only destroys a face if the counter is~1, otherwise it simply */
-  /*    decrements the counter.                                            */
-  /*                                                                       */
-  /*    This function helps in managing life-cycles of structures that     */
-  /*    reference @FT_Face objects.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.4.2                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Reference_Face( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Face                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard a given face object, as well as all of its child slots and */
-  /*    sizes.                                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Face.                                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Face( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Select_Size                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select a bitmap strike.                                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: A handle to a target face object.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    strike_index :: The index of the bitmap strike in the              */
-  /*                    `available_sizes' field of @FT_FaceRec structure.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Select_Size( FT_Face  face,
-                  FT_Int   strike_index );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Size_Request_Type                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type that lists the supported size request types.   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_SIZE_REQUEST_TYPE_NOMINAL ::                                    */
-  /*      The nominal size.  The `units_per_EM' field of @FT_FaceRec is    */
-  /*      used to determine both scaling values.                           */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_REAL_DIM ::                                   */
-  /*      The real dimension.  The sum of the `ascender' and (minus of)    */
-  /*      the `descender' fields of @FT_FaceRec are used to determine both */
-  /*      scaling values.                                                  */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_BBOX ::                                       */
-  /*      The font bounding box.  The width and height of the `bbox' field */
-  /*      of @FT_FaceRec are used to determine the horizontal and vertical */
-  /*      scaling value, respectively.                                     */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_CELL ::                                       */
-  /*      The `max_advance_width' field of @FT_FaceRec is used to          */
-  /*      determine the horizontal scaling value; the vertical scaling     */
-  /*      value is determined the same way as                              */
-  /*      @FT_SIZE_REQUEST_TYPE_REAL_DIM does.  Finally, both scaling      */
-  /*      values are set to the smaller one.  This type is useful if you   */
-  /*      want to specify the font size for, say, a window of a given      */
-  /*      dimension and 80x24 cells.                                       */
-  /*                                                                       */
-  /*    FT_SIZE_REQUEST_TYPE_SCALES ::                                     */
-  /*      Specify the scaling values directly.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The above descriptions only apply to scalable formats.  For bitmap */
-  /*    formats, the behaviour is up to the driver.                        */
-  /*                                                                       */
-  /*    See the note section of @FT_Size_Metrics if you wonder how size    */
-  /*    requesting relates to scaling values.                              */
-  /*                                                                       */
-  typedef enum  FT_Size_Request_Type_
-  {
-    FT_SIZE_REQUEST_TYPE_NOMINAL,
-    FT_SIZE_REQUEST_TYPE_REAL_DIM,
-    FT_SIZE_REQUEST_TYPE_BBOX,
-    FT_SIZE_REQUEST_TYPE_CELL,
-    FT_SIZE_REQUEST_TYPE_SCALES,
-
-    FT_SIZE_REQUEST_TYPE_MAX
-
-  } FT_Size_Request_Type;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_RequestRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a size request.                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    type           :: See @FT_Size_Request_Type.                       */
-  /*                                                                       */
-  /*    width          :: The desired width.                               */
-  /*                                                                       */
-  /*    height         :: The desired height.                              */
-  /*                                                                       */
-  /*    horiResolution :: The horizontal resolution.  If set to zero,      */
-  /*                      `width' is treated as a 26.6 fractional pixel    */
-  /*                      value.                                           */
-  /*                                                                       */
-  /*    vertResolution :: The vertical resolution.  If set to zero,        */
-  /*                      `height' is treated as a 26.6 fractional pixel   */
-  /*                      value.                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If `width' is zero, then the horizontal scaling value is set equal */
-  /*    to the vertical scaling value, and vice versa.                     */
-  /*                                                                       */
-  typedef struct  FT_Size_RequestRec_
-  {
-    FT_Size_Request_Type  type;
-    FT_Long               width;
-    FT_Long               height;
-    FT_UInt               horiResolution;
-    FT_UInt               vertResolution;
-
-  } FT_Size_RequestRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_Request                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a size request structure.                              */
-  /*                                                                       */
-  typedef struct FT_Size_RequestRec_  *FT_Size_Request;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Request_Size                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Resize the scale of the active @FT_Size object in a face.          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    req  :: A pointer to a @FT_Size_RequestRec.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Although drivers may select the bitmap strike matching the         */
-  /*    request, you should not rely on this if you intend to select a     */
-  /*    particular bitmap strike.  Use @FT_Select_Size instead in that     */
-  /*    case.                                                              */
-  /*                                                                       */
-  /*    The relation between the requested size and the resulting glyph    */
-  /*    size is dependent entirely on how the size is defined in the       */
-  /*    source face.  The font designer chooses the final size of each     */
-  /*    glyph relative to this size.  For more information refer to        */
-  /*    `http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html'      */
-  /*                                                                       */
-  /*    Don't use this function if you are using the FreeType cache API.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Request_Size( FT_Face          face,
-                   FT_Size_Request  req );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Char_Size                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Request_Size to request the nominal size   */
-  /*    (in points).                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face            :: A handle to a target face object.               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    char_width      :: The nominal width, in 26.6 fractional points.   */
-  /*                                                                       */
-  /*    char_height     :: The nominal height, in 26.6 fractional points.  */
-  /*                                                                       */
-  /*    horz_resolution :: The horizontal resolution in dpi.               */
-  /*                                                                       */
-  /*    vert_resolution :: The vertical resolution in dpi.                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If either the character width or height is zero, it is set equal   */
-  /*    to the other value.                                                */
-  /*                                                                       */
-  /*    If either the horizontal or vertical resolution is zero, it is set */
-  /*    equal to the other value.                                          */
-  /*                                                                       */
-  /*    A character width or height smaller than 1pt is set to 1pt; if     */
-  /*    both resolution values are zero, they are set to 72dpi.            */
-  /*                                                                       */
-  /*    Don't use this function if you are using the FreeType cache API.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Char_Size( FT_Face     face,
-                    FT_F26Dot6  char_width,
-                    FT_F26Dot6  char_height,
-                    FT_UInt     horz_resolution,
-                    FT_UInt     vert_resolution );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Pixel_Sizes                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function calls @FT_Request_Size to request the nominal size   */
-  /*    (in pixels).                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: A handle to the target face object.                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    pixel_width  :: The nominal width, in pixels.                      */
-  /*                                                                       */
-  /*    pixel_height :: The nominal height, in pixels.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should not rely on the resulting glyphs matching, or being     */
-  /*    constrained, to this pixel size.  Refer to @FT_Request_Size to     */
-  /*    understand how requested sizes relate to actual sizes.             */
-  /*                                                                       */
-  /*    Don't use this function if you are using the FreeType cache API.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Pixel_Sizes( FT_Face  face,
-                      FT_UInt  pixel_width,
-                      FT_UInt  pixel_height );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Load_Glyph                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to load a single glyph into the glyph slot of a    */
-  /*    face object.                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face        :: A handle to the target face object where the glyph  */
-  /*                   is loaded.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph_index :: The index of the glyph in the font file.  For       */
-  /*                   CID-keyed fonts (either in PS or in CFF format)     */
-  /*                   this argument specifies the CID value.              */
-  /*                                                                       */
-  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   @FT_LOAD_XXX constants can be used to control the   */
-  /*                   glyph loading process (e.g., whether the outline    */
-  /*                   should be scaled, whether to load bitmaps or not,   */
-  /*                   whether to hint the outline, etc).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The loaded glyph may be transformed.  See @FT_Set_Transform for    */
-  /*    the details.                                                       */
-  /*                                                                       */
-  /*    For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument' is        */
-  /*    returned for invalid CID values (this is, for CID values that      */
-  /*    don't have a corresponding glyph in the font).  See the discussion */
-  /*    of the @FT_FACE_FLAG_CID_KEYED flag for more details.              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Load_Glyph( FT_Face   face,
-                 FT_UInt   glyph_index,
-                 FT_Int32  load_flags );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Load_Char                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to load a single glyph into the glyph slot of a    */
-  /*    face object, according to its character code.                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face        :: A handle to a target face object where the glyph    */
-  /*                   is loaded.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    char_code   :: The glyph's character code, according to the        */
-  /*                   current charmap used in the face.                   */
-  /*                                                                       */
-  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   @FT_LOAD_XXX constants can be used to control the   */
-  /*                   glyph loading process (e.g., whether the outline    */
-  /*                   should be scaled, whether to load bitmaps or not,   */
-  /*                   whether to hint the outline, etc).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function simply calls @FT_Get_Char_Index and @FT_Load_Glyph.  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Load_Char( FT_Face   face,
-                FT_ULong  char_code,
-                FT_Int32  load_flags );
-
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FT_LOAD_XXX
-   *
-   * @description:
-   *   A list of bit field constants used with @FT_Load_Glyph to indicate
-   *   what kind of operations to perform during glyph loading.
-   *
-   * @values:
-   *   FT_LOAD_DEFAULT ::
-   *     Corresponding to~0, this value is used as the default glyph load
-   *     operation.  In this case, the following happens:
-   *
-   *     1. FreeType looks for a bitmap for the glyph corresponding to the
-   *        face's current size.  If one is found, the function returns.
-   *        The bitmap data can be accessed from the glyph slot (see note
-   *        below).
-   *
-   *     2. If no embedded bitmap is searched or found, FreeType looks for a
-   *        scalable outline.  If one is found, it is loaded from the font
-   *        file, scaled to device pixels, then `hinted' to the pixel grid
-   *        in order to optimize it.  The outline data can be accessed from
-   *        the glyph slot (see note below).
-   *
-   *     Note that by default, the glyph loader doesn't render outlines into
-   *     bitmaps.  The following flags are used to modify this default
-   *     behaviour to more specific and useful cases.
-   *
-   *   FT_LOAD_NO_SCALE ::
-   *     Don't scale the loaded outline glyph but keep it in font units.
-   *
-   *     This flag implies @FT_LOAD_NO_HINTING and @FT_LOAD_NO_BITMAP, and
-   *     unsets @FT_LOAD_RENDER.
-   *
-   *     If the font is `tricky' (see @FT_FACE_FLAG_TRICKY for more), using
-   *     FT_LOAD_NO_SCALE usually yields meaningless outlines because the
-   *     subglyphs must be scaled and positioned with hinting instructions.
-   *     This can be solved by loading the font without FT_LOAD_NO_SCALE and
-   *     setting the character size to `font->units_per_EM'.
-   *
-   *   FT_LOAD_NO_HINTING ::
-   *     Disable hinting.  This generally generates `blurrier' bitmap glyphs
-   *     when the glyph are rendered in any of the anti-aliased modes.  See
-   *     also the note below.
-   *
-   *     This flag is implied by @FT_LOAD_NO_SCALE.
-   *
-   *   FT_LOAD_RENDER ::
-   *     Call @FT_Render_Glyph after the glyph is loaded.  By default, the
-   *     glyph is rendered in @FT_RENDER_MODE_NORMAL mode.  This can be
-   *     overridden by @FT_LOAD_TARGET_XXX or @FT_LOAD_MONOCHROME.
-   *
-   *     This flag is unset by @FT_LOAD_NO_SCALE.
-   *
-   *   FT_LOAD_NO_BITMAP ::
-   *     Ignore bitmap strikes when loading.  Bitmap-only fonts ignore this
-   *     flag.
-   *
-   *     @FT_LOAD_NO_SCALE always sets this flag.
-   *
-   *   FT_LOAD_VERTICAL_LAYOUT ::
-   *     Load the glyph for vertical text layout.  In particular, the
-   *     `advance' value in the @FT_GlyphSlotRec structure is set to the
-   *     `vertAdvance' value of the `metrics' field.
-   *
-   *     In case @FT_HAS_VERTICAL doesn't return true, you shouldn't use
-   *     this flag currently.  Reason is that in this case vertical metrics
-   *     get synthesized, and those values are not always consistent across
-   *     various font formats.
-   *
-   *   FT_LOAD_FORCE_AUTOHINT ::
-   *     Indicates that the auto-hinter is preferred over the font's native
-   *     hinter.  See also the note below.
-   *
-   *   FT_LOAD_PEDANTIC ::
-   *     Indicates that the font driver should perform pedantic verifications
-   *     during glyph loading.  This is mostly used to detect broken glyphs
-   *     in fonts.  By default, FreeType tries to handle broken fonts also.
-   *
-   *     In particular, errors from the TrueType bytecode engine are not
-   *     passed to the application if this flag is not set; this might
-   *     result in partially hinted or distorted glyphs in case a glyph's
-   *     bytecode is buggy.
-   *
-   *   FT_LOAD_NO_RECURSE ::
-   *     Indicate that the font driver should not load composite glyphs
-   *     recursively.  Instead, it should set the `num_subglyph' and
-   *     `subglyphs' values of the glyph slot accordingly, and set
-   *     `glyph->format' to @FT_GLYPH_FORMAT_COMPOSITE.  The description of
-   *     subglyphs can then be accessed with @FT_Get_SubGlyph_Info.
-   *
-   *     This flag implies @FT_LOAD_NO_SCALE and @FT_LOAD_IGNORE_TRANSFORM.
-   *
-   *   FT_LOAD_IGNORE_TRANSFORM ::
-   *     Indicates that the transform matrix set by @FT_Set_Transform should
-   *     be ignored.
-   *
-   *   FT_LOAD_MONOCHROME ::
-   *     This flag is used with @FT_LOAD_RENDER to indicate that you want to
-   *     render an outline glyph to a 1-bit monochrome bitmap glyph, with
-   *     8~pixels packed into each byte of the bitmap data.
-   *
-   *     Note that this has no effect on the hinting algorithm used.  You
-   *     should rather use @FT_LOAD_TARGET_MONO so that the
-   *     monochrome-optimized hinting algorithm is used.
-   *
-   *   FT_LOAD_LINEAR_DESIGN ::
-   *     Indicates that the `linearHoriAdvance' and `linearVertAdvance'
-   *     fields of @FT_GlyphSlotRec should be kept in font units.  See
-   *     @FT_GlyphSlotRec for details.
-   *
-   *   FT_LOAD_NO_AUTOHINT ::
-   *     Disable auto-hinter.  See also the note below.
-   *
-   *   FT_LOAD_COLOR ::
-   *     This flag is used to request loading of color embedded-bitmap
-   *     images.  The resulting color bitmaps, if available, will have the
-   *     @FT_PIXEL_MODE_BGRA format.  When the flag is not used and color
-   *     bitmaps are found, they will be converted to 256-level gray
-   *     bitmaps transparently.  Those bitmaps will be in the
-   *     @FT_PIXEL_MODE_GRAY format.
-   *
-   *   FT_LOAD_COMPUTE_METRICS ::
-   *     This flag sets computing glyph metrics without the use of bundled
-   *     metrics tables (for example, the `hdmx' table in TrueType fonts).
-   *     Well-behaving fonts have optimized bundled metrics and these should
-   *     be used.  This flag is mainly used by font validating or font
-   *     editing applications, which need to ignore, verify, or edit those
-   *     tables.
-   *
-   *     Currently, this flag is only implemented for TrueType fonts.
-   *
-   *   FT_LOAD_CROP_BITMAP ::
-   *     Ignored.  Deprecated.
-   *
-   *   FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
-   *     Ignored.  Deprecated.
-   *
-   * @note:
-   *   By default, hinting is enabled and the font's native hinter (see
-   *   @FT_FACE_FLAG_HINTER) is preferred over the auto-hinter.  You can
-   *   disable hinting by setting @FT_LOAD_NO_HINTING or change the
-   *   precedence by setting @FT_LOAD_FORCE_AUTOHINT.  You can also set
-   *   @FT_LOAD_NO_AUTOHINT in case you don't want the auto-hinter to be
-   *   used at all.
-   *
-   *   See the description of @FT_FACE_FLAG_TRICKY for a special exception
-   *   (affecting only a handful of Asian fonts).
-   *
-   *   Besides deciding which hinter to use, you can also decide which
-   *   hinting algorithm to use.  See @FT_LOAD_TARGET_XXX for details.
-   *
-   *   Note that the auto-hinter needs a valid Unicode cmap (either a native
-   *   one or synthesized by FreeType) for producing correct results.  If a
-   *   font provides an incorrect mapping (for example, assigning the
-   *   character code U+005A, LATIN CAPITAL LETTER Z, to a glyph depicting a
-   *   mathematical integral sign), the auto-hinter might produce useless
-   *   results.
-   *
-   */
-#define FT_LOAD_DEFAULT                      0x0
-#define FT_LOAD_NO_SCALE                     ( 1L << 0 )
-#define FT_LOAD_NO_HINTING                   ( 1L << 1 )
-#define FT_LOAD_RENDER                       ( 1L << 2 )
-#define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
-#define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
-#define FT_LOAD_FORCE_AUTOHINT               ( 1L << 5 )
-#define FT_LOAD_CROP_BITMAP                  ( 1L << 6 )
-#define FT_LOAD_PEDANTIC                     ( 1L << 7 )
-#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  ( 1L << 9 )
-#define FT_LOAD_NO_RECURSE                   ( 1L << 10 )
-#define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
-#define FT_LOAD_MONOCHROME                   ( 1L << 12 )
-#define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
-#define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
-  /* Bits 16..19 are used by `FT_LOAD_TARGET_' */
-#define FT_LOAD_COLOR                        ( 1L << 20 )
-#define FT_LOAD_COMPUTE_METRICS              ( 1L << 21 )
-
-  /* */
-
-  /* used internally only by certain font drivers! */
-#define FT_LOAD_ADVANCE_ONLY                 ( 1L << 8 )
-#define FT_LOAD_SBITS_ONLY                   ( 1L << 14 )
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_LOAD_TARGET_XXX
-   *
-   * @description:
-   *   A list of values that are used to select a specific hinting algorithm
-   *   to use by the hinter.  You should OR one of these values to your
-   *   `load_flags' when calling @FT_Load_Glyph.
-   *
-   *   Note that font's native hinters may ignore the hinting algorithm you
-   *   have specified (e.g., the TrueType bytecode interpreter).  You can set
-   *   @FT_LOAD_FORCE_AUTOHINT to ensure that the auto-hinter is used.
-   *
-   * @values:
-   *   FT_LOAD_TARGET_NORMAL ::
-   *     This corresponds to the default hinting algorithm, optimized for
-   *     standard gray-level rendering.  For monochrome output, use
-   *     @FT_LOAD_TARGET_MONO instead.
-   *
-   *   FT_LOAD_TARGET_LIGHT ::
-   *     A lighter hinting algorithm for gray-level modes.  Many generated
-   *     glyphs are fuzzier but better resemble their original shape.  This
-   *     is achieved by snapping glyphs to the pixel grid only vertically
-   *     (Y-axis), as is done by Microsoft's ClearType and Adobe's
-   *     proprietary font renderer.  This preserves inter-glyph spacing in
-   *     horizontal text.  The snapping is done either by the native font
-   *     driver if the driver itself and the font support it or by the
-   *     auto-hinter.
-   *
-   *   FT_LOAD_TARGET_MONO ::
-   *     Strong hinting algorithm that should only be used for monochrome
-   *     output.  The result is probably unpleasant if the glyph is rendered
-   *     in non-monochrome modes.
-   *
-   *   FT_LOAD_TARGET_LCD ::
-   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for horizontally
-   *     decimated LCD displays.
-   *
-   *   FT_LOAD_TARGET_LCD_V ::
-   *     A variant of @FT_LOAD_TARGET_NORMAL optimized for vertically
-   *     decimated LCD displays.
-   *
-   * @note:
-   *   You should use only _one_ of the FT_LOAD_TARGET_XXX values in your
-   *   `load_flags'.  They can't be ORed.
-   *
-   *   If @FT_LOAD_RENDER is also set, the glyph is rendered in the
-   *   corresponding mode (i.e., the mode that matches the used algorithm
-   *   best).  An exception is FT_LOAD_TARGET_MONO since it implies
-   *   @FT_LOAD_MONOCHROME.
-   *
-   *   You can use a hinting algorithm that doesn't correspond to the same
-   *   rendering mode.  As an example, it is possible to use the `light'
-   *   hinting algorithm and have the results rendered in horizontal LCD
-   *   pixel mode, with code like
-   *
-   *     {
-   *       FT_Load_Glyph( face, glyph_index,
-   *                      load_flags | FT_LOAD_TARGET_LIGHT );
-   *
-   *       FT_Render_Glyph( face->glyph, FT_RENDER_MODE_LCD );
-   *     }
-   *
-   */
-#define FT_LOAD_TARGET_( x )   ( (FT_Int32)( (x) & 15 ) << 16 )
-
-#define FT_LOAD_TARGET_NORMAL  FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL )
-#define FT_LOAD_TARGET_LIGHT   FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT  )
-#define FT_LOAD_TARGET_MONO    FT_LOAD_TARGET_( FT_RENDER_MODE_MONO   )
-#define FT_LOAD_TARGET_LCD     FT_LOAD_TARGET_( FT_RENDER_MODE_LCD    )
-#define FT_LOAD_TARGET_LCD_V   FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V  )
-
-
-  /**************************************************************************
-   *
-   * @macro:
-   *   FT_LOAD_TARGET_MODE
-   *
-   * @description:
-   *   Return the @FT_Render_Mode corresponding to a given
-   *   @FT_LOAD_TARGET_XXX value.
-   *
-   */
-#define FT_LOAD_TARGET_MODE( x )  ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Transform                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to set the transformation that is applied to glyph */
-  /*    images when they are loaded into a glyph slot through              */
-  /*    @FT_Load_Glyph.                                                    */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face   :: A handle to the source face object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to the transformation's 2x2 matrix.  Use~0 for */
-  /*              the identity matrix.                                     */
-  /*    delta  :: A pointer to the translation vector.  Use~0 for the null */
-  /*              vector.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The transformation is only applied to scalable image formats after */
-  /*    the glyph has been loaded.  It means that hinting is unaltered by  */
-  /*    the transformation and is performed on the character size given in */
-  /*    the last call to @FT_Set_Char_Size or @FT_Set_Pixel_Sizes.         */
-  /*                                                                       */
-  /*    Note that this also transforms the `face.glyph.advance' field, but */
-  /*    *not* the values in `face.glyph.metrics'.                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Set_Transform( FT_Face     face,
-                    FT_Matrix*  matrix,
-                    FT_Vector*  delta );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Render_Mode                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type that lists the render modes supported by       */
-  /*    FreeType~2.  Each mode corresponds to a specific type of scanline  */
-  /*    conversion performed on the outline.                               */
-  /*                                                                       */
-  /*    For bitmap fonts and embedded bitmaps the `bitmap->pixel_mode'     */
-  /*    field in the @FT_GlyphSlotRec structure gives the format of the    */
-  /*    returned bitmap.                                                   */
-  /*                                                                       */
-  /*    All modes except @FT_RENDER_MODE_MONO use 256 levels of opacity,   */
-  /*    indicating pixel coverage.  Use linear alpha blending and gamma    */
-  /*    correction to correctly render non-monochrome glyph bitmaps onto a */
-  /*    surface; see @FT_Render_Glyph.                                     */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_RENDER_MODE_NORMAL ::                                           */
-  /*      This is the default render mode; it corresponds to 8-bit         */
-  /*      anti-aliased bitmaps.                                            */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LIGHT ::                                            */
-  /*      This is equivalent to @FT_RENDER_MODE_NORMAL.  It is only        */
-  /*      defined as a separate value because render modes are also used   */
-  /*      indirectly to define hinting algorithm selectors.  See           */
-  /*      @FT_LOAD_TARGET_XXX for details.                                 */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_MONO ::                                             */
-  /*      This mode corresponds to 1-bit bitmaps (with 2~levels of         */
-  /*      opacity).                                                        */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LCD ::                                              */
-  /*      This mode corresponds to horizontal RGB and BGR sub-pixel        */
-  /*      displays like LCD screens.  It produces 8-bit bitmaps that are   */
-  /*      3~times the width of the original glyph outline in pixels, and   */
-  /*      which use the @FT_PIXEL_MODE_LCD mode.                           */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LCD_V ::                                            */
-  /*      This mode corresponds to vertical RGB and BGR sub-pixel displays */
-  /*      (like PDA screens, rotated LCD displays, etc.).  It produces     */
-  /*      8-bit bitmaps that are 3~times the height of the original        */
-  /*      glyph outline in pixels and use the @FT_PIXEL_MODE_LCD_V mode.   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The LCD-optimized glyph bitmaps produced by FT_Render_Glyph can be */
-  /*    filtered to reduce color-fringes by using @FT_Library_SetLcdFilter */
-  /*    (not active in the default builds).  It is up to the caller to     */
-  /*    either call @FT_Library_SetLcdFilter (if available) or do the      */
-  /*    filtering itself.                                                  */
-  /*                                                                       */
-  /*    The selected render mode only affects vector glyphs of a font.     */
-  /*    Embedded bitmaps often have a different pixel mode like            */
-  /*    @FT_PIXEL_MODE_MONO.  You can use @FT_Bitmap_Convert to transform  */
-  /*    them into 8-bit pixmaps.                                           */
-  /*                                                                       */
-  typedef enum  FT_Render_Mode_
-  {
-    FT_RENDER_MODE_NORMAL = 0,
-    FT_RENDER_MODE_LIGHT,
-    FT_RENDER_MODE_MONO,
-    FT_RENDER_MODE_LCD,
-    FT_RENDER_MODE_LCD_V,
-
-    FT_RENDER_MODE_MAX
-
-  } FT_Render_Mode;
-
-
-  /* these constants are deprecated; use the corresponding */
-  /* `FT_Render_Mode' values instead                       */
-#define ft_render_mode_normal  FT_RENDER_MODE_NORMAL
-#define ft_render_mode_mono    FT_RENDER_MODE_MONO
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Render_Glyph                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Convert a given glyph image to a bitmap.  It does so by inspecting */
-  /*    the glyph image format, finding the relevant renderer, and         */
-  /*    invoking it.                                                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    slot        :: A handle to the glyph slot containing the image to  */
-  /*                   convert.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    render_mode :: This is the render mode used to render the glyph    */
-  /*                   image into a bitmap.  See @FT_Render_Mode for a     */
-  /*                   list of possible values.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    To get meaningful results, font scaling values must be set with    */
-  /*    functions like @FT_Set_Char_Size before calling FT_Render_Glyph.   */
-  /*                                                                       */
-  /*    When FreeType outputs a bitmap of a glyph, it really outputs an    */
-  /*    alpha coverage map.  If a pixel is completely covered by a         */
-  /*    filled-in outline, the bitmap contains 0xFF at that pixel, meaning */
-  /*    that 0xFF/0xFF fraction of that pixel is covered, meaning the      */
-  /*    pixel is 100% black (or 0% bright).  If a pixel is only 50%        */
-  /*    covered (value 0x80), the pixel is made 50% black (50% bright or a */
-  /*    middle shade of grey).  0% covered means 0% black (100% bright or  */
-  /*    white).                                                            */
-  /*                                                                       */
-  /*    On high-DPI screens like on smartphones and tablets, the pixels    */
-  /*    are so small that their chance of being completely covered and     */
-  /*    therefore completely black are fairly good.  On the low-DPI        */
-  /*    screens, however, the situation is different.  The pixels are too  */
-  /*    large for most of the details of a glyph and shades of gray are    */
-  /*    the norm rather than the exception.                                */
-  /*                                                                       */
-  /*    This is relevant because all our screens have a second problem:    */
-  /*    they are not linear.  1~+~1 is not~2.  Twice the value does not    */
-  /*    result in twice the brightness.  When a pixel is only 50% covered, */
-  /*    the coverage map says 50% black, and this translates to a pixel    */
-  /*    value of 128 when you use 8~bits per channel (0-255).  However,    */
-  /*    this does not translate to 50% brightness for that pixel on our    */
-  /*    sRGB and gamma~2.2 screens.  Due to their non-linearity, they      */
-  /*    dwell longer in the darks and only a pixel value of about 186      */
-  /*    results in 50% brightness – 128 ends up too dark on both bright    */
-  /*    and dark backgrounds.  The net result is that dark text looks      */
-  /*    burnt-out, pixely and blotchy on bright background, bright text    */
-  /*    too frail on dark backgrounds, and colored text on colored         */
-  /*    background (for example, red on green) seems to have dark halos or */
-  /*    `dirt' around it.  The situation is especially ugly for diagonal   */
-  /*    stems like in `w' glyph shapes where the quality of FreeType's     */
-  /*    anti-aliasing depends on the correct display of grays.  On         */
-  /*    high-DPI screens where smaller, fully black pixels reign supreme,  */
-  /*    this doesn't matter, but on our low-DPI screens with all the gray  */
-  /*    shades, it does.  0% and 100% brightness are the same things in    */
-  /*    linear and non-linear space, just all the shades in-between        */
-  /*    aren't.                                                            */
-  /*                                                                       */
-  /*    The blending function for placing text over a background is        */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      dst = alpha * src + (1 - alpha) * dst    ,                       */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    which is known as the OVER operator.                               */
-  /*                                                                       */
-  /*    To correctly composite an antialiased pixel of a glyph onto a      */
-  /*    surface,                                                           */
-  /*                                                                       */
-  /*    1. take the foreground and background colors (e.g., in sRGB space) */
-  /*       and apply gamma to get them in a linear space,                  */
-  /*                                                                       */
-  /*    2. use OVER to blend the two linear colors using the glyph pixel   */
-  /*       as the alpha value (remember, the glyph bitmap is an alpha      */
-  /*       coverage bitmap), and                                           */
-  /*                                                                       */
-  /*    3. apply inverse gamma to the blended pixel and write it back to   */
-  /*       the image.                                                      */
-  /*                                                                       */
-  /*    Internal testing at Adobe found that a target inverse gamma of~1.8 */
-  /*    for step~3 gives good results across a wide range of displays with */
-  /*    an sRGB gamma curve or a similar one.                              */
-  /*                                                                       */
-  /*    This process can cost performance.  There is an approximation that */
-  /*    does not need to know about the background color; see              */
-  /*    https://bel.fi/alankila/lcd/ and                                   */
-  /*    https://bel.fi/alankila/lcd/alpcor.html for details.               */
-  /*                                                                       */
-  /*    *ATTENTION*: Linear blending is even more important when dealing   */
-  /*    with subpixel-rendered glyphs to prevent color-fringing!  A        */
-  /*    subpixel-rendered glyph must first be filtered with a filter that  */
-  /*    gives equal weight to the three color primaries and does not       */
-  /*    exceed a sum of 0x100, see section @lcd_filtering.  Then the       */
-  /*    only difference to gray linear blending is that subpixel-rendered  */
-  /*    linear blending is done 3~times per pixel: red foreground subpixel */
-  /*    to red background subpixel and so on for green and blue.           */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Render_Glyph( FT_GlyphSlot    slot,
-                   FT_Render_Mode  render_mode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Kerning_Mode                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify which kerning values to return in   */
-  /*    @FT_Get_Kerning.                                                   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_KERNING_DEFAULT  :: Return grid-fitted kerning distances in     */
-  /*                           pixels (value is~0).  Whether they are      */
-  /*                           scaled depends on @FT_LOAD_NO_SCALE.        */
-  /*                                                                       */
-  /*    FT_KERNING_UNFITTED :: Return un-grid-fitted kerning distances in  */
-  /*                           26.6 fractional pixels.  Whether they are   */
-  /*                           scaled depends on @FT_LOAD_NO_SCALE.        */
-  /*                                                                       */
-  /*    FT_KERNING_UNSCALED :: Return the kerning vector in original font  */
-  /*                           units.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    FT_KERNING_DEFAULT returns full pixel values; it also makes        */
-  /*    FreeType heuristically scale down kerning distances at small ppem  */
-  /*    values so that they don't become too big.                          */
-  /*                                                                       */
-  typedef enum  FT_Kerning_Mode_
-  {
-    FT_KERNING_DEFAULT  = 0,
-    FT_KERNING_UNFITTED,
-    FT_KERNING_UNSCALED
-
-  } FT_Kerning_Mode;
-
-
-  /* these constants are deprecated; use the corresponding */
-  /* `FT_Kerning_Mode' values instead                      */
-#define ft_kerning_default   FT_KERNING_DEFAULT
-#define ft_kerning_unfitted  FT_KERNING_UNFITTED
-#define ft_kerning_unscaled  FT_KERNING_UNSCALED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Kerning                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the kerning vector between two glyphs of a same face.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to a source face object.                   */
-  /*                                                                       */
-  /*    left_glyph  :: The index of the left glyph in the kern pair.       */
-  /*                                                                       */
-  /*    right_glyph :: The index of the right glyph in the kern pair.      */
-  /*                                                                       */
-  /*    kern_mode   :: See @FT_Kerning_Mode for more information.          */
-  /*                   Determines the scale and dimension of the returned  */
-  /*                   kerning vector.                                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    akerning    :: The kerning vector.  This is either in font units,  */
-  /*                   fractional pixels (26.6 format), or pixels for      */
-  /*                   scalable formats, and in pixels for fixed-sizes     */
-  /*                   formats.                                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Only horizontal layouts (left-to-right & right-to-left) are        */
-  /*    supported by this method.  Other layouts, or more sophisticated    */
-  /*    kernings, are out of the scope of this API function -- they can be */
-  /*    implemented through format-specific interfaces.                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Kerning( FT_Face     face,
-                  FT_UInt     left_glyph,
-                  FT_UInt     right_glyph,
-                  FT_UInt     kern_mode,
-                  FT_Vector  *akerning );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Track_Kerning                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the track kerning for a given face object at a given size.  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: A handle to a source face object.                    */
-  /*                                                                       */
-  /*    point_size :: The point size in 16.16 fractional points.           */
-  /*                                                                       */
-  /*    degree     :: The degree of tightness.  Increasingly negative      */
-  /*                  values represent tighter track kerning, while        */
-  /*                  increasingly positive values represent looser track  */
-  /*                  kerning.  Value zero means no track kerning.         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    akerning   :: The kerning in 16.16 fractional points, to be        */
-  /*                  uniformly applied between all glyphs.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Currently, only the Type~1 font driver supports track kerning,     */
-  /*    using data from AFM files (if attached with @FT_Attach_File or     */
-  /*    @FT_Attach_Stream).                                                */
-  /*                                                                       */
-  /*    Only very few AFM files come with track kerning data; please refer */
-  /*    to the Adobe's AFM specification for more details.                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Track_Kerning( FT_Face    face,
-                        FT_Fixed   point_size,
-                        FT_Int     degree,
-                        FT_Fixed*  akerning );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Glyph_Name                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the ASCII name of a given glyph in a face.  This only     */
-  /*    works for those faces where @FT_HAS_GLYPH_NAMES(face) returns~1.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to a source face object.                   */
-  /*                                                                       */
-  /*    glyph_index :: The glyph index.                                    */
-  /*                                                                       */
-  /*    buffer_max  :: The maximum number of bytes available in the        */
-  /*                   buffer.                                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    buffer      :: A pointer to a target buffer where the name is      */
-  /*                   copied to.                                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error is returned if the face doesn't provide glyph names or if */
-  /*    the glyph index is invalid.  In all cases of failure, the first    */
-  /*    byte of `buffer' is set to~0 to indicate an empty name.            */
-  /*                                                                       */
-  /*    The glyph name is truncated to fit within the buffer if it is too  */
-  /*    long.  The returned string is always zero-terminated.              */
-  /*                                                                       */
-  /*    Be aware that FreeType reorders glyph indices internally so that   */
-  /*    glyph index~0 always corresponds to the `missing glyph' (called    */
-  /*    `.notdef').                                                        */
-  /*                                                                       */
-  /*    This function always returns an error if the config macro          */
-  /*    `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is not defined in `ftoption.h'.  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph_Name( FT_Face     face,
-                     FT_UInt     glyph_index,
-                     FT_Pointer  buffer,
-                     FT_UInt     buffer_max );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Postscript_Name                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the ASCII PostScript name of a given face, if available.  */
-  /*    This only works with PostScript and TrueType fonts.                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face object.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to the face's PostScript name.  NULL if unavailable.     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned pointer is owned by the face and is destroyed with    */
-  /*    it.                                                                */
-  /*                                                                       */
-  FT_EXPORT( const char* )
-  FT_Get_Postscript_Name( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Select_Charmap                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select a given charmap by its encoding tag (as listed in           */
-  /*    `freetype.h').                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    encoding :: A handle to the selected encoding.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function returns an error if no charmap in the face           */
-  /*    corresponds to the encoding queried here.                          */
-  /*                                                                       */
-  /*    Because many fonts contain more than a single cmap for Unicode     */
-  /*    encoding, this function has some special code to select the one    */
-  /*    that covers Unicode best (`best' in the sense that a UCS-4 cmap is */
-  /*    preferred to a UCS-2 cmap).  It is thus preferable to              */
-  /*    @FT_Set_Charmap in this case.                                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Select_Charmap( FT_Face      face,
-                     FT_Encoding  encoding );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Charmap                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select a given charmap for character code to glyph index mapping.  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face    :: A handle to the source face object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap :: A handle to the selected charmap.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function returns an error if the charmap is not part of       */
-  /*    the face (i.e., if it is not listed in the `face->charmaps'        */
-  /*    table).                                                            */
-  /*                                                                       */
-  /*    It also fails if a type~14 charmap is selected.                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Charmap( FT_Face     face,
-                  FT_CharMap  charmap );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Get_Charmap_Index
-   *
-   * @description:
-   *   Retrieve index of a given charmap.
-   *
-   * @input:
-   *   charmap ::
-   *     A handle to a charmap.
-   *
-   * @return:
-   *   The index into the array of character maps within the face to which
-   *   `charmap' belongs.  If an error occurs, -1 is returned.
-   *
-   */
-  FT_EXPORT( FT_Int )
-  FT_Get_Charmap_Index( FT_CharMap  charmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Char_Index                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the glyph index of a given character code.  This function   */
-  /*    uses a charmap object to do the mapping.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /*    charcode :: The character code.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0~means `undefined character code'.              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If you use FreeType to manipulate the contents of font files       */
-  /*    directly, be aware that the glyph index returned by this function  */
-  /*    doesn't always correspond to the internal indices used within the  */
-  /*    file.  This is done to ensure that value~0 always corresponds to   */
-  /*    the `missing glyph'.  If the first glyph is not named `.notdef',   */
-  /*    then for Type~1 and Type~42 fonts, `.notdef' will be moved into    */
-  /*    the glyph ID~0 position, and whatever was there will be moved to   */
-  /*    the position `.notdef' had.  For Type~1 fonts, if there is no      */
-  /*    `.notdef' glyph at all, then one will be created at index~0 and    */
-  /*    whatever was there will be moved to the last index -- Type~42      */
-  /*    fonts are considered invalid under this condition.                 */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Char_Index( FT_Face   face,
-                     FT_ULong  charcode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_First_Char                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to return the first character code in the    */
-  /*    current charmap of a given face.  It also returns the              */
-  /*    corresponding glyph index.                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face object.                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    agindex :: Glyph index of first character code.  0~if charmap is   */
-  /*               empty.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The charmap's first character code.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should use this function with @FT_Get_Next_Char to be able to  */
-  /*    parse all character codes available in a given charmap.  The code  */
-  /*    should look like this:                                             */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_ULong  charcode;                                              */
-  /*      FT_UInt   gindex;                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      charcode = FT_Get_First_Char( face, &gindex );                   */
-  /*      while ( gindex != 0 )                                            */
-  /*      {                                                                */
-  /*        ... do something with (charcode,gindex) pair ...               */
-  /*                                                                       */
-  /*        charcode = FT_Get_Next_Char( face, charcode, &gindex );        */
-  /*      }                                                                */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Be aware that character codes can have values up to 0xFFFFFFFF;    */
-  /*    this might happen for non-Unicode or malformed cmaps.  However,    */
-  /*    even with regular Unicode encoding, so-called `last resort fonts'  */
-  /*    (using SFNT cmap format 13, see function @FT_Get_CMap_Format)      */
-  /*    normally have entries for all Unicode characters up to 0x1FFFFF,   */
-  /*    which can cause *a lot* of iterations.                             */
-  /*                                                                       */
-  /*    Note that `*agindex' is set to~0 if the charmap is empty.  The     */
-  /*    result itself can be~0 in two cases: if the charmap is empty or    */
-  /*    if the value~0 is the first valid character code.                  */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_First_Char( FT_Face   face,
-                     FT_UInt  *agindex );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Next_Char                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to return the next character code in the     */
-  /*    current charmap of a given face following the value `char_code',   */
-  /*    as well as the corresponding glyph index.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face      :: A handle to the source face object.                   */
-  /*    char_code :: The starting character code.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    agindex   :: Glyph index of next character code.  0~if charmap     */
-  /*                 is empty.                                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The charmap's next character code.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should use this function with @FT_Get_First_Char to walk       */
-  /*    over all character codes available in a given charmap.  See the    */
-  /*    note for this function for a simple code example.                  */
-  /*                                                                       */
-  /*    Note that `*agindex' is set to~0 when there are no more codes in   */
-  /*    the charmap.                                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_Next_Char( FT_Face    face,
-                    FT_ULong   char_code,
-                    FT_UInt   *agindex );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Name_Index                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the glyph index of a given glyph name.  This function uses  */
-  /*    driver specific objects to do the translation.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: A handle to the source face object.                  */
-  /*                                                                       */
-  /*    glyph_name :: The glyph name.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0~means `undefined character code'.              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Name_Index( FT_Face     face,
-                     FT_String*  glyph_name );
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_SUBGLYPH_FLAG_XXX
-   *
-   * @description:
-   *   A list of constants used to describe subglyphs.  Please refer to the
-   *   TrueType specification for the meaning of the various flags.
-   *
-   * @values:
-   *   FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS ::
-   *   FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES ::
-   *   FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID ::
-   *   FT_SUBGLYPH_FLAG_SCALE ::
-   *   FT_SUBGLYPH_FLAG_XY_SCALE ::
-   *   FT_SUBGLYPH_FLAG_2X2 ::
-   *   FT_SUBGLYPH_FLAG_USE_MY_METRICS ::
-   *
-   */
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
-#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
-#define FT_SUBGLYPH_FLAG_SCALE                   8
-#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
-#define FT_SUBGLYPH_FLAG_2X2                  0x80
-#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
-
-
-  /*************************************************************************
-   *
-   * @func:
-   *   FT_Get_SubGlyph_Info
-   *
-   * @description:
-   *   Retrieve a description of a given subglyph.  Only use it if
-   *   `glyph->format' is @FT_GLYPH_FORMAT_COMPOSITE; an error is
-   *   returned otherwise.
-   *
-   * @input:
-   *   glyph ::
-   *     The source glyph slot.
-   *
-   *   sub_index ::
-   *     The index of the subglyph.  Must be less than
-   *     `glyph->num_subglyphs'.
-   *
-   * @output:
-   *   p_index ::
-   *     The glyph index of the subglyph.
-   *
-   *   p_flags ::
-   *     The subglyph flags, see @FT_SUBGLYPH_FLAG_XXX.
-   *
-   *   p_arg1 ::
-   *     The subglyph's first argument (if any).
-   *
-   *   p_arg2 ::
-   *     The subglyph's second argument (if any).
-   *
-   *   p_transform ::
-   *     The subglyph transformation (if any).
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   The values of `*p_arg1', `*p_arg2', and `*p_transform' must be
-   *   interpreted depending on the flags returned in `*p_flags'.  See the
-   *   TrueType specification for details.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_SubGlyph_Info( FT_GlyphSlot  glyph,
-                        FT_UInt       sub_index,
-                        FT_Int       *p_index,
-                        FT_UInt      *p_flags,
-                        FT_Int       *p_arg1,
-                        FT_Int       *p_arg2,
-                        FT_Matrix    *p_transform );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_FSTYPE_XXX                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flags used in the `fsType' field of the OS/2 table   */
-  /*    in a TrueType or OpenType font and the `FSType' entry in a         */
-  /*    PostScript font.  These bit flags are returned by                  */
-  /*    @FT_Get_FSType_Flags; they inform client applications of embedding */
-  /*    and subsetting restrictions associated with a font.                */
-  /*                                                                       */
-  /*    See                                                                */
-  /*    http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/FontPolicies.pdf */
-  /*    for more details.                                                  */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_FSTYPE_INSTALLABLE_EMBEDDING ::                                 */
-  /*      Fonts with no fsType bit set may be embedded and permanently     */
-  /*      installed on the remote system by an application.                */
-  /*                                                                       */
-  /*    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING ::                          */
-  /*      Fonts that have only this bit set must not be modified, embedded */
-  /*      or exchanged in any manner without first obtaining permission of */
-  /*      the font software copyright owner.                               */
-  /*                                                                       */
-  /*    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING ::                           */
-  /*      If this bit is set, the font may be embedded and temporarily     */
-  /*      loaded on the remote system.  Documents containing Preview &     */
-  /*      Print fonts must be opened `read-only'; no edits can be applied  */
-  /*      to the document.                                                 */
-  /*                                                                       */
-  /*    FT_FSTYPE_EDITABLE_EMBEDDING ::                                    */
-  /*      If this bit is set, the font may be embedded but must only be    */
-  /*      installed temporarily on other systems.  In contrast to Preview  */
-  /*      & Print fonts, documents containing editable fonts may be opened */
-  /*      for reading, editing is permitted, and changes may be saved.     */
-  /*                                                                       */
-  /*    FT_FSTYPE_NO_SUBSETTING ::                                         */
-  /*      If this bit is set, the font may not be subsetted prior to       */
-  /*      embedding.                                                       */
-  /*                                                                       */
-  /*    FT_FSTYPE_BITMAP_EMBEDDING_ONLY ::                                 */
-  /*      If this bit is set, only bitmaps contained in the font may be    */
-  /*      embedded; no outline data may be embedded.  If there are no      */
-  /*      bitmaps available in the font, then the font is unembeddable.    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The flags are ORed together, thus more than a single value can be  */
-  /*    returned.                                                          */
-  /*                                                                       */
-  /*    While the fsType flags can indicate that a font may be embedded, a */
-  /*    license with the font vendor may be separately required to use the */
-  /*    font in this way.                                                  */
-  /*                                                                       */
-#define FT_FSTYPE_INSTALLABLE_EMBEDDING         0x0000
-#define FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING  0x0002
-#define FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING   0x0004
-#define FT_FSTYPE_EDITABLE_EMBEDDING            0x0008
-#define FT_FSTYPE_NO_SUBSETTING                 0x0100
-#define FT_FSTYPE_BITMAP_EMBEDDING_ONLY         0x0200
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_FSType_Flags                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the fsType flags for a font.                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face object.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The fsType flags, @FT_FSTYPE_XXX.                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use this function rather than directly reading the `fs_type' field */
-  /*    in the @PS_FontInfoRec structure, which is only guaranteed to      */
-  /*    return the correct results for Type~1 fonts.                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.8                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UShort )
-  FT_Get_FSType_Flags( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    glyph_variants                                                     */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Glyph Variants                                                     */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The FreeType~2 interface to Unicode Ideographic Variation          */
-  /*    Sequences (IVS), using the SFNT cmap format~14.                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Many CJK characters have variant forms.  They are a sort of grey   */
-  /*    area somewhere between being totally irrelevant and semantically   */
-  /*    distinct; for this reason, the Unicode consortium decided to       */
-  /*    introduce Ideographic Variation Sequences (IVS), consisting of a   */
-  /*    Unicode base character and one of 240 variant selectors            */
-  /*    (U+E0100-U+E01EF), instead of further extending the already huge   */
-  /*    code range for CJK characters.                                     */
-  /*                                                                       */
-  /*    An IVS is registered and unique; for further details please refer  */
-  /*    to Unicode Technical Standard #37, the Ideographic Variation       */
-  /*    Database:                                                          */
-  /*                                                                       */
-  /*      http://www.unicode.org/reports/tr37/                             */
-  /*                                                                       */
-  /*    To date (November 2014), the character with the most variants is   */
-  /*    U+9089, having 32 such IVS.                                        */
-  /*                                                                       */
-  /*    Adobe and MS decided to support IVS with a new cmap subtable       */
-  /*    (format~14).  It is an odd subtable because it is not a mapping of */
-  /*    input code points to glyphs, but contains lists of all variants    */
-  /*    supported by the font.                                             */
-  /*                                                                       */
-  /*    A variant may be either `default' or `non-default'.  A default     */
-  /*    variant is the one you will get for that code point if you look it */
-  /*    up in the standard Unicode cmap.  A non-default variant is a       */
-  /*    different glyph.                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetCharVariantIndex                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the glyph index of a given character code as modified by    */
-  /*    the variation selector.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    charcode ::                                                        */
-  /*      The character code point in Unicode.                             */
-  /*                                                                       */
-  /*    variantSelector ::                                                 */
-  /*      The Unicode code point of the variation selector.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0~means either `undefined character code', or    */
-  /*    `undefined selector code', or `no variation selector cmap          */
-  /*    subtable', or `current CharMap is not Unicode'.                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If you use FreeType to manipulate the contents of font files       */
-  /*    directly, be aware that the glyph index returned by this function  */
-  /*    doesn't always correspond to the internal indices used within      */
-  /*    the file.  This is done to ensure that value~0 always corresponds  */
-  /*    to the `missing glyph'.                                            */
-  /*                                                                       */
-  /*    This function is only meaningful if                                */
-  /*      a) the font has a variation selector cmap sub table,             */
-  /*    and                                                                */
-  /*      b) the current charmap has a Unicode encoding.                   */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Face_GetCharVariantIndex( FT_Face   face,
-                               FT_ULong  charcode,
-                               FT_ULong  variantSelector );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetCharVariantIsDefault                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check whether this variant of this Unicode character is the one to */
-  /*    be found in the `cmap'.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    charcode ::                                                        */
-  /*      The character codepoint in Unicode.                              */
-  /*                                                                       */
-  /*    variantSelector ::                                                 */
-  /*      The Unicode codepoint of the variation selector.                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    1~if found in the standard (Unicode) cmap, 0~if found in the       */
-  /*    variation selector cmap, or -1 if it is not a variant.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is only meaningful if the font has a variation       */
-  /*    selector cmap subtable.                                            */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Int )
-  FT_Face_GetCharVariantIsDefault( FT_Face   face,
-                                   FT_ULong  charcode,
-                                   FT_ULong  variantSelector );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetVariantSelectors                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a zero-terminated list of Unicode variant selectors found   */
-  /*    in the font.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to an array of selector code points, or NULL if there is */
-  /*    no valid variant selector cmap subtable.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The last item in the array is~0; the array is owned by the         */
-  /*    @FT_Face object but can be overwritten or released on the next     */
-  /*    call to a FreeType function.                                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetVariantSelectors( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetVariantsOfChar                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a zero-terminated list of Unicode variant selectors found   */
-  /*    for the specified character code.                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    charcode ::                                                        */
-  /*      The character codepoint in Unicode.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to an array of variant selector code points that are     */
-  /*    active for the given character, or NULL if the corresponding list  */
-  /*    is empty.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The last item in the array is~0; the array is owned by the         */
-  /*    @FT_Face object but can be overwritten or released on the next     */
-  /*    call to a FreeType function.                                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetVariantsOfChar( FT_Face   face,
-                             FT_ULong  charcode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_GetCharsOfVariant                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a zero-terminated list of Unicode character codes found for */
-  /*    the specified variant selector.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      A handle to the source face object.                              */
-  /*                                                                       */
-  /*    variantSelector ::                                                 */
-  /*      The variant selector code point in Unicode.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A list of all the code points that are specified by this selector  */
-  /*    (both default and non-default codes are returned) or NULL if there */
-  /*    is no valid cmap or the variant selector is invalid.               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The last item in the array is~0; the array is owned by the         */
-  /*    @FT_Face object but can be overwritten or released on the next     */
-  /*    call to a FreeType function.                                       */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.6                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetCharsOfVariant( FT_Face   face,
-                             FT_ULong  variantSelector );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    computations                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Computations                                                       */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Crunching fixed numbers and vectors.                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various functions used to perform            */
-  /*    computations on 16.16 fixed-float numbers or 2d vectors.           */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_MulDiv                                                          */
-  /*    FT_MulFix                                                          */
-  /*    FT_DivFix                                                          */
-  /*    FT_RoundFix                                                        */
-  /*    FT_CeilFix                                                         */
-  /*    FT_FloorFix                                                        */
-  /*    FT_Vector_Transform                                                */
-  /*    FT_Matrix_Multiply                                                 */
-  /*    FT_Matrix_Invert                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulDiv                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation `(a*b)/c'   */
-  /*    with maximum accuracy (it uses a 64-bit intermediate integer       */
-  /*    whenever necessary).                                               */
-  /*                                                                       */
-  /*    This function isn't necessarily as fast as some processor specific */
-  /*    operations, but is at least completely portable.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.                                        */
-  /*    c :: The divisor.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/c'.  This function never traps when trying to */
-  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
-  /*    on the signs of `a' and `b'.                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_MulDiv( FT_Long  a,
-             FT_Long  b,
-             FT_Long  c );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulFix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation             */
-  /*    `(a*b)/0x10000' with maximum accuracy.  Most of the time this is   */
-  /*    used to multiply a given value by a 16.16 fixed-point factor.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
-  /*         possible (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/0x10000'.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function has been optimized for the case where the absolute   */
-  /*    value of `a' is less than 2048, and `b' is a 16.16 scaling factor. */
-  /*    As this happens mainly when scaling from notional units to         */
-  /*    fractional pixels in FreeType, it resulted in noticeable speed     */
-  /*    improvements between versions 2.x and 1.x.                         */
-  /*                                                                       */
-  /*    As a conclusion, always try to place a 16.16 factor as the         */
-  /*    _second_ argument of this function; this can make a great          */
-  /*    difference.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_MulFix( FT_Long  a,
-             FT_Long  b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_DivFix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation             */
-  /*    `(a*0x10000)/b' with maximum accuracy.  Most of the time, this is  */
-  /*    used to divide a given value by a 16.16 fixed-point factor.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The numerator.                                                */
-  /*    b :: The denominator.  Use a 16.16 factor here.                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*0x10000)/b'.                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_DivFix( FT_Long  a,
-             FT_Long  b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_RoundFix                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to round a 16.16 fixed number.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number to be rounded.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    `a' rounded to nearest 16.16 fixed integer, halfway cases away     */
-  /*    from zero.                                                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_RoundFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_CeilFix                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to compute the ceiling function of a   */
-  /*    16.16 fixed number.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number for which the ceiling function is to be computed.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    `a' rounded towards plus infinity.                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_CeilFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_FloorFix                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to compute the floor function of a     */
-  /*    16.16 fixed number.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number for which the floor function is to be computed.    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    `a' rounded towards minus infinity.                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_FloorFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Vector_Transform                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Transform a single vector through a 2x2 matrix.                    */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    vector :: The target vector to transform.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to the source 2x2 matrix.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The result is undefined if either `vector' or `matrix' is invalid. */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Transform( FT_Vector*        vec,
-                       const FT_Matrix*  matrix );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    version                                                            */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    FreeType Version                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Functions and macros related to FreeType versions.                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Note that those functions and macros are of limited use because    */
-  /*    even a new release of FreeType with only documentation changes     */
-  /*    increases the version number.                                      */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Library_Version                                                 */
-  /*                                                                       */
-  /*    FREETYPE_MAJOR                                                     */
-  /*    FREETYPE_MINOR                                                     */
-  /*    FREETYPE_PATCH                                                     */
-  /*                                                                       */
-  /*    FT_Face_CheckTrueTypePatents                                       */
-  /*    FT_Face_SetUnpatentedHinting                                       */
-  /*                                                                       */
-  /*    FREETYPE_XXX                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FREETYPE_XXX
-   *
-   * @description:
-   *   These three macros identify the FreeType source code version.
-   *   Use @FT_Library_Version to access them at runtime.
-   *
-   * @values:
-   *   FREETYPE_MAJOR :: The major version number.
-   *   FREETYPE_MINOR :: The minor version number.
-   *   FREETYPE_PATCH :: The patch level.
-   *
-   * @note:
-   *   The version number of FreeType if built as a dynamic link library
-   *   with the `libtool' package is _not_ controlled by these three
-   *   macros.
-   *
-   */
-#define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  6
-#define FREETYPE_PATCH  3
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Library_Version                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the version of the FreeType library being used.  This is    */
-  /*    useful when dynamically linking to the library, since one cannot   */
-  /*    use the macros @FREETYPE_MAJOR, @FREETYPE_MINOR, and               */
-  /*    @FREETYPE_PATCH.                                                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A source library handle.                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amajor  :: The major version number.                               */
-  /*                                                                       */
-  /*    aminor  :: The minor version number.                               */
-  /*                                                                       */
-  /*    apatch  :: The patch version number.                               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The reason why this function takes a `library' argument is because */
-  /*    certain programs implement library initialization in a custom way  */
-  /*    that doesn't use @FT_Init_FreeType.                                */
-  /*                                                                       */
-  /*    In such cases, the library version might not be available before   */
-  /*    the library object has been created.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Library_Version( FT_Library   library,
-                      FT_Int      *amajor,
-                      FT_Int      *aminor,
-                      FT_Int      *apatch );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_CheckTrueTypePatents                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Deprecated, does nothing.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A face handle.                                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Always returns false.                                              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since May 2010, TrueType hinting is no longer patented.            */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.5                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Bool )
-  FT_Face_CheckTrueTypePatents( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Face_SetUnpatentedHinting                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Deprecated, does nothing.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A face handle.                                            */
-  /*                                                                       */
-  /*    value :: New boolean setting.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Always returns false.                                              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since May 2010, TrueType hinting is no longer patented.            */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.3.5                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Bool )
-  FT_Face_SetUnpatentedHinting( FT_Face  face,
-                                FT_Bool  value );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FREETYPE_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftadvanc.h b/dependencies2013/win32/include/freetype/ftadvanc.h
deleted file mode 100644
index 023dd84b..00000000
--- a/dependencies2013/win32/include/freetype/ftadvanc.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftadvanc.h                                                             */
-/*                                                                         */
-/*    Quick computation of advance widths (specification only).            */
-/*                                                                         */
-/*  Copyright 2008-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTADVANC_H_
-#define FTADVANC_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   quick_advance
-   *
-   * @title:
-   *   Quick retrieval of advance values
-   *
-   * @abstract:
-   *   Retrieve horizontal and vertical advance values without processing
-   *   glyph outlines, if possible.
-   *
-   * @description:
-   *   This section contains functions to quickly extract advance values
-   *   without handling glyph outlines, if possible.
-   *
-   * @order:
-   *   FT_Get_Advance
-   *   FT_Get_Advances
-   *
-   */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    FT_ADVANCE_FLAG_FAST_ONLY                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A bit-flag to be OR-ed with the `flags' parameter of the           */
-  /*    @FT_Get_Advance and @FT_Get_Advances functions.                    */
-  /*                                                                       */
-  /*    If set, it indicates that you want these functions to fail if the  */
-  /*    corresponding hinting mode or font driver doesn't allow for very   */
-  /*    quick advance computation.                                         */
-  /*                                                                       */
-  /*    Typically, glyphs that are either unscaled, unhinted, bitmapped,   */
-  /*    or light-hinted can have their advance width computed very         */
-  /*    quickly.                                                           */
-  /*                                                                       */
-  /*    Normal and bytecode hinted modes that require loading, scaling,    */
-  /*    and hinting of the glyph outline, are extremely slow by            */
-  /*    comparison.                                                        */
-  /*                                                                       */
-#define FT_ADVANCE_FLAG_FAST_ONLY  0x20000000L
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Advance                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the advance value of a given glyph outline in an          */
-  /*    @FT_Face.                                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: The source @FT_Face handle.                          */
-  /*                                                                       */
-  /*    gindex     :: The glyph index.                                     */
-  /*                                                                       */
-  /*    load_flags :: A set of bit flags similar to those used when        */
-  /*                  calling @FT_Load_Glyph, used to determine what kind  */
-  /*                  of advances you need.                                */
-  /* <Output>                                                              */
-  /*    padvance :: The advance value.  If scaling is performed (based on  */
-  /*                the value of `load_flags'), the advance value is in    */
-  /*                16.16 format.  Otherwise, it is in font units.         */
-  /*                                                                       */
-  /*                If @FT_LOAD_VERTICAL_LAYOUT is set, this is the        */
-  /*                vertical advance corresponding to a vertical layout.   */
-  /*                Otherwise, it is the horizontal advance in a           */
-  /*                horizontal layout.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function may fail if you use @FT_ADVANCE_FLAG_FAST_ONLY and   */
-  /*    if the corresponding font backend doesn't have a quick way to      */
-  /*    retrieve the advances.                                             */
-  /*                                                                       */
-  /*    A scaled advance is returned in 16.16 format but isn't transformed */
-  /*    by the affine transformation specified by @FT_Set_Transform.       */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Advance( FT_Face    face,
-                  FT_UInt    gindex,
-                  FT_Int32   load_flags,
-                  FT_Fixed  *padvance );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Advances                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the advance values of several glyph outlines in an        */
-  /*    @FT_Face.                                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: The source @FT_Face handle.                         */
-  /*                                                                       */
-  /*    start       :: The first glyph index.                              */
-  /*                                                                       */
-  /*    count       :: The number of advance values you want to retrieve.  */
-  /*                                                                       */
-  /*    load_flags  :: A set of bit flags similar to those used when       */
-  /*                   calling @FT_Load_Glyph.                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    padvance :: The advance values.  This array, to be provided by the */
-  /*                caller, must contain at least `count' elements.        */
-  /*                                                                       */
-  /*                If scaling is performed (based on the value of         */
-  /*                `load_flags'), the advance values are in 16.16 format. */
-  /*                Otherwise, they are in font units.                     */
-  /*                                                                       */
-  /*                If @FT_LOAD_VERTICAL_LAYOUT is set, these are the      */
-  /*                vertical advances corresponding to a vertical layout.  */
-  /*                Otherwise, they are the horizontal advances in a       */
-  /*                horizontal layout.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function may fail if you use @FT_ADVANCE_FLAG_FAST_ONLY and   */
-  /*    if the corresponding font backend doesn't have a quick way to      */
-  /*    retrieve the advances.                                             */
-  /*                                                                       */
-  /*    Scaled advances are returned in 16.16 format but aren't            */
-  /*    transformed by the affine transformation specified by              */
-  /*    @FT_Set_Transform.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Advances( FT_Face    face,
-                   FT_UInt    start,
-                   FT_UInt    count,
-                   FT_Int32   load_flags,
-                   FT_Fixed  *padvances );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTADVANC_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftautoh.h b/dependencies2013/win32/include/freetype/ftautoh.h
deleted file mode 100644
index 40c8003c..00000000
--- a/dependencies2013/win32/include/freetype/ftautoh.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftautoh.h                                                              */
-/*                                                                         */
-/*    FreeType API for controlling the auto-hinter (specification only).   */
-/*                                                                         */
-/*  Copyright 2012-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTAUTOH_H_
-#define FTAUTOH_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   auto_hinter
-   *
-   * @title:
-   *   The auto-hinter
-   *
-   * @abstract:
-   *   Controlling the auto-hinting module.
-   *
-   * @description:
-   *   While FreeType's auto-hinter doesn't expose API functions by itself,
-   *   it is possible to control its behaviour with @FT_Property_Set and
-   *   @FT_Property_Get.  The following lists the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   Note that the auto-hinter's module name is `autofitter' for
-   *   historical reasons.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   glyph-to-script-map
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   The auto-hinter provides various script modules to hint glyphs.
-   *   Examples of supported scripts are Latin or CJK.  Before a glyph is
-   *   auto-hinted, the Unicode character map of the font gets examined, and
-   *   the script is then determined based on Unicode character ranges, see
-   *   below.
-   *
-   *   OpenType fonts, however, often provide much more glyphs than
-   *   character codes (small caps, superscripts, ligatures, swashes, etc.),
-   *   to be controlled by so-called `features'.  Handling OpenType features
-   *   can be quite complicated and thus needs a separate library on top of
-   *   FreeType.
-   *
-   *   The mapping between glyph indices and scripts (in the auto-hinter
-   *   sense, see the @FT_AUTOHINTER_SCRIPT_XXX values) is stored as an
-   *   array with `num_glyphs' elements, as found in the font's @FT_Face
-   *   structure.  The `glyph-to-script-map' property returns a pointer to
-   *   this array, which can be modified as needed.  Note that the
-   *   modification should happen before the first glyph gets processed by
-   *   the auto-hinter so that the global analysis of the font shapes
-   *   actually uses the modified mapping.
-   *
-   *   The following example code demonstrates how to access it (omitting
-   *   the error handling).
-   *
-   *   {
-   *     FT_Library                library;
-   *     FT_Face                   face;
-   *     FT_Prop_GlyphToScriptMap  prop;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *     FT_New_Face( library, "foo.ttf", 0, &face );
-   *
-   *     prop.face = face;
-   *
-   *     FT_Property_Get( library, "autofitter",
-   *                               "glyph-to-script-map", &prop );
-   *
-   *     // adjust `prop.map' as needed right here
-   *
-   *     FT_Load_Glyph( face, ..., FT_LOAD_FORCE_AUTOHINT );
-   *   }
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_AUTOHINTER_SCRIPT_XXX
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   A list of constants used for the @glyph-to-script-map property to
-   *   specify the script submodule the auto-hinter should use for hinting a
-   *   particular glyph.
-   *
-   * @values:
-   *   FT_AUTOHINTER_SCRIPT_NONE ::
-   *     Don't auto-hint this glyph.
-   *
-   *   FT_AUTOHINTER_SCRIPT_LATIN ::
-   *     Apply the latin auto-hinter.  For the auto-hinter, `latin' is a
-   *     very broad term, including Cyrillic and Greek also since characters
-   *     from those scripts share the same design constraints.
-   *
-   *     By default, characters from the following Unicode ranges are
-   *     assigned to this submodule.
-   *
-   *     {
-   *       U+0020 - U+007F  // Basic Latin (no control characters)
-   *       U+00A0 - U+00FF  // Latin-1 Supplement (no control characters)
-   *       U+0100 - U+017F  // Latin Extended-A
-   *       U+0180 - U+024F  // Latin Extended-B
-   *       U+0250 - U+02AF  // IPA Extensions
-   *       U+02B0 - U+02FF  // Spacing Modifier Letters
-   *       U+0300 - U+036F  // Combining Diacritical Marks
-   *       U+0370 - U+03FF  // Greek and Coptic
-   *       U+0400 - U+04FF  // Cyrillic
-   *       U+0500 - U+052F  // Cyrillic Supplement
-   *       U+1D00 - U+1D7F  // Phonetic Extensions
-   *       U+1D80 - U+1DBF  // Phonetic Extensions Supplement
-   *       U+1DC0 - U+1DFF  // Combining Diacritical Marks Supplement
-   *       U+1E00 - U+1EFF  // Latin Extended Additional
-   *       U+1F00 - U+1FFF  // Greek Extended
-   *       U+2000 - U+206F  // General Punctuation
-   *       U+2070 - U+209F  // Superscripts and Subscripts
-   *       U+20A0 - U+20CF  // Currency Symbols
-   *       U+2150 - U+218F  // Number Forms
-   *       U+2460 - U+24FF  // Enclosed Alphanumerics
-   *       U+2C60 - U+2C7F  // Latin Extended-C
-   *       U+2DE0 - U+2DFF  // Cyrillic Extended-A
-   *       U+2E00 - U+2E7F  // Supplemental Punctuation
-   *       U+A640 - U+A69F  // Cyrillic Extended-B
-   *       U+A720 - U+A7FF  // Latin Extended-D
-   *       U+FB00 - U+FB06  // Alphab. Present. Forms (Latin Ligatures)
-   *      U+1D400 - U+1D7FF // Mathematical Alphanumeric Symbols
-   *      U+1F100 - U+1F1FF // Enclosed Alphanumeric Supplement
-   *     }
-   *
-   *   FT_AUTOHINTER_SCRIPT_CJK ::
-   *     Apply the CJK auto-hinter, covering Chinese, Japanese, Korean, old
-   *     Vietnamese, and some other scripts.
-   *
-   *     By default, characters from the following Unicode ranges are
-   *     assigned to this submodule.
-   *
-   *     {
-   *       U+1100 - U+11FF  // Hangul Jamo
-   *       U+2E80 - U+2EFF  // CJK Radicals Supplement
-   *       U+2F00 - U+2FDF  // Kangxi Radicals
-   *       U+2FF0 - U+2FFF  // Ideographic Description Characters
-   *       U+3000 - U+303F  // CJK Symbols and Punctuation
-   *       U+3040 - U+309F  // Hiragana
-   *       U+30A0 - U+30FF  // Katakana
-   *       U+3100 - U+312F  // Bopomofo
-   *       U+3130 - U+318F  // Hangul Compatibility Jamo
-   *       U+3190 - U+319F  // Kanbun
-   *       U+31A0 - U+31BF  // Bopomofo Extended
-   *       U+31C0 - U+31EF  // CJK Strokes
-   *       U+31F0 - U+31FF  // Katakana Phonetic Extensions
-   *       U+3200 - U+32FF  // Enclosed CJK Letters and Months
-   *       U+3300 - U+33FF  // CJK Compatibility
-   *       U+3400 - U+4DBF  // CJK Unified Ideographs Extension A
-   *       U+4DC0 - U+4DFF  // Yijing Hexagram Symbols
-   *       U+4E00 - U+9FFF  // CJK Unified Ideographs
-   *       U+A960 - U+A97F  // Hangul Jamo Extended-A
-   *       U+AC00 - U+D7AF  // Hangul Syllables
-   *       U+D7B0 - U+D7FF  // Hangul Jamo Extended-B
-   *       U+F900 - U+FAFF  // CJK Compatibility Ideographs
-   *       U+FE10 - U+FE1F  // Vertical forms
-   *       U+FE30 - U+FE4F  // CJK Compatibility Forms
-   *       U+FF00 - U+FFEF  // Halfwidth and Fullwidth Forms
-   *      U+1B000 - U+1B0FF // Kana Supplement
-   *      U+1D300 - U+1D35F // Tai Xuan Hing Symbols
-   *      U+1F200 - U+1F2FF // Enclosed Ideographic Supplement
-   *      U+20000 - U+2A6DF // CJK Unified Ideographs Extension B
-   *      U+2A700 - U+2B73F // CJK Unified Ideographs Extension C
-   *      U+2B740 - U+2B81F // CJK Unified Ideographs Extension D
-   *      U+2F800 - U+2FA1F // CJK Compatibility Ideographs Supplement
-   *     }
-   *
-   *   FT_AUTOHINTER_SCRIPT_INDIC ::
-   *     Apply the indic auto-hinter, covering all major scripts from the
-   *     Indian sub-continent and some other related scripts like Thai, Lao,
-   *     or Tibetan.
-   *
-   *     By default, characters from the following Unicode ranges are
-   *     assigned to this submodule.
-   *
-   *     {
-   *       U+0900 - U+0DFF  // Indic Range
-   *       U+0F00 - U+0FFF  // Tibetan
-   *       U+1900 - U+194F  // Limbu
-   *       U+1B80 - U+1BBF  // Sundanese
-   *       U+A800 - U+A82F  // Syloti Nagri
-   *       U+ABC0 - U+ABFF  // Meetei Mayek
-   *      U+11800 - U+118DF // Sharada
-   *     }
-   *
-   *     Note that currently Indic support is rudimentary only, missing blue
-   *     zone support.
-   *
-   */
-#define FT_AUTOHINTER_SCRIPT_NONE   0
-#define FT_AUTOHINTER_SCRIPT_LATIN  1
-#define FT_AUTOHINTER_SCRIPT_CJK    2
-#define FT_AUTOHINTER_SCRIPT_INDIC  3
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Prop_GlyphToScriptMap
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   The data exchange structure for the @glyph-to-script-map property.
-   *
-   */
-  typedef struct  FT_Prop_GlyphToScriptMap_
-  {
-    FT_Face     face;
-    FT_UShort*  map;
-
-  } FT_Prop_GlyphToScriptMap;
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   fallback-script
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   If no auto-hinter script module can be assigned to a glyph, a
-   *   fallback script gets assigned to it (see also the
-   *   @glyph-to-script-map property).  By default, this is
-   *   @FT_AUTOHINTER_SCRIPT_CJK.  Using the `fallback-script' property,
-   *   this fallback value can be changed.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_UInt     fallback_script = FT_AUTOHINTER_SCRIPT_NONE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "autofitter",
-   *                               "fallback-script", &fallback_script );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   *   It's important to use the right timing for changing this value: The
-   *   creation of the glyph-to-script map that eventually uses the
-   *   fallback script value gets triggered either by setting or reading a
-   *   face-specific property like @glyph-to-script-map, or by auto-hinting
-   *   any glyph from that face.  In particular, if you have already created
-   *   an @FT_Face structure but not loaded any glyph (using the
-   *   auto-hinter), a change of the fallback script will affect this face.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   default-script
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   If FreeType gets compiled with FT_CONFIG_OPTION_USE_HARFBUZZ to make
-   *   the HarfBuzz library access OpenType features for getting better
-   *   glyph coverages, this property sets the (auto-fitter) script to be
-   *   used for the default (OpenType) script data of a font's GSUB table.
-   *   Features for the default script are intended for all scripts not
-   *   explicitly handled in GSUB; an example is a `dlig' feature,
-   *   containing the combination of the characters `T', `E', and `L' to
-   *   form a `TEL' ligature.
-   *
-   *   By default, this is @FT_AUTOHINTER_SCRIPT_LATIN.  Using the
-   *   `default-script' property, this default value can be changed.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_UInt     default_script = FT_AUTOHINTER_SCRIPT_NONE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "autofitter",
-   *                               "default-script", &default_script );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   *   It's important to use the right timing for changing this value: The
-   *   creation of the glyph-to-script map that eventually uses the
-   *   default script value gets triggered either by setting or reading a
-   *   face-specific property like @glyph-to-script-map, or by auto-hinting
-   *   any glyph from that face.  In particular, if you have already created
-   *   an @FT_Face structure but not loaded any glyph (using the
-   *   auto-hinter), a change of the default script will affect this face.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   increase-x-height
-   *
-   * @description:
-   *   For ppem values in the range 6~<= ppem <= `increase-x-height', round
-   *   up the font's x~height much more often than normally.  If the value
-   *   is set to~0, which is the default, this feature is switched off.  Use
-   *   this property to improve the legibility of small font sizes if
-   *   necessary.
-   *
-   *   {
-   *     FT_Library               library;
-   *     FT_Face                  face;
-   *     FT_Prop_IncreaseXHeight  prop;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *     FT_New_Face( library, "foo.ttf", 0, &face );
-   *     FT_Set_Char_Size( face, 10 * 64, 0, 72, 0 );
-   *
-   *     prop.face  = face;
-   *     prop.limit = 14;
-   *
-   *     FT_Property_Set( library, "autofitter",
-   *                               "increase-x-height", &prop );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   *   Set this value right after calling @FT_Set_Char_Size, but before
-   *   loading any glyph (using the auto-hinter).
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Prop_IncreaseXHeight
-   *
-   * @description:
-   *   The data exchange structure for the @increase-x-height property.
-   *
-   */
-  typedef struct  FT_Prop_IncreaseXHeight_
-  {
-    FT_Face  face;
-    FT_UInt  limit;
-
-  } FT_Prop_IncreaseXHeight;
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   warping
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   If FreeType gets compiled with option AF_CONFIG_OPTION_USE_WARPER to
-   *   activate the warp hinting code in the auto-hinter, this property
-   *   switches warping on and off.
-   *
-   *   Warping only works in `light' auto-hinting mode.  The idea of the
-   *   code is to slightly scale and shift a glyph along the non-hinted
-   *   dimension (which is usually the horizontal axis) so that as much of
-   *   its segments are aligned (more or less) to the grid.  To find out a
-   *   glyph's optimal scaling and shifting value, various parameter
-   *   combinations are tried and scored.
-   *
-   *   By default, warping is off.  The example below shows how to switch on
-   *   warping (omitting the error handling).
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Bool     warping = 1;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "autofitter",
-   *                               "warping", &warping );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   *   The warping code can also change advance widths.  Have a look at the
-   *   `lsb_delta' and `rsb_delta' fields in the @FT_GlyphSlotRec structure
-   *   for details on improving inter-glyph distances while rendering.
-   *
-   *   Since warping is a global property of the auto-hinter it is best to
-   *   change its value before rendering any face.  Otherwise, you should
-   *   reload all faces that get auto-hinted in `light' hinting mode.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   no-stem-darkening[autofit]
-   *
-   * @description:
-   *   *Experimental* *only,* *requires* *linear* *alpha* *blending* *and*
-   *   *gamma* *correction*
-   *
-   *   Stem darkening emboldens glyphs at smaller sizes to make them more
-   *   readable on common low-DPI screens when using linear alpha blending
-   *   and gamma correction, see @FT_Render_Glyph.  When not using linear
-   *   alpha blending and gamma correction, glyphs will appear heavy and
-   *   fuzzy!
-   *
-   *   Gamma correction essentially lightens fonts since shades of grey are
-   *   shifted to higher pixel values (=~higher brightness) to match the
-   *   original intention to the reality of our screens.  The side-effect is
-   *   that glyphs `thin out'.  Mac OS~X and Adobe's proprietary font
-   *   rendering library implement a counter-measure: stem darkening at
-   *   smaller sizes where shades of gray dominate.  By emboldening a glyph
-   *   slightly in relation to its pixel size, individual pixels get higher
-   *   coverage of filled-in outlines and are therefore `blacker'.  This
-   *   counteracts the `thinning out' of glyphs, making text remain readable
-   *   at smaller sizes.  All glyphs that pass through the auto-hinter will
-   *   be emboldened unless this property is set to TRUE.
-   *
-   *   See the description of the CFF driver for algorithmic details.  Total
-   *   consistency with the CFF driver is currently not achieved because the
-   *   emboldening method differs and glyphs must be scaled down on the
-   *   Y-axis to keep outline points inside their precomputed blue zones.
-   *   The smaller the size (especially 9ppem and down), the higher the loss
-   *   of emboldening versus the CFF driver.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   darkening-parameters[autofit]
-   *
-   * @description:
-   *   *Experimental* *only*
-   *
-   *   See the description of the CFF driver for details.  This
-   *   implementation appropriates the
-   *   CFF_CONFIG_OPTION_DARKENING_PARAMETER_* #defines for consistency.
-   *   Note the differences described in @no-stem-darkening[autofit].
-   *
-   */
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTAUTOH_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftbbox.h b/dependencies2013/win32/include/freetype/ftbbox.h
deleted file mode 100644
index 2a4d2144..00000000
--- a/dependencies2013/win32/include/freetype/ftbbox.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbbox.h                                                               */
-/*                                                                         */
-/*    FreeType exact bbox computation (specification).                     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This component has a _single_ role: to compute exact outline bounding */
-  /* boxes.                                                                */
-  /*                                                                       */
-  /* It is separated from the rest of the engine for various technical     */
-  /* reasons.  It may well be integrated in `ftoutln' later.               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTBBOX_H_
-#define FTBBOX_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_BBox                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Compute the exact bounding box of an outline.  This is slower      */
-  /*    than computing the control box.  However, it uses an advanced      */
-  /*    algorithm that returns _very_ quickly when the two boxes           */
-  /*    coincide.  Otherwise, the outline Bézier arcs are traversed to     */
-  /*    extract their extrema.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A pointer to the source outline.                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    abbox   :: The outline's exact bounding box.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the font is tricky and the glyph has been loaded with           */
-  /*    @FT_LOAD_NO_SCALE, the resulting BBox is meaningless.  To get      */
-  /*    reasonable values for the BBox it is necessary to load the glyph   */
-  /*    at a large ppem value (so that the hinting instructions can        */
-  /*    properly shift and scale the subglyphs), then extracting the BBox, */
-  /*    which can be eventually converted back to font units.              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_BBox( FT_Outline*  outline,
-                       FT_BBox     *abbox );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTBBOX_H_ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
diff --git a/dependencies2013/win32/include/freetype/ftbdf.h b/dependencies2013/win32/include/freetype/ftbdf.h
deleted file mode 100644
index 016dba08..00000000
--- a/dependencies2013/win32/include/freetype/ftbdf.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbdf.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing BDF-specific strings (specification).     */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTBDF_H_
-#define FTBDF_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bdf_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    BDF and PCF Files                                                  */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    BDF and PCF specific API.                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of functions specific to BDF */
-  /*    and PCF fonts.                                                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /**********************************************************************
-   *
-   * @enum:
-   *    BDF_PropertyType
-   *
-   * @description:
-   *    A list of BDF property types.
-   *
-   * @values:
-   *    BDF_PROPERTY_TYPE_NONE ::
-   *      Value~0 is used to indicate a missing property.
-   *
-   *    BDF_PROPERTY_TYPE_ATOM ::
-   *      Property is a string atom.
-   *
-   *    BDF_PROPERTY_TYPE_INTEGER ::
-   *      Property is a 32-bit signed integer.
-   *
-   *    BDF_PROPERTY_TYPE_CARDINAL ::
-   *      Property is a 32-bit unsigned integer.
-   */
-  typedef enum  BDF_PropertyType_
-  {
-    BDF_PROPERTY_TYPE_NONE     = 0,
-    BDF_PROPERTY_TYPE_ATOM     = 1,
-    BDF_PROPERTY_TYPE_INTEGER  = 2,
-    BDF_PROPERTY_TYPE_CARDINAL = 3
-
-  } BDF_PropertyType;
-
-
-  /**********************************************************************
-   *
-   * @type:
-   *    BDF_Property
-   *
-   * @description:
-   *    A handle to a @BDF_PropertyRec structure to model a given
-   *    BDF/PCF property.
-   */
-  typedef struct BDF_PropertyRec_*  BDF_Property;
-
-
- /**********************************************************************
-  *
-  * @struct:
-  *    BDF_PropertyRec
-  *
-  * @description:
-  *    This structure models a given BDF/PCF property.
-  *
-  * @fields:
-  *    type ::
-  *      The property type.
-  *
-  *    u.atom ::
-  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.  May be
-  *      NULL, indicating an empty string.
-  *
-  *    u.integer ::
-  *      A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
-  *
-  *    u.cardinal ::
-  *      An unsigned integer, if type is @BDF_PROPERTY_TYPE_CARDINAL.
-  */
-  typedef struct  BDF_PropertyRec_
-  {
-    BDF_PropertyType  type;
-    union {
-      const char*     atom;
-      FT_Int32        integer;
-      FT_UInt32       cardinal;
-
-    } u;
-
-  } BDF_PropertyRec;
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_BDF_Charset_ID
-  *
-  * @description:
-  *    Retrieve a BDF font character set identity, according to
-  *    the BDF specification.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  * @output:
-  *    acharset_encoding ::
-  *       Charset encoding, as a C~string, owned by the face.
-  *
-  *    acharset_registry ::
-  *       Charset registry, as a C~string, owned by the face.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function only works with BDF faces, returning an error otherwise.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Charset_ID( FT_Face       face,
-                         const char*  *acharset_encoding,
-                         const char*  *acharset_registry );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_BDF_Property
-  *
-  * @description:
-  *    Retrieve a BDF property from a BDF or PCF font file.
-  *
-  * @input:
-  *    face :: A handle to the input face.
-  *
-  *    name :: The property name.
-  *
-  * @output:
-  *    aproperty :: The property.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function works with BDF _and_ PCF fonts.  It returns an error
-  *   otherwise.  It also returns an error if the property is not in the
-  *   font.
-  *
-  *   A `property' is a either key-value pair within the STARTPROPERTIES
-  *   ... ENDPROPERTIES block of a BDF font or a key-value pair from the
-  *   `info->props' array within a `FontRec' structure of a PCF font.
-  *
-  *   Integer properties are always stored as `signed' within PCF fonts;
-  *   consequently, @BDF_PROPERTY_TYPE_CARDINAL is a possible return value
-  *   for BDF fonts only.
-  *
-  *   In case of error, `aproperty->type' is always set to
-  *   @BDF_PROPERTY_TYPE_NONE.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Property( FT_Face           face,
-                       const char*       prop_name,
-                       BDF_PropertyRec  *aproperty );
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* FTBDF_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftbitmap.h b/dependencies2013/win32/include/freetype/ftbitmap.h
deleted file mode 100644
index 0eac7b9d..00000000
--- a/dependencies2013/win32/include/freetype/ftbitmap.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbitmap.h                                                             */
-/*                                                                         */
-/*    FreeType utility functions for bitmaps (specification).              */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTBITMAP_H_
-#define FTBITMAP_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bitmap_handling                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Bitmap Handling                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Handling FT_Bitmap objects.                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains functions for handling @FT_Bitmap objects.   */
-  /*    Note that none of the functions changes the bitmap's `flow' (as    */
-  /*    indicated by the sign of the `pitch' field in `FT_Bitmap').        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Init                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Initialize a pointer to an @FT_Bitmap structure.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    abitmap :: A pointer to the bitmap structure.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    A deprecated name for the same function is `FT_Bitmap_New'.        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Bitmap_Init( FT_Bitmap  *abitmap );
-
-
-  /* deprecated */
-  FT_EXPORT( void )
-  FT_Bitmap_New( FT_Bitmap  *abitmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Copy                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Copy a bitmap into another one.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /*    source  :: A handle to the source bitmap.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target  :: A handle to the target bitmap.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Copy( FT_Library        library,
-                  const FT_Bitmap  *source,
-                  FT_Bitmap        *target);
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Embolden                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Embolden a bitmap.  The new bitmap will be about `xStrength'       */
-  /*    pixels wider and `yStrength' pixels higher.  The left and bottom   */
-  /*    borders are kept unchanged.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: A handle to a library object.                         */
-  /*                                                                       */
-  /*    xStrength :: How strong the glyph is emboldened horizontally.      */
-  /*                 Expressed in 26.6 pixel format.                       */
-  /*                                                                       */
-  /*    yStrength :: How strong the glyph is emboldened vertically.        */
-  /*                 Expressed in 26.6 pixel format.                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    bitmap    :: A handle to the target bitmap.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The current implementation restricts `xStrength' to be less than   */
-  /*    or equal to~8 if bitmap is of pixel_mode @FT_PIXEL_MODE_MONO.      */
-  /*                                                                       */
-  /*    If you want to embolden the bitmap owned by a @FT_GlyphSlotRec,    */
-  /*    you should call @FT_GlyphSlot_Own_Bitmap on the slot first.        */
-  /*                                                                       */
-  /*    Bitmaps in @FT_PIXEL_MODE_GRAY2 and @FT_PIXEL_MODE_GRAY@ format    */
-  /*    are converted to @FT_PIXEL_MODE_GRAY format (i.e., 8bpp).          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Embolden( FT_Library  library,
-                      FT_Bitmap*  bitmap,
-                      FT_Pos      xStrength,
-                      FT_Pos      yStrength );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Convert                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, 8bpp or 32bpp */
-  /*    to a bitmap object with depth 8bpp, making the number of used      */
-  /*    bytes line (a.k.a. the `pitch') a multiple of `alignment'.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: A handle to a library object.                         */
-  /*                                                                       */
-  /*    source    :: The source bitmap.                                    */
-  /*                                                                       */
-  /*    alignment :: The pitch of the bitmap is a multiple of this         */
-  /*                 parameter.  Common values are 1, 2, or 4.             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target    :: The target bitmap.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    It is possible to call @FT_Bitmap_Convert multiple times without   */
-  /*    calling @FT_Bitmap_Done (the memory is simply reallocated).        */
-  /*                                                                       */
-  /*    Use @FT_Bitmap_Done to finally remove the bitmap object.           */
-  /*                                                                       */
-  /*    The `library' argument is taken to have access to FreeType's       */
-  /*    memory handling functions.                                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Convert( FT_Library        library,
-                     const FT_Bitmap  *source,
-                     FT_Bitmap        *target,
-                     FT_Int            alignment );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GlyphSlot_Own_Bitmap                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Make sure that a glyph slot owns `slot->bitmap'.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot :: The glyph slot.                                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is to be used in combination with                    */
-  /*    @FT_Bitmap_Embolden.                                               */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GlyphSlot_Own_Bitmap( FT_GlyphSlot  slot );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Bitmap_Done                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a bitmap object initialized with @FT_Bitmap_Init.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /*    bitmap  :: The bitmap object to be freed.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `library' argument is taken to have access to FreeType's       */
-  /*    memory handling functions.                                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Done( FT_Library  library,
-                  FT_Bitmap  *bitmap );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTBITMAP_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftbzip2.h b/dependencies2013/win32/include/freetype/ftbzip2.h
deleted file mode 100644
index b7f2eee8..00000000
--- a/dependencies2013/win32/include/freetype/ftbzip2.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbzip2.h                                                              */
-/*                                                                         */
-/*    Bzip2-compressed stream support.                                     */
-/*                                                                         */
-/*  Copyright 2010-2016 by                                                 */
-/*  Joel Klinghed.                                                         */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTBZIP2_H_
-#define FTBZIP2_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bzip2                                                              */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    BZIP2 Streams                                                      */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using bzip2-compressed font files.                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Bzip2-specific functions. */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenBzip2
-  *
-  * @description:
-  *   Open a new stream to parse bzip2-compressed font files.  This is
-  *   mainly used to support the compressed `*.pcf.bz2' fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream ::
-  *     The target embedding stream.
-  *
-  *   source ::
-  *     The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function `FT_Stream_Close' on the new stream will
-  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream.
-  *
-  *   In certain builds of the library, bzip2 compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a bzip2 compressed stream
-  *   from it and re-open the face with it.
-  *
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with bzip2 support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenBzip2( FT_Stream  stream,
-                       FT_Stream  source );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTBZIP2_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftcache.h b/dependencies2013/win32/include/freetype/ftcache.h
deleted file mode 100644
index 6c9f2c42..00000000
--- a/dependencies2013/win32/include/freetype/ftcache.h
+++ /dev/null
@@ -1,1057 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcache.h                                                              */
-/*                                                                         */
-/*    FreeType Cache subsystem (specification).                            */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTCACHE_H_
-#define FTCACHE_H_
-
-
-#include <ft2build.h>
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************
-   *
-   * <Section>
-   *    cache_subsystem
-   *
-   * <Title>
-   *    Cache Sub-System
-   *
-   * <Abstract>
-   *    How to cache face, size, and glyph data with FreeType~2.
-   *
-   * <Description>
-   *   This section describes the FreeType~2 cache sub-system, which is used
-   *   to limit the number of concurrently opened @FT_Face and @FT_Size
-   *   objects, as well as caching information like character maps and glyph
-   *   images while limiting their maximum memory usage.
-   *
-   *   Note that all types and functions begin with the `FTC_' prefix.
-   *
-   *   The cache is highly portable and thus doesn't know anything about the
-   *   fonts installed on your system, or how to access them.  This implies
-   *   the following scheme:
-   *
-   *   First, available or installed font faces are uniquely identified by
-   *   @FTC_FaceID values, provided to the cache by the client.  Note that
-   *   the cache only stores and compares these values, and doesn't try to
-   *   interpret them in any way.
-   *
-   *   Second, the cache calls, only when needed, a client-provided function
-   *   to convert an @FTC_FaceID into a new @FT_Face object.  The latter is
-   *   then completely managed by the cache, including its termination
-   *   through @FT_Done_Face.  To monitor termination of face objects, the
-   *   finalizer callback in the `generic' field of the @FT_Face object can
-   *   be used, which might also be used to store the @FTC_FaceID of the
-   *   face.
-   *
-   *   Clients are free to map face IDs to anything else.  The most simple
-   *   usage is to associate them to a (pathname,face_index) pair that is
-   *   used to call @FT_New_Face.  However, more complex schemes are also
-   *   possible.
-   *
-   *   Note that for the cache to work correctly, the face ID values must be
-   *   *persistent*, which means that the contents they point to should not
-   *   change at runtime, or that their value should not become invalid.
-   *
-   *   If this is unavoidable (e.g., when a font is uninstalled at runtime),
-   *   you should call @FTC_Manager_RemoveFaceID as soon as possible, to let
-   *   the cache get rid of any references to the old @FTC_FaceID it may
-   *   keep internally.  Failure to do so will lead to incorrect behaviour
-   *   or even crashes.
-   *
-   *   To use the cache, start with calling @FTC_Manager_New to create a new
-   *   @FTC_Manager object, which models a single cache instance.  You can
-   *   then look up @FT_Face and @FT_Size objects with
-   *   @FTC_Manager_LookupFace and @FTC_Manager_LookupSize, respectively.
-   *
-   *   If you want to use the charmap caching, call @FTC_CMapCache_New, then
-   *   later use @FTC_CMapCache_Lookup to perform the equivalent of
-   *   @FT_Get_Char_Index, only much faster.
-   *
-   *   If you want to use the @FT_Glyph caching, call @FTC_ImageCache, then
-   *   later use @FTC_ImageCache_Lookup to retrieve the corresponding
-   *   @FT_Glyph objects from the cache.
-   *
-   *   If you need lots of small bitmaps, it is much more memory efficient
-   *   to call @FTC_SBitCache_New followed by @FTC_SBitCache_Lookup.  This
-   *   returns @FTC_SBitRec structures, which are used to store small
-   *   bitmaps directly.  (A small bitmap is one whose metrics and
-   *   dimensions all fit into 8-bit integers).
-   *
-   *   We hope to also provide a kerning cache in the near future.
-   *
-   *
-   * <Order>
-   *   FTC_Manager
-   *   FTC_FaceID
-   *   FTC_Face_Requester
-   *
-   *   FTC_Manager_New
-   *   FTC_Manager_Reset
-   *   FTC_Manager_Done
-   *   FTC_Manager_LookupFace
-   *   FTC_Manager_LookupSize
-   *   FTC_Manager_RemoveFaceID
-   *
-   *   FTC_Node
-   *   FTC_Node_Unref
-   *
-   *   FTC_ImageCache
-   *   FTC_ImageCache_New
-   *   FTC_ImageCache_Lookup
-   *
-   *   FTC_SBit
-   *   FTC_SBitCache
-   *   FTC_SBitCache_New
-   *   FTC_SBitCache_Lookup
-   *
-   *   FTC_CMapCache
-   *   FTC_CMapCache_New
-   *   FTC_CMapCache_Lookup
-   *
-   *************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                    BASIC TYPE DEFINITIONS                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type: FTC_FaceID
-   *
-   * @description:
-   *   An opaque pointer type that is used to identity face objects.  The
-   *   contents of such objects is application-dependent.
-   *
-   *   These pointers are typically used to point to a user-defined
-   *   structure containing a font file path, and face index.
-   *
-   * @note:
-   *   Never use NULL as a valid @FTC_FaceID.
-   *
-   *   Face IDs are passed by the client to the cache manager that calls,
-   *   when needed, the @FTC_Face_Requester to translate them into new
-   *   @FT_Face objects.
-   *
-   *   If the content of a given face ID changes at runtime, or if the value
-   *   becomes invalid (e.g., when uninstalling a font), you should
-   *   immediately call @FTC_Manager_RemoveFaceID before any other cache
-   *   function.
-   *
-   *   Failure to do so will result in incorrect behaviour or even
-   *   memory leaks and crashes.
-   */
-  typedef FT_Pointer  FTC_FaceID;
-
-
-  /************************************************************************
-   *
-   * @functype:
-   *   FTC_Face_Requester
-   *
-   * @description:
-   *   A callback function provided by client applications.  It is used by
-   *   the cache manager to translate a given @FTC_FaceID into a new valid
-   *   @FT_Face object, on demand.
-   *
-   * <Input>
-   *   face_id ::
-   *     The face ID to resolve.
-   *
-   *   library ::
-   *     A handle to a FreeType library object.
-   *
-   *   req_data ::
-   *     Application-provided request data (see note below).
-   *
-   * <Output>
-   *   aface ::
-   *     A new @FT_Face handle.
-   *
-   * <Return>
-   *   FreeType error code.  0~means success.
-   *
-   * <Note>
-   *   The third parameter `req_data' is the same as the one passed by the
-   *   client when @FTC_Manager_New is called.
-   *
-   *   The face requester should not perform funny things on the returned
-   *   face object, like creating a new @FT_Size for it, or setting a
-   *   transformation through @FT_Set_Transform!
-   */
-  typedef FT_Error
-  (*FTC_Face_Requester)( FTC_FaceID  face_id,
-                         FT_Library  library,
-                         FT_Pointer  req_data,
-                         FT_Face*    aface );
-
-  /* */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                      CACHE MANAGER OBJECT                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Manager                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This object corresponds to one instance of the cache-subsystem.    */
-  /*    It is used to cache one or more @FT_Face objects, along with       */
-  /*    corresponding @FT_Size objects.                                    */
-  /*                                                                       */
-  /*    The manager intentionally limits the total number of opened        */
-  /*    @FT_Face and @FT_Size objects to control memory usage.  See the    */
-  /*    `max_faces' and `max_sizes' parameters of @FTC_Manager_New.        */
-  /*                                                                       */
-  /*    The manager is also used to cache `nodes' of various types while   */
-  /*    limiting their total memory usage.                                 */
-  /*                                                                       */
-  /*    All limitations are enforced by keeping lists of managed objects   */
-  /*    in most-recently-used order, and flushing old nodes to make room   */
-  /*    for new ones.                                                      */
-  /*                                                                       */
-  typedef struct FTC_ManagerRec_*  FTC_Manager;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Node                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to a cache node object.  Each cache node is       */
-  /*    reference-counted.  A node with a count of~0 might be flushed      */
-  /*    out of a full cache whenever a lookup request is performed.        */
-  /*                                                                       */
-  /*    If you look up nodes, you have the ability to `acquire' them,      */
-  /*    i.e., to increment their reference count.  This will prevent the   */
-  /*    node from being flushed out of the cache until you explicitly      */
-  /*    `release' it (see @FTC_Node_Unref).                                */
-  /*                                                                       */
-  /*    See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup.         */
-  /*                                                                       */
-  typedef struct FTC_NodeRec_*  FTC_Node;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_New                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new cache manager.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: The parent FreeType library handle to use.            */
-  /*                                                                       */
-  /*    max_faces :: Maximum number of opened @FT_Face objects managed by  */
-  /*                 this cache instance.  Use~0 for defaults.             */
-  /*                                                                       */
-  /*    max_sizes :: Maximum number of opened @FT_Size objects managed by  */
-  /*                 this cache instance.  Use~0 for defaults.             */
-  /*                                                                       */
-  /*    max_bytes :: Maximum number of bytes to use for cached data nodes. */
-  /*                 Use~0 for defaults.  Note that this value does not    */
-  /*                 account for managed @FT_Face and @FT_Size objects.    */
-  /*                                                                       */
-  /*    requester :: An application-provided callback used to translate    */
-  /*                 face IDs into real @FT_Face objects.                  */
-  /*                                                                       */
-  /*    req_data  :: A generic pointer that is passed to the requester     */
-  /*                 each time it is called (see @FTC_Face_Requester).     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amanager  :: A handle to a new manager object.  0~in case of       */
-  /*                 failure.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_New( FT_Library          library,
-                   FT_UInt             max_faces,
-                   FT_UInt             max_sizes,
-                   FT_ULong            max_bytes,
-                   FTC_Face_Requester  requester,
-                   FT_Pointer          req_data,
-                   FTC_Manager        *amanager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Reset                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Empty a given cache manager.  This simply gets rid of all the      */
-  /*    currently cached @FT_Face and @FT_Size objects within the manager. */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    manager :: A handle to the manager.                                */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Reset( FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Done                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a given manager after emptying it.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the target cache manager object.            */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Done( FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_LookupFace                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the @FT_Face object that corresponds to a given face ID   */
-  /*    through a cache manager.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /*    face_id :: The ID of the face object.                              */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface   :: A handle to the face object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned @FT_Face object is always owned by the manager.  You  */
-  /*    should never try to discard it yourself.                           */
-  /*                                                                       */
-  /*    The @FT_Face object doesn't necessarily have a current size object */
-  /*    (i.e., face->size can be~0).  If you need a specific `font size',  */
-  /*    use @FTC_Manager_LookupSize instead.                               */
-  /*                                                                       */
-  /*    Never change the face's transformation matrix (i.e., never call    */
-  /*    the @FT_Set_Transform function) on a returned face!  If you need   */
-  /*    to transform glyphs, do it yourself after glyph loading.           */
-  /*                                                                       */
-  /*    When you perform a lookup, out-of-memory errors are detected       */
-  /*    _within_ the lookup and force incremental flushes of the cache     */
-  /*    until enough memory is released for the lookup to succeed.         */
-  /*                                                                       */
-  /*    If a lookup fails with `FT_Err_Out_Of_Memory' the cache has        */
-  /*    already been completely flushed, and still no memory was available */
-  /*    for the operation.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_LookupFace( FTC_Manager  manager,
-                          FTC_FaceID   face_id,
-                          FT_Face     *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_ScalerRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe a given character size in either      */
-  /*    pixels or points to the cache manager.  See                        */
-  /*    @FTC_Manager_LookupSize.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face_id :: The source face ID.                                     */
-  /*                                                                       */
-  /*    width   :: The character width.                                    */
-  /*                                                                       */
-  /*    height  :: The character height.                                   */
-  /*                                                                       */
-  /*    pixel   :: A Boolean.  If 1, the `width' and `height' fields are   */
-  /*               interpreted as integer pixel character sizes.           */
-  /*               Otherwise, they are expressed as 1/64th of points.      */
-  /*                                                                       */
-  /*    x_res   :: Only used when `pixel' is value~0 to indicate the       */
-  /*               horizontal resolution in dpi.                           */
-  /*                                                                       */
-  /*    y_res   :: Only used when `pixel' is value~0 to indicate the       */
-  /*               vertical resolution in dpi.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This type is mainly used to retrieve @FT_Size objects through the  */
-  /*    cache manager.                                                     */
-  /*                                                                       */
-  typedef struct  FTC_ScalerRec_
-  {
-    FTC_FaceID  face_id;
-    FT_UInt     width;
-    FT_UInt     height;
-    FT_Int      pixel;
-    FT_UInt     x_res;
-    FT_UInt     y_res;
-
-  } FTC_ScalerRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_Scaler                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an @FTC_ScalerRec structure.                           */
-  /*                                                                       */
-  typedef struct FTC_ScalerRec_*  FTC_Scaler;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_LookupSize                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the @FT_Size object that corresponds to a given           */
-  /*    @FTC_ScalerRec pointer through a cache manager.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /*    scaler  :: A scaler handle.                                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    asize   :: A handle to the size object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned @FT_Size object is always owned by the manager.  You  */
-  /*    should never try to discard it by yourself.                        */
-  /*                                                                       */
-  /*    You can access the parent @FT_Face object simply as `size->face'   */
-  /*    if you need it.  Note that this object is also owned by the        */
-  /*    manager.                                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    When you perform a lookup, out-of-memory errors are detected       */
-  /*    _within_ the lookup and force incremental flushes of the cache     */
-  /*    until enough memory is released for the lookup to succeed.         */
-  /*                                                                       */
-  /*    If a lookup fails with `FT_Err_Out_Of_Memory' the cache has        */
-  /*    already been completely flushed, and still no memory is available  */
-  /*    for the operation.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_LookupSize( FTC_Manager  manager,
-                          FTC_Scaler   scaler,
-                          FT_Size     *asize );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Node_Unref                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Decrement a cache node's internal reference count.  When the count */
-  /*    reaches 0, it is not destroyed but becomes eligible for subsequent */
-  /*    cache flushes.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node    :: The cache node handle.                                  */
-  /*                                                                       */
-  /*    manager :: The cache manager handle.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Node_Unref( FTC_Node     node,
-                  FTC_Manager  manager );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FTC_Manager_RemoveFaceID
-   *
-   * @description:
-   *   A special function used to indicate to the cache manager that
-   *   a given @FTC_FaceID is no longer valid, either because its
-   *   content changed, or because it was deallocated or uninstalled.
-   *
-   * @input:
-   *   manager ::
-   *     The cache manager handle.
-   *
-   *   face_id ::
-   *     The @FTC_FaceID to be removed.
-   *
-   * @note:
-   *   This function flushes all nodes from the cache corresponding to this
-   *   `face_id', with the exception of nodes with a non-null reference
-   *   count.
-   *
-   *   Such nodes are however modified internally so as to never appear
-   *   in later lookups with the same `face_id' value, and to be immediately
-   *   destroyed when released by all their users.
-   *
-   */
-  FT_EXPORT( void )
-  FTC_Manager_RemoveFaceID( FTC_Manager  manager,
-                            FTC_FaceID   face_id );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FTC_CMapCache
-   *
-   * @description:
-   *   An opaque handle used to model a charmap cache.  This cache is to
-   *   hold character codes -> glyph indices mappings.
-   *
-   */
-  typedef struct FTC_CMapCacheRec_*  FTC_CMapCache;
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FTC_CMapCache_New
-   *
-   * @description:
-   *   Create a new charmap cache.
-   *
-   * @input:
-   *   manager ::
-   *     A handle to the cache manager.
-   *
-   * @output:
-   *   acache ::
-   *     A new cache handle.  NULL in case of error.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   Like all other caches, this one will be destroyed with the cache
-   *   manager.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FTC_CMapCache_New( FTC_Manager     manager,
-                     FTC_CMapCache  *acache );
-
-
-  /************************************************************************
-   *
-   * @function:
-   *   FTC_CMapCache_Lookup
-   *
-   * @description:
-   *   Translate a character code into a glyph index, using the charmap
-   *   cache.
-   *
-   * @input:
-   *   cache ::
-   *     A charmap cache handle.
-   *
-   *   face_id ::
-   *     The source face ID.
-   *
-   *   cmap_index ::
-   *     The index of the charmap in the source face.  Any negative value
-   *     means to use the cache @FT_Face's default charmap.
-   *
-   *   char_code ::
-   *     The character code (in the corresponding charmap).
-   *
-   * @return:
-   *    Glyph index.  0~means `no glyph'.
-   *
-   */
-  FT_EXPORT( FT_UInt )
-  FTC_CMapCache_Lookup( FTC_CMapCache  cache,
-                        FTC_FaceID     face_id,
-                        FT_Int         cmap_index,
-                        FT_UInt32      char_code );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       IMAGE CACHE OBJECT                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FTC_ImageTypeRec
-   *
-   * @description:
-   *   A structure used to model the type of images in a glyph cache.
-   *
-   * @fields:
-   *   face_id ::
-   *     The face ID.
-   *
-   *   width ::
-   *     The width in pixels.
-   *
-   *   height ::
-   *     The height in pixels.
-   *
-   *   flags ::
-   *     The load flags, as in @FT_Load_Glyph.
-   *
-   */
-  typedef struct  FTC_ImageTypeRec_
-  {
-    FTC_FaceID  face_id;
-    FT_UInt     width;
-    FT_UInt     height;
-    FT_Int32    flags;
-
-  } FTC_ImageTypeRec;
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FTC_ImageType
-   *
-   * @description:
-   *   A handle to an @FTC_ImageTypeRec structure.
-   *
-   */
-  typedef struct FTC_ImageTypeRec_*  FTC_ImageType;
-
-
-  /* */
-
-
-#define FTC_IMAGE_TYPE_COMPARE( d1, d2 )      \
-          ( (d1)->face_id == (d2)->face_id && \
-            (d1)->width   == (d2)->width   && \
-            (d1)->flags   == (d2)->flags   )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_ImageCache                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a glyph image cache object.  They are designed to      */
-  /*    hold many distinct glyph images while not exceeding a certain      */
-  /*    memory threshold.                                                  */
-  /*                                                                       */
-  typedef struct FTC_ImageCacheRec_*  FTC_ImageCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_New                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new glyph image cache.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: The parent manager for the image cache.                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new glyph image cache object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_New( FTC_Manager      manager,
-                      FTC_ImageCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_Lookup                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve a given glyph image from a glyph image cache.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source glyph image cache.                */
-  /*                                                                       */
-  /*    type   :: A pointer to a glyph image type descriptor.              */
-  /*                                                                       */
-  /*    gindex :: The glyph index to retrieve.                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: The corresponding @FT_Glyph object.  0~in case of        */
-  /*              failure.                                                 */
-  /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
-  /*              node after incrementing its reference count (see note    */
-  /*              below).                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned glyph is owned and managed by the glyph image cache.  */
-  /*    Never try to transform or discard it manually!  You can however    */
-  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the glyph image, after increasing its reference    */
-  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
-  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
-  /*    `release' it.                                                      */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_Lookup( FTC_ImageCache  cache,
-                         FTC_ImageType   type,
-                         FT_UInt         gindex,
-                         FT_Glyph       *aglyph,
-                         FTC_Node       *anode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_LookupScaler                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A variant of @FTC_ImageCache_Lookup that uses an @FTC_ScalerRec    */
-  /*    to specify the face ID and its size.                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache      :: A handle to the source glyph image cache.            */
-  /*                                                                       */
-  /*    scaler     :: A pointer to a scaler descriptor.                    */
-  /*                                                                       */
-  /*    load_flags :: The corresponding load flags.                        */
-  /*                                                                       */
-  /*    gindex     :: The glyph index to retrieve.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph     :: The corresponding @FT_Glyph object.  0~in case of    */
-  /*                  failure.                                             */
-  /*                                                                       */
-  /*    anode      :: Used to return the address of of the corresponding   */
-  /*                  cache node after incrementing its reference count    */
-  /*                  (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned glyph is owned and managed by the glyph image cache.  */
-  /*    Never try to transform or discard it manually!  You can however    */
-  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the glyph image, after increasing its reference    */
-  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
-  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
-  /*    `release' it.                                                      */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  /*    Calls to @FT_Set_Char_Size and friends have no effect on cached    */
-  /*    glyphs; you should always use the FreeType cache API instead.      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_LookupScaler( FTC_ImageCache  cache,
-                               FTC_Scaler      scaler,
-                               FT_ULong        load_flags,
-                               FT_UInt         gindex,
-                               FT_Glyph       *aglyph,
-                               FTC_Node       *anode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBit                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a small bitmap descriptor.  See the @FTC_SBitRec       */
-  /*    structure for details.                                             */
-  /*                                                                       */
-  typedef struct FTC_SBitRec_*  FTC_SBit;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_SBitRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very compact structure used to describe a small glyph bitmap.    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    width     :: The bitmap width in pixels.                           */
-  /*                                                                       */
-  /*    height    :: The bitmap height in pixels.                          */
-  /*                                                                       */
-  /*    left      :: The horizontal distance from the pen position to the  */
-  /*                 left bitmap border (a.k.a. `left side bearing', or    */
-  /*                 `lsb').                                               */
-  /*                                                                       */
-  /*    top       :: The vertical distance from the pen position (on the   */
-  /*                 baseline) to the upper bitmap border (a.k.a. `top     */
-  /*                 side bearing').  The distance is positive for upwards */
-  /*                 y~coordinates.                                        */
-  /*                                                                       */
-  /*    format    :: The format of the glyph bitmap (monochrome or gray).  */
-  /*                                                                       */
-  /*    max_grays :: Maximum gray level value (in the range 1 to~255).     */
-  /*                                                                       */
-  /*    pitch     :: The number of bytes per bitmap line.  May be positive */
-  /*                 or negative.                                          */
-  /*                                                                       */
-  /*    xadvance  :: The horizontal advance width in pixels.               */
-  /*                                                                       */
-  /*    yadvance  :: The vertical advance height in pixels.                */
-  /*                                                                       */
-  /*    buffer    :: A pointer to the bitmap pixels.                       */
-  /*                                                                       */
-  typedef struct  FTC_SBitRec_
-  {
-    FT_Byte   width;
-    FT_Byte   height;
-    FT_Char   left;
-    FT_Char   top;
-
-    FT_Byte   format;
-    FT_Byte   max_grays;
-    FT_Short  pitch;
-    FT_Char   xadvance;
-    FT_Char   yadvance;
-
-    FT_Byte*  buffer;
-
-  } FTC_SBitRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBitCache                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a small bitmap cache.  These are special cache objects */
-  /*    used to store small glyph bitmaps (and anti-aliased pixmaps) in a  */
-  /*    much more efficient way than the traditional glyph image cache     */
-  /*    implemented by @FTC_ImageCache.                                    */
-  /*                                                                       */
-  typedef struct FTC_SBitCacheRec_*  FTC_SBitCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_New                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new cache to store small glyph bitmaps.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the source cache manager.                   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new sbit cache.  NULL in case of error. */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_New( FTC_Manager     manager,
-                     FTC_SBitCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_Lookup                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Look up a given small glyph bitmap in a given sbit cache and       */
-  /*    `lock' it to prevent its flushing from the cache until needed.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source sbit cache.                       */
-  /*                                                                       */
-  /*    type   :: A pointer to the glyph image type descriptor.            */
-  /*                                                                       */
-  /*    gindex :: The glyph index.                                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sbit   :: A handle to a small bitmap descriptor.                   */
-  /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
-  /*              node after incrementing its reference count (see note    */
-  /*              below).                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The small bitmap descriptor and its bit buffer are owned by the    */
-  /*    cache and should never be freed by the application.  They might    */
-  /*    as well disappear from memory on the next cache lookup, so don't   */
-  /*    treat them as persistent data.                                     */
-  /*                                                                       */
-  /*    The descriptor's `buffer' field is set to~0 to indicate a missing  */
-  /*    glyph bitmap.                                                      */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the bitmap, after increasing its reference count.  */
-  /*    This ensures that the node (as well as the image) will always be   */
-  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the bitmap could be flushed out of the cache on the next      */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_Lookup( FTC_SBitCache    cache,
-                        FTC_ImageType    type,
-                        FT_UInt          gindex,
-                        FTC_SBit        *sbit,
-                        FTC_Node        *anode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_LookupScaler                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A variant of @FTC_SBitCache_Lookup that uses an @FTC_ScalerRec     */
-  /*    to specify the face ID and its size.                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache      :: A handle to the source sbit cache.                   */
-  /*                                                                       */
-  /*    scaler     :: A pointer to the scaler descriptor.                  */
-  /*                                                                       */
-  /*    load_flags :: The corresponding load flags.                        */
-  /*                                                                       */
-  /*    gindex     :: The glyph index.                                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sbit       :: A handle to a small bitmap descriptor.               */
-  /*                                                                       */
-  /*    anode      :: Used to return the address of of the corresponding   */
-  /*                  cache node after incrementing its reference count    */
-  /*                  (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The small bitmap descriptor and its bit buffer are owned by the    */
-  /*    cache and should never be freed by the application.  They might    */
-  /*    as well disappear from memory on the next cache lookup, so don't   */
-  /*    treat them as persistent data.                                     */
-  /*                                                                       */
-  /*    The descriptor's `buffer' field is set to~0 to indicate a missing  */
-  /*    glyph bitmap.                                                      */
-  /*                                                                       */
-  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the bitmap, after increasing its reference count.  */
-  /*    This ensures that the node (as well as the image) will always be   */
-  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
-  /*                                                                       */
-  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
-  /*    that the bitmap could be flushed out of the cache on the next      */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_LookupScaler( FTC_SBitCache  cache,
-                              FTC_Scaler     scaler,
-                              FT_ULong       load_flags,
-                              FT_UInt        gindex,
-                              FTC_SBit      *sbit,
-                              FTC_Node      *anode );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTCACHE_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftcffdrv.h b/dependencies2013/win32/include/freetype/ftcffdrv.h
deleted file mode 100644
index b0b42999..00000000
--- a/dependencies2013/win32/include/freetype/ftcffdrv.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcffdrv.h                                                             */
-/*                                                                         */
-/*    FreeType API for controlling the CFF driver (specification only).    */
-/*                                                                         */
-/*  Copyright 2013-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTCFFDRV_H_
-#define FTCFFDRV_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   cff_driver
-   *
-   * @title:
-   *   The CFF driver
-   *
-   * @abstract:
-   *   Controlling the CFF driver module.
-   *
-   * @description:
-   *   While FreeType's CFF driver doesn't expose API functions by itself,
-   *   it is possible to control its behaviour with @FT_Property_Set and
-   *   @FT_Property_Get.  The list below gives the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   The CFF driver's module name is `cff'.
-   *
-   *   *Hinting* *and* *antialiasing* *principles* *of* *the* *new* *engine*
-   *
-   *   The rasterizer is positioning horizontal features (e.g., ascender
-   *   height & x-height, or crossbars) on the pixel grid and minimizing the
-   *   amount of antialiasing applied to them, while placing vertical
-   *   features (vertical stems) on the pixel grid without hinting, thus
-   *   representing the stem position and weight accurately.  Sometimes the
-   *   vertical stems may be only partially black.  In this context,
-   *   `antialiasing' means that stems are not positioned exactly on pixel
-   *   borders, causing a fuzzy appearance.
-   *
-   *   There are two principles behind this approach.
-   *
-   *   1) No hinting in the horizontal direction: Unlike `superhinted'
-   *   TrueType, which changes glyph widths to accommodate regular
-   *   inter-glyph spacing, Adobe's approach is `faithful to the design' in
-   *   representing both the glyph width and the inter-glyph spacing
-   *   designed for the font.  This makes the screen display as close as it
-   *   can be to the result one would get with infinite resolution, while
-   *   preserving what is considered the key characteristics of each glyph.
-   *   Note that the distances between unhinted and grid-fitted positions at
-   *   small sizes are comparable to kerning values and thus would be
-   *   noticeable (and distracting) while reading if hinting were applied.
-   *
-   *   One of the reasons to not hint horizontally is antialiasing for LCD
-   *   screens: The pixel geometry of modern displays supplies three
-   *   vertical sub-pixels as the eye moves horizontally across each visible
-   *   pixel.  On devices where we can be certain this characteristic is
-   *   present a rasterizer can take advantage of the sub-pixels to add
-   *   increments of weight.  In Western writing systems this turns out to
-   *   be the more critical direction anyway; the weights and spacing of
-   *   vertical stems (see above) are central to Armenian, Cyrillic, Greek,
-   *   and Latin type designs.  Even when the rasterizer uses greyscale
-   *   antialiasing instead of color (a necessary compromise when one
-   *   doesn't know the screen characteristics), the unhinted vertical
-   *   features preserve the design's weight and spacing much better than
-   *   aliased type would.
-   *
-   *   2) Alignment in the vertical direction: Weights and spacing along the
-   *   y~axis are less critical; what is much more important is the visual
-   *   alignment of related features (like cap-height and x-height).  The
-   *   sense of alignment for these is enhanced by the sharpness of grid-fit
-   *   edges, while the cruder vertical resolution (full pixels instead of
-   *   1/3 pixels) is less of a problem.
-   *
-   *   On the technical side, horizontal alignment zones for ascender,
-   *   x-height, and other important height values (traditionally called
-   *   `blue zones') as defined in the font are positioned independently,
-   *   each being rounded to the nearest pixel edge, taking care of
-   *   overshoot suppression at small sizes, stem darkening, and scaling.
-   *
-   *   Hstems (this is, hint values defined in the font to help align
-   *   horizontal features) that fall within a blue zone are said to be
-   *   `captured' and are aligned to that zone.  Uncaptured stems are moved
-   *   in one of four ways, top edge up or down, bottom edge up or down.
-   *   Unless there are conflicting hstems, the smallest movement is taken
-   *   to minimize distortion.
-   *
-   * @order:
-   *   hinting-engine
-   *   no-stem-darkening[cff]
-   *   darkening-parameters[cff]
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   hinting-engine
-   *
-   * @description:
-   *   Thanks to Adobe, which contributed a new hinting (and parsing)
-   *   engine, an application can select between `freetype' and `adobe' if
-   *   compiled with CFF_CONFIG_OPTION_OLD_ENGINE.  If this configuration
-   *   macro isn't defined, `hinting-engine' does nothing.
-   *
-   *   The default engine is `freetype' if CFF_CONFIG_OPTION_OLD_ENGINE is
-   *   defined, and `adobe' otherwise.
-   *
-   *   The following example code demonstrates how to select Adobe's hinting
-   *   engine (omitting the error handling).
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "hinting-engine", &hinting_engine );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_CFF_HINTING_XXX
-   *
-   * @description:
-   *   A list of constants used for the @hinting-engine property to select
-   *   the hinting engine for CFF fonts.
-   *
-   * @values:
-   *   FT_CFF_HINTING_FREETYPE ::
-   *     Use the old FreeType hinting engine.
-   *
-   *   FT_CFF_HINTING_ADOBE ::
-   *     Use the hinting engine contributed by Adobe.
-   *
-   */
-#define FT_CFF_HINTING_FREETYPE  0
-#define FT_CFF_HINTING_ADOBE     1
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   no-stem-darkening[cff]
-   *
-   * @description:
-   *   By default, the Adobe CFF engine darkens stems at smaller sizes,
-   *   regardless of hinting, to enhance contrast.  This feature requires
-   *   a rendering system with proper gamma correction.  Setting this
-   *   property, stem darkening gets switched off.
-   *
-   *   Note that stem darkening is never applied if @FT_LOAD_NO_SCALE is set.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Bool     no_stem_darkening = TRUE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "no-stem-darkening", &no_stem_darkening );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   darkening-parameters[cff]
-   *
-   * @description:
-   *   By default, the Adobe CFF engine darkens stems as follows (if the
-   *   `no-stem-darkening' property isn't set):
-   *
-   *   {
-   *     stem width <= 0.5px:   darkening amount = 0.4px
-   *     stem width  = 1px:     darkening amount = 0.275px
-   *     stem width  = 1.667px: darkening amount = 0.275px
-   *     stem width >= 2.333px: darkening amount = 0px
-   *   }
-   *
-   *   and piecewise linear in-between.  At configuration time, these four
-   *   control points can be set with the macro
-   *   `CFF_CONFIG_OPTION_DARKENING_PARAMETERS'.  At runtime, the control
-   *   points can be changed using the `darkening-parameters' property, as
-   *   the following example demonstrates.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Int      darken_params[8] = {  500, 300,   // x1, y1
-   *                                      1000, 200,   // x2, y2
-   *                                      1500, 100,   // x3, y3
-   *                                      2000,   0 }; // x4, y4
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "darkening-parameters", darken_params );
-   *   }
-   *
-   *   The x~values give the stem width, and the y~values the darkening
-   *   amount.  The unit is 1000th of pixels.  All coordinate values must be
-   *   positive; the x~values must be monotonically increasing; the
-   *   y~values must be monotonically decreasing and smaller than or
-   *   equal to 500 (corresponding to half a pixel); the slope of each
-   *   linear piece must be shallower than -1 (e.g., -.4).
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* FTCFFDRV_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftchapters.h b/dependencies2013/win32/include/freetype/ftchapters.h
deleted file mode 100644
index ab438953..00000000
--- a/dependencies2013/win32/include/freetype/ftchapters.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/* This file defines the structure of the FreeType reference.              */
-/* It is used by the python script that generates the HTML files.          */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    general_remarks                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    General Remarks                                                      */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    header_inclusion                                                     */
-/*    user_allocation                                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    core_api                                                             */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Core API                                                             */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    version                                                              */
-/*    basic_types                                                          */
-/*    base_interface                                                       */
-/*    glyph_variants                                                       */
-/*    glyph_management                                                     */
-/*    mac_specific                                                         */
-/*    sizes_management                                                     */
-/*    header_file_macros                                                   */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    format_specific                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Format-Specific API                                                  */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    multiple_masters                                                     */
-/*    truetype_tables                                                      */
-/*    type1_tables                                                         */
-/*    sfnt_names                                                           */
-/*    bdf_fonts                                                            */
-/*    cid_fonts                                                            */
-/*    pfr_fonts                                                            */
-/*    winfnt_fonts                                                         */
-/*    font_formats                                                         */
-/*    gasp_table                                                           */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    module_specific                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Controlling FreeType Modules                                         */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    auto_hinter                                                          */
-/*    cff_driver                                                           */
-/*    tt_driver                                                            */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    cache_subsystem                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Cache Sub-System                                                     */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    cache_subsystem                                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    support_api                                                          */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Support API                                                          */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    computations                                                         */
-/*    list_processing                                                      */
-/*    outline_processing                                                   */
-/*    quick_advance                                                        */
-/*    bitmap_handling                                                      */
-/*    raster                                                               */
-/*    glyph_stroker                                                        */
-/*    system_interface                                                     */
-/*    module_management                                                    */
-/*    gzip                                                                 */
-/*    lzw                                                                  */
-/*    bzip2                                                                */
-/*    lcd_filtering                                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    error_codes                                                          */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Error Codes                                                          */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    error_enumerations                                                   */
-/*    error_code_values                                                    */
-/*                                                                         */
-/***************************************************************************/
diff --git a/dependencies2013/win32/include/freetype/ftcid.h b/dependencies2013/win32/include/freetype/ftcid.h
deleted file mode 100644
index e1bc9fe0..00000000
--- a/dependencies2013/win32/include/freetype/ftcid.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcid.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing CID font information (specification).     */
-/*                                                                         */
-/*  Copyright 2007-2016 by                                                 */
-/*  Dereg Clegg and Michael Toftdal.                                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTCID_H_
-#define FTCID_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cid_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    CID Fonts                                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    CID-keyed font specific API.                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of CID-keyed font specific   */
-  /*    functions.                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_CID_Registry_Ordering_Supplement
-   *
-   * @description:
-   *    Retrieve the Registry/Ordering/Supplement triple (also known as the
-   *    "R/O/S") from a CID-keyed font.
-   *
-   * @input:
-   *    face ::
-   *       A handle to the input face.
-   *
-   * @output:
-   *    registry ::
-   *       The registry, as a C~string, owned by the face.
-   *
-   *    ordering ::
-   *       The ordering, as a C~string, owned by the face.
-   *
-   *    supplement ::
-   *       The supplement.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    This function only works with CID faces, returning an error
-   *    otherwise.
-   *
-   * @since:
-   *    2.3.6
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_Registry_Ordering_Supplement( FT_Face       face,
-                                           const char*  *registry,
-                                           const char*  *ordering,
-                                           FT_Int       *supplement);
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_CID_Is_Internally_CID_Keyed
-   *
-   * @description:
-   *    Retrieve the type of the input face, CID keyed or not.  In
-   *    contrast to the @FT_IS_CID_KEYED macro this function returns
-   *    successfully also for CID-keyed fonts in an SFNT wrapper.
-   *
-   * @input:
-   *    face ::
-   *       A handle to the input face.
-   *
-   * @output:
-   *    is_cid ::
-   *       The type of the face as an @FT_Bool.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    This function only works with CID faces and OpenType fonts,
-   *    returning an error otherwise.
-   *
-   * @since:
-   *    2.3.9
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_Is_Internally_CID_Keyed( FT_Face   face,
-                                      FT_Bool  *is_cid );
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_CID_From_Glyph_Index
-   *
-   * @description:
-   *    Retrieve the CID of the input glyph index.
-   *
-   * @input:
-   *    face ::
-   *       A handle to the input face.
-   *
-   *    glyph_index ::
-   *       The input glyph index.
-   *
-   * @output:
-   *    cid ::
-   *       The CID as an @FT_UInt.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    This function only works with CID faces and OpenType fonts,
-   *    returning an error otherwise.
-   *
-   * @since:
-   *    2.3.9
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_From_Glyph_Index( FT_Face   face,
-                               FT_UInt   glyph_index,
-                               FT_UInt  *cid );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTCID_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/fterrdef.h b/dependencies2013/win32/include/freetype/fterrdef.h
deleted file mode 100644
index 3f53dd58..00000000
--- a/dependencies2013/win32/include/freetype/fterrdef.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fterrdef.h                                                             */
-/*                                                                         */
-/*    FreeType error codes (specification).                                */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   error_code_values                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*   Error Code Values                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*   All possible error codes returned by FreeType functions.            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   The list below is taken verbatim from the file `fterrdef.h'         */
-  /*   (loaded automatically by including `FT_FREETYPE_H').  The first     */
-  /*   argument of the `FT_ERROR_DEF_' macro is the error label; by        */
-  /*   default, the prefix `FT_Err_' gets added so that you get error      */
-  /*   names like `FT_Err_Cannot_Open_Resource'.  The second argument is   */
-  /*   the error code, and the last argument an error string, which is not */
-  /*   used by FreeType.                                                   */
-  /*                                                                       */
-  /*   Within your application you should *only* use error names and       */
-  /*   *never* its numeric values!  The latter might (and actually do)     */
-  /*   change in forthcoming FreeType versions.                            */
-  /*                                                                       */
-  /*   Macro `FT_NOERRORDEF_' defines `FT_Err_Ok', which is always zero.   */
-  /*   See the `Error Enumerations' subsection how to automatically        */
-  /*   generate a list of error strings.                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Err_XXX                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /* generic errors */
-
-  FT_NOERRORDEF_( Ok,                                        0x00,
-                  "no error" )
-
-  FT_ERRORDEF_( Cannot_Open_Resource,                        0x01,
-                "cannot open resource" )
-  FT_ERRORDEF_( Unknown_File_Format,                         0x02,
-                "unknown file format" )
-  FT_ERRORDEF_( Invalid_File_Format,                         0x03,
-                "broken file" )
-  FT_ERRORDEF_( Invalid_Version,                             0x04,
-                "invalid FreeType version" )
-  FT_ERRORDEF_( Lower_Module_Version,                        0x05,
-                "module version is too low" )
-  FT_ERRORDEF_( Invalid_Argument,                            0x06,
-                "invalid argument" )
-  FT_ERRORDEF_( Unimplemented_Feature,                       0x07,
-                "unimplemented feature" )
-  FT_ERRORDEF_( Invalid_Table,                               0x08,
-                "broken table" )
-  FT_ERRORDEF_( Invalid_Offset,                              0x09,
-                "broken offset within table" )
-  FT_ERRORDEF_( Array_Too_Large,                             0x0A,
-                "array allocation size too large" )
-  FT_ERRORDEF_( Missing_Module,                              0x0B,
-                "missing module" )
-  FT_ERRORDEF_( Missing_Property,                            0x0C,
-                "missing property" )
-
-  /* glyph/character errors */
-
-  FT_ERRORDEF_( Invalid_Glyph_Index,                         0x10,
-                "invalid glyph index" )
-  FT_ERRORDEF_( Invalid_Character_Code,                      0x11,
-                "invalid character code" )
-  FT_ERRORDEF_( Invalid_Glyph_Format,                        0x12,
-                "unsupported glyph image format" )
-  FT_ERRORDEF_( Cannot_Render_Glyph,                         0x13,
-                "cannot render this glyph format" )
-  FT_ERRORDEF_( Invalid_Outline,                             0x14,
-                "invalid outline" )
-  FT_ERRORDEF_( Invalid_Composite,                           0x15,
-                "invalid composite glyph" )
-  FT_ERRORDEF_( Too_Many_Hints,                              0x16,
-                "too many hints" )
-  FT_ERRORDEF_( Invalid_Pixel_Size,                          0x17,
-                "invalid pixel size" )
-
-  /* handle errors */
-
-  FT_ERRORDEF_( Invalid_Handle,                              0x20,
-                "invalid object handle" )
-  FT_ERRORDEF_( Invalid_Library_Handle,                      0x21,
-                "invalid library handle" )
-  FT_ERRORDEF_( Invalid_Driver_Handle,                       0x22,
-                "invalid module handle" )
-  FT_ERRORDEF_( Invalid_Face_Handle,                         0x23,
-                "invalid face handle" )
-  FT_ERRORDEF_( Invalid_Size_Handle,                         0x24,
-                "invalid size handle" )
-  FT_ERRORDEF_( Invalid_Slot_Handle,                         0x25,
-                "invalid glyph slot handle" )
-  FT_ERRORDEF_( Invalid_CharMap_Handle,                      0x26,
-                "invalid charmap handle" )
-  FT_ERRORDEF_( Invalid_Cache_Handle,                        0x27,
-                "invalid cache manager handle" )
-  FT_ERRORDEF_( Invalid_Stream_Handle,                       0x28,
-                "invalid stream handle" )
-
-  /* driver errors */
-
-  FT_ERRORDEF_( Too_Many_Drivers,                            0x30,
-                "too many modules" )
-  FT_ERRORDEF_( Too_Many_Extensions,                         0x31,
-                "too many extensions" )
-
-  /* memory errors */
-
-  FT_ERRORDEF_( Out_Of_Memory,                               0x40,
-                "out of memory" )
-  FT_ERRORDEF_( Unlisted_Object,                             0x41,
-                "unlisted object" )
-
-  /* stream errors */
-
-  FT_ERRORDEF_( Cannot_Open_Stream,                          0x51,
-                "cannot open stream" )
-  FT_ERRORDEF_( Invalid_Stream_Seek,                         0x52,
-                "invalid stream seek" )
-  FT_ERRORDEF_( Invalid_Stream_Skip,                         0x53,
-                "invalid stream skip" )
-  FT_ERRORDEF_( Invalid_Stream_Read,                         0x54,
-                "invalid stream read" )
-  FT_ERRORDEF_( Invalid_Stream_Operation,                    0x55,
-                "invalid stream operation" )
-  FT_ERRORDEF_( Invalid_Frame_Operation,                     0x56,
-                "invalid frame operation" )
-  FT_ERRORDEF_( Nested_Frame_Access,                         0x57,
-                "nested frame access" )
-  FT_ERRORDEF_( Invalid_Frame_Read,                          0x58,
-                "invalid frame read" )
-
-  /* raster errors */
-
-  FT_ERRORDEF_( Raster_Uninitialized,                        0x60,
-                "raster uninitialized" )
-  FT_ERRORDEF_( Raster_Corrupted,                            0x61,
-                "raster corrupted" )
-  FT_ERRORDEF_( Raster_Overflow,                             0x62,
-                "raster overflow" )
-  FT_ERRORDEF_( Raster_Negative_Height,                      0x63,
-                "negative height while rastering" )
-
-  /* cache errors */
-
-  FT_ERRORDEF_( Too_Many_Caches,                             0x70,
-                "too many registered caches" )
-
-  /* TrueType and SFNT errors */
-
-  FT_ERRORDEF_( Invalid_Opcode,                              0x80,
-                "invalid opcode" )
-  FT_ERRORDEF_( Too_Few_Arguments,                           0x81,
-                "too few arguments" )
-  FT_ERRORDEF_( Stack_Overflow,                              0x82,
-                "stack overflow" )
-  FT_ERRORDEF_( Code_Overflow,                               0x83,
-                "code overflow" )
-  FT_ERRORDEF_( Bad_Argument,                                0x84,
-                "bad argument" )
-  FT_ERRORDEF_( Divide_By_Zero,                              0x85,
-                "division by zero" )
-  FT_ERRORDEF_( Invalid_Reference,                           0x86,
-                "invalid reference" )
-  FT_ERRORDEF_( Debug_OpCode,                                0x87,
-                "found debug opcode" )
-  FT_ERRORDEF_( ENDF_In_Exec_Stream,                         0x88,
-                "found ENDF opcode in execution stream" )
-  FT_ERRORDEF_( Nested_DEFS,                                 0x89,
-                "nested DEFS" )
-  FT_ERRORDEF_( Invalid_CodeRange,                           0x8A,
-                "invalid code range" )
-  FT_ERRORDEF_( Execution_Too_Long,                          0x8B,
-                "execution context too long" )
-  FT_ERRORDEF_( Too_Many_Function_Defs,                      0x8C,
-                "too many function definitions" )
-  FT_ERRORDEF_( Too_Many_Instruction_Defs,                   0x8D,
-                "too many instruction definitions" )
-  FT_ERRORDEF_( Table_Missing,                               0x8E,
-                "SFNT font table missing" )
-  FT_ERRORDEF_( Horiz_Header_Missing,                        0x8F,
-                "horizontal header (hhea) table missing" )
-  FT_ERRORDEF_( Locations_Missing,                           0x90,
-                "locations (loca) table missing" )
-  FT_ERRORDEF_( Name_Table_Missing,                          0x91,
-                "name table missing" )
-  FT_ERRORDEF_( CMap_Table_Missing,                          0x92,
-                "character map (cmap) table missing" )
-  FT_ERRORDEF_( Hmtx_Table_Missing,                          0x93,
-                "horizontal metrics (hmtx) table missing" )
-  FT_ERRORDEF_( Post_Table_Missing,                          0x94,
-                "PostScript (post) table missing" )
-  FT_ERRORDEF_( Invalid_Horiz_Metrics,                       0x95,
-                "invalid horizontal metrics" )
-  FT_ERRORDEF_( Invalid_CharMap_Format,                      0x96,
-                "invalid character map (cmap) format" )
-  FT_ERRORDEF_( Invalid_PPem,                                0x97,
-                "invalid ppem value" )
-  FT_ERRORDEF_( Invalid_Vert_Metrics,                        0x98,
-                "invalid vertical metrics" )
-  FT_ERRORDEF_( Could_Not_Find_Context,                      0x99,
-                "could not find context" )
-  FT_ERRORDEF_( Invalid_Post_Table_Format,                   0x9A,
-                "invalid PostScript (post) table format" )
-  FT_ERRORDEF_( Invalid_Post_Table,                          0x9B,
-                "invalid PostScript (post) table" )
-
-  /* CFF, CID, and Type 1 errors */
-
-  FT_ERRORDEF_( Syntax_Error,                                0xA0,
-                "opcode syntax error" )
-  FT_ERRORDEF_( Stack_Underflow,                             0xA1,
-                "argument stack underflow" )
-  FT_ERRORDEF_( Ignore,                                      0xA2,
-                "ignore" )
-  FT_ERRORDEF_( No_Unicode_Glyph_Name,                       0xA3,
-                "no Unicode glyph name found" )
-  FT_ERRORDEF_( Glyph_Too_Big,                               0xA4,
-                "glyph too big for hinting" )
-
-  /* BDF errors */
-
-  FT_ERRORDEF_( Missing_Startfont_Field,                     0xB0,
-                "`STARTFONT' field missing" )
-  FT_ERRORDEF_( Missing_Font_Field,                          0xB1,
-                "`FONT' field missing" )
-  FT_ERRORDEF_( Missing_Size_Field,                          0xB2,
-                "`SIZE' field missing" )
-  FT_ERRORDEF_( Missing_Fontboundingbox_Field,               0xB3,
-                "`FONTBOUNDINGBOX' field missing" )
-  FT_ERRORDEF_( Missing_Chars_Field,                         0xB4,
-                "`CHARS' field missing" )
-  FT_ERRORDEF_( Missing_Startchar_Field,                     0xB5,
-                "`STARTCHAR' field missing" )
-  FT_ERRORDEF_( Missing_Encoding_Field,                      0xB6,
-                "`ENCODING' field missing" )
-  FT_ERRORDEF_( Missing_Bbx_Field,                           0xB7,
-                "`BBX' field missing" )
-  FT_ERRORDEF_( Bbx_Too_Big,                                 0xB8,
-                "`BBX' too big" )
-  FT_ERRORDEF_( Corrupted_Font_Header,                       0xB9,
-                "Font header corrupted or missing fields" )
-  FT_ERRORDEF_( Corrupted_Font_Glyphs,                       0xBA,
-                "Font glyphs corrupted or missing fields" )
-
-  /* */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/fterrors.h b/dependencies2013/win32/include/freetype/fterrors.h
deleted file mode 100644
index e15bfb00..00000000
--- a/dependencies2013/win32/include/freetype/fterrors.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fterrors.h                                                             */
-/*                                                                         */
-/*    FreeType error code handling (specification).                        */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   error_enumerations                                                  */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*   Error Enumerations                                                  */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*   How to handle errors and error strings.                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   The header file `fterrors.h' (which is automatically included by    */
-  /*   `freetype.h' defines the handling of FreeType's enumeration         */
-  /*   constants.  It can also be used to generate error message strings   */
-  /*   with a small macro trick explained below.                           */
-  /*                                                                       */
-  /*   *Error* *Formats*                                                   */
-  /*                                                                       */
-  /*   The configuration macro FT_CONFIG_OPTION_USE_MODULE_ERRORS can be   */
-  /*   defined in `ftoption.h' in order to make the higher byte indicate   */
-  /*   the module where the error has happened (this is not compatible     */
-  /*   with standard builds of FreeType&nbsp;2, however).  See the file    */
-  /*   `ftmoderr.h' for more details.                                      */
-  /*                                                                       */
-  /*   *Error* *Message* *Strings*                                         */
-  /*                                                                       */
-  /*   Error definitions are set up with special macros that allow client  */
-  /*   applications to build a table of error message strings.  The        */
-  /*   strings are not included in a normal build of FreeType&nbsp;2 to    */
-  /*   save space (most client applications do not use them).              */
-  /*                                                                       */
-  /*   To do so, you have to define the following macros before including  */
-  /*   this file.                                                          */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     FT_ERROR_START_LIST                                               */
-  /*   }                                                                   */
-  /*                                                                       */
-  /*   This macro is called before anything else to define the start of    */
-  /*   the error list.  It is followed by several FT_ERROR_DEF calls.      */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     FT_ERROR_DEF( e, v, s )                                           */
-  /*   }                                                                   */
-  /*                                                                       */
-  /*   This macro is called to define one single error.  `e' is the error  */
-  /*   code identifier (e.g., `Invalid_Argument'), `v' is the error's      */
-  /*   numerical value, and `s' is the corresponding error string.         */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     FT_ERROR_END_LIST                                                 */
-  /*   }                                                                   */
-  /*                                                                       */
-  /*   This macro ends the list.                                           */
-  /*                                                                       */
-  /*   Additionally, you have to undefine `FTERRORS_H_' before #including  */
-  /*   this file.                                                          */
-  /*                                                                       */
-  /*   Here is a simple example.                                           */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     #undef FTERRORS_H_                                                */
-  /*     #define FT_ERRORDEF( e, v, s )  { e, s },                         */
-  /*     #define FT_ERROR_START_LIST     {                                 */
-  /*     #define FT_ERROR_END_LIST       { 0, NULL } };                    */
-  /*                                                                       */
-  /*     const struct                                                      */
-  /*     {                                                                 */
-  /*       int          err_code;                                          */
-  /*       const char*  err_msg;                                           */
-  /*     } ft_errors[] =                                                   */
-  /*                                                                       */
-  /*     #include FT_ERRORS_H                                              */
-  /*   }                                                                   */
-  /*                                                                       */
-  /*   Note that `FT_Err_Ok' is _not_ defined with `FT_ERRORDEF' but with  */
-  /*   `FT_NOERRORDEF'; it is always zero.                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /* */
-
-  /* In previous FreeType versions we used `__FTERRORS_H__'.  However, */
-  /* using two successive underscores in a non-system symbol name      */
-  /* violates the C (and C++) standard, so it was changed to the       */
-  /* current form.  In spite of this, we have to make                  */
-  /*                                                                   */
-  /*   #undefine __FTERRORS_H__                                        */
-  /*                                                                   */
-  /* work for backwards compatibility.                                 */
-  /*                                                                   */
-#if !( defined( FTERRORS_H_ ) && defined ( __FTERRORS_H__ ) )
-#define FTERRORS_H_
-#define __FTERRORS_H__
-
-
-  /* include module base error codes */
-#include FT_MODULE_ERRORS_H
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                       SETUP MACROS                      *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#undef  FT_NEED_EXTERN_C
-
-
-  /* FT_ERR_PREFIX is used as a prefix for error identifiers. */
-  /* By default, we use `FT_Err_'.                            */
-  /*                                                          */
-#ifndef FT_ERR_PREFIX
-#define FT_ERR_PREFIX  FT_Err_
-#endif
-
-
-  /* FT_ERR_BASE is used as the base for module-specific errors. */
-  /*                                                             */
-#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-
-#ifndef FT_ERR_BASE
-#define FT_ERR_BASE  FT_Mod_Err_Base
-#endif
-
-#else
-
-#undef FT_ERR_BASE
-#define FT_ERR_BASE  0
-
-#endif /* FT_CONFIG_OPTION_USE_MODULE_ERRORS */
-
-
-  /* If FT_ERRORDEF is not defined, we need to define a simple */
-  /* enumeration type.                                         */
-  /*                                                           */
-#ifndef FT_ERRORDEF
-
-#define FT_ERRORDEF( e, v, s )  e = v,
-#define FT_ERROR_START_LIST     enum {
-#define FT_ERROR_END_LIST       FT_ERR_CAT( FT_ERR_PREFIX, Max ) };
-
-#ifdef __cplusplus
-#define FT_NEED_EXTERN_C
-  extern "C" {
-#endif
-
-#endif /* !FT_ERRORDEF */
-
-
-  /* this macro is used to define an error */
-#define FT_ERRORDEF_( e, v, s )                                             \
-          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s )
-
-  /* this is only used for <module>_Err_Ok, which must be 0! */
-#define FT_NOERRORDEF_( e, v, s )                             \
-          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s )
-
-
-#ifdef FT_ERROR_START_LIST
-  FT_ERROR_START_LIST
-#endif
-
-
-  /* now include the error codes */
-#include FT_ERROR_DEFINITIONS_H
-
-
-#ifdef FT_ERROR_END_LIST
-  FT_ERROR_END_LIST
-#endif
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                      SIMPLE CLEANUP                     *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-#ifdef FT_NEED_EXTERN_C
-  }
-#endif
-
-#undef FT_ERROR_START_LIST
-#undef FT_ERROR_END_LIST
-
-#undef FT_ERRORDEF
-#undef FT_ERRORDEF_
-#undef FT_NOERRORDEF_
-
-#undef FT_NEED_EXTERN_C
-#undef FT_ERR_BASE
-
-  /* FT_ERR_PREFIX is needed internally */
-#ifndef FT2_BUILD_LIBRARY
-#undef FT_ERR_PREFIX
-#endif
-
-#endif /* !(FTERRORS_H_ && __FTERRORS_H__) */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftfntfmt.h b/dependencies2013/win32/include/freetype/ftfntfmt.h
deleted file mode 100644
index bd423247..00000000
--- a/dependencies2013/win32/include/freetype/ftfntfmt.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftfntfmt.h                                                             */
-/*                                                                         */
-/*    Support functions for font formats.                                  */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTFNTFMT_H_
-#define FTFNTFMT_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   font_formats                                                        */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*   Font Formats                                                        */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*   Getting the font format.                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   The single function in this section can be used to get the font     */
-  /*   format.  Note that this information is not needed normally;         */
-  /*   however, there are special cases (like in PDF devices) where it is  */
-  /*   important to differentiate, in spite of FreeType's uniform API.     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*   FT_Get_Font_Format                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   Return a string describing the format of a given face.  Possible    */
-  /*   values are `TrueType', `Type~1', `BDF', `PCF', `Type~42',           */
-  /*   `CID~Type~1', `CFF', `PFR', and `Windows~FNT'.                      */
-  /*                                                                       */
-  /*   The return value is suitable to be used as an X11 FONT_PROPERTY.    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*   face ::                                                             */
-  /*     Input face handle.                                                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*   Font format string.  NULL in case of error.                         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*   A deprecated name for the same function is                          */
-  /*   `FT_Get_X11_Font_Format'.                                           */
-  /*                                                                       */
-  FT_EXPORT( const char* )
-  FT_Get_Font_Format( FT_Face  face );
-
-
-  /* deprecated */
-  FT_EXPORT( const char* )
-  FT_Get_X11_Font_Format( FT_Face  face );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTFNTFMT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftgasp.h b/dependencies2013/win32/include/freetype/ftgasp.h
deleted file mode 100644
index 3f5b3bc6..00000000
--- a/dependencies2013/win32/include/freetype/ftgasp.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgasp.h                                                               */
-/*                                                                         */
-/*    Access of TrueType's `gasp' table (specification).                   */
-/*                                                                         */
-/*  Copyright 2007-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTGASP_H_
-#define FTGASP_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-  /***************************************************************************
-   *
-   * @section:
-   *   gasp_table
-   *
-   * @title:
-   *   Gasp Table
-   *
-   * @abstract:
-   *   Retrieving TrueType `gasp' table entries.
-   *
-   * @description:
-   *   The function @FT_Get_Gasp can be used to query a TrueType or OpenType
-   *   font for specific entries in its `gasp' table, if any.  This is
-   *   mainly useful when implementing native TrueType hinting with the
-   *   bytecode interpreter to duplicate the Windows text rendering results.
-   */
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FT_GASP_XXX
-   *
-   * @description:
-   *   A list of values and/or bit-flags returned by the @FT_Get_Gasp
-   *   function.
-   *
-   * @values:
-   *   FT_GASP_NO_TABLE ::
-   *     This special value means that there is no GASP table in this face.
-   *     It is up to the client to decide what to do.
-   *
-   *   FT_GASP_DO_GRIDFIT ::
-   *     Grid-fitting and hinting should be performed at the specified ppem.
-   *     This *really* means TrueType bytecode interpretation.  If this bit
-   *     is not set, no hinting gets applied.
-   *
-   *   FT_GASP_DO_GRAY ::
-   *     Anti-aliased rendering should be performed at the specified ppem.
-   *     If not set, do monochrome rendering.
-   *
-   *   FT_GASP_SYMMETRIC_SMOOTHING ::
-   *     If set, smoothing along multiple axes must be used with ClearType.
-   *
-   *   FT_GASP_SYMMETRIC_GRIDFIT ::
-   *     Grid-fitting must be used with ClearType's symmetric smoothing.
-   *
-   * @note:
-   *   The bit-flags `FT_GASP_DO_GRIDFIT' and `FT_GASP_DO_GRAY' are to be
-   *   used for standard font rasterization only.  Independently of that,
-   *   `FT_GASP_SYMMETRIC_SMOOTHING' and `FT_GASP_SYMMETRIC_GRIDFIT' are to
-   *   be used if ClearType is enabled (and `FT_GASP_DO_GRIDFIT' and
-   *   `FT_GASP_DO_GRAY' are consequently ignored).
-   *
-   *   `ClearType' is Microsoft's implementation of LCD rendering, partly
-   *   protected by patents.
-   *
-   * @since:
-   *   2.3.0
-   */
-#define FT_GASP_NO_TABLE               -1
-#define FT_GASP_DO_GRIDFIT           0x01
-#define FT_GASP_DO_GRAY              0x02
-#define FT_GASP_SYMMETRIC_SMOOTHING  0x08
-#define FT_GASP_SYMMETRIC_GRIDFIT    0x10
-
-
-  /*************************************************************************
-   *
-   * @func:
-   *   FT_Get_Gasp
-   *
-   * @description:
-   *   Read the `gasp' table from a TrueType or OpenType font file and
-   *   return the entry corresponding to a given character pixel size.
-   *
-   * @input:
-   *   face :: The source face handle.
-   *   ppem :: The vertical character pixel size.
-   *
-   * @return:
-   *   Bit flags (see @FT_GASP_XXX), or @FT_GASP_NO_TABLE if there is no
-   *   `gasp' table in the face.
-   *
-   * @since:
-   *   2.3.0
-   */
-  FT_EXPORT( FT_Int )
-  FT_Get_Gasp( FT_Face  face,
-               FT_UInt  ppem );
-
-  /* */
-
-
-#endif /* FTGASP_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftglyph.h b/dependencies2013/win32/include/freetype/ftglyph.h
deleted file mode 100644
index d9840a81..00000000
--- a/dependencies2013/win32/include/freetype/ftglyph.h
+++ /dev/null
@@ -1,605 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftglyph.h                                                              */
-/*                                                                         */
-/*    FreeType convenience functions to handle glyphs (specification).     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file contains the definition of several convenience functions    */
-  /* that can be used by client applications to easily retrieve glyph      */
-  /* bitmaps and outlines from a given face.                               */
-  /*                                                                       */
-  /* These functions should be optional if you are writing a font server   */
-  /* or text layout engine on top of FreeType.  However, they are pretty   */
-  /* handy for many other simple uses of the library.                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTGLYPH_H_
-#define FTGLYPH_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    glyph_management                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Glyph Management                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Generic interface to manage individual glyph data.                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains definitions used to manage glyph data        */
-  /*    through generic FT_Glyph objects.  Each of them can contain a      */
-  /*    bitmap, a vector outline, or even images in other formats.         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* forward declaration to a private type */
-  typedef struct FT_Glyph_Class_  FT_Glyph_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Glyph                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Handle to an object used to model generic glyph images.  It is a   */
-  /*    pointer to the @FT_GlyphRec structure and can contain a glyph      */
-  /*    bitmap or pointer.                                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Glyph objects are not owned by the library.  You must thus release */
-  /*    them manually (through @FT_Done_Glyph) _before_ calling            */
-  /*    @FT_Done_FreeType.                                                 */
-  /*                                                                       */
-  typedef struct FT_GlyphRec_*  FT_Glyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The root glyph structure contains a given glyph image plus its     */
-  /*    advance width in 16.16 fixed-point format.                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library :: A handle to the FreeType library object.                */
-  /*                                                                       */
-  /*    clazz   :: A pointer to the glyph's class.  Private.               */
-  /*                                                                       */
-  /*    format  :: The format of the glyph's image.                        */
-  /*                                                                       */
-  /*    advance :: A 16.16 vector that gives the glyph's advance width.    */
-  /*                                                                       */
-  typedef struct  FT_GlyphRec_
-  {
-    FT_Library             library;
-    const FT_Glyph_Class*  clazz;
-    FT_Glyph_Format        format;
-    FT_Vector              advance;
-
-  } FT_GlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_BitmapGlyph                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model a bitmap glyph image.  This is */
-  /*    a sub-class of @FT_Glyph, and a pointer to @FT_BitmapGlyphRec.     */
-  /*                                                                       */
-  typedef struct FT_BitmapGlyphRec_*  FT_BitmapGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_BitmapGlyphRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used for bitmap glyph images.  This really is a        */
-  /*    `sub-class' of @FT_GlyphRec.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root   :: The root @FT_Glyph fields.                               */
-  /*                                                                       */
-  /*    left   :: The left-side bearing, i.e., the horizontal distance     */
-  /*              from the current pen position to the left border of the  */
-  /*              glyph bitmap.                                            */
-  /*                                                                       */
-  /*    top    :: The top-side bearing, i.e., the vertical distance from   */
-  /*              the current pen position to the top border of the glyph  */
-  /*              bitmap.  This distance is positive for upwards~y!        */
-  /*                                                                       */
-  /*    bitmap :: A descriptor for the bitmap.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can typecast an @FT_Glyph to @FT_BitmapGlyph if you have       */
-  /*    `glyph->format == FT_GLYPH_FORMAT_BITMAP'.  This lets you access   */
-  /*    the bitmap's contents easily.                                      */
-  /*                                                                       */
-  /*    The corresponding pixel buffer is always owned by @FT_BitmapGlyph  */
-  /*    and is thus created and destroyed with it.                         */
-  /*                                                                       */
-  typedef struct  FT_BitmapGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Int       left;
-    FT_Int       top;
-    FT_Bitmap    bitmap;
-
-  } FT_BitmapGlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_OutlineGlyph                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model an outline glyph image.  This  */
-  /*    is a sub-class of @FT_Glyph, and a pointer to @FT_OutlineGlyphRec. */
-  /*                                                                       */
-  typedef struct FT_OutlineGlyphRec_*  FT_OutlineGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_OutlineGlyphRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used for outline (vectorial) glyph images.  This       */
-  /*    really is a `sub-class' of @FT_GlyphRec.                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root    :: The root @FT_Glyph fields.                              */
-  /*                                                                       */
-  /*    outline :: A descriptor for the outline.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can typecast an @FT_Glyph to @FT_OutlineGlyph if you have      */
-  /*    `glyph->format == FT_GLYPH_FORMAT_OUTLINE'.  This lets you access  */
-  /*    the outline's content easily.                                      */
-  /*                                                                       */
-  /*    As the outline is extracted from a glyph slot, its coordinates are */
-  /*    expressed normally in 26.6 pixels, unless the flag                 */
-  /*    @FT_LOAD_NO_SCALE was used in @FT_Load_Glyph() or @FT_Load_Char(). */
-  /*                                                                       */
-  /*    The outline's tables are always owned by the object and are        */
-  /*    destroyed with it.                                                 */
-  /*                                                                       */
-  typedef struct  FT_OutlineGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Outline   outline;
-
-  } FT_OutlineGlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Glyph                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to extract a glyph image from a slot.  Note that   */
-  /*    the created @FT_Glyph object must be released with @FT_Done_Glyph. */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot   :: A handle to the source glyph slot.                       */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: A handle to the glyph object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph( FT_GlyphSlot  slot,
-                FT_Glyph     *aglyph );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Copy                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to copy a glyph image.  Note that the created      */
-  /*    @FT_Glyph object must be released with @FT_Done_Glyph.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    source :: A handle to the source glyph object.                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target :: A handle to the target glyph object.  0~in case of       */
-  /*              error.                                                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Copy( FT_Glyph   source,
-                 FT_Glyph  *target );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Transform                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Transform a glyph image if its format is scalable.                 */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    glyph  :: A handle to the target glyph object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to a 2x2 matrix to apply.                      */
-  /*                                                                       */
-  /*    delta  :: A pointer to a 2d vector to apply.  Coordinates are      */
-  /*              expressed in 1/64th of a pixel.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code (if not 0, the glyph format is not scalable).  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The 2x2 transformation matrix is also applied to the glyph's       */
-  /*    advance vector.                                                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Transform( FT_Glyph    glyph,
-                      FT_Matrix*  matrix,
-                      FT_Vector*  delta );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Glyph_BBox_Mode                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The mode how the values of @FT_Glyph_Get_CBox are returned.        */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_GLYPH_BBOX_UNSCALED ::                                          */
-  /*      Return unscaled font units.                                      */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_SUBPIXELS ::                                         */
-  /*      Return unfitted 26.6 coordinates.                                */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_GRIDFIT ::                                           */
-  /*      Return grid-fitted 26.6 coordinates.                             */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_TRUNCATE ::                                          */
-  /*      Return coordinates in integer pixels.                            */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_PIXELS ::                                            */
-  /*      Return grid-fitted pixel coordinates.                            */
-  /*                                                                       */
-  typedef enum  FT_Glyph_BBox_Mode_
-  {
-    FT_GLYPH_BBOX_UNSCALED  = 0,
-    FT_GLYPH_BBOX_SUBPIXELS = 0,
-    FT_GLYPH_BBOX_GRIDFIT   = 1,
-    FT_GLYPH_BBOX_TRUNCATE  = 2,
-    FT_GLYPH_BBOX_PIXELS    = 3
-
-  } FT_Glyph_BBox_Mode;
-
-
-  /* these constants are deprecated; use the corresponding */
-  /* `FT_Glyph_BBox_Mode' values instead                   */
-#define ft_glyph_bbox_unscaled   FT_GLYPH_BBOX_UNSCALED
-#define ft_glyph_bbox_subpixels  FT_GLYPH_BBOX_SUBPIXELS
-#define ft_glyph_bbox_gridfit    FT_GLYPH_BBOX_GRIDFIT
-#define ft_glyph_bbox_truncate   FT_GLYPH_BBOX_TRUNCATE
-#define ft_glyph_bbox_pixels     FT_GLYPH_BBOX_PIXELS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Get_CBox                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a glyph's `control box'.  The control box encloses all the  */
-  /*    outline's points, including Bézier control points.  Though it      */
-  /*    coincides with the exact bounding box for most glyphs, it can be   */
-  /*    slightly larger in some situations (like when rotating an outline  */
-  /*    that contains Bézier outside arcs).                                */
-  /*                                                                       */
-  /*    Computing the control box is very fast, while getting the bounding */
-  /*    box can take much more time as it needs to walk over all segments  */
-  /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component, which is dedicated to this single task.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph :: A handle to the source glyph object.                      */
-  /*                                                                       */
-  /*    mode  :: The mode that indicates how to interpret the returned     */
-  /*             bounding box values.                                      */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acbox :: The glyph coordinate bounding box.  Coordinates are       */
-  /*             expressed in 1/64th of pixels if it is grid-fitted.       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Coordinates are relative to the glyph origin, using the y~upwards  */
-  /*    convention.                                                        */
-  /*                                                                       */
-  /*    If the glyph has been loaded with @FT_LOAD_NO_SCALE, `bbox_mode'   */
-  /*    must be set to @FT_GLYPH_BBOX_UNSCALED to get unscaled font        */
-  /*    units in 26.6 pixel format.  The value @FT_GLYPH_BBOX_SUBPIXELS    */
-  /*    is another name for this constant.                                 */
-  /*                                                                       */
-  /*    If the font is tricky and the glyph has been loaded with           */
-  /*    @FT_LOAD_NO_SCALE, the resulting CBox is meaningless.  To get      */
-  /*    reasonable values for the CBox it is necessary to load the glyph   */
-  /*    at a large ppem value (so that the hinting instructions can        */
-  /*    properly shift and scale the subglyphs), then extracting the CBox, */
-  /*    which can be eventually converted back to font units.              */
-  /*                                                                       */
-  /*    Note that the maximum coordinates are exclusive, which means that  */
-  /*    one can compute the width and height of the glyph image (be it in  */
-  /*    integer or 26.6 pixels) as:                                        */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      width  = bbox.xMax - bbox.xMin;                                  */
-  /*      height = bbox.yMax - bbox.yMin;                                  */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Note also that for 26.6 coordinates, if `bbox_mode' is set to      */
-  /*    @FT_GLYPH_BBOX_GRIDFIT, the coordinates will also be grid-fitted,  */
-  /*    which corresponds to:                                              */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      bbox.xMin = FLOOR(bbox.xMin);                                    */
-  /*      bbox.yMin = FLOOR(bbox.yMin);                                    */
-  /*      bbox.xMax = CEILING(bbox.xMax);                                  */
-  /*      bbox.yMax = CEILING(bbox.yMax);                                  */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    To get the bbox in pixel coordinates, set `bbox_mode' to           */
-  /*    @FT_GLYPH_BBOX_TRUNCATE.                                           */
-  /*                                                                       */
-  /*    To get the bbox in grid-fitted pixel coordinates, set `bbox_mode'  */
-  /*    to @FT_GLYPH_BBOX_PIXELS.                                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Glyph_Get_CBox( FT_Glyph  glyph,
-                     FT_UInt   bbox_mode,
-                     FT_BBox  *acbox );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_To_Bitmap                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Convert a given glyph object to a bitmap glyph object.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    the_glyph   :: A pointer to a handle to the target glyph.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    render_mode :: An enumeration that describes how the data is       */
-  /*                   rendered.                                           */
-  /*                                                                       */
-  /*    origin      :: A pointer to a vector used to translate the glyph   */
-  /*                   image before rendering.  Can be~0 (if no            */
-  /*                   translation).  The origin is expressed in           */
-  /*                   26.6 pixels.                                        */
-  /*                                                                       */
-  /*    destroy     :: A boolean that indicates that the original glyph    */
-  /*                   image should be destroyed by this function.  It is  */
-  /*                   never destroyed in case of error.                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does nothing if the glyph format isn't scalable.     */
-  /*                                                                       */
-  /*    The glyph image is translated with the `origin' vector before      */
-  /*    rendering.                                                         */
-  /*                                                                       */
-  /*    The first parameter is a pointer to an @FT_Glyph handle, that will */
-  /*    be _replaced_ by this function (with newly allocated data).        */
-  /*    Typically, you would use (omitting error handling):                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      {                                                                */
-  /*        FT_Glyph        glyph;                                         */
-  /*        FT_BitmapGlyph  glyph_bitmap;                                  */
-  /*                                                                       */
-  /*                                                                       */
-  /*        // load glyph                                                  */
-  /*        error = FT_Load_Char( face, glyph_index, FT_LOAD_DEFAUT );     */
-  /*                                                                       */
-  /*        // extract glyph image                                         */
-  /*        error = FT_Get_Glyph( face->glyph, &glyph );                   */
-  /*                                                                       */
-  /*        // convert to a bitmap (default render mode + destroying old)  */
-  /*        if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )                 */
-  /*        {                                                              */
-  /*          error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_NORMAL,   */
-  /*                                      0, 1 );                          */
-  /*          if ( error ) // `glyph' unchanged                            */
-  /*            ...                                                        */
-  /*        }                                                              */
-  /*                                                                       */
-  /*        // access bitmap content by typecasting                        */
-  /*        glyph_bitmap = (FT_BitmapGlyph)glyph;                          */
-  /*                                                                       */
-  /*        // do funny stuff with it, like blitting/drawing               */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        // discard glyph image (bitmap or not)                         */
-  /*        FT_Done_Glyph( glyph );                                        */
-  /*      }                                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*    Here another example, again without error handling:                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      {                                                                */
-  /*        FT_Glyph  glyphs[MAX_GLYPHS]                                   */
-  /*                                                                       */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
-  /*          error = FT_Load_Glyph( face, idx, FT_LOAD_DEFAULT ) ||       */
-  /*                  FT_Get_Glyph ( face->glyph, &glyph[idx] );           */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
-  /*        {                                                              */
-  /*          FT_Glyph  bitmap = glyphs[idx];                              */
-  /*                                                                       */
-  /*                                                                       */
-  /*          ...                                                          */
-  /*                                                                       */
-  /*          // after this call, `bitmap' no longer points into           */
-  /*          // the `glyphs' array (and the old value isn't destroyed)    */
-  /*          FT_Glyph_To_Bitmap( &bitmap, FT_RENDER_MODE_MONO, 0, 0 );    */
-  /*                                                                       */
-  /*          ...                                                          */
-  /*                                                                       */
-  /*          FT_Done_Glyph( bitmap );                                     */
-  /*        }                                                              */
-  /*                                                                       */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        for ( idx = 0; i < MAX_GLYPHS; i++ )                           */
-  /*          FT_Done_Glyph( glyphs[idx] );                                */
-  /*      }                                                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_To_Bitmap( FT_Glyph*       the_glyph,
-                      FT_Render_Mode  render_mode,
-                      FT_Vector*      origin,
-                      FT_Bool         destroy );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Glyph                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy a given glyph.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph :: A handle to the target glyph object.                      */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Done_Glyph( FT_Glyph  glyph );
-
-  /* */
-
-
-  /* other helpful functions */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    computations                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Matrix_Multiply                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Perform the matrix operation `b = a*b'.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: A pointer to matrix `a'.                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    b :: A pointer to matrix `b'.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The result is undefined if either `a' or `b' is zero.              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Matrix_Multiply( const FT_Matrix*  a,
-                      FT_Matrix*        b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Matrix_Invert                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Invert a 2x2 matrix.  Return an error if it can't be inverted.     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    matrix :: A pointer to the target matrix.  Remains untouched in    */
-  /*              case of error.                                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Matrix_Invert( FT_Matrix*  matrix );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTGLYPH_H_ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
diff --git a/dependencies2013/win32/include/freetype/ftgxval.h b/dependencies2013/win32/include/freetype/ftgxval.h
deleted file mode 100644
index a58e86a0..00000000
--- a/dependencies2013/win32/include/freetype/ftgxval.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgxval.h                                                              */
-/*                                                                         */
-/*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  Masatake YAMATO, Redhat K.K,                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/*                                                                         */
-/* gxvalid is derived from both gxlayout module and otvalid module.        */
-/* Development of gxlayout is supported by the Information-technology      */
-/* Promotion Agency(IPA), Japan.                                           */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTGXVAL_H_
-#define FTGXVAL_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    gx_validation                                                      */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    TrueTypeGX/AAT Validation                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    An API to validate TrueTypeGX/AAT tables.                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of functions to validate     */
-  /*    some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd,  */
-  /*    trak, prop, lcar).                                                 */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_TrueTypeGX_Validate                                             */
-  /*    FT_TrueTypeGX_Free                                                 */
-  /*                                                                       */
-  /*    FT_ClassicKern_Validate                                            */
-  /*    FT_ClassicKern_Free                                                */
-  /*                                                                       */
-  /*    FT_VALIDATE_GX_LENGTH                                              */
-  /*    FT_VALIDATE_GXXXX                                                  */
-  /*    FT_VALIDATE_CKERNXXX                                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                                                                       */
-  /* Warning: Use FT_VALIDATE_XXX to validate a table.                     */
-  /*          Following definitions are for gxvalid developers.            */
-  /*                                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-#define FT_VALIDATE_feat_INDEX     0
-#define FT_VALIDATE_mort_INDEX     1
-#define FT_VALIDATE_morx_INDEX     2
-#define FT_VALIDATE_bsln_INDEX     3
-#define FT_VALIDATE_just_INDEX     4
-#define FT_VALIDATE_kern_INDEX     5
-#define FT_VALIDATE_opbd_INDEX     6
-#define FT_VALIDATE_trak_INDEX     7
-#define FT_VALIDATE_prop_INDEX     8
-#define FT_VALIDATE_lcar_INDEX     9
-#define FT_VALIDATE_GX_LAST_INDEX  FT_VALIDATE_lcar_INDEX
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_VALIDATE_GX_LENGTH
-   *
-   * @description:
-   *   The number of tables checked in this module.  Use it as a parameter
-   *   for the `table-length' argument of function @FT_TrueTypeGX_Validate.
-   */
-#define FT_VALIDATE_GX_LENGTH     (FT_VALIDATE_GX_LAST_INDEX + 1)
-
-  /* */
-
-  /* Up to 0x1000 is used by otvalid.
-     Ox2xxx is reserved for feature OT extension. */
-#define FT_VALIDATE_GX_START 0x4000
-#define FT_VALIDATE_GX_BITFIELD( tag )                  \
-  ( FT_VALIDATE_GX_START << FT_VALIDATE_##tag##_INDEX )
-
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_VALIDATE_GXXXX
-  *
-  * @description:
-  *    A list of bit-field constants used with @FT_TrueTypeGX_Validate to
-  *    indicate which TrueTypeGX/AAT Type tables should be validated.
-  *
-  * @values:
-  *    FT_VALIDATE_feat ::
-  *      Validate `feat' table.
-  *
-  *    FT_VALIDATE_mort ::
-  *      Validate `mort' table.
-  *
-  *    FT_VALIDATE_morx ::
-  *      Validate `morx' table.
-  *
-  *    FT_VALIDATE_bsln ::
-  *      Validate `bsln' table.
-  *
-  *    FT_VALIDATE_just ::
-  *      Validate `just' table.
-  *
-  *    FT_VALIDATE_kern ::
-  *      Validate `kern' table.
-  *
-  *    FT_VALIDATE_opbd ::
-  *      Validate `opbd' table.
-  *
-  *    FT_VALIDATE_trak ::
-  *      Validate `trak' table.
-  *
-  *    FT_VALIDATE_prop ::
-  *      Validate `prop' table.
-  *
-  *    FT_VALIDATE_lcar ::
-  *      Validate `lcar' table.
-  *
-  *    FT_VALIDATE_GX ::
-  *      Validate all TrueTypeGX tables (feat, mort, morx, bsln, just, kern,
-  *      opbd, trak, prop and lcar).
-  *
-  */
-
-#define FT_VALIDATE_feat  FT_VALIDATE_GX_BITFIELD( feat )
-#define FT_VALIDATE_mort  FT_VALIDATE_GX_BITFIELD( mort )
-#define FT_VALIDATE_morx  FT_VALIDATE_GX_BITFIELD( morx )
-#define FT_VALIDATE_bsln  FT_VALIDATE_GX_BITFIELD( bsln )
-#define FT_VALIDATE_just  FT_VALIDATE_GX_BITFIELD( just )
-#define FT_VALIDATE_kern  FT_VALIDATE_GX_BITFIELD( kern )
-#define FT_VALIDATE_opbd  FT_VALIDATE_GX_BITFIELD( opbd )
-#define FT_VALIDATE_trak  FT_VALIDATE_GX_BITFIELD( trak )
-#define FT_VALIDATE_prop  FT_VALIDATE_GX_BITFIELD( prop )
-#define FT_VALIDATE_lcar  FT_VALIDATE_GX_BITFIELD( lcar )
-
-#define FT_VALIDATE_GX  ( FT_VALIDATE_feat | \
-                          FT_VALIDATE_mort | \
-                          FT_VALIDATE_morx | \
-                          FT_VALIDATE_bsln | \
-                          FT_VALIDATE_just | \
-                          FT_VALIDATE_kern | \
-                          FT_VALIDATE_opbd | \
-                          FT_VALIDATE_trak | \
-                          FT_VALIDATE_prop | \
-                          FT_VALIDATE_lcar )
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_TrueTypeGX_Validate
-  *
-  * @description:
-  *    Validate various TrueTypeGX tables to assure that all offsets and
-  *    indices are valid.  The idea is that a higher-level library that
-  *    actually does the text layout can access those tables without
-  *    error checking (which can be quite time consuming).
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    validation_flags ::
-  *       A bit field that specifies the tables to be validated.  See
-  *       @FT_VALIDATE_GXXXX for possible values.
-  *
-  *    table_length ::
-  *       The size of the `tables' array.  Normally, @FT_VALIDATE_GX_LENGTH
-  *       should be passed.
-  *
-  * @output:
-  *    tables ::
-  *       The array where all validated sfnt tables are stored.
-  *       The array itself must be allocated by a client.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function only works with TrueTypeGX fonts, returning an error
-  *   otherwise.
-  *
-  *   After use, the application should deallocate the buffers pointed to by
-  *   each `tables' element, by calling @FT_TrueTypeGX_Free.  A NULL value
-  *   indicates that the table either doesn't exist in the font, the
-  *   application hasn't asked for validation, or the validator doesn't have
-  *   the ability to validate the sfnt table.
-  */
-  FT_EXPORT( FT_Error )
-  FT_TrueTypeGX_Validate( FT_Face   face,
-                          FT_UInt   validation_flags,
-                          FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
-                          FT_UInt   table_length );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_TrueTypeGX_Free
-  *
-  * @description:
-  *    Free the buffer allocated by TrueTypeGX validator.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    table ::
-  *       The pointer to the buffer allocated by
-  *       @FT_TrueTypeGX_Validate.
-  *
-  * @note:
-  *   This function must be used to free the buffer allocated by
-  *   @FT_TrueTypeGX_Validate only.
-  */
-  FT_EXPORT( void )
-  FT_TrueTypeGX_Free( FT_Face   face,
-                      FT_Bytes  table );
-
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_VALIDATE_CKERNXXX
-  *
-  * @description:
-  *    A list of bit-field constants used with @FT_ClassicKern_Validate
-  *    to indicate the classic kern dialect or dialects.  If the selected
-  *    type doesn't fit, @FT_ClassicKern_Validate regards the table as
-  *    invalid.
-  *
-  * @values:
-  *    FT_VALIDATE_MS ::
-  *      Handle the `kern' table as a classic Microsoft kern table.
-  *
-  *    FT_VALIDATE_APPLE ::
-  *      Handle the `kern' table as a classic Apple kern table.
-  *
-  *    FT_VALIDATE_CKERN ::
-  *      Handle the `kern' as either classic Apple or Microsoft kern table.
-  */
-#define FT_VALIDATE_MS     ( FT_VALIDATE_GX_START << 0 )
-#define FT_VALIDATE_APPLE  ( FT_VALIDATE_GX_START << 1 )
-
-#define FT_VALIDATE_CKERN  ( FT_VALIDATE_MS | FT_VALIDATE_APPLE )
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_ClassicKern_Validate
-  *
-  * @description:
-  *    Validate classic (16-bit format) kern table to assure that the offsets
-  *    and indices are valid.  The idea is that a higher-level library that
-  *    actually does the text layout can access those tables without error
-  *    checking (which can be quite time consuming).
-  *
-  *    The `kern' table validator in @FT_TrueTypeGX_Validate deals with both
-  *    the new 32-bit format and the classic 16-bit format, while
-  *    FT_ClassicKern_Validate only supports the classic 16-bit format.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    validation_flags ::
-  *       A bit field that specifies the dialect to be validated.  See
-  *       @FT_VALIDATE_CKERNXXX for possible values.
-  *
-  * @output:
-  *    ckern_table ::
-  *       A pointer to the kern table.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   After use, the application should deallocate the buffers pointed to by
-  *   `ckern_table', by calling @FT_ClassicKern_Free.  A NULL value
-  *   indicates that the table doesn't exist in the font.
-  */
-  FT_EXPORT( FT_Error )
-  FT_ClassicKern_Validate( FT_Face    face,
-                           FT_UInt    validation_flags,
-                           FT_Bytes  *ckern_table );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_ClassicKern_Free
-  *
-  * @description:
-  *    Free the buffer allocated by classic Kern validator.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    table ::
-  *       The pointer to the buffer that is allocated by
-  *       @FT_ClassicKern_Validate.
-  *
-  * @note:
-  *   This function must be used to free the buffer allocated by
-  *   @FT_ClassicKern_Validate only.
-  */
-  FT_EXPORT( void )
-  FT_ClassicKern_Free( FT_Face   face,
-                       FT_Bytes  table );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTGXVAL_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftgzip.h b/dependencies2013/win32/include/freetype/ftgzip.h
deleted file mode 100644
index 3932ce68..00000000
--- a/dependencies2013/win32/include/freetype/ftgzip.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgzip.h                                                               */
-/*                                                                         */
-/*    Gzip-compressed stream support.                                      */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTGZIP_H_
-#define FTGZIP_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    gzip                                                               */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    GZIP Streams                                                       */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using gzip-compressed font files.                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Gzip-specific functions.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenGzip
-  *
-  * @description:
-  *   Open a new stream to parse gzip-compressed font files.  This is
-  *   mainly used to support the compressed `*.pcf.gz' fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream ::
-  *     The target embedding stream.
-  *
-  *   source ::
-  *     The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function `FT_Stream_Close' on the new stream will
-  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream.
-  *
-  *   In certain builds of the library, gzip compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a gzipped stream from
-  *   it and re-open the face with it.
-  *
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with zlib support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream  stream,
-                      FT_Stream  source );
-
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Gzip_Uncompress
-  *
-  * @description:
-  *   Decompress a zipped input buffer into an output buffer.  This function
-  *   is modeled after zlib's `uncompress' function.
-  *
-  * @input:
-  *   memory ::
-  *     A FreeType memory handle.
-  *
-  *   input ::
-  *     The input buffer.
-  *
-  *   input_len ::
-  *     The length of the input buffer.
-  *
-  * @output:
-  *   output::
-  *     The output buffer.
-  *
-  * @inout:
-  *   output_len ::
-  *     Before calling the function, this is the total size of the output
-  *     buffer, which must be large enough to hold the entire uncompressed
-  *     data (so the size of the uncompressed data must be known in
-  *     advance).  After calling the function, `output_len' is the size of
-  *     the used data in `output'.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with zlib support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Gzip_Uncompress( FT_Memory       memory,
-                      FT_Byte*        output,
-                      FT_ULong*       output_len,
-                      const FT_Byte*  input,
-                      FT_ULong        input_len );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTGZIP_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftimage.h b/dependencies2013/win32/include/freetype/ftimage.h
deleted file mode 100644
index 1d557c93..00000000
--- a/dependencies2013/win32/include/freetype/ftimage.h
+++ /dev/null
@@ -1,1214 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftimage.h                                                              */
-/*                                                                         */
-/*    FreeType glyph image formats and default raster interface            */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Note: A `raster' is simply a scan-line converter, used to render      */
-  /*       FT_Outlines into FT_Bitmaps.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTIMAGE_H_
-#define FTIMAGE_H_
-
-
-  /* STANDALONE_ is from ftgrays.c */
-#ifndef STANDALONE_
-#include <ft2build.h>
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Pos                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The type FT_Pos is used to store vectorial coordinates.  Depending */
-  /*    on the context, these can represent distances in integer font      */
-  /*    units, or 16.16, or 26.6 fixed-point pixel coordinates.            */
-  /*                                                                       */
-  typedef signed long  FT_Pos;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Vector                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2D vector; coordinates are of   */
-  /*    the FT_Pos type.                                                   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x :: The horizontal coordinate.                                    */
-  /*    y :: The vertical coordinate.                                      */
-  /*                                                                       */
-  typedef struct  FT_Vector_
-  {
-    FT_Pos  x;
-    FT_Pos  y;
-
-  } FT_Vector;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_BBox                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold an outline's bounding box, i.e., the      */
-  /*    coordinates of its extrema in the horizontal and vertical          */
-  /*    directions.                                                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    xMin :: The horizontal minimum (left-most).                        */
-  /*                                                                       */
-  /*    yMin :: The vertical minimum (bottom-most).                        */
-  /*                                                                       */
-  /*    xMax :: The horizontal maximum (right-most).                       */
-  /*                                                                       */
-  /*    yMax :: The vertical maximum (top-most).                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The bounding box is specified with the coordinates of the lower    */
-  /*    left and the upper right corner.  In PostScript, those values are  */
-  /*    often called (llx,lly) and (urx,ury), respectively.                */
-  /*                                                                       */
-  /*    If `yMin' is negative, this value gives the glyph's descender.     */
-  /*    Otherwise, the glyph doesn't descend below the baseline.           */
-  /*    Similarly, if `ymax' is positive, this value gives the glyph's     */
-  /*    ascender.                                                          */
-  /*                                                                       */
-  /*    `xMin' gives the horizontal distance from the glyph's origin to    */
-  /*    the left edge of the glyph's bounding box.  If `xMin' is negative, */
-  /*    the glyph extends to the left of the origin.                       */
-  /*                                                                       */
-  typedef struct  FT_BBox_
-  {
-    FT_Pos  xMin, yMin;
-    FT_Pos  xMax, yMax;
-
-  } FT_BBox;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Pixel_Mode                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type used to describe the format of pixels in a     */
-  /*    given bitmap.  Note that additional formats may be added in the    */
-  /*    future.                                                            */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_PIXEL_MODE_NONE ::                                              */
-  /*      Value~0 is reserved.                                             */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_MONO ::                                              */
-  /*      A monochrome bitmap, using 1~bit per pixel.  Note that pixels    */
-  /*      are stored in most-significant order (MSB), which means that     */
-  /*      the left-most pixel in a byte has value 128.                     */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY ::                                              */
-  /*      An 8-bit bitmap, generally used to represent anti-aliased glyph  */
-  /*      images.  Each pixel is stored in one byte.  Note that the number */
-  /*      of `gray' levels is stored in the `num_grays' field of the       */
-  /*      @FT_Bitmap structure (it generally is 256).                      */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY2 ::                                             */
-  /*      A 2-bit per pixel bitmap, used to represent embedded             */
-  /*      anti-aliased bitmaps in font files according to the OpenType     */
-  /*      specification.  We haven't found a single font using this        */
-  /*      format, however.                                                 */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY4 ::                                             */
-  /*      A 4-bit per pixel bitmap, representing embedded anti-aliased     */
-  /*      bitmaps in font files according to the OpenType specification.   */
-  /*      We haven't found a single font using this format, however.       */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_LCD ::                                               */
-  /*      An 8-bit bitmap, representing RGB or BGR decimated glyph images  */
-  /*      used for display on LCD displays; the bitmap is three times      */
-  /*      wider than the original glyph image.  See also                   */
-  /*      @FT_RENDER_MODE_LCD.                                             */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_LCD_V ::                                             */
-  /*      An 8-bit bitmap, representing RGB or BGR decimated glyph images  */
-  /*      used for display on rotated LCD displays; the bitmap is three    */
-  /*      times taller than the original glyph image.  See also            */
-  /*      @FT_RENDER_MODE_LCD_V.                                           */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_BGRA ::                                              */
-  /*      An image with four 8-bit channels per pixel, representing a      */
-  /*      color image (such as emoticons) with alpha channel.  For each    */
-  /*      pixel, the format is BGRA, which means, the blue channel comes   */
-  /*      first in memory.  The color channels are pre-multiplied and in   */
-  /*      the sRGB colorspace.  For example, full red at half-translucent  */
-  /*      opacity will be represented as `00,00,80,80', not `00,00,FF,80'. */
-  /*      See also @FT_LOAD_COLOR.                                         */
-  /*                                                                       */
-  typedef enum  FT_Pixel_Mode_
-  {
-    FT_PIXEL_MODE_NONE = 0,
-    FT_PIXEL_MODE_MONO,
-    FT_PIXEL_MODE_GRAY,
-    FT_PIXEL_MODE_GRAY2,
-    FT_PIXEL_MODE_GRAY4,
-    FT_PIXEL_MODE_LCD,
-    FT_PIXEL_MODE_LCD_V,
-    FT_PIXEL_MODE_BGRA,
-
-    FT_PIXEL_MODE_MAX      /* do not remove */
-
-  } FT_Pixel_Mode;
-
-
-  /* these constants are deprecated; use the corresponding `FT_Pixel_Mode' */
-  /* values instead.                                                       */
-#define ft_pixel_mode_none   FT_PIXEL_MODE_NONE
-#define ft_pixel_mode_mono   FT_PIXEL_MODE_MONO
-#define ft_pixel_mode_grays  FT_PIXEL_MODE_GRAY
-#define ft_pixel_mode_pal2   FT_PIXEL_MODE_GRAY2
-#define ft_pixel_mode_pal4   FT_PIXEL_MODE_GRAY4
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Bitmap                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe a bitmap or pixmap to the raster.     */
-  /*    Note that we now manage pixmaps of various depths through the      */
-  /*    `pixel_mode' field.                                                */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    rows         :: The number of bitmap rows.                         */
-  /*                                                                       */
-  /*    width        :: The number of pixels in bitmap row.                */
-  /*                                                                       */
-  /*    pitch        :: The pitch's absolute value is the number of bytes  */
-  /*                    taken by one bitmap row, including padding.        */
-  /*                    However, the pitch is positive when the bitmap has */
-  /*                    a `down' flow, and negative when it has an `up'    */
-  /*                    flow.  In all cases, the pitch is an offset to add */
-  /*                    to a bitmap pointer in order to go down one row.   */
-  /*                                                                       */
-  /*                    Note that `padding' means the alignment of a       */
-  /*                    bitmap to a byte border, and FreeType functions    */
-  /*                    normally align to the smallest possible integer    */
-  /*                    value.                                             */
-  /*                                                                       */
-  /*                    For the B/W rasterizer, `pitch' is always an even  */
-  /*                    number.                                            */
-  /*                                                                       */
-  /*                    To change the pitch of a bitmap (say, to make it a */
-  /*                    multiple of 4), use @FT_Bitmap_Convert.            */
-  /*                    Alternatively, you might use callback functions to */
-  /*                    directly render to the application's surface; see  */
-  /*                    the file `example2.cpp' in the tutorial for a      */
-  /*                    demonstration.                                     */
-  /*                                                                       */
-  /*    buffer       :: A typeless pointer to the bitmap buffer.  This     */
-  /*                    value should be aligned on 32-bit boundaries in    */
-  /*                    most cases.                                        */
-  /*                                                                       */
-  /*    num_grays    :: This field is only used with                       */
-  /*                    @FT_PIXEL_MODE_GRAY; it gives the number of gray   */
-  /*                    levels used in the bitmap.                         */
-  /*                                                                       */
-  /*    pixel_mode   :: The pixel mode, i.e., how pixel bits are stored.   */
-  /*                    See @FT_Pixel_Mode for possible values.            */
-  /*                                                                       */
-  /*    palette_mode :: This field is intended for paletted pixel modes;   */
-  /*                    it indicates how the palette is stored.  Not       */
-  /*                    used currently.                                    */
-  /*                                                                       */
-  /*    palette      :: A typeless pointer to the bitmap palette; this     */
-  /*                    field is intended for paletted pixel modes.  Not   */
-  /*                    used currently.                                    */
-  /*                                                                       */
-  typedef struct  FT_Bitmap_
-  {
-    unsigned int    rows;
-    unsigned int    width;
-    int             pitch;
-    unsigned char*  buffer;
-    unsigned short  num_grays;
-    unsigned char   pixel_mode;
-    unsigned char   palette_mode;
-    void*           palette;
-
-  } FT_Bitmap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Outline                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure is used to describe an outline to the scan-line     */
-  /*    converter.                                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    n_contours :: The number of contours in the outline.               */
-  /*                                                                       */
-  /*    n_points   :: The number of points in the outline.                 */
-  /*                                                                       */
-  /*    points     :: A pointer to an array of `n_points' @FT_Vector       */
-  /*                  elements, giving the outline's point coordinates.    */
-  /*                                                                       */
-  /*    tags       :: A pointer to an array of `n_points' chars, giving    */
-  /*                  each outline point's type.                           */
-  /*                                                                       */
-  /*                  If bit~0 is unset, the point is `off' the curve,     */
-  /*                  i.e., a Bézier control point, while it is `on' if    */
-  /*                  set.                                                 */
-  /*                                                                       */
-  /*                  Bit~1 is meaningful for `off' points only.  If set,  */
-  /*                  it indicates a third-order Bézier arc control point; */
-  /*                  and a second-order control point if unset.           */
-  /*                                                                       */
-  /*                  If bit~2 is set, bits 5-7 contain the drop-out mode  */
-  /*                  (as defined in the OpenType specification; the value */
-  /*                  is the same as the argument to the SCANMODE          */
-  /*                  instruction).                                        */
-  /*                                                                       */
-  /*                  Bits 3 and~4 are reserved for internal purposes.     */
-  /*                                                                       */
-  /*    contours   :: An array of `n_contours' shorts, giving the end      */
-  /*                  point of each contour within the outline.  For       */
-  /*                  example, the first contour is defined by the points  */
-  /*                  `0' to `contours[0]', the second one is defined by   */
-  /*                  the points `contours[0]+1' to `contours[1]', etc.    */
-  /*                                                                       */
-  /*    flags      :: A set of bit flags used to characterize the outline  */
-  /*                  and give hints to the scan-converter and hinter on   */
-  /*                  how to convert/grid-fit it.  See @FT_OUTLINE_XXX.    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The B/W rasterizer only checks bit~2 in the `tags' array for the   */
-  /*    first point of each contour.  The drop-out mode as given with      */
-  /*    @FT_OUTLINE_IGNORE_DROPOUTS, @FT_OUTLINE_SMART_DROPOUTS, and       */
-  /*    @FT_OUTLINE_INCLUDE_STUBS in `flags' is then overridden.           */
-  /*                                                                       */
-  typedef struct  FT_Outline_
-  {
-    short       n_contours;      /* number of contours in glyph        */
-    short       n_points;        /* number of points in the glyph      */
-
-    FT_Vector*  points;          /* the outline's points               */
-    char*       tags;            /* the points flags                   */
-    short*      contours;        /* the contour end points             */
-
-    int         flags;           /* outline masks                      */
-
-  } FT_Outline;
-
-  /* */
-
-  /* Following limits must be consistent with */
-  /* FT_Outline.{n_contours,n_points}         */
-#define FT_OUTLINE_CONTOURS_MAX  SHRT_MAX
-#define FT_OUTLINE_POINTS_MAX    SHRT_MAX
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_OUTLINE_XXX                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-field constants use for the flags in an outline's    */
-  /*    `flags' field.                                                     */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_OUTLINE_NONE ::                                                 */
-  /*      Value~0 is reserved.                                             */
-  /*                                                                       */
-  /*    FT_OUTLINE_OWNER ::                                                */
-  /*      If set, this flag indicates that the outline's field arrays      */
-  /*      (i.e., `points', `flags', and `contours') are `owned' by the     */
-  /*      outline object, and should thus be freed when it is destroyed.   */
-  /*                                                                       */
-  /*    FT_OUTLINE_EVEN_ODD_FILL ::                                        */
-  /*      By default, outlines are filled using the non-zero winding rule. */
-  /*      If set to 1, the outline will be filled using the even-odd fill  */
-  /*      rule (only works with the smooth rasterizer).                    */
-  /*                                                                       */
-  /*    FT_OUTLINE_REVERSE_FILL ::                                         */
-  /*      By default, outside contours of an outline are oriented in       */
-  /*      clock-wise direction, as defined in the TrueType specification.  */
-  /*      This flag is set if the outline uses the opposite direction      */
-  /*      (typically for Type~1 fonts).  This flag is ignored by the scan  */
-  /*      converter.                                                       */
-  /*                                                                       */
-  /*    FT_OUTLINE_IGNORE_DROPOUTS ::                                      */
-  /*      By default, the scan converter will try to detect drop-outs in   */
-  /*      an outline and correct the glyph bitmap to ensure consistent     */
-  /*      shape continuity.  If set, this flag hints the scan-line         */
-  /*      converter to ignore such cases.  See below for more information. */
-  /*                                                                       */
-  /*    FT_OUTLINE_SMART_DROPOUTS ::                                       */
-  /*      Select smart dropout control.  If unset, use simple dropout      */
-  /*      control.  Ignored if @FT_OUTLINE_IGNORE_DROPOUTS is set.  See    */
-  /*      below for more information.                                      */
-  /*                                                                       */
-  /*    FT_OUTLINE_INCLUDE_STUBS ::                                        */
-  /*      If set, turn pixels on for `stubs', otherwise exclude them.      */
-  /*      Ignored if @FT_OUTLINE_IGNORE_DROPOUTS is set.  See below for    */
-  /*      more information.                                                */
-  /*                                                                       */
-  /*    FT_OUTLINE_HIGH_PRECISION ::                                       */
-  /*      This flag indicates that the scan-line converter should try to   */
-  /*      convert this outline to bitmaps with the highest possible        */
-  /*      quality.  It is typically set for small character sizes.  Note   */
-  /*      that this is only a hint that might be completely ignored by a   */
-  /*      given scan-converter.                                            */
-  /*                                                                       */
-  /*    FT_OUTLINE_SINGLE_PASS ::                                          */
-  /*      This flag is set to force a given scan-converter to only use a   */
-  /*      single pass over the outline to render a bitmap glyph image.     */
-  /*      Normally, it is set for very large character sizes.  It is only  */
-  /*      a hint that might be completely ignored by a given               */
-  /*      scan-converter.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The flags @FT_OUTLINE_IGNORE_DROPOUTS, @FT_OUTLINE_SMART_DROPOUTS, */
-  /*    and @FT_OUTLINE_INCLUDE_STUBS are ignored by the smooth            */
-  /*    rasterizer.                                                        */
-  /*                                                                       */
-  /*    There exists a second mechanism to pass the drop-out mode to the   */
-  /*    B/W rasterizer; see the `tags' field in @FT_Outline.               */
-  /*                                                                       */
-  /*    Please refer to the description of the `SCANTYPE' instruction in   */
-  /*    the OpenType specification (in file `ttinst1.doc') how simple      */
-  /*    drop-outs, smart drop-outs, and stubs are defined.                 */
-  /*                                                                       */
-#define FT_OUTLINE_NONE             0x0
-#define FT_OUTLINE_OWNER            0x1
-#define FT_OUTLINE_EVEN_ODD_FILL    0x2
-#define FT_OUTLINE_REVERSE_FILL     0x4
-#define FT_OUTLINE_IGNORE_DROPOUTS  0x8
-#define FT_OUTLINE_SMART_DROPOUTS   0x10
-#define FT_OUTLINE_INCLUDE_STUBS    0x20
-
-#define FT_OUTLINE_HIGH_PRECISION   0x100
-#define FT_OUTLINE_SINGLE_PASS      0x200
-
-
-  /* these constants are deprecated; use the corresponding */
-  /* `FT_OUTLINE_XXX' values instead                       */
-#define ft_outline_none             FT_OUTLINE_NONE
-#define ft_outline_owner            FT_OUTLINE_OWNER
-#define ft_outline_even_odd_fill    FT_OUTLINE_EVEN_ODD_FILL
-#define ft_outline_reverse_fill     FT_OUTLINE_REVERSE_FILL
-#define ft_outline_ignore_dropouts  FT_OUTLINE_IGNORE_DROPOUTS
-#define ft_outline_high_precision   FT_OUTLINE_HIGH_PRECISION
-#define ft_outline_single_pass      FT_OUTLINE_SINGLE_PASS
-
-  /* */
-
-#define FT_CURVE_TAG( flag )  ( flag & 3 )
-
-#define FT_CURVE_TAG_ON            1
-#define FT_CURVE_TAG_CONIC         0
-#define FT_CURVE_TAG_CUBIC         2
-
-#define FT_CURVE_TAG_HAS_SCANMODE  4
-
-#define FT_CURVE_TAG_TOUCH_X       8  /* reserved for the TrueType hinter */
-#define FT_CURVE_TAG_TOUCH_Y      16  /* reserved for the TrueType hinter */
-
-#define FT_CURVE_TAG_TOUCH_BOTH    ( FT_CURVE_TAG_TOUCH_X | \
-                                     FT_CURVE_TAG_TOUCH_Y )
-
-#define FT_Curve_Tag_On       FT_CURVE_TAG_ON
-#define FT_Curve_Tag_Conic    FT_CURVE_TAG_CONIC
-#define FT_Curve_Tag_Cubic    FT_CURVE_TAG_CUBIC
-#define FT_Curve_Tag_Touch_X  FT_CURVE_TAG_TOUCH_X
-#define FT_Curve_Tag_Touch_Y  FT_CURVE_TAG_TOUCH_Y
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_MoveToFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `move  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `move to' is emitted to start a new contour in an outline.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    to   :: A pointer to the target point of the `move to'.            */
-  /*                                                                       */
-  /*    user :: A typeless pointer, which is passed from the caller of the */
-  /*            decomposition function.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_MoveToFunc)( const FT_Vector*  to,
-                            void*             user );
-
-#define FT_Outline_MoveTo_Func  FT_Outline_MoveToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_LineToFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `line  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `line to' is emitted to indicate a segment in the outline.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    to   :: A pointer to the target point of the `line to'.            */
-  /*                                                                       */
-  /*    user :: A typeless pointer, which is passed from the caller of the */
-  /*            decomposition function.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_LineToFunc)( const FT_Vector*  to,
-                            void*             user );
-
-#define FT_Outline_LineTo_Func  FT_Outline_LineToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_ConicToFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `conic */
-  /*    to' function during outline walking or decomposition.              */
-  /*                                                                       */
-  /*    A `conic to' is emitted to indicate a second-order Bézier arc in   */
-  /*    the outline.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    control :: An intermediate control point between the last position */
-  /*               and the new target in `to'.                             */
-  /*                                                                       */
-  /*    to      :: A pointer to the target end point of the conic arc.     */
-  /*                                                                       */
-  /*    user    :: A typeless pointer, which is passed from the caller of  */
-  /*               the decomposition function.                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_ConicToFunc)( const FT_Vector*  control,
-                             const FT_Vector*  to,
-                             void*             user );
-
-#define FT_Outline_ConicTo_Func  FT_Outline_ConicToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_CubicToFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `cubic */
-  /*    to' function during outline walking or decomposition.              */
-  /*                                                                       */
-  /*    A `cubic to' is emitted to indicate a third-order Bézier arc.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    control1 :: A pointer to the first Bézier control point.           */
-  /*                                                                       */
-  /*    control2 :: A pointer to the second Bézier control point.          */
-  /*                                                                       */
-  /*    to       :: A pointer to the target end point.                     */
-  /*                                                                       */
-  /*    user     :: A typeless pointer, which is passed from the caller of */
-  /*                the decomposition function.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_CubicToFunc)( const FT_Vector*  control1,
-                             const FT_Vector*  control2,
-                             const FT_Vector*  to,
-                             void*             user );
-
-#define FT_Outline_CubicTo_Func  FT_Outline_CubicToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Outline_Funcs                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure to hold various function pointers used during outline  */
-  /*    decomposition in order to emit segments, conic, and cubic Béziers. */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    move_to  :: The `move to' emitter.                                 */
-  /*                                                                       */
-  /*    line_to  :: The segment emitter.                                   */
-  /*                                                                       */
-  /*    conic_to :: The second-order Bézier arc emitter.                   */
-  /*                                                                       */
-  /*    cubic_to :: The third-order Bézier arc emitter.                    */
-  /*                                                                       */
-  /*    shift    :: The shift that is applied to coordinates before they   */
-  /*                are sent to the emitter.                               */
-  /*                                                                       */
-  /*    delta    :: The delta that is applied to coordinates before they   */
-  /*                are sent to the emitter, but after the shift.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The point coordinates sent to the emitters are the transformed     */
-  /*    version of the original coordinates (this is important for high    */
-  /*    accuracy during scan-conversion).  The transformation is simple:   */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      x' = (x << shift) - delta                                        */
-  /*      y' = (x << shift) - delta                                        */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Set the values of `shift' and `delta' to~0 to get the original     */
-  /*    point coordinates.                                                 */
-  /*                                                                       */
-  typedef struct  FT_Outline_Funcs_
-  {
-    FT_Outline_MoveToFunc   move_to;
-    FT_Outline_LineToFunc   line_to;
-    FT_Outline_ConicToFunc  conic_to;
-    FT_Outline_CubicToFunc  cubic_to;
-
-    int                     shift;
-    FT_Pos                  delta;
-
-  } FT_Outline_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_IMAGE_TAG                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four-letter tags to an unsigned long type.     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since many 16-bit compilers don't like 32-bit enumerations, you    */
-  /*    should redefine this macro in case of problems to something like   */
-  /*    this:                                                              */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  value         */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    to get a simple enumeration without assigning special numbers.     */
-  /*                                                                       */
-#ifndef FT_IMAGE_TAG
-#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  \
-          value = ( ( (unsigned long)_x1 << 24 ) | \
-                    ( (unsigned long)_x2 << 16 ) | \
-                    ( (unsigned long)_x3 << 8  ) | \
-                      (unsigned long)_x4         )
-#endif /* FT_IMAGE_TAG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Glyph_Format                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type used to describe the format of a given glyph   */
-  /*    image.  Note that this version of FreeType only supports two image */
-  /*    formats, even though future font drivers will be able to register  */
-  /*    their own format.                                                  */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_GLYPH_FORMAT_NONE ::                                            */
-  /*      The value~0 is reserved.                                         */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_COMPOSITE ::                                       */
-  /*      The glyph image is a composite of several other images.  This    */
-  /*      format is _only_ used with @FT_LOAD_NO_RECURSE, and is used to   */
-  /*      report compound glyphs (like accented characters).               */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_BITMAP ::                                          */
-  /*      The glyph image is a bitmap, and can be described as an          */
-  /*      @FT_Bitmap.  You generally need to access the `bitmap' field of  */
-  /*      the @FT_GlyphSlotRec structure to read it.                       */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_OUTLINE ::                                         */
-  /*      The glyph image is a vectorial outline made of line segments     */
-  /*      and Bézier arcs; it can be described as an @FT_Outline; you      */
-  /*      generally want to access the `outline' field of the              */
-  /*      @FT_GlyphSlotRec structure to read it.                           */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_PLOTTER ::                                         */
-  /*      The glyph image is a vectorial path with no inside and outside   */
-  /*      contours.  Some Type~1 fonts, like those in the Hershey family,  */
-  /*      contain glyphs in this format.  These are described as           */
-  /*      @FT_Outline, but FreeType isn't currently capable of rendering   */
-  /*      them correctly.                                                  */
-  /*                                                                       */
-  typedef enum  FT_Glyph_Format_
-  {
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0 ),
-
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't' )
-
-  } FT_Glyph_Format;
-
-
-  /* these constants are deprecated; use the corresponding */
-  /* `FT_Glyph_Format' values instead.                     */
-#define ft_glyph_format_none       FT_GLYPH_FORMAT_NONE
-#define ft_glyph_format_composite  FT_GLYPH_FORMAT_COMPOSITE
-#define ft_glyph_format_bitmap     FT_GLYPH_FORMAT_BITMAP
-#define ft_glyph_format_outline    FT_GLYPH_FORMAT_OUTLINE
-#define ft_glyph_format_plotter    FT_GLYPH_FORMAT_PLOTTER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****            R A S T E R   D E F I N I T I O N S                *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A raster is a scan converter, in charge of rendering an outline into  */
-  /* a a bitmap.  This section contains the public API for rasters.        */
-  /*                                                                       */
-  /* Note that in FreeType 2, all rasters are now encapsulated within      */
-  /* specific modules called `renderers'.  See `ftrender.h' for more       */
-  /* details on renderers.                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    raster                                                             */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Scanline Converter                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How vectorial outlines are converted into bitmaps and pixmaps.     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains technical definitions.                       */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Raster                                                          */
-  /*    FT_Span                                                            */
-  /*    FT_SpanFunc                                                        */
-  /*                                                                       */
-  /*    FT_Raster_Params                                                   */
-  /*    FT_RASTER_FLAG_XXX                                                 */
-  /*                                                                       */
-  /*    FT_Raster_NewFunc                                                  */
-  /*    FT_Raster_DoneFunc                                                 */
-  /*    FT_Raster_ResetFunc                                                */
-  /*    FT_Raster_SetModeFunc                                              */
-  /*    FT_Raster_RenderFunc                                               */
-  /*    FT_Raster_Funcs                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Raster                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle (pointer) to a raster object.  Each object can be */
-  /*    used independently to convert an outline into a bitmap or pixmap.  */
-  /*                                                                       */
-  typedef struct FT_RasterRec_*  FT_Raster;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Span                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a single span of gray pixels when        */
-  /*    rendering an anti-aliased bitmap.                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x        :: The span's horizontal start position.                  */
-  /*                                                                       */
-  /*    len      :: The span's length in pixels.                           */
-  /*                                                                       */
-  /*    coverage :: The span color/coverage, ranging from 0 (background)   */
-  /*                to 255 (foreground).                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is used by the span drawing callback type named     */
-  /*    @FT_SpanFunc that takes the y~coordinate of the span as a          */
-  /*    parameter.                                                         */
-  /*                                                                       */
-  /*    The coverage value is always between 0 and 255.  If you want less  */
-  /*    gray values, the callback function has to reduce them.             */
-  /*                                                                       */
-  typedef struct  FT_Span_
-  {
-    short           x;
-    unsigned short  len;
-    unsigned char   coverage;
-
-  } FT_Span;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_SpanFunc                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used as a call-back by the anti-aliased renderer in     */
-  /*    order to let client applications draw themselves the gray pixel    */
-  /*    spans on each scan line.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The scanline's y~coordinate.                              */
-  /*                                                                       */
-  /*    count :: The number of spans to draw on this scanline.             */
-  /*                                                                       */
-  /*    spans :: A table of `count' spans to draw on the scanline.         */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This callback allows client applications to directly render the    */
-  /*    gray spans of the anti-aliased bitmap to any kind of surfaces.     */
-  /*                                                                       */
-  /*    This can be used to write anti-aliased outlines directly to a      */
-  /*    given background bitmap, and even perform translucency.            */
-  /*                                                                       */
-  /*    Note that the `count' field cannot be greater than a fixed value   */
-  /*    defined by the `FT_MAX_GRAY_SPANS' configuration macro in          */
-  /*    `ftoption.h'.  By default, this value is set to~32, which means    */
-  /*    that if there are more than 32~spans on a given scanline, the      */
-  /*    callback is called several times with the same `y' parameter in    */
-  /*    order to draw all callbacks.                                       */
-  /*                                                                       */
-  /*    Otherwise, the callback is only called once per scan-line, and     */
-  /*    only for those scanlines that do have `gray' pixels on them.       */
-  /*                                                                       */
-  typedef void
-  (*FT_SpanFunc)( int             y,
-                  int             count,
-                  const FT_Span*  spans,
-                  void*           user );
-
-#define FT_Raster_Span_Func  FT_SpanFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_BitTest_Func                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Deprecated, unimplemented.                                         */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_BitTest_Func)( int    y,
-                             int    x,
-                             void*  user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_BitSet_Func                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Deprecated, unimplemented.                                         */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_BitSet_Func)( int    y,
-                            int    x,
-                            void*  user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_RASTER_FLAG_XXX                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flag constants as used in the `flags' field of a     */
-  /*    @FT_Raster_Params structure.                                       */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_RASTER_FLAG_DEFAULT :: This value is 0.                         */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_AA      :: This flag is set to indicate that an     */
-  /*                              anti-aliased glyph image should be       */
-  /*                              generated.  Otherwise, it will be        */
-  /*                              monochrome (1-bit).                      */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_DIRECT  :: This flag is set to indicate direct      */
-  /*                              rendering.  In this mode, client         */
-  /*                              applications must provide their own span */
-  /*                              callback.  This lets them directly       */
-  /*                              draw or compose over an existing bitmap. */
-  /*                              If this bit is not set, the target       */
-  /*                              pixmap's buffer _must_ be zeroed before  */
-  /*                              rendering.                               */
-  /*                                                                       */
-  /*                              Direct rendering is only possible with   */
-  /*                              anti-aliased glyphs.                     */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_CLIP    :: This flag is only used in direct         */
-  /*                              rendering mode.  If set, the output will */
-  /*                              be clipped to a box specified in the     */
-  /*                              `clip_box' field of the                  */
-  /*                              @FT_Raster_Params structure.             */
-  /*                                                                       */
-  /*                              Note that by default, the glyph bitmap   */
-  /*                              is clipped to the target pixmap, except  */
-  /*                              in direct rendering mode where all spans */
-  /*                              are generated if no clipping box is set. */
-  /*                                                                       */
-#define FT_RASTER_FLAG_DEFAULT  0x0
-#define FT_RASTER_FLAG_AA       0x1
-#define FT_RASTER_FLAG_DIRECT   0x2
-#define FT_RASTER_FLAG_CLIP     0x4
-
-  /* these constants are deprecated; use the corresponding */
-  /* `FT_RASTER_FLAG_XXX' values instead                   */
-#define ft_raster_flag_default  FT_RASTER_FLAG_DEFAULT
-#define ft_raster_flag_aa       FT_RASTER_FLAG_AA
-#define ft_raster_flag_direct   FT_RASTER_FLAG_DIRECT
-#define ft_raster_flag_clip     FT_RASTER_FLAG_CLIP
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Raster_Params                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure to hold the arguments used by a raster's render        */
-  /*    function.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    target      :: The target bitmap.                                  */
-  /*                                                                       */
-  /*    source      :: A pointer to the source glyph image (e.g., an       */
-  /*                   @FT_Outline).                                       */
-  /*                                                                       */
-  /*    flags       :: The rendering flags.                                */
-  /*                                                                       */
-  /*    gray_spans  :: The gray span drawing callback.                     */
-  /*                                                                       */
-  /*    black_spans :: Unused.                                             */
-  /*                                                                       */
-  /*    bit_test    :: Unused.                                             */
-  /*                                                                       */
-  /*    bit_set     :: Unused.                                             */
-  /*                                                                       */
-  /*    user        :: User-supplied data that is passed to each drawing   */
-  /*                   callback.                                           */
-  /*                                                                       */
-  /*    clip_box    :: An optional clipping box.  It is only used in       */
-  /*                   direct rendering mode.  Note that coordinates here  */
-  /*                   should be expressed in _integer_ pixels (and not in */
-  /*                   26.6 fixed-point units).                            */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An anti-aliased glyph bitmap is drawn if the @FT_RASTER_FLAG_AA    */
-  /*    bit flag is set in the `flags' field, otherwise a monochrome       */
-  /*    bitmap is generated.                                               */
-  /*                                                                       */
-  /*    If the @FT_RASTER_FLAG_DIRECT bit flag is set in `flags', the      */
-  /*    raster will call the `gray_spans' callback to draw gray pixel      */
-  /*    spans.  This allows direct composition over a pre-existing bitmap  */
-  /*    through user-provided callbacks to perform the span drawing and    */
-  /*    composition.    Not supported by the monochrome rasterizer.        */
-  /*                                                                       */
-  typedef struct  FT_Raster_Params_
-  {
-    const FT_Bitmap*        target;
-    const void*             source;
-    int                     flags;
-    FT_SpanFunc             gray_spans;
-    FT_SpanFunc             black_spans;  /* unused */
-    FT_Raster_BitTest_Func  bit_test;     /* unused */
-    FT_Raster_BitSet_Func   bit_set;      /* unused */
-    void*                   user;
-    FT_BBox                 clip_box;
-
-  } FT_Raster_Params;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_NewFunc                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to create a new raster object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory allocator.                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    raster :: A handle to the new raster object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `memory' parameter is a typeless pointer in order to avoid     */
-  /*    un-wanted dependencies on the rest of the FreeType code.  In       */
-  /*    practice, it is an @FT_Memory object, i.e., a handle to the        */
-  /*    standard FreeType memory allocator.  However, this field can be    */
-  /*    completely ignored by a given raster implementation.               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_NewFunc)( void*       memory,
-                        FT_Raster*  raster );
-
-#define FT_Raster_New_Func  FT_Raster_NewFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_DoneFunc                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to destroy a given raster object.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the raster object.                           */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_DoneFunc)( FT_Raster  raster );
-
-#define FT_Raster_Done_Func  FT_Raster_DoneFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_ResetFunc                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType used to provide an area of memory called the `render      */
-  /*    pool' available to all registered rasters.  This was not thread    */
-  /*    safe however and now FreeType never allocates this pool.  NULL     */
-  /*    is always passed in as pool_base.                                  */
-  /*                                                                       */
-  /*    This function is called each time the render pool changes, or just */
-  /*    after a new raster object is created.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster    :: A handle to the new raster object.                    */
-  /*                                                                       */
-  /*    pool_base :: The address in memory of the render pool.             */
-  /*                                                                       */
-  /*    pool_size :: The size in bytes of the render pool.                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Rasters should ignore the render pool and rely on dynamic or stack */
-  /*    allocation if they want to (a handle to the memory allocator is    */
-  /*    passed to the raster constructor).                                 */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_ResetFunc)( FT_Raster       raster,
-                          unsigned char*  pool_base,
-                          unsigned long   pool_size );
-
-#define FT_Raster_Reset_Func  FT_Raster_ResetFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_SetModeFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is a generic facility to change modes or attributes  */
-  /*    in a given raster.  This can be used for debugging purposes, or    */
-  /*    simply to allow implementation-specific `features' in a given      */
-  /*    raster module.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the new raster object.                       */
-  /*                                                                       */
-  /*    mode   :: A 4-byte tag used to name the mode or property.          */
-  /*                                                                       */
-  /*    args   :: A pointer to the new mode/property to use.               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_SetModeFunc)( FT_Raster      raster,
-                            unsigned long  mode,
-                            void*          args );
-
-#define FT_Raster_Set_Mode_Func  FT_Raster_SetModeFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_RenderFunc                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Invoke a given raster to scan-convert a given glyph image into a   */
-  /*    target bitmap.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the raster object.                           */
-  /*                                                                       */
-  /*    params :: A pointer to an @FT_Raster_Params structure used to      */
-  /*              store the rendering parameters.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0~means success.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The exact format of the source image depends on the raster's glyph */
-  /*    format defined in its @FT_Raster_Funcs structure.  It can be an    */
-  /*    @FT_Outline or anything else in order to support a large array of  */
-  /*    glyph formats.                                                     */
-  /*                                                                       */
-  /*    Note also that the render function can fail and return a           */
-  /*    `FT_Err_Unimplemented_Feature' error code if the raster used does  */
-  /*    not support direct composition.                                    */
-  /*                                                                       */
-  /*    XXX: For now, the standard raster doesn't support direct           */
-  /*         composition but this should change for the final release (see */
-  /*         the files `demos/src/ftgrays.c' and `demos/src/ftgrays2.c'    */
-  /*         for examples of distinct implementations that support direct  */
-  /*         composition).                                                 */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_RenderFunc)( FT_Raster                raster,
-                           const FT_Raster_Params*  params );
-
-#define FT_Raster_Render_Func  FT_Raster_RenderFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Raster_Funcs                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   A structure used to describe a given raster class to the library.   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    glyph_format  :: The supported glyph format for this raster.       */
-  /*                                                                       */
-  /*    raster_new    :: The raster constructor.                           */
-  /*                                                                       */
-  /*    raster_reset  :: Used to reset the render pool within the raster.  */
-  /*                                                                       */
-  /*    raster_render :: A function to render a glyph into a given bitmap. */
-  /*                                                                       */
-  /*    raster_done   :: The raster destructor.                            */
-  /*                                                                       */
-  typedef struct  FT_Raster_Funcs_
-  {
-    FT_Glyph_Format        glyph_format;
-    FT_Raster_NewFunc      raster_new;
-    FT_Raster_ResetFunc    raster_reset;
-    FT_Raster_SetModeFunc  raster_set_mode;
-    FT_Raster_RenderFunc   raster_render;
-    FT_Raster_DoneFunc     raster_done;
-
-  } FT_Raster_Funcs;
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTIMAGE_H_ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
diff --git a/dependencies2013/win32/include/freetype/ftincrem.h b/dependencies2013/win32/include/freetype/ftincrem.h
deleted file mode 100644
index 46b58b79..00000000
--- a/dependencies2013/win32/include/freetype/ftincrem.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftincrem.h                                                             */
-/*                                                                         */
-/*    FreeType incremental loading (specification).                        */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTINCREM_H_
-#define FTINCREM_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /***************************************************************************
-   *
-   * @section:
-   *    incremental
-   *
-   * @title:
-   *    Incremental Loading
-   *
-   * @abstract:
-   *    Custom Glyph Loading.
-   *
-   * @description:
-   *   This section contains various functions used to perform so-called
-   *   `incremental' glyph loading.  This is a mode where all glyphs loaded
-   *   from a given @FT_Face are provided by the client application.
-   *
-   *   Apart from that, all other tables are loaded normally from the font
-   *   file.  This mode is useful when FreeType is used within another
-   *   engine, e.g., a PostScript Imaging Processor.
-   *
-   *   To enable this mode, you must use @FT_Open_Face, passing an
-   *   @FT_Parameter with the @FT_PARAM_TAG_INCREMENTAL tag and an
-   *   @FT_Incremental_Interface value.  See the comments for
-   *   @FT_Incremental_InterfaceRec for an example.
-   *
-   */
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental
-   *
-   * @description:
-   *   An opaque type describing a user-provided object used to implement
-   *   `incremental' glyph loading within FreeType.  This is used to support
-   *   embedded fonts in certain environments (e.g., PostScript interpreters),
-   *   where the glyph data isn't in the font file, or must be overridden by
-   *   different values.
-   *
-   * @note:
-   *   It is up to client applications to create and implement @FT_Incremental
-   *   objects, as long as they provide implementations for the methods
-   *   @FT_Incremental_GetGlyphDataFunc, @FT_Incremental_FreeGlyphDataFunc
-   *   and @FT_Incremental_GetGlyphMetricsFunc.
-   *
-   *   See the description of @FT_Incremental_InterfaceRec to understand how
-   *   to use incremental objects with FreeType.
-   *
-   */
-  typedef struct FT_IncrementalRec_*  FT_Incremental;
-
-
-  /***************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_MetricsRec
-   *
-   * @description:
-   *   A small structure used to contain the basic glyph metrics returned
-   *   by the @FT_Incremental_GetGlyphMetricsFunc method.
-   *
-   * @fields:
-   *   bearing_x ::
-   *     Left bearing, in font units.
-   *
-   *   bearing_y ::
-   *     Top bearing, in font units.
-   *
-   *   advance ::
-   *     Horizontal component of glyph advance, in font units.
-   *
-   *   advance_v ::
-   *     Vertical component of glyph advance, in font units.
-   *
-   * @note:
-   *   These correspond to horizontal or vertical metrics depending on the
-   *   value of the `vertical' argument to the function
-   *   @FT_Incremental_GetGlyphMetricsFunc.
-   *
-   */
-  typedef struct  FT_Incremental_MetricsRec_
-  {
-    FT_Long  bearing_x;
-    FT_Long  bearing_y;
-    FT_Long  advance;
-    FT_Long  advance_v;     /* since 2.3.12 */
-
-  } FT_Incremental_MetricsRec;
-
-
-  /***************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_Metrics
-   *
-   * @description:
-   *   A handle to an @FT_Incremental_MetricsRec structure.
-   *
-   */
-   typedef struct FT_Incremental_MetricsRec_*  FT_Incremental_Metrics;
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_GetGlyphDataFunc
-   *
-   * @description:
-   *   A function called by FreeType to access a given glyph's data bytes
-   *   during @FT_Load_Glyph or @FT_Load_Char if incremental loading is
-   *   enabled.
-   *
-   *   Note that the format of the glyph's data bytes depends on the font
-   *   file format.  For TrueType, it must correspond to the raw bytes within
-   *   the `glyf' table.  For PostScript formats, it must correspond to the
-   *   *unencrypted* charstring bytes, without any `lenIV' header.  It is
-   *   undefined for any other format.
-   *
-   * @input:
-   *   incremental ::
-   *     Handle to an opaque @FT_Incremental handle provided by the client
-   *     application.
-   *
-   *   glyph_index ::
-   *     Index of relevant glyph.
-   *
-   * @output:
-   *   adata ::
-   *     A structure describing the returned glyph data bytes (which will be
-   *     accessed as a read-only byte block).
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   If this function returns successfully the method
-   *   @FT_Incremental_FreeGlyphDataFunc will be called later to release
-   *   the data bytes.
-   *
-   *   Nested calls to @FT_Incremental_GetGlyphDataFunc can happen for
-   *   compound glyphs.
-   *
-   */
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphDataFunc)( FT_Incremental  incremental,
-                                      FT_UInt         glyph_index,
-                                      FT_Data*        adata );
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_FreeGlyphDataFunc
-   *
-   * @description:
-   *   A function used to release the glyph data bytes returned by a
-   *   successful call to @FT_Incremental_GetGlyphDataFunc.
-   *
-   * @input:
-   *   incremental ::
-   *     A handle to an opaque @FT_Incremental handle provided by the client
-   *     application.
-   *
-   *   data ::
-   *     A structure describing the glyph data bytes (which will be accessed
-   *     as a read-only byte block).
-   *
-   */
-  typedef void
-  (*FT_Incremental_FreeGlyphDataFunc)( FT_Incremental  incremental,
-                                       FT_Data*        data );
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_GetGlyphMetricsFunc
-   *
-   * @description:
-   *   A function used to retrieve the basic metrics of a given glyph index
-   *   before accessing its data.  This is necessary because, in certain
-   *   formats like TrueType, the metrics are stored in a different place from
-   *   the glyph images proper.
-   *
-   * @input:
-   *   incremental ::
-   *     A handle to an opaque @FT_Incremental handle provided by the client
-   *     application.
-   *
-   *   glyph_index ::
-   *     Index of relevant glyph.
-   *
-   *   vertical ::
-   *     If true, return vertical metrics.
-   *
-   *   ametrics ::
-   *     This parameter is used for both input and output.
-   *     The original glyph metrics, if any, in font units.  If metrics are
-   *     not available all the values must be set to zero.
-   *
-   * @output:
-   *   ametrics ::
-   *     The replacement glyph metrics in font units.
-   *
-   */
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphMetricsFunc)
-                      ( FT_Incremental              incremental,
-                        FT_UInt                     glyph_index,
-                        FT_Bool                     vertical,
-                        FT_Incremental_MetricsRec  *ametrics );
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_FuncsRec
-   *
-   * @description:
-   *   A table of functions for accessing fonts that load data
-   *   incrementally.  Used in @FT_Incremental_InterfaceRec.
-   *
-   * @fields:
-   *   get_glyph_data ::
-   *     The function to get glyph data.  Must not be null.
-   *
-   *   free_glyph_data ::
-   *     The function to release glyph data.  Must not be null.
-   *
-   *   get_glyph_metrics ::
-   *     The function to get glyph metrics.  May be null if the font does
-   *     not provide overriding glyph metrics.
-   *
-   */
-  typedef struct  FT_Incremental_FuncsRec_
-  {
-    FT_Incremental_GetGlyphDataFunc     get_glyph_data;
-    FT_Incremental_FreeGlyphDataFunc    free_glyph_data;
-    FT_Incremental_GetGlyphMetricsFunc  get_glyph_metrics;
-
-  } FT_Incremental_FuncsRec;
-
-
-  /***************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_InterfaceRec
-   *
-   * @description:
-   *   A structure to be used with @FT_Open_Face to indicate that the user
-   *   wants to support incremental glyph loading.  You should use it with
-   *   @FT_PARAM_TAG_INCREMENTAL as in the following example:
-   *
-   *     {
-   *       FT_Incremental_InterfaceRec  inc_int;
-   *       FT_Parameter                 parameter;
-   *       FT_Open_Args                 open_args;
-   *
-   *
-   *       // set up incremental descriptor
-   *       inc_int.funcs  = my_funcs;
-   *       inc_int.object = my_object;
-   *
-   *       // set up optional parameter
-   *       parameter.tag  = FT_PARAM_TAG_INCREMENTAL;
-   *       parameter.data = &inc_int;
-   *
-   *       // set up FT_Open_Args structure
-   *       open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;
-   *       open_args.pathname   = my_font_pathname;
-   *       open_args.num_params = 1;
-   *       open_args.params     = &parameter; // we use one optional argument
-   *
-   *       // open the font
-   *       error = FT_Open_Face( library, &open_args, index, &face );
-   *       ...
-   *     }
-   *
-   */
-  typedef struct  FT_Incremental_InterfaceRec_
-  {
-    const FT_Incremental_FuncsRec*  funcs;
-    FT_Incremental                  object;
-
-  } FT_Incremental_InterfaceRec;
-
-
-  /***************************************************************************
-   *
-   * @type:
-   *   FT_Incremental_Interface
-   *
-   * @description:
-   *   A pointer to an @FT_Incremental_InterfaceRec structure.
-   *
-   */
-  typedef FT_Incremental_InterfaceRec*   FT_Incremental_Interface;
-
-
-  /***************************************************************************
-   *
-   * @constant:
-   *   FT_PARAM_TAG_INCREMENTAL
-   *
-   * @description:
-   *   A constant used as the tag of @FT_Parameter structures to indicate
-   *   an incremental loading object to be used by FreeType.
-   *
-   */
-#define FT_PARAM_TAG_INCREMENTAL  FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTINCREM_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftlcdfil.h b/dependencies2013/win32/include/freetype/ftlcdfil.h
deleted file mode 100644
index e06a8957..00000000
--- a/dependencies2013/win32/include/freetype/ftlcdfil.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlcdfil.h                                                             */
-/*                                                                         */
-/*    FreeType API for color filtering of subpixel bitmap glyphs           */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 2006-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTLCDFIL_H_
-#define FTLCDFIL_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /***************************************************************************
-   *
-   * @section:
-   *   lcd_filtering
-   *
-   * @title:
-   *   LCD Filtering
-   *
-   * @abstract:
-   *   Reduce color fringes of subpixel-rendered bitmaps.
-   *
-   * @description:
-   *   Subpixel rendering exploits the color-striped structure of LCD
-   *   pixels, increasing the available resolution in the direction of the
-   *   stripe (usually horizontal RGB) by a factor of~3.  Since these
-   *   subpixels are color pixels, using them unfiltered creates severe
-   *   color fringes.  Use the @FT_Library_SetLcdFilter API to specify a
-   *   low-pass filter, which is then applied to subpixel-rendered bitmaps
-   *   generated through @FT_Render_Glyph.  The filter sacrifices some of
-   *   the higher resolution to reduce color fringes, making the glyph image
-   *   slightly blurrier.  Positional improvements will remain.
-   *
-   *   Note that no filter is active by default, and that this function is
-   *   *not* implemented in default builds of the library.  You need to
-   *   #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your `ftoption.h' file
-   *   in order to activate it and explicitly call @FT_Library_SetLcdFilter
-   *   to enable it.
-   *
-   *   A filter should have two properties:
-   *
-   *   1) It should be normalized, meaning the sum of the 5~components
-   *      should be 256 (0x100).  It is possible to go above or under this
-   *      target sum, however: going under means tossing out contrast, going
-   *      over means invoking clamping and thereby non-linearities that
-   *      increase contrast somewhat at the expense of greater distortion
-   *      and color-fringing.  Contrast is better enhanced through stem
-   *      darkening.
-   *
-   *   2) It should be color-balanced, meaning a filter `{~a, b, c, b, a~}'
-   *      where a~+ b~=~c.  It distributes the computed coverage for one
-   *      subpixel to all subpixels equally, sacrificing some won resolution
-   *      but drastically reducing color-fringing.  Positioning improvements
-   *      remain!  Note that color-fringing can only really be minimized
-   *      when using a color-balanced filter and alpha-blending the glyph
-   *      onto a surface in linear space; see @FT_Render_Glyph.
-   *
-   *   Regarding the form, a filter can be a `boxy' filter or a `beveled'
-   *   filter.  Boxy filters are sharper but are less forgiving of non-ideal
-   *   gamma curves of a screen (viewing angles!), beveled filters are
-   *   fuzzier but more tolerant.
-   *
-   *   Examples:
-   *
-   *   - [0x10 0x40 0x70 0x40 0x10] is beveled and neither balanced nor
-   *     normalized.
-   *
-   *   - [0x1A 0x33 0x4D 0x33 0x1A] is beveled and balanced but not
-   *     normalized.
-   *
-   *   - [0x19 0x33 0x66 0x4c 0x19] is beveled and normalized but not
-   *     balanced.
-   *
-   *   - [0x00 0x4c 0x66 0x4c 0x00] is boxily beveled and normalized but not
-   *     balanced.
-   *
-   *   - [0x00 0x55 0x56 0x55 0x00] is boxy, normalized, and almost
-   *     balanced.
-   *
-   *   - [0x08 0x4D 0x56 0x4D 0x08] is beveled, normalized and, almost
-   *     balanced.
-   *
-   *   The filter affects glyph bitmaps rendered through @FT_Render_Glyph,
-   *   @FT_Load_Glyph, and @FT_Load_Char.  It does _not_ affect the output
-   *   of @FT_Outline_Render and @FT_Outline_Get_Bitmap.
-   *
-   *   If this feature is activated, the dimensions of LCD glyph bitmaps are
-   *   either wider or taller than the dimensions of the corresponding
-   *   outline with regard to the pixel grid.  For example, for
-   *   @FT_RENDER_MODE_LCD, the filter adds 3~subpixels to the left, and
-   *   3~subpixels to the right.  The bitmap offset values are adjusted
-   *   accordingly, so clients shouldn't need to modify their layout and
-   *   glyph positioning code when enabling the filter.
-   *
-   *   It is important to understand that linear alpha blending and gamma
-   *   correction is critical for correctly rendering glyphs onto surfaces
-   *   without artifacts and even more critical when subpixel rendering is
-   *   involved.
-   *
-   *   Each of the 3~alpha values (subpixels) is independently used to blend
-   *   one color channel.  That is, red alpha blends the red channel of the
-   *   text color with the red channel of the background pixel.  The
-   *   distribution of density values by the color-balanced filter assumes
-   *   alpha blending is done in linear space; only then color artifacts
-   *   cancel out.
-   */
-
-
-  /****************************************************************************
-   *
-   * @enum:
-   *   FT_LcdFilter
-   *
-   * @description:
-   *   A list of values to identify various types of LCD filters.
-   *
-   * @values:
-   *   FT_LCD_FILTER_NONE ::
-   *     Do not perform filtering.  When used with subpixel rendering, this
-   *     results in sometimes severe color fringes.
-   *
-   *   FT_LCD_FILTER_DEFAULT ::
-   *     The default filter reduces color fringes considerably, at the cost
-   *     of a slight blurriness in the output.
-   *
-   *     It is a beveled, normalized, and color-balanced five-tap filter
-   *     that is more forgiving to screens with non-ideal gamma curves and
-   *     viewing angles.  Note that while color-fringing is reduced, it can
-   *     only be minimized by using linear alpha blending and gamma
-   *     correction to render glyphs onto surfaces.  The default filter
-   *     weights are [0x08 0x4D 0x56 0x4D 0x08].
-   *
-   *   FT_LCD_FILTER_LIGHT ::
-   *     The light filter is a variant that is sharper at the cost of
-   *     slightly more color fringes than the default one.
-   *
-   *     It is a boxy, normalized, and color-balanced three-tap filter that
-   *     is less forgiving to screens with non-ideal gamma curves and
-   *     viewing angles.  This filter works best when the rendering system
-   *     uses linear alpha blending and gamma correction to render glyphs
-   *     onto surfaces.  The light filter weights are
-   *     [0x00 0x55 0x56 0x55 0x00].
-   *
-   *   FT_LCD_FILTER_LEGACY ::
-   *     This filter corresponds to the original libXft color filter.  It
-   *     provides high contrast output but can exhibit really bad color
-   *     fringes if glyphs are not extremely well hinted to the pixel grid.
-   *     In other words, it only works well if the TrueType bytecode
-   *     interpreter is enabled *and* high-quality hinted fonts are used.
-   *
-   *     This filter is only provided for comparison purposes, and might be
-   *     disabled or stay unsupported in the future.
-   *
-   *   FT_LCD_FILTER_LEGACY1 ::
-   *     For historical reasons, the FontConfig library returns a different
-   *     enumeration value for legacy LCD filtering.  To make code work that
-   *     (incorrectly) forwards FontConfig's enumeration value to
-   *     @FT_Library_SetLcdFilter without proper mapping, it is thus easiest
-   *     to have another enumeration value, which is completely equal to
-   *     `FT_LCD_FILTER_LEGACY'.
-   *
-   * @since:
-   *   2.3.0 (`FT_LCD_FILTER_LEGACY1' since 2.6.2)
-   */
-  typedef enum  FT_LcdFilter_
-  {
-    FT_LCD_FILTER_NONE    = 0,
-    FT_LCD_FILTER_DEFAULT = 1,
-    FT_LCD_FILTER_LIGHT   = 2,
-    FT_LCD_FILTER_LEGACY1 = 3,
-    FT_LCD_FILTER_LEGACY  = 16,
-
-    FT_LCD_FILTER_MAX   /* do not remove */
-
-  } FT_LcdFilter;
-
-
-  /**************************************************************************
-   *
-   * @func:
-   *   FT_Library_SetLcdFilter
-   *
-   * @description:
-   *   This function is used to apply color filtering to LCD decimated
-   *   bitmaps, like the ones used when calling @FT_Render_Glyph with
-   *   @FT_RENDER_MODE_LCD or @FT_RENDER_MODE_LCD_V.
-   *
-   * @input:
-   *   library ::
-   *     A handle to the target library instance.
-   *
-   *   filter ::
-   *     The filter type.
-   *
-   *     You can use @FT_LCD_FILTER_NONE here to disable this feature, or
-   *     @FT_LCD_FILTER_DEFAULT to use a default filter that should work
-   *     well on most LCD screens.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   This feature is always disabled by default.  Clients must make an
-   *   explicit call to this function with a `filter' value other than
-   *   @FT_LCD_FILTER_NONE in order to enable it.
-   *
-   *   Due to *PATENTS* covering subpixel rendering, this function doesn't
-   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
-   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
-   *   defined in your build of the library, which should correspond to all
-   *   default builds of FreeType.
-   *
-   * @since:
-   *   2.3.0
-   */
-  FT_EXPORT( FT_Error )
-  FT_Library_SetLcdFilter( FT_Library    library,
-                           FT_LcdFilter  filter );
-
-
-  /**************************************************************************
-   *
-   * @func:
-   *   FT_Library_SetLcdFilterWeights
-   *
-   * @description:
-   *   This function can be used to enable LCD filter with custom weights,
-   *   instead of using presets in @FT_Library_SetLcdFilter.
-   *
-   * @input:
-   *   library ::
-   *     A handle to the target library instance.
-   *
-   *   weights ::
-   *     A pointer to an array; the function copies the first five bytes and
-   *     uses them to specify the filter weights.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   Due to *PATENTS* covering subpixel rendering, this function doesn't
-   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
-   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
-   *   defined in your build of the library, which should correspond to all
-   *   default builds of FreeType.
-   *
-   * @since:
-   *   2.4.0
-   */
-  FT_EXPORT( FT_Error )
-  FT_Library_SetLcdFilterWeights( FT_Library      library,
-                                  unsigned char  *weights );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTLCDFIL_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftlist.h b/dependencies2013/win32/include/freetype/ftlist.h
deleted file mode 100644
index 82f437ac..00000000
--- a/dependencies2013/win32/include/freetype/ftlist.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlist.h                                                               */
-/*                                                                         */
-/*    Generic list support for FreeType (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file implements functions relative to list processing.  Its     */
-  /*  data structures are defined in `freetype.h'.                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTLIST_H_
-#define FTLIST_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    list_processing                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    List Processing                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Simple management of lists.                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various definitions related to list          */
-  /*    processing using doubly-linked nodes.                              */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_List                                                            */
-  /*    FT_ListNode                                                        */
-  /*    FT_ListRec                                                         */
-  /*    FT_ListNodeRec                                                     */
-  /*                                                                       */
-  /*    FT_List_Add                                                        */
-  /*    FT_List_Insert                                                     */
-  /*    FT_List_Find                                                       */
-  /*    FT_List_Remove                                                     */
-  /*    FT_List_Up                                                         */
-  /*    FT_List_Iterate                                                    */
-  /*    FT_List_Iterator                                                   */
-  /*    FT_List_Finalize                                                   */
-  /*    FT_List_Destructor                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Find                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Find the list node for a given listed object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    data :: The address of the listed object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    List node.  NULL if it wasn't found.                               */
-  /*                                                                       */
-  FT_EXPORT( FT_ListNode )
-  FT_List_Find( FT_List  list,
-                void*    data );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Add                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Append an element to the end of a list.                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    node :: The node to append.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Add( FT_List      list,
-               FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Insert                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Insert an element at the head of a list.                           */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to parent list.                                  */
-  /*    node :: The node to insert.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Insert( FT_List      list,
-                  FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Remove                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Remove a node from a list.  This function doesn't check whether    */
-  /*    the node is in the list!                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node :: The node to remove.                                        */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Remove( FT_List      list,
-                  FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Up                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Move a node to the head/top of a list.  Used to maintain LRU       */
-  /*    lists.                                                             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    node :: The node to move.                                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Up( FT_List      list,
-              FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_List_Iterator                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An FT_List iterator function that is called during a list parse    */
-  /*    by @FT_List_Iterate.                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node :: The current iteration list node.                           */
-  /*                                                                       */
-  /*    user :: A typeless pointer passed to @FT_List_Iterate.             */
-  /*            Can be used to point to the iteration's state.             */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_List_Iterator)( FT_ListNode  node,
-                       void*        user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Iterate                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Parse a list and calls a given iterator function on each element.  */
-  /*    Note that parsing is stopped as soon as one of the iterator calls  */
-  /*    returns a non-zero value.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list     :: A handle to the list.                                  */
-  /*    iterator :: An iterator function, called on each node of the list. */
-  /*    user     :: A user-supplied field that is passed as the second     */
-  /*                argument to the iterator.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result (a FreeType error code) of the last iterator call.      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_List_Iterate( FT_List           list,
-                   FT_List_Iterator  iterator,
-                   void*             user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_List_Destructor                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An @FT_List iterator function that is called during a list         */
-  /*    finalization by @FT_List_Finalize to destroy all elements in a     */
-  /*    given list.                                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    system :: The current system object.                               */
-  /*                                                                       */
-  /*    data   :: The current object to destroy.                           */
-  /*                                                                       */
-  /*    user   :: A typeless pointer passed to @FT_List_Iterate.  It can   */
-  /*              be used to point to the iteration's state.               */
-  /*                                                                       */
-  typedef void
-  (*FT_List_Destructor)( FT_Memory  memory,
-                         void*      data,
-                         void*      user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Finalize                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy all elements in the list as well as the list itself.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list    :: A handle to the list.                                   */
-  /*                                                                       */
-  /*    destroy :: A list destructor that will be applied to each element  */
-  /*               of the list.  Set this to NULL if not needed.           */
-  /*                                                                       */
-  /*    memory  :: The current memory object that handles deallocation.    */
-  /*                                                                       */
-  /*    user    :: A user-supplied field that is passed as the last        */
-  /*               argument to the destructor.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function expects that all nodes added by @FT_List_Add or      */
-  /*    @FT_List_Insert have been dynamically allocated.                   */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Finalize( FT_List             list,
-                    FT_List_Destructor  destroy,
-                    FT_Memory           memory,
-                    void*               user );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTLIST_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftlzw.h b/dependencies2013/win32/include/freetype/ftlzw.h
deleted file mode 100644
index 582e2c14..00000000
--- a/dependencies2013/win32/include/freetype/ftlzw.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlzw.h                                                                */
-/*                                                                         */
-/*    LZW-compressed stream support.                                       */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTLZW_H_
-#define FTLZW_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    lzw                                                                */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    LZW Streams                                                        */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using LZW-compressed font files.                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of LZW-specific functions.   */
-  /*                                                                       */
-  /*************************************************************************/
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenLZW
-  *
-  * @description:
-  *   Open a new stream to parse LZW-compressed font files.  This is
-  *   mainly used to support the compressed `*.pcf.Z' fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream :: The target embedding stream.
-  *
-  *   source :: The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function `FT_Stream_Close' on the new stream will
-  *   *not* call `FT_Stream_Close' on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream
-  *
-  *   In certain builds of the library, LZW compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a LZW stream from it
-  *   and re-open the face with it.
-  *
-  *   This function may return `FT_Err_Unimplemented_Feature' if your build
-  *   of FreeType was not compiled with LZW support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenLZW( FT_Stream  stream,
-                     FT_Stream  source );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTLZW_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftmac.h b/dependencies2013/win32/include/freetype/ftmac.h
deleted file mode 100644
index adb15cad..00000000
--- a/dependencies2013/win32/include/freetype/ftmac.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmac.h                                                                */
-/*                                                                         */
-/*    Additional Mac-specific API.                                         */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* NOTE: Include this file after FT_FREETYPE_H and after any               */
-/*       Mac-specific headers (because this header uses Mac types such as  */
-/*       Handle, FSSpec, FSRef, etc.)                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTMAC_H_
-#define FTMAC_H_
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-/* gcc-3.4.1 and later can warn about functions tagged as deprecated */
-#ifndef FT_DEPRECATED_ATTRIBUTE
-#if defined(__GNUC__)                                               && \
-    ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
-#define FT_DEPRECATED_ATTRIBUTE  __attribute__((deprecated))
-#else
-#define FT_DEPRECATED_ATTRIBUTE
-#endif
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    mac_specific                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Mac Specific Interface                                             */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Only available on the Macintosh.                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following definitions are only available if FreeType is        */
-  /*    compiled on a Macintosh.                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FOND                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new face object from a FOND resource.                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fond       :: A FOND resource.                                     */
-  /*                                                                       */
-  /*    face_index :: Only supported for the -1 `sanity check' special     */
-  /*                  case.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Notes>                                                               */
-  /*    This function can be used to create @FT_Face objects from fonts    */
-  /*    that are installed in the system as follows.                       */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      fond = GetResource( 'FOND', fontName );                          */
-  /*      error = FT_New_Face_From_FOND( library, fond, 0, &face );        */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FOND( FT_Library  library,
-                         Handle      fond,
-                         FT_Long     face_index,
-                         FT_Face    *aface )
-                       FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFile_From_Mac_Name                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return an FSSpec for the disk file containing the named font.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName   :: Mac OS name of the font (e.g., Times New Roman       */
-  /*                  Bold).                                               */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    pathSpec   :: FSSpec to the file.  For passing to                  */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /*    face_index :: Index of the face.  For passing to                   */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GetFile_From_Mac_Name( const char*  fontName,
-                            FSSpec*      pathSpec,
-                            FT_Long*     face_index )
-                          FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFile_From_Mac_ATS_Name                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return an FSSpec for the disk file containing the named font.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName   :: Mac OS name of the font in ATS framework.            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    pathSpec   :: FSSpec to the file. For passing to                   */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /*    face_index :: Index of the face. For passing to                    */
-  /*                  @FT_New_Face_From_FSSpec.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GetFile_From_Mac_ATS_Name( const char*  fontName,
-                                FSSpec*      pathSpec,
-                                FT_Long*     face_index )
-                              FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFilePath_From_Mac_ATS_Name                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a pathname of the disk file and face index for given font   */
-  /*    name that is handled by ATS framework.                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName    :: Mac OS name of the font in ATS framework.           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    path        :: Buffer to store pathname of the file.  For passing  */
-  /*                   to @FT_New_Face.  The client must allocate this     */
-  /*                   buffer before calling this function.                */
-  /*                                                                       */
-  /*    maxPathSize :: Lengths of the buffer `path' that client allocated. */
-  /*                                                                       */
-  /*    face_index  :: Index of the face.  For passing to @FT_New_Face.    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_GetFilePath_From_Mac_ATS_Name( const char*  fontName,
-                                    UInt8*       path,
-                                    UInt32       maxPathSize,
-                                    FT_Long*     face_index )
-                                  FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FSSpec                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new face object from a given resource and typeface index  */
-  /*    using an FSSpec to the font file.                                  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    spec       :: FSSpec to the font file.                             */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index~0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    @FT_New_Face_From_FSSpec is identical to @FT_New_Face except       */
-  /*    it accepts an FSSpec instead of a path.                            */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FSSpec( FT_Library     library,
-                           const FSSpec  *spec,
-                           FT_Long        face_index,
-                           FT_Face       *aface )
-                         FT_DEPRECATED_ATTRIBUTE;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FSRef                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new face object from a given resource and typeface index  */
-  /*    using an FSRef to the font file.                                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    spec       :: FSRef to the font file.                              */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index~0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    @FT_New_Face_From_FSRef is identical to @FT_New_Face except        */
-  /*    it accepts an FSRef instead of a path.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FSRef( FT_Library    library,
-                          const FSRef  *ref,
-                          FT_Long       face_index,
-                          FT_Face      *aface )
-                        FT_DEPRECATED_ATTRIBUTE;
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* FTMAC_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftmm.h b/dependencies2013/win32/include/freetype/ftmm.h
deleted file mode 100644
index 6c05f0c3..00000000
--- a/dependencies2013/win32/include/freetype/ftmm.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmm.h                                                                 */
-/*                                                                         */
-/*    FreeType Multiple Master font interface (specification).             */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTMM_H_
-#define FTMM_H_
-
-
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    multiple_masters                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Multiple Masters                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to manage Multiple Masters fonts.                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following types and functions are used to manage Multiple      */
-  /*    Master fonts, i.e., the selection of specific design instances by  */
-  /*    setting design axis coordinates.                                   */
-  /*                                                                       */
-  /*    George Williams has extended this interface to make it work with   */
-  /*    both Type~1 Multiple Masters fonts and GX distortable (var)        */
-  /*    fonts.  Some of these routines only work with MM fonts, others     */
-  /*    will work with both types.  They are similar enough that a         */
-  /*    consistent interface makes sense.                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_MM_Axis                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a given axis in design space for  */
-  /*    Multiple Masters fonts.                                            */
-  /*                                                                       */
-  /*    This structure can't be used for GX var fonts.                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    name    :: The axis's name.                                        */
-  /*                                                                       */
-  /*    minimum :: The axis's minimum design coordinate.                   */
-  /*                                                                       */
-  /*    maximum :: The axis's maximum design coordinate.                   */
-  /*                                                                       */
-  typedef struct  FT_MM_Axis_
-  {
-    FT_String*  name;
-    FT_Long     minimum;
-    FT_Long     maximum;
-
-  } FT_MM_Axis;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Multi_Master                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the axes and space of a Multiple Masters */
-  /*    font.                                                              */
-  /*                                                                       */
-  /*    This structure can't be used for GX var fonts.                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_axis    :: Number of axes.  Cannot exceed~4.                   */
-  /*                                                                       */
-  /*    num_designs :: Number of designs; should be normally 2^num_axis    */
-  /*                   even though the Type~1 specification strangely      */
-  /*                   allows for intermediate designs to be present.      */
-  /*                   This number cannot exceed~16.                       */
-  /*                                                                       */
-  /*    axis        :: A table of axis descriptors.                        */
-  /*                                                                       */
-  typedef struct  FT_Multi_Master_
-  {
-    FT_UInt     num_axis;
-    FT_UInt     num_designs;
-    FT_MM_Axis  axis[T1_MAX_MM_AXIS];
-
-  } FT_Multi_Master;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Var_Axis                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a given axis in design space for  */
-  /*    Multiple Masters and GX var fonts.                                 */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    name    :: The axis's name.                                        */
-  /*               Not always meaningful for GX.                           */
-  /*                                                                       */
-  /*    minimum :: The axis's minimum design coordinate.                   */
-  /*                                                                       */
-  /*    def     :: The axis's default design coordinate.                   */
-  /*               FreeType computes meaningful default values for MM; it  */
-  /*               is then an integer value, not in 16.16 format.          */
-  /*                                                                       */
-  /*    maximum :: The axis's maximum design coordinate.                   */
-  /*                                                                       */
-  /*    tag     :: The axis's tag (the GX equivalent to `name').           */
-  /*               FreeType provides default values for MM if possible.    */
-  /*                                                                       */
-  /*    strid   :: The entry in `name' table (another GX version of        */
-  /*               `name').                                                */
-  /*               Not meaningful for MM.                                  */
-  /*                                                                       */
-  typedef struct  FT_Var_Axis_
-  {
-    FT_String*  name;
-
-    FT_Fixed    minimum;
-    FT_Fixed    def;
-    FT_Fixed    maximum;
-
-    FT_ULong    tag;
-    FT_UInt     strid;
-
-  } FT_Var_Axis;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Var_Named_Style                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a named style in a GX var font.   */
-  /*                                                                       */
-  /*    This structure can't be used for MM fonts.                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    coords :: The design coordinates for this style.                   */
-  /*              This is an array with one entry for each axis.           */
-  /*                                                                       */
-  /*    strid  :: The entry in `name' table identifying this style.        */
-  /*                                                                       */
-  typedef struct  FT_Var_Named_Style_
-  {
-    FT_Fixed*  coords;
-    FT_UInt    strid;
-
-  } FT_Var_Named_Style;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_MM_Var                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the axes and space of a Multiple Masters */
-  /*    or GX var distortable font.                                        */
-  /*                                                                       */
-  /*    Some fields are specific to one format and not to the other.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_axis        :: The number of axes.  The maximum value is~4 for */
-  /*                       MM; no limit in GX.                             */
-  /*                                                                       */
-  /*    num_designs     :: The number of designs; should be normally       */
-  /*                       2^num_axis for MM fonts.  Not meaningful for GX */
-  /*                       (where every glyph could have a different       */
-  /*                       number of designs).                             */
-  /*                                                                       */
-  /*    num_namedstyles :: The number of named styles; only meaningful for */
-  /*                       GX that allows certain design coordinates to    */
-  /*                       have a string ID (in the `name' table)          */
-  /*                       associated with them.  The font can tell the    */
-  /*                       user that, for example, Weight=1.5 is `Bold'.   */
-  /*                                                                       */
-  /*    axis            :: An axis descriptor table.                       */
-  /*                       GX fonts contain slightly more data than MM.    */
-  /*                       Memory management of this pointer is done       */
-  /*                       internally by FreeType.                         */
-  /*                                                                       */
-  /*    namedstyle      :: A named style table.                            */
-  /*                       Only meaningful with GX.                        */
-  /*                       Memory management of this pointer is done       */
-  /*                       internally by FreeType.                         */
-  /*                                                                       */
-  typedef struct  FT_MM_Var_
-  {
-    FT_UInt              num_axis;
-    FT_UInt              num_designs;
-    FT_UInt              num_namedstyles;
-    FT_Var_Axis*         axis;
-    FT_Var_Named_Style*  namedstyle;
-
-  } FT_MM_Var;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Multi_Master                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the Multiple Master descriptor of a given font.           */
-  /*                                                                       */
-  /*    This function can't be used with GX fonts.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face.                            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amaster :: The Multiple Masters descriptor.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Multi_Master( FT_Face           face,
-                       FT_Multi_Master  *amaster );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_MM_Var                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the Multiple Master/GX var descriptor of a given font.    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face.                            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amaster :: The Multiple Masters/GX var descriptor.                 */
-  /*               Allocates a data structure, which the user must         */
-  /*               deallocate with `free' after use.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_MM_Var( FT_Face      face,
-                 FT_MM_Var*  *amaster );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_MM_Design_Coordinates                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Masters fonts, choose an interpolated font design     */
-  /*    through design coordinates.                                        */
-  /*                                                                       */
-  /*    This function can't be used with GX fonts.                         */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of available design coordinates.  If it   */
-  /*                  is larger than the number of axes, ignore the excess */
-  /*                  values.  If it is smaller than the number of axes,   */
-  /*                  use default values for the remaining axes.           */
-  /*                                                                       */
-  /*    coords     :: An array of design coordinates.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Design_Coordinates( FT_Face   face,
-                                FT_UInt   num_coords,
-                                FT_Long*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Var_Design_Coordinates                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Master or GX Var fonts, choose an interpolated font   */
-  /*    design through design coordinates.                                 */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of available design coordinates.  If it   */
-  /*                  is larger than the number of axes, ignore the excess */
-  /*                  values.  If it is smaller than the number of axes,   */
-  /*                  use default values for the remaining axes.           */
-  /*                                                                       */
-  /*    coords     :: An array of design coordinates.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Var_Design_Coordinates( FT_Face    face,
-                                 FT_UInt    num_coords,
-                                 FT_Fixed*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_MM_Blend_Coordinates                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Masters and GX var fonts, choose an interpolated font */
-  /*    design through normalized blend coordinates.                       */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of available design coordinates.  If it   */
-  /*                  is larger than the number of axes, ignore the excess */
-  /*                  values.  If it is smaller than the number of axes,   */
-  /*                  use default values for the remaining axes.           */
-  /*                                                                       */
-  /*    coords     :: The design coordinates array (each element must be   */
-  /*                  between 0 and 1.0).                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Blend_Coordinates( FT_Face    face,
-                               FT_UInt    num_coords,
-                               FT_Fixed*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Var_Blend_Coordinates                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is another name of @FT_Set_MM_Blend_Coordinates.              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Var_Blend_Coordinates( FT_Face    face,
-                                FT_UInt    num_coords,
-                                FT_Fixed*  coords );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTMM_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftmodapi.h b/dependencies2013/win32/include/freetype/ftmodapi.h
deleted file mode 100644
index b4d2758e..00000000
--- a/dependencies2013/win32/include/freetype/ftmodapi.h
+++ /dev/null
@@ -1,667 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmodapi.h                                                             */
-/*                                                                         */
-/*    FreeType modules public interface (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTMODAPI_H_
-#define FTMODAPI_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Module Management                                                  */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to add, upgrade, remove, and control modules from FreeType.    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The definitions below are used to manage modules within FreeType.  */
-  /*    Modules can be added, upgraded, and removed at runtime.            */
-  /*    Additionally, some module properties can be controlled also.       */
-  /*                                                                       */
-  /*    Here is a list of possible values of the `module_name' field in    */
-  /*    the @FT_Module_Class structure.                                    */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      autofitter                                                       */
-  /*      bdf                                                              */
-  /*      cff                                                              */
-  /*      gxvalid                                                          */
-  /*      otvalid                                                          */
-  /*      pcf                                                              */
-  /*      pfr                                                              */
-  /*      psaux                                                            */
-  /*      pshinter                                                         */
-  /*      psnames                                                          */
-  /*      raster1                                                          */
-  /*      sfnt                                                             */
-  /*      smooth, smooth-lcd, smooth-lcdv                                  */
-  /*      truetype                                                         */
-  /*      type1                                                            */
-  /*      type42                                                           */
-  /*      t1cid                                                            */
-  /*      winfonts                                                         */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Note that the FreeType Cache sub-system is not a FreeType module.  */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Module                                                          */
-  /*    FT_Module_Constructor                                              */
-  /*    FT_Module_Destructor                                               */
-  /*    FT_Module_Requester                                                */
-  /*    FT_Module_Class                                                    */
-  /*                                                                       */
-  /*    FT_Add_Module                                                      */
-  /*    FT_Get_Module                                                      */
-  /*    FT_Remove_Module                                                   */
-  /*    FT_Add_Default_Modules                                             */
-  /*                                                                       */
-  /*    FT_Property_Set                                                    */
-  /*    FT_Property_Get                                                    */
-  /*                                                                       */
-  /*    FT_New_Library                                                     */
-  /*    FT_Done_Library                                                    */
-  /*    FT_Reference_Library                                               */
-  /*                                                                       */
-  /*    FT_Renderer                                                        */
-  /*    FT_Renderer_Class                                                  */
-  /*                                                                       */
-  /*    FT_Get_Renderer                                                    */
-  /*    FT_Set_Renderer                                                    */
-  /*                                                                       */
-  /*    FT_Set_Debug_Hook                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* module bit flags */
-#define FT_MODULE_FONT_DRIVER         1  /* this module is a font driver  */
-#define FT_MODULE_RENDERER            2  /* this module is a renderer     */
-#define FT_MODULE_HINTER              4  /* this module is a glyph hinter */
-#define FT_MODULE_STYLER              8  /* this module is a styler       */
-
-#define FT_MODULE_DRIVER_SCALABLE      0x100  /* the driver supports      */
-                                              /* scalable fonts           */
-#define FT_MODULE_DRIVER_NO_OUTLINES   0x200  /* the driver does not      */
-                                              /* support vector outlines  */
-#define FT_MODULE_DRIVER_HAS_HINTER    0x400  /* the driver provides its  */
-                                              /* own hinter               */
-#define FT_MODULE_DRIVER_HINTS_LIGHTLY 0x800  /* the driver's hinter      */
-                                              /* produces LIGHT hints     */
-
-
-  /* deprecated values */
-#define ft_module_font_driver         FT_MODULE_FONT_DRIVER
-#define ft_module_renderer            FT_MODULE_RENDERER
-#define ft_module_hinter              FT_MODULE_HINTER
-#define ft_module_styler              FT_MODULE_STYLER
-
-#define ft_module_driver_scalable       FT_MODULE_DRIVER_SCALABLE
-#define ft_module_driver_no_outlines    FT_MODULE_DRIVER_NO_OUTLINES
-#define ft_module_driver_has_hinter     FT_MODULE_DRIVER_HAS_HINTER
-#define ft_module_driver_hints_lightly  FT_MODULE_DRIVER_HINTS_LIGHTLY
-
-
-  typedef FT_Pointer  FT_Module_Interface;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Constructor                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to initialize (not create) a new module object.    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module :: The module to initialize.                                */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_Module_Constructor)( FT_Module  module );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Destructor                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to finalize (not destroy) a given module object.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module :: The module to finalize.                                  */
-  /*                                                                       */
-  typedef void
-  (*FT_Module_Destructor)( FT_Module  module );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Requester                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to query a given module for a specific interface.  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module :: The module to be searched.                               */
-  /*                                                                       */
-  /*    name ::   The name of the interface in the module.                 */
-  /*                                                                       */
-  typedef FT_Module_Interface
-  (*FT_Module_Requester)( FT_Module    module,
-                          const char*  name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Module_Class                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The module class descriptor.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    module_flags    :: Bit flags describing the module.                */
-  /*                                                                       */
-  /*    module_size     :: The size of one module object/instance in       */
-  /*                       bytes.                                          */
-  /*                                                                       */
-  /*    module_name     :: The name of the module.                         */
-  /*                                                                       */
-  /*    module_version  :: The version, as a 16.16 fixed number            */
-  /*                       (major.minor).                                  */
-  /*                                                                       */
-  /*    module_requires :: The version of FreeType this module requires,   */
-  /*                       as a 16.16 fixed number (major.minor).  Starts  */
-  /*                       at version 2.0, i.e., 0x20000.                  */
-  /*                                                                       */
-  /*    module_init     :: The initializing function.                      */
-  /*                                                                       */
-  /*    module_done     :: The finalizing function.                        */
-  /*                                                                       */
-  /*    get_interface   :: The interface requesting function.              */
-  /*                                                                       */
-  typedef struct  FT_Module_Class_
-  {
-    FT_ULong               module_flags;
-    FT_Long                module_size;
-    const FT_String*       module_name;
-    FT_Fixed               module_version;
-    FT_Fixed               module_requires;
-
-    const void*            module_interface;
-
-    FT_Module_Constructor  module_init;
-    FT_Module_Destructor   module_done;
-    FT_Module_Requester    get_interface;
-
-  } FT_Module_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Add_Module                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Add a new module to a given library instance.                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to the library object.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    clazz   :: A pointer to class descriptor for the module.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error will be returned if a module already exists by that name, */
-  /*    or if the module requires a version of FreeType that is too great. */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Add_Module( FT_Library              library,
-                 const FT_Module_Class*  clazz );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Module                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Find a module by its name.                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object.                     */
-  /*                                                                       */
-  /*    module_name :: The module's name (as an ASCII string).             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A module handle.  0~if none was found.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    FreeType's internal modules aren't documented very well, and you   */
-  /*    should look up the source code for details.                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Module )
-  FT_Get_Module( FT_Library   library,
-                 const char*  module_name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Remove_Module                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Remove a given module from a library instance.                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module  :: A handle to a module object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The module object is destroyed by the function in case of success. */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Remove_Module( FT_Library  library,
-                    FT_Module   module );
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Property_Set
-   *
-   * @description:
-   *    Set a property for a given module.
-   *
-   * @input:
-   *    library ::
-   *       A handle to the library the module is part of.
-   *
-   *    module_name ::
-   *       The module name.
-   *
-   *    property_name ::
-   *       The property name.  Properties are described in the `Synopsis'
-   *       subsection of the module's documentation.
-   *
-   *       Note that only a few modules have properties.
-   *
-   *    value ::
-   *       A generic pointer to a variable or structure that gives the new
-   *       value of the property.  The exact definition of `value' is
-   *       dependent on the property; see the `Synopsis' subsection of the
-   *       module's documentation.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *    If `module_name' isn't a valid module name, or `property_name'
-   *    doesn't specify a valid property, or if `value' doesn't represent a
-   *    valid value for the given property, an error is returned.
-   *
-   *    The following example sets property `bar' (a simple integer) in
-   *    module `foo' to value~1.
-   *
-   *    {
-   *      FT_UInt  bar;
-   *
-   *
-   *      bar = 1;
-   *      FT_Property_Set( library, "foo", "bar", &bar );
-   *    }
-   *
-   *    Note that the FreeType Cache sub-system doesn't recognize module
-   *    property changes.  To avoid glyph lookup confusion within the cache
-   *    you should call @FTC_Manager_Reset to completely flush the cache if
-   *    a module property gets changed after @FTC_Manager_New has been
-   *    called.
-   *
-   *    It is not possible to set properties of the FreeType Cache
-   *    sub-system itself with FT_Property_Set; use @FTC_Property_Set
-   *    instead.
-   *
-   *  @since:
-   *    2.4.11
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Property_Set( FT_Library        library,
-                   const FT_String*  module_name,
-                   const FT_String*  property_name,
-                   const void*       value );
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Property_Get
-   *
-   * @description:
-   *    Get a module's property value.
-   *
-   * @input:
-   *    library ::
-   *       A handle to the library the module is part of.
-   *
-   *    module_name ::
-   *       The module name.
-   *
-   *    property_name ::
-   *       The property name.  Properties are described in the `Synopsis'
-   *       subsection of the module's documentation.
-   *
-   * @inout:
-   *    value ::
-   *       A generic pointer to a variable or structure that gives the
-   *       value of the property.  The exact definition of `value' is
-   *       dependent on the property; see the `Synopsis' subsection of the
-   *       module's documentation.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *    If `module_name' isn't a valid module name, or `property_name'
-   *    doesn't specify a valid property, or if `value' doesn't represent a
-   *    valid value for the given property, an error is returned.
-   *
-   *    The following example gets property `baz' (a range) in module `foo'.
-   *
-   *    {
-   *      typedef  range_
-   *      {
-   *        FT_Int32  min;
-   *        FT_Int32  max;
-   *
-   *      } range;
-   *
-   *      range  baz;
-   *
-   *
-   *      FT_Property_Get( library, "foo", "baz", &baz );
-   *    }
-   *
-   *    It is not possible to retrieve properties of the FreeType Cache
-   *    sub-system with FT_Property_Get; use @FTC_Property_Get instead.
-   *
-   *  @since:
-   *    2.4.11
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Property_Get( FT_Library        library,
-                   const FT_String*  module_name,
-                   const FT_String*  property_name,
-                   void*             value );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Reference_Library                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A counter gets initialized to~1 at the time an @FT_Library         */
-  /*    structure is created.  This function increments the counter.       */
-  /*    @FT_Done_Library then only destroys a library if the counter is~1, */
-  /*    otherwise it simply decrements the counter.                        */
-  /*                                                                       */
-  /*    This function helps in managing life-cycles of structures that     */
-  /*    reference @FT_Library objects.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a target library object.                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Since>                                                               */
-  /*    2.4.2                                                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Reference_Library( FT_Library  library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Library                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to create a new FreeType library instance    */
-  /*    from a given memory object.  It is thus possible to use libraries  */
-  /*    with distinct memory allocators within the same program.  Note,    */
-  /*    however, that the used @FT_Memory structure is expected to remain  */
-  /*    valid for the life of the @FT_Library object.                      */
-  /*                                                                       */
-  /*    Normally, you would call this function (followed by a call to      */
-  /*    @FT_Add_Default_Modules or a series of calls to @FT_Add_Module)    */
-  /*    instead of @FT_Init_FreeType to initialize the FreeType library.   */
-  /*                                                                       */
-  /*    Don't use @FT_Done_FreeType but @FT_Done_Library to destroy a      */
-  /*    library instance.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory   :: A handle to the original memory object.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    alibrary :: A pointer to handle of a new library object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Library.                                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Library( FT_Memory    memory,
-                  FT_Library  *alibrary );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Library                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard a given library object.  This closes all drivers and       */
-  /*    discards all resource objects.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the target library.                         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See the discussion of reference counters in the description of     */
-  /*    @FT_Reference_Library.                                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Library( FT_Library  library );
-
-  /* */
-
-  typedef void
-  (*FT_DebugHook_Func)( void*  arg );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Debug_Hook                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Set a debug hook function for debugging the interpreter of a font  */
-  /*    format.                                                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hook_index :: The index of the debug hook.  You should use the     */
-  /*                  values defined in `ftobjs.h', e.g.,                  */
-  /*                  `FT_DEBUG_HOOK_TRUETYPE'.                            */
-  /*                                                                       */
-  /*    debug_hook :: The function used to debug the interpreter.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Currently, four debug hook slots are available, but only two (for  */
-  /*    the TrueType and the Type~1 interpreter) are defined.              */
-  /*                                                                       */
-  /*    Since the internal headers of FreeType are no longer installed,    */
-  /*    the symbol `FT_DEBUG_HOOK_TRUETYPE' isn't available publicly.      */
-  /*    This is a bug and will be fixed in a forthcoming release.          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Set_Debug_Hook( FT_Library         library,
-                     FT_UInt            hook_index,
-                     FT_DebugHook_Func  debug_hook );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Add_Default_Modules                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Add the set of default drivers to a given library object.          */
-  /*    This is only useful when you create a library object with          */
-  /*    @FT_New_Library (usually to plug a custom memory manager).         */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to a new library object.                       */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Add_Default_Modules( FT_Library  library );
-
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   truetype_engine
-   *
-   * @title:
-   *   The TrueType Engine
-   *
-   * @abstract:
-   *   TrueType bytecode support.
-   *
-   * @description:
-   *   This section contains a function used to query the level of TrueType
-   *   bytecode support compiled in this version of the library.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   *  @enum:
-   *     FT_TrueTypeEngineType
-   *
-   *  @description:
-   *     A list of values describing which kind of TrueType bytecode
-   *     engine is implemented in a given FT_Library instance.  It is used
-   *     by the @FT_Get_TrueType_Engine_Type function.
-   *
-   *  @values:
-   *     FT_TRUETYPE_ENGINE_TYPE_NONE ::
-   *       The library doesn't implement any kind of bytecode interpreter.
-   *
-   *     FT_TRUETYPE_ENGINE_TYPE_UNPATENTED ::
-   *       Deprecated and removed.
-   *
-   *     FT_TRUETYPE_ENGINE_TYPE_PATENTED ::
-   *       The library implements a bytecode interpreter that covers
-   *       the full instruction set of the TrueType virtual machine (this
-   *       was governed by patents until May 2010, hence the name).
-   *
-   *  @since:
-   *     2.2
-   *
-   */
-  typedef enum  FT_TrueTypeEngineType_
-  {
-    FT_TRUETYPE_ENGINE_TYPE_NONE = 0,
-    FT_TRUETYPE_ENGINE_TYPE_UNPATENTED,
-    FT_TRUETYPE_ENGINE_TYPE_PATENTED
-
-  } FT_TrueTypeEngineType;
-
-
-  /**************************************************************************
-   *
-   *  @func:
-   *     FT_Get_TrueType_Engine_Type
-   *
-   *  @description:
-   *     Return an @FT_TrueTypeEngineType value to indicate which level of
-   *     the TrueType virtual machine a given library instance supports.
-   *
-   *  @input:
-   *     library ::
-   *       A library instance.
-   *
-   *  @return:
-   *     A value indicating which level is supported.
-   *
-   *  @since:
-   *     2.2
-   *
-   */
-  FT_EXPORT( FT_TrueTypeEngineType )
-  FT_Get_TrueType_Engine_Type( FT_Library  library );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTMODAPI_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftmoderr.h b/dependencies2013/win32/include/freetype/ftmoderr.h
deleted file mode 100644
index 2a7671c8..00000000
--- a/dependencies2013/win32/include/freetype/ftmoderr.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmoderr.h                                                             */
-/*                                                                         */
-/*    FreeType module error offsets (specification).                       */
-/*                                                                         */
-/*  Copyright 2001-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to define the FreeType module error codes.          */
-  /*                                                                       */
-  /* If the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in `ftoption.h' is    */
-  /* set, the lower byte of an error value identifies the error code as    */
-  /* usual.  In addition, the higher byte identifies the module.  For      */
-  /* example, the error `FT_Err_Invalid_File_Format' has value 0x0003, the */
-  /* error `TT_Err_Invalid_File_Format' has value 0x1303, the error        */
-  /* `T1_Err_Invalid_File_Format' has value 0x1403, etc.                   */
-  /*                                                                       */
-  /* Note that `FT_Err_Ok', `TT_Err_Ok', etc. are always equal to zero,    */
-  /* including the high byte.                                              */
-  /*                                                                       */
-  /* If FT_CONFIG_OPTION_USE_MODULE_ERRORS isn't set, the higher byte of   */
-  /* an error value is set to zero.                                        */
-  /*                                                                       */
-  /* To hide the various `XXX_Err_' prefixes in the source code, FreeType  */
-  /* provides some macros in `fttypes.h'.                                  */
-  /*                                                                       */
-  /*   FT_ERR( err )                                                       */
-  /*     Add current error module prefix (as defined with the              */
-  /*     `FT_ERR_PREFIX' macro) to `err'.  For example, in the BDF module  */
-  /*     the line                                                          */
-  /*                                                                       */
-  /*       error = FT_ERR( Invalid_Outline );                              */
-  /*                                                                       */
-  /*     expands to                                                        */
-  /*                                                                       */
-  /*       error = BDF_Err_Invalid_Outline;                                */
-  /*                                                                       */
-  /*     For simplicity, you can always use `FT_Err_Ok' directly instead   */
-  /*     of `FT_ERR( Ok )'.                                                */
-  /*                                                                       */
-  /*   FT_ERR_EQ( errcode, err )                                           */
-  /*   FT_ERR_NEQ( errcode, err )                                          */
-  /*     Compare error code `errcode' with the error `err' for equality    */
-  /*     and inequality, respectively.  Example:                           */
-  /*                                                                       */
-  /*       if ( FT_ERR_EQ( error, Invalid_Outline ) )                      */
-  /*         ...                                                           */
-  /*                                                                       */
-  /*     Using this macro you don't have to think about error prefixes.    */
-  /*     Of course, if module errors are not active, the above example is  */
-  /*     the same as                                                       */
-  /*                                                                       */
-  /*       if ( error == FT_Err_Invalid_Outline )                          */
-  /*         ...                                                           */
-  /*                                                                       */
-  /*   FT_ERROR_BASE( errcode )                                            */
-  /*   FT_ERROR_MODULE( errcode )                                          */
-  /*     Get base error and module error code, respectively.               */
-  /*                                                                       */
-  /*                                                                       */
-  /* It can also be used to create a module error message table easily     */
-  /* with something like                                                   */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     #undef FTMODERR_H_                                                */
-  /*     #define FT_MODERRDEF( e, v, s )  { FT_Mod_Err_ ## e, s },         */
-  /*     #define FT_MODERR_START_LIST     {                                */
-  /*     #define FT_MODERR_END_LIST       { 0, 0 } };                      */
-  /*                                                                       */
-  /*     const struct                                                      */
-  /*     {                                                                 */
-  /*       int          mod_err_offset;                                    */
-  /*       const char*  mod_err_msg                                        */
-  /*     } ft_mod_errors[] =                                               */
-  /*                                                                       */
-  /*     #include FT_MODULE_ERRORS_H                                       */
-  /*   }                                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTMODERR_H_
-#define FTMODERR_H_
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                       SETUP MACROS                      *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#undef  FT_NEED_EXTERN_C
-
-#ifndef FT_MODERRDEF
-
-#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = v,
-#else
-#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = 0,
-#endif
-
-#define FT_MODERR_START_LIST  enum {
-#define FT_MODERR_END_LIST    FT_Mod_Err_Max };
-
-#ifdef __cplusplus
-#define FT_NEED_EXTERN_C
-  extern "C" {
-#endif
-
-#endif /* !FT_MODERRDEF */
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****               LIST MODULE ERROR BASES                   *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#ifdef FT_MODERR_START_LIST
-  FT_MODERR_START_LIST
-#endif
-
-
-  FT_MODERRDEF( Base,      0x000, "base module" )
-  FT_MODERRDEF( Autofit,   0x100, "autofitter module" )
-  FT_MODERRDEF( BDF,       0x200, "BDF module" )
-  FT_MODERRDEF( Bzip2,     0x300, "Bzip2 module" )
-  FT_MODERRDEF( Cache,     0x400, "cache module" )
-  FT_MODERRDEF( CFF,       0x500, "CFF module" )
-  FT_MODERRDEF( CID,       0x600, "CID module" )
-  FT_MODERRDEF( Gzip,      0x700, "Gzip module" )
-  FT_MODERRDEF( LZW,       0x800, "LZW module" )
-  FT_MODERRDEF( OTvalid,   0x900, "OpenType validation module" )
-  FT_MODERRDEF( PCF,       0xA00, "PCF module" )
-  FT_MODERRDEF( PFR,       0xB00, "PFR module" )
-  FT_MODERRDEF( PSaux,     0xC00, "PS auxiliary module" )
-  FT_MODERRDEF( PShinter,  0xD00, "PS hinter module" )
-  FT_MODERRDEF( PSnames,   0xE00, "PS names module" )
-  FT_MODERRDEF( Raster,    0xF00, "raster module" )
-  FT_MODERRDEF( SFNT,     0x1000, "SFNT module" )
-  FT_MODERRDEF( Smooth,   0x1100, "smooth raster module" )
-  FT_MODERRDEF( TrueType, 0x1200, "TrueType module" )
-  FT_MODERRDEF( Type1,    0x1300, "Type 1 module" )
-  FT_MODERRDEF( Type42,   0x1400, "Type 42 module" )
-  FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" )
-  FT_MODERRDEF( GXvalid,  0x1600, "GX validation module" )
-
-
-#ifdef FT_MODERR_END_LIST
-  FT_MODERR_END_LIST
-#endif
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                      CLEANUP                            *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#ifdef FT_NEED_EXTERN_C
-  }
-#endif
-
-#undef FT_MODERR_START_LIST
-#undef FT_MODERR_END_LIST
-#undef FT_MODERRDEF
-#undef FT_NEED_EXTERN_C
-
-
-#endif /* FTMODERR_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftotval.h b/dependencies2013/win32/include/freetype/ftotval.h
deleted file mode 100644
index c678ef34..00000000
--- a/dependencies2013/win32/include/freetype/ftotval.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftotval.h                                                              */
-/*                                                                         */
-/*    FreeType API for validating OpenType tables (specification).         */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/*                                                                         */
-/* Warning: This module might be moved to a different library in the       */
-/*          future to avoid a tight dependency between FreeType and the    */
-/*          OpenType specification.                                        */
-/*                                                                         */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTOTVAL_H_
-#define FTOTVAL_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    ot_validation                                                      */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    OpenType Validation                                                */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    An API to validate OpenType tables.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of functions to validate     */
-  /*    some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).         */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_OpenType_Validate                                               */
-  /*    FT_OpenType_Free                                                   */
-  /*                                                                       */
-  /*    FT_VALIDATE_OTXXX                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_VALIDATE_OTXXX
-  *
-  * @description:
-  *    A list of bit-field constants used with @FT_OpenType_Validate to
-  *    indicate which OpenType tables should be validated.
-  *
-  * @values:
-  *    FT_VALIDATE_BASE ::
-  *      Validate BASE table.
-  *
-  *    FT_VALIDATE_GDEF ::
-  *      Validate GDEF table.
-  *
-  *    FT_VALIDATE_GPOS ::
-  *      Validate GPOS table.
-  *
-  *    FT_VALIDATE_GSUB ::
-  *      Validate GSUB table.
-  *
-  *    FT_VALIDATE_JSTF ::
-  *      Validate JSTF table.
-  *
-  *    FT_VALIDATE_MATH ::
-  *      Validate MATH table.
-  *
-  *    FT_VALIDATE_OT ::
-  *      Validate all OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).
-  *
-  */
-#define FT_VALIDATE_BASE  0x0100
-#define FT_VALIDATE_GDEF  0x0200
-#define FT_VALIDATE_GPOS  0x0400
-#define FT_VALIDATE_GSUB  0x0800
-#define FT_VALIDATE_JSTF  0x1000
-#define FT_VALIDATE_MATH  0x2000
-
-#define FT_VALIDATE_OT  FT_VALIDATE_BASE | \
-                        FT_VALIDATE_GDEF | \
-                        FT_VALIDATE_GPOS | \
-                        FT_VALIDATE_GSUB | \
-                        FT_VALIDATE_JSTF | \
-                        FT_VALIDATE_MATH
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_OpenType_Validate
-  *
-  * @description:
-  *    Validate various OpenType tables to assure that all offsets and
-  *    indices are valid.  The idea is that a higher-level library that
-  *    actually does the text layout can access those tables without
-  *    error checking (which can be quite time consuming).
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    validation_flags ::
-  *       A bit field that specifies the tables to be validated.  See
-  *       @FT_VALIDATE_OTXXX for possible values.
-  *
-  * @output:
-  *    BASE_table ::
-  *       A pointer to the BASE table.
-  *
-  *    GDEF_table ::
-  *       A pointer to the GDEF table.
-  *
-  *    GPOS_table ::
-  *       A pointer to the GPOS table.
-  *
-  *    GSUB_table ::
-  *       A pointer to the GSUB table.
-  *
-  *    JSTF_table ::
-  *       A pointer to the JSTF table.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   This function only works with OpenType fonts, returning an error
-  *   otherwise.
-  *
-  *   After use, the application should deallocate the five tables with
-  *   @FT_OpenType_Free.  A NULL value indicates that the table either
-  *   doesn't exist in the font, or the application hasn't asked for
-  *   validation.
-  */
-  FT_EXPORT( FT_Error )
-  FT_OpenType_Validate( FT_Face    face,
-                        FT_UInt    validation_flags,
-                        FT_Bytes  *BASE_table,
-                        FT_Bytes  *GDEF_table,
-                        FT_Bytes  *GPOS_table,
-                        FT_Bytes  *GSUB_table,
-                        FT_Bytes  *JSTF_table );
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_OpenType_Free
-  *
-  * @description:
-  *    Free the buffer allocated by OpenType validator.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  *    table ::
-  *       The pointer to the buffer that is allocated by
-  *       @FT_OpenType_Validate.
-  *
-  * @note:
-  *   This function must be used to free the buffer allocated by
-  *   @FT_OpenType_Validate only.
-  */
-  FT_EXPORT( void )
-  FT_OpenType_Free( FT_Face   face,
-                    FT_Bytes  table );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTOTVAL_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftoutln.h b/dependencies2013/win32/include/freetype/ftoutln.h
deleted file mode 100644
index 6a645120..00000000
--- a/dependencies2013/win32/include/freetype/ftoutln.h
+++ /dev/null
@@ -1,574 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftoutln.h                                                              */
-/*                                                                         */
-/*    Support for the FT_Outline type used to store glyph shapes of        */
-/*    most scalable font formats (specification).                          */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTOUTLN_H_
-#define FTOUTLN_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Outline Processing                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Functions to create, transform, and render vectorial glyph images. */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains routines used to create and destroy scalable */
-  /*    glyph images known as `outlines'.  These can also be measured,     */
-  /*    transformed, and converted into bitmaps and pixmaps.               */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Outline                                                         */
-  /*    FT_Outline_New                                                     */
-  /*    FT_Outline_Done                                                    */
-  /*    FT_Outline_Copy                                                    */
-  /*    FT_Outline_Translate                                               */
-  /*    FT_Outline_Transform                                               */
-  /*    FT_Outline_Embolden                                                */
-  /*    FT_Outline_EmboldenXY                                              */
-  /*    FT_Outline_Reverse                                                 */
-  /*    FT_Outline_Check                                                   */
-  /*                                                                       */
-  /*    FT_Outline_Get_CBox                                                */
-  /*    FT_Outline_Get_BBox                                                */
-  /*                                                                       */
-  /*    FT_Outline_Get_Bitmap                                              */
-  /*    FT_Outline_Render                                                  */
-  /*    FT_Outline_Decompose                                               */
-  /*    FT_Outline_Funcs                                                   */
-  /*    FT_Outline_MoveToFunc                                              */
-  /*    FT_Outline_LineToFunc                                              */
-  /*    FT_Outline_ConicToFunc                                             */
-  /*    FT_Outline_CubicToFunc                                             */
-  /*                                                                       */
-  /*    FT_Orientation                                                     */
-  /*    FT_Outline_Get_Orientation                                         */
-  /*                                                                       */
-  /*    FT_OUTLINE_XXX                                                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Decompose                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Walk over an outline's structure to decompose it into individual   */
-  /*    segments and Bézier arcs.  This function also emits `move to'      */
-  /*    operations to indicate the start of new contours in the outline.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline        :: A pointer to the source target.                  */
-  /*                                                                       */
-  /*    func_interface :: A table of `emitters', i.e., function pointers   */
-  /*                      called during decomposition to indicate path     */
-  /*                      operations.                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    user           :: A typeless pointer that is passed to each        */
-  /*                      emitter during the decomposition.  It can be     */
-  /*                      used to store the state during the               */
-  /*                      decomposition.                                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    A contour that contains a single point only is represented by a    */
-  /*    `move to' operation followed by `line to' to the same point.  In   */
-  /*    most cases, it is best to filter this out before using the         */
-  /*    outline for stroking purposes (otherwise it would result in a      */
-  /*    visible dot when round caps are used).                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Decompose( FT_Outline*              outline,
-                        const FT_Outline_Funcs*  func_interface,
-                        void*                    user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_New                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new outline of a given size.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object from where the       */
-  /*                   outline is allocated.  Note however that the new    */
-  /*                   outline will *not* necessarily be *freed*, when     */
-  /*                   destroying the library, by @FT_Done_FreeType.       */
-  /*                                                                       */
-  /*    numPoints   :: The maximum number of points within the outline.    */
-  /*                   Must be smaller than or equal to 0xFFFF (65535).    */
-  /*                                                                       */
-  /*    numContours :: The maximum number of contours within the outline.  */
-  /*                   This value must be in the range 0 to `numPoints'.   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    anoutline   :: A handle to the new outline.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The reason why this function takes a `library' parameter is simply */
-  /*    to use the library's memory allocator.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_New( FT_Library   library,
-                  FT_UInt      numPoints,
-                  FT_Int       numContours,
-                  FT_Outline  *anoutline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_New_Internal( FT_Memory    memory,
-                           FT_UInt      numPoints,
-                           FT_Int       numContours,
-                           FT_Outline  *anoutline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Done                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroy an outline created with @FT_Outline_New.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle of the library object used to allocate the     */
-  /*               outline.                                                */
-  /*                                                                       */
-  /*    outline :: A pointer to the outline object to be discarded.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the outline's `owner' field is not set, only the outline        */
-  /*    descriptor will be released.                                       */
-  /*                                                                       */
-  /*    The reason why this function takes an `library' parameter is       */
-  /*    simply to use ft_mem_free().                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done( FT_Library   library,
-                   FT_Outline*  outline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done_Internal( FT_Memory    memory,
-                            FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Check                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check the contents of an outline descriptor.                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A handle to a source outline.                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Check( FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_CBox                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return an outline's `control box'.  The control box encloses all   */
-  /*    the outline's points, including Bézier control points.  Though it  */
-  /*    coincides with the exact bounding box for most glyphs, it can be   */
-  /*    slightly larger in some situations (like when rotating an outline  */
-  /*    that contains Bézier outside arcs).                                */
-  /*                                                                       */
-  /*    Computing the control box is very fast, while getting the bounding */
-  /*    box can take much more time as it needs to walk over all segments  */
-  /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component, which is dedicated to this single task.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acbox   :: The outline's control box.                              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    See @FT_Glyph_Get_CBox for a discussion of tricky fonts.           */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Get_CBox( const FT_Outline*  outline,
-                       FT_BBox           *acbox );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Translate                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Apply a simple translation to the points of an outline.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    xOffset :: The horizontal offset.                                  */
-  /*                                                                       */
-  /*    yOffset :: The vertical offset.                                    */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Translate( const FT_Outline*  outline,
-                        FT_Pos             xOffset,
-                        FT_Pos             yOffset );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Copy                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Copy an outline into another one.  Both objects must have the      */
-  /*    same sizes (number of points & number of contours) when this       */
-  /*    function is called.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    source :: A handle to the source outline.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target :: A handle to the target outline.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Copy( const FT_Outline*  source,
-                   FT_Outline        *target );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Transform                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Apply a simple 2x2 matrix to all of an outline's points.  Useful   */
-  /*    for applying rotations, slanting, flipping, etc.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix  :: A pointer to the transformation matrix.                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can use @FT_Outline_Translate if you need to translate the     */
-  /*    outline's points.                                                  */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Transform( const FT_Outline*  outline,
-                        const FT_Matrix*   matrix );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Embolden                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Embolden an outline.  The new outline will be at most 4~times      */
-  /*    `strength' pixels wider and higher.  You may think of the left and */
-  /*    bottom borders as unchanged.                                       */
-  /*                                                                       */
-  /*    Negative `strength' values to reduce the outline thickness are     */
-  /*    possible also.                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline  :: A handle to the target outline.                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    strength :: How strong the glyph is emboldened.  Expressed in      */
-  /*                26.6 pixel format.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The used algorithm to increase or decrease the thickness of the    */
-  /*    glyph doesn't change the number of points; this means that certain */
-  /*    situations like acute angles or intersections are sometimes        */
-  /*    handled incorrectly.                                               */
-  /*                                                                       */
-  /*    If you need `better' metrics values you should call                */
-  /*    @FT_Outline_Get_CBox or @FT_Outline_Get_BBox.                      */
-  /*                                                                       */
-  /*    Example call:                                                      */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_Load_Glyph( face, index, FT_LOAD_DEFAULT );                   */
-  /*      if ( face->glyph->format == FT_GLYPH_FORMAT_OUTLINE )            */
-  /*        FT_Outline_Embolden( &face->glyph->outline, strength );        */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    To get meaningful results, font scaling values must be set with    */
-  /*    functions like @FT_Set_Char_Size before calling FT_Render_Glyph.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Embolden( FT_Outline*  outline,
-                       FT_Pos       strength );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_EmboldenXY                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Embolden an outline.  The new outline will be `xstrength' pixels   */
-  /*    wider and `ystrength' pixels higher.  Otherwise, it is similar to  */
-  /*    @FT_Outline_Embolden, which uses the same strength in both         */
-  /*    directions.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_EmboldenXY( FT_Outline*  outline,
-                         FT_Pos       xstrength,
-                         FT_Pos       ystrength );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Reverse                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reverse the drawing direction of an outline.  This is used to      */
-  /*    ensure consistent fill conventions for mirrored glyphs.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function toggles the bit flag @FT_OUTLINE_REVERSE_FILL in     */
-  /*    the outline's `flags' field.                                       */
-  /*                                                                       */
-  /*    It shouldn't be used by a normal client application, unless it     */
-  /*    knows what it is doing.                                            */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Reverse( FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_Bitmap                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Render an outline within a bitmap.  The outline's image is simply  */
-  /*    OR-ed to the target bitmap.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    abitmap :: A pointer to the target bitmap descriptor.              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does NOT CREATE the bitmap, it only renders an       */
-  /*    outline image within the one you pass to it!  Consequently, the    */
-  /*    various fields in `abitmap' should be set accordingly.             */
-  /*                                                                       */
-  /*    It will use the raster corresponding to the default glyph format.  */
-  /*                                                                       */
-  /*    The value of the `num_grays' field in `abitmap' is ignored.  If    */
-  /*    you select the gray-level rasterizer, and you want less than 256   */
-  /*    gray levels, you have to use @FT_Outline_Render directly.          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_Bitmap( FT_Library        library,
-                         FT_Outline*       outline,
-                         const FT_Bitmap  *abitmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Render                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Render an outline within a bitmap using the current scan-convert.  */
-  /*    This function uses an @FT_Raster_Params structure as an argument,  */
-  /*    allowing advanced features like direct composition, translucency,  */
-  /*    etc.                                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    params  :: A pointer to an @FT_Raster_Params structure used to     */
-  /*               describe the rendering operation.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should know what you are doing and how @FT_Raster_Params works */
-  /*    to use this function.                                              */
-  /*                                                                       */
-  /*    The field `params.source' will be set to `outline' before the scan */
-  /*    converter is called, which means that the value you give to it is  */
-  /*    actually ignored.                                                  */
-  /*                                                                       */
-  /*    The gray-level rasterizer always uses 256 gray levels.  If you     */
-  /*    want less gray levels, you have to provide your own span callback. */
-  /*    See the @FT_RASTER_FLAG_DIRECT value of the `flags' field in the   */
-  /*    @FT_Raster_Params structure for more details.                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Render( FT_Library         library,
-                     FT_Outline*        outline,
-                     FT_Raster_Params*  params );
-
-
- /**************************************************************************
-  *
-  * @enum:
-  *   FT_Orientation
-  *
-  * @description:
-  *   A list of values used to describe an outline's contour orientation.
-  *
-  *   The TrueType and PostScript specifications use different conventions
-  *   to determine whether outline contours should be filled or unfilled.
-  *
-  * @values:
-  *   FT_ORIENTATION_TRUETYPE ::
-  *     According to the TrueType specification, clockwise contours must
-  *     be filled, and counter-clockwise ones must be unfilled.
-  *
-  *   FT_ORIENTATION_POSTSCRIPT ::
-  *     According to the PostScript specification, counter-clockwise contours
-  *     must be filled, and clockwise ones must be unfilled.
-  *
-  *   FT_ORIENTATION_FILL_RIGHT ::
-  *     This is identical to @FT_ORIENTATION_TRUETYPE, but is used to
-  *     remember that in TrueType, everything that is to the right of
-  *     the drawing direction of a contour must be filled.
-  *
-  *   FT_ORIENTATION_FILL_LEFT ::
-  *     This is identical to @FT_ORIENTATION_POSTSCRIPT, but is used to
-  *     remember that in PostScript, everything that is to the left of
-  *     the drawing direction of a contour must be filled.
-  *
-  *   FT_ORIENTATION_NONE ::
-  *     The orientation cannot be determined.  That is, different parts of
-  *     the glyph have different orientation.
-  *
-  */
-  typedef enum  FT_Orientation_
-  {
-    FT_ORIENTATION_TRUETYPE   = 0,
-    FT_ORIENTATION_POSTSCRIPT = 1,
-    FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE,
-    FT_ORIENTATION_FILL_LEFT  = FT_ORIENTATION_POSTSCRIPT,
-    FT_ORIENTATION_NONE
-
-  } FT_Orientation;
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Outline_Get_Orientation
-  *
-  * @description:
-  *   This function analyzes a glyph outline and tries to compute its
-  *   fill orientation (see @FT_Orientation).  This is done by integrating
-  *   the total area covered by the outline. The positive integral
-  *   corresponds to the clockwise orientation and @FT_ORIENTATION_POSTSCRIPT
-  *   is returned. The negative integral corresponds to the counter-clockwise
-  *   orientation and @FT_ORIENTATION_TRUETYPE is returned.
-  *
-  *   Note that this will return @FT_ORIENTATION_TRUETYPE for empty
-  *   outlines.
-  *
-  * @input:
-  *   outline ::
-  *     A handle to the source outline.
-  *
-  * @return:
-  *   The orientation.
-  *
-  */
-  FT_EXPORT( FT_Orientation )
-  FT_Outline_Get_Orientation( FT_Outline*  outline );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTOUTLN_H_ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
diff --git a/dependencies2013/win32/include/freetype/ftpfr.h b/dependencies2013/win32/include/freetype/ftpfr.h
deleted file mode 100644
index 2e1bff2f..00000000
--- a/dependencies2013/win32/include/freetype/ftpfr.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftpfr.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing PFR-specific data (specification only).   */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTPFR_H_
-#define FTPFR_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    pfr_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    PFR Fonts                                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    PFR/TrueDoc specific API.                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of PFR-specific functions.   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Metrics
-  *
-  * @description:
-  *    Return the outline and metrics resolutions of a given PFR face.
-  *
-  * @input:
-  *    face :: Handle to the input face.  It can be a non-PFR face.
-  *
-  * @output:
-  *    aoutline_resolution ::
-  *      Outline resolution.  This is equivalent to `face->units_per_EM'
-  *      for non-PFR fonts.  Optional (parameter can be NULL).
-  *
-  *    ametrics_resolution ::
-  *      Metrics resolution.  This is equivalent to `outline_resolution'
-  *      for non-PFR fonts.  Optional (parameter can be NULL).
-  *
-  *    ametrics_x_scale ::
-  *      A 16.16 fixed-point number used to scale distance expressed
-  *      in metrics units to device sub-pixels.  This is equivalent to
-  *      `face->size->x_scale', but for metrics only.  Optional (parameter
-  *      can be NULL).
-  *
-  *    ametrics_y_scale ::
-  *      Same as `ametrics_x_scale' but for the vertical direction.
-  *      optional (parameter can be NULL).
-  *
-  * @return:
-  *    FreeType error code.  0~means success.
-  *
-  * @note:
-  *   If the input face is not a PFR, this function will return an error.
-  *   However, in all cases, it will return valid values.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Metrics( FT_Face    face,
-                      FT_UInt   *aoutline_resolution,
-                      FT_UInt   *ametrics_resolution,
-                      FT_Fixed  *ametrics_x_scale,
-                      FT_Fixed  *ametrics_y_scale );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Kerning
-  *
-  * @description:
-  *    Return the kerning pair corresponding to two glyphs in a PFR face.
-  *    The distance is expressed in metrics units, unlike the result of
-  *    @FT_Get_Kerning.
-  *
-  * @input:
-  *    face  :: A handle to the input face.
-  *
-  *    left  :: Index of the left glyph.
-  *
-  *    right :: Index of the right glyph.
-  *
-  * @output:
-  *    avector :: A kerning vector.
-  *
-  * @return:
-  *    FreeType error code.  0~means success.
-  *
-  * @note:
-  *    This function always return distances in original PFR metrics
-  *    units.  This is unlike @FT_Get_Kerning with the @FT_KERNING_UNSCALED
-  *    mode, which always returns distances converted to outline units.
-  *
-  *    You can use the value of the `x_scale' and `y_scale' parameters
-  *    returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Kerning( FT_Face     face,
-                      FT_UInt     left,
-                      FT_UInt     right,
-                      FT_Vector  *avector );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Advance
-  *
-  * @description:
-  *    Return a given glyph advance, expressed in original metrics units,
-  *    from a PFR font.
-  *
-  * @input:
-  *    face   :: A handle to the input face.
-  *
-  *    gindex :: The glyph index.
-  *
-  * @output:
-  *    aadvance :: The glyph advance in metrics units.
-  *
-  * @return:
-  *    FreeType error code.  0~means success.
-  *
-  * @note:
-  *    You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics
-  *    to convert the advance to device sub-pixels (i.e., 1/64th of pixels).
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Advance( FT_Face   face,
-                      FT_UInt   gindex,
-                      FT_Pos   *aadvance );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTPFR_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftrender.h b/dependencies2013/win32/include/freetype/ftrender.h
deleted file mode 100644
index 9f7ed9e9..00000000
--- a/dependencies2013/win32/include/freetype/ftrender.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftrender.h                                                             */
-/*                                                                         */
-/*    FreeType renderer modules public interface (specification).          */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTRENDER_H_
-#define FTRENDER_H_
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* create a new glyph object */
-  typedef FT_Error
-  (*FT_Glyph_InitFunc)( FT_Glyph      glyph,
-                        FT_GlyphSlot  slot );
-
-  /* destroys a given glyph object */
-  typedef void
-  (*FT_Glyph_DoneFunc)( FT_Glyph  glyph );
-
-  typedef void
-  (*FT_Glyph_TransformFunc)( FT_Glyph          glyph,
-                             const FT_Matrix*  matrix,
-                             const FT_Vector*  delta );
-
-  typedef void
-  (*FT_Glyph_GetBBoxFunc)( FT_Glyph  glyph,
-                           FT_BBox*  abbox );
-
-  typedef FT_Error
-  (*FT_Glyph_CopyFunc)( FT_Glyph   source,
-                        FT_Glyph   target );
-
-  typedef FT_Error
-  (*FT_Glyph_PrepareFunc)( FT_Glyph      glyph,
-                           FT_GlyphSlot  slot );
-
-/* deprecated */
-#define FT_Glyph_Init_Func       FT_Glyph_InitFunc
-#define FT_Glyph_Done_Func       FT_Glyph_DoneFunc
-#define FT_Glyph_Transform_Func  FT_Glyph_TransformFunc
-#define FT_Glyph_BBox_Func       FT_Glyph_GetBBoxFunc
-#define FT_Glyph_Copy_Func       FT_Glyph_CopyFunc
-#define FT_Glyph_Prepare_Func    FT_Glyph_PrepareFunc
-
-
-  struct  FT_Glyph_Class_
-  {
-    FT_Long                 glyph_size;
-    FT_Glyph_Format         glyph_format;
-    FT_Glyph_InitFunc       glyph_init;
-    FT_Glyph_DoneFunc       glyph_done;
-    FT_Glyph_CopyFunc       glyph_copy;
-    FT_Glyph_TransformFunc  glyph_transform;
-    FT_Glyph_GetBBoxFunc    glyph_bbox;
-    FT_Glyph_PrepareFunc    glyph_prepare;
-  };
-
-
-  typedef FT_Error
-  (*FT_Renderer_RenderFunc)( FT_Renderer       renderer,
-                             FT_GlyphSlot      slot,
-                             FT_UInt           mode,
-                             const FT_Vector*  origin );
-
-  typedef FT_Error
-  (*FT_Renderer_TransformFunc)( FT_Renderer       renderer,
-                                FT_GlyphSlot      slot,
-                                const FT_Matrix*  matrix,
-                                const FT_Vector*  delta );
-
-
-  typedef void
-  (*FT_Renderer_GetCBoxFunc)( FT_Renderer   renderer,
-                              FT_GlyphSlot  slot,
-                              FT_BBox*      cbox );
-
-
-  typedef FT_Error
-  (*FT_Renderer_SetModeFunc)( FT_Renderer  renderer,
-                              FT_ULong     mode_tag,
-                              FT_Pointer   mode_ptr );
-
-/* deprecated identifiers */
-#define FTRenderer_render  FT_Renderer_RenderFunc
-#define FTRenderer_transform  FT_Renderer_TransformFunc
-#define FTRenderer_getCBox  FT_Renderer_GetCBoxFunc
-#define FTRenderer_setMode  FT_Renderer_SetModeFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Renderer_Class                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The renderer module class descriptor.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root            :: The root @FT_Module_Class fields.               */
-  /*                                                                       */
-  /*    glyph_format    :: The glyph image format this renderer handles.   */
-  /*                                                                       */
-  /*    render_glyph    :: A method used to render the image that is in a  */
-  /*                       given glyph slot into a bitmap.                 */
-  /*                                                                       */
-  /*    transform_glyph :: A method used to transform the image that is in */
-  /*                       a given glyph slot.                             */
-  /*                                                                       */
-  /*    get_glyph_cbox  :: A method used to access the glyph's cbox.       */
-  /*                                                                       */
-  /*    set_mode        :: A method used to pass additional parameters.    */
-  /*                                                                       */
-  /*    raster_class    :: For @FT_GLYPH_FORMAT_OUTLINE renderers only.    */
-  /*                       This is a pointer to its raster's class.        */
-  /*                                                                       */
-  typedef struct  FT_Renderer_Class_
-  {
-    FT_Module_Class            root;
-
-    FT_Glyph_Format            glyph_format;
-
-    FT_Renderer_RenderFunc     render_glyph;
-    FT_Renderer_TransformFunc  transform_glyph;
-    FT_Renderer_GetCBoxFunc    get_glyph_cbox;
-    FT_Renderer_SetModeFunc    set_mode;
-
-    FT_Raster_Funcs*           raster_class;
-
-  } FT_Renderer_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Renderer                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the current renderer for a given glyph format.            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the library object.                         */
-  /*                                                                       */
-  /*    format  :: The glyph format.                                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A renderer handle.  0~if none found.                               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error will be returned if a module already exists by that name, */
-  /*    or if the module requires a version of FreeType that is too great. */
-  /*                                                                       */
-  /*    To add a new renderer, simply use @FT_Add_Module.  To retrieve a   */
-  /*    renderer by its name, use @FT_Get_Module.                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Renderer )
-  FT_Get_Renderer( FT_Library       library,
-                   FT_Glyph_Format  format );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Renderer                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Set the current renderer to use, and set additional mode.          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    renderer   :: A handle to the renderer object.                     */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    parameters :: Additional parameters.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    In case of success, the renderer will be used to convert glyph     */
-  /*    images in the renderer's known format into bitmaps.                */
-  /*                                                                       */
-  /*    This doesn't change the current renderer for other formats.        */
-  /*                                                                       */
-  /*    Currently, no FreeType renderer module uses `parameters'; you      */
-  /*    should thus always pass NULL as the value.                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Renderer( FT_Library     library,
-                   FT_Renderer    renderer,
-                   FT_UInt        num_params,
-                   FT_Parameter*  parameters );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTRENDER_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftsizes.h b/dependencies2013/win32/include/freetype/ftsizes.h
deleted file mode 100644
index 55e0d5cc..00000000
--- a/dependencies2013/win32/include/freetype/ftsizes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsizes.h                                                              */
-/*                                                                         */
-/*    FreeType size objects management (specification).                    */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Typical application would normally not need to use these functions.   */
-  /* However, they have been placed in a public API for the rare cases     */
-  /* where they are needed.                                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTSIZES_H_
-#define FTSIZES_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    sizes_management                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Size Management                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Managing multiple sizes per face.                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    When creating a new face object (e.g., with @FT_New_Face), an      */
-  /*    @FT_Size object is automatically created and used to store all     */
-  /*    pixel-size dependent information, available in the `face->size'    */
-  /*    field.                                                             */
-  /*                                                                       */
-  /*    It is however possible to create more sizes for a given face,      */
-  /*    mostly in order to manage several character pixel sizes of the     */
-  /*    same font family and style.  See @FT_New_Size and @FT_Done_Size.   */
-  /*                                                                       */
-  /*    Note that @FT_Set_Pixel_Sizes and @FT_Set_Char_Size only           */
-  /*    modify the contents of the current `active' size; you thus need    */
-  /*    to use @FT_Activate_Size to change it.                             */
-  /*                                                                       */
-  /*    99% of applications won't need the functions provided here,        */
-  /*    especially if they use the caching sub-system, so be cautious      */
-  /*    when using these.                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Size                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Create a new size object from a given face object.                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a parent face object.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    asize :: A handle to a new size object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You need to call @FT_Activate_Size in order to select the new size */
-  /*    for upcoming calls to @FT_Set_Pixel_Sizes, @FT_Set_Char_Size,      */
-  /*    @FT_Load_Glyph, @FT_Load_Char, etc.                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Size( FT_Face   face,
-               FT_Size*  size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Size                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard a given size object.  Note that @FT_Done_Face              */
-  /*    automatically discards all size objects allocated with             */
-  /*    @FT_New_Size.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    size :: A handle to a target size object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Size( FT_Size  size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Activate_Size                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Even though it is possible to create several size objects for a    */
-  /*    given face (see @FT_New_Size for details), functions like          */
-  /*    @FT_Load_Glyph or @FT_Load_Char only use the one that has been     */
-  /*    activated last to determine the `current character pixel size'.    */
-  /*                                                                       */
-  /*    This function can be used to `activate' a previously created size  */
-  /*    object.                                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    size :: A handle to a target size object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If `face' is the size's parent face object, this function changes  */
-  /*    the value of `face->size' to the input size handle.                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Activate_Size( FT_Size  size );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTSIZES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftsnames.h b/dependencies2013/win32/include/freetype/ftsnames.h
deleted file mode 100644
index a7b51c2c..00000000
--- a/dependencies2013/win32/include/freetype/ftsnames.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsnames.h                                                             */
-/*                                                                         */
-/*    Simple interface to access SFNT name tables (which are used          */
-/*    to hold font names, copyright info, notices, etc.) (specification).  */
-/*                                                                         */
-/*    This is _not_ used to retrieve glyph names!                          */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTSNAMES_H_
-#define FTSNAMES_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    sfnt_names                                                         */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    SFNT Names                                                         */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Access the names embedded in TrueType and OpenType files.          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType and OpenType specifications allow the inclusion of    */
-  /*    a special `names table' in font files.  This table contains        */
-  /*    textual (and internationalized) information regarding the font,    */
-  /*    like family name, copyright, version, etc.                         */
-  /*                                                                       */
-  /*    The definitions below are used to access them if available.        */
-  /*                                                                       */
-  /*    Note that this has nothing to do with glyph names!                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SfntName                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model an SFNT `name' table entry.              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platform_id :: The platform ID for `string'.                       */
-  /*                                                                       */
-  /*    encoding_id :: The encoding ID for `string'.                       */
-  /*                                                                       */
-  /*    language_id :: The language ID for `string'.                       */
-  /*                                                                       */
-  /*    name_id     :: An identifier for `string'.                         */
-  /*                                                                       */
-  /*    string      :: The `name' string.  Note that its format differs    */
-  /*                   depending on the (platform,encoding) pair.  It can  */
-  /*                   be a Pascal String, a UTF-16 one, etc.              */
-  /*                                                                       */
-  /*                   Generally speaking, the string is not               */
-  /*                   zero-terminated.  Please refer to the TrueType      */
-  /*                   specification for details.                          */
-  /*                                                                       */
-  /*    string_len  :: The length of `string' in bytes.                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Possible values for `platform_id', `encoding_id', `language_id',   */
-  /*    and `name_id' are given in the file `ttnameid.h'.  For details     */
-  /*    please refer to the TrueType or OpenType specification.            */
-  /*                                                                       */
-  /*    See also @TT_PLATFORM_XXX, @TT_APPLE_ID_XXX, @TT_MAC_ID_XXX,       */
-  /*    @TT_ISO_ID_XXX, and @TT_MS_ID_XXX.                                 */
-  /*                                                                       */
-  typedef struct  FT_SfntName_
-  {
-    FT_UShort  platform_id;
-    FT_UShort  encoding_id;
-    FT_UShort  language_id;
-    FT_UShort  name_id;
-
-    FT_Byte*   string;      /* this string is *not* null-terminated! */
-    FT_UInt    string_len;  /* in bytes */
-
-  } FT_SfntName;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Name_Count                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the number of name strings in the SFNT `name' table.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The number of strings in the `name' table.                         */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Sfnt_Name_Count( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Name                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve a string of the SFNT `name' table for a given index.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A handle to the source face.                              */
-  /*                                                                       */
-  /*    idx   :: The index of the `name' string.                           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aname :: The indexed @FT_SfntName structure.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0~means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `string' array returned in the `aname' structure is not        */
-  /*    null-terminated.  The application should deallocate it if it is no */
-  /*    longer in use.                                                     */
-  /*                                                                       */
-  /*    Use @FT_Get_Sfnt_Name_Count to get the total number of available   */
-  /*    `name' table entries, then do a loop until you get the right       */
-  /*    platform, encoding, and name ID.                                   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Sfnt_Name( FT_Face       face,
-                    FT_UInt       idx,
-                    FT_SfntName  *aname );
-
-
-  /***************************************************************************
-   *
-   * @constant:
-   *   FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY
-   *
-   * @description:
-   *   A constant used as the tag of @FT_Parameter structures to make
-   *   FT_Open_Face() ignore preferred family subfamily names in `name'
-   *   table since OpenType version 1.4.  For backwards compatibility with
-   *   legacy systems that have a 4-face-per-family restriction.
-   *
-   */
-#define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
-
-
-  /***************************************************************************
-   *
-   * @constant:
-   *   FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY
-   *
-   * @description:
-   *   A constant used as the tag of @FT_Parameter structures to make
-   *   FT_Open_Face() ignore preferred subfamily names in `name' table since
-   *   OpenType version 1.4.  For backwards compatibility with legacy
-   *   systems that have a 4-face-per-family restriction.
-   *
-   */
-#define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 's' )
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTSNAMES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftstroke.h b/dependencies2013/win32/include/freetype/ftstroke.h
deleted file mode 100644
index b3b9922d..00000000
--- a/dependencies2013/win32/include/freetype/ftstroke.h
+++ /dev/null
@@ -1,785 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstroke.h                                                             */
-/*                                                                         */
-/*    FreeType path stroker (specification).                               */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTSTROKE_H_
-#define FTSTROKE_H_
-
-#include <ft2build.h>
-#include FT_OUTLINE_H
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
- /************************************************************************
-  *
-  * @section:
-  *    glyph_stroker
-  *
-  * @title:
-  *    Glyph Stroker
-  *
-  * @abstract:
-  *    Generating bordered and stroked glyphs.
-  *
-  * @description:
-  *    This component generates stroked outlines of a given vectorial
-  *    glyph.  It also allows you to retrieve the `outside' and/or the
-  *    `inside' borders of the stroke.
-  *
-  *    This can be useful to generate `bordered' glyph, i.e., glyphs
-  *    displayed with a coloured (and anti-aliased) border around their
-  *    shape.
-  *
-  * @order:
-  *    FT_Stroker
-  *
-  *    FT_Stroker_LineJoin
-  *    FT_Stroker_LineCap
-  *    FT_StrokerBorder
-  *
-  *    FT_Outline_GetInsideBorder
-  *    FT_Outline_GetOutsideBorder
-  *
-  *    FT_Glyph_Stroke
-  *    FT_Glyph_StrokeBorder
-  *
-  *    FT_Stroker_New
-  *    FT_Stroker_Set
-  *    FT_Stroker_Rewind
-  *    FT_Stroker_ParseOutline
-  *    FT_Stroker_Done
-  *
-  *    FT_Stroker_BeginSubPath
-  *    FT_Stroker_EndSubPath
-  *
-  *    FT_Stroker_LineTo
-  *    FT_Stroker_ConicTo
-  *    FT_Stroker_CubicTo
-  *
-  *    FT_Stroker_GetBorderCounts
-  *    FT_Stroker_ExportBorder
-  *    FT_Stroker_GetCounts
-  *    FT_Stroker_Export
-  *
-  */
-
-
- /**************************************************************
-  *
-  * @type:
-  *   FT_Stroker
-  *
-  * @description:
-  *   Opaque handle to a path stroker object.
-  */
-  typedef struct FT_StrokerRec_*  FT_Stroker;
-
-
-  /**************************************************************
-   *
-   * @enum:
-   *   FT_Stroker_LineJoin
-   *
-   * @description:
-   *   These values determine how two joining lines are rendered
-   *   in a stroker.
-   *
-   * @values:
-   *   FT_STROKER_LINEJOIN_ROUND ::
-   *     Used to render rounded line joins.  Circular arcs are used
-   *     to join two lines smoothly.
-   *
-   *   FT_STROKER_LINEJOIN_BEVEL ::
-   *     Used to render beveled line joins.  The outer corner of
-   *     the joined lines is filled by enclosing the triangular
-   *     region of the corner with a straight line between the
-   *     outer corners of each stroke.
-   *
-   *   FT_STROKER_LINEJOIN_MITER_FIXED ::
-   *     Used to render mitered line joins, with fixed bevels if the
-   *     miter limit is exceeded.  The outer edges of the strokes
-   *     for the two segments are extended until they meet at an
-   *     angle.  If the segments meet at too sharp an angle (such
-   *     that the miter would extend from the intersection of the
-   *     segments a distance greater than the product of the miter
-   *     limit value and the border radius), then a bevel join (see
-   *     above) is used instead.  This prevents long spikes being
-   *     created.  FT_STROKER_LINEJOIN_MITER_FIXED generates a miter
-   *     line join as used in PostScript and PDF.
-   *
-   *   FT_STROKER_LINEJOIN_MITER_VARIABLE ::
-   *   FT_STROKER_LINEJOIN_MITER ::
-   *     Used to render mitered line joins, with variable bevels if
-   *     the miter limit is exceeded.  The intersection of the
-   *     strokes is clipped at a line perpendicular to the bisector
-   *     of the angle between the strokes, at the distance from the
-   *     intersection of the segments equal to the product of the
-   *     miter limit value and the border radius.  This prevents
-   *     long spikes being created.
-   *     FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line
-   *     join as used in XPS.  FT_STROKER_LINEJOIN_MITER is an alias
-   *     for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for
-   *     backwards compatibility.
-   */
-  typedef enum  FT_Stroker_LineJoin_
-  {
-    FT_STROKER_LINEJOIN_ROUND          = 0,
-    FT_STROKER_LINEJOIN_BEVEL          = 1,
-    FT_STROKER_LINEJOIN_MITER_VARIABLE = 2,
-    FT_STROKER_LINEJOIN_MITER          = FT_STROKER_LINEJOIN_MITER_VARIABLE,
-    FT_STROKER_LINEJOIN_MITER_FIXED    = 3
-
-  } FT_Stroker_LineJoin;
-
-
-  /**************************************************************
-   *
-   * @enum:
-   *   FT_Stroker_LineCap
-   *
-   * @description:
-   *   These values determine how the end of opened sub-paths are
-   *   rendered in a stroke.
-   *
-   * @values:
-   *   FT_STROKER_LINECAP_BUTT ::
-   *     The end of lines is rendered as a full stop on the last
-   *     point itself.
-   *
-   *   FT_STROKER_LINECAP_ROUND ::
-   *     The end of lines is rendered as a half-circle around the
-   *     last point.
-   *
-   *   FT_STROKER_LINECAP_SQUARE ::
-   *     The end of lines is rendered as a square around the
-   *     last point.
-   */
-  typedef enum  FT_Stroker_LineCap_
-  {
-    FT_STROKER_LINECAP_BUTT = 0,
-    FT_STROKER_LINECAP_ROUND,
-    FT_STROKER_LINECAP_SQUARE
-
-  } FT_Stroker_LineCap;
-
-
-  /**************************************************************
-   *
-   * @enum:
-   *   FT_StrokerBorder
-   *
-   * @description:
-   *   These values are used to select a given stroke border
-   *   in @FT_Stroker_GetBorderCounts and @FT_Stroker_ExportBorder.
-   *
-   * @values:
-   *   FT_STROKER_BORDER_LEFT ::
-   *     Select the left border, relative to the drawing direction.
-   *
-   *   FT_STROKER_BORDER_RIGHT ::
-   *     Select the right border, relative to the drawing direction.
-   *
-   * @note:
-   *   Applications are generally interested in the `inside' and `outside'
-   *   borders.  However, there is no direct mapping between these and the
-   *   `left' and `right' ones, since this really depends on the glyph's
-   *   drawing orientation, which varies between font formats.
-   *
-   *   You can however use @FT_Outline_GetInsideBorder and
-   *   @FT_Outline_GetOutsideBorder to get these.
-   */
-  typedef enum  FT_StrokerBorder_
-  {
-    FT_STROKER_BORDER_LEFT = 0,
-    FT_STROKER_BORDER_RIGHT
-
-  } FT_StrokerBorder;
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Outline_GetInsideBorder
-   *
-   * @description:
-   *   Retrieve the @FT_StrokerBorder value corresponding to the
-   *   `inside' borders of a given outline.
-   *
-   * @input:
-   *   outline ::
-   *     The source outline handle.
-   *
-   * @return:
-   *   The border index.  @FT_STROKER_BORDER_RIGHT for empty or invalid
-   *   outlines.
-   */
-  FT_EXPORT( FT_StrokerBorder )
-  FT_Outline_GetInsideBorder( FT_Outline*  outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Outline_GetOutsideBorder
-   *
-   * @description:
-   *   Retrieve the @FT_StrokerBorder value corresponding to the
-   *   `outside' borders of a given outline.
-   *
-   * @input:
-   *   outline ::
-   *     The source outline handle.
-   *
-   * @return:
-   *   The border index.  @FT_STROKER_BORDER_LEFT for empty or invalid
-   *   outlines.
-   */
-  FT_EXPORT( FT_StrokerBorder )
-  FT_Outline_GetOutsideBorder( FT_Outline*  outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_New
-   *
-   * @description:
-   *   Create a new stroker object.
-   *
-   * @input:
-   *   library ::
-   *     FreeType library handle.
-   *
-   * @output:
-   *   astroker ::
-   *     A new stroker object handle.  NULL in case of error.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_New( FT_Library   library,
-                  FT_Stroker  *astroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Set
-   *
-   * @description:
-   *   Reset a stroker object's attributes.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   radius ::
-   *     The border radius.
-   *
-   *   line_cap ::
-   *     The line cap style.
-   *
-   *   line_join ::
-   *     The line join style.
-   *
-   *   miter_limit ::
-   *     The miter limit for the FT_STROKER_LINEJOIN_MITER_FIXED and
-   *     FT_STROKER_LINEJOIN_MITER_VARIABLE line join styles,
-   *     expressed as 16.16 fixed-point value.
-   *
-   * @note:
-   *   The radius is expressed in the same units as the outline
-   *   coordinates.
-   *
-   *   This function calls @FT_Stroker_Rewind automatically.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Set( FT_Stroker           stroker,
-                  FT_Fixed             radius,
-                  FT_Stroker_LineCap   line_cap,
-                  FT_Stroker_LineJoin  line_join,
-                  FT_Fixed             miter_limit );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Rewind
-   *
-   * @description:
-   *   Reset a stroker object without changing its attributes.
-   *   You should call this function before beginning a new
-   *   series of calls to @FT_Stroker_BeginSubPath or
-   *   @FT_Stroker_EndSubPath.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Rewind( FT_Stroker  stroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_ParseOutline
-   *
-   * @description:
-   *   A convenience function used to parse a whole outline with
-   *   the stroker.  The resulting outline(s) can be retrieved
-   *   later by functions like @FT_Stroker_GetCounts and @FT_Stroker_Export.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   outline ::
-   *     The source outline.
-   *
-   *   opened ::
-   *     A boolean.  If~1, the outline is treated as an open path instead
-   *     of a closed one.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   If `opened' is~0 (the default), the outline is treated as a closed
-   *   path, and the stroker generates two distinct `border' outlines.
-   *
-   *   If `opened' is~1, the outline is processed as an open path, and the
-   *   stroker generates a single `stroke' outline.
-   *
-   *   This function calls @FT_Stroker_Rewind automatically.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ParseOutline( FT_Stroker   stroker,
-                           FT_Outline*  outline,
-                           FT_Bool      opened );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_BeginSubPath
-   *
-   * @description:
-   *   Start a new sub-path in the stroker.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   to ::
-   *     A pointer to the start vector.
-   *
-   *   open ::
-   *     A boolean.  If~1, the sub-path is treated as an open one.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   This function is useful when you need to stroke a path that is
-   *   not stored as an @FT_Outline object.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_BeginSubPath( FT_Stroker  stroker,
-                           FT_Vector*  to,
-                           FT_Bool     open );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_EndSubPath
-   *
-   * @description:
-   *   Close the current sub-path in the stroker.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function after @FT_Stroker_BeginSubPath.
-   *   If the subpath was not `opened', this function `draws' a
-   *   single line segment to the start position when needed.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_EndSubPath( FT_Stroker  stroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_LineTo
-   *
-   * @description:
-   *   `Draw' a single line segment in the stroker's current sub-path,
-   *   from the last position.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   to ::
-   *     A pointer to the destination point.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function between @FT_Stroker_BeginSubPath and
-   *   @FT_Stroker_EndSubPath.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_LineTo( FT_Stroker  stroker,
-                     FT_Vector*  to );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_ConicTo
-   *
-   * @description:
-   *   `Draw' a single quadratic Bézier in the stroker's current sub-path,
-   *   from the last position.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   control ::
-   *     A pointer to a Bézier control point.
-   *
-   *   to ::
-   *     A pointer to the destination point.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function between @FT_Stroker_BeginSubPath and
-   *   @FT_Stroker_EndSubPath.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ConicTo( FT_Stroker  stroker,
-                      FT_Vector*  control,
-                      FT_Vector*  to );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_CubicTo
-   *
-   * @description:
-   *   `Draw' a single cubic Bézier in the stroker's current sub-path,
-   *   from the last position.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   control1 ::
-   *     A pointer to the first Bézier control point.
-   *
-   *   control2 ::
-   *     A pointer to second Bézier control point.
-   *
-   *   to ::
-   *     A pointer to the destination point.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   You should call this function between @FT_Stroker_BeginSubPath and
-   *   @FT_Stroker_EndSubPath.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_CubicTo( FT_Stroker  stroker,
-                      FT_Vector*  control1,
-                      FT_Vector*  control2,
-                      FT_Vector*  to );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_GetBorderCounts
-   *
-   * @description:
-   *   Call this function once you have finished parsing your paths
-   *   with the stroker.  It returns the number of points and
-   *   contours necessary to export one of the `border' or `stroke'
-   *   outlines generated by the stroker.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   border ::
-   *     The border index.
-   *
-   * @output:
-   *   anum_points ::
-   *     The number of points.
-   *
-   *   anum_contours ::
-   *     The number of contours.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   When an outline, or a sub-path, is `closed', the stroker generates
-   *   two independent `border' outlines, named `left' and `right'.
-   *
-   *   When the outline, or a sub-path, is `opened', the stroker merges
-   *   the `border' outlines with caps.  The `left' border receives all
-   *   points, while the `right' border becomes empty.
-   *
-   *   Use the function @FT_Stroker_GetCounts instead if you want to
-   *   retrieve the counts associated to both borders.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetBorderCounts( FT_Stroker        stroker,
-                              FT_StrokerBorder  border,
-                              FT_UInt          *anum_points,
-                              FT_UInt          *anum_contours );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_ExportBorder
-   *
-   * @description:
-   *   Call this function after @FT_Stroker_GetBorderCounts to
-   *   export the corresponding border to your own @FT_Outline
-   *   structure.
-   *
-   *   Note that this function appends the border points and
-   *   contours to your outline, but does not try to resize its
-   *   arrays.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   border ::
-   *     The border index.
-   *
-   *   outline ::
-   *     The target outline handle.
-   *
-   * @note:
-   *   Always call this function after @FT_Stroker_GetBorderCounts to
-   *   get sure that there is enough room in your @FT_Outline object to
-   *   receive all new data.
-   *
-   *   When an outline, or a sub-path, is `closed', the stroker generates
-   *   two independent `border' outlines, named `left' and `right'.
-   *
-   *   When the outline, or a sub-path, is `opened', the stroker merges
-   *   the `border' outlines with caps.  The `left' border receives all
-   *   points, while the `right' border becomes empty.
-   *
-   *   Use the function @FT_Stroker_Export instead if you want to
-   *   retrieve all borders at once.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_ExportBorder( FT_Stroker        stroker,
-                           FT_StrokerBorder  border,
-                           FT_Outline*       outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_GetCounts
-   *
-   * @description:
-   *   Call this function once you have finished parsing your paths
-   *   with the stroker.  It returns the number of points and
-   *   contours necessary to export all points/borders from the stroked
-   *   outline/path.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   * @output:
-   *   anum_points ::
-   *     The number of points.
-   *
-   *   anum_contours ::
-   *     The number of contours.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetCounts( FT_Stroker  stroker,
-                        FT_UInt    *anum_points,
-                        FT_UInt    *anum_contours );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Export
-   *
-   * @description:
-   *   Call this function after @FT_Stroker_GetBorderCounts to
-   *   export all borders to your own @FT_Outline structure.
-   *
-   *   Note that this function appends the border points and
-   *   contours to your outline, but does not try to resize its
-   *   arrays.
-   *
-   * @input:
-   *   stroker ::
-   *     The target stroker handle.
-   *
-   *   outline ::
-   *     The target outline handle.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Export( FT_Stroker   stroker,
-                     FT_Outline*  outline );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Stroker_Done
-   *
-   * @description:
-   *   Destroy a stroker object.
-   *
-   * @input:
-   *   stroker ::
-   *     A stroker handle.  Can be NULL.
-   */
-  FT_EXPORT( void )
-  FT_Stroker_Done( FT_Stroker  stroker );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Glyph_Stroke
-   *
-   * @description:
-   *   Stroke a given outline glyph object with a given stroker.
-   *
-   * @inout:
-   *   pglyph ::
-   *     Source glyph handle on input, new glyph handle on output.
-   *
-   * @input:
-   *   stroker ::
-   *     A stroker handle.
-   *
-   *   destroy ::
-   *     A Boolean.  If~1, the source glyph object is destroyed
-   *     on success.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *   The source glyph is untouched in case of error.
-   *
-   *   Adding stroke may yield a significantly wider and taller glyph
-   *   depending on how large of a radius was used to stroke the glyph.  You
-   *   may need to manually adjust horizontal and vertical advance amounts
-   *   to account for this added size.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Stroke( FT_Glyph    *pglyph,
-                   FT_Stroker   stroker,
-                   FT_Bool      destroy );
-
-
-  /**************************************************************
-   *
-   * @function:
-   *   FT_Glyph_StrokeBorder
-   *
-   * @description:
-   *   Stroke a given outline glyph object with a given stroker, but
-   *   only return either its inside or outside border.
-   *
-   * @inout:
-   *   pglyph ::
-   *     Source glyph handle on input, new glyph handle on output.
-   *
-   * @input:
-   *   stroker ::
-   *     A stroker handle.
-   *
-   *   inside ::
-   *     A Boolean.  If~1, return the inside border, otherwise
-   *     the outside border.
-   *
-   *   destroy ::
-   *     A Boolean.  If~1, the source glyph object is destroyed
-   *     on success.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *   The source glyph is untouched in case of error.
-   *
-   *   Adding stroke may yield a significantly wider and taller glyph
-   *   depending on how large of a radius was used to stroke the glyph.  You
-   *   may need to manually adjust horizontal and vertical advance amounts
-   *   to account for this added size.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_StrokeBorder( FT_Glyph    *pglyph,
-                         FT_Stroker   stroker,
-                         FT_Bool      inside,
-                         FT_Bool      destroy );
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* FTSTROKE_H_ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
diff --git a/dependencies2013/win32/include/freetype/ftsynth.h b/dependencies2013/win32/include/freetype/ftsynth.h
deleted file mode 100644
index fdfcb691..00000000
--- a/dependencies2013/win32/include/freetype/ftsynth.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsynth.h                                                              */
-/*                                                                         */
-/*    FreeType synthesizing code for emboldening and slanting              */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 2000-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********        WARNING, THIS IS ALPHA CODE!  THIS API         *********/
-  /*********    IS DUE TO CHANGE UNTIL STRICTLY NOTIFIED BY THE    *********/
-  /*********            FREETYPE DEVELOPMENT TEAM                  *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* Main reason for not lifting the functions in this module to a  */
-  /* `standard' API is that the used parameters for emboldening and */
-  /* slanting are not configurable.  Consider the functions as a    */
-  /* code resource that should be copied into the application and   */
-  /* adapted to the particular needs.                               */
-
-
-#ifndef FTSYNTH_H_
-#define FTSYNTH_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /* Embolden a glyph by a `reasonable' value (which is highly a matter of */
-  /* taste).  This function is actually a convenience function, providing  */
-  /* a wrapper for @FT_Outline_Embolden and @FT_Bitmap_Embolden.           */
-  /*                                                                       */
-  /* For emboldened outlines the height, width, and advance metrics are    */
-  /* increased by the strength of the emboldening -- this even affects     */
-  /* mono-width fonts!                                                     */
-  /*                                                                       */
-  /* You can also call @FT_Outline_Get_CBox to get precise values.         */
-  FT_EXPORT( void )
-  FT_GlyphSlot_Embolden( FT_GlyphSlot  slot );
-
-  /* Slant an outline glyph to the right by about 12 degrees. */
-  FT_EXPORT( void )
-  FT_GlyphSlot_Oblique( FT_GlyphSlot  slot );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTSYNTH_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftsystem.h b/dependencies2013/win32/include/freetype/ftsystem.h
deleted file mode 100644
index 908ae07f..00000000
--- a/dependencies2013/win32/include/freetype/ftsystem.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsystem.h                                                             */
-/*                                                                         */
-/*    FreeType low-level system interface definition (specification).      */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTSYSTEM_H_
-#define FTSYSTEM_H_
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   system_interface                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*   System Interface                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*   How FreeType manages memory and i/o.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This section contains various definitions related to memory         */
-  /*   management and i/o access.  You need to understand this             */
-  /*   information if you want to use a custom memory manager or you own   */
-  /*   i/o streams.                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                  M E M O R Y   M A N A G E M E N T                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FT_Memory
-   *
-   * @description:
-   *   A handle to a given memory manager object, defined with an
-   *   @FT_MemoryRec structure.
-   *
-   */
-  typedef struct FT_MemoryRec_*  FT_Memory;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Alloc_Func
-   *
-   * @description:
-   *   A function used to allocate `size' bytes from `memory'.
-   *
-   * @input:
-   *   memory ::
-   *     A handle to the source memory manager.
-   *
-   *   size ::
-   *     The size in bytes to allocate.
-   *
-   * @return:
-   *   Address of new memory block.  0~in case of failure.
-   *
-   */
-  typedef void*
-  (*FT_Alloc_Func)( FT_Memory  memory,
-                    long       size );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Free_Func
-   *
-   * @description:
-   *   A function used to release a given block of memory.
-   *
-   * @input:
-   *   memory ::
-   *     A handle to the source memory manager.
-   *
-   *   block ::
-   *     The address of the target memory block.
-   *
-   */
-  typedef void
-  (*FT_Free_Func)( FT_Memory  memory,
-                   void*      block );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Realloc_Func
-   *
-   * @description:
-   *   A function used to re-allocate a given block of memory.
-   *
-   * @input:
-   *   memory ::
-   *     A handle to the source memory manager.
-   *
-   *   cur_size ::
-   *     The block's current size in bytes.
-   *
-   *   new_size ::
-   *     The block's requested new size.
-   *
-   *   block ::
-   *     The block's current address.
-   *
-   * @return:
-   *   New block address.  0~in case of memory shortage.
-   *
-   * @note:
-   *   In case of error, the old block must still be available.
-   *
-   */
-  typedef void*
-  (*FT_Realloc_Func)( FT_Memory  memory,
-                      long       cur_size,
-                      long       new_size,
-                      void*      block );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FT_MemoryRec
-   *
-   * @description:
-   *   A structure used to describe a given memory manager to FreeType~2.
-   *
-   * @fields:
-   *   user ::
-   *     A generic typeless pointer for user data.
-   *
-   *   alloc ::
-   *     A pointer type to an allocation function.
-   *
-   *   free ::
-   *     A pointer type to an memory freeing function.
-   *
-   *   realloc ::
-   *     A pointer type to a reallocation function.
-   *
-   */
-  struct  FT_MemoryRec_
-  {
-    void*            user;
-    FT_Alloc_Func    alloc;
-    FT_Free_Func     free;
-    FT_Realloc_Func  realloc;
-  };
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                       I / O   M A N A G E M E N T                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FT_Stream
-   *
-   * @description:
-   *   A handle to an input stream.
-   *
-   * @also:
-   *   See @FT_StreamRec for the publicly accessible fields of a given
-   *   stream object.
-   *
-   */
-  typedef struct FT_StreamRec_*  FT_Stream;
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FT_StreamDesc
-   *
-   * @description:
-   *   A union type used to store either a long or a pointer.  This is used
-   *   to store a file descriptor or a `FILE*' in an input stream.
-   *
-   */
-  typedef union  FT_StreamDesc_
-  {
-    long   value;
-    void*  pointer;
-
-  } FT_StreamDesc;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Stream_IoFunc
-   *
-   * @description:
-   *   A function used to seek and read data from a given input stream.
-   *
-   * @input:
-   *   stream ::
-   *     A handle to the source stream.
-   *
-   *   offset ::
-   *     The offset of read in stream (always from start).
-   *
-   *   buffer ::
-   *     The address of the read buffer.
-   *
-   *   count ::
-   *     The number of bytes to read from the stream.
-   *
-   * @return:
-   *   The number of bytes effectively read by the stream.
-   *
-   * @note:
-   *   This function might be called to perform a seek or skip operation
-   *   with a `count' of~0.  A non-zero return value then indicates an
-   *   error.
-   *
-   */
-  typedef unsigned long
-  (*FT_Stream_IoFunc)( FT_Stream       stream,
-                       unsigned long   offset,
-                       unsigned char*  buffer,
-                       unsigned long   count );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   FT_Stream_CloseFunc
-   *
-   * @description:
-   *   A function used to close a given input stream.
-   *
-   * @input:
-   *  stream ::
-   *     A handle to the target stream.
-   *
-   */
-  typedef void
-  (*FT_Stream_CloseFunc)( FT_Stream  stream );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   FT_StreamRec
-   *
-   * @description:
-   *   A structure used to describe an input stream.
-   *
-   * @input:
-   *   base ::
-   *     For memory-based streams, this is the address of the first stream
-   *     byte in memory.  This field should always be set to NULL for
-   *     disk-based streams.
-   *
-   *   size ::
-   *     The stream size in bytes.
-   *
-   *     In case of compressed streams where the size is unknown before
-   *     actually doing the decompression, the value is set to 0x7FFFFFFF. 
-   *     (Note that this size value can occur for normal streams also; it is
-   *     thus just a hint.)
-   *
-   *   pos ::
-   *     The current position within the stream.
-   *
-   *   descriptor ::
-   *     This field is a union that can hold an integer or a pointer.  It is
-   *     used by stream implementations to store file descriptors or `FILE*'
-   *     pointers.
-   *
-   *   pathname ::
-   *     This field is completely ignored by FreeType.  However, it is often
-   *     useful during debugging to use it to store the stream's filename
-   *     (where available).
-   *
-   *   read ::
-   *     The stream's input function.
-   *
-   *   close ::
-   *     The stream's close function.
-   *
-   *   memory ::
-   *     The memory manager to use to preload frames.  This is set
-   *     internally by FreeType and shouldn't be touched by stream
-   *     implementations.
-   *
-   *   cursor ::
-   *     This field is set and used internally by FreeType when parsing
-   *     frames.
-   *
-   *   limit ::
-   *     This field is set and used internally by FreeType when parsing
-   *     frames.
-   *
-   */
-  typedef struct  FT_StreamRec_
-  {
-    unsigned char*       base;
-    unsigned long        size;
-    unsigned long        pos;
-
-    FT_StreamDesc        descriptor;
-    FT_StreamDesc        pathname;
-    FT_Stream_IoFunc     read;
-    FT_Stream_CloseFunc  close;
-
-    FT_Memory            memory;
-    unsigned char*       cursor;
-    unsigned char*       limit;
-
-  } FT_StreamRec;
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTSYSTEM_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/fttrigon.h b/dependencies2013/win32/include/freetype/fttrigon.h
deleted file mode 100644
index f789b524..00000000
--- a/dependencies2013/win32/include/freetype/fttrigon.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttrigon.h                                                             */
-/*                                                                         */
-/*    FreeType trigonometric functions (specification).                    */
-/*                                                                         */
-/*  Copyright 2001-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTTRIGON_H_
-#define FTTRIGON_H_
-
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*   computations                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   FT_Angle
-   *
-   * @description:
-   *   This type is used to model angle values in FreeType.  Note that the
-   *   angle is a 16.16 fixed-point value expressed in degrees.
-   *
-   */
-  typedef FT_Fixed  FT_Angle;
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_PI
-   *
-   * @description:
-   *   The angle pi expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_PI  ( 180L << 16 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_2PI
-   *
-   * @description:
-   *   The angle 2*pi expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_2PI  ( FT_ANGLE_PI * 2 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_PI2
-   *
-   * @description:
-   *   The angle pi/2 expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_PI2  ( FT_ANGLE_PI / 2 )
-
-
-  /*************************************************************************
-   *
-   * @macro:
-   *   FT_ANGLE_PI4
-   *
-   * @description:
-   *   The angle pi/4 expressed in @FT_Angle units.
-   *
-   */
-#define FT_ANGLE_PI4  ( FT_ANGLE_PI / 4 )
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Sin
-   *
-   * @description:
-   *   Return the sinus of a given angle in fixed-point format.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   * @return:
-   *   The sinus value.
-   *
-   * @note:
-   *   If you need both the sinus and cosinus for a given angle, use the
-   *   function @FT_Vector_Unit.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Sin( FT_Angle  angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Cos
-   *
-   * @description:
-   *   Return the cosinus of a given angle in fixed-point format.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   * @return:
-   *   The cosinus value.
-   *
-   * @note:
-   *   If you need both the sinus and cosinus for a given angle, use the
-   *   function @FT_Vector_Unit.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Cos( FT_Angle  angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Tan
-   *
-   * @description:
-   *   Return the tangent of a given angle in fixed-point format.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   * @return:
-   *   The tangent value.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Tan( FT_Angle  angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Atan2
-   *
-   * @description:
-   *   Return the arc-tangent corresponding to a given vector (x,y) in
-   *   the 2d plane.
-   *
-   * @input:
-   *   x ::
-   *     The horizontal vector coordinate.
-   *
-   *   y ::
-   *     The vertical vector coordinate.
-   *
-   * @return:
-   *   The arc-tangent value (i.e. angle).
-   *
-   */
-  FT_EXPORT( FT_Angle )
-  FT_Atan2( FT_Fixed  x,
-            FT_Fixed  y );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Angle_Diff
-   *
-   * @description:
-   *   Return the difference between two angles.  The result is always
-   *   constrained to the ]-PI..PI] interval.
-   *
-   * @input:
-   *   angle1 ::
-   *     First angle.
-   *
-   *   angle2 ::
-   *     Second angle.
-   *
-   * @return:
-   *   Constrained value of `value2-value1'.
-   *
-   */
-  FT_EXPORT( FT_Angle )
-  FT_Angle_Diff( FT_Angle  angle1,
-                 FT_Angle  angle2 );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Unit
-   *
-   * @description:
-   *   Return the unit vector corresponding to a given angle.  After the
-   *   call, the value of `vec.x' will be `cos(angle)', and the value of
-   *   `vec.y' will be `sin(angle)'.
-   *
-   *   This function is useful to retrieve both the sinus and cosinus of a
-   *   given angle quickly.
-   *
-   * @output:
-   *   vec ::
-   *     The address of target vector.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_Unit( FT_Vector*  vec,
-                  FT_Angle    angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Rotate
-   *
-   * @description:
-   *   Rotate a vector by a given angle.
-   *
-   * @inout:
-   *   vec ::
-   *     The address of target vector.
-   *
-   * @input:
-   *   angle ::
-   *     The input angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_Rotate( FT_Vector*  vec,
-                    FT_Angle    angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Length
-   *
-   * @description:
-   *   Return the length of a given vector.
-   *
-   * @input:
-   *   vec ::
-   *     The address of target vector.
-   *
-   * @return:
-   *   The vector length, expressed in the same units that the original
-   *   vector coordinates.
-   *
-   */
-  FT_EXPORT( FT_Fixed )
-  FT_Vector_Length( FT_Vector*  vec );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_Polarize
-   *
-   * @description:
-   *   Compute both the length and angle of a given vector.
-   *
-   * @input:
-   *   vec ::
-   *     The address of source vector.
-   *
-   * @output:
-   *   length ::
-   *     The vector length.
-   *
-   *   angle ::
-   *     The vector angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_Polarize( FT_Vector*  vec,
-                      FT_Fixed   *length,
-                      FT_Angle   *angle );
-
-
-  /*************************************************************************
-   *
-   * @function:
-   *   FT_Vector_From_Polar
-   *
-   * @description:
-   *   Compute vector coordinates from a length and angle.
-   *
-   * @output:
-   *   vec ::
-   *     The address of source vector.
-   *
-   * @input:
-   *   length ::
-   *     The vector length.
-   *
-   *   angle ::
-   *     The vector angle.
-   *
-   */
-  FT_EXPORT( void )
-  FT_Vector_From_Polar( FT_Vector*  vec,
-                        FT_Fixed    length,
-                        FT_Angle    angle );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTTRIGON_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftttdrv.h b/dependencies2013/win32/include/freetype/ftttdrv.h
deleted file mode 100644
index 6c02e657..00000000
--- a/dependencies2013/win32/include/freetype/ftttdrv.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftttdrv.h                                                              */
-/*                                                                         */
-/*    FreeType API for controlling the TrueType driver                     */
-/*    (specification only).                                                */
-/*                                                                         */
-/*  Copyright 2013-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTTTDRV_H_
-#define FTTTDRV_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   tt_driver
-   *
-   * @title:
-   *   The TrueType driver
-   *
-   * @abstract:
-   *   Controlling the TrueType driver module.
-   *
-   * @description:
-   *   While FreeType's TrueType driver doesn't expose API functions by
-   *   itself, it is possible to control its behaviour with @FT_Property_Set
-   *   and @FT_Property_Get.  The following lists the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   The TrueType driver's module name is `truetype'.
-   *
-   *   We start with a list of definitions, kindly provided by Greg
-   *   Hitchcock.
-   *
-   *   _Bi-Level_ _Rendering_
-   *
-   *   Monochromatic rendering, exclusively used in the early days of
-   *   TrueType by both Apple and Microsoft.  Microsoft's GDI interface
-   *   supported hinting of the right-side bearing point, such that the
-   *   advance width could be non-linear.  Most often this was done to
-   *   achieve some level of glyph symmetry.  To enable reasonable
-   *   performance (e.g., not having to run hinting on all glyphs just to
-   *   get the widths) there was a bit in the head table indicating if the
-   *   side bearing was hinted, and additional tables, `hdmx' and `LTSH', to
-   *   cache hinting widths across multiple sizes and device aspect ratios.
-   *
-   *   _Font_ _Smoothing_
-   *
-   *   Microsoft's GDI implementation of anti-aliasing.  Not traditional
-   *   anti-aliasing as the outlines were hinted before the sampling.  The
-   *   widths matched the bi-level rendering.
-   *
-   *   _ClearType_ _Rendering_
-   *
-   *   Technique that uses physical subpixels to improve rendering on LCD
-   *   (and other) displays.  Because of the higher resolution, many methods
-   *   of improving symmetry in glyphs through hinting the right-side
-   *   bearing were no longer necessary.  This lead to what GDI calls
-   *   `natural widths' ClearType, see
-   *   http://www.beatstamm.com/typography/RTRCh4.htm#Sec21.  Since hinting
-   *   has extra resolution, most non-linearity went away, but it is still
-   *   possible for hints to change the advance widths in this mode.
-   *
-   *   _ClearType_ _Compatible_ _Widths_
-   *
-   *   One of the earliest challenges with ClearType was allowing the
-   *   implementation in GDI to be selected without requiring all UI and
-   *   documents to reflow.  To address this, a compatible method of
-   *   rendering ClearType was added where the font hints are executed once
-   *   to determine the width in bi-level rendering, and then re-run in
-   *   ClearType, with the difference in widths being absorbed in the font
-   *   hints for ClearType (mostly in the white space of hints); see
-   *   http://www.beatstamm.com/typography/RTRCh4.htm#Sec20.  Somewhat by
-   *   definition, compatible width ClearType allows for non-linear widths,
-   *   but only when the bi-level version has non-linear widths.
-   *
-   *   _ClearType_ _Subpixel_ _Positioning_
-   *
-   *   One of the nice benefits of ClearType is the ability to more crisply
-   *   display fractional widths; unfortunately, the GDI model of integer
-   *   bitmaps did not support this.  However, the WPF and Direct Write
-   *   frameworks do support fractional widths.  DWrite calls this `natural
-   *   mode', not to be confused with GDI's `natural widths'.  Subpixel
-   *   positioning, in the current implementation of Direct Write,
-   *   unfortunately does not support hinted advance widths, see
-   *   http://www.beatstamm.com/typography/RTRCh4.htm#Sec22.  Note that the
-   *   TrueType interpreter fully allows the advance width to be adjusted in
-   *   this mode, just the DWrite client will ignore those changes.
-   *
-   *   _ClearType_ _Backwards_ _Compatibility_
-   *
-   *   This is a set of exceptions made in the TrueType interpreter to
-   *   minimize hinting techniques that were problematic with the extra
-   *   resolution of ClearType; see
-   *   http://www.beatstamm.com/typography/RTRCh4.htm#Sec1 and
-   *   http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx.
-   *   This technique is not to be confused with ClearType compatible
-   *   widths.  ClearType backwards compatibility has no direct impact on
-   *   changing advance widths, but there might be an indirect impact on
-   *   disabling some deltas.  This could be worked around in backwards
-   *   compatibility mode.
-   *
-   *   _Native_ _ClearType_ _Mode_
-   *
-   *   (Not to be confused with `natural widths'.)  This mode removes all
-   *   the exceptions in the TrueType interpreter when running with
-   *   ClearType.  Any issues on widths would still apply, though.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   interpreter-version
-   *
-   * @description:
-   *   Currently, two versions are available, representing the bytecode
-   *   interpreter with and without subpixel hinting support,
-   *   respectively.  The default is subpixel support if
-   *   TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel
-   *   support otherwise (since it isn't available then).
-   *
-   *   If subpixel hinting is on, many TrueType bytecode instructions behave
-   *   differently compared to B/W or grayscale rendering (except if `native
-   *   ClearType' is selected by the font).  The main idea is to render at a
-   *   much increased horizontal resolution, then sampling down the created
-   *   output to subpixel precision.  However, many older fonts are not
-   *   suited to this and must be specially taken care of by applying
-   *   (hardcoded) font-specific tweaks.
-   *
-   *   Details on subpixel hinting and some of the necessary tweaks can be
-   *   found in Greg Hitchcock's whitepaper at
-   *   `http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx'.
-   *
-   *   The following example code demonstrates how to activate subpixel
-   *   hinting (omitting the error handling).
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Face     face;
-   *     FT_UInt     interpreter_version = TT_INTERPRETER_VERSION_38;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "truetype",
-   *                               "interpreter-version",
-   *                               &interpreter_version );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   TT_INTERPRETER_VERSION_XXX
-   *
-   * @description:
-   *   A list of constants used for the @interpreter-version property to
-   *   select the hinting engine for Truetype fonts.
-   *
-   *   The numeric value in the constant names represents the version
-   *   number as returned by the `GETINFO' bytecode instruction.
-   *
-   * @values:
-   *   TT_INTERPRETER_VERSION_35 ::
-   *     Version~35 corresponds to MS rasterizer v.1.7 as used e.g. in
-   *     Windows~98; only grayscale and B/W rasterizing is supported.
-   *
-   *   TT_INTERPRETER_VERSION_38 ::
-   *     Version~38 corresponds to MS rasterizer v.1.9; it is roughly
-   *     equivalent to the hinting provided by DirectWrite ClearType (as
-   *     can be found, for example, in the Internet Explorer~9 running on
-   *     Windows~7).
-   *
-   * @note:
-   *   This property controls the behaviour of the bytecode interpreter
-   *   and thus how outlines get hinted.  It does *not* control how glyph
-   *   get rasterized!  In particular, it does not control subpixel color
-   *   filtering.
-   *
-   *   If FreeType has not been compiled with configuration option
-   *   FT_CONFIG_OPTION_SUBPIXEL_HINTING, selecting version~38 causes an
-   *   `FT_Err_Unimplemented_Feature' error.
-   *
-   *   Depending on the graphics framework, Microsoft uses different
-   *   bytecode and rendering engines.  As a consequence, the version
-   *   numbers returned by a call to the `GETINFO' bytecode instruction are
-   *   more convoluted than desired.
-   *
-   *   Here are two tables that try to shed some light on the possible
-   *   values for the MS rasterizer engine, together with the additional
-   *   features introduced by it.
-   *
-   *   {
-   *     GETINFO framework               version feature
-   *     -------------------------------------------------------------------
-   *         3   GDI (Win 3.1),            v1.0  16-bit, first version
-   *             TrueImage
-   *        33   GDI (Win NT 3.1),         v1.5  32-bit
-   *             HP Laserjet
-   *        34   GDI (Win 95)              v1.6  font smoothing,
-   *                                             new SCANTYPE opcode
-   *        35   GDI (Win 98/2000)         v1.7  (UN)SCALED_COMPONENT_OFFSET
-   *                                               bits in composite glyphs
-   *        36   MGDI (Win CE 2)           v1.6+ classic ClearType
-   *        37   GDI (XP and later),       v1.8  ClearType
-   *             GDI+ old (before Vista)
-   *        38   GDI+ old (Vista, Win 7),  v1.9  subpixel ClearType,
-   *             WPF                             Y-direction ClearType,
-   *                                             additional error checking
-   *        39   DWrite (before Win 8)     v2.0  subpixel ClearType flags
-   *                                               in GETINFO opcode,
-   *                                             bug fixes
-   *        40   GDI+ (after Win 7),       v2.1  Y-direction ClearType flag
-   *             DWrite (Win 8)                    in GETINFO opcode,
-   *                                             Gray ClearType
-   *   }
-   *
-   *   The `version' field gives a rough orientation only, since some
-   *   applications provided certain features much earlier (as an example,
-   *   Microsoft Reader used subpixel and Y-direction ClearType already in
-   *   Windows 2000).  Similarly, updates to a given framework might include
-   *   improved hinting support.
-   *
-   *   {
-   *      version   sampling          rendering        comment
-   *               x        y       x           y
-   *     --------------------------------------------------------------
-   *       v1.0   normal  normal  B/W           B/W    bi-level
-   *       v1.6   high    high    gray          gray   grayscale
-   *       v1.8   high    normal  color-filter  B/W    (GDI) ClearType
-   *       v1.9   high    high    color-filter  gray   Color ClearType
-   *       v2.1   high    normal  gray          B/W    Gray ClearType
-   *       v2.1   high    high    gray          gray   Gray ClearType
-   *   }
-   *
-   *   Color and Gray ClearType are the two available variants of
-   *   `Y-direction ClearType', meaning grayscale rasterization along the
-   *   Y-direction; the name used in the TrueType specification for this
-   *   feature is `symmetric smoothing'.  `Classic ClearType' is the
-   *   original algorithm used before introducing a modified version in
-   *   Win~XP.  Another name for v1.6's grayscale rendering is `font
-   *   smoothing', and `Color ClearType' is sometimes also called `DWrite
-   *   ClearType'.  To differentiate between today's Color ClearType and the
-   *   earlier ClearType variant with B/W rendering along the vertical axis,
-   *   the latter is sometimes called `GDI ClearType'.
-   *
-   *   `Normal' and `high' sampling describe the (virtual) resolution to
-   *   access the rasterized outline after the hinting process.  `Normal'
-   *   means 1 sample per grid line (i.e., B/W).  In the current Microsoft
-   *   implementation, `high' means an extra virtual resolution of 16x16 (or
-   *   16x1) grid lines per pixel for bytecode instructions like `MIRP'.
-   *   After hinting, these 16 grid lines are mapped to 6x5 (or 6x1) grid
-   *   lines for color filtering if Color ClearType is activated.
-   *
-   *   Note that `Gray ClearType' is essentially the same as v1.6's
-   *   grayscale rendering.  However, the GETINFO instruction handles it
-   *   differently: v1.6 returns bit~12 (hinting for grayscale), while v2.1
-   *   returns bits~13 (hinting for ClearType), 18 (symmetrical smoothing),
-   *   and~19 (Gray ClearType).  Also, this mode respects bits 2 and~3 for
-   *   the version~1 gasp table exclusively (like Color ClearType), while
-   *   v1.6 only respects the values of version~0 (bits 0 and~1).
-   *
-   *   FreeType doesn't provide all capabilities of the most recent
-   *   ClearType incarnation, thus we identify our subpixel support as
-   *   version~38.
-   *
-   */
-#define TT_INTERPRETER_VERSION_35  35
-#define TT_INTERPRETER_VERSION_38  38
-
- /* */
-
-
-FT_END_HEADER
-
-
-#endif /* FTTTDRV_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/fttypes.h b/dependencies2013/win32/include/freetype/fttypes.h
deleted file mode 100644
index 2673e79c..00000000
--- a/dependencies2013/win32/include/freetype/fttypes.h
+++ /dev/null
@@ -1,602 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttypes.h                                                              */
-/*                                                                         */
-/*    FreeType simple types definitions (specification only).              */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTTYPES_H_
-#define FTTYPES_H_
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_SYSTEM_H
-#include FT_IMAGE_H
-
-#include <stddef.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Basic Data Types                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The basic data types defined by the library.                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the basic data types defined by FreeType~2,  */
-  /*    ranging from simple scalar types to bitmap descriptors.  More      */
-  /*    font-specific structures are defined in a different section.       */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Byte                                                            */
-  /*    FT_Bytes                                                           */
-  /*    FT_Char                                                            */
-  /*    FT_Int                                                             */
-  /*    FT_UInt                                                            */
-  /*    FT_Int16                                                           */
-  /*    FT_UInt16                                                          */
-  /*    FT_Int32                                                           */
-  /*    FT_UInt32                                                          */
-  /*    FT_Int64                                                           */
-  /*    FT_UInt64                                                          */
-  /*    FT_Short                                                           */
-  /*    FT_UShort                                                          */
-  /*    FT_Long                                                            */
-  /*    FT_ULong                                                           */
-  /*    FT_Bool                                                            */
-  /*    FT_Offset                                                          */
-  /*    FT_PtrDist                                                         */
-  /*    FT_String                                                          */
-  /*    FT_Tag                                                             */
-  /*    FT_Error                                                           */
-  /*    FT_Fixed                                                           */
-  /*    FT_Pointer                                                         */
-  /*    FT_Pos                                                             */
-  /*    FT_Vector                                                          */
-  /*    FT_BBox                                                            */
-  /*    FT_Matrix                                                          */
-  /*    FT_FWord                                                           */
-  /*    FT_UFWord                                                          */
-  /*    FT_F2Dot14                                                         */
-  /*    FT_UnitVector                                                      */
-  /*    FT_F26Dot6                                                         */
-  /*    FT_Data                                                            */
-  /*                                                                       */
-  /*    FT_MAKE_TAG                                                        */
-  /*                                                                       */
-  /*    FT_Generic                                                         */
-  /*    FT_Generic_Finalizer                                               */
-  /*                                                                       */
-  /*    FT_Bitmap                                                          */
-  /*    FT_Pixel_Mode                                                      */
-  /*    FT_Palette_Mode                                                    */
-  /*    FT_Glyph_Format                                                    */
-  /*    FT_IMAGE_TAG                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Bool                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef of unsigned char, used for simple booleans.  As usual,   */
-  /*    values 1 and~0 represent true and false, respectively.             */
-  /*                                                                       */
-  typedef unsigned char  FT_Bool;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_FWord                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 16-bit integer used to store a distance in original font  */
-  /*    units.                                                             */
-  /*                                                                       */
-  typedef signed short  FT_FWord;   /* distance in FUnits */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UFWord                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An unsigned 16-bit integer used to store a distance in original    */
-  /*    font units.                                                        */
-  /*                                                                       */
-  typedef unsigned short  FT_UFWord;  /* unsigned distance */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Char                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the _signed_ char type.                       */
-  /*                                                                       */
-  typedef signed char  FT_Char;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Byte                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the _unsigned_ char type.                     */
-  /*                                                                       */
-  typedef unsigned char  FT_Byte;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Bytes                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for constant memory areas.                               */
-  /*                                                                       */
-  typedef const FT_Byte*  FT_Bytes;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Tag                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for 32-bit tags (as used in the SFNT format).            */
-  /*                                                                       */
-  typedef FT_UInt32  FT_Tag;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_String                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the char type, usually used for strings.      */
-  /*                                                                       */
-  typedef char  FT_String;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Short                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for signed short.                                        */
-  /*                                                                       */
-  typedef signed short  FT_Short;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UShort                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for unsigned short.                                      */
-  /*                                                                       */
-  typedef unsigned short  FT_UShort;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for the int type.                                        */
-  /*                                                                       */
-  typedef signed int  FT_Int;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for the unsigned int type.                               */
-  /*                                                                       */
-  typedef unsigned int  FT_UInt;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Long                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for signed long.                                         */
-  /*                                                                       */
-  typedef signed long  FT_Long;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_ULong                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for unsigned long.                                       */
-  /*                                                                       */
-  typedef unsigned long  FT_ULong;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_F2Dot14                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 2.14 fixed-point type used for unit vectors.              */
-  /*                                                                       */
-  typedef signed short  FT_F2Dot14;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_F26Dot6                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 26.6 fixed-point type used for vectorial pixel            */
-  /*    coordinates.                                                       */
-  /*                                                                       */
-  typedef signed long  FT_F26Dot6;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Fixed                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is used to store 16.16 fixed-point values, like scaling  */
-  /*    values or matrix coefficients.                                     */
-  /*                                                                       */
-  typedef signed long  FT_Fixed;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Error                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The FreeType error code type.  A value of~0 is always interpreted  */
-  /*    as a successful operation.                                         */
-  /*                                                                       */
-  typedef int  FT_Error;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Pointer                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for a typeless pointer.                           */
-  /*                                                                       */
-  typedef void*  FT_Pointer;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Offset                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is equivalent to the ANSI~C `size_t' type, i.e., the largest  */
-  /*    _unsigned_ integer type used to express a file size or position,   */
-  /*    or a memory block size.                                            */
-  /*                                                                       */
-  typedef size_t  FT_Offset;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_PtrDist                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is equivalent to the ANSI~C `ptrdiff_t' type, i.e., the       */
-  /*    largest _signed_ integer type used to express the distance         */
-  /*    between two pointers.                                              */
-  /*                                                                       */
-  typedef ft_ptrdiff_t  FT_PtrDist;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_UnitVector                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2D vector unit vector.  Uses    */
-  /*    FT_F2Dot14 types.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x :: Horizontal coordinate.                                        */
-  /*                                                                       */
-  /*    y :: Vertical coordinate.                                          */
-  /*                                                                       */
-  typedef struct  FT_UnitVector_
-  {
-    FT_F2Dot14  x;
-    FT_F2Dot14  y;
-
-  } FT_UnitVector;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Matrix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2x2 matrix.  Coefficients are   */
-  /*    in 16.16 fixed-point format.  The computation performed is:        */
-  /*                                                                       */
-  /*       {                                                               */
-  /*          x' = x*xx + y*xy                                             */
-  /*          y' = x*yx + y*yy                                             */
-  /*       }                                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    xx :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    xy :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    yx :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    yy :: Matrix coefficient.                                          */
-  /*                                                                       */
-  typedef struct  FT_Matrix_
-  {
-    FT_Fixed  xx, xy;
-    FT_Fixed  yx, yy;
-
-  } FT_Matrix;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Data                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Read-only binary data represented as a pointer and a length.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    pointer :: The data.                                               */
-  /*                                                                       */
-  /*    length  :: The length of the data in bytes.                        */
-  /*                                                                       */
-  typedef struct  FT_Data_
-  {
-    const FT_Byte*  pointer;
-    FT_Int          length;
-
-  } FT_Data;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Generic_Finalizer                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Describe a function used to destroy the `client' data of any       */
-  /*    FreeType object.  See the description of the @FT_Generic type for  */
-  /*    details of usage.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    The address of the FreeType object that is under finalization.     */
-  /*    Its client data is accessed through its `generic' field.           */
-  /*                                                                       */
-  typedef void  (*FT_Generic_Finalizer)(void*  object);
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Generic                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Client applications often need to associate their own data to a    */
-  /*    variety of FreeType core objects.  For example, a text layout API  */
-  /*    might want to associate a glyph cache to a given size object.      */
-  /*                                                                       */
-  /*    Some FreeType object contains a `generic' field, of type           */
-  /*    FT_Generic, which usage is left to client applications and font    */
-  /*    servers.                                                           */
-  /*                                                                       */
-  /*    It can be used to store a pointer to client-specific data, as well */
-  /*    as the address of a `finalizer' function, which will be called by  */
-  /*    FreeType when the object is destroyed (for example, the previous   */
-  /*    client example would put the address of the glyph cache destructor */
-  /*    in the `finalizer' field).                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    data      :: A typeless pointer to any client-specified data. This */
-  /*                 field is completely ignored by the FreeType library.  */
-  /*                                                                       */
-  /*    finalizer :: A pointer to a `generic finalizer' function, which    */
-  /*                 will be called when the object is destroyed.  If this */
-  /*                 field is set to NULL, no code will be called.         */
-  /*                                                                       */
-  typedef struct  FT_Generic_
-  {
-    void*                 data;
-    FT_Generic_Finalizer  finalizer;
-
-  } FT_Generic;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_MAKE_TAG                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four-letter tags that are used to label        */
-  /*    TrueType tables into an unsigned long, to be used within FreeType. */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The produced values *must* be 32-bit integers.  Don't redefine     */
-  /*    this macro.                                                        */
-  /*                                                                       */
-#define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
-          (FT_Tag)                        \
-          ( ( (FT_ULong)_x1 << 24 ) |     \
-            ( (FT_ULong)_x2 << 16 ) |     \
-            ( (FT_ULong)_x3 <<  8 ) |     \
-              (FT_ULong)_x4         )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                    L I S T   M A N A G E M E N T                      */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    list_processing                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_ListNode                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*     Many elements and objects in FreeType are listed through an       */
-  /*     @FT_List record (see @FT_ListRec).  As its name suggests, an      */
-  /*     FT_ListNode is a handle to a single list element.                 */
-  /*                                                                       */
-  typedef struct FT_ListNodeRec_*  FT_ListNode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_List                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a list record (see @FT_ListRec).                       */
-  /*                                                                       */
-  typedef struct FT_ListRec_*  FT_List;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ListNodeRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold a single list element.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    prev :: The previous element in the list.  NULL if first.          */
-  /*                                                                       */
-  /*    next :: The next element in the list.  NULL if last.               */
-  /*                                                                       */
-  /*    data :: A typeless pointer to the listed object.                   */
-  /*                                                                       */
-  typedef struct  FT_ListNodeRec_
-  {
-    FT_ListNode  prev;
-    FT_ListNode  next;
-    void*        data;
-
-  } FT_ListNodeRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ListRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold a simple doubly-linked list.  These are   */
-  /*    used in many parts of FreeType.                                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    head :: The head (first element) of doubly-linked list.            */
-  /*                                                                       */
-  /*    tail :: The tail (last element) of doubly-linked list.             */
-  /*                                                                       */
-  typedef struct  FT_ListRec_
-  {
-    FT_ListNode  head;
-    FT_ListNode  tail;
-
-  } FT_ListRec;
-
-  /* */
-
-
-#define FT_IS_EMPTY( list )  ( (list).head == 0 )
-#define FT_BOOL( x )  ( (FT_Bool)( x ) )
-
-  /* concatenate C tokens */
-#define FT_ERR_XCAT( x, y )  x ## y
-#define FT_ERR_CAT( x, y )   FT_ERR_XCAT( x, y )
-
-  /* see `ftmoderr.h' for descriptions of the following macros */
-
-#define FT_ERR( e )  FT_ERR_CAT( FT_ERR_PREFIX, e )
-
-#define FT_ERROR_BASE( x )    ( (x) & 0xFF )
-#define FT_ERROR_MODULE( x )  ( (x) & 0xFF00U )
-
-#define FT_ERR_EQ( x, e )                                        \
-          ( FT_ERROR_BASE( x ) == FT_ERROR_BASE( FT_ERR( e ) ) )
-#define FT_ERR_NEQ( x, e )                                       \
-          ( FT_ERROR_BASE( x ) != FT_ERROR_BASE( FT_ERR( e ) ) )
-
-
-FT_END_HEADER
-
-#endif /* FTTYPES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ftwinfnt.h b/dependencies2013/win32/include/freetype/ftwinfnt.h
deleted file mode 100644
index a1a715ba..00000000
--- a/dependencies2013/win32/include/freetype/ftwinfnt.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftwinfnt.h                                                             */
-/*                                                                         */
-/*    FreeType API for accessing Windows fnt-specific data.                */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTWINFNT_H_
-#define FTWINFNT_H_
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    winfnt_fonts                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Window FNT Files                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Windows FNT specific API.                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Windows FNT specific      */
-  /*    functions.                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************
-   *
-   * @enum:
-   *   FT_WinFNT_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `charset' byte in
-   *   @FT_WinFNT_HeaderRec.  Exact mapping tables for the various cpXXXX
-   *   encodings (except for cp1361) can be found at
-   *   ftp://ftp.unicode.org/Public in the MAPPINGS/VENDORS/MICSFT/WINDOWS
-   *   subdirectory.  cp1361 is roughly a superset of
-   *   MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
-   *
-   * @values:
-   *   FT_WinFNT_ID_DEFAULT ::
-   *     This is used for font enumeration and font creation as a
-   *     `don't care' value.  Valid font files don't contain this value.
-   *     When querying for information about the character set of the font
-   *     that is currently selected into a specified device context, this
-   *     return value (of the related Windows API) simply denotes failure.
-   *
-   *   FT_WinFNT_ID_SYMBOL ::
-   *     There is no known mapping table available.
-   *
-   *   FT_WinFNT_ID_MAC ::
-   *     Mac Roman encoding.
-   *
-   *   FT_WinFNT_ID_OEM ::
-   *     From Michael Pöttgen <michael@poettgen.de>:
-   *
-   *       The `Windows Font Mapping' article says that FT_WinFNT_ID_OEM
-   *       is used for the charset of vector fonts, like `modern.fon',
-   *       `roman.fon', and `script.fon' on Windows.
-   *
-   *       The `CreateFont' documentation says: The FT_WinFNT_ID_OEM value
-   *       specifies a character set that is operating-system dependent.
-   *
-   *       The `IFIMETRICS' documentation from the `Windows Driver
-   *       Development Kit' says: This font supports an OEM-specific
-   *       character set.  The OEM character set is system dependent.
-   *
-   *       In general OEM, as opposed to ANSI (i.e., cp1252), denotes the
-   *       second default codepage that most international versions of
-   *       Windows have.  It is one of the OEM codepages from
-   *
-   *         https://msdn.microsoft.com/en-us/goglobal/bb964655,
-   *
-   *       and is used for the `DOS boxes', to support legacy applications.
-   *       A German Windows version for example usually uses ANSI codepage
-   *       1252 and OEM codepage 850.
-   *
-   *   FT_WinFNT_ID_CP874 ::
-   *     A superset of Thai TIS 620 and ISO 8859-11.
-   *
-   *   FT_WinFNT_ID_CP932 ::
-   *     A superset of Japanese Shift-JIS (with minor deviations).
-   *
-   *   FT_WinFNT_ID_CP936 ::
-   *     A superset of simplified Chinese GB 2312-1980 (with different
-   *     ordering and minor deviations).
-   *
-   *   FT_WinFNT_ID_CP949 ::
-   *     A superset of Korean Hangul KS~C 5601-1987 (with different
-   *     ordering and minor deviations).
-   *
-   *   FT_WinFNT_ID_CP950 ::
-   *     A superset of traditional Chinese Big~5 ETen (with different
-   *     ordering and minor deviations).
-   *
-   *   FT_WinFNT_ID_CP1250 ::
-   *     A superset of East European ISO 8859-2 (with slightly different
-   *     ordering).
-   *
-   *   FT_WinFNT_ID_CP1251 ::
-   *     A superset of Russian ISO 8859-5 (with different ordering).
-   *
-   *   FT_WinFNT_ID_CP1252 ::
-   *     ANSI encoding.  A superset of ISO 8859-1.
-   *
-   *   FT_WinFNT_ID_CP1253 ::
-   *     A superset of Greek ISO 8859-7 (with minor modifications).
-   *
-   *   FT_WinFNT_ID_CP1254 ::
-   *     A superset of Turkish ISO 8859-9.
-   *
-   *   FT_WinFNT_ID_CP1255 ::
-   *     A superset of Hebrew ISO 8859-8 (with some modifications).
-   *
-   *   FT_WinFNT_ID_CP1256 ::
-   *     A superset of Arabic ISO 8859-6 (with different ordering).
-   *
-   *   FT_WinFNT_ID_CP1257 ::
-   *     A superset of Baltic ISO 8859-13 (with some deviations).
-   *
-   *   FT_WinFNT_ID_CP1258 ::
-   *     For Vietnamese.  This encoding doesn't cover all necessary
-   *     characters.
-   *
-   *   FT_WinFNT_ID_CP1361 ::
-   *     Korean (Johab).
-   */
-
-#define FT_WinFNT_ID_CP1252    0
-#define FT_WinFNT_ID_DEFAULT   1
-#define FT_WinFNT_ID_SYMBOL    2
-#define FT_WinFNT_ID_MAC      77
-#define FT_WinFNT_ID_CP932   128
-#define FT_WinFNT_ID_CP949   129
-#define FT_WinFNT_ID_CP1361  130
-#define FT_WinFNT_ID_CP936   134
-#define FT_WinFNT_ID_CP950   136
-#define FT_WinFNT_ID_CP1253  161
-#define FT_WinFNT_ID_CP1254  162
-#define FT_WinFNT_ID_CP1258  163
-#define FT_WinFNT_ID_CP1255  177
-#define FT_WinFNT_ID_CP1256  178
-#define FT_WinFNT_ID_CP1257  186
-#define FT_WinFNT_ID_CP1251  204
-#define FT_WinFNT_ID_CP874   222
-#define FT_WinFNT_ID_CP1250  238
-#define FT_WinFNT_ID_OEM     255
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_WinFNT_HeaderRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Windows FNT Header info.                                           */
-  /*                                                                       */
-  typedef struct  FT_WinFNT_HeaderRec_
-  {
-    FT_UShort  version;
-    FT_ULong   file_size;
-    FT_Byte    copyright[60];
-    FT_UShort  file_type;
-    FT_UShort  nominal_point_size;
-    FT_UShort  vertical_resolution;
-    FT_UShort  horizontal_resolution;
-    FT_UShort  ascent;
-    FT_UShort  internal_leading;
-    FT_UShort  external_leading;
-    FT_Byte    italic;
-    FT_Byte    underline;
-    FT_Byte    strike_out;
-    FT_UShort  weight;
-    FT_Byte    charset;
-    FT_UShort  pixel_width;
-    FT_UShort  pixel_height;
-    FT_Byte    pitch_and_family;
-    FT_UShort  avg_width;
-    FT_UShort  max_width;
-    FT_Byte    first_char;
-    FT_Byte    last_char;
-    FT_Byte    default_char;
-    FT_Byte    break_char;
-    FT_UShort  bytes_per_row;
-    FT_ULong   device_offset;
-    FT_ULong   face_name_offset;
-    FT_ULong   bits_pointer;
-    FT_ULong   bits_offset;
-    FT_Byte    reserved;
-    FT_ULong   flags;
-    FT_UShort  A_space;
-    FT_UShort  B_space;
-    FT_UShort  C_space;
-    FT_UShort  color_table_offset;
-    FT_ULong   reserved1[4];
-
-  } FT_WinFNT_HeaderRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_WinFNT_Header                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an @FT_WinFNT_HeaderRec structure.                     */
-  /*                                                                       */
-  typedef struct FT_WinFNT_HeaderRec_*  FT_WinFNT_Header;
-
-
-  /**********************************************************************
-   *
-   * @function:
-   *    FT_Get_WinFNT_Header
-   *
-   * @description:
-   *    Retrieve a Windows FNT font info header.
-   *
-   * @input:
-   *    face    :: A handle to the input face.
-   *
-   * @output:
-   *    aheader :: The WinFNT header.
-   *
-   * @return:
-   *   FreeType error code.  0~means success.
-   *
-   * @note:
-   *   This function only works with Windows FNT faces, returning an error
-   *   otherwise.
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_WinFNT_Header( FT_Face               face,
-                        FT_WinFNT_HeaderRec  *aheader );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* FTWINFNT_H_ */
-
-
-/* END */
-
-
-/* Local Variables: */
-/* coding: utf-8    */
-/* End:             */
diff --git a/dependencies2013/win32/include/freetype/internal/autohint.h b/dependencies2013/win32/include/freetype/internal/autohint.h
deleted file mode 100644
index 7ef82b8f..00000000
--- a/dependencies2013/win32/include/freetype/internal/autohint.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  autohint.h                                                             */
-/*                                                                         */
-/*    High-level `autohint' module-specific interface (specification).     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The auto-hinter is used to load and automatically hint glyphs if a    */
-  /* format-specific hinter isn't available.                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef AUTOHINT_H_
-#define AUTOHINT_H_
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A small technical note regarding automatic hinting in order to        */
-  /* clarify this module interface.                                        */
-  /*                                                                       */
-  /* An automatic hinter might compute two kinds of data for a given face: */
-  /*                                                                       */
-  /* - global hints: Usually some metrics that describe global properties  */
-  /*                 of the face.  It is computed by scanning more or less */
-  /*                 aggressively the glyphs in the face, and thus can be  */
-  /*                 very slow to compute (even if the size of global      */
-  /*                 hints is really small).                               */
-  /*                                                                       */
-  /* - glyph hints:  These describe some important features of the glyph   */
-  /*                 outline, as well as how to align them.  They are      */
-  /*                 generally much faster to compute than global hints.   */
-  /*                                                                       */
-  /* The current FreeType auto-hinter does a pretty good job while         */
-  /* performing fast computations for both global and glyph hints.         */
-  /* However, we might be interested in introducing more complex and       */
-  /* powerful algorithms in the future, like the one described in the John */
-  /* D. Hobby paper, which unfortunately requires a lot more horsepower.   */
-  /*                                                                       */
-  /* Because a sufficiently sophisticated font management system would     */
-  /* typically implement an LRU cache of opened face objects to reduce     */
-  /* memory usage, it is a good idea to be able to avoid recomputing       */
-  /* global hints every time the same face is re-opened.                   */
-  /*                                                                       */
-  /* We thus provide the ability to cache global hints outside of the face */
-  /* object, in order to speed up font re-opening time.  Of course, this   */
-  /* feature is purely optional, so most client programs won't even notice */
-  /* it.                                                                   */
-  /*                                                                       */
-  /* I initially thought that it would be a good idea to cache the glyph   */
-  /* hints too.  However, my general idea now is that if you really need   */
-  /* to cache these too, you are simply in need of a new font format,      */
-  /* where all this information could be stored within the font file and   */
-  /* decoded on the fly.                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct FT_AutoHinterRec_  *FT_AutoHinter;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalGetFunc                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieve the global hints computed for a given face object.  The   */
-  /*    resulting data is dissociated from the face and will survive a     */
-  /*    call to FT_Done_Face().  It must be discarded through the API      */
-  /*    FT_AutoHinter_GlobalDoneFunc().                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter       :: A handle to the source auto-hinter.                */
-  /*                                                                       */
-  /*    face         :: A handle to the source face object.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    global_hints :: A typeless pointer to the global hints.            */
-  /*                                                                       */
-  /*    global_len   :: The size in bytes of the global hints.             */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalGetFunc)( FT_AutoHinter  hinter,
-                                  FT_Face        face,
-                                  void**         global_hints,
-                                  long*          global_len );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalDoneFunc                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discard the global hints retrieved through                         */
-  /*    FT_AutoHinter_GlobalGetFunc().  This is the only way these hints   */
-  /*    are freed from memory.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter :: A handle to the auto-hinter module.                      */
-  /*                                                                       */
-  /*    global :: A pointer to retrieved global hints to discard.          */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalDoneFunc)( FT_AutoHinter  hinter,
-                                   void*          global );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalResetFunc                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to recompute the global metrics in a given   */
-  /*    font.  This is useful when global font data changes (e.g. Multiple */
-  /*    Masters fonts where blend coordinates change).                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter :: A handle to the source auto-hinter.                      */
-  /*                                                                       */
-  /*    face   :: A handle to the face.                                    */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalResetFunc)( FT_AutoHinter  hinter,
-                                    FT_Face        face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlyphLoadFunc                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to load, scale, and automatically hint a     */
-  /*    glyph from a given face.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to the face.                               */
-  /*                                                                       */
-  /*    glyph_index :: The glyph index.                                    */
-  /*                                                                       */
-  /*    load_flags  :: The load flags.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is capable of loading composite glyphs by hinting    */
-  /*    each sub-glyph independently (which improves quality).             */
-  /*                                                                       */
-  /*    It will call the font driver with @FT_Load_Glyph, with             */
-  /*    @FT_LOAD_NO_SCALE set.                                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_AutoHinter_GlyphLoadFunc)( FT_AutoHinter  hinter,
-                                  FT_GlyphSlot   slot,
-                                  FT_Size        size,
-                                  FT_UInt        glyph_index,
-                                  FT_Int32       load_flags );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_AutoHinter_InterfaceRec                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The auto-hinter module's interface.                                */
-  /*                                                                       */
-  typedef struct  FT_AutoHinter_InterfaceRec_
-  {
-    FT_AutoHinter_GlobalResetFunc  reset_face;
-    FT_AutoHinter_GlobalGetFunc    get_global_hints;
-    FT_AutoHinter_GlobalDoneFunc   done_global_hints;
-    FT_AutoHinter_GlyphLoadFunc    load_glyph;
-
-  } FT_AutoHinter_InterfaceRec, *FT_AutoHinter_Interface;
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_AUTOHINTER_INTERFACE(       \
-          class_,                             \
-          reset_face_,                        \
-          get_global_hints_,                  \
-          done_global_hints_,                 \
-          load_glyph_ )                       \
-  FT_CALLBACK_TABLE_DEF                       \
-  const FT_AutoHinter_InterfaceRec  class_ =  \
-  {                                           \
-    reset_face_,                              \
-    get_global_hints_,                        \
-    done_global_hints_,                       \
-    load_glyph_                               \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_AUTOHINTER_INTERFACE(                            \
-          class_,                                                  \
-          reset_face_,                                             \
-          get_global_hints_,                                       \
-          done_global_hints_,                                      \
-          load_glyph_ )                                            \
-  void                                                             \
-  FT_Init_Class_ ## class_( FT_Library                   library,  \
-                            FT_AutoHinter_InterfaceRec*  clazz )   \
-  {                                                                \
-    FT_UNUSED( library );                                          \
-                                                                   \
-    clazz->reset_face        = reset_face_;                        \
-    clazz->get_global_hints  = get_global_hints_;                  \
-    clazz->done_global_hints = done_global_hints_;                 \
-    clazz->load_glyph        = load_glyph_;                        \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* AUTOHINT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftcalc.h b/dependencies2013/win32/include/freetype/internal/ftcalc.h
deleted file mode 100644
index 8a884f68..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftcalc.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcalc.h                                                               */
-/*                                                                         */
-/*    Arithmetic computations (specification).                             */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTCALC_H_
-#define FTCALC_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* FT_MulDiv() and FT_MulFix() are declared in freetype.h.               */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifndef  FT_CONFIG_OPTION_NO_ASSEMBLER
-  /* Provide assembler fragments for performance-critical functions. */
-  /* These must be defined `static __inline__' with GCC.             */
-
-#if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
-
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
-
-  /* documentation is in freetype.h */
-
-  static __inline FT_Int32
-  FT_MulFix_arm( FT_Int32  a,
-                 FT_Int32  b )
-  {
-    FT_Int32  t, t2;
-
-
-    __asm
-    {
-      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
-      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
-      add   a,  a,  #0x8000         /* a  += 0x8000 */
-      adds  t2, t2, a               /* t2 += a */
-      adc   t,  t,  #0              /* t  += carry */
-      mov   a,  t2, lsr #16         /* a   = t2 >> 16 */
-      orr   a,  a,  t,  lsl #16     /* a  |= t << 16 */
-    }
-    return a;
-  }
-
-#endif /* __CC_ARM || __ARMCC__ */
-
-
-#ifdef __GNUC__
-
-#if defined( __arm__ )                                 && \
-    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
-    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
-
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
-
-  /* documentation is in freetype.h */
-
-  static __inline__ FT_Int32
-  FT_MulFix_arm( FT_Int32  a,
-                 FT_Int32  b )
-  {
-    FT_Int32  t, t2;
-
-
-    __asm__ __volatile__ (
-      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
-      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
-#if defined( __clang__ ) && defined( __thumb2__ )
-      "add.w  %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
-#else
-      "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
-#endif
-      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
-      "adc    %2, %2, #0\n\t"           /* %2 += carry */
-      "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
-      "orr    %0, %0, %2, lsl #16\n\t"  /* %0 |= %2 << 16 */
-      : "=r"(a), "=&r"(t2), "=&r"(t)
-      : "r"(a), "r"(b)
-      : "cc" );
-    return a;
-  }
-
-#endif /* __arm__                      && */
-       /* ( __thumb2__ || !__thumb__ ) && */
-       /* !( __CC_ARM || __ARMCC__ )      */
-
-
-#if defined( __i386__ )
-
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
-
-  /* documentation is in freetype.h */
-
-  static __inline__ FT_Int32
-  FT_MulFix_i386( FT_Int32  a,
-                  FT_Int32  b )
-  {
-    FT_Int32  result;
-
-
-    __asm__ __volatile__ (
-      "imul  %%edx\n"
-      "movl  %%edx, %%ecx\n"
-      "sarl  $31, %%ecx\n"
-      "addl  $0x8000, %%ecx\n"
-      "addl  %%ecx, %%eax\n"
-      "adcl  $0, %%edx\n"
-      "shrl  $16, %%eax\n"
-      "shll  $16, %%edx\n"
-      "addl  %%edx, %%eax\n"
-      : "=a"(result), "=d"(b)
-      : "a"(a), "d"(b)
-      : "%ecx", "cc" );
-    return result;
-  }
-
-#endif /* i386 */
-
-#endif /* __GNUC__ */
-
-
-#ifdef _MSC_VER /* Visual C++ */
-
-#ifdef _M_IX86
-
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
-
-  /* documentation is in freetype.h */
-
-  static __inline FT_Int32
-  FT_MulFix_i386( FT_Int32  a,
-                  FT_Int32  b )
-  {
-    FT_Int32  result;
-
-    __asm
-    {
-      mov eax, a
-      mov edx, b
-      imul edx
-      mov ecx, edx
-      sar ecx, 31
-      add ecx, 8000h
-      add eax, ecx
-      adc edx, 0
-      shr eax, 16
-      shl edx, 16
-      add eax, edx
-      mov result, eax
-    }
-    return result;
-  }
-
-#endif /* _M_IX86 */
-
-#endif /* _MSC_VER */
-
-
-#if defined( __GNUC__ ) && defined( __x86_64__ )
-
-#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
-
-  static __inline__ FT_Int32
-  FT_MulFix_x86_64( FT_Int32  a,
-                    FT_Int32  b )
-  {
-    /* Temporarily disable the warning that C90 doesn't support */
-    /* `long long'.                                             */
-#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 6 )
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlong-long"
-#endif
-
-#if 1
-    /* Technically not an assembly fragment, but GCC does a really good */
-    /* job at inlining it and generating good machine code for it.      */
-    long long  ret, tmp;
-
-
-    ret  = (long long)a * b;
-    tmp  = ret >> 63;
-    ret += 0x8000 + tmp;
-
-    return (FT_Int32)( ret >> 16 );
-#else
-
-    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
-    /* code from the lines below.  The main issue is that `wide_a' is not  */
-    /* properly initialized by sign-extending `a'.  Instead, the generated */
-    /* machine code assumes that the register that contains `a' on input   */
-    /* can be used directly as a 64-bit value, which is wrong most of the  */
-    /* time.                                                               */
-    long long  wide_a = (long long)a;
-    long long  wide_b = (long long)b;
-    long long  result;
-
-
-    __asm__ __volatile__ (
-      "imul %2, %1\n"
-      "mov %1, %0\n"
-      "sar $63, %0\n"
-      "lea 0x8000(%1, %0), %0\n"
-      "sar $16, %0\n"
-      : "=&r"(result), "=&r"(wide_a)
-      : "r"(wide_b)
-      : "cc" );
-
-    return (FT_Int32)result;
-#endif
-
-#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 6 )
-#pragma GCC diagnostic pop
-#endif
-  }
-
-#endif /* __GNUC__ && __x86_64__ */
-
-#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
-
-
-#ifdef FT_CONFIG_OPTION_INLINE_MULFIX
-#ifdef FT_MULFIX_ASSEMBLER
-#define FT_MulFix( a, b )  FT_MULFIX_ASSEMBLER( (FT_Int32)(a), (FT_Int32)(b) )
-#endif
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulDiv_No_Round                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation `(a*b)/c'   */
-  /*    (without rounding) with maximum accuracy (it uses a 64-bit         */
-  /*    intermediate integer whenever necessary).                          */
-  /*                                                                       */
-  /*    This function isn't necessarily as fast as some processor specific */
-  /*    operations, but is at least completely portable.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.                                        */
-  /*    c :: The divisor.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/c'.  This function never traps when trying to */
-  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
-  /*    on the signs of `a' and `b'.                                       */
-  /*                                                                       */
-  FT_BASE( FT_Long )
-  FT_MulDiv_No_Round( FT_Long  a,
-                      FT_Long  b,
-                      FT_Long  c );
-
-
-  /*
-   *  A variant of FT_Matrix_Multiply which scales its result afterwards.
-   *  The idea is that both `a' and `b' are scaled by factors of 10 so that
-   *  the values are as precise as possible to get a correct result during
-   *  the 64bit multiplication.  Let `sa' and `sb' be the scaling factors of
-   *  `a' and `b', respectively, then the scaling factor of the result is
-   *  `sa*sb'.
-   */
-  FT_BASE( void )
-  FT_Matrix_Multiply_Scaled( const FT_Matrix*  a,
-                             FT_Matrix        *b,
-                             FT_Long           scaling );
-
-
-  /*
-   *  A variant of FT_Vector_Transform.  See comments for
-   *  FT_Matrix_Multiply_Scaled.
-   */
-  FT_BASE( void )
-  FT_Vector_Transform_Scaled( FT_Vector*        vector,
-                              const FT_Matrix*  matrix,
-                              FT_Long           scaling );
-
-
-  /*
-   *  This function normalizes a vector and returns its original length.
-   *  The normalized vector is a 16.16 fixed-point unit vector with length
-   *  close to 0x10000.  The accuracy of the returned length is limited to
-   *  16 bits also.  The function utilizes quick inverse square root
-   *  approximation without divisions and square roots relying on Newton's
-   *  iterations instead.
-   */
-  FT_BASE( FT_UInt32 )
-  FT_Vector_NormLen( FT_Vector*  vector );
-
-
-  /*
-   *  Return -1, 0, or +1, depending on the orientation of a given corner.
-   *  We use the Cartesian coordinate system, with positive vertical values
-   *  going upwards.  The function returns +1 if the corner turns to the
-   *  left, -1 to the right, and 0 for undecidable cases.
-   */
-  FT_BASE( FT_Int )
-  ft_corner_orientation( FT_Pos  in_x,
-                         FT_Pos  in_y,
-                         FT_Pos  out_x,
-                         FT_Pos  out_y );
-
-
-  /*
-   *  Return TRUE if a corner is flat or nearly flat.  This is equivalent to
-   *  saying that the corner point is close to its neighbors, or inside an
-   *  ellipse defined by the neighbor focal points to be more precise.
-   */
-  FT_BASE( FT_Int )
-  ft_corner_is_flat( FT_Pos  in_x,
-                     FT_Pos  in_y,
-                     FT_Pos  out_x,
-                     FT_Pos  out_y );
-
-
-  /*
-   *  Return the most significant bit index.
-   */
-
-#ifndef  FT_CONFIG_OPTION_NO_ASSEMBLER
-#if defined( __GNUC__ )                                          && \
-    ( __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4 ) )
-
-#if FT_SIZEOF_INT == 4
-
-#define FT_MSB( x )  ( 31 - __builtin_clz( x ) )
-
-#elif FT_SIZEOF_LONG == 4
-
-#define FT_MSB( x )  ( 31 - __builtin_clzl( x ) )
-
-#endif
-
-#endif /* __GNUC__ */
-#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
-
-#ifndef FT_MSB
-
-  FT_BASE( FT_Int )
-  FT_MSB( FT_UInt32  z );
-
-#endif
-
-
-  /*
-   *  Return sqrt(x*x+y*y), which is the same as `FT_Vector_Length' but uses
-   *  two fixed-point arguments instead.
-   */
-  FT_BASE( FT_Fixed )
-  FT_Hypot( FT_Fixed  x,
-            FT_Fixed  y );
-
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_SqrtFixed                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Computes the square root of a 16.16 fixed-point value.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    x :: The value to compute the root for.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `sqrt(x)'.                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is not very fast.                                    */
-  /*                                                                       */
-  FT_BASE( FT_Int32 )
-  FT_SqrtFixed( FT_Int32  x );
-
-#endif /* 0 */
-
-
-#define INT_TO_F26DOT6( x )    ( (FT_Long)(x) << 6  )
-#define INT_TO_F2DOT14( x )    ( (FT_Long)(x) << 14 )
-#define INT_TO_FIXED( x )      ( (FT_Long)(x) << 16 )
-#define F2DOT14_TO_FIXED( x )  ( (FT_Long)(x) << 2  )
-#define FLOAT_TO_FIXED( x )    ( (FT_Long)( x * 65536.0 ) )
-#define FIXED_TO_INT( x )      ( FT_RoundFix( x ) >> 16 )
-
-#define ROUND_F26DOT6( x )     ( x >= 0 ? (    ( (x) + 32 ) & -64 )     \
-                                        : ( -( ( 32 - (x) ) & -64 ) ) )
-
-
-FT_END_HEADER
-
-#endif /* FTCALC_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftdebug.h b/dependencies2013/win32/include/freetype/internal/ftdebug.h
deleted file mode 100644
index d1104571..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftdebug.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftdebug.h                                                              */
-/*                                                                         */
-/*    Debugging and logging component (specification).                     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/*                                                                         */
-/*  IMPORTANT: A description of FreeType's debugging support can be        */
-/*             found in `docs/DEBUG.TXT'.  Read it if you need to use or   */
-/*             understand this code.                                       */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTDEBUG_H_
-#define FTDEBUG_H_
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* force the definition of FT_DEBUG_LEVEL_ERROR if FT_DEBUG_LEVEL_TRACE */
-  /* is already defined; this simplifies the following #ifdefs            */
-  /*                                                                      */
-#ifdef FT_DEBUG_LEVEL_TRACE
-#undef  FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_ERROR
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the trace enums as well as the trace levels array when they    */
-  /* are needed.                                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-#define FT_TRACE_DEF( x )  trace_ ## x ,
-
-  /* defining the enumeration */
-  typedef enum  FT_Trace_
-  {
-#include FT_INTERNAL_TRACE_H
-    trace_count
-
-  } FT_Trace;
-
-
-  /* defining the array of trace levels, provided by `src/base/ftdebug.c' */
-  extern int  ft_trace_levels[trace_count];
-
-#undef FT_TRACE_DEF
-
-#endif /* FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_TRACE macro                                             */
-  /*                                                                       */
-  /* IMPORTANT!                                                            */
-  /*                                                                       */
-  /* Each component must define the macro FT_COMPONENT to a valid FT_Trace */
-  /* value before using any TRACE macro.                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-#define FT_TRACE( level, varformat )                      \
-          do                                              \
-          {                                               \
-            if ( ft_trace_levels[FT_COMPONENT] >= level ) \
-              FT_Message varformat;                       \
-          } while ( 0 )
-
-#else /* !FT_DEBUG_LEVEL_TRACE */
-
-#define FT_TRACE( level, varformat )  do { } while ( 0 )      /* nothing */
-
-#endif /* !FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Trace_Get_Count                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the number of available trace components.                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The number of trace components.  0 if FreeType 2 is not built with */
-  /*    FT_DEBUG_LEVEL_TRACE definition.                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function may be useful if you want to access elements of      */
-  /*    the internal `ft_trace_levels' array by an index.                  */
-  /*                                                                       */
-  FT_BASE( FT_Int )
-  FT_Trace_Get_Count( void );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Trace_Get_Name                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the name of a trace component.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    The index of the trace component.                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The name of the trace component.  This is a statically allocated   */
-  /*    C string, so do not free it after use.  NULL if FreeType 2 is not  */
-  /*    built with FT_DEBUG_LEVEL_TRACE definition.                        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use @FT_Trace_Get_Count to get the number of available trace       */
-  /*    components.                                                        */
-  /*                                                                       */
-  /*    This function may be useful if you want to control FreeType 2's    */
-  /*    debug level in your application.                                   */
-  /*                                                                       */
-  FT_BASE( const char* )
-  FT_Trace_Get_Name( FT_Int  idx );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* You need two opening and closing parentheses!                         */
-  /*                                                                       */
-  /* Example: FT_TRACE0(( "Value is %i", foo ))                            */
-  /*                                                                       */
-  /* Output of the FT_TRACEX macros is sent to stderr.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-#define FT_TRACE0( varformat )  FT_TRACE( 0, varformat )
-#define FT_TRACE1( varformat )  FT_TRACE( 1, varformat )
-#define FT_TRACE2( varformat )  FT_TRACE( 2, varformat )
-#define FT_TRACE3( varformat )  FT_TRACE( 3, varformat )
-#define FT_TRACE4( varformat )  FT_TRACE( 4, varformat )
-#define FT_TRACE5( varformat )  FT_TRACE( 5, varformat )
-#define FT_TRACE6( varformat )  FT_TRACE( 6, varformat )
-#define FT_TRACE7( varformat )  FT_TRACE( 7, varformat )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_ERROR macro.                                            */
-  /*                                                                       */
-  /* Output of this macro is sent to stderr.                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#define FT_ERROR( varformat )  FT_Message  varformat
-
-#else  /* !FT_DEBUG_LEVEL_ERROR */
-
-#define FT_ERROR( varformat )  do { } while ( 0 )      /* nothing */
-
-#endif /* !FT_DEBUG_LEVEL_ERROR */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_ASSERT and FT_THROW macros.  The call to `FT_Throw'     */
-  /* makes it possible to easily set a breakpoint at this function.        */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#define FT_ASSERT( condition )                                      \
-          do                                                        \
-          {                                                         \
-            if ( !( condition ) )                                   \
-              FT_Panic( "assertion failed on line %d of file %s\n", \
-                        __LINE__, __FILE__ );                       \
-          } while ( 0 )
-
-#define FT_THROW( e )                                   \
-          ( FT_Throw( FT_ERR_CAT( FT_ERR_PREFIX, e ),   \
-                      __LINE__,                         \
-                      __FILE__ )                      | \
-            FT_ERR_CAT( FT_ERR_PREFIX, e )            )
-
-#else /* !FT_DEBUG_LEVEL_ERROR */
-
-#define FT_ASSERT( condition )  do { } while ( 0 )
-
-#define FT_THROW( e )  FT_ERR_CAT( FT_ERR_PREFIX, e )
-
-#endif /* !FT_DEBUG_LEVEL_ERROR */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define `FT_Message' and `FT_Panic' when needed.                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#include "stdio.h"  /* for vfprintf() */
-
-  /* print a message */
-  FT_BASE( void )
-  FT_Message( const char*  fmt,
-              ... );
-
-  /* print a message and exit */
-  FT_BASE( void )
-  FT_Panic( const char*  fmt,
-            ... );
-
-  /* report file name and line number of an error */
-  FT_BASE( int )
-  FT_Throw( FT_Error     error,
-            int          line,
-            const char*  file );
-
-#endif /* FT_DEBUG_LEVEL_ERROR */
-
-
-  FT_BASE( void )
-  ft_debug_init( void );
-
-FT_END_HEADER
-
-#endif /* FTDEBUG_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftdriver.h b/dependencies2013/win32/include/freetype/internal/ftdriver.h
deleted file mode 100644
index 3e1e66e9..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftdriver.h
+++ /dev/null
@@ -1,409 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftdriver.h                                                             */
-/*                                                                         */
-/*    FreeType font driver interface (specification).                      */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTDRIVER_H_
-#define FTDRIVER_H_
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef FT_Error
-  (*FT_Face_InitFunc)( FT_Stream      stream,
-                       FT_Face        face,
-                       FT_Int         typeface_index,
-                       FT_Int         num_params,
-                       FT_Parameter*  parameters );
-
-  typedef void
-  (*FT_Face_DoneFunc)( FT_Face  face );
-
-
-  typedef FT_Error
-  (*FT_Size_InitFunc)( FT_Size  size );
-
-  typedef void
-  (*FT_Size_DoneFunc)( FT_Size  size );
-
-
-  typedef FT_Error
-  (*FT_Slot_InitFunc)( FT_GlyphSlot  slot );
-
-  typedef void
-  (*FT_Slot_DoneFunc)( FT_GlyphSlot  slot );
-
-
-  typedef FT_Error
-  (*FT_Size_RequestFunc)( FT_Size          size,
-                          FT_Size_Request  req );
-
-  typedef FT_Error
-  (*FT_Size_SelectFunc)( FT_Size   size,
-                         FT_ULong  size_index );
-
-  typedef FT_Error
-  (*FT_Slot_LoadFunc)( FT_GlyphSlot  slot,
-                       FT_Size       size,
-                       FT_UInt       glyph_index,
-                       FT_Int32      load_flags );
-
-
-  typedef FT_UInt
-  (*FT_CharMap_CharIndexFunc)( FT_CharMap  charmap,
-                               FT_Long     charcode );
-
-  typedef FT_Long
-  (*FT_CharMap_CharNextFunc)( FT_CharMap  charmap,
-                              FT_Long     charcode );
-
-
-  typedef FT_Error
-  (*FT_Face_GetKerningFunc)( FT_Face     face,
-                             FT_UInt     left_glyph,
-                             FT_UInt     right_glyph,
-                             FT_Vector*  kerning );
-
-
-  typedef FT_Error
-  (*FT_Face_AttachFunc)( FT_Face    face,
-                         FT_Stream  stream );
-
-
-  typedef FT_Error
-  (*FT_Face_GetAdvancesFunc)( FT_Face    face,
-                              FT_UInt    first,
-                              FT_UInt    count,
-                              FT_Int32   flags,
-                              FT_Fixed*  advances );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Driver_ClassRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The font driver class.  This structure mostly contains pointers to */
-  /*    driver methods.                                                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root             :: The parent module.                             */
-  /*                                                                       */
-  /*    face_object_size :: The size of a face object in bytes.            */
-  /*                                                                       */
-  /*    size_object_size :: The size of a size object in bytes.            */
-  /*                                                                       */
-  /*    slot_object_size :: The size of a glyph object in bytes.           */
-  /*                                                                       */
-  /*    init_face        :: The format-specific face constructor.          */
-  /*                                                                       */
-  /*    done_face        :: The format-specific face destructor.           */
-  /*                                                                       */
-  /*    init_size        :: The format-specific size constructor.          */
-  /*                                                                       */
-  /*    done_size        :: The format-specific size destructor.           */
-  /*                                                                       */
-  /*    init_slot        :: The format-specific slot constructor.          */
-  /*                                                                       */
-  /*    done_slot        :: The format-specific slot destructor.           */
-  /*                                                                       */
-  /*                                                                       */
-  /*    load_glyph       :: A function handle to load a glyph to a slot.   */
-  /*                        This field is mandatory!                       */
-  /*                                                                       */
-  /*    get_kerning      :: A function handle to return the unscaled       */
-  /*                        kerning for a given pair of glyphs.  Can be    */
-  /*                        set to 0 if the format doesn't support         */
-  /*                        kerning.                                       */
-  /*                                                                       */
-  /*    attach_file      :: This function handle is used to read           */
-  /*                        additional data for a face from another        */
-  /*                        file/stream.  For example, this can be used to */
-  /*                        add data from AFM or PFM files on a Type 1     */
-  /*                        face, or a CIDMap on a CID-keyed face.         */
-  /*                                                                       */
-  /*    get_advances     :: A function handle used to return advance       */
-  /*                        widths of `count' glyphs (in font units),      */
-  /*                        starting at `first'.  The `vertical' flag must */
-  /*                        be set to get vertical advance heights.  The   */
-  /*                        `advances' buffer is caller-allocated.         */
-  /*                        The idea of this function is to be able to     */
-  /*                        perform device-independent text layout without */
-  /*                        loading a single glyph image.                  */
-  /*                                                                       */
-  /*    request_size     :: A handle to a function used to request the new */
-  /*                        character size.  Can be set to 0 if the        */
-  /*                        scaling done in the base layer suffices.       */
-  /*                                                                       */
-  /*    select_size      :: A handle to a function used to select a new    */
-  /*                        fixed size.  It is used only if                */
-  /*                        @FT_FACE_FLAG_FIXED_SIZES is set.  Can be set  */
-  /*                        to 0 if the scaling done in the base layer     */
-  /*                        suffices.                                      */
-  /* <Note>                                                                */
-  /*    Most function pointers, with the exception of `load_glyph', can be */
-  /*    set to 0 to indicate a default behaviour.                          */
-  /*                                                                       */
-  typedef struct  FT_Driver_ClassRec_
-  {
-    FT_Module_Class          root;
-
-    FT_Long                  face_object_size;
-    FT_Long                  size_object_size;
-    FT_Long                  slot_object_size;
-
-    FT_Face_InitFunc         init_face;
-    FT_Face_DoneFunc         done_face;
-
-    FT_Size_InitFunc         init_size;
-    FT_Size_DoneFunc         done_size;
-
-    FT_Slot_InitFunc         init_slot;
-    FT_Slot_DoneFunc         done_slot;
-
-    FT_Slot_LoadFunc         load_glyph;
-
-    FT_Face_GetKerningFunc   get_kerning;
-    FT_Face_AttachFunc       attach_file;
-    FT_Face_GetAdvancesFunc  get_advances;
-
-    /* since version 2.2 */
-    FT_Size_RequestFunc      request_size;
-    FT_Size_SelectFunc       select_size;
-
-  } FT_Driver_ClassRec, *FT_Driver_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DECLARE_DRIVER                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to create a forward declaration of an FT_Driver_ClassRec      */
-  /*    struct instance.                                                   */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_DRIVER                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Driver_ClassRec struct.       */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function has to be */
-  /*    called with a pointer where the allocated structure is returned.   */
-  /*    And when it is no longer needed a `destroy' function needs to be   */
-  /*    called to release that allocation.                                 */
-  /*                                                                       */
-  /*    `ftinit.c' (ft_create_default_module_classes) already contains a   */
-  /*    mechanism to call these functions for the default modules          */
-  /*    described in `ftmodule.h'.                                         */
-  /*                                                                       */
-  /*    Notice that the created `create' and `destroy' functions call      */
-  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
-  /*    initialize any additional global data, like a module specific      */
-  /*    interface, and put them in the global pic container defined in     */
-  /*    `ftpic.h'.  If you don't need them just implement the functions as */
-  /*    empty to resolve the link error.  Also the `pic_init' and          */
-  /*    `pic_free' functions should be declared in `pic.h', to be referred */
-  /*    by driver definition calling `FT_DEFINE_DRIVER' in following.      */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro is     */
-  /*    used).                                                             */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_DRIVER( class_ )  \
-  FT_CALLBACK_TABLE                  \
-  const FT_Driver_ClassRec  class_;
-
-#define FT_DEFINE_DRIVER(                    \
-          class_,                            \
-          flags_,                            \
-          size_,                             \
-          name_,                             \
-          version_,                          \
-          requires_,                         \
-          interface_,                        \
-          init_,                             \
-          done_,                             \
-          get_interface_,                    \
-          face_object_size_,                 \
-          size_object_size_,                 \
-          slot_object_size_,                 \
-          init_face_,                        \
-          done_face_,                        \
-          init_size_,                        \
-          done_size_,                        \
-          init_slot_,                        \
-          done_slot_,                        \
-          load_glyph_,                       \
-          get_kerning_,                      \
-          attach_file_,                      \
-          get_advances_,                     \
-          request_size_,                     \
-          select_size_ )                     \
-  FT_CALLBACK_TABLE_DEF                      \
-  const FT_Driver_ClassRec  class_ =         \
-  {                                          \
-    FT_DEFINE_ROOT_MODULE( flags_,           \
-                           size_,            \
-                           name_,            \
-                           version_,         \
-                           requires_,        \
-                           interface_,       \
-                           init_,            \
-                           done_,            \
-                           get_interface_ )  \
-                                             \
-    face_object_size_,                       \
-    size_object_size_,                       \
-    slot_object_size_,                       \
-                                             \
-    init_face_,                              \
-    done_face_,                              \
-                                             \
-    init_size_,                              \
-    done_size_,                              \
-                                             \
-    init_slot_,                              \
-    done_slot_,                              \
-                                             \
-    load_glyph_,                             \
-                                             \
-    get_kerning_,                            \
-    attach_file_,                            \
-    get_advances_,                           \
-                                             \
-    request_size_,                           \
-    select_size_                             \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_DRIVER( class_ )  FT_DECLARE_MODULE( class_ )
-
-#define FT_DEFINE_DRIVER(                                        \
-          class_,                                                \
-          flags_,                                                \
-          size_,                                                 \
-          name_,                                                 \
-          version_,                                              \
-          requires_,                                             \
-          interface_,                                            \
-          init_,                                                 \
-          done_,                                                 \
-          get_interface_,                                        \
-          face_object_size_,                                     \
-          size_object_size_,                                     \
-          slot_object_size_,                                     \
-          init_face_,                                            \
-          done_face_,                                            \
-          init_size_,                                            \
-          done_size_,                                            \
-          init_slot_,                                            \
-          done_slot_,                                            \
-          load_glyph_,                                           \
-          get_kerning_,                                          \
-          attach_file_,                                          \
-          get_advances_,                                         \
-          request_size_,                                         \
-          select_size_ )                                         \
-  void                                                           \
-  FT_Destroy_Class_ ## class_( FT_Library        library,        \
-                               FT_Module_Class*  clazz )         \
-  {                                                              \
-    FT_Memory        memory = library->memory;                   \
-    FT_Driver_Class  dclazz = (FT_Driver_Class)clazz;            \
-                                                                 \
-                                                                 \
-    class_ ## _pic_free( library );                              \
-    if ( dclazz )                                                \
-      FT_FREE( dclazz );                                         \
-  }                                                              \
-                                                                 \
-                                                                 \
-  FT_Error                                                       \
-  FT_Create_Class_ ## class_( FT_Library         library,        \
-                              FT_Module_Class**  output_class )  \
-  {                                                              \
-    FT_Driver_Class  clazz  = NULL;                              \
-    FT_Error         error;                                      \
-    FT_Memory        memory = library->memory;                   \
-                                                                 \
-                                                                 \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
-      return error;                                              \
-                                                                 \
-    error = class_ ## _pic_init( library );                      \
-    if ( error )                                                 \
-    {                                                            \
-      FT_FREE( clazz );                                          \
-      return error;                                              \
-    }                                                            \
-                                                                 \
-    FT_DEFINE_ROOT_MODULE( flags_,                               \
-                           size_,                                \
-                           name_,                                \
-                           version_,                             \
-                           requires_,                            \
-                           interface_,                           \
-                           init_,                                \
-                           done_,                                \
-                           get_interface_ )                      \
-                                                                 \
-    clazz->face_object_size = face_object_size_;                 \
-    clazz->size_object_size = size_object_size_;                 \
-    clazz->slot_object_size = slot_object_size_;                 \
-                                                                 \
-    clazz->init_face        = init_face_;                        \
-    clazz->done_face        = done_face_;                        \
-                                                                 \
-    clazz->init_size        = init_size_;                        \
-    clazz->done_size        = done_size_;                        \
-                                                                 \
-    clazz->init_slot        = init_slot_;                        \
-    clazz->done_slot        = done_slot_;                        \
-                                                                 \
-    clazz->load_glyph       = load_glyph_;                       \
-                                                                 \
-    clazz->get_kerning      = get_kerning_;                      \
-    clazz->attach_file      = attach_file_;                      \
-    clazz->get_advances     = get_advances_;                     \
-                                                                 \
-    clazz->request_size     = request_size_;                     \
-    clazz->select_size      = select_size_;                      \
-                                                                 \
-    *output_class = (FT_Module_Class*)clazz;                     \
-                                                                 \
-    return FT_Err_Ok;                                            \
-  }
-
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* FTDRIVER_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftgloadr.h b/dependencies2013/win32/include/freetype/internal/ftgloadr.h
deleted file mode 100644
index bebf5dbb..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftgloadr.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgloadr.h                                                             */
-/*                                                                         */
-/*    The FreeType glyph loader (specification).                           */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTGLOADR_H_
-#define FTGLOADR_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphLoader                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The glyph loader is an internal object used to load several glyphs */
-  /*    together (for example, in the case of composites).                 */
-  /*                                                                       */
-  typedef struct  FT_SubGlyphRec_
-  {
-    FT_Int     index;
-    FT_UShort  flags;
-    FT_Int     arg1;
-    FT_Int     arg2;
-    FT_Matrix  transform;
-
-  } FT_SubGlyphRec;
-
-
-  typedef struct  FT_GlyphLoadRec_
-  {
-    FT_Outline   outline;       /* outline                   */
-    FT_Vector*   extra_points;  /* extra points table        */
-    FT_Vector*   extra_points2; /* second extra points table */
-    FT_UInt      num_subglyphs; /* number of subglyphs       */
-    FT_SubGlyph  subglyphs;     /* subglyphs                 */
-
-  } FT_GlyphLoadRec, *FT_GlyphLoad;
-
-
-  typedef struct  FT_GlyphLoaderRec_
-  {
-    FT_Memory        memory;
-    FT_UInt          max_points;
-    FT_UInt          max_contours;
-    FT_UInt          max_subglyphs;
-    FT_Bool          use_extra;
-
-    FT_GlyphLoadRec  base;
-    FT_GlyphLoadRec  current;
-
-    void*            other;            /* for possible future extension? */
-
-  } FT_GlyphLoaderRec, *FT_GlyphLoader;
-
-
-  /* create new empty glyph loader */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_New( FT_Memory        memory,
-                      FT_GlyphLoader  *aloader );
-
-  /* add an extra points table to a glyph loader */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CreateExtra( FT_GlyphLoader  loader );
-
-  /* destroy a glyph loader */
-  FT_BASE( void )
-  FT_GlyphLoader_Done( FT_GlyphLoader  loader );
-
-  /* reset a glyph loader (frees everything int it) */
-  FT_BASE( void )
-  FT_GlyphLoader_Reset( FT_GlyphLoader  loader );
-
-  /* rewind a glyph loader */
-  FT_BASE( void )
-  FT_GlyphLoader_Rewind( FT_GlyphLoader  loader );
-
-  /* check that there is enough space to add `n_points' and `n_contours' */
-  /* to the glyph loader                                                 */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CheckPoints( FT_GlyphLoader  loader,
-                              FT_UInt         n_points,
-                              FT_UInt         n_contours );
-
-
-#define FT_GLYPHLOADER_CHECK_P( _loader, _count )       \
-  ( (_count) == 0                                    || \
-    ( (FT_UInt)(_loader)->base.outline.n_points    +    \
-      (FT_UInt)(_loader)->current.outline.n_points +    \
-      (FT_UInt)(_count) ) <= (_loader)->max_points   )
-
-#define FT_GLYPHLOADER_CHECK_C( _loader, _count )         \
-  ( (_count) == 0                                      || \
-    ( (FT_UInt)(_loader)->base.outline.n_contours    +    \
-      (FT_UInt)(_loader)->current.outline.n_contours +    \
-      (FT_UInt)(_count) ) <= (_loader)->max_contours   )
-
-#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points, _contours ) \
-  ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points )   &&              \
-      FT_GLYPHLOADER_CHECK_C( _loader, _contours ) )               \
-    ? 0                                                            \
-    : FT_GlyphLoader_CheckPoints( (_loader),                       \
-                                  (FT_UInt)(_points),              \
-                                  (FT_UInt)(_contours) ) )
-
-
-  /* check that there is enough space to add `n_subs' sub-glyphs to */
-  /* a glyph loader                                                 */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CheckSubGlyphs( FT_GlyphLoader  loader,
-                                 FT_UInt         n_subs );
-
-  /* prepare a glyph loader, i.e. empty the current glyph */
-  FT_BASE( void )
-  FT_GlyphLoader_Prepare( FT_GlyphLoader  loader );
-
-  /* add the current glyph to the base glyph */
-  FT_BASE( void )
-  FT_GlyphLoader_Add( FT_GlyphLoader  loader );
-
-  /* copy points from one glyph loader to another */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CopyPoints( FT_GlyphLoader  target,
-                             FT_GlyphLoader  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* FTGLOADR_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/fthash.h b/dependencies2013/win32/include/freetype/internal/fthash.h
deleted file mode 100644
index f22f9d5d..00000000
--- a/dependencies2013/win32/include/freetype/internal/fthash.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fthash.h                                                               */
-/*                                                                         */
-/*    Hashing functions (specification).                                   */
-/*                                                                         */
-/***************************************************************************/
-
-/*
- * Copyright 2000 Computing Research Labs, New Mexico State University
- * Copyright 2001-2015
- *   Francesco Zappa Nardelli
- *
- * 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 COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY 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.
- */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file is based on code from bdf.c,v 1.22 2000/03/16 20:08:50     */
-  /*                                                                       */
-  /*  taken from Mark Leisher's xmbdfed package                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTHASH_H_
-#define FTHASH_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef union  FT_Hashkey_
-  {
-    FT_Int       num;
-    const char*  str;
-
-  } FT_Hashkey;
-
-
-  typedef struct  FT_HashnodeRec_
-  {
-    FT_Hashkey  key;
-    size_t      data;
-
-  } FT_HashnodeRec;
-
-  typedef struct FT_HashnodeRec_  *FT_Hashnode;
-
-
-  typedef FT_ULong
-  (*FT_Hash_LookupFunc)( FT_Hashkey*  key );
-
-  typedef FT_Bool
-  (*FT_Hash_CompareFunc)( FT_Hashkey*  a,
-                          FT_Hashkey*  b );
-
-
-  typedef struct  FT_HashRec_
-  {
-    FT_UInt  limit;
-    FT_UInt  size;
-    FT_UInt  used;
-
-    FT_Hash_LookupFunc   lookup;
-    FT_Hash_CompareFunc  compare;
-
-    FT_Hashnode*  table;
-
-  } FT_HashRec;
-
-  typedef struct FT_HashRec_  *FT_Hash;
-
-
-  FT_Error
-  ft_hash_str_init( FT_Hash    hash,
-                    FT_Memory  memory );
-
-  FT_Error
-  ft_hash_num_init( FT_Hash    hash,
-                    FT_Memory  memory );
-
-  void
-  ft_hash_str_free( FT_Hash    hash,
-                    FT_Memory  memory );
-
-#define ft_hash_num_free  ft_hash_str_free
-
-  FT_Error
-  ft_hash_str_insert( const char*  key,
-                      size_t       data,
-                      FT_Hash      hash,
-                      FT_Memory    memory );
-
-  FT_Error
-  ft_hash_num_insert( FT_Int     num,
-                      size_t     data,
-                      FT_Hash    hash,
-                      FT_Memory  memory );
-
-  size_t*
-  ft_hash_str_lookup( const char*  key,
-                      FT_Hash      hash );
-
-  size_t*
-  ft_hash_num_lookup( FT_Int   num,
-                      FT_Hash  hash );
-
-
-FT_END_HEADER
-
-
-#endif /* FTHASH_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftmemory.h b/dependencies2013/win32/include/freetype/internal/ftmemory.h
deleted file mode 100644
index 3157dafa..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftmemory.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmemory.h                                                             */
-/*                                                                         */
-/*    The FreeType memory management macros (specification).               */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTMEMORY_H_
-#define FTMEMORY_H_
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_SET_ERROR                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used to set an implicit `error' variable to a given  */
-  /*    expression's value (usually a function call), and convert it to a  */
-  /*    boolean which is set whenever the value is != 0.                   */
-  /*                                                                       */
-#undef  FT_SET_ERROR
-#define FT_SET_ERROR( expression ) \
-          ( ( error = (expression) ) != 0 )
-
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                           M E M O R Y                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*
-   *  C++ refuses to handle statements like p = (void*)anything, with `p' a
-   *  typed pointer.  Since we don't have a `typeof' operator in standard
-   *  C++, we have to use a template to emulate it.
-   */
-
-#ifdef __cplusplus
-
-  extern "C++"
-  template <typename T> inline T*
-  cplusplus_typeof(        T*,
-                    void  *v )
-  {
-    return static_cast <T*> ( v );
-  }
-
-#define FT_ASSIGNP( p, val )  (p) = cplusplus_typeof( (p), (val) )
-
-#else
-
-#define FT_ASSIGNP( p, val )  (p) = (val)
-
-#endif
-
-
-
-#ifdef FT_DEBUG_MEMORY
-
-  FT_BASE( const char* )  _ft_debug_file;
-  FT_BASE( long )         _ft_debug_lineno;
-
-#define FT_DEBUG_INNER( exp )  ( _ft_debug_file   = __FILE__, \
-                                 _ft_debug_lineno = __LINE__, \
-                                 (exp) )
-
-#define FT_ASSIGNP_INNER( p, exp )  ( _ft_debug_file   = __FILE__, \
-                                      _ft_debug_lineno = __LINE__, \
-                                      FT_ASSIGNP( p, exp ) )
-
-#else /* !FT_DEBUG_MEMORY */
-
-#define FT_DEBUG_INNER( exp )       (exp)
-#define FT_ASSIGNP_INNER( p, exp )  FT_ASSIGNP( p, exp )
-
-#endif /* !FT_DEBUG_MEMORY */
-
-
-  /*
-   *  The allocation functions return a pointer, and the error code
-   *  is written to through the `p_error' parameter.  See below for
-   *  for documentation.
-   */
-
-  FT_BASE( FT_Pointer )
-  ft_mem_alloc( FT_Memory  memory,
-                FT_Long    size,
-                FT_Error  *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_qalloc( FT_Memory  memory,
-                 FT_Long    size,
-                 FT_Error  *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_realloc( FT_Memory  memory,
-                  FT_Long    item_size,
-                  FT_Long    cur_count,
-                  FT_Long    new_count,
-                  void*      block,
-                  FT_Error  *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_qrealloc( FT_Memory  memory,
-                   FT_Long    item_size,
-                   FT_Long    cur_count,
-                   FT_Long    new_count,
-                   void*      block,
-                   FT_Error  *p_error );
-
-  FT_BASE( void )
-  ft_mem_free( FT_Memory    memory,
-               const void*  P );
-
-
-#define FT_MEM_ALLOC( ptr, size )                               \
-          FT_ASSIGNP_INNER( ptr, ft_mem_alloc( memory,          \
-                                               (FT_Long)(size), \
-                                               &error ) )
-
-#define FT_MEM_FREE( ptr )                \
-          FT_BEGIN_STMNT                  \
-            ft_mem_free( memory, (ptr) ); \
-            (ptr) = NULL;                 \
-          FT_END_STMNT
-
-#define FT_MEM_NEW( ptr )                        \
-          FT_MEM_ALLOC( ptr, sizeof ( *(ptr) ) )
-
-#define FT_MEM_REALLOC( ptr, cursz, newsz )                        \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,           \
-                                                 1,                \
-                                                 (FT_Long)(cursz), \
-                                                 (FT_Long)(newsz), \
-                                                 (ptr),            \
-                                                 &error ) )
-
-#define FT_MEM_QALLOC( ptr, size )                               \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qalloc( memory,          \
-                                                (FT_Long)(size), \
-                                                &error ) )
-
-#define FT_MEM_QNEW( ptr )                        \
-          FT_MEM_QALLOC( ptr, sizeof ( *(ptr) ) )
-
-#define FT_MEM_QREALLOC( ptr, cursz, newsz )                        \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,           \
-                                                  1,                \
-                                                  (FT_Long)(cursz), \
-                                                  (FT_Long)(newsz), \
-                                                  (ptr),            \
-                                                  &error ) )
-
-#define FT_MEM_ALLOC_MULT( ptr, count, item_size )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,               \
-                                                 (FT_Long)(item_size), \
-                                                 0,                    \
-                                                 (FT_Long)(count),     \
-                                                 NULL,                 \
-                                                 &error ) )
-
-#define FT_MEM_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz )           \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
-                                                 (FT_Long)(itmsz),  \
-                                                 (FT_Long)(oldcnt), \
-                                                 (FT_Long)(newcnt), \
-                                                 (ptr),             \
-                                                 &error ) )
-
-#define FT_MEM_QALLOC_MULT( ptr, count, item_size )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,               \
-                                                  (FT_Long)(item_size), \
-                                                  0,                    \
-                                                  (FT_Long)(count),     \
-                                                  NULL,                 \
-                                                  &error ) )
-
-#define FT_MEM_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz)            \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
-                                                  (FT_Long)(itmsz),  \
-                                                  (FT_Long)(oldcnt), \
-                                                  (FT_Long)(newcnt), \
-                                                  (ptr),             \
-                                                  &error ) )
-
-
-#define FT_MEM_SET_ERROR( cond )  ( (cond), error != 0 )
-
-
-#define FT_MEM_SET( dest, byte, count )               \
-          ft_memset( dest, byte, (FT_Offset)(count) )
-
-#define FT_MEM_COPY( dest, source, count )              \
-          ft_memcpy( dest, source, (FT_Offset)(count) )
-
-#define FT_MEM_MOVE( dest, source, count )               \
-          ft_memmove( dest, source, (FT_Offset)(count) )
-
-
-#define FT_MEM_ZERO( dest, count )  FT_MEM_SET( dest, 0, count )
-
-#define FT_ZERO( p )                FT_MEM_ZERO( p, sizeof ( *(p) ) )
-
-
-#define FT_ARRAY_ZERO( dest, count )                             \
-          FT_MEM_ZERO( dest,                                     \
-                       (FT_Offset)(count) * sizeof ( *(dest) ) )
-
-#define FT_ARRAY_COPY( dest, source, count )                     \
-          FT_MEM_COPY( dest,                                     \
-                       source,                                   \
-                       (FT_Offset)(count) * sizeof ( *(dest) ) )
-
-#define FT_ARRAY_MOVE( dest, source, count )                     \
-          FT_MEM_MOVE( dest,                                     \
-                       source,                                   \
-                       (FT_Offset)(count) * sizeof ( *(dest) ) )
-
-
-  /*
-   *  Return the maximum number of addressable elements in an array.
-   *  We limit ourselves to INT_MAX, rather than UINT_MAX, to avoid
-   *  any problems.
-   */
-#define FT_ARRAY_MAX( ptr )           ( FT_INT_MAX / sizeof ( *(ptr) ) )
-
-#define FT_ARRAY_CHECK( ptr, count )  ( (count) <= FT_ARRAY_MAX( ptr ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The following functions macros expect that their pointer argument is  */
-  /* _typed_ in order to automatically compute array element sizes.        */
-  /*                                                                       */
-
-#define FT_MEM_NEW_ARRAY( ptr, count )                              \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
-                                                 sizeof ( *(ptr) ), \
-                                                 0,                 \
-                                                 (FT_Long)(count),  \
-                                                 NULL,              \
-                                                 &error ) )
-
-#define FT_MEM_RENEW_ARRAY( ptr, cursz, newsz )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory,            \
-                                                 sizeof ( *(ptr) ), \
-                                                 (FT_Long)(cursz),  \
-                                                 (FT_Long)(newsz),  \
-                                                 (ptr),             \
-                                                 &error ) )
-
-#define FT_MEM_QNEW_ARRAY( ptr, count )                              \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
-                                                  sizeof ( *(ptr) ), \
-                                                  0,                 \
-                                                  (FT_Long)(count),  \
-                                                  NULL,              \
-                                                  &error ) )
-
-#define FT_MEM_QRENEW_ARRAY( ptr, cursz, newsz )                     \
-          FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory,            \
-                                                  sizeof ( *(ptr) ), \
-                                                  (FT_Long)(cursz),  \
-                                                  (FT_Long)(newsz),  \
-                                                  (ptr),             \
-                                                  &error ) )
-
-#define FT_ALLOC( ptr, size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_ALLOC( ptr, size ) )
-
-#define FT_REALLOC( ptr, cursz, newsz )                           \
-          FT_MEM_SET_ERROR( FT_MEM_REALLOC( ptr, cursz, newsz ) )
-
-#define FT_ALLOC_MULT( ptr, count, item_size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_ALLOC_MULT( ptr, count, item_size ) )
-
-#define FT_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz )              \
-          FT_MEM_SET_ERROR( FT_MEM_REALLOC_MULT( ptr, oldcnt,      \
-                                                 newcnt, itmsz ) )
-
-#define FT_QALLOC( ptr, size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QALLOC( ptr, size ) )
-
-#define FT_QREALLOC( ptr, cursz, newsz )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QREALLOC( ptr, cursz, newsz ) )
-
-#define FT_QALLOC_MULT( ptr, count, item_size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QALLOC_MULT( ptr, count, item_size ) )
-
-#define FT_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz )              \
-          FT_MEM_SET_ERROR( FT_MEM_QREALLOC_MULT( ptr, oldcnt,      \
-                                                  newcnt, itmsz ) )
-
-#define FT_FREE( ptr )  FT_MEM_FREE( ptr )
-
-#define FT_NEW( ptr )  FT_MEM_SET_ERROR( FT_MEM_NEW( ptr ) )
-
-#define FT_NEW_ARRAY( ptr, count )                           \
-          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
-
-#define FT_RENEW_ARRAY( ptr, curcnt, newcnt )                           \
-          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
-
-#define FT_QNEW( ptr )                           \
-          FT_MEM_SET_ERROR( FT_MEM_QNEW( ptr ) )
-
-#define FT_QNEW_ARRAY( ptr, count )                          \
-          FT_MEM_SET_ERROR( FT_MEM_NEW_ARRAY( ptr, count ) )
-
-#define FT_QRENEW_ARRAY( ptr, curcnt, newcnt )                          \
-          FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) )
-
-
-  FT_BASE( FT_Pointer )
-  ft_mem_strdup( FT_Memory    memory,
-                 const char*  str,
-                 FT_Error    *p_error );
-
-  FT_BASE( FT_Pointer )
-  ft_mem_dup( FT_Memory    memory,
-              const void*  address,
-              FT_ULong     size,
-              FT_Error    *p_error );
-
-
-#define FT_MEM_STRDUP( dst, str )                                            \
-          (dst) = (char*)ft_mem_strdup( memory, (const char*)(str), &error )
-
-#define FT_STRDUP( dst, str )                           \
-          FT_MEM_SET_ERROR( FT_MEM_STRDUP( dst, str ) )
-
-#define FT_MEM_DUP( dst, address, size )                                    \
-          (dst) = ft_mem_dup( memory, (address), (FT_ULong)(size), &error )
-
-#define FT_DUP( dst, address, size )                           \
-          FT_MEM_SET_ERROR( FT_MEM_DUP( dst, address, size ) )
-
-
-  /* Return >= 1 if a truncation occurs.            */
-  /* Return 0 if the source string fits the buffer. */
-  /* This is *not* the same as strlcpy().           */
-  FT_BASE( FT_Int )
-  ft_mem_strcpyn( char*        dst,
-                  const char*  src,
-                  FT_ULong     size );
-
-#define FT_STRCPYN( dst, src, size )                                         \
-          ft_mem_strcpyn( (char*)dst, (const char*)(src), (FT_ULong)(size) )
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* FTMEMORY_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftobjs.h b/dependencies2013/win32/include/freetype/internal/ftobjs.h
deleted file mode 100644
index e3fa3208..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftobjs.h
+++ /dev/null
@@ -1,1560 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftobjs.h                                                               */
-/*                                                                         */
-/*    The FreeType private base classes (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file contains the definition of all internal FreeType classes.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTOBJS_H_
-#define FTOBJS_H_
-
-#include <ft2build.h>
-#include FT_RENDER_H
-#include FT_SIZES_H
-#include FT_LCD_FILTER_H
-#include FT_INTERNAL_MEMORY_H
-#include FT_INTERNAL_GLYPH_LOADER_H
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_AUTOHINT_H
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_PIC_H
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-#include FT_INCREMENTAL_H
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Some generic definitions.                                             */
-  /*                                                                       */
-#ifndef TRUE
-#define TRUE  1
-#endif
-
-#ifndef FALSE
-#define FALSE  0
-#endif
-
-#ifndef NULL
-#define NULL  (void*)0
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The min and max functions missing in C.  As usual, be careful not to  */
-  /* write things like FT_MIN( a++, b++ ) to avoid side effects.           */
-  /*                                                                       */
-#define FT_MIN( a, b )  ( (a) < (b) ? (a) : (b) )
-#define FT_MAX( a, b )  ( (a) > (b) ? (a) : (b) )
-
-#define FT_ABS( a )     ( (a) < 0 ? -(a) : (a) )
-
-  /*
-   *  Approximate sqrt(x*x+y*y) using the `alpha max plus beta min'
-   *  algorithm.  We use alpha = 1, beta = 3/8, giving us results with a
-   *  largest error less than 7% compared to the exact value.
-   */
-#define FT_HYPOT( x, y )                 \
-          ( x = FT_ABS( x ),             \
-            y = FT_ABS( y ),             \
-            x > y ? x + ( 3 * y >> 3 )   \
-                  : y + ( 3 * x >> 3 ) )
-
-  /* we use FT_TYPEOF to suppress signedness compilation warnings */
-#define FT_PAD_FLOOR( x, n )  ( (x) & ~FT_TYPEOF( x )( (n)-1 ) )
-#define FT_PAD_ROUND( x, n )  FT_PAD_FLOOR( (x) + ((n)/2), n )
-#define FT_PAD_CEIL( x, n )   FT_PAD_FLOOR( (x) + ((n)-1), n )
-
-#define FT_PIX_FLOOR( x )     ( (x) & ~FT_TYPEOF( x )63 )
-#define FT_PIX_ROUND( x )     FT_PIX_FLOOR( (x) + 32 )
-#define FT_PIX_CEIL( x )      FT_PIX_FLOOR( (x) + 63 )
-
-
-  /*
-   *  character classification functions -- since these are used to parse
-   *  font files, we must not use those in <ctypes.h> which are
-   *  locale-dependent
-   */
-#define  ft_isdigit( x )   ( ( (unsigned)(x) - '0' ) < 10U )
-
-#define  ft_isxdigit( x )  ( ( (unsigned)(x) - '0' ) < 10U || \
-                             ( (unsigned)(x) - 'a' ) < 6U  || \
-                             ( (unsigned)(x) - 'A' ) < 6U  )
-
-  /* the next two macros assume ASCII representation */
-#define  ft_isupper( x )  ( ( (unsigned)(x) - 'A' ) < 26U )
-#define  ft_islower( x )  ( ( (unsigned)(x) - 'a' ) < 26U )
-
-#define  ft_isalpha( x )  ( ft_isupper( x ) || ft_islower( x ) )
-#define  ft_isalnum( x )  ( ft_isdigit( x ) || ft_isalpha( x ) )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                       C H A R M A P S                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* handle to internal charmap object */
-  typedef struct FT_CMapRec_*              FT_CMap;
-
-  /* handle to charmap class structure */
-  typedef const struct FT_CMap_ClassRec_*  FT_CMap_Class;
-
-  /* internal charmap object structure */
-  typedef struct  FT_CMapRec_
-  {
-    FT_CharMapRec  charmap;
-    FT_CMap_Class  clazz;
-
-  } FT_CMapRec;
-
-  /* typecase any pointer to a charmap handle */
-#define FT_CMAP( x )              ((FT_CMap)( x ))
-
-  /* obvious macros */
-#define FT_CMAP_PLATFORM_ID( x )  FT_CMAP( x )->charmap.platform_id
-#define FT_CMAP_ENCODING_ID( x )  FT_CMAP( x )->charmap.encoding_id
-#define FT_CMAP_ENCODING( x )     FT_CMAP( x )->charmap.encoding
-#define FT_CMAP_FACE( x )         FT_CMAP( x )->charmap.face
-
-
-  /* class method definitions */
-  typedef FT_Error
-  (*FT_CMap_InitFunc)( FT_CMap     cmap,
-                       FT_Pointer  init_data );
-
-  typedef void
-  (*FT_CMap_DoneFunc)( FT_CMap  cmap );
-
-  typedef FT_UInt
-  (*FT_CMap_CharIndexFunc)( FT_CMap    cmap,
-                            FT_UInt32  char_code );
-
-  typedef FT_UInt
-  (*FT_CMap_CharNextFunc)( FT_CMap     cmap,
-                           FT_UInt32  *achar_code );
-
-  typedef FT_UInt
-  (*FT_CMap_CharVarIndexFunc)( FT_CMap    cmap,
-                               FT_CMap    unicode_cmap,
-                               FT_UInt32  char_code,
-                               FT_UInt32  variant_selector );
-
-  typedef FT_Bool
-  (*FT_CMap_CharVarIsDefaultFunc)( FT_CMap    cmap,
-                                   FT_UInt32  char_code,
-                                   FT_UInt32  variant_selector );
-
-  typedef FT_UInt32 *
-  (*FT_CMap_VariantListFunc)( FT_CMap    cmap,
-                              FT_Memory  mem );
-
-  typedef FT_UInt32 *
-  (*FT_CMap_CharVariantListFunc)( FT_CMap    cmap,
-                                  FT_Memory  mem,
-                                  FT_UInt32  char_code );
-
-  typedef FT_UInt32 *
-  (*FT_CMap_VariantCharListFunc)( FT_CMap    cmap,
-                                  FT_Memory  mem,
-                                  FT_UInt32  variant_selector );
-
-
-  typedef struct  FT_CMap_ClassRec_
-  {
-    FT_ULong               size;
-    FT_CMap_InitFunc       init;
-    FT_CMap_DoneFunc       done;
-    FT_CMap_CharIndexFunc  char_index;
-    FT_CMap_CharNextFunc   char_next;
-
-    /* Subsequent entries are special ones for format 14 -- the variant */
-    /* selector subtable which behaves like no other                    */
-
-    FT_CMap_CharVarIndexFunc      char_var_index;
-    FT_CMap_CharVarIsDefaultFunc  char_var_default;
-    FT_CMap_VariantListFunc       variant_list;
-    FT_CMap_CharVariantListFunc   charvariant_list;
-    FT_CMap_VariantCharListFunc   variantchar_list;
-
-  } FT_CMap_ClassRec;
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_CMAP_CLASS( class_ )              \
-  FT_CALLBACK_TABLE const  FT_CMap_ClassRec class_;
-
-#define FT_DEFINE_CMAP_CLASS(       \
-          class_,                   \
-          size_,                    \
-          init_,                    \
-          done_,                    \
-          char_index_,              \
-          char_next_,               \
-          char_var_index_,          \
-          char_var_default_,        \
-          variant_list_,            \
-          charvariant_list_,        \
-          variantchar_list_ )       \
-  FT_CALLBACK_TABLE_DEF             \
-  const FT_CMap_ClassRec  class_ =  \
-  {                                 \
-    size_,                          \
-    init_,                          \
-    done_,                          \
-    char_index_,                    \
-    char_next_,                     \
-    char_var_index_,                \
-    char_var_default_,              \
-    variant_list_,                  \
-    charvariant_list_,              \
-    variantchar_list_               \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_CMAP_CLASS( class_ )                  \
-  void                                                   \
-  FT_Init_Class_ ## class_( FT_Library         library,  \
-                            FT_CMap_ClassRec*  clazz );
-
-#define FT_DEFINE_CMAP_CLASS(                            \
-          class_,                                        \
-          size_,                                         \
-          init_,                                         \
-          done_,                                         \
-          char_index_,                                   \
-          char_next_,                                    \
-          char_var_index_,                               \
-          char_var_default_,                             \
-          variant_list_,                                 \
-          charvariant_list_,                             \
-          variantchar_list_ )                            \
-  void                                                   \
-  FT_Init_Class_ ## class_( FT_Library         library,  \
-                            FT_CMap_ClassRec*  clazz )   \
-  {                                                      \
-    FT_UNUSED( library );                                \
-                                                         \
-    clazz->size             = size_;                     \
-    clazz->init             = init_;                     \
-    clazz->done             = done_;                     \
-    clazz->char_index       = char_index_;               \
-    clazz->char_next        = char_next_;                \
-    clazz->char_var_index   = char_var_index_;           \
-    clazz->char_var_default = char_var_default_;         \
-    clazz->variant_list     = variant_list_;             \
-    clazz->charvariant_list = charvariant_list_;         \
-    clazz->variantchar_list = variantchar_list_;         \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /* create a new charmap and add it to charmap->face */
-  FT_BASE( FT_Error )
-  FT_CMap_New( FT_CMap_Class  clazz,
-               FT_Pointer     init_data,
-               FT_CharMap     charmap,
-               FT_CMap       *acmap );
-
-  /* destroy a charmap and remove it from face's list */
-  FT_BASE( void )
-  FT_CMap_Done( FT_CMap  cmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Face_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_Face        */
-  /*    object.  These fields may change between different releases of     */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    max_points ::                                                      */
-  /*      The maximum number of points used to store the vectorial outline */
-  /*      of any glyph in this face.  If this value cannot be known in     */
-  /*      advance, or if the face isn't scalable, this should be set to 0. */
-  /*      Only relevant for scalable formats.                              */
-  /*                                                                       */
-  /*    max_contours ::                                                    */
-  /*      The maximum number of contours used to store the vectorial       */
-  /*      outline of any glyph in this face.  If this value cannot be      */
-  /*      known in advance, or if the face isn't scalable, this should be  */
-  /*      set to 0.  Only relevant for scalable formats.                   */
-  /*                                                                       */
-  /*    transform_matrix ::                                                */
-  /*      A 2x2 matrix of 16.16 coefficients used to transform glyph       */
-  /*      outlines after they are loaded from the font.  Only used by the  */
-  /*      convenience functions.                                           */
-  /*                                                                       */
-  /*    transform_delta ::                                                 */
-  /*      A translation vector used to transform glyph outlines after they */
-  /*      are loaded from the font.  Only used by the convenience          */
-  /*      functions.                                                       */
-  /*                                                                       */
-  /*    transform_flags ::                                                 */
-  /*      Some flags used to classify the transform.  Only used by the     */
-  /*      convenience functions.                                           */
-  /*                                                                       */
-  /*    services ::                                                        */
-  /*      A cache for frequently used services.  It should be only         */
-  /*      accessed with the macro `FT_FACE_LOOKUP_SERVICE'.                */
-  /*                                                                       */
-  /*    incremental_interface ::                                           */
-  /*      If non-null, the interface through which glyph data and metrics  */
-  /*      are loaded incrementally for faces that do not provide all of    */
-  /*      this data when first opened.  This field exists only if          */
-  /*      @FT_CONFIG_OPTION_INCREMENTAL is defined.                        */
-  /*                                                                       */
-  /*    refcount ::                                                        */
-  /*      A counter initialized to~1 at the time an @FT_Face structure is  */
-  /*      created.  @FT_Reference_Face increments this counter, and        */
-  /*      @FT_Done_Face only destroys a face if the counter is~1,          */
-  /*      otherwise it simply decrements it.                               */
-  /*                                                                       */
-  typedef struct  FT_Face_InternalRec_
-  {
-    FT_Matrix           transform_matrix;
-    FT_Vector           transform_delta;
-    FT_Int              transform_flags;
-
-    FT_ServiceCacheRec  services;
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-    FT_Incremental_InterfaceRec*  incremental_interface;
-#endif
-
-    FT_Int              refcount;
-
-  } FT_Face_InternalRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Slot_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_GlyphSlot   */
-  /*    object.  These fields may change between different releases of     */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    loader            :: The glyph loader object used to load outlines */
-  /*                         into the glyph slot.                          */
-  /*                                                                       */
-  /*    flags             :: Possible values are zero or                   */
-  /*                         FT_GLYPH_OWN_BITMAP.  The latter indicates    */
-  /*                         that the FT_GlyphSlot structure owns the      */
-  /*                         bitmap buffer.                                */
-  /*                                                                       */
-  /*    glyph_transformed :: Boolean.  Set to TRUE when the loaded glyph   */
-  /*                         must be transformed through a specific        */
-  /*                         font transformation.  This is _not_ the same  */
-  /*                         as the face transform set through             */
-  /*                         FT_Set_Transform().                           */
-  /*                                                                       */
-  /*    glyph_matrix      :: The 2x2 matrix corresponding to the glyph     */
-  /*                         transformation, if necessary.                 */
-  /*                                                                       */
-  /*    glyph_delta       :: The 2d translation vector corresponding to    */
-  /*                         the glyph transformation, if necessary.       */
-  /*                                                                       */
-  /*    glyph_hints       :: Format-specific glyph hints management.       */
-  /*                                                                       */
-
-#define FT_GLYPH_OWN_BITMAP  0x1U
-
-  typedef struct  FT_Slot_InternalRec_
-  {
-    FT_GlyphLoader  loader;
-    FT_UInt         flags;
-    FT_Bool         glyph_transformed;
-    FT_Matrix       glyph_matrix;
-    FT_Vector       glyph_delta;
-    void*           glyph_hints;
-
-  } FT_GlyphSlot_InternalRec;
-
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_Size        */
-  /*    object.  Currently, it's empty.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-  typedef struct  FT_Size_InternalRec_
-  {
-    /* empty */
-
-  } FT_Size_InternalRec;
-
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                         M O D U L E S                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ModuleRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A module object instance.                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    clazz   :: A pointer to the module's class.                        */
-  /*                                                                       */
-  /*    library :: A handle to the parent library object.                  */
-  /*                                                                       */
-  /*    memory  :: A handle to the memory manager.                         */
-  /*                                                                       */
-  typedef struct  FT_ModuleRec_
-  {
-    FT_Module_Class*  clazz;
-    FT_Library        library;
-    FT_Memory         memory;
-
-  } FT_ModuleRec;
-
-
-  /* typecast an object to an FT_Module */
-#define FT_MODULE( x )          ((FT_Module)( x ))
-#define FT_MODULE_CLASS( x )    FT_MODULE( x )->clazz
-#define FT_MODULE_LIBRARY( x )  FT_MODULE( x )->library
-#define FT_MODULE_MEMORY( x )   FT_MODULE( x )->memory
-
-
-#define FT_MODULE_IS_DRIVER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_FONT_DRIVER )
-
-#define FT_MODULE_IS_RENDERER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      FT_MODULE_RENDERER )
-
-#define FT_MODULE_IS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_HINTER )
-
-#define FT_MODULE_IS_STYLER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_STYLER )
-
-#define FT_DRIVER_IS_SCALABLE( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      FT_MODULE_DRIVER_SCALABLE )
-
-#define FT_DRIVER_USES_OUTLINES( x )  !( FT_MODULE_CLASS( x )->module_flags & \
-                                         FT_MODULE_DRIVER_NO_OUTLINES )
-
-#define FT_DRIVER_HAS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                     FT_MODULE_DRIVER_HAS_HINTER )
-
-#define FT_DRIVER_HINTS_LIGHTLY( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                        FT_MODULE_DRIVER_HINTS_LIGHTLY )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Module_Interface                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Finds a module and returns its specific interface as a typeless    */
-  /*    pointer.                                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object.                     */
-  /*                                                                       */
-  /*    module_name :: The module's name (as an ASCII string).             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A module-specific interface if available, 0 otherwise.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should better be familiar with FreeType internals to know      */
-  /*    which module to look for, and what its interface is :-)            */
-  /*                                                                       */
-  FT_BASE( const void* )
-  FT_Get_Module_Interface( FT_Library   library,
-                           const char*  mod_name );
-
-  FT_BASE( FT_Pointer )
-  ft_module_get_service( FT_Module    module,
-                         const char*  service_id );
-
-  /* */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****   F A C E,   S I Z E   &   G L Y P H   S L O T   O B J E C T S  ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* a few macros used to perform easy typecasts with minimal brain damage */
-
-#define FT_FACE( x )          ((FT_Face)(x))
-#define FT_SIZE( x )          ((FT_Size)(x))
-#define FT_SLOT( x )          ((FT_GlyphSlot)(x))
-
-#define FT_FACE_DRIVER( x )   FT_FACE( x )->driver
-#define FT_FACE_LIBRARY( x )  FT_FACE_DRIVER( x )->root.library
-#define FT_FACE_MEMORY( x )   FT_FACE( x )->memory
-#define FT_FACE_STREAM( x )   FT_FACE( x )->stream
-
-#define FT_SIZE_FACE( x )     FT_SIZE( x )->face
-#define FT_SLOT_FACE( x )     FT_SLOT( x )->face
-
-#define FT_FACE_SLOT( x )     FT_FACE( x )->glyph
-#define FT_FACE_SIZE( x )     FT_FACE( x )->size
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_GlyphSlot                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    It is sometimes useful to have more than one glyph slot for a      */
-  /*    given face object.  This function is used to create additional     */
-  /*    slots.  All of them are automatically discarded when the face is   */
-  /*    destroyed.                                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A handle to a parent face object.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aslot :: A handle to a new glyph slot object.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_New_GlyphSlot( FT_Face        face,
-                    FT_GlyphSlot  *aslot );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_GlyphSlot                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a given glyph slot.  Remember however that all slots are  */
-  /*    automatically destroyed with its parent.  Using this function is   */
-  /*    not always mandatory.                                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot :: A handle to a target glyph slot.                           */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Done_GlyphSlot( FT_GlyphSlot  slot );
-
- /* */
-
-#define FT_REQUEST_WIDTH( req )                                            \
-          ( (req)->horiResolution                                          \
-              ? ( (req)->width * (FT_Pos)(req)->horiResolution + 36 ) / 72 \
-              : (req)->width )
-
-#define FT_REQUEST_HEIGHT( req )                                            \
-          ( (req)->vertResolution                                           \
-              ? ( (req)->height * (FT_Pos)(req)->vertResolution + 36 ) / 72 \
-              : (req)->height )
-
-
-  /* Set the metrics according to a bitmap strike. */
-  FT_BASE( void )
-  FT_Select_Metrics( FT_Face   face,
-                     FT_ULong  strike_index );
-
-
-  /* Set the metrics according to a size request. */
-  FT_BASE( void )
-  FT_Request_Metrics( FT_Face          face,
-                      FT_Size_Request  req );
-
-
-  /* Match a size request against `available_sizes'. */
-  FT_BASE( FT_Error )
-  FT_Match_Size( FT_Face          face,
-                 FT_Size_Request  req,
-                 FT_Bool          ignore_width,
-                 FT_ULong*        size_index );
-
-
-  /* Use the horizontal metrics to synthesize the vertical metrics. */
-  /* If `advance' is zero, it is also synthesized.                  */
-  FT_BASE( void )
-  ft_synthesize_vertical_metrics( FT_Glyph_Metrics*  metrics,
-                                  FT_Pos             advance );
-
-
-  /* Free the bitmap of a given glyphslot when needed (i.e., only when it */
-  /* was allocated with ft_glyphslot_alloc_bitmap).                       */
-  FT_BASE( void )
-  ft_glyphslot_free_bitmap( FT_GlyphSlot  slot );
-
-
-  /* Allocate a new bitmap buffer in a glyph slot. */
-  FT_BASE( FT_Error )
-  ft_glyphslot_alloc_bitmap( FT_GlyphSlot  slot,
-                             FT_ULong      size );
-
-
-  /* Set the bitmap buffer in a glyph slot to a given pointer.  The buffer */
-  /* will not be freed by a later call to ft_glyphslot_free_bitmap.        */
-  FT_BASE( void )
-  ft_glyphslot_set_bitmap( FT_GlyphSlot  slot,
-                           FT_Byte*      buffer );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                        R E N D E R E R S                        ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#define FT_RENDERER( x )      ((FT_Renderer)( x ))
-#define FT_GLYPH( x )         ((FT_Glyph)( x ))
-#define FT_BITMAP_GLYPH( x )  ((FT_BitmapGlyph)( x ))
-#define FT_OUTLINE_GLYPH( x ) ((FT_OutlineGlyph)( x ))
-
-
-  typedef struct  FT_RendererRec_
-  {
-    FT_ModuleRec            root;
-    FT_Renderer_Class*      clazz;
-    FT_Glyph_Format         glyph_format;
-    FT_Glyph_Class          glyph_class;
-
-    FT_Raster               raster;
-    FT_Raster_Render_Func   raster_render;
-    FT_Renderer_RenderFunc  render;
-
-  } FT_RendererRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                    F O N T   D R I V E R S                      ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* typecast a module into a driver easily */
-#define FT_DRIVER( x )        ((FT_Driver)(x))
-
-  /* typecast a module as a driver, and get its driver class */
-#define FT_DRIVER_CLASS( x )  FT_DRIVER( x )->clazz
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_DriverRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The root font driver class.  A font driver is responsible for      */
-  /*    managing and loading font files of a given format.                 */
-  /*                                                                       */
-  /*  <Fields>                                                             */
-  /*     root         :: Contains the fields of the root module class.     */
-  /*                                                                       */
-  /*     clazz        :: A pointer to the font driver's class.  Note that  */
-  /*                     this is NOT root.clazz.  `class' wasn't used      */
-  /*                     as it is a reserved word in C++.                  */
-  /*                                                                       */
-  /*     faces_list   :: The list of faces currently opened by this        */
-  /*                     driver.                                           */
-  /*                                                                       */
-  /*     glyph_loader :: Unused.  Used to be glyph loader for all faces    */
-  /*                     managed by this driver.                           */
-  /*                                                                       */
-  typedef struct  FT_DriverRec_
-  {
-    FT_ModuleRec     root;
-    FT_Driver_Class  clazz;
-    FT_ListRec       faces_list;
-    FT_GlyphLoader   glyph_loader;
-
-  } FT_DriverRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                       L I B R A R I E S                         ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* This hook is used by the TrueType debugger.  It must be set to an */
-  /* alternate truetype bytecode interpreter function.                 */
-#define FT_DEBUG_HOOK_TRUETYPE            0
-
-
-  typedef void  (*FT_Bitmap_LcdFilterFunc)( FT_Bitmap*      bitmap,
-                                            FT_Render_Mode  render_mode,
-                                            FT_Library      library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_LibraryRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The FreeType library class.  This is the root of all FreeType      */
-  /*    data.  Use FT_New_Library() to create a library object, and        */
-  /*    FT_Done_Library() to discard it and all child objects.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory           :: The library's memory object.  Manages memory   */
-  /*                        allocation.                                    */
-  /*                                                                       */
-  /*    version_major    :: The major version number of the library.       */
-  /*                                                                       */
-  /*    version_minor    :: The minor version number of the library.       */
-  /*                                                                       */
-  /*    version_patch    :: The current patch level of the library.        */
-  /*                                                                       */
-  /*    num_modules      :: The number of modules currently registered     */
-  /*                        within this library.  This is set to 0 for new */
-  /*                        libraries.  New modules are added through the  */
-  /*                        FT_Add_Module() API function.                  */
-  /*                                                                       */
-  /*    modules          :: A table used to store handles to the currently */
-  /*                        registered modules. Note that each font driver */
-  /*                        contains a list of its opened faces.           */
-  /*                                                                       */
-  /*    renderers        :: The list of renderers currently registered     */
-  /*                        within the library.                            */
-  /*                                                                       */
-  /*    cur_renderer     :: The current outline renderer.  This is a       */
-  /*                        shortcut used to avoid parsing the list on     */
-  /*                        each call to FT_Outline_Render().  It is a     */
-  /*                        handle to the current renderer for the         */
-  /*                        FT_GLYPH_FORMAT_OUTLINE format.                */
-  /*                                                                       */
-  /*    auto_hinter      :: XXX                                            */
-  /*                                                                       */
-  /*    raster_pool      :: The raster object's render pool.  This can     */
-  /*                        ideally be changed dynamically at run-time.    */
-  /*                                                                       */
-  /*    raster_pool_size :: The size of the render pool in bytes.          */
-  /*                                                                       */
-  /*    debug_hooks      :: XXX                                            */
-  /*                                                                       */
-  /*    lcd_filter       :: If subpixel rendering is activated, the        */
-  /*                        selected LCD filter mode.                      */
-  /*                                                                       */
-  /*    lcd_extra        :: If subpixel rendering is activated, the number */
-  /*                        of extra pixels needed for the LCD filter.     */
-  /*                                                                       */
-  /*    lcd_weights      :: If subpixel rendering is activated, the LCD    */
-  /*                        filter weights, if any.                        */
-  /*                                                                       */
-  /*    lcd_filter_func  :: If subpixel rendering is activated, the LCD    */
-  /*                        filtering callback function.                   */
-  /*                                                                       */
-  /*    pic_container    :: Contains global structs and tables, instead    */
-  /*                        of defining them globally.                     */
-  /*                                                                       */
-  /*    refcount         :: A counter initialized to~1 at the time an      */
-  /*                        @FT_Library structure is created.              */
-  /*                        @FT_Reference_Library increments this counter, */
-  /*                        and @FT_Done_Library only destroys a library   */
-  /*                        if the counter is~1, otherwise it simply       */
-  /*                        decrements it.                                 */
-  /*                                                                       */
-  typedef struct  FT_LibraryRec_
-  {
-    FT_Memory          memory;           /* library's memory manager */
-
-    FT_Int             version_major;
-    FT_Int             version_minor;
-    FT_Int             version_patch;
-
-    FT_UInt            num_modules;
-    FT_Module          modules[FT_MAX_MODULES];  /* module objects  */
-
-    FT_ListRec         renderers;        /* list of renderers        */
-    FT_Renderer        cur_renderer;     /* current outline renderer */
-    FT_Module          auto_hinter;
-
-    FT_Byte*           raster_pool;      /* scan-line conversion */
-                                         /* render pool          */
-    FT_ULong           raster_pool_size; /* size of render pool in bytes */
-
-    FT_DebugHook_Func  debug_hooks[4];
-
-#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-    FT_LcdFilter             lcd_filter;
-    FT_Int                   lcd_extra;        /* number of extra pixels */
-    FT_Byte                  lcd_weights[7];   /* filter weights, if any */
-    FT_Bitmap_LcdFilterFunc  lcd_filter_func;  /* filtering callback     */
-#endif
-
-#ifdef FT_CONFIG_OPTION_PIC
-    FT_PIC_Container   pic_container;
-#endif
-
-    FT_Int             refcount;
-
-  } FT_LibraryRec;
-
-
-  FT_BASE( FT_Renderer )
-  FT_Lookup_Renderer( FT_Library       library,
-                      FT_Glyph_Format  format,
-                      FT_ListNode*     node );
-
-  FT_BASE( FT_Error )
-  FT_Render_Glyph_Internal( FT_Library      library,
-                            FT_GlyphSlot    slot,
-                            FT_Render_Mode  render_mode );
-
-  typedef const char*
-  (*FT_Face_GetPostscriptNameFunc)( FT_Face  face );
-
-  typedef FT_Error
-  (*FT_Face_GetGlyphNameFunc)( FT_Face     face,
-                               FT_UInt     glyph_index,
-                               FT_Pointer  buffer,
-                               FT_UInt     buffer_max );
-
-  typedef FT_UInt
-  (*FT_Face_GetGlyphNameIndexFunc)( FT_Face     face,
-                                    FT_String*  glyph_name );
-
-
-#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Memory                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new memory object.                                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to the new memory object.  0 in case of error.           */
-  /*                                                                       */
-  FT_BASE( FT_Memory )
-  FT_New_Memory( void );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Memory                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards memory manager.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory manager.                          */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Done_Memory( FT_Memory  memory );
-
-#endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
-
-
-  /* Define default raster's interface.  The default raster is located in  */
-  /* `src/base/ftraster.c'.                                                */
-  /*                                                                       */
-  /* Client applications can register new rasters through the              */
-  /* FT_Set_Raster() API.                                                  */
-
-#ifndef FT_NO_DEFAULT_RASTER
-  FT_EXPORT_VAR( FT_Raster_Funcs )  ft_default_raster;
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                      P I C   S U P P O R T                      ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* PIC support macros for ftimage.h */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_OUTLINE_FUNCS                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Outline_Funcs struct.         */
-  /*    When FT_CONFIG_OPTION_PIC is defined an init function will need    */
-  /*    to be called with a pre-allocated structure to be filled.          */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_OUTLINE_FUNCS(           \
-          class_,                          \
-          move_to_,                        \
-          line_to_,                        \
-          conic_to_,                       \
-          cubic_to_,                       \
-          shift_,                          \
-          delta_ )                         \
-  static const  FT_Outline_Funcs class_ =  \
-  {                                        \
-    move_to_,                              \
-    line_to_,                              \
-    conic_to_,                             \
-    cubic_to_,                             \
-    shift_,                                \
-    delta_                                 \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_OUTLINE_FUNCS(                     \
-          class_,                                    \
-          move_to_,                                  \
-          line_to_,                                  \
-          conic_to_,                                 \
-          cubic_to_,                                 \
-          shift_,                                    \
-          delta_ )                                   \
-  static FT_Error                                    \
-  Init_Class_ ## class_( FT_Outline_Funcs*  clazz )  \
-  {                                                  \
-    clazz->move_to  = move_to_;                      \
-    clazz->line_to  = line_to_;                      \
-    clazz->conic_to = conic_to_;                     \
-    clazz->cubic_to = cubic_to_;                     \
-    clazz->shift    = shift_;                        \
-    clazz->delta    = delta_;                        \
-                                                     \
-    return FT_Err_Ok;                                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_RASTER_FUNCS                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Raster_Funcs struct.          */
-  /*    When FT_CONFIG_OPTION_PIC is defined an init function will need    */
-  /*    to be called with a pre-allocated structure to be filled.          */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_RASTER_FUNCS(    \
-          class_,                  \
-          glyph_format_,           \
-          raster_new_,             \
-          raster_reset_,           \
-          raster_set_mode_,        \
-          raster_render_,          \
-          raster_done_ )           \
-  const FT_Raster_Funcs  class_ =  \
-  {                                \
-    glyph_format_,                 \
-    raster_new_,                   \
-    raster_reset_,                 \
-    raster_set_mode_,              \
-    raster_render_,                \
-    raster_done_                   \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_RASTER_FUNCS(                        \
-          class_,                                      \
-          glyph_format_,                               \
-          raster_new_,                                 \
-          raster_reset_,                               \
-          raster_set_mode_,                            \
-          raster_render_,                              \
-          raster_done_ )                               \
-  void                                                 \
-  FT_Init_Class_ ## class_( FT_Raster_Funcs*  clazz )  \
-  {                                                    \
-    clazz->glyph_format    = glyph_format_;            \
-    clazz->raster_new      = raster_new_;              \
-    clazz->raster_reset    = raster_reset_;            \
-    clazz->raster_set_mode = raster_set_mode_;         \
-    clazz->raster_render   = raster_render_;           \
-    clazz->raster_done     = raster_done_;             \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /* PIC support macros for ftrender.h */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_GLYPH                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Glyph_Class struct.           */
-  /*    When FT_CONFIG_OPTION_PIC is defined an init function will need    */
-  /*    to be called with a pre-allocated structure to be filled.          */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_GLYPH(          \
-          class_,                 \
-          size_,                  \
-          format_,                \
-          init_,                  \
-          done_,                  \
-          copy_,                  \
-          transform_,             \
-          bbox_,                  \
-          prepare_ )              \
-  FT_CALLBACK_TABLE_DEF           \
-  const FT_Glyph_Class  class_ =  \
-  {                               \
-    size_,                        \
-    format_,                      \
-    init_,                        \
-    done_,                        \
-    copy_,                        \
-    transform_,                   \
-    bbox_,                        \
-    prepare_                      \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_GLYPH(                              \
-          class_,                                     \
-          size_,                                      \
-          format_,                                    \
-          init_,                                      \
-          done_,                                      \
-          copy_,                                      \
-          transform_,                                 \
-          bbox_,                                      \
-          prepare_ )                                  \
-  void                                                \
-  FT_Init_Class_ ## class_( FT_Glyph_Class*  clazz )  \
-  {                                                   \
-    clazz->glyph_size      = size_;                   \
-    clazz->glyph_format    = format_;                 \
-    clazz->glyph_init      = init_;                   \
-    clazz->glyph_done      = done_;                   \
-    clazz->glyph_copy      = copy_;                   \
-    clazz->glyph_transform = transform_;              \
-    clazz->glyph_bbox      = bbox_;                   \
-    clazz->glyph_prepare   = prepare_;                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DECLARE_RENDERER                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to create a forward declaration of a                          */
-  /*    FT_Renderer_Class struct instance.                                 */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_RENDERER                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of FT_Renderer_Class struct.        */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function will      */
-  /*    need to be called with a pointer where the allocated structure is  */
-  /*    returned.  And when it is no longer needed a `destroy' function    */
-  /*    needs to be called to release that allocation.                     */
-  /*    `ftinit.c' (ft_create_default_module_classes) already contains     */
-  /*    a mechanism to call these functions for the default modules        */
-  /*    described in `ftmodule.h'.                                         */
-  /*                                                                       */
-  /*    Notice that the created `create' and `destroy' functions call      */
-  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
-  /*    initialize any additional global data, like a module specific      */
-  /*    interface, and put them in the global pic container defined in     */
-  /*    `ftpic.h'.  If you don't need them just implement the functions as */
-  /*    empty to resolve the link error.  Also the `pic_init' and          */
-  /*    `pic_free' functions should be declared in `pic.h', to be referred */
-  /*    by the renderer definition calling `FT_DEFINE_RENDERER' in the     */
-  /*    following.                                                         */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_RENDERER( class_ )               \
-  FT_EXPORT_VAR( const FT_Renderer_Class ) class_;
-
-#define FT_DEFINE_RENDERER(                  \
-          class_,                            \
-          flags_,                            \
-          size_,                             \
-          name_,                             \
-          version_,                          \
-          requires_,                         \
-          interface_,                        \
-          init_,                             \
-          done_,                             \
-          get_interface_,                    \
-          glyph_format_,                     \
-          render_glyph_,                     \
-          transform_glyph_,                  \
-          get_glyph_cbox_,                   \
-          set_mode_,                         \
-          raster_class_ )                    \
-  FT_CALLBACK_TABLE_DEF                      \
-  const FT_Renderer_Class  class_ =          \
-  {                                          \
-    FT_DEFINE_ROOT_MODULE( flags_,           \
-                           size_,            \
-                           name_,            \
-                           version_,         \
-                           requires_,        \
-                           interface_,       \
-                           init_,            \
-                           done_,            \
-                           get_interface_ )  \
-    glyph_format_,                           \
-                                             \
-    render_glyph_,                           \
-    transform_glyph_,                        \
-    get_glyph_cbox_,                         \
-    set_mode_,                               \
-                                             \
-    raster_class_                            \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_RENDERER( class_ )  FT_DECLARE_MODULE( class_ )
-
-#define FT_DEFINE_RENDERER(                                      \
-          class_,                                                \
-          flags_,                                                \
-          size_,                                                 \
-          name_,                                                 \
-          version_,                                              \
-          requires_,                                             \
-          interface_,                                            \
-          init_,                                                 \
-          done_,                                                 \
-          get_interface_,                                        \
-          glyph_format_,                                         \
-          render_glyph_,                                         \
-          transform_glyph_,                                      \
-          get_glyph_cbox_,                                       \
-          set_mode_,                                             \
-          raster_class_ )                                        \
-  void                                                           \
-  FT_Destroy_Class_ ## class_( FT_Library        library,        \
-                               FT_Module_Class*  clazz )         \
-  {                                                              \
-    FT_Renderer_Class*  rclazz = (FT_Renderer_Class*)clazz;      \
-    FT_Memory           memory = library->memory;                \
-                                                                 \
-                                                                 \
-    class_ ## _pic_free( library );                              \
-    if ( rclazz )                                                \
-      FT_FREE( rclazz );                                         \
-  }                                                              \
-                                                                 \
-                                                                 \
-  FT_Error                                                       \
-  FT_Create_Class_ ## class_( FT_Library         library,        \
-                              FT_Module_Class**  output_class )  \
-  {                                                              \
-    FT_Renderer_Class*  clazz = NULL;                            \
-    FT_Error            error;                                   \
-    FT_Memory           memory = library->memory;                \
-                                                                 \
-                                                                 \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
-      return error;                                              \
-                                                                 \
-    error = class_ ## _pic_init( library );                      \
-    if ( error )                                                 \
-    {                                                            \
-      FT_FREE( clazz );                                          \
-      return error;                                              \
-    }                                                            \
-                                                                 \
-    FT_DEFINE_ROOT_MODULE( flags_,                               \
-                           size_,                                \
-                           name_,                                \
-                           version_,                             \
-                           requires_,                            \
-                           interface_,                           \
-                           init_,                                \
-                           done_,                                \
-                           get_interface_ )                      \
-                                                                 \
-    clazz->glyph_format    = glyph_format_;                      \
-                                                                 \
-    clazz->render_glyph    = render_glyph_;                      \
-    clazz->transform_glyph = transform_glyph_;                   \
-    clazz->get_glyph_cbox  = get_glyph_cbox_;                    \
-    clazz->set_mode        = set_mode_;                          \
-                                                                 \
-    clazz->raster_class    = raster_class_;                      \
-                                                                 \
-    *output_class = (FT_Module_Class*)clazz;                     \
-                                                                 \
-    return FT_Err_Ok;                                            \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /* PIC support macros for ftmodapi.h **/
-
-
-#ifdef FT_CONFIG_OPTION_PIC
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Creator                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to create (allocate) a new module class object.    */
-  /*    The object's members are initialized, but the module itself is     */
-  /*    not.                                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory       :: A handle to the memory manager.                    */
-  /*    output_class :: Initialized with the newly allocated class.        */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_Module_Creator)( FT_Memory          memory,
-                        FT_Module_Class**  output_class );
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Module_Destroyer                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to destroy (deallocate) a module class object.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory manager.                          */
-  /*    clazz  :: Module class to destroy.                                 */
-  /*                                                                       */
-  typedef void
-  (*FT_Module_Destroyer)( FT_Memory         memory,
-                          FT_Module_Class*  clazz );
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DECLARE_MODULE                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to create a forward declaration of a                          */
-  /*    FT_Module_Class struct instance.                                   */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_MODULE                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of an FT_Module_Class struct.       */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function needs     */
-  /*    to be called with a pointer where the allocated structure is       */
-  /*    returned.  And when it is no longer needed a `destroy' function    */
-  /*    needs to be called to release that allocation.                     */
-  /*    `ftinit.c' (ft_create_default_module_classes) already contains     */
-  /*    a mechanism to call these functions for the default modules        */
-  /*    described in `ftmodule.h'.                                         */
-  /*                                                                       */
-  /*    Notice that the created `create' and `destroy' functions call      */
-  /*    `pic_init' and `pic_free' to allow you to manually allocate and    */
-  /*    initialize any additional global data, like a module specific      */
-  /*    interface, and put them in the global pic container defined in     */
-  /*    `ftpic.h'.  If you don't need them just implement the functions as */
-  /*    empty to resolve the link error.  Also the `pic_init' and          */
-  /*    `pic_free' functions should be declared in `pic.h', to be referred */
-  /*    by the module definition calling `FT_DEFINE_MODULE' in the         */
-  /*    following.                                                         */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_ROOT_MODULE                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an instance of an FT_Module_Class struct inside */
-  /*    another struct that contains it or in a function that initializes  */
-  /*    that containing struct.                                            */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DECLARE_MODULE( class_ )  \
-  FT_CALLBACK_TABLE                  \
-  const FT_Module_Class  class_;
-
-#define FT_DEFINE_ROOT_MODULE(  \
-          flags_,               \
-          size_,                \
-          name_,                \
-          version_,             \
-          requires_,            \
-          interface_,           \
-          init_,                \
-          done_,                \
-          get_interface_ )      \
-  {                             \
-    flags_,                     \
-    size_,                      \
-                                \
-    name_,                      \
-    version_,                   \
-    requires_,                  \
-                                \
-    interface_,                 \
-                                \
-    init_,                      \
-    done_,                      \
-    get_interface_,             \
-  },
-
-#define FT_DEFINE_MODULE(         \
-          class_,                 \
-          flags_,                 \
-          size_,                  \
-          name_,                  \
-          version_,               \
-          requires_,              \
-          interface_,             \
-          init_,                  \
-          done_,                  \
-          get_interface_ )        \
-  FT_CALLBACK_TABLE_DEF           \
-  const FT_Module_Class class_ =  \
-  {                               \
-    flags_,                       \
-    size_,                        \
-                                  \
-    name_,                        \
-    version_,                     \
-    requires_,                    \
-                                  \
-    interface_,                   \
-                                  \
-    init_,                        \
-    done_,                        \
-    get_interface_,               \
-  };
-
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DECLARE_MODULE( class_ )                               \
-  FT_Error                                                        \
-  FT_Create_Class_ ## class_( FT_Library         library,         \
-                              FT_Module_Class**  output_class );  \
-  void                                                            \
-  FT_Destroy_Class_ ## class_( FT_Library        library,         \
-                               FT_Module_Class*  clazz );
-
-#define FT_DEFINE_ROOT_MODULE(                      \
-          flags_,                                   \
-          size_,                                    \
-          name_,                                    \
-          version_,                                 \
-          requires_,                                \
-          interface_,                               \
-          init_,                                    \
-          done_,                                    \
-          get_interface_ )                          \
-    clazz->root.module_flags     = flags_;          \
-    clazz->root.module_size      = size_;           \
-    clazz->root.module_name      = name_;           \
-    clazz->root.module_version   = version_;        \
-    clazz->root.module_requires  = requires_;       \
-                                                    \
-    clazz->root.module_interface = interface_;      \
-                                                    \
-    clazz->root.module_init      = init_;           \
-    clazz->root.module_done      = done_;           \
-    clazz->root.get_interface    = get_interface_;
-
-#define FT_DEFINE_MODULE(                                        \
-          class_,                                                \
-          flags_,                                                \
-          size_,                                                 \
-          name_,                                                 \
-          version_,                                              \
-          requires_,                                             \
-          interface_,                                            \
-          init_,                                                 \
-          done_,                                                 \
-          get_interface_ )                                       \
-  void                                                           \
-  FT_Destroy_Class_ ## class_( FT_Library        library,        \
-                               FT_Module_Class*  clazz )         \
-  {                                                              \
-    FT_Memory memory = library->memory;                          \
-                                                                 \
-                                                                 \
-    class_ ## _pic_free( library );                              \
-    if ( clazz )                                                 \
-      FT_FREE( clazz );                                          \
-  }                                                              \
-                                                                 \
-                                                                 \
-  FT_Error                                                       \
-  FT_Create_Class_ ## class_( FT_Library         library,        \
-                              FT_Module_Class**  output_class )  \
-  {                                                              \
-    FT_Memory         memory = library->memory;                  \
-    FT_Module_Class*  clazz  = NULL;                             \
-    FT_Error          error;                                     \
-                                                                 \
-                                                                 \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) )                  \
-      return error;                                              \
-    error = class_ ## _pic_init( library );                      \
-    if ( error )                                                 \
-    {                                                            \
-      FT_FREE( clazz );                                          \
-      return error;                                              \
-    }                                                            \
-                                                                 \
-    clazz->module_flags     = flags_;                            \
-    clazz->module_size      = size_;                             \
-    clazz->module_name      = name_;                             \
-    clazz->module_version   = version_;                          \
-    clazz->module_requires  = requires_;                         \
-                                                                 \
-    clazz->module_interface = interface_;                        \
-                                                                 \
-    clazz->module_init      = init_;                             \
-    clazz->module_done      = done_;                             \
-    clazz->get_interface    = get_interface_;                    \
-                                                                 \
-    *output_class = clazz;                                       \
-                                                                 \
-    return FT_Err_Ok;                                            \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-FT_END_HEADER
-
-#endif /* FTOBJS_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftpic.h b/dependencies2013/win32/include/freetype/internal/ftpic.h
deleted file mode 100644
index 6d800a08..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftpic.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftpic.h                                                                */
-/*                                                                         */
-/*    The FreeType position independent code services (declaration).       */
-/*                                                                         */
-/*  Copyright 2009-2016 by                                                 */
-/*  Oran Agra and Mickey Gabel.                                            */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Modules that ordinarily have const global data that need address     */
-  /*  can instead define pointers here.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTPIC_H_
-#define FTPIC_H_
-
-
-FT_BEGIN_HEADER
-
-#ifdef FT_CONFIG_OPTION_PIC
-
-  typedef struct  FT_PIC_Container_
-  {
-    /* pic containers for base */
-    void*  base;
-
-    /* pic containers for modules */
-    void*  autofit;
-    void*  cff;
-    void*  pshinter;
-    void*  psnames;
-    void*  raster;
-    void*  sfnt;
-    void*  smooth;
-    void*  truetype;
-
-  } FT_PIC_Container;
-
-
-  /* Initialize the various function tables, structs, etc. */
-  /* stored in the container.                              */
-  FT_BASE( FT_Error )
-  ft_pic_container_init( FT_Library  library );
-
-
-  /* Destroy the contents of the container. */
-  FT_BASE( void )
-  ft_pic_container_destroy( FT_Library  library );
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
- /* */
-
-FT_END_HEADER
-
-#endif /* FTPIC_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftrfork.h b/dependencies2013/win32/include/freetype/internal/ftrfork.h
deleted file mode 100644
index b923401e..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftrfork.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftrfork.h                                                              */
-/*                                                                         */
-/*    Embedded resource forks accessor (specification).                    */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  Masatake YAMATO and Redhat K.K.                                        */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/* Development of the code in this file is support of                      */
-/* Information-technology Promotion Agency, Japan.                         */
-/***************************************************************************/
-
-
-#ifndef FTRFORK_H_
-#define FTRFORK_H_
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* Number of guessing rules supported in `FT_Raccess_Guess'.            */
-  /* Don't forget to increment the number if you add a new guessing rule. */
-#define FT_RACCESS_N_RULES  9
-
-
-  /* A structure to describe a reference in a resource by its resource ID */
-  /* and internal offset.  The `POST' resource expects to be concatenated */
-  /* by the order of resource IDs instead of its appearance in the file.  */
-
-  typedef struct  FT_RFork_Ref_
-  {
-    FT_UShort  res_id;
-    FT_Long    offset;
-
-  } FT_RFork_Ref;
-
-#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
-  typedef FT_Error
-  (*ft_raccess_guess_func)( FT_Library  library,
-                            FT_Stream   stream,
-                            char       *base_file_name,
-                            char      **result_file_name,
-                            FT_Long    *result_offset );
-
-  typedef enum  FT_RFork_Rule_ {
-    FT_RFork_Rule_invalid = -2,
-    FT_RFork_Rule_uknown, /* -1 */
-    FT_RFork_Rule_apple_double,
-    FT_RFork_Rule_apple_single,
-    FT_RFork_Rule_darwin_ufs_export,
-    FT_RFork_Rule_darwin_newvfs,
-    FT_RFork_Rule_darwin_hfsplus,
-    FT_RFork_Rule_vfat,
-    FT_RFork_Rule_linux_cap,
-    FT_RFork_Rule_linux_double,
-    FT_RFork_Rule_linux_netatalk
-  } FT_RFork_Rule;
-
-  /* For fast translation between rule index and rule type,
-   * the macros FT_RFORK_xxx should be kept consistent with
-   * the raccess_guess_funcs table
-   */
-  typedef struct ft_raccess_guess_rec_ {
-    ft_raccess_guess_func  func;
-    FT_RFork_Rule          type;
-  } ft_raccess_guess_rec;
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-  /* this array is a storage in non-PIC mode, so ; is needed in END */
-#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
-          static const type name[] = {
-#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix )  \
-          { raccess_guess_ ## func_suffix,                           \
-            FT_RFork_Rule_ ## type_suffix },
-#define CONST_FT_RFORK_RULE_ARRAY_END  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-  /* this array is a function in PIC mode, so no ; is needed in END */
-#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
-          void                                         \
-          FT_Init_Table_ ## name( type*  storage )     \
-          {                                            \
-            type*  local = storage;                    \
-                                                       \
-                                                       \
-            int  i = 0;
-#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix )  \
-          local[i].func = raccess_guess_ ## func_suffix;             \
-          local[i].type = FT_RFork_Rule_ ## type_suffix;             \
-          i++;
-#define CONST_FT_RFORK_RULE_ARRAY_END  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Raccess_Guess                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Guess a file name and offset where the actual resource fork is     */
-  /*    stored.  The macro FT_RACCESS_N_RULES holds the number of          */
-  /*    guessing rules;  the guessed result for the Nth rule is            */
-  /*    represented as a triplet: a new file name (new_names[N]), a file   */
-  /*    offset (offsets[N]), and an error code (errors[N]).                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library ::                                                         */
-  /*      A FreeType library instance.                                     */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      A file stream containing the resource fork.                      */
-  /*                                                                       */
-  /*    base_name ::                                                       */
-  /*      The (base) file name of the resource fork used for some          */
-  /*      guessing rules.                                                  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    new_names ::                                                       */
-  /*      An array of guessed file names in which the resource forks may   */
-  /*      exist.  If `new_names[N]' is NULL, the guessed file name is      */
-  /*      equal to `base_name'.                                            */
-  /*                                                                       */
-  /*    offsets ::                                                         */
-  /*      An array of guessed file offsets.  `offsets[N]' holds the file   */
-  /*      offset of the possible start of the resource fork in file        */
-  /*      `new_names[N]'.                                                  */
-  /*                                                                       */
-  /*    errors ::                                                          */
-  /*      An array of FreeType error codes.  `errors[N]' is the error      */
-  /*      code of Nth guessing rule function.  If `errors[N]' is not       */
-  /*      FT_Err_Ok, `new_names[N]' and `offsets[N]' are meaningless.      */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Raccess_Guess( FT_Library  library,
-                    FT_Stream   stream,
-                    char*       base_name,
-                    char**      new_names,
-                    FT_Long*    offsets,
-                    FT_Error*   errors );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Raccess_Get_HeaderInfo                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the information from the header of resource fork.  The         */
-  /*    information includes the file offset where the resource map        */
-  /*    starts, and the file offset where the resource data starts.        */
-  /*    `FT_Raccess_Get_DataOffsets' requires these two data.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library ::                                                         */
-  /*      A FreeType library instance.                                     */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      A file stream containing the resource fork.                      */
-  /*                                                                       */
-  /*    rfork_offset ::                                                    */
-  /*      The file offset where the resource fork starts.                  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    map_offset ::                                                      */
-  /*      The file offset where the resource map starts.                   */
-  /*                                                                       */
-  /*    rdata_pos ::                                                       */
-  /*      The file offset where the resource data starts.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  FT_Err_Ok means success.                     */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_Raccess_Get_HeaderInfo( FT_Library  library,
-                             FT_Stream   stream,
-                             FT_Long     rfork_offset,
-                             FT_Long    *map_offset,
-                             FT_Long    *rdata_pos );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Raccess_Get_DataOffsets                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the data offsets for a tag in a resource fork.  Offsets are    */
-  /*    stored in an array because, in some cases, resources in a resource */
-  /*    fork have the same tag.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library ::                                                         */
-  /*      A FreeType library instance.                                     */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      A file stream containing the resource fork.                      */
-  /*                                                                       */
-  /*    map_offset ::                                                      */
-  /*      The file offset where the resource map starts.                   */
-  /*                                                                       */
-  /*    rdata_pos ::                                                       */
-  /*      The file offset where the resource data starts.                  */
-  /*                                                                       */
-  /*    tag ::                                                             */
-  /*      The resource tag.                                                */
-  /*                                                                       */
-  /*    sort_by_res_id ::                                                  */
-  /*      A Boolean to sort the fragmented resource by their ids.          */
-  /*      The fragmented resources for `POST' resource should be sorted    */
-  /*      to restore Type1 font properly.  For `sfnt' resources, sorting   */
-  /*      may induce a different order of the faces in comparison to that  */
-  /*      by QuickDraw API.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    offsets ::                                                         */
-  /*      The stream offsets for the resource data specified by `tag'.     */
-  /*      This array is allocated by the function, so you have to call     */
-  /*      @ft_mem_free after use.                                          */
-  /*                                                                       */
-  /*    count ::                                                           */
-  /*      The length of offsets array.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  FT_Err_Ok means success.                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Normally you should use `FT_Raccess_Get_HeaderInfo' to get the     */
-  /*    value for `map_offset' and `rdata_pos'.                            */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_Raccess_Get_DataOffsets( FT_Library  library,
-                              FT_Stream   stream,
-                              FT_Long     map_offset,
-                              FT_Long     rdata_pos,
-                              FT_Long     tag,
-                              FT_Bool     sort_by_res_id,
-                              FT_Long   **offsets,
-                              FT_Long    *count );
-
-
-FT_END_HEADER
-
-#endif /* FTRFORK_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftserv.h b/dependencies2013/win32/include/freetype/internal/ftserv.h
deleted file mode 100644
index 91897177..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftserv.h
+++ /dev/null
@@ -1,763 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftserv.h                                                               */
-/*                                                                         */
-/*    The FreeType services (specification only).                          */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Each module can export one or more `services'.  Each service is      */
-  /*  identified by a constant string and modeled by a pointer; the latter */
-  /*  generally corresponds to a structure containing function pointers.   */
-  /*                                                                       */
-  /*  Note that a service's data cannot be a mere function pointer because */
-  /*  in C it is possible that function pointers might be implemented      */
-  /*  differently than data pointers (e.g. 48 bits instead of 32).         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FTSERV_H_
-#define FTSERV_H_
-
-
-FT_BEGIN_HEADER
-
-  /*
-   * @macro:
-   *   FT_FACE_FIND_SERVICE
-   *
-   * @description:
-   *   This macro is used to look up a service from a face's driver module.
-   *
-   * @input:
-   *   face ::
-   *     The source face handle.
-   *
-   *   id ::
-   *     A string describing the service as defined in the service's
-   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
-   *     `multi-masters').  It is automatically prefixed with
-   *     `FT_SERVICE_ID_'.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable that receives the service pointer.  Will be NULL
-   *     if not found.
-   */
-#ifdef __cplusplus
-
-#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
-  FT_BEGIN_STMNT                                                            \
-    FT_Module    module = FT_MODULE( FT_FACE( face )->driver );             \
-    FT_Pointer   _tmp_  = NULL;                                             \
-    FT_Pointer*  _pptr_ = (FT_Pointer*)&(ptr);                              \
-                                                                            \
-                                                                            \
-    if ( module->clazz->get_interface )                                     \
-      _tmp_ = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
-    *_pptr_ = _tmp_;                                                        \
-  FT_END_STMNT
-
-#else /* !C++ */
-
-#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
-  FT_BEGIN_STMNT                                                            \
-    FT_Module   module = FT_MODULE( FT_FACE( face )->driver );              \
-    FT_Pointer  _tmp_  = NULL;                                              \
-                                                                            \
-    if ( module->clazz->get_interface )                                     \
-      _tmp_ = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
-    ptr = _tmp_;                                                            \
-  FT_END_STMNT
-
-#endif /* !C++ */
-
-
-  /*
-   * @macro:
-   *   FT_FACE_FIND_GLOBAL_SERVICE
-   *
-   * @description:
-   *   This macro is used to look up a service from all modules.
-   *
-   * @input:
-   *   face ::
-   *     The source face handle.
-   *
-   *   id ::
-   *     A string describing the service as defined in the service's
-   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
-   *     `multi-masters').  It is automatically prefixed with
-   *     `FT_SERVICE_ID_'.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable that receives the service pointer.  Will be NULL
-   *     if not found.
-   */
-#ifdef __cplusplus
-
-#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
-  FT_BEGIN_STMNT                                                   \
-    FT_Module    module = FT_MODULE( FT_FACE( face )->driver );    \
-    FT_Pointer   _tmp_;                                            \
-    FT_Pointer*  _pptr_ = (FT_Pointer*)&(ptr);                     \
-                                                                   \
-                                                                   \
-    _tmp_ = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
-    *_pptr_ = _tmp_;                                               \
-  FT_END_STMNT
-
-#else /* !C++ */
-
-#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
-  FT_BEGIN_STMNT                                                   \
-    FT_Module   module = FT_MODULE( FT_FACE( face )->driver );     \
-    FT_Pointer  _tmp_;                                             \
-                                                                   \
-                                                                   \
-    _tmp_ = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
-    ptr   = _tmp_;                                                 \
-  FT_END_STMNT
-
-#endif /* !C++ */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****         S E R V I C E   D E S C R I P T O R S                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   *  The following structure is used to _describe_ a given service
-   *  to the library.  This is useful to build simple static service lists.
-   */
-  typedef struct  FT_ServiceDescRec_
-  {
-    const char*  serv_id;     /* service name         */
-    const void*  serv_data;   /* service pointer/data */
-
-  } FT_ServiceDescRec;
-
-  typedef const FT_ServiceDescRec*  FT_ServiceDesc;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_DEFINE_SERVICEDESCREC1                                          */
-  /*    FT_DEFINE_SERVICEDESCREC2                                          */
-  /*    FT_DEFINE_SERVICEDESCREC3                                          */
-  /*    FT_DEFINE_SERVICEDESCREC4                                          */
-  /*    FT_DEFINE_SERVICEDESCREC5                                          */
-  /*    FT_DEFINE_SERVICEDESCREC6                                          */
-  /*    FT_DEFINE_SERVICEDESCREC7                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Used to initialize an array of FT_ServiceDescRec structures.       */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function needs to  */
-  /*    be called with a pointer to return an allocated array.  As soon as */
-  /*    it is no longer needed, a `destroy' function needs to be called to */
-  /*    release that allocation.                                           */
-  /*                                                                       */
-  /*    These functions should be manually called from the `pic_init' and  */
-  /*    `pic_free' functions of your module (see FT_DEFINE_MODULE).        */
-  /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is not defined the array will be         */
-  /*    allocated in the global scope (or the scope where the macro is     */
-  /*    used).                                                             */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
-                                   serv_id_1, serv_data_1 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { serv_id_5, serv_data_5 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { serv_id_5, serv_data_5 },                                             \
-    { serv_id_6, serv_data_6 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#define FT_DEFINE_SERVICEDESCREC7( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6,                  \
-                                   serv_id_7, serv_data_7 )                 \
-  static const FT_ServiceDescRec  class_[] =                                \
-  {                                                                         \
-    { serv_id_1, serv_data_1 },                                             \
-    { serv_id_2, serv_data_2 },                                             \
-    { serv_id_3, serv_data_3 },                                             \
-    { serv_id_4, serv_data_4 },                                             \
-    { serv_id_5, serv_data_5 },                                             \
-    { serv_id_6, serv_data_6 },                                             \
-    { serv_id_7, serv_data_7 },                                             \
-    { NULL, NULL }                                                          \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
-                                   serv_id_1, serv_data_1 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 2 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = NULL;                                              \
-    clazz[1].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 3 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = NULL;                                              \
-    clazz[2].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 4 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = NULL;                                              \
-    clazz[3].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 5 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = NULL;                                              \
-    clazz[4].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class )           \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 6 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = serv_id_5;                                         \
-    clazz[4].serv_data = serv_data_5;                                       \
-    clazz[5].serv_id   = NULL;                                              \
-    clazz[5].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class)            \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 7 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = serv_id_5;                                         \
-    clazz[4].serv_data = serv_data_5;                                       \
-    clazz[5].serv_id   = serv_id_6;                                         \
-    clazz[5].serv_data = serv_data_6;                                       \
-    clazz[6].serv_id   = NULL;                                              \
-    clazz[6].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#define FT_DEFINE_SERVICEDESCREC7( class_,                                  \
-                                   serv_id_1, serv_data_1,                  \
-                                   serv_id_2, serv_data_2,                  \
-                                   serv_id_3, serv_data_3,                  \
-                                   serv_id_4, serv_data_4,                  \
-                                   serv_id_5, serv_data_5,                  \
-                                   serv_id_6, serv_data_6,                  \
-                                   serv_id_7, serv_data_7 )                 \
-  void                                                                      \
-  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
-                               FT_ServiceDescRec*  clazz )                  \
-  {                                                                         \
-    FT_Memory  memory = library->memory;                                    \
-                                                                            \
-                                                                            \
-    if ( clazz )                                                            \
-      FT_FREE( clazz );                                                     \
-  }                                                                         \
-                                                                            \
-  FT_Error                                                                  \
-  FT_Create_Class_ ## class_( FT_Library           library,                 \
-                              FT_ServiceDescRec**  output_class)            \
-  {                                                                         \
-    FT_ServiceDescRec*  clazz  = NULL;                                      \
-    FT_Error            error;                                              \
-    FT_Memory           memory = library->memory;                           \
-                                                                            \
-                                                                            \
-    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 8 ) )                         \
-      return error;                                                         \
-                                                                            \
-    clazz[0].serv_id   = serv_id_1;                                         \
-    clazz[0].serv_data = serv_data_1;                                       \
-    clazz[1].serv_id   = serv_id_2;                                         \
-    clazz[1].serv_data = serv_data_2;                                       \
-    clazz[2].serv_id   = serv_id_3;                                         \
-    clazz[2].serv_data = serv_data_3;                                       \
-    clazz[3].serv_id   = serv_id_4;                                         \
-    clazz[3].serv_data = serv_data_4;                                       \
-    clazz[4].serv_id   = serv_id_5;                                         \
-    clazz[4].serv_data = serv_data_5;                                       \
-    clazz[5].serv_id   = serv_id_6;                                         \
-    clazz[5].serv_data = serv_data_6;                                       \
-    clazz[6].serv_id   = serv_id_7;                                         \
-    clazz[6].serv_data = serv_data_7;                                       \
-    clazz[7].serv_id   = NULL;                                              \
-    clazz[7].serv_data = NULL;                                              \
-                                                                            \
-    *output_class = clazz;                                                  \
-                                                                            \
-    return FT_Err_Ok;                                                       \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-  /*
-   *  Parse a list of FT_ServiceDescRec descriptors and look for
-   *  a specific service by ID.  Note that the last element in the
-   *  array must be { NULL, NULL }, and that the function should
-   *  return NULL if the service isn't available.
-   *
-   *  This function can be used by modules to implement their
-   *  `get_service' method.
-   */
-  FT_BASE( FT_Pointer )
-  ft_service_list_lookup( FT_ServiceDesc  service_descriptors,
-                          const char*     service_id );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****             S E R V I C E S   C A C H E                       *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   *  This structure is used to store a cache for several frequently used
-   *  services.  It is the type of `face->internal->services'.  You
-   *  should only use FT_FACE_LOOKUP_SERVICE to access it.
-   *
-   *  All fields should have the type FT_Pointer to relax compilation
-   *  dependencies.  We assume the developer isn't completely stupid.
-   *
-   *  Each field must be named `service_XXXX' where `XXX' corresponds to
-   *  the correct FT_SERVICE_ID_XXXX macro.  See the definition of
-   *  FT_FACE_LOOKUP_SERVICE below how this is implemented.
-   *
-   */
-  typedef struct  FT_ServiceCacheRec_
-  {
-    FT_Pointer  service_POSTSCRIPT_FONT_NAME;
-    FT_Pointer  service_MULTI_MASTERS;
-    FT_Pointer  service_GLYPH_DICT;
-    FT_Pointer  service_PFR_METRICS;
-    FT_Pointer  service_WINFNT;
-
-  } FT_ServiceCacheRec, *FT_ServiceCache;
-
-
-  /*
-   *  A magic number used within the services cache.
-   */
-
-  /* ensure that value `1' has the same width as a pointer */
-#define FT_SERVICE_UNAVAILABLE  ((FT_Pointer)~(FT_PtrDist)1)
-
-
-  /*
-   * @macro:
-   *   FT_FACE_LOOKUP_SERVICE
-   *
-   * @description:
-   *   This macro is used to lookup a service from a face's driver module
-   *   using its cache.
-   *
-   * @input:
-   *   face::
-   *     The source face handle containing the cache.
-   *
-   *   field ::
-   *     The field name in the cache.
-   *
-   *   id ::
-   *     The service ID.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable receiving the service data.  NULL if not available.
-   */
-#ifdef __cplusplus
-
-#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                \
-  FT_BEGIN_STMNT                                               \
-    FT_Pointer   svc;                                          \
-    FT_Pointer*  Pptr = (FT_Pointer*)&(ptr);                   \
-                                                               \
-                                                               \
-    svc = FT_FACE( face )->internal->services. service_ ## id; \
-    if ( svc == FT_SERVICE_UNAVAILABLE )                       \
-      svc = NULL;                                              \
-    else if ( svc == NULL )                                    \
-    {                                                          \
-      FT_FACE_FIND_SERVICE( face, svc, id );                   \
-                                                               \
-      FT_FACE( face )->internal->services. service_ ## id =    \
-        (FT_Pointer)( svc != NULL ? svc                        \
-                                  : FT_SERVICE_UNAVAILABLE );  \
-    }                                                          \
-    *Pptr = svc;                                               \
-  FT_END_STMNT
-
-#else /* !C++ */
-
-#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                \
-  FT_BEGIN_STMNT                                               \
-    FT_Pointer  svc;                                           \
-                                                               \
-                                                               \
-    svc = FT_FACE( face )->internal->services. service_ ## id; \
-    if ( svc == FT_SERVICE_UNAVAILABLE )                       \
-      svc = NULL;                                              \
-    else if ( svc == NULL )                                    \
-    {                                                          \
-      FT_FACE_FIND_SERVICE( face, svc, id );                   \
-                                                               \
-      FT_FACE( face )->internal->services. service_ ## id =    \
-        (FT_Pointer)( svc != NULL ? svc                        \
-                                  : FT_SERVICE_UNAVAILABLE );  \
-    }                                                          \
-    ptr = svc;                                                 \
-  FT_END_STMNT
-
-#endif /* !C++ */
-
-  /*
-   *  A macro used to define new service structure types.
-   */
-
-#define FT_DEFINE_SERVICE( name )            \
-  typedef struct FT_Service_ ## name ## Rec_ \
-    FT_Service_ ## name ## Rec ;             \
-  typedef struct FT_Service_ ## name ## Rec_ \
-    const * FT_Service_ ## name ;            \
-  struct FT_Service_ ## name ## Rec_
-
-  /* */
-
-  /*
-   *  The header files containing the services.
-   */
-
-#define FT_SERVICE_BDF_H                <freetype/internal/services/svbdf.h>
-#define FT_SERVICE_CID_H                <freetype/internal/services/svcid.h>
-#define FT_SERVICE_GLYPH_DICT_H         <freetype/internal/services/svgldict.h>
-#define FT_SERVICE_GX_VALIDATE_H        <freetype/internal/services/svgxval.h>
-#define FT_SERVICE_KERNING_H            <freetype/internal/services/svkern.h>
-#define FT_SERVICE_MULTIPLE_MASTERS_H   <freetype/internal/services/svmm.h>
-#define FT_SERVICE_OPENTYPE_VALIDATE_H  <freetype/internal/services/svotval.h>
-#define FT_SERVICE_PFR_H                <freetype/internal/services/svpfr.h>
-#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <freetype/internal/services/svpscmap.h>
-#define FT_SERVICE_POSTSCRIPT_INFO_H    <freetype/internal/services/svpsinfo.h>
-#define FT_SERVICE_POSTSCRIPT_NAME_H    <freetype/internal/services/svpostnm.h>
-#define FT_SERVICE_PROPERTIES_H         <freetype/internal/services/svprop.h>
-#define FT_SERVICE_SFNT_H               <freetype/internal/services/svsfnt.h>
-#define FT_SERVICE_TRUETYPE_ENGINE_H    <freetype/internal/services/svtteng.h>
-#define FT_SERVICE_TT_CMAP_H            <freetype/internal/services/svttcmap.h>
-#define FT_SERVICE_WINFNT_H             <freetype/internal/services/svwinfnt.h>
-#define FT_SERVICE_FONT_FORMAT_H        <freetype/internal/services/svfntfmt.h>
-#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype/internal/services/svttglyf.h>
-
- /* */
-
-FT_END_HEADER
-
-#endif /* FTSERV_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftstream.h b/dependencies2013/win32/include/freetype/internal/ftstream.h
deleted file mode 100644
index 6d048756..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftstream.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstream.h                                                             */
-/*                                                                         */
-/*    Stream handling (specification).                                     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTSTREAM_H_
-#define FTSTREAM_H_
-
-
-#include <ft2build.h>
-#include FT_SYSTEM_H
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* format of an 8-bit frame_op value:           */
-  /*                                              */
-  /* bit  76543210                                */
-  /*      xxxxxxes                                */
-  /*                                              */
-  /* s is set to 1 if the value is signed.        */
-  /* e is set to 1 if the value is little-endian. */
-  /* xxx is a command.                            */
-
-#define FT_FRAME_OP_SHIFT         2
-#define FT_FRAME_OP_SIGNED        1
-#define FT_FRAME_OP_LITTLE        2
-#define FT_FRAME_OP_COMMAND( x )  ( x >> FT_FRAME_OP_SHIFT )
-
-#define FT_MAKE_FRAME_OP( command, little, sign ) \
-          ( ( command << FT_FRAME_OP_SHIFT ) | ( little << 1 ) | sign )
-
-#define FT_FRAME_OP_END    0
-#define FT_FRAME_OP_START  1  /* start a new frame     */
-#define FT_FRAME_OP_BYTE   2  /* read 1-byte value     */
-#define FT_FRAME_OP_SHORT  3  /* read 2-byte value     */
-#define FT_FRAME_OP_LONG   4  /* read 4-byte value     */
-#define FT_FRAME_OP_OFF3   5  /* read 3-byte value     */
-#define FT_FRAME_OP_BYTES  6  /* read a bytes sequence */
-
-
-  typedef enum  FT_Frame_Op_
-  {
-    ft_frame_end       = 0,
-    ft_frame_start     = FT_MAKE_FRAME_OP( FT_FRAME_OP_START, 0, 0 ),
-
-    ft_frame_byte      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 0 ),
-    ft_frame_schar     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 1 ),
-
-    ft_frame_ushort_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 0 ),
-    ft_frame_short_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 1 ),
-    ft_frame_ushort_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 0 ),
-    ft_frame_short_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 1 ),
-
-    ft_frame_ulong_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 0 ),
-    ft_frame_long_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 1 ),
-    ft_frame_ulong_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 0 ),
-    ft_frame_long_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 1 ),
-
-    ft_frame_uoff3_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 0 ),
-    ft_frame_off3_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 1 ),
-    ft_frame_uoff3_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 0 ),
-    ft_frame_off3_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 1 ),
-
-    ft_frame_bytes     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 0 ),
-    ft_frame_skip      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 1 )
-
-  } FT_Frame_Op;
-
-
-  typedef struct  FT_Frame_Field_
-  {
-    FT_Byte    value;
-    FT_Byte    size;
-    FT_UShort  offset;
-
-  } FT_Frame_Field;
-
-
-  /* Construct an FT_Frame_Field out of a structure type and a field name. */
-  /* The structure type must be set in the FT_STRUCTURE macro before       */
-  /* calling the FT_FRAME_START() macro.                                   */
-  /*                                                                       */
-#define FT_FIELD_SIZE( f ) \
-          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f )
-
-#define FT_FIELD_SIZE_DELTA( f ) \
-          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f[0] )
-
-#define FT_FIELD_OFFSET( f ) \
-          (FT_UShort)( offsetof( FT_STRUCTURE, f ) )
-
-#define FT_FRAME_FIELD( frame_op, field ) \
-          {                               \
-            frame_op,                     \
-            FT_FIELD_SIZE( field ),       \
-            FT_FIELD_OFFSET( field )      \
-          }
-
-#define FT_MAKE_EMPTY_FIELD( frame_op )  { frame_op, 0, 0 }
-
-#define FT_FRAME_START( size )   { ft_frame_start, 0, size }
-#define FT_FRAME_END             { ft_frame_end, 0, 0 }
-
-#define FT_FRAME_LONG( f )       FT_FRAME_FIELD( ft_frame_long_be, f )
-#define FT_FRAME_ULONG( f )      FT_FRAME_FIELD( ft_frame_ulong_be, f )
-#define FT_FRAME_SHORT( f )      FT_FRAME_FIELD( ft_frame_short_be, f )
-#define FT_FRAME_USHORT( f )     FT_FRAME_FIELD( ft_frame_ushort_be, f )
-#define FT_FRAME_OFF3( f )       FT_FRAME_FIELD( ft_frame_off3_be, f )
-#define FT_FRAME_UOFF3( f )      FT_FRAME_FIELD( ft_frame_uoff3_be, f )
-#define FT_FRAME_BYTE( f )       FT_FRAME_FIELD( ft_frame_byte, f )
-#define FT_FRAME_CHAR( f )       FT_FRAME_FIELD( ft_frame_schar, f )
-
-#define FT_FRAME_LONG_LE( f )    FT_FRAME_FIELD( ft_frame_long_le, f )
-#define FT_FRAME_ULONG_LE( f )   FT_FRAME_FIELD( ft_frame_ulong_le, f )
-#define FT_FRAME_SHORT_LE( f )   FT_FRAME_FIELD( ft_frame_short_le, f )
-#define FT_FRAME_USHORT_LE( f )  FT_FRAME_FIELD( ft_frame_ushort_le, f )
-#define FT_FRAME_OFF3_LE( f )    FT_FRAME_FIELD( ft_frame_off3_le, f )
-#define FT_FRAME_UOFF3_LE( f )   FT_FRAME_FIELD( ft_frame_uoff3_le, f )
-
-#define FT_FRAME_SKIP_LONG       { ft_frame_long_be, 0, 0 }
-#define FT_FRAME_SKIP_SHORT      { ft_frame_short_be, 0, 0 }
-#define FT_FRAME_SKIP_BYTE       { ft_frame_byte, 0, 0 }
-
-#define FT_FRAME_BYTES( field, count ) \
-          {                            \
-            ft_frame_bytes,            \
-            count,                     \
-            FT_FIELD_OFFSET( field )   \
-          }
-
-#define FT_FRAME_SKIP_BYTES( count )  { ft_frame_skip, count, 0 }
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Integer extraction macros -- the `buffer' parameter must ALWAYS be of */
-  /* type `char*' or equivalent (1-byte elements).                         */
-  /*                                                                       */
-
-#define FT_BYTE_( p, i )  ( ((const FT_Byte*)(p))[(i)] )
-
-#define FT_INT16( x )   ( (FT_Int16)(x)  )
-#define FT_UINT16( x )  ( (FT_UInt16)(x) )
-#define FT_INT32( x )   ( (FT_Int32)(x)  )
-#define FT_UINT32( x )  ( (FT_UInt32)(x) )
-
-
-#define FT_BYTE_U16( p, i, s )  ( FT_UINT16( FT_BYTE_( p, i ) ) << (s) )
-#define FT_BYTE_U32( p, i, s )  ( FT_UINT32( FT_BYTE_( p, i ) ) << (s) )
-
-
-#define FT_PEEK_SHORT( p )  FT_INT16( FT_BYTE_U16( p, 0, 8) | \
-                                      FT_BYTE_U16( p, 1, 0) )
-
-#define FT_PEEK_USHORT( p )  FT_UINT16( FT_BYTE_U16( p, 0, 8 ) | \
-                                        FT_BYTE_U16( p, 1, 0 ) )
-
-#define FT_PEEK_LONG( p )  FT_INT32( FT_BYTE_U32( p, 0, 24 ) | \
-                                     FT_BYTE_U32( p, 1, 16 ) | \
-                                     FT_BYTE_U32( p, 2,  8 ) | \
-                                     FT_BYTE_U32( p, 3,  0 ) )
-
-#define FT_PEEK_ULONG( p )  FT_UINT32( FT_BYTE_U32( p, 0, 24 ) | \
-                                       FT_BYTE_U32( p, 1, 16 ) | \
-                                       FT_BYTE_U32( p, 2,  8 ) | \
-                                       FT_BYTE_U32( p, 3,  0 ) )
-
-#define FT_PEEK_OFF3( p )  FT_INT32( FT_BYTE_U32( p, 0, 16 ) | \
-                                     FT_BYTE_U32( p, 1,  8 ) | \
-                                     FT_BYTE_U32( p, 2,  0 ) )
-
-#define FT_PEEK_UOFF3( p )  FT_UINT32( FT_BYTE_U32( p, 0, 16 ) | \
-                                       FT_BYTE_U32( p, 1,  8 ) | \
-                                       FT_BYTE_U32( p, 2,  0 ) )
-
-#define FT_PEEK_SHORT_LE( p )  FT_INT16( FT_BYTE_U16( p, 1, 8 ) | \
-                                         FT_BYTE_U16( p, 0, 0 ) )
-
-#define FT_PEEK_USHORT_LE( p )  FT_UINT16( FT_BYTE_U16( p, 1, 8 ) |  \
-                                           FT_BYTE_U16( p, 0, 0 ) )
-
-#define FT_PEEK_LONG_LE( p )  FT_INT32( FT_BYTE_U32( p, 3, 24 ) | \
-                                        FT_BYTE_U32( p, 2, 16 ) | \
-                                        FT_BYTE_U32( p, 1,  8 ) | \
-                                        FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_ULONG_LE( p )  FT_UINT32( FT_BYTE_U32( p, 3, 24 ) | \
-                                          FT_BYTE_U32( p, 2, 16 ) | \
-                                          FT_BYTE_U32( p, 1,  8 ) | \
-                                          FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_OFF3_LE( p )  FT_INT32( FT_BYTE_U32( p, 2, 16 ) | \
-                                        FT_BYTE_U32( p, 1,  8 ) | \
-                                        FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_UOFF3_LE( p )  FT_UINT32( FT_BYTE_U32( p, 2, 16 ) | \
-                                          FT_BYTE_U32( p, 1,  8 ) | \
-                                          FT_BYTE_U32( p, 0,  0 ) )
-
-
-#define FT_NEXT_CHAR( buffer )       \
-          ( (signed char)*buffer++ )
-
-#define FT_NEXT_BYTE( buffer )         \
-          ( (unsigned char)*buffer++ )
-
-#define FT_NEXT_SHORT( buffer )                                   \
-          ( (short)( buffer += 2, FT_PEEK_SHORT( buffer - 2 ) ) )
-
-#define FT_NEXT_USHORT( buffer )                                            \
-          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT( buffer - 2 ) ) )
-
-#define FT_NEXT_OFF3( buffer )                                  \
-          ( (long)( buffer += 3, FT_PEEK_OFF3( buffer - 3 ) ) )
-
-#define FT_NEXT_UOFF3( buffer )                                           \
-          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3( buffer - 3 ) ) )
-
-#define FT_NEXT_LONG( buffer )                                  \
-          ( (long)( buffer += 4, FT_PEEK_LONG( buffer - 4 ) ) )
-
-#define FT_NEXT_ULONG( buffer )                                           \
-          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG( buffer - 4 ) ) )
-
-
-#define FT_NEXT_SHORT_LE( buffer )                                   \
-          ( (short)( buffer += 2, FT_PEEK_SHORT_LE( buffer - 2 ) ) )
-
-#define FT_NEXT_USHORT_LE( buffer )                                            \
-          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT_LE( buffer - 2 ) ) )
-
-#define FT_NEXT_OFF3_LE( buffer )                                  \
-          ( (long)( buffer += 3, FT_PEEK_OFF3_LE( buffer - 3 ) ) )
-
-#define FT_NEXT_UOFF3_LE( buffer )                                           \
-          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3_LE( buffer - 3 ) ) )
-
-#define FT_NEXT_LONG_LE( buffer )                                  \
-          ( (long)( buffer += 4, FT_PEEK_LONG_LE( buffer - 4 ) ) )
-
-#define FT_NEXT_ULONG_LE( buffer )                                           \
-          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG_LE( buffer - 4 ) ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Each GET_xxxx() macro uses an implicit `stream' variable.             */
-  /*                                                                       */
-#if 0
-#define FT_GET_MACRO( type )    FT_NEXT_ ## type ( stream->cursor )
-
-#define FT_GET_CHAR()       FT_GET_MACRO( CHAR )
-#define FT_GET_BYTE()       FT_GET_MACRO( BYTE )
-#define FT_GET_SHORT()      FT_GET_MACRO( SHORT )
-#define FT_GET_USHORT()     FT_GET_MACRO( USHORT )
-#define FT_GET_OFF3()       FT_GET_MACRO( OFF3 )
-#define FT_GET_UOFF3()      FT_GET_MACRO( UOFF3 )
-#define FT_GET_LONG()       FT_GET_MACRO( LONG )
-#define FT_GET_ULONG()      FT_GET_MACRO( ULONG )
-#define FT_GET_TAG4()       FT_GET_MACRO( ULONG )
-
-#define FT_GET_SHORT_LE()   FT_GET_MACRO( SHORT_LE )
-#define FT_GET_USHORT_LE()  FT_GET_MACRO( USHORT_LE )
-#define FT_GET_LONG_LE()    FT_GET_MACRO( LONG_LE )
-#define FT_GET_ULONG_LE()   FT_GET_MACRO( ULONG_LE )
-
-#else
-#define FT_GET_MACRO( func, type )        ( (type)func( stream ) )
-
-#define FT_GET_CHAR()       FT_GET_MACRO( FT_Stream_GetChar, FT_Char )
-#define FT_GET_BYTE()       FT_GET_MACRO( FT_Stream_GetChar, FT_Byte )
-#define FT_GET_SHORT()      FT_GET_MACRO( FT_Stream_GetUShort, FT_Short )
-#define FT_GET_USHORT()     FT_GET_MACRO( FT_Stream_GetUShort, FT_UShort )
-#define FT_GET_OFF3()       FT_GET_MACRO( FT_Stream_GetUOffset, FT_Long )
-#define FT_GET_UOFF3()      FT_GET_MACRO( FT_Stream_GetUOffset, FT_ULong )
-#define FT_GET_LONG()       FT_GET_MACRO( FT_Stream_GetULong, FT_Long )
-#define FT_GET_ULONG()      FT_GET_MACRO( FT_Stream_GetULong, FT_ULong )
-#define FT_GET_TAG4()       FT_GET_MACRO( FT_Stream_GetULong, FT_ULong )
-
-#define FT_GET_SHORT_LE()   FT_GET_MACRO( FT_Stream_GetUShortLE, FT_Short )
-#define FT_GET_USHORT_LE()  FT_GET_MACRO( FT_Stream_GetUShortLE, FT_UShort )
-#define FT_GET_LONG_LE()    FT_GET_MACRO( FT_Stream_GetULongLE, FT_Long )
-#define FT_GET_ULONG_LE()   FT_GET_MACRO( FT_Stream_GetULongLE, FT_ULong )
-#endif
-
-#define FT_READ_MACRO( func, type, var )        \
-          ( var = (type)func( stream, &error ), \
-            error != FT_Err_Ok )
-
-#define FT_READ_BYTE( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Byte, var )
-#define FT_READ_CHAR( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Char, var )
-#define FT_READ_SHORT( var )      FT_READ_MACRO( FT_Stream_ReadUShort, FT_Short, var )
-#define FT_READ_USHORT( var )     FT_READ_MACRO( FT_Stream_ReadUShort, FT_UShort, var )
-#define FT_READ_OFF3( var )       FT_READ_MACRO( FT_Stream_ReadUOffset, FT_Long, var )
-#define FT_READ_UOFF3( var )      FT_READ_MACRO( FT_Stream_ReadUOffset, FT_ULong, var )
-#define FT_READ_LONG( var )       FT_READ_MACRO( FT_Stream_ReadULong, FT_Long, var )
-#define FT_READ_ULONG( var )      FT_READ_MACRO( FT_Stream_ReadULong, FT_ULong, var )
-
-#define FT_READ_SHORT_LE( var )   FT_READ_MACRO( FT_Stream_ReadUShortLE, FT_Short, var )
-#define FT_READ_USHORT_LE( var )  FT_READ_MACRO( FT_Stream_ReadUShortLE, FT_UShort, var )
-#define FT_READ_LONG_LE( var )    FT_READ_MACRO( FT_Stream_ReadULongLE, FT_Long, var )
-#define FT_READ_ULONG_LE( var )   FT_READ_MACRO( FT_Stream_ReadULongLE, FT_ULong, var )
-
-
-#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
-
-  /* initialize a stream for reading a regular system stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Open( FT_Stream    stream,
-                  const char*  filepathname );
-
-#endif /* FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
-
-
-  /* create a new (input) stream from an FT_Open_Args structure */
-  FT_BASE( FT_Error )
-  FT_Stream_New( FT_Library           library,
-                 const FT_Open_Args*  args,
-                 FT_Stream           *astream );
-
-  /* free a stream */
-  FT_BASE( void )
-  FT_Stream_Free( FT_Stream  stream,
-                  FT_Int     external );
-
-  /* initialize a stream for reading in-memory data */
-  FT_BASE( void )
-  FT_Stream_OpenMemory( FT_Stream       stream,
-                        const FT_Byte*  base,
-                        FT_ULong        size );
-
-  /* close a stream (does not destroy the stream structure) */
-  FT_BASE( void )
-  FT_Stream_Close( FT_Stream  stream );
-
-
-  /* seek within a stream. position is relative to start of stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Seek( FT_Stream  stream,
-                  FT_ULong   pos );
-
-  /* skip bytes in a stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Skip( FT_Stream  stream,
-                  FT_Long    distance );
-
-  /* return current stream position */
-  FT_BASE( FT_ULong )
-  FT_Stream_Pos( FT_Stream  stream );
-
-  /* read bytes from a stream into a user-allocated buffer, returns an */
-  /* error if not all bytes could be read.                             */
-  FT_BASE( FT_Error )
-  FT_Stream_Read( FT_Stream  stream,
-                  FT_Byte*   buffer,
-                  FT_ULong   count );
-
-  /* read bytes from a stream at a given position */
-  FT_BASE( FT_Error )
-  FT_Stream_ReadAt( FT_Stream  stream,
-                    FT_ULong   pos,
-                    FT_Byte*   buffer,
-                    FT_ULong   count );
-
-  /* try to read bytes at the end of a stream; return number of bytes */
-  /* really available                                                 */
-  FT_BASE( FT_ULong )
-  FT_Stream_TryRead( FT_Stream  stream,
-                     FT_Byte*   buffer,
-                     FT_ULong   count );
-
-  /* Enter a frame of `count' consecutive bytes in a stream.  Returns an */
-  /* error if the frame could not be read/accessed.  The caller can use  */
-  /* the FT_Stream_Get_XXX functions to retrieve frame data without      */
-  /* error checks.                                                       */
-  /*                                                                     */
-  /* You must _always_ call FT_Stream_ExitFrame() once you have entered  */
-  /* a stream frame!                                                     */
-  /*                                                                     */
-  FT_BASE( FT_Error )
-  FT_Stream_EnterFrame( FT_Stream  stream,
-                        FT_ULong   count );
-
-  /* exit a stream frame */
-  FT_BASE( void )
-  FT_Stream_ExitFrame( FT_Stream  stream );
-
-  /* Extract a stream frame.  If the stream is disk-based, a heap block */
-  /* is allocated and the frame bytes are read into it.  If the stream  */
-  /* is memory-based, this function simply set a pointer to the data.   */
-  /*                                                                    */
-  /* Useful to optimize access to memory-based streams transparently.   */
-  /*                                                                    */
-  /* All extracted frames must be `freed' with a call to the function   */
-  /* FT_Stream_ReleaseFrame().                                          */
-  /*                                                                    */
-  FT_BASE( FT_Error )
-  FT_Stream_ExtractFrame( FT_Stream  stream,
-                          FT_ULong   count,
-                          FT_Byte**  pbytes );
-
-  /* release an extract frame (see FT_Stream_ExtractFrame) */
-  FT_BASE( void )
-  FT_Stream_ReleaseFrame( FT_Stream  stream,
-                          FT_Byte**  pbytes );
-
-  /* read a byte from an entered frame */
-  FT_BASE( FT_Char )
-  FT_Stream_GetChar( FT_Stream  stream );
-
-  /* read a 16-bit big-endian unsigned integer from an entered frame */
-  FT_BASE( FT_UShort )
-  FT_Stream_GetUShort( FT_Stream  stream );
-
-  /* read a 24-bit big-endian unsigned integer from an entered frame */
-  FT_BASE( FT_ULong )
-  FT_Stream_GetUOffset( FT_Stream  stream );
-
-  /* read a 32-bit big-endian unsigned integer from an entered frame */
-  FT_BASE( FT_ULong )
-  FT_Stream_GetULong( FT_Stream  stream );
-
-  /* read a 16-bit little-endian unsigned integer from an entered frame */
-  FT_BASE( FT_UShort )
-  FT_Stream_GetUShortLE( FT_Stream  stream );
-
-  /* read a 32-bit little-endian unsigned integer from an entered frame */
-  FT_BASE( FT_ULong )
-  FT_Stream_GetULongLE( FT_Stream  stream );
-
-
-  /* read a byte from a stream */
-  FT_BASE( FT_Char )
-  FT_Stream_ReadChar( FT_Stream  stream,
-                      FT_Error*  error );
-
-  /* read a 16-bit big-endian unsigned integer from a stream */
-  FT_BASE( FT_UShort )
-  FT_Stream_ReadUShort( FT_Stream  stream,
-                        FT_Error*  error );
-
-  /* read a 24-bit big-endian unsigned integer from a stream */
-  FT_BASE( FT_ULong )
-  FT_Stream_ReadUOffset( FT_Stream  stream,
-                         FT_Error*  error );
-
-  /* read a 32-bit big-endian integer from a stream */
-  FT_BASE( FT_ULong )
-  FT_Stream_ReadULong( FT_Stream  stream,
-                       FT_Error*  error );
-
-  /* read a 16-bit little-endian unsigned integer from a stream */
-  FT_BASE( FT_UShort )
-  FT_Stream_ReadUShortLE( FT_Stream  stream,
-                          FT_Error*  error );
-
-  /* read a 32-bit little-endian unsigned integer from a stream */
-  FT_BASE( FT_ULong )
-  FT_Stream_ReadULongLE( FT_Stream  stream,
-                         FT_Error*  error );
-
-  /* Read a structure from a stream.  The structure must be described */
-  /* by an array of FT_Frame_Field records.                           */
-  FT_BASE( FT_Error )
-  FT_Stream_ReadFields( FT_Stream              stream,
-                        const FT_Frame_Field*  fields,
-                        void*                  structure );
-
-
-#define FT_STREAM_POS()           \
-          FT_Stream_Pos( stream )
-
-#define FT_STREAM_SEEK( position )                               \
-          FT_SET_ERROR( FT_Stream_Seek( stream,                  \
-                                        (FT_ULong)(position) ) )
-
-#define FT_STREAM_SKIP( distance )                              \
-          FT_SET_ERROR( FT_Stream_Skip( stream,                 \
-                                        (FT_Long)(distance) ) )
-
-#define FT_STREAM_READ( buffer, count )                       \
-          FT_SET_ERROR( FT_Stream_Read( stream,               \
-                                        (FT_Byte*)(buffer),   \
-                                        (FT_ULong)(count) ) )
-
-#define FT_STREAM_READ_AT( position, buffer, count )            \
-          FT_SET_ERROR( FT_Stream_ReadAt( stream,               \
-                                          (FT_ULong)(position), \
-                                          (FT_Byte*)buffer,     \
-                                          (FT_ULong)(count) ) )
-
-#define FT_STREAM_READ_FIELDS( fields, object )                          \
-          FT_SET_ERROR( FT_Stream_ReadFields( stream, fields, object ) )
-
-
-#define FT_FRAME_ENTER( size )                                           \
-          FT_SET_ERROR(                                                  \
-            FT_DEBUG_INNER( FT_Stream_EnterFrame( stream,                \
-                                                  (FT_ULong)(size) ) ) )
-
-#define FT_FRAME_EXIT()                                   \
-          FT_DEBUG_INNER( FT_Stream_ExitFrame( stream ) )
-
-#define FT_FRAME_EXTRACT( size, bytes )                                       \
-          FT_SET_ERROR(                                                       \
-            FT_DEBUG_INNER( FT_Stream_ExtractFrame( stream,                   \
-                                                    (FT_ULong)(size),         \
-                                                    (FT_Byte**)&(bytes) ) ) )
-
-#define FT_FRAME_RELEASE( bytes )                                         \
-          FT_DEBUG_INNER( FT_Stream_ReleaseFrame( stream,                 \
-                                                  (FT_Byte**)&(bytes) ) )
-
-
-FT_END_HEADER
-
-#endif /* FTSTREAM_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/fttrace.h b/dependencies2013/win32/include/freetype/internal/fttrace.h
deleted file mode 100644
index efb33559..00000000
--- a/dependencies2013/win32/include/freetype/internal/fttrace.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttrace.h                                                              */
-/*                                                                         */
-/*    Tracing handling (specification only).                               */
-/*                                                                         */
-/*  Copyright 2002-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /* definitions of trace levels for FreeType 2 */
-
-  /* the first level must always be `trace_any' */
-FT_TRACE_DEF( any )
-
-  /* base components */
-FT_TRACE_DEF( calc )      /* calculations            (ftcalc.c)   */
-FT_TRACE_DEF( memory )    /* memory manager          (ftobjs.c)   */
-FT_TRACE_DEF( stream )    /* stream manager          (ftstream.c) */
-FT_TRACE_DEF( io )        /* i/o interface           (ftsystem.c) */
-FT_TRACE_DEF( list )      /* list management         (ftlist.c)   */
-FT_TRACE_DEF( init )      /* initialization          (ftinit.c)   */
-FT_TRACE_DEF( objs )      /* base objects            (ftobjs.c)   */
-FT_TRACE_DEF( outline )   /* outline management      (ftoutln.c)  */
-FT_TRACE_DEF( glyph )     /* glyph management        (ftglyph.c)  */
-FT_TRACE_DEF( gloader )   /* glyph loader            (ftgloadr.c) */
-
-FT_TRACE_DEF( raster )    /* monochrome rasterizer   (ftraster.c) */
-FT_TRACE_DEF( smooth )    /* anti-aliasing raster    (ftgrays.c)  */
-FT_TRACE_DEF( mm )        /* MM interface            (ftmm.c)     */
-FT_TRACE_DEF( raccess )   /* resource fork accessor  (ftrfork.c)  */
-FT_TRACE_DEF( synth )     /* bold/slant synthesizer  (ftsynth.c)  */
-FT_TRACE_DEF( bitmap )    /* bitmap checksum         (ftobjs.c)   */
-
-  /* Cache sub-system */
-FT_TRACE_DEF( cache )     /* cache sub-system        (ftcache.c, etc.) */
-
-  /* SFNT driver components */
-FT_TRACE_DEF( sfdriver )  /* SFNT font driver        (sfdriver.c) */
-FT_TRACE_DEF( sfobjs )    /* SFNT object handler     (sfobjs.c)   */
-FT_TRACE_DEF( ttcmap )    /* charmap handler         (ttcmap.c)   */
-FT_TRACE_DEF( ttkern )    /* kerning handler         (ttkern.c)   */
-FT_TRACE_DEF( ttload )    /* basic TrueType tables   (ttload.c)   */
-FT_TRACE_DEF( ttmtx )     /* metrics-related tables  (ttmtx.c)    */
-FT_TRACE_DEF( ttpost )    /* PS table processing     (ttpost.c)   */
-FT_TRACE_DEF( ttsbit )    /* TrueType sbit handling  (ttsbit.c)   */
-FT_TRACE_DEF( ttbdf )     /* TrueType embedded BDF   (ttbdf.c)    */
-
-  /* TrueType driver components */
-FT_TRACE_DEF( ttdriver )  /* TT font driver          (ttdriver.c) */
-FT_TRACE_DEF( ttgload )   /* TT glyph loader         (ttgload.c)  */
-FT_TRACE_DEF( ttinterp )  /* bytecode interpreter    (ttinterp.c) */
-FT_TRACE_DEF( ttobjs )    /* TT objects manager      (ttobjs.c)   */
-FT_TRACE_DEF( ttpload )   /* TT data/program loader  (ttpload.c)  */
-FT_TRACE_DEF( ttgxvar )   /* TrueType GX var handler (ttgxvar.c)  */
-
-  /* Type 1 driver components */
-FT_TRACE_DEF( t1afm )
-FT_TRACE_DEF( t1driver )
-FT_TRACE_DEF( t1gload )
-FT_TRACE_DEF( t1hint )
-FT_TRACE_DEF( t1load )
-FT_TRACE_DEF( t1objs )
-FT_TRACE_DEF( t1parse )
-
-  /* PostScript helper module `psaux' */
-FT_TRACE_DEF( t1decode )
-FT_TRACE_DEF( psobjs )
-FT_TRACE_DEF( psconv )
-
-  /* PostScript hinting module `pshinter' */
-FT_TRACE_DEF( pshrec )
-FT_TRACE_DEF( pshalgo1 )
-FT_TRACE_DEF( pshalgo2 )
-
-  /* Type 2 driver components */
-FT_TRACE_DEF( cffdriver )
-FT_TRACE_DEF( cffgload )
-FT_TRACE_DEF( cffload )
-FT_TRACE_DEF( cffobjs )
-FT_TRACE_DEF( cffparse )
-
-FT_TRACE_DEF( cf2blues )
-FT_TRACE_DEF( cf2hints )
-FT_TRACE_DEF( cf2interp )
-
-  /* Type 42 driver component */
-FT_TRACE_DEF( t42 )
-
-  /* CID driver components */
-FT_TRACE_DEF( cidafm )
-FT_TRACE_DEF( ciddriver )
-FT_TRACE_DEF( cidgload )
-FT_TRACE_DEF( cidload )
-FT_TRACE_DEF( cidobjs )
-FT_TRACE_DEF( cidparse )
-
-  /* Windows font component */
-FT_TRACE_DEF( winfnt )
-
-  /* PCF font components */
-FT_TRACE_DEF( pcfdriver )
-FT_TRACE_DEF( pcfread )
-
-  /* BDF font components */
-FT_TRACE_DEF( bdfdriver )
-FT_TRACE_DEF( bdflib )
-
-  /* PFR font component */
-FT_TRACE_DEF( pfr )
-
-  /* OpenType validation components */
-FT_TRACE_DEF( otvmodule )
-FT_TRACE_DEF( otvcommon )
-FT_TRACE_DEF( otvbase )
-FT_TRACE_DEF( otvgdef )
-FT_TRACE_DEF( otvgpos )
-FT_TRACE_DEF( otvgsub )
-FT_TRACE_DEF( otvjstf )
-FT_TRACE_DEF( otvmath )
-
-  /* TrueTypeGX/AAT validation components */
-FT_TRACE_DEF( gxvmodule )
-FT_TRACE_DEF( gxvcommon )
-FT_TRACE_DEF( gxvfeat )
-FT_TRACE_DEF( gxvmort )
-FT_TRACE_DEF( gxvmorx )
-FT_TRACE_DEF( gxvbsln )
-FT_TRACE_DEF( gxvjust )
-FT_TRACE_DEF( gxvkern )
-FT_TRACE_DEF( gxvopbd )
-FT_TRACE_DEF( gxvtrak )
-FT_TRACE_DEF( gxvprop )
-FT_TRACE_DEF( gxvlcar )
-
-  /* autofit components */
-FT_TRACE_DEF( afmodule )
-FT_TRACE_DEF( afhints )
-FT_TRACE_DEF( afcjk )
-FT_TRACE_DEF( aflatin )
-FT_TRACE_DEF( aflatin2 )
-FT_TRACE_DEF( afwarp )
-FT_TRACE_DEF( afshaper )
-FT_TRACE_DEF( afglobal )
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/ftvalid.h b/dependencies2013/win32/include/freetype/internal/ftvalid.h
deleted file mode 100644
index aac92c9a..00000000
--- a/dependencies2013/win32/include/freetype/internal/ftvalid.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftvalid.h                                                              */
-/*                                                                         */
-/*    FreeType validation support (specification).                         */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FTVALID_H_
-#define FTVALID_H_
-
-#include <ft2build.h>
-#include FT_CONFIG_STANDARD_LIBRARY_H   /* for ft_setjmp and ft_longjmp */
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                    V A L I D A T I O N                          ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* handle to a validation object */
-  typedef struct FT_ValidatorRec_ volatile*  FT_Validator;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* There are three distinct validation levels defined here:              */
-  /*                                                                       */
-  /* FT_VALIDATE_DEFAULT ::                                                */
-  /*   A table that passes this validation level can be used reliably by   */
-  /*   FreeType.  It generally means that all offsets have been checked to */
-  /*   prevent out-of-bound reads, that array counts are correct, etc.     */
-  /*                                                                       */
-  /* FT_VALIDATE_TIGHT ::                                                  */
-  /*   A table that passes this validation level can be used reliably and  */
-  /*   doesn't contain invalid data.  For example, a charmap table that    */
-  /*   returns invalid glyph indices will not pass, even though it can     */
-  /*   be used with FreeType in default mode (the library will simply      */
-  /*   return an error later when trying to load the glyph).               */
-  /*                                                                       */
-  /*   It also checks that fields which must be a multiple of 2, 4, or 8,  */
-  /*   don't have incorrect values, etc.                                   */
-  /*                                                                       */
-  /* FT_VALIDATE_PARANOID ::                                               */
-  /*   Only for font debugging.  Checks that a table follows the           */
-  /*   specification by 100%.  Very few fonts will be able to pass this    */
-  /*   level anyway but it can be useful for certain tools like font       */
-  /*   editors/converters.                                                 */
-  /*                                                                       */
-  typedef enum  FT_ValidationLevel_
-  {
-    FT_VALIDATE_DEFAULT = 0,
-    FT_VALIDATE_TIGHT,
-    FT_VALIDATE_PARANOID
-
-  } FT_ValidationLevel;
-
-
-#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
-  /* We disable the warning `structure was padded due to   */
-  /* __declspec(align())' in order to compile cleanly with */
-  /* the maximum level of warnings.                        */
-#pragma warning( push )
-#pragma warning( disable : 4324 )
-#endif /* _MSC_VER */
-
-  /* validator structure */
-  typedef struct  FT_ValidatorRec_
-  {
-    ft_jmp_buf          jump_buffer; /* used for exception handling      */
-
-    const FT_Byte*      base;        /* address of table in memory       */
-    const FT_Byte*      limit;       /* `base' + sizeof(table) in memory */
-    FT_ValidationLevel  level;       /* validation level                 */
-    FT_Error            error;       /* error returned. 0 means success  */
-
-  } FT_ValidatorRec;
-
-#if defined( _MSC_VER )
-#pragma warning( pop )
-#endif
-
-#define FT_VALIDATOR( x )  ( (FT_Validator)( x ) )
-
-
-  FT_BASE( void )
-  ft_validator_init( FT_Validator        valid,
-                     const FT_Byte*      base,
-                     const FT_Byte*      limit,
-                     FT_ValidationLevel  level );
-
-  /* Do not use this. It's broken and will cause your validator to crash */
-  /* if you run it on an invalid font.                                   */
-  FT_BASE( FT_Int )
-  ft_validator_run( FT_Validator  valid );
-
-  /* Sets the error field in a validator, then calls `longjmp' to return */
-  /* to high-level caller.  Using `setjmp/longjmp' avoids many stupid    */
-  /* error checks within the validation routines.                        */
-  /*                                                                     */
-  FT_BASE( void )
-  ft_validator_error( FT_Validator  valid,
-                      FT_Error      error );
-
-
-  /* Calls ft_validate_error.  Assumes that the `valid' local variable */
-  /* holds a pointer to the current validator object.                  */
-  /*                                                                   */
-#define FT_INVALID( _error )  FT_INVALID_( _error )
-#define FT_INVALID_( _error ) \
-          ft_validator_error( valid, FT_THROW( _error ) )
-
-  /* called when a broken table is detected */
-#define FT_INVALID_TOO_SHORT \
-          FT_INVALID( Invalid_Table )
-
-  /* called when an invalid offset is detected */
-#define FT_INVALID_OFFSET \
-          FT_INVALID( Invalid_Offset )
-
-  /* called when an invalid format/value is detected */
-#define FT_INVALID_FORMAT \
-          FT_INVALID( Invalid_Table )
-
-  /* called when an invalid glyph index is detected */
-#define FT_INVALID_GLYPH_ID \
-          FT_INVALID( Invalid_Glyph_Index )
-
-  /* called when an invalid field value is detected */
-#define FT_INVALID_DATA \
-          FT_INVALID( Invalid_Table )
-
-
-FT_END_HEADER
-
-#endif /* FTVALID_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/internal.h b/dependencies2013/win32/include/freetype/internal/internal.h
deleted file mode 100644
index 8c3c14c1..00000000
--- a/dependencies2013/win32/include/freetype/internal/internal.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  internal.h                                                             */
-/*                                                                         */
-/*    Internal header files (specification only).                          */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is automatically included by `ft2build.h'.                  */
-  /* Do not include it manually!                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define FT_INTERNAL_OBJECTS_H             <freetype/internal/ftobjs.h>
-#define FT_INTERNAL_PIC_H                 <freetype/internal/ftpic.h>
-#define FT_INTERNAL_STREAM_H              <freetype/internal/ftstream.h>
-#define FT_INTERNAL_MEMORY_H              <freetype/internal/ftmemory.h>
-#define FT_INTERNAL_DEBUG_H               <freetype/internal/ftdebug.h>
-#define FT_INTERNAL_CALC_H                <freetype/internal/ftcalc.h>
-#define FT_INTERNAL_HASH_H                <freetype/internal/fthash.h>
-#define FT_INTERNAL_DRIVER_H              <freetype/internal/ftdriver.h>
-#define FT_INTERNAL_TRACE_H               <freetype/internal/fttrace.h>
-#define FT_INTERNAL_GLYPH_LOADER_H        <freetype/internal/ftgloadr.h>
-#define FT_INTERNAL_SFNT_H                <freetype/internal/sfnt.h>
-#define FT_INTERNAL_SERVICE_H             <freetype/internal/ftserv.h>
-#define FT_INTERNAL_RFORK_H               <freetype/internal/ftrfork.h>
-#define FT_INTERNAL_VALIDATE_H            <freetype/internal/ftvalid.h>
-
-#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype/internal/tttypes.h>
-#define FT_INTERNAL_TYPE1_TYPES_H         <freetype/internal/t1types.h>
-
-#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype/internal/psaux.h>
-#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype/internal/pshints.h>
-
-#define FT_INTERNAL_AUTOHINT_H            <freetype/internal/autohint.h>
-
-
-#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
-
-  /* We disable the warning `conditional expression is constant' here */
-  /* in order to compile cleanly with the maximum level of warnings.  */
-  /* In particular, the warning complains about stuff like `while(0)' */
-  /* which is very useful in macro definitions.  There is no benefit  */
-  /* in having it enabled.                                            */
-#pragma warning( disable : 4127 )
-
-#endif /* _MSC_VER */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/psaux.h b/dependencies2013/win32/include/freetype/internal/psaux.h
deleted file mode 100644
index 15dedfd2..00000000
--- a/dependencies2013/win32/include/freetype/internal/psaux.h
+++ /dev/null
@@ -1,879 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  psaux.h                                                                */
-/*                                                                         */
-/*    Auxiliary functions and data structures related to PostScript fonts  */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef PSAUX_H_
-#define PSAUX_H_
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-#include FT_INTERNAL_HASH_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                             T1_TABLE                          *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct PS_TableRec_*              PS_Table;
-  typedef const struct PS_Table_FuncsRec_*  PS_Table_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_Table_FuncsRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A set of function pointers to manage PS_Table objects.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    table_init    :: Used to initialize a table.                       */
-  /*                                                                       */
-  /*    table_done    :: Finalizes resp. destroy a given table.            */
-  /*                                                                       */
-  /*    table_add     :: Adds a new object to a table.                     */
-  /*                                                                       */
-  /*    table_release :: Releases table data, then finalizes it.           */
-  /*                                                                       */
-  typedef struct  PS_Table_FuncsRec_
-  {
-    FT_Error
-    (*init)( PS_Table   table,
-             FT_Int     count,
-             FT_Memory  memory );
-
-    void
-    (*done)( PS_Table  table );
-
-    FT_Error
-    (*add)( PS_Table  table,
-            FT_Int    idx,
-            void*     object,
-            FT_UInt   length );
-
-    void
-    (*release)( PS_Table  table );
-
-  } PS_Table_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_TableRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A PS_Table is a simple object used to store an array of objects in */
-  /*    a single memory block.                                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    block     :: The address in memory of the growheap's block.  This  */
-  /*                 can change between two object adds, due to            */
-  /*                 reallocation.                                         */
-  /*                                                                       */
-  /*    cursor    :: The current top of the grow heap within its block.    */
-  /*                                                                       */
-  /*    capacity  :: The current size of the heap block.  Increments by    */
-  /*                 1kByte chunks.                                        */
-  /*                                                                       */
-  /*    init      :: Set to 0xDEADBEEF if `elements' and `lengths' have    */
-  /*                 been allocated.                                       */
-  /*                                                                       */
-  /*    max_elems :: The maximum number of elements in table.              */
-  /*                                                                       */
-  /*    num_elems :: The current number of elements in table.              */
-  /*                                                                       */
-  /*    elements  :: A table of element addresses within the block.        */
-  /*                                                                       */
-  /*    lengths   :: A table of element sizes within the block.            */
-  /*                                                                       */
-  /*    memory    :: The object used for memory operations                 */
-  /*                 (alloc/realloc).                                      */
-  /*                                                                       */
-  /*    funcs     :: A table of method pointers for this object.           */
-  /*                                                                       */
-  typedef struct  PS_TableRec_
-  {
-    FT_Byte*           block;          /* current memory block           */
-    FT_Offset          cursor;         /* current cursor in memory block */
-    FT_Offset          capacity;       /* current size of memory block   */
-    FT_ULong           init;
-
-    FT_Int             max_elems;
-    FT_Int             num_elems;
-    FT_Byte**          elements;       /* addresses of table elements */
-    FT_UInt*           lengths;        /* lengths of table elements   */
-
-    FT_Memory          memory;
-    PS_Table_FuncsRec  funcs;
-
-  } PS_TableRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       T1 FIELDS & TOKENS                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct PS_ParserRec_*  PS_Parser;
-
-  typedef struct T1_TokenRec_*   T1_Token;
-
-  typedef struct T1_FieldRec_*   T1_Field;
-
-
-  /* simple enumeration type used to identify token types */
-  typedef enum  T1_TokenType_
-  {
-    T1_TOKEN_TYPE_NONE = 0,
-    T1_TOKEN_TYPE_ANY,
-    T1_TOKEN_TYPE_STRING,
-    T1_TOKEN_TYPE_ARRAY,
-    T1_TOKEN_TYPE_KEY, /* aka `name' */
-
-    /* do not remove */
-    T1_TOKEN_TYPE_MAX
-
-  } T1_TokenType;
-
-
-  /* a simple structure used to identify tokens */
-  typedef struct  T1_TokenRec_
-  {
-    FT_Byte*      start;   /* first character of token in input stream */
-    FT_Byte*      limit;   /* first character after the token          */
-    T1_TokenType  type;    /* type of token                            */
-
-  } T1_TokenRec;
-
-
-  /* enumeration type used to identify object fields */
-  typedef enum  T1_FieldType_
-  {
-    T1_FIELD_TYPE_NONE = 0,
-    T1_FIELD_TYPE_BOOL,
-    T1_FIELD_TYPE_INTEGER,
-    T1_FIELD_TYPE_FIXED,
-    T1_FIELD_TYPE_FIXED_1000,
-    T1_FIELD_TYPE_STRING,
-    T1_FIELD_TYPE_KEY,
-    T1_FIELD_TYPE_BBOX,
-    T1_FIELD_TYPE_MM_BBOX,
-    T1_FIELD_TYPE_INTEGER_ARRAY,
-    T1_FIELD_TYPE_FIXED_ARRAY,
-    T1_FIELD_TYPE_CALLBACK,
-
-    /* do not remove */
-    T1_FIELD_TYPE_MAX
-
-  } T1_FieldType;
-
-
-  typedef enum  T1_FieldLocation_
-  {
-    T1_FIELD_LOCATION_CID_INFO,
-    T1_FIELD_LOCATION_FONT_DICT,
-    T1_FIELD_LOCATION_FONT_EXTRA,
-    T1_FIELD_LOCATION_FONT_INFO,
-    T1_FIELD_LOCATION_PRIVATE,
-    T1_FIELD_LOCATION_BBOX,
-    T1_FIELD_LOCATION_LOADER,
-    T1_FIELD_LOCATION_FACE,
-    T1_FIELD_LOCATION_BLEND,
-
-    /* do not remove */
-    T1_FIELD_LOCATION_MAX
-
-  } T1_FieldLocation;
-
-
-  typedef void
-  (*T1_Field_ParseFunc)( FT_Face     face,
-                         FT_Pointer  parser );
-
-
-  /* structure type used to model object fields */
-  typedef struct  T1_FieldRec_
-  {
-    const char*         ident;        /* field identifier               */
-    T1_FieldLocation    location;
-    T1_FieldType        type;         /* type of field                  */
-    T1_Field_ParseFunc  reader;
-    FT_UInt             offset;       /* offset of field in object      */
-    FT_Byte             size;         /* size of field in bytes         */
-    FT_UInt             array_max;    /* maximum number of elements for */
-                                      /* array                          */
-    FT_UInt             count_offset; /* offset of element count for    */
-                                      /* arrays; must not be zero if in */
-                                      /* use -- in other words, a       */
-                                      /* `num_FOO' element must not     */
-                                      /* start the used structure if we */
-                                      /* parse a `FOO' array            */
-    FT_UInt             dict;         /* where we expect it             */
-  } T1_FieldRec;
-
-#define T1_FIELD_DICT_FONTDICT ( 1 << 0 ) /* also FontInfo and FDArray */
-#define T1_FIELD_DICT_PRIVATE  ( 1 << 1 )
-
-
-
-#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname, _dict ) \
-          {                                                 \
-            _ident, T1CODE, _type,                          \
-            0,                                              \
-            FT_FIELD_OFFSET( _fname ),                      \
-            FT_FIELD_SIZE( _fname ),                        \
-            0, 0,                                           \
-            _dict                                           \
-          },
-
-#define T1_NEW_CALLBACK_FIELD( _ident, _reader, _dict ) \
-          {                                             \
-            _ident, T1CODE, T1_FIELD_TYPE_CALLBACK,     \
-            (T1_Field_ParseFunc)_reader,                \
-            0, 0,                                       \
-            0, 0,                                       \
-            _dict                                       \
-          },
-
-#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max, _dict ) \
-          {                                                      \
-            _ident, T1CODE, _type,                               \
-            0,                                                   \
-            FT_FIELD_OFFSET( _fname ),                           \
-            FT_FIELD_SIZE_DELTA( _fname ),                       \
-            _max,                                                \
-            FT_FIELD_OFFSET( num_ ## _fname ),                   \
-            _dict                                                \
-          },
-
-#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max, _dict ) \
-          {                                                       \
-            _ident, T1CODE, _type,                                \
-            0,                                                    \
-            FT_FIELD_OFFSET( _fname ),                            \
-            FT_FIELD_SIZE_DELTA( _fname ),                        \
-            _max, 0,                                              \
-            _dict                                                 \
-          },
-
-
-#define T1_FIELD_BOOL( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BOOL, _fname, _dict )
-
-#define T1_FIELD_NUM( _ident, _fname, _dict )                                 \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER, _fname, _dict )
-
-#define T1_FIELD_FIXED( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED, _fname, _dict )
-
-#define T1_FIELD_FIXED_1000( _ident, _fname, _dict )                     \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_1000, _fname, \
-                               _dict )
-
-#define T1_FIELD_STRING( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_STRING, _fname, _dict )
-
-#define T1_FIELD_KEY( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_KEY, _fname, _dict )
-
-#define T1_FIELD_BBOX( _ident, _fname, _dict )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BBOX, _fname, _dict )
-
-
-#define T1_FIELD_NUM_TABLE( _ident, _fname, _fmax, _dict )         \
-          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
-                              _fname, _fmax, _dict )
-
-#define T1_FIELD_FIXED_TABLE( _ident, _fname, _fmax, _dict )     \
-          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
-                              _fname, _fmax, _dict )
-
-#define T1_FIELD_NUM_TABLE2( _ident, _fname, _fmax, _dict )         \
-          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
-                               _fname, _fmax, _dict )
-
-#define T1_FIELD_FIXED_TABLE2( _ident, _fname, _fmax, _dict )     \
-          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
-                               _fname, _fmax, _dict )
-
-#define T1_FIELD_CALLBACK( _ident, _name, _dict )       \
-          T1_NEW_CALLBACK_FIELD( _ident, _name, _dict )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                            T1 PARSER                          *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef const struct PS_Parser_FuncsRec_*  PS_Parser_Funcs;
-
-  typedef struct  PS_Parser_FuncsRec_
-  {
-    void
-    (*init)( PS_Parser  parser,
-             FT_Byte*   base,
-             FT_Byte*   limit,
-             FT_Memory  memory );
-
-    void
-    (*done)( PS_Parser  parser );
-
-    void
-    (*skip_spaces)( PS_Parser  parser );
-    void
-    (*skip_PS_token)( PS_Parser  parser );
-
-    FT_Long
-    (*to_int)( PS_Parser  parser );
-    FT_Fixed
-    (*to_fixed)( PS_Parser  parser,
-                 FT_Int     power_ten );
-
-    FT_Error
-    (*to_bytes)( PS_Parser  parser,
-                 FT_Byte*   bytes,
-                 FT_Offset  max_bytes,
-                 FT_ULong*  pnum_bytes,
-                 FT_Bool    delimiters );
-
-    FT_Int
-    (*to_coord_array)( PS_Parser  parser,
-                       FT_Int     max_coords,
-                       FT_Short*  coords );
-    FT_Int
-    (*to_fixed_array)( PS_Parser  parser,
-                       FT_Int     max_values,
-                       FT_Fixed*  values,
-                       FT_Int     power_ten );
-
-    void
-    (*to_token)( PS_Parser  parser,
-                 T1_Token   token );
-    void
-    (*to_token_array)( PS_Parser  parser,
-                       T1_Token   tokens,
-                       FT_UInt    max_tokens,
-                       FT_Int*    pnum_tokens );
-
-    FT_Error
-    (*load_field)( PS_Parser       parser,
-                   const T1_Field  field,
-                   void**          objects,
-                   FT_UInt         max_objects,
-                   FT_ULong*       pflags );
-
-    FT_Error
-    (*load_field_table)( PS_Parser       parser,
-                         const T1_Field  field,
-                         void**          objects,
-                         FT_UInt         max_objects,
-                         FT_ULong*       pflags );
-
-  } PS_Parser_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_ParserRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A PS_Parser is an object used to parse a Type 1 font very quickly. */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    cursor :: The current position in the text.                        */
-  /*                                                                       */
-  /*    base   :: Start of the processed text.                             */
-  /*                                                                       */
-  /*    limit  :: End of the processed text.                               */
-  /*                                                                       */
-  /*    error  :: The last error returned.                                 */
-  /*                                                                       */
-  /*    memory :: The object used for memory operations (alloc/realloc).   */
-  /*                                                                       */
-  /*    funcs  :: A table of functions for the parser.                     */
-  /*                                                                       */
-  typedef struct  PS_ParserRec_
-  {
-    FT_Byte*   cursor;
-    FT_Byte*   base;
-    FT_Byte*   limit;
-    FT_Error   error;
-    FT_Memory  memory;
-
-    PS_Parser_FuncsRec  funcs;
-
-  } PS_ParserRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                         T1 BUILDER                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct T1_BuilderRec_*  T1_Builder;
-
-
-  typedef FT_Error
-  (*T1_Builder_Check_Points_Func)( T1_Builder  builder,
-                                   FT_Int      count );
-
-  typedef void
-  (*T1_Builder_Add_Point_Func)( T1_Builder  builder,
-                                FT_Pos      x,
-                                FT_Pos      y,
-                                FT_Byte     flag );
-
-  typedef FT_Error
-  (*T1_Builder_Add_Point1_Func)( T1_Builder  builder,
-                                 FT_Pos      x,
-                                 FT_Pos      y );
-
-  typedef FT_Error
-  (*T1_Builder_Add_Contour_Func)( T1_Builder  builder );
-
-  typedef FT_Error
-  (*T1_Builder_Start_Point_Func)( T1_Builder  builder,
-                                  FT_Pos      x,
-                                  FT_Pos      y );
-
-  typedef void
-  (*T1_Builder_Close_Contour_Func)( T1_Builder  builder );
-
-
-  typedef const struct T1_Builder_FuncsRec_*  T1_Builder_Funcs;
-
-  typedef struct  T1_Builder_FuncsRec_
-  {
-    void
-    (*init)( T1_Builder    builder,
-             FT_Face       face,
-             FT_Size       size,
-             FT_GlyphSlot  slot,
-             FT_Bool       hinting );
-
-    void
-    (*done)( T1_Builder   builder );
-
-    T1_Builder_Check_Points_Func   check_points;
-    T1_Builder_Add_Point_Func      add_point;
-    T1_Builder_Add_Point1_Func     add_point1;
-    T1_Builder_Add_Contour_Func    add_contour;
-    T1_Builder_Start_Point_Func    start_point;
-    T1_Builder_Close_Contour_Func  close_contour;
-
-  } T1_Builder_FuncsRec;
-
-
-  /* an enumeration type to handle charstring parsing states */
-  typedef enum  T1_ParseState_
-  {
-    T1_Parse_Start,
-    T1_Parse_Have_Width,
-    T1_Parse_Have_Moveto,
-    T1_Parse_Have_Path
-
-  } T1_ParseState;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Structure>                                                           */
-  /*    T1_BuilderRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*     A structure used during glyph loading to store its outline.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory       :: The current memory object.                         */
-  /*                                                                       */
-  /*    face         :: The current face object.                           */
-  /*                                                                       */
-  /*    glyph        :: The current glyph slot.                            */
-  /*                                                                       */
-  /*    loader       :: XXX                                                */
-  /*                                                                       */
-  /*    base         :: The base glyph outline.                            */
-  /*                                                                       */
-  /*    current      :: The current glyph outline.                         */
-  /*                                                                       */
-  /*    max_points   :: maximum points in builder outline                  */
-  /*                                                                       */
-  /*    max_contours :: Maximum number of contours in builder outline.     */
-  /*                                                                       */
-  /*    pos_x        :: The horizontal translation (if composite glyph).   */
-  /*                                                                       */
-  /*    pos_y        :: The vertical translation (if composite glyph).     */
-  /*                                                                       */
-  /*    left_bearing :: The left side bearing point.                       */
-  /*                                                                       */
-  /*    advance      :: The horizontal advance vector.                     */
-  /*                                                                       */
-  /*    bbox         :: Unused.                                            */
-  /*                                                                       */
-  /*    parse_state  :: An enumeration which controls the charstring       */
-  /*                    parsing state.                                     */
-  /*                                                                       */
-  /*    load_points  :: If this flag is not set, no points are loaded.     */
-  /*                                                                       */
-  /*    no_recurse   :: Set but not used.                                  */
-  /*                                                                       */
-  /*    metrics_only :: A boolean indicating that we only want to compute  */
-  /*                    the metrics of a given glyph, not load all of its  */
-  /*                    points.                                            */
-  /*                                                                       */
-  /*    funcs        :: An array of function pointers for the builder.     */
-  /*                                                                       */
-  typedef struct  T1_BuilderRec_
-  {
-    FT_Memory       memory;
-    FT_Face         face;
-    FT_GlyphSlot    glyph;
-    FT_GlyphLoader  loader;
-    FT_Outline*     base;
-    FT_Outline*     current;
-
-    FT_Pos          pos_x;
-    FT_Pos          pos_y;
-
-    FT_Vector       left_bearing;
-    FT_Vector       advance;
-
-    FT_BBox         bbox;          /* bounding box */
-    T1_ParseState   parse_state;
-    FT_Bool         load_points;
-    FT_Bool         no_recurse;
-
-    FT_Bool         metrics_only;
-
-    void*           hints_funcs;    /* hinter-specific */
-    void*           hints_globals;  /* hinter-specific */
-
-    T1_Builder_FuncsRec  funcs;
-
-  } T1_BuilderRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                         T1 DECODER                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
-  /* calls during glyph loading.                                           */
-  /*                                                                       */
-#define T1_MAX_SUBRS_CALLS  8
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
-  /* minimum of 16 is required.                                            */
-  /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  32
-
-#endif /* 0 */
-
-
-  typedef struct  T1_Decoder_ZoneRec_
-  {
-    FT_Byte*  cursor;
-    FT_Byte*  base;
-    FT_Byte*  limit;
-
-  } T1_Decoder_ZoneRec, *T1_Decoder_Zone;
-
-
-  typedef struct T1_DecoderRec_*              T1_Decoder;
-  typedef const struct T1_Decoder_FuncsRec_*  T1_Decoder_Funcs;
-
-
-  typedef FT_Error
-  (*T1_Decoder_Callback)( T1_Decoder  decoder,
-                          FT_UInt     glyph_index );
-
-
-  typedef struct  T1_Decoder_FuncsRec_
-  {
-    FT_Error
-    (*init)( T1_Decoder           decoder,
-             FT_Face              face,
-             FT_Size              size,
-             FT_GlyphSlot         slot,
-             FT_Byte**            glyph_names,
-             PS_Blend             blend,
-             FT_Bool              hinting,
-             FT_Render_Mode       hint_mode,
-             T1_Decoder_Callback  callback );
-
-    void
-    (*done)( T1_Decoder  decoder );
-
-    FT_Error
-    (*parse_charstrings)( T1_Decoder  decoder,
-                          FT_Byte*    base,
-                          FT_UInt     len );
-
-  } T1_Decoder_FuncsRec;
-
-
-  typedef struct  T1_DecoderRec_
-  {
-    T1_BuilderRec        builder;
-
-    FT_Long              stack[T1_MAX_CHARSTRINGS_OPERANDS];
-    FT_Long*             top;
-
-    T1_Decoder_ZoneRec   zones[T1_MAX_SUBRS_CALLS + 1];
-    T1_Decoder_Zone      zone;
-
-    FT_Service_PsCMaps   psnames;      /* for seac */
-    FT_UInt              num_glyphs;
-    FT_Byte**            glyph_names;
-
-    FT_Int               lenIV;        /* internal for sub routine calls */
-    FT_Int               num_subrs;
-    FT_Byte**            subrs;
-    FT_UInt*             subrs_len;    /* array of subrs length (optional) */
-    FT_Hash              subrs_hash;   /* used if `num_subrs' was massaged */
-
-    FT_Matrix            font_matrix;
-    FT_Vector            font_offset;
-
-    FT_Int               flex_state;
-    FT_Int               num_flex_vectors;
-    FT_Vector            flex_vectors[7];
-
-    PS_Blend             blend;       /* for multiple master support */
-
-    FT_Render_Mode       hint_mode;
-
-    T1_Decoder_Callback  parse_callback;
-    T1_Decoder_FuncsRec  funcs;
-
-    FT_Long*             buildchar;
-    FT_UInt              len_buildchar;
-
-    FT_Bool              seac;
-
-  } T1_DecoderRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                            AFM PARSER                         *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct AFM_ParserRec_*  AFM_Parser;
-
-  typedef struct  AFM_Parser_FuncsRec_
-  {
-    FT_Error
-    (*init)( AFM_Parser  parser,
-             FT_Memory   memory,
-             FT_Byte*    base,
-             FT_Byte*    limit );
-
-    void
-    (*done)( AFM_Parser  parser );
-
-    FT_Error
-    (*parse)( AFM_Parser  parser );
-
-  } AFM_Parser_FuncsRec;
-
-
-  typedef struct AFM_StreamRec_*  AFM_Stream;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    AFM_ParserRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An AFM_Parser is a parser for the AFM files.                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory    :: The object used for memory operations (alloc and      */
-  /*                 realloc).                                             */
-  /*                                                                       */
-  /*    stream    :: This is an opaque object.                             */
-  /*                                                                       */
-  /*    FontInfo  :: The result will be stored here.                       */
-  /*                                                                       */
-  /*    get_index :: A user provided function to get a glyph index by its  */
-  /*                 name.                                                 */
-  /*                                                                       */
-  typedef struct  AFM_ParserRec_
-  {
-    FT_Memory     memory;
-    AFM_Stream    stream;
-
-    AFM_FontInfo  FontInfo;
-
-    FT_Int
-    (*get_index)( const char*  name,
-                  FT_Offset    len,
-                  void*        user_data );
-
-    void*         user_data;
-
-  } AFM_ParserRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                     TYPE1 CHARMAPS                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef const struct T1_CMap_ClassesRec_*  T1_CMap_Classes;
-
-  typedef struct T1_CMap_ClassesRec_
-  {
-    FT_CMap_Class  standard;
-    FT_CMap_Class  expert;
-    FT_CMap_Class  custom;
-    FT_CMap_Class  unicode;
-
-  } T1_CMap_ClassesRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                        PSAux Module Interface                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct  PSAux_ServiceRec_
-  {
-    /* don't use `PS_Table_Funcs' and friends to avoid compiler warnings */
-    const PS_Table_FuncsRec*    ps_table_funcs;
-    const PS_Parser_FuncsRec*   ps_parser_funcs;
-    const T1_Builder_FuncsRec*  t1_builder_funcs;
-    const T1_Decoder_FuncsRec*  t1_decoder_funcs;
-
-    void
-    (*t1_decrypt)( FT_Byte*   buffer,
-                   FT_Offset  length,
-                   FT_UShort  seed );
-
-    T1_CMap_Classes  t1_cmap_classes;
-
-    /* fields after this comment line were added after version 2.1.10 */
-    const AFM_Parser_FuncsRec*  afm_parser_funcs;
-
-  } PSAux_ServiceRec, *PSAux_Service;
-
-  /* backwards-compatible type definition */
-  typedef PSAux_ServiceRec   PSAux_Interface;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                 Some convenience functions                    *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#define IS_PS_NEWLINE( ch ) \
-  ( (ch) == '\r' ||         \
-    (ch) == '\n' )
-
-#define IS_PS_SPACE( ch )  \
-  ( (ch) == ' '         || \
-    IS_PS_NEWLINE( ch ) || \
-    (ch) == '\t'        || \
-    (ch) == '\f'        || \
-    (ch) == '\0' )
-
-#define IS_PS_SPECIAL( ch )       \
-  ( (ch) == '/'                || \
-    (ch) == '(' || (ch) == ')' || \
-    (ch) == '<' || (ch) == '>' || \
-    (ch) == '[' || (ch) == ']' || \
-    (ch) == '{' || (ch) == '}' || \
-    (ch) == '%'                )
-
-#define IS_PS_DELIM( ch )  \
-  ( IS_PS_SPACE( ch )   || \
-    IS_PS_SPECIAL( ch ) )
-
-#define IS_PS_DIGIT( ch )        \
-  ( (ch) >= '0' && (ch) <= '9' )
-
-#define IS_PS_XDIGIT( ch )            \
-  ( IS_PS_DIGIT( ch )              || \
-    ( (ch) >= 'A' && (ch) <= 'F' ) || \
-    ( (ch) >= 'a' && (ch) <= 'f' ) )
-
-#define IS_PS_BASE85( ch )       \
-  ( (ch) >= '!' && (ch) <= 'u' )
-
-#define IS_PS_TOKEN( cur, limit, token )                                \
-  ( (char)(cur)[0] == (token)[0]                                     && \
-    ( (cur) + sizeof ( (token) ) == (limit) ||                          \
-      ( (cur) + sizeof( (token) ) < (limit)          &&                 \
-        IS_PS_DELIM( (cur)[sizeof ( (token) ) - 1] ) ) )             && \
-    ft_strncmp( (char*)(cur), (token), sizeof ( (token) ) - 1 ) == 0 )
-
-
-FT_END_HEADER
-
-#endif /* PSAUX_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/pshints.h b/dependencies2013/win32/include/freetype/internal/pshints.h
deleted file mode 100644
index e60dc9cd..00000000
--- a/dependencies2013/win32/include/freetype/internal/pshints.h
+++ /dev/null
@@ -1,722 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshints.h                                                              */
-/*                                                                         */
-/*    Interface to Postscript-specific (Type 1 and Type 2) hints           */
-/*    recorders (specification only).  These are used to support native    */
-/*    T1/T2 hints in the `type1', `cid', and `cff' font drivers.           */
-/*                                                                         */
-/*  Copyright 2001-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef PSHINTS_H_
-#define PSHINTS_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_TYPE1_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****               INTERNAL REPRESENTATION OF GLOBALS              *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct PSH_GlobalsRec_*  PSH_Globals;
-
-  typedef FT_Error
-  (*PSH_Globals_NewFunc)( FT_Memory     memory,
-                          T1_Private*   private_dict,
-                          PSH_Globals*  aglobals );
-
-  typedef void
-  (*PSH_Globals_SetScaleFunc)( PSH_Globals  globals,
-                               FT_Fixed     x_scale,
-                               FT_Fixed     y_scale,
-                               FT_Fixed     x_delta,
-                               FT_Fixed     y_delta );
-
-  typedef void
-  (*PSH_Globals_DestroyFunc)( PSH_Globals  globals );
-
-
-  typedef struct  PSH_Globals_FuncsRec_
-  {
-    PSH_Globals_NewFunc       create;
-    PSH_Globals_SetScaleFunc  set_scale;
-    PSH_Globals_DestroyFunc   destroy;
-
-  } PSH_Globals_FuncsRec, *PSH_Globals_Funcs;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  PUBLIC TYPE 1 HINTS RECORDER                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T1_Hints
-   *
-   * @description:
-   *   This is a handle to an opaque structure used to record glyph hints
-   *   from a Type 1 character glyph character string.
-   *
-   *   The methods used to operate on this object are defined by the
-   *   @T1_Hints_FuncsRec structure.  Recording glyph hints is normally
-   *   achieved through the following scheme:
-   *
-   *   - Open a new hint recording session by calling the `open' method.
-   *     This rewinds the recorder and prepare it for new input.
-   *
-   *   - For each hint found in the glyph charstring, call the corresponding
-   *     method (`stem', `stem3', or `reset').  Note that these functions do
-   *     not return an error code.
-   *
-   *   - Close the recording session by calling the `close' method.  It
-   *     returns an error code if the hints were invalid or something
-   *     strange happened (e.g., memory shortage).
-   *
-   *   The hints accumulated in the object can later be used by the
-   *   PostScript hinter.
-   *
-   */
-  typedef struct T1_HintsRec_*  T1_Hints;
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T1_Hints_Funcs
-   *
-   * @description:
-   *   A pointer to the @T1_Hints_FuncsRec structure that defines the API of
-   *   a given @T1_Hints object.
-   *
-   */
-  typedef const struct T1_Hints_FuncsRec_*  T1_Hints_Funcs;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_OpenFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to prepare it for a new Type 1
-   *   hints recording session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   * @note:
-   *   You should always call the @T1_Hints_CloseFunc method in order to
-   *   close an opened recording session.
-   *
-   */
-  typedef void
-  (*T1_Hints_OpenFunc)( T1_Hints  hints );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_SetStemFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to record a new horizontal or
-   *   vertical stem.  This corresponds to the Type 1 `hstem' and `vstem'
-   *   operators.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   dimension ::
-   *     0 for horizontal stems (hstem), 1 for vertical ones (vstem).
-   *
-   *   coords ::
-   *     Array of 2 coordinates in 16.16 format, used as (position,length)
-   *     stem descriptor.
-   *
-   * @note:
-   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
-   *   horizontal coordinates (x) for vertical stems (dim=1).
-   *
-   *   `coords[0]' is the absolute stem position (lowest coordinate);
-   *   `coords[1]' is the length.
-   *
-   *   The length can be negative, in which case it must be either -20 or
-   *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
-   *   specification.
-   *
-   *   If the length is -21 (corresponding to a bottom ghost stem), then
-   *   the real stem position is `coords[0]+coords[1]'.
-   *
-   */
-  typedef void
-  (*T1_Hints_SetStemFunc)( T1_Hints   hints,
-                           FT_UInt    dimension,
-                           FT_Fixed*  coords );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_SetStem3Func
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to record three
-   *   counter-controlled horizontal or vertical stems at once.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   dimension ::
-   *     0 for horizontal stems, 1 for vertical ones.
-   *
-   *   coords ::
-   *     An array of 6 values in 16.16 format, holding 3 (position,length)
-   *     pairs for the counter-controlled stems.
-   *
-   * @note:
-   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
-   *   horizontal coordinates (x) for vertical stems (dim=1).
-   *
-   *   The lengths cannot be negative (ghost stems are never
-   *   counter-controlled).
-   *
-   */
-  typedef void
-  (*T1_Hints_SetStem3Func)( T1_Hints   hints,
-                            FT_UInt    dimension,
-                            FT_Fixed*  coords );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_ResetFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to reset the stems hints in a
-   *   recording session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   end_point ::
-   *     The index of the last point in the input glyph in which the
-   *     previously defined hints apply.
-   *
-   */
-  typedef void
-  (*T1_Hints_ResetFunc)( T1_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_CloseFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to close a hint recording
-   *   session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   end_point ::
-   *     The index of the last point in the input glyph.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   The error code is set to indicate that an error occurred during the
-   *   recording session.
-   *
-   */
-  typedef FT_Error
-  (*T1_Hints_CloseFunc)( T1_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T1_Hints_ApplyFunc
-   *
-   * @description:
-   *   A method of the @T1_Hints class used to apply hints to the
-   *   corresponding glyph outline.  Must be called once all hints have been
-   *   recorded.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 1 hints recorder.
-   *
-   *   outline ::
-   *     A pointer to the target outline descriptor.
-   *
-   *   globals ::
-   *     The hinter globals for this font.
-   *
-   *   hint_mode ::
-   *     Hinting information.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   On input, all points within the outline are in font coordinates. On
-   *   output, they are in 1/64th of pixels.
-   *
-   *   The scaling transformation is taken from the `globals' object which
-   *   must correspond to the same font as the glyph.
-   *
-   */
-  typedef FT_Error
-  (*T1_Hints_ApplyFunc)( T1_Hints        hints,
-                         FT_Outline*     outline,
-                         PSH_Globals     globals,
-                         FT_Render_Mode  hint_mode );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   T1_Hints_FuncsRec
-   *
-   * @description:
-   *   The structure used to provide the API to @T1_Hints objects.
-   *
-   * @fields:
-   *   hints ::
-   *     A handle to the T1 Hints recorder.
-   *
-   *   open ::
-   *     The function to open a recording session.
-   *
-   *   close ::
-   *     The function to close a recording session.
-   *
-   *   stem ::
-   *     The function to set a simple stem.
-   *
-   *   stem3 ::
-   *     The function to set counter-controlled stems.
-   *
-   *   reset ::
-   *     The function to reset stem hints.
-   *
-   *   apply ::
-   *     The function to apply the hints to the corresponding glyph outline.
-   *
-   */
-  typedef struct  T1_Hints_FuncsRec_
-  {
-    T1_Hints               hints;
-    T1_Hints_OpenFunc      open;
-    T1_Hints_CloseFunc     close;
-    T1_Hints_SetStemFunc   stem;
-    T1_Hints_SetStem3Func  stem3;
-    T1_Hints_ResetFunc     reset;
-    T1_Hints_ApplyFunc     apply;
-
-  } T1_Hints_FuncsRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  PUBLIC TYPE 2 HINTS RECORDER                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T2_Hints
-   *
-   * @description:
-   *   This is a handle to an opaque structure used to record glyph hints
-   *   from a Type 2 character glyph character string.
-   *
-   *   The methods used to operate on this object are defined by the
-   *   @T2_Hints_FuncsRec structure.  Recording glyph hints is normally
-   *   achieved through the following scheme:
-   *
-   *   - Open a new hint recording session by calling the `open' method.
-   *     This rewinds the recorder and prepare it for new input.
-   *
-   *   - For each hint found in the glyph charstring, call the corresponding
-   *     method (`stems', `hintmask', `counters').  Note that these
-   *     functions do not return an error code.
-   *
-   *   - Close the recording session by calling the `close' method.  It
-   *     returns an error code if the hints were invalid or something
-   *     strange happened (e.g., memory shortage).
-   *
-   *   The hints accumulated in the object can later be used by the
-   *   Postscript hinter.
-   *
-   */
-  typedef struct T2_HintsRec_*  T2_Hints;
-
-
-  /*************************************************************************
-   *
-   * @type:
-   *   T2_Hints_Funcs
-   *
-   * @description:
-   *   A pointer to the @T2_Hints_FuncsRec structure that defines the API of
-   *   a given @T2_Hints object.
-   *
-   */
-  typedef const struct T2_Hints_FuncsRec_*  T2_Hints_Funcs;
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_OpenFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to prepare it for a new Type 2
-   *   hints recording session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   * @note:
-   *   You should always call the @T2_Hints_CloseFunc method in order to
-   *   close an opened recording session.
-   *
-   */
-  typedef void
-  (*T2_Hints_OpenFunc)( T2_Hints  hints );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_StemsFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to set the table of stems in
-   *   either the vertical or horizontal dimension.  Equivalent to the
-   *   `hstem', `vstem', `hstemhm', and `vstemhm' Type 2 operators.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   dimension ::
-   *     0 for horizontal stems (hstem), 1 for vertical ones (vstem).
-   *
-   *   count ::
-   *     The number of stems.
-   *
-   *   coords ::
-   *     An array of `count' (position,length) pairs in 16.16 format.
-   *
-   * @note:
-   *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
-   *   horizontal coordinates (x) for vertical stems (dim=1).
-   *
-   *   There are `2*count' elements in the `coords' array.  Each even
-   *   element is an absolute position in font units, each odd element is a
-   *   length in font units.
-   *
-   *   A length can be negative, in which case it must be either -20 or
-   *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
-   *   specification.
-   *
-   */
-  typedef void
-  (*T2_Hints_StemsFunc)( T2_Hints   hints,
-                         FT_UInt    dimension,
-                         FT_Int     count,
-                         FT_Fixed*  coordinates );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_MaskFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to set a given hintmask (this
-   *   corresponds to the `hintmask' Type 2 operator).
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   end_point ::
-   *     The glyph index of the last point to which the previously defined
-   *     or activated hints apply.
-   *
-   *   bit_count ::
-   *     The number of bits in the hint mask.
-   *
-   *   bytes ::
-   *     An array of bytes modelling the hint mask.
-   *
-   * @note:
-   *   If the hintmask starts the charstring (before any glyph point
-   *   definition), the value of `end_point' should be 0.
-   *
-   *   `bit_count' is the number of meaningful bits in the `bytes' array; it
-   *   must be equal to the total number of hints defined so far (i.e.,
-   *   horizontal+verticals).
-   *
-   *   The `bytes' array can come directly from the Type 2 charstring and
-   *   respects the same format.
-   *
-   */
-  typedef void
-  (*T2_Hints_MaskFunc)( T2_Hints        hints,
-                        FT_UInt         end_point,
-                        FT_UInt         bit_count,
-                        const FT_Byte*  bytes );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_CounterFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to set a given counter mask
-   *   (this corresponds to the `hintmask' Type 2 operator).
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   end_point ::
-   *     A glyph index of the last point to which the previously defined or
-   *     active hints apply.
-   *
-   *   bit_count ::
-   *     The number of bits in the hint mask.
-   *
-   *   bytes ::
-   *     An array of bytes modelling the hint mask.
-   *
-   * @note:
-   *   If the hintmask starts the charstring (before any glyph point
-   *   definition), the value of `end_point' should be 0.
-   *
-   *   `bit_count' is the number of meaningful bits in the `bytes' array; it
-   *   must be equal to the total number of hints defined so far (i.e.,
-   *   horizontal+verticals).
-   *
-   *    The `bytes' array can come directly from the Type 2 charstring and
-   *    respects the same format.
-   *
-   */
-  typedef void
-  (*T2_Hints_CounterFunc)( T2_Hints        hints,
-                           FT_UInt         bit_count,
-                           const FT_Byte*  bytes );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_CloseFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to close a hint recording
-   *   session.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   end_point ::
-   *     The index of the last point in the input glyph.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   The error code is set to indicate that an error occurred during the
-   *   recording session.
-   *
-   */
-  typedef FT_Error
-  (*T2_Hints_CloseFunc)( T2_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************
-   *
-   * @functype:
-   *   T2_Hints_ApplyFunc
-   *
-   * @description:
-   *   A method of the @T2_Hints class used to apply hints to the
-   *   corresponding glyph outline.  Must be called after the `close'
-   *   method.
-   *
-   * @input:
-   *   hints ::
-   *     A handle to the Type 2 hints recorder.
-   *
-   *   outline ::
-   *     A pointer to the target outline descriptor.
-   *
-   *   globals ::
-   *     The hinter globals for this font.
-   *
-   *   hint_mode ::
-   *     Hinting information.
-   *
-   * @return:
-   *   FreeType error code.  0 means success.
-   *
-   * @note:
-   *   On input, all points within the outline are in font coordinates. On
-   *   output, they are in 1/64th of pixels.
-   *
-   *   The scaling transformation is taken from the `globals' object which
-   *   must correspond to the same font than the glyph.
-   *
-   */
-  typedef FT_Error
-  (*T2_Hints_ApplyFunc)( T2_Hints        hints,
-                         FT_Outline*     outline,
-                         PSH_Globals     globals,
-                         FT_Render_Mode  hint_mode );
-
-
-  /*************************************************************************
-   *
-   * @struct:
-   *   T2_Hints_FuncsRec
-   *
-   * @description:
-   *   The structure used to provide the API to @T2_Hints objects.
-   *
-   * @fields:
-   *   hints ::
-   *     A handle to the T2 hints recorder object.
-   *
-   *   open ::
-   *     The function to open a recording session.
-   *
-   *   close ::
-   *     The function to close a recording session.
-   *
-   *   stems ::
-   *     The function to set the dimension's stems table.
-   *
-   *   hintmask ::
-   *     The function to set hint masks.
-   *
-   *   counter ::
-   *     The function to set counter masks.
-   *
-   *   apply ::
-   *     The function to apply the hints on the corresponding glyph outline.
-   *
-   */
-  typedef struct  T2_Hints_FuncsRec_
-  {
-    T2_Hints              hints;
-    T2_Hints_OpenFunc     open;
-    T2_Hints_CloseFunc    close;
-    T2_Hints_StemsFunc    stems;
-    T2_Hints_MaskFunc     hintmask;
-    T2_Hints_CounterFunc  counter;
-    T2_Hints_ApplyFunc    apply;
-
-  } T2_Hints_FuncsRec;
-
-
-  /* */
-
-
-  typedef struct  PSHinter_Interface_
-  {
-    PSH_Globals_Funcs  (*get_globals_funcs)( FT_Module  module );
-    T1_Hints_Funcs     (*get_t1_funcs)     ( FT_Module  module );
-    T2_Hints_Funcs     (*get_t2_funcs)     ( FT_Module  module );
-
-  } PSHinter_Interface;
-
-  typedef PSHinter_Interface*  PSHinter_Service;
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_PSHINTER_INTERFACE(        \
-          class_,                            \
-          get_globals_funcs_,                \
-          get_t1_funcs_,                     \
-          get_t2_funcs_ )                    \
-  static const PSHinter_Interface  class_ =  \
-  {                                          \
-    get_globals_funcs_,                      \
-    get_t1_funcs_,                           \
-    get_t2_funcs_                            \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_PSHINTER_INTERFACE(                      \
-          class_,                                          \
-          get_globals_funcs_,                              \
-          get_t1_funcs_,                                   \
-          get_t2_funcs_ )                                  \
-  void                                                     \
-  FT_Init_Class_ ## class_( FT_Library           library,  \
-                            PSHinter_Interface*  clazz )   \
-  {                                                        \
-    FT_UNUSED( library );                                  \
-                                                           \
-    clazz->get_globals_funcs = get_globals_funcs_;         \
-    clazz->get_t1_funcs      = get_t1_funcs_;              \
-    clazz->get_t2_funcs      = get_t2_funcs_;              \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* PSHINTS_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svbdf.h b/dependencies2013/win32/include/freetype/internal/services/svbdf.h
deleted file mode 100644
index c24475fc..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svbdf.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svbdf.h                                                                */
-/*                                                                         */
-/*    The FreeType BDF services (specification).                           */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVBDF_H_
-#define SVBDF_H_
-
-#include FT_BDF_H
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_BDF  "bdf"
-
-  typedef FT_Error
-  (*FT_BDF_GetCharsetIdFunc)( FT_Face       face,
-                              const char*  *acharset_encoding,
-                              const char*  *acharset_registry );
-
-  typedef FT_Error
-  (*FT_BDF_GetPropertyFunc)( FT_Face           face,
-                             const char*       prop_name,
-                             BDF_PropertyRec  *aproperty );
-
-
-  FT_DEFINE_SERVICE( BDF )
-  {
-    FT_BDF_GetCharsetIdFunc  get_charset_id;
-    FT_BDF_GetPropertyFunc   get_property;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
-                                  get_charset_id_,                       \
-                                  get_property_ )                        \
-  static const FT_Service_BDFRec  class_ =                               \
-  {                                                                      \
-    get_charset_id_, get_property_                                       \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
-                                  get_charset_id_,                       \
-                                  get_property_ )                        \
-  void                                                                   \
-  FT_Init_Class_ ## class_( FT_Service_BDFRec*  clazz )                  \
-  {                                                                      \
-    clazz->get_charset_id = get_charset_id_;                             \
-    clazz->get_property   = get_property_;                               \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVBDF_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svcid.h b/dependencies2013/win32/include/freetype/internal/services/svcid.h
deleted file mode 100644
index dbbe6044..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svcid.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svcid.h                                                                */
-/*                                                                         */
-/*    The FreeType CID font services (specification).                      */
-/*                                                                         */
-/*  Copyright 2007-2016 by                                                 */
-/*  Derek Clegg and Michael Toftdal.                                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVCID_H_
-#define SVCID_H_
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_CID  "CID"
-
-  typedef FT_Error
-  (*FT_CID_GetRegistryOrderingSupplementFunc)( FT_Face       face,
-                                               const char*  *registry,
-                                               const char*  *ordering,
-                                               FT_Int       *supplement );
-  typedef FT_Error
-  (*FT_CID_GetIsInternallyCIDKeyedFunc)( FT_Face   face,
-                                         FT_Bool  *is_cid );
-  typedef FT_Error
-  (*FT_CID_GetCIDFromGlyphIndexFunc)( FT_Face   face,
-                                      FT_UInt   glyph_index,
-                                      FT_UInt  *cid );
-
-  FT_DEFINE_SERVICE( CID )
-  {
-    FT_CID_GetRegistryOrderingSupplementFunc  get_ros;
-    FT_CID_GetIsInternallyCIDKeyedFunc        get_is_cid;
-    FT_CID_GetCIDFromGlyphIndexFunc           get_cid_from_glyph_index;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
-                                  get_ros_,                                 \
-                                  get_is_cid_,                              \
-                                  get_cid_from_glyph_index_ )               \
-  static const FT_Service_CIDRec class_ =                                   \
-  {                                                                         \
-    get_ros_, get_is_cid_, get_cid_from_glyph_index_                        \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
-                                  get_ros_,                                 \
-                                  get_is_cid_,                              \
-                                  get_cid_from_glyph_index_ )               \
-  void                                                                      \
-  FT_Init_Class_ ## class_( FT_Library          library,                    \
-                            FT_Service_CIDRec*  clazz )                     \
-  {                                                                         \
-    FT_UNUSED( library );                                                   \
-                                                                            \
-    clazz->get_ros                  = get_ros_;                             \
-    clazz->get_is_cid               = get_is_cid_;                          \
-    clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_;            \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVCID_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svfntfmt.h b/dependencies2013/win32/include/freetype/internal/services/svfntfmt.h
deleted file mode 100644
index bd295c9c..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svfntfmt.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svfntfmt.h                                                             */
-/*                                                                         */
-/*    The FreeType font format service (specification only).               */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVFNTFMT_H_
-#define SVFNTFMT_H_
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A trivial service used to return the name of a face's font driver,
-   *  according to the XFree86 nomenclature.  Note that the service data
-   *  is a simple constant string pointer.
-   */
-
-#define FT_SERVICE_ID_FONT_FORMAT  "font-format"
-
-#define FT_FONT_FORMAT_TRUETYPE  "TrueType"
-#define FT_FONT_FORMAT_TYPE_1    "Type 1"
-#define FT_FONT_FORMAT_BDF       "BDF"
-#define FT_FONT_FORMAT_PCF       "PCF"
-#define FT_FONT_FORMAT_TYPE_42   "Type 42"
-#define FT_FONT_FORMAT_CID       "CID Type 1"
-#define FT_FONT_FORMAT_CFF       "CFF"
-#define FT_FONT_FORMAT_PFR       "PFR"
-#define FT_FONT_FORMAT_WINFNT    "Windows FNT"
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVFNTFMT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svgldict.h b/dependencies2013/win32/include/freetype/internal/services/svgldict.h
deleted file mode 100644
index fff29bc4..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svgldict.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svgldict.h                                                             */
-/*                                                                         */
-/*    The FreeType glyph dictionary services (specification).              */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVGLDICT_H_
-#define SVGLDICT_H_
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A service used to retrieve glyph names, as well as to find the
-   *  index of a given glyph name in a font.
-   *
-   */
-
-#define FT_SERVICE_ID_GLYPH_DICT  "glyph-dict"
-
-
-  typedef FT_Error
-  (*FT_GlyphDict_GetNameFunc)( FT_Face     face,
-                               FT_UInt     glyph_index,
-                               FT_Pointer  buffer,
-                               FT_UInt     buffer_max );
-
-  typedef FT_UInt
-  (*FT_GlyphDict_NameIndexFunc)( FT_Face     face,
-                                 FT_String*  glyph_name );
-
-
-  FT_DEFINE_SERVICE( GlyphDict )
-  {
-    FT_GlyphDict_GetNameFunc    get_name;
-    FT_GlyphDict_NameIndexFunc  name_index;  /* optional */
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
-                                        get_name_,                     \
-                                        name_index_)                   \
-  static const FT_Service_GlyphDictRec  class_ =                       \
-  {                                                                    \
-    get_name_, name_index_                                             \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
-                                        get_name_,                     \
-                                        name_index_)                   \
-  void                                                                 \
-  FT_Init_Class_ ## class_( FT_Library                library,         \
-                            FT_Service_GlyphDictRec*  clazz )          \
-  {                                                                    \
-    FT_UNUSED( library );                                              \
-                                                                       \
-    clazz->get_name   = get_name_;                                     \
-    clazz->name_index = name_index_;                                   \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVGLDICT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svgxval.h b/dependencies2013/win32/include/freetype/internal/services/svgxval.h
deleted file mode 100644
index fb8ffba8..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svgxval.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svgxval.h                                                              */
-/*                                                                         */
-/*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  Masatake YAMATO, Red Hat K.K.,                                         */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/*                                                                         */
-/* gxvalid is derived from both gxlayout module and otvalid module.        */
-/* Development of gxlayout is supported by the Information-technology      */
-/* Promotion Agency(IPA), Japan.                                           */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVGXVAL_H_
-#define SVGXVAL_H_
-
-#include FT_GX_VALIDATE_H
-#include FT_INTERNAL_VALIDATE_H
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_GX_VALIDATE           "truetypegx-validate"
-#define FT_SERVICE_ID_CLASSICKERN_VALIDATE  "classickern-validate"
-
-  typedef FT_Error
-  (*gxv_validate_func)( FT_Face   face,
-                        FT_UInt   gx_flags,
-                        FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
-                        FT_UInt   table_length );
-
-
-  typedef FT_Error
-  (*ckern_validate_func)( FT_Face   face,
-                          FT_UInt   ckern_flags,
-                          FT_Bytes  *ckern_table );
-
-
-  FT_DEFINE_SERVICE( GXvalidate )
-  {
-    gxv_validate_func  validate;
-  };
-
-  FT_DEFINE_SERVICE( CKERNvalidate )
-  {
-    ckern_validate_func  validate;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVGXVAL_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svkern.h b/dependencies2013/win32/include/freetype/internal/services/svkern.h
deleted file mode 100644
index a636f1af..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svkern.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svkern.h                                                               */
-/*                                                                         */
-/*    The FreeType Kerning service (specification).                        */
-/*                                                                         */
-/*  Copyright 2006-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVKERN_H_
-#define SVKERN_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-#define FT_SERVICE_ID_KERNING  "kerning"
-
-
-  typedef FT_Error
-  (*FT_Kerning_TrackGetFunc)( FT_Face    face,
-                              FT_Fixed   point_size,
-                              FT_Int     degree,
-                              FT_Fixed*  akerning );
-
-  FT_DEFINE_SERVICE( Kerning )
-  {
-    FT_Kerning_TrackGetFunc  get_track;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVKERN_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svmm.h b/dependencies2013/win32/include/freetype/internal/services/svmm.h
deleted file mode 100644
index b78a19f8..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svmm.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svmm.h                                                                 */
-/*                                                                         */
-/*    The FreeType Multiple Masters and GX var services (specification).   */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVMM_H_
-#define SVMM_H_
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A service used to manage multiple-masters data in a given face.
-   *
-   *  See the related APIs in `ftmm.h' (FT_MULTIPLE_MASTERS_H).
-   *
-   */
-
-#define FT_SERVICE_ID_MULTI_MASTERS  "multi-masters"
-
-
-  typedef FT_Error
-  (*FT_Get_MM_Func)( FT_Face           face,
-                     FT_Multi_Master*  master );
-
-  typedef FT_Error
-  (*FT_Get_MM_Var_Func)( FT_Face      face,
-                         FT_MM_Var*  *master );
-
-  typedef FT_Error
-  (*FT_Set_MM_Design_Func)( FT_Face   face,
-                            FT_UInt   num_coords,
-                            FT_Long*  coords );
-
-  typedef FT_Error
-  (*FT_Set_Var_Design_Func)( FT_Face    face,
-                             FT_UInt    num_coords,
-                             FT_Fixed*  coords );
-
-  typedef FT_Error
-  (*FT_Set_MM_Blend_Func)( FT_Face   face,
-                           FT_UInt   num_coords,
-                           FT_Long*  coords );
-
-
-  FT_DEFINE_SERVICE( MultiMasters )
-  {
-    FT_Get_MM_Func          get_mm;
-    FT_Set_MM_Design_Func   set_mm_design;
-    FT_Set_MM_Blend_Func    set_mm_blend;
-    FT_Get_MM_Var_Func      get_mm_var;
-    FT_Set_Var_Design_Func  set_var_design;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
-                                           get_mm_,                         \
-                                           set_mm_design_,                  \
-                                           set_mm_blend_,                   \
-                                           get_mm_var_,                     \
-                                           set_var_design_ )                \
-  static const FT_Service_MultiMastersRec  class_ =                         \
-  {                                                                         \
-    get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_    \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
-                                           get_mm_,                         \
-                                           set_mm_design_,                  \
-                                           set_mm_blend_,                   \
-                                           get_mm_var_,                     \
-                                           set_var_design_ )                \
-  void                                                                      \
-  FT_Init_Class_ ## class_( FT_Service_MultiMastersRec*  clazz )            \
-  {                                                                         \
-    clazz->get_mm         = get_mm_;                                        \
-    clazz->set_mm_design  = set_mm_design_;                                 \
-    clazz->set_mm_blend   = set_mm_blend_;                                  \
-    clazz->get_mm_var     = get_mm_var_;                                    \
-    clazz->set_var_design = set_var_design_;                                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* SVMM_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svotval.h b/dependencies2013/win32/include/freetype/internal/services/svotval.h
deleted file mode 100644
index bc929d4b..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svotval.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svotval.h                                                              */
-/*                                                                         */
-/*    The FreeType OpenType validation service (specification).            */
-/*                                                                         */
-/*  Copyright 2004-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVOTVAL_H_
-#define SVOTVAL_H_
-
-#include FT_OPENTYPE_VALIDATE_H
-#include FT_INTERNAL_VALIDATE_H
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_OPENTYPE_VALIDATE  "opentype-validate"
-
-
-  typedef FT_Error
-  (*otv_validate_func)( FT_Face volatile  face,
-                        FT_UInt           ot_flags,
-                        FT_Bytes         *base,
-                        FT_Bytes         *gdef,
-                        FT_Bytes         *gpos,
-                        FT_Bytes         *gsub,
-                        FT_Bytes         *jstf );
-
-
-  FT_DEFINE_SERVICE( OTvalidate )
-  {
-    otv_validate_func  validate;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVOTVAL_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svpfr.h b/dependencies2013/win32/include/freetype/internal/services/svpfr.h
deleted file mode 100644
index d0f7c4df..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svpfr.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpfr.h                                                                */
-/*                                                                         */
-/*    Internal PFR service functions (specification).                      */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVPFR_H_
-#define SVPFR_H_
-
-#include FT_PFR_H
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_PFR_METRICS  "pfr-metrics"
-
-
-  typedef FT_Error
-  (*FT_PFR_GetMetricsFunc)( FT_Face    face,
-                            FT_UInt   *aoutline,
-                            FT_UInt   *ametrics,
-                            FT_Fixed  *ax_scale,
-                            FT_Fixed  *ay_scale );
-
-  typedef FT_Error
-  (*FT_PFR_GetKerningFunc)( FT_Face     face,
-                            FT_UInt     left,
-                            FT_UInt     right,
-                            FT_Vector  *avector );
-
-  typedef FT_Error
-  (*FT_PFR_GetAdvanceFunc)( FT_Face   face,
-                            FT_UInt   gindex,
-                            FT_Pos   *aadvance );
-
-
-  FT_DEFINE_SERVICE( PfrMetrics )
-  {
-    FT_PFR_GetMetricsFunc  get_metrics;
-    FT_PFR_GetKerningFunc  get_kerning;
-    FT_PFR_GetAdvanceFunc  get_advance;
-
-  };
-
- /* */
-
-FT_END_HEADER
-
-#endif /* SVPFR_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svpostnm.h b/dependencies2013/win32/include/freetype/internal/services/svpostnm.h
deleted file mode 100644
index f1243800..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svpostnm.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpostnm.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript name services (specification).               */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVPOSTNM_H_
-#define SVPOSTNM_H_
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-  /*
-   *  A trivial service used to retrieve the PostScript name of a given
-   *  font when available.  The `get_name' field should never be NULL.
-   *
-   *  The corresponding function can return NULL to indicate that the
-   *  PostScript name is not available.
-   *
-   *  The name is owned by the face and will be destroyed with it.
-   */
-
-#define FT_SERVICE_ID_POSTSCRIPT_FONT_NAME  "postscript-font-name"
-
-
-  typedef const char*
-  (*FT_PsName_GetFunc)( FT_Face  face );
-
-
-  FT_DEFINE_SERVICE( PsFontName )
-  {
-    FT_PsName_GetFunc  get_ps_font_name;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
-  static const FT_Service_PsFontNameRec  class_ =                    \
-  {                                                                  \
-    get_ps_font_name_                                                \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
-  void                                                               \
-  FT_Init_Class_ ## class_( FT_Library                 library,      \
-                            FT_Service_PsFontNameRec*  clazz )       \
-  {                                                                  \
-    FT_UNUSED( library );                                            \
-                                                                     \
-    clazz->get_ps_font_name = get_ps_font_name_;                     \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVPOSTNM_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svprop.h b/dependencies2013/win32/include/freetype/internal/services/svprop.h
deleted file mode 100644
index 870e90ed..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svprop.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svprop.h                                                               */
-/*                                                                         */
-/*    The FreeType property service (specification).                       */
-/*                                                                         */
-/*  Copyright 2012-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVPROP_H_
-#define SVPROP_H_
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_PROPERTIES  "properties"
-
-
-  typedef FT_Error
-  (*FT_Properties_SetFunc)( FT_Module    module,
-                            const char*  property_name,
-                            const void*  value );
-
-  typedef FT_Error
-  (*FT_Properties_GetFunc)( FT_Module    module,
-                            const char*  property_name,
-                            void*        value );
-
-
-  FT_DEFINE_SERVICE( Properties )
-  {
-    FT_Properties_SetFunc  set_property;
-    FT_Properties_GetFunc  get_property;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PROPERTIESREC( class_,          \
-                                         set_property_,   \
-                                         get_property_ )  \
-  static const FT_Service_PropertiesRec  class_ =         \
-  {                                                       \
-    set_property_,                                        \
-    get_property_                                         \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PROPERTIESREC( class_,                \
-                                         set_property_,         \
-                                         get_property_ )        \
-  void                                                          \
-  FT_Init_Class_ ## class_( FT_Service_PropertiesRec*  clazz )  \
-  {                                                             \
-    clazz->set_property = set_property_;                        \
-    clazz->get_property = get_property_;                        \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVPROP_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svpscmap.h b/dependencies2013/win32/include/freetype/internal/services/svpscmap.h
deleted file mode 100644
index 9acc2169..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svpscmap.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpscmap.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript charmap service (specification).             */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVPSCMAP_H_
-#define SVPSCMAP_H_
-
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_POSTSCRIPT_CMAPS  "postscript-cmaps"
-
-
-  /*
-   *  Adobe glyph name to unicode value.
-   */
-  typedef FT_UInt32
-  (*PS_Unicode_ValueFunc)( const char*  glyph_name );
-
-  /*
-   *  Macintosh name id to glyph name.  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_Macintosh_NameFunc)( FT_UInt  name_index );
-
-  /*
-   *  Adobe standard string ID to glyph name.  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_Adobe_Std_StringsFunc)( FT_UInt  string_index );
-
-
-  /*
-   *  Simple unicode -> glyph index charmap built from font glyph names
-   *  table.
-   */
-  typedef struct  PS_UniMap_
-  {
-    FT_UInt32  unicode;      /* bit 31 set: is glyph variant */
-    FT_UInt    glyph_index;
-
-  } PS_UniMap;
-
-
-  typedef struct PS_UnicodesRec_*  PS_Unicodes;
-
-  typedef struct  PS_UnicodesRec_
-  {
-    FT_CMapRec  cmap;
-    FT_UInt     num_maps;
-    PS_UniMap*  maps;
-
-  } PS_UnicodesRec;
-
-
-  /*
-   *  A function which returns a glyph name for a given index.  Returns
-   *  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_GetGlyphNameFunc)( FT_Pointer  data,
-                          FT_UInt     string_index );
-
-  /*
-   *  A function used to release the glyph name returned by
-   *  PS_GetGlyphNameFunc, when needed
-   */
-  typedef void
-  (*PS_FreeGlyphNameFunc)( FT_Pointer  data,
-                           const char*  name );
-
-  typedef FT_Error
-  (*PS_Unicodes_InitFunc)( FT_Memory             memory,
-                           PS_Unicodes           unicodes,
-                           FT_UInt               num_glyphs,
-                           PS_GetGlyphNameFunc   get_glyph_name,
-                           PS_FreeGlyphNameFunc  free_glyph_name,
-                           FT_Pointer            glyph_data );
-
-  typedef FT_UInt
-  (*PS_Unicodes_CharIndexFunc)( PS_Unicodes  unicodes,
-                                FT_UInt32    unicode );
-
-  typedef FT_UInt32
-  (*PS_Unicodes_CharNextFunc)( PS_Unicodes  unicodes,
-                               FT_UInt32   *unicode );
-
-
-  FT_DEFINE_SERVICE( PsCMaps )
-  {
-    PS_Unicode_ValueFunc       unicode_value;
-
-    PS_Unicodes_InitFunc       unicodes_init;
-    PS_Unicodes_CharIndexFunc  unicodes_char_index;
-    PS_Unicodes_CharNextFunc   unicodes_char_next;
-
-    PS_Macintosh_NameFunc      macintosh_name;
-    PS_Adobe_Std_StringsFunc   adobe_std_strings;
-    const unsigned short*      adobe_std_encoding;
-    const unsigned short*      adobe_expert_encoding;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
-                                      unicode_value_,                       \
-                                      unicodes_init_,                       \
-                                      unicodes_char_index_,                 \
-                                      unicodes_char_next_,                  \
-                                      macintosh_name_,                      \
-                                      adobe_std_strings_,                   \
-                                      adobe_std_encoding_,                  \
-                                      adobe_expert_encoding_ )              \
-  static const FT_Service_PsCMapsRec  class_ =                              \
-  {                                                                         \
-    unicode_value_, unicodes_init_,                                         \
-    unicodes_char_index_, unicodes_char_next_, macintosh_name_,             \
-    adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_         \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
-                                      unicode_value_,                       \
-                                      unicodes_init_,                       \
-                                      unicodes_char_index_,                 \
-                                      unicodes_char_next_,                  \
-                                      macintosh_name_,                      \
-                                      adobe_std_strings_,                   \
-                                      adobe_std_encoding_,                  \
-                                      adobe_expert_encoding_ )              \
-  void                                                                      \
-  FT_Init_Class_ ## class_( FT_Library              library,                \
-                            FT_Service_PsCMapsRec*  clazz )                 \
-  {                                                                         \
-    FT_UNUSED( library );                                                   \
-                                                                            \
-    clazz->unicode_value         = unicode_value_;                          \
-    clazz->unicodes_init         = unicodes_init_;                          \
-    clazz->unicodes_char_index   = unicodes_char_index_;                    \
-    clazz->unicodes_char_next    = unicodes_char_next_;                     \
-    clazz->macintosh_name        = macintosh_name_;                         \
-    clazz->adobe_std_strings     = adobe_std_strings_;                      \
-    clazz->adobe_std_encoding    = adobe_std_encoding_;                     \
-    clazz->adobe_expert_encoding = adobe_expert_encoding_;                  \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVPSCMAP_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svpsinfo.h b/dependencies2013/win32/include/freetype/internal/services/svpsinfo.h
deleted file mode 100644
index f2c80604..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svpsinfo.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpsinfo.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript info service (specification).                */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVPSINFO_H_
-#define SVPSINFO_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_POSTSCRIPT_INFO  "postscript-info"
-
-
-  typedef FT_Error
-  (*PS_GetFontInfoFunc)( FT_Face          face,
-                         PS_FontInfoRec*  afont_info );
-
-  typedef FT_Error
-  (*PS_GetFontExtraFunc)( FT_Face           face,
-                          PS_FontExtraRec*  afont_extra );
-
-  typedef FT_Int
-  (*PS_HasGlyphNamesFunc)( FT_Face  face );
-
-  typedef FT_Error
-  (*PS_GetFontPrivateFunc)( FT_Face         face,
-                            PS_PrivateRec*  afont_private );
-
-  typedef FT_Long
-  (*PS_GetFontValueFunc)( FT_Face       face,
-                          PS_Dict_Keys  key,
-                          FT_UInt       idx,
-                          void         *value,
-                          FT_Long       value_len );
-
-
-  FT_DEFINE_SERVICE( PsInfo )
-  {
-    PS_GetFontInfoFunc     ps_get_font_info;
-    PS_GetFontExtraFunc    ps_get_font_extra;
-    PS_HasGlyphNamesFunc   ps_has_glyph_names;
-    PS_GetFontPrivateFunc  ps_get_font_private;
-    PS_GetFontValueFunc    ps_get_font_value;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
-                                     get_font_info_,             \
-                                     ps_get_font_extra_,         \
-                                     has_glyph_names_,           \
-                                     get_font_private_,          \
-                                     get_font_value_ )           \
-  static const FT_Service_PsInfoRec  class_ =                    \
-  {                                                              \
-    get_font_info_, ps_get_font_extra_, has_glyph_names_,        \
-    get_font_private_, get_font_value_                           \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
-                                     get_font_info_,             \
-                                     ps_get_font_extra_,         \
-                                     has_glyph_names_,           \
-                                     get_font_private_,          \
-                                     get_font_value_ )           \
-  void                                                           \
-  FT_Init_Class_ ## class_( FT_Library             library,      \
-                            FT_Service_PsInfoRec*  clazz )       \
-  {                                                              \
-    FT_UNUSED( library );                                        \
-                                                                 \
-    clazz->ps_get_font_info    = get_font_info_;                 \
-    clazz->ps_get_font_extra   = ps_get_font_extra_;             \
-    clazz->ps_has_glyph_names  = has_glyph_names_;               \
-    clazz->ps_get_font_private = get_font_private_;              \
-    clazz->ps_get_font_value   = get_font_value_;                \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVPSINFO_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svsfnt.h b/dependencies2013/win32/include/freetype/internal/services/svsfnt.h
deleted file mode 100644
index 0f38cf19..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svsfnt.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svsfnt.h                                                               */
-/*                                                                         */
-/*    The FreeType SFNT table loading service (specification).             */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVSFNT_H_
-#define SVSFNT_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  SFNT table loading service.
-   */
-
-#define FT_SERVICE_ID_SFNT_TABLE  "sfnt-table"
-
-
-  /*
-   * Used to implement FT_Load_Sfnt_Table().
-   */
-  typedef FT_Error
-  (*FT_SFNT_TableLoadFunc)( FT_Face    face,
-                            FT_ULong   tag,
-                            FT_Long    offset,
-                            FT_Byte*   buffer,
-                            FT_ULong*  length );
-
-  /*
-   * Used to implement FT_Get_Sfnt_Table().
-   */
-  typedef void*
-  (*FT_SFNT_TableGetFunc)( FT_Face      face,
-                           FT_Sfnt_Tag  tag );
-
-
-  /*
-   * Used to implement FT_Sfnt_Table_Info().
-   */
-  typedef FT_Error
-  (*FT_SFNT_TableInfoFunc)( FT_Face    face,
-                            FT_UInt    idx,
-                            FT_ULong  *tag,
-                            FT_ULong  *offset,
-                            FT_ULong  *length );
-
-
-  FT_DEFINE_SERVICE( SFNT_Table )
-  {
-    FT_SFNT_TableLoadFunc  load_table;
-    FT_SFNT_TableGetFunc   get_table;
-    FT_SFNT_TableInfoFunc  table_info;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ )  \
-  static const FT_Service_SFNT_TableRec  class_ =                      \
-  {                                                                    \
-    load_, get_, info_                                                 \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ ) \
-  void                                                                \
-  FT_Init_Class_ ## class_( FT_Service_SFNT_TableRec*  clazz )        \
-  {                                                                   \
-    clazz->load_table = load_;                                        \
-    clazz->get_table  = get_;                                         \
-    clazz->table_info = info_;                                        \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVSFNT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svttcmap.h b/dependencies2013/win32/include/freetype/internal/services/svttcmap.h
deleted file mode 100644
index 772c7218..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svttcmap.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svttcmap.h                                                             */
-/*                                                                         */
-/*    The FreeType TrueType/sfnt cmap extra information service.           */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  Masatake YAMATO, Redhat K.K.,                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/* Development of this service is support of
-   Information-technology Promotion Agency, Japan. */
-
-#ifndef SVTTCMAP_H_
-#define SVTTCMAP_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_TT_CMAP  "tt-cmaps"
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_CMapInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to store TrueType/sfnt specific cmap information  */
-  /*    which is not covered by the generic @FT_CharMap structure.  This   */
-  /*    structure can be accessed with the @FT_Get_TT_CMap_Info function.  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    language ::                                                        */
-  /*      The language ID used in Mac fonts.  Definitions of values are in */
-  /*      `ttnameid.h'.                                                    */
-  /*                                                                       */
-  /*    format ::                                                          */
-  /*      The cmap format.  OpenType 1.6 defines the formats 0 (byte       */
-  /*      encoding table), 2~(high-byte mapping through table), 4~(segment */
-  /*      mapping to delta values), 6~(trimmed table mapping), 8~(mixed    */
-  /*      16-bit and 32-bit coverage), 10~(trimmed array), 12~(segmented   */
-  /*      coverage), 13~(last resort font), and 14 (Unicode Variation      */
-  /*      Sequences).                                                      */
-  /*                                                                       */
-  typedef struct  TT_CMapInfo_
-  {
-    FT_ULong  language;
-    FT_Long   format;
-
-  } TT_CMapInfo;
-
-
-  typedef FT_Error
-  (*TT_CMap_Info_GetFunc)( FT_CharMap    charmap,
-                           TT_CMapInfo  *cmap_info );
-
-
-  FT_DEFINE_SERVICE( TTCMaps )
-  {
-    TT_CMap_Info_GetFunc  get_cmap_info;
-  };
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
-  static const FT_Service_TTCMapsRec  class_ =                  \
-  {                                                             \
-    get_cmap_info_                                              \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
-  void                                                          \
-  FT_Init_Class_ ## class_( FT_Library              library,    \
-                            FT_Service_TTCMapsRec*  clazz )     \
-  {                                                             \
-    FT_UNUSED( library );                                       \
-                                                                \
-    clazz->get_cmap_info = get_cmap_info_;                      \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* SVTTCMAP_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svtteng.h b/dependencies2013/win32/include/freetype/internal/services/svtteng.h
deleted file mode 100644
index c55061a0..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svtteng.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svtteng.h                                                              */
-/*                                                                         */
-/*    The FreeType TrueType engine query service (specification).          */
-/*                                                                         */
-/*  Copyright 2006-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVTTENG_H_
-#define SVTTENG_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_MODULE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  SFNT table loading service.
-   */
-
-#define FT_SERVICE_ID_TRUETYPE_ENGINE  "truetype-engine"
-
-  /*
-   * Used to implement FT_Get_TrueType_Engine_Type
-   */
-
-  FT_DEFINE_SERVICE( TrueTypeEngine )
-  {
-    FT_TrueTypeEngineType  engine_type;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVTTENG_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svttglyf.h b/dependencies2013/win32/include/freetype/internal/services/svttglyf.h
deleted file mode 100644
index c33edd46..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svttglyf.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svttglyf.h                                                             */
-/*                                                                         */
-/*    The FreeType TrueType glyph service.                                 */
-/*                                                                         */
-/*  Copyright 2007-2016 by                                                 */
-/*  David Turner.                                                          */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-#ifndef SVTTGLYF_H_
-#define SVTTGLYF_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_TT_GLYF  "tt-glyf"
-
-
-  typedef FT_ULong
-  (*TT_Glyf_GetLocationFunc)( FT_Face    face,
-                              FT_UInt    gindex,
-                              FT_ULong  *psize );
-
-  FT_DEFINE_SERVICE( TTGlyf )
-  {
-    TT_Glyf_GetLocationFunc  get_location;
-  };
-
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
-  static const FT_Service_TTGlyfRec  class_ =                 \
-  {                                                           \
-    get_location_                                             \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
-  void                                                        \
-  FT_Init_Class_ ## class_( FT_Service_TTGlyfRec*  clazz )    \
-  {                                                           \
-    clazz->get_location = get_location_;                      \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* SVTTGLYF_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/services/svwinfnt.h b/dependencies2013/win32/include/freetype/internal/services/svwinfnt.h
deleted file mode 100644
index c2f6d4c6..00000000
--- a/dependencies2013/win32/include/freetype/internal/services/svwinfnt.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svwinfnt.h                                                             */
-/*                                                                         */
-/*    The FreeType Windows FNT/FONT service (specification).               */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SVWINFNT_H_
-#define SVWINFNT_H_
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_WINFONTS_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_WINFNT  "winfonts"
-
-  typedef FT_Error
-  (*FT_WinFnt_GetHeaderFunc)( FT_Face               face,
-                              FT_WinFNT_HeaderRec  *aheader );
-
-
-  FT_DEFINE_SERVICE( WinFnt )
-  {
-    FT_WinFnt_GetHeaderFunc  get_header;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* SVWINFNT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/sfnt.h b/dependencies2013/win32/include/freetype/internal/sfnt.h
deleted file mode 100644
index e139315a..00000000
--- a/dependencies2013/win32/include/freetype/internal/sfnt.h
+++ /dev/null
@@ -1,748 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  sfnt.h                                                                 */
-/*                                                                         */
-/*    High-level `sfnt' driver interface (specification).                  */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef SFNT_H_
-#define SFNT_H_
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_TRUETYPE_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Init_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    First part of the SFNT face object initialization.  This finds     */
-  /*    the face in a SFNT file or collection, and load its format tag in  */
-  /*    face->format_tag.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection, in bits 0-15.  The numbered instance     */
-  /*                  index~+~1 of a GX (sub)font, if applicable, in bits  */
-  /*                  16-30.                                               */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    params     :: Optional additional parameters.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  /*    This function recognizes fonts embedded in a `TrueType             */
-  /*    collection'.                                                       */
-  /*                                                                       */
-  /*    Once the format tag has been validated by the font driver, it      */
-  /*    should then call the TT_Load_Face_Func() callback to read the rest */
-  /*    of the SFNT tables in the object.                                  */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Init_Face_Func)( FT_Stream      stream,
-                        TT_Face        face,
-                        FT_Int         face_index,
-                        FT_Int         num_params,
-                        FT_Parameter*  params );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Second part of the SFNT face object initialization.  This loads    */
-  /*    the common SFNT tables (head, OS/2, maxp, metrics, etc.) in the    */
-  /*    face object.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection, in bits 0-15.  The numbered instance     */
-  /*                  index~+~1 of a GX (sub)font, if applicable, in bits  */
-  /*                  16-30.                                               */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    params     :: Optional additional parameters.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function must be called after TT_Init_Face_Func().            */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Face_Func)( FT_Stream      stream,
-                        TT_Face        face,
-                        FT_Int         face_index,
-                        FT_Int         num_params,
-                        FT_Parameter*  params );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Done_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A callback used to delete the common SFNT data from a face.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the target face object.                        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does NOT destroy the face object.                    */
-  /*                                                                       */
-  typedef void
-  (*TT_Done_Face_Func)( TT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Any_Func                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load any font table into client memory.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: The face object to look for.                             */
-  /*                                                                       */
-  /*    tag    :: The tag of table to load.  Use the value 0 if you want   */
-  /*              to access the whole font file, else set this parameter   */
-  /*              to a valid TrueType table tag that you can forge with    */
-  /*              the MAKE_TT_TAG macro.                                   */
-  /*                                                                       */
-  /*    offset :: The starting offset in the table (or the file if         */
-  /*              tag == 0).                                               */
-  /*                                                                       */
-  /*    length :: The address of the decision variable:                    */
-  /*                                                                       */
-  /*                If length == NULL:                                     */
-  /*                  Loads the whole table.  Returns an error if          */
-  /*                  `offset' == 0!                                       */
-  /*                                                                       */
-  /*                If *length == 0:                                       */
-  /*                  Exits immediately; returning the length of the given */
-  /*                  table or of the font file, depending on the value of */
-  /*                  `tag'.                                               */
-  /*                                                                       */
-  /*                If *length != 0:                                       */
-  /*                  Loads the next `length' bytes of table or font,      */
-  /*                  starting at offset `offset' (in table or font too).  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    buffer :: The address of target buffer.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    TrueType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Any_Func)( TT_Face    face,
-                       FT_ULong   tag,
-                       FT_Long    offset,
-                       FT_Byte   *buffer,
-                       FT_ULong*  length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Find_SBit_Image_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check whether an embedded bitmap (an `sbit') exists for a given    */
-  /*    glyph, at a given strike.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    glyph_index   :: The glyph index.                                  */
-  /*                                                                       */
-  /*    strike_index  :: The current strike index.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    arange        :: The SBit range containing the glyph index.        */
-  /*                                                                       */
-  /*    astrike       :: The SBit strike containing the glyph index.       */
-  /*                                                                       */
-  /*    aglyph_offset :: The offset of the glyph data in `EBDT' table.     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns                    */
-  /*    SFNT_Err_Invalid_Argument if no sbit exists for the requested      */
-  /*    glyph.                                                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Find_SBit_Image_Func)( TT_Face          face,
-                              FT_UInt          glyph_index,
-                              FT_ULong         strike_index,
-                              TT_SBit_Range   *arange,
-                              TT_SBit_Strike  *astrike,
-                              FT_ULong        *aglyph_offset );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_SBit_Metrics_Func                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the big metrics for a given embedded bitmap.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream      :: The input stream.                                   */
-  /*                                                                       */
-  /*    range       :: The SBit range containing the glyph.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    big_metrics :: A big SBit metrics structure for the glyph.         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be positioned at the glyph's offset within  */
-  /*    the `EBDT' table before the call.                                  */
-  /*                                                                       */
-  /*    If the image format uses variable metrics, the stream cursor is    */
-  /*    positioned just after the metrics header in the `EBDT' table on    */
-  /*    function exit.                                                     */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_SBit_Metrics_Func)( FT_Stream        stream,
-                                TT_SBit_Range    range,
-                                TT_SBit_Metrics  metrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_SBit_Image_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load a given glyph sbit image from the font resource.  This also   */
-  /*    returns its metrics.                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face ::                                                            */
-  /*      The target face object.                                          */
-  /*                                                                       */
-  /*    strike_index ::                                                    */
-  /*      The strike index.                                                */
-  /*                                                                       */
-  /*    glyph_index ::                                                     */
-  /*      The current glyph index.                                         */
-  /*                                                                       */
-  /*    load_flags ::                                                      */
-  /*      The current load flags.                                          */
-  /*                                                                       */
-  /*    stream ::                                                          */
-  /*      The input stream.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amap ::                                                            */
-  /*      The target pixmap.                                               */
-  /*                                                                       */
-  /*    ametrics ::                                                        */
-  /*      A big sbit metrics structure for the glyph image.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    glyph sbit exists for the index.                                   */
-  /*                                                                       */
-  /*  <Note>                                                               */
-  /*    The `map.buffer' field is always freed before the glyph is loaded. */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_SBit_Image_Func)( TT_Face              face,
-                              FT_ULong             strike_index,
-                              FT_UInt              glyph_index,
-                              FT_UInt              load_flags,
-                              FT_Stream            stream,
-                              FT_Bitmap           *amap,
-                              TT_SBit_MetricsRec  *ametrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Set_SBit_Strike_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Select an sbit strike for a given size request.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    req           :: The size request.                                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    astrike_index :: The index of the sbit strike.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    sbit strike exists for the selected ppem values.                   */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Set_SBit_Strike_Func)( TT_Face          face,
-                              FT_Size_Request  req,
-                              FT_ULong*        astrike_index );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Strike_Metrics_Func                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load the metrics of a given strike.                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    strike_index  :: The strike index.                                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    metrics       :: the metrics of the strike.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    such sbit strike exists.                                           */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Strike_Metrics_Func)( TT_Face           face,
-                                  FT_ULong          strike_index,
-                                  FT_Size_Metrics*  metrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Get_PS_Name_Func                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Get the PostScript glyph name of a glyph.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    idx  :: The glyph index.                                           */
-  /*                                                                       */
-  /*    PSname :: The address of a string pointer.  Will be NULL in case   */
-  /*              of error, otherwise it is a pointer to the glyph name.   */
-  /*                                                                       */
-  /*              You must not modify the returned string!                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Get_PS_Name_Func)( TT_Face      face,
-                          FT_UInt      idx,
-                          FT_String**  PSname );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Metrics_Func                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load a metrics table, which is a table with a horizontal and a     */
-  /*    vertical version.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the target face object.                    */
-  /*                                                                       */
-  /*    stream   :: The input stream.                                      */
-  /*                                                                       */
-  /*    vertical :: A boolean flag.  If set, load the vertical one.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Metrics_Func)( TT_Face    face,
-                           FT_Stream  stream,
-                           FT_Bool    vertical );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Get_Metrics_Func                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load the horizontal or vertical header in a face object.           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the target face object.                    */
-  /*                                                                       */
-  /*    vertical :: A boolean flag.  If set, load vertical metrics.        */
-  /*                                                                       */
-  /*    gindex   :: The glyph index.                                       */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    abearing :: The horizontal (or vertical) bearing.  Set to zero in  */
-  /*                case of error.                                         */
-  /*                                                                       */
-  /*    aadvance :: The horizontal (or vertical) advance.  Set to zero in  */
-  /*                case of error.                                         */
-  /*                                                                       */
-  typedef void
-  (*TT_Get_Metrics_Func)( TT_Face     face,
-                          FT_Bool     vertical,
-                          FT_UInt     gindex,
-                          FT_Short*   abearing,
-                          FT_UShort*  aadvance );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Get_Name_Func                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    From the `name' table, return a given ENGLISH name record in       */
-  /*    ASCII.                                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /*    nameid   :: The name id of the name record to return.              */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    name     :: The address of an allocated string pointer.  NULL if   */
-  /*                no name is present.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Get_Name_Func)( TT_Face      face,
-                       FT_UShort    nameid,
-                       FT_String**  name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Table_Func                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Load a given TrueType table.                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the target face object.                      */
-  /*                                                                       */
-  /*    stream :: The input stream.                                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The function uses `face->goto_table' to seek the stream to the     */
-  /*    start of the table, except while loading the font directory.       */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Table_Func)( TT_Face    face,
-                         FT_Stream  stream );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Free_Table_Func                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Free a given TrueType table.                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the target face object.                        */
-  /*                                                                       */
-  typedef void
-  (*TT_Free_Table_Func)( TT_Face  face );
-
-
-  /*
-   * @functype:
-   *    TT_Face_GetKerningFunc
-   *
-   * @description:
-   *    Return the horizontal kerning value between two glyphs.
-   *
-   * @input:
-   *    face        :: A handle to the source face object.
-   *    left_glyph  :: The left glyph index.
-   *    right_glyph :: The right glyph index.
-   *
-   * @return:
-   *    The kerning value in font units.
-   */
-  typedef FT_Int
-  (*TT_Face_GetKerningFunc)( TT_Face  face,
-                             FT_UInt  left_glyph,
-                             FT_UInt  right_glyph );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    SFNT_Interface                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure holds pointers to the functions used to load and    */
-  /*    free the basic tables that are required in a `sfnt' font file.     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Check the various xxx_Func() descriptions for details.             */
-  /*                                                                       */
-  typedef struct  SFNT_Interface_
-  {
-    TT_Loader_GotoTableFunc      goto_table;
-
-    TT_Init_Face_Func            init_face;
-    TT_Load_Face_Func            load_face;
-    TT_Done_Face_Func            done_face;
-    FT_Module_Requester          get_interface;
-
-    TT_Load_Any_Func             load_any;
-
-    /* these functions are called by `load_face' but they can also  */
-    /* be called from external modules, if there is a need to do so */
-    TT_Load_Table_Func           load_head;
-    TT_Load_Metrics_Func         load_hhea;
-    TT_Load_Table_Func           load_cmap;
-    TT_Load_Table_Func           load_maxp;
-    TT_Load_Table_Func           load_os2;
-    TT_Load_Table_Func           load_post;
-
-    TT_Load_Table_Func           load_name;
-    TT_Free_Table_Func           free_name;
-
-    /* this field was called `load_kerning' up to version 2.1.10 */
-    TT_Load_Table_Func           load_kern;
-
-    TT_Load_Table_Func           load_gasp;
-    TT_Load_Table_Func           load_pclt;
-
-    /* see `ttload.h'; this field was called `load_bitmap_header' up to */
-    /* version 2.1.10                                                   */
-    TT_Load_Table_Func           load_bhed;
-
-    TT_Load_SBit_Image_Func      load_sbit_image;
-
-    /* see `ttpost.h' */
-    TT_Get_PS_Name_Func          get_psname;
-    TT_Free_Table_Func           free_psnames;
-
-    /* starting here, the structure differs from version 2.1.7 */
-
-    /* this field was introduced in version 2.1.8, named `get_psname' */
-    TT_Face_GetKerningFunc       get_kerning;
-
-    /* new elements introduced after version 2.1.10 */
-
-    /* load the font directory, i.e., the offset table and */
-    /* the table directory                                 */
-    TT_Load_Table_Func           load_font_dir;
-    TT_Load_Metrics_Func         load_hmtx;
-
-    TT_Load_Table_Func           load_eblc;
-    TT_Free_Table_Func           free_eblc;
-
-    TT_Set_SBit_Strike_Func      set_sbit_strike;
-    TT_Load_Strike_Metrics_Func  load_strike_metrics;
-
-    TT_Get_Metrics_Func          get_metrics;
-
-    TT_Get_Name_Func             get_name;
-
-  } SFNT_Interface;
-
-
-  /* transitional */
-  typedef SFNT_Interface*   SFNT_Service;
-
-#ifndef FT_CONFIG_OPTION_PIC
-
-#define FT_DEFINE_SFNT_INTERFACE(        \
-          class_,                        \
-          goto_table_,                   \
-          init_face_,                    \
-          load_face_,                    \
-          done_face_,                    \
-          get_interface_,                \
-          load_any_,                     \
-          load_head_,                    \
-          load_hhea_,                    \
-          load_cmap_,                    \
-          load_maxp_,                    \
-          load_os2_,                     \
-          load_post_,                    \
-          load_name_,                    \
-          free_name_,                    \
-          load_kern_,                    \
-          load_gasp_,                    \
-          load_pclt_,                    \
-          load_bhed_,                    \
-          load_sbit_image_,              \
-          get_psname_,                   \
-          free_psnames_,                 \
-          get_kerning_,                  \
-          load_font_dir_,                \
-          load_hmtx_,                    \
-          load_eblc_,                    \
-          free_eblc_,                    \
-          set_sbit_strike_,              \
-          load_strike_metrics_,          \
-          get_metrics_,                  \
-          get_name_ )                    \
-  static const SFNT_Interface  class_ =  \
-  {                                      \
-    goto_table_,                         \
-    init_face_,                          \
-    load_face_,                          \
-    done_face_,                          \
-    get_interface_,                      \
-    load_any_,                           \
-    load_head_,                          \
-    load_hhea_,                          \
-    load_cmap_,                          \
-    load_maxp_,                          \
-    load_os2_,                           \
-    load_post_,                          \
-    load_name_,                          \
-    free_name_,                          \
-    load_kern_,                          \
-    load_gasp_,                          \
-    load_pclt_,                          \
-    load_bhed_,                          \
-    load_sbit_image_,                    \
-    get_psname_,                         \
-    free_psnames_,                       \
-    get_kerning_,                        \
-    load_font_dir_,                      \
-    load_hmtx_,                          \
-    load_eblc_,                          \
-    free_eblc_,                          \
-    set_sbit_strike_,                    \
-    load_strike_metrics_,                \
-    get_metrics_,                        \
-    get_name_,                           \
-  };
-
-#else /* FT_CONFIG_OPTION_PIC */
-
-#define FT_INTERNAL( a, a_ )  \
-          clazz->a = a_;
-
-#define FT_DEFINE_SFNT_INTERFACE(                       \
-          class_,                                       \
-          goto_table_,                                  \
-          init_face_,                                   \
-          load_face_,                                   \
-          done_face_,                                   \
-          get_interface_,                               \
-          load_any_,                                    \
-          load_head_,                                   \
-          load_hhea_,                                   \
-          load_cmap_,                                   \
-          load_maxp_,                                   \
-          load_os2_,                                    \
-          load_post_,                                   \
-          load_name_,                                   \
-          free_name_,                                   \
-          load_kern_,                                   \
-          load_gasp_,                                   \
-          load_pclt_,                                   \
-          load_bhed_,                                   \
-          load_sbit_image_,                             \
-          get_psname_,                                  \
-          free_psnames_,                                \
-          get_kerning_,                                 \
-          load_font_dir_,                               \
-          load_hmtx_,                                   \
-          load_eblc_,                                   \
-          free_eblc_,                                   \
-          set_sbit_strike_,                             \
-          load_strike_metrics_,                         \
-          get_metrics_,                                 \
-          get_name_ )                                   \
-  void                                                  \
-  FT_Init_Class_ ## class_( FT_Library       library,   \
-                            SFNT_Interface*  clazz )    \
-  {                                                     \
-    FT_UNUSED( library );                               \
-                                                        \
-    clazz->goto_table          = goto_table_;           \
-    clazz->init_face           = init_face_;            \
-    clazz->load_face           = load_face_;            \
-    clazz->done_face           = done_face_;            \
-    clazz->get_interface       = get_interface_;        \
-    clazz->load_any            = load_any_;             \
-    clazz->load_head           = load_head_;            \
-    clazz->load_hhea           = load_hhea_;            \
-    clazz->load_cmap           = load_cmap_;            \
-    clazz->load_maxp           = load_maxp_;            \
-    clazz->load_os2            = load_os2_;             \
-    clazz->load_post           = load_post_;            \
-    clazz->load_name           = load_name_;            \
-    clazz->free_name           = free_name_;            \
-    clazz->load_kern           = load_kern_;            \
-    clazz->load_gasp           = load_gasp_;            \
-    clazz->load_pclt           = load_pclt_;            \
-    clazz->load_bhed           = load_bhed_;            \
-    clazz->load_sbit_image     = load_sbit_image_;      \
-    clazz->get_psname          = get_psname_;           \
-    clazz->free_psnames        = free_psnames_;         \
-    clazz->get_kerning         = get_kerning_;          \
-    clazz->load_font_dir       = load_font_dir_;        \
-    clazz->load_hmtx           = load_hmtx_;            \
-    clazz->load_eblc           = load_eblc_;            \
-    clazz->free_eblc           = free_eblc_;            \
-    clazz->set_sbit_strike     = set_sbit_strike_;      \
-    clazz->load_strike_metrics = load_strike_metrics_;  \
-    clazz->get_metrics         = get_metrics_;          \
-    clazz->get_name            = get_name_;             \
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-FT_END_HEADER
-
-#endif /* SFNT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/t1types.h b/dependencies2013/win32/include/freetype/internal/t1types.h
deleted file mode 100644
index 494c011f..00000000
--- a/dependencies2013/win32/include/freetype/internal/t1types.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t1types.h                                                              */
-/*                                                                         */
-/*    Basic Type1/Type2 type definitions and interface (specification      */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef T1TYPES_H_
-#define T1TYPES_H_
-
-
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_HASH_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***              REQUIRED TYPE1/TYPE2 TABLES DEFINITIONS              ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_EncodingRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling a custom encoding.                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_chars  :: The number of character codes in the encoding.       */
-  /*                  Usually 256.                                         */
-  /*                                                                       */
-  /*    code_first :: The lowest valid character code in the encoding.     */
-  /*                                                                       */
-  /*    code_last  :: The highest valid character code in the encoding     */
-  /*                  + 1. When equal to code_first there are no valid     */
-  /*                  character codes.                                     */
-  /*                                                                       */
-  /*    char_index :: An array of corresponding glyph indices.             */
-  /*                                                                       */
-  /*    char_name  :: An array of corresponding glyph names.               */
-  /*                                                                       */
-  typedef struct  T1_EncodingRecRec_
-  {
-    FT_Int       num_chars;
-    FT_Int       code_first;
-    FT_Int       code_last;
-
-    FT_UShort*   char_index;
-    FT_String**  char_name;
-
-  } T1_EncodingRec, *T1_Encoding;
-
-
-  /* used to hold extra data of PS_FontInfoRec that
-   * cannot be stored in the publicly defined structure.
-   *
-   * Note these can't be blended with multiple-masters.
-   */
-  typedef struct  PS_FontExtraRec_
-  {
-    FT_UShort  fs_type;
-
-  } PS_FontExtraRec;
-
-
-  typedef struct  T1_FontRec_
-  {
-    PS_FontInfoRec   font_info;         /* font info dictionary   */
-    PS_FontExtraRec  font_extra;        /* font info extra fields */
-    PS_PrivateRec    private_dict;      /* private dictionary     */
-    FT_String*       font_name;         /* top-level dictionary   */
-
-    T1_EncodingType  encoding_type;
-    T1_EncodingRec   encoding;
-
-    FT_Byte*         subrs_block;
-    FT_Byte*         charstrings_block;
-    FT_Byte*         glyph_names_block;
-
-    FT_Int           num_subrs;
-    FT_Byte**        subrs;
-    FT_UInt*         subrs_len;
-    FT_Hash          subrs_hash;
-
-    FT_Int           num_glyphs;
-    FT_String**      glyph_names;       /* array of glyph names       */
-    FT_Byte**        charstrings;       /* array of glyph charstrings */
-    FT_UInt*         charstrings_len;
-
-    FT_Byte          paint_type;
-    FT_Byte          font_type;
-    FT_Matrix        font_matrix;
-    FT_Vector        font_offset;
-    FT_BBox          font_bbox;
-    FT_Long          font_id;
-
-    FT_Fixed         stroke_width;
-
-  } T1_FontRec, *T1_Font;
-
-
-  typedef struct  CID_SubrsRec_
-  {
-    FT_Int     num_subrs;
-    FT_Byte**  code;
-
-  } CID_SubrsRec, *CID_Subrs;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                AFM FONT INFORMATION STRUCTURES                    ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct  AFM_TrackKernRec_
-  {
-    FT_Int    degree;
-    FT_Fixed  min_ptsize;
-    FT_Fixed  min_kern;
-    FT_Fixed  max_ptsize;
-    FT_Fixed  max_kern;
-
-  } AFM_TrackKernRec, *AFM_TrackKern;
-
-  typedef struct  AFM_KernPairRec_
-  {
-    FT_UInt  index1;
-    FT_UInt  index2;
-    FT_Int   x;
-    FT_Int   y;
-
-  } AFM_KernPairRec, *AFM_KernPair;
-
-  typedef struct  AFM_FontInfoRec_
-  {
-    FT_Bool        IsCIDFont;
-    FT_BBox        FontBBox;
-    FT_Fixed       Ascender;
-    FT_Fixed       Descender;
-    AFM_TrackKern  TrackKerns;   /* free if non-NULL */
-    FT_UInt        NumTrackKern;
-    AFM_KernPair   KernPairs;    /* free if non-NULL */
-    FT_UInt        NumKernPair;
-
-  } AFM_FontInfoRec, *AFM_FontInfo;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                ORIGINAL T1_FACE CLASS DEFINITION                  ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct T1_FaceRec_*   T1_Face;
-  typedef struct CID_FaceRec_*  CID_Face;
-
-
-  typedef struct  T1_FaceRec_
-  {
-    FT_FaceRec      root;
-    T1_FontRec      type1;
-    const void*     psnames;
-    const void*     psaux;
-    const void*     afm_data;
-    FT_CharMapRec   charmaprecs[2];
-    FT_CharMap      charmaps[2];
-
-    /* support for Multiple Masters fonts */
-    PS_Blend        blend;
-
-    /* undocumented, optional: indices of subroutines that express      */
-    /* the NormalizeDesignVector and the ConvertDesignVector procedure, */
-    /* respectively, as Type 2 charstrings; -1 if keywords not present  */
-    FT_Int           ndv_idx;
-    FT_Int           cdv_idx;
-
-    /* undocumented, optional: has the same meaning as len_buildchar */
-    /* for Type 2 fonts; manipulated by othersubrs 19, 24, and 25    */
-    FT_UInt          len_buildchar;
-    FT_Long*         buildchar;
-
-    /* since version 2.1 - interface to PostScript hinter */
-    const void*     pshinter;
-
-  } T1_FaceRec;
-
-
-  typedef struct  CID_FaceRec_
-  {
-    FT_FaceRec       root;
-    void*            psnames;
-    void*            psaux;
-    CID_FaceInfoRec  cid;
-    PS_FontExtraRec  font_extra;
-#if 0
-    void*            afm_data;
-#endif
-    CID_Subrs        subrs;
-
-    /* since version 2.1 - interface to PostScript hinter */
-    void*            pshinter;
-
-    /* since version 2.1.8, but was originally positioned after `afm_data' */
-    FT_Byte*         binary_data; /* used if hex data has been converted */
-    FT_Stream        cid_stream;
-
-  } CID_FaceRec;
-
-
-FT_END_HEADER
-
-#endif /* T1TYPES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/internal/tttypes.h b/dependencies2013/win32/include/freetype/internal/tttypes.h
deleted file mode 100644
index 8f1a642d..00000000
--- a/dependencies2013/win32/include/freetype/internal/tttypes.h
+++ /dev/null
@@ -1,1522 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttypes.h                                                              */
-/*                                                                         */
-/*    Basic SFNT/TrueType type definitions and interface (specification    */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef TTTYPES_H_
-#define TTTYPES_H_
-
-
-#include <ft2build.h>
-#include FT_TRUETYPE_TABLES_H
-#include FT_INTERNAL_OBJECTS_H
-
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-#include FT_MULTIPLE_MASTERS_H
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***             REQUIRED TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TTC_HeaderRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    TrueType collection header.  This table contains the offsets of    */
-  /*    the font headers of each distinct TrueType face in the file.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tag     :: Must be `ttc ' to indicate a TrueType collection.       */
-  /*                                                                       */
-  /*    version :: The version number.                                     */
-  /*                                                                       */
-  /*    count   :: The number of faces in the collection.  The             */
-  /*               specification says this should be an unsigned long, but */
-  /*               we use a signed long since we need the value -1 for     */
-  /*               specific purposes.                                      */
-  /*                                                                       */
-  /*    offsets :: The offsets of the font headers, one per face.          */
-  /*                                                                       */
-  typedef struct  TTC_HeaderRec_
-  {
-    FT_ULong   tag;
-    FT_Fixed   version;
-    FT_Long    count;
-    FT_ULong*  offsets;
-
-  } TTC_HeaderRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    SFNT_HeaderRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    SFNT file format header.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    format_tag     :: The font format tag.                             */
-  /*                                                                       */
-  /*    num_tables     :: The number of tables in file.                    */
-  /*                                                                       */
-  /*    search_range   :: Must be `16 * (max power of 2 <= num_tables)'.   */
-  /*                                                                       */
-  /*    entry_selector :: Must be log2 of `search_range / 16'.             */
-  /*                                                                       */
-  /*    range_shift    :: Must be `num_tables * 16 - search_range'.        */
-  /*                                                                       */
-  typedef struct  SFNT_HeaderRec_
-  {
-    FT_ULong   format_tag;
-    FT_UShort  num_tables;
-    FT_UShort  search_range;
-    FT_UShort  entry_selector;
-    FT_UShort  range_shift;
-
-    FT_ULong   offset;  /* not in file */
-
-  } SFNT_HeaderRec, *SFNT_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_TableRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure describes a given table of a TrueType font.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Tag      :: A four-bytes tag describing the table.                 */
-  /*                                                                       */
-  /*    CheckSum :: The table checksum.  This value can be ignored.        */
-  /*                                                                       */
-  /*    Offset   :: The offset of the table from the start of the TrueType */
-  /*                font in its resource.                                  */
-  /*                                                                       */
-  /*    Length   :: The table length (in bytes).                           */
-  /*                                                                       */
-  typedef struct  TT_TableRec_
-  {
-    FT_ULong  Tag;        /*        table type */
-    FT_ULong  CheckSum;   /*    table checksum */
-    FT_ULong  Offset;     /* table file offset */
-    FT_ULong  Length;     /*      table length */
-
-  } TT_TableRec, *TT_Table;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    WOFF_HeaderRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    WOFF file format header.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    See                                                                */
-  /*                                                                       */
-  /*      http://www.w3.org/TR/WOFF/#WOFFHeader                            */
-  /*                                                                       */
-  typedef struct  WOFF_HeaderRec_
-  {
-    FT_ULong   signature;
-    FT_ULong   flavor;
-    FT_ULong   length;
-    FT_UShort  num_tables;
-    FT_UShort  reserved;
-    FT_ULong   totalSfntSize;
-    FT_UShort  majorVersion;
-    FT_UShort  minorVersion;
-    FT_ULong   metaOffset;
-    FT_ULong   metaLength;
-    FT_ULong   metaOrigLength;
-    FT_ULong   privOffset;
-    FT_ULong   privLength;
-
-  } WOFF_HeaderRec, *WOFF_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    WOFF_TableRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure describes a given table of a WOFF font.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Tag        :: A four-bytes tag describing the table.               */
-  /*                                                                       */
-  /*    Offset     :: The offset of the table from the start of the WOFF   */
-  /*                  font in its resource.                                */
-  /*                                                                       */
-  /*    CompLength :: Compressed table length (in bytes).                  */
-  /*                                                                       */
-  /*    OrigLength :: Uncompressed table length (in bytes).                */
-  /*                                                                       */
-  /*    CheckSum   :: The table checksum.  This value can be ignored.      */
-  /*                                                                       */
-  /*    OrigOffset :: The uncompressed table file offset.  This value gets */
-  /*                  computed while constructing the (uncompressed) SFNT  */
-  /*                  header.  It is not contained in the WOFF file.       */
-  /*                                                                       */
-  typedef struct  WOFF_TableRec_
-  {
-    FT_ULong  Tag;           /* table ID                  */
-    FT_ULong  Offset;        /* table file offset         */
-    FT_ULong  CompLength;    /* compressed table length   */
-    FT_ULong  OrigLength;    /* uncompressed table length */
-    FT_ULong  CheckSum;      /* uncompressed checksum     */
-
-    FT_ULong  OrigOffset;    /* uncompressed table file offset */
-                             /* (not in the WOFF file)         */
-  } WOFF_TableRec, *WOFF_Table;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_LongMetricsRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the long metrics of the `hmtx' and `vmtx'     */
-  /*    TrueType tables.  The values are expressed in font units.          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    advance :: The advance width or height for the glyph.              */
-  /*                                                                       */
-  /*    bearing :: The left-side or top-side bearing for the glyph.        */
-  /*                                                                       */
-  typedef struct  TT_LongMetricsRec_
-  {
-    FT_UShort  advance;
-    FT_Short   bearing;
-
-  } TT_LongMetricsRec, *TT_LongMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_ShortMetrics                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple type to model the short metrics of the `hmtx' and `vmtx'  */
-  /*    tables.                                                            */
-  /*                                                                       */
-  typedef FT_Short  TT_ShortMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_NameEntryRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling TrueType name records.  Name records are used */
-  /*    to store important strings like family name, style name,           */
-  /*    copyright, etc. in _localized_ versions (i.e., language, encoding, */
-  /*    etc).                                                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platformID   :: The ID of the name's encoding platform.            */
-  /*                                                                       */
-  /*    encodingID   :: The platform-specific ID for the name's encoding.  */
-  /*                                                                       */
-  /*    languageID   :: The platform-specific ID for the name's language.  */
-  /*                                                                       */
-  /*    nameID       :: The ID specifying what kind of name this is.       */
-  /*                                                                       */
-  /*    stringLength :: The length of the string in bytes.                 */
-  /*                                                                       */
-  /*    stringOffset :: The offset to the string in the `name' table.      */
-  /*                                                                       */
-  /*    string       :: A pointer to the string's bytes.  Note that these  */
-  /*                    are usually UTF-16 encoded characters.             */
-  /*                                                                       */
-  typedef struct  TT_NameEntryRec_
-  {
-    FT_UShort  platformID;
-    FT_UShort  encodingID;
-    FT_UShort  languageID;
-    FT_UShort  nameID;
-    FT_UShort  stringLength;
-    FT_ULong   stringOffset;
-
-    /* this last field is not defined in the spec */
-    /* but used by the FreeType engine            */
-
-    FT_Byte*   string;
-
-  } TT_NameEntryRec, *TT_NameEntry;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_NameTableRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the TrueType name table.                      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    format         :: The format of the name table.                    */
-  /*                                                                       */
-  /*    numNameRecords :: The number of names in table.                    */
-  /*                                                                       */
-  /*    storageOffset  :: The offset of the name table in the `name'       */
-  /*                      TrueType table.                                  */
-  /*                                                                       */
-  /*    names          :: An array of name records.                        */
-  /*                                                                       */
-  /*    stream         :: the file's input stream.                         */
-  /*                                                                       */
-  typedef struct  TT_NameTableRec_
-  {
-    FT_UShort         format;
-    FT_UInt           numNameRecords;
-    FT_UInt           storageOffset;
-    TT_NameEntryRec*  names;
-    FT_Stream         stream;
-
-  } TT_NameTableRec, *TT_NameTable;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***             OPTIONAL TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_GaspRangeRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A tiny structure used to model a gasp range according to the       */
-  /*    TrueType specification.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    maxPPEM  :: The maximum ppem value to which `gaspFlag' applies.    */
-  /*                                                                       */
-  /*    gaspFlag :: A flag describing the grid-fitting and anti-aliasing   */
-  /*                modes to be used.                                      */
-  /*                                                                       */
-  typedef struct  TT_GaspRangeRec_
-  {
-    FT_UShort  maxPPEM;
-    FT_UShort  gaspFlag;
-
-  } TT_GaspRangeRec, *TT_GaspRange;
-
-
-#define TT_GASP_GRIDFIT  0x01
-#define TT_GASP_DOGRAY   0x02
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_GaspRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the TrueType `gasp' table used to specify     */
-  /*    grid-fitting and anti-aliasing behaviour.                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version    :: The version number.                                  */
-  /*                                                                       */
-  /*    numRanges  :: The number of gasp ranges in table.                  */
-  /*                                                                       */
-  /*    gaspRanges :: An array of gasp ranges.                             */
-  /*                                                                       */
-  typedef struct  TT_Gasp_
-  {
-    FT_UShort     version;
-    FT_UShort     numRanges;
-    TT_GaspRange  gaspRanges;
-
-  } TT_GaspRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                    EMBEDDED BITMAPS SUPPORT                       ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_MetricsRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold the big metrics of a given glyph bitmap   */
-  /*    in a TrueType or OpenType font.  These are usually found in the    */
-  /*    `EBDT' (Microsoft) or `bloc' (Apple) table.                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height       :: The glyph height in pixels.                        */
-  /*                                                                       */
-  /*    width        :: The glyph width in pixels.                         */
-  /*                                                                       */
-  /*    horiBearingX :: The horizontal left bearing.                       */
-  /*                                                                       */
-  /*    horiBearingY :: The horizontal top bearing.                        */
-  /*                                                                       */
-  /*    horiAdvance  :: The horizontal advance.                            */
-  /*                                                                       */
-  /*    vertBearingX :: The vertical left bearing.                         */
-  /*                                                                       */
-  /*    vertBearingY :: The vertical top bearing.                          */
-  /*                                                                       */
-  /*    vertAdvance  :: The vertical advance.                              */
-  /*                                                                       */
-  typedef struct  TT_SBit_MetricsRec_
-  {
-    FT_UShort  height;
-    FT_UShort  width;
-
-    FT_Short   horiBearingX;
-    FT_Short   horiBearingY;
-    FT_UShort  horiAdvance;
-
-    FT_Short   vertBearingX;
-    FT_Short   vertBearingY;
-    FT_UShort  vertAdvance;
-
-  } TT_SBit_MetricsRec, *TT_SBit_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_SmallMetricsRec                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold the small metrics of a given glyph bitmap */
-  /*    in a TrueType or OpenType font.  These are usually found in the    */
-  /*    `EBDT' (Microsoft) or the `bdat' (Apple) table.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height   :: The glyph height in pixels.                            */
-  /*                                                                       */
-  /*    width    :: The glyph width in pixels.                             */
-  /*                                                                       */
-  /*    bearingX :: The left-side bearing.                                 */
-  /*                                                                       */
-  /*    bearingY :: The top-side bearing.                                  */
-  /*                                                                       */
-  /*    advance  :: The advance width or height.                           */
-  /*                                                                       */
-  typedef struct  TT_SBit_Small_Metrics_
-  {
-    FT_Byte  height;
-    FT_Byte  width;
-
-    FT_Char  bearingX;
-    FT_Char  bearingY;
-    FT_Byte  advance;
-
-  } TT_SBit_SmallMetricsRec, *TT_SBit_SmallMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_LineMetricsRec                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe the text line metrics of a given      */
-  /*    bitmap strike, for either a horizontal or vertical layout.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    ascender                :: The ascender in pixels.                 */
-  /*                                                                       */
-  /*    descender               :: The descender in pixels.                */
-  /*                                                                       */
-  /*    max_width               :: The maximum glyph width in pixels.      */
-  /*                                                                       */
-  /*    caret_slope_enumerator  :: Rise of the caret slope, typically set  */
-  /*                               to 1 for non-italic fonts.              */
-  /*                                                                       */
-  /*    caret_slope_denominator :: Rise of the caret slope, typically set  */
-  /*                               to 0 for non-italic fonts.              */
-  /*                                                                       */
-  /*    caret_offset            :: Offset in pixels to move the caret for  */
-  /*                               proper positioning.                     */
-  /*                                                                       */
-  /*    min_origin_SB           :: Minimum of horiBearingX (resp.          */
-  /*                               vertBearingY).                          */
-  /*    min_advance_SB          :: Minimum of                              */
-  /*                                                                       */
-  /*                                 horizontal advance -                  */
-  /*                                   ( horiBearingX + width )            */
-  /*                                                                       */
-  /*                               resp.                                   */
-  /*                                                                       */
-  /*                                 vertical advance -                    */
-  /*                                   ( vertBearingY + height )           */
-  /*                                                                       */
-  /*    max_before_BL           :: Maximum of horiBearingY (resp.          */
-  /*                               vertBearingY).                          */
-  /*                                                                       */
-  /*    min_after_BL            :: Minimum of                              */
-  /*                                                                       */
-  /*                                 horiBearingY - height                 */
-  /*                                                                       */
-  /*                               resp.                                   */
-  /*                                                                       */
-  /*                                 vertBearingX - width                  */
-  /*                                                                       */
-  /*    pads                    :: Unused (to make the size of the record  */
-  /*                               a multiple of 32 bits.                  */
-  /*                                                                       */
-  typedef struct  TT_SBit_LineMetricsRec_
-  {
-    FT_Char  ascender;
-    FT_Char  descender;
-    FT_Byte  max_width;
-    FT_Char  caret_slope_numerator;
-    FT_Char  caret_slope_denominator;
-    FT_Char  caret_offset;
-    FT_Char  min_origin_SB;
-    FT_Char  min_advance_SB;
-    FT_Char  max_before_BL;
-    FT_Char  min_after_BL;
-    FT_Char  pads[2];
-
-  } TT_SBit_LineMetricsRec, *TT_SBit_LineMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_RangeRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A TrueType/OpenType subIndexTable as defined in the `EBLC'         */
-  /*    (Microsoft) or `bloc' (Apple) tables.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    first_glyph   :: The first glyph index in the range.               */
-  /*                                                                       */
-  /*    last_glyph    :: The last glyph index in the range.                */
-  /*                                                                       */
-  /*    index_format  :: The format of index table.  Valid values are 1    */
-  /*                     to 5.                                             */
-  /*                                                                       */
-  /*    image_format  :: The format of `EBDT' image data.                  */
-  /*                                                                       */
-  /*    image_offset  :: The offset to image data in `EBDT'.               */
-  /*                                                                       */
-  /*    image_size    :: For index formats 2 and 5.  This is the size in   */
-  /*                     bytes of each glyph bitmap.                       */
-  /*                                                                       */
-  /*    big_metrics   :: For index formats 2 and 5.  This is the big       */
-  /*                     metrics for each glyph bitmap.                    */
-  /*                                                                       */
-  /*    num_glyphs    :: For index formats 4 and 5.  This is the number of */
-  /*                     glyphs in the code array.                         */
-  /*                                                                       */
-  /*    glyph_offsets :: For index formats 1 and 3.                        */
-  /*                                                                       */
-  /*    glyph_codes   :: For index formats 4 and 5.                        */
-  /*                                                                       */
-  /*    table_offset  :: The offset of the index table in the `EBLC'       */
-  /*                     table.  Only used during strike loading.          */
-  /*                                                                       */
-  typedef struct  TT_SBit_RangeRec_
-  {
-    FT_UShort           first_glyph;
-    FT_UShort           last_glyph;
-
-    FT_UShort           index_format;
-    FT_UShort           image_format;
-    FT_ULong            image_offset;
-
-    FT_ULong            image_size;
-    TT_SBit_MetricsRec  metrics;
-    FT_ULong            num_glyphs;
-
-    FT_ULong*           glyph_offsets;
-    FT_UShort*          glyph_codes;
-
-    FT_ULong            table_offset;
-
-  } TT_SBit_RangeRec, *TT_SBit_Range;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_StrikeRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used describe a given bitmap strike in the `EBLC'      */
-  /*    (Microsoft) or `bloc' (Apple) tables.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*   num_index_ranges :: The number of index ranges.                     */
-  /*                                                                       */
-  /*   index_ranges     :: An array of glyph index ranges.                 */
-  /*                                                                       */
-  /*   color_ref        :: Unused.  `color_ref' is put in for future       */
-  /*                       enhancements, but these fields are already      */
-  /*                       in use by other platforms (e.g. Newton).        */
-  /*                       For details, please see                         */
-  /*                                                                       */
-  /*                         https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6bloc.html */
-  /*                                                                       */
-  /*   hori             :: The line metrics for horizontal layouts.        */
-  /*                                                                       */
-  /*   vert             :: The line metrics for vertical layouts.          */
-  /*                                                                       */
-  /*   start_glyph      :: The lowest glyph index for this strike.         */
-  /*                                                                       */
-  /*   end_glyph        :: The highest glyph index for this strike.        */
-  /*                                                                       */
-  /*   x_ppem           :: The number of horizontal pixels per EM.         */
-  /*                                                                       */
-  /*   y_ppem           :: The number of vertical pixels per EM.           */
-  /*                                                                       */
-  /*   bit_depth        :: The bit depth.  Valid values are 1, 2, 4,       */
-  /*                       and 8.                                          */
-  /*                                                                       */
-  /*   flags            :: Is this a vertical or horizontal strike?  For   */
-  /*                       details, please see                             */
-  /*                                                                       */
-  /*                         https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6bloc.html */
-  /*                                                                       */
-  typedef struct  TT_SBit_StrikeRec_
-  {
-    FT_Int                  num_ranges;
-    TT_SBit_Range           sbit_ranges;
-    FT_ULong                ranges_offset;
-
-    FT_ULong                color_ref;
-
-    TT_SBit_LineMetricsRec  hori;
-    TT_SBit_LineMetricsRec  vert;
-
-    FT_UShort               start_glyph;
-    FT_UShort               end_glyph;
-
-    FT_Byte                 x_ppem;
-    FT_Byte                 y_ppem;
-
-    FT_Byte                 bit_depth;
-    FT_Char                 flags;
-
-  } TT_SBit_StrikeRec, *TT_SBit_Strike;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_ComponentRec                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure to describe a compound sbit element.            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    glyph_code :: The element's glyph index.                           */
-  /*                                                                       */
-  /*    x_offset   :: The element's left bearing.                          */
-  /*                                                                       */
-  /*    y_offset   :: The element's top bearing.                           */
-  /*                                                                       */
-  typedef struct  TT_SBit_ComponentRec_
-  {
-    FT_UShort  glyph_code;
-    FT_Char    x_offset;
-    FT_Char    y_offset;
-
-  } TT_SBit_ComponentRec, *TT_SBit_Component;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_ScaleRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used describe a given bitmap scaling table, as defined */
-  /*    in the `EBSC' table.                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    hori              :: The horizontal line metrics.                  */
-  /*                                                                       */
-  /*    vert              :: The vertical line metrics.                    */
-  /*                                                                       */
-  /*    x_ppem            :: The number of horizontal pixels per EM.       */
-  /*                                                                       */
-  /*    y_ppem            :: The number of vertical pixels per EM.         */
-  /*                                                                       */
-  /*    x_ppem_substitute :: Substitution x_ppem value.                    */
-  /*                                                                       */
-  /*    y_ppem_substitute :: Substitution y_ppem value.                    */
-  /*                                                                       */
-  typedef struct  TT_SBit_ScaleRec_
-  {
-    TT_SBit_LineMetricsRec  hori;
-    TT_SBit_LineMetricsRec  vert;
-
-    FT_Byte                 x_ppem;
-    FT_Byte                 y_ppem;
-
-    FT_Byte                 x_ppem_substitute;
-    FT_Byte                 y_ppem_substitute;
-
-  } TT_SBit_ScaleRec, *TT_SBit_Scale;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  POSTSCRIPT GLYPH NAMES SUPPORT                   ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_20Rec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names sub-table, format 2.0.  Stores the PS name of     */
-  /*    each glyph in the font face.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_glyphs    :: The number of named glyphs in the table.          */
-  /*                                                                       */
-  /*    num_names     :: The number of PS names stored in the table.       */
-  /*                                                                       */
-  /*    glyph_indices :: The indices of the glyphs in the names arrays.    */
-  /*                                                                       */
-  /*    glyph_names   :: The PS names not in Mac Encoding.                 */
-  /*                                                                       */
-  typedef struct  TT_Post_20Rec_
-  {
-    FT_UShort   num_glyphs;
-    FT_UShort   num_names;
-    FT_UShort*  glyph_indices;
-    FT_Char**   glyph_names;
-
-  } TT_Post_20Rec, *TT_Post_20;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_25Rec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names sub-table, format 2.5.  Stores the PS name of     */
-  /*    each glyph in the font face.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_glyphs :: The number of glyphs in the table.                   */
-  /*                                                                       */
-  /*    offsets    :: An array of signed offsets in a normal Mac           */
-  /*                  Postscript name encoding.                            */
-  /*                                                                       */
-  typedef struct  TT_Post_25_
-  {
-    FT_UShort  num_glyphs;
-    FT_Char*   offsets;
-
-  } TT_Post_25Rec, *TT_Post_25;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_NamesRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names table, either format 2.0 or 2.5.                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    loaded    :: A flag to indicate whether the PS names are loaded.   */
-  /*                                                                       */
-  /*    format_20 :: The sub-table used for format 2.0.                    */
-  /*                                                                       */
-  /*    format_25 :: The sub-table used for format 2.5.                    */
-  /*                                                                       */
-  typedef struct  TT_Post_NamesRec_
-  {
-    FT_Bool  loaded;
-
-    union
-    {
-      TT_Post_20Rec  format_20;
-      TT_Post_25Rec  format_25;
-
-    } names;
-
-  } TT_Post_NamesRec, *TT_Post_Names;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                    GX VARIATION TABLE SUPPORT                     ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-  typedef struct GX_BlendRec_  *GX_Blend;
-#endif
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***              EMBEDDED BDF PROPERTIES TABLE SUPPORT                ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   * These types are used to support a `BDF ' table that isn't part of the
-   * official TrueType specification.  It is mainly used in SFNT-based
-   * bitmap fonts that were generated from a set of BDF fonts.
-   *
-   * The format of the table is as follows.
-   *
-   *   USHORT   version      `BDF ' table version number, should be 0x0001.
-   *   USHORT   strikeCount  Number of strikes (bitmap sizes) in this table.
-   *   ULONG    stringTable  Offset (from start of BDF table) to string
-   *                         table.
-   *
-   * This is followed by an array of `strikeCount' descriptors, having the
-   * following format.
-   *
-   *   USHORT   ppem         Vertical pixels per EM for this strike.
-   *   USHORT   numItems     Number of items for this strike (properties and
-   *                         atoms).  Maximum is 255.
-   *
-   * This array in turn is followed by `strikeCount' value sets.  Each
-   * `value set' is an array of `numItems' items with the following format.
-   *
-   *   ULONG    item_name    Offset in string table to item name.
-   *   USHORT   item_type    The item type.  Possible values are
-   *                            0 => string (e.g., COMMENT)
-   *                            1 => atom   (e.g., FONT or even SIZE)
-   *                            2 => int32
-   *                            3 => uint32
-   *                         0x10 => A flag to indicate a properties.  This
-   *                                 is ORed with the above values.
-   *   ULONG    item_value   For strings  => Offset into string table without
-   *                                         the corresponding double quotes.
-   *                         For atoms    => Offset into string table.
-   *                         For integers => Direct value.
-   *
-   * All strings in the string table consist of bytes and are
-   * zero-terminated.
-   *
-   */
-
-#ifdef TT_CONFIG_OPTION_BDF
-
-  typedef struct  TT_BDFRec_
-  {
-    FT_Byte*   table;
-    FT_Byte*   table_end;
-    FT_Byte*   strings;
-    FT_ULong   strings_size;
-    FT_UInt    num_strikes;
-    FT_Bool    loaded;
-
-  } TT_BDFRec, *TT_BDF;
-
-#endif /* TT_CONFIG_OPTION_BDF */
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  ORIGINAL TT_FACE CLASS DEFINITION                ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This structure/class is defined here because it is common to the      */
-  /* following formats: TTF, OpenType-TT, and OpenType-CFF.                */
-  /*                                                                       */
-  /* Note, however, that the classes TT_Size and TT_GlyphSlot are not      */
-  /* shared between font drivers, and are thus defined in `ttobjs.h'.      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a TrueType face/font object.  A TT_Face encapsulates   */
-  /*    the resolution and scaling independent parts of a TrueType font    */
-  /*    resource.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The TT_Face structure is also used as a `parent class' for the     */
-  /*    OpenType-CFF class (T2_Face).                                      */
-  /*                                                                       */
-  typedef struct TT_FaceRec_*  TT_Face;
-
-
-  /* a function type used for the truetype bytecode interpreter hooks */
-  typedef FT_Error
-  (*TT_Interpreter)( void*  exec_context );
-
-  /* forward declaration */
-  typedef struct TT_LoaderRec_*  TT_Loader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_GotoTableFunc                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Seeks a stream to the start of a given TrueType table.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the target face object.                      */
-  /*                                                                       */
-  /*    tag    :: A 4-byte tag used to name the table.                     */
-  /*                                                                       */
-  /*    stream :: The input stream.                                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    length :: The length of the table in bytes.  Set to 0 if not       */
-  /*              needed.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_GotoTableFunc)( TT_Face    face,
-                              FT_ULong   tag,
-                              FT_Stream  stream,
-                              FT_ULong*  length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_StartGlyphFunc                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Seeks a stream to the start of a given glyph element, and opens a  */
-  /*    frame for it.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader      :: The current TrueType glyph loader object.           */
-  /*                                                                       */
-  /*    glyph index :: The index of the glyph to access.                   */
-  /*                                                                       */
-  /*    offset      :: The offset of the glyph according to the            */
-  /*                   `locations' table.                                  */
-  /*                                                                       */
-  /*    byte_count  :: The size of the frame in bytes.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is normally equivalent to FT_STREAM_SEEK(offset)     */
-  /*    followed by FT_FRAME_ENTER(byte_count) with the loader's stream,   */
-  /*    but alternative formats (e.g. compressed ones) might use something */
-  /*    different.                                                         */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_StartGlyphFunc)( TT_Loader  loader,
-                               FT_UInt    glyph_index,
-                               FT_ULong   offset,
-                               FT_UInt    byte_count );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_ReadGlyphFunc                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reads one glyph element (its header, a simple glyph, or a          */
-  /*    composite) from the loader's current stream frame.                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader :: The current TrueType glyph loader object.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_ReadGlyphFunc)( TT_Loader  loader );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_EndGlyphFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Closes the current loader stream frame for the glyph.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader :: The current TrueType glyph loader object.                */
-  /*                                                                       */
-  typedef void
-  (*TT_Loader_EndGlyphFunc)( TT_Loader  loader );
-
-
-  typedef enum TT_SbitTableType_
-  {
-    TT_SBIT_TABLE_TYPE_NONE = 0,
-    TT_SBIT_TABLE_TYPE_EBLC, /* `EBLC' (Microsoft), */
-                             /* `bloc' (Apple)      */
-    TT_SBIT_TABLE_TYPE_CBLC, /* `CBLC' (Google)     */
-    TT_SBIT_TABLE_TYPE_SBIX, /* `sbix' (Apple)      */
-
-    /* do not remove */
-    TT_SBIT_TABLE_TYPE_MAX
-
-  } TT_SbitTableType;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                         TrueType Face Type                            */
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType face class.  These objects model the resolution and   */
-  /*    point-size independent data found in a TrueType font file.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root                 :: The base FT_Face structure, managed by the */
-  /*                            base layer.                                */
-  /*                                                                       */
-  /*    ttc_header           :: The TrueType collection header, used when  */
-  /*                            the file is a `ttc' rather than a `ttf'.   */
-  /*                            For ordinary font files, the field         */
-  /*                            `ttc_header.count' is set to 0.            */
-  /*                                                                       */
-  /*    format_tag           :: The font format tag.                       */
-  /*                                                                       */
-  /*    num_tables           :: The number of TrueType tables in this font */
-  /*                            file.                                      */
-  /*                                                                       */
-  /*    dir_tables           :: The directory of TrueType tables for this  */
-  /*                            font file.                                 */
-  /*                                                                       */
-  /*    header               :: The font's font header (`head' table).     */
-  /*                            Read on font opening.                      */
-  /*                                                                       */
-  /*    horizontal           :: The font's horizontal header (`hhea'       */
-  /*                            table).  This field also contains the      */
-  /*                            associated horizontal metrics table        */
-  /*                            (`hmtx').                                  */
-  /*                                                                       */
-  /*    max_profile          :: The font's maximum profile table.  Read on */
-  /*                            font opening.  Note that some maximum      */
-  /*                            values cannot be taken directly from this  */
-  /*                            table.  We thus define additional fields   */
-  /*                            below to hold the computed maxima.         */
-  /*                                                                       */
-  /*    vertical_info        :: A boolean which is set when the font file  */
-  /*                            contains vertical metrics.  If not, the    */
-  /*                            value of the `vertical' field is           */
-  /*                            undefined.                                 */
-  /*                                                                       */
-  /*    vertical             :: The font's vertical header (`vhea' table). */
-  /*                            This field also contains the associated    */
-  /*                            vertical metrics table (`vmtx'), if found. */
-  /*                            IMPORTANT: The contents of this field is   */
-  /*                            undefined if the `vertical_info' field is  */
-  /*                            unset.                                     */
-  /*                                                                       */
-  /*    num_names            :: The number of name records within this     */
-  /*                            TrueType font.                             */
-  /*                                                                       */
-  /*    name_table           :: The table of name records (`name').        */
-  /*                                                                       */
-  /*    os2                  :: The font's OS/2 table (`OS/2').            */
-  /*                                                                       */
-  /*    postscript           :: The font's PostScript table (`post'        */
-  /*                            table).  The PostScript glyph names are    */
-  /*                            not loaded by the driver on face opening.  */
-  /*                            See the `ttpost' module for more details.  */
-  /*                                                                       */
-  /*    cmap_table           :: Address of the face's `cmap' SFNT table    */
-  /*                            in memory (it's an extracted frame).       */
-  /*                                                                       */
-  /*    cmap_size            :: The size in bytes of the `cmap_table'      */
-  /*                            described above.                           */
-  /*                                                                       */
-  /*    goto_table           :: A function called by each TrueType table   */
-  /*                            loader to position a stream's cursor to    */
-  /*                            the start of a given table according to    */
-  /*                            its tag.  It defaults to TT_Goto_Face but  */
-  /*                            can be different for strange formats (e.g. */
-  /*                            Type 42).                                  */
-  /*                                                                       */
-  /*    access_glyph_frame   :: A function used to access the frame of a   */
-  /*                            given glyph within the face's font file.   */
-  /*                                                                       */
-  /*    forget_glyph_frame   :: A function used to forget the frame of a   */
-  /*                            given glyph when all data has been loaded. */
-  /*                                                                       */
-  /*    read_glyph_header    :: A function used to read a glyph header.    */
-  /*                            It must be called between an `access' and  */
-  /*                            `forget'.                                  */
-  /*                                                                       */
-  /*    read_simple_glyph    :: A function used to read a simple glyph.    */
-  /*                            It must be called after the header was     */
-  /*                            read, and before the `forget'.             */
-  /*                                                                       */
-  /*    read_composite_glyph :: A function used to read a composite glyph. */
-  /*                            It must be called after the header was     */
-  /*                            read, and before the `forget'.             */
-  /*                                                                       */
-  /*    sfnt                 :: A pointer to the SFNT service.             */
-  /*                                                                       */
-  /*    psnames              :: A pointer to the PostScript names service. */
-  /*                                                                       */
-  /*    hdmx                 :: The face's horizontal device metrics       */
-  /*                            (`hdmx' table).  This table is optional in */
-  /*                            TrueType/OpenType fonts.                   */
-  /*                                                                       */
-  /*    gasp                 :: The grid-fitting and scaling properties    */
-  /*                            table (`gasp').  This table is optional in */
-  /*                            TrueType/OpenType fonts.                   */
-  /*                                                                       */
-  /*    pclt                 :: The `pclt' SFNT table.                     */
-  /*                                                                       */
-  /*    num_sbit_scales      :: The number of sbit scales for this font.   */
-  /*                                                                       */
-  /*    sbit_scales          :: Array of sbit scales embedded in this      */
-  /*                            font.  This table is optional in a         */
-  /*                            TrueType/OpenType font.                    */
-  /*                                                                       */
-  /*    postscript_names     :: A table used to store the Postscript names */
-  /*                            of  the glyphs for this font.  See the     */
-  /*                            file  `ttconfig.h' for comments on the     */
-  /*                            TT_CONFIG_OPTION_POSTSCRIPT_NAMES option.  */
-  /*                                                                       */
-  /*    num_locations        :: The number of glyph locations in this      */
-  /*                            TrueType file.  This should be             */
-  /*                            identical to the number of glyphs.         */
-  /*                            Ignored for Type 2 fonts.                  */
-  /*                                                                       */
-  /*    glyph_locations      :: An array of longs.  These are offsets to   */
-  /*                            glyph data within the `glyf' table.        */
-  /*                            Ignored for Type 2 font faces.             */
-  /*                                                                       */
-  /*    glyf_len             :: The length of the `glyf' table.  Needed    */
-  /*                            for malformed `loca' tables.               */
-  /*                                                                       */
-  /*    font_program_size    :: Size in bytecodes of the face's font       */
-  /*                            program.  0 if none defined.  Ignored for  */
-  /*                            Type 2 fonts.                              */
-  /*                                                                       */
-  /*    font_program         :: The face's font program (bytecode stream)  */
-  /*                            executed at load time, also used during    */
-  /*                            glyph rendering.  Comes from the `fpgm'    */
-  /*                            table.  Ignored for Type 2 font fonts.     */
-  /*                                                                       */
-  /*    cvt_program_size     :: The size in bytecodes of the face's cvt    */
-  /*                            program.  Ignored for Type 2 fonts.        */
-  /*                                                                       */
-  /*    cvt_program          :: The face's cvt program (bytecode stream)   */
-  /*                            executed each time an instance/size is     */
-  /*                            changed/reset.  Comes from the `prep'      */
-  /*                            table.  Ignored for Type 2 fonts.          */
-  /*                                                                       */
-  /*    cvt_size             :: Size of the control value table (in        */
-  /*                            entries).   Ignored for Type 2 fonts.      */
-  /*                                                                       */
-  /*    cvt                  :: The face's original control value table.   */
-  /*                            Coordinates are expressed in unscaled font */
-  /*                            units.  Comes from the `cvt ' table.       */
-  /*                            Ignored for Type 2 fonts.                  */
-  /*                                                                       */
-  /*    num_kern_pairs       :: The number of kerning pairs present in the */
-  /*                            font file.  The engine only loads the      */
-  /*                            first horizontal format 0 kern table it    */
-  /*                            finds in the font file.  Ignored for       */
-  /*                            Type 2 fonts.                              */
-  /*                                                                       */
-  /*    kern_table_index     :: The index of the kerning table in the font */
-  /*                            kerning directory.  Ignored for Type 2     */
-  /*                            fonts.                                     */
-  /*                                                                       */
-  /*    interpreter          :: A pointer to the TrueType bytecode         */
-  /*                            interpreters field is also used to hook    */
-  /*                            the debugger in `ttdebug'.                 */
-  /*                                                                       */
-  /*    doblend              :: A boolean which is set if the font should  */
-  /*                            be blended (this is for GX var).           */
-  /*                                                                       */
-  /*    blend                :: Contains the data needed to control GX     */
-  /*                            variation tables (rather like Multiple     */
-  /*                            Master data).                              */
-  /*                                                                       */
-  /*    extra                :: Reserved for third-party font drivers.     */
-  /*                                                                       */
-  /*    postscript_name      :: The PS name of the font.  Used by the      */
-  /*                            postscript name service.                   */
-  /*                                                                       */
-  typedef struct  TT_FaceRec_
-  {
-    FT_FaceRec            root;
-
-    TTC_HeaderRec         ttc_header;
-
-    FT_ULong              format_tag;
-    FT_UShort             num_tables;
-    TT_Table              dir_tables;
-
-    TT_Header             header;       /* TrueType header table          */
-    TT_HoriHeader         horizontal;   /* TrueType horizontal header     */
-
-    TT_MaxProfile         max_profile;
-
-    FT_Bool               vertical_info;
-    TT_VertHeader         vertical;     /* TT Vertical header, if present */
-
-    FT_UShort             num_names;    /* number of name records  */
-    TT_NameTableRec       name_table;   /* name table              */
-
-    TT_OS2                os2;          /* TrueType OS/2 table            */
-    TT_Postscript         postscript;   /* TrueType Postscript table      */
-
-    FT_Byte*              cmap_table;   /* extracted `cmap' table */
-    FT_ULong              cmap_size;
-
-    TT_Loader_GotoTableFunc   goto_table;
-
-    TT_Loader_StartGlyphFunc  access_glyph_frame;
-    TT_Loader_EndGlyphFunc    forget_glyph_frame;
-    TT_Loader_ReadGlyphFunc   read_glyph_header;
-    TT_Loader_ReadGlyphFunc   read_simple_glyph;
-    TT_Loader_ReadGlyphFunc   read_composite_glyph;
-
-    /* a typeless pointer to the SFNT_Interface table used to load */
-    /* the basic TrueType tables in the face object                */
-    void*                 sfnt;
-
-    /* a typeless pointer to the FT_Service_PsCMapsRec table used to */
-    /* handle glyph names <-> unicode & Mac values                   */
-    void*                 psnames;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* Optional TrueType/OpenType tables                                   */
-    /*                                                                     */
-    /***********************************************************************/
-
-    /* grid-fitting and scaling table */
-    TT_GaspRec            gasp;                 /* the `gasp' table */
-
-    /* PCL 5 table */
-    TT_PCLT               pclt;
-
-    /* embedded bitmaps support */
-    FT_ULong              num_sbit_scales;
-    TT_SBit_Scale         sbit_scales;
-
-    /* postscript names table */
-    TT_Post_NamesRec      postscript_names;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* TrueType-specific fields (ignored by the OTF-Type2 driver)          */
-    /*                                                                     */
-    /***********************************************************************/
-
-    /* the font program, if any */
-    FT_ULong              font_program_size;
-    FT_Byte*              font_program;
-
-    /* the cvt program, if any */
-    FT_ULong              cvt_program_size;
-    FT_Byte*              cvt_program;
-
-    /* the original, unscaled, control value table */
-    FT_ULong              cvt_size;
-    FT_Short*             cvt;
-
-    /* A pointer to the bytecode interpreter to use.  This is also */
-    /* used to hook the debugger for the `ttdebug' utility.        */
-    TT_Interpreter        interpreter;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* Other tables or fields. This is used by derivative formats like     */
-    /* OpenType.                                                           */
-    /*                                                                     */
-    /***********************************************************************/
-
-    FT_Generic            extra;
-
-    const char*           postscript_name;
-
-    FT_ULong              glyf_len;
-
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-    FT_Bool               doblend;
-    GX_Blend              blend;
-#endif
-
-    /* since version 2.2 */
-
-    FT_Byte*              horz_metrics;
-    FT_ULong              horz_metrics_size;
-
-    FT_Byte*              vert_metrics;
-    FT_ULong              vert_metrics_size;
-
-    FT_ULong              num_locations; /* in broken TTF, gid > 0xFFFF */
-    FT_Byte*              glyph_locations;
-
-    FT_Byte*              hdmx_table;
-    FT_ULong              hdmx_table_size;
-    FT_UInt               hdmx_record_count;
-    FT_ULong              hdmx_record_size;
-    FT_Byte*              hdmx_record_sizes;
-
-    FT_Byte*              sbit_table;
-    FT_ULong              sbit_table_size;
-    TT_SbitTableType      sbit_table_type;
-    FT_UInt               sbit_num_strikes;
-
-    FT_Byte*              kern_table;
-    FT_ULong              kern_table_size;
-    FT_UInt               num_kern_tables;
-    FT_UInt32             kern_avail_bits;
-    FT_UInt32             kern_order_bits;
-
-#ifdef TT_CONFIG_OPTION_BDF
-    TT_BDFRec             bdf;
-#endif /* TT_CONFIG_OPTION_BDF */
-
-    /* since 2.3.0 */
-    FT_ULong              horz_metrics_offset;
-    FT_ULong              vert_metrics_offset;
-
-#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-    /* since 2.4.12 */
-    FT_ULong              sph_found_func_flags; /* special functions found */
-                                                /* for this face           */
-    FT_Bool               sph_compatibility_mode;
-#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-  } TT_FaceRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  <Struct>                                                             */
-  /*     TT_GlyphZoneRec                                                   */
-  /*                                                                       */
-  /*  <Description>                                                        */
-  /*     A glyph zone is used to load, scale and hint glyph outline        */
-  /*     coordinates.                                                      */
-  /*                                                                       */
-  /*  <Fields>                                                             */
-  /*     memory       :: A handle to the memory manager.                   */
-  /*                                                                       */
-  /*     max_points   :: The maximum size in points of the zone.           */
-  /*                                                                       */
-  /*     max_contours :: Max size in links contours of the zone.           */
-  /*                                                                       */
-  /*     n_points     :: The current number of points in the zone.         */
-  /*                                                                       */
-  /*     n_contours   :: The current number of contours in the zone.       */
-  /*                                                                       */
-  /*     org          :: The original glyph coordinates (font              */
-  /*                     units/scaled).                                    */
-  /*                                                                       */
-  /*     cur          :: The current glyph coordinates (scaled/hinted).    */
-  /*                                                                       */
-  /*     tags         :: The point control tags.                           */
-  /*                                                                       */
-  /*     contours     :: The contours end points.                          */
-  /*                                                                       */
-  /*     first_point  :: Offset of the current subglyph's first point.     */
-  /*                                                                       */
-  typedef struct  TT_GlyphZoneRec_
-  {
-    FT_Memory   memory;
-    FT_UShort   max_points;
-    FT_Short    max_contours;
-    FT_UShort   n_points;    /* number of points in zone    */
-    FT_Short    n_contours;  /* number of contours          */
-
-    FT_Vector*  org;         /* original point coordinates  */
-    FT_Vector*  cur;         /* current point coordinates   */
-    FT_Vector*  orus;        /* original (unscaled) point coordinates */
-
-    FT_Byte*    tags;        /* current touch flags         */
-    FT_UShort*  contours;    /* contour end points          */
-
-    FT_UShort   first_point; /* offset of first (#0) point  */
-
-  } TT_GlyphZoneRec, *TT_GlyphZone;
-
-
-  /* handle to execution context */
-  typedef struct TT_ExecContextRec_*  TT_ExecContext;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_Size                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a TrueType size object.                                */
-  /*                                                                       */
-  typedef struct TT_SizeRec_*  TT_Size;
-
-
-  /* glyph loader structure */
-  typedef struct  TT_LoaderRec_
-  {
-    TT_Face          face;
-    TT_Size          size;
-    FT_GlyphSlot     glyph;
-    FT_GlyphLoader   gloader;
-
-    FT_ULong         load_flags;
-    FT_UInt          glyph_index;
-
-    FT_Stream        stream;
-    FT_Int           byte_len;
-
-    FT_Short         n_contours;
-    FT_BBox          bbox;
-    FT_Int           left_bearing;
-    FT_Int           advance;
-    FT_Int           linear;
-    FT_Bool          linear_def;
-    FT_Vector        pp1;
-    FT_Vector        pp2;
-
-    FT_ULong         glyf_offset;
-
-    /* the zone where we load our glyphs */
-    TT_GlyphZoneRec  base;
-    TT_GlyphZoneRec  zone;
-
-    TT_ExecContext   exec;
-    FT_Byte*         instructions;
-    FT_ULong         ins_pos;
-
-    /* for possible extensibility in other formats */
-    void*            other;
-
-    /* since version 2.1.8 */
-    FT_Int           top_bearing;
-    FT_Int           vadvance;
-    FT_Vector        pp3;
-    FT_Vector        pp4;
-
-    /* since version 2.2.1 */
-    FT_Byte*         cursor;
-    FT_Byte*         limit;
-
-    /* since version 2.6.2 */
-    FT_ListRec       composites;
-
-  } TT_LoaderRec;
-
-
-FT_END_HEADER
-
-#endif /* TTTYPES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/t1tables.h b/dependencies2013/win32/include/freetype/t1tables.h
deleted file mode 100644
index e272324b..00000000
--- a/dependencies2013/win32/include/freetype/t1tables.h
+++ /dev/null
@@ -1,761 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t1tables.h                                                             */
-/*                                                                         */
-/*    Basic Type 1/Type 2 tables definitions and interface (specification  */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef T1TABLES_H_
-#define T1TABLES_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    type1_tables                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Type 1 Tables                                                      */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Type~1 (PostScript) specific font tables.                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the definition of Type 1-specific tables,    */
-  /*    including structures related to other PostScript font formats.     */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    PS_FontInfoRec                                                     */
-  /*    PS_FontInfo                                                        */
-  /*    PS_PrivateRec                                                      */
-  /*    PS_Private                                                         */
-  /*                                                                       */
-  /*    CID_FaceDictRec                                                    */
-  /*    CID_FaceDict                                                       */
-  /*    CID_FaceInfoRec                                                    */
-  /*    CID_FaceInfo                                                       */
-  /*                                                                       */
-  /*    FT_Has_PS_Glyph_Names                                              */
-  /*    FT_Get_PS_Font_Info                                                */
-  /*    FT_Get_PS_Font_Private                                             */
-  /*    FT_Get_PS_Font_Value                                               */
-  /*                                                                       */
-  /*    T1_Blend_Flags                                                     */
-  /*    T1_EncodingType                                                    */
-  /*    PS_Dict_Keys                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* Note that we separate font data in PS_FontInfoRec and PS_PrivateRec */
-  /* structures in order to support Multiple Master fonts.               */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_FontInfoRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a Type~1 or Type~2 FontInfo dictionary.  */
-  /*    Note that for Multiple Master fonts, each instance has its own     */
-  /*    FontInfo dictionary.                                               */
-  /*                                                                       */
-  typedef struct  PS_FontInfoRec_
-  {
-    FT_String*  version;
-    FT_String*  notice;
-    FT_String*  full_name;
-    FT_String*  family_name;
-    FT_String*  weight;
-    FT_Long     italic_angle;
-    FT_Bool     is_fixed_pitch;
-    FT_Short    underline_position;
-    FT_UShort   underline_thickness;
-
-  } PS_FontInfoRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_FontInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @PS_FontInfoRec structure.                           */
-  /*                                                                       */
-  typedef struct PS_FontInfoRec_*  PS_FontInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_FontInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is equivalent to @PS_FontInfoRec.  It is deprecated but  */
-  /*    kept to maintain source compatibility between various versions of  */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  typedef PS_FontInfoRec  T1_FontInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_PrivateRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a Type~1 or Type~2 private dictionary.   */
-  /*    Note that for Multiple Master fonts, each instance has its own     */
-  /*    Private dictionary.                                                */
-  /*                                                                       */
-  typedef struct  PS_PrivateRec_
-  {
-    FT_Int     unique_id;
-    FT_Int     lenIV;
-
-    FT_Byte    num_blue_values;
-    FT_Byte    num_other_blues;
-    FT_Byte    num_family_blues;
-    FT_Byte    num_family_other_blues;
-
-    FT_Short   blue_values[14];
-    FT_Short   other_blues[10];
-
-    FT_Short   family_blues      [14];
-    FT_Short   family_other_blues[10];
-
-    FT_Fixed   blue_scale;
-    FT_Int     blue_shift;
-    FT_Int     blue_fuzz;
-
-    FT_UShort  standard_width[1];
-    FT_UShort  standard_height[1];
-
-    FT_Byte    num_snap_widths;
-    FT_Byte    num_snap_heights;
-    FT_Bool    force_bold;
-    FT_Bool    round_stem_up;
-
-    FT_Short   snap_widths [13];  /* including std width  */
-    FT_Short   snap_heights[13];  /* including std height */
-
-    FT_Fixed   expansion_factor;
-
-    FT_Long    language_group;
-    FT_Long    password;
-
-    FT_Short   min_feature[2];
-
-  } PS_PrivateRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_Private                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @PS_PrivateRec structure.                            */
-  /*                                                                       */
-  typedef struct PS_PrivateRec_*  PS_Private;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_Private                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This type is equivalent to @PS_PrivateRec.  It is deprecated but    */
-  /*   kept to maintain source compatibility between various versions of   */
-  /*   FreeType.                                                           */
-  /*                                                                       */
-  typedef PS_PrivateRec  T1_Private;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    T1_Blend_Flags                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A set of flags used to indicate which fields are present in a      */
-  /*    given blend dictionary (font info or private).  Used to support    */
-  /*    Multiple Masters fonts.                                            */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    T1_BLEND_UNDERLINE_POSITION ::                                     */
-  /*    T1_BLEND_UNDERLINE_THICKNESS ::                                    */
-  /*    T1_BLEND_ITALIC_ANGLE ::                                           */
-  /*    T1_BLEND_BLUE_VALUES ::                                            */
-  /*    T1_BLEND_OTHER_BLUES ::                                            */
-  /*    T1_BLEND_STANDARD_WIDTH ::                                         */
-  /*    T1_BLEND_STANDARD_HEIGHT ::                                        */
-  /*    T1_BLEND_STEM_SNAP_WIDTHS ::                                       */
-  /*    T1_BLEND_STEM_SNAP_HEIGHTS ::                                      */
-  /*    T1_BLEND_BLUE_SCALE ::                                             */
-  /*    T1_BLEND_BLUE_SHIFT ::                                             */
-  /*    T1_BLEND_FAMILY_BLUES ::                                           */
-  /*    T1_BLEND_FAMILY_OTHER_BLUES ::                                     */
-  /*    T1_BLEND_FORCE_BOLD ::                                             */
-  /*                                                                       */
-  typedef enum  T1_Blend_Flags_
-  {
-    /* required fields in a FontInfo blend dictionary */
-    T1_BLEND_UNDERLINE_POSITION = 0,
-    T1_BLEND_UNDERLINE_THICKNESS,
-    T1_BLEND_ITALIC_ANGLE,
-
-    /* required fields in a Private blend dictionary */
-    T1_BLEND_BLUE_VALUES,
-    T1_BLEND_OTHER_BLUES,
-    T1_BLEND_STANDARD_WIDTH,
-    T1_BLEND_STANDARD_HEIGHT,
-    T1_BLEND_STEM_SNAP_WIDTHS,
-    T1_BLEND_STEM_SNAP_HEIGHTS,
-    T1_BLEND_BLUE_SCALE,
-    T1_BLEND_BLUE_SHIFT,
-    T1_BLEND_FAMILY_BLUES,
-    T1_BLEND_FAMILY_OTHER_BLUES,
-    T1_BLEND_FORCE_BOLD,
-
-    T1_BLEND_MAX    /* do not remove */
-
-  } T1_Blend_Flags;
-
-
-  /* these constants are deprecated; use the corresponding */
-  /* `T1_Blend_Flags' values instead                       */
-#define t1_blend_underline_position   T1_BLEND_UNDERLINE_POSITION
-#define t1_blend_underline_thickness  T1_BLEND_UNDERLINE_THICKNESS
-#define t1_blend_italic_angle         T1_BLEND_ITALIC_ANGLE
-#define t1_blend_blue_values          T1_BLEND_BLUE_VALUES
-#define t1_blend_other_blues          T1_BLEND_OTHER_BLUES
-#define t1_blend_standard_widths      T1_BLEND_STANDARD_WIDTH
-#define t1_blend_standard_height      T1_BLEND_STANDARD_HEIGHT
-#define t1_blend_stem_snap_widths     T1_BLEND_STEM_SNAP_WIDTHS
-#define t1_blend_stem_snap_heights    T1_BLEND_STEM_SNAP_HEIGHTS
-#define t1_blend_blue_scale           T1_BLEND_BLUE_SCALE
-#define t1_blend_blue_shift           T1_BLEND_BLUE_SHIFT
-#define t1_blend_family_blues         T1_BLEND_FAMILY_BLUES
-#define t1_blend_family_other_blues   T1_BLEND_FAMILY_OTHER_BLUES
-#define t1_blend_force_bold           T1_BLEND_FORCE_BOLD
-#define t1_blend_max                  T1_BLEND_MAX
-
-  /* */
-
-
-  /* maximum number of Multiple Masters designs, as defined in the spec */
-#define T1_MAX_MM_DESIGNS     16
-
-  /* maximum number of Multiple Masters axes, as defined in the spec */
-#define T1_MAX_MM_AXIS        4
-
-  /* maximum number of elements in a design map */
-#define T1_MAX_MM_MAP_POINTS  20
-
-
-  /* this structure is used to store the BlendDesignMap entry for an axis */
-  typedef struct  PS_DesignMap_
-  {
-    FT_Byte    num_points;
-    FT_Long*   design_points;
-    FT_Fixed*  blend_points;
-
-  } PS_DesignMapRec, *PS_DesignMap;
-
-  /* backwards-compatible definition */
-  typedef PS_DesignMapRec  T1_DesignMap;
-
-
-  typedef struct  PS_BlendRec_
-  {
-    FT_UInt          num_designs;
-    FT_UInt          num_axis;
-
-    FT_String*       axis_names[T1_MAX_MM_AXIS];
-    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
-    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
-
-    FT_Fixed*        weight_vector;
-    FT_Fixed*        default_weight_vector;
-
-    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
-    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
-
-    FT_ULong         blend_bitflags;
-
-    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
-
-    /* since 2.3.0 */
-
-    /* undocumented, optional: the default design instance;   */
-    /* corresponds to default_weight_vector --                */
-    /* num_default_design_vector == 0 means it is not present */
-    /* in the font and associated metrics files               */
-    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
-    FT_UInt          num_default_design_vector;
-
-  } PS_BlendRec, *PS_Blend;
-
-
-  /* backwards-compatible definition */
-  typedef PS_BlendRec  T1_Blend;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceDictRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to represent data in a CID top-level dictionary.  */
-  /*                                                                       */
-  typedef struct  CID_FaceDictRec_
-  {
-    PS_PrivateRec  private_dict;
-
-    FT_UInt        len_buildchar;
-    FT_Fixed       forcebold_threshold;
-    FT_Pos         stroke_width;
-    FT_Fixed       expansion_factor;
-
-    FT_Byte        paint_type;
-    FT_Byte        font_type;
-    FT_Matrix      font_matrix;
-    FT_Vector      font_offset;
-
-    FT_UInt        num_subrs;
-    FT_ULong       subrmap_offset;
-    FT_Int         sd_bytes;
-
-  } CID_FaceDictRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceDict                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @CID_FaceDictRec structure.                          */
-  /*                                                                       */
-  typedef struct CID_FaceDictRec_*  CID_FaceDict;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FontDict                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is equivalent to @CID_FaceDictRec.  It is deprecated but */
-  /*    kept to maintain source compatibility between various versions of  */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  typedef CID_FaceDictRec  CID_FontDict;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceInfoRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to represent CID Face information.                */
-  /*                                                                       */
-  typedef struct  CID_FaceInfoRec_
-  {
-    FT_String*      cid_font_name;
-    FT_Fixed        cid_version;
-    FT_Int          cid_font_type;
-
-    FT_String*      registry;
-    FT_String*      ordering;
-    FT_Int          supplement;
-
-    PS_FontInfoRec  font_info;
-    FT_BBox         font_bbox;
-    FT_ULong        uid_base;
-
-    FT_Int          num_xuid;
-    FT_ULong        xuid[16];
-
-    FT_ULong        cidmap_offset;
-    FT_Int          fd_bytes;
-    FT_Int          gd_bytes;
-    FT_ULong        cid_count;
-
-    FT_Int          num_dicts;
-    CID_FaceDict    font_dicts;
-
-    FT_ULong        data_offset;
-
-  } CID_FaceInfoRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_FaceInfo                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a @CID_FaceInfoRec structure.                          */
-  /*                                                                       */
-  typedef struct CID_FaceInfoRec_*  CID_FaceInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_Info                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This type is equivalent to @CID_FaceInfoRec.  It is deprecated but  */
-  /*   kept to maintain source compatibility between various versions of   */
-  /*   FreeType.                                                           */
-  /*                                                                       */
-  typedef CID_FaceInfoRec  CID_Info;
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Has_PS_Glyph_Names
-   *
-   * @description:
-   *    Return true if a given face provides reliable PostScript glyph
-   *    names.  This is similar to using the @FT_HAS_GLYPH_NAMES macro,
-   *    except that certain fonts (mostly TrueType) contain incorrect
-   *    glyph name tables.
-   *
-   *    When this function returns true, the caller is sure that the glyph
-   *    names returned by @FT_Get_Glyph_Name are reliable.
-   *
-   * @input:
-   *    face ::
-   *       face handle
-   *
-   * @return:
-   *    Boolean.  True if glyph names are reliable.
-   *
-   */
-  FT_EXPORT( FT_Int )
-  FT_Has_PS_Glyph_Names( FT_Face  face );
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Get_PS_Font_Info
-   *
-   * @description:
-   *    Retrieve the @PS_FontInfoRec structure corresponding to a given
-   *    PostScript font.
-   *
-   * @input:
-   *    face ::
-   *       PostScript face handle.
-   *
-   * @output:
-   *    afont_info ::
-   *       Output font info structure pointer.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    String pointers within the @PS_FontInfoRec structure are owned by
-   *    the face and don't need to be freed by the caller.  Missing entries
-   *    in the font's FontInfo dictionary are represented by NULL pointers.
-   *
-   *    If the font's format is not PostScript-based, this function will
-   *    return the `FT_Err_Invalid_Argument' error code.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Info( FT_Face      face,
-                       PS_FontInfo  afont_info );
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Get_PS_Font_Private
-   *
-   * @description:
-   *    Retrieve the @PS_PrivateRec structure corresponding to a given
-   *    PostScript font.
-   *
-   * @input:
-   *    face ::
-   *       PostScript face handle.
-   *
-   * @output:
-   *    afont_private ::
-   *       Output private dictionary structure pointer.
-   *
-   * @return:
-   *    FreeType error code.  0~means success.
-   *
-   * @note:
-   *    The string pointers within the @PS_PrivateRec structure are owned by
-   *    the face and don't need to be freed by the caller.
-   *
-   *    If the font's format is not PostScript-based, this function returns
-   *    the `FT_Err_Invalid_Argument' error code.
-   *
-   */
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Private( FT_Face     face,
-                          PS_Private  afont_private );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    T1_EncodingType                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration describing the `Encoding' entry in a Type 1         */
-  /*    dictionary.                                                        */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    T1_ENCODING_TYPE_NONE ::                                           */
-  /*    T1_ENCODING_TYPE_ARRAY ::                                          */
-  /*    T1_ENCODING_TYPE_STANDARD ::                                       */
-  /*    T1_ENCODING_TYPE_ISOLATIN1 ::                                      */
-  /*    T1_ENCODING_TYPE_EXPERT ::                                         */
-  /*                                                                       */
-  typedef enum  T1_EncodingType_
-  {
-    T1_ENCODING_TYPE_NONE = 0,
-    T1_ENCODING_TYPE_ARRAY,
-    T1_ENCODING_TYPE_STANDARD,
-    T1_ENCODING_TYPE_ISOLATIN1,
-    T1_ENCODING_TYPE_EXPERT
-
-  } T1_EncodingType;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    PS_Dict_Keys                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used in calls to @FT_Get_PS_Font_Value to identify  */
-  /*    the Type~1 dictionary entry to retrieve.                           */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    PS_DICT_FONT_TYPE ::                                               */
-  /*    PS_DICT_FONT_MATRIX ::                                             */
-  /*    PS_DICT_FONT_BBOX ::                                               */
-  /*    PS_DICT_PAINT_TYPE ::                                              */
-  /*    PS_DICT_FONT_NAME ::                                               */
-  /*    PS_DICT_UNIQUE_ID ::                                               */
-  /*    PS_DICT_NUM_CHAR_STRINGS ::                                        */
-  /*    PS_DICT_CHAR_STRING_KEY ::                                         */
-  /*    PS_DICT_CHAR_STRING ::                                             */
-  /*    PS_DICT_ENCODING_TYPE ::                                           */
-  /*    PS_DICT_ENCODING_ENTRY ::                                          */
-  /*    PS_DICT_NUM_SUBRS ::                                               */
-  /*    PS_DICT_SUBR ::                                                    */
-  /*    PS_DICT_STD_HW ::                                                  */
-  /*    PS_DICT_STD_VW ::                                                  */
-  /*    PS_DICT_NUM_BLUE_VALUES ::                                         */
-  /*    PS_DICT_BLUE_VALUE ::                                              */
-  /*    PS_DICT_BLUE_FUZZ ::                                               */
-  /*    PS_DICT_NUM_OTHER_BLUES ::                                         */
-  /*    PS_DICT_OTHER_BLUE ::                                              */
-  /*    PS_DICT_NUM_FAMILY_BLUES ::                                        */
-  /*    PS_DICT_FAMILY_BLUE ::                                             */
-  /*    PS_DICT_NUM_FAMILY_OTHER_BLUES ::                                  */
-  /*    PS_DICT_FAMILY_OTHER_BLUE ::                                       */
-  /*    PS_DICT_BLUE_SCALE ::                                              */
-  /*    PS_DICT_BLUE_SHIFT ::                                              */
-  /*    PS_DICT_NUM_STEM_SNAP_H ::                                         */
-  /*    PS_DICT_STEM_SNAP_H ::                                             */
-  /*    PS_DICT_NUM_STEM_SNAP_V ::                                         */
-  /*    PS_DICT_STEM_SNAP_V ::                                             */
-  /*    PS_DICT_FORCE_BOLD ::                                              */
-  /*    PS_DICT_RND_STEM_UP ::                                             */
-  /*    PS_DICT_MIN_FEATURE ::                                             */
-  /*    PS_DICT_LEN_IV ::                                                  */
-  /*    PS_DICT_PASSWORD ::                                                */
-  /*    PS_DICT_LANGUAGE_GROUP ::                                          */
-  /*    PS_DICT_VERSION ::                                                 */
-  /*    PS_DICT_NOTICE ::                                                  */
-  /*    PS_DICT_FULL_NAME ::                                               */
-  /*    PS_DICT_FAMILY_NAME ::                                             */
-  /*    PS_DICT_WEIGHT ::                                                  */
-  /*    PS_DICT_IS_FIXED_PITCH ::                                          */
-  /*    PS_DICT_UNDERLINE_POSITION ::                                      */
-  /*    PS_DICT_UNDERLINE_THICKNESS ::                                     */
-  /*    PS_DICT_FS_TYPE ::                                                 */
-  /*    PS_DICT_ITALIC_ANGLE ::                                            */
-  /*                                                                       */
-  typedef enum  PS_Dict_Keys_
-  {
-    /* conventionally in the font dictionary */
-    PS_DICT_FONT_TYPE,              /* FT_Byte         */
-    PS_DICT_FONT_MATRIX,            /* FT_Fixed        */
-    PS_DICT_FONT_BBOX,              /* FT_Fixed        */
-    PS_DICT_PAINT_TYPE,             /* FT_Byte         */
-    PS_DICT_FONT_NAME,              /* FT_String*      */
-    PS_DICT_UNIQUE_ID,              /* FT_Int          */
-    PS_DICT_NUM_CHAR_STRINGS,       /* FT_Int          */
-    PS_DICT_CHAR_STRING_KEY,        /* FT_String*      */
-    PS_DICT_CHAR_STRING,            /* FT_String*      */
-    PS_DICT_ENCODING_TYPE,          /* T1_EncodingType */
-    PS_DICT_ENCODING_ENTRY,         /* FT_String*      */
-
-    /* conventionally in the font Private dictionary */
-    PS_DICT_NUM_SUBRS,              /* FT_Int     */
-    PS_DICT_SUBR,                   /* FT_String* */
-    PS_DICT_STD_HW,                 /* FT_UShort  */
-    PS_DICT_STD_VW,                 /* FT_UShort  */
-    PS_DICT_NUM_BLUE_VALUES,        /* FT_Byte    */
-    PS_DICT_BLUE_VALUE,             /* FT_Short   */
-    PS_DICT_BLUE_FUZZ,              /* FT_Int     */
-    PS_DICT_NUM_OTHER_BLUES,        /* FT_Byte    */
-    PS_DICT_OTHER_BLUE,             /* FT_Short   */
-    PS_DICT_NUM_FAMILY_BLUES,       /* FT_Byte    */
-    PS_DICT_FAMILY_BLUE,            /* FT_Short   */
-    PS_DICT_NUM_FAMILY_OTHER_BLUES, /* FT_Byte    */
-    PS_DICT_FAMILY_OTHER_BLUE,      /* FT_Short   */
-    PS_DICT_BLUE_SCALE,             /* FT_Fixed   */
-    PS_DICT_BLUE_SHIFT,             /* FT_Int     */
-    PS_DICT_NUM_STEM_SNAP_H,        /* FT_Byte    */
-    PS_DICT_STEM_SNAP_H,            /* FT_Short   */
-    PS_DICT_NUM_STEM_SNAP_V,        /* FT_Byte    */
-    PS_DICT_STEM_SNAP_V,            /* FT_Short   */
-    PS_DICT_FORCE_BOLD,             /* FT_Bool    */
-    PS_DICT_RND_STEM_UP,            /* FT_Bool    */
-    PS_DICT_MIN_FEATURE,            /* FT_Short   */
-    PS_DICT_LEN_IV,                 /* FT_Int     */
-    PS_DICT_PASSWORD,               /* FT_Long    */
-    PS_DICT_LANGUAGE_GROUP,         /* FT_Long    */
-
-    /* conventionally in the font FontInfo dictionary */
-    PS_DICT_VERSION,                /* FT_String* */
-    PS_DICT_NOTICE,                 /* FT_String* */
-    PS_DICT_FULL_NAME,              /* FT_String* */
-    PS_DICT_FAMILY_NAME,            /* FT_String* */
-    PS_DICT_WEIGHT,                 /* FT_String* */
-    PS_DICT_IS_FIXED_PITCH,         /* FT_Bool    */
-    PS_DICT_UNDERLINE_POSITION,     /* FT_Short   */
-    PS_DICT_UNDERLINE_THICKNESS,    /* FT_UShort  */
-    PS_DICT_FS_TYPE,                /* FT_UShort  */
-    PS_DICT_ITALIC_ANGLE,           /* FT_Long    */
-
-    PS_DICT_MAX = PS_DICT_ITALIC_ANGLE
-
-  } PS_Dict_Keys;
-
-
-  /************************************************************************
-   *
-   * @function:
-   *    FT_Get_PS_Font_Value
-   *
-   * @description:
-   *    Retrieve the value for the supplied key from a PostScript font.
-   *
-   * @input:
-   *    face ::
-   *       PostScript face handle.
-   *
-   *    key ::
-   *       An enumeration value representing the dictionary key to retrieve.
-   *
-   *    idx ::
-   *       For array values, this specifies the index to be returned.
-   *
-   *    value ::
-   *       A pointer to memory into which to write the value.
-   *
-   *    valen_len ::
-   *       The size, in bytes, of the memory supplied for the value.
-   *
-   * @output:
-   *    value ::
-   *       The value matching the above key, if it exists.
-   *
-   * @return:
-   *    The amount of memory (in bytes) required to hold the requested
-   *    value (if it exists, -1 otherwise).
-   *
-   * @note:
-   *    The values returned are not pointers into the internal structures of
-   *    the face, but are `fresh' copies, so that the memory containing them
-   *    belongs to the calling application.  This also enforces the
-   *    `read-only' nature of these values, i.e., this function cannot be
-   *    used to manipulate the face.
-   *
-   *    `value' is a void pointer because the values returned can be of
-   *    various types.
-   *
-   *    If either `value' is NULL or `value_len' is too small, just the
-   *    required memory size for the requested entry is returned.
-   *
-   *    The `idx' parameter is used, not only to retrieve elements of, for
-   *    example, the FontMatrix or FontBBox, but also to retrieve name keys
-   *    from the CharStrings dictionary, and the charstrings themselves.  It
-   *    is ignored for atomic values.
-   *
-   *    PS_DICT_BLUE_SCALE returns a value that is scaled up by 1000.  To
-   *    get the value as in the font stream, you need to divide by
-   *    65536000.0 (to remove the FT_Fixed scale, and the x1000 scale).
-   *
-   *    IMPORTANT: Only key/value pairs read by the FreeType interpreter can
-   *    be retrieved.  So, for example, PostScript procedures such as NP,
-   *    ND, and RD are not available.  Arbitrary keys are, obviously, not be
-   *    available either.
-   *
-   *    If the font's format is not PostScript-based, this function returns
-   *    the `FT_Err_Invalid_Argument' error code.
-   *
-   */
-  FT_EXPORT( FT_Long )
-  FT_Get_PS_Font_Value( FT_Face       face,
-                        PS_Dict_Keys  key,
-                        FT_UInt       idx,
-                        void         *value,
-                        FT_Long       value_len );
-
-  /* */
-
-FT_END_HEADER
-
-#endif /* T1TABLES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ttnameid.h b/dependencies2013/win32/include/freetype/ttnameid.h
deleted file mode 100644
index ce707f16..00000000
--- a/dependencies2013/win32/include/freetype/ttnameid.h
+++ /dev/null
@@ -1,1237 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ttnameid.h                                                             */
-/*                                                                         */
-/*    TrueType name ID definitions (specification only).                   */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef TTNAMEID_H_
-#define TTNAMEID_H_
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    truetype_tables                                                    */
-  /*                                                                       */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values for the `platform' identifier code in the name        */
-  /* records of the TTF `name' table.                                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_PLATFORM_XXX
-   *
-   * @description:
-   *   A list of valid values for the `platform_id' identifier code in
-   *   @FT_CharMapRec and @FT_SfntName structures.
-   *
-   * @values:
-   *   TT_PLATFORM_APPLE_UNICODE ::
-   *     Used by Apple to indicate a Unicode character map and/or name entry.
-   *     See @TT_APPLE_ID_XXX for corresponding `encoding_id' values.  Note
-   *     that name entries in this format are coded as big-endian UCS-2
-   *     character codes _only_.
-   *
-   *   TT_PLATFORM_MACINTOSH ::
-   *     Used by Apple to indicate a MacOS-specific charmap and/or name entry.
-   *     See @TT_MAC_ID_XXX for corresponding `encoding_id' values.  Note that
-   *     most TrueType fonts contain an Apple roman charmap to be usable on
-   *     MacOS systems (even if they contain a Microsoft charmap as well).
-   *
-   *   TT_PLATFORM_ISO ::
-   *     This value was used to specify ISO/IEC 10646 charmaps.  It is however
-   *     now deprecated.  See @TT_ISO_ID_XXX for a list of corresponding
-   *     `encoding_id' values.
-   *
-   *   TT_PLATFORM_MICROSOFT ::
-   *     Used by Microsoft to indicate Windows-specific charmaps.  See
-   *     @TT_MS_ID_XXX for a list of corresponding `encoding_id' values.
-   *     Note that most fonts contain a Unicode charmap using
-   *     (TT_PLATFORM_MICROSOFT, @TT_MS_ID_UNICODE_CS).
-   *
-   *   TT_PLATFORM_CUSTOM ::
-   *     Used to indicate application-specific charmaps.
-   *
-   *   TT_PLATFORM_ADOBE ::
-   *     This value isn't part of any font format specification, but is used
-   *     by FreeType to report Adobe-specific charmaps in an @FT_CharMapRec
-   *     structure.  See @TT_ADOBE_ID_XXX.
-   */
-
-#define TT_PLATFORM_APPLE_UNICODE  0
-#define TT_PLATFORM_MACINTOSH      1
-#define TT_PLATFORM_ISO            2 /* deprecated */
-#define TT_PLATFORM_MICROSOFT      3
-#define TT_PLATFORM_CUSTOM         4
-#define TT_PLATFORM_ADOBE          7 /* artificial */
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_APPLE_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_APPLE_UNICODE charmaps and name entries.
-   *
-   * @values:
-   *   TT_APPLE_ID_DEFAULT ::
-   *     Unicode version 1.0.
-   *
-   *   TT_APPLE_ID_UNICODE_1_1 ::
-   *     Unicode 1.1; specifies Hangul characters starting at U+34xx.
-   *
-   *   TT_APPLE_ID_ISO_10646 ::
-   *     Deprecated (identical to preceding).
-   *
-   *   TT_APPLE_ID_UNICODE_2_0 ::
-   *     Unicode 2.0 and beyond (UTF-16 BMP only).
-   *
-   *   TT_APPLE_ID_UNICODE_32 ::
-   *     Unicode 3.1 and beyond, using UTF-32.
-   *
-   *   TT_APPLE_ID_VARIANT_SELECTOR ::
-   *     From Adobe, not Apple.  Not a normal cmap.  Specifies variations
-   *     on a real cmap.
-   */
-
-#define TT_APPLE_ID_DEFAULT           0 /* Unicode 1.0 */
-#define TT_APPLE_ID_UNICODE_1_1       1 /* specify Hangul at U+34xx */
-#define TT_APPLE_ID_ISO_10646         2 /* deprecated */
-#define TT_APPLE_ID_UNICODE_2_0       3 /* or later */
-#define TT_APPLE_ID_UNICODE_32        4 /* 2.0 or later, full repertoire */
-#define TT_APPLE_ID_VARIANT_SELECTOR  5 /* variation selector data */
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_MAC_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_MACINTOSH charmaps and name entries.
-   *
-   * @values:
-   *   TT_MAC_ID_ROMAN ::
-   *   TT_MAC_ID_JAPANESE ::
-   *   TT_MAC_ID_TRADITIONAL_CHINESE ::
-   *   TT_MAC_ID_KOREAN ::
-   *   TT_MAC_ID_ARABIC ::
-   *   TT_MAC_ID_HEBREW ::
-   *   TT_MAC_ID_GREEK ::
-   *   TT_MAC_ID_RUSSIAN ::
-   *   TT_MAC_ID_RSYMBOL ::
-   *   TT_MAC_ID_DEVANAGARI ::
-   *   TT_MAC_ID_GURMUKHI ::
-   *   TT_MAC_ID_GUJARATI ::
-   *   TT_MAC_ID_ORIYA ::
-   *   TT_MAC_ID_BENGALI ::
-   *   TT_MAC_ID_TAMIL ::
-   *   TT_MAC_ID_TELUGU ::
-   *   TT_MAC_ID_KANNADA ::
-   *   TT_MAC_ID_MALAYALAM ::
-   *   TT_MAC_ID_SINHALESE ::
-   *   TT_MAC_ID_BURMESE ::
-   *   TT_MAC_ID_KHMER ::
-   *   TT_MAC_ID_THAI ::
-   *   TT_MAC_ID_LAOTIAN ::
-   *   TT_MAC_ID_GEORGIAN ::
-   *   TT_MAC_ID_ARMENIAN ::
-   *   TT_MAC_ID_MALDIVIAN ::
-   *   TT_MAC_ID_SIMPLIFIED_CHINESE ::
-   *   TT_MAC_ID_TIBETAN ::
-   *   TT_MAC_ID_MONGOLIAN ::
-   *   TT_MAC_ID_GEEZ ::
-   *   TT_MAC_ID_SLAVIC ::
-   *   TT_MAC_ID_VIETNAMESE ::
-   *   TT_MAC_ID_SINDHI ::
-   *   TT_MAC_ID_UNINTERP ::
-   */
-
-#define TT_MAC_ID_ROMAN                 0
-#define TT_MAC_ID_JAPANESE              1
-#define TT_MAC_ID_TRADITIONAL_CHINESE   2
-#define TT_MAC_ID_KOREAN                3
-#define TT_MAC_ID_ARABIC                4
-#define TT_MAC_ID_HEBREW                5
-#define TT_MAC_ID_GREEK                 6
-#define TT_MAC_ID_RUSSIAN               7
-#define TT_MAC_ID_RSYMBOL               8
-#define TT_MAC_ID_DEVANAGARI            9
-#define TT_MAC_ID_GURMUKHI             10
-#define TT_MAC_ID_GUJARATI             11
-#define TT_MAC_ID_ORIYA                12
-#define TT_MAC_ID_BENGALI              13
-#define TT_MAC_ID_TAMIL                14
-#define TT_MAC_ID_TELUGU               15
-#define TT_MAC_ID_KANNADA              16
-#define TT_MAC_ID_MALAYALAM            17
-#define TT_MAC_ID_SINHALESE            18
-#define TT_MAC_ID_BURMESE              19
-#define TT_MAC_ID_KHMER                20
-#define TT_MAC_ID_THAI                 21
-#define TT_MAC_ID_LAOTIAN              22
-#define TT_MAC_ID_GEORGIAN             23
-#define TT_MAC_ID_ARMENIAN             24
-#define TT_MAC_ID_MALDIVIAN            25
-#define TT_MAC_ID_SIMPLIFIED_CHINESE   25
-#define TT_MAC_ID_TIBETAN              26
-#define TT_MAC_ID_MONGOLIAN            27
-#define TT_MAC_ID_GEEZ                 28
-#define TT_MAC_ID_SLAVIC               29
-#define TT_MAC_ID_VIETNAMESE           30
-#define TT_MAC_ID_SINDHI               31
-#define TT_MAC_ID_UNINTERP             32
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_ISO_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_ISO charmaps and name entries.
-   *
-   *   Their use is now deprecated.
-   *
-   * @values:
-   *   TT_ISO_ID_7BIT_ASCII ::
-   *     ASCII.
-   *   TT_ISO_ID_10646 ::
-   *     ISO/10646.
-   *   TT_ISO_ID_8859_1 ::
-   *     Also known as Latin-1.
-   */
-
-#define TT_ISO_ID_7BIT_ASCII  0
-#define TT_ISO_ID_10646       1
-#define TT_ISO_ID_8859_1      2
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_MS_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_MICROSOFT charmaps and name entries.
-   *
-   * @values:
-   *   TT_MS_ID_SYMBOL_CS ::
-   *     Corresponds to Microsoft symbol encoding. See
-   *     @FT_ENCODING_MS_SYMBOL.
-   *
-   *   TT_MS_ID_UNICODE_CS ::
-   *     Corresponds to a Microsoft WGL4 charmap, matching Unicode.  See
-   *     @FT_ENCODING_UNICODE.
-   *
-   *   TT_MS_ID_SJIS ::
-   *     Corresponds to SJIS Japanese encoding.  See @FT_ENCODING_SJIS.
-   *
-   *   TT_MS_ID_GB2312 ::
-   *     Corresponds to Simplified Chinese as used in Mainland China.  See
-   *     @FT_ENCODING_GB2312.
-   *
-   *   TT_MS_ID_BIG_5 ::
-   *     Corresponds to Traditional Chinese as used in Taiwan and Hong Kong.
-   *     See @FT_ENCODING_BIG5.
-   *
-   *   TT_MS_ID_WANSUNG ::
-   *     Corresponds to Korean Wansung encoding.  See @FT_ENCODING_WANSUNG.
-   *
-   *   TT_MS_ID_JOHAB ::
-   *     Corresponds to Johab encoding.  See @FT_ENCODING_JOHAB.
-   *
-   *   TT_MS_ID_UCS_4 ::
-   *     Corresponds to UCS-4 or UTF-32 charmaps.  This has been added to
-   *     the OpenType specification version 1.4 (mid-2001.)
-   */
-
-#define TT_MS_ID_SYMBOL_CS    0
-#define TT_MS_ID_UNICODE_CS   1
-#define TT_MS_ID_SJIS         2
-#define TT_MS_ID_GB2312       3
-#define TT_MS_ID_BIG_5        4
-#define TT_MS_ID_WANSUNG      5
-#define TT_MS_ID_JOHAB        6
-#define TT_MS_ID_UCS_4       10
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_ADOBE_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_ADOBE charmaps.  This is a FreeType-specific extension!
-   *
-   * @values:
-   *   TT_ADOBE_ID_STANDARD ::
-   *     Adobe standard encoding.
-   *   TT_ADOBE_ID_EXPERT ::
-   *     Adobe expert encoding.
-   *   TT_ADOBE_ID_CUSTOM ::
-   *     Adobe custom encoding.
-   *   TT_ADOBE_ID_LATIN_1 ::
-   *     Adobe Latin~1 encoding.
-   */
-
-#define TT_ADOBE_ID_STANDARD  0
-#define TT_ADOBE_ID_EXPERT    1
-#define TT_ADOBE_ID_CUSTOM    2
-#define TT_ADOBE_ID_LATIN_1   3
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the language identifier field in the name records  */
-  /* of the TTF `name' table if the `platform' identifier code is          */
-  /* TT_PLATFORM_MACINTOSH.  These values are also used as return values   */
-  /* for function @FT_Get_CMap_Language_ID.                                */
-  /*                                                                       */
-  /* The canonical source for the Apple assigned Language ID's is at       */
-  /*                                                                       */
-  /*   https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6name.html */
-  /*                                                                       */
-#define TT_MAC_LANGID_ENGLISH                       0
-#define TT_MAC_LANGID_FRENCH                        1
-#define TT_MAC_LANGID_GERMAN                        2
-#define TT_MAC_LANGID_ITALIAN                       3
-#define TT_MAC_LANGID_DUTCH                         4
-#define TT_MAC_LANGID_SWEDISH                       5
-#define TT_MAC_LANGID_SPANISH                       6
-#define TT_MAC_LANGID_DANISH                        7
-#define TT_MAC_LANGID_PORTUGUESE                    8
-#define TT_MAC_LANGID_NORWEGIAN                     9
-#define TT_MAC_LANGID_HEBREW                       10
-#define TT_MAC_LANGID_JAPANESE                     11
-#define TT_MAC_LANGID_ARABIC                       12
-#define TT_MAC_LANGID_FINNISH                      13
-#define TT_MAC_LANGID_GREEK                        14
-#define TT_MAC_LANGID_ICELANDIC                    15
-#define TT_MAC_LANGID_MALTESE                      16
-#define TT_MAC_LANGID_TURKISH                      17
-#define TT_MAC_LANGID_CROATIAN                     18
-#define TT_MAC_LANGID_CHINESE_TRADITIONAL          19
-#define TT_MAC_LANGID_URDU                         20
-#define TT_MAC_LANGID_HINDI                        21
-#define TT_MAC_LANGID_THAI                         22
-#define TT_MAC_LANGID_KOREAN                       23
-#define TT_MAC_LANGID_LITHUANIAN                   24
-#define TT_MAC_LANGID_POLISH                       25
-#define TT_MAC_LANGID_HUNGARIAN                    26
-#define TT_MAC_LANGID_ESTONIAN                     27
-#define TT_MAC_LANGID_LETTISH                      28
-#define TT_MAC_LANGID_SAAMISK                      29
-#define TT_MAC_LANGID_FAEROESE                     30
-#define TT_MAC_LANGID_FARSI                        31
-#define TT_MAC_LANGID_RUSSIAN                      32
-#define TT_MAC_LANGID_CHINESE_SIMPLIFIED           33
-#define TT_MAC_LANGID_FLEMISH                      34
-#define TT_MAC_LANGID_IRISH                        35
-#define TT_MAC_LANGID_ALBANIAN                     36
-#define TT_MAC_LANGID_ROMANIAN                     37
-#define TT_MAC_LANGID_CZECH                        38
-#define TT_MAC_LANGID_SLOVAK                       39
-#define TT_MAC_LANGID_SLOVENIAN                    40
-#define TT_MAC_LANGID_YIDDISH                      41
-#define TT_MAC_LANGID_SERBIAN                      42
-#define TT_MAC_LANGID_MACEDONIAN                   43
-#define TT_MAC_LANGID_BULGARIAN                    44
-#define TT_MAC_LANGID_UKRAINIAN                    45
-#define TT_MAC_LANGID_BYELORUSSIAN                 46
-#define TT_MAC_LANGID_UZBEK                        47
-#define TT_MAC_LANGID_KAZAKH                       48
-#define TT_MAC_LANGID_AZERBAIJANI                  49
-#define TT_MAC_LANGID_AZERBAIJANI_CYRILLIC_SCRIPT  49
-#define TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT    50
-#define TT_MAC_LANGID_ARMENIAN                     51
-#define TT_MAC_LANGID_GEORGIAN                     52
-#define TT_MAC_LANGID_MOLDAVIAN                    53
-#define TT_MAC_LANGID_KIRGHIZ                      54
-#define TT_MAC_LANGID_TAJIKI                       55
-#define TT_MAC_LANGID_TURKMEN                      56
-#define TT_MAC_LANGID_MONGOLIAN                    57
-#define TT_MAC_LANGID_MONGOLIAN_MONGOLIAN_SCRIPT   57
-#define TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT    58
-#define TT_MAC_LANGID_PASHTO                       59
-#define TT_MAC_LANGID_KURDISH                      60
-#define TT_MAC_LANGID_KASHMIRI                     61
-#define TT_MAC_LANGID_SINDHI                       62
-#define TT_MAC_LANGID_TIBETAN                      63
-#define TT_MAC_LANGID_NEPALI                       64
-#define TT_MAC_LANGID_SANSKRIT                     65
-#define TT_MAC_LANGID_MARATHI                      66
-#define TT_MAC_LANGID_BENGALI                      67
-#define TT_MAC_LANGID_ASSAMESE                     68
-#define TT_MAC_LANGID_GUJARATI                     69
-#define TT_MAC_LANGID_PUNJABI                      70
-#define TT_MAC_LANGID_ORIYA                        71
-#define TT_MAC_LANGID_MALAYALAM                    72
-#define TT_MAC_LANGID_KANNADA                      73
-#define TT_MAC_LANGID_TAMIL                        74
-#define TT_MAC_LANGID_TELUGU                       75
-#define TT_MAC_LANGID_SINHALESE                    76
-#define TT_MAC_LANGID_BURMESE                      77
-#define TT_MAC_LANGID_KHMER                        78
-#define TT_MAC_LANGID_LAO                          79
-#define TT_MAC_LANGID_VIETNAMESE                   80
-#define TT_MAC_LANGID_INDONESIAN                   81
-#define TT_MAC_LANGID_TAGALOG                      82
-#define TT_MAC_LANGID_MALAY_ROMAN_SCRIPT           83
-#define TT_MAC_LANGID_MALAY_ARABIC_SCRIPT          84
-#define TT_MAC_LANGID_AMHARIC                      85
-#define TT_MAC_LANGID_TIGRINYA                     86
-#define TT_MAC_LANGID_GALLA                        87
-#define TT_MAC_LANGID_SOMALI                       88
-#define TT_MAC_LANGID_SWAHILI                      89
-#define TT_MAC_LANGID_RUANDA                       90
-#define TT_MAC_LANGID_RUNDI                        91
-#define TT_MAC_LANGID_CHEWA                        92
-#define TT_MAC_LANGID_MALAGASY                     93
-#define TT_MAC_LANGID_ESPERANTO                    94
-#define TT_MAC_LANGID_WELSH                       128
-#define TT_MAC_LANGID_BASQUE                      129
-#define TT_MAC_LANGID_CATALAN                     130
-#define TT_MAC_LANGID_LATIN                       131
-#define TT_MAC_LANGID_QUECHUA                     132
-#define TT_MAC_LANGID_GUARANI                     133
-#define TT_MAC_LANGID_AYMARA                      134
-#define TT_MAC_LANGID_TATAR                       135
-#define TT_MAC_LANGID_UIGHUR                      136
-#define TT_MAC_LANGID_DZONGKHA                    137
-#define TT_MAC_LANGID_JAVANESE                    138
-#define TT_MAC_LANGID_SUNDANESE                   139
-
-
-#if 0  /* these seem to be errors that have been dropped */
-
-#define TT_MAC_LANGID_SCOTTISH_GAELIC             140
-#define TT_MAC_LANGID_IRISH_GAELIC                141
-
-#endif
-
-
-  /* The following codes are new as of 2000-03-10 */
-#define TT_MAC_LANGID_GALICIAN                    140
-#define TT_MAC_LANGID_AFRIKAANS                   141
-#define TT_MAC_LANGID_BRETON                      142
-#define TT_MAC_LANGID_INUKTITUT                   143
-#define TT_MAC_LANGID_SCOTTISH_GAELIC             144
-#define TT_MAC_LANGID_MANX_GAELIC                 145
-#define TT_MAC_LANGID_IRISH_GAELIC                146
-#define TT_MAC_LANGID_TONGAN                      147
-#define TT_MAC_LANGID_GREEK_POLYTONIC             148
-#define TT_MAC_LANGID_GREELANDIC                  149
-#define TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT    150
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the language identifier field in the name records  */
-  /* of the TTF `name' table if the `platform' identifier code is          */
-  /* TT_PLATFORM_MICROSOFT.                                                */
-  /*                                                                       */
-  /* The canonical source for the MS assigned LCIDs is                     */
-  /*                                                                       */
-  /*   http://www.microsoft.com/globaldev/reference/lcid-all.mspx          */
-  /*                                                                       */
-
-#define TT_MS_LANGID_ARABIC_GENERAL                    0x0001
-#define TT_MS_LANGID_ARABIC_SAUDI_ARABIA               0x0401
-#define TT_MS_LANGID_ARABIC_IRAQ                       0x0801
-#define TT_MS_LANGID_ARABIC_EGYPT                      0x0C01
-#define TT_MS_LANGID_ARABIC_LIBYA                      0x1001
-#define TT_MS_LANGID_ARABIC_ALGERIA                    0x1401
-#define TT_MS_LANGID_ARABIC_MOROCCO                    0x1801
-#define TT_MS_LANGID_ARABIC_TUNISIA                    0x1C01
-#define TT_MS_LANGID_ARABIC_OMAN                       0x2001
-#define TT_MS_LANGID_ARABIC_YEMEN                      0x2401
-#define TT_MS_LANGID_ARABIC_SYRIA                      0x2801
-#define TT_MS_LANGID_ARABIC_JORDAN                     0x2C01
-#define TT_MS_LANGID_ARABIC_LEBANON                    0x3001
-#define TT_MS_LANGID_ARABIC_KUWAIT                     0x3401
-#define TT_MS_LANGID_ARABIC_UAE                        0x3801
-#define TT_MS_LANGID_ARABIC_BAHRAIN                    0x3C01
-#define TT_MS_LANGID_ARABIC_QATAR                      0x4001
-#define TT_MS_LANGID_BULGARIAN_BULGARIA                0x0402
-#define TT_MS_LANGID_CATALAN_SPAIN                     0x0403
-#define TT_MS_LANGID_CHINESE_GENERAL                   0x0004
-#define TT_MS_LANGID_CHINESE_TAIWAN                    0x0404
-#define TT_MS_LANGID_CHINESE_PRC                       0x0804
-#define TT_MS_LANGID_CHINESE_HONG_KONG                 0x0C04
-#define TT_MS_LANGID_CHINESE_SINGAPORE                 0x1004
-
-#if 1  /* this looks like the correct value */
-#define TT_MS_LANGID_CHINESE_MACAU                     0x1404
-#else  /* but beware, Microsoft may change its mind...
-          the most recent Word reference has the following: */
-#define TT_MS_LANGID_CHINESE_MACAU  TT_MS_LANGID_CHINESE_HONG_KONG
-#endif
-
-#if 0  /* used only with .NET `cultures'; commented out */
-#define TT_MS_LANGID_CHINESE_TRADITIONAL               0x7C04
-#endif
-
-#define TT_MS_LANGID_CZECH_CZECH_REPUBLIC              0x0405
-#define TT_MS_LANGID_DANISH_DENMARK                    0x0406
-#define TT_MS_LANGID_GERMAN_GERMANY                    0x0407
-#define TT_MS_LANGID_GERMAN_SWITZERLAND                0x0807
-#define TT_MS_LANGID_GERMAN_AUSTRIA                    0x0C07
-#define TT_MS_LANGID_GERMAN_LUXEMBOURG                 0x1007
-#define TT_MS_LANGID_GERMAN_LIECHTENSTEI               0x1407
-#define TT_MS_LANGID_GREEK_GREECE                      0x0408
-
-  /* don't ask what this one means... It is commented out currently. */
-#if 0
-#define TT_MS_LANGID_GREEK_GREECE2                     0x2008
-#endif
-
-#define TT_MS_LANGID_ENGLISH_GENERAL                   0x0009
-#define TT_MS_LANGID_ENGLISH_UNITED_STATES             0x0409
-#define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM            0x0809
-#define TT_MS_LANGID_ENGLISH_AUSTRALIA                 0x0C09
-#define TT_MS_LANGID_ENGLISH_CANADA                    0x1009
-#define TT_MS_LANGID_ENGLISH_NEW_ZEALAND               0x1409
-#define TT_MS_LANGID_ENGLISH_IRELAND                   0x1809
-#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA              0x1C09
-#define TT_MS_LANGID_ENGLISH_JAMAICA                   0x2009
-#define TT_MS_LANGID_ENGLISH_CARIBBEAN                 0x2409
-#define TT_MS_LANGID_ENGLISH_BELIZE                    0x2809
-#define TT_MS_LANGID_ENGLISH_TRINIDAD                  0x2C09
-#define TT_MS_LANGID_ENGLISH_ZIMBABWE                  0x3009
-#define TT_MS_LANGID_ENGLISH_PHILIPPINES               0x3409
-#define TT_MS_LANGID_ENGLISH_INDONESIA                 0x3809
-#define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3C09
-#define TT_MS_LANGID_ENGLISH_INDIA                     0x4009
-#define TT_MS_LANGID_ENGLISH_MALAYSIA                  0x4409
-#define TT_MS_LANGID_ENGLISH_SINGAPORE                 0x4809
-#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT    0x040A
-#define TT_MS_LANGID_SPANISH_MEXICO                    0x080A
-#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT  0x0C0A
-#define TT_MS_LANGID_SPANISH_GUATEMALA                 0x100A
-#define TT_MS_LANGID_SPANISH_COSTA_RICA                0x140A
-#define TT_MS_LANGID_SPANISH_PANAMA                    0x180A
-#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC        0x1C0A
-#define TT_MS_LANGID_SPANISH_VENEZUELA                 0x200A
-#define TT_MS_LANGID_SPANISH_COLOMBIA                  0x240A
-#define TT_MS_LANGID_SPANISH_PERU                      0x280A
-#define TT_MS_LANGID_SPANISH_ARGENTINA                 0x2C0A
-#define TT_MS_LANGID_SPANISH_ECUADOR                   0x300A
-#define TT_MS_LANGID_SPANISH_CHILE                     0x340A
-#define TT_MS_LANGID_SPANISH_URUGUAY                   0x380A
-#define TT_MS_LANGID_SPANISH_PARAGUAY                  0x3C0A
-#define TT_MS_LANGID_SPANISH_BOLIVIA                   0x400A
-#define TT_MS_LANGID_SPANISH_EL_SALVADOR               0x440A
-#define TT_MS_LANGID_SPANISH_HONDURAS                  0x480A
-#define TT_MS_LANGID_SPANISH_NICARAGUA                 0x4C0A
-#define TT_MS_LANGID_SPANISH_PUERTO_RICO               0x500A
-#define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540A
-  /* The following ID blatantly violate MS specs by using a */
-  /* sublanguage > 0x1F.                                    */
-#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40AU
-#define TT_MS_LANGID_FINNISH_FINLAND                   0x040B
-#define TT_MS_LANGID_FRENCH_FRANCE                     0x040C
-#define TT_MS_LANGID_FRENCH_BELGIUM                    0x080C
-#define TT_MS_LANGID_FRENCH_CANADA                     0x0C0C
-#define TT_MS_LANGID_FRENCH_SWITZERLAND                0x100C
-#define TT_MS_LANGID_FRENCH_LUXEMBOURG                 0x140C
-#define TT_MS_LANGID_FRENCH_MONACO                     0x180C
-#define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1C0C
-#define TT_MS_LANGID_FRENCH_REUNION                    0x200C
-#define TT_MS_LANGID_FRENCH_CONGO                      0x240C
-  /* which was formerly: */
-#define TT_MS_LANGID_FRENCH_ZAIRE  TT_MS_LANGID_FRENCH_CONGO
-#define TT_MS_LANGID_FRENCH_SENEGAL                    0x280C
-#define TT_MS_LANGID_FRENCH_CAMEROON                   0x2C0C
-#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE              0x300C
-#define TT_MS_LANGID_FRENCH_MALI                       0x340C
-#define TT_MS_LANGID_FRENCH_MOROCCO                    0x380C
-#define TT_MS_LANGID_FRENCH_HAITI                      0x3C0C
-  /* and another violation of the spec (see 0xE40AU) */
-#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40CU
-#define TT_MS_LANGID_HEBREW_ISRAEL                     0x040D
-#define TT_MS_LANGID_HUNGARIAN_HUNGARY                 0x040E
-#define TT_MS_LANGID_ICELANDIC_ICELAND                 0x040F
-#define TT_MS_LANGID_ITALIAN_ITALY                     0x0410
-#define TT_MS_LANGID_ITALIAN_SWITZERLAND               0x0810
-#define TT_MS_LANGID_JAPANESE_JAPAN                    0x0411
-#define TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA     0x0412
-#define TT_MS_LANGID_KOREAN_JOHAB_KOREA                0x0812
-#define TT_MS_LANGID_DUTCH_NETHERLANDS                 0x0413
-#define TT_MS_LANGID_DUTCH_BELGIUM                     0x0813
-#define TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL           0x0414
-#define TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK          0x0814
-#define TT_MS_LANGID_POLISH_POLAND                     0x0415
-#define TT_MS_LANGID_PORTUGUESE_BRAZIL                 0x0416
-#define TT_MS_LANGID_PORTUGUESE_PORTUGAL               0x0816
-#define TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND        0x0417
-#define TT_MS_LANGID_ROMANIAN_ROMANIA                  0x0418
-#define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA                0x0818
-#define TT_MS_LANGID_RUSSIAN_RUSSIA                    0x0419
-#define TT_MS_LANGID_RUSSIAN_MOLDAVIA                  0x0819
-#define TT_MS_LANGID_CROATIAN_CROATIA                  0x041A
-#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN              0x081A
-#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC           0x0C1A
-
-#if 0  /* this used to be this value, but it looks like we were wrong */
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x101A
-#else  /* current sources say */
-#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA       0x101A
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x141A
-       /* and XPsp2 Platform SDK added (2004-07-26) */
-       /* Names are shortened to be significant within 40 chars. */
-#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN         0x181A
-#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC      0x181A
-#endif
-
-#define TT_MS_LANGID_SLOVAK_SLOVAKIA                   0x041B
-#define TT_MS_LANGID_ALBANIAN_ALBANIA                  0x041C
-#define TT_MS_LANGID_SWEDISH_SWEDEN                    0x041D
-#define TT_MS_LANGID_SWEDISH_FINLAND                   0x081D
-#define TT_MS_LANGID_THAI_THAILAND                     0x041E
-#define TT_MS_LANGID_TURKISH_TURKEY                    0x041F
-#define TT_MS_LANGID_URDU_PAKISTAN                     0x0420
-#define TT_MS_LANGID_URDU_INDIA                        0x0820
-#define TT_MS_LANGID_INDONESIAN_INDONESIA              0x0421
-#define TT_MS_LANGID_UKRAINIAN_UKRAINE                 0x0422
-#define TT_MS_LANGID_BELARUSIAN_BELARUS                0x0423
-#define TT_MS_LANGID_SLOVENE_SLOVENIA                  0x0424
-#define TT_MS_LANGID_ESTONIAN_ESTONIA                  0x0425
-#define TT_MS_LANGID_LATVIAN_LATVIA                    0x0426
-#define TT_MS_LANGID_LITHUANIAN_LITHUANIA              0x0427
-#define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA      0x0827
-#define TT_MS_LANGID_TAJIK_TAJIKISTAN                  0x0428
-#define TT_MS_LANGID_FARSI_IRAN                        0x0429
-#define TT_MS_LANGID_VIETNAMESE_VIET_NAM               0x042A
-#define TT_MS_LANGID_ARMENIAN_ARMENIA                  0x042B
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN            0x042C
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC         0x082C
-#define TT_MS_LANGID_BASQUE_SPAIN                      0x042D
-#define TT_MS_LANGID_SORBIAN_GERMANY                   0x042E
-#define TT_MS_LANGID_MACEDONIAN_MACEDONIA              0x042F
-#define TT_MS_LANGID_SUTU_SOUTH_AFRICA                 0x0430
-#define TT_MS_LANGID_TSONGA_SOUTH_AFRICA               0x0431
-#define TT_MS_LANGID_TSWANA_SOUTH_AFRICA               0x0432
-#define TT_MS_LANGID_VENDA_SOUTH_AFRICA                0x0433
-#define TT_MS_LANGID_XHOSA_SOUTH_AFRICA                0x0434
-#define TT_MS_LANGID_ZULU_SOUTH_AFRICA                 0x0435
-#define TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA            0x0436
-#define TT_MS_LANGID_GEORGIAN_GEORGIA                  0x0437
-#define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS           0x0438
-#define TT_MS_LANGID_HINDI_INDIA                       0x0439
-#define TT_MS_LANGID_MALTESE_MALTA                     0x043A
-  /* Added by XPsp2 Platform SDK (2004-07-26) */
-#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY              0x043B
-#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN              0x083B
-#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND             0x0C3B
-#define TT_MS_LANGID_SAMI_LULE_NORWAY                  0x103B
-#define TT_MS_LANGID_SAMI_LULE_SWEDEN                  0x143B
-#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY              0x183B
-#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN              0x1C3B
-#define TT_MS_LANGID_SAMI_SKOLT_FINLAND                0x203B
-#define TT_MS_LANGID_SAMI_INARI_FINLAND                0x243B
-  /* ... and we also keep our old identifier... */
-#define TT_MS_LANGID_SAAMI_LAPONIA                     0x043B
-
-#if 0 /* this seems to be a previous inversion */
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043C
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083C
-#else
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083C
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043C
-#endif
-
-#define TT_MS_LANGID_YIDDISH_GERMANY                   0x043D
-#define TT_MS_LANGID_MALAY_MALAYSIA                    0x043E
-#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM           0x083E
-#define TT_MS_LANGID_KAZAK_KAZAKSTAN                   0x043F
-#define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN /* Cyrillic*/ 0x0440
-  /* alias declared in Windows 2000 */
-#define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \
-          TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN
-
-#define TT_MS_LANGID_SWAHILI_KENYA                     0x0441
-#define TT_MS_LANGID_TURKMEN_TURKMENISTAN              0x0442
-#define TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN            0x0443
-#define TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC         0x0843
-#define TT_MS_LANGID_TATAR_TATARSTAN                   0x0444
-#define TT_MS_LANGID_BENGALI_INDIA                     0x0445
-#define TT_MS_LANGID_BENGALI_BANGLADESH                0x0845
-#define TT_MS_LANGID_PUNJABI_INDIA                     0x0446
-#define TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN           0x0846
-#define TT_MS_LANGID_GUJARATI_INDIA                    0x0447
-#define TT_MS_LANGID_ORIYA_INDIA                       0x0448
-#define TT_MS_LANGID_TAMIL_INDIA                       0x0449
-#define TT_MS_LANGID_TELUGU_INDIA                      0x044A
-#define TT_MS_LANGID_KANNADA_INDIA                     0x044B
-#define TT_MS_LANGID_MALAYALAM_INDIA                   0x044C
-#define TT_MS_LANGID_ASSAMESE_INDIA                    0x044D
-#define TT_MS_LANGID_MARATHI_INDIA                     0x044E
-#define TT_MS_LANGID_SANSKRIT_INDIA                    0x044F
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN      0x0850
-#define TT_MS_LANGID_TIBETAN_CHINA                     0x0451
-  /* Don't use the next constant!  It has            */
-  /*   (1) the wrong spelling (Dzonghka)             */
-  /*   (2) Microsoft doesn't officially define it -- */
-  /*       at least it is not in the List of Local   */
-  /*       ID Values.                                */
-  /*   (3) Dzongkha is not the same language as      */
-  /*       Tibetan, so merging it is wrong anyway.   */
-  /*                                                 */
-  /* TT_MS_LANGID_TIBETAN_BHUTAN is correct, BTW.    */
-#define TT_MS_LANGID_DZONGHKA_BHUTAN                   0x0851
-
-#if 0
-  /* the following used to be defined */
-#define TT_MS_LANGID_TIBETAN_BHUTAN                    0x0451
-  /* ... but it was changed; */
-#else
-  /* So we will continue to #define it, but with the correct value */
-#define TT_MS_LANGID_TIBETAN_BHUTAN   TT_MS_LANGID_DZONGHKA_BHUTAN
-#endif
-
-#define TT_MS_LANGID_WELSH_WALES                       0x0452
-#define TT_MS_LANGID_KHMER_CAMBODIA                    0x0453
-#define TT_MS_LANGID_LAO_LAOS                          0x0454
-#define TT_MS_LANGID_BURMESE_MYANMAR                   0x0455
-#define TT_MS_LANGID_GALICIAN_SPAIN                    0x0456
-#define TT_MS_LANGID_KONKANI_INDIA                     0x0457
-#define TT_MS_LANGID_MANIPURI_INDIA  /* Bengali */     0x0458
-#define TT_MS_LANGID_SINDHI_INDIA /* Arabic */         0x0459
-#define TT_MS_LANGID_SINDHI_PAKISTAN                   0x0859
-  /* Missing a LCID for Sindhi in Devanagari script */
-#define TT_MS_LANGID_SYRIAC_SYRIA                      0x045A
-#define TT_MS_LANGID_SINHALESE_SRI_LANKA               0x045B
-#define TT_MS_LANGID_CHEROKEE_UNITED_STATES            0x045C
-#define TT_MS_LANGID_INUKTITUT_CANADA                  0x045D
-#define TT_MS_LANGID_AMHARIC_ETHIOPIA                  0x045E
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */    0x045F
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN           0x085F
-  /* Missing a LCID for Tifinagh script */
-#define TT_MS_LANGID_KASHMIRI_PAKISTAN /* Arabic */    0x0460
-  /* Spelled this way by XPsp2 Platform SDK (2004-07-26) */
-  /* script is yet unclear... might be Arabic, Nagari or Sharada */
-#define TT_MS_LANGID_KASHMIRI_SASIA                    0x0860
-  /* ... and aliased (by MS) for compatibility reasons. */
-#define TT_MS_LANGID_KASHMIRI_INDIA TT_MS_LANGID_KASHMIRI_SASIA
-#define TT_MS_LANGID_NEPALI_NEPAL                      0x0461
-#define TT_MS_LANGID_NEPALI_INDIA                      0x0861
-#define TT_MS_LANGID_FRISIAN_NETHERLANDS               0x0462
-#define TT_MS_LANGID_PASHTO_AFGHANISTAN                0x0463
-#define TT_MS_LANGID_FILIPINO_PHILIPPINES              0x0464
-#define TT_MS_LANGID_DHIVEHI_MALDIVES                  0x0465
-  /* alias declared in Windows 2000 */
-#define TT_MS_LANGID_DIVEHI_MALDIVES  TT_MS_LANGID_DHIVEHI_MALDIVES
-#define TT_MS_LANGID_EDO_NIGERIA                       0x0466
-#define TT_MS_LANGID_FULFULDE_NIGERIA                  0x0467
-#define TT_MS_LANGID_HAUSA_NIGERIA                     0x0468
-#define TT_MS_LANGID_IBIBIO_NIGERIA                    0x0469
-#define TT_MS_LANGID_YORUBA_NIGERIA                    0x046A
-#define TT_MS_LANGID_QUECHUA_BOLIVIA                   0x046B
-#define TT_MS_LANGID_QUECHUA_ECUADOR                   0x086B
-#define TT_MS_LANGID_QUECHUA_PERU                      0x0C6B
-#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA               0x046C
-  /* Also spelled by XPsp2 Platform SDK (2004-07-26) */
-#define TT_MS_LANGID_SOTHO_SOUTHERN_SOUTH_AFRICA \
-          TT_MS_LANGID_SEPEDI_SOUTH_AFRICA
-  /* language codes 0x046D, 0x046E and 0x046F are (still) unknown. */
-#define TT_MS_LANGID_IGBO_NIGERIA                      0x0470
-#define TT_MS_LANGID_KANURI_NIGERIA                    0x0471
-#define TT_MS_LANGID_OROMO_ETHIOPIA                    0x0472
-#define TT_MS_LANGID_TIGRIGNA_ETHIOPIA                 0x0473
-#define TT_MS_LANGID_TIGRIGNA_ERYTHREA                 0x0873
-  /* also spelled in the `Passport SDK' list as: */
-#define TT_MS_LANGID_TIGRIGNA_ERYTREA  TT_MS_LANGID_TIGRIGNA_ERYTHREA
-#define TT_MS_LANGID_GUARANI_PARAGUAY                  0x0474
-#define TT_MS_LANGID_HAWAIIAN_UNITED_STATES            0x0475
-#define TT_MS_LANGID_LATIN                             0x0476
-#define TT_MS_LANGID_SOMALI_SOMALIA                    0x0477
-  /* Note: Yi does not have a (proper) ISO 639-2 code, since it is mostly */
-  /*       not written (but OTOH the peculiar writing system is worth     */
-  /*       studying).                                                     */
-#define TT_MS_LANGID_YI_CHINA                          0x0478
-#define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES   0x0479
-  /* language codes from 0x047A to 0x047F are (still) unknown. */
-#define TT_MS_LANGID_UIGHUR_CHINA                      0x0480
-#define TT_MS_LANGID_MAORI_NEW_ZEALAND                 0x0481
-
-#if 0  /* not deemed useful for fonts */
-#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE            0x04FF
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the `name' identifier field in the name records of */
-  /* the TTF `name' table.  These values are platform independent.         */
-  /*                                                                       */
-#define TT_NAME_ID_COPYRIGHT            0
-#define TT_NAME_ID_FONT_FAMILY          1
-#define TT_NAME_ID_FONT_SUBFAMILY       2
-#define TT_NAME_ID_UNIQUE_ID            3
-#define TT_NAME_ID_FULL_NAME            4
-#define TT_NAME_ID_VERSION_STRING       5
-#define TT_NAME_ID_PS_NAME              6
-#define TT_NAME_ID_TRADEMARK            7
-
-  /* the following values are from the OpenType spec */
-#define TT_NAME_ID_MANUFACTURER         8
-#define TT_NAME_ID_DESIGNER             9
-#define TT_NAME_ID_DESCRIPTION          10
-#define TT_NAME_ID_VENDOR_URL           11
-#define TT_NAME_ID_DESIGNER_URL         12
-#define TT_NAME_ID_LICENSE              13
-#define TT_NAME_ID_LICENSE_URL          14
-  /* number 15 is reserved */
-#define TT_NAME_ID_PREFERRED_FAMILY     16
-#define TT_NAME_ID_PREFERRED_SUBFAMILY  17
-#define TT_NAME_ID_MAC_FULL_NAME        18
-
-  /* The following code is new as of 2000-01-21 */
-#define TT_NAME_ID_SAMPLE_TEXT          19
-
-  /* This is new in OpenType 1.3 */
-#define TT_NAME_ID_CID_FINDFONT_NAME    20
-
-  /* This is new in OpenType 1.5 */
-#define TT_NAME_ID_WWS_FAMILY           21
-#define TT_NAME_ID_WWS_SUBFAMILY        22
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Bit mask values for the Unicode Ranges from the TTF `OS2 ' table.     */
-  /*                                                                       */
-  /* Updated 08-Nov-2008.                                                  */
-  /*                                                                       */
-
-  /* Bit  0   Basic Latin */
-#define TT_UCR_BASIC_LATIN                     (1L <<  0) /* U+0020-U+007E */
-  /* Bit  1   C1 Controls and Latin-1 Supplement */
-#define TT_UCR_LATIN1_SUPPLEMENT               (1L <<  1) /* U+0080-U+00FF */
-  /* Bit  2   Latin Extended-A */
-#define TT_UCR_LATIN_EXTENDED_A                (1L <<  2) /* U+0100-U+017F */
-  /* Bit  3   Latin Extended-B */
-#define TT_UCR_LATIN_EXTENDED_B                (1L <<  3) /* U+0180-U+024F */
-  /* Bit  4   IPA Extensions                 */
-  /*          Phonetic Extensions            */
-  /*          Phonetic Extensions Supplement */
-#define TT_UCR_IPA_EXTENSIONS                  (1L <<  4) /* U+0250-U+02AF */
-                                                          /* U+1D00-U+1D7F */
-                                                          /* U+1D80-U+1DBF */
-  /* Bit  5   Spacing Modifier Letters */
-  /*          Modifier Tone Letters    */
-#define TT_UCR_SPACING_MODIFIER                (1L <<  5) /* U+02B0-U+02FF */
-                                                          /* U+A700-U+A71F */
-  /* Bit  6   Combining Diacritical Marks            */
-  /*          Combining Diacritical Marks Supplement */
-#define TT_UCR_COMBINING_DIACRITICS            (1L <<  6) /* U+0300-U+036F */
-                                                          /* U+1DC0-U+1DFF */
-  /* Bit  7   Greek and Coptic */
-#define TT_UCR_GREEK                           (1L <<  7) /* U+0370-U+03FF */
-  /* Bit  8   Coptic */
-#define TT_UCR_COPTIC                          (1L <<  8) /* U+2C80-U+2CFF */
-  /* Bit  9   Cyrillic            */
-  /*          Cyrillic Supplement */
-  /*          Cyrillic Extended-A */
-  /*          Cyrillic Extended-B */
-#define TT_UCR_CYRILLIC                        (1L <<  9) /* U+0400-U+04FF */
-                                                          /* U+0500-U+052F */
-                                                          /* U+2DE0-U+2DFF */
-                                                          /* U+A640-U+A69F */
-  /* Bit 10   Armenian */
-#define TT_UCR_ARMENIAN                        (1L << 10) /* U+0530-U+058F */
-  /* Bit 11   Hebrew */
-#define TT_UCR_HEBREW                          (1L << 11) /* U+0590-U+05FF */
-  /* Bit 12   Vai */
-#define TT_UCR_VAI                             (1L << 12) /* U+A500-U+A63F */
-  /* Bit 13   Arabic            */
-  /*          Arabic Supplement */
-#define TT_UCR_ARABIC                          (1L << 13) /* U+0600-U+06FF */
-                                                          /* U+0750-U+077F */
-  /* Bit 14   NKo */
-#define TT_UCR_NKO                             (1L << 14) /* U+07C0-U+07FF */
-  /* Bit 15   Devanagari */
-#define TT_UCR_DEVANAGARI                      (1L << 15) /* U+0900-U+097F */
-  /* Bit 16   Bengali */
-#define TT_UCR_BENGALI                         (1L << 16) /* U+0980-U+09FF */
-  /* Bit 17   Gurmukhi */
-#define TT_UCR_GURMUKHI                        (1L << 17) /* U+0A00-U+0A7F */
-  /* Bit 18   Gujarati */
-#define TT_UCR_GUJARATI                        (1L << 18) /* U+0A80-U+0AFF */
-  /* Bit 19   Oriya */
-#define TT_UCR_ORIYA                           (1L << 19) /* U+0B00-U+0B7F */
-  /* Bit 20   Tamil */
-#define TT_UCR_TAMIL                           (1L << 20) /* U+0B80-U+0BFF */
-  /* Bit 21   Telugu */
-#define TT_UCR_TELUGU                          (1L << 21) /* U+0C00-U+0C7F */
-  /* Bit 22   Kannada */
-#define TT_UCR_KANNADA                         (1L << 22) /* U+0C80-U+0CFF */
-  /* Bit 23   Malayalam */
-#define TT_UCR_MALAYALAM                       (1L << 23) /* U+0D00-U+0D7F */
-  /* Bit 24   Thai */
-#define TT_UCR_THAI                            (1L << 24) /* U+0E00-U+0E7F */
-  /* Bit 25   Lao */
-#define TT_UCR_LAO                             (1L << 25) /* U+0E80-U+0EFF */
-  /* Bit 26   Georgian            */
-  /*          Georgian Supplement */
-#define TT_UCR_GEORGIAN                        (1L << 26) /* U+10A0-U+10FF */
-                                                          /* U+2D00-U+2D2F */
-  /* Bit 27   Balinese */
-#define TT_UCR_BALINESE                        (1L << 27) /* U+1B00-U+1B7F */
-  /* Bit 28   Hangul Jamo */
-#define TT_UCR_HANGUL_JAMO                     (1L << 28) /* U+1100-U+11FF */
-  /* Bit 29   Latin Extended Additional */
-  /*          Latin Extended-C          */
-  /*          Latin Extended-D          */
-#define TT_UCR_LATIN_EXTENDED_ADDITIONAL       (1L << 29) /* U+1E00-U+1EFF */
-                                                          /* U+2C60-U+2C7F */
-                                                          /* U+A720-U+A7FF */
-  /* Bit 30   Greek Extended */
-#define TT_UCR_GREEK_EXTENDED                  (1L << 30) /* U+1F00-U+1FFF */
-  /* Bit 31   General Punctuation      */
-  /*          Supplemental Punctuation */
-#define TT_UCR_GENERAL_PUNCTUATION             (1L << 31) /* U+2000-U+206F */
-                                                          /* U+2E00-U+2E7F */
-  /* Bit 32   Superscripts And Subscripts */
-#define TT_UCR_SUPERSCRIPTS_SUBSCRIPTS         (1L <<  0) /* U+2070-U+209F */
-  /* Bit 33   Currency Symbols */
-#define TT_UCR_CURRENCY_SYMBOLS                (1L <<  1) /* U+20A0-U+20CF */
-  /* Bit 34   Combining Diacritical Marks For Symbols */
-#define TT_UCR_COMBINING_DIACRITICS_SYMB       (1L <<  2) /* U+20D0-U+20FF */
-  /* Bit 35   Letterlike Symbols */
-#define TT_UCR_LETTERLIKE_SYMBOLS              (1L <<  3) /* U+2100-U+214F */
-  /* Bit 36   Number Forms */
-#define TT_UCR_NUMBER_FORMS                    (1L <<  4) /* U+2150-U+218F */
-  /* Bit 37   Arrows                           */
-  /*          Supplemental Arrows-A            */
-  /*          Supplemental Arrows-B            */
-  /*          Miscellaneous Symbols and Arrows */
-#define TT_UCR_ARROWS                          (1L <<  5) /* U+2190-U+21FF */
-                                                          /* U+27F0-U+27FF */
-                                                          /* U+2900-U+297F */
-                                                          /* U+2B00-U+2BFF */
-  /* Bit 38   Mathematical Operators               */
-  /*          Supplemental Mathematical Operators  */
-  /*          Miscellaneous Mathematical Symbols-A */
-  /*          Miscellaneous Mathematical Symbols-B */
-#define TT_UCR_MATHEMATICAL_OPERATORS          (1L <<  6) /* U+2200-U+22FF */
-                                                          /* U+2A00-U+2AFF */
-                                                          /* U+27C0-U+27EF */
-                                                          /* U+2980-U+29FF */
-  /* Bit 39 Miscellaneous Technical */
-#define TT_UCR_MISCELLANEOUS_TECHNICAL         (1L <<  7) /* U+2300-U+23FF */
-  /* Bit 40   Control Pictures */
-#define TT_UCR_CONTROL_PICTURES                (1L <<  8) /* U+2400-U+243F */
-  /* Bit 41   Optical Character Recognition */
-#define TT_UCR_OCR                             (1L <<  9) /* U+2440-U+245F */
-  /* Bit 42   Enclosed Alphanumerics */
-#define TT_UCR_ENCLOSED_ALPHANUMERICS          (1L << 10) /* U+2460-U+24FF */
-  /* Bit 43   Box Drawing */
-#define TT_UCR_BOX_DRAWING                     (1L << 11) /* U+2500-U+257F */
-  /* Bit 44   Block Elements */
-#define TT_UCR_BLOCK_ELEMENTS                  (1L << 12) /* U+2580-U+259F */
-  /* Bit 45   Geometric Shapes */
-#define TT_UCR_GEOMETRIC_SHAPES                (1L << 13) /* U+25A0-U+25FF */
-  /* Bit 46   Miscellaneous Symbols */
-#define TT_UCR_MISCELLANEOUS_SYMBOLS           (1L << 14) /* U+2600-U+26FF */
-  /* Bit 47   Dingbats */
-#define TT_UCR_DINGBATS                        (1L << 15) /* U+2700-U+27BF */
-  /* Bit 48   CJK Symbols and Punctuation */
-#define TT_UCR_CJK_SYMBOLS                     (1L << 16) /* U+3000-U+303F */
-  /* Bit 49   Hiragana */
-#define TT_UCR_HIRAGANA                        (1L << 17) /* U+3040-U+309F */
-  /* Bit 50   Katakana                     */
-  /*          Katakana Phonetic Extensions */
-#define TT_UCR_KATAKANA                        (1L << 18) /* U+30A0-U+30FF */
-                                                          /* U+31F0-U+31FF */
-  /* Bit 51   Bopomofo          */
-  /*          Bopomofo Extended */
-#define TT_UCR_BOPOMOFO                        (1L << 19) /* U+3100-U+312F */
-                                                          /* U+31A0-U+31BF */
-  /* Bit 52   Hangul Compatibility Jamo */
-#define TT_UCR_HANGUL_COMPATIBILITY_JAMO       (1L << 20) /* U+3130-U+318F */
-  /* Bit 53   Phags-Pa */
-#define TT_UCR_CJK_MISC                        (1L << 21) /* U+A840-U+A87F */
-#define TT_UCR_KANBUN  TT_UCR_CJK_MISC /* deprecated */
-#define TT_UCR_PHAGSPA
-  /* Bit 54   Enclosed CJK Letters and Months */
-#define TT_UCR_ENCLOSED_CJK_LETTERS_MONTHS     (1L << 22) /* U+3200-U+32FF */
-  /* Bit 55   CJK Compatibility */
-#define TT_UCR_CJK_COMPATIBILITY               (1L << 23) /* U+3300-U+33FF */
-  /* Bit 56   Hangul Syllables */
-#define TT_UCR_HANGUL                          (1L << 24) /* U+AC00-U+D7A3 */
-  /* Bit 57   High Surrogates              */
-  /*          High Private Use Surrogates  */
-  /*          Low Surrogates               */
-  /*                                       */
-  /* According to OpenType specs v.1.3+,   */
-  /* setting bit 57 implies that there is  */
-  /* at least one codepoint beyond the     */
-  /* Basic Multilingual Plane that is      */
-  /* supported by this font.  So it really */
-  /* means >= U+10000                      */
-#define TT_UCR_SURROGATES                      (1L << 25) /* U+D800-U+DB7F */
-                                                          /* U+DB80-U+DBFF */
-                                                          /* U+DC00-U+DFFF */
-#define TT_UCR_NON_PLANE_0  TT_UCR_SURROGATES
-  /* Bit 58  Phoenician */
-#define TT_UCR_PHOENICIAN                      (1L << 26) /*U+10900-U+1091F*/
-  /* Bit 59   CJK Unified Ideographs             */
-  /*          CJK Radicals Supplement            */
-  /*          Kangxi Radicals                    */
-  /*          Ideographic Description Characters */
-  /*          CJK Unified Ideographs Extension A */
-  /*          CJK Unified Ideographs Extension B */
-  /*          Kanbun                             */
-#define TT_UCR_CJK_UNIFIED_IDEOGRAPHS          (1L << 27) /* U+4E00-U+9FFF */
-                                                          /* U+2E80-U+2EFF */
-                                                          /* U+2F00-U+2FDF */
-                                                          /* U+2FF0-U+2FFF */
-                                                          /* U+3400-U+4DB5 */
-                                                          /*U+20000-U+2A6DF*/
-                                                          /* U+3190-U+319F */
-  /* Bit 60   Private Use */
-#define TT_UCR_PRIVATE_USE                     (1L << 28) /* U+E000-U+F8FF */
-  /* Bit 61   CJK Strokes                             */
-  /*          CJK Compatibility Ideographs            */
-  /*          CJK Compatibility Ideographs Supplement */
-#define TT_UCR_CJK_COMPATIBILITY_IDEOGRAPHS    (1L << 29) /* U+31C0-U+31EF */
-                                                          /* U+F900-U+FAFF */
-                                                          /*U+2F800-U+2FA1F*/
-  /* Bit 62   Alphabetic Presentation Forms */
-#define TT_UCR_ALPHABETIC_PRESENTATION_FORMS   (1L << 30) /* U+FB00-U+FB4F */
-  /* Bit 63   Arabic Presentation Forms-A */
-#define TT_UCR_ARABIC_PRESENTATIONS_A          (1L << 31) /* U+FB50-U+FDFF */
-  /* Bit 64   Combining Half Marks */
-#define TT_UCR_COMBINING_HALF_MARKS            (1L <<  0) /* U+FE20-U+FE2F */
-  /* Bit 65   Vertical forms          */
-  /*          CJK Compatibility Forms */
-#define TT_UCR_CJK_COMPATIBILITY_FORMS         (1L <<  1) /* U+FE10-U+FE1F */
-                                                          /* U+FE30-U+FE4F */
-  /* Bit 66   Small Form Variants */
-#define TT_UCR_SMALL_FORM_VARIANTS             (1L <<  2) /* U+FE50-U+FE6F */
-  /* Bit 67   Arabic Presentation Forms-B */
-#define TT_UCR_ARABIC_PRESENTATIONS_B          (1L <<  3) /* U+FE70-U+FEFE */
-  /* Bit 68   Halfwidth and Fullwidth Forms */
-#define TT_UCR_HALFWIDTH_FULLWIDTH_FORMS       (1L <<  4) /* U+FF00-U+FFEF */
-  /* Bit 69   Specials */
-#define TT_UCR_SPECIALS                        (1L <<  5) /* U+FFF0-U+FFFD */
-  /* Bit 70   Tibetan */
-#define TT_UCR_TIBETAN                         (1L <<  6) /* U+0F00-U+0FFF */
-  /* Bit 71   Syriac */
-#define TT_UCR_SYRIAC                          (1L <<  7) /* U+0700-U+074F */
-  /* Bit 72   Thaana */
-#define TT_UCR_THAANA                          (1L <<  8) /* U+0780-U+07BF */
-  /* Bit 73   Sinhala */
-#define TT_UCR_SINHALA                         (1L <<  9) /* U+0D80-U+0DFF */
-  /* Bit 74   Myanmar */
-#define TT_UCR_MYANMAR                         (1L << 10) /* U+1000-U+109F */
-  /* Bit 75   Ethiopic            */
-  /*          Ethiopic Supplement */
-  /*          Ethiopic Extended   */
-#define TT_UCR_ETHIOPIC                        (1L << 11) /* U+1200-U+137F */
-                                                          /* U+1380-U+139F */
-                                                          /* U+2D80-U+2DDF */
-  /* Bit 76   Cherokee */
-#define TT_UCR_CHEROKEE                        (1L << 12) /* U+13A0-U+13FF */
-  /* Bit 77   Unified Canadian Aboriginal Syllabics */
-#define TT_UCR_CANADIAN_ABORIGINAL_SYLLABICS   (1L << 13) /* U+1400-U+167F */
-  /* Bit 78   Ogham */
-#define TT_UCR_OGHAM                           (1L << 14) /* U+1680-U+169F */
-  /* Bit 79   Runic */
-#define TT_UCR_RUNIC                           (1L << 15) /* U+16A0-U+16FF */
-  /* Bit 80   Khmer         */
-  /*          Khmer Symbols */
-#define TT_UCR_KHMER                           (1L << 16) /* U+1780-U+17FF */
-                                                          /* U+19E0-U+19FF */
-  /* Bit 81   Mongolian */
-#define TT_UCR_MONGOLIAN                       (1L << 17) /* U+1800-U+18AF */
-  /* Bit 82   Braille Patterns */
-#define TT_UCR_BRAILLE                         (1L << 18) /* U+2800-U+28FF */
-  /* Bit 83   Yi Syllables */
-  /*          Yi Radicals  */
-#define TT_UCR_YI                              (1L << 19) /* U+A000-U+A48F */
-                                                          /* U+A490-U+A4CF */
-  /* Bit 84   Tagalog  */
-  /*          Hanunoo  */
-  /*          Buhid    */
-  /*          Tagbanwa */
-#define TT_UCR_PHILIPPINE                      (1L << 20) /* U+1700-U+171F */
-                                                          /* U+1720-U+173F */
-                                                          /* U+1740-U+175F */
-                                                          /* U+1760-U+177F */
-  /* Bit 85   Old Italic */
-#define TT_UCR_OLD_ITALIC                      (1L << 21) /*U+10300-U+1032F*/
-  /* Bit 86   Gothic */
-#define TT_UCR_GOTHIC                          (1L << 22) /*U+10330-U+1034F*/
-  /* Bit 87   Deseret */
-#define TT_UCR_DESERET                         (1L << 23) /*U+10400-U+1044F*/
-  /* Bit 88   Byzantine Musical Symbols      */
-  /*          Musical Symbols                */
-  /*          Ancient Greek Musical Notation */
-#define TT_UCR_MUSICAL_SYMBOLS                 (1L << 24) /*U+1D000-U+1D0FF*/
-                                                          /*U+1D100-U+1D1FF*/
-                                                          /*U+1D200-U+1D24F*/
-  /* Bit 89   Mathematical Alphanumeric Symbols */
-#define TT_UCR_MATH_ALPHANUMERIC_SYMBOLS       (1L << 25) /*U+1D400-U+1D7FF*/
-  /* Bit 90   Private Use (plane 15) */
-  /*          Private Use (plane 16) */
-#define TT_UCR_PRIVATE_USE_SUPPLEMENTARY       (1L << 26) /*U+F0000-U+FFFFD*/
-                                                        /*U+100000-U+10FFFD*/
-  /* Bit 91   Variation Selectors            */
-  /*          Variation Selectors Supplement */
-#define TT_UCR_VARIATION_SELECTORS             (1L << 27) /* U+FE00-U+FE0F */
-                                                          /*U+E0100-U+E01EF*/
-  /* Bit 92   Tags */
-#define TT_UCR_TAGS                            (1L << 28) /*U+E0000-U+E007F*/
-  /* Bit 93   Limbu */
-#define TT_UCR_LIMBU                           (1L << 29) /* U+1900-U+194F */
-  /* Bit 94   Tai Le */
-#define TT_UCR_TAI_LE                          (1L << 30) /* U+1950-U+197F */
-  /* Bit 95   New Tai Lue */
-#define TT_UCR_NEW_TAI_LUE                     (1L << 31) /* U+1980-U+19DF */
-  /* Bit 96   Buginese */
-#define TT_UCR_BUGINESE                        (1L <<  0) /* U+1A00-U+1A1F */
-  /* Bit 97   Glagolitic */
-#define TT_UCR_GLAGOLITIC                      (1L <<  1) /* U+2C00-U+2C5F */
-  /* Bit 98   Tifinagh */
-#define TT_UCR_TIFINAGH                        (1L <<  2) /* U+2D30-U+2D7F */
-  /* Bit 99   Yijing Hexagram Symbols */
-#define TT_UCR_YIJING                          (1L <<  3) /* U+4DC0-U+4DFF */
-  /* Bit 100  Syloti Nagri */
-#define TT_UCR_SYLOTI_NAGRI                    (1L <<  4) /* U+A800-U+A82F */
-  /* Bit 101  Linear B Syllabary */
-  /*          Linear B Ideograms */
-  /*          Aegean Numbers     */
-#define TT_UCR_LINEAR_B                        (1L <<  5) /*U+10000-U+1007F*/
-                                                          /*U+10080-U+100FF*/
-                                                          /*U+10100-U+1013F*/
-  /* Bit 102  Ancient Greek Numbers */
-#define TT_UCR_ANCIENT_GREEK_NUMBERS           (1L <<  6) /*U+10140-U+1018F*/
-  /* Bit 103  Ugaritic */
-#define TT_UCR_UGARITIC                        (1L <<  7) /*U+10380-U+1039F*/
-  /* Bit 104  Old Persian */
-#define TT_UCR_OLD_PERSIAN                     (1L <<  8) /*U+103A0-U+103DF*/
-  /* Bit 105  Shavian */
-#define TT_UCR_SHAVIAN                         (1L <<  9) /*U+10450-U+1047F*/
-  /* Bit 106  Osmanya */
-#define TT_UCR_OSMANYA                         (1L << 10) /*U+10480-U+104AF*/
-  /* Bit 107  Cypriot Syllabary */
-#define TT_UCR_CYPRIOT_SYLLABARY               (1L << 11) /*U+10800-U+1083F*/
-  /* Bit 108  Kharoshthi */
-#define TT_UCR_KHAROSHTHI                      (1L << 12) /*U+10A00-U+10A5F*/
-  /* Bit 109  Tai Xuan Jing Symbols */
-#define TT_UCR_TAI_XUAN_JING                   (1L << 13) /*U+1D300-U+1D35F*/
-  /* Bit 110  Cuneiform                         */
-  /*          Cuneiform Numbers and Punctuation */
-#define TT_UCR_CUNEIFORM                       (1L << 14) /*U+12000-U+123FF*/
-                                                          /*U+12400-U+1247F*/
-  /* Bit 111  Counting Rod Numerals */
-#define TT_UCR_COUNTING_ROD_NUMERALS           (1L << 15) /*U+1D360-U+1D37F*/
-  /* Bit 112  Sundanese */
-#define TT_UCR_SUNDANESE                       (1L << 16) /* U+1B80-U+1BBF */
-  /* Bit 113  Lepcha */
-#define TT_UCR_LEPCHA                          (1L << 17) /* U+1C00-U+1C4F */
-  /* Bit 114  Ol Chiki */
-#define TT_UCR_OL_CHIKI                        (1L << 18) /* U+1C50-U+1C7F */
-  /* Bit 115  Saurashtra */
-#define TT_UCR_SAURASHTRA                      (1L << 19) /* U+A880-U+A8DF */
-  /* Bit 116  Kayah Li */
-#define TT_UCR_KAYAH_LI                        (1L << 20) /* U+A900-U+A92F */
-  /* Bit 117  Rejang */
-#define TT_UCR_REJANG                          (1L << 21) /* U+A930-U+A95F */
-  /* Bit 118  Cham */
-#define TT_UCR_CHAM                            (1L << 22) /* U+AA00-U+AA5F */
-  /* Bit 119  Ancient Symbols */
-#define TT_UCR_ANCIENT_SYMBOLS                 (1L << 23) /*U+10190-U+101CF*/
-  /* Bit 120  Phaistos Disc */
-#define TT_UCR_PHAISTOS_DISC                   (1L << 24) /*U+101D0-U+101FF*/
-  /* Bit 121  Carian */
-  /*          Lycian */
-  /*          Lydian */
-#define TT_UCR_OLD_ANATOLIAN                   (1L << 25) /*U+102A0-U+102DF*/
-                                                          /*U+10280-U+1029F*/
-                                                          /*U+10920-U+1093F*/
-  /* Bit 122  Domino Tiles  */
-  /*          Mahjong Tiles */
-#define TT_UCR_GAME_TILES                      (1L << 26) /*U+1F030-U+1F09F*/
-                                                          /*U+1F000-U+1F02F*/
-  /* Bit 123-127 Reserved for process-internal usage */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Some compilers have a very limited length of identifiers.             */
-  /*                                                                       */
-#if defined( __TURBOC__ ) && __TURBOC__ < 0x0410 || defined( __PACIFIC__ )
-#define HAVE_LIMIT_ON_IDENTS
-#endif
-
-
-#ifndef HAVE_LIMIT_ON_IDENTS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Here some alias #defines in order to be clearer.                      */
-  /*                                                                       */
-  /* These are not always #defined to stay within the 31~character limit,  */
-  /* which some compilers have.                                            */
-  /*                                                                       */
-  /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern  */
-  /* Borland compilers (read: from BC++ 3.1 on) can increase this limit.   */
-  /* If you get a warning with such a compiler, use the -i40 switch.       */
-  /*                                                                       */
-#define TT_UCR_ARABIC_PRESENTATION_FORMS_A      \
-         TT_UCR_ARABIC_PRESENTATIONS_A
-#define TT_UCR_ARABIC_PRESENTATION_FORMS_B      \
-         TT_UCR_ARABIC_PRESENTATIONS_B
-
-#define TT_UCR_COMBINING_DIACRITICAL_MARKS      \
-         TT_UCR_COMBINING_DIACRITICS
-#define TT_UCR_COMBINING_DIACRITICAL_MARKS_SYMB \
-         TT_UCR_COMBINING_DIACRITICS_SYMB
-
-
-#endif /* !HAVE_LIMIT_ON_IDENTS */
-
-
-FT_END_HEADER
-
-#endif /* TTNAMEID_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/tttables.h b/dependencies2013/win32/include/freetype/tttables.h
deleted file mode 100644
index 1c075dcf..00000000
--- a/dependencies2013/win32/include/freetype/tttables.h
+++ /dev/null
@@ -1,829 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttables.h                                                             */
-/*                                                                         */
-/*    Basic SFNT/TrueType tables definitions and interface                 */
-/*    (specification only).                                                */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef TTTABLES_H_
-#define TTTABLES_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    truetype_tables                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    TrueType Tables                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    TrueType specific table types and functions.                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the definition of TrueType-specific tables   */
-  /*    as well as some routines used to access and process them.          */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    TT_Header                                                          */
-  /*    TT_HoriHeader                                                      */
-  /*    TT_VertHeader                                                      */
-  /*    TT_OS2                                                             */
-  /*    TT_Postscript                                                      */
-  /*    TT_PCLT                                                            */
-  /*    TT_MaxProfile                                                      */
-  /*                                                                       */
-  /*    FT_Sfnt_Tag                                                        */
-  /*    FT_Get_Sfnt_Table                                                  */
-  /*    FT_Load_Sfnt_Table                                                 */
-  /*    FT_Sfnt_Table_Info                                                 */
-  /*                                                                       */
-  /*    FT_Get_CMap_Language_ID                                            */
-  /*    FT_Get_CMap_Format                                                 */
-  /*                                                                       */
-  /*    FT_PARAM_TAG_UNPATENTED_HINTING                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Header                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType font header table.  All       */
-  /*    fields follow the TrueType specification.                          */
-  /*                                                                       */
-  typedef struct  TT_Header_
-  {
-    FT_Fixed   Table_Version;
-    FT_Fixed   Font_Revision;
-
-    FT_Long    CheckSum_Adjust;
-    FT_Long    Magic_Number;
-
-    FT_UShort  Flags;
-    FT_UShort  Units_Per_EM;
-
-    FT_Long    Created [2];
-    FT_Long    Modified[2];
-
-    FT_Short   xMin;
-    FT_Short   yMin;
-    FT_Short   xMax;
-    FT_Short   yMax;
-
-    FT_UShort  Mac_Style;
-    FT_UShort  Lowest_Rec_PPEM;
-
-    FT_Short   Font_Direction;
-    FT_Short   Index_To_Loc_Format;
-    FT_Short   Glyph_Data_Format;
-
-  } TT_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_HoriHeader                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType horizontal header, the `hhea' */
-  /*    table, as well as the corresponding horizontal metrics table,      */
-  /*    i.e., the `hmtx' table.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Version                :: The table version.                       */
-  /*                                                                       */
-  /*    Ascender               :: The font's ascender, i.e., the distance  */
-  /*                              from the baseline to the top-most of all */
-  /*                              glyph points found in the font.          */
-  /*                                                                       */
-  /*                              This value is invalid in many fonts, as  */
-  /*                              it is usually set by the font designer,  */
-  /*                              and often reflects only a portion of the */
-  /*                              glyphs found in the font (maybe ASCII).  */
-  /*                                                                       */
-  /*                              You should use the `sTypoAscender' field */
-  /*                              of the OS/2 table instead if you want    */
-  /*                              the correct one.                         */
-  /*                                                                       */
-  /*    Descender              :: The font's descender, i.e., the distance */
-  /*                              from the baseline to the bottom-most of  */
-  /*                              all glyph points found in the font.  It  */
-  /*                              is negative.                             */
-  /*                                                                       */
-  /*                              This value is invalid in many fonts, as  */
-  /*                              it is usually set by the font designer,  */
-  /*                              and often reflects only a portion of the */
-  /*                              glyphs found in the font (maybe ASCII).  */
-  /*                                                                       */
-  /*                              You should use the `sTypoDescender'      */
-  /*                              field of the OS/2 table instead if you   */
-  /*                              want the correct one.                    */
-  /*                                                                       */
-  /*    Line_Gap               :: The font's line gap, i.e., the distance  */
-  /*                              to add to the ascender and descender to  */
-  /*                              get the BTB, i.e., the                   */
-  /*                              baseline-to-baseline distance for the    */
-  /*                              font.                                    */
-  /*                                                                       */
-  /*    advance_Width_Max      :: This field is the maximum of all advance */
-  /*                              widths found in the font.  It can be     */
-  /*                              used to compute the maximum width of an  */
-  /*                              arbitrary string of text.                */
-  /*                                                                       */
-  /*    min_Left_Side_Bearing  :: The minimum left side bearing of all     */
-  /*                              glyphs within the font.                  */
-  /*                                                                       */
-  /*    min_Right_Side_Bearing :: The minimum right side bearing of all    */
-  /*                              glyphs within the font.                  */
-  /*                                                                       */
-  /*    xMax_Extent            :: The maximum horizontal extent (i.e., the */
-  /*                              `width' of a glyph's bounding box) for   */
-  /*                              all glyphs in the font.                  */
-  /*                                                                       */
-  /*    caret_Slope_Rise       :: The rise coefficient of the cursor's     */
-  /*                              slope of the cursor (slope=rise/run).    */
-  /*                                                                       */
-  /*    caret_Slope_Run        :: The run coefficient of the cursor's      */
-  /*                              slope.                                   */
-  /*                                                                       */
-  /*    Reserved               :: 8~reserved bytes.                        */
-  /*                                                                       */
-  /*    metric_Data_Format     :: Always~0.                                */
-  /*                                                                       */
-  /*    number_Of_HMetrics     :: Number of HMetrics entries in the `hmtx' */
-  /*                              table -- this value can be smaller than  */
-  /*                              the total number of glyphs in the font.  */
-  /*                                                                       */
-  /*    long_metrics           :: A pointer into the `hmtx' table.         */
-  /*                                                                       */
-  /*    short_metrics          :: A pointer into the `hmtx' table.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields,      */
-  /*               which are different.                                    */
-  /*                                                                       */
-  /*               This ensures that a single function in the `ttload'     */
-  /*               module is able to read both the horizontal and vertical */
-  /*               headers.                                                */
-  /*                                                                       */
-  typedef struct  TT_HoriHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Width_Max;      /* advance width maximum */
-
-    FT_Short   min_Left_Side_Bearing;  /* minimum left-sb       */
-    FT_Short   min_Right_Side_Bearing; /* minimum right-sb      */
-    FT_Short   xMax_Extent;            /* xmax extents          */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved[4];
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_HMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they are used to connect the metrics header to the relevant    */
-    /* `HMTX' table.                                                      */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_HoriHeader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_VertHeader                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType vertical header, the `vhea'   */
-  /*    table, as well as the corresponding vertical metrics table, i.e.,  */
-  /*    the `vmtx' table.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Version                 :: The table version.                      */
-  /*                                                                       */
-  /*    Ascender                :: The font's ascender, i.e., the distance */
-  /*                               from the baseline to the top-most of    */
-  /*                               all glyph points found in the font.     */
-  /*                                                                       */
-  /*                               This value is invalid in many fonts, as */
-  /*                               it is usually set by the font designer, */
-  /*                               and often reflects only a portion of    */
-  /*                               the glyphs found in the font (maybe     */
-  /*                               ASCII).                                 */
-  /*                                                                       */
-  /*                               You should use the `sTypoAscender'      */
-  /*                               field of the OS/2 table instead if you  */
-  /*                               want the correct one.                   */
-  /*                                                                       */
-  /*    Descender               :: The font's descender, i.e., the         */
-  /*                               distance from the baseline to the       */
-  /*                               bottom-most of all glyph points found   */
-  /*                               in the font.  It is negative.           */
-  /*                                                                       */
-  /*                               This value is invalid in many fonts, as */
-  /*                               it is usually set by the font designer, */
-  /*                               and often reflects only a portion of    */
-  /*                               the glyphs found in the font (maybe     */
-  /*                               ASCII).                                 */
-  /*                                                                       */
-  /*                               You should use the `sTypoDescender'     */
-  /*                               field of the OS/2 table instead if you  */
-  /*                               want the correct one.                   */
-  /*                                                                       */
-  /*    Line_Gap                :: The font's line gap, i.e., the distance */
-  /*                               to add to the ascender and descender to */
-  /*                               get the BTB, i.e., the                  */
-  /*                               baseline-to-baseline distance for the   */
-  /*                               font.                                   */
-  /*                                                                       */
-  /*    advance_Height_Max      :: This field is the maximum of all        */
-  /*                               advance heights found in the font.  It  */
-  /*                               can be used to compute the maximum      */
-  /*                               height of an arbitrary string of text.  */
-  /*                                                                       */
-  /*    min_Top_Side_Bearing    :: The minimum top side bearing of all     */
-  /*                               glyphs within the font.                 */
-  /*                                                                       */
-  /*    min_Bottom_Side_Bearing :: The minimum bottom side bearing of all  */
-  /*                               glyphs within the font.                 */
-  /*                                                                       */
-  /*    yMax_Extent             :: The maximum vertical extent (i.e., the  */
-  /*                               `height' of a glyph's bounding box) for */
-  /*                               all glyphs in the font.                 */
-  /*                                                                       */
-  /*    caret_Slope_Rise        :: The rise coefficient of the cursor's    */
-  /*                               slope of the cursor (slope=rise/run).   */
-  /*                                                                       */
-  /*    caret_Slope_Run         :: The run coefficient of the cursor's     */
-  /*                               slope.                                  */
-  /*                                                                       */
-  /*    caret_Offset            :: The cursor's offset for slanted fonts.  */
-  /*                               This value is `reserved' in vmtx        */
-  /*                               version 1.0.                            */
-  /*                                                                       */
-  /*    Reserved                :: 8~reserved bytes.                       */
-  /*                                                                       */
-  /*    metric_Data_Format      :: Always~0.                               */
-  /*                                                                       */
-  /*    number_Of_HMetrics      :: Number of VMetrics entries in the       */
-  /*                               `vmtx' table -- this value can be       */
-  /*                               smaller than the total number of glyphs */
-  /*                               in the font.                            */
-  /*                                                                       */
-  /*    long_metrics           :: A pointer into the `vmtx' table.         */
-  /*                                                                       */
-  /*    short_metrics          :: A pointer into the `vmtx' table.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields,      */
-  /*               which are different.                                    */
-  /*                                                                       */
-  /*               This ensures that a single function in the `ttload'     */
-  /*               module is able to read both the horizontal and vertical */
-  /*               headers.                                                */
-  /*                                                                       */
-  typedef struct  TT_VertHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Height_Max;      /* advance height maximum */
-
-    FT_Short   min_Top_Side_Bearing;    /* minimum left-sb or top-sb       */
-    FT_Short   min_Bottom_Side_Bearing; /* minimum right-sb or bottom-sb   */
-    FT_Short   yMax_Extent;             /* xmax or ymax extents            */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved[4];
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_VMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they're used to connect the metrics header to the relevant     */
-    /* `HMTX' or `VMTX' table.                                            */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_VertHeader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_OS2                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType OS/2 table.  All fields       */
-  /*    comply to the OpenType specification.                              */
-  /*                                                                       */
-  /*    Note that we now support old Mac fonts that do not include an OS/2 */
-  /*    table.  In this case, the `version' field is always set to 0xFFFF. */
-  /*                                                                       */
-  typedef struct  TT_OS2_
-  {
-    FT_UShort  version;                /* 0x0001 - more or 0xFFFF */
-    FT_Short   xAvgCharWidth;
-    FT_UShort  usWeightClass;
-    FT_UShort  usWidthClass;
-    FT_UShort  fsType;
-    FT_Short   ySubscriptXSize;
-    FT_Short   ySubscriptYSize;
-    FT_Short   ySubscriptXOffset;
-    FT_Short   ySubscriptYOffset;
-    FT_Short   ySuperscriptXSize;
-    FT_Short   ySuperscriptYSize;
-    FT_Short   ySuperscriptXOffset;
-    FT_Short   ySuperscriptYOffset;
-    FT_Short   yStrikeoutSize;
-    FT_Short   yStrikeoutPosition;
-    FT_Short   sFamilyClass;
-
-    FT_Byte    panose[10];
-
-    FT_ULong   ulUnicodeRange1;        /* Bits 0-31   */
-    FT_ULong   ulUnicodeRange2;        /* Bits 32-63  */
-    FT_ULong   ulUnicodeRange3;        /* Bits 64-95  */
-    FT_ULong   ulUnicodeRange4;        /* Bits 96-127 */
-
-    FT_Char    achVendID[4];
-
-    FT_UShort  fsSelection;
-    FT_UShort  usFirstCharIndex;
-    FT_UShort  usLastCharIndex;
-    FT_Short   sTypoAscender;
-    FT_Short   sTypoDescender;
-    FT_Short   sTypoLineGap;
-    FT_UShort  usWinAscent;
-    FT_UShort  usWinDescent;
-
-    /* only version 1 and higher: */
-
-    FT_ULong   ulCodePageRange1;       /* Bits 0-31   */
-    FT_ULong   ulCodePageRange2;       /* Bits 32-63  */
-
-    /* only version 2 and higher: */
-
-    FT_Short   sxHeight;
-    FT_Short   sCapHeight;
-    FT_UShort  usDefaultChar;
-    FT_UShort  usBreakChar;
-    FT_UShort  usMaxContext;
-
-    /* only version 5 and higher: */
-
-    FT_UShort  usLowerOpticalPointSize;       /* in twips (1/20th points) */
-    FT_UShort  usUpperOpticalPointSize;       /* in twips (1/20th points) */
-
-  } TT_OS2;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Postscript                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType PostScript table.  All fields */
-  /*    comply to the TrueType specification.  This structure does not     */
-  /*    reference the PostScript glyph names, which can be nevertheless    */
-  /*    accessed with the `ttpost' module.                                 */
-  /*                                                                       */
-  typedef struct  TT_Postscript_
-  {
-    FT_Fixed  FormatType;
-    FT_Fixed  italicAngle;
-    FT_Short  underlinePosition;
-    FT_Short  underlineThickness;
-    FT_ULong  isFixedPitch;
-    FT_ULong  minMemType42;
-    FT_ULong  maxMemType42;
-    FT_ULong  minMemType1;
-    FT_ULong  maxMemType1;
-
-    /* Glyph names follow in the file, but we don't   */
-    /* load them by default.  See the ttpost.c file.  */
-
-  } TT_Postscript;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_PCLT                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType PCLT table.  All fields       */
-  /*    comply to the TrueType specification.                              */
-  /*                                                                       */
-  typedef struct  TT_PCLT_
-  {
-    FT_Fixed   Version;
-    FT_ULong   FontNumber;
-    FT_UShort  Pitch;
-    FT_UShort  xHeight;
-    FT_UShort  Style;
-    FT_UShort  TypeFamily;
-    FT_UShort  CapHeight;
-    FT_UShort  SymbolSet;
-    FT_Char    TypeFace[16];
-    FT_Char    CharacterComplement[8];
-    FT_Char    FileName[6];
-    FT_Char    StrokeWeight;
-    FT_Char    WidthType;
-    FT_Byte    SerifStyle;
-    FT_Byte    Reserved;
-
-  } TT_PCLT;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_MaxProfile                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The maximum profile is a table containing many max values, which   */
-  /*    can be used to pre-allocate arrays.  This ensures that no memory   */
-  /*    allocation occurs during a glyph load.                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version               :: The version number.                       */
-  /*                                                                       */
-  /*    numGlyphs             :: The number of glyphs in this TrueType     */
-  /*                             font.                                     */
-  /*                                                                       */
-  /*    maxPoints             :: The maximum number of points in a         */
-  /*                             non-composite TrueType glyph.  See also   */
-  /*                             the structure element                     */
-  /*                             `maxCompositePoints'.                     */
-  /*                                                                       */
-  /*    maxContours           :: The maximum number of contours in a       */
-  /*                             non-composite TrueType glyph.  See also   */
-  /*                             the structure element                     */
-  /*                             `maxCompositeContours'.                   */
-  /*                                                                       */
-  /*    maxCompositePoints    :: The maximum number of points in a         */
-  /*                             composite TrueType glyph.  See also the   */
-  /*                             structure element `maxPoints'.            */
-  /*                                                                       */
-  /*    maxCompositeContours  :: The maximum number of contours in a       */
-  /*                             composite TrueType glyph.  See also the   */
-  /*                             structure element `maxContours'.          */
-  /*                                                                       */
-  /*    maxZones              :: The maximum number of zones used for      */
-  /*                             glyph hinting.                            */
-  /*                                                                       */
-  /*    maxTwilightPoints     :: The maximum number of points in the       */
-  /*                             twilight zone used for glyph hinting.     */
-  /*                                                                       */
-  /*    maxStorage            :: The maximum number of elements in the     */
-  /*                             storage area used for glyph hinting.      */
-  /*                                                                       */
-  /*    maxFunctionDefs       :: The maximum number of function            */
-  /*                             definitions in the TrueType bytecode for  */
-  /*                             this font.                                */
-  /*                                                                       */
-  /*    maxInstructionDefs    :: The maximum number of instruction         */
-  /*                             definitions in the TrueType bytecode for  */
-  /*                             this font.                                */
-  /*                                                                       */
-  /*    maxStackElements      :: The maximum number of stack elements used */
-  /*                             during bytecode interpretation.           */
-  /*                                                                       */
-  /*    maxSizeOfInstructions :: The maximum number of TrueType opcodes    */
-  /*                             used for glyph hinting.                   */
-  /*                                                                       */
-  /*    maxComponentElements  :: The maximum number of simple (i.e., non-  */
-  /*                             composite) glyphs in a composite glyph.   */
-  /*                                                                       */
-  /*    maxComponentDepth     :: The maximum nesting depth of composite    */
-  /*                             glyphs.                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is only used during font loading.                   */
-  /*                                                                       */
-  typedef struct  TT_MaxProfile_
-  {
-    FT_Fixed   version;
-    FT_UShort  numGlyphs;
-    FT_UShort  maxPoints;
-    FT_UShort  maxContours;
-    FT_UShort  maxCompositePoints;
-    FT_UShort  maxCompositeContours;
-    FT_UShort  maxZones;
-    FT_UShort  maxTwilightPoints;
-    FT_UShort  maxStorage;
-    FT_UShort  maxFunctionDefs;
-    FT_UShort  maxInstructionDefs;
-    FT_UShort  maxStackElements;
-    FT_UShort  maxSizeOfInstructions;
-    FT_UShort  maxComponentElements;
-    FT_UShort  maxComponentDepth;
-
-  } TT_MaxProfile;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Sfnt_Tag                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify the index of an SFNT table.         */
-  /*    Used in the @FT_Get_Sfnt_Table API function.                       */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_SFNT_HEAD :: To access the font's @TT_Header structure.         */
-  /*                                                                       */
-  /*    FT_SFNT_MAXP :: To access the font's @TT_MaxProfile structure.     */
-  /*                                                                       */
-  /*    FT_SFNT_OS2  :: To access the font's @TT_OS2 structure.            */
-  /*                                                                       */
-  /*    FT_SFNT_HHEA :: To access the font's @TT_HoriHeader structure.     */
-  /*                                                                       */
-  /*    FT_SFNT_VHEA :: To access the font's @TT_VertHeader structure.     */
-  /*                                                                       */
-  /*    FT_SFNT_POST :: To access the font's @TT_Postscript structure.     */
-  /*                                                                       */
-  /*    FT_SFNT_PCLT :: To access the font's @TT_PCLT structure.           */
-  /*                                                                       */
-  typedef enum  FT_Sfnt_Tag_
-  {
-    FT_SFNT_HEAD,
-    FT_SFNT_MAXP,
-    FT_SFNT_OS2,
-    FT_SFNT_HHEA,
-    FT_SFNT_VHEA,
-    FT_SFNT_POST,
-    FT_SFNT_PCLT,
-
-    FT_SFNT_MAX
-
-  } FT_Sfnt_Tag;
-
-  /* these constants are deprecated; use the corresponding `FT_Sfnt_Tag' */
-  /* values instead                                                      */
-#define ft_sfnt_head  FT_SFNT_HEAD
-#define ft_sfnt_maxp  FT_SFNT_MAXP
-#define ft_sfnt_os2   FT_SFNT_OS2
-#define ft_sfnt_hhea  FT_SFNT_HHEA
-#define ft_sfnt_vhea  FT_SFNT_VHEA
-#define ft_sfnt_post  FT_SFNT_POST
-#define ft_sfnt_pclt  FT_SFNT_PCLT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Table                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a pointer to a given SFNT table within a face.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source.                                    */
-  /*                                                                       */
-  /*    tag  :: The index of the SFNT table.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A type-less pointer to the table.  This will be~0 in case of       */
-  /*    error, or if the corresponding table was not found *OR* loaded     */
-  /*    from the file.                                                     */
-  /*                                                                       */
-  /*    Use a typecast according to `tag' to access the structure          */
-  /*    elements.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The table is owned by the face object and disappears with it.      */
-  /*                                                                       */
-  /*    This function is only useful to access SFNT tables that are loaded */
-  /*    by the sfnt, truetype, and opentype drivers.  See @FT_Sfnt_Tag for */
-  /*    a list.                                                            */
-  /*                                                                       */
-  /*    Here an example how to access the `vhea' table:                    */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      TT_VertHeader*  vert_header;                                     */
-  /*                                                                       */
-  /*                                                                       */
-  /*      vert_header =                                                    */
-  /*        (TT_VertHeader*)FT_Get_Sfnt_Table( face, FT_SFNT_VHEA );       */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( void* )
-  FT_Get_Sfnt_Table( FT_Face      face,
-                     FT_Sfnt_Tag  tag );
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Load_Sfnt_Table
-  *
-  * @description:
-  *   Load any font table into client memory.
-  *
-  * @input:
-  *   face ::
-  *     A handle to the source face.
-  *
-  *   tag ::
-  *     The four-byte tag of the table to load.  Use the value~0 if you want
-  *     to access the whole font file.  Otherwise, you can use one of the
-  *     definitions found in the @FT_TRUETYPE_TAGS_H file, or forge a new
-  *     one with @FT_MAKE_TAG.
-  *
-  *   offset ::
-  *     The starting offset in the table (or file if tag == 0).
-  *
-  * @output:
-  *   buffer ::
-  *     The target buffer address.  The client must ensure that the memory
-  *     array is big enough to hold the data.
-  *
-  * @inout:
-  *   length ::
-  *     If the `length' parameter is NULL, then try to load the whole table.
-  *     Return an error code if it fails.
-  *
-  *     Else, if `*length' is~0, exit immediately while returning the
-  *     table's (or file) full size in it.
-  *
-  *     Else the number of bytes to read from the table or file, from the
-  *     starting offset.
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   If you need to determine the table's length you should first call this
-  *   function with `*length' set to~0, as in the following example:
-  *
-  *     {
-  *       FT_ULong  length = 0;
-  *
-  *
-  *       error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
-  *       if ( error ) { ... table does not exist ... }
-  *
-  *       buffer = malloc( length );
-  *       if ( buffer == NULL ) { ... not enough memory ... }
-  *
-  *       error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length );
-  *       if ( error ) { ... could not load table ... }
-  *     }
-  *
-  *   Note that structures like @TT_Header or @TT_OS2 can't be used with
-  *   this function; they are limited to @FT_Get_Sfnt_Table.  Reason is that
-  *   those structures depend on the processor architecture, with varying
-  *   size (e.g. 32bit vs. 64bit) or order (big endian vs. little endian).
-  *
-  */
-  FT_EXPORT( FT_Error )
-  FT_Load_Sfnt_Table( FT_Face    face,
-                      FT_ULong   tag,
-                      FT_Long    offset,
-                      FT_Byte*   buffer,
-                      FT_ULong*  length );
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Sfnt_Table_Info
-  *
-  * @description:
-  *   Return information on an SFNT table.
-  *
-  * @input:
-  *   face ::
-  *     A handle to the source face.
-  *
-  *   table_index ::
-  *     The index of an SFNT table.  The function returns
-  *     FT_Err_Table_Missing for an invalid value.
-  *
-  * @inout:
-  *   tag ::
-  *     The name tag of the SFNT table.  If the value is NULL, `table_index'
-  *     is ignored, and `length' returns the number of SFNT tables in the
-  *     font.
-  *
-  * @output:
-  *   length ::
-  *     The length of the SFNT table (or the number of SFNT tables, depending
-  *     on `tag').
-  *
-  * @return:
-  *   FreeType error code.  0~means success.
-  *
-  * @note:
-  *   While parsing fonts, FreeType handles SFNT tables with length zero as
-  *   missing.
-  *
-  */
-  FT_EXPORT( FT_Error )
-  FT_Sfnt_Table_Info( FT_Face    face,
-                      FT_UInt    table_index,
-                      FT_ULong  *tag,
-                      FT_ULong  *length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_CMap_Language_ID                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return TrueType/sfnt specific cmap language ID.  Definitions of    */
-  /*    language ID values are in `ttnameid.h'.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap ::                                                         */
-  /*      The target charmap.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The language ID of `charmap'.  If `charmap' doesn't belong to a    */
-  /*    TrueType/sfnt face, just return~0 as the default value.            */
-  /*                                                                       */
-  /*    For a format~14 cmap (to access Unicode IVS), the return value is  */
-  /*    0xFFFFFFFF.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_CMap_Language_ID( FT_CharMap  charmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_CMap_Format                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return TrueType/sfnt specific cmap format.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap ::                                                         */
-  /*      The target charmap.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The format of `charmap'.  If `charmap' doesn't belong to a         */
-  /*    TrueType/sfnt face, return -1.                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_Get_CMap_Format( FT_CharMap  charmap );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* TTTABLES_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/tttags.h b/dependencies2013/win32/include/freetype/tttags.h
deleted file mode 100644
index f3c9aa5f..00000000
--- a/dependencies2013/win32/include/freetype/tttags.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttags.h                                                               */
-/*                                                                         */
-/*    Tags for TrueType and OpenType tables (specification only).          */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef TTAGS_H_
-#define TTAGS_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-#define TTAG_avar  FT_MAKE_TAG( 'a', 'v', 'a', 'r' )
-#define TTAG_BASE  FT_MAKE_TAG( 'B', 'A', 'S', 'E' )
-#define TTAG_bdat  FT_MAKE_TAG( 'b', 'd', 'a', 't' )
-#define TTAG_BDF   FT_MAKE_TAG( 'B', 'D', 'F', ' ' )
-#define TTAG_bhed  FT_MAKE_TAG( 'b', 'h', 'e', 'd' )
-#define TTAG_bloc  FT_MAKE_TAG( 'b', 'l', 'o', 'c' )
-#define TTAG_bsln  FT_MAKE_TAG( 'b', 's', 'l', 'n' )
-#define TTAG_CBDT  FT_MAKE_TAG( 'C', 'B', 'D', 'T' )
-#define TTAG_CBLC  FT_MAKE_TAG( 'C', 'B', 'L', 'C' )
-#define TTAG_CFF   FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
-#define TTAG_CID   FT_MAKE_TAG( 'C', 'I', 'D', ' ' )
-#define TTAG_cmap  FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
-#define TTAG_cvar  FT_MAKE_TAG( 'c', 'v', 'a', 'r' )
-#define TTAG_cvt   FT_MAKE_TAG( 'c', 'v', 't', ' ' )
-#define TTAG_DSIG  FT_MAKE_TAG( 'D', 'S', 'I', 'G' )
-#define TTAG_EBDT  FT_MAKE_TAG( 'E', 'B', 'D', 'T' )
-#define TTAG_EBLC  FT_MAKE_TAG( 'E', 'B', 'L', 'C' )
-#define TTAG_EBSC  FT_MAKE_TAG( 'E', 'B', 'S', 'C' )
-#define TTAG_feat  FT_MAKE_TAG( 'f', 'e', 'a', 't' )
-#define TTAG_FOND  FT_MAKE_TAG( 'F', 'O', 'N', 'D' )
-#define TTAG_fpgm  FT_MAKE_TAG( 'f', 'p', 'g', 'm' )
-#define TTAG_fvar  FT_MAKE_TAG( 'f', 'v', 'a', 'r' )
-#define TTAG_gasp  FT_MAKE_TAG( 'g', 'a', 's', 'p' )
-#define TTAG_GDEF  FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
-#define TTAG_glyf  FT_MAKE_TAG( 'g', 'l', 'y', 'f' )
-#define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
-#define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
-#define TTAG_gvar  FT_MAKE_TAG( 'g', 'v', 'a', 'r' )
-#define TTAG_hdmx  FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
-#define TTAG_head  FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
-#define TTAG_hhea  FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
-#define TTAG_hmtx  FT_MAKE_TAG( 'h', 'm', 't', 'x' )
-#define TTAG_JSTF  FT_MAKE_TAG( 'J', 'S', 'T', 'F' )
-#define TTAG_just  FT_MAKE_TAG( 'j', 'u', 's', 't' )
-#define TTAG_kern  FT_MAKE_TAG( 'k', 'e', 'r', 'n' )
-#define TTAG_lcar  FT_MAKE_TAG( 'l', 'c', 'a', 'r' )
-#define TTAG_loca  FT_MAKE_TAG( 'l', 'o', 'c', 'a' )
-#define TTAG_LTSH  FT_MAKE_TAG( 'L', 'T', 'S', 'H' )
-#define TTAG_LWFN  FT_MAKE_TAG( 'L', 'W', 'F', 'N' )
-#define TTAG_MATH  FT_MAKE_TAG( 'M', 'A', 'T', 'H' )
-#define TTAG_maxp  FT_MAKE_TAG( 'm', 'a', 'x', 'p' )
-#define TTAG_META  FT_MAKE_TAG( 'M', 'E', 'T', 'A' )
-#define TTAG_MMFX  FT_MAKE_TAG( 'M', 'M', 'F', 'X' )
-#define TTAG_MMSD  FT_MAKE_TAG( 'M', 'M', 'S', 'D' )
-#define TTAG_mort  FT_MAKE_TAG( 'm', 'o', 'r', 't' )
-#define TTAG_morx  FT_MAKE_TAG( 'm', 'o', 'r', 'x' )
-#define TTAG_name  FT_MAKE_TAG( 'n', 'a', 'm', 'e' )
-#define TTAG_opbd  FT_MAKE_TAG( 'o', 'p', 'b', 'd' )
-#define TTAG_OS2   FT_MAKE_TAG( 'O', 'S', '/', '2' )
-#define TTAG_OTTO  FT_MAKE_TAG( 'O', 'T', 'T', 'O' )
-#define TTAG_PCLT  FT_MAKE_TAG( 'P', 'C', 'L', 'T' )
-#define TTAG_POST  FT_MAKE_TAG( 'P', 'O', 'S', 'T' )
-#define TTAG_post  FT_MAKE_TAG( 'p', 'o', 's', 't' )
-#define TTAG_prep  FT_MAKE_TAG( 'p', 'r', 'e', 'p' )
-#define TTAG_prop  FT_MAKE_TAG( 'p', 'r', 'o', 'p' )
-#define TTAG_sbix  FT_MAKE_TAG( 's', 'b', 'i', 'x' )
-#define TTAG_sfnt  FT_MAKE_TAG( 's', 'f', 'n', 't' )
-#define TTAG_SING  FT_MAKE_TAG( 'S', 'I', 'N', 'G' )
-#define TTAG_trak  FT_MAKE_TAG( 't', 'r', 'a', 'k' )
-#define TTAG_true  FT_MAKE_TAG( 't', 'r', 'u', 'e' )
-#define TTAG_ttc   FT_MAKE_TAG( 't', 't', 'c', ' ' )
-#define TTAG_ttcf  FT_MAKE_TAG( 't', 't', 'c', 'f' )
-#define TTAG_TYP1  FT_MAKE_TAG( 'T', 'Y', 'P', '1' )
-#define TTAG_typ1  FT_MAKE_TAG( 't', 'y', 'p', '1' )
-#define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
-#define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
-#define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
-#define TTAG_wOFF  FT_MAKE_TAG( 'w', 'O', 'F', 'F' )
-
-
-FT_END_HEADER
-
-#endif /* TTAGS_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/freetype/ttunpat.h b/dependencies2013/win32/include/freetype/ttunpat.h
deleted file mode 100644
index ca4676ba..00000000
--- a/dependencies2013/win32/include/freetype/ttunpat.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ttunpat.h                                                              */
-/*                                                                         */
-/*    Definitions for the unpatented TrueType hinting system.              */
-/*    Obsolete, retained for backwards compatibility.                      */
-/*                                                                         */
-/*  Copyright 2003-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  Written by Graham Asher <graham.asher@btinternet.com>                  */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef TTUNPAT_H_
-#define TTUNPAT_H_
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
- /***************************************************************************
-  *
-  * @constant:
-  *   FT_PARAM_TAG_UNPATENTED_HINTING
-  *
-  * @description:
-  *   Deprecated.
-  *
-  *   Previously: A constant used as the tag of an @FT_Parameter structure to
-  *   indicate that unpatented methods only should be used by the TrueType
-  *   bytecode interpreter for a typeface opened by @FT_Open_Face.
-  *
-  */
-#define FT_PARAM_TAG_UNPATENTED_HINTING  FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* TTUNPAT_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/ft2build.h b/dependencies2013/win32/include/ft2build.h
deleted file mode 100644
index c89cb469..00000000
--- a/dependencies2013/win32/include/ft2build.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ft2build.h                                                             */
-/*                                                                         */
-/*    FreeType 2 build and setup macros.                                   */
-/*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This is the `entry point' for FreeType header file inclusions.  It is */
-  /* the only header file which should be included directly; all other     */
-  /* FreeType header files should be accessed with macro names (after      */
-  /* including `ft2build.h').                                              */
-  /*                                                                       */
-  /* A typical example is                                                  */
-  /*                                                                       */
-  /*   #include <ft2build.h>                                               */
-  /*   #include FT_FREETYPE_H                                              */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef FT2BUILD_H_
-#define FT2BUILD_H_
-
-#include <freetype/config/ftheader.h>
-
-#endif /* FT2BUILD_H_ */
-
-
-/* END */
diff --git a/dependencies2013/win32/include/libavcodec/avcodec.h b/dependencies2013/win32/include/libavcodec/avcodec.h
deleted file mode 100644
index 18c3e3ea..00000000
--- a/dependencies2013/win32/include/libavcodec/avcodec.h
+++ /dev/null
@@ -1,6425 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec external API header
- */
-
-#include <errno.h>
-#include "libavutil/samplefmt.h"
-#include "libavutil/attributes.h"
-#include "libavutil/avutil.h"
-#include "libavutil/buffer.h"
-#include "libavutil/cpu.h"
-#include "libavutil/channel_layout.h"
-#include "libavutil/dict.h"
-#include "libavutil/frame.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "version.h"
-
-/**
- * @defgroup libavc libavcodec
- * Encoding/Decoding Library
- *
- * @{
- *
- * @defgroup lavc_decoding Decoding
- * @{
- * @}
- *
- * @defgroup lavc_encoding Encoding
- * @{
- * @}
- *
- * @defgroup lavc_codec Codecs
- * @{
- * @defgroup lavc_codec_native Native Codecs
- * @{
- * @}
- * @defgroup lavc_codec_wrappers External library wrappers
- * @{
- * @}
- * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
- * @{
- * @}
- * @}
- * @defgroup lavc_internal Internal
- * @{
- * @}
- * @}
- */
-
-/**
- * @ingroup libavc
- * @defgroup lavc_encdec send/receive encoding and decoding API overview
- * @{
- *
- * The avcodec_send_packet()/avcodec_receive_frame()/avcodec_send_frame()/
- * avcodec_receive_packet() functions provide an encode/decode API, which
- * decouples input and output.
- *
- * The API is very similar for encoding/decoding and audio/video, and works as
- * follows:
- * - Set up and open the AVCodecContext as usual.
- * - Send valid input:
- *   - For decoding, call avcodec_send_packet() to give the decoder raw
- *     compressed data in an AVPacket.
- *   - For encoding, call avcodec_send_frame() to give the encoder an AVFrame
- *     containing uncompressed audio or video.
- *   In both cases, it is recommended that AVPackets and AVFrames are
- *   refcounted, or libavcodec might have to copy the input data. (libavformat
- *   always returns refcounted AVPackets, and av_frame_get_buffer() allocates
- *   refcounted AVFrames.)
- * - Receive output in a loop. Periodically call one of the avcodec_receive_*()
- *   functions and process their output:
- *   - For decoding, call avcodec_receive_frame(). On success, it will return
- *     an AVFrame containing uncompressed audio or video data.
- *   - For encoding, call avcodec_receive_packet(). On success, it will return
- *     an AVPacket with a compressed frame.
- *   Repeat this call until it returns AVERROR(EAGAIN) or an error. The
- *   AVERROR(EAGAIN) return value means that new input data is required to
- *   return new output. In this case, continue with sending input. For each
- *   input frame/packet, the codec will typically return 1 output frame/packet,
- *   but it can also be 0 or more than 1.
- *
- * At the beginning of decoding or encoding, the codec might accept multiple
- * input frames/packets without returning a frame, until its internal buffers
- * are filled. This situation is handled transparently if you follow the steps
- * outlined above.
- *
- * In theory, sending input can result in EAGAIN - this should happen only if
- * not all output was received. You can use this to structure alternative decode
- * or encode loops other than the one suggested above. For example, you could
- * try sending new input on each iteration, and try to receive output if that
- * returns EAGAIN.
- *
- * End of stream situations. These require "flushing" (aka draining) the codec,
- * as the codec might buffer multiple frames or packets internally for
- * performance or out of necessity (consider B-frames).
- * This is handled as follows:
- * - Instead of valid input, send NULL to the avcodec_send_packet() (decoding)
- *   or avcodec_send_frame() (encoding) functions. This will enter draining
- *   mode.
- * - Call avcodec_receive_frame() (decoding) or avcodec_receive_packet()
- *   (encoding) in a loop until AVERROR_EOF is returned. The functions will
- *   not return AVERROR(EAGAIN), unless you forgot to enter draining mode.
- * - Before decoding can be resumed again, the codec has to be reset with
- *   avcodec_flush_buffers().
- *
- * Using the API as outlined above is highly recommended. But it is also
- * possible to call functions outside of this rigid schema. For example, you can
- * call avcodec_send_packet() repeatedly without calling
- * avcodec_receive_frame(). In this case, avcodec_send_packet() will succeed
- * until the codec's internal buffer has been filled up (which is typically of
- * size 1 per output frame, after initial input), and then reject input with
- * AVERROR(EAGAIN). Once it starts rejecting input, you have no choice but to
- * read at least some output.
- *
- * Not all codecs will follow a rigid and predictable dataflow; the only
- * guarantee is that an AVERROR(EAGAIN) return value on a send/receive call on
- * one end implies that a receive/send call on the other end will succeed, or
- * at least will not fail with AVERROR(EAGAIN). In general, no codec will
- * permit unlimited buffering of input or output.
- *
- * This API replaces the following legacy functions:
- * - avcodec_decode_video2() and avcodec_decode_audio4():
- *   Use avcodec_send_packet() to feed input to the decoder, then use
- *   avcodec_receive_frame() to receive decoded frames after each packet.
- *   Unlike with the old video decoding API, multiple frames might result from
- *   a packet. For audio, splitting the input packet into frames by partially
- *   decoding packets becomes transparent to the API user. You never need to
- *   feed an AVPacket to the API twice (unless it is rejected with AVERROR(EAGAIN) - then
- *   no data was read from the packet).
- *   Additionally, sending a flush/draining packet is required only once.
- * - avcodec_encode_video2()/avcodec_encode_audio2():
- *   Use avcodec_send_frame() to feed input to the encoder, then use
- *   avcodec_receive_packet() to receive encoded packets.
- *   Providing user-allocated buffers for avcodec_receive_packet() is not
- *   possible.
- * - The new API does not handle subtitles yet.
- *
- * Mixing new and old function calls on the same AVCodecContext is not allowed,
- * and will result in undefined behavior.
- *
- * Some codecs might require using the new API; using the old API will return
- * an error when calling it. All codecs support the new API.
- *
- * A codec is not allowed to return AVERROR(EAGAIN) for both sending and receiving. This
- * would be an invalid state, which could put the codec user into an endless
- * loop. The API has no concept of time either: it cannot happen that trying to
- * do avcodec_send_packet() results in AVERROR(EAGAIN), but a repeated call 1 second
- * later accepts the packet (with no other receive/flush API calls involved).
- * The API is a strict state machine, and the passage of time is not supposed
- * to influence it. Some timing-dependent behavior might still be deemed
- * acceptable in certain cases. But it must never result in both send/receive
- * returning EAGAIN at the same time at any point. It must also absolutely be
- * avoided that the current state is "unstable" and can "flip-flop" between
- * the send/receive APIs allowing progress. For example, it's not allowed that
- * the codec randomly decides that it actually wants to consume a packet now
- * instead of returning a frame, after it just returned AVERROR(EAGAIN) on an
- * avcodec_send_packet() call.
- * @}
- */
-
-/**
- * @defgroup lavc_core Core functions/structures.
- * @ingroup libavc
- *
- * Basic definitions, functions for querying libavcodec capabilities,
- * allocating core structures, etc.
- * @{
- */
-
-
-/**
- * Identify the syntax and semantics of the bitstream.
- * The principle is roughly:
- * Two decoders with the same ID can decode the same streams.
- * Two encoders with the same ID can encode compatible streams.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of an existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs
- *
- * After adding new codec IDs, do not forget to add an entry to the codec
- * descriptor list and bump libavcodec minor version.
- */
-enum AVCodecID {
-    AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    AV_CODEC_ID_MPEG1VIDEO,
-    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
-    AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
-    AV_CODEC_ID_H261,
-    AV_CODEC_ID_H263,
-    AV_CODEC_ID_RV10,
-    AV_CODEC_ID_RV20,
-    AV_CODEC_ID_MJPEG,
-    AV_CODEC_ID_MJPEGB,
-    AV_CODEC_ID_LJPEG,
-    AV_CODEC_ID_SP5X,
-    AV_CODEC_ID_JPEGLS,
-    AV_CODEC_ID_MPEG4,
-    AV_CODEC_ID_RAWVIDEO,
-    AV_CODEC_ID_MSMPEG4V1,
-    AV_CODEC_ID_MSMPEG4V2,
-    AV_CODEC_ID_MSMPEG4V3,
-    AV_CODEC_ID_WMV1,
-    AV_CODEC_ID_WMV2,
-    AV_CODEC_ID_H263P,
-    AV_CODEC_ID_H263I,
-    AV_CODEC_ID_FLV1,
-    AV_CODEC_ID_SVQ1,
-    AV_CODEC_ID_SVQ3,
-    AV_CODEC_ID_DVVIDEO,
-    AV_CODEC_ID_HUFFYUV,
-    AV_CODEC_ID_CYUV,
-    AV_CODEC_ID_H264,
-    AV_CODEC_ID_INDEO3,
-    AV_CODEC_ID_VP3,
-    AV_CODEC_ID_THEORA,
-    AV_CODEC_ID_ASV1,
-    AV_CODEC_ID_ASV2,
-    AV_CODEC_ID_FFV1,
-    AV_CODEC_ID_4XM,
-    AV_CODEC_ID_VCR1,
-    AV_CODEC_ID_CLJR,
-    AV_CODEC_ID_MDEC,
-    AV_CODEC_ID_ROQ,
-    AV_CODEC_ID_INTERPLAY_VIDEO,
-    AV_CODEC_ID_XAN_WC3,
-    AV_CODEC_ID_XAN_WC4,
-    AV_CODEC_ID_RPZA,
-    AV_CODEC_ID_CINEPAK,
-    AV_CODEC_ID_WS_VQA,
-    AV_CODEC_ID_MSRLE,
-    AV_CODEC_ID_MSVIDEO1,
-    AV_CODEC_ID_IDCIN,
-    AV_CODEC_ID_8BPS,
-    AV_CODEC_ID_SMC,
-    AV_CODEC_ID_FLIC,
-    AV_CODEC_ID_TRUEMOTION1,
-    AV_CODEC_ID_VMDVIDEO,
-    AV_CODEC_ID_MSZH,
-    AV_CODEC_ID_ZLIB,
-    AV_CODEC_ID_QTRLE,
-    AV_CODEC_ID_TSCC,
-    AV_CODEC_ID_ULTI,
-    AV_CODEC_ID_QDRAW,
-    AV_CODEC_ID_VIXL,
-    AV_CODEC_ID_QPEG,
-    AV_CODEC_ID_PNG,
-    AV_CODEC_ID_PPM,
-    AV_CODEC_ID_PBM,
-    AV_CODEC_ID_PGM,
-    AV_CODEC_ID_PGMYUV,
-    AV_CODEC_ID_PAM,
-    AV_CODEC_ID_FFVHUFF,
-    AV_CODEC_ID_RV30,
-    AV_CODEC_ID_RV40,
-    AV_CODEC_ID_VC1,
-    AV_CODEC_ID_WMV3,
-    AV_CODEC_ID_LOCO,
-    AV_CODEC_ID_WNV1,
-    AV_CODEC_ID_AASC,
-    AV_CODEC_ID_INDEO2,
-    AV_CODEC_ID_FRAPS,
-    AV_CODEC_ID_TRUEMOTION2,
-    AV_CODEC_ID_BMP,
-    AV_CODEC_ID_CSCD,
-    AV_CODEC_ID_MMVIDEO,
-    AV_CODEC_ID_ZMBV,
-    AV_CODEC_ID_AVS,
-    AV_CODEC_ID_SMACKVIDEO,
-    AV_CODEC_ID_NUV,
-    AV_CODEC_ID_KMVC,
-    AV_CODEC_ID_FLASHSV,
-    AV_CODEC_ID_CAVS,
-    AV_CODEC_ID_JPEG2000,
-    AV_CODEC_ID_VMNC,
-    AV_CODEC_ID_VP5,
-    AV_CODEC_ID_VP6,
-    AV_CODEC_ID_VP6F,
-    AV_CODEC_ID_TARGA,
-    AV_CODEC_ID_DSICINVIDEO,
-    AV_CODEC_ID_TIERTEXSEQVIDEO,
-    AV_CODEC_ID_TIFF,
-    AV_CODEC_ID_GIF,
-    AV_CODEC_ID_DXA,
-    AV_CODEC_ID_DNXHD,
-    AV_CODEC_ID_THP,
-    AV_CODEC_ID_SGI,
-    AV_CODEC_ID_C93,
-    AV_CODEC_ID_BETHSOFTVID,
-    AV_CODEC_ID_PTX,
-    AV_CODEC_ID_TXD,
-    AV_CODEC_ID_VP6A,
-    AV_CODEC_ID_AMV,
-    AV_CODEC_ID_VB,
-    AV_CODEC_ID_PCX,
-    AV_CODEC_ID_SUNRAST,
-    AV_CODEC_ID_INDEO4,
-    AV_CODEC_ID_INDEO5,
-    AV_CODEC_ID_MIMIC,
-    AV_CODEC_ID_RL2,
-    AV_CODEC_ID_ESCAPE124,
-    AV_CODEC_ID_DIRAC,
-    AV_CODEC_ID_BFI,
-    AV_CODEC_ID_CMV,
-    AV_CODEC_ID_MOTIONPIXELS,
-    AV_CODEC_ID_TGV,
-    AV_CODEC_ID_TGQ,
-    AV_CODEC_ID_TQI,
-    AV_CODEC_ID_AURA,
-    AV_CODEC_ID_AURA2,
-    AV_CODEC_ID_V210X,
-    AV_CODEC_ID_TMV,
-    AV_CODEC_ID_V210,
-    AV_CODEC_ID_DPX,
-    AV_CODEC_ID_MAD,
-    AV_CODEC_ID_FRWU,
-    AV_CODEC_ID_FLASHSV2,
-    AV_CODEC_ID_CDGRAPHICS,
-    AV_CODEC_ID_R210,
-    AV_CODEC_ID_ANM,
-    AV_CODEC_ID_BINKVIDEO,
-    AV_CODEC_ID_IFF_ILBM,
-#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
-    AV_CODEC_ID_KGV1,
-    AV_CODEC_ID_YOP,
-    AV_CODEC_ID_VP8,
-    AV_CODEC_ID_PICTOR,
-    AV_CODEC_ID_ANSI,
-    AV_CODEC_ID_A64_MULTI,
-    AV_CODEC_ID_A64_MULTI5,
-    AV_CODEC_ID_R10K,
-    AV_CODEC_ID_MXPEG,
-    AV_CODEC_ID_LAGARITH,
-    AV_CODEC_ID_PRORES,
-    AV_CODEC_ID_JV,
-    AV_CODEC_ID_DFA,
-    AV_CODEC_ID_WMV3IMAGE,
-    AV_CODEC_ID_VC1IMAGE,
-    AV_CODEC_ID_UTVIDEO,
-    AV_CODEC_ID_BMV_VIDEO,
-    AV_CODEC_ID_VBLE,
-    AV_CODEC_ID_DXTORY,
-    AV_CODEC_ID_V410,
-    AV_CODEC_ID_XWD,
-    AV_CODEC_ID_CDXL,
-    AV_CODEC_ID_XBM,
-    AV_CODEC_ID_ZEROCODEC,
-    AV_CODEC_ID_MSS1,
-    AV_CODEC_ID_MSA1,
-    AV_CODEC_ID_TSCC2,
-    AV_CODEC_ID_MTS2,
-    AV_CODEC_ID_CLLC,
-    AV_CODEC_ID_MSS2,
-    AV_CODEC_ID_VP9,
-    AV_CODEC_ID_AIC,
-    AV_CODEC_ID_ESCAPE130,
-    AV_CODEC_ID_G2M,
-    AV_CODEC_ID_WEBP,
-    AV_CODEC_ID_HNM4_VIDEO,
-    AV_CODEC_ID_HEVC,
-#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
-    AV_CODEC_ID_FIC,
-    AV_CODEC_ID_ALIAS_PIX,
-    AV_CODEC_ID_BRENDER_PIX,
-    AV_CODEC_ID_PAF_VIDEO,
-    AV_CODEC_ID_EXR,
-    AV_CODEC_ID_VP7,
-    AV_CODEC_ID_SANM,
-    AV_CODEC_ID_SGIRLE,
-    AV_CODEC_ID_MVC1,
-    AV_CODEC_ID_MVC2,
-    AV_CODEC_ID_HQX,
-    AV_CODEC_ID_TDSC,
-    AV_CODEC_ID_HQ_HQA,
-    AV_CODEC_ID_HAP,
-    AV_CODEC_ID_DDS,
-    AV_CODEC_ID_DXV,
-    AV_CODEC_ID_SCREENPRESSO,
-    AV_CODEC_ID_RSCC,
-
-    AV_CODEC_ID_Y41P = 0x8000,
-    AV_CODEC_ID_AVRP,
-    AV_CODEC_ID_012V,
-    AV_CODEC_ID_AVUI,
-    AV_CODEC_ID_AYUV,
-    AV_CODEC_ID_TARGA_Y216,
-    AV_CODEC_ID_V308,
-    AV_CODEC_ID_V408,
-    AV_CODEC_ID_YUV4,
-    AV_CODEC_ID_AVRN,
-    AV_CODEC_ID_CPIA,
-    AV_CODEC_ID_XFACE,
-    AV_CODEC_ID_SNOW,
-    AV_CODEC_ID_SMVJPEG,
-    AV_CODEC_ID_APNG,
-    AV_CODEC_ID_DAALA,
-    AV_CODEC_ID_CFHD,
-    AV_CODEC_ID_TRUEMOTION2RT,
-    AV_CODEC_ID_M101,
-    AV_CODEC_ID_MAGICYUV,
-    AV_CODEC_ID_SHEERVIDEO,
-    AV_CODEC_ID_YLC,
-    AV_CODEC_ID_PSD,
-    AV_CODEC_ID_PIXLET,
-    AV_CODEC_ID_SPEEDHQ,
-    AV_CODEC_ID_FMVC,
-    AV_CODEC_ID_SCPR,
-    AV_CODEC_ID_CLEARVIDEO,
-    AV_CODEC_ID_XPM,
-    AV_CODEC_ID_AV1,
-    AV_CODEC_ID_BITPACKED,
-    AV_CODEC_ID_MSCC,
-    AV_CODEC_ID_SRGC,
-    AV_CODEC_ID_SVG,
-    AV_CODEC_ID_GDV,
-    AV_CODEC_ID_FITS,
-
-    /* various PCM "codecs" */
-    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    AV_CODEC_ID_PCM_S16LE = 0x10000,
-    AV_CODEC_ID_PCM_S16BE,
-    AV_CODEC_ID_PCM_U16LE,
-    AV_CODEC_ID_PCM_U16BE,
-    AV_CODEC_ID_PCM_S8,
-    AV_CODEC_ID_PCM_U8,
-    AV_CODEC_ID_PCM_MULAW,
-    AV_CODEC_ID_PCM_ALAW,
-    AV_CODEC_ID_PCM_S32LE,
-    AV_CODEC_ID_PCM_S32BE,
-    AV_CODEC_ID_PCM_U32LE,
-    AV_CODEC_ID_PCM_U32BE,
-    AV_CODEC_ID_PCM_S24LE,
-    AV_CODEC_ID_PCM_S24BE,
-    AV_CODEC_ID_PCM_U24LE,
-    AV_CODEC_ID_PCM_U24BE,
-    AV_CODEC_ID_PCM_S24DAUD,
-    AV_CODEC_ID_PCM_ZORK,
-    AV_CODEC_ID_PCM_S16LE_PLANAR,
-    AV_CODEC_ID_PCM_DVD,
-    AV_CODEC_ID_PCM_F32BE,
-    AV_CODEC_ID_PCM_F32LE,
-    AV_CODEC_ID_PCM_F64BE,
-    AV_CODEC_ID_PCM_F64LE,
-    AV_CODEC_ID_PCM_BLURAY,
-    AV_CODEC_ID_PCM_LXF,
-    AV_CODEC_ID_S302M,
-    AV_CODEC_ID_PCM_S8_PLANAR,
-    AV_CODEC_ID_PCM_S24LE_PLANAR,
-    AV_CODEC_ID_PCM_S32LE_PLANAR,
-    AV_CODEC_ID_PCM_S16BE_PLANAR,
-
-    AV_CODEC_ID_PCM_S64LE = 0x10800,
-    AV_CODEC_ID_PCM_S64BE,
-    AV_CODEC_ID_PCM_F16LE,
-    AV_CODEC_ID_PCM_F24LE,
-
-    /* various ADPCM codecs */
-    AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    AV_CODEC_ID_ADPCM_IMA_WAV,
-    AV_CODEC_ID_ADPCM_IMA_DK3,
-    AV_CODEC_ID_ADPCM_IMA_DK4,
-    AV_CODEC_ID_ADPCM_IMA_WS,
-    AV_CODEC_ID_ADPCM_IMA_SMJPEG,
-    AV_CODEC_ID_ADPCM_MS,
-    AV_CODEC_ID_ADPCM_4XM,
-    AV_CODEC_ID_ADPCM_XA,
-    AV_CODEC_ID_ADPCM_ADX,
-    AV_CODEC_ID_ADPCM_EA,
-    AV_CODEC_ID_ADPCM_G726,
-    AV_CODEC_ID_ADPCM_CT,
-    AV_CODEC_ID_ADPCM_SWF,
-    AV_CODEC_ID_ADPCM_YAMAHA,
-    AV_CODEC_ID_ADPCM_SBPRO_4,
-    AV_CODEC_ID_ADPCM_SBPRO_3,
-    AV_CODEC_ID_ADPCM_SBPRO_2,
-    AV_CODEC_ID_ADPCM_THP,
-    AV_CODEC_ID_ADPCM_IMA_AMV,
-    AV_CODEC_ID_ADPCM_EA_R1,
-    AV_CODEC_ID_ADPCM_EA_R3,
-    AV_CODEC_ID_ADPCM_EA_R2,
-    AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
-    AV_CODEC_ID_ADPCM_IMA_EA_EACS,
-    AV_CODEC_ID_ADPCM_EA_XAS,
-    AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
-    AV_CODEC_ID_ADPCM_IMA_ISS,
-    AV_CODEC_ID_ADPCM_G722,
-    AV_CODEC_ID_ADPCM_IMA_APC,
-    AV_CODEC_ID_ADPCM_VIMA,
-#if FF_API_VIMA_DECODER
-    AV_CODEC_ID_VIMA = AV_CODEC_ID_ADPCM_VIMA,
-#endif
-
-    AV_CODEC_ID_ADPCM_AFC = 0x11800,
-    AV_CODEC_ID_ADPCM_IMA_OKI,
-    AV_CODEC_ID_ADPCM_DTK,
-    AV_CODEC_ID_ADPCM_IMA_RAD,
-    AV_CODEC_ID_ADPCM_G726LE,
-    AV_CODEC_ID_ADPCM_THP_LE,
-    AV_CODEC_ID_ADPCM_PSX,
-    AV_CODEC_ID_ADPCM_AICA,
-    AV_CODEC_ID_ADPCM_IMA_DAT4,
-    AV_CODEC_ID_ADPCM_MTAF,
-
-    /* AMR */
-    AV_CODEC_ID_AMR_NB = 0x12000,
-    AV_CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    AV_CODEC_ID_RA_144 = 0x13000,
-    AV_CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    AV_CODEC_ID_ROQ_DPCM = 0x14000,
-    AV_CODEC_ID_INTERPLAY_DPCM,
-    AV_CODEC_ID_XAN_DPCM,
-    AV_CODEC_ID_SOL_DPCM,
-
-    AV_CODEC_ID_SDX2_DPCM = 0x14800,
-    AV_CODEC_ID_GREMLIN_DPCM,
-
-    /* audio codecs */
-    AV_CODEC_ID_MP2 = 0x15000,
-    AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    AV_CODEC_ID_AAC,
-    AV_CODEC_ID_AC3,
-    AV_CODEC_ID_DTS,
-    AV_CODEC_ID_VORBIS,
-    AV_CODEC_ID_DVAUDIO,
-    AV_CODEC_ID_WMAV1,
-    AV_CODEC_ID_WMAV2,
-    AV_CODEC_ID_MACE3,
-    AV_CODEC_ID_MACE6,
-    AV_CODEC_ID_VMDAUDIO,
-    AV_CODEC_ID_FLAC,
-    AV_CODEC_ID_MP3ADU,
-    AV_CODEC_ID_MP3ON4,
-    AV_CODEC_ID_SHORTEN,
-    AV_CODEC_ID_ALAC,
-    AV_CODEC_ID_WESTWOOD_SND1,
-    AV_CODEC_ID_GSM, ///< as in Berlin toast format
-    AV_CODEC_ID_QDM2,
-    AV_CODEC_ID_COOK,
-    AV_CODEC_ID_TRUESPEECH,
-    AV_CODEC_ID_TTA,
-    AV_CODEC_ID_SMACKAUDIO,
-    AV_CODEC_ID_QCELP,
-    AV_CODEC_ID_WAVPACK,
-    AV_CODEC_ID_DSICINAUDIO,
-    AV_CODEC_ID_IMC,
-    AV_CODEC_ID_MUSEPACK7,
-    AV_CODEC_ID_MLP,
-    AV_CODEC_ID_GSM_MS, /* as found in WAV */
-    AV_CODEC_ID_ATRAC3,
-#if FF_API_VOXWARE
-    AV_CODEC_ID_VOXWARE,
-#endif
-    AV_CODEC_ID_APE,
-    AV_CODEC_ID_NELLYMOSER,
-    AV_CODEC_ID_MUSEPACK8,
-    AV_CODEC_ID_SPEEX,
-    AV_CODEC_ID_WMAVOICE,
-    AV_CODEC_ID_WMAPRO,
-    AV_CODEC_ID_WMALOSSLESS,
-    AV_CODEC_ID_ATRAC3P,
-    AV_CODEC_ID_EAC3,
-    AV_CODEC_ID_SIPR,
-    AV_CODEC_ID_MP1,
-    AV_CODEC_ID_TWINVQ,
-    AV_CODEC_ID_TRUEHD,
-    AV_CODEC_ID_MP4ALS,
-    AV_CODEC_ID_ATRAC1,
-    AV_CODEC_ID_BINKAUDIO_RDFT,
-    AV_CODEC_ID_BINKAUDIO_DCT,
-    AV_CODEC_ID_AAC_LATM,
-    AV_CODEC_ID_QDMC,
-    AV_CODEC_ID_CELT,
-    AV_CODEC_ID_G723_1,
-    AV_CODEC_ID_G729,
-    AV_CODEC_ID_8SVX_EXP,
-    AV_CODEC_ID_8SVX_FIB,
-    AV_CODEC_ID_BMV_AUDIO,
-    AV_CODEC_ID_RALF,
-    AV_CODEC_ID_IAC,
-    AV_CODEC_ID_ILBC,
-    AV_CODEC_ID_OPUS,
-    AV_CODEC_ID_COMFORT_NOISE,
-    AV_CODEC_ID_TAK,
-    AV_CODEC_ID_METASOUND,
-    AV_CODEC_ID_PAF_AUDIO,
-    AV_CODEC_ID_ON2AVC,
-    AV_CODEC_ID_DSS_SP,
-
-    AV_CODEC_ID_FFWAVESYNTH = 0x15800,
-    AV_CODEC_ID_SONIC,
-    AV_CODEC_ID_SONIC_LS,
-    AV_CODEC_ID_EVRC,
-    AV_CODEC_ID_SMV,
-    AV_CODEC_ID_DSD_LSBF,
-    AV_CODEC_ID_DSD_MSBF,
-    AV_CODEC_ID_DSD_LSBF_PLANAR,
-    AV_CODEC_ID_DSD_MSBF_PLANAR,
-    AV_CODEC_ID_4GV,
-    AV_CODEC_ID_INTERPLAY_ACM,
-    AV_CODEC_ID_XMA1,
-    AV_CODEC_ID_XMA2,
-    AV_CODEC_ID_DST,
-    AV_CODEC_ID_ATRAC3AL,
-    AV_CODEC_ID_ATRAC3PAL,
-    AV_CODEC_ID_DOLBY_E,
-
-    /* subtitle codecs */
-    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
-    AV_CODEC_ID_DVB_SUBTITLE,
-    AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
-    AV_CODEC_ID_XSUB,
-    AV_CODEC_ID_SSA,
-    AV_CODEC_ID_MOV_TEXT,
-    AV_CODEC_ID_HDMV_PGS_SUBTITLE,
-    AV_CODEC_ID_DVB_TELETEXT,
-    AV_CODEC_ID_SRT,
-
-    AV_CODEC_ID_MICRODVD   = 0x17800,
-    AV_CODEC_ID_EIA_608,
-    AV_CODEC_ID_JACOSUB,
-    AV_CODEC_ID_SAMI,
-    AV_CODEC_ID_REALTEXT,
-    AV_CODEC_ID_STL,
-    AV_CODEC_ID_SUBVIEWER1,
-    AV_CODEC_ID_SUBVIEWER,
-    AV_CODEC_ID_SUBRIP,
-    AV_CODEC_ID_WEBVTT,
-    AV_CODEC_ID_MPL2,
-    AV_CODEC_ID_VPLAYER,
-    AV_CODEC_ID_PJS,
-    AV_CODEC_ID_ASS,
-    AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    AV_CODEC_ID_TTF = 0x18000,
-
-    AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream.
-    AV_CODEC_ID_BINTEXT    = 0x18800,
-    AV_CODEC_ID_XBIN,
-    AV_CODEC_ID_IDF,
-    AV_CODEC_ID_OTF,
-    AV_CODEC_ID_SMPTE_KLV,
-    AV_CODEC_ID_DVD_NAV,
-    AV_CODEC_ID_TIMED_ID3,
-    AV_CODEC_ID_BIN_DATA,
-
-
-    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
-
-    AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    AV_CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-    AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
-};
-
-/**
- * This struct describes the properties of a single codec described by an
- * AVCodecID.
- * @see avcodec_descriptor_get()
- */
-typedef struct AVCodecDescriptor {
-    enum AVCodecID     id;
-    enum AVMediaType type;
-    /**
-     * Name of the codec described by this descriptor. It is non-empty and
-     * unique for each codec descriptor. It should contain alphanumeric
-     * characters and '_' only.
-     */
-    const char      *name;
-    /**
-     * A more descriptive name for this codec. May be NULL.
-     */
-    const char *long_name;
-    /**
-     * Codec properties, a combination of AV_CODEC_PROP_* flags.
-     */
-    int             props;
-    /**
-     * MIME type(s) associated with the codec.
-     * May be NULL; if not, a NULL-terminated array of MIME types.
-     * The first item is always non-NULL and is the preferred MIME type.
-     */
-    const char *const *mime_types;
-    /**
-     * If non-NULL, an array of profiles recognized for this codec.
-     * Terminated with FF_PROFILE_UNKNOWN.
-     */
-    const struct AVProfile *profiles;
-} AVCodecDescriptor;
-
-/**
- * Codec uses only intra compression.
- * Video and audio codecs only.
- */
-#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
-/**
- * Codec supports lossy compression. Audio and video codecs only.
- * @note a codec may support both lossy and lossless
- * compression modes
- */
-#define AV_CODEC_PROP_LOSSY         (1 << 1)
-/**
- * Codec supports lossless compression. Audio and video codecs only.
- */
-#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
-/**
- * Codec supports frame reordering. That is, the coded order (the order in which
- * the encoded packets are output by the encoders / stored / input to the
- * decoders) may be different from the presentation order of the corresponding
- * frames.
- *
- * For codecs that do not have this property set, PTS and DTS should always be
- * equal.
- */
-#define AV_CODEC_PROP_REORDER       (1 << 3)
-/**
- * Subtitle codec is bitmap based
- * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
- */
-#define AV_CODEC_PROP_BITMAP_SUB    (1 << 16)
-/**
- * Subtitle codec is text based.
- * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
- */
-#define AV_CODEC_PROP_TEXT_SUB      (1 << 17)
-
-/**
- * @ingroup lavc_decoding
- * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
- * This is mainly needed because some optimized bitstream readers read
- * 32 or 64 bit at once and could read over the end.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define AV_INPUT_BUFFER_PADDING_SIZE 32
-
-/**
- * @ingroup lavc_encoding
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define AV_INPUT_BUFFER_MIN_SIZE 16384
-
-#if FF_API_WITHOUT_PREFIX
-/**
- * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 32
-
-/**
- * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead
- */
-#define FF_MIN_BUFFER_SIZE 16384
-#endif /* FF_API_WITHOUT_PREFIX */
-
-/**
- * @ingroup lavc_encoding
- * motion estimation type.
- * @deprecated use codec private option instead
- */
-#if FF_API_MOTION_EST
-enum Motion_Est_ID {
-    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
-    ME_FULL,
-    ME_LOG,
-    ME_PHODS,
-    ME_EPZS,        ///< enhanced predictive zonal search
-    ME_X1,          ///< reserved for experiments
-    ME_HEX,         ///< hexagon based search
-    ME_UMH,         ///< uneven multi-hexagon search
-    ME_TESA,        ///< transformed exhaustive search algorithm
-    ME_ITER=50,     ///< iterative search
-};
-#endif
-
-/**
- * @ingroup lavc_decoding
- */
-enum AVDiscard{
-    /* We leave some space between them for extensions (drop some
-     * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE    =-16, ///< discard nothing
-    AVDISCARD_DEFAULT =  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF  =  8, ///< discard all non reference
-    AVDISCARD_BIDIR   = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONINTRA= 24, ///< discard all non intra frames
-    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL     = 48, ///< discard all
-};
-
-enum AVAudioServiceType {
-    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
-    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
-    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
-    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
-    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
-    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
-    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
-    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
-    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
-};
-
-/**
- * @ingroup lavc_encoding
- */
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
-#define FF_MAX_B_FRAMES 16
-#endif
-
-/* encoding support
-   These flags can be passed in AVCodecContext.flags before initialization.
-   Note: Not everything is supported yet.
-*/
-
-/**
- * Allow decoders to produce frames with data planes that are not aligned
- * to CPU requirements (e.g. due to cropping).
- */
-#define AV_CODEC_FLAG_UNALIGNED       (1 <<  0)
-/**
- * Use fixed qscale.
- */
-#define AV_CODEC_FLAG_QSCALE          (1 <<  1)
-/**
- * 4 MV per MB allowed / advanced prediction for H.263.
- */
-#define AV_CODEC_FLAG_4MV             (1 <<  2)
-/**
- * Output even those frames that might be corrupted.
- */
-#define AV_CODEC_FLAG_OUTPUT_CORRUPT  (1 <<  3)
-/**
- * Use qpel MC.
- */
-#define AV_CODEC_FLAG_QPEL            (1 <<  4)
-/**
- * Use internal 2pass ratecontrol in first pass mode.
- */
-#define AV_CODEC_FLAG_PASS1           (1 <<  9)
-/**
- * Use internal 2pass ratecontrol in second pass mode.
- */
-#define AV_CODEC_FLAG_PASS2           (1 << 10)
-/**
- * loop filter.
- */
-#define AV_CODEC_FLAG_LOOP_FILTER     (1 << 11)
-/**
- * Only decode/encode grayscale.
- */
-#define AV_CODEC_FLAG_GRAY            (1 << 13)
-/**
- * error[?] variables will be set during encoding.
- */
-#define AV_CODEC_FLAG_PSNR            (1 << 15)
-/**
- * Input bitstream might be truncated at a random location
- * instead of only at frame boundaries.
- */
-#define AV_CODEC_FLAG_TRUNCATED       (1 << 16)
-/**
- * Use interlaced DCT.
- */
-#define AV_CODEC_FLAG_INTERLACED_DCT  (1 << 18)
-/**
- * Force low delay.
- */
-#define AV_CODEC_FLAG_LOW_DELAY       (1 << 19)
-/**
- * Place global headers in extradata instead of every keyframe.
- */
-#define AV_CODEC_FLAG_GLOBAL_HEADER   (1 << 22)
-/**
- * Use only bitexact stuff (except (I)DCT).
- */
-#define AV_CODEC_FLAG_BITEXACT        (1 << 23)
-/* Fx : Flag for H.263+ extra options */
-/**
- * H.263 advanced intra coding / MPEG-4 AC prediction
- */
-#define AV_CODEC_FLAG_AC_PRED         (1 << 24)
-/**
- * interlaced motion estimation
- */
-#define AV_CODEC_FLAG_INTERLACED_ME   (1 << 29)
-#define AV_CODEC_FLAG_CLOSED_GOP      (1U << 31)
-
-/**
- * Allow non spec compliant speedup tricks.
- */
-#define AV_CODEC_FLAG2_FAST           (1 <<  0)
-/**
- * Skip bitstream encoding.
- */
-#define AV_CODEC_FLAG2_NO_OUTPUT      (1 <<  2)
-/**
- * Place global headers at every keyframe instead of in extradata.
- */
-#define AV_CODEC_FLAG2_LOCAL_HEADER   (1 <<  3)
-
-/**
- * timecode is in drop frame format. DEPRECATED!!!!
- */
-#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13)
-
-/**
- * Input bitstream might be truncated at a packet boundaries
- * instead of only at frame boundaries.
- */
-#define AV_CODEC_FLAG2_CHUNKS         (1 << 15)
-/**
- * Discard cropping information from SPS.
- */
-#define AV_CODEC_FLAG2_IGNORE_CROP    (1 << 16)
-
-/**
- * Show all frames before the first keyframe
- */
-#define AV_CODEC_FLAG2_SHOW_ALL       (1 << 22)
-/**
- * Export motion vectors through frame side data
- */
-#define AV_CODEC_FLAG2_EXPORT_MVS     (1 << 28)
-/**
- * Do not skip samples and export skip information as frame side data
- */
-#define AV_CODEC_FLAG2_SKIP_MANUAL    (1 << 29)
-/**
- * Do not reset ASS ReadOrder field on flush (subtitles decoding)
- */
-#define AV_CODEC_FLAG2_RO_FLUSH_NOOP  (1 << 30)
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-/**
- * Decoder can use draw_horiz_band callback.
- */
-#define AV_CODEC_CAP_DRAW_HORIZ_BAND     (1 <<  0)
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define AV_CODEC_CAP_DR1                 (1 <<  1)
-#define AV_CODEC_CAP_TRUNCATED           (1 <<  3)
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *       with NULL data. The user can still send NULL data to the public encode
- *       or decode function, but libavcodec will not pass it along to the codec
- *       unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames.
- *
- * Encoders:
- * The encoder needs to be fed with NULL data at the end of encoding until the
- * encoder no longer returns data.
- *
- * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
- *       flag also means that the encoder must set the pts and duration for
- *       each output packet. If this flag is not set, the pts and duration will
- *       be determined by libavcodec from the input frame.
- */
-#define AV_CODEC_CAP_DELAY               (1 <<  5)
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define AV_CODEC_CAP_SMALL_LAST_FRAME    (1 <<  6)
-
-#if FF_API_CAP_VDPAU
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define AV_CODEC_CAP_HWACCEL_VDPAU       (1 <<  7)
-#endif
-
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carrying such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define AV_CODEC_CAP_SUBFRAMES           (1 <<  8)
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define AV_CODEC_CAP_EXPERIMENTAL        (1 <<  9)
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define AV_CODEC_CAP_CHANNEL_CONF        (1 << 10)
-/**
- * Codec supports frame-level multithreading.
- */
-#define AV_CODEC_CAP_FRAME_THREADS       (1 << 12)
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define AV_CODEC_CAP_SLICE_THREADS       (1 << 13)
-/**
- * Codec supports changed parameters at any point.
- */
-#define AV_CODEC_CAP_PARAM_CHANGE        (1 << 14)
-/**
- * Codec supports avctx->thread_count == 0 (auto).
- */
-#define AV_CODEC_CAP_AUTO_THREADS        (1 << 15)
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
-/**
- * Decoder is not a preferred choice for probing.
- * This indicates that the decoder is not a good choice for probing.
- * It could for example be an expensive to spin up hardware decoder,
- * or it could simply not provide a lot of useful information about
- * the stream.
- * A decoder marked with this flag should only be used as last resort
- * choice for probing.
- */
-#define AV_CODEC_CAP_AVOID_PROBING       (1 << 17)
-/**
- * Codec is intra only.
- */
-#define AV_CODEC_CAP_INTRA_ONLY       0x40000000
-/**
- * Codec is lossless.
- */
-#define AV_CODEC_CAP_LOSSLESS         0x80000000
-
-
-#if FF_API_WITHOUT_PREFIX
-/**
- * Allow decoders to produce frames with data planes that are not aligned
- * to CPU requirements (e.g. due to cropping).
- */
-#define CODEC_FLAG_UNALIGNED AV_CODEC_FLAG_UNALIGNED
-#define CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE
-#define CODEC_FLAG_4MV    AV_CODEC_FLAG_4MV
-#define CODEC_FLAG_OUTPUT_CORRUPT AV_CODEC_FLAG_OUTPUT_CORRUPT
-#define CODEC_FLAG_QPEL   AV_CODEC_FLAG_QPEL
-#if FF_API_GMC
-/**
- * @deprecated use the "gmc" private option of the libxvid encoder
- */
-#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
-#endif
-#if FF_API_MV0
-/**
- * @deprecated use the flag "mv0" in the "mpv_flags" private option of the
- * mpegvideo encoders
- */
-#define CODEC_FLAG_MV0    0x0040
-#endif
-#if FF_API_INPUT_PRESERVED
-/**
- * @deprecated passing reference-counted frames to the encoders replaces this
- * flag
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#endif
-#define CODEC_FLAG_PASS1           AV_CODEC_FLAG_PASS1
-#define CODEC_FLAG_PASS2           AV_CODEC_FLAG_PASS2
-#define CODEC_FLAG_GRAY            AV_CODEC_FLAG_GRAY
-#if FF_API_EMU_EDGE
-/**
- * @deprecated edges are not used/required anymore. I.e. this flag is now always
- * set.
- */
-#define CODEC_FLAG_EMU_EDGE        0x4000
-#endif
-#define CODEC_FLAG_PSNR            AV_CODEC_FLAG_PSNR
-#define CODEC_FLAG_TRUNCATED       AV_CODEC_FLAG_TRUNCATED
-
-#if FF_API_NORMALIZE_AQP
-/**
- * @deprecated use the flag "naq" in the "mpv_flags" private option of the
- * mpegvideo encoders
- */
-#define CODEC_FLAG_NORMALIZE_AQP  0x00020000
-#endif
-#define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT
-#define CODEC_FLAG_LOW_DELAY      AV_CODEC_FLAG_LOW_DELAY
-#define CODEC_FLAG_GLOBAL_HEADER  AV_CODEC_FLAG_GLOBAL_HEADER
-#define CODEC_FLAG_BITEXACT       AV_CODEC_FLAG_BITEXACT
-#define CODEC_FLAG_AC_PRED        AV_CODEC_FLAG_AC_PRED
-#define CODEC_FLAG_LOOP_FILTER    AV_CODEC_FLAG_LOOP_FILTER
-#define CODEC_FLAG_INTERLACED_ME  AV_CODEC_FLAG_INTERLACED_ME
-#define CODEC_FLAG_CLOSED_GOP     AV_CODEC_FLAG_CLOSED_GOP
-#define CODEC_FLAG2_FAST          AV_CODEC_FLAG2_FAST
-#define CODEC_FLAG2_NO_OUTPUT     AV_CODEC_FLAG2_NO_OUTPUT
-#define CODEC_FLAG2_LOCAL_HEADER  AV_CODEC_FLAG2_LOCAL_HEADER
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE
-#define CODEC_FLAG2_IGNORE_CROP   AV_CODEC_FLAG2_IGNORE_CROP
-
-#define CODEC_FLAG2_CHUNKS        AV_CODEC_FLAG2_CHUNKS
-#define CODEC_FLAG2_SHOW_ALL      AV_CODEC_FLAG2_SHOW_ALL
-#define CODEC_FLAG2_EXPORT_MVS    AV_CODEC_FLAG2_EXPORT_MVS
-#define CODEC_FLAG2_SKIP_MANUAL   AV_CODEC_FLAG2_SKIP_MANUAL
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND AV_CODEC_CAP_DRAW_HORIZ_BAND ///< Decoder can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1             AV_CODEC_CAP_DR1
-#define CODEC_CAP_TRUNCATED       AV_CODEC_CAP_TRUNCATED
-#if FF_API_XVMC
-/* Codec can export data for HW decoding. This flag indicates that
- * the codec would call get_format() with list that might contain HW accelerated
- * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
- * including raw image format.
- * The application can use the passed context to determine bitstream version,
- * chroma format, resolution etc.
- */
-#define CODEC_CAP_HWACCEL         0x0010
-#endif /* FF_API_XVMC */
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *       with NULL data. The user can still send NULL data to the public encode
- *       or decode function, but libavcodec will not pass it along to the codec
- *       unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames.
- *
- * Encoders:
- * The encoder needs to be fed with NULL data at the end of encoding until the
- * encoder no longer returns data.
- *
- * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
- *       flag also means that the encoder must set the pts and duration for
- *       each output packet. If this flag is not set, the pts and duration will
- *       be determined by libavcodec from the input frame.
- */
-#define CODEC_CAP_DELAY           AV_CODEC_CAP_DELAY
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define CODEC_CAP_SMALL_LAST_FRAME AV_CODEC_CAP_SMALL_LAST_FRAME
-#if FF_API_CAP_VDPAU
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU    AV_CODEC_CAP_HWACCEL_VDPAU
-#endif
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carrying such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define CODEC_CAP_SUBFRAMES        AV_CODEC_CAP_SUBFRAMES
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define CODEC_CAP_EXPERIMENTAL     AV_CODEC_CAP_EXPERIMENTAL
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define CODEC_CAP_CHANNEL_CONF     AV_CODEC_CAP_CHANNEL_CONF
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES    0x0800
-#endif
-/**
- * Codec supports frame-level multithreading.
- */
-#define CODEC_CAP_FRAME_THREADS    AV_CODEC_CAP_FRAME_THREADS
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define CODEC_CAP_SLICE_THREADS    AV_CODEC_CAP_SLICE_THREADS
-/**
- * Codec supports changed parameters at any point.
- */
-#define CODEC_CAP_PARAM_CHANGE     AV_CODEC_CAP_PARAM_CHANGE
-/**
- * Codec supports avctx->thread_count == 0 (auto).
- */
-#define CODEC_CAP_AUTO_THREADS     AV_CODEC_CAP_AUTO_THREADS
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define CODEC_CAP_VARIABLE_FRAME_SIZE AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-/**
- * Codec is intra only.
- */
-#define CODEC_CAP_INTRA_ONLY       AV_CODEC_CAP_INTRA_ONLY
-/**
- * Codec is lossless.
- */
-#define CODEC_CAP_LOSSLESS         AV_CODEC_CAP_LOSSLESS
-
-/**
- * HWAccel is experimental and is thus avoided in favor of non experimental
- * codecs
- */
-#define HWACCEL_CODEC_CAP_EXPERIMENTAL     0x0200
-#endif /* FF_API_WITHOUT_PREFIX */
-
-#if FF_API_MB_TYPE
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16      0x0008
-#define MB_TYPE_16x8       0x0010
-#define MB_TYPE_8x16       0x0020
-#define MB_TYPE_8x8        0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2    0x0100 //FIXME
-#define MB_TYPE_ACPRED     0x0200
-#define MB_TYPE_GMC        0x0400
-#define MB_TYPE_SKIP       0x0800
-#define MB_TYPE_P0L0       0x1000
-#define MB_TYPE_P1L0       0x2000
-#define MB_TYPE_P0L1       0x4000
-#define MB_TYPE_P1L1       0x8000
-#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
-#define MB_TYPE_QUANT      0x00010000
-#define MB_TYPE_CBP        0x00020000
-// Note bits 24-31 are reserved for codec specific use (H.264 ref0, MPEG-1 0mv, ...)
-#endif
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan{
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position[3][2];
-}AVPanScan;
-
-/**
- * This structure describes the bitrate properties of an encoded bitstream. It
- * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD
- * parameters for H.264/HEVC.
- */
-typedef struct AVCPBProperties {
-    /**
-     * Maximum bitrate of the stream, in bits per second.
-     * Zero if unknown or unspecified.
-     */
-    int max_bitrate;
-    /**
-     * Minimum bitrate of the stream, in bits per second.
-     * Zero if unknown or unspecified.
-     */
-    int min_bitrate;
-    /**
-     * Average bitrate of the stream, in bits per second.
-     * Zero if unknown or unspecified.
-     */
-    int avg_bitrate;
-
-    /**
-     * The size of the buffer to which the ratecontrol is applied, in bits.
-     * Zero if unknown or unspecified.
-     */
-    int buffer_size;
-
-    /**
-     * The delay between the time the packet this structure is associated with
-     * is received and the time when it should be decoded, in periods of a 27MHz
-     * clock.
-     *
-     * UINT64_MAX when unknown or unspecified.
-     */
-    uint64_t vbv_delay;
-} AVCPBProperties;
-
-#if FF_API_QSCALE_TYPE
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-#endif
-
-/**
- * The decoder will keep a reference to the frame and may reuse it later.
- */
-#define AV_GET_BUFFER_FLAG_REF (1 << 0)
-
-/**
- * @defgroup lavc_packet AVPacket
- *
- * Types and functions for working with AVPacket.
- * @{
- */
-enum AVPacketSideDataType {
-    /**
-     * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
-     * bytes worth of palette. This side data signals that a new palette is
-     * present.
-     */
-    AV_PKT_DATA_PALETTE,
-
-    /**
-     * The AV_PKT_DATA_NEW_EXTRADATA is used to notify the codec or the format
-     * that the extradata buffer was changed and the receiving side should
-     * act upon it appropriately. The new extradata is embedded in the side
-     * data buffer and should be immediately used for processing the current
-     * frame or packet.
-     */
-    AV_PKT_DATA_NEW_EXTRADATA,
-
-    /**
-     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
-     * @code
-     * u32le param_flags
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
-     *     s32le channel_count
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
-     *     u64le channel_layout
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
-     *     s32le sample_rate
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
-     *     s32le width
-     *     s32le height
-     * @endcode
-     */
-    AV_PKT_DATA_PARAM_CHANGE,
-
-    /**
-     * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
-     * structures with info about macroblocks relevant to splitting the
-     * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
-     * That is, it does not necessarily contain info about all macroblocks,
-     * as long as the distance between macroblocks in the info is smaller
-     * than the target payload size.
-     * Each MB info structure is 12 bytes, and is laid out as follows:
-     * @code
-     * u32le bit offset from the start of the packet
-     * u8    current quantizer at the start of the macroblock
-     * u8    GOB number
-     * u16le macroblock address within the GOB
-     * u8    horizontal MV predictor
-     * u8    vertical MV predictor
-     * u8    horizontal MV predictor for block number 3
-     * u8    vertical MV predictor for block number 3
-     * @endcode
-     */
-    AV_PKT_DATA_H263_MB_INFO,
-
-    /**
-     * This side data should be associated with an audio stream and contains
-     * ReplayGain information in form of the AVReplayGain struct.
-     */
-    AV_PKT_DATA_REPLAYGAIN,
-
-    /**
-     * This side data contains a 3x3 transformation matrix describing an affine
-     * transformation that needs to be applied to the decoded video frames for
-     * correct presentation.
-     *
-     * See libavutil/display.h for a detailed description of the data.
-     */
-    AV_PKT_DATA_DISPLAYMATRIX,
-
-    /**
-     * This side data should be associated with a video stream and contains
-     * Stereoscopic 3D information in form of the AVStereo3D struct.
-     */
-    AV_PKT_DATA_STEREO3D,
-
-    /**
-     * This side data should be associated with an audio stream and corresponds
-     * to enum AVAudioServiceType.
-     */
-    AV_PKT_DATA_AUDIO_SERVICE_TYPE,
-
-    /**
-     * This side data contains quality related information from the encoder.
-     * @code
-     * u32le quality factor of the compressed frame. Allowed range is between 1 (good) and FF_LAMBDA_MAX (bad).
-     * u8    picture type
-     * u8    error count
-     * u16   reserved
-     * u64le[error count] sum of squared differences between encoder in and output
-     * @endcode
-     */
-    AV_PKT_DATA_QUALITY_STATS,
-
-    /**
-     * This side data contains an integer value representing the stream index
-     * of a "fallback" track.  A fallback track indicates an alternate
-     * track to use when the current track can not be decoded for some reason.
-     * e.g. no decoder available for codec.
-     */
-    AV_PKT_DATA_FALLBACK_TRACK,
-
-    /**
-     * This side data corresponds to the AVCPBProperties struct.
-     */
-    AV_PKT_DATA_CPB_PROPERTIES,
-
-    /**
-     * Recommmends skipping the specified number of samples
-     * @code
-     * u32le number of samples to skip from start of this packet
-     * u32le number of samples to skip from end of this packet
-     * u8    reason for start skip
-     * u8    reason for end   skip (0=padding silence, 1=convergence)
-     * @endcode
-     */
-    AV_PKT_DATA_SKIP_SAMPLES=70,
-
-    /**
-     * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
-     * the packet may contain "dual mono" audio specific to Japanese DTV
-     * and if it is true, recommends only the selected channel to be used.
-     * @code
-     * u8    selected channels (0=mail/left, 1=sub/right, 2=both)
-     * @endcode
-     */
-    AV_PKT_DATA_JP_DUALMONO,
-
-    /**
-     * A list of zero terminated key/value strings. There is no end marker for
-     * the list, so it is required to rely on the side data size to stop.
-     */
-    AV_PKT_DATA_STRINGS_METADATA,
-
-    /**
-     * Subtitle event position
-     * @code
-     * u32le x1
-     * u32le y1
-     * u32le x2
-     * u32le y2
-     * @endcode
-     */
-    AV_PKT_DATA_SUBTITLE_POSITION,
-
-    /**
-     * Data found in BlockAdditional element of matroska container. There is
-     * no end marker for the data, so it is required to rely on the side data
-     * size to recognize the end. 8 byte id (as found in BlockAddId) followed
-     * by data.
-     */
-    AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
-
-    /**
-     * The optional first identifier line of a WebVTT cue.
-     */
-    AV_PKT_DATA_WEBVTT_IDENTIFIER,
-
-    /**
-     * The optional settings (rendering instructions) that immediately
-     * follow the timestamp specifier of a WebVTT cue.
-     */
-    AV_PKT_DATA_WEBVTT_SETTINGS,
-
-    /**
-     * A list of zero terminated key/value strings. There is no end marker for
-     * the list, so it is required to rely on the side data size to stop. This
-     * side data includes updated metadata which appeared in the stream.
-     */
-    AV_PKT_DATA_METADATA_UPDATE,
-
-    /**
-     * MPEGTS stream ID, this is required to pass the stream ID
-     * information from the demuxer to the corresponding muxer.
-     */
-    AV_PKT_DATA_MPEGTS_STREAM_ID,
-
-    /**
-     * Mastering display metadata (based on SMPTE-2086:2014). This metadata
-     * should be associated with a video stream and contains data in the form
-     * of the AVMasteringDisplayMetadata struct.
-     */
-    AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
-
-    /**
-     * This side data should be associated with a video stream and corresponds
-     * to the AVSphericalMapping structure.
-     */
-    AV_PKT_DATA_SPHERICAL,
-
-    /**
-     * Content light level (based on CTA-861.3). This metadata should be
-     * associated with a video stream and contains data in the form of the
-     * AVContentLightMetadata struct.
-     */
-    AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
-
-    /**
-     * ATSC A53 Part 4 Closed Captions. This metadata should be associated with
-     * a video stream. A53 CC bitstream is stored as uint8_t in AVPacketSideData.data.
-     * The number of bytes of CC data is AVPacketSideData.size.
-     */
-    AV_PKT_DATA_A53_CC,
-
-    /**
-     * The number of side data elements (in fact a bit more than it).
-     * This is not part of the public API/ABI in the sense that it may
-     * change when new side data types are added.
-     * This must stay the last enum value.
-     * If its value becomes huge, some code using it
-     * needs to be updated as it assumes it to be smaller than other limits.
-     */
-    AV_PKT_DATA_NB
-};
-
-#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED
-
-typedef struct AVPacketSideData {
-    uint8_t *data;
-    int      size;
-    enum AVPacketSideDataType type;
-} AVPacketSideData;
-
-/**
- * This structure stores compressed data. It is typically exported by demuxers
- * and then passed as input to decoders, or received as output from encoders and
- * then passed to muxers.
- *
- * For video, it should typically contain one compressed frame. For audio it may
- * contain several compressed frames. Encoders are allowed to output empty
- * packets, with no compressed data, containing only side data
- * (e.g. to update some stream parameters at the end of encoding).
- *
- * AVPacket is one of the few structs in FFmpeg, whose size is a part of public
- * ABI. Thus it may be allocated on stack and no new fields can be added to it
- * without libavcodec and libavformat major bump.
- *
- * The semantics of data ownership depends on the buf field.
- * If it is set, the packet data is dynamically allocated and is
- * valid indefinitely until a call to av_packet_unref() reduces the
- * reference count to 0.
- *
- * If the buf field is not set av_packet_ref() would make a copy instead
- * of increasing the reference count.
- *
- * The side data is always allocated with av_malloc(), copied by
- * av_packet_ref() and freed by av_packet_unref().
- *
- * @see av_packet_ref
- * @see av_packet_unref
- */
-typedef struct AVPacket {
-    /**
-     * A reference to the reference-counted buffer where the packet data is
-     * stored.
-     * May be NULL, then the packet data is not reference-counted.
-     */
-    AVBufferRef *buf;
-    /**
-     * Presentation timestamp in AVStream->time_base units; the time at which
-     * the decompressed packet will be presented to the user.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    uint8_t *data;
-    int   size;
-    int   stream_index;
-    /**
-     * A combination of AV_PKT_FLAG values
-     */
-    int   flags;
-    /**
-     * Additional packet data that can be provided by the container.
-     * Packet can contain several types of side information.
-     */
-    AVPacketSideData *side_data;
-    int side_data_elems;
-
-    /**
-     * Duration of this packet in AVStream->time_base units, 0 if unknown.
-     * Equals next_pts - this_pts in presentation order.
-     */
-    int64_t duration;
-
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-#if FF_API_CONVERGENCE_DURATION
-    /**
-     * @deprecated Same as the duration field, but as int64_t. This was required
-     * for Matroska subtitles, whose duration values could overflow when the
-     * duration field was still an int.
-     */
-    attribute_deprecated
-    int64_t convergence_duration;
-#endif
-} AVPacket;
-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-/**
- * Flag is used to discard packets which are required to maintain valid
- * decoder state but are not required for output and should be dropped
- * after decoding.
- **/
-#define AV_PKT_FLAG_DISCARD   0x0004
-/**
- * The packet comes from a trusted source.
- *
- * Otherwise-unsafe constructs such as arbitrary pointers to data
- * outside the packet may be followed.
- */
-#define AV_PKT_FLAG_TRUSTED   0x0008
-
-enum AVSideDataParamChangeFlags {
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
-    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
-};
-/**
- * @}
- */
-
-struct AVCodecInternal;
-
-enum AVFieldOrder {
-    AV_FIELD_UNKNOWN,
-    AV_FIELD_PROGRESSIVE,
-    AV_FIELD_TT,          //< Top coded_first, top displayed first
-    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
-    AV_FIELD_TB,          //< Top coded first, bottom displayed first
-    AV_FIELD_BT,          //< Bottom coded first, top displayed first
-};
-
-/**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * You can use AVOptions (av_opt* / av_set/get*()) to access these fields from user
- * applications.
- * The name string for AVOptions options matches the associated command line
- * parameter name and can be found in libavcodec/options_table.h
- * The AVOption/command line parameter names differ in some cases from the C
- * structure field names for historic reasons or brevity.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context3
-     */
-    const AVClass *av_class;
-    int log_level_offset;
-
-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-    const struct AVCodec  *codec;
-#if FF_API_CODEC_NAME
-    /**
-     * @deprecated this field is not used for anything in libavcodec
-     */
-    attribute_deprecated
-    char             codec_name[32];
-#endif
-    enum AVCodecID     codec_id; /* see AV_CODEC_ID_xxx */
-
-    /**
-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * A demuxer should set this to what is stored in the field used to identify the codec.
-     * If there are multiple such fields in a container then the demuxer should choose the one
-     * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger than 32 bits then the demuxer should
-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
-     * first.
-     * - encoding: Set by user, if not then the default based on codec_id will be used.
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int codec_tag;
-
-#if FF_API_STREAM_CODEC_TAG
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated
-    unsigned int stream_codec_tag;
-#endif
-
-    void *priv_data;
-
-    /**
-     * Private context used for internal data.
-     *
-     * Unlike priv_data, this is not codec-specific. It is used in general
-     * libavcodec functions.
-     */
-    struct AVCodecInternal *internal;
-
-    /**
-     * Private data of the user, can be used to carry app specific stuff.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    /**
-     * the average bitrate
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: Set by user, may be overwritten by libavcodec
-     *             if this info is available in the stream
-     */
-    int64_t bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-    /**
-     * AV_CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * AV_CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * MJPEG: Huffman tables
-     * rv10: additional flags
-     * MPEG-4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid problems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * This often, but not always is the inverse of the frame rate or field rate
-     * for video. 1/time_base is not the average frame rate if the frame rate is not
-     * constant.
-     *
-     * Like containers, elementary streams also can store timestamps, 1/time_base
-     * is the unit in which these timestamps are specified.
-     * As example of such codec time base see ISO/IEC 14496-2:2001(E)
-     * vop_time_increment_resolution and fixed_vop_rate
-     * (fixed_vop_rate == 0 implies that it is different from the framerate)
-     *
-     * - encoding: MUST be set by user.
-     * - decoding: the use of this field for decoding is deprecated.
-     *             Use framerate instead.
-     */
-    AVRational time_base;
-
-    /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
-     *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
-     */
-    int ticks_per_frame;
-
-    /**
-     * Codec delay.
-     *
-     * Encoding: Number of frames delay there will be from the encoder input to
-     *           the decoder output. (we assume the decoder matches the spec)
-     * Decoding: Number of frames delay in addition to what a standard decoder
-     *           as specified in the spec would produce.
-     *
-     * Video:
-     *   Number of frames the decoded output will be delayed relative to the
-     *   encoded input.
-     *
-     * Audio:
-     *   For encoding, this field is unused (see initial_padding).
-     *
-     *   For decoding, this is the number of samples the decoder needs to
-     *   output before the decoder's output is valid. When seeking, you should
-     *   start decoding this many samples prior to your desired seek point.
-     *
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int delay;
-
-
-    /* video only */
-    /**
-     * picture width / height.
-     *
-     * @note Those fields may not match the values of the last
-     * AVFrame output by avcodec_decode_video2 due frame
-     * reordering.
-     *
-     * - encoding: MUST be set by user.
-     * - decoding: May be set by the user before opening the decoder if known e.g.
-     *             from the container. Some decoders will require the dimensions
-     *             to be set by the caller. During decoding, the decoder may
-     *             overwrite those values as required while parsing the data.
-     */
-    int width, height;
-
-    /**
-     * Bitstream width / height, may be different from width/height e.g. when
-     * the decoded frame is cropped before being output or lowres is enabled.
-     *
-     * @note Those field may not match the value of the last
-     * AVFrame output by avcodec_receive_frame() due frame
-     * reordering.
-     *
-     * - encoding: unused
-     * - decoding: May be set by the user before opening the decoder if known
-     *             e.g. from the container. During decoding, the decoder may
-     *             overwrite those values as required while parsing the data.
-     */
-    int coded_width, coded_height;
-
-#if FF_API_ASPECT_EXTENDED
-#define FF_ASPECT_EXTENDED 15
-#endif
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * Pixel format, see AV_PIX_FMT_xxx.
-     * May be set by the demuxer if known from headers.
-     * May be overridden by the decoder if it knows better.
-     *
-     * @note This field may not match the value of the last
-     * AVFrame output by avcodec_receive_frame() due frame
-     * reordering.
-     *
-     * - encoding: Set by user.
-     * - decoding: Set by user if known, overridden by libavcodec while
-     *             parsing the data.
-     */
-    enum AVPixelFormat pix_fmt;
-
-#if FF_API_MOTION_EST
-    /**
-     * This option does nothing
-     * @deprecated use codec private options instead
-     */
-    attribute_deprecated int me_method;
-#endif
-
-    /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * When multithreading is used, it may be called from multiple threads
-     * at the same time; threads might draw different parts of the same AVFrame,
-     * or multiple AVFrames, and there is no guarantee that slices will be drawn
-     * in order.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
-     */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
-                            int y, int type, int height);
-
-    /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @note The callback may be called again immediately if initialization for
-     * the selected (hardware-accelerated) pixel format failed.
-     * @warning Behavior is undefined if the callback returns a value not
-     * in the fmt list of formats.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-#if FF_API_RC_STRATEGY
-    /** @deprecated use codec private option instead */
-    attribute_deprecated int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-#endif
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int b_frame_strategy;
-#endif
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-    /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int mpeg_quant;
-#endif
-
-    /**
-     * qscale factor between P- and I-frames
-     * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor + offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * slice count
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user (or 0).
-     */
-    int slice_count;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-     int prediction_method;
-#define FF_PRED_LEFT   0
-#define FF_PRED_PLANE  1
-#define FF_PRED_MEDIAN 2
-#endif
-
-    /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * That is the width of a pixel divided by the height of the pixel.
-     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD          0
-#define FF_CMP_SSE          1
-#define FF_CMP_SATD         2
-#define FF_CMP_DCT          3
-#define FF_CMP_PSNR         4
-#define FF_CMP_BIT          5
-#define FF_CMP_RD           6
-#define FF_CMP_ZERO         7
-#define FF_CMP_VSAD         8
-#define FF_CMP_VSSE         9
-#define FF_CMP_NSSE         10
-#define FF_CMP_W53          11
-#define FF_CMP_W97          12
-#define FF_CMP_DCTMAX       13
-#define FF_CMP_DCT264       14
-#define FF_CMP_MEDIAN_SAD   15
-#define FF_CMP_CHROMA       256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int pre_me;
-#endif
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-#if FF_API_AFD
-    /**
-     * DTG active format information (additional aspect ratio
-     * information only used in DVB MPEG-2 transport streams)
-     * 0 if not set.
-     *
-     * - encoding: unused
-     * - decoding: Set by decoder.
-     * @deprecated Deprecated in favor of AVSideData
-     */
-    attribute_deprecated int dtg_active_format;
-#define FF_DTG_AFD_SAME         8
-#define FF_DTG_AFD_4_3          9
-#define FF_DTG_AFD_16_9         10
-#define FF_DTG_AFD_14_9         11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3       15
-#endif /* FF_API_AFD */
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-#if FF_API_QUANT_BIAS
-    /**
-     * @deprecated use encoder private option instead
-     */
-    attribute_deprecated int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
-    /**
-     * @deprecated use encoder private option instead
-     */
-    attribute_deprecated int inter_quant_bias;
-#endif
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-#if FF_API_XVMC
-    /**
-     * XVideo Motion Acceleration
-     * - encoding: forbidden
-     * - decoding: set by decoder
-     * @deprecated XvMC doesn't need it anymore.
-     */
-    attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int scenechange_threshold;
-
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int noise_reduction;
-#endif
-
-#if FF_API_MPV_OPT
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated
-    int me_threshold;
-
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated
-    int mb_threshold;
-#endif
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec
-     */
-    int intra_dc_precision;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_bottom;
-
-#if FF_API_MPV_OPT
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    float border_masking;
-#endif
-
-    /**
-     * minimum MB Lagrange multiplier
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB Lagrange multiplier
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-#if FF_API_PRIVATE_OPT
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    int me_penalty_compensation;
-#endif
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int brd_scale;
-#endif
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int chromaoffset;
-#endif
-
-#if FF_API_UNUSED_MEMBERS
-    /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int scenechange_factor;
-#endif
-
-    /**
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int b_sensitivity;
-#endif
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVChromaLocation chroma_sample_location;
-
-    /**
-     * Number of slices.
-     * Indicates number of picture subdivisions. Used for parallelized
-     * decoding.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int slices;
-
-    /** Field order
-     * - encoding: set by libavcodec
-     * - decoding: Set by user.
-     */
-    enum AVFieldOrder field_order;
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVSampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * Number of samples per channel in an audio frame.
-     *
-     * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
-     *   except the last must contain exactly frame_size samples per channel.
-     *   May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
-     *   frame size is not restricted.
-     * - decoding: may be set by some decoders to indicate constant frame size
-     */
-    int frame_size;
-
-    /**
-     * Frame counter, set by libavcodec.
-     *
-     * - decoding: total number of frames returned from the decoder so far.
-     * - encoding: total number of frames passed to the encoder so far.
-     *
-     *   @note the counter is not incremented if encoding/decoding resulted in
-     *   an error.
-     */
-    int frame_number;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by user, may be overwritten by libavcodec.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint64_t request_channel_layout;
-
-    /**
-     * Type of service that the audio stream conveys.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVAudioServiceType audio_service_type;
-
-    /**
-     * desired sample format
-     * - encoding: Not used.
-     * - decoding: Set by user.
-     * Decoder will decode to this format if it can.
-     */
-    enum AVSampleFormat request_sample_fmt;
-
-    /**
-     * This callback is called at the beginning of each frame to get data
-     * buffer(s) for it. There may be one contiguous buffer for all the data or
-     * there may be a buffer per each data plane or anything in between. What
-     * this means is, you may set however many entries in buf[] you feel necessary.
-     * Each buffer must be reference-counted using the AVBuffer API (see description
-     * of buf[] below).
-     *
-     * The following fields will be set in the frame before this callback is
-     * called:
-     * - format
-     * - width, height (video only)
-     * - sample_rate, channel_layout, nb_samples (audio only)
-     * Their values may differ from the corresponding values in
-     * AVCodecContext. This callback must use the frame values, not the codec
-     * context values, to calculate the required buffer size.
-     *
-     * This callback must fill the following fields in the frame:
-     * - data[]
-     * - linesize[]
-     * - extended_data:
-     *   * if the data is planar audio with more than 8 channels, then this
-     *     callback must allocate and fill extended_data to contain all pointers
-     *     to all data planes. data[] must hold as many pointers as it can.
-     *     extended_data must be allocated with av_malloc() and will be freed in
-     *     av_frame_unref().
-     *   * otherwise extended_data must point to data
-     * - buf[] must contain one or more pointers to AVBufferRef structures. Each of
-     *   the frame's data and extended_data pointers must be contained in these. That
-     *   is, one AVBufferRef for each allocated chunk of memory, not necessarily one
-     *   AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(),
-     *   and av_buffer_ref().
-     * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
-     *   this callback and filled with the extra buffers if there are more
-     *   buffers than buf[] can hold. extended_buf will be freed in
-     *   av_frame_unref().
-     *
-     * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call
-     * avcodec_default_get_buffer2() instead of providing buffers allocated by
-     * some other means.
-     *
-     * Each data plane must be aligned to the maximum required by the target
-     * CPU.
-     *
-     * @see avcodec_default_get_buffer2()
-     *
-     * Video:
-     *
-     * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
-     * (read and/or written to if it is writable) later by libavcodec.
-     *
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     *
-     * Some decoders do not support linesizes changing between frames.
-     *
-     * If frame multithreading is used and thread_safe_callbacks is set,
-     * this callback may be called from a different thread, but not from more
-     * than one at once. Does not need to be reentrant.
-     *
-     * @see avcodec_align_dimensions2()
-     *
-     * Audio:
-     *
-     * Decoders request a buffer of a particular size by setting
-     * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
-     * however, utilize only part of the buffer by setting AVFrame.nb_samples
-     * to a smaller value in the output frame.
-     *
-     * As a convenience, av_samples_get_buffer_size() and
-     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
-     * functions to find the required data size and to fill data pointers and
-     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-     * since all planes must be the same size.
-     *
-     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
-
-    /**
-     * If non-zero, the decoded audio and video frames returned from
-     * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
-     * and are valid indefinitely. The caller must free them with
-     * av_frame_unref() when they are not needed anymore.
-     * Otherwise, the decoded frames must not be freed by the caller and are
-     * only valid until the next decode call.
-     *
-     * This is always automatically enabled if avcodec_receive_frame() is used.
-     *
-     * - encoding: unused
-     * - decoding: set by the caller before avcodec_open2().
-     */
-    attribute_deprecated
-    int refcounted_frames;
-
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
-
-    /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmin;
-
-    /**
-     * maximum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-#if FF_API_MPV_OPT
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    float rc_qsquish;
-
-    attribute_deprecated
-    float rc_qmod_amp;
-    attribute_deprecated
-    int rc_qmod_freq;
-#endif
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    int rc_override_count;
-    RcOverride *rc_override;
-
-#if FF_API_MPV_OPT
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    const char *rc_eq;
-#endif
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: Set by user, may be overwritten by libavcodec.
-     */
-    int64_t rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t rc_min_rate;
-
-#if FF_API_MPV_OPT
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    float rc_buffer_aggressivity;
-
-    attribute_deprecated
-    float rc_initial_cplx;
-#endif
-
-    /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_max_available_vbv_use;
-
-    /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_min_vbv_overflow_use;
-
-    /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_initial_buffer_occupancy;
-
-#if FF_API_CODER_TYPE
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#if FF_API_UNUSED_MEMBERS
-#define FF_CODER_TYPE_DEFLATE   4
-#endif /* FF_API_UNUSED_MEMBERS */
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    int coder_type;
-#endif /* FF_API_CODER_TYPE */
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int context_model;
-#endif
-
-#if FF_API_MPV_OPT
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    int lmin;
-
-    /**
-     * @deprecated use encoder private options instead
-     */
-    attribute_deprecated
-    int lmax;
-#endif
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int frame_skip_threshold;
-
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int frame_skip_factor;
-
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int frame_skip_exp;
-
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int frame_skip_cmp;
-#endif /* FF_API_PRIVATE_OPT */
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int min_prediction_order;
-
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int max_prediction_order;
-
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int64_t timecode_frame_start;
-#endif
-
-#if FF_API_RTP_CALLBACK
-    /**
-     * @deprecated unused
-     */
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    attribute_deprecated
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-#endif
-
-#if FF_API_PRIVATE_OPT
-    /** @deprecated use encoder private options instead */
-    attribute_deprecated
-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
-                            /* do its best to deliver a chunk with size     */
-                            /* below rtp_payload_size, the chunk will start */
-                            /* with a start code on some codecs like H.263. */
-                            /* This doesn't take account of any particular  */
-                            /* headers inside the transmitted RTP payload.  */
-#endif
-
-#if FF_API_STAT_BITS
-    /* statistics, used for 2-pass encoding */
-    attribute_deprecated
-    int mv_bits;
-    attribute_deprecated
-    int header_bits;
-    attribute_deprecated
-    int i_tex_bits;
-    attribute_deprecated
-    int p_tex_bits;
-    attribute_deprecated
-    int i_count;
-    attribute_deprecated
-    int p_count;
-    attribute_deprecated
-    int skip_count;
-    attribute_deprecated
-    int misc_bits;
-
-    /** @deprecated this field is unused */
-    attribute_deprecated
-    int frame_bits;
-#endif
-
-    /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    char *stats_out;
-
-    /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    char *stats_in;
-
-    /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
-     */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#if FF_API_OLD_MSMPEG4
-#define FF_BUG_OLD_MSMPEG4      2
-#endif
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#if FF_API_AC_VLC
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#endif
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED       16384
-#define FF_BUG_IEDGE           32768
-
-    /**
-     * strictly follow the standard (MPEG-4, ...).
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things, whereas setting it to unofficial or lower
-     * will mean the encoder might produce output that is not supported by all
-     * spec-compliant decoders. Decoders don't differentiate between normal,
-     * unofficial and experimental (that is, they always try to decode things
-     * when they can) unless they are explicitly asked to behave stupidly
-     * (=strictly conform to the specs)
-     */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-#define FF_EC_FAVOR_INTER 256
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#if FF_API_DEBUG_MV
-/**
- * @deprecated this option does nothing
- */
-#define FF_DEBUG_MV          32
-#endif
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#if FF_API_UNUSED_MEMBERS
-#define FF_DEBUG_PTS         0x00000200
-#endif /* FF_API_UNUSED_MEMBERS */
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#endif
-#define FF_DEBUG_BUFFERS     0x00008000
-#define FF_DEBUG_THREADS     0x00010000
-#define FF_DEBUG_GREEN_MD    0x00800000
-#define FF_DEBUG_NOMC        0x01000000
-
-#if FF_API_DEBUG_MV
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 // visualize forward predicted MVs of P-frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 // visualize forward predicted MVs of B-frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 // visualize backward predicted MVs of B-frames
-#endif
-
-    /**
-     * Error recognition; may misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int err_recognition;
-
-/**
- * Verify checksums embedded in the bitstream (could be of either encoded or
- * decoded data, depending on the codec) and print an error message on mismatch.
- * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
- * decoder returning an error.
- */
-#define AV_EF_CRCCHECK  (1<<0)
-#define AV_EF_BITSTREAM (1<<1)          ///< detect bitstream specification deviations
-#define AV_EF_BUFFER    (1<<2)          ///< detect improper bitstream length
-#define AV_EF_EXPLODE   (1<<3)          ///< abort decoding on minor error detection
-
-#define AV_EF_IGNORE_ERR (1<<15)        ///< ignore errors and continue
-#define AV_EF_CAREFUL    (1<<16)        ///< consider things that violate the spec, are fast to calculate and have not been seen in the wild as errors
-#define AV_EF_COMPLIANT  (1<<17)        ///< consider all spec non compliances as errors
-#define AV_EF_AGGRESSIVE (1<<18)        ///< consider things that a sane encoder should not do as an error
-
-
-    /**
-     * opaque 64-bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    struct AVHWAccel *hwaccel;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data FFmpeg cannot instantiate itself. Please refer to the
-     * FFmpeg HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * DCT algorithm, see FF_DCT_* below
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#if FF_API_ARCH_SH4
-#define FF_IDCT_SH4           9
-#endif
-#define FF_IDCT_SIMPLEARM     10
-#if FF_API_UNUSED_MEMBERS
-#define FF_IDCT_IPP           13
-#endif /* FF_API_UNUSED_MEMBERS */
-#define FF_IDCT_XVID          14
-#if FF_API_IDCT_XVIDMMX
-#define FF_IDCT_XVIDMMX       14
-#endif /* FF_API_IDCT_XVIDMMX */
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#if FF_API_ARCH_SPARC
-#define FF_IDCT_SIMPLEVIS     18
-#endif
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_SIMPLENEON    22
-#if FF_API_ARCH_ALPHA
-#define FF_IDCT_SIMPLEALPHA   23
-#endif
-#define FF_IDCT_NONE          24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
-#define FF_IDCT_SIMPLEAUTO    128
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-#if FF_API_LOWRES
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int lowres;
-#endif
-
-#if FF_API_CODED_FRAME
-    /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     *
-     * @deprecated use the quality factor packet side data instead
-     */
-    attribute_deprecated AVFrame *coded_frame;
-#endif
-
-    /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_count;
-
-    /**
-     * Which multithreading methods to use.
-     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
-     * so clients which cannot provide future frames should not use it.
-     *
-     * - encoding: Set by user, otherwise the default is used.
-     * - decoding: Set by user, otherwise the default is used.
-     */
-    int thread_type;
-#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
-#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
-
-    /**
-     * Which multithreading methods are in use by the codec.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int active_thread_type;
-
-    /**
-     * Set by the client if its custom get_buffer() callback can be called
-     * synchronously from another thread, which allows faster multithreaded decoding.
-     * draw_horiz_band() will be called from other threads regardless of this setting.
-     * Ignored if the default get_buffer() is used.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_safe_callbacks;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-    /**
-     * noise vs. sse weight for the nsse comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-#define FF_PROFILE_RESERVED -100
-
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
-#define FF_PROFILE_AAC_HE   4
-#define FF_PROFILE_AAC_HE_V2 28
-#define FF_PROFILE_AAC_LD   22
-#define FF_PROFILE_AAC_ELD  38
-#define FF_PROFILE_MPEG2_AAC_LOW 128
-#define FF_PROFILE_MPEG2_AAC_HE  131
-
-#define FF_PROFILE_DNXHD         0
-#define FF_PROFILE_DNXHR_LB      1
-#define FF_PROFILE_DNXHR_SQ      2
-#define FF_PROFILE_DNXHR_HQ      3
-#define FF_PROFILE_DNXHR_HQX     4
-#define FF_PROFILE_DNXHR_444     5
-
-#define FF_PROFILE_DTS         20
-#define FF_PROFILE_DTS_ES      30
-#define FF_PROFILE_DTS_96_24   40
-#define FF_PROFILE_DTS_HD_HRA  50
-#define FF_PROFILE_DTS_HD_MA   60
-#define FF_PROFILE_DTS_EXPRESS 70
-
-#define FF_PROFILE_MPEG2_422    0
-#define FF_PROFILE_MPEG2_HIGH   1
-#define FF_PROFILE_MPEG2_SS     2
-#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
-#define FF_PROFILE_MPEG2_MAIN   4
-#define FF_PROFILE_MPEG2_SIMPLE 5
-
-#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
-#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
-
-#define FF_PROFILE_H264_BASELINE             66
-#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
-#define FF_PROFILE_H264_MAIN                 77
-#define FF_PROFILE_H264_EXTENDED             88
-#define FF_PROFILE_H264_HIGH                 100
-#define FF_PROFILE_H264_HIGH_10              110
-#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_MULTIVIEW_HIGH       118
-#define FF_PROFILE_H264_HIGH_422             122
-#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_STEREO_HIGH          128
-#define FF_PROFILE_H264_HIGH_444             144
-#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
-#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_CAVLC_444            44
-
-#define FF_PROFILE_VC1_SIMPLE   0
-#define FF_PROFILE_VC1_MAIN     1
-#define FF_PROFILE_VC1_COMPLEX  2
-#define FF_PROFILE_VC1_ADVANCED 3
-
-#define FF_PROFILE_MPEG4_SIMPLE                     0
-#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
-#define FF_PROFILE_MPEG4_CORE                       2
-#define FF_PROFILE_MPEG4_MAIN                       3
-#define FF_PROFILE_MPEG4_N_BIT                      4
-#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
-#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
-#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
-#define FF_PROFILE_MPEG4_HYBRID                     8
-#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
-#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
-#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
-#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
-#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
-#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
-
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   1
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   2
-#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  32768
-#define FF_PROFILE_JPEG2000_DCINEMA_2K              3
-#define FF_PROFILE_JPEG2000_DCINEMA_4K              4
-
-#define FF_PROFILE_VP9_0                            0
-#define FF_PROFILE_VP9_1                            1
-#define FF_PROFILE_VP9_2                            2
-#define FF_PROFILE_VP9_3                            3
-
-#define FF_PROFILE_HEVC_MAIN                        1
-#define FF_PROFILE_HEVC_MAIN_10                     2
-#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
-#define FF_PROFILE_HEVC_REXT                        4
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     * Skip loop filtering for selected frames.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     * Skip IDCT/dequantization for selected frames.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_idct;
-
-    /**
-     * Skip decoding for selected frames.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     * Header containing style information for text subtitles.
-     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-     * the Format line following. It shouldn't include any Dialogue line.
-     * - encoding: Set/allocated/freed by user (before avcodec_open2())
-     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-     */
-    uint8_t *subtitle_header;
-    int subtitle_header_size;
-
-#if FF_API_ERROR_RATE
-    /**
-     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
-     * encoders
-     */
-    attribute_deprecated
-    int error_rate;
-#endif
-
-#if FF_API_VBV_DELAY
-    /**
-     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
-     * Used for compliant TS muxing.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused.
-     * @deprecated this value is now exported as a part of
-     * AV_PKT_DATA_CPB_PROPERTIES packet side data
-     */
-    attribute_deprecated
-    uint64_t vbv_delay;
-#endif
-
-#if FF_API_SIDEDATA_ONLY_PKT
-    /**
-     * Encoding only and set by default. Allow encoders to output packets
-     * that do not contain any encoded data, only side data.
-     *
-     * Some encoders need to output such packets, e.g. to update some stream
-     * parameters at the end of encoding.
-     *
-     * @deprecated this field disables the default behaviour and
-     *             it is kept only for compatibility.
-     */
-    attribute_deprecated
-    int side_data_only_packets;
-#endif
-
-    /**
-     * Audio only. The number of "priming" samples (padding) inserted by the
-     * encoder at the beginning of the audio. I.e. this number of leading
-     * decoded samples must be discarded by the caller to get the original audio
-     * without leading padding.
-     *
-     * - decoding: unused
-     * - encoding: Set by libavcodec. The timestamps on the output packets are
-     *             adjusted by the encoder so that they always refer to the
-     *             first sample of the data actually contained in the packet,
-     *             including any added padding.  E.g. if the timebase is
-     *             1/samplerate and the timestamp of the first input sample is
-     *             0, the timestamp of the first output packet will be
-     *             -initial_padding.
-     */
-    int initial_padding;
-
-    /**
-     * - decoding: For codecs that store a framerate value in the compressed
-     *             bitstream, the decoder may export it here. { 0, 1} when
-     *             unknown.
-     * - encoding: May be used to signal the framerate of CFR content to an
-     *             encoder.
-     */
-    AVRational framerate;
-
-    /**
-     * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx.
-     * - encoding: unused.
-     * - decoding: Set by libavcodec before calling get_format()
-     */
-    enum AVPixelFormat sw_pix_fmt;
-
-    /**
-     * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
-     * - encoding unused.
-     * - decoding set by user.
-     */
-    AVRational pkt_timebase;
-
-    /**
-     * AVCodecDescriptor
-     * - encoding: unused.
-     * - decoding: set by libavcodec.
-     */
-    const AVCodecDescriptor *codec_descriptor;
-
-#if !FF_API_LOWRES
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int lowres;
-#endif
-
-    /**
-     * Current statistics for PTS correction.
-     * - decoding: maintained and used by libavcodec, not intended to be used by user apps
-     * - encoding: unused
-     */
-    int64_t pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far
-    int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
-    int64_t pts_correction_last_pts;       /// PTS of the last frame
-    int64_t pts_correction_last_dts;       /// DTS of the last frame
-
-    /**
-     * Character encoding of the input subtitles file.
-     * - decoding: set by user
-     * - encoding: unused
-     */
-    char *sub_charenc;
-
-    /**
-     * Subtitles character encoding mode. Formats or codecs might be adjusting
-     * this setting (if they are doing the conversion themselves for instance).
-     * - decoding: set by libavcodec
-     * - encoding: unused
-     */
-    int sub_charenc_mode;
-#define FF_SUB_CHARENC_MODE_DO_NOTHING  -1  ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance)
-#define FF_SUB_CHARENC_MODE_AUTOMATIC    0  ///< libavcodec will select the mode itself
-#define FF_SUB_CHARENC_MODE_PRE_DECODER  1  ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv
-
-    /**
-     * Skip processing alpha if supported by codec.
-     * Note that if the format uses pre-multiplied alpha (common with VP6,
-     * and recommended due to better video quality/compression)
-     * the image will look as if alpha-blended onto a black background.
-     * However for formats that do not use pre-multiplied alpha
-     * there might be serious artefacts (though e.g. libswscale currently
-     * assumes pre-multiplied alpha anyway).
-     *
-     * - decoding: set by user
-     * - encoding: unused
-     */
-    int skip_alpha;
-
-    /**
-     * Number of samples to skip after a discontinuity
-     * - decoding: unused
-     * - encoding: set by libavcodec
-     */
-    int seek_preroll;
-
-#if !FF_API_DEBUG_MV
-    /**
-     * debug motion vectors
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-#endif
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: unused.
-     */
-    uint16_t *chroma_intra_matrix;
-
-    /**
-     * dump format separator.
-     * can be ", " or "\n      " or anything else
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    uint8_t *dump_separator;
-
-    /**
-     * ',' separated list of allowed decoders.
-     * If NULL then all are allowed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *codec_whitelist;
-
-    /**
-     * Properties of the stream that gets decoded
-     * - encoding: unused
-     * - decoding: set by libavcodec
-     */
-    unsigned properties;
-#define FF_CODEC_PROPERTY_LOSSLESS        0x00000001
-#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
-
-    /**
-     * Additional data associated with the entire coded stream.
-     *
-     * - decoding: unused
-     * - encoding: may be set by libavcodec after avcodec_open2().
-     */
-    AVPacketSideData *coded_side_data;
-    int            nb_coded_side_data;
-
-    /**
-     * A reference to the AVHWFramesContext describing the input (for encoding)
-     * or output (decoding) frames. The reference is set by the caller and
-     * afterwards owned (and freed) by libavcodec - it should never be read by
-     * the caller after being set.
-     *
-     * - decoding: This field should be set by the caller from the get_format()
-     *             callback. The previous reference (if any) will always be
-     *             unreffed by libavcodec before the get_format() call.
-     *
-     *             If the default get_buffer2() is used with a hwaccel pixel
-     *             format, then this AVHWFramesContext will be used for
-     *             allocating the frame buffers.
-     *
-     * - encoding: For hardware encoders configured to use a hwaccel pixel
-     *             format, this field should be set by the caller to a reference
-     *             to the AVHWFramesContext describing input frames.
-     *             AVHWFramesContext.format must be equal to
-     *             AVCodecContext.pix_fmt.
-     *
-     *             This field should be set before avcodec_open2() is called.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-    /**
-     * Control the form of AVSubtitle.rects[N]->ass
-     * - decoding: set by user
-     * - encoding: unused
-     */
-    int sub_text_format;
-#define FF_SUB_TEXT_FMT_ASS              0
-#if FF_API_ASS_TIMING
-#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1
-#endif
-
-    /**
-     * Audio only. The amount of padding (in samples) appended by the encoder to
-     * the end of the audio. I.e. this number of decoded samples must be
-     * discarded by the caller from the end of the stream to get the original
-     * audio without any trailing padding.
-     *
-     * - decoding: unused
-     * - encoding: unused
-     */
-    int trailing_padding;
-
-    /**
-     * The number of pixels per image to maximally accept.
-     *
-     * - decoding: set by user
-     * - encoding: set by user
-     */
-    int64_t max_pixels;
-
-    /**
-     * A reference to the AVHWDeviceContext describing the device which will
-     * be used by a hardware encoder/decoder.  The reference is set by the
-     * caller and afterwards owned (and freed) by libavcodec.
-     *
-     * This should be used if either the codec device does not require
-     * hardware frames or any that are used are to be allocated internally by
-     * libavcodec.  If the user wishes to supply any of the frames used as
-     * encoder input or decoder output then hw_frames_ctx should be used
-     * instead.  When hw_frames_ctx is set in get_format() for a decoder, this
-     * field will be ignored while decoding the associated stream segment, but
-     * may again be used on a following one after another get_format() call.
-     *
-     * For both encoders and decoders this field should be set before
-     * avcodec_open2() is called and must not be written to thereafter.
-     *
-     * Note that some decoders may require this field to be set initially in
-     * order to support hw_frames_ctx at all - in that case, all frames
-     * contexts used must be created on the same device.
-     */
-    AVBufferRef *hw_device_ctx;
-
-    /**
-     * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated
-     * decoding (if active).
-     * - encoding: unused
-     * - decoding: Set by user (either before avcodec_open2(), or in the
-     *             AVCodecContext.get_format callback)
-     */
-    int hwaccel_flags;
-
-    /**
-     * Video decoding only. Certain video codecs support cropping, meaning that
-     * only a sub-rectangle of the decoded frame is intended for display.  This
-     * option controls how cropping is handled by libavcodec.
-     *
-     * When set to 1 (the default), libavcodec will apply cropping internally.
-     * I.e. it will modify the output frame width/height fields and offset the
-     * data pointers (only by as much as possible while preserving alignment, or
-     * by the full amount if the AV_CODEC_FLAG_UNALIGNED flag is set) so that
-     * the frames output by the decoder refer only to the cropped area. The
-     * crop_* fields of the output frames will be zero.
-     *
-     * When set to 0, the width/height fields of the output frames will be set
-     * to the coded dimensions and the crop_* fields will describe the cropping
-     * rectangle. Applying the cropping is left to the caller.
-     *
-     * @warning When hardware acceleration with opaque output frames is used,
-     * libavcodec is unable to apply cropping from the top/left border.
-     *
-     * @note when this option is set to zero, the width/height fields of the
-     * AVCodecContext and output AVFrames have different meanings. The codec
-     * context fields store display dimensions (with the coded dimensions in
-     * coded_width/height), while the frame fields store the coded dimensions
-     * (with the display dimensions being determined by the crop_* fields).
-     */
-    int apply_cropping;
-} AVCodecContext;
-
-AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
-void       av_codec_set_pkt_timebase         (AVCodecContext *avctx, AVRational val);
-
-const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
-void                     av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
-
-unsigned av_codec_get_codec_properties(const AVCodecContext *avctx);
-
-int  av_codec_get_lowres(const AVCodecContext *avctx);
-void av_codec_set_lowres(AVCodecContext *avctx, int val);
-
-int  av_codec_get_seek_preroll(const AVCodecContext *avctx);
-void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
-
-uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx);
-void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val);
-
-/**
- * AVProfile.
- */
-typedef struct AVProfile {
-    int profile;
-    const char *name; ///< short name for the profile
-} AVProfile;
-
-typedef struct AVCodecDefault AVCodecDefault;
-
-struct AVSubtitle;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    enum AVMediaType type;
-    enum AVCodecID id;
-    /**
-     * Codec capabilities.
-     * see AV_CODEC_CAP_*
-     */
-    int capabilities;
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
-    const AVClass *priv_class;              ///< AVClass for the private context
-    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavcodec and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    int priv_data_size;
-    struct AVCodec *next;
-    /**
-     * @name Frame-level threading support functions
-     * @{
-     */
-    /**
-     * If defined, called on thread contexts when they are created.
-     * If the codec allocates writable tables in init(), re-allocate them here.
-     * priv_data will be set to a copy of the original.
-     */
-    int (*init_thread_copy)(AVCodecContext *);
-    /**
-     * Copy necessary context variables from a previous thread context to the current one.
-     * If not defined, the next thread will start automatically; otherwise, the codec
-     * must call ff_thread_finish_setup().
-     *
-     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
-     */
-    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
-    /** @} */
-
-    /**
-     * Private codec-specific defaults.
-     */
-    const AVCodecDefault *defaults;
-
-    /**
-     * Initialize codec static data, called from avcodec_register().
-     */
-    void (*init_static_data)(struct AVCodec *codec);
-
-    int (*init)(AVCodecContext *);
-    int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
-                      const struct AVSubtitle *sub);
-    /**
-     * Encode data to an AVPacket.
-     *
-     * @param      avctx          codec context
-     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
-     * @param[in]  frame          AVFrame containing the raw data to be encoded
-     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-     *                            non-empty packet was returned in avpkt.
-     * @return 0 on success, negative error code on failure
-     */
-    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
-                   int *got_packet_ptr);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
-    int (*close)(AVCodecContext *);
-    /**
-     * Encode API with decoupled packet/frame dataflow. The API is the
-     * same as the avcodec_ prefixed APIs (avcodec_send_frame() etc.), except
-     * that:
-     * - never called if the codec is closed or the wrong type,
-     * - if AV_CODEC_CAP_DELAY is not set, drain frames are never sent,
-     * - only one drain frame is ever passed down,
-     */
-    int (*send_frame)(AVCodecContext *avctx, const AVFrame *frame);
-    int (*receive_packet)(AVCodecContext *avctx, AVPacket *avpkt);
-
-    /**
-     * Decode API with decoupled packet/frame dataflow. This function is called
-     * to get one output frame. It should call ff_decode_get_packet() to obtain
-     * input data.
-     */
-    int (*receive_frame)(AVCodecContext *avctx, AVFrame *frame);
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(AVCodecContext *);
-    /**
-     * Internal codec capabilities.
-     * See FF_CODEC_CAP_* in internal.h
-     */
-    int caps_internal;
-
-    /**
-     * Decoding only, a comma-separated list of bitstream filters to apply to
-     * packets before decoding.
-     */
-    const char *bsfs;
-} AVCodec;
-
-int av_codec_get_max_lowres(const AVCodec *codec);
-
-struct MpegEncContext;
-
-/**
- * @defgroup lavc_hwaccel AVHWAccel
- * @{
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See AV_CODEC_ID_xxx
-     */
-    enum AVCodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see AV_HWACCEL_CODEC_CAP_*
-     */
-    int capabilities;
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavcodec and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVHWAccel *next;
-
-    /**
-     * Allocate a custom buffer
-     */
-    int (*alloc_frame)(AVCodecContext *avctx, AVFrame *frame);
-
-    /**
-     * Called at the beginning of each frame or field picture.
-     *
-     * Meaningful frame information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * Meaningful slice information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     * The only exception is XvMC, that works on MB level.
-     *
-     * @param avctx the codec context
-     * @param buf the slice data buffer base
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * Size of per-frame hardware accelerator private data.
-     *
-     * Private data is allocated with av_mallocz() before
-     * AVCodecContext.get_buffer() and deallocated after
-     * AVCodecContext.release_buffer().
-     */
-    int frame_priv_data_size;
-
-    /**
-     * Called for every Macroblock in a slice.
-     *
-     * XvMC uses it to replace the ff_mpv_reconstruct_mb().
-     * Instead of decoding to raw picture, MB parameters are
-     * stored in an array provided by the video driver.
-     *
-     * @param s the mpeg context
-     */
-    void (*decode_mb)(struct MpegEncContext *s);
-
-    /**
-     * Initialize the hwaccel private data.
-     *
-     * This will be called from ff_get_format(), after hwaccel and
-     * hwaccel_context are set and the hwaccel private data in AVCodecInternal
-     * is allocated.
-     */
-    int (*init)(AVCodecContext *avctx);
-
-    /**
-     * Uninitialize the hwaccel private data.
-     *
-     * This will be called from get_format() or avcodec_close(), after hwaccel
-     * and hwaccel_context are already uninitialized.
-     */
-    int (*uninit)(AVCodecContext *avctx);
-
-    /**
-     * Size of the private data to allocate in
-     * AVCodecInternal.hwaccel_priv_data.
-     */
-    int priv_data_size;
-
-    /**
-     * Internal hwaccel capabilities.
-     */
-    int caps_internal;
-} AVHWAccel;
-
-/**
- * HWAccel is experimental and is thus avoided in favor of non experimental
- * codecs
- */
-#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
-
-/**
- * Hardware acceleration should be used for decoding even if the codec level
- * used is unknown or higher than the maximum supported level reported by the
- * hardware driver.
- *
- * It's generally a good idea to pass this flag unless you have a specific
- * reason not to, as hardware tends to under-report supported levels.
- */
-#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0)
-
-/**
- * Hardware acceleration can output YUV pixel formats with a different chroma
- * sampling than 4:2:0 and/or other than 8 bits per component.
- */
-#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
-
-/**
- * Hardware acceleration should still be attempted for decoding when the
- * codec profile does not match the reported capabilities of the hardware.
- *
- * For example, this can be used to try to decode baseline profile H.264
- * streams in hardware - it will often succeed, because many streams marked
- * as baseline profile actually conform to constrained baseline profile.
- *
- * @warning If the stream is actually not supported then the behaviour is
- *          undefined, and may include returning entirely incorrect output
- *          while indicating success.
- */
-#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2)
-
-/**
- * @}
- */
-
-#if FF_API_AVPICTURE
-/**
- * @defgroup lavc_picture AVPicture
- *
- * Functions for working with AVPicture
- * @{
- */
-
-/**
- * Picture data structure.
- *
- * Up to four components can be stored into it, the last component is
- * alpha.
- * @deprecated use AVFrame or imgutils functions instead
- */
-typedef struct AVPicture {
-    attribute_deprecated
-    uint8_t *data[AV_NUM_DATA_POINTERS];    ///< pointers to the image data planes
-    attribute_deprecated
-    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
-} AVPicture;
-
-/**
- * @}
- */
-#endif
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    SUBTITLE_ASS,
-};
-
-#define AV_SUBTITLE_FLAG_FORCED 0x00000001
-
-typedef struct AVSubtitleRect {
-    int x;         ///< top left corner  of pict, undefined when pict is not set
-    int y;         ///< top left corner  of pict, undefined when pict is not set
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-#if FF_API_AVPICTURE
-    /**
-     * @deprecated unused
-     */
-    attribute_deprecated
-    AVPicture pict;
-#endif
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * Can be set for text/ass as well once they are rendered.
-     */
-    uint8_t *data[4];
-    int linesize[4];
-
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The presentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-
-    int flags;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/**
- * This struct describes the properties of an encoded stream.
- *
- * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must
- * be allocated with avcodec_parameters_alloc() and freed with
- * avcodec_parameters_free().
- */
-typedef struct AVCodecParameters {
-    /**
-     * General type of the encoded data.
-     */
-    enum AVMediaType codec_type;
-    /**
-     * Specific type of the encoded data (the codec used).
-     */
-    enum AVCodecID   codec_id;
-    /**
-     * Additional information about the codec (corresponds to the AVI FOURCC).
-     */
-    uint32_t         codec_tag;
-
-    /**
-     * Extra binary data needed for initializing the decoder, codec-dependent.
-     *
-     * Must be allocated with av_malloc() and will be freed by
-     * avcodec_parameters_free(). The allocated size of extradata must be at
-     * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding
-     * bytes zeroed.
-     */
-    uint8_t *extradata;
-    /**
-     * Size of the extradata content in bytes.
-     */
-    int      extradata_size;
-
-    /**
-     * - video: the pixel format, the value corresponds to enum AVPixelFormat.
-     * - audio: the sample format, the value corresponds to enum AVSampleFormat.
-     */
-    int format;
-
-    /**
-     * The average bitrate of the encoded data (in bits per second).
-     */
-    int64_t bit_rate;
-
-    /**
-     * The number of bits per sample in the codedwords.
-     *
-     * This is basically the bitrate per sample. It is mandatory for a bunch of
-     * formats to actually decode them. It's the number of bits for one sample in
-     * the actual coded bitstream.
-     *
-     * This could be for example 4 for ADPCM
-     * For PCM formats this matches bits_per_raw_sample
-     * Can be 0
-     */
-    int bits_per_coded_sample;
-
-    /**
-     * This is the number of valid bits in each output sample. If the
-     * sample format has more bits, the least significant bits are additional
-     * padding bits, which are always 0. Use right shifts to reduce the sample
-     * to its actual size. For example, audio formats with 24 bit samples will
-     * have bits_per_raw_sample set to 24, and format set to AV_SAMPLE_FMT_S32.
-     * To get the original sample use "(int32_t)sample >> 8"."
-     *
-     * For ADPCM this might be 12 or 16 or similar
-     * Can be 0
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * Codec-specific bitstream restrictions that the stream conforms to.
-     */
-    int profile;
-    int level;
-
-    /**
-     * Video only. The dimensions of the video frame in pixels.
-     */
-    int width;
-    int height;
-
-    /**
-     * Video only. The aspect ratio (width / height) which a single pixel
-     * should have when displayed.
-     *
-     * When the aspect ratio is unknown / undefined, the numerator should be
-     * set to 0 (the denominator may have any value).
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * Video only. The order of the fields in interlaced video.
-     */
-    enum AVFieldOrder                  field_order;
-
-    /**
-     * Video only. Additional colorspace characteristics.
-     */
-    enum AVColorRange                  color_range;
-    enum AVColorPrimaries              color_primaries;
-    enum AVColorTransferCharacteristic color_trc;
-    enum AVColorSpace                  color_space;
-    enum AVChromaLocation              chroma_location;
-
-    /**
-     * Video only. Number of delayed frames.
-     */
-    int video_delay;
-
-    /**
-     * Audio only. The channel layout bitmask. May be 0 if the channel layout is
-     * unknown or unspecified, otherwise the number of bits set must be equal to
-     * the channels field.
-     */
-    uint64_t channel_layout;
-    /**
-     * Audio only. The number of audio channels.
-     */
-    int      channels;
-    /**
-     * Audio only. The number of audio samples per second.
-     */
-    int      sample_rate;
-    /**
-     * Audio only. The number of bytes per coded audio frame, required by some
-     * formats.
-     *
-     * Corresponds to nBlockAlign in WAVEFORMATEX.
-     */
-    int      block_align;
-    /**
-     * Audio only. Audio frame size, if known. Required by some formats to be static.
-     */
-    int      frame_size;
-
-    /**
-     * Audio only. The amount of padding (in samples) inserted by the encoder at
-     * the beginning of the audio. I.e. this number of leading decoded samples
-     * must be discarded by the caller to get the original audio without leading
-     * padding.
-     */
-    int initial_padding;
-    /**
-     * Audio only. The amount of padding (in samples) appended by the encoder to
-     * the end of the audio. I.e. this number of decoded samples must be
-     * discarded by the caller from the end of the stream to get the original
-     * audio without any trailing padding.
-     */
-    int trailing_padding;
-    /**
-     * Audio only. Number of samples to skip after a discontinuity.
-     */
-    int seek_preroll;
-} AVCodecParameters;
-
-/**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
- */
-AVCodec *av_codec_next(const AVCodec *c);
-
-/**
- * Return the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Return the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Return the libavcodec license.
- */
-const char *avcodec_license(void);
-
-/**
- * Register the codec codec and initialize libavcodec.
- *
- * @warning either this function or avcodec_register_all() must be called
- * before any other libavcodec functions.
- *
- * @see avcodec_register_all()
- */
-void avcodec_register(AVCodec *codec);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Allocate an AVCodecContext and set its fields to default values. The
- * resulting struct should be freed with avcodec_free_context().
- *
- * @param codec if non-NULL, allocate private data and initialize defaults
- *              for the given codec. It is illegal to then call avcodec_open2()
- *              with a different codec.
- *              If NULL, then the codec-specific defaults won't be initialized,
- *              which may result in suboptimal default settings (this is
- *              important mainly for encoders, e.g. libx264).
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- */
-AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
-
-/**
- * Free the codec context and everything associated with it and write NULL to
- * the provided pointer.
- */
-void avcodec_free_context(AVCodecContext **avctx);
-
-#if FF_API_GET_CONTEXT_DEFAULTS
-/**
- * @deprecated This function should not be used, as closing and opening a codec
- * context multiple time is not supported. A new codec context should be
- * allocated for each new use.
- */
-int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
-#endif
-
-/**
- * Get the AVClass for AVCodecContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_class(void);
-
-#if FF_API_COPY_CONTEXT
-/**
- * Get the AVClass for AVFrame. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_frame_class(void);
-
-/**
- * Get the AVClass for AVSubtitleRect. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_subtitle_rect_class(void);
-
-/**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open2() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context3(NULL), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
- *
- * @deprecated The semantics of this function are ill-defined and it should not
- * be used. If you need to transfer the stream parameters from one codec context
- * to another, use an intermediate AVCodecParameters instance and the
- * avcodec_parameters_from_context() / avcodec_parameters_to_context()
- * functions.
- */
-attribute_deprecated
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-#endif
-
-/**
- * Allocate a new AVCodecParameters and set its fields to default values
- * (unknown/invalid/0). The returned struct must be freed with
- * avcodec_parameters_free().
- */
-AVCodecParameters *avcodec_parameters_alloc(void);
-
-/**
- * Free an AVCodecParameters instance and everything associated with it and
- * write NULL to the supplied pointer.
- */
-void avcodec_parameters_free(AVCodecParameters **par);
-
-/**
- * Copy the contents of src to dst. Any allocated fields in dst are freed and
- * replaced with newly allocated duplicates of the corresponding fields in src.
- *
- * @return >= 0 on success, a negative AVERROR code on failure.
- */
-int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src);
-
-/**
- * Fill the parameters struct based on the values from the supplied codec
- * context. Any allocated fields in par are freed and replaced with duplicates
- * of the corresponding fields in codec.
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int avcodec_parameters_from_context(AVCodecParameters *par,
-                                    const AVCodecContext *codec);
-
-/**
- * Fill the codec context based on the values from the supplied codec
- * parameters. Any allocated fields in codec that have a corresponding field in
- * par are freed and replaced with duplicates of the corresponding field in par.
- * Fields in codec that do not have a counterpart in par are not touched.
- *
- * @return >= 0 on success, a negative AVERROR code on failure.
- */
-int avcodec_parameters_to_context(AVCodecContext *codec,
-                                  const AVCodecParameters *par);
-
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated with avcodec_alloc_context3().
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @note Always call this function before using decoding routines (such as
- * @ref avcodec_receive_frame()).
- *
- * @code
- * avcodec_register_all();
- * av_dict_set(&opts, "b", "2.5M", 0);
- * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open2(context, codec, opts) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context to initialize.
- * @param codec The codec to open this context for. If a non-NULL codec has been
- *              previously passed to avcodec_alloc_context3() or
- *              for this context, then this parameter MUST be either NULL or
- *              equal to the previously passed codec.
- * @param options A dictionary filled with AVCodecContext and codec-private options.
- *                On return this object will be filled with options that were not found.
- *
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
- *      av_dict_set(), av_opt_find().
- */
-int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
-
-/**
- * Close a given AVCodecContext and free all the data associated with it
- * (but not the AVCodecContext itself).
- *
- * Calling this function on an AVCodecContext that hasn't been opened will free
- * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
- * codec. Subsequent calls will do nothing.
- *
- * @note Do not use this function. Use avcodec_free_context() to destroy a
- * codec context (either open or closed). Opening and closing a codec context
- * multiple times is not supported anymore -- use multiple codec contexts
- * instead.
- */
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Free all allocated data in the given subtitle struct.
- *
- * @param sub AVSubtitle to free.
- */
-void avsubtitle_free(AVSubtitle *sub);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_packet
- * @{
- */
-
-/**
- * Allocate an AVPacket and set its fields to default values.  The resulting
- * struct must be freed using av_packet_free().
- *
- * @return An AVPacket filled with default values or NULL on failure.
- *
- * @note this only allocates the AVPacket itself, not the data buffers. Those
- * must be allocated through other means such as av_new_packet.
- *
- * @see av_new_packet
- */
-AVPacket *av_packet_alloc(void);
-
-/**
- * Create a new packet that references the same data as src.
- *
- * This is a shortcut for av_packet_alloc()+av_packet_ref().
- *
- * @return newly created AVPacket on success, NULL on error.
- *
- * @see av_packet_alloc
- * @see av_packet_ref
- */
-AVPacket *av_packet_clone(const AVPacket *src);
-
-/**
- * Free the packet, if the packet is reference counted, it will be
- * unreferenced first.
- *
- * @param pkt packet to be freed. The pointer will be set to NULL.
- * @note passing NULL is a no-op.
- */
-void av_packet_free(AVPacket **pkt);
-
-/**
- * Initialize optional fields of a packet with default values.
- *
- * Note, this does not touch the data and size members, which have to be
- * initialized separately.
- *
- * @param pkt packet
- */
-void av_init_packet(AVPacket *pkt);
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * Increase packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param grow_by number of bytes by which to increase the size of the packet
- */
-int av_grow_packet(AVPacket *pkt, int grow_by);
-
-/**
- * Initialize a reference-counted packet from av_malloc()ed data.
- *
- * @param pkt packet to be initialized. This function will set the data, size,
- *        buf and destruct fields, all others are left untouched.
- * @param data Data allocated by av_malloc() to be used as packet data. If this
- *        function returns successfully, the data is owned by the underlying AVBuffer.
- *        The caller may not access the data through other means.
- * @param size size of data in bytes, without the padding. I.e. the full buffer
- *        size is assumed to be size + AV_INPUT_BUFFER_PADDING_SIZE.
- *
- * @return 0 on success, a negative AVERROR on error
- */
-int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
-
-#if FF_API_AVPACKET_OLD_API
-/**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
- *
- * @deprecated Use av_packet_ref
- */
-attribute_deprecated
-int av_dup_packet(AVPacket *pkt);
-/**
- * Copy packet, including contents
- *
- * @return 0 on success, negative AVERROR on fail
- *
- * @deprecated Use av_packet_ref
- */
-attribute_deprecated
-int av_copy_packet(AVPacket *dst, const AVPacket *src);
-
-/**
- * Copy packet side data
- *
- * @return 0 on success, negative AVERROR on fail
- *
- * @deprecated Use av_packet_copy_props
- */
-attribute_deprecated
-int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src);
-
-/**
- * Free a packet.
- *
- * @deprecated Use av_packet_unref
- *
- * @param pkt packet to free
- */
-attribute_deprecated
-void av_free_packet(AVPacket *pkt);
-#endif
-/**
- * Allocate new information of a packet.
- *
- * @param pkt packet
- * @param type side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size);
-
-/**
- * Wrap an existing array as a packet side data.
- *
- * @param pkt packet
- * @param type side information type
- * @param data the side data array. It must be allocated with the av_malloc()
- *             family of functions. The ownership of the data is transferred to
- *             pkt.
- * @param size side information size
- * @return a non-negative number on success, a negative AVERROR code on
- *         failure. On failure, the packet is unchanged and the data remains
- *         owned by the caller.
- */
-int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                            uint8_t *data, size_t size);
-
-/**
- * Shrink the already allocated side data buffer
- *
- * @param pkt packet
- * @param type side information type
- * @param size new side information size
- * @return 0 on success, < 0 on failure
- */
-int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                               int size);
-
-/**
- * Get side information from packet.
- *
- * @param pkt packet
- * @param type desired side information type
- * @param size pointer for side information size to store (optional)
- * @return pointer to data if present or NULL otherwise
- */
-uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int *size);
-
-#if FF_API_MERGE_SD_API
-attribute_deprecated
-int av_packet_merge_side_data(AVPacket *pkt);
-
-attribute_deprecated
-int av_packet_split_side_data(AVPacket *pkt);
-#endif
-
-const char *av_packet_side_data_name(enum AVPacketSideDataType type);
-
-/**
- * Pack a dictionary for use in side_data.
- *
- * @param dict The dictionary to pack.
- * @param size pointer to store the size of the returned data
- * @return pointer to data if successful, NULL otherwise
- */
-uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size);
-/**
- * Unpack a dictionary from side_data.
- *
- * @param data data from side_data
- * @param size size of the data
- * @param dict the metadata storage dictionary
- * @return 0 on success, < 0 on failure
- */
-int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict);
-
-
-/**
- * Convenience function to free all the side data stored.
- * All the other fields stay untouched.
- *
- * @param pkt packet
- */
-void av_packet_free_side_data(AVPacket *pkt);
-
-/**
- * Setup a new reference to the data described by a given packet
- *
- * If src is reference-counted, setup dst as a new reference to the
- * buffer in src. Otherwise allocate a new buffer in dst and copy the
- * data from src into it.
- *
- * All the other fields are copied from src.
- *
- * @see av_packet_unref
- *
- * @param dst Destination packet
- * @param src Source packet
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_packet_ref(AVPacket *dst, const AVPacket *src);
-
-/**
- * Wipe the packet.
- *
- * Unreference the buffer referenced by the packet and reset the
- * remaining packet fields to their default values.
- *
- * @param pkt The packet to be unreferenced.
- */
-void av_packet_unref(AVPacket *pkt);
-
-/**
- * Move every field in src to dst and reset src.
- *
- * @see av_packet_unref
- *
- * @param src Source packet, will be reset
- * @param dst Destination packet
- */
-void av_packet_move_ref(AVPacket *dst, AVPacket *src);
-
-/**
- * Copy only "properties" fields from src to dst.
- *
- * Properties for the purpose of this function are all the fields
- * beside those related to the packet data (buf, data, size)
- *
- * @param dst Destination packet
- * @param src Source packet
- *
- * @return 0 on success AVERROR on failure.
- */
-int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
-
-/**
- * Convert valid timing fields (timestamps / durations) in a packet from one
- * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be
- * ignored.
- *
- * @param pkt packet on which the conversion will be performed
- * @param tb_src source timebase, in which the timing fields in pkt are
- *               expressed
- * @param tb_dst destination timebase, to which the timing fields will be
- *               converted
- */
-void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_decoding
- * @{
- */
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-
-/**
- * The default callback for AVCodecContext.get_buffer2(). It is made public so
- * it can be called by custom get_buffer2() implementations for decoders without
- * AV_CODEC_CAP_DR1 set.
- */
-int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
-
-#if FF_API_EMU_EDGE
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- *
- * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
- * needed
- */
-attribute_deprecated
-unsigned avcodec_get_edge_width(void);
-#endif
-
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you do not use any horizontal
- * padding.
- *
- * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you also ensure that all
- * line sizes are a multiple of the respective linesize_align[i].
- *
- * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_align[AV_NUM_DATA_POINTERS]);
-
-/**
- * Converts AVChromaLocation to swscale x/y chroma position.
- *
- * The positions represent the chroma (0,0) position in a coordinates system
- * with luma (0,0) representing the origin and luma(1,1) representing 256,256
- *
- * @param xpos  horizontal chroma sample position
- * @param ypos  vertical   chroma sample position
- */
-int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos);
-
-/**
- * Converts swscale x/y chroma position to AVChromaLocation.
- *
- * The positions represent the chroma (0,0) position in a coordinates system
- * with luma (0,0) representing the origin and luma(1,1) representing 256,256
- *
- * @param xpos  horizontal chroma sample position
- * @param ypos  vertical   chroma sample position
- */
-enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
-
-/**
- * Decode the audio frame of size avpkt->size from avpkt->data into frame.
- *
- * Some decoders may support multiple frames in a single AVPacket. Such
- * decoders would then just decode the first frame and the return value would be
- * less than the packet size. In this case, avcodec_decode_audio4 has to be
- * called again with an AVPacket containing the remaining data in order to
- * decode the second frame, etc...  Even if no frames are returned, the packet
- * needs to be fed to the decoder with remaining data until it is completely
- * consumed or an error occurs.
- *
- * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between input
- * and output. This means that for some packets they will not immediately
- * produce decoded output and need to be flushed at the end of decoding to get
- * all the decoded data. Flushing is done by calling this function with packets
- * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
- * returning samples. It is safe to flush even those decoders that are not
- * marked with AV_CODEC_CAP_DELAY, then no samples will be returned.
- *
- * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE
- *          larger than the actual read bytes because some optimized bitstream
- *          readers read 32 or 64 bits at once and could read over the end.
- *
- * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
- * before packets may be fed to the decoder.
- *
- * @param      avctx the codec context
- * @param[out] frame The AVFrame in which to store decoded audio samples.
- *                   The decoder will allocate a buffer for the decoded frame by
- *                   calling the AVCodecContext.get_buffer2() callback.
- *                   When AVCodecContext.refcounted_frames is set to 1, the frame is
- *                   reference counted and the returned reference belongs to the
- *                   caller. The caller must release the frame using av_frame_unref()
- *                   when the frame is no longer needed. The caller may safely write
- *                   to the frame if av_frame_is_writable() returns 1.
- *                   When AVCodecContext.refcounted_frames is set to 0, the returned
- *                   reference belongs to the decoder and is valid only until the
- *                   next call to this function or until closing or flushing the
- *                   decoder. The caller may not write to it.
- * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
- *                           non-zero. Note that this field being set to zero
- *                           does not mean that an error has occurred. For
- *                           decoders with AV_CODEC_CAP_DELAY set, no given decode
- *                           call is guaranteed to produce a frame.
- * @param[in]  avpkt The input AVPacket containing the input buffer.
- *                   At least avpkt->data and avpkt->size should be set. Some
- *                   decoders might also require additional fields to be set.
- * @return A negative error code is returned if an error occurred during
- *         decoding, otherwise the number of bytes consumed from the input
- *         AVPacket is returned.
- *
-* @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
- */
-attribute_deprecated
-int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
-                          int *got_frame_ptr, const AVPacket *avpkt);
-
-/**
- * Decode the video frame of size avpkt->size from avpkt->data into picture.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame.
- *
- * @warning The input buffer must be AV_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer buf should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
- * before packets may be fed to the decoder.
- *
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use av_frame_alloc() to get an AVFrame. The codec will
- *             allocate memory for the actual bitmap by calling the
- *             AVCodecContext.get_buffer2() callback.
- *             When AVCodecContext.refcounted_frames is set to 1, the frame is
- *             reference counted and the returned reference belongs to the
- *             caller. The caller must release the frame using av_frame_unref()
- *             when the frame is no longer needed. The caller may safely write
- *             to the frame if av_frame_is_writable() returns 1.
- *             When AVCodecContext.refcounted_frames is set to 0, the returned
- *             reference belongs to the decoder and is valid only until the
- *             next call to this function or until closing or flushing the
- *             decoder. The caller may not write to it.
- *
- * @param[in] avpkt The input AVPacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields like
- *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
- *            fields possible.
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- *
- * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
- */
-attribute_deprecated
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         const AVPacket *avpkt);
-
-/**
- * Decode a subtitle message.
- * Return a negative value on error, otherwise return the number of bytes used.
- * If no subtitle could be decompressed, got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in *sub.
- * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expect to be negligible
- * and reusing a get_buffer written for video codecs would probably perform badly
- * due to a potentially very different allocation pattern.
- *
- * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between input
- * and output. This means that for some packets they will not immediately
- * produce decoded output and need to be flushed at the end of decoding to get
- * all the decoded data. Flushing is done by calling this function with packets
- * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
- * returning subtitles. It is safe to flush even those decoders that are not
- * marked with AV_CODEC_CAP_DELAY, then no subtitles will be returned.
- *
- * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
- * before packets may be fed to the decoder.
- *
- * @param avctx the codec context
- * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored,
- *                 must be freed with avsubtitle_free if *got_sub_ptr is set.
- * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @param[in] avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-
-/**
- * Supply raw packet data as input to a decoder.
- *
- * Internally, this call will copy relevant AVCodecContext fields, which can
- * influence decoding per-packet, and apply them when the packet is actually
- * decoded. (For example AVCodecContext.skip_frame, which might direct the
- * decoder to drop the frame contained by the packet sent with this function.)
- *
- * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE
- *          larger than the actual read bytes because some optimized bitstream
- *          readers read 32 or 64 bits at once and could read over the end.
- *
- * @warning Do not mix this API with the legacy API (like avcodec_decode_video2())
- *          on the same AVCodecContext. It will return unexpected results now
- *          or in future libavcodec versions.
- *
- * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
- *       before packets may be fed to the decoder.
- *
- * @param avctx codec context
- * @param[in] avpkt The input AVPacket. Usually, this will be a single video
- *                  frame, or several complete audio frames.
- *                  Ownership of the packet remains with the caller, and the
- *                  decoder will not write to the packet. The decoder may create
- *                  a reference to the packet data (or copy it if the packet is
- *                  not reference-counted).
- *                  Unlike with older APIs, the packet is always fully consumed,
- *                  and if it contains multiple frames (e.g. some audio codecs),
- *                  will require you to call avcodec_receive_frame() multiple
- *                  times afterwards before you can send a new packet.
- *                  It can be NULL (or an AVPacket with data set to NULL and
- *                  size set to 0); in this case, it is considered a flush
- *                  packet, which signals the end of the stream. Sending the
- *                  first flush packet will return success. Subsequent ones are
- *                  unnecessary and will return AVERROR_EOF. If the decoder
- *                  still has frames buffered, it will return them after sending
- *                  a flush packet.
- *
- * @return 0 on success, otherwise negative error code:
- *      AVERROR(EAGAIN):   input is not accepted in the current state - user
- *                         must read output with avcodec_receive_frame() (once
- *                         all output is read, the packet should be resent, and
- *                         the call will not fail with EAGAIN).
- *      AVERROR_EOF:       the decoder has been flushed, and no new packets can
- *                         be sent to it (also returned if more than 1 flush
- *                         packet is sent)
- *      AVERROR(EINVAL):   codec not opened, it is an encoder, or requires flush
- *      AVERROR(ENOMEM):   failed to add packet to internal queue, or similar
- *      other errors: legitimate decoding errors
- */
-int avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt);
-
-/**
- * Return decoded output data from a decoder.
- *
- * @param avctx codec context
- * @param frame This will be set to a reference-counted video or audio
- *              frame (depending on the decoder type) allocated by the
- *              decoder. Note that the function will always call
- *              av_frame_unref(frame) before doing anything else.
- *
- * @return
- *      0:                 success, a frame was returned
- *      AVERROR(EAGAIN):   output is not available in this state - user must try
- *                         to send new input
- *      AVERROR_EOF:       the decoder has been fully flushed, and there will be
- *                         no more output frames
- *      AVERROR(EINVAL):   codec not opened, or it is an encoder
- *      other negative values: legitimate decoding errors
- */
-int avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame);
-
-/**
- * Supply a raw video or audio frame to the encoder. Use avcodec_receive_packet()
- * to retrieve buffered output packets.
- *
- * @param avctx     codec context
- * @param[in] frame AVFrame containing the raw audio or video frame to be encoded.
- *                  Ownership of the frame remains with the caller, and the
- *                  encoder will not write to the frame. The encoder may create
- *                  a reference to the frame data (or copy it if the frame is
- *                  not reference-counted).
- *                  It can be NULL, in which case it is considered a flush
- *                  packet.  This signals the end of the stream. If the encoder
- *                  still has packets buffered, it will return them after this
- *                  call. Once flushing mode has been entered, additional flush
- *                  packets are ignored, and sending frames will return
- *                  AVERROR_EOF.
- *
- *                  For audio:
- *                  If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
- *                  can have any number of samples.
- *                  If it is not set, frame->nb_samples must be equal to
- *                  avctx->frame_size for all frames except the last.
- *                  The final frame may be smaller than avctx->frame_size.
- * @return 0 on success, otherwise negative error code:
- *      AVERROR(EAGAIN):   input is not accepted in the current state - user
- *                         must read output with avcodec_receive_packet() (once
- *                         all output is read, the packet should be resent, and
- *                         the call will not fail with EAGAIN).
- *      AVERROR_EOF:       the encoder has been flushed, and no new frames can
- *                         be sent to it
- *      AVERROR(EINVAL):   codec not opened, refcounted_frames not set, it is a
- *                         decoder, or requires flush
- *      AVERROR(ENOMEM):   failed to add packet to internal queue, or similar
- *      other errors: legitimate decoding errors
- */
-int avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame);
-
-/**
- * Read encoded data from the encoder.
- *
- * @param avctx codec context
- * @param avpkt This will be set to a reference-counted packet allocated by the
- *              encoder. Note that the function will always call
- *              av_frame_unref(frame) before doing anything else.
- * @return 0 on success, otherwise negative error code:
- *      AVERROR(EAGAIN):   output is not available in the current state - user
- *                         must try to send input
- *      AVERROR_EOF:       the encoder has been fully flushed, and there will be
- *                         no more output packets
- *      AVERROR(EINVAL):   codec not opened, or it is an encoder
- *      other errors: legitimate decoding errors
- */
-int avcodec_receive_packet(AVCodecContext *avctx, AVPacket *avpkt);
-
-
-/**
- * @defgroup lavc_parsing Frame parsing
- * @{
- */
-
-enum AVPictureStructure {
-    AV_PICTURE_STRUCTURE_UNKNOWN,      //< unknown
-    AV_PICTURE_STRUCTURE_TOP_FIELD,    //< coded as top field
-    AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
-    AV_PICTURE_STRUCTURE_FRAME,        //< coded as frame
-};
-
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-
-    int flags;
-#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
-#define PARSER_FLAG_ONCE                      0x0002
-/// Set if the parser has a valid file offset
-#define PARSER_FLAG_FETCHED_OFFSET            0x0004
-#define PARSER_FLAG_USE_CODEC_TS              0x1000
-
-    int64_t offset;      ///< byte offset from starting packet start
-    int64_t cur_frame_end[AV_PARSER_PTS_NB];
-
-    /**
-     * Set by parser to 1 for key frames and 0 for non-key frames.
-     * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-#if FF_API_CONVERGENCE_DURATION
-    /**
-     * @deprecated unused
-     */
-    attribute_deprecated
-    int64_t convergence_duration;
-#endif
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * Previous frame byte position.
-     */
-    int64_t last_pos;
-
-    /**
-     * Duration of the current frame.
-     * For audio, this is in units of 1 / AVCodecContext.sample_rate.
-     * For all other types, this is in units of AVCodecContext.time_base.
-     */
-    int duration;
-
-    enum AVFieldOrder field_order;
-
-    /**
-     * Indicate whether a picture is coded as a frame, top field or bottom field.
-     *
-     * For example, H.264 field_pic_flag equal to 0 corresponds to
-     * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
-     * equal to 1 and bottom_field_flag equal to 0 corresponds to
-     * AV_PICTURE_STRUCTURE_TOP_FIELD.
-     */
-    enum AVPictureStructure picture_structure;
-
-    /**
-     * Picture number incremented in presentation or output order.
-     * This field may be reinitialized at the first picture of a new sequence.
-     *
-     * For example, this corresponds to H.264 PicOrderCnt.
-     */
-    int output_picture_number;
-
-    /**
-     * Dimensions of the decoded video intended for presentation.
-     */
-    int width;
-    int height;
-
-    /**
-     * Dimensions of the coded video.
-     */
-    int coded_width;
-    int coded_height;
-
-    /**
-     * The format of the coded data, corresponds to enum AVPixelFormat for video
-     * and for enum AVSampleFormat for audio.
-     *
-     * Note that a decoder can have considerable freedom in how exactly it
-     * decodes the data, so the format reported here might be different from the
-     * one returned by a decoder.
-     */
-    int format;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids[5]; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    /* This callback never returns an error, a negative value means that
-     * the frame start was in a previous packet. */
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-    struct AVCodecParser *next;
-} AVCodecParser;
-
-AVCodecParser *av_parser_next(const AVCodecParser *c);
-
-void av_register_codec_parser(AVCodecParser *parser);
-AVCodecParserContext *av_parser_init(int codec_id);
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      buffer size in bytes without the padding. I.e. the full buffer
-                        size is assumed to be buf_size + AV_INPUT_BUFFER_PADDING_SIZE.
-                        To signal EOF, this should be 0 (so that the last frame
-                        can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-/**
- * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
- * @deprecated use AVBitStreamFilter
- */
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe);
-void av_parser_close(AVCodecParserContext *s);
-
-/**
- * @}
- * @}
- */
-
-/**
- * @addtogroup lavc_encoding
- * @{
- */
-
-/**
- * Find a registered encoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder(enum AVCodecID id);
-
-/**
- * Find a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
-
-/**
- * Encode a frame of audio.
- *
- * Takes input samples from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay, split, and combine input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. If avpkt->data and
- *                  avpkt->size are set, avpkt->destruct must also be set. All
- *                  other AVPacket fields will be reset by the encoder using
- *                  av_init_packet(). If avpkt->data is NULL, the encoder will
- *                  allocate it. The encoder will set avpkt->size to the size
- *                  of the output packet.
- *
- *                  If this function fails or produces no output, avpkt will be
- *                  freed using av_packet_unref().
- * @param[in] frame AVFrame containing the raw audio data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  AV_CODEC_CAP_DELAY capability set.
- *                  If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
- *                  can have any number of samples.
- *                  If it is not set, frame->nb_samples must be equal to
- *                  avctx->frame_size for all frames except the last.
- *                  The final frame may be smaller than avctx->frame_size.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- *
- * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
- */
-attribute_deprecated
-int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-/**
- * Encode a frame of video.
- *
- * Takes input raw video data from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay and reorder input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. All other AVPacket fields
- *                  will be reset by the encoder using av_init_packet(). If
- *                  avpkt->data is NULL, the encoder will allocate it.
- *                  The encoder will set avpkt->size to the size of the
- *                  output packet. The returned data (if any) belongs to the
- *                  caller, he is responsible for freeing it.
- *
- *                  If this function fails or produces no output, avpkt will be
- *                  freed using av_packet_unref().
- * @param[in] frame AVFrame containing the raw video data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  AV_CODEC_CAP_DELAY capability set.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- *
- * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
- */
-attribute_deprecated
-int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-
-/**
- * @}
- */
-
-#if FF_API_AVCODEC_RESAMPLE
-/**
- * @defgroup lavc_resample Audio resampling
- * @ingroup libavc
- * @deprecated use libswresample instead
- *
- * @{
- */
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-/**
- *  Initialize audio resampling context.
- *
- * @param output_channels  number of output channels
- * @param input_channels   number of input channels
- * @param output_rate      output sample rate
- * @param input_rate       input sample rate
- * @param sample_fmt_out   requested output sample format
- * @param sample_fmt_in    input sample format
- * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff frequency
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear           if 1 then the used FIR filter will be linearly interpolated
-                           between the 2 closest, if 0 the closest will be used
- * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occurred
- */
-attribute_deprecated
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
-                                        int output_rate, int input_rate,
-                                        enum AVSampleFormat sample_fmt_out,
-                                        enum AVSampleFormat sample_fmt_in,
-                                        int filter_length, int log2_phase_count,
-                                        int linear, double cutoff);
-
-attribute_deprecated
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-
-/**
- * Free resample context.
- *
- * @param s a non-NULL pointer to a resample context previously
- *          created with av_audio_resample_init()
- */
-attribute_deprecated
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
-                 between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-attribute_deprecated
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-attribute_deprecated
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-attribute_deprecated
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-attribute_deprecated
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * @}
- */
-#endif
-
-#if FF_API_AVPICTURE
-/**
- * @addtogroup lavc_picture
- * @{
- */
-
-/**
- * @deprecated unused
- */
-attribute_deprecated
-int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * @deprecated unused
- */
-attribute_deprecated
-void avpicture_free(AVPicture *picture);
-
-/**
- * @deprecated use av_image_fill_arrays() instead.
- */
-attribute_deprecated
-int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * @deprecated use av_image_copy_to_buffer() instead.
- */
-attribute_deprecated
-int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt,
-                     int width, int height,
-                     unsigned char *dest, int dest_size);
-
-/**
- * @deprecated use av_image_get_buffer_size() instead.
- */
-attribute_deprecated
-int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * @deprecated av_image_copy() instead.
- */
-attribute_deprecated
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * @deprecated unused
- */
-attribute_deprecated
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum AVPixelFormat pix_fmt, int top_band, int left_band);
-
-/**
- * @deprecated unused
- */
-attribute_deprecated
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-/**
- * @}
- */
-#endif
-
-/**
- * @defgroup lavc_misc Utility functions
- * @ingroup libavc
- *
- * Miscellaneous utility functions related to both encoding and decoding
- * (or neither).
- * @{
- */
-
-/**
- * @defgroup lavc_misc_pixfmt Pixel formats
- *
- * Functions for working with pixel formats.
- * @{
- */
-
-#if FF_API_GETCHROMA
-/**
- * @deprecated Use av_pix_fmt_get_chroma_sub_sample
- */
-
-attribute_deprecated
-void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
-#endif
-
-/**
- * Return a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
- */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
-
-/**
- * @deprecated see av_get_pix_fmt_loss()
- */
-int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
-                             int has_alpha);
-
-/**
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_list parameter.
- *
- *
- * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list,
-                                            enum AVPixelFormat src_pix_fmt,
-                                            int has_alpha, int *loss_ptr);
-
-/**
- * @deprecated see av_find_best_pix_fmt_of_2()
- */
-enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
-                                            enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
-
-attribute_deprecated
-enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
-                                            enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
-
-enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-/**
- * @}
- */
-
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
-
-#if FF_API_TAG_STRING
-/**
- * Put a string representing the codec tag codec_tag in buf.
- *
- * @param buf       buffer to place codec tag in
- * @param buf_size size in bytes of buf
- * @param codec_tag codec tag to assign
- * @return the length of the string that would have been generated if
- * enough space had been available, excluding the trailing null
- *
- * @deprecated see av_fourcc_make_string() and av_fourcc2str().
- */
-attribute_deprecated
-size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
-#endif
-
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-/**
- * Return a name for the specified profile, if available.
- *
- * @param codec the codec that is searched for the given profile
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- */
-const char *av_get_profile_name(const AVCodec *codec, int profile);
-
-/**
- * Return a name for the specified profile, if available.
- *
- * @param codec_id the ID of the codec to which the requested profile belongs
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- *
- * @note unlike av_get_profile_name(), which searches a list of profiles
- *       supported by a specific decoder or encoder implementation, this
- *       function searches the list of profiles from the AVCodecDescriptor
- */
-const char *avcodec_profile_name(enum AVCodecID codec_id, int profile);
-
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
-
-/**
- * Fill AVFrame audio data and linesize pointers.
- *
- * The buffer buf must be a preallocated buffer with a size big enough
- * to contain the specified samples amount. The filled AVFrame data
- * pointers will point to this buffer.
- *
- * AVFrame extended_data channel pointers are allocated if necessary for
- * planar audio.
- *
- * @param frame       the AVFrame
- *                    frame->nb_samples must be set prior to calling the
- *                    function. This function fills in frame->data,
- *                    frame->extended_data, frame->linesize[0].
- * @param nb_channels channel count
- * @param sample_fmt  sample format
- * @param buf         buffer to use for frame data
- * @param buf_size    size of buffer
- * @param align       plane size sample alignment (0 = default)
- * @return            >=0 on success, negative error code on failure
- * @todo return the size in bytes required to store the samples in
- * case of success, at the next libavutil bump
- */
-int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
-                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
-                             int buf_size, int align);
-
-/**
- * Reset the internal decoder state / flush internal buffers. Should be called
- * e.g. when seeking or when switching to a different stream.
- *
- * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
- * this invalidates the frames previously returned from the decoder. When
- * refcounted frames are used, the decoder just releases any references it might
- * keep internally, but the caller's reference remains valid.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum AVCodecID codec_id);
-
-/**
- * Return the PCM codec associated with a sample format.
- * @param be  endianness, 0 for little, 1 for big,
- *            -1 (or anything else) for native
- * @return  AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
- */
-enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
-
-/**
- * Return codec bits per sample.
- * Only return non-zero if the bits per sample is exactly correct, not an
- * approximation.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-
-/**
- * Return audio frame duration.
- *
- * @param avctx        codec context
- * @param frame_bytes  size of the frame, or 0 if unknown
- * @return             frame duration, in samples, if known. 0 if not able to
- *                     determine.
- */
-int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
-
-/**
- * This function is the same as av_get_audio_frame_duration(), except it works
- * with AVCodecParameters instead of an AVCodecContext.
- */
-int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes);
-
-#if FF_API_OLD_BSF
-typedef struct AVBitStreamFilterContext {
-    void *priv_data;
-    const struct AVBitStreamFilter *filter;
-    AVCodecParserContext *parser;
-    struct AVBitStreamFilterContext *next;
-    /**
-     * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter().
-     * Not for access by library users.
-     */
-    char *args;
-} AVBitStreamFilterContext;
-#endif
-
-typedef struct AVBSFInternal AVBSFInternal;
-
-/**
- * The bitstream filter state.
- *
- * This struct must be allocated with av_bsf_alloc() and freed with
- * av_bsf_free().
- *
- * The fields in the struct will only be changed (by the caller or by the
- * filter) as described in their documentation, and are to be considered
- * immutable otherwise.
- */
-typedef struct AVBSFContext {
-    /**
-     * A class for logging and AVOptions
-     */
-    const AVClass *av_class;
-
-    /**
-     * The bitstream filter this context is an instance of.
-     */
-    const struct AVBitStreamFilter *filter;
-
-    /**
-     * Opaque libavcodec internal data. Must not be touched by the caller in any
-     * way.
-     */
-    AVBSFInternal *internal;
-
-    /**
-     * Opaque filter-specific private data. If filter->priv_class is non-NULL,
-     * this is an AVOptions-enabled struct.
-     */
-    void *priv_data;
-
-    /**
-     * Parameters of the input stream. This field is allocated in
-     * av_bsf_alloc(), it needs to be filled by the caller before
-     * av_bsf_init().
-     */
-    AVCodecParameters *par_in;
-
-    /**
-     * Parameters of the output stream. This field is allocated in
-     * av_bsf_alloc(), it is set by the filter in av_bsf_init().
-     */
-    AVCodecParameters *par_out;
-
-    /**
-     * The timebase used for the timestamps of the input packets. Set by the
-     * caller before av_bsf_init().
-     */
-    AVRational time_base_in;
-
-    /**
-     * The timebase used for the timestamps of the output packets. Set by the
-     * filter in av_bsf_init().
-     */
-    AVRational time_base_out;
-} AVBSFContext;
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-
-    /**
-     * A list of codec ids supported by the filter, terminated by
-     * AV_CODEC_ID_NONE.
-     * May be NULL, in that case the bitstream filter works with any codec id.
-     */
-    const enum AVCodecID *codec_ids;
-
-    /**
-     * A class for the private data, used to declare bitstream filter private
-     * AVOptions. This field is NULL for bitstream filters that do not declare
-     * any options.
-     *
-     * If this field is non-NULL, the first member of the filter private data
-     * must be a pointer to AVClass, which will be set by libavcodec generic
-     * code to this class.
-     */
-    const AVClass *priv_class;
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavcodec and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    int priv_data_size;
-    int (*init)(AVBSFContext *ctx);
-    int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
-    void (*close)(AVBSFContext *ctx);
-} AVBitStreamFilter;
-
-#if FF_API_OLD_BSF
-/**
- * Register a bitstream filter.
- *
- * The filter will be accessible to the application code through
- * av_bitstream_filter_next() or can be directly initialized with
- * av_bitstream_filter_init().
- *
- * @see avcodec_register_all()
- */
-attribute_deprecated
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
-
-/**
- * Create and initialize a bitstream filter context given a bitstream
- * filter name.
- *
- * The returned context must be freed with av_bitstream_filter_close().
- *
- * @param name    the name of the bitstream filter
- * @return a bitstream filter context if a matching filter was found
- * and successfully initialized, NULL otherwise
- */
-attribute_deprecated
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-
-/**
- * Filter bitstream.
- *
- * This function filters the buffer buf with size buf_size, and places the
- * filtered buffer in the buffer pointed to by poutbuf.
- *
- * The output buffer must be freed by the caller.
- *
- * @param bsfc            bitstream filter context created by av_bitstream_filter_init()
- * @param avctx           AVCodecContext accessed by the filter, may be NULL.
- *                        If specified, this must point to the encoder context of the
- *                        output stream the packet is sent to.
- * @param args            arguments which specify the filter configuration, may be NULL
- * @param poutbuf         pointer which is updated to point to the filtered buffer
- * @param poutbuf_size    pointer which is updated to the filtered buffer size in bytes
- * @param buf             buffer containing the data to filter
- * @param buf_size        size in bytes of buf
- * @param keyframe        set to non-zero if the buffer to filter corresponds to a key-frame packet data
- * @return >= 0 in case of success, or a negative error code in case of failure
- *
- * If the return value is positive, an output buffer is allocated and
- * is available in *poutbuf, and is distinct from the input buffer.
- *
- * If the return value is 0, the output buffer is not allocated and
- * should be considered identical to the input buffer, or in case
- * *poutbuf was set it points to the input buffer (not necessarily to
- * its starting address). A special case is if *poutbuf was set to NULL and
- * *poutbuf_size was set to 0, which indicates the packet should be dropped.
- */
-attribute_deprecated
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe);
-
-/**
- * Release bitstream filter context.
- *
- * @param bsf the bitstream filter context created with
- * av_bitstream_filter_init(), can be NULL
- */
-attribute_deprecated
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-/**
- * If f is NULL, return the first registered bitstream filter,
- * if f is non-NULL, return the next registered bitstream filter
- * after f, or NULL if f is the last one.
- *
- * This function can be used to iterate over all registered bitstream
- * filters.
- */
-attribute_deprecated
-AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
-#endif
-
-/**
- * @return a bitstream filter with the specified name or NULL if no such
- *         bitstream filter exists.
- */
-const AVBitStreamFilter *av_bsf_get_by_name(const char *name);
-
-/**
- * Iterate over all registered bitstream filters.
- *
- * @param opaque a pointer where libavcodec will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered bitstream filter or NULL when the iteration is
- *         finished
- */
-const AVBitStreamFilter *av_bsf_next(void **opaque);
-
-/**
- * Allocate a context for a given bitstream filter. The caller must fill in the
- * context parameters as described in the documentation and then call
- * av_bsf_init() before sending any data to the filter.
- *
- * @param filter the filter for which to allocate an instance.
- * @param ctx a pointer into which the pointer to the newly-allocated context
- *            will be written. It must be freed with av_bsf_free() after the
- *            filtering is done.
- *
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **ctx);
-
-/**
- * Prepare the filter for use, after all the parameters and options have been
- * set.
- */
-int av_bsf_init(AVBSFContext *ctx);
-
-/**
- * Submit a packet for filtering.
- *
- * After sending each packet, the filter must be completely drained by calling
- * av_bsf_receive_packet() repeatedly until it returns AVERROR(EAGAIN) or
- * AVERROR_EOF.
- *
- * @param pkt the packet to filter. The bitstream filter will take ownership of
- * the packet and reset the contents of pkt. pkt is not touched if an error occurs.
- * This parameter may be NULL, which signals the end of the stream (i.e. no more
- * packets will be sent). That will cause the filter to output any packets it
- * may have buffered internally.
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
-
-/**
- * Retrieve a filtered packet.
- *
- * @param[out] pkt this struct will be filled with the contents of the filtered
- *                 packet. It is owned by the caller and must be freed using
- *                 av_packet_unref() when it is no longer needed.
- *                 This parameter should be "clean" (i.e. freshly allocated
- *                 with av_packet_alloc() or unreffed with av_packet_unref())
- *                 when this function is called. If this function returns
- *                 successfully, the contents of pkt will be completely
- *                 overwritten by the returned data. On failure, pkt is not
- *                 touched.
- *
- * @return 0 on success. AVERROR(EAGAIN) if more packets need to be sent to the
- * filter (using av_bsf_send_packet()) to get more output. AVERROR_EOF if there
- * will be no further output from the filter. Another negative AVERROR value if
- * an error occurs.
- *
- * @note one input packet may result in several output packets, so after sending
- * a packet with av_bsf_send_packet(), this function needs to be called
- * repeatedly until it stops returning 0. It is also possible for a filter to
- * output fewer packets than were sent to it, so this function may return
- * AVERROR(EAGAIN) immediately after a successful av_bsf_send_packet() call.
- */
-int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
-
-/**
- * Free a bitstream filter context and everything associated with it; write NULL
- * into the supplied pointer.
- */
-void av_bsf_free(AVBSFContext **ctx);
-
-/**
- * Get the AVClass for AVBSFContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *av_bsf_get_class(void);
-
-/**
- * Structure for chain/list of bitstream filters.
- * Empty list can be allocated by av_bsf_list_alloc().
- */
-typedef struct AVBSFList AVBSFList;
-
-/**
- * Allocate empty list of bitstream filters.
- * The list must be later freed by av_bsf_list_free()
- * or finalized by av_bsf_list_finalize().
- *
- * @return Pointer to @ref AVBSFList on success, NULL in case of failure
- */
-AVBSFList *av_bsf_list_alloc(void);
-
-/**
- * Free list of bitstream filters.
- *
- * @param lst Pointer to pointer returned by av_bsf_list_alloc()
- */
-void av_bsf_list_free(AVBSFList **lst);
-
-/**
- * Append bitstream filter to the list of bitstream filters.
- *
- * @param lst List to append to
- * @param bsf Filter context to be appended
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_append(AVBSFList *lst, AVBSFContext *bsf);
-
-/**
- * Construct new bitstream filter context given it's name and options
- * and append it to the list of bitstream filters.
- *
- * @param lst      List to append to
- * @param bsf_name Name of the bitstream filter
- * @param options  Options for the bitstream filter, can be set to NULL
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_append2(AVBSFList *lst, const char * bsf_name, AVDictionary **options);
-/**
- * Finalize list of bitstream filters.
- *
- * This function will transform @ref AVBSFList to single @ref AVBSFContext,
- * so the whole chain of bitstream filters can be treated as single filter
- * freshly allocated by av_bsf_alloc().
- * If the call is successful, @ref AVBSFList structure is freed and lst
- * will be set to NULL. In case of failure, caller is responsible for
- * freeing the structure by av_bsf_list_free()
- *
- * @param      lst Filter list structure to be transformed
- * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext structure
- *                 representing the chain of bitstream filters
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_finalize(AVBSFList **lst, AVBSFContext **bsf);
-
-/**
- * Parse string describing list of bitstream filters and create single
- * @ref AVBSFContext describing the whole chain of bitstream filters.
- * Resulting @ref AVBSFContext can be treated as any other @ref AVBSFContext freshly
- * allocated by av_bsf_alloc().
- *
- * @param      str String describing chain of bitstream filters in format
- *                 `bsf1[=opt1=val1:opt2=val2][,bsf2]`
- * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext structure
- *                 representing the chain of bitstream filters
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_parse_str(const char *str, AVBSFContext **bsf);
-
-/**
- * Get null/pass-through bitstream filter.
- *
- * @param[out] bsf Pointer to be set to new instance of pass-through bitstream filter
- *
- * @return
- */
-int av_bsf_get_null_filter(AVBSFContext **bsf);
-
-/* memory */
-
-/**
- * Same behaviour av_fast_malloc but the buffer has additional
- * AV_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
- *
- * In addition the whole buffer will initially and after resizes
- * be 0-initialized so that no uninitialized data will ever appear.
- */
-void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Same behaviour av_fast_padded_malloc except that buffer will always
- * be 0-initialized after call.
- */
-void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Encode extradata length to a buffer. Used by xiph codecs.
- *
- * @param s buffer to write to; must be at least (v/255+1) bytes long
- * @param v size of extradata in bytes
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-#if FF_API_MISSING_SAMPLE
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbiage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- * @deprecated Use avpriv_report_missing_feature() instead.
- */
-attribute_deprecated
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- * @deprecated Use avpriv_request_sample() instead.
- */
-attribute_deprecated
-void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
-#endif /* FF_API_MISSING_SAMPLE */
-
-/**
- * Register the hardware accelerator hwaccel.
- */
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- */
-AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel);
-
-
-/**
- * Lock operation used by lockmgr
- */
-enum AVLockOp {
-  AV_LOCK_CREATE,  ///< Create a mutex
-  AV_LOCK_OBTAIN,  ///< Lock the mutex
-  AV_LOCK_RELEASE, ///< Unlock the mutex
-  AV_LOCK_DESTROY, ///< Free mutex resources
-};
-
-/**
- * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. The "mutex" argument to the function points
- * to a (void *) where the lockmgr should store/get a pointer to a user
- * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the
- * value left by the last call for all other ops. If the lock manager is
- * unable to perform the op then it should leave the mutex in the same
- * state as when it was called and return a non-zero value. However,
- * when called with AV_LOCK_DESTROY the mutex will always be assumed to
- * have been successfully destroyed. If av_lockmgr_register succeeds
- * it will return a non-negative value, if it fails it will return a
- * negative value and destroy all mutex and unregister all callbacks.
- * av_lockmgr_register is not thread-safe, it must be called from a
- * single thread before any calls which make use of locking are used.
- *
- * @param cb User defined callback. av_lockmgr_register invokes calls
- *           to this callback and the previously registered callback.
- *           The callback will be used to create more than one mutex
- *           each of which must be backed by its own underlying locking
- *           mechanism (i.e. do not use a single static object to
- *           implement your lock manager). If cb is set to NULL the
- *           lockmgr will be unregistered.
- */
-int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
-
-/**
- * Get the type of the given codec.
- */
-enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
-
-/**
- * Get the name of a codec.
- * @return  a static string identifying the codec; never NULL
- */
-const char *avcodec_get_name(enum AVCodecID id);
-
-/**
- * @return a positive value if s is open (i.e. avcodec_open2() was called on it
- * with no corresponding avcodec_close()), 0 otherwise.
- */
-int avcodec_is_open(AVCodecContext *s);
-
-/**
- * @return a non-zero number if codec is an encoder, zero otherwise
- */
-int av_codec_is_encoder(const AVCodec *codec);
-
-/**
- * @return a non-zero number if codec is a decoder, zero otherwise
- */
-int av_codec_is_decoder(const AVCodec *codec);
-
-/**
- * @return descriptor for given codec ID or NULL if no descriptor exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
-
-/**
- * Iterate over all codec descriptors known to libavcodec.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
-
-/**
- * @return codec descriptor with the given name or NULL if no such descriptor
- *         exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
-
-/**
- * Allocate a CPB properties structure and initialize its fields to default
- * values.
- *
- * @param size if non-NULL, the size of the allocated struct will be written
- *             here. This is useful for embedding it in side data.
- *
- * @return the newly allocated struct or NULL on failure
- */
-AVCPBProperties *av_cpb_properties_alloc(size_t *size);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVCODEC_H */
diff --git a/dependencies2013/win32/include/libavcodec/avdct.h b/dependencies2013/win32/include/libavcodec/avdct.h
deleted file mode 100644
index 272422e4..00000000
--- a/dependencies2013/win32/include/libavcodec/avdct.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVDCT_H
-#define AVCODEC_AVDCT_H
-
-#include "libavutil/opt.h"
-
-/**
- * AVDCT context.
- * @note function pointers can be NULL if the specific features have been
- *       disabled at build time.
- */
-typedef struct AVDCT {
-    const AVClass *av_class;
-
-    void (*idct)(int16_t *block /* align 16 */);
-
-    /**
-     * IDCT input permutation.
-     * Several optimized IDCTs need a permutated input (relative to the
-     * normal order of the reference IDCT).
-     * This permutation must be performed before the idct_put/add.
-     * Note, normally this can be merged with the zigzag/alternate scan<br>
-     * An example to avoid confusion:
-     * - (->decode coeffs -> zigzag reorder -> dequant -> reference IDCT -> ...)
-     * - (x -> reference DCT -> reference IDCT -> x)
-     * - (x -> reference DCT -> simple_mmx_perm = idct_permutation
-     *    -> simple_idct_mmx -> x)
-     * - (-> decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant
-     *    -> simple_idct_mmx -> ...)
-     */
-    uint8_t idct_permutation[64];
-
-    void (*fdct)(int16_t *block /* align 16 */);
-
-
-    /**
-     * DCT algorithm.
-     * must use AVOptions to set this field.
-     */
-    int dct_algo;
-
-    /**
-     * IDCT algorithm.
-     * must use AVOptions to set this field.
-     */
-    int idct_algo;
-
-    void (*get_pixels)(int16_t *block /* align 16 */,
-                       const uint8_t *pixels /* align 8 */,
-                       ptrdiff_t line_size);
-
-    int bits_per_sample;
-} AVDCT;
-
-/**
- * Allocates a AVDCT context.
- * This needs to be initialized with avcodec_dct_init() after optionally
- * configuring it with AVOptions.
- *
- * To free it use av_free()
- */
-AVDCT *avcodec_dct_alloc(void);
-int avcodec_dct_init(AVDCT *);
-
-const AVClass *avcodec_dct_get_class(void);
-
-#endif /* AVCODEC_AVDCT_H */
diff --git a/dependencies2013/win32/include/libavcodec/avfft.h b/dependencies2013/win32/include/libavcodec/avfft.h
deleted file mode 100644
index 0c0f9b8d..00000000
--- a/dependencies2013/win32/include/libavcodec/avfft.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVFFT_H
-#define AVCODEC_AVFFT_H
-
-/**
- * @file
- * @ingroup lavc_fft
- * FFT functions
- */
-
-/**
- * @defgroup lavc_fft FFT functions
- * @ingroup lavc_misc
- *
- * @{
- */
-
-typedef float FFTSample;
-
-typedef struct FFTComplex {
-    FFTSample re, im;
-} FFTComplex;
-
-typedef struct FFTContext FFTContext;
-
-/**
- * Set up a complex FFT.
- * @param nbits           log2 of the length of the input array
- * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
- */
-FFTContext *av_fft_init(int nbits, int inverse);
-
-/**
- * Do the permutation needed BEFORE calling ff_fft_calc().
- */
-void av_fft_permute(FFTContext *s, FFTComplex *z);
-
-/**
- * Do a complex FFT with the parameters defined in av_fft_init(). The
- * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
- */
-void av_fft_calc(FFTContext *s, FFTComplex *z);
-
-void av_fft_end(FFTContext *s);
-
-FFTContext *av_mdct_init(int nbits, int inverse, double scale);
-void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_end(FFTContext *s);
-
-/* Real Discrete Fourier Transform */
-
-enum RDFTransformType {
-    DFT_R2C,
-    IDFT_C2R,
-    IDFT_R2C,
-    DFT_C2R,
-};
-
-typedef struct RDFTContext RDFTContext;
-
-/**
- * Set up a real FFT.
- * @param nbits           log2 of the length of the input array
- * @param trans           the type of transform
- */
-RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
-void av_rdft_calc(RDFTContext *s, FFTSample *data);
-void av_rdft_end(RDFTContext *s);
-
-/* Discrete Cosine Transform */
-
-typedef struct DCTContext DCTContext;
-
-enum DCTTransformType {
-    DCT_II = 0,
-    DCT_III,
-    DCT_I,
-    DST_I,
-};
-
-/**
- * Set up DCT.
- *
- * @param nbits           size of the input array:
- *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
- *                        (1 << nbits) + 1 for DCT-I
- * @param type            the type of transform
- *
- * @note the first element of the input of DST-I is ignored
- */
-DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
-void av_dct_calc(DCTContext *s, FFTSample *data);
-void av_dct_end (DCTContext *s);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVFFT_H */
diff --git a/dependencies2013/win32/include/libavcodec/d3d11va.h b/dependencies2013/win32/include/libavcodec/d3d11va.h
deleted file mode 100644
index 6816b6c1..00000000
--- a/dependencies2013/win32/include/libavcodec/d3d11va.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Direct3D11 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- * copyright (c) 2015 Steve Lhomme
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_D3D11VA_H
-#define AVCODEC_D3D11VA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_d3d11va
- * Public libavcodec D3D11VA header.
- */
-
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0602
-#endif
-
-#include <stdint.h>
-#include <d3d11.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_d3d11va Direct3D11
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for Direct3D11 and old UVD/UVD+ ATI video cards
-#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO    2 ///< Work around for Direct3D11 and old Intel GPUs with ClearVideo interface
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the Direct3D11 FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- *
- * Use av_d3d11va_alloc_context() exclusively to allocate an AVD3D11VAContext.
- */
-typedef struct AVD3D11VAContext {
-    /**
-     * D3D11 decoder object
-     */
-    ID3D11VideoDecoder *decoder;
-
-    /**
-      * D3D11 VideoContext
-      */
-    ID3D11VideoContext *video_context;
-
-    /**
-     * D3D11 configuration used to create the decoder
-     */
-    D3D11_VIDEO_DECODER_CONFIG *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    ID3D11VideoDecoderOutputView **surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the FFmpeg AVHWAccel implementation
-     */
-    unsigned report_id;
-
-    /**
-      * Mutex to access video_context
-      */
-    HANDLE  context_mutex;
-} AVD3D11VAContext;
-
-/**
- * Allocate an AVD3D11VAContext.
- *
- * @return Newly-allocated AVD3D11VAContext or NULL on failure.
- */
-AVD3D11VAContext *av_d3d11va_alloc_context(void);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_D3D11VA_H */
diff --git a/dependencies2013/win32/include/libavcodec/dirac.h b/dependencies2013/win32/include/libavcodec/dirac.h
deleted file mode 100644
index e6d9d346..00000000
--- a/dependencies2013/win32/include/libavcodec/dirac.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2007 Marco Gerards <marco@gnu.org>
- * Copyright (C) 2009 David Conrad
- * Copyright (C) 2011 Jordi Ortiz
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DIRAC_H
-#define AVCODEC_DIRAC_H
-
-/**
- * @file
- * Interface to Dirac Decoder/Encoder
- * @author Marco Gerards <marco@gnu.org>
- * @author David Conrad
- * @author Jordi Ortiz
- */
-
-#include "avcodec.h"
-
-/**
- * The spec limits the number of wavelet decompositions to 4 for both
- * level 1 (VC-2) and 128 (long-gop default).
- * 5 decompositions is the maximum before >16-bit buffers are needed.
- * Schroedinger allows this for DD 9,7 and 13,7 wavelets only, limiting
- * the others to 4 decompositions (or 3 for the fidelity filter).
- *
- * We use this instead of MAX_DECOMPOSITIONS to save some memory.
- */
-#define MAX_DWT_LEVELS 5
-
-/**
- * Parse code values:
- *
- * Dirac Specification ->
- * 9.6.1  Table 9.1
- *
- * VC-2 Specification  ->
- * 10.4.1 Table 10.1
- */
-
-enum DiracParseCodes {
-    DIRAC_PCODE_SEQ_HEADER      = 0x00,
-    DIRAC_PCODE_END_SEQ         = 0x10,
-    DIRAC_PCODE_AUX             = 0x20,
-    DIRAC_PCODE_PAD             = 0x30,
-    DIRAC_PCODE_PICTURE_CODED   = 0x08,
-    DIRAC_PCODE_PICTURE_RAW     = 0x48,
-    DIRAC_PCODE_PICTURE_LOW_DEL = 0xC8,
-    DIRAC_PCODE_PICTURE_HQ      = 0xE8,
-    DIRAC_PCODE_INTER_NOREF_CO1 = 0x0A,
-    DIRAC_PCODE_INTER_NOREF_CO2 = 0x09,
-    DIRAC_PCODE_INTER_REF_CO1   = 0x0D,
-    DIRAC_PCODE_INTER_REF_CO2   = 0x0E,
-    DIRAC_PCODE_INTRA_REF_CO    = 0x0C,
-    DIRAC_PCODE_INTRA_REF_RAW   = 0x4C,
-    DIRAC_PCODE_INTRA_REF_PICT  = 0xCC,
-    DIRAC_PCODE_MAGIC           = 0x42424344,
-};
-
-typedef struct DiracVersionInfo {
-    int major;
-    int minor;
-} DiracVersionInfo;
-
-typedef struct AVDiracSeqHeader {
-    unsigned width;
-    unsigned height;
-    uint8_t chroma_format;          ///< 0: 444  1: 422  2: 420
-
-    uint8_t interlaced;
-    uint8_t top_field_first;
-
-    uint8_t frame_rate_index;       ///< index into dirac_frame_rate[]
-    uint8_t aspect_ratio_index;     ///< index into dirac_aspect_ratio[]
-
-    uint16_t clean_width;
-    uint16_t clean_height;
-    uint16_t clean_left_offset;
-    uint16_t clean_right_offset;
-
-    uint8_t pixel_range_index;      ///< index into dirac_pixel_range_presets[]
-    uint8_t color_spec_index;       ///< index into dirac_color_spec_presets[]
-
-    int profile;
-    int level;
-
-    AVRational framerate;
-    AVRational sample_aspect_ratio;
-
-    enum AVPixelFormat pix_fmt;
-    enum AVColorRange color_range;
-    enum AVColorPrimaries color_primaries;
-    enum AVColorTransferCharacteristic color_trc;
-    enum AVColorSpace colorspace;
-
-    DiracVersionInfo version;
-    int bit_depth;
-} AVDiracSeqHeader;
-
-/**
- * Parse a Dirac sequence header.
- *
- * @param dsh this function will allocate and fill an AVDiracSeqHeader struct
- *            and write it into this pointer. The caller must free it with
- *            av_free().
- * @param buf the data buffer
- * @param buf_size the size of the data buffer in bytes
- * @param log_ctx if non-NULL, this function will log errors here
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_dirac_parse_sequence_header(AVDiracSeqHeader **dsh,
-                                   const uint8_t *buf, size_t buf_size,
-                                   void *log_ctx);
-
-#endif /* AVCODEC_DIRAC_H */
diff --git a/dependencies2013/win32/include/libavcodec/dv_profile.h b/dependencies2013/win32/include/libavcodec/dv_profile.h
deleted file mode 100644
index 9380a66f..00000000
--- a/dependencies2013/win32/include/libavcodec/dv_profile.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DV_PROFILE_H
-#define AVCODEC_DV_PROFILE_H
-
-#include <stdint.h>
-
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-#include "avcodec.h"
-
-/* minimum number of bytes to read from a DV stream in order to
- * determine the profile */
-#define DV_PROFILE_BYTES (6 * 80) /* 6 DIF blocks */
-
-
-/*
- * AVDVProfile is used to express the differences between various
- * DV flavors. For now it's primarily used for differentiating
- * 525/60 and 625/50, but the plans are to use it for various
- * DV specs as well (e.g. SMPTE314M vs. IEC 61834).
- */
-typedef struct AVDVProfile {
-    int              dsf;                   /* value of the dsf in the DV header */
-    int              video_stype;           /* stype for VAUX source pack */
-    int              frame_size;            /* total size of one frame in bytes */
-    int              difseg_size;           /* number of DIF segments per DIF channel */
-    int              n_difchan;             /* number of DIF channels per frame */
-    AVRational       time_base;             /* 1/framerate */
-    int              ltc_divisor;           /* FPS from the LTS standpoint */
-    int              height;                /* picture height in pixels */
-    int              width;                 /* picture width in pixels */
-    AVRational       sar[2];                /* sample aspect ratios for 4:3 and 16:9 */
-    enum AVPixelFormat pix_fmt;             /* picture pixel format */
-    int              bpm;                   /* blocks per macroblock */
-    const uint8_t   *block_sizes;           /* AC block sizes, in bits */
-    int              audio_stride;          /* size of audio_shuffle table */
-    int              audio_min_samples[3];  /* min amount of audio samples */
-                                            /* for 48kHz, 44.1kHz and 32kHz */
-    int              audio_samples_dist[5]; /* how many samples are supposed to be */
-                                            /* in each frame in a 5 frames window */
-    const uint8_t  (*audio_shuffle)[9];     /* PCM shuffling table */
-} AVDVProfile;
-
-/**
- * Get a DV profile for the provided compressed frame.
- *
- * @param sys the profile used for the previous frame, may be NULL
- * @param frame the compressed data buffer
- * @param buf_size size of the buffer in bytes
- * @return the DV profile for the supplied data or NULL on failure
- */
-const AVDVProfile *av_dv_frame_profile(const AVDVProfile *sys,
-                                       const uint8_t *frame, unsigned buf_size);
-
-/**
- * Get a DV profile for the provided stream parameters.
- */
-const AVDVProfile *av_dv_codec_profile(int width, int height, enum AVPixelFormat pix_fmt);
-
-/**
- * Get a DV profile for the provided stream parameters.
- * The frame rate is used as a best-effort parameter.
- */
-const AVDVProfile *av_dv_codec_profile2(int width, int height, enum AVPixelFormat pix_fmt, AVRational frame_rate);
-
-#endif /* AVCODEC_DV_PROFILE_H */
diff --git a/dependencies2013/win32/include/libavcodec/dxva2.h b/dependencies2013/win32/include/libavcodec/dxva2.h
deleted file mode 100644
index 22c93992..00000000
--- a/dependencies2013/win32/include/libavcodec/dxva2.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * DXVA2 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DXVA2_H
-#define AVCODEC_DXVA2_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_dxva2
- * Public libavcodec DXVA2 header.
- */
-
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0602
-#endif
-
-#include <stdint.h>
-#include <d3d9.h>
-#include <dxva2api.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
-#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO    2 ///< Work around for DXVA2 and old Intel GPUs with ClearVideo interface
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the DXVA2 FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct dxva_context {
-    /**
-     * DXVA2 decoder object
-     */
-    IDirectXVideoDecoder *decoder;
-
-    /**
-     * DXVA2 configuration used to create the decoder
-     */
-    const DXVA2_ConfigPictureDecode *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    LPDIRECT3DSURFACE9 *surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the FFmpeg AVHWAccel implementation
-     */
-    unsigned report_id;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_DXVA2_H */
diff --git a/dependencies2013/win32/include/libavcodec/jni.h b/dependencies2013/win32/include/libavcodec/jni.h
deleted file mode 100644
index dd99e926..00000000
--- a/dependencies2013/win32/include/libavcodec/jni.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * JNI public API functions
- *
- * Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron stupeflix.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_JNI_H
-#define AVCODEC_JNI_H
-
-/*
- * Manually set a Java virtual machine which will be used to retrieve the JNI
- * environment. Once a Java VM is set it cannot be changed afterwards, meaning
- * you can call multiple times av_jni_set_java_vm with the same Java VM pointer
- * however it will error out if you try to set a different Java VM.
- *
- * @param vm Java virtual machine
- * @param log_ctx context used for logging, can be NULL
- * @return 0 on success, < 0 otherwise
- */
-int av_jni_set_java_vm(void *vm, void *log_ctx);
-
-/*
- * Get the Java virtual machine which has been set with av_jni_set_java_vm.
- *
- * @param vm Java virtual machine
- * @return a pointer to the Java virtual machine
- */
-void *av_jni_get_java_vm(void *log_ctx);
-
-#endif /* AVCODEC_JNI_H */
diff --git a/dependencies2013/win32/include/libavcodec/mediacodec.h b/dependencies2013/win32/include/libavcodec/mediacodec.h
deleted file mode 100644
index 5606d24a..00000000
--- a/dependencies2013/win32/include/libavcodec/mediacodec.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Android MediaCodec public API
- *
- * Copyright (c) 2016 Matthieu Bouron <matthieu.bouron stupeflix.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_MEDIACODEC_H
-#define AVCODEC_MEDIACODEC_H
-
-#include "libavcodec/avcodec.h"
-
-/**
- * This structure holds a reference to a android/view/Surface object that will
- * be used as output by the decoder.
- *
- */
-typedef struct AVMediaCodecContext {
-
-    /**
-     * android/view/Surface object reference.
-     */
-    void *surface;
-
-} AVMediaCodecContext;
-
-/**
- * Allocate and initialize a MediaCodec context.
- *
- * When decoding with MediaCodec is finished, the caller must free the
- * MediaCodec context with av_mediacodec_default_free.
- *
- * @return a pointer to a newly allocated AVMediaCodecContext on success, NULL otherwise
- */
-AVMediaCodecContext *av_mediacodec_alloc_context(void);
-
-/**
- * Convenience function that sets up the MediaCodec context.
- *
- * @param avctx codec context
- * @param ctx MediaCodec context to initialize
- * @param surface reference to an android/view/Surface
- * @return 0 on success, < 0 otherwise
- */
-int av_mediacodec_default_init(AVCodecContext *avctx, AVMediaCodecContext *ctx, void *surface);
-
-/**
- * This function must be called to free the MediaCodec context initialized with
- * av_mediacodec_default_init().
- *
- * @param avctx codec context
- */
-void av_mediacodec_default_free(AVCodecContext *avctx);
-
-/**
- * Opaque structure representing a MediaCodec buffer to render.
- */
-typedef struct MediaCodecBuffer AVMediaCodecBuffer;
-
-/**
- * Release a MediaCodec buffer and render it to the surface that is associated
- * with the decoder. This function should only be called once on a given
- * buffer, once released the underlying buffer returns to the codec, thus
- * subsequent calls to this function will have no effect.
- *
- * @param buffer the buffer to render
- * @param render 1 to release and render the buffer to the surface or 0 to
- * discard the buffer
- * @return 0 on success, < 0 otherwise
- */
-int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render);
-
-#endif /* AVCODEC_MEDIACODEC_H */
diff --git a/dependencies2013/win32/include/libavcodec/qsv.h b/dependencies2013/win32/include/libavcodec/qsv.h
deleted file mode 100644
index b77158ec..00000000
--- a/dependencies2013/win32/include/libavcodec/qsv.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Intel MediaSDK QSV public API
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_QSV_H
-#define AVCODEC_QSV_H
-
-#include <mfx/mfxvideo.h>
-
-#include "libavutil/buffer.h"
-
-/**
- * This struct is used for communicating QSV parameters between libavcodec and
- * the caller. It is managed by the caller and must be assigned to
- * AVCodecContext.hwaccel_context.
- * - decoding: hwaccel_context must be set on return from the get_format()
- *             callback
- * - encoding: hwaccel_context must be set before avcodec_open2()
- */
-typedef struct AVQSVContext {
-    /**
-     * If non-NULL, the session to use for encoding or decoding.
-     * Otherwise, libavcodec will try to create an internal session.
-     */
-    mfxSession session;
-
-    /**
-     * The IO pattern to use.
-     */
-    int iopattern;
-
-    /**
-     * Extra buffers to pass to encoder or decoder initialization.
-     */
-    mfxExtBuffer **ext_buffers;
-    int         nb_ext_buffers;
-
-    /**
-     * Encoding only. If this field is set to non-zero by the caller, libavcodec
-     * will create an mfxExtOpaqueSurfaceAlloc extended buffer and pass it to
-     * the encoder initialization. This only makes sense if iopattern is also
-     * set to MFX_IOPATTERN_IN_OPAQUE_MEMORY.
-     *
-     * The number of allocated opaque surfaces will be the sum of the number
-     * required by the encoder and the user-provided value nb_opaque_surfaces.
-     * The array of the opaque surfaces will be exported to the caller through
-     * the opaque_surfaces field.
-     */
-    int opaque_alloc;
-
-    /**
-     * Encoding only, and only if opaque_alloc is set to non-zero. Before
-     * calling avcodec_open2(), the caller should set this field to the number
-     * of extra opaque surfaces to allocate beyond what is required by the
-     * encoder.
-     *
-     * On return from avcodec_open2(), this field will be set by libavcodec to
-     * the total number of allocated opaque surfaces.
-     */
-    int nb_opaque_surfaces;
-
-    /**
-     * Encoding only, and only if opaque_alloc is set to non-zero. On return
-     * from avcodec_open2(), this field will be used by libavcodec to export the
-     * array of the allocated opaque surfaces to the caller, so they can be
-     * passed to other parts of the pipeline.
-     *
-     * The buffer reference exported here is owned and managed by libavcodec,
-     * the callers should make their own reference with av_buffer_ref() and free
-     * it with av_buffer_unref() when it is no longer needed.
-     *
-     * The buffer data is an nb_opaque_surfaces-sized array of mfxFrameSurface1.
-     */
-    AVBufferRef *opaque_surfaces;
-
-    /**
-     * Encoding only, and only if opaque_alloc is set to non-zero. On return
-     * from avcodec_open2(), this field will be set to the surface type used in
-     * the opaque allocation request.
-     */
-    int opaque_alloc_type;
-} AVQSVContext;
-
-/**
- * Allocate a new context.
- *
- * It must be freed by the caller with av_free().
- */
-AVQSVContext *av_qsv_alloc_context(void);
-
-#endif /* AVCODEC_QSV_H */
diff --git a/dependencies2013/win32/include/libavcodec/vaapi.h b/dependencies2013/win32/include/libavcodec/vaapi.h
deleted file mode 100644
index bb284553..00000000
--- a/dependencies2013/win32/include/libavcodec/vaapi.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Video Acceleration API (shared data between FFmpeg and the video player)
- * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
- *
- * Copyright (C) 2008-2009 Splitted-Desktop Systems
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_H
-#define AVCODEC_VAAPI_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vaapi
- * Public libavcodec VA API header.
- */
-
-#include <stdint.h>
-#include "libavutil/attributes.h"
-#include "version.h"
-
-#if FF_API_STRUCT_VAAPI_CONTEXT
-
-/**
- * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
- * @ingroup lavc_codec_hwaccel
- * @{
- */
-
-/**
- * This structure is used to share data between the FFmpeg library and
- * the client video application.
- * This shall be zero-allocated and available as
- * AVCodecContext.hwaccel_context. All user members can be set once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- *
- * Deprecated: use AVCodecContext.hw_frames_ctx instead.
- */
-struct attribute_deprecated vaapi_context {
-    /**
-     * Window system dependent data
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *display;
-
-    /**
-     * Configuration ID
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t config_id;
-
-    /**
-     * Context ID (video decode pipeline)
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t context_id;
-
-#if FF_API_VAAPI_CONTEXT
-    /**
-     * VAPictureParameterBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    uint32_t pic_param_buf_id;
-
-    /**
-     * VAIQMatrixBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    uint32_t iq_matrix_buf_id;
-
-    /**
-     * VABitPlaneBuffer ID (for VC-1 decoding)
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    uint32_t bitplane_buf_id;
-
-    /**
-     * Slice parameter/data buffer IDs
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    uint32_t *slice_buf_ids;
-
-    /**
-     * Number of effective slice buffer IDs to send to the HW
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    unsigned int n_slice_buf_ids;
-
-    /**
-     * Size of pre-allocated slice_buf_ids
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    unsigned int slice_buf_ids_alloc;
-
-    /**
-     * Pointer to VASliceParameterBuffers
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    void *slice_params;
-
-    /**
-     * Size of a VASliceParameterBuffer element
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    unsigned int slice_param_size;
-
-    /**
-     * Size of pre-allocated slice_params
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    unsigned int slice_params_alloc;
-
-    /**
-     * Number of slices currently filled in
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    unsigned int slice_count;
-
-    /**
-     * Pointer to slice data buffer base
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    const uint8_t *slice_data;
-
-    /**
-     * Current size of slice data
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    attribute_deprecated
-    uint32_t slice_data_size;
-#endif
-};
-
-/* @} */
-
-#endif /* FF_API_STRUCT_VAAPI_CONTEXT */
-
-#endif /* AVCODEC_VAAPI_H */
diff --git a/dependencies2013/win32/include/libavcodec/vda.h b/dependencies2013/win32/include/libavcodec/vda.h
deleted file mode 100644
index bde14e31..00000000
--- a/dependencies2013/win32/include/libavcodec/vda.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * VDA HW acceleration
- *
- * copyright (c) 2011 Sebastien Zwickert
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDA_H
-#define AVCODEC_VDA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vda
- * Public libavcodec VDA header.
- */
-
-#include "libavcodec/avcodec.h"
-
-#include <stdint.h>
-
-// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
-// http://openradar.appspot.com/8026390
-#undef __GNUC_STDC_INLINE__
-
-#define Picture QuickdrawPicture
-#include <VideoDecodeAcceleration/VDADecoder.h>
-#undef Picture
-
-#include "libavcodec/version.h"
-
-// extra flags not defined in VDADecoder.h
-enum {
-    kVDADecodeInfo_Asynchronous = 1UL << 0,
-    kVDADecodeInfo_FrameDropped = 1UL << 1
-};
-
-/**
- * @defgroup lavc_codec_hwaccel_vda VDA
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-/**
- * This structure is used to provide the necessary configurations and data
- * to the VDA FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct vda_context {
-    /**
-     * VDA decoder object.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    VDADecoder          decoder;
-
-    /**
-     * The Core Video pixel buffer that contains the current image data.
-     *
-     * encoding: unused
-     * decoding: Set by libavcodec. Unset by user.
-     */
-    CVPixelBufferRef    cv_buffer;
-
-    /**
-     * Use the hardware decoder in synchronous mode.
-     *
-     * encoding: unused
-     * decoding: Set by user.
-     */
-    int                 use_sync_decoding;
-
-    /**
-     * The frame width.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 width;
-
-    /**
-     * The frame height.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 height;
-
-    /**
-     * The frame format.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 format;
-
-    /**
-     * The pixel format for output image buffers.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    OSType              cv_pix_fmt_type;
-
-    /**
-     * unused
-     */
-    uint8_t             *priv_bitstream;
-
-    /**
-     * unused
-     */
-    int                 priv_bitstream_size;
-
-    /**
-     * unused
-     */
-    int                 priv_allocated_size;
-
-    /**
-     * Use av_buffer to manage buffer.
-     * When the flag is set, the CVPixelBuffers returned by the decoder will
-     * be released automatically, so you have to retain them if necessary.
-     * Not setting this flag may cause memory leak.
-     *
-     * encoding: unused
-     * decoding: Set by user.
-     */
-    int                 use_ref_buffer;
-};
-
-/** Create the video decoder. */
-int ff_vda_create_decoder(struct vda_context *vda_ctx,
-                          uint8_t *extradata,
-                          int extradata_size);
-
-/** Destroy the video decoder. */
-int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-
-/**
- * This struct holds all the information that needs to be passed
- * between the caller and libavcodec for initializing VDA decoding.
- * Its size is not a part of the public ABI, it must be allocated with
- * av_vda_alloc_context() and freed with av_free().
- */
-typedef struct AVVDAContext {
-    /**
-     * VDA decoder object. Created and freed by the caller.
-     */
-    VDADecoder decoder;
-
-    /**
-     * The output callback that must be passed to VDADecoderCreate.
-     * Set by av_vda_alloc_context().
-     */
-    VDADecoderOutputCallback output_callback;
-
-    /**
-     * CVPixelBuffer Format Type that VDA will use for decoded frames; set by
-     * the caller.
-     */
-    OSType cv_pix_fmt_type;
-} AVVDAContext;
-
-/**
- * Allocate and initialize a VDA context.
- *
- * This function should be called from the get_format() callback when the caller
- * selects the AV_PIX_FMT_VDA format. The caller must then create the decoder
- * object (using the output callback provided by libavcodec) that will be used
- * for VDA-accelerated decoding.
- *
- * When decoding with VDA is finished, the caller must destroy the decoder
- * object and free the VDA context using av_free().
- *
- * @return the newly allocated context or NULL on failure
- */
-AVVDAContext *av_vda_alloc_context(void);
-
-/**
- * This is a convenience function that creates and sets up the VDA context using
- * an internal implementation.
- *
- * @param avctx the corresponding codec context
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int av_vda_default_init(AVCodecContext *avctx);
-
-/**
- * This is a convenience function that creates and sets up the VDA context using
- * an internal implementation.
- *
- * @param avctx the corresponding codec context
- * @param vdactx the VDA context to use
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int av_vda_default_init2(AVCodecContext *avctx, AVVDAContext *vdactx);
-
-/**
- * This function must be called to free the VDA context initialized with
- * av_vda_default_init().
- *
- * @param avctx the corresponding codec context
- */
-void av_vda_default_free(AVCodecContext *avctx);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_VDA_H */
diff --git a/dependencies2013/win32/include/libavcodec/vdpau.h b/dependencies2013/win32/include/libavcodec/vdpau.h
deleted file mode 100644
index 855d387d..00000000
--- a/dependencies2013/win32/include/libavcodec/vdpau.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vdpau
- * Public libavcodec VDPAU header.
- */
-
-
-/**
- * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
- * @ingroup lavc_codec_hwaccel
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using FFmpeg
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * @{
- */
-
-#include <vdpau/vdpau.h>
-
-#include "libavutil/avconfig.h"
-#include "libavutil/attributes.h"
-
-#include "avcodec.h"
-#include "version.h"
-
-#if FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
-    VdpPictureInfoH264        h264;
-    VdpPictureInfoMPEG1Or2    mpeg;
-    VdpPictureInfoVC1          vc1;
-    VdpPictureInfoMPEG4Part2 mpeg4;
-};
-#endif
-
-struct AVCodecContext;
-struct AVFrame;
-
-typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
-                               const VdpPictureInfo *, uint32_t,
-                               const VdpBitstreamBuffer *);
-
-/**
- * This structure is used to share data between the libavcodec library and
- * the client video application.
- * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
- * function and make it available as
- * AVCodecContext.hwaccel_context. Members can be set by the user once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- *
- * The size of this structure is not a part of the public ABI and must not
- * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
- * AVVDPAUContext.
- */
-typedef struct AVVDPAUContext {
-    /**
-     * VDPAU decoder handle
-     *
-     * Set by user.
-     */
-    VdpDecoder decoder;
-
-    /**
-     * VDPAU decoder render callback
-     *
-     * Set by the user.
-     */
-    VdpDecoderRender *render;
-
-#if FF_API_BUFS_VDPAU
-    /**
-     * VDPAU picture information
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    union AVVDPAUPictureInfo info;
-
-    /**
-     * Allocated size of the bitstream_buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_allocated;
-
-    /**
-     * Useful bitstream buffers in the bitstream buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_used;
-
-   /**
-     * Table of bitstream buffers.
-     * The user is responsible for freeing this buffer using av_freep().
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    VdpBitstreamBuffer *bitstream_buffers;
-#endif
-    AVVDPAU_Render2 render2;
-} AVVDPAUContext;
-
-/**
- * @brief allocation function for AVVDPAUContext
- *
- * Allows extending the struct without breaking API/ABI
- */
-AVVDPAUContext *av_alloc_vdpaucontext(void);
-
-AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
-void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
-
-/**
- * Associate a VDPAU device with a codec context for hardware acceleration.
- * This function is meant to be called from the get_format() codec callback,
- * or earlier. It can also be called after avcodec_flush_buffers() to change
- * the underlying VDPAU device mid-stream (e.g. to recover from non-transparent
- * display preemption).
- *
- * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes
- * successfully.
- *
- * @param avctx decoding context whose get_format() callback is invoked
- * @param device VDPAU device handle to use for hardware acceleration
- * @param get_proc_address VDPAU device driver
- * @param flags zero of more OR'd AV_HWACCEL_FLAG_* flags
- *
- * @return 0 on success, an AVERROR code on failure.
- */
-int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
-                          VdpGetProcAddress *get_proc_address, unsigned flags);
-
-/**
- * Gets the parameters to create an adequate VDPAU video surface for the codec
- * context using VDPAU hardware decoding acceleration.
- *
- * @note Behavior is undefined if the context was not successfully bound to a
- * VDPAU device using av_vdpau_bind_context().
- *
- * @param avctx the codec context being used for decoding the stream
- * @param type storage space for the VDPAU video surface chroma type
- *              (or NULL to ignore)
- * @param width storage space for the VDPAU video surface pixel width
- *              (or NULL to ignore)
- * @param height storage space for the VDPAU video surface pixel height
- *              (or NULL to ignore)
- *
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
-                                    uint32_t *width, uint32_t *height);
-
-/**
- * Allocate an AVVDPAUContext.
- *
- * @return Newly-allocated AVVDPAUContext or NULL on failure.
- */
-AVVDPAUContext *av_vdpau_alloc_context(void);
-
-#if FF_API_VDPAU_PROFILE
-/**
- * Get a decoder profile that should be used for initializing a VDPAU decoder.
- * Should be called from the AVCodecContext.get_format() callback.
- *
- * @deprecated Use av_vdpau_bind_context() instead.
- *
- * @param avctx the codec context being used for decoding the stream
- * @param profile a pointer into which the result will be written on success.
- *                The contents of profile are undefined if this function returns
- *                an error.
- *
- * @return 0 on success (non-negative), a negative AVERROR on failure.
- */
-attribute_deprecated
-int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
-#endif
-
-#if FF_API_CAP_VDPAU
-/** @brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * @brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * @brief This structure is used as a callback between the FFmpeg
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the FFmpeg decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-    /** picture parameter information for all supported codecs */
-    union AVVDPAUPictureInfo info;
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-};
-#endif
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
diff --git a/dependencies2013/win32/include/libavcodec/version.h b/dependencies2013/win32/include/libavcodec/version.h
deleted file mode 100644
index 594023ef..00000000
--- a/dependencies2013/win32/include/libavcodec/version.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VERSION_H
-#define AVCODEC_VERSION_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec version macros.
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVCODEC_VERSION_MAJOR  57
-#define LIBAVCODEC_VERSION_MINOR 108
-#define LIBAVCODEC_VERSION_MICRO 100
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @note, when bumping the major version it is recommended to manually
- * disable each FF_API_* in its own commit instead of disabling them all
- * at once through the bump. This improves the git bisect-ability of the change.
- */
-
-#ifndef FF_API_VIMA_DECODER
-#define FF_API_VIMA_DECODER     (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_AUDIO_CONVERT
-#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
-#endif
-#ifndef FF_API_MISSING_SAMPLE
-#define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LOWRES
-#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_VOXWARE
-#define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_SET_DIMENSIONS
-#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_DEBUG_MV
-#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_AC_VLC
-#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_OLD_MSMPEG4
-#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_ARCH_ALPHA
-#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_MB_TYPE
-#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_EMU_EDGE
-#define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_ARCH_SH4
-#define FF_API_ARCH_SH4          (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_ARCH_SPARC
-#define FF_API_ARCH_SPARC        (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_UNUSED_MEMBERS
-#define FF_API_UNUSED_MEMBERS    (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_IDCT_XVIDMMX
-#define FF_API_IDCT_XVIDMMX      (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_INPUT_PRESERVED
-#define FF_API_INPUT_PRESERVED   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_NORMALIZE_AQP
-#define FF_API_NORMALIZE_AQP     (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_GMC
-#define FF_API_GMC               (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_MV0
-#define FF_API_MV0               (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_CODEC_NAME
-#define FF_API_CODEC_NAME        (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_AFD
-#define FF_API_AFD               (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_VISMV
-/* XXX: don't forget to drop the -vismv documentation */
-#define FF_API_VISMV             (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_AUDIOENC_DELAY
-#define FF_API_AUDIOENC_DELAY    (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_VAAPI_CONTEXT
-#define FF_API_VAAPI_CONTEXT     (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_MERGE_SD
-#define FF_API_MERGE_SD          (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_AVCTX_TIMEBASE
-#define FF_API_AVCTX_TIMEBASE    (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_MPV_OPT
-#define FF_API_MPV_OPT           (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_STREAM_CODEC_TAG
-#define FF_API_STREAM_CODEC_TAG  (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_QUANT_BIAS
-#define FF_API_QUANT_BIAS        (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_RC_STRATEGY
-#define FF_API_RC_STRATEGY       (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_CODED_FRAME
-#define FF_API_CODED_FRAME       (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_MOTION_EST
-#define FF_API_MOTION_EST        (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_WITHOUT_PREFIX
-#define FF_API_WITHOUT_PREFIX    (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_SIDEDATA_ONLY_PKT
-#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_VDPAU_PROFILE
-#define FF_API_VDPAU_PROFILE     (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_CONVERGENCE_DURATION
-#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_AVPICTURE
-#define FF_API_AVPICTURE         (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_AVPACKET_OLD_API
-#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_RTP_CALLBACK
-#define FF_API_RTP_CALLBACK      (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_VBV_DELAY
-#define FF_API_VBV_DELAY         (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_CODER_TYPE
-#define FF_API_CODER_TYPE        (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_STAT_BITS
-#define FF_API_STAT_BITS         (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_PRIVATE_OPT
-#define FF_API_PRIVATE_OPT      (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_ASS_TIMING
-#define FF_API_ASS_TIMING       (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_OLD_BSF
-#define FF_API_OLD_BSF          (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_COPY_CONTEXT
-#define FF_API_COPY_CONTEXT     (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_GET_CONTEXT_DEFAULTS
-#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_NVENC_OLD_NAME
-#define FF_API_NVENC_OLD_NAME    (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_STRUCT_VAAPI_CONTEXT
-#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_MERGE_SD_API
-#define FF_API_MERGE_SD_API      (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_TAG_STRING
-#define FF_API_TAG_STRING        (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-#ifndef FF_API_GETCHROMA
-#define FF_API_GETCHROMA         (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
-
-
-#endif /* AVCODEC_VERSION_H */
diff --git a/dependencies2013/win32/include/libavcodec/videotoolbox.h b/dependencies2013/win32/include/libavcodec/videotoolbox.h
deleted file mode 100644
index af2db0d5..00000000
--- a/dependencies2013/win32/include/libavcodec/videotoolbox.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Videotoolbox hardware acceleration
- *
- * copyright (c) 2012 Sebastien Zwickert
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VIDEOTOOLBOX_H
-#define AVCODEC_VIDEOTOOLBOX_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_videotoolbox
- * Public libavcodec Videotoolbox header.
- */
-
-#include <stdint.h>
-
-#define Picture QuickdrawPicture
-#include <VideoToolbox/VideoToolbox.h>
-#undef Picture
-
-#include "libavcodec/avcodec.h"
-
-/**
- * This struct holds all the information that needs to be passed
- * between the caller and libavcodec for initializing Videotoolbox decoding.
- * Its size is not a part of the public ABI, it must be allocated with
- * av_videotoolbox_alloc_context() and freed with av_free().
- */
-typedef struct AVVideotoolboxContext {
-    /**
-     * Videotoolbox decompression session object.
-     * Created and freed the caller.
-     */
-    VTDecompressionSessionRef session;
-
-    /**
-     * The output callback that must be passed to the session.
-     * Set by av_videottoolbox_default_init()
-     */
-    VTDecompressionOutputCallback output_callback;
-
-    /**
-     * CVPixelBuffer Format Type that Videotoolbox will use for decoded frames.
-     * set by the caller. If this is set to 0, then no specific format is
-     * requested from the decoder, and its native format is output.
-     */
-    OSType cv_pix_fmt_type;
-
-    /**
-     * CoreMedia Format Description that Videotoolbox will use to create the decompression session.
-     * Set by the caller.
-     */
-    CMVideoFormatDescriptionRef cm_fmt_desc;
-
-    /**
-     * CoreMedia codec type that Videotoolbox will use to create the decompression session.
-     * Set by the caller.
-     */
-    int cm_codec_type;
-} AVVideotoolboxContext;
-
-/**
- * Allocate and initialize a Videotoolbox context.
- *
- * This function should be called from the get_format() callback when the caller
- * selects the AV_PIX_FMT_VIDETOOLBOX format. The caller must then create
- * the decoder object (using the output callback provided by libavcodec) that
- * will be used for Videotoolbox-accelerated decoding.
- *
- * When decoding with Videotoolbox is finished, the caller must destroy the decoder
- * object and free the Videotoolbox context using av_free().
- *
- * @return the newly allocated context or NULL on failure
- */
-AVVideotoolboxContext *av_videotoolbox_alloc_context(void);
-
-/**
- * This is a convenience function that creates and sets up the Videotoolbox context using
- * an internal implementation.
- *
- * @param avctx the corresponding codec context
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int av_videotoolbox_default_init(AVCodecContext *avctx);
-
-/**
- * This is a convenience function that creates and sets up the Videotoolbox context using
- * an internal implementation.
- *
- * @param avctx the corresponding codec context
- * @param vtctx the Videotoolbox context to use
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext *vtctx);
-
-/**
- * This function must be called to free the Videotoolbox context initialized with
- * av_videotoolbox_default_init().
- *
- * @param avctx the corresponding codec context
- */
-void av_videotoolbox_default_free(AVCodecContext *avctx);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_VIDEOTOOLBOX_H */
diff --git a/dependencies2013/win32/include/libavcodec/vorbis_parser.h b/dependencies2013/win32/include/libavcodec/vorbis_parser.h
deleted file mode 100644
index 789932ac..00000000
--- a/dependencies2013/win32/include/libavcodec/vorbis_parser.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * A public API for Vorbis parsing
- *
- * Determines the duration for each packet.
- */
-
-#ifndef AVCODEC_VORBIS_PARSER_H
-#define AVCODEC_VORBIS_PARSER_H
-
-#include <stdint.h>
-
-typedef struct AVVorbisParseContext AVVorbisParseContext;
-
-/**
- * Allocate and initialize the Vorbis parser using headers in the extradata.
- */
-AVVorbisParseContext *av_vorbis_parse_init(const uint8_t *extradata,
-                                           int extradata_size);
-
-/**
- * Free the parser and everything associated with it.
- */
-void av_vorbis_parse_free(AVVorbisParseContext **s);
-
-#define VORBIS_FLAG_HEADER  0x00000001
-#define VORBIS_FLAG_COMMENT 0x00000002
-#define VORBIS_FLAG_SETUP   0x00000004
-
-/**
- * Get the duration for a Vorbis packet.
- *
- * If @p flags is @c NULL,
- * special frames are considered invalid.
- *
- * @param s        Vorbis parser context
- * @param buf      buffer containing a Vorbis frame
- * @param buf_size size of the buffer
- * @param flags    flags for special frames
- */
-int av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
-                                int buf_size, int *flags);
-
-/**
- * Get the duration for a Vorbis packet.
- *
- * @param s        Vorbis parser context
- * @param buf      buffer containing a Vorbis frame
- * @param buf_size size of the buffer
- */
-int av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
-                          int buf_size);
-
-void av_vorbis_parse_reset(AVVorbisParseContext *s);
-
-#endif /* AVCODEC_VORBIS_PARSER_H */
diff --git a/dependencies2013/win32/include/libavcodec/xvmc.h b/dependencies2013/win32/include/libavcodec/xvmc.h
deleted file mode 100644
index 465ee78d..00000000
--- a/dependencies2013/win32/include/libavcodec/xvmc.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_xvmc
- * Public libavcodec XvMC header.
- */
-
-#include <X11/extensions/XvMC.h>
-
-#include "libavutil/attributes.h"
-#include "version.h"
-#include "avcodec.h"
-
-/**
- * @defgroup lavc_codec_hwaccel_xvmc XvMC
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct attribute_deprecated xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_XVMC_H */
diff --git a/dependencies2013/win32/include/libavdevice/avdevice.h b/dependencies2013/win32/include/libavdevice/avdevice.h
deleted file mode 100644
index ee946248..00000000
--- a/dependencies2013/win32/include/libavdevice/avdevice.h
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVDEVICE_AVDEVICE_H
-#define AVDEVICE_AVDEVICE_H
-
-#include "version.h"
-
-/**
- * @file
- * @ingroup lavd
- * Main libavdevice API header
- */
-
-/**
- * @defgroup lavd libavdevice
- * Special devices muxing/demuxing library.
- *
- * Libavdevice is a complementary library to @ref libavf "libavformat". It
- * provides various "special" platform-specific muxers and demuxers, e.g. for
- * grabbing devices, audio capture and playback etc. As a consequence, the
- * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own
- * I/O functions). The filename passed to avformat_open_input() often does not
- * refer to an actually existing file, but has some special device-specific
- * meaning - e.g. for xcbgrab it is the display name.
- *
- * To use libavdevice, simply call avdevice_register_all() to register all
- * compiled muxers and demuxers. They all use standard libavformat API.
- *
- * @{
- */
-
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
-#include "libavutil/dict.h"
-#include "libavformat/avformat.h"
-
-/**
- * Return the LIBAVDEVICE_VERSION_INT constant.
- */
-unsigned avdevice_version(void);
-
-/**
- * Return the libavdevice build-time configuration.
- */
-const char *avdevice_configuration(void);
-
-/**
- * Return the libavdevice license.
- */
-const char *avdevice_license(void);
-
-/**
- * Initialize libavdevice and register all the input and output devices.
- */
-void avdevice_register_all(void);
-
-/**
- * Audio input devices iterator.
- *
- * If d is NULL, returns the first registered input audio/video device,
- * if d is non-NULL, returns the next registered input audio/video device after d
- * or NULL if d is the last one.
- */
-AVInputFormat *av_input_audio_device_next(AVInputFormat  *d);
-
-/**
- * Video input devices iterator.
- *
- * If d is NULL, returns the first registered input audio/video device,
- * if d is non-NULL, returns the next registered input audio/video device after d
- * or NULL if d is the last one.
- */
-AVInputFormat *av_input_video_device_next(AVInputFormat  *d);
-
-/**
- * Audio output devices iterator.
- *
- * If d is NULL, returns the first registered output audio/video device,
- * if d is non-NULL, returns the next registered output audio/video device after d
- * or NULL if d is the last one.
- */
-AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d);
-
-/**
- * Video output devices iterator.
- *
- * If d is NULL, returns the first registered output audio/video device,
- * if d is non-NULL, returns the next registered output audio/video device after d
- * or NULL if d is the last one.
- */
-AVOutputFormat *av_output_video_device_next(AVOutputFormat *d);
-
-typedef struct AVDeviceRect {
-    int x;      /**< x coordinate of top left corner */
-    int y;      /**< y coordinate of top left corner */
-    int width;  /**< width */
-    int height; /**< height */
-} AVDeviceRect;
-
-/**
- * Message types used by avdevice_app_to_dev_control_message().
- */
-enum AVAppToDevMessageType {
-    /**
-     * Dummy message.
-     */
-    AV_APP_TO_DEV_NONE = MKBETAG('N','O','N','E'),
-
-    /**
-     * Window size change message.
-     *
-     * Message is sent to the device every time the application changes the size
-     * of the window device renders to.
-     * Message should also be sent right after window is created.
-     *
-     * data: AVDeviceRect: new window size.
-     */
-    AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G','E','O','M'),
-
-    /**
-     * Repaint request message.
-     *
-     * Message is sent to the device when window has to be repainted.
-     *
-     * data: AVDeviceRect: area required to be repainted.
-     *       NULL: whole area is required to be repainted.
-     */
-    AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R','E','P','A'),
-
-    /**
-     * Request pause/play.
-     *
-     * Application requests pause/unpause playback.
-     * Mostly usable with devices that have internal buffer.
-     * By default devices are not paused.
-     *
-     * data: NULL
-     */
-    AV_APP_TO_DEV_PAUSE        = MKBETAG('P', 'A', 'U', ' '),
-    AV_APP_TO_DEV_PLAY         = MKBETAG('P', 'L', 'A', 'Y'),
-    AV_APP_TO_DEV_TOGGLE_PAUSE = MKBETAG('P', 'A', 'U', 'T'),
-
-    /**
-     * Volume control message.
-     *
-     * Set volume level. It may be device-dependent if volume
-     * is changed per stream or system wide. Per stream volume
-     * change is expected when possible.
-     *
-     * data: double: new volume with range of 0.0 - 1.0.
-     */
-    AV_APP_TO_DEV_SET_VOLUME = MKBETAG('S', 'V', 'O', 'L'),
-
-    /**
-     * Mute control messages.
-     *
-     * Change mute state. It may be device-dependent if mute status
-     * is changed per stream or system wide. Per stream mute status
-     * change is expected when possible.
-     *
-     * data: NULL.
-     */
-    AV_APP_TO_DEV_MUTE        = MKBETAG(' ', 'M', 'U', 'T'),
-    AV_APP_TO_DEV_UNMUTE      = MKBETAG('U', 'M', 'U', 'T'),
-    AV_APP_TO_DEV_TOGGLE_MUTE = MKBETAG('T', 'M', 'U', 'T'),
-
-    /**
-     * Get volume/mute messages.
-     *
-     * Force the device to send AV_DEV_TO_APP_VOLUME_LEVEL_CHANGED or
-     * AV_DEV_TO_APP_MUTE_STATE_CHANGED command respectively.
-     *
-     * data: NULL.
-     */
-    AV_APP_TO_DEV_GET_VOLUME = MKBETAG('G', 'V', 'O', 'L'),
-    AV_APP_TO_DEV_GET_MUTE   = MKBETAG('G', 'M', 'U', 'T'),
-};
-
-/**
- * Message types used by avdevice_dev_to_app_control_message().
- */
-enum AVDevToAppMessageType {
-    /**
-     * Dummy message.
-     */
-    AV_DEV_TO_APP_NONE = MKBETAG('N','O','N','E'),
-
-    /**
-     * Create window buffer message.
-     *
-     * Device requests to create a window buffer. Exact meaning is device-
-     * and application-dependent. Message is sent before rendering first
-     * frame and all one-shot initializations should be done here.
-     * Application is allowed to ignore preferred window buffer size.
-     *
-     * @note: Application is obligated to inform about window buffer size
-     *        with AV_APP_TO_DEV_WINDOW_SIZE message.
-     *
-     * data: AVDeviceRect: preferred size of the window buffer.
-     *       NULL: no preferred size of the window buffer.
-     */
-    AV_DEV_TO_APP_CREATE_WINDOW_BUFFER = MKBETAG('B','C','R','E'),
-
-    /**
-     * Prepare window buffer message.
-     *
-     * Device requests to prepare a window buffer for rendering.
-     * Exact meaning is device- and application-dependent.
-     * Message is sent before rendering of each frame.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER = MKBETAG('B','P','R','E'),
-
-    /**
-     * Display window buffer message.
-     *
-     * Device requests to display a window buffer.
-     * Message is sent when new frame is ready to be displayed.
-     * Usually buffers need to be swapped in handler of this message.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER = MKBETAG('B','D','I','S'),
-
-    /**
-     * Destroy window buffer message.
-     *
-     * Device requests to destroy a window buffer.
-     * Message is sent when device is about to be destroyed and window
-     * buffer is not required anymore.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B','D','E','S'),
-
-    /**
-     * Buffer fullness status messages.
-     *
-     * Device signals buffer overflow/underflow.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_BUFFER_OVERFLOW = MKBETAG('B','O','F','L'),
-    AV_DEV_TO_APP_BUFFER_UNDERFLOW = MKBETAG('B','U','F','L'),
-
-    /**
-     * Buffer readable/writable.
-     *
-     * Device informs that buffer is readable/writable.
-     * When possible, device informs how many bytes can be read/write.
-     *
-     * @warning Device may not inform when number of bytes than can be read/write changes.
-     *
-     * data: int64_t: amount of bytes available to read/write.
-     *       NULL: amount of bytes available to read/write is not known.
-     */
-    AV_DEV_TO_APP_BUFFER_READABLE = MKBETAG('B','R','D',' '),
-    AV_DEV_TO_APP_BUFFER_WRITABLE = MKBETAG('B','W','R',' '),
-
-    /**
-     * Mute state change message.
-     *
-     * Device informs that mute state has changed.
-     *
-     * data: int: 0 for not muted state, non-zero for muted state.
-     */
-    AV_DEV_TO_APP_MUTE_STATE_CHANGED = MKBETAG('C','M','U','T'),
-
-    /**
-     * Volume level change message.
-     *
-     * Device informs that volume level has changed.
-     *
-     * data: double: new volume with range of 0.0 - 1.0.
-     */
-    AV_DEV_TO_APP_VOLUME_LEVEL_CHANGED = MKBETAG('C','V','O','L'),
-};
-
-/**
- * Send control message from application to device.
- *
- * @param s         device context.
- * @param type      message type.
- * @param data      message data. Exact type depends on message type.
- * @param data_size size of message data.
- * @return >= 0 on success, negative on error.
- *         AVERROR(ENOSYS) when device doesn't implement handler of the message.
- */
-int avdevice_app_to_dev_control_message(struct AVFormatContext *s,
-                                        enum AVAppToDevMessageType type,
-                                        void *data, size_t data_size);
-
-/**
- * Send control message from device to application.
- *
- * @param s         device context.
- * @param type      message type.
- * @param data      message data. Can be NULL.
- * @param data_size size of message data.
- * @return >= 0 on success, negative on error.
- *         AVERROR(ENOSYS) when application doesn't implement handler of the message.
- */
-int avdevice_dev_to_app_control_message(struct AVFormatContext *s,
-                                        enum AVDevToAppMessageType type,
-                                        void *data, size_t data_size);
-
-/**
- * Following API allows user to probe device capabilities (supported codecs,
- * pixel formats, sample formats, resolutions, channel counts, etc).
- * It is build on top op AVOption API.
- * Queried capabilities make it possible to set up converters of video or audio
- * parameters that fit to the device.
- *
- * List of capabilities that can be queried:
- *  - Capabilities valid for both audio and video devices:
- *    - codec:          supported audio/video codecs.
- *                      type: AV_OPT_TYPE_INT (AVCodecID value)
- *  - Capabilities valid for audio devices:
- *    - sample_format:  supported sample formats.
- *                      type: AV_OPT_TYPE_INT (AVSampleFormat value)
- *    - sample_rate:    supported sample rates.
- *                      type: AV_OPT_TYPE_INT
- *    - channels:       supported number of channels.
- *                      type: AV_OPT_TYPE_INT
- *    - channel_layout: supported channel layouts.
- *                      type: AV_OPT_TYPE_INT64
- *  - Capabilities valid for video devices:
- *    - pixel_format:   supported pixel formats.
- *                      type: AV_OPT_TYPE_INT (AVPixelFormat value)
- *    - window_size:    supported window sizes (describes size of the window size presented to the user).
- *                      type: AV_OPT_TYPE_IMAGE_SIZE
- *    - frame_size:     supported frame sizes (describes size of provided video frames).
- *                      type: AV_OPT_TYPE_IMAGE_SIZE
- *    - fps:            supported fps values
- *                      type: AV_OPT_TYPE_RATIONAL
- *
- * Value of the capability may be set by user using av_opt_set() function
- * and AVDeviceCapabilitiesQuery object. Following queries will
- * limit results to the values matching already set capabilities.
- * For example, setting a codec may impact number of formats or fps values
- * returned during next query. Setting invalid value may limit results to zero.
- *
- * Example of the usage basing on opengl output device:
- *
- * @code
- *  AVFormatContext *oc = NULL;
- *  AVDeviceCapabilitiesQuery *caps = NULL;
- *  AVOptionRanges *ranges;
- *  int ret;
- *
- *  if ((ret = avformat_alloc_output_context2(&oc, NULL, "opengl", NULL)) < 0)
- *      goto fail;
- *  if (avdevice_capabilities_create(&caps, oc, NULL) < 0)
- *      goto fail;
- *
- *  //query codecs
- *  if (av_opt_query_ranges(&ranges, caps, "codec", AV_OPT_MULTI_COMPONENT_RANGE)) < 0)
- *      goto fail;
- *  //pick codec here and set it
- *  av_opt_set(caps, "codec", AV_CODEC_ID_RAWVIDEO, 0);
- *
- *  //query format
- *  if (av_opt_query_ranges(&ranges, caps, "pixel_format", AV_OPT_MULTI_COMPONENT_RANGE)) < 0)
- *      goto fail;
- *  //pick format here and set it
- *  av_opt_set(caps, "pixel_format", AV_PIX_FMT_YUV420P, 0);
- *
- *  //query and set more capabilities
- *
- * fail:
- *  //clean up code
- *  avdevice_capabilities_free(&query, oc);
- *  avformat_free_context(oc);
- * @endcode
- */
-
-/**
- * Structure describes device capabilities.
- *
- * It is used by devices in conjunction with av_device_capabilities AVOption table
- * to implement capabilities probing API based on AVOption API. Should not be used directly.
- */
-typedef struct AVDeviceCapabilitiesQuery {
-    const AVClass *av_class;
-    AVFormatContext *device_context;
-    enum AVCodecID codec;
-    enum AVSampleFormat sample_format;
-    enum AVPixelFormat pixel_format;
-    int sample_rate;
-    int channels;
-    int64_t channel_layout;
-    int window_width;
-    int window_height;
-    int frame_width;
-    int frame_height;
-    AVRational fps;
-} AVDeviceCapabilitiesQuery;
-
-/**
- * AVOption table used by devices to implement device capabilities API. Should not be used by a user.
- */
-extern const AVOption av_device_capabilities[];
-
-/**
- * Initialize capabilities probing API based on AVOption API.
- *
- * avdevice_capabilities_free() must be called when query capabilities API is
- * not used anymore.
- *
- * @param[out] caps      Device capabilities data. Pointer to a NULL pointer must be passed.
- * @param s              Context of the device.
- * @param device_options An AVDictionary filled with device-private options.
- *                       On return this parameter will be destroyed and replaced with a dict
- *                       containing options that were not found. May be NULL.
- *                       The same options must be passed later to avformat_write_header() for output
- *                       devices or avformat_open_input() for input devices, or at any other place
- *                       that affects device-private options.
- *
- * @return >= 0 on success, negative otherwise.
- */
-int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s,
-                                 AVDictionary **device_options);
-
-/**
- * Free resources created by avdevice_capabilities_create()
- *
- * @param caps Device capabilities data to be freed.
- * @param s    Context of the device.
- */
-void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s);
-
-/**
- * Structure describes basic parameters of the device.
- */
-typedef struct AVDeviceInfo {
-    char *device_name;                   /**< device name, format depends on device */
-    char *device_description;            /**< human friendly name */
-} AVDeviceInfo;
-
-/**
- * List of devices.
- */
-typedef struct AVDeviceInfoList {
-    AVDeviceInfo **devices;              /**< list of autodetected devices */
-    int nb_devices;                      /**< number of autodetected devices */
-    int default_device;                  /**< index of default device or -1 if no default */
-} AVDeviceInfoList;
-
-/**
- * List devices.
- *
- * Returns available device names and their parameters.
- *
- * @note: Some devices may accept system-dependent device names that cannot be
- *        autodetected. The list returned by this function cannot be assumed to
- *        be always completed.
- *
- * @param s                device context.
- * @param[out] device_list list of autodetected devices.
- * @return count of autodetected devices, negative on error.
- */
-int avdevice_list_devices(struct AVFormatContext *s, AVDeviceInfoList **device_list);
-
-/**
- * Convenient function to free result of avdevice_list_devices().
- *
- * @param devices device list to be freed.
- */
-void avdevice_free_list_devices(AVDeviceInfoList **device_list);
-
-/**
- * List devices.
- *
- * Returns available device names and their parameters.
- * These are convinient wrappers for avdevice_list_devices().
- * Device context is allocated and deallocated internally.
- *
- * @param device           device format. May be NULL if device name is set.
- * @param device_name      device name. May be NULL if device format is set.
- * @param device_options   An AVDictionary filled with device-private options. May be NULL.
- *                         The same options must be passed later to avformat_write_header() for output
- *                         devices or avformat_open_input() for input devices, or at any other place
- *                         that affects device-private options.
- * @param[out] device_list list of autodetected devices
- * @return count of autodetected devices, negative on error.
- * @note device argument takes precedence over device_name when both are set.
- */
-int avdevice_list_input_sources(struct AVInputFormat *device, const char *device_name,
-                                AVDictionary *device_options, AVDeviceInfoList **device_list);
-int avdevice_list_output_sinks(struct AVOutputFormat *device, const char *device_name,
-                               AVDictionary *device_options, AVDeviceInfoList **device_list);
-
-/**
- * @}
- */
-
-#endif /* AVDEVICE_AVDEVICE_H */
diff --git a/dependencies2013/win32/include/libavdevice/version.h b/dependencies2013/win32/include/libavdevice/version.h
deleted file mode 100644
index d3622c53..00000000
--- a/dependencies2013/win32/include/libavdevice/version.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVDEVICE_VERSION_H
-#define AVDEVICE_VERSION_H
-
-/**
- * @file
- * @ingroup lavd
- * Libavdevice version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVDEVICE_VERSION_MAJOR  57
-#define LIBAVDEVICE_VERSION_MINOR  11
-#define LIBAVDEVICE_VERSION_MICRO 100
-
-#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
-                                               LIBAVDEVICE_VERSION_MINOR, \
-                                               LIBAVDEVICE_VERSION_MICRO)
-#define LIBAVDEVICE_VERSION     AV_VERSION(LIBAVDEVICE_VERSION_MAJOR, \
-                                           LIBAVDEVICE_VERSION_MINOR, \
-                                           LIBAVDEVICE_VERSION_MICRO)
-#define LIBAVDEVICE_BUILD       LIBAVDEVICE_VERSION_INT
-
-#define LIBAVDEVICE_IDENT       "Lavd" AV_STRINGIFY(LIBAVDEVICE_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#endif /* AVDEVICE_VERSION_H */
diff --git a/dependencies2013/win32/include/libavfilter/avfilter.h b/dependencies2013/win32/include/libavfilter/avfilter.h
deleted file mode 100644
index 73a723d5..00000000
--- a/dependencies2013/win32/include/libavfilter/avfilter.h
+++ /dev/null
@@ -1,1197 +0,0 @@
-/*
- * filter layer
- * Copyright (c) 2007 Bobby Bingham
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFILTER_AVFILTER_H
-#define AVFILTER_AVFILTER_H
-
-/**
- * @file
- * @ingroup lavfi
- * Main libavfilter public API header
- */
-
-/**
- * @defgroup lavfi libavfilter
- * Graph-based frame editing library.
- *
- * @{
- */
-
-#include <stddef.h>
-
-#include "libavutil/attributes.h"
-#include "libavutil/avutil.h"
-#include "libavutil/buffer.h"
-#include "libavutil/dict.h"
-#include "libavutil/frame.h"
-#include "libavutil/log.h"
-#include "libavutil/samplefmt.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "libavfilter/version.h"
-
-/**
- * Return the LIBAVFILTER_VERSION_INT constant.
- */
-unsigned avfilter_version(void);
-
-/**
- * Return the libavfilter build-time configuration.
- */
-const char *avfilter_configuration(void);
-
-/**
- * Return the libavfilter license.
- */
-const char *avfilter_license(void);
-
-typedef struct AVFilterContext AVFilterContext;
-typedef struct AVFilterLink    AVFilterLink;
-typedef struct AVFilterPad     AVFilterPad;
-typedef struct AVFilterFormats AVFilterFormats;
-
-/**
- * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
- * AVFilter.inputs/outputs).
- */
-int avfilter_pad_count(const AVFilterPad *pads);
-
-/**
- * Get the name of an AVFilterPad.
- *
- * @param pads an array of AVFilterPads
- * @param pad_idx index of the pad in the array it; is the caller's
- *                responsibility to ensure the index is valid
- *
- * @return name of the pad_idx'th pad in pads
- */
-const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx);
-
-/**
- * Get the type of an AVFilterPad.
- *
- * @param pads an array of AVFilterPads
- * @param pad_idx index of the pad in the array; it is the caller's
- *                responsibility to ensure the index is valid
- *
- * @return type of the pad_idx'th pad in pads
- */
-enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx);
-
-/**
- * The number of the filter inputs is not determined just by AVFilter.inputs.
- * The filter might add additional inputs during initialization depending on the
- * options supplied to it.
- */
-#define AVFILTER_FLAG_DYNAMIC_INPUTS        (1 << 0)
-/**
- * The number of the filter outputs is not determined just by AVFilter.outputs.
- * The filter might add additional outputs during initialization depending on
- * the options supplied to it.
- */
-#define AVFILTER_FLAG_DYNAMIC_OUTPUTS       (1 << 1)
-/**
- * The filter supports multithreading by splitting frames into multiple parts
- * and processing them concurrently.
- */
-#define AVFILTER_FLAG_SLICE_THREADS         (1 << 2)
-/**
- * Some filters support a generic "enable" expression option that can be used
- * to enable or disable a filter in the timeline. Filters supporting this
- * option have this flag set. When the enable expression is false, the default
- * no-op filter_frame() function is called in place of the filter_frame()
- * callback defined on each input pad, thus the frame is passed unchanged to
- * the next filters.
- */
-#define AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC  (1 << 16)
-/**
- * Same as AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, except that the filter will
- * have its filter_frame() callback(s) called as usual even when the enable
- * expression is false. The filter will disable filtering within the
- * filter_frame() callback(s) itself, for example executing code depending on
- * the AVFilterContext->is_disabled value.
- */
-#define AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL (1 << 17)
-/**
- * Handy mask to test whether the filter supports or no the timeline feature
- * (internally or generically).
- */
-#define AVFILTER_FLAG_SUPPORT_TIMELINE (AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL)
-
-/**
- * Filter definition. This defines the pads a filter contains, and all the
- * callback functions used to interact with the filter.
- */
-typedef struct AVFilter {
-    /**
-     * Filter name. Must be non-NULL and unique among filters.
-     */
-    const char *name;
-
-    /**
-     * A description of the filter. May be NULL.
-     *
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *description;
-
-    /**
-     * List of inputs, terminated by a zeroed element.
-     *
-     * NULL if there are no (static) inputs. Instances of filters with
-     * AVFILTER_FLAG_DYNAMIC_INPUTS set may have more inputs than present in
-     * this list.
-     */
-    const AVFilterPad *inputs;
-    /**
-     * List of outputs, terminated by a zeroed element.
-     *
-     * NULL if there are no (static) outputs. Instances of filters with
-     * AVFILTER_FLAG_DYNAMIC_OUTPUTS set may have more outputs than present in
-     * this list.
-     */
-    const AVFilterPad *outputs;
-
-    /**
-     * A class for the private data, used to declare filter private AVOptions.
-     * This field is NULL for filters that do not declare any options.
-     *
-     * If this field is non-NULL, the first member of the filter private data
-     * must be a pointer to AVClass, which will be set by libavfilter generic
-     * code to this class.
-     */
-    const AVClass *priv_class;
-
-    /**
-     * A combination of AVFILTER_FLAG_*
-     */
-    int flags;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavfilter and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * Filter pre-initialization function
-     *
-     * This callback will be called immediately after the filter context is
-     * allocated, to allow allocating and initing sub-objects.
-     *
-     * If this callback is not NULL, the uninit callback will be called on
-     * allocation failure.
-     *
-     * @return 0 on success,
-     *         AVERROR code on failure (but the code will be
-     *           dropped and treated as ENOMEM by the calling code)
-     */
-    int (*preinit)(AVFilterContext *ctx);
-
-    /**
-     * Filter initialization function.
-     *
-     * This callback will be called only once during the filter lifetime, after
-     * all the options have been set, but before links between filters are
-     * established and format negotiation is done.
-     *
-     * Basic filter initialization should be done here. Filters with dynamic
-     * inputs and/or outputs should create those inputs/outputs here based on
-     * provided options. No more changes to this filter's inputs/outputs can be
-     * done after this callback.
-     *
-     * This callback must not assume that the filter links exist or frame
-     * parameters are known.
-     *
-     * @ref AVFilter.uninit "uninit" is guaranteed to be called even if
-     * initialization fails, so this callback does not have to clean up on
-     * failure.
-     *
-     * @return 0 on success, a negative AVERROR on failure
-     */
-    int (*init)(AVFilterContext *ctx);
-
-    /**
-     * Should be set instead of @ref AVFilter.init "init" by the filters that
-     * want to pass a dictionary of AVOptions to nested contexts that are
-     * allocated during init.
-     *
-     * On return, the options dict should be freed and replaced with one that
-     * contains all the options which could not be processed by this filter (or
-     * with NULL if all the options were processed).
-     *
-     * Otherwise the semantics is the same as for @ref AVFilter.init "init".
-     */
-    int (*init_dict)(AVFilterContext *ctx, AVDictionary **options);
-
-    /**
-     * Filter uninitialization function.
-     *
-     * Called only once right before the filter is freed. Should deallocate any
-     * memory held by the filter, release any buffer references, etc. It does
-     * not need to deallocate the AVFilterContext.priv memory itself.
-     *
-     * This callback may be called even if @ref AVFilter.init "init" was not
-     * called or failed, so it must be prepared to handle such a situation.
-     */
-    void (*uninit)(AVFilterContext *ctx);
-
-    /**
-     * Query formats supported by the filter on its inputs and outputs.
-     *
-     * This callback is called after the filter is initialized (so the inputs
-     * and outputs are fixed), shortly before the format negotiation. This
-     * callback may be called more than once.
-     *
-     * This callback must set AVFilterLink.out_formats on every input link and
-     * AVFilterLink.in_formats on every output link to a list of pixel/sample
-     * formats that the filter supports on that link. For audio links, this
-     * filter must also set @ref AVFilterLink.in_samplerates "in_samplerates" /
-     * @ref AVFilterLink.out_samplerates "out_samplerates" and
-     * @ref AVFilterLink.in_channel_layouts "in_channel_layouts" /
-     * @ref AVFilterLink.out_channel_layouts "out_channel_layouts" analogously.
-     *
-     * This callback may be NULL for filters with one input, in which case
-     * libavfilter assumes that it supports all input formats and preserves
-     * them on output.
-     *
-     * @return zero on success, a negative value corresponding to an
-     * AVERROR code otherwise
-     */
-    int (*query_formats)(AVFilterContext *);
-
-    int priv_size;      ///< size of private data to allocate for the filter
-
-    int flags_internal; ///< Additional flags for avfilter internal use only.
-
-    /**
-     * Used by the filter registration system. Must not be touched by any other
-     * code.
-     */
-    struct AVFilter *next;
-
-    /**
-     * Make the filter instance process a command.
-     *
-     * @param cmd    the command to process, for handling simplicity all commands must be alphanumeric only
-     * @param arg    the argument for the command
-     * @param res    a buffer with size res_size where the filter(s) can return a response. This must not change when the command is not supported.
-     * @param flags  if AVFILTER_CMD_FLAG_FAST is set and the command would be
-     *               time consuming then a filter should treat it like an unsupported command
-     *
-     * @returns >=0 on success otherwise an error code.
-     *          AVERROR(ENOSYS) on unsupported commands
-     */
-    int (*process_command)(AVFilterContext *, const char *cmd, const char *arg, char *res, int res_len, int flags);
-
-    /**
-     * Filter initialization function, alternative to the init()
-     * callback. Args contains the user-supplied parameters, opaque is
-     * used for providing binary data.
-     */
-    int (*init_opaque)(AVFilterContext *ctx, void *opaque);
-
-    /**
-     * Filter activation function.
-     *
-     * Called when any processing is needed from the filter, instead of any
-     * filter_frame and request_frame on pads.
-     *
-     * The function must examine inlinks and outlinks and perform a single
-     * step of processing. If there is nothing to do, the function must do
-     * nothing and not return an error. If more steps are or may be
-     * possible, it must use ff_filter_set_ready() to schedule another
-     * activation.
-     */
-    int (*activate)(AVFilterContext *ctx);
-} AVFilter;
-
-/**
- * Process multiple parts of the frame concurrently.
- */
-#define AVFILTER_THREAD_SLICE (1 << 0)
-
-typedef struct AVFilterInternal AVFilterInternal;
-
-/** An instance of a filter */
-struct AVFilterContext {
-    const AVClass *av_class;        ///< needed for av_log() and filters common options
-
-    const AVFilter *filter;         ///< the AVFilter of which this is an instance
-
-    char *name;                     ///< name of this filter instance
-
-    AVFilterPad   *input_pads;      ///< array of input pads
-    AVFilterLink **inputs;          ///< array of pointers to input links
-    unsigned    nb_inputs;          ///< number of input pads
-
-    AVFilterPad   *output_pads;     ///< array of output pads
-    AVFilterLink **outputs;         ///< array of pointers to output links
-    unsigned    nb_outputs;         ///< number of output pads
-
-    void *priv;                     ///< private data for use by the filter
-
-    struct AVFilterGraph *graph;    ///< filtergraph this filter belongs to
-
-    /**
-     * Type of multithreading being allowed/used. A combination of
-     * AVFILTER_THREAD_* flags.
-     *
-     * May be set by the caller before initializing the filter to forbid some
-     * or all kinds of multithreading for this filter. The default is allowing
-     * everything.
-     *
-     * When the filter is initialized, this field is combined using bit AND with
-     * AVFilterGraph.thread_type to get the final mask used for determining
-     * allowed threading types. I.e. a threading type needs to be set in both
-     * to be allowed.
-     *
-     * After the filter is initialized, libavfilter sets this field to the
-     * threading type that is actually used (0 for no multithreading).
-     */
-    int thread_type;
-
-    /**
-     * An opaque struct for libavfilter internal use.
-     */
-    AVFilterInternal *internal;
-
-    struct AVFilterCommand *command_queue;
-
-    char *enable_str;               ///< enable expression string
-    void *enable;                   ///< parsed expression (AVExpr*)
-    double *var_values;             ///< variable values for the enable expression
-    int is_disabled;                ///< the enabled state from the last expression evaluation
-
-    /**
-     * For filters which will create hardware frames, sets the device the
-     * filter should create them in.  All other filters will ignore this field:
-     * in particular, a filter which consumes or processes hardware frames will
-     * instead use the hw_frames_ctx field in AVFilterLink to carry the
-     * hardware context information.
-     */
-    AVBufferRef *hw_device_ctx;
-
-    /**
-     * Max number of threads allowed in this filter instance.
-     * If <= 0, its value is ignored.
-     * Overrides global number of threads set per filter graph.
-     */
-    int nb_threads;
-
-    /**
-     * Ready status of the filter.
-     * A non-0 value means that the filter needs activating;
-     * a higher value suggests a more urgent activation.
-     */
-    unsigned ready;
-};
-
-/**
- * A link between two filters. This contains pointers to the source and
- * destination filters between which this link exists, and the indexes of
- * the pads involved. In addition, this link also contains the parameters
- * which have been negotiated and agreed upon between the filter, such as
- * image dimensions, format, etc.
- *
- * Applications must not normally access the link structure directly.
- * Use the buffersrc and buffersink API instead.
- * In the future, access to the header may be reserved for filters
- * implementation.
- */
-struct AVFilterLink {
-    AVFilterContext *src;       ///< source filter
-    AVFilterPad *srcpad;        ///< output pad on the source filter
-
-    AVFilterContext *dst;       ///< dest filter
-    AVFilterPad *dstpad;        ///< input pad on the dest filter
-
-    enum AVMediaType type;      ///< filter media type
-
-    /* These parameters apply only to video */
-    int w;                      ///< agreed upon image width
-    int h;                      ///< agreed upon image height
-    AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
-    /* These parameters apply only to audio */
-    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/channel_layout.h)
-    int sample_rate;            ///< samples per second
-
-    int format;                 ///< agreed upon media format
-
-    /**
-     * Define the time base used by the PTS of the frames/samples
-     * which will pass through this link.
-     * During the configuration stage, each filter is supposed to
-     * change only the output timebase, while the timebase of the
-     * input link is assumed to be an unchangeable property.
-     */
-    AVRational time_base;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavfilter and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    /**
-     * Lists of formats and channel layouts supported by the input and output
-     * filters respectively. These lists are used for negotiating the format
-     * to actually be used, which will be loaded into the format and
-     * channel_layout members, above, when chosen.
-     *
-     */
-    AVFilterFormats *in_formats;
-    AVFilterFormats *out_formats;
-
-    /**
-     * Lists of channel layouts and sample rates used for automatic
-     * negotiation.
-     */
-    AVFilterFormats  *in_samplerates;
-    AVFilterFormats *out_samplerates;
-    struct AVFilterChannelLayouts  *in_channel_layouts;
-    struct AVFilterChannelLayouts *out_channel_layouts;
-
-    /**
-     * Audio only, the destination filter sets this to a non-zero value to
-     * request that buffers with the given number of samples should be sent to
-     * it. AVFilterPad.needs_fifo must also be set on the corresponding input
-     * pad.
-     * Last buffer before EOF will be padded with silence.
-     */
-    int request_samples;
-
-    /** stage of the initialization of the link properties (dimensions, etc) */
-    enum {
-        AVLINK_UNINIT = 0,      ///< not started
-        AVLINK_STARTINIT,       ///< started, but incomplete
-        AVLINK_INIT             ///< complete
-    } init_state;
-
-    /**
-     * Graph the filter belongs to.
-     */
-    struct AVFilterGraph *graph;
-
-    /**
-     * Current timestamp of the link, as defined by the most recent
-     * frame(s), in link time_base units.
-     */
-    int64_t current_pts;
-
-    /**
-     * Current timestamp of the link, as defined by the most recent
-     * frame(s), in AV_TIME_BASE units.
-     */
-    int64_t current_pts_us;
-
-    /**
-     * Index in the age array.
-     */
-    int age_index;
-
-    /**
-     * Frame rate of the stream on the link, or 1/0 if unknown or variable;
-     * if left to 0/0, will be automatically copied from the first input
-     * of the source filter if it exists.
-     *
-     * Sources should set it to the best estimation of the real frame rate.
-     * If the source frame rate is unknown or variable, set this to 1/0.
-     * Filters should update it if necessary depending on their function.
-     * Sinks can use it to set a default output frame rate.
-     * It is similar to the r_frame_rate field in AVStream.
-     */
-    AVRational frame_rate;
-
-    /**
-     * Buffer partially filled with samples to achieve a fixed/minimum size.
-     */
-    AVFrame *partial_buf;
-
-    /**
-     * Size of the partial buffer to allocate.
-     * Must be between min_samples and max_samples.
-     */
-    int partial_buf_size;
-
-    /**
-     * Minimum number of samples to filter at once. If filter_frame() is
-     * called with fewer samples, it will accumulate them in partial_buf.
-     * This field and the related ones must not be changed after filtering
-     * has started.
-     * If 0, all related fields are ignored.
-     */
-    int min_samples;
-
-    /**
-     * Maximum number of samples to filter at once. If filter_frame() is
-     * called with more samples, it will split them.
-     */
-    int max_samples;
-
-    /**
-     * Number of channels.
-     */
-    int channels;
-
-    /**
-     * Link processing flags.
-     */
-    unsigned flags;
-
-    /**
-     * Number of past frames sent through the link.
-     */
-    int64_t frame_count_in, frame_count_out;
-
-    /**
-     * A pointer to a FFFramePool struct.
-     */
-    void *frame_pool;
-
-    /**
-     * True if a frame is currently wanted on the output of this filter.
-     * Set when ff_request_frame() is called by the output,
-     * cleared when a frame is filtered.
-     */
-    int frame_wanted_out;
-
-    /**
-     * For hwaccel pixel formats, this should be a reference to the
-     * AVHWFramesContext describing the frames.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-#ifndef FF_INTERNAL_FIELDS
-
-    /**
-     * Internal structure members.
-     * The fields below this limit are internal for libavfilter's use
-     * and must in no way be accessed by applications.
-     */
-    char reserved[0xF000];
-
-#else /* FF_INTERNAL_FIELDS */
-
-    /**
-     * Queue of frames waiting to be filtered.
-     */
-    FFFrameQueue fifo;
-
-    /**
-     * If set, the source filter can not generate a frame as is.
-     * The goal is to avoid repeatedly calling the request_frame() method on
-     * the same link.
-     */
-    int frame_blocked_in;
-
-    /**
-     * Link input status.
-     * If not zero, all attempts of filter_frame will fail with the
-     * corresponding code.
-     */
-    int status_in;
-
-    /**
-     * Timestamp of the input status change.
-     */
-    int64_t status_in_pts;
-
-    /**
-     * Link output status.
-     * If not zero, all attempts of request_frame will fail with the
-     * corresponding code.
-     */
-    int status_out;
-
-#endif /* FF_INTERNAL_FIELDS */
-
-};
-
-/**
- * Link two filters together.
- *
- * @param src    the source filter
- * @param srcpad index of the output pad on the source filter
- * @param dst    the destination filter
- * @param dstpad index of the input pad on the destination filter
- * @return       zero on success
- */
-int avfilter_link(AVFilterContext *src, unsigned srcpad,
-                  AVFilterContext *dst, unsigned dstpad);
-
-/**
- * Free the link in *link, and set its pointer to NULL.
- */
-void avfilter_link_free(AVFilterLink **link);
-
-/**
- * Get the number of channels of a link.
- */
-int avfilter_link_get_channels(AVFilterLink *link);
-
-/**
- * Set the closed field of a link.
- * @deprecated applications are not supposed to mess with links, they should
- * close the sinks.
- */
-attribute_deprecated
-void avfilter_link_set_closed(AVFilterLink *link, int closed);
-
-/**
- * Negotiate the media format, dimensions, etc of all inputs to a filter.
- *
- * @param filter the filter to negotiate the properties for its inputs
- * @return       zero on successful negotiation
- */
-int avfilter_config_links(AVFilterContext *filter);
-
-#define AVFILTER_CMD_FLAG_ONE   1 ///< Stop once a filter understood the command (for target=all for example), fast filters are favored automatically
-#define AVFILTER_CMD_FLAG_FAST  2 ///< Only execute command when its fast (like a video out that supports contrast adjustment in hw)
-
-/**
- * Make the filter instance process a command.
- * It is recommended to use avfilter_graph_send_command().
- */
-int avfilter_process_command(AVFilterContext *filter, const char *cmd, const char *arg, char *res, int res_len, int flags);
-
-/** Initialize the filter system. Register all builtin filters. */
-void avfilter_register_all(void);
-
-#if FF_API_OLD_FILTER_REGISTER
-/** Uninitialize the filter system. Unregister all filters. */
-attribute_deprecated
-void avfilter_uninit(void);
-#endif
-
-/**
- * Register a filter. This is only needed if you plan to use
- * avfilter_get_by_name later to lookup the AVFilter structure by name. A
- * filter can still by instantiated with avfilter_graph_alloc_filter even if it
- * is not registered.
- *
- * @param filter the filter to register
- * @return 0 if the registration was successful, a negative value
- * otherwise
- */
-int avfilter_register(AVFilter *filter);
-
-/**
- * Get a filter definition matching the given name.
- *
- * @param name the filter name to find
- * @return     the filter definition, if any matching one is registered.
- *             NULL if none found.
- */
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
-AVFilter *avfilter_get_by_name(const char *name);
-
-/**
- * Iterate over all registered filters.
- * @return If prev is non-NULL, next registered filter after prev or NULL if
- * prev is the last filter. If prev is NULL, return the first registered filter.
- */
-const AVFilter *avfilter_next(const AVFilter *prev);
-
-#if FF_API_OLD_FILTER_REGISTER
-/**
- * If filter is NULL, returns a pointer to the first registered filter pointer,
- * if filter is non-NULL, returns the next pointer after filter.
- * If the returned pointer points to NULL, the last registered filter
- * was already reached.
- * @deprecated use avfilter_next()
- */
-attribute_deprecated
-AVFilter **av_filter_next(AVFilter **filter);
-#endif
-
-#if FF_API_AVFILTER_OPEN
-/**
- * Create a filter instance.
- *
- * @param filter_ctx put here a pointer to the created filter context
- * on success, NULL on failure
- * @param filter    the filter to create an instance of
- * @param inst_name Name to give to the new instance. Can be NULL for none.
- * @return >= 0 in case of success, a negative error code otherwise
- * @deprecated use avfilter_graph_alloc_filter() instead
- */
-attribute_deprecated
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
-#endif
-
-
-#if FF_API_AVFILTER_INIT_FILTER
-/**
- * Initialize a filter.
- *
- * @param filter the filter to initialize
- * @param args   A string of parameters to use when initializing the filter.
- *               The format and meaning of this string varies by filter.
- * @param opaque Any extra non-string data needed by the filter. The meaning
- *               of this parameter varies by filter.
- * @return       zero on success
- */
-attribute_deprecated
-int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
-#endif
-
-/**
- * Initialize a filter with the supplied parameters.
- *
- * @param ctx  uninitialized filter context to initialize
- * @param args Options to initialize the filter with. This must be a
- *             ':'-separated list of options in the 'key=value' form.
- *             May be NULL if the options have been set directly using the
- *             AVOptions API or there are no options that need to be set.
- * @return 0 on success, a negative AVERROR on failure
- */
-int avfilter_init_str(AVFilterContext *ctx, const char *args);
-
-/**
- * Initialize a filter with the supplied dictionary of options.
- *
- * @param ctx     uninitialized filter context to initialize
- * @param options An AVDictionary filled with options for this filter. On
- *                return this parameter will be destroyed and replaced with
- *                a dict containing options that were not found. This dictionary
- *                must be freed by the caller.
- *                May be NULL, then this function is equivalent to
- *                avfilter_init_str() with the second parameter set to NULL.
- * @return 0 on success, a negative AVERROR on failure
- *
- * @note This function and avfilter_init_str() do essentially the same thing,
- * the difference is in manner in which the options are passed. It is up to the
- * calling code to choose whichever is more preferable. The two functions also
- * behave differently when some of the provided options are not declared as
- * supported by the filter. In such a case, avfilter_init_str() will fail, but
- * this function will leave those extra options in the options AVDictionary and
- * continue as usual.
- */
-int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options);
-
-/**
- * Free a filter context. This will also remove the filter from its
- * filtergraph's list of filters.
- *
- * @param filter the filter to free
- */
-void avfilter_free(AVFilterContext *filter);
-
-/**
- * Insert a filter in the middle of an existing link.
- *
- * @param link the link into which the filter should be inserted
- * @param filt the filter to be inserted
- * @param filt_srcpad_idx the input pad on the filter to connect
- * @param filt_dstpad_idx the output pad on the filter to connect
- * @return     zero on success
- */
-int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
-                           unsigned filt_srcpad_idx, unsigned filt_dstpad_idx);
-
-/**
- * @return AVClass for AVFilterContext.
- *
- * @see av_opt_find().
- */
-const AVClass *avfilter_get_class(void);
-
-typedef struct AVFilterGraphInternal AVFilterGraphInternal;
-
-/**
- * A function pointer passed to the @ref AVFilterGraph.execute callback to be
- * executed multiple times, possibly in parallel.
- *
- * @param ctx the filter context the job belongs to
- * @param arg an opaque parameter passed through from @ref
- *            AVFilterGraph.execute
- * @param jobnr the index of the job being executed
- * @param nb_jobs the total number of jobs
- *
- * @return 0 on success, a negative AVERROR on error
- */
-typedef int (avfilter_action_func)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
-
-/**
- * A function executing multiple jobs, possibly in parallel.
- *
- * @param ctx the filter context to which the jobs belong
- * @param func the function to be called multiple times
- * @param arg the argument to be passed to func
- * @param ret a nb_jobs-sized array to be filled with return values from each
- *            invocation of func
- * @param nb_jobs the number of jobs to execute
- *
- * @return 0 on success, a negative AVERROR on error
- */
-typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func *func,
-                                    void *arg, int *ret, int nb_jobs);
-
-typedef struct AVFilterGraph {
-    const AVClass *av_class;
-    AVFilterContext **filters;
-    unsigned nb_filters;
-
-    char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
-#if FF_API_LAVR_OPTS
-    attribute_deprecated char *resample_lavr_opts;   ///< libavresample options to use for the auto-inserted resample filters
-#endif
-
-    /**
-     * Type of multithreading allowed for filters in this graph. A combination
-     * of AVFILTER_THREAD_* flags.
-     *
-     * May be set by the caller at any point, the setting will apply to all
-     * filters initialized after that. The default is allowing everything.
-     *
-     * When a filter in this graph is initialized, this field is combined using
-     * bit AND with AVFilterContext.thread_type to get the final mask used for
-     * determining allowed threading types. I.e. a threading type needs to be
-     * set in both to be allowed.
-     */
-    int thread_type;
-
-    /**
-     * Maximum number of threads used by filters in this graph. May be set by
-     * the caller before adding any filters to the filtergraph. Zero (the
-     * default) means that the number of threads is determined automatically.
-     */
-    int nb_threads;
-
-    /**
-     * Opaque object for libavfilter internal use.
-     */
-    AVFilterGraphInternal *internal;
-
-    /**
-     * Opaque user data. May be set by the caller to an arbitrary value, e.g. to
-     * be used from callbacks like @ref AVFilterGraph.execute.
-     * Libavfilter will not touch this field in any way.
-     */
-    void *opaque;
-
-    /**
-     * This callback may be set by the caller immediately after allocating the
-     * graph and before adding any filters to it, to provide a custom
-     * multithreading implementation.
-     *
-     * If set, filters with slice threading capability will call this callback
-     * to execute multiple jobs in parallel.
-     *
-     * If this field is left unset, libavfilter will use its internal
-     * implementation, which may or may not be multithreaded depending on the
-     * platform and build options.
-     */
-    avfilter_execute_func *execute;
-
-    char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions
-
-    /**
-     * Private fields
-     *
-     * The following fields are for internal use only.
-     * Their type, offset, number and semantic can change without notice.
-     */
-
-    AVFilterLink **sink_links;
-    int sink_links_count;
-
-    unsigned disable_auto_convert;
-} AVFilterGraph;
-
-/**
- * Allocate a filter graph.
- *
- * @return the allocated filter graph on success or NULL.
- */
-AVFilterGraph *avfilter_graph_alloc(void);
-
-/**
- * Create a new filter instance in a filter graph.
- *
- * @param graph graph in which the new filter will be used
- * @param filter the filter to create an instance of
- * @param name Name to give to the new instance (will be copied to
- *             AVFilterContext.name). This may be used by the caller to identify
- *             different filters, libavfilter itself assigns no semantics to
- *             this parameter. May be NULL.
- *
- * @return the context of the newly created filter instance (note that it is
- *         also retrievable directly through AVFilterGraph.filters or with
- *         avfilter_graph_get_filter()) on success or NULL on failure.
- */
-AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
-                                             const AVFilter *filter,
-                                             const char *name);
-
-/**
- * Get a filter instance identified by instance name from graph.
- *
- * @param graph filter graph to search through.
- * @param name filter instance name (should be unique in the graph).
- * @return the pointer to the found filter instance or NULL if it
- * cannot be found.
- */
-AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, const char *name);
-
-#if FF_API_AVFILTER_OPEN
-/**
- * Add an existing filter instance to a filter graph.
- *
- * @param graphctx  the filter graph
- * @param filter the filter to be added
- *
- * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
- * filter graph
- */
-attribute_deprecated
-int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
-#endif
-
-/**
- * Create and add a filter instance into an existing graph.
- * The filter instance is created from the filter filt and inited
- * with the parameters args and opaque.
- *
- * In case of success put in *filt_ctx the pointer to the created
- * filter instance, otherwise set *filt_ctx to NULL.
- *
- * @param name the instance name to give to the created filter instance
- * @param graph_ctx the filter graph
- * @return a negative AVERROR error code in case of failure, a non
- * negative value otherwise
- */
-int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
-                                 const char *name, const char *args, void *opaque,
-                                 AVFilterGraph *graph_ctx);
-
-/**
- * Enable or disable automatic format conversion inside the graph.
- *
- * Note that format conversion can still happen inside explicitly inserted
- * scale and aresample filters.
- *
- * @param flags  any of the AVFILTER_AUTO_CONVERT_* constants
- */
-void avfilter_graph_set_auto_convert(AVFilterGraph *graph, unsigned flags);
-
-enum {
-    AVFILTER_AUTO_CONVERT_ALL  =  0, /**< all automatic conversions enabled */
-    AVFILTER_AUTO_CONVERT_NONE = -1, /**< all automatic conversions disabled */
-};
-
-/**
- * Check validity and configure all the links and formats in the graph.
- *
- * @param graphctx the filter graph
- * @param log_ctx context used for logging
- * @return >= 0 in case of success, a negative AVERROR code otherwise
- */
-int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
-
-/**
- * Free a graph, destroy its links, and set *graph to NULL.
- * If *graph is NULL, do nothing.
- */
-void avfilter_graph_free(AVFilterGraph **graph);
-
-/**
- * A linked-list of the inputs/outputs of the filter chain.
- *
- * This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
- * where it is used to communicate open (unlinked) inputs and outputs from and
- * to the caller.
- * This struct specifies, per each not connected pad contained in the graph, the
- * filter context and the pad index required for establishing a link.
- */
-typedef struct AVFilterInOut {
-    /** unique name for this input/output in the list */
-    char *name;
-
-    /** filter context associated to this input/output */
-    AVFilterContext *filter_ctx;
-
-    /** index of the filt_ctx pad to use for linking */
-    int pad_idx;
-
-    /** next input/input in the list, NULL if this is the last */
-    struct AVFilterInOut *next;
-} AVFilterInOut;
-
-/**
- * Allocate a single AVFilterInOut entry.
- * Must be freed with avfilter_inout_free().
- * @return allocated AVFilterInOut on success, NULL on failure.
- */
-AVFilterInOut *avfilter_inout_alloc(void);
-
-/**
- * Free the supplied list of AVFilterInOut and set *inout to NULL.
- * If *inout is NULL, do nothing.
- */
-void avfilter_inout_free(AVFilterInOut **inout);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * @note The caller must provide the lists of inputs and outputs,
- * which therefore must be known before calling the function.
- *
- * @note The inputs parameter describes inputs of the already existing
- * part of the graph; i.e. from the point of view of the newly created
- * part, they are outputs. Similarly the outputs parameter describes
- * outputs of the already existing filters, which are provided as
- * inputs to the parsed filters.
- *
- * @param graph   the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param inputs  linked list to the inputs of the graph
- * @param outputs linked list to the outputs of the graph
- * @return zero on success, a negative AVERROR code on error
- */
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
-                         AVFilterInOut *inputs, AVFilterInOut *outputs,
-                         void *log_ctx);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * In the graph filters description, if the input label of the first
- * filter is not specified, "in" is assumed; if the output label of
- * the last filter is not specified, "out" is assumed.
- *
- * @param graph   the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param inputs  pointer to a linked list to the inputs of the graph, may be NULL.
- *                If non-NULL, *inputs is updated to contain the list of open inputs
- *                after the parsing, should be freed with avfilter_inout_free().
- * @param outputs pointer to a linked list to the outputs of the graph, may be NULL.
- *                If non-NULL, *outputs is updated to contain the list of open outputs
- *                after the parsing, should be freed with avfilter_inout_free().
- * @return non negative on success, a negative AVERROR code on error
- */
-int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters,
-                             AVFilterInOut **inputs, AVFilterInOut **outputs,
-                             void *log_ctx);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * @param[in]  graph   the filter graph where to link the parsed graph context
- * @param[in]  filters string to be parsed
- * @param[out] inputs  a linked list of all free (unlinked) inputs of the
- *                     parsed graph will be returned here. It is to be freed
- *                     by the caller using avfilter_inout_free().
- * @param[out] outputs a linked list of all free (unlinked) outputs of the
- *                     parsed graph will be returned here. It is to be freed by the
- *                     caller using avfilter_inout_free().
- * @return zero on success, a negative AVERROR code on error
- *
- * @note This function returns the inputs and outputs that are left
- * unlinked after parsing the graph and the caller then deals with
- * them.
- * @note This function makes no reference whatsoever to already
- * existing parts of the graph and the inputs parameter will on return
- * contain inputs of the newly parsed part of the graph.  Analogously
- * the outputs parameter will contain outputs of the newly created
- * filters.
- */
-int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
-                          AVFilterInOut **inputs,
-                          AVFilterInOut **outputs);
-
-/**
- * Send a command to one or more filter instances.
- *
- * @param graph  the filter graph
- * @param target the filter(s) to which the command should be sent
- *               "all" sends to all filters
- *               otherwise it can be a filter or filter instance name
- *               which will send the command to all matching filters.
- * @param cmd    the command to send, for handling simplicity all commands must be alphanumeric only
- * @param arg    the argument for the command
- * @param res    a buffer with size res_size where the filter(s) can return a response.
- *
- * @returns >=0 on success otherwise an error code.
- *              AVERROR(ENOSYS) on unsupported commands
- */
-int avfilter_graph_send_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, char *res, int res_len, int flags);
-
-/**
- * Queue a command for one or more filter instances.
- *
- * @param graph  the filter graph
- * @param target the filter(s) to which the command should be sent
- *               "all" sends to all filters
- *               otherwise it can be a filter or filter instance name
- *               which will send the command to all matching filters.
- * @param cmd    the command to sent, for handling simplicity all commands must be alphanumeric only
- * @param arg    the argument for the command
- * @param ts     time at which the command should be sent to the filter
- *
- * @note As this executes commands after this function returns, no return code
- *       from the filter is provided, also AVFILTER_CMD_FLAG_ONE is not supported.
- */
-int avfilter_graph_queue_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, int flags, double ts);
-
-
-/**
- * Dump a graph into a human-readable string representation.
- *
- * @param graph    the graph to dump
- * @param options  formatting options; currently ignored
- * @return  a string, or NULL in case of memory allocation failure;
- *          the string must be freed using av_free
- */
-char *avfilter_graph_dump(AVFilterGraph *graph, const char *options);
-
-/**
- * Request a frame on the oldest sink link.
- *
- * If the request returns AVERROR_EOF, try the next.
- *
- * Note that this function is not meant to be the sole scheduling mechanism
- * of a filtergraph, only a convenience function to help drain a filtergraph
- * in a balanced way under normal circumstances.
- *
- * Also note that AVERROR_EOF does not mean that frames did not arrive on
- * some of the sinks during the process.
- * When there are multiple sink links, in case the requested link
- * returns an EOF, this may cause a filter to flush pending frames
- * which are sent to another sink link, although unrequested.
- *
- * @return  the return value of ff_request_frame(),
- *          or AVERROR_EOF if all links returned AVERROR_EOF
- */
-int avfilter_graph_request_oldest(AVFilterGraph *graph);
-
-/**
- * @}
- */
-
-#endif /* AVFILTER_AVFILTER_H */
diff --git a/dependencies2013/win32/include/libavfilter/avfiltergraph.h b/dependencies2013/win32/include/libavfilter/avfiltergraph.h
deleted file mode 100644
index b31d581c..00000000
--- a/dependencies2013/win32/include/libavfilter/avfiltergraph.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Filter graphs
- * copyright (c) 2007 Bobby Bingham
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFILTER_AVFILTERGRAPH_H
-#define AVFILTER_AVFILTERGRAPH_H
-
-#include "avfilter.h"
-#include "libavutil/log.h"
-
-#endif /* AVFILTER_AVFILTERGRAPH_H */
diff --git a/dependencies2013/win32/include/libavfilter/buffersink.h b/dependencies2013/win32/include/libavfilter/buffersink.h
deleted file mode 100644
index 21d6bb50..00000000
--- a/dependencies2013/win32/include/libavfilter/buffersink.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFILTER_BUFFERSINK_H
-#define AVFILTER_BUFFERSINK_H
-
-/**
- * @file
- * @ingroup lavfi_buffersink
- * memory buffer sink API for audio and video
- */
-
-#include "avfilter.h"
-
-/**
- * @defgroup lavfi_buffersink Buffer sink API
- * @ingroup lavfi
- * @{
- */
-
-/**
- * Get a frame with filtered data from sink and put it in frame.
- *
- * @param ctx    pointer to a buffersink or abuffersink filter context.
- * @param frame  pointer to an allocated frame that will be filled with data.
- *               The data must be freed using av_frame_unref() / av_frame_free()
- * @param flags  a combination of AV_BUFFERSINK_FLAG_* flags
- *
- * @return  >= 0 in for success, a negative AVERROR code for failure.
- */
-int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags);
-
-/**
- * Tell av_buffersink_get_buffer_ref() to read video/samples buffer
- * reference, but not remove it from the buffer. This is useful if you
- * need only to read a video/samples buffer, without to fetch it.
- */
-#define AV_BUFFERSINK_FLAG_PEEK 1
-
-/**
- * Tell av_buffersink_get_buffer_ref() not to request a frame from its input.
- * If a frame is already buffered, it is read (and removed from the buffer),
- * but if no frame is present, return AVERROR(EAGAIN).
- */
-#define AV_BUFFERSINK_FLAG_NO_REQUEST 2
-
-/**
- * Struct to use for initializing a buffersink context.
- */
-typedef struct AVBufferSinkParams {
-    const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE
-} AVBufferSinkParams;
-
-/**
- * Create an AVBufferSinkParams structure.
- *
- * Must be freed with av_free().
- */
-AVBufferSinkParams *av_buffersink_params_alloc(void);
-
-/**
- * Struct to use for initializing an abuffersink context.
- */
-typedef struct AVABufferSinkParams {
-    const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE
-    const int64_t *channel_layouts;         ///< list of allowed channel layouts, terminated by -1
-    const int *channel_counts;              ///< list of allowed channel counts, terminated by -1
-    int all_channel_counts;                 ///< if not 0, accept any channel count or layout
-    int *sample_rates;                      ///< list of allowed sample rates, terminated by -1
-} AVABufferSinkParams;
-
-/**
- * Create an AVABufferSinkParams structure.
- *
- * Must be freed with av_free().
- */
-AVABufferSinkParams *av_abuffersink_params_alloc(void);
-
-/**
- * Set the frame size for an audio buffer sink.
- *
- * All calls to av_buffersink_get_buffer_ref will return a buffer with
- * exactly the specified number of samples, or AVERROR(EAGAIN) if there is
- * not enough. The last buffer at EOF will be padded with 0.
- */
-void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size);
-
-/**
- * @defgroup lavfi_buffersink_accessors Buffer sink accessors
- * Get the properties of the stream
- * @{
- */
-
-enum AVMediaType av_buffersink_get_type                (const AVFilterContext *ctx);
-AVRational       av_buffersink_get_time_base           (const AVFilterContext *ctx);
-int              av_buffersink_get_format              (const AVFilterContext *ctx);
-
-AVRational       av_buffersink_get_frame_rate          (const AVFilterContext *ctx);
-int              av_buffersink_get_w                   (const AVFilterContext *ctx);
-int              av_buffersink_get_h                   (const AVFilterContext *ctx);
-AVRational       av_buffersink_get_sample_aspect_ratio (const AVFilterContext *ctx);
-
-int              av_buffersink_get_channels            (const AVFilterContext *ctx);
-uint64_t         av_buffersink_get_channel_layout      (const AVFilterContext *ctx);
-int              av_buffersink_get_sample_rate         (const AVFilterContext *ctx);
-
-AVBufferRef *    av_buffersink_get_hw_frames_ctx       (const AVFilterContext *ctx);
-
-/** @} */
-
-/**
- * Get a frame with filtered data from sink and put it in frame.
- *
- * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
- * @param frame pointer to an allocated frame that will be filled with data.
- *              The data must be freed using av_frame_unref() / av_frame_free()
- *
- * @return
- *         - >= 0 if a frame was successfully returned.
- *         - AVERROR(EAGAIN) if no frames are available at this point; more
- *           input frames must be added to the filtergraph to get more output.
- *         - AVERROR_EOF if there will be no more output frames on this sink.
- *         - A different negative AVERROR code in other failure cases.
- */
-int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame);
-
-/**
- * Same as av_buffersink_get_frame(), but with the ability to specify the number
- * of samples read. This function is less efficient than
- * av_buffersink_get_frame(), because it copies the data around.
- *
- * @param ctx pointer to a context of the abuffersink AVFilter.
- * @param frame pointer to an allocated frame that will be filled with data.
- *              The data must be freed using av_frame_unref() / av_frame_free()
- *              frame will contain exactly nb_samples audio samples, except at
- *              the end of stream, when it can contain less than nb_samples.
- *
- * @return The return codes have the same meaning as for
- *         av_buffersink_get_samples().
- *
- * @warning do not mix this function with av_buffersink_get_frame(). Use only one or
- * the other with a single sink, not both.
- */
-int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples);
-
-/**
- * @}
- */
-
-#endif /* AVFILTER_BUFFERSINK_H */
diff --git a/dependencies2013/win32/include/libavfilter/buffersrc.h b/dependencies2013/win32/include/libavfilter/buffersrc.h
deleted file mode 100644
index 0652113f..00000000
--- a/dependencies2013/win32/include/libavfilter/buffersrc.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFILTER_BUFFERSRC_H
-#define AVFILTER_BUFFERSRC_H
-
-/**
- * @file
- * @ingroup lavfi_buffersrc
- * Memory buffer source API.
- */
-
-#include "avfilter.h"
-
-/**
- * @defgroup lavfi_buffersrc Buffer source API
- * @ingroup lavfi
- * @{
- */
-
-enum {
-
-    /**
-     * Do not check for format changes.
-     */
-    AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1,
-
-    /**
-     * Immediately push the frame to the output.
-     */
-    AV_BUFFERSRC_FLAG_PUSH = 4,
-
-    /**
-     * Keep a reference to the frame.
-     * If the frame if reference-counted, create a new reference; otherwise
-     * copy the frame data.
-     */
-    AV_BUFFERSRC_FLAG_KEEP_REF = 8,
-
-};
-
-/**
- * Get the number of failed requests.
- *
- * A failed request is when the request_frame method is called while no
- * frame is present in the buffer.
- * The number is reset when a frame is added.
- */
-unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src);
-
-/**
- * This structure contains the parameters describing the frames that will be
- * passed to this filter.
- *
- * It should be allocated with av_buffersrc_parameters_alloc() and freed with
- * av_free(). All the allocated fields in it remain owned by the caller.
- */
-typedef struct AVBufferSrcParameters {
-    /**
-     * video: the pixel format, value corresponds to enum AVPixelFormat
-     * audio: the sample format, value corresponds to enum AVSampleFormat
-     */
-    int format;
-    /**
-     * The timebase to be used for the timestamps on the input frames.
-     */
-    AVRational time_base;
-
-    /**
-     * Video only, the display dimensions of the input frames.
-     */
-    int width, height;
-
-    /**
-     * Video only, the sample (pixel) aspect ratio.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * Video only, the frame rate of the input video. This field must only be
-     * set to a non-zero value if input stream has a known constant framerate
-     * and should be left at its initial value if the framerate is variable or
-     * unknown.
-     */
-    AVRational frame_rate;
-
-    /**
-     * Video with a hwaccel pixel format only. This should be a reference to an
-     * AVHWFramesContext instance describing the input frames.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-    /**
-     * Audio only, the audio sampling rate in samples per secon.
-     */
-    int sample_rate;
-
-    /**
-     * Audio only, the audio channel layout
-     */
-    uint64_t channel_layout;
-} AVBufferSrcParameters;
-
-/**
- * Allocate a new AVBufferSrcParameters instance. It should be freed by the
- * caller with av_free().
- */
-AVBufferSrcParameters *av_buffersrc_parameters_alloc(void);
-
-/**
- * Initialize the buffersrc or abuffersrc filter with the provided parameters.
- * This function may be called multiple times, the later calls override the
- * previous ones. Some of the parameters may also be set through AVOptions, then
- * whatever method is used last takes precedence.
- *
- * @param ctx an instance of the buffersrc or abuffersrc filter
- * @param param the stream parameters. The frames later passed to this filter
- *              must conform to those parameters. All the allocated fields in
- *              param remain owned by the caller, libavfilter will make internal
- *              copies or references when necessary.
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_buffersrc_parameters_set(AVFilterContext *ctx, AVBufferSrcParameters *param);
-
-/**
- * Add a frame to the buffer source.
- *
- * @param ctx   an instance of the buffersrc filter
- * @param frame frame to be added. If the frame is reference counted, this
- * function will make a new reference to it. Otherwise the frame data will be
- * copied.
- *
- * @return 0 on success, a negative AVERROR on error
- *
- * This function is equivalent to av_buffersrc_add_frame_flags() with the
- * AV_BUFFERSRC_FLAG_KEEP_REF flag.
- */
-av_warn_unused_result
-int av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame);
-
-/**
- * Add a frame to the buffer source.
- *
- * @param ctx   an instance of the buffersrc filter
- * @param frame frame to be added. If the frame is reference counted, this
- * function will take ownership of the reference(s) and reset the frame.
- * Otherwise the frame data will be copied. If this function returns an error,
- * the input frame is not touched.
- *
- * @return 0 on success, a negative AVERROR on error.
- *
- * @note the difference between this function and av_buffersrc_write_frame() is
- * that av_buffersrc_write_frame() creates a new reference to the input frame,
- * while this function takes ownership of the reference passed to it.
- *
- * This function is equivalent to av_buffersrc_add_frame_flags() without the
- * AV_BUFFERSRC_FLAG_KEEP_REF flag.
- */
-av_warn_unused_result
-int av_buffersrc_add_frame(AVFilterContext *ctx, AVFrame *frame);
-
-/**
- * Add a frame to the buffer source.
- *
- * By default, if the frame is reference-counted, this function will take
- * ownership of the reference(s) and reset the frame. This can be controlled
- * using the flags.
- *
- * If this function returns an error, the input frame is not touched.
- *
- * @param buffer_src  pointer to a buffer source context
- * @param frame       a frame, or NULL to mark EOF
- * @param flags       a combination of AV_BUFFERSRC_FLAG_*
- * @return            >= 0 in case of success, a negative AVERROR code
- *                    in case of failure
- */
-av_warn_unused_result
-int av_buffersrc_add_frame_flags(AVFilterContext *buffer_src,
-                                 AVFrame *frame, int flags);
-
-/**
- * Close the buffer source after EOF.
- *
- * This is similar to passing NULL to av_buffersrc_add_frame_flags()
- * except it takes the timestamp of the EOF, i.e. the timestamp of the end
- * of the last frame.
- */
-int av_buffersrc_close(AVFilterContext *ctx, int64_t pts, unsigned flags);
-
-/**
- * @}
- */
-
-#endif /* AVFILTER_BUFFERSRC_H */
diff --git a/dependencies2013/win32/include/libavfilter/version.h b/dependencies2013/win32/include/libavfilter/version.h
deleted file mode 100644
index 788d0a72..00000000
--- a/dependencies2013/win32/include/libavfilter/version.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFILTER_VERSION_H
-#define AVFILTER_VERSION_H
-
-/**
- * @file
- * @ingroup lavfi
- * Libavfilter version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVFILTER_VERSION_MAJOR   6
-#define LIBAVFILTER_VERSION_MINOR 108
-#define LIBAVFILTER_VERSION_MICRO 100
-
-#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
-                                               LIBAVFILTER_VERSION_MINOR, \
-                                               LIBAVFILTER_VERSION_MICRO)
-#define LIBAVFILTER_VERSION     AV_VERSION(LIBAVFILTER_VERSION_MAJOR,   \
-                                           LIBAVFILTER_VERSION_MINOR,   \
-                                           LIBAVFILTER_VERSION_MICRO)
-#define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
-
-#define LIBAVFILTER_IDENT       "Lavfi" AV_STRINGIFY(LIBAVFILTER_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_OLD_FILTER_OPTS
-#define FF_API_OLD_FILTER_OPTS              (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-#ifndef FF_API_OLD_FILTER_OPTS_ERROR
-#define FF_API_OLD_FILTER_OPTS_ERROR        (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-#ifndef FF_API_AVFILTER_OPEN
-#define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-#ifndef FF_API_AVFILTER_INIT_FILTER
-#define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-#ifndef FF_API_OLD_FILTER_REGISTER
-#define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-#ifndef FF_API_NOCONST_GET_NAME
-#define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-#ifndef FF_API_LAVR_OPTS
-#define FF_API_LAVR_OPTS                    (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-
-#endif /* AVFILTER_VERSION_H */
diff --git a/dependencies2013/win32/include/libavformat/avformat.h b/dependencies2013/win32/include/libavformat/avformat.h
deleted file mode 100644
index b0de66ac..00000000
--- a/dependencies2013/win32/include/libavformat/avformat.h
+++ /dev/null
@@ -1,3008 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-/**
- * @file
- * @ingroup libavf
- * Main libavformat public API header
- */
-
-/**
- * @defgroup libavf libavformat
- * I/O and Muxing/Demuxing Library
- *
- * Libavformat (lavf) is a library for dealing with various media container
- * formats. Its main two purposes are demuxing - i.e. splitting a media file
- * into component streams, and the reverse process of muxing - writing supplied
- * data in a specified container format. It also has an @ref lavf_io
- * "I/O module" which supports a number of protocols for accessing the data (e.g.
- * file, tcp, http and others). Before using lavf, you need to call
- * av_register_all() to register all compiled muxers, demuxers and protocols.
- * Unless you are absolutely sure you won't use libavformat's network
- * capabilities, you should also call avformat_network_init().
- *
- * A supported input format is described by an AVInputFormat struct, conversely
- * an output format is described by AVOutputFormat. You can iterate over all
- * registered input/output formats using the av_iformat_next() /
- * av_oformat_next() functions. The protocols layer is not part of the public
- * API, so you can only get the names of supported protocols with the
- * avio_enum_protocols() function.
- *
- * Main lavf structure used for both muxing and demuxing is AVFormatContext,
- * which exports all information about the file being read or written. As with
- * most Libavformat structures, its size is not part of public ABI, so it cannot be
- * allocated on stack or directly with av_malloc(). To create an
- * AVFormatContext, use avformat_alloc_context() (some functions, like
- * avformat_open_input() might do that for you).
- *
- * Most importantly an AVFormatContext contains:
- * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
- * "output" format. It is either autodetected or set by user for input;
- * always set by user for output.
- * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
- * elementary streams stored in the file. AVStreams are typically referred to
- * using their index in this array.
- * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
- * set by user for input, always set by user for output (unless you are dealing
- * with an AVFMT_NOFILE format).
- *
- * @section lavf_options Passing options to (de)muxers
- * It is possible to configure lavf muxers and demuxers using the @ref avoptions
- * mechanism. Generic (format-independent) libavformat options are provided by
- * AVFormatContext, they can be examined from a user program by calling
- * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
- * from avformat_get_class()). Private (format-specific) options are provided by
- * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
- * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
- * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
- * if its AVClass is non-NULL, and the protocols layer. See the discussion on
- * nesting in @ref avoptions documentation to learn how to access those.
- *
- * @section urls
- * URL strings in libavformat are made of a scheme/protocol, a ':', and a
- * scheme specific string. URLs without a scheme and ':' used for local files
- * are supported but deprecated. "file:" should be used for local files.
- *
- * It is important that the scheme string is not taken from untrusted
- * sources without checks.
- *
- * Note that some schemes/protocols are quite powerful, allowing access to
- * both local and remote files, parts of them, concatenations of them, local
- * audio and video devices and so on.
- *
- * @{
- *
- * @defgroup lavf_decoding Demuxing
- * @{
- * Demuxers read a media file and split it into chunks of data (@em packets). A
- * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
- * single elementary stream. In the lavf API this process is represented by the
- * avformat_open_input() function for opening a file, av_read_frame() for
- * reading a single packet and finally avformat_close_input(), which does the
- * cleanup.
- *
- * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL, which
- * is passed to avformat_open_input(), as in the following code:
- * @code
- * const char    *url = "file:in.mp3";
- * AVFormatContext *s = NULL;
- * int ret = avformat_open_input(&s, url, NULL, NULL);
- * if (ret < 0)
- *     abort();
- * @endcode
- * The above code attempts to allocate an AVFormatContext, open the
- * specified file (autodetecting the format) and read the header, exporting the
- * information stored there into s. Some formats do not have a header or do not
- * store enough information there, so it is recommended that you call the
- * avformat_find_stream_info() function which tries to read and decode a few
- * frames to find missing information.
- *
- * In some cases you might want to preallocate an AVFormatContext yourself with
- * avformat_alloc_context() and do some tweaking on it before passing it to
- * avformat_open_input(). One such case is when you want to use custom functions
- * for reading input data instead of lavf internal I/O layer.
- * To do that, create your own AVIOContext with avio_alloc_context(), passing
- * your reading callbacks to it. Then set the @em pb field of your
- * AVFormatContext to newly created AVIOContext.
- *
- * Since the format of the opened file is in general not known until after
- * avformat_open_input() has returned, it is not possible to set demuxer private
- * options on a preallocated context. Instead, the options should be passed to
- * avformat_open_input() wrapped in an AVDictionary:
- * @code
- * AVDictionary *options = NULL;
- * av_dict_set(&options, "video_size", "640x480", 0);
- * av_dict_set(&options, "pixel_format", "rgb24", 0);
- *
- * if (avformat_open_input(&s, url, NULL, &options) < 0)
- *     abort();
- * av_dict_free(&options);
- * @endcode
- * This code passes the private options 'video_size' and 'pixel_format' to the
- * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
- * cannot know how to interpret raw video data otherwise. If the format turns
- * out to be something different than raw video, those options will not be
- * recognized by the demuxer and therefore will not be applied. Such unrecognized
- * options are then returned in the options dictionary (recognized options are
- * consumed). The calling program can handle such unrecognized options as it
- * wishes, e.g.
- * @code
- * AVDictionaryEntry *e;
- * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
- *     fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
- *     abort();
- * }
- * @endcode
- *
- * After you have finished reading the file, you must close it with
- * avformat_close_input(). It will free everything associated with the file.
- *
- * @section lavf_decoding_read Reading from an opened file
- * Reading data from an opened AVFormatContext is done by repeatedly calling
- * av_read_frame() on it. Each call, if successful, will return an AVPacket
- * containing encoded data for one AVStream, identified by
- * AVPacket.stream_index. This packet may be passed straight into the libavcodec
- * decoding functions avcodec_send_packet() or avcodec_decode_subtitle2() if the
- * caller wishes to decode the data.
- *
- * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
- * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
- * pts/dts, 0 for duration) if the stream does not provide them. The timing
- * information will be in AVStream.time_base units, i.e. it has to be
- * multiplied by the timebase to convert them to seconds.
- *
- * If AVPacket.buf is set on the returned packet, then the packet is
- * allocated dynamically and the user may keep it indefinitely.
- * Otherwise, if AVPacket.buf is NULL, the packet data is backed by a
- * static storage somewhere inside the demuxer and the packet is only valid
- * until the next av_read_frame() call or closing the file. If the caller
- * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
- * of it.
- * In both cases, the packet must be freed with av_packet_unref() when it is no
- * longer needed.
- *
- * @section lavf_decoding_seek Seeking
- * @}
- *
- * @defgroup lavf_encoding Muxing
- * @{
- * Muxers take encoded data in the form of @ref AVPacket "AVPackets" and write
- * it into files or other output bytestreams in the specified container format.
- *
- * The main API functions for muxing are avformat_write_header() for writing the
- * file header, av_write_frame() / av_interleaved_write_frame() for writing the
- * packets and av_write_trailer() for finalizing the file.
- *
- * At the beginning of the muxing process, the caller must first call
- * avformat_alloc_context() to create a muxing context. The caller then sets up
- * the muxer by filling the various fields in this context:
- *
- * - The @ref AVFormatContext.oformat "oformat" field must be set to select the
- *   muxer that will be used.
- * - Unless the format is of the AVFMT_NOFILE type, the @ref AVFormatContext.pb
- *   "pb" field must be set to an opened IO context, either returned from
- *   avio_open2() or a custom one.
- * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
- *   be created with the avformat_new_stream() function. The caller should fill
- *   the @ref AVStream.codecpar "stream codec parameters" information, such as the
- *   codec @ref AVCodecParameters.codec_type "type", @ref AVCodecParameters.codec_id
- *   "id" and other parameters (e.g. width / height, the pixel or sample format,
- *   etc.) as known. The @ref AVStream.time_base "stream timebase" should
- *   be set to the timebase that the caller desires to use for this stream (note
- *   that the timebase actually used by the muxer can be different, as will be
- *   described later).
- * - It is advised to manually initialize only the relevant fields in
- *   AVCodecParameters, rather than using @ref avcodec_parameters_copy() during
- *   remuxing: there is no guarantee that the codec context values remain valid
- *   for both input and output format contexts.
- * - The caller may fill in additional information, such as @ref
- *   AVFormatContext.metadata "global" or @ref AVStream.metadata "per-stream"
- *   metadata, @ref AVFormatContext.chapters "chapters", @ref
- *   AVFormatContext.programs "programs", etc. as described in the
- *   AVFormatContext documentation. Whether such information will actually be
- *   stored in the output depends on what the container format and the muxer
- *   support.
- *
- * When the muxing context is fully set up, the caller must call
- * avformat_write_header() to initialize the muxer internals and write the file
- * header. Whether anything actually is written to the IO context at this step
- * depends on the muxer, but this function must always be called. Any muxer
- * private options must be passed in the options parameter to this function.
- *
- * The data is then sent to the muxer by repeatedly calling av_write_frame() or
- * av_interleaved_write_frame() (consult those functions' documentation for
- * discussion on the difference between them; only one of them may be used with
- * a single muxing context, they should not be mixed). Do note that the timing
- * information on the packets sent to the muxer must be in the corresponding
- * AVStream's timebase. That timebase is set by the muxer (in the
- * avformat_write_header() step) and may be different from the timebase
- * requested by the caller.
- *
- * Once all the data has been written, the caller must call av_write_trailer()
- * to flush any buffered packets and finalize the output file, then close the IO
- * context (if any) and finally free the muxing context with
- * avformat_free_context().
- * @}
- *
- * @defgroup lavf_io I/O Read/Write
- * @{
- * @section lavf_io_dirlist Directory listing
- * The directory listing API makes it possible to list files on remote servers.
- *
- * Some of possible use cases:
- * - an "open file" dialog to choose files from a remote location,
- * - a recursive media finder providing a player with an ability to play all
- * files from a given directory.
- *
- * @subsection lavf_io_dirlist_open Opening a directory
- * At first, a directory needs to be opened by calling avio_open_dir()
- * supplied with a URL and, optionally, ::AVDictionary containing
- * protocol-specific parameters. The function returns zero or positive
- * integer and allocates AVIODirContext on success.
- *
- * @code
- * AVIODirContext *ctx = NULL;
- * if (avio_open_dir(&ctx, "smb://example.com/some_dir", NULL) < 0) {
- *     fprintf(stderr, "Cannot open directory.\n");
- *     abort();
- * }
- * @endcode
- *
- * This code tries to open a sample directory using smb protocol without
- * any additional parameters.
- *
- * @subsection lavf_io_dirlist_read Reading entries
- * Each directory's entry (i.e. file, another directory, anything else
- * within ::AVIODirEntryType) is represented by AVIODirEntry.
- * Reading consecutive entries from an opened AVIODirContext is done by
- * repeatedly calling avio_read_dir() on it. Each call returns zero or
- * positive integer if successful. Reading can be stopped right after the
- * NULL entry has been read -- it means there are no entries left to be
- * read. The following code reads all entries from a directory associated
- * with ctx and prints their names to standard output.
- * @code
- * AVIODirEntry *entry = NULL;
- * for (;;) {
- *     if (avio_read_dir(ctx, &entry) < 0) {
- *         fprintf(stderr, "Cannot list directory.\n");
- *         abort();
- *     }
- *     if (!entry)
- *         break;
- *     printf("%s\n", entry->name);
- *     avio_free_directory_entry(&entry);
- * }
- * @endcode
- * @}
- *
- * @defgroup lavf_codec Demuxers
- * @{
- * @defgroup lavf_codec_native Native Demuxers
- * @{
- * @}
- * @defgroup lavf_codec_wrappers External library wrappers
- * @{
- * @}
- * @}
- * @defgroup lavf_protos I/O Protocols
- * @{
- * @}
- * @defgroup lavf_internal Internal
- * @{
- * @}
- * @}
- */
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "avio.h"
-#include "libavformat/version.h"
-
-struct AVFormatContext;
-
-struct AVDeviceInfoList;
-struct AVDeviceCapabilitiesQuery;
-
-/**
- * @defgroup metadata_api Public Metadata API
- * @{
- * @ingroup libavf
- * The metadata API allows libavformat to export metadata tags to a client
- * application when demuxing. Conversely it allows a client application to
- * set metadata when muxing.
- *
- * Metadata is exported or set as pairs of key/value strings in the 'metadata'
- * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
- * using the @ref lavu_dict "AVDictionary" API. Like all strings in FFmpeg,
- * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
- * exported by demuxers isn't checked to be valid UTF-8 in most cases.
- *
- * Important concepts to keep in mind:
- * -  Keys are unique; there can never be 2 tags with the same key. This is
- *    also meant semantically, i.e., a demuxer should not knowingly produce
- *    several keys that are literally different but semantically identical.
- *    E.g., key=Author5, key=Author6. In this example, all authors must be
- *    placed in the same tag.
- * -  Metadata is flat, not hierarchical; there are no subtags. If you
- *    want to store, e.g., the email address of the child of producer Alice
- *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * -  Several modifiers can be applied to the tag name. This is done by
- *    appending a dash character ('-') and the modifier name in the order
- *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- *    -  language -- a tag whose value is localized for a particular language
- *       is appended with the ISO 639-2/B 3-letter language code.
- *       For example: Author-ger=Michael, Author-eng=Mike
- *       The original/default language is in the unqualified "Author" tag.
- *       A demuxer should set a default if it sets any translated tag.
- *    -  sorting  -- a modified version of a tag that should be used for
- *       sorting will have '-sort' appended. E.g. artist="The Beatles",
- *       artist-sort="Beatles, The".
- * - Some protocols and demuxers support metadata updates. After a successful
- *   call to av_read_packet(), AVFormatContext.event_flags or AVStream.event_flags
- *   will be updated to indicate if metadata changed. In order to detect metadata
- *   changes on a stream, you need to loop through all streams in the AVFormatContext
- *   and check their individual event_flags.
- *
- * -  Demuxers attempt to export metadata in a generic format, however tags
- *    with no generic equivalents are left as they are stored in the container.
- *    Follows a list of generic tag names:
- *
- @verbatim
- album        -- name of the set this work belongs to
- album_artist -- main creator of the set/album, if different from artist.
-                 e.g. "Various Artists" for compilation albums.
- artist       -- main creator of the work
- comment      -- any additional description of the file.
- composer     -- who composed the work, if different from artist.
- copyright    -- name of copyright holder.
- creation_time-- date when the file was created, preferably in ISO 8601.
- date         -- date when the work was created, preferably in ISO 8601.
- disc         -- number of a subset, e.g. disc in a multi-disc collection.
- encoder      -- name/settings of the software/hardware that produced the file.
- encoded_by   -- person/group who created the file.
- filename     -- original name of the file.
- genre        -- <self-evident>.
- language     -- main language in which the work is performed, preferably
-                 in ISO 639-2 format. Multiple languages can be specified by
-                 separating them with commas.
- performer    -- artist who performed the work, if different from artist.
-                 E.g for "Also sprach Zarathustra", artist would be "Richard
-                 Strauss" and performer "London Philharmonic Orchestra".
- publisher    -- name of the label/publisher.
- service_name     -- name of the service in broadcasting (channel name).
- service_provider -- name of the service provider in broadcasting.
- title        -- name of the work.
- track        -- number of this work in the set, can be in form current/total.
- variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
- @endverbatim
- *
- * Look in the examples section for an application example how to use the Metadata API.
- *
- * @}
- */
-
-/* packet functions */
-
-
-/**
- * Allocate and read the payload of a packet and initialize its
- * fields with default values.
- *
- * @param s    associated IO context
- * @param pkt packet
- * @param size desired payload size
- * @return >0 (read size) if OK, AVERROR_xxx otherwise
- */
-int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-
-/**
- * Read data and append it to the current content of the AVPacket.
- * If pkt->size is 0 this is identical to av_get_packet.
- * Note that this uses av_grow_packet and thus involves a realloc
- * which is inefficient. Thus this function should only be used
- * when there is no reasonable way to know (an upper bound of)
- * the final size.
- *
- * @param s    associated IO context
- * @param pkt packet
- * @param size amount of data to read
- * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
- *         will not be lost even if an error occurs.
- */
-int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-#if FF_API_LAVF_FRAC
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-#endif
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/**
- * This structure contains the data a format has to probe a file.
- */
-typedef struct AVProbeData {
-    const char *filename;
-    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
-    int buf_size;       /**< Size of buf except extra allocated bytes */
-    const char *mime_type; /**< mime_type, when known. */
-} AVProbeData;
-
-#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
-#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
-
-#define AVPROBE_SCORE_EXTENSION  50 ///< score for file extension
-#define AVPROBE_SCORE_MIME       75 ///< score for file mime type
-#define AVPROBE_SCORE_MAX       100 ///< maximum score
-
-#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
-
-/// Demuxer will use avio_open, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#if FF_API_LAVF_FMT_RAWPICTURE
-#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
-                                      raw picture data. @deprecated Not used anymore */
-#endif
-#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
-#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
-#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
-#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
-#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
-#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fall back on generic search */
-#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
-#define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
-#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
-                                        increasing timestamps, but they must
-                                        still be monotonic */
-#define AVFMT_TS_NEGATIVE  0x40000 /**< Format allows muxing negative
-                                        timestamps. If not set the timestamp
-                                        will be shifted in av_write_frame and
-                                        av_interleaved_write_frame so they
-                                        start from 0.
-                                        The user or muxer can override this through
-                                        AVFormatContext.avoid_negative_ts
-                                        */
-
-#define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-typedef struct AVOutputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /* output support */
-    enum AVCodecID audio_codec;    /**< default audio codec */
-    enum AVCodecID video_codec;    /**< default video codec */
-    enum AVCodecID subtitle_codec; /**< default subtitle codec */
-    /**
-     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER,
-     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
-     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
-     * AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE
-     */
-    int flags;
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVOutputFormat *next;
-    /**
-     * size of private data so that it can be allocated in the wrapper
-     */
-    int priv_data_size;
-
-    int (*write_header)(struct AVFormatContext *);
-    /**
-     * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
-     * pkt can be NULL in order to flush data buffered in the muxer.
-     * When flushing, return 0 if there still is more data to flush,
-     * or 1 if everything was flushed and there is no more buffered
-     * data.
-     */
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /**
-     * Currently only used to set pixel format if not YUV420P.
-     */
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
-    /**
-     * Test if the given codec can be stored in this container.
-     *
-     * @return 1 if the codec is supported, 0 if it is not.
-     *         A negative number if unknown.
-     *         MKTAG('A', 'P', 'I', 'C') if the codec is only supported as AV_DISPOSITION_ATTACHED_PIC
-     */
-    int (*query_codec)(enum AVCodecID id, int std_compliance);
-
-    void (*get_output_timestamp)(struct AVFormatContext *s, int stream,
-                                 int64_t *dts, int64_t *wall);
-    /**
-     * Allows sending messages from application to device.
-     */
-    int (*control_message)(struct AVFormatContext *s, int type,
-                           void *data, size_t data_size);
-
-    /**
-     * Write an uncoded AVFrame.
-     *
-     * See av_write_uncoded_frame() for details.
-     *
-     * The library will free *frame afterwards, but the muxer can prevent it
-     * by setting the pointer to NULL.
-     */
-    int (*write_uncoded_frame)(struct AVFormatContext *, int stream_index,
-                               AVFrame **frame, unsigned flags);
-    /**
-     * Returns device list with it properties.
-     * @see avdevice_list_devices() for more details.
-     */
-    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
-    /**
-     * Initialize device capabilities submodule.
-     * @see avdevice_capabilities_create() for more details.
-     */
-    int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
-    /**
-     * Free device capabilities submodule.
-     * @see avdevice_capabilities_free() for more details.
-     */
-    int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
-    enum AVCodecID data_codec; /**< default data codec */
-    /**
-     * Initialize format. May allocate data here, and set any AVFormatContext or
-     * AVStream parameters that need to be set before packets are sent.
-     * This method must not write output.
-     *
-     * Return 0 if streams were fully configured, 1 if not, negative AVERROR on failure
-     *
-     * Any allocations made here must be freed in deinit().
-     */
-    int (*init)(struct AVFormatContext *);
-    /**
-     * Deinitialize format. If present, this is called whenever the muxer is being
-     * destroyed, regardless of whether or not the header has been written.
-     *
-     * If a trailer is being written, this is called after write_trailer().
-     *
-     * This is called if init() fails as well.
-     */
-    void (*deinit)(struct AVFormatContext *);
-    /**
-     * Set up any necessary bitstream filtering and extract any extra data needed
-     * for the global header.
-     * Return 0 if more packets from this stream must be checked; 1 if not.
-     */
-    int (*check_bitstream)(struct AVFormatContext *, const AVPacket *pkt);
-} AVOutputFormat;
-/**
- * @}
- */
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-typedef struct AVInputFormat {
-    /**
-     * A comma separated list of short names for the format. New names
-     * may be appended with a minor bump.
-     */
-    const char *name;
-
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-
-    /**
-     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
-     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS.
-     */
-    int flags;
-
-    /**
-     * If extensions are defined, then no probe is done. You should
-     * usually not use extension format guessing because it is not
-     * reliable enough
-     */
-    const char *extensions;
-
-    const struct AVCodecTag * const *codec_tag;
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /**
-     * Comma-separated list of mime types.
-     * It is used check for matching mime types while probing.
-     * @see av_probe_input_format2
-     */
-    const char *mime_type;
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVInputFormat *next;
-
-    /**
-     * Raw demuxers store their codec ID here.
-     */
-    int raw_codec_id;
-
-    /**
-     * Size of private data so that it can be allocated in the wrapper.
-     */
-    int priv_data_size;
-
-    /**
-     * Tell if a given file has a chance of being parsed as this format.
-     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
-     * big so you do not have to check for that unless you need more.
-     */
-    int (*read_probe)(AVProbeData *);
-
-    /**
-     * Read the format header and initialize the AVFormatContext
-     * structure. Return 0 if OK. 'avformat_new_stream' should be
-     * called to create new streams.
-     */
-    int (*read_header)(struct AVFormatContext *);
-
-    /**
-     * Read one packet and put it in 'pkt'. pts and flags are also
-     * set. 'avformat_new_stream' can be called only if the flag
-     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
-     * background thread).
-     * @return 0 on success, < 0 on error.
-     *         When returning an error, pkt must not have been allocated
-     *         or must be freed before returning
-     */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-
-    /**
-     * Close the stream. The AVFormatContext and AVStreams are not
-     * freed by this function
-     */
-    int (*read_close)(struct AVFormatContext *);
-
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-
-    /**
-     * Get the next timestamp in stream[stream_index].time_base units.
-     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
-     */
-    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
-                              int64_t *pos, int64_t pos_limit);
-
-    /**
-     * Start/resume playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_play)(struct AVFormatContext *);
-
-    /**
-     * Pause playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_pause)(struct AVFormatContext *);
-
-    /**
-     * Seek to timestamp ts.
-     * Seeking will be done so that the point from which all active streams
-     * can be presented successfully will be closest to ts and within min/max_ts.
-     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
-     */
-    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-    /**
-     * Returns device list with it properties.
-     * @see avdevice_list_devices() for more details.
-     */
-    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
-
-    /**
-     * Initialize device capabilities submodule.
-     * @see avdevice_capabilities_create() for more details.
-     */
-    int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
-
-    /**
-     * Free device capabilities submodule.
-     * @see avdevice_capabilities_free() for more details.
-     */
-    int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
-} AVInputFormat;
-/**
- * @}
- */
-
-enum AVStreamParseType {
-    AVSTREAM_PARSE_NONE,
-    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
-    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
-    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
-    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
-    AVSTREAM_PARSE_FULL_RAW=MKTAG(0,'R','A','W'),       /**< full parsing and repack with timestamp and position generation by parser for raw
-                                                             this assumes that each packet in the file contains no demuxer level headers and
-                                                             just codec level data, otherwise position generation would fail */
-};
-
-typedef struct AVIndexEntry {
-    int64_t pos;
-    int64_t timestamp;        /**<
-                               * Timestamp in AVStream.time_base units, preferably the time from which on correctly decoded frames are available
-                               * when seeking to this entry. That means preferable PTS on keyframe based formats.
-                               * But demuxers can choose to store a different timestamp, if it is more convenient for the implementation or nothing better
-                               * is known
-                               */
-#define AVINDEX_KEYFRAME 0x0001
-#define AVINDEX_DISCARD_FRAME  0x0002    /**
-                                          * Flag is used to indicate which frame should be discarded after decoding.
-                                          */
-    int flags:2;
-    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-#define AV_DISPOSITION_DEFAULT   0x0001
-#define AV_DISPOSITION_DUB       0x0002
-#define AV_DISPOSITION_ORIGINAL  0x0004
-#define AV_DISPOSITION_COMMENT   0x0008
-#define AV_DISPOSITION_LYRICS    0x0010
-#define AV_DISPOSITION_KARAOKE   0x0020
-
-/**
- * Track should be used during playback by default.
- * Useful for subtitle track that should be displayed
- * even when user did not explicitly ask for subtitles.
- */
-#define AV_DISPOSITION_FORCED    0x0040
-#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
-#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
-#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
-/**
- * The stream is stored in the file as an attached picture/"cover art" (e.g.
- * APIC frame in ID3v2). The first (usually only) packet associated with it
- * will be returned among the first few packets read from the file unless
- * seeking takes place. It can also be accessed at any time in
- * AVStream.attached_pic.
- */
-#define AV_DISPOSITION_ATTACHED_PIC      0x0400
-/**
- * The stream is sparse, and contains thumbnail images, often corresponding
- * to chapter markers. Only ever used with AV_DISPOSITION_ATTACHED_PIC.
- */
-#define AV_DISPOSITION_TIMED_THUMBNAILS  0x0800
-
-typedef struct AVStreamInternal AVStreamInternal;
-
-/**
- * To specify text track kind (different from subtitles default).
- */
-#define AV_DISPOSITION_CAPTIONS     0x10000
-#define AV_DISPOSITION_DESCRIPTIONS 0x20000
-#define AV_DISPOSITION_METADATA     0x40000
-
-/**
- * Options for behavior on timestamp wrap detection.
- */
-#define AV_PTS_WRAP_IGNORE      0   ///< ignore the wrap
-#define AV_PTS_WRAP_ADD_OFFSET  1   ///< add the format specific offset on wrap detection
-#define AV_PTS_WRAP_SUB_OFFSET  -1  ///< subtract the format specific offset on wrap detection
-
-/**
- * Stream structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-    int index;    /**< stream index in AVFormatContext */
-    /**
-     * Format-specific stream ID.
-     * decoding: set by libavformat
-     * encoding: set by the user, replaced by libavformat if left unset
-     */
-    int id;
-#if FF_API_LAVF_AVCTX
-    /**
-     * @deprecated use the codecpar struct instead
-     */
-    attribute_deprecated
-    AVCodecContext *codec;
-#endif
-    void *priv_data;
-
-#if FF_API_LAVF_FRAC
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated
-    struct AVFrac pts;
-#endif
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented.
-     *
-     * decoding: set by libavformat
-     * encoding: May be set by the caller before avformat_write_header() to
-     *           provide a hint to the muxer about the desired timebase. In
-     *           avformat_write_header(), the muxer will overwrite this field
-     *           with the timebase that will actually be used for the timestamps
-     *           written into the file (which may or may not be related to the
-     *           user-provided one, depending on the format).
-     */
-    AVRational time_base;
-
-    /**
-     * Decoding: pts of the first frame of the stream in presentation order, in stream time base.
-     * Only set this if you are absolutely 100% sure that the value you set
-     * it to really is the pts of the first frame.
-     * This may be undefined (AV_NOPTS_VALUE).
-     * @note The ASF header does NOT contain a correct start_time the ASF
-     * demuxer must NOT set this.
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in stream time base.
-     * If a source file does not specify a duration, but does specify
-     * a bitrate, this value will be estimated from bitrate and file size.
-     *
-     * Encoding: May be set by the caller before avformat_write_header() to
-     * provide a hint to the muxer about the estimated duration.
-     */
-    int64_t duration;
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-    int disposition; /**< AV_DISPOSITION_* bit field */
-
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVDictionary *metadata;
-
-    /**
-     * Average framerate
-     *
-     * - demuxing: May be set by libavformat when creating the stream or in
-     *             avformat_find_stream_info().
-     * - muxing: May be set by the caller before avformat_write_header().
-     */
-    AVRational avg_frame_rate;
-
-    /**
-     * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
-     * will contain the attached picture.
-     *
-     * decoding: set by libavformat, must not be modified by the caller.
-     * encoding: unused
-     */
-    AVPacket attached_pic;
-
-    /**
-     * An array of side data that applies to the whole stream (i.e. the
-     * container does not allow it to change between packets).
-     *
-     * There may be no overlap between the side data in this array and side data
-     * in the packets. I.e. a given side data is either exported by the muxer
-     * (demuxing) / set by the caller (muxing) in this array, then it never
-     * appears in the packets, or the side data is exported / sent through
-     * the packets (always in the first packet where the value becomes known or
-     * changes), then it does not appear in this array.
-     *
-     * - demuxing: Set by libavformat when the stream is created.
-     * - muxing: May be set by the caller before avformat_write_header().
-     *
-     * Freed by libavformat in avformat_free_context().
-     *
-     * @see av_format_inject_global_side_data()
-     */
-    AVPacketSideData *side_data;
-    /**
-     * The number of elements in the AVStream.side_data array.
-     */
-    int            nb_side_data;
-
-    /**
-     * Flags for the user to detect events happening on the stream. Flags must
-     * be cleared by the user once the event has been handled.
-     * A combination of AVSTREAM_EVENT_FLAG_*.
-     */
-    int event_flags;
-#define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * Internal note: be aware that physically removing these fields
-     * will break ABI. Replace removed fields with dummy fields, and
-     * add new fields to AVStreamInternal.
-     *****************************************************************
-     */
-
-    /**
-     * Stream information used internally by avformat_find_stream_info()
-     */
-#define MAX_STD_TIMEBASES (30*12+30+3+6)
-    struct {
-        int64_t last_dts;
-        int64_t duration_gcd;
-        int duration_count;
-        int64_t rfps_duration_sum;
-        double (*duration_error)[2][MAX_STD_TIMEBASES];
-        int64_t codec_info_duration;
-        int64_t codec_info_duration_fields;
-
-        /**
-         * 0  -> decoder has not been searched for yet.
-         * >0 -> decoder found
-         * <0 -> decoder with codec_id == -found_decoder has not been found
-         */
-        int found_decoder;
-
-        int64_t last_duration;
-
-        /**
-         * Those are used for average framerate estimation.
-         */
-        int64_t fps_first_dts;
-        int     fps_first_dts_idx;
-        int64_t fps_last_dts;
-        int     fps_last_dts_idx;
-
-    } *info;
-
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-
-    // Timestamp generation support:
-    /**
-     * Timestamp corresponding to the last dts sync point.
-     *
-     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
-     * a DTS is received from the underlying container. Otherwise set to
-     * AV_NOPTS_VALUE by default.
-     */
-    int64_t first_dts;
-    int64_t cur_dts;
-    int64_t last_IP_pts;
-    int last_IP_duration;
-
-    /**
-     * Number of packets to buffer for codec probing
-     */
-    int probe_packets;
-
-    /**
-     * Number of frames that have been demuxed during avformat_find_stream_info()
-     */
-    int codec_info_nb_frames;
-
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     */
-    struct AVPacketList *last_in_packet_buffer;
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-
-    /**
-     * Real base framerate of the stream.
-     * This is the lowest framerate with which all timestamps can be
-     * represented accurately (it is the least common multiple of all
-     * framerates in the stream). Note, this value is just a guess!
-     * For example, if the time base is 1/90000 and all frames have either
-     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
-     *
-     * Code outside avformat should access this field using:
-     * av_stream_get/set_r_frame_rate(stream)
-     */
-    AVRational r_frame_rate;
-
-    /**
-     * Stream Identifier
-     * This is the MPEG-TS stream identifier +1
-     * 0 means unknown
-     */
-    int stream_identifier;
-
-    int64_t interleaver_chunk_size;
-    int64_t interleaver_chunk_duration;
-
-    /**
-     * stream probing state
-     * -1   -> probing finished
-     *  0   -> no probing requested
-     * rest -> perform probing with request_probe being the minimum score to accept.
-     * NOT PART OF PUBLIC API
-     */
-    int request_probe;
-    /**
-     * Indicates that everything up to the next keyframe
-     * should be discarded.
-     */
-    int skip_to_keyframe;
-
-    /**
-     * Number of samples to skip at the start of the frame decoded from the next packet.
-     */
-    int skip_samples;
-
-    /**
-     * If not 0, the number of samples that should be skipped from the start of
-     * the stream (the samples are removed from packets with pts==0, which also
-     * assumes negative timestamps do not happen).
-     * Intended for use with formats such as mp3 with ad-hoc gapless audio
-     * support.
-     */
-    int64_t start_skip_samples;
-
-    /**
-     * If not 0, the first audio sample that should be discarded from the stream.
-     * This is broken by design (needs global sample count), but can't be
-     * avoided for broken by design formats such as mp3 with ad-hoc gapless
-     * audio support.
-     */
-    int64_t first_discard_sample;
-
-    /**
-     * The sample after last sample that is intended to be discarded after
-     * first_discard_sample. Works on frame boundaries only. Used to prevent
-     * early EOF if the gapless info is broken (considered concatenated mp3s).
-     */
-    int64_t last_discard_sample;
-
-    /**
-     * Number of internally decoded frames, used internally in libavformat, do not access
-     * its lifetime differs from info which is why it is not in that structure.
-     */
-    int nb_decoded_frames;
-
-    /**
-     * Timestamp offset added to timestamps before muxing
-     * NOT PART OF PUBLIC API
-     */
-    int64_t mux_ts_offset;
-
-    /**
-     * Internal data to check for wrapping of the time stamp
-     */
-    int64_t pts_wrap_reference;
-
-    /**
-     * Options for behavior, when a wrap is detected.
-     *
-     * Defined by AV_PTS_WRAP_ values.
-     *
-     * If correction is enabled, there are two possibilities:
-     * If the first time stamp is near the wrap point, the wrap offset
-     * will be subtracted, which will create negative time stamps.
-     * Otherwise the offset will be added.
-     */
-    int pts_wrap_behavior;
-
-    /**
-     * Internal data to prevent doing update_initial_durations() twice
-     */
-    int update_initial_durations_done;
-
-    /**
-     * Internal data to generate dts from pts
-     */
-    int64_t pts_reorder_error[MAX_REORDER_DELAY+1];
-    uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1];
-
-    /**
-     * Internal data to analyze DTS and detect faulty mpeg streams
-     */
-    int64_t last_dts_for_order_check;
-    uint8_t dts_ordered;
-    uint8_t dts_misordered;
-
-    /**
-     * Internal data to inject global side data
-     */
-    int inject_global_side_data;
-
-    /*****************************************************************
-     * All fields above this line are not part of the public API.
-     * Fields below are part of the public API and ABI again.
-     *****************************************************************
-     */
-
-    /**
-     * String containing paris of key and values describing recommended encoder configuration.
-     * Paris are separated by ','.
-     * Keys are separated from values by '='.
-     */
-    char *recommended_encoder_configuration;
-
-    /**
-     * display aspect ratio (0 if unknown)
-     * - encoding: unused
-     * - decoding: Set by libavformat to calculate sample_aspect_ratio internally
-     */
-    AVRational display_aspect_ratio;
-
-    struct FFFrac *priv_pts;
-
-    /**
-     * An opaque field for libavformat internal usage.
-     * Must not be accessed in any way by callers.
-     */
-    AVStreamInternal *internal;
-
-    /*
-     * Codec parameters associated with this stream. Allocated and freed by
-     * libavformat in avformat_new_stream() and avformat_free_context()
-     * respectively.
-     *
-     * - demuxing: filled by libavformat on stream creation or in
-     *             avformat_find_stream_info()
-     * - muxing: filled by the caller before avformat_write_header()
-     */
-    AVCodecParameters *codecpar;
-} AVStream;
-
-AVRational av_stream_get_r_frame_rate(const AVStream *s);
-void       av_stream_set_r_frame_rate(AVStream *s, AVRational r);
-struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
-char* av_stream_get_recommended_encoder_configuration(const AVStream *s);
-void  av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration);
-
-/**
- * Returns the pts of the last muxed packet + its duration
- *
- * the retuned value is undefined when used with a demuxer.
- */
-int64_t    av_stream_get_end_pts(const AVStream *st);
-
-#define AV_PROGRAM_RUNNING 1
-
-/**
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-    int            flags;
-    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
-    unsigned int   *stream_index;
-    unsigned int   nb_stream_indexes;
-    AVDictionary *metadata;
-
-    int program_num;
-    int pmt_pid;
-    int pcr_pid;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    int64_t start_time;
-    int64_t end_time;
-
-    int64_t pts_wrap_reference;    ///< reference dts for wrap detection
-    int pts_wrap_behavior;         ///< behavior on wrap detection
-} AVProgram;
-
-#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
-                                         (streams are added dynamically) */
-
-typedef struct AVChapter {
-    int id;                 ///< unique ID to identify the chapter
-    AVRational time_base;   ///< time base in which the start/end timestamps are specified
-    int64_t start, end;     ///< chapter start/end time in time_base units
-    AVDictionary *metadata;
-} AVChapter;
-
-
-/**
- * Callback used by devices to communicate with application.
- */
-typedef int (*av_format_control_message)(struct AVFormatContext *s, int type,
-                                         void *data, size_t data_size);
-
-typedef int (*AVOpenCallback)(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags,
-                              const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * The duration of a video can be estimated through various ways, and this enum can be used
- * to know how the duration was estimated.
- */
-enum AVDurationEstimationMethod {
-    AVFMT_DURATION_FROM_PTS,    ///< Duration accurately estimated from PTSes
-    AVFMT_DURATION_FROM_STREAM, ///< Duration estimated from a stream with a known duration
-    AVFMT_DURATION_FROM_BITRATE ///< Duration estimated from bitrate (less accurate)
-};
-
-typedef struct AVFormatInternal AVFormatInternal;
-
-/**
- * Format I/O context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*, use
- * avformat_alloc_context() to create an AVFormatContext.
- *
- * Fields can be accessed through AVOptions (av_opt*),
- * the name string used matches the associated command line parameter name and
- * can be found in libavformat/options_table.h.
- * The AVOption/command line parameter names differ in some cases from the C
- * structure field names for historic reasons or brevity.
- */
-typedef struct AVFormatContext {
-    /**
-     * A class for logging and @ref avoptions. Set by avformat_alloc_context().
-     * Exports (de)muxer private options if they exist.
-     */
-    const AVClass *av_class;
-
-    /**
-     * The input container format.
-     *
-     * Demuxing only, set by avformat_open_input().
-     */
-    struct AVInputFormat *iformat;
-
-    /**
-     * The output container format.
-     *
-     * Muxing only, must be set by the caller before avformat_write_header().
-     */
-    struct AVOutputFormat *oformat;
-
-    /**
-     * Format private data. This is an AVOptions-enabled struct
-     * if and only if iformat/oformat.priv_class is not NULL.
-     *
-     * - muxing: set by avformat_write_header()
-     * - demuxing: set by avformat_open_input()
-     */
-    void *priv_data;
-
-    /**
-     * I/O context.
-     *
-     * - demuxing: either set by the user before avformat_open_input() (then
-     *             the user must close it manually) or set by avformat_open_input().
-     * - muxing: set by the user before avformat_write_header(). The caller must
-     *           take care of closing / freeing the IO context.
-     *
-     * Do NOT set this field if AVFMT_NOFILE flag is set in
-     * iformat/oformat.flags. In such a case, the (de)muxer will handle
-     * I/O in some other way and this field will be NULL.
-     */
-    AVIOContext *pb;
-
-    /* stream info */
-    /**
-     * Flags signalling stream properties. A combination of AVFMTCTX_*.
-     * Set by libavformat.
-     */
-    int ctx_flags;
-
-    /**
-     * Number of elements in AVFormatContext.streams.
-     *
-     * Set by avformat_new_stream(), must not be modified by any other code.
-     */
-    unsigned int nb_streams;
-    /**
-     * A list of all streams in the file. New streams are created with
-     * avformat_new_stream().
-     *
-     * - demuxing: streams are created by libavformat in avformat_open_input().
-     *             If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
-     *             appear in av_read_frame().
-     * - muxing: streams are created by the user before avformat_write_header().
-     *
-     * Freed by libavformat in avformat_free_context().
-     */
-    AVStream **streams;
-
-    /**
-     * input or output filename
-     *
-     * - demuxing: set by avformat_open_input()
-     * - muxing: may be set by the caller before avformat_write_header()
-     */
-    char filename[1024];
-
-    /**
-     * Position of the first frame of the component, in
-     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
-     * It is deduced from the AVStream values.
-     *
-     * Demuxing only, set by libavformat.
-     */
-    int64_t start_time;
-
-    /**
-     * Duration of the stream, in AV_TIME_BASE fractional
-     * seconds. Only set this value if you know none of the individual stream
-     * durations and also do not set any of them. This is deduced from the
-     * AVStream values if not set.
-     *
-     * Demuxing only, set by libavformat.
-     */
-    int64_t duration;
-
-    /**
-     * Total stream bitrate in bit/s, 0 if not
-     * available. Never set it directly if the file_size and the
-     * duration are known as FFmpeg can compute it automatically.
-     */
-    int64_t bit_rate;
-
-    unsigned int packet_size;
-    int max_delay;
-
-    /**
-     * Flags modifying the (de)muxer behaviour. A combination of AVFMT_FLAG_*.
-     * Set by the user before avformat_open_input() / avformat_write_header().
-     */
-    int flags;
-#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
-#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
-#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
-#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
-#define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
-#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
-#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
-#define AVFMT_FLAG_FLUSH_PACKETS    0x0200 ///< Flush the AVIOContext every packet.
-/**
- * When muxing, try to avoid writing any random/volatile data to the output.
- * This includes any random IDs, real-time timestamps/dates, muxer version, etc.
- *
- * This flag is mainly intended for testing.
- */
-#define AVFMT_FLAG_BITEXACT         0x0400
-#define AVFMT_FLAG_MP4A_LATM    0x8000 ///< Enable RTP MP4A-LATM payload
-#define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
-#define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
-#if FF_API_LAVF_KEEPSIDE_FLAG
-#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate. Deprecated, will be the default.
-#endif
-#define AVFMT_FLAG_FAST_SEEK   0x80000 ///< Enable fast, but inaccurate seeks for some formats
-#define AVFMT_FLAG_SHORTEST   0x100000 ///< Stop muxing when the shortest stream stops.
-#define AVFMT_FLAG_AUTO_BSF   0x200000 ///< Wait for packet data before writing a header, and add bitstream filters as requested by the muxer
-
-    /**
-     * Maximum size of the data read from input for determining
-     * the input container format.
-     * Demuxing only, set by the caller before avformat_open_input().
-     */
-    int64_t probesize;
-
-    /**
-     * Maximum duration (in AV_TIME_BASE units) of the data read
-     * from input in avformat_find_stream_info().
-     * Demuxing only, set by the caller before avformat_find_stream_info().
-     * Can be set to 0 to let avformat choose using a heuristic.
-     */
-    int64_t max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID video_codec_id;
-
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID audio_codec_id;
-
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * - muxing: unused
-     * - demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    unsigned int max_picture_buffer;
-
-    /**
-     * Number of chapters in AVChapter array.
-     * When muxing, chapters are normally written in the file header,
-     * so nb_chapters should normally be initialized before write_header
-     * is called. Some muxers (e.g. mov and mkv) can also write chapters
-     * in the trailer.  To write chapters in the trailer, nb_chapters
-     * must be zero when write_header is called and non-zero when
-     * write_trailer is called.
-     * - muxing: set by user
-     * - demuxing: set by libavformat
-     */
-    unsigned int nb_chapters;
-    AVChapter **chapters;
-
-    /**
-     * Metadata that applies to the whole file.
-     *
-     * - demuxing: set by libavformat in avformat_open_input()
-     * - muxing: may be set by the caller before avformat_write_header()
-     *
-     * Freed by libavformat in avformat_free_context().
-     */
-    AVDictionary *metadata;
-
-    /**
-     * Start time of the stream in real world time, in microseconds
-     * since the Unix epoch (00:00 1st January 1970). That is, pts=0 in the
-     * stream was captured at this real world time.
-     * - muxing: Set by the caller before avformat_write_header(). If set to
-     *           either 0 or AV_NOPTS_VALUE, then the current wall-time will
-     *           be used.
-     * - demuxing: Set by libavformat. AV_NOPTS_VALUE if unknown. Note that
-     *             the value may become known after some number of frames
-     *             have been received.
-     */
-    int64_t start_time_realtime;
-
-    /**
-     * The number of frames used for determining the framerate in
-     * avformat_find_stream_info().
-     * Demuxing only, set by the caller before avformat_find_stream_info().
-     */
-    int fps_probe_size;
-
-    /**
-     * Error recognition; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * Demuxing only, set by the caller before avformat_open_input().
-     */
-    int error_recognition;
-
-    /**
-     * Custom interrupt callbacks for the I/O layer.
-     *
-     * demuxing: set by the user before avformat_open_input().
-     * muxing: set by the user before avformat_write_header()
-     * (mainly useful for AVFMT_NOFILE formats). The callback
-     * should also be passed to avio_open2() if it's used to
-     * open the file.
-     */
-    AVIOInterruptCB interrupt_callback;
-
-    /**
-     * Flags to enable debugging.
-     */
-    int debug;
-#define FF_FDEBUG_TS        0x0001
-
-    /**
-     * Maximum buffering duration for interleaving.
-     *
-     * To ensure all the streams are interleaved correctly,
-     * av_interleaved_write_frame() will wait until it has at least one packet
-     * for each stream before actually writing any packets to the output file.
-     * When some streams are "sparse" (i.e. there are large gaps between
-     * successive packets), this can result in excessive buffering.
-     *
-     * This field specifies the maximum difference between the timestamps of the
-     * first and the last packet in the muxing queue, above which libavformat
-     * will output a packet regardless of whether it has queued a packet for all
-     * the streams.
-     *
-     * Muxing only, set by the caller before avformat_write_header().
-     */
-    int64_t max_interleave_delta;
-
-    /**
-     * Allow non-standard and experimental extension
-     * @see AVCodecContext.strict_std_compliance
-     */
-    int strict_std_compliance;
-
-    /**
-     * Flags for the user to detect events happening on the file. Flags must
-     * be cleared by the user once the event has been handled.
-     * A combination of AVFMT_EVENT_FLAG_*.
-     */
-    int event_flags;
-#define AVFMT_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
-
-    /**
-     * Maximum number of packets to read while waiting for the first timestamp.
-     * Decoding only.
-     */
-    int max_ts_probe;
-
-    /**
-     * Avoid negative timestamps during muxing.
-     * Any value of the AVFMT_AVOID_NEG_TS_* constants.
-     * Note, this only works when using av_interleaved_write_frame. (interleave_packet_per_dts is in use)
-     * - muxing: Set by user
-     * - demuxing: unused
-     */
-    int avoid_negative_ts;
-#define AVFMT_AVOID_NEG_TS_AUTO             -1 ///< Enabled when required by target format
-#define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative
-#define AVFMT_AVOID_NEG_TS_MAKE_ZERO         2 ///< Shift timestamps so that they start at 0
-
-    /**
-     * Transport stream id.
-     * This will be moved into demuxer private options. Thus no API/ABI compatibility
-     */
-    int ts_id;
-
-    /**
-     * Audio preload in microseconds.
-     * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int audio_preload;
-
-    /**
-     * Max chunk time in microseconds.
-     * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int max_chunk_duration;
-
-    /**
-     * Max chunk size in bytes
-     * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int max_chunk_size;
-
-    /**
-     * forces the use of wallclock timestamps as pts/dts of packets
-     * This has undefined results in the presence of B frames.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    int use_wallclock_as_timestamps;
-
-    /**
-     * avio flags, used to force AVIO_FLAG_DIRECT.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    int avio_flags;
-
-    /**
-     * The duration field can be estimated through various ways, and this field can be used
-     * to know how the duration was estimated.
-     * - encoding: unused
-     * - decoding: Read by user
-     */
-    enum AVDurationEstimationMethod duration_estimation_method;
-
-    /**
-     * Skip initial bytes when opening stream
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    int64_t skip_initial_bytes;
-
-    /**
-     * Correct single timestamp overflows
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    unsigned int correct_ts_overflow;
-
-    /**
-     * Force seeking to any (also non key) frames.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    int seek2any;
-
-    /**
-     * Flush the I/O context after each packet.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int flush_packets;
-
-    /**
-     * format probing score.
-     * The maximal score is AVPROBE_SCORE_MAX, its set when the demuxer probes
-     * the format.
-     * - encoding: unused
-     * - decoding: set by avformat, read by user
-     */
-    int probe_score;
-
-    /**
-     * number of bytes to read maximally to identify format.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    int format_probesize;
-
-    /**
-     * ',' separated list of allowed decoders.
-     * If NULL then all are allowed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *codec_whitelist;
-
-    /**
-     * ',' separated list of allowed demuxers.
-     * If NULL then all are allowed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *format_whitelist;
-
-    /**
-     * An opaque field for libavformat internal usage.
-     * Must not be accessed in any way by callers.
-     */
-    AVFormatInternal *internal;
-
-    /**
-     * IO repositioned flag.
-     * This is set by avformat when the underlaying IO context read pointer
-     * is repositioned, for example when doing byte based seeking.
-     * Demuxers can use the flag to detect such changes.
-     */
-    int io_repositioned;
-
-    /**
-     * Forced video codec.
-     * This allows forcing a specific decoder, even when there are multiple with
-     * the same codec_id.
-     * Demuxing: Set by user
-     */
-    AVCodec *video_codec;
-
-    /**
-     * Forced audio codec.
-     * This allows forcing a specific decoder, even when there are multiple with
-     * the same codec_id.
-     * Demuxing: Set by user
-     */
-    AVCodec *audio_codec;
-
-    /**
-     * Forced subtitle codec.
-     * This allows forcing a specific decoder, even when there are multiple with
-     * the same codec_id.
-     * Demuxing: Set by user
-     */
-    AVCodec *subtitle_codec;
-
-    /**
-     * Forced data codec.
-     * This allows forcing a specific decoder, even when there are multiple with
-     * the same codec_id.
-     * Demuxing: Set by user
-     */
-    AVCodec *data_codec;
-
-    /**
-     * Number of bytes to be written as padding in a metadata header.
-     * Demuxing: Unused.
-     * Muxing: Set by user via av_format_set_metadata_header_padding.
-     */
-    int metadata_header_padding;
-
-    /**
-     * User data.
-     * This is a place for some private data of the user.
-     */
-    void *opaque;
-
-    /**
-     * Callback used by devices to communicate with application.
-     */
-    av_format_control_message control_message_cb;
-
-    /**
-     * Output timestamp offset, in microseconds.
-     * Muxing: set by user
-     */
-    int64_t output_ts_offset;
-
-    /**
-     * dump format separator.
-     * can be ", " or "\n      " or anything else
-     * - muxing: Set by user.
-     * - demuxing: Set by user.
-     */
-    uint8_t *dump_separator;
-
-    /**
-     * Forced Data codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID data_codec_id;
-
-#if FF_API_OLD_OPEN_CALLBACKS
-    /**
-     * Called to open further IO contexts when needed for demuxing.
-     *
-     * This can be set by the user application to perform security checks on
-     * the URLs before opening them.
-     * The function should behave like avio_open2(), AVFormatContext is provided
-     * as contextual information and to reach AVFormatContext.opaque.
-     *
-     * If NULL then some simple checks are used together with avio_open2().
-     *
-     * Must not be accessed directly from outside avformat.
-     * @See av_format_set_open_cb()
-     *
-     * Demuxing: Set by user.
-     *
-     * @deprecated Use io_open and io_close.
-     */
-    attribute_deprecated
-    int (*open_cb)(struct AVFormatContext *s, AVIOContext **p, const char *url, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options);
-#endif
-
-    /**
-     * ',' separated list of allowed protocols.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *protocol_whitelist;
-
-    /*
-     * A callback for opening new IO streams.
-     *
-     * Whenever a muxer or a demuxer needs to open an IO stream (typically from
-     * avformat_open_input() for demuxers, but for certain formats can happen at
-     * other times as well), it will call this callback to obtain an IO context.
-     *
-     * @param s the format context
-     * @param pb on success, the newly opened IO context should be returned here
-     * @param url the url to open
-     * @param flags a combination of AVIO_FLAG_*
-     * @param options a dictionary of additional options, with the same
-     *                semantics as in avio_open2()
-     * @return 0 on success, a negative AVERROR code on failure
-     *
-     * @note Certain muxers and demuxers do nesting, i.e. they open one or more
-     * additional internal format contexts. Thus the AVFormatContext pointer
-     * passed to this callback may be different from the one facing the caller.
-     * It will, however, have the same 'opaque' field.
-     */
-    int (*io_open)(struct AVFormatContext *s, AVIOContext **pb, const char *url,
-                   int flags, AVDictionary **options);
-
-    /**
-     * A callback for closing the streams opened with AVFormatContext.io_open().
-     */
-    void (*io_close)(struct AVFormatContext *s, AVIOContext *pb);
-
-    /**
-     * ',' separated list of disallowed protocols.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *protocol_blacklist;
-
-    /**
-     * The maximum number of streams.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    int max_streams;
-} AVFormatContext;
-
-/**
- * Accessors for some AVFormatContext fields. These used to be provided for ABI
- * compatibility, and do not need to be used anymore.
- */
-int av_format_get_probe_score(const AVFormatContext *s);
-AVCodec * av_format_get_video_codec(const AVFormatContext *s);
-void      av_format_set_video_codec(AVFormatContext *s, AVCodec *c);
-AVCodec * av_format_get_audio_codec(const AVFormatContext *s);
-void      av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
-AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
-void      av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
-AVCodec * av_format_get_data_codec(const AVFormatContext *s);
-void      av_format_set_data_codec(AVFormatContext *s, AVCodec *c);
-int       av_format_get_metadata_header_padding(const AVFormatContext *s);
-void      av_format_set_metadata_header_padding(AVFormatContext *s, int c);
-void *    av_format_get_opaque(const AVFormatContext *s);
-void      av_format_set_opaque(AVFormatContext *s, void *opaque);
-av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
-void      av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
-#if FF_API_OLD_OPEN_CALLBACKS
-attribute_deprecated AVOpenCallback av_format_get_open_cb(const AVFormatContext *s);
-attribute_deprecated void av_format_set_open_cb(AVFormatContext *s, AVOpenCallback callback);
-#endif
-
-/**
- * This function will cause global side data to be injected in the next packet
- * of each stream as well as after any subsequent seek.
- */
-void av_format_inject_global_side_data(AVFormatContext *s);
-
-/**
- * Returns the method used to set ctx->duration.
- *
- * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE.
- */
-enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx);
-
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-
-
-/**
- * @defgroup lavf_core Core functions
- * @ingroup libavf
- *
- * Functions for querying libavformat capabilities, allocating core structures,
- * etc.
- * @{
- */
-
-/**
- * Return the LIBAVFORMAT_VERSION_INT constant.
- */
-unsigned avformat_version(void);
-
-/**
- * Return the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Return the libavformat license.
- */
-const char *avformat_license(void);
-
-/**
- * Initialize libavformat and register all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- */
-void av_register_all(void);
-
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-
-/**
- * Do global initialization of network components. This is optional,
- * but recommended, since it avoids the overhead of implicitly
- * doing the setup for each session.
- *
- * Calling this function will become mandatory if using network
- * protocols at some major version bump.
- */
-int avformat_network_init(void);
-
-/**
- * Undo the initialization done by avformat_network_init.
- */
-int avformat_network_deinit(void);
-
-/**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
- */
-AVInputFormat  *av_iformat_next(const AVInputFormat  *f);
-
-/**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
- */
-AVOutputFormat *av_oformat_next(const AVOutputFormat *f);
-
-/**
- * Allocate an AVFormatContext.
- * avformat_free_context() can be used to free the context and everything
- * allocated by the framework within it.
- */
-AVFormatContext *avformat_alloc_context(void);
-
-/**
- * Free an AVFormatContext and all its streams.
- * @param s context to free
- */
-void avformat_free_context(AVFormatContext *s);
-
-/**
- * Get the AVClass for AVFormatContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avformat_get_class(void);
-
-/**
- * Add a new stream to a media file.
- *
- * When demuxing, it is called by the demuxer in read_header(). If the
- * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
- * be called in read_packet().
- *
- * When muxing, should be called by the user before avformat_write_header().
- *
- * User is required to call avcodec_close() and avformat_free_context() to
- * clean up the allocation by avformat_new_stream().
- *
- * @param s media file handle
- * @param c If non-NULL, the AVCodecContext corresponding to the new stream
- * will be initialized to use this codec. This is needed for e.g. codec-specific
- * defaults to be set, so codec should be provided if it is known.
- *
- * @return newly created stream or NULL on error.
- */
-AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
-
-/**
- * Wrap an existing array as stream side data.
- *
- * @param st stream
- * @param type side information type
- * @param data the side data array. It must be allocated with the av_malloc()
- *             family of functions. The ownership of the data is transferred to
- *             st.
- * @param size side information size
- * @return zero on success, a negative AVERROR code on failure. On failure,
- *         the stream is unchanged and the data remains owned by the caller.
- */
-int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
-                            uint8_t *data, size_t size);
-
-/**
- * Allocate new information from stream.
- *
- * @param stream stream
- * @param type desired side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t *av_stream_new_side_data(AVStream *stream,
-                                 enum AVPacketSideDataType type, int size);
-/**
- * Get side information from stream.
- *
- * @param stream stream
- * @param type desired side information type
- * @param size pointer for side information size to store (optional)
- * @return pointer to data if present or NULL otherwise
- */
-#if FF_API_NOCONST_GET_SIDE_DATA
-uint8_t *av_stream_get_side_data(AVStream *stream,
-                                 enum AVPacketSideDataType type, int *size);
-#else
-uint8_t *av_stream_get_side_data(const AVStream *stream,
-                                 enum AVPacketSideDataType type, int *size);
-#endif
-
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * @}
- */
-
-
-/**
- * Allocate an AVFormatContext for an output format.
- * avformat_free_context() can be used to free the context and
- * everything allocated by the framework within it.
- *
- * @param *ctx is set to the created format context, or to NULL in
- * case of failure
- * @param oformat format to use for allocating the context, if NULL
- * format_name and filename are used instead
- * @param format_name the name of output format to use for allocating the
- * context, if NULL filename is used instead
- * @param filename the name of the filename to use for allocating the
- * context, may be NULL
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- */
-int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oformat,
-                                   const char *format_name, const char *filename);
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-
-/**
- * Find AVInputFormat based on the short name of the input format.
- */
-AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * Guess the file format.
- *
- * @param pd        data to be probed
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- */
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
-
-/**
- * Guess the file format.
- *
- * @param pd        data to be probed
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_max A probe score larger that this is required to accept a
- *                  detection, the variable is set to the actual detection
- *                  score afterwards.
- *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
- *                  to retry with a larger probe buffer.
- */
-AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_ret The score of the best detection.
- */
-AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret);
-
-/**
- * Probe a bytestream to determine the input format. Each time a probe returns
- * with a score that is too low, the probe buffer size is increased and another
- * attempt is made. When the maximum probe size is reached, the input format
- * with the highest score is returned.
- *
- * @param pb the bytestream to probe
- * @param fmt the input format is put here
- * @param url the url of the stream
- * @param logctx the log context
- * @param offset the offset within the bytestream to probe from
- * @param max_probe_size the maximum probe buffer size (zero for default)
- * @return the score in case of success, a negative value corresponding to an
- *         the maximal score is AVPROBE_SCORE_MAX
- * AVERROR code otherwise
- */
-int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
-                           const char *url, void *logctx,
-                           unsigned int offset, unsigned int max_probe_size);
-
-/**
- * Like av_probe_input_buffer2() but returns 0 on success
- */
-int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
-                          const char *url, void *logctx,
-                          unsigned int offset, unsigned int max_probe_size);
-
-/**
- * Open an input stream and read the header. The codecs are not opened.
- * The stream must be closed with avformat_close_input().
- *
- * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
- *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
- *           function and written into ps.
- *           Note that a user-supplied AVFormatContext will be freed on failure.
- * @param url URL of the stream to open.
- * @param fmt If non-NULL, this parameter forces a specific input format.
- *            Otherwise the format is autodetected.
- * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note If you want to use custom IO, preallocate the format context and set its pb field.
- */
-int avformat_open_input(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options);
-
-attribute_deprecated
-int av_demuxer_open(AVFormatContext *ic);
-
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @param options  If non-NULL, an ic.nb_streams long array of pointers to
- *                 dictionaries, where i-th member contains options for
- *                 codec corresponding to i-th stream.
- *                 On return each dictionary will be filled with options that were not found.
- * @return >=0 if OK, AVERROR_xxx on error
- *
- * @note this function isn't guaranteed to open all the codecs, so
- *       options being non-empty at return is a perfectly normal behavior.
- *
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- */
-int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
-
-/**
- * Find the programs which belong to a given stream.
- *
- * @param ic    media file handle
- * @param last  the last found program, the search will start after this
- *              program, or from the beginning if it is NULL
- * @param s     stream index
- * @return the next program which belongs to s, NULL if no program is found or
- *         the last program is not among the programs of ic.
- */
-AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s);
-
-void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
-
-/**
- * Find the "best" stream in the file.
- * The best stream is determined according to various heuristics as the most
- * likely to be what the user expects.
- * If the decoder parameter is non-NULL, av_find_best_stream will find the
- * default decoder for the stream's codec; streams for which no decoder can
- * be found are ignored.
- *
- * @param ic                media file handle
- * @param type              stream type: video, audio, subtitles, etc.
- * @param wanted_stream_nb  user-requested stream number,
- *                          or -1 for automatic selection
- * @param related_stream    try to find a stream related (eg. in the same
- *                          program) to this one, or -1 if none
- * @param decoder_ret       if non-NULL, returns the decoder for the
- *                          selected stream
- * @param flags             flags; none are currently defined
- * @return  the non-negative stream number in case of success,
- *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
- *          could be found,
- *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
- * @note  If av_find_best_stream returns successfully and decoder_ret is not
- *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
- */
-int av_find_best_stream(AVFormatContext *ic,
-                        enum AVMediaType type,
-                        int wanted_stream_nb,
-                        int related_stream,
-                        AVCodec **decoder_ret,
-                        int flags);
-
-/**
- * Return the next frame of a stream.
- * This function returns what is stored in the file, and does not validate
- * that what is there are valid frames for the decoder. It will split what is
- * stored in the file into frames and return one for each call. It will not
- * omit invalid data between valid frames so as to give the decoder the maximum
- * information possible for decoding.
- *
- * If pkt->buf is NULL, then the packet is valid until the next
- * av_read_frame() or until avformat_close_input(). Otherwise the packet
- * is valid indefinitely. In both cases the packet must be freed with
- * av_packet_unref when it is no longer needed. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of frames if each
- * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
- * have a variable size (e.g. MPEG audio), then it contains one frame.
- *
- * pkt->pts, pkt->dts and pkt->duration are always set to correct
- * values in AVStream.time_base units (and guessed if the format cannot
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Seek to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- *
- * @param s media file handle
- * @param stream_index If stream_index is (-1), a default
- * stream is selected, and timestamp is automatically converted
- * from AV_TIME_BASE units to the stream specific time_base.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * Seek to timestamp ts.
- * Seeking will be done so that the point from which all active streams
- * can be presented successfully will be closest to ts and within min/max_ts.
- * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * or if stream_index is -1, in AV_TIME_BASE units.
- * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
- * keyframes (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored.
- *
- * @param s media file handle
- * @param stream_index index of the stream which is used as time base reference
- * @param min_ts smallest acceptable timestamp
- * @param ts target timestamp
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @note This is part of the new seek API which is still under construction.
- *       Thus do not use this yet. It may change at any time, do not expect
- *       ABI compatibility yet!
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Discard all internally buffered data. This can be useful when dealing with
- * discontinuities in the byte stream. Generally works only with formats that
- * can resync. This includes headerless formats like MPEG-TS/TS but should also
- * work with NUT, Ogg and in a limited way AVI for example.
- *
- * The set of streams, the detected duration, stream parameters and codecs do
- * not change when calling this function. If you want a complete reset, it's
- * better to open a new AVFormatContext.
- *
- * This does not flush the AVIOContext (s->pb). If necessary, call
- * avio_flush(s->pb) before calling this function.
- *
- * @param s media file handle
- * @return >=0 on success, error code otherwise
- */
-int avformat_flush(AVFormatContext *s);
-
-/**
- * Start playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pause a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-/**
- * Close an opened input AVFormatContext. Free it and all its contents
- * and set *s to NULL.
- */
-void avformat_close_input(AVFormatContext **s);
-/**
- * @}
- */
-
-#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
-#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
-#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
-#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-
-#define AVSTREAM_INIT_IN_WRITE_HEADER 0 ///< stream parameters initialized in avformat_write_header
-#define AVSTREAM_INIT_IN_INIT_OUTPUT  1 ///< stream parameters initialized in avformat_init_output
-
-/**
- * Allocate the stream private data and write the stream header to
- * an output media file.
- *
- * @param s Media file handle, must be allocated with avformat_alloc_context().
- *          Its oformat field must be set to the desired output format;
- *          Its pb field must be set to an already opened AVIOContext.
- * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return AVSTREAM_INIT_IN_WRITE_HEADER on success if the codec had not already been fully initialized in avformat_init,
- *         AVSTREAM_INIT_IN_INIT_OUTPUT  on success if the codec had already been fully initialized in avformat_init,
- *         negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next, avformat_init_output.
- */
-av_warn_unused_result
-int avformat_write_header(AVFormatContext *s, AVDictionary **options);
-
-/**
- * Allocate the stream private data and initialize the codec, but do not write the header.
- * May optionally be used before avformat_write_header to initialize stream parameters
- * before actually writing the header.
- * If using this function, do not pass the same options to avformat_write_header.
- *
- * @param s Media file handle, must be allocated with avformat_alloc_context().
- *          Its oformat field must be set to the desired output format;
- *          Its pb field must be set to an already opened AVIOContext.
- * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return AVSTREAM_INIT_IN_WRITE_HEADER on success if the codec requires avformat_write_header to fully initialize,
- *         AVSTREAM_INIT_IN_INIT_OUTPUT  on success if the codec has been fully initialized,
- *         negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next, avformat_write_header.
- */
-av_warn_unused_result
-int avformat_init_output(AVFormatContext *s, AVDictionary **options);
-
-/**
- * Write a packet to an output media file.
- *
- * This function passes the packet directly to the muxer, without any buffering
- * or reordering. The caller is responsible for correctly interleaving the
- * packets if the format requires it. Callers that want libavformat to handle
- * the interleaving should call av_interleaved_write_frame() instead of this
- * function.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written. Note that unlike
- *            av_interleaved_write_frame(), this function does not take
- *            ownership of the packet passed to it (though some muxers may make
- *            an internal reference to the input packet).
- *            <br>
- *            This parameter can be NULL (at any time, not just at the end), in
- *            order to immediately flush data buffered within the muxer, for
- *            muxers that buffer up data internally before writing it to the
- *            output.
- *            <br>
- *            Packet's @ref AVPacket.stream_index "stream_index" field must be
- *            set to the index of the corresponding stream in @ref
- *            AVFormatContext.streams "s->streams".
- *            <br>
- *            The timestamps (@ref AVPacket.pts "pts", @ref AVPacket.dts "dts")
- *            must be set to correct values in the stream's timebase (unless the
- *            output format is flagged with the AVFMT_NOTIMESTAMPS flag, then
- *            they can be set to AV_NOPTS_VALUE).
- *            The dts for subsequent packets passed to this function must be strictly
- *            increasing when compared in their respective timebases (unless the
- *            output format is flagged with the AVFMT_TS_NONSTRICT, then they
- *            merely have to be nondecreasing).  @ref AVPacket.duration
- *            "duration") should also be set if known.
- * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
- *
- * @see av_interleaved_write_frame()
- */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write a packet to an output media file ensuring correct interleaving.
- *
- * This function will buffer the packets internally as needed to make sure the
- * packets in the output file are properly interleaved in the order of
- * increasing dts. Callers doing their own interleaving should call
- * av_write_frame() instead of this function.
- *
- * Using this function instead of av_write_frame() can give muxers advance
- * knowledge of future packets, improving e.g. the behaviour of the mp4
- * muxer for VFR content in fragmenting mode.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written.
- *            <br>
- *            If the packet is reference-counted, this function will take
- *            ownership of this reference and unreference it later when it sees
- *            fit.
- *            The caller must not access the data through this reference after
- *            this function returns. If the packet is not reference-counted,
- *            libavformat will make a copy.
- *            <br>
- *            This parameter can be NULL (at any time, not just at the end), to
- *            flush the interleaving queues.
- *            <br>
- *            Packet's @ref AVPacket.stream_index "stream_index" field must be
- *            set to the index of the corresponding stream in @ref
- *            AVFormatContext.streams "s->streams".
- *            <br>
- *            The timestamps (@ref AVPacket.pts "pts", @ref AVPacket.dts "dts")
- *            must be set to correct values in the stream's timebase (unless the
- *            output format is flagged with the AVFMT_NOTIMESTAMPS flag, then
- *            they can be set to AV_NOPTS_VALUE).
- *            The dts for subsequent packets in one stream must be strictly
- *            increasing (unless the output format is flagged with the
- *            AVFMT_TS_NONSTRICT, then they merely have to be nondecreasing).
- *            @ref AVPacket.duration "duration") should also be set if known.
- *
- * @return 0 on success, a negative AVERROR on error. Libavformat will always
- *         take care of freeing the packet, even if this function fails.
- *
- * @see av_write_frame(), AVFormatContext.max_interleave_delta
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write an uncoded frame to an output media file.
- *
- * The frame must be correctly interleaved according to the container
- * specification; if not, then av_interleaved_write_frame() must be used.
- *
- * See av_interleaved_write_frame() for details.
- */
-int av_write_uncoded_frame(AVFormatContext *s, int stream_index,
-                           AVFrame *frame);
-
-/**
- * Write an uncoded frame to an output media file.
- *
- * If the muxer supports it, this function makes it possible to write an AVFrame
- * structure directly, without encoding it into a packet.
- * It is mostly useful for devices and similar special muxers that use raw
- * video or PCM data and will not serialize it into a byte stream.
- *
- * To test whether it is possible to use it with a given muxer and stream,
- * use av_write_uncoded_frame_query().
- *
- * The caller gives up ownership of the frame and must not access it
- * afterwards.
- *
- * @return  >=0 for success, a negative code on error
- */
-int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index,
-                                       AVFrame *frame);
-
-/**
- * Test whether a muxer supports uncoded frame.
- *
- * @return  >=0 if an uncoded frame can be written to that muxer and stream,
- *          <0 if not
- */
-int av_write_uncoded_frame_query(AVFormatContext *s, int stream_index);
-
-/**
- * Write the stream trailer to an output media file and free the
- * file private data.
- *
- * May only be called after a successful call to avformat_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_trailer(AVFormatContext *s);
-
-/**
- * Return the output format in the list of registered output formats
- * which best matches the provided parameters, or return NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
-                                const char *filename,
-                                const char *mime_type);
-
-/**
- * Guess the codec ID based upon muxer and filename.
- */
-enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum AVMediaType type);
-
-/**
- * Get timing information for the data currently output.
- * The exact meaning of "currently output" depends on the format.
- * It is mostly relevant for devices that have an internal buffer and/or
- * work in real time.
- * @param s          media file handle
- * @param stream     stream in the media file
- * @param[out] dts   DTS of the last packet output for the stream, in stream
- *                   time_base units
- * @param[out] wall  absolute time when that packet whas output,
- *                   in microsecond
- * @return  0 if OK, AVERROR(ENOSYS) if the format does not support it
- * Note: some formats or devices may not allow to measure dts and wall
- * atomically.
- */
-int av_get_output_timestamp(struct AVFormatContext *s, int stream,
-                            int64_t *dts, int64_t *wall);
-
-
-/**
- * @}
- */
-
-
-/**
- * @defgroup lavf_misc Utility functions
- * @ingroup libavf
- * @{
- *
- * Miscellaneous utility functions related to both muxing and demuxing
- * (or neither).
- */
-
-/**
- * Send a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump(FILE *f, const uint8_t *buf, int size);
-
-/**
- * Send a nice hexadecimal dump of a buffer to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
-
-/**
- * Send a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump2(FILE *f, const AVPacket *pkt, int dump_payload, const AVStream *st);
-
-
-/**
- * Send a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump_log2(void *avcl, int level, const AVPacket *pkt, int dump_payload,
-                      const AVStream *st);
-
-/**
- * Get the AVCodecID for the given codec tag tag.
- * If no codec id is found returns AV_CODEC_ID_NONE.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- * @param tag  codec tag to match to a codec ID
- */
-enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * Get the codec tag for the given codec id id.
- * If no codec tag is found returns 0.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- * @param id   codec ID to match to a codec tag
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
-
-/**
- * Get the codec tag for the given codec id.
- *
- * @param tags list of supported codec_id - codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- * @param id codec id that should be searched for in the list
- * @param tag A pointer to the found tag
- * @return 0 if id was not found in tags, > 0 if it was found
- */
-int av_codec_get_tag2(const struct AVCodecTag * const *tags, enum AVCodecID id,
-                      unsigned int *tag);
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Get the index for a specific timestamp.
- *
- * @param st        stream that the timestamp belongs to
- * @param timestamp timestamp to retrieve the index for
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Add an index entry into a sorted list. Update the entry if the list
- * already contains it.
- *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-
-/**
- * Split a URL string into components.
- *
- * The pointers to buffers for storing individual components may be null,
- * in order to ignore that component. Buffers for components not found are
- * set to empty strings. If the port is not found, it is set to a negative
- * value.
- *
- * @param proto the buffer for the protocol
- * @param proto_size the size of the proto buffer
- * @param authorization the buffer for the authorization
- * @param authorization_size the size of the authorization buffer
- * @param hostname the buffer for the host name
- * @param hostname_size the size of the hostname buffer
- * @param port_ptr a pointer to store the port number in
- * @param path the buffer for the path
- * @param path_size the size of the path buffer
- * @param url the URL to split
- */
-void av_url_split(char *proto,         int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname,      int hostname_size,
-                  int *port_ptr,
-                  char *path,          int path_size,
-                  const char *url);
-
-
-/**
- * Print detailed information about the input or output format, such as
- * duration, bitrate, streams, container, programs, metadata, side data,
- * codec and time base.
- *
- * @param ic        the context to analyze
- * @param index     index of the stream to dump information about
- * @param url       the URL to print, such as source or destination file
- * @param is_output Select whether the specified context is an input(0) or output(1)
- */
-void av_dump_format(AVFormatContext *ic,
-                    int index,
-                    const char *url,
-                    int is_output);
-
-
-#define AV_FRAME_FILENAME_FLAGS_MULTIPLE 1 ///< Allow multiple %d
-
-/**
- * Return in 'buf' the path with '%d' replaced by a number.
- *
- * Also handles the '%0nd' format where 'n' is the total number
- * of digits and '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @param flags AV_FRAME_FILENAME_FLAGS_*
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename2(char *buf, int buf_size,
-                          const char *path, int number, int flags);
-
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * Check whether filename actually is a numbered sequence generator.
- *
- * @param filename possible numbered sequence string
- * @return 1 if a valid numbered sequence string, 0 otherwise
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * Generate an SDP for an RTP session.
- *
- * Note, this overwrites the id values of AVStreams in the muxer contexts
- * for getting unique dynamic payload types.
- *
- * @param ac array of AVFormatContexts describing the RTP streams. If the
- *           array is composed by only one context, such context can contain
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           all the contexts in the array (an AVCodecContext per RTP stream)
- *           must contain only one AVStream.
- * @param n_files number of AVCodecContexts contained in ac
- * @param buf buffer where the SDP will be stored (must be allocated by
- *            the caller)
- * @param size the size of the buffer
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
-
-/**
- * Return a positive value if the given filename has one of the given
- * extensions, 0 otherwise.
- *
- * @param filename   file name to check against the given extensions
- * @param extensions a comma-separated list of filename extensions
- */
-int av_match_ext(const char *filename, const char *extensions);
-
-/**
- * Test if the given container can store a codec.
- *
- * @param ofmt           container to check for compatibility
- * @param codec_id       codec to potentially store in container
- * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
- *
- * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
- *         A negative number if this information is not available.
- */
-int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
-                         int std_compliance);
-
-/**
- * @defgroup riff_fourcc RIFF FourCCs
- * @{
- * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
- * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
- * following code:
- * @code
- * uint32_t tag = MKTAG('H', '2', '6', '4');
- * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
- * enum AVCodecID id = av_codec_get_id(table, tag);
- * @endcode
- */
-/**
- * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
- */
-const struct AVCodecTag *avformat_get_riff_video_tags(void);
-/**
- * @return the table mapping RIFF FourCCs for audio to AVCodecID.
- */
-const struct AVCodecTag *avformat_get_riff_audio_tags(void);
-/**
- * @return the table mapping MOV FourCCs for video to libavcodec AVCodecID.
- */
-const struct AVCodecTag *avformat_get_mov_video_tags(void);
-/**
- * @return the table mapping MOV FourCCs for audio to AVCodecID.
- */
-const struct AVCodecTag *avformat_get_mov_audio_tags(void);
-
-/**
- * @}
- */
-
-/**
- * Guess the sample aspect ratio of a frame, based on both the stream and the
- * frame aspect ratio.
- *
- * Since the frame aspect ratio is set by the codec but the stream aspect ratio
- * is set by the demuxer, these two may not be equal. This function tries to
- * return the value that you should use if you would like to display the frame.
- *
- * Basic logic is to use the stream aspect ratio if it is set to something sane
- * otherwise use the frame aspect ratio. This way a container setting, which is
- * usually easy to modify can override the coded value in the frames.
- *
- * @param format the format context which the stream is part of
- * @param stream the stream which the frame is part of
- * @param frame the frame with the aspect ratio to be determined
- * @return the guessed (valid) sample_aspect_ratio, 0/1 if no idea
- */
-AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame);
-
-/**
- * Guess the frame rate, based on both the container and codec information.
- *
- * @param ctx the format context which the stream is part of
- * @param stream the stream which the frame is part of
- * @param frame the frame for which the frame rate should be determined, may be NULL
- * @return the guessed (valid) frame rate, 0/1 if no idea
- */
-AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, AVFrame *frame);
-
-/**
- * Check if the stream st contained in s is matched by the stream specifier
- * spec.
- *
- * See the "stream specifiers" chapter in the documentation for the syntax
- * of spec.
- *
- * @return  >0 if st is matched by spec;
- *          0  if st is not matched by spec;
- *          AVERROR code if spec is invalid
- *
- * @note  A stream specifier can match several streams in the format.
- */
-int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st,
-                                    const char *spec);
-
-int avformat_queue_attached_pictures(AVFormatContext *s);
-
-#if FF_API_OLD_BSF
-/**
- * Apply a list of bitstream filters to a packet.
- *
- * @param codec AVCodecContext, usually from an AVStream
- * @param pkt the packet to apply filters to. If, on success, the returned
- *        packet has size == 0 and side_data_elems == 0, it indicates that
- *        the packet should be dropped
- * @param bsfc a NULL-terminated list of filters to apply
- * @return  >=0 on success;
- *          AVERROR code on failure
- */
-attribute_deprecated
-int av_apply_bitstream_filters(AVCodecContext *codec, AVPacket *pkt,
-                               AVBitStreamFilterContext *bsfc);
-#endif
-
-enum AVTimebaseSource {
-    AVFMT_TBCF_AUTO = -1,
-    AVFMT_TBCF_DECODER,
-    AVFMT_TBCF_DEMUXER,
-#if FF_API_R_FRAME_RATE
-    AVFMT_TBCF_R_FRAMERATE,
-#endif
-};
-
-/**
- * Transfer internal timing information from one stream to another.
- *
- * This function is useful when doing stream copy.
- *
- * @param ofmt     target output format for ost
- * @param ost      output stream which needs timings copy and adjustments
- * @param ist      reference input stream to copy timings from
- * @param copy_tb  define from where the stream codec timebase needs to be imported
- */
-int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt,
-                                                  AVStream *ost, const AVStream *ist,
-                                                  enum AVTimebaseSource copy_tb);
-
-/**
- * Get the internal codec timebase from a stream.
- *
- * @param st  input stream to extract the timebase from
- */
-AVRational av_stream_get_codec_timebase(const AVStream *st);
-
-/**
- * @}
- */
-
-#endif /* AVFORMAT_AVFORMAT_H */
diff --git a/dependencies2013/win32/include/libavformat/avio.h b/dependencies2013/win32/include/libavformat/avio.h
deleted file mode 100644
index f9c5972a..00000000
--- a/dependencies2013/win32/include/libavformat/avio.h
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * @ingroup lavf_io
- * Buffered I/O operations
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "libavformat/version.h"
-
-/**
- * Seeking works like for a local file.
- */
-#define AVIO_SEEKABLE_NORMAL (1 << 0)
-
-/**
- * Seeking by timestamp with avio_seek_time() is possible.
- */
-#define AVIO_SEEKABLE_TIME   (1 << 1)
-
-/**
- * Callback for checking whether to abort blocking functions.
- * AVERROR_EXIT is returned in this case by the interrupted
- * function. During blocking operations, callback is called with
- * opaque as parameter. If the callback returns 1, the
- * blocking operation will be aborted.
- *
- * No members can be added to this struct without a major bump, if
- * new elements have been added after this struct in AVFormatContext
- * or AVIOContext.
- */
-typedef struct AVIOInterruptCB {
-    int (*callback)(void*);
-    void *opaque;
-} AVIOInterruptCB;
-
-/**
- * Directory entry types.
- */
-enum AVIODirEntryType {
-    AVIO_ENTRY_UNKNOWN,
-    AVIO_ENTRY_BLOCK_DEVICE,
-    AVIO_ENTRY_CHARACTER_DEVICE,
-    AVIO_ENTRY_DIRECTORY,
-    AVIO_ENTRY_NAMED_PIPE,
-    AVIO_ENTRY_SYMBOLIC_LINK,
-    AVIO_ENTRY_SOCKET,
-    AVIO_ENTRY_FILE,
-    AVIO_ENTRY_SERVER,
-    AVIO_ENTRY_SHARE,
-    AVIO_ENTRY_WORKGROUP,
-};
-
-/**
- * Describes single entry of the directory.
- *
- * Only name and type fields are guaranteed be set.
- * Rest of fields are protocol or/and platform dependent and might be unknown.
- */
-typedef struct AVIODirEntry {
-    char *name;                           /**< Filename */
-    int type;                             /**< Type of the entry */
-    int utf8;                             /**< Set to 1 when name is encoded with UTF-8, 0 otherwise.
-                                               Name can be encoded with UTF-8 even though 0 is set. */
-    int64_t size;                         /**< File size in bytes, -1 if unknown. */
-    int64_t modification_timestamp;       /**< Time of last modification in microseconds since unix
-                                               epoch, -1 if unknown. */
-    int64_t access_timestamp;             /**< Time of last access in microseconds since unix epoch,
-                                               -1 if unknown. */
-    int64_t status_change_timestamp;      /**< Time of last status change in microseconds since unix
-                                               epoch, -1 if unknown. */
-    int64_t user_id;                      /**< User ID of owner, -1 if unknown. */
-    int64_t group_id;                     /**< Group ID of owner, -1 if unknown. */
-    int64_t filemode;                     /**< Unix file mode, -1 if unknown. */
-} AVIODirEntry;
-
-typedef struct AVIODirContext {
-    struct URLContext *url_context;
-} AVIODirContext;
-
-/**
- * Different data types that can be returned via the AVIO
- * write_data_type callback.
- */
-enum AVIODataMarkerType {
-    /**
-     * Header data; this needs to be present for the stream to be decodeable.
-     */
-    AVIO_DATA_MARKER_HEADER,
-    /**
-     * A point in the output bytestream where a decoder can start decoding
-     * (i.e. a keyframe). A demuxer/decoder given the data flagged with
-     * AVIO_DATA_MARKER_HEADER, followed by any AVIO_DATA_MARKER_SYNC_POINT,
-     * should give decodeable results.
-     */
-    AVIO_DATA_MARKER_SYNC_POINT,
-    /**
-     * A point in the output bytestream where a demuxer can start parsing
-     * (for non self synchronizing bytestream formats). That is, any
-     * non-keyframe packet start point.
-     */
-    AVIO_DATA_MARKER_BOUNDARY_POINT,
-    /**
-     * This is any, unlabelled data. It can either be a muxer not marking
-     * any positions at all, it can be an actual boundary/sync point
-     * that the muxer chooses not to mark, or a later part of a packet/fragment
-     * that is cut into multiple write callbacks due to limited IO buffer size.
-     */
-    AVIO_DATA_MARKER_UNKNOWN,
-    /**
-     * Trailer data, which doesn't contain actual content, but only for
-     * finalizing the output file.
-     */
-    AVIO_DATA_MARKER_TRAILER,
-    /**
-     * A point in the output bytestream where the underlying AVIOContext might
-     * flush the buffer depending on latency or buffering requirements. Typically
-     * means the end of a packet.
-     */
-    AVIO_DATA_MARKER_FLUSH_POINT,
-};
-
-/**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVIOContext) must not be used outside libav*.
- *
- * @note None of the function pointers in AVIOContext should be called
- *       directly, they should only be set by the client application
- *       when implementing custom I/O. Normally these are set to the
- *       function pointers specified in avio_alloc_context()
- */
-typedef struct AVIOContext {
-    /**
-     * A class for private options.
-     *
-     * If this AVIOContext is created by avio_open2(), av_class is set and
-     * passes the options down to protocols.
-     *
-     * If this AVIOContext is manually allocated, then av_class may be set by
-     * the caller.
-     *
-     * warning -- this field can be NULL, be sure to not pass this AVIOContext
-     * to any av_opt_* functions in that case.
-     */
-    const AVClass *av_class;
-
-    /*
-     * The following shows the relationship between buffer, buf_ptr,
-     * buf_ptr_max, buf_end, buf_size, and pos, when reading and when writing
-     * (since AVIOContext is used for both):
-     *
-     **********************************************************************************
-     *                                   READING
-     **********************************************************************************
-     *
-     *                            |              buffer_size              |
-     *                            |---------------------------------------|
-     *                            |                                       |
-     *
-     *                         buffer          buf_ptr       buf_end
-     *                            +---------------+-----------------------+
-     *                            |/ / / / / / / /|/ / / / / / /|         |
-     *  read buffer:              |/ / consumed / | to be read /|         |
-     *                            |/ / / / / / / /|/ / / / / / /|         |
-     *                            +---------------+-----------------------+
-     *
-     *                                                         pos
-     *              +-------------------------------------------+-----------------+
-     *  input file: |                                           |                 |
-     *              +-------------------------------------------+-----------------+
-     *
-     *
-     **********************************************************************************
-     *                                   WRITING
-     **********************************************************************************
-     *
-     *                             |          buffer_size                 |
-     *                             |--------------------------------------|
-     *                             |                                      |
-     *
-     *                                                buf_ptr_max
-     *                          buffer                 (buf_ptr)       buf_end
-     *                             +-----------------------+--------------+
-     *                             |/ / / / / / / / / / / /|              |
-     *  write buffer:              | / / to be flushed / / |              |
-     *                             |/ / / / / / / / / / / /|              |
-     *                             +-----------------------+--------------+
-     *                               buf_ptr can be in this
-     *                               due to a backward seek
-     *
-     *                            pos
-     *               +-------------+----------------------------------------------+
-     *  output file: |             |                                              |
-     *               +-------------+----------------------------------------------+
-     *
-     */
-    unsigned char *buffer;  /**< Start of the buffer. */
-    int buffer_size;        /**< Maximum buffer size */
-    unsigned char *buf_ptr; /**< Current position in the buffer */
-    unsigned char *buf_end; /**< End of the data, may be less than
-                                 buffer+buffer_size if the read function returned
-                                 less data than requested, e.g. for streams where
-                                 no more data has been received yet. */
-    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
-                                 functions. */
-    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int64_t (*seek)(void *opaque, int64_t offset, int whence);
-    int64_t pos;            /**< position in the file of the current buffer */
-    int must_flush;         /**< unused */
-    int eof_reached;        /**< true if eof reached */
-    int write_flag;         /**< true if open for writing */
-    int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;              /**< contains the error code or 0 if no error happened */
-    /**
-     * Pause or resume playback for network streaming protocols - e.g. MMS.
-     */
-    int (*read_pause)(void *opaque, int pause);
-    /**
-     * Seek to a given timestamp in stream with the specified stream_index.
-     * Needed for some network streaming protocols which don't support seeking
-     * to byte position.
-     */
-    int64_t (*read_seek)(void *opaque, int stream_index,
-                         int64_t timestamp, int flags);
-    /**
-     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
-     */
-    int seekable;
-
-    /**
-     * max filesize, used to limit allocations
-     * This field is internal to libavformat and access from outside is not allowed.
-     */
-    int64_t maxsize;
-
-    /**
-     * avio_read and avio_write should if possible be satisfied directly
-     * instead of going through a buffer, and avio_seek will always
-     * call the underlying seek function directly.
-     */
-    int direct;
-
-    /**
-     * Bytes read statistic
-     * This field is internal to libavformat and access from outside is not allowed.
-     */
-    int64_t bytes_read;
-
-    /**
-     * seek statistic
-     * This field is internal to libavformat and access from outside is not allowed.
-     */
-    int seek_count;
-
-    /**
-     * writeout statistic
-     * This field is internal to libavformat and access from outside is not allowed.
-     */
-    int writeout_count;
-
-    /**
-     * Original buffer size
-     * used internally after probing and ensure seekback to reset the buffer size
-     * This field is internal to libavformat and access from outside is not allowed.
-     */
-    int orig_buffer_size;
-
-    /**
-     * Threshold to favor readahead over seek.
-     * This is current internal only, do not use from outside.
-     */
-    int short_seek_threshold;
-
-    /**
-     * ',' separated list of allowed protocols.
-     */
-    const char *protocol_whitelist;
-
-    /**
-     * ',' separated list of disallowed protocols.
-     */
-    const char *protocol_blacklist;
-
-    /**
-     * A callback that is used instead of write_packet.
-     */
-    int (*write_data_type)(void *opaque, uint8_t *buf, int buf_size,
-                           enum AVIODataMarkerType type, int64_t time);
-    /**
-     * If set, don't call write_data_type separately for AVIO_DATA_MARKER_BOUNDARY_POINT,
-     * but ignore them and treat them as AVIO_DATA_MARKER_UNKNOWN (to avoid needlessly
-     * small chunks of data returned from the callback).
-     */
-    int ignore_boundary_point;
-
-    /**
-     * Internal, not meant to be used from outside of AVIOContext.
-     */
-    enum AVIODataMarkerType current_type;
-    int64_t last_time;
-
-    /**
-     * A callback that is used instead of short_seek_threshold.
-     * This is current internal only, do not use from outside.
-     */
-    int (*short_seek_get)(void *opaque);
-
-    int64_t written;
-
-    /**
-     * Maximum reached position before a backward seek in the write buffer,
-     * used keeping track of already written data for a later flush.
-     */
-    unsigned char *buf_ptr_max;
-
-    /**
-     * Try to buffer at least this amount of data before flushing it
-     */
-    int min_packet_size;
-} AVIOContext;
-
-/**
- * Return the name of the protocol that will handle the passed URL.
- *
- * NULL is returned if no protocol could be found for the given URL.
- *
- * @return Name of the protocol or NULL.
- */
-const char *avio_find_protocol_name(const char *url);
-
-/**
- * Return AVIO_FLAG_* access flags corresponding to the access permissions
- * of the resource in url, or a negative value corresponding to an
- * AVERROR code in case of failure. The returned access flags are
- * masked by the value in flags.
- *
- * @note This function is intrinsically unsafe, in the sense that the
- * checked resource may change its existence or permission status from
- * one call to another. Thus you should not trust the returned value,
- * unless you are sure that no other processes are accessing the
- * checked resource.
- */
-int avio_check(const char *url, int flags);
-
-/**
- * Move or rename a resource.
- *
- * @note url_src and url_dst should share the same protocol and authority.
- *
- * @param url_src url to resource to be moved
- * @param url_dst new url to resource if the operation succeeded
- * @return >=0 on success or negative on error.
- */
-int avpriv_io_move(const char *url_src, const char *url_dst);
-
-/**
- * Delete a resource.
- *
- * @param url resource to be deleted.
- * @return >=0 on success or negative on error.
- */
-int avpriv_io_delete(const char *url);
-
-/**
- * Open directory for reading.
- *
- * @param s       directory read context. Pointer to a NULL pointer must be passed.
- * @param url     directory to be listed.
- * @param options A dictionary filled with protocol-private options. On return
- *                this parameter will be destroyed and replaced with a dictionary
- *                containing options that were not found. May be NULL.
- * @return >=0 on success or negative on error.
- */
-int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options);
-
-/**
- * Get next directory entry.
- *
- * Returned entry must be freed with avio_free_directory_entry(). In particular
- * it may outlive AVIODirContext.
- *
- * @param s         directory read context.
- * @param[out] next next entry or NULL when no more entries.
- * @return >=0 on success or negative on error. End of list is not considered an
- *             error.
- */
-int avio_read_dir(AVIODirContext *s, AVIODirEntry **next);
-
-/**
- * Close directory.
- *
- * @note Entries created using avio_read_dir() are not deleted and must be
- * freeded with avio_free_directory_entry().
- *
- * @param s         directory read context.
- * @return >=0 on success or negative on error.
- */
-int avio_close_dir(AVIODirContext **s);
-
-/**
- * Free entry allocated by avio_read_dir().
- *
- * @param entry entry to be freed.
- */
-void avio_free_directory_entry(AVIODirEntry **entry);
-
-/**
- * Allocate and initialize an AVIOContext for buffered I/O. It must be later
- * freed with avio_context_free().
- *
- * @param buffer Memory block for input/output operations via AVIOContext.
- *        The buffer must be allocated with av_malloc() and friends.
- *        It may be freed and replaced with a new buffer by libavformat.
- *        AVIOContext.buffer holds the buffer currently in use,
- *        which must be later freed with av_free().
- * @param buffer_size The buffer size is very important for performance.
- *        For protocols with fixed blocksize it should be set to this blocksize.
- *        For others a typical size is a cache page, e.g. 4kb.
- * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
- * @param opaque An opaque pointer to user-specific data.
- * @param read_packet  A function for refilling the buffer, may be NULL.
- * @param write_packet A function for writing the buffer contents, may be NULL.
- *        The function may not change the input buffers content.
- * @param seek A function for seeking to specified byte position, may be NULL.
- *
- * @return Allocated AVIOContext or NULL on failure.
- */
-AVIOContext *avio_alloc_context(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-/**
- * Free the supplied IO context and everything associated with it.
- *
- * @param s Double pointer to the IO context. This function will write NULL
- * into s.
- */
-void avio_context_free(AVIOContext **s);
-
-void avio_w8(AVIOContext *s, int b);
-void avio_write(AVIOContext *s, const unsigned char *buf, int size);
-void avio_wl64(AVIOContext *s, uint64_t val);
-void avio_wb64(AVIOContext *s, uint64_t val);
-void avio_wl32(AVIOContext *s, unsigned int val);
-void avio_wb32(AVIOContext *s, unsigned int val);
-void avio_wl24(AVIOContext *s, unsigned int val);
-void avio_wb24(AVIOContext *s, unsigned int val);
-void avio_wl16(AVIOContext *s, unsigned int val);
-void avio_wb16(AVIOContext *s, unsigned int val);
-
-/**
- * Write a NULL-terminated string.
- * @return number of bytes written.
- */
-int avio_put_str(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16LE and write it.
- * @param s the AVIOContext
- * @param str NULL-terminated UTF-8 string
- *
- * @return number of bytes written.
- */
-int avio_put_str16le(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16BE and write it.
- * @param s the AVIOContext
- * @param str NULL-terminated UTF-8 string
- *
- * @return number of bytes written.
- */
-int avio_put_str16be(AVIOContext *s, const char *str);
-
-/**
- * Mark the written bytestream as a specific type.
- *
- * Zero-length ranges are omitted from the output.
- *
- * @param time the stream time the current bytestream pos corresponds to
- *             (in AV_TIME_BASE units), or AV_NOPTS_VALUE if unknown or not
- *             applicable
- * @param type the kind of data written starting at the current pos
- */
-void avio_write_marker(AVIOContext *s, int64_t time, enum AVIODataMarkerType type);
-
-/**
- * ORing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Passing this flag as the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonable
- * means that can be extremely slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
-/**
- * fseek() equivalent for AVIOContext.
- * @return new position or AVERROR.
- */
-int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward
- * @return new position or AVERROR.
- */
-int64_t avio_skip(AVIOContext *s, int64_t offset);
-
-/**
- * ftell() equivalent for AVIOContext.
- * @return position or AVERROR.
- */
-static av_always_inline int64_t avio_tell(AVIOContext *s)
-{
-    return avio_seek(s, 0, SEEK_CUR);
-}
-
-/**
- * Get the filesize.
- * @return filesize or AVERROR
- */
-int64_t avio_size(AVIOContext *s);
-
-/**
- * feof() equivalent for AVIOContext.
- * @return non zero if and only if end of file
- */
-int avio_feof(AVIOContext *s);
-#if FF_API_URL_FEOF
-/**
- * @deprecated use avio_feof()
- */
-attribute_deprecated
-int url_feof(AVIOContext *s);
-#endif
-
-/** @warning Writes up to 4 KiB per call */
-int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
-
-/**
- * Force flushing of buffered data.
- *
- * For write streams, force the buffered data to be immediately written to the output,
- * without to wait to fill the internal buffer.
- *
- * For read streams, discard all currently buffered data, and advance the
- * reported file position to that of the underlying stream. This does not
- * read new data, and does not perform any seeks.
- */
-void avio_flush(AVIOContext *s);
-
-/**
- * Read size bytes from AVIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int avio_read(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * Read size bytes from AVIOContext into buf. Unlike avio_read(), this is allowed
- * to read fewer bytes than requested. The missing bytes can be read in the next
- * call. This always tries to read at least 1 byte.
- * Useful to reduce latency in certain cases.
- * @return number of bytes read or AVERROR
- */
-int avio_read_partial(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * @name Functions for reading from AVIOContext
- * @{
- *
- * @note return 0 if EOF, so you cannot use it if EOF handling is
- *       necessary
- */
-int          avio_r8  (AVIOContext *s);
-unsigned int avio_rl16(AVIOContext *s);
-unsigned int avio_rl24(AVIOContext *s);
-unsigned int avio_rl32(AVIOContext *s);
-uint64_t     avio_rl64(AVIOContext *s);
-unsigned int avio_rb16(AVIOContext *s);
-unsigned int avio_rb24(AVIOContext *s);
-unsigned int avio_rb32(AVIOContext *s);
-uint64_t     avio_rb64(AVIOContext *s);
-/**
- * @}
- */
-
-/**
- * Read a string from pb into buf. The reading will terminate when either
- * a NULL character was encountered, maxlen bytes have been read, or nothing
- * more can be read from pb. The result is guaranteed to be NULL-terminated, it
- * will be truncated if buf is too small.
- * Note that the string is not interpreted or validated in any way, it
- * might get truncated in the middle of a sequence for multi-byte encodings.
- *
- * @return number of bytes read (is always <= maxlen).
- * If reading ends on EOF or error, the return value will be one more than
- * bytes actually read.
- */
-int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-/**
- * Read a UTF-16 string from pb and convert it to UTF-8.
- * The reading will terminate when either a null or invalid character was
- * encountered or maxlen bytes have been read.
- * @return number of bytes read (is always <= maxlen)
- */
-int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
-int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-
-/**
- * @name URL open modes
- * The flags argument to avio_open must be one of the following
- * constants, optionally ORed with other flags.
- * @{
- */
-#define AVIO_FLAG_READ  1                                      /**< read-only */
-#define AVIO_FLAG_WRITE 2                                      /**< write-only */
-#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
-/**
- * @}
- */
-
-/**
- * Use non-blocking mode.
- * If this flag is set, operations on the context will return
- * AVERROR(EAGAIN) if they can not be performed immediately.
- * If this flag is not set, operations on the context will never return
- * AVERROR(EAGAIN).
- * Note that this flag does not affect the opening/connecting of the
- * context. Connecting a protocol will always block if necessary (e.g. on
- * network protocols) but never hang (e.g. on busy devices).
- * Warning: non-blocking protocols is work-in-progress; this flag may be
- * silently ignored.
- */
-#define AVIO_FLAG_NONBLOCK 8
-
-/**
- * Use direct mode.
- * avio_read and avio_write should if possible be satisfied directly
- * instead of going through a buffer, and avio_seek will always
- * call the underlying seek function directly.
- */
-#define AVIO_FLAG_DIRECT 0x8000
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param url resource to access
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return >= 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open(AVIOContext **s, const char *url, int flags);
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param url resource to access
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @param int_cb an interrupt callback to be used at the protocols level
- * @param options  A dictionary filled with protocol-private options. On return
- * this parameter will be destroyed and replaced with a dict containing options
- * that were not found. May be NULL.
- * @return >= 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open2(AVIOContext **s, const char *url, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * Close the resource accessed by the AVIOContext s and free it.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_closep
- */
-int avio_close(AVIOContext *s);
-
-/**
- * Close the resource accessed by the AVIOContext *s, free it
- * and set the pointer pointing to it to NULL.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_close
- */
-int avio_closep(AVIOContext **s);
-
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int avio_open_dyn_buf(AVIOContext **s);
-
-/**
- * Return the written size and a pointer to the buffer.
- * The AVIOContext stream is left intact.
- * The buffer must NOT be freed.
- * No padding is added to the buffer.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int avio_get_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
- * Padding of AV_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * Iterate through names of available protocols.
- *
- * @param opaque A private pointer representing current protocol.
- *        It must be a pointer to NULL on first iteration and will
- *        be updated by successive calls to avio_enum_protocols.
- * @param output If set to 1, iterate over output protocols,
- *               otherwise over input protocols.
- *
- * @return A static string containing the name of current protocol or NULL
- */
-const char *avio_enum_protocols(void **opaque, int output);
-
-/**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- *
- * @param h     IO context from which to call the read_pause function pointer
- * @param pause 1 for pause, 0 for resume
- */
-int     avio_pause(AVIOContext *h, int pause);
-
-/**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- *
- * @param h IO context from which to call the seek function pointers
- * @param stream_index The stream index that the timestamp is relative to.
- *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- *        units from the beginning of the presentation.
- *        If a stream_index >= 0 is used and the protocol does not support
- *        seeking based on component streams, the call will fail.
- * @param timestamp timestamp in AVStream.time_base units
- *        or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
- *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- *        fail if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
- */
-int64_t avio_seek_time(AVIOContext *h, int stream_index,
-                       int64_t timestamp, int flags);
-
-/* Avoid a warning. The header can not be included because it breaks c++. */
-struct AVBPrint;
-
-/**
- * Read contents of h into print buffer, up to max_size bytes, or up to EOF.
- *
- * @return 0 for success (max_size bytes read or EOF reached), negative error
- * code otherwise
- */
-int avio_read_to_bprint(AVIOContext *h, struct AVBPrint *pb, size_t max_size);
-
-/**
- * Accept and allocate a client context on a server context.
- * @param  s the server context
- * @param  c the client context, must be unallocated
- * @return   >= 0 on success or a negative value corresponding
- *           to an AVERROR on failure
- */
-int avio_accept(AVIOContext *s, AVIOContext **c);
-
-/**
- * Perform one step of the protocol handshake to accept a new client.
- * This function must be called on a client returned by avio_accept() before
- * using it as a read/write context.
- * It is separate from avio_accept() because it may block.
- * A step of the handshake is defined by places where the application may
- * decide to change the proceedings.
- * For example, on a protocol with a request header and a reply header, each
- * one can constitute a step because the application may use the parameters
- * from the request to change parameters in the reply; or each individual
- * chunk of the request can constitute a step.
- * If the handshake is already finished, avio_handshake() does nothing and
- * returns 0 immediately.
- *
- * @param  c the client context to perform the handshake on
- * @return   0   on a complete and successful handshake
- *           > 0 if the handshake progressed, but is not complete
- *           < 0 for an AVERROR code
- */
-int avio_handshake(AVIOContext *c);
-#endif /* AVFORMAT_AVIO_H */
diff --git a/dependencies2013/win32/include/libavformat/version.h b/dependencies2013/win32/include/libavformat/version.h
deleted file mode 100644
index 828be14b..00000000
--- a/dependencies2013/win32/include/libavformat/version.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_VERSION_H
-#define AVFORMAT_VERSION_H
-
-/**
- * @file
- * @ingroup libavf
- * Libavformat version macros
- */
-
-#include "libavutil/version.h"
-
-// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
-// Also please add any ticket numbers that you believe might be affected here
-#define LIBAVFORMAT_VERSION_MAJOR  57
-#define LIBAVFORMAT_VERSION_MINOR  84
-#define LIBAVFORMAT_VERSION_MICRO 100
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @note, when bumping the major version it is recommended to manually
- * disable each FF_API_* in its own commit instead of disabling them all
- * at once through the bump. This improves the git bisect-ability of the change.
- *
- */
-#ifndef FF_API_LAVF_BITEXACT
-#define FF_API_LAVF_BITEXACT            (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LAVF_FRAC
-#define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LAVF_CODEC_TB
-#define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_URL_FEOF
-#define FF_API_URL_FEOF                 (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LAVF_FMT_RAWPICTURE
-#define FF_API_LAVF_FMT_RAWPICTURE      (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_COMPUTE_PKT_FIELDS2
-#define FF_API_COMPUTE_PKT_FIELDS2      (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_OLD_OPEN_CALLBACKS
-#define FF_API_OLD_OPEN_CALLBACKS       (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LAVF_AVCTX
-#define FF_API_LAVF_AVCTX               (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_NOCONST_GET_SIDE_DATA
-#define FF_API_NOCONST_GET_SIDE_DATA    (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_HTTP_USER_AGENT
-#define FF_API_HTTP_USER_AGENT          (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_HLS_WRAP
-#define FF_API_HLS_WRAP                 (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LAVF_MERGE_SD
-#define FF_API_LAVF_MERGE_SD            (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_LAVF_KEEPSIDE_FLAG
-#define FF_API_LAVF_KEEPSIDE_FLAG       (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_OLD_ROTATE_API
-#define FF_API_OLD_ROTATE_API           (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
-
-
-#ifndef FF_API_R_FRAME_RATE
-#define FF_API_R_FRAME_RATE            1
-#endif
-#endif /* AVFORMAT_VERSION_H */
diff --git a/dependencies2013/win32/include/libavutil/adler32.h b/dependencies2013/win32/include/libavutil/adler32.h
deleted file mode 100644
index a1f035b7..00000000
--- a/dependencies2013/win32/include/libavutil/adler32.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_adler32
- * Public header for Adler-32 hash function implementation.
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @defgroup lavu_adler32 Adler-32
- * @ingroup lavu_hash
- * Adler-32 hash function implementation.
- *
- * @{
- */
-
-/**
- * Calculate the Adler32 checksum of a buffer.
- *
- * Passing the return value to a subsequent av_adler32_update() call
- * allows the checksum of multiple buffers to be calculated as though
- * they were concatenated.
- *
- * @param adler initial checksum value
- * @param buf   pointer to input buffer
- * @param len   size of input buffer
- * @return      updated checksum
- */
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ADLER32_H */
diff --git a/dependencies2013/win32/include/libavutil/aes.h b/dependencies2013/win32/include/libavutil/aes.h
deleted file mode 100644
index 09efbda1..00000000
--- a/dependencies2013/win32/include/libavutil/aes.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AES_H
-#define AVUTIL_AES_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_aes AES
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_aes_size;
-
-struct AVAES;
-
-/**
- * Allocate an AVAES context.
- */
-struct AVAES *av_aes_alloc(void);
-
-/**
- * Initialize an AVAES context.
- * @param key_bits 128, 192 or 256
- * @param decrypt 0 for encryption, 1 for decryption
- */
-int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- * @param count number of 16 byte blocks
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AES_H */
diff --git a/dependencies2013/win32/include/libavutil/aes_ctr.h b/dependencies2013/win32/include/libavutil/aes_ctr.h
deleted file mode 100644
index f596fa6a..00000000
--- a/dependencies2013/win32/include/libavutil/aes_ctr.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * AES-CTR cipher
- * Copyright (c) 2015 Eran Kornblau <erankor at gmail dot com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AES_CTR_H
-#define AVUTIL_AES_CTR_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-#define AES_CTR_KEY_SIZE (16)
-#define AES_CTR_IV_SIZE (8)
-
-struct AVAESCTR;
-
-/**
- * Allocate an AVAESCTR context.
- */
-struct AVAESCTR *av_aes_ctr_alloc(void);
-
-/**
- * Initialize an AVAESCTR context.
- * @param key encryption key, must have a length of AES_CTR_KEY_SIZE
- */
-int av_aes_ctr_init(struct AVAESCTR *a, const uint8_t *key);
-
-/**
- * Release an AVAESCTR context.
- */
-void av_aes_ctr_free(struct AVAESCTR *a);
-
-/**
- * Process a buffer using a previously initialized context.
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param size the size of src and dst
- */
-void av_aes_ctr_crypt(struct AVAESCTR *a, uint8_t *dst, const uint8_t *src, int size);
-
-/**
- * Get the current iv
- */
-const uint8_t* av_aes_ctr_get_iv(struct AVAESCTR *a);
-
-/**
- * Generate a random iv
- */
-void av_aes_ctr_set_random_iv(struct AVAESCTR *a);
-
-/**
- * Forcefully change the iv
- */
-void av_aes_ctr_set_iv(struct AVAESCTR *a, const uint8_t* iv);
-
-/**
- * Increment the top 64 bit of the iv (performed after each frame)
- */
-void av_aes_ctr_increment_iv(struct AVAESCTR *a);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AES_CTR_H */
diff --git a/dependencies2013/win32/include/libavutil/attributes.h b/dependencies2013/win32/include/libavutil/attributes.h
deleted file mode 100644
index 54d19011..00000000
--- a/dependencies2013/win32/include/libavutil/attributes.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
-#    define AV_GCC_VERSION_AT_MOST(x,y)  (__GNUC__ < (x) || __GNUC__ == (x) && __GNUC_MINOR__ <= (y))
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#    define AV_GCC_VERSION_AT_MOST(x,y)  0
-#endif
-
-#ifndef av_always_inline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#elif defined(_MSC_VER)
-#    define av_always_inline __forceinline
-#else
-#    define av_always_inline inline
-#endif
-#endif
-
-#ifndef av_extern_inline
-#if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
-#    define av_extern_inline extern inline
-#else
-#    define av_extern_inline inline
-#endif
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,4)
-#    define av_warn_unused_result __attribute__((warn_unused_result))
-#else
-#    define av_warn_unused_result
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#elif defined(_MSC_VER)
-#    define av_noinline __declspec(noinline)
-#else
-#    define av_noinline
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#    define attribute_deprecated __declspec(deprecated)
-#else
-#    define attribute_deprecated
-#endif
-
-/**
- * Disable warnings about deprecated features
- * This is useful for sections of code kept for backward compatibility and
- * scheduled for removal.
- */
-#ifndef AV_NOWARN_DEPRECATED
-#if AV_GCC_VERSION_AT_LEAST(4,6)
-#    define AV_NOWARN_DEPRECATED(code) \
-        _Pragma("GCC diagnostic push") \
-        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
-        code \
-        _Pragma("GCC diagnostic pop")
-#elif defined(_MSC_VER)
-#    define AV_NOWARN_DEPRECATED(code) \
-        __pragma(warning(push)) \
-        __pragma(warning(disable : 4996)) \
-        code; \
-        __pragma(warning(pop))
-#else
-#    define AV_NOWARN_DEPRECATED(code) code
-#endif
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-
-/**
- * Mark a variable as used and prevent the compiler from optimizing it
- * away.  This is useful for variables accessed only from inline
- * assembler without the compiler being aware.
- */
-#if AV_GCC_VERSION_AT_LEAST(3,1) || defined(__clang__)
-#    define av_used __attribute__((used))
-#else
-#    define av_used
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,3)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
-#else
-#    define av_builtin_constant_p(x) 0
-#    define av_printf_format(fmtpos, attrpos)
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,5)
-#    define av_noreturn __attribute__((noreturn))
-#else
-#    define av_noreturn
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
diff --git a/dependencies2013/win32/include/libavutil/audio_fifo.h b/dependencies2013/win32/include/libavutil/audio_fifo.h
deleted file mode 100644
index d8a9194a..00000000
--- a/dependencies2013/win32/include/libavutil/audio_fifo.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Audio FIFO
- * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Audio FIFO Buffer
- */
-
-#ifndef AVUTIL_AUDIO_FIFO_H
-#define AVUTIL_AUDIO_FIFO_H
-
-#include "avutil.h"
-#include "fifo.h"
-#include "samplefmt.h"
-
-/**
- * @addtogroup lavu_audio
- * @{
- *
- * @defgroup lavu_audiofifo Audio FIFO Buffer
- * @{
- */
-
-/**
- * Context for an Audio FIFO Buffer.
- *
- * - Operates at the sample level rather than the byte level.
- * - Supports multiple channels with either planar or packed sample format.
- * - Automatic reallocation when writing to a full buffer.
- */
-typedef struct AVAudioFifo AVAudioFifo;
-
-/**
- * Free an AVAudioFifo.
- *
- * @param af  AVAudioFifo to free
- */
-void av_audio_fifo_free(AVAudioFifo *af);
-
-/**
- * Allocate an AVAudioFifo.
- *
- * @param sample_fmt  sample format
- * @param channels    number of channels
- * @param nb_samples  initial allocation size, in samples
- * @return            newly allocated AVAudioFifo, or NULL on error
- */
-AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
-                                 int nb_samples);
-
-/**
- * Reallocate an AVAudioFifo.
- *
- * @param af          AVAudioFifo to reallocate
- * @param nb_samples  new allocation size, in samples
- * @return            0 if OK, or negative AVERROR code on failure
- */
-av_warn_unused_result
-int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
-
-/**
- * Write data to an AVAudioFifo.
- *
- * The AVAudioFifo will be reallocated automatically if the available space
- * is less than nb_samples.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to write to
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to write
- * @return            number of samples actually written, or negative AVERROR
- *                    code on failure. If successful, the number of samples
- *                    actually written will always be nb_samples.
- */
-int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Peek data from an AVAudioFifo.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to read from
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to peek
- * @return            number of samples actually peek, or negative AVERROR code
- *                    on failure. The number of samples actually peek will not
- *                    be greater than nb_samples, and will only be less than
- *                    nb_samples if av_audio_fifo_size is less than nb_samples.
- */
-int av_audio_fifo_peek(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Peek data from an AVAudioFifo.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to read from
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to peek
- * @param offset      offset from current read position
- * @return            number of samples actually peek, or negative AVERROR code
- *                    on failure. The number of samples actually peek will not
- *                    be greater than nb_samples, and will only be less than
- *                    nb_samples if av_audio_fifo_size is less than nb_samples.
- */
-int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offset);
-
-/**
- * Read data from an AVAudioFifo.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to read from
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to read
- * @return            number of samples actually read, or negative AVERROR code
- *                    on failure. The number of samples actually read will not
- *                    be greater than nb_samples, and will only be less than
- *                    nb_samples if av_audio_fifo_size is less than nb_samples.
- */
-int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Drain data from an AVAudioFifo.
- *
- * Removes the data without reading it.
- *
- * @param af          AVAudioFifo to drain
- * @param nb_samples  number of samples to drain
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
-
-/**
- * Reset the AVAudioFifo buffer.
- *
- * This empties all data in the buffer.
- *
- * @param af  AVAudioFifo to reset
- */
-void av_audio_fifo_reset(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for reading.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for reading
- */
-int av_audio_fifo_size(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for writing.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for writing
- */
-int av_audio_fifo_space(AVAudioFifo *af);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AUDIO_FIFO_H */
diff --git a/dependencies2013/win32/include/libavutil/avassert.h b/dependencies2013/win32/include/libavutil/avassert.h
deleted file mode 100644
index 46f3fea5..00000000
--- a/dependencies2013/win32/include/libavutil/avassert.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple assert() macros that are a bit more flexible than ISO C assert().
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_AVASSERT_H
-#define AVUTIL_AVASSERT_H
-
-#include <stdlib.h>
-#include "avutil.h"
-#include "log.h"
-
-/**
- * assert() equivalent, that is always enabled.
- */
-#define av_assert0(cond) do {                                           \
-    if (!(cond)) {                                                      \
-        av_log(NULL, AV_LOG_PANIC, "Assertion %s failed at %s:%d\n",    \
-               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
-        abort();                                                        \
-    }                                                                   \
-} while (0)
-
-
-/**
- * assert() equivalent, that does not lie in speed critical code.
- * These asserts() thus can be enabled without fearing speed loss.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
-#define av_assert1(cond) av_assert0(cond)
-#else
-#define av_assert1(cond) ((void)0)
-#endif
-
-
-/**
- * assert() equivalent, that does lie in speed critical code.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
-#define av_assert2(cond) av_assert0(cond)
-#define av_assert2_fpu() av_assert0_fpu()
-#else
-#define av_assert2(cond) ((void)0)
-#define av_assert2_fpu() ((void)0)
-#endif
-
-/**
- * Assert that floating point opperations can be executed.
- *
- * This will av_assert0() that the cpu is not in MMX state on X86
- */
-void av_assert0_fpu(void);
-
-#endif /* AVUTIL_AVASSERT_H */
diff --git a/dependencies2013/win32/include/libavutil/avconfig.h b/dependencies2013/win32/include/libavutil/avconfig.h
deleted file mode 100644
index f10aa618..00000000
--- a/dependencies2013/win32/include/libavutil/avconfig.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
-#endif /* AVUTIL_AVCONFIG_H */
diff --git a/dependencies2013/win32/include/libavutil/avstring.h b/dependencies2013/win32/include/libavutil/avstring.h
deleted file mode 100644
index 04d26956..00000000
--- a/dependencies2013/win32/include/libavutil/avstring.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2007 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
-
-#include <stddef.h>
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_string
- * @{
- */
-
-/**
- * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
- * the address of the first character in str after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_strstart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Return non-zero if pfx is a prefix of str independent of case. If
- * it is, *ptr is set to the address of the first character in str
- * after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_stristart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Locate the first case-independent occurrence in the string haystack
- * of the string needle.  A zero-length string needle is considered to
- * match at the start of haystack.
- *
- * This function is a case-insensitive version of the standard strstr().
- *
- * @param haystack string to search in
- * @param needle   string to search for
- * @return         pointer to the located match within haystack
- *                 or a null pointer if no match
- */
-char *av_stristr(const char *haystack, const char *needle);
-
-/**
- * Locate the first occurrence of the string needle in the string haystack
- * where not more than hay_length characters are searched. A zero-length
- * string needle is considered to match at the start of haystack.
- *
- * This function is a length-limited version of the standard strstr().
- *
- * @param haystack   string to search in
- * @param needle     string to search for
- * @param hay_length length of string to search in
- * @return           pointer to the located match within haystack
- *                   or a null pointer if no match
- */
-char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
-
-/**
- * Copy the string src to dst, but no more than size - 1 bytes, and
- * null-terminate dst.
- *
- * This function is the same as BSD strlcpy().
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the length of src
- *
- * @warning since the return value is the length of src, src absolutely
- * _must_ be a properly 0-terminated string, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcpy(char *dst, const char *src, size_t size);
-
-/**
- * Append the string src to the string dst, but to a total length of
- * no more than size - 1 bytes, and null-terminate dst.
- *
- * This function is similar to BSD strlcat(), but differs when
- * size <= strlen(dst).
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the total length of src and dst
- *
- * @warning since the return value use the length of src and dst, these
- * absolutely _must_ be a properly 0-terminated strings, otherwise this
- * will read beyond the end of the buffer and possibly crash.
- */
-size_t av_strlcat(char *dst, const char *src, size_t size);
-
-/**
- * Append output to a string, according to a format. Never write out of
- * the destination buffer, and always put a terminating 0 within
- * the buffer.
- * @param dst destination buffer (string to which the output is
- *  appended)
- * @param size total size of the destination buffer
- * @param fmt printf-compatible format string, specifying how the
- *  following parameters are used
- * @return the length of the string that would have been generated
- *  if enough space had been available
- */
-size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
-
-/**
- * Get the count of continuous non zero chars starting from the beginning.
- *
- * @param len maximum number of characters to check in the string, that
- *            is the maximum value which is returned by the function
- */
-static inline size_t av_strnlen(const char *s, size_t len)
-{
-    size_t i;
-    for (i = 0; i < len && s[i]; i++)
-        ;
-    return i;
-}
-
-/**
- * Print arguments following specified format into a large enough auto
- * allocated buffer. It is similar to GNU asprintf().
- * @param fmt printf-compatible format string, specifying how the
- *            following parameters are used.
- * @return the allocated string
- * @note You have to free the string yourself with av_free().
- */
-char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2);
-
-/**
- * Convert a number to an av_malloced string.
- */
-char *av_d2str(double d);
-
-/**
- * Unescape the given string until a non escaped terminating char,
- * and return the token corresponding to the unescaped string.
- *
- * The normal \ and ' escaping is supported. Leading and trailing
- * whitespaces are removed, unless they are escaped with '\' or are
- * enclosed between ''.
- *
- * @param buf the buffer to parse, buf will be updated to point to the
- * terminating char
- * @param term a 0-terminated list of terminating chars
- * @return the malloced unescaped string, which must be av_freed by
- * the user, NULL in case of allocation failure
- */
-char *av_get_token(const char **buf, const char *term);
-
-/**
- * Split the string into several tokens which can be accessed by
- * successive calls to av_strtok().
- *
- * A token is defined as a sequence of characters not belonging to the
- * set specified in delim.
- *
- * On the first call to av_strtok(), s should point to the string to
- * parse, and the value of saveptr is ignored. In subsequent calls, s
- * should be NULL, and saveptr should be unchanged since the previous
- * call.
- *
- * This function is similar to strtok_r() defined in POSIX.1.
- *
- * @param s the string to parse, may be NULL
- * @param delim 0-terminated list of token delimiters, must be non-NULL
- * @param saveptr user-provided pointer which points to stored
- * information necessary for av_strtok() to continue scanning the same
- * string. saveptr is updated to point to the next character after the
- * first delimiter found, or to NULL if the string was terminated
- * @return the found token, or NULL when no token is found
- */
-char *av_strtok(char *s, const char *delim, char **saveptr);
-
-/**
- * Locale-independent conversion of ASCII isdigit.
- */
-static inline av_const int av_isdigit(int c)
-{
-    return c >= '0' && c <= '9';
-}
-
-/**
- * Locale-independent conversion of ASCII isgraph.
- */
-static inline av_const int av_isgraph(int c)
-{
-    return c > 32 && c < 127;
-}
-
-/**
- * Locale-independent conversion of ASCII isspace.
- */
-static inline av_const int av_isspace(int c)
-{
-    return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' ||
-           c == '\v';
-}
-
-/**
- * Locale-independent conversion of ASCII characters to uppercase.
- */
-static inline av_const int av_toupper(int c)
-{
-    if (c >= 'a' && c <= 'z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII characters to lowercase.
- */
-static inline av_const int av_tolower(int c)
-{
-    if (c >= 'A' && c <= 'Z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII isxdigit.
- */
-static inline av_const int av_isxdigit(int c)
-{
-    c = av_tolower(c);
-    return av_isdigit(c) || (c >= 'a' && c <= 'f');
-}
-
-/**
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strcasecmp(const char *a, const char *b);
-
-/**
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strncasecmp(const char *a, const char *b, size_t n);
-
-/**
- * Locale-independent strings replace.
- * @note This means only ASCII-range characters are replace
- */
-char *av_strireplace(const char *str, const char *from, const char *to);
-
-/**
- * Thread safe basename.
- * @param path the path, on DOS both \ and / are considered separators.
- * @return pointer to the basename substring.
- */
-const char *av_basename(const char *path);
-
-/**
- * Thread safe dirname.
- * @param path the path, on DOS both \ and / are considered separators.
- * @return the path with the separator replaced by the string terminator or ".".
- * @note the function may change the input string.
- */
-const char *av_dirname(char *path);
-
-/**
- * Match instances of a name in a comma-separated list of names.
- * List entries are checked from the start to the end of the names list,
- * the first match ends further processing. If an entry prefixed with '-'
- * matches, then 0 is returned. The "ALL" list entry is considered to
- * match all names.
- *
- * @param name  Name to look for.
- * @param names List of names.
- * @return 1 on match, 0 otherwise.
- */
-int av_match_name(const char *name, const char *names);
-
-/**
- * Append path component to the existing path.
- * Path separator '/' is placed between when needed.
- * Resulting string have to be freed with av_free().
- * @param path      base path
- * @param component component to be appended
- * @return new path or NULL on error.
- */
-char *av_append_path_component(const char *path, const char *component);
-
-enum AVEscapeMode {
-    AV_ESCAPE_MODE_AUTO,      ///< Use auto-selected escaping mode.
-    AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping.
-    AV_ESCAPE_MODE_QUOTE,     ///< Use single-quote escaping.
-};
-
-/**
- * Consider spaces special and escape them even in the middle of the
- * string.
- *
- * This is equivalent to adding the whitespace characters to the special
- * characters lists, except it is guaranteed to use the exact same list
- * of whitespace characters as the rest of libavutil.
- */
-#define AV_ESCAPE_FLAG_WHITESPACE (1 << 0)
-
-/**
- * Escape only specified special characters.
- * Without this flag, escape also any characters that may be considered
- * special by av_get_token(), such as the single quote.
- */
-#define AV_ESCAPE_FLAG_STRICT (1 << 1)
-
-/**
- * Escape string in src, and put the escaped string in an allocated
- * string in *dst, which must be freed with av_free().
- *
- * @param dst           pointer where an allocated string is put
- * @param src           string to escape, must be non-NULL
- * @param special_chars string containing the special characters which
- *                      need to be escaped, can be NULL
- * @param mode          escape mode to employ, see AV_ESCAPE_MODE_* macros.
- *                      Any unknown value for mode will be considered equivalent to
- *                      AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
- *                      notice.
- * @param flags         flags which control how to escape, see AV_ESCAPE_FLAG_ macros
- * @return the length of the allocated string, or a negative error code in case of error
- * @see av_bprint_escape()
- */
-av_warn_unused_result
-int av_escape(char **dst, const char *src, const char *special_chars,
-              enum AVEscapeMode mode, int flags);
-
-#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES          1 ///< accept codepoints over 0x10FFFF
-#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS             2 ///< accept non-characters - 0xFFFE and 0xFFFF
-#define AV_UTF8_FLAG_ACCEPT_SURROGATES                 4 ///< accept UTF-16 surrogates codes
-#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML
-
-#define AV_UTF8_FLAG_ACCEPT_ALL \
-    AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES
-
-/**
- * Read and decode a single UTF-8 code point (character) from the
- * buffer in *buf, and update *buf to point to the next byte to
- * decode.
- *
- * In case of an invalid byte sequence, the pointer will be updated to
- * the next byte after the invalid sequence and the function will
- * return an error code.
- *
- * Depending on the specified flags, the function will also fail in
- * case the decoded code point does not belong to a valid range.
- *
- * @note For speed-relevant code a carefully implemented use of
- * GET_UTF8() may be preferred.
- *
- * @param codep   pointer used to return the parsed code in case of success.
- *                The value in *codep is set even in case the range check fails.
- * @param bufp    pointer to the address the first byte of the sequence
- *                to decode, updated by the function to point to the
- *                byte next after the decoded sequence
- * @param buf_end pointer to the end of the buffer, points to the next
- *                byte past the last in the buffer. This is used to
- *                avoid buffer overreads (in case of an unfinished
- *                UTF-8 sequence towards the end of the buffer).
- * @param flags   a collection of AV_UTF8_FLAG_* flags
- * @return >= 0 in case a sequence was successfully read, a negative
- * value in case of invalid sequence
- */
-av_warn_unused_result
-int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
-                   unsigned int flags);
-
-/**
- * Check if a name is in a list.
- * @returns 0 if not found, or the 1 based index where it has been found in the
- *            list.
- */
-int av_match_list(const char *name, const char *list, char separator);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AVSTRING_H */
diff --git a/dependencies2013/win32/include/libavutil/avutil.h b/dependencies2013/win32/include/libavutil/avutil.h
deleted file mode 100644
index 4d633156..00000000
--- a/dependencies2013/win32/include/libavutil/avutil.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * @ingroup lavu
- * Convenience header that includes @ref lavu "libavutil"'s core.
- */
-
-/**
- * @mainpage
- *
- * @section ffmpeg_intro Introduction
- *
- * This document describes the usage of the different libraries
- * provided by FFmpeg.
- *
- * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @ref lavfi "libavfilter" graph-based frame editing library
- * @li @ref libavf "libavformat" I/O and muxing/demuxing library
- * @li @ref lavd "libavdevice" special devices muxing/demuxing library
- * @li @ref lavu "libavutil" common utility library
- * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
- * @li @ref lpp  "libpostproc" post processing library
- * @li @ref libsws "libswscale" color conversion and scaling library
- *
- * @section ffmpeg_versioning Versioning and compatibility
- *
- * Each of the FFmpeg libraries contains a version.h header, which defines a
- * major, minor and micro version number with the
- * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
- * number is incremented with backward incompatible changes - e.g. removing
- * parts of the public API, reordering public struct members, etc. The minor
- * version number is incremented for backward compatible API changes or major
- * new features - e.g. adding a new public function or a new decoder. The micro
- * version number is incremented for smaller changes that a calling program
- * might still want to check for - e.g. changing behavior in a previously
- * unspecified situation.
- *
- * FFmpeg guarantees backward API and ABI compatibility for each library as long
- * as its major version number is unchanged. This means that no public symbols
- * will be removed or renamed. Types and names of the public struct members and
- * values of public macros and enums will remain the same (unless they were
- * explicitly declared as not part of the public API). Documented behavior will
- * not change.
- *
- * In other words, any correct program that works with a given FFmpeg snapshot
- * should work just as well without any changes with any later snapshot with the
- * same major versions. This applies to both rebuilding the program against new
- * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
- * links against.
- *
- * However, new public symbols may be added and new members may be appended to
- * public structs whose size is not part of public ABI (most public structs in
- * FFmpeg). New macros and enum values may be added. Behavior in undocumented
- * situations may change slightly (and be documented). All those are accompanied
- * by an entry in doc/APIchanges and incrementing either the minor or micro
- * version number.
- */
-
-/**
- * @defgroup lavu libavutil
- * Common code shared across all FFmpeg libraries.
- *
- * @note
- * libavutil is designed to be modular. In most cases, in order to use the
- * functions provided by one component of libavutil you must explicitly include
- * the specific header containing that feature. If you are only using
- * media-related components, you could simply include libavutil/avutil.h, which
- * brings in most of the "core" components.
- *
- * @{
- *
- * @defgroup lavu_crypto Crypto and Hashing
- *
- * @{
- * @}
- *
- * @defgroup lavu_math Mathematics
- * @{
- *
- * @}
- *
- * @defgroup lavu_string String Manipulation
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_mem Memory Management
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_data Data Structures
- * @{
- *
- * @}
- *
- * @defgroup lavu_video Video related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_audio Audio related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_error Error Codes
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_log Logging Facility
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_misc Other
- *
- * @{
- *
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * @{
- *
- * @}
- *
- * @defgroup version_utils Library Version Macros
- *
- * @{
- *
- * @}
- */
-
-
-/**
- * @addtogroup lavu_ver
- * @{
- */
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return an informative version string. This usually is the actual release
- * version number or a git commit description. This string has no fixed format
- * and can change any time. It should never be parsed by code.
- */
-const char *av_version_info(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_media Media Type
- * @brief Media Type
- */
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
-    AVMEDIA_TYPE_NB
-};
-
-/**
- * Return a string describing the media_type enum, NULL if media_type
- * is unknown.
- */
-const char *av_get_media_type_string(enum AVMediaType media_type);
-
-/**
- * @defgroup lavu_const Constants
- * @{
- *
- * @defgroup lavu_enc Encoding specific
- *
- * @note those definition should move to avcodec
- * @{
- */
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-
-/**
- * @}
- * @defgroup lavu_time Timestamp specific
- *
- * FFmpeg internal timebase and timestamp definitions
- *
- * @{
- */
-
-/**
- * @brief Undefined timestamp value
- *
- * Usually reported by demuxer that work on containers that do not provide
- * either pts or dts.
- */
-
-#define AV_NOPTS_VALUE          ((int64_t)UINT64_C(0x8000000000000000))
-
-/**
- * Internal time base represented as integer
- */
-
-#define AV_TIME_BASE            1000000
-
-/**
- * Internal time base represented as fractional value
- */
-
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * @}
- * @}
- * @defgroup lavu_picture Image related
- *
- * AVPicture types, pixel formats and basic image planes manipulation.
- *
- * @{
- */
-
-enum AVPictureType {
-    AV_PICTURE_TYPE_NONE = 0, ///< Undefined
-    AV_PICTURE_TYPE_I,     ///< Intra
-    AV_PICTURE_TYPE_P,     ///< Predicted
-    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
-    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG-4
-    AV_PICTURE_TYPE_SI,    ///< Switching Intra
-    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
-    AV_PICTURE_TYPE_BI,    ///< BI type
-};
-
-/**
- * Return a single letter to describe the given picture type
- * pict_type.
- *
- * @param[in] pict_type the picture type @return a single character
- * representing the picture type, '?' if pict_type is unknown
- */
-char av_get_picture_type_char(enum AVPictureType pict_type);
-
-/**
- * @}
- */
-
-#include "common.h"
-#include "error.h"
-#include "rational.h"
-#include "version.h"
-#include "macros.h"
-#include "mathematics.h"
-#include "log.h"
-#include "pixfmt.h"
-
-/**
- * Return x default pointer in case p is NULL.
- */
-static inline void *av_x_if_null(const void *p, const void *x)
-{
-    return (void *)(intptr_t)(p ? p : x);
-}
-
-/**
- * Compute the length of an integer list.
- *
- * @param elsize  size in bytes of each list element (only 1, 2, 4 or 8)
- * @param term    list terminator (usually 0 or -1)
- * @param list    pointer to the list
- * @return  length of the list, in elements, not counting the terminator
- */
-unsigned av_int_list_length_for_size(unsigned elsize,
-                                     const void *list, uint64_t term) av_pure;
-
-/**
- * Compute the length of an integer list.
- *
- * @param term  list terminator (usually 0 or -1)
- * @param list  pointer to the list
- * @return  length of the list, in elements, not counting the terminator
- */
-#define av_int_list_length(list, term) \
-    av_int_list_length_for_size(sizeof(*(list)), list, term)
-
-/**
- * Open a file using a UTF-8 filename.
- * The API of this function matches POSIX fopen(), errors are returned through
- * errno.
- */
-FILE *av_fopen_utf8(const char *path, const char *mode);
-
-/**
- * Return the fractional representation of the internal time base.
- */
-AVRational av_get_time_base_q(void);
-
-#define AV_FOURCC_MAX_STRING_SIZE 32
-
-#define av_fourcc2str(fourcc) av_fourcc_make_string((char[AV_FOURCC_MAX_STRING_SIZE]){0}, fourcc)
-
-/**
- * Fill the provided buffer with a string containing a FourCC (four-character
- * code) representation.
- *
- * @param buf    a buffer with size in bytes of at least AV_FOURCC_MAX_STRING_SIZE
- * @param fourcc the fourcc to represent
- * @return the buffer in input
- */
-char *av_fourcc_make_string(char *buf, uint32_t fourcc);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */
diff --git a/dependencies2013/win32/include/libavutil/base64.h b/dependencies2013/win32/include/libavutil/base64.h
deleted file mode 100644
index 2954c12d..00000000
--- a/dependencies2013/win32/include/libavutil/base64.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_base64 Base64
- * @ingroup lavu_crypto
- * @{
- */
-
-/**
- * Decode a base64-encoded string.
- *
- * @param out      buffer for decoded data
- * @param in       null-terminated input string
- * @param out_size size in bytes of the out buffer, must be at
- *                 least 3/4 of the length of in, that is AV_BASE64_DECODE_SIZE(strlen(in))
- * @return         number of bytes written, or a negative value in case of
- *                 invalid input
- */
-int av_base64_decode(uint8_t *out, const char *in, int out_size);
-
-/**
- * Calculate the output size in bytes needed to decode a base64 string
- * with length x to a data buffer.
- */
-#define AV_BASE64_DECODE_SIZE(x) ((x) * 3LL / 4)
-
-/**
- * Encode data to base64 and null-terminate.
- *
- * @param out      buffer for encoded data
- * @param out_size size in bytes of the out buffer (including the
- *                 null terminator), must be at least AV_BASE64_SIZE(in_size)
- * @param in       input buffer containing the data to encode
- * @param in_size  size in bytes of the in buffer
- * @return         out or NULL in case of error
- */
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
-
-/**
- * Calculate the output size needed to base64-encode x bytes to a
- * null-terminated string.
- */
-#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
-
- /**
-  * @}
-  */
-
-#endif /* AVUTIL_BASE64_H */
diff --git a/dependencies2013/win32/include/libavutil/blowfish.h b/dependencies2013/win32/include/libavutil/blowfish.h
deleted file mode 100644
index 9e289a40..00000000
--- a/dependencies2013/win32/include/libavutil/blowfish.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Blowfish algorithm
- * Copyright (c) 2012 Samuel Pitoiset
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BLOWFISH_H
-#define AVUTIL_BLOWFISH_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_blowfish Blowfish
- * @ingroup lavu_crypto
- * @{
- */
-
-#define AV_BF_ROUNDS 16
-
-typedef struct AVBlowfish {
-    uint32_t p[AV_BF_ROUNDS + 2];
-    uint32_t s[4][256];
-} AVBlowfish;
-
-/**
- * Allocate an AVBlowfish context.
- */
-AVBlowfish *av_blowfish_alloc(void);
-
-/**
- * Initialize an AVBlowfish context.
- *
- * @param ctx an AVBlowfish context
- * @param key a key
- * @param key_len length of the key
- */
-void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param xl left four bytes halves of input to be encrypted
- * @param xr right four bytes halves of input to be encrypted
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
-                           int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
-                       int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BLOWFISH_H */
diff --git a/dependencies2013/win32/include/libavutil/bprint.h b/dependencies2013/win32/include/libavutil/bprint.h
deleted file mode 100644
index c09b1ac1..00000000
--- a/dependencies2013/win32/include/libavutil/bprint.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2012 Nicolas George
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BPRINT_H
-#define AVUTIL_BPRINT_H
-
-#include <stdarg.h>
-
-#include "attributes.h"
-#include "avstring.h"
-
-/**
- * Define a structure with extra padding to a fixed size
- * This helps ensuring binary compatibility with future versions.
- */
-
-#define FF_PAD_STRUCTURE(name, size, ...) \
-struct ff_pad_helper_##name { __VA_ARGS__ }; \
-typedef struct name { \
-    __VA_ARGS__ \
-    char reserved_padding[size - sizeof(struct ff_pad_helper_##name)]; \
-} name;
-
-/**
- * Buffer to print data progressively
- *
- * The string buffer grows as necessary and is always 0-terminated.
- * The content of the string is never accessed, and thus is
- * encoding-agnostic and can even hold binary data.
- *
- * Small buffers are kept in the structure itself, and thus require no
- * memory allocation at all (unless the contents of the buffer is needed
- * after the structure goes out of scope). This is almost as lightweight as
- * declaring a local "char buf[512]".
- *
- * The length of the string can go beyond the allocated size: the buffer is
- * then truncated, but the functions still keep account of the actual total
- * length.
- *
- * In other words, buf->len can be greater than buf->size and records the
- * total length of what would have been to the buffer if there had been
- * enough memory.
- *
- * Append operations do not need to be tested for failure: if a memory
- * allocation fails, data stop being appended to the buffer, but the length
- * is still updated. This situation can be tested with
- * av_bprint_is_complete().
- *
- * The size_max field determines several possible behaviours:
- *
- * size_max = -1 (= UINT_MAX) or any large value will let the buffer be
- * reallocated as necessary, with an amortized linear cost.
- *
- * size_max = 0 prevents writing anything to the buffer: only the total
- * length is computed. The write operations can then possibly be repeated in
- * a buffer with exactly the necessary size
- * (using size_init = size_max = len + 1).
- *
- * size_max = 1 is automatically replaced by the exact size available in the
- * structure itself, thus ensuring no dynamic memory allocation. The
- * internal buffer is large enough to hold a reasonable paragraph of text,
- * such as the current paragraph.
- */
-
-FF_PAD_STRUCTURE(AVBPrint, 1024,
-    char *str;         /**< string so far */
-    unsigned len;      /**< length so far */
-    unsigned size;     /**< allocated memory */
-    unsigned size_max; /**< maximum allocated memory */
-    char reserved_internal_buffer[1];
-)
-
-/**
- * Convenience macros for special values for av_bprint_init() size_max
- * parameter.
- */
-#define AV_BPRINT_SIZE_UNLIMITED  ((unsigned)-1)
-#define AV_BPRINT_SIZE_AUTOMATIC  1
-#define AV_BPRINT_SIZE_COUNT_ONLY 0
-
-/**
- * Init a print buffer.
- *
- * @param buf        buffer to init
- * @param size_init  initial size (including the final 0)
- * @param size_max   maximum size;
- *                   0 means do not write anything, just count the length;
- *                   1 is replaced by the maximum value for automatic storage;
- *                   any large value means that the internal buffer will be
- *                   reallocated as needed up to that limit; -1 is converted to
- *                   UINT_MAX, the largest limit possible.
- *                   Check also AV_BPRINT_SIZE_* macros.
- */
-void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max);
-
-/**
- * Init a print buffer using a pre-existing buffer.
- *
- * The buffer will not be reallocated.
- *
- * @param buf     buffer structure to init
- * @param buffer  byte buffer to use for the string data
- * @param size    size of buffer
- */
-void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
-
-/**
- * Append a formatted string to a print buffer.
- */
-void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
-
-/**
- * Append a formatted string to a print buffer.
- */
-void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg);
-
-/**
- * Append char c n times to a print buffer.
- */
-void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
-
-/**
- * Append data to a print buffer.
- *
- * param buf  bprint buffer to use
- * param data pointer to data
- * param size size of data
- */
-void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size);
-
-struct tm;
-/**
- * Append a formatted date and time to a print buffer.
- *
- * param buf  bprint buffer to use
- * param fmt  date and time format string, see strftime()
- * param tm   broken-down time structure to translate
- *
- * @note due to poor design of the standard strftime function, it may
- * produce poor results if the format string expands to a very long text and
- * the bprint buffer is near the limit stated by the size_max option.
- */
-void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm);
-
-/**
- * Allocate bytes in the buffer for external use.
- *
- * @param[in]  buf          buffer structure
- * @param[in]  size         required size
- * @param[out] mem          pointer to the memory area
- * @param[out] actual_size  size of the memory area after allocation;
- *                          can be larger or smaller than size
- */
-void av_bprint_get_buffer(AVBPrint *buf, unsigned size,
-                          unsigned char **mem, unsigned *actual_size);
-
-/**
- * Reset the string to "" but keep internal allocated data.
- */
-void av_bprint_clear(AVBPrint *buf);
-
-/**
- * Test if the print buffer is complete (not truncated).
- *
- * It may have been truncated due to a memory allocation failure
- * or the size_max limit (compare size and size_max if necessary).
- */
-static inline int av_bprint_is_complete(const AVBPrint *buf)
-{
-    return buf->len < buf->size;
-}
-
-/**
- * Finalize a print buffer.
- *
- * The print buffer can no longer be used afterwards,
- * but the len and size fields are still valid.
- *
- * @arg[out] ret_str  if not NULL, used to return a permanent copy of the
- *                    buffer contents, or NULL if memory allocation fails;
- *                    if NULL, the buffer is discarded and freed
- * @return  0 for success or error code (probably AVERROR(ENOMEM))
- */
-int av_bprint_finalize(AVBPrint *buf, char **ret_str);
-
-/**
- * Escape the content in src and append it to dstbuf.
- *
- * @param dstbuf        already inited destination bprint buffer
- * @param src           string containing the text to escape
- * @param special_chars string containing the special characters which
- *                      need to be escaped, can be NULL
- * @param mode          escape mode to employ, see AV_ESCAPE_MODE_* macros.
- *                      Any unknown value for mode will be considered equivalent to
- *                      AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
- *                      notice.
- * @param flags         flags which control how to escape, see AV_ESCAPE_FLAG_* macros
- */
-void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars,
-                      enum AVEscapeMode mode, int flags);
-
-#endif /* AVUTIL_BPRINT_H */
diff --git a/dependencies2013/win32/include/libavutil/bswap.h b/dependencies2013/win32/include/libavutil/bswap.h
deleted file mode 100644
index 91cb7953..00000000
--- a/dependencies2013/win32/include/libavutil/bswap.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * byte swapping routines
- */
-
-#ifndef AVUTIL_BSWAP_H
-#define AVUTIL_BSWAP_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_AARCH64
-#   include "aarch64/bswap.h"
-#elif ARCH_ARM
-#   include "arm/bswap.h"
-#elif ARCH_AVR32
-#   include "avr32/bswap.h"
-#elif ARCH_SH4
-#   include "sh4/bswap.h"
-#elif ARCH_X86
-#   include "x86/bswap.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
-#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
-#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
-
-#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
-
-#ifndef av_bswap16
-static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
-{
-    x= (x>>8) | (x<<8);
-    return x;
-}
-#endif
-
-#ifndef av_bswap32
-static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
-{
-    return AV_BSWAP32C(x);
-}
-#endif
-
-#ifndef av_bswap64
-static inline uint64_t av_const av_bswap64(uint64_t x)
-{
-    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
-}
-#endif
-
-// be2ne ... big-endian to native-endian
-// le2ne ... little-endian to native-endian
-
-#if AV_HAVE_BIGENDIAN
-#define av_be2ne16(x) (x)
-#define av_be2ne32(x) (x)
-#define av_be2ne64(x) (x)
-#define av_le2ne16(x) av_bswap16(x)
-#define av_le2ne32(x) av_bswap32(x)
-#define av_le2ne64(x) av_bswap64(x)
-#define AV_BE2NEC(s, x) (x)
-#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
-#else
-#define av_be2ne16(x) av_bswap16(x)
-#define av_be2ne32(x) av_bswap32(x)
-#define av_be2ne64(x) av_bswap64(x)
-#define av_le2ne16(x) (x)
-#define av_le2ne32(x) (x)
-#define av_le2ne64(x) (x)
-#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
-#define AV_LE2NEC(s, x) (x)
-#endif
-
-#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
-#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
-#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
-#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
-#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
-#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
-
-#endif /* AVUTIL_BSWAP_H */
diff --git a/dependencies2013/win32/include/libavutil/buffer.h b/dependencies2013/win32/include/libavutil/buffer.h
deleted file mode 100644
index 73b6bd0b..00000000
--- a/dependencies2013/win32/include/libavutil/buffer.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_buffer
- * refcounted data buffer API
- */
-
-#ifndef AVUTIL_BUFFER_H
-#define AVUTIL_BUFFER_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_buffer AVBuffer
- * @ingroup lavu_data
- *
- * @{
- * AVBuffer is an API for reference-counted data buffers.
- *
- * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
- * represents the data buffer itself; it is opaque and not meant to be accessed
- * by the caller directly, but only through AVBufferRef. However, the caller may
- * e.g. compare two AVBuffer pointers to check whether two different references
- * are describing the same data buffer. AVBufferRef represents a single
- * reference to an AVBuffer and it is the object that may be manipulated by the
- * caller directly.
- *
- * There are two functions provided for creating a new AVBuffer with a single
- * reference -- av_buffer_alloc() to just allocate a new buffer, and
- * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
- * reference, additional references may be created with av_buffer_ref().
- * Use av_buffer_unref() to free a reference (this will automatically free the
- * data once all the references are freed).
- *
- * The convention throughout this API and the rest of FFmpeg is such that the
- * buffer is considered writable if there exists only one reference to it (and
- * it has not been marked as read-only). The av_buffer_is_writable() function is
- * provided to check whether this is true and av_buffer_make_writable() will
- * automatically create a new writable buffer when necessary.
- * Of course nothing prevents the calling code from violating this convention,
- * however that is safe only when all the existing references are under its
- * control.
- *
- * @note Referencing and unreferencing the buffers is thread-safe and thus
- * may be done from multiple threads simultaneously without any need for
- * additional locking.
- *
- * @note Two different references to the same buffer can point to different
- * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
- */
-
-/**
- * A reference counted buffer type. It is opaque and is meant to be used through
- * references (AVBufferRef).
- */
-typedef struct AVBuffer AVBuffer;
-
-/**
- * A reference to a data buffer.
- *
- * The size of this struct is not a part of the public ABI and it is not meant
- * to be allocated directly.
- */
-typedef struct AVBufferRef {
-    AVBuffer *buffer;
-
-    /**
-     * The data buffer. It is considered writable if and only if
-     * this is the only reference to the buffer, in which case
-     * av_buffer_is_writable() returns 1.
-     */
-    uint8_t *data;
-    /**
-     * Size of data in bytes.
-     */
-    int      size;
-} AVBufferRef;
-
-/**
- * Allocate an AVBuffer of the given size using av_malloc().
- *
- * @return an AVBufferRef of given size or NULL when out of memory
- */
-AVBufferRef *av_buffer_alloc(int size);
-
-/**
- * Same as av_buffer_alloc(), except the returned buffer will be initialized
- * to zero.
- */
-AVBufferRef *av_buffer_allocz(int size);
-
-/**
- * Always treat the buffer as read-only, even when it has only one
- * reference.
- */
-#define AV_BUFFER_FLAG_READONLY (1 << 0)
-
-/**
- * Create an AVBuffer from an existing array.
- *
- * If this function is successful, data is owned by the AVBuffer. The caller may
- * only access data through the returned AVBufferRef and references derived from
- * it.
- * If this function fails, data is left untouched.
- * @param data   data array
- * @param size   size of data in bytes
- * @param free   a callback for freeing this buffer's data
- * @param opaque parameter to be got for processing or passed to free
- * @param flags  a combination of AV_BUFFER_FLAG_*
- *
- * @return an AVBufferRef referring to data on success, NULL on failure.
- */
-AVBufferRef *av_buffer_create(uint8_t *data, int size,
-                              void (*free)(void *opaque, uint8_t *data),
-                              void *opaque, int flags);
-
-/**
- * Default free callback, which calls av_free() on the buffer data.
- * This function is meant to be passed to av_buffer_create(), not called
- * directly.
- */
-void av_buffer_default_free(void *opaque, uint8_t *data);
-
-/**
- * Create a new reference to an AVBuffer.
- *
- * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
- * failure.
- */
-AVBufferRef *av_buffer_ref(AVBufferRef *buf);
-
-/**
- * Free a given reference and automatically free the buffer if there are no more
- * references to it.
- *
- * @param buf the reference to be freed. The pointer is set to NULL on return.
- */
-void av_buffer_unref(AVBufferRef **buf);
-
-/**
- * @return 1 if the caller may write to the data referred to by buf (which is
- * true if and only if buf is the only reference to the underlying AVBuffer).
- * Return 0 otherwise.
- * A positive answer is valid until av_buffer_ref() is called on buf.
- */
-int av_buffer_is_writable(const AVBufferRef *buf);
-
-/**
- * @return the opaque parameter set by av_buffer_create.
- */
-void *av_buffer_get_opaque(const AVBufferRef *buf);
-
-int av_buffer_get_ref_count(const AVBufferRef *buf);
-
-/**
- * Create a writable reference from a given buffer reference, avoiding data copy
- * if possible.
- *
- * @param buf buffer reference to make writable. On success, buf is either left
- *            untouched, or it is unreferenced and a new writable AVBufferRef is
- *            written in its place. On failure, buf is left untouched.
- * @return 0 on success, a negative AVERROR on failure.
- */
-int av_buffer_make_writable(AVBufferRef **buf);
-
-/**
- * Reallocate a given buffer.
- *
- * @param buf  a buffer reference to reallocate. On success, buf will be
- *             unreferenced and a new reference with the required size will be
- *             written in its place. On failure buf will be left untouched. *buf
- *             may be NULL, then a new buffer is allocated.
- * @param size required new buffer size.
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note the buffer is actually reallocated with av_realloc() only if it was
- * initially allocated through av_buffer_realloc(NULL) and there is only one
- * reference to it (i.e. the one passed to this function). In all other cases
- * a new buffer is allocated and the data is copied.
- */
-int av_buffer_realloc(AVBufferRef **buf, int size);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_bufferpool AVBufferPool
- * @ingroup lavu_data
- *
- * @{
- * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
- *
- * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
- * meant to solve this in cases when the caller needs a set of buffers of the
- * same size (the most obvious use case being buffers for raw video or audio
- * frames).
- *
- * At the beginning, the user must call av_buffer_pool_init() to create the
- * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
- * get a reference to a new buffer, similar to av_buffer_alloc(). This new
- * reference works in all aspects the same way as the one created by
- * av_buffer_alloc(). However, when the last reference to this buffer is
- * unreferenced, it is returned to the pool instead of being freed and will be
- * reused for subsequent av_buffer_pool_get() calls.
- *
- * When the caller is done with the pool and no longer needs to allocate any new
- * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
- * Once all the buffers are released, it will automatically be freed.
- *
- * Allocating and releasing buffers with this API is thread-safe as long as
- * either the default alloc callback is used, or the user-supplied one is
- * thread-safe.
- */
-
-/**
- * The buffer pool. This structure is opaque and not meant to be accessed
- * directly. It is allocated with av_buffer_pool_init() and freed with
- * av_buffer_pool_uninit().
- */
-typedef struct AVBufferPool AVBufferPool;
-
-/**
- * Allocate and initialize a buffer pool.
- *
- * @param size size of each buffer in this pool
- * @param alloc a function that will be used to allocate new buffers when the
- * pool is empty. May be NULL, then the default allocator will be used
- * (av_buffer_alloc()).
- * @return newly created buffer pool on success, NULL on error.
- */
-AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
-
-/**
- * Allocate and initialize a buffer pool with a more complex allocator.
- *
- * @param size size of each buffer in this pool
- * @param opaque arbitrary user data used by the allocator
- * @param alloc a function that will be used to allocate new buffers when the
- *              pool is empty.
- * @param pool_free a function that will be called immediately before the pool
- *                  is freed. I.e. after av_buffer_pool_uninit() is called
- *                  by the caller and all the frames are returned to the pool
- *                  and freed. It is intended to uninitialize the user opaque
- *                  data.
- * @return newly created buffer pool on success, NULL on error.
- */
-AVBufferPool *av_buffer_pool_init2(int size, void *opaque,
-                                   AVBufferRef* (*alloc)(void *opaque, int size),
-                                   void (*pool_free)(void *opaque));
-
-/**
- * Mark the pool as being available for freeing. It will actually be freed only
- * once all the allocated buffers associated with the pool are released. Thus it
- * is safe to call this function while some of the allocated buffers are still
- * in use.
- *
- * @param pool pointer to the pool to be freed. It will be set to NULL.
- */
-void av_buffer_pool_uninit(AVBufferPool **pool);
-
-/**
- * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
- * This function may be called simultaneously from multiple threads.
- *
- * @return a reference to the new buffer on success, NULL on error.
- */
-AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BUFFER_H */
diff --git a/dependencies2013/win32/include/libavutil/camellia.h b/dependencies2013/win32/include/libavutil/camellia.h
deleted file mode 100644
index e674c9b9..00000000
--- a/dependencies2013/win32/include/libavutil/camellia.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * An implementation of the CAMELLIA algorithm as mentioned in RFC3713
- * Copyright (c) 2014 Supraja Meedinti
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CAMELLIA_H
-#define AVUTIL_CAMELLIA_H
-
-#include <stdint.h>
-
-
-/**
-  * @file
-  * @brief Public header for libavutil CAMELLIA algorithm
-  * @defgroup lavu_camellia CAMELLIA
-  * @ingroup lavu_crypto
-  * @{
-  */
-
-extern const int av_camellia_size;
-
-struct AVCAMELLIA;
-
-/**
-  * Allocate an AVCAMELLIA context
-  * To free the struct: av_free(ptr)
-  */
-struct AVCAMELLIA *av_camellia_alloc(void);
-
-/**
-  * Initialize an AVCAMELLIA context.
-  *
-  * @param ctx an AVCAMELLIA context
-  * @param key a key of 16, 24, 32 bytes used for encryption/decryption
-  * @param key_bits number of keybits: possible are 128, 192, 256
- */
-int av_camellia_init(struct AVCAMELLIA *ctx, const uint8_t *key, int key_bits);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context
-  *
-  * @param ctx an AVCAMELLIA context
-  * @param dst destination array, can be equal to src
-  * @param src source array, can be equal to dst
-  * @param count number of 16 byte blocks
-  * @paran iv initialization vector for CBC mode, NULL for ECB mode
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_camellia_crypt(struct AVCAMELLIA *ctx, uint8_t *dst, const uint8_t *src, int count, uint8_t* iv, int decrypt);
-
-/**
- * @}
- */
-#endif /* AVUTIL_CAMELLIA_H */
diff --git a/dependencies2013/win32/include/libavutil/cast5.h b/dependencies2013/win32/include/libavutil/cast5.h
deleted file mode 100644
index ad5b347e..00000000
--- a/dependencies2013/win32/include/libavutil/cast5.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * An implementation of the CAST128 algorithm as mentioned in RFC2144
- * Copyright (c) 2014 Supraja Meedinti
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CAST5_H
-#define AVUTIL_CAST5_H
-
-#include <stdint.h>
-
-
-/**
-  * @file
-  * @brief Public header for libavutil CAST5 algorithm
-  * @defgroup lavu_cast5 CAST5
-  * @ingroup lavu_crypto
-  * @{
-  */
-
-extern const int av_cast5_size;
-
-struct AVCAST5;
-
-/**
-  * Allocate an AVCAST5 context
-  * To free the struct: av_free(ptr)
-  */
-struct AVCAST5 *av_cast5_alloc(void);
-/**
-  * Initialize an AVCAST5 context.
-  *
-  * @param ctx an AVCAST5 context
-  * @param key a key of 5,6,...16 bytes used for encryption/decryption
-  * @param key_bits number of keybits: possible are 40,48,...,128
-  * @return 0 on success, less than 0 on failure
- */
-int av_cast5_init(struct AVCAST5 *ctx, const uint8_t *key, int key_bits);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context, ECB mode only
-  *
-  * @param ctx an AVCAST5 context
-  * @param dst destination array, can be equal to src
-  * @param src source array, can be equal to dst
-  * @param count number of 8 byte blocks
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_cast5_crypt(struct AVCAST5 *ctx, uint8_t *dst, const uint8_t *src, int count, int decrypt);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context
-  *
-  * @param ctx an AVCAST5 context
-  * @param dst destination array, can be equal to src
-  * @param src source array, can be equal to dst
-  * @param count number of 8 byte blocks
-  * @param iv initialization vector for CBC mode, NULL for ECB mode
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_cast5_crypt2(struct AVCAST5 *ctx, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-/**
- * @}
- */
-#endif /* AVUTIL_CAST5_H */
diff --git a/dependencies2013/win32/include/libavutil/channel_layout.h b/dependencies2013/win32/include/libavutil/channel_layout.h
deleted file mode 100644
index 50bb8f03..00000000
--- a/dependencies2013/win32/include/libavutil/channel_layout.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (c) 2008 Peter Ross
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CHANNEL_LAYOUT_H
-#define AVUTIL_CHANNEL_LAYOUT_H
-
-#include <stdint.h>
-
-/**
- * @file
- * audio channel layout utility functions
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup channel_masks Audio channel masks
- *
- * A channel layout is a 64-bits integer with a bit set for every channel.
- * The number of bits set must be equal to the number of channels.
- * The value 0 means that the channel layout is not known.
- * @note this data structure is not powerful enough to handle channels
- * combinations that have the same channel multiple times, such as
- * dual-mono.
- *
- * @{
- */
-#define AV_CH_FRONT_LEFT             0x00000001
-#define AV_CH_FRONT_RIGHT            0x00000002
-#define AV_CH_FRONT_CENTER           0x00000004
-#define AV_CH_LOW_FREQUENCY          0x00000008
-#define AV_CH_BACK_LEFT              0x00000010
-#define AV_CH_BACK_RIGHT             0x00000020
-#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define AV_CH_BACK_CENTER            0x00000100
-#define AV_CH_SIDE_LEFT              0x00000200
-#define AV_CH_SIDE_RIGHT             0x00000400
-#define AV_CH_TOP_CENTER             0x00000800
-#define AV_CH_TOP_FRONT_LEFT         0x00001000
-#define AV_CH_TOP_FRONT_CENTER       0x00002000
-#define AV_CH_TOP_FRONT_RIGHT        0x00004000
-#define AV_CH_TOP_BACK_LEFT          0x00008000
-#define AV_CH_TOP_BACK_CENTER        0x00010000
-#define AV_CH_TOP_BACK_RIGHT         0x00020000
-#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
-#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
-#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
-#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
-#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
-#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
-
-/**
- * @}
- * @defgroup channel_mask_c Audio channel layouts
- * @{
- * */
-#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
-#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_HEXADECAGONAL     (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-
-enum AVMatrixEncoding {
-    AV_MATRIX_ENCODING_NONE,
-    AV_MATRIX_ENCODING_DOLBY,
-    AV_MATRIX_ENCODING_DPLII,
-    AV_MATRIX_ENCODING_DPLIIX,
-    AV_MATRIX_ENCODING_DPLIIZ,
-    AV_MATRIX_ENCODING_DOLBYEX,
-    AV_MATRIX_ENCODING_DOLBYHEADPHONE,
-    AV_MATRIX_ENCODING_NB
-};
-
-/**
- * Return a channel layout id that matches name, or 0 if no match is found.
- *
- * name can be one or several of the following notations,
- * separated by '+' or '|':
- * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
- *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
- * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
- *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
- * - a number of channels, in decimal, followed by 'c', yielding
- *   the default channel layout for that number of channels (@see
- *   av_get_default_channel_layout);
- * - a channel layout mask, in hexadecimal starting with "0x" (see the
- *   AV_CH_* macros).
- *
- * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
- */
-uint64_t av_get_channel_layout(const char *name);
-
-/**
- * Return a channel layout and the number of channels based on the specified name.
- *
- * This function is similar to (@see av_get_channel_layout), but can also parse
- * unknown channel layout specifications.
- *
- * @param[in]  name             channel layout specification string
- * @param[out] channel_layout   parsed channel layout (0 if unknown)
- * @param[out] nb_channels      number of channels
- *
- * @return 0 on success, AVERROR(EINVAL) if the parsing fails.
- */
-int av_get_extended_channel_layout(const char *name, uint64_t* channel_layout, int* nb_channels);
-
-/**
- * Return a description of a channel layout.
- * If nb_channels is <= 0, it is guessed from the channel_layout.
- *
- * @param buf put here the string containing the channel layout
- * @param buf_size size in bytes of the buffer
- */
-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
-
-struct AVBPrint;
-/**
- * Append a description of a channel layout to a bprint buffer.
- */
-void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout);
-
-/**
- * Return the number of channels in the channel layout.
- */
-int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-
-/**
- * Return default channel layout for a given number of channels.
- */
-int64_t av_get_default_channel_layout(int nb_channels);
-
-/**
- * Get the index of a channel in channel_layout.
- *
- * @param channel a channel layout describing exactly one channel which must be
- *                present in channel_layout.
- *
- * @return index of channel in channel_layout on success, a negative AVERROR
- *         on error.
- */
-int av_get_channel_layout_channel_index(uint64_t channel_layout,
-                                        uint64_t channel);
-
-/**
- * Get the channel with the given index in channel_layout.
- */
-uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-
-/**
- * Get the name of a given channel.
- *
- * @return channel name on success, NULL on error.
- */
-const char *av_get_channel_name(uint64_t channel);
-
-/**
- * Get the description of a given channel.
- *
- * @param channel  a channel layout with a single channel
- * @return  channel description on success, NULL on error
- */
-const char *av_get_channel_description(uint64_t channel);
-
-/**
- * Get the value and name of a standard channel layout.
- *
- * @param[in]  index   index in an internal list, starting at 0
- * @param[out] layout  channel layout mask
- * @param[out] name    name of the layout
- * @return  0  if the layout exists,
- *          <0 if index is beyond the limits
- */
-int av_get_standard_channel_layout(unsigned index, uint64_t *layout,
-                                   const char **name);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_CHANNEL_LAYOUT_H */
diff --git a/dependencies2013/win32/include/libavutil/common.h b/dependencies2013/win32/include/libavutil/common.h
deleted file mode 100644
index 8142b31f..00000000
--- a/dependencies2013/win32/include/libavutil/common.h
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
-#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-#endif
-
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "attributes.h"
-#include "macros.h"
-#include "version.h"
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-/* Fast a/(1<<b) rounded toward +inf. Assume a>=0 and b>=0 */
-#define AV_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
-                                                       : ((a) + (1<<(b)) - 1) >> (b))
-/* Backwards compat. */
-#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT
-
-#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
-#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
-
-/**
- * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they
- * are not representable as absolute values of their type. This is the same
- * as with *abs()
- * @see FFNABS()
- */
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-/**
- * Negative Absolute value.
- * this works for all integers of all types.
- * As with many macros, this evaluates its argument twice, it thus must not have
- * a sideeffect, that is FFNABS(x++) has undefined behavior.
- */
-#define FFNABS(a) ((a) <= 0 ? (a) : (-(a)))
-
-/**
- * Comparator.
- * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0
- * if x == y. This is useful for instance in a qsort comparator callback.
- * Furthermore, compilers are able to optimize this to branchless code, and
- * there is no risk of overflow with signed types.
- * As with many macros, this evaluates its argument multiple times, it thus
- * must not have a side-effect.
- */
-#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y)))
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-
-/* misc math functions */
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-/* Pull in unguarded fallback defines at the end of this file. */
-#include "common.h"
-
-#ifndef av_log2
-av_const int av_log2(unsigned v);
-#endif
-
-#ifndef av_log2_16bit
-av_const int av_log2_16bit(unsigned v);
-#endif
-
-/**
- * Clip a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed 64bit integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clip a signed integer value into the -128,127 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int8_t av_clip_int8_c(int a)
-{
-    if ((a+0x80U) & ~0xFF) return (a>>31) ^ 0x7F;
-    else                  return a;
-}
-
-/**
- * Clip a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clip a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int16_t av_clip_int16_c(int a)
-{
-    if ((a+0x8000U) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (int32_t)((a>>63) ^ 0x7FFFFFFF);
-    else                                         return (int32_t)a;
-}
-
-/**
- * Clip a signed integer into the -(2^p),(2^p-1) range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_intp2_c(int a, int p)
-{
-    if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
-        return (a >> 31) ^ ((1 << p) - 1);
-    else
-        return a;
-}
-
-/**
- * Clip a signed integer to an unsigned power of two range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
-{
-    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
-    else                   return  a;
-}
-
-/**
- * Clear high bits from an unsigned integer starting with specific bit position
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p)
-{
-    return a & ((1 << p) - 1);
-}
-
-/**
- * Add two signed 32-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_add32_c(int a, int b)
-{
-    return av_clipl_int32((int64_t)a + b);
-}
-
-/**
- * Add a doubled value to another value with saturation at both stages.
- *
- * @param  a first value
- * @param  b value doubled and added to a
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_dadd32_c(int a, int b)
-{
-    return av_sat_add32(a, av_sat_add32(b, b));
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a double value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const double av_clipd_c(double a, double amin, double amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static av_always_inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount_c(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount64_c(uint64_t x)
-{
-    return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
-}
-
-static av_always_inline av_const int av_parity_c(uint32_t v)
-{
-    return av_popcount(v) & 1;
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-
-/**
- * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val      Output value, must be an lvalue of type uint32_t.
- * @param GET_BYTE Expression reading one byte from the input.
- *                 Evaluated up to 7 times (4 for the currently
- *                 assigned Unicode range).  With a memory buffer
- *                 input, this could be *ptr++.
- * @param ERROR    Expression to be evaluated on invalid input,
- *                 typically a goto statement.
- *
- * @warning ERROR should not contain a loop control statement which
- * could interact with the internal while loop, and should force an
- * exit from the macro code (e.g. through a goto or a return) in order
- * to prevent undefined results.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= (GET_BYTE);\
-    {\
-        uint32_t top = (val & 128) >> 1;\
-        if ((val & 0xc0) == 0x80 || val >= 0xFE)\
-            ERROR\
-        while (val & top) {\
-            int tmp= (GET_BYTE) - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-            top <<= 5;\
-        }\
-        val &= (top << 1) - 1;\
-    }
-
-/**
- * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val       Output value, must be an lvalue of type uint32_t.
- * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
- *                  to native byte order.  Evaluated one or two times.
- * @param ERROR     Expression to be evaluated on invalid input,
- *                  typically a goto statement.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/**
- * @def PUT_UTF8(val, tmp, PUT_BYTE)
- * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/**
- * @def PUT_UTF16(val, tmp, PUT_16BIT)
- * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
-
-/*
- * The following definitions are outside the multiple inclusion guard
- * to ensure they are immediately available in intmath.h.
- */
-
-#ifndef av_ceil_log2
-#   define av_ceil_log2     av_ceil_log2_c
-#endif
-#ifndef av_clip
-#   define av_clip          av_clip_c
-#endif
-#ifndef av_clip64
-#   define av_clip64        av_clip64_c
-#endif
-#ifndef av_clip_uint8
-#   define av_clip_uint8    av_clip_uint8_c
-#endif
-#ifndef av_clip_int8
-#   define av_clip_int8     av_clip_int8_c
-#endif
-#ifndef av_clip_uint16
-#   define av_clip_uint16   av_clip_uint16_c
-#endif
-#ifndef av_clip_int16
-#   define av_clip_int16    av_clip_int16_c
-#endif
-#ifndef av_clipl_int32
-#   define av_clipl_int32   av_clipl_int32_c
-#endif
-#ifndef av_clip_intp2
-#   define av_clip_intp2    av_clip_intp2_c
-#endif
-#ifndef av_clip_uintp2
-#   define av_clip_uintp2   av_clip_uintp2_c
-#endif
-#ifndef av_mod_uintp2
-#   define av_mod_uintp2    av_mod_uintp2_c
-#endif
-#ifndef av_sat_add32
-#   define av_sat_add32     av_sat_add32_c
-#endif
-#ifndef av_sat_dadd32
-#   define av_sat_dadd32    av_sat_dadd32_c
-#endif
-#ifndef av_clipf
-#   define av_clipf         av_clipf_c
-#endif
-#ifndef av_clipd
-#   define av_clipd         av_clipd_c
-#endif
-#ifndef av_popcount
-#   define av_popcount      av_popcount_c
-#endif
-#ifndef av_popcount64
-#   define av_popcount64    av_popcount64_c
-#endif
-#ifndef av_parity
-#   define av_parity        av_parity_c
-#endif
diff --git a/dependencies2013/win32/include/libavutil/cpu.h b/dependencies2013/win32/include/libavutil/cpu.h
deleted file mode 100644
index 9e5d40af..00000000
--- a/dependencies2013/win32/include/libavutil/cpu.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CPU_H
-#define AVUTIL_CPU_H
-
-#include <stddef.h>
-
-#include "attributes.h"
-
-#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
-
-    /* lower 16 bits - CPU features */
-#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
-#define AV_CPU_FLAG_MMXEXT       0x0002 ///< SSE integer functions or AMD MMX ext
-#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
-#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
-#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
-#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
-#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
-                                        ///< than regular MMX/SSE (e.g. Core1)
-#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
-#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
-#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
-                                        ///< than regular MMX/SSE (e.g. Core1)
-#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
-#define AV_CPU_FLAG_SSSE3SLOW 0x4000000 ///< SSSE3 supported, but usually not faster
-#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
-#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
-#define AV_CPU_FLAG_AESNI       0x80000 ///< Advanced Encryption Standard functions
-#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
-#define AV_CPU_FLAG_AVXSLOW   0x8000000 ///< AVX supported, but slow when using YMM registers (e.g. Bulldozer)
-#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
-#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
-#define AV_CPU_FLAG_CMOV         0x1000 ///< supports cmov instruction
-#define AV_CPU_FLAG_AVX2         0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
-#define AV_CPU_FLAG_FMA3        0x10000 ///< Haswell FMA3 functions
-#define AV_CPU_FLAG_BMI1        0x20000 ///< Bit Manipulation Instruction Set 1
-#define AV_CPU_FLAG_BMI2        0x40000 ///< Bit Manipulation Instruction Set 2
-
-#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
-#define AV_CPU_FLAG_VSX          0x0002 ///< ISA 2.06
-#define AV_CPU_FLAG_POWER8       0x0004 ///< ISA 2.07
-
-#define AV_CPU_FLAG_ARMV5TE      (1 << 0)
-#define AV_CPU_FLAG_ARMV6        (1 << 1)
-#define AV_CPU_FLAG_ARMV6T2      (1 << 2)
-#define AV_CPU_FLAG_VFP          (1 << 3)
-#define AV_CPU_FLAG_VFPV3        (1 << 4)
-#define AV_CPU_FLAG_NEON         (1 << 5)
-#define AV_CPU_FLAG_ARMV8        (1 << 6)
-#define AV_CPU_FLAG_VFP_VM       (1 << 7) ///< VFPv2 vector mode, deprecated in ARMv7-A and unavailable in various CPUs implementations
-#define AV_CPU_FLAG_SETEND       (1 <<16)
-
-/**
- * Return the flags which specify extensions supported by the CPU.
- * The returned value is affected by av_force_cpu_flags() if that was used
- * before. So av_get_cpu_flags() can easily be used in an application to
- * detect the enabled cpu flags.
- */
-int av_get_cpu_flags(void);
-
-/**
- * Disables cpu detection and forces the specified flags.
- * -1 is a special case that disables forcing of specific flags.
- */
-void av_force_cpu_flags(int flags);
-
-/**
- * Set a mask on flags returned by av_get_cpu_flags().
- * This function is mainly useful for testing.
- * Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
- */
-attribute_deprecated void av_set_cpu_flags_mask(int mask);
-
-/**
- * Parse CPU flags from a string.
- *
- * The returned flags contain the specified flags as well as related unspecified flags.
- *
- * This function exists only for compatibility with libav.
- * Please use av_parse_cpu_caps() when possible.
- * @return a combination of AV_CPU_* flags, negative on error.
- */
-attribute_deprecated
-int av_parse_cpu_flags(const char *s);
-
-/**
- * Parse CPU caps from a string and update the given AV_CPU_* flags based on that.
- *
- * @return negative on error.
- */
-int av_parse_cpu_caps(unsigned *flags, const char *s);
-
-/**
- * @return the number of logical CPU cores present.
- */
-int av_cpu_count(void);
-
-/**
- * Get the maximum data alignment that may be required by FFmpeg.
- *
- * Note that this is affected by the build configuration and the CPU flags mask,
- * so e.g. if the CPU supports AVX, but libavutil has been built with
- * --disable-avx or the AV_CPU_FLAG_AVX flag has been disabled through
- *  av_set_cpu_flags_mask(), then this function will behave as if AVX is not
- *  present.
- */
-size_t av_cpu_max_align(void);
-
-#endif /* AVUTIL_CPU_H */
diff --git a/dependencies2013/win32/include/libavutil/crc.h b/dependencies2013/win32/include/libavutil/crc.h
deleted file mode 100644
index 2a1b0d76..00000000
--- a/dependencies2013/win32/include/libavutil/crc.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_crc32
- * Public header for CRC hash function implementation.
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_crc32 CRC
- * @ingroup lavu_hash
- * CRC (Cyclic Redundancy Check) hash function implementation.
- *
- * This module supports numerous CRC polynomials, in addition to the most
- * widely used CRC-32-IEEE. See @ref AVCRCId for a list of available
- * polynomials.
- *
- * @{
- */
-
-typedef uint32_t AVCRC;
-
-typedef enum {
-    AV_CRC_8_ATM,
-    AV_CRC_16_ANSI,
-    AV_CRC_16_CCITT,
-    AV_CRC_32_IEEE,
-    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
-    AV_CRC_16_ANSI_LE,  /*< reversed bitorder version of AV_CRC_16_ANSI */
-#if FF_API_CRC_BIG_TABLE
-    AV_CRC_24_IEEE = 12,
-#else
-    AV_CRC_24_IEEE,
-#endif /* FF_API_CRC_BIG_TABLE */
-    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
-}AVCRCId;
-
-/**
- * Initialize a CRC table.
- * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
- * @param le If 1, the lowest bit represents the coefficient for the highest
- *           exponent of the corresponding polynomial (both for poly and
- *           actual CRC).
- *           If 0, you must swap the CRC parameter and the result of av_crc
- *           if you need the standard representation (can be simplified in
- *           most cases to e.g. bswap16):
- *           av_bswap32(crc << (32-bits))
- * @param bits number of bits for the CRC
- * @param poly generator polynomial without the x**bits coefficient, in the
- *             representation as specified by le
- * @param ctx_size size of ctx in bytes
- * @return <0 on failure
- */
-int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
-
-/**
- * Get an initialized standard CRC table.
- * @param crc_id ID of a standard CRC
- * @return a pointer to the CRC table or NULL on failure
- */
-const AVCRC *av_crc_get_table(AVCRCId crc_id);
-
-/**
- * Calculate the CRC of a block.
- * @param crc CRC of previous blocks if any or initial value for CRC
- * @return CRC updated with the data from the given block
- *
- * @see av_crc_init() "le" parameter
- */
-uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
-                const uint8_t *buffer, size_t length) av_pure;
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_CRC_H */
diff --git a/dependencies2013/win32/include/libavutil/des.h b/dependencies2013/win32/include/libavutil/des.h
deleted file mode 100644
index 4cf11f5b..00000000
--- a/dependencies2013/win32/include/libavutil/des.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * DES encryption/decryption
- * Copyright (c) 2007 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_DES_H
-#define AVUTIL_DES_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_des DES
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVDES {
-    uint64_t round_keys[3][16];
-    int triple_des;
-} AVDES;
-
-/**
- * Allocate an AVDES context.
- */
-AVDES *av_des_alloc(void);
-
-/**
- * @brief Initializes an AVDES context.
- *
- * @param key_bits must be 64 or 192
- * @param decrypt 0 for encryption/CBC-MAC, 1 for decryption
- * @return zero on success, negative value otherwise
- */
-int av_des_init(struct AVDES *d, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * @brief Encrypts / decrypts using the DES algorithm.
- *
- * @param count number of 8 byte blocks
- * @param dst destination array, can be equal to src, must be 8-byte aligned
- * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used,
- *           must be 8-byte aligned
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @brief Calculates CBC-MAC using the DES algorithm.
- *
- * @param count number of 8 byte blocks
- * @param dst destination array, can be equal to src, must be 8-byte aligned
- * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL
- */
-void av_des_mac(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DES_H */
diff --git a/dependencies2013/win32/include/libavutil/dict.h b/dependencies2013/win32/include/libavutil/dict.h
deleted file mode 100644
index 118f1f00..00000000
--- a/dependencies2013/win32/include/libavutil/dict.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Public dictionary API.
- * @deprecated
- *  AVDictionary is provided for compatibility with libav. It is both in
- *  implementation as well as API inefficient. It does not scale and is
- *  extremely slow with large dictionaries.
- *  It is recommended that new code uses our tree container from tree.c/h
- *  where applicable, which uses AVL trees to achieve O(log n) performance.
- */
-
-#ifndef AVUTIL_DICT_H
-#define AVUTIL_DICT_H
-
-#include <stdint.h>
-
-#include "version.h"
-
-/**
- * @addtogroup lavu_dict AVDictionary
- * @ingroup lavu_data
- *
- * @brief Simple key:value store
- *
- * @{
- * Dictionaries are used for storing key:value pairs. To create
- * an AVDictionary, simply pass an address of a NULL pointer to
- * av_dict_set(). NULL can be used as an empty dictionary wherever
- * a pointer to an AVDictionary is required.
- * Use av_dict_get() to retrieve an entry or iterate over all
- * entries and finally av_dict_free() to free the dictionary
- * and all its contents.
- *
- @code
-   AVDictionary *d = NULL;           // "create" an empty dictionary
-   AVDictionaryEntry *t = NULL;
-
-   av_dict_set(&d, "foo", "bar", 0); // add an entry
-
-   char *k = av_strdup("key");       // if your strings are already allocated,
-   char *v = av_strdup("value");     // you can avoid copying them like this
-   av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
-
-   while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
-       <....>                             // iterate over all entries in d
-   }
-   av_dict_free(&d);
- @endcode
- */
-
-#define AV_DICT_MATCH_CASE      1   /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */
-#define AV_DICT_IGNORE_SUFFIX   2   /**< Return first entry in a dictionary whose first part corresponds to the search key,
-                                         ignoring the suffix of the found key string. Only relevant in av_dict_get(). */
-#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
-                                         allocated with av_malloc() or another memory allocation function. */
-#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
-                                         allocated with av_malloc() or another memory allocation function. */
-#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
-#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
-                                      delimiter is added, the strings are simply concatenated. */
-#define AV_DICT_MULTIKEY       64   /**< Allow to store several equal keys in the dictionary */
-
-typedef struct AVDictionaryEntry {
-    char *key;
-    char *value;
-} AVDictionaryEntry;
-
-typedef struct AVDictionary AVDictionary;
-
-/**
- * Get a dictionary entry with matching key.
- *
- * The returned entry key or value must not be changed, or it will
- * cause undefined behavior.
- *
- * To iterate through all the dictionary entries, you can set the matching key
- * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
- *
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param key matching key
- * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved
- * @return found entry or NULL in case no matching entry was found in the dictionary
- */
-AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
-                               const AVDictionaryEntry *prev, int flags);
-
-/**
- * Get number of entries in dictionary.
- *
- * @param m dictionary
- * @return  number of entries in dictionary
- */
-int av_dict_count(const AVDictionary *m);
-
-/**
- * Set the given entry in *pm, overwriting an existing entry.
- *
- * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set,
- * these arguments will be freed on error.
- *
- * Warning: Adding a new entry to a dictionary invalidates all existing entries
- * previously returned with av_dict_get.
- *
- * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
- * a dictionary struct is allocated and put in *pm.
- * @param key entry key to add to *pm (will either be av_strduped or added as a new key depending on flags)
- * @param value entry value to add to *pm (will be av_strduped or added as a new key depending on flags).
- *        Passing a NULL value will cause an existing entry to be deleted.
- * @return >= 0 on success otherwise an error code <0
- */
-int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
-
-/**
- * Convenience wrapper for av_dict_set that converts the value to a string
- * and stores it.
- *
- * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error.
- */
-int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, int flags);
-
-/**
- * Parse the key/value pairs list and add the parsed entries to a dictionary.
- *
- * In case of failure, all the successfully set entries are stored in
- * *pm. You may need to manually free the created dictionary.
- *
- * @param key_val_sep  a 0-terminated list of characters used to separate
- *                     key from value
- * @param pairs_sep    a 0-terminated list of characters used to separate
- *                     two pairs from each other
- * @param flags        flags to use when adding to dictionary.
- *                     AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
- *                     are ignored since the key/value tokens will always
- *                     be duplicated.
- * @return             0 on success, negative AVERROR code on failure
- */
-int av_dict_parse_string(AVDictionary **pm, const char *str,
-                         const char *key_val_sep, const char *pairs_sep,
-                         int flags);
-
-/**
- * Copy entries from one AVDictionary struct into another.
- * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
- *            this function will allocate a struct for you and put it in *dst
- * @param src pointer to source AVDictionary struct
- * @param flags flags to use when setting entries in *dst
- * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
- * @return 0 on success, negative AVERROR code on failure. If dst was allocated
- *           by this function, callers should free the associated memory.
- */
-int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags);
-
-/**
- * Free all the memory allocated for an AVDictionary struct
- * and all keys and values.
- */
-void av_dict_free(AVDictionary **m);
-
-/**
- * Get dictionary entries as a string.
- *
- * Create a string containing dictionary's entries.
- * Such string may be passed back to av_dict_parse_string().
- * @note String is escaped with backslashes ('\').
- *
- * @param[in]  m             dictionary
- * @param[out] buffer        Pointer to buffer that will be allocated with string containg entries.
- *                           Buffer must be freed by the caller when is no longer needed.
- * @param[in]  key_val_sep   character used to separate key from value
- * @param[in]  pairs_sep     character used to separate two pairs from each other
- * @return                   >= 0 on success, negative on error
- * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same.
- */
-int av_dict_get_string(const AVDictionary *m, char **buffer,
-                       const char key_val_sep, const char pairs_sep);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DICT_H */
diff --git a/dependencies2013/win32/include/libavutil/display.h b/dependencies2013/win32/include/libavutil/display.h
deleted file mode 100644
index 515adad7..00000000
--- a/dependencies2013/win32/include/libavutil/display.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2014 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Display matrix
- */
-
-#ifndef AVUTIL_DISPLAY_H
-#define AVUTIL_DISPLAY_H
-
-#include <stdint.h>
-#include "common.h"
-
-/**
- * @addtogroup lavu_video
- * @{
- *
- * @defgroup lavu_video_display Display transformation matrix functions
- * @{
- */
-
-/**
- * @addtogroup lavu_video_display
- * The display transformation matrix specifies an affine transformation that
- * should be applied to video frames for correct presentation. It is compatible
- * with the matrices stored in the ISO/IEC 14496-12 container format.
- *
- * The data is a 3x3 matrix represented as a 9-element array:
- *
- * @code{.unparsed}
- *                                  | a b u |
- *   (a, b, u, c, d, v, x, y, w) -> | c d v |
- *                                  | x y w |
- * @endcode
- *
- * All numbers are stored in native endianness, as 16.16 fixed-point values,
- * except for u, v and w, which are stored as 2.30 fixed-point values.
- *
- * The transformation maps a point (p, q) in the source (pre-transformation)
- * frame to the point (p', q') in the destination (post-transformation) frame as
- * follows:
- *
- * @code{.unparsed}
- *               | a b u |
- *   (p, q, 1) . | c d v | = z * (p', q', 1)
- *               | x y w |
- * @endcode
- *
- * The transformation can also be more explicitly written in components as
- * follows:
- *
- * @code{.unparsed}
- *   p' = (a * p + c * q + x) / z;
- *   q' = (b * p + d * q + y) / z;
- *   z  =  u * p + v * q + w
- * @endcode
- */
-
-/**
- * Extract the rotation component of the transformation matrix.
- *
- * @param matrix the transformation matrix
- * @return the angle (in degrees) by which the transformation rotates the frame
- *         counterclockwise. The angle will be in range [-180.0, 180.0],
- *         or NaN if the matrix is singular.
- *
- * @note floating point numbers are inherently inexact, so callers are
- *       recommended to round the return value to nearest integer before use.
- */
-double av_display_rotation_get(const int32_t matrix[9]);
-
-/**
- * Initialize a transformation matrix describing a pure counterclockwise
- * rotation by the specified angle (in degrees).
- *
- * @param matrix an allocated transformation matrix (will be fully overwritten
- *               by this function)
- * @param angle rotation angle in degrees.
- */
-void av_display_rotation_set(int32_t matrix[9], double angle);
-
-/**
- * Flip the input matrix horizontally and/or vertically.
- *
- * @param matrix an allocated transformation matrix
- * @param hflip whether the matrix should be flipped horizontally
- * @param vflip whether the matrix should be flipped vertically
- */
-void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_DISPLAY_H */
diff --git a/dependencies2013/win32/include/libavutil/downmix_info.h b/dependencies2013/win32/include/libavutil/downmix_info.h
deleted file mode 100644
index 221cf5bf..00000000
--- a/dependencies2013/win32/include/libavutil/downmix_info.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_DOWNMIX_INFO_H
-#define AVUTIL_DOWNMIX_INFO_H
-
-#include "frame.h"
-
-/**
- * @file
- * audio downmix medatata
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup downmix_info Audio downmix metadata
- * @{
- */
-
-/**
- * Possible downmix types.
- */
-enum AVDownmixType {
-    AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
-    AV_DOWNMIX_TYPE_LORO,    /**< Lo/Ro 2-channel downmix (Stereo). */
-    AV_DOWNMIX_TYPE_LTRT,    /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
-    AV_DOWNMIX_TYPE_DPLII,   /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
-    AV_DOWNMIX_TYPE_NB       /**< Number of downmix types. Not part of ABI. */
-};
-
-/**
- * This structure describes optional metadata relevant to a downmix procedure.
- *
- * All fields are set by the decoder to the value indicated in the audio
- * bitstream (if present), or to a "sane" default otherwise.
- */
-typedef struct AVDownmixInfo {
-    /**
-     * Type of downmix preferred by the mastering engineer.
-     */
-    enum AVDownmixType preferred_downmix_type;
-
-    /**
-     * Absolute scale factor representing the nominal level of the center
-     * channel during a regular downmix.
-     */
-    double center_mix_level;
-
-    /**
-     * Absolute scale factor representing the nominal level of the center
-     * channel during an Lt/Rt compatible downmix.
-     */
-    double center_mix_level_ltrt;
-
-    /**
-     * Absolute scale factor representing the nominal level of the surround
-     * channels during a regular downmix.
-     */
-    double surround_mix_level;
-
-    /**
-     * Absolute scale factor representing the nominal level of the surround
-     * channels during an Lt/Rt compatible downmix.
-     */
-    double surround_mix_level_ltrt;
-
-    /**
-     * Absolute scale factor representing the level at which the LFE data is
-     * mixed into L/R channels during downmixing.
-     */
-    double lfe_mix_level;
-} AVDownmixInfo;
-
-/**
- * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
- *
- * If the side data is absent, it is created and added to the frame.
- *
- * @param frame the frame for which the side data is to be obtained or created
- *
- * @return the AVDownmixInfo structure to be edited by the caller, or NULL if
- *         the structure cannot be allocated.
- */
-AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DOWNMIX_INFO_H */
diff --git a/dependencies2013/win32/include/libavutil/error.h b/dependencies2013/win32/include/libavutil/error.h
deleted file mode 100644
index 71df4da3..00000000
--- a/dependencies2013/win32/include/libavutil/error.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include <stddef.h>
-
-/**
- * @addtogroup lavu_error
- *
- * @{
- */
-
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
-
-#define AVERROR_BSF_NOT_FOUND      FFERRTAG(0xF8,'B','S','F') ///< Bitstream filter not found
-#define AVERROR_BUG                FFERRTAG( 'B','U','G','!') ///< Internal bug, also see AVERROR_BUG2
-#define AVERROR_BUFFER_TOO_SMALL   FFERRTAG( 'B','U','F','S') ///< Buffer too small
-#define AVERROR_DECODER_NOT_FOUND  FFERRTAG(0xF8,'D','E','C') ///< Decoder not found
-#define AVERROR_DEMUXER_NOT_FOUND  FFERRTAG(0xF8,'D','E','M') ///< Demuxer not found
-#define AVERROR_ENCODER_NOT_FOUND  FFERRTAG(0xF8,'E','N','C') ///< Encoder not found
-#define AVERROR_EOF                FFERRTAG( 'E','O','F',' ') ///< End of file
-#define AVERROR_EXIT               FFERRTAG( 'E','X','I','T') ///< Immediate exit was requested; the called function should not be restarted
-#define AVERROR_EXTERNAL           FFERRTAG( 'E','X','T',' ') ///< Generic error in an external library
-#define AVERROR_FILTER_NOT_FOUND   FFERRTAG(0xF8,'F','I','L') ///< Filter not found
-#define AVERROR_INVALIDDATA        FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input
-#define AVERROR_MUXER_NOT_FOUND    FFERRTAG(0xF8,'M','U','X') ///< Muxer not found
-#define AVERROR_OPTION_NOT_FOUND   FFERRTAG(0xF8,'O','P','T') ///< Option not found
-#define AVERROR_PATCHWELCOME       FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome
-#define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found
-
-#define AVERROR_STREAM_NOT_FOUND   FFERRTAG(0xF8,'S','T','R') ///< Stream not found
-/**
- * This is semantically identical to AVERROR_BUG
- * it has been introduced in Libav after our AVERROR_BUG and with a modified value.
- */
-#define AVERROR_BUG2               FFERRTAG( 'B','U','G',' ')
-#define AVERROR_UNKNOWN            FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library
-#define AVERROR_EXPERIMENTAL       (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it.
-#define AVERROR_INPUT_CHANGED      (-0x636e6701) ///< Input changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_OUTPUT_CHANGED)
-#define AVERROR_OUTPUT_CHANGED     (-0x636e6702) ///< Output changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_INPUT_CHANGED)
-/* HTTP & RTSP errors */
-#define AVERROR_HTTP_BAD_REQUEST   FFERRTAG(0xF8,'4','0','0')
-#define AVERROR_HTTP_UNAUTHORIZED  FFERRTAG(0xF8,'4','0','1')
-#define AVERROR_HTTP_FORBIDDEN     FFERRTAG(0xF8,'4','0','3')
-#define AVERROR_HTTP_NOT_FOUND     FFERRTAG(0xF8,'4','0','4')
-#define AVERROR_HTTP_OTHER_4XX     FFERRTAG(0xF8,'4','X','X')
-#define AVERROR_HTTP_SERVER_ERROR  FFERRTAG(0xF8,'5','X','X')
-
-#define AV_ERROR_MAX_STRING_SIZE 64
-
-/**
- * Put a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errnum      error code to describe
- * @param errbuf      buffer to which description is written
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- */
-int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
-
-/**
- * Fill the provided buffer with a string containing an error string
- * corresponding to the AVERROR code errnum.
- *
- * @param errbuf         a buffer
- * @param errbuf_size    size in bytes of errbuf
- * @param errnum         error code to describe
- * @return the buffer in input, filled with the error description
- * @see av_strerror()
- */
-static inline char *av_make_error_string(char *errbuf, size_t errbuf_size, int errnum)
-{
-    av_strerror(errnum, errbuf, errbuf_size);
-    return errbuf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_err2str(errnum) \
-    av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, AV_ERROR_MAX_STRING_SIZE, errnum)
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ERROR_H */
diff --git a/dependencies2013/win32/include/libavutil/eval.h b/dependencies2013/win32/include/libavutil/eval.h
deleted file mode 100644
index dacd22b9..00000000
--- a/dependencies2013/win32/include/libavutil/eval.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple arithmetic expression evaluator
- */
-
-#ifndef AVUTIL_EVAL_H
-#define AVUTIL_EVAL_H
-
-#include "avutil.h"
-
-typedef struct AVExpr AVExpr;
-
-/**
- * Parse and evaluate an expression.
- * Note, this is significantly slower than av_expr_eval().
- *
- * @param res a pointer to a double where is put the result value of
- * the expression, or NAN in case of error
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param const_values a zero terminated array of values for the identifiers from const_names
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @param log_ctx parent logging context
- * @return >= 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse_and_eval(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * Parse an expression.
- *
- * @param expr a pointer where is put an AVExpr containing the parsed
- * value in case of successful parsing, or NULL otherwise.
- * The pointed to AVExpr must be freed with av_expr_free() by the user
- * when it is not needed anymore.
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param log_ctx parent logging context
- * @return >= 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-
-/**
- * Evaluate a previously parsed expression.
- *
- * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @return the value of the expression
- */
-double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * Free a parsed expression previously created with av_expr_parse().
- */
-void av_expr_free(AVExpr *e);
-
-/**
- * Parse the string in numstr and return its value as a double. If
- * the string is empty, contains only whitespaces, or does not contain
- * an initial substring that has the expected syntax for a
- * floating-point number, no conversion is performed. In this case,
- * returns a value of zero and the value returned in tail is the value
- * of numstr.
- *
- * @param numstr a string representing a number, may contain one of
- * the International System number postfixes, for example 'K', 'M',
- * 'G'. If 'i' is appended after the postfix, powers of 2 are used
- * instead of powers of 10. The 'B' postfix multiplies the value by
- * 8, and can be appended after another postfix or used alone. This
- * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
- * @param tail if non-NULL puts here the pointer to the char next
- * after the last parsed character
- */
-double av_strtod(const char *numstr, char **tail);
-
-#endif /* AVUTIL_EVAL_H */
diff --git a/dependencies2013/win32/include/libavutil/ffversion.h b/dependencies2013/win32/include/libavutil/ffversion.h
deleted file mode 100644
index 1fdf49bd..00000000
--- a/dependencies2013/win32/include/libavutil/ffversion.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Automatically generated by version.sh, do not manually edit! */
-#ifndef AVUTIL_FFVERSION_H
-#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-87862-gad56e8057d"
-#endif /* AVUTIL_FFVERSION_H */
diff --git a/dependencies2013/win32/include/libavutil/fifo.h b/dependencies2013/win32/include/libavutil/fifo.h
deleted file mode 100644
index dc7bc6f0..00000000
--- a/dependencies2013/win32/include/libavutil/fifo.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-#include "avutil.h"
-#include "attributes.h"
-
-typedef struct AVFifoBuffer {
-    uint8_t *buffer;
-    uint8_t *rptr, *wptr, *end;
-    uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initialize an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Initialize an AVFifoBuffer.
- * @param nmemb number of elements
- * @param size  size of the single element
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size);
-
-/**
- * Free an AVFifoBuffer.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Free an AVFifoBuffer and reset pointer to NULL.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_freep(AVFifoBuffer **f);
-
-/**
- * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Return the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
- * @param f AVFifoBuffer to read from
- * @return size
- */
-int av_fifo_size(const AVFifoBuffer *f);
-
-/**
- * Return the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param f AVFifoBuffer to write into
- * @return size
- */
-int av_fifo_space(const AVFifoBuffer *f);
-
-/**
- * Feed data at specific position from an AVFifoBuffer to a user-supplied callback.
- * Similar as av_fifo_gereric_read but without discarding data.
- * @param f AVFifoBuffer to read from
- * @param offset offset from current read position
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_peek_at(AVFifoBuffer *f, void *dest, int offset, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * Similar as av_fifo_gereric_read but without discarding data.
- * @param f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_peek(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * @param f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from a user-supplied callback to an AVFifoBuffer.
- * @param f AVFifoBuffer to write to
- * @param src data source; non-const since it may be used as a
- * modifiable context by the function defined in func
- * @param size number of bytes to write
- * @param func generic write function; the first parameter is src,
- * the second is dest_buf, the third is dest_buf_size.
- * func must return the number of bytes written to dest_buf, or <= 0 to
- * indicate no more data available to write.
- * If func is NULL, src is interpreted as a simple byte array for source data.
- * @return the number of bytes written to the FIFO
- */
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-
-/**
- * Resize an AVFifoBuffer.
- * In case of reallocation failure, the old FIFO is kept unchanged.
- *
- * @param f AVFifoBuffer to resize
- * @param size new AVFifoBuffer size in bytes
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
-
-/**
- * Enlarge an AVFifoBuffer.
- * In case of reallocation failure, the old FIFO is kept unchanged.
- * The new fifo size may be larger than the requested size.
- *
- * @param f AVFifoBuffer to resize
- * @param additional_space the amount of space in bytes to allocate in addition to av_fifo_size()
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_grow(AVFifoBuffer *f, unsigned int additional_space);
-
-/**
- * Read and discard the specified amount of data from an AVFifoBuffer.
- * @param f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-/**
- * Return a pointer to the data stored in a FIFO buffer at a certain offset.
- * The FIFO buffer is not modified.
- *
- * @param f    AVFifoBuffer to peek at, f must be non-NULL
- * @param offs an offset in bytes, its absolute value must be less
- *             than the used buffer size or the returned pointer will
- *             point outside to the buffer data.
- *             The used buffer size can be checked with av_fifo_size().
- */
-static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr = f->buffer + (ptr - f->end);
-    else if (ptr < f->buffer)
-        ptr = f->end - (f->buffer - ptr);
-    return ptr;
-}
-
-#endif /* AVUTIL_FIFO_H */
diff --git a/dependencies2013/win32/include/libavutil/file.h b/dependencies2013/win32/include/libavutil/file.h
deleted file mode 100644
index 8666c7b1..00000000
--- a/dependencies2013/win32/include/libavutil/file.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_FILE_H
-#define AVUTIL_FILE_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-
-/**
- * @file
- * Misc file utilities.
- */
-
-/**
- * Read the file with name filename, and put its content in a newly
- * allocated buffer or map it with mmap() when available.
- * In case of success set *bufptr to the read or mmapped buffer, and
- * *size to the size in bytes of the buffer in *bufptr.
- * The returned buffer must be released with av_file_unmap().
- *
- * @param log_offset loglevel offset used for logging
- * @param log_ctx context used for logging
- * @return a non negative number in case of success, a negative value
- * corresponding to an AVERROR error code in case of failure
- */
-av_warn_unused_result
-int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
-                int log_offset, void *log_ctx);
-
-/**
- * Unmap or free the buffer bufptr created by av_file_map().
- *
- * @param size size in bytes of bufptr, must be the same as returned
- * by av_file_map()
- */
-void av_file_unmap(uint8_t *bufptr, size_t size);
-
-/**
- * Wrapper to work around the lack of mkstemp() on mingw.
- * Also, tries to create file in /tmp first, if possible.
- * *prefix can be a character constant; *filename will be allocated internally.
- * @return file descriptor of opened file (or negative value corresponding to an
- * AVERROR code on error)
- * and opened file name in **filename.
- * @note On very old libcs it is necessary to set a secure umask before
- *       calling this, av_tempfile() can't call umask itself as it is used in
- *       libraries and could interfere with the calling application.
- * @deprecated as fd numbers cannot be passed saftely between libs on some platforms
- */
-int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx);
-
-#endif /* AVUTIL_FILE_H */
diff --git a/dependencies2013/win32/include/libavutil/frame.h b/dependencies2013/win32/include/libavutil/frame.h
deleted file mode 100644
index abe4f4fd..00000000
--- a/dependencies2013/win32/include/libavutil/frame.h
+++ /dev/null
@@ -1,821 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_frame
- * reference-counted frame API
- */
-
-#ifndef AVUTIL_FRAME_H
-#define AVUTIL_FRAME_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "avutil.h"
-#include "buffer.h"
-#include "dict.h"
-#include "rational.h"
-#include "samplefmt.h"
-#include "pixfmt.h"
-#include "version.h"
-
-
-/**
- * @defgroup lavu_frame AVFrame
- * @ingroup lavu_data
- *
- * @{
- * AVFrame is an abstraction for reference-counted raw multimedia data.
- */
-
-enum AVFrameSideDataType {
-    /**
-     * The data is the AVPanScan struct defined in libavcodec.
-     */
-    AV_FRAME_DATA_PANSCAN,
-    /**
-     * ATSC A53 Part 4 Closed Captions.
-     * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
-     * The number of bytes of CC data is AVFrameSideData.size.
-     */
-    AV_FRAME_DATA_A53_CC,
-    /**
-     * Stereoscopic 3d metadata.
-     * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
-     */
-    AV_FRAME_DATA_STEREO3D,
-    /**
-     * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
-     */
-    AV_FRAME_DATA_MATRIXENCODING,
-    /**
-     * Metadata relevant to a downmix procedure.
-     * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
-     */
-    AV_FRAME_DATA_DOWNMIX_INFO,
-    /**
-     * ReplayGain information in the form of the AVReplayGain struct.
-     */
-    AV_FRAME_DATA_REPLAYGAIN,
-    /**
-     * This side data contains a 3x3 transformation matrix describing an affine
-     * transformation that needs to be applied to the frame for correct
-     * presentation.
-     *
-     * See libavutil/display.h for a detailed description of the data.
-     */
-    AV_FRAME_DATA_DISPLAYMATRIX,
-    /**
-     * Active Format Description data consisting of a single byte as specified
-     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-     */
-    AV_FRAME_DATA_AFD,
-    /**
-     * Motion vectors exported by some codecs (on demand through the export_mvs
-     * flag set in the libavcodec AVCodecContext flags2 option).
-     * The data is the AVMotionVector struct defined in
-     * libavutil/motion_vector.h.
-     */
-    AV_FRAME_DATA_MOTION_VECTORS,
-    /**
-     * Recommmends skipping the specified number of samples. This is exported
-     * only if the "skip_manual" AVOption is set in libavcodec.
-     * This has the same format as AV_PKT_DATA_SKIP_SAMPLES.
-     * @code
-     * u32le number of samples to skip from start of this packet
-     * u32le number of samples to skip from end of this packet
-     * u8    reason for start skip
-     * u8    reason for end   skip (0=padding silence, 1=convergence)
-     * @endcode
-     */
-    AV_FRAME_DATA_SKIP_SAMPLES,
-    /**
-     * This side data must be associated with an audio frame and corresponds to
-     * enum AVAudioServiceType defined in avcodec.h.
-     */
-    AV_FRAME_DATA_AUDIO_SERVICE_TYPE,
-    /**
-     * Mastering display metadata associated with a video frame. The payload is
-     * an AVMasteringDisplayMetadata type and contains information about the
-     * mastering display color volume.
-     */
-    AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
-    /**
-     * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer.
-     * This is set on the first frame of a GOP that has a temporal reference of 0.
-     */
-    AV_FRAME_DATA_GOP_TIMECODE,
-
-    /**
-     * The data represents the AVSphericalMapping structure defined in
-     * libavutil/spherical.h.
-     */
-    AV_FRAME_DATA_SPHERICAL,
-
-    /**
-     * Content light level (based on CTA-861.3). This payload contains data in
-     * the form of the AVContentLightMetadata struct.
-     */
-    AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
-
-    /**
-     * The data contains an ICC profile as an opaque octet buffer following the
-     * format described by ISO 15076-1 with an optional name defined in the
-     * metadata key entry "name".
-     */
-    AV_FRAME_DATA_ICC_PROFILE,
-};
-
-enum AVActiveFormatDescription {
-    AV_AFD_SAME         = 8,
-    AV_AFD_4_3          = 9,
-    AV_AFD_16_9         = 10,
-    AV_AFD_14_9         = 11,
-    AV_AFD_4_3_SP_14_9  = 13,
-    AV_AFD_16_9_SP_14_9 = 14,
-    AV_AFD_SP_4_3       = 15,
-};
-
-
-/**
- * Structure to hold side data for an AVFrame.
- *
- * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- */
-typedef struct AVFrameSideData {
-    enum AVFrameSideDataType type;
-    uint8_t *data;
-    int      size;
-    AVDictionary *metadata;
-    AVBufferRef *buf;
-} AVFrameSideData;
-
-/**
- * This structure describes decoded (raw) audio or video data.
- *
- * AVFrame must be allocated using av_frame_alloc(). Note that this only
- * allocates the AVFrame itself, the buffers for the data must be managed
- * through other means (see below).
- * AVFrame must be freed with av_frame_free().
- *
- * AVFrame is typically allocated once and then reused multiple times to hold
- * different data (e.g. a single AVFrame to hold frames received from a
- * decoder). In such a case, av_frame_unref() will free any references held by
- * the frame and reset it to its original clean state before it
- * is reused again.
- *
- * The data described by an AVFrame is usually reference counted through the
- * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
- * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
- * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
- * every single data plane must be contained in one of the buffers in
- * AVFrame.buf or AVFrame.extended_buf.
- * There may be a single buffer for all the data, or one separate buffer for
- * each plane, or anything in between.
- *
- * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- *
- * Fields can be accessed through AVOptions, the name string used, matches the
- * C structure field name for fields accessible through AVOptions. The AVClass
- * for AVFrame can be obtained from avcodec_get_frame_class()
- */
-typedef struct AVFrame {
-#define AV_NUM_DATA_POINTERS 8
-    /**
-     * pointer to the picture/channel planes.
-     * This might be different from the first allocated byte
-     *
-     * Some decoders access areas outside 0,0 - width,height, please
-     * see avcodec_align_dimensions2(). Some filters and swscale can read
-     * up to 16 bytes beyond the planes, if these filters are to be used,
-     * then 16 extra bytes must be allocated.
-     *
-     * NOTE: Except for hwaccel formats, pointers not needed by the format
-     * MUST be set to NULL.
-     */
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-
-    /**
-     * For video, size in bytes of each picture line.
-     * For audio, size in bytes of each plane.
-     *
-     * For audio, only linesize[0] may be set. For planar audio, each channel
-     * plane must be the same size.
-     *
-     * For video the linesizes should be multiples of the CPUs alignment
-     * preference, this is 16 or 32 for modern desktop CPUs.
-     * Some code requires such alignment other code can be slower without
-     * correct alignment, for yet other it makes no difference.
-     *
-     * @note The linesize may be larger than the size of usable data -- there
-     * may be extra padding present for performance reasons.
-     */
-    int linesize[AV_NUM_DATA_POINTERS];
-
-    /**
-     * pointers to the data planes/channels.
-     *
-     * For video, this should simply point to data[].
-     *
-     * For planar audio, each channel has a separate data pointer, and
-     * linesize[0] contains the size of each channel buffer.
-     * For packed audio, there is just one data pointer, and linesize[0]
-     * contains the total size of the buffer for all channels.
-     *
-     * Note: Both data and extended_data should always be set in a valid frame,
-     * but for planar audio with more channels that can fit in data,
-     * extended_data must be used in order to access all channels.
-     */
-    uint8_t **extended_data;
-
-    /**
-     * @name Video dimensions
-     * Video frames only. The coded dimensions (in pixels) of the video frame,
-     * i.e. the size of the rectangle that contains some well-defined values.
-     *
-     * @note The part of the frame intended for display/presentation is further
-     * restricted by the @ref cropping "Cropping rectangle".
-     * @{
-     */
-    int width, height;
-    /**
-     * @}
-     */
-
-    /**
-     * number of audio samples (per channel) described by this frame
-     */
-    int nb_samples;
-
-    /**
-     * format of the frame, -1 if unknown or unset
-     * Values correspond to enum AVPixelFormat for video frames,
-     * enum AVSampleFormat for audio)
-     */
-    int format;
-
-    /**
-     * 1 -> keyframe, 0-> not
-     */
-    int key_frame;
-
-    /**
-     * Picture type of the frame.
-     */
-    enum AVPictureType pict_type;
-
-    /**
-     * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * Presentation timestamp in time_base units (time when frame should be shown to user).
-     */
-    int64_t pts;
-
-#if FF_API_PKT_PTS
-    /**
-     * PTS copied from the AVPacket that was decoded to produce this frame.
-     * @deprecated use the pts field instead
-     */
-    attribute_deprecated
-    int64_t pkt_pts;
-#endif
-
-    /**
-     * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used)
-     * This is also the Presentation time of this AVFrame calculated from
-     * only AVPacket.dts values without pts values.
-     */
-    int64_t pkt_dts;
-
-    /**
-     * picture number in bitstream order
-     */
-    int coded_picture_number;
-    /**
-     * picture number in display order
-     */
-    int display_picture_number;
-
-    /**
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-     */
-    int quality;
-
-    /**
-     * for some private data of the user
-     */
-    void *opaque;
-
-#if FF_API_ERROR_FRAME
-    /**
-     * @deprecated unused
-     */
-    attribute_deprecated
-    uint64_t error[AV_NUM_DATA_POINTERS];
-#endif
-
-    /**
-     * When decoding, this signals how much the picture must be delayed.
-     * extra_delay = repeat_pict / (2*fps)
-     */
-    int repeat_pict;
-
-    /**
-     * The content of the picture is interlaced.
-     */
-    int interlaced_frame;
-
-    /**
-     * If the content is interlaced, is top field displayed first.
-     */
-    int top_field_first;
-
-    /**
-     * Tell user application that palette has changed from previous frame.
-     */
-    int palette_has_changed;
-
-    /**
-     * reordered opaque 64 bits (generally an integer or a double precision float
-     * PTS but can be anything).
-     * The user sets AVCodecContext.reordered_opaque to represent the input at
-     * that time,
-     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Sample rate of the audio data.
-     */
-    int sample_rate;
-
-    /**
-     * Channel layout of the audio data.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * AVBuffer references backing the data for this frame. If all elements of
-     * this array are NULL, then this frame is not reference counted. This array
-     * must be filled contiguously -- if buf[i] is non-NULL then buf[j] must
-     * also be non-NULL for all j < i.
-     *
-     * There may be at most one AVBuffer per data plane, so for video this array
-     * always contains all the references. For planar audio with more than
-     * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
-     * this array. Then the extra AVBufferRef pointers are stored in the
-     * extended_buf array.
-     */
-    AVBufferRef *buf[AV_NUM_DATA_POINTERS];
-
-    /**
-     * For planar audio which requires more than AV_NUM_DATA_POINTERS
-     * AVBufferRef pointers, this array will hold all the references which
-     * cannot fit into AVFrame.buf.
-     *
-     * Note that this is different from AVFrame.extended_data, which always
-     * contains all the pointers. This array only contains the extra pointers,
-     * which cannot fit into AVFrame.buf.
-     *
-     * This array is always allocated using av_malloc() by whoever constructs
-     * the frame. It is freed in av_frame_unref().
-     */
-    AVBufferRef **extended_buf;
-    /**
-     * Number of elements in extended_buf.
-     */
-    int        nb_extended_buf;
-
-    AVFrameSideData **side_data;
-    int            nb_side_data;
-
-/**
- * @defgroup lavu_frame_flags AV_FRAME_FLAGS
- * @ingroup lavu_frame
- * Flags describing additional frame properties.
- *
- * @{
- */
-
-/**
- * The frame data may be corrupted, e.g. due to decoding errors.
- */
-#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
-/**
- * A flag to mark the frames which need to be decoded, but shouldn't be output.
- */
-#define AV_FRAME_FLAG_DISCARD   (1 << 2)
-/**
- * @}
- */
-
-    /**
-     * Frame flags, a combination of @ref lavu_frame_flags
-     */
-    int flags;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    enum AVColorPrimaries color_primaries;
-
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    enum AVChromaLocation chroma_location;
-
-    /**
-     * frame timestamp estimated using various heuristics, in stream time base
-     * - encoding: unused
-     * - decoding: set by libavcodec, read by user.
-     */
-    int64_t best_effort_timestamp;
-
-    /**
-     * reordered pos from the last AVPacket that has been input into the decoder
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_pos;
-
-    /**
-     * duration of the corresponding packet, expressed in
-     * AVStream->time_base units, 0 if unknown.
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_duration;
-
-    /**
-     * metadata.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVDictionary *metadata;
-
-    /**
-     * decode error flags of the frame, set to a combination of
-     * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
-     * were errors during the decoding.
-     * - encoding: unused
-     * - decoding: set by libavcodec, read by user.
-     */
-    int decode_error_flags;
-#define FF_DECODE_ERROR_INVALID_BITSTREAM   1
-#define FF_DECODE_ERROR_MISSING_REFERENCE   2
-
-    /**
-     * number of audio channels, only used for audio.
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int channels;
-
-    /**
-     * size of the corresponding packet containing the compressed
-     * frame.
-     * It is set to a negative value if unknown.
-     * - encoding: unused
-     * - decoding: set by libavcodec, read by user.
-     */
-    int pkt_size;
-
-#if FF_API_FRAME_QP
-    /**
-     * QP table
-     */
-    attribute_deprecated
-    int8_t *qscale_table;
-    /**
-     * QP store stride
-     */
-    attribute_deprecated
-    int qstride;
-
-    attribute_deprecated
-    int qscale_type;
-
-    AVBufferRef *qp_table_buf;
-#endif
-    /**
-     * For hwaccel-format frames, this should be a reference to the
-     * AVHWFramesContext describing the frame.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-    /**
-     * AVBufferRef for free use by the API user. FFmpeg will never check the
-     * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-     * the frame is unreferenced. av_frame_copy_props() calls create a new
-     * reference with av_buffer_ref() for the target frame's opaque_ref field.
-     *
-     * This is unrelated to the opaque field, although it serves a similar
-     * purpose.
-     */
-    AVBufferRef *opaque_ref;
-
-    /**
-     * @anchor cropping
-     * @name Cropping
-     * Video frames only. The number of pixels to discard from the the
-     * top/bottom/left/right border of the frame to obtain the sub-rectangle of
-     * the frame intended for presentation.
-     * @{
-     */
-    size_t crop_top;
-    size_t crop_bottom;
-    size_t crop_left;
-    size_t crop_right;
-    /**
-     * @}
-     */
-} AVFrame;
-
-/**
- * Accessors for some AVFrame fields. These used to be provided for ABI
- * compatibility, and do not need to be used anymore.
- */
-int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
-void    av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
-int64_t av_frame_get_pkt_duration         (const AVFrame *frame);
-void    av_frame_set_pkt_duration         (AVFrame *frame, int64_t val);
-int64_t av_frame_get_pkt_pos              (const AVFrame *frame);
-void    av_frame_set_pkt_pos              (AVFrame *frame, int64_t val);
-int64_t av_frame_get_channel_layout       (const AVFrame *frame);
-void    av_frame_set_channel_layout       (AVFrame *frame, int64_t val);
-int     av_frame_get_channels             (const AVFrame *frame);
-void    av_frame_set_channels             (AVFrame *frame, int     val);
-int     av_frame_get_sample_rate          (const AVFrame *frame);
-void    av_frame_set_sample_rate          (AVFrame *frame, int     val);
-AVDictionary *av_frame_get_metadata       (const AVFrame *frame);
-void          av_frame_set_metadata       (AVFrame *frame, AVDictionary *val);
-int     av_frame_get_decode_error_flags   (const AVFrame *frame);
-void    av_frame_set_decode_error_flags   (AVFrame *frame, int     val);
-int     av_frame_get_pkt_size(const AVFrame *frame);
-void    av_frame_set_pkt_size(AVFrame *frame, int val);
-AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
-#if FF_API_FRAME_QP
-int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
-int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
-#endif
-enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
-void    av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
-enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
-void    av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
-
-/**
- * Get the name of a colorspace.
- * @return a static string identifying the colorspace; can be NULL.
- */
-const char *av_get_colorspace_name(enum AVColorSpace val);
-
-/**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct must be freed using av_frame_free().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- *
- * @note this only allocates the AVFrame itself, not the data buffers. Those
- * must be allocated through other means, e.g. with av_frame_get_buffer() or
- * manually.
- */
-AVFrame *av_frame_alloc(void);
-
-/**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data. If the frame is reference counted, it will be
- * unreferenced first.
- *
- * @param frame frame to be freed. The pointer will be set to NULL.
- */
-void av_frame_free(AVFrame **frame);
-
-/**
- * Set up a new reference to the data described by the source frame.
- *
- * Copy frame properties from src to dst and create a new reference for each
- * AVBufferRef from src.
- *
- * If src is not reference counted, new buffers are allocated and the data is
- * copied.
- *
- * @warning: dst MUST have been either unreferenced with av_frame_unref(dst),
- *           or newly allocated with av_frame_alloc() before calling this
- *           function, or undefined behavior will occur.
- *
- * @return 0 on success, a negative AVERROR on error
- */
-int av_frame_ref(AVFrame *dst, const AVFrame *src);
-
-/**
- * Create a new frame that references the same data as src.
- *
- * This is a shortcut for av_frame_alloc()+av_frame_ref().
- *
- * @return newly created AVFrame on success, NULL on error.
- */
-AVFrame *av_frame_clone(const AVFrame *src);
-
-/**
- * Unreference all the buffers referenced by frame and reset the frame fields.
- */
-void av_frame_unref(AVFrame *frame);
-
-/**
- * Move everything contained in src to dst and reset src.
- *
- * @warning: dst is not unreferenced, but directly overwritten without reading
- *           or deallocating its contents. Call av_frame_unref(dst) manually
- *           before calling this function to ensure that no memory is leaked.
- */
-void av_frame_move_ref(AVFrame *dst, AVFrame *src);
-
-/**
- * Allocate new buffer(s) for audio or video data.
- *
- * The following fields must be set on frame before calling this function:
- * - format (pixel format for video, sample format for audio)
- * - width and height for video
- * - nb_samples and channel_layout for audio
- *
- * This function will fill AVFrame.data and AVFrame.buf arrays and, if
- * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
- * For planar formats, one buffer will be allocated for each plane.
- *
- * @warning: if frame already has been allocated, calling this function will
- *           leak memory. In addition, undefined behavior can occur in certain
- *           cases.
- *
- * @param frame frame in which to store the new buffers.
- * @param align Required buffer size alignment. If equal to 0, alignment will be
- *              chosen automatically for the current CPU. It is highly
- *              recommended to pass 0 here unless you know what you are doing.
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_frame_get_buffer(AVFrame *frame, int align);
-
-/**
- * Check if the frame data is writable.
- *
- * @return A positive value if the frame data is writable (which is true if and
- * only if each of the underlying buffers has only one reference, namely the one
- * stored in this frame). Return 0 otherwise.
- *
- * If 1 is returned the answer is valid until av_buffer_ref() is called on any
- * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
- *
- * @see av_frame_make_writable(), av_buffer_is_writable()
- */
-int av_frame_is_writable(AVFrame *frame);
-
-/**
- * Ensure that the frame data is writable, avoiding data copy if possible.
- *
- * Do nothing if the frame is writable, allocate new buffers and copy the data
- * if it is not.
- *
- * @return 0 on success, a negative AVERROR on error.
- *
- * @see av_frame_is_writable(), av_buffer_is_writable(),
- * av_buffer_make_writable()
- */
-int av_frame_make_writable(AVFrame *frame);
-
-/**
- * Copy the frame data from src to dst.
- *
- * This function does not allocate anything, dst must be already initialized and
- * allocated with the same parameters as src.
- *
- * This function only copies the frame data (i.e. the contents of the data /
- * extended data arrays), not any other properties.
- *
- * @return >= 0 on success, a negative AVERROR on error.
- */
-int av_frame_copy(AVFrame *dst, const AVFrame *src);
-
-/**
- * Copy only "metadata" fields from src to dst.
- *
- * Metadata for the purpose of this function are those fields that do not affect
- * the data layout in the buffers.  E.g. pts, sample rate (for audio) or sample
- * aspect ratio (for video), but not width/height or channel layout.
- * Side data is also copied.
- */
-int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
-
-/**
- * Get the buffer reference a given data plane is stored in.
- *
- * @param plane index of the data plane of interest in frame->extended_data.
- *
- * @return the buffer reference that contains the plane or NULL if the input
- * frame is not valid.
- */
-AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
-
-/**
- * Add a new side data to a frame.
- *
- * @param frame a frame to which the side data should be added
- * @param type type of the added side data
- * @param size size of the side data
- *
- * @return newly added side data on success, NULL on error
- */
-AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
-                                        enum AVFrameSideDataType type,
-                                        int size);
-
-/**
- * @return a pointer to the side data of a given type on success, NULL if there
- * is no side data with such type in this frame.
- */
-AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
-                                        enum AVFrameSideDataType type);
-
-/**
- * If side data of the supplied type exists in the frame, free it and remove it
- * from the frame.
- */
-void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
-
-
-/**
- * Flags for frame cropping.
- */
-enum {
-    /**
-     * Apply the maximum possible cropping, even if it requires setting the
-     * AVFrame.data[] entries to unaligned pointers. Passing unaligned data
-     * to FFmpeg API is generally not allowed, and causes undefined behavior
-     * (such as crashes). You can pass unaligned data only to FFmpeg APIs that
-     * are explicitly documented to accept it. Use this flag only if you
-     * absolutely know what you are doing.
-     */
-    AV_FRAME_CROP_UNALIGNED     = 1 << 0,
-};
-
-/**
- * Crop the given video AVFrame according to its crop_left/crop_top/crop_right/
- * crop_bottom fields. If cropping is successful, the function will adjust the
- * data pointers and the width/height fields, and set the crop fields to 0.
- *
- * In all cases, the cropping boundaries will be rounded to the inherent
- * alignment of the pixel format. In some cases, such as for opaque hwaccel
- * formats, the left/top cropping is ignored. The crop fields are set to 0 even
- * if the cropping was rounded or ignored.
- *
- * @param frame the frame which should be cropped
- * @param flags Some combination of AV_FRAME_CROP_* flags, or 0.
- *
- * @return >= 0 on success, a negative AVERROR on error. If the cropping fields
- * were invalid, AVERROR(ERANGE) is returned, and nothing is changed.
- */
-int av_frame_apply_cropping(AVFrame *frame, int flags);
-
-/**
- * @return a string identifying the side data type
- */
-const char *av_frame_side_data_name(enum AVFrameSideDataType type);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_FRAME_H */
diff --git a/dependencies2013/win32/include/libavutil/hash.h b/dependencies2013/win32/include/libavutil/hash.h
deleted file mode 100644
index a20b8934..00000000
--- a/dependencies2013/win32/include/libavutil/hash.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_hash_generic
- * Generic hashing API
- */
-
-#ifndef AVUTIL_HASH_H
-#define AVUTIL_HASH_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_hash Hash Functions
- * @ingroup lavu_crypto
- * Hash functions useful in multimedia.
- *
- * Hash functions are widely used in multimedia, from error checking and
- * concealment to internal regression testing. libavutil has efficient
- * implementations of a variety of hash functions that may be useful for
- * FFmpeg and other multimedia applications.
- *
- * @{
- *
- * @defgroup lavu_hash_generic Generic Hashing API
- * An abstraction layer for all hash functions supported by libavutil.
- *
- * If your application needs to support a wide range of different hash
- * functions, then the Generic Hashing API is for you. It provides a generic,
- * reusable API for @ref lavu_hash "all hash functions" implemented in libavutil.
- * If you just need to use one particular hash function, use the @ref lavu_hash
- * "individual hash" directly.
- *
- * @section Sample Code
- *
- * A basic template for using the Generic Hashing API follows:
- *
- * @code
- * struct AVHashContext *ctx = NULL;
- * const char *hash_name = NULL;
- * uint8_t *output_buf = NULL;
- *
- * // Select from a string returned by av_hash_names()
- * hash_name = ...;
- *
- * // Allocate a hash context
- * ret = av_hash_alloc(&ctx, hash_name);
- * if (ret < 0)
- *     return ret;
- *
- * // Initialize the hash context
- * av_hash_init(ctx);
- *
- * // Update the hash context with data
- * while (data_left) {
- *     av_hash_update(ctx, data, size);
- * }
- *
- * // Now we have no more data, so it is time to finalize the hash and get the
- * // output. But we need to first allocate an output buffer. Note that you can
- * // use any memory allocation function, including malloc(), not just
- * // av_malloc().
- * output_buf = av_malloc(av_hash_get_size(ctx));
- * if (!output_buf)
- *     return AVERROR(ENOMEM);
- *
- * // Finalize the hash context.
- * // You can use any of the av_hash_final*() functions provided, for other
- * // output formats. If you do so, be sure to adjust the memory allocation
- * // above. See the function documentation below for the exact amount of extra
- * // memory needed.
- * av_hash_final(ctx, output_buffer);
- *
- * // Free the context
- * av_hash_freep(&ctx);
- * @endcode
- *
- * @section Hash Function-Specific Information
- * If the CRC32 hash is selected, the #AV_CRC_32_IEEE polynomial will be
- * used.
- *
- * If the Murmur3 hash is selected, the default seed will be used. See @ref
- * lavu_murmur3_seedinfo "Murmur3" for more information.
- *
- * @{
- */
-
-/**
- * @example ffhash.c
- * This example is a simple command line application that takes one or more
- * arguments. It demonstrates a typical use of the hashing API with allocation,
- * initialization, updating, and finalizing.
- */
-
-struct AVHashContext;
-
-/**
- * Allocate a hash context for the algorithm specified by name.
- *
- * @return  >= 0 for success, a negative error code for failure
- *
- * @note The context is not initialized after a call to this function; you must
- * call av_hash_init() to do so.
- */
-int av_hash_alloc(struct AVHashContext **ctx, const char *name);
-
-/**
- * Get the names of available hash algorithms.
- *
- * This function can be used to enumerate the algorithms.
- *
- * @param[in] i  Index of the hash algorithm, starting from 0
- * @return       Pointer to a static string or `NULL` if `i` is out of range
- */
-const char *av_hash_names(int i);
-
-/**
- * Get the name of the algorithm corresponding to the given hash context.
- */
-const char *av_hash_get_name(const struct AVHashContext *ctx);
-
-/**
- * Maximum value that av_hash_get_size() will currently return.
- *
- * You can use this if you absolutely want or need to use static allocation for
- * the output buffer and are fine with not supporting hashes newly added to
- * libavutil without recompilation.
- *
- * @warning
- * Adding new hashes with larger sizes, and increasing the macro while doing
- * so, will not be considered an ABI change. To prevent your code from
- * overflowing a buffer, either dynamically allocate the output buffer with
- * av_hash_get_size(), or limit your use of the Hashing API to hashes that are
- * already in FFmpeg during the time of compilation.
- */
-#define AV_HASH_MAX_SIZE 64
-
-/**
- * Get the size of the resulting hash value in bytes.
- *
- * The maximum value this function will currently return is available as macro
- * #AV_HASH_MAX_SIZE.
- *
- * @param[in]     ctx Hash context
- * @return            Size of the hash value in bytes
- */
-int av_hash_get_size(const struct AVHashContext *ctx);
-
-/**
- * Initialize or reset a hash context.
- *
- * @param[in,out] ctx Hash context
- */
-void av_hash_init(struct AVHashContext *ctx);
-
-/**
- * Update a hash context with additional data.
- *
- * @param[in,out] ctx Hash context
- * @param[in]     src Data to be added to the hash context
- * @param[in]     len Size of the additional data
- */
-void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len);
-
-/**
- * Finalize a hash context and compute the actual hash value.
- *
- * The minimum size of `dst` buffer is given by av_hash_get_size() or
- * #AV_HASH_MAX_SIZE. The use of the latter macro is discouraged.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * @param[in,out] ctx Hash context
- * @param[out]    dst Where the final hash value will be stored
- *
- * @see av_hash_final_bin() provides an alternative API
- */
-void av_hash_final(struct AVHashContext *ctx, uint8_t *dst);
-
-/**
- * Finalize a hash context and store the actual hash value in a buffer.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * If `size` is smaller than the hash size (given by av_hash_get_size()), the
- * hash is truncated; if size is larger, the buffer is padded with 0.
- *
- * @param[in,out] ctx  Hash context
- * @param[out]    dst  Where the final hash value will be stored
- * @param[in]     size Number of bytes to write to `dst`
- */
-void av_hash_final_bin(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Finalize a hash context and store the hexadecimal representation of the
- * actual hash value as a string.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * The string is always 0-terminated.
- *
- * If `size` is smaller than `2 * hash_size + 1`, where `hash_size` is the
- * value returned by av_hash_get_size(), the string will be truncated.
- *
- * @param[in,out] ctx  Hash context
- * @param[out]    dst  Where the string will be stored
- * @param[in]     size Maximum number of bytes to write to `dst`
- */
-void av_hash_final_hex(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Finalize a hash context and store the Base64 representation of the
- * actual hash value as a string.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * The string is always 0-terminated.
- *
- * If `size` is smaller than AV_BASE64_SIZE(hash_size), where `hash_size` is
- * the value returned by av_hash_get_size(), the string will be truncated.
- *
- * @param[in,out] ctx  Hash context
- * @param[out]    dst  Where the final hash value will be stored
- * @param[in]     size Maximum number of bytes to write to `dst`
- */
-void av_hash_final_b64(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Free hash context and set hash context pointer to `NULL`.
- *
- * @param[in,out] ctx  Pointer to hash context
- */
-void av_hash_freep(struct AVHashContext **ctx);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_HASH_H */
diff --git a/dependencies2013/win32/include/libavutil/hmac.h b/dependencies2013/win32/include/libavutil/hmac.h
deleted file mode 100644
index 576a0a4f..00000000
--- a/dependencies2013/win32/include/libavutil/hmac.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2012 Martin Storsjo
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HMAC_H
-#define AVUTIL_HMAC_H
-
-#include <stdint.h>
-
-#include "version.h"
-/**
- * @defgroup lavu_hmac HMAC
- * @ingroup lavu_crypto
- * @{
- */
-
-enum AVHMACType {
-    AV_HMAC_MD5,
-    AV_HMAC_SHA1,
-    AV_HMAC_SHA224,
-    AV_HMAC_SHA256,
-    AV_HMAC_SHA384 = 12,
-    AV_HMAC_SHA512,
-};
-
-typedef struct AVHMAC AVHMAC;
-
-/**
- * Allocate an AVHMAC context.
- * @param type The hash function used for the HMAC.
- */
-AVHMAC *av_hmac_alloc(enum AVHMACType type);
-
-/**
- * Free an AVHMAC context.
- * @param ctx The context to free, may be NULL
- */
-void av_hmac_free(AVHMAC *ctx);
-
-/**
- * Initialize an AVHMAC context with an authentication key.
- * @param ctx    The HMAC context
- * @param key    The authentication key
- * @param keylen The length of the key, in bytes
- */
-void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
-
-/**
- * Hash data with the HMAC.
- * @param ctx  The HMAC context
- * @param data The data to hash
- * @param len  The length of the data, in bytes
- */
-void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
-
-/**
- * Finish hashing and output the HMAC digest.
- * @param ctx    The HMAC context
- * @param out    The output buffer to write the digest into
- * @param outlen The length of the out buffer, in bytes
- * @return       The number of bytes written to out, or a negative error code.
- */
-int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
-
-/**
- * Hash an array of data with a key.
- * @param ctx    The HMAC context
- * @param data   The data to hash
- * @param len    The length of the data, in bytes
- * @param key    The authentication key
- * @param keylen The length of the key, in bytes
- * @param out    The output buffer to write the digest into
- * @param outlen The length of the out buffer, in bytes
- * @return       The number of bytes written to out, or a negative error code.
- */
-int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
-                 const uint8_t *key, unsigned int keylen,
-                 uint8_t *out, unsigned int outlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_HMAC_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext.h b/dependencies2013/win32/include/libavutil/hwcontext.h
deleted file mode 100644
index 03334e20..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext.h
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_H
-#define AVUTIL_HWCONTEXT_H
-
-#include "buffer.h"
-#include "frame.h"
-#include "log.h"
-#include "pixfmt.h"
-
-enum AVHWDeviceType {
-    AV_HWDEVICE_TYPE_VDPAU,
-    AV_HWDEVICE_TYPE_CUDA,
-    AV_HWDEVICE_TYPE_VAAPI,
-    AV_HWDEVICE_TYPE_DXVA2,
-    AV_HWDEVICE_TYPE_QSV,
-    AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
-    AV_HWDEVICE_TYPE_NONE,
-    AV_HWDEVICE_TYPE_D3D11VA,
-    AV_HWDEVICE_TYPE_DRM,
-};
-
-typedef struct AVHWDeviceInternal AVHWDeviceInternal;
-
-/**
- * This struct aggregates all the (hardware/vendor-specific) "high-level" state,
- * i.e. state that is not tied to a concrete processing configuration.
- * E.g., in an API that supports hardware-accelerated encoding and decoding,
- * this struct will (if possible) wrap the state that is common to both encoding
- * and decoding and from which specific instances of encoders or decoders can be
- * derived.
- *
- * This struct is reference-counted with the AVBuffer mechanism. The
- * av_hwdevice_ctx_alloc() constructor yields a reference, whose data field
- * points to the actual AVHWDeviceContext. Further objects derived from
- * AVHWDeviceContext (such as AVHWFramesContext, describing a frame pool with
- * specific properties) will hold an internal reference to it. After all the
- * references are released, the AVHWDeviceContext itself will be freed,
- * optionally invoking a user-specified callback for uninitializing the hardware
- * state.
- */
-typedef struct AVHWDeviceContext {
-    /**
-     * A class for logging. Set by av_hwdevice_ctx_alloc().
-     */
-    const AVClass *av_class;
-
-    /**
-     * Private data used internally by libavutil. Must not be accessed in any
-     * way by the caller.
-     */
-    AVHWDeviceInternal *internal;
-
-    /**
-     * This field identifies the underlying API used for hardware access.
-     *
-     * This field is set when this struct is allocated and never changed
-     * afterwards.
-     */
-    enum AVHWDeviceType type;
-
-    /**
-     * The format-specific data, allocated and freed by libavutil along with
-     * this context.
-     *
-     * Should be cast by the user to the format-specific context defined in the
-     * corresponding header (hwcontext_*.h) and filled as described in the
-     * documentation before calling av_hwdevice_ctx_init().
-     *
-     * After calling av_hwdevice_ctx_init() this struct should not be modified
-     * by the caller.
-     */
-    void *hwctx;
-
-    /**
-     * This field may be set by the caller before calling av_hwdevice_ctx_init().
-     *
-     * If non-NULL, this callback will be called when the last reference to
-     * this context is unreferenced, immediately before it is freed.
-     *
-     * @note when other objects (e.g an AVHWFramesContext) are derived from this
-     *       struct, this callback will be invoked after all such child objects
-     *       are fully uninitialized and their respective destructors invoked.
-     */
-    void (*free)(struct AVHWDeviceContext *ctx);
-
-    /**
-     * Arbitrary user data, to be used e.g. by the free() callback.
-     */
-    void *user_opaque;
-} AVHWDeviceContext;
-
-typedef struct AVHWFramesInternal AVHWFramesInternal;
-
-/**
- * This struct describes a set or pool of "hardware" frames (i.e. those with
- * data not located in normal system memory). All the frames in the pool are
- * assumed to be allocated in the same way and interchangeable.
- *
- * This struct is reference-counted with the AVBuffer mechanism and tied to a
- * given AVHWDeviceContext instance. The av_hwframe_ctx_alloc() constructor
- * yields a reference, whose data field points to the actual AVHWFramesContext
- * struct.
- */
-typedef struct AVHWFramesContext {
-    /**
-     * A class for logging.
-     */
-    const AVClass *av_class;
-
-    /**
-     * Private data used internally by libavutil. Must not be accessed in any
-     * way by the caller.
-     */
-    AVHWFramesInternal *internal;
-
-    /**
-     * A reference to the parent AVHWDeviceContext. This reference is owned and
-     * managed by the enclosing AVHWFramesContext, but the caller may derive
-     * additional references from it.
-     */
-    AVBufferRef *device_ref;
-
-    /**
-     * The parent AVHWDeviceContext. This is simply a pointer to
-     * device_ref->data provided for convenience.
-     *
-     * Set by libavutil in av_hwframe_ctx_init().
-     */
-    AVHWDeviceContext *device_ctx;
-
-    /**
-     * The format-specific data, allocated and freed automatically along with
-     * this context.
-     *
-     * Should be cast by the user to the format-specific context defined in the
-     * corresponding header (hwframe_*.h) and filled as described in the
-     * documentation before calling av_hwframe_ctx_init().
-     *
-     * After any frames using this context are created, the contents of this
-     * struct should not be modified by the caller.
-     */
-    void *hwctx;
-
-    /**
-     * This field may be set by the caller before calling av_hwframe_ctx_init().
-     *
-     * If non-NULL, this callback will be called when the last reference to
-     * this context is unreferenced, immediately before it is freed.
-     */
-    void (*free)(struct AVHWFramesContext *ctx);
-
-    /**
-     * Arbitrary user data, to be used e.g. by the free() callback.
-     */
-    void *user_opaque;
-
-    /**
-     * A pool from which the frames are allocated by av_hwframe_get_buffer().
-     * This field may be set by the caller before calling av_hwframe_ctx_init().
-     * The buffers returned by calling av_buffer_pool_get() on this pool must
-     * have the properties described in the documentation in the corresponding hw
-     * type's header (hwcontext_*.h). The pool will be freed strictly before
-     * this struct's free() callback is invoked.
-     *
-     * This field may be NULL, then libavutil will attempt to allocate a pool
-     * internally. Note that certain device types enforce pools allocated at
-     * fixed size (frame count), which cannot be extended dynamically. In such a
-     * case, initial_pool_size must be set appropriately.
-     */
-    AVBufferPool *pool;
-
-    /**
-     * Initial size of the frame pool. If a device type does not support
-     * dynamically resizing the pool, then this is also the maximum pool size.
-     *
-     * May be set by the caller before calling av_hwframe_ctx_init(). Must be
-     * set if pool is NULL and the device type does not support dynamic pools.
-     */
-    int initial_pool_size;
-
-    /**
-     * The pixel format identifying the underlying HW surface type.
-     *
-     * Must be a hwaccel format, i.e. the corresponding descriptor must have the
-     * AV_PIX_FMT_FLAG_HWACCEL flag set.
-     *
-     * Must be set by the user before calling av_hwframe_ctx_init().
-     */
-    enum AVPixelFormat format;
-
-    /**
-     * The pixel format identifying the actual data layout of the hardware
-     * frames.
-     *
-     * Must be set by the caller before calling av_hwframe_ctx_init().
-     *
-     * @note when the underlying API does not provide the exact data layout, but
-     * only the colorspace/bit depth, this field should be set to the fully
-     * planar version of that format (e.g. for 8-bit 420 YUV it should be
-     * AV_PIX_FMT_YUV420P, not AV_PIX_FMT_NV12 or anything else).
-     */
-    enum AVPixelFormat sw_format;
-
-    /**
-     * The allocated dimensions of the frames in this pool.
-     *
-     * Must be set by the user before calling av_hwframe_ctx_init().
-     */
-    int width, height;
-} AVHWFramesContext;
-
-/**
- * Look up an AVHWDeviceType by name.
- *
- * @param name String name of the device type (case-insensitive).
- * @return The type from enum AVHWDeviceType, or AV_HWDEVICE_TYPE_NONE if
- *         not found.
- */
-enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name);
-
-/** Get the string name of an AVHWDeviceType.
- *
- * @param type Type from enum AVHWDeviceType.
- * @return Pointer to a static string containing the name, or NULL if the type
- *         is not valid.
- */
-const char *av_hwdevice_get_type_name(enum AVHWDeviceType type);
-
-/**
- * Iterate over supported device types.
- *
- * @param type AV_HWDEVICE_TYPE_NONE initially, then the previous type
- *             returned by this function in subsequent iterations.
- * @return The next usable device type from enum AVHWDeviceType, or
- *         AV_HWDEVICE_TYPE_NONE if there are no more.
- */
-enum AVHWDeviceType av_hwdevice_iterate_types(enum AVHWDeviceType prev);
-
-/**
- * Allocate an AVHWDeviceContext for a given hardware type.
- *
- * @param type the type of the hardware device to allocate.
- * @return a reference to the newly created AVHWDeviceContext on success or NULL
- *         on failure.
- */
-AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type);
-
-/**
- * Finalize the device context before use. This function must be called after
- * the context is filled with all the required information and before it is
- * used in any way.
- *
- * @param ref a reference to the AVHWDeviceContext
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_hwdevice_ctx_init(AVBufferRef *ref);
-
-/**
- * Open a device of the specified type and create an AVHWDeviceContext for it.
- *
- * This is a convenience function intended to cover the simple cases. Callers
- * who need to fine-tune device creation/management should open the device
- * manually and then wrap it in an AVHWDeviceContext using
- * av_hwdevice_ctx_alloc()/av_hwdevice_ctx_init().
- *
- * The returned context is already initialized and ready for use, the caller
- * should not call av_hwdevice_ctx_init() on it. The user_opaque/free fields of
- * the created AVHWDeviceContext are set by this function and should not be
- * touched by the caller.
- *
- * @param device_ctx On success, a reference to the newly-created device context
- *                   will be written here. The reference is owned by the caller
- *                   and must be released with av_buffer_unref() when no longer
- *                   needed. On failure, NULL will be written to this pointer.
- * @param type The type of the device to create.
- * @param device A type-specific string identifying the device to open.
- * @param opts A dictionary of additional (type-specific) options to use in
- *             opening the device. The dictionary remains owned by the caller.
- * @param flags currently unused
- *
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_hwdevice_ctx_create(AVBufferRef **device_ctx, enum AVHWDeviceType type,
-                           const char *device, AVDictionary *opts, int flags);
-
-/**
- * Create a new device of the specified type from an existing device.
- *
- * If the source device is a device of the target type or was originally
- * derived from such a device (possibly through one or more intermediate
- * devices of other types), then this will return a reference to the
- * existing device of the same type as is requested.
- *
- * Otherwise, it will attempt to derive a new device from the given source
- * device.  If direct derivation to the new type is not implemented, it will
- * attempt the same derivation from each ancestor of the source device in
- * turn looking for an implemented derivation method.
- *
- * @param dst_ctx On success, a reference to the newly-created
- *                AVHWDeviceContext.
- * @param type    The type of the new device to create.
- * @param src_ctx A reference to an existing AVHWDeviceContext which will be
- *                used to create the new device.
- * @param flags   Currently unused; should be set to zero.
- * @return        Zero on success, a negative AVERROR code on failure.
- */
-int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ctx,
-                                   enum AVHWDeviceType type,
-                                   AVBufferRef *src_ctx, int flags);
-
-
-/**
- * Allocate an AVHWFramesContext tied to a given device context.
- *
- * @param device_ctx a reference to a AVHWDeviceContext. This function will make
- *                   a new reference for internal use, the one passed to the
- *                   function remains owned by the caller.
- * @return a reference to the newly created AVHWFramesContext on success or NULL
- *         on failure.
- */
-AVBufferRef *av_hwframe_ctx_alloc(AVBufferRef *device_ctx);
-
-/**
- * Finalize the context before use. This function must be called after the
- * context is filled with all the required information and before it is attached
- * to any frames.
- *
- * @param ref a reference to the AVHWFramesContext
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_hwframe_ctx_init(AVBufferRef *ref);
-
-/**
- * Allocate a new frame attached to the given AVHWFramesContext.
- *
- * @param hwframe_ctx a reference to an AVHWFramesContext
- * @param frame an empty (freshly allocated or unreffed) frame to be filled with
- *              newly allocated buffers.
- * @param flags currently unused, should be set to zero
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_hwframe_get_buffer(AVBufferRef *hwframe_ctx, AVFrame *frame, int flags);
-
-/**
- * Copy data to or from a hw surface. At least one of dst/src must have an
- * AVHWFramesContext attached.
- *
- * If src has an AVHWFramesContext attached, then the format of dst (if set)
- * must use one of the formats returned by av_hwframe_transfer_get_formats(src,
- * AV_HWFRAME_TRANSFER_DIRECTION_FROM).
- * If dst has an AVHWFramesContext attached, then the format of src must use one
- * of the formats returned by av_hwframe_transfer_get_formats(dst,
- * AV_HWFRAME_TRANSFER_DIRECTION_TO)
- *
- * dst may be "clean" (i.e. with data/buf pointers unset), in which case the
- * data buffers will be allocated by this function using av_frame_get_buffer().
- * If dst->format is set, then this format will be used, otherwise (when
- * dst->format is AV_PIX_FMT_NONE) the first acceptable format will be chosen.
- *
- * The two frames must have matching allocated dimensions (i.e. equal to
- * AVHWFramesContext.width/height), since not all device types support
- * transferring a sub-rectangle of the whole surface. The display dimensions
- * (i.e. AVFrame.width/height) may be smaller than the allocated dimensions, but
- * also have to be equal for both frames. When the display dimensions are
- * smaller than the allocated dimensions, the content of the padding in the
- * destination frame is unspecified.
- *
- * @param dst the destination frame. dst is not touched on failure.
- * @param src the source frame.
- * @param flags currently unused, should be set to zero
- * @return 0 on success, a negative AVERROR error code on failure.
- */
-int av_hwframe_transfer_data(AVFrame *dst, const AVFrame *src, int flags);
-
-enum AVHWFrameTransferDirection {
-    /**
-     * Transfer the data from the queried hw frame.
-     */
-    AV_HWFRAME_TRANSFER_DIRECTION_FROM,
-
-    /**
-     * Transfer the data to the queried hw frame.
-     */
-    AV_HWFRAME_TRANSFER_DIRECTION_TO,
-};
-
-/**
- * Get a list of possible source or target formats usable in
- * av_hwframe_transfer_data().
- *
- * @param hwframe_ctx the frame context to obtain the information for
- * @param dir the direction of the transfer
- * @param formats the pointer to the output format list will be written here.
- *                The list is terminated with AV_PIX_FMT_NONE and must be freed
- *                by the caller when no longer needed using av_free().
- *                If this function returns successfully, the format list will
- *                have at least one item (not counting the terminator).
- *                On failure, the contents of this pointer are unspecified.
- * @param flags currently unused, should be set to zero
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ctx,
-                                    enum AVHWFrameTransferDirection dir,
-                                    enum AVPixelFormat **formats, int flags);
-
-
-/**
- * This struct describes the constraints on hardware frames attached to
- * a given device with a hardware-specific configuration.  This is returned
- * by av_hwdevice_get_hwframe_constraints() and must be freed by
- * av_hwframe_constraints_free() after use.
- */
-typedef struct AVHWFramesConstraints {
-    /**
-     * A list of possible values for format in the hw_frames_ctx,
-     * terminated by AV_PIX_FMT_NONE.  This member will always be filled.
-     */
-    enum AVPixelFormat *valid_hw_formats;
-
-    /**
-     * A list of possible values for sw_format in the hw_frames_ctx,
-     * terminated by AV_PIX_FMT_NONE.  Can be NULL if this information is
-     * not known.
-     */
-    enum AVPixelFormat *valid_sw_formats;
-
-    /**
-     * The minimum size of frames in this hw_frames_ctx.
-     * (Zero if not known.)
-     */
-    int min_width;
-    int min_height;
-
-    /**
-     * The maximum size of frames in this hw_frames_ctx.
-     * (INT_MAX if not known / no limit.)
-     */
-    int max_width;
-    int max_height;
-} AVHWFramesConstraints;
-
-/**
- * Allocate a HW-specific configuration structure for a given HW device.
- * After use, the user must free all members as required by the specific
- * hardware structure being used, then free the structure itself with
- * av_free().
- *
- * @param device_ctx a reference to the associated AVHWDeviceContext.
- * @return The newly created HW-specific configuration structure on
- *         success or NULL on failure.
- */
-void *av_hwdevice_hwconfig_alloc(AVBufferRef *device_ctx);
-
-/**
- * Get the constraints on HW frames given a device and the HW-specific
- * configuration to be used with that device.  If no HW-specific
- * configuration is provided, returns the maximum possible capabilities
- * of the device.
- *
- * @param ref a reference to the associated AVHWDeviceContext.
- * @param hwconfig a filled HW-specific configuration structure, or NULL
- *        to return the maximum possible capabilities of the device.
- * @return AVHWFramesConstraints structure describing the constraints
- *         on the device, or NULL if not available.
- */
-AVHWFramesConstraints *av_hwdevice_get_hwframe_constraints(AVBufferRef *ref,
-                                                           const void *hwconfig);
-
-/**
- * Free an AVHWFrameConstraints structure.
- *
- * @param constraints The (filled or unfilled) AVHWFrameConstraints structure.
- */
-void av_hwframe_constraints_free(AVHWFramesConstraints **constraints);
-
-
-/**
- * Flags to apply to frame mappings.
- */
-enum {
-    /**
-     * The mapping must be readable.
-     */
-    AV_HWFRAME_MAP_READ      = 1 << 0,
-    /**
-     * The mapping must be writeable.
-     */
-    AV_HWFRAME_MAP_WRITE     = 1 << 1,
-    /**
-     * The mapped frame will be overwritten completely in subsequent
-     * operations, so the current frame data need not be loaded.  Any values
-     * which are not overwritten are unspecified.
-     */
-    AV_HWFRAME_MAP_OVERWRITE = 1 << 2,
-    /**
-     * The mapping must be direct.  That is, there must not be any copying in
-     * the map or unmap steps.  Note that performance of direct mappings may
-     * be much lower than normal memory.
-     */
-    AV_HWFRAME_MAP_DIRECT    = 1 << 3,
-};
-
-/**
- * Map a hardware frame.
- *
- * This has a number of different possible effects, depending on the format
- * and origin of the src and dst frames.  On input, src should be a usable
- * frame with valid buffers and dst should be blank (typically as just created
- * by av_frame_alloc()).  src should have an associated hwframe context, and
- * dst may optionally have a format and associated hwframe context.
- *
- * If src was created by mapping a frame from the hwframe context of dst,
- * then this function undoes the mapping - dst is replaced by a reference to
- * the frame that src was originally mapped from.
- *
- * If both src and dst have an associated hwframe context, then this function
- * attempts to map the src frame from its hardware context to that of dst and
- * then fill dst with appropriate data to be usable there.  This will only be
- * possible if the hwframe contexts and associated devices are compatible -
- * given compatible devices, av_hwframe_ctx_create_derived() can be used to
- * create a hwframe context for dst in which mapping should be possible.
- *
- * If src has a hwframe context but dst does not, then the src frame is
- * mapped to normal memory and should thereafter be usable as a normal frame.
- * If the format is set on dst, then the mapping will attempt to create dst
- * with that format and fail if it is not possible.  If format is unset (is
- * AV_PIX_FMT_NONE) then dst will be mapped with whatever the most appropriate
- * format to use is (probably the sw_format of the src hwframe context).
- *
- * A return value of AVERROR(ENOSYS) indicates that the mapping is not
- * possible with the given arguments and hwframe setup, while other return
- * values indicate that it failed somehow.
- *
- * @param dst Destination frame, to contain the mapping.
- * @param src Source frame, to be mapped.
- * @param flags Some combination of AV_HWFRAME_MAP_* flags.
- * @return Zero on success, negative AVERROR code on failure.
- */
-int av_hwframe_map(AVFrame *dst, const AVFrame *src, int flags);
-
-
-/**
- * Create and initialise an AVHWFramesContext as a mapping of another existing
- * AVHWFramesContext on a different device.
- *
- * av_hwframe_ctx_init() should not be called after this.
- *
- * @param derived_frame_ctx  On success, a reference to the newly created
- *                           AVHWFramesContext.
- * @param derived_device_ctx A reference to the device to create the new
- *                           AVHWFramesContext on.
- * @param source_frame_ctx   A reference to an existing AVHWFramesContext
- *                           which will be mapped to the derived context.
- * @param flags  Some combination of AV_HWFRAME_MAP_* flags, defining the
- *               mapping parameters to apply to frames which are allocated
- *               in the derived device.
- * @return       Zero on success, negative AVERROR code on failure.
- */
-int av_hwframe_ctx_create_derived(AVBufferRef **derived_frame_ctx,
-                                  enum AVPixelFormat format,
-                                  AVBufferRef *derived_device_ctx,
-                                  AVBufferRef *source_frame_ctx,
-                                  int flags);
-
-#endif /* AVUTIL_HWCONTEXT_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_cuda.h b/dependencies2013/win32/include/libavutil/hwcontext_cuda.h
deleted file mode 100644
index 12dae844..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_cuda.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef AVUTIL_HWCONTEXT_CUDA_H
-#define AVUTIL_HWCONTEXT_CUDA_H
-
-#ifndef CUDA_VERSION
-#include <cuda.h>
-#endif
-
-#include "pixfmt.h"
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_CUDA.
- *
- * This API supports dynamic frame pools. AVHWFramesContext.pool must return
- * AVBufferRefs whose data pointer is a CUdeviceptr.
- */
-
-typedef struct AVCUDADeviceContextInternal AVCUDADeviceContextInternal;
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVCUDADeviceContext {
-    CUcontext cuda_ctx;
-    AVCUDADeviceContextInternal *internal;
-} AVCUDADeviceContext;
-
-/**
- * AVHWFramesContext.hwctx is currently not used
- */
-
-#endif /* AVUTIL_HWCONTEXT_CUDA_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_d3d11va.h b/dependencies2013/win32/include/libavutil/hwcontext_d3d11va.h
deleted file mode 100644
index 98db7ce3..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_d3d11va.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_D3D11VA_H
-#define AVUTIL_HWCONTEXT_D3D11VA_H
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_D3D11VA.
- *
- * The default pool implementation will be fixed-size if initial_pool_size is
- * set (and allocate elements from an array texture). Otherwise it will allocate
- * individual textures. Be aware that decoding requires a single array texture.
- *
- * Using sw_format==AV_PIX_FMT_YUV420P has special semantics, and maps to
- * DXGI_FORMAT_420_OPAQUE. av_hwframe_transfer_data() is not supported for
- * this format. Refer to MSDN for details.
- *
- * av_hwdevice_ctx_create() for this device type supports a key named "debug"
- * for the AVDictionary entry. If this is set to any value, the device creation
- * code will try to load various supported D3D debugging layers.
- */
-
-#include <d3d11.h>
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVD3D11VADeviceContext {
-    /**
-     * Device used for texture creation and access. This can also be used to
-     * set the libavcodec decoding device.
-     *
-     * Must be set by the user. This is the only mandatory field - the other
-     * device context fields are set from this and are available for convenience.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11Device        *device;
-
-    /**
-     * If unset, this will be set from the device field on init.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11DeviceContext *device_context;
-
-    /**
-     * If unset, this will be set from the device field on init.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11VideoDevice   *video_device;
-
-    /**
-     * If unset, this will be set from the device_context field on init.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11VideoContext  *video_context;
-
-    /**
-     * Callbacks for locking. They protect accesses to device_context and
-     * video_context calls. They also protect access to the internal staging
-     * texture (for av_hwframe_transfer_data() calls). They do NOT protect
-     * access to hwcontext or decoder state in general.
-     *
-     * If unset on init, the hwcontext implementation will set them to use an
-     * internal mutex.
-     *
-     * The underlying lock must be recursive. lock_ctx is for free use by the
-     * locking implementation.
-     */
-    void (*lock)(void *lock_ctx);
-    void (*unlock)(void *lock_ctx);
-    void *lock_ctx;
-} AVD3D11VADeviceContext;
-
-/**
- * D3D11 frame descriptor for pool allocation.
- *
- * In user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer pointing at an object of this type describing the
- * planes of the frame.
- *
- * This has no use outside of custom allocation, and AVFrame AVBufferRef do not
- * necessarily point to an instance of this struct.
- */
-typedef struct AVD3D11FrameDescriptor {
-    /**
-     * The texture in which the frame is located. The reference count is
-     * managed by the AVBufferRef, and destroying the reference will release
-     * the interface.
-     *
-     * Normally stored in AVFrame.data[0].
-     */
-    ID3D11Texture2D *texture;
-
-    /**
-     * The index into the array texture element representing the frame, or 0
-     * if the texture is not an array texture.
-     *
-     * Normally stored in AVFrame.data[1] (cast from intptr_t).
-     */
-    intptr_t index;
-} AVD3D11FrameDescriptor;
-
-/**
- * This struct is allocated as AVHWFramesContext.hwctx
- */
-typedef struct AVD3D11VAFramesContext {
-    /**
-     * The canonical texture used for pool allocation. If this is set to NULL
-     * on init, the hwframes implementation will allocate and set an array
-     * texture if initial_pool_size > 0.
-     *
-     * The only situation when the API user should set this is:
-     * - the user wants to do manual pool allocation (setting
-     *   AVHWFramesContext.pool), instead of letting AVHWFramesContext
-     *   allocate the pool
-     * - of an array texture
-     * - and wants it to use it for decoding
-     * - this has to be done before calling av_hwframe_ctx_init()
-     *
-     * Deallocating the AVHWFramesContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     *
-     * This is in particular used by the libavcodec D3D11VA hwaccel, which
-     * requires a single array texture. It will create ID3D11VideoDecoderOutputView
-     * objects for each array texture element on decoder initialization.
-     */
-    ID3D11Texture2D *texture;
-
-    /**
-     * D3D11_TEXTURE2D_DESC.BindFlags used for texture creation. The user must
-     * at least set D3D11_BIND_DECODER if the frames context is to be used for
-     * video decoding.
-     * This field is ignored/invalid if a user-allocated texture is provided.
-     */
-    UINT BindFlags;
-
-    /**
-     * D3D11_TEXTURE2D_DESC.MiscFlags used for texture creation.
-     * This field is ignored/invalid if a user-allocated texture is provided.
-     */
-    UINT MiscFlags;
-} AVD3D11VAFramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_D3D11VA_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_drm.h b/dependencies2013/win32/include/libavutil/hwcontext_drm.h
deleted file mode 100644
index 2e225451..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_drm.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_DRM_H
-#define AVUTIL_HWCONTEXT_DRM_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * @file
- * API-specific header for AV_HWDEVICE_TYPE_DRM.
- *
- * Internal frame allocation is not currently supported - all frames
- * must be allocated by the user.  Thus AVHWFramesContext is always
- * NULL, though this may change if support for frame allocation is
- * added in future.
- */
-
-enum {
-    /**
-     * The maximum number of layers/planes in a DRM frame.
-     */
-    AV_DRM_MAX_PLANES = 4
-};
-
-/**
- * DRM object descriptor.
- *
- * Describes a single DRM object, addressing it as a PRIME file
- * descriptor.
- */
-typedef struct AVDRMObjectDescriptor {
-    /**
-     * DRM PRIME fd for the object.
-     */
-    int fd;
-    /**
-     * Total size of the object.
-     *
-     * (This includes any parts not which do not contain image data.)
-     */
-    size_t size;
-    /**
-     * Format modifier applied to the object (DRM_FORMAT_MOD_*).
-     */
-    uint64_t format_modifier;
-} AVDRMObjectDescriptor;
-
-/**
- * DRM plane descriptor.
- *
- * Describes a single plane of a layer, which is contained within
- * a single object.
- */
-typedef struct AVDRMPlaneDescriptor {
-    /**
-     * Index of the object containing this plane in the objects
-     * array of the enclosing frame descriptor.
-     */
-    int object_index;
-    /**
-     * Offset within that object of this plane.
-     */
-    ptrdiff_t offset;
-    /**
-     * Pitch (linesize) of this plane.
-     */
-    ptrdiff_t pitch;
-} AVDRMPlaneDescriptor;
-
-/**
- * DRM layer descriptor.
- *
- * Describes a single layer within a frame.  This has the structure
- * defined by its format, and will contain one or more planes.
- */
-typedef struct AVDRMLayerDescriptor {
-    /**
-     * Format of the layer (DRM_FORMAT_*).
-     */
-    uint32_t format;
-    /**
-     * Number of planes in the layer.
-     *
-     * This must match the number of planes required by format.
-     */
-    int nb_planes;
-    /**
-     * Array of planes in this layer.
-     */
-    AVDRMPlaneDescriptor planes[AV_DRM_MAX_PLANES];
-} AVDRMLayerDescriptor;
-
-/**
- * DRM frame descriptor.
- *
- * This is used as the data pointer for AV_PIX_FMT_DRM_PRIME frames.
- * It is also used by user-allocated frame pools - allocating in
- * AVHWFramesContext.pool must return AVBufferRefs which contain
- * an object of this type.
- *
- * The fields of this structure should be set such it can be
- * imported directly by EGL using the EGL_EXT_image_dma_buf_import
- * and EGL_EXT_image_dma_buf_import_modifiers extensions.
- * (Note that the exact layout of a particular format may vary between
- * platforms - we only specify that the same platform should be able
- * to import it.)
- *
- * The total number of planes must not exceed AV_DRM_MAX_PLANES, and
- * the order of the planes by increasing layer index followed by
- * increasing plane index must be the same as the order which would
- * be used for the data pointers in the equivalent software format.
- */
-typedef struct AVDRMFrameDescriptor {
-    /**
-     * Number of DRM objects making up this frame.
-     */
-    int nb_objects;
-    /**
-     * Array of objects making up the frame.
-     */
-    AVDRMObjectDescriptor objects[AV_DRM_MAX_PLANES];
-    /**
-     * Number of layers in the frame.
-     */
-    int nb_layers;
-    /**
-     * Array of layers in the frame.
-     */
-    AVDRMLayerDescriptor layers[AV_DRM_MAX_PLANES];
-} AVDRMFrameDescriptor;
-
-/**
- * DRM device.
- *
- * Allocated as AVHWDeviceContext.hwctx.
- */
-typedef struct AVDRMDeviceContext {
-    /**
-     * File descriptor of DRM device.
-     *
-     * This is used as the device to create frames on, and may also be
-     * used in some derivation and mapping operations.
-     *
-     * If no device is required, set to -1.
-     */
-    int fd;
-} AVDRMDeviceContext;
-
-#endif /* AVUTIL_HWCONTEXT_DRM_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_dxva2.h b/dependencies2013/win32/include/libavutil/hwcontext_dxva2.h
deleted file mode 100644
index e1b79bc0..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_dxva2.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef AVUTIL_HWCONTEXT_DXVA2_H
-#define AVUTIL_HWCONTEXT_DXVA2_H
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_DXVA2.
- *
- * Only fixed-size pools are supported.
- *
- * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer set to a pointer to IDirect3DSurface9.
- */
-
-#include <d3d9.h>
-#include <dxva2api.h>
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVDXVA2DeviceContext {
-    IDirect3DDeviceManager9 *devmgr;
-} AVDXVA2DeviceContext;
-
-/**
- * This struct is allocated as AVHWFramesContext.hwctx
- */
-typedef struct AVDXVA2FramesContext {
-    /**
-     * The surface type (e.g. DXVA2_VideoProcessorRenderTarget or
-     * DXVA2_VideoDecoderRenderTarget). Must be set by the caller.
-     */
-    DWORD               surface_type;
-
-    /**
-     * The surface pool. When an external pool is not provided by the caller,
-     * this will be managed (allocated and filled on init, freed on uninit) by
-     * libavutil.
-     */
-    IDirect3DSurface9 **surfaces;
-    int              nb_surfaces;
-
-    /**
-     * Certain drivers require the decoder to be destroyed before the surfaces.
-     * To allow internally managed pools to work properly in such cases, this
-     * field is provided.
-     *
-     * If it is non-NULL, libavutil will call IDirectXVideoDecoder_Release() on
-     * it just before the internal surface pool is freed.
-     *
-     * This is for convenience only. Some code uses other methods to manage the
-     * decoder reference.
-     */
-    IDirectXVideoDecoder *decoder_to_release;
-} AVDXVA2FramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_DXVA2_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_qsv.h b/dependencies2013/win32/include/libavutil/hwcontext_qsv.h
deleted file mode 100644
index b98d611c..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_qsv.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_QSV_H
-#define AVUTIL_HWCONTEXT_QSV_H
-
-#include <mfx/mfxvideo.h>
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_QSV.
- *
- * This API does not support dynamic frame pools. AVHWFramesContext.pool must
- * contain AVBufferRefs whose data pointer points to an mfxFrameSurface1 struct.
- */
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVQSVDeviceContext {
-    mfxSession session;
-} AVQSVDeviceContext;
-
-/**
- * This struct is allocated as AVHWFramesContext.hwctx
- */
-typedef struct AVQSVFramesContext {
-    mfxFrameSurface1 *surfaces;
-    int            nb_surfaces;
-
-    /**
-     * A combination of MFX_MEMTYPE_* describing the frame pool.
-     */
-    int frame_type;
-} AVQSVFramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_QSV_H */
-
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_vaapi.h b/dependencies2013/win32/include/libavutil/hwcontext_vaapi.h
deleted file mode 100644
index 0b2e071c..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_vaapi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_VAAPI_H
-#define AVUTIL_HWCONTEXT_VAAPI_H
-
-#include <va/va.h>
-
-/**
- * @file
- * API-specific header for AV_HWDEVICE_TYPE_VAAPI.
- *
- * Dynamic frame pools are supported, but note that any pool used as a render
- * target is required to be of fixed size in order to be be usable as an
- * argument to vaCreateContext().
- *
- * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer set to a VASurfaceID.
- */
-
-enum {
-    /**
-     * The quirks field has been set by the user and should not be detected
-     * automatically by av_hwdevice_ctx_init().
-     */
-    AV_VAAPI_DRIVER_QUIRK_USER_SET = (1 << 0),
-    /**
-     * The driver does not destroy parameter buffers when they are used by
-     * vaRenderPicture().  Additional code will be required to destroy them
-     * separately afterwards.
-     */
-    AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS = (1 << 1),
-
-    /**
-     * The driver does not support the VASurfaceAttribMemoryType attribute,
-     * so the surface allocation code will not try to use it.
-     */
-    AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE = (1 << 2),
-
-    /**
-     * The driver does not support surface attributes at all.
-     * The surface allocation code will never pass them to surface allocation,
-     * and the results of the vaQuerySurfaceAttributes() call will be faked.
-     */
-    AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3),
-};
-
-/**
- * VAAPI connection details.
- *
- * Allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVVAAPIDeviceContext {
-    /**
-     * The VADisplay handle, to be filled by the user.
-     */
-    VADisplay display;
-    /**
-     * Driver quirks to apply - this is filled by av_hwdevice_ctx_init(),
-     * with reference to a table of known drivers, unless the
-     * AV_VAAPI_DRIVER_QUIRK_USER_SET bit is already present.  The user
-     * may need to refer to this field when performing any later
-     * operations using VAAPI with the same VADisplay.
-     */
-    unsigned int driver_quirks;
-} AVVAAPIDeviceContext;
-
-/**
- * VAAPI-specific data associated with a frame pool.
- *
- * Allocated as AVHWFramesContext.hwctx.
- */
-typedef struct AVVAAPIFramesContext {
-    /**
-     * Set by the user to apply surface attributes to all surfaces in
-     * the frame pool.  If null, default settings are used.
-     */
-    VASurfaceAttrib *attributes;
-    int           nb_attributes;
-    /**
-     * The surfaces IDs of all surfaces in the pool after creation.
-     * Only valid if AVHWFramesContext.initial_pool_size was positive.
-     * These are intended to be used as the render_targets arguments to
-     * vaCreateContext().
-     */
-    VASurfaceID     *surface_ids;
-    int           nb_surfaces;
-} AVVAAPIFramesContext;
-
-/**
- * VAAPI hardware pipeline configuration details.
- *
- * Allocated with av_hwdevice_hwconfig_alloc().
- */
-typedef struct AVVAAPIHWConfig {
-    /**
-     * ID of a VAAPI pipeline configuration.
-     */
-    VAConfigID config_id;
-} AVVAAPIHWConfig;
-
-#endif /* AVUTIL_HWCONTEXT_VAAPI_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_vdpau.h b/dependencies2013/win32/include/libavutil/hwcontext_vdpau.h
deleted file mode 100644
index 1b7ea1e4..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_vdpau.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_VDPAU_H
-#define AVUTIL_HWCONTEXT_VDPAU_H
-
-#include <vdpau/vdpau.h>
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_VDPAU.
- *
- * This API supports dynamic frame pools. AVHWFramesContext.pool must return
- * AVBufferRefs whose data pointer is a VdpVideoSurface.
- */
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVVDPAUDeviceContext {
-    VdpDevice          device;
-    VdpGetProcAddress *get_proc_address;
-} AVVDPAUDeviceContext;
-
-/**
- * AVHWFramesContext.hwctx is currently not used
- */
-
-#endif /* AVUTIL_HWCONTEXT_VDPAU_H */
diff --git a/dependencies2013/win32/include/libavutil/hwcontext_videotoolbox.h b/dependencies2013/win32/include/libavutil/hwcontext_videotoolbox.h
deleted file mode 100644
index 380918d9..00000000
--- a/dependencies2013/win32/include/libavutil/hwcontext_videotoolbox.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H
-#define AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H
-
-#include <stdint.h>
-
-#include <VideoToolbox/VideoToolbox.h>
-
-#include "pixfmt.h"
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_VIDEOTOOLBOX.
- *
- * This API currently does not support frame allocation, as the raw VideoToolbox
- * API does allocation, and FFmpeg itself never has the need to allocate frames.
- *
- * If the API user sets a custom pool, AVHWFramesContext.pool must return
- * AVBufferRefs whose data pointer is a CVImageBufferRef or CVPixelBufferRef.
- *
- * Currently AVHWDeviceContext.hwctx and AVHWFramesContext.hwctx are always
- * NULL.
- */
-
-/**
- * Convert a VideoToolbox (actually CoreVideo) format to AVPixelFormat.
- * Returns AV_PIX_FMT_NONE if no known equivalent was found.
- */
-enum AVPixelFormat av_map_videotoolbox_format_to_pixfmt(uint32_t cv_fmt);
-
-/**
- * Convert an AVPixelFormat to a VideoToolbox (actually CoreVideo) format.
- * Returns 0 if no known equivalent was found.
- */
-uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt);
-
-#endif /* AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H */
diff --git a/dependencies2013/win32/include/libavutil/imgutils.h b/dependencies2013/win32/include/libavutil/imgutils.h
deleted file mode 100644
index 5b790ecf..00000000
--- a/dependencies2013/win32/include/libavutil/imgutils.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_IMGUTILS_H
-#define AVUTIL_IMGUTILS_H
-
-/**
- * @file
- * misc image utilities
- *
- * @addtogroup lavu_picture
- * @{
- */
-
-#include "avutil.h"
-#include "pixdesc.h"
-#include "rational.h"
-
-/**
- * Compute the max pixel step for each plane of an image with a
- * format described by pixdesc.
- *
- * The pixel step is the distance in bytes between the first byte of
- * the group of bytes which describe a pixel component and the first
- * byte of the successive group in the same plane for the same
- * component.
- *
- * @param max_pixsteps an array which is filled with the max pixel step
- * for each plane. Since a plane may contain different pixel
- * components, the computed max_pixsteps[plane] is relative to the
- * component in the plane with the max pixel step.
- * @param max_pixstep_comps an array which is filled with the component
- * for each plane which has the max pixel step. May be NULL.
- */
-void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
-                                const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Compute the size of an image line with format pix_fmt and width
- * width for the plane plane.
- *
- * @return the computed size in bytes
- */
-int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
-
-/**
- * Fill plane linesizes for an image with pixel format pix_fmt and
- * width width.
- *
- * @param linesizes array to be filled with the linesize for each plane
- * @return >= 0 in case of success, a negative error code otherwise
- */
-int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
-
-/**
- * Fill plane data pointers for an image with pixel format pix_fmt and
- * height height.
- *
- * @param data pointers array to be filled with the pointer for each image plane
- * @param ptr the pointer to a buffer which will contain the image
- * @param linesizes the array containing the linesize for each
- * plane, should be filled by av_image_fill_linesizes()
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes[4]);
-
-/**
- * Allocate an image with size w and h and pixel format pix_fmt, and
- * fill pointers and linesizes accordingly.
- * The allocated image buffer has to be freed by using
- * av_freep(&pointers[0]).
- *
- * @param align the value to use for buffer size alignment
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
-                   int w, int h, enum AVPixelFormat pix_fmt, int align);
-
-/**
- * Copy image plane from src to dst.
- * That is, copy "height" number of lines of "bytewidth" bytes each.
- * The first byte of each successive line is separated by *_linesize
- * bytes.
- *
- * bytewidth must be contained by both absolute values of dst_linesize
- * and src_linesize, otherwise the function behavior is undefined.
- *
- * @param dst_linesize linesize for the image plane in dst
- * @param src_linesize linesize for the image plane in src
- */
-void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
-                         const uint8_t *src, int src_linesize,
-                         int bytewidth, int height);
-
-/**
- * Copy image in src_data to dst_data.
- *
- * @param dst_linesizes linesizes for the image in dst_data
- * @param src_linesizes linesizes for the image in src_data
- */
-void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
-                   const uint8_t *src_data[4], const int src_linesizes[4],
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Copy image data located in uncacheable (e.g. GPU mapped) memory. Where
- * available, this function will use special functionality for reading from such
- * memory, which may result in greatly improved performance compared to plain
- * av_image_copy().
- *
- * The data pointers and the linesizes must be aligned to the maximum required
- * by the CPU architecture.
- *
- * @note The linesize parameters have the type ptrdiff_t here, while they are
- *       int for av_image_copy().
- * @note On x86, the linesizes currently need to be aligned to the cacheline
- *       size (i.e. 64) to get improved performance.
- */
-void av_image_copy_uc_from(uint8_t *dst_data[4],       const ptrdiff_t dst_linesizes[4],
-                           const uint8_t *src_data[4], const ptrdiff_t src_linesizes[4],
-                           enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Setup the data pointers and linesizes based on the specified image
- * parameters and the provided array.
- *
- * The fields of the given image are filled in by using the src
- * address which points to the image data buffer. Depending on the
- * specified pixel format, one or multiple image data pointers and
- * line sizes will be set.  If a planar format is specified, several
- * pointers will be set pointing to the different picture planes and
- * the line sizes of the different planes will be stored in the
- * lines_sizes array. Call with src == NULL to get the required
- * size for the src buffer.
- *
- * To allocate the buffer and fill in the dst_data and dst_linesize in
- * one call, use av_image_alloc().
- *
- * @param dst_data      data pointers to be filled in
- * @param dst_linesize  linesizes for the image in dst_data to be filled in
- * @param src           buffer which will contain or contains the actual image data, can be NULL
- * @param pix_fmt       the pixel format of the image
- * @param width         the width of the image in pixels
- * @param height        the height of the image in pixels
- * @param align         the value used in src for linesize alignment
- * @return the size in bytes required for src, a negative error code
- * in case of failure
- */
-int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
-                         const uint8_t *src,
-                         enum AVPixelFormat pix_fmt, int width, int height, int align);
-
-/**
- * Return the size in bytes of the amount of data required to store an
- * image with the given parameters.
- *
- * @param pix_fmt  the pixel format of the image
- * @param width    the width of the image in pixels
- * @param height   the height of the image in pixels
- * @param align    the assumed linesize alignment
- * @return the buffer size in bytes, a negative error code in case of failure
- */
-int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, int align);
-
-/**
- * Copy image data from an image into a buffer.
- *
- * av_image_get_buffer_size() can be used to compute the required size
- * for the buffer to fill.
- *
- * @param dst           a buffer into which picture data will be copied
- * @param dst_size      the size in bytes of dst
- * @param src_data      pointers containing the source image data
- * @param src_linesize  linesizes for the image in src_data
- * @param pix_fmt       the pixel format of the source image
- * @param width         the width of the source image in pixels
- * @param height        the height of the source image in pixels
- * @param align         the assumed linesize alignment for dst
- * @return the number of bytes written to dst, or a negative value
- * (error code) on error
- */
-int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
-                            const uint8_t * const src_data[4], const int src_linesize[4],
-                            enum AVPixelFormat pix_fmt, int width, int height, int align);
-
-/**
- * Check if the given dimension of an image is valid, meaning that all
- * bytes of the image can be addressed with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param log_offset the offset to sum to the log level for logging with log_ctx
- * @param log_ctx the parent logging context, it may be NULL
- * @return >= 0 if valid, a negative error code otherwise
- */
-int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
-
-/**
- * Check if the given dimension of an image is valid, meaning that all
- * bytes of a plane of an image with the specified pix_fmt can be addressed
- * with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param max_pixels the maximum number of pixels the user wants to accept
- * @param pix_fmt the pixel format, can be AV_PIX_FMT_NONE if unknown.
- * @param log_offset the offset to sum to the log level for logging with log_ctx
- * @param log_ctx the parent logging context, it may be NULL
- * @return >= 0 if valid, a negative error code otherwise
- */
-int av_image_check_size2(unsigned int w, unsigned int h, int64_t max_pixels, enum AVPixelFormat pix_fmt, int log_offset, void *log_ctx);
-
-/**
- * Check if the given sample aspect ratio of an image is valid.
- *
- * It is considered invalid if the denominator is 0 or if applying the ratio
- * to the image size would make the smaller dimension less than 1. If the
- * sar numerator is 0, it is considered unknown and will return as valid.
- *
- * @param w width of the image
- * @param h height of the image
- * @param sar sample aspect ratio of the image
- * @return 0 if valid, a negative AVERROR code otherwise
- */
-int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar);
-
-/**
- * Overwrite the image data with black. This is suitable for filling a
- * sub-rectangle of an image, meaning the padding between the right most pixel
- * and the left most pixel on the next line will not be overwritten. For some
- * formats, the image size might be rounded up due to inherent alignment.
- *
- * If the pixel format has alpha, the alpha is cleared to opaque.
- *
- * This can return an error if the pixel format is not supported. Normally, all
- * non-hwaccel pixel formats should be supported.
- *
- * Passing NULL for dst_data is allowed. Then the function returns whether the
- * operation would have succeeded. (It can return an error if the pix_fmt is
- * not supported.)
- *
- * @param dst_data      data pointers to destination image
- * @param dst_linesize  linesizes for the destination image
- * @param pix_fmt       the pixel format of the image
- * @param range         the color range of the image (important for colorspaces such as YUV)
- * @param width         the width of the image in pixels
- * @param height        the height of the image in pixels
- * @return 0 if the image data was cleared, a negative AVERROR code otherwise
- */
-int av_image_fill_black(uint8_t *dst_data[4], const ptrdiff_t dst_linesize[4],
-                        enum AVPixelFormat pix_fmt, enum AVColorRange range,
-                        int width, int height);
-
-/**
- * @}
- */
-
-
-#endif /* AVUTIL_IMGUTILS_H */
diff --git a/dependencies2013/win32/include/libavutil/intfloat.h b/dependencies2013/win32/include/libavutil/intfloat.h
deleted file mode 100644
index fe3d7ec4..00000000
--- a/dependencies2013/win32/include/libavutil/intfloat.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_H
-#define AVUTIL_INTFLOAT_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-union av_intfloat32 {
-    uint32_t i;
-    float    f;
-};
-
-union av_intfloat64 {
-    uint64_t i;
-    double   f;
-};
-
-/**
- * Reinterpret a 32-bit integer as a float.
- */
-static av_always_inline float av_int2float(uint32_t i)
-{
-    union av_intfloat32 v;
-    v.i = i;
-    return v.f;
-}
-
-/**
- * Reinterpret a float as a 32-bit integer.
- */
-static av_always_inline uint32_t av_float2int(float f)
-{
-    union av_intfloat32 v;
-    v.f = f;
-    return v.i;
-}
-
-/**
- * Reinterpret a 64-bit integer as a double.
- */
-static av_always_inline double av_int2double(uint64_t i)
-{
-    union av_intfloat64 v;
-    v.i = i;
-    return v.f;
-}
-
-/**
- * Reinterpret a double as a 64-bit integer.
- */
-static av_always_inline uint64_t av_double2int(double f)
-{
-    union av_intfloat64 v;
-    v.f = f;
-    return v.i;
-}
-
-#endif /* AVUTIL_INTFLOAT_H */
diff --git a/dependencies2013/win32/include/libavutil/intreadwrite.h b/dependencies2013/win32/include/libavutil/intreadwrite.h
deleted file mode 100644
index d54d4b91..00000000
--- a/dependencies2013/win32/include/libavutil/intreadwrite.h
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTREADWRITE_H
-#define AVUTIL_INTREADWRITE_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-#include "bswap.h"
-
-typedef union {
-    uint64_t u64;
-    uint32_t u32[2];
-    uint16_t u16[4];
-    uint8_t  u8 [8];
-    double   f64;
-    float    f32[2];
-} av_alias av_alias64;
-
-typedef union {
-    uint32_t u32;
-    uint16_t u16[2];
-    uint8_t  u8 [4];
-    float    f32;
-} av_alias av_alias32;
-
-typedef union {
-    uint16_t u16;
-    uint8_t  u8 [2];
-} av_alias av_alias16;
-
-/*
- * Arch-specific headers can provide any combination of
- * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
- * Preprocessor symbols must be defined, even if these are implemented
- * as inline functions.
- *
- * R/W means read/write, B/L/N means big/little/native endianness.
- * The following macros require aligned access, compared to their
- * unaligned variants: AV_(COPY|SWAP|ZERO)(64|128), AV_[RW]N[8-64]A.
- * Incorrect usage may range from abysmal performance to crash
- * depending on the platform.
- *
- * The unaligned variants are AV_[RW][BLN][8-64] and AV_COPY*U.
- */
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/intreadwrite.h"
-#elif ARCH_AVR32
-#   include "avr32/intreadwrite.h"
-#elif ARCH_MIPS
-#   include "mips/intreadwrite.h"
-#elif ARCH_PPC
-#   include "ppc/intreadwrite.h"
-#elif ARCH_TOMI
-#   include "tomi/intreadwrite.h"
-#elif ARCH_X86
-#   include "x86/intreadwrite.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-/*
- * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
- */
-
-#if AV_HAVE_BIGENDIAN
-
-#   if    defined(AV_RN16) && !defined(AV_RB16)
-#       define AV_RB16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RB16)
-#       define AV_RN16(p) AV_RB16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WB16)
-#       define AV_WB16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WB16)
-#       define AV_WN16(p, v) AV_WB16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RB24)
-#       define AV_RB24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RB24)
-#       define AV_RN24(p) AV_RB24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WB24)
-#       define AV_WB24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WB24)
-#       define AV_WN24(p, v) AV_WB24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RB32)
-#       define AV_RB32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RB32)
-#       define AV_RN32(p) AV_RB32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WB32)
-#       define AV_WB32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WB32)
-#       define AV_WN32(p, v) AV_WB32(p, v)
-#   endif
-
-#   if    defined(AV_RN48) && !defined(AV_RB48)
-#       define AV_RB48(p) AV_RN48(p)
-#   elif !defined(AV_RN48) &&  defined(AV_RB48)
-#       define AV_RN48(p) AV_RB48(p)
-#   endif
-
-#   if    defined(AV_WN48) && !defined(AV_WB48)
-#       define AV_WB48(p, v) AV_WN48(p, v)
-#   elif !defined(AV_WN48) &&  defined(AV_WB48)
-#       define AV_WN48(p, v) AV_WB48(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RB64)
-#       define AV_RB64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RB64)
-#       define AV_RN64(p) AV_RB64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WB64)
-#       define AV_WB64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WB64)
-#       define AV_WN64(p, v) AV_WB64(p, v)
-#   endif
-
-#else /* AV_HAVE_BIGENDIAN */
-
-#   if    defined(AV_RN16) && !defined(AV_RL16)
-#       define AV_RL16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RL16)
-#       define AV_RN16(p) AV_RL16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WL16)
-#       define AV_WL16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WL16)
-#       define AV_WN16(p, v) AV_WL16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RL24)
-#       define AV_RL24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RL24)
-#       define AV_RN24(p) AV_RL24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WL24)
-#       define AV_WL24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WL24)
-#       define AV_WN24(p, v) AV_WL24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RL32)
-#       define AV_RL32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RL32)
-#       define AV_RN32(p) AV_RL32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WL32)
-#       define AV_WL32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WL32)
-#       define AV_WN32(p, v) AV_WL32(p, v)
-#   endif
-
-#   if    defined(AV_RN48) && !defined(AV_RL48)
-#       define AV_RL48(p) AV_RN48(p)
-#   elif !defined(AV_RN48) &&  defined(AV_RL48)
-#       define AV_RN48(p) AV_RL48(p)
-#   endif
-
-#   if    defined(AV_WN48) && !defined(AV_WL48)
-#       define AV_WL48(p, v) AV_WN48(p, v)
-#   elif !defined(AV_WN48) &&  defined(AV_WL48)
-#       define AV_WN48(p, v) AV_WL48(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RL64)
-#       define AV_RL64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RL64)
-#       define AV_RN64(p) AV_RL64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WL64)
-#       define AV_WL64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WL64)
-#       define AV_WN64(p, v) AV_WL64(p, v)
-#   endif
-
-#endif /* !AV_HAVE_BIGENDIAN */
-
-/*
- * Define AV_[RW]N helper macros to simplify definitions not provided
- * by per-arch headers.
- */
-
-#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
-
-union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
-union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
-union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
-
-#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
-#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
-
-#elif defined(__DECC)
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
-#elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64)) && AV_HAVE_FAST_UNALIGNED
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
-#elif AV_HAVE_FAST_UNALIGNED
-
-#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
-#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#else
-
-#ifndef AV_RB16
-#   define AV_RB16(x)                           \
-    ((((const uint8_t*)(x))[0] << 8) |          \
-      ((const uint8_t*)(x))[1])
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, val) do {                 \
-        uint16_t d = (val);                     \
-        ((uint8_t*)(p))[1] = (d);               \
-        ((uint8_t*)(p))[0] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(x)                           \
-    ((((const uint8_t*)(x))[1] << 8) |          \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, val) do {                 \
-        uint16_t d = (val);                     \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
-               (((const uint8_t*)(x))[1] << 16) |    \
-               (((const uint8_t*)(x))[2] <<  8) |    \
-                ((const uint8_t*)(x))[3])
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, val) do {                 \
-        uint32_t d = (val);                     \
-        ((uint8_t*)(p))[3] = (d);               \
-        ((uint8_t*)(p))[2] = (d)>>8;            \
-        ((uint8_t*)(p))[1] = (d)>>16;           \
-        ((uint8_t*)(p))[0] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
-               (((const uint8_t*)(x))[2] << 16) |    \
-               (((const uint8_t*)(x))[1] <<  8) |    \
-                ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, val) do {                 \
-        uint32_t d = (val);                     \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[7])
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, val) do {                 \
-        uint64_t d = (val);                     \
-        ((uint8_t*)(p))[7] = (d);               \
-        ((uint8_t*)(p))[6] = (d)>>8;            \
-        ((uint8_t*)(p))[5] = (d)>>16;           \
-        ((uint8_t*)(p))[4] = (d)>>24;           \
-        ((uint8_t*)(p))[3] = (d)>>32;           \
-        ((uint8_t*)(p))[2] = (d)>>40;           \
-        ((uint8_t*)(p))[1] = (d)>>48;           \
-        ((uint8_t*)(p))[0] = (d)>>56;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, val) do {                 \
-        uint64_t d = (val);                     \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-        ((uint8_t*)(p))[4] = (d)>>32;           \
-        ((uint8_t*)(p))[5] = (d)>>40;           \
-        ((uint8_t*)(p))[6] = (d)>>48;           \
-        ((uint8_t*)(p))[7] = (d)>>56;           \
-    } while(0)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RN(s, p)    AV_RB##s(p)
-#   define AV_WN(s, p, v) AV_WB##s(p, v)
-#else
-#   define AV_RN(s, p)    AV_RL##s(p)
-#   define AV_WN(s, p, v) AV_WL##s(p, v)
-#endif
-
-#endif /* HAVE_FAST_UNALIGNED */
-
-#ifndef AV_RN16
-#   define AV_RN16(p) AV_RN(16, p)
-#endif
-
-#ifndef AV_RN32
-#   define AV_RN32(p) AV_RN(32, p)
-#endif
-
-#ifndef AV_RN64
-#   define AV_RN64(p) AV_RN(64, p)
-#endif
-
-#ifndef AV_WN16
-#   define AV_WN16(p, v) AV_WN(16, p, v)
-#endif
-
-#ifndef AV_WN32
-#   define AV_WN32(p, v) AV_WN(32, p, v)
-#endif
-
-#ifndef AV_WN64
-#   define AV_WN64(p, v) AV_WN(64, p, v)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RB(s, p)    AV_RN##s(p)
-#   define AV_WB(s, p, v) AV_WN##s(p, v)
-#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#else
-#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#   define AV_RL(s, p)    AV_RN##s(p)
-#   define AV_WL(s, p, v) AV_WN##s(p, v)
-#endif
-
-#define AV_RB8(x)     (((const uint8_t*)(x))[0])
-#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
-
-#define AV_RL8(x)     AV_RB8(x)
-#define AV_WL8(p, d)  AV_WB8(p, d)
-
-#ifndef AV_RB16
-#   define AV_RB16(p)    AV_RB(16, p)
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, v) AV_WB(16, p, v)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(p)    AV_RL(16, p)
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, v) AV_WL(16, p, v)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(p)    AV_RB(32, p)
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, v) AV_WB(32, p, v)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(p)    AV_RL(32, p)
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, v) AV_WL(32, p, v)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(p)    AV_RB(64, p)
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, v) AV_WB(64, p, v)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(p)    AV_RL(64, p)
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, v) AV_WL(64, p, v)
-#endif
-
-#ifndef AV_RB24
-#   define AV_RB24(x)                           \
-    ((((const uint8_t*)(x))[0] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[2])
-#endif
-#ifndef AV_WB24
-#   define AV_WB24(p, d) do {                   \
-        ((uint8_t*)(p))[2] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[0] = (d)>>16;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL24
-#   define AV_RL24(x)                           \
-    ((((const uint8_t*)(x))[2] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL24
-#   define AV_WL24(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-    } while(0)
-#endif
-
-#ifndef AV_RB48
-#   define AV_RB48(x)                                     \
-    (((uint64_t)((const uint8_t*)(x))[0] << 40) |         \
-     ((uint64_t)((const uint8_t*)(x))[1] << 32) |         \
-     ((uint64_t)((const uint8_t*)(x))[2] << 24) |         \
-     ((uint64_t)((const uint8_t*)(x))[3] << 16) |         \
-     ((uint64_t)((const uint8_t*)(x))[4] <<  8) |         \
-      (uint64_t)((const uint8_t*)(x))[5])
-#endif
-#ifndef AV_WB48
-#   define AV_WB48(p, darg) do {                \
-        uint64_t d = (darg);                    \
-        ((uint8_t*)(p))[5] = (d);               \
-        ((uint8_t*)(p))[4] = (d)>>8;            \
-        ((uint8_t*)(p))[3] = (d)>>16;           \
-        ((uint8_t*)(p))[2] = (d)>>24;           \
-        ((uint8_t*)(p))[1] = (d)>>32;           \
-        ((uint8_t*)(p))[0] = (d)>>40;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL48
-#   define AV_RL48(x)                                     \
-    (((uint64_t)((const uint8_t*)(x))[5] << 40) |         \
-     ((uint64_t)((const uint8_t*)(x))[4] << 32) |         \
-     ((uint64_t)((const uint8_t*)(x))[3] << 24) |         \
-     ((uint64_t)((const uint8_t*)(x))[2] << 16) |         \
-     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |         \
-      (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL48
-#   define AV_WL48(p, darg) do {                \
-        uint64_t d = (darg);                    \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-        ((uint8_t*)(p))[4] = (d)>>32;           \
-        ((uint8_t*)(p))[5] = (d)>>40;           \
-    } while(0)
-#endif
-
-/*
- * The AV_[RW]NA macros access naturally aligned data
- * in a type-safe way.
- */
-
-#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
-#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#ifndef AV_RN16A
-#   define AV_RN16A(p) AV_RNA(16, p)
-#endif
-
-#ifndef AV_RN32A
-#   define AV_RN32A(p) AV_RNA(32, p)
-#endif
-
-#ifndef AV_RN64A
-#   define AV_RN64A(p) AV_RNA(64, p)
-#endif
-
-#ifndef AV_WN16A
-#   define AV_WN16A(p, v) AV_WNA(16, p, v)
-#endif
-
-#ifndef AV_WN32A
-#   define AV_WN32A(p, v) AV_WNA(32, p, v)
-#endif
-
-#ifndef AV_WN64A
-#   define AV_WN64A(p, v) AV_WNA(64, p, v)
-#endif
-
-/*
- * The AV_COPYxxU macros are suitable for copying data to/from unaligned
- * memory locations.
- */
-
-#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
-
-#ifndef AV_COPY16U
-#   define AV_COPY16U(d, s) AV_COPYU(16, d, s)
-#endif
-
-#ifndef AV_COPY32U
-#   define AV_COPY32U(d, s) AV_COPYU(32, d, s)
-#endif
-
-#ifndef AV_COPY64U
-#   define AV_COPY64U(d, s) AV_COPYU(64, d, s)
-#endif
-
-#ifndef AV_COPY128U
-#   define AV_COPY128U(d, s)                                    \
-    do {                                                        \
-        AV_COPY64U(d, s);                                       \
-        AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8);     \
-    } while(0)
-#endif
-
-/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
- * naturally aligned. They may be implemented using MMX,
- * so emms_c() must be called before using any float code
- * afterwards.
- */
-
-#define AV_COPY(n, d, s) \
-    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
-
-#ifndef AV_COPY16
-#   define AV_COPY16(d, s) AV_COPY(16, d, s)
-#endif
-
-#ifndef AV_COPY32
-#   define AV_COPY32(d, s) AV_COPY(32, d, s)
-#endif
-
-#ifndef AV_COPY64
-#   define AV_COPY64(d, s) AV_COPY(64, d, s)
-#endif
-
-#ifndef AV_COPY128
-#   define AV_COPY128(d, s)                    \
-    do {                                       \
-        AV_COPY64(d, s);                       \
-        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
-    } while(0)
-#endif
-
-#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
-
-#ifndef AV_SWAP64
-#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
-#endif
-
-#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
-
-#ifndef AV_ZERO16
-#   define AV_ZERO16(d) AV_ZERO(16, d)
-#endif
-
-#ifndef AV_ZERO32
-#   define AV_ZERO32(d) AV_ZERO(32, d)
-#endif
-
-#ifndef AV_ZERO64
-#   define AV_ZERO64(d) AV_ZERO(64, d)
-#endif
-
-#ifndef AV_ZERO128
-#   define AV_ZERO128(d)         \
-    do {                         \
-        AV_ZERO64(d);            \
-        AV_ZERO64((char*)(d)+8); \
-    } while(0)
-#endif
-
-#endif /* AVUTIL_INTREADWRITE_H */
diff --git a/dependencies2013/win32/include/libavutil/lfg.h b/dependencies2013/win32/include/libavutil/lfg.h
deleted file mode 100644
index 03f779ad..00000000
--- a/dependencies2013/win32/include/libavutil/lfg.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Lagged Fibonacci PRNG
- * Copyright (c) 2008 Michael Niedermayer
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LFG_H
-#define AVUTIL_LFG_H
-
-#include <stdint.h>
-
-typedef struct AVLFG {
-    unsigned int state[64];
-    int index;
-} AVLFG;
-
-void av_lfg_init(AVLFG *c, unsigned int seed);
-
-/**
- * Seed the state of the ALFG using binary data.
- *
- * Return value: 0 on success, negative value (AVERROR) on failure.
- */
-int av_lfg_init_from_data(AVLFG *c, const uint8_t *data, unsigned int length);
-
-/**
- * Get the next random unsigned 32-bit number using an ALFG.
- *
- * Please also consider a simple LCG like state= state*1664525+1013904223,
- * it may be good enough and faster for your specific use case.
- */
-static inline unsigned int av_lfg_get(AVLFG *c){
-    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
-    return c->state[c->index++ & 63];
-}
-
-/**
- * Get the next random unsigned 32-bit number using a MLFG.
- *
- * Please also consider av_lfg_get() above, it is faster.
- */
-static inline unsigned int av_mlfg_get(AVLFG *c){
-    unsigned int a= c->state[(c->index-55) & 63];
-    unsigned int b= c->state[(c->index-24) & 63];
-    return c->state[c->index++ & 63] = 2*a*b+a+b;
-}
-
-/**
- * Get the next two numbers generated by a Box-Muller Gaussian
- * generator using the random numbers issued by lfg.
- *
- * @param out array where the two generated numbers are placed
- */
-void av_bmg_get(AVLFG *lfg, double out[2]);
-
-#endif /* AVUTIL_LFG_H */
diff --git a/dependencies2013/win32/include/libavutil/log.h b/dependencies2013/win32/include/libavutil/log.h
deleted file mode 100644
index f0a57385..00000000
--- a/dependencies2013/win32/include/libavutil/log.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LOG_H
-#define AVUTIL_LOG_H
-
-#include <stdarg.h>
-#include "avutil.h"
-#include "attributes.h"
-#include "version.h"
-
-typedef enum {
-    AV_CLASS_CATEGORY_NA = 0,
-    AV_CLASS_CATEGORY_INPUT,
-    AV_CLASS_CATEGORY_OUTPUT,
-    AV_CLASS_CATEGORY_MUXER,
-    AV_CLASS_CATEGORY_DEMUXER,
-    AV_CLASS_CATEGORY_ENCODER,
-    AV_CLASS_CATEGORY_DECODER,
-    AV_CLASS_CATEGORY_FILTER,
-    AV_CLASS_CATEGORY_BITSTREAM_FILTER,
-    AV_CLASS_CATEGORY_SWSCALER,
-    AV_CLASS_CATEGORY_SWRESAMPLER,
-    AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40,
-    AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
-    AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT,
-    AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT,
-    AV_CLASS_CATEGORY_DEVICE_OUTPUT,
-    AV_CLASS_CATEGORY_DEVICE_INPUT,
-    AV_CLASS_CATEGORY_NB  ///< not part of ABI/API
-}AVClassCategory;
-
-#define AV_IS_INPUT_DEVICE(category) \
-    (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \
-     ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \
-     ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT))
-
-#define AV_IS_OUTPUT_DEVICE(category) \
-    (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \
-     ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \
-     ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT))
-
-struct AVOptionRanges;
-
-/**
- * Describe the class of an AVClass context structure. That is an
- * arbitrary struct of which the first field is a pointer to an
- * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
- */
-typedef struct AVClass {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @see av_set_default_options()
-     */
-    const struct AVOption *option;
-
-    /**
-     * LIBAVUTIL_VERSION with which this structure was created.
-     * This is used to allow fields to be added without requiring major
-     * version bumps everywhere.
-     */
-
-    int version;
-
-    /**
-     * Offset in the structure where log_level_offset is stored.
-     * 0 means there is no such variable
-     */
-    int log_level_offset_offset;
-
-    /**
-     * Offset in the structure where a pointer to the parent context for
-     * logging is stored. For example a decoder could pass its AVCodecContext
-     * to eval as such a parent context, which an av_log() implementation
-     * could then leverage to display the parent context.
-     * The offset can be NULL.
-     */
-    int parent_log_context_offset;
-
-    /**
-     * Return next AVOptions-enabled child or NULL
-     */
-    void* (*child_next)(void *obj, void *prev);
-
-    /**
-     * Return an AVClass corresponding to the next potential
-     * AVOptions-enabled child.
-     *
-     * The difference between child_next and this is that
-     * child_next iterates over _already existing_ objects, while
-     * child_class_next iterates over _all possible_ children.
-     */
-    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
-
-    /**
-     * Category used for visualization (like color)
-     * This is only set if the category is equal for all objects using this class.
-     * available since version (51 << 16 | 56 << 8 | 100)
-     */
-    AVClassCategory category;
-
-    /**
-     * Callback to return the category.
-     * available since version (51 << 16 | 59 << 8 | 100)
-     */
-    AVClassCategory (*get_category)(void* ctx);
-
-    /**
-     * Callback to return the supported/allowed ranges.
-     * available since version (52.12)
-     */
-    int (*query_ranges)(struct AVOptionRanges **, void *obj, const char *key, int flags);
-} AVClass;
-
-/**
- * @addtogroup lavu_log
- *
- * @{
- *
- * @defgroup lavu_log_constants Logging Constants
- *
- * @{
- */
-
-/**
- * Print no output.
- */
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-/**
- * Standard information.
- */
-#define AV_LOG_INFO     32
-
-/**
- * Detailed information.
- */
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * Extremely verbose debugging, useful for libav* development.
- */
-#define AV_LOG_TRACE    56
-
-#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET)
-
-/**
- * @}
- */
-
-/**
- * Sets additional colors for extended debugging sessions.
- * @code
-   av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n");
-   @endcode
- * Requires 256color terminal support. Uses outside debugging is not
- * recommended.
- */
-#define AV_LOG_C(x) ((x) << 8)
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different logging callback
- * function.
- * @see av_log_set_callback
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct or NULL if general log.
- * @param level The importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant".
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- */
-void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
-
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different logging callback
- * function.
- * @see av_log_set_callback
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct.
- * @param level The importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant".
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- * @param vl The arguments referenced by the format string.
- */
-void av_vlog(void *avcl, int level, const char *fmt, va_list vl);
-
-/**
- * Get the current log level
- *
- * @see lavu_log_constants
- *
- * @return Current log level
- */
-int av_log_get_level(void);
-
-/**
- * Set the log level
- *
- * @see lavu_log_constants
- *
- * @param level Logging level
- */
-void av_log_set_level(int level);
-
-/**
- * Set the logging callback
- *
- * @note The callback must be thread safe, even if the application does not use
- *       threads itself as some codecs are multithreaded.
- *
- * @see av_log_default_callback
- *
- * @param callback A logging function with a compatible signature.
- */
-void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
-
-/**
- * Default logging callback
- *
- * It prints the message to stderr, optionally colorizing it.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct.
- * @param level The importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant".
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- * @param vl The arguments referenced by the format string.
- */
-void av_log_default_callback(void *avcl, int level, const char *fmt,
-                             va_list vl);
-
-/**
- * Return the context name
- *
- * @param  ctx The AVClass context
- *
- * @return The AVClass class_name
- */
-const char* av_default_item_name(void* ctx);
-AVClassCategory av_default_get_category(void *ptr);
-
-/**
- * Format a line of log the same way as the default callback.
- * @param line          buffer to receive the formatted line
- * @param line_size     size of the buffer
- * @param print_prefix  used to store whether the prefix must be printed;
- *                      must point to a persistent integer initially set to 1
- */
-void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
-                        char *line, int line_size, int *print_prefix);
-
-/**
- * Format a line of log the same way as the default callback.
- * @param line          buffer to receive the formatted line;
- *                      may be NULL if line_size is 0
- * @param line_size     size of the buffer; at most line_size-1 characters will
- *                      be written to the buffer, plus one null terminator
- * @param print_prefix  used to store whether the prefix must be printed;
- *                      must point to a persistent integer initially set to 1
- * @return Returns a negative value if an error occurred, otherwise returns
- *         the number of characters that would have been written for a
- *         sufficiently large buffer, not including the terminating null
- *         character. If the return value is not less than line_size, it means
- *         that the log message was truncated to fit the buffer.
- */
-int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
-                        char *line, int line_size, int *print_prefix);
-
-#if FF_API_DLOG
-/**
- * av_dlog macros
- * @deprecated unused
- * Useful to print debug messages that shouldn't get compiled in normally.
- */
-
-#ifdef DEBUG
-#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#    define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
-#endif
-#endif /* FF_API_DLOG */
-
-/**
- * Skip repeated messages, this requires the user app to use av_log() instead of
- * (f)printf as the 2 would otherwise interfere and lead to
- * "Last message repeated x times" messages below (f)printf messages with some
- * bad luck.
- * Also to receive the last, "last repeated" line if any, the user app must
- * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
- */
-#define AV_LOG_SKIP_REPEATED 1
-
-/**
- * Include the log severity in messages originating from codecs.
- *
- * Results in messages such as:
- * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts
- */
-#define AV_LOG_PRINT_LEVEL 2
-
-void av_log_set_flags(int arg);
-int av_log_get_flags(void);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LOG_H */
diff --git a/dependencies2013/win32/include/libavutil/lzo.h b/dependencies2013/win32/include/libavutil/lzo.h
deleted file mode 100644
index c0340399..00000000
--- a/dependencies2013/win32/include/libavutil/lzo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
- * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED  1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL     2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR           8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING   8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff --git a/dependencies2013/win32/include/libavutil/macros.h b/dependencies2013/win32/include/libavutil/macros.h
deleted file mode 100644
index 2007ee56..00000000
--- a/dependencies2013/win32/include/libavutil/macros.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu
- * Utility Preprocessor macros
- */
-
-#ifndef AVUTIL_MACROS_H
-#define AVUTIL_MACROS_H
-
-/**
- * @addtogroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-/**
- * @}
- */
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-#endif /* AVUTIL_MACROS_H */
diff --git a/dependencies2013/win32/include/libavutil/mastering_display_metadata.h b/dependencies2013/win32/include/libavutil/mastering_display_metadata.h
deleted file mode 100644
index 847b0b62..00000000
--- a/dependencies2013/win32/include/libavutil/mastering_display_metadata.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Copyright (c) 2016 Neil Birkbeck <neil.birkbeck@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MASTERING_DISPLAY_METADATA_H
-#define AVUTIL_MASTERING_DISPLAY_METADATA_H
-
-#include "frame.h"
-#include "rational.h"
-
-
-/**
- * Mastering display metadata capable of representing the color volume of
- * the display used to master the content (SMPTE 2086:2014).
- *
- * To be used as payload of a AVFrameSideData or AVPacketSideData with the
- * appropriate type.
- *
- * @note The struct should be allocated with av_mastering_display_metadata_alloc()
- *       and its size is not a part of the public ABI.
- */
-typedef struct AVMasteringDisplayMetadata {
-    /**
-     * CIE 1931 xy chromaticity coords of color primaries (r, g, b order).
-     */
-    AVRational display_primaries[3][2];
-
-    /**
-     * CIE 1931 xy chromaticity coords of white point.
-     */
-    AVRational white_point[2];
-
-    /**
-     * Min luminance of mastering display (cd/m^2).
-     */
-    AVRational min_luminance;
-
-    /**
-     * Max luminance of mastering display (cd/m^2).
-     */
-    AVRational max_luminance;
-
-    /**
-     * Flag indicating whether the display primaries (and white point) are set.
-     */
-    int has_primaries;
-
-    /**
-     * Flag indicating whether the luminance (min_ and max_) have been set.
-     */
-    int has_luminance;
-
-} AVMasteringDisplayMetadata;
-
-/**
- * Allocate an AVMasteringDisplayMetadata structure and set its fields to
- * default values. The resulting struct can be freed using av_freep().
- *
- * @return An AVMasteringDisplayMetadata filled with default values or NULL
- *         on failure.
- */
-AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void);
-
-/**
- * Allocate a complete AVMasteringDisplayMetadata and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVMasteringDisplayMetadata structure to be filled by caller.
- */
-AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame);
-
-/**
- * Content light level needed by to transmit HDR over HDMI (CTA-861.3).
- *
- * To be used as payload of a AVFrameSideData or AVPacketSideData with the
- * appropriate type.
- *
- * @note The struct should be allocated with av_content_light_metadata_alloc()
- *       and its size is not a part of the public ABI.
- */
-typedef struct AVContentLightMetadata {
-    /**
-     * Max content light level (cd/m^2).
-     */
-    unsigned MaxCLL;
-
-    /**
-     * Max average light level per frame (cd/m^2).
-     */
-    unsigned MaxFALL;
-} AVContentLightMetadata;
-
-/**
- * Allocate an AVContentLightMetadata structure and set its fields to
- * default values. The resulting struct can be freed using av_freep().
- *
- * @return An AVContentLightMetadata filled with default values or NULL
- *         on failure.
- */
-AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size);
-
-/**
- * Allocate a complete AVContentLightMetadata and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVContentLightMetadata structure to be filled by caller.
- */
-AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame);
-
-#endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */
diff --git a/dependencies2013/win32/include/libavutil/mathematics.h b/dependencies2013/win32/include/libavutil/mathematics.h
deleted file mode 100644
index 54901800..00000000
--- a/dependencies2013/win32/include/libavutil/mathematics.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * copyright (c) 2005-2012 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @addtogroup lavu_math
- * Mathematical utilities for working with timestamp and time base.
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-#include "intfloat.h"
-
-#ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
-#endif
-#ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
-#endif
-#ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
-#endif
-#ifndef M_LOG2_10
-#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
-#endif
-#ifndef M_PHI
-#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
-#endif
-#ifndef M_PI
-#define M_PI           3.14159265358979323846  /* pi */
-#endif
-#ifndef M_PI_2
-#define M_PI_2         1.57079632679489661923  /* pi/2 */
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
-#endif
-#ifndef NAN
-#define NAN            av_int2float(0x7fc00000)
-#endif
-#ifndef INFINITY
-#define INFINITY       av_int2float(0x7f800000)
-#endif
-
-/**
- * @addtogroup lavu_math
- *
- * @{
- */
-
-/**
- * Rounding methods.
- */
-enum AVRounding {
-    AV_ROUND_ZERO     = 0, ///< Round toward zero.
-    AV_ROUND_INF      = 1, ///< Round away from zero.
-    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
-    AV_ROUND_UP       = 3, ///< Round toward +infinity.
-    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
-    /**
-     * Flag telling rescaling functions to pass `INT64_MIN`/`MAX` through
-     * unchanged, avoiding special cases for #AV_NOPTS_VALUE.
-     *
-     * Unlike other values of the enumeration AVRounding, this value is a
-     * bitmask that must be used in conjunction with another value of the
-     * enumeration through a bitwise OR, in order to set behavior for normal
-     * cases.
-     *
-     * @code{.c}
-     * av_rescale_rnd(3, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-     * // Rescaling 3:
-     * //     Calculating 3 * 1 / 2
-     * //     3 / 2 is rounded up to 2
-     * //     => 2
-     *
-     * av_rescale_rnd(AV_NOPTS_VALUE, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-     * // Rescaling AV_NOPTS_VALUE:
-     * //     AV_NOPTS_VALUE == INT64_MIN
-     * //     AV_NOPTS_VALUE is passed through
-     * //     => AV_NOPTS_VALUE
-     * @endcode
-     */
-    AV_ROUND_PASS_MINMAX = 8192,
-};
-
-/**
- * Compute the greatest common divisor of two integer operands.
- *
- * @param a,b Operands
- * @return GCD of a and b up to sign; if a >= 0 and b >= 0, return value is >= 0;
- * if a == 0 and b == 0, returns 0.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescale a 64-bit integer with rounding to nearest.
- *
- * The operation is mathematically equivalent to `a * b / c`, but writing that
- * directly can overflow.
- *
- * This function is equivalent to av_rescale_rnd() with #AV_ROUND_NEAR_INF.
- *
- * @see av_rescale_rnd(), av_rescale_q(), av_rescale_q_rnd()
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescale a 64-bit integer with specified rounding.
- *
- * The operation is mathematically equivalent to `a * b / c`, but writing that
- * directly can overflow, and does not support different rounding methods.
- *
- * @see av_rescale(), av_rescale_q(), av_rescale_q_rnd()
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers.
- *
- * The operation is mathematically equivalent to `a * bq / cq`.
- *
- * This function is equivalent to av_rescale_q_rnd() with #AV_ROUND_NEAR_INF.
- *
- * @see av_rescale(), av_rescale_rnd(), av_rescale_q_rnd()
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
- *
- * The operation is mathematically equivalent to `a * bq / cq`.
- *
- * @see av_rescale(), av_rescale_rnd(), av_rescale_q()
- */
-int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-                         enum AVRounding rnd) av_const;
-
-/**
- * Compare two timestamps each in its own time base.
- *
- * @return One of the following values:
- *         - -1 if `ts_a` is before `ts_b`
- *         - 1 if `ts_a` is after `ts_b`
- *         - 0 if they represent the same position
- *
- * @warning
- * The result of the function is undefined if one of the timestamps is outside
- * the `int64_t` range when represented in the other's timebase.
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-/**
- * Compare the remainders of two integer operands divided by a common divisor.
- *
- * In other words, compare the least significant `log2(mod)` bits of integers
- * `a` and `b`.
- *
- * @code{.c}
- * av_compare_mod(0x11, 0x02, 0x10) < 0 // since 0x11 % 0x10  (0x1) < 0x02 % 0x10  (0x2)
- * av_compare_mod(0x11, 0x02, 0x20) > 0 // since 0x11 % 0x20 (0x11) > 0x02 % 0x20 (0x02)
- * @endcode
- *
- * @param a,b Operands
- * @param mod Divisor; must be a power of 2
- * @return
- *         - a negative value if `a % mod < b % mod`
- *         - a positive value if `a % mod > b % mod`
- *         - zero             if `a % mod == b % mod`
- */
-int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-
-/**
- * Rescale a timestamp while preserving known durations.
- *
- * This function is designed to be called per audio packet to scale the input
- * timestamp to a different time base. Compared to a simple av_rescale_q()
- * call, this function is robust against possible inconsistent frame durations.
- *
- * The `last` parameter is a state variable that must be preserved for all
- * subsequent calls for the same stream. For the first call, `*last` should be
- * initialized to #AV_NOPTS_VALUE.
- *
- * @param[in]     in_tb    Input time base
- * @param[in]     in_ts    Input timestamp
- * @param[in]     fs_tb    Duration time base; typically this is finer-grained
- *                         (greater) than `in_tb` and `out_tb`
- * @param[in]     duration Duration till the next call to this function (i.e.
- *                         duration of the current packet/frame)
- * @param[in,out] last     Pointer to a timestamp expressed in terms of
- *                         `fs_tb`, acting as a state variable
- * @param[in]     out_tb   Output timebase
- * @return        Timestamp expressed in terms of `out_tb`
- *
- * @note In the context of this function, "duration" is in term of samples, not
- *       seconds.
- */
-int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts,  AVRational fs_tb, int duration, int64_t *last, AVRational out_tb);
-
-/**
- * Add a value to a timestamp.
- *
- * This function guarantees that when the same value is repeatly added that
- * no accumulation of rounding errors occurs.
- *
- * @param[in] ts     Input timestamp
- * @param[in] ts_tb  Input timestamp time base
- * @param[in] inc    Value to be added
- * @param[in] inc_tb Time base of `inc`
- */
-int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
-
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MATHEMATICS_H */
diff --git a/dependencies2013/win32/include/libavutil/md5.h b/dependencies2013/win32/include/libavutil/md5.h
deleted file mode 100644
index ca72ccbf..00000000
--- a/dependencies2013/win32/include/libavutil/md5.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_md5
- * Public header for MD5 hash function implementation.
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_md5 MD5
- * @ingroup lavu_hash
- * MD5 hash function implementation.
- *
- * @{
- */
-
-extern const int av_md5_size;
-
-struct AVMD5;
-
-/**
- * Allocate an AVMD5 context.
- */
-struct AVMD5 *av_md5_alloc(void);
-
-/**
- * Initialize MD5 hashing.
- *
- * @param ctx pointer to the function context (of size av_md5_size)
- */
-void av_md5_init(struct AVMD5 *ctx);
-
-/**
- * Update hash value.
- *
- * @param ctx hash function context
- * @param src input data to update hash with
- * @param len input data length
- */
-#if FF_API_CRYPTO_SIZE_T
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, int len);
-#else
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, size_t len);
-#endif
-
-/**
- * Finish hashing and output digest value.
- *
- * @param ctx hash function context
- * @param dst buffer where output digest value is stored
- */
-void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
-
-/**
- * Hash an array of data.
- *
- * @param dst The output buffer to write the digest into
- * @param src The data to hash
- * @param len The length of the data, in bytes
- */
-#if FF_API_CRYPTO_SIZE_T
-void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
-#else
-void av_md5_sum(uint8_t *dst, const uint8_t *src, size_t len);
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MD5_H */
diff --git a/dependencies2013/win32/include/libavutil/mem.h b/dependencies2013/win32/include/libavutil/mem.h
deleted file mode 100644
index 527cd031..00000000
--- a/dependencies2013/win32/include/libavutil/mem.h
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_mem
- * Memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "error.h"
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_mem
- * Utilities for manipulating memory.
- *
- * FFmpeg has several applications of memory that are not required of a typical
- * program. For example, the computing-heavy components like video decoding and
- * encoding can be sped up significantly through the use of aligned memory.
- *
- * However, for each of FFmpeg's applications of memory, there might not be a
- * recognized or standardized API for that specific use. Memory alignment, for
- * instance, varies wildly depending on operating systems, architectures, and
- * compilers. Hence, this component of @ref libavutil is created to make
- * dealing with memory consistently possible on all platforms.
- *
- * @{
- *
- * @defgroup lavu_mem_macros Alignment Macros
- * Helper macros for declaring aligned variables.
- * @{
- */
-
-/**
- * @def DECLARE_ALIGNED(n,t,v)
- * Declare a variable that is aligned in memory.
- *
- * @code{.c}
- * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
- * DECLARE_ALIGNED(32, uint8_t, aligned_array)[128];
- *
- * // The default-alignment equivalent would be
- * uint16_t aligned_int = 42;
- * uint8_t aligned_array[128];
- * @endcode
- *
- * @param n Minimum alignment in bytes
- * @param t Type of the variable (or array element)
- * @param v Name of the variable
- */
-
-/**
- * @def DECLARE_ASM_CONST(n,t,v)
- * Declare a static constant aligned variable appropriate for use in inline
- * assembly code.
- *
- * @code{.c}
- * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
- * @endcode
- *
- * @param n Minimum alignment in bytes
- * @param t Type of the variable (or array element)
- * @param v Name of the variable
- */
-
-#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__DJGPP__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (FFMIN(n, 16)))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
-#elif defined(__GNUC__) || defined(__clang__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_attrs Function Attributes
- * Function attributes applicable to memory handling functions.
- *
- * These function attributes can help compilers emit more useful warnings, or
- * generate better code.
- * @{
- */
-
-/**
- * @def av_malloc_attrib
- * Function attribute denoting a malloc-like function.
- *
- * @see <a href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-g_t_0040code_007bmalloc_007d-function-attribute-3251">Function attribute `malloc` in GCC's documentation</a>
- */
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-/**
- * @def av_alloc_size(...)
- * Function attribute used on a function that allocates memory, whose size is
- * given by the specified parameter(s).
- *
- * @code{.c}
- * void *av_malloc(size_t size) av_alloc_size(1);
- * void *av_calloc(size_t nmemb, size_t size) av_alloc_size(1, 2);
- * @endcode
- *
- * @param ... One or two parameter indexes, separated by a comma
- *
- * @see <a href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-g_t_0040code_007balloc_005fsize_007d-function-attribute-3220">Function attribute `alloc_size` in GCC's documentation</a>
- */
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-#else
-    #define av_alloc_size(...)
-#endif
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_funcs Heap Management
- * Functions responsible for allocating, freeing, and copying memory.
- *
- * All memory allocation functions have a built-in upper limit of `INT_MAX`
- * bytes. This may be changed with av_max_alloc(), although exercise extreme
- * caution when doing so.
- *
- * @{
- */
-
-/**
- * Allocate a memory block with alignment suitable for all memory accesses
- * (including vectors if available on the CPU).
- *
- * @param size Size in bytes for the memory block to be allocated
- * @return Pointer to the allocated block, or `NULL` if the block cannot
- *         be allocated
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a memory block with alignment suitable for all memory accesses
- * (including vectors if available on the CPU) and zero all the bytes of the
- * block.
- *
- * @param size Size in bytes for the memory block to be allocated
- * @return Pointer to the allocated block, or `NULL` if it cannot be allocated
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a memory block for an array with av_malloc().
- *
- * The allocated memory will have size `size * nmemb` bytes.
- *
- * @param nmemb Number of element
- * @param size  Size of a single element
- * @return Pointer to the allocated block, or `NULL` if the block cannot
- *         be allocated
- * @see av_malloc()
- */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_malloc(nmemb * size);
-}
-
-/**
- * Allocate a memory block for an array with av_mallocz().
- *
- * The allocated memory will have size `size * nmemb` bytes.
- *
- * @param nmemb Number of elements
- * @param size  Size of the single element
- * @return Pointer to the allocated block, or `NULL` if the block cannot
- *         be allocated
- *
- * @see av_mallocz()
- * @see av_malloc_array()
- */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_mallocz(nmemb * size);
-}
-
-/**
- * Non-inlined equivalent of av_mallocz_array().
- *
- * Created for symmetry with the calloc() C function.
- */
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
-
-/**
- * Allocate, reallocate, or free a block of memory.
- *
- * If `ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
- * zero, free the memory block pointed to by `ptr`. Otherwise, expand or
- * shrink that block of memory according to `size`.
- *
- * @param ptr  Pointer to a memory block already allocated with
- *             av_realloc() or `NULL`
- * @param size Size in bytes of the memory block to be allocated or
- *             reallocated
- *
- * @return Pointer to a newly-reallocated block or `NULL` if the block
- *         cannot be reallocated or the function is used to free the memory block
- *
- * @warning Unlike av_malloc(), the returned pointer is not guaranteed to be
- *          correctly aligned.
- * @see av_fast_realloc()
- * @see av_reallocp()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Allocate, reallocate, or free a block of memory through a pointer to a
- * pointer.
- *
- * If `*ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
- * zero, free the memory block pointed to by `*ptr`. Otherwise, expand or
- * shrink that block of memory according to `size`.
- *
- * @param[in,out] ptr  Pointer to a pointer to a memory block already allocated
- *                     with av_realloc(), or a pointer to `NULL`. The pointer
- *                     is updated on success, or freed on failure.
- * @param[in]     size Size in bytes for the memory block to be allocated or
- *                     reallocated
- *
- * @return Zero on success, an AVERROR error code on failure
- *
- * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
- *          correctly aligned.
- */
-av_warn_unused_result
-int av_reallocp(void *ptr, size_t size);
-
-/**
- * Allocate, reallocate, or free a block of memory.
- *
- * This function does the same thing as av_realloc(), except:
- * - It takes two size arguments and allocates `nelem * elsize` bytes,
- *   after checking the result of the multiplication for integer overflow.
- * - It frees the input block in case of failure, thus avoiding the memory
- *   leak with the classic
- *   @code{.c}
- *   buf = realloc(buf);
- *   if (!buf)
- *       return -1;
- *   @endcode
- *   pattern.
- */
-void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
-
-/**
- * Allocate, reallocate, or free an array.
- *
- * If `ptr` is `NULL` and `nmemb` > 0, allocate a new block. If
- * `nmemb` is zero, free the memory block pointed to by `ptr`.
- *
- * @param ptr   Pointer to a memory block already allocated with
- *              av_realloc() or `NULL`
- * @param nmemb Number of elements in the array
- * @param size  Size of the single element of the array
- *
- * @return Pointer to a newly-reallocated block or NULL if the block
- *         cannot be reallocated or the function is used to free the memory block
- *
- * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
- *          correctly aligned.
- * @see av_reallocp_array()
- */
-av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Allocate, reallocate, or free an array through a pointer to a pointer.
- *
- * If `*ptr` is `NULL` and `nmemb` > 0, allocate a new block. If `nmemb` is
- * zero, free the memory block pointed to by `*ptr`.
- *
- * @param[in,out] ptr   Pointer to a pointer to a memory block already
- *                      allocated with av_realloc(), or a pointer to `NULL`.
- *                      The pointer is updated on success, or freed on failure.
- * @param[in]     nmemb Number of elements
- * @param[in]     size  Size of the single element
- *
- * @return Zero on success, an AVERROR error code on failure
- *
- * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
- *          correctly aligned.
- */
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Reallocate the given buffer if it is not large enough, otherwise do nothing.
- *
- * If the given buffer is `NULL`, then a new uninitialized buffer is allocated.
- *
- * If the given buffer is not large enough, and reallocation fails, `NULL` is
- * returned and `*size` is set to 0, but the original buffer is not changed or
- * freed.
- *
- * A typical use pattern follows:
- *
- * @code{.c}
- * uint8_t *buf = ...;
- * uint8_t *new_buf = av_fast_realloc(buf, &current_size, size_needed);
- * if (!new_buf) {
- *     // Allocation failed; clean up original buffer
- *     av_freep(&buf);
- *     return AVERROR(ENOMEM);
- * }
- * @endcode
- *
- * @param[in,out] ptr      Already allocated buffer, or `NULL`
- * @param[in,out] size     Pointer to current size of buffer `ptr`. `*size` is
- *                         changed to `min_size` in case of success or 0 in
- *                         case of failure
- * @param[in]     min_size New size of buffer `ptr`
- * @return `ptr` if the buffer is large enough, a pointer to newly reallocated
- *         buffer if the buffer was not large enough, or `NULL` in case of
- *         error
- * @see av_realloc()
- * @see av_fast_malloc()
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc(), the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special handling to
- * avoid memleaks is necessary.
- *
- * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
- * `size_needed` is greater than 0.
- *
- * @code{.c}
- * uint8_t *buf = ...;
- * av_fast_malloc(&buf, &current_size, size_needed);
- * if (!buf) {
- *     // Allocation failed; buf already freed
- *     return AVERROR(ENOMEM);
- * }
- * @endcode
- *
- * @param[in,out] ptr      Pointer to pointer to an already allocated buffer.
- *                         `*ptr` will be overwritten with pointer to new
- *                         buffer on success or `NULL` on failure
- * @param[in,out] size     Pointer to current size of buffer `*ptr`. `*size` is
- *                         changed to `min_size` in case of success or 0 in
- *                         case of failure
- * @param[in]     min_size New size of buffer `*ptr`
- * @see av_realloc()
- * @see av_fast_mallocz()
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate and clear a buffer, reusing the given one if large enough.
- *
- * Like av_fast_malloc(), but all newly allocated space is initially cleared.
- * Reused buffer is not cleared.
- *
- * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
- * `size_needed` is greater than 0.
- *
- * @param[in,out] ptr      Pointer to pointer to an already allocated buffer.
- *                         `*ptr` will be overwritten with pointer to new
- *                         buffer on success or `NULL` on failure
- * @param[in,out] size     Pointer to current size of buffer `*ptr`. `*size` is
- *                         changed to `min_size` in case of success or 0 in
- *                         case of failure
- * @param[in]     min_size New size of buffer `*ptr`
- * @see av_fast_malloc()
- */
-void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Free a memory block which has been allocated with a function of av_malloc()
- * or av_realloc() family.
- *
- * @param ptr Pointer to the memory block which should be freed.
- *
- * @note `ptr = NULL` is explicitly allowed.
- * @note It is recommended that you use av_freep() instead, to prevent leaving
- *       behind dangling pointers.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Free a memory block which has been allocated with a function of av_malloc()
- * or av_realloc() family, and set the pointer pointing to it to `NULL`.
- *
- * @code{.c}
- * uint8_t *buf = av_malloc(16);
- * av_free(buf);
- * // buf now contains a dangling pointer to freed memory, and accidental
- * // dereference of buf will result in a use-after-free, which may be a
- * // security risk.
- *
- * uint8_t *buf = av_malloc(16);
- * av_freep(&buf);
- * // buf is now NULL, and accidental dereference will only result in a
- * // NULL-pointer dereference.
- * @endcode
- *
- * @param ptr Pointer to the pointer to the memory block which should be freed
- * @note `*ptr = NULL` is safe and leads to no action.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * Duplicate a string.
- *
- * @param s String to be duplicated
- * @return Pointer to a newly-allocated string containing a
- *         copy of `s` or `NULL` if the string cannot be allocated
- * @see av_strndup()
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Duplicate a substring of a string.
- *
- * @param s   String to be duplicated
- * @param len Maximum length of the resulting string (not counting the
- *            terminating byte)
- * @return Pointer to a newly-allocated string containing a
- *         substring of `s` or `NULL` if the string cannot be allocated
- */
-char *av_strndup(const char *s, size_t len) av_malloc_attrib;
-
-/**
- * Duplicate a buffer with av_malloc().
- *
- * @param p    Buffer to be duplicated
- * @param size Size in bytes of the buffer copied
- * @return Pointer to a newly allocated buffer containing a
- *         copy of `p` or `NULL` if the buffer cannot be allocated
- */
-void *av_memdup(const void *p, size_t size);
-
-/**
- * Overlapping memcpy() implementation.
- *
- * @param dst  Destination buffer
- * @param back Number of bytes back to start copying (i.e. the initial size of
- *             the overlapping window); must be > 0
- * @param cnt  Number of bytes to copy; must be >= 0
- *
- * @note `cnt > back` is valid, this will copy the bytes we just copied,
- *       thus creating a repeating pattern with a period length of `back`.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_dynarray Dynamic Array
- *
- * Utilities to make an array grow when needed.
- *
- * Sometimes, the programmer would want to have an array that can grow when
- * needed. The libavutil dynamic array utilities fill that need.
- *
- * libavutil supports two systems of appending elements onto a dynamically
- * allocated array, the first one storing the pointer to the value in the
- * array, and the second storing the value directly. In both systems, the
- * caller is responsible for maintaining a variable containing the length of
- * the array, as well as freeing of the array after use.
- *
- * The first system stores pointers to values in a block of dynamically
- * allocated memory. Since only pointers are stored, the function does not need
- * to know the size of the type. Both av_dynarray_add() and
- * av_dynarray_add_nofree() implement this system.
- *
- * @code
- * type **array = NULL; //< an array of pointers to values
- * int    nb    = 0;    //< a variable to keep track of the length of the array
- *
- * type to_be_added  = ...;
- * type to_be_added2 = ...;
- *
- * av_dynarray_add(&array, &nb, &to_be_added);
- * if (nb == 0)
- *     return AVERROR(ENOMEM);
- *
- * av_dynarray_add(&array, &nb, &to_be_added2);
- * if (nb == 0)
- *     return AVERROR(ENOMEM);
- *
- * // Now:
- * //  nb           == 2
- * // &to_be_added  == array[0]
- * // &to_be_added2 == array[1]
- *
- * av_freep(&array);
- * @endcode
- *
- * The second system stores the value directly in a block of memory. As a
- * result, the function has to know the size of the type. av_dynarray2_add()
- * implements this mechanism.
- *
- * @code
- * type *array = NULL; //< an array of values
- * int   nb    = 0;    //< a variable to keep track of the length of the array
- *
- * type to_be_added  = ...;
- * type to_be_added2 = ...;
- *
- * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array), NULL);
- * if (!addr)
- *     return AVERROR(ENOMEM);
- * memcpy(addr, &to_be_added, sizeof(to_be_added));
- *
- * // Shortcut of the above.
- * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array),
- *                               (const void *)&to_be_added2);
- * if (!addr)
- *     return AVERROR(ENOMEM);
- *
- * // Now:
- * //  nb           == 2
- * //  to_be_added  == array[0]
- * //  to_be_added2 == array[1]
- *
- * av_freep(&array);
- * @endcode
- *
- * @{
- */
-
-/**
- * Add the pointer to an element to a dynamic array.
- *
- * The array to grow is supposed to be an array of pointers to
- * structures, and the element to add must be a pointer to an already
- * allocated structure.
- *
- * The array is reallocated when its size reaches powers of 2.
- * Therefore, the amortized cost of adding an element is constant.
- *
- * In case of success, the pointer to the array is updated in order to
- * point to the new grown array, and the number pointed to by `nb_ptr`
- * is incremented.
- * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
- * `*nb_ptr` is set to 0.
- *
- * @param[in,out] tab_ptr Pointer to the array to grow
- * @param[in,out] nb_ptr  Pointer to the number of elements in the array
- * @param[in]     elem    Element to add
- * @see av_dynarray_add_nofree(), av_dynarray2_add()
- */
-void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
-
-/**
- * Add an element to a dynamic array.
- *
- * Function has the same functionality as av_dynarray_add(),
- * but it doesn't free memory on fails. It returns error code
- * instead and leave current buffer untouched.
- *
- * @return >=0 on success, negative otherwise
- * @see av_dynarray_add(), av_dynarray2_add()
- */
-av_warn_unused_result
-int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem);
-
-/**
- * Add an element of size `elem_size` to a dynamic array.
- *
- * The array is reallocated when its number of elements reaches powers of 2.
- * Therefore, the amortized cost of adding an element is constant.
- *
- * In case of success, the pointer to the array is updated in order to
- * point to the new grown array, and the number pointed to by `nb_ptr`
- * is incremented.
- * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
- * `*nb_ptr` is set to 0.
- *
- * @param[in,out] tab_ptr   Pointer to the array to grow
- * @param[in,out] nb_ptr    Pointer to the number of elements in the array
- * @param[in]     elem_size Size in bytes of an element in the array
- * @param[in]     elem_data Pointer to the data of the element to add. If
- *                          `NULL`, the space of the newly added element is
- *                          allocated but left uninitialized.
- *
- * @return Pointer to the data of the element to copy in the newly allocated
- *         space
- * @see av_dynarray_add(), av_dynarray_add_nofree()
- */
-void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size,
-                       const uint8_t *elem_data);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_misc Miscellaneous Functions
- *
- * Other functions related to memory allocation.
- *
- * @{
- */
-
-/**
- * Multiply two `size_t` values checking for overflow.
- *
- * @param[in]  a,b Operands of multiplication
- * @param[out] r   Pointer to the result of the operation
- * @return 0 on success, AVERROR(EINVAL) on overflow
- */
-static inline int av_size_mult(size_t a, size_t b, size_t *r)
-{
-    size_t t = a * b;
-    /* Hack inspired from glibc: don't try the division if nelem and elsize
-     * are both less than sqrt(SIZE_MAX). */
-    if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
-        return AVERROR(EINVAL);
-    *r = t;
-    return 0;
-}
-
-/**
- * Set the maximum size that may be allocated in one block.
- *
- * The value specified with this function is effective for all libavutil's @ref
- * lavu_mem_funcs "heap management functions."
- *
- * By default, the max value is defined as `INT_MAX`.
- *
- * @param max Value to be set as the new maximum size
- *
- * @warning Exercise extreme caution when using this function. Don't touch
- *          this if you do not understand the full consequence of doing so.
- */
-void av_max_alloc(size_t max);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */
diff --git a/dependencies2013/win32/include/libavutil/motion_vector.h b/dependencies2013/win32/include/libavutil/motion_vector.h
deleted file mode 100644
index ec295563..00000000
--- a/dependencies2013/win32/include/libavutil/motion_vector.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MOTION_VECTOR_H
-#define AVUTIL_MOTION_VECTOR_H
-
-#include <stdint.h>
-
-typedef struct AVMotionVector {
-    /**
-     * Where the current macroblock comes from; negative value when it comes
-     * from the past, positive value when it comes from the future.
-     * XXX: set exact relative ref frame reference instead of a +/- 1 "direction".
-     */
-    int32_t source;
-    /**
-     * Width and height of the block.
-     */
-    uint8_t w, h;
-    /**
-     * Absolute source position. Can be outside the frame area.
-     */
-    int16_t src_x, src_y;
-    /**
-     * Absolute destination position. Can be outside the frame area.
-     */
-    int16_t dst_x, dst_y;
-    /**
-     * Extra flag information.
-     * Currently unused.
-     */
-    uint64_t flags;
-    /**
-     * Motion vector
-     * src_x = dst_x + motion_x / motion_scale
-     * src_y = dst_y + motion_y / motion_scale
-     */
-    int32_t motion_x, motion_y;
-    uint16_t motion_scale;
-} AVMotionVector;
-
-#endif /* AVUTIL_MOTION_VECTOR_H */
diff --git a/dependencies2013/win32/include/libavutil/murmur3.h b/dependencies2013/win32/include/libavutil/murmur3.h
deleted file mode 100644
index 6a1694c0..00000000
--- a/dependencies2013/win32/include/libavutil/murmur3.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_murmur3
- * Public header for MurmurHash3 hash function implementation.
- */
-
-#ifndef AVUTIL_MURMUR3_H
-#define AVUTIL_MURMUR3_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_murmur3 Murmur3
- * @ingroup lavu_hash
- * MurmurHash3 hash function implementation.
- *
- * MurmurHash3 is a non-cryptographic hash function, of which three
- * incompatible versions were created by its inventor Austin Appleby:
- *
- * - 32-bit output
- * - 128-bit output for 32-bit platforms
- * - 128-bit output for 64-bit platforms
- *
- * FFmpeg only implements the last variant: 128-bit output designed for 64-bit
- * platforms. Even though the hash function was designed for 64-bit platforms,
- * the function in reality works on 32-bit systems too, only with reduced
- * performance.
- *
- * @anchor lavu_murmur3_seedinfo
- * By design, MurmurHash3 requires a seed to operate. In response to this,
- * libavutil provides two functions for hash initiation, one that requires a
- * seed (av_murmur3_init_seeded()) and one that uses a fixed arbitrary integer
- * as the seed, and therefore does not (av_murmur3_init()).
- *
- * To make hashes comparable, you should provide the same seed for all calls to
- * this hash function -- if you are supplying one yourself, that is.
- *
- * @{
- */
-
-/**
- * Allocate an AVMurMur3 hash context.
- *
- * @return Uninitialized hash context or `NULL` in case of error
- */
-struct AVMurMur3 *av_murmur3_alloc(void);
-
-/**
- * Initialize or reinitialize an AVMurMur3 hash context with a seed.
- *
- * @param[out] c    Hash context
- * @param[in]  seed Random seed
- *
- * @see av_murmur3_init()
- * @see @ref lavu_murmur3_seedinfo "Detailed description" on a discussion of
- * seeds for MurmurHash3.
- */
-void av_murmur3_init_seeded(struct AVMurMur3 *c, uint64_t seed);
-
-/**
- * Initialize or reinitialize an AVMurMur3 hash context.
- *
- * Equivalent to av_murmur3_init_seeded() with a built-in seed.
- *
- * @param[out] c    Hash context
- *
- * @see av_murmur3_init_seeded()
- * @see @ref lavu_murmur3_seedinfo "Detailed description" on a discussion of
- * seeds for MurmurHash3.
- */
-void av_murmur3_init(struct AVMurMur3 *c);
-
-/**
- * Update hash context with new data.
- *
- * @param[out] c    Hash context
- * @param[in]  src  Input data to update hash with
- * @param[in]  len  Number of bytes to read from `src`
- */
-void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param[in,out] c    Hash context
- * @param[out]    dst  Buffer where output digest value is stored
- */
-void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MURMUR3_H */
diff --git a/dependencies2013/win32/include/libavutil/opt.h b/dependencies2013/win32/include/libavutil/opt.h
deleted file mode 100644
index 0d893795..00000000
--- a/dependencies2013/win32/include/libavutil/opt.h
+++ /dev/null
@@ -1,866 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OPT_H
-#define AVUTIL_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "rational.h"
-#include "avutil.h"
-#include "dict.h"
-#include "log.h"
-#include "pixfmt.h"
-#include "samplefmt.h"
-#include "version.h"
-
-/**
- * @defgroup avoptions AVOptions
- * @ingroup lavu_data
- * @{
- * AVOptions provide a generic system to declare options on arbitrary structs
- * ("objects"). An option can have a help text, a type and a range of possible
- * values. Options may then be enumerated, read and written to.
- *
- * @section avoptions_implement Implementing AVOptions
- * This section describes how to add AVOptions capabilities to a struct.
- *
- * All AVOptions-related information is stored in an AVClass. Therefore
- * the first member of the struct should be a pointer to an AVClass describing it.
- * The option field of the AVClass must be set to a NULL-terminated static array
- * of AVOptions. Each AVOption must have a non-empty name, a type, a default
- * value and for number-type AVOptions also a range of allowed values. It must
- * also declare an offset in bytes from the start of the struct, where the field
- * associated with this AVOption is located. Other fields in the AVOption struct
- * should also be set when applicable, but are not required.
- *
- * The following example illustrates an AVOptions-enabled struct:
- * @code
- * typedef struct test_struct {
- *     const AVClass *class;
- *     int      int_opt;
- *     char    *str_opt;
- *     uint8_t *bin_opt;
- *     int      bin_len;
- * } test_struct;
- *
- * static const AVOption test_options[] = {
- *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
- *     AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
- *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
- *     AV_OPT_TYPE_STRING },
- *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
- *     AV_OPT_TYPE_BINARY },
- *   { NULL },
- * };
- *
- * static const AVClass test_class = {
- *     .class_name = "test class",
- *     .item_name  = av_default_item_name,
- *     .option     = test_options,
- *     .version    = LIBAVUTIL_VERSION_INT,
- * };
- * @endcode
- *
- * Next, when allocating your struct, you must ensure that the AVClass pointer
- * is set to the correct value. Then, av_opt_set_defaults() can be called to
- * initialize defaults. After that the struct is ready to be used with the
- * AVOptions API.
- *
- * When cleaning up, you may use the av_opt_free() function to automatically
- * free all the allocated string and binary options.
- *
- * Continuing with the above example:
- *
- * @code
- * test_struct *alloc_test_struct(void)
- * {
- *     test_struct *ret = av_mallocz(sizeof(*ret));
- *     ret->class = &test_class;
- *     av_opt_set_defaults(ret);
- *     return ret;
- * }
- * void free_test_struct(test_struct **foo)
- * {
- *     av_opt_free(*foo);
- *     av_freep(foo);
- * }
- * @endcode
- *
- * @subsection avoptions_implement_nesting Nesting
- *      It may happen that an AVOptions-enabled struct contains another
- *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
- *      libavcodec exports generic options, while its priv_data field exports
- *      codec-specific options). In such a case, it is possible to set up the
- *      parent struct to export a child's options. To do that, simply
- *      implement AVClass.child_next() and AVClass.child_class_next() in the
- *      parent struct's AVClass.
- *      Assuming that the test_struct from above now also contains a
- *      child_struct field:
- *
- *      @code
- *      typedef struct child_struct {
- *          AVClass *class;
- *          int flags_opt;
- *      } child_struct;
- *      static const AVOption child_opts[] = {
- *          { "test_flags", "This is a test option of flags type.",
- *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
- *          { NULL },
- *      };
- *      static const AVClass child_class = {
- *          .class_name = "child class",
- *          .item_name  = av_default_item_name,
- *          .option     = child_opts,
- *          .version    = LIBAVUTIL_VERSION_INT,
- *      };
- *
- *      void *child_next(void *obj, void *prev)
- *      {
- *          test_struct *t = obj;
- *          if (!prev && t->child_struct)
- *              return t->child_struct;
- *          return NULL
- *      }
- *      const AVClass child_class_next(const AVClass *prev)
- *      {
- *          return prev ? NULL : &child_class;
- *      }
- *      @endcode
- *      Putting child_next() and child_class_next() as defined above into
- *      test_class will now make child_struct's options accessible through
- *      test_struct (again, proper setup as described above needs to be done on
- *      child_struct right after it is created).
- *
- *      From the above example it might not be clear why both child_next()
- *      and child_class_next() are needed. The distinction is that child_next()
- *      iterates over actually existing objects, while child_class_next()
- *      iterates over all possible child classes. E.g. if an AVCodecContext
- *      was initialized to use a codec which has private options, then its
- *      child_next() will return AVCodecContext.priv_data and finish
- *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
- *      iterate over all available codecs with private options.
- *
- * @subsection avoptions_implement_named_constants Named constants
- *      It is possible to create named constants for options. Simply set the unit
- *      field of the option the constants should apply to a string and
- *      create the constants themselves as options of type AV_OPT_TYPE_CONST
- *      with their unit field set to the same string.
- *      Their default_val field should contain the value of the named
- *      constant.
- *      For example, to add some named constants for the test_flags option
- *      above, put the following into the child_opts array:
- *      @code
- *      { "test_flags", "This is a test option of flags type.",
- *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
- *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
- *      @endcode
- *
- * @section avoptions_use Using AVOptions
- * This section deals with accessing options in an AVOptions-enabled struct.
- * Such structs in FFmpeg are e.g. AVCodecContext in libavcodec or
- * AVFormatContext in libavformat.
- *
- * @subsection avoptions_use_examine Examining AVOptions
- * The basic functions for examining options are av_opt_next(), which iterates
- * over all options defined for one object, and av_opt_find(), which searches
- * for an option with the given name.
- *
- * The situation is more complicated with nesting. An AVOptions-enabled struct
- * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
- * to av_opt_find() will make the function search children recursively.
- *
- * For enumerating there are basically two cases. The first is when you want to
- * get all options that may potentially exist on the struct and its children
- * (e.g.  when constructing documentation). In that case you should call
- * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
- * second case is when you have an already initialized struct with all its
- * children and you want to get all options that can be actually written or read
- * from it. In that case you should call av_opt_child_next() recursively (and
- * av_opt_next() on each result).
- *
- * @subsection avoptions_use_get_set Reading and writing AVOptions
- * When setting options, you often have a string read directly from the
- * user. In such a case, simply passing it to av_opt_set() is enough. For
- * non-string type options, av_opt_set() will parse the string according to the
- * option type.
- *
- * Similarly av_opt_get() will read any option type and convert it to a string
- * which will be returned. Do not forget that the string is allocated, so you
- * have to free it with av_free().
- *
- * In some cases it may be more convenient to put all options into an
- * AVDictionary and call av_opt_set_dict() on it. A specific case of this
- * are the format/codec open functions in lavf/lavc which take a dictionary
- * filled with option as a parameter. This makes it possible to set some options
- * that cannot be set otherwise, since e.g. the input file format is not known
- * before the file is actually opened.
- */
-
-enum AVOptionType{
-    AV_OPT_TYPE_FLAGS,
-    AV_OPT_TYPE_INT,
-    AV_OPT_TYPE_INT64,
-    AV_OPT_TYPE_DOUBLE,
-    AV_OPT_TYPE_FLOAT,
-    AV_OPT_TYPE_STRING,
-    AV_OPT_TYPE_RATIONAL,
-    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    AV_OPT_TYPE_DICT,
-    AV_OPT_TYPE_UINT64,
-    AV_OPT_TYPE_CONST = 128,
-    AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers
-    AV_OPT_TYPE_PIXEL_FMT  = MKBETAG('P','F','M','T'),
-    AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'),
-    AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational
-    AV_OPT_TYPE_DURATION   = MKBETAG('D','U','R',' '),
-    AV_OPT_TYPE_COLOR      = MKBETAG('C','O','L','R'),
-    AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'),
-    AV_OPT_TYPE_BOOL           = MKBETAG('B','O','O','L'),
-};
-
-/**
- * AVOption
- */
-typedef struct AVOption {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    union {
-        int64_t i64;
-        double dbl;
-        const char *str;
-        /* TODO those are unused now */
-        AVRational q;
-    } default_val;
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#if FF_API_OPT_TYPE_METADATA
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#endif
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-/**
- * The option is intended for exporting values to the caller.
- */
-#define AV_OPT_FLAG_EXPORT          64
-/**
- * The option may not be set through the AVOptions API, only read.
- * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set.
- */
-#define AV_OPT_FLAG_READONLY        128
-#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption;
-
-/**
- * A single allowed range of values, or a single allowed value.
- */
-typedef struct AVOptionRange {
-    const char *str;
-    /**
-     * Value range.
-     * For string ranges this represents the min/max length.
-     * For dimensions this represents the min/max pixel count or width/height in multi-component case.
-     */
-    double value_min, value_max;
-    /**
-     * Value's component range.
-     * For string this represents the unicode range for chars, 0-127 limits to ASCII.
-     */
-    double component_min, component_max;
-    /**
-     * Range flag.
-     * If set to 1 the struct encodes a range, if set to 0 a single value.
-     */
-    int is_range;
-} AVOptionRange;
-
-/**
- * List of AVOptionRange structs.
- */
-typedef struct AVOptionRanges {
-    /**
-     * Array of option ranges.
-     *
-     * Most of option types use just one component.
-     * Following describes multi-component option types:
-     *
-     * AV_OPT_TYPE_IMAGE_SIZE:
-     * component index 0: range of pixel count (width * height).
-     * component index 1: range of width.
-     * component index 2: range of height.
-     *
-     * @note To obtain multi-component version of this structure, user must
-     *       provide AV_OPT_MULTI_COMPONENT_RANGE to av_opt_query_ranges or
-     *       av_opt_query_ranges_default function.
-     *
-     * Multi-component range can be read as in following example:
-     *
-     * @code
-     * int range_index, component_index;
-     * AVOptionRanges *ranges;
-     * AVOptionRange *range[3]; //may require more than 3 in the future.
-     * av_opt_query_ranges(&ranges, obj, key, AV_OPT_MULTI_COMPONENT_RANGE);
-     * for (range_index = 0; range_index < ranges->nb_ranges; range_index++) {
-     *     for (component_index = 0; component_index < ranges->nb_components; component_index++)
-     *         range[component_index] = ranges->range[ranges->nb_ranges * component_index + range_index];
-     *     //do something with range here.
-     * }
-     * av_opt_freep_ranges(&ranges);
-     * @endcode
-     */
-    AVOptionRange **range;
-    /**
-     * Number of ranges per component.
-     */
-    int nb_ranges;
-    /**
-     * Number of componentes.
-     */
-    int nb_components;
-} AVOptionRanges;
-
-/**
- * Show the obj options.
- *
- * @param req_flags requested flags for the options to show. Show only the
- * options for which it is opt->flags & req_flags.
- * @param rej_flags rejected flags for the options to show. Show only the
- * options for which it is !(opt->flags & req_flags).
- * @param av_log_obj log context to use for showing the options
- */
-int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
-
-/**
- * Set the values of all AVOption fields to their default values.
- *
- * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
- */
-void av_opt_set_defaults(void *s);
-
-/**
- * Set the values of all AVOption fields to their default values. Only these
- * AVOption fields for which (opt->flags & mask) == flags will have their
- * default applied to s.
- *
- * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
- * @param mask combination of AV_OPT_FLAG_*
- * @param flags combination of AV_OPT_FLAG_*
- */
-void av_opt_set_defaults2(void *s, int mask, int flags);
-
-/**
- * Parse the key/value pairs list in opts. For each key/value pair
- * found, stores the value in the field in ctx that is named like the
- * key. ctx must be an AVClass context, storing is done using
- * AVOptions.
- *
- * @param opts options string to parse, may be NULL
- * @param key_val_sep a 0-terminated list of characters used to
- * separate key from value
- * @param pairs_sep a 0-terminated list of characters used to separate
- * two pairs from each other
- * @return the number of successfully set key/value pairs, or a negative
- * value corresponding to an AVERROR code in case of error:
- * AVERROR(EINVAL) if opts cannot be parsed,
- * the error code issued by av_opt_set() if a key/value pair
- * cannot be set
- */
-int av_set_options_string(void *ctx, const char *opts,
-                          const char *key_val_sep, const char *pairs_sep);
-
-/**
- * Parse the key-value pairs list in opts. For each key=value pair found,
- * set the value of the corresponding option in ctx.
- *
- * @param ctx          the AVClass object to set options on
- * @param opts         the options string, key-value pairs separated by a
- *                     delimiter
- * @param shorthand    a NULL-terminated array of options names for shorthand
- *                     notation: if the first field in opts has no key part,
- *                     the key is taken from the first element of shorthand;
- *                     then again for the second, etc., until either opts is
- *                     finished, shorthand is finished or a named option is
- *                     found; after that, all options must be named
- * @param key_val_sep  a 0-terminated list of characters used to separate
- *                     key from value, for example '='
- * @param pairs_sep    a 0-terminated list of characters used to separate
- *                     two pairs from each other, for example ':' or ','
- * @return  the number of successfully set key=value pairs, or a negative
- *          value corresponding to an AVERROR code in case of error:
- *          AVERROR(EINVAL) if opts cannot be parsed,
- *          the error code issued by av_set_string3() if a key/value pair
- *          cannot be set
- *
- * Options names must use only the following characters: a-z A-Z 0-9 - . / _
- * Separators must use characters distinct from option names and from each
- * other.
- */
-int av_opt_set_from_string(void *ctx, const char *opts,
-                           const char *const *shorthand,
-                           const char *key_val_sep, const char *pairs_sep);
-/**
- * Free all allocated objects in obj.
- */
-void av_opt_free(void *obj);
-
-/**
- * Check whether a particular flag is set in a flags field.
- *
- * @param field_name the name of the flag field option
- * @param flag_name the name of the flag to check
- * @return non-zero if the flag is set, zero if the flag isn't set,
- *         isn't of the right type, or the flags field doesn't exist.
- */
-int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
-
-/**
- * Set all the options from a given dictionary on an object.
- *
- * @param obj a struct whose first element is a pointer to AVClass
- * @param options options to process. This dictionary will be freed and replaced
- *                by a new one containing all options not found in obj.
- *                Of course this new dictionary needs to be freed by caller
- *                with av_dict_free().
- *
- * @return 0 on success, a negative AVERROR if some option was found in obj,
- *         but could not be set.
- *
- * @see av_dict_copy()
- */
-int av_opt_set_dict(void *obj, struct AVDictionary **options);
-
-
-/**
- * Set all the options from a given dictionary on an object.
- *
- * @param obj a struct whose first element is a pointer to AVClass
- * @param options options to process. This dictionary will be freed and replaced
- *                by a new one containing all options not found in obj.
- *                Of course this new dictionary needs to be freed by caller
- *                with av_dict_free().
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- *
- * @return 0 on success, a negative AVERROR if some option was found in obj,
- *         but could not be set.
- *
- * @see av_dict_copy()
- */
-int av_opt_set_dict2(void *obj, struct AVDictionary **options, int search_flags);
-
-/**
- * Extract a key-value pair from the beginning of a string.
- *
- * @param ropts        pointer to the options string, will be updated to
- *                     point to the rest of the string (one of the pairs_sep
- *                     or the final NUL)
- * @param key_val_sep  a 0-terminated list of characters used to separate
- *                     key from value, for example '='
- * @param pairs_sep    a 0-terminated list of characters used to separate
- *                     two pairs from each other, for example ':' or ','
- * @param flags        flags; see the AV_OPT_FLAG_* values below
- * @param rkey         parsed key; must be freed using av_free()
- * @param rval         parsed value; must be freed using av_free()
- *
- * @return  >=0 for success, or a negative value corresponding to an
- *          AVERROR code in case of error; in particular:
- *          AVERROR(EINVAL) if no key is present
- *
- */
-int av_opt_get_key_value(const char **ropts,
-                         const char *key_val_sep, const char *pairs_sep,
-                         unsigned flags,
-                         char **rkey, char **rval);
-
-enum {
-
-    /**
-     * Accept to parse a value without a key; the key will then be returned
-     * as NULL.
-     */
-    AV_OPT_FLAG_IMPLICIT_KEY = 1,
-};
-
-/**
- * @defgroup opt_eval_funcs Evaluating option strings
- * @{
- * This group of functions can be used to evaluate option strings
- * and get numbers out of them. They do the same thing as av_opt_set(),
- * except the result is written into the caller-supplied pointer.
- *
- * @param obj a struct whose first element is a pointer to AVClass.
- * @param o an option for which the string is to be evaluated.
- * @param val string to be evaluated.
- * @param *_out value of the string will be written here.
- *
- * @return 0 on success, a negative number on failure.
- */
-int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
-int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
-int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
-int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
-int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
-int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
-/**
- * @}
- */
-
-#define AV_OPT_SEARCH_CHILDREN   (1 << 0) /**< Search in possible children of the
-                                               given object first. */
-/**
- *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
- *  instead of a required pointer to a struct containing AVClass. This is
- *  useful for searching for options without needing to allocate the corresponding
- *  object.
- */
-#define AV_OPT_SEARCH_FAKE_OBJ   (1 << 1)
-
-/**
- *  In av_opt_get, return NULL if the option has a pointer type and is set to NULL,
- *  rather than returning an empty string.
- */
-#define AV_OPT_ALLOW_NULL (1 << 2)
-
-/**
- *  Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than
- *  one component for certain option types.
- *  @see AVOptionRanges for details.
- */
-#define AV_OPT_MULTI_COMPONENT_RANGE (1 << 12)
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- *
- * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
- * directly with av_opt_set(). Use special calls which take an options
- * AVDictionary (e.g. avformat_open_input()) to set options found with this
- * flag.
- */
-const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
-                            int opt_flags, int search_flags);
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- * @param[out] target_obj if non-NULL, an object to which the option belongs will be
- * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
- * in search_flags. This parameter is ignored if search_flags contain
- * AV_OPT_SEARCH_FAKE_OBJ.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- */
-const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
-                             int opt_flags, int search_flags, void **target_obj);
-
-/**
- * Iterate over all AVOptions belonging to obj.
- *
- * @param obj an AVOptions-enabled struct or a double pointer to an
- *            AVClass describing it.
- * @param prev result of the previous call to av_opt_next() on this object
- *             or NULL
- * @return next AVOption or NULL
- */
-const AVOption *av_opt_next(const void *obj, const AVOption *prev);
-
-/**
- * Iterate over AVOptions-enabled children of obj.
- *
- * @param prev result of a previous call to this function or NULL
- * @return next AVOptions-enabled child or NULL
- */
-void *av_opt_child_next(void *obj, void *prev);
-
-/**
- * Iterate over potential AVOptions-enabled children of parent.
- *
- * @param prev result of a previous call to this function or NULL
- * @return AVClass corresponding to next potential child or NULL
- */
-const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
-
-/**
- * @defgroup opt_set_funcs Option setting functions
- * @{
- * Those functions set the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. In case of av_opt_set() if the field is not
- * of a string type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be set on a child of obj.
- *
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR_OPTION_NOT_FOUND if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- */
-int av_opt_set         (void *obj, const char *name, const char *val, int search_flags);
-int av_opt_set_int     (void *obj, const char *name, int64_t     val, int search_flags);
-int av_opt_set_double  (void *obj, const char *name, double      val, int search_flags);
-int av_opt_set_q       (void *obj, const char *name, AVRational  val, int search_flags);
-int av_opt_set_bin     (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
-int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags);
-int av_opt_set_pixel_fmt (void *obj, const char *name, enum AVPixelFormat fmt, int search_flags);
-int av_opt_set_sample_fmt(void *obj, const char *name, enum AVSampleFormat fmt, int search_flags);
-int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int search_flags);
-int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, int search_flags);
-/**
- * @note Any old dictionary present is discarded and replaced with a copy of the new one. The
- * caller still owns val is and responsible for freeing it.
- */
-int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags);
-
-/**
- * Set a binary option to an integer list.
- *
- * @param obj    AVClass object to set options on
- * @param name   name of the binary option
- * @param val    pointer to an integer list (must have the correct type with
- *               regard to the contents of the list)
- * @param term   list terminator (usually 0 or -1)
- * @param flags  search flags
- */
-#define av_opt_set_int_list(obj, name, val, term, flags) \
-    (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \
-     AVERROR(EINVAL) : \
-     av_opt_set_bin(obj, name, (const uint8_t *)(val), \
-                    av_int_list_length(val, term) * sizeof(*(val)), flags))
-
-/**
- * @}
- */
-
-/**
- * @defgroup opt_get_funcs Option getting functions
- * @{
- * Those functions get a value of the option with the given name from an object.
- *
- * @param[in] obj a struct whose first element is a pointer to an AVClass.
- * @param[in] name name of the option to get.
- * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be found in a child of obj.
- * @param[out] out_val value of the option will be written here
- * @return >=0 on success, a negative error code otherwise
- */
-/**
- * @note the returned string will be av_malloc()ed and must be av_free()ed by the caller
- *
- * @note if AV_OPT_ALLOW_NULL is set in search_flags in av_opt_get, and the option has
- * AV_OPT_TYPE_STRING or AV_OPT_TYPE_BINARY and is set to NULL, *out_val will be set
- * to NULL instead of an allocated empty string.
- */
-int av_opt_get         (void *obj, const char *name, int search_flags, uint8_t   **out_val);
-int av_opt_get_int     (void *obj, const char *name, int search_flags, int64_t    *out_val);
-int av_opt_get_double  (void *obj, const char *name, int search_flags, double     *out_val);
-int av_opt_get_q       (void *obj, const char *name, int search_flags, AVRational *out_val);
-int av_opt_get_image_size(void *obj, const char *name, int search_flags, int *w_out, int *h_out);
-int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt);
-int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt);
-int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRational *out_val);
-int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout);
-/**
- * @param[out] out_val The returned dictionary is a copy of the actual value and must
- * be freed with av_dict_free() by the caller
- */
-int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val);
-/**
- * @}
- */
-/**
- * Gets a pointer to the requested field in a struct.
- * This function allows accessing a struct even when its fields are moved or
- * renamed since the application making the access has been compiled,
- *
- * @returns a pointer to the field, it can be cast to the correct type and read
- *          or written to.
- */
-void *av_opt_ptr(const AVClass *avclass, void *obj, const char *name);
-
-/**
- * Free an AVOptionRanges struct and set it to NULL.
- */
-void av_opt_freep_ranges(AVOptionRanges **ranges);
-
-/**
- * Get a list of allowed ranges for the given option.
- *
- * The returned list may depend on other fields in obj like for example profile.
- *
- * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
- *              AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
- *              AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges
- *
- * The result must be freed with av_opt_freep_ranges.
- *
- * @return number of compontents returned on success, a negative errro code otherwise
- */
-int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags);
-
-/**
- * Copy options from src object into dest object.
- *
- * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object.
- * Original memory allocated for such options is freed unless both src and dest options points to the same memory.
- *
- * @param dest Object to copy from
- * @param src  Object to copy into
- * @return 0 on success, negative on error
- */
-int av_opt_copy(void *dest, const void *src);
-
-/**
- * Get a default list of allowed ranges for the given option.
- *
- * This list is constructed without using the AVClass.query_ranges() callback
- * and can be used as fallback from within the callback.
- *
- * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
- *              AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
- *              AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges
- *
- * The result must be freed with av_opt_free_ranges.
- *
- * @return number of compontents returned on success, a negative errro code otherwise
- */
-int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags);
-
-/**
- * Check if given option is set to its default value.
- *
- * Options o must belong to the obj. This function must not be called to check child's options state.
- * @see av_opt_is_set_to_default_by_name().
- *
- * @param obj  AVClass object to check option on
- * @param o    option to be checked
- * @return     >0 when option is set to its default,
- *              0 when option is not set its default,
- *             <0 on error
- */
-int av_opt_is_set_to_default(void *obj, const AVOption *o);
-
-/**
- * Check if given option is set to its default value.
- *
- * @param obj          AVClass object to check option on
- * @param name         option name
- * @param search_flags combination of AV_OPT_SEARCH_*
- * @return             >0 when option is set to its default,
- *                     0 when option is not set its default,
- *                     <0 on error
- */
-int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_flags);
-
-
-#define AV_OPT_SERIALIZE_SKIP_DEFAULTS              0x00000001  ///< Serialize options that are not set to default values only.
-#define AV_OPT_SERIALIZE_OPT_FLAGS_EXACT            0x00000002  ///< Serialize options that exactly match opt_flags only.
-
-/**
- * Serialize object's options.
- *
- * Create a string containing object's serialized options.
- * Such string may be passed back to av_opt_set_from_string() in order to restore option values.
- * A key/value or pairs separator occurring in the serialized value or
- * name string are escaped through the av_escape() function.
- *
- * @param[in]  obj           AVClass object to serialize
- * @param[in]  opt_flags     serialize options with all the specified flags set (AV_OPT_FLAG)
- * @param[in]  flags         combination of AV_OPT_SERIALIZE_* flags
- * @param[out] buffer        Pointer to buffer that will be allocated with string containg serialized options.
- *                           Buffer must be freed by the caller when is no longer needed.
- * @param[in]  key_val_sep   character used to separate key from value
- * @param[in]  pairs_sep     character used to separate two pairs from each other
- * @return                   >= 0 on success, negative on error
- * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same.
- */
-int av_opt_serialize(void *obj, int opt_flags, int flags, char **buffer,
-                     const char key_val_sep, const char pairs_sep);
-/**
- * @}
- */
-
-#endif /* AVUTIL_OPT_H */
diff --git a/dependencies2013/win32/include/libavutil/parseutils.h b/dependencies2013/win32/include/libavutil/parseutils.h
deleted file mode 100644
index e66d24b7..00000000
--- a/dependencies2013/win32/include/libavutil/parseutils.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PARSEUTILS_H
-#define AVUTIL_PARSEUTILS_H
-
-#include <time.h>
-
-#include "rational.h"
-
-/**
- * @file
- * misc parsing utilities
- */
-
-/**
- * Parse str and store the parsed ratio in q.
- *
- * Note that a ratio with infinite (1/0) or negative value is
- * considered valid, so you should check on the returned value if you
- * want to exclude those values.
- *
- * The undefined value can be expressed using the "0:0" string.
- *
- * @param[in,out] q pointer to the AVRational which will contain the ratio
- * @param[in] str the string to parse: it has to be a string in the format
- * num:den, a float number or an expression
- * @param[in] max the maximum allowed numerator and denominator
- * @param[in] log_offset log level offset which is applied to the log
- * level of log_ctx
- * @param[in] log_ctx parent logging context
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_ratio(AVRational *q, const char *str, int max,
-                   int log_offset, void *log_ctx);
-
-#define av_parse_ratio_quiet(rate, str, max) \
-    av_parse_ratio(rate, str, max, AV_LOG_MAX_OFFSET, NULL)
-
-/**
- * Parse str and put in width_ptr and height_ptr the detected values.
- *
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * height value
- * @param[in] str the string to parse: it has to be a string in the format
- * width x height or a valid video size abbreviation.
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parse str and store the detected values in *rate.
- *
- * @param[in,out] rate pointer to the AVRational which will contain the detected
- * frame rate
- * @param[in] str the string to parse: it has to be a string in the format
- * rate_num / rate_den, a float number or a valid video rate abbreviation
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_rate(AVRational *rate, const char *str);
-
-/**
- * Put the RGBA values that correspond to color_string in rgba_color.
- *
- * @param color_string a string specifying a color. It can be the name of
- * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
- * possibly followed by "@" and a string representing the alpha
- * component.
- * The alpha component may be a string composed by "0x" followed by an
- * hexadecimal number or a decimal number between 0.0 and 1.0, which
- * represents the opacity value (0x00/0.0 means completely transparent,
- * 0xff/1.0 completely opaque).
- * If the alpha component is not specified then 0xff is assumed.
- * The string "random" will result in a random color.
- * @param slen length of the initial part of color_string containing the
- * color. It can be set to -1 if color_string is a null terminated string
- * containing nothing else than the color.
- * @return >= 0 in case of success, a negative value in case of
- * failure (for example if color_string cannot be parsed).
- */
-int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
-                   void *log_ctx);
-
-/**
- * Get the name of a color from the internal table of hard-coded named
- * colors.
- *
- * This function is meant to enumerate the color names recognized by
- * av_parse_color().
- *
- * @param color_idx index of the requested color, starting from 0
- * @param rgbp      if not NULL, will point to a 3-elements array with the color value in RGB
- * @return the color name string or NULL if color_idx is not in the array
- */
-const char *av_get_known_color_name(int color_idx, const uint8_t **rgb);
-
-/**
- * Parse timestr and return in *time a corresponding number of
- * microseconds.
- *
- * @param timeval puts here the number of microseconds corresponding
- * to the string in timestr. If the string represents a duration, it
- * is the number of microseconds contained in the time interval.  If
- * the string is a date, is the number of microseconds since 1st of
- * January, 1970 up to the time of the parsed date.  If timestr cannot
- * be successfully parsed, set *time to INT64_MIN.
-
- * @param timestr a string representing a date or a duration.
- * - If a date the syntax is:
- * @code
- * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH:MM:SS[.m...]]]}|{HHMMSS[.m...]]]}}[Z]
- * now
- * @endcode
- * If the value is "now" it takes the current time.
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * - If a duration the syntax is:
- * @code
- * [-][HH:]MM:SS[.m...]
- * [-]S+[.m...]
- * @endcode
- * @param duration flag which tells how to interpret timestr, if not
- * zero timestr is interpreted as a duration, otherwise as a date
- * @return >= 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_parse_time(int64_t *timeval, const char *timestr, int duration);
-
-/**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
- * Simplified version of strptime
- *
- * Parse the input string p according to the format string fmt and
- * store its results in the structure dt.
- * This implementation supports only a subset of the formats supported
- * by the standard strptime().
- *
- * The supported input field descriptors are listed below.
- * - %H: the hour as a decimal number, using a 24-hour clock, in the
- *   range '00' through '23'
- * - %J: hours as a decimal number, in the range '0' through INT_MAX
- * - %M: the minute as a decimal number, using a 24-hour clock, in the
- *   range '00' through '59'
- * - %S: the second as a decimal number, using a 24-hour clock, in the
- *   range '00' through '59'
- * - %Y: the year as a decimal number, using the Gregorian calendar
- * - %m: the month as a decimal number, in the range '1' through '12'
- * - %d: the day of the month as a decimal number, in the range '1'
- *   through '31'
- * - %T: alias for '%H:%M:%S'
- * - %%: a literal '%'
- *
- * @return a pointer to the first character not processed in this function
- *         call. In case the input string contains more characters than
- *         required by the format string the return value points right after
- *         the last consumed input character. In case the whole input string
- *         is consumed the return value points to the null byte at the end of
- *         the string. On failure NULL is returned.
- */
-char *av_small_strptime(const char *p, const char *fmt, struct tm *dt);
-
-/**
- * Convert the decomposed UTC time in tm to a time_t value.
- */
-time_t av_timegm(struct tm *tm);
-
-#endif /* AVUTIL_PARSEUTILS_H */
diff --git a/dependencies2013/win32/include/libavutil/pixdesc.h b/dependencies2013/win32/include/libavutil/pixdesc.h
deleted file mode 100644
index fc3737c4..00000000
--- a/dependencies2013/win32/include/libavutil/pixdesc.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-
-#include "attributes.h"
-#include "pixfmt.h"
-#include "version.h"
-
-typedef struct AVComponentDescriptor {
-    /**
-     * Which of the 4 planes contains the component.
-     */
-    int plane;
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    int step;
-
-    /**
-     * Number of elements before the component of the first pixel.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    int offset;
-
-    /**
-     * Number of least significant bits that must be shifted away
-     * to get the value.
-     */
-    int shift;
-
-    /**
-     * Number of bits in the component.
-     */
-    int depth;
-
-#if FF_API_PLUS1_MINUS1
-    /** deprecated, use step instead */
-    attribute_deprecated int step_minus1;
-
-    /** deprecated, use depth instead */
-    attribute_deprecated int depth_minus1;
-
-    /** deprecated, use offset instead */
-    attribute_deprecated int offset_plus1;
-#endif
-} AVComponentDescriptor;
-
-/**
- * Descriptor that unambiguously describes how the bits of a pixel are
- * stored in the up to 4 data planes of an image. It also stores the
- * subsampling factors and number of components.
- *
- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
- *       and all the YUV variants) AVPixFmtDescriptor just stores how values
- *       are stored not what these values represent.
- */
-typedef struct AVPixFmtDescriptor {
-    const char *name;
-    uint8_t nb_components;  ///< The number of components each pixel has, (1-4)
-
-    /**
-     * Amount to shift the luma width right to find the chroma width.
-     * For YV12 this is 1 for example.
-     * chroma_width = AV_CEIL_RSHIFT(luma_width, log2_chroma_w)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_w;
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= AV_CEIL_RSHIFT(luma_height, log2_chroma_h)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_h;
-
-    /**
-     * Combination of AV_PIX_FMT_FLAG_... flags.
-     */
-    uint64_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed.
-     * If the format has 1 or 2 components, then luma is 0.
-     * If the format has 3 or 4 components:
-     *   if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
-     *   otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
-     *
-     * If present, the Alpha channel is always the last component.
-     */
-    AVComponentDescriptor comp[4];
-
-    /**
-     * Alternative comma-separated names.
-     */
-    const char *alias;
-} AVPixFmtDescriptor;
-
-/**
- * Pixel format is big-endian.
- */
-#define AV_PIX_FMT_FLAG_BE           (1 << 0)
-/**
- * Pixel format has a palette in data[1], values are indexes in this palette.
- */
-#define AV_PIX_FMT_FLAG_PAL          (1 << 1)
-/**
- * All values of a component are bit-wise packed end to end.
- */
-#define AV_PIX_FMT_FLAG_BITSTREAM    (1 << 2)
-/**
- * Pixel format is an HW accelerated format.
- */
-#define AV_PIX_FMT_FLAG_HWACCEL      (1 << 3)
-/**
- * At least one pixel component is not in the first data plane.
- */
-#define AV_PIX_FMT_FLAG_PLANAR       (1 << 4)
-/**
- * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
- */
-#define AV_PIX_FMT_FLAG_RGB          (1 << 5)
-
-/**
- * The pixel format is "pseudo-paletted". This means that it contains a
- * fixed palette in the 2nd plane but the palette is fixed/constant for each
- * PIX_FMT. This allows interpreting the data as if it was PAL8, which can
- * in some cases be simpler. Or the data can be interpreted purely based on
- * the pixel format without using the palette.
- * An example of a pseudo-paletted format is AV_PIX_FMT_GRAY8
- */
-#define AV_PIX_FMT_FLAG_PSEUDOPAL    (1 << 6)
-
-/**
- * The pixel format has an alpha channel. This is set on all formats that
- * support alpha in some way. The exception is AV_PIX_FMT_PAL8, which can
- * carry alpha as part of the palette. Details are explained in the
- * AVPixelFormat enum, and are also encoded in the corresponding
- * AVPixFmtDescriptor.
- *
- * The alpha is always straight, never pre-multiplied.
- *
- * If a codec or a filter does not support alpha, it should set all alpha to
- * opaque, or use the equivalent pixel formats without alpha component, e.g.
- * AV_PIX_FMT_RGB0 (or AV_PIX_FMT_RGB24 etc.) instead of AV_PIX_FMT_RGBA.
- */
-#define AV_PIX_FMT_FLAG_ALPHA        (1 << 7)
-
-/**
- * The pixel format is following a Bayer pattern
- */
-#define AV_PIX_FMT_FLAG_BAYER        (1 << 8)
-
-/**
- * The pixel format contains IEEE-754 floating point values. Precision (double,
- * single, or half) should be determined by the pixel size (64, 32, or 16 bits).
- */
-#define AV_PIX_FMT_FLAG_FLOAT        (1 << 9)
-
-/**
- * Return the number of bits per pixel used by the pixel format
- * described by pixdesc. Note that this is not the same as the number
- * of bits per sample.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Return the number of bits per pixel for the pixel format
- * described by pixdesc, including any padding or unused bits.
- */
-int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-/**
- * @return a pixel format descriptor for provided pixel format or NULL if
- * this pixel format is unknown.
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
-
-/**
- * Iterate over all pixel format descriptors known to libavutil.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
-
-/**
- * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
- * is not a valid pointer to a pixel format descriptor.
- */
-enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
-
-/**
- * Utility function to access log2_chroma_w log2_chroma_h from
- * the pixel format AVPixFmtDescriptor.
- *
- * See av_get_chroma_sub_sample() for a function that asserts a
- * valid pixel format instead of returning an error code.
- * Its recommended that you use avcodec_get_chroma_sub_sample unless
- * you do check the return code!
- *
- * @param[in]  pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_w (horizontal/width shift)
- * @param[out] v_shift store log2_chroma_h (vertical/height shift)
- *
- * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
- */
-int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
-                                     int *h_shift, int *v_shift);
-
-/**
- * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
- * valid pixel format.
- */
-int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
-
-/**
- * @return the name for provided color range or NULL if unknown.
- */
-const char *av_color_range_name(enum AVColorRange range);
-
-/**
- * @return the AVColorRange value for name or an AVError if not found.
- */
-int av_color_range_from_name(const char *name);
-
-/**
- * @return the name for provided color primaries or NULL if unknown.
- */
-const char *av_color_primaries_name(enum AVColorPrimaries primaries);
-
-/**
- * @return the AVColorPrimaries value for name or an AVError if not found.
- */
-int av_color_primaries_from_name(const char *name);
-
-/**
- * @return the name for provided color transfer or NULL if unknown.
- */
-const char *av_color_transfer_name(enum AVColorTransferCharacteristic transfer);
-
-/**
- * @return the AVColorTransferCharacteristic value for name or an AVError if not found.
- */
-int av_color_transfer_from_name(const char *name);
-
-/**
- * @return the name for provided color space or NULL if unknown.
- */
-const char *av_color_space_name(enum AVColorSpace space);
-
-/**
- * @return the AVColorSpace value for name or an AVError if not found.
- */
-int av_color_space_from_name(const char *name);
-
-/**
- * @return the name for provided chroma location or NULL if unknown.
- */
-const char *av_chroma_location_name(enum AVChromaLocation location);
-
-/**
- * @return the AVChromaLocation value for name or an AVError if not found.
- */
-int av_chroma_location_from_name(const char *name);
-
-/**
- * Return the pixel format corresponding to name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE.
- */
-enum AVPixelFormat av_get_pix_fmt(const char *name);
-
-/**
- * Return the short name for a pixel format, NULL in case pix_fmt is
- * unknown.
- *
- * @see av_get_pix_fmt(), av_get_pix_fmt_string()
- */
-const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
-
-/**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or a header if pix_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param pix_fmt the number of the pixel format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- */
-char *av_get_pix_fmt_string(char *buf, int buf_size,
-                            enum AVPixelFormat pix_fmt);
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
- */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
-                        const int linesize[4], const AVPixFmtDescriptor *desc,
-                        int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4],
-                         const int linesize[4], const AVPixFmtDescriptor *desc,
-                         int x, int y, int c, int w);
-
-/**
- * Utility function to swap the endianness of a pixel format.
- *
- * @param[in]  pix_fmt the pixel format
- *
- * @return pixel format with swapped endianness if it exists,
- * otherwise AV_PIX_FMT_NONE
- */
-enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
-
-#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * av_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur
- * (maximum loss for an invalid dst_pix_fmt).
- */
-int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
-                        enum AVPixelFormat src_pix_fmt,
-                        int has_alpha);
-
-/**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * av_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur
- * (maximum loss for an invalid dst_pix_fmt).
- */
-enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
-                                             enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
-
-#endif /* AVUTIL_PIXDESC_H */
diff --git a/dependencies2013/win32/include/libavutil/pixelutils.h b/dependencies2013/win32/include/libavutil/pixelutils.h
deleted file mode 100644
index a8dbc157..00000000
--- a/dependencies2013/win32/include/libavutil/pixelutils.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXELUTILS_H
-#define AVUTIL_PIXELUTILS_H
-
-#include <stddef.h>
-#include <stdint.h>
-#include "common.h"
-
-/**
- * Sum of abs(src1[x] - src2[x])
- */
-typedef int (*av_pixelutils_sad_fn)(const uint8_t *src1, ptrdiff_t stride1,
-                                    const uint8_t *src2, ptrdiff_t stride2);
-
-/**
- * Get a potentially optimized pointer to a Sum-of-absolute-differences
- * function (see the av_pixelutils_sad_fn prototype).
- *
- * @param w_bits  1<<w_bits is the requested width of the block size
- * @param h_bits  1<<h_bits is the requested height of the block size
- * @param aligned If set to 2, the returned sad function will assume src1 and
- *                src2 addresses are aligned on the block size.
- *                If set to 1, the returned sad function will assume src1 is
- *                aligned on the block size.
- *                If set to 0, the returned sad function assume no particular
- *                alignment.
- * @param log_ctx context used for logging, can be NULL
- *
- * @return a pointer to the SAD function or NULL in case of error (because of
- *         invalid parameters)
- */
-av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits,
-                                              int aligned, void *log_ctx);
-
-#endif /* AVUTIL_PIXELUTILS_H */
diff --git a/dependencies2013/win32/include/libavutil/pixfmt.h b/dependencies2013/win32/include/libavutil/pixfmt.h
deleted file mode 100644
index 24889c8e..00000000
--- a/dependencies2013/win32/include/libavutil/pixfmt.h
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- */
-
-#include "libavutil/avconfig.h"
-#include "version.h"
-
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-
-/**
- * Pixel format.
- *
- * @note
- * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * @par
- * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB32 palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * @par
- * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- */
-enum AVPixelFormat {
-    AV_PIX_FMT_NONE = -1,
-    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_PAL8,      ///< 8 bits with AV_PIX_FMT_RGB32 palette
-    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range
-    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range
-    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
-    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    AV_PIX_FMT_XVMC_MPEG2_IDCT,
-    AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
-    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV440P and setting color_range
-    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), big-endian   , X=unused/undefined
-    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), little-endian, X=unused/undefined
-
-    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), big-endian   , X=unused/undefined
-    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), little-endian, X=unused/undefined
-
-#if FF_API_VAAPI
-    /** @name Deprecated pixel formats */
-    /**@{*/
-    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID
-    /**@}*/
-    AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD,
-#else
-    /**
-     *  Hardware acceleration through VA-API, data[3] contains a
-     *  VASurfaceID.
-     */
-    AV_PIX_FMT_VAAPI,
-#endif
-
-    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG-4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined
-    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), big-endian,    X=unused/undefined
-    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), little-endian, X=unused/undefined
-    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), big-endian,    X=unused/undefined
-    AV_PIX_FMT_YA8,       ///< 8 bits gray, 8 bits alpha
-
-    AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-    AV_PIX_FMT_GRAY8A= AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-
-    AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-
-    /**
-     * The following 12 formats have the disadvantage of needing 1 format for each bit depth.
-     * Notice that each 9/10 bits sample is stored in 16 bits with extra padding.
-     * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
-     */
-    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP
-    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
-    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
-    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
-    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
-    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
-    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
-    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-
-    AV_PIX_FMT_VDPAU,     ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
-
-    AV_PIX_FMT_XYZ12LE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
-    AV_PIX_FMT_XYZ12BE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
-    AV_PIX_FMT_NV16,         ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_NV20LE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_NV20BE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-
-    AV_PIX_FMT_RGBA64BE,     ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    AV_PIX_FMT_RGBA64LE,     ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    AV_PIX_FMT_BGRA64BE,     ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    AV_PIX_FMT_BGRA64LE,     ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-
-    AV_PIX_FMT_YVYU422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
-
-    AV_PIX_FMT_VDA,          ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef
-
-    AV_PIX_FMT_YA16BE,       ///< 16 bits gray, 16 bits alpha (big-endian)
-    AV_PIX_FMT_YA16LE,       ///< 16 bits gray, 16 bits alpha (little-endian)
-
-    AV_PIX_FMT_GBRAP,        ///< planar GBRA 4:4:4:4 32bpp
-    AV_PIX_FMT_GBRAP16BE,    ///< planar GBRA 4:4:4:4 64bpp, big-endian
-    AV_PIX_FMT_GBRAP16LE,    ///< planar GBRA 4:4:4:4 64bpp, little-endian
-    /**
-     *  HW acceleration through QSV, data[3] contains a pointer to the
-     *  mfxFrameSurface1 structure.
-     */
-    AV_PIX_FMT_QSV,
-    /**
-     * HW acceleration though MMAL, data[3] contains a pointer to the
-     * MMAL_BUFFER_HEADER_T structure.
-     */
-    AV_PIX_FMT_MMAL,
-
-    AV_PIX_FMT_D3D11VA_VLD,  ///< HW decoding through Direct3D11 via old API, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer
-
-    /**
-     * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
-     * exactly as for system memory frames.
-     */
-    AV_PIX_FMT_CUDA,
-
-    AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB...   X=unused/undefined
-    AV_PIX_FMT_RGB0,        ///< packed RGB 8:8:8, 32bpp, RGBXRGBX...   X=unused/undefined
-    AV_PIX_FMT_0BGR,        ///< packed BGR 8:8:8, 32bpp, XBGRXBGR...   X=unused/undefined
-    AV_PIX_FMT_BGR0,        ///< packed BGR 8:8:8, 32bpp, BGRXBGRX...   X=unused/undefined
-
-    AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big-endian
-    AV_PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little-endian
-    AV_PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big-endian
-    AV_PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little-endian
-    AV_PIX_FMT_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P and setting color_range
-
-    AV_PIX_FMT_BAYER_BGGR8,    ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_RGGB8,    ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_GBRG8,    ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_GRBG8,    ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */
-    AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */
-    AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
-    AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
-#if !FF_API_XVMC
-    AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
-#endif /* !FF_API_XVMC */
-    AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
-    AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
-    AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
-    AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
-    AV_PIX_FMT_AYUV64LE,    ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
-    AV_PIX_FMT_AYUV64BE,    ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
-
-    AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
-
-    AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, little-endian
-    AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, big-endian
-
-    AV_PIX_FMT_GBRAP12BE,  ///< planar GBR 4:4:4:4 48bpp, big-endian
-    AV_PIX_FMT_GBRAP12LE,  ///< planar GBR 4:4:4:4 48bpp, little-endian
-
-    AV_PIX_FMT_GBRAP10BE,  ///< planar GBR 4:4:4:4 40bpp, big-endian
-    AV_PIX_FMT_GBRAP10LE,  ///< planar GBR 4:4:4:4 40bpp, little-endian
-
-    AV_PIX_FMT_MEDIACODEC, ///< hardware decoding through MediaCodec
-
-    AV_PIX_FMT_GRAY12BE,   ///<        Y        , 12bpp, big-endian
-    AV_PIX_FMT_GRAY12LE,   ///<        Y        , 12bpp, little-endian
-    AV_PIX_FMT_GRAY10BE,   ///<        Y        , 10bpp, big-endian
-    AV_PIX_FMT_GRAY10LE,   ///<        Y        , 10bpp, little-endian
-
-    AV_PIX_FMT_P016LE, ///< like NV12, with 16bpp per component, little-endian
-    AV_PIX_FMT_P016BE, ///< like NV12, with 16bpp per component, big-endian
-
-    /**
-     * Hardware surfaces for Direct3D11.
-     *
-     * This is preferred over the legacy AV_PIX_FMT_D3D11VA_VLD. The new D3D11
-     * hwaccel API and filtering support AV_PIX_FMT_D3D11 only.
-     *
-     * data[0] contains a ID3D11Texture2D pointer, and data[1] contains the
-     * texture array index of the frame as intptr_t if the ID3D11Texture2D is
-     * an array texture (or always 0 if it's a normal texture).
-     */
-    AV_PIX_FMT_D3D11,
-
-    AV_PIX_FMT_GRAY9BE,   ///<        Y        , 9bpp, big-endian
-    AV_PIX_FMT_GRAY9LE,   ///<        Y        , 9bpp, little-endian
-
-    AV_PIX_FMT_GBRPF32BE,  ///< IEEE-754 single precision planar GBR 4:4:4,     96bpp, big-endian
-    AV_PIX_FMT_GBRPF32LE,  ///< IEEE-754 single precision planar GBR 4:4:4,     96bpp, little-endian
-    AV_PIX_FMT_GBRAPF32BE, ///< IEEE-754 single precision planar GBRA 4:4:4:4, 128bpp, big-endian
-    AV_PIX_FMT_GBRAPF32LE, ///< IEEE-754 single precision planar GBRA 4:4:4:4, 128bpp, little-endian
-
-    /**
-     * DRM-managed buffers exposed through PRIME buffer sharing.
-     *
-     * data[0] points to an AVDRMFrameDescriptor.
-     */
-    AV_PIX_FMT_DRM_PRIME,
-
-    AV_PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-};
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-#else
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-#endif
-
-#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
-#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
-#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-#define AV_PIX_FMT_0RGB32  AV_PIX_FMT_NE(0RGB, BGR0)
-#define AV_PIX_FMT_0BGR32  AV_PIX_FMT_NE(0BGR, RGB0)
-
-#define AV_PIX_FMT_GRAY9  AV_PIX_FMT_NE(GRAY9BE,  GRAY9LE)
-#define AV_PIX_FMT_GRAY10 AV_PIX_FMT_NE(GRAY10BE, GRAY10LE)
-#define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
-#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define AV_PIX_FMT_YA16   AV_PIX_FMT_NE(YA16BE,   YA16LE)
-#define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
-#define AV_PIX_FMT_BGR48  AV_PIX_FMT_NE(BGR48BE,  BGR48LE)
-#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
-
-#define AV_PIX_FMT_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
-#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
-#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
-#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-#define AV_PIX_FMT_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE)
-#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
-#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
-#define AV_PIX_FMT_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE)
-#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
-#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
-#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
-#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
-#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#define AV_PIX_FMT_GBRP9     AV_PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
-#define AV_PIX_FMT_GBRP10    AV_PIX_FMT_NE(GBRP10BE,    GBRP10LE)
-#define AV_PIX_FMT_GBRP12    AV_PIX_FMT_NE(GBRP12BE,    GBRP12LE)
-#define AV_PIX_FMT_GBRP14    AV_PIX_FMT_NE(GBRP14BE,    GBRP14LE)
-#define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
-#define AV_PIX_FMT_GBRAP10   AV_PIX_FMT_NE(GBRAP10BE,   GBRAP10LE)
-#define AV_PIX_FMT_GBRAP12   AV_PIX_FMT_NE(GBRAP12BE,   GBRAP12LE)
-#define AV_PIX_FMT_GBRAP16   AV_PIX_FMT_NE(GBRAP16BE,   GBRAP16LE)
-
-#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE,    BAYER_BGGR16LE)
-#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE,    BAYER_RGGB16LE)
-#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE,    BAYER_GBRG16LE)
-#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE,    BAYER_GRBG16LE)
-
-#define AV_PIX_FMT_GBRPF32    AV_PIX_FMT_NE(GBRPF32BE,  GBRPF32LE)
-#define AV_PIX_FMT_GBRAPF32   AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
-
-#define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
-#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
-#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
-#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-
-#define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
-#define AV_PIX_FMT_NV20       AV_PIX_FMT_NE(NV20BE,  NV20LE)
-#define AV_PIX_FMT_AYUV64     AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
-#define AV_PIX_FMT_P010       AV_PIX_FMT_NE(P010BE,  P010LE)
-#define AV_PIX_FMT_P016       AV_PIX_FMT_NE(P016BE,  P016LE)
-
-/**
-  * Chromaticity coordinates of the source primaries.
-  * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1.
-  */
-enum AVColorPrimaries {
-    AVCOL_PRI_RESERVED0   = 0,
-    AVCOL_PRI_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED = 2,
-    AVCOL_PRI_RESERVED    = 3,
-    AVCOL_PRI_BT470M      = 4,  ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-
-    AVCOL_PRI_BT470BG     = 5,  ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M   = 6,  ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M   = 7,  ///< functionally identical to above
-    AVCOL_PRI_FILM        = 8,  ///< colour filters using Illuminant C
-    AVCOL_PRI_BT2020      = 9,  ///< ITU-R BT2020
-    AVCOL_PRI_SMPTE428    = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
-    AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428,
-    AVCOL_PRI_SMPTE431    = 11, ///< SMPTE ST 431-2 (2011) / DCI P3
-    AVCOL_PRI_SMPTE432    = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3
-    AVCOL_PRI_JEDEC_P22   = 22, ///< JEDEC P22 phosphors
-    AVCOL_PRI_NB                ///< Not part of ABI
-};
-
-/**
- * Color Transfer Characteristic.
- * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.2.
- */
-enum AVColorTransferCharacteristic {
-    AVCOL_TRC_RESERVED0    = 0,
-    AVCOL_TRC_BT709        = 1,  ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED  = 2,
-    AVCOL_TRC_RESERVED     = 3,
-    AVCOL_TRC_GAMMA22      = 4,  ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28      = 5,  ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE170M    = 6,  ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
-    AVCOL_TRC_SMPTE240M    = 7,
-    AVCOL_TRC_LINEAR       = 8,  ///< "Linear transfer characteristics"
-    AVCOL_TRC_LOG          = 9,  ///< "Logarithmic transfer characteristic (100:1 range)"
-    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)"
-    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
-    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10-bit system
-    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12-bit system
-    AVCOL_TRC_SMPTE2084    = 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
-    AVCOL_TRC_SMPTEST2084  = AVCOL_TRC_SMPTE2084,
-    AVCOL_TRC_SMPTE428     = 17, ///< SMPTE ST 428-1
-    AVCOL_TRC_SMPTEST428_1 = AVCOL_TRC_SMPTE428,
-    AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma"
-    AVCOL_TRC_NB                 ///< Not part of ABI
-};
-
-/**
- * YUV colorspace type.
- * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.3.
- */
-enum AVColorSpace {
-    AVCOL_SPC_RGB         = 0,  ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB)
-    AVCOL_SPC_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED = 2,
-    AVCOL_SPC_RESERVED    = 3,
-    AVCOL_SPC_FCC         = 4,  ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-    AVCOL_SPC_BT470BG     = 5,  ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   = 6,  ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_SPC_SMPTE240M   = 7,  ///< functionally identical to above
-    AVCOL_SPC_YCGCO       = 8,  ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_YCOCG       = AVCOL_SPC_YCGCO,
-    AVCOL_SPC_BT2020_NCL  = 9,  ///< ITU-R BT2020 non-constant luminance system
-    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
-    AVCOL_SPC_SMPTE2085   = 11, ///< SMPTE 2085, Y'D'zD'x
-    AVCOL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system
-    AVCOL_SPC_CHROMA_DERIVED_CL = 13, ///< Chromaticity-derived constant luminance system
-    AVCOL_SPC_ICTCP       = 14, ///< ITU-R BT.2100-0, ICtCp
-    AVCOL_SPC_NB                ///< Not part of ABI
-};
-
-/**
- * MPEG vs JPEG YUV range.
- */
-enum AVColorRange {
-    AVCOL_RANGE_UNSPECIFIED = 0,
-    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB               ///< Not part of ABI
-};
-
-/**
- * Location of chroma samples.
- *
- * Illustration showing the location of the first (top left) chroma sample of the
- * image, the left shows only luma, the right
- * shows the location of the chroma sample, the 2 could be imagined to overlay
- * each other but are drawn separately due to limitations of ASCII
- *
- *                1st 2nd       1st 2nd horizontal luma sample positions
- *                 v   v         v   v
- *                 ______        ______
- *1st luma line > |X   X ...    |3 4 X ...     X are luma samples,
- *                |             |1 2           1-6 are possible chroma positions
- *2nd luma line > |X   X ...    |5 6 X ...     0 is undefined/unknown position
- */
-enum AVChromaLocation {
-    AVCHROMA_LOC_UNSPECIFIED = 0,
-    AVCHROMA_LOC_LEFT        = 1, ///< MPEG-2/4 4:2:0, H.264 default for 4:2:0
-    AVCHROMA_LOC_CENTER      = 2, ///< MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0
-    AVCHROMA_LOC_TOPLEFT     = 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2
-    AVCHROMA_LOC_TOP         = 4,
-    AVCHROMA_LOC_BOTTOMLEFT  = 5,
-    AVCHROMA_LOC_BOTTOM      = 6,
-    AVCHROMA_LOC_NB               ///< Not part of ABI
-};
-
-#endif /* AVUTIL_PIXFMT_H */
diff --git a/dependencies2013/win32/include/libavutil/random_seed.h b/dependencies2013/win32/include/libavutil/random_seed.h
deleted file mode 100644
index 0462a048..00000000
--- a/dependencies2013/win32/include/libavutil/random_seed.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_RANDOM_SEED_H
-#define AVUTIL_RANDOM_SEED_H
-
-#include <stdint.h>
-/**
- * @addtogroup lavu_crypto
- * @{
- */
-
-/**
- * Get a seed to use in conjunction with random functions.
- * This function tries to provide a good seed at a best effort bases.
- * Its possible to call this function multiple times if more bits are needed.
- * It can be quite slow, which is why it should only be used as seed for a faster
- * PRNG. The quality of the seed depends on the platform.
- */
-uint32_t av_get_random_seed(void);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RANDOM_SEED_H */
diff --git a/dependencies2013/win32/include/libavutil/rational.h b/dependencies2013/win32/include/libavutil/rational.h
deleted file mode 100644
index 5c6b67b4..00000000
--- a/dependencies2013/win32/include/libavutil/rational.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_math_rational
- * Utilties for rational number calculation.
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include <limits.h>
-#include "attributes.h"
-
-/**
- * @defgroup lavu_math_rational AVRational
- * @ingroup lavu_math
- * Rational number calculation.
- *
- * While rational numbers can be expressed as floating-point numbers, the
- * conversion process is a lossy one, so are floating-point operations. On the
- * other hand, the nature of FFmpeg demands highly accurate calculation of
- * timestamps. This set of rational number utilities serves as a generic
- * interface for manipulating rational numbers as pairs of numerators and
- * denominators.
- *
- * Many of the functions that operate on AVRational's have the suffix `_q`, in
- * reference to the mathematical symbol "ℚ" (Q) which denotes the set of all
- * rational numbers.
- *
- * @{
- */
-
-/**
- * Rational number (pair of numerator and denominator).
- */
-typedef struct AVRational{
-    int num; ///< Numerator
-    int den; ///< Denominator
-} AVRational;
-
-/**
- * Create an AVRational.
- *
- * Useful for compilers that do not support compound literals.
- *
- * @note The return value is not reduced.
- * @see av_reduce()
- */
-static inline AVRational av_make_q(int num, int den)
-{
-    AVRational r = { num, den };
-    return r;
-}
-
-/**
- * Compare two rationals.
- *
- * @param a First rational
- * @param b Second rational
- *
- * @return One of the following values:
- *         - 0 if `a == b`
- *         - 1 if `a > b`
- *         - -1 if `a < b`
- *         - `INT_MIN` if one of the values is of the form `0 / 0`
- */
-static inline int av_cmp_q(AVRational a, AVRational b){
-    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-
-    if(tmp) return (int)((tmp ^ a.den ^ b.den)>>63)|1;
-    else if(b.den && a.den) return 0;
-    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
-    else                    return INT_MIN;
-}
-
-/**
- * Convert an AVRational to a `double`.
- * @param a AVRational to convert
- * @return `a` in floating-point form
- * @see av_d2q()
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduce a fraction.
- *
- * This is useful for framerate calculations.
- *
- * @param[out] dst_num Destination numerator
- * @param[out] dst_den Destination denominator
- * @param[in]      num Source numerator
- * @param[in]      den Source denominator
- * @param[in]      max Maximum allowed values for `dst_num` & `dst_den`
- * @return 1 if the operation is exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiply two rationals.
- * @param b First rational
- * @param c Second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divide one rational by another.
- * @param b First rational
- * @param c Second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Add two rationals.
- * @param b First rational
- * @param c Second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtract one rational from another.
- * @param b First rational
- * @param c Second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * Invert a rational.
- * @param q value
- * @return 1 / q
- */
-static av_always_inline AVRational av_inv_q(AVRational q)
-{
-    AVRational r = { q.den, q.num };
-    return r;
-}
-
-/**
- * Convert a double precision floating point number to a rational.
- *
- * In case of infinity, the returned value is expressed as `{1, 0}` or
- * `{-1, 0}` depending on the sign.
- *
- * @param d   `double` to convert
- * @param max Maximum allowed numerator and denominator
- * @return `d` in AVRational form
- * @see av_q2d()
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * Find which of the two rationals is closer to another rational.
- *
- * @param q     Rational to be compared against
- * @param q1,q2 Rationals to be tested
- * @return One of the following values:
- *         - 1 if `q1` is nearer to `q` than `q2`
- *         - -1 if `q2` is nearer to `q` than `q1`
- *         - 0 if they have the same distance
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Find the value in a list of rationals nearest a given reference rational.
- *
- * @param q      Reference rational
- * @param q_list Array of rationals terminated by `{0, 0}`
- * @return Index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-/**
- * Convert an AVRational to a IEEE 32-bit `float` expressed in fixed-point
- * format.
- *
- * @param q Rational to be converted
- * @return Equivalent floating-point value, expressed as an unsigned 32-bit
- *         integer.
- * @note The returned value is platform-indepedant.
- */
-uint32_t av_q2intfloat(AVRational q);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RATIONAL_H */
diff --git a/dependencies2013/win32/include/libavutil/rc4.h b/dependencies2013/win32/include/libavutil/rc4.h
deleted file mode 100644
index 029cd2ad..00000000
--- a/dependencies2013/win32/include/libavutil/rc4.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * RC4 encryption/decryption/pseudo-random number generator
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_RC4_H
-#define AVUTIL_RC4_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_rc4 RC4
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVRC4 {
-    uint8_t state[256];
-    int x, y;
-} AVRC4;
-
-/**
- * Allocate an AVRC4 context.
- */
-AVRC4 *av_rc4_alloc(void);
-
-/**
- * @brief Initializes an AVRC4 context.
- *
- * @param key_bits must be a multiple of 8
- * @param decrypt 0 for encryption, 1 for decryption, currently has no effect
- * @return zero on success, negative value otherwise
- */
-int av_rc4_init(struct AVRC4 *d, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * @brief Encrypts / decrypts using the RC4 algorithm.
- *
- * @param count number of bytes
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst, may be NULL
- * @param iv not (yet) used for RC4, should be NULL
- * @param decrypt 0 for encryption, 1 for decryption, not (yet) used
- */
-void av_rc4_crypt(struct AVRC4 *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RC4_H */
diff --git a/dependencies2013/win32/include/libavutil/replaygain.h b/dependencies2013/win32/include/libavutil/replaygain.h
deleted file mode 100644
index b49bf1a3..00000000
--- a/dependencies2013/win32/include/libavutil/replaygain.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_REPLAYGAIN_H
-#define AVUTIL_REPLAYGAIN_H
-
-#include <stdint.h>
-
-/**
- * ReplayGain information (see
- * http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_1.0_specification).
- * The size of this struct is a part of the public ABI.
- */
-typedef struct AVReplayGain {
-    /**
-     * Track replay gain in microbels (divide by 100000 to get the value in dB).
-     * Should be set to INT32_MIN when unknown.
-     */
-    int32_t track_gain;
-    /**
-     * Peak track amplitude, with 100000 representing full scale (but values
-     * may overflow). 0 when unknown.
-     */
-    uint32_t track_peak;
-    /**
-     * Same as track_gain, but for the whole album.
-     */
-    int32_t album_gain;
-    /**
-     * Same as track_peak, but for the whole album,
-     */
-    uint32_t album_peak;
-} AVReplayGain;
-
-#endif /* AVUTIL_REPLAYGAIN_H */
diff --git a/dependencies2013/win32/include/libavutil/ripemd.h b/dependencies2013/win32/include/libavutil/ripemd.h
deleted file mode 100644
index 6d6bb320..00000000
--- a/dependencies2013/win32/include/libavutil/ripemd.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (C) 2013 James Almer <jamrial@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_ripemd
- * Public header for RIPEMD hash function implementation.
- */
-
-#ifndef AVUTIL_RIPEMD_H
-#define AVUTIL_RIPEMD_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_ripemd RIPEMD
- * @ingroup lavu_hash
- * RIPEMD hash function implementation.
- *
- * @{
- */
-
-extern const int av_ripemd_size;
-
-struct AVRIPEMD;
-
-/**
- * Allocate an AVRIPEMD context.
- */
-struct AVRIPEMD *av_ripemd_alloc(void);
-
-/**
- * Initialize RIPEMD hashing.
- *
- * @param context pointer to the function context (of size av_ripemd_size)
- * @param bits    number of bits in digest (128, 160, 256 or 320 bits)
- * @return        zero if initialization succeeded, -1 otherwise
- */
-int av_ripemd_init(struct AVRIPEMD* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- */
-void av_ripemd_final(struct AVRIPEMD* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RIPEMD_H */
diff --git a/dependencies2013/win32/include/libavutil/samplefmt.h b/dependencies2013/win32/include/libavutil/samplefmt.h
deleted file mode 100644
index 8cd43ae8..00000000
--- a/dependencies2013/win32/include/libavutil/samplefmt.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SAMPLEFMT_H
-#define AVUTIL_SAMPLEFMT_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_audio
- * @{
- *
- * @defgroup lavu_sampfmts Audio sample formats
- *
- * Audio sample format enumeration and related convenience functions.
- * @{
- */
-
-/**
- * Audio sample formats
- *
- * - The data described by the sample format is always in native-endian order.
- *   Sample values can be expressed by native C types, hence the lack of a signed
- *   24-bit sample format even though it is a common raw audio data format.
- *
- * - The floating-point formats are based on full volume being in the range
- *   [-1.0, 1.0]. Any values outside this range are beyond full volume level.
- *
- * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
- *   (such as AVFrame in libavcodec) is as follows:
- *
- * @par
- * For planar sample formats, each audio channel is in a separate data plane,
- * and linesize is the buffer size, in bytes, for a single plane. All data
- * planes must be the same size. For packed sample formats, only the first data
- * plane is used, and samples for each channel are interleaved. In this case,
- * linesize is the buffer size, in bytes, for the 1 plane.
- *
- */
-enum AVSampleFormat {
-    AV_SAMPLE_FMT_NONE = -1,
-    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
-    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
-    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
-    AV_SAMPLE_FMT_FLT,         ///< float
-    AV_SAMPLE_FMT_DBL,         ///< double
-
-    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
-    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
-    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
-    AV_SAMPLE_FMT_FLTP,        ///< float, planar
-    AV_SAMPLE_FMT_DBLP,        ///< double, planar
-    AV_SAMPLE_FMT_S64,         ///< signed 64 bits
-    AV_SAMPLE_FMT_S64P,        ///< signed 64 bits, planar
-
-    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
-};
-
-/**
- * Return the name of sample_fmt, or NULL if sample_fmt is not
- * recognized.
- */
-const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-
-/**
- * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
- * on error.
- */
-enum AVSampleFormat av_get_sample_fmt(const char *name);
-
-/**
- * Return the planar<->packed alternative form of the given sample format, or
- * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the
- * requested planar/packed format, the format returned is the same as the
- * input.
- */
-enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar);
-
-/**
- * Get the packed alternative form of the given sample format.
- *
- * If the passed sample_fmt is already in packed format, the format returned is
- * the same as the input.
- *
- * @return  the packed alternative form of the given sample format or
-            AV_SAMPLE_FMT_NONE on error.
- */
-enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the planar alternative form of the given sample format.
- *
- * If the passed sample_fmt is already in planar format, the format returned is
- * the same as the input.
- *
- * @return  the planar alternative form of the given sample format or
-            AV_SAMPLE_FMT_NONE on error.
- */
-enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
-
-/**
- * Generate a string corresponding to the sample format with
- * sample_fmt, or a header if sample_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param sample_fmt the number of the sample format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- * @return the pointer to the filled buffer or NULL if sample_fmt is
- * unknown or in case of other errors
- */
-char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
-
-/**
- * Return number of bytes per sample.
- *
- * @param sample_fmt the sample format
- * @return number of bytes per sample or zero if unknown for the given
- * sample format
- */
-int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-
-/**
- * Check if the sample format is planar.
- *
- * @param sample_fmt the sample format to inspect
- * @return 1 if the sample format is planar, 0 if it is interleaved
- */
-int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the required buffer size for the given audio parameters.
- *
- * @param[out] linesize calculated linesize, may be NULL
- * @param nb_channels   the number of channels
- * @param nb_samples    the number of samples in a single channel
- * @param sample_fmt    the sample format
- * @param align         buffer size alignment (0 = default, 1 = no alignment)
- * @return              required buffer size, or negative error code on failure
- */
-int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
-                               enum AVSampleFormat sample_fmt, int align);
-
-/**
- * @}
- *
- * @defgroup lavu_sampmanip Samples manipulation
- *
- * Functions that manipulate audio samples
- * @{
- */
-
-/**
- * Fill plane data pointers and linesize for samples with sample
- * format sample_fmt.
- *
- * The audio_data array is filled with the pointers to the samples data planes:
- * for planar, set the start point of each channel's data within the buffer,
- * for packed, set the start point of the entire buffer only.
- *
- * The value pointed to by linesize is set to the aligned size of each
- * channel's data buffer for planar layout, or to the aligned size of the
- * buffer for all channels for packed layout.
- *
- * The buffer in buf must be big enough to contain all the samples
- * (use av_samples_get_buffer_size() to compute its minimum size),
- * otherwise the audio_data pointers will point to invalid data.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    calculated linesize, may be NULL
- * @param buf              the pointer to a buffer containing the samples
- * @param nb_channels      the number of channels
- * @param nb_samples       the number of samples in a single channel
- * @param sample_fmt       the sample format
- * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 >=0 on success or a negative error code on failure
- * @todo return minimum size in bytes required for the buffer in case
- * of success at the next bump
- */
-int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
-                           const uint8_t *buf,
-                           int nb_channels, int nb_samples,
-                           enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Allocate a samples buffer for nb_samples samples, and fill data pointers and
- * linesize accordingly.
- * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
- * Allocated data will be initialized to silence.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    aligned size for audio buffer(s), may be NULL
- * @param nb_channels      number of audio channels
- * @param nb_samples       number of samples per channel
- * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 >=0 on success or a negative error code on failure
- * @todo return the size of the allocated buffer in case of success at the next bump
- * @see av_samples_fill_arrays()
- * @see av_samples_alloc_array_and_samples()
- */
-int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
-                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Allocate a data pointers array, samples buffer for nb_samples
- * samples, and fill data pointers and linesize accordingly.
- *
- * This is the same as av_samples_alloc(), but also allocates the data
- * pointers array.
- *
- * @see av_samples_alloc()
- */
-int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels,
-                                       int nb_samples, enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Copy samples from src to dst.
- *
- * @param dst destination array of pointers to data planes
- * @param src source array of pointers to data planes
- * @param dst_offset offset in samples at which the data will be written to dst
- * @param src_offset offset in samples at which the data will be read from src
- * @param nb_samples number of samples to be copied
- * @param nb_channels number of audio channels
- * @param sample_fmt audio sample format
- */
-int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
-                    int src_offset, int nb_samples, int nb_channels,
-                    enum AVSampleFormat sample_fmt);
-
-/**
- * Fill an audio buffer with silence.
- *
- * @param audio_data  array of pointers to data planes
- * @param offset      offset in samples at which to start filling
- * @param nb_samples  number of samples to fill
- * @param nb_channels number of audio channels
- * @param sample_fmt  audio sample format
- */
-int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
-                           int nb_channels, enum AVSampleFormat sample_fmt);
-
-/**
- * @}
- * @}
- */
-#endif /* AVUTIL_SAMPLEFMT_H */
diff --git a/dependencies2013/win32/include/libavutil/sha.h b/dependencies2013/win32/include/libavutil/sha.h
deleted file mode 100644
index c0180e57..00000000
--- a/dependencies2013/win32/include/libavutil/sha.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_sha
- * Public header for SHA-1 & SHA-256 hash function implementations.
- */
-
-#ifndef AVUTIL_SHA_H
-#define AVUTIL_SHA_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_sha SHA
- * @ingroup lavu_hash
- * SHA-1 and SHA-256 (Secure Hash Algorithm) hash function implementations.
- *
- * This module supports the following SHA hash functions:
- *
- * - SHA-1: 160 bits
- * - SHA-224: 224 bits, as a variant of SHA-2
- * - SHA-256: 256 bits, as a variant of SHA-2
- *
- * @see For SHA-384, SHA-512, and variants thereof, see @ref lavu_sha512.
- *
- * @{
- */
-
-extern const int av_sha_size;
-
-struct AVSHA;
-
-/**
- * Allocate an AVSHA context.
- */
-struct AVSHA *av_sha_alloc(void);
-
-/**
- * Initialize SHA-1 or SHA-2 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
- * @return        zero if initialization succeeded, -1 otherwise
- */
-int av_sha_init(struct AVSHA* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param ctx     hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-#if FF_API_CRYPTO_SIZE_T
-void av_sha_update(struct AVSHA *ctx, const uint8_t *data, unsigned int len);
-#else
-void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len);
-#endif
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- */
-void av_sha_final(struct AVSHA* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA_H */
diff --git a/dependencies2013/win32/include/libavutil/sha512.h b/dependencies2013/win32/include/libavutil/sha512.h
deleted file mode 100644
index bef714b4..00000000
--- a/dependencies2013/win32/include/libavutil/sha512.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (C) 2013 James Almer <jamrial@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_sha512
- * Public header for SHA-512 implementation.
- */
-
-#ifndef AVUTIL_SHA512_H
-#define AVUTIL_SHA512_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_sha512 SHA-512
- * @ingroup lavu_hash
- * SHA-512 (Secure Hash Algorithm) hash function implementations.
- *
- * This module supports the following SHA-2 hash functions:
- *
- * - SHA-512/224: 224 bits
- * - SHA-512/256: 256 bits
- * - SHA-384: 384 bits
- * - SHA-512: 512 bits
- *
- * @see For SHA-1, SHA-256, and variants thereof, see @ref lavu_sha.
- *
- * @{
- */
-
-extern const int av_sha512_size;
-
-struct AVSHA512;
-
-/**
- * Allocate an AVSHA512 context.
- */
-struct AVSHA512 *av_sha512_alloc(void);
-
-/**
- * Initialize SHA-2 512 hashing.
- *
- * @param context pointer to the function context (of size av_sha512_size)
- * @param bits    number of bits in digest (224, 256, 384 or 512 bits)
- * @return        zero if initialization succeeded, -1 otherwise
- */
-int av_sha512_init(struct AVSHA512* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-#if FF_API_CRYPTO_SIZE_T
-void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
-#else
-void av_sha512_update(struct AVSHA512* context, const uint8_t* data, size_t len);
-#endif
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- */
-void av_sha512_final(struct AVSHA512* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA512_H */
diff --git a/dependencies2013/win32/include/libavutil/spherical.h b/dependencies2013/win32/include/libavutil/spherical.h
deleted file mode 100644
index cef759cf..00000000
--- a/dependencies2013/win32/include/libavutil/spherical.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2016 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Spherical video
- */
-
-#ifndef AVUTIL_SPHERICAL_H
-#define AVUTIL_SPHERICAL_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * @addtogroup lavu_video
- * @{
- *
- * @defgroup lavu_video_spherical Spherical video mapping
- * @{
- */
-
-/**
- * @addtogroup lavu_video_spherical
- * A spherical video file contains surfaces that need to be mapped onto a
- * sphere. Depending on how the frame was converted, a different distortion
- * transformation or surface recomposition function needs to be applied before
- * the video should be mapped and displayed.
- */
-
-/**
- * Projection of the video surface(s) on a sphere.
- */
-enum AVSphericalProjection {
-    /**
-     * Video represents a sphere mapped on a flat surface using
-     * equirectangular projection.
-     */
-    AV_SPHERICAL_EQUIRECTANGULAR,
-
-    /**
-     * Video frame is split into 6 faces of a cube, and arranged on a
-     * 3x2 layout. Faces are oriented upwards for the front, left, right,
-     * and back faces. The up face is oriented so the top of the face is
-     * forwards and the down face is oriented so the top of the face is
-     * to the back.
-     */
-    AV_SPHERICAL_CUBEMAP,
-
-    /**
-     * Video represents a portion of a sphere mapped on a flat surface
-     * using equirectangular projection. The @ref bounding fields indicate
-     * the position of the current video in a larger surface.
-     */
-    AV_SPHERICAL_EQUIRECTANGULAR_TILE,
-};
-
-/**
- * This structure describes how to handle spherical videos, outlining
- * information about projection, initial layout, and any other view modifier.
- *
- * @note The struct must be allocated with av_spherical_alloc() and
- *       its size is not a part of the public ABI.
- */
-typedef struct AVSphericalMapping {
-    /**
-     * Projection type.
-     */
-    enum AVSphericalProjection projection;
-
-    /**
-     * @name Initial orientation
-     * @{
-     * There fields describe additional rotations applied to the sphere after
-     * the video frame is mapped onto it. The sphere is rotated around the
-     * viewer, who remains stationary. The order of transformation is always
-     * yaw, followed by pitch, and finally by roll.
-     *
-     * The coordinate system matches the one defined in OpenGL, where the
-     * forward vector (z) is coming out of screen, and it is equivalent to
-     * a rotation matrix of R = r_y(yaw) * r_x(pitch) * r_z(roll).
-     *
-     * A positive yaw rotates the portion of the sphere in front of the viewer
-     * toward their right. A positive pitch rotates the portion of the sphere
-     * in front of the viewer upwards. A positive roll tilts the portion of
-     * the sphere in front of the viewer to the viewer's right.
-     *
-     * These values are exported as 16.16 fixed point.
-     *
-     * See this equirectangular projection as example:
-     *
-     * @code{.unparsed}
-     *                   Yaw
-     *     -180           0           180
-     *   90 +-------------+-------------+  180
-     *      |             |             |                  up
-     * P    |             |             |                 y|    forward
-     * i    |             ^             |                  |   /z
-     * t  0 +-------------X-------------+    0 Roll        |  /
-     * c    |             |             |                  | /
-     * h    |             |             |                 0|/_____right
-     *      |             |             |                        x
-     *  -90 +-------------+-------------+ -180
-     *
-     * X - the default camera center
-     * ^ - the default up vector
-     * @endcode
-     */
-    int32_t yaw;   ///< Rotation around the up vector [-180, 180].
-    int32_t pitch; ///< Rotation around the right vector [-90, 90].
-    int32_t roll;  ///< Rotation around the forward vector [-180, 180].
-    /**
-     * @}
-     */
-
-    /**
-     * @name Bounding rectangle
-     * @anchor bounding
-     * @{
-     * These fields indicate the location of the current tile, and where
-     * it should be mapped relative to the original surface. They are
-     * exported as 0.32 fixed point, and can be converted to classic
-     * pixel values with av_spherical_bounds().
-     *
-     * @code{.unparsed}
-     *      +----------------+----------+
-     *      |                |bound_top |
-     *      |            +--------+     |
-     *      | bound_left |tile    |     |
-     *      +<---------->|        |<--->+bound_right
-     *      |            +--------+     |
-     *      |                |          |
-     *      |    bound_bottom|          |
-     *      +----------------+----------+
-     * @endcode
-     *
-     * If needed, the original video surface dimensions can be derived
-     * by adding the current stream or frame size to the related bounds,
-     * like in the following example:
-     *
-     * @code{c}
-     *     original_width  = tile->width  + bound_left + bound_right;
-     *     original_height = tile->height + bound_top  + bound_bottom;
-     * @endcode
-     *
-     * @note These values are valid only for the tiled equirectangular
-     *       projection type (@ref AV_SPHERICAL_EQUIRECTANGULAR_TILE),
-     *       and should be ignored in all other cases.
-     */
-    uint32_t bound_left;   ///< Distance from the left edge
-    uint32_t bound_top;    ///< Distance from the top edge
-    uint32_t bound_right;  ///< Distance from the right edge
-    uint32_t bound_bottom; ///< Distance from the bottom edge
-    /**
-     * @}
-     */
-
-    /**
-     * Number of pixels to pad from the edge of each cube face.
-     *
-     * @note This value is valid for only for the cubemap projection type
-     *       (@ref AV_SPHERICAL_CUBEMAP), and should be ignored in all other
-     *       cases.
-     */
-    uint32_t padding;
-} AVSphericalMapping;
-
-/**
- * Allocate a AVSphericalVideo structure and initialize its fields to default
- * values.
- *
- * @return the newly allocated struct or NULL on failure
- */
-AVSphericalMapping *av_spherical_alloc(size_t *size);
-
-/**
- * Convert the @ref bounding fields from an AVSphericalVideo
- * from 0.32 fixed point to pixels.
- *
- * @param map    The AVSphericalVideo map to read bound values from.
- * @param width  Width of the current frame or stream.
- * @param height Height of the current frame or stream.
- * @param left   Pixels from the left edge.
- * @param top    Pixels from the top edge.
- * @param right  Pixels from the right edge.
- * @param bottom Pixels from the bottom edge.
- */
-void av_spherical_tile_bounds(const AVSphericalMapping *map,
-                              size_t width, size_t height,
-                              size_t *left, size_t *top,
-                              size_t *right, size_t *bottom);
-
-/**
- * Provide a human-readable name of a given AVSphericalProjection.
- *
- * @param projection The input AVSphericalProjection.
- *
- * @return The name of the AVSphericalProjection, or "unknown".
- */
-const char *av_spherical_projection_name(enum AVSphericalProjection projection);
-
-/**
- * Get the AVSphericalProjection form a human-readable name.
- *
- * @param name The input string.
- *
- * @return The AVSphericalProjection value, or -1 if not found.
- */
-int av_spherical_from_name(const char *name);
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_SPHERICAL_H */
diff --git a/dependencies2013/win32/include/libavutil/stereo3d.h b/dependencies2013/win32/include/libavutil/stereo3d.h
deleted file mode 100644
index 54f4c4c5..00000000
--- a/dependencies2013/win32/include/libavutil/stereo3d.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Stereoscopic video
- */
-
-#ifndef AVUTIL_STEREO3D_H
-#define AVUTIL_STEREO3D_H
-
-#include <stdint.h>
-
-#include "frame.h"
-
-/**
- * @addtogroup lavu_video
- * @{
- *
- * @defgroup lavu_video_stereo3d Stereo3D types and functions
- * @{
- */
-
-/**
- * @addtogroup lavu_video_stereo3d
- * A stereoscopic video file consists in multiple views embedded in a single
- * frame, usually describing two views of a scene. This file describes all
- * possible codec-independent view arrangements.
- * */
-
-/**
- * List of possible 3D Types
- */
-enum AVStereo3DType {
-    /**
-     * Video is not stereoscopic (and metadata has to be there).
-     */
-    AV_STEREO3D_2D,
-
-    /**
-     * Views are next to each other.
-     *
-     * @code{.unparsed}
-     *    LLLLRRRR
-     *    LLLLRRRR
-     *    LLLLRRRR
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_SIDEBYSIDE,
-
-    /**
-     * Views are on top of each other.
-     *
-     * @code{.unparsed}
-     *    LLLLLLLL
-     *    LLLLLLLL
-     *    RRRRRRRR
-     *    RRRRRRRR
-     * @endcode
-     */
-    AV_STEREO3D_TOPBOTTOM,
-
-    /**
-     * Views are alternated temporally.
-     *
-     * @code{.unparsed}
-     *     frame0   frame1   frame2   ...
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    ...      ...      ...
-     * @endcode
-     */
-    AV_STEREO3D_FRAMESEQUENCE,
-
-    /**
-     * Views are packed in a checkerboard-like structure per pixel.
-     *
-     * @code{.unparsed}
-     *    LRLRLRLR
-     *    RLRLRLRL
-     *    LRLRLRLR
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_CHECKERBOARD,
-
-    /**
-     * Views are next to each other, but when upscaling
-     * apply a checkerboard pattern.
-     *
-     * @code{.unparsed}
-     *     LLLLRRRR          L L L L    R R R R
-     *     LLLLRRRR    =>     L L L L  R R R R
-     *     LLLLRRRR          L L L L    R R R R
-     *     LLLLRRRR           L L L L  R R R R
-     * @endcode
-     */
-    AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
-
-    /**
-     * Views are packed per line, as if interlaced.
-     *
-     * @code{.unparsed}
-     *    LLLLLLLL
-     *    RRRRRRRR
-     *    LLLLLLLL
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_LINES,
-
-    /**
-     * Views are packed per column.
-     *
-     * @code{.unparsed}
-     *    LRLRLRLR
-     *    LRLRLRLR
-     *    LRLRLRLR
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_COLUMNS,
-};
-
-
-/**
- * Inverted views, Right/Bottom represents the left view.
- */
-#define AV_STEREO3D_FLAG_INVERT     (1 << 0)
-
-/**
- * Stereo 3D type: this structure describes how two videos are packed
- * within a single video surface, with additional information as needed.
- *
- * @note The struct must be allocated with av_stereo3d_alloc() and
- *       its size is not a part of the public ABI.
- */
-typedef struct AVStereo3D {
-    /**
-     * How views are packed within the video.
-     */
-    enum AVStereo3DType type;
-
-    /**
-     * Additional information about the frame packing.
-     */
-    int flags;
-} AVStereo3D;
-
-/**
- * Allocate an AVStereo3D structure and set its fields to default values.
- * The resulting struct can be freed using av_freep().
- *
- * @return An AVStereo3D filled with default values or NULL on failure.
- */
-AVStereo3D *av_stereo3d_alloc(void);
-
-/**
- * Allocate a complete AVFrameSideData and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVStereo3D structure to be filled by caller.
- */
-AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
-
-/**
- * Provide a human-readable name of a given stereo3d type.
- *
- * @param type The input stereo3d type value.
- *
- * @return The name of the stereo3d value, or "unknown".
- */
-const char *av_stereo3d_type_name(unsigned int type);
-
-/**
- * Get the AVStereo3DType form a human-readable name.
- *
- * @param name The input string.
- *
- * @return The AVStereo3DType value, or -1 if not found.
- */
-int av_stereo3d_from_name(const char *name);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_STEREO3D_H */
diff --git a/dependencies2013/win32/include/libavutil/tea.h b/dependencies2013/win32/include/libavutil/tea.h
deleted file mode 100644
index dd929bda..00000000
--- a/dependencies2013/win32/include/libavutil/tea.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * A 32-bit implementation of the TEA algorithm
- * Copyright (c) 2015 Vesselin Bontchev
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_TEA_H
-#define AVUTIL_TEA_H
-
-#include <stdint.h>
-
-/**
- * @file
- * @brief Public header for libavutil TEA algorithm
- * @defgroup lavu_tea TEA
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_tea_size;
-
-struct AVTEA;
-
-/**
-  * Allocate an AVTEA context
-  * To free the struct: av_free(ptr)
-  */
-struct AVTEA *av_tea_alloc(void);
-
-/**
- * Initialize an AVTEA context.
- *
- * @param ctx an AVTEA context
- * @param key a key of 16 bytes used for encryption/decryption
- * @param rounds the number of rounds in TEA (64 is the "standard")
- */
-void av_tea_init(struct AVTEA *ctx, const uint8_t key[16], int rounds);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_tea_crypt(struct AVTEA *ctx, uint8_t *dst, const uint8_t *src,
-                  int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_TEA_H */
diff --git a/dependencies2013/win32/include/libavutil/threadmessage.h b/dependencies2013/win32/include/libavutil/threadmessage.h
deleted file mode 100644
index 8480a0a3..00000000
--- a/dependencies2013/win32/include/libavutil/threadmessage.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_THREADMESSAGE_H
-#define AVUTIL_THREADMESSAGE_H
-
-typedef struct AVThreadMessageQueue AVThreadMessageQueue;
-
-typedef enum AVThreadMessageFlags {
-
-    /**
-     * Perform non-blocking operation.
-     * If this flag is set, send and recv operations are non-blocking and
-     * return AVERROR(EAGAIN) immediately if they can not proceed.
-     */
-    AV_THREAD_MESSAGE_NONBLOCK = 1,
-
-} AVThreadMessageFlags;
-
-/**
- * Allocate a new message queue.
- *
- * @param mq      pointer to the message queue
- * @param nelem   maximum number of elements in the queue
- * @param elsize  size of each element in the queue
- * @return  >=0 for success; <0 for error, in particular AVERROR(ENOSYS) if
- *          lavu was built without thread support
- */
-int av_thread_message_queue_alloc(AVThreadMessageQueue **mq,
-                                  unsigned nelem,
-                                  unsigned elsize);
-
-/**
- * Free a message queue.
- *
- * The message queue must no longer be in use by another thread.
- */
-void av_thread_message_queue_free(AVThreadMessageQueue **mq);
-
-/**
- * Send a message on the queue.
- */
-int av_thread_message_queue_send(AVThreadMessageQueue *mq,
-                                 void *msg,
-                                 unsigned flags);
-
-/**
- * Receive a message from the queue.
- */
-int av_thread_message_queue_recv(AVThreadMessageQueue *mq,
-                                 void *msg,
-                                 unsigned flags);
-
-/**
- * Set the sending error code.
- *
- * If the error code is set to non-zero, av_thread_message_queue_send() will
- * return it immediately. Conventional values, such as AVERROR_EOF or
- * AVERROR(EAGAIN), can be used to cause the sending thread to stop or
- * suspend its operation.
- */
-void av_thread_message_queue_set_err_send(AVThreadMessageQueue *mq,
-                                          int err);
-
-/**
- * Set the receiving error code.
- *
- * If the error code is set to non-zero, av_thread_message_queue_recv() will
- * return it immediately when there are no longer available messages.
- * Conventional values, such as AVERROR_EOF or AVERROR(EAGAIN), can be used
- * to cause the receiving thread to stop or suspend its operation.
- */
-void av_thread_message_queue_set_err_recv(AVThreadMessageQueue *mq,
-                                          int err);
-
-/**
- * Set the optional free message callback function which will be called if an
- * operation is removing messages from the queue.
- */
-void av_thread_message_queue_set_free_func(AVThreadMessageQueue *mq,
-                                           void (*free_func)(void *msg));
-
-/**
- * Flush the message queue
- *
- * This function is mostly equivalent to reading and free-ing every message
- * except that it will be done in a single operation (no lock/unlock between
- * reads).
- */
-void av_thread_message_flush(AVThreadMessageQueue *mq);
-
-#endif /* AVUTIL_THREADMESSAGE_H */
diff --git a/dependencies2013/win32/include/libavutil/time.h b/dependencies2013/win32/include/libavutil/time.h
deleted file mode 100644
index dc169b06..00000000
--- a/dependencies2013/win32/include/libavutil/time.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2000-2003 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_TIME_H
-#define AVUTIL_TIME_H
-
-#include <stdint.h>
-
-/**
- * Get the current time in microseconds.
- */
-int64_t av_gettime(void);
-
-/**
- * Get the current time in microseconds since some unspecified starting point.
- * On platforms that support it, the time comes from a monotonic clock
- * This property makes this time source ideal for measuring relative time.
- * The returned values may not be monotonic on platforms where a monotonic
- * clock is not available.
- */
-int64_t av_gettime_relative(void);
-
-/**
- * Indicates with a boolean result if the av_gettime_relative() time source
- * is monotonic.
- */
-int av_gettime_relative_is_monotonic(void);
-
-/**
- * Sleep for a period of time.  Although the duration is expressed in
- * microseconds, the actual delay may be rounded to the precision of the
- * system timer.
- *
- * @param  usec Number of microseconds to sleep.
- * @return zero on success or (negative) error code.
- */
-int av_usleep(unsigned usec);
-
-#endif /* AVUTIL_TIME_H */
diff --git a/dependencies2013/win32/include/libavutil/timecode.h b/dependencies2013/win32/include/libavutil/timecode.h
deleted file mode 100644
index 37c1361b..00000000
--- a/dependencies2013/win32/include/libavutil/timecode.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
- * Copyright (c) 2011-2012 Smartjog S.A.S, Clément Bœsch <clement.boesch@smartjog.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Timecode helpers header
- */
-
-#ifndef AVUTIL_TIMECODE_H
-#define AVUTIL_TIMECODE_H
-
-#include <stdint.h>
-#include "rational.h"
-
-#define AV_TIMECODE_STR_SIZE 23
-
-enum AVTimecodeFlag {
-    AV_TIMECODE_FLAG_DROPFRAME      = 1<<0, ///< timecode is drop frame
-    AV_TIMECODE_FLAG_24HOURSMAX     = 1<<1, ///< timecode wraps after 24 hours
-    AV_TIMECODE_FLAG_ALLOWNEGATIVE  = 1<<2, ///< negative time values are allowed
-};
-
-typedef struct {
-    int start;          ///< timecode frame start (first base frame number)
-    uint32_t flags;     ///< flags such as drop frame, +24 hours support, ...
-    AVRational rate;    ///< frame rate in rational form
-    unsigned fps;       ///< frame per second; must be consistent with the rate field
-} AVTimecode;
-
-/**
- * Adjust frame number for NTSC drop frame time code.
- *
- * @param framenum frame number to adjust
- * @param fps      frame per second, 30 or 60
- * @return         adjusted frame number
- * @warning        adjustment is only valid in NTSC 29.97 and 59.94
- */
-int av_timecode_adjust_ntsc_framenum2(int framenum, int fps);
-
-/**
- * Convert frame number to SMPTE 12M binary representation.
- *
- * @param tc       timecode data correctly initialized
- * @param framenum frame number
- * @return         the SMPTE binary representation
- *
- * @note Frame number adjustment is automatically done in case of drop timecode,
- *       you do NOT have to call av_timecode_adjust_ntsc_framenum2().
- * @note The frame number is relative to tc->start.
- * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
- *       correction (PC) bits are set to zero.
- */
-uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum);
-
-/**
- * Load timecode string in buf.
- *
- * @param buf      destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param tc       timecode data correctly initialized
- * @param framenum frame number
- * @return         the buf parameter
- *
- * @note Timecode representation can be a negative timecode and have more than
- *       24 hours, but will only be honored if the flags are correctly set.
- * @note The frame number is relative to tc->start.
- */
-char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum);
-
-/**
- * Get the timecode string from the SMPTE timecode format.
- *
- * @param buf        destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param tcsmpte    the 32-bit SMPTE timecode
- * @param prevent_df prevent the use of a drop flag when it is known the DF bit
- *                   is arbitrary
- * @return           the buf parameter
- */
-char *av_timecode_make_smpte_tc_string(char *buf, uint32_t tcsmpte, int prevent_df);
-
-/**
- * Get the timecode string from the 25-bit timecode format (MPEG GOP format).
- *
- * @param buf     destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param tc25bit the 25-bits timecode
- * @return        the buf parameter
- */
-char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit);
-
-/**
- * Init a timecode struct with the passed parameters.
- *
- * @param log_ctx     a pointer to an arbitrary struct of which the first field
- *                    is a pointer to an AVClass struct (used for av_log)
- * @param tc          pointer to an allocated AVTimecode
- * @param rate        frame rate in rational form
- * @param flags       miscellaneous flags such as drop frame, +24 hours, ...
- *                    (see AVTimecodeFlag)
- * @param frame_start the first frame number
- * @return            0 on success, AVERROR otherwise
- */
-int av_timecode_init(AVTimecode *tc, AVRational rate, int flags, int frame_start, void *log_ctx);
-
-/**
- * Parse timecode representation (hh:mm:ss[:;.]ff).
- *
- * @param log_ctx a pointer to an arbitrary struct of which the first field is a
- *                pointer to an AVClass struct (used for av_log).
- * @param tc      pointer to an allocated AVTimecode
- * @param rate    frame rate in rational form
- * @param str     timecode string which will determine the frame start
- * @return        0 on success, AVERROR otherwise
- */
-int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *str, void *log_ctx);
-
-/**
- * Check if the timecode feature is available for the given frame rate
- *
- * @return 0 if supported, <0 otherwise
- */
-int av_timecode_check_frame_rate(AVRational rate);
-
-#endif /* AVUTIL_TIMECODE_H */
diff --git a/dependencies2013/win32/include/libavutil/timestamp.h b/dependencies2013/win32/include/libavutil/timestamp.h
deleted file mode 100644
index e082f01b..00000000
--- a/dependencies2013/win32/include/libavutil/timestamp.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * timestamp utils, mostly useful for debugging/logging purposes
- */
-
-#ifndef AVUTIL_TIMESTAMP_H
-#define AVUTIL_TIMESTAMP_H
-
-#include "common.h"
-
-#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
-#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
-#endif
-
-#define AV_TS_MAX_STRING_SIZE 32
-
-/**
- * Fill the provided buffer with a string containing a timestamp
- * representation.
- *
- * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
- * @param ts the timestamp to represent
- * @return the buffer in input
- */
-static inline char *av_ts_make_string(char *buf, int64_t ts)
-{
-    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
-    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%" PRId64, ts);
-    return buf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
-
-/**
- * Fill the provided buffer with a string containing a timestamp time
- * representation.
- *
- * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
- * @param ts the timestamp to represent
- * @param tb the timebase of the timestamp
- * @return the buffer in input
- */
-static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
-{
-    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
-    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
-    return buf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
-
-#endif /* AVUTIL_TIMESTAMP_H */
diff --git a/dependencies2013/win32/include/libavutil/tree.h b/dependencies2013/win32/include/libavutil/tree.h
deleted file mode 100644
index d5e0aebf..00000000
--- a/dependencies2013/win32/include/libavutil/tree.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * A tree container.
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_TREE_H
-#define AVUTIL_TREE_H
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @addtogroup lavu_tree AVTree
- * @ingroup lavu_data
- *
- * Low-complexity tree container
- *
- * Insertion, removal, finding equal, largest which is smaller than and
- * smallest which is larger than, all have O(log n) worst-case complexity.
- * @{
- */
-
-
-struct AVTreeNode;
-extern const int av_tree_node_size;
-
-/**
- * Allocate an AVTreeNode.
- */
-struct AVTreeNode *av_tree_node_alloc(void);
-
-/**
- * Find an element.
- * @param root a pointer to the root node of the tree
- * @param next If next is not NULL, then next[0] will contain the previous
- *             element and next[1] the next element. If either does not exist,
- *             then the corresponding entry in next is unchanged.
- * @param cmp compare function used to compare elements in the tree,
- *            API identical to that of Standard C's qsort
- *            It is guaranteed that the first and only the first argument to cmp()
- *            will be the key parameter to av_tree_find(), thus it could if the
- *            user wants, be a different type (like an opaque context).
- * @return An element with cmp(key, elem) == 0 or NULL if no such element
- *         exists in the tree.
- */
-void *av_tree_find(const struct AVTreeNode *root, void *key,
-                   int (*cmp)(const void *key, const void *b), void *next[2]);
-
-/**
- * Insert or remove an element.
- *
- * If *next is NULL, then the supplied element will be removed if it exists.
- * If *next is non-NULL, then the supplied element will be inserted, unless
- * it already exists in the tree.
- *
- * @param rootp A pointer to a pointer to the root node of the tree; note that
- *              the root node can change during insertions, this is required
- *              to keep the tree balanced.
- * @param key  pointer to the element key to insert in the tree
- * @param next Used to allocate and free AVTreeNodes. For insertion the user
- *             must set it to an allocated and zeroed object of at least
- *             av_tree_node_size bytes size. av_tree_insert() will set it to
- *             NULL if it has been consumed.
- *             For deleting elements *next is set to NULL by the user and
- *             av_tree_insert() will set it to the AVTreeNode which was
- *             used for the removed element.
- *             This allows the use of flat arrays, which have
- *             lower overhead compared to many malloced elements.
- *             You might want to define a function like:
- *             @code
- *             void *tree_insert(struct AVTreeNode **rootp, void *key,
- *                               int (*cmp)(void *key, const void *b),
- *                               AVTreeNode **next)
- *             {
- *                 if (!*next)
- *                     *next = av_mallocz(av_tree_node_size);
- *                 return av_tree_insert(rootp, key, cmp, next);
- *             }
- *             void *tree_remove(struct AVTreeNode **rootp, void *key,
- *                               int (*cmp)(void *key, const void *b, AVTreeNode **next))
- *             {
- *                 av_freep(next);
- *                 return av_tree_insert(rootp, key, cmp, next);
- *             }
- *             @endcode
- * @param cmp compare function used to compare elements in the tree, API identical
- *            to that of Standard C's qsort
- * @return If no insertion happened, the found element; if an insertion or
- *         removal happened, then either key or NULL will be returned.
- *         Which one it is depends on the tree state and the implementation. You
- *         should make no assumptions that it's one or the other in the code.
- */
-void *av_tree_insert(struct AVTreeNode **rootp, void *key,
-                     int (*cmp)(const void *key, const void *b),
-                     struct AVTreeNode **next);
-
-void av_tree_destroy(struct AVTreeNode *t);
-
-/**
- * Apply enu(opaque, &elem) to all the elements in the tree in a given range.
- *
- * @param cmp a comparison function that returns < 0 for an element below the
- *            range, > 0 for an element above the range and == 0 for an
- *            element inside the range
- *
- * @note The cmp function should use the same ordering used to construct the
- *       tree.
- */
-void av_tree_enumerate(struct AVTreeNode *t, void *opaque,
-                       int (*cmp)(void *opaque, void *elem),
-                       int (*enu)(void *opaque, void *elem));
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_TREE_H */
diff --git a/dependencies2013/win32/include/libavutil/twofish.h b/dependencies2013/win32/include/libavutil/twofish.h
deleted file mode 100644
index 813cfecd..00000000
--- a/dependencies2013/win32/include/libavutil/twofish.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * An implementation of the TwoFish algorithm
- * Copyright (c) 2015 Supraja Meedinti
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_TWOFISH_H
-#define AVUTIL_TWOFISH_H
-
-#include <stdint.h>
-
-
-/**
-  * @file
-  * @brief Public header for libavutil TWOFISH algorithm
-  * @defgroup lavu_twofish TWOFISH
-  * @ingroup lavu_crypto
-  * @{
-  */
-
-extern const int av_twofish_size;
-
-struct AVTWOFISH;
-
-/**
-  * Allocate an AVTWOFISH context
-  * To free the struct: av_free(ptr)
-  */
-struct AVTWOFISH *av_twofish_alloc(void);
-
-/**
-  * Initialize an AVTWOFISH context.
-  *
-  * @param ctx an AVTWOFISH context
-  * @param key a key of size ranging from 1 to 32 bytes used for encryption/decryption
-  * @param key_bits number of keybits: 128, 192, 256 If less than the required, padded with zeroes to nearest valid value; return value is 0 if key_bits is 128/192/256, -1 if less than 0, 1 otherwise
- */
-int av_twofish_init(struct AVTWOFISH *ctx, const uint8_t *key, int key_bits);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context
-  *
-  * @param ctx an AVTWOFISH context
-  * @param dst destination array, can be equal to src
-  * @param src source array, can be equal to dst
-  * @param count number of 16 byte blocks
-  * @paran iv initialization vector for CBC mode, NULL for ECB mode
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_twofish_crypt(struct AVTWOFISH *ctx, uint8_t *dst, const uint8_t *src, int count, uint8_t* iv, int decrypt);
-
-/**
- * @}
- */
-#endif /* AVUTIL_TWOFISH_H */
diff --git a/dependencies2013/win32/include/libavutil/version.h b/dependencies2013/win32/include/libavutil/version.h
deleted file mode 100644
index bf5ea15a..00000000
--- a/dependencies2013/win32/include/libavutil/version.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * copyright (c) 2003 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-#ifndef AVUTIL_VERSION_H
-#define AVUTIL_VERSION_H
-
-#include "macros.h"
-
-/**
- * @addtogroup version_utils
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * The FFmpeg libraries follow a versioning sheme very similar to
- * Semantic Versioning (http://semver.org/)
- * The difference is that the component called PATCH is called MICRO in FFmpeg
- * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
- * Also we do not increase MICRO for every bugfix or change in git master.
- *
- * Prior to FFmpeg 3.2 point releases did not change any lib version number to
- * avoid aliassing different git master checkouts.
- * Starting with FFmpeg 3.2, the released library versions will occupy
- * a separate MAJOR.MINOR that is not used on the master development branch.
- * That is if we branch a release of master 55.10.123 we will bump to 55.11.100
- * for the release and master will continue at 55.12.100 after it. Each new
- * point release will then bump the MICRO improving the usefulness of the lib
- * versions.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * Extract version components from the full ::AV_VERSION_INT int as returned
- * by functions like ::avformat_version() and ::avcodec_version()
- */
-#define AV_VERSION_MAJOR(a) ((a) >> 16)
-#define AV_VERSION_MINOR(a) (((a) & 0x00FF00) >> 8)
-#define AV_VERSION_MICRO(a) ((a) & 0xFF)
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-
-#define LIBAVUTIL_VERSION_MAJOR  55
-#define LIBAVUTIL_VERSION_MINOR  79
-#define LIBAVUTIL_VERSION_MICRO 100
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @defgroup lavu_depr_guards Deprecation Guards
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @note, when bumping the major version it is recommended to manually
- * disable each FF_API_* in its own commit instead of disabling them all
- * at once through the bump. This improves the git bisect-ability of the change.
- *
- * @{
- */
-
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OPT_TYPE_METADATA
-#define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DLOG
-#define FF_API_DLOG                     (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_VAAPI
-#define FF_API_VAAPI                    (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_FRAME_QP
-#define FF_API_FRAME_QP                 (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_PLUS1_MINUS1
-#define FF_API_PLUS1_MINUS1             (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ERROR_FRAME
-#define FF_API_ERROR_FRAME              (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CRC_BIG_TABLE
-#define FF_API_CRC_BIG_TABLE            (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_PKT_PTS
-#define FF_API_PKT_PTS                  (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CRYPTO_SIZE_T
-#define FF_API_CRYPTO_SIZE_T            (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
-
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */
diff --git a/dependencies2013/win32/include/libavutil/xtea.h b/dependencies2013/win32/include/libavutil/xtea.h
deleted file mode 100644
index 735427c1..00000000
--- a/dependencies2013/win32/include/libavutil/xtea.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * A 32-bit implementation of the XTEA algorithm
- * Copyright (c) 2012 Samuel Pitoiset
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_XTEA_H
-#define AVUTIL_XTEA_H
-
-#include <stdint.h>
-
-/**
- * @file
- * @brief Public header for libavutil XTEA algorithm
- * @defgroup lavu_xtea XTEA
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVXTEA {
-    uint32_t key[16];
-} AVXTEA;
-
-/**
- * Allocate an AVXTEA context.
- */
-AVXTEA *av_xtea_alloc(void);
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption,
- *            interpreted as big endian 32 bit numbers
- */
-void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption,
- *            interpreted as little endian 32 bit numbers
- */
-void av_xtea_le_init(struct AVXTEA *ctx, const uint8_t key[16]);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context,
- * in big endian format.
- *
- * @param ctx an AVXTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                   int count, uint8_t *iv, int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context,
- * in little endian format.
- *
- * @param ctx an AVXTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_xtea_le_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                      int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_XTEA_H */
diff --git a/dependencies2013/win32/include/libpng16/png.h b/dependencies2013/win32/include/libpng16/png.h
deleted file mode 100644
index c2c4fdf2..00000000
--- a/dependencies2013/win32/include/libpng16/png.h
+++ /dev/null
@@ -1,3265 +0,0 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.6.30, June 28, 2017
- *
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license (See LICENSE, below)
- *
- * Authors and maintainers:
- *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.30, June 28, 2017:
- *     Glenn Randers-Pehrson.
- *   See also "Contributing Authors", below.
- */
-
-/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- *
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
- *
- * This code is released under the libpng license.
- *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.30, June 28, 2017 are
- * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
- * derived from libpng-1.0.6, and are distributed according to the same
- * disclaimer and license as libpng-1.0.6 with the following individuals
- * added to the list of Contributing Authors:
- *
- *    Simon-Pierre Cadieux
- *    Eric S. Raymond
- *    Mans Rullgard
- *    Cosmin Truta
- *    Gilles Vollant
- *    James Yu
- *    Mandar Sahastrabuddhe
- *    Google Inc.
- *    Vadim Barkov
- *
- * and with the following additions to the disclaimer:
- *
- *    There is no warranty against interference with your enjoyment of the
- *    library or against infringement.  There is no warranty that our
- *    efforts or the library will fulfill any of your particular purposes
- *    or needs.  This library is provided with all faults, and the entire
- *    risk of satisfactory quality, performance, accuracy, and effort is with
- *    the user.
- *
- * Some files in the "contrib" directory and some configure-generated
- * files that are distributed with libpng have other copyright owners and
- * are released under other open source licenses.
- *
- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
- * libpng-0.96, and are distributed according to the same disclaimer and
- * license as libpng-0.96, with the following individuals added to the list
- * of Contributing Authors:
- *
- *    Tom Lane
- *    Glenn Randers-Pehrson
- *    Willem van Schaik
- *
- * libpng versions 0.89, June 1996, through 0.96, May 1997, are
- * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
- * and are distributed according to the same disclaimer and license as
- * libpng-0.88, with the following individuals added to the list of
- * Contributing Authors:
- *
- *    John Bowler
- *    Kevin Bracey
- *    Sam Bushell
- *    Magnus Holmgren
- *    Greg Roelofs
- *    Tom Tanner
- *
- * Some files in the "scripts" directory have other copyright owners
- * but are released under this license.
- *
- * libpng versions 0.5, May 1995, through 0.88, January 1996, are
- * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
- *
- * For the purposes of this copyright and license, "Contributing Authors"
- * is defined as the following set of individuals:
- *
- *    Andreas Dilger
- *    Dave Martindale
- *    Guy Eric Schalnat
- *    Paul Schmidt
- *    Tim Wegner
- *
- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied,
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary,
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject
- * to the following restrictions:
- *
- *   1. The origin of this source code must not be misrepresented.
- *
- *   2. Altered versions must be plainly marked as such and must not
- *      be misrepresented as being the original source.
- *
- *   3. This Copyright notice may not be removed or altered from any
- *      source or altered source distribution.
- *
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products.  If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
- *
- * END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
- *
- * TRADEMARK:
- *
- * The name "libpng" has not been registered by the Copyright owner
- * as a trademark in any jurisdiction.  However, because libpng has
- * been distributed and maintained world-wide, continually since 1995,
- * the Copyright owner claims "common-law trademark protection" in any
- * jurisdiction where common-law trademark is recognized.
- *
- * OSI CERTIFICATION:
- *
- * Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
- * a certification mark of the Open Source Initiative. OSI has not addressed
- * the additional disclaimers inserted at version 1.0.7.
- *
- * EXPORT CONTROL:
- *
- * The Copyright owner believes that the Export Control Classification
- * Number (ECCN) for libpng is EAR99, which means not subject to export
- * controls or International Traffic in Arms Regulations (ITAR) because
- * it is open source, publicly available software, that does not contain
- * any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
- * 734.7(b).
- */
-
-/*
- * A "png_get_copyright" function is available, for convenient use in "about"
- * boxes and the like:
- *
- *    printf("%s", png_get_copyright(NULL));
- *
- * Also, the PNG logo (in PNG format, of course) is supplied in the
- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- */
-
-/*
- * The contributing authors would like to thank all those who helped
- * with testing, bug fixes, and patience.  This wouldn't have been
- * possible without all of you.
- *
- * Thanks to Frank J. T. Wojcik for helping with the documentation.
- */
-
-/* Note about libpng version numbers:
- *
- *    Due to various miscommunications, unforeseen code incompatibilities
- *    and occasional factors outside the authors' control, version numbering
- *    on the library has not always been consistent and straightforward.
- *    The following table summarizes matters since version 0.89c, which was
- *    the first widely used release:
- *
- *    source                 png.h  png.h  shared-lib
- *    version                string   int  version
- *    -------                ------ -----  ----------
- *    0.89c "1.0 beta 3"     0.89      89  1.0.89
- *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
- *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
- *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
- *    0.97c                  0.97      97  2.0.97
- *    0.98                   0.98      98  2.0.98
- *    0.99                   0.99      98  2.0.99
- *    0.99a-m                0.99      99  2.0.99
- *    1.00                   1.00     100  2.1.0 [100 should be 10000]
- *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
- *    1.0.1       png.h string is   10001  2.1.0
- *    1.0.1a-e    identical to the  10002  from here on, the shared library
- *    1.0.2       source version)   10002  is 2.V where V is the source code
- *    1.0.2a-b                      10003  version, except as noted.
- *    1.0.3                         10003
- *    1.0.3a-d                      10004
- *    1.0.4                         10004
- *    1.0.4a-f                      10005
- *    1.0.5 (+ 2 patches)           10005
- *    1.0.5a-d                      10006
- *    1.0.5e-r                      10100 (not source compatible)
- *    1.0.5s-v                      10006 (not binary compatible)
- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
- *    1.0.6d-f                      10007 (still binary incompatible)
- *    1.0.6g                        10007
- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
- *    1.0.6i                        10007  10.6i
- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
- *    1.0.7                    1    10007  (still compatible)
- *    ...
- *    1.0.19                  10    10019  10.so.0.19[.0]
- *    ...
- *    1.2.57                  13    10257  12.so.0.57[.0]
- *    ...
- *    1.5.28                  15    10527  15.so.15.28[.0]
- *    ...
- *    1.6.30                  16    10630  16.so.16.30[.0]
- *
- *    Henceforth the source version will match the shared-library major
- *    and minor numbers; the shared-library major version number will be
- *    used for changes in backward compatibility, as it is intended.  The
- *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
- *    for applications, is an unsigned integer of the form xyyzz corresponding
- *    to the source version x.y.z (leading zeros in y and z).  Beta versions
- *    were given the previous public release number plus a letter, until
- *    version 1.0.6j; from then on they were given the upcoming public
- *    release number plus "betaNN" or "rcNN".
- *
- *    Binary incompatibility exists only when applications make direct access
- *    to the info_ptr or png_ptr members through png.h, and the compiled
- *    application is loaded with a different version of the library.
- *
- *    DLLNUM will change each time there are forward or backward changes
- *    in binary compatibility (e.g., when a new feature is added).
- *
- * See libpng.txt or libpng.3 for more information.  The PNG specification
- * is available as a W3C Recommendation and as an ISO Specification,
- * <https://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- *    June 28, 2017
- *
- *    Since the PNG Development group is an ad-hoc body, we can't make
- *    an official declaration.
- *
- *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.6.30 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has two year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other, which is deprecated,
- *    holds the date in text format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The string is
- *        "char time_buffer[29]" in png_struct.  This is no longer used
- *    in libpng-1.6.x and will be removed from libpng-1.7.0.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123_buffer() in png.c
- *          (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and
- *          png_convert_to_rfc_1152() in error prior to libpng-0.98)
- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- *        png_convert_from_time_t() in pngwrite.c
- *        png_get_tIME() in pngget.c
- *        png_handle_tIME() in pngrutil.c, called in pngread.c
- *        png_set_tIME() in pngset.c
- *        png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- *    All handle dates properly in a Y2K environment.  The
- *    png_convert_from_time_t() function calls gmtime() to convert from system
- *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that libpng applications
- *    are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()
- *    function, or that they are incorrectly passing only a 2-digit year
- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
- *    but this is not under our control.  The libpng documentation has always
- *    stated that it works with 4-digit years, and the APIs have been
- *    documented as such.
- *
- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
- *    integer to hold the year, and can hold years as large as 65535.
- *
- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
- *    no date-related code.
- *
- *       Glenn Randers-Pehrson
- *       libpng maintainer
- *       PNG Development Group
- */
-
-#ifndef PNG_H
-#define PNG_H
-
-/* This is not the place to learn how to use libpng. The file libpng-manual.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build.  This file is useful for looking
- * at the actual function definitions and structure components.  If that
- * file has been stripped from your copy of libpng, you can find it at
- * <http://www.libpng.org/pub/png/libpng-manual.txt>
- *
- * If you just need to read a PNG file and don't want to read the documentation
- * skip to the end of this file and read the section entitled 'simplified API'.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.30"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30 - June 28, 2017\n"
-
-#define PNG_LIBPNG_VER_SONUM   16
-#define PNG_LIBPNG_VER_DLLNUM  16
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 30
-
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
- */
-
-#define PNG_LIBPNG_VER_BUILD  0
-
-/* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-
-/* Release-Specific Flags */
-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
-                                       PNG_LIBPNG_BUILD_STABLE only */
-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_SPECIAL */
-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_PRIVATE */
-
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
-
-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000).  From
- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
- */
-#define PNG_LIBPNG_VER 10630 /* 1.6.30 */
-
-/* Library configuration: these options cannot be changed after
- * the library has been built.
- */
-#ifndef PNGLCONF_H
-/* If pnglibconf.h is missing, you can
- * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
- */
-#   include "pnglibconf.h"
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Machine specific configuration. */
-#  include "pngconf.h"
-#endif
-
-/*
- * Added at libpng-1.2.8
- *
- * Ref MSDN: Private as priority over Special
- * VS_FF_PRIVATEBUILD File *was not* built using standard release
- * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string.
- *
- * VS_FF_SPECIALBUILD File *was* built by the original company using
- * standard release procedures but is a variation of the standard
- * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string.
- */
-
-#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */
-#  define PNG_LIBPNG_BUILD_TYPE \
-       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
-#else
-#  ifdef PNG_LIBPNG_SPECIALBUILD
-#    define PNG_LIBPNG_BUILD_TYPE \
-         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
-#  else
-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
-#  endif
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Version information for C files, stored in png.c.  This had better match
- * the version above.
- */
-#define png_libpng_ver png_get_header_ver(NULL)
-
-/* This file is arranged in several sections:
- *
- * 1. [omitted]
- * 2. Any configuration options that can be specified by for the application
- *    code when it is built.  (Build time configuration is in pnglibconf.h)
- * 3. Type definitions (base types are defined in pngconf.h), structure
- *    definitions.
- * 4. Exported library functions.
- * 5. Simplified API.
- * 6. Implementation options.
- *
- * The library source code has additional files (principally pngpriv.h) that
- * allow configuration of the library.
- */
-
-/* Section 1: [omitted] */
-
-/* Section 2: run time configuration
- * See pnglibconf.h for build time configuration
- *
- * Run time configuration allows the application to choose between
- * implementations of certain arithmetic APIs.  The default is set
- * at build time and recorded in pnglibconf.h, but it is safe to
- * override these (and only these) settings.  Note that this won't
- * change what the library does, only application code, and the
- * settings can (and probably should) be made on a per-file basis
- * by setting the #defines before including png.h
- *
- * Use macros to read integers from PNG data or use the exported
- * functions?
- *   PNG_USE_READ_MACROS: use the macros (see below)  Note that
- *     the macros evaluate their argument multiple times.
- *   PNG_NO_USE_READ_MACROS: call the relevant library function.
- *
- * Use the alternative algorithm for compositing alpha samples that
- * does not use division?
- *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'
- *      algorithm.
- *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.
- *
- * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is
- * false?
- *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error
- *      APIs to png_warning.
- * Otherwise the calls are mapped to png_error.
- */
-
-/* Section 3: type definitions, including structures and compile time
- * constants.
- * See pngconf.h for base types that vary by machine/system
- */
-
-/* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
-typedef char* png_libpng_version_1_6_30;
-
-/* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
- *
- * png_struct is the cache of information used while reading or writing a single
- * PNG file.  One of these is always required, although the simplified API
- * (below) hides the creation and destruction of it.
- */
-typedef struct png_struct_def png_struct;
-typedef const png_struct * png_const_structp;
-typedef png_struct * png_structp;
-typedef png_struct * * png_structpp;
-
-/* png_info contains information read from or to be written to a PNG file.  One
- * or more of these must exist while reading or creating a PNG file.  The
- * information is not used by libpng during read but is used to control what
- * gets written when a PNG file is created.  "png_get_" function calls read
- * information during read and "png_set_" functions calls write information
- * when creating a PNG.
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_info_def png_info;
-typedef png_info * png_infop;
-typedef const png_info * png_const_infop;
-typedef png_info * * png_infopp;
-
-/* Types with names ending 'p' are pointer types.  The corresponding types with
- * names ending 'rp' are identical pointer types except that the pointer is
- * marked 'restrict', which means that it is the only pointer to the object
- * passed to the function.  Applications should not use the 'restrict' types;
- * it is always valid to pass 'p' to a pointer with a function argument of the
- * corresponding 'rp' type.  Different compilers have different rules with
- * regard to type matching in the presence of 'restrict'.  For backward
- * compatibility libpng callbacks never have 'restrict' in their parameters and,
- * consequentially, writing portable application code is extremely difficult if
- * an attempt is made to use 'restrict'.
- */
-typedef png_struct * PNG_RESTRICT png_structrp;
-typedef const png_struct * PNG_RESTRICT png_const_structrp;
-typedef png_info * PNG_RESTRICT png_inforp;
-typedef const png_info * PNG_RESTRICT png_const_inforp;
-
-/* Three color definitions.  The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
- * be png_byte or png_uint_16 (as defined below).
- */
-typedef struct png_color_struct
-{
-   png_byte red;
-   png_byte green;
-   png_byte blue;
-} png_color;
-typedef png_color * png_colorp;
-typedef const png_color * png_const_colorp;
-typedef png_color * * png_colorpp;
-
-typedef struct png_color_16_struct
-{
-   png_byte index;    /* used for palette files */
-   png_uint_16 red;   /* for use in red green blue files */
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 gray;  /* for use in grayscale files */
-} png_color_16;
-typedef png_color_16 * png_color_16p;
-typedef const png_color_16 * png_const_color_16p;
-typedef png_color_16 * * png_color_16pp;
-
-typedef struct png_color_8_struct
-{
-   png_byte red;   /* for use in red green blue files */
-   png_byte green;
-   png_byte blue;
-   png_byte gray;  /* for use in grayscale files */
-   png_byte alpha; /* for alpha channel files */
-} png_color_8;
-typedef png_color_8 * png_color_8p;
-typedef const png_color_8 * png_const_color_8p;
-typedef png_color_8 * * png_color_8pp;
-
-/*
- * The following two structures are used for the in-core representation
- * of sPLT chunks.
- */
-typedef struct png_sPLT_entry_struct
-{
-   png_uint_16 red;
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 alpha;
-   png_uint_16 frequency;
-} png_sPLT_entry;
-typedef png_sPLT_entry * png_sPLT_entryp;
-typedef const png_sPLT_entry * png_const_sPLT_entryp;
-typedef png_sPLT_entry * * png_sPLT_entrypp;
-
-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
- *  occupy the LSB of their respective members, and the MSB of each member
- *  is zero-filled.  The frequency member always occupies the full 16 bits.
- */
-
-typedef struct png_sPLT_struct
-{
-   png_charp name;           /* palette name */
-   png_byte depth;           /* depth of palette samples */
-   png_sPLT_entryp entries;  /* palette entries */
-   png_int_32 nentries;      /* number of palette entries */
-} png_sPLT_t;
-typedef png_sPLT_t * png_sPLT_tp;
-typedef const png_sPLT_t * png_const_sPLT_tp;
-typedef png_sPLT_t * * png_sPLT_tpp;
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
- * and whether that contents is compressed or not.  The "key" field
- * points to a regular zero-terminated C string.  The "text" fields can be a
- * regular C string, an empty string, or a NULL pointer.
- * However, the structure returned by png_get_text() will always contain
- * the "text" field as a regular zero-terminated C string (possibly
- * empty), never a NULL pointer, so it can be safely used in printf() and
- * other string-handling functions.  Note that the "itxt_length", "lang", and
- * "lang_key" members of the structure only exist when the library is built
- * with iTXt chunk support.  Prior to libpng-1.4.0 the library was built by
- * default without iTXt support. Also note that when iTXt *is* supported,
- * the "lang" and "lang_key" fields contain NULL pointers when the
- * "compression" field contains * PNG_TEXT_COMPRESSION_NONE or
- * PNG_TEXT_COMPRESSION_zTXt. Note that the "compression value" is not the
- * same as what appears in the PNG tEXt/zTXt/iTXt chunk's "compression flag"
- * which is always 0 or 1, or its "compression method" which is always 0.
- */
-typedef struct png_text_struct
-{
-   int  compression;       /* compression value:
-                             -1: tEXt, none
-                              0: zTXt, deflate
-                              1: iTXt, none
-                              2: iTXt, deflate  */
-   png_charp key;          /* keyword, 1-79 character description of "text" */
-   png_charp text;         /* comment, may be an empty string (ie "")
-                              or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-   png_size_t itxt_length; /* length of the itxt string */
-   png_charp lang;         /* language code, 0-79 characters
-                              or a NULL pointer */
-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
-                              chars or a NULL pointer */
-} png_text;
-typedef png_text * png_textp;
-typedef const png_text * png_const_textp;
-typedef png_text * * png_textpp;
-#endif
-
-/* Supported compression types for text in PNG files (tEXt, and zTXt).
- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
-#define PNG_TEXT_COMPRESSION_NONE_WR -3
-#define PNG_TEXT_COMPRESSION_zTXt_WR -2
-#define PNG_TEXT_COMPRESSION_NONE    -1
-#define PNG_TEXT_COMPRESSION_zTXt     0
-#define PNG_ITXT_COMPRESSION_NONE     1
-#define PNG_ITXT_COMPRESSION_zTXt     2
-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
-
-/* png_time is a way to hold the time in an machine independent way.
- * Two conversions are provided, both from time_t and struct tm.  There
- * is no portable way to convert to either of these structures, as far
- * as I know.  If you know of a portable way, send it to me.  As a side
- * note - PNG has always been Year 2000 compliant!
- */
-typedef struct png_time_struct
-{
-   png_uint_16 year; /* full year, as in, 1995 */
-   png_byte month;   /* month of year, 1 - 12 */
-   png_byte day;     /* day of month, 1 - 31 */
-   png_byte hour;    /* hour of day, 0 - 23 */
-   png_byte minute;  /* minute of hour, 0 - 59 */
-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
-} png_time;
-typedef png_time * png_timep;
-typedef const png_time * png_const_timep;
-typedef png_time * * png_timepp;
-
-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\
-   defined(PNG_USER_CHUNKS_SUPPORTED)
-/* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support.  The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
- *
- * The data in the structure is set by libpng on read and used on write.
- */
-typedef struct png_unknown_chunk_t
-{
-   png_byte name[5]; /* Textual chunk name with '\0' terminator */
-   png_byte *data;   /* Data, should not be modified on read! */
-   png_size_t size;
-
-   /* On write 'location' must be set using the flag values listed below.
-    * Notice that on read it is set by libpng however the values stored have
-    * more bits set than are listed below.  Always treat the value as a
-    * bitmask.  On write set only one bit - setting multiple bits may cause the
-    * chunk to be written in multiple places.
-    */
-   png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-
-typedef png_unknown_chunk * png_unknown_chunkp;
-typedef const png_unknown_chunk * png_const_unknown_chunkp;
-typedef png_unknown_chunk * * png_unknown_chunkpp;
-#endif
-
-/* Flag values for the unknown chunk location byte. */
-#define PNG_HAVE_IHDR  0x01
-#define PNG_HAVE_PLTE  0x02
-#define PNG_AFTER_IDAT 0x08
-
-/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-#define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
-
-/* These are constants for fixed point values encoded in the
- * PNG specification manner (x100000)
- */
-#define PNG_FP_1    100000
-#define PNG_FP_HALF  50000
-#define PNG_FP_MAX  ((png_fixed_point)0x7fffffffL)
-#define PNG_FP_MIN  (-PNG_FP_MAX)
-
-/* These describe the color_type field in png_info. */
-/* color type masks */
-#define PNG_COLOR_MASK_PALETTE    1
-#define PNG_COLOR_MASK_COLOR      2
-#define PNG_COLOR_MASK_ALPHA      4
-
-/* color types.  Note that not all combinations are legal */
-#define PNG_COLOR_TYPE_GRAY 0
-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
-/* aliases */
-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
-
-/* This is for compression type. PNG 1.0-1.2 only define the single type. */
-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
-
-/* This is for filter type. PNG 1.0-1.2 only define the single type. */
-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
-
-/* These are for the interlacing type.  These values should NOT be changed. */
-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
-#define PNG_INTERLACE_LAST        2 /* Not a valid value */
-
-/* These are for the oFFs chunk.  These values should NOT be changed. */
-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
-#define PNG_OFFSET_LAST           2 /* Not a valid value */
-
-/* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_EQUATION_LAST         4 /* Not a valid value */
-
-/* These are for the sCAL chunk.  These values should NOT be changed. */
-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
-#define PNG_SCALE_METER           1 /* meters per pixel */
-#define PNG_SCALE_RADIAN          2 /* radians per pixel */
-#define PNG_SCALE_LAST            3 /* Not a valid value */
-
-/* These are for the pHYs chunk.  These values should NOT be changed. */
-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
-#define PNG_RESOLUTION_METER      1 /* pixels/meter */
-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
-
-/* These are for the sRGB chunk.  These values should NOT be changed. */
-#define PNG_sRGB_INTENT_PERCEPTUAL 0
-#define PNG_sRGB_INTENT_RELATIVE   1
-#define PNG_sRGB_INTENT_SATURATION 2
-#define PNG_sRGB_INTENT_ABSOLUTE   3
-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
-
-/* This is for text chunks */
-#define PNG_KEYWORD_MAX_LENGTH     79
-
-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
-#define PNG_MAX_PALETTE_LENGTH    256
-
-/* These determine if an ancillary chunk's data has been successfully read
- * from the PNG header, or if the application has filled in the corresponding
- * data in the info_struct to be written into the output file.  The values
- * of the PNG_INFO_<chunk> defines should NOT be changed.
- */
-#define PNG_INFO_gAMA 0x0001U
-#define PNG_INFO_sBIT 0x0002U
-#define PNG_INFO_cHRM 0x0004U
-#define PNG_INFO_PLTE 0x0008U
-#define PNG_INFO_tRNS 0x0010U
-#define PNG_INFO_bKGD 0x0020U
-#define PNG_INFO_hIST 0x0040U
-#define PNG_INFO_pHYs 0x0080U
-#define PNG_INFO_oFFs 0x0100U
-#define PNG_INFO_tIME 0x0200U
-#define PNG_INFO_pCAL 0x0400U
-#define PNG_INFO_sRGB 0x0800U  /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000U  /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000U  /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
-#define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
-
-/* This is used for the transformation routines, as some of them
- * change these values for the row.  It also should enable using
- * the routines for other purposes.
- */
-typedef struct png_row_info_struct
-{
-   png_uint_32 width;    /* width of row */
-   png_size_t rowbytes;  /* number of bytes in row */
-   png_byte color_type;  /* color type of row */
-   png_byte bit_depth;   /* bit depth of row */
-   png_byte channels;    /* number of channels (1, 2, 3, or 4) */
-   png_byte pixel_depth; /* bits per pixel (depth * channels) */
-} png_row_info;
-
-typedef png_row_info * png_row_infop;
-typedef png_row_info * * png_row_infopp;
-
-/* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
- * own.  The png_error_ptr type should match that of user-supplied warning
- * and error functions, while the png_rw_ptr type should match that of the
- * user read/write data functions.  Note that the 'write' function must not
- * modify the buffer it is passed. The 'read' function, on the other hand, is
- * expected to return the read data in the buffer.
- */
-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t));
-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
-    int));
-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32,
-    int));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
-typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
-
-/* The following callback receives png_uint_32 row_number, int pass for the
- * png_bytep data of the row.  When transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-typedef PNG_CALLBACK(void, *png_progressive_row_ptr, (png_structp, png_bytep,
-    png_uint_32, int));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-typedef PNG_CALLBACK(void, *png_user_transform_ptr, (png_structp, png_row_infop,
-    png_bytep));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
-    png_unknown_chunkp));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-/* not used anywhere */
-/* typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp)); */
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This must match the function definition in <setjmp.h>, and the application
- * must include this before png.h to obtain the definition of jmp_buf.  The
- * function is required to be PNG_NORETURN, but this is not checked.  If the
- * function does return the application will crash via an abort() or similar
- * system level call.
- *
- * If you get a warning here while building the library you may need to make
- * changes to ensure that pnglibconf.h records the calling convention used by
- * your compiler.  This may be very difficult - try using a different compiler
- * to build the library!
- */
-PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
-#endif
-
-/* Transform masks for the high-level interface */
-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */
-/* Added to libpng-1.2.34 */
-#define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER
-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */
-/* Added to libpng-1.4.0 */
-#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
-/* Added to libpng-1.5.4 */
-#define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
-#if INT_MAX >= 0x8000 /* else this might break */
-#define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
-#endif
-
-/* Flags for MNG supported features */
-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
-#define PNG_FLAG_MNG_FILTER_64      0x04
-#define PNG_ALL_MNG_FEATURES        0x05
-
-/* NOTE: prior to 1.5 these functions had no 'API' style declaration,
- * this allowed the zlib default functions to be used on Windows
- * platforms.  In 1.5 the zlib default malloc (which just calls malloc and
- * ignores the first argument) should be completely compatible with the
- * following.
- */
-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,
-    png_alloc_size_t));
-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
-
-/* Section 4: exported functions
- * Here are the function definitions most commonly used.  This is not
- * the place to find out how to use libpng.  See libpng-manual.txt for the
- * full explanation, see example.c for the summary.  This just provides
- * a simple one line description of the use of each function.
- *
- * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in
- * pngconf.h and in the *.dfn files in the scripts directory.
- *
- *   PNG_EXPORT(ordinal, type, name, (args));
- *
- *       ordinal:    ordinal that is used while building
- *                   *.def files. The ordinal value is only
- *                   relevant when preprocessing png.h with
- *                   the *.dfn files for building symbol table
- *                   entries, and are removed by pngconf.h.
- *       type:       return type of the function
- *       name:       function name
- *       args:       function arguments, with types
- *
- * When we wish to append attributes to a function prototype we use
- * the PNG_EXPORTA() macro instead.
- *
- *   PNG_EXPORTA(ordinal, type, name, (args), attributes);
- *
- *       ordinal, type, name, and args: same as in PNG_EXPORT().
- *       attributes: function attributes
- */
-
-/* Returns the version number of the library */
-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
-
-/* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
-
-/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
- * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
- */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start,
-    png_size_t num_to_check));
-
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
-
-/* Allocate and initialize png_ptr struct for reading, and any other memory. */
-PNG_EXPORTA(4, png_structp, png_create_read_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-/* Allocate and initialize png_ptr struct for writing, and any other memory */
-PNG_EXPORTA(5, png_structp, png_create_write_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_const_structrp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
-    png_size_t size));
-
-/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
- * match up.
- */
-#ifdef PNG_SETJMP_SUPPORTED
-/* This function returns the jmp_buf built in to *png_ptr.  It must be
- * supplied with an appropriate 'longjmp' function to use on that jmp_buf
- * unless the default error function is overridden in which case NULL is
- * acceptable.  The size of the jmp_buf is checked against the actual size
- * allocated by the library - the call will return NULL on a mismatch
- * indicating an ABI mismatch.
- */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
-#  define png_jmpbuf(png_ptr) \
-      (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))
-#else
-#  define png_jmpbuf(png_ptr) \
-      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
-#endif
-/* This function should be used by libpng applications in place of
- * longjmp(png_ptr->jmpbuf, val).  If longjmp_fn() has been set, it
- * will use it; otherwise it will call PNG_ABORT().  This function was
- * added in libpng-1.5.0.
- */
-PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);
-#endif
-
-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(11, png_structp, png_create_read_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-#endif
-
-/* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, png_size_t length));
-
-/* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
-    png_const_bytep chunk_name, png_uint_32 length));
-
-/* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
-    png_const_bytep data, png_size_t length));
-
-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
-    PNG_ALLOCATED);
-
-/* DEPRECATED: this function allowed init structures to be created using the
- * default allocation method (typically malloc).  Use is deprecated in 1.6.0 and
- * the API will be removed in the future.
- */
-PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size), PNG_DEPRECATED);
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structrp png_ptr, png_inforp info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   /* Convert to a US string format: there is no localization support in this
-    * routine.  The original implementation used a 29 character buffer in
-    * png_struct, this will be removed in future versions.
-    */
-#if PNG_LIBPNG_VER < 10700
-/* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */
-PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
-    png_const_timep ptime),PNG_DEPRECATED);
-#endif
-PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],
-    png_const_timep ptime));
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* Convert from a struct tm to png_time */
-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-    const struct tm * ttime));
-
-/* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
-#endif /* CONVERT_tIME */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
- * of a tRNS chunk if present.
- */
-PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-#define PNG_ERROR_ACTION_NONE  1
-#define PNG_ERROR_ACTION_WARN  2
-#define PNG_ERROR_ACTION_ERROR 3
-#define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
-
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,
-    int error_action, double red, double green))
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,
-    int error_action, png_fixed_point red, png_fixed_point green))
-
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp
-    png_ptr));
-#endif
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* How the alpha channel is interpreted - this affects how the color channels
- * of a PNG file are returned to the calling application when an alpha channel,
- * or a tRNS chunk in a palette file, is present.
- *
- * This has no effect on the way pixels are written into a PNG output
- * datastream. The color samples in a PNG datastream are never premultiplied
- * with the alpha samples.
- *
- * The default is to return data according to the PNG specification: the alpha
- * channel is a linear measure of the contribution of the pixel to the
- * corresponding composited pixel, and the color channels are unassociated
- * (not premultiplied).  The gamma encoded color channels must be scaled
- * according to the contribution and to do this it is necessary to undo
- * the encoding, scale the color values, perform the composition and reencode
- * the values.  This is the 'PNG' mode.
- *
- * The alternative is to 'associate' the alpha with the color information by
- * storing color channel values that have been scaled by the alpha.
- * image.  These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes
- * (the latter being the two common names for associated alpha color channels).
- *
- * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha
- * value is equal to the maximum value.
- *
- * The final choice is to gamma encode the alpha channel as well.  This is
- * broken because, in practice, no implementation that uses this choice
- * correctly undoes the encoding before handling alpha composition.  Use this
- * choice only if other serious errors in the software or hardware you use
- * mandate it; the typical serious error is for dark halos to appear around
- * opaque areas of the composited PNG image because of arithmetic overflow.
- *
- * The API function png_set_alpha_mode specifies which of these choices to use
- * with an enumerated 'mode' value and the gamma of the required output:
- */
-#define PNG_ALPHA_PNG           0 /* according to the PNG standard */
-#define PNG_ALPHA_STANDARD      1 /* according to Porter/Duff */
-#define PNG_ALPHA_ASSOCIATED    1 /* as above; this is the normal practice */
-#define PNG_ALPHA_PREMULTIPLIED 1 /* as above */
-#define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */
-#define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */
-
-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,
-    double output_gamma))
-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
-    int mode, png_fixed_point output_gamma))
-#endif
-
-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-/* The output_gamma value is a screen gamma in libpng terminology: it expresses
- * how to decode the output values, not how they are encoded.
- */
-#define PNG_DEFAULT_sRGB -1       /* sRGB gamma and color space */
-#define PNG_GAMMA_MAC_18 -2       /* Old Mac '1.8' gamma and color space */
-#define PNG_GAMMA_sRGB   220000   /* Television standards--matches sRGB gamma */
-#define PNG_GAMMA_LINEAR PNG_FP_1 /* Linear */
-#endif
-
-/* The following are examples of calls to png_set_alpha_mode to achieve the
- * required overall gamma correction and, where necessary, alpha
- * premultiplication.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- *    This is the default libpng handling of the alpha channel - it is not
- *    pre-multiplied into the color components.  In addition the call states
- *    that the output is for a sRGB system and causes all PNG files without gAMA
- *    chunks to be assumed to be encoded using sRGB.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    In this case the output is assumed to be something like an sRGB conformant
- *    display preceeded by a power-law lookup table of power 1.45.  This is how
- *    early Mac systems behaved.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
- *    This is the classic Jim Blinn approach and will work in academic
- *    environments where everything is done by the book.  It has the shortcoming
- *    of assuming that input PNG data with no gamma information is linear - this
- *    is unlikely to be correct unless the PNG files where generated locally.
- *    Most of the time the output precision will be so low as to show
- *    significant banding in dark areas of the image.
- *
- * png_set_expand_16(pp);
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);
- *    This is a somewhat more realistic Jim Blinn inspired approach.  PNG files
- *    are assumed to have the sRGB encoding if not marked with a gamma value and
- *    the output is always 16 bits per component.  This permits accurate scaling
- *    and processing of the data.  If you know that your input PNG files were
- *    generated locally you might need to replace PNG_DEFAULT_sRGB with the
- *    correct value for your system.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB);
- *    If you just need to composite the PNG image onto an existing background
- *    and if you control the code that does this you can use the optimization
- *    setting.  In this case you just copy completely opaque pixels to the
- *    output.  For pixels that are not completely transparent (you just skip
- *    those) you do the composition math using png_composite or png_composite_16
- *    below then encode the resultant 8-bit or 16-bit values to match the output
- *    encoding.
- *
- * Other cases
- *    If neither the PNG nor the standard linear encoding work for you because
- *    of the software or hardware you use then you have a big problem.  The PNG
- *    case will probably result in halos around the image.  The linear encoding
- *    will probably result in a washed out, too bright, image (it's actually too
- *    contrasty.)  Try the ALPHA_OPTIMIZED mode above - this will probably
- *    substantially reduce the halos.  Alternatively try:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB);
- *    This option will also reduce the halos, but there will be slight dark
- *    halos round the opaque parts of the image where the background is light.
- *    In the OPTIMIZED mode the halos will be light halos where the background
- *    is dark.  Take your pick - the halos are unavoidable unless you can get
- *    your hardware/software fixed!  (The OPTIMIZED approach is slightly
- *    faster.)
- *
- * When the default gamma of PNG files doesn't match the output gamma.
- *    If you have PNG files with no gamma information png_set_alpha_mode allows
- *    you to provide a default gamma, but it also sets the ouput gamma to the
- *    matching value.  If you know your PNG files have a gamma that doesn't
- *    match the output you can take advantage of the fact that
- *    png_set_alpha_mode always sets the output gamma but only sets the PNG
- *    default if it is not already set:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    The first call sets both the default and the output gamma values, the
- *    second call overrides the output gamma without changing the default.  This
- *    is easier than achieving the same effect with png_set_gamma.  You must use
- *    PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will
- *    fire if more than one call to png_set_alpha_mode and png_set_background is
- *    made in the same read operation, however multiple calls with PNG_ALPHA_PNG
- *    are ignored.
- */
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
-    int flags));
-/* The values of the PNG_FILLER_ defines should NOT be changed */
-#  define PNG_FILLER_BEFORE 0
-#  define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
-    png_uint_32 filler, int flags));
-#endif /* READ_FILLER || WRITE_FILLER */
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-/* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
-    true_bits));
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* Have the code handle the interlacing.  Returns the number of passes.
- * MUST be called before png_read_update_info or png_start_read_image,
- * otherwise it will not have the desired effect.  Note that it is still
- * necessary to call png_read_row or png_read_rows png_get_image_height
- * times for each pass.
-*/
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-/* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color.  Prior to
- * libpng-1.5.4 this API must not be called before the PNG file header has been
- * read.  Doing so will result in unexpected behavior and possible warnings or
- * errors if the PNG file contains a bKGD chunk.
- */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma))
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma))
-#endif
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-#  define PNG_BACKGROUND_GAMMA_SCREEN  1
-#  define PNG_BACKGROUND_GAMMA_FILE    2
-#  define PNG_BACKGROUND_GAMMA_UNIQUE  3
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-/* Scale a 16-bit depth file down to 8-bit, accurately. */
-PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_16_TO_8_SUPPORTED /* Name prior to 1.5.4 */
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Turn on quantizing, and reduce the palette to the number of colors
- * available.
- */
-PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
-    png_colorp palette, int num_palette, int maximum_colors,
-    png_const_uint_16p histogram, int full_quantize));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* The threshold on gamma processing is configurable but hard-wired into the
- * library.  The following is the floating point variant.
- */
-#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)
-
-/* Handle gamma correction. Screen_gamma=(display_exponent).
- * NOTE: this API simply sets the screen and file gamma values. It will
- * therefore override the value for gamma in a PNG file if it is called after
- * the file header has been read - use with care  - call before reading the PNG
- * file for best results!
- *
- * These routines accept the same gamma values as png_set_alpha_mode (described
- * above).  The PNG_GAMMA_ defines and PNG_DEFAULT_sRGB can be passed to either
- * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value
- * is the inverse of a 'screen gamma' value.
- */
-PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,
-    double screen_gamma, double override_file_gamma))
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma))
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,
-    png_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,
-    png_bytep display_row));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
-    png_const_bytep row));
-
-/* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writeable to maintain compatibility with previous versions
- * of libpng and to allow the 'display_row' array from read_rows to be passed
- * unchanged to write_rows.
- */
-PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,
-    png_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
-    int ancil_action));
-
-/* Values for png_set_crc_action() say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
- * therein.  Note that it is impossible to "discard" data in a critical
- * chunk.  For versions prior to 0.90, the action was always error/quit,
- * whereas in version 0.90 and later, the action for CRC errors in ancillary
- * chunks is warn/discard.  These values should NOT be changed.
- *
- *      value                       action:critical     action:ancillary
- */
-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
-
-#ifdef PNG_WRITE_SUPPORTED
-/* These functions give the user control over the scan-line filtering in
- * libpng and the compression methods used by zlib.  These functions are
- * mainly useful for testing, as the defaults should work with most users.
- * Those users who are tight on memory or want faster performance at the
- * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
- */
-
-/* Set the filtering method(s) used by libpng.  Currently, the only valid
- * value for "method" is 0.
- */
-PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
-    int filters));
-#endif /* WRITE */
-
-/* Flags for png_set_filter() to say which filters to use.  The flags
- * are chosen so that they don't conflict with real filter types
- * below, in case they are supplied instead of the #defined constants.
- * These values should NOT be changed.
- */
-#define PNG_NO_FILTERS     0x00
-#define PNG_FILTER_NONE    0x08
-#define PNG_FILTER_SUB     0x10
-#define PNG_FILTER_UP      0x20
-#define PNG_FILTER_AVG     0x40
-#define PNG_FILTER_PAETH   0x80
-#define PNG_FAST_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP)
-#define PNG_ALL_FILTERS (PNG_FAST_FILTERS | PNG_FILTER_AVG | PNG_FILTER_PAETH)
-
-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
- * These defines should NOT be changed.
- */
-#define PNG_FILTER_VALUE_NONE  0
-#define PNG_FILTER_VALUE_SUB   1
-#define PNG_FILTER_VALUE_UP    2
-#define PNG_FILTER_VALUE_AVG   3
-#define PNG_FILTER_VALUE_PAETH 4
-#define PNG_FILTER_VALUE_LAST  5
-
-#ifdef PNG_WRITE_SUPPORTED
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,
-    int heuristic_method, int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs))
-PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structrp png_ptr, int heuristic_method, int num_weights,
-    png_const_fixed_point_p filter_weights,
-    png_const_fixed_point_p filter_costs))
-#endif /* WRITE_WEIGHTED_FILTER */
-
-/* The following are no longer used and will be removed from libpng-1.7: */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
-/* Set the library compression level.  Currently, valid values range from
- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
- * (0 - no compression, 9 - "maximal" compression).  Note that tests have
- * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future,
- * these values may not correspond directly to the zlib compression levels.
- */
-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,
-    int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,
-    int method));
-#endif /* WRITE_CUSTOMIZE_COMPRESSION */
-
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-/* Also set zlib parameters for compressing non-IDAT chunks */
-PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,
-    int level));
-
-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(225, void, png_set_text_compression_window_bits,
-    (png_structrp png_ptr, int window_bits));
-
-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
-    int method));
-#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
-#endif /* WRITE */
-
-/* These next functions are called for input/output, memory, and error
- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
- * and call standard C I/O routines such as fread(), fwrite(), and
- * fprintf().  These functions can be made to use other I/O routines
- * at run time for those applications that need to handle I/O in a
- * different manner by calling png_set_???_fn().  See libpng-manual.txt for
- * more information.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-/* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
-#endif
-
-/* Replace the (error and abort), and warning functions with user
- * supplied functions.  If no messages are to be printed you must still
- * write and use replacement functions. The replacement error_fn should
- * still do a longjmp to the last setjmp location if you are using this
- * method of error handling.  If error_fn or warning_fn is NULL, the
- * default function will be used.
- */
-
-PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,
-    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
-
-/* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
-
-/* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
- * output_flush_fn will be ignored (and thus can be NULL).
- * It is probably a mistake to use NULL for output_flush_fn if
- * write_data_fn is not also NULL unless you have built libpng with
- * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's
- * default flush function, which uses the standard *FILE structure, will
- * be used.
- */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
-/* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr read_data_fn));
-
-/* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,
-    png_write_status_ptr write_row_fn));
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-/* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr read_user_transform_fn));
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr write_user_transform_fn));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,
-    png_voidp user_transform_ptr, int user_transform_depth,
-    int user_transform_channels));
-/* Return the user pointer associated with the user transform functions */
-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-/* Return information about the row currently being processed.  Note that these
- * APIs do not fail but will return unexpected results if called outside a user
- * transform callback.  Also note that when transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-/* This callback is called only for *unknown* chunks.  If
- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED is set then it is possible to set known
- * chunks to be treated as unknown, however in this case the callback must do
- * any processing required by the chunk (e.g. by calling the appropriate
- * png_set_ APIs.)
- *
- * There is no write support - on write, by default, all the chunks in the
- * 'unknown' list are written in the specified position.
- *
- * The integer return from the callback function is interpreted thus:
- *
- * negative: An error occurred; png_chunk_error will be called.
- *     zero: The chunk was not handled, the chunk will be saved. A critical
- *           chunk will cause an error at this point unless it is to be saved.
- * positive: The chunk was handled, libpng will ignore/discard it.
- *
- * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about
- * how this behavior will change in libpng 1.7
- */
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-/* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,
-    png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
-    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
-
-/* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
-    (png_const_structrp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
-    png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));
-
-/* A function which may be called *only* within png_process_data to stop the
- * processing of any more data.  The function returns the number of bytes
- * remaining, excluding any that libpng has cached internally.  A subsequent
- * call to png_process_data must supply these bytes again.  If the argument
- * 'save' is set to true the routine will first save all the pending data and
- * will always return 0.
- */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
-
-/* A function which may be called *only* outside (after) a call to
- * png_process_data.  It returns the number of bytes of data to skip in the
- * input.  Normally it will return 0, but if it returns a non-zero value the
- * application must skip than number of bytes of input data and pass the
- * following data to the next call to png_process_data.
- */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
-
-/* Function that combines rows.  'new_row' is a flag that should come from
- * the callback and be non-NULL if anything needs to be done; the library
- * stores its own version of the new data internally and ignores the passed
- * in value.
- */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PROGRESSIVE_READ */
-
-PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application; this works on the png_info structure passed
- * in, it does not change the state for other png_info structures.
- *
- * It is unlikely that this function works correctly as of 1.6.0 and using it
- * may result either in memory leaks or double free of allocated data.
- */
-PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int freer, png_uint_32 mask));
-
-/* Assignments for png_data_freer */
-#define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
-/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008U
-#define PNG_FREE_ICCP 0x0010U
-#define PNG_FREE_SPLT 0x0020U
-#define PNG_FREE_ROWS 0x0040U
-#define PNG_FREE_PCAL 0x0080U
-#define PNG_FREE_SCAL 0x0100U
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#  define PNG_FREE_UNKN 0x0200U
-#endif
-/*      PNG_FREE_LIST 0x0400U   removed in 1.6.0 because it is ignored */
-#define PNG_FREE_PLTE 0x1000U
-#define PNG_FREE_TRNS 0x2000U
-#define PNG_FREE_TEXT 0x4000U
-#define PNG_FREE_ALL  0x7fffU
-#define PNG_FREE_MUL  0x4220U /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);
-PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,
-    png_voidp ptr), PNG_DEPRECATED);
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-/* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-#else
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);
-#  define png_error(s1,s2) png_err(s1)
-#  define png_chunk_error(s1,s2) png_err(s1)
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-
-/* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#else
-#  define png_warning(s1,s2) ((void)(s1))
-#  define png_chunk_warning(s1,s2) ((void)(s1))
-#endif
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-/* Benign error in libpng.  Can continue, but may have a problem.
- * User can choose whether to handle as a fatal error or as a warning. */
-PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-
-#ifdef PNG_READ_SUPPORTED
-/* Same, chunk name is prepended to message (only during read) */
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#endif
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structrp png_ptr, int allowed));
-#else
-#  ifdef PNG_ALLOW_BENIGN_ERRORS
-#    define png_benign_error png_warning
-#    define png_chunk_benign_error png_chunk_warning
-#  else
-#    define png_benign_error png_error
-#    define png_chunk_benign_error png_chunk_error
-#  endif
-#endif
-
-/* The png_set_<chunk> functions are for storing values in the png_info_struct.
- * Similarly, the png_get_<chunk> calls are used to read values from the
- * png_info_struct, either storing the parameters in the passed variables, or
- * setting pointers into the png_info_struct where the data is stored.  The
- * png_get_<chunk> functions return a non-zero value if the data was available
- * in info_ptr, or return zero and do not change any of the parameters if the
- * data was not available.
- *
- * These functions should be used instead of directly accessing png_info
- * to avoid problems with future changes in the size and internal layout of
- * png_info_struct.
- */
-/* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 flag));
-
-/* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* Returns row_pointers, which is an array of pointers to scanlines that was
- * returned from png_read_png().
- */
-PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Set row_pointers, which is an array of pointers to scanlines for use
- * by png_write_png().
- */
-PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image resolution in pixels per meter, from pHYs chunk data. */
-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-
-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-#endif /* EASY_ACCESS */
-
-#ifdef PNG_READ_SUPPORTED
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,
-    double *red_y, double *green_x, double *green_y, double *blue_x,
-    double *blue_y))
-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,
-    double *green_X, double *green_Y, double *green_Z, double *blue_X,
-    double *blue_Y, double *blue_Z))
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_white_x, png_fixed_point *int_white_y,
-    png_fixed_point *int_red_x, png_fixed_point *int_red_y,
-    png_fixed_point *int_green_x, png_fixed_point *int_green_y,
-    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))
-PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z))
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
-    double white_x, double white_y, double red_x, double red_y, double green_x,
-    double green_y, double blue_x, double blue_y))
-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double red_X, double red_Y, double red_Z,
-    double green_X, double green_Y, double green_Z, double blue_X,
-    double blue_Y, double blue_Z))
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y))
-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z))
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *file_gamma))
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_file_gamma))
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double file_gamma))
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_file_gamma))
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_16p *hist));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,
-    int *bit_depth, int *color_type, int *interlace_method,
-    int *compression_method, int *filter_method));
-
-PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_method, int compression_method,
-    int filter_method));
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
-   png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
-   int *unit_type));
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,
-    int unit_type));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,
-    png_int_32 *X1, int *type, int *nparams, png_charp *units,
-    png_charpp *params));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,
-    int type, int nparams, png_const_charp units, png_charpp params));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-#endif
-
-PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,
-   png_inforp info_ptr, png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charpp name, int *compression_type,
-    png_bytepp profile, png_uint_32 *proflen));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp name, int compression_type,
-    png_const_bytep profile, png_uint_32 proflen));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_textp *text_ptr, int *num_text));
-#endif
-
-/* Note while png_set_text() will accept a structure whose text,
- * language, and  translated keywords are NULL pointers, the structure
- * returned by png_get_text will always contain regular
- * zero-terminated C strings.  They might be empty strings but
- * they will never be NULL pointers.
- */
-
-#ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_textp text_ptr, int num_text));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,
-    png_color_16p *trans_color));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,
-    png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *unit, double *width, double *height))
-#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
-   defined(PNG_FLOATING_POINT_SUPPORTED)
-/* NOTE: this API is currently implemented using floating point arithmetic,
- * consequently it can only be used on systems with floating point support.
- * In any case the range of values supported by png_fixed_point is small and it
- * is highly recommended that png_get_sCAL_s be used instead.
- */
-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_fixed_point *width, png_fixed_point *height))
-#endif
-PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit, double width, double height))
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
-   png_inforp info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height))
-PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit,
-    png_const_charp swidth, png_const_charp sheight));
-#endif /* sCAL */
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-/* Provide the default handling for all unknown chunks or, optionally, for
- * specific unknown chunks.
- *
- * NOTE: prior to 1.6.0 the handling specified for particular chunks on read was
- * ignored and the default was used, the per-chunk setting only had an effect on
- * write.  If you wish to have chunk-specific handling on read in code that must
- * work on earlier versions you must use a user chunk callback to specify the
- * desired handling (keep or discard.)
- *
- * The 'keep' parameter is a PNG_HANDLE_CHUNK_ value as listed below.  The
- * parameter is interpreted as follows:
- *
- * READ:
- *    PNG_HANDLE_CHUNK_AS_DEFAULT:
- *       Known chunks: do normal libpng processing, do not keep the chunk (but
- *          see the comments below about PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
- *       Unknown chunks: for a specific chunk use the global default, when used
- *          as the default discard the chunk data.
- *    PNG_HANDLE_CHUNK_NEVER:
- *       Discard the chunk data.
- *    PNG_HANDLE_CHUNK_IF_SAFE:
- *       Keep the chunk data if the chunk is not critical else raise a chunk
- *       error.
- *    PNG_HANDLE_CHUNK_ALWAYS:
- *       Keep the chunk data.
- *
- * If the chunk data is saved it can be retrieved using png_get_unknown_chunks,
- * below.  Notice that specifying "AS_DEFAULT" as a global default is equivalent
- * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
- * it simply resets the behavior to the libpng default.
- *
- * INTERACTION WTIH USER CHUNK CALLBACKS:
- * The per-chunk handling is always used when there is a png_user_chunk_ptr
- * callback and the callback returns 0; the chunk is then always stored *unless*
- * it is critical and the per-chunk setting is other than ALWAYS.  Notice that
- * the global default is *not* used in this case.  (In effect the per-chunk
- * value is incremented to at least IF_SAFE.)
- *
- * IMPORTANT NOTE: this behavior will change in libpng 1.7 - the global and
- * per-chunk defaults will be honored.  If you want to preserve the current
- * behavior when your callback returns 0 you must set PNG_HANDLE_CHUNK_IF_SAFE
- * as the default - if you don't do this libpng 1.6 will issue a warning.
- *
- * If you want unhandled unknown chunks to be discarded in libpng 1.6 and
- * earlier simply return '1' (handled).
- *
- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED:
- *    If this is *not* set known chunks will always be handled by libpng and
- *    will never be stored in the unknown chunk list.  Known chunks listed to
- *    png_set_keep_unknown_chunks will have no effect.  If it is set then known
- *    chunks listed with a keep other than AS_DEFAULT will *never* be processed
- *    by libpng, in addition critical chunks must either be processed by the
- *    callback or saved.
- *
- *    The IHDR and IEND chunks must not be listed.  Because this turns off the
- *    default handling for chunks that would otherwise be recognized the
- *    behavior of libpng transformations may well become incorrect!
- *
- * WRITE:
- *    When writing chunks the options only apply to the chunks specified by
- *    png_set_unknown_chunks (below), libpng will *always* write known chunks
- *    required by png_set_ calls and will always write the core critical chunks
- *    (as required for PLTE).
- *
- *    Each chunk in the png_set_unknown_chunks list is looked up in the
- *    png_set_keep_unknown_chunks list to find the keep setting, this is then
- *    interpreted as follows:
- *
- *    PNG_HANDLE_CHUNK_AS_DEFAULT:
- *       Write safe-to-copy chunks and write other chunks if the global
- *       default is set to _ALWAYS, otherwise don't write this chunk.
- *    PNG_HANDLE_CHUNK_NEVER:
- *       Do not write the chunk.
- *    PNG_HANDLE_CHUNK_IF_SAFE:
- *       Write the chunk if it is safe-to-copy, otherwise do not write it.
- *    PNG_HANDLE_CHUNK_ALWAYS:
- *       Write the chunk.
- *
- * Note that the default behavior is effectively the opposite of the read case -
- * in read unknown chunks are not stored by default, in write they are written
- * by default.  Also the behavior of PNG_HANDLE_CHUNK_IF_SAFE is very different
- * - on write the safe-to-copy bit is checked, on read the critical bit is
- * checked and on read if the chunk is critical an error will be raised.
- *
- * num_chunks:
- * ===========
- *    If num_chunks is positive, then the "keep" parameter specifies the manner
- *    for handling only those chunks appearing in the chunk_list array,
- *    otherwise the chunk list array is ignored.
- *
- *    If num_chunks is 0 the "keep" parameter specifies the default behavior for
- *    unknown chunks, as described above.
- *
- *    If num_chunks is negative, then the "keep" parameter specifies the manner
- *    for handling all unknown chunks plus all chunks recognized by libpng
- *    except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
- *    be processed by libpng.
- */
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
-    int keep, png_const_bytep chunk_list, int num_chunks));
-#endif /* HANDLE_AS_UNKNOWN */
-
-/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
- * the result is therefore true (non-zero) if special handling is required,
- * false for the default handling.
- */
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
-    png_const_bytep chunk_name));
-#endif /* SET_UNKNOWN_CHUNKS */
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-   /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added
-    * unknowns to the location currently stored in the png_struct.  This is
-    * invariably the wrong value on write.  To fix this call the following API
-    * for each chunk in the list with the correct location.  If you know your
-    * code won't be compiled on earlier versions you can rely on
-    * png_set_unknown_chunks(write-ptr, png_get_unknown_chunks(read-ptr)) doing
-    * the correct thing.
-    */
-
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));
-
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_unknown_chunkpp entries));
-#endif
-
-/* Png_free_data() will turn off the "valid" flag for anything it frees.
- * If you need to turn it off for a chunk that your application has freed,
- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
- */
-PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, png_voidp params));
-#endif
-#ifdef PNG_WRITE_SUPPORTED
-PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, png_voidp params));
-#endif
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structrp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
-    png_uint_32 mng_features_permitted));
-#endif
-
-/* For use in png_set_keep_unknown, added to version 1.2.6 */
-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
-#define PNG_HANDLE_CHUNK_NEVER        1
-#define PNG_HANDLE_CHUNK_IF_SAFE      2
-#define PNG_HANDLE_CHUNK_ALWAYS       3
-#define PNG_HANDLE_CHUNK_LAST         4
-
-/* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler.
- */
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,
-    png_uint_32 strip_mode));
-#endif
-
-/* Added in libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,
-    png_uint_32 user_width_max, png_uint_32 user_height_max));
-PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structrp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structrp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structrp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* pHYs */
-#endif  /* INCH_CONVERSIONS */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));
-
-/* Removed from libpng 1.6; use png_get_io_chunk_type. */
-PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),
-    PNG_DEPRECATED)
-
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structrp png_ptr));
-
-/* The flags returned by png_get_io_state() are the following: */
-#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
-#  define PNG_IO_READING     0x0001   /* currently reading */
-#  define PNG_IO_WRITING     0x0002   /* currently writing */
-#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */
-#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */
-#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */
-#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */
-#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */
-#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */
-#endif /* IO_STATE */
-
-/* Interlace support.  The following macros are always defined so that if
- * libpng interlace handling is turned off the macros may be used to handle
- * interlaced images within the application.
- */
-#define PNG_INTERLACE_ADAM7_PASSES 7
-
-/* Two macros to return the first row and first column of the original,
- * full, image which appears in a given pass.  'pass' is in the range 0
- * to 6 and the result is in the range 0 to 7.
- */
-#define PNG_PASS_START_ROW(pass) (((1&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* A macro to return the offset between pixels in the output row for a pair of
- * pixels in the input - effectively the inverse of the 'COL_SHIFT' macro that
- * follows.  Note that ROW_OFFSET is the offset from one row to the next whereas
- * COL_OFFSET is from one column to the next, within a row.
- */
-#define PNG_PASS_ROW_OFFSET(pass) ((pass)>2?(8>>(((pass)-1)>>1)):8)
-#define PNG_PASS_COL_OFFSET(pass) (1<<((7-(pass))>>1))
-
-/* Two macros to help evaluate the number of rows or columns in each
- * pass.  This is expressed as a shift - effectively log2 of the number or
- * rows or columns in each 8x8 tile of the original image.
- */
-#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3)
-#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3)
-
-/* Hence two macros to determine the number of rows or columns in a given
- * pass of an image given its height or width.  In fact these macros may
- * return non-zero even though the sub-image is empty, because the other
- * dimension may be empty for a small image.
- */
-#define PNG_PASS_ROWS(height, pass) (((height)+(((1<<PNG_PASS_ROW_SHIFT(pass))\
-   -1)-PNG_PASS_START_ROW(pass)))>>PNG_PASS_ROW_SHIFT(pass))
-#define PNG_PASS_COLS(width, pass) (((width)+(((1<<PNG_PASS_COL_SHIFT(pass))\
-   -1)-PNG_PASS_START_COL(pass)))>>PNG_PASS_COL_SHIFT(pass))
-
-/* For the reader row callbacks (both progressive and sequential) it is
- * necessary to find the row in the output image given a row in an interlaced
- * image, so two more macros:
- */
-#define PNG_ROW_FROM_PASS_ROW(y_in, pass) \
-   (((y_in)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(x_in, pass) \
-   (((x_in)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-
-/* Two macros which return a boolean (0 or 1) saying whether the given row
- * or column is in a particular pass.  These use a common utility macro that
- * returns a mask for a given pass - the offset 'off' selects the row or
- * column version.  The mask has the appropriate bit set for each column in
- * the tile.
- */
-#define PNG_PASS_MASK(pass,off) ( \
-   ((0x110145AF>>(((7-(off))-(pass))<<2)) & 0xF) | \
-   ((0x01145AF0>>(((7-(off))-(pass))<<2)) & 0xF0))
-
-#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \
-   ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)
-#define PNG_COL_IN_INTERLACE_PASS(x, pass) \
-   ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1)
-
-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
-/* With these routines we avoid an integer divide, which will be slower on
- * most machines.  However, it does take more operations than the corresponding
- * divide method, so it may be slower on a few RISC systems.  There are two
- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
- *
- * Note that the rounding factors are NOT supposed to be the same!  128 and
- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
- * standard method.
- *
- * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
- */
-
- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-
-#  define png_composite(composite, fg, alpha, bg)        \
-   {                                                     \
-      png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
-          * (png_uint_16)(alpha)                         \
-          + (png_uint_16)(bg)*(png_uint_16)(255          \
-          - (png_uint_16)(alpha)) + 128);                \
-      (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); \
-   }
-
-#  define png_composite_16(composite, fg, alpha, bg)     \
-   {                                                     \
-      png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \
-          * (png_uint_32)(alpha)                         \
-          + (png_uint_32)(bg)*(65535                     \
-          - (png_uint_32)(alpha)) + 32768);              \
-      (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); \
-   }
-
-#else  /* Standard method using integer division */
-
-#  define png_composite(composite, fg, alpha, bg)                      \
-   (composite) =                                                       \
-       (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
-       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
-       127) / 255))
-
-#  define png_composite_16(composite, fg, alpha, bg)                       \
-   (composite) =                                                           \
-       (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-       (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +     \
-       32767) / 65535))
-#endif /* READ_COMPOSITE_NODIV */
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
-#endif
-
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,
-    png_const_bytep buf));
-/* No png_get_int_16 -- may be added if there's a real need for it. */
-
-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));
-#endif
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
-/* No png_save_int_16 -- may be added if there's a real need for it. */
-#endif
-
-#ifdef PNG_USE_READ_MACROS
-/* Inline macros to do direct reads of bytes from the input buffer.
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
-#  define PNG_get_uint_32(buf) \
-   (((png_uint_32)(*(buf)) << 24) + \
-    ((png_uint_32)(*((buf) + 1)) << 16) + \
-    ((png_uint_32)(*((buf) + 2)) << 8) + \
-    ((png_uint_32)(*((buf) + 3))))
-
-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
-    * function) incorrectly returned a value of type png_uint_32.
-    */
-#  define PNG_get_uint_16(buf) \
-   ((png_uint_16) \
-    (((unsigned int)(*(buf)) << 8) + \
-    ((unsigned int)(*((buf) + 1)))))
-
-#  define PNG_get_int_32(buf) \
-   ((png_int_32)((*(buf) & 0x80) \
-    ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \
-    : (png_int_32)png_get_uint_32(buf)))
-
-/* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
- * but defining a macro name prefixed with PNG_PREFIX.
- */
-#  ifndef PNG_PREFIX
-#    define png_get_uint_32(buf) PNG_get_uint_32(buf)
-#    define png_get_uint_16(buf) PNG_get_uint_16(buf)
-#    define png_get_int_32(buf)  PNG_get_int_32(buf)
-#  endif
-#else
-#  ifdef PNG_PREFIX
-   /* No macros; revert to the (redefined) function */
-#    define PNG_get_uint_32 (png_get_uint_32)
-#    define PNG_get_uint_16 (png_get_uint_16)
-#    define PNG_get_int_32  (png_get_int_32)
-#  endif
-#endif
-
-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-PNG_EXPORT(242, void, png_set_check_for_invalid_index,
-    (png_structrp png_ptr, int allowed));
-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-#  endif
-#endif /* CHECK_FOR_INVALID_INDEX */
-
-/*******************************************************************************
- * Section 5: SIMPLIFIED API
- *******************************************************************************
- *
- * Please read the documentation in libpng-manual.txt (TODO: write said
- * documentation) if you don't understand what follows.
- *
- * The simplified API hides the details of both libpng and the PNG file format
- * itself.  It allows PNG files to be read into a very limited number of
- * in-memory bitmap formats or to be written from the same formats.  If these
- * formats do not accomodate your needs then you can, and should, use the more
- * sophisticated APIs above - these support a wide variety of in-memory formats
- * and a wide variety of sophisticated transformations to those formats as well
- * as a wide variety of APIs to manipulate ancillary information.
- *
- * To read a PNG file using the simplified API:
- *
- * 1) Declare a 'png_image' structure (see below) on the stack, set the
- *    version field to PNG_IMAGE_VERSION and the 'opaque' pointer to NULL
- *    (this is REQUIRED, your program may crash if you don't do it.)
- * 2) Call the appropriate png_image_begin_read... function.
- * 3) Set the png_image 'format' member to the required sample format.
- * 4) Allocate a buffer for the image and, if required, the color-map.
- * 5) Call png_image_finish_read to read the image and, if required, the
- *    color-map into your buffers.
- *
- * There are no restrictions on the format of the PNG input itself; all valid
- * color types, bit depths, and interlace methods are acceptable, and the
- * input image is transformed as necessary to the requested in-memory format
- * during the png_image_finish_read() step.  The only caveat is that if you
- * request a color-mapped image from a PNG that is full-color or makes
- * complex use of an alpha channel the transformation is extremely lossy and the
- * result may look terrible.
- *
- * To write a PNG file using the simplified API:
- *
- * 1) Declare a 'png_image' structure on the stack and memset() it to all zero.
- * 2) Initialize the members of the structure that describe the image, setting
- *    the 'format' member to the format of the image samples.
- * 3) Call the appropriate png_image_write... function with a pointer to the
- *    image and, if necessary, the color-map to write the PNG data.
- *
- * png_image is a structure that describes the in-memory format of an image
- * when it is being read or defines the in-memory format of an image that you
- * need to write:
- */
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
-    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-
-#define PNG_IMAGE_VERSION 1
-
-typedef struct png_control *png_controlp;
-typedef struct
-{
-   png_controlp opaque;    /* Initialize to NULL, free with png_image_free */
-   png_uint_32  version;   /* Set to PNG_IMAGE_VERSION */
-   png_uint_32  width;     /* Image width in pixels (columns) */
-   png_uint_32  height;    /* Image height in pixels (rows) */
-   png_uint_32  format;    /* Image format as defined below */
-   png_uint_32  flags;     /* A bit mask containing informational flags */
-   png_uint_32  colormap_entries;
-                           /* Number of entries in the color-map */
-
-   /* In the event of an error or warning the following field will be set to a
-    * non-zero value and the 'message' field will contain a '\0' terminated
-    * string with the libpng error or warning message.  If both warnings and
-    * an error were encountered, only the error is recorded.  If there
-    * are multiple warnings, only the first one is recorded.
-    *
-    * The upper 30 bits of this value are reserved, the low two bits contain
-    * a value as follows:
-    */
-#  define PNG_IMAGE_WARNING 1
-#  define PNG_IMAGE_ERROR 2
-   /*
-    * The result is a two-bit code such that a value more than 1 indicates
-    * a failure in the API just called:
-    *
-    *    0 - no warning or error
-    *    1 - warning
-    *    2 - error
-    *    3 - error preceded by warning
-    */
-#  define PNG_IMAGE_FAILED(png_cntrl) ((((png_cntrl).warning_or_error)&0x03)>1)
-
-   png_uint_32  warning_or_error;
-
-   char         message[64];
-} png_image, *png_imagep;
-
-/* The samples of the image have one to four channels whose components have
- * original values in the range 0 to 1.0:
- *
- * 1: A single gray or luminance channel (G).
- * 2: A gray/luminance channel and an alpha channel (GA).
- * 3: Three red, green, blue color channels (RGB).
- * 4: Three color channels and an alpha channel (RGBA).
- *
- * The components are encoded in one of two ways:
- *
- * a) As a small integer, value 0..255, contained in a single byte.  For the
- * alpha channel the original value is simply value/255.  For the color or
- * luminance channels the value is encoded according to the sRGB specification
- * and matches the 8-bit format expected by typical display devices.
- *
- * The color/gray channels are not scaled (pre-multiplied) by the alpha
- * channel and are suitable for passing to color management software.
- *
- * b) As a value in the range 0..65535, contained in a 2-byte integer.  All
- * channels can be converted to the original value by dividing by 65535; all
- * channels are linear.  Color channels use the RGB encoding (RGB end-points) of
- * the sRGB specification.  This encoding is identified by the
- * PNG_FORMAT_FLAG_LINEAR flag below.
- *
- * When the simplified API needs to convert between sRGB and linear colorspaces,
- * the actual sRGB transfer curve defined in the sRGB specification (see the
- * article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2
- * approximation used elsewhere in libpng.
- *
- * When an alpha channel is present it is expected to denote pixel coverage
- * of the color or luminance channels and is returned as an associated alpha
- * channel: the color/gray channels are scaled (pre-multiplied) by the alpha
- * value.
- *
- * The samples are either contained directly in the image data, between 1 and 8
- * bytes per pixel according to the encoding, or are held in a color-map indexed
- * by bytes in the image data.  In the case of a color-map the color-map entries
- * are individual samples, encoded as above, and the image data has one byte per
- * pixel to select the relevant sample from the color-map.
- */
-
-/* PNG_FORMAT_*
- *
- * #defines to be used in png_image::format.  Each #define identifies a
- * particular layout of sample data and, if present, alpha values.  There are
- * separate defines for each of the two component encodings.
- *
- * A format is built up using single bit flag values.  All combinations are
- * valid.  Formats can be built up from the flag values or you can use one of
- * the predefined values below.  When testing formats always use the FORMAT_FLAG
- * macros to test for individual features - future versions of the library may
- * add new flags.
- *
- * When reading or writing color-mapped images the format should be set to the
- * format of the entries in the color-map then png_image_{read,write}_colormap
- * called to read or write the color-map and set the format correctly for the
- * image data.  Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!
- *
- * NOTE: libpng can be built with particular features disabled. If you see
- * compiler errors because the definition of one of the following flags has been
- * compiled out it is because libpng does not have the required support.  It is
- * possible, however, for the libpng configuration to enable the format on just
- * read or just write; in that case you may see an error at run time.  You can
- * guard against this by checking for the definition of the appropriate
- * "_SUPPORTED" macro, one of:
- *
- *    PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED
- */
-#define PNG_FORMAT_FLAG_ALPHA    0x01U /* format with an alpha channel */
-#define PNG_FORMAT_FLAG_COLOR    0x02U /* color format: otherwise grayscale */
-#define PNG_FORMAT_FLAG_LINEAR   0x04U /* 2-byte channels else 1-byte */
-#define PNG_FORMAT_FLAG_COLORMAP 0x08U /* image data is color-mapped */
-
-#ifdef PNG_FORMAT_BGR_SUPPORTED
-#  define PNG_FORMAT_FLAG_BGR    0x10U /* BGR colors, else order is RGB */
-#endif
-
-#ifdef PNG_FORMAT_AFIRST_SUPPORTED
-#  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */
-#endif
-
-/* Commonly used formats have predefined macros.
- *
- * First the single byte (sRGB) formats:
- */
-#define PNG_FORMAT_GRAY 0
-#define PNG_FORMAT_GA   PNG_FORMAT_FLAG_ALPHA
-#define PNG_FORMAT_AG   (PNG_FORMAT_GA|PNG_FORMAT_FLAG_AFIRST)
-#define PNG_FORMAT_RGB  PNG_FORMAT_FLAG_COLOR
-#define PNG_FORMAT_BGR  (PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_BGR)
-#define PNG_FORMAT_RGBA (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_ARGB (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_AFIRST)
-#define PNG_FORMAT_BGRA (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_ABGR (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_AFIRST)
-
-/* Then the linear 2-byte formats.  When naming these "Y" is used to
- * indicate a luminance (gray) channel.
- */
-#define PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR
-#define PNG_FORMAT_LINEAR_Y_ALPHA (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_LINEAR_RGB (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR)
-#define PNG_FORMAT_LINEAR_RGB_ALPHA \
-   (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA)
-
-/* With color-mapped formats the image data is one byte for each pixel, the byte
- * is an index into the color-map which is formatted as above.  To obtain a
- * color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP
- * to one of the above definitions, or you can use one of the definitions below.
- */
-#define PNG_FORMAT_RGB_COLORMAP  (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_BGR_COLORMAP  (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_RGBA_COLORMAP (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_ARGB_COLORMAP (PNG_FORMAT_ARGB|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_BGRA_COLORMAP (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_ABGR_COLORMAP (PNG_FORMAT_ABGR|PNG_FORMAT_FLAG_COLORMAP)
-
-/* PNG_IMAGE macros
- *
- * These are convenience macros to derive information from a png_image
- * structure.  The PNG_IMAGE_SAMPLE_ macros return values appropriate to the
- * actual image sample values - either the entries in the color-map or the
- * pixels in the image.  The PNG_IMAGE_PIXEL_ macros return corresponding values
- * for the pixels and will always return 1 for color-mapped formats.  The
- * remaining macros return information about the rows in the image and the
- * complete image.
- *
- * NOTE: All the macros that take a png_image::format parameter are compile time
- * constants if the format parameter is, itself, a constant.  Therefore these
- * macros can be used in array declarations and case labels where required.
- * Similarly the macros are also pre-processor constants (sizeof is not used) so
- * they can be used in #if tests.
- *
- * First the information about the samples.
- */
-#define PNG_IMAGE_SAMPLE_CHANNELS(fmt)\
-   (((fmt)&(PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA))+1)
-   /* Return the total number of channels in a given format: 1..4 */
-
-#define PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)\
-   ((((fmt) & PNG_FORMAT_FLAG_LINEAR) >> 2)+1)
-   /* Return the size in bytes of a single component of a pixel or color-map
-    * entry (as appropriate) in the image: 1 or 2.
-    */
-
-#define PNG_IMAGE_SAMPLE_SIZE(fmt)\
-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt))
-   /* This is the size of the sample data for one sample.  If the image is
-    * color-mapped it is the size of one color-map entry (and image pixels are
-    * one byte in size), otherwise it is the size of one image pixel.
-    */
-
-#define PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)\
-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * 256)
-   /* The maximum size of the color-map required by the format expressed in a
-    * count of components.  This can be used to compile-time allocate a
-    * color-map:
-    *
-    * png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];
-    *
-    * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];
-    *
-    * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the
-    * information from one of the png_image_begin_read_ APIs and dynamically
-    * allocate the required memory.
-    */
-
-/* Corresponding information about the pixels */
-#define PNG_IMAGE_PIXEL_(test,fmt)\
-   (((fmt)&PNG_FORMAT_FLAG_COLORMAP)?1:test(fmt))
-
-#define PNG_IMAGE_PIXEL_CHANNELS(fmt)\
-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_CHANNELS,fmt)
-   /* The number of separate channels (components) in a pixel; 1 for a
-    * color-mapped image.
-    */
-
-#define PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\
-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_COMPONENT_SIZE,fmt)
-   /* The size, in bytes, of each component in a pixel; 1 for a color-mapped
-    * image.
-    */
-
-#define PNG_IMAGE_PIXEL_SIZE(fmt) PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_SIZE,fmt)
-   /* The size, in bytes, of a complete pixel; 1 for a color-mapped image. */
-
-/* Information about the whole row, or whole image */
-#define PNG_IMAGE_ROW_STRIDE(image)\
-   (PNG_IMAGE_PIXEL_CHANNELS((image).format) * (image).width)
-   /* Return the total number of components in a single row of the image; this
-    * is the minimum 'row stride', the minimum count of components between each
-    * row.  For a color-mapped image this is the minimum number of bytes in a
-    * row.
-    *
-    * WARNING: this macro overflows for some images with more than one component
-    * and very large image widths.  libpng will refuse to process an image where
-    * this macro would overflow.
-    */
-
-#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\
-   (PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))
-   /* Return the size, in bytes, of an image buffer given a png_image and a row
-    * stride - the number of components to leave space for in each row.
-    *
-    * WARNING: this macro overflows a 32-bit integer for some large PNG images,
-    * libpng will refuse to process an image where such an overflow would occur.
-    */
-
-#define PNG_IMAGE_SIZE(image)\
-   PNG_IMAGE_BUFFER_SIZE(image, PNG_IMAGE_ROW_STRIDE(image))
-   /* Return the size, in bytes, of the image in memory given just a png_image;
-    * the row stride is the minimum stride required for the image.
-    */
-
-#define PNG_IMAGE_COLORMAP_SIZE(image)\
-   (PNG_IMAGE_SAMPLE_SIZE((image).format) * (image).colormap_entries)
-   /* Return the size, in bytes, of the color-map of this image.  If the image
-    * format is not a color-map format this will return a size sufficient for
-    * 256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if
-    * you don't want to allocate a color-map in this case.
-    */
-
-/* PNG_IMAGE_FLAG_*
- *
- * Flags containing additional information about the image are held in the
- * 'flags' field of png_image.
- */
-#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01
-   /* This indicates the the RGB values of the in-memory bitmap do not
-    * correspond to the red, green and blue end-points defined by sRGB.
-    */
-
-#define PNG_IMAGE_FLAG_FAST 0x02
-   /* On write emphasise speed over compression; the resultant PNG file will be
-    * larger but will be produced significantly faster, particular for large
-    * images.  Do not use this option for images which will be distributed, only
-    * used it when producing intermediate files that will be read back in
-    * repeatedly.  For a typical 24-bit image the option will double the read
-    * speed at the cost of increasing the image size by 25%, however for many
-    * more compressible images the PNG file can be 10 times larger with only a
-    * slight speed gain.
-    */
-
-#define PNG_IMAGE_FLAG_16BIT_sRGB 0x04
-   /* On read if the image is a 16-bit per component image and there is no gAMA
-    * or sRGB chunk assume that the components are sRGB encoded.  Notice that
-    * images output by the simplified API always have gamma information; setting
-    * this flag only affects the interpretation of 16-bit images from an
-    * external source.  It is recommended that the application expose this flag
-    * to the user; the user can normally easily recognize the difference between
-    * linear and sRGB encoding.  This flag has no effect on write - the data
-    * passed to the write APIs must have the correct encoding (as defined
-    * above.)
-    *
-    * If the flag is not set (the default) input 16-bit per component data is
-    * assumed to be linear.
-    *
-    * NOTE: the flag can only be set after the png_image_begin_read_ call,
-    * because that call initializes the 'flags' field.
-    */
-
-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-/* READ APIs
- * ---------
- *
- * The png_image passed to the read APIs must have been initialized by setting
- * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)
- */
-#ifdef PNG_STDIO_SUPPORTED
-PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
-   const char *file_name));
-   /* The named file is opened for read and the image header is filled in
-    * from the PNG header in the file.
-    */
-
-PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-   FILE* file));
-   /* The PNG header is read from the stdio FILE object. */
-#endif /* STDIO */
-
-PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
-   png_const_voidp memory, png_size_t size));
-   /* The PNG header is read from the given memory buffer. */
-
-PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
-   png_const_colorp background, void *buffer, png_int_32 row_stride,
-   void *colormap));
-   /* Finish reading the image into the supplied buffer and clean up the
-    * png_image structure.
-    *
-    * row_stride is the step, in byte or 2-byte units as appropriate,
-    * between adjacent rows.  A positive stride indicates that the top-most row
-    * is first in the buffer - the normal top-down arrangement.  A negative
-    * stride indicates that the bottom-most row is first in the buffer.
-    *
-    * background need only be supplied if an alpha channel must be removed from
-    * a png_byte format and the removal is to be done by compositing on a solid
-    * color; otherwise it may be NULL and any composition will be done directly
-    * onto the buffer.  The value is an sRGB color to use for the background,
-    * for grayscale output the green channel is used.
-    *
-    * background must be supplied when an alpha channel must be removed from a
-    * single byte color-mapped output format, in other words if:
-    *
-    * 1) The original format from png_image_begin_read_from_* had
-    *    PNG_FORMAT_FLAG_ALPHA set.
-    * 2) The format set by the application does not.
-    * 3) The format set by the application has PNG_FORMAT_FLAG_COLORMAP set and
-    *    PNG_FORMAT_FLAG_LINEAR *not* set.
-    *
-    * For linear output removing the alpha channel is always done by compositing
-    * on black and background is ignored.
-    *
-    * colormap must be supplied when PNG_FORMAT_FLAG_COLORMAP is set.  It must
-    * be at least the size (in bytes) returned by PNG_IMAGE_COLORMAP_SIZE.
-    * image->colormap_entries will be updated to the actual number of entries
-    * written to the colormap; this may be less than the original value.
-    */
-
-PNG_EXPORT(238, void, png_image_free, (png_imagep image));
-   /* Free any data allocated by libpng in image->opaque, setting the pointer to
-    * NULL.  May be called at any time after the structure is initialized.
-    */
-#endif /* SIMPLIFIED_READ */
-
-#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-/* WRITE APIS
- * ----------
- * For write you must initialize a png_image structure to describe the image to
- * be written.  To do this use memset to set the whole structure to 0 then
- * initialize fields describing your image.
- *
- * version: must be set to PNG_IMAGE_VERSION
- * opaque: must be initialized to NULL
- * width: image width in pixels
- * height: image height in rows
- * format: the format of the data (image and color-map) you wish to write
- * flags: set to 0 unless one of the defined flags applies; set
- *    PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images where the RGB
- *    values do not correspond to the colors in sRGB.
- * colormap_entries: set to the number of entries in the color-map (0 to 256)
- */
-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
-   const char *file, int convert_to_8bit, const void *buffer,
-   png_int_32 row_stride, const void *colormap));
-   /* Write the image to the named file. */
-
-PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
-   int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
-   const void *colormap));
-   /* Write the image to the given (FILE*). */
-#endif /* SIMPLIFIED_WRITE_STDIO */
-
-/* With all write APIs if image is in one of the linear formats with 16-bit
- * data then setting convert_to_8_bit will cause the output to be an 8-bit PNG
- * gamma encoded according to the sRGB specification, otherwise a 16-bit linear
- * encoded PNG file is written.
- *
- * With color-mapped data formats the colormap parameter point to a color-map
- * with at least image->colormap_entries encoded in the specified format.  If
- * the format is linear the written PNG color-map will be converted to sRGB
- * regardless of the convert_to_8_bit flag.
- *
- * With all APIs row_stride is handled as in the read APIs - it is the spacing
- * from one row to the next in component sized units (1 or 2 bytes) and if
- * negative indicates a bottom-up row layout in the buffer.  If row_stride is
- * zero, libpng will calculate it for you from the image width and number of
- * channels.
- *
- * Note that the write API does not support interlacing, sub-8-bit pixels or
- * most ancillary chunks.  If you need to write text chunks (e.g. for copyright
- * notices) you need to use one of the other APIs.
- */
-
-PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
-   png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8_bit,
-   const void *buffer, png_int_32 row_stride, const void *colormap));
-   /* Write the image to the given memory buffer.  The function both writes the
-    * whole PNG data stream to *memory and updates *memory_bytes with the count
-    * of bytes written.
-    *
-    * 'memory' may be NULL.  In this case *memory_bytes is not read however on
-    * success the number of bytes which would have been written will still be
-    * stored in *memory_bytes.  On failure *memory_bytes will contain 0.
-    *
-    * If 'memory' is not NULL it must point to memory[*memory_bytes] of
-    * writeable memory.
-    *
-    * If the function returns success memory[*memory_bytes] (if 'memory' is not
-    * NULL) contains the written PNG data.  *memory_bytes will always be less
-    * than or equal to the original value.
-    *
-    * If the function returns false and *memory_bytes was not changed an error
-    * occured during write.  If *memory_bytes was changed, or is not 0 if
-    * 'memory' was NULL, the write would have succeeded but for the memory
-    * buffer being too small.  *memory_bytes contains the required number of
-    * bytes and will be bigger that the original value.
-    */
-
-#define png_image_write_get_memory_size(image, size, convert_to_8_bit, buffer,\
-   row_stride, colormap)\
-   png_image_write_to_memory(&(image), 0, &(size), convert_to_8_bit, buffer,\
-         row_stride, colormap)
-   /* Return the amount of memory in 'size' required to compress this image.
-    * The png_image structure 'image' must be filled in as in the above
-    * function and must not be changed before the actual write call, the buffer
-    * and all other parameters must also be identical to that in the final
-    * write call.  The 'size' variable need not be initialized.
-    *
-    * NOTE: the macro returns true/false, if false is returned 'size' will be
-    * set to zero and the write failed and probably will fail if tried again.
-    */
-
-/* You can pre-allocate the buffer by making sure it is of sufficient size
- * regardless of the amount of compression achieved.  The buffer size will
- * always be bigger than the original image and it will never be filled.  The
- * following macros are provided to assist in allocating the buffer.
- */
-#define PNG_IMAGE_DATA_SIZE(image) (PNG_IMAGE_SIZE(image)+(image).height)
-   /* The number of uncompressed bytes in the PNG byte encoding of the image;
-    * uncompressing the PNG IDAT data will give this number of bytes.
-    *
-    * NOTE: while PNG_IMAGE_SIZE cannot overflow for an image in memory this
-    * macro can because of the extra bytes used in the PNG byte encoding.  You
-    * need to avoid this macro if your image size approaches 2^30 in width or
-    * height.  The same goes for the remainder of these macros; they all produce
-    * bigger numbers than the actual in-memory image size.
-    */
-#ifndef PNG_ZLIB_MAX_SIZE
-#  define PNG_ZLIB_MAX_SIZE(b) ((b)+(((b)+7U)>>3)+(((b)+63U)>>6)+11U)
-   /* An upper bound on the number of compressed bytes given 'b' uncompressed
-    * bytes.  This is based on deflateBounds() in zlib; different
-    * implementations of zlib compression may conceivably produce more data so
-    * if your zlib implementation is not zlib itself redefine this macro
-    * appropriately.
-    */
-#endif
-
-#define PNG_IMAGE_COMPRESSED_SIZE_MAX(image)\
-   PNG_ZLIB_MAX_SIZE((png_alloc_size_t)PNG_IMAGE_DATA_SIZE(image))
-   /* An upper bound on the size of the data in the PNG IDAT chunks. */
-
-#define PNG_IMAGE_PNG_SIZE_MAX_(image, image_size)\
-   ((8U/*sig*/+25U/*IHDR*/+16U/*gAMA*/+44U/*cHRM*/+12U/*IEND*/+\
-    (((image).format&PNG_FORMAT_FLAG_COLORMAP)?/*colormap: PLTE, tRNS*/\
-    12U+3U*(image).colormap_entries/*PLTE data*/+\
-    (((image).format&PNG_FORMAT_FLAG_ALPHA)?\
-    12U/*tRNS*/+(image).colormap_entries:0U):0U)+\
-    12U)+(12U*((image_size)/PNG_ZBUF_SIZE))/*IDAT*/+(image_size))
-   /* A helper for the following macro; if your compiler cannot handle the
-    * following macro use this one with the result of
-    * PNG_IMAGE_COMPRESSED_SIZE_MAX(image) as the second argument (most
-    * compilers should handle this just fine.)
-    */
-
-#define PNG_IMAGE_PNG_SIZE_MAX(image)\
-   PNG_IMAGE_PNG_SIZE_MAX_(image, PNG_IMAGE_COMPRESSED_SIZE_MAX(image))
-   /* An upper bound on the total length of the PNG data stream for 'image'.
-    * The result is of type png_alloc_size_t, on 32-bit systems this may
-    * overflow even though PNG_IMAGE_DATA_SIZE does not overflow; the write will
-    * run out of buffer space but return a corrected size which should work.
-    */
-#endif /* SIMPLIFIED_WRITE */
-/*******************************************************************************
- *  END OF SIMPLIFIED API
- ******************************************************************************/
-#endif /* SIMPLIFIED_{READ|WRITE} */
-
-/*******************************************************************************
- * Section 6: IMPLEMENTATION OPTIONS
- *******************************************************************************
- *
- * Support for arbitrary implementation-specific optimizations.  The API allows
- * particular options to be turned on or off.  'Option' is the number of the
- * option and 'onoff' is 0 (off) or non-0 (on).  The value returned is given
- * by the PNG_OPTION_ defines below.
- *
- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
- *           are detected at run time, however sometimes it may be impossible
- *           to do this in user mode, in which case it is necessary to discover
- *           the capabilities in an OS specific way.  Such capabilities are
- *           listed here when libpng has support for them and must be turned
- *           ON by the application if present.
- *
- * SOFTWARE: sometimes software optimizations actually result in performance
- *           decrease on some architectures or systems, or with some sets of
- *           PNG images.  'Software' options allow such optimizations to be
- *           selected at run time.
- */
-#ifdef PNG_SET_OPTION_SUPPORTED
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
-#endif
-#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
-#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
-#  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
-#endif
-#define PNG_IGNORE_ADLER32 8
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
-#endif
-#define PNG_OPTION_NEXT  12 /* Next option - numbers must be even */
-
-/* Return values: NOTE: there are four values and 'off' is *not* zero */
-#define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
-#define PNG_OPTION_INVALID 1 /* Option number out of range */
-#define PNG_OPTION_OFF     2
-#define PNG_OPTION_ON      3
-
-PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
-   int onoff));
-#endif /* SET_OPTION */
-
-/*******************************************************************************
- *  END OF HARDWARE AND SOFTWARE OPTIONS
- ******************************************************************************/
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
- * defs, and in scripts/symbols.def.
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(245);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
diff --git a/dependencies2013/win32/include/libpng16/pngconf.h b/dependencies2013/win32/include/libpng16/pngconf.h
deleted file mode 100644
index f64592ac..00000000
--- a/dependencies2013/win32/include/libpng16/pngconf.h
+++ /dev/null
@@ -1,622 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.6.30, June 28, 2017
- *
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
-
-/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C
- * compiler for correct compilation.  The following header files are required by
- * the standard.  If your compiler doesn't provide these header files, or they
- * do not match the standard, you will need to provide/improve them.
- */
-#include <limits.h>
-#include <stddef.h>
-
-/* Library header files.  These header files are all defined by ISOC90; libpng
- * expects conformant implementations, however, an ISOC90 conformant system need
- * not provide these header files if the functionality cannot be implemented.
- * In this case it will be necessary to disable the relevant parts of libpng in
- * the build of pnglibconf.h.
- *
- * Prior to 1.6.0 string.h was included here; the API changes in 1.6.0 to not
- * include this unnecessary header file.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-   /* Required for the definition of FILE: */
-#  include <stdio.h>
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   /* Required for the definition of jmp_buf and the declaration of longjmp: */
-#  include <setjmp.h>
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-   /* Required for struct tm: */
-#  include <time.h>
-#endif
-
-#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
-/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
- * PNG_NO_CONST; this is no longer supported except for data declarations which
- * apparently still cause problems in 2011 on some compilers.
- */
-#define PNG_CONST const /* backward compatibility only */
-
-/* This controls optimization of the reading of 16-bit and 32-bit values
- * from PNG files.  It can be set on a per-app-file basis - it
- * just changes whether a macro is used when the function is called.
- * The library builder sets the default; if read functions are not
- * built into the library the macro implementation is forced on.
- */
-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-#  define PNG_USE_READ_MACROS
-#endif
-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-#  if PNG_DEFAULT_READ_MACROS
-#    define PNG_USE_READ_MACROS
-#  endif
-#endif
-
-/* COMPILER SPECIFIC OPTIONS.
- *
- * These options are provided so that a variety of difficult compilers
- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE
- * below) but still have compiler specific implementations, others
- * may be changed on a per-file basis when compiling against libpng.
- */
-
-/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
- * against legacy (pre ISOC90) compilers that did not understand function
- * prototypes.  It is not required for modern C compilers.
- */
-#ifndef PNGARG
-#  define PNGARG(arglist) arglist
-#endif
-
-/* Function calling conventions.
- * =============================
- * Normally it is not necessary to specify to the compiler how to call
- * a function - it just does it - however on x86 systems derived from
- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems
- * and some others) there are multiple ways to call a function and the
- * default can be changed on the compiler command line.  For this reason
- * libpng specifies the calling convention of every exported function and
- * every function called via a user supplied function pointer.  This is
- * done in this file by defining the following macros:
- *
- * PNGAPI    Calling convention for exported functions.
- * PNGCBAPI  Calling convention for user provided (callback) functions.
- * PNGCAPI   Calling convention used by the ANSI-C library (required
- *           for longjmp callbacks and sometimes used internally to
- *           specify the calling convention for zlib).
- *
- * These macros should never be overridden.  If it is necessary to
- * change calling convention in a private build this can be done
- * by setting PNG_API_RULE (which defaults to 0) to one of the values
- * below to select the correct 'API' variants.
- *
- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.
- *                This is correct in every known environment.
- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and
- *                the 'C' calling convention (from PNGCAPI) for
- *                callbacks (PNGCBAPI).  This is no longer required
- *                in any known environment - if it has to be used
- *                please post an explanation of the problem to the
- *                libpng mailing list.
- *
- * These cases only differ if the operating system does not use the C
- * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
- * Cygwin running on those systems.
- *
- * Note that the value must be defined in pnglibconf.h so that what
- * the application uses to call the library matches the conventions
- * set when building the library.
- */
-
-/* Symbol export
- * =============
- * When building a shared library it is almost always necessary to tell
- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'
- * is used to mark the symbols.  On some systems these symbols can be
- * extracted at link time and need no special processing by the compiler,
- * on other systems the symbols are flagged by the compiler and just
- * the declaration requires a special tag applied (unfortunately) in a
- * compiler dependent way.  Some systems can do either.
- *
- * A small number of older systems also require a symbol from a DLL to
- * be flagged to the program that calls it.  This is a problem because
- * we do not know in the header file included by application code that
- * the symbol will come from a shared library, as opposed to a statically
- * linked one.  For this reason the application must tell us by setting
- * the magic flag PNG_USE_DLL to turn on the special processing before
- * it includes png.h.
- *
- * Four additional macros are used to make this happen:
- *
- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
- *            the build or imported if PNG_USE_DLL is set - compiler
- *            and system specific.
- *
- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to
- *                       'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
- *                make a symbol exported from the DLL.  Not used in the
- *                public header files; see pngpriv.h for how it is used
- *                in the libpng build.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- *                from a DLL - used to define PNG_IMPEXP when
- *                PNG_USE_DLL is set.
- */
-
-/* System specific discovery.
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
- * import processing is possible.  On Windows systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
-#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-    defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-  /* Windows system (DOS doesn't support DLLs).  Includes builds under Cygwin or
-   * MinGW on any architecture currently supported by Windows.  Also includes
-   * Watcom builds but these need special treatment because they are not
-   * compatible with GCC or Visual C because of different calling conventions.
-   */
-#  if PNG_API_RULE == 2
-   /* If this line results in an error, either because __watcall is not
-    * understood or because of a redefine just below you cannot use *this*
-    * build of the library with the compiler you are using.  *This* build was
-    * build using Watcom and applications must also be built using Watcom!
-    */
-#    define PNGCAPI __watcall
-#  endif
-
-#  if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
-#    define PNGCAPI __cdecl
-#    if PNG_API_RULE == 1
-   /* If this line results in an error __stdcall is not understood and
-    * PNG_API_RULE should not have been set to '1'.
-    */
-#      define PNGAPI __stdcall
-#    endif
-#  else
-   /* An older compiler, or one not detected (erroneously) above,
-    * if necessary override on the command line to get the correct
-    * variants for the compiler.
-    */
-#    ifndef PNGCAPI
-#      define PNGCAPI _cdecl
-#    endif
-#    if PNG_API_RULE == 1 && !defined(PNGAPI)
-#      define PNGAPI _stdcall
-#    endif
-#  endif /* compiler/api */
-
-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
-#  endif
-
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-   /* older Borland and MSC
-    * compilers used '__export' and required this to be after
-    * the type.
-    */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
-
-#else /* !Windows */
-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#    define PNGAPI _System
-#  else /* !Windows/x86 && !OS/2 */
-   /* Use the defaults, or define PNG*API on the command line (but
-    * this will have to be done for every compile!)
-    */
-#  endif /* other system, !OS/2 */
-#endif /* !Windows/x86 */
-
-/* Now do all the defaulting . */
-#ifndef PNGCAPI
-#  define PNGCAPI
-#endif
-#ifndef PNGCBAPI
-#  define PNGCBAPI PNGCAPI
-#endif
-#ifndef PNGAPI
-#  define PNGAPI PNGCAPI
-#endif
-
-/* PNG_IMPEXP may be set on the compilation system command line or (if not set)
- * then in an internal header file when building the library, otherwise (when
- * using the library) it is set here.
- */
-#ifndef PNG_IMPEXP
-#  if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-   /* This forces use of a DLL, disallowing static linking */
-#    define PNG_IMPEXP PNG_DLL_IMPORT
-#  endif
-
-#  ifndef PNG_IMPEXP
-#    define PNG_IMPEXP
-#  endif
-#endif
-
-/* In 1.5.2 the definition of PNG_FUNCTION has been changed to always treat
- * 'attributes' as a storage class - the attributes go at the start of the
- * function definition, and attributes are always appended regardless of the
- * compiler.  This considerably simplifies these macros but may cause problems
- * if any compilers both need function attributes and fail to handle them as
- * a storage class (this is unlikely.)
- */
-#ifndef PNG_FUNCTION
-#  define PNG_FUNCTION(type, name, args, attributes) attributes type name args
-#endif
-
-#ifndef PNG_EXPORT_TYPE
-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
-#endif
-
-   /* The ordinal value is only relevant when preprocessing png.h for symbol
-    * table entries, so we discard it here.  See the .dfn files in the
-    * scripts directory.
-    */
-
-#ifndef PNG_EXPORTA
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes) \
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
-      PNG_LINKAGE_API attributes)
-#endif
-
-/* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
- * so make something non-empty to satisfy the requirement:
- */
-#define PNG_EMPTY /*empty list*/
-
-#define PNG_EXPORT(ordinal, type, name, args) \
-   PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
-
-/* Use PNG_REMOVED to comment out a removed interface. */
-#ifndef PNG_REMOVED
-#  define PNG_REMOVED(ordinal, type, name, args, attributes)
-#endif
-
-#ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
-#endif
-
-/* Support for compiler specific function attributes.  These are used
- * so that where compiler support is available incorrect use of API
- * functions in png.h will generate compiler warnings.
- *
- * Added at libpng-1.2.41.
- */
-
-#ifndef PNG_NO_PEDANTIC_WARNINGS
-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  endif
-#endif
-
-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
-  /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available, incorrect use of API
-   * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.  Disabling these removes the warnings but may also produce
-   * less efficient code.
-   */
-#  if defined(__clang__) && defined(__has_attribute)
-   /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
-#    if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    if !defined(PNG_NORETURN) && __has_attribute(__noreturn__)
-#      define PNG_NORETURN __attribute__((__noreturn__))
-#    endif
-#    if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__)
-#      define PNG_ALLOCATED __attribute__((__malloc__))
-#    endif
-#    if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__)
-#      define PNG_DEPRECATED __attribute__((__deprecated__))
-#    endif
-#    if !defined(PNG_PRIVATE)
-#      ifdef __has_extension
-#        if __has_extension(attribute_unavailable_with_message)
-#          define PNG_PRIVATE __attribute__((__unavailable__(\
-             "This function is not exported by libpng.")))
-#        endif
-#      endif
-#    endif
-#    ifndef PNG_RESTRICT
-#      define PNG_RESTRICT __restrict
-#    endif
-
-#  elif defined(__GNUC__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    if __GNUC__ >= 3
-#      ifndef PNG_ALLOCATED
-#        define PNG_ALLOCATED  __attribute__((__malloc__))
-#      endif
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_PRIVATE
-#        if 0 /* Doesn't work so we use deprecated instead*/
-#          define PNG_PRIVATE \
-            __attribute__((warning("This function is not exported by libpng.")))
-#        else
-#          define PNG_PRIVATE \
-            __attribute__((__deprecated__))
-#        endif
-#      endif
-#      if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
-#        ifndef PNG_RESTRICT
-#          define PNG_RESTRICT __restrict
-#        endif
-#      endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */
-#    endif /* __GNUC__ >= 3 */
-
-#  elif defined(_MSC_VER)  && (_MSC_VER >= 1300)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /* not supported */
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
-#    endif
-#    ifndef PNG_ALLOCATED
-#      if (_MSC_VER >= 1400)
-#        define PNG_ALLOCATED __declspec(restrict)
-#      endif
-#    endif
-#    ifndef PNG_DEPRECATED
-#      define PNG_DEPRECATED __declspec(deprecated)
-#    endif
-#    ifndef PNG_PRIVATE
-#      define PNG_PRIVATE __declspec(deprecated)
-#    endif
-#    ifndef PNG_RESTRICT
-#      if (_MSC_VER >= 1400)
-#        define PNG_RESTRICT __restrict
-#      endif
-#    endif
-
-#  elif defined(__WATCOMC__)
-#    ifndef PNG_RESTRICT
-#      define PNG_RESTRICT __restrict
-#    endif
-#  endif
-#endif /* PNG_PEDANTIC_WARNINGS */
-
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED  /* Use of this function is deprecated */
-#endif
-#ifndef PNG_USE_RESULT
-#  define PNG_USE_RESULT  /* The result of this function must be checked */
-#endif
-#ifndef PNG_NORETURN
-#  define PNG_NORETURN    /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#endif
-#ifndef PNG_RESTRICT
-#  define PNG_RESTRICT    /* The C99 "restrict" feature */
-#endif
-
-#ifndef PNG_FP_EXPORT     /* A floating point API. */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args);
-#  else                   /* No floating point APIs */
-#     define PNG_FP_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args);
-#  else                   /* No fixed point APIs */
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* Some typedefs to get us started.  These should be safe on most of the common
- * platforms.
- *
- * png_uint_32 and png_int_32 may, currently, be larger than required to hold a
- * 32-bit value however this is not normally advisable.
- *
- * png_uint_16 and png_int_16 should always be two bytes in size - this is
- * verified at library build time.
- *
- * png_byte must always be one byte in size.
- *
- * The checks below use constants from limits.h, as defined by the ISOC90
- * standard.
- */
-#if CHAR_BIT == 8 && UCHAR_MAX == 255
-   typedef unsigned char png_byte;
-#else
-#  error "libpng requires 8-bit bytes"
-#endif
-
-#if INT_MIN == -32768 && INT_MAX == 32767
-   typedef int png_int_16;
-#elif SHRT_MIN == -32768 && SHRT_MAX == 32767
-   typedef short png_int_16;
-#else
-#  error "libpng requires a signed 16-bit type"
-#endif
-
-#if UINT_MAX == 65535
-   typedef unsigned int png_uint_16;
-#elif USHRT_MAX == 65535
-   typedef unsigned short png_uint_16;
-#else
-#  error "libpng requires an unsigned 16-bit type"
-#endif
-
-#if INT_MIN < -2147483646 && INT_MAX > 2147483646
-   typedef int png_int_32;
-#elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
-   typedef long int png_int_32;
-#else
-#  error "libpng requires a signed 32-bit (or more) type"
-#endif
-
-#if UINT_MAX > 4294967294U
-   typedef unsigned int png_uint_32;
-#elif ULONG_MAX > 4294967294U
-   typedef unsigned long int png_uint_32;
-#else
-#  error "libpng requires an unsigned 32-bit (or more) type"
-#endif
-
-/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
- * requires an ISOC90 compiler and relies on consistent behavior of sizeof.
- */
-typedef size_t png_size_t;
-typedef ptrdiff_t png_ptrdiff_t;
-
-/* libpng needs to know the maximum value of 'size_t' and this controls the
- * definition of png_alloc_size_t, below.  This maximum value of size_t limits
- * but does not control the maximum allocations the library makes - there is
- * direct application control of this through png_set_user_limits().
- */
-#ifndef PNG_SMALL_SIZE_T
-   /* Compiler specific tests for systems where size_t is known to be less than
-    * 32 bits (some of these systems may no longer work because of the lack of
-    * 'far' support; see above.)
-    */
-#  if (defined(__TURBOC__) && !defined(__FLAT__)) ||\
-   (defined(_MSC_VER) && defined(MAXSEG_64K))
-#     define PNG_SMALL_SIZE_T
-#  endif
-#endif
-
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
- * smaller than png_uint_32.  Casts from png_size_t or png_uint_32 to
- * png_alloc_size_t are not necessary; in fact, it is recommended not to use
- * them at all so that the compiler can complain when something turns out to be
- * problematic.
- *
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect to
- * encounter practical situations that require such conversions.
- *
- * PNG_SMALL_SIZE_T must be defined if the maximum value of size_t is less than
- * 4294967295 - i.e. less than the maximum value of png_uint_32.
- */
-#ifdef PNG_SMALL_SIZE_T
-   typedef png_uint_32 png_alloc_size_t;
-#else
-   typedef png_size_t png_alloc_size_t;
-#endif
-
-/* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
- * implementations of Intel CPU specific support of user-mode segmented address
- * spaces, where 16-bit pointers address more than 65536 bytes of memory using
- * separate 'segment' registers.  The implementation requires two different
- * types of pointer (only one of which includes the segment value.)
- *
- * If required this support is available in version 1.2 of libpng and may be
- * available in versions through 1.5, although the correctness of the code has
- * not been verified recently.
- */
-
-/* Typedef for floating-point numbers that are converted to fixed-point with a
- * multiple of 100,000, e.g., gamma
- */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void                  * png_voidp;
-typedef const void            * png_const_voidp;
-typedef png_byte              * png_bytep;
-typedef const png_byte        * png_const_bytep;
-typedef png_uint_32           * png_uint_32p;
-typedef const png_uint_32     * png_const_uint_32p;
-typedef png_int_32            * png_int_32p;
-typedef const png_int_32      * png_const_int_32p;
-typedef png_uint_16           * png_uint_16p;
-typedef const png_uint_16     * png_const_uint_16p;
-typedef png_int_16            * png_int_16p;
-typedef const png_int_16      * png_const_int_16p;
-typedef char                  * png_charp;
-typedef const char            * png_const_charp;
-typedef png_fixed_point       * png_fixed_point_p;
-typedef const png_fixed_point * png_const_fixed_point_p;
-typedef png_size_t            * png_size_tp;
-typedef const png_size_t      * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double       * png_doublep;
-typedef const double * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        * * png_bytepp;
-typedef png_uint_32     * * png_uint_32pp;
-typedef png_int_32      * * png_int_32pp;
-typedef png_uint_16     * * png_uint_16pp;
-typedef png_int_16      * * png_int_16pp;
-typedef const char      * * png_const_charpp;
-typedef char            * * png_charpp;
-typedef png_fixed_point * * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          * * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            * * * png_charppp;
-
-#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
-#endif /* PNGCONF_H */
diff --git a/dependencies2013/win32/include/libpng16/pnglibconf.h b/dependencies2013/win32/include/libpng16/pnglibconf.h
deleted file mode 100644
index dc8e14ff..00000000
--- a/dependencies2013/win32/include/libpng16/pnglibconf.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* pnglibconf.h - library build configuration */
-
-/* libpng version 1.6.30, June 28, 2017 */
-
-/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglibconf.dfa */
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_COLORSPACE_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_FORMAT_AFIRST_SUPPORTED
-#define PNG_FORMAT_BGR_SUPPORTED
-#define PNG_GAMMA_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
-/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_OPTION_SUPPORTED
-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_READ_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-#define PNG_INFLATE_BUF_SIZE 1024
-#define PNG_LINKAGE_API extern
-#define PNG_LINKAGE_CALLBACK extern
-#define PNG_LINKAGE_DATA extern
-#define PNG_LINKAGE_FUNCTION extern
-#define PNG_MAX_GAMMA_8 11
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-#define PNG_USER_CHUNK_CACHE_MAX 1000
-#define PNG_USER_CHUNK_MALLOC_MAX 8000000
-#define PNG_USER_HEIGHT_MAX 1000000
-#define PNG_USER_WIDTH_MAX 1000000
-#define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x12b0
-#define PNG_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-#define PNG_Z_DEFAULT_STRATEGY 1
-#define PNG_sCAL_PRECISION 5
-#define PNG_sRGB_PROFILE_CHECKS 2
-/* end of settings */
-#endif /* PNGLCONF_H */
diff --git a/dependencies2013/win32/include/libswresample/swresample.h b/dependencies2013/win32/include/libswresample/swresample.h
deleted file mode 100644
index c7b84fbc..00000000
--- a/dependencies2013/win32/include/libswresample/swresample.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * Copyright (C) 2011-2013 Michael Niedermayer (michaelni@gmx.at)
- *
- * This file is part of libswresample
- *
- * libswresample 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.
- *
- * libswresample 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 libswresample; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWRESAMPLE_SWRESAMPLE_H
-#define SWRESAMPLE_SWRESAMPLE_H
-
-/**
- * @file
- * @ingroup lswr
- * libswresample public header
- */
-
-/**
- * @defgroup lswr libswresample
- * @{
- *
- * Audio resampling, sample format conversion and mixing library.
- *
- * Interaction with lswr is done through SwrContext, which is
- * allocated with swr_alloc() or swr_alloc_set_opts(). It is opaque, so all parameters
- * must be set with the @ref avoptions API.
- *
- * The first thing you will need to do in order to use lswr is to allocate
- * SwrContext. This can be done with swr_alloc() or swr_alloc_set_opts(). If you
- * are using the former, you must set options through the @ref avoptions API.
- * The latter function provides the same feature, but it allows you to set some
- * common options in the same statement.
- *
- * For example the following code will setup conversion from planar float sample
- * format to interleaved signed 16-bit integer, downsampling from 48kHz to
- * 44.1kHz and downmixing from 5.1 channels to stereo (using the default mixing
- * matrix). This is using the swr_alloc() function.
- * @code
- * SwrContext *swr = swr_alloc();
- * av_opt_set_channel_layout(swr, "in_channel_layout",  AV_CH_LAYOUT_5POINT1, 0);
- * av_opt_set_channel_layout(swr, "out_channel_layout", AV_CH_LAYOUT_STEREO,  0);
- * av_opt_set_int(swr, "in_sample_rate",     48000,                0);
- * av_opt_set_int(swr, "out_sample_rate",    44100,                0);
- * av_opt_set_sample_fmt(swr, "in_sample_fmt",  AV_SAMPLE_FMT_FLTP, 0);
- * av_opt_set_sample_fmt(swr, "out_sample_fmt", AV_SAMPLE_FMT_S16,  0);
- * @endcode
- *
- * The same job can be done using swr_alloc_set_opts() as well:
- * @code
- * SwrContext *swr = swr_alloc_set_opts(NULL,  // we're allocating a new context
- *                       AV_CH_LAYOUT_STEREO,  // out_ch_layout
- *                       AV_SAMPLE_FMT_S16,    // out_sample_fmt
- *                       44100,                // out_sample_rate
- *                       AV_CH_LAYOUT_5POINT1, // in_ch_layout
- *                       AV_SAMPLE_FMT_FLTP,   // in_sample_fmt
- *                       48000,                // in_sample_rate
- *                       0,                    // log_offset
- *                       NULL);                // log_ctx
- * @endcode
- *
- * Once all values have been set, it must be initialized with swr_init(). If
- * you need to change the conversion parameters, you can change the parameters
- * using @ref AVOptions, as described above in the first example; or by using
- * swr_alloc_set_opts(), but with the first argument the allocated context.
- * You must then call swr_init() again.
- *
- * The conversion itself is done by repeatedly calling swr_convert().
- * Note that the samples may get buffered in swr if you provide insufficient
- * output space or if sample rate conversion is done, which requires "future"
- * samples. Samples that do not require future input can be retrieved at any
- * time by using swr_convert() (in_count can be set to 0).
- * At the end of conversion the resampling buffer can be flushed by calling
- * swr_convert() with NULL in and 0 in_count.
- *
- * The samples used in the conversion process can be managed with the libavutil
- * @ref lavu_sampmanip "samples manipulation" API, including av_samples_alloc()
- * function used in the following example.
- *
- * The delay between input and output, can at any time be found by using
- * swr_get_delay().
- *
- * The following code demonstrates the conversion loop assuming the parameters
- * from above and caller-defined functions get_input() and handle_output():
- * @code
- * uint8_t **input;
- * int in_samples;
- *
- * while (get_input(&input, &in_samples)) {
- *     uint8_t *output;
- *     int out_samples = av_rescale_rnd(swr_get_delay(swr, 48000) +
- *                                      in_samples, 44100, 48000, AV_ROUND_UP);
- *     av_samples_alloc(&output, NULL, 2, out_samples,
- *                      AV_SAMPLE_FMT_S16, 0);
- *     out_samples = swr_convert(swr, &output, out_samples,
- *                                      input, in_samples);
- *     handle_output(output, out_samples);
- *     av_freep(&output);
- * }
- * @endcode
- *
- * When the conversion is finished, the conversion
- * context and everything associated with it must be freed with swr_free().
- * A swr_close() function is also available, but it exists mainly for
- * compatibility with libavresample, and is not required to be called.
- *
- * There will be no memory leak if the data is not completely flushed before
- * swr_free().
- */
-
-#include <stdint.h>
-#include "libavutil/channel_layout.h"
-#include "libavutil/frame.h"
-#include "libavutil/samplefmt.h"
-
-#include "libswresample/version.h"
-
-/**
- * @name Option constants
- * These constants are used for the @ref avoptions interface for lswr.
- * @{
- *
- */
-
-#define SWR_FLAG_RESAMPLE 1 ///< Force resampling even if equal sample rate
-//TODO use int resample ?
-//long term TODO can we enable this dynamically?
-
-/** Dithering algorithms */
-enum SwrDitherType {
-    SWR_DITHER_NONE = 0,
-    SWR_DITHER_RECTANGULAR,
-    SWR_DITHER_TRIANGULAR,
-    SWR_DITHER_TRIANGULAR_HIGHPASS,
-
-    SWR_DITHER_NS = 64,         ///< not part of API/ABI
-    SWR_DITHER_NS_LIPSHITZ,
-    SWR_DITHER_NS_F_WEIGHTED,
-    SWR_DITHER_NS_MODIFIED_E_WEIGHTED,
-    SWR_DITHER_NS_IMPROVED_E_WEIGHTED,
-    SWR_DITHER_NS_SHIBATA,
-    SWR_DITHER_NS_LOW_SHIBATA,
-    SWR_DITHER_NS_HIGH_SHIBATA,
-    SWR_DITHER_NB,              ///< not part of API/ABI
-};
-
-/** Resampling Engines */
-enum SwrEngine {
-    SWR_ENGINE_SWR,             /**< SW Resampler */
-    SWR_ENGINE_SOXR,            /**< SoX Resampler */
-    SWR_ENGINE_NB,              ///< not part of API/ABI
-};
-
-/** Resampling Filter Types */
-enum SwrFilterType {
-    SWR_FILTER_TYPE_CUBIC,              /**< Cubic */
-    SWR_FILTER_TYPE_BLACKMAN_NUTTALL,   /**< Blackman Nuttall windowed sinc */
-    SWR_FILTER_TYPE_KAISER,             /**< Kaiser windowed sinc */
-};
-
-/**
- * @}
- */
-
-/**
- * The libswresample context. Unlike libavcodec and libavformat, this structure
- * is opaque. This means that if you would like to set options, you must use
- * the @ref avoptions API and cannot directly set values to members of the
- * structure.
- */
-typedef struct SwrContext SwrContext;
-
-/**
- * Get the AVClass for SwrContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- * @return the AVClass of SwrContext
- */
-const AVClass *swr_get_class(void);
-
-/**
- * @name SwrContext constructor functions
- * @{
- */
-
-/**
- * Allocate SwrContext.
- *
- * If you use this function you will need to set the parameters (manually or
- * with swr_alloc_set_opts()) before calling swr_init().
- *
- * @see swr_alloc_set_opts(), swr_init(), swr_free()
- * @return NULL on error, allocated context otherwise
- */
-struct SwrContext *swr_alloc(void);
-
-/**
- * Initialize context after user parameters have been set.
- * @note The context must be configured using the AVOption API.
- *
- * @see av_opt_set_int()
- * @see av_opt_set_dict()
- *
- * @param[in,out]   s Swr context to initialize
- * @return AVERROR error code in case of failure.
- */
-int swr_init(struct SwrContext *s);
-
-/**
- * Check whether an swr context has been initialized or not.
- *
- * @param[in]       s Swr context to check
- * @see swr_init()
- * @return positive if it has been initialized, 0 if not initialized
- */
-int swr_is_initialized(struct SwrContext *s);
-
-/**
- * Allocate SwrContext if needed and set/reset common parameters.
- *
- * This function does not require s to be allocated with swr_alloc(). On the
- * other hand, swr_alloc() can use swr_alloc_set_opts() to set the parameters
- * on the allocated context.
- *
- * @param s               existing Swr context if available, or NULL if not
- * @param out_ch_layout   output channel layout (AV_CH_LAYOUT_*)
- * @param out_sample_fmt  output sample format (AV_SAMPLE_FMT_*).
- * @param out_sample_rate output sample rate (frequency in Hz)
- * @param in_ch_layout    input channel layout (AV_CH_LAYOUT_*)
- * @param in_sample_fmt   input sample format (AV_SAMPLE_FMT_*).
- * @param in_sample_rate  input sample rate (frequency in Hz)
- * @param log_offset      logging level offset
- * @param log_ctx         parent logging context, can be NULL
- *
- * @see swr_init(), swr_free()
- * @return NULL on error, allocated context otherwise
- */
-struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
-                                      int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
-                                      int64_t  in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
-                                      int log_offset, void *log_ctx);
-
-/**
- * @}
- *
- * @name SwrContext destructor functions
- * @{
- */
-
-/**
- * Free the given SwrContext and set the pointer to NULL.
- *
- * @param[in] s a pointer to a pointer to Swr context
- */
-void swr_free(struct SwrContext **s);
-
-/**
- * Closes the context so that swr_is_initialized() returns 0.
- *
- * The context can be brought back to life by running swr_init(),
- * swr_init() can also be used without swr_close().
- * This function is mainly provided for simplifying the usecase
- * where one tries to support libavresample and libswresample.
- *
- * @param[in,out] s Swr context to be closed
- */
-void swr_close(struct SwrContext *s);
-
-/**
- * @}
- *
- * @name Core conversion functions
- * @{
- */
-
-/** Convert audio.
- *
- * in and in_count can be set to 0 to flush the last few samples out at the
- * end.
- *
- * If more input is provided than output space, then the input will be buffered.
- * You can avoid this buffering by using swr_get_out_samples() to retrieve an
- * upper bound on the required number of output samples for the given number of
- * input samples. Conversion will run directly without copying whenever possible.
- *
- * @param s         allocated Swr context, with parameters set
- * @param out       output buffers, only the first one need be set in case of packed audio
- * @param out_count amount of space available for output in samples per channel
- * @param in        input buffers, only the first one need to be set in case of packed audio
- * @param in_count  number of input samples available in one channel
- *
- * @return number of samples output per channel, negative value on error
- */
-int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
-                                const uint8_t **in , int in_count);
-
-/**
- * Convert the next timestamp from input to output
- * timestamps are in 1/(in_sample_rate * out_sample_rate) units.
- *
- * @note There are 2 slightly differently behaving modes.
- *       @li When automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
- *              in this case timestamps will be passed through with delays compensated
- *       @li When automatic timestamp compensation is used, (min_compensation < FLT_MAX)
- *              in this case the output timestamps will match output sample numbers.
- *              See ffmpeg-resampler(1) for the two modes of compensation.
- *
- * @param s[in]     initialized Swr context
- * @param pts[in]   timestamp for the next input sample, INT64_MIN if unknown
- * @see swr_set_compensation(), swr_drop_output(), and swr_inject_silence() are
- *      function used internally for timestamp compensation.
- * @return the output timestamp for the next output sample
- */
-int64_t swr_next_pts(struct SwrContext *s, int64_t pts);
-
-/**
- * @}
- *
- * @name Low-level option setting functions
- * These functons provide a means to set low-level options that is not possible
- * with the AVOption API.
- * @{
- */
-
-/**
- * Activate resampling compensation ("soft" compensation). This function is
- * internally called when needed in swr_next_pts().
- *
- * @param[in,out] s             allocated Swr context. If it is not initialized,
- *                              or SWR_FLAG_RESAMPLE is not set, swr_init() is
- *                              called with the flag set.
- * @param[in]     sample_delta  delta in PTS per sample
- * @param[in]     compensation_distance number of samples to compensate for
- * @return    >= 0 on success, AVERROR error codes if:
- *            @li @c s is NULL,
- *            @li @c compensation_distance is less than 0,
- *            @li @c compensation_distance is 0 but sample_delta is not,
- *            @li compensation unsupported by resampler, or
- *            @li swr_init() fails when called.
- */
-int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensation_distance);
-
-/**
- * Set a customized input channel mapping.
- *
- * @param[in,out] s           allocated Swr context, not yet initialized
- * @param[in]     channel_map customized input channel mapping (array of channel
- *                            indexes, -1 for a muted channel)
- * @return >= 0 on success, or AVERROR error code in case of failure.
- */
-int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map);
-
-/**
- * Generate a channel mixing matrix.
- *
- * This function is the one used internally by libswresample for building the
- * default mixing matrix. It is made public just as a utility function for
- * building custom matrices.
- *
- * @param in_layout           input channel layout
- * @param out_layout          output channel layout
- * @param center_mix_level    mix level for the center channel
- * @param surround_mix_level  mix level for the surround channel(s)
- * @param lfe_mix_level       mix level for the low-frequency effects channel
- * @param rematrix_maxval     if 1.0, coefficients will be normalized to prevent
- *                            overflow. if INT_MAX, coefficients will not be
- *                            normalized.
- * @param[out] matrix         mixing coefficients; matrix[i + stride * o] is
- *                            the weight of input channel i in output channel o.
- * @param stride              distance between adjacent input channels in the
- *                            matrix array
- * @param matrix_encoding     matrixed stereo downmix mode (e.g. dplii)
- * @param log_ctx             parent logging context, can be NULL
- * @return                    0 on success, negative AVERROR code on failure
- */
-int swr_build_matrix(uint64_t in_layout, uint64_t out_layout,
-                     double center_mix_level, double surround_mix_level,
-                     double lfe_mix_level, double rematrix_maxval,
-                     double rematrix_volume, double *matrix,
-                     int stride, enum AVMatrixEncoding matrix_encoding,
-                     void *log_ctx);
-
-/**
- * Set a customized remix matrix.
- *
- * @param s       allocated Swr context, not yet initialized
- * @param matrix  remix coefficients; matrix[i + stride * o] is
- *                the weight of input channel i in output channel o
- * @param stride  offset between lines of the matrix
- * @return  >= 0 on success, or AVERROR error code in case of failure.
- */
-int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride);
-
-/**
- * @}
- *
- * @name Sample handling functions
- * @{
- */
-
-/**
- * Drops the specified number of output samples.
- *
- * This function, along with swr_inject_silence(), is called by swr_next_pts()
- * if needed for "hard" compensation.
- *
- * @param s     allocated Swr context
- * @param count number of samples to be dropped
- *
- * @return >= 0 on success, or a negative AVERROR code on failure
- */
-int swr_drop_output(struct SwrContext *s, int count);
-
-/**
- * Injects the specified number of silence samples.
- *
- * This function, along with swr_drop_output(), is called by swr_next_pts()
- * if needed for "hard" compensation.
- *
- * @param s     allocated Swr context
- * @param count number of samples to be dropped
- *
- * @return >= 0 on success, or a negative AVERROR code on failure
- */
-int swr_inject_silence(struct SwrContext *s, int count);
-
-/**
- * Gets the delay the next input sample will experience relative to the next output sample.
- *
- * Swresample can buffer data if more input has been provided than available
- * output space, also converting between sample rates needs a delay.
- * This function returns the sum of all such delays.
- * The exact delay is not necessarily an integer value in either input or
- * output sample rate. Especially when downsampling by a large value, the
- * output sample rate may be a poor choice to represent the delay, similarly
- * for upsampling and the input sample rate.
- *
- * @param s     swr context
- * @param base  timebase in which the returned delay will be:
- *              @li if it's set to 1 the returned delay is in seconds
- *              @li if it's set to 1000 the returned delay is in milliseconds
- *              @li if it's set to the input sample rate then the returned
- *                  delay is in input samples
- *              @li if it's set to the output sample rate then the returned
- *                  delay is in output samples
- *              @li if it's the least common multiple of in_sample_rate and
- *                  out_sample_rate then an exact rounding-free delay will be
- *                  returned
- * @returns     the delay in 1 / @c base units.
- */
-int64_t swr_get_delay(struct SwrContext *s, int64_t base);
-
-/**
- * Find an upper bound on the number of samples that the next swr_convert
- * call will output, if called with in_samples of input samples. This
- * depends on the internal state, and anything changing the internal state
- * (like further swr_convert() calls) will may change the number of samples
- * swr_get_out_samples() returns for the same number of input samples.
- *
- * @param in_samples    number of input samples.
- * @note any call to swr_inject_silence(), swr_convert(), swr_next_pts()
- *       or swr_set_compensation() invalidates this limit
- * @note it is recommended to pass the correct available buffer size
- *       to all functions like swr_convert() even if swr_get_out_samples()
- *       indicates that less would be used.
- * @returns an upper bound on the number of samples that the next swr_convert
- *          will output or a negative value to indicate an error
- */
-int swr_get_out_samples(struct SwrContext *s, int in_samples);
-
-/**
- * @}
- *
- * @name Configuration accessors
- * @{
- */
-
-/**
- * Return the @ref LIBSWRESAMPLE_VERSION_INT constant.
- *
- * This is useful to check if the build-time libswresample has the same version
- * as the run-time one.
- *
- * @returns     the unsigned int-typed version
- */
-unsigned swresample_version(void);
-
-/**
- * Return the swr build-time configuration.
- *
- * @returns     the build-time @c ./configure flags
- */
-const char *swresample_configuration(void);
-
-/**
- * Return the swr license.
- *
- * @returns     the license of libswresample, determined at build-time
- */
-const char *swresample_license(void);
-
-/**
- * @}
- *
- * @name AVFrame based API
- * @{
- */
-
-/**
- * Convert the samples in the input AVFrame and write them to the output AVFrame.
- *
- * Input and output AVFrames must have channel_layout, sample_rate and format set.
- *
- * If the output AVFrame does not have the data pointers allocated the nb_samples
- * field will be set using av_frame_get_buffer()
- * is called to allocate the frame.
- *
- * The output AVFrame can be NULL or have fewer allocated samples than required.
- * In this case, any remaining samples not written to the output will be added
- * to an internal FIFO buffer, to be returned at the next call to this function
- * or to swr_convert().
- *
- * If converting sample rate, there may be data remaining in the internal
- * resampling delay buffer. swr_get_delay() tells the number of
- * remaining samples. To get this data as output, call this function or
- * swr_convert() with NULL input.
- *
- * If the SwrContext configuration does not match the output and
- * input AVFrame settings the conversion does not take place and depending on
- * which AVFrame is not matching AVERROR_OUTPUT_CHANGED, AVERROR_INPUT_CHANGED
- * or the result of a bitwise-OR of them is returned.
- *
- * @see swr_delay()
- * @see swr_convert()
- * @see swr_get_delay()
- *
- * @param swr             audio resample context
- * @param output          output AVFrame
- * @param input           input AVFrame
- * @return                0 on success, AVERROR on failure or nonmatching
- *                        configuration.
- */
-int swr_convert_frame(SwrContext *swr,
-                      AVFrame *output, const AVFrame *input);
-
-/**
- * Configure or reconfigure the SwrContext using the information
- * provided by the AVFrames.
- *
- * The original resampling context is reset even on failure.
- * The function calls swr_close() internally if the context is open.
- *
- * @see swr_close();
- *
- * @param swr             audio resample context
- * @param output          output AVFrame
- * @param input           input AVFrame
- * @return                0 on success, AVERROR on failure.
- */
-int swr_config_frame(SwrContext *swr, const AVFrame *out, const AVFrame *in);
-
-/**
- * @}
- * @}
- */
-
-#endif /* SWRESAMPLE_SWRESAMPLE_H */
diff --git a/dependencies2013/win32/include/libswresample/version.h b/dependencies2013/win32/include/libswresample/version.h
deleted file mode 100644
index 46424ae2..00000000
--- a/dependencies2013/win32/include/libswresample/version.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of libswresample
- *
- * libswresample 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.
- *
- * libswresample 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 libswresample; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWRESAMPLE_VERSION_H
-#define SWRESAMPLE_VERSION_H
-
-/**
- * @file
- * Libswresample version macros
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBSWRESAMPLE_VERSION_MAJOR   2
-#define LIBSWRESAMPLE_VERSION_MINOR  10
-#define LIBSWRESAMPLE_VERSION_MICRO 100
-
-#define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
-                                                  LIBSWRESAMPLE_VERSION_MINOR, \
-                                                  LIBSWRESAMPLE_VERSION_MICRO)
-#define LIBSWRESAMPLE_VERSION      AV_VERSION(LIBSWRESAMPLE_VERSION_MAJOR, \
-                                              LIBSWRESAMPLE_VERSION_MINOR, \
-                                              LIBSWRESAMPLE_VERSION_MICRO)
-#define LIBSWRESAMPLE_BUILD        LIBSWRESAMPLE_VERSION_INT
-
-#define LIBSWRESAMPLE_IDENT        "SwR" AV_STRINGIFY(LIBSWRESAMPLE_VERSION)
-
-#endif /* SWRESAMPLE_VERSION_H */
diff --git a/dependencies2013/win32/include/libswscale/swscale.h b/dependencies2013/win32/include/libswscale/swscale.h
deleted file mode 100644
index 7713f51e..00000000
--- a/dependencies2013/win32/include/libswscale/swscale.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (C) 2001-2011 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWSCALE_SWSCALE_H
-#define SWSCALE_SWSCALE_H
-
-/**
- * @file
- * @ingroup libsws
- * external API header
- */
-
-#include <stdint.h>
-
-#include "libavutil/avutil.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "version.h"
-
-/**
- * @defgroup libsws libswscale
- * Color conversion and scaling library.
- *
- * @{
- *
- * Return the LIBSWSCALE_VERSION_INT constant.
- */
-unsigned swscale_version(void);
-
-/**
- * Return the libswscale build-time configuration.
- */
-const char *swscale_configuration(void);
-
-/**
- * Return the libswscale license.
- */
-const char *swscale_license(void);
-
-/* values for the flags, the stuff on the command line is different */
-#define SWS_FAST_BILINEAR     1
-#define SWS_BILINEAR          2
-#define SWS_BICUBIC           4
-#define SWS_X                 8
-#define SWS_POINT          0x10
-#define SWS_AREA           0x20
-#define SWS_BICUBLIN       0x40
-#define SWS_GAUSS          0x80
-#define SWS_SINC          0x100
-#define SWS_LANCZOS       0x200
-#define SWS_SPLINE        0x400
-
-#define SWS_SRC_V_CHR_DROP_MASK     0x30000
-#define SWS_SRC_V_CHR_DROP_SHIFT    16
-
-#define SWS_PARAM_DEFAULT           123456
-
-#define SWS_PRINT_INFO              0x1000
-
-//the following 3 flags are not completely implemented
-//internal chrominance subsampling info
-#define SWS_FULL_CHR_H_INT    0x2000
-//input subsampling info
-#define SWS_FULL_CHR_H_INP    0x4000
-#define SWS_DIRECT_BGR        0x8000
-#define SWS_ACCURATE_RND      0x40000
-#define SWS_BITEXACT          0x80000
-#define SWS_ERROR_DIFFUSION  0x800000
-
-#define SWS_MAX_REDUCE_CUTOFF 0.002
-
-#define SWS_CS_ITU709         1
-#define SWS_CS_FCC            4
-#define SWS_CS_ITU601         5
-#define SWS_CS_ITU624         5
-#define SWS_CS_SMPTE170M      5
-#define SWS_CS_SMPTE240M      7
-#define SWS_CS_DEFAULT        5
-#define SWS_CS_BT2020         9
-
-/**
- * Return a pointer to yuv<->rgb coefficients for the given colorspace
- * suitable for sws_setColorspaceDetails().
- *
- * @param colorspace One of the SWS_CS_* macros. If invalid,
- * SWS_CS_DEFAULT is used.
- */
-const int *sws_getCoefficients(int colorspace);
-
-// when used for filters they must have an odd number of elements
-// coeffs cannot be shared between vectors
-typedef struct SwsVector {
-    double *coeff;              ///< pointer to the list of coefficients
-    int length;                 ///< number of coefficients in the vector
-} SwsVector;
-
-// vectors can be shared
-typedef struct SwsFilter {
-    SwsVector *lumH;
-    SwsVector *lumV;
-    SwsVector *chrH;
-    SwsVector *chrV;
-} SwsFilter;
-
-struct SwsContext;
-
-/**
- * Return a positive value if pix_fmt is a supported input format, 0
- * otherwise.
- */
-int sws_isSupportedInput(enum AVPixelFormat pix_fmt);
-
-/**
- * Return a positive value if pix_fmt is a supported output format, 0
- * otherwise.
- */
-int sws_isSupportedOutput(enum AVPixelFormat pix_fmt);
-
-/**
- * @param[in]  pix_fmt the pixel format
- * @return a positive value if an endianness conversion for pix_fmt is
- * supported, 0 otherwise.
- */
-int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt);
-
-/**
- * Allocate an empty SwsContext. This must be filled and passed to
- * sws_init_context(). For filling see AVOptions, options.c and
- * sws_setColorspaceDetails().
- */
-struct SwsContext *sws_alloc_context(void);
-
-/**
- * Initialize the swscaler context sws_context.
- *
- * @return zero or positive value on success, a negative value on
- * error
- */
-av_warn_unused_result
-int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFilter *dstFilter);
-
-/**
- * Free the swscaler context swsContext.
- * If swsContext is NULL, then does nothing.
- */
-void sws_freeContext(struct SwsContext *swsContext);
-
-/**
- * Allocate and return an SwsContext. You need it to perform
- * scaling/conversion operations using sws_scale().
- *
- * @param srcW the width of the source image
- * @param srcH the height of the source image
- * @param srcFormat the source image format
- * @param dstW the width of the destination image
- * @param dstH the height of the destination image
- * @param dstFormat the destination image format
- * @param flags specify which algorithm and options to use for rescaling
- * @param param extra parameters to tune the used scaler
- *              For SWS_BICUBIC param[0] and [1] tune the shape of the basis
- *              function, param[0] tunes f(1) and param[1] f´(1)
- *              For SWS_GAUSS param[0] tunes the exponent and thus cutoff
- *              frequency
- *              For SWS_LANCZOS param[0] tunes the width of the window function
- * @return a pointer to an allocated context, or NULL in case of error
- * @note this function is to be removed after a saner alternative is
- *       written
- */
-struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
-                                  int dstW, int dstH, enum AVPixelFormat dstFormat,
-                                  int flags, SwsFilter *srcFilter,
-                                  SwsFilter *dstFilter, const double *param);
-
-/**
- * Scale the image slice in srcSlice and put the resulting scaled
- * slice in the image in dst. A slice is a sequence of consecutive
- * rows in an image.
- *
- * Slices have to be provided in sequential order, either in
- * top-bottom or bottom-top order. If slices are provided in
- * non-sequential order the behavior of the function is undefined.
- *
- * @param c         the scaling context previously created with
- *                  sws_getContext()
- * @param srcSlice  the array containing the pointers to the planes of
- *                  the source slice
- * @param srcStride the array containing the strides for each plane of
- *                  the source image
- * @param srcSliceY the position in the source image of the slice to
- *                  process, that is the number (counted starting from
- *                  zero) in the image of the first row of the slice
- * @param srcSliceH the height of the source slice, that is the number
- *                  of rows in the slice
- * @param dst       the array containing the pointers to the planes of
- *                  the destination image
- * @param dstStride the array containing the strides for each plane of
- *                  the destination image
- * @return          the height of the output slice
- */
-int sws_scale(struct SwsContext *c, const uint8_t *const srcSlice[],
-              const int srcStride[], int srcSliceY, int srcSliceH,
-              uint8_t *const dst[], const int dstStride[]);
-
-/**
- * @param dstRange flag indicating the while-black range of the output (1=jpeg / 0=mpeg)
- * @param srcRange flag indicating the while-black range of the input (1=jpeg / 0=mpeg)
- * @param table the yuv2rgb coefficients describing the output yuv space, normally ff_yuv2rgb_coeffs[x]
- * @param inv_table the yuv2rgb coefficients describing the input yuv space, normally ff_yuv2rgb_coeffs[x]
- * @param brightness 16.16 fixed point brightness correction
- * @param contrast 16.16 fixed point contrast correction
- * @param saturation 16.16 fixed point saturation correction
- * @return -1 if not supported
- */
-int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
-                             int srcRange, const int table[4], int dstRange,
-                             int brightness, int contrast, int saturation);
-
-/**
- * @return -1 if not supported
- */
-int sws_getColorspaceDetails(struct SwsContext *c, int **inv_table,
-                             int *srcRange, int **table, int *dstRange,
-                             int *brightness, int *contrast, int *saturation);
-
-/**
- * Allocate and return an uninitialized vector with length coefficients.
- */
-SwsVector *sws_allocVec(int length);
-
-/**
- * Return a normalized Gaussian curve used to filter stuff
- * quality = 3 is high quality, lower is lower quality.
- */
-SwsVector *sws_getGaussianVec(double variance, double quality);
-
-/**
- * Scale all the coefficients of a by the scalar value.
- */
-void sws_scaleVec(SwsVector *a, double scalar);
-
-/**
- * Scale all the coefficients of a so that their sum equals height.
- */
-void sws_normalizeVec(SwsVector *a, double height);
-
-#if FF_API_SWS_VECTOR
-attribute_deprecated SwsVector *sws_getConstVec(double c, int length);
-attribute_deprecated SwsVector *sws_getIdentityVec(void);
-attribute_deprecated void sws_convVec(SwsVector *a, SwsVector *b);
-attribute_deprecated void sws_addVec(SwsVector *a, SwsVector *b);
-attribute_deprecated void sws_subVec(SwsVector *a, SwsVector *b);
-attribute_deprecated void sws_shiftVec(SwsVector *a, int shift);
-attribute_deprecated SwsVector *sws_cloneVec(SwsVector *a);
-attribute_deprecated void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level);
-#endif
-
-void sws_freeVec(SwsVector *a);
-
-SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
-                                float lumaSharpen, float chromaSharpen,
-                                float chromaHShift, float chromaVShift,
-                                int verbose);
-void sws_freeFilter(SwsFilter *filter);
-
-/**
- * Check if context can be reused, otherwise reallocate a new one.
- *
- * If context is NULL, just calls sws_getContext() to get a new
- * context. Otherwise, checks if the parameters are the ones already
- * saved in context. If that is the case, returns the current
- * context. Otherwise, frees context and gets a new context with
- * the new parameters.
- *
- * Be warned that srcFilter and dstFilter are not checked, they
- * are assumed to remain the same.
- */
-struct SwsContext *sws_getCachedContext(struct SwsContext *context,
-                                        int srcW, int srcH, enum AVPixelFormat srcFormat,
-                                        int dstW, int dstH, enum AVPixelFormat dstFormat,
-                                        int flags, SwsFilter *srcFilter,
-                                        SwsFilter *dstFilter, const double *param);
-
-/**
- * Convert an 8-bit paletted frame into a frame with a color depth of 32 bits.
- *
- * The output frame will have the same packed format as the palette.
- *
- * @param src        source frame buffer
- * @param dst        destination frame buffer
- * @param num_pixels number of pixels to convert
- * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
- */
-void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
-
-/**
- * Convert an 8-bit paletted frame into a frame with a color depth of 24 bits.
- *
- * With the palette format "ABCD", the destination frame ends up with the format "ABC".
- *
- * @param src        source frame buffer
- * @param dst        destination frame buffer
- * @param num_pixels number of pixels to convert
- * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
- */
-void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
-
-/**
- * Get the AVClass for swsContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *sws_get_class(void);
-
-/**
- * @}
- */
-
-#endif /* SWSCALE_SWSCALE_H */
diff --git a/dependencies2013/win32/include/libswscale/version.h b/dependencies2013/win32/include/libswscale/version.h
deleted file mode 100644
index 23d5b0c4..00000000
--- a/dependencies2013/win32/include/libswscale/version.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWSCALE_VERSION_H
-#define SWSCALE_VERSION_H
-
-/**
- * @file
- * swscale version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBSWSCALE_VERSION_MAJOR   4
-#define LIBSWSCALE_VERSION_MINOR   9
-#define LIBSWSCALE_VERSION_MICRO 100
-
-#define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
-                                               LIBSWSCALE_VERSION_MINOR, \
-                                               LIBSWSCALE_VERSION_MICRO)
-#define LIBSWSCALE_VERSION      AV_VERSION(LIBSWSCALE_VERSION_MAJOR, \
-                                           LIBSWSCALE_VERSION_MINOR, \
-                                           LIBSWSCALE_VERSION_MICRO)
-#define LIBSWSCALE_BUILD        LIBSWSCALE_VERSION_INT
-
-#define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_SWS_VECTOR
-#define FF_API_SWS_VECTOR            (LIBSWSCALE_VERSION_MAJOR < 6)
-#endif
-
-#endif /* SWSCALE_VERSION_H */
diff --git a/dependencies2013/win32/include/luajit/lauxlib.h b/dependencies2013/win32/include/luajit/lauxlib.h
deleted file mode 100644
index fed1491b..00000000
--- a/dependencies2013/win32/include/luajit/lauxlib.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-** $Id: lauxlib.h,v 1.88.1.1 2007/12/27 13:02:25 roberto Exp $
-** Auxiliary functions for building Lua libraries
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef lauxlib_h
-#define lauxlib_h
-
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "lua.h"
-
-
-#define luaL_getn(L,i)          ((int)lua_objlen(L, i))
-#define luaL_setn(L,i,j)        ((void)0)  /* no op! */
-
-/* extra error code for `luaL_load' */
-#define LUA_ERRFILE     (LUA_ERRERR+1)
-
-typedef struct luaL_Reg {
-  const char *name;
-  lua_CFunction func;
-} luaL_Reg;
-
-LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
-                                const luaL_Reg *l, int nup);
-LUALIB_API void (luaL_register) (lua_State *L, const char *libname,
-                                const luaL_Reg *l);
-LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
-LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
-LUALIB_API int (luaL_typerror) (lua_State *L, int narg, const char *tname);
-LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
-LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg,
-                                                          size_t *l);
-LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
-                                          const char *def, size_t *l);
-LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
-LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
-
-LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
-                                          lua_Integer def);
-
-LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
-LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
-LUALIB_API void (luaL_checkany) (lua_State *L, int narg);
-
-LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
-LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
-
-LUALIB_API void (luaL_where) (lua_State *L, int lvl);
-LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
-
-LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
-                                   const char *const lst[]);
-
-LUALIB_API int (luaL_ref) (lua_State *L, int t);
-LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
-
-LUALIB_API int (luaL_loadfile) (lua_State *L, const char *filename);
-LUALIB_API int (luaL_loadbuffer) (lua_State *L, const char *buff, size_t sz,
-                                  const char *name);
-LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
-
-LUALIB_API lua_State *(luaL_newstate) (void);
-
-
-LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
-                                                  const char *r);
-
-LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx,
-                                         const char *fname, int szhint);
-
-/* From Lua 5.2. */
-LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
-LUALIB_API int luaL_execresult(lua_State *L, int stat);
-LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
-				 const char *mode);
-LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
-				   const char *name, const char *mode);
-LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
-				int level);
-
-
-/*
-** ===============================================================
-** some useful macros
-** ===============================================================
-*/
-
-#define luaL_argcheck(L, cond,numarg,extramsg)	\
-		((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
-#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
-#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
-#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
-#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
-#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
-#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
-
-#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
-
-#define luaL_dofile(L, fn) \
-	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
-
-#define luaL_dostring(L, s) \
-	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
-
-#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
-
-#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
-
-/*
-** {======================================================
-** Generic Buffer manipulation
-** =======================================================
-*/
-
-
-
-typedef struct luaL_Buffer {
-  char *p;			/* current position in buffer */
-  int lvl;  /* number of strings in the stack (level) */
-  lua_State *L;
-  char buffer[LUAL_BUFFERSIZE];
-} luaL_Buffer;
-
-#define luaL_addchar(B,c) \
-  ((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
-   (*(B)->p++ = (char)(c)))
-
-/* compatibility only */
-#define luaL_putchar(B,c)	luaL_addchar(B,c)
-
-#define luaL_addsize(B,n)	((B)->p += (n))
-
-LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
-LUALIB_API char *(luaL_prepbuffer) (luaL_Buffer *B);
-LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
-LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
-LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
-
-
-/* }====================================================== */
-
-
-/* compatibility with ref system */
-
-/* pre-defined references */
-#define LUA_NOREF       (-2)
-#define LUA_REFNIL      (-1)
-
-#define lua_ref(L,lock) ((lock) ? luaL_ref(L, LUA_REGISTRYINDEX) : \
-      (lua_pushstring(L, "unlocked references are obsolete"), lua_error(L), 0))
-
-#define lua_unref(L,ref)        luaL_unref(L, LUA_REGISTRYINDEX, (ref))
-
-#define lua_getref(L,ref)       lua_rawgeti(L, LUA_REGISTRYINDEX, (ref))
-
-
-#define luaL_reg	luaL_Reg
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_alloc.h b/dependencies2013/win32/include/luajit/lj_alloc.h
deleted file mode 100644
index f87a7cf3..00000000
--- a/dependencies2013/win32/include/luajit/lj_alloc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-** Bundled memory allocator.
-** Donated to the public domain.
-*/
-
-#ifndef _LJ_ALLOC_H
-#define _LJ_ALLOC_H
-
-#include "lj_def.h"
-
-#ifndef LUAJIT_USE_SYSMALLOC
-LJ_FUNC void *lj_alloc_create(void);
-LJ_FUNC void lj_alloc_destroy(void *msp);
-LJ_FUNC void *lj_alloc_f(void *msp, void *ptr, size_t osize, size_t nsize);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_arch.h b/dependencies2013/win32/include/luajit/lj_arch.h
deleted file mode 100644
index e04c4ee9..00000000
--- a/dependencies2013/win32/include/luajit/lj_arch.h
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
-** Target architecture selection.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_ARCH_H
-#define _LJ_ARCH_H
-
-#include "lua.h"
-
-/* Target endianess. */
-#define LUAJIT_LE	0
-#define LUAJIT_BE	1
-
-/* Target architectures. */
-#define LUAJIT_ARCH_X86		1
-#define LUAJIT_ARCH_x86		1
-#define LUAJIT_ARCH_X64		2
-#define LUAJIT_ARCH_x64		2
-#define LUAJIT_ARCH_ARM		3
-#define LUAJIT_ARCH_arm		3
-#define LUAJIT_ARCH_PPC		4
-#define LUAJIT_ARCH_ppc		4
-#define LUAJIT_ARCH_PPCSPE	5
-#define LUAJIT_ARCH_ppcspe	5
-#define LUAJIT_ARCH_MIPS	6
-#define LUAJIT_ARCH_mips	6
-
-/* Target OS. */
-#define LUAJIT_OS_OTHER		0
-#define LUAJIT_OS_WINDOWS	1
-#define LUAJIT_OS_LINUX		2
-#define LUAJIT_OS_OSX		3
-#define LUAJIT_OS_BSD		4
-#define LUAJIT_OS_POSIX		5
-
-/* Select native target if no target defined. */
-#ifndef LUAJIT_TARGET
-
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#define LUAJIT_TARGET	LUAJIT_ARCH_X86
-#elif defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
-#define LUAJIT_TARGET	LUAJIT_ARCH_X64
-#elif defined(__arm__) || defined(__arm) || defined(__ARM__) || defined(__ARM)
-#define LUAJIT_TARGET	LUAJIT_ARCH_ARM
-#elif defined(__ppc__) || defined(__ppc) || defined(__PPC__) || defined(__PPC) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(__POWERPC) || defined(_M_PPC)
-#ifdef __NO_FPRS__
-#define LUAJIT_TARGET	LUAJIT_ARCH_PPCSPE
-#else
-#define LUAJIT_TARGET	LUAJIT_ARCH_PPC
-#endif
-#elif defined(__mips__) || defined(__mips) || defined(__MIPS__) || defined(__MIPS)
-#define LUAJIT_TARGET	LUAJIT_ARCH_MIPS
-#else
-#error "No support for this architecture (yet)"
-#endif
-
-#endif
-
-/* Select native OS if no target OS defined. */
-#ifndef LUAJIT_OS
-
-#if defined(_WIN32) && !defined(_XBOX_VER)
-#define LUAJIT_OS	LUAJIT_OS_WINDOWS
-#elif defined(__linux__)
-#define LUAJIT_OS	LUAJIT_OS_LINUX
-#elif defined(__MACH__) && defined(__APPLE__)
-#define LUAJIT_OS	LUAJIT_OS_OSX
-#elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
-       defined(__NetBSD__) || defined(__OpenBSD__) || \
-       defined(__DragonFly__)) && !defined(__ORBIS__)
-#define LUAJIT_OS	LUAJIT_OS_BSD
-#elif (defined(__sun__) && defined(__svr4__))
-#define LUAJIT_OS	LUAJIT_OS_POSIX
-#elif defined(__CYGWIN__)
-#define LJ_TARGET_CYGWIN	1
-#define LUAJIT_OS	LUAJIT_OS_POSIX
-#else
-#define LUAJIT_OS	LUAJIT_OS_OTHER
-#endif
-
-#endif
-
-/* Set target OS properties. */
-#if LUAJIT_OS == LUAJIT_OS_WINDOWS
-#define LJ_OS_NAME	"Windows"
-#elif LUAJIT_OS == LUAJIT_OS_LINUX
-#define LJ_OS_NAME	"Linux"
-#elif LUAJIT_OS == LUAJIT_OS_OSX
-#define LJ_OS_NAME	"OSX"
-#elif LUAJIT_OS == LUAJIT_OS_BSD
-#define LJ_OS_NAME	"BSD"
-#elif LUAJIT_OS == LUAJIT_OS_POSIX
-#define LJ_OS_NAME	"POSIX"
-#else
-#define LJ_OS_NAME	"Other"
-#endif
-
-#define LJ_TARGET_WINDOWS	(LUAJIT_OS == LUAJIT_OS_WINDOWS)
-#define LJ_TARGET_LINUX		(LUAJIT_OS == LUAJIT_OS_LINUX)
-#define LJ_TARGET_OSX		(LUAJIT_OS == LUAJIT_OS_OSX)
-#define LJ_TARGET_IOS		(LJ_TARGET_OSX && LUAJIT_TARGET == LUAJIT_ARCH_ARM)
-#define LJ_TARGET_POSIX		(LUAJIT_OS > LUAJIT_OS_WINDOWS)
-#define LJ_TARGET_DLOPEN	LJ_TARGET_POSIX
-
-#ifdef __CELLOS_LV2__
-#define LJ_TARGET_PS3		1
-#define LJ_TARGET_CONSOLE	1
-#endif
-
-#ifdef __ORBIS__
-#define LJ_TARGET_PS4		1
-#define LJ_TARGET_CONSOLE	1
-#undef NULL
-#define NULL ((void*)0)
-#endif
-
-#ifdef __psp2__
-#define LJ_TARGET_PSVITA	1
-#define LJ_TARGET_CONSOLE	1
-#endif
-
-#if _XBOX_VER >= 200
-#define LJ_TARGET_XBOX360	1
-#define LJ_TARGET_CONSOLE	1
-#endif
-
-#define LJ_NUMMODE_SINGLE	0	/* Single-number mode only. */
-#define LJ_NUMMODE_SINGLE_DUAL	1	/* Default to single-number mode. */
-#define LJ_NUMMODE_DUAL		2	/* Dual-number mode only. */
-#define LJ_NUMMODE_DUAL_SINGLE	3	/* Default to dual-number mode. */
-
-/* Set target architecture properties. */
-#if LUAJIT_TARGET == LUAJIT_ARCH_X86
-
-#define LJ_ARCH_NAME		"x86"
-#define LJ_ARCH_BITS		32
-#define LJ_ARCH_ENDIAN		LUAJIT_LE
-#if LJ_TARGET_WINDOWS || LJ_TARGET_CYGWIN
-#define LJ_ABI_WIN		1
-#else
-#define LJ_ABI_WIN		0
-#endif
-#define LJ_TARGET_X86		1
-#define LJ_TARGET_X86ORX64	1
-#define LJ_TARGET_EHRETREG	0
-#define LJ_TARGET_MASKSHIFT	1
-#define LJ_TARGET_MASKROT	1
-#define LJ_TARGET_UNALIGNED	1
-#define LJ_ARCH_NUMMODE		LJ_NUMMODE_SINGLE_DUAL
-
-#elif LUAJIT_TARGET == LUAJIT_ARCH_X64
-
-#define LJ_ARCH_NAME		"x64"
-#define LJ_ARCH_BITS		64
-#define LJ_ARCH_ENDIAN		LUAJIT_LE
-#if LJ_TARGET_WINDOWS || LJ_TARGET_CYGWIN
-#define LJ_ABI_WIN		1
-#else
-#define LJ_ABI_WIN		0
-#endif
-#define LJ_TARGET_X64		1
-#define LJ_TARGET_X86ORX64	1
-#define LJ_TARGET_EHRETREG	0
-#define LJ_TARGET_JUMPRANGE	31	/* +-2^31 = +-2GB */
-#define LJ_TARGET_MASKSHIFT	1
-#define LJ_TARGET_MASKROT	1
-#define LJ_TARGET_UNALIGNED	1
-#define LJ_ARCH_NUMMODE		LJ_NUMMODE_SINGLE_DUAL
-
-#elif LUAJIT_TARGET == LUAJIT_ARCH_ARM
-
-#define LJ_ARCH_NAME		"arm"
-#define LJ_ARCH_BITS		32
-#define LJ_ARCH_ENDIAN		LUAJIT_LE
-#if !defined(LJ_ARCH_HASFPU) && __SOFTFP__
-#define LJ_ARCH_HASFPU		0
-#endif
-#if !defined(LJ_ABI_SOFTFP) && !__ARM_PCS_VFP
-#define LJ_ABI_SOFTFP		1
-#endif
-#define LJ_ABI_EABI		1
-#define LJ_TARGET_ARM		1
-#define LJ_TARGET_EHRETREG	0
-#define LJ_TARGET_JUMPRANGE	25	/* +-2^25 = +-32MB */
-#define LJ_TARGET_MASKSHIFT	0
-#define LJ_TARGET_MASKROT	1
-#define LJ_TARGET_UNIFYROT	2	/* Want only IR_BROR. */
-#define LJ_ARCH_NUMMODE		LJ_NUMMODE_DUAL
-
-#if __ARM_ARCH____ARM_ARCH_8__ || __ARM_ARCH_8A__
-#define LJ_ARCH_VERSION		80
-#elif __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH_7S__ || __ARM_ARCH_7VE__
-#define LJ_ARCH_VERSION		70
-#elif __ARM_ARCH_6T2__
-#define LJ_ARCH_VERSION		61
-#elif __ARM_ARCH_6__ || __ARM_ARCH_6J__ || __ARM_ARCH_6K__ || __ARM_ARCH_6Z__ || __ARM_ARCH_6ZK__
-#define LJ_ARCH_VERSION		60
-#else
-#define LJ_ARCH_VERSION		50
-#endif
-
-#elif LUAJIT_TARGET == LUAJIT_ARCH_PPC
-
-#define LJ_ARCH_NAME		"ppc"
-#if _LP64
-#define LJ_ARCH_BITS		64
-#else
-#define LJ_ARCH_BITS		32
-#endif
-#define LJ_ARCH_ENDIAN		LUAJIT_BE
-#define LJ_TARGET_PPC		1
-#define LJ_TARGET_EHRETREG	3
-#define LJ_TARGET_JUMPRANGE	25	/* +-2^25 = +-32MB */
-#define LJ_TARGET_MASKSHIFT	0
-#define LJ_TARGET_MASKROT	1
-#define LJ_TARGET_UNIFYROT	1	/* Want only IR_BROL. */
-#define LJ_ARCH_NUMMODE		LJ_NUMMODE_DUAL_SINGLE
-
-#if _ARCH_PWR7
-#define LJ_ARCH_VERSION		70
-#elif _ARCH_PWR6
-#define LJ_ARCH_VERSION		60
-#elif _ARCH_PWR5X
-#define LJ_ARCH_VERSION		51
-#elif _ARCH_PWR5
-#define LJ_ARCH_VERSION		50
-#elif _ARCH_PWR4
-#define LJ_ARCH_VERSION		40
-#else
-#define LJ_ARCH_VERSION		0
-#endif
-#if __PPC64__ || __powerpc64__ || LJ_TARGET_CONSOLE
-#define LJ_ARCH_PPC64		1
-#define LJ_ARCH_NOFFI		1
-#endif
-#if _ARCH_PPCSQ
-#define LJ_ARCH_SQRT		1
-#endif
-#if _ARCH_PWR5X
-#define LJ_ARCH_ROUND		1
-#endif
-#if __PPU__
-#define LJ_ARCH_CELL		1
-#endif
-#if LJ_TARGET_XBOX360
-#define LJ_ARCH_XENON		1
-#endif
-
-#elif LUAJIT_TARGET == LUAJIT_ARCH_PPCSPE
-
-#define LJ_ARCH_NAME		"ppcspe"
-#define LJ_ARCH_BITS		32
-#define LJ_ARCH_ENDIAN		LUAJIT_BE
-#ifndef LJ_ABI_SOFTFP
-#define LJ_ABI_SOFTFP		1
-#endif
-#define LJ_ABI_EABI		1
-#define LJ_TARGET_PPCSPE	1
-#define LJ_TARGET_EHRETREG	3
-#define LJ_TARGET_JUMPRANGE	25	/* +-2^25 = +-32MB */
-#define LJ_TARGET_MASKSHIFT	0
-#define LJ_TARGET_MASKROT	1
-#define LJ_TARGET_UNIFYROT	1	/* Want only IR_BROL. */
-#define LJ_ARCH_NUMMODE		LJ_NUMMODE_SINGLE
-#define LJ_ARCH_NOFFI		1	/* NYI: comparisons, calls. */
-#define LJ_ARCH_NOJIT		1
-
-#elif LUAJIT_TARGET == LUAJIT_ARCH_MIPS
-
-#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL)
-#define LJ_ARCH_NAME		"mipsel"
-#define LJ_ARCH_ENDIAN		LUAJIT_LE
-#else
-#define LJ_ARCH_NAME		"mips"
-#define LJ_ARCH_ENDIAN		LUAJIT_BE
-#endif
-#define LJ_ARCH_BITS		32
-#define LJ_TARGET_MIPS		1
-#define LJ_TARGET_EHRETREG	4
-#define LJ_TARGET_JUMPRANGE	27	/* 2*2^27 = 256MB-aligned region */
-#define LJ_TARGET_MASKSHIFT	1
-#define LJ_TARGET_MASKROT	1
-#define LJ_TARGET_UNIFYROT	2	/* Want only IR_BROR. */
-#define LJ_ARCH_NUMMODE		LJ_NUMMODE_SINGLE
-
-#if _MIPS_ARCH_MIPS32R2
-#define LJ_ARCH_VERSION		20
-#else
-#define LJ_ARCH_VERSION		10
-#endif
-
-#else
-#error "No target architecture defined"
-#endif
-
-#ifndef LJ_PAGESIZE
-#define LJ_PAGESIZE		4096
-#endif
-
-/* Check for minimum required compiler versions. */
-#if defined(__GNUC__)
-#if LJ_TARGET_X86
-#if (__GNUC__ < 3) || ((__GNUC__ == 3) && __GNUC_MINOR__ < 4)
-#error "Need at least GCC 3.4 or newer"
-#endif
-#elif LJ_TARGET_X64
-#if __GNUC__ < 4
-#error "Need at least GCC 4.0 or newer"
-#endif
-#elif LJ_TARGET_ARM
-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2)
-#error "Need at least GCC 4.2 or newer"
-#endif
-#elif !LJ_TARGET_PS3
-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
-#error "Need at least GCC 4.3 or newer"
-#endif
-#endif
-#endif
-
-/* Check target-specific constraints. */
-#ifndef _BUILDVM_H
-#if LJ_TARGET_X64
-#if __USING_SJLJ_EXCEPTIONS__
-#error "Need a C compiler with native exception handling on x64"
-#endif
-#elif LJ_TARGET_ARM
-#if defined(__ARMEB__)
-#error "No support for big-endian ARM"
-#endif
-#if __ARM_ARCH_6M__ || __ARM_ARCH_7M__ || __ARM_ARCH_7EM__
-#error "No support for Cortex-M CPUs"
-#endif
-#if !(__ARM_EABI__ || LJ_TARGET_IOS)
-#error "Only ARM EABI or iOS 3.0+ ABI is supported"
-#endif
-#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
-#if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
-#error "No support for PowerPC CPUs without double-precision FPU"
-#endif
-#if defined(_LITTLE_ENDIAN)
-#error "No support for little-endian PowerPC"
-#endif
-#if defined(_LP64)
-#error "No support for PowerPC 64 bit mode"
-#endif
-#elif LJ_TARGET_MIPS
-#if defined(__mips_soft_float)
-#error "No support for MIPS CPUs without FPU"
-#endif
-#if defined(_LP64)
-#error "No support for MIPS64"
-#endif
-#endif
-#endif
-
-/* Enable or disable the dual-number mode for the VM. */
-#if (LJ_ARCH_NUMMODE == LJ_NUMMODE_SINGLE && LUAJIT_NUMMODE == 2) || \
-    (LJ_ARCH_NUMMODE == LJ_NUMMODE_DUAL && LUAJIT_NUMMODE == 1)
-#error "No support for this number mode on this architecture"
-#endif
-#if LJ_ARCH_NUMMODE == LJ_NUMMODE_DUAL || \
-    (LJ_ARCH_NUMMODE == LJ_NUMMODE_DUAL_SINGLE && LUAJIT_NUMMODE != 1) || \
-    (LJ_ARCH_NUMMODE == LJ_NUMMODE_SINGLE_DUAL && LUAJIT_NUMMODE == 2)
-#define LJ_DUALNUM		1
-#else
-#define LJ_DUALNUM		0
-#endif
-
-#if LJ_TARGET_IOS || LJ_TARGET_CONSOLE
-/* Runtime code generation is restricted on iOS. Complain to Apple, not me. */
-/* Ditto for the consoles. Complain to Sony or MS, not me. */
-#ifndef LUAJIT_ENABLE_JIT
-#define LJ_OS_NOJIT		1
-#endif
-#endif
-
-/* Disable or enable the JIT compiler. */
-#if defined(LUAJIT_DISABLE_JIT) || defined(LJ_ARCH_NOJIT) || defined(LJ_OS_NOJIT)
-#define LJ_HASJIT		0
-#else
-#define LJ_HASJIT		1
-#endif
-
-/* Disable or enable the FFI extension. */
-#if defined(LUAJIT_DISABLE_FFI) || defined(LJ_ARCH_NOFFI)
-#define LJ_HASFFI		0
-#else
-#define LJ_HASFFI		1
-#endif
-
-#ifndef LJ_ARCH_HASFPU
-#define LJ_ARCH_HASFPU		1
-#endif
-#ifndef LJ_ABI_SOFTFP
-#define LJ_ABI_SOFTFP		0
-#endif
-#define LJ_SOFTFP		(!LJ_ARCH_HASFPU)
-
-#if LJ_ARCH_ENDIAN == LUAJIT_BE
-#define LJ_LE			0
-#define LJ_BE			1
-#define LJ_ENDIAN_SELECT(le, be)	be
-#define LJ_ENDIAN_LOHI(lo, hi)		hi lo
-#else
-#define LJ_LE			1
-#define LJ_BE			0
-#define LJ_ENDIAN_SELECT(le, be)	le
-#define LJ_ENDIAN_LOHI(lo, hi)		lo hi
-#endif
-
-#if LJ_ARCH_BITS == 32
-#define LJ_32			1
-#define LJ_64			0
-#else
-#define LJ_32			0
-#define LJ_64			1
-#endif
-
-#ifndef LJ_TARGET_UNALIGNED
-#define LJ_TARGET_UNALIGNED	0
-#endif
-
-/* Various workarounds for embedded operating systems. */
-#if (defined(__ANDROID__) && !defined(LJ_TARGET_X86ORX64)) || defined(__symbian__) || LJ_TARGET_XBOX360
-#define LUAJIT_NO_LOG2
-#endif
-#if defined(__symbian__)
-#define LUAJIT_NO_EXP2
-#endif
-#if LJ_TARGET_CONSOLE || (LJ_TARGET_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0)
-#define LJ_NO_SYSTEM		1
-#endif
-
-#if !defined(LUAJIT_NO_UNWIND) && __GNU_COMPACT_EH__
-/* NYI: no support for compact unwind specification, yet. */
-#define LUAJIT_NO_UNWIND	1
-#endif
-
-#if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4
-#define LJ_NO_UNWIND		1
-#endif
-
-/* Compatibility with Lua 5.1 vs. 5.2. */
-#ifdef LUAJIT_ENABLE_LUA52COMPAT
-#define LJ_52			1
-#else
-#define LJ_52			0
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_asm.h b/dependencies2013/win32/include/luajit/lj_asm.h
deleted file mode 100644
index 2819481b..00000000
--- a/dependencies2013/win32/include/luajit/lj_asm.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-** IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_ASM_H
-#define _LJ_ASM_H
-
-#include "lj_jit.h"
-
-#if LJ_HASJIT
-LJ_FUNC void lj_asm_trace(jit_State *J, GCtrace *T);
-LJ_FUNC void lj_asm_patchexit(jit_State *J, GCtrace *T, ExitNo exitno,
-			      MCode *target);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_asm_arm.h b/dependencies2013/win32/include/luajit/lj_asm_arm.h
deleted file mode 100644
index 961f7e39..00000000
--- a/dependencies2013/win32/include/luajit/lj_asm_arm.h
+++ /dev/null
@@ -1,2360 +0,0 @@
-/*
-** ARM IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Register allocator extensions --------------------------------------- */
-
-/* Allocate a register with a hint. */
-static Reg ra_hintalloc(ASMState *as, IRRef ref, Reg hint, RegSet allow)
-{
-  Reg r = IR(ref)->r;
-  if (ra_noreg(r)) {
-    if (!ra_hashint(r) && !iscrossref(as, ref))
-      ra_sethint(IR(ref)->r, hint);  /* Propagate register hint. */
-    r = ra_allocref(as, ref, allow);
-  }
-  ra_noweak(as, r);
-  return r;
-}
-
-/* Allocate a scratch register pair. */
-static Reg ra_scratchpair(ASMState *as, RegSet allow)
-{
-  RegSet pick1 = as->freeset & allow;
-  RegSet pick2 = pick1 & (pick1 >> 1) & RSET_GPREVEN;
-  Reg r;
-  if (pick2) {
-    r = rset_picktop(pick2);
-  } else {
-    RegSet pick = pick1 & (allow >> 1) & RSET_GPREVEN;
-    if (pick) {
-      r = rset_picktop(pick);
-      ra_restore(as, regcost_ref(as->cost[r+1]));
-    } else {
-      pick = pick1 & (allow << 1) & RSET_GPRODD;
-      if (pick) {
-	r = ra_restore(as, regcost_ref(as->cost[rset_picktop(pick)-1]));
-      } else {
-	r = ra_evict(as, allow & (allow >> 1) & RSET_GPREVEN);
-	ra_restore(as, regcost_ref(as->cost[r+1]));
-      }
-    }
-  }
-  lua_assert(rset_test(RSET_GPREVEN, r));
-  ra_modified(as, r);
-  ra_modified(as, r+1);
-  RA_DBGX((as, "scratchpair    $r $r", r, r+1));
-  return r;
-}
-
-#if !LJ_SOFTFP
-/* Allocate two source registers for three-operand instructions. */
-static Reg ra_alloc2(ASMState *as, IRIns *ir, RegSet allow)
-{
-  IRIns *irl = IR(ir->op1), *irr = IR(ir->op2);
-  Reg left = irl->r, right = irr->r;
-  if (ra_hasreg(left)) {
-    ra_noweak(as, left);
-    if (ra_noreg(right))
-      right = ra_allocref(as, ir->op2, rset_exclude(allow, left));
-    else
-      ra_noweak(as, right);
-  } else if (ra_hasreg(right)) {
-    ra_noweak(as, right);
-    left = ra_allocref(as, ir->op1, rset_exclude(allow, right));
-  } else if (ra_hashint(right)) {
-    right = ra_allocref(as, ir->op2, allow);
-    left = ra_alloc1(as, ir->op1, rset_exclude(allow, right));
-  } else {
-    left = ra_allocref(as, ir->op1, allow);
-    right = ra_alloc1(as, ir->op2, rset_exclude(allow, left));
-  }
-  return left | (right << 8);
-}
-#endif
-
-/* -- Guard handling ------------------------------------------------------ */
-
-/* Generate an exit stub group at the bottom of the reserved MCode memory. */
-static MCode *asm_exitstub_gen(ASMState *as, ExitNo group)
-{
-  MCode *mxp = as->mcbot;
-  int i;
-  if (mxp + 4*4+4*EXITSTUBS_PER_GROUP >= as->mctop)
-    asm_mclimit(as);
-  /* str lr, [sp]; bl ->vm_exit_handler; .long DISPATCH_address, group. */
-  *mxp++ = ARMI_STR|ARMI_LS_P|ARMI_LS_U|ARMF_D(RID_LR)|ARMF_N(RID_SP);
-  *mxp = ARMI_BL|((((MCode *)(void *)lj_vm_exit_handler-mxp)-2)&0x00ffffffu);
-  mxp++;
-  *mxp++ = (MCode)i32ptr(J2GG(as->J)->dispatch);  /* DISPATCH address */
-  *mxp++ = group*EXITSTUBS_PER_GROUP;
-  for (i = 0; i < EXITSTUBS_PER_GROUP; i++)
-    *mxp++ = ARMI_B|((-6-i)&0x00ffffffu);
-  lj_mcode_sync(as->mcbot, mxp);
-  lj_mcode_commitbot(as->J, mxp);
-  as->mcbot = mxp;
-  as->mclim = as->mcbot + MCLIM_REDZONE;
-  return mxp - EXITSTUBS_PER_GROUP;
-}
-
-/* Setup all needed exit stubs. */
-static void asm_exitstub_setup(ASMState *as, ExitNo nexits)
-{
-  ExitNo i;
-  if (nexits >= EXITSTUBS_PER_GROUP*LJ_MAX_EXITSTUBGR)
-    lj_trace_err(as->J, LJ_TRERR_SNAPOV);
-  for (i = 0; i < (nexits+EXITSTUBS_PER_GROUP-1)/EXITSTUBS_PER_GROUP; i++)
-    if (as->J->exitstubgroup[i] == NULL)
-      as->J->exitstubgroup[i] = asm_exitstub_gen(as, i);
-}
-
-/* Emit conditional branch to exit for guard. */
-static void asm_guardcc(ASMState *as, ARMCC cc)
-{
-  MCode *target = exitstub_addr(as->J, as->snapno);
-  MCode *p = as->mcp;
-  if (LJ_UNLIKELY(p == as->invmcp)) {
-    as->loopinv = 1;
-    *p = ARMI_BL | ((target-p-2) & 0x00ffffffu);
-    emit_branch(as, ARMF_CC(ARMI_B, cc^1), p+1);
-    return;
-  }
-  emit_branch(as, ARMF_CC(ARMI_BL, cc), target);
-}
-
-/* -- Operand fusion ------------------------------------------------------ */
-
-/* Limit linear search to this distance. Avoids O(n^2) behavior. */
-#define CONFLICT_SEARCH_LIM	31
-
-/* Check if there's no conflicting instruction between curins and ref. */
-static int noconflict(ASMState *as, IRRef ref, IROp conflict)
-{
-  IRIns *ir = as->ir;
-  IRRef i = as->curins;
-  if (i > ref + CONFLICT_SEARCH_LIM)
-    return 0;  /* Give up, ref is too far away. */
-  while (--i > ref)
-    if (ir[i].o == conflict)
-      return 0;  /* Conflict found. */
-  return 1;  /* Ok, no conflict. */
-}
-
-/* Fuse the array base of colocated arrays. */
-static int32_t asm_fuseabase(ASMState *as, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (ir->o == IR_TNEW && ir->op1 <= LJ_MAX_COLOSIZE &&
-      !neverfuse(as) && noconflict(as, ref, IR_NEWREF))
-    return (int32_t)sizeof(GCtab);
-  return 0;
-}
-
-/* Fuse array/hash/upvalue reference into register+offset operand. */
-static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow,
-			  int lim)
-{
-  IRIns *ir = IR(ref);
-  if (ra_noreg(ir->r)) {
-    if (ir->o == IR_AREF) {
-      if (mayfuse(as, ref)) {
-	if (irref_isk(ir->op2)) {
-	  IRRef tab = IR(ir->op1)->op1;
-	  int32_t ofs = asm_fuseabase(as, tab);
-	  IRRef refa = ofs ? tab : ir->op1;
-	  ofs += 8*IR(ir->op2)->i;
-	  if (ofs > -lim && ofs < lim) {
-	    *ofsp = ofs;
-	    return ra_alloc1(as, refa, allow);
-	  }
-	}
-      }
-    } else if (ir->o == IR_HREFK) {
-      if (mayfuse(as, ref)) {
-	int32_t ofs = (int32_t)(IR(ir->op2)->op2 * sizeof(Node));
-	if (ofs < lim) {
-	  *ofsp = ofs;
-	  return ra_alloc1(as, ir->op1, allow);
-	}
-      }
-    } else if (ir->o == IR_UREFC) {
-      if (irref_isk(ir->op1)) {
-	GCfunc *fn = ir_kfunc(IR(ir->op1));
-	int32_t ofs = i32ptr(&gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.tv);
-	*ofsp = (ofs & 255);  /* Mask out less bits to allow LDRD. */
-	return ra_allock(as, (ofs & ~255), allow);
-      }
-    }
-  }
-  *ofsp = 0;
-  return ra_alloc1(as, ref, allow);
-}
-
-/* Fuse m operand into arithmetic/logic instructions. */
-static uint32_t asm_fuseopm(ASMState *as, ARMIns ai, IRRef ref, RegSet allow)
-{
-  IRIns *ir = IR(ref);
-  if (ra_hasreg(ir->r)) {
-    ra_noweak(as, ir->r);
-    return ARMF_M(ir->r);
-  } else if (irref_isk(ref)) {
-    uint32_t k = emit_isk12(ai, ir->i);
-    if (k)
-      return k;
-  } else if (mayfuse(as, ref)) {
-    if (ir->o >= IR_BSHL && ir->o <= IR_BROR) {
-      Reg m = ra_alloc1(as, ir->op1, allow);
-      ARMShift sh = ir->o == IR_BSHL ? ARMSH_LSL :
-		    ir->o == IR_BSHR ? ARMSH_LSR :
-		    ir->o == IR_BSAR ? ARMSH_ASR : ARMSH_ROR;
-      if (irref_isk(ir->op2)) {
-	return m | ARMF_SH(sh, (IR(ir->op2)->i & 31));
-      } else {
-	Reg s = ra_alloc1(as, ir->op2, rset_exclude(allow, m));
-	return m | ARMF_RSH(sh, s);
-      }
-    } else if (ir->o == IR_ADD && ir->op1 == ir->op2) {
-      Reg m = ra_alloc1(as, ir->op1, allow);
-      return m | ARMF_SH(ARMSH_LSL, 1);
-    }
-  }
-  return ra_allocref(as, ref, allow);
-}
-
-/* Fuse shifts into loads/stores. Only bother with BSHL 2 => lsl #2. */
-static IRRef asm_fuselsl2(ASMState *as, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (ra_noreg(ir->r) && mayfuse(as, ref) && ir->o == IR_BSHL &&
-      irref_isk(ir->op2) && IR(ir->op2)->i == 2)
-    return ir->op1;
-  return 0;  /* No fusion. */
-}
-
-/* Fuse XLOAD/XSTORE reference into load/store operand. */
-static void asm_fusexref(ASMState *as, ARMIns ai, Reg rd, IRRef ref,
-			 RegSet allow, int32_t ofs)
-{
-  IRIns *ir = IR(ref);
-  Reg base;
-  if (ra_noreg(ir->r) && canfuse(as, ir)) {
-    int32_t lim = (!LJ_SOFTFP && (ai & 0x08000000)) ? 1024 :
-		   (ai & 0x04000000) ? 4096 : 256;
-    if (ir->o == IR_ADD) {
-      int32_t ofs2;
-      if (irref_isk(ir->op2) &&
-	  (ofs2 = ofs + IR(ir->op2)->i) > -lim && ofs2 < lim &&
-	  (!(!LJ_SOFTFP && (ai & 0x08000000)) || !(ofs2 & 3))) {
-	ofs = ofs2;
-	ref = ir->op1;
-      } else if (ofs == 0 && !(!LJ_SOFTFP && (ai & 0x08000000))) {
-	IRRef lref = ir->op1, rref = ir->op2;
-	Reg rn, rm;
-	if ((ai & 0x04000000)) {
-	  IRRef sref = asm_fuselsl2(as, rref);
-	  if (sref) {
-	    rref = sref;
-	    ai |= ARMF_SH(ARMSH_LSL, 2);
-	  } else if ((sref = asm_fuselsl2(as, lref)) != 0) {
-	    lref = rref;
-	    rref = sref;
-	    ai |= ARMF_SH(ARMSH_LSL, 2);
-	  }
-	}
-	rn = ra_alloc1(as, lref, allow);
-	rm = ra_alloc1(as, rref, rset_exclude(allow, rn));
-	if ((ai & 0x04000000)) ai |= ARMI_LS_R;
-	emit_dnm(as, ai|ARMI_LS_P|ARMI_LS_U, rd, rn, rm);
-	return;
-      }
-    } else if (ir->o == IR_STRREF && !(!LJ_SOFTFP && (ai & 0x08000000))) {
-      lua_assert(ofs == 0);
-      ofs = (int32_t)sizeof(GCstr);
-      if (irref_isk(ir->op2)) {
-	ofs += IR(ir->op2)->i;
-	ref = ir->op1;
-      } else if (irref_isk(ir->op1)) {
-	ofs += IR(ir->op1)->i;
-	ref = ir->op2;
-      } else {
-	/* NYI: Fuse ADD with constant. */
-	Reg rn = ra_alloc1(as, ir->op1, allow);
-	uint32_t m = asm_fuseopm(as, 0, ir->op2, rset_exclude(allow, rn));
-	if ((ai & 0x04000000))
-	  emit_lso(as, ai, rd, rd, ofs);
-	else
-	  emit_lsox(as, ai, rd, rd, ofs);
-	emit_dn(as, ARMI_ADD^m, rd, rn);
-	return;
-      }
-      if (ofs <= -lim || ofs >= lim) {
-	Reg rn = ra_alloc1(as, ref, allow);
-	Reg rm = ra_allock(as, ofs, rset_exclude(allow, rn));
-	if ((ai & 0x04000000)) ai |= ARMI_LS_R;
-	emit_dnm(as, ai|ARMI_LS_P|ARMI_LS_U, rd, rn, rm);
-	return;
-      }
-    }
-  }
-  base = ra_alloc1(as, ref, allow);
-#if !LJ_SOFTFP
-  if ((ai & 0x08000000))
-    emit_vlso(as, ai, rd, base, ofs);
-  else
-#endif
-  if ((ai & 0x04000000))
-    emit_lso(as, ai, rd, base, ofs);
-  else
-    emit_lsox(as, ai, rd, base, ofs);
-}
-
-#if !LJ_SOFTFP
-/* Fuse to multiply-add/sub instruction. */
-static int asm_fusemadd(ASMState *as, IRIns *ir, ARMIns ai, ARMIns air)
-{
-  IRRef lref = ir->op1, rref = ir->op2;
-  IRIns *irm;
-  if (lref != rref &&
-      ((mayfuse(as, lref) && (irm = IR(lref), irm->o == IR_MUL) &&
-	ra_noreg(irm->r)) ||
-       (mayfuse(as, rref) && (irm = IR(rref), irm->o == IR_MUL) &&
-	(rref = lref, ai = air, ra_noreg(irm->r))))) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    Reg add = ra_hintalloc(as, rref, dest, RSET_FPR);
-    Reg right, left = ra_alloc2(as, irm,
-			rset_exclude(rset_exclude(RSET_FPR, dest), add));
-    right = (left >> 8); left &= 255;
-    emit_dnm(as, ai, (dest & 15), (left & 15), (right & 15));
-    if (dest != add) emit_dm(as, ARMI_VMOV_D, (dest & 15), (add & 15));
-    return 1;
-  }
-  return 0;
-}
-#endif
-
-/* -- Calls --------------------------------------------------------------- */
-
-/* Generate a call to a C function. */
-static void asm_gencall(ASMState *as, const CCallInfo *ci, IRRef *args)
-{
-  uint32_t n, nargs = CCI_NARGS(ci);
-  int32_t ofs = 0;
-#if LJ_SOFTFP
-  Reg gpr = REGARG_FIRSTGPR;
-#else
-  Reg gpr, fpr = REGARG_FIRSTFPR, fprodd = 0;
-#endif
-  if ((void *)ci->func)
-    emit_call(as, (void *)ci->func);
-#if !LJ_SOFTFP
-  for (gpr = REGARG_FIRSTGPR; gpr <= REGARG_LASTGPR; gpr++)
-    as->cost[gpr] = REGCOST(~0u, ASMREF_L);
-  gpr = REGARG_FIRSTGPR;
-#endif
-  for (n = 0; n < nargs; n++) {  /* Setup args. */
-    IRRef ref = args[n];
-    IRIns *ir = IR(ref);
-#if !LJ_SOFTFP
-    if (ref && irt_isfp(ir->t)) {
-      RegSet of = as->freeset;
-      Reg src;
-      if (!LJ_ABI_SOFTFP && !(ci->flags & CCI_VARARG)) {
-	if (irt_isnum(ir->t)) {
-	  if (fpr <= REGARG_LASTFPR) {
-	    ra_leftov(as, fpr, ref);
-	    fpr++;
-	    continue;
-	  }
-	} else if (fprodd) {  /* Ick. */
-	  src = ra_alloc1(as, ref, RSET_FPR);
-	  emit_dm(as, ARMI_VMOV_S, (fprodd & 15), (src & 15) | 0x00400000);
-	  fprodd = 0;
-	  continue;
-	} else if (fpr <= REGARG_LASTFPR) {
-	  ra_leftov(as, fpr, ref);
-	  fprodd = fpr++;
-	  continue;
-	}
-	/* Workaround to protect argument GPRs from being used for remat. */
-	as->freeset &= ~RSET_RANGE(REGARG_FIRSTGPR, REGARG_LASTGPR+1);
-	src = ra_alloc1(as, ref, RSET_FPR);  /* May alloc GPR to remat FPR. */
-	as->freeset |= (of & RSET_RANGE(REGARG_FIRSTGPR, REGARG_LASTGPR+1));
-	fprodd = 0;
-	goto stackfp;
-      }
-      /* Workaround to protect argument GPRs from being used for remat. */
-      as->freeset &= ~RSET_RANGE(REGARG_FIRSTGPR, REGARG_LASTGPR+1);
-      src = ra_alloc1(as, ref, RSET_FPR);  /* May alloc GPR to remat FPR. */
-      as->freeset |= (of & RSET_RANGE(REGARG_FIRSTGPR, REGARG_LASTGPR+1));
-      if (irt_isnum(ir->t)) gpr = (gpr+1) & ~1u;
-      if (gpr <= REGARG_LASTGPR) {
-	lua_assert(rset_test(as->freeset, gpr));  /* Must have been evicted. */
-	if (irt_isnum(ir->t)) {
-	  lua_assert(rset_test(as->freeset, gpr+1));  /* Ditto. */
-	  emit_dnm(as, ARMI_VMOV_RR_D, gpr, gpr+1, (src & 15));
-	  gpr += 2;
-	} else {
-	  emit_dn(as, ARMI_VMOV_R_S, gpr, (src & 15));
-	  gpr++;
-	}
-      } else {
-      stackfp:
-	if (irt_isnum(ir->t)) ofs = (ofs + 4) & ~4;
-	emit_spstore(as, ir, src, ofs);
-	ofs += irt_isnum(ir->t) ? 8 : 4;
-      }
-    } else
-#endif
-    {
-      if (gpr <= REGARG_LASTGPR) {
-	lua_assert(rset_test(as->freeset, gpr));  /* Must have been evicted. */
-	if (ref) ra_leftov(as, gpr, ref);
-	gpr++;
-      } else {
-	if (ref) {
-	  Reg r = ra_alloc1(as, ref, RSET_GPR);
-	  emit_spstore(as, ir, r, ofs);
-	}
-	ofs += 4;
-      }
-    }
-  }
-}
-
-/* Setup result reg/sp for call. Evict scratch regs. */
-static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  RegSet drop = RSET_SCRATCH;
-  int hiop = ((ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t));
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  if (hiop && ra_hasreg((ir+1)->r))
-    rset_clear(drop, (ir+1)->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);  /* Evictions must be performed first. */
-  if (ra_used(ir)) {
-    lua_assert(!irt_ispri(ir->t));
-    if (!LJ_SOFTFP && irt_isfp(ir->t)) {
-      if (LJ_ABI_SOFTFP || (ci->flags & (CCI_CASTU64|CCI_VARARG))) {
-	Reg dest = (ra_dest(as, ir, RSET_FPR) & 15);
-	if (irt_isnum(ir->t))
-	  emit_dnm(as, ARMI_VMOV_D_RR, RID_RETLO, RID_RETHI, dest);
-	else
-	  emit_dn(as, ARMI_VMOV_S_R, RID_RET, dest);
-      } else {
-	ra_destreg(as, ir, RID_FPRET);
-      }
-    } else if (hiop) {
-      ra_destpair(as, ir);
-    } else {
-      ra_destreg(as, ir, RID_RET);
-    }
-  }
-  UNUSED(ci);
-}
-
-static void asm_call(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX];
-  const CCallInfo *ci = &lj_ir_callinfo[ir->op2];
-  asm_collectargs(as, ir, ci, args);
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-static void asm_callx(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  CCallInfo ci;
-  IRRef func;
-  IRIns *irf;
-  ci.flags = asm_callx_flags(as, ir);
-  asm_collectargs(as, ir, &ci, args);
-  asm_setupresult(as, ir, &ci);
-  func = ir->op2; irf = IR(func);
-  if (irf->o == IR_CARG) { func = irf->op1; irf = IR(func); }
-  if (irref_isk(func)) {  /* Call to constant address. */
-    ci.func = (ASMFunction)(void *)(irf->i);
-  } else {  /* Need a non-argument register for indirect calls. */
-    Reg freg = ra_alloc1(as, func, RSET_RANGE(RID_R4, RID_R12+1));
-    emit_m(as, ARMI_BLXr, freg);
-    ci.func = (ASMFunction)(void *)0;
-  }
-  asm_gencall(as, &ci, args);
-}
-
-/* -- Returns ------------------------------------------------------------- */
-
-/* Return to lower frame. Guard that it goes to the right spot. */
-static void asm_retf(ASMState *as, IRIns *ir)
-{
-  Reg base = ra_alloc1(as, REF_BASE, RSET_GPR);
-  void *pc = ir_kptr(IR(ir->op2));
-  int32_t delta = 1+bc_a(*((const BCIns *)pc - 1));
-  as->topslot -= (BCReg)delta;
-  if ((int32_t)as->topslot < 0) as->topslot = 0;
-  irt_setmark(IR(REF_BASE)->t);  /* Children must not coalesce with BASE reg. */
-  /* Need to force a spill on REF_BASE now to update the stack slot. */
-  emit_lso(as, ARMI_STR, base, RID_SP, ra_spill(as, IR(REF_BASE)));
-  emit_setgl(as, base, jit_base);
-  emit_addptr(as, base, -8*delta);
-  asm_guardcc(as, CC_NE);
-  emit_nm(as, ARMI_CMP, RID_TMP,
-	  ra_allock(as, i32ptr(pc), rset_exclude(RSET_GPR, base)));
-  emit_lso(as, ARMI_LDR, RID_TMP, base, -4);
-}
-
-/* -- Type conversions ---------------------------------------------------- */
-
-#if !LJ_SOFTFP
-static void asm_tointg(ASMState *as, IRIns *ir, Reg left)
-{
-  Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, left));
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  asm_guardcc(as, CC_NE);
-  emit_d(as, ARMI_VMRS, 0);
-  emit_dm(as, ARMI_VCMP_D, (tmp & 15), (left & 15));
-  emit_dm(as, ARMI_VCVT_F64_S32, (tmp & 15), (tmp & 15));
-  emit_dn(as, ARMI_VMOV_R_S, dest, (tmp & 15));
-  emit_dm(as, ARMI_VCVT_S32_F64, (tmp & 15), (left & 15));
-}
-
-static void asm_tobit(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_FPR;
-  Reg left = ra_alloc1(as, ir->op1, allow);
-  Reg right = ra_alloc1(as, ir->op2, rset_clear(allow, left));
-  Reg tmp = ra_scratch(as, rset_clear(allow, right));
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  emit_dn(as, ARMI_VMOV_R_S, dest, (tmp & 15));
-  emit_dnm(as, ARMI_VADD_D, (tmp & 15), (left & 15), (right & 15));
-}
-#endif
-
-static void asm_conv(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)(ir->op2 & IRCONV_SRCMASK);
-#if !LJ_SOFTFP
-  int stfp = (st == IRT_NUM || st == IRT_FLOAT);
-#endif
-  IRRef lref = ir->op1;
-  /* 64 bit integer conversions are handled by SPLIT. */
-  lua_assert(!irt_isint64(ir->t) && !(st == IRT_I64 || st == IRT_U64));
-#if LJ_SOFTFP
-  /* FP conversions are handled by SPLIT. */
-  lua_assert(!irt_isfp(ir->t) && !(st == IRT_NUM || st == IRT_FLOAT));
-  /* Can't check for same types: SPLIT uses CONV int.int + BXOR for sfp NEG. */
-#else
-  lua_assert(irt_type(ir->t) != st);
-  if (irt_isfp(ir->t)) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    if (stfp) {  /* FP to FP conversion. */
-      emit_dm(as, st == IRT_NUM ? ARMI_VCVT_F32_F64 : ARMI_VCVT_F64_F32,
-	      (dest & 15), (ra_alloc1(as, lref, RSET_FPR) & 15));
-    } else {  /* Integer to FP conversion. */
-      Reg left = ra_alloc1(as, lref, RSET_GPR);
-      ARMIns ai = irt_isfloat(ir->t) ?
-	(st == IRT_INT ? ARMI_VCVT_F32_S32 : ARMI_VCVT_F32_U32) :
-	(st == IRT_INT ? ARMI_VCVT_F64_S32 : ARMI_VCVT_F64_U32);
-      emit_dm(as, ai, (dest & 15), (dest & 15));
-      emit_dn(as, ARMI_VMOV_S_R, left, (dest & 15));
-    }
-  } else if (stfp) {  /* FP to integer conversion. */
-    if (irt_isguard(ir->t)) {
-      /* Checked conversions are only supported from number to int. */
-      lua_assert(irt_isint(ir->t) && st == IRT_NUM);
-      asm_tointg(as, ir, ra_alloc1(as, lref, RSET_FPR));
-    } else {
-      Reg left = ra_alloc1(as, lref, RSET_FPR);
-      Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, left));
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      ARMIns ai;
-      emit_dn(as, ARMI_VMOV_R_S, dest, (tmp & 15));
-      ai = irt_isint(ir->t) ?
-	(st == IRT_NUM ? ARMI_VCVT_S32_F64 : ARMI_VCVT_S32_F32) :
-	(st == IRT_NUM ? ARMI_VCVT_U32_F64 : ARMI_VCVT_U32_F32);
-      emit_dm(as, ai, (tmp & 15), (left & 15));
-    }
-  } else
-#endif
-  {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    if (st >= IRT_I8 && st <= IRT_U16) {  /* Extend to 32 bit integer. */
-      Reg left = ra_alloc1(as, lref, RSET_GPR);
-      lua_assert(irt_isint(ir->t) || irt_isu32(ir->t));
-      if ((as->flags & JIT_F_ARMV6)) {
-	ARMIns ai = st == IRT_I8 ? ARMI_SXTB :
-		    st == IRT_U8 ? ARMI_UXTB :
-		    st == IRT_I16 ? ARMI_SXTH : ARMI_UXTH;
-	emit_dm(as, ai, dest, left);
-      } else if (st == IRT_U8) {
-	emit_dn(as, ARMI_AND|ARMI_K12|255, dest, left);
-      } else {
-	uint32_t shift = st == IRT_I8 ? 24 : 16;
-	ARMShift sh = st == IRT_U16 ? ARMSH_LSR : ARMSH_ASR;
-	emit_dm(as, ARMI_MOV|ARMF_SH(sh, shift), dest, RID_TMP);
-	emit_dm(as, ARMI_MOV|ARMF_SH(ARMSH_LSL, shift), RID_TMP, left);
-      }
-    } else {  /* Handle 32/32 bit no-op (cast). */
-      ra_leftov(as, dest, lref);  /* Do nothing, but may need to move regs. */
-    }
-  }
-}
-
-#if !LJ_SOFTFP && LJ_HASFFI
-static void asm_conv64(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)((ir-1)->op2 & IRCONV_SRCMASK);
-  IRType dt = (((ir-1)->op2 & IRCONV_DSTMASK) >> IRCONV_DSH);
-  IRCallID id;
-  CCallInfo ci;
-  IRRef args[2];
-  args[0] = (ir-1)->op1;
-  args[1] = ir->op1;
-  if (st == IRT_NUM || st == IRT_FLOAT) {
-    id = IRCALL_fp64_d2l + ((st == IRT_FLOAT) ? 2 : 0) + (dt - IRT_I64);
-    ir--;
-  } else {
-    id = IRCALL_fp64_l2d + ((dt == IRT_FLOAT) ? 2 : 0) + (st - IRT_I64);
-  }
-  ci = lj_ir_callinfo[id];
-#if !LJ_ABI_SOFTFP
-  ci.flags |= CCI_VARARG;  /* These calls don't use the hard-float ABI! */
-#endif
-  asm_setupresult(as, ir, &ci);
-  asm_gencall(as, &ci, args);
-}
-#endif
-
-static void asm_strto(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_strscan_num];
-  IRRef args[2];
-  Reg rlo = 0, rhi = 0, tmp;
-  int destused = ra_used(ir);
-  int32_t ofs = 0;
-  ra_evictset(as, RSET_SCRATCH);
-#if LJ_SOFTFP
-  if (destused) {
-    if (ra_hasspill(ir->s) && ra_hasspill((ir+1)->s) &&
-	(ir->s & 1) == 0 && ir->s + 1 == (ir+1)->s) {
-      int i;
-      for (i = 0; i < 2; i++) {
-	Reg r = (ir+i)->r;
-	if (ra_hasreg(r)) {
-	  ra_free(as, r);
-	  ra_modified(as, r);
-	  emit_spload(as, ir+i, r, sps_scale((ir+i)->s));
-	}
-      }
-      ofs = sps_scale(ir->s);
-      destused = 0;
-    } else {
-      rhi = ra_dest(as, ir+1, RSET_GPR);
-      rlo = ra_dest(as, ir, rset_exclude(RSET_GPR, rhi));
-    }
-  }
-  asm_guardcc(as, CC_EQ);
-  if (destused) {
-    emit_lso(as, ARMI_LDR, rhi, RID_SP, 4);
-    emit_lso(as, ARMI_LDR, rlo, RID_SP, 0);
-  }
-#else
-  UNUSED(rhi);
-  if (destused) {
-    if (ra_hasspill(ir->s)) {
-      ofs = sps_scale(ir->s);
-      destused = 0;
-      if (ra_hasreg(ir->r)) {
-	ra_free(as, ir->r);
-	ra_modified(as, ir->r);
-	emit_spload(as, ir, ir->r, ofs);
-      }
-    } else {
-      rlo = ra_dest(as, ir, RSET_FPR);
-    }
-  }
-  asm_guardcc(as, CC_EQ);
-  if (destused)
-    emit_vlso(as, ARMI_VLDR_D, rlo, RID_SP, 0);
-#endif
-  emit_n(as, ARMI_CMP|ARMI_K12|0, RID_RET);  /* Test return status. */
-  args[0] = ir->op1;      /* GCstr *str */
-  args[1] = ASMREF_TMP1;  /* TValue *n  */
-  asm_gencall(as, ci, args);
-  tmp = ra_releasetmp(as, ASMREF_TMP1);
-  if (ofs == 0)
-    emit_dm(as, ARMI_MOV, tmp, RID_SP);
-  else
-    emit_opk(as, ARMI_ADD, tmp, RID_SP, ofs, RSET_GPR);
-}
-
-/* Get pointer to TValue. */
-static void asm_tvptr(ASMState *as, Reg dest, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (irt_isnum(ir->t)) {
-    if (irref_isk(ref)) {
-      /* Use the number constant itself as a TValue. */
-      ra_allockreg(as, i32ptr(ir_knum(ir)), dest);
-    } else {
-#if LJ_SOFTFP
-      lua_assert(0);
-#else
-      /* Otherwise force a spill and use the spill slot. */
-      emit_opk(as, ARMI_ADD, dest, RID_SP, ra_spill(as, ir), RSET_GPR);
-#endif
-    }
-  } else {
-    /* Otherwise use [sp] and [sp+4] to hold the TValue. */
-    RegSet allow = rset_exclude(RSET_GPR, dest);
-    Reg type;
-    emit_dm(as, ARMI_MOV, dest, RID_SP);
-    if (!irt_ispri(ir->t)) {
-      Reg src = ra_alloc1(as, ref, allow);
-      emit_lso(as, ARMI_STR, src, RID_SP, 0);
-    }
-    if ((ir+1)->o == IR_HIOP)
-      type = ra_alloc1(as, ref+1, allow);
-    else
-      type = ra_allock(as, irt_toitype(ir->t), allow);
-    emit_lso(as, ARMI_STR, type, RID_SP, 4);
-  }
-}
-
-static void asm_tostr(ASMState *as, IRIns *ir)
-{
-  IRRef args[2];
-  args[0] = ASMREF_L;
-  as->gcsteps++;
-  if (irt_isnum(IR(ir->op1)->t) || (ir+1)->o == IR_HIOP) {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromnum];
-    args[1] = ASMREF_TMP1;  /* const lua_Number * */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-    asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op1);
-  } else {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromint];
-    args[1] = ir->op1;  /* int32_t k */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-  }
-}
-
-/* -- Memory references --------------------------------------------------- */
-
-static void asm_aref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg idx, base;
-  if (irref_isk(ir->op2)) {
-    IRRef tab = IR(ir->op1)->op1;
-    int32_t ofs = asm_fuseabase(as, tab);
-    IRRef refa = ofs ? tab : ir->op1;
-    uint32_t k = emit_isk12(ARMI_ADD, ofs + 8*IR(ir->op2)->i);
-    if (k) {
-      base = ra_alloc1(as, refa, RSET_GPR);
-      emit_dn(as, ARMI_ADD^k, dest, base);
-      return;
-    }
-  }
-  base = ra_alloc1(as, ir->op1, RSET_GPR);
-  idx = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, base));
-  emit_dnm(as, ARMI_ADD|ARMF_SH(ARMSH_LSL, 3), dest, base, idx);
-}
-
-/* Inlined hash lookup. Specialized for key type and for const keys.
-** The equivalent C code is:
-**   Node *n = hashkey(t, key);
-**   do {
-**     if (lj_obj_equal(&n->key, key)) return &n->val;
-**   } while ((n = nextnode(n)));
-**   return niltv(L);
-*/
-static void asm_href(ASMState *as, IRIns *ir, IROp merge)
-{
-  RegSet allow = RSET_GPR;
-  int destused = ra_used(ir);
-  Reg dest = ra_dest(as, ir, allow);
-  Reg tab = ra_alloc1(as, ir->op1, rset_clear(allow, dest));
-  Reg key = 0, keyhi = 0, keynumhi = RID_NONE, tmp = RID_TMP;
-  IRRef refkey = ir->op2;
-  IRIns *irkey = IR(refkey);
-  IRType1 kt = irkey->t;
-  int32_t k = 0, khi = emit_isk12(ARMI_CMP, irt_toitype(kt));
-  uint32_t khash;
-  MCLabel l_end, l_loop;
-  rset_clear(allow, tab);
-  if (!irref_isk(refkey) || irt_isstr(kt)) {
-#if LJ_SOFTFP
-    key = ra_alloc1(as, refkey, allow);
-    rset_clear(allow, key);
-    if (irkey[1].o == IR_HIOP) {
-      if (ra_hasreg((irkey+1)->r)) {
-	keynumhi = (irkey+1)->r;
-	keyhi = RID_TMP;
-	ra_noweak(as, keynumhi);
-      } else {
-	keyhi = keynumhi = ra_allocref(as, refkey+1, allow);
-      }
-      rset_clear(allow, keynumhi);
-      khi = 0;
-    }
-#else
-    if (irt_isnum(kt)) {
-      key = ra_scratch(as, allow);
-      rset_clear(allow, key);
-      keyhi = keynumhi = ra_scratch(as, allow);
-      rset_clear(allow, keyhi);
-      khi = 0;
-    } else {
-      key = ra_alloc1(as, refkey, allow);
-      rset_clear(allow, key);
-    }
-#endif
-  } else if (irt_isnum(kt)) {
-    int32_t val = (int32_t)ir_knum(irkey)->u32.lo;
-    k = emit_isk12(ARMI_CMP, val);
-    if (!k) {
-      key = ra_allock(as, val, allow);
-      rset_clear(allow, key);
-    }
-    val = (int32_t)ir_knum(irkey)->u32.hi;
-    khi = emit_isk12(ARMI_CMP, val);
-    if (!khi) {
-      keyhi = ra_allock(as, val, allow);
-      rset_clear(allow, keyhi);
-    }
-  } else if (!irt_ispri(kt)) {
-    k = emit_isk12(ARMI_CMP, irkey->i);
-    if (!k) {
-      key = ra_alloc1(as, refkey, allow);
-      rset_clear(allow, key);
-    }
-  }
-  if (!irt_ispri(kt))
-    tmp = ra_scratchpair(as, allow);
-
-  /* Key not found in chain: jump to exit (if merged) or load niltv. */
-  l_end = emit_label(as);
-  as->invmcp = NULL;
-  if (merge == IR_NE)
-    asm_guardcc(as, CC_AL);
-  else if (destused)
-    emit_loada(as, dest, niltvg(J2G(as->J)));
-
-  /* Follow hash chain until the end. */
-  l_loop = --as->mcp;
-  emit_n(as, ARMI_CMP|ARMI_K12|0, dest);
-  emit_lso(as, ARMI_LDR, dest, dest, (int32_t)offsetof(Node, next));
-
-  /* Type and value comparison. */
-  if (merge == IR_EQ)
-    asm_guardcc(as, CC_EQ);
-  else
-    emit_branch(as, ARMF_CC(ARMI_B, CC_EQ), l_end);
-  if (!irt_ispri(kt)) {
-    emit_nm(as, ARMF_CC(ARMI_CMP, CC_EQ)^k, tmp, key);
-    emit_nm(as, ARMI_CMP^khi, tmp+1, keyhi);
-    emit_lsox(as, ARMI_LDRD, tmp, dest, (int32_t)offsetof(Node, key));
-  } else {
-    emit_n(as, ARMI_CMP^khi, tmp);
-    emit_lso(as, ARMI_LDR, tmp, dest, (int32_t)offsetof(Node, key.it));
-  }
-  *l_loop = ARMF_CC(ARMI_B, CC_NE) | ((as->mcp-l_loop-2) & 0x00ffffffu);
-
-  /* Load main position relative to tab->node into dest. */
-  khash = irref_isk(refkey) ? ir_khash(irkey) : 1;
-  if (khash == 0) {
-    emit_lso(as, ARMI_LDR, dest, tab, (int32_t)offsetof(GCtab, node));
-  } else {
-    emit_dnm(as, ARMI_ADD|ARMF_SH(ARMSH_LSL, 3), dest, dest, tmp);
-    emit_dnm(as, ARMI_ADD|ARMF_SH(ARMSH_LSL, 1), tmp, tmp, tmp);
-    if (irt_isstr(kt)) {  /* Fetch of str->hash is cheaper than ra_allock. */
-      emit_dnm(as, ARMI_AND, tmp, tmp+1, RID_TMP);
-      emit_lso(as, ARMI_LDR, dest, tab, (int32_t)offsetof(GCtab, node));
-      emit_lso(as, ARMI_LDR, tmp+1, key, (int32_t)offsetof(GCstr, hash));
-      emit_lso(as, ARMI_LDR, RID_TMP, tab, (int32_t)offsetof(GCtab, hmask));
-    } else if (irref_isk(refkey)) {
-      emit_opk(as, ARMI_AND, tmp, RID_TMP, (int32_t)khash,
-	       rset_exclude(rset_exclude(RSET_GPR, tab), dest));
-      emit_lso(as, ARMI_LDR, dest, tab, (int32_t)offsetof(GCtab, node));
-      emit_lso(as, ARMI_LDR, RID_TMP, tab, (int32_t)offsetof(GCtab, hmask));
-    } else {  /* Must match with hash*() in lj_tab.c. */
-      if (ra_hasreg(keynumhi)) {  /* Canonicalize +-0.0 to 0.0. */
-	if (keyhi == RID_TMP)
-	  emit_dm(as, ARMF_CC(ARMI_MOV, CC_NE), keyhi, keynumhi);
-	emit_d(as, ARMF_CC(ARMI_MOV, CC_EQ)|ARMI_K12|0, keyhi);
-      }
-      emit_dnm(as, ARMI_AND, tmp, tmp, RID_TMP);
-      emit_dnm(as, ARMI_SUB|ARMF_SH(ARMSH_ROR, 32-HASH_ROT3), tmp, tmp, tmp+1);
-      emit_lso(as, ARMI_LDR, dest, tab, (int32_t)offsetof(GCtab, node));
-      emit_dnm(as, ARMI_EOR|ARMF_SH(ARMSH_ROR, 32-((HASH_ROT2+HASH_ROT1)&31)),
-	       tmp, tmp+1, tmp);
-      emit_lso(as, ARMI_LDR, RID_TMP, tab, (int32_t)offsetof(GCtab, hmask));
-      emit_dnm(as, ARMI_SUB|ARMF_SH(ARMSH_ROR, 32-HASH_ROT1), tmp+1, tmp+1, tmp);
-      if (ra_hasreg(keynumhi)) {
-	emit_dnm(as, ARMI_EOR, tmp+1, tmp, key);
-	emit_dnm(as, ARMI_ORR|ARMI_S, RID_TMP, tmp, key);  /* Test for +-0.0. */
-	emit_dnm(as, ARMI_ADD, tmp, keynumhi, keynumhi);
-#if !LJ_SOFTFP
-	emit_dnm(as, ARMI_VMOV_RR_D, key, keynumhi,
-		 (ra_alloc1(as, refkey, RSET_FPR) & 15));
-#endif
-      } else {
-	emit_dnm(as, ARMI_EOR, tmp+1, tmp, key);
-	emit_opk(as, ARMI_ADD, tmp, key, (int32_t)HASH_BIAS,
-		 rset_exclude(rset_exclude(RSET_GPR, tab), key));
-      }
-    }
-  }
-}
-
-static void asm_hrefk(ASMState *as, IRIns *ir)
-{
-  IRIns *kslot = IR(ir->op2);
-  IRIns *irkey = IR(kslot->op1);
-  int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node));
-  int32_t kofs = ofs + (int32_t)offsetof(Node, key);
-  Reg dest = (ra_used(ir) || ofs > 4095) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
-  Reg node = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg key = RID_NONE, type = RID_TMP, idx = node;
-  RegSet allow = rset_exclude(RSET_GPR, node);
-  lua_assert(ofs % sizeof(Node) == 0);
-  if (ofs > 4095) {
-    idx = dest;
-    rset_clear(allow, dest);
-    kofs = (int32_t)offsetof(Node, key);
-  } else if (ra_hasreg(dest)) {
-    emit_opk(as, ARMI_ADD, dest, node, ofs, allow);
-  }
-  asm_guardcc(as, CC_NE);
-  if (!irt_ispri(irkey->t)) {
-    RegSet even = (as->freeset & allow);
-    even = even & (even >> 1) & RSET_GPREVEN;
-    if (even) {
-      key = ra_scratch(as, even);
-      if (rset_test(as->freeset, key+1)) {
-	type = key+1;
-	ra_modified(as, type);
-      }
-    } else {
-      key = ra_scratch(as, allow);
-    }
-    rset_clear(allow, key);
-  }
-  rset_clear(allow, type);
-  if (irt_isnum(irkey->t)) {
-    emit_opk(as, ARMF_CC(ARMI_CMP, CC_EQ), 0, type,
-	     (int32_t)ir_knum(irkey)->u32.hi, allow);
-    emit_opk(as, ARMI_CMP, 0, key,
-	     (int32_t)ir_knum(irkey)->u32.lo, allow);
-  } else {
-    if (ra_hasreg(key))
-      emit_opk(as, ARMF_CC(ARMI_CMP, CC_EQ), 0, key, irkey->i, allow);
-    emit_n(as, ARMI_CMN|ARMI_K12|-irt_toitype(irkey->t), type);
-  }
-  emit_lso(as, ARMI_LDR, type, idx, kofs+4);
-  if (ra_hasreg(key)) emit_lso(as, ARMI_LDR, key, idx, kofs);
-  if (ofs > 4095)
-    emit_opk(as, ARMI_ADD, dest, node, ofs, RSET_GPR);
-}
-
-static void asm_newref(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
-  IRRef args[3];
-  if (ir->r == RID_SINK)
-    return;
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ir->op1;      /* GCtab *t     */
-  args[2] = ASMREF_TMP1;  /* cTValue *key */
-  asm_setupresult(as, ir, ci);  /* TValue * */
-  asm_gencall(as, ci, args);
-  asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2);
-}
-
-static void asm_uref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op1)) {
-    GCfunc *fn = ir_kfunc(IR(ir->op1));
-    MRef *v = &gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.v;
-    emit_lsptr(as, ARMI_LDR, dest, v);
-  } else {
-    Reg uv = ra_scratch(as, RSET_GPR);
-    Reg func = ra_alloc1(as, ir->op1, RSET_GPR);
-    if (ir->o == IR_UREFC) {
-      asm_guardcc(as, CC_NE);
-      emit_n(as, ARMI_CMP|ARMI_K12|1, RID_TMP);
-      emit_opk(as, ARMI_ADD, dest, uv,
-	       (int32_t)offsetof(GCupval, tv), RSET_GPR);
-      emit_lso(as, ARMI_LDRB, RID_TMP, uv, (int32_t)offsetof(GCupval, closed));
-    } else {
-      emit_lso(as, ARMI_LDR, dest, uv, (int32_t)offsetof(GCupval, v));
-    }
-    emit_lso(as, ARMI_LDR, uv, func,
-	     (int32_t)offsetof(GCfuncL, uvptr) + 4*(int32_t)(ir->op2 >> 8));
-  }
-}
-
-static void asm_fref(ASMState *as, IRIns *ir)
-{
-  UNUSED(as); UNUSED(ir);
-  lua_assert(!ra_used(ir));
-}
-
-static void asm_strref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  IRRef ref = ir->op2, refk = ir->op1;
-  Reg r;
-  if (irref_isk(ref)) {
-    IRRef tmp = refk; refk = ref; ref = tmp;
-  } else if (!irref_isk(refk)) {
-    uint32_t k, m = ARMI_K12|sizeof(GCstr);
-    Reg right, left = ra_alloc1(as, ir->op1, RSET_GPR);
-    IRIns *irr = IR(ir->op2);
-    if (ra_hasreg(irr->r)) {
-      ra_noweak(as, irr->r);
-      right = irr->r;
-    } else if (mayfuse(as, irr->op2) &&
-	       irr->o == IR_ADD && irref_isk(irr->op2) &&
-	       (k = emit_isk12(ARMI_ADD,
-			       (int32_t)sizeof(GCstr) + IR(irr->op2)->i))) {
-      m = k;
-      right = ra_alloc1(as, irr->op1, rset_exclude(RSET_GPR, left));
-    } else {
-      right = ra_allocref(as, ir->op2, rset_exclude(RSET_GPR, left));
-    }
-    emit_dn(as, ARMI_ADD^m, dest, dest);
-    emit_dnm(as, ARMI_ADD, dest, left, right);
-    return;
-  }
-  r = ra_alloc1(as, ref, RSET_GPR);
-  emit_opk(as, ARMI_ADD, dest, r,
-	   sizeof(GCstr) + IR(refk)->i, rset_exclude(RSET_GPR, r));
-}
-
-/* -- Loads and stores ---------------------------------------------------- */
-
-static ARMIns asm_fxloadins(IRIns *ir)
-{
-  switch (irt_type(ir->t)) {
-  case IRT_I8: return ARMI_LDRSB;
-  case IRT_U8: return ARMI_LDRB;
-  case IRT_I16: return ARMI_LDRSH;
-  case IRT_U16: return ARMI_LDRH;
-  case IRT_NUM: lua_assert(!LJ_SOFTFP); return ARMI_VLDR_D;
-  case IRT_FLOAT: if (!LJ_SOFTFP) return ARMI_VLDR_S;
-  default: return ARMI_LDR;
-  }
-}
-
-static ARMIns asm_fxstoreins(IRIns *ir)
-{
-  switch (irt_type(ir->t)) {
-  case IRT_I8: case IRT_U8: return ARMI_STRB;
-  case IRT_I16: case IRT_U16: return ARMI_STRH;
-  case IRT_NUM: lua_assert(!LJ_SOFTFP); return ARMI_VSTR_D;
-  case IRT_FLOAT: if (!LJ_SOFTFP) return ARMI_VSTR_S;
-  default: return ARMI_STR;
-  }
-}
-
-static void asm_fload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg idx = ra_alloc1(as, ir->op1, RSET_GPR);
-  ARMIns ai = asm_fxloadins(ir);
-  int32_t ofs;
-  if (ir->op2 == IRFL_TAB_ARRAY) {
-    ofs = asm_fuseabase(as, ir->op1);
-    if (ofs) {  /* Turn the t->array load into an add for colocated arrays. */
-      emit_dn(as, ARMI_ADD|ARMI_K12|ofs, dest, idx);
-      return;
-    }
-  }
-  ofs = field_ofs[ir->op2];
-  if ((ai & 0x04000000))
-    emit_lso(as, ai, dest, idx, ofs);
-  else
-    emit_lsox(as, ai, dest, idx, ofs);
-}
-
-static void asm_fstore(ASMState *as, IRIns *ir)
-{
-  if (ir->r != RID_SINK) {
-    Reg src = ra_alloc1(as, ir->op2, RSET_GPR);
-    IRIns *irf = IR(ir->op1);
-    Reg idx = ra_alloc1(as, irf->op1, rset_exclude(RSET_GPR, src));
-    int32_t ofs = field_ofs[irf->op2];
-    ARMIns ai = asm_fxstoreins(ir);
-    if ((ai & 0x04000000))
-      emit_lso(as, ai, src, idx, ofs);
-    else
-      emit_lsox(as, ai, src, idx, ofs);
-  }
-}
-
-static void asm_xload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir,
-		     (!LJ_SOFTFP && irt_isfp(ir->t)) ? RSET_FPR : RSET_GPR);
-  lua_assert(!(ir->op2 & IRXLOAD_UNALIGNED));
-  asm_fusexref(as, asm_fxloadins(ir), dest, ir->op1, RSET_GPR, 0);
-}
-
-static void asm_xstore(ASMState *as, IRIns *ir, int32_t ofs)
-{
-  if (ir->r != RID_SINK) {
-    Reg src = ra_alloc1(as, ir->op2,
-			(!LJ_SOFTFP && irt_isfp(ir->t)) ? RSET_FPR : RSET_GPR);
-    asm_fusexref(as, asm_fxstoreins(ir), src, ir->op1,
-		 rset_exclude(RSET_GPR, src), ofs);
-  }
-}
-
-static void asm_ahuvload(ASMState *as, IRIns *ir)
-{
-  int hiop = (LJ_SOFTFP && (ir+1)->o == IR_HIOP);
-  IRType t = hiop ? IRT_NUM : irt_type(ir->t);
-  Reg dest = RID_NONE, type = RID_NONE, idx;
-  RegSet allow = RSET_GPR;
-  int32_t ofs = 0;
-  if (hiop && ra_used(ir+1)) {
-    type = ra_dest(as, ir+1, allow);
-    rset_clear(allow, type);
-  }
-  if (ra_used(ir)) {
-    lua_assert((LJ_SOFTFP ? 0 : irt_isnum(ir->t)) ||
-	       irt_isint(ir->t) || irt_isaddr(ir->t));
-    dest = ra_dest(as, ir, (!LJ_SOFTFP && t == IRT_NUM) ? RSET_FPR : allow);
-    rset_clear(allow, dest);
-  }
-  idx = asm_fuseahuref(as, ir->op1, &ofs, allow,
-		       (!LJ_SOFTFP && t == IRT_NUM) ? 1024 : 4096);
-  if (!hiop || type == RID_NONE) {
-    rset_clear(allow, idx);
-    if (ofs < 256 && ra_hasreg(dest) && (dest & 1) == 0 &&
-	rset_test((as->freeset & allow), dest+1)) {
-      type = dest+1;
-      ra_modified(as, type);
-    } else {
-      type = RID_TMP;
-    }
-  }
-  asm_guardcc(as, t == IRT_NUM ? CC_HS : CC_NE);
-  emit_n(as, ARMI_CMN|ARMI_K12|-irt_toitype_(t), type);
-  if (ra_hasreg(dest)) {
-#if !LJ_SOFTFP
-    if (t == IRT_NUM)
-      emit_vlso(as, ARMI_VLDR_D, dest, idx, ofs);
-    else
-#endif
-      emit_lso(as, ARMI_LDR, dest, idx, ofs);
-  }
-  emit_lso(as, ARMI_LDR, type, idx, ofs+4);
-}
-
-static void asm_ahustore(ASMState *as, IRIns *ir)
-{
-  if (ir->r != RID_SINK) {
-    RegSet allow = RSET_GPR;
-    Reg idx, src = RID_NONE, type = RID_NONE;
-    int32_t ofs = 0;
-#if !LJ_SOFTFP
-    if (irt_isnum(ir->t)) {
-      src = ra_alloc1(as, ir->op2, RSET_FPR);
-      idx = asm_fuseahuref(as, ir->op1, &ofs, allow, 1024);
-      emit_vlso(as, ARMI_VSTR_D, src, idx, ofs);
-    } else
-#endif
-    {
-      int hiop = (LJ_SOFTFP && (ir+1)->o == IR_HIOP);
-      if (!irt_ispri(ir->t)) {
-	src = ra_alloc1(as, ir->op2, allow);
-	rset_clear(allow, src);
-      }
-      if (hiop)
-	type = ra_alloc1(as, (ir+1)->op2, allow);
-      else
-	type = ra_allock(as, (int32_t)irt_toitype(ir->t), allow);
-      idx = asm_fuseahuref(as, ir->op1, &ofs, rset_exclude(allow, type), 4096);
-      if (ra_hasreg(src)) emit_lso(as, ARMI_STR, src, idx, ofs);
-      emit_lso(as, ARMI_STR, type, idx, ofs+4);
-    }
-  }
-}
-
-static void asm_sload(ASMState *as, IRIns *ir)
-{
-  int32_t ofs = 8*((int32_t)ir->op1-1) + ((ir->op2 & IRSLOAD_FRAME) ? 4 : 0);
-  int hiop = (LJ_SOFTFP && (ir+1)->o == IR_HIOP);
-  IRType t = hiop ? IRT_NUM : irt_type(ir->t);
-  Reg dest = RID_NONE, type = RID_NONE, base;
-  RegSet allow = RSET_GPR;
-  lua_assert(!(ir->op2 & IRSLOAD_PARENT));  /* Handled by asm_head_side(). */
-  lua_assert(irt_isguard(ir->t) || !(ir->op2 & IRSLOAD_TYPECHECK));
-#if LJ_SOFTFP
-  lua_assert(!(ir->op2 & IRSLOAD_CONVERT));  /* Handled by LJ_SOFTFP SPLIT. */
-  if (hiop && ra_used(ir+1)) {
-    type = ra_dest(as, ir+1, allow);
-    rset_clear(allow, type);
-  }
-#else
-  if ((ir->op2 & IRSLOAD_CONVERT) && irt_isguard(ir->t) && t == IRT_INT) {
-    dest = ra_scratch(as, RSET_FPR);
-    asm_tointg(as, ir, dest);
-    t = IRT_NUM;  /* Continue with a regular number type check. */
-  } else
-#endif
-  if (ra_used(ir)) {
-    Reg tmp = RID_NONE;
-    if ((ir->op2 & IRSLOAD_CONVERT))
-      tmp = ra_scratch(as, t == IRT_INT ? RSET_FPR : RSET_GPR);
-    lua_assert((LJ_SOFTFP ? 0 : irt_isnum(ir->t)) ||
-	       irt_isint(ir->t) || irt_isaddr(ir->t));
-    dest = ra_dest(as, ir, (!LJ_SOFTFP && t == IRT_NUM) ? RSET_FPR : allow);
-    rset_clear(allow, dest);
-    base = ra_alloc1(as, REF_BASE, allow);
-    if ((ir->op2 & IRSLOAD_CONVERT)) {
-      if (t == IRT_INT) {
-	emit_dn(as, ARMI_VMOV_R_S, dest, (tmp & 15));
-	emit_dm(as, ARMI_VCVT_S32_F64, (tmp & 15), (tmp & 15));
-	t = IRT_NUM;  /* Check for original type. */
-      } else {
-	emit_dm(as, ARMI_VCVT_F64_S32, (dest & 15), (dest & 15));
-	emit_dn(as, ARMI_VMOV_S_R, tmp, (dest & 15));
-	t = IRT_INT;  /* Check for original type. */
-      }
-      dest = tmp;
-    }
-    goto dotypecheck;
-  }
-  base = ra_alloc1(as, REF_BASE, allow);
-dotypecheck:
-  rset_clear(allow, base);
-  if ((ir->op2 & IRSLOAD_TYPECHECK)) {
-    if (ra_noreg(type)) {
-      if (ofs < 256 && ra_hasreg(dest) && (dest & 1) == 0 &&
-	  rset_test((as->freeset & allow), dest+1)) {
-	type = dest+1;
-	ra_modified(as, type);
-      } else {
-	type = RID_TMP;
-      }
-    }
-    asm_guardcc(as, t == IRT_NUM ? CC_HS : CC_NE);
-    emit_n(as, ARMI_CMN|ARMI_K12|-irt_toitype_(t), type);
-  }
-  if (ra_hasreg(dest)) {
-#if !LJ_SOFTFP
-    if (t == IRT_NUM) {
-      if (ofs < 1024) {
-	emit_vlso(as, ARMI_VLDR_D, dest, base, ofs);
-      } else {
-	if (ra_hasreg(type)) emit_lso(as, ARMI_LDR, type, base, ofs+4);
-	emit_vlso(as, ARMI_VLDR_D, dest, RID_TMP, 0);
-	emit_opk(as, ARMI_ADD, RID_TMP, base, ofs, allow);
-	return;
-      }
-    } else
-#endif
-      emit_lso(as, ARMI_LDR, dest, base, ofs);
-  }
-  if (ra_hasreg(type)) emit_lso(as, ARMI_LDR, type, base, ofs+4);
-}
-
-/* -- Allocations --------------------------------------------------------- */
-
-#if LJ_HASFFI
-static void asm_cnew(ASMState *as, IRIns *ir)
-{
-  CTState *cts = ctype_ctsG(J2G(as->J));
-  CTypeID ctypeid = (CTypeID)IR(ir->op1)->i;
-  CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ?
-	      lj_ctype_size(cts, ctypeid) : (CTSize)IR(ir->op2)->i;
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco];
-  IRRef args[2];
-  RegSet allow = (RSET_GPR & ~RSET_SCRATCH);
-  RegSet drop = RSET_SCRATCH;
-  lua_assert(sz != CTSIZE_INVALID);
-
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ASMREF_TMP1;  /* MSize size   */
-  as->gcsteps++;
-
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);
-  if (ra_used(ir))
-    ra_destreg(as, ir, RID_RET);  /* GCcdata * */
-
-  /* Initialize immutable cdata object. */
-  if (ir->o == IR_CNEWI) {
-    int32_t ofs = sizeof(GCcdata);
-    lua_assert(sz == 4 || sz == 8);
-    if (sz == 8) {
-      ofs += 4; ir++;
-      lua_assert(ir->o == IR_HIOP);
-    }
-    for (;;) {
-      Reg r = ra_alloc1(as, ir->op2, allow);
-      emit_lso(as, ARMI_STR, r, RID_RET, ofs);
-      rset_clear(allow, r);
-      if (ofs == sizeof(GCcdata)) break;
-      ofs -= 4; ir--;
-    }
-  }
-  /* Initialize gct and ctypeid. lj_mem_newgco() already sets marked. */
-  {
-    uint32_t k = emit_isk12(ARMI_MOV, ctypeid);
-    Reg r = k ? RID_R1 : ra_allock(as, ctypeid, allow);
-    emit_lso(as, ARMI_STRB, RID_TMP, RID_RET, offsetof(GCcdata, gct));
-    emit_lsox(as, ARMI_STRH, r, RID_RET, offsetof(GCcdata, ctypeid));
-    emit_d(as, ARMI_MOV|ARMI_K12|~LJ_TCDATA, RID_TMP);
-    if (k) emit_d(as, ARMI_MOV^k, RID_R1);
-  }
-  asm_gencall(as, ci, args);
-  ra_allockreg(as, (int32_t)(sz+sizeof(GCcdata)),
-	       ra_releasetmp(as, ASMREF_TMP1));
-}
-#else
-#define asm_cnew(as, ir)	((void)0)
-#endif
-
-/* -- Write barriers ------------------------------------------------------ */
-
-static void asm_tbar(ASMState *as, IRIns *ir)
-{
-  Reg tab = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg link = ra_scratch(as, rset_exclude(RSET_GPR, tab));
-  Reg gr = ra_allock(as, i32ptr(J2G(as->J)),
-		     rset_exclude(rset_exclude(RSET_GPR, tab), link));
-  Reg mark = RID_TMP;
-  MCLabel l_end = emit_label(as);
-  emit_lso(as, ARMI_STR, link, tab, (int32_t)offsetof(GCtab, gclist));
-  emit_lso(as, ARMI_STRB, mark, tab, (int32_t)offsetof(GCtab, marked));
-  emit_lso(as, ARMI_STR, tab, gr,
-	   (int32_t)offsetof(global_State, gc.grayagain));
-  emit_dn(as, ARMI_BIC|ARMI_K12|LJ_GC_BLACK, mark, mark);
-  emit_lso(as, ARMI_LDR, link, gr,
-	   (int32_t)offsetof(global_State, gc.grayagain));
-  emit_branch(as, ARMF_CC(ARMI_B, CC_EQ), l_end);
-  emit_n(as, ARMI_TST|ARMI_K12|LJ_GC_BLACK, mark);
-  emit_lso(as, ARMI_LDRB, mark, tab, (int32_t)offsetof(GCtab, marked));
-}
-
-static void asm_obar(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_barrieruv];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg obj, val, tmp;
-  /* No need for other object barriers (yet). */
-  lua_assert(IR(ir->op1)->o == IR_UREFC);
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ir->op1;      /* TValue *tv      */
-  asm_gencall(as, ci, args);
-  if ((l_end[-1] >> 28) == CC_AL)
-    l_end[-1] = ARMF_CC(l_end[-1], CC_NE);
-  else
-    emit_branch(as, ARMF_CC(ARMI_B, CC_EQ), l_end);
-  ra_allockreg(as, i32ptr(J2G(as->J)), ra_releasetmp(as, ASMREF_TMP1));
-  obj = IR(ir->op1)->r;
-  tmp = ra_scratch(as, rset_exclude(RSET_GPR, obj));
-  emit_n(as, ARMF_CC(ARMI_TST, CC_NE)|ARMI_K12|LJ_GC_BLACK, tmp);
-  emit_n(as, ARMI_TST|ARMI_K12|LJ_GC_WHITES, RID_TMP);
-  val = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, obj));
-  emit_lso(as, ARMI_LDRB, tmp, obj,
-	   (int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv));
-  emit_lso(as, ARMI_LDRB, RID_TMP, val, (int32_t)offsetof(GChead, marked));
-}
-
-/* -- Arithmetic and logic operations ------------------------------------- */
-
-#if !LJ_SOFTFP
-static void asm_fparith(ASMState *as, IRIns *ir, ARMIns ai)
-{
-  Reg dest = ra_dest(as, ir, RSET_FPR);
-  Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-  right = (left >> 8); left &= 255;
-  emit_dnm(as, ai, (dest & 15), (left & 15), (right & 15));
-}
-
-static void asm_fpunary(ASMState *as, IRIns *ir, ARMIns ai)
-{
-  Reg dest = ra_dest(as, ir, RSET_FPR);
-  Reg left = ra_hintalloc(as, ir->op1, dest, RSET_FPR);
-  emit_dm(as, ai, (dest & 15), (left & 15));
-}
-
-static int asm_fpjoin_pow(ASMState *as, IRIns *ir)
-{
-  IRIns *irp = IR(ir->op1);
-  if (irp == ir-1 && irp->o == IR_MUL && !ra_used(irp)) {
-    IRIns *irpp = IR(irp->op1);
-    if (irpp == ir-2 && irpp->o == IR_FPMATH &&
-	irpp->op2 == IRFPM_LOG2 && !ra_used(irpp)) {
-      const CCallInfo *ci = &lj_ir_callinfo[IRCALL_pow];
-      IRRef args[2];
-      args[0] = irpp->op1;
-      args[1] = irp->op2;
-      asm_setupresult(as, ir, ci);
-      asm_gencall(as, ci, args);
-      return 1;
-    }
-  }
-  return 0;
-}
-#endif
-
-static int asm_swapops(ASMState *as, IRRef lref, IRRef rref)
-{
-  IRIns *ir;
-  if (irref_isk(rref))
-    return 0;  /* Don't swap constants to the left. */
-  if (irref_isk(lref))
-    return 1;  /* But swap constants to the right. */
-  ir = IR(rref);
-  if ((ir->o >= IR_BSHL && ir->o <= IR_BROR) ||
-      (ir->o == IR_ADD && ir->op1 == ir->op2))
-    return 0;  /* Don't swap fusable operands to the left. */
-  ir = IR(lref);
-  if ((ir->o >= IR_BSHL && ir->o <= IR_BROR) ||
-      (ir->o == IR_ADD && ir->op1 == ir->op2))
-    return 1;  /* But swap fusable operands to the right. */
-  return 0;  /* Otherwise don't swap. */
-}
-
-static void asm_intop(ASMState *as, IRIns *ir, ARMIns ai)
-{
-  IRRef lref = ir->op1, rref = ir->op2;
-  Reg left, dest = ra_dest(as, ir, RSET_GPR);
-  uint32_t m;
-  if (asm_swapops(as, lref, rref)) {
-    IRRef tmp = lref; lref = rref; rref = tmp;
-    if ((ai & ~ARMI_S) == ARMI_SUB || (ai & ~ARMI_S) == ARMI_SBC)
-      ai ^= (ARMI_SUB^ARMI_RSB);
-  }
-  left = ra_hintalloc(as, lref, dest, RSET_GPR);
-  m = asm_fuseopm(as, ai, rref, rset_exclude(RSET_GPR, left));
-  if (irt_isguard(ir->t)) {  /* For IR_ADDOV etc. */
-    asm_guardcc(as, CC_VS);
-    ai |= ARMI_S;
-  }
-  emit_dn(as, ai^m, dest, left);
-}
-
-static void asm_intop_s(ASMState *as, IRIns *ir, ARMIns ai)
-{
-  if (as->flagmcp == as->mcp) {  /* Drop cmp r, #0. */
-    as->flagmcp = NULL;
-    as->mcp++;
-    ai |= ARMI_S;
-  }
-  asm_intop(as, ir, ai);
-}
-
-static void asm_bitop(ASMState *as, IRIns *ir, ARMIns ai)
-{
-  if (as->flagmcp == as->mcp) {  /* Try to drop cmp r, #0. */
-    uint32_t cc = (as->mcp[1] >> 28);
-    as->flagmcp = NULL;
-    if (cc <= CC_NE) {
-      as->mcp++;
-      ai |= ARMI_S;
-    } else if (cc == CC_GE) {
-      *++as->mcp ^= ((CC_GE^CC_PL) << 28);
-      ai |= ARMI_S;
-    } else if (cc == CC_LT) {
-      *++as->mcp ^= ((CC_LT^CC_MI) << 28);
-      ai |= ARMI_S;
-    }  /* else: other conds don't work with bit ops. */
-  }
-  if (ir->op2 == 0) {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    uint32_t m = asm_fuseopm(as, ai, ir->op1, RSET_GPR);
-    emit_d(as, ai^m, dest);
-  } else {
-    /* NYI: Turn BAND !k12 into uxtb, uxth or bfc or shl+shr. */
-    asm_intop(as, ir, ai);
-  }
-}
-
-static void asm_intneg(ASMState *as, IRIns *ir, ARMIns ai)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-  emit_dn(as, ai|ARMI_K12|0, dest, left);
-}
-
-/* NYI: use add/shift for MUL(OV) with constants. FOLD only does 2^k. */
-static void asm_intmul(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, rset_exclude(RSET_GPR, dest));
-  Reg right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  Reg tmp = RID_NONE;
-  /* ARMv5 restriction: dest != left and dest_hi != left. */
-  if (dest == left && left != right) { left = right; right = dest; }
-  if (irt_isguard(ir->t)) {  /* IR_MULOV */
-    if (!(as->flags & JIT_F_ARMV6) && dest == left)
-      tmp = left = ra_scratch(as, rset_exclude(RSET_GPR, left));
-    asm_guardcc(as, CC_NE);
-    emit_nm(as, ARMI_TEQ|ARMF_SH(ARMSH_ASR, 31), RID_TMP, dest);
-    emit_dnm(as, ARMI_SMULL|ARMF_S(right), dest, RID_TMP, left);
-  } else {
-    if (!(as->flags & JIT_F_ARMV6) && dest == left) tmp = left = RID_TMP;
-    emit_nm(as, ARMI_MUL|ARMF_S(right), dest, left);
-  }
-  /* Only need this for the dest == left == right case. */
-  if (ra_hasreg(tmp)) emit_dm(as, ARMI_MOV, tmp, right);
-}
-
-static void asm_add(ASMState *as, IRIns *ir)
-{
-#if !LJ_SOFTFP
-  if (irt_isnum(ir->t)) {
-    if (!asm_fusemadd(as, ir, ARMI_VMLA_D, ARMI_VMLA_D))
-      asm_fparith(as, ir, ARMI_VADD_D);
-    return;
-  }
-#endif
-  asm_intop_s(as, ir, ARMI_ADD);
-}
-
-static void asm_sub(ASMState *as, IRIns *ir)
-{
-#if !LJ_SOFTFP
-  if (irt_isnum(ir->t)) {
-    if (!asm_fusemadd(as, ir, ARMI_VNMLS_D, ARMI_VMLS_D))
-      asm_fparith(as, ir, ARMI_VSUB_D);
-    return;
-  }
-#endif
-  asm_intop_s(as, ir, ARMI_SUB);
-}
-
-static void asm_mul(ASMState *as, IRIns *ir)
-{
-#if !LJ_SOFTFP
-  if (irt_isnum(ir->t)) {
-    asm_fparith(as, ir, ARMI_VMUL_D);
-    return;
-  }
-#endif
-  asm_intmul(as, ir);
-}
-
-static void asm_neg(ASMState *as, IRIns *ir)
-{
-#if !LJ_SOFTFP
-  if (irt_isnum(ir->t)) {
-    asm_fpunary(as, ir, ARMI_VNEG_D);
-    return;
-  }
-#endif
-  asm_intneg(as, ir, ARMI_RSB);
-}
-
-static void asm_callid(ASMState *as, IRIns *ir, IRCallID id)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[id];
-  IRRef args[2];
-  args[0] = ir->op1;
-  args[1] = ir->op2;
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-#if !LJ_SOFTFP
-static void asm_callround(ASMState *as, IRIns *ir, int id)
-{
-  /* The modified regs must match with the *.dasc implementation. */
-  RegSet drop = RID2RSET(RID_R0)|RID2RSET(RID_R1)|RID2RSET(RID_R2)|
-		RID2RSET(RID_R3)|RID2RSET(RID_R12);
-  RegSet of;
-  Reg dest, src;
-  ra_evictset(as, drop);
-  dest = ra_dest(as, ir, RSET_FPR);
-  emit_dnm(as, ARMI_VMOV_D_RR, RID_RETLO, RID_RETHI, (dest & 15));
-  emit_call(as, id == IRFPM_FLOOR ? (void *)lj_vm_floor_sf :
-		id == IRFPM_CEIL ? (void *)lj_vm_ceil_sf :
-				   (void *)lj_vm_trunc_sf);
-  /* Workaround to protect argument GPRs from being used for remat. */
-  of = as->freeset;
-  as->freeset &= ~RSET_RANGE(RID_R0, RID_R1+1);
-  as->cost[RID_R0] = as->cost[RID_R1] = REGCOST(~0u, ASMREF_L);
-  src = ra_alloc1(as, ir->op1, RSET_FPR);  /* May alloc GPR to remat FPR. */
-  as->freeset |= (of & RSET_RANGE(RID_R0, RID_R1+1));
-  emit_dnm(as, ARMI_VMOV_RR_D, RID_R0, RID_R1, (src & 15));
-}
-#endif
-
-static void asm_bitswap(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-  if ((as->flags & JIT_F_ARMV6)) {
-    emit_dm(as, ARMI_REV, dest, left);
-  } else {
-    Reg tmp2 = dest;
-    if (tmp2 == left)
-      tmp2 = ra_scratch(as, rset_exclude(rset_exclude(RSET_GPR, dest), left));
-    emit_dnm(as, ARMI_EOR|ARMF_SH(ARMSH_LSR, 8), dest, tmp2, RID_TMP);
-    emit_dm(as, ARMI_MOV|ARMF_SH(ARMSH_ROR, 8), tmp2, left);
-    emit_dn(as, ARMI_BIC|ARMI_K12|256*8|255, RID_TMP, RID_TMP);
-    emit_dnm(as, ARMI_EOR|ARMF_SH(ARMSH_ROR, 16), RID_TMP, left, left);
-  }
-}
-
-static void asm_bitshift(ASMState *as, IRIns *ir, ARMShift sh)
-{
-  if (irref_isk(ir->op2)) {  /* Constant shifts. */
-    /* NYI: Turn SHL+SHR or BAND+SHR into uxtb, uxth or ubfx. */
-    /* NYI: Turn SHL+ASR into sxtb, sxth or sbfx. */
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-    int32_t shift = (IR(ir->op2)->i & 31);
-    emit_dm(as, ARMI_MOV|ARMF_SH(sh, shift), dest, left);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-    Reg right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-    emit_dm(as, ARMI_MOV|ARMF_RSH(sh, right), dest, left);
-  }
-}
-
-static void asm_intmin_max(ASMState *as, IRIns *ir, int cc)
-{
-  uint32_t kcmp = 0, kmov = 0;
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-  Reg right = 0;
-  if (irref_isk(ir->op2)) {
-    kcmp = emit_isk12(ARMI_CMP, IR(ir->op2)->i);
-    if (kcmp) kmov = emit_isk12(ARMI_MOV, IR(ir->op2)->i);
-  }
-  if (!kmov) {
-    kcmp = 0;
-    right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  }
-  if (kmov || dest != right) {
-    emit_dm(as, ARMF_CC(ARMI_MOV, cc)^kmov, dest, right);
-    cc ^= 1;  /* Must use opposite conditions for paired moves. */
-  } else {
-    cc ^= (CC_LT^CC_GT);  /* Otherwise may swap CC_LT <-> CC_GT. */
-  }
-  if (dest != left) emit_dm(as, ARMF_CC(ARMI_MOV, cc), dest, left);
-  emit_nm(as, ARMI_CMP^kcmp, left, right);
-}
-
-#if LJ_SOFTFP
-static void asm_sfpmin_max(ASMState *as, IRIns *ir, int cc)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_softfp_cmp];
-  RegSet drop = RSET_SCRATCH;
-  Reg r;
-  IRRef args[4];
-  args[0] = ir->op1; args[1] = (ir+1)->op1;
-  args[2] = ir->op2; args[3] = (ir+1)->op2;
-  /* __aeabi_cdcmple preserves r0-r3. */
-  if (ra_hasreg(ir->r)) rset_clear(drop, ir->r);
-  if (ra_hasreg((ir+1)->r)) rset_clear(drop, (ir+1)->r);
-  if (!rset_test(as->freeset, RID_R2) &&
-      regcost_ref(as->cost[RID_R2]) == args[2]) rset_clear(drop, RID_R2);
-  if (!rset_test(as->freeset, RID_R3) &&
-      regcost_ref(as->cost[RID_R3]) == args[3]) rset_clear(drop, RID_R3);
-  ra_evictset(as, drop);
-  ra_destpair(as, ir);
-  emit_dm(as, ARMF_CC(ARMI_MOV, cc), RID_RETHI, RID_R3);
-  emit_dm(as, ARMF_CC(ARMI_MOV, cc), RID_RETLO, RID_R2);
-  emit_call(as, (void *)ci->func);
-  for (r = RID_R0; r <= RID_R3; r++)
-    ra_leftov(as, r, args[r-RID_R0]);
-}
-#else
-static void asm_fpmin_max(ASMState *as, IRIns *ir, int cc)
-{
-  Reg dest = (ra_dest(as, ir, RSET_FPR) & 15);
-  Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-  right = ((left >> 8) & 15); left &= 15;
-  if (dest != left) emit_dm(as, ARMF_CC(ARMI_VMOV_D, cc^1), dest, left);
-  if (dest != right) emit_dm(as, ARMF_CC(ARMI_VMOV_D, cc), dest, right);
-  emit_d(as, ARMI_VMRS, 0);
-  emit_dm(as, ARMI_VCMP_D, left, right);
-}
-#endif
-
-static void asm_min_max(ASMState *as, IRIns *ir, int cc, int fcc)
-{
-#if LJ_SOFTFP
-  UNUSED(fcc);
-#else
-  if (irt_isnum(ir->t))
-    asm_fpmin_max(as, ir, fcc);
-  else
-#endif
-    asm_intmin_max(as, ir, cc);
-}
-
-/* -- Comparisons --------------------------------------------------------- */
-
-/* Map of comparisons to flags. ORDER IR. */
-static const uint8_t asm_compmap[IR_ABC+1] = {
-  /* op  FP swp  int cc   FP cc */
-  /* LT       */ CC_GE + (CC_HS << 4),
-  /* GE    x  */ CC_LT + (CC_HI << 4),
-  /* LE       */ CC_GT + (CC_HI << 4),
-  /* GT    x  */ CC_LE + (CC_HS << 4),
-  /* ULT   x  */ CC_HS + (CC_LS << 4),
-  /* UGE      */ CC_LO + (CC_LO << 4),
-  /* ULE   x  */ CC_HI + (CC_LO << 4),
-  /* UGT      */ CC_LS + (CC_LS << 4),
-  /* EQ       */ CC_NE + (CC_NE << 4),
-  /* NE       */ CC_EQ + (CC_EQ << 4),
-  /* ABC      */ CC_LS + (CC_LS << 4)  /* Same as UGT. */
-};
-
-#if LJ_SOFTFP
-/* FP comparisons. */
-static void asm_sfpcomp(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_softfp_cmp];
-  RegSet drop = RSET_SCRATCH;
-  Reg r;
-  IRRef args[4];
-  int swp = (((ir->o ^ (ir->o >> 2)) & ~(ir->o >> 3) & 1) << 1);
-  args[swp^0] = ir->op1; args[swp^1] = (ir+1)->op1;
-  args[swp^2] = ir->op2; args[swp^3] = (ir+1)->op2;
-  /* __aeabi_cdcmple preserves r0-r3. This helps to reduce spills. */
-  for (r = RID_R0; r <= RID_R3; r++)
-    if (!rset_test(as->freeset, r) &&
-	regcost_ref(as->cost[r]) == args[r-RID_R0]) rset_clear(drop, r);
-  ra_evictset(as, drop);
-  asm_guardcc(as, (asm_compmap[ir->o] >> 4));
-  emit_call(as, (void *)ci->func);
-  for (r = RID_R0; r <= RID_R3; r++)
-    ra_leftov(as, r, args[r-RID_R0]);
-}
-#else
-/* FP comparisons. */
-static void asm_fpcomp(ASMState *as, IRIns *ir)
-{
-  Reg left, right;
-  ARMIns ai;
-  int swp = ((ir->o ^ (ir->o >> 2)) & ~(ir->o >> 3) & 1);
-  if (!swp && irref_isk(ir->op2) && ir_knum(IR(ir->op2))->u64 == 0) {
-    left = (ra_alloc1(as, ir->op1, RSET_FPR) & 15);
-    right = 0;
-    ai = ARMI_VCMPZ_D;
-  } else {
-    left = ra_alloc2(as, ir, RSET_FPR);
-    if (swp) {
-      right = (left & 15); left = ((left >> 8) & 15);
-    } else {
-      right = ((left >> 8) & 15); left &= 15;
-    }
-    ai = ARMI_VCMP_D;
-  }
-  asm_guardcc(as, (asm_compmap[ir->o] >> 4));
-  emit_d(as, ARMI_VMRS, 0);
-  emit_dm(as, ai, left, right);
-}
-#endif
-
-/* Integer comparisons. */
-static void asm_intcomp(ASMState *as, IRIns *ir)
-{
-  ARMCC cc = (asm_compmap[ir->o] & 15);
-  IRRef lref = ir->op1, rref = ir->op2;
-  Reg left;
-  uint32_t m;
-  int cmpprev0 = 0;
-  lua_assert(irt_isint(ir->t) || irt_isu32(ir->t) || irt_isaddr(ir->t));
-  if (asm_swapops(as, lref, rref)) {
-    Reg tmp = lref; lref = rref; rref = tmp;
-    if (cc >= CC_GE) cc ^= 7;  /* LT <-> GT, LE <-> GE */
-    else if (cc > CC_NE) cc ^= 11;  /* LO <-> HI, LS <-> HS */
-  }
-  if (irref_isk(rref) && IR(rref)->i == 0) {
-    IRIns *irl = IR(lref);
-    cmpprev0 = (irl+1 == ir);
-    /* Combine comp(BAND(left, right), 0) into tst left, right. */
-    if (cmpprev0 && irl->o == IR_BAND && !ra_used(irl)) {
-      IRRef blref = irl->op1, brref = irl->op2;
-      uint32_t m2 = 0;
-      Reg bleft;
-      if (asm_swapops(as, blref, brref)) {
-	Reg tmp = blref; blref = brref; brref = tmp;
-      }
-      if (irref_isk(brref)) {
-	m2 = emit_isk12(ARMI_AND, IR(brref)->i);
-	if ((m2 & (ARMI_AND^ARMI_BIC)))
-	  goto notst;  /* Not beneficial if we miss a constant operand. */
-      }
-      if (cc == CC_GE) cc = CC_PL;
-      else if (cc == CC_LT) cc = CC_MI;
-      else if (cc > CC_NE) goto notst;  /* Other conds don't work with tst. */
-      bleft = ra_alloc1(as, blref, RSET_GPR);
-      if (!m2) m2 = asm_fuseopm(as, 0, brref, rset_exclude(RSET_GPR, bleft));
-      asm_guardcc(as, cc);
-      emit_n(as, ARMI_TST^m2, bleft);
-      return;
-    }
-  }
-notst:
-  left = ra_alloc1(as, lref, RSET_GPR);
-  m = asm_fuseopm(as, ARMI_CMP, rref, rset_exclude(RSET_GPR, left));
-  asm_guardcc(as, cc);
-  emit_n(as, ARMI_CMP^m, left);
-  /* Signed comparison with zero and referencing previous ins? */
-  if (cmpprev0 && (cc <= CC_NE || cc >= CC_GE))
-    as->flagmcp = as->mcp;  /* Allow elimination of the compare. */
-}
-
-#if LJ_HASFFI
-/* 64 bit integer comparisons. */
-static void asm_int64comp(ASMState *as, IRIns *ir)
-{
-  int signedcomp = (ir->o <= IR_GT);
-  ARMCC cclo, cchi;
-  Reg leftlo, lefthi;
-  uint32_t mlo, mhi;
-  RegSet allow = RSET_GPR, oldfree;
-
-  /* Always use unsigned comparison for loword. */
-  cclo = asm_compmap[ir->o + (signedcomp ? 4 : 0)] & 15;
-  leftlo = ra_alloc1(as, ir->op1, allow);
-  oldfree = as->freeset;
-  mlo = asm_fuseopm(as, ARMI_CMP, ir->op2, rset_clear(allow, leftlo));
-  allow &= ~(oldfree & ~as->freeset);  /* Update for allocs of asm_fuseopm. */
-
-  /* Use signed or unsigned comparison for hiword. */
-  cchi = asm_compmap[ir->o] & 15;
-  lefthi = ra_alloc1(as, (ir+1)->op1, allow);
-  mhi = asm_fuseopm(as, ARMI_CMP, (ir+1)->op2, rset_clear(allow, lefthi));
-
-  /* All register allocations must be performed _before_ this point. */
-  if (signedcomp) {
-    MCLabel l_around = emit_label(as);
-    asm_guardcc(as, cclo);
-    emit_n(as, ARMI_CMP^mlo, leftlo);
-    emit_branch(as, ARMF_CC(ARMI_B, CC_NE), l_around);
-    if (cchi == CC_GE || cchi == CC_LE) cchi ^= 6;  /* GE -> GT, LE -> LT */
-    asm_guardcc(as, cchi);
-  } else {
-    asm_guardcc(as, cclo);
-    emit_n(as, ARMF_CC(ARMI_CMP, CC_EQ)^mlo, leftlo);
-  }
-  emit_n(as, ARMI_CMP^mhi, lefthi);
-}
-#endif
-
-/* -- Support for 64 bit ops in 32 bit mode ------------------------------- */
-
-/* Hiword op of a split 64 bit op. Previous op must be the loword op. */
-static void asm_hiop(ASMState *as, IRIns *ir)
-{
-#if LJ_HASFFI || LJ_SOFTFP
-  /* HIOP is marked as a store because it needs its own DCE logic. */
-  int uselo = ra_used(ir-1), usehi = ra_used(ir);  /* Loword/hiword used? */
-  if (LJ_UNLIKELY(!(as->flags & JIT_F_OPT_DCE))) uselo = usehi = 1;
-  if ((ir-1)->o <= IR_NE) {  /* 64 bit integer or FP comparisons. ORDER IR. */
-    as->curins--;  /* Always skip the loword comparison. */
-#if LJ_SOFTFP
-    if (!irt_isint(ir->t)) {
-      asm_sfpcomp(as, ir-1);
-      return;
-    }
-#endif
-#if LJ_HASFFI
-    asm_int64comp(as, ir-1);
-#endif
-    return;
-#if LJ_SOFTFP
-  } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) {
-    as->curins--;  /* Always skip the loword min/max. */
-    if (uselo || usehi)
-      asm_sfpmin_max(as, ir-1, (ir-1)->o == IR_MIN ? CC_HI : CC_LO);
-    return;
-#elif LJ_HASFFI
-  } else if ((ir-1)->o == IR_CONV) {
-    as->curins--;  /* Always skip the CONV. */
-    if (usehi || uselo)
-      asm_conv64(as, ir);
-    return;
-#endif
-  } else if ((ir-1)->o == IR_XSTORE) {
-    if ((ir-1)->r != RID_SINK)
-      asm_xstore(as, ir, 4);
-    return;
-  }
-  if (!usehi) return;  /* Skip unused hiword op for all remaining ops. */
-  switch ((ir-1)->o) {
-#if LJ_HASFFI
-  case IR_ADD:
-    as->curins--;
-    asm_intop(as, ir, ARMI_ADC);
-    asm_intop(as, ir-1, ARMI_ADD|ARMI_S);
-    break;
-  case IR_SUB:
-    as->curins--;
-    asm_intop(as, ir, ARMI_SBC);
-    asm_intop(as, ir-1, ARMI_SUB|ARMI_S);
-    break;
-  case IR_NEG:
-    as->curins--;
-    asm_intneg(as, ir, ARMI_RSC);
-    asm_intneg(as, ir-1, ARMI_RSB|ARMI_S);
-    break;
-#endif
-#if LJ_SOFTFP
-  case IR_SLOAD: case IR_ALOAD: case IR_HLOAD: case IR_ULOAD: case IR_VLOAD:
-  case IR_STRTO:
-    if (!uselo)
-      ra_allocref(as, ir->op1, RSET_GPR);  /* Mark lo op as used. */
-    break;
-#endif
-  case IR_CALLN:
-  case IR_CALLS:
-  case IR_CALLXS:
-    if (!uselo)
-      ra_allocref(as, ir->op1, RID2RSET(RID_RETLO));  /* Mark lo op as used. */
-    break;
-#if LJ_SOFTFP
-  case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR:
-#endif
-  case IR_CNEWI:
-    /* Nothing to do here. Handled by lo op itself. */
-    break;
-  default: lua_assert(0); break;
-  }
-#else
-  UNUSED(as); UNUSED(ir); lua_assert(0);
-#endif
-}
-
-/* -- Stack handling ------------------------------------------------------ */
-
-/* Check Lua stack size for overflow. Use exit handler as fallback. */
-static void asm_stack_check(ASMState *as, BCReg topslot,
-			    IRIns *irp, RegSet allow, ExitNo exitno)
-{
-  Reg pbase;
-  uint32_t k;
-  if (irp) {
-    if (!ra_hasspill(irp->s)) {
-      pbase = irp->r;
-      lua_assert(ra_hasreg(pbase));
-    } else if (allow) {
-      pbase = rset_pickbot(allow);
-    } else {
-      pbase = RID_RET;
-      emit_lso(as, ARMI_LDR, RID_RET, RID_SP, 0);  /* Restore temp. register. */
-    }
-  } else {
-    pbase = RID_BASE;
-  }
-  emit_branch(as, ARMF_CC(ARMI_BL, CC_LS), exitstub_addr(as->J, exitno));
-  k = emit_isk12(0, (int32_t)(8*topslot));
-  lua_assert(k);
-  emit_n(as, ARMI_CMP^k, RID_TMP);
-  emit_dnm(as, ARMI_SUB, RID_TMP, RID_TMP, pbase);
-  emit_lso(as, ARMI_LDR, RID_TMP, RID_TMP,
-	   (int32_t)offsetof(lua_State, maxstack));
-  if (irp) {  /* Must not spill arbitrary registers in head of side trace. */
-    int32_t i = i32ptr(&J2G(as->J)->jit_L);
-    if (ra_hasspill(irp->s))
-      emit_lso(as, ARMI_LDR, pbase, RID_SP, sps_scale(irp->s));
-    emit_lso(as, ARMI_LDR, RID_TMP, RID_TMP, (i & 4095));
-    if (ra_hasspill(irp->s) && !allow)
-      emit_lso(as, ARMI_STR, RID_RET, RID_SP, 0);  /* Save temp. register. */
-    emit_loadi(as, RID_TMP, (i & ~4095));
-  } else {
-    emit_getgl(as, RID_TMP, jit_L);
-  }
-}
-
-/* Restore Lua stack from on-trace state. */
-static void asm_stack_restore(ASMState *as, SnapShot *snap)
-{
-  SnapEntry *map = &as->T->snapmap[snap->mapofs];
-  SnapEntry *flinks = &as->T->snapmap[snap_nextofs(as->T, snap)-1];
-  MSize n, nent = snap->nent;
-  /* Store the value of all modified slots to the Lua stack. */
-  for (n = 0; n < nent; n++) {
-    SnapEntry sn = map[n];
-    BCReg s = snap_slot(sn);
-    int32_t ofs = 8*((int32_t)s-1);
-    IRRef ref = snap_ref(sn);
-    IRIns *ir = IR(ref);
-    if ((sn & SNAP_NORESTORE))
-      continue;
-    if (irt_isnum(ir->t)) {
-#if LJ_SOFTFP
-      RegSet odd = rset_exclude(RSET_GPRODD, RID_BASE);
-      Reg tmp;
-      lua_assert(irref_isk(ref));  /* LJ_SOFTFP: must be a number constant. */
-      tmp = ra_allock(as, (int32_t)ir_knum(ir)->u32.lo,
-		      rset_exclude(RSET_GPREVEN, RID_BASE));
-      emit_lso(as, ARMI_STR, tmp, RID_BASE, ofs);
-      if (rset_test(as->freeset, tmp+1)) odd = RID2RSET(tmp+1);
-      tmp = ra_allock(as, (int32_t)ir_knum(ir)->u32.hi, odd);
-      emit_lso(as, ARMI_STR, tmp, RID_BASE, ofs+4);
-#else
-      Reg src = ra_alloc1(as, ref, RSET_FPR);
-      emit_vlso(as, ARMI_VSTR_D, src, RID_BASE, ofs);
-#endif
-    } else {
-      RegSet odd = rset_exclude(RSET_GPRODD, RID_BASE);
-      Reg type;
-      lua_assert(irt_ispri(ir->t) || irt_isaddr(ir->t) || irt_isinteger(ir->t));
-      if (!irt_ispri(ir->t)) {
-	Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPREVEN, RID_BASE));
-	emit_lso(as, ARMI_STR, src, RID_BASE, ofs);
-	if (rset_test(as->freeset, src+1)) odd = RID2RSET(src+1);
-      }
-      if ((sn & (SNAP_CONT|SNAP_FRAME))) {
-	if (s == 0) continue;  /* Do not overwrite link to previous frame. */
-	type = ra_allock(as, (int32_t)(*flinks--), odd);
-#if LJ_SOFTFP
-      } else if ((sn & SNAP_SOFTFPNUM)) {
-	type = ra_alloc1(as, ref+1, rset_exclude(RSET_GPRODD, RID_BASE));
-#endif
-      } else {
-	type = ra_allock(as, (int32_t)irt_toitype(ir->t), odd);
-      }
-      emit_lso(as, ARMI_STR, type, RID_BASE, ofs+4);
-    }
-    checkmclim(as);
-  }
-  lua_assert(map + nent == flinks);
-}
-
-/* -- GC handling --------------------------------------------------------- */
-
-/* Check GC threshold and do one or more GC steps. */
-static void asm_gc_check(ASMState *as)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_step_jit];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg tmp1, tmp2;
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  /* Exit trace if in GCSatomic or GCSfinalize. Avoids syncing GC objects. */
-  asm_guardcc(as, CC_NE);  /* Assumes asm_snap_prep() already done. */
-  emit_n(as, ARMI_CMP|ARMI_K12|0, RID_RET);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ASMREF_TMP2;  /* MSize steps     */
-  asm_gencall(as, ci, args);
-  tmp1 = ra_releasetmp(as, ASMREF_TMP1);
-  tmp2 = ra_releasetmp(as, ASMREF_TMP2);
-  emit_loadi(as, tmp2, as->gcsteps);
-  /* Jump around GC step if GC total < GC threshold. */
-  emit_branch(as, ARMF_CC(ARMI_B, CC_LS), l_end);
-  emit_nm(as, ARMI_CMP, RID_TMP, tmp2);
-  emit_lso(as, ARMI_LDR, tmp2, tmp1,
-	   (int32_t)offsetof(global_State, gc.threshold));
-  emit_lso(as, ARMI_LDR, RID_TMP, tmp1,
-	   (int32_t)offsetof(global_State, gc.total));
-  ra_allockreg(as, i32ptr(J2G(as->J)), tmp1);
-  as->gcsteps = 0;
-  checkmclim(as);
-}
-
-/* -- Loop handling ------------------------------------------------------- */
-
-/* Fixup the loop branch. */
-static void asm_loop_fixup(ASMState *as)
-{
-  MCode *p = as->mctop;
-  MCode *target = as->mcp;
-  if (as->loopinv) {  /* Inverted loop branch? */
-    /* asm_guardcc already inverted the bcc and patched the final bl. */
-    p[-2] |= ((uint32_t)(target-p) & 0x00ffffffu);
-  } else {
-    p[-1] = ARMI_B | ((uint32_t)((target-p)-1) & 0x00ffffffu);
-  }
-}
-
-/* -- Head of trace ------------------------------------------------------- */
-
-/* Reload L register from g->jit_L. */
-static void asm_head_lreg(ASMState *as)
-{
-  IRIns *ir = IR(ASMREF_L);
-  if (ra_used(ir)) {
-    Reg r = ra_dest(as, ir, RSET_GPR);
-    emit_getgl(as, r, jit_L);
-    ra_evictk(as);
-  }
-}
-
-/* Coalesce BASE register for a root trace. */
-static void asm_head_root_base(ASMState *as)
-{
-  IRIns *ir;
-  asm_head_lreg(as);
-  ir = IR(REF_BASE);
-  if (ra_hasreg(ir->r) && (rset_test(as->modset, ir->r) || irt_ismarked(ir->t)))
-    ra_spill(as, ir);
-  ra_destreg(as, ir, RID_BASE);
-}
-
-/* Coalesce BASE register for a side trace. */
-static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow)
-{
-  IRIns *ir;
-  asm_head_lreg(as);
-  ir = IR(REF_BASE);
-  if (ra_hasreg(ir->r) && (rset_test(as->modset, ir->r) || irt_ismarked(ir->t)))
-    ra_spill(as, ir);
-  if (ra_hasspill(irp->s)) {
-    rset_clear(allow, ra_dest(as, ir, allow));
-  } else {
-    Reg r = irp->r;
-    lua_assert(ra_hasreg(r));
-    rset_clear(allow, r);
-    if (r != ir->r && !rset_test(as->freeset, r))
-      ra_restore(as, regcost_ref(as->cost[r]));
-    ra_destreg(as, ir, r);
-  }
-  return allow;
-}
-
-/* -- Tail of trace ------------------------------------------------------- */
-
-/* Fixup the tail code. */
-static void asm_tail_fixup(ASMState *as, TraceNo lnk)
-{
-  MCode *p = as->mctop;
-  MCode *target;
-  int32_t spadj = as->T->spadjust;
-  if (spadj == 0) {
-    as->mctop = --p;
-  } else {
-    /* Patch stack adjustment. */
-    uint32_t k = emit_isk12(ARMI_ADD, spadj);
-    lua_assert(k);
-    p[-2] = (ARMI_ADD^k) | ARMF_D(RID_SP) | ARMF_N(RID_SP);
-  }
-  /* Patch exit branch. */
-  target = lnk ? traceref(as->J, lnk)->mcode : (MCode *)lj_vm_exit_interp;
-  p[-1] = ARMI_B|(((target-p)-1)&0x00ffffffu);
-}
-
-/* Prepare tail of code. */
-static void asm_tail_prep(ASMState *as)
-{
-  MCode *p = as->mctop - 1;  /* Leave room for exit branch. */
-  if (as->loopref) {
-    as->invmcp = as->mcp = p;
-  } else {
-    as->mcp = p-1;  /* Leave room for stack pointer adjustment. */
-    as->invmcp = NULL;
-  }
-  *p = 0;  /* Prevent load/store merging. */
-}
-
-/* -- Instruction dispatch ------------------------------------------------ */
-
-/* Assemble a single instruction. */
-static void asm_ir(ASMState *as, IRIns *ir)
-{
-  switch ((IROp)ir->o) {
-  /* Miscellaneous ops. */
-  case IR_LOOP: asm_loop(as); break;
-  case IR_NOP: case IR_XBAR: lua_assert(!ra_used(ir)); break;
-  case IR_USE:
-    ra_alloc1(as, ir->op1, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR); break;
-  case IR_PHI: asm_phi(as, ir); break;
-  case IR_HIOP: asm_hiop(as, ir); break;
-  case IR_GCSTEP: asm_gcstep(as, ir); break;
-
-  /* Guarded assertions. */
-  case IR_EQ: case IR_NE:
-    if ((ir-1)->o == IR_HREF && ir->op1 == as->curins-1) {
-      as->curins--;
-      asm_href(as, ir-1, (IROp)ir->o);
-      break;
-    }
-    /* fallthrough */
-  case IR_LT: case IR_GE: case IR_LE: case IR_GT:
-  case IR_ULT: case IR_UGE: case IR_ULE: case IR_UGT:
-  case IR_ABC:
-#if !LJ_SOFTFP
-    if (irt_isnum(ir->t)) { asm_fpcomp(as, ir); break; }
-#endif
-    asm_intcomp(as, ir);
-    break;
-
-  case IR_RETF: asm_retf(as, ir); break;
-
-  /* Bit ops. */
-  case IR_BNOT: asm_bitop(as, ir, ARMI_MVN); break;
-  case IR_BSWAP: asm_bitswap(as, ir); break;
-
-  case IR_BAND: asm_bitop(as, ir, ARMI_AND); break;
-  case IR_BOR:  asm_bitop(as, ir, ARMI_ORR); break;
-  case IR_BXOR: asm_bitop(as, ir, ARMI_EOR); break;
-
-  case IR_BSHL: asm_bitshift(as, ir, ARMSH_LSL); break;
-  case IR_BSHR: asm_bitshift(as, ir, ARMSH_LSR); break;
-  case IR_BSAR: asm_bitshift(as, ir, ARMSH_ASR); break;
-  case IR_BROR: asm_bitshift(as, ir, ARMSH_ROR); break;
-  case IR_BROL: lua_assert(0); break;
-
-  /* Arithmetic ops. */
-  case IR_ADD: case IR_ADDOV: asm_add(as, ir); break;
-  case IR_SUB: case IR_SUBOV: asm_sub(as, ir); break;
-  case IR_MUL: case IR_MULOV: asm_mul(as, ir); break;
-  case IR_MOD: asm_callid(as, ir, IRCALL_lj_vm_modi); break;
-  case IR_NEG: asm_neg(as, ir); break;
-
-#if LJ_SOFTFP
-  case IR_DIV: case IR_POW: case IR_ABS:
-  case IR_ATAN2: case IR_LDEXP: case IR_FPMATH: case IR_TOBIT:
-    lua_assert(0);  /* Unused for LJ_SOFTFP. */
-    break;
-#else
-  case IR_DIV: asm_fparith(as, ir, ARMI_VDIV_D); break;
-  case IR_POW: asm_callid(as, ir, IRCALL_lj_vm_powi); break;
-  case IR_ABS: asm_fpunary(as, ir, ARMI_VABS_D); break;
-  case IR_ATAN2: asm_callid(as, ir, IRCALL_atan2); break;
-  case IR_LDEXP: asm_callid(as, ir, IRCALL_ldexp); break;
-  case IR_FPMATH:
-    if (ir->op2 == IRFPM_EXP2 && asm_fpjoin_pow(as, ir))
-      break;
-    if (ir->op2 <= IRFPM_TRUNC)
-      asm_callround(as, ir, ir->op2);
-    else if (ir->op2 == IRFPM_SQRT)
-      asm_fpunary(as, ir, ARMI_VSQRT_D);
-    else
-      asm_callid(as, ir, IRCALL_lj_vm_floor + ir->op2);
-    break;
-  case IR_TOBIT: asm_tobit(as, ir); break;
-#endif
-
-  case IR_MIN: asm_min_max(as, ir, CC_GT, CC_HI); break;
-  case IR_MAX: asm_min_max(as, ir, CC_LT, CC_LO); break;
-
-  /* Memory references. */
-  case IR_AREF: asm_aref(as, ir); break;
-  case IR_HREF: asm_href(as, ir, 0); break;
-  case IR_HREFK: asm_hrefk(as, ir); break;
-  case IR_NEWREF: asm_newref(as, ir); break;
-  case IR_UREFO: case IR_UREFC: asm_uref(as, ir); break;
-  case IR_FREF: asm_fref(as, ir); break;
-  case IR_STRREF: asm_strref(as, ir); break;
-
-  /* Loads and stores. */
-  case IR_ALOAD: case IR_HLOAD: case IR_ULOAD: case IR_VLOAD:
-    asm_ahuvload(as, ir);
-    break;
-  case IR_FLOAD: asm_fload(as, ir); break;
-  case IR_XLOAD: asm_xload(as, ir); break;
-  case IR_SLOAD: asm_sload(as, ir); break;
-
-  case IR_ASTORE: case IR_HSTORE: case IR_USTORE: asm_ahustore(as, ir); break;
-  case IR_FSTORE: asm_fstore(as, ir); break;
-  case IR_XSTORE: asm_xstore(as, ir, 0); break;
-
-  /* Allocations. */
-  case IR_SNEW: case IR_XSNEW: asm_snew(as, ir); break;
-  case IR_TNEW: asm_tnew(as, ir); break;
-  case IR_TDUP: asm_tdup(as, ir); break;
-  case IR_CNEW: case IR_CNEWI: asm_cnew(as, ir); break;
-
-  /* Write barriers. */
-  case IR_TBAR: asm_tbar(as, ir); break;
-  case IR_OBAR: asm_obar(as, ir); break;
-
-  /* Type conversions. */
-  case IR_CONV: asm_conv(as, ir); break;
-  case IR_TOSTR: asm_tostr(as, ir); break;
-  case IR_STRTO: asm_strto(as, ir); break;
-
-  /* Calls. */
-  case IR_CALLN: case IR_CALLL: case IR_CALLS: asm_call(as, ir); break;
-  case IR_CALLXS: asm_callx(as, ir); break;
-  case IR_CARG: break;
-
-  default:
-    setintV(&as->J->errinfo, ir->o);
-    lj_trace_err_info(as->J, LJ_TRERR_NYIIR);
-    break;
-  }
-}
-
-/* -- Trace setup --------------------------------------------------------- */
-
-/* Ensure there are enough stack slots for call arguments. */
-static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  uint32_t i, nargs = (int)CCI_NARGS(ci);
-  int nslots = 0, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR, fprodd = 0;
-  asm_collectargs(as, ir, ci, args);
-  for (i = 0; i < nargs; i++) {
-    if (!LJ_SOFTFP && args[i] && irt_isfp(IR(args[i])->t)) {
-      if (!LJ_ABI_SOFTFP && !(ci->flags & CCI_VARARG)) {
-	if (irt_isnum(IR(args[i])->t)) {
-	  if (nfpr > 0) nfpr--;
-	  else fprodd = 0, nslots = (nslots + 3) & ~1;
-	} else {
-	  if (fprodd) fprodd--;
-	  else if (nfpr > 0) fprodd = 1, nfpr--;
-	  else nslots++;
-	}
-      } else if (irt_isnum(IR(args[i])->t)) {
-	ngpr &= ~1;
-	if (ngpr > 0) ngpr -= 2; else nslots += 2;
-      } else {
-	if (ngpr > 0) ngpr--; else nslots++;
-      }
-    } else {
-      if (ngpr > 0) ngpr--; else nslots++;
-    }
-  }
-  if (nslots > as->evenspill)  /* Leave room for args in stack slots. */
-    as->evenspill = nslots;
-  return REGSP_HINT(RID_RET);
-}
-
-static void asm_setup_target(ASMState *as)
-{
-  /* May need extra exit for asm_stack_check on side traces. */
-  asm_exitstub_setup(as, as->T->nsnap + (as->parent ? 1 : 0));
-}
-
-/* -- Trace patching ------------------------------------------------------ */
-
-/* Patch exit jumps of existing machine code to a new target. */
-void lj_asm_patchexit(jit_State *J, GCtrace *T, ExitNo exitno, MCode *target)
-{
-  MCode *p = T->mcode;
-  MCode *pe = (MCode *)((char *)p + T->szmcode);
-  MCode *cstart = NULL, *cend = p;
-  MCode *mcarea = lj_mcode_patch(J, p, 0);
-  MCode *px = exitstub_addr(J, exitno) - 2;
-  for (; p < pe; p++) {
-    /* Look for bl_cc exitstub, replace with b_cc target. */
-    uint32_t ins = *p;
-    if ((ins & 0x0f000000u) == 0x0b000000u && ins < 0xf0000000u &&
-	((ins ^ (px-p)) & 0x00ffffffu) == 0) {
-      *p = (ins & 0xfe000000u) | (((target-p)-2) & 0x00ffffffu);
-      cend = p+1;
-      if (!cstart) cstart = p;
-    }
-  }
-  lua_assert(cstart != NULL);
-  lj_mcode_sync(cstart, cend);
-  lj_mcode_patch(J, mcarea, 1);
-}
-
diff --git a/dependencies2013/win32/include/luajit/lj_asm_mips.h b/dependencies2013/win32/include/luajit/lj_asm_mips.h
deleted file mode 100644
index 03270cca..00000000
--- a/dependencies2013/win32/include/luajit/lj_asm_mips.h
+++ /dev/null
@@ -1,1972 +0,0 @@
-/*
-** MIPS IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Register allocator extensions --------------------------------------- */
-
-/* Allocate a register with a hint. */
-static Reg ra_hintalloc(ASMState *as, IRRef ref, Reg hint, RegSet allow)
-{
-  Reg r = IR(ref)->r;
-  if (ra_noreg(r)) {
-    if (!ra_hashint(r) && !iscrossref(as, ref))
-      ra_sethint(IR(ref)->r, hint);  /* Propagate register hint. */
-    r = ra_allocref(as, ref, allow);
-  }
-  ra_noweak(as, r);
-  return r;
-}
-
-/* Allocate a register or RID_ZERO. */
-static Reg ra_alloc1z(ASMState *as, IRRef ref, RegSet allow)
-{
-  Reg r = IR(ref)->r;
-  if (ra_noreg(r)) {
-    if (!(allow & RSET_FPR) && irref_isk(ref) && IR(ref)->i == 0)
-      return RID_ZERO;
-    r = ra_allocref(as, ref, allow);
-  } else {
-    ra_noweak(as, r);
-  }
-  return r;
-}
-
-/* Allocate two source registers for three-operand instructions. */
-static Reg ra_alloc2(ASMState *as, IRIns *ir, RegSet allow)
-{
-  IRIns *irl = IR(ir->op1), *irr = IR(ir->op2);
-  Reg left = irl->r, right = irr->r;
-  if (ra_hasreg(left)) {
-    ra_noweak(as, left);
-    if (ra_noreg(right))
-      right = ra_alloc1z(as, ir->op2, rset_exclude(allow, left));
-    else
-      ra_noweak(as, right);
-  } else if (ra_hasreg(right)) {
-    ra_noweak(as, right);
-    left = ra_alloc1z(as, ir->op1, rset_exclude(allow, right));
-  } else if (ra_hashint(right)) {
-    right = ra_alloc1z(as, ir->op2, allow);
-    left = ra_alloc1z(as, ir->op1, rset_exclude(allow, right));
-  } else {
-    left = ra_alloc1z(as, ir->op1, allow);
-    right = ra_alloc1z(as, ir->op2, rset_exclude(allow, left));
-  }
-  return left | (right << 8);
-}
-
-/* -- Guard handling ------------------------------------------------------ */
-
-/* Need some spare long-range jump slots, for out-of-range branches. */
-#define MIPS_SPAREJUMP		4
-
-/* Setup spare long-range jump slots per mcarea. */
-static void asm_sparejump_setup(ASMState *as)
-{
-  MCode *mxp = as->mcbot;
-  /* Assumes sizeof(MCLink) == 8. */
-  if (((uintptr_t)mxp & (LJ_PAGESIZE-1)) == 8) {
-    lua_assert(MIPSI_NOP == 0);
-    memset(mxp+2, 0, MIPS_SPAREJUMP*8);
-    mxp += MIPS_SPAREJUMP*2;
-    lua_assert(mxp < as->mctop);
-    lj_mcode_sync(as->mcbot, mxp);
-    lj_mcode_commitbot(as->J, mxp);
-    as->mcbot = mxp;
-    as->mclim = as->mcbot + MCLIM_REDZONE;
-  }
-}
-
-/* Setup exit stub after the end of each trace. */
-static void asm_exitstub_setup(ASMState *as)
-{
-  MCode *mxp = as->mctop;
-  /* sw TMP, 0(sp); j ->vm_exit_handler; li TMP, traceno */
-  *--mxp = MIPSI_LI|MIPSF_T(RID_TMP)|as->T->traceno;
-  *--mxp = MIPSI_J|((((uintptr_t)(void *)lj_vm_exit_handler)>>2)&0x03ffffffu);
-  lua_assert(((uintptr_t)mxp ^ (uintptr_t)(void *)lj_vm_exit_handler)>>28 == 0);
-  *--mxp = MIPSI_SW|MIPSF_T(RID_TMP)|MIPSF_S(RID_SP)|0;
-  as->mctop = mxp;
-}
-
-/* Keep this in-sync with exitstub_trace_addr(). */
-#define asm_exitstub_addr(as)	((as)->mctop)
-
-/* Emit conditional branch to exit for guard. */
-static void asm_guard(ASMState *as, MIPSIns mi, Reg rs, Reg rt)
-{
-  MCode *target = asm_exitstub_addr(as);
-  MCode *p = as->mcp;
-  if (LJ_UNLIKELY(p == as->invmcp)) {
-    as->invmcp = NULL;
-    as->loopinv = 1;
-    as->mcp = p+1;
-    mi = mi ^ ((mi>>28) == 1 ? 0x04000000u : 0x00010000u);  /* Invert cond. */
-    target = p;  /* Patch target later in asm_loop_fixup. */
-  }
-  emit_ti(as, MIPSI_LI, RID_TMP, as->snapno);
-  emit_branch(as, mi, rs, rt, target);
-}
-
-/* -- Operand fusion ------------------------------------------------------ */
-
-/* Limit linear search to this distance. Avoids O(n^2) behavior. */
-#define CONFLICT_SEARCH_LIM	31
-
-/* Check if there's no conflicting instruction between curins and ref. */
-static int noconflict(ASMState *as, IRRef ref, IROp conflict)
-{
-  IRIns *ir = as->ir;
-  IRRef i = as->curins;
-  if (i > ref + CONFLICT_SEARCH_LIM)
-    return 0;  /* Give up, ref is too far away. */
-  while (--i > ref)
-    if (ir[i].o == conflict)
-      return 0;  /* Conflict found. */
-  return 1;  /* Ok, no conflict. */
-}
-
-/* Fuse the array base of colocated arrays. */
-static int32_t asm_fuseabase(ASMState *as, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (ir->o == IR_TNEW && ir->op1 <= LJ_MAX_COLOSIZE &&
-      !neverfuse(as) && noconflict(as, ref, IR_NEWREF))
-    return (int32_t)sizeof(GCtab);
-  return 0;
-}
-
-/* Fuse array/hash/upvalue reference into register+offset operand. */
-static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow)
-{
-  IRIns *ir = IR(ref);
-  if (ra_noreg(ir->r)) {
-    if (ir->o == IR_AREF) {
-      if (mayfuse(as, ref)) {
-	if (irref_isk(ir->op2)) {
-	  IRRef tab = IR(ir->op1)->op1;
-	  int32_t ofs = asm_fuseabase(as, tab);
-	  IRRef refa = ofs ? tab : ir->op1;
-	  ofs += 8*IR(ir->op2)->i;
-	  if (checki16(ofs)) {
-	    *ofsp = ofs;
-	    return ra_alloc1(as, refa, allow);
-	  }
-	}
-      }
-    } else if (ir->o == IR_HREFK) {
-      if (mayfuse(as, ref)) {
-	int32_t ofs = (int32_t)(IR(ir->op2)->op2 * sizeof(Node));
-	if (checki16(ofs)) {
-	  *ofsp = ofs;
-	  return ra_alloc1(as, ir->op1, allow);
-	}
-      }
-    } else if (ir->o == IR_UREFC) {
-      if (irref_isk(ir->op1)) {
-	GCfunc *fn = ir_kfunc(IR(ir->op1));
-	int32_t ofs = i32ptr(&gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.tv);
-	int32_t jgl = (intptr_t)J2G(as->J);
-	if ((uint32_t)(ofs-jgl) < 65536) {
-	  *ofsp = ofs-jgl-32768;
-	  return RID_JGL;
-	} else {
-	  *ofsp = (int16_t)ofs;
-	  return ra_allock(as, ofs-(int16_t)ofs, allow);
-	}
-      }
-    }
-  }
-  *ofsp = 0;
-  return ra_alloc1(as, ref, allow);
-}
-
-/* Fuse XLOAD/XSTORE reference into load/store operand. */
-static void asm_fusexref(ASMState *as, MIPSIns mi, Reg rt, IRRef ref,
-			 RegSet allow, int32_t ofs)
-{
-  IRIns *ir = IR(ref);
-  Reg base;
-  if (ra_noreg(ir->r) && canfuse(as, ir)) {
-    if (ir->o == IR_ADD) {
-      int32_t ofs2;
-      if (irref_isk(ir->op2) && (ofs2 = ofs + IR(ir->op2)->i, checki16(ofs2))) {
-	ref = ir->op1;
-	ofs = ofs2;
-      }
-    } else if (ir->o == IR_STRREF) {
-      int32_t ofs2 = 65536;
-      lua_assert(ofs == 0);
-      ofs = (int32_t)sizeof(GCstr);
-      if (irref_isk(ir->op2)) {
-	ofs2 = ofs + IR(ir->op2)->i;
-	ref = ir->op1;
-      } else if (irref_isk(ir->op1)) {
-	ofs2 = ofs + IR(ir->op1)->i;
-	ref = ir->op2;
-      }
-      if (!checki16(ofs2)) {
-	/* NYI: Fuse ADD with constant. */
-	Reg right, left = ra_alloc2(as, ir, allow);
-	right = (left >> 8); left &= 255;
-	emit_hsi(as, mi, rt, RID_TMP, ofs);
-	emit_dst(as, MIPSI_ADDU, RID_TMP, left, right);
-	return;
-      }
-      ofs = ofs2;
-    }
-  }
-  base = ra_alloc1(as, ref, allow);
-  emit_hsi(as, mi, rt, base, ofs);
-}
-
-/* -- Calls --------------------------------------------------------------- */
-
-/* Generate a call to a C function. */
-static void asm_gencall(ASMState *as, const CCallInfo *ci, IRRef *args)
-{
-  uint32_t n, nargs = CCI_NARGS(ci);
-  int32_t ofs = 16;
-  Reg gpr, fpr = REGARG_FIRSTFPR;
-  if ((void *)ci->func)
-    emit_call(as, (void *)ci->func);
-  for (gpr = REGARG_FIRSTGPR; gpr <= REGARG_LASTGPR; gpr++)
-    as->cost[gpr] = REGCOST(~0u, ASMREF_L);
-  gpr = REGARG_FIRSTGPR;
-  for (n = 0; n < nargs; n++) {  /* Setup args. */
-    IRRef ref = args[n];
-    if (ref) {
-      IRIns *ir = IR(ref);
-      if (irt_isfp(ir->t) && fpr <= REGARG_LASTFPR &&
-	  !(ci->flags & CCI_VARARG)) {
-	lua_assert(rset_test(as->freeset, fpr));  /* Already evicted. */
-	ra_leftov(as, fpr, ref);
-	fpr += 2;
-	gpr += irt_isnum(ir->t) ? 2 : 1;
-      } else {
-	fpr = REGARG_LASTFPR+1;
-	if (irt_isnum(ir->t)) gpr = (gpr+1) & ~1;
-	if (gpr <= REGARG_LASTGPR) {
-	  lua_assert(rset_test(as->freeset, gpr));  /* Already evicted. */
-	  if (irt_isfp(ir->t)) {
-	    RegSet of = as->freeset;
-	    Reg r;
-	    /* Workaround to protect argument GPRs from being used for remat. */
-	    as->freeset &= ~RSET_RANGE(REGARG_FIRSTGPR, REGARG_LASTGPR+1);
-	    r = ra_alloc1(as, ref, RSET_FPR);
-	    as->freeset |= (of & RSET_RANGE(REGARG_FIRSTGPR, REGARG_LASTGPR+1));
-	    if (irt_isnum(ir->t)) {
-	      emit_tg(as, MIPSI_MFC1, gpr+(LJ_BE?0:1), r+1);
-	      emit_tg(as, MIPSI_MFC1, gpr+(LJ_BE?1:0), r);
-	      lua_assert(rset_test(as->freeset, gpr+1));  /* Already evicted. */
-	      gpr += 2;
-	    } else if (irt_isfloat(ir->t)) {
-	      emit_tg(as, MIPSI_MFC1, gpr, r);
-	      gpr++;
-	    }
-	  } else {
-	    ra_leftov(as, gpr, ref);
-	    gpr++;
-	  }
-	} else {
-	  Reg r = ra_alloc1z(as, ref, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR);
-	  if (irt_isnum(ir->t)) ofs = (ofs + 4) & ~4;
-	  emit_spstore(as, ir, r, ofs);
-	  ofs += irt_isnum(ir->t) ? 8 : 4;
-	}
-      }
-    } else {
-      fpr = REGARG_LASTFPR+1;
-      if (gpr <= REGARG_LASTGPR)
-	gpr++;
-      else
-	ofs += 4;
-    }
-    checkmclim(as);
-  }
-}
-
-/* Setup result reg/sp for call. Evict scratch regs. */
-static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  RegSet drop = RSET_SCRATCH;
-  int hiop = ((ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t));
-  if ((ci->flags & CCI_NOFPRCLOBBER))
-    drop &= ~RSET_FPR;
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  if (hiop && ra_hasreg((ir+1)->r))
-    rset_clear(drop, (ir+1)->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);  /* Evictions must be performed first. */
-  if (ra_used(ir)) {
-    lua_assert(!irt_ispri(ir->t));
-    if (irt_isfp(ir->t)) {
-      if ((ci->flags & CCI_CASTU64)) {
-	int32_t ofs = sps_scale(ir->s);
-	Reg dest = ir->r;
-	if (ra_hasreg(dest)) {
-	  ra_free(as, dest);
-	  ra_modified(as, dest);
-	  emit_tg(as, MIPSI_MTC1, RID_RETHI, dest+1);
-	  emit_tg(as, MIPSI_MTC1, RID_RETLO, dest);
-	}
-	if (ofs) {
-	  emit_tsi(as, MIPSI_SW, RID_RETLO, RID_SP, ofs+(LJ_BE?4:0));
-	  emit_tsi(as, MIPSI_SW, RID_RETHI, RID_SP, ofs+(LJ_BE?0:4));
-	}
-      } else {
-	ra_destreg(as, ir, RID_FPRET);
-      }
-    } else if (hiop) {
-      ra_destpair(as, ir);
-    } else {
-      ra_destreg(as, ir, RID_RET);
-    }
-  }
-}
-
-static void asm_call(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX];
-  const CCallInfo *ci = &lj_ir_callinfo[ir->op2];
-  asm_collectargs(as, ir, ci, args);
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-static void asm_callx(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  CCallInfo ci;
-  IRRef func;
-  IRIns *irf;
-  ci.flags = asm_callx_flags(as, ir);
-  asm_collectargs(as, ir, &ci, args);
-  asm_setupresult(as, ir, &ci);
-  func = ir->op2; irf = IR(func);
-  if (irf->o == IR_CARG) { func = irf->op1; irf = IR(func); }
-  if (irref_isk(func)) {  /* Call to constant address. */
-    ci.func = (ASMFunction)(void *)(irf->i);
-  } else {  /* Need specific register for indirect calls. */
-    Reg r = ra_alloc1(as, func, RID2RSET(RID_CFUNCADDR));
-    MCode *p = as->mcp;
-    if (r == RID_CFUNCADDR)
-      *--p = MIPSI_NOP;
-    else
-      *--p = MIPSI_MOVE | MIPSF_D(RID_CFUNCADDR) | MIPSF_S(r);
-    *--p = MIPSI_JALR | MIPSF_S(r);
-    as->mcp = p;
-    ci.func = (ASMFunction)(void *)0;
-  }
-  asm_gencall(as, &ci, args);
-}
-
-static void asm_callid(ASMState *as, IRIns *ir, IRCallID id)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[id];
-  IRRef args[2];
-  args[0] = ir->op1;
-  args[1] = ir->op2;
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-static void asm_callround(ASMState *as, IRIns *ir, IRCallID id)
-{
-  /* The modified regs must match with the *.dasc implementation. */
-  RegSet drop = RID2RSET(RID_R1)|RID2RSET(RID_R12)|RID2RSET(RID_FPRET)|
-		RID2RSET(RID_F2)|RID2RSET(RID_F4)|RID2RSET(REGARG_FIRSTFPR);
-  if (ra_hasreg(ir->r)) rset_clear(drop, ir->r);
-  ra_evictset(as, drop);
-  ra_destreg(as, ir, RID_FPRET);
-  emit_call(as, (void *)lj_ir_callinfo[id].func);
-  ra_leftov(as, REGARG_FIRSTFPR, ir->op1);
-}
-
-/* -- Returns ------------------------------------------------------------- */
-
-/* Return to lower frame. Guard that it goes to the right spot. */
-static void asm_retf(ASMState *as, IRIns *ir)
-{
-  Reg base = ra_alloc1(as, REF_BASE, RSET_GPR);
-  void *pc = ir_kptr(IR(ir->op2));
-  int32_t delta = 1+bc_a(*((const BCIns *)pc - 1));
-  as->topslot -= (BCReg)delta;
-  if ((int32_t)as->topslot < 0) as->topslot = 0;
-  irt_setmark(IR(REF_BASE)->t);  /* Children must not coalesce with BASE reg. */
-  emit_setgl(as, base, jit_base);
-  emit_addptr(as, base, -8*delta);
-  asm_guard(as, MIPSI_BNE, RID_TMP,
-	    ra_allock(as, i32ptr(pc), rset_exclude(RSET_GPR, base)));
-  emit_tsi(as, MIPSI_LW, RID_TMP, base, -8);
-}
-
-/* -- Type conversions ---------------------------------------------------- */
-
-static void asm_tointg(ASMState *as, IRIns *ir, Reg left)
-{
-  Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, left));
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  asm_guard(as, MIPSI_BC1F, 0, 0);
-  emit_fgh(as, MIPSI_C_EQ_D, 0, tmp, left);
-  emit_fg(as, MIPSI_CVT_D_W, tmp, tmp);
-  emit_tg(as, MIPSI_MFC1, dest, tmp);
-  emit_fg(as, MIPSI_CVT_W_D, tmp, left);
-}
-
-static void asm_tobit(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_FPR;
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, allow);
-  Reg right = ra_alloc1(as, ir->op2, rset_clear(allow, left));
-  Reg tmp = ra_scratch(as, rset_clear(allow, right));
-  emit_tg(as, MIPSI_MFC1, dest, tmp);
-  emit_fgh(as, MIPSI_ADD_D, tmp, left, right);
-}
-
-static void asm_conv(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)(ir->op2 & IRCONV_SRCMASK);
-  int stfp = (st == IRT_NUM || st == IRT_FLOAT);
-  IRRef lref = ir->op1;
-  lua_assert(irt_type(ir->t) != st);
-  lua_assert(!(irt_isint64(ir->t) ||
-	       (st == IRT_I64 || st == IRT_U64))); /* Handled by SPLIT. */
-  if (irt_isfp(ir->t)) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    if (stfp) {  /* FP to FP conversion. */
-      emit_fg(as, st == IRT_NUM ? MIPSI_CVT_S_D : MIPSI_CVT_D_S,
-	      dest, ra_alloc1(as, lref, RSET_FPR));
-    } else if (st == IRT_U32) {  /* U32 to FP conversion. */
-      /* y = (x ^ 0x8000000) + 2147483648.0 */
-      Reg left = ra_alloc1(as, lref, RSET_GPR);
-      Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, dest));
-      if (irt_isfloat(ir->t))
-	emit_fg(as, MIPSI_CVT_S_D, dest, dest);
-      /* Must perform arithmetic with doubles to keep the precision. */
-      emit_fgh(as, MIPSI_ADD_D, dest, dest, tmp);
-      emit_fg(as, MIPSI_CVT_D_W, dest, dest);
-      emit_lsptr(as, MIPSI_LDC1, (tmp & 31),
-		 (void *)lj_ir_k64_find(as->J, U64x(41e00000,00000000)),
-		 RSET_GPR);
-      emit_tg(as, MIPSI_MTC1, RID_TMP, dest);
-      emit_dst(as, MIPSI_XOR, RID_TMP, RID_TMP, left);
-      emit_ti(as, MIPSI_LUI, RID_TMP, 0x8000);
-    } else {  /* Integer to FP conversion. */
-      Reg left = ra_alloc1(as, lref, RSET_GPR);
-      emit_fg(as, irt_isfloat(ir->t) ? MIPSI_CVT_S_W : MIPSI_CVT_D_W,
-	      dest, dest);
-      emit_tg(as, MIPSI_MTC1, left, dest);
-    }
-  } else if (stfp) {  /* FP to integer conversion. */
-    if (irt_isguard(ir->t)) {
-      /* Checked conversions are only supported from number to int. */
-      lua_assert(irt_isint(ir->t) && st == IRT_NUM);
-      asm_tointg(as, ir, ra_alloc1(as, lref, RSET_FPR));
-    } else {
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      Reg left = ra_alloc1(as, lref, RSET_FPR);
-      Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, left));
-      if (irt_isu32(ir->t)) {
-	/* y = (int)floor(x - 2147483648.0) ^ 0x80000000 */
-	emit_dst(as, MIPSI_XOR, dest, dest, RID_TMP);
-	emit_ti(as, MIPSI_LUI, RID_TMP, 0x8000);
-	emit_tg(as, MIPSI_MFC1, dest, tmp);
-	emit_fg(as, st == IRT_FLOAT ? MIPSI_FLOOR_W_S : MIPSI_FLOOR_W_D,
-		tmp, tmp);
-	emit_fgh(as, st == IRT_FLOAT ? MIPSI_SUB_S : MIPSI_SUB_D,
-		 tmp, left, tmp);
-	if (st == IRT_FLOAT)
-	  emit_lsptr(as, MIPSI_LWC1, (tmp & 31),
-		     (void *)lj_ir_k64_find(as->J, U64x(4f000000,4f000000)),
-		     RSET_GPR);
-	else
-	  emit_lsptr(as, MIPSI_LDC1, (tmp & 31),
-		     (void *)lj_ir_k64_find(as->J, U64x(41e00000,00000000)),
-		     RSET_GPR);
-      } else {
-	emit_tg(as, MIPSI_MFC1, dest, tmp);
-	emit_fg(as, st == IRT_FLOAT ? MIPSI_TRUNC_W_S : MIPSI_TRUNC_W_D,
-		tmp, left);
-      }
-    }
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    if (st >= IRT_I8 && st <= IRT_U16) {  /* Extend to 32 bit integer. */
-      Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-      lua_assert(irt_isint(ir->t) || irt_isu32(ir->t));
-      if ((ir->op2 & IRCONV_SEXT)) {
-	if ((as->flags & JIT_F_MIPS32R2)) {
-	  emit_dst(as, st == IRT_I8 ? MIPSI_SEB : MIPSI_SEH, dest, 0, left);
-	} else {
-	  uint32_t shift = st == IRT_I8 ? 24 : 16;
-	  emit_dta(as, MIPSI_SRA, dest, dest, shift);
-	  emit_dta(as, MIPSI_SLL, dest, left, shift);
-	}
-      } else {
-	emit_tsi(as, MIPSI_ANDI, dest, left,
-		 (int32_t)(st == IRT_U8 ? 0xff : 0xffff));
-      }
-    } else {  /* 32/64 bit integer conversions. */
-      /* Only need to handle 32/32 bit no-op (cast) on 32 bit archs. */
-      ra_leftov(as, dest, lref);  /* Do nothing, but may need to move regs. */
-    }
-  }
-}
-
-#if LJ_HASFFI
-static void asm_conv64(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)((ir-1)->op2 & IRCONV_SRCMASK);
-  IRType dt = (((ir-1)->op2 & IRCONV_DSTMASK) >> IRCONV_DSH);
-  IRCallID id;
-  const CCallInfo *ci;
-  IRRef args[2];
-  args[LJ_BE?0:1] = ir->op1;
-  args[LJ_BE?1:0] = (ir-1)->op1;
-  if (st == IRT_NUM || st == IRT_FLOAT) {
-    id = IRCALL_fp64_d2l + ((st == IRT_FLOAT) ? 2 : 0) + (dt - IRT_I64);
-    ir--;
-  } else {
-    id = IRCALL_fp64_l2d + ((dt == IRT_FLOAT) ? 2 : 0) + (st - IRT_I64);
-  }
-  ci = &lj_ir_callinfo[id];
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-#endif
-
-static void asm_strto(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_strscan_num];
-  IRRef args[2];
-  RegSet drop = RSET_SCRATCH;
-  if (ra_hasreg(ir->r)) rset_set(drop, ir->r);  /* Spill dest reg (if any). */
-  ra_evictset(as, drop);
-  asm_guard(as, MIPSI_BEQ, RID_RET, RID_ZERO);  /* Test return status. */
-  args[0] = ir->op1;      /* GCstr *str */
-  args[1] = ASMREF_TMP1;  /* TValue *n  */
-  asm_gencall(as, ci, args);
-  /* Store the result to the spill slot or temp slots. */
-  emit_tsi(as, MIPSI_ADDIU, ra_releasetmp(as, ASMREF_TMP1),
-	   RID_SP, sps_scale(ir->s));
-}
-
-/* Get pointer to TValue. */
-static void asm_tvptr(ASMState *as, Reg dest, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (irt_isnum(ir->t)) {
-    if (irref_isk(ref))  /* Use the number constant itself as a TValue. */
-      ra_allockreg(as, i32ptr(ir_knum(ir)), dest);
-    else  /* Otherwise force a spill and use the spill slot. */
-      emit_tsi(as, MIPSI_ADDIU, dest, RID_SP, ra_spill(as, ir));
-  } else {
-    /* Otherwise use g->tmptv to hold the TValue. */
-    RegSet allow = rset_exclude(RSET_GPR, dest);
-    Reg type;
-    emit_tsi(as, MIPSI_ADDIU, dest, RID_JGL, offsetof(global_State, tmptv)-32768);
-    if (!irt_ispri(ir->t)) {
-      Reg src = ra_alloc1(as, ref, allow);
-      emit_setgl(as, src, tmptv.gcr);
-    }
-    type = ra_allock(as, irt_toitype(ir->t), allow);
-    emit_setgl(as, type, tmptv.it);
-  }
-}
-
-static void asm_tostr(ASMState *as, IRIns *ir)
-{
-  IRRef args[2];
-  args[0] = ASMREF_L;
-  as->gcsteps++;
-  if (irt_isnum(IR(ir->op1)->t) || (ir+1)->o == IR_HIOP) {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromnum];
-    args[1] = ASMREF_TMP1;  /* const lua_Number * */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-    asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op1);
-  } else {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromint];
-    args[1] = ir->op1;  /* int32_t k */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-  }
-}
-
-/* -- Memory references --------------------------------------------------- */
-
-static void asm_aref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg idx, base;
-  if (irref_isk(ir->op2)) {
-    IRRef tab = IR(ir->op1)->op1;
-    int32_t ofs = asm_fuseabase(as, tab);
-    IRRef refa = ofs ? tab : ir->op1;
-    ofs += 8*IR(ir->op2)->i;
-    if (checki16(ofs)) {
-      base = ra_alloc1(as, refa, RSET_GPR);
-      emit_tsi(as, MIPSI_ADDIU, dest, base, ofs);
-      return;
-    }
-  }
-  base = ra_alloc1(as, ir->op1, RSET_GPR);
-  idx = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, base));
-  emit_dst(as, MIPSI_ADDU, dest, RID_TMP, base);
-  emit_dta(as, MIPSI_SLL, RID_TMP, idx, 3);
-}
-
-/* Inlined hash lookup. Specialized for key type and for const keys.
-** The equivalent C code is:
-**   Node *n = hashkey(t, key);
-**   do {
-**     if (lj_obj_equal(&n->key, key)) return &n->val;
-**   } while ((n = nextnode(n)));
-**   return niltv(L);
-*/
-static void asm_href(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_GPR;
-  int destused = ra_used(ir);
-  Reg dest = ra_dest(as, ir, allow);
-  Reg tab = ra_alloc1(as, ir->op1, rset_clear(allow, dest));
-  Reg key = RID_NONE, type = RID_NONE, tmpnum = RID_NONE, tmp1 = RID_TMP, tmp2;
-  IRRef refkey = ir->op2;
-  IRIns *irkey = IR(refkey);
-  IRType1 kt = irkey->t;
-  uint32_t khash;
-  MCLabel l_end, l_loop, l_next;
-
-  rset_clear(allow, tab);
-  if (irt_isnum(kt)) {
-    key = ra_alloc1(as, refkey, RSET_FPR);
-    tmpnum = ra_scratch(as, rset_exclude(RSET_FPR, key));
-  } else if (!irt_ispri(kt)) {
-    key = ra_alloc1(as, refkey, allow);
-    rset_clear(allow, key);
-    type = ra_allock(as, irt_toitype(irkey->t), allow);
-    rset_clear(allow, type);
-  }
-  tmp2 = ra_scratch(as, allow);
-  rset_clear(allow, tmp2);
-
-  /* Key not found in chain: load niltv. */
-  l_end = emit_label(as);
-  if (destused)
-    emit_loada(as, dest, niltvg(J2G(as->J)));
-  else
-    *--as->mcp = MIPSI_NOP;
-  /* Follow hash chain until the end. */
-  emit_move(as, dest, tmp1);
-  l_loop = --as->mcp;
-  emit_tsi(as, MIPSI_LW, tmp1, dest, (int32_t)offsetof(Node, next));
-  l_next = emit_label(as);
-
-  /* Type and value comparison. */
-  if (irt_isnum(kt)) {
-    emit_branch(as, MIPSI_BC1T, 0, 0, l_end);
-    emit_fgh(as, MIPSI_C_EQ_D, 0, tmpnum, key);
-	emit_tg(as, MIPSI_MFC1, tmp1, key+1);
-    emit_branch(as, MIPSI_BEQ, tmp1, RID_ZERO, l_next);
-    emit_tsi(as, MIPSI_SLTIU, tmp1, tmp1, (int32_t)LJ_TISNUM);
-    emit_hsi(as, MIPSI_LDC1, tmpnum, dest, (int32_t)offsetof(Node, key.n));
-  } else {
-    if (irt_ispri(kt)) {
-      emit_branch(as, MIPSI_BEQ, tmp1, type, l_end);
-    } else {
-      emit_branch(as, MIPSI_BEQ, tmp2, key, l_end);
-      emit_tsi(as, MIPSI_LW, tmp2, dest, (int32_t)offsetof(Node, key.gcr));
-      emit_branch(as, MIPSI_BNE, tmp1, type, l_next);
-    }
-  }
-  emit_tsi(as, MIPSI_LW, tmp1, dest, (int32_t)offsetof(Node, key.it));
-  *l_loop = MIPSI_BNE | MIPSF_S(tmp1) | ((as->mcp-l_loop-1) & 0xffffu);
-
-  /* Load main position relative to tab->node into dest. */
-  khash = irref_isk(refkey) ? ir_khash(irkey) : 1;
-  if (khash == 0) {
-    emit_tsi(as, MIPSI_LW, dest, tab, (int32_t)offsetof(GCtab, node));
-  } else {
-    Reg tmphash = tmp1;
-    if (irref_isk(refkey))
-      tmphash = ra_allock(as, khash, allow);
-    emit_dst(as, MIPSI_ADDU, dest, dest, tmp1);
-    lua_assert(sizeof(Node) == 24);
-    emit_dst(as, MIPSI_SUBU, tmp1, tmp2, tmp1);
-    emit_dta(as, MIPSI_SLL, tmp1, tmp1, 3);
-    emit_dta(as, MIPSI_SLL, tmp2, tmp1, 5);
-    emit_dst(as, MIPSI_AND, tmp1, tmp2, tmphash);
-    emit_tsi(as, MIPSI_LW, dest, tab, (int32_t)offsetof(GCtab, node));
-    emit_tsi(as, MIPSI_LW, tmp2, tab, (int32_t)offsetof(GCtab, hmask));
-    if (irref_isk(refkey)) {
-      /* Nothing to do. */
-    } else if (irt_isstr(kt)) {
-      emit_tsi(as, MIPSI_LW, tmp1, key, (int32_t)offsetof(GCstr, hash));
-    } else {  /* Must match with hash*() in lj_tab.c. */
-      emit_dst(as, MIPSI_SUBU, tmp1, tmp1, tmp2);
-      emit_rotr(as, tmp2, tmp2, dest, (-HASH_ROT3)&31);
-      emit_dst(as, MIPSI_XOR, tmp1, tmp1, tmp2);
-      emit_rotr(as, tmp1, tmp1, dest, (-HASH_ROT2-HASH_ROT1)&31);
-      emit_dst(as, MIPSI_SUBU, tmp2, tmp2, dest);
-      if (irt_isnum(kt)) {
-	emit_dst(as, MIPSI_XOR, tmp2, tmp2, tmp1);
-	if ((as->flags & JIT_F_MIPS32R2)) {
-	  emit_dta(as, MIPSI_ROTR, dest, tmp1, (-HASH_ROT1)&31);
-	} else {
-	  emit_dst(as, MIPSI_OR, dest, dest, tmp1);
-	  emit_dta(as, MIPSI_SLL, tmp1, tmp1, HASH_ROT1);
-	  emit_dta(as, MIPSI_SRL, dest, tmp1, (-HASH_ROT1)&31);
-	}
-	emit_dst(as, MIPSI_ADDU, tmp1, tmp1, tmp1);
-	emit_tg(as, MIPSI_MFC1, tmp2, key);
-	emit_tg(as, MIPSI_MFC1, tmp1, key+1);
-      } else {
-	emit_dst(as, MIPSI_XOR, tmp2, key, tmp1);
-	emit_rotr(as, dest, tmp1, tmp2, (-HASH_ROT1)&31);
-	emit_dst(as, MIPSI_ADDU, tmp1, key, ra_allock(as, HASH_BIAS, allow));
-      }
-    }
-  }
-}
-
-static void asm_hrefk(ASMState *as, IRIns *ir)
-{
-  IRIns *kslot = IR(ir->op2);
-  IRIns *irkey = IR(kslot->op1);
-  int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node));
-  int32_t kofs = ofs + (int32_t)offsetof(Node, key);
-  Reg dest = (ra_used(ir)||ofs > 32736) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
-  Reg node = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg key = RID_NONE, type = RID_TMP, idx = node;
-  RegSet allow = rset_exclude(RSET_GPR, node);
-  int32_t lo, hi;
-  lua_assert(ofs % sizeof(Node) == 0);
-  if (ofs > 32736) {
-    idx = dest;
-    rset_clear(allow, dest);
-    kofs = (int32_t)offsetof(Node, key);
-  } else if (ra_hasreg(dest)) {
-    emit_tsi(as, MIPSI_ADDIU, dest, node, ofs);
-  }
-  if (!irt_ispri(irkey->t)) {
-    key = ra_scratch(as, allow);
-    rset_clear(allow, key);
-  }
-  if (irt_isnum(irkey->t)) {
-    lo = (int32_t)ir_knum(irkey)->u32.lo;
-    hi = (int32_t)ir_knum(irkey)->u32.hi;
-  } else {
-    lo = irkey->i;
-    hi = irt_toitype(irkey->t);
-    if (!ra_hasreg(key))
-      goto nolo;
-  }
-  asm_guard(as, MIPSI_BNE, key, lo ? ra_allock(as, lo, allow) : RID_ZERO);
-nolo:
-  asm_guard(as, MIPSI_BNE, type, hi ? ra_allock(as, hi, allow) : RID_ZERO);
-  if (ra_hasreg(key)) emit_tsi(as, MIPSI_LW, key, idx, kofs+(LJ_BE?4:0));
-  emit_tsi(as, MIPSI_LW, type, idx, kofs+(LJ_BE?0:4));
-  if (ofs > 32736)
-    emit_tsi(as, MIPSI_ADDU, dest, node, ra_allock(as, ofs, allow));
-}
-
-static void asm_newref(ASMState *as, IRIns *ir)
-{
-  if (ir->r != RID_SINK) {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
-    IRRef args[3];
-    args[0] = ASMREF_L;     /* lua_State *L */
-    args[1] = ir->op1;      /* GCtab *t     */
-    args[2] = ASMREF_TMP1;  /* cTValue *key */
-    asm_setupresult(as, ir, ci);  /* TValue * */
-    asm_gencall(as, ci, args);
-    asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2);
-  }
-}
-
-static void asm_uref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op1)) {
-    GCfunc *fn = ir_kfunc(IR(ir->op1));
-    MRef *v = &gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.v;
-    emit_lsptr(as, MIPSI_LW, dest, v, RSET_GPR);
-  } else {
-    Reg uv = ra_scratch(as, RSET_GPR);
-    Reg func = ra_alloc1(as, ir->op1, RSET_GPR);
-    if (ir->o == IR_UREFC) {
-      asm_guard(as, MIPSI_BEQ, RID_TMP, RID_ZERO);
-      emit_tsi(as, MIPSI_ADDIU, dest, uv, (int32_t)offsetof(GCupval, tv));
-      emit_tsi(as, MIPSI_LBU, RID_TMP, uv, (int32_t)offsetof(GCupval, closed));
-    } else {
-      emit_tsi(as, MIPSI_LW, dest, uv, (int32_t)offsetof(GCupval, v));
-    }
-    emit_tsi(as, MIPSI_LW, uv, func,
-	     (int32_t)offsetof(GCfuncL, uvptr) + 4*(int32_t)(ir->op2 >> 8));
-  }
-}
-
-static void asm_fref(ASMState *as, IRIns *ir)
-{
-  UNUSED(as); UNUSED(ir);
-  lua_assert(!ra_used(ir));
-}
-
-static void asm_strref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  IRRef ref = ir->op2, refk = ir->op1;
-  int32_t ofs = (int32_t)sizeof(GCstr);
-  Reg r;
-  if (irref_isk(ref)) {
-    IRRef tmp = refk; refk = ref; ref = tmp;
-  } else if (!irref_isk(refk)) {
-    Reg right, left = ra_alloc1(as, ir->op1, RSET_GPR);
-    IRIns *irr = IR(ir->op2);
-    if (ra_hasreg(irr->r)) {
-      ra_noweak(as, irr->r);
-      right = irr->r;
-    } else if (mayfuse(as, irr->op2) &&
-	       irr->o == IR_ADD && irref_isk(irr->op2) &&
-	       checki16(ofs + IR(irr->op2)->i)) {
-      ofs += IR(irr->op2)->i;
-      right = ra_alloc1(as, irr->op1, rset_exclude(RSET_GPR, left));
-    } else {
-      right = ra_allocref(as, ir->op2, rset_exclude(RSET_GPR, left));
-    }
-    emit_tsi(as, MIPSI_ADDIU, dest, dest, ofs);
-    emit_dst(as, MIPSI_ADDU, dest, left, right);
-    return;
-  }
-  r = ra_alloc1(as, ref, RSET_GPR);
-  ofs += IR(refk)->i;
-  if (checki16(ofs))
-    emit_tsi(as, MIPSI_ADDIU, dest, r, ofs);
-  else
-    emit_dst(as, MIPSI_ADDU, dest, r,
-	     ra_allock(as, ofs, rset_exclude(RSET_GPR, r)));
-}
-
-/* -- Loads and stores ---------------------------------------------------- */
-
-static MIPSIns asm_fxloadins(IRIns *ir)
-{
-  switch (irt_type(ir->t)) {
-  case IRT_I8: return MIPSI_LB;
-  case IRT_U8: return MIPSI_LBU;
-  case IRT_I16: return MIPSI_LH;
-  case IRT_U16: return MIPSI_LHU;
-  case IRT_NUM: return MIPSI_LDC1;
-  case IRT_FLOAT: return MIPSI_LWC1;
-  default: return MIPSI_LW;
-  }
-}
-
-static MIPSIns asm_fxstoreins(IRIns *ir)
-{
-  switch (irt_type(ir->t)) {
-  case IRT_I8: case IRT_U8: return MIPSI_SB;
-  case IRT_I16: case IRT_U16: return MIPSI_SH;
-  case IRT_NUM: return MIPSI_SDC1;
-  case IRT_FLOAT: return MIPSI_SWC1;
-  default: return MIPSI_SW;
-  }
-}
-
-static void asm_fload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg idx = ra_alloc1(as, ir->op1, RSET_GPR);
-  MIPSIns mi = asm_fxloadins(ir);
-  int32_t ofs;
-  if (ir->op2 == IRFL_TAB_ARRAY) {
-    ofs = asm_fuseabase(as, ir->op1);
-    if (ofs) {  /* Turn the t->array load into an add for colocated arrays. */
-      emit_tsi(as, MIPSI_ADDIU, dest, idx, ofs);
-      return;
-    }
-  }
-  ofs = field_ofs[ir->op2];
-  lua_assert(!irt_isfp(ir->t));
-  emit_tsi(as, mi, dest, idx, ofs);
-}
-
-static void asm_fstore(ASMState *as, IRIns *ir)
-{
-  if (ir->r != RID_SINK) {
-    Reg src = ra_alloc1z(as, ir->op2, RSET_GPR);
-    IRIns *irf = IR(ir->op1);
-    Reg idx = ra_alloc1(as, irf->op1, rset_exclude(RSET_GPR, src));
-    int32_t ofs = field_ofs[irf->op2];
-    MIPSIns mi = asm_fxstoreins(ir);
-    lua_assert(!irt_isfp(ir->t));
-    emit_tsi(as, mi, src, idx, ofs);
-  }
-}
-
-static void asm_xload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR);
-  lua_assert(!(ir->op2 & IRXLOAD_UNALIGNED));
-  asm_fusexref(as, asm_fxloadins(ir), dest, ir->op1, RSET_GPR, 0);
-}
-
-static void asm_xstore(ASMState *as, IRIns *ir, int32_t ofs)
-{
-  if (ir->r != RID_SINK) {
-    Reg src = ra_alloc1z(as, ir->op2, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR);
-    asm_fusexref(as, asm_fxstoreins(ir), src, ir->op1,
-		 rset_exclude(RSET_GPR, src), ofs);
-  }
-}
-
-static void asm_ahuvload(ASMState *as, IRIns *ir)
-{
-  IRType1 t = ir->t;
-  Reg dest = RID_NONE, type = RID_TMP, idx;
-  RegSet allow = RSET_GPR;
-  int32_t ofs = 0;
-  if (ra_used(ir)) {
-    lua_assert(irt_isnum(t) || irt_isint(t) || irt_isaddr(t));
-    dest = ra_dest(as, ir, irt_isnum(t) ? RSET_FPR : RSET_GPR);
-    rset_clear(allow, dest);
-  }
-  idx = asm_fuseahuref(as, ir->op1, &ofs, allow);
-  rset_clear(allow, idx);
-  if (irt_isnum(t)) {
-    asm_guard(as, MIPSI_BEQ, type, RID_ZERO);
-    emit_tsi(as, MIPSI_SLTIU, type, type, (int32_t)LJ_TISNUM);
-    if (ra_hasreg(dest))
-      emit_hsi(as, MIPSI_LDC1, dest, idx, ofs);
-  } else {
-    asm_guard(as, MIPSI_BNE, type, ra_allock(as, irt_toitype(t), allow));
-    if (ra_hasreg(dest)) emit_tsi(as, MIPSI_LW, dest, idx, ofs+(LJ_BE?4:0));
-  }
-  emit_tsi(as, MIPSI_LW, type, idx, ofs+(LJ_BE?0:4));
-}
-
-static void asm_ahustore(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_GPR;
-  Reg idx, src = RID_NONE, type = RID_NONE;
-  int32_t ofs = 0;
-  if (ir->r == RID_SINK)
-    return;
-  if (irt_isnum(ir->t)) {
-    src = ra_alloc1(as, ir->op2, RSET_FPR);
-  } else {
-    if (!irt_ispri(ir->t)) {
-      src = ra_alloc1(as, ir->op2, allow);
-      rset_clear(allow, src);
-    }
-    type = ra_allock(as, (int32_t)irt_toitype(ir->t), allow);
-    rset_clear(allow, type);
-  }
-  idx = asm_fuseahuref(as, ir->op1, &ofs, allow);
-  if (irt_isnum(ir->t)) {
-    emit_hsi(as, MIPSI_SDC1, src, idx, ofs);
-  } else {
-    if (ra_hasreg(src))
-      emit_tsi(as, MIPSI_SW, src, idx, ofs+(LJ_BE?4:0));
-    emit_tsi(as, MIPSI_SW, type, idx, ofs+(LJ_BE?0:4));
-  }
-}
-
-static void asm_sload(ASMState *as, IRIns *ir)
-{
-  int32_t ofs = 8*((int32_t)ir->op1-1) + ((ir->op2 & IRSLOAD_FRAME) ? 4 : 0);
-  IRType1 t = ir->t;
-  Reg dest = RID_NONE, type = RID_NONE, base;
-  RegSet allow = RSET_GPR;
-  lua_assert(!(ir->op2 & IRSLOAD_PARENT));  /* Handled by asm_head_side(). */
-  lua_assert(irt_isguard(t) || !(ir->op2 & IRSLOAD_TYPECHECK));
-  lua_assert(!irt_isint(t) || (ir->op2 & (IRSLOAD_CONVERT|IRSLOAD_FRAME)));
-  if ((ir->op2 & IRSLOAD_CONVERT) && irt_isguard(t) && irt_isint(t)) {
-    dest = ra_scratch(as, RSET_FPR);
-    asm_tointg(as, ir, dest);
-    t.irt = IRT_NUM;  /* Continue with a regular number type check. */
-  } else if (ra_used(ir)) {
-    lua_assert(irt_isnum(t) || irt_isint(t) || irt_isaddr(t));
-    dest = ra_dest(as, ir, irt_isnum(t) ? RSET_FPR : RSET_GPR);
-    rset_clear(allow, dest);
-    base = ra_alloc1(as, REF_BASE, allow);
-    rset_clear(allow, base);
-    if ((ir->op2 & IRSLOAD_CONVERT)) {
-      if (irt_isint(t)) {
-	Reg tmp = ra_scratch(as, RSET_FPR);
-	emit_tg(as, MIPSI_MFC1, dest, tmp);
-	emit_fg(as, MIPSI_CVT_W_D, tmp, tmp);
-	dest = tmp;
-	t.irt = IRT_NUM;  /* Check for original type. */
-      } else {
-	Reg tmp = ra_scratch(as, RSET_GPR);
-	emit_fg(as, MIPSI_CVT_D_W, dest, dest);
-	emit_tg(as, MIPSI_MTC1, tmp, dest);
-	dest = tmp;
-	t.irt = IRT_INT;  /* Check for original type. */
-      }
-    }
-    goto dotypecheck;
-  }
-  base = ra_alloc1(as, REF_BASE, allow);
-  rset_clear(allow, base);
-dotypecheck:
-  if (irt_isnum(t)) {
-    if ((ir->op2 & IRSLOAD_TYPECHECK)) {
-      asm_guard(as, MIPSI_BEQ, RID_TMP, RID_ZERO);
-      emit_tsi(as, MIPSI_SLTIU, RID_TMP, RID_TMP, (int32_t)LJ_TISNUM);
-      type = RID_TMP;
-    }
-    if (ra_hasreg(dest)) emit_hsi(as, MIPSI_LDC1, dest, base, ofs);
-  } else {
-    if ((ir->op2 & IRSLOAD_TYPECHECK)) {
-      Reg ktype = ra_allock(as, irt_toitype(t), allow);
-      asm_guard(as, MIPSI_BNE, RID_TMP, ktype);
-      type = RID_TMP;
-    }
-    if (ra_hasreg(dest)) emit_tsi(as, MIPSI_LW, dest, base, ofs ^ (LJ_BE?4:0));
-  }
-  if (ra_hasreg(type)) emit_tsi(as, MIPSI_LW, type, base, ofs ^ (LJ_BE?0:4));
-}
-
-/* -- Allocations --------------------------------------------------------- */
-
-#if LJ_HASFFI
-static void asm_cnew(ASMState *as, IRIns *ir)
-{
-  CTState *cts = ctype_ctsG(J2G(as->J));
-  CTypeID ctypeid = (CTypeID)IR(ir->op1)->i;
-  CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ?
-	      lj_ctype_size(cts, ctypeid) : (CTSize)IR(ir->op2)->i;
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco];
-  IRRef args[2];
-  RegSet allow = (RSET_GPR & ~RSET_SCRATCH);
-  RegSet drop = RSET_SCRATCH;
-  lua_assert(sz != CTSIZE_INVALID);
-
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ASMREF_TMP1;  /* MSize size   */
-  as->gcsteps++;
-
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);
-  if (ra_used(ir))
-    ra_destreg(as, ir, RID_RET);  /* GCcdata * */
-
-  /* Initialize immutable cdata object. */
-  if (ir->o == IR_CNEWI) {
-    int32_t ofs = sizeof(GCcdata);
-    lua_assert(sz == 4 || sz == 8);
-    if (sz == 8) {
-      ofs += 4;
-      lua_assert((ir+1)->o == IR_HIOP);
-      if (LJ_LE) ir++;
-    }
-    for (;;) {
-      Reg r = ra_alloc1z(as, ir->op2, allow);
-      emit_tsi(as, MIPSI_SW, r, RID_RET, ofs);
-      rset_clear(allow, r);
-      if (ofs == sizeof(GCcdata)) break;
-      ofs -= 4; if (LJ_BE) ir++; else ir--;
-    }
-  }
-  /* Initialize gct and ctypeid. lj_mem_newgco() already sets marked. */
-  emit_tsi(as, MIPSI_SB, RID_RET+1, RID_RET, offsetof(GCcdata, gct));
-  emit_tsi(as, MIPSI_SH, RID_TMP, RID_RET, offsetof(GCcdata, ctypeid));
-  emit_ti(as, MIPSI_LI, RID_RET+1, ~LJ_TCDATA);
-  emit_ti(as, MIPSI_LI, RID_TMP, ctypeid); /* Lower 16 bit used. Sign-ext ok. */
-  asm_gencall(as, ci, args);
-  ra_allockreg(as, (int32_t)(sz+sizeof(GCcdata)),
-	       ra_releasetmp(as, ASMREF_TMP1));
-}
-#else
-#define asm_cnew(as, ir)	((void)0)
-#endif
-
-/* -- Write barriers ------------------------------------------------------ */
-
-static void asm_tbar(ASMState *as, IRIns *ir)
-{
-  Reg tab = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg mark = ra_scratch(as, rset_exclude(RSET_GPR, tab));
-  Reg link = RID_TMP;
-  MCLabel l_end = emit_label(as);
-  emit_tsi(as, MIPSI_SW, link, tab, (int32_t)offsetof(GCtab, gclist));
-  emit_tsi(as, MIPSI_SB, mark, tab, (int32_t)offsetof(GCtab, marked));
-  emit_setgl(as, tab, gc.grayagain);
-  emit_getgl(as, link, gc.grayagain);
-  emit_dst(as, MIPSI_XOR, mark, mark, RID_TMP);  /* Clear black bit. */
-  emit_branch(as, MIPSI_BEQ, RID_TMP, RID_ZERO, l_end);
-  emit_tsi(as, MIPSI_ANDI, RID_TMP, mark, LJ_GC_BLACK);
-  emit_tsi(as, MIPSI_LBU, mark, tab, (int32_t)offsetof(GCtab, marked));
-}
-
-static void asm_obar(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_barrieruv];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg obj, val, tmp;
-  /* No need for other object barriers (yet). */
-  lua_assert(IR(ir->op1)->o == IR_UREFC);
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ir->op1;      /* TValue *tv      */
-  asm_gencall(as, ci, args);
-  emit_tsi(as, MIPSI_ADDIU, ra_releasetmp(as, ASMREF_TMP1), RID_JGL, -32768);
-  obj = IR(ir->op1)->r;
-  tmp = ra_scratch(as, rset_exclude(RSET_GPR, obj));
-  emit_branch(as, MIPSI_BEQ, RID_TMP, RID_ZERO, l_end);
-  emit_tsi(as, MIPSI_ANDI, tmp, tmp, LJ_GC_BLACK);
-  emit_branch(as, MIPSI_BEQ, RID_TMP, RID_ZERO, l_end);
-  emit_tsi(as, MIPSI_ANDI, RID_TMP, RID_TMP, LJ_GC_WHITES);
-  val = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, obj));
-  emit_tsi(as, MIPSI_LBU, tmp, obj,
-	   (int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv));
-  emit_tsi(as, MIPSI_LBU, RID_TMP, val, (int32_t)offsetof(GChead, marked));
-}
-
-/* -- Arithmetic and logic operations ------------------------------------- */
-
-static void asm_fparith(ASMState *as, IRIns *ir, MIPSIns mi)
-{
-  Reg dest = ra_dest(as, ir, RSET_FPR);
-  Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-  right = (left >> 8); left &= 255;
-  emit_fgh(as, mi, dest, left, right);
-}
-
-static void asm_fpunary(ASMState *as, IRIns *ir, MIPSIns mi)
-{
-  Reg dest = ra_dest(as, ir, RSET_FPR);
-  Reg left = ra_hintalloc(as, ir->op1, dest, RSET_FPR);
-  emit_fg(as, mi, dest, left);
-}
-
-static int asm_fpjoin_pow(ASMState *as, IRIns *ir)
-{
-  IRIns *irp = IR(ir->op1);
-  if (irp == ir-1 && irp->o == IR_MUL && !ra_used(irp)) {
-    IRIns *irpp = IR(irp->op1);
-    if (irpp == ir-2 && irpp->o == IR_FPMATH &&
-	irpp->op2 == IRFPM_LOG2 && !ra_used(irpp)) {
-      const CCallInfo *ci = &lj_ir_callinfo[IRCALL_pow];
-      IRRef args[2];
-      args[0] = irpp->op1;
-      args[1] = irp->op2;
-      asm_setupresult(as, ir, ci);
-      asm_gencall(as, ci, args);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-static void asm_add(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    asm_fparith(as, ir, MIPSI_ADD_D);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg right, left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    if (irref_isk(ir->op2)) {
-      int32_t k = IR(ir->op2)->i;
-      if (checki16(k)) {
-	emit_tsi(as, MIPSI_ADDIU, dest, left, k);
-	return;
-      }
-    }
-    right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-    emit_dst(as, MIPSI_ADDU, dest, left, right);
-  }
-}
-
-static void asm_sub(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    asm_fparith(as, ir, MIPSI_SUB_D);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-    right = (left >> 8); left &= 255;
-    emit_dst(as, MIPSI_SUBU, dest, left, right);
-  }
-}
-
-static void asm_mul(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    asm_fparith(as, ir, MIPSI_MUL_D);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-    right = (left >> 8); left &= 255;
-    emit_dst(as, MIPSI_MUL, dest, left, right);
-  }
-}
-
-static void asm_neg(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    asm_fpunary(as, ir, MIPSI_NEG_D);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    emit_dst(as, MIPSI_SUBU, dest, RID_ZERO, left);
-  }
-}
-
-static void asm_arithov(ASMState *as, IRIns *ir)
-{
-  Reg right, left, tmp, dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int k = IR(ir->op2)->i;
-    if (ir->o == IR_SUBOV) k = -k;
-    if (checki16(k)) {  /* (dest < left) == (k >= 0 ? 1 : 0) */
-      left = ra_alloc1(as, ir->op1, RSET_GPR);
-      asm_guard(as, k >= 0 ? MIPSI_BNE : MIPSI_BEQ, RID_TMP, RID_ZERO);
-      emit_dst(as, MIPSI_SLT, RID_TMP, dest, dest == left ? RID_TMP : left);
-      emit_tsi(as, MIPSI_ADDIU, dest, left, k);
-      if (dest == left) emit_move(as, RID_TMP, left);
-      return;
-    }
-  }
-  left = ra_alloc2(as, ir, RSET_GPR);
-  right = (left >> 8); left &= 255;
-  tmp = ra_scratch(as, rset_exclude(rset_exclude(rset_exclude(RSET_GPR, left),
-						 right), dest));
-  asm_guard(as, MIPSI_BLTZ, RID_TMP, 0);
-  emit_dst(as, MIPSI_AND, RID_TMP, RID_TMP, tmp);
-  if (ir->o == IR_ADDOV) {  /* ((dest^left) & (dest^right)) < 0 */
-    emit_dst(as, MIPSI_XOR, RID_TMP, dest, dest == right ? RID_TMP : right);
-  } else {  /* ((dest^left) & (dest^~right)) < 0 */
-    emit_dst(as, MIPSI_XOR, RID_TMP, RID_TMP, dest);
-    emit_dst(as, MIPSI_NOR, RID_TMP, dest == right ? RID_TMP : right, RID_ZERO);
-  }
-  emit_dst(as, MIPSI_XOR, tmp, dest, dest == left ? RID_TMP : left);
-  emit_dst(as, ir->o == IR_ADDOV ? MIPSI_ADDU : MIPSI_SUBU, dest, left, right);
-  if (dest == left || dest == right)
-    emit_move(as, RID_TMP, dest == left ? left : right);
-}
-
-static void asm_mulov(ASMState *as, IRIns *ir)
-{
-#if LJ_DUALNUM
-#error "NYI: MULOV"
-#else
-  UNUSED(as); UNUSED(ir); lua_assert(0);  /* Unused in single-number mode. */
-#endif
-}
-
-#if LJ_HASFFI
-static void asm_add64(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg right, left = ra_alloc1(as, ir->op1, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    if (k == 0) {
-      emit_dst(as, MIPSI_ADDU, dest, left, RID_TMP);
-      goto loarith;
-    } else if (checki16(k)) {
-      emit_dst(as, MIPSI_ADDU, dest, dest, RID_TMP);
-      emit_tsi(as, MIPSI_ADDIU, dest, left, k);
-      goto loarith;
-    }
-  }
-  emit_dst(as, MIPSI_ADDU, dest, dest, RID_TMP);
-  right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  emit_dst(as, MIPSI_ADDU, dest, left, right);
-loarith:
-  ir--;
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc1(as, ir->op1, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    if (k == 0) {
-      if (dest != left)
-	emit_move(as, dest, left);
-      return;
-    } else if (checki16(k)) {
-      if (dest == left) {
-	Reg tmp = ra_scratch(as, rset_exclude(RSET_GPR, left));
-	emit_move(as, dest, tmp);
-	dest = tmp;
-      }
-      emit_dst(as, MIPSI_SLTU, RID_TMP, dest, left);
-      emit_tsi(as, MIPSI_ADDIU, dest, left, k);
-      return;
-    }
-  }
-  right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  if (dest == left && dest == right) {
-    Reg tmp = ra_scratch(as, rset_exclude(rset_exclude(RSET_GPR, left), right));
-    emit_move(as, dest, tmp);
-    dest = tmp;
-  }
-  emit_dst(as, MIPSI_SLTU, RID_TMP, dest, dest == left ? right : left);
-  emit_dst(as, MIPSI_ADDU, dest, left, right);
-}
-
-static void asm_sub64(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-  right = (left >> 8); left &= 255;
-  emit_dst(as, MIPSI_SUBU, dest, dest, RID_TMP);
-  emit_dst(as, MIPSI_SUBU, dest, left, right);
-  ir--;
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc2(as, ir, RSET_GPR);
-  right = (left >> 8); left &= 255;
-  if (dest == left) {
-    Reg tmp = ra_scratch(as, rset_exclude(rset_exclude(RSET_GPR, left), right));
-    emit_move(as, dest, tmp);
-    dest = tmp;
-  }
-  emit_dst(as, MIPSI_SLTU, RID_TMP, left, dest);
-  emit_dst(as, MIPSI_SUBU, dest, left, right);
-}
-
-static void asm_neg64(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-  emit_dst(as, MIPSI_SUBU, dest, dest, RID_TMP);
-  emit_dst(as, MIPSI_SUBU, dest, RID_ZERO, left);
-  ir--;
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc1(as, ir->op1, RSET_GPR);
-  emit_dst(as, MIPSI_SLTU, RID_TMP, RID_ZERO, dest);
-  emit_dst(as, MIPSI_SUBU, dest, RID_ZERO, left);
-}
-#endif
-
-static void asm_bitnot(ASMState *as, IRIns *ir)
-{
-  Reg left, right, dest = ra_dest(as, ir, RSET_GPR);
-  IRIns *irl = IR(ir->op1);
-  if (mayfuse(as, ir->op1) && irl->o == IR_BOR) {
-    left = ra_alloc2(as, irl, RSET_GPR);
-    right = (left >> 8); left &= 255;
-  } else {
-    left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    right = RID_ZERO;
-  }
-  emit_dst(as, MIPSI_NOR, dest, left, right);
-}
-
-static void asm_bitswap(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-  if ((as->flags & JIT_F_MIPS32R2)) {
-    emit_dta(as, MIPSI_ROTR, dest, RID_TMP, 16);
-    emit_dst(as, MIPSI_WSBH, RID_TMP, 0, left);
-  } else {
-    Reg tmp = ra_scratch(as, rset_exclude(rset_exclude(RSET_GPR, left), dest));
-    emit_dst(as, MIPSI_OR, dest, dest, tmp);
-    emit_dst(as, MIPSI_OR, dest, dest, RID_TMP);
-    emit_tsi(as, MIPSI_ANDI, dest, dest, 0xff00);
-    emit_dta(as, MIPSI_SLL, RID_TMP, RID_TMP, 8);
-    emit_dta(as, MIPSI_SRL, dest, left, 8);
-    emit_tsi(as, MIPSI_ANDI, RID_TMP, left, 0xff00);
-    emit_dst(as, MIPSI_OR, tmp, tmp, RID_TMP);
-    emit_dta(as, MIPSI_SRL, tmp, left, 24);
-    emit_dta(as, MIPSI_SLL, RID_TMP, left, 24);
-  }
-}
-
-static void asm_bitop(ASMState *as, IRIns *ir, MIPSIns mi, MIPSIns mik)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg right, left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    if (checku16(k)) {
-      emit_tsi(as, mik, dest, left, k);
-      return;
-    }
-  }
-  right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  emit_dst(as, mi, dest, left, right);
-}
-
-static void asm_bitshift(ASMState *as, IRIns *ir, MIPSIns mi, MIPSIns mik)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op2)) {  /* Constant shifts. */
-    uint32_t shift = (uint32_t)(IR(ir->op2)->i & 31);
-    emit_dta(as, mik, dest, ra_hintalloc(as, ir->op1, dest, RSET_GPR), shift);
-  } else {
-    Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-    right = (left >> 8); left &= 255;
-    emit_dst(as, mi, dest, right, left);  /* Shift amount is in rs. */
-  }
-}
-
-static void asm_bitror(ASMState *as, IRIns *ir)
-{
-  if ((as->flags & JIT_F_MIPS32R2)) {
-    asm_bitshift(as, ir, MIPSI_ROTRV, MIPSI_ROTR);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    if (irref_isk(ir->op2)) {  /* Constant shifts. */
-      uint32_t shift = (uint32_t)(IR(ir->op2)->i & 31);
-      Reg left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-      emit_rotr(as, dest, left, RID_TMP, shift);
-    } else {
-      Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-      right = (left >> 8); left &= 255;
-      emit_dst(as, MIPSI_OR, dest, dest, RID_TMP);
-      emit_dst(as, MIPSI_SRLV, dest, right, left);
-      emit_dst(as, MIPSI_SLLV, RID_TMP, RID_TMP, left);
-      emit_dst(as, MIPSI_SUBU, RID_TMP, ra_allock(as, 32, RSET_GPR), right);
-    }
-  }
-}
-
-static void asm_min_max(ASMState *as, IRIns *ir, int ismax)
-{
-  if (irt_isnum(ir->t)) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-    right = (left >> 8); left &= 255;
-    if (dest == left) {
-      emit_fg(as, MIPSI_MOVT_D, dest, right);
-    } else {
-      emit_fg(as, MIPSI_MOVF_D, dest, left);
-      if (dest != right) emit_fg(as, MIPSI_MOV_D, dest, right);
-    }
-    emit_fgh(as, MIPSI_C_OLT_D, 0, ismax ? left : right, ismax ? right : left);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-    right = (left >> 8); left &= 255;
-    if (dest == left) {
-      emit_dst(as, MIPSI_MOVN, dest, right, RID_TMP);
-    } else {
-      emit_dst(as, MIPSI_MOVZ, dest, left, RID_TMP);
-      if (dest != right) emit_move(as, dest, right);
-    }
-    emit_dst(as, MIPSI_SLT, RID_TMP,
-	     ismax ? left : right, ismax ? right : left);
-  }
-}
-
-/* -- Comparisons --------------------------------------------------------- */
-
-static void asm_comp(ASMState *as, IRIns *ir)
-{
-  /* ORDER IR: LT GE LE GT  ULT UGE ULE UGT. */
-  IROp op = ir->o;
-  if (irt_isnum(ir->t)) {
-    Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-    right = (left >> 8); left &= 255;
-    asm_guard(as, (op&1) ? MIPSI_BC1T : MIPSI_BC1F, 0, 0);
-    emit_fgh(as, MIPSI_C_OLT_D + ((op&3) ^ ((op>>2)&1)), 0, left, right);
-  } else {
-    Reg right, left = ra_alloc1(as, ir->op1, RSET_GPR);
-    if (op == IR_ABC) op = IR_UGT;
-    if ((op&4) == 0 && irref_isk(ir->op2) && IR(ir->op2)->i == 0) {
-      MIPSIns mi = (op&2) ? ((op&1) ? MIPSI_BLEZ : MIPSI_BGTZ) :
-			    ((op&1) ? MIPSI_BLTZ : MIPSI_BGEZ);
-      asm_guard(as, mi, left, 0);
-    } else {
-      if (irref_isk(ir->op2)) {
-	int32_t k = IR(ir->op2)->i;
-	if ((op&2)) k++;
-	if (checki16(k)) {
-	  asm_guard(as, (op&1) ? MIPSI_BNE : MIPSI_BEQ, RID_TMP, RID_ZERO);
-	  emit_tsi(as, (op&4) ? MIPSI_SLTIU : MIPSI_SLTI,
-		   RID_TMP, left, k);
-	  return;
-	}
-      }
-      right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-      asm_guard(as, ((op^(op>>1))&1) ? MIPSI_BNE : MIPSI_BEQ, RID_TMP, RID_ZERO);
-      emit_dst(as, (op&4) ? MIPSI_SLTU : MIPSI_SLT,
-	       RID_TMP, (op&2) ? right : left, (op&2) ? left : right);
-    }
-  }
-}
-
-static void asm_compeq(ASMState *as, IRIns *ir)
-{
-  Reg right, left = ra_alloc2(as, ir, irt_isnum(ir->t) ? RSET_FPR : RSET_GPR);
-  right = (left >> 8); left &= 255;
-  if (irt_isnum(ir->t)) {
-    asm_guard(as, (ir->o & 1) ? MIPSI_BC1T : MIPSI_BC1F, 0, 0);
-    emit_fgh(as, MIPSI_C_EQ_D, 0, left, right);
-  } else {
-    asm_guard(as, (ir->o & 1) ? MIPSI_BEQ : MIPSI_BNE, left, right);
-  }
-}
-
-#if LJ_HASFFI
-/* 64 bit integer comparisons. */
-static void asm_comp64(ASMState *as, IRIns *ir)
-{
-  /* ORDER IR: LT GE LE GT  ULT UGE ULE UGT. */
-  IROp op = (ir-1)->o;
-  MCLabel l_end;
-  Reg rightlo, leftlo, righthi, lefthi = ra_alloc2(as, ir, RSET_GPR);
-  righthi = (lefthi >> 8); lefthi &= 255;
-  leftlo = ra_alloc2(as, ir-1,
-		     rset_exclude(rset_exclude(RSET_GPR, lefthi), righthi));
-  rightlo = (leftlo >> 8); leftlo &= 255;
-  asm_guard(as, ((op^(op>>1))&1) ? MIPSI_BNE : MIPSI_BEQ, RID_TMP, RID_ZERO);
-  l_end = emit_label(as);
-  if (lefthi != righthi)
-    emit_dst(as, (op&4) ? MIPSI_SLTU : MIPSI_SLT, RID_TMP,
-	     (op&2) ? righthi : lefthi, (op&2) ? lefthi : righthi);
-  emit_dst(as, MIPSI_SLTU, RID_TMP,
-	   (op&2) ? rightlo : leftlo, (op&2) ? leftlo : rightlo);
-  if (lefthi != righthi)
-    emit_branch(as, MIPSI_BEQ, lefthi, righthi, l_end);
-}
-
-static void asm_comp64eq(ASMState *as, IRIns *ir)
-{
-  Reg tmp, right, left = ra_alloc2(as, ir, RSET_GPR);
-  right = (left >> 8); left &= 255;
-  asm_guard(as, ((ir-1)->o & 1) ? MIPSI_BEQ : MIPSI_BNE, RID_TMP, RID_ZERO);
-  tmp = ra_scratch(as, rset_exclude(rset_exclude(RSET_GPR, left), right));
-  emit_dst(as, MIPSI_OR, RID_TMP, RID_TMP, tmp);
-  emit_dst(as, MIPSI_XOR, tmp, left, right);
-  left = ra_alloc2(as, ir-1, RSET_GPR);
-  right = (left >> 8); left &= 255;
-  emit_dst(as, MIPSI_XOR, RID_TMP, left, right);
-}
-#endif
-
-/* -- Support for 64 bit ops in 32 bit mode ------------------------------- */
-
-/* Hiword op of a split 64 bit op. Previous op must be the loword op. */
-static void asm_hiop(ASMState *as, IRIns *ir)
-{
-#if LJ_HASFFI
-  /* HIOP is marked as a store because it needs its own DCE logic. */
-  int uselo = ra_used(ir-1), usehi = ra_used(ir);  /* Loword/hiword used? */
-  if (LJ_UNLIKELY(!(as->flags & JIT_F_OPT_DCE))) uselo = usehi = 1;
-  if ((ir-1)->o == IR_CONV) {  /* Conversions to/from 64 bit. */
-    as->curins--;  /* Always skip the CONV. */
-    if (usehi || uselo)
-      asm_conv64(as, ir);
-    return;
-  } else if ((ir-1)->o < IR_EQ) {  /* 64 bit integer comparisons. ORDER IR. */
-    as->curins--;  /* Always skip the loword comparison. */
-    asm_comp64(as, ir);
-    return;
-  } else if ((ir-1)->o <= IR_NE) {  /* 64 bit integer comparisons. ORDER IR. */
-    as->curins--;  /* Always skip the loword comparison. */
-    asm_comp64eq(as, ir);
-    return;
-  } else if ((ir-1)->o == IR_XSTORE) {
-    as->curins--;  /* Handle both stores here. */
-    if ((ir-1)->r != RID_SINK) {
-      asm_xstore(as, ir, LJ_LE ? 4 : 0);
-      asm_xstore(as, ir-1, LJ_LE ? 0 : 4);
-    }
-    return;
-  }
-  if (!usehi) return;  /* Skip unused hiword op for all remaining ops. */
-  switch ((ir-1)->o) {
-  case IR_ADD: as->curins--; asm_add64(as, ir); break;
-  case IR_SUB: as->curins--; asm_sub64(as, ir); break;
-  case IR_NEG: as->curins--; asm_neg64(as, ir); break;
-  case IR_CALLN:
-  case IR_CALLXS:
-    if (!uselo)
-      ra_allocref(as, ir->op1, RID2RSET(RID_RETLO));  /* Mark lo op as used. */
-    break;
-  case IR_CNEWI:
-    /* Nothing to do here. Handled by lo op itself. */
-    break;
-  default: lua_assert(0); break;
-  }
-#else
-  UNUSED(as); UNUSED(ir); lua_assert(0);  /* Unused without FFI. */
-#endif
-}
-
-/* -- Stack handling ------------------------------------------------------ */
-
-/* Check Lua stack size for overflow. Use exit handler as fallback. */
-static void asm_stack_check(ASMState *as, BCReg topslot,
-			    IRIns *irp, RegSet allow, ExitNo exitno)
-{
-  /* Try to get an unused temp. register, otherwise spill/restore RID_RET*. */
-  Reg tmp, pbase = irp ? (ra_hasreg(irp->r) ? irp->r : RID_TMP) : RID_BASE;
-  ExitNo oldsnap = as->snapno;
-  rset_clear(allow, pbase);
-  tmp = allow ? rset_pickbot(allow) :
-		(pbase == RID_RETHI ? RID_RETLO : RID_RETHI);
-  as->snapno = exitno;
-  asm_guard(as, MIPSI_BNE, RID_TMP, RID_ZERO);
-  as->snapno = oldsnap;
-  if (allow == RSET_EMPTY)  /* Restore temp. register. */
-    emit_tsi(as, MIPSI_LW, tmp, RID_SP, 0);
-  else
-    ra_modified(as, tmp);
-  emit_tsi(as, MIPSI_SLTIU, RID_TMP, RID_TMP, (int32_t)(8*topslot));
-  emit_dst(as, MIPSI_SUBU, RID_TMP, tmp, pbase);
-  emit_tsi(as, MIPSI_LW, tmp, tmp, offsetof(lua_State, maxstack));
-  if (pbase == RID_TMP)
-    emit_getgl(as, RID_TMP, jit_base);
-  emit_getgl(as, tmp, jit_L);
-  if (allow == RSET_EMPTY)  /* Spill temp. register. */
-    emit_tsi(as, MIPSI_SW, tmp, RID_SP, 0);
-}
-
-/* Restore Lua stack from on-trace state. */
-static void asm_stack_restore(ASMState *as, SnapShot *snap)
-{
-  SnapEntry *map = &as->T->snapmap[snap->mapofs];
-  SnapEntry *flinks = &as->T->snapmap[snap_nextofs(as->T, snap)-1];
-  MSize n, nent = snap->nent;
-  /* Store the value of all modified slots to the Lua stack. */
-  for (n = 0; n < nent; n++) {
-    SnapEntry sn = map[n];
-    BCReg s = snap_slot(sn);
-    int32_t ofs = 8*((int32_t)s-1);
-    IRRef ref = snap_ref(sn);
-    IRIns *ir = IR(ref);
-    if ((sn & SNAP_NORESTORE))
-      continue;
-    if (irt_isnum(ir->t)) {
-      Reg src = ra_alloc1(as, ref, RSET_FPR);
-      emit_hsi(as, MIPSI_SDC1, src, RID_BASE, ofs);
-    } else {
-      Reg type;
-      RegSet allow = rset_exclude(RSET_GPR, RID_BASE);
-      lua_assert(irt_ispri(ir->t) || irt_isaddr(ir->t) || irt_isinteger(ir->t));
-      if (!irt_ispri(ir->t)) {
-	Reg src = ra_alloc1(as, ref, allow);
-	rset_clear(allow, src);
-	emit_tsi(as, MIPSI_SW, src, RID_BASE, ofs+(LJ_BE?4:0));
-      }
-      if ((sn & (SNAP_CONT|SNAP_FRAME))) {
-	if (s == 0) continue;  /* Do not overwrite link to previous frame. */
-	type = ra_allock(as, (int32_t)(*flinks--), allow);
-      } else {
-	type = ra_allock(as, (int32_t)irt_toitype(ir->t), allow);
-      }
-      emit_tsi(as, MIPSI_SW, type, RID_BASE, ofs+(LJ_BE?0:4));
-    }
-    checkmclim(as);
-  }
-  lua_assert(map + nent == flinks);
-}
-
-/* -- GC handling --------------------------------------------------------- */
-
-/* Check GC threshold and do one or more GC steps. */
-static void asm_gc_check(ASMState *as)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_step_jit];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg tmp;
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  /* Exit trace if in GCSatomic or GCSfinalize. Avoids syncing GC objects. */
-  /* Assumes asm_snap_prep() already done. */
-  asm_guard(as, MIPSI_BNE, RID_RET, RID_ZERO);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ASMREF_TMP2;  /* MSize steps     */
-  asm_gencall(as, ci, args);
-  emit_tsi(as, MIPSI_ADDIU, ra_releasetmp(as, ASMREF_TMP1), RID_JGL, -32768);
-  tmp = ra_releasetmp(as, ASMREF_TMP2);
-  emit_loadi(as, tmp, as->gcsteps);
-  /* Jump around GC step if GC total < GC threshold. */
-  emit_branch(as, MIPSI_BNE, RID_TMP, RID_ZERO, l_end);
-  emit_dst(as, MIPSI_SLTU, RID_TMP, RID_TMP, tmp);
-  emit_getgl(as, tmp, gc.threshold);
-  emit_getgl(as, RID_TMP, gc.total);
-  as->gcsteps = 0;
-  checkmclim(as);
-}
-
-/* -- Loop handling ------------------------------------------------------- */
-
-/* Fixup the loop branch. */
-static void asm_loop_fixup(ASMState *as)
-{
-  MCode *p = as->mctop;
-  MCode *target = as->mcp;
-  p[-1] = MIPSI_NOP;
-  if (as->loopinv) {  /* Inverted loop branch? */
-    /* asm_guard already inverted the cond branch. Only patch the target. */
-    p[-3] |= ((target-p+2) & 0x0000ffffu);
-  } else {
-    p[-2] = MIPSI_J|(((uintptr_t)target>>2)&0x03ffffffu);
-  }
-}
-
-/* -- Head of trace ------------------------------------------------------- */
-
-/* Coalesce BASE register for a root trace. */
-static void asm_head_root_base(ASMState *as)
-{
-  IRIns *ir = IR(REF_BASE);
-  Reg r = ir->r;
-  if (as->loopinv) as->mctop--;
-  if (ra_hasreg(r)) {
-    ra_free(as, r);
-    if (rset_test(as->modset, r) || irt_ismarked(ir->t))
-      ir->r = RID_INIT;  /* No inheritance for modified BASE register. */
-    if (r != RID_BASE)
-      emit_move(as, r, RID_BASE);
-  }
-}
-
-/* Coalesce BASE register for a side trace. */
-static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow)
-{
-  IRIns *ir = IR(REF_BASE);
-  Reg r = ir->r;
-  if (as->loopinv) as->mctop--;
-  if (ra_hasreg(r)) {
-    ra_free(as, r);
-    if (rset_test(as->modset, r) || irt_ismarked(ir->t))
-      ir->r = RID_INIT;  /* No inheritance for modified BASE register. */
-    if (irp->r == r) {
-      rset_clear(allow, r);  /* Mark same BASE register as coalesced. */
-    } else if (ra_hasreg(irp->r) && rset_test(as->freeset, irp->r)) {
-      rset_clear(allow, irp->r);
-      emit_move(as, r, irp->r);  /* Move from coalesced parent reg. */
-    } else {
-      emit_getgl(as, r, jit_base);  /* Otherwise reload BASE. */
-    }
-  }
-  return allow;
-}
-
-/* -- Tail of trace ------------------------------------------------------- */
-
-/* Fixup the tail code. */
-static void asm_tail_fixup(ASMState *as, TraceNo lnk)
-{
-  MCode *target = lnk ? traceref(as->J,lnk)->mcode : (MCode *)lj_vm_exit_interp;
-  int32_t spadj = as->T->spadjust;
-  MCode *p = as->mctop-1;
-  *p = spadj ? (MIPSI_ADDIU|MIPSF_T(RID_SP)|MIPSF_S(RID_SP)|spadj) : MIPSI_NOP;
-  p[-1] = MIPSI_J|(((uintptr_t)target>>2)&0x03ffffffu);
-}
-
-/* Prepare tail of code. */
-static void asm_tail_prep(ASMState *as)
-{
-  as->mcp = as->mctop-2;  /* Leave room for branch plus nop or stack adj. */
-  as->invmcp = as->loopref ? as->mcp : NULL;
-}
-
-/* -- Instruction dispatch ------------------------------------------------ */
-
-/* Assemble a single instruction. */
-static void asm_ir(ASMState *as, IRIns *ir)
-{
-  switch ((IROp)ir->o) {
-  /* Miscellaneous ops. */
-  case IR_LOOP: asm_loop(as); break;
-  case IR_NOP: case IR_XBAR: lua_assert(!ra_used(ir)); break;
-  case IR_USE:
-    ra_alloc1(as, ir->op1, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR); break;
-  case IR_PHI: asm_phi(as, ir); break;
-  case IR_HIOP: asm_hiop(as, ir); break;
-  case IR_GCSTEP: asm_gcstep(as, ir); break;
-
-  /* Guarded assertions. */
-  case IR_EQ: case IR_NE: asm_compeq(as, ir); break;
-  case IR_LT: case IR_GE: case IR_LE: case IR_GT:
-  case IR_ULT: case IR_UGE: case IR_ULE: case IR_UGT:
-  case IR_ABC:
-    asm_comp(as, ir);
-    break;
-
-  case IR_RETF: asm_retf(as, ir); break;
-
-  /* Bit ops. */
-  case IR_BNOT: asm_bitnot(as, ir); break;
-  case IR_BSWAP: asm_bitswap(as, ir); break;
-
-  case IR_BAND: asm_bitop(as, ir, MIPSI_AND, MIPSI_ANDI); break;
-  case IR_BOR:  asm_bitop(as, ir, MIPSI_OR, MIPSI_ORI); break;
-  case IR_BXOR: asm_bitop(as, ir, MIPSI_XOR, MIPSI_XORI); break;
-
-  case IR_BSHL: asm_bitshift(as, ir, MIPSI_SLLV, MIPSI_SLL); break;
-  case IR_BSHR: asm_bitshift(as, ir, MIPSI_SRLV, MIPSI_SRL); break;
-  case IR_BSAR: asm_bitshift(as, ir, MIPSI_SRAV, MIPSI_SRA); break;
-  case IR_BROL: lua_assert(0); break;
-  case IR_BROR: asm_bitror(as, ir); break;
-
-  /* Arithmetic ops. */
-  case IR_ADD: asm_add(as, ir); break;
-  case IR_SUB: asm_sub(as, ir); break;
-  case IR_MUL: asm_mul(as, ir); break;
-  case IR_DIV: asm_fparith(as, ir, MIPSI_DIV_D); break;
-  case IR_MOD: asm_callid(as, ir, IRCALL_lj_vm_modi); break;
-  case IR_POW: asm_callid(as, ir, IRCALL_lj_vm_powi); break;
-  case IR_NEG: asm_neg(as, ir); break;
-
-  case IR_ABS: asm_fpunary(as, ir, MIPSI_ABS_D); break;
-  case IR_ATAN2: asm_callid(as, ir, IRCALL_atan2); break;
-  case IR_LDEXP: asm_callid(as, ir, IRCALL_ldexp); break;
-  case IR_MIN: asm_min_max(as, ir, 0); break;
-  case IR_MAX: asm_min_max(as, ir, 1); break;
-  case IR_FPMATH:
-    if (ir->op2 == IRFPM_EXP2 && asm_fpjoin_pow(as, ir))
-      break;
-    if (ir->op2 <= IRFPM_TRUNC)
-      asm_callround(as, ir, IRCALL_lj_vm_floor + ir->op2);
-    else if (ir->op2 == IRFPM_SQRT)
-      asm_fpunary(as, ir, MIPSI_SQRT_D);
-    else
-      asm_callid(as, ir, IRCALL_lj_vm_floor + ir->op2);
-    break;
-
-  /* Overflow-checking arithmetic ops. */
-  case IR_ADDOV: asm_arithov(as, ir); break;
-  case IR_SUBOV: asm_arithov(as, ir); break;
-  case IR_MULOV: asm_mulov(as, ir); break;
-
-  /* Memory references. */
-  case IR_AREF: asm_aref(as, ir); break;
-  case IR_HREF: asm_href(as, ir); break;
-  case IR_HREFK: asm_hrefk(as, ir); break;
-  case IR_NEWREF: asm_newref(as, ir); break;
-  case IR_UREFO: case IR_UREFC: asm_uref(as, ir); break;
-  case IR_FREF: asm_fref(as, ir); break;
-  case IR_STRREF: asm_strref(as, ir); break;
-
-  /* Loads and stores. */
-  case IR_ALOAD: case IR_HLOAD: case IR_ULOAD: case IR_VLOAD:
-    asm_ahuvload(as, ir);
-    break;
-  case IR_FLOAD: asm_fload(as, ir); break;
-  case IR_XLOAD: asm_xload(as, ir); break;
-  case IR_SLOAD: asm_sload(as, ir); break;
-
-  case IR_ASTORE: case IR_HSTORE: case IR_USTORE: asm_ahustore(as, ir); break;
-  case IR_FSTORE: asm_fstore(as, ir); break;
-  case IR_XSTORE: asm_xstore(as, ir, 0); break;
-
-  /* Allocations. */
-  case IR_SNEW: case IR_XSNEW: asm_snew(as, ir); break;
-  case IR_TNEW: asm_tnew(as, ir); break;
-  case IR_TDUP: asm_tdup(as, ir); break;
-  case IR_CNEW: case IR_CNEWI: asm_cnew(as, ir); break;
-
-  /* Write barriers. */
-  case IR_TBAR: asm_tbar(as, ir); break;
-  case IR_OBAR: asm_obar(as, ir); break;
-
-  /* Type conversions. */
-  case IR_CONV: asm_conv(as, ir); break;
-  case IR_TOBIT: asm_tobit(as, ir); break;
-  case IR_TOSTR: asm_tostr(as, ir); break;
-  case IR_STRTO: asm_strto(as, ir); break;
-
-  /* Calls. */
-  case IR_CALLN: case IR_CALLL: case IR_CALLS: asm_call(as, ir); break;
-  case IR_CALLXS: asm_callx(as, ir); break;
-  case IR_CARG: break;
-
-  default:
-    setintV(&as->J->errinfo, ir->o);
-    lj_trace_err_info(as->J, LJ_TRERR_NYIIR);
-    break;
-  }
-}
-
-/* -- Trace setup --------------------------------------------------------- */
-
-/* Ensure there are enough stack slots for call arguments. */
-static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  uint32_t i, nargs = (int)CCI_NARGS(ci);
-  int nslots = 4, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR;
-  asm_collectargs(as, ir, ci, args);
-  for (i = 0; i < nargs; i++) {
-    if (args[i] && irt_isfp(IR(args[i])->t) &&
-	nfpr > 0 && !(ci->flags & CCI_VARARG)) {
-      nfpr--;
-      ngpr -= irt_isnum(IR(args[i])->t) ? 2 : 1;
-    } else if (args[i] && irt_isnum(IR(args[i])->t)) {
-      nfpr = 0;
-      ngpr = ngpr & ~1;
-      if (ngpr > 0) ngpr -= 2; else nslots = (nslots+3) & ~1;
-    } else {
-      nfpr = 0;
-      if (ngpr > 0) ngpr--; else nslots++;
-    }
-  }
-  if (nslots > as->evenspill)  /* Leave room for args in stack slots. */
-    as->evenspill = nslots;
-  return irt_isfp(ir->t) ? REGSP_HINT(RID_FPRET) : REGSP_HINT(RID_RET);
-}
-
-static void asm_setup_target(ASMState *as)
-{
-  asm_sparejump_setup(as);
-  asm_exitstub_setup(as);
-}
-
-/* -- Trace patching ------------------------------------------------------ */
-
-/* Patch exit jumps of existing machine code to a new target. */
-void lj_asm_patchexit(jit_State *J, GCtrace *T, ExitNo exitno, MCode *target)
-{
-  MCode *p = T->mcode;
-  MCode *pe = (MCode *)((char *)p + T->szmcode);
-  MCode *px = exitstub_trace_addr(T, exitno);
-  MCode *cstart = NULL, *cstop = NULL;
-  MCode *mcarea = lj_mcode_patch(J, p, 0);
-  MCode exitload = MIPSI_LI | MIPSF_T(RID_TMP) | exitno;
-  MCode tjump = MIPSI_J|(((uintptr_t)target>>2)&0x03ffffffu);
-  for (p++; p < pe; p++) {
-    if (*p == exitload) {  /* Look for load of exit number. */
-      if (((p[-1] ^ (px-p)) & 0xffffu) == 0) {  /* Look for exitstub branch. */
-	ptrdiff_t delta = target - p;
-	if (((delta + 0x8000) >> 16) == 0) {  /* Patch in-range branch. */
-	patchbranch:
-	  p[-1] = (p[-1] & 0xffff0000u) | (delta & 0xffffu);
-	  *p = MIPSI_NOP;  /* Replace the load of the exit number. */
-	  cstop = p;
-	  if (!cstart) cstart = p-1;
-	} else {  /* Branch out of range. Use spare jump slot in mcarea. */
-	  int i;
-	  for (i = 2; i < 2+MIPS_SPAREJUMP*2; i += 2) {
-	    if (mcarea[i] == tjump) {
-	      delta = mcarea+i - p;
-	      goto patchbranch;
-	    } else if (mcarea[i] == MIPSI_NOP) {
-	      mcarea[i] = tjump;
-	      cstart = mcarea+i;
-	      delta = mcarea+i - p;
-	      goto patchbranch;
-	    }
-	  }
-	  /* Ignore jump slot overflow. Child trace is simply not attached. */
-	}
-      } else if (p+1 == pe) {
-	/* Patch NOP after code for inverted loop branch. Use of J is ok. */
-	lua_assert(p[1] == MIPSI_NOP);
-	p[1] = tjump;
-	*p = MIPSI_NOP;  /* Replace the load of the exit number. */
-	cstop = p+2;
-	if (!cstart) cstart = p+1;
-      }
-    }
-  }
-  if (cstart) lj_mcode_sync(cstart, cstop);
-  lj_mcode_patch(J, mcarea, 1);
-}
-
diff --git a/dependencies2013/win32/include/luajit/lj_asm_ppc.h b/dependencies2013/win32/include/luajit/lj_asm_ppc.h
deleted file mode 100644
index d8a14c83..00000000
--- a/dependencies2013/win32/include/luajit/lj_asm_ppc.h
+++ /dev/null
@@ -1,2168 +0,0 @@
-/*
-** PPC IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Register allocator extensions --------------------------------------- */
-
-/* Allocate a register with a hint. */
-static Reg ra_hintalloc(ASMState *as, IRRef ref, Reg hint, RegSet allow)
-{
-  Reg r = IR(ref)->r;
-  if (ra_noreg(r)) {
-    if (!ra_hashint(r) && !iscrossref(as, ref))
-      ra_sethint(IR(ref)->r, hint);  /* Propagate register hint. */
-    r = ra_allocref(as, ref, allow);
-  }
-  ra_noweak(as, r);
-  return r;
-}
-
-/* Allocate two source registers for three-operand instructions. */
-static Reg ra_alloc2(ASMState *as, IRIns *ir, RegSet allow)
-{
-  IRIns *irl = IR(ir->op1), *irr = IR(ir->op2);
-  Reg left = irl->r, right = irr->r;
-  if (ra_hasreg(left)) {
-    ra_noweak(as, left);
-    if (ra_noreg(right))
-      right = ra_allocref(as, ir->op2, rset_exclude(allow, left));
-    else
-      ra_noweak(as, right);
-  } else if (ra_hasreg(right)) {
-    ra_noweak(as, right);
-    left = ra_allocref(as, ir->op1, rset_exclude(allow, right));
-  } else if (ra_hashint(right)) {
-    right = ra_allocref(as, ir->op2, allow);
-    left = ra_alloc1(as, ir->op1, rset_exclude(allow, right));
-  } else {
-    left = ra_allocref(as, ir->op1, allow);
-    right = ra_alloc1(as, ir->op2, rset_exclude(allow, left));
-  }
-  return left | (right << 8);
-}
-
-/* -- Guard handling ------------------------------------------------------ */
-
-/* Setup exit stubs after the end of each trace. */
-static void asm_exitstub_setup(ASMState *as, ExitNo nexits)
-{
-  ExitNo i;
-  MCode *mxp = as->mctop;
-  if (mxp - (nexits + 3 + MCLIM_REDZONE) < as->mclim)
-    asm_mclimit(as);
-  /* 1: mflr r0; bl ->vm_exit_handler; li r0, traceno; bl <1; bl <1; ... */
-  for (i = nexits-1; (int32_t)i >= 0; i--)
-    *--mxp = PPCI_BL|(((-3-i)&0x00ffffffu)<<2);
-  *--mxp = PPCI_LI|PPCF_T(RID_TMP)|as->T->traceno;  /* Read by exit handler. */
-  mxp--;
-  *mxp = PPCI_BL|((((MCode *)(void *)lj_vm_exit_handler-mxp)&0x00ffffffu)<<2);
-  *--mxp = PPCI_MFLR|PPCF_T(RID_TMP);
-  as->mctop = mxp;
-}
-
-static MCode *asm_exitstub_addr(ASMState *as, ExitNo exitno)
-{
-  /* Keep this in-sync with exitstub_trace_addr(). */
-  return as->mctop + exitno + 3;
-}
-
-/* Emit conditional branch to exit for guard. */
-static void asm_guardcc(ASMState *as, PPCCC cc)
-{
-  MCode *target = asm_exitstub_addr(as, as->snapno);
-  MCode *p = as->mcp;
-  if (LJ_UNLIKELY(p == as->invmcp)) {
-    as->loopinv = 1;
-    *p = PPCI_B | (((target-p) & 0x00ffffffu) << 2);
-    emit_condbranch(as, PPCI_BC, cc^4, p);
-    return;
-  }
-  emit_condbranch(as, PPCI_BC, cc, target);
-}
-
-/* -- Operand fusion ------------------------------------------------------ */
-
-/* Limit linear search to this distance. Avoids O(n^2) behavior. */
-#define CONFLICT_SEARCH_LIM	31
-
-/* Check if there's no conflicting instruction between curins and ref. */
-static int noconflict(ASMState *as, IRRef ref, IROp conflict)
-{
-  IRIns *ir = as->ir;
-  IRRef i = as->curins;
-  if (i > ref + CONFLICT_SEARCH_LIM)
-    return 0;  /* Give up, ref is too far away. */
-  while (--i > ref)
-    if (ir[i].o == conflict)
-      return 0;  /* Conflict found. */
-  return 1;  /* Ok, no conflict. */
-}
-
-/* Fuse the array base of colocated arrays. */
-static int32_t asm_fuseabase(ASMState *as, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (ir->o == IR_TNEW && ir->op1 <= LJ_MAX_COLOSIZE &&
-      !neverfuse(as) && noconflict(as, ref, IR_NEWREF))
-    return (int32_t)sizeof(GCtab);
-  return 0;
-}
-
-/* Indicates load/store indexed is ok. */
-#define AHUREF_LSX	((int32_t)0x80000000)
-
-/* Fuse array/hash/upvalue reference into register+offset operand. */
-static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow)
-{
-  IRIns *ir = IR(ref);
-  if (ra_noreg(ir->r)) {
-    if (ir->o == IR_AREF) {
-      if (mayfuse(as, ref)) {
-	if (irref_isk(ir->op2)) {
-	  IRRef tab = IR(ir->op1)->op1;
-	  int32_t ofs = asm_fuseabase(as, tab);
-	  IRRef refa = ofs ? tab : ir->op1;
-	  ofs += 8*IR(ir->op2)->i;
-	  if (checki16(ofs)) {
-	    *ofsp = ofs;
-	    return ra_alloc1(as, refa, allow);
-	  }
-	}
-	if (*ofsp == AHUREF_LSX) {
-	  Reg base = ra_alloc1(as, ir->op1, allow);
-	  Reg idx = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, base));
-	  return base | (idx << 8);
-	}
-      }
-    } else if (ir->o == IR_HREFK) {
-      if (mayfuse(as, ref)) {
-	int32_t ofs = (int32_t)(IR(ir->op2)->op2 * sizeof(Node));
-	if (checki16(ofs)) {
-	  *ofsp = ofs;
-	  return ra_alloc1(as, ir->op1, allow);
-	}
-      }
-    } else if (ir->o == IR_UREFC) {
-      if (irref_isk(ir->op1)) {
-	GCfunc *fn = ir_kfunc(IR(ir->op1));
-	int32_t ofs = i32ptr(&gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.tv);
-	int32_t jgl = (intptr_t)J2G(as->J);
-	if ((uint32_t)(ofs-jgl) < 65536) {
-	  *ofsp = ofs-jgl-32768;
-	  return RID_JGL;
-	} else {
-	  *ofsp = (int16_t)ofs;
-	  return ra_allock(as, ofs-(int16_t)ofs, allow);
-	}
-      }
-    }
-  }
-  *ofsp = 0;
-  return ra_alloc1(as, ref, allow);
-}
-
-/* Fuse XLOAD/XSTORE reference into load/store operand. */
-static void asm_fusexref(ASMState *as, PPCIns pi, Reg rt, IRRef ref,
-			 RegSet allow, int32_t ofs)
-{
-  IRIns *ir = IR(ref);
-  Reg base;
-  if (ra_noreg(ir->r) && canfuse(as, ir)) {
-    if (ir->o == IR_ADD) {
-      int32_t ofs2;
-      if (irref_isk(ir->op2) && (ofs2 = ofs + IR(ir->op2)->i, checki16(ofs2))) {
-	ofs = ofs2;
-	ref = ir->op1;
-      } else if (ofs == 0) {
-	Reg right, left = ra_alloc2(as, ir, allow);
-	right = (left >> 8); left &= 255;
-	emit_fab(as, PPCI_LWZX | ((pi >> 20) & 0x780), rt, left, right);
-	return;
-      }
-    } else if (ir->o == IR_STRREF) {
-      lua_assert(ofs == 0);
-      ofs = (int32_t)sizeof(GCstr);
-      if (irref_isk(ir->op2)) {
-	ofs += IR(ir->op2)->i;
-	ref = ir->op1;
-      } else if (irref_isk(ir->op1)) {
-	ofs += IR(ir->op1)->i;
-	ref = ir->op2;
-      } else {
-	/* NYI: Fuse ADD with constant. */
-	Reg tmp, right, left = ra_alloc2(as, ir, allow);
-	right = (left >> 8); left &= 255;
-	tmp = ra_scratch(as, rset_exclude(rset_exclude(allow, left), right));
-	emit_fai(as, pi, rt, tmp, ofs);
-	emit_tab(as, PPCI_ADD, tmp, left, right);
-	return;
-      }
-      if (!checki16(ofs)) {
-	Reg left = ra_alloc1(as, ref, allow);
-	Reg right = ra_allock(as, ofs, rset_exclude(allow, left));
-	emit_fab(as, PPCI_LWZX | ((pi >> 20) & 0x780), rt, left, right);
-	return;
-      }
-    }
-  }
-  base = ra_alloc1(as, ref, allow);
-  emit_fai(as, pi, rt, base, ofs);
-}
-
-/* Fuse XLOAD/XSTORE reference into indexed-only load/store operand. */
-static void asm_fusexrefx(ASMState *as, PPCIns pi, Reg rt, IRRef ref,
-			  RegSet allow)
-{
-  IRIns *ira = IR(ref);
-  Reg right, left;
-  if (canfuse(as, ira) && ira->o == IR_ADD && ra_noreg(ira->r)) {
-    left = ra_alloc2(as, ira, allow);
-    right = (left >> 8); left &= 255;
-  } else {
-    right = ra_alloc1(as, ref, allow);
-    left = RID_R0;
-  }
-  emit_tab(as, pi, rt, left, right);
-}
-
-/* Fuse to multiply-add/sub instruction. */
-static int asm_fusemadd(ASMState *as, IRIns *ir, PPCIns pi, PPCIns pir)
-{
-  IRRef lref = ir->op1, rref = ir->op2;
-  IRIns *irm;
-  if (lref != rref &&
-      ((mayfuse(as, lref) && (irm = IR(lref), irm->o == IR_MUL) &&
-	ra_noreg(irm->r)) ||
-       (mayfuse(as, rref) && (irm = IR(rref), irm->o == IR_MUL) &&
-	(rref = lref, pi = pir, ra_noreg(irm->r))))) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    Reg add = ra_alloc1(as, rref, RSET_FPR);
-    Reg right, left = ra_alloc2(as, irm, rset_exclude(RSET_FPR, add));
-    right = (left >> 8); left &= 255;
-    emit_facb(as, pi, dest, left, right, add);
-    return 1;
-  }
-  return 0;
-}
-
-/* -- Calls --------------------------------------------------------------- */
-
-/* Generate a call to a C function. */
-static void asm_gencall(ASMState *as, const CCallInfo *ci, IRRef *args)
-{
-  uint32_t n, nargs = CCI_NARGS(ci);
-  int32_t ofs = 8;
-  Reg gpr = REGARG_FIRSTGPR, fpr = REGARG_FIRSTFPR;
-  if ((void *)ci->func)
-    emit_call(as, (void *)ci->func);
-  for (n = 0; n < nargs; n++) {  /* Setup args. */
-    IRRef ref = args[n];
-    if (ref) {
-      IRIns *ir = IR(ref);
-      if (irt_isfp(ir->t)) {
-	if (fpr <= REGARG_LASTFPR) {
-	  lua_assert(rset_test(as->freeset, fpr));  /* Already evicted. */
-	  ra_leftov(as, fpr, ref);
-	  fpr++;
-	} else {
-	  Reg r = ra_alloc1(as, ref, RSET_FPR);
-	  if (irt_isnum(ir->t)) ofs = (ofs + 4) & ~4;
-	  emit_spstore(as, ir, r, ofs);
-	  ofs += irt_isnum(ir->t) ? 8 : 4;
-	}
-      } else {
-	if (gpr <= REGARG_LASTGPR) {
-	  lua_assert(rset_test(as->freeset, gpr));  /* Already evicted. */
-	  ra_leftov(as, gpr, ref);
-	  gpr++;
-	} else {
-	  Reg r = ra_alloc1(as, ref, RSET_GPR);
-	  emit_spstore(as, ir, r, ofs);
-	  ofs += 4;
-	}
-      }
-    } else {
-      if (gpr <= REGARG_LASTGPR)
-	gpr++;
-      else
-	ofs += 4;
-    }
-    checkmclim(as);
-  }
-  if ((ci->flags & CCI_VARARG))  /* Vararg calls need to know about FPR use. */
-    emit_tab(as, fpr == REGARG_FIRSTFPR ? PPCI_CRXOR : PPCI_CREQV, 6, 6, 6);
-}
-
-/* Setup result reg/sp for call. Evict scratch regs. */
-static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  RegSet drop = RSET_SCRATCH;
-  int hiop = ((ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t));
-  if ((ci->flags & CCI_NOFPRCLOBBER))
-    drop &= ~RSET_FPR;
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  if (hiop && ra_hasreg((ir+1)->r))
-    rset_clear(drop, (ir+1)->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);  /* Evictions must be performed first. */
-  if (ra_used(ir)) {
-    lua_assert(!irt_ispri(ir->t));
-    if (irt_isfp(ir->t)) {
-      if ((ci->flags & CCI_CASTU64)) {
-	/* Use spill slot or temp slots. */
-	int32_t ofs = ir->s ? sps_scale(ir->s) : SPOFS_TMP;
-	Reg dest = ir->r;
-	if (ra_hasreg(dest)) {
-	  ra_free(as, dest);
-	  ra_modified(as, dest);
-	  emit_fai(as, PPCI_LFD, dest, RID_SP, ofs);
-	}
-	emit_tai(as, PPCI_STW, RID_RETHI, RID_SP, ofs);
-	emit_tai(as, PPCI_STW, RID_RETLO, RID_SP, ofs+4);
-      } else {
-	ra_destreg(as, ir, RID_FPRET);
-      }
-    } else if (hiop) {
-      ra_destpair(as, ir);
-    } else {
-      ra_destreg(as, ir, RID_RET);
-    }
-  }
-}
-
-static void asm_call(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX];
-  const CCallInfo *ci = &lj_ir_callinfo[ir->op2];
-  asm_collectargs(as, ir, ci, args);
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-static void asm_callx(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  CCallInfo ci;
-  IRRef func;
-  IRIns *irf;
-  ci.flags = asm_callx_flags(as, ir);
-  asm_collectargs(as, ir, &ci, args);
-  asm_setupresult(as, ir, &ci);
-  func = ir->op2; irf = IR(func);
-  if (irf->o == IR_CARG) { func = irf->op1; irf = IR(func); }
-  if (irref_isk(func)) {  /* Call to constant address. */
-    ci.func = (ASMFunction)(void *)(irf->i);
-  } else {  /* Need a non-argument register for indirect calls. */
-    RegSet allow = RSET_GPR & ~RSET_RANGE(RID_R0, REGARG_LASTGPR+1);
-    Reg freg = ra_alloc1(as, func, allow);
-    *--as->mcp = PPCI_BCTRL;
-    *--as->mcp = PPCI_MTCTR | PPCF_T(freg);
-    ci.func = (ASMFunction)(void *)0;
-  }
-  asm_gencall(as, &ci, args);
-}
-
-static void asm_callid(ASMState *as, IRIns *ir, IRCallID id)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[id];
-  IRRef args[2];
-  args[0] = ir->op1;
-  args[1] = ir->op2;
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-/* -- Returns ------------------------------------------------------------- */
-
-/* Return to lower frame. Guard that it goes to the right spot. */
-static void asm_retf(ASMState *as, IRIns *ir)
-{
-  Reg base = ra_alloc1(as, REF_BASE, RSET_GPR);
-  void *pc = ir_kptr(IR(ir->op2));
-  int32_t delta = 1+bc_a(*((const BCIns *)pc - 1));
-  as->topslot -= (BCReg)delta;
-  if ((int32_t)as->topslot < 0) as->topslot = 0;
-  irt_setmark(IR(REF_BASE)->t);  /* Children must not coalesce with BASE reg. */
-  emit_setgl(as, base, jit_base);
-  emit_addptr(as, base, -8*delta);
-  asm_guardcc(as, CC_NE);
-  emit_ab(as, PPCI_CMPW, RID_TMP,
-	  ra_allock(as, i32ptr(pc), rset_exclude(RSET_GPR, base)));
-  emit_tai(as, PPCI_LWZ, RID_TMP, base, -8);
-}
-
-/* -- Type conversions ---------------------------------------------------- */
-
-static void asm_tointg(ASMState *as, IRIns *ir, Reg left)
-{
-  RegSet allow = RSET_FPR;
-  Reg tmp = ra_scratch(as, rset_clear(allow, left));
-  Reg fbias = ra_scratch(as, rset_clear(allow, tmp));
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg hibias = ra_allock(as, 0x43300000, rset_exclude(RSET_GPR, dest));
-  asm_guardcc(as, CC_NE);
-  emit_fab(as, PPCI_FCMPU, 0, tmp, left);
-  emit_fab(as, PPCI_FSUB, tmp, tmp, fbias);
-  emit_fai(as, PPCI_LFD, tmp, RID_SP, SPOFS_TMP);
-  emit_tai(as, PPCI_STW, RID_TMP, RID_SP, SPOFS_TMPLO);
-  emit_tai(as, PPCI_STW, hibias, RID_SP, SPOFS_TMPHI);
-  emit_asi(as, PPCI_XORIS, RID_TMP, dest, 0x8000);
-  emit_tai(as, PPCI_LWZ, dest, RID_SP, SPOFS_TMPLO);
-  emit_lsptr(as, PPCI_LFS, (fbias & 31),
-	     (void *)lj_ir_k64_find(as->J, U64x(59800004,59800000)),
-	     RSET_GPR);
-  emit_fai(as, PPCI_STFD, tmp, RID_SP, SPOFS_TMP);
-  emit_fb(as, PPCI_FCTIWZ, tmp, left);
-}
-
-static void asm_tobit(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_FPR;
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, allow);
-  Reg right = ra_alloc1(as, ir->op2, rset_clear(allow, left));
-  Reg tmp = ra_scratch(as, rset_clear(allow, right));
-  emit_tai(as, PPCI_LWZ, dest, RID_SP, SPOFS_TMPLO);
-  emit_fai(as, PPCI_STFD, tmp, RID_SP, SPOFS_TMP);
-  emit_fab(as, PPCI_FADD, tmp, left, right);
-}
-
-static void asm_conv(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)(ir->op2 & IRCONV_SRCMASK);
-  int stfp = (st == IRT_NUM || st == IRT_FLOAT);
-  IRRef lref = ir->op1;
-  lua_assert(irt_type(ir->t) != st);
-  lua_assert(!(irt_isint64(ir->t) ||
-	       (st == IRT_I64 || st == IRT_U64))); /* Handled by SPLIT. */
-  if (irt_isfp(ir->t)) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    if (stfp) {  /* FP to FP conversion. */
-      if (st == IRT_NUM)  /* double -> float conversion. */
-	emit_fb(as, PPCI_FRSP, dest, ra_alloc1(as, lref, RSET_FPR));
-      else  /* float -> double conversion is a no-op on PPC. */
-	ra_leftov(as, dest, lref);  /* Do nothing, but may need to move regs. */
-    } else {  /* Integer to FP conversion. */
-      /* IRT_INT: Flip hibit, bias with 2^52, subtract 2^52+2^31. */
-      /* IRT_U32: Bias with 2^52, subtract 2^52. */
-      RegSet allow = RSET_GPR;
-      Reg left = ra_alloc1(as, lref, allow);
-      Reg hibias = ra_allock(as, 0x43300000, rset_clear(allow, left));
-      Reg fbias = ra_scratch(as, rset_exclude(RSET_FPR, dest));
-      const float *kbias;
-      if (irt_isfloat(ir->t)) emit_fb(as, PPCI_FRSP, dest, dest);
-      emit_fab(as, PPCI_FSUB, dest, dest, fbias);
-      emit_fai(as, PPCI_LFD, dest, RID_SP, SPOFS_TMP);
-      kbias = (const float *)lj_ir_k64_find(as->J, U64x(59800004,59800000));
-      if (st == IRT_U32) kbias++;
-      emit_lsptr(as, PPCI_LFS, (fbias & 31), (void *)kbias,
-		 rset_clear(allow, hibias));
-      emit_tai(as, PPCI_STW, st == IRT_U32 ? left : RID_TMP,
-	       RID_SP, SPOFS_TMPLO);
-      emit_tai(as, PPCI_STW, hibias, RID_SP, SPOFS_TMPHI);
-      if (st != IRT_U32) emit_asi(as, PPCI_XORIS, RID_TMP, left, 0x8000);
-    }
-  } else if (stfp) {  /* FP to integer conversion. */
-    if (irt_isguard(ir->t)) {
-      /* Checked conversions are only supported from number to int. */
-      lua_assert(irt_isint(ir->t) && st == IRT_NUM);
-      asm_tointg(as, ir, ra_alloc1(as, lref, RSET_FPR));
-    } else {
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      Reg left = ra_alloc1(as, lref, RSET_FPR);
-      Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, left));
-      if (irt_isu32(ir->t)) {
-	/* Convert both x and x-2^31 to int and merge results. */
-	Reg tmpi = ra_scratch(as, rset_exclude(RSET_GPR, dest));
-	emit_asb(as, PPCI_OR, dest, dest, tmpi);  /* Select with mask idiom. */
-	emit_asb(as, PPCI_AND, tmpi, tmpi, RID_TMP);
-	emit_asb(as, PPCI_ANDC, dest, dest, RID_TMP);
-	emit_tai(as, PPCI_LWZ, tmpi, RID_SP, SPOFS_TMPLO);  /* tmp = (int)(x) */
-	emit_tai(as, PPCI_ADDIS, dest, dest, 0x8000);  /* dest += 2^31 */
-	emit_asb(as, PPCI_SRAWI, RID_TMP, dest, 31);  /* mask = -(dest < 0) */
-	emit_fai(as, PPCI_STFD, tmp, RID_SP, SPOFS_TMP);
-	emit_tai(as, PPCI_LWZ, dest,
-		 RID_SP, SPOFS_TMPLO);  /* dest = (int)(x-2^31) */
-	emit_fb(as, PPCI_FCTIWZ, tmp, left);
-	emit_fai(as, PPCI_STFD, tmp, RID_SP, SPOFS_TMP);
-	emit_fb(as, PPCI_FCTIWZ, tmp, tmp);
-	emit_fab(as, PPCI_FSUB, tmp, left, tmp);
-	emit_lsptr(as, PPCI_LFS, (tmp & 31),
-		   (void *)lj_ir_k64_find(as->J, U64x(4f000000,00000000)),
-		   RSET_GPR);
-      } else {
-	emit_tai(as, PPCI_LWZ, dest, RID_SP, SPOFS_TMPLO);
-	emit_fai(as, PPCI_STFD, tmp, RID_SP, SPOFS_TMP);
-	emit_fb(as, PPCI_FCTIWZ, tmp, left);
-      }
-    }
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    if (st >= IRT_I8 && st <= IRT_U16) {  /* Extend to 32 bit integer. */
-      Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-      lua_assert(irt_isint(ir->t) || irt_isu32(ir->t));
-      if ((ir->op2 & IRCONV_SEXT))
-	emit_as(as, st == IRT_I8 ? PPCI_EXTSB : PPCI_EXTSH, dest, left);
-      else
-	emit_rot(as, PPCI_RLWINM, dest, left, 0, st == IRT_U8 ? 24 : 16, 31);
-    } else {  /* 32/64 bit integer conversions. */
-      /* Only need to handle 32/32 bit no-op (cast) on 32 bit archs. */
-      ra_leftov(as, dest, lref);  /* Do nothing, but may need to move regs. */
-    }
-  }
-}
-
-#if LJ_HASFFI
-static void asm_conv64(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)((ir-1)->op2 & IRCONV_SRCMASK);
-  IRType dt = (((ir-1)->op2 & IRCONV_DSTMASK) >> IRCONV_DSH);
-  IRCallID id;
-  const CCallInfo *ci;
-  IRRef args[2];
-  args[0] = ir->op1;
-  args[1] = (ir-1)->op1;
-  if (st == IRT_NUM || st == IRT_FLOAT) {
-    id = IRCALL_fp64_d2l + ((st == IRT_FLOAT) ? 2 : 0) + (dt - IRT_I64);
-    ir--;
-  } else {
-    id = IRCALL_fp64_l2d + ((dt == IRT_FLOAT) ? 2 : 0) + (st - IRT_I64);
-  }
-  ci = &lj_ir_callinfo[id];
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-#endif
-
-static void asm_strto(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_strscan_num];
-  IRRef args[2];
-  int32_t ofs;
-  RegSet drop = RSET_SCRATCH;
-  if (ra_hasreg(ir->r)) rset_set(drop, ir->r);  /* Spill dest reg (if any). */
-  ra_evictset(as, drop);
-  asm_guardcc(as, CC_EQ);
-  emit_ai(as, PPCI_CMPWI, RID_RET, 0);  /* Test return status. */
-  args[0] = ir->op1;      /* GCstr *str */
-  args[1] = ASMREF_TMP1;  /* TValue *n  */
-  asm_gencall(as, ci, args);
-  /* Store the result to the spill slot or temp slots. */
-  ofs = ir->s ? sps_scale(ir->s) : SPOFS_TMP;
-  emit_tai(as, PPCI_ADDI, ra_releasetmp(as, ASMREF_TMP1), RID_SP, ofs);
-}
-
-/* Get pointer to TValue. */
-static void asm_tvptr(ASMState *as, Reg dest, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (irt_isnum(ir->t)) {
-    if (irref_isk(ref))  /* Use the number constant itself as a TValue. */
-      ra_allockreg(as, i32ptr(ir_knum(ir)), dest);
-    else  /* Otherwise force a spill and use the spill slot. */
-      emit_tai(as, PPCI_ADDI, dest, RID_SP, ra_spill(as, ir));
-  } else {
-    /* Otherwise use g->tmptv to hold the TValue. */
-    RegSet allow = rset_exclude(RSET_GPR, dest);
-    Reg type;
-    emit_tai(as, PPCI_ADDI, dest, RID_JGL, offsetof(global_State, tmptv)-32768);
-    if (!irt_ispri(ir->t)) {
-      Reg src = ra_alloc1(as, ref, allow);
-      emit_setgl(as, src, tmptv.gcr);
-    }
-    type = ra_allock(as, irt_toitype(ir->t), allow);
-    emit_setgl(as, type, tmptv.it);
-  }
-}
-
-static void asm_tostr(ASMState *as, IRIns *ir)
-{
-  IRRef args[2];
-  args[0] = ASMREF_L;
-  as->gcsteps++;
-  if (irt_isnum(IR(ir->op1)->t) || (ir+1)->o == IR_HIOP) {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromnum];
-    args[1] = ASMREF_TMP1;  /* const lua_Number * */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-    asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op1);
-  } else {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromint];
-    args[1] = ir->op1;  /* int32_t k */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-  }
-}
-
-/* -- Memory references --------------------------------------------------- */
-
-static void asm_aref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg idx, base;
-  if (irref_isk(ir->op2)) {
-    IRRef tab = IR(ir->op1)->op1;
-    int32_t ofs = asm_fuseabase(as, tab);
-    IRRef refa = ofs ? tab : ir->op1;
-    ofs += 8*IR(ir->op2)->i;
-    if (checki16(ofs)) {
-      base = ra_alloc1(as, refa, RSET_GPR);
-      emit_tai(as, PPCI_ADDI, dest, base, ofs);
-      return;
-    }
-  }
-  base = ra_alloc1(as, ir->op1, RSET_GPR);
-  idx = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, base));
-  emit_tab(as, PPCI_ADD, dest, RID_TMP, base);
-  emit_slwi(as, RID_TMP, idx, 3);
-}
-
-/* Inlined hash lookup. Specialized for key type and for const keys.
-** The equivalent C code is:
-**   Node *n = hashkey(t, key);
-**   do {
-**     if (lj_obj_equal(&n->key, key)) return &n->val;
-**   } while ((n = nextnode(n)));
-**   return niltv(L);
-*/
-static void asm_href(ASMState *as, IRIns *ir, IROp merge)
-{
-  RegSet allow = RSET_GPR;
-  int destused = ra_used(ir);
-  Reg dest = ra_dest(as, ir, allow);
-  Reg tab = ra_alloc1(as, ir->op1, rset_clear(allow, dest));
-  Reg key = RID_NONE, tmp1 = RID_TMP, tmp2;
-  Reg tisnum = RID_NONE, tmpnum = RID_NONE;
-  IRRef refkey = ir->op2;
-  IRIns *irkey = IR(refkey);
-  IRType1 kt = irkey->t;
-  uint32_t khash;
-  MCLabel l_end, l_loop, l_next;
-
-  rset_clear(allow, tab);
-  if (irt_isnum(kt)) {
-    key = ra_alloc1(as, refkey, RSET_FPR);
-    tmpnum = ra_scratch(as, rset_exclude(RSET_FPR, key));
-    tisnum = ra_allock(as, (int32_t)LJ_TISNUM, allow);
-    rset_clear(allow, tisnum);
-  } else if (!irt_ispri(kt)) {
-    key = ra_alloc1(as, refkey, allow);
-    rset_clear(allow, key);
-  }
-  tmp2 = ra_scratch(as, allow);
-  rset_clear(allow, tmp2);
-
-  /* Key not found in chain: jump to exit (if merged) or load niltv. */
-  l_end = emit_label(as);
-  as->invmcp = NULL;
-  if (merge == IR_NE)
-    asm_guardcc(as, CC_EQ);
-  else if (destused)
-    emit_loada(as, dest, niltvg(J2G(as->J)));
-
-  /* Follow hash chain until the end. */
-  l_loop = --as->mcp;
-  emit_ai(as, PPCI_CMPWI, dest, 0);
-  emit_tai(as, PPCI_LWZ, dest, dest, (int32_t)offsetof(Node, next));
-  l_next = emit_label(as);
-
-  /* Type and value comparison. */
-  if (merge == IR_EQ)
-    asm_guardcc(as, CC_EQ);
-  else
-    emit_condbranch(as, PPCI_BC|PPCF_Y, CC_EQ, l_end);
-  if (irt_isnum(kt)) {
-    emit_fab(as, PPCI_FCMPU, 0, tmpnum, key);
-    emit_condbranch(as, PPCI_BC, CC_GE, l_next);
-    emit_ab(as, PPCI_CMPLW, tmp1, tisnum);
-    emit_fai(as, PPCI_LFD, tmpnum, dest, (int32_t)offsetof(Node, key.n));
-  } else {
-    if (!irt_ispri(kt)) {
-      emit_ab(as, PPCI_CMPW, tmp2, key);
-      emit_condbranch(as, PPCI_BC, CC_NE, l_next);
-    }
-    emit_ai(as, PPCI_CMPWI, tmp1, irt_toitype(irkey->t));
-    if (!irt_ispri(kt))
-      emit_tai(as, PPCI_LWZ, tmp2, dest, (int32_t)offsetof(Node, key.gcr));
-  }
-  emit_tai(as, PPCI_LWZ, tmp1, dest, (int32_t)offsetof(Node, key.it));
-  *l_loop = PPCI_BC | PPCF_Y | PPCF_CC(CC_NE) |
-	    (((char *)as->mcp-(char *)l_loop) & 0xffffu);
-
-  /* Load main position relative to tab->node into dest. */
-  khash = irref_isk(refkey) ? ir_khash(irkey) : 1;
-  if (khash == 0) {
-    emit_tai(as, PPCI_LWZ, dest, tab, (int32_t)offsetof(GCtab, node));
-  } else {
-    Reg tmphash = tmp1;
-    if (irref_isk(refkey))
-      tmphash = ra_allock(as, khash, allow);
-    emit_tab(as, PPCI_ADD, dest, dest, tmp1);
-    emit_tai(as, PPCI_MULLI, tmp1, tmp1, sizeof(Node));
-    emit_asb(as, PPCI_AND, tmp1, tmp2, tmphash);
-    emit_tai(as, PPCI_LWZ, dest, tab, (int32_t)offsetof(GCtab, node));
-    emit_tai(as, PPCI_LWZ, tmp2, tab, (int32_t)offsetof(GCtab, hmask));
-    if (irref_isk(refkey)) {
-      /* Nothing to do. */
-    } else if (irt_isstr(kt)) {
-      emit_tai(as, PPCI_LWZ, tmp1, key, (int32_t)offsetof(GCstr, hash));
-    } else {  /* Must match with hash*() in lj_tab.c. */
-      emit_tab(as, PPCI_SUBF, tmp1, tmp2, tmp1);
-      emit_rotlwi(as, tmp2, tmp2, HASH_ROT3);
-      emit_asb(as, PPCI_XOR, tmp1, tmp1, tmp2);
-      emit_rotlwi(as, tmp1, tmp1, (HASH_ROT2+HASH_ROT1)&31);
-      emit_tab(as, PPCI_SUBF, tmp2, dest, tmp2);
-      if (irt_isnum(kt)) {
-	int32_t ofs = ra_spill(as, irkey);
-	emit_asb(as, PPCI_XOR, tmp2, tmp2, tmp1);
-	emit_rotlwi(as, dest, tmp1, HASH_ROT1);
-	emit_tab(as, PPCI_ADD, tmp1, tmp1, tmp1);
-	emit_tai(as, PPCI_LWZ, tmp2, RID_SP, ofs+4);
-	emit_tai(as, PPCI_LWZ, tmp1, RID_SP, ofs);
-      } else {
-	emit_asb(as, PPCI_XOR, tmp2, key, tmp1);
-	emit_rotlwi(as, dest, tmp1, HASH_ROT1);
-	emit_tai(as, PPCI_ADDI, tmp1, tmp2, HASH_BIAS);
-	emit_tai(as, PPCI_ADDIS, tmp2, key, (HASH_BIAS + 32768)>>16);
-      }
-    }
-  }
-}
-
-static void asm_hrefk(ASMState *as, IRIns *ir)
-{
-  IRIns *kslot = IR(ir->op2);
-  IRIns *irkey = IR(kslot->op1);
-  int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node));
-  int32_t kofs = ofs + (int32_t)offsetof(Node, key);
-  Reg dest = (ra_used(ir)||ofs > 32736) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
-  Reg node = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg key = RID_NONE, type = RID_TMP, idx = node;
-  RegSet allow = rset_exclude(RSET_GPR, node);
-  lua_assert(ofs % sizeof(Node) == 0);
-  if (ofs > 32736) {
-    idx = dest;
-    rset_clear(allow, dest);
-    kofs = (int32_t)offsetof(Node, key);
-  } else if (ra_hasreg(dest)) {
-    emit_tai(as, PPCI_ADDI, dest, node, ofs);
-  }
-  asm_guardcc(as, CC_NE);
-  if (!irt_ispri(irkey->t)) {
-    key = ra_scratch(as, allow);
-    rset_clear(allow, key);
-  }
-  rset_clear(allow, type);
-  if (irt_isnum(irkey->t)) {
-    emit_cmpi(as, key, (int32_t)ir_knum(irkey)->u32.lo);
-    asm_guardcc(as, CC_NE);
-    emit_cmpi(as, type, (int32_t)ir_knum(irkey)->u32.hi);
-  } else {
-    if (ra_hasreg(key)) {
-      emit_cmpi(as, key, irkey->i);  /* May use RID_TMP, i.e. type. */
-      asm_guardcc(as, CC_NE);
-    }
-    emit_ai(as, PPCI_CMPWI, type, irt_toitype(irkey->t));
-  }
-  if (ra_hasreg(key)) emit_tai(as, PPCI_LWZ, key, idx, kofs+4);
-  emit_tai(as, PPCI_LWZ, type, idx, kofs);
-  if (ofs > 32736) {
-    emit_tai(as, PPCI_ADDIS, dest, dest, (ofs + 32768) >> 16);
-    emit_tai(as, PPCI_ADDI, dest, node, ofs);
-  }
-}
-
-static void asm_newref(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
-  IRRef args[3];
-  if (ir->r == RID_SINK)
-    return;
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ir->op1;      /* GCtab *t     */
-  args[2] = ASMREF_TMP1;  /* cTValue *key */
-  asm_setupresult(as, ir, ci);  /* TValue * */
-  asm_gencall(as, ci, args);
-  asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2);
-}
-
-static void asm_uref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op1)) {
-    GCfunc *fn = ir_kfunc(IR(ir->op1));
-    MRef *v = &gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.v;
-    emit_lsptr(as, PPCI_LWZ, dest, v, RSET_GPR);
-  } else {
-    Reg uv = ra_scratch(as, RSET_GPR);
-    Reg func = ra_alloc1(as, ir->op1, RSET_GPR);
-    if (ir->o == IR_UREFC) {
-      asm_guardcc(as, CC_NE);
-      emit_ai(as, PPCI_CMPWI, RID_TMP, 1);
-      emit_tai(as, PPCI_ADDI, dest, uv, (int32_t)offsetof(GCupval, tv));
-      emit_tai(as, PPCI_LBZ, RID_TMP, uv, (int32_t)offsetof(GCupval, closed));
-    } else {
-      emit_tai(as, PPCI_LWZ, dest, uv, (int32_t)offsetof(GCupval, v));
-    }
-    emit_tai(as, PPCI_LWZ, uv, func,
-	     (int32_t)offsetof(GCfuncL, uvptr) + 4*(int32_t)(ir->op2 >> 8));
-  }
-}
-
-static void asm_fref(ASMState *as, IRIns *ir)
-{
-  UNUSED(as); UNUSED(ir);
-  lua_assert(!ra_used(ir));
-}
-
-static void asm_strref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  IRRef ref = ir->op2, refk = ir->op1;
-  int32_t ofs = (int32_t)sizeof(GCstr);
-  Reg r;
-  if (irref_isk(ref)) {
-    IRRef tmp = refk; refk = ref; ref = tmp;
-  } else if (!irref_isk(refk)) {
-    Reg right, left = ra_alloc1(as, ir->op1, RSET_GPR);
-    IRIns *irr = IR(ir->op2);
-    if (ra_hasreg(irr->r)) {
-      ra_noweak(as, irr->r);
-      right = irr->r;
-    } else if (mayfuse(as, irr->op2) &&
-	       irr->o == IR_ADD && irref_isk(irr->op2) &&
-	       checki16(ofs + IR(irr->op2)->i)) {
-      ofs += IR(irr->op2)->i;
-      right = ra_alloc1(as, irr->op1, rset_exclude(RSET_GPR, left));
-    } else {
-      right = ra_allocref(as, ir->op2, rset_exclude(RSET_GPR, left));
-    }
-    emit_tai(as, PPCI_ADDI, dest, dest, ofs);
-    emit_tab(as, PPCI_ADD, dest, left, right);
-    return;
-  }
-  r = ra_alloc1(as, ref, RSET_GPR);
-  ofs += IR(refk)->i;
-  if (checki16(ofs))
-    emit_tai(as, PPCI_ADDI, dest, r, ofs);
-  else
-    emit_tab(as, PPCI_ADD, dest, r,
-	     ra_allock(as, ofs, rset_exclude(RSET_GPR, r)));
-}
-
-/* -- Loads and stores ---------------------------------------------------- */
-
-static PPCIns asm_fxloadins(IRIns *ir)
-{
-  switch (irt_type(ir->t)) {
-  case IRT_I8: return PPCI_LBZ;  /* Needs sign-extension. */
-  case IRT_U8: return PPCI_LBZ;
-  case IRT_I16: return PPCI_LHA;
-  case IRT_U16: return PPCI_LHZ;
-  case IRT_NUM: return PPCI_LFD;
-  case IRT_FLOAT: return PPCI_LFS;
-  default: return PPCI_LWZ;
-  }
-}
-
-static PPCIns asm_fxstoreins(IRIns *ir)
-{
-  switch (irt_type(ir->t)) {
-  case IRT_I8: case IRT_U8: return PPCI_STB;
-  case IRT_I16: case IRT_U16: return PPCI_STH;
-  case IRT_NUM: return PPCI_STFD;
-  case IRT_FLOAT: return PPCI_STFS;
-  default: return PPCI_STW;
-  }
-}
-
-static void asm_fload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg idx = ra_alloc1(as, ir->op1, RSET_GPR);
-  PPCIns pi = asm_fxloadins(ir);
-  int32_t ofs;
-  if (ir->op2 == IRFL_TAB_ARRAY) {
-    ofs = asm_fuseabase(as, ir->op1);
-    if (ofs) {  /* Turn the t->array load into an add for colocated arrays. */
-      emit_tai(as, PPCI_ADDI, dest, idx, ofs);
-      return;
-    }
-  }
-  ofs = field_ofs[ir->op2];
-  lua_assert(!irt_isi8(ir->t));
-  emit_tai(as, pi, dest, idx, ofs);
-}
-
-static void asm_fstore(ASMState *as, IRIns *ir)
-{
-  if (ir->r != RID_SINK) {
-    Reg src = ra_alloc1(as, ir->op2, RSET_GPR);
-    IRIns *irf = IR(ir->op1);
-    Reg idx = ra_alloc1(as, irf->op1, rset_exclude(RSET_GPR, src));
-    int32_t ofs = field_ofs[irf->op2];
-    PPCIns pi = asm_fxstoreins(ir);
-    emit_tai(as, pi, src, idx, ofs);
-  }
-}
-
-static void asm_xload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR);
-  lua_assert(!(ir->op2 & IRXLOAD_UNALIGNED));
-  if (irt_isi8(ir->t))
-    emit_as(as, PPCI_EXTSB, dest, dest);
-  asm_fusexref(as, asm_fxloadins(ir), dest, ir->op1, RSET_GPR, 0);
-}
-
-static void asm_xstore(ASMState *as, IRIns *ir, int32_t ofs)
-{
-  IRIns *irb;
-  if (ir->r == RID_SINK)
-    return;
-  if (ofs == 0 && mayfuse(as, ir->op2) && (irb = IR(ir->op2))->o == IR_BSWAP &&
-      ra_noreg(irb->r) && (irt_isint(ir->t) || irt_isu32(ir->t))) {
-    /* Fuse BSWAP with XSTORE to stwbrx. */
-    Reg src = ra_alloc1(as, irb->op1, RSET_GPR);
-    asm_fusexrefx(as, PPCI_STWBRX, src, ir->op1, rset_exclude(RSET_GPR, src));
-  } else {
-    Reg src = ra_alloc1(as, ir->op2, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR);
-    asm_fusexref(as, asm_fxstoreins(ir), src, ir->op1,
-		 rset_exclude(RSET_GPR, src), ofs);
-  }
-}
-
-static void asm_ahuvload(ASMState *as, IRIns *ir)
-{
-  IRType1 t = ir->t;
-  Reg dest = RID_NONE, type = RID_TMP, tmp = RID_TMP, idx;
-  RegSet allow = RSET_GPR;
-  int32_t ofs = AHUREF_LSX;
-  if (ra_used(ir)) {
-    lua_assert(irt_isnum(t) || irt_isint(t) || irt_isaddr(t));
-    if (!irt_isnum(t)) ofs = 0;
-    dest = ra_dest(as, ir, irt_isnum(t) ? RSET_FPR : RSET_GPR);
-    rset_clear(allow, dest);
-  }
-  idx = asm_fuseahuref(as, ir->op1, &ofs, allow);
-  if (irt_isnum(t)) {
-    Reg tisnum = ra_allock(as, (int32_t)LJ_TISNUM, rset_exclude(allow, idx));
-    asm_guardcc(as, CC_GE);
-    emit_ab(as, PPCI_CMPLW, type, tisnum);
-    if (ra_hasreg(dest)) {
-      if (ofs == AHUREF_LSX) {
-	tmp = ra_scratch(as, rset_exclude(rset_exclude(RSET_GPR,
-						       (idx&255)), (idx>>8)));
-	emit_fab(as, PPCI_LFDX, dest, (idx&255), tmp);
-      } else {
-	emit_fai(as, PPCI_LFD, dest, idx, ofs);
-      }
-    }
-  } else {
-    asm_guardcc(as, CC_NE);
-    emit_ai(as, PPCI_CMPWI, type, irt_toitype(t));
-    if (ra_hasreg(dest)) emit_tai(as, PPCI_LWZ, dest, idx, ofs+4);
-  }
-  if (ofs == AHUREF_LSX) {
-    emit_tab(as, PPCI_LWZX, type, (idx&255), tmp);
-    emit_slwi(as, tmp, (idx>>8), 3);
-  } else {
-    emit_tai(as, PPCI_LWZ, type, idx, ofs);
-  }
-}
-
-static void asm_ahustore(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_GPR;
-  Reg idx, src = RID_NONE, type = RID_NONE;
-  int32_t ofs = AHUREF_LSX;
-  if (ir->r == RID_SINK)
-    return;
-  if (irt_isnum(ir->t)) {
-    src = ra_alloc1(as, ir->op2, RSET_FPR);
-  } else {
-    if (!irt_ispri(ir->t)) {
-      src = ra_alloc1(as, ir->op2, allow);
-      rset_clear(allow, src);
-      ofs = 0;
-    }
-    type = ra_allock(as, (int32_t)irt_toitype(ir->t), allow);
-    rset_clear(allow, type);
-  }
-  idx = asm_fuseahuref(as, ir->op1, &ofs, allow);
-  if (irt_isnum(ir->t)) {
-    if (ofs == AHUREF_LSX) {
-      emit_fab(as, PPCI_STFDX, src, (idx&255), RID_TMP);
-      emit_slwi(as, RID_TMP, (idx>>8), 3);
-    } else {
-      emit_fai(as, PPCI_STFD, src, idx, ofs);
-    }
-  } else {
-    if (ra_hasreg(src))
-      emit_tai(as, PPCI_STW, src, idx, ofs+4);
-    if (ofs == AHUREF_LSX) {
-      emit_tab(as, PPCI_STWX, type, (idx&255), RID_TMP);
-      emit_slwi(as, RID_TMP, (idx>>8), 3);
-    } else {
-      emit_tai(as, PPCI_STW, type, idx, ofs);
-    }
-  }
-}
-
-static void asm_sload(ASMState *as, IRIns *ir)
-{
-  int32_t ofs = 8*((int32_t)ir->op1-1) + ((ir->op2 & IRSLOAD_FRAME) ? 0 : 4);
-  IRType1 t = ir->t;
-  Reg dest = RID_NONE, type = RID_NONE, base;
-  RegSet allow = RSET_GPR;
-  lua_assert(!(ir->op2 & IRSLOAD_PARENT));  /* Handled by asm_head_side(). */
-  lua_assert(irt_isguard(t) || !(ir->op2 & IRSLOAD_TYPECHECK));
-  lua_assert(LJ_DUALNUM ||
-	     !irt_isint(t) || (ir->op2 & (IRSLOAD_CONVERT|IRSLOAD_FRAME)));
-  if ((ir->op2 & IRSLOAD_CONVERT) && irt_isguard(t) && irt_isint(t)) {
-    dest = ra_scratch(as, RSET_FPR);
-    asm_tointg(as, ir, dest);
-    t.irt = IRT_NUM;  /* Continue with a regular number type check. */
-  } else if (ra_used(ir)) {
-    lua_assert(irt_isnum(t) || irt_isint(t) || irt_isaddr(t));
-    dest = ra_dest(as, ir, irt_isnum(t) ? RSET_FPR : RSET_GPR);
-    rset_clear(allow, dest);
-    base = ra_alloc1(as, REF_BASE, allow);
-    rset_clear(allow, base);
-    if ((ir->op2 & IRSLOAD_CONVERT)) {
-      if (irt_isint(t)) {
-	emit_tai(as, PPCI_LWZ, dest, RID_SP, SPOFS_TMPLO);
-	dest = ra_scratch(as, RSET_FPR);
-	emit_fai(as, PPCI_STFD, dest, RID_SP, SPOFS_TMP);
-	emit_fb(as, PPCI_FCTIWZ, dest, dest);
-	t.irt = IRT_NUM;  /* Check for original type. */
-      } else {
-	Reg tmp = ra_scratch(as, allow);
-	Reg hibias = ra_allock(as, 0x43300000, rset_clear(allow, tmp));
-	Reg fbias = ra_scratch(as, rset_exclude(RSET_FPR, dest));
-	emit_fab(as, PPCI_FSUB, dest, dest, fbias);
-	emit_fai(as, PPCI_LFD, dest, RID_SP, SPOFS_TMP);
-	emit_lsptr(as, PPCI_LFS, (fbias & 31),
-		   (void *)lj_ir_k64_find(as->J, U64x(59800004,59800000)),
-		   rset_clear(allow, hibias));
-	emit_tai(as, PPCI_STW, tmp, RID_SP, SPOFS_TMPLO);
-	emit_tai(as, PPCI_STW, hibias, RID_SP, SPOFS_TMPHI);
-	emit_asi(as, PPCI_XORIS, tmp, tmp, 0x8000);
-	dest = tmp;
-	t.irt = IRT_INT;  /* Check for original type. */
-      }
-    }
-    goto dotypecheck;
-  }
-  base = ra_alloc1(as, REF_BASE, allow);
-  rset_clear(allow, base);
-dotypecheck:
-  if (irt_isnum(t)) {
-    if ((ir->op2 & IRSLOAD_TYPECHECK)) {
-      Reg tisnum = ra_allock(as, (int32_t)LJ_TISNUM, allow);
-      asm_guardcc(as, CC_GE);
-      emit_ab(as, PPCI_CMPLW, RID_TMP, tisnum);
-      type = RID_TMP;
-    }
-    if (ra_hasreg(dest)) emit_fai(as, PPCI_LFD, dest, base, ofs-4);
-  } else {
-    if ((ir->op2 & IRSLOAD_TYPECHECK)) {
-      asm_guardcc(as, CC_NE);
-      emit_ai(as, PPCI_CMPWI, RID_TMP, irt_toitype(t));
-      type = RID_TMP;
-    }
-    if (ra_hasreg(dest)) emit_tai(as, PPCI_LWZ, dest, base, ofs);
-  }
-  if (ra_hasreg(type)) emit_tai(as, PPCI_LWZ, type, base, ofs-4);
-}
-
-/* -- Allocations --------------------------------------------------------- */
-
-#if LJ_HASFFI
-static void asm_cnew(ASMState *as, IRIns *ir)
-{
-  CTState *cts = ctype_ctsG(J2G(as->J));
-  CTypeID ctypeid = (CTypeID)IR(ir->op1)->i;
-  CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ?
-	      lj_ctype_size(cts, ctypeid) : (CTSize)IR(ir->op2)->i;
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco];
-  IRRef args[2];
-  RegSet allow = (RSET_GPR & ~RSET_SCRATCH);
-  RegSet drop = RSET_SCRATCH;
-  lua_assert(sz != CTSIZE_INVALID);
-
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ASMREF_TMP1;  /* MSize size   */
-  as->gcsteps++;
-
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);
-  if (ra_used(ir))
-    ra_destreg(as, ir, RID_RET);  /* GCcdata * */
-
-  /* Initialize immutable cdata object. */
-  if (ir->o == IR_CNEWI) {
-    int32_t ofs = sizeof(GCcdata);
-    lua_assert(sz == 4 || sz == 8);
-    if (sz == 8) {
-      ofs += 4;
-      lua_assert((ir+1)->o == IR_HIOP);
-    }
-    for (;;) {
-      Reg r = ra_alloc1(as, ir->op2, allow);
-      emit_tai(as, PPCI_STW, r, RID_RET, ofs);
-      rset_clear(allow, r);
-      if (ofs == sizeof(GCcdata)) break;
-      ofs -= 4; ir++;
-    }
-  }
-  /* Initialize gct and ctypeid. lj_mem_newgco() already sets marked. */
-  emit_tai(as, PPCI_STB, RID_RET+1, RID_RET, offsetof(GCcdata, gct));
-  emit_tai(as, PPCI_STH, RID_TMP, RID_RET, offsetof(GCcdata, ctypeid));
-  emit_ti(as, PPCI_LI, RID_RET+1, ~LJ_TCDATA);
-  emit_ti(as, PPCI_LI, RID_TMP, ctypeid);  /* Lower 16 bit used. Sign-ext ok. */
-  asm_gencall(as, ci, args);
-  ra_allockreg(as, (int32_t)(sz+sizeof(GCcdata)),
-	       ra_releasetmp(as, ASMREF_TMP1));
-}
-#else
-#define asm_cnew(as, ir)	((void)0)
-#endif
-
-/* -- Write barriers ------------------------------------------------------ */
-
-static void asm_tbar(ASMState *as, IRIns *ir)
-{
-  Reg tab = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg mark = ra_scratch(as, rset_exclude(RSET_GPR, tab));
-  Reg link = RID_TMP;
-  MCLabel l_end = emit_label(as);
-  emit_tai(as, PPCI_STW, link, tab, (int32_t)offsetof(GCtab, gclist));
-  emit_tai(as, PPCI_STB, mark, tab, (int32_t)offsetof(GCtab, marked));
-  emit_setgl(as, tab, gc.grayagain);
-  lua_assert(LJ_GC_BLACK == 0x04);
-  emit_rot(as, PPCI_RLWINM, mark, mark, 0, 30, 28);  /* Clear black bit. */
-  emit_getgl(as, link, gc.grayagain);
-  emit_condbranch(as, PPCI_BC|PPCF_Y, CC_EQ, l_end);
-  emit_asi(as, PPCI_ANDIDOT, RID_TMP, mark, LJ_GC_BLACK);
-  emit_tai(as, PPCI_LBZ, mark, tab, (int32_t)offsetof(GCtab, marked));
-}
-
-static void asm_obar(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_barrieruv];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg obj, val, tmp;
-  /* No need for other object barriers (yet). */
-  lua_assert(IR(ir->op1)->o == IR_UREFC);
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ir->op1;      /* TValue *tv      */
-  asm_gencall(as, ci, args);
-  emit_tai(as, PPCI_ADDI, ra_releasetmp(as, ASMREF_TMP1), RID_JGL, -32768);
-  obj = IR(ir->op1)->r;
-  tmp = ra_scratch(as, rset_exclude(RSET_GPR, obj));
-  emit_condbranch(as, PPCI_BC|PPCF_Y, CC_EQ, l_end);
-  emit_asi(as, PPCI_ANDIDOT, tmp, tmp, LJ_GC_BLACK);
-  emit_condbranch(as, PPCI_BC, CC_EQ, l_end);
-  emit_asi(as, PPCI_ANDIDOT, RID_TMP, RID_TMP, LJ_GC_WHITES);
-  val = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, obj));
-  emit_tai(as, PPCI_LBZ, tmp, obj,
-	   (int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv));
-  emit_tai(as, PPCI_LBZ, RID_TMP, val, (int32_t)offsetof(GChead, marked));
-}
-
-/* -- Arithmetic and logic operations ------------------------------------- */
-
-static void asm_fparith(ASMState *as, IRIns *ir, PPCIns pi)
-{
-  Reg dest = ra_dest(as, ir, RSET_FPR);
-  Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-  right = (left >> 8); left &= 255;
-  if (pi == PPCI_FMUL)
-    emit_fac(as, pi, dest, left, right);
-  else
-    emit_fab(as, pi, dest, left, right);
-}
-
-static void asm_fpunary(ASMState *as, IRIns *ir, PPCIns pi)
-{
-  Reg dest = ra_dest(as, ir, RSET_FPR);
-  Reg left = ra_hintalloc(as, ir->op1, dest, RSET_FPR);
-  emit_fb(as, pi, dest, left);
-}
-
-static int asm_fpjoin_pow(ASMState *as, IRIns *ir)
-{
-  IRIns *irp = IR(ir->op1);
-  if (irp == ir-1 && irp->o == IR_MUL && !ra_used(irp)) {
-    IRIns *irpp = IR(irp->op1);
-    if (irpp == ir-2 && irpp->o == IR_FPMATH &&
-	irpp->op2 == IRFPM_LOG2 && !ra_used(irpp)) {
-      const CCallInfo *ci = &lj_ir_callinfo[IRCALL_pow];
-      IRRef args[2];
-      args[0] = irpp->op1;
-      args[1] = irp->op2;
-      asm_setupresult(as, ir, ci);
-      asm_gencall(as, ci, args);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-static void asm_add(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    if (!asm_fusemadd(as, ir, PPCI_FMADD, PPCI_FMADD))
-      asm_fparith(as, ir, PPCI_FADD);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg right, left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    PPCIns pi;
-    if (irref_isk(ir->op2)) {
-      int32_t k = IR(ir->op2)->i;
-      if (checki16(k)) {
-	pi = PPCI_ADDI;
-	/* May fail due to spills/restores above, but simplifies the logic. */
-	if (as->flagmcp == as->mcp) {
-	  as->flagmcp = NULL;
-	  as->mcp++;
-	  pi = PPCI_ADDICDOT;
-	}
-	emit_tai(as, pi, dest, left, k);
-	return;
-      } else if ((k & 0xffff) == 0) {
-	emit_tai(as, PPCI_ADDIS, dest, left, (k >> 16));
-	return;
-      } else if (!as->sectref) {
-	emit_tai(as, PPCI_ADDIS, dest, dest, (k + 32768) >> 16);
-	emit_tai(as, PPCI_ADDI, dest, left, k);
-	return;
-      }
-    }
-    pi = PPCI_ADD;
-    /* May fail due to spills/restores above, but simplifies the logic. */
-    if (as->flagmcp == as->mcp) {
-      as->flagmcp = NULL;
-      as->mcp++;
-      pi |= PPCF_DOT;
-    }
-    right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-    emit_tab(as, pi, dest, left, right);
-  }
-}
-
-static void asm_sub(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    if (!asm_fusemadd(as, ir, PPCI_FMSUB, PPCI_FNMSUB))
-      asm_fparith(as, ir, PPCI_FSUB);
-  } else {
-    PPCIns pi = PPCI_SUBF;
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg left, right;
-    if (irref_isk(ir->op1)) {
-      int32_t k = IR(ir->op1)->i;
-      if (checki16(k)) {
-	right = ra_alloc1(as, ir->op2, RSET_GPR);
-	emit_tai(as, PPCI_SUBFIC, dest, right, k);
-	return;
-      }
-    }
-    /* May fail due to spills/restores above, but simplifies the logic. */
-    if (as->flagmcp == as->mcp) {
-      as->flagmcp = NULL;
-      as->mcp++;
-      pi |= PPCF_DOT;
-    }
-    left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-    emit_tab(as, pi, dest, right, left);  /* Subtract right _from_ left. */
-  }
-}
-
-static void asm_mul(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    asm_fparith(as, ir, PPCI_FMUL);
-  } else {
-    PPCIns pi = PPCI_MULLW;
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg right, left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    if (irref_isk(ir->op2)) {
-      int32_t k = IR(ir->op2)->i;
-      if (checki16(k)) {
-	emit_tai(as, PPCI_MULLI, dest, left, k);
-	return;
-      }
-    }
-    /* May fail due to spills/restores above, but simplifies the logic. */
-    if (as->flagmcp == as->mcp) {
-      as->flagmcp = NULL;
-      as->mcp++;
-      pi |= PPCF_DOT;
-    }
-    right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-    emit_tab(as, pi, dest, left, right);
-  }
-}
-
-static void asm_neg(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t)) {
-    asm_fpunary(as, ir, PPCI_FNEG);
-  } else {
-    Reg dest, left;
-    PPCIns pi = PPCI_NEG;
-    if (as->flagmcp == as->mcp) {
-      as->flagmcp = NULL;
-      as->mcp++;
-      pi |= PPCF_DOT;
-    }
-    dest = ra_dest(as, ir, RSET_GPR);
-    left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-    emit_tab(as, pi, dest, left, 0);
-  }
-}
-
-static void asm_arithov(ASMState *as, IRIns *ir, PPCIns pi)
-{
-  Reg dest, left, right;
-  if (as->flagmcp == as->mcp) {
-    as->flagmcp = NULL;
-    as->mcp++;
-  }
-  asm_guardcc(as, CC_SO);
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc2(as, ir, RSET_GPR);
-  right = (left >> 8); left &= 255;
-  if (pi == PPCI_SUBFO) { Reg tmp = left; left = right; right = tmp; }
-  emit_tab(as, pi|PPCF_DOT, dest, left, right);
-}
-
-#if LJ_HASFFI
-static void asm_add64(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg right, left = ra_alloc1(as, ir->op1, RSET_GPR);
-  PPCIns pi = PPCI_ADDE;
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    if (k == 0)
-      pi = PPCI_ADDZE;
-    else if (k == -1)
-      pi = PPCI_ADDME;
-    else
-      goto needright;
-    right = 0;
-  } else {
-  needright:
-    right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  }
-  emit_tab(as, pi, dest, left, right);
-  ir--;
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc1(as, ir->op1, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    if (checki16(k)) {
-      emit_tai(as, PPCI_ADDIC, dest, left, k);
-      return;
-    }
-  }
-  right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  emit_tab(as, PPCI_ADDC, dest, left, right);
-}
-
-static void asm_sub64(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left, right = ra_alloc1(as, ir->op2, RSET_GPR);
-  PPCIns pi = PPCI_SUBFE;
-  if (irref_isk(ir->op1)) {
-    int32_t k = IR(ir->op1)->i;
-    if (k == 0)
-      pi = PPCI_SUBFZE;
-    else if (k == -1)
-      pi = PPCI_SUBFME;
-    else
-      goto needleft;
-    left = 0;
-  } else {
-  needleft:
-    left = ra_alloc1(as, ir->op1, rset_exclude(RSET_GPR, right));
-  }
-  emit_tab(as, pi, dest, right, left);  /* Subtract right _from_ left. */
-  ir--;
-  dest = ra_dest(as, ir, RSET_GPR);
-  right = ra_alloc1(as, ir->op2, RSET_GPR);
-  if (irref_isk(ir->op1)) {
-    int32_t k = IR(ir->op1)->i;
-    if (checki16(k)) {
-      emit_tai(as, PPCI_SUBFIC, dest, right, k);
-      return;
-    }
-  }
-  left = ra_alloc1(as, ir->op1, rset_exclude(RSET_GPR, right));
-  emit_tab(as, PPCI_SUBFC, dest, right, left);
-}
-
-static void asm_neg64(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-  emit_tab(as, PPCI_SUBFZE, dest, left, 0);
-  ir--;
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc1(as, ir->op1, RSET_GPR);
-  emit_tai(as, PPCI_SUBFIC, dest, left, 0);
-}
-#endif
-
-static void asm_bitnot(ASMState *as, IRIns *ir)
-{
-  Reg dest, left, right;
-  PPCIns pi = PPCI_NOR;
-  if (as->flagmcp == as->mcp) {
-    as->flagmcp = NULL;
-    as->mcp++;
-    pi |= PPCF_DOT;
-  }
-  dest = ra_dest(as, ir, RSET_GPR);
-  if (mayfuse(as, ir->op1)) {
-    IRIns *irl = IR(ir->op1);
-    if (irl->o == IR_BAND)
-      pi ^= (PPCI_NOR ^ PPCI_NAND);
-    else if (irl->o == IR_BXOR)
-      pi ^= (PPCI_NOR ^ PPCI_EQV);
-    else if (irl->o != IR_BOR)
-      goto nofuse;
-    left = ra_hintalloc(as, irl->op1, dest, RSET_GPR);
-    right = ra_alloc1(as, irl->op2, rset_exclude(RSET_GPR, left));
-  } else {
-nofuse:
-    left = right = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-  }
-  emit_asb(as, pi, dest, left, right);
-}
-
-static void asm_bitswap(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  IRIns *irx;
-  if (mayfuse(as, ir->op1) && (irx = IR(ir->op1))->o == IR_XLOAD &&
-      ra_noreg(irx->r) && (irt_isint(irx->t) || irt_isu32(irx->t))) {
-    /* Fuse BSWAP with XLOAD to lwbrx. */
-    asm_fusexrefx(as, PPCI_LWBRX, dest, irx->op1, RSET_GPR);
-  } else {
-    Reg left = ra_alloc1(as, ir->op1, RSET_GPR);
-    Reg tmp = dest;
-    if (tmp == left) {
-      tmp = RID_TMP;
-      emit_mr(as, dest, RID_TMP);
-    }
-    emit_rot(as, PPCI_RLWIMI, tmp, left, 24, 16, 23);
-    emit_rot(as, PPCI_RLWIMI, tmp, left, 24, 0, 7);
-    emit_rotlwi(as, tmp, left, 8);
-  }
-}
-
-static void asm_bitop(ASMState *as, IRIns *ir, PPCIns pi, PPCIns pik)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg right, left = ra_hintalloc(as, ir->op1, dest, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    Reg tmp = left;
-    if ((checku16(k) || (k & 0xffff) == 0) || (tmp = dest, !as->sectref)) {
-      if (!checku16(k)) {
-	emit_asi(as, pik ^ (PPCI_ORI ^ PPCI_ORIS), dest, tmp, (k >> 16));
-	if ((k & 0xffff) == 0) return;
-      }
-      emit_asi(as, pik, dest, left, k);
-      return;
-    }
-  }
-  /* May fail due to spills/restores above, but simplifies the logic. */
-  if (as->flagmcp == as->mcp) {
-    as->flagmcp = NULL;
-    as->mcp++;
-    pi |= PPCF_DOT;
-  }
-  right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-  emit_asb(as, pi, dest, left, right);
-}
-
-/* Fuse BAND with contiguous bitmask and a shift to rlwinm. */
-static void asm_fuseandsh(ASMState *as, PPCIns pi, int32_t mask, IRRef ref)
-{
-  IRIns *ir;
-  Reg left;
-  if (mayfuse(as, ref) && (ir = IR(ref), ra_noreg(ir->r)) &&
-      irref_isk(ir->op2) && ir->o >= IR_BSHL && ir->o <= IR_BROR) {
-    int32_t sh = (IR(ir->op2)->i & 31);
-    switch (ir->o) {
-    case IR_BSHL:
-      if ((mask & ((1u<<sh)-1))) goto nofuse;
-      break;
-    case IR_BSHR:
-      if ((mask & ~((~0u)>>sh))) goto nofuse;
-      sh = ((32-sh)&31);
-      break;
-    case IR_BROL:
-      break;
-    default:
-      goto nofuse;
-    }
-    left = ra_alloc1(as, ir->op1, RSET_GPR);
-    *--as->mcp = pi | PPCF_T(left) | PPCF_B(sh);
-    return;
-  }
-nofuse:
-  left = ra_alloc1(as, ref, RSET_GPR);
-  *--as->mcp = pi | PPCF_T(left);
-}
-
-static void asm_bitand(ASMState *as, IRIns *ir)
-{
-  Reg dest, left, right;
-  IRRef lref = ir->op1;
-  PPCIns dot = 0;
-  IRRef op2;
-  if (as->flagmcp == as->mcp) {
-    as->flagmcp = NULL;
-    as->mcp++;
-    dot = PPCF_DOT;
-  }
-  dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op2)) {
-    int32_t k = IR(ir->op2)->i;
-    if (k) {
-      /* First check for a contiguous bitmask as used by rlwinm. */
-      uint32_t s1 = lj_ffs((uint32_t)k);
-      uint32_t k1 = ((uint32_t)k >> s1);
-      if ((k1 & (k1+1)) == 0) {
-	asm_fuseandsh(as, PPCI_RLWINM|dot | PPCF_A(dest) |
-			  PPCF_MB(31-lj_fls((uint32_t)k)) | PPCF_ME(31-s1),
-			  k, lref);
-	return;
-      }
-      if (~(uint32_t)k) {
-	uint32_t s2 = lj_ffs(~(uint32_t)k);
-	uint32_t k2 = (~(uint32_t)k >> s2);
-	if ((k2 & (k2+1)) == 0) {
-	  asm_fuseandsh(as, PPCI_RLWINM|dot | PPCF_A(dest) |
-			    PPCF_MB(32-s2) | PPCF_ME(30-lj_fls(~(uint32_t)k)),
-			    k, lref);
-	  return;
-	}
-      }
-    }
-    if (checku16(k)) {
-      left = ra_alloc1(as, lref, RSET_GPR);
-      emit_asi(as, PPCI_ANDIDOT, dest, left, k);
-      return;
-    } else if ((k & 0xffff) == 0) {
-      left = ra_alloc1(as, lref, RSET_GPR);
-      emit_asi(as, PPCI_ANDISDOT, dest, left, (k >> 16));
-      return;
-    }
-  }
-  op2 = ir->op2;
-  if (mayfuse(as, op2) && IR(op2)->o == IR_BNOT && ra_noreg(IR(op2)->r)) {
-    dot ^= (PPCI_AND ^ PPCI_ANDC);
-    op2 = IR(op2)->op1;
-  }
-  left = ra_hintalloc(as, lref, dest, RSET_GPR);
-  right = ra_alloc1(as, op2, rset_exclude(RSET_GPR, left));
-  emit_asb(as, PPCI_AND ^ dot, dest, left, right);
-}
-
-static void asm_bitshift(ASMState *as, IRIns *ir, PPCIns pi, PPCIns pik)
-{
-  Reg dest, left;
-  Reg dot = 0;
-  if (as->flagmcp == as->mcp) {
-    as->flagmcp = NULL;
-    as->mcp++;
-    dot = PPCF_DOT;
-  }
-  dest = ra_dest(as, ir, RSET_GPR);
-  left = ra_alloc1(as, ir->op1, RSET_GPR);
-  if (irref_isk(ir->op2)) {  /* Constant shifts. */
-    int32_t shift = (IR(ir->op2)->i & 31);
-    if (pik == 0)  /* SLWI */
-      emit_rot(as, PPCI_RLWINM|dot, dest, left, shift, 0, 31-shift);
-    else if (pik == 1)  /* SRWI */
-      emit_rot(as, PPCI_RLWINM|dot, dest, left, (32-shift)&31, shift, 31);
-    else
-      emit_asb(as, pik|dot, dest, left, shift);
-  } else {
-    Reg right = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, left));
-    emit_asb(as, pi|dot, dest, left, right);
-  }
-}
-
-static void asm_min_max(ASMState *as, IRIns *ir, int ismax)
-{
-  if (irt_isnum(ir->t)) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    Reg tmp = dest;
-    Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-    right = (left >> 8); left &= 255;
-    if (tmp == left || tmp == right)
-      tmp = ra_scratch(as, rset_exclude(rset_exclude(rset_exclude(RSET_FPR,
-					dest), left), right));
-    emit_facb(as, PPCI_FSEL, dest, tmp,
-	      ismax ? left : right, ismax ? right : left);
-    emit_fab(as, PPCI_FSUB, tmp, left, right);
-  } else {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    Reg tmp1 = RID_TMP, tmp2 = dest;
-    Reg right, left = ra_alloc2(as, ir, RSET_GPR);
-    right = (left >> 8); left &= 255;
-    if (tmp2 == left || tmp2 == right)
-      tmp2 = ra_scratch(as, rset_exclude(rset_exclude(rset_exclude(RSET_GPR,
-					 dest), left), right));
-    emit_tab(as, PPCI_ADD, dest, tmp2, right);
-    emit_asb(as, ismax ? PPCI_ANDC : PPCI_AND, tmp2, tmp2, tmp1);
-    emit_tab(as, PPCI_SUBFE, tmp1, tmp1, tmp1);
-    emit_tab(as, PPCI_SUBFC, tmp2, tmp2, tmp1);
-    emit_asi(as, PPCI_XORIS, tmp2, right, 0x8000);
-    emit_asi(as, PPCI_XORIS, tmp1, left, 0x8000);
-  }
-}
-
-/* -- Comparisons --------------------------------------------------------- */
-
-#define CC_UNSIGNED	0x08	/* Unsigned integer comparison. */
-#define CC_TWO		0x80	/* Check two flags for FP comparison. */
-
-/* Map of comparisons to flags. ORDER IR. */
-static const uint8_t asm_compmap[IR_ABC+1] = {
-  /* op     int cc                 FP cc */
-  /* LT  */ CC_GE               + (CC_GE<<4),
-  /* GE  */ CC_LT               + (CC_LE<<4) + CC_TWO,
-  /* LE  */ CC_GT               + (CC_GE<<4) + CC_TWO,
-  /* GT  */ CC_LE               + (CC_LE<<4),
-  /* ULT */ CC_GE + CC_UNSIGNED + (CC_GT<<4) + CC_TWO,
-  /* UGE */ CC_LT + CC_UNSIGNED + (CC_LT<<4),
-  /* ULE */ CC_GT + CC_UNSIGNED + (CC_GT<<4),
-  /* UGT */ CC_LE + CC_UNSIGNED + (CC_LT<<4) + CC_TWO,
-  /* EQ  */ CC_NE               + (CC_NE<<4),
-  /* NE  */ CC_EQ               + (CC_EQ<<4),
-  /* ABC */ CC_LE + CC_UNSIGNED + (CC_LT<<4) + CC_TWO  /* Same as UGT. */
-};
-
-static void asm_intcomp_(ASMState *as, IRRef lref, IRRef rref, Reg cr, PPCCC cc)
-{
-  Reg right, left = ra_alloc1(as, lref, RSET_GPR);
-  if (irref_isk(rref)) {
-    int32_t k = IR(rref)->i;
-    if ((cc & CC_UNSIGNED) == 0) {  /* Signed comparison with constant. */
-      if (checki16(k)) {
-	emit_tai(as, PPCI_CMPWI, cr, left, k);
-	/* Signed comparison with zero and referencing previous ins? */
-	if (k == 0 && lref == as->curins-1)
-	  as->flagmcp = as->mcp;  /* Allow elimination of the compare. */
-	return;
-      } else if ((cc & 3) == (CC_EQ & 3)) {  /* Use CMPLWI for EQ or NE. */
-	if (checku16(k)) {
-	  emit_tai(as, PPCI_CMPLWI, cr, left, k);
-	  return;
-	} else if (!as->sectref && ra_noreg(IR(rref)->r)) {
-	  emit_tai(as, PPCI_CMPLWI, cr, RID_TMP, k);
-	  emit_asi(as, PPCI_XORIS, RID_TMP, left, (k >> 16));
-	  return;
-	}
-      }
-    } else {  /* Unsigned comparison with constant. */
-      if (checku16(k)) {
-	emit_tai(as, PPCI_CMPLWI, cr, left, k);
-	return;
-      }
-    }
-  }
-  right = ra_alloc1(as, rref, rset_exclude(RSET_GPR, left));
-  emit_tab(as, (cc & CC_UNSIGNED) ? PPCI_CMPLW : PPCI_CMPW, cr, left, right);
-}
-
-static void asm_comp(ASMState *as, IRIns *ir)
-{
-  PPCCC cc = asm_compmap[ir->o];
-  if (irt_isnum(ir->t)) {
-    Reg right, left = ra_alloc2(as, ir, RSET_FPR);
-    right = (left >> 8); left &= 255;
-    asm_guardcc(as, (cc >> 4));
-    if ((cc & CC_TWO))
-      emit_tab(as, PPCI_CROR, ((cc>>4)&3), ((cc>>4)&3), (CC_EQ&3));
-    emit_fab(as, PPCI_FCMPU, 0, left, right);
-  } else {
-    IRRef lref = ir->op1, rref = ir->op2;
-    if (irref_isk(lref) && !irref_isk(rref)) {
-      /* Swap constants to the right (only for ABC). */
-      IRRef tmp = lref; lref = rref; rref = tmp;
-      if ((cc & 2) == 0) cc ^= 1;  /* LT <-> GT, LE <-> GE */
-    }
-    asm_guardcc(as, cc);
-    asm_intcomp_(as, lref, rref, 0, cc);
-  }
-}
-
-#if LJ_HASFFI
-/* 64 bit integer comparisons. */
-static void asm_comp64(ASMState *as, IRIns *ir)
-{
-  PPCCC cc = asm_compmap[(ir-1)->o];
-  if ((cc&3) == (CC_EQ&3)) {
-    asm_guardcc(as, cc);
-    emit_tab(as, (cc&4) ? PPCI_CRAND : PPCI_CROR,
-	     (CC_EQ&3), (CC_EQ&3), 4+(CC_EQ&3));
-  } else {
-    asm_guardcc(as, CC_EQ);
-    emit_tab(as, PPCI_CROR, (CC_EQ&3), (CC_EQ&3), ((cc^~(cc>>2))&1));
-    emit_tab(as, (cc&4) ? PPCI_CRAND : PPCI_CRANDC,
-	     (CC_EQ&3), (CC_EQ&3), 4+(cc&3));
-  }
-  /* Loword comparison sets cr1 and is unsigned, except for equality. */
-  asm_intcomp_(as, (ir-1)->op1, (ir-1)->op2, 4,
-	       cc | ((cc&3) == (CC_EQ&3) ? 0 : CC_UNSIGNED));
-  /* Hiword comparison sets cr0. */
-  asm_intcomp_(as, ir->op1, ir->op2, 0, cc);
-  as->flagmcp = NULL;  /* Doesn't work here. */
-}
-#endif
-
-/* -- Support for 64 bit ops in 32 bit mode ------------------------------- */
-
-/* Hiword op of a split 64 bit op. Previous op must be the loword op. */
-static void asm_hiop(ASMState *as, IRIns *ir)
-{
-#if LJ_HASFFI
-  /* HIOP is marked as a store because it needs its own DCE logic. */
-  int uselo = ra_used(ir-1), usehi = ra_used(ir);  /* Loword/hiword used? */
-  if (LJ_UNLIKELY(!(as->flags & JIT_F_OPT_DCE))) uselo = usehi = 1;
-  if ((ir-1)->o == IR_CONV) {  /* Conversions to/from 64 bit. */
-    as->curins--;  /* Always skip the CONV. */
-    if (usehi || uselo)
-      asm_conv64(as, ir);
-    return;
-  } else if ((ir-1)->o <= IR_NE) {  /* 64 bit integer comparisons. ORDER IR. */
-    as->curins--;  /* Always skip the loword comparison. */
-    asm_comp64(as, ir);
-    return;
-  } else if ((ir-1)->o == IR_XSTORE) {
-    as->curins--;  /* Handle both stores here. */
-    if ((ir-1)->r != RID_SINK) {
-      asm_xstore(as, ir, 0);
-      asm_xstore(as, ir-1, 4);
-    }
-    return;
-  }
-  if (!usehi) return;  /* Skip unused hiword op for all remaining ops. */
-  switch ((ir-1)->o) {
-  case IR_ADD: as->curins--; asm_add64(as, ir); break;
-  case IR_SUB: as->curins--; asm_sub64(as, ir); break;
-  case IR_NEG: as->curins--; asm_neg64(as, ir); break;
-  case IR_CALLN:
-  case IR_CALLXS:
-    if (!uselo)
-      ra_allocref(as, ir->op1, RID2RSET(RID_RETLO));  /* Mark lo op as used. */
-    break;
-  case IR_CNEWI:
-    /* Nothing to do here. Handled by lo op itself. */
-    break;
-  default: lua_assert(0); break;
-  }
-#else
-  UNUSED(as); UNUSED(ir); lua_assert(0);  /* Unused without FFI. */
-#endif
-}
-
-/* -- Stack handling ------------------------------------------------------ */
-
-/* Check Lua stack size for overflow. Use exit handler as fallback. */
-static void asm_stack_check(ASMState *as, BCReg topslot,
-			    IRIns *irp, RegSet allow, ExitNo exitno)
-{
-  /* Try to get an unused temp. register, otherwise spill/restore RID_RET*. */
-  Reg tmp, pbase = irp ? (ra_hasreg(irp->r) ? irp->r : RID_TMP) : RID_BASE;
-  rset_clear(allow, pbase);
-  tmp = allow ? rset_pickbot(allow) :
-		(pbase == RID_RETHI ? RID_RETLO : RID_RETHI);
-  emit_condbranch(as, PPCI_BC, CC_LT, asm_exitstub_addr(as, exitno));
-  if (allow == RSET_EMPTY)  /* Restore temp. register. */
-    emit_tai(as, PPCI_LWZ, tmp, RID_SP, SPOFS_TMPW);
-  else
-    ra_modified(as, tmp);
-  emit_ai(as, PPCI_CMPLWI, RID_TMP, (int32_t)(8*topslot));
-  emit_tab(as, PPCI_SUBF, RID_TMP, pbase, tmp);
-  emit_tai(as, PPCI_LWZ, tmp, tmp, offsetof(lua_State, maxstack));
-  if (pbase == RID_TMP)
-    emit_getgl(as, RID_TMP, jit_base);
-  emit_getgl(as, tmp, jit_L);
-  if (allow == RSET_EMPTY)  /* Spill temp. register. */
-    emit_tai(as, PPCI_STW, tmp, RID_SP, SPOFS_TMPW);
-}
-
-/* Restore Lua stack from on-trace state. */
-static void asm_stack_restore(ASMState *as, SnapShot *snap)
-{
-  SnapEntry *map = &as->T->snapmap[snap->mapofs];
-  SnapEntry *flinks = &as->T->snapmap[snap_nextofs(as->T, snap)-1];
-  MSize n, nent = snap->nent;
-  /* Store the value of all modified slots to the Lua stack. */
-  for (n = 0; n < nent; n++) {
-    SnapEntry sn = map[n];
-    BCReg s = snap_slot(sn);
-    int32_t ofs = 8*((int32_t)s-1);
-    IRRef ref = snap_ref(sn);
-    IRIns *ir = IR(ref);
-    if ((sn & SNAP_NORESTORE))
-      continue;
-    if (irt_isnum(ir->t)) {
-      Reg src = ra_alloc1(as, ref, RSET_FPR);
-      emit_fai(as, PPCI_STFD, src, RID_BASE, ofs);
-    } else {
-      Reg type;
-      RegSet allow = rset_exclude(RSET_GPR, RID_BASE);
-      lua_assert(irt_ispri(ir->t) || irt_isaddr(ir->t) || irt_isinteger(ir->t));
-      if (!irt_ispri(ir->t)) {
-	Reg src = ra_alloc1(as, ref, allow);
-	rset_clear(allow, src);
-	emit_tai(as, PPCI_STW, src, RID_BASE, ofs+4);
-      }
-      if ((sn & (SNAP_CONT|SNAP_FRAME))) {
-	if (s == 0) continue;  /* Do not overwrite link to previous frame. */
-	type = ra_allock(as, (int32_t)(*flinks--), allow);
-      } else {
-	type = ra_allock(as, (int32_t)irt_toitype(ir->t), allow);
-      }
-      emit_tai(as, PPCI_STW, type, RID_BASE, ofs);
-    }
-    checkmclim(as);
-  }
-  lua_assert(map + nent == flinks);
-}
-
-/* -- GC handling --------------------------------------------------------- */
-
-/* Check GC threshold and do one or more GC steps. */
-static void asm_gc_check(ASMState *as)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_step_jit];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg tmp;
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  /* Exit trace if in GCSatomic or GCSfinalize. Avoids syncing GC objects. */
-  asm_guardcc(as, CC_NE);  /* Assumes asm_snap_prep() already done. */
-  emit_ai(as, PPCI_CMPWI, RID_RET, 0);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ASMREF_TMP2;  /* MSize steps     */
-  asm_gencall(as, ci, args);
-  emit_tai(as, PPCI_ADDI, ra_releasetmp(as, ASMREF_TMP1), RID_JGL, -32768);
-  tmp = ra_releasetmp(as, ASMREF_TMP2);
-  emit_loadi(as, tmp, as->gcsteps);
-  /* Jump around GC step if GC total < GC threshold. */
-  emit_condbranch(as, PPCI_BC|PPCF_Y, CC_LT, l_end);
-  emit_ab(as, PPCI_CMPLW, RID_TMP, tmp);
-  emit_getgl(as, tmp, gc.threshold);
-  emit_getgl(as, RID_TMP, gc.total);
-  as->gcsteps = 0;
-  checkmclim(as);
-}
-
-/* -- Loop handling ------------------------------------------------------- */
-
-/* Fixup the loop branch. */
-static void asm_loop_fixup(ASMState *as)
-{
-  MCode *p = as->mctop;
-  MCode *target = as->mcp;
-  if (as->loopinv) {  /* Inverted loop branch? */
-    /* asm_guardcc already inverted the cond branch and patched the final b. */
-    p[-2] = (p[-2] & (0xffff0000u & ~PPCF_Y)) | (((target-p+2) & 0x3fffu) << 2);
-  } else {
-    p[-1] = PPCI_B|(((target-p+1)&0x00ffffffu)<<2);
-  }
-}
-
-/* -- Head of trace ------------------------------------------------------- */
-
-/* Coalesce BASE register for a root trace. */
-static void asm_head_root_base(ASMState *as)
-{
-  IRIns *ir = IR(REF_BASE);
-  Reg r = ir->r;
-  if (ra_hasreg(r)) {
-    ra_free(as, r);
-    if (rset_test(as->modset, r) || irt_ismarked(ir->t))
-      ir->r = RID_INIT;  /* No inheritance for modified BASE register. */
-    if (r != RID_BASE)
-      emit_mr(as, r, RID_BASE);
-  }
-}
-
-/* Coalesce BASE register for a side trace. */
-static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow)
-{
-  IRIns *ir = IR(REF_BASE);
-  Reg r = ir->r;
-  if (ra_hasreg(r)) {
-    ra_free(as, r);
-    if (rset_test(as->modset, r) || irt_ismarked(ir->t))
-      ir->r = RID_INIT;  /* No inheritance for modified BASE register. */
-    if (irp->r == r) {
-      rset_clear(allow, r);  /* Mark same BASE register as coalesced. */
-    } else if (ra_hasreg(irp->r) && rset_test(as->freeset, irp->r)) {
-      rset_clear(allow, irp->r);
-      emit_mr(as, r, irp->r);  /* Move from coalesced parent reg. */
-    } else {
-      emit_getgl(as, r, jit_base);  /* Otherwise reload BASE. */
-    }
-  }
-  return allow;
-}
-
-/* -- Tail of trace ------------------------------------------------------- */
-
-/* Fixup the tail code. */
-static void asm_tail_fixup(ASMState *as, TraceNo lnk)
-{
-  MCode *p = as->mctop;
-  MCode *target;
-  int32_t spadj = as->T->spadjust;
-  if (spadj == 0) {
-    *--p = PPCI_NOP;
-    *--p = PPCI_NOP;
-    as->mctop = p;
-  } else {
-    /* Patch stack adjustment. */
-    lua_assert(checki16(CFRAME_SIZE+spadj));
-    p[-3] = PPCI_ADDI | PPCF_T(RID_TMP) | PPCF_A(RID_SP) | (CFRAME_SIZE+spadj);
-    p[-2] = PPCI_STWU | PPCF_T(RID_TMP) | PPCF_A(RID_SP) | spadj;
-  }
-  /* Patch exit branch. */
-  target = lnk ? traceref(as->J, lnk)->mcode : (MCode *)lj_vm_exit_interp;
-  p[-1] = PPCI_B|(((target-p+1)&0x00ffffffu)<<2);
-}
-
-/* Prepare tail of code. */
-static void asm_tail_prep(ASMState *as)
-{
-  MCode *p = as->mctop - 1;  /* Leave room for exit branch. */
-  if (as->loopref) {
-    as->invmcp = as->mcp = p;
-  } else {
-    as->mcp = p-2;  /* Leave room for stack pointer adjustment. */
-    as->invmcp = NULL;
-  }
-}
-
-/* -- Instruction dispatch ------------------------------------------------ */
-
-/* Assemble a single instruction. */
-static void asm_ir(ASMState *as, IRIns *ir)
-{
-  switch ((IROp)ir->o) {
-  /* Miscellaneous ops. */
-  case IR_LOOP: asm_loop(as); break;
-  case IR_NOP: case IR_XBAR: lua_assert(!ra_used(ir)); break;
-  case IR_USE:
-    ra_alloc1(as, ir->op1, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR); break;
-  case IR_PHI: asm_phi(as, ir); break;
-  case IR_HIOP: asm_hiop(as, ir); break;
-  case IR_GCSTEP: asm_gcstep(as, ir); break;
-
-  /* Guarded assertions. */
-  case IR_EQ: case IR_NE:
-    if ((ir-1)->o == IR_HREF && ir->op1 == as->curins-1) {
-      as->curins--;
-      asm_href(as, ir-1, (IROp)ir->o);
-      break;
-    }
-    /* fallthrough */
-  case IR_LT: case IR_GE: case IR_LE: case IR_GT:
-  case IR_ULT: case IR_UGE: case IR_ULE: case IR_UGT:
-  case IR_ABC:
-    asm_comp(as, ir);
-    break;
-
-  case IR_RETF: asm_retf(as, ir); break;
-
-  /* Bit ops. */
-  case IR_BNOT: asm_bitnot(as, ir); break;
-  case IR_BSWAP: asm_bitswap(as, ir); break;
-
-  case IR_BAND: asm_bitand(as, ir); break;
-  case IR_BOR:  asm_bitop(as, ir, PPCI_OR, PPCI_ORI); break;
-  case IR_BXOR: asm_bitop(as, ir, PPCI_XOR, PPCI_XORI); break;
-
-  case IR_BSHL: asm_bitshift(as, ir, PPCI_SLW, 0); break;
-  case IR_BSHR: asm_bitshift(as, ir, PPCI_SRW, 1); break;
-  case IR_BSAR: asm_bitshift(as, ir, PPCI_SRAW, PPCI_SRAWI); break;
-  case IR_BROL: asm_bitshift(as, ir, PPCI_RLWNM|PPCF_MB(0)|PPCF_ME(31),
-			     PPCI_RLWINM|PPCF_MB(0)|PPCF_ME(31)); break;
-  case IR_BROR: lua_assert(0); break;
-
-  /* Arithmetic ops. */
-  case IR_ADD: asm_add(as, ir); break;
-  case IR_SUB: asm_sub(as, ir); break;
-  case IR_MUL: asm_mul(as, ir); break;
-  case IR_DIV: asm_fparith(as, ir, PPCI_FDIV); break;
-  case IR_MOD: asm_callid(as, ir, IRCALL_lj_vm_modi); break;
-  case IR_POW: asm_callid(as, ir, IRCALL_lj_vm_powi); break;
-  case IR_NEG: asm_neg(as, ir); break;
-
-  case IR_ABS: asm_fpunary(as, ir, PPCI_FABS); break;
-  case IR_ATAN2: asm_callid(as, ir, IRCALL_atan2); break;
-  case IR_LDEXP: asm_callid(as, ir, IRCALL_ldexp); break;
-  case IR_MIN: asm_min_max(as, ir, 0); break;
-  case IR_MAX: asm_min_max(as, ir, 1); break;
-  case IR_FPMATH:
-    if (ir->op2 == IRFPM_EXP2 && asm_fpjoin_pow(as, ir))
-      break;
-    if (ir->op2 == IRFPM_SQRT && (as->flags & JIT_F_SQRT))
-      asm_fpunary(as, ir, PPCI_FSQRT);
-    else
-      asm_callid(as, ir, IRCALL_lj_vm_floor + ir->op2);
-    break;
-
-  /* Overflow-checking arithmetic ops. */
-  case IR_ADDOV: asm_arithov(as, ir, PPCI_ADDO); break;
-  case IR_SUBOV: asm_arithov(as, ir, PPCI_SUBFO); break;
-  case IR_MULOV: asm_arithov(as, ir, PPCI_MULLWO); break;
-
-  /* Memory references. */
-  case IR_AREF: asm_aref(as, ir); break;
-  case IR_HREF: asm_href(as, ir, 0); break;
-  case IR_HREFK: asm_hrefk(as, ir); break;
-  case IR_NEWREF: asm_newref(as, ir); break;
-  case IR_UREFO: case IR_UREFC: asm_uref(as, ir); break;
-  case IR_FREF: asm_fref(as, ir); break;
-  case IR_STRREF: asm_strref(as, ir); break;
-
-  /* Loads and stores. */
-  case IR_ALOAD: case IR_HLOAD: case IR_ULOAD: case IR_VLOAD:
-    asm_ahuvload(as, ir);
-    break;
-  case IR_FLOAD: asm_fload(as, ir); break;
-  case IR_XLOAD: asm_xload(as, ir); break;
-  case IR_SLOAD: asm_sload(as, ir); break;
-
-  case IR_ASTORE: case IR_HSTORE: case IR_USTORE: asm_ahustore(as, ir); break;
-  case IR_FSTORE: asm_fstore(as, ir); break;
-  case IR_XSTORE: asm_xstore(as, ir, 0); break;
-
-  /* Allocations. */
-  case IR_SNEW: case IR_XSNEW: asm_snew(as, ir); break;
-  case IR_TNEW: asm_tnew(as, ir); break;
-  case IR_TDUP: asm_tdup(as, ir); break;
-  case IR_CNEW: case IR_CNEWI: asm_cnew(as, ir); break;
-
-  /* Write barriers. */
-  case IR_TBAR: asm_tbar(as, ir); break;
-  case IR_OBAR: asm_obar(as, ir); break;
-
-  /* Type conversions. */
-  case IR_CONV: asm_conv(as, ir); break;
-  case IR_TOBIT: asm_tobit(as, ir); break;
-  case IR_TOSTR: asm_tostr(as, ir); break;
-  case IR_STRTO: asm_strto(as, ir); break;
-
-  /* Calls. */
-  case IR_CALLN: case IR_CALLL: case IR_CALLS: asm_call(as, ir); break;
-  case IR_CALLXS: asm_callx(as, ir); break;
-  case IR_CARG: break;
-
-  default:
-    setintV(&as->J->errinfo, ir->o);
-    lj_trace_err_info(as->J, LJ_TRERR_NYIIR);
-    break;
-  }
-}
-
-/* -- Trace setup --------------------------------------------------------- */
-
-/* Ensure there are enough stack slots for call arguments. */
-static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  uint32_t i, nargs = (int)CCI_NARGS(ci);
-  int nslots = 2, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR;
-  asm_collectargs(as, ir, ci, args);
-  for (i = 0; i < nargs; i++)
-    if (args[i] && irt_isfp(IR(args[i])->t)) {
-      if (nfpr > 0) nfpr--; else nslots = (nslots+3) & ~1;
-    } else {
-      if (ngpr > 0) ngpr--; else nslots++;
-    }
-  if (nslots > as->evenspill)  /* Leave room for args in stack slots. */
-    as->evenspill = nslots;
-  return irt_isfp(ir->t) ? REGSP_HINT(RID_FPRET) : REGSP_HINT(RID_RET);
-}
-
-static void asm_setup_target(ASMState *as)
-{
-  asm_exitstub_setup(as, as->T->nsnap + (as->parent ? 1 : 0));
-}
-
-/* -- Trace patching ------------------------------------------------------ */
-
-/* Patch exit jumps of existing machine code to a new target. */
-void lj_asm_patchexit(jit_State *J, GCtrace *T, ExitNo exitno, MCode *target)
-{
-  MCode *p = T->mcode;
-  MCode *pe = (MCode *)((char *)p + T->szmcode);
-  MCode *px = exitstub_trace_addr(T, exitno);
-  MCode *cstart = NULL;
-  MCode *mcarea = lj_mcode_patch(J, p, 0);
-  int clearso = 0;
-  for (; p < pe; p++) {
-    /* Look for exitstub branch, try to replace with branch to target. */
-    uint32_t ins = *p;
-    if ((ins & 0xfc000000u) == 0x40000000u &&
-	((ins ^ ((char *)px-(char *)p)) & 0xffffu) == 0) {
-      ptrdiff_t delta = (char *)target - (char *)p;
-      if (((ins >> 16) & 3) == (CC_SO&3)) {
-	clearso = sizeof(MCode);
-	delta -= sizeof(MCode);
-      }
-      /* Many, but not all short-range branches can be patched directly. */
-      if (((delta + 0x8000) >> 16) == 0) {
-	*p = (ins & 0xffdf0000u) | ((uint32_t)delta & 0xffffu) |
-	     ((delta & 0x8000) * (PPCF_Y/0x8000));
-	if (!cstart) cstart = p;
-      }
-    } else if ((ins & 0xfc000000u) == PPCI_B &&
-	       ((ins ^ ((char *)px-(char *)p)) & 0x03ffffffu) == 0) {
-      ptrdiff_t delta = (char *)target - (char *)p;
-      lua_assert(((delta + 0x02000000) >> 26) == 0);
-      *p = PPCI_B | ((uint32_t)delta & 0x03ffffffu);
-      if (!cstart) cstart = p;
-    }
-  }
-  {  /* Always patch long-range branch in exit stub itself. */
-    ptrdiff_t delta = (char *)target - (char *)px - clearso;
-    lua_assert(((delta + 0x02000000) >> 26) == 0);
-    *px = PPCI_B | ((uint32_t)delta & 0x03ffffffu);
-  }
-  if (!cstart) cstart = px;
-  lj_mcode_sync(cstart, px+1);
-  if (clearso) {  /* Extend the current trace. Ugly workaround. */
-    MCode *pp = J->cur.mcode;
-    J->cur.szmcode += sizeof(MCode);
-    *--pp = PPCI_MCRXR;  /* Clear SO flag. */
-    J->cur.mcode = pp;
-    lj_mcode_sync(pp, pp+1);
-  }
-  lj_mcode_patch(J, mcarea, 1);
-}
-
diff --git a/dependencies2013/win32/include/luajit/lj_asm_x86.h b/dependencies2013/win32/include/luajit/lj_asm_x86.h
deleted file mode 100644
index 10468bb7..00000000
--- a/dependencies2013/win32/include/luajit/lj_asm_x86.h
+++ /dev/null
@@ -1,2900 +0,0 @@
-/*
-** x86/x64 IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Guard handling ------------------------------------------------------ */
-
-/* Generate an exit stub group at the bottom of the reserved MCode memory. */
-static MCode *asm_exitstub_gen(ASMState *as, ExitNo group)
-{
-  ExitNo i, groupofs = (group*EXITSTUBS_PER_GROUP) & 0xff;
-  MCode *mxp = as->mcbot;
-  MCode *mxpstart = mxp;
-  if (mxp + (2+2)*EXITSTUBS_PER_GROUP+8+5 >= as->mctop)
-    asm_mclimit(as);
-  /* Push low byte of exitno for each exit stub. */
-  *mxp++ = XI_PUSHi8; *mxp++ = (MCode)groupofs;
-  for (i = 1; i < EXITSTUBS_PER_GROUP; i++) {
-    *mxp++ = XI_JMPs; *mxp++ = (MCode)((2+2)*(EXITSTUBS_PER_GROUP - i) - 2);
-    *mxp++ = XI_PUSHi8; *mxp++ = (MCode)(groupofs + i);
-  }
-  /* Push the high byte of the exitno for each exit stub group. */
-  *mxp++ = XI_PUSHi8; *mxp++ = (MCode)((group*EXITSTUBS_PER_GROUP)>>8);
-  /* Store DISPATCH at original stack slot 0. Account for the two push ops. */
-  *mxp++ = XI_MOVmi;
-  *mxp++ = MODRM(XM_OFS8, 0, RID_ESP);
-  *mxp++ = MODRM(XM_SCALE1, RID_ESP, RID_ESP);
-  *mxp++ = 2*sizeof(void *);
-  *(int32_t *)mxp = ptr2addr(J2GG(as->J)->dispatch); mxp += 4;
-  /* Jump to exit handler which fills in the ExitState. */
-  *mxp++ = XI_JMP; mxp += 4;
-  *((int32_t *)(mxp-4)) = jmprel(mxp, (MCode *)(void *)lj_vm_exit_handler);
-  /* Commit the code for this group (even if assembly fails later on). */
-  lj_mcode_commitbot(as->J, mxp);
-  as->mcbot = mxp;
-  as->mclim = as->mcbot + MCLIM_REDZONE;
-  return mxpstart;
-}
-
-/* Setup all needed exit stubs. */
-static void asm_exitstub_setup(ASMState *as, ExitNo nexits)
-{
-  ExitNo i;
-  if (nexits >= EXITSTUBS_PER_GROUP*LJ_MAX_EXITSTUBGR)
-    lj_trace_err(as->J, LJ_TRERR_SNAPOV);
-  for (i = 0; i < (nexits+EXITSTUBS_PER_GROUP-1)/EXITSTUBS_PER_GROUP; i++)
-    if (as->J->exitstubgroup[i] == NULL)
-      as->J->exitstubgroup[i] = asm_exitstub_gen(as, i);
-}
-
-/* Emit conditional branch to exit for guard.
-** It's important to emit this *after* all registers have been allocated,
-** because rematerializations may invalidate the flags.
-*/
-static void asm_guardcc(ASMState *as, int cc)
-{
-  MCode *target = exitstub_addr(as->J, as->snapno);
-  MCode *p = as->mcp;
-  if (LJ_UNLIKELY(p == as->invmcp)) {
-    as->loopinv = 1;
-    *(int32_t *)(p+1) = jmprel(p+5, target);
-    target = p;
-    cc ^= 1;
-    if (as->realign) {
-      emit_sjcc(as, cc, target);
-      return;
-    }
-  }
-  emit_jcc(as, cc, target);
-}
-
-/* -- Memory operand fusion ----------------------------------------------- */
-
-/* Limit linear search to this distance. Avoids O(n^2) behavior. */
-#define CONFLICT_SEARCH_LIM	31
-
-/* Check if a reference is a signed 32 bit constant. */
-static int asm_isk32(ASMState *as, IRRef ref, int32_t *k)
-{
-  if (irref_isk(ref)) {
-    IRIns *ir = IR(ref);
-    if (ir->o != IR_KINT64) {
-      *k = ir->i;
-      return 1;
-    } else if (checki32((int64_t)ir_kint64(ir)->u64)) {
-      *k = (int32_t)ir_kint64(ir)->u64;
-      return 1;
-    }
-  }
-  return 0;
-}
-
-/* Check if there's no conflicting instruction between curins and ref.
-** Also avoid fusing loads if there are multiple references.
-*/
-static int noconflict(ASMState *as, IRRef ref, IROp conflict, int noload)
-{
-  IRIns *ir = as->ir;
-  IRRef i = as->curins;
-  if (i > ref + CONFLICT_SEARCH_LIM)
-    return 0;  /* Give up, ref is too far away. */
-  while (--i > ref) {
-    if (ir[i].o == conflict)
-      return 0;  /* Conflict found. */
-    else if (!noload && (ir[i].op1 == ref || ir[i].op2 == ref))
-      return 0;
-  }
-  return 1;  /* Ok, no conflict. */
-}
-
-/* Fuse array base into memory operand. */
-static IRRef asm_fuseabase(ASMState *as, IRRef ref)
-{
-  IRIns *irb = IR(ref);
-  as->mrm.ofs = 0;
-  if (irb->o == IR_FLOAD) {
-    IRIns *ira = IR(irb->op1);
-    lua_assert(irb->op2 == IRFL_TAB_ARRAY);
-    /* We can avoid the FLOAD of t->array for colocated arrays. */
-    if (ira->o == IR_TNEW && ira->op1 <= LJ_MAX_COLOSIZE &&
-	!neverfuse(as) && noconflict(as, irb->op1, IR_NEWREF, 1)) {
-      as->mrm.ofs = (int32_t)sizeof(GCtab);  /* Ofs to colocated array. */
-      return irb->op1;  /* Table obj. */
-    }
-  } else if (irb->o == IR_ADD && irref_isk(irb->op2)) {
-    /* Fuse base offset (vararg load). */
-    as->mrm.ofs = IR(irb->op2)->i;
-    return irb->op1;
-  }
-  return ref;  /* Otherwise use the given array base. */
-}
-
-/* Fuse array reference into memory operand. */
-static void asm_fusearef(ASMState *as, IRIns *ir, RegSet allow)
-{
-  IRIns *irx;
-  lua_assert(ir->o == IR_AREF);
-  as->mrm.base = (uint8_t)ra_alloc1(as, asm_fuseabase(as, ir->op1), allow);
-  irx = IR(ir->op2);
-  if (irref_isk(ir->op2)) {
-    as->mrm.ofs += 8*irx->i;
-    as->mrm.idx = RID_NONE;
-  } else {
-    rset_clear(allow, as->mrm.base);
-    as->mrm.scale = XM_SCALE8;
-    /* Fuse a constant ADD (e.g. t[i+1]) into the offset.
-    ** Doesn't help much without ABCelim, but reduces register pressure.
-    */
-    if (!LJ_64 &&  /* Has bad effects with negative index on x64. */
-	mayfuse(as, ir->op2) && ra_noreg(irx->r) &&
-	irx->o == IR_ADD && irref_isk(irx->op2)) {
-      as->mrm.ofs += 8*IR(irx->op2)->i;
-      as->mrm.idx = (uint8_t)ra_alloc1(as, irx->op1, allow);
-    } else {
-      as->mrm.idx = (uint8_t)ra_alloc1(as, ir->op2, allow);
-    }
-  }
-}
-
-/* Fuse array/hash/upvalue reference into memory operand.
-** Caveat: this may allocate GPRs for the base/idx registers. Be sure to
-** pass the final allow mask, excluding any GPRs used for other inputs.
-** In particular: 2-operand GPR instructions need to call ra_dest() first!
-*/
-static void asm_fuseahuref(ASMState *as, IRRef ref, RegSet allow)
-{
-  IRIns *ir = IR(ref);
-  if (ra_noreg(ir->r)) {
-    switch ((IROp)ir->o) {
-    case IR_AREF:
-      if (mayfuse(as, ref)) {
-	asm_fusearef(as, ir, allow);
-	return;
-      }
-      break;
-    case IR_HREFK:
-      if (mayfuse(as, ref)) {
-	as->mrm.base = (uint8_t)ra_alloc1(as, ir->op1, allow);
-	as->mrm.ofs = (int32_t)(IR(ir->op2)->op2 * sizeof(Node));
-	as->mrm.idx = RID_NONE;
-	return;
-      }
-      break;
-    case IR_UREFC:
-      if (irref_isk(ir->op1)) {
-	GCfunc *fn = ir_kfunc(IR(ir->op1));
-	GCupval *uv = &gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv;
-	as->mrm.ofs = ptr2addr(&uv->tv);
-	as->mrm.base = as->mrm.idx = RID_NONE;
-	return;
-      }
-      break;
-    default:
-      lua_assert(ir->o == IR_HREF || ir->o == IR_NEWREF || ir->o == IR_UREFO ||
-		 ir->o == IR_KKPTR);
-      break;
-    }
-  }
-  as->mrm.base = (uint8_t)ra_alloc1(as, ref, allow);
-  as->mrm.ofs = 0;
-  as->mrm.idx = RID_NONE;
-}
-
-/* Fuse FLOAD/FREF reference into memory operand. */
-static void asm_fusefref(ASMState *as, IRIns *ir, RegSet allow)
-{
-  lua_assert(ir->o == IR_FLOAD || ir->o == IR_FREF);
-  as->mrm.ofs = field_ofs[ir->op2];
-  as->mrm.idx = RID_NONE;
-  if (irref_isk(ir->op1)) {
-    as->mrm.ofs += IR(ir->op1)->i;
-    as->mrm.base = RID_NONE;
-  } else {
-    as->mrm.base = (uint8_t)ra_alloc1(as, ir->op1, allow);
-  }
-}
-
-/* Fuse string reference into memory operand. */
-static void asm_fusestrref(ASMState *as, IRIns *ir, RegSet allow)
-{
-  IRIns *irr;
-  lua_assert(ir->o == IR_STRREF);
-  as->mrm.base = as->mrm.idx = RID_NONE;
-  as->mrm.scale = XM_SCALE1;
-  as->mrm.ofs = sizeof(GCstr);
-  if (irref_isk(ir->op1)) {
-    as->mrm.ofs += IR(ir->op1)->i;
-  } else {
-    Reg r = ra_alloc1(as, ir->op1, allow);
-    rset_clear(allow, r);
-    as->mrm.base = (uint8_t)r;
-  }
-  irr = IR(ir->op2);
-  if (irref_isk(ir->op2)) {
-    as->mrm.ofs += irr->i;
-  } else {
-    Reg r;
-    /* Fuse a constant add into the offset, e.g. string.sub(s, i+10). */
-    if (!LJ_64 &&  /* Has bad effects with negative index on x64. */
-	mayfuse(as, ir->op2) && irr->o == IR_ADD && irref_isk(irr->op2)) {
-      as->mrm.ofs += IR(irr->op2)->i;
-      r = ra_alloc1(as, irr->op1, allow);
-    } else {
-      r = ra_alloc1(as, ir->op2, allow);
-    }
-    if (as->mrm.base == RID_NONE)
-      as->mrm.base = (uint8_t)r;
-    else
-      as->mrm.idx = (uint8_t)r;
-  }
-}
-
-static void asm_fusexref(ASMState *as, IRRef ref, RegSet allow)
-{
-  IRIns *ir = IR(ref);
-  as->mrm.idx = RID_NONE;
-  if (ir->o == IR_KPTR || ir->o == IR_KKPTR) {
-    as->mrm.ofs = ir->i;
-    as->mrm.base = RID_NONE;
-  } else if (ir->o == IR_STRREF) {
-    asm_fusestrref(as, ir, allow);
-  } else {
-    as->mrm.ofs = 0;
-    if (canfuse(as, ir) && ir->o == IR_ADD && ra_noreg(ir->r)) {
-      /* Gather (base+idx*sz)+ofs as emitted by cdata ptr/array indexing. */
-      IRIns *irx;
-      IRRef idx;
-      Reg r;
-      if (asm_isk32(as, ir->op2, &as->mrm.ofs)) {  /* Recognize x+ofs. */
-	ref = ir->op1;
-	ir = IR(ref);
-	if (!(ir->o == IR_ADD && canfuse(as, ir) && ra_noreg(ir->r)))
-	  goto noadd;
-      }
-      as->mrm.scale = XM_SCALE1;
-      idx = ir->op1;
-      ref = ir->op2;
-      irx = IR(idx);
-      if (!(irx->o == IR_BSHL || irx->o == IR_ADD)) {  /* Try other operand. */
-	idx = ir->op2;
-	ref = ir->op1;
-	irx = IR(idx);
-      }
-      if (canfuse(as, irx) && ra_noreg(irx->r)) {
-	if (irx->o == IR_BSHL && irref_isk(irx->op2) && IR(irx->op2)->i <= 3) {
-	  /* Recognize idx<<b with b = 0-3, corresponding to sz = (1),2,4,8. */
-	  idx = irx->op1;
-	  as->mrm.scale = (uint8_t)(IR(irx->op2)->i << 6);
-	} else if (irx->o == IR_ADD && irx->op1 == irx->op2) {
-	  /* FOLD does idx*2 ==> idx<<1 ==> idx+idx. */
-	  idx = irx->op1;
-	  as->mrm.scale = XM_SCALE2;
-	}
-      }
-      r = ra_alloc1(as, idx, allow);
-      rset_clear(allow, r);
-      as->mrm.idx = (uint8_t)r;
-    }
-  noadd:
-    as->mrm.base = (uint8_t)ra_alloc1(as, ref, allow);
-  }
-}
-
-/* Fuse load into memory operand. */
-static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow)
-{
-  IRIns *ir = IR(ref);
-  if (ra_hasreg(ir->r)) {
-    if (allow != RSET_EMPTY) {  /* Fast path. */
-      ra_noweak(as, ir->r);
-      return ir->r;
-    }
-  fusespill:
-    /* Force a spill if only memory operands are allowed (asm_x87load). */
-    as->mrm.base = RID_ESP;
-    as->mrm.ofs = ra_spill(as, ir);
-    as->mrm.idx = RID_NONE;
-    return RID_MRM;
-  }
-  if (ir->o == IR_KNUM) {
-    RegSet avail = as->freeset & ~as->modset & RSET_FPR;
-    lua_assert(allow != RSET_EMPTY);
-    if (!(avail & (avail-1))) {  /* Fuse if less than two regs available. */
-      as->mrm.ofs = ptr2addr(ir_knum(ir));
-      as->mrm.base = as->mrm.idx = RID_NONE;
-      return RID_MRM;
-    }
-  } else if (ref == REF_BASE || ir->o == IR_KINT64) {
-    RegSet avail = as->freeset & ~as->modset & RSET_GPR;
-    lua_assert(allow != RSET_EMPTY);
-    if (!(avail & (avail-1))) {  /* Fuse if less than two regs available. */
-      as->mrm.ofs = ptr2addr(ref == REF_BASE ? (void *)&J2G(as->J)->jit_base : (void *)ir_kint64(ir));
-      as->mrm.base = as->mrm.idx = RID_NONE;
-      return RID_MRM;
-    }
-  } else if (mayfuse(as, ref)) {
-    RegSet xallow = (allow & RSET_GPR) ? allow : RSET_GPR;
-    if (ir->o == IR_SLOAD) {
-      if (!(ir->op2 & (IRSLOAD_PARENT|IRSLOAD_CONVERT)) &&
-	  noconflict(as, ref, IR_RETF, 0)) {
-	as->mrm.base = (uint8_t)ra_alloc1(as, REF_BASE, xallow);
-	as->mrm.ofs = 8*((int32_t)ir->op1-1) + ((ir->op2&IRSLOAD_FRAME)?4:0);
-	as->mrm.idx = RID_NONE;
-	return RID_MRM;
-      }
-    } else if (ir->o == IR_FLOAD) {
-      /* Generic fusion is only ok for 32 bit operand (but see asm_comp). */
-      if ((irt_isint(ir->t) || irt_isu32(ir->t) || irt_isaddr(ir->t)) &&
-	  noconflict(as, ref, IR_FSTORE, 0)) {
-	asm_fusefref(as, ir, xallow);
-	return RID_MRM;
-      }
-    } else if (ir->o == IR_ALOAD || ir->o == IR_HLOAD || ir->o == IR_ULOAD) {
-      if (noconflict(as, ref, ir->o + IRDELTA_L2S, 0)) {
-	asm_fuseahuref(as, ir->op1, xallow);
-	return RID_MRM;
-      }
-    } else if (ir->o == IR_XLOAD) {
-      /* Generic fusion is not ok for 8/16 bit operands (but see asm_comp).
-      ** Fusing unaligned memory operands is ok on x86 (except for SIMD types).
-      */
-      if ((!irt_typerange(ir->t, IRT_I8, IRT_U16)) &&
-	  noconflict(as, ref, IR_XSTORE, 0)) {
-	asm_fusexref(as, ir->op1, xallow);
-	return RID_MRM;
-      }
-    } else if (ir->o == IR_VLOAD) {
-      asm_fuseahuref(as, ir->op1, xallow);
-      return RID_MRM;
-    }
-  }
-  if (!(as->freeset & allow) && !emit_canremat(ref) &&
-      (allow == RSET_EMPTY || ra_hasspill(ir->s) || iscrossref(as, ref)))
-    goto fusespill;
-  return ra_allocref(as, ref, allow);
-}
-
-#if LJ_64
-/* Don't fuse a 32 bit load into a 64 bit operation. */
-static Reg asm_fuseloadm(ASMState *as, IRRef ref, RegSet allow, int is64)
-{
-  if (is64 && !irt_is64(IR(ref)->t))
-    return ra_alloc1(as, ref, allow);
-  return asm_fuseload(as, ref, allow);
-}
-#else
-#define asm_fuseloadm(as, ref, allow, is64)  asm_fuseload(as, (ref), (allow))
-#endif
-
-/* -- Calls --------------------------------------------------------------- */
-
-/* Count the required number of stack slots for a call. */
-static int asm_count_call_slots(ASMState *as, const CCallInfo *ci, IRRef *args)
-{
-  uint32_t i, nargs = CCI_NARGS(ci);
-  int nslots = 0;
-#if LJ_64
-  if (LJ_ABI_WIN) {
-    nslots = (int)(nargs*2);  /* Only matters for more than four args. */
-  } else {
-    int ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR;
-    for (i = 0; i < nargs; i++)
-      if (args[i] && irt_isfp(IR(args[i])->t)) {
-	if (nfpr > 0) nfpr--; else nslots += 2;
-      } else {
-	if (ngpr > 0) ngpr--; else nslots += 2;
-      }
-  }
-#else
-  int ngpr = 0;
-  if ((ci->flags & CCI_CC_MASK) == CCI_CC_FASTCALL)
-    ngpr = 2;
-  else if ((ci->flags & CCI_CC_MASK) == CCI_CC_THISCALL)
-    ngpr = 1;
-  for (i = 0; i < nargs; i++)
-    if (args[i] && irt_isfp(IR(args[i])->t)) {
-      nslots += irt_isnum(IR(args[i])->t) ? 2 : 1;
-    } else {
-      if (ngpr > 0) ngpr--; else nslots++;
-    }
-#endif
-  return nslots;
-}
-
-/* Generate a call to a C function. */
-static void asm_gencall(ASMState *as, const CCallInfo *ci, IRRef *args)
-{
-  uint32_t n, nargs = CCI_NARGS(ci);
-  int32_t ofs = STACKARG_OFS;
-#if LJ_64
-  uint32_t gprs = REGARG_GPRS;
-  Reg fpr = REGARG_FIRSTFPR;
-#if !LJ_ABI_WIN
-  MCode *patchnfpr = NULL;
-#endif
-#else
-  uint32_t gprs = 0;
-  if ((ci->flags & CCI_CC_MASK) != CCI_CC_CDECL) {
-    if ((ci->flags & CCI_CC_MASK) == CCI_CC_THISCALL)
-      gprs = (REGARG_GPRS & 31);
-    else if ((ci->flags & CCI_CC_MASK) == CCI_CC_FASTCALL)
-      gprs = REGARG_GPRS;
-  }
-#endif
-  if ((void *)ci->func)
-    emit_call(as, ci->func);
-#if LJ_64
-  if ((ci->flags & CCI_VARARG)) {  /* Special handling for vararg calls. */
-#if LJ_ABI_WIN
-    for (n = 0; n < 4 && n < nargs; n++) {
-      IRIns *ir = IR(args[n]);
-      if (irt_isfp(ir->t))  /* Duplicate FPRs in GPRs. */
-	emit_rr(as, XO_MOVDto, (irt_isnum(ir->t) ? REX_64 : 0) | (fpr+n),
-		((gprs >> (n*5)) & 31));  /* Either MOVD or MOVQ. */
-    }
-#else
-    patchnfpr = --as->mcp;  /* Indicate number of used FPRs in register al. */
-    *--as->mcp = XI_MOVrib | RID_EAX;
-#endif
-  }
-#endif
-  for (n = 0; n < nargs; n++) {  /* Setup args. */
-    IRRef ref = args[n];
-    IRIns *ir = IR(ref);
-    Reg r;
-#if LJ_64 && LJ_ABI_WIN
-    /* Windows/x64 argument registers are strictly positional. */
-    r = irt_isfp(ir->t) ? (fpr <= REGARG_LASTFPR ? fpr : 0) : (gprs & 31);
-    fpr++; gprs >>= 5;
-#elif LJ_64
-    /* POSIX/x64 argument registers are used in order of appearance. */
-    if (irt_isfp(ir->t)) {
-      r = fpr <= REGARG_LASTFPR ? fpr++ : 0;
-    } else {
-      r = gprs & 31; gprs >>= 5;
-    }
-#else
-    if (ref && irt_isfp(ir->t)) {
-      r = 0;
-    } else {
-      r = gprs & 31; gprs >>= 5;
-      if (!ref) continue;
-    }
-#endif
-    if (r) {  /* Argument is in a register. */
-      if (r < RID_MAX_GPR && ref < ASMREF_TMP1) {
-#if LJ_64
-	if (ir->o == IR_KINT64)
-	  emit_loadu64(as, r, ir_kint64(ir)->u64);
-	else
-#endif
-	  emit_loadi(as, r, ir->i);
-      } else {
-	lua_assert(rset_test(as->freeset, r));  /* Must have been evicted. */
-	if (ra_hasreg(ir->r)) {
-	  ra_noweak(as, ir->r);
-	  emit_movrr(as, ir, r, ir->r);
-	} else {
-	  ra_allocref(as, ref, RID2RSET(r));
-	}
-      }
-    } else if (irt_isfp(ir->t)) {  /* FP argument is on stack. */
-      lua_assert(!(irt_isfloat(ir->t) && irref_isk(ref)));  /* No float k. */
-      if (LJ_32 && (ofs & 4) && irref_isk(ref)) {
-	/* Split stores for unaligned FP consts. */
-	emit_movmroi(as, RID_ESP, ofs, (int32_t)ir_knum(ir)->u32.lo);
-	emit_movmroi(as, RID_ESP, ofs+4, (int32_t)ir_knum(ir)->u32.hi);
-      } else {
-	r = ra_alloc1(as, ref, RSET_FPR);
-	emit_rmro(as, irt_isnum(ir->t) ? XO_MOVSDto : XO_MOVSSto,
-		  r, RID_ESP, ofs);
-      }
-      ofs += (LJ_32 && irt_isfloat(ir->t)) ? 4 : 8;
-    } else {  /* Non-FP argument is on stack. */
-      if (LJ_32 && ref < ASMREF_TMP1) {
-	emit_movmroi(as, RID_ESP, ofs, ir->i);
-      } else {
-	r = ra_alloc1(as, ref, RSET_GPR);
-	emit_movtomro(as, REX_64 + r, RID_ESP, ofs);
-      }
-      ofs += sizeof(intptr_t);
-    }
-    checkmclim(as);
-  }
-#if LJ_64 && !LJ_ABI_WIN
-  if (patchnfpr) *patchnfpr = fpr - REGARG_FIRSTFPR;
-#endif
-}
-
-/* Setup result reg/sp for call. Evict scratch regs. */
-static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  RegSet drop = RSET_SCRATCH;
-  int hiop = (LJ_32 && (ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t));
-  if ((ci->flags & CCI_NOFPRCLOBBER))
-    drop &= ~RSET_FPR;
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  if (hiop && ra_hasreg((ir+1)->r))
-    rset_clear(drop, (ir+1)->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);  /* Evictions must be performed first. */
-  if (ra_used(ir)) {
-    if (irt_isfp(ir->t)) {
-      int32_t ofs = sps_scale(ir->s);  /* Use spill slot or temp slots. */
-#if LJ_64
-      if ((ci->flags & CCI_CASTU64)) {
-	Reg dest = ir->r;
-	if (ra_hasreg(dest)) {
-	  ra_free(as, dest);
-	  ra_modified(as, dest);
-	  emit_rr(as, XO_MOVD, dest|REX_64, RID_RET);  /* Really MOVQ. */
-	}
-	if (ofs) emit_movtomro(as, RID_RET|REX_64, RID_ESP, ofs);
-      } else {
-	ra_destreg(as, ir, RID_FPRET);
-      }
-#else
-      /* Number result is in x87 st0 for x86 calling convention. */
-      Reg dest = ir->r;
-      if (ra_hasreg(dest)) {
-	ra_free(as, dest);
-	ra_modified(as, dest);
-	emit_rmro(as, irt_isnum(ir->t) ? XMM_MOVRM(as) : XO_MOVSS,
-		  dest, RID_ESP, ofs);
-      }
-      if ((ci->flags & CCI_CASTU64)) {
-	emit_movtomro(as, RID_RETLO, RID_ESP, ofs);
-	emit_movtomro(as, RID_RETHI, RID_ESP, ofs+4);
-      } else {
-	emit_rmro(as, irt_isnum(ir->t) ? XO_FSTPq : XO_FSTPd,
-		  irt_isnum(ir->t) ? XOg_FSTPq : XOg_FSTPd, RID_ESP, ofs);
-      }
-#endif
-#if LJ_32
-    } else if (hiop) {
-      ra_destpair(as, ir);
-#endif
-    } else {
-      lua_assert(!irt_ispri(ir->t));
-      ra_destreg(as, ir, RID_RET);
-    }
-  } else if (LJ_32 && irt_isfp(ir->t) && !(ci->flags & CCI_CASTU64)) {
-    emit_x87op(as, XI_FPOP);  /* Pop unused result from x87 st0. */
-  }
-}
-
-static void asm_call(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX];
-  const CCallInfo *ci = &lj_ir_callinfo[ir->op2];
-  asm_collectargs(as, ir, ci, args);
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-/* Return a constant function pointer or NULL for indirect calls. */
-static void *asm_callx_func(ASMState *as, IRIns *irf, IRRef func)
-{
-#if LJ_32
-  UNUSED(as);
-  if (irref_isk(func))
-    return (void *)irf->i;
-#else
-  if (irref_isk(func)) {
-    MCode *p;
-    if (irf->o == IR_KINT64)
-      p = (MCode *)(void *)ir_k64(irf)->u64;
-    else
-      p = (MCode *)(void *)(uintptr_t)(uint32_t)irf->i;
-    if (p - as->mcp == (int32_t)(p - as->mcp))
-      return p;  /* Call target is still in +-2GB range. */
-    /* Avoid the indirect case of emit_call(). Try to hoist func addr. */
-  }
-#endif
-  return NULL;
-}
-
-static void asm_callx(ASMState *as, IRIns *ir)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  CCallInfo ci;
-  IRRef func;
-  IRIns *irf;
-  int32_t spadj = 0;
-  ci.flags = asm_callx_flags(as, ir);
-  asm_collectargs(as, ir, &ci, args);
-  asm_setupresult(as, ir, &ci);
-#if LJ_32
-  /* Have to readjust stack after non-cdecl calls due to callee cleanup. */
-  if ((ci.flags & CCI_CC_MASK) != CCI_CC_CDECL)
-    spadj = 4 * asm_count_call_slots(as, &ci, args);
-#endif
-  func = ir->op2; irf = IR(func);
-  if (irf->o == IR_CARG) { func = irf->op1; irf = IR(func); }
-  ci.func = (ASMFunction)asm_callx_func(as, irf, func);
-  if (!(void *)ci.func) {
-    /* Use a (hoistable) non-scratch register for indirect calls. */
-    RegSet allow = (RSET_GPR & ~RSET_SCRATCH);
-    Reg r = ra_alloc1(as, func, allow);
-    if (LJ_32) emit_spsub(as, spadj);  /* Above code may cause restores! */
-    emit_rr(as, XO_GROUP5, XOg_CALL, r);
-  } else if (LJ_32) {
-    emit_spsub(as, spadj);
-  }
-  asm_gencall(as, &ci, args);
-}
-
-/* -- Returns ------------------------------------------------------------- */
-
-/* Return to lower frame. Guard that it goes to the right spot. */
-static void asm_retf(ASMState *as, IRIns *ir)
-{
-  Reg base = ra_alloc1(as, REF_BASE, RSET_GPR);
-  void *pc = ir_kptr(IR(ir->op2));
-  int32_t delta = 1+bc_a(*((const BCIns *)pc - 1));
-  as->topslot -= (BCReg)delta;
-  if ((int32_t)as->topslot < 0) as->topslot = 0;
-  irt_setmark(IR(REF_BASE)->t);  /* Children must not coalesce with BASE reg. */
-  emit_setgl(as, base, jit_base);
-  emit_addptr(as, base, -8*delta);
-  asm_guardcc(as, CC_NE);
-  emit_gmroi(as, XG_ARITHi(XOg_CMP), base, -4, ptr2addr(pc));
-}
-
-/* -- Type conversions ---------------------------------------------------- */
-
-static void asm_tointg(ASMState *as, IRIns *ir, Reg left)
-{
-  Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, left));
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  asm_guardcc(as, CC_P);
-  asm_guardcc(as, CC_NE);
-  emit_rr(as, XO_UCOMISD, left, tmp);
-  emit_rr(as, XO_CVTSI2SD, tmp, dest);
-  if (!(as->flags & JIT_F_SPLIT_XMM))
-    emit_rr(as, XO_XORPS, tmp, tmp);  /* Avoid partial register stall. */
-  emit_rr(as, XO_CVTTSD2SI, dest, left);
-  /* Can't fuse since left is needed twice. */
-}
-
-static void asm_tobit(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  Reg tmp = ra_noreg(IR(ir->op1)->r) ?
-	      ra_alloc1(as, ir->op1, RSET_FPR) :
-	      ra_scratch(as, RSET_FPR);
-  Reg right = asm_fuseload(as, ir->op2, rset_exclude(RSET_FPR, tmp));
-  emit_rr(as, XO_MOVDto, tmp, dest);
-  emit_mrm(as, XO_ADDSD, tmp, right);
-  ra_left(as, tmp, ir->op1);
-}
-
-static void asm_conv(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)(ir->op2 & IRCONV_SRCMASK);
-  int st64 = (st == IRT_I64 || st == IRT_U64 || (LJ_64 && st == IRT_P64));
-  int stfp = (st == IRT_NUM || st == IRT_FLOAT);
-  IRRef lref = ir->op1;
-  lua_assert(irt_type(ir->t) != st);
-  lua_assert(!(LJ_32 && (irt_isint64(ir->t) || st64)));  /* Handled by SPLIT. */
-  if (irt_isfp(ir->t)) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    if (stfp) {  /* FP to FP conversion. */
-      Reg left = asm_fuseload(as, lref, RSET_FPR);
-      emit_mrm(as, st == IRT_NUM ? XO_CVTSD2SS : XO_CVTSS2SD, dest, left);
-      if (left == dest) return;  /* Avoid the XO_XORPS. */
-    } else if (LJ_32 && st == IRT_U32) {  /* U32 to FP conversion on x86. */
-      /* number = (2^52+2^51 .. u32) - (2^52+2^51) */
-      cTValue *k = lj_ir_k64_find(as->J, U64x(43380000,00000000));
-      Reg bias = ra_scratch(as, rset_exclude(RSET_FPR, dest));
-      if (irt_isfloat(ir->t))
-	emit_rr(as, XO_CVTSD2SS, dest, dest);
-      emit_rr(as, XO_SUBSD, dest, bias);  /* Subtract 2^52+2^51 bias. */
-      emit_rr(as, XO_XORPS, dest, bias);  /* Merge bias and integer. */
-      emit_loadn(as, bias, k);
-      emit_mrm(as, XO_MOVD, dest, asm_fuseload(as, lref, RSET_GPR));
-      return;
-    } else {  /* Integer to FP conversion. */
-      Reg left = (LJ_64 && (st == IRT_U32 || st == IRT_U64)) ?
-		 ra_alloc1(as, lref, RSET_GPR) :
-		 asm_fuseloadm(as, lref, RSET_GPR, st64);
-      if (LJ_64 && st == IRT_U64) {
-	MCLabel l_end = emit_label(as);
-	const void *k = lj_ir_k64_find(as->J, U64x(43f00000,00000000));
-	emit_rma(as, XO_ADDSD, dest, k);  /* Add 2^64 to compensate. */
-	emit_sjcc(as, CC_NS, l_end);
-	emit_rr(as, XO_TEST, left|REX_64, left);  /* Check if u64 >= 2^63. */
-      }
-      emit_mrm(as, irt_isnum(ir->t) ? XO_CVTSI2SD : XO_CVTSI2SS,
-	       dest|((LJ_64 && (st64 || st == IRT_U32)) ? REX_64 : 0), left);
-    }
-    if (!(as->flags & JIT_F_SPLIT_XMM))
-      emit_rr(as, XO_XORPS, dest, dest);  /* Avoid partial register stall. */
-  } else if (stfp) {  /* FP to integer conversion. */
-    if (irt_isguard(ir->t)) {
-      /* Checked conversions are only supported from number to int. */
-      lua_assert(irt_isint(ir->t) && st == IRT_NUM);
-      asm_tointg(as, ir, ra_alloc1(as, lref, RSET_FPR));
-    } else {
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      x86Op op = st == IRT_NUM ?
-		 ((ir->op2 & IRCONV_TRUNC) ? XO_CVTTSD2SI : XO_CVTSD2SI) :
-		 ((ir->op2 & IRCONV_TRUNC) ? XO_CVTTSS2SI : XO_CVTSS2SI);
-      if (LJ_64 ? irt_isu64(ir->t) : irt_isu32(ir->t)) {
-	/* LJ_64: For inputs >= 2^63 add -2^64, convert again. */
-	/* LJ_32: For inputs >= 2^31 add -2^31, convert again and add 2^31. */
-	Reg tmp = ra_noreg(IR(lref)->r) ? ra_alloc1(as, lref, RSET_FPR) :
-					  ra_scratch(as, RSET_FPR);
-	MCLabel l_end = emit_label(as);
-	if (LJ_32)
-	  emit_gri(as, XG_ARITHi(XOg_ADD), dest, (int32_t)0x80000000);
-	emit_rr(as, op, dest|REX_64, tmp);
-	if (st == IRT_NUM)
-	  emit_rma(as, XO_ADDSD, tmp, lj_ir_k64_find(as->J,
-		   LJ_64 ? U64x(c3f00000,00000000) : U64x(c1e00000,00000000)));
-	else
-	  emit_rma(as, XO_ADDSS, tmp, lj_ir_k64_find(as->J,
-		   LJ_64 ? U64x(00000000,df800000) : U64x(00000000,cf000000)));
-	emit_sjcc(as, CC_NS, l_end);
-	emit_rr(as, XO_TEST, dest|REX_64, dest);  /* Check if dest negative. */
-	emit_rr(as, op, dest|REX_64, tmp);
-	ra_left(as, tmp, lref);
-      } else {
-	Reg left = asm_fuseload(as, lref, RSET_FPR);
-	if (LJ_64 && irt_isu32(ir->t))
-	  emit_rr(as, XO_MOV, dest, dest);  /* Zero hiword. */
-	emit_mrm(as, op,
-		 dest|((LJ_64 &&
-			(irt_is64(ir->t) || irt_isu32(ir->t))) ? REX_64 : 0),
-		 left);
-      }
-    }
-  } else if (st >= IRT_I8 && st <= IRT_U16) {  /* Extend to 32 bit integer. */
-    Reg left, dest = ra_dest(as, ir, RSET_GPR);
-    RegSet allow = RSET_GPR;
-    x86Op op;
-    lua_assert(irt_isint(ir->t) || irt_isu32(ir->t));
-    if (st == IRT_I8) {
-      op = XO_MOVSXb; allow = RSET_GPR8; dest |= FORCE_REX;
-    } else if (st == IRT_U8) {
-      op = XO_MOVZXb; allow = RSET_GPR8; dest |= FORCE_REX;
-    } else if (st == IRT_I16) {
-      op = XO_MOVSXw;
-    } else {
-      op = XO_MOVZXw;
-    }
-    left = asm_fuseload(as, lref, allow);
-    /* Add extra MOV if source is already in wrong register. */
-    if (!LJ_64 && left != RID_MRM && !rset_test(allow, left)) {
-      Reg tmp = ra_scratch(as, allow);
-      emit_rr(as, op, dest, tmp);
-      emit_rr(as, XO_MOV, tmp, left);
-    } else {
-      emit_mrm(as, op, dest, left);
-    }
-  } else {  /* 32/64 bit integer conversions. */
-    if (LJ_32) {  /* Only need to handle 32/32 bit no-op (cast) on x86. */
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      ra_left(as, dest, lref);  /* Do nothing, but may need to move regs. */
-    } else if (irt_is64(ir->t)) {
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      if (st64 || !(ir->op2 & IRCONV_SEXT)) {
-	/* 64/64 bit no-op (cast) or 32 to 64 bit zero extension. */
-	ra_left(as, dest, lref);  /* Do nothing, but may need to move regs. */
-      } else {  /* 32 to 64 bit sign extension. */
-	Reg left = asm_fuseload(as, lref, RSET_GPR);
-	emit_mrm(as, XO_MOVSXd, dest|REX_64, left);
-      }
-    } else {
-      Reg dest = ra_dest(as, ir, RSET_GPR);
-      if (st64) {
-	Reg left = asm_fuseload(as, lref, RSET_GPR);
-	/* This is either a 32 bit reg/reg mov which zeroes the hiword
-	** or a load of the loword from a 64 bit address.
-	*/
-	emit_mrm(as, XO_MOV, dest, left);
-      } else {  /* 32/32 bit no-op (cast). */
-	ra_left(as, dest, lref);  /* Do nothing, but may need to move regs. */
-      }
-    }
-  }
-}
-
-#if LJ_32 && LJ_HASFFI
-/* No SSE conversions to/from 64 bit on x86, so resort to ugly x87 code. */
-
-/* 64 bit integer to FP conversion in 32 bit mode. */
-static void asm_conv_fp_int64(ASMState *as, IRIns *ir)
-{
-  Reg hi = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg lo = ra_alloc1(as, (ir-1)->op1, rset_exclude(RSET_GPR, hi));
-  int32_t ofs = sps_scale(ir->s);  /* Use spill slot or temp slots. */
-  Reg dest = ir->r;
-  if (ra_hasreg(dest)) {
-    ra_free(as, dest);
-    ra_modified(as, dest);
-    emit_rmro(as, irt_isnum(ir->t) ? XMM_MOVRM(as) : XO_MOVSS,
-	      dest, RID_ESP, ofs);
-  }
-  emit_rmro(as, irt_isnum(ir->t) ? XO_FSTPq : XO_FSTPd,
-	    irt_isnum(ir->t) ? XOg_FSTPq : XOg_FSTPd, RID_ESP, ofs);
-  if (((ir-1)->op2 & IRCONV_SRCMASK) == IRT_U64) {
-    /* For inputs in [2^63,2^64-1] add 2^64 to compensate. */
-    MCLabel l_end = emit_label(as);
-    emit_rma(as, XO_FADDq, XOg_FADDq,
-	     lj_ir_k64_find(as->J, U64x(43f00000,00000000)));
-    emit_sjcc(as, CC_NS, l_end);
-    emit_rr(as, XO_TEST, hi, hi);  /* Check if u64 >= 2^63. */
-  } else {
-    lua_assert(((ir-1)->op2 & IRCONV_SRCMASK) == IRT_I64);
-  }
-  emit_rmro(as, XO_FILDq, XOg_FILDq, RID_ESP, 0);
-  /* NYI: Avoid narrow-to-wide store-to-load forwarding stall. */
-  emit_rmro(as, XO_MOVto, hi, RID_ESP, 4);
-  emit_rmro(as, XO_MOVto, lo, RID_ESP, 0);
-}
-
-/* FP to 64 bit integer conversion in 32 bit mode. */
-static void asm_conv_int64_fp(ASMState *as, IRIns *ir)
-{
-  IRType st = (IRType)((ir-1)->op2 & IRCONV_SRCMASK);
-  IRType dt = (((ir-1)->op2 & IRCONV_DSTMASK) >> IRCONV_DSH);
-  Reg lo, hi;
-  lua_assert(st == IRT_NUM || st == IRT_FLOAT);
-  lua_assert(dt == IRT_I64 || dt == IRT_U64);
-  lua_assert(((ir-1)->op2 & IRCONV_TRUNC));
-  hi = ra_dest(as, ir, RSET_GPR);
-  lo = ra_dest(as, ir-1, rset_exclude(RSET_GPR, hi));
-  if (ra_used(ir-1)) emit_rmro(as, XO_MOV, lo, RID_ESP, 0);
-  /* NYI: Avoid wide-to-narrow store-to-load forwarding stall. */
-  if (!(as->flags & JIT_F_SSE3)) {  /* Set FPU rounding mode to default. */
-    emit_rmro(as, XO_FLDCW, XOg_FLDCW, RID_ESP, 4);
-    emit_rmro(as, XO_MOVto, lo, RID_ESP, 4);
-    emit_gri(as, XG_ARITHi(XOg_AND), lo, 0xf3ff);
-  }
-  if (dt == IRT_U64) {
-    /* For inputs in [2^63,2^64-1] add -2^64 and convert again. */
-    MCLabel l_pop, l_end = emit_label(as);
-    emit_x87op(as, XI_FPOP);
-    l_pop = emit_label(as);
-    emit_sjmp(as, l_end);
-    emit_rmro(as, XO_MOV, hi, RID_ESP, 4);
-    if ((as->flags & JIT_F_SSE3))
-      emit_rmro(as, XO_FISTTPq, XOg_FISTTPq, RID_ESP, 0);
-    else
-      emit_rmro(as, XO_FISTPq, XOg_FISTPq, RID_ESP, 0);
-    emit_rma(as, XO_FADDq, XOg_FADDq,
-	     lj_ir_k64_find(as->J, U64x(c3f00000,00000000)));
-    emit_sjcc(as, CC_NS, l_pop);
-    emit_rr(as, XO_TEST, hi, hi);  /* Check if out-of-range (2^63). */
-  }
-  emit_rmro(as, XO_MOV, hi, RID_ESP, 4);
-  if ((as->flags & JIT_F_SSE3)) {  /* Truncation is easy with SSE3. */
-    emit_rmro(as, XO_FISTTPq, XOg_FISTTPq, RID_ESP, 0);
-  } else {  /* Otherwise set FPU rounding mode to truncate before the store. */
-    emit_rmro(as, XO_FISTPq, XOg_FISTPq, RID_ESP, 0);
-    emit_rmro(as, XO_FLDCW, XOg_FLDCW, RID_ESP, 0);
-    emit_rmro(as, XO_MOVtow, lo, RID_ESP, 0);
-    emit_rmro(as, XO_ARITHw(XOg_OR), lo, RID_ESP, 0);
-    emit_loadi(as, lo, 0xc00);
-    emit_rmro(as, XO_FNSTCW, XOg_FNSTCW, RID_ESP, 0);
-  }
-  if (dt == IRT_U64)
-    emit_x87op(as, XI_FDUP);
-  emit_mrm(as, st == IRT_NUM ? XO_FLDq : XO_FLDd,
-	   st == IRT_NUM ? XOg_FLDq: XOg_FLDd,
-	   asm_fuseload(as, ir->op1, RSET_EMPTY));
-}
-#endif
-
-static void asm_strto(ASMState *as, IRIns *ir)
-{
-  /* Force a spill slot for the destination register (if any). */
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_strscan_num];
-  IRRef args[2];
-  RegSet drop = RSET_SCRATCH;
-  if ((drop & RSET_FPR) != RSET_FPR && ra_hasreg(ir->r))
-    rset_set(drop, ir->r);  /* WIN64 doesn't spill all FPRs. */
-  ra_evictset(as, drop);
-  asm_guardcc(as, CC_E);
-  emit_rr(as, XO_TEST, RID_RET, RID_RET);  /* Test return status. */
-  args[0] = ir->op1;      /* GCstr *str */
-  args[1] = ASMREF_TMP1;  /* TValue *n  */
-  asm_gencall(as, ci, args);
-  /* Store the result to the spill slot or temp slots. */
-  emit_rmro(as, XO_LEA, ra_releasetmp(as, ASMREF_TMP1)|REX_64,
-	    RID_ESP, sps_scale(ir->s));
-}
-
-static void asm_tostr(ASMState *as, IRIns *ir)
-{
-  IRIns *irl = IR(ir->op1);
-  IRRef args[2];
-  args[0] = ASMREF_L;
-  as->gcsteps++;
-  if (irt_isnum(irl->t)) {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromnum];
-    args[1] = ASMREF_TMP1;  /* const lua_Number * */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-    emit_rmro(as, XO_LEA, ra_releasetmp(as, ASMREF_TMP1)|REX_64,
-	      RID_ESP, ra_spill(as, irl));
-  } else {
-    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_str_fromint];
-    args[1] = ir->op1;  /* int32_t k */
-    asm_setupresult(as, ir, ci);  /* GCstr * */
-    asm_gencall(as, ci, args);
-  }
-}
-
-/* -- Memory references --------------------------------------------------- */
-
-static void asm_aref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  asm_fusearef(as, ir, RSET_GPR);
-  if (!(as->mrm.idx == RID_NONE && as->mrm.ofs == 0))
-    emit_mrm(as, XO_LEA, dest, RID_MRM);
-  else if (as->mrm.base != dest)
-    emit_rr(as, XO_MOV, dest, as->mrm.base);
-}
-
-/* Merge NE(HREF, niltv) check. */
-static MCode *merge_href_niltv(ASMState *as, IRIns *ir)
-{
-  /* Assumes nothing else generates NE of HREF. */
-  if ((ir[1].o == IR_NE || ir[1].o == IR_EQ) && ir[1].op1 == as->curins &&
-      ra_hasreg(ir->r)) {
-    MCode *p = as->mcp;
-    p += (LJ_64 && *p != XI_ARITHi) ? 7+6 : 6+6;
-    /* Ensure no loop branch inversion happened. */
-    if (p[-6] == 0x0f && p[-5] == XI_JCCn+(CC_NE^(ir[1].o & 1))) {
-      as->mcp = p;  /* Kill cmp reg, imm32 + jz exit. */
-      return p + *(int32_t *)(p-4);  /* Return exit address. */
-    }
-  }
-  return NULL;
-}
-
-/* Inlined hash lookup. Specialized for key type and for const keys.
-** The equivalent C code is:
-**   Node *n = hashkey(t, key);
-**   do {
-**     if (lj_obj_equal(&n->key, key)) return &n->val;
-**   } while ((n = nextnode(n)));
-**   return niltv(L);
-*/
-static void asm_href(ASMState *as, IRIns *ir)
-{
-  MCode *nilexit = merge_href_niltv(as, ir);  /* Do this before any restores. */
-  RegSet allow = RSET_GPR;
-  Reg dest = ra_dest(as, ir, allow);
-  Reg tab = ra_alloc1(as, ir->op1, rset_clear(allow, dest));
-  Reg key = RID_NONE, tmp = RID_NONE;
-  IRIns *irkey = IR(ir->op2);
-  int isk = irref_isk(ir->op2);
-  IRType1 kt = irkey->t;
-  uint32_t khash;
-  MCLabel l_end, l_loop, l_next;
-
-  if (!isk) {
-    rset_clear(allow, tab);
-    key = ra_alloc1(as, ir->op2, irt_isnum(kt) ? RSET_FPR : allow);
-    if (!irt_isstr(kt))
-      tmp = ra_scratch(as, rset_exclude(allow, key));
-  }
-
-  /* Key not found in chain: jump to exit (if merged with NE) or load niltv. */
-  l_end = emit_label(as);
-  if (nilexit && ir[1].o == IR_NE) {
-    emit_jcc(as, CC_E, nilexit);  /* XI_JMP is not found by lj_asm_patchexit. */
-    nilexit = NULL;
-  } else {
-    emit_loada(as, dest, niltvg(J2G(as->J)));
-  }
-
-  /* Follow hash chain until the end. */
-  l_loop = emit_sjcc_label(as, CC_NZ);
-  emit_rr(as, XO_TEST, dest, dest);
-  emit_rmro(as, XO_MOV, dest, dest, offsetof(Node, next));
-  l_next = emit_label(as);
-
-  /* Type and value comparison. */
-  if (nilexit)
-    emit_jcc(as, CC_E, nilexit);
-  else
-    emit_sjcc(as, CC_E, l_end);
-  if (irt_isnum(kt)) {
-    if (isk) {
-      /* Assumes -0.0 is already canonicalized to +0.0. */
-      emit_gmroi(as, XG_ARITHi(XOg_CMP), dest, offsetof(Node, key.u32.lo),
-		 (int32_t)ir_knum(irkey)->u32.lo);
-      emit_sjcc(as, CC_NE, l_next);
-      emit_gmroi(as, XG_ARITHi(XOg_CMP), dest, offsetof(Node, key.u32.hi),
-		 (int32_t)ir_knum(irkey)->u32.hi);
-    } else {
-      emit_sjcc(as, CC_P, l_next);
-      emit_rmro(as, XO_UCOMISD, key, dest, offsetof(Node, key.n));
-      emit_sjcc(as, CC_AE, l_next);
-      /* The type check avoids NaN penalties and complaints from Valgrind. */
-#if LJ_64
-      emit_u32(as, LJ_TISNUM);
-      emit_rmro(as, XO_ARITHi, XOg_CMP, dest, offsetof(Node, key.it));
-#else
-      emit_i8(as, LJ_TISNUM);
-      emit_rmro(as, XO_ARITHi8, XOg_CMP, dest, offsetof(Node, key.it));
-#endif
-    }
-#if LJ_64
-  } else if (irt_islightud(kt)) {
-    emit_rmro(as, XO_CMP, key|REX_64, dest, offsetof(Node, key.u64));
-#endif
-  } else {
-    if (!irt_ispri(kt)) {
-      lua_assert(irt_isaddr(kt));
-      if (isk)
-	emit_gmroi(as, XG_ARITHi(XOg_CMP), dest, offsetof(Node, key.gcr),
-		   ptr2addr(ir_kgc(irkey)));
-      else
-	emit_rmro(as, XO_CMP, key, dest, offsetof(Node, key.gcr));
-      emit_sjcc(as, CC_NE, l_next);
-    }
-    lua_assert(!irt_isnil(kt));
-    emit_i8(as, irt_toitype(kt));
-    emit_rmro(as, XO_ARITHi8, XOg_CMP, dest, offsetof(Node, key.it));
-  }
-  emit_sfixup(as, l_loop);
-  checkmclim(as);
-
-  /* Load main position relative to tab->node into dest. */
-  khash = isk ? ir_khash(irkey) : 1;
-  if (khash == 0) {
-    emit_rmro(as, XO_MOV, dest, tab, offsetof(GCtab, node));
-  } else {
-    emit_rmro(as, XO_ARITH(XOg_ADD), dest, tab, offsetof(GCtab, node));
-    if ((as->flags & JIT_F_PREFER_IMUL)) {
-      emit_i8(as, sizeof(Node));
-      emit_rr(as, XO_IMULi8, dest, dest);
-    } else {
-      emit_shifti(as, XOg_SHL, dest, 3);
-      emit_rmrxo(as, XO_LEA, dest, dest, dest, XM_SCALE2, 0);
-    }
-    if (isk) {
-      emit_gri(as, XG_ARITHi(XOg_AND), dest, (int32_t)khash);
-      emit_rmro(as, XO_MOV, dest, tab, offsetof(GCtab, hmask));
-    } else if (irt_isstr(kt)) {
-      emit_rmro(as, XO_ARITH(XOg_AND), dest, key, offsetof(GCstr, hash));
-      emit_rmro(as, XO_MOV, dest, tab, offsetof(GCtab, hmask));
-    } else {  /* Must match with hashrot() in lj_tab.c. */
-      emit_rmro(as, XO_ARITH(XOg_AND), dest, tab, offsetof(GCtab, hmask));
-      emit_rr(as, XO_ARITH(XOg_SUB), dest, tmp);
-      emit_shifti(as, XOg_ROL, tmp, HASH_ROT3);
-      emit_rr(as, XO_ARITH(XOg_XOR), dest, tmp);
-      emit_shifti(as, XOg_ROL, dest, HASH_ROT2);
-      emit_rr(as, XO_ARITH(XOg_SUB), tmp, dest);
-      emit_shifti(as, XOg_ROL, dest, HASH_ROT1);
-      emit_rr(as, XO_ARITH(XOg_XOR), tmp, dest);
-      if (irt_isnum(kt)) {
-	emit_rr(as, XO_ARITH(XOg_ADD), dest, dest);
-#if LJ_64
-	emit_shifti(as, XOg_SHR|REX_64, dest, 32);
-	emit_rr(as, XO_MOV, tmp, dest);
-	emit_rr(as, XO_MOVDto, key|REX_64, dest);
-#else
-	emit_rmro(as, XO_MOV, dest, RID_ESP, ra_spill(as, irkey)+4);
-	emit_rr(as, XO_MOVDto, key, tmp);
-#endif
-      } else {
-	emit_rr(as, XO_MOV, tmp, key);
-	emit_rmro(as, XO_LEA, dest, key, HASH_BIAS);
-      }
-    }
-  }
-}
-
-static void asm_hrefk(ASMState *as, IRIns *ir)
-{
-  IRIns *kslot = IR(ir->op2);
-  IRIns *irkey = IR(kslot->op1);
-  int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node));
-  Reg dest = ra_used(ir) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
-  Reg node = ra_alloc1(as, ir->op1, RSET_GPR);
-#if !LJ_64
-  MCLabel l_exit;
-#endif
-  lua_assert(ofs % sizeof(Node) == 0);
-  if (ra_hasreg(dest)) {
-    if (ofs != 0) {
-      if (dest == node && !(as->flags & JIT_F_LEA_AGU))
-	emit_gri(as, XG_ARITHi(XOg_ADD), dest, ofs);
-      else
-	emit_rmro(as, XO_LEA, dest, node, ofs);
-    } else if (dest != node) {
-      emit_rr(as, XO_MOV, dest, node);
-    }
-  }
-  asm_guardcc(as, CC_NE);
-#if LJ_64
-  if (!irt_ispri(irkey->t)) {
-    Reg key = ra_scratch(as, rset_exclude(RSET_GPR, node));
-    emit_rmro(as, XO_CMP, key|REX_64, node,
-	       ofs + (int32_t)offsetof(Node, key.u64));
-    lua_assert(irt_isnum(irkey->t) || irt_isgcv(irkey->t));
-    /* Assumes -0.0 is already canonicalized to +0.0. */
-    emit_loadu64(as, key, irt_isnum(irkey->t) ? ir_knum(irkey)->u64 :
-			  ((uint64_t)irt_toitype(irkey->t) << 32) |
-			  (uint64_t)(uint32_t)ptr2addr(ir_kgc(irkey)));
-  } else {
-    lua_assert(!irt_isnil(irkey->t));
-    emit_i8(as, irt_toitype(irkey->t));
-    emit_rmro(as, XO_ARITHi8, XOg_CMP, node,
-	      ofs + (int32_t)offsetof(Node, key.it));
-  }
-#else
-  l_exit = emit_label(as);
-  if (irt_isnum(irkey->t)) {
-    /* Assumes -0.0 is already canonicalized to +0.0. */
-    emit_gmroi(as, XG_ARITHi(XOg_CMP), node,
-	       ofs + (int32_t)offsetof(Node, key.u32.lo),
-	       (int32_t)ir_knum(irkey)->u32.lo);
-    emit_sjcc(as, CC_NE, l_exit);
-    emit_gmroi(as, XG_ARITHi(XOg_CMP), node,
-	       ofs + (int32_t)offsetof(Node, key.u32.hi),
-	       (int32_t)ir_knum(irkey)->u32.hi);
-  } else {
-    if (!irt_ispri(irkey->t)) {
-      lua_assert(irt_isgcv(irkey->t));
-      emit_gmroi(as, XG_ARITHi(XOg_CMP), node,
-		 ofs + (int32_t)offsetof(Node, key.gcr),
-		 ptr2addr(ir_kgc(irkey)));
-      emit_sjcc(as, CC_NE, l_exit);
-    }
-    lua_assert(!irt_isnil(irkey->t));
-    emit_i8(as, irt_toitype(irkey->t));
-    emit_rmro(as, XO_ARITHi8, XOg_CMP, node,
-	      ofs + (int32_t)offsetof(Node, key.it));
-  }
-#endif
-}
-
-static void asm_newref(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
-  IRRef args[3];
-  IRIns *irkey;
-  Reg tmp;
-  if (ir->r == RID_SINK)
-    return;
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ir->op1;      /* GCtab *t     */
-  args[2] = ASMREF_TMP1;  /* cTValue *key */
-  asm_setupresult(as, ir, ci);  /* TValue * */
-  asm_gencall(as, ci, args);
-  tmp = ra_releasetmp(as, ASMREF_TMP1);
-  irkey = IR(ir->op2);
-  if (irt_isnum(irkey->t)) {
-    /* For numbers use the constant itself or a spill slot as a TValue. */
-    if (irref_isk(ir->op2))
-      emit_loada(as, tmp, ir_knum(irkey));
-    else
-      emit_rmro(as, XO_LEA, tmp|REX_64, RID_ESP, ra_spill(as, irkey));
-  } else {
-    /* Otherwise use g->tmptv to hold the TValue. */
-    if (!irref_isk(ir->op2)) {
-      Reg src = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, tmp));
-      emit_movtomro(as, REX_64IR(irkey, src), tmp, 0);
-    } else if (!irt_ispri(irkey->t)) {
-      emit_movmroi(as, tmp, 0, irkey->i);
-    }
-    if (!(LJ_64 && irt_islightud(irkey->t)))
-      emit_movmroi(as, tmp, 4, irt_toitype(irkey->t));
-    emit_loada(as, tmp, &J2G(as->J)->tmptv);
-  }
-}
-
-static void asm_uref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  if (irref_isk(ir->op1)) {
-    GCfunc *fn = ir_kfunc(IR(ir->op1));
-    MRef *v = &gcref(fn->l.uvptr[(ir->op2 >> 8)])->uv.v;
-    emit_rma(as, XO_MOV, dest, v);
-  } else {
-    Reg uv = ra_scratch(as, RSET_GPR);
-    Reg func = ra_alloc1(as, ir->op1, RSET_GPR);
-    if (ir->o == IR_UREFC) {
-      emit_rmro(as, XO_LEA, dest, uv, offsetof(GCupval, tv));
-      asm_guardcc(as, CC_NE);
-      emit_i8(as, 1);
-      emit_rmro(as, XO_ARITHib, XOg_CMP, uv, offsetof(GCupval, closed));
-    } else {
-      emit_rmro(as, XO_MOV, dest, uv, offsetof(GCupval, v));
-    }
-    emit_rmro(as, XO_MOV, uv, func,
-	      (int32_t)offsetof(GCfuncL, uvptr) + 4*(int32_t)(ir->op2 >> 8));
-  }
-}
-
-static void asm_fref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  asm_fusefref(as, ir, RSET_GPR);
-  emit_mrm(as, XO_LEA, dest, RID_MRM);
-}
-
-static void asm_strref(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  asm_fusestrref(as, ir, RSET_GPR);
-  if (as->mrm.base == RID_NONE)
-    emit_loadi(as, dest, as->mrm.ofs);
-  else if (as->mrm.base == dest && as->mrm.idx == RID_NONE)
-    emit_gri(as, XG_ARITHi(XOg_ADD), dest, as->mrm.ofs);
-  else
-    emit_mrm(as, XO_LEA, dest, RID_MRM);
-}
-
-/* -- Loads and stores ---------------------------------------------------- */
-
-static void asm_fxload(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR);
-  x86Op xo;
-  if (ir->o == IR_FLOAD)
-    asm_fusefref(as, ir, RSET_GPR);
-  else
-    asm_fusexref(as, ir->op1, RSET_GPR);
-  /* ir->op2 is ignored -- unaligned loads are ok on x86. */
-  switch (irt_type(ir->t)) {
-  case IRT_I8: xo = XO_MOVSXb; break;
-  case IRT_U8: xo = XO_MOVZXb; break;
-  case IRT_I16: xo = XO_MOVSXw; break;
-  case IRT_U16: xo = XO_MOVZXw; break;
-  case IRT_NUM: xo = XMM_MOVRM(as); break;
-  case IRT_FLOAT: xo = XO_MOVSS; break;
-  default:
-    if (LJ_64 && irt_is64(ir->t))
-      dest |= REX_64;
-    else
-      lua_assert(irt_isint(ir->t) || irt_isu32(ir->t) || irt_isaddr(ir->t));
-    xo = XO_MOV;
-    break;
-  }
-  emit_mrm(as, xo, dest, RID_MRM);
-}
-
-static void asm_fxstore(ASMState *as, IRIns *ir)
-{
-  RegSet allow = RSET_GPR;
-  Reg src = RID_NONE, osrc = RID_NONE;
-  int32_t k = 0;
-  if (ir->r == RID_SINK)
-    return;
-  /* The IRT_I16/IRT_U16 stores should never be simplified for constant
-  ** values since mov word [mem], imm16 has a length-changing prefix.
-  */
-  if (irt_isi16(ir->t) || irt_isu16(ir->t) || irt_isfp(ir->t) ||
-      !asm_isk32(as, ir->op2, &k)) {
-    RegSet allow8 = irt_isfp(ir->t) ? RSET_FPR :
-		    (irt_isi8(ir->t) || irt_isu8(ir->t)) ? RSET_GPR8 : RSET_GPR;
-    src = osrc = ra_alloc1(as, ir->op2, allow8);
-    if (!LJ_64 && !rset_test(allow8, src)) {  /* Already in wrong register. */
-      rset_clear(allow, osrc);
-      src = ra_scratch(as, allow8);
-    }
-    rset_clear(allow, src);
-  }
-  if (ir->o == IR_FSTORE) {
-    asm_fusefref(as, IR(ir->op1), allow);
-  } else {
-    asm_fusexref(as, ir->op1, allow);
-    if (LJ_32 && ir->o == IR_HIOP) as->mrm.ofs += 4;
-  }
-  if (ra_hasreg(src)) {
-    x86Op xo;
-    switch (irt_type(ir->t)) {
-    case IRT_I8: case IRT_U8: xo = XO_MOVtob; src |= FORCE_REX; break;
-    case IRT_I16: case IRT_U16: xo = XO_MOVtow; break;
-    case IRT_NUM: xo = XO_MOVSDto; break;
-    case IRT_FLOAT: xo = XO_MOVSSto; break;
-#if LJ_64
-    case IRT_LIGHTUD: lua_assert(0);  /* NYI: mask 64 bit lightuserdata. */
-#endif
-    default:
-      if (LJ_64 && irt_is64(ir->t))
-	src |= REX_64;
-      else
-	lua_assert(irt_isint(ir->t) || irt_isu32(ir->t) || irt_isaddr(ir->t));
-      xo = XO_MOVto;
-      break;
-    }
-    emit_mrm(as, xo, src, RID_MRM);
-    if (!LJ_64 && src != osrc) {
-      ra_noweak(as, osrc);
-      emit_rr(as, XO_MOV, src, osrc);
-    }
-  } else {
-    if (irt_isi8(ir->t) || irt_isu8(ir->t)) {
-      emit_i8(as, k);
-      emit_mrm(as, XO_MOVmib, 0, RID_MRM);
-    } else {
-      lua_assert(irt_is64(ir->t) || irt_isint(ir->t) || irt_isu32(ir->t) ||
-		 irt_isaddr(ir->t));
-      emit_i32(as, k);
-      emit_mrm(as, XO_MOVmi, REX_64IR(ir, 0), RID_MRM);
-    }
-  }
-}
-
-#if LJ_64
-static Reg asm_load_lightud64(ASMState *as, IRIns *ir, int typecheck)
-{
-  if (ra_used(ir) || typecheck) {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    if (typecheck) {
-      Reg tmp = ra_scratch(as, rset_exclude(RSET_GPR, dest));
-      asm_guardcc(as, CC_NE);
-      emit_i8(as, -2);
-      emit_rr(as, XO_ARITHi8, XOg_CMP, tmp);
-      emit_shifti(as, XOg_SAR|REX_64, tmp, 47);
-      emit_rr(as, XO_MOV, tmp|REX_64, dest);
-    }
-    return dest;
-  } else {
-    return RID_NONE;
-  }
-}
-#endif
-
-static void asm_ahuvload(ASMState *as, IRIns *ir)
-{
-  lua_assert(irt_isnum(ir->t) || irt_ispri(ir->t) || irt_isaddr(ir->t) ||
-	     (LJ_DUALNUM && irt_isint(ir->t)));
-#if LJ_64
-  if (irt_islightud(ir->t)) {
-    Reg dest = asm_load_lightud64(as, ir, 1);
-    if (ra_hasreg(dest)) {
-      asm_fuseahuref(as, ir->op1, RSET_GPR);
-      emit_mrm(as, XO_MOV, dest|REX_64, RID_MRM);
-    }
-    return;
-  } else
-#endif
-  if (ra_used(ir)) {
-    RegSet allow = irt_isnum(ir->t) ? RSET_FPR : RSET_GPR;
-    Reg dest = ra_dest(as, ir, allow);
-    asm_fuseahuref(as, ir->op1, RSET_GPR);
-    emit_mrm(as, dest < RID_MAX_GPR ? XO_MOV : XMM_MOVRM(as), dest, RID_MRM);
-  } else {
-    asm_fuseahuref(as, ir->op1, RSET_GPR);
-  }
-  /* Always do the type check, even if the load result is unused. */
-  as->mrm.ofs += 4;
-  asm_guardcc(as, irt_isnum(ir->t) ? CC_AE : CC_NE);
-  if (LJ_64 && irt_type(ir->t) >= IRT_NUM) {
-    lua_assert(irt_isinteger(ir->t) || irt_isnum(ir->t));
-    emit_u32(as, LJ_TISNUM);
-    emit_mrm(as, XO_ARITHi, XOg_CMP, RID_MRM);
-  } else {
-    emit_i8(as, irt_toitype(ir->t));
-    emit_mrm(as, XO_ARITHi8, XOg_CMP, RID_MRM);
-  }
-}
-
-static void asm_ahustore(ASMState *as, IRIns *ir)
-{
-  if (ir->r == RID_SINK)
-    return;
-  if (irt_isnum(ir->t)) {
-    Reg src = ra_alloc1(as, ir->op2, RSET_FPR);
-    asm_fuseahuref(as, ir->op1, RSET_GPR);
-    emit_mrm(as, XO_MOVSDto, src, RID_MRM);
-#if LJ_64
-  } else if (irt_islightud(ir->t)) {
-    Reg src = ra_alloc1(as, ir->op2, RSET_GPR);
-    asm_fuseahuref(as, ir->op1, rset_exclude(RSET_GPR, src));
-    emit_mrm(as, XO_MOVto, src|REX_64, RID_MRM);
-#endif
-  } else {
-    IRIns *irr = IR(ir->op2);
-    RegSet allow = RSET_GPR;
-    Reg src = RID_NONE;
-    if (!irref_isk(ir->op2)) {
-      src = ra_alloc1(as, ir->op2, allow);
-      rset_clear(allow, src);
-    }
-    asm_fuseahuref(as, ir->op1, allow);
-    if (ra_hasreg(src)) {
-      emit_mrm(as, XO_MOVto, src, RID_MRM);
-    } else if (!irt_ispri(irr->t)) {
-      lua_assert(irt_isaddr(ir->t) || (LJ_DUALNUM && irt_isinteger(ir->t)));
-      emit_i32(as, irr->i);
-      emit_mrm(as, XO_MOVmi, 0, RID_MRM);
-    }
-    as->mrm.ofs += 4;
-    emit_i32(as, (int32_t)irt_toitype(ir->t));
-    emit_mrm(as, XO_MOVmi, 0, RID_MRM);
-  }
-}
-
-static void asm_sload(ASMState *as, IRIns *ir)
-{
-  int32_t ofs = 8*((int32_t)ir->op1-1) + ((ir->op2 & IRSLOAD_FRAME) ? 4 : 0);
-  IRType1 t = ir->t;
-  Reg base;
-  lua_assert(!(ir->op2 & IRSLOAD_PARENT));  /* Handled by asm_head_side(). */
-  lua_assert(irt_isguard(t) || !(ir->op2 & IRSLOAD_TYPECHECK));
-  lua_assert(LJ_DUALNUM ||
-	     !irt_isint(t) || (ir->op2 & (IRSLOAD_CONVERT|IRSLOAD_FRAME)));
-  if ((ir->op2 & IRSLOAD_CONVERT) && irt_isguard(t) && irt_isint(t)) {
-    Reg left = ra_scratch(as, RSET_FPR);
-    asm_tointg(as, ir, left);  /* Frees dest reg. Do this before base alloc. */
-    base = ra_alloc1(as, REF_BASE, RSET_GPR);
-    emit_rmro(as, XMM_MOVRM(as), left, base, ofs);
-    t.irt = IRT_NUM;  /* Continue with a regular number type check. */
-#if LJ_64
-  } else if (irt_islightud(t)) {
-    Reg dest = asm_load_lightud64(as, ir, (ir->op2 & IRSLOAD_TYPECHECK));
-    if (ra_hasreg(dest)) {
-      base = ra_alloc1(as, REF_BASE, RSET_GPR);
-      emit_rmro(as, XO_MOV, dest|REX_64, base, ofs);
-    }
-    return;
-#endif
-  } else if (ra_used(ir)) {
-    RegSet allow = irt_isnum(t) ? RSET_FPR : RSET_GPR;
-    Reg dest = ra_dest(as, ir, allow);
-    base = ra_alloc1(as, REF_BASE, RSET_GPR);
-    lua_assert(irt_isnum(t) || irt_isint(t) || irt_isaddr(t));
-    if ((ir->op2 & IRSLOAD_CONVERT)) {
-      t.irt = irt_isint(t) ? IRT_NUM : IRT_INT;  /* Check for original type. */
-      emit_rmro(as, irt_isint(t) ? XO_CVTSI2SD : XO_CVTSD2SI, dest, base, ofs);
-    } else if (irt_isnum(t)) {
-      emit_rmro(as, XMM_MOVRM(as), dest, base, ofs);
-    } else {
-      emit_rmro(as, XO_MOV, dest, base, ofs);
-    }
-  } else {
-    if (!(ir->op2 & IRSLOAD_TYPECHECK))
-      return;  /* No type check: avoid base alloc. */
-    base = ra_alloc1(as, REF_BASE, RSET_GPR);
-  }
-  if ((ir->op2 & IRSLOAD_TYPECHECK)) {
-    /* Need type check, even if the load result is unused. */
-    asm_guardcc(as, irt_isnum(t) ? CC_AE : CC_NE);
-    if (LJ_64 && irt_type(t) >= IRT_NUM) {
-      lua_assert(irt_isinteger(t) || irt_isnum(t));
-      emit_u32(as, LJ_TISNUM);
-      emit_rmro(as, XO_ARITHi, XOg_CMP, base, ofs+4);
-    } else {
-      emit_i8(as, irt_toitype(t));
-      emit_rmro(as, XO_ARITHi8, XOg_CMP, base, ofs+4);
-    }
-  }
-}
-
-/* -- Allocations --------------------------------------------------------- */
-
-#if LJ_HASFFI
-static void asm_cnew(ASMState *as, IRIns *ir)
-{
-  CTState *cts = ctype_ctsG(J2G(as->J));
-  CTypeID ctypeid = (CTypeID)IR(ir->op1)->i;
-  CTSize sz = (ir->o == IR_CNEWI || ir->op2 == REF_NIL) ?
-	      lj_ctype_size(cts, ctypeid) : (CTSize)IR(ir->op2)->i;
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_mem_newgco];
-  IRRef args[2];
-  lua_assert(sz != CTSIZE_INVALID);
-
-  args[0] = ASMREF_L;     /* lua_State *L */
-  args[1] = ASMREF_TMP1;  /* MSize size   */
-  as->gcsteps++;
-  asm_setupresult(as, ir, ci);  /* GCcdata * */
-
-  /* Initialize immutable cdata object. */
-  if (ir->o == IR_CNEWI) {
-    RegSet allow = (RSET_GPR & ~RSET_SCRATCH);
-#if LJ_64
-    Reg r64 = sz == 8 ? REX_64 : 0;
-    if (irref_isk(ir->op2)) {
-      IRIns *irk = IR(ir->op2);
-      uint64_t k = irk->o == IR_KINT64 ? ir_k64(irk)->u64 :
-					 (uint64_t)(uint32_t)irk->i;
-      if (sz == 4 || checki32((int64_t)k)) {
-	emit_i32(as, (int32_t)k);
-	emit_rmro(as, XO_MOVmi, r64, RID_RET, sizeof(GCcdata));
-      } else {
-	emit_movtomro(as, RID_ECX + r64, RID_RET, sizeof(GCcdata));
-	emit_loadu64(as, RID_ECX, k);
-      }
-    } else {
-      Reg r = ra_alloc1(as, ir->op2, allow);
-      emit_movtomro(as, r + r64, RID_RET, sizeof(GCcdata));
-    }
-#else
-    int32_t ofs = sizeof(GCcdata);
-    if (sz == 8) {
-      ofs += 4; ir++;
-      lua_assert(ir->o == IR_HIOP);
-    }
-    do {
-      if (irref_isk(ir->op2)) {
-	emit_movmroi(as, RID_RET, ofs, IR(ir->op2)->i);
-      } else {
-	Reg r = ra_alloc1(as, ir->op2, allow);
-	emit_movtomro(as, r, RID_RET, ofs);
-	rset_clear(allow, r);
-      }
-      if (ofs == sizeof(GCcdata)) break;
-      ofs -= 4; ir--;
-    } while (1);
-#endif
-    lua_assert(sz == 4 || sz == 8);
-  }
-
-  /* Combine initialization of marked, gct and ctypeid. */
-  emit_movtomro(as, RID_ECX, RID_RET, offsetof(GCcdata, marked));
-  emit_gri(as, XG_ARITHi(XOg_OR), RID_ECX,
-	   (int32_t)((~LJ_TCDATA<<8)+(ctypeid<<16)));
-  emit_gri(as, XG_ARITHi(XOg_AND), RID_ECX, LJ_GC_WHITES);
-  emit_opgl(as, XO_MOVZXb, RID_ECX, gc.currentwhite);
-
-  asm_gencall(as, ci, args);
-  emit_loadi(as, ra_releasetmp(as, ASMREF_TMP1), (int32_t)(sz+sizeof(GCcdata)));
-}
-#else
-#define asm_cnew(as, ir)	((void)0)
-#endif
-
-/* -- Write barriers ------------------------------------------------------ */
-
-static void asm_tbar(ASMState *as, IRIns *ir)
-{
-  Reg tab = ra_alloc1(as, ir->op1, RSET_GPR);
-  Reg tmp = ra_scratch(as, rset_exclude(RSET_GPR, tab));
-  MCLabel l_end = emit_label(as);
-  emit_movtomro(as, tmp, tab, offsetof(GCtab, gclist));
-  emit_setgl(as, tab, gc.grayagain);
-  emit_getgl(as, tmp, gc.grayagain);
-  emit_i8(as, ~LJ_GC_BLACK);
-  emit_rmro(as, XO_ARITHib, XOg_AND, tab, offsetof(GCtab, marked));
-  emit_sjcc(as, CC_Z, l_end);
-  emit_i8(as, LJ_GC_BLACK);
-  emit_rmro(as, XO_GROUP3b, XOg_TEST, tab, offsetof(GCtab, marked));
-}
-
-static void asm_obar(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_barrieruv];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg obj;
-  /* No need for other object barriers (yet). */
-  lua_assert(IR(ir->op1)->o == IR_UREFC);
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ir->op1;      /* TValue *tv      */
-  asm_gencall(as, ci, args);
-  emit_loada(as, ra_releasetmp(as, ASMREF_TMP1), J2G(as->J));
-  obj = IR(ir->op1)->r;
-  emit_sjcc(as, CC_Z, l_end);
-  emit_i8(as, LJ_GC_WHITES);
-  if (irref_isk(ir->op2)) {
-    GCobj *vp = ir_kgc(IR(ir->op2));
-    emit_rma(as, XO_GROUP3b, XOg_TEST, &vp->gch.marked);
-  } else {
-    Reg val = ra_alloc1(as, ir->op2, rset_exclude(RSET_SCRATCH&RSET_GPR, obj));
-    emit_rmro(as, XO_GROUP3b, XOg_TEST, val, (int32_t)offsetof(GChead, marked));
-  }
-  emit_sjcc(as, CC_Z, l_end);
-  emit_i8(as, LJ_GC_BLACK);
-  emit_rmro(as, XO_GROUP3b, XOg_TEST, obj,
-	    (int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv));
-}
-
-/* -- FP/int arithmetic and logic operations ------------------------------ */
-
-/* Load reference onto x87 stack. Force a spill to memory if needed. */
-static void asm_x87load(ASMState *as, IRRef ref)
-{
-  IRIns *ir = IR(ref);
-  if (ir->o == IR_KNUM) {
-    cTValue *tv = ir_knum(ir);
-    if (tvispzero(tv))  /* Use fldz only for +0. */
-      emit_x87op(as, XI_FLDZ);
-    else if (tvispone(tv))
-      emit_x87op(as, XI_FLD1);
-    else
-      emit_rma(as, XO_FLDq, XOg_FLDq, tv);
-  } else if (ir->o == IR_CONV && ir->op2 == IRCONV_NUM_INT && !ra_used(ir) &&
-	     !irref_isk(ir->op1) && mayfuse(as, ir->op1)) {
-    IRIns *iri = IR(ir->op1);
-    emit_rmro(as, XO_FILDd, XOg_FILDd, RID_ESP, ra_spill(as, iri));
-  } else {
-    emit_mrm(as, XO_FLDq, XOg_FLDq, asm_fuseload(as, ref, RSET_EMPTY));
-  }
-}
-
-/* Try to rejoin pow from EXP2, MUL and LOG2 (if still unsplit). */
-static int fpmjoin_pow(ASMState *as, IRIns *ir)
-{
-  IRIns *irp = IR(ir->op1);
-  if (irp == ir-1 && irp->o == IR_MUL && !ra_used(irp)) {
-    IRIns *irpp = IR(irp->op1);
-    if (irpp == ir-2 && irpp->o == IR_FPMATH &&
-	irpp->op2 == IRFPM_LOG2 && !ra_used(irpp)) {
-      /* The modified regs must match with the *.dasc implementation. */
-      RegSet drop = RSET_RANGE(RID_XMM0, RID_XMM2+1)|RID2RSET(RID_EAX);
-      IRIns *irx;
-      if (ra_hasreg(ir->r))
-	rset_clear(drop, ir->r);  /* Dest reg handled below. */
-      ra_evictset(as, drop);
-      ra_destreg(as, ir, RID_XMM0);
-      emit_call(as, lj_vm_pow_sse);
-      irx = IR(irpp->op1);
-      if (ra_noreg(irx->r) && ra_gethint(irx->r) == RID_XMM1)
-	irx->r = RID_INIT;  /* Avoid allocating xmm1 for x. */
-      ra_left(as, RID_XMM0, irpp->op1);
-      ra_left(as, RID_XMM1, irp->op2);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-static void asm_fpmath(ASMState *as, IRIns *ir)
-{
-  IRFPMathOp fpm = ir->o == IR_FPMATH ? (IRFPMathOp)ir->op2 : IRFPM_OTHER;
-  if (fpm == IRFPM_SQRT) {
-    Reg dest = ra_dest(as, ir, RSET_FPR);
-    Reg left = asm_fuseload(as, ir->op1, RSET_FPR);
-    emit_mrm(as, XO_SQRTSD, dest, left);
-  } else if (fpm <= IRFPM_TRUNC) {
-    if (as->flags & JIT_F_SSE4_1) {  /* SSE4.1 has a rounding instruction. */
-      Reg dest = ra_dest(as, ir, RSET_FPR);
-      Reg left = asm_fuseload(as, ir->op1, RSET_FPR);
-      /* ROUNDSD has a 4-byte opcode which doesn't fit in x86Op.
-      ** Let's pretend it's a 3-byte opcode, and compensate afterwards.
-      ** This is atrocious, but the alternatives are much worse.
-      */
-      /* Round down/up/trunc == 1001/1010/1011. */
-      emit_i8(as, 0x09 + fpm);
-      emit_mrm(as, XO_ROUNDSD, dest, left);
-      if (LJ_64 && as->mcp[1] != (MCode)(XO_ROUNDSD >> 16)) {
-	as->mcp[0] = as->mcp[1]; as->mcp[1] = 0x0f;  /* Swap 0F and REX. */
-      }
-      *--as->mcp = 0x66;  /* 1st byte of ROUNDSD opcode. */
-    } else {  /* Call helper functions for SSE2 variant. */
-      /* The modified regs must match with the *.dasc implementation. */
-      RegSet drop = RSET_RANGE(RID_XMM0, RID_XMM3+1)|RID2RSET(RID_EAX);
-      if (ra_hasreg(ir->r))
-	rset_clear(drop, ir->r);  /* Dest reg handled below. */
-      ra_evictset(as, drop);
-      ra_destreg(as, ir, RID_XMM0);
-      emit_call(as, fpm == IRFPM_FLOOR ? lj_vm_floor_sse :
-		    fpm == IRFPM_CEIL ? lj_vm_ceil_sse : lj_vm_trunc_sse);
-      ra_left(as, RID_XMM0, ir->op1);
-    }
-  } else if (fpm == IRFPM_EXP2 && fpmjoin_pow(as, ir)) {
-    /* Rejoined to pow(). */
-  } else {  /* Handle x87 ops. */
-    int32_t ofs = sps_scale(ir->s);  /* Use spill slot or temp slots. */
-    Reg dest = ir->r;
-    if (ra_hasreg(dest)) {
-      ra_free(as, dest);
-      ra_modified(as, dest);
-      emit_rmro(as, XMM_MOVRM(as), dest, RID_ESP, ofs);
-    }
-    emit_rmro(as, XO_FSTPq, XOg_FSTPq, RID_ESP, ofs);
-    switch (fpm) {  /* st0 = lj_vm_*(st0) */
-    case IRFPM_EXP: emit_call(as, lj_vm_exp_x87); break;
-    case IRFPM_EXP2: emit_call(as, lj_vm_exp2_x87); break;
-    case IRFPM_SIN: emit_x87op(as, XI_FSIN); break;
-    case IRFPM_COS: emit_x87op(as, XI_FCOS); break;
-    case IRFPM_TAN: emit_x87op(as, XI_FPOP); emit_x87op(as, XI_FPTAN); break;
-    case IRFPM_LOG: case IRFPM_LOG2: case IRFPM_LOG10:
-      /* Note: the use of fyl2xp1 would be pointless here. When computing
-      ** log(1.0+eps) the precision is already lost after 1.0 is added.
-      ** Subtracting 1.0 won't recover it. OTOH math.log1p would make sense.
-      */
-      emit_x87op(as, XI_FYL2X); break;
-    case IRFPM_OTHER:
-      switch (ir->o) {
-      case IR_ATAN2:
-	emit_x87op(as, XI_FPATAN); asm_x87load(as, ir->op2); break;
-      case IR_LDEXP:
-	emit_x87op(as, XI_FPOP1); emit_x87op(as, XI_FSCALE); break;
-      default: lua_assert(0); break;
-      }
-      break;
-    default: lua_assert(0); break;
-    }
-    asm_x87load(as, ir->op1);
-    switch (fpm) {
-    case IRFPM_LOG: emit_x87op(as, XI_FLDLN2); break;
-    case IRFPM_LOG2: emit_x87op(as, XI_FLD1); break;
-    case IRFPM_LOG10: emit_x87op(as, XI_FLDLG2); break;
-    case IRFPM_OTHER:
-      if (ir->o == IR_LDEXP) asm_x87load(as, ir->op2);
-      break;
-    default: break;
-    }
-  }
-}
-
-static void asm_fppowi(ASMState *as, IRIns *ir)
-{
-  /* The modified regs must match with the *.dasc implementation. */
-  RegSet drop = RSET_RANGE(RID_XMM0, RID_XMM1+1)|RID2RSET(RID_EAX);
-  if (ra_hasreg(ir->r))
-    rset_clear(drop, ir->r);  /* Dest reg handled below. */
-  ra_evictset(as, drop);
-  ra_destreg(as, ir, RID_XMM0);
-  emit_call(as, lj_vm_powi_sse);
-  ra_left(as, RID_XMM0, ir->op1);
-  ra_left(as, RID_EAX, ir->op2);
-}
-
-#if LJ_64 && LJ_HASFFI
-static void asm_arith64(ASMState *as, IRIns *ir, IRCallID id)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[id];
-  IRRef args[2];
-  args[0] = ir->op1;
-  args[1] = ir->op2;
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-#endif
-
-static void asm_intmod(ASMState *as, IRIns *ir)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_vm_modi];
-  IRRef args[2];
-  args[0] = ir->op1;
-  args[1] = ir->op2;
-  asm_setupresult(as, ir, ci);
-  asm_gencall(as, ci, args);
-}
-
-static int asm_swapops(ASMState *as, IRIns *ir)
-{
-  IRIns *irl = IR(ir->op1);
-  IRIns *irr = IR(ir->op2);
-  lua_assert(ra_noreg(irr->r));
-  if (!irm_iscomm(lj_ir_mode[ir->o]))
-    return 0;  /* Can't swap non-commutative operations. */
-  if (irref_isk(ir->op2))
-    return 0;  /* Don't swap constants to the left. */
-  if (ra_hasreg(irl->r))
-    return 1;  /* Swap if left already has a register. */
-  if (ra_samehint(ir->r, irr->r))
-    return 1;  /* Swap if dest and right have matching hints. */
-  if (as->curins > as->loopref) {  /* In variant part? */
-    if (ir->op2 < as->loopref && !irt_isphi(irr->t))
-      return 0;  /* Keep invariants on the right. */
-    if (ir->op1 < as->loopref && !irt_isphi(irl->t))
-      return 1;  /* Swap invariants to the right. */
-  }
-  if (opisfusableload(irl->o))
-    return 1;  /* Swap fusable loads to the right. */
-  return 0;  /* Otherwise don't swap. */
-}
-
-static void asm_fparith(ASMState *as, IRIns *ir, x86Op xo)
-{
-  IRRef lref = ir->op1;
-  IRRef rref = ir->op2;
-  RegSet allow = RSET_FPR;
-  Reg dest;
-  Reg right = IR(rref)->r;
-  if (ra_hasreg(right)) {
-    rset_clear(allow, right);
-    ra_noweak(as, right);
-  }
-  dest = ra_dest(as, ir, allow);
-  if (lref == rref) {
-    right = dest;
-  } else if (ra_noreg(right)) {
-    if (asm_swapops(as, ir)) {
-      IRRef tmp = lref; lref = rref; rref = tmp;
-    }
-    right = asm_fuseload(as, rref, rset_clear(allow, dest));
-  }
-  emit_mrm(as, xo, dest, right);
-  ra_left(as, dest, lref);
-}
-
-static void asm_intarith(ASMState *as, IRIns *ir, x86Arith xa)
-{
-  IRRef lref = ir->op1;
-  IRRef rref = ir->op2;
-  RegSet allow = RSET_GPR;
-  Reg dest, right;
-  int32_t k = 0;
-  if (as->flagmcp == as->mcp) {  /* Drop test r,r instruction. */
-    MCode *p = as->mcp + ((LJ_64 && *as->mcp < XI_TESTb) ? 3 : 2);
-    if ((p[1] & 15) < 14) {
-      if ((p[1] & 15) >= 12) p[1] -= 4;  /* L <->S, NL <-> NS */
-      as->flagmcp = NULL;
-      as->mcp = p;
-    }  /* else: cannot transform LE/NLE to cc without use of OF. */
-  }
-  right = IR(rref)->r;
-  if (ra_hasreg(right)) {
-    rset_clear(allow, right);
-    ra_noweak(as, right);
-  }
-  dest = ra_dest(as, ir, allow);
-  if (lref == rref) {
-    right = dest;
-  } else if (ra_noreg(right) && !asm_isk32(as, rref, &k)) {
-    if (asm_swapops(as, ir)) {
-      IRRef tmp = lref; lref = rref; rref = tmp;
-    }
-    right = asm_fuseloadm(as, rref, rset_clear(allow, dest), irt_is64(ir->t));
-  }
-  if (irt_isguard(ir->t))  /* For IR_ADDOV etc. */
-    asm_guardcc(as, CC_O);
-  if (xa != XOg_X_IMUL) {
-    if (ra_hasreg(right))
-      emit_mrm(as, XO_ARITH(xa), REX_64IR(ir, dest), right);
-    else
-      emit_gri(as, XG_ARITHi(xa), REX_64IR(ir, dest), k);
-  } else if (ra_hasreg(right)) {  /* IMUL r, mrm. */
-    emit_mrm(as, XO_IMUL, REX_64IR(ir, dest), right);
-  } else {  /* IMUL r, r, k. */
-    /* NYI: use lea/shl/add/sub (FOLD only does 2^k) depending on CPU. */
-    Reg left = asm_fuseloadm(as, lref, RSET_GPR, irt_is64(ir->t));
-    x86Op xo;
-    if (checki8(k)) { emit_i8(as, k); xo = XO_IMULi8;
-    } else { emit_i32(as, k); xo = XO_IMULi; }
-    emit_mrm(as, xo, REX_64IR(ir, dest), left);
-    return;
-  }
-  ra_left(as, dest, lref);
-}
-
-/* LEA is really a 4-operand ADD with an independent destination register,
-** up to two source registers and an immediate. One register can be scaled
-** by 1, 2, 4 or 8. This can be used to avoid moves or to fuse several
-** instructions.
-**
-** Currently only a few common cases are supported:
-** - 3-operand ADD:    y = a+b; y = a+k   with a and b already allocated
-** - Left ADD fusion:  y = (a+b)+k; y = (a+k)+b
-** - Right ADD fusion: y = a+(b+k)
-** The ommited variants have already been reduced by FOLD.
-**
-** There are more fusion opportunities, like gathering shifts or joining
-** common references. But these are probably not worth the trouble, since
-** array indexing is not decomposed and already makes use of all fields
-** of the ModRM operand.
-*/
-static int asm_lea(ASMState *as, IRIns *ir)
-{
-  IRIns *irl = IR(ir->op1);
-  IRIns *irr = IR(ir->op2);
-  RegSet allow = RSET_GPR;
-  Reg dest;
-  as->mrm.base = as->mrm.idx = RID_NONE;
-  as->mrm.scale = XM_SCALE1;
-  as->mrm.ofs = 0;
-  if (ra_hasreg(irl->r)) {
-    rset_clear(allow, irl->r);
-    ra_noweak(as, irl->r);
-    as->mrm.base = irl->r;
-    if (irref_isk(ir->op2) || ra_hasreg(irr->r)) {
-      /* The PHI renaming logic does a better job in some cases. */
-      if (ra_hasreg(ir->r) &&
-	  ((irt_isphi(irl->t) && as->phireg[ir->r] == ir->op1) ||
-	   (irt_isphi(irr->t) && as->phireg[ir->r] == ir->op2)))
-	return 0;
-      if (irref_isk(ir->op2)) {
-	as->mrm.ofs = irr->i;
-      } else {
-	rset_clear(allow, irr->r);
-	ra_noweak(as, irr->r);
-	as->mrm.idx = irr->r;
-      }
-    } else if (irr->o == IR_ADD && mayfuse(as, ir->op2) &&
-	       irref_isk(irr->op2)) {
-      Reg idx = ra_alloc1(as, irr->op1, allow);
-      rset_clear(allow, idx);
-      as->mrm.idx = (uint8_t)idx;
-      as->mrm.ofs = IR(irr->op2)->i;
-    } else {
-      return 0;
-    }
-  } else if (ir->op1 != ir->op2 && irl->o == IR_ADD && mayfuse(as, ir->op1) &&
-	     (irref_isk(ir->op2) || irref_isk(irl->op2))) {
-    Reg idx, base = ra_alloc1(as, irl->op1, allow);
-    rset_clear(allow, base);
-    as->mrm.base = (uint8_t)base;
-    if (irref_isk(ir->op2)) {
-      as->mrm.ofs = irr->i;
-      idx = ra_alloc1(as, irl->op2, allow);
-    } else {
-      as->mrm.ofs = IR(irl->op2)->i;
-      idx = ra_alloc1(as, ir->op2, allow);
-    }
-    rset_clear(allow, idx);
-    as->mrm.idx = (uint8_t)idx;
-  } else {
-    return 0;
-  }
-  dest = ra_dest(as, ir, allow);
-  emit_mrm(as, XO_LEA, dest, RID_MRM);
-  return 1;  /* Success. */
-}
-
-static void asm_add(ASMState *as, IRIns *ir)
-{
-  if (irt_isnum(ir->t))
-    asm_fparith(as, ir, XO_ADDSD);
-  else if ((as->flags & JIT_F_LEA_AGU) || as->flagmcp == as->mcp ||
-	   irt_is64(ir->t) || !asm_lea(as, ir))
-    asm_intarith(as, ir, XOg_ADD);
-}
-
-static void asm_neg_not(ASMState *as, IRIns *ir, x86Group3 xg)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  emit_rr(as, XO_GROUP3, REX_64IR(ir, xg), dest);
-  ra_left(as, dest, ir->op1);
-}
-
-static void asm_min_max(ASMState *as, IRIns *ir, int cc)
-{
-  Reg right, dest = ra_dest(as, ir, RSET_GPR);
-  IRRef lref = ir->op1, rref = ir->op2;
-  if (irref_isk(rref)) { lref = rref; rref = ir->op1; }
-  right = ra_alloc1(as, rref, rset_exclude(RSET_GPR, dest));
-  emit_rr(as, XO_CMOV + (cc<<24), REX_64IR(ir, dest), right);
-  emit_rr(as, XO_CMP, REX_64IR(ir, dest), right);
-  ra_left(as, dest, lref);
-}
-
-static void asm_bitswap(ASMState *as, IRIns *ir)
-{
-  Reg dest = ra_dest(as, ir, RSET_GPR);
-  as->mcp = emit_op(XO_BSWAP + ((dest&7) << 24),
-		    REX_64IR(ir, 0), dest, 0, as->mcp, 1);
-  ra_left(as, dest, ir->op1);
-}
-
-static void asm_bitshift(ASMState *as, IRIns *ir, x86Shift xs)
-{
-  IRRef rref = ir->op2;
-  IRIns *irr = IR(rref);
-  Reg dest;
-  if (irref_isk(rref)) {  /* Constant shifts. */
-    int shift;
-    dest = ra_dest(as, ir, RSET_GPR);
-    shift = irr->i & (irt_is64(ir->t) ? 63 : 31);
-    switch (shift) {
-    case 0: break;
-    case 1: emit_rr(as, XO_SHIFT1, REX_64IR(ir, xs), dest); break;
-    default: emit_shifti(as, REX_64IR(ir, xs), dest, shift); break;
-    }
-  } else {  /* Variable shifts implicitly use register cl (i.e. ecx). */
-    Reg right;
-    dest = ra_dest(as, ir, rset_exclude(RSET_GPR, RID_ECX));
-    if (dest == RID_ECX) {
-      dest = ra_scratch(as, rset_exclude(RSET_GPR, RID_ECX));
-      emit_rr(as, XO_MOV, RID_ECX, dest);
-    }
-    right = irr->r;
-    if (ra_noreg(right))
-      right = ra_allocref(as, rref, RID2RSET(RID_ECX));
-    else if (right != RID_ECX)
-      ra_scratch(as, RID2RSET(RID_ECX));
-    emit_rr(as, XO_SHIFTcl, REX_64IR(ir, xs), dest);
-    ra_noweak(as, right);
-    if (right != RID_ECX)
-      emit_rr(as, XO_MOV, RID_ECX, right);
-  }
-  ra_left(as, dest, ir->op1);
-  /*
-  ** Note: avoid using the flags resulting from a shift or rotate!
-  ** All of them cause a partial flag stall, except for r,1 shifts
-  ** (but not rotates). And a shift count of 0 leaves the flags unmodified.
-  */
-}
-
-/* -- Comparisons --------------------------------------------------------- */
-
-/* Virtual flags for unordered FP comparisons. */
-#define VCC_U	0x1000		/* Unordered. */
-#define VCC_P	0x2000		/* Needs extra CC_P branch. */
-#define VCC_S	0x4000		/* Swap avoids CC_P branch. */
-#define VCC_PS	(VCC_P|VCC_S)
-
-/* Map of comparisons to flags. ORDER IR. */
-#define COMPFLAGS(ci, cin, cu, cf)	((ci)+((cu)<<4)+((cin)<<8)+(cf))
-static const uint16_t asm_compmap[IR_ABC+1] = {
-  /*                 signed non-eq unsigned flags */
-  /* LT  */ COMPFLAGS(CC_GE, CC_G,  CC_AE, VCC_PS),
-  /* GE  */ COMPFLAGS(CC_L,  CC_L,  CC_B,  0),
-  /* LE  */ COMPFLAGS(CC_G,  CC_G,  CC_A,  VCC_PS),
-  /* GT  */ COMPFLAGS(CC_LE, CC_L,  CC_BE, 0),
-  /* ULT */ COMPFLAGS(CC_AE, CC_A,  CC_AE, VCC_U),
-  /* UGE */ COMPFLAGS(CC_B,  CC_B,  CC_B,  VCC_U|VCC_PS),
-  /* ULE */ COMPFLAGS(CC_A,  CC_A,  CC_A,  VCC_U),
-  /* UGT */ COMPFLAGS(CC_BE, CC_B,  CC_BE, VCC_U|VCC_PS),
-  /* EQ  */ COMPFLAGS(CC_NE, CC_NE, CC_NE, VCC_P),
-  /* NE  */ COMPFLAGS(CC_E,  CC_E,  CC_E,  VCC_U|VCC_P),
-  /* ABC */ COMPFLAGS(CC_BE, CC_B,  CC_BE, VCC_U|VCC_PS)  /* Same as UGT. */
-};
-
-/* FP and integer comparisons. */
-static void asm_comp(ASMState *as, IRIns *ir, uint32_t cc)
-{
-  if (irt_isnum(ir->t)) {
-    IRRef lref = ir->op1;
-    IRRef rref = ir->op2;
-    Reg left, right;
-    MCLabel l_around;
-    /*
-    ** An extra CC_P branch is required to preserve ordered/unordered
-    ** semantics for FP comparisons. This can be avoided by swapping
-    ** the operands and inverting the condition (except for EQ and UNE).
-    ** So always try to swap if possible.
-    **
-    ** Another option would be to swap operands to achieve better memory
-    ** operand fusion. But it's unlikely that this outweighs the cost
-    ** of the extra branches.
-    */
-    if (cc & VCC_S) {  /* Swap? */
-      IRRef tmp = lref; lref = rref; rref = tmp;
-      cc ^= (VCC_PS|(5<<4));  /* A <-> B, AE <-> BE, PS <-> none */
-    }
-    left = ra_alloc1(as, lref, RSET_FPR);
-    right = asm_fuseload(as, rref, rset_exclude(RSET_FPR, left));
-    l_around = emit_label(as);
-    asm_guardcc(as, cc >> 4);
-    if (cc & VCC_P) {  /* Extra CC_P branch required? */
-      if (!(cc & VCC_U)) {
-	asm_guardcc(as, CC_P);  /* Branch to exit for ordered comparisons. */
-      } else if (l_around != as->invmcp) {
-	emit_sjcc(as, CC_P, l_around);  /* Branch around for unordered. */
-      } else {
-	/* Patched to mcloop by asm_loop_fixup. */
-	as->loopinv = 2;
-	if (as->realign)
-	  emit_sjcc(as, CC_P, as->mcp);
-	else
-	  emit_jcc(as, CC_P, as->mcp);
-      }
-    }
-    emit_mrm(as, XO_UCOMISD, left, right);
-  } else {
-    IRRef lref = ir->op1, rref = ir->op2;
-    IROp leftop = (IROp)(IR(lref)->o);
-    Reg r64 = REX_64IR(ir, 0);
-    int32_t imm = 0;
-    lua_assert(irt_is64(ir->t) || irt_isint(ir->t) ||
-	       irt_isu32(ir->t) || irt_isaddr(ir->t) || irt_isu8(ir->t));
-    /* Swap constants (only for ABC) and fusable loads to the right. */
-    if (irref_isk(lref) || (!irref_isk(rref) && opisfusableload(leftop))) {
-      if ((cc & 0xc) == 0xc) cc ^= 0x53;  /* L <-> G, LE <-> GE */
-      else if ((cc & 0xa) == 0x2) cc ^= 0x55;  /* A <-> B, AE <-> BE */
-      lref = ir->op2; rref = ir->op1;
-    }
-    if (asm_isk32(as, rref, &imm)) {
-      IRIns *irl = IR(lref);
-      /* Check wether we can use test ins. Not for unsigned, since CF=0. */
-      int usetest = (imm == 0 && (cc & 0xa) != 0x2);
-      if (usetest && irl->o == IR_BAND && irl+1 == ir && !ra_used(irl)) {
-	/* Combine comp(BAND(ref, r/imm), 0) into test mrm, r/imm. */
-	Reg right, left = RID_NONE;
-	RegSet allow = RSET_GPR;
-	if (!asm_isk32(as, irl->op2, &imm)) {
-	  left = ra_alloc1(as, irl->op2, allow);
-	  rset_clear(allow, left);
-	} else {  /* Try to Fuse IRT_I8/IRT_U8 loads, too. See below. */
-	  IRIns *irll = IR(irl->op1);
-	  if (opisfusableload((IROp)irll->o) &&
-	      (irt_isi8(irll->t) || irt_isu8(irll->t))) {
-	    IRType1 origt = irll->t;  /* Temporarily flip types. */
-	    irll->t.irt = (irll->t.irt & ~IRT_TYPE) | IRT_INT;
-	    as->curins--;  /* Skip to BAND to avoid failing in noconflict(). */
-	    right = asm_fuseload(as, irl->op1, RSET_GPR);
-	    as->curins++;
-	    irll->t = origt;
-	    if (right != RID_MRM) goto test_nofuse;
-	    /* Fusion succeeded, emit test byte mrm, imm8. */
-	    asm_guardcc(as, cc);
-	    emit_i8(as, (imm & 0xff));
-	    emit_mrm(as, XO_GROUP3b, XOg_TEST, RID_MRM);
-	    return;
-	  }
-	}
-	as->curins--;  /* Skip to BAND to avoid failing in noconflict(). */
-	right = asm_fuseloadm(as, irl->op1, allow, r64);
-	as->curins++;  /* Undo the above. */
-      test_nofuse:
-	asm_guardcc(as, cc);
-	if (ra_noreg(left)) {
-	  emit_i32(as, imm);
-	  emit_mrm(as, XO_GROUP3, r64 + XOg_TEST, right);
-	} else {
-	  emit_mrm(as, XO_TEST, r64 + left, right);
-	}
-      } else {
-	Reg left;
-	if (opisfusableload((IROp)irl->o) &&
-	    ((irt_isu8(irl->t) && checku8(imm)) ||
-	     ((irt_isi8(irl->t) || irt_isi16(irl->t)) && checki8(imm)) ||
-	     (irt_isu16(irl->t) && checku16(imm) && checki8((int16_t)imm)))) {
-	  /* Only the IRT_INT case is fused by asm_fuseload.
-	  ** The IRT_I8/IRT_U8 loads and some IRT_I16/IRT_U16 loads
-	  ** are handled here.
-	  ** Note that cmp word [mem], imm16 should not be generated,
-	  ** since it has a length-changing prefix. Compares of a word
-	  ** against a sign-extended imm8 are ok, however.
-	  */
-	  IRType1 origt = irl->t;  /* Temporarily flip types. */
-	  irl->t.irt = (irl->t.irt & ~IRT_TYPE) | IRT_INT;
-	  left = asm_fuseload(as, lref, RSET_GPR);
-	  irl->t = origt;
-	  if (left == RID_MRM) {  /* Fusion succeeded? */
-	    if (irt_isu8(irl->t) || irt_isu16(irl->t))
-	      cc >>= 4;  /* Need unsigned compare. */
-	    asm_guardcc(as, cc);
-	    emit_i8(as, imm);
-	    emit_mrm(as, (irt_isi8(origt) || irt_isu8(origt)) ?
-			 XO_ARITHib : XO_ARITHiw8, r64 + XOg_CMP, RID_MRM);
-	    return;
-	  }  /* Otherwise handle register case as usual. */
-	} else {
-	  left = asm_fuseloadm(as, lref,
-			       irt_isu8(ir->t) ? RSET_GPR8 : RSET_GPR, r64);
-	}
-	asm_guardcc(as, cc);
-	if (usetest && left != RID_MRM) {
-	  /* Use test r,r instead of cmp r,0. */
-	  x86Op xo = XO_TEST;
-	  if (irt_isu8(ir->t)) {
-	    lua_assert(ir->o == IR_EQ || ir->o == IR_NE);
-	    xo = XO_TESTb;
-	    if (!rset_test(RSET_RANGE(RID_EAX, RID_EBX+1), left)) {
-	      if (LJ_64) {
-		left |= FORCE_REX;
-	      } else {
-		emit_i32(as, 0xff);
-		emit_mrm(as, XO_GROUP3, XOg_TEST, left);
-		return;
-	      }
-	    }
-	  }
-	  emit_rr(as, xo, r64 + left, left);
-	  if (irl+1 == ir)  /* Referencing previous ins? */
-	    as->flagmcp = as->mcp;  /* Set flag to drop test r,r if possible. */
-	} else {
-	  emit_gmrmi(as, XG_ARITHi(XOg_CMP), r64 + left, imm);
-	}
-      }
-    } else {
-      Reg left = ra_alloc1(as, lref, RSET_GPR);
-      Reg right = asm_fuseloadm(as, rref, rset_exclude(RSET_GPR, left), r64);
-      asm_guardcc(as, cc);
-      emit_mrm(as, XO_CMP, r64 + left, right);
-    }
-  }
-}
-
-#if LJ_32 && LJ_HASFFI
-/* 64 bit integer comparisons in 32 bit mode. */
-static void asm_comp_int64(ASMState *as, IRIns *ir)
-{
-  uint32_t cc = asm_compmap[(ir-1)->o];
-  RegSet allow = RSET_GPR;
-  Reg lefthi = RID_NONE, leftlo = RID_NONE;
-  Reg righthi = RID_NONE, rightlo = RID_NONE;
-  MCLabel l_around;
-  x86ModRM mrm;
-
-  as->curins--;  /* Skip loword ins. Avoids failing in noconflict(), too. */
-
-  /* Allocate/fuse hiword operands. */
-  if (irref_isk(ir->op2)) {
-    lefthi = asm_fuseload(as, ir->op1, allow);
-  } else {
-    lefthi = ra_alloc1(as, ir->op1, allow);
-    rset_clear(allow, lefthi);
-    righthi = asm_fuseload(as, ir->op2, allow);
-    if (righthi == RID_MRM) {
-      if (as->mrm.base != RID_NONE) rset_clear(allow, as->mrm.base);
-      if (as->mrm.idx != RID_NONE) rset_clear(allow, as->mrm.idx);
-    } else {
-      rset_clear(allow, righthi);
-    }
-  }
-  mrm = as->mrm;  /* Save state for hiword instruction. */
-
-  /* Allocate/fuse loword operands. */
-  if (irref_isk((ir-1)->op2)) {
-    leftlo = asm_fuseload(as, (ir-1)->op1, allow);
-  } else {
-    leftlo = ra_alloc1(as, (ir-1)->op1, allow);
-    rset_clear(allow, leftlo);
-    rightlo = asm_fuseload(as, (ir-1)->op2, allow);
-  }
-
-  /* All register allocations must be performed _before_ this point. */
-  l_around = emit_label(as);
-  as->invmcp = as->flagmcp = NULL;  /* Cannot use these optimizations. */
-
-  /* Loword comparison and branch. */
-  asm_guardcc(as, cc >> 4);  /* Always use unsigned compare for loword. */
-  if (ra_noreg(rightlo)) {
-    int32_t imm = IR((ir-1)->op2)->i;
-    if (imm == 0 && ((cc >> 4) & 0xa) != 0x2 && leftlo != RID_MRM)
-      emit_rr(as, XO_TEST, leftlo, leftlo);
-    else
-      emit_gmrmi(as, XG_ARITHi(XOg_CMP), leftlo, imm);
-  } else {
-    emit_mrm(as, XO_CMP, leftlo, rightlo);
-  }
-
-  /* Hiword comparison and branches. */
-  if ((cc & 15) != CC_NE)
-    emit_sjcc(as, CC_NE, l_around);  /* Hiword unequal: skip loword compare. */
-  if ((cc & 15) != CC_E)
-    asm_guardcc(as, cc >> 8);  /* Hiword compare without equality check. */
-  as->mrm = mrm;  /* Restore state. */
-  if (ra_noreg(righthi)) {
-    int32_t imm = IR(ir->op2)->i;
-    if (imm == 0 && (cc & 0xa) != 0x2 && lefthi != RID_MRM)
-      emit_rr(as, XO_TEST, lefthi, lefthi);
-    else
-      emit_gmrmi(as, XG_ARITHi(XOg_CMP), lefthi, imm);
-  } else {
-    emit_mrm(as, XO_CMP, lefthi, righthi);
-  }
-}
-#endif
-
-/* -- Support for 64 bit ops in 32 bit mode ------------------------------- */
-
-/* Hiword op of a split 64 bit op. Previous op must be the loword op. */
-static void asm_hiop(ASMState *as, IRIns *ir)
-{
-#if LJ_32 && LJ_HASFFI
-  /* HIOP is marked as a store because it needs its own DCE logic. */
-  int uselo = ra_used(ir-1), usehi = ra_used(ir);  /* Loword/hiword used? */
-  if (LJ_UNLIKELY(!(as->flags & JIT_F_OPT_DCE))) uselo = usehi = 1;
-  if ((ir-1)->o == IR_CONV) {  /* Conversions to/from 64 bit. */
-    if (usehi || uselo) {
-      if (irt_isfp(ir->t))
-	asm_conv_fp_int64(as, ir);
-      else
-	asm_conv_int64_fp(as, ir);
-    }
-    as->curins--;  /* Always skip the CONV. */
-    return;
-  } else if ((ir-1)->o <= IR_NE) {  /* 64 bit integer comparisons. ORDER IR. */
-    asm_comp_int64(as, ir);
-    return;
-  } else if ((ir-1)->o == IR_XSTORE) {
-    if ((ir-1)->r != RID_SINK)
-      asm_fxstore(as, ir);
-    return;
-  }
-  if (!usehi) return;  /* Skip unused hiword op for all remaining ops. */
-  switch ((ir-1)->o) {
-  case IR_ADD:
-    as->flagmcp = NULL;
-    as->curins--;
-    asm_intarith(as, ir, XOg_ADC);
-    asm_intarith(as, ir-1, XOg_ADD);
-    break;
-  case IR_SUB:
-    as->flagmcp = NULL;
-    as->curins--;
-    asm_intarith(as, ir, XOg_SBB);
-    asm_intarith(as, ir-1, XOg_SUB);
-    break;
-  case IR_NEG: {
-    Reg dest = ra_dest(as, ir, RSET_GPR);
-    emit_rr(as, XO_GROUP3, XOg_NEG, dest);
-    emit_i8(as, 0);
-    emit_rr(as, XO_ARITHi8, XOg_ADC, dest);
-    ra_left(as, dest, ir->op1);
-    as->curins--;
-    asm_neg_not(as, ir-1, XOg_NEG);
-    break;
-    }
-  case IR_CALLN:
-  case IR_CALLXS:
-    if (!uselo)
-      ra_allocref(as, ir->op1, RID2RSET(RID_RETLO));  /* Mark lo op as used. */
-    break;
-  case IR_CNEWI:
-    /* Nothing to do here. Handled by CNEWI itself. */
-    break;
-  default: lua_assert(0); break;
-  }
-#else
-  UNUSED(as); UNUSED(ir); lua_assert(0);  /* Unused on x64 or without FFI. */
-#endif
-}
-
-/* -- Stack handling ------------------------------------------------------ */
-
-/* Check Lua stack size for overflow. Use exit handler as fallback. */
-static void asm_stack_check(ASMState *as, BCReg topslot,
-			    IRIns *irp, RegSet allow, ExitNo exitno)
-{
-  /* Try to get an unused temp. register, otherwise spill/restore eax. */
-  Reg pbase = irp ? irp->r : RID_BASE;
-  Reg r = allow ? rset_pickbot(allow) : RID_EAX;
-  emit_jcc(as, CC_B, exitstub_addr(as->J, exitno));
-  if (allow == RSET_EMPTY)  /* Restore temp. register. */
-    emit_rmro(as, XO_MOV, r|REX_64, RID_ESP, 0);
-  else
-    ra_modified(as, r);
-  emit_gri(as, XG_ARITHi(XOg_CMP), r, (int32_t)(8*topslot));
-  if (ra_hasreg(pbase) && pbase != r)
-    emit_rr(as, XO_ARITH(XOg_SUB), r, pbase);
-  else
-    emit_rmro(as, XO_ARITH(XOg_SUB), r, RID_NONE,
-	      ptr2addr(&J2G(as->J)->jit_base));
-  emit_rmro(as, XO_MOV, r, r, offsetof(lua_State, maxstack));
-  emit_getgl(as, r, jit_L);
-  if (allow == RSET_EMPTY)  /* Spill temp. register. */
-    emit_rmro(as, XO_MOVto, r|REX_64, RID_ESP, 0);
-}
-
-/* Restore Lua stack from on-trace state. */
-static void asm_stack_restore(ASMState *as, SnapShot *snap)
-{
-  SnapEntry *map = &as->T->snapmap[snap->mapofs];
-  SnapEntry *flinks = &as->T->snapmap[snap_nextofs(as->T, snap)-1];
-  MSize n, nent = snap->nent;
-  /* Store the value of all modified slots to the Lua stack. */
-  for (n = 0; n < nent; n++) {
-    SnapEntry sn = map[n];
-    BCReg s = snap_slot(sn);
-    int32_t ofs = 8*((int32_t)s-1);
-    IRRef ref = snap_ref(sn);
-    IRIns *ir = IR(ref);
-    if ((sn & SNAP_NORESTORE))
-      continue;
-    if (irt_isnum(ir->t)) {
-      Reg src = ra_alloc1(as, ref, RSET_FPR);
-      emit_rmro(as, XO_MOVSDto, src, RID_BASE, ofs);
-    } else {
-      lua_assert(irt_ispri(ir->t) || irt_isaddr(ir->t) ||
-		 (LJ_DUALNUM && irt_isinteger(ir->t)));
-      if (!irref_isk(ref)) {
-	Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPR, RID_BASE));
-	emit_movtomro(as, REX_64IR(ir, src), RID_BASE, ofs);
-      } else if (!irt_ispri(ir->t)) {
-	emit_movmroi(as, RID_BASE, ofs, ir->i);
-      }
-      if ((sn & (SNAP_CONT|SNAP_FRAME))) {
-	if (s != 0)  /* Do not overwrite link to previous frame. */
-	  emit_movmroi(as, RID_BASE, ofs+4, (int32_t)(*flinks--));
-      } else {
-	if (!(LJ_64 && irt_islightud(ir->t)))
-	  emit_movmroi(as, RID_BASE, ofs+4, irt_toitype(ir->t));
-      }
-    }
-    checkmclim(as);
-  }
-  lua_assert(map + nent == flinks);
-}
-
-/* -- GC handling --------------------------------------------------------- */
-
-/* Check GC threshold and do one or more GC steps. */
-static void asm_gc_check(ASMState *as)
-{
-  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_gc_step_jit];
-  IRRef args[2];
-  MCLabel l_end;
-  Reg tmp;
-  ra_evictset(as, RSET_SCRATCH);
-  l_end = emit_label(as);
-  /* Exit trace if in GCSatomic or GCSfinalize. Avoids syncing GC objects. */
-  asm_guardcc(as, CC_NE);  /* Assumes asm_snap_prep() already done. */
-  emit_rr(as, XO_TEST, RID_RET, RID_RET);
-  args[0] = ASMREF_TMP1;  /* global_State *g */
-  args[1] = ASMREF_TMP2;  /* MSize steps     */
-  asm_gencall(as, ci, args);
-  tmp = ra_releasetmp(as, ASMREF_TMP1);
-  emit_loada(as, tmp, J2G(as->J));
-  emit_loadi(as, ra_releasetmp(as, ASMREF_TMP2), as->gcsteps);
-  /* Jump around GC step if GC total < GC threshold. */
-  emit_sjcc(as, CC_B, l_end);
-  emit_opgl(as, XO_ARITH(XOg_CMP), tmp, gc.threshold);
-  emit_getgl(as, tmp, gc.total);
-  as->gcsteps = 0;
-  checkmclim(as);
-}
-
-/* -- Loop handling ------------------------------------------------------- */
-
-/* Fixup the loop branch. */
-static void asm_loop_fixup(ASMState *as)
-{
-  MCode *p = as->mctop;
-  MCode *target = as->mcp;
-  if (as->realign) {  /* Realigned loops use short jumps. */
-    as->realign = NULL;  /* Stop another retry. */
-    lua_assert(((intptr_t)target & 15) == 0);
-    if (as->loopinv) {  /* Inverted loop branch? */
-      p -= 5;
-      p[0] = XI_JMP;
-      lua_assert(target - p >= -128);
-      p[-1] = (MCode)(target - p);  /* Patch sjcc. */
-      if (as->loopinv == 2)
-	p[-3] = (MCode)(target - p + 2);  /* Patch opt. short jp. */
-    } else {
-      lua_assert(target - p >= -128);
-      p[-1] = (MCode)(int8_t)(target - p);  /* Patch short jmp. */
-      p[-2] = XI_JMPs;
-    }
-  } else {
-    MCode *newloop;
-    p[-5] = XI_JMP;
-    if (as->loopinv) {  /* Inverted loop branch? */
-      /* asm_guardcc already inverted the jcc and patched the jmp. */
-      p -= 5;
-      newloop = target+4;
-      *(int32_t *)(p-4) = (int32_t)(target - p);  /* Patch jcc. */
-      if (as->loopinv == 2) {
-	*(int32_t *)(p-10) = (int32_t)(target - p + 6);  /* Patch opt. jp. */
-	newloop = target+8;
-      }
-    } else {  /* Otherwise just patch jmp. */
-      *(int32_t *)(p-4) = (int32_t)(target - p);
-      newloop = target+3;
-    }
-    /* Realign small loops and shorten the loop branch. */
-    if (newloop >= p - 128) {
-      as->realign = newloop;  /* Force a retry and remember alignment. */
-      as->curins = as->stopins;  /* Abort asm_trace now. */
-      as->T->nins = as->orignins;  /* Remove any added renames. */
-    }
-  }
-}
-
-/* -- Head of trace ------------------------------------------------------- */
-
-/* Coalesce BASE register for a root trace. */
-static void asm_head_root_base(ASMState *as)
-{
-  IRIns *ir = IR(REF_BASE);
-  Reg r = ir->r;
-  if (ra_hasreg(r)) {
-    ra_free(as, r);
-    if (rset_test(as->modset, r) || irt_ismarked(ir->t))
-      ir->r = RID_INIT;  /* No inheritance for modified BASE register. */
-    if (r != RID_BASE)
-      emit_rr(as, XO_MOV, r, RID_BASE);
-  }
-}
-
-/* Coalesce or reload BASE register for a side trace. */
-static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow)
-{
-  IRIns *ir = IR(REF_BASE);
-  Reg r = ir->r;
-  if (ra_hasreg(r)) {
-    ra_free(as, r);
-    if (rset_test(as->modset, r) || irt_ismarked(ir->t))
-      ir->r = RID_INIT;  /* No inheritance for modified BASE register. */
-    if (irp->r == r) {
-      rset_clear(allow, r);  /* Mark same BASE register as coalesced. */
-    } else if (ra_hasreg(irp->r) && rset_test(as->freeset, irp->r)) {
-      rset_clear(allow, irp->r);
-      emit_rr(as, XO_MOV, r, irp->r);  /* Move from coalesced parent reg. */
-    } else {
-      emit_getgl(as, r, jit_base);  /* Otherwise reload BASE. */
-    }
-  }
-  return allow;
-}
-
-/* -- Tail of trace ------------------------------------------------------- */
-
-/* Fixup the tail code. */
-static void asm_tail_fixup(ASMState *as, TraceNo lnk)
-{
-  /* Note: don't use as->mcp swap + emit_*: emit_op overwrites more bytes. */
-  MCode *p = as->mctop;
-  MCode *target, *q;
-  int32_t spadj = as->T->spadjust;
-  if (spadj == 0) {
-    p -= ((as->flags & JIT_F_LEA_AGU) ? 7 : 6) + (LJ_64 ? 1 : 0);
-  } else {
-    MCode *p1;
-    /* Patch stack adjustment. */
-    if (checki8(spadj)) {
-      p -= 3;
-      p1 = p-6;
-      *p1 = (MCode)spadj;
-    } else {
-      p1 = p-9;
-      *(int32_t *)p1 = spadj;
-    }
-    if ((as->flags & JIT_F_LEA_AGU)) {
-#if LJ_64
-      p1[-4] = 0x48;
-#endif
-      p1[-3] = (MCode)XI_LEA;
-      p1[-2] = MODRM(checki8(spadj) ? XM_OFS8 : XM_OFS32, RID_ESP, RID_ESP);
-      p1[-1] = MODRM(XM_SCALE1, RID_ESP, RID_ESP);
-    } else {
-#if LJ_64
-      p1[-3] = 0x48;
-#endif
-      p1[-2] = (MCode)(checki8(spadj) ? XI_ARITHi8 : XI_ARITHi);
-      p1[-1] = MODRM(XM_REG, XOg_ADD, RID_ESP);
-    }
-  }
-  /* Patch exit branch. */
-  target = lnk ? traceref(as->J, lnk)->mcode : (MCode *)lj_vm_exit_interp;
-  *(int32_t *)(p-4) = jmprel(p, target);
-  p[-5] = XI_JMP;
-  /* Drop unused mcode tail. Fill with NOPs to make the prefetcher happy. */
-  for (q = as->mctop-1; q >= p; q--)
-    *q = XI_NOP;
-  as->mctop = p;
-}
-
-/* Prepare tail of code. */
-static void asm_tail_prep(ASMState *as)
-{
-  MCode *p = as->mctop;
-  /* Realign and leave room for backwards loop branch or exit branch. */
-  if (as->realign) {
-    int i = ((int)(intptr_t)as->realign) & 15;
-    /* Fill unused mcode tail with NOPs to make the prefetcher happy. */
-    while (i-- > 0)
-      *--p = XI_NOP;
-    as->mctop = p;
-    p -= (as->loopinv ? 5 : 2);  /* Space for short/near jmp. */
-  } else {
-    p -= 5;  /* Space for exit branch (near jmp). */
-  }
-  if (as->loopref) {
-    as->invmcp = as->mcp = p;
-  } else {
-    /* Leave room for ESP adjustment: add esp, imm or lea esp, [esp+imm] */
-    as->mcp = p - (((as->flags & JIT_F_LEA_AGU) ? 7 : 6)  + (LJ_64 ? 1 : 0));
-    as->invmcp = NULL;
-  }
-}
-
-/* -- Instruction dispatch ------------------------------------------------ */
-
-/* Assemble a single instruction. */
-static void asm_ir(ASMState *as, IRIns *ir)
-{
-  switch ((IROp)ir->o) {
-  /* Miscellaneous ops. */
-  case IR_LOOP: asm_loop(as); break;
-  case IR_NOP: case IR_XBAR: lua_assert(!ra_used(ir)); break;
-  case IR_USE:
-    ra_alloc1(as, ir->op1, irt_isfp(ir->t) ? RSET_FPR : RSET_GPR); break;
-  case IR_PHI: asm_phi(as, ir); break;
-  case IR_HIOP: asm_hiop(as, ir); break;
-  case IR_GCSTEP: asm_gcstep(as, ir); break;
-
-  /* Guarded assertions. */
-  case IR_LT: case IR_GE: case IR_LE: case IR_GT:
-  case IR_ULT: case IR_UGE: case IR_ULE: case IR_UGT:
-  case IR_EQ: case IR_NE: case IR_ABC:
-    asm_comp(as, ir, asm_compmap[ir->o]);
-    break;
-
-  case IR_RETF: asm_retf(as, ir); break;
-
-  /* Bit ops. */
-  case IR_BNOT: asm_neg_not(as, ir, XOg_NOT); break;
-  case IR_BSWAP: asm_bitswap(as, ir); break;
-
-  case IR_BAND: asm_intarith(as, ir, XOg_AND); break;
-  case IR_BOR:  asm_intarith(as, ir, XOg_OR); break;
-  case IR_BXOR: asm_intarith(as, ir, XOg_XOR); break;
-
-  case IR_BSHL: asm_bitshift(as, ir, XOg_SHL); break;
-  case IR_BSHR: asm_bitshift(as, ir, XOg_SHR); break;
-  case IR_BSAR: asm_bitshift(as, ir, XOg_SAR); break;
-  case IR_BROL: asm_bitshift(as, ir, XOg_ROL); break;
-  case IR_BROR: asm_bitshift(as, ir, XOg_ROR); break;
-
-  /* Arithmetic ops. */
-  case IR_ADD: asm_add(as, ir); break;
-  case IR_SUB:
-    if (irt_isnum(ir->t))
-      asm_fparith(as, ir, XO_SUBSD);
-    else  /* Note: no need for LEA trick here. i-k is encoded as i+(-k). */
-      asm_intarith(as, ir, XOg_SUB);
-    break;
-  case IR_MUL:
-    if (irt_isnum(ir->t))
-      asm_fparith(as, ir, XO_MULSD);
-    else
-      asm_intarith(as, ir, XOg_X_IMUL);
-    break;
-  case IR_DIV:
-#if LJ_64 && LJ_HASFFI
-    if (!irt_isnum(ir->t))
-      asm_arith64(as, ir, irt_isi64(ir->t) ? IRCALL_lj_carith_divi64 :
-					     IRCALL_lj_carith_divu64);
-    else
-#endif
-      asm_fparith(as, ir, XO_DIVSD);
-    break;
-  case IR_MOD:
-#if LJ_64 && LJ_HASFFI
-    if (!irt_isint(ir->t))
-      asm_arith64(as, ir, irt_isi64(ir->t) ? IRCALL_lj_carith_modi64 :
-					     IRCALL_lj_carith_modu64);
-    else
-#endif
-      asm_intmod(as, ir);
-    break;
-
-  case IR_NEG:
-    if (irt_isnum(ir->t))
-      asm_fparith(as, ir, XO_XORPS);
-    else
-      asm_neg_not(as, ir, XOg_NEG);
-    break;
-  case IR_ABS: asm_fparith(as, ir, XO_ANDPS); break;
-
-  case IR_MIN:
-    if (irt_isnum(ir->t))
-      asm_fparith(as, ir, XO_MINSD);
-    else
-      asm_min_max(as, ir, CC_G);
-    break;
-  case IR_MAX:
-    if (irt_isnum(ir->t))
-      asm_fparith(as, ir, XO_MAXSD);
-    else
-      asm_min_max(as, ir, CC_L);
-    break;
-
-  case IR_FPMATH: case IR_ATAN2: case IR_LDEXP:
-    asm_fpmath(as, ir);
-    break;
-  case IR_POW:
-#if LJ_64 && LJ_HASFFI
-    if (!irt_isnum(ir->t))
-      asm_arith64(as, ir, irt_isi64(ir->t) ? IRCALL_lj_carith_powi64 :
-					     IRCALL_lj_carith_powu64);
-    else
-#endif
-      asm_fppowi(as, ir);
-    break;
-
-  /* Overflow-checking arithmetic ops. Note: don't use LEA here! */
-  case IR_ADDOV: asm_intarith(as, ir, XOg_ADD); break;
-  case IR_SUBOV: asm_intarith(as, ir, XOg_SUB); break;
-  case IR_MULOV: asm_intarith(as, ir, XOg_X_IMUL); break;
-
-  /* Memory references. */
-  case IR_AREF: asm_aref(as, ir); break;
-  case IR_HREF: asm_href(as, ir); break;
-  case IR_HREFK: asm_hrefk(as, ir); break;
-  case IR_NEWREF: asm_newref(as, ir); break;
-  case IR_UREFO: case IR_UREFC: asm_uref(as, ir); break;
-  case IR_FREF: asm_fref(as, ir); break;
-  case IR_STRREF: asm_strref(as, ir); break;
-
-  /* Loads and stores. */
-  case IR_ALOAD: case IR_HLOAD: case IR_ULOAD: case IR_VLOAD:
-    asm_ahuvload(as, ir);
-    break;
-  case IR_FLOAD: case IR_XLOAD: asm_fxload(as, ir); break;
-  case IR_SLOAD: asm_sload(as, ir); break;
-
-  case IR_ASTORE: case IR_HSTORE: case IR_USTORE: asm_ahustore(as, ir); break;
-  case IR_FSTORE: case IR_XSTORE: asm_fxstore(as, ir); break;
-
-  /* Allocations. */
-  case IR_SNEW: case IR_XSNEW: asm_snew(as, ir); break;
-  case IR_TNEW: asm_tnew(as, ir); break;
-  case IR_TDUP: asm_tdup(as, ir); break;
-  case IR_CNEW: case IR_CNEWI: asm_cnew(as, ir); break;
-
-  /* Write barriers. */
-  case IR_TBAR: asm_tbar(as, ir); break;
-  case IR_OBAR: asm_obar(as, ir); break;
-
-  /* Type conversions. */
-  case IR_TOBIT: asm_tobit(as, ir); break;
-  case IR_CONV: asm_conv(as, ir); break;
-  case IR_TOSTR: asm_tostr(as, ir); break;
-  case IR_STRTO: asm_strto(as, ir); break;
-
-  /* Calls. */
-  case IR_CALLN: case IR_CALLL: case IR_CALLS: asm_call(as, ir); break;
-  case IR_CALLXS: asm_callx(as, ir); break;
-  case IR_CARG: break;
-
-  default:
-    setintV(&as->J->errinfo, ir->o);
-    lj_trace_err_info(as->J, LJ_TRERR_NYIIR);
-    break;
-  }
-}
-
-/* -- Trace setup --------------------------------------------------------- */
-
-/* Ensure there are enough stack slots for call arguments. */
-static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci)
-{
-  IRRef args[CCI_NARGS_MAX*2];
-  int nslots;
-  asm_collectargs(as, ir, ci, args);
-  nslots = asm_count_call_slots(as, ci, args);
-  if (nslots > as->evenspill)  /* Leave room for args in stack slots. */
-    as->evenspill = nslots;
-#if LJ_64
-  return irt_isfp(ir->t) ? REGSP_HINT(RID_FPRET) : REGSP_HINT(RID_RET);
-#else
-  return irt_isfp(ir->t) ? REGSP_INIT : REGSP_HINT(RID_RET);
-#endif
-}
-
-/* Target-specific setup. */
-static void asm_setup_target(ASMState *as)
-{
-  asm_exitstub_setup(as, as->T->nsnap);
-}
-
-/* -- Trace patching ------------------------------------------------------ */
-
-static const uint8_t map_op1[256] = {
-0x92,0x92,0x92,0x92,0x52,0x45,0x51,0x51,0x92,0x92,0x92,0x92,0x52,0x45,0x51,0x20,
-0x92,0x92,0x92,0x92,0x52,0x45,0x51,0x51,0x92,0x92,0x92,0x92,0x52,0x45,0x51,0x51,
-0x92,0x92,0x92,0x92,0x52,0x45,0x10,0x51,0x92,0x92,0x92,0x92,0x52,0x45,0x10,0x51,
-0x92,0x92,0x92,0x92,0x52,0x45,0x10,0x51,0x92,0x92,0x92,0x92,0x52,0x45,0x10,0x51,
-#if LJ_64
-0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14,
-#else
-0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,
-#endif
-0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,
-0x51,0x51,0x92,0x92,0x10,0x10,0x12,0x11,0x45,0x86,0x52,0x93,0x51,0x51,0x51,0x51,
-0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,
-0x93,0x86,0x93,0x93,0x92,0x92,0x92,0x92,0x92,0x92,0x92,0x92,0x92,0x92,0x92,0x92,
-0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x47,0x51,0x51,0x51,0x51,0x51,
-#if LJ_64
-0x59,0x59,0x59,0x59,0x51,0x51,0x51,0x51,0x52,0x45,0x51,0x51,0x51,0x51,0x51,0x51,
-#else
-0x55,0x55,0x55,0x55,0x51,0x51,0x51,0x51,0x52,0x45,0x51,0x51,0x51,0x51,0x51,0x51,
-#endif
-0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,
-0x93,0x93,0x53,0x51,0x70,0x71,0x93,0x86,0x54,0x51,0x53,0x51,0x51,0x52,0x51,0x51,
-0x92,0x92,0x92,0x92,0x52,0x52,0x51,0x51,0x92,0x92,0x92,0x92,0x92,0x92,0x92,0x92,
-0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x45,0x45,0x47,0x52,0x51,0x51,0x51,0x51,
-0x10,0x51,0x10,0x10,0x51,0x51,0x63,0x66,0x51,0x51,0x51,0x51,0x51,0x51,0x92,0x92
-};
-
-static const uint8_t map_op2[256] = {
-0x93,0x93,0x93,0x93,0x52,0x52,0x52,0x52,0x52,0x52,0x51,0x52,0x51,0x93,0x52,0x94,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x53,0x53,0x53,0x53,0x53,0x53,0x53,0x53,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x34,0x51,0x35,0x51,0x51,0x51,0x51,0x51,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x53,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x94,0x54,0x54,0x54,0x93,0x93,0x93,0x52,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,0x46,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x52,0x52,0x52,0x93,0x94,0x93,0x51,0x51,0x52,0x52,0x52,0x93,0x94,0x93,0x93,0x93,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x94,0x93,0x93,0x93,0x93,0x93,
-0x93,0x93,0x94,0x93,0x94,0x94,0x94,0x93,0x52,0x52,0x52,0x52,0x52,0x52,0x52,0x52,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,
-0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x93,0x52
-};
-
-static uint32_t asm_x86_inslen(const uint8_t* p)
-{
-  uint32_t result = 0;
-  uint32_t prefixes = 0;
-  uint32_t x = map_op1[*p];
-  for (;;) {
-    switch (x >> 4) {
-    case 0: return result + x + (prefixes & 4);
-    case 1: prefixes |= x; x = map_op1[*++p]; result++; break;
-    case 2: x = map_op2[*++p]; break;
-    case 3: p++; goto mrm;
-    case 4: result -= (prefixes & 2);  /* fallthrough */
-    case 5: return result + (x & 15);
-    case 6:  /* Group 3. */
-      if (p[1] & 0x38) x = 2;
-      else if ((prefixes & 2) && (x == 0x66)) x = 4;
-      goto mrm;
-    case 7: /* VEX c4/c5. */
-      if (LJ_32 && p[1] < 0xc0) {
-	x = 2;
-	goto mrm;
-      }
-      if (x == 0x70) {
-	x = *++p & 0x1f;
-	result++;
-	if (x >= 2) {
-	  p += 2;
-	  result += 2;
-	  goto mrm;
-	}
-      }
-      p++;
-      result++;
-      x = map_op2[*++p];
-      break;
-    case 8: result -= (prefixes & 2);  /* fallthrough */
-    case 9: mrm:  /* ModR/M and possibly SIB. */
-      result += (x & 15);
-      x = *++p;
-      switch (x >> 6) {
-      case 0: if ((x & 7) == 5) return result + 4; break;
-      case 1: result++; break;
-      case 2: result += 4; break;
-      case 3: return result;
-      }
-      if ((x & 7) == 4) {
-	result++;
-	if (x < 0x40 && (p[1] & 7) == 5) result += 4;
-      }
-      return result;
-    }
-  }
-}
-
-/* Patch exit jumps of existing machine code to a new target. */
-void lj_asm_patchexit(jit_State *J, GCtrace *T, ExitNo exitno, MCode *target)
-{
-  MCode *p = T->mcode;
-  MCode *mcarea = lj_mcode_patch(J, p, 0);
-  MSize len = T->szmcode;
-  MCode *px = exitstub_addr(J, exitno) - 6;
-  MCode *pe = p+len-6;
-  uint32_t stateaddr = u32ptr(&J2G(J)->vmstate);
-  if (len > 5 && p[len-5] == XI_JMP && p+len-6 + *(int32_t *)(p+len-4) == px)
-    *(int32_t *)(p+len-4) = jmprel(p+len, target);
-  /* Do not patch parent exit for a stack check. Skip beyond vmstate update. */
-  for (; p < pe; p += asm_x86_inslen(p))
-    if (*(uint32_t *)(p+(LJ_64 ? 3 : 2)) == stateaddr && p[0] == XI_MOVmi)
-      break;
-  lua_assert(p < pe);
-  for (; p < pe; p += asm_x86_inslen(p))
-    if ((*(uint16_t *)p & 0xf0ff) == 0x800f && p + *(int32_t *)(p+2) == px)
-      *(int32_t *)(p+2) = jmprel(p+6, target);
-  lj_mcode_sync(T->mcode, T->mcode + T->szmcode);
-  lj_mcode_patch(J, mcarea, 1);
-}
-
diff --git a/dependencies2013/win32/include/luajit/lj_bc.h b/dependencies2013/win32/include/luajit/lj_bc.h
deleted file mode 100644
index 108c10f2..00000000
--- a/dependencies2013/win32/include/luajit/lj_bc.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
-** Bytecode instruction format.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_BC_H
-#define _LJ_BC_H
-
-#include "lj_def.h"
-#include "lj_arch.h"
-
-/* Bytecode instruction format, 32 bit wide, fields of 8 or 16 bit:
-**
-** +----+----+----+----+
-** | B  | C  | A  | OP | Format ABC
-** +----+----+----+----+
-** |    D    | A  | OP | Format AD
-** +--------------------
-** MSB               LSB
-**
-** In-memory instructions are always stored in host byte order.
-*/
-
-/* Operand ranges and related constants. */
-#define BCMAX_A		0xff
-#define BCMAX_B		0xff
-#define BCMAX_C		0xff
-#define BCMAX_D		0xffff
-#define BCBIAS_J	0x8000
-#define NO_REG		BCMAX_A
-#define NO_JMP		(~(BCPos)0)
-
-/* Macros to get instruction fields. */
-#define bc_op(i)	((BCOp)((i)&0xff))
-#define bc_a(i)		((BCReg)(((i)>>8)&0xff))
-#define bc_b(i)		((BCReg)((i)>>24))
-#define bc_c(i)		((BCReg)(((i)>>16)&0xff))
-#define bc_d(i)		((BCReg)((i)>>16))
-#define bc_j(i)		((ptrdiff_t)bc_d(i)-BCBIAS_J)
-
-/* Macros to set instruction fields. */
-#define setbc_byte(p, x, ofs) \
-  ((uint8_t *)(p))[LJ_ENDIAN_SELECT(ofs, 3-ofs)] = (uint8_t)(x)
-#define setbc_op(p, x)	setbc_byte(p, (x), 0)
-#define setbc_a(p, x)	setbc_byte(p, (x), 1)
-#define setbc_b(p, x)	setbc_byte(p, (x), 3)
-#define setbc_c(p, x)	setbc_byte(p, (x), 2)
-#define setbc_d(p, x) \
-  ((uint16_t *)(p))[LJ_ENDIAN_SELECT(1, 0)] = (uint16_t)(x)
-#define setbc_j(p, x)	setbc_d(p, (BCPos)((int32_t)(x)+BCBIAS_J))
-
-/* Macros to compose instructions. */
-#define BCINS_ABC(o, a, b, c) \
-  (((BCIns)(o))|((BCIns)(a)<<8)|((BCIns)(b)<<24)|((BCIns)(c)<<16))
-#define BCINS_AD(o, a, d) \
-  (((BCIns)(o))|((BCIns)(a)<<8)|((BCIns)(d)<<16))
-#define BCINS_AJ(o, a, j)	BCINS_AD(o, a, (BCPos)((int32_t)(j)+BCBIAS_J))
-
-/* Bytecode instruction definition. Order matters, see below.
-**
-** (name, filler, Amode, Bmode, Cmode or Dmode, metamethod)
-**
-** The opcode name suffixes specify the type for RB/RC or RD:
-** V = variable slot
-** S = string const
-** N = number const
-** P = primitive type (~itype)
-** B = unsigned byte literal
-** M = multiple args/results
-*/
-#define BCDEF(_) \
-  /* Comparison ops. ORDER OPR. */ \
-  _(ISLT,	var,	___,	var,	lt) \
-  _(ISGE,	var,	___,	var,	lt) \
-  _(ISLE,	var,	___,	var,	le) \
-  _(ISGT,	var,	___,	var,	le) \
-  \
-  _(ISEQV,	var,	___,	var,	eq) \
-  _(ISNEV,	var,	___,	var,	eq) \
-  _(ISEQS,	var,	___,	str,	eq) \
-  _(ISNES,	var,	___,	str,	eq) \
-  _(ISEQN,	var,	___,	num,	eq) \
-  _(ISNEN,	var,	___,	num,	eq) \
-  _(ISEQP,	var,	___,	pri,	eq) \
-  _(ISNEP,	var,	___,	pri,	eq) \
-  \
-  /* Unary test and copy ops. */ \
-  _(ISTC,	dst,	___,	var,	___) \
-  _(ISFC,	dst,	___,	var,	___) \
-  _(IST,	___,	___,	var,	___) \
-  _(ISF,	___,	___,	var,	___) \
-  \
-  /* Unary ops. */ \
-  _(MOV,	dst,	___,	var,	___) \
-  _(NOT,	dst,	___,	var,	___) \
-  _(UNM,	dst,	___,	var,	unm) \
-  _(LEN,	dst,	___,	var,	len) \
-  \
-  /* Binary ops. ORDER OPR. VV last, POW must be next. */ \
-  _(ADDVN,	dst,	var,	num,	add) \
-  _(SUBVN,	dst,	var,	num,	sub) \
-  _(MULVN,	dst,	var,	num,	mul) \
-  _(DIVVN,	dst,	var,	num,	div) \
-  _(MODVN,	dst,	var,	num,	mod) \
-  \
-  _(ADDNV,	dst,	var,	num,	add) \
-  _(SUBNV,	dst,	var,	num,	sub) \
-  _(MULNV,	dst,	var,	num,	mul) \
-  _(DIVNV,	dst,	var,	num,	div) \
-  _(MODNV,	dst,	var,	num,	mod) \
-  \
-  _(ADDVV,	dst,	var,	var,	add) \
-  _(SUBVV,	dst,	var,	var,	sub) \
-  _(MULVV,	dst,	var,	var,	mul) \
-  _(DIVVV,	dst,	var,	var,	div) \
-  _(MODVV,	dst,	var,	var,	mod) \
-  \
-  _(POW,	dst,	var,	var,	pow) \
-  _(CAT,	dst,	rbase,	rbase,	concat) \
-  \
-  /* Constant ops. */ \
-  _(KSTR,	dst,	___,	str,	___) \
-  _(KCDATA,	dst,	___,	cdata,	___) \
-  _(KSHORT,	dst,	___,	lits,	___) \
-  _(KNUM,	dst,	___,	num,	___) \
-  _(KPRI,	dst,	___,	pri,	___) \
-  _(KNIL,	base,	___,	base,	___) \
-  \
-  /* Upvalue and function ops. */ \
-  _(UGET,	dst,	___,	uv,	___) \
-  _(USETV,	uv,	___,	var,	___) \
-  _(USETS,	uv,	___,	str,	___) \
-  _(USETN,	uv,	___,	num,	___) \
-  _(USETP,	uv,	___,	pri,	___) \
-  _(UCLO,	rbase,	___,	jump,	___) \
-  _(FNEW,	dst,	___,	func,	gc) \
-  \
-  /* Table ops. */ \
-  _(TNEW,	dst,	___,	lit,	gc) \
-  _(TDUP,	dst,	___,	tab,	gc) \
-  _(GGET,	dst,	___,	str,	index) \
-  _(GSET,	var,	___,	str,	newindex) \
-  _(TGETV,	dst,	var,	var,	index) \
-  _(TGETS,	dst,	var,	str,	index) \
-  _(TGETB,	dst,	var,	lit,	index) \
-  _(TSETV,	var,	var,	var,	newindex) \
-  _(TSETS,	var,	var,	str,	newindex) \
-  _(TSETB,	var,	var,	lit,	newindex) \
-  _(TSETM,	base,	___,	num,	newindex) \
-  \
-  /* Calls and vararg handling. T = tail call. */ \
-  _(CALLM,	base,	lit,	lit,	call) \
-  _(CALL,	base,	lit,	lit,	call) \
-  _(CALLMT,	base,	___,	lit,	call) \
-  _(CALLT,	base,	___,	lit,	call) \
-  _(ITERC,	base,	lit,	lit,	call) \
-  _(ITERN,	base,	lit,	lit,	call) \
-  _(VARG,	base,	lit,	lit,	___) \
-  _(ISNEXT,	base,	___,	jump,	___) \
-  \
-  /* Returns. */ \
-  _(RETM,	base,	___,	lit,	___) \
-  _(RET,	rbase,	___,	lit,	___) \
-  _(RET0,	rbase,	___,	lit,	___) \
-  _(RET1,	rbase,	___,	lit,	___) \
-  \
-  /* Loops and branches. I/J = interp/JIT, I/C/L = init/call/loop. */ \
-  _(FORI,	base,	___,	jump,	___) \
-  _(JFORI,	base,	___,	jump,	___) \
-  \
-  _(FORL,	base,	___,	jump,	___) \
-  _(IFORL,	base,	___,	jump,	___) \
-  _(JFORL,	base,	___,	lit,	___) \
-  \
-  _(ITERL,	base,	___,	jump,	___) \
-  _(IITERL,	base,	___,	jump,	___) \
-  _(JITERL,	base,	___,	lit,	___) \
-  \
-  _(LOOP,	rbase,	___,	jump,	___) \
-  _(ILOOP,	rbase,	___,	jump,	___) \
-  _(JLOOP,	rbase,	___,	lit,	___) \
-  \
-  _(JMP,	rbase,	___,	jump,	___) \
-  \
-  /* Function headers. I/J = interp/JIT, F/V/C = fixarg/vararg/C func. */ \
-  _(FUNCF,	rbase,	___,	___,	___) \
-  _(IFUNCF,	rbase,	___,	___,	___) \
-  _(JFUNCF,	rbase,	___,	lit,	___) \
-  _(FUNCV,	rbase,	___,	___,	___) \
-  _(IFUNCV,	rbase,	___,	___,	___) \
-  _(JFUNCV,	rbase,	___,	lit,	___) \
-  _(FUNCC,	rbase,	___,	___,	___) \
-  _(FUNCCW,	rbase,	___,	___,	___)
-
-/* Bytecode opcode numbers. */
-typedef enum {
-#define BCENUM(name, ma, mb, mc, mt)	BC_##name,
-BCDEF(BCENUM)
-#undef BCENUM
-  BC__MAX
-} BCOp;
-
-LJ_STATIC_ASSERT((int)BC_ISEQV+1 == (int)BC_ISNEV);
-LJ_STATIC_ASSERT(((int)BC_ISEQV^1) == (int)BC_ISNEV);
-LJ_STATIC_ASSERT(((int)BC_ISEQS^1) == (int)BC_ISNES);
-LJ_STATIC_ASSERT(((int)BC_ISEQN^1) == (int)BC_ISNEN);
-LJ_STATIC_ASSERT(((int)BC_ISEQP^1) == (int)BC_ISNEP);
-LJ_STATIC_ASSERT(((int)BC_ISLT^1) == (int)BC_ISGE);
-LJ_STATIC_ASSERT(((int)BC_ISLE^1) == (int)BC_ISGT);
-LJ_STATIC_ASSERT(((int)BC_ISLT^3) == (int)BC_ISGT);
-LJ_STATIC_ASSERT((int)BC_IST-(int)BC_ISTC == (int)BC_ISF-(int)BC_ISFC);
-LJ_STATIC_ASSERT((int)BC_CALLT-(int)BC_CALL == (int)BC_CALLMT-(int)BC_CALLM);
-LJ_STATIC_ASSERT((int)BC_CALLMT + 1 == (int)BC_CALLT);
-LJ_STATIC_ASSERT((int)BC_RETM + 1 == (int)BC_RET);
-LJ_STATIC_ASSERT((int)BC_FORL + 1 == (int)BC_IFORL);
-LJ_STATIC_ASSERT((int)BC_FORL + 2 == (int)BC_JFORL);
-LJ_STATIC_ASSERT((int)BC_ITERL + 1 == (int)BC_IITERL);
-LJ_STATIC_ASSERT((int)BC_ITERL + 2 == (int)BC_JITERL);
-LJ_STATIC_ASSERT((int)BC_LOOP + 1 == (int)BC_ILOOP);
-LJ_STATIC_ASSERT((int)BC_LOOP + 2 == (int)BC_JLOOP);
-LJ_STATIC_ASSERT((int)BC_FUNCF + 1 == (int)BC_IFUNCF);
-LJ_STATIC_ASSERT((int)BC_FUNCF + 2 == (int)BC_JFUNCF);
-LJ_STATIC_ASSERT((int)BC_FUNCV + 1 == (int)BC_IFUNCV);
-LJ_STATIC_ASSERT((int)BC_FUNCV + 2 == (int)BC_JFUNCV);
-
-/* This solves a circular dependency problem, change as needed. */
-#define FF_next_N	4
-
-/* Stack slots used by FORI/FORL, relative to operand A. */
-enum {
-  FORL_IDX, FORL_STOP, FORL_STEP, FORL_EXT
-};
-
-/* Bytecode operand modes. ORDER BCMode */
-typedef enum {
-  BCMnone, BCMdst, BCMbase, BCMvar, BCMrbase, BCMuv,  /* Mode A must be <= 7 */
-  BCMlit, BCMlits, BCMpri, BCMnum, BCMstr, BCMtab, BCMfunc, BCMjump, BCMcdata,
-  BCM_max
-} BCMode;
-#define BCM___		BCMnone
-
-#define bcmode_a(op)	((BCMode)(lj_bc_mode[op] & 7))
-#define bcmode_b(op)	((BCMode)((lj_bc_mode[op]>>3) & 15))
-#define bcmode_c(op)	((BCMode)((lj_bc_mode[op]>>7) & 15))
-#define bcmode_d(op)	bcmode_c(op)
-#define bcmode_hasd(op)	((lj_bc_mode[op] & (15<<3)) == (BCMnone<<3))
-#define bcmode_mm(op)	((MMS)(lj_bc_mode[op]>>11))
-
-#define BCMODE(name, ma, mb, mc, mm) \
-  (BCM##ma|(BCM##mb<<3)|(BCM##mc<<7)|(MM_##mm<<11)),
-#define BCMODE_FF	0
-
-static LJ_AINLINE int bc_isret(BCOp op)
-{
-  return (op == BC_RETM || op == BC_RET || op == BC_RET0 || op == BC_RET1);
-}
-
-LJ_DATA const uint16_t lj_bc_mode[];
-LJ_DATA const uint16_t lj_bc_ofs[];
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_bcdump.h b/dependencies2013/win32/include/luajit/lj_bcdump.h
deleted file mode 100644
index ba53c0a1..00000000
--- a/dependencies2013/win32/include/luajit/lj_bcdump.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-** Bytecode dump definitions.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_BCDUMP_H
-#define _LJ_BCDUMP_H
-
-#include "lj_obj.h"
-#include "lj_lex.h"
-
-/* -- Bytecode dump format ------------------------------------------------ */
-
-/*
-** dump   = header proto+ 0U
-** header = ESC 'L' 'J' versionB flagsU [namelenU nameB*]
-** proto  = lengthU pdata
-** pdata  = phead bcinsW* uvdataH* kgc* knum* [debugB*]
-** phead  = flagsB numparamsB framesizeB numuvB numkgcU numknU numbcU
-**          [debuglenU [firstlineU numlineU]]
-** kgc    = kgctypeU { ktab | (loU hiU) | (rloU rhiU iloU ihiU) | strB* }
-** knum   = intU0 | (loU1 hiU)
-** ktab   = narrayU nhashU karray* khash*
-** karray = ktabk
-** khash  = ktabk ktabk
-** ktabk  = ktabtypeU { intU | (loU hiU) | strB* }
-**
-** B = 8 bit, H = 16 bit, W = 32 bit, U = ULEB128 of W, U0/U1 = ULEB128 of W+1
-*/
-
-/* Bytecode dump header. */
-#define BCDUMP_HEAD1		0x1b
-#define BCDUMP_HEAD2		0x4c
-#define BCDUMP_HEAD3		0x4a
-
-/* If you perform *any* kind of private modifications to the bytecode itself
-** or to the dump format, you *must* set BCDUMP_VERSION to 0x80 or higher.
-*/
-#define BCDUMP_VERSION		1
-
-/* Compatibility flags. */
-#define BCDUMP_F_BE		0x01
-#define BCDUMP_F_STRIP		0x02
-#define BCDUMP_F_FFI		0x04
-
-#define BCDUMP_F_KNOWN		(BCDUMP_F_FFI*2-1)
-
-/* Type codes for the GC constants of a prototype. Plus length for strings. */
-enum {
-  BCDUMP_KGC_CHILD, BCDUMP_KGC_TAB, BCDUMP_KGC_I64, BCDUMP_KGC_U64,
-  BCDUMP_KGC_COMPLEX, BCDUMP_KGC_STR
-};
-
-/* Type codes for the keys/values of a constant table. */
-enum {
-  BCDUMP_KTAB_NIL, BCDUMP_KTAB_FALSE, BCDUMP_KTAB_TRUE,
-  BCDUMP_KTAB_INT, BCDUMP_KTAB_NUM, BCDUMP_KTAB_STR
-};
-
-/* -- Bytecode reader/writer ---------------------------------------------- */
-
-LJ_FUNC int lj_bcwrite(lua_State *L, GCproto *pt, lua_Writer writer,
-		       void *data, int strip);
-LJ_FUNC GCproto *lj_bcread(LexState *ls);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_carith.h b/dependencies2013/win32/include/luajit/lj_carith.h
deleted file mode 100644
index 3c155910..00000000
--- a/dependencies2013/win32/include/luajit/lj_carith.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-** C data arithmetic.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CARITH_H
-#define _LJ_CARITH_H
-
-#include "lj_obj.h"
-
-#if LJ_HASFFI
-
-LJ_FUNC int lj_carith_op(lua_State *L, MMS mm);
-
-#if LJ_32 && LJ_HASJIT
-LJ_FUNC int64_t lj_carith_mul64(int64_t x, int64_t k);
-#endif
-LJ_FUNC uint64_t lj_carith_divu64(uint64_t a, uint64_t b);
-LJ_FUNC int64_t lj_carith_divi64(int64_t a, int64_t b);
-LJ_FUNC uint64_t lj_carith_modu64(uint64_t a, uint64_t b);
-LJ_FUNC int64_t lj_carith_modi64(int64_t a, int64_t b);
-LJ_FUNC uint64_t lj_carith_powu64(uint64_t x, uint64_t k);
-LJ_FUNC int64_t lj_carith_powi64(int64_t x, int64_t k);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_ccall.h b/dependencies2013/win32/include/luajit/lj_ccall.h
deleted file mode 100644
index 9089e6c7..00000000
--- a/dependencies2013/win32/include/luajit/lj_ccall.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-** FFI C call handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CCALL_H
-#define _LJ_CCALL_H
-
-#include "lj_obj.h"
-#include "lj_ctype.h"
-
-#if LJ_HASFFI
-
-/* -- C calling conventions ----------------------------------------------- */
-
-#if LJ_TARGET_X86ORX64
-
-#if LJ_TARGET_X86
-#define CCALL_NARG_GPR		2	/* For fastcall arguments. */
-#define CCALL_NARG_FPR		0
-#define CCALL_NRET_GPR		2
-#define CCALL_NRET_FPR		1	/* For FP results on x87 stack. */
-#define CCALL_ALIGN_STACKARG	0	/* Don't align argument on stack. */
-#elif LJ_ABI_WIN
-#define CCALL_NARG_GPR		4
-#define CCALL_NARG_FPR		4
-#define CCALL_NRET_GPR		1
-#define CCALL_NRET_FPR		1
-#define CCALL_SPS_EXTRA		4
-#else
-#define CCALL_NARG_GPR		6
-#define CCALL_NARG_FPR		8
-#define CCALL_NRET_GPR		2
-#define CCALL_NRET_FPR		2
-#define CCALL_VECTOR_REG	1	/* Pass vectors in registers. */
-#endif
-
-#define CCALL_SPS_FREE		1
-#define CCALL_ALIGN_CALLSTATE	16
-
-typedef LJ_ALIGN(16) union FPRArg {
-  double d[2];
-  float f[4];
-  uint8_t b[16];
-  uint16_t s[8];
-  int i[4];
-  int64_t l[2];
-} FPRArg;
-
-typedef intptr_t GPRArg;
-
-#elif LJ_TARGET_ARM
-
-#define CCALL_NARG_GPR		4
-#define CCALL_NRET_GPR		2	/* For softfp double. */
-#if LJ_ABI_SOFTFP
-#define CCALL_NARG_FPR		0
-#define CCALL_NRET_FPR		0
-#else
-#define CCALL_NARG_FPR		8
-#define CCALL_NRET_FPR		4
-#endif
-#define CCALL_SPS_FREE		0
-
-typedef intptr_t GPRArg;
-typedef union FPRArg {
-  double d;
-  float f[2];
-} FPRArg;
-
-#elif LJ_TARGET_PPC
-
-#define CCALL_NARG_GPR		8
-#define CCALL_NARG_FPR		8
-#define CCALL_NRET_GPR		4	/* For complex double. */
-#define CCALL_NRET_FPR		1
-#define CCALL_SPS_EXTRA		4
-#define CCALL_SPS_FREE		0
-
-typedef intptr_t GPRArg;
-typedef double FPRArg;
-
-#elif LJ_TARGET_PPCSPE
-
-#define CCALL_NARG_GPR		8
-#define CCALL_NARG_FPR		0
-#define CCALL_NRET_GPR		4	/* For softfp complex double. */
-#define CCALL_NRET_FPR		0
-#define CCALL_SPS_FREE		0	/* NYI */
-
-typedef intptr_t GPRArg;
-
-#elif LJ_TARGET_MIPS
-
-#define CCALL_NARG_GPR		4
-#define CCALL_NARG_FPR		2
-#define CCALL_NRET_GPR		2
-#define CCALL_NRET_FPR		2
-#define CCALL_SPS_EXTRA		7
-#define CCALL_SPS_FREE		1
-
-typedef intptr_t GPRArg;
-typedef union FPRArg {
-  double d;
-  struct { LJ_ENDIAN_LOHI(float f; , float g;) };
-} FPRArg;
-
-#else
-#error "Missing calling convention definitions for this architecture"
-#endif
-
-#ifndef CCALL_SPS_EXTRA
-#define CCALL_SPS_EXTRA		0
-#endif
-#ifndef CCALL_VECTOR_REG
-#define CCALL_VECTOR_REG	0
-#endif
-#ifndef CCALL_ALIGN_STACKARG
-#define CCALL_ALIGN_STACKARG	1
-#endif
-#ifndef CCALL_ALIGN_CALLSTATE
-#define CCALL_ALIGN_CALLSTATE	8
-#endif
-
-#define CCALL_NUM_GPR \
-  (CCALL_NARG_GPR > CCALL_NRET_GPR ? CCALL_NARG_GPR : CCALL_NRET_GPR)
-#define CCALL_NUM_FPR \
-  (CCALL_NARG_FPR > CCALL_NRET_FPR ? CCALL_NARG_FPR : CCALL_NRET_FPR)
-
-/* Check against constants in lj_ctype.h. */
-LJ_STATIC_ASSERT(CCALL_NUM_GPR <= CCALL_MAX_GPR);
-LJ_STATIC_ASSERT(CCALL_NUM_FPR <= CCALL_MAX_FPR);
-
-#define CCALL_MAXSTACK		32
-
-/* -- C call state -------------------------------------------------------- */
-
-typedef LJ_ALIGN(CCALL_ALIGN_CALLSTATE) struct CCallState {
-  void (*func)(void);		/* Pointer to called function. */
-  uint32_t spadj;		/* Stack pointer adjustment. */
-  uint8_t nsp;			/* Number of stack slots. */
-  uint8_t retref;		/* Return value by reference. */
-#if LJ_TARGET_X64
-  uint8_t ngpr;			/* Number of arguments in GPRs. */
-  uint8_t nfpr;			/* Number of arguments in FPRs. */
-#elif LJ_TARGET_X86
-  uint8_t resx87;		/* Result on x87 stack: 1:float, 2:double. */
-#elif LJ_TARGET_PPC
-  uint8_t nfpr;			/* Number of arguments in FPRs. */
-#endif
-#if LJ_32
-  int32_t align1;
-#endif
-#if CCALL_NUM_FPR
-  FPRArg fpr[CCALL_NUM_FPR];	/* Arguments/results in FPRs. */
-#endif
-  GPRArg gpr[CCALL_NUM_GPR];	/* Arguments/results in GPRs. */
-  GPRArg stack[CCALL_MAXSTACK];	/* Stack slots. */
-} CCallState;
-
-/* -- C call handling ----------------------------------------------------- */
-
-/* Really belongs to lj_vm.h. */
-LJ_ASMF void LJ_FASTCALL lj_vm_ffi_call(CCallState *cc);
-
-LJ_FUNC CTypeID lj_ccall_ctid_vararg(CTState *cts, cTValue *o);
-LJ_FUNC int lj_ccall_func(lua_State *L, GCcdata *cd);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_ccallback.h b/dependencies2013/win32/include/luajit/lj_ccallback.h
deleted file mode 100644
index a8cdad38..00000000
--- a/dependencies2013/win32/include/luajit/lj_ccallback.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-** FFI C callback handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CCALLBACK_H
-#define _LJ_CCALLBACK_H
-
-#include "lj_obj.h"
-#include "lj_ctype.h"
-
-#if LJ_HASFFI
-
-/* Really belongs to lj_vm.h. */
-LJ_ASMF void lj_vm_ffi_callback(void);
-
-LJ_FUNC MSize lj_ccallback_ptr2slot(CTState *cts, void *p);
-LJ_FUNCA lua_State * LJ_FASTCALL lj_ccallback_enter(CTState *cts, void *cf);
-LJ_FUNCA void LJ_FASTCALL lj_ccallback_leave(CTState *cts, TValue *o);
-LJ_FUNC void *lj_ccallback_new(CTState *cts, CType *ct, GCfunc *fn);
-LJ_FUNC void lj_ccallback_mcode_free(CTState *cts);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_cconv.h b/dependencies2013/win32/include/luajit/lj_cconv.h
deleted file mode 100644
index 0a0b66c9..00000000
--- a/dependencies2013/win32/include/luajit/lj_cconv.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-** C type conversions.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CCONV_H
-#define _LJ_CCONV_H
-
-#include "lj_obj.h"
-#include "lj_ctype.h"
-
-#if LJ_HASFFI
-
-/* Compressed C type index. ORDER CCX. */
-enum {
-  CCX_B,	/* Bool. */
-  CCX_I,	/* Integer. */
-  CCX_F,	/* Floating-point number. */
-  CCX_C,	/* Complex. */
-  CCX_V,	/* Vector. */
-  CCX_P,	/* Pointer. */
-  CCX_A,	/* Refarray. */
-  CCX_S		/* Struct/union. */
-};
-
-/* Convert C type info to compressed C type index. ORDER CT. ORDER CCX. */
-static LJ_AINLINE uint32_t cconv_idx(CTInfo info)
-{
-  uint32_t idx = ((info >> 26) & 15u);  /* Dispatch bits. */
-  lua_assert(ctype_type(info) <= CT_MAYCONVERT);
-#if LJ_64
-  idx = ((uint32_t)(U64x(f436fff5,fff7f021) >> 4*idx) & 15u);
-#else
-  idx = (((idx < 8 ? 0xfff7f021u : 0xf436fff5) >> 4*(idx & 7u)) & 15u);
-#endif
-  lua_assert(idx < 8);
-  return idx;
-}
-
-#define cconv_idx2(dinfo, sinfo) \
-  ((cconv_idx((dinfo)) << 3) + cconv_idx((sinfo)))
-
-#define CCX(dst, src)		((CCX_##dst << 3) + CCX_##src)
-
-/* Conversion flags. */
-#define CCF_CAST	0x00000001u
-#define CCF_FROMTV	0x00000002u
-#define CCF_SAME	0x00000004u
-#define CCF_IGNQUAL	0x00000008u
-
-#define CCF_ARG_SHIFT	8
-#define CCF_ARG(n)	((n) << CCF_ARG_SHIFT)
-#define CCF_GETARG(f)	((f) >> CCF_ARG_SHIFT)
-
-LJ_FUNC int lj_cconv_compatptr(CTState *cts, CType *d, CType *s, CTInfo flags);
-LJ_FUNC void lj_cconv_ct_ct(CTState *cts, CType *d, CType *s,
-			    uint8_t *dp, uint8_t *sp, CTInfo flags);
-LJ_FUNC int lj_cconv_tv_ct(CTState *cts, CType *s, CTypeID sid,
-			   TValue *o, uint8_t *sp);
-LJ_FUNC int lj_cconv_tv_bf(CTState *cts, CType *s, TValue *o, uint8_t *sp);
-LJ_FUNC void lj_cconv_ct_tv(CTState *cts, CType *d,
-			    uint8_t *dp, TValue *o, CTInfo flags);
-LJ_FUNC void lj_cconv_bf_tv(CTState *cts, CType *d, uint8_t *dp, TValue *o);
-LJ_FUNC int lj_cconv_multi_init(CTState *cts, CType *d, TValue *o);
-LJ_FUNC void lj_cconv_ct_init(CTState *cts, CType *d, CTSize sz,
-			      uint8_t *dp, TValue *o, MSize len);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_cdata.h b/dependencies2013/win32/include/luajit/lj_cdata.h
deleted file mode 100644
index 4bb65db2..00000000
--- a/dependencies2013/win32/include/luajit/lj_cdata.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-** C data management.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CDATA_H
-#define _LJ_CDATA_H
-
-#include "lj_obj.h"
-#include "lj_gc.h"
-#include "lj_ctype.h"
-
-#if LJ_HASFFI
-
-/* Get C data pointer. */
-static LJ_AINLINE void *cdata_getptr(void *p, CTSize sz)
-{
-  if (LJ_64 && sz == 4) {  /* Support 32 bit pointers on 64 bit targets. */
-    return ((void *)(uintptr_t)*(uint32_t *)p);
-  } else {
-    lua_assert(sz == CTSIZE_PTR);
-    return *(void **)p;
-  }
-}
-
-/* Set C data pointer. */
-static LJ_AINLINE void cdata_setptr(void *p, CTSize sz, const void *v)
-{
-  if (LJ_64 && sz == 4) {  /* Support 32 bit pointers on 64 bit targets. */
-    *(uint32_t *)p = (uint32_t)(uintptr_t)v;
-  } else {
-    lua_assert(sz == CTSIZE_PTR);
-    *(void **)p = (void *)v;
-  }
-}
-
-/* Allocate fixed-size C data object. */
-static LJ_AINLINE GCcdata *lj_cdata_new(CTState *cts, CTypeID id, CTSize sz)
-{
-  GCcdata *cd;
-#ifdef LUA_USE_ASSERT
-  CType *ct = ctype_raw(cts, id);
-  lua_assert((ctype_hassize(ct->info) ? ct->size : CTSIZE_PTR) == sz);
-#endif
-  cd = (GCcdata *)lj_mem_newgco(cts->L, sizeof(GCcdata) + sz);
-  cd->gct = ~LJ_TCDATA;
-  cd->ctypeid = ctype_check(cts, id);
-  return cd;
-}
-
-/* Variant which works without a valid CTState. */
-static LJ_AINLINE GCcdata *lj_cdata_new_(lua_State *L, CTypeID id, CTSize sz)
-{
-  GCcdata *cd = (GCcdata *)lj_mem_newgco(L, sizeof(GCcdata) + sz);
-  cd->gct = ~LJ_TCDATA;
-  cd->ctypeid = id;
-  return cd;
-}
-
-LJ_FUNC GCcdata *lj_cdata_newref(CTState *cts, const void *pp, CTypeID id);
-LJ_FUNC GCcdata *lj_cdata_newv(CTState *cts, CTypeID id, CTSize sz,
-			       CTSize align);
-
-LJ_FUNC void LJ_FASTCALL lj_cdata_free(global_State *g, GCcdata *cd);
-LJ_FUNCA TValue * LJ_FASTCALL lj_cdata_setfin(lua_State *L, GCcdata *cd);
-
-LJ_FUNC CType *lj_cdata_index(CTState *cts, GCcdata *cd, cTValue *key,
-			      uint8_t **pp, CTInfo *qual);
-LJ_FUNC int lj_cdata_get(CTState *cts, CType *s, TValue *o, uint8_t *sp);
-LJ_FUNC void lj_cdata_set(CTState *cts, CType *d, uint8_t *dp, TValue *o,
-			  CTInfo qual);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_char.h b/dependencies2013/win32/include/luajit/lj_char.h
deleted file mode 100644
index c3c86d34..00000000
--- a/dependencies2013/win32/include/luajit/lj_char.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-** Character types.
-** Donated to the public domain.
-*/
-
-#ifndef _LJ_CHAR_H
-#define _LJ_CHAR_H
-
-#include "lj_def.h"
-
-#define LJ_CHAR_CNTRL	0x01
-#define LJ_CHAR_SPACE	0x02
-#define LJ_CHAR_PUNCT	0x04
-#define LJ_CHAR_DIGIT	0x08
-#define LJ_CHAR_XDIGIT	0x10
-#define LJ_CHAR_UPPER	0x20
-#define LJ_CHAR_LOWER	0x40
-#define LJ_CHAR_IDENT	0x80
-#define LJ_CHAR_ALPHA	(LJ_CHAR_LOWER|LJ_CHAR_UPPER)
-#define LJ_CHAR_ALNUM	(LJ_CHAR_ALPHA|LJ_CHAR_DIGIT)
-#define LJ_CHAR_GRAPH	(LJ_CHAR_ALNUM|LJ_CHAR_PUNCT)
-
-/* Only pass -1 or 0..255 to these macros. Never pass a signed char! */
-#define lj_char_isa(c, t)	((lj_char_bits+1)[(c)] & t)
-#define lj_char_iscntrl(c)	lj_char_isa((c), LJ_CHAR_CNTRL)
-#define lj_char_isspace(c)	lj_char_isa((c), LJ_CHAR_SPACE)
-#define lj_char_ispunct(c)	lj_char_isa((c), LJ_CHAR_PUNCT)
-#define lj_char_isdigit(c)	lj_char_isa((c), LJ_CHAR_DIGIT)
-#define lj_char_isxdigit(c)	lj_char_isa((c), LJ_CHAR_XDIGIT)
-#define lj_char_isupper(c)	lj_char_isa((c), LJ_CHAR_UPPER)
-#define lj_char_islower(c)	lj_char_isa((c), LJ_CHAR_LOWER)
-#define lj_char_isident(c)	lj_char_isa((c), LJ_CHAR_IDENT)
-#define lj_char_isalpha(c)	lj_char_isa((c), LJ_CHAR_ALPHA)
-#define lj_char_isalnum(c)	lj_char_isa((c), LJ_CHAR_ALNUM)
-#define lj_char_isgraph(c)	lj_char_isa((c), LJ_CHAR_GRAPH)
-
-#define lj_char_toupper(c)	((c) - (lj_char_islower(c) >> 1))
-#define lj_char_tolower(c)	((c) + lj_char_isupper(c))
-
-LJ_DATA const uint8_t lj_char_bits[257];
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_clib.h b/dependencies2013/win32/include/luajit/lj_clib.h
deleted file mode 100644
index fcc9dac5..00000000
--- a/dependencies2013/win32/include/luajit/lj_clib.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-** FFI C library loader.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CLIB_H
-#define _LJ_CLIB_H
-
-#include "lj_obj.h"
-
-#if LJ_HASFFI
-
-/* Namespace for C library indexing. */
-#define CLNS_INDEX	((1u<<CT_FUNC)|(1u<<CT_EXTERN)|(1u<<CT_CONSTVAL))
-
-/* C library namespace. */
-typedef struct CLibrary {
-  void *handle;		/* Opaque handle for dynamic library loader. */
-  GCtab *cache;		/* Cache for resolved symbols. Anchored in ud->env. */
-} CLibrary;
-
-LJ_FUNC TValue *lj_clib_index(lua_State *L, CLibrary *cl, GCstr *name);
-LJ_FUNC void lj_clib_load(lua_State *L, GCtab *mt, GCstr *name, int global);
-LJ_FUNC void lj_clib_unload(CLibrary *cl);
-LJ_FUNC void lj_clib_default(lua_State *L, GCtab *mt);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_cparse.h b/dependencies2013/win32/include/luajit/lj_cparse.h
deleted file mode 100644
index bad1060b..00000000
--- a/dependencies2013/win32/include/luajit/lj_cparse.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-** C declaration parser.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CPARSE_H
-#define _LJ_CPARSE_H
-
-#include "lj_obj.h"
-#include "lj_ctype.h"
-
-#if LJ_HASFFI
-
-/* C parser limits. */
-#define CPARSE_MAX_BUF		32768	/* Max. token buffer size. */
-#define CPARSE_MAX_DECLSTACK	100	/* Max. declaration stack depth. */
-#define CPARSE_MAX_DECLDEPTH	20	/* Max. recursive declaration depth. */
-#define CPARSE_MAX_PACKSTACK	7	/* Max. pack pragma stack depth. */
-
-/* Flags for C parser mode. */
-#define CPARSE_MODE_MULTI	1	/* Process multiple declarations. */
-#define CPARSE_MODE_ABSTRACT	2	/* Accept abstract declarators. */
-#define CPARSE_MODE_DIRECT	4	/* Accept direct declarators. */
-#define CPARSE_MODE_FIELD	8	/* Accept field width in bits, too. */
-#define CPARSE_MODE_NOIMPLICIT	16	/* Reject implicit declarations. */
-#define CPARSE_MODE_SKIP	32	/* Skip definitions, ignore errors. */
-
-typedef int CPChar;	/* C parser character. Unsigned ext. from char. */
-typedef int CPToken;	/* C parser token. */
-
-/* C parser internal value representation. */
-typedef struct CPValue {
-  union {
-    int32_t i32;	/* Value for CTID_INT32. */
-    uint32_t u32;	/* Value for CTID_UINT32. */
-  };
-  CTypeID id;		/* C Type ID of the value. */
-} CPValue;
-
-/* C parser state. */
-typedef struct CPState {
-  CPChar c;		/* Current character. */
-  CPToken tok;		/* Current token. */
-  CPValue val;		/* Token value. */
-  GCstr *str;		/* Interned string of identifier/keyword. */
-  CType *ct;		/* C type table entry. */
-  const char *p;	/* Current position in input buffer. */
-  SBuf sb;		/* String buffer for tokens. */
-  lua_State *L;		/* Lua state. */
-  CTState *cts;		/* C type state. */
-  TValue *param;	/* C type parameters. */
-  const char *srcname;	/* Current source name. */
-  BCLine linenumber;	/* Input line counter. */
-  int depth;		/* Recursive declaration depth. */
-  uint32_t tmask;	/* Type mask for next identifier. */
-  uint32_t mode;	/* C parser mode. */
-  uint8_t packstack[CPARSE_MAX_PACKSTACK];  /* Stack for pack pragmas. */
-  uint8_t curpack;	/* Current position in pack pragma stack. */
-} CPState;
-
-LJ_FUNC int lj_cparse(CPState *cp);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_crecord.h b/dependencies2013/win32/include/luajit/lj_crecord.h
deleted file mode 100644
index 8e0afd18..00000000
--- a/dependencies2013/win32/include/luajit/lj_crecord.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-** Trace recorder for C data operations.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CRECORD_H
-#define _LJ_CRECORD_H
-
-#include "lj_obj.h"
-#include "lj_jit.h"
-#include "lj_ffrecord.h"
-
-#if LJ_HASJIT && LJ_HASFFI
-LJ_FUNC void LJ_FASTCALL recff_cdata_index(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_cdata_call(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_clib_index(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_new(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_errno(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_string(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_copy(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_fill(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_typeof(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_istype(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_abi(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_xof(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL recff_ffi_gc(jit_State *J, RecordFFData *rd);
-LJ_FUNC void LJ_FASTCALL lj_crecord_tonumber(jit_State *J, RecordFFData *rd);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_ctype.h b/dependencies2013/win32/include/luajit/lj_ctype.h
deleted file mode 100644
index 2aefd3b6..00000000
--- a/dependencies2013/win32/include/luajit/lj_ctype.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-** C type management.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_CTYPE_H
-#define _LJ_CTYPE_H
-
-#include "lj_obj.h"
-#include "lj_gc.h"
-
-#if LJ_HASFFI
-
-/* -- C type definitions -------------------------------------------------- */
-
-/* C type numbers. Highest 4 bits of C type info. ORDER CT. */
-enum {
-  /* Externally visible types. */
-  CT_NUM,		/* Integer or floating-point numbers. */
-  CT_STRUCT,		/* Struct or union. */
-  CT_PTR,		/* Pointer or reference. */
-  CT_ARRAY,		/* Array or complex type. */
-  CT_MAYCONVERT = CT_ARRAY,
-  CT_VOID,		/* Void type. */
-  CT_ENUM,		/* Enumeration. */
-  CT_HASSIZE = CT_ENUM,  /* Last type where ct->size holds the actual size. */
-  CT_FUNC,		/* Function. */
-  CT_TYPEDEF,		/* Typedef. */
-  CT_ATTRIB,		/* Miscellaneous attributes. */
-  /* Internal element types. */
-  CT_FIELD,		/* Struct/union field or function parameter. */
-  CT_BITFIELD,		/* Struct/union bitfield. */
-  CT_CONSTVAL,		/* Constant value. */
-  CT_EXTERN,		/* External reference. */
-  CT_KW			/* Keyword. */
-};
-
-LJ_STATIC_ASSERT(((int)CT_PTR & (int)CT_ARRAY) == CT_PTR);
-LJ_STATIC_ASSERT(((int)CT_STRUCT & (int)CT_ARRAY) == CT_STRUCT);
-
-/*
-**  ---------- info ------------
-** |type      flags...  A   cid | size   |  sib  | next  | name  |
-** +----------------------------+--------+-------+-------+-------+--
-** |NUM       BFcvUL..  A       | size   |       | type  |       |
-** |STRUCT    ..cvU..V  A       | size   | field | name? | name? |
-** |PTR       ..cvR...  A   cid | size   |       | type  |       |
-** |ARRAY     VCcv...V  A   cid | size   |       | type  |       |
-** |VOID      ..cv....  A       | size   |       | type  |       |
-** |ENUM                A   cid | size   | const | name? | name? |
-** |FUNC      ....VS.. cc   cid | nargs  | field | name? | name? |
-** |TYPEDEF                 cid |        |       | name  | name  |
-** |ATTRIB        attrnum   cid | attr   | sib?  | type? |       |
-** |FIELD                   cid | offset | field |       | name? |
-** |BITFIELD  B.cvU csz bsz pos | offset | field |       | name? |
-** |CONSTVAL    c           cid | value  | const | name  | name  |
-** |EXTERN                  cid |        | sib?  | name  | name  |
-** |KW                      tok | size   |       | name  | name  |
-** +----------------------------+--------+-------+-------+-------+--
-**        ^^  ^^--- bits used for C type conversion dispatch
-*/
-
-/* C type info flags.     TFFArrrr  */
-#define CTF_BOOL	0x08000000u	/* Boolean: NUM, BITFIELD. */
-#define CTF_FP		0x04000000u	/* Floating-point: NUM. */
-#define CTF_CONST	0x02000000u	/* Const qualifier. */
-#define CTF_VOLATILE	0x01000000u	/* Volatile qualifier. */
-#define CTF_UNSIGNED	0x00800000u	/* Unsigned: NUM, BITFIELD. */
-#define CTF_LONG	0x00400000u	/* Long: NUM. */
-#define CTF_VLA		0x00100000u	/* Variable-length: ARRAY, STRUCT. */
-#define CTF_REF		0x00800000u	/* Reference: PTR. */
-#define CTF_VECTOR	0x08000000u	/* Vector: ARRAY. */
-#define CTF_COMPLEX	0x04000000u	/* Complex: ARRAY. */
-#define CTF_UNION	0x00800000u	/* Union: STRUCT. */
-#define CTF_VARARG	0x00800000u	/* Vararg: FUNC. */
-#define CTF_SSEREGPARM	0x00400000u	/* SSE register parameters: FUNC. */
-
-#define CTF_QUAL	(CTF_CONST|CTF_VOLATILE)
-#define CTF_ALIGN	(CTMASK_ALIGN<<CTSHIFT_ALIGN)
-#define CTF_UCHAR	((char)-1 > 0 ? CTF_UNSIGNED : 0)
-
-/* Flags used in parser.  .F.Ammvf   cp->attr  */
-#define CTFP_ALIGNED	0x00000001u	/* cp->attr + ALIGN */
-#define CTFP_PACKED	0x00000002u	/* cp->attr */
-/*                        ...C...f   cp->fattr */
-#define CTFP_CCONV	0x00000001u	/* cp->fattr + CCONV/[SSE]REGPARM */
-
-/* C type info bitfields. */
-#define CTMASK_CID	0x0000ffffu	/* Max. 65536 type IDs. */
-#define CTMASK_NUM	0xf0000000u	/* Max. 16 type numbers. */
-#define CTSHIFT_NUM	28
-#define CTMASK_ALIGN	15		/* Max. alignment is 2^15. */
-#define CTSHIFT_ALIGN	16
-#define CTMASK_ATTRIB	255		/* Max. 256 attributes. */
-#define CTSHIFT_ATTRIB	16
-#define CTMASK_CCONV	3		/* Max. 4 calling conventions. */
-#define CTSHIFT_CCONV	16
-#define CTMASK_REGPARM	3		/* Max. 0-3 regparms. */
-#define CTSHIFT_REGPARM	18
-/* Bitfields only used in parser. */
-#define CTMASK_VSIZEP	15		/* Max. vector size is 2^15. */
-#define CTSHIFT_VSIZEP	4
-#define CTMASK_MSIZEP	255		/* Max. type size (via mode) is 128. */
-#define CTSHIFT_MSIZEP	8
-
-/* Info bits for BITFIELD. Max. size of bitfield is 64 bits. */
-#define CTBSZ_MAX	32		/* Max. size of bitfield is 32 bit. */
-#define CTBSZ_FIELD	127		/* Temp. marker for regular field. */
-#define CTMASK_BITPOS	127
-#define CTMASK_BITBSZ	127
-#define CTMASK_BITCSZ	127
-#define CTSHIFT_BITPOS	0
-#define CTSHIFT_BITBSZ	8
-#define CTSHIFT_BITCSZ	16
-
-#define CTF_INSERT(info, field, val) \
-  info = (info & ~(CTMASK_##field<<CTSHIFT_##field)) | \
-	  (((CTSize)(val) & CTMASK_##field) << CTSHIFT_##field)
-
-/* Calling conventions. ORDER CC */
-enum { CTCC_CDECL, CTCC_THISCALL, CTCC_FASTCALL, CTCC_STDCALL };
-
-/* Attribute numbers. */
-enum {
-  CTA_NONE,		/* Ignored attribute. Must be zero. */
-  CTA_QUAL,		/* Unmerged qualifiers. */
-  CTA_ALIGN,		/* Alignment override. */
-  CTA_SUBTYPE,		/* Transparent sub-type. */
-  CTA_REDIR,		/* Redirected symbol name. */
-  CTA_BAD,		/* To catch bad IDs. */
-  CTA__MAX
-};
-
-/* Special sizes. */
-#define CTSIZE_INVALID	0xffffffffu
-
-typedef uint32_t CTInfo;	/* Type info. */
-typedef uint32_t CTSize;	/* Type size. */
-typedef uint32_t CTypeID;	/* Type ID. */
-typedef uint16_t CTypeID1;	/* Minimum-sized type ID. */
-
-/* C type table element. */
-typedef struct CType {
-  CTInfo info;		/* Type info. */
-  CTSize size;		/* Type size or other info. */
-  CTypeID1 sib;		/* Sibling element. */
-  CTypeID1 next;	/* Next element in hash chain. */
-  GCRef name;		/* Element name (GCstr). */
-} CType;
-
-#define CTHASH_SIZE	128	/* Number of hash anchors. */
-#define CTHASH_MASK	(CTHASH_SIZE-1)
-
-/* Simplify target-specific configuration. Checked in lj_ccall.h. */
-#define CCALL_MAX_GPR		8
-#define CCALL_MAX_FPR		8
-
-typedef LJ_ALIGN(8) union FPRCBArg { double d; float f[2]; } FPRCBArg;
-
-/* C callback state. Defined here, to avoid dragging in lj_ccall.h. */
-
-typedef LJ_ALIGN(8) struct CCallback {
-  FPRCBArg fpr[CCALL_MAX_FPR];	/* Arguments/results in FPRs. */
-  intptr_t gpr[CCALL_MAX_GPR];	/* Arguments/results in GPRs. */
-  intptr_t *stack;		/* Pointer to arguments on stack. */
-  void *mcode;			/* Machine code for callback func. pointers. */
-  CTypeID1 *cbid;		/* Callback type table. */
-  MSize sizeid;			/* Size of callback type table. */
-  MSize topid;			/* Highest unused callback type table slot. */
-  MSize slot;			/* Current callback slot. */
-} CCallback;
-
-/* C type state. */
-typedef struct CTState {
-  CType *tab;		/* C type table. */
-  CTypeID top;		/* Current top of C type table. */
-  MSize sizetab;	/* Size of C type table. */
-  lua_State *L;		/* Lua state (needed for errors and allocations). */
-  global_State *g;	/* Global state. */
-  GCtab *finalizer;	/* Map of cdata to finalizer. */
-  GCtab *miscmap;	/* Map of -CTypeID to metatable and cb slot to func. */
-  CCallback cb;		/* Temporary callback state. */
-  CTypeID1 hash[CTHASH_SIZE];  /* Hash anchors for C type table. */
-} CTState;
-
-#define CTINFO(ct, flags)	(((CTInfo)(ct) << CTSHIFT_NUM) + (flags))
-#define CTALIGN(al)		((CTSize)(al) << CTSHIFT_ALIGN)
-#define CTATTRIB(at)		((CTInfo)(at) << CTSHIFT_ATTRIB)
-
-#define ctype_type(info)	((info) >> CTSHIFT_NUM)
-#define ctype_cid(info)		((CTypeID)((info) & CTMASK_CID))
-#define ctype_align(info)	(((info) >> CTSHIFT_ALIGN) & CTMASK_ALIGN)
-#define ctype_attrib(info)	(((info) >> CTSHIFT_ATTRIB) & CTMASK_ATTRIB)
-#define ctype_bitpos(info)	(((info) >> CTSHIFT_BITPOS) & CTMASK_BITPOS)
-#define ctype_bitbsz(info)	(((info) >> CTSHIFT_BITBSZ) & CTMASK_BITBSZ)
-#define ctype_bitcsz(info)	(((info) >> CTSHIFT_BITCSZ) & CTMASK_BITCSZ)
-#define ctype_vsizeP(info)	(((info) >> CTSHIFT_VSIZEP) & CTMASK_VSIZEP)
-#define ctype_msizeP(info)	(((info) >> CTSHIFT_MSIZEP) & CTMASK_MSIZEP)
-#define ctype_cconv(info)	(((info) >> CTSHIFT_CCONV) & CTMASK_CCONV)
-
-/* Simple type checks. */
-#define ctype_isnum(info)	(ctype_type((info)) == CT_NUM)
-#define ctype_isvoid(info)	(ctype_type((info)) == CT_VOID)
-#define ctype_isptr(info)	(ctype_type((info)) == CT_PTR)
-#define ctype_isarray(info)	(ctype_type((info)) == CT_ARRAY)
-#define ctype_isstruct(info)	(ctype_type((info)) == CT_STRUCT)
-#define ctype_isfunc(info)	(ctype_type((info)) == CT_FUNC)
-#define ctype_isenum(info)	(ctype_type((info)) == CT_ENUM)
-#define ctype_istypedef(info)	(ctype_type((info)) == CT_TYPEDEF)
-#define ctype_isattrib(info)	(ctype_type((info)) == CT_ATTRIB)
-#define ctype_isfield(info)	(ctype_type((info)) == CT_FIELD)
-#define ctype_isbitfield(info)	(ctype_type((info)) == CT_BITFIELD)
-#define ctype_isconstval(info)	(ctype_type((info)) == CT_CONSTVAL)
-#define ctype_isextern(info)	(ctype_type((info)) == CT_EXTERN)
-#define ctype_hassize(info)	(ctype_type((info)) <= CT_HASSIZE)
-
-/* Combined type and flag checks. */
-#define ctype_isinteger(info) \
-  (((info) & (CTMASK_NUM|CTF_BOOL|CTF_FP)) == CTINFO(CT_NUM, 0))
-#define ctype_isinteger_or_bool(info) \
-  (((info) & (CTMASK_NUM|CTF_FP)) == CTINFO(CT_NUM, 0))
-#define ctype_isbool(info) \
-  (((info) & (CTMASK_NUM|CTF_BOOL)) == CTINFO(CT_NUM, CTF_BOOL))
-#define ctype_isfp(info) \
-  (((info) & (CTMASK_NUM|CTF_FP)) == CTINFO(CT_NUM, CTF_FP))
-
-#define ctype_ispointer(info) \
-  ((ctype_type(info) >> 1) == (CT_PTR >> 1))  /* Pointer or array. */
-#define ctype_isref(info) \
-  (((info) & (CTMASK_NUM|CTF_REF)) == CTINFO(CT_PTR, CTF_REF))
-
-#define ctype_isrefarray(info) \
-  (((info) & (CTMASK_NUM|CTF_VECTOR|CTF_COMPLEX)) == CTINFO(CT_ARRAY, 0))
-#define ctype_isvector(info) \
-  (((info) & (CTMASK_NUM|CTF_VECTOR)) == CTINFO(CT_ARRAY, CTF_VECTOR))
-#define ctype_iscomplex(info) \
-  (((info) & (CTMASK_NUM|CTF_COMPLEX)) == CTINFO(CT_ARRAY, CTF_COMPLEX))
-
-#define ctype_isvltype(info) \
-  (((info) & ((CTMASK_NUM|CTF_VLA) - (2u<<CTSHIFT_NUM))) == \
-   CTINFO(CT_STRUCT, CTF_VLA))  /* VL array or VL struct. */
-#define ctype_isvlarray(info) \
-  (((info) & (CTMASK_NUM|CTF_VLA)) == CTINFO(CT_ARRAY, CTF_VLA))
-
-#define ctype_isxattrib(info, at) \
-  (((info) & (CTMASK_NUM|CTATTRIB(CTMASK_ATTRIB))) == \
-   CTINFO(CT_ATTRIB, CTATTRIB(at)))
-
-/* Target-dependent sizes and alignments. */
-#if LJ_64
-#define CTSIZE_PTR	8
-#define CTALIGN_PTR	CTALIGN(3)
-#else
-#define CTSIZE_PTR	4
-#define CTALIGN_PTR	CTALIGN(2)
-#endif
-
-#define CTINFO_REF(ref) \
-  CTINFO(CT_PTR, (CTF_CONST|CTF_REF|CTALIGN_PTR) + (ref))
-
-#define CT_MEMALIGN	3	/* Alignment guaranteed by memory allocator. */
-
-/* -- Predefined types ---------------------------------------------------- */
-
-/* Target-dependent types. */
-#if LJ_TARGET_PPC || LJ_TARGET_PPCSPE
-#define CTTYDEFP(_) \
-  _(LINT32,		4,	CT_NUM, CTF_LONG|CTALIGN(2))
-#else
-#define CTTYDEFP(_)
-#endif
-
-/* Common types. */
-#define CTTYDEF(_) \
-  _(NONE,		0,	CT_ATTRIB, CTATTRIB(CTA_BAD)) \
-  _(VOID,		-1,	CT_VOID, CTALIGN(0)) \
-  _(CVOID,		-1,	CT_VOID, CTF_CONST|CTALIGN(0)) \
-  _(BOOL,		1,	CT_NUM, CTF_BOOL|CTF_UNSIGNED|CTALIGN(0)) \
-  _(CCHAR,		1,	CT_NUM, CTF_CONST|CTF_UCHAR|CTALIGN(0)) \
-  _(INT8,		1,	CT_NUM, CTALIGN(0)) \
-  _(UINT8,		1,	CT_NUM, CTF_UNSIGNED|CTALIGN(0)) \
-  _(INT16,		2,	CT_NUM, CTALIGN(1)) \
-  _(UINT16,		2,	CT_NUM, CTF_UNSIGNED|CTALIGN(1)) \
-  _(INT32,		4,	CT_NUM, CTALIGN(2)) \
-  _(UINT32,		4,	CT_NUM, CTF_UNSIGNED|CTALIGN(2)) \
-  _(INT64,		8,	CT_NUM, CTF_LONG|CTALIGN(3)) \
-  _(UINT64,		8,	CT_NUM, CTF_UNSIGNED|CTF_LONG|CTALIGN(3)) \
-  _(FLOAT,		4,	CT_NUM, CTF_FP|CTALIGN(2)) \
-  _(DOUBLE,		8,	CT_NUM, CTF_FP|CTALIGN(3)) \
-  _(COMPLEX_FLOAT,	8,	CT_ARRAY, CTF_COMPLEX|CTALIGN(2)|CTID_FLOAT) \
-  _(COMPLEX_DOUBLE,	16,	CT_ARRAY, CTF_COMPLEX|CTALIGN(3)|CTID_DOUBLE) \
-  _(P_VOID,	CTSIZE_PTR,	CT_PTR, CTALIGN_PTR|CTID_VOID) \
-  _(P_CVOID,	CTSIZE_PTR,	CT_PTR, CTALIGN_PTR|CTID_CVOID) \
-  _(P_CCHAR,	CTSIZE_PTR,	CT_PTR, CTALIGN_PTR|CTID_CCHAR) \
-  _(A_CCHAR,		-1,	CT_ARRAY, CTF_CONST|CTALIGN(0)|CTID_CCHAR) \
-  _(CTYPEID,		4,	CT_ENUM, CTALIGN(2)|CTID_INT32) \
-  CTTYDEFP(_) \
-  /* End of type list. */
-
-/* Public predefined type IDs. */
-enum {
-#define CTTYIDDEF(id, sz, ct, info)	CTID_##id,
-CTTYDEF(CTTYIDDEF)
-#undef CTTYIDDEF
-  /* Predefined typedefs and keywords follow. */
-  CTID_MAX = 65536
-};
-
-/* Target-dependent type IDs. */
-#if LJ_64
-#define CTID_INT_PSZ	CTID_INT64
-#define CTID_UINT_PSZ	CTID_UINT64
-#else
-#define CTID_INT_PSZ	CTID_INT32
-#define CTID_UINT_PSZ	CTID_UINT32
-#endif
-
-#if LJ_ABI_WIN
-#define CTID_WCHAR	CTID_UINT16
-#elif LJ_TARGET_PPC
-#define CTID_WCHAR	CTID_LINT32
-#else
-#define CTID_WCHAR	CTID_INT32
-#endif
-
-/* -- C tokens and keywords ----------------------------------------------- */
-
-/* C lexer keywords. */
-#define CTOKDEF(_) \
-  _(IDENT, "<identifier>") _(STRING, "<string>") \
-  _(INTEGER, "<integer>") _(EOF, "<eof>") \
-  _(OROR, "||") _(ANDAND, "&&") _(EQ, "==") _(NE, "!=") \
-  _(LE, "<=") _(GE, ">=") _(SHL, "<<") _(SHR, ">>") _(DEREF, "->")
-
-/* Simple declaration specifiers. */
-#define CDSDEF(_) \
-  _(VOID) _(BOOL) _(CHAR) _(INT) _(FP) \
-  _(LONG) _(LONGLONG) _(SHORT) _(COMPLEX) _(SIGNED) _(UNSIGNED) \
-  _(CONST) _(VOLATILE) _(RESTRICT) _(INLINE) \
-  _(TYPEDEF) _(EXTERN) _(STATIC) _(AUTO) _(REGISTER)
-
-/* C keywords. */
-#define CKWDEF(_) \
-  CDSDEF(_) _(EXTENSION) _(ASM) _(ATTRIBUTE) \
-  _(DECLSPEC) _(CCDECL) _(PTRSZ) \
-  _(STRUCT) _(UNION) _(ENUM) \
-  _(SIZEOF) _(ALIGNOF)
-
-/* C token numbers. */
-enum {
-  CTOK_OFS = 255,
-#define CTOKNUM(name, sym)	CTOK_##name,
-#define CKWNUM(name)		CTOK_##name,
-CTOKDEF(CTOKNUM)
-CKWDEF(CKWNUM)
-#undef CTOKNUM
-#undef CKWNUM
-  CTOK_FIRSTDECL = CTOK_VOID,
-  CTOK_FIRSTSCL = CTOK_TYPEDEF,
-  CTOK_LASTDECLFLAG = CTOK_REGISTER,
-  CTOK_LASTDECL = CTOK_ENUM
-};
-
-/* Declaration specifier flags. */
-enum {
-#define CDSFLAG(name)	CDF_##name = (1u << (CTOK_##name - CTOK_FIRSTDECL)),
-CDSDEF(CDSFLAG)
-#undef CDSFLAG
-  CDF__END
-};
-
-#define CDF_SCL  (CDF_TYPEDEF|CDF_EXTERN|CDF_STATIC|CDF_AUTO|CDF_REGISTER)
-
-/* -- C type management --------------------------------------------------- */
-
-#define ctype_ctsG(g)		(mref((g)->ctype_state, CTState))
-
-/* Get C type state. */
-static LJ_AINLINE CTState *ctype_cts(lua_State *L)
-{
-  CTState *cts = ctype_ctsG(G(L));
-  cts->L = L;  /* Save L for errors and allocations. */
-  return cts;
-}
-
-/* Save and restore state of C type table. */
-#define LJ_CTYPE_SAVE(cts)	CTState savects_ = *(cts)
-#define LJ_CTYPE_RESTORE(cts) \
-  ((cts)->top = savects_.top, \
-   memcpy((cts)->hash, savects_.hash, sizeof(savects_.hash)))
-
-/* Check C type ID for validity when assertions are enabled. */
-static LJ_AINLINE CTypeID ctype_check(CTState *cts, CTypeID id)
-{
-  lua_assert(id > 0 && id < cts->top); UNUSED(cts);
-  return id;
-}
-
-/* Get C type for C type ID. */
-static LJ_AINLINE CType *ctype_get(CTState *cts, CTypeID id)
-{
-  return &cts->tab[ctype_check(cts, id)];
-}
-
-/* Get C type ID for a C type. */
-#define ctype_typeid(cts, ct)	((CTypeID)((ct) - (cts)->tab))
-
-/* Get child C type. */
-static LJ_AINLINE CType *ctype_child(CTState *cts, CType *ct)
-{
-  lua_assert(!(ctype_isvoid(ct->info) || ctype_isstruct(ct->info) ||
-	     ctype_isbitfield(ct->info)));  /* These don't have children. */
-  return ctype_get(cts, ctype_cid(ct->info));
-}
-
-/* Get raw type for a C type ID. */
-static LJ_AINLINE CType *ctype_raw(CTState *cts, CTypeID id)
-{
-  CType *ct = ctype_get(cts, id);
-  while (ctype_isattrib(ct->info)) ct = ctype_child(cts, ct);
-  return ct;
-}
-
-/* Get raw type of the child of a C type. */
-static LJ_AINLINE CType *ctype_rawchild(CTState *cts, CType *ct)
-{
-  do { ct = ctype_child(cts, ct); } while (ctype_isattrib(ct->info));
-  return ct;
-}
-
-/* Set the name of a C type table element. */
-static LJ_AINLINE void ctype_setname(CType *ct, GCstr *s)
-{
-  /* NOBARRIER: mark string as fixed -- the C type table is never collected. */
-  fixstring(s);
-  setgcref(ct->name, obj2gco(s));
-}
-
-LJ_FUNC CTypeID lj_ctype_new(CTState *cts, CType **ctp);
-LJ_FUNC CTypeID lj_ctype_intern(CTState *cts, CTInfo info, CTSize size);
-LJ_FUNC void lj_ctype_addname(CTState *cts, CType *ct, CTypeID id);
-LJ_FUNC CTypeID lj_ctype_getname(CTState *cts, CType **ctp, GCstr *name,
-				 uint32_t tmask);
-LJ_FUNC CType *lj_ctype_getfieldq(CTState *cts, CType *ct, GCstr *name,
-				  CTSize *ofs, CTInfo *qual);
-#define lj_ctype_getfield(cts, ct, name, ofs) \
-  lj_ctype_getfieldq((cts), (ct), (name), (ofs), NULL)
-LJ_FUNC CType *lj_ctype_rawref(CTState *cts, CTypeID id);
-LJ_FUNC CTSize lj_ctype_size(CTState *cts, CTypeID id);
-LJ_FUNC CTSize lj_ctype_vlsize(CTState *cts, CType *ct, CTSize nelem);
-LJ_FUNC CTInfo lj_ctype_info(CTState *cts, CTypeID id, CTSize *szp);
-LJ_FUNC cTValue *lj_ctype_meta(CTState *cts, CTypeID id, MMS mm);
-LJ_FUNC GCstr *lj_ctype_repr(lua_State *L, CTypeID id, GCstr *name);
-LJ_FUNC GCstr *lj_ctype_repr_int64(lua_State *L, uint64_t n, int isunsigned);
-LJ_FUNC GCstr *lj_ctype_repr_complex(lua_State *L, void *sp, CTSize size);
-LJ_FUNC CTState *lj_ctype_init(lua_State *L);
-LJ_FUNC void lj_ctype_freestate(global_State *g);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_debug.h b/dependencies2013/win32/include/luajit/lj_debug.h
deleted file mode 100644
index d10d0da2..00000000
--- a/dependencies2013/win32/include/luajit/lj_debug.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-** Debugging and introspection.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_DEBUG_H
-#define _LJ_DEBUG_H
-
-#include "lj_obj.h"
-
-typedef struct lj_Debug {
-  /* Common fields. Must be in the same order as in lua.h. */
-  int event;
-  const char *name;
-  const char *namewhat;
-  const char *what;
-  const char *source;
-  int currentline;
-  int nups;
-  int linedefined;
-  int lastlinedefined;
-  char short_src[LUA_IDSIZE];
-  int i_ci;
-  /* Extended fields. Only valid if lj_debug_getinfo() is called with ext = 1.*/
-  int nparams;
-  int isvararg;
-} lj_Debug;
-
-LJ_FUNC cTValue *lj_debug_frame(lua_State *L, int level, int *size);
-LJ_FUNC BCLine LJ_FASTCALL lj_debug_line(GCproto *pt, BCPos pc);
-LJ_FUNC const char *lj_debug_uvname(GCproto *pt, uint32_t idx);
-LJ_FUNC const char *lj_debug_uvnamev(cTValue *o, uint32_t idx, TValue **tvp);
-LJ_FUNC const char *lj_debug_slotname(GCproto *pt, const BCIns *pc,
-				      BCReg slot, const char **name);
-LJ_FUNC const char *lj_debug_funcname(lua_State *L, TValue *frame,
-				      const char **name);
-LJ_FUNC void lj_debug_shortname(char *out, GCstr *str);
-LJ_FUNC void lj_debug_addloc(lua_State *L, const char *msg,
-			     cTValue *frame, cTValue *nextframe);
-LJ_FUNC void lj_debug_pushloc(lua_State *L, GCproto *pt, BCPos pc);
-LJ_FUNC int lj_debug_getinfo(lua_State *L, const char *what, lj_Debug *ar,
-			     int ext);
-
-/* Fixed internal variable names. */
-#define VARNAMEDEF(_) \
-  _(FOR_IDX, "(for index)") \
-  _(FOR_STOP, "(for limit)") \
-  _(FOR_STEP, "(for step)") \
-  _(FOR_GEN, "(for generator)") \
-  _(FOR_STATE, "(for state)") \
-  _(FOR_CTL, "(for control)")
-
-enum {
-  VARNAME_END,
-#define VARNAMEENUM(name, str)	VARNAME_##name,
-  VARNAMEDEF(VARNAMEENUM)
-#undef VARNAMEENUM
-  VARNAME__MAX
-};
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_def.h b/dependencies2013/win32/include/luajit/lj_def.h
deleted file mode 100644
index 21cc59a4..00000000
--- a/dependencies2013/win32/include/luajit/lj_def.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
-** LuaJIT common internal definitions.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_DEF_H
-#define _LJ_DEF_H
-
-#include "lua.h"
-
-#if defined(_MSC_VER)
-/* MSVC is stuck in the last century and doesn't have C99's stdint.h. */
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#ifdef _WIN64
-typedef __int64 intptr_t;
-typedef unsigned __int64 uintptr_t;
-#else
-typedef __int32 intptr_t;
-typedef unsigned __int32 uintptr_t;
-#endif
-#elif defined(__symbian__)
-/* Cough. */
-typedef signed char int8_t;
-typedef short int int16_t;
-typedef int int32_t;
-typedef long long int64_t;
-typedef unsigned char uint8_t;
-typedef unsigned short int uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-typedef int intptr_t;
-typedef unsigned int uintptr_t;
-#else
-#include <stdint.h>
-#endif
-
-/* Needed everywhere. */
-#include <string.h>
-#include <stdlib.h>
-
-/* Various VM limits. */
-#define LJ_MAX_MEM	0x7fffff00	/* Max. total memory allocation. */
-#define LJ_MAX_ALLOC	LJ_MAX_MEM	/* Max. individual allocation length. */
-#define LJ_MAX_STR	LJ_MAX_MEM	/* Max. string length. */
-#define LJ_MAX_UDATA	LJ_MAX_MEM	/* Max. userdata length. */
-
-#define LJ_MAX_STRTAB	(1<<26)		/* Max. string table size. */
-#define LJ_MAX_HBITS	26		/* Max. hash bits. */
-#define LJ_MAX_ABITS	28		/* Max. bits of array key. */
-#define LJ_MAX_ASIZE	((1<<(LJ_MAX_ABITS-1))+1)  /* Max. array part size. */
-#define LJ_MAX_COLOSIZE	16		/* Max. elems for colocated array. */
-
-#define LJ_MAX_LINE	LJ_MAX_MEM	/* Max. source code line number. */
-#define LJ_MAX_XLEVEL	200		/* Max. syntactic nesting level. */
-#define LJ_MAX_BCINS	(1<<26)		/* Max. # of bytecode instructions. */
-#define LJ_MAX_SLOTS	250		/* Max. # of slots in a Lua func. */
-#define LJ_MAX_LOCVAR	200		/* Max. # of local variables. */
-#define LJ_MAX_UPVAL	60		/* Max. # of upvalues. */
-
-#define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
-#define LJ_STACK_EXTRA	5		/* Extra stack space (metamethods). */
-
-#define LJ_NUM_CBPAGE	1		/* Number of FFI callback pages. */
-
-/* Minimum table/buffer sizes. */
-#define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
-#define LJ_MIN_REGISTRY	2		/* Min. registry size (hbits). */
-#define LJ_MIN_STRTAB	256		/* Min. string table size (pow2). */
-#define LJ_MIN_SBUF	32		/* Min. string buffer length. */
-#define LJ_MIN_VECSZ	8		/* Min. size for growable vectors. */
-#define LJ_MIN_IRSZ	32		/* Min. size for growable IR. */
-#define LJ_MIN_K64SZ	16		/* Min. size for chained K64Array. */
-
-/* JIT compiler limits. */
-#define LJ_MAX_JSLOTS	250		/* Max. # of stack slots for a trace. */
-#define LJ_MAX_PHI	64		/* Max. # of PHIs for a loop. */
-#define LJ_MAX_EXITSTUBGR	16	/* Max. # of exit stub groups. */
-
-/* Various macros. */
-#ifndef UNUSED
-#define UNUSED(x)	((void)(x))	/* to avoid warnings */
-#endif
-
-#define U64x(hi, lo)	(((uint64_t)0x##hi << 32) + (uint64_t)0x##lo)
-#define i32ptr(p)	((int32_t)(intptr_t)(void *)(p))
-#define u32ptr(p)	((uint32_t)(intptr_t)(void *)(p))
-
-#define checki8(x)	((x) == (int32_t)(int8_t)(x))
-#define checku8(x)	((x) == (int32_t)(uint8_t)(x))
-#define checki16(x)	((x) == (int32_t)(int16_t)(x))
-#define checku16(x)	((x) == (int32_t)(uint16_t)(x))
-#define checki32(x)	((x) == (int32_t)(x))
-#define checku32(x)	((x) == (uint32_t)(x))
-#define checkptr32(x)	((uintptr_t)(x) == (uint32_t)(uintptr_t)(x))
-
-/* Every half-decent C compiler transforms this into a rotate instruction. */
-#define lj_rol(x, n)	(((x)<<(n)) | ((x)>>(-(int)(n)&(8*sizeof(x)-1))))
-#define lj_ror(x, n)	(((x)<<(-(int)(n)&(8*sizeof(x)-1))) | ((x)>>(n)))
-
-/* A really naive Bloom filter. But sufficient for our needs. */
-typedef uintptr_t BloomFilter;
-#define BLOOM_MASK	(8*sizeof(BloomFilter) - 1)
-#define bloombit(x)	((uintptr_t)1 << ((x) & BLOOM_MASK))
-#define bloomset(b, x)	((b) |= bloombit((x)))
-#define bloomtest(b, x)	((b) & bloombit((x)))
-
-#if defined(__GNUC__) || defined(__psp2__)
-
-#define LJ_NORET	__attribute__((noreturn))
-#define LJ_ALIGN(n)	__attribute__((aligned(n)))
-#define LJ_INLINE	inline
-#define LJ_AINLINE	inline __attribute__((always_inline))
-#define LJ_NOINLINE	__attribute__((noinline))
-
-#if defined(__ELF__) || defined(__MACH__) || defined(__psp2__)
-#if !((defined(__sun__) && defined(__svr4__)) || defined(__CELLOS_LV2__))
-#define LJ_NOAPI	extern __attribute__((visibility("hidden")))
-#endif
-#endif
-
-/* Note: it's only beneficial to use fastcall on x86 and then only for up to
-** two non-FP args. The amalgamated compile covers all LJ_FUNC cases. Only
-** indirect calls and related tail-called C functions are marked as fastcall.
-*/
-#if defined(__i386__)
-#define LJ_FASTCALL	__attribute__((fastcall))
-#endif
-
-#define LJ_LIKELY(x)	__builtin_expect(!!(x), 1)
-#define LJ_UNLIKELY(x)	__builtin_expect(!!(x), 0)
-
-#define lj_ffs(x)	((uint32_t)__builtin_ctz(x))
-/* Don't ask ... */
-#if defined(__INTEL_COMPILER) && (defined(__i386__) || defined(__x86_64__))
-static LJ_AINLINE uint32_t lj_fls(uint32_t x)
-{
-  uint32_t r; __asm__("bsrl %1, %0" : "=r" (r) : "rm" (x) : "cc"); return r;
-}
-#else
-#define lj_fls(x)	((uint32_t)(__builtin_clz(x)^31))
-#endif
-
-#if defined(__arm__)
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-#if defined(__psp2__)
-  return __builtin_rev(x);
-#else
-  uint32_t r;
-#if __ARM_ARCH_6__ || __ARM_ARCH_6J__ || __ARM_ARCH_6T2__ || __ARM_ARCH_6Z__ ||\
-    __ARM_ARCH_6ZK__ || __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__
-  __asm__("rev %0, %1" : "=r" (r) : "r" (x));
-  return r;
-#else
-#ifdef __thumb__
-  r = x ^ lj_ror(x, 16);
-#else
-  __asm__("eor %0, %1, %1, ror #16" : "=r" (r) : "r" (x));
-#endif
-  return ((r & 0xff00ffffu) >> 8) ^ lj_ror(x, 8);
-#endif
-#endif
-}
-
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return ((uint64_t)lj_bswap((uint32_t)x)<<32) | lj_bswap((uint32_t)(x>>32));
-}
-#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-  return (uint32_t)__builtin_bswap32((int32_t)x);
-}
-
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return (uint64_t)__builtin_bswap64((int64_t)x);
-}
-#elif defined(__i386__) || defined(__x86_64__)
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-  uint32_t r; __asm__("bswap %0" : "=r" (r) : "0" (x)); return r;
-}
-
-#if defined(__i386__)
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return ((uint64_t)lj_bswap((uint32_t)x)<<32) | lj_bswap((uint32_t)(x>>32));
-}
-#else
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  uint64_t r; __asm__("bswap %0" : "=r" (r) : "0" (x)); return r;
-}
-#endif
-#else
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-  return (x << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | (x >> 24);
-}
-
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return (uint64_t)lj_bswap((uint32_t)(x >> 32)) |
-	 ((uint64_t)lj_bswap((uint32_t)x) << 32);
-}
-#endif
-
-typedef union __attribute__((packed)) Unaligned16 {
-  uint16_t u;
-  uint8_t b[2];
-} Unaligned16;
-
-typedef union __attribute__((packed)) Unaligned32 {
-  uint32_t u;
-  uint8_t b[4];
-} Unaligned32;
-
-/* Unaligned load of uint16_t. */
-static LJ_AINLINE uint16_t lj_getu16(const void *p)
-{
-  return ((const Unaligned16 *)p)->u;
-}
-
-/* Unaligned load of uint32_t. */
-static LJ_AINLINE uint32_t lj_getu32(const void *p)
-{
-  return ((const Unaligned32 *)p)->u;
-}
-
-#elif defined(_MSC_VER)
-
-#define LJ_NORET	__declspec(noreturn)
-#define LJ_ALIGN(n)	__declspec(align(n))
-#define LJ_INLINE	__inline
-#define LJ_AINLINE	__forceinline
-#define LJ_NOINLINE	__declspec(noinline)
-#if defined(_M_IX86)
-#define LJ_FASTCALL	__fastcall
-#endif
-
-#ifdef _M_PPC
-unsigned int _CountLeadingZeros(long);
-#pragma intrinsic(_CountLeadingZeros)
-static LJ_AINLINE uint32_t lj_fls(uint32_t x)
-{
-  return _CountLeadingZeros(x) ^ 31;
-}
-#else
-unsigned char _BitScanForward(uint32_t *, unsigned long);
-unsigned char _BitScanReverse(uint32_t *, unsigned long);
-#pragma intrinsic(_BitScanForward)
-#pragma intrinsic(_BitScanReverse)
-
-static LJ_AINLINE uint32_t lj_ffs(uint32_t x)
-{
-  uint32_t r; _BitScanForward(&r, x); return r;
-}
-
-static LJ_AINLINE uint32_t lj_fls(uint32_t x)
-{
-  uint32_t r; _BitScanReverse(&r, x); return r;
-}
-#endif
-
-unsigned long _byteswap_ulong(unsigned long);
-uint64_t _byteswap_uint64(uint64_t);
-#define lj_bswap(x)	(_byteswap_ulong((x)))
-#define lj_bswap64(x)	(_byteswap_uint64((x)))
-
-#if defined(_M_PPC) && defined(LUAJIT_NO_UNALIGNED)
-/*
-** Replacement for unaligned loads on Xbox 360. Disabled by default since it's
-** usually more costly than the occasional stall when crossing a cache-line.
-*/
-static LJ_AINLINE uint16_t lj_getu16(const void *v)
-{
-  const uint8_t *p = (const uint8_t *)v;
-  return (uint16_t)((p[0]<<8) | p[1]);
-}
-static LJ_AINLINE uint32_t lj_getu32(const void *v)
-{
-  const uint8_t *p = (const uint8_t *)v;
-  return (uint32_t)((p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3]);
-}
-#else
-/* Unaligned loads are generally ok on x86/x64. */
-#define lj_getu16(p)	(*(uint16_t *)(p))
-#define lj_getu32(p)	(*(uint32_t *)(p))
-#endif
-
-#else
-#error "missing defines for your compiler"
-#endif
-
-/* Optional defines. */
-#ifndef LJ_FASTCALL
-#define LJ_FASTCALL
-#endif
-#ifndef LJ_NORET
-#define LJ_NORET
-#endif
-#ifndef LJ_NOAPI
-#define LJ_NOAPI	extern
-#endif
-#ifndef LJ_LIKELY
-#define LJ_LIKELY(x)	(x)
-#define LJ_UNLIKELY(x)	(x)
-#endif
-
-/* Attributes for internal functions. */
-#define LJ_DATA		LJ_NOAPI
-#define LJ_DATADEF
-#define LJ_ASMF		LJ_NOAPI
-#define LJ_FUNCA	LJ_NOAPI
-#if defined(ljamalg_c)
-#define LJ_FUNC		static
-#else
-#define LJ_FUNC		LJ_NOAPI
-#endif
-#define LJ_FUNC_NORET	LJ_FUNC LJ_NORET
-#define LJ_FUNCA_NORET	LJ_FUNCA LJ_NORET
-#define LJ_ASMF_NORET	LJ_ASMF LJ_NORET
-
-/* Runtime assertions. */
-#ifdef lua_assert
-#define check_exp(c, e)		(lua_assert(c), (e))
-#define api_check(l, e)		lua_assert(e)
-#else
-#define lua_assert(c)		((void)0)
-#define check_exp(c, e)		(e)
-#define api_check		luai_apicheck
-#endif
-
-/* Static assertions. */
-#define LJ_ASSERT_NAME2(name, line)	name ## line
-#define LJ_ASSERT_NAME(line)		LJ_ASSERT_NAME2(lj_assert_, line)
-#ifdef __COUNTER__
-#define LJ_STATIC_ASSERT(cond) \
-  extern void LJ_ASSERT_NAME(__COUNTER__)(int STATIC_ASSERTION_FAILED[(cond)?1:-1])
-#else
-#define LJ_STATIC_ASSERT(cond) \
-  extern void LJ_ASSERT_NAME(__LINE__)(int STATIC_ASSERTION_FAILED[(cond)?1:-1])
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_dispatch.h b/dependencies2013/win32/include/luajit/lj_dispatch.h
deleted file mode 100644
index e46a0eee..00000000
--- a/dependencies2013/win32/include/luajit/lj_dispatch.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-** Instruction dispatch handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_DISPATCH_H
-#define _LJ_DISPATCH_H
-
-#include "lj_obj.h"
-#include "lj_bc.h"
-#if LJ_HASJIT
-#include "lj_jit.h"
-#endif
-
-#if LJ_TARGET_MIPS
-/* Need our own global offset table for the dreaded MIPS calling conventions. */
-#if LJ_HASJIT
-#define JITGOTDEF(_)	_(lj_trace_exit) _(lj_trace_hot)
-#else
-#define JITGOTDEF(_)
-#endif
-#if LJ_HASFFI
-#define FFIGOTDEF(_) \
-  _(lj_meta_equal_cd) _(lj_ccallback_enter) _(lj_ccallback_leave)
-#else
-#define FFIGOTDEF(_)
-#endif
-#define GOTDEF(_) \
-  _(floor) _(ceil) _(trunc) _(log) _(log10) _(exp) _(sin) _(cos) _(tan) \
-  _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \
-  _(pow) _(fmod) _(ldexp) \
-  _(lj_dispatch_call) _(lj_dispatch_ins) _(lj_err_throw) \
-  _(lj_ffh_coroutine_wrap_err) _(lj_func_closeuv) _(lj_func_newL_gc) \
-  _(lj_gc_barrieruv) _(lj_gc_step) _(lj_gc_step_fixtop) _(lj_meta_arith) \
-  _(lj_meta_call) _(lj_meta_cat) _(lj_meta_comp) _(lj_meta_equal) \
-  _(lj_meta_for) _(lj_meta_len) _(lj_meta_tget) _(lj_meta_tset) \
-  _(lj_state_growstack) _(lj_str_fromnum) _(lj_str_fromnumber) _(lj_str_new) \
-  _(lj_tab_dup) _(lj_tab_get) _(lj_tab_getinth) _(lj_tab_len) _(lj_tab_new) \
-  _(lj_tab_newkey) _(lj_tab_next) _(lj_tab_reasize) \
-  JITGOTDEF(_) FFIGOTDEF(_)
-
-enum {
-#define GOTENUM(name) LJ_GOT_##name,
-GOTDEF(GOTENUM)
-#undef GOTENUM
-  LJ_GOT__MAX
-};
-#endif
-
-/* Type of hot counter. Must match the code in the assembler VM. */
-/* 16 bits are sufficient. Only 0.0015% overhead with maximum slot penalty. */
-typedef uint16_t HotCount;
-
-/* Number of hot counter hash table entries (must be a power of two). */
-#define HOTCOUNT_SIZE		64
-#define HOTCOUNT_PCMASK		((HOTCOUNT_SIZE-1)*sizeof(HotCount))
-
-/* Hotcount decrements. */
-#define HOTCOUNT_LOOP		2
-#define HOTCOUNT_CALL		1
-
-/* This solves a circular dependency problem -- bump as needed. Sigh. */
-#define GG_NUM_ASMFF	62
-
-#define GG_LEN_DDISP	(BC__MAX + GG_NUM_ASMFF)
-#define GG_LEN_SDISP	BC_FUNCF
-#define GG_LEN_DISP	(GG_LEN_DDISP + GG_LEN_SDISP)
-
-/* Global state, main thread and extra fields are allocated together. */
-typedef struct GG_State {
-  lua_State L;				/* Main thread. */
-  global_State g;			/* Global state. */
-#if LJ_TARGET_MIPS
-  ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
-#endif
-#if LJ_HASJIT
-  jit_State J;				/* JIT state. */
-  HotCount hotcount[HOTCOUNT_SIZE];	/* Hot counters. */
-#endif
-  ASMFunction dispatch[GG_LEN_DISP];	/* Instruction dispatch tables. */
-  BCIns bcff[GG_NUM_ASMFF];		/* Bytecode for ASM fast functions. */
-} GG_State;
-
-#define GG_OFS(field)	((int)offsetof(GG_State, field))
-#define G2GG(gl)	((GG_State *)((char *)(gl) - GG_OFS(g)))
-#define J2GG(j)		((GG_State *)((char *)(j) - GG_OFS(J)))
-#define L2GG(L)		(G2GG(G(L)))
-#define J2G(J)		(&J2GG(J)->g)
-#define G2J(gl)		(&G2GG(gl)->J)
-#define L2J(L)		(&L2GG(L)->J)
-#define GG_G2DISP	(GG_OFS(dispatch) - GG_OFS(g))
-#define GG_DISP2G	(GG_OFS(g) - GG_OFS(dispatch))
-#define GG_DISP2J	(GG_OFS(J) - GG_OFS(dispatch))
-#define GG_DISP2HOT	(GG_OFS(hotcount) - GG_OFS(dispatch))
-#define GG_DISP2STATIC	(GG_LEN_DDISP*(int)sizeof(ASMFunction))
-
-#define hotcount_get(gg, pc) \
-  (gg)->hotcount[(u32ptr(pc)>>2) & (HOTCOUNT_SIZE-1)]
-#define hotcount_set(gg, pc, val) \
-  (hotcount_get((gg), (pc)) = (HotCount)(val))
-
-/* Dispatch table management. */
-LJ_FUNC void lj_dispatch_init(GG_State *GG);
-#if LJ_HASJIT
-LJ_FUNC void lj_dispatch_init_hotcount(global_State *g);
-#endif
-LJ_FUNC void lj_dispatch_update(global_State *g);
-
-/* Instruction dispatch callback for hooks or when recording. */
-LJ_FUNCA void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc);
-LJ_FUNCA ASMFunction LJ_FASTCALL lj_dispatch_call(lua_State *L, const BCIns*pc);
-LJ_FUNCA void LJ_FASTCALL lj_dispatch_return(lua_State *L, const BCIns *pc);
-
-#if LJ_HASFFI && !defined(_BUILDVM_H)
-/* Save/restore errno and GetLastError() around hooks, exits and recording. */
-#include <errno.h>
-#if LJ_TARGET_WINDOWS
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#define ERRNO_SAVE	int olderr = errno; DWORD oldwerr = GetLastError();
-#define ERRNO_RESTORE	errno = olderr; SetLastError(oldwerr);
-#else
-#define ERRNO_SAVE	int olderr = errno;
-#define ERRNO_RESTORE	errno = olderr;
-#endif
-#else
-#define ERRNO_SAVE
-#define ERRNO_RESTORE
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_emit_arm.h b/dependencies2013/win32/include/luajit/lj_emit_arm.h
deleted file mode 100644
index 285c98de..00000000
--- a/dependencies2013/win32/include/luajit/lj_emit_arm.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-** ARM instruction emitter.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Constant encoding --------------------------------------------------- */
-
-static uint8_t emit_invai[16] = {
-  /* AND */ (ARMI_AND^ARMI_BIC) >> 21,
-  /* EOR */ 0,
-  /* SUB */ (ARMI_SUB^ARMI_ADD) >> 21,
-  /* RSB */ 0,
-  /* ADD */ (ARMI_ADD^ARMI_SUB) >> 21,
-  /* ADC */ (ARMI_ADC^ARMI_SBC) >> 21,
-  /* SBC */ (ARMI_SBC^ARMI_ADC) >> 21,
-  /* RSC */ 0,
-  /* TST */ 0,
-  /* TEQ */ 0,
-  /* CMP */ (ARMI_CMP^ARMI_CMN) >> 21,
-  /* CMN */ (ARMI_CMN^ARMI_CMP) >> 21,
-  /* ORR */ 0,
-  /* MOV */ (ARMI_MOV^ARMI_MVN) >> 21,
-  /* BIC */ (ARMI_BIC^ARMI_AND) >> 21,
-  /* MVN */ (ARMI_MVN^ARMI_MOV) >> 21
-};
-
-/* Encode constant in K12 format for data processing instructions. */
-static uint32_t emit_isk12(ARMIns ai, int32_t n)
-{
-  uint32_t invai, i, m = (uint32_t)n;
-  /* K12: unsigned 8 bit value, rotated in steps of two bits. */
-  for (i = 0; i < 4096; i += 256, m = lj_rol(m, 2))
-    if (m <= 255) return ARMI_K12|m|i;
-  /* Otherwise try negation/complement with the inverse instruction. */
-  invai = emit_invai[((ai >> 21) & 15)];
-  if (!invai) return 0;  /* Failed. No inverse instruction. */
-  m = ~(uint32_t)n;
-  if (invai == ((ARMI_SUB^ARMI_ADD) >> 21) ||
-      invai == (ARMI_CMP^ARMI_CMN) >> 21) m++;
-  for (i = 0; i < 4096; i += 256, m = lj_rol(m, 2))
-    if (m <= 255) return ARMI_K12|(invai<<21)|m|i;
-  return 0;  /* Failed. */
-}
-
-/* -- Emit basic instructions --------------------------------------------- */
-
-static void emit_dnm(ASMState *as, ARMIns ai, Reg rd, Reg rn, Reg rm)
-{
-  *--as->mcp = ai | ARMF_D(rd) | ARMF_N(rn) | ARMF_M(rm);
-}
-
-static void emit_dm(ASMState *as, ARMIns ai, Reg rd, Reg rm)
-{
-  *--as->mcp = ai | ARMF_D(rd) | ARMF_M(rm);
-}
-
-static void emit_dn(ASMState *as, ARMIns ai, Reg rd, Reg rn)
-{
-  *--as->mcp = ai | ARMF_D(rd) | ARMF_N(rn);
-}
-
-static void emit_nm(ASMState *as, ARMIns ai, Reg rn, Reg rm)
-{
-  *--as->mcp = ai | ARMF_N(rn) | ARMF_M(rm);
-}
-
-static void emit_d(ASMState *as, ARMIns ai, Reg rd)
-{
-  *--as->mcp = ai | ARMF_D(rd);
-}
-
-static void emit_n(ASMState *as, ARMIns ai, Reg rn)
-{
-  *--as->mcp = ai | ARMF_N(rn);
-}
-
-static void emit_m(ASMState *as, ARMIns ai, Reg rm)
-{
-  *--as->mcp = ai | ARMF_M(rm);
-}
-
-static void emit_lsox(ASMState *as, ARMIns ai, Reg rd, Reg rn, int32_t ofs)
-{
-  lua_assert(ofs >= -255 && ofs <= 255);
-  if (ofs < 0) ofs = -ofs; else ai |= ARMI_LS_U;
-  *--as->mcp = ai | ARMI_LS_P | ARMI_LSX_I | ARMF_D(rd) | ARMF_N(rn) |
-	       ((ofs & 0xf0) << 4) | (ofs & 0x0f);
-}
-
-static void emit_lso(ASMState *as, ARMIns ai, Reg rd, Reg rn, int32_t ofs)
-{
-  lua_assert(ofs >= -4095 && ofs <= 4095);
-  /* Combine LDR/STR pairs to LDRD/STRD. */
-  if (*as->mcp == (ai|ARMI_LS_P|ARMI_LS_U|ARMF_D(rd^1)|ARMF_N(rn)|(ofs^4)) &&
-      (ai & ~(ARMI_LDR^ARMI_STR)) == ARMI_STR && rd != rn &&
-      (uint32_t)ofs <= 252 && !(ofs & 3) && !((rd ^ (ofs >>2)) & 1) &&
-      as->mcp != as->mcloop) {
-    as->mcp++;
-    emit_lsox(as, ai == ARMI_LDR ? ARMI_LDRD : ARMI_STRD, rd&~1, rn, ofs&~4);
-    return;
-  }
-  if (ofs < 0) ofs = -ofs; else ai |= ARMI_LS_U;
-  *--as->mcp = ai | ARMI_LS_P | ARMF_D(rd) | ARMF_N(rn) | ofs;
-}
-
-#if !LJ_SOFTFP
-static void emit_vlso(ASMState *as, ARMIns ai, Reg rd, Reg rn, int32_t ofs)
-{
-  lua_assert(ofs >= -1020 && ofs <= 1020 && (ofs&3) == 0);
-  if (ofs < 0) ofs = -ofs; else ai |= ARMI_LS_U;
-  *--as->mcp = ai | ARMI_LS_P | ARMF_D(rd & 15) | ARMF_N(rn) | (ofs >> 2);
-}
-#endif
-
-/* -- Emit loads/stores --------------------------------------------------- */
-
-/* Prefer spills of BASE/L. */
-#define emit_canremat(ref)	((ref) < ASMREF_L)
-
-/* Try to find a one step delta relative to another constant. */
-static int emit_kdelta1(ASMState *as, Reg d, int32_t i)
-{
-  RegSet work = ~as->freeset & RSET_GPR;
-  while (work) {
-    Reg r = rset_picktop(work);
-    IRRef ref = regcost_ref(as->cost[r]);
-    lua_assert(r != d);
-    if (emit_canremat(ref)) {
-      int32_t delta = i - (ra_iskref(ref) ? ra_krefk(as, ref) : IR(ref)->i);
-      uint32_t k = emit_isk12(ARMI_ADD, delta);
-      if (k) {
-	if (k == ARMI_K12)
-	  emit_dm(as, ARMI_MOV, d, r);
-	else
-	  emit_dn(as, ARMI_ADD^k, d, r);
-	return 1;
-      }
-    }
-    rset_clear(work, r);
-  }
-  return 0;  /* Failed. */
-}
-
-/* Try to find a two step delta relative to another constant. */
-static int emit_kdelta2(ASMState *as, Reg d, int32_t i)
-{
-  RegSet work = ~as->freeset & RSET_GPR;
-  while (work) {
-    Reg r = rset_picktop(work);
-    IRRef ref = regcost_ref(as->cost[r]);
-    lua_assert(r != d);
-    if (emit_canremat(ref)) {
-      int32_t other = ra_iskref(ref) ? ra_krefk(as, ref) : IR(ref)->i;
-      if (other) {
-	int32_t delta = i - other;
-	uint32_t sh, inv = 0, k2, k;
-	if (delta < 0) { delta = -delta; inv = ARMI_ADD^ARMI_SUB; }
-	sh = lj_ffs(delta) & ~1;
-	k2 = emit_isk12(0, delta & (255 << sh));
-	k = emit_isk12(0, delta & ~(255 << sh));
-	if (k) {
-	  emit_dn(as, ARMI_ADD^k2^inv, d, d);
-	  emit_dn(as, ARMI_ADD^k^inv, d, r);
-	  return 1;
-	}
-      }
-    }
-    rset_clear(work, r);
-  }
-  return 0;  /* Failed. */
-}
-
-/* Load a 32 bit constant into a GPR. */
-static void emit_loadi(ASMState *as, Reg r, int32_t i)
-{
-  uint32_t k = emit_isk12(ARMI_MOV, i);
-  lua_assert(rset_test(as->freeset, r) || r == RID_TMP);
-  if (k) {
-    /* Standard K12 constant. */
-    emit_d(as, ARMI_MOV^k, r);
-  } else if ((as->flags & JIT_F_ARMV6T2) && (uint32_t)i < 0x00010000u) {
-    /* 16 bit loword constant for ARMv6T2. */
-    emit_d(as, ARMI_MOVW|(i & 0x0fff)|((i & 0xf000)<<4), r);
-  } else if (emit_kdelta1(as, r, i)) {
-    /* One step delta relative to another constant. */
-  } else if ((as->flags & JIT_F_ARMV6T2)) {
-    /* 32 bit hiword/loword constant for ARMv6T2. */
-    emit_d(as, ARMI_MOVT|((i>>16) & 0x0fff)|(((i>>16) & 0xf000)<<4), r);
-    emit_d(as, ARMI_MOVW|(i & 0x0fff)|((i & 0xf000)<<4), r);
-  } else if (emit_kdelta2(as, r, i)) {
-    /* Two step delta relative to another constant. */
-  } else {
-    /* Otherwise construct the constant with up to 4 instructions. */
-    /* NYI: use mvn+bic, use pc-relative loads. */
-    for (;;) {
-      uint32_t sh = lj_ffs(i) & ~1;
-      int32_t m = i & (255 << sh);
-      i &= ~(255 << sh);
-      if (i == 0) {
-	emit_d(as, ARMI_MOV ^ emit_isk12(0, m), r);
-	break;
-      }
-      emit_dn(as, ARMI_ORR ^ emit_isk12(0, m), r, r);
-    }
-  }
-}
-
-#define emit_loada(as, r, addr)		emit_loadi(as, (r), i32ptr((addr)))
-
-static Reg ra_allock(ASMState *as, int32_t k, RegSet allow);
-
-/* Get/set from constant pointer. */
-static void emit_lsptr(ASMState *as, ARMIns ai, Reg r, void *p)
-{
-  int32_t i = i32ptr(p);
-  emit_lso(as, ai, r, ra_allock(as, (i & ~4095), rset_exclude(RSET_GPR, r)),
-	   (i & 4095));
-}
-
-#if !LJ_SOFTFP
-/* Load a number constant into an FPR. */
-static void emit_loadn(ASMState *as, Reg r, cTValue *tv)
-{
-  int32_t i;
-  if ((as->flags & JIT_F_VFPV3) && !tv->u32.lo) {
-    uint32_t hi = tv->u32.hi;
-    uint32_t b = ((hi >> 22) & 0x1ff);
-    if (!(hi & 0xffff) && (b == 0x100 || b == 0x0ff)) {
-      *--as->mcp = ARMI_VMOVI_D | ARMF_D(r & 15) |
-		   ((tv->u32.hi >> 12) & 0x00080000) |
-		   ((tv->u32.hi >> 4) & 0x00070000) |
-		   ((tv->u32.hi >> 16) & 0x0000000f);
-      return;
-    }
-  }
-  i = i32ptr(tv);
-  emit_vlso(as, ARMI_VLDR_D, r,
-	    ra_allock(as, (i & ~1020), RSET_GPR), (i & 1020));
-}
-#endif
-
-/* Get/set global_State fields. */
-#define emit_getgl(as, r, field) \
-  emit_lsptr(as, ARMI_LDR, (r), (void *)&J2G(as->J)->field)
-#define emit_setgl(as, r, field) \
-  emit_lsptr(as, ARMI_STR, (r), (void *)&J2G(as->J)->field)
-
-/* Trace number is determined from pc of exit instruction. */
-#define emit_setvmstate(as, i)		UNUSED(i)
-
-/* -- Emit control-flow instructions -------------------------------------- */
-
-/* Label for internal jumps. */
-typedef MCode *MCLabel;
-
-/* Return label pointing to current PC. */
-#define emit_label(as)		((as)->mcp)
-
-static void emit_branch(ASMState *as, ARMIns ai, MCode *target)
-{
-  MCode *p = as->mcp;
-  ptrdiff_t delta = (target - p) - 1;
-  lua_assert(((delta + 0x00800000) >> 24) == 0);
-  *--p = ai | ((uint32_t)delta & 0x00ffffffu);
-  as->mcp = p;
-}
-
-#define emit_jmp(as, target) emit_branch(as, ARMI_B, (target))
-
-static void emit_call(ASMState *as, void *target)
-{
-  MCode *p = --as->mcp;
-  ptrdiff_t delta = ((char *)target - (char *)p) - 8;
-  if ((((delta>>2) + 0x00800000) >> 24) == 0) {
-    if ((delta & 1))
-      *p = ARMI_BLX | ((uint32_t)(delta>>2) & 0x00ffffffu) | ((delta&2) << 23);
-    else
-      *p = ARMI_BL | ((uint32_t)(delta>>2) & 0x00ffffffu);
-  } else {  /* Target out of range: need indirect call. But don't use R0-R3. */
-    Reg r = ra_allock(as, i32ptr(target), RSET_RANGE(RID_R4, RID_R12+1));
-    *p = ARMI_BLXr | ARMF_M(r);
-  }
-}
-
-/* -- Emit generic operations --------------------------------------------- */
-
-/* Generic move between two regs. */
-static void emit_movrr(ASMState *as, IRIns *ir, Reg dst, Reg src)
-{
-#if LJ_SOFTFP
-  lua_assert(!irt_isnum(ir->t)); UNUSED(ir);
-#else
-  if (dst >= RID_MAX_GPR) {
-    emit_dm(as, irt_isnum(ir->t) ? ARMI_VMOV_D : ARMI_VMOV_S,
-	    (dst & 15), (src & 15));
-    return;
-  }
-#endif
-  if (as->mcp != as->mcloop) {  /* Swap early registers for loads/stores. */
-    MCode ins = *as->mcp, swp = (src^dst);
-    if ((ins & 0x0c000000) == 0x04000000 && (ins & 0x02000010) != 0x02000010) {
-      if (!((ins ^ (dst << 16)) & 0x000f0000))
-	*as->mcp = ins ^ (swp << 16);  /* Swap N in load/store. */
-      if (!(ins & 0x00100000) && !((ins ^ (dst << 12)) & 0x0000f000))
-	*as->mcp = ins ^ (swp << 12);  /* Swap D in store. */
-    }
-  }
-  emit_dm(as, ARMI_MOV, dst, src);
-}
-
-/* Generic load of register from stack slot. */
-static void emit_spload(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-#if LJ_SOFTFP
-  lua_assert(!irt_isnum(ir->t)); UNUSED(ir);
-#else
-  if (r >= RID_MAX_GPR)
-    emit_vlso(as, irt_isnum(ir->t) ? ARMI_VLDR_D : ARMI_VLDR_S, r, RID_SP, ofs);
-  else
-#endif
-    emit_lso(as, ARMI_LDR, r, RID_SP, ofs);
-}
-
-/* Generic store of register to stack slot. */
-static void emit_spstore(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-#if LJ_SOFTFP
-  lua_assert(!irt_isnum(ir->t)); UNUSED(ir);
-#else
-  if (r >= RID_MAX_GPR)
-    emit_vlso(as, irt_isnum(ir->t) ? ARMI_VSTR_D : ARMI_VSTR_S, r, RID_SP, ofs);
-  else
-#endif
-    emit_lso(as, ARMI_STR, r, RID_SP, ofs);
-}
-
-/* Emit an arithmetic/logic operation with a constant operand. */
-static void emit_opk(ASMState *as, ARMIns ai, Reg dest, Reg src,
-		     int32_t i, RegSet allow)
-{
-  uint32_t k = emit_isk12(ai, i);
-  if (k)
-    emit_dn(as, ai^k, dest, src);
-  else
-    emit_dnm(as, ai, dest, src, ra_allock(as, i, allow));
-}
-
-/* Add offset to pointer. */
-static void emit_addptr(ASMState *as, Reg r, int32_t ofs)
-{
-  if (ofs)
-    emit_opk(as, ARMI_ADD, r, r, ofs, rset_exclude(RSET_GPR, r));
-}
-
-#define emit_spsub(as, ofs)	emit_addptr(as, RID_SP, -(ofs))
-
diff --git a/dependencies2013/win32/include/luajit/lj_emit_mips.h b/dependencies2013/win32/include/luajit/lj_emit_mips.h
deleted file mode 100644
index ed62608a..00000000
--- a/dependencies2013/win32/include/luajit/lj_emit_mips.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-** MIPS instruction emitter.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Emit basic instructions --------------------------------------------- */
-
-static void emit_dst(ASMState *as, MIPSIns mi, Reg rd, Reg rs, Reg rt)
-{
-  *--as->mcp = mi | MIPSF_D(rd) | MIPSF_S(rs) | MIPSF_T(rt);
-}
-
-static void emit_dta(ASMState *as, MIPSIns mi, Reg rd, Reg rt, uint32_t a)
-{
-  *--as->mcp = mi | MIPSF_D(rd) | MIPSF_T(rt) | MIPSF_A(a);
-}
-
-#define emit_ds(as, mi, rd, rs)		emit_dst(as, (mi), (rd), (rs), 0)
-#define emit_tg(as, mi, rt, rg)		emit_dst(as, (mi), (rg)&31, 0, (rt))
-
-static void emit_tsi(ASMState *as, MIPSIns mi, Reg rt, Reg rs, int32_t i)
-{
-  *--as->mcp = mi | MIPSF_T(rt) | MIPSF_S(rs) | (i & 0xffff);
-}
-
-#define emit_ti(as, mi, rt, i)		emit_tsi(as, (mi), (rt), 0, (i))
-#define emit_hsi(as, mi, rh, rs, i)	emit_tsi(as, (mi), (rh) & 31, (rs), (i))
-
-static void emit_fgh(ASMState *as, MIPSIns mi, Reg rf, Reg rg, Reg rh)
-{
-  *--as->mcp = mi | MIPSF_F(rf&31) | MIPSF_G(rg&31) | MIPSF_H(rh&31);
-}
-
-#define emit_fg(as, mi, rf, rg)		emit_fgh(as, (mi), (rf), (rg), 0)
-
-static void emit_rotr(ASMState *as, Reg dest, Reg src, Reg tmp, uint32_t shift)
-{
-  if ((as->flags & JIT_F_MIPS32R2)) {
-    emit_dta(as, MIPSI_ROTR, dest, src, shift);
-  } else {
-    emit_dst(as, MIPSI_OR, dest, dest, tmp);
-    emit_dta(as, MIPSI_SLL, dest, src, (-shift)&31);
-    emit_dta(as, MIPSI_SRL, tmp, src, shift);
-  }
-}
-
-/* -- Emit loads/stores --------------------------------------------------- */
-
-/* Prefer rematerialization of BASE/L from global_State over spills. */
-#define emit_canremat(ref)	((ref) <= REF_BASE)
-
-/* Try to find a one step delta relative to another constant. */
-static int emit_kdelta1(ASMState *as, Reg t, int32_t i)
-{
-  RegSet work = ~as->freeset & RSET_GPR;
-  while (work) {
-    Reg r = rset_picktop(work);
-    IRRef ref = regcost_ref(as->cost[r]);
-    lua_assert(r != t);
-    if (ref < ASMREF_L) {
-      int32_t delta = i - (ra_iskref(ref) ? ra_krefk(as, ref) : IR(ref)->i);
-      if (checki16(delta)) {
-	emit_tsi(as, MIPSI_ADDIU, t, r, delta);
-	return 1;
-      }
-    }
-    rset_clear(work, r);
-  }
-  return 0;  /* Failed. */
-}
-
-/* Load a 32 bit constant into a GPR. */
-static void emit_loadi(ASMState *as, Reg r, int32_t i)
-{
-  if (checki16(i)) {
-    emit_ti(as, MIPSI_LI, r, i);
-  } else {
-    if ((i & 0xffff)) {
-      int32_t jgl = i32ptr(J2G(as->J));
-      if ((uint32_t)(i-jgl) < 65536) {
-	emit_tsi(as, MIPSI_ADDIU, r, RID_JGL, i-jgl-32768);
-	return;
-      } else if (emit_kdelta1(as, r, i)) {
-	return;
-      } else if ((i >> 16) == 0) {
-	emit_tsi(as, MIPSI_ORI, r, RID_ZERO, i);
-	return;
-      }
-      emit_tsi(as, MIPSI_ORI, r, r, i);
-    }
-    emit_ti(as, MIPSI_LUI, r, (i >> 16));
-  }
-}
-
-#define emit_loada(as, r, addr)		emit_loadi(as, (r), i32ptr((addr)))
-
-static Reg ra_allock(ASMState *as, int32_t k, RegSet allow);
-static void ra_allockreg(ASMState *as, int32_t k, Reg r);
-
-/* Get/set from constant pointer. */
-static void emit_lsptr(ASMState *as, MIPSIns mi, Reg r, void *p, RegSet allow)
-{
-  int32_t jgl = i32ptr(J2G(as->J));
-  int32_t i = i32ptr(p);
-  Reg base;
-  if ((uint32_t)(i-jgl) < 65536) {
-    i = i-jgl-32768;
-    base = RID_JGL;
-  } else {
-    base = ra_allock(as, i-(int16_t)i, allow);
-  }
-  emit_tsi(as, mi, r, base, i);
-}
-
-#define emit_loadn(as, r, tv) \
-  emit_lsptr(as, MIPSI_LDC1, ((r) & 31), (void *)(tv), RSET_GPR)
-
-/* Get/set global_State fields. */
-static void emit_lsglptr(ASMState *as, MIPSIns mi, Reg r, int32_t ofs)
-{
-  emit_tsi(as, mi, r, RID_JGL, ofs-32768);
-}
-
-#define emit_getgl(as, r, field) \
-  emit_lsglptr(as, MIPSI_LW, (r), (int32_t)offsetof(global_State, field))
-#define emit_setgl(as, r, field) \
-  emit_lsglptr(as, MIPSI_SW, (r), (int32_t)offsetof(global_State, field))
-
-/* Trace number is determined from per-trace exit stubs. */
-#define emit_setvmstate(as, i)		UNUSED(i)
-
-/* -- Emit control-flow instructions -------------------------------------- */
-
-/* Label for internal jumps. */
-typedef MCode *MCLabel;
-
-/* Return label pointing to current PC. */
-#define emit_label(as)		((as)->mcp)
-
-static void emit_branch(ASMState *as, MIPSIns mi, Reg rs, Reg rt, MCode *target)
-{
-  MCode *p = as->mcp;
-  ptrdiff_t delta = target - p;
-  lua_assert(((delta + 0x8000) >> 16) == 0);
-  *--p = mi | MIPSF_S(rs) | MIPSF_T(rt) | ((uint32_t)delta & 0xffffu);
-  as->mcp = p;
-}
-
-static void emit_jmp(ASMState *as, MCode *target)
-{
-  *--as->mcp = MIPSI_NOP;
-  emit_branch(as, MIPSI_B, RID_ZERO, RID_ZERO, (target));
-}
-
-static void emit_call(ASMState *as, void *target)
-{
-  MCode *p = as->mcp;
-  *--p = MIPSI_NOP;
-  if ((((uintptr_t)target ^ (uintptr_t)p) >> 28) == 0)
-    *--p = MIPSI_JAL | (((uintptr_t)target >>2) & 0x03ffffffu);
-  else  /* Target out of range: need indirect call. */
-    *--p = MIPSI_JALR | MIPSF_S(RID_CFUNCADDR);
-  as->mcp = p;
-  ra_allockreg(as, i32ptr(target), RID_CFUNCADDR);
-}
-
-/* -- Emit generic operations --------------------------------------------- */
-
-#define emit_move(as, dst, src) \
-  emit_ds(as, MIPSI_MOVE, (dst), (src))
-
-/* Generic move between two regs. */
-static void emit_movrr(ASMState *as, IRIns *ir, Reg dst, Reg src)
-{
-  if (dst < RID_MAX_GPR)
-    emit_move(as, dst, src);
-  else
-    emit_fg(as, irt_isnum(ir->t) ? MIPSI_MOV_D : MIPSI_MOV_S, dst, src);
-}
-
-/* Generic load of register from stack slot. */
-static void emit_spload(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-  if (r < RID_MAX_GPR)
-    emit_tsi(as, MIPSI_LW, r, RID_SP, ofs);
-  else
-    emit_tsi(as, irt_isnum(ir->t) ? MIPSI_LDC1 : MIPSI_LWC1,
-	     (r & 31), RID_SP, ofs);
-}
-
-/* Generic store of register to stack slot. */
-static void emit_spstore(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-  if (r < RID_MAX_GPR)
-    emit_tsi(as, MIPSI_SW, r, RID_SP, ofs);
-  else
-    emit_tsi(as, irt_isnum(ir->t) ? MIPSI_SDC1 : MIPSI_SWC1,
-	     (r&31), RID_SP, ofs);
-}
-
-/* Add offset to pointer. */
-static void emit_addptr(ASMState *as, Reg r, int32_t ofs)
-{
-  if (ofs) {
-    lua_assert(checki16(ofs));
-    emit_tsi(as, MIPSI_ADDIU, r, r, ofs);
-  }
-}
-
-#define emit_spsub(as, ofs)	emit_addptr(as, RID_SP, -(ofs))
-
diff --git a/dependencies2013/win32/include/luajit/lj_emit_ppc.h b/dependencies2013/win32/include/luajit/lj_emit_ppc.h
deleted file mode 100644
index 14099302..00000000
--- a/dependencies2013/win32/include/luajit/lj_emit_ppc.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-** PPC instruction emitter.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Emit basic instructions --------------------------------------------- */
-
-static void emit_tab(ASMState *as, PPCIns pi, Reg rt, Reg ra, Reg rb)
-{
-  *--as->mcp = pi | PPCF_T(rt) | PPCF_A(ra) | PPCF_B(rb);
-}
-
-#define emit_asb(as, pi, ra, rs, rb)	emit_tab(as, (pi), (rs), (ra), (rb))
-#define emit_as(as, pi, ra, rs)		emit_tab(as, (pi), (rs), (ra), 0)
-#define emit_ab(as, pi, ra, rb)		emit_tab(as, (pi), 0, (ra), (rb))
-
-static void emit_tai(ASMState *as, PPCIns pi, Reg rt, Reg ra, int32_t i)
-{
-  *--as->mcp = pi | PPCF_T(rt) | PPCF_A(ra) | (i & 0xffff);
-}
-
-#define emit_ti(as, pi, rt, i)		emit_tai(as, (pi), (rt), 0, (i))
-#define emit_ai(as, pi, ra, i)		emit_tai(as, (pi), 0, (ra), (i))
-#define emit_asi(as, pi, ra, rs, i)	emit_tai(as, (pi), (rs), (ra), (i))
-
-#define emit_fab(as, pi, rf, ra, rb) \
-  emit_tab(as, (pi), (rf)&31, (ra)&31, (rb)&31)
-#define emit_fb(as, pi, rf, rb)		emit_tab(as, (pi), (rf)&31, 0, (rb)&31)
-#define emit_fac(as, pi, rf, ra, rc) \
-  emit_tab(as, (pi) | PPCF_C((rc) & 31), (rf)&31, (ra)&31, 0)
-#define emit_facb(as, pi, rf, ra, rc, rb) \
-  emit_tab(as, (pi) | PPCF_C((rc) & 31), (rf)&31, (ra)&31, (rb)&31)
-#define emit_fai(as, pi, rf, ra, i)	emit_tai(as, (pi), (rf)&31, (ra), (i))
-
-static void emit_rot(ASMState *as, PPCIns pi, Reg ra, Reg rs,
-		     int32_t n, int32_t b, int32_t e)
-{
-  *--as->mcp = pi | PPCF_T(rs) | PPCF_A(ra) | PPCF_B(n) |
-	       PPCF_MB(b) | PPCF_ME(e);
-}
-
-static void emit_slwi(ASMState *as, Reg ra, Reg rs, int32_t n)
-{
-  lua_assert(n >= 0 && n < 32);
-  emit_rot(as, PPCI_RLWINM, ra, rs, n, 0, 31-n);
-}
-
-static void emit_rotlwi(ASMState *as, Reg ra, Reg rs, int32_t n)
-{
-  lua_assert(n >= 0 && n < 32);
-  emit_rot(as, PPCI_RLWINM, ra, rs, n, 0, 31);
-}
-
-/* -- Emit loads/stores --------------------------------------------------- */
-
-/* Prefer rematerialization of BASE/L from global_State over spills. */
-#define emit_canremat(ref)	((ref) <= REF_BASE)
-
-/* Try to find a one step delta relative to another constant. */
-static int emit_kdelta1(ASMState *as, Reg t, int32_t i)
-{
-  RegSet work = ~as->freeset & RSET_GPR;
-  while (work) {
-    Reg r = rset_picktop(work);
-    IRRef ref = regcost_ref(as->cost[r]);
-    lua_assert(r != t);
-    if (ref < ASMREF_L) {
-      int32_t delta = i - (ra_iskref(ref) ? ra_krefk(as, ref) : IR(ref)->i);
-      if (checki16(delta)) {
-	emit_tai(as, PPCI_ADDI, t, r, delta);
-	return 1;
-      }
-    }
-    rset_clear(work, r);
-  }
-  return 0;  /* Failed. */
-}
-
-/* Load a 32 bit constant into a GPR. */
-static void emit_loadi(ASMState *as, Reg r, int32_t i)
-{
-  if (checki16(i)) {
-    emit_ti(as, PPCI_LI, r, i);
-  } else {
-    if ((i & 0xffff)) {
-      int32_t jgl = i32ptr(J2G(as->J));
-      if ((uint32_t)(i-jgl) < 65536) {
-	emit_tai(as, PPCI_ADDI, r, RID_JGL, i-jgl-32768);
-	return;
-      } else if (emit_kdelta1(as, r, i)) {
-	return;
-      }
-      emit_asi(as, PPCI_ORI, r, r, i);
-    }
-    emit_ti(as, PPCI_LIS, r, (i >> 16));
-  }
-}
-
-#define emit_loada(as, r, addr)		emit_loadi(as, (r), i32ptr((addr)))
-
-static Reg ra_allock(ASMState *as, int32_t k, RegSet allow);
-
-/* Get/set from constant pointer. */
-static void emit_lsptr(ASMState *as, PPCIns pi, Reg r, void *p, RegSet allow)
-{
-  int32_t jgl = i32ptr(J2G(as->J));
-  int32_t i = i32ptr(p);
-  Reg base;
-  if ((uint32_t)(i-jgl) < 65536) {
-    i = i-jgl-32768;
-    base = RID_JGL;
-  } else {
-    base = ra_allock(as, i-(int16_t)i, allow);
-  }
-  emit_tai(as, pi, r, base, i);
-}
-
-#define emit_loadn(as, r, tv) \
-  emit_lsptr(as, PPCI_LFD, ((r) & 31), (void *)(tv), RSET_GPR)
-
-/* Get/set global_State fields. */
-static void emit_lsglptr(ASMState *as, PPCIns pi, Reg r, int32_t ofs)
-{
-  emit_tai(as, pi, r, RID_JGL, ofs-32768);
-}
-
-#define emit_getgl(as, r, field) \
-  emit_lsglptr(as, PPCI_LWZ, (r), (int32_t)offsetof(global_State, field))
-#define emit_setgl(as, r, field) \
-  emit_lsglptr(as, PPCI_STW, (r), (int32_t)offsetof(global_State, field))
-
-/* Trace number is determined from per-trace exit stubs. */
-#define emit_setvmstate(as, i)		UNUSED(i)
-
-/* -- Emit control-flow instructions -------------------------------------- */
-
-/* Label for internal jumps. */
-typedef MCode *MCLabel;
-
-/* Return label pointing to current PC. */
-#define emit_label(as)		((as)->mcp)
-
-static void emit_condbranch(ASMState *as, PPCIns pi, PPCCC cc, MCode *target)
-{
-  MCode *p = --as->mcp;
-  ptrdiff_t delta = (char *)target - (char *)p;
-  lua_assert(((delta + 0x8000) >> 16) == 0);
-  pi ^= (delta & 0x8000) * (PPCF_Y/0x8000);
-  *p = pi | PPCF_CC(cc) | ((uint32_t)delta & 0xffffu);
-}
-
-static void emit_jmp(ASMState *as, MCode *target)
-{
-  MCode *p = --as->mcp;
-  ptrdiff_t delta = (char *)target - (char *)p;
-  *p = PPCI_B | (delta & 0x03fffffcu);
-}
-
-static void emit_call(ASMState *as, void *target)
-{
-  MCode *p = --as->mcp;
-  ptrdiff_t delta = (char *)target - (char *)p;
-  if ((((delta>>2) + 0x00800000) >> 24) == 0) {
-    *p = PPCI_BL | (delta & 0x03fffffcu);
-  } else {  /* Target out of range: need indirect call. Don't use arg reg. */
-    RegSet allow = RSET_GPR & ~RSET_RANGE(RID_R0, REGARG_LASTGPR+1);
-    Reg r = ra_allock(as, i32ptr(target), allow);
-    *p = PPCI_BCTRL;
-    p[-1] = PPCI_MTCTR | PPCF_T(r);
-    as->mcp = p-1;
-  }
-}
-
-/* -- Emit generic operations --------------------------------------------- */
-
-#define emit_mr(as, dst, src) \
-  emit_asb(as, PPCI_MR, (dst), (src), (src))
-
-/* Generic move between two regs. */
-static void emit_movrr(ASMState *as, IRIns *ir, Reg dst, Reg src)
-{
-  UNUSED(ir);
-  if (dst < RID_MAX_GPR)
-    emit_mr(as, dst, src);
-  else
-    emit_fb(as, PPCI_FMR, dst, src);
-}
-
-/* Generic load of register from stack slot. */
-static void emit_spload(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-  if (r < RID_MAX_GPR)
-    emit_tai(as, PPCI_LWZ, r, RID_SP, ofs);
-  else
-    emit_fai(as, irt_isnum(ir->t) ? PPCI_LFD : PPCI_LFS, r, RID_SP, ofs);
-}
-
-/* Generic store of register to stack slot. */
-static void emit_spstore(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-  if (r < RID_MAX_GPR)
-    emit_tai(as, PPCI_STW, r, RID_SP, ofs);
-  else
-    emit_fai(as, irt_isnum(ir->t) ? PPCI_STFD : PPCI_STFS, r, RID_SP, ofs);
-}
-
-/* Emit a compare (for equality) with a constant operand. */
-static void emit_cmpi(ASMState *as, Reg r, int32_t k)
-{
-  if (checki16(k)) {
-    emit_ai(as, PPCI_CMPWI, r, k);
-  } else if (checku16(k)) {
-    emit_ai(as, PPCI_CMPLWI, r, k);
-  } else {
-    emit_ai(as, PPCI_CMPLWI, RID_TMP, k);
-    emit_asi(as, PPCI_XORIS, RID_TMP, r, (k >> 16));
-  }
-}
-
-/* Add offset to pointer. */
-static void emit_addptr(ASMState *as, Reg r, int32_t ofs)
-{
-  if (ofs) {
-    emit_tai(as, PPCI_ADDI, r, r, ofs);
-    if (!checki16(ofs))
-      emit_tai(as, PPCI_ADDIS, r, r, (ofs + 32768) >> 16);
-  }
-}
-
-static void emit_spsub(ASMState *as, int32_t ofs)
-{
-  if (ofs) {
-    emit_tai(as, PPCI_STWU, RID_TMP, RID_SP, -ofs);
-    emit_tai(as, PPCI_ADDI, RID_TMP, RID_SP,
-	     CFRAME_SIZE + (as->parent ? as->parent->spadjust : 0));
-  }
-}
-
diff --git a/dependencies2013/win32/include/luajit/lj_emit_x86.h b/dependencies2013/win32/include/luajit/lj_emit_x86.h
deleted file mode 100644
index bcceb93e..00000000
--- a/dependencies2013/win32/include/luajit/lj_emit_x86.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
-** x86/x64 instruction emitter.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* -- Emit basic instructions --------------------------------------------- */
-
-#define MODRM(mode, r1, r2)	((MCode)((mode)+(((r1)&7)<<3)+((r2)&7)))
-
-#if LJ_64
-#define REXRB(p, rr, rb) \
-    { MCode rex = 0x40 + (((rr)>>1)&4) + (((rb)>>3)&1); \
-      if (rex != 0x40) *--(p) = rex; }
-#define FORCE_REX		0x200
-#define REX_64			(FORCE_REX|0x080000)
-#else
-#define REXRB(p, rr, rb)	((void)0)
-#define FORCE_REX		0
-#define REX_64			0
-#endif
-
-#define emit_i8(as, i)		(*--as->mcp = (MCode)(i))
-#define emit_i32(as, i)		(*(int32_t *)(as->mcp-4) = (i), as->mcp -= 4)
-#define emit_u32(as, u)		(*(uint32_t *)(as->mcp-4) = (u), as->mcp -= 4)
-
-#define emit_x87op(as, xo) \
-  (*(uint16_t *)(as->mcp-2) = (uint16_t)(xo), as->mcp -= 2)
-
-/* op */
-static LJ_AINLINE MCode *emit_op(x86Op xo, Reg rr, Reg rb, Reg rx,
-				 MCode *p, int delta)
-{
-  int n = (int8_t)xo;
-#if defined(__GNUC__)
-  if (__builtin_constant_p(xo) && n == -2)
-    p[delta-2] = (MCode)(xo >> 24);
-  else if (__builtin_constant_p(xo) && n == -3)
-    *(uint16_t *)(p+delta-3) = (uint16_t)(xo >> 16);
-  else
-#endif
-    *(uint32_t *)(p+delta-5) = (uint32_t)xo;
-  p += n + delta;
-#if LJ_64
-  {
-    uint32_t rex = 0x40 + ((rr>>1)&(4+(FORCE_REX>>1)))+((rx>>2)&2)+((rb>>3)&1);
-    if (rex != 0x40) {
-      rex |= (rr >> 16);
-      if (n == -4) { *p = (MCode)rex; rex = (MCode)(xo >> 8); }
-      else if ((xo & 0xffffff) == 0x6600fd) { *p = (MCode)rex; rex = 0x66; }
-      *--p = (MCode)rex;
-    }
-  }
-#else
-  UNUSED(rr); UNUSED(rb); UNUSED(rx);
-#endif
-  return p;
-}
-
-/* op + modrm */
-#define emit_opm(xo, mode, rr, rb, p, delta) \
-  (p[(delta)-1] = MODRM((mode), (rr), (rb)), \
-   emit_op((xo), (rr), (rb), 0, (p), (delta)))
-
-/* op + modrm + sib */
-#define emit_opmx(xo, mode, scale, rr, rb, rx, p) \
-  (p[-1] = MODRM((scale), (rx), (rb)), \
-   p[-2] = MODRM((mode), (rr), RID_ESP), \
-   emit_op((xo), (rr), (rb), (rx), (p), -1))
-
-/* op r1, r2 */
-static void emit_rr(ASMState *as, x86Op xo, Reg r1, Reg r2)
-{
-  MCode *p = as->mcp;
-  as->mcp = emit_opm(xo, XM_REG, r1, r2, p, 0);
-}
-
-#if LJ_64 && defined(LUA_USE_ASSERT)
-/* [addr] is sign-extended in x64 and must be in lower 2G (not 4G). */
-static int32_t ptr2addr(const void *p)
-{
-  lua_assert((uintptr_t)p < (uintptr_t)0x80000000);
-  return i32ptr(p);
-}
-#else
-#define ptr2addr(p)	(i32ptr((p)))
-#endif
-
-/* op r, [addr] */
-static void emit_rma(ASMState *as, x86Op xo, Reg rr, const void *addr)
-{
-  MCode *p = as->mcp;
-  *(int32_t *)(p-4) = ptr2addr(addr);
-#if LJ_64
-  p[-5] = MODRM(XM_SCALE1, RID_ESP, RID_EBP);
-  as->mcp = emit_opm(xo, XM_OFS0, rr, RID_ESP, p, -5);
-#else
-  as->mcp = emit_opm(xo, XM_OFS0, rr, RID_EBP, p, -4);
-#endif
-}
-
-/* op r, [base+ofs] */
-static void emit_rmro(ASMState *as, x86Op xo, Reg rr, Reg rb, int32_t ofs)
-{
-  MCode *p = as->mcp;
-  x86Mode mode;
-  if (ra_hasreg(rb)) {
-    if (ofs == 0 && (rb&7) != RID_EBP) {
-      mode = XM_OFS0;
-    } else if (checki8(ofs)) {
-      *--p = (MCode)ofs;
-      mode = XM_OFS8;
-    } else {
-      p -= 4;
-      *(int32_t *)p = ofs;
-      mode = XM_OFS32;
-    }
-    if ((rb&7) == RID_ESP)
-      *--p = MODRM(XM_SCALE1, RID_ESP, RID_ESP);
-  } else {
-    *(int32_t *)(p-4) = ofs;
-#if LJ_64
-    p[-5] = MODRM(XM_SCALE1, RID_ESP, RID_EBP);
-    p -= 5;
-    rb = RID_ESP;
-#else
-    p -= 4;
-    rb = RID_EBP;
-#endif
-    mode = XM_OFS0;
-  }
-  as->mcp = emit_opm(xo, mode, rr, rb, p, 0);
-}
-
-/* op r, [base+idx*scale+ofs] */
-static void emit_rmrxo(ASMState *as, x86Op xo, Reg rr, Reg rb, Reg rx,
-		       x86Mode scale, int32_t ofs)
-{
-  MCode *p = as->mcp;
-  x86Mode mode;
-  if (ofs == 0 && (rb&7) != RID_EBP) {
-    mode = XM_OFS0;
-  } else if (checki8(ofs)) {
-    mode = XM_OFS8;
-    *--p = (MCode)ofs;
-  } else {
-    mode = XM_OFS32;
-    p -= 4;
-    *(int32_t *)p = ofs;
-  }
-  as->mcp = emit_opmx(xo, mode, scale, rr, rb, rx, p);
-}
-
-/* op r, i */
-static void emit_gri(ASMState *as, x86Group xg, Reg rb, int32_t i)
-{
-  MCode *p = as->mcp;
-  x86Op xo;
-  if (checki8(i)) {
-    *--p = (MCode)i;
-    xo = XG_TOXOi8(xg);
-  } else {
-    p -= 4;
-    *(int32_t *)p = i;
-    xo = XG_TOXOi(xg);
-  }
-  as->mcp = emit_opm(xo, XM_REG, (Reg)(xg & 7) | (rb & REX_64), rb, p, 0);
-}
-
-/* op [base+ofs], i */
-static void emit_gmroi(ASMState *as, x86Group xg, Reg rb, int32_t ofs,
-		       int32_t i)
-{
-  x86Op xo;
-  if (checki8(i)) {
-    emit_i8(as, i);
-    xo = XG_TOXOi8(xg);
-  } else {
-    emit_i32(as, i);
-    xo = XG_TOXOi(xg);
-  }
-  emit_rmro(as, xo, (Reg)(xg & 7), rb, ofs);
-}
-
-#define emit_shifti(as, xg, r, i) \
-  (emit_i8(as, (i)), emit_rr(as, XO_SHIFTi, (Reg)(xg), (r)))
-
-/* op r, rm/mrm */
-static void emit_mrm(ASMState *as, x86Op xo, Reg rr, Reg rb)
-{
-  MCode *p = as->mcp;
-  x86Mode mode = XM_REG;
-  if (rb == RID_MRM) {
-    rb = as->mrm.base;
-    if (rb == RID_NONE) {
-      rb = RID_EBP;
-      mode = XM_OFS0;
-      p -= 4;
-      *(int32_t *)p = as->mrm.ofs;
-      if (as->mrm.idx != RID_NONE)
-	goto mrmidx;
-#if LJ_64
-      *--p = MODRM(XM_SCALE1, RID_ESP, RID_EBP);
-      rb = RID_ESP;
-#endif
-    } else {
-      if (as->mrm.ofs == 0 && (rb&7) != RID_EBP) {
-	mode = XM_OFS0;
-      } else if (checki8(as->mrm.ofs)) {
-	*--p = (MCode)as->mrm.ofs;
-	mode = XM_OFS8;
-      } else {
-	p -= 4;
-	*(int32_t *)p = as->mrm.ofs;
-	mode = XM_OFS32;
-      }
-      if (as->mrm.idx != RID_NONE) {
-      mrmidx:
-	as->mcp = emit_opmx(xo, mode, as->mrm.scale, rr, rb, as->mrm.idx, p);
-	return;
-      }
-      if ((rb&7) == RID_ESP)
-	*--p = MODRM(XM_SCALE1, RID_ESP, RID_ESP);
-    }
-  }
-  as->mcp = emit_opm(xo, mode, rr, rb, p, 0);
-}
-
-/* op rm/mrm, i */
-static void emit_gmrmi(ASMState *as, x86Group xg, Reg rb, int32_t i)
-{
-  x86Op xo;
-  if (checki8(i)) {
-    emit_i8(as, i);
-    xo = XG_TOXOi8(xg);
-  } else {
-    emit_i32(as, i);
-    xo = XG_TOXOi(xg);
-  }
-  emit_mrm(as, xo, (Reg)(xg & 7) | (rb & REX_64), (rb & ~REX_64));
-}
-
-/* -- Emit loads/stores --------------------------------------------------- */
-
-/* Instruction selection for XMM moves. */
-#define XMM_MOVRR(as)	((as->flags & JIT_F_SPLIT_XMM) ? XO_MOVSD : XO_MOVAPS)
-#define XMM_MOVRM(as)	((as->flags & JIT_F_SPLIT_XMM) ? XO_MOVLPD : XO_MOVSD)
-
-/* mov [base+ofs], i */
-static void emit_movmroi(ASMState *as, Reg base, int32_t ofs, int32_t i)
-{
-  emit_i32(as, i);
-  emit_rmro(as, XO_MOVmi, 0, base, ofs);
-}
-
-/* mov [base+ofs], r */
-#define emit_movtomro(as, r, base, ofs) \
-  emit_rmro(as, XO_MOVto, (r), (base), (ofs))
-
-/* Get/set global_State fields. */
-#define emit_opgl(as, xo, r, field) \
-  emit_rma(as, (xo), (r), (void *)&J2G(as->J)->field)
-#define emit_getgl(as, r, field)	emit_opgl(as, XO_MOV, (r), field)
-#define emit_setgl(as, r, field)	emit_opgl(as, XO_MOVto, (r), field)
-
-#define emit_setvmstate(as, i) \
-  (emit_i32(as, i), emit_opgl(as, XO_MOVmi, 0, vmstate))
-
-/* mov r, i / xor r, r */
-static void emit_loadi(ASMState *as, Reg r, int32_t i)
-{
-  /* XOR r,r is shorter, but modifies the flags. This is bad for HIOP. */
-  if (i == 0 && !(LJ_32 && (IR(as->curins)->o == IR_HIOP ||
-			    (as->curins+1 < as->T->nins &&
-			     IR(as->curins+1)->o == IR_HIOP)))) {
-    emit_rr(as, XO_ARITH(XOg_XOR), r, r);
-  } else {
-    MCode *p = as->mcp;
-    *(int32_t *)(p-4) = i;
-    p[-5] = (MCode)(XI_MOVri+(r&7));
-    p -= 5;
-    REXRB(p, 0, r);
-    as->mcp = p;
-  }
-}
-
-/* mov r, addr */
-#define emit_loada(as, r, addr) \
-  emit_loadi(as, (r), ptr2addr((addr)))
-
-#if LJ_64
-/* mov r, imm64 or shorter 32 bit extended load. */
-static void emit_loadu64(ASMState *as, Reg r, uint64_t u64)
-{
-  if (checku32(u64)) {  /* 32 bit load clears upper 32 bits. */
-    emit_loadi(as, r, (int32_t)u64);
-  } else if (checki32((int64_t)u64)) {  /* Sign-extended 32 bit load. */
-    MCode *p = as->mcp;
-    *(int32_t *)(p-4) = (int32_t)u64;
-    as->mcp = emit_opm(XO_MOVmi, XM_REG, REX_64, r, p, -4);
-  } else {  /* Full-size 64 bit load. */
-    MCode *p = as->mcp;
-    *(uint64_t *)(p-8) = u64;
-    p[-9] = (MCode)(XI_MOVri+(r&7));
-    p[-10] = 0x48 + ((r>>3)&1);
-    p -= 10;
-    as->mcp = p;
-  }
-}
-#endif
-
-/* movsd r, [&tv->n] / xorps r, r */
-static void emit_loadn(ASMState *as, Reg r, cTValue *tv)
-{
-  if (tvispzero(tv))  /* Use xor only for +0. */
-    emit_rr(as, XO_XORPS, r, r);
-  else
-    emit_rma(as, XMM_MOVRM(as), r, &tv->n);
-}
-
-/* -- Emit control-flow instructions -------------------------------------- */
-
-/* Label for short jumps. */
-typedef MCode *MCLabel;
-
-#if LJ_32 && LJ_HASFFI
-/* jmp short target */
-static void emit_sjmp(ASMState *as, MCLabel target)
-{
-  MCode *p = as->mcp;
-  ptrdiff_t delta = target - p;
-  lua_assert(delta == (int8_t)delta);
-  p[-1] = (MCode)(int8_t)delta;
-  p[-2] = XI_JMPs;
-  as->mcp = p - 2;
-}
-#endif
-
-/* jcc short target */
-static void emit_sjcc(ASMState *as, int cc, MCLabel target)
-{
-  MCode *p = as->mcp;
-  ptrdiff_t delta = target - p;
-  lua_assert(delta == (int8_t)delta);
-  p[-1] = (MCode)(int8_t)delta;
-  p[-2] = (MCode)(XI_JCCs+(cc&15));
-  as->mcp = p - 2;
-}
-
-/* jcc short (pending target) */
-static MCLabel emit_sjcc_label(ASMState *as, int cc)
-{
-  MCode *p = as->mcp;
-  p[-1] = 0;
-  p[-2] = (MCode)(XI_JCCs+(cc&15));
-  as->mcp = p - 2;
-  return p;
-}
-
-/* Fixup jcc short target. */
-static void emit_sfixup(ASMState *as, MCLabel source)
-{
-  source[-1] = (MCode)(as->mcp-source);
-}
-
-/* Return label pointing to current PC. */
-#define emit_label(as)		((as)->mcp)
-
-/* Compute relative 32 bit offset for jump and call instructions. */
-static LJ_AINLINE int32_t jmprel(MCode *p, MCode *target)
-{
-  ptrdiff_t delta = target - p;
-  lua_assert(delta == (int32_t)delta);
-  return (int32_t)delta;
-}
-
-/* jcc target */
-static void emit_jcc(ASMState *as, int cc, MCode *target)
-{
-  MCode *p = as->mcp;
-  *(int32_t *)(p-4) = jmprel(p, target);
-  p[-5] = (MCode)(XI_JCCn+(cc&15));
-  p[-6] = 0x0f;
-  as->mcp = p - 6;
-}
-
-/* jmp target */
-static void emit_jmp(ASMState *as, MCode *target)
-{
-  MCode *p = as->mcp;
-  *(int32_t *)(p-4) = jmprel(p, target);
-  p[-5] = XI_JMP;
-  as->mcp = p - 5;
-}
-
-/* call target */
-static void emit_call_(ASMState *as, MCode *target)
-{
-  MCode *p = as->mcp;
-#if LJ_64
-  if (target-p != (int32_t)(target-p)) {
-    /* Assumes RID_RET is never an argument to calls and always clobbered. */
-    emit_rr(as, XO_GROUP5, XOg_CALL, RID_RET);
-    emit_loadu64(as, RID_RET, (uint64_t)target);
-    return;
-  }
-#endif
-  *(int32_t *)(p-4) = jmprel(p, target);
-  p[-5] = XI_CALL;
-  as->mcp = p - 5;
-}
-
-#define emit_call(as, f)	emit_call_(as, (MCode *)(void *)(f))
-
-/* -- Emit generic operations --------------------------------------------- */
-
-/* Use 64 bit operations to handle 64 bit IR types. */
-#if LJ_64
-#define REX_64IR(ir, r)		((r) + (irt_is64((ir)->t) ? REX_64 : 0))
-#else
-#define REX_64IR(ir, r)		(r)
-#endif
-
-/* Generic move between two regs. */
-static void emit_movrr(ASMState *as, IRIns *ir, Reg dst, Reg src)
-{
-  UNUSED(ir);
-  if (dst < RID_MAX_GPR)
-    emit_rr(as, XO_MOV, REX_64IR(ir, dst), src);
-  else
-    emit_rr(as, XMM_MOVRR(as), dst, src);
-}
-
-/* Generic load of register from stack slot. */
-static void emit_spload(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-  if (r < RID_MAX_GPR)
-    emit_rmro(as, XO_MOV, REX_64IR(ir, r), RID_ESP, ofs);
-  else
-    emit_rmro(as, irt_isnum(ir->t) ? XMM_MOVRM(as) : XO_MOVSS, r, RID_ESP, ofs);
-}
-
-/* Generic store of register to stack slot. */
-static void emit_spstore(ASMState *as, IRIns *ir, Reg r, int32_t ofs)
-{
-  if (r < RID_MAX_GPR)
-    emit_rmro(as, XO_MOVto, REX_64IR(ir, r), RID_ESP, ofs);
-  else
-    emit_rmro(as, irt_isnum(ir->t) ? XO_MOVSDto : XO_MOVSSto, r, RID_ESP, ofs);
-}
-
-/* Add offset to pointer. */
-static void emit_addptr(ASMState *as, Reg r, int32_t ofs)
-{
-  if (ofs) {
-    if ((as->flags & JIT_F_LEA_AGU))
-      emit_rmro(as, XO_LEA, r, r, ofs);
-    else
-      emit_gri(as, XG_ARITHi(XOg_ADD), r, ofs);
-  }
-}
-
-#define emit_spsub(as, ofs)	emit_addptr(as, RID_ESP|REX_64, -(ofs))
-
-/* Prefer rematerialization of BASE/L from global_State over spills. */
-#define emit_canremat(ref)	((ref) <= REF_BASE)
-
diff --git a/dependencies2013/win32/include/luajit/lj_err.h b/dependencies2013/win32/include/luajit/lj_err.h
deleted file mode 100644
index cba5fb71..00000000
--- a/dependencies2013/win32/include/luajit/lj_err.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-** Error handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_ERR_H
-#define _LJ_ERR_H
-
-#include <stdarg.h>
-
-#include "lj_obj.h"
-
-typedef enum {
-#define ERRDEF(name, msg) \
-  LJ_ERR_##name, LJ_ERR_##name##_ = LJ_ERR_##name + sizeof(msg)-1,
-#include "lj_errmsg.h"
-  LJ_ERR__MAX
-} ErrMsg;
-
-LJ_DATA const char *lj_err_allmsg;
-#define err2msg(em)	(lj_err_allmsg+(int)(em))
-
-LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em);
-LJ_FUNCA_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode);
-LJ_FUNC_NORET void lj_err_mem(lua_State *L);
-LJ_FUNC_NORET void lj_err_run(lua_State *L);
-LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em);
-LJ_FUNC_NORET void lj_err_lex(lua_State *L, GCstr *src, const char *tok,
-			      BCLine line, ErrMsg em, va_list argp);
-LJ_FUNC_NORET void lj_err_optype(lua_State *L, cTValue *o, ErrMsg opm);
-LJ_FUNC_NORET void lj_err_comp(lua_State *L, cTValue *o1, cTValue *o2);
-LJ_FUNC_NORET void lj_err_optype_call(lua_State *L, TValue *o);
-LJ_FUNC_NORET void lj_err_callermsg(lua_State *L, const char *msg);
-LJ_FUNC_NORET void lj_err_callerv(lua_State *L, ErrMsg em, ...);
-LJ_FUNC_NORET void lj_err_caller(lua_State *L, ErrMsg em);
-LJ_FUNC_NORET void lj_err_arg(lua_State *L, int narg, ErrMsg em);
-LJ_FUNC_NORET void lj_err_argv(lua_State *L, int narg, ErrMsg em, ...);
-LJ_FUNC_NORET void lj_err_argtype(lua_State *L, int narg, const char *xname);
-LJ_FUNC_NORET void lj_err_argt(lua_State *L, int narg, int tt);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_errmsg.h b/dependencies2013/win32/include/luajit/lj_errmsg.h
deleted file mode 100644
index ac552f40..00000000
--- a/dependencies2013/win32/include/luajit/lj_errmsg.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-** VM error messages.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* This file may be included multiple times with different ERRDEF macros. */
-
-/* Basic error handling. */
-ERRDEF(ERRMEM,	"not enough memory")
-ERRDEF(ERRERR,	"error in error handling")
-ERRDEF(ERRCPP,	"C++ exception")
-
-/* Allocations. */
-ERRDEF(STROV,	"string length overflow")
-ERRDEF(UDATAOV,	"userdata length overflow")
-ERRDEF(STKOV,	"stack overflow")
-ERRDEF(STKOVM,	"stack overflow (%s)")
-ERRDEF(TABOV,	"table overflow")
-
-/* Table indexing. */
-ERRDEF(NANIDX,	"table index is NaN")
-ERRDEF(NILIDX,	"table index is nil")
-ERRDEF(NEXTIDX,	"invalid key to " LUA_QL("next"))
-
-/* Metamethod resolving. */
-ERRDEF(BADCALL,	"attempt to call a %s value")
-ERRDEF(BADOPRT,	"attempt to %s %s " LUA_QS " (a %s value)")
-ERRDEF(BADOPRV,	"attempt to %s a %s value")
-ERRDEF(BADCMPT,	"attempt to compare %s with %s")
-ERRDEF(BADCMPV,	"attempt to compare two %s values")
-ERRDEF(GETLOOP,	"loop in gettable")
-ERRDEF(SETLOOP,	"loop in settable")
-ERRDEF(OPCALL,	"call")
-ERRDEF(OPINDEX,	"index")
-ERRDEF(OPARITH,	"perform arithmetic on")
-ERRDEF(OPCAT,	"concatenate")
-ERRDEF(OPLEN,	"get length of")
-
-/* Type checks. */
-ERRDEF(BADSELF,	"calling " LUA_QS " on bad self (%s)")
-ERRDEF(BADARG,	"bad argument #%d to " LUA_QS " (%s)")
-ERRDEF(BADTYPE,	"%s expected, got %s")
-ERRDEF(BADVAL,	"invalid value")
-ERRDEF(NOVAL,	"value expected")
-ERRDEF(NOCORO,	"coroutine expected")
-ERRDEF(NOTABN,	"nil or table expected")
-ERRDEF(NOLFUNC,	"Lua function expected")
-ERRDEF(NOFUNCL,	"function or level expected")
-ERRDEF(NOSFT,	"string/function/table expected")
-ERRDEF(NOPROXY,	"boolean or proxy expected")
-ERRDEF(FORINIT,	LUA_QL("for") " initial value must be a number")
-ERRDEF(FORLIM,	LUA_QL("for") " limit must be a number")
-ERRDEF(FORSTEP,	LUA_QL("for") " step must be a number")
-
-/* C API checks. */
-ERRDEF(NOENV,	"no calling environment")
-ERRDEF(CYIELD,	"attempt to yield across C-call boundary")
-ERRDEF(BADLU,	"bad light userdata pointer")
-ERRDEF(NOGCMM,	"bad action while in __gc metamethod")
-#if LJ_TARGET_WINDOWS
-ERRDEF(BADFPU,	"bad FPU precision (use D3DCREATE_FPU_PRESERVE with DirectX)")
-#endif
-
-/* Standard library function errors. */
-ERRDEF(ASSERT,	"assertion failed!")
-ERRDEF(PROTMT,	"cannot change a protected metatable")
-ERRDEF(UNPACK,	"too many results to unpack")
-ERRDEF(RDRSTR,	"reader function must return a string")
-ERRDEF(PRTOSTR,	LUA_QL("tostring") " must return a string to " LUA_QL("print"))
-ERRDEF(IDXRNG,	"index out of range")
-ERRDEF(BASERNG,	"base out of range")
-ERRDEF(LVLRNG,	"level out of range")
-ERRDEF(INVLVL,	"invalid level")
-ERRDEF(INVOPT,	"invalid option")
-ERRDEF(INVOPTM,	"invalid option " LUA_QS)
-ERRDEF(INVFMT,	"invalid format")
-ERRDEF(SETFENV,	LUA_QL("setfenv") " cannot change environment of given object")
-ERRDEF(CORUN,	"cannot resume running coroutine")
-ERRDEF(CODEAD,	"cannot resume dead coroutine")
-ERRDEF(COSUSP,	"cannot resume non-suspended coroutine")
-ERRDEF(TABINS,	"wrong number of arguments to " LUA_QL("insert"))
-ERRDEF(TABCAT,	"invalid value (%s) at index %d in table for " LUA_QL("concat"))
-ERRDEF(TABSORT,	"invalid order function for sorting")
-ERRDEF(IOCLFL,	"attempt to use a closed file")
-ERRDEF(IOSTDCL,	"standard file is closed")
-ERRDEF(OSUNIQF,	"unable to generate a unique filename")
-ERRDEF(OSDATEF,	"field " LUA_QS " missing in date table")
-ERRDEF(STRDUMP,	"unable to dump given function")
-ERRDEF(STRSLC,	"string slice too long")
-ERRDEF(STRPATB,	"missing " LUA_QL("[") " after " LUA_QL("%f") " in pattern")
-ERRDEF(STRPATC,	"invalid pattern capture")
-ERRDEF(STRPATE,	"malformed pattern (ends with " LUA_QL("%") ")")
-ERRDEF(STRPATM,	"malformed pattern (missing " LUA_QL("]") ")")
-ERRDEF(STRPATU,	"unbalanced pattern")
-ERRDEF(STRPATX,	"pattern too complex")
-ERRDEF(STRCAPI,	"invalid capture index")
-ERRDEF(STRCAPN,	"too many captures")
-ERRDEF(STRCAPU,	"unfinished capture")
-ERRDEF(STRFMTO,	"invalid option " LUA_QL("%%%c") " to " LUA_QL("format"))
-ERRDEF(STRFMTR,	"invalid format (repeated flags)")
-ERRDEF(STRFMTW,	"invalid format (width or precision too long)")
-ERRDEF(STRGSRV,	"invalid replacement value (a %s)")
-ERRDEF(BADMODN,	"name conflict for module " LUA_QS)
-#if LJ_HASJIT
-ERRDEF(JITPROT,	"runtime code generation failed, restricted kernel?")
-#if LJ_TARGET_X86ORX64
-ERRDEF(NOJIT,	"JIT compiler disabled, CPU does not support SSE2")
-#else
-ERRDEF(NOJIT,	"JIT compiler disabled")
-#endif
-#elif defined(LJ_ARCH_NOJIT)
-ERRDEF(NOJIT,	"no JIT compiler for this architecture (yet)")
-#else
-ERRDEF(NOJIT,	"JIT compiler permanently disabled by build option")
-#endif
-ERRDEF(JITOPT,	"unknown or malformed optimization flag " LUA_QS)
-
-/* Lexer/parser errors. */
-ERRDEF(XMODE,	"attempt to load chunk with wrong mode")
-ERRDEF(XNEAR,	"%s near " LUA_QS)
-ERRDEF(XELEM,	"lexical element too long")
-ERRDEF(XLINES,	"chunk has too many lines")
-ERRDEF(XLEVELS,	"chunk has too many syntax levels")
-ERRDEF(XNUMBER,	"malformed number")
-ERRDEF(XLSTR,	"unfinished long string")
-ERRDEF(XLCOM,	"unfinished long comment")
-ERRDEF(XSTR,	"unfinished string")
-ERRDEF(XESC,	"invalid escape sequence")
-ERRDEF(XLDELIM,	"invalid long string delimiter")
-ERRDEF(XTOKEN,	LUA_QS " expected")
-ERRDEF(XJUMP,	"control structure too long")
-ERRDEF(XSLOTS,	"function or expression too complex")
-ERRDEF(XLIMC,	"chunk has more than %d local variables")
-ERRDEF(XLIMM,	"main function has more than %d %s")
-ERRDEF(XLIMF,	"function at line %d has more than %d %s")
-ERRDEF(XMATCH,	LUA_QS " expected (to close " LUA_QS " at line %d)")
-ERRDEF(XFIXUP,	"function too long for return fixup")
-ERRDEF(XPARAM,	"<name> or " LUA_QL("...") " expected")
-#if !LJ_52
-ERRDEF(XAMBIG,	"ambiguous syntax (function call x new statement)")
-#endif
-ERRDEF(XFUNARG,	"function arguments expected")
-ERRDEF(XSYMBOL,	"unexpected symbol")
-ERRDEF(XDOTS,	"cannot use " LUA_QL("...") " outside a vararg function")
-ERRDEF(XSYNTAX,	"syntax error")
-ERRDEF(XFOR,	LUA_QL("=") " or " LUA_QL("in") " expected")
-ERRDEF(XBREAK,	"no loop to break")
-ERRDEF(XLUNDEF,	"undefined label " LUA_QS)
-ERRDEF(XLDUP,	"duplicate label " LUA_QS)
-ERRDEF(XGSCOPE,	"<goto %s> jumps into the scope of local " LUA_QS)
-
-/* Bytecode reader errors. */
-ERRDEF(BCFMT,	"cannot load incompatible bytecode")
-ERRDEF(BCBAD,	"cannot load malformed bytecode")
-
-#if LJ_HASFFI
-/* FFI errors. */
-ERRDEF(FFI_INVTYPE,	"invalid C type")
-ERRDEF(FFI_INVSIZE,	"size of C type is unknown or too large")
-ERRDEF(FFI_BADSCL,	"bad storage class")
-ERRDEF(FFI_DECLSPEC,	"declaration specifier expected")
-ERRDEF(FFI_BADTAG,	"undeclared or implicit tag " LUA_QS)
-ERRDEF(FFI_REDEF,	"attempt to redefine " LUA_QS)
-ERRDEF(FFI_NUMPARAM,	"wrong number of type parameters")
-ERRDEF(FFI_INITOV,	"too many initializers for " LUA_QS)
-ERRDEF(FFI_BADCONV,	"cannot convert " LUA_QS " to " LUA_QS)
-ERRDEF(FFI_BADLEN,	"attempt to get length of " LUA_QS)
-ERRDEF(FFI_BADCONCAT,	"attempt to concatenate " LUA_QS " and " LUA_QS)
-ERRDEF(FFI_BADARITH,	"attempt to perform arithmetic on " LUA_QS " and " LUA_QS)
-ERRDEF(FFI_BADCOMP,	"attempt to compare " LUA_QS " with " LUA_QS)
-ERRDEF(FFI_BADCALL,	LUA_QS " is not callable")
-ERRDEF(FFI_NUMARG,	"wrong number of arguments for function call")
-ERRDEF(FFI_BADMEMBER,	LUA_QS " has no member named " LUA_QS)
-ERRDEF(FFI_BADIDX,	LUA_QS " cannot be indexed")
-ERRDEF(FFI_BADIDXW,	LUA_QS " cannot be indexed with " LUA_QS)
-ERRDEF(FFI_BADMM,	LUA_QS " has no " LUA_QS " metamethod")
-ERRDEF(FFI_WRCONST,	"attempt to write to constant location")
-ERRDEF(FFI_NODECL,	"missing declaration for symbol " LUA_QS)
-ERRDEF(FFI_BADCBACK,	"bad callback")
-#if LJ_OS_NOJIT
-ERRDEF(FFI_CBACKOV,	"no support for callbacks on this OS")
-#else
-ERRDEF(FFI_CBACKOV,	"too many callbacks")
-#endif
-ERRDEF(FFI_NYIPACKBIT,	"NYI: packed bit fields")
-ERRDEF(FFI_NYICALL,	"NYI: cannot call this C function (yet)")
-#endif
-
-#undef ERRDEF
-
-/* Detecting unused error messages:
-   awk -F, '/^ERRDEF/ { gsub(/ERRDEF./, ""); printf "grep -q LJ_ERR_%s *.[ch] || echo %s\n", $1, $1}' lj_errmsg.h | sh
-*/
diff --git a/dependencies2013/win32/include/luajit/lj_ff.h b/dependencies2013/win32/include/luajit/lj_ff.h
deleted file mode 100644
index 31d65a00..00000000
--- a/dependencies2013/win32/include/luajit/lj_ff.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-** Fast function IDs.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_FF_H
-#define _LJ_FF_H
-
-/* Fast function ID. */
-typedef enum {
-  FF_LUA_ = FF_LUA,	/* Lua function (must be 0). */
-  FF_C_ = FF_C,		/* Regular C function (must be 1). */
-#define FFDEF(name)	FF_##name,
-#include "lj_ffdef.h"
-  FF__MAX
-} FastFunc;
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_ffrecord.h b/dependencies2013/win32/include/luajit/lj_ffrecord.h
deleted file mode 100644
index 3b407450..00000000
--- a/dependencies2013/win32/include/luajit/lj_ffrecord.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-** Fast function call recorder.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_FFRECORD_H
-#define _LJ_FFRECORD_H
-
-#include "lj_obj.h"
-#include "lj_jit.h"
-
-#if LJ_HASJIT
-/* Data used by handlers to record a fast function. */
-typedef struct RecordFFData {
-  TValue *argv;		/* Runtime argument values. */
-  ptrdiff_t nres;	/* Number of returned results (defaults to 1). */
-  uint32_t data;	/* Per-ffid auxiliary data (opcode, literal etc.). */
-} RecordFFData;
-
-LJ_FUNC int32_t lj_ffrecord_select_mode(jit_State *J, TRef tr, TValue *tv);
-LJ_FUNC void lj_ffrecord_func(jit_State *J);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_frame.h b/dependencies2013/win32/include/luajit/lj_frame.h
deleted file mode 100644
index eb5df307..00000000
--- a/dependencies2013/win32/include/luajit/lj_frame.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-** Stack frames.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_FRAME_H
-#define _LJ_FRAME_H
-
-#include "lj_obj.h"
-#include "lj_bc.h"
-
-/* -- Lua stack frame ----------------------------------------------------- */
-
-/* Frame type markers in callee function slot (callee base-1). */
-enum {
-  FRAME_LUA, FRAME_C, FRAME_CONT, FRAME_VARG,
-  FRAME_LUAP, FRAME_CP, FRAME_PCALL, FRAME_PCALLH
-};
-#define FRAME_TYPE		3
-#define FRAME_P			4
-#define FRAME_TYPEP		(FRAME_TYPE|FRAME_P)
-
-/* Macros to access and modify Lua frames. */
-#define frame_gc(f)		(gcref((f)->fr.func))
-#define frame_func(f)		(&frame_gc(f)->fn)
-#define frame_ftsz(f)		((f)->fr.tp.ftsz)
-
-#define frame_type(f)		(frame_ftsz(f) & FRAME_TYPE)
-#define frame_typep(f)		(frame_ftsz(f) & FRAME_TYPEP)
-#define frame_islua(f)		(frame_type(f) == FRAME_LUA)
-#define frame_isc(f)		(frame_type(f) == FRAME_C)
-#define frame_iscont(f)		(frame_typep(f) == FRAME_CONT)
-#define frame_isvarg(f)		(frame_typep(f) == FRAME_VARG)
-#define frame_ispcall(f)	((frame_ftsz(f) & 6) == FRAME_PCALL)
-
-#define frame_pc(f)		(mref((f)->fr.tp.pcr, const BCIns))
-#define frame_contpc(f)		(frame_pc((f)-1))
-#if LJ_64
-#define frame_contf(f) \
-  ((ASMFunction)(void *)((intptr_t)lj_vm_asm_begin + \
-			 (intptr_t)(int32_t)((f)-1)->u32.lo))
-#else
-#define frame_contf(f)		((ASMFunction)gcrefp(((f)-1)->gcr, void))
-#endif
-#define frame_delta(f)		(frame_ftsz(f) >> 3)
-#define frame_sized(f)		(frame_ftsz(f) & ~FRAME_TYPEP)
-
-#define frame_prevl(f)		((f) - (1+bc_a(frame_pc(f)[-1])))
-#define frame_prevd(f)		((TValue *)((char *)(f) - frame_sized(f)))
-#define frame_prev(f)		(frame_islua(f)?frame_prevl(f):frame_prevd(f))
-/* Note: this macro does not skip over FRAME_VARG. */
-
-#define setframe_pc(f, pc)	(setmref((f)->fr.tp.pcr, (pc)))
-#define setframe_ftsz(f, sz)	((f)->fr.tp.ftsz = (sz))
-#define setframe_gc(f, p)	(setgcref((f)->fr.func, (p)))
-
-/* -- C stack frame ------------------------------------------------------- */
-
-/* Macros to access and modify the C stack frame chain. */
-
-/* These definitions must match with the arch-specific *.dasc files. */
-#if LJ_TARGET_X86
-#define CFRAME_OFS_ERRF		(15*4)
-#define CFRAME_OFS_NRES		(14*4)
-#define CFRAME_OFS_PREV		(13*4)
-#define CFRAME_OFS_L		(12*4)
-#define CFRAME_OFS_PC		(6*4)
-#define CFRAME_OFS_MULTRES	(5*4)
-#define CFRAME_SIZE		(12*4)
-#define CFRAME_SHIFT_MULTRES	0
-#elif LJ_TARGET_X64
-#if LJ_ABI_WIN
-#define CFRAME_OFS_PREV		(13*8)
-#define CFRAME_OFS_PC		(25*4)
-#define CFRAME_OFS_L		(24*4)
-#define CFRAME_OFS_ERRF		(23*4)
-#define CFRAME_OFS_NRES		(22*4)
-#define CFRAME_OFS_MULTRES	(21*4)
-#define CFRAME_SIZE		(10*8)
-#define CFRAME_SIZE_JIT		(CFRAME_SIZE + 9*16 + 4*8)
-#define CFRAME_SHIFT_MULTRES	0
-#else
-#define CFRAME_OFS_PREV		(4*8)
-#define CFRAME_OFS_PC		(7*4)
-#define CFRAME_OFS_L		(6*4)
-#define CFRAME_OFS_ERRF		(5*4)
-#define CFRAME_OFS_NRES		(4*4)
-#define CFRAME_OFS_MULTRES	(1*4)
-#if LJ_NO_UNWIND
-#define CFRAME_SIZE		(12*8)
-#else
-#define CFRAME_SIZE		(10*8)
-#endif
-#define CFRAME_SIZE_JIT		(CFRAME_SIZE + 16)
-#define CFRAME_SHIFT_MULTRES	0
-#endif
-#elif LJ_TARGET_ARM
-#define CFRAME_OFS_ERRF		24
-#define CFRAME_OFS_NRES		20
-#define CFRAME_OFS_PREV		16
-#define CFRAME_OFS_L		12
-#define CFRAME_OFS_PC		8
-#define CFRAME_OFS_MULTRES	4
-#if LJ_ARCH_HASFPU
-#define CFRAME_SIZE		128
-#else
-#define CFRAME_SIZE		64
-#endif
-#define CFRAME_SHIFT_MULTRES	3
-#elif LJ_TARGET_PPC
-#if LJ_TARGET_XBOX360
-#define CFRAME_OFS_ERRF		424
-#define CFRAME_OFS_NRES		420
-#define CFRAME_OFS_PREV		400
-#define CFRAME_OFS_L		416
-#define CFRAME_OFS_PC		412
-#define CFRAME_OFS_MULTRES	408
-#define CFRAME_SIZE		384
-#define CFRAME_SHIFT_MULTRES	3
-#elif LJ_ARCH_PPC64
-#define CFRAME_OFS_ERRF		472
-#define CFRAME_OFS_NRES		468
-#define CFRAME_OFS_PREV		448
-#define CFRAME_OFS_L		464
-#define CFRAME_OFS_PC		460
-#define CFRAME_OFS_MULTRES	456
-#define CFRAME_SIZE		400
-#define CFRAME_SHIFT_MULTRES	3
-#else
-#define CFRAME_OFS_ERRF		48
-#define CFRAME_OFS_NRES		44
-#define CFRAME_OFS_PREV		40
-#define CFRAME_OFS_L		36
-#define CFRAME_OFS_PC		32
-#define CFRAME_OFS_MULTRES	28
-#define CFRAME_SIZE		272
-#define CFRAME_SHIFT_MULTRES	3
-#endif
-#elif LJ_TARGET_PPCSPE
-#define CFRAME_OFS_ERRF		28
-#define CFRAME_OFS_NRES		24
-#define CFRAME_OFS_PREV		20
-#define CFRAME_OFS_L		16
-#define CFRAME_OFS_PC		12
-#define CFRAME_OFS_MULTRES	8
-#define CFRAME_SIZE		184
-#define CFRAME_SHIFT_MULTRES	3
-#elif LJ_TARGET_MIPS
-#define CFRAME_OFS_ERRF		124
-#define CFRAME_OFS_NRES		120
-#define CFRAME_OFS_PREV		116
-#define CFRAME_OFS_L		112
-#define CFRAME_OFS_PC		20
-#define CFRAME_OFS_MULTRES	16
-#define CFRAME_SIZE		112
-#define CFRAME_SHIFT_MULTRES	3
-#else
-#error "Missing CFRAME_* definitions for this architecture"
-#endif
-
-#ifndef CFRAME_SIZE_JIT
-#define CFRAME_SIZE_JIT		CFRAME_SIZE
-#endif
-
-#define CFRAME_RESUME		1
-#define CFRAME_UNWIND_FF	2  /* Only used in unwinder. */
-#define CFRAME_RAWMASK		(~(intptr_t)(CFRAME_RESUME|CFRAME_UNWIND_FF))
-
-#define cframe_errfunc(cf)	(*(int32_t *)(((char *)(cf))+CFRAME_OFS_ERRF))
-#define cframe_nres(cf)		(*(int32_t *)(((char *)(cf))+CFRAME_OFS_NRES))
-#define cframe_prev(cf)		(*(void **)(((char *)(cf))+CFRAME_OFS_PREV))
-#define cframe_multres(cf)  (*(uint32_t *)(((char *)(cf))+CFRAME_OFS_MULTRES))
-#define cframe_multres_n(cf)	(cframe_multres((cf)) >> CFRAME_SHIFT_MULTRES)
-#define cframe_L(cf) \
-  (&gcref(*(GCRef *)(((char *)(cf))+CFRAME_OFS_L))->th)
-#define cframe_pc(cf) \
-  (mref(*(MRef *)(((char *)(cf))+CFRAME_OFS_PC), const BCIns))
-#define setcframe_L(cf, L) \
-  (setmref(*(MRef *)(((char *)(cf))+CFRAME_OFS_L), (L)))
-#define setcframe_pc(cf, pc) \
-  (setmref(*(MRef *)(((char *)(cf))+CFRAME_OFS_PC), (pc)))
-#define cframe_canyield(cf)	((intptr_t)(cf) & CFRAME_RESUME)
-#define cframe_unwind_ff(cf)	((intptr_t)(cf) & CFRAME_UNWIND_FF)
-#define cframe_raw(cf)		((void *)((intptr_t)(cf) & CFRAME_RAWMASK))
-#define cframe_Lpc(L)		cframe_pc(cframe_raw(L->cframe))
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_func.h b/dependencies2013/win32/include/luajit/lj_func.h
deleted file mode 100644
index 901751b9..00000000
--- a/dependencies2013/win32/include/luajit/lj_func.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-** Function handling (prototypes, functions and upvalues).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_FUNC_H
-#define _LJ_FUNC_H
-
-#include "lj_obj.h"
-
-/* Prototypes. */
-LJ_FUNC void LJ_FASTCALL lj_func_freeproto(global_State *g, GCproto *pt);
-
-/* Upvalues. */
-LJ_FUNCA void LJ_FASTCALL lj_func_closeuv(lua_State *L, TValue *level);
-LJ_FUNC void LJ_FASTCALL lj_func_freeuv(global_State *g, GCupval *uv);
-
-/* Functions (closures). */
-LJ_FUNC GCfunc *lj_func_newC(lua_State *L, MSize nelems, GCtab *env);
-LJ_FUNC GCfunc *lj_func_newL_empty(lua_State *L, GCproto *pt, GCtab *env);
-LJ_FUNCA GCfunc *lj_func_newL_gc(lua_State *L, GCproto *pt, GCfuncL *parent);
-LJ_FUNC void LJ_FASTCALL lj_func_free(global_State *g, GCfunc *c);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_gc.h b/dependencies2013/win32/include/luajit/lj_gc.h
deleted file mode 100644
index 57ac7147..00000000
--- a/dependencies2013/win32/include/luajit/lj_gc.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-** Garbage collector.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_GC_H
-#define _LJ_GC_H
-
-#include "lj_obj.h"
-
-/* Garbage collector states. Order matters. */
-enum {
-  GCSpause, GCSpropagate, GCSatomic, GCSsweepstring, GCSsweep, GCSfinalize
-};
-
-/* Bitmasks for marked field of GCobj. */
-#define LJ_GC_WHITE0	0x01
-#define LJ_GC_WHITE1	0x02
-#define LJ_GC_BLACK	0x04
-#define LJ_GC_FINALIZED	0x08
-#define LJ_GC_WEAKKEY	0x08
-#define LJ_GC_WEAKVAL	0x10
-#define LJ_GC_CDATA_FIN	0x10
-#define LJ_GC_FIXED	0x20
-#define LJ_GC_SFIXED	0x40
-
-#define LJ_GC_WHITES	(LJ_GC_WHITE0 | LJ_GC_WHITE1)
-#define LJ_GC_COLORS	(LJ_GC_WHITES | LJ_GC_BLACK)
-#define LJ_GC_WEAK	(LJ_GC_WEAKKEY | LJ_GC_WEAKVAL)
-
-/* Macros to test and set GCobj colors. */
-#define iswhite(x)	((x)->gch.marked & LJ_GC_WHITES)
-#define isblack(x)	((x)->gch.marked & LJ_GC_BLACK)
-#define isgray(x)	(!((x)->gch.marked & (LJ_GC_BLACK|LJ_GC_WHITES)))
-#define tviswhite(x)	(tvisgcv(x) && iswhite(gcV(x)))
-#define otherwhite(g)	(g->gc.currentwhite ^ LJ_GC_WHITES)
-#define isdead(g, v)	((v)->gch.marked & otherwhite(g) & LJ_GC_WHITES)
-
-#define curwhite(g)	((g)->gc.currentwhite & LJ_GC_WHITES)
-#define newwhite(g, x)	(obj2gco(x)->gch.marked = (uint8_t)curwhite(g))
-#define makewhite(g, x) \
-  ((x)->gch.marked = ((x)->gch.marked & (uint8_t)~LJ_GC_COLORS) | curwhite(g))
-#define flipwhite(x)	((x)->gch.marked ^= LJ_GC_WHITES)
-#define black2gray(x)	((x)->gch.marked &= (uint8_t)~LJ_GC_BLACK)
-#define fixstring(s)	((s)->marked |= LJ_GC_FIXED)
-#define markfinalized(x)	((x)->gch.marked |= LJ_GC_FINALIZED)
-
-/* Collector. */
-LJ_FUNC size_t lj_gc_separateudata(global_State *g, int all);
-LJ_FUNC void lj_gc_finalize_udata(lua_State *L);
-#if LJ_HASFFI
-LJ_FUNC void lj_gc_finalize_cdata(lua_State *L);
-#else
-#define lj_gc_finalize_cdata(L)		UNUSED(L)
-#endif
-LJ_FUNC void lj_gc_freeall(global_State *g);
-LJ_FUNCA int LJ_FASTCALL lj_gc_step(lua_State *L);
-LJ_FUNCA void LJ_FASTCALL lj_gc_step_fixtop(lua_State *L);
-#if LJ_HASJIT
-LJ_FUNC int LJ_FASTCALL lj_gc_step_jit(global_State *g, MSize steps);
-#endif
-LJ_FUNC void lj_gc_fullgc(lua_State *L);
-
-/* GC check: drive collector forward if the GC threshold has been reached. */
-#define lj_gc_check(L) \
-  { if (LJ_UNLIKELY(G(L)->gc.total >= G(L)->gc.threshold)) \
-      lj_gc_step(L); }
-#define lj_gc_check_fixtop(L) \
-  { if (LJ_UNLIKELY(G(L)->gc.total >= G(L)->gc.threshold)) \
-      lj_gc_step_fixtop(L); }
-
-/* Write barriers. */
-LJ_FUNC void lj_gc_barrierf(global_State *g, GCobj *o, GCobj *v);
-LJ_FUNCA void LJ_FASTCALL lj_gc_barrieruv(global_State *g, TValue *tv);
-LJ_FUNC void lj_gc_closeuv(global_State *g, GCupval *uv);
-#if LJ_HASJIT
-LJ_FUNC void lj_gc_barriertrace(global_State *g, uint32_t traceno);
-#endif
-
-/* Move the GC propagation frontier back for tables (make it gray again). */
-static LJ_AINLINE void lj_gc_barrierback(global_State *g, GCtab *t)
-{
-  GCobj *o = obj2gco(t);
-  lua_assert(isblack(o) && !isdead(g, o));
-  lua_assert(g->gc.state != GCSfinalize && g->gc.state != GCSpause);
-  black2gray(o);
-  setgcrefr(t->gclist, g->gc.grayagain);
-  setgcref(g->gc.grayagain, o);
-}
-
-/* Barrier for stores to table objects. TValue and GCobj variant. */
-#define lj_gc_anybarriert(L, t)  \
-  { if (LJ_UNLIKELY(isblack(obj2gco(t)))) lj_gc_barrierback(G(L), (t)); }
-#define lj_gc_barriert(L, t, tv) \
-  { if (tviswhite(tv) && isblack(obj2gco(t))) \
-      lj_gc_barrierback(G(L), (t)); }
-#define lj_gc_objbarriert(L, t, o)  \
-  { if (iswhite(obj2gco(o)) && isblack(obj2gco(t))) \
-      lj_gc_barrierback(G(L), (t)); }
-
-/* Barrier for stores to any other object. TValue and GCobj variant. */
-#define lj_gc_barrier(L, p, tv) \
-  { if (tviswhite(tv) && isblack(obj2gco(p))) \
-      lj_gc_barrierf(G(L), obj2gco(p), gcV(tv)); }
-#define lj_gc_objbarrier(L, p, o) \
-  { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
-      lj_gc_barrierf(G(L), obj2gco(p), obj2gco(o)); }
-
-/* Allocator. */
-LJ_FUNC void *lj_mem_realloc(lua_State *L, void *p, MSize osz, MSize nsz);
-LJ_FUNC void * LJ_FASTCALL lj_mem_newgco(lua_State *L, MSize size);
-LJ_FUNC void *lj_mem_grow(lua_State *L, void *p,
-			  MSize *szp, MSize lim, MSize esz);
-
-#define lj_mem_new(L, s)	lj_mem_realloc(L, NULL, 0, (s))
-
-static LJ_AINLINE void lj_mem_free(global_State *g, void *p, size_t osize)
-{
-  g->gc.total -= (MSize)osize;
-  g->allocf(g->allocd, p, osize, 0);
-}
-
-#define lj_mem_newvec(L, n, t)	((t *)lj_mem_new(L, (MSize)((n)*sizeof(t))))
-#define lj_mem_reallocvec(L, p, on, n, t) \
-  ((p) = (t *)lj_mem_realloc(L, p, (on)*sizeof(t), (MSize)((n)*sizeof(t))))
-#define lj_mem_growvec(L, p, n, m, t) \
-  ((p) = (t *)lj_mem_grow(L, (p), &(n), (m), (MSize)sizeof(t)))
-#define lj_mem_freevec(g, p, n, t)	lj_mem_free(g, (p), (n)*sizeof(t))
-
-#define lj_mem_newobj(L, t)	((t *)lj_mem_newgco(L, sizeof(t)))
-#define lj_mem_newt(L, s, t)	((t *)lj_mem_new(L, (s)))
-#define lj_mem_freet(g, p)	lj_mem_free(g, (p), sizeof(*(p)))
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_gdbjit.h b/dependencies2013/win32/include/luajit/lj_gdbjit.h
deleted file mode 100644
index bbaa1568..00000000
--- a/dependencies2013/win32/include/luajit/lj_gdbjit.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-** Client for the GDB JIT API.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_GDBJIT_H
-#define _LJ_GDBJIT_H
-
-#include "lj_obj.h"
-#include "lj_jit.h"
-
-#if LJ_HASJIT && defined(LUAJIT_USE_GDBJIT)
-
-LJ_FUNC void lj_gdbjit_addtrace(jit_State *J, GCtrace *T);
-LJ_FUNC void lj_gdbjit_deltrace(jit_State *J, GCtrace *T);
-
-#else
-#define lj_gdbjit_addtrace(J, T)	UNUSED(T)
-#define lj_gdbjit_deltrace(J, T)	UNUSED(T)
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_ir.h b/dependencies2013/win32/include/luajit/lj_ir.h
deleted file mode 100644
index ded3e0eb..00000000
--- a/dependencies2013/win32/include/luajit/lj_ir.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
-** SSA IR (Intermediate Representation) format.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_IR_H
-#define _LJ_IR_H
-
-#include "lj_obj.h"
-
-/* -- IR instructions ----------------------------------------------------- */
-
-/* IR instruction definition. Order matters, see below. ORDER IR */
-#define IRDEF(_) \
-  /* Guarded assertions. */ \
-  /* Must be properly aligned to flip opposites (^1) and (un)ordered (^4). */ \
-  _(LT,		N , ref, ref) \
-  _(GE,		N , ref, ref) \
-  _(LE,		N , ref, ref) \
-  _(GT,		N , ref, ref) \
-  \
-  _(ULT,	N , ref, ref) \
-  _(UGE,	N , ref, ref) \
-  _(ULE,	N , ref, ref) \
-  _(UGT,	N , ref, ref) \
-  \
-  _(EQ,		C , ref, ref) \
-  _(NE,		C , ref, ref) \
-  \
-  _(ABC,	N , ref, ref) \
-  _(RETF,	S , ref, ref) \
-  \
-  /* Miscellaneous ops. */ \
-  _(NOP,	N , ___, ___) \
-  _(BASE,	N , lit, lit) \
-  _(PVAL,	N , lit, ___) \
-  _(GCSTEP,	S , ___, ___) \
-  _(HIOP,	S , ref, ref) \
-  _(LOOP,	S , ___, ___) \
-  _(USE,	S , ref, ___) \
-  _(PHI,	S , ref, ref) \
-  _(RENAME,	S , ref, lit) \
-  \
-  /* Constants. */ \
-  _(KPRI,	N , ___, ___) \
-  _(KINT,	N , cst, ___) \
-  _(KGC,	N , cst, ___) \
-  _(KPTR,	N , cst, ___) \
-  _(KKPTR,	N , cst, ___) \
-  _(KNULL,	N , cst, ___) \
-  _(KNUM,	N , cst, ___) \
-  _(KINT64,	N , cst, ___) \
-  _(KSLOT,	N , ref, lit) \
-  \
-  /* Bit ops. */ \
-  _(BNOT,	N , ref, ___) \
-  _(BSWAP,	N , ref, ___) \
-  _(BAND,	C , ref, ref) \
-  _(BOR,	C , ref, ref) \
-  _(BXOR,	C , ref, ref) \
-  _(BSHL,	N , ref, ref) \
-  _(BSHR,	N , ref, ref) \
-  _(BSAR,	N , ref, ref) \
-  _(BROL,	N , ref, ref) \
-  _(BROR,	N , ref, ref) \
-  \
-  /* Arithmetic ops. ORDER ARITH */ \
-  _(ADD,	C , ref, ref) \
-  _(SUB,	N , ref, ref) \
-  _(MUL,	C , ref, ref) \
-  _(DIV,	N , ref, ref) \
-  _(MOD,	N , ref, ref) \
-  _(POW,	N , ref, ref) \
-  _(NEG,	N , ref, ref) \
-  \
-  _(ABS,	N , ref, ref) \
-  _(ATAN2,	N , ref, ref) \
-  _(LDEXP,	N , ref, ref) \
-  _(MIN,	C , ref, ref) \
-  _(MAX,	C , ref, ref) \
-  _(FPMATH,	N , ref, lit) \
-  \
-  /* Overflow-checking arithmetic ops. */ \
-  _(ADDOV,	CW, ref, ref) \
-  _(SUBOV,	NW, ref, ref) \
-  _(MULOV,	CW, ref, ref) \
-  \
-  /* Memory ops. A = array, H = hash, U = upvalue, F = field, S = stack. */ \
-  \
-  /* Memory references. */ \
-  _(AREF,	R , ref, ref) \
-  _(HREFK,	R , ref, ref) \
-  _(HREF,	L , ref, ref) \
-  _(NEWREF,	S , ref, ref) \
-  _(UREFO,	LW, ref, lit) \
-  _(UREFC,	LW, ref, lit) \
-  _(FREF,	R , ref, lit) \
-  _(STRREF,	N , ref, ref) \
-  \
-  /* Loads and Stores. These must be in the same order. */ \
-  _(ALOAD,	L , ref, ___) \
-  _(HLOAD,	L , ref, ___) \
-  _(ULOAD,	L , ref, ___) \
-  _(FLOAD,	L , ref, lit) \
-  _(XLOAD,	L , ref, lit) \
-  _(SLOAD,	L , lit, lit) \
-  _(VLOAD,	L , ref, ___) \
-  \
-  _(ASTORE,	S , ref, ref) \
-  _(HSTORE,	S , ref, ref) \
-  _(USTORE,	S , ref, ref) \
-  _(FSTORE,	S , ref, ref) \
-  _(XSTORE,	S , ref, ref) \
-  \
-  /* Allocations. */ \
-  _(SNEW,	N , ref, ref)  /* CSE is ok, not marked as A. */ \
-  _(XSNEW,	A , ref, ref) \
-  _(TNEW,	AW, lit, lit) \
-  _(TDUP,	AW, ref, ___) \
-  _(CNEW,	AW, ref, ref) \
-  _(CNEWI,	NW, ref, ref)  /* CSE is ok, not marked as A. */ \
-  \
-  /* Barriers. */ \
-  _(TBAR,	S , ref, ___) \
-  _(OBAR,	S , ref, ref) \
-  _(XBAR,	S , ___, ___) \
-  \
-  /* Type conversions. */ \
-  _(CONV,	NW, ref, lit) \
-  _(TOBIT,	N , ref, ref) \
-  _(TOSTR,	N , ref, ___) \
-  _(STRTO,	N , ref, ___) \
-  \
-  /* Calls. */ \
-  _(CALLN,	N , ref, lit) \
-  _(CALLL,	L , ref, lit) \
-  _(CALLS,	S , ref, lit) \
-  _(CALLXS,	S , ref, ref) \
-  _(CARG,	N , ref, ref) \
-  \
-  /* End of list. */
-
-/* IR opcodes (max. 256). */
-typedef enum {
-#define IRENUM(name, m, m1, m2)	IR_##name,
-IRDEF(IRENUM)
-#undef IRENUM
-  IR__MAX
-} IROp;
-
-/* Stored opcode. */
-typedef uint8_t IROp1;
-
-LJ_STATIC_ASSERT(((int)IR_EQ^1) == (int)IR_NE);
-LJ_STATIC_ASSERT(((int)IR_LT^1) == (int)IR_GE);
-LJ_STATIC_ASSERT(((int)IR_LE^1) == (int)IR_GT);
-LJ_STATIC_ASSERT(((int)IR_LT^3) == (int)IR_GT);
-LJ_STATIC_ASSERT(((int)IR_LT^4) == (int)IR_ULT);
-
-/* Delta between xLOAD and xSTORE. */
-#define IRDELTA_L2S		((int)IR_ASTORE - (int)IR_ALOAD)
-
-LJ_STATIC_ASSERT((int)IR_HLOAD + IRDELTA_L2S == (int)IR_HSTORE);
-LJ_STATIC_ASSERT((int)IR_ULOAD + IRDELTA_L2S == (int)IR_USTORE);
-LJ_STATIC_ASSERT((int)IR_FLOAD + IRDELTA_L2S == (int)IR_FSTORE);
-LJ_STATIC_ASSERT((int)IR_XLOAD + IRDELTA_L2S == (int)IR_XSTORE);
-
-/* -- Named IR literals --------------------------------------------------- */
-
-/* FPMATH sub-functions. ORDER FPM. */
-#define IRFPMDEF(_) \
-  _(FLOOR) _(CEIL) _(TRUNC)  /* Must be first and in this order. */ \
-  _(SQRT) _(EXP) _(EXP2) _(LOG) _(LOG2) _(LOG10) \
-  _(SIN) _(COS) _(TAN) \
-  _(OTHER)
-
-typedef enum {
-#define FPMENUM(name)		IRFPM_##name,
-IRFPMDEF(FPMENUM)
-#undef FPMENUM
-  IRFPM__MAX
-} IRFPMathOp;
-
-/* FLOAD fields. */
-#define IRFLDEF(_) \
-  _(STR_LEN,	offsetof(GCstr, len)) \
-  _(FUNC_ENV,	offsetof(GCfunc, l.env)) \
-  _(FUNC_PC,	offsetof(GCfunc, l.pc)) \
-  _(TAB_META,	offsetof(GCtab, metatable)) \
-  _(TAB_ARRAY,	offsetof(GCtab, array)) \
-  _(TAB_NODE,	offsetof(GCtab, node)) \
-  _(TAB_ASIZE,	offsetof(GCtab, asize)) \
-  _(TAB_HMASK,	offsetof(GCtab, hmask)) \
-  _(TAB_NOMM,	offsetof(GCtab, nomm)) \
-  _(UDATA_META,	offsetof(GCudata, metatable)) \
-  _(UDATA_UDTYPE, offsetof(GCudata, udtype)) \
-  _(UDATA_FILE,	sizeof(GCudata)) \
-  _(CDATA_CTYPEID, offsetof(GCcdata, ctypeid)) \
-  _(CDATA_PTR,	sizeof(GCcdata)) \
-  _(CDATA_INT, sizeof(GCcdata)) \
-  _(CDATA_INT64, sizeof(GCcdata)) \
-  _(CDATA_INT64_4, sizeof(GCcdata) + 4)
-
-typedef enum {
-#define FLENUM(name, ofs)	IRFL_##name,
-IRFLDEF(FLENUM)
-#undef FLENUM
-  IRFL__MAX
-} IRFieldID;
-
-/* SLOAD mode bits, stored in op2. */
-#define IRSLOAD_PARENT		0x01	/* Coalesce with parent trace. */
-#define IRSLOAD_FRAME		0x02	/* Load hiword of frame. */
-#define IRSLOAD_TYPECHECK	0x04	/* Needs type check. */
-#define IRSLOAD_CONVERT		0x08	/* Number to integer conversion. */
-#define IRSLOAD_READONLY	0x10	/* Read-only, omit slot store. */
-#define IRSLOAD_INHERIT		0x20	/* Inherited by exits/side traces. */
-
-/* XLOAD mode, stored in op2. */
-#define IRXLOAD_READONLY	1	/* Load from read-only data. */
-#define IRXLOAD_VOLATILE	2	/* Load from volatile data. */
-#define IRXLOAD_UNALIGNED	4	/* Unaligned load. */
-
-/* CONV mode, stored in op2. */
-#define IRCONV_SRCMASK		0x001f	/* Source IRType. */
-#define IRCONV_DSTMASK		0x03e0	/* Dest. IRType (also in ir->t). */
-#define IRCONV_DSH		5
-#define IRCONV_NUM_INT		((IRT_NUM<<IRCONV_DSH)|IRT_INT)
-#define IRCONV_INT_NUM		((IRT_INT<<IRCONV_DSH)|IRT_NUM)
-#define IRCONV_TRUNC		0x0400	/* Truncate number to integer. */
-#define IRCONV_SEXT		0x0800	/* Sign-extend integer to integer. */
-#define IRCONV_MODEMASK		0x0fff
-#define IRCONV_CONVMASK		0xf000
-#define IRCONV_CSH		12
-/* Number to integer conversion mode. Ordered by strength of the checks. */
-#define IRCONV_TOBIT  (0<<IRCONV_CSH)	/* None. Cache only: TOBIT conv. */
-#define IRCONV_ANY    (1<<IRCONV_CSH)	/* Any FP number is ok. */
-#define IRCONV_INDEX  (2<<IRCONV_CSH)	/* Check + special backprop rules. */
-#define IRCONV_CHECK  (3<<IRCONV_CSH)	/* Number checked for integerness. */
-
-/* -- IR operands --------------------------------------------------------- */
-
-/* IR operand mode (2 bit). */
-typedef enum {
-  IRMref,		/* IR reference. */
-  IRMlit,		/* 16 bit unsigned literal. */
-  IRMcst,		/* Constant literal: i, gcr or ptr. */
-  IRMnone		/* Unused operand. */
-} IRMode;
-#define IRM___		IRMnone
-
-/* Mode bits: Commutative, {Normal/Ref, Alloc, Load, Store}, Non-weak guard. */
-#define IRM_C			0x10
-
-#define IRM_N			0x00
-#define IRM_R			IRM_N
-#define IRM_A			0x20
-#define IRM_L			0x40
-#define IRM_S			0x60
-
-#define IRM_W			0x80
-
-#define IRM_NW			(IRM_N|IRM_W)
-#define IRM_CW			(IRM_C|IRM_W)
-#define IRM_AW			(IRM_A|IRM_W)
-#define IRM_LW			(IRM_L|IRM_W)
-
-#define irm_op1(m)		((IRMode)((m)&3))
-#define irm_op2(m)		((IRMode)(((m)>>2)&3))
-#define irm_iscomm(m)		((m) & IRM_C)
-#define irm_kind(m)		((m) & IRM_S)
-
-#define IRMODE(name, m, m1, m2)	(((IRM##m1)|((IRM##m2)<<2)|(IRM_##m))^IRM_W),
-
-LJ_DATA const uint8_t lj_ir_mode[IR__MAX+1];
-
-/* -- IR instruction types ------------------------------------------------ */
-
-/* Map of itypes to non-negative numbers. ORDER LJ_T.
-** LJ_TUPVAL/LJ_TTRACE never appear in a TValue. Use these itypes for
-** IRT_P32 and IRT_P64, which never escape the IR.
-** The various integers are only used in the IR and can only escape to
-** a TValue after implicit or explicit conversion. Their types must be
-** contiguous and next to IRT_NUM (see the typerange macros below).
-*/
-#define IRTDEF(_) \
-  _(NIL, 4) _(FALSE, 4) _(TRUE, 4) _(LIGHTUD, LJ_64 ? 8 : 4) _(STR, 4) \
-  _(P32, 4) _(THREAD, 4) _(PROTO, 4) _(FUNC, 4) _(P64, 8) _(CDATA, 4) \
-  _(TAB, 4) _(UDATA, 4) \
-  _(FLOAT, 4) _(NUM, 8) _(I8, 1) _(U8, 1) _(I16, 2) _(U16, 2) \
-  _(INT, 4) _(U32, 4) _(I64, 8) _(U64, 8) \
-  _(SOFTFP, 4)  /* There is room for 9 more types. */
-
-/* IR result type and flags (8 bit). */
-typedef enum {
-#define IRTENUM(name, size)	IRT_##name,
-IRTDEF(IRTENUM)
-#undef IRTENUM
-  IRT__MAX,
-
-  /* Native pointer type and the corresponding integer type. */
-  IRT_PTR = LJ_64 ? IRT_P64 : IRT_P32,
-  IRT_INTP = LJ_64 ? IRT_I64 : IRT_INT,
-  IRT_UINTP = LJ_64 ? IRT_U64 : IRT_U32,
-
-  /* Additional flags. */
-  IRT_MARK = 0x20,	/* Marker for misc. purposes. */
-  IRT_ISPHI = 0x40,	/* Instruction is left or right PHI operand. */
-  IRT_GUARD = 0x80,	/* Instruction is a guard. */
-
-  /* Masks. */
-  IRT_TYPE = 0x1f,
-  IRT_T = 0xff
-} IRType;
-
-#define irtype_ispri(irt)	((uint32_t)(irt) <= IRT_TRUE)
-
-/* Stored IRType. */
-typedef struct IRType1 { uint8_t irt; } IRType1;
-
-#define IRT(o, t)		((uint32_t)(((o)<<8) | (t)))
-#define IRTI(o)			(IRT((o), IRT_INT))
-#define IRTN(o)			(IRT((o), IRT_NUM))
-#define IRTG(o, t)		(IRT((o), IRT_GUARD|(t)))
-#define IRTGI(o)		(IRT((o), IRT_GUARD|IRT_INT))
-
-#define irt_t(t)		((IRType)(t).irt)
-#define irt_type(t)		((IRType)((t).irt & IRT_TYPE))
-#define irt_sametype(t1, t2)	((((t1).irt ^ (t2).irt) & IRT_TYPE) == 0)
-#define irt_typerange(t, first, last) \
-  ((uint32_t)((t).irt & IRT_TYPE) - (uint32_t)(first) <= (uint32_t)(last-first))
-
-#define irt_isnil(t)		(irt_type(t) == IRT_NIL)
-#define irt_ispri(t)		((uint32_t)irt_type(t) <= IRT_TRUE)
-#define irt_islightud(t)	(irt_type(t) == IRT_LIGHTUD)
-#define irt_isstr(t)		(irt_type(t) == IRT_STR)
-#define irt_istab(t)		(irt_type(t) == IRT_TAB)
-#define irt_iscdata(t)		(irt_type(t) == IRT_CDATA)
-#define irt_isfloat(t)		(irt_type(t) == IRT_FLOAT)
-#define irt_isnum(t)		(irt_type(t) == IRT_NUM)
-#define irt_isint(t)		(irt_type(t) == IRT_INT)
-#define irt_isi8(t)		(irt_type(t) == IRT_I8)
-#define irt_isu8(t)		(irt_type(t) == IRT_U8)
-#define irt_isi16(t)		(irt_type(t) == IRT_I16)
-#define irt_isu16(t)		(irt_type(t) == IRT_U16)
-#define irt_isu32(t)		(irt_type(t) == IRT_U32)
-#define irt_isi64(t)		(irt_type(t) == IRT_I64)
-#define irt_isu64(t)		(irt_type(t) == IRT_U64)
-
-#define irt_isfp(t)		(irt_isnum(t) || irt_isfloat(t))
-#define irt_isinteger(t)	(irt_typerange((t), IRT_I8, IRT_INT))
-#define irt_isgcv(t)		(irt_typerange((t), IRT_STR, IRT_UDATA))
-#define irt_isaddr(t)		(irt_typerange((t), IRT_LIGHTUD, IRT_UDATA))
-#define irt_isint64(t)		(irt_typerange((t), IRT_I64, IRT_U64))
-
-#if LJ_64
-#define IRT_IS64 \
-  ((1u<<IRT_NUM)|(1u<<IRT_I64)|(1u<<IRT_U64)|(1u<<IRT_P64)|(1u<<IRT_LIGHTUD))
-#else
-#define IRT_IS64 \
-  ((1u<<IRT_NUM)|(1u<<IRT_I64)|(1u<<IRT_U64))
-#endif
-
-#define irt_is64(t)		((IRT_IS64 >> irt_type(t)) & 1)
-#define irt_is64orfp(t)		(((IRT_IS64|(1u<<IRT_FLOAT))>>irt_type(t)) & 1)
-
-#define irt_size(t)		(lj_ir_type_size[irt_t((t))])
-
-LJ_DATA const uint8_t lj_ir_type_size[];
-
-static LJ_AINLINE IRType itype2irt(const TValue *tv)
-{
-  if (tvisint(tv))
-    return IRT_INT;
-  else if (tvisnum(tv))
-    return IRT_NUM;
-#if LJ_64
-  else if (tvislightud(tv))
-    return IRT_LIGHTUD;
-#endif
-  else
-    return (IRType)~itype(tv);
-}
-
-static LJ_AINLINE uint32_t irt_toitype_(IRType t)
-{
-  lua_assert(!LJ_64 || t != IRT_LIGHTUD);
-  if (LJ_DUALNUM && t > IRT_NUM) {
-    return LJ_TISNUM;
-  } else {
-    lua_assert(t <= IRT_NUM);
-    return ~(uint32_t)t;
-  }
-}
-
-#define irt_toitype(t)		irt_toitype_(irt_type((t)))
-
-#define irt_isguard(t)		((t).irt & IRT_GUARD)
-#define irt_ismarked(t)		((t).irt & IRT_MARK)
-#define irt_setmark(t)		((t).irt |= IRT_MARK)
-#define irt_clearmark(t)	((t).irt &= ~IRT_MARK)
-#define irt_isphi(t)		((t).irt & IRT_ISPHI)
-#define irt_setphi(t)		((t).irt |= IRT_ISPHI)
-#define irt_clearphi(t)		((t).irt &= ~IRT_ISPHI)
-
-/* Stored combined IR opcode and type. */
-typedef uint16_t IROpT;
-
-/* -- IR references ------------------------------------------------------- */
-
-/* IR references. */
-typedef uint16_t IRRef1;	/* One stored reference. */
-typedef uint32_t IRRef2;	/* Two stored references. */
-typedef uint32_t IRRef;		/* Used to pass around references. */
-
-/* Fixed references. */
-enum {
-  REF_BIAS =	0x8000,
-  REF_TRUE =	REF_BIAS-3,
-  REF_FALSE =	REF_BIAS-2,
-  REF_NIL =	REF_BIAS-1,	/* \--- Constants grow downwards. */
-  REF_BASE =	REF_BIAS,	/* /--- IR grows upwards. */
-  REF_FIRST =	REF_BIAS+1,
-  REF_DROP =	0xffff
-};
-
-/* Note: IRMlit operands must be < REF_BIAS, too!
-** This allows for fast and uniform manipulation of all operands
-** without looking up the operand mode in lj_ir_mode:
-** - CSE calculates the maximum reference of two operands.
-**   This must work with mixed reference/literal operands, too.
-** - DCE marking only checks for operand >= REF_BIAS.
-** - LOOP needs to substitute reference operands.
-**   Constant references and literals must not be modified.
-*/
-
-#define IRREF2(lo, hi)		((IRRef2)(lo) | ((IRRef2)(hi) << 16))
-
-#define irref_isk(ref)		((ref) < REF_BIAS)
-
-/* Tagged IR references (32 bit).
-**
-** +-------+-------+---------------+
-** |  irt  | flags |      ref      |
-** +-------+-------+---------------+
-**
-** The tag holds a copy of the IRType and speeds up IR type checks.
-*/
-typedef uint32_t TRef;
-
-#define TREF_REFMASK		0x0000ffff
-#define TREF_FRAME		0x00010000
-#define TREF_CONT		0x00020000
-
-#define TREF(ref, t)		((TRef)((ref) + ((t)<<24)))
-
-#define tref_ref(tr)		((IRRef1)(tr))
-#define tref_t(tr)		((IRType)((tr)>>24))
-#define tref_type(tr)		((IRType)(((tr)>>24) & IRT_TYPE))
-#define tref_typerange(tr, first, last) \
-  ((((tr)>>24) & IRT_TYPE) - (TRef)(first) <= (TRef)(last-first))
-
-#define tref_istype(tr, t)	(((tr) & (IRT_TYPE<<24)) == ((t)<<24))
-#define tref_isnil(tr)		(tref_istype((tr), IRT_NIL))
-#define tref_isfalse(tr)	(tref_istype((tr), IRT_FALSE))
-#define tref_istrue(tr)		(tref_istype((tr), IRT_TRUE))
-#define tref_isstr(tr)		(tref_istype((tr), IRT_STR))
-#define tref_isfunc(tr)		(tref_istype((tr), IRT_FUNC))
-#define tref_iscdata(tr)	(tref_istype((tr), IRT_CDATA))
-#define tref_istab(tr)		(tref_istype((tr), IRT_TAB))
-#define tref_isudata(tr)	(tref_istype((tr), IRT_UDATA))
-#define tref_isnum(tr)		(tref_istype((tr), IRT_NUM))
-#define tref_isint(tr)		(tref_istype((tr), IRT_INT))
-
-#define tref_isbool(tr)		(tref_typerange((tr), IRT_FALSE, IRT_TRUE))
-#define tref_ispri(tr)		(tref_typerange((tr), IRT_NIL, IRT_TRUE))
-#define tref_istruecond(tr)	(!tref_typerange((tr), IRT_NIL, IRT_FALSE))
-#define tref_isinteger(tr)	(tref_typerange((tr), IRT_I8, IRT_INT))
-#define tref_isnumber(tr)	(tref_typerange((tr), IRT_NUM, IRT_INT))
-#define tref_isnumber_str(tr)	(tref_isnumber((tr)) || tref_isstr((tr)))
-#define tref_isgcv(tr)		(tref_typerange((tr), IRT_STR, IRT_UDATA))
-
-#define tref_isk(tr)		(irref_isk(tref_ref((tr))))
-#define tref_isk2(tr1, tr2)	(irref_isk(tref_ref((tr1) | (tr2))))
-
-#define TREF_PRI(t)		(TREF(REF_NIL-(t), (t)))
-#define TREF_NIL		(TREF_PRI(IRT_NIL))
-#define TREF_FALSE		(TREF_PRI(IRT_FALSE))
-#define TREF_TRUE		(TREF_PRI(IRT_TRUE))
-
-/* -- IR format ----------------------------------------------------------- */
-
-/* IR instruction format (64 bit).
-**
-**    16      16     8   8   8   8
-** +-------+-------+---+---+---+---+
-** |  op1  |  op2  | t | o | r | s |
-** +-------+-------+---+---+---+---+
-** |  op12/i/gco   |   ot  | prev  | (alternative fields in union)
-** +---------------+-------+-------+
-**        32           16      16
-**
-** prev is only valid prior to register allocation and then reused for r + s.
-*/
-
-typedef union IRIns {
-  struct {
-    LJ_ENDIAN_LOHI(
-      IRRef1 op1;	/* IR operand 1. */
-    , IRRef1 op2;	/* IR operand 2. */
-    )
-    IROpT ot;		/* IR opcode and type (overlaps t and o). */
-    IRRef1 prev;	/* Previous ins in same chain (overlaps r and s). */
-  };
-  struct {
-    IRRef2 op12;	/* IR operand 1 and 2 (overlaps op1 and op2). */
-    LJ_ENDIAN_LOHI(
-      IRType1 t;	/* IR type. */
-    , IROp1 o;		/* IR opcode. */
-    )
-    LJ_ENDIAN_LOHI(
-      uint8_t r;	/* Register allocation (overlaps prev). */
-    , uint8_t s;	/* Spill slot allocation (overlaps prev). */
-    )
-  };
-  int32_t i;		/* 32 bit signed integer literal (overlaps op12). */
-  GCRef gcr;		/* GCobj constant (overlaps op12). */
-  MRef ptr;		/* Pointer constant (overlaps op12). */
-} IRIns;
-
-#define ir_kgc(ir)	check_exp((ir)->o == IR_KGC, gcref((ir)->gcr))
-#define ir_kstr(ir)	(gco2str(ir_kgc((ir))))
-#define ir_ktab(ir)	(gco2tab(ir_kgc((ir))))
-#define ir_kfunc(ir)	(gco2func(ir_kgc((ir))))
-#define ir_kcdata(ir)	(gco2cd(ir_kgc((ir))))
-#define ir_knum(ir)	check_exp((ir)->o == IR_KNUM, mref((ir)->ptr, cTValue))
-#define ir_kint64(ir)	check_exp((ir)->o == IR_KINT64, mref((ir)->ptr,cTValue))
-#define ir_k64(ir) \
-  check_exp((ir)->o == IR_KNUM || (ir)->o == IR_KINT64, mref((ir)->ptr,cTValue))
-#define ir_kptr(ir) \
-  check_exp((ir)->o == IR_KPTR || (ir)->o == IR_KKPTR, mref((ir)->ptr, void))
-
-/* A store or any other op with a non-weak guard has a side-effect. */
-static LJ_AINLINE int ir_sideeff(IRIns *ir)
-{
-  return (((ir->t.irt | ~IRT_GUARD) & lj_ir_mode[ir->o]) >= IRM_S);
-}
-
-LJ_STATIC_ASSERT((int)IRT_GUARD == (int)IRM_W);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_ircall.h b/dependencies2013/win32/include/luajit/lj_ircall.h
deleted file mode 100644
index 44afde3a..00000000
--- a/dependencies2013/win32/include/luajit/lj_ircall.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-** IR CALL* instruction definitions.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_IRCALL_H
-#define _LJ_IRCALL_H
-
-#include "lj_obj.h"
-#include "lj_ir.h"
-#include "lj_jit.h"
-
-/* C call info for CALL* instructions. */
-typedef struct CCallInfo {
-  ASMFunction func;		/* Function pointer. */
-  uint32_t flags;		/* Number of arguments and flags. */
-} CCallInfo;
-
-#define CCI_NARGS(ci)		((ci)->flags & 0xff)	/* Extract # of args. */
-#define CCI_NARGS_MAX		32			/* Max. # of args. */
-
-#define CCI_OTSHIFT		16
-#define CCI_OPTYPE(ci)		((ci)->flags >> CCI_OTSHIFT)  /* Get op/type. */
-#define CCI_OPSHIFT		24
-#define CCI_OP(ci)		((ci)->flags >> CCI_OPSHIFT)  /* Get op. */
-
-#define CCI_CALL_N		(IR_CALLN << CCI_OPSHIFT)
-#define CCI_CALL_L		(IR_CALLL << CCI_OPSHIFT)
-#define CCI_CALL_S		(IR_CALLS << CCI_OPSHIFT)
-#define CCI_CALL_FN		(CCI_CALL_N|CCI_CC_FASTCALL)
-#define CCI_CALL_FL		(CCI_CALL_L|CCI_CC_FASTCALL)
-#define CCI_CALL_FS		(CCI_CALL_S|CCI_CC_FASTCALL)
-
-/* C call info flags. */
-#define CCI_L			0x0100	/* Implicit L arg. */
-#define CCI_CASTU64		0x0200	/* Cast u64 result to number. */
-#define CCI_NOFPRCLOBBER	0x0400	/* Does not clobber any FPRs. */
-#define CCI_VARARG		0x0800	/* Vararg function. */
-
-#define CCI_CC_MASK		0x3000	/* Calling convention mask. */
-#define CCI_CC_SHIFT		12
-/* ORDER CC */
-#define CCI_CC_CDECL		0x0000	/* Default cdecl calling convention. */
-#define CCI_CC_THISCALL		0x1000	/* Thiscall calling convention. */
-#define CCI_CC_FASTCALL		0x2000	/* Fastcall calling convention. */
-#define CCI_CC_STDCALL		0x3000	/* Stdcall calling convention. */
-
-/* Helpers for conditional function definitions. */
-#define IRCALLCOND_ANY(x)		x
-
-#if LJ_TARGET_X86ORX64
-#define IRCALLCOND_FPMATH(x)		NULL
-#else
-#define IRCALLCOND_FPMATH(x)		x
-#endif
-
-#if LJ_SOFTFP
-#define IRCALLCOND_SOFTFP(x)		x
-#if LJ_HASFFI
-#define IRCALLCOND_SOFTFP_FFI(x)	x
-#else
-#define IRCALLCOND_SOFTFP_FFI(x)	NULL
-#endif
-#else
-#define IRCALLCOND_SOFTFP(x)		NULL
-#define IRCALLCOND_SOFTFP_FFI(x)	NULL
-#endif
-
-#define LJ_NEED_FP64	(LJ_TARGET_ARM || LJ_TARGET_PPC || LJ_TARGET_MIPS)
-
-#if LJ_HASFFI && (LJ_SOFTFP || LJ_NEED_FP64)
-#define IRCALLCOND_FP64_FFI(x)		x
-#else
-#define IRCALLCOND_FP64_FFI(x)		NULL
-#endif
-
-#if LJ_HASFFI
-#define IRCALLCOND_FFI(x)		x
-#if LJ_32
-#define IRCALLCOND_FFI32(x)		x
-#else
-#define IRCALLCOND_FFI32(x)		NULL
-#endif
-#else
-#define IRCALLCOND_FFI(x)		NULL
-#define IRCALLCOND_FFI32(x)		NULL
-#endif
-
-#if LJ_SOFTFP
-#define ARG1_FP		2	/* Treat as 2 32 bit arguments. */
-#else
-#define ARG1_FP		1
-#endif
-
-#if LJ_32
-#define ARG2_64		4	/* Treat as 4 32 bit arguments. */
-#else
-#define ARG2_64		2
-#endif
-
-/* Function definitions for CALL* instructions. */
-#define IRCALLDEF(_) \
-  _(ANY,	lj_str_cmp,		2,  FN, INT, CCI_NOFPRCLOBBER) \
-  _(ANY,	lj_str_new,		3,   S, STR, CCI_L) \
-  _(ANY,	lj_strscan_num,		2,  FN, INT, 0) \
-  _(ANY,	lj_str_fromint,		2,  FN, STR, CCI_L) \
-  _(ANY,	lj_str_fromnum,		2,  FN, STR, CCI_L) \
-  _(ANY,	lj_tab_new1,		2,  FS, TAB, CCI_L) \
-  _(ANY,	lj_tab_dup,		2,  FS, TAB, CCI_L) \
-  _(ANY,	lj_tab_newkey,		3,   S, P32, CCI_L) \
-  _(ANY,	lj_tab_len,		1,  FL, INT, 0) \
-  _(ANY,	lj_gc_step_jit,		2,  FS, NIL, CCI_L) \
-  _(ANY,	lj_gc_barrieruv,	2,  FS, NIL, 0) \
-  _(ANY,	lj_mem_newgco,		2,  FS, P32, CCI_L) \
-  _(ANY,	lj_math_random_step, 1, FS, NUM, CCI_CASTU64) \
-  _(ANY,	lj_vm_modi,		2,  FN, INT, 0) \
-  _(ANY,	sinh,			ARG1_FP,  N, NUM, 0) \
-  _(ANY,	cosh,			ARG1_FP,  N, NUM, 0) \
-  _(ANY,	tanh,			ARG1_FP,  N, NUM, 0) \
-  _(ANY,	fputc,			2,  S, INT, 0) \
-  _(ANY,	fwrite,			4,  S, INT, 0) \
-  _(ANY,	fflush,			1,  S, INT, 0) \
-  /* ORDER FPM */ \
-  _(FPMATH,	lj_vm_floor,		ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	lj_vm_ceil,		ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	lj_vm_trunc,		ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	sqrt,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	exp,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	lj_vm_exp2,		ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	log,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	lj_vm_log2,		ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	log10,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	sin,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	cos,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	tan,			ARG1_FP,   N, NUM, 0) \
-  _(FPMATH,	lj_vm_powi,		ARG1_FP+1, N, NUM, 0) \
-  _(FPMATH,	pow,			ARG1_FP*2, N, NUM, 0) \
-  _(FPMATH,	atan2,			ARG1_FP*2, N, NUM, 0) \
-  _(FPMATH,	ldexp,			ARG1_FP+1, N, NUM, 0) \
-  _(SOFTFP,	lj_vm_tobit,		2,   N, INT, 0) \
-  _(SOFTFP,	softfp_add,		4,   N, NUM, 0) \
-  _(SOFTFP,	softfp_sub,		4,   N, NUM, 0) \
-  _(SOFTFP,	softfp_mul,		4,   N, NUM, 0) \
-  _(SOFTFP,	softfp_div,		4,   N, NUM, 0) \
-  _(SOFTFP,	softfp_cmp,		4,   N, NIL, 0) \
-  _(SOFTFP,	softfp_i2d,		1,   N, NUM, 0) \
-  _(SOFTFP,	softfp_d2i,		2,   N, INT, 0) \
-  _(SOFTFP_FFI,	softfp_ui2d,		1,   N, NUM, 0) \
-  _(SOFTFP_FFI,	softfp_f2d,		1,   N, NUM, 0) \
-  _(SOFTFP_FFI,	softfp_d2ui,		2,   N, INT, 0) \
-  _(SOFTFP_FFI,	softfp_d2f,		2,   N, FLOAT, 0) \
-  _(SOFTFP_FFI,	softfp_i2f,		1,   N, FLOAT, 0) \
-  _(SOFTFP_FFI,	softfp_ui2f,		1,   N, FLOAT, 0) \
-  _(SOFTFP_FFI,	softfp_f2i,		1,   N, INT, 0) \
-  _(SOFTFP_FFI,	softfp_f2ui,		1,   N, INT, 0) \
-  _(FP64_FFI,	fp64_l2d,		2,   N, NUM, 0) \
-  _(FP64_FFI,	fp64_ul2d,		2,   N, NUM, 0) \
-  _(FP64_FFI,	fp64_l2f,		2,   N, FLOAT, 0) \
-  _(FP64_FFI,	fp64_ul2f,		2,   N, FLOAT, 0) \
-  _(FP64_FFI,	fp64_d2l,		ARG1_FP,   N, I64, 0) \
-  _(FP64_FFI,	fp64_d2ul,		ARG1_FP,   N, U64, 0) \
-  _(FP64_FFI,	fp64_f2l,		1,   N, I64, 0) \
-  _(FP64_FFI,	fp64_f2ul,		1,   N, U64, 0) \
-  _(FFI,	lj_carith_divi64,	ARG2_64,   N, I64, CCI_NOFPRCLOBBER) \
-  _(FFI,	lj_carith_divu64,	ARG2_64,   N, U64, CCI_NOFPRCLOBBER) \
-  _(FFI,	lj_carith_modi64,	ARG2_64,   N, I64, CCI_NOFPRCLOBBER) \
-  _(FFI,	lj_carith_modu64,	ARG2_64,   N, U64, CCI_NOFPRCLOBBER) \
-  _(FFI,	lj_carith_powi64,	ARG2_64,   N, I64, CCI_NOFPRCLOBBER) \
-  _(FFI,	lj_carith_powu64,	ARG2_64,   N, U64, CCI_NOFPRCLOBBER) \
-  _(FFI,	lj_cdata_setfin,	2,        FN, P32, CCI_L) \
-  _(FFI,	strlen,			1,         L, INTP, 0) \
-  _(FFI,	memcpy,			3,         S, PTR, 0) \
-  _(FFI,	memset,			3,         S, PTR, 0) \
-  _(FFI,	lj_vm_errno,		0,         S, INT, CCI_NOFPRCLOBBER) \
-  _(FFI32,	lj_carith_mul64,	ARG2_64,   N, I64, CCI_NOFPRCLOBBER)
-  \
-  /* End of list. */
-
-typedef enum {
-#define IRCALLENUM(cond, name, nargs, kind, type, flags)	IRCALL_##name,
-IRCALLDEF(IRCALLENUM)
-#undef IRCALLENUM
-  IRCALL__MAX
-} IRCallID;
-
-LJ_FUNC TRef lj_ir_call(jit_State *J, IRCallID id, ...);
-
-LJ_DATA const CCallInfo lj_ir_callinfo[IRCALL__MAX+1];
-
-/* Soft-float declarations. */
-#if LJ_SOFTFP
-#if LJ_TARGET_ARM
-#define softfp_add __aeabi_dadd
-#define softfp_sub __aeabi_dsub
-#define softfp_mul __aeabi_dmul
-#define softfp_div __aeabi_ddiv
-#define softfp_cmp __aeabi_cdcmple
-#define softfp_i2d __aeabi_i2d
-#define softfp_d2i __aeabi_d2iz
-#define softfp_ui2d __aeabi_ui2d
-#define softfp_f2d __aeabi_f2d
-#define softfp_d2ui __aeabi_d2uiz
-#define softfp_d2f __aeabi_d2f
-#define softfp_i2f __aeabi_i2f
-#define softfp_ui2f __aeabi_ui2f
-#define softfp_f2i __aeabi_f2iz
-#define softfp_f2ui __aeabi_f2uiz
-#define fp64_l2d __aeabi_l2d
-#define fp64_ul2d __aeabi_ul2d
-#define fp64_l2f __aeabi_l2f
-#define fp64_ul2f __aeabi_ul2f
-#if LJ_TARGET_IOS
-#define fp64_d2l __fixdfdi
-#define fp64_d2ul __fixunsdfdi
-#define fp64_f2l __fixsfdi
-#define fp64_f2ul __fixunssfdi
-#else
-#define fp64_d2l __aeabi_d2lz
-#define fp64_d2ul __aeabi_d2ulz
-#define fp64_f2l __aeabi_f2lz
-#define fp64_f2ul __aeabi_f2ulz
-#endif
-#else
-#error "Missing soft-float definitions for target architecture"
-#endif
-extern double softfp_add(double a, double b);
-extern double softfp_sub(double a, double b);
-extern double softfp_mul(double a, double b);
-extern double softfp_div(double a, double b);
-extern void softfp_cmp(double a, double b);
-extern double softfp_i2d(int32_t a);
-extern int32_t softfp_d2i(double a);
-#if LJ_HASFFI
-extern double softfp_ui2d(uint32_t a);
-extern double softfp_f2d(float a);
-extern uint32_t softfp_d2ui(double a);
-extern float softfp_d2f(double a);
-extern float softfp_i2f(int32_t a);
-extern float softfp_ui2f(uint32_t a);
-extern int32_t softfp_f2i(float a);
-extern uint32_t softfp_f2ui(float a);
-#endif
-#endif
-
-#if LJ_HASFFI && LJ_NEED_FP64 && !(LJ_TARGET_ARM && LJ_SOFTFP)
-#ifdef __GNUC__
-#define fp64_l2d __floatdidf
-#define fp64_ul2d __floatundidf
-#define fp64_l2f __floatdisf
-#define fp64_ul2f __floatundisf
-#define fp64_d2l __fixdfdi
-#define fp64_d2ul __fixunsdfdi
-#define fp64_f2l __fixsfdi
-#define fp64_f2ul __fixunssfdi
-#else
-#error "Missing fp64 helper definitions for this compiler"
-#endif
-#endif
-
-#if LJ_HASFFI && (LJ_SOFTFP || LJ_NEED_FP64)
-extern double fp64_l2d(int64_t a);
-extern double fp64_ul2d(uint64_t a);
-extern float fp64_l2f(int64_t a);
-extern float fp64_ul2f(uint64_t a);
-extern int64_t fp64_d2l(double a);
-extern uint64_t fp64_d2ul(double a);
-extern int64_t fp64_f2l(float a);
-extern uint64_t fp64_f2ul(float a);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_iropt.h b/dependencies2013/win32/include/luajit/lj_iropt.h
deleted file mode 100644
index b5081e06..00000000
--- a/dependencies2013/win32/include/luajit/lj_iropt.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-** Common header for IR emitter and optimizations.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_IROPT_H
-#define _LJ_IROPT_H
-
-#include <stdarg.h>
-
-#include "lj_obj.h"
-#include "lj_jit.h"
-
-#if LJ_HASJIT
-/* IR emitter. */
-LJ_FUNC void LJ_FASTCALL lj_ir_growtop(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_ir_emit(jit_State *J);
-
-/* Save current IR in J->fold.ins, but do not emit it (yet). */
-static LJ_AINLINE void lj_ir_set_(jit_State *J, uint16_t ot, IRRef1 a, IRRef1 b)
-{
-  J->fold.ins.ot = ot; J->fold.ins.op1 = a; J->fold.ins.op2 = b;
-}
-
-#define lj_ir_set(J, ot, a, b) \
-  lj_ir_set_(J, (uint16_t)(ot), (IRRef1)(a), (IRRef1)(b))
-
-/* Get ref of next IR instruction and optionally grow IR.
-** Note: this may invalidate all IRIns*!
-*/
-static LJ_AINLINE IRRef lj_ir_nextins(jit_State *J)
-{
-  IRRef ref = J->cur.nins;
-  if (LJ_UNLIKELY(ref >= J->irtoplim)) lj_ir_growtop(J);
-  J->cur.nins = ref + 1;
-  return ref;
-}
-
-/* Interning of constants. */
-LJ_FUNC TRef LJ_FASTCALL lj_ir_kint(jit_State *J, int32_t k);
-LJ_FUNC void lj_ir_k64_freeall(jit_State *J);
-LJ_FUNC TRef lj_ir_k64(jit_State *J, IROp op, cTValue *tv);
-LJ_FUNC cTValue *lj_ir_k64_find(jit_State *J, uint64_t u64);
-LJ_FUNC TRef lj_ir_knum_u64(jit_State *J, uint64_t u64);
-LJ_FUNC TRef lj_ir_knumint(jit_State *J, lua_Number n);
-LJ_FUNC TRef lj_ir_kint64(jit_State *J, uint64_t u64);
-LJ_FUNC TRef lj_ir_kgc(jit_State *J, GCobj *o, IRType t);
-LJ_FUNC TRef lj_ir_kptr_(jit_State *J, IROp op, void *ptr);
-LJ_FUNC TRef lj_ir_knull(jit_State *J, IRType t);
-LJ_FUNC TRef lj_ir_kslot(jit_State *J, TRef key, IRRef slot);
-
-#if LJ_64
-#define lj_ir_kintp(J, k)	lj_ir_kint64(J, (uint64_t)(k))
-#else
-#define lj_ir_kintp(J, k)	lj_ir_kint(J, (int32_t)(k))
-#endif
-
-static LJ_AINLINE TRef lj_ir_knum(jit_State *J, lua_Number n)
-{
-  TValue tv;
-  tv.n = n;
-  return lj_ir_knum_u64(J, tv.u64);
-}
-
-#define lj_ir_kstr(J, str)	lj_ir_kgc(J, obj2gco((str)), IRT_STR)
-#define lj_ir_ktab(J, tab)	lj_ir_kgc(J, obj2gco((tab)), IRT_TAB)
-#define lj_ir_kfunc(J, func)	lj_ir_kgc(J, obj2gco((func)), IRT_FUNC)
-#define lj_ir_kptr(J, ptr)	lj_ir_kptr_(J, IR_KPTR, (ptr))
-#define lj_ir_kkptr(J, ptr)	lj_ir_kptr_(J, IR_KKPTR, (ptr))
-
-/* Special FP constants. */
-#define lj_ir_knum_zero(J)	lj_ir_knum_u64(J, U64x(00000000,00000000))
-#define lj_ir_knum_one(J)	lj_ir_knum_u64(J, U64x(3ff00000,00000000))
-#define lj_ir_knum_tobit(J)	lj_ir_knum_u64(J, U64x(43380000,00000000))
-
-/* Special 128 bit SIMD constants. */
-#define lj_ir_knum_abs(J)	lj_ir_k64(J, IR_KNUM, LJ_KSIMD(J, LJ_KSIMD_ABS))
-#define lj_ir_knum_neg(J)	lj_ir_k64(J, IR_KNUM, LJ_KSIMD(J, LJ_KSIMD_NEG))
-
-/* Access to constants. */
-LJ_FUNC void lj_ir_kvalue(lua_State *L, TValue *tv, const IRIns *ir);
-
-/* Convert IR operand types. */
-LJ_FUNC TRef LJ_FASTCALL lj_ir_tonumber(jit_State *J, TRef tr);
-LJ_FUNC TRef LJ_FASTCALL lj_ir_tonum(jit_State *J, TRef tr);
-LJ_FUNC TRef LJ_FASTCALL lj_ir_tostr(jit_State *J, TRef tr);
-
-/* Miscellaneous IR ops. */
-LJ_FUNC int lj_ir_numcmp(lua_Number a, lua_Number b, IROp op);
-LJ_FUNC int lj_ir_strcmp(GCstr *a, GCstr *b, IROp op);
-LJ_FUNC void lj_ir_rollback(jit_State *J, IRRef ref);
-
-/* Emit IR instructions with on-the-fly optimizations. */
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fold(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_cse(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_cselim(jit_State *J, IRRef lim);
-
-/* Special return values for the fold functions. */
-enum {
-  NEXTFOLD,		/* Couldn't fold, pass on. */
-  RETRYFOLD,		/* Retry fold with modified fins. */
-  KINTFOLD,		/* Return ref for int constant in fins->i. */
-  FAILFOLD,		/* Guard would always fail. */
-  DROPFOLD,		/* Guard eliminated. */
-  MAX_FOLD
-};
-
-#define INTFOLD(k)	((J->fold.ins.i = (k)), (TRef)KINTFOLD)
-#define INT64FOLD(k)	(lj_ir_kint64(J, (k)))
-#define CONDFOLD(cond)	((TRef)FAILFOLD + (TRef)(cond))
-#define LEFTFOLD	(J->fold.ins.op1)
-#define RIGHTFOLD	(J->fold.ins.op2)
-#define CSEFOLD		(lj_opt_cse(J))
-#define EMITFOLD	(lj_ir_emit(J))
-
-/* Load/store forwarding. */
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_aload(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_hload(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_uload(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_fload(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_xload(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_tab_len(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_fwd_hrefk(jit_State *J);
-LJ_FUNC int LJ_FASTCALL lj_opt_fwd_href_nokey(jit_State *J);
-LJ_FUNC int LJ_FASTCALL lj_opt_fwd_tptr(jit_State *J, IRRef lim);
-LJ_FUNC int lj_opt_fwd_wasnonnil(jit_State *J, IROpT loadop, IRRef xref);
-
-/* Dead-store elimination. */
-LJ_FUNC TRef LJ_FASTCALL lj_opt_dse_ahstore(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_dse_ustore(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_dse_fstore(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_dse_xstore(jit_State *J);
-
-/* Narrowing. */
-LJ_FUNC TRef LJ_FASTCALL lj_opt_narrow_convert(jit_State *J);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_narrow_index(jit_State *J, TRef key);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_narrow_toint(jit_State *J, TRef tr);
-LJ_FUNC TRef LJ_FASTCALL lj_opt_narrow_tobit(jit_State *J, TRef tr);
-#if LJ_HASFFI
-LJ_FUNC TRef LJ_FASTCALL lj_opt_narrow_cindex(jit_State *J, TRef key);
-#endif
-LJ_FUNC TRef lj_opt_narrow_arith(jit_State *J, TRef rb, TRef rc,
-				 TValue *vb, TValue *vc, IROp op);
-LJ_FUNC TRef lj_opt_narrow_unm(jit_State *J, TRef rc, TValue *vc);
-LJ_FUNC TRef lj_opt_narrow_mod(jit_State *J, TRef rb, TRef rc, TValue *vb, TValue *vc);
-LJ_FUNC TRef lj_opt_narrow_pow(jit_State *J, TRef rb, TRef rc, TValue *vb, TValue *vc);
-LJ_FUNC IRType lj_opt_narrow_forl(jit_State *J, cTValue *forbase);
-
-/* Optimization passes. */
-LJ_FUNC void lj_opt_dce(jit_State *J);
-LJ_FUNC int lj_opt_loop(jit_State *J);
-#if LJ_SOFTFP || (LJ_32 && LJ_HASFFI)
-LJ_FUNC void lj_opt_split(jit_State *J);
-#else
-#define lj_opt_split(J)		UNUSED(J)
-#endif
-LJ_FUNC void lj_opt_sink(jit_State *J);
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_jit.h b/dependencies2013/win32/include/luajit/lj_jit.h
deleted file mode 100644
index a2e8fd92..00000000
--- a/dependencies2013/win32/include/luajit/lj_jit.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
-** Common definitions for the JIT compiler.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_JIT_H
-#define _LJ_JIT_H
-
-#include "lj_obj.h"
-#include "lj_ir.h"
-
-/* JIT engine flags. */
-#define JIT_F_ON		0x00000001
-
-/* CPU-specific JIT engine flags. */
-#if LJ_TARGET_X86ORX64
-#define JIT_F_CMOV		0x00000010
-#define JIT_F_SSE2		0x00000020
-#define JIT_F_SSE3		0x00000040
-#define JIT_F_SSE4_1		0x00000080
-#define JIT_F_P4		0x00000100
-#define JIT_F_PREFER_IMUL	0x00000200
-#define JIT_F_SPLIT_XMM		0x00000400
-#define JIT_F_LEA_AGU		0x00000800
-
-/* Names for the CPU-specific flags. Must match the order above. */
-#define JIT_F_CPU_FIRST		JIT_F_CMOV
-#define JIT_F_CPUSTRING		"\4CMOV\4SSE2\4SSE3\6SSE4.1\2P4\3AMD\2K8\4ATOM"
-#elif LJ_TARGET_ARM
-#define JIT_F_ARMV6_		0x00000010
-#define JIT_F_ARMV6T2_		0x00000020
-#define JIT_F_ARMV7		0x00000040
-#define JIT_F_VFPV2		0x00000080
-#define JIT_F_VFPV3		0x00000100
-
-#define JIT_F_ARMV6		(JIT_F_ARMV6_|JIT_F_ARMV6T2_|JIT_F_ARMV7)
-#define JIT_F_ARMV6T2		(JIT_F_ARMV6T2_|JIT_F_ARMV7)
-#define JIT_F_VFP		(JIT_F_VFPV2|JIT_F_VFPV3)
-
-/* Names for the CPU-specific flags. Must match the order above. */
-#define JIT_F_CPU_FIRST		JIT_F_ARMV6_
-#define JIT_F_CPUSTRING		"\5ARMv6\7ARMv6T2\5ARMv7\5VFPv2\5VFPv3"
-#elif LJ_TARGET_PPC
-#define JIT_F_SQRT		0x00000010
-#define JIT_F_ROUND		0x00000020
-
-/* Names for the CPU-specific flags. Must match the order above. */
-#define JIT_F_CPU_FIRST		JIT_F_SQRT
-#define JIT_F_CPUSTRING		"\4SQRT\5ROUND"
-#elif LJ_TARGET_MIPS
-#define JIT_F_MIPS32R2		0x00000010
-
-/* Names for the CPU-specific flags. Must match the order above. */
-#define JIT_F_CPU_FIRST		JIT_F_MIPS32R2
-#define JIT_F_CPUSTRING		"\010MIPS32R2"
-#else
-#define JIT_F_CPU_FIRST		0
-#define JIT_F_CPUSTRING		""
-#endif
-
-/* Optimization flags. */
-#define JIT_F_OPT_MASK		0x0fff0000
-
-#define JIT_F_OPT_FOLD		0x00010000
-#define JIT_F_OPT_CSE		0x00020000
-#define JIT_F_OPT_DCE		0x00040000
-#define JIT_F_OPT_FWD		0x00080000
-#define JIT_F_OPT_DSE		0x00100000
-#define JIT_F_OPT_NARROW	0x00200000
-#define JIT_F_OPT_LOOP		0x00400000
-#define JIT_F_OPT_ABC		0x00800000
-#define JIT_F_OPT_SINK		0x01000000
-#define JIT_F_OPT_FUSE		0x02000000
-
-/* Optimizations names for -O. Must match the order above. */
-#define JIT_F_OPT_FIRST		JIT_F_OPT_FOLD
-#define JIT_F_OPTSTRING	\
-  "\4fold\3cse\3dce\3fwd\3dse\6narrow\4loop\3abc\4sink\4fuse"
-
-/* Optimization levels set a fixed combination of flags. */
-#define JIT_F_OPT_0	0
-#define JIT_F_OPT_1	(JIT_F_OPT_FOLD|JIT_F_OPT_CSE|JIT_F_OPT_DCE)
-#define JIT_F_OPT_2	(JIT_F_OPT_1|JIT_F_OPT_NARROW|JIT_F_OPT_LOOP)
-#define JIT_F_OPT_3	(JIT_F_OPT_2|\
-  JIT_F_OPT_FWD|JIT_F_OPT_DSE|JIT_F_OPT_ABC|JIT_F_OPT_SINK|JIT_F_OPT_FUSE)
-#define JIT_F_OPT_DEFAULT	JIT_F_OPT_3
-
-#if LJ_TARGET_WINDOWS || LJ_64
-/* See: http://blogs.msdn.com/oldnewthing/archive/2003/10/08/55239.aspx */
-#define JIT_P_sizemcode_DEFAULT		64
-#else
-/* Could go as low as 4K, but the mmap() overhead would be rather high. */
-#define JIT_P_sizemcode_DEFAULT		32
-#endif
-
-/* Optimization parameters and their defaults. Length is a char in octal! */
-#define JIT_PARAMDEF(_) \
-  _(\010, maxtrace,	1000)	/* Max. # of traces in cache. */ \
-  _(\011, maxrecord,	4000)	/* Max. # of recorded IR instructions. */ \
-  _(\012, maxirconst,	500)	/* Max. # of IR constants of a trace. */ \
-  _(\007, maxside,	100)	/* Max. # of side traces of a root trace. */ \
-  _(\007, maxsnap,	500)	/* Max. # of snapshots for a trace. */ \
-  \
-  _(\007, hotloop,	56)	/* # of iter. to detect a hot loop/call. */ \
-  _(\007, hotexit,	10)	/* # of taken exits to start a side trace. */ \
-  _(\007, tryside,	4)	/* # of attempts to compile a side trace. */ \
-  \
-  _(\012, instunroll,	4)	/* Max. unroll for instable loops. */ \
-  _(\012, loopunroll,	15)	/* Max. unroll for loop ops in side traces. */ \
-  _(\012, callunroll,	3)	/* Max. unroll for recursive calls. */ \
-  _(\011, recunroll,	2)	/* Min. unroll for true recursion. */ \
-  \
-  /* Size of each machine code area (in KBytes). */ \
-  _(\011, sizemcode,	JIT_P_sizemcode_DEFAULT) \
-  /* Max. total size of all machine code areas (in KBytes). */ \
-  _(\010, maxmcode,	512) \
-  /* End of list. */
-
-enum {
-#define JIT_PARAMENUM(len, name, value)	JIT_P_##name,
-JIT_PARAMDEF(JIT_PARAMENUM)
-#undef JIT_PARAMENUM
-  JIT_P__MAX
-};
-
-#define JIT_PARAMSTR(len, name, value)	#len #name
-#define JIT_P_STRING	JIT_PARAMDEF(JIT_PARAMSTR)
-
-/* Trace compiler state. */
-typedef enum {
-  LJ_TRACE_IDLE,	/* Trace compiler idle. */
-  LJ_TRACE_ACTIVE = 0x10,
-  LJ_TRACE_RECORD,	/* Bytecode recording active. */
-  LJ_TRACE_START,	/* New trace started. */
-  LJ_TRACE_END,		/* End of trace. */
-  LJ_TRACE_ASM,		/* Assemble trace. */
-  LJ_TRACE_ERR		/* Trace aborted with error. */
-} TraceState;
-
-/* Post-processing action. */
-typedef enum {
-  LJ_POST_NONE,		/* No action. */
-  LJ_POST_FIXCOMP,	/* Fixup comparison and emit pending guard. */
-  LJ_POST_FIXGUARD,	/* Fixup and emit pending guard. */
-  LJ_POST_FIXGUARDSNAP,	/* Fixup and emit pending guard and snapshot. */
-  LJ_POST_FIXBOOL,	/* Fixup boolean result. */
-  LJ_POST_FIXCONST,	/* Fixup constant results. */
-  LJ_POST_FFRETRY	/* Suppress recording of retried fast functions. */
-} PostProc;
-
-/* Machine code type. */
-#if LJ_TARGET_X86ORX64
-typedef uint8_t MCode;
-#else
-typedef uint32_t MCode;
-#endif
-
-/* Stack snapshot header. */
-typedef struct SnapShot {
-  uint16_t mapofs;	/* Offset into snapshot map. */
-  IRRef1 ref;		/* First IR ref for this snapshot. */
-  uint8_t nslots;	/* Number of valid slots. */
-  uint8_t topslot;	/* Maximum frame extent. */
-  uint8_t nent;		/* Number of compressed entries. */
-  uint8_t count;	/* Count of taken exits for this snapshot. */
-} SnapShot;
-
-#define SNAPCOUNT_DONE	255	/* Already compiled and linked a side trace. */
-
-/* Compressed snapshot entry. */
-typedef uint32_t SnapEntry;
-
-#define SNAP_FRAME		0x010000	/* Frame slot. */
-#define SNAP_CONT		0x020000	/* Continuation slot. */
-#define SNAP_NORESTORE		0x040000	/* No need to restore slot. */
-#define SNAP_SOFTFPNUM		0x080000	/* Soft-float number. */
-LJ_STATIC_ASSERT(SNAP_FRAME == TREF_FRAME);
-LJ_STATIC_ASSERT(SNAP_CONT == TREF_CONT);
-
-#define SNAP(slot, flags, ref)	(((SnapEntry)(slot) << 24) + (flags) + (ref))
-#define SNAP_TR(slot, tr) \
-  (((SnapEntry)(slot) << 24) + ((tr) & (TREF_CONT|TREF_FRAME|TREF_REFMASK)))
-#define SNAP_MKPC(pc)		((SnapEntry)u32ptr(pc))
-#define SNAP_MKFTSZ(ftsz)	((SnapEntry)(ftsz))
-#define snap_ref(sn)		((sn) & 0xffff)
-#define snap_slot(sn)		((BCReg)((sn) >> 24))
-#define snap_isframe(sn)	((sn) & SNAP_FRAME)
-#define snap_pc(sn)		((const BCIns *)(uintptr_t)(sn))
-#define snap_setref(sn, ref)	(((sn) & (0xffff0000&~SNAP_NORESTORE)) | (ref))
-
-/* Snapshot and exit numbers. */
-typedef uint32_t SnapNo;
-typedef uint32_t ExitNo;
-
-/* Trace number. */
-typedef uint32_t TraceNo;	/* Used to pass around trace numbers. */
-typedef uint16_t TraceNo1;	/* Stored trace number. */
-
-/* Type of link. ORDER LJ_TRLINK */
-typedef enum {
-  LJ_TRLINK_NONE,		/* Incomplete trace. No link, yet. */
-  LJ_TRLINK_ROOT,		/* Link to other root trace. */
-  LJ_TRLINK_LOOP,		/* Loop to same trace. */
-  LJ_TRLINK_TAILREC,		/* Tail-recursion. */
-  LJ_TRLINK_UPREC,		/* Up-recursion. */
-  LJ_TRLINK_DOWNREC,		/* Down-recursion. */
-  LJ_TRLINK_INTERP,		/* Fallback to interpreter. */
-  LJ_TRLINK_RETURN		/* Return to interpreter. */
-} TraceLink;
-
-/* Trace object. */
-typedef struct GCtrace {
-  GCHeader;
-  uint8_t topslot;	/* Top stack slot already checked to be allocated. */
-  uint8_t linktype;	/* Type of link. */
-  IRRef nins;		/* Next IR instruction. Biased with REF_BIAS. */
-  GCRef gclist;
-  IRIns *ir;		/* IR instructions/constants. Biased with REF_BIAS. */
-  IRRef nk;		/* Lowest IR constant. Biased with REF_BIAS. */
-  uint16_t nsnap;	/* Number of snapshots. */
-  uint16_t nsnapmap;	/* Number of snapshot map elements. */
-  SnapShot *snap;	/* Snapshot array. */
-  SnapEntry *snapmap;	/* Snapshot map. */
-  GCRef startpt;	/* Starting prototype. */
-  MRef startpc;		/* Bytecode PC of starting instruction. */
-  BCIns startins;	/* Original bytecode of starting instruction. */
-  MSize szmcode;	/* Size of machine code. */
-  MCode *mcode;		/* Start of machine code. */
-  MSize mcloop;		/* Offset of loop start in machine code. */
-  uint16_t nchild;	/* Number of child traces (root trace only). */
-  uint16_t spadjust;	/* Stack pointer adjustment (offset in bytes). */
-  TraceNo1 traceno;	/* Trace number. */
-  TraceNo1 link;	/* Linked trace (or self for loops). */
-  TraceNo1 root;	/* Root trace of side trace (or 0 for root traces). */
-  TraceNo1 nextroot;	/* Next root trace for same prototype. */
-  TraceNo1 nextside;	/* Next side trace of same root trace. */
-  uint8_t sinktags;	/* Trace has SINK tags. */
-  uint8_t unused1;
-#ifdef LUAJIT_USE_GDBJIT
-  void *gdbjit_entry;	/* GDB JIT entry. */
-#endif
-} GCtrace;
-
-#define gco2trace(o)	check_exp((o)->gch.gct == ~LJ_TTRACE, (GCtrace *)(o))
-#define traceref(J, n) \
-  check_exp((n)>0 && (MSize)(n)<J->sizetrace, (GCtrace *)gcref(J->trace[(n)]))
-
-LJ_STATIC_ASSERT(offsetof(GChead, gclist) == offsetof(GCtrace, gclist));
-
-static LJ_AINLINE MSize snap_nextofs(GCtrace *T, SnapShot *snap)
-{
-  if (snap+1 == &T->snap[T->nsnap])
-    return T->nsnapmap;
-  else
-    return (snap+1)->mapofs;
-}
-
-/* Round-robin penalty cache for bytecodes leading to aborted traces. */
-typedef struct HotPenalty {
-  MRef pc;		/* Starting bytecode PC. */
-  uint16_t val;		/* Penalty value, i.e. hotcount start. */
-  uint16_t reason;	/* Abort reason (really TraceErr). */
-} HotPenalty;
-
-#define PENALTY_SLOTS	64	/* Penalty cache slot. Must be a power of 2. */
-#define PENALTY_MIN	(36*2)	/* Minimum penalty value. */
-#define PENALTY_MAX	60000	/* Maximum penalty value. */
-#define PENALTY_RNDBITS	4	/* # of random bits to add to penalty value. */
-
-/* Round-robin backpropagation cache for narrowing conversions. */
-typedef struct BPropEntry {
-  IRRef1 key;		/* Key: original reference. */
-  IRRef1 val;		/* Value: reference after conversion. */
-  IRRef mode;		/* Mode for this entry (currently IRCONV_*). */
-} BPropEntry;
-
-/* Number of slots for the backpropagation cache. Must be a power of 2. */
-#define BPROP_SLOTS	16
-
-/* Scalar evolution analysis cache. */
-typedef struct ScEvEntry {
-  MRef pc;		/* Bytecode PC of FORI. */
-  IRRef1 idx;		/* Index reference. */
-  IRRef1 start;		/* Constant start reference. */
-  IRRef1 stop;		/* Constant stop reference. */
-  IRRef1 step;		/* Constant step reference. */
-  IRType1 t;		/* Scalar type. */
-  uint8_t dir;		/* Direction. 1: +, 0: -. */
-} ScEvEntry;
-
-/* 128 bit SIMD constants. */
-enum {
-  LJ_KSIMD_ABS,
-  LJ_KSIMD_NEG,
-  LJ_KSIMD__MAX
-};
-
-/* Get 16 byte aligned pointer to SIMD constant. */
-#define LJ_KSIMD(J, n) \
-  ((TValue *)(((intptr_t)&J->ksimd[2*(n)] + 15) & ~(intptr_t)15))
-
-/* Set/reset flag to activate the SPLIT pass for the current trace. */
-#if LJ_SOFTFP || (LJ_32 && LJ_HASFFI)
-#define lj_needsplit(J)		(J->needsplit = 1)
-#define lj_resetsplit(J)	(J->needsplit = 0)
-#else
-#define lj_needsplit(J)		UNUSED(J)
-#define lj_resetsplit(J)	UNUSED(J)
-#endif
-
-/* Fold state is used to fold instructions on-the-fly. */
-typedef struct FoldState {
-  IRIns ins;		/* Currently emitted instruction. */
-  IRIns left;		/* Instruction referenced by left operand. */
-  IRIns right;		/* Instruction referenced by right operand. */
-} FoldState;
-
-/* JIT compiler state. */
-typedef struct jit_State {
-  GCtrace cur;		/* Current trace. */
-
-  lua_State *L;		/* Current Lua state. */
-  const BCIns *pc;	/* Current PC. */
-  GCfunc *fn;		/* Current function. */
-  GCproto *pt;		/* Current prototype. */
-  TRef *base;		/* Current frame base, points into J->slots. */
-
-  uint32_t flags;	/* JIT engine flags. */
-  BCReg maxslot;	/* Relative to baseslot. */
-  BCReg baseslot;	/* Current frame base, offset into J->slots. */
-
-  uint8_t mergesnap;	/* Allowed to merge with next snapshot. */
-  uint8_t needsnap;	/* Need snapshot before recording next bytecode. */
-  IRType1 guardemit;	/* Accumulated IRT_GUARD for emitted instructions. */
-  uint8_t bcskip;	/* Number of bytecode instructions to skip. */
-
-  FoldState fold;	/* Fold state. */
-
-  const BCIns *bc_min;	/* Start of allowed bytecode range for root trace. */
-  MSize bc_extent;	/* Extent of the range. */
-
-  TraceState state;	/* Trace compiler state. */
-
-  int32_t instunroll;	/* Unroll counter for instable loops. */
-  int32_t loopunroll;	/* Unroll counter for loop ops in side traces. */
-  int32_t tailcalled;	/* Number of successive tailcalls. */
-  int32_t framedepth;	/* Current frame depth. */
-  int32_t retdepth;	/* Return frame depth (count of RETF). */
-
-  MRef k64;		/* Pointer to chained array of 64 bit constants. */
-  TValue ksimd[LJ_KSIMD__MAX*2+1];  /* 16 byte aligned SIMD constants. */
-
-  IRIns *irbuf;		/* Temp. IR instruction buffer. Biased with REF_BIAS. */
-  IRRef irtoplim;	/* Upper limit of instuction buffer (biased). */
-  IRRef irbotlim;	/* Lower limit of instuction buffer (biased). */
-  IRRef loopref;	/* Last loop reference or ref of final LOOP (or 0). */
-
-  MSize sizesnap;	/* Size of temp. snapshot buffer. */
-  SnapShot *snapbuf;	/* Temp. snapshot buffer. */
-  SnapEntry *snapmapbuf;  /* Temp. snapshot map buffer. */
-  MSize sizesnapmap;	/* Size of temp. snapshot map buffer. */
-
-  PostProc postproc;	/* Required post-processing after execution. */
-#if LJ_SOFTFP || (LJ_32 && LJ_HASFFI)
-  int needsplit;	/* Need SPLIT pass. */
-#endif
-
-  GCRef *trace;		/* Array of traces. */
-  TraceNo freetrace;	/* Start of scan for next free trace. */
-  MSize sizetrace;	/* Size of trace array. */
-
-  IRRef1 chain[IR__MAX];  /* IR instruction skip-list chain anchors. */
-  TRef slot[LJ_MAX_JSLOTS+LJ_STACK_EXTRA];  /* Stack slot map. */
-
-  int32_t param[JIT_P__MAX];  /* JIT engine parameters. */
-
-  MCode *exitstubgroup[LJ_MAX_EXITSTUBGR];  /* Exit stub group addresses. */
-
-  HotPenalty penalty[PENALTY_SLOTS];  /* Penalty slots. */
-  uint32_t penaltyslot;	/* Round-robin index into penalty slots. */
-  uint32_t prngstate;	/* PRNG state. */
-
-  BPropEntry bpropcache[BPROP_SLOTS];  /* Backpropagation cache slots. */
-  uint32_t bpropslot;	/* Round-robin index into bpropcache slots. */
-
-  ScEvEntry scev;	/* Scalar evolution analysis cache slots. */
-
-  const BCIns *startpc;	/* Bytecode PC of starting instruction. */
-  TraceNo parent;	/* Parent of current side trace (0 for root traces). */
-  ExitNo exitno;	/* Exit number in parent of current side trace. */
-
-  BCIns *patchpc;	/* PC for pending re-patch. */
-  BCIns patchins;	/* Instruction for pending re-patch. */
-
-  int mcprot;		/* Protection of current mcode area. */
-  MCode *mcarea;	/* Base of current mcode area. */
-  MCode *mctop;		/* Top of current mcode area. */
-  MCode *mcbot;		/* Bottom of current mcode area. */
-  size_t szmcarea;	/* Size of current mcode area. */
-  size_t szallmcarea;	/* Total size of all allocated mcode areas. */
-
-  TValue errinfo;	/* Additional info element for trace errors. */
-}
-#if LJ_TARGET_ARM
-LJ_ALIGN(16)		/* For DISPATCH-relative addresses in assembler part. */
-#endif
-jit_State;
-
-/* Trivial PRNG e.g. used for penalty randomization. */
-static LJ_AINLINE uint32_t LJ_PRNG_BITS(jit_State *J, int bits)
-{
-  /* Yes, this LCG is very weak, but that doesn't matter for our use case. */
-  J->prngstate = J->prngstate * 1103515245 + 12345;
-  return J->prngstate >> (32-bits);
-}
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_lex.h b/dependencies2013/win32/include/luajit/lj_lex.h
deleted file mode 100644
index 41c03f93..00000000
--- a/dependencies2013/win32/include/luajit/lj_lex.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-** Lexical analyzer.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_LEX_H
-#define _LJ_LEX_H
-
-#include <stdarg.h>
-
-#include "lj_obj.h"
-#include "lj_err.h"
-
-/* Lua lexer tokens. */
-#define TKDEF(_, __) \
-  _(and) _(break) _(do) _(else) _(elseif) _(end) _(false) \
-  _(for) _(function) _(goto) _(if) _(in) _(local) _(nil) _(not) _(or) \
-  _(repeat) _(return) _(then) _(true) _(until) _(while) \
-  __(concat, ..) __(dots, ...) __(eq, ==) __(ge, >=) __(le, <=) __(ne, ~=) \
-  __(label, ::) __(number, <number>) __(name, <name>) __(string, <string>) \
-  __(eof, <eof>)
-
-enum {
-  TK_OFS = 256,
-#define TKENUM1(name)		TK_##name,
-#define TKENUM2(name, sym)	TK_##name,
-TKDEF(TKENUM1, TKENUM2)
-#undef TKENUM1
-#undef TKENUM2
-  TK_RESERVED = TK_while - TK_OFS
-};
-
-typedef int LexToken;
-
-/* Combined bytecode ins/line. Only used during bytecode generation. */
-typedef struct BCInsLine {
-  BCIns ins;		/* Bytecode instruction. */
-  BCLine line;		/* Line number for this bytecode. */
-} BCInsLine;
-
-/* Info for local variables. Only used during bytecode generation. */
-typedef struct VarInfo {
-  GCRef name;		/* Local variable name or goto/label name. */
-  BCPos startpc;	/* First point where the local variable is active. */
-  BCPos endpc;		/* First point where the local variable is dead. */
-  uint8_t slot;		/* Variable slot. */
-  uint8_t info;		/* Variable/goto/label info. */
-} VarInfo;
-
-/* Lua lexer state. */
-typedef struct LexState {
-  struct FuncState *fs;	/* Current FuncState. Defined in lj_parse.c. */
-  struct lua_State *L;	/* Lua state. */
-  TValue tokenval;	/* Current token value. */
-  TValue lookaheadval;	/* Lookahead token value. */
-  int current;		/* Current character (charint). */
-  LexToken token;	/* Current token. */
-  LexToken lookahead;	/* Lookahead token. */
-  MSize n;		/* Bytes left in input buffer. */
-  const char *p;	/* Current position in input buffer. */
-  SBuf sb;		/* String buffer for tokens. */
-  lua_Reader rfunc;	/* Reader callback. */
-  void *rdata;		/* Reader callback data. */
-  BCLine linenumber;	/* Input line counter. */
-  BCLine lastline;	/* Line of last token. */
-  GCstr *chunkname;	/* Current chunk name (interned string). */
-  const char *chunkarg;	/* Chunk name argument. */
-  const char *mode;	/* Allow loading bytecode (b) and/or source text (t). */
-  VarInfo *vstack;	/* Stack for names and extents of local variables. */
-  MSize sizevstack;	/* Size of variable stack. */
-  MSize vtop;		/* Top of variable stack. */
-  BCInsLine *bcstack;	/* Stack for bytecode instructions/line numbers. */
-  MSize sizebcstack;	/* Size of bytecode stack. */
-  uint32_t level;	/* Syntactical nesting level. */
-} LexState;
-
-LJ_FUNC int lj_lex_setup(lua_State *L, LexState *ls);
-LJ_FUNC void lj_lex_cleanup(lua_State *L, LexState *ls);
-LJ_FUNC void lj_lex_next(LexState *ls);
-LJ_FUNC LexToken lj_lex_lookahead(LexState *ls);
-LJ_FUNC const char *lj_lex_token2str(LexState *ls, LexToken token);
-LJ_FUNC_NORET void lj_lex_error(LexState *ls, LexToken token, ErrMsg em, ...);
-LJ_FUNC void lj_lex_init(lua_State *L);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_lib.h b/dependencies2013/win32/include/luajit/lj_lib.h
deleted file mode 100644
index aa874076..00000000
--- a/dependencies2013/win32/include/luajit/lj_lib.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-** Library function support.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_LIB_H
-#define _LJ_LIB_H
-
-#include "lj_obj.h"
-
-/*
-** A fallback handler is called by the assembler VM if the fast path fails:
-**
-** - too few arguments:   unrecoverable.
-** - wrong argument type:   recoverable, if coercion succeeds.
-** - bad argument value:  unrecoverable.
-** - stack overflow:        recoverable, if stack reallocation succeeds.
-** - extra handling:        recoverable.
-**
-** The unrecoverable cases throw an error with lj_err_arg(), lj_err_argtype(),
-** lj_err_caller() or lj_err_callermsg().
-** The recoverable cases return 0 or the number of results + 1.
-** The assembler VM retries the fast path only if 0 is returned.
-** This time the fallback must not be called again or it gets stuck in a loop.
-*/
-
-/* Return values from fallback handler. */
-#define FFH_RETRY	0
-#define FFH_UNREACHABLE	FFH_RETRY
-#define FFH_RES(n)	((n)+1)
-#define FFH_TAILCALL	(-1)
-
-LJ_FUNC TValue *lj_lib_checkany(lua_State *L, int narg);
-LJ_FUNC GCstr *lj_lib_checkstr(lua_State *L, int narg);
-LJ_FUNC GCstr *lj_lib_optstr(lua_State *L, int narg);
-#if LJ_DUALNUM
-LJ_FUNC void lj_lib_checknumber(lua_State *L, int narg);
-#else
-#define lj_lib_checknumber(L, narg)	lj_lib_checknum((L), (narg))
-#endif
-LJ_FUNC lua_Number lj_lib_checknum(lua_State *L, int narg);
-LJ_FUNC int32_t lj_lib_checkint(lua_State *L, int narg);
-LJ_FUNC int32_t lj_lib_optint(lua_State *L, int narg, int32_t def);
-LJ_FUNC int32_t lj_lib_checkbit(lua_State *L, int narg);
-LJ_FUNC GCfunc *lj_lib_checkfunc(lua_State *L, int narg);
-LJ_FUNC GCtab *lj_lib_checktab(lua_State *L, int narg);
-LJ_FUNC GCtab *lj_lib_checktabornil(lua_State *L, int narg);
-LJ_FUNC int lj_lib_checkopt(lua_State *L, int narg, int def, const char *lst);
-
-/* Avoid including lj_frame.h. */
-#define lj_lib_upvalue(L, n) \
-  (&gcref((L->base-1)->fr.func)->fn.c.upvalue[(n)-1])
-
-#if LJ_TARGET_WINDOWS
-#define lj_lib_checkfpu(L) \
-  do { setnumV(L->top++, (lua_Number)1437217655); \
-    if (lua_tointeger(L, -1) != 1437217655) lj_err_caller(L, LJ_ERR_BADFPU); \
-    L->top--; } while (0)
-#else
-#define lj_lib_checkfpu(L)	UNUSED(L)
-#endif
-
-/* Push internal function on the stack. */
-static LJ_AINLINE void lj_lib_pushcc(lua_State *L, lua_CFunction f,
-				     int id, int n)
-{
-  GCfunc *fn;
-  lua_pushcclosure(L, f, n);
-  fn = funcV(L->top-1);
-  fn->c.ffid = (uint8_t)id;
-  setmref(fn->c.pc, &G(L)->bc_cfunc_int);
-}
-
-#define lj_lib_pushcf(L, fn, id)	(lj_lib_pushcc(L, (fn), (id), 0))
-
-/* Library function declarations. Scanned by buildvm. */
-#define LJLIB_CF(name)		static int lj_cf_##name(lua_State *L)
-#define LJLIB_ASM(name)		static int lj_ffh_##name(lua_State *L)
-#define LJLIB_ASM_(name)
-#define LJLIB_SET(name)
-#define LJLIB_PUSH(arg)
-#define LJLIB_REC(handler)
-#define LJLIB_NOREGUV
-#define LJLIB_NOREG
-
-#define LJ_LIB_REG(L, regname, name) \
-  lj_lib_register(L, regname, lj_lib_init_##name, lj_lib_cf_##name)
-
-LJ_FUNC void lj_lib_register(lua_State *L, const char *libname,
-			     const uint8_t *init, const lua_CFunction *cf);
-
-/* Library init data tags. */
-#define LIBINIT_LENMASK	0x3f
-#define LIBINIT_TAGMASK	0xc0
-#define LIBINIT_CF	0x00
-#define LIBINIT_ASM	0x40
-#define LIBINIT_ASM_	0x80
-#define LIBINIT_STRING	0xc0
-#define LIBINIT_MAXSTR	0x39
-#define LIBINIT_SET	0xfa
-#define LIBINIT_NUMBER	0xfb
-#define LIBINIT_COPY	0xfc
-#define LIBINIT_LASTCL	0xfd
-#define LIBINIT_FFID	0xfe
-#define LIBINIT_END	0xff
-
-/* Exported library functions. */
-
-typedef struct RandomState RandomState;
-LJ_FUNC uint64_t LJ_FASTCALL lj_math_random_step(RandomState *rs);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_mcode.h b/dependencies2013/win32/include/luajit/lj_mcode.h
deleted file mode 100644
index f0847e93..00000000
--- a/dependencies2013/win32/include/luajit/lj_mcode.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-** Machine code management.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_MCODE_H
-#define _LJ_MCODE_H
-
-#include "lj_obj.h"
-
-#if LJ_HASJIT || LJ_HASFFI
-LJ_FUNC void lj_mcode_sync(void *start, void *end);
-#endif
-
-#if LJ_HASJIT
-
-#include "lj_jit.h"
-
-LJ_FUNC void lj_mcode_free(jit_State *J);
-LJ_FUNC MCode *lj_mcode_reserve(jit_State *J, MCode **lim);
-LJ_FUNC void lj_mcode_commit(jit_State *J, MCode *m);
-LJ_FUNC void lj_mcode_abort(jit_State *J);
-LJ_FUNC MCode *lj_mcode_patch(jit_State *J, MCode *ptr, int finish);
-LJ_FUNC_NORET void lj_mcode_limiterr(jit_State *J, size_t need);
-
-#define lj_mcode_commitbot(J, m)	(J->mcbot = (m))
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_meta.h b/dependencies2013/win32/include/luajit/lj_meta.h
deleted file mode 100644
index e061d99e..00000000
--- a/dependencies2013/win32/include/luajit/lj_meta.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-** Metamethod handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_META_H
-#define _LJ_META_H
-
-#include "lj_obj.h"
-
-/* Metamethod handling */
-LJ_FUNC void lj_meta_init(lua_State *L);
-LJ_FUNC cTValue *lj_meta_cache(GCtab *mt, MMS mm, GCstr *name);
-LJ_FUNC cTValue *lj_meta_lookup(lua_State *L, cTValue *o, MMS mm);
-#if LJ_HASFFI
-LJ_FUNC int lj_meta_tailcall(lua_State *L, cTValue *tv);
-#endif
-
-#define lj_meta_fastg(g, mt, mm) \
-  ((mt) == NULL ? NULL : ((mt)->nomm & (1u<<(mm))) ? NULL : \
-   lj_meta_cache(mt, mm, mmname_str(g, mm)))
-#define lj_meta_fast(L, mt, mm)	lj_meta_fastg(G(L), mt, mm)
-
-/* C helpers for some instructions, called from assembler VM. */
-LJ_FUNCA cTValue *lj_meta_tget(lua_State *L, cTValue *o, cTValue *k);
-LJ_FUNCA TValue *lj_meta_tset(lua_State *L, cTValue *o, cTValue *k);
-LJ_FUNCA TValue *lj_meta_arith(lua_State *L, TValue *ra, cTValue *rb,
-			       cTValue *rc, BCReg op);
-LJ_FUNCA TValue *lj_meta_cat(lua_State *L, TValue *top, int left);
-LJ_FUNCA TValue * LJ_FASTCALL lj_meta_len(lua_State *L, cTValue *o);
-LJ_FUNCA TValue *lj_meta_equal(lua_State *L, GCobj *o1, GCobj *o2, int ne);
-LJ_FUNCA TValue * LJ_FASTCALL lj_meta_equal_cd(lua_State *L, BCIns ins);
-LJ_FUNCA TValue *lj_meta_comp(lua_State *L, cTValue *o1, cTValue *o2, int op);
-LJ_FUNCA void lj_meta_call(lua_State *L, TValue *func, TValue *top);
-LJ_FUNCA void LJ_FASTCALL lj_meta_for(lua_State *L, TValue *o);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_obj.h b/dependencies2013/win32/include/luajit/lj_obj.h
deleted file mode 100644
index e70b0032..00000000
--- a/dependencies2013/win32/include/luajit/lj_obj.h
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
-** LuaJIT VM tags, values and objects.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-**
-** Portions taken verbatim or adapted from the Lua interpreter.
-** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
-*/
-
-#ifndef _LJ_OBJ_H
-#define _LJ_OBJ_H
-
-#include "lua.h"
-#include "lj_def.h"
-#include "lj_arch.h"
-
-/* -- Memory references (32 bit address space) ---------------------------- */
-
-/* Memory size. */
-typedef uint32_t MSize;
-
-/* Memory reference */
-typedef struct MRef {
-  uint32_t ptr32;	/* Pseudo 32 bit pointer. */
-} MRef;
-
-#define mref(r, t)	((t *)(void *)(uintptr_t)(r).ptr32)
-
-#define setmref(r, p)	((r).ptr32 = (uint32_t)(uintptr_t)(void *)(p))
-#define setmrefr(r, v)	((r).ptr32 = (v).ptr32)
-
-/* -- GC object references (32 bit address space) ------------------------- */
-
-/* GCobj reference */
-typedef struct GCRef {
-  uint32_t gcptr32;	/* Pseudo 32 bit pointer. */
-} GCRef;
-
-/* Common GC header for all collectable objects. */
-#define GCHeader	GCRef nextgc; uint8_t marked; uint8_t gct
-/* This occupies 6 bytes, so use the next 2 bytes for non-32 bit fields. */
-
-#define gcref(r)	((GCobj *)(uintptr_t)(r).gcptr32)
-#define gcrefp(r, t)	((t *)(void *)(uintptr_t)(r).gcptr32)
-#define gcrefu(r)	((r).gcptr32)
-#define gcrefi(r)	((int32_t)(r).gcptr32)
-#define gcrefeq(r1, r2)	((r1).gcptr32 == (r2).gcptr32)
-#define gcnext(gc)	(gcref((gc)->gch.nextgc))
-
-#define setgcref(r, gc)	((r).gcptr32 = (uint32_t)(uintptr_t)&(gc)->gch)
-#define setgcrefi(r, i)	((r).gcptr32 = (uint32_t)(i))
-#define setgcrefp(r, p)	((r).gcptr32 = (uint32_t)(uintptr_t)(p))
-#define setgcrefnull(r)	((r).gcptr32 = 0)
-#define setgcrefr(r, v)	((r).gcptr32 = (v).gcptr32)
-
-/* IMPORTANT NOTE:
-**
-** All uses of the setgcref* macros MUST be accompanied with a write barrier.
-**
-** This is to ensure the integrity of the incremental GC. The invariant
-** to preserve is that a black object never points to a white object.
-** I.e. never store a white object into a field of a black object.
-**
-** It's ok to LEAVE OUT the write barrier ONLY in the following cases:
-** - The source is not a GC object (NULL).
-** - The target is a GC root. I.e. everything in global_State.
-** - The target is a lua_State field (threads are never black).
-** - The target is a stack slot, see setgcV et al.
-** - The target is an open upvalue, i.e. pointing to a stack slot.
-** - The target is a newly created object (i.e. marked white). But make
-**   sure nothing invokes the GC inbetween.
-** - The target and the source are the same object (self-reference).
-** - The target already contains the object (e.g. moving elements around).
-**
-** The most common case is a store to a stack slot. All other cases where
-** a barrier has been omitted are annotated with a NOBARRIER comment.
-**
-** The same logic applies for stores to table slots (array part or hash
-** part). ALL uses of lj_tab_set* require a barrier for the stored value
-** *and* the stored key, based on the above rules. In practice this means
-** a barrier is needed if *either* of the key or value are a GC object.
-**
-** It's ok to LEAVE OUT the write barrier in the following special cases:
-** - The stored value is nil. The key doesn't matter because it's either
-**   not resurrected or lj_tab_newkey() will take care of the key barrier.
-** - The key doesn't matter if the *previously* stored value is guaranteed
-**   to be non-nil (because the key is kept alive in the table).
-** - The key doesn't matter if it's guaranteed not to be part of the table,
-**   since lj_tab_newkey() takes care of the key barrier. This applies
-**   trivially to new tables, but watch out for resurrected keys. Storing
-**   a nil value leaves the key in the table!
-**
-** In case of doubt use lj_gc_anybarriert() as it's rather cheap. It's used
-** by the interpreter for all table stores.
-**
-** Note: In contrast to Lua's GC, LuaJIT's GC does *not* specially mark
-** dead keys in tables. The reference is left in, but it's guaranteed to
-** be never dereferenced as long as the value is nil. It's ok if the key is
-** freed or if any object subsequently gets the same address.
-**
-** Not destroying dead keys helps to keep key hash slots stable. This avoids
-** specialization back-off for HREFK when a value flips between nil and
-** non-nil and the GC gets in the way. It also allows safely hoisting
-** HREF/HREFK across GC steps. Dead keys are only removed if a table is
-** resized (i.e. by NEWREF) and xREF must not be CSEd across a resize.
-**
-** The trade-off is that a write barrier for tables must take the key into
-** account, too. Implicitly resurrecting the key by storing a non-nil value
-** may invalidate the incremental GC invariant.
-*/
-
-/* -- Common type definitions --------------------------------------------- */
-
-/* Types for handling bytecodes. Need this here, details in lj_bc.h. */
-typedef uint32_t BCIns;  /* Bytecode instruction. */
-typedef uint32_t BCPos;  /* Bytecode position. */
-typedef uint32_t BCReg;  /* Bytecode register. */
-typedef int32_t BCLine;  /* Bytecode line number. */
-
-/* Internal assembler functions. Never call these directly from C. */
-typedef void (*ASMFunction)(void);
-
-/* Resizable string buffer. Need this here, details in lj_str.h. */
-typedef struct SBuf {
-  char *buf;		/* String buffer base. */
-  MSize n;		/* String buffer length. */
-  MSize sz;		/* String buffer size. */
-} SBuf;
-
-/* -- Tags and values ----------------------------------------------------- */
-
-/* Frame link. */
-typedef union {
-  int32_t ftsz;		/* Frame type and size of previous frame. */
-  MRef pcr;		/* Overlaps PC for Lua frames. */
-} FrameLink;
-
-/* Tagged value. */
-typedef LJ_ALIGN(8) union TValue {
-  uint64_t u64;		/* 64 bit pattern overlaps number. */
-  lua_Number n;		/* Number object overlaps split tag/value object. */
-  struct {
-    LJ_ENDIAN_LOHI(
-      union {
-	GCRef gcr;	/* GCobj reference (if any). */
-	int32_t i;	/* Integer value. */
-      };
-    , uint32_t it;	/* Internal object tag. Must overlap MSW of number. */
-    )
-  };
-  struct {
-    LJ_ENDIAN_LOHI(
-      GCRef func;	/* Function for next frame (or dummy L). */
-    , FrameLink tp;	/* Link to previous frame. */
-    )
-  } fr;
-  struct {
-    LJ_ENDIAN_LOHI(
-      uint32_t lo;	/* Lower 32 bits of number. */
-    , uint32_t hi;	/* Upper 32 bits of number. */
-    )
-  } u32;
-} TValue;
-
-typedef const TValue cTValue;
-
-#define tvref(r)	(mref(r, TValue))
-
-/* More external and GCobj tags for internal objects. */
-#define LAST_TT		LUA_TTHREAD
-#define LUA_TPROTO	(LAST_TT+1)
-#define LUA_TCDATA	(LAST_TT+2)
-
-/* Internal object tags.
-**
-** Internal tags overlap the MSW of a number object (must be a double).
-** Interpreted as a double these are special NaNs. The FPU only generates
-** one type of NaN (0xfff8_0000_0000_0000). So MSWs > 0xfff80000 are available
-** for use as internal tags. Small negative numbers are used to shorten the
-** encoding of type comparisons (reg/mem against sign-ext. 8 bit immediate).
-**
-**                  ---MSW---.---LSW---
-** primitive types |  itype  |         |
-** lightuserdata   |  itype  |  void * |  (32 bit platforms)
-** lightuserdata   |ffff|    void *    |  (64 bit platforms, 47 bit pointers)
-** GC objects      |  itype  |  GCRef  |
-** int (LJ_DUALNUM)|  itype  |   int   |
-** number           -------double------
-**
-** ORDER LJ_T
-** Primitive types nil/false/true must be first, lightuserdata next.
-** GC objects are at the end, table/userdata must be lowest.
-** Also check lj_ir.h for similar ordering constraints.
-*/
-#define LJ_TNIL			(~0u)
-#define LJ_TFALSE		(~1u)
-#define LJ_TTRUE		(~2u)
-#define LJ_TLIGHTUD		(~3u)
-#define LJ_TSTR			(~4u)
-#define LJ_TUPVAL		(~5u)
-#define LJ_TTHREAD		(~6u)
-#define LJ_TPROTO		(~7u)
-#define LJ_TFUNC		(~8u)
-#define LJ_TTRACE		(~9u)
-#define LJ_TCDATA		(~10u)
-#define LJ_TTAB			(~11u)
-#define LJ_TUDATA		(~12u)
-/* This is just the canonical number type used in some places. */
-#define LJ_TNUMX		(~13u)
-
-/* Integers have itype == LJ_TISNUM doubles have itype < LJ_TISNUM */
-#if LJ_64
-#define LJ_TISNUM		0xfffeffffu
-#else
-#define LJ_TISNUM		LJ_TNUMX
-#endif
-#define LJ_TISTRUECOND		LJ_TFALSE
-#define LJ_TISPRI		LJ_TTRUE
-#define LJ_TISGCV		(LJ_TSTR+1)
-#define LJ_TISTABUD		LJ_TTAB
-
-/* -- String object ------------------------------------------------------- */
-
-/* String object header. String payload follows. */
-typedef struct GCstr {
-  GCHeader;
-  uint8_t reserved;	/* Used by lexer for fast lookup of reserved words. */
-  uint8_t unused;
-  MSize hash;		/* Hash of string. */
-  MSize len;		/* Size of string. */
-} GCstr;
-
-#define strref(r)	(&gcref((r))->str)
-#define strdata(s)	((const char *)((s)+1))
-#define strdatawr(s)	((char *)((s)+1))
-#define strVdata(o)	strdata(strV(o))
-#define sizestring(s)	(sizeof(struct GCstr)+(s)->len+1)
-
-/* -- Userdata object ----------------------------------------------------- */
-
-/* Userdata object. Payload follows. */
-typedef struct GCudata {
-  GCHeader;
-  uint8_t udtype;	/* Userdata type. */
-  uint8_t unused2;
-  GCRef env;		/* Should be at same offset in GCfunc. */
-  MSize len;		/* Size of payload. */
-  GCRef metatable;	/* Must be at same offset in GCtab. */
-  uint32_t align1;	/* To force 8 byte alignment of the payload. */
-} GCudata;
-
-/* Userdata types. */
-enum {
-  UDTYPE_USERDATA,	/* Regular userdata. */
-  UDTYPE_IO_FILE,	/* I/O library FILE. */
-  UDTYPE_FFI_CLIB,	/* FFI C library namespace. */
-  UDTYPE__MAX
-};
-
-#define uddata(u)	((void *)((u)+1))
-#define sizeudata(u)	(sizeof(struct GCudata)+(u)->len)
-
-/* -- C data object ------------------------------------------------------- */
-
-/* C data object. Payload follows. */
-typedef struct GCcdata {
-  GCHeader;
-  uint16_t ctypeid;	/* C type ID. */
-} GCcdata;
-
-/* Prepended to variable-sized or realigned C data objects. */
-typedef struct GCcdataVar {
-  uint16_t offset;	/* Offset to allocated memory (relative to GCcdata). */
-  uint16_t extra;	/* Extra space allocated (incl. GCcdata + GCcdatav). */
-  MSize len;		/* Size of payload. */
-} GCcdataVar;
-
-#define cdataptr(cd)	((void *)((cd)+1))
-#define cdataisv(cd)	((cd)->marked & 0x80)
-#define cdatav(cd)	((GCcdataVar *)((char *)(cd) - sizeof(GCcdataVar)))
-#define cdatavlen(cd)	check_exp(cdataisv(cd), cdatav(cd)->len)
-#define sizecdatav(cd)	(cdatavlen(cd) + cdatav(cd)->extra)
-#define memcdatav(cd)	((void *)((char *)(cd) - cdatav(cd)->offset))
-
-/* -- Prototype object ---------------------------------------------------- */
-
-#define SCALE_NUM_GCO	((int32_t)sizeof(lua_Number)/sizeof(GCRef))
-#define round_nkgc(n)	(((n) + SCALE_NUM_GCO-1) & ~(SCALE_NUM_GCO-1))
-
-typedef struct GCproto {
-  GCHeader;
-  uint8_t numparams;	/* Number of parameters. */
-  uint8_t framesize;	/* Fixed frame size. */
-  MSize sizebc;		/* Number of bytecode instructions. */
-  GCRef gclist;
-  MRef k;		/* Split constant array (points to the middle). */
-  MRef uv;		/* Upvalue list. local slot|0x8000 or parent uv idx. */
-  MSize sizekgc;	/* Number of collectable constants. */
-  MSize sizekn;		/* Number of lua_Number constants. */
-  MSize sizept;		/* Total size including colocated arrays. */
-  uint8_t sizeuv;	/* Number of upvalues. */
-  uint8_t flags;	/* Miscellaneous flags (see below). */
-  uint16_t trace;	/* Anchor for chain of root traces. */
-  /* ------ The following fields are for debugging/tracebacks only ------ */
-  GCRef chunkname;	/* Name of the chunk this function was defined in. */
-  BCLine firstline;	/* First line of the function definition. */
-  BCLine numline;	/* Number of lines for the function definition. */
-  MRef lineinfo;	/* Compressed map from bytecode ins. to source line. */
-  MRef uvinfo;		/* Upvalue names. */
-  MRef varinfo;		/* Names and compressed extents of local variables. */
-} GCproto;
-
-/* Flags for prototype. */
-#define PROTO_CHILD		0x01	/* Has child prototypes. */
-#define PROTO_VARARG		0x02	/* Vararg function. */
-#define PROTO_FFI		0x04	/* Uses BC_KCDATA for FFI datatypes. */
-#define PROTO_NOJIT		0x08	/* JIT disabled for this function. */
-#define PROTO_ILOOP		0x10	/* Patched bytecode with ILOOP etc. */
-/* Only used during parsing. */
-#define PROTO_HAS_RETURN	0x20	/* Already emitted a return. */
-#define PROTO_FIXUP_RETURN	0x40	/* Need to fixup emitted returns. */
-/* Top bits used for counting created closures. */
-#define PROTO_CLCOUNT		0x20	/* Base of saturating 3 bit counter. */
-#define PROTO_CLC_BITS		3
-#define PROTO_CLC_POLY		(3*PROTO_CLCOUNT)  /* Polymorphic threshold. */
-
-#define PROTO_UV_LOCAL		0x8000	/* Upvalue for local slot. */
-#define PROTO_UV_IMMUTABLE	0x4000	/* Immutable upvalue. */
-
-#define proto_kgc(pt, idx) \
-  check_exp((uintptr_t)(intptr_t)(idx) >= (uintptr_t)-(intptr_t)(pt)->sizekgc, \
-	    gcref(mref((pt)->k, GCRef)[(idx)]))
-#define proto_knumtv(pt, idx) \
-  check_exp((uintptr_t)(idx) < (pt)->sizekn, &mref((pt)->k, TValue)[(idx)])
-#define proto_bc(pt)		((BCIns *)((char *)(pt) + sizeof(GCproto)))
-#define proto_bcpos(pt, pc)	((BCPos)((pc) - proto_bc(pt)))
-#define proto_uv(pt)		(mref((pt)->uv, uint16_t))
-
-#define proto_chunkname(pt)	(strref((pt)->chunkname))
-#define proto_chunknamestr(pt)	(strdata(proto_chunkname((pt))))
-#define proto_lineinfo(pt)	(mref((pt)->lineinfo, const void))
-#define proto_uvinfo(pt)	(mref((pt)->uvinfo, const uint8_t))
-#define proto_varinfo(pt)	(mref((pt)->varinfo, const uint8_t))
-
-/* -- Upvalue object ------------------------------------------------------ */
-
-typedef struct GCupval {
-  GCHeader;
-  uint8_t closed;	/* Set if closed (i.e. uv->v == &uv->u.value). */
-  uint8_t immutable;	/* Immutable value. */
-  union {
-    TValue tv;		/* If closed: the value itself. */
-    struct {		/* If open: double linked list, anchored at thread. */
-      GCRef prev;
-      GCRef next;
-    };
-  };
-  MRef v;		/* Points to stack slot (open) or above (closed). */
-  uint32_t dhash;	/* Disambiguation hash: dh1 != dh2 => cannot alias. */
-} GCupval;
-
-#define uvprev(uv_)	(&gcref((uv_)->prev)->uv)
-#define uvnext(uv_)	(&gcref((uv_)->next)->uv)
-#define uvval(uv_)	(mref((uv_)->v, TValue))
-
-/* -- Function object (closures) ------------------------------------------ */
-
-/* Common header for functions. env should be at same offset in GCudata. */
-#define GCfuncHeader \
-  GCHeader; uint8_t ffid; uint8_t nupvalues; \
-  GCRef env; GCRef gclist; MRef pc
-
-typedef struct GCfuncC {
-  GCfuncHeader;
-  lua_CFunction f;	/* C function to be called. */
-  TValue upvalue[1];	/* Array of upvalues (TValue). */
-} GCfuncC;
-
-typedef struct GCfuncL {
-  GCfuncHeader;
-  GCRef uvptr[1];	/* Array of _pointers_ to upvalue objects (GCupval). */
-} GCfuncL;
-
-typedef union GCfunc {
-  GCfuncC c;
-  GCfuncL l;
-} GCfunc;
-
-#define FF_LUA		0
-#define FF_C		1
-#define isluafunc(fn)	((fn)->c.ffid == FF_LUA)
-#define iscfunc(fn)	((fn)->c.ffid == FF_C)
-#define isffunc(fn)	((fn)->c.ffid > FF_C)
-#define funcproto(fn) \
-  check_exp(isluafunc(fn), (GCproto *)(mref((fn)->l.pc, char)-sizeof(GCproto)))
-#define sizeCfunc(n)	(sizeof(GCfuncC)-sizeof(TValue)+sizeof(TValue)*(n))
-#define sizeLfunc(n)	(sizeof(GCfuncL)-sizeof(GCRef)+sizeof(GCRef)*(n))
-
-/* -- Table object -------------------------------------------------------- */
-
-/* Hash node. */
-typedef struct Node {
-  TValue val;		/* Value object. Must be first field. */
-  TValue key;		/* Key object. */
-  MRef next;		/* Hash chain. */
-  MRef freetop;		/* Top of free elements (stored in t->node[0]). */
-} Node;
-
-LJ_STATIC_ASSERT(offsetof(Node, val) == 0);
-
-typedef struct GCtab {
-  GCHeader;
-  uint8_t nomm;		/* Negative cache for fast metamethods. */
-  int8_t colo;		/* Array colocation. */
-  MRef array;		/* Array part. */
-  GCRef gclist;
-  GCRef metatable;	/* Must be at same offset in GCudata. */
-  MRef node;		/* Hash part. */
-  uint32_t asize;	/* Size of array part (keys [0, asize-1]). */
-  uint32_t hmask;	/* Hash part mask (size of hash part - 1). */
-} GCtab;
-
-#define sizetabcolo(n)	((n)*sizeof(TValue) + sizeof(GCtab))
-#define tabref(r)	(&gcref((r))->tab)
-#define noderef(r)	(mref((r), Node))
-#define nextnode(n)	(mref((n)->next, Node))
-
-/* -- State objects ------------------------------------------------------- */
-
-/* VM states. */
-enum {
-  LJ_VMST_INTERP,	/* Interpreter. */
-  LJ_VMST_C,		/* C function. */
-  LJ_VMST_GC,		/* Garbage collector. */
-  LJ_VMST_EXIT,		/* Trace exit handler. */
-  LJ_VMST_RECORD,	/* Trace recorder. */
-  LJ_VMST_OPT,		/* Optimizer. */
-  LJ_VMST_ASM,		/* Assembler. */
-  LJ_VMST__MAX
-};
-
-#define setvmstate(g, st)	((g)->vmstate = ~LJ_VMST_##st)
-
-/* Metamethods. ORDER MM */
-#ifdef LJ_HASFFI
-#define MMDEF_FFI(_) _(new)
-#else
-#define MMDEF_FFI(_)
-#endif
-
-#if LJ_52 || LJ_HASFFI
-#define MMDEF_PAIRS(_) _(pairs) _(ipairs)
-#else
-#define MMDEF_PAIRS(_)
-#define MM_pairs	255
-#define MM_ipairs	255
-#endif
-
-#define MMDEF(_) \
-  _(index) _(newindex) _(gc) _(mode) _(eq) _(len) \
-  /* Only the above (fast) metamethods are negative cached (max. 8). */ \
-  _(lt) _(le) _(concat) _(call) \
-  /* The following must be in ORDER ARITH. */ \
-  _(add) _(sub) _(mul) _(div) _(mod) _(pow) _(unm) \
-  /* The following are used in the standard libraries. */ \
-  _(metatable) _(tostring) MMDEF_FFI(_) MMDEF_PAIRS(_)
-
-typedef enum {
-#define MMENUM(name)	MM_##name,
-MMDEF(MMENUM)
-#undef MMENUM
-  MM__MAX,
-  MM____ = MM__MAX,
-  MM_FAST = MM_len
-} MMS;
-
-/* GC root IDs. */
-typedef enum {
-  GCROOT_MMNAME,	/* Metamethod names. */
-  GCROOT_MMNAME_LAST = GCROOT_MMNAME + MM__MAX-1,
-  GCROOT_BASEMT,	/* Metatables for base types. */
-  GCROOT_BASEMT_NUM = GCROOT_BASEMT + ~LJ_TNUMX,
-  GCROOT_IO_INPUT,	/* Userdata for default I/O input file. */
-  GCROOT_IO_OUTPUT,	/* Userdata for default I/O output file. */
-  GCROOT_MAX
-} GCRootID;
-
-#define basemt_it(g, it)	((g)->gcroot[GCROOT_BASEMT+~(it)])
-#define basemt_obj(g, o)	((g)->gcroot[GCROOT_BASEMT+itypemap(o)])
-#define mmname_str(g, mm)	(strref((g)->gcroot[GCROOT_MMNAME+(mm)]))
-
-typedef struct GCState {
-  MSize total;		/* Memory currently allocated. */
-  MSize threshold;	/* Memory threshold. */
-  uint8_t currentwhite;	/* Current white color. */
-  uint8_t state;	/* GC state. */
-  uint8_t nocdatafin;	/* No cdata finalizer called. */
-  uint8_t unused2;
-  MSize sweepstr;	/* Sweep position in string table. */
-  GCRef root;		/* List of all collectable objects. */
-  MRef sweep;		/* Sweep position in root list. */
-  GCRef gray;		/* List of gray objects. */
-  GCRef grayagain;	/* List of objects for atomic traversal. */
-  GCRef weak;		/* List of weak tables (to be cleared). */
-  GCRef mmudata;	/* List of userdata (to be finalized). */
-  MSize stepmul;	/* Incremental GC step granularity. */
-  MSize debt;		/* Debt (how much GC is behind schedule). */
-  MSize estimate;	/* Estimate of memory actually in use. */
-  MSize pause;		/* Pause between successive GC cycles. */
-} GCState;
-
-/* Global state, shared by all threads of a Lua universe. */
-typedef struct global_State {
-  GCRef *strhash;	/* String hash table (hash chain anchors). */
-  MSize strmask;	/* String hash mask (size of hash table - 1). */
-  MSize strnum;		/* Number of strings in hash table. */
-  lua_Alloc allocf;	/* Memory allocator. */
-  void *allocd;		/* Memory allocator data. */
-  GCState gc;		/* Garbage collector. */
-  SBuf tmpbuf;		/* Temporary buffer for string concatenation. */
-  Node nilnode;		/* Fallback 1-element hash part (nil key and value). */
-  GCstr strempty;	/* Empty string. */
-  uint8_t stremptyz;	/* Zero terminator of empty string. */
-  uint8_t hookmask;	/* Hook mask. */
-  uint8_t dispatchmode;	/* Dispatch mode. */
-  uint8_t vmevmask;	/* VM event mask. */
-  GCRef mainthref;	/* Link to main thread. */
-  TValue registrytv;	/* Anchor for registry. */
-  TValue tmptv, tmptv2;	/* Temporary TValues. */
-  GCupval uvhead;	/* Head of double-linked list of all open upvalues. */
-  int32_t hookcount;	/* Instruction hook countdown. */
-  int32_t hookcstart;	/* Start count for instruction hook counter. */
-  lua_Hook hookf;	/* Hook function. */
-  lua_CFunction wrapf;	/* Wrapper for C function calls. */
-  lua_CFunction panic;	/* Called as a last resort for errors. */
-  volatile int32_t vmstate;  /* VM state or current JIT code trace number. */
-  BCIns bc_cfunc_int;	/* Bytecode for internal C function calls. */
-  BCIns bc_cfunc_ext;	/* Bytecode for external C function calls. */
-  GCRef jit_L;		/* Current JIT code lua_State or NULL. */
-  MRef jit_base;	/* Current JIT code L->base. */
-  MRef ctype_state;	/* Pointer to C type state. */
-  GCRef gcroot[GCROOT_MAX];  /* GC roots. */
-} global_State;
-
-#define mainthread(g)	(&gcref(g->mainthref)->th)
-#define niltv(L) \
-  check_exp(tvisnil(&G(L)->nilnode.val), &G(L)->nilnode.val)
-#define niltvg(g) \
-  check_exp(tvisnil(&(g)->nilnode.val), &(g)->nilnode.val)
-
-/* Hook management. Hook event masks are defined in lua.h. */
-#define HOOK_EVENTMASK		0x0f
-#define HOOK_ACTIVE		0x10
-#define HOOK_ACTIVE_SHIFT	4
-#define HOOK_VMEVENT		0x20
-#define HOOK_GC			0x40
-#define hook_active(g)		((g)->hookmask & HOOK_ACTIVE)
-#define hook_enter(g)		((g)->hookmask |= HOOK_ACTIVE)
-#define hook_entergc(g)		((g)->hookmask |= (HOOK_ACTIVE|HOOK_GC))
-#define hook_vmevent(g)		((g)->hookmask |= (HOOK_ACTIVE|HOOK_VMEVENT))
-#define hook_leave(g)		((g)->hookmask &= ~HOOK_ACTIVE)
-#define hook_save(g)		((g)->hookmask & ~HOOK_EVENTMASK)
-#define hook_restore(g, h) \
-  ((g)->hookmask = ((g)->hookmask & HOOK_EVENTMASK) | (h))
-
-/* Per-thread state object. */
-struct lua_State {
-  GCHeader;
-  uint8_t dummy_ffid;	/* Fake FF_C for curr_funcisL() on dummy frames. */
-  uint8_t status;	/* Thread status. */
-  MRef glref;		/* Link to global state. */
-  GCRef gclist;		/* GC chain. */
-  TValue *base;		/* Base of currently executing function. */
-  TValue *top;		/* First free slot in the stack. */
-  MRef maxstack;	/* Last free slot in the stack. */
-  MRef stack;		/* Stack base. */
-  GCRef openupval;	/* List of open upvalues in the stack. */
-  GCRef env;		/* Thread environment (table of globals). */
-  void *cframe;		/* End of C stack frame chain. */
-  MSize stacksize;	/* True stack size (incl. LJ_STACK_EXTRA). */
-};
-
-#define G(L)			(mref(L->glref, global_State))
-#define registry(L)		(&G(L)->registrytv)
-
-/* Macros to access the currently executing (Lua) function. */
-#define curr_func(L)		(&gcref((L->base-1)->fr.func)->fn)
-#define curr_funcisL(L)		(isluafunc(curr_func(L)))
-#define curr_proto(L)		(funcproto(curr_func(L)))
-#define curr_topL(L)		(L->base + curr_proto(L)->framesize)
-#define curr_top(L)		(curr_funcisL(L) ? curr_topL(L) : L->top)
-
-/* -- GC object definition and conversions -------------------------------- */
-
-/* GC header for generic access to common fields of GC objects. */
-typedef struct GChead {
-  GCHeader;
-  uint8_t unused1;
-  uint8_t unused2;
-  GCRef env;
-  GCRef gclist;
-  GCRef metatable;
-} GChead;
-
-/* The env field SHOULD be at the same offset for all GC objects. */
-LJ_STATIC_ASSERT(offsetof(GChead, env) == offsetof(GCfuncL, env));
-LJ_STATIC_ASSERT(offsetof(GChead, env) == offsetof(GCudata, env));
-
-/* The metatable field MUST be at the same offset for all GC objects. */
-LJ_STATIC_ASSERT(offsetof(GChead, metatable) == offsetof(GCtab, metatable));
-LJ_STATIC_ASSERT(offsetof(GChead, metatable) == offsetof(GCudata, metatable));
-
-/* The gclist field MUST be at the same offset for all GC objects. */
-LJ_STATIC_ASSERT(offsetof(GChead, gclist) == offsetof(lua_State, gclist));
-LJ_STATIC_ASSERT(offsetof(GChead, gclist) == offsetof(GCproto, gclist));
-LJ_STATIC_ASSERT(offsetof(GChead, gclist) == offsetof(GCfuncL, gclist));
-LJ_STATIC_ASSERT(offsetof(GChead, gclist) == offsetof(GCtab, gclist));
-
-typedef union GCobj {
-  GChead gch;
-  GCstr str;
-  GCupval uv;
-  lua_State th;
-  GCproto pt;
-  GCfunc fn;
-  GCcdata cd;
-  GCtab tab;
-  GCudata ud;
-} GCobj;
-
-/* Macros to convert a GCobj pointer into a specific value. */
-#define gco2str(o)	check_exp((o)->gch.gct == ~LJ_TSTR, &(o)->str)
-#define gco2uv(o)	check_exp((o)->gch.gct == ~LJ_TUPVAL, &(o)->uv)
-#define gco2th(o)	check_exp((o)->gch.gct == ~LJ_TTHREAD, &(o)->th)
-#define gco2pt(o)	check_exp((o)->gch.gct == ~LJ_TPROTO, &(o)->pt)
-#define gco2func(o)	check_exp((o)->gch.gct == ~LJ_TFUNC, &(o)->fn)
-#define gco2cd(o)	check_exp((o)->gch.gct == ~LJ_TCDATA, &(o)->cd)
-#define gco2tab(o)	check_exp((o)->gch.gct == ~LJ_TTAB, &(o)->tab)
-#define gco2ud(o)	check_exp((o)->gch.gct == ~LJ_TUDATA, &(o)->ud)
-
-/* Macro to convert any collectable object into a GCobj pointer. */
-#define obj2gco(v)	((GCobj *)(v))
-
-/* -- TValue getters/setters ---------------------------------------------- */
-
-#ifdef LUA_USE_ASSERT
-#include "lj_gc.h"
-#endif
-
-/* Macros to test types. */
-#define itype(o)	((o)->it)
-#define tvisnil(o)	(itype(o) == LJ_TNIL)
-#define tvisfalse(o)	(itype(o) == LJ_TFALSE)
-#define tvistrue(o)	(itype(o) == LJ_TTRUE)
-#define tvisbool(o)	(tvisfalse(o) || tvistrue(o))
-#if LJ_64
-#define tvislightud(o)	(((int32_t)itype(o) >> 15) == -2)
-#else
-#define tvislightud(o)	(itype(o) == LJ_TLIGHTUD)
-#endif
-#define tvisstr(o)	(itype(o) == LJ_TSTR)
-#define tvisfunc(o)	(itype(o) == LJ_TFUNC)
-#define tvisthread(o)	(itype(o) == LJ_TTHREAD)
-#define tvisproto(o)	(itype(o) == LJ_TPROTO)
-#define tviscdata(o)	(itype(o) == LJ_TCDATA)
-#define tvistab(o)	(itype(o) == LJ_TTAB)
-#define tvisudata(o)	(itype(o) == LJ_TUDATA)
-#define tvisnumber(o)	(itype(o) <= LJ_TISNUM)
-#define tvisint(o)	(LJ_DUALNUM && itype(o) == LJ_TISNUM)
-#define tvisnum(o)	(itype(o) < LJ_TISNUM)
-
-#define tvistruecond(o)	(itype(o) < LJ_TISTRUECOND)
-#define tvispri(o)	(itype(o) >= LJ_TISPRI)
-#define tvistabud(o)	(itype(o) <= LJ_TISTABUD)  /* && !tvisnum() */
-#define tvisgcv(o)	((itype(o) - LJ_TISGCV) > (LJ_TNUMX - LJ_TISGCV))
-
-/* Special macros to test numbers for NaN, +0, -0, +1 and raw equality. */
-#define tvisnan(o)	((o)->n != (o)->n)
-#if LJ_64
-#define tviszero(o)	(((o)->u64 << 1) == 0)
-#else
-#define tviszero(o)	(((o)->u32.lo | ((o)->u32.hi << 1)) == 0)
-#endif
-#define tvispzero(o)	((o)->u64 == 0)
-#define tvismzero(o)	((o)->u64 == U64x(80000000,00000000))
-#define tvispone(o)	((o)->u64 == U64x(3ff00000,00000000))
-#define rawnumequal(o1, o2)	((o1)->u64 == (o2)->u64)
-
-/* Macros to convert type ids. */
-#if LJ_64
-#define itypemap(o) \
-  (tvisnumber(o) ? ~LJ_TNUMX : tvislightud(o) ? ~LJ_TLIGHTUD : ~itype(o))
-#else
-#define itypemap(o)	(tvisnumber(o) ? ~LJ_TNUMX : ~itype(o))
-#endif
-
-/* Macros to get tagged values. */
-#define gcval(o)	(gcref((o)->gcr))
-#define boolV(o)	check_exp(tvisbool(o), (LJ_TFALSE - (o)->it))
-#if LJ_64
-#define lightudV(o) \
-  check_exp(tvislightud(o), (void *)((o)->u64 & U64x(00007fff,ffffffff)))
-#else
-#define lightudV(o)	check_exp(tvislightud(o), gcrefp((o)->gcr, void))
-#endif
-#define gcV(o)		check_exp(tvisgcv(o), gcval(o))
-#define strV(o)		check_exp(tvisstr(o), &gcval(o)->str)
-#define funcV(o)	check_exp(tvisfunc(o), &gcval(o)->fn)
-#define threadV(o)	check_exp(tvisthread(o), &gcval(o)->th)
-#define protoV(o)	check_exp(tvisproto(o), &gcval(o)->pt)
-#define cdataV(o)	check_exp(tviscdata(o), &gcval(o)->cd)
-#define tabV(o)		check_exp(tvistab(o), &gcval(o)->tab)
-#define udataV(o)	check_exp(tvisudata(o), &gcval(o)->ud)
-#define numV(o)		check_exp(tvisnum(o), (o)->n)
-#define intV(o)		check_exp(tvisint(o), (int32_t)(o)->i)
-
-/* Macros to set tagged values. */
-#define setitype(o, i)		((o)->it = (i))
-#define setnilV(o)		((o)->it = LJ_TNIL)
-#define setboolV(o, x)		((o)->it = LJ_TFALSE-(uint32_t)(x))
-
-static LJ_AINLINE void setlightudV(TValue *o, void *p)
-{
-#if LJ_64
-  o->u64 = (uint64_t)p | (((uint64_t)0xffff) << 48);
-#else
-  setgcrefp(o->gcr, p); setitype(o, LJ_TLIGHTUD);
-#endif
-}
-
-#if LJ_64
-#define checklightudptr(L, p) \
-  (((uint64_t)(p) >> 47) ? (lj_err_msg(L, LJ_ERR_BADLU), NULL) : (p))
-#define setcont(o, f) \
-  ((o)->u64 = (uint64_t)(void *)(f) - (uint64_t)lj_vm_asm_begin)
-#else
-#define checklightudptr(L, p)	(p)
-#define setcont(o, f)		setlightudV((o), (void *)(f))
-#endif
-
-#define tvchecklive(L, o) \
-  UNUSED(L), lua_assert(!tvisgcv(o) || \
-  ((~itype(o) == gcval(o)->gch.gct) && !isdead(G(L), gcval(o))))
-
-static LJ_AINLINE void setgcV(lua_State *L, TValue *o, GCobj *v, uint32_t itype)
-{
-  setgcref(o->gcr, v); setitype(o, itype); tvchecklive(L, o);
-}
-
-#define define_setV(name, type, tag) \
-static LJ_AINLINE void name(lua_State *L, TValue *o, type *v) \
-{ \
-  setgcV(L, o, obj2gco(v), tag); \
-}
-define_setV(setstrV, GCstr, LJ_TSTR)
-define_setV(setthreadV, lua_State, LJ_TTHREAD)
-define_setV(setprotoV, GCproto, LJ_TPROTO)
-define_setV(setfuncV, GCfunc, LJ_TFUNC)
-define_setV(setcdataV, GCcdata, LJ_TCDATA)
-define_setV(settabV, GCtab, LJ_TTAB)
-define_setV(setudataV, GCudata, LJ_TUDATA)
-
-#define setnumV(o, x)		((o)->n = (x))
-#define setnanV(o)		((o)->u64 = U64x(fff80000,00000000))
-#define setpinfV(o)		((o)->u64 = U64x(7ff00000,00000000))
-#define setminfV(o)		((o)->u64 = U64x(fff00000,00000000))
-
-static LJ_AINLINE void setintV(TValue *o, int32_t i)
-{
-#if LJ_DUALNUM
-  o->i = (uint32_t)i; setitype(o, LJ_TISNUM);
-#else
-  o->n = (lua_Number)i;
-#endif
-}
-
-static LJ_AINLINE void setint64V(TValue *o, int64_t i)
-{
-  if (LJ_DUALNUM && LJ_LIKELY(i == (int64_t)(int32_t)i))
-    setintV(o, (int32_t)i);
-  else
-    setnumV(o, (lua_Number)i);
-}
-
-#if LJ_64
-#define setintptrV(o, i)	setint64V((o), (i))
-#else
-#define setintptrV(o, i)	setintV((o), (i))
-#endif
-
-/* Copy tagged values. */
-static LJ_AINLINE void copyTV(lua_State *L, TValue *o1, const TValue *o2)
-{
-  *o1 = *o2; tvchecklive(L, o1);
-}
-
-/* -- Number to integer conversion ---------------------------------------- */
-
-#if LJ_SOFTFP
-LJ_ASMF int32_t lj_vm_tobit(double x);
-#endif
-
-static LJ_AINLINE int32_t lj_num2bit(lua_Number n)
-{
-#if LJ_SOFTFP
-  return lj_vm_tobit(n);
-#else
-  TValue o;
-  o.n = n + 6755399441055744.0;  /* 2^52 + 2^51 */
-  return (int32_t)o.u32.lo;
-#endif
-}
-
-#if LJ_TARGET_X86 && !defined(__SSE2__)
-#define lj_num2int(n)   lj_num2bit((n))
-#else
-#define lj_num2int(n)   ((int32_t)(n))
-#endif
-
-static LJ_AINLINE uint64_t lj_num2u64(lua_Number n)
-{
-#ifdef _MSC_VER
-  if (n >= 9223372036854775808.0)  /* They think it's a feature. */
-    return (uint64_t)(int64_t)(n - 18446744073709551616.0);
-  else
-#endif
-    return (uint64_t)n;
-}
-
-static LJ_AINLINE int32_t numberVint(cTValue *o)
-{
-  if (LJ_LIKELY(tvisint(o)))
-    return intV(o);
-  else
-    return lj_num2int(numV(o));
-}
-
-static LJ_AINLINE lua_Number numberVnum(cTValue *o)
-{
-  if (LJ_UNLIKELY(tvisint(o)))
-    return (lua_Number)intV(o);
-  else
-    return numV(o);
-}
-
-/* -- Miscellaneous object handling --------------------------------------- */
-
-/* Names and maps for internal and external object tags. */
-LJ_DATA const char *const lj_obj_typename[1+LUA_TCDATA+1];
-LJ_DATA const char *const lj_obj_itypename[~LJ_TNUMX+1];
-
-#define lj_typename(o)	(lj_obj_itypename[itypemap(o)])
-
-/* Compare two objects without calling metamethods. */
-LJ_FUNC int lj_obj_equal(cTValue *o1, cTValue *o2);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_parse.h b/dependencies2013/win32/include/luajit/lj_parse.h
deleted file mode 100644
index ceeab699..00000000
--- a/dependencies2013/win32/include/luajit/lj_parse.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-** Lua parser (source code -> bytecode).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_PARSE_H
-#define _LJ_PARSE_H
-
-#include "lj_obj.h"
-#include "lj_lex.h"
-
-LJ_FUNC GCproto *lj_parse(LexState *ls);
-LJ_FUNC GCstr *lj_parse_keepstr(LexState *ls, const char *str, size_t l);
-#if LJ_HASFFI
-LJ_FUNC void lj_parse_keepcdata(LexState *ls, TValue *tv, GCcdata *cd);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_record.h b/dependencies2013/win32/include/luajit/lj_record.h
deleted file mode 100644
index 2bbbde5b..00000000
--- a/dependencies2013/win32/include/luajit/lj_record.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-** Trace recorder (bytecode -> SSA IR).
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_RECORD_H
-#define _LJ_RECORD_H
-
-#include "lj_obj.h"
-#include "lj_jit.h"
-
-#if LJ_HASJIT
-/* Context for recording an indexed load/store. */
-typedef struct RecordIndex {
-  TValue tabv;		/* Runtime value of table (or indexed object). */
-  TValue keyv;		/* Runtime value of key. */
-  TValue valv;		/* Runtime value of stored value. */
-  TValue mobjv;		/* Runtime value of metamethod object. */
-  GCtab *mtv;		/* Runtime value of metatable object. */
-  cTValue *oldv;	/* Runtime value of previously stored value. */
-  TRef tab;		/* Table (or indexed object) reference. */
-  TRef key;		/* Key reference. */
-  TRef val;		/* Value reference for a store or 0 for a load. */
-  TRef mt;		/* Metatable reference. */
-  TRef mobj;		/* Metamethod object reference. */
-  int idxchain;		/* Index indirections left or 0 for raw lookup. */
-} RecordIndex;
-
-LJ_FUNC int lj_record_objcmp(jit_State *J, TRef a, TRef b,
-			     cTValue *av, cTValue *bv);
-LJ_FUNC TRef lj_record_constify(jit_State *J, cTValue *o);
-
-LJ_FUNC void lj_record_call(jit_State *J, BCReg func, ptrdiff_t nargs);
-LJ_FUNC void lj_record_tailcall(jit_State *J, BCReg func, ptrdiff_t nargs);
-LJ_FUNC void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults);
-
-LJ_FUNC int lj_record_mm_lookup(jit_State *J, RecordIndex *ix, MMS mm);
-LJ_FUNC TRef lj_record_idx(jit_State *J, RecordIndex *ix);
-
-LJ_FUNC void lj_record_ins(jit_State *J);
-LJ_FUNC void lj_record_setup(jit_State *J);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_snap.h b/dependencies2013/win32/include/luajit/lj_snap.h
deleted file mode 100644
index 2c9ae3d6..00000000
--- a/dependencies2013/win32/include/luajit/lj_snap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-** Snapshot handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_SNAP_H
-#define _LJ_SNAP_H
-
-#include "lj_obj.h"
-#include "lj_jit.h"
-
-#if LJ_HASJIT
-LJ_FUNC void lj_snap_add(jit_State *J);
-LJ_FUNC void lj_snap_purge(jit_State *J);
-LJ_FUNC void lj_snap_shrink(jit_State *J);
-LJ_FUNC IRIns *lj_snap_regspmap(GCtrace *T, SnapNo snapno, IRIns *ir);
-LJ_FUNC void lj_snap_replay(jit_State *J, GCtrace *T);
-LJ_FUNC const BCIns *lj_snap_restore(jit_State *J, void *exptr);
-LJ_FUNC void lj_snap_grow_buf_(jit_State *J, MSize need);
-LJ_FUNC void lj_snap_grow_map_(jit_State *J, MSize need);
-
-static LJ_AINLINE void lj_snap_grow_buf(jit_State *J, MSize need)
-{
-  if (LJ_UNLIKELY(need > J->sizesnap)) lj_snap_grow_buf_(J, need);
-}
-
-static LJ_AINLINE void lj_snap_grow_map(jit_State *J, MSize need)
-{
-  if (LJ_UNLIKELY(need > J->sizesnapmap)) lj_snap_grow_map_(J, need);
-}
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_state.h b/dependencies2013/win32/include/luajit/lj_state.h
deleted file mode 100644
index d5b476b2..00000000
--- a/dependencies2013/win32/include/luajit/lj_state.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-** State and stack handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_STATE_H
-#define _LJ_STATE_H
-
-#include "lj_obj.h"
-
-#define incr_top(L) \
-  (++L->top >= tvref(L->maxstack) && (lj_state_growstack1(L), 0))
-
-#define savestack(L, p)		((char *)(p) - mref(L->stack, char))
-#define restorestack(L, n)	((TValue *)(mref(L->stack, char) + (n)))
-
-LJ_FUNC void lj_state_relimitstack(lua_State *L);
-LJ_FUNC void lj_state_shrinkstack(lua_State *L, MSize used);
-LJ_FUNCA void LJ_FASTCALL lj_state_growstack(lua_State *L, MSize need);
-LJ_FUNC void LJ_FASTCALL lj_state_growstack1(lua_State *L);
-
-static LJ_AINLINE void lj_state_checkstack(lua_State *L, MSize need)
-{
-  if ((mref(L->maxstack, char) - (char *)L->top) <=
-      (ptrdiff_t)need*(ptrdiff_t)sizeof(TValue))
-    lj_state_growstack(L, need);
-}
-
-LJ_FUNC lua_State *lj_state_new(lua_State *L);
-LJ_FUNC void LJ_FASTCALL lj_state_free(global_State *g, lua_State *L);
-#if LJ_64
-LJ_FUNC lua_State *lj_state_newstate(lua_Alloc f, void *ud);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_str.h b/dependencies2013/win32/include/luajit/lj_str.h
deleted file mode 100644
index be04a975..00000000
--- a/dependencies2013/win32/include/luajit/lj_str.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-** String handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_STR_H
-#define _LJ_STR_H
-
-#include <stdarg.h>
-
-#include "lj_obj.h"
-
-/* String interning. */
-LJ_FUNC int32_t LJ_FASTCALL lj_str_cmp(GCstr *a, GCstr *b);
-LJ_FUNC void lj_str_resize(lua_State *L, MSize newmask);
-LJ_FUNCA GCstr *lj_str_new(lua_State *L, const char *str, size_t len);
-LJ_FUNC void LJ_FASTCALL lj_str_free(global_State *g, GCstr *s);
-
-#define lj_str_newz(L, s)	(lj_str_new(L, s, strlen(s)))
-#define lj_str_newlit(L, s)	(lj_str_new(L, "" s, sizeof(s)-1))
-
-/* Type conversions. */
-LJ_FUNC size_t LJ_FASTCALL lj_str_bufnum(char *s, cTValue *o);
-LJ_FUNC char * LJ_FASTCALL lj_str_bufint(char *p, int32_t k);
-LJ_FUNCA GCstr * LJ_FASTCALL lj_str_fromnum(lua_State *L, const lua_Number *np);
-LJ_FUNC GCstr * LJ_FASTCALL lj_str_fromint(lua_State *L, int32_t k);
-LJ_FUNCA GCstr * LJ_FASTCALL lj_str_fromnumber(lua_State *L, cTValue *o);
-
-#define LJ_STR_INTBUF		(1+10)
-#define LJ_STR_NUMBUF		LUAI_MAXNUMBER2STR
-
-/* String formatting. */
-LJ_FUNC const char *lj_str_pushvf(lua_State *L, const char *fmt, va_list argp);
-LJ_FUNC const char *lj_str_pushf(lua_State *L, const char *fmt, ...)
-#if defined(__GNUC__)
-  __attribute__ ((format (printf, 2, 3)))
-#endif
-  ;
-
-/* Resizable string buffers. Struct definition in lj_obj.h. */
-LJ_FUNC char *lj_str_needbuf(lua_State *L, SBuf *sb, MSize sz);
-
-#define lj_str_initbuf(sb)	((sb)->buf = NULL, (sb)->sz = 0)
-#define lj_str_resetbuf(sb)	((sb)->n = 0)
-#define lj_str_resizebuf(L, sb, size) \
-  ((sb)->buf = (char *)lj_mem_realloc(L, (sb)->buf, (sb)->sz, (size)), \
-   (sb)->sz = (size))
-#define lj_str_freebuf(g, sb)	lj_mem_free(g, (void *)(sb)->buf, (sb)->sz)
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_strscan.h b/dependencies2013/win32/include/luajit/lj_strscan.h
deleted file mode 100644
index 6fb0dda0..00000000
--- a/dependencies2013/win32/include/luajit/lj_strscan.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-** String scanning.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_STRSCAN_H
-#define _LJ_STRSCAN_H
-
-#include "lj_obj.h"
-
-/* Options for accepted/returned formats. */
-#define STRSCAN_OPT_TOINT	0x01  /* Convert to int32_t, if possible. */
-#define STRSCAN_OPT_TONUM	0x02  /* Always convert to double. */
-#define STRSCAN_OPT_IMAG	0x04
-#define STRSCAN_OPT_LL		0x08
-#define STRSCAN_OPT_C		0x10
-
-/* Returned format. */
-typedef enum {
-  STRSCAN_ERROR,
-  STRSCAN_NUM, STRSCAN_IMAG,
-  STRSCAN_INT, STRSCAN_U32, STRSCAN_I64, STRSCAN_U64,
-} StrScanFmt;
-
-LJ_FUNC StrScanFmt lj_strscan_scan(const uint8_t *p, TValue *o, uint32_t opt);
-LJ_FUNC int LJ_FASTCALL lj_strscan_num(GCstr *str, TValue *o);
-#if LJ_DUALNUM
-LJ_FUNC int LJ_FASTCALL lj_strscan_number(GCstr *str, TValue *o);
-#else
-#define lj_strscan_number(s, o)		lj_strscan_num((s), (o))
-#endif
-
-/* Check for number or convert string to number/int in-place (!). */
-static LJ_AINLINE int lj_strscan_numberobj(TValue *o)
-{
-  return tvisnumber(o) || (tvisstr(o) && lj_strscan_number(strV(o), o));
-}
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_tab.h b/dependencies2013/win32/include/luajit/lj_tab.h
deleted file mode 100644
index 36ce7cdd..00000000
--- a/dependencies2013/win32/include/luajit/lj_tab.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-** Table handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TAB_H
-#define _LJ_TAB_H
-
-#include "lj_obj.h"
-
-/* Hash constants. Tuned using a brute force search. */
-#define HASH_BIAS	(-0x04c11db7)
-#define HASH_ROT1	14
-#define HASH_ROT2	5
-#define HASH_ROT3	13
-
-/* Scramble the bits of numbers and pointers. */
-static LJ_AINLINE uint32_t hashrot(uint32_t lo, uint32_t hi)
-{
-#if LJ_TARGET_X86ORX64
-  /* Prefer variant that compiles well for a 2-operand CPU. */
-  lo ^= hi; hi = lj_rol(hi, HASH_ROT1);
-  lo -= hi; hi = lj_rol(hi, HASH_ROT2);
-  hi ^= lo; hi -= lj_rol(lo, HASH_ROT3);
-#else
-  lo ^= hi;
-  lo = lo - lj_rol(hi, HASH_ROT1);
-  hi = lo ^ lj_rol(hi, HASH_ROT1 + HASH_ROT2);
-  hi = hi - lj_rol(lo, HASH_ROT3);
-#endif
-  return hi;
-}
-
-#define hsize2hbits(s)	((s) ? ((s)==1 ? 1 : 1+lj_fls((uint32_t)((s)-1))) : 0)
-
-LJ_FUNCA GCtab *lj_tab_new(lua_State *L, uint32_t asize, uint32_t hbits);
-#if LJ_HASJIT
-LJ_FUNC GCtab * LJ_FASTCALL lj_tab_new1(lua_State *L, uint32_t ahsize);
-#endif
-LJ_FUNCA GCtab * LJ_FASTCALL lj_tab_dup(lua_State *L, const GCtab *kt);
-LJ_FUNC void LJ_FASTCALL lj_tab_free(global_State *g, GCtab *t);
-#if LJ_HASFFI
-LJ_FUNC void lj_tab_rehash(lua_State *L, GCtab *t);
-#endif
-LJ_FUNCA void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize);
-
-/* Caveat: all getters except lj_tab_get() can return NULL! */
-
-LJ_FUNCA cTValue * LJ_FASTCALL lj_tab_getinth(GCtab *t, int32_t key);
-LJ_FUNC cTValue *lj_tab_getstr(GCtab *t, GCstr *key);
-LJ_FUNCA cTValue *lj_tab_get(lua_State *L, GCtab *t, cTValue *key);
-
-/* Caveat: all setters require a write barrier for the stored value. */
-
-LJ_FUNCA TValue *lj_tab_newkey(lua_State *L, GCtab *t, cTValue *key);
-LJ_FUNC TValue *lj_tab_setinth(lua_State *L, GCtab *t, int32_t key);
-LJ_FUNC TValue *lj_tab_setstr(lua_State *L, GCtab *t, GCstr *key);
-LJ_FUNC TValue *lj_tab_set(lua_State *L, GCtab *t, cTValue *key);
-
-#define inarray(t, key)		((MSize)(key) < (MSize)(t)->asize)
-#define arrayslot(t, i)		(&tvref((t)->array)[(i)])
-#define lj_tab_getint(t, key) \
-  (inarray((t), (key)) ? arrayslot((t), (key)) : lj_tab_getinth((t), (key)))
-#define lj_tab_setint(L, t, key) \
-  (inarray((t), (key)) ? arrayslot((t), (key)) : lj_tab_setinth(L, (t), (key)))
-
-LJ_FUNCA int lj_tab_next(lua_State *L, GCtab *t, TValue *key);
-LJ_FUNCA MSize LJ_FASTCALL lj_tab_len(GCtab *t);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_target.h b/dependencies2013/win32/include/luajit/lj_target.h
deleted file mode 100644
index 53bfa6bf..00000000
--- a/dependencies2013/win32/include/luajit/lj_target.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-** Definitions for target CPU.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TARGET_H
-#define _LJ_TARGET_H
-
-#include "lj_def.h"
-#include "lj_arch.h"
-
-/* -- Registers and spill slots ------------------------------------------- */
-
-/* Register type (uint8_t in ir->r). */
-typedef uint32_t Reg;
-
-/* The hi-bit is NOT set for an allocated register. This means the value
-** can be directly used without masking. The hi-bit is set for a register
-** allocation hint or for RID_INIT, RID_SINK or RID_SUNK.
-*/
-#define RID_NONE		0x80
-#define RID_MASK		0x7f
-#define RID_INIT		(RID_NONE|RID_MASK)
-#define RID_SINK		(RID_INIT-1)
-#define RID_SUNK		(RID_INIT-2)
-
-#define ra_noreg(r)		((r) & RID_NONE)
-#define ra_hasreg(r)		(!((r) & RID_NONE))
-
-/* The ra_hashint() macro assumes a previous test for ra_noreg(). */
-#define ra_hashint(r)		((r) < RID_SUNK)
-#define ra_gethint(r)		((Reg)((r) & RID_MASK))
-#define ra_sethint(rr, r)	rr = (uint8_t)((r)|RID_NONE)
-#define ra_samehint(r1, r2)	(ra_gethint((r1)^(r2)) == 0)
-
-/* Spill slot 0 means no spill slot has been allocated. */
-#define SPS_NONE		0
-
-#define ra_hasspill(s)		((s) != SPS_NONE)
-
-/* Combined register and spill slot (uint16_t in ir->prev). */
-typedef uint32_t RegSP;
-
-#define REGSP(r, s)		((r) + ((s) << 8))
-#define REGSP_HINT(r)		((r)|RID_NONE)
-#define REGSP_INIT		REGSP(RID_INIT, 0)
-
-#define regsp_reg(rs)		((rs) & 255)
-#define regsp_spill(rs)		((rs) >> 8)
-#define regsp_used(rs) \
-  (((rs) & ~REGSP(RID_MASK, 0)) != REGSP(RID_NONE, 0))
-
-/* -- Register sets ------------------------------------------------------- */
-
-/* Bitset for registers. 32 registers suffice for most architectures.
-** Note that one set holds bits for both GPRs and FPRs.
-*/
-#if LJ_TARGET_PPC || LJ_TARGET_MIPS
-typedef uint64_t RegSet;
-#else
-typedef uint32_t RegSet;
-#endif
-
-#define RID2RSET(r)		(((RegSet)1) << (r))
-#define RSET_EMPTY		((RegSet)0)
-#define RSET_RANGE(lo, hi)	((RID2RSET((hi)-(lo))-1) << (lo))
-
-#define rset_test(rs, r)	((int)((rs) >> (r)) & 1)
-#define rset_set(rs, r)		(rs |= RID2RSET(r))
-#define rset_clear(rs, r)	(rs &= ~RID2RSET(r))
-#define rset_exclude(rs, r)	(rs & ~RID2RSET(r))
-#if LJ_TARGET_PPC || LJ_TARGET_MIPS
-#define rset_picktop(rs)	((Reg)(__builtin_clzll(rs)^63))
-#define rset_pickbot(rs)	((Reg)__builtin_ctzll(rs))
-#else
-#define rset_picktop(rs)	((Reg)lj_fls(rs))
-#define rset_pickbot(rs)	((Reg)lj_ffs(rs))
-#endif
-
-/* -- Register allocation cost -------------------------------------------- */
-
-/* The register allocation heuristic keeps track of the cost for allocating
-** a specific register:
-**
-** A free register (obviously) has a cost of 0 and a 1-bit in the free mask.
-**
-** An already allocated register has the (non-zero) IR reference in the lowest
-** bits and the result of a blended cost-model in the higher bits.
-**
-** The allocator first checks the free mask for a hit. Otherwise an (unrolled)
-** linear search for the minimum cost is used. The search doesn't need to
-** keep track of the position of the minimum, which makes it very fast.
-** The lowest bits of the minimum cost show the desired IR reference whose
-** register is the one to evict.
-**
-** Without the cost-model this degenerates to the standard heuristics for
-** (reverse) linear-scan register allocation. Since code generation is done
-** in reverse, a live interval extends from the last use to the first def.
-** For an SSA IR the IR reference is the first (and only) def and thus
-** trivially marks the end of the interval. The LSRA heuristics says to pick
-** the register whose live interval has the furthest extent, i.e. the lowest
-** IR reference in our case.
-**
-** A cost-model should take into account other factors, like spill-cost and
-** restore- or rematerialization-cost, which depend on the kind of instruction.
-** E.g. constants have zero spill costs, variant instructions have higher
-** costs than invariants and PHIs should preferably never be spilled.
-**
-** Here's a first cut at simple, but effective blended cost-model for R-LSRA:
-** - Due to careful design of the IR, constants already have lower IR
-**   references than invariants and invariants have lower IR references
-**   than variants.
-** - The cost in the upper 16 bits is the sum of the IR reference and a
-**   weighted score. The score currently only takes into account whether
-**   the IRT_ISPHI bit is set in the instruction type.
-** - The PHI weight is the minimum distance (in IR instructions) a PHI
-**   reference has to be further apart from a non-PHI reference to be spilled.
-** - It should be a power of two (for speed) and must be between 2 and 32768.
-**   Good values for the PHI weight seem to be between 40 and 150.
-** - Further study is required.
-*/
-#define REGCOST_PHI_WEIGHT	64
-
-/* Cost for allocating a specific register. */
-typedef uint32_t RegCost;
-
-/* Note: assumes 16 bit IRRef1. */
-#define REGCOST(cost, ref)	((RegCost)(ref) + ((RegCost)(cost) << 16))
-#define regcost_ref(rc)		((IRRef1)(rc))
-
-#define REGCOST_T(t) \
-  ((RegCost)((t)&IRT_ISPHI) * (((RegCost)(REGCOST_PHI_WEIGHT)<<16)/IRT_ISPHI))
-#define REGCOST_REF_T(ref, t)	(REGCOST((ref), (ref)) + REGCOST_T((t)))
-
-/* -- Target-specific definitions ----------------------------------------- */
-
-#if LJ_TARGET_X86ORX64
-#include "lj_target_x86.h"
-#elif LJ_TARGET_ARM
-#include "lj_target_arm.h"
-#elif LJ_TARGET_PPC
-#include "lj_target_ppc.h"
-#elif LJ_TARGET_MIPS
-#include "lj_target_mips.h"
-#else
-#error "Missing include for target CPU"
-#endif
-
-#ifdef EXITSTUBS_PER_GROUP
-/* Return the address of an exit stub. */
-static LJ_AINLINE char *exitstub_addr_(char **group, uint32_t exitno)
-{
-  lua_assert(group[exitno / EXITSTUBS_PER_GROUP] != NULL);
-  return (char *)group[exitno / EXITSTUBS_PER_GROUP] +
-	 EXITSTUB_SPACING*(exitno % EXITSTUBS_PER_GROUP);
-}
-/* Avoid dependence on lj_jit.h if only including lj_target.h. */
-#define exitstub_addr(J, exitno) \
-  ((MCode *)exitstub_addr_((char **)((J)->exitstubgroup), (exitno)))
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_target_arm.h b/dependencies2013/win32/include/luajit/lj_target_arm.h
deleted file mode 100644
index d02cbf86..00000000
--- a/dependencies2013/win32/include/luajit/lj_target_arm.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-** Definitions for ARM CPUs.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TARGET_ARM_H
-#define _LJ_TARGET_ARM_H
-
-/* -- Registers IDs ------------------------------------------------------- */
-
-#define GPRDEF(_) \
-  _(R0) _(R1) _(R2) _(R3) _(R4) _(R5) _(R6) _(R7) \
-  _(R8) _(R9) _(R10) _(R11) _(R12) _(SP) _(LR) _(PC)
-#if LJ_SOFTFP
-#define FPRDEF(_)
-#else
-#define FPRDEF(_) \
-  _(D0) _(D1) _(D2) _(D3) _(D4) _(D5) _(D6) _(D7) \
-  _(D8) _(D9) _(D10) _(D11) _(D12) _(D13) _(D14) _(D15)
-#endif
-#define VRIDDEF(_)
-
-#define RIDENUM(name)	RID_##name,
-
-enum {
-  GPRDEF(RIDENUM)		/* General-purpose registers (GPRs). */
-  FPRDEF(RIDENUM)		/* Floating-point registers (FPRs). */
-  RID_MAX,
-  RID_TMP = RID_LR,
-
-  /* Calling conventions. */
-  RID_RET = RID_R0,
-  RID_RETLO = RID_R0,
-  RID_RETHI = RID_R1,
-#if LJ_SOFTFP
-  RID_FPRET = RID_R0,
-#else
-  RID_FPRET = RID_D0,
-#endif
-
-  /* These definitions must match with the *.dasc file(s): */
-  RID_BASE = RID_R9,		/* Interpreter BASE. */
-  RID_LPC = RID_R6,		/* Interpreter PC. */
-  RID_DISPATCH = RID_R7,	/* Interpreter DISPATCH table. */
-  RID_LREG = RID_R8,		/* Interpreter L. */
-
-  /* Register ranges [min, max) and number of registers. */
-  RID_MIN_GPR = RID_R0,
-  RID_MAX_GPR = RID_PC+1,
-  RID_MIN_FPR = RID_MAX_GPR,
-#if LJ_SOFTFP
-  RID_MAX_FPR = RID_MIN_FPR,
-#else
-  RID_MAX_FPR = RID_D15+1,
-#endif
-  RID_NUM_GPR = RID_MAX_GPR - RID_MIN_GPR,
-  RID_NUM_FPR = RID_MAX_FPR - RID_MIN_FPR
-};
-
-#define RID_NUM_KREF		RID_NUM_GPR
-#define RID_MIN_KREF		RID_R0
-
-/* -- Register sets ------------------------------------------------------- */
-
-/* Make use of all registers, except sp, lr and pc. */
-#define RSET_GPR		(RSET_RANGE(RID_MIN_GPR, RID_R12+1))
-#define RSET_GPREVEN \
-  (RID2RSET(RID_R0)|RID2RSET(RID_R2)|RID2RSET(RID_R4)|RID2RSET(RID_R6)| \
-   RID2RSET(RID_R8)|RID2RSET(RID_R10))
-#define RSET_GPRODD \
-  (RID2RSET(RID_R1)|RID2RSET(RID_R3)|RID2RSET(RID_R5)|RID2RSET(RID_R7)| \
-   RID2RSET(RID_R9)|RID2RSET(RID_R11))
-#if LJ_SOFTFP
-#define RSET_FPR		0
-#else
-#define RSET_FPR		(RSET_RANGE(RID_MIN_FPR, RID_MAX_FPR))
-#endif
-#define RSET_ALL		(RSET_GPR|RSET_FPR)
-#define RSET_INIT		RSET_ALL
-
-/* ABI-specific register sets. lr is an implicit scratch register. */
-#define RSET_SCRATCH_GPR_	(RSET_RANGE(RID_R0, RID_R3+1)|RID2RSET(RID_R12))
-#ifdef __APPLE__
-#define RSET_SCRATCH_GPR	(RSET_SCRATCH_GPR_|RID2RSET(RID_R9))
-#else
-#define RSET_SCRATCH_GPR	RSET_SCRATCH_GPR_
-#endif
-#if LJ_SOFTFP
-#define RSET_SCRATCH_FPR	0
-#else
-#define RSET_SCRATCH_FPR	(RSET_RANGE(RID_D0, RID_D7+1))
-#endif
-#define RSET_SCRATCH		(RSET_SCRATCH_GPR|RSET_SCRATCH_FPR)
-#define REGARG_FIRSTGPR		RID_R0
-#define REGARG_LASTGPR		RID_R3
-#define REGARG_NUMGPR		4
-#if LJ_ABI_SOFTFP
-#define REGARG_FIRSTFPR		0
-#define REGARG_LASTFPR		0
-#define REGARG_NUMFPR		0
-#else
-#define REGARG_FIRSTFPR		RID_D0
-#define REGARG_LASTFPR		RID_D7
-#define REGARG_NUMFPR		8
-#endif
-
-/* -- Spill slots --------------------------------------------------------- */
-
-/* Spill slots are 32 bit wide. An even/odd pair is used for FPRs.
-**
-** SPS_FIXED: Available fixed spill slots in interpreter frame.
-** This definition must match with the *.dasc file(s).
-**
-** SPS_FIRST: First spill slot for general use. Reserve min. two 32 bit slots.
-*/
-#define SPS_FIXED	2
-#define SPS_FIRST	2
-
-#define SPOFS_TMP	0
-
-#define sps_scale(slot)		(4 * (int32_t)(slot))
-#define sps_align(slot)		(((slot) - SPS_FIXED + 1) & ~1)
-
-/* -- Exit state ---------------------------------------------------------- */
-
-/* This definition must match with the *.dasc file(s). */
-typedef struct {
-#if !LJ_SOFTFP
-  lua_Number fpr[RID_NUM_FPR];	/* Floating-point registers. */
-#endif
-  int32_t gpr[RID_NUM_GPR];	/* General-purpose registers. */
-  int32_t spill[256];		/* Spill slots. */
-} ExitState;
-
-/* PC after instruction that caused an exit. Used to find the trace number. */
-#define EXITSTATE_PCREG		RID_PC
-/* Highest exit + 1 indicates stack check. */
-#define EXITSTATE_CHECKEXIT	1
-
-#define EXITSTUB_SPACING        4
-#define EXITSTUBS_PER_GROUP     32
-
-/* -- Instructions -------------------------------------------------------- */
-
-/* Instruction fields. */
-#define ARMF_CC(ai, cc)	(((ai) ^ ARMI_CCAL) | ((cc) << 28))
-#define ARMF_N(r)	((r) << 16)
-#define ARMF_D(r)	((r) << 12)
-#define ARMF_S(r)	((r) << 8)
-#define ARMF_M(r)	(r)
-#define ARMF_SH(sh, n)	(((sh) << 5) | ((n) << 7))
-#define ARMF_RSH(sh, r)	(0x10 | ((sh) << 5) | ARMF_S(r))
-
-typedef enum ARMIns {
-  ARMI_CCAL = 0xe0000000,
-  ARMI_S = 0x000100000,
-  ARMI_K12 = 0x02000000,
-  ARMI_KNEG = 0x00200000,
-  ARMI_LS_W = 0x00200000,
-  ARMI_LS_U = 0x00800000,
-  ARMI_LS_P = 0x01000000,
-  ARMI_LS_R = 0x02000000,
-  ARMI_LSX_I = 0x00400000,
-
-  ARMI_AND = 0xe0000000,
-  ARMI_EOR = 0xe0200000,
-  ARMI_SUB = 0xe0400000,
-  ARMI_RSB = 0xe0600000,
-  ARMI_ADD = 0xe0800000,
-  ARMI_ADC = 0xe0a00000,
-  ARMI_SBC = 0xe0c00000,
-  ARMI_RSC = 0xe0e00000,
-  ARMI_TST = 0xe1100000,
-  ARMI_TEQ = 0xe1300000,
-  ARMI_CMP = 0xe1500000,
-  ARMI_CMN = 0xe1700000,
-  ARMI_ORR = 0xe1800000,
-  ARMI_MOV = 0xe1a00000,
-  ARMI_BIC = 0xe1c00000,
-  ARMI_MVN = 0xe1e00000,
-
-  ARMI_NOP = 0xe1a00000,
-
-  ARMI_MUL = 0xe0000090,
-  ARMI_SMULL = 0xe0c00090,
-
-  ARMI_LDR = 0xe4100000,
-  ARMI_LDRB = 0xe4500000,
-  ARMI_LDRH = 0xe01000b0,
-  ARMI_LDRSB = 0xe01000d0,
-  ARMI_LDRSH = 0xe01000f0,
-  ARMI_LDRD = 0xe00000d0,
-  ARMI_STR = 0xe4000000,
-  ARMI_STRB = 0xe4400000,
-  ARMI_STRH = 0xe00000b0,
-  ARMI_STRD = 0xe00000f0,
-  ARMI_PUSH = 0xe92d0000,
-
-  ARMI_B = 0xea000000,
-  ARMI_BL = 0xeb000000,
-  ARMI_BLX = 0xfa000000,
-  ARMI_BLXr = 0xe12fff30,
-
-  /* ARMv6 */
-  ARMI_REV = 0xe6bf0f30,
-  ARMI_SXTB = 0xe6af0070,
-  ARMI_SXTH = 0xe6bf0070,
-  ARMI_UXTB = 0xe6ef0070,
-  ARMI_UXTH = 0xe6ff0070,
-
-  /* ARMv6T2 */
-  ARMI_MOVW = 0xe3000000,
-  ARMI_MOVT = 0xe3400000,
-
-  /* VFP */
-  ARMI_VMOV_D = 0xeeb00b40,
-  ARMI_VMOV_S = 0xeeb00a40,
-  ARMI_VMOVI_D = 0xeeb00b00,
-
-  ARMI_VMOV_R_S = 0xee100a10,
-  ARMI_VMOV_S_R = 0xee000a10,
-  ARMI_VMOV_RR_D = 0xec500b10,
-  ARMI_VMOV_D_RR = 0xec400b10,
-
-  ARMI_VADD_D = 0xee300b00,
-  ARMI_VSUB_D = 0xee300b40,
-  ARMI_VMUL_D = 0xee200b00,
-  ARMI_VMLA_D = 0xee000b00,
-  ARMI_VMLS_D = 0xee000b40,
-  ARMI_VNMLS_D = 0xee100b00,
-  ARMI_VDIV_D = 0xee800b00,
-
-  ARMI_VABS_D = 0xeeb00bc0,
-  ARMI_VNEG_D = 0xeeb10b40,
-  ARMI_VSQRT_D = 0xeeb10bc0,
-
-  ARMI_VCMP_D = 0xeeb40b40,
-  ARMI_VCMPZ_D = 0xeeb50b40,
-
-  ARMI_VMRS = 0xeef1fa10,
-
-  ARMI_VCVT_S32_F32 = 0xeebd0ac0,
-  ARMI_VCVT_S32_F64 = 0xeebd0bc0,
-  ARMI_VCVT_U32_F32 = 0xeebc0ac0,
-  ARMI_VCVT_U32_F64 = 0xeebc0bc0,
-  ARMI_VCVTR_S32_F32 = 0xeebd0a40,
-  ARMI_VCVTR_S32_F64 = 0xeebd0b40,
-  ARMI_VCVTR_U32_F32 = 0xeebc0a40,
-  ARMI_VCVTR_U32_F64 = 0xeebc0b40,
-  ARMI_VCVT_F32_S32 = 0xeeb80ac0,
-  ARMI_VCVT_F64_S32 = 0xeeb80bc0,
-  ARMI_VCVT_F32_U32 = 0xeeb80a40,
-  ARMI_VCVT_F64_U32 = 0xeeb80b40,
-  ARMI_VCVT_F32_F64 = 0xeeb70bc0,
-  ARMI_VCVT_F64_F32 = 0xeeb70ac0,
-
-  ARMI_VLDR_S = 0xed100a00,
-  ARMI_VLDR_D = 0xed100b00,
-  ARMI_VSTR_S = 0xed000a00,
-  ARMI_VSTR_D = 0xed000b00,
-} ARMIns;
-
-typedef enum ARMShift {
-  ARMSH_LSL, ARMSH_LSR, ARMSH_ASR, ARMSH_ROR
-} ARMShift;
-
-/* ARM condition codes. */
-typedef enum ARMCC {
-  CC_EQ, CC_NE, CC_CS, CC_CC, CC_MI, CC_PL, CC_VS, CC_VC,
-  CC_HI, CC_LS, CC_GE, CC_LT, CC_GT, CC_LE, CC_AL,
-  CC_HS = CC_CS, CC_LO = CC_CC
-} ARMCC;
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_target_mips.h b/dependencies2013/win32/include/luajit/lj_target_mips.h
deleted file mode 100644
index bed174b8..00000000
--- a/dependencies2013/win32/include/luajit/lj_target_mips.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-** Definitions for MIPS CPUs.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TARGET_MIPS_H
-#define _LJ_TARGET_MIPS_H
-
-/* -- Registers IDs ------------------------------------------------------- */
-
-#define GPRDEF(_) \
-  _(R0) _(R1) _(R2) _(R3) _(R4) _(R5) _(R6) _(R7) \
-  _(R8) _(R9) _(R10) _(R11) _(R12) _(R13) _(R14) _(R15) \
-  _(R16) _(R17) _(R18) _(R19) _(R20) _(R21) _(R22) _(R23) \
-  _(R24) _(R25) _(SYS1) _(SYS2) _(R28) _(SP) _(R30) _(RA)
-#define FPRDEF(_) \
-  _(F0) _(F1) _(F2) _(F3) _(F4) _(F5) _(F6) _(F7) \
-  _(F8) _(F9) _(F10) _(F11) _(F12) _(F13) _(F14) _(F15) \
-  _(F16) _(F17) _(F18) _(F19) _(F20) _(F21) _(F22) _(F23) \
-  _(F24) _(F25) _(F26) _(F27) _(F28) _(F29) _(F30) _(F31)
-#define VRIDDEF(_)
-
-#define RIDENUM(name)	RID_##name,
-
-enum {
-  GPRDEF(RIDENUM)		/* General-purpose registers (GPRs). */
-  FPRDEF(RIDENUM)		/* Floating-point registers (FPRs). */
-  RID_MAX,
-  RID_ZERO = RID_R0,
-  RID_TMP = RID_RA,
-  RID_GP = RID_R28,
-
-  /* Calling conventions. */
-  RID_RET = RID_R2,
-#if LJ_LE
-  RID_RETHI = RID_R3,
-  RID_RETLO = RID_R2,
-#else
-  RID_RETHI = RID_R2,
-  RID_RETLO = RID_R3,
-#endif
-  RID_FPRET = RID_F0,
-  RID_CFUNCADDR = RID_R25,
-
-  /* These definitions must match with the *.dasc file(s): */
-  RID_BASE = RID_R16,		/* Interpreter BASE. */
-  RID_LPC = RID_R18,		/* Interpreter PC. */
-  RID_DISPATCH = RID_R19,	/* Interpreter DISPATCH table. */
-  RID_LREG = RID_R20,		/* Interpreter L. */
-  RID_JGL = RID_R30,		/* On-trace: global_State + 32768. */
-
-  /* Register ranges [min, max) and number of registers. */
-  RID_MIN_GPR = RID_R0,
-  RID_MAX_GPR = RID_RA+1,
-  RID_MIN_FPR = RID_F0,
-  RID_MAX_FPR = RID_F31+1,
-  RID_NUM_GPR = RID_MAX_GPR - RID_MIN_GPR,
-  RID_NUM_FPR = RID_MAX_FPR - RID_MIN_FPR	/* Only even regs are used. */
-};
-
-#define RID_NUM_KREF		RID_NUM_GPR
-#define RID_MIN_KREF		RID_R0
-
-/* -- Register sets ------------------------------------------------------- */
-
-/* Make use of all registers, except ZERO, TMP, SP, SYS1, SYS2, JGL and GP. */
-#define RSET_FIXED \
-  (RID2RSET(RID_ZERO)|RID2RSET(RID_TMP)|RID2RSET(RID_SP)|\
-   RID2RSET(RID_SYS1)|RID2RSET(RID_SYS2)|RID2RSET(RID_JGL)|RID2RSET(RID_GP))
-#define RSET_GPR	(RSET_RANGE(RID_MIN_GPR, RID_MAX_GPR) - RSET_FIXED)
-#define RSET_FPR \
-  (RID2RSET(RID_F0)|RID2RSET(RID_F2)|RID2RSET(RID_F4)|RID2RSET(RID_F6)|\
-   RID2RSET(RID_F8)|RID2RSET(RID_F10)|RID2RSET(RID_F12)|RID2RSET(RID_F14)|\
-   RID2RSET(RID_F16)|RID2RSET(RID_F18)|RID2RSET(RID_F20)|RID2RSET(RID_F22)|\
-   RID2RSET(RID_F24)|RID2RSET(RID_F26)|RID2RSET(RID_F28)|RID2RSET(RID_F30))
-#define RSET_ALL	(RSET_GPR|RSET_FPR)
-#define RSET_INIT	RSET_ALL
-
-#define RSET_SCRATCH_GPR \
-  (RSET_RANGE(RID_R1, RID_R15+1)|\
-   RID2RSET(RID_R24)|RID2RSET(RID_R25))
-#define RSET_SCRATCH_FPR \
-  (RID2RSET(RID_F0)|RID2RSET(RID_F2)|RID2RSET(RID_F4)|RID2RSET(RID_F6)|\
-   RID2RSET(RID_F8)|RID2RSET(RID_F10)|RID2RSET(RID_F12)|RID2RSET(RID_F14)|\
-   RID2RSET(RID_F16)|RID2RSET(RID_F18))
-#define RSET_SCRATCH		(RSET_SCRATCH_GPR|RSET_SCRATCH_FPR)
-#define REGARG_FIRSTGPR		RID_R4
-#define REGARG_LASTGPR		RID_R7
-#define REGARG_NUMGPR		4
-#define REGARG_FIRSTFPR		RID_F12
-#define REGARG_LASTFPR		RID_F14
-#define REGARG_NUMFPR		2
-
-/* -- Spill slots --------------------------------------------------------- */
-
-/* Spill slots are 32 bit wide. An even/odd pair is used for FPRs.
-**
-** SPS_FIXED: Available fixed spill slots in interpreter frame.
-** This definition must match with the *.dasc file(s).
-**
-** SPS_FIRST: First spill slot for general use.
-*/
-#define SPS_FIXED	5
-#define SPS_FIRST	4
-
-#define SPOFS_TMP	0
-
-#define sps_scale(slot)		(4 * (int32_t)(slot))
-#define sps_align(slot)		(((slot) - SPS_FIXED + 1) & ~1)
-
-/* -- Exit state ---------------------------------------------------------- */
-
-/* This definition must match with the *.dasc file(s). */
-typedef struct {
-  lua_Number fpr[RID_NUM_FPR];	/* Floating-point registers. */
-  int32_t gpr[RID_NUM_GPR];	/* General-purpose registers. */
-  int32_t spill[256];		/* Spill slots. */
-} ExitState;
-
-/* Highest exit + 1 indicates stack check. */
-#define EXITSTATE_CHECKEXIT	1
-
-/* Return the address of a per-trace exit stub. */
-static LJ_AINLINE uint32_t *exitstub_trace_addr_(uint32_t *p)
-{
-  while (*p == 0x00000000) p++;  /* Skip MIPSI_NOP. */
-  return p;
-}
-/* Avoid dependence on lj_jit.h if only including lj_target.h. */
-#define exitstub_trace_addr(T, exitno) \
-  exitstub_trace_addr_((MCode *)((char *)(T)->mcode + (T)->szmcode))
-
-/* -- Instructions -------------------------------------------------------- */
-
-/* Instruction fields. */
-#define MIPSF_S(r)	((r) << 21)
-#define MIPSF_T(r)	((r) << 16)
-#define MIPSF_D(r)	((r) << 11)
-#define MIPSF_R(r)	((r) << 21)
-#define MIPSF_H(r)	((r) << 16)
-#define MIPSF_G(r)	((r) << 11)
-#define MIPSF_F(r)	((r) << 6)
-#define MIPSF_A(n)	((n) << 6)
-#define MIPSF_M(n)	((n) << 11)
-
-typedef enum MIPSIns {
-  /* Integer instructions. */
-  MIPSI_MOVE = 0x00000021,
-  MIPSI_NOP = 0x00000000,
-
-  MIPSI_LI = 0x24000000,
-  MIPSI_LU = 0x34000000,
-  MIPSI_LUI = 0x3c000000,
-
-  MIPSI_ADDIU = 0x24000000,
-  MIPSI_ANDI = 0x30000000,
-  MIPSI_ORI = 0x34000000,
-  MIPSI_XORI = 0x38000000,
-  MIPSI_SLTI = 0x28000000,
-  MIPSI_SLTIU = 0x2c000000,
-
-  MIPSI_ADDU = 0x00000021,
-  MIPSI_SUBU = 0x00000023,
-  MIPSI_MUL = 0x70000002,
-  MIPSI_AND = 0x00000024,
-  MIPSI_OR = 0x00000025,
-  MIPSI_XOR = 0x00000026,
-  MIPSI_NOR = 0x00000027,
-  MIPSI_SLT = 0x0000002a,
-  MIPSI_SLTU = 0x0000002b,
-  MIPSI_MOVZ = 0x0000000a,
-  MIPSI_MOVN = 0x0000000b,
-
-  MIPSI_SLL = 0x00000000,
-  MIPSI_SRL = 0x00000002,
-  MIPSI_SRA = 0x00000003,
-  MIPSI_ROTR = 0x00200002,	/* MIPS32R2 */
-  MIPSI_SLLV = 0x00000004,
-  MIPSI_SRLV = 0x00000006,
-  MIPSI_SRAV = 0x00000007,
-  MIPSI_ROTRV = 0x00000046,	/* MIPS32R2 */
-
-  MIPSI_SEB = 0x7c000420,	/* MIPS32R2 */
-  MIPSI_SEH = 0x7c000620,	/* MIPS32R2 */
-  MIPSI_WSBH = 0x7c0000a0,	/* MIPS32R2 */
-
-  MIPSI_B = 0x10000000,
-  MIPSI_J = 0x08000000,
-  MIPSI_JAL = 0x0c000000,
-  MIPSI_JR = 0x00000008,
-  MIPSI_JALR = 0x0000f809,
-
-  MIPSI_BEQ = 0x10000000,
-  MIPSI_BNE = 0x14000000,
-  MIPSI_BLEZ = 0x18000000,
-  MIPSI_BGTZ = 0x1c000000,
-  MIPSI_BLTZ = 0x04000000,
-  MIPSI_BGEZ = 0x04010000,
-
-  /* Load/store instructions. */
-  MIPSI_LW = 0x8c000000,
-  MIPSI_SW = 0xac000000,
-  MIPSI_LB = 0x80000000,
-  MIPSI_SB = 0xa0000000,
-  MIPSI_LH = 0x84000000,
-  MIPSI_SH = 0xa4000000,
-  MIPSI_LBU = 0x90000000,
-  MIPSI_LHU = 0x94000000,
-  MIPSI_LWC1 = 0xc4000000,
-  MIPSI_SWC1 = 0xe4000000,
-  MIPSI_LDC1 = 0xd4000000,
-  MIPSI_SDC1 = 0xf4000000,
-
-  /* FP instructions. */
-  MIPSI_MOV_S = 0x46000006,
-  MIPSI_MOV_D = 0x46200006,
-  MIPSI_MOVT_D = 0x46210011,
-  MIPSI_MOVF_D = 0x46200011,
-
-  MIPSI_ABS_D = 0x46200005,
-  MIPSI_NEG_D = 0x46200007,
-
-  MIPSI_ADD_D = 0x46200000,
-  MIPSI_SUB_D = 0x46200001,
-  MIPSI_MUL_D = 0x46200002,
-  MIPSI_DIV_D = 0x46200003,
-  MIPSI_SQRT_D = 0x46200004,
-
-  MIPSI_ADD_S = 0x46000000,
-  MIPSI_SUB_S = 0x46000001,
-
-  MIPSI_CVT_D_S = 0x46000021,
-  MIPSI_CVT_W_S = 0x46000024,
-  MIPSI_CVT_S_D = 0x46200020,
-  MIPSI_CVT_W_D = 0x46200024,
-  MIPSI_CVT_S_W = 0x46800020,
-  MIPSI_CVT_D_W = 0x46800021,
-
-  MIPSI_TRUNC_W_S = 0x4600000d,
-  MIPSI_TRUNC_W_D = 0x4620000d,
-  MIPSI_FLOOR_W_S = 0x4600000f,
-  MIPSI_FLOOR_W_D = 0x4620000f,
-
-  MIPSI_MFC1 = 0x44000000,
-  MIPSI_MTC1 = 0x44800000,
-
-  MIPSI_BC1F = 0x45000000,
-  MIPSI_BC1T = 0x45010000,
-
-  MIPSI_C_EQ_D = 0x46200032,
-  MIPSI_C_OLT_D = 0x46200034,
-  MIPSI_C_ULT_D = 0x46200035,
-  MIPSI_C_OLE_D = 0x46200036,
-  MIPSI_C_ULE_D = 0x46200037,
-
-} MIPSIns;
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_target_ppc.h b/dependencies2013/win32/include/luajit/lj_target_ppc.h
deleted file mode 100644
index e57e27df..00000000
--- a/dependencies2013/win32/include/luajit/lj_target_ppc.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-** Definitions for PPC CPUs.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TARGET_PPC_H
-#define _LJ_TARGET_PPC_H
-
-/* -- Registers IDs ------------------------------------------------------- */
-
-#define GPRDEF(_) \
-  _(R0) _(SP) _(SYS1) _(R3) _(R4) _(R5) _(R6) _(R7) \
-  _(R8) _(R9) _(R10) _(R11) _(R12) _(SYS2) _(R14) _(R15) \
-  _(R16) _(R17) _(R18) _(R19) _(R20) _(R21) _(R22) _(R23) \
-  _(R24) _(R25) _(R26) _(R27) _(R28) _(R29) _(R30) _(R31)
-#define FPRDEF(_) \
-  _(F0) _(F1) _(F2) _(F3) _(F4) _(F5) _(F6) _(F7) \
-  _(F8) _(F9) _(F10) _(F11) _(F12) _(F13) _(F14) _(F15) \
-  _(F16) _(F17) _(F18) _(F19) _(F20) _(F21) _(F22) _(F23) \
-  _(F24) _(F25) _(F26) _(F27) _(F28) _(F29) _(F30) _(F31)
-#define VRIDDEF(_)
-
-#define RIDENUM(name)	RID_##name,
-
-enum {
-  GPRDEF(RIDENUM)		/* General-purpose registers (GPRs). */
-  FPRDEF(RIDENUM)		/* Floating-point registers (FPRs). */
-  RID_MAX,
-  RID_TMP = RID_R0,
-
-  /* Calling conventions. */
-  RID_RET = RID_R3,
-  RID_RETHI = RID_R3,
-  RID_RETLO = RID_R4,
-  RID_FPRET = RID_F1,
-
-  /* These definitions must match with the *.dasc file(s): */
-  RID_BASE = RID_R14,		/* Interpreter BASE. */
-  RID_LPC = RID_R16,		/* Interpreter PC. */
-  RID_DISPATCH = RID_R17,	/* Interpreter DISPATCH table. */
-  RID_LREG = RID_R18,		/* Interpreter L. */
-  RID_JGL = RID_R31,		/* On-trace: global_State + 32768. */
-
-  /* Register ranges [min, max) and number of registers. */
-  RID_MIN_GPR = RID_R0,
-  RID_MAX_GPR = RID_R31+1,
-  RID_MIN_FPR = RID_F0,
-  RID_MAX_FPR = RID_F31+1,
-  RID_NUM_GPR = RID_MAX_GPR - RID_MIN_GPR,
-  RID_NUM_FPR = RID_MAX_FPR - RID_MIN_FPR
-};
-
-#define RID_NUM_KREF		RID_NUM_GPR
-#define RID_MIN_KREF		RID_R0
-
-/* -- Register sets ------------------------------------------------------- */
-
-/* Make use of all registers, except TMP, SP, SYS1, SYS2 and JGL. */
-#define RSET_FIXED \
-  (RID2RSET(RID_TMP)|RID2RSET(RID_SP)|RID2RSET(RID_SYS1)|\
-   RID2RSET(RID_SYS2)|RID2RSET(RID_JGL))
-#define RSET_GPR	(RSET_RANGE(RID_MIN_GPR, RID_MAX_GPR) - RSET_FIXED)
-#define RSET_FPR	RSET_RANGE(RID_MIN_FPR, RID_MAX_FPR)
-#define RSET_ALL	(RSET_GPR|RSET_FPR)
-#define RSET_INIT	RSET_ALL
-
-#define RSET_SCRATCH_GPR	(RSET_RANGE(RID_R3, RID_R12+1))
-#define RSET_SCRATCH_FPR	(RSET_RANGE(RID_F0, RID_F13+1))
-#define RSET_SCRATCH		(RSET_SCRATCH_GPR|RSET_SCRATCH_FPR)
-#define REGARG_FIRSTGPR		RID_R3
-#define REGARG_LASTGPR		RID_R10
-#define REGARG_NUMGPR		8
-#define REGARG_FIRSTFPR		RID_F1
-#define REGARG_LASTFPR		RID_F8
-#define REGARG_NUMFPR		8
-
-/* -- Spill slots --------------------------------------------------------- */
-
-/* Spill slots are 32 bit wide. An even/odd pair is used for FPRs.
-**
-** SPS_FIXED: Available fixed spill slots in interpreter frame.
-** This definition must match with the *.dasc file(s).
-**
-** SPS_FIRST: First spill slot for general use.
-** [sp+12] tmplo word \
-** [sp+ 8] tmphi word / tmp dword, parameter area for callee
-** [sp+ 4] tmpw, LR of callee
-** [sp+ 0] stack chain
-*/
-#define SPS_FIXED	7
-#define SPS_FIRST	4
-
-/* Stack offsets for temporary slots. Used for FP<->int conversions etc. */
-#define SPOFS_TMPW	4
-#define SPOFS_TMP	8
-#define SPOFS_TMPHI	8
-#define SPOFS_TMPLO	12
-
-#define sps_scale(slot)		(4 * (int32_t)(slot))
-#define sps_align(slot)		(((slot) - SPS_FIXED + 3) & ~3)
-
-/* -- Exit state ---------------------------------------------------------- */
-
-/* This definition must match with the *.dasc file(s). */
-typedef struct {
-  lua_Number fpr[RID_NUM_FPR];	/* Floating-point registers. */
-  int32_t gpr[RID_NUM_GPR];	/* General-purpose registers. */
-  int32_t spill[256];		/* Spill slots. */
-} ExitState;
-
-/* Highest exit + 1 indicates stack check. */
-#define EXITSTATE_CHECKEXIT	1
-
-/* Return the address of a per-trace exit stub. */
-static LJ_AINLINE uint32_t *exitstub_trace_addr_(uint32_t *p, uint32_t exitno)
-{
-  while (*p == 0x60000000) p++;  /* Skip PPCI_NOP. */
-  return p + 3 + exitno;
-}
-/* Avoid dependence on lj_jit.h if only including lj_target.h. */
-#define exitstub_trace_addr(T, exitno) \
-  exitstub_trace_addr_((MCode *)((char *)(T)->mcode + (T)->szmcode), (exitno))
-
-/* -- Instructions -------------------------------------------------------- */
-
-/* Instruction fields. */
-#define PPCF_CC(cc)	((((cc) & 3) << 16) | (((cc) & 4) << 22))
-#define PPCF_T(r)	((r) << 21)
-#define PPCF_A(r)	((r) << 16)
-#define PPCF_B(r)	((r) << 11)
-#define PPCF_C(r)	((r) << 6)
-#define PPCF_MB(n)	((n) << 6)
-#define PPCF_ME(n)	((n) << 1)
-#define PPCF_Y		0x00200000
-#define PPCF_DOT	0x00000001
-
-typedef enum PPCIns {
-  /* Integer instructions. */
-  PPCI_MR = 0x7c000378,
-  PPCI_NOP = 0x60000000,
-
-  PPCI_LI = 0x38000000,
-  PPCI_LIS = 0x3c000000,
-
-  PPCI_ADD = 0x7c000214,
-  PPCI_ADDC = 0x7c000014,
-  PPCI_ADDO = 0x7c000614,
-  PPCI_ADDE = 0x7c000114,
-  PPCI_ADDZE = 0x7c000194,
-  PPCI_ADDME = 0x7c0001d4,
-  PPCI_ADDI = 0x38000000,
-  PPCI_ADDIS = 0x3c000000,
-  PPCI_ADDIC = 0x30000000,
-  PPCI_ADDICDOT = 0x34000000,
-
-  PPCI_SUBF = 0x7c000050,
-  PPCI_SUBFC = 0x7c000010,
-  PPCI_SUBFO = 0x7c000450,
-  PPCI_SUBFE = 0x7c000110,
-  PPCI_SUBFZE = 0x7c000190,
-  PPCI_SUBFME = 0x7c0001d0,
-  PPCI_SUBFIC = 0x20000000,
-
-  PPCI_NEG = 0x7c0000d0,
-
-  PPCI_AND = 0x7c000038,
-  PPCI_ANDC = 0x7c000078,
-  PPCI_NAND = 0x7c0003b8,
-  PPCI_ANDIDOT = 0x70000000,
-  PPCI_ANDISDOT = 0x74000000,
-
-  PPCI_OR = 0x7c000378,
-  PPCI_NOR = 0x7c0000f8,
-  PPCI_ORI = 0x60000000,
-  PPCI_ORIS = 0x64000000,
-
-  PPCI_XOR = 0x7c000278,
-  PPCI_EQV = 0x7c000238,
-  PPCI_XORI = 0x68000000,
-  PPCI_XORIS = 0x6c000000,
-
-  PPCI_CMPW = 0x7c000000,
-  PPCI_CMPLW = 0x7c000040,
-  PPCI_CMPWI = 0x2c000000,
-  PPCI_CMPLWI = 0x28000000,
-
-  PPCI_MULLW = 0x7c0001d6,
-  PPCI_MULLI = 0x1c000000,
-  PPCI_MULLWO = 0x7c0005d6,
-
-  PPCI_EXTSB = 0x7c000774,
-  PPCI_EXTSH = 0x7c000734,
-
-  PPCI_SLW = 0x7c000030,
-  PPCI_SRW = 0x7c000430,
-  PPCI_SRAW = 0x7c000630,
-  PPCI_SRAWI = 0x7c000670,
-
-  PPCI_RLWNM = 0x5c000000,
-  PPCI_RLWINM = 0x54000000,
-  PPCI_RLWIMI = 0x50000000,
-
-  PPCI_B = 0x48000000,
-  PPCI_BL = 0x48000001,
-  PPCI_BC = 0x40800000,
-  PPCI_BCL = 0x40800001,
-  PPCI_BCTR = 0x4e800420,
-  PPCI_BCTRL = 0x4e800421,
-
-  PPCI_CRANDC = 0x4c000102,
-  PPCI_CRXOR = 0x4c000182,
-  PPCI_CRAND = 0x4c000202,
-  PPCI_CREQV = 0x4c000242,
-  PPCI_CRORC = 0x4c000342,
-  PPCI_CROR = 0x4c000382,
-
-  PPCI_MFLR = 0x7c0802a6,
-  PPCI_MTCTR = 0x7c0903a6,
-
-  PPCI_MCRXR = 0x7c000400,
-
-  /* Load/store instructions. */
-  PPCI_LWZ = 0x80000000,
-  PPCI_LBZ = 0x88000000,
-  PPCI_STW = 0x90000000,
-  PPCI_STB = 0x98000000,
-  PPCI_LHZ = 0xa0000000,
-  PPCI_LHA = 0xa8000000,
-  PPCI_STH = 0xb0000000,
-
-  PPCI_STWU = 0x94000000,
-
-  PPCI_LFS = 0xc0000000,
-  PPCI_LFD = 0xc8000000,
-  PPCI_STFS = 0xd0000000,
-  PPCI_STFD = 0xd8000000,
-
-  PPCI_LWZX = 0x7c00002e,
-  PPCI_LBZX = 0x7c0000ae,
-  PPCI_STWX = 0x7c00012e,
-  PPCI_STBX = 0x7c0001ae,
-  PPCI_LHZX = 0x7c00022e,
-  PPCI_LHAX = 0x7c0002ae,
-  PPCI_STHX = 0x7c00032e,
-
-  PPCI_LWBRX = 0x7c00042c,
-  PPCI_STWBRX = 0x7c00052c,
-
-  PPCI_LFSX = 0x7c00042e,
-  PPCI_LFDX = 0x7c0004ae,
-  PPCI_STFSX = 0x7c00052e,
-  PPCI_STFDX = 0x7c0005ae,
-
-  /* FP instructions. */
-  PPCI_FMR = 0xfc000090,
-  PPCI_FNEG = 0xfc000050,
-  PPCI_FABS = 0xfc000210,
-
-  PPCI_FRSP = 0xfc000018,
-  PPCI_FCTIWZ = 0xfc00001e,
-
-  PPCI_FADD = 0xfc00002a,
-  PPCI_FSUB = 0xfc000028,
-  PPCI_FMUL = 0xfc000032,
-  PPCI_FDIV = 0xfc000024,
-  PPCI_FSQRT = 0xfc00002c,
-
-  PPCI_FMADD = 0xfc00003a,
-  PPCI_FMSUB = 0xfc000038,
-  PPCI_FNMSUB = 0xfc00003c,
-
-  PPCI_FCMPU = 0xfc000000,
-  PPCI_FSEL = 0xfc00002e,
-} PPCIns;
-
-typedef enum PPCCC {
-  CC_GE, CC_LE, CC_NE, CC_NS, CC_LT, CC_GT, CC_EQ, CC_SO
-} PPCCC;
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_target_x86.h b/dependencies2013/win32/include/luajit/lj_target_x86.h
deleted file mode 100644
index 4426cc8c..00000000
--- a/dependencies2013/win32/include/luajit/lj_target_x86.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-** Definitions for x86 and x64 CPUs.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TARGET_X86_H
-#define _LJ_TARGET_X86_H
-
-/* -- Registers IDs ------------------------------------------------------- */
-
-#if LJ_64
-#define GPRDEF(_) \
-  _(EAX) _(ECX) _(EDX) _(EBX) _(ESP) _(EBP) _(ESI) _(EDI) \
-  _(R8D) _(R9D) _(R10D) _(R11D) _(R12D) _(R13D) _(R14D) _(R15D)
-#define FPRDEF(_) \
-  _(XMM0) _(XMM1) _(XMM2) _(XMM3) _(XMM4) _(XMM5) _(XMM6) _(XMM7) \
-  _(XMM8) _(XMM9) _(XMM10) _(XMM11) _(XMM12) _(XMM13) _(XMM14) _(XMM15)
-#else
-#define GPRDEF(_) \
-  _(EAX) _(ECX) _(EDX) _(EBX) _(ESP) _(EBP) _(ESI) _(EDI)
-#define FPRDEF(_) \
-  _(XMM0) _(XMM1) _(XMM2) _(XMM3) _(XMM4) _(XMM5) _(XMM6) _(XMM7)
-#endif
-#define VRIDDEF(_) \
-  _(MRM)
-
-#define RIDENUM(name)	RID_##name,
-
-enum {
-  GPRDEF(RIDENUM)		/* General-purpose registers (GPRs). */
-  FPRDEF(RIDENUM)		/* Floating-point registers (FPRs). */
-  RID_MAX,
-  RID_MRM = RID_MAX,		/* Pseudo-id for ModRM operand. */
-
-  /* Calling conventions. */
-  RID_RET = RID_EAX,
-#if LJ_64
-  RID_FPRET = RID_XMM0,
-#else
-  RID_RETLO = RID_EAX,
-  RID_RETHI = RID_EDX,
-#endif
-
-  /* These definitions must match with the *.dasc file(s): */
-  RID_BASE = RID_EDX,		/* Interpreter BASE. */
-#if LJ_64 && !LJ_ABI_WIN
-  RID_LPC = RID_EBX,		/* Interpreter PC. */
-  RID_DISPATCH = RID_R14D,	/* Interpreter DISPATCH table. */
-#else
-  RID_LPC = RID_ESI,		/* Interpreter PC. */
-  RID_DISPATCH = RID_EBX,	/* Interpreter DISPATCH table. */
-#endif
-
-  /* Register ranges [min, max) and number of registers. */
-  RID_MIN_GPR = RID_EAX,
-  RID_MIN_FPR = RID_XMM0,
-  RID_MAX_GPR = RID_MIN_FPR,
-  RID_MAX_FPR = RID_MAX,
-  RID_NUM_GPR = RID_MAX_GPR - RID_MIN_GPR,
-  RID_NUM_FPR = RID_MAX_FPR - RID_MIN_FPR,
-};
-
-/* -- Register sets ------------------------------------------------------- */
-
-/* Make use of all registers, except the stack pointer. */
-#define RSET_GPR	(RSET_RANGE(RID_MIN_GPR, RID_MAX_GPR)-RID2RSET(RID_ESP))
-#define RSET_FPR	(RSET_RANGE(RID_MIN_FPR, RID_MAX_FPR))
-#define RSET_ALL	(RSET_GPR|RSET_FPR)
-#define RSET_INIT	RSET_ALL
-
-#if LJ_64
-/* Note: this requires the use of FORCE_REX! */
-#define RSET_GPR8	RSET_GPR
-#else
-#define RSET_GPR8	(RSET_RANGE(RID_EAX, RID_EBX+1))
-#endif
-
-/* ABI-specific register sets. */
-#define RSET_ACD	(RID2RSET(RID_EAX)|RID2RSET(RID_ECX)|RID2RSET(RID_EDX))
-#if LJ_64
-#if LJ_ABI_WIN
-/* Windows x64 ABI. */
-#define RSET_SCRATCH \
-  (RSET_ACD|RSET_RANGE(RID_R8D, RID_R11D+1)|RSET_RANGE(RID_XMM0, RID_XMM5+1))
-#define REGARG_GPRS \
-  (RID_ECX|((RID_EDX|((RID_R8D|(RID_R9D<<5))<<5))<<5))
-#define REGARG_NUMGPR	4
-#define REGARG_NUMFPR	4
-#define REGARG_FIRSTFPR	RID_XMM0
-#define REGARG_LASTFPR	RID_XMM3
-#define STACKARG_OFS	(4*8)
-#else
-/* The rest of the civilized x64 world has a common ABI. */
-#define RSET_SCRATCH \
-  (RSET_ACD|RSET_RANGE(RID_ESI, RID_R11D+1)|RSET_FPR)
-#define REGARG_GPRS \
-  (RID_EDI|((RID_ESI|((RID_EDX|((RID_ECX|((RID_R8D|(RID_R9D \
-   <<5))<<5))<<5))<<5))<<5))
-#define REGARG_NUMGPR	6
-#define REGARG_NUMFPR	8
-#define REGARG_FIRSTFPR	RID_XMM0
-#define REGARG_LASTFPR	RID_XMM7
-#define STACKARG_OFS	0
-#endif
-#else
-/* Common x86 ABI. */
-#define RSET_SCRATCH	(RSET_ACD|RSET_FPR)
-#define REGARG_GPRS	(RID_ECX|(RID_EDX<<5))  /* Fastcall only. */
-#define REGARG_NUMGPR	2  /* Fastcall only. */
-#define REGARG_NUMFPR	0
-#define STACKARG_OFS	0
-#endif
-
-#if LJ_64
-/* Prefer the low 8 regs of each type to reduce REX prefixes. */
-#undef rset_picktop
-#define rset_picktop(rs)	(lj_fls(lj_bswap(rs)) ^ 0x18)
-#endif
-
-/* -- Spill slots --------------------------------------------------------- */
-
-/* Spill slots are 32 bit wide. An even/odd pair is used for FPRs.
-**
-** SPS_FIXED: Available fixed spill slots in interpreter frame.
-** This definition must match with the *.dasc file(s).
-**
-** SPS_FIRST: First spill slot for general use. Reserve min. two 32 bit slots.
-*/
-#if LJ_64
-#if LJ_ABI_WIN
-#define SPS_FIXED	(4*2)
-#define SPS_FIRST	(4*2)	/* Don't use callee register save area. */
-#else
-#define SPS_FIXED	4
-#define SPS_FIRST	2
-#endif
-#else
-#define SPS_FIXED	6
-#define SPS_FIRST	2
-#endif
-
-#define SPOFS_TMP	0
-
-#define sps_scale(slot)		(4 * (int32_t)(slot))
-#define sps_align(slot)		(((slot) - SPS_FIXED + 3) & ~3)
-
-/* -- Exit state ---------------------------------------------------------- */
-
-/* This definition must match with the *.dasc file(s). */
-typedef struct {
-  lua_Number fpr[RID_NUM_FPR];	/* Floating-point registers. */
-  intptr_t gpr[RID_NUM_GPR];	/* General-purpose registers. */
-  int32_t spill[256];		/* Spill slots. */
-} ExitState;
-
-/* Limited by the range of a short fwd jump (127): (2+2)*(32-1)-2 = 122. */
-#define EXITSTUB_SPACING	(2+2)
-#define EXITSTUBS_PER_GROUP	32
-
-/* -- x86 ModRM operand encoding ------------------------------------------ */
-
-typedef enum {
-  XM_OFS0 = 0x00, XM_OFS8 = 0x40, XM_OFS32 = 0x80, XM_REG = 0xc0,
-  XM_SCALE1 = 0x00, XM_SCALE2 = 0x40, XM_SCALE4 = 0x80, XM_SCALE8 = 0xc0,
-  XM_MASK = 0xc0
-} x86Mode;
-
-/* Structure to hold variable ModRM operand. */
-typedef struct {
-  int32_t ofs;		/* Offset. */
-  uint8_t base;		/* Base register or RID_NONE. */
-  uint8_t idx;		/* Index register or RID_NONE. */
-  uint8_t scale;	/* Index scale (XM_SCALE1 .. XM_SCALE8). */
-} x86ModRM;
-
-/* -- Opcodes ------------------------------------------------------------- */
-
-/* Macros to construct variable-length x86 opcodes. -(len+1) is in LSB. */
-#define XO_(o)		((uint32_t)(0x0000fe + (0x##o<<24)))
-#define XO_FPU(a,b)	((uint32_t)(0x00fd + (0x##a<<16)+(0x##b<<24)))
-#define XO_0f(o)	((uint32_t)(0x0f00fd + (0x##o<<24)))
-#define XO_66(o)	((uint32_t)(0x6600fd + (0x##o<<24)))
-#define XO_660f(o)	((uint32_t)(0x0f66fc + (0x##o<<24)))
-#define XO_f20f(o)	((uint32_t)(0x0ff2fc + (0x##o<<24)))
-#define XO_f30f(o)	((uint32_t)(0x0ff3fc + (0x##o<<24)))
-
-/* This list of x86 opcodes is not intended to be complete. Opcodes are only
-** included when needed. Take a look at DynASM or jit.dis_x86 to see the
-** whole mess.
-*/
-typedef enum {
-  /* Fixed length opcodes. XI_* prefix. */
-  XI_NOP =	0x90,
-  XI_XCHGa =	0x90,
-  XI_CALL =	0xe8,
-  XI_JMP =	0xe9,
-  XI_JMPs =	0xeb,
-  XI_PUSH =	0x50, /* Really 50+r. */
-  XI_JCCs =	0x70, /* Really 7x. */
-  XI_JCCn =	0x80, /* Really 0f8x. */
-  XI_LEA =	0x8d,
-  XI_MOVrib =	0xb0, /* Really b0+r. */
-  XI_MOVri =	0xb8, /* Really b8+r. */
-  XI_ARITHib =	0x80,
-  XI_ARITHi =	0x81,
-  XI_ARITHi8 =	0x83,
-  XI_PUSHi8 =	0x6a,
-  XI_TESTb =	0x84,
-  XI_TEST =	0x85,
-  XI_MOVmi =	0xc7,
-  XI_GROUP5 =	0xff,
-
-  /* Note: little-endian byte-order! */
-  XI_FLDZ =	0xeed9,
-  XI_FLD1 =	0xe8d9,
-  XI_FLDLG2 =	0xecd9,
-  XI_FLDLN2 =	0xedd9,
-  XI_FDUP =	0xc0d9,  /* Really fld st0. */
-  XI_FPOP =	0xd8dd,  /* Really fstp st0. */
-  XI_FPOP1 =	0xd9dd,  /* Really fstp st1. */
-  XI_FRNDINT =	0xfcd9,
-  XI_FSIN =	0xfed9,
-  XI_FCOS =	0xffd9,
-  XI_FPTAN =	0xf2d9,
-  XI_FPATAN =	0xf3d9,
-  XI_FSCALE =	0xfdd9,
-  XI_FYL2X =	0xf1d9,
-
-  /* Variable-length opcodes. XO_* prefix. */
-  XO_MOV =	XO_(8b),
-  XO_MOVto =	XO_(89),
-  XO_MOVtow =	XO_66(89),
-  XO_MOVtob =	XO_(88),
-  XO_MOVmi =	XO_(c7),
-  XO_MOVmib =	XO_(c6),
-  XO_LEA =	XO_(8d),
-  XO_ARITHib =	XO_(80),
-  XO_ARITHi =	XO_(81),
-  XO_ARITHi8 =	XO_(83),
-  XO_ARITHiw8 =	XO_66(83),
-  XO_SHIFTi =	XO_(c1),
-  XO_SHIFT1 =	XO_(d1),
-  XO_SHIFTcl =	XO_(d3),
-  XO_IMUL =	XO_0f(af),
-  XO_IMULi =	XO_(69),
-  XO_IMULi8 =	XO_(6b),
-  XO_CMP =	XO_(3b),
-  XO_TESTb =	XO_(84),
-  XO_TEST =	XO_(85),
-  XO_GROUP3b =	XO_(f6),
-  XO_GROUP3 =	XO_(f7),
-  XO_GROUP5b =	XO_(fe),
-  XO_GROUP5 =	XO_(ff),
-  XO_MOVZXb =	XO_0f(b6),
-  XO_MOVZXw =	XO_0f(b7),
-  XO_MOVSXb =	XO_0f(be),
-  XO_MOVSXw =	XO_0f(bf),
-  XO_MOVSXd =	XO_(63),
-  XO_BSWAP =	XO_0f(c8),
-  XO_CMOV =	XO_0f(40),
-
-  XO_MOVSD =	XO_f20f(10),
-  XO_MOVSDto =	XO_f20f(11),
-  XO_MOVSS =	XO_f30f(10),
-  XO_MOVSSto =	XO_f30f(11),
-  XO_MOVLPD =	XO_660f(12),
-  XO_MOVAPS =	XO_0f(28),
-  XO_XORPS =	XO_0f(57),
-  XO_ANDPS =	XO_0f(54),
-  XO_ADDSD =	XO_f20f(58),
-  XO_SUBSD =	XO_f20f(5c),
-  XO_MULSD =	XO_f20f(59),
-  XO_DIVSD =	XO_f20f(5e),
-  XO_SQRTSD =	XO_f20f(51),
-  XO_MINSD =	XO_f20f(5d),
-  XO_MAXSD =	XO_f20f(5f),
-  XO_ROUNDSD =	0x0b3a0ffc,  /* Really 66 0f 3a 0b. See asm_fpmath. */
-  XO_UCOMISD =	XO_660f(2e),
-  XO_CVTSI2SD =	XO_f20f(2a),
-  XO_CVTSD2SI =	XO_f20f(2d),
-  XO_CVTTSD2SI=	XO_f20f(2c),
-  XO_CVTSI2SS =	XO_f30f(2a),
-  XO_CVTSS2SI =	XO_f30f(2d),
-  XO_CVTTSS2SI=	XO_f30f(2c),
-  XO_CVTSS2SD =	XO_f30f(5a),
-  XO_CVTSD2SS =	XO_f20f(5a),
-  XO_ADDSS =	XO_f30f(58),
-  XO_MOVD =	XO_660f(6e),
-  XO_MOVDto =	XO_660f(7e),
-
-  XO_FLDd =	XO_(d9), XOg_FLDd = 0,
-  XO_FLDq =	XO_(dd), XOg_FLDq = 0,
-  XO_FILDd =	XO_(db), XOg_FILDd = 0,
-  XO_FILDq =	XO_(df), XOg_FILDq = 5,
-  XO_FSTPd =	XO_(d9), XOg_FSTPd = 3,
-  XO_FSTPq =	XO_(dd), XOg_FSTPq = 3,
-  XO_FISTPq =	XO_(df), XOg_FISTPq = 7,
-  XO_FISTTPq =	XO_(dd), XOg_FISTTPq = 1,
-  XO_FADDq =	XO_(dc), XOg_FADDq = 0,
-  XO_FLDCW =	XO_(d9), XOg_FLDCW = 5,
-  XO_FNSTCW =	XO_(d9), XOg_FNSTCW = 7
-} x86Op;
-
-/* x86 opcode groups. */
-typedef uint32_t x86Group;
-
-#define XG_(i8, i, g)	((x86Group)(((i8) << 16) + ((i) << 8) + (g)))
-#define XG_ARITHi(g)	XG_(XI_ARITHi8, XI_ARITHi, g)
-#define XG_TOXOi(xg)	((x86Op)(0x000000fe + (((xg)<<16) & 0xff000000)))
-#define XG_TOXOi8(xg)	((x86Op)(0x000000fe + (((xg)<<8) & 0xff000000)))
-
-#define XO_ARITH(a)	((x86Op)(0x030000fe + ((a)<<27)))
-#define XO_ARITHw(a)	((x86Op)(0x036600fd + ((a)<<27)))
-
-typedef enum {
-  XOg_ADD, XOg_OR, XOg_ADC, XOg_SBB, XOg_AND, XOg_SUB, XOg_XOR, XOg_CMP,
-  XOg_X_IMUL
-} x86Arith;
-
-typedef enum {
-  XOg_ROL, XOg_ROR, XOg_RCL, XOg_RCR, XOg_SHL, XOg_SHR, XOg_SAL, XOg_SAR
-} x86Shift;
-
-typedef enum {
-  XOg_TEST, XOg_TEST_, XOg_NOT, XOg_NEG, XOg_MUL, XOg_IMUL, XOg_DIV, XOg_IDIV
-} x86Group3;
-
-typedef enum {
-  XOg_INC, XOg_DEC, XOg_CALL, XOg_CALLfar, XOg_JMP, XOg_JMPfar, XOg_PUSH
-} x86Group5;
-
-/* x86 condition codes. */
-typedef enum {
-  CC_O, CC_NO, CC_B, CC_NB, CC_E, CC_NE, CC_BE, CC_NBE,
-  CC_S, CC_NS, CC_P, CC_NP, CC_L, CC_NL, CC_LE, CC_NLE,
-  CC_C = CC_B, CC_NAE = CC_C, CC_NC = CC_NB, CC_AE = CC_NB,
-  CC_Z = CC_E, CC_NZ = CC_NE, CC_NA = CC_BE, CC_A = CC_NBE,
-  CC_PE = CC_P, CC_PO = CC_NP, CC_NGE = CC_L, CC_GE = CC_NL,
-  CC_NG = CC_LE, CC_G = CC_NLE
-} x86CC;
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_trace.h b/dependencies2013/win32/include/luajit/lj_trace.h
deleted file mode 100644
index edc7af0d..00000000
--- a/dependencies2013/win32/include/luajit/lj_trace.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-** Trace management.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_TRACE_H
-#define _LJ_TRACE_H
-
-#include "lj_obj.h"
-
-#if LJ_HASJIT
-#include "lj_jit.h"
-#include "lj_dispatch.h"
-
-/* Trace errors. */
-typedef enum {
-#define TREDEF(name, msg)	LJ_TRERR_##name,
-#include "lj_traceerr.h"
-  LJ_TRERR__MAX
-} TraceError;
-
-LJ_FUNC_NORET void lj_trace_err(jit_State *J, TraceError e);
-LJ_FUNC_NORET void lj_trace_err_info(jit_State *J, TraceError e);
-
-/* Trace management. */
-LJ_FUNC void LJ_FASTCALL lj_trace_free(global_State *g, GCtrace *T);
-LJ_FUNC void lj_trace_reenableproto(GCproto *pt);
-LJ_FUNC void lj_trace_flushproto(global_State *g, GCproto *pt);
-LJ_FUNC void lj_trace_flush(jit_State *J, TraceNo traceno);
-LJ_FUNC int lj_trace_flushall(lua_State *L);
-LJ_FUNC void lj_trace_initstate(global_State *g);
-LJ_FUNC void lj_trace_freestate(global_State *g);
-
-/* Event handling. */
-LJ_FUNC void lj_trace_ins(jit_State *J, const BCIns *pc);
-LJ_FUNCA void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc);
-LJ_FUNCA int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr);
-
-/* Signal asynchronous abort of trace or end of trace. */
-#define lj_trace_abort(g)	(G2J(g)->state &= ~LJ_TRACE_ACTIVE)
-#define lj_trace_end(J)		(J->state = LJ_TRACE_END)
-
-#else
-
-#define lj_trace_flushall(L)	(UNUSED(L), 0)
-#define lj_trace_initstate(g)	UNUSED(g)
-#define lj_trace_freestate(g)	UNUSED(g)
-#define lj_trace_abort(g)	UNUSED(g)
-#define lj_trace_end(J)		UNUSED(J)
-
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_traceerr.h b/dependencies2013/win32/include/luajit/lj_traceerr.h
deleted file mode 100644
index f920e5ed..00000000
--- a/dependencies2013/win32/include/luajit/lj_traceerr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-** Trace compiler error messages.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-/* This file may be included multiple times with different TREDEF macros. */
-
-/* Recording. */
-TREDEF(RECERR,	"error thrown or hook called during recording")
-TREDEF(TRACEOV,	"trace too long")
-TREDEF(STACKOV,	"trace too deep")
-TREDEF(SNAPOV,	"too many snapshots")
-TREDEF(BLACKL,	"blacklisted")
-TREDEF(NYIBC,	"NYI: bytecode %d")
-
-/* Recording loop ops. */
-TREDEF(LLEAVE,	"leaving loop in root trace")
-TREDEF(LINNER,	"inner loop in root trace")
-TREDEF(LUNROLL,	"loop unroll limit reached")
-
-/* Recording calls/returns. */
-TREDEF(BADTYPE,	"bad argument type")
-TREDEF(CJITOFF,	"JIT compilation disabled for function")
-TREDEF(CUNROLL,	"call unroll limit reached")
-TREDEF(DOWNREC,	"down-recursion, restarting")
-TREDEF(NYICF,	"NYI: C function %s")
-TREDEF(NYIFF,	"NYI: FastFunc %s")
-TREDEF(NYIFFU,	"NYI: unsupported variant of FastFunc %s")
-TREDEF(NYIRETL,	"NYI: return to lower frame")
-
-/* Recording indexed load/store. */
-TREDEF(STORENN,	"store with nil or NaN key")
-TREDEF(NOMM,	"missing metamethod")
-TREDEF(IDXLOOP,	"looping index lookup")
-TREDEF(NYITMIX,	"NYI: mixed sparse/dense table")
-
-/* Recording C data operations. */
-TREDEF(NOCACHE,	"symbol not in cache")
-TREDEF(NYICONV,	"NYI: unsupported C type conversion")
-TREDEF(NYICALL,	"NYI: unsupported C function type")
-
-/* Optimizations. */
-TREDEF(GFAIL,	"guard would always fail")
-TREDEF(PHIOV,	"too many PHIs")
-TREDEF(TYPEINS,	"persistent type instability")
-
-/* Assembler. */
-TREDEF(MCODEAL,	"failed to allocate mcode memory")
-TREDEF(MCODEOV,	"machine code too long")
-TREDEF(MCODELM,	"hit mcode limit (retrying)")
-TREDEF(SPILLOV,	"too many spill slots")
-TREDEF(BADRA,	"inconsistent register allocation")
-TREDEF(NYIIR,	"NYI: cannot assemble IR instruction %d")
-TREDEF(NYIPHI,	"NYI: PHI shuffling too complex")
-TREDEF(NYICOAL,	"NYI: register coalescing too complex")
-
-#undef TREDEF
-
-/* Detecting unused error messages:
-   awk -F, '/^TREDEF/ { gsub(/TREDEF./, ""); printf "grep -q LJ_TRERR_%s *.[ch] || echo %s\n", $1, $1}' lj_traceerr.h | sh
-*/
diff --git a/dependencies2013/win32/include/luajit/lj_udata.h b/dependencies2013/win32/include/luajit/lj_udata.h
deleted file mode 100644
index f271a42d..00000000
--- a/dependencies2013/win32/include/luajit/lj_udata.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-** Userdata handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_UDATA_H
-#define _LJ_UDATA_H
-
-#include "lj_obj.h"
-
-LJ_FUNC GCudata *lj_udata_new(lua_State *L, MSize sz, GCtab *env);
-LJ_FUNC void LJ_FASTCALL lj_udata_free(global_State *g, GCudata *ud);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_vm.h b/dependencies2013/win32/include/luajit/lj_vm.h
deleted file mode 100644
index 3ffa76bf..00000000
--- a/dependencies2013/win32/include/luajit/lj_vm.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-** Assembler VM interface definitions.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_VM_H
-#define _LJ_VM_H
-
-#include "lj_obj.h"
-
-/* Entry points for ASM parts of VM. */
-LJ_ASMF void lj_vm_call(lua_State *L, TValue *base, int nres1);
-LJ_ASMF int lj_vm_pcall(lua_State *L, TValue *base, int nres1, ptrdiff_t ef);
-typedef TValue *(*lua_CPFunction)(lua_State *L, lua_CFunction func, void *ud);
-LJ_ASMF int lj_vm_cpcall(lua_State *L, lua_CFunction func, void *ud,
-			 lua_CPFunction cp);
-LJ_ASMF int lj_vm_resume(lua_State *L, TValue *base, int nres1, ptrdiff_t ef);
-LJ_ASMF_NORET void LJ_FASTCALL lj_vm_unwind_c(void *cframe, int errcode);
-LJ_ASMF_NORET void LJ_FASTCALL lj_vm_unwind_ff(void *cframe);
-LJ_ASMF void lj_vm_unwind_c_eh(void);
-LJ_ASMF void lj_vm_unwind_ff_eh(void);
-#if LJ_TARGET_X86ORX64
-LJ_ASMF void lj_vm_unwind_rethrow(void);
-#endif
-
-/* Miscellaneous functions. */
-#if LJ_TARGET_X86ORX64
-LJ_ASMF int lj_vm_cpuid(uint32_t f, uint32_t res[4]);
-#endif
-#if LJ_TARGET_PPC
-void lj_vm_cachesync(void *start, void *end);
-#endif
-LJ_ASMF double lj_vm_foldarith(double x, double y, int op);
-#if LJ_HASJIT
-LJ_ASMF double lj_vm_foldfpm(double x, int op);
-#endif
-#if !LJ_ARCH_HASFPU
-/* Declared in lj_obj.h: LJ_ASMF int32_t lj_vm_tobit(double x); */
-#endif
-
-/* Dispatch targets for recording and hooks. */
-LJ_ASMF void lj_vm_record(void);
-LJ_ASMF void lj_vm_inshook(void);
-LJ_ASMF void lj_vm_rethook(void);
-LJ_ASMF void lj_vm_callhook(void);
-
-/* Trace exit handling. */
-LJ_ASMF void lj_vm_exit_handler(void);
-LJ_ASMF void lj_vm_exit_interp(void);
-
-/* Internal math helper functions. */
-#if LJ_TARGET_X86ORX64 || LJ_TARGET_PPC
-#define lj_vm_floor	floor
-#define lj_vm_ceil	ceil
-#else
-LJ_ASMF double lj_vm_floor(double);
-LJ_ASMF double lj_vm_ceil(double);
-#if LJ_TARGET_ARM
-LJ_ASMF double lj_vm_floor_sf(double);
-LJ_ASMF double lj_vm_ceil_sf(double);
-#endif
-#endif
-#if defined(LUAJIT_NO_LOG2) || LJ_TARGET_X86ORX64
-LJ_ASMF double lj_vm_log2(double);
-#else
-#define lj_vm_log2	log2
-#endif
-
-#if LJ_HASJIT
-#if LJ_TARGET_X86ORX64
-LJ_ASMF void lj_vm_floor_sse(void);
-LJ_ASMF void lj_vm_ceil_sse(void);
-LJ_ASMF void lj_vm_trunc_sse(void);
-LJ_ASMF void lj_vm_exp_x87(void);
-LJ_ASMF void lj_vm_exp2_x87(void);
-LJ_ASMF void lj_vm_pow_sse(void);
-LJ_ASMF void lj_vm_powi_sse(void);
-#else
-#if LJ_TARGET_PPC
-#define lj_vm_trunc	trunc
-#else
-LJ_ASMF double lj_vm_trunc(double);
-#if LJ_TARGET_ARM
-LJ_ASMF double lj_vm_trunc_sf(double);
-#endif
-#endif
-LJ_ASMF double lj_vm_powi(double, int32_t);
-#ifdef LUAJIT_NO_EXP2
-LJ_ASMF double lj_vm_exp2(double);
-#else
-#define lj_vm_exp2	exp2
-#endif
-#endif
-LJ_ASMF int32_t LJ_FASTCALL lj_vm_modi(int32_t, int32_t);
-#if LJ_HASFFI
-LJ_ASMF int lj_vm_errno(void);
-#endif
-#endif
-
-/* Continuations for metamethods. */
-LJ_ASMF void lj_cont_cat(void);  /* Continue with concatenation. */
-LJ_ASMF void lj_cont_ra(void);  /* Store result in RA from instruction. */
-LJ_ASMF void lj_cont_nop(void);  /* Do nothing, just continue execution. */
-LJ_ASMF void lj_cont_condt(void);  /* Branch if result is true. */
-LJ_ASMF void lj_cont_condf(void);  /* Branch if result is false. */
-LJ_ASMF void lj_cont_hook(void);  /* Continue from hook yield. */
-
-enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
-
-/* Start of the ASM code. */
-LJ_ASMF char lj_vm_asm_begin[];
-
-/* Bytecode offsets are relative to lj_vm_asm_begin. */
-#define makeasmfunc(ofs)	((ASMFunction)(lj_vm_asm_begin + (ofs)))
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lj_vmevent.h b/dependencies2013/win32/include/luajit/lj_vmevent.h
deleted file mode 100644
index 050fb4dd..00000000
--- a/dependencies2013/win32/include/luajit/lj_vmevent.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-** VM event handling.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_VMEVENT_H
-#define _LJ_VMEVENT_H
-
-#include "lj_obj.h"
-
-/* Registry key for VM event handler table. */
-#define LJ_VMEVENTS_REGKEY	"_VMEVENTS"
-#define LJ_VMEVENTS_HSIZE	4
-
-#define VMEVENT_MASK(ev)	((uint8_t)1 << ((int)(ev) & 7))
-#define VMEVENT_HASH(ev)	((int)(ev) & ~7)
-#define VMEVENT_HASHIDX(h)	((int)(h) << 3)
-#define VMEVENT_NOCACHE		255
-
-#define VMEVENT_DEF(name, hash) \
-  LJ_VMEVENT_##name##_, \
-  LJ_VMEVENT_##name = ((LJ_VMEVENT_##name##_) & 7)|((hash) << 3)
-
-/* VM event IDs. */
-typedef enum {
-  VMEVENT_DEF(BC,	0x00003883),
-  VMEVENT_DEF(TRACE,	0xb2d91467),
-  VMEVENT_DEF(RECORD,	0x9284bf4f),
-  VMEVENT_DEF(TEXIT,	0xb29df2b0),
-  LJ_VMEVENT__MAX
-} VMEvent;
-
-#ifdef LUAJIT_DISABLE_VMEVENT
-#define lj_vmevent_send(L, ev, args)		UNUSED(L)
-#define lj_vmevent_send_(L, ev, args, post)	UNUSED(L)
-#else
-#define lj_vmevent_send(L, ev, args) \
-  if (G(L)->vmevmask & VMEVENT_MASK(LJ_VMEVENT_##ev)) { \
-    ptrdiff_t argbase = lj_vmevent_prepare(L, LJ_VMEVENT_##ev); \
-    if (argbase) { \
-      args \
-      lj_vmevent_call(L, argbase); \
-    } \
-  }
-#define lj_vmevent_send_(L, ev, args, post) \
-  if (G(L)->vmevmask & VMEVENT_MASK(LJ_VMEVENT_##ev)) { \
-    ptrdiff_t argbase = lj_vmevent_prepare(L, LJ_VMEVENT_##ev); \
-    if (argbase) { \
-      args \
-      lj_vmevent_call(L, argbase); \
-      post \
-    } \
-  }
-
-LJ_FUNC ptrdiff_t lj_vmevent_prepare(lua_State *L, VMEvent ev);
-LJ_FUNC void lj_vmevent_call(lua_State *L, ptrdiff_t argbase);
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lua.h b/dependencies2013/win32/include/luajit/lua.h
deleted file mode 100644
index c83fd3bb..00000000
--- a/dependencies2013/win32/include/luajit/lua.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $
-** Lua - An Extensible Extension Language
-** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
-** See Copyright Notice at the end of this file
-*/
-
-
-#ifndef lua_h
-#define lua_h
-
-#include <stdarg.h>
-#include <stddef.h>
-
-
-#include "luaconf.h"
-
-
-#define LUA_VERSION	"Lua 5.1"
-#define LUA_RELEASE	"Lua 5.1.4"
-#define LUA_VERSION_NUM	501
-#define LUA_COPYRIGHT	"Copyright (C) 1994-2008 Lua.org, PUC-Rio"
-#define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
-
-
-/* mark for precompiled code (`<esc>Lua') */
-#define	LUA_SIGNATURE	"\033Lua"
-
-/* option for multiple returns in `lua_pcall' and `lua_call' */
-#define LUA_MULTRET	(-1)
-
-
-/*
-** pseudo-indices
-*/
-#define LUA_REGISTRYINDEX	(-10000)
-#define LUA_ENVIRONINDEX	(-10001)
-#define LUA_GLOBALSINDEX	(-10002)
-#define lua_upvalueindex(i)	(LUA_GLOBALSINDEX-(i))
-
-
-/* thread status; 0 is OK */
-#define LUA_YIELD	1
-#define LUA_ERRRUN	2
-#define LUA_ERRSYNTAX	3
-#define LUA_ERRMEM	4
-#define LUA_ERRERR	5
-
-
-typedef struct lua_State lua_State;
-
-typedef int (*lua_CFunction) (lua_State *L);
-
-
-/*
-** functions that read/write blocks when loading/dumping Lua chunks
-*/
-typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
-
-typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
-
-
-/*
-** prototype for memory-allocation functions
-*/
-typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
-
-
-/*
-** basic types
-*/
-#define LUA_TNONE		(-1)
-
-#define LUA_TNIL		0
-#define LUA_TBOOLEAN		1
-#define LUA_TLIGHTUSERDATA	2
-#define LUA_TNUMBER		3
-#define LUA_TSTRING		4
-#define LUA_TTABLE		5
-#define LUA_TFUNCTION		6
-#define LUA_TUSERDATA		7
-#define LUA_TTHREAD		8
-
-
-
-/* minimum Lua stack available to a C function */
-#define LUA_MINSTACK	20
-
-
-/*
-** generic extra include file
-*/
-#if defined(LUA_USER_H)
-#include LUA_USER_H
-#endif
-
-
-/* type of numbers in Lua */
-typedef LUA_NUMBER lua_Number;
-
-
-/* type for integer functions */
-typedef LUA_INTEGER lua_Integer;
-
-
-
-/*
-** state manipulation
-*/
-LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
-LUA_API void       (lua_close) (lua_State *L);
-LUA_API lua_State *(lua_newthread) (lua_State *L);
-
-LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
-
-
-/*
-** basic stack manipulation
-*/
-LUA_API int   (lua_gettop) (lua_State *L);
-LUA_API void  (lua_settop) (lua_State *L, int idx);
-LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
-LUA_API void  (lua_remove) (lua_State *L, int idx);
-LUA_API void  (lua_insert) (lua_State *L, int idx);
-LUA_API void  (lua_replace) (lua_State *L, int idx);
-LUA_API int   (lua_checkstack) (lua_State *L, int sz);
-
-LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
-
-
-/*
-** access functions (stack -> C)
-*/
-
-LUA_API int             (lua_isnumber) (lua_State *L, int idx);
-LUA_API int             (lua_isstring) (lua_State *L, int idx);
-LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
-LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
-LUA_API int             (lua_type) (lua_State *L, int idx);
-LUA_API const char     *(lua_typename) (lua_State *L, int tp);
-
-LUA_API int            (lua_equal) (lua_State *L, int idx1, int idx2);
-LUA_API int            (lua_rawequal) (lua_State *L, int idx1, int idx2);
-LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
-
-LUA_API lua_Number      (lua_tonumber) (lua_State *L, int idx);
-LUA_API lua_Integer     (lua_tointeger) (lua_State *L, int idx);
-LUA_API int             (lua_toboolean) (lua_State *L, int idx);
-LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
-LUA_API size_t          (lua_objlen) (lua_State *L, int idx);
-LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
-LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
-LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
-LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
-
-
-/*
-** push functions (C -> stack)
-*/
-LUA_API void  (lua_pushnil) (lua_State *L);
-LUA_API void  (lua_pushnumber) (lua_State *L, lua_Number n);
-LUA_API void  (lua_pushinteger) (lua_State *L, lua_Integer n);
-LUA_API void  (lua_pushlstring) (lua_State *L, const char *s, size_t l);
-LUA_API void  (lua_pushstring) (lua_State *L, const char *s);
-LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
-                                                      va_list argp);
-LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
-LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
-LUA_API void  (lua_pushboolean) (lua_State *L, int b);
-LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
-LUA_API int   (lua_pushthread) (lua_State *L);
-
-
-/*
-** get functions (Lua -> stack)
-*/
-LUA_API void  (lua_gettable) (lua_State *L, int idx);
-LUA_API void  (lua_getfield) (lua_State *L, int idx, const char *k);
-LUA_API void  (lua_rawget) (lua_State *L, int idx);
-LUA_API void  (lua_rawgeti) (lua_State *L, int idx, int n);
-LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
-LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
-LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
-LUA_API void  (lua_getfenv) (lua_State *L, int idx);
-
-
-/*
-** set functions (stack -> Lua)
-*/
-LUA_API void  (lua_settable) (lua_State *L, int idx);
-LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
-LUA_API void  (lua_rawset) (lua_State *L, int idx);
-LUA_API void  (lua_rawseti) (lua_State *L, int idx, int n);
-LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
-LUA_API int   (lua_setfenv) (lua_State *L, int idx);
-
-
-/*
-** `load' and `call' functions (load and run Lua code)
-*/
-LUA_API void  (lua_call) (lua_State *L, int nargs, int nresults);
-LUA_API int   (lua_pcall) (lua_State *L, int nargs, int nresults, int errfunc);
-LUA_API int   (lua_cpcall) (lua_State *L, lua_CFunction func, void *ud);
-LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
-                                        const char *chunkname);
-
-LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
-
-
-/*
-** coroutine functions
-*/
-LUA_API int  (lua_yield) (lua_State *L, int nresults);
-LUA_API int  (lua_resume) (lua_State *L, int narg);
-LUA_API int  (lua_status) (lua_State *L);
-
-/*
-** garbage-collection function and options
-*/
-
-#define LUA_GCSTOP		0
-#define LUA_GCRESTART		1
-#define LUA_GCCOLLECT		2
-#define LUA_GCCOUNT		3
-#define LUA_GCCOUNTB		4
-#define LUA_GCSTEP		5
-#define LUA_GCSETPAUSE		6
-#define LUA_GCSETSTEPMUL	7
-
-LUA_API int (lua_gc) (lua_State *L, int what, int data);
-
-
-/*
-** miscellaneous functions
-*/
-
-LUA_API int   (lua_error) (lua_State *L);
-
-LUA_API int   (lua_next) (lua_State *L, int idx);
-
-LUA_API void  (lua_concat) (lua_State *L, int n);
-
-LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
-LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
-
-
-
-/*
-** ===============================================================
-** some useful macros
-** ===============================================================
-*/
-
-#define lua_pop(L,n)		lua_settop(L, -(n)-1)
-
-#define lua_newtable(L)		lua_createtable(L, 0, 0)
-
-#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
-
-#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
-
-#define lua_strlen(L,i)		lua_objlen(L, (i))
-
-#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
-#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
-#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
-#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
-#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
-#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
-#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
-#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
-
-#define lua_pushliteral(L, s)	\
-	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
-
-#define lua_setglobal(L,s)	lua_setfield(L, LUA_GLOBALSINDEX, (s))
-#define lua_getglobal(L,s)	lua_getfield(L, LUA_GLOBALSINDEX, (s))
-
-#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
-
-
-
-/*
-** compatibility macros and functions
-*/
-
-#define lua_open()	luaL_newstate()
-
-#define lua_getregistry(L)	lua_pushvalue(L, LUA_REGISTRYINDEX)
-
-#define lua_getgccount(L)	lua_gc(L, LUA_GCCOUNT, 0)
-
-#define lua_Chunkreader		lua_Reader
-#define lua_Chunkwriter		lua_Writer
-
-
-/* hack */
-LUA_API void lua_setlevel	(lua_State *from, lua_State *to);
-
-
-/*
-** {======================================================================
-** Debug API
-** =======================================================================
-*/
-
-
-/*
-** Event codes
-*/
-#define LUA_HOOKCALL	0
-#define LUA_HOOKRET	1
-#define LUA_HOOKLINE	2
-#define LUA_HOOKCOUNT	3
-#define LUA_HOOKTAILRET 4
-
-
-/*
-** Event masks
-*/
-#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
-#define LUA_MASKRET	(1 << LUA_HOOKRET)
-#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
-#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
-
-typedef struct lua_Debug lua_Debug;  /* activation record */
-
-
-/* Functions to be called by the debuger in specific events */
-typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
-
-
-LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
-LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
-LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n);
-LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n);
-LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
-LUA_API lua_Hook lua_gethook (lua_State *L);
-LUA_API int lua_gethookmask (lua_State *L);
-LUA_API int lua_gethookcount (lua_State *L);
-
-/* From Lua 5.2. */
-LUA_API void *lua_upvalueid (lua_State *L, int idx, int n);
-LUA_API void lua_upvaluejoin (lua_State *L, int idx1, int n1, int idx2, int n2);
-LUA_API int lua_loadx (lua_State *L, lua_Reader reader, void *dt,
-		       const char *chunkname, const char *mode);
-
-
-struct lua_Debug {
-  int event;
-  const char *name;	/* (n) */
-  const char *namewhat;	/* (n) `global', `local', `field', `method' */
-  const char *what;	/* (S) `Lua', `C', `main', `tail' */
-  const char *source;	/* (S) */
-  int currentline;	/* (l) */
-  int nups;		/* (u) number of upvalues */
-  int linedefined;	/* (S) */
-  int lastlinedefined;	/* (S) */
-  char short_src[LUA_IDSIZE]; /* (S) */
-  /* private part */
-  int i_ci;  /* active function */
-};
-
-/* }====================================================================== */
-
-
-/******************************************************************************
-* Copyright (C) 1994-2008 Lua.org, PUC-Rio.  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 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.
-******************************************************************************/
-
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lua.hpp b/dependencies2013/win32/include/luajit/lua.hpp
deleted file mode 100644
index 07e9002d..00000000
--- a/dependencies2013/win32/include/luajit/lua.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// C++ wrapper for LuaJIT header files.
-
-extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-#include "luajit.h"
-}
-
diff --git a/dependencies2013/win32/include/luajit/luaconf.h b/dependencies2013/win32/include/luajit/luaconf.h
deleted file mode 100644
index b33e91b7..00000000
--- a/dependencies2013/win32/include/luajit/luaconf.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-** Configuration header.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef luaconf_h
-#define luaconf_h
-
-#ifndef WINVER
-#define WINVER 0x0501
-#endif
-#include <limits.h>
-#include <stddef.h>
-
-/* Default path for loading Lua and C modules with require(). */
-#if defined(_WIN32)
-/*
-** In Windows, any exclamation mark ('!') in the path is replaced by the
-** path of the directory of the executable file of the current process.
-*/
-#define LUA_LDIR	"!\\lua\\"
-#define LUA_CDIR	"!\\"
-#define LUA_PATH_DEFAULT \
-  ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;"
-#define LUA_CPATH_DEFAULT \
-  ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
-#else
-/*
-** Note to distribution maintainers: do NOT patch the following lines!
-** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
-*/
-#ifndef LUA_MULTILIB
-#define LUA_MULTILIB	"lib"
-#endif
-#ifndef LUA_LMULTILIB
-#define LUA_LMULTILIB	"lib"
-#endif
-#define LUA_LROOT	"/usr/local"
-#define LUA_LUADIR	"/lua/5.1/"
-#define LUA_LJDIR	"/luajit-2.0.5/"
-
-#ifdef LUA_ROOT
-#define LUA_JROOT	LUA_ROOT
-#define LUA_RLDIR	LUA_ROOT "/share" LUA_LUADIR
-#define LUA_RCDIR	LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR
-#define LUA_RLPATH	";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua"
-#define LUA_RCPATH	";" LUA_RCDIR "?.so"
-#else
-#define LUA_JROOT	LUA_LROOT
-#define LUA_RLPATH
-#define LUA_RCPATH
-#endif
-
-#define LUA_JPATH	";" LUA_JROOT "/share" LUA_LJDIR "?.lua"
-#define LUA_LLDIR	LUA_LROOT "/share" LUA_LUADIR
-#define LUA_LCDIR	LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
-#define LUA_LLPATH	";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
-#define LUA_LCPATH1	";" LUA_LCDIR "?.so"
-#define LUA_LCPATH2	";" LUA_LCDIR "loadall.so"
-
-#define LUA_PATH_DEFAULT	"./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH
-#define LUA_CPATH_DEFAULT	"./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
-#endif
-
-/* Environment variable names for path overrides and initialization code. */
-#define LUA_PATH	"LUA_PATH"
-#define LUA_CPATH	"LUA_CPATH"
-#define LUA_INIT	"LUA_INIT"
-
-/* Special file system characters. */
-#if defined(_WIN32)
-#define LUA_DIRSEP	"\\"
-#else
-#define LUA_DIRSEP	"/"
-#endif
-#define LUA_PATHSEP	";"
-#define LUA_PATH_MARK	"?"
-#define LUA_EXECDIR	"!"
-#define LUA_IGMARK	"-"
-#define LUA_PATH_CONFIG \
-  LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" \
-  LUA_EXECDIR "\n" LUA_IGMARK
-
-/* Quoting in error messages. */
-#define LUA_QL(x)	"'" x "'"
-#define LUA_QS		LUA_QL("%s")
-
-/* Various tunables. */
-#define LUAI_MAXSTACK	65500	/* Max. # of stack slots for a thread (<64K). */
-#define LUAI_MAXCSTACK	8000	/* Max. # of stack slots for a C func (<10K). */
-#define LUAI_GCPAUSE	200	/* Pause GC until memory is at 200%. */
-#define LUAI_GCMUL	200	/* Run GC at 200% of allocation speed. */
-#define LUA_MAXCAPTURES	32	/* Max. pattern captures. */
-
-/* Compatibility with older library function names. */
-#define LUA_COMPAT_MOD		/* OLD: math.mod, NEW: math.fmod */
-#define LUA_COMPAT_GFIND	/* OLD: string.gfind, NEW: string.gmatch */
-
-/* Configuration for the frontend (the luajit executable). */
-#if defined(luajit_c)
-#define LUA_PROGNAME	"luajit"  /* Fallback frontend name. */
-#define LUA_PROMPT	"> "	/* Interactive prompt. */
-#define LUA_PROMPT2	">> "	/* Continuation prompt. */
-#define LUA_MAXINPUT	512	/* Max. input line length. */
-#endif
-
-/* Note: changing the following defines breaks the Lua 5.1 ABI. */
-#define LUA_INTEGER	ptrdiff_t
-#define LUA_IDSIZE	60	/* Size of lua_Debug.short_src. */
-/*
-** Size of lauxlib and io.* on-stack buffers. Weird workaround to avoid using
-** unreasonable amounts of stack space, but still retain ABI compatibility.
-** Blame Lua for depending on BUFSIZ in the ABI, blame **** for wrecking it.
-*/
-#define LUAL_BUFFERSIZE	(BUFSIZ > 16384 ? 8192 : BUFSIZ)
-
-/* The following defines are here only for compatibility with luaconf.h
-** from the standard Lua distribution. They must not be changed for LuaJIT.
-*/
-#define LUA_NUMBER_DOUBLE
-#define LUA_NUMBER		double
-#define LUAI_UACNUMBER		double
-#define LUA_NUMBER_SCAN		"%lf"
-#define LUA_NUMBER_FMT		"%.14g"
-#define lua_number2str(s, n)	sprintf((s), LUA_NUMBER_FMT, (n))
-#define LUAI_MAXNUMBER2STR	32
-#define LUA_INTFRMLEN		"l"
-#define LUA_INTFRM_T		long
-
-/* Linkage of public API functions. */
-#if defined(LUA_BUILD_AS_DLL)
-#if defined(LUA_CORE) || defined(LUA_LIB)
-#define LUA_API		__declspec(dllexport)
-#else
-#define LUA_API		__declspec(dllimport)
-#endif
-#else
-#define LUA_API		extern
-#endif
-
-#define LUALIB_API	LUA_API
-
-/* Support for internal assertions. */
-#if defined(LUA_USE_ASSERT) || defined(LUA_USE_APICHECK)
-#include <assert.h>
-#endif
-#ifdef LUA_USE_ASSERT
-#define lua_assert(x)		assert(x)
-#endif
-#ifdef LUA_USE_APICHECK
-#define luai_apicheck(L, o)	{ (void)L; assert(o); }
-#else
-#define luai_apicheck(L, o)	{ (void)L; }
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/luajit.h b/dependencies2013/win32/include/luajit/luajit.h
deleted file mode 100644
index c5ff3acb..00000000
--- a/dependencies2013/win32/include/luajit/luajit.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
-**
-** Copyright (C) 2005-2017 Mike Pall. 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 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.
-**
-** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
-*/
-
-#ifndef _LUAJIT_H
-#define _LUAJIT_H
-
-#include "lua.h"
-
-#define LUAJIT_VERSION		"LuaJIT 2.0.5"
-#define LUAJIT_VERSION_NUM	20005  /* Version 2.0.5 = 02.00.05. */
-#define LUAJIT_VERSION_SYM	luaJIT_version_2_0_5
-#define LUAJIT_COPYRIGHT	"Copyright (C) 2005-2017 Mike Pall"
-#define LUAJIT_URL		"http://luajit.org/"
-
-/* Modes for luaJIT_setmode. */
-#define LUAJIT_MODE_MASK	0x00ff
-
-enum {
-  LUAJIT_MODE_ENGINE,		/* Set mode for whole JIT engine. */
-  LUAJIT_MODE_DEBUG,		/* Set debug mode (idx = level). */
-
-  LUAJIT_MODE_FUNC,		/* Change mode for a function. */
-  LUAJIT_MODE_ALLFUNC,		/* Recurse into subroutine protos. */
-  LUAJIT_MODE_ALLSUBFUNC,	/* Change only the subroutines. */
-
-  LUAJIT_MODE_TRACE,		/* Flush a compiled trace. */
-
-  LUAJIT_MODE_WRAPCFUNC = 0x10,	/* Set wrapper mode for C function calls. */
-
-  LUAJIT_MODE_MAX
-};
-
-/* Flags or'ed in to the mode. */
-#define LUAJIT_MODE_OFF		0x0000	/* Turn feature off. */
-#define LUAJIT_MODE_ON		0x0100	/* Turn feature on. */
-#define LUAJIT_MODE_FLUSH	0x0200	/* Flush JIT-compiled code. */
-
-/* LuaJIT public C API. */
-
-/* Control the JIT engine. */
-LUA_API int luaJIT_setmode(lua_State *L, int idx, int mode);
-
-/* Enforce (dynamic) linker error for version mismatches. Call from main. */
-LUA_API void LUAJIT_VERSION_SYM(void);
-
-#endif
diff --git a/dependencies2013/win32/include/luajit/lualib.h b/dependencies2013/win32/include/luajit/lualib.h
deleted file mode 100644
index bfc130a1..00000000
--- a/dependencies2013/win32/include/luajit/lualib.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-** Standard library header.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LUALIB_H
-#define _LUALIB_H
-
-#include "lua.h"
-
-#define LUA_FILEHANDLE	"FILE*"
-
-#define LUA_COLIBNAME	"coroutine"
-#define LUA_MATHLIBNAME	"math"
-#define LUA_STRLIBNAME	"string"
-#define LUA_TABLIBNAME	"table"
-#define LUA_IOLIBNAME	"io"
-#define LUA_OSLIBNAME	"os"
-#define LUA_LOADLIBNAME	"package"
-#define LUA_DBLIBNAME	"debug"
-#define LUA_BITLIBNAME	"bit"
-#define LUA_JITLIBNAME	"jit"
-#define LUA_FFILIBNAME	"ffi"
-
-LUALIB_API int luaopen_base(lua_State *L);
-LUALIB_API int luaopen_math(lua_State *L);
-LUALIB_API int luaopen_string(lua_State *L);
-LUALIB_API int luaopen_table(lua_State *L);
-LUALIB_API int luaopen_io(lua_State *L);
-LUALIB_API int luaopen_os(lua_State *L);
-LUALIB_API int luaopen_package(lua_State *L);
-LUALIB_API int luaopen_debug(lua_State *L);
-LUALIB_API int luaopen_bit(lua_State *L);
-LUALIB_API int luaopen_jit(lua_State *L);
-LUALIB_API int luaopen_ffi(lua_State *L);
-
-LUALIB_API void luaL_openlibs(lua_State *L);
-
-#ifndef lua_assert
-#define lua_assert(x)	((void)0)
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/ogg/config_types.h b/dependencies2013/win32/include/ogg/config_types.h
deleted file mode 100644
index 4b00047a..00000000
--- a/dependencies2013/win32/include/ogg/config_types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __CONFIG_TYPES_H__
-#define __CONFIG_TYPES_H__
-
-/* these are filled in by configure */
-#define INCLUDE_INTTYPES_H 1
-#define INCLUDE_STDINT_H 1
-#define INCLUDE_SYS_TYPES_H 1
-
-#if INCLUDE_INTTYPES_H
-#  include <inttypes.h>
-#endif
-#if INCLUDE_STDINT_H
-#  include <stdint.h>
-#endif
-#if INCLUDE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-typedef int16_t ogg_int16_t;
-typedef uint16_t ogg_uint16_t;
-typedef int32_t ogg_int32_t;
-typedef uint32_t ogg_uint32_t;
-typedef int64_t ogg_int64_t;
-
-#endif
diff --git a/dependencies2013/win32/include/ogg/ogg.h b/dependencies2013/win32/include/ogg/ogg.h
deleted file mode 100644
index 7609fc24..00000000
--- a/dependencies2013/win32/include/ogg/ogg.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: toplevel libogg include
- last mod: $Id$
-
- ********************************************************************/
-#ifndef _OGG_H
-#define _OGG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <ogg/os_types.h>
-
-typedef struct {
-  void *iov_base;
-  size_t iov_len;
-} ogg_iovec_t;
-
-typedef struct {
-  long endbyte;
-  int  endbit;
-
-  unsigned char *buffer;
-  unsigned char *ptr;
-  long storage;
-} oggpack_buffer;
-
-/* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
-
-typedef struct {
-  unsigned char *header;
-  long header_len;
-  unsigned char *body;
-  long body_len;
-} ogg_page;
-
-/* ogg_stream_state contains the current encode/decode state of a logical
-   Ogg bitstream **********************************************************/
-
-typedef struct {
-  unsigned char   *body_data;    /* bytes from packet bodies */
-  long    body_storage;          /* storage elements allocated */
-  long    body_fill;             /* elements stored; fill mark */
-  long    body_returned;         /* elements of fill returned */
-
-
-  int     *lacing_vals;      /* The values that will go to the segment table */
-  ogg_int64_t *granule_vals; /* granulepos values for headers. Not compact
-                                this way, but it is simple coupled to the
-                                lacing fifo */
-  long    lacing_storage;
-  long    lacing_fill;
-  long    lacing_packet;
-  long    lacing_returned;
-
-  unsigned char    header[282];      /* working space for header encode */
-  int              header_fill;
-
-  int     e_o_s;          /* set when we have buffered the last packet in the
-                             logical bitstream */
-  int     b_o_s;          /* set after we've written the initial page
-                             of a logical bitstream */
-  long    serialno;
-  long    pageno;
-  ogg_int64_t  packetno;  /* sequence number for decode; the framing
-                             knows where there's a hole in the data,
-                             but we need coupling so that the codec
-                             (which is in a separate abstraction
-                             layer) also knows about the gap */
-  ogg_int64_t   granulepos;
-
-} ogg_stream_state;
-
-/* ogg_packet is used to encapsulate the data and metadata belonging
-   to a single raw Ogg/Vorbis packet *************************************/
-
-typedef struct {
-  unsigned char *packet;
-  long  bytes;
-  long  b_o_s;
-  long  e_o_s;
-
-  ogg_int64_t  granulepos;
-
-  ogg_int64_t  packetno;     /* sequence number for decode; the framing
-                                knows where there's a hole in the data,
-                                but we need coupling so that the codec
-                                (which is in a separate abstraction
-                                layer) also knows about the gap */
-} ogg_packet;
-
-typedef struct {
-  unsigned char *data;
-  int storage;
-  int fill;
-  int returned;
-
-  int unsynced;
-  int headerbytes;
-  int bodybytes;
-} ogg_sync_state;
-
-/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
-
-extern void  oggpack_writeinit(oggpack_buffer *b);
-extern int   oggpack_writecheck(oggpack_buffer *b);
-extern void  oggpack_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpack_writealign(oggpack_buffer *b);
-extern void  oggpack_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpack_reset(oggpack_buffer *b);
-extern void  oggpack_writeclear(oggpack_buffer *b);
-extern void  oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpack_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpack_look(oggpack_buffer *b,int bits);
-extern long  oggpack_look1(oggpack_buffer *b);
-extern void  oggpack_adv(oggpack_buffer *b,int bits);
-extern void  oggpack_adv1(oggpack_buffer *b);
-extern long  oggpack_read(oggpack_buffer *b,int bits);
-extern long  oggpack_read1(oggpack_buffer *b);
-extern long  oggpack_bytes(oggpack_buffer *b);
-extern long  oggpack_bits(oggpack_buffer *b);
-extern unsigned char *oggpack_get_buffer(oggpack_buffer *b);
-
-extern void  oggpackB_writeinit(oggpack_buffer *b);
-extern int   oggpackB_writecheck(oggpack_buffer *b);
-extern void  oggpackB_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpackB_writealign(oggpack_buffer *b);
-extern void  oggpackB_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpackB_reset(oggpack_buffer *b);
-extern void  oggpackB_writeclear(oggpack_buffer *b);
-extern void  oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpackB_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpackB_look(oggpack_buffer *b,int bits);
-extern long  oggpackB_look1(oggpack_buffer *b);
-extern void  oggpackB_adv(oggpack_buffer *b,int bits);
-extern void  oggpackB_adv1(oggpack_buffer *b);
-extern long  oggpackB_read(oggpack_buffer *b,int bits);
-extern long  oggpackB_read1(oggpack_buffer *b);
-extern long  oggpackB_bytes(oggpack_buffer *b);
-extern long  oggpackB_bits(oggpack_buffer *b);
-extern unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
-
-/* Ogg BITSTREAM PRIMITIVES: encoding **************************/
-
-extern int      ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
-extern int      ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov,
-                                   int count, long e_o_s, ogg_int64_t granulepos);
-extern int      ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_pageout_fill(ogg_stream_state *os, ogg_page *og, int nfill);
-extern int      ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_flush_fill(ogg_stream_state *os, ogg_page *og, int nfill);
-
-/* Ogg BITSTREAM PRIMITIVES: decoding **************************/
-
-extern int      ogg_sync_init(ogg_sync_state *oy);
-extern int      ogg_sync_clear(ogg_sync_state *oy);
-extern int      ogg_sync_reset(ogg_sync_state *oy);
-extern int      ogg_sync_destroy(ogg_sync_state *oy);
-extern int      ogg_sync_check(ogg_sync_state *oy);
-
-extern char    *ogg_sync_buffer(ogg_sync_state *oy, long size);
-extern int      ogg_sync_wrote(ogg_sync_state *oy, long bytes);
-extern long     ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
-extern int      ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);
-extern int      ogg_stream_pagein(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op);
-extern int      ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op);
-
-/* Ogg BITSTREAM PRIMITIVES: general ***************************/
-
-extern int      ogg_stream_init(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_clear(ogg_stream_state *os);
-extern int      ogg_stream_reset(ogg_stream_state *os);
-extern int      ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_destroy(ogg_stream_state *os);
-extern int      ogg_stream_check(ogg_stream_state *os);
-extern int      ogg_stream_eos(ogg_stream_state *os);
-
-extern void     ogg_page_checksum_set(ogg_page *og);
-
-extern int      ogg_page_version(const ogg_page *og);
-extern int      ogg_page_continued(const ogg_page *og);
-extern int      ogg_page_bos(const ogg_page *og);
-extern int      ogg_page_eos(const ogg_page *og);
-extern ogg_int64_t  ogg_page_granulepos(const ogg_page *og);
-extern int      ogg_page_serialno(const ogg_page *og);
-extern long     ogg_page_pageno(const ogg_page *og);
-extern int      ogg_page_packets(const ogg_page *og);
-
-extern void     ogg_packet_clear(ogg_packet *op);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _OGG_H */
diff --git a/dependencies2013/win32/include/ogg/os_types.h b/dependencies2013/win32/include/ogg/os_types.h
deleted file mode 100644
index b8f56308..00000000
--- a/dependencies2013/win32/include/ogg/os_types.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id$
-
- ********************************************************************/
-#ifndef _OS_TYPES_H
-#define _OS_TYPES_H
-
-/* make it easy on the folks that want to compile the libs with a
-   different malloc than stdlib */
-#define _ogg_malloc  malloc
-#define _ogg_calloc  calloc
-#define _ogg_realloc realloc
-#define _ogg_free    free
-
-#if defined(_WIN32)
-
-#  if defined(__CYGWIN__)
-#    include <stdint.h>
-     typedef int16_t ogg_int16_t;
-     typedef uint16_t ogg_uint16_t;
-     typedef int32_t ogg_int32_t;
-     typedef uint32_t ogg_uint32_t;
-     typedef int64_t ogg_int64_t;
-     typedef uint64_t ogg_uint64_t;
-#  elif defined(__MINGW32__)
-#    include <sys/types.h>
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef long long ogg_int64_t;
-     typedef unsigned long long ogg_uint64_t;
-#  elif defined(__MWERKS__)
-     typedef long long ogg_int64_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-#  else
-#    if defined(_MSC_VER) && (_MSC_VER >= 1800) /* MSVC 2013 and newer */
-#      include <stdint.h>
-       typedef int16_t ogg_int16_t;
-       typedef uint16_t ogg_uint16_t;
-       typedef int32_t ogg_int32_t;
-       typedef uint32_t ogg_uint32_t;
-       typedef int64_t ogg_int64_t;
-       typedef uint64_t ogg_uint64_t;
-#    else
-       /* MSVC/Borland */
-       typedef __int64 ogg_int64_t;
-       typedef __int32 ogg_int32_t;
-       typedef unsigned __int32 ogg_uint32_t;
-       typedef __int16 ogg_int16_t;
-       typedef unsigned __int16 ogg_uint16_t;
-#    endif
-#  endif
-
-#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
-
-#  include <inttypes.h>
-   typedef int16_t ogg_int16_t;
-   typedef uint16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef uint32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined(__HAIKU__)
-
-  /* Haiku */
-#  include <sys/types.h>
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16_t ogg_int16_t;
-   typedef uint16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef uint32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short ogg_int16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef long ogg_int64_t;
-   typedef int ogg_int32_t;
-   typedef unsigned ogg_uint32_t;
-   typedef short ogg_int16_t;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#elif defined(__TMS320C6X__)
-
-   /* TI C64x compiler */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#else
-
-#  include <ogg/config_types.h>
-
-#endif
-
-#endif  /* _OS_TYPES_H */
diff --git a/dependencies2013/win32/include/opus/opus.h b/dependencies2013/win32/include/opus/opus.h
deleted file mode 100644
index 5be73ddf..00000000
--- a/dependencies2013/win32/include/opus/opus.h
+++ /dev/null
@@ -1,981 +0,0 @@
-/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
-   Written by Jean-Marc Valin and Koen Vos */
-/*
-   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.
-
-   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.
-*/
-
-/**
- * @file opus.h
- * @brief Opus reference implementation API
- */
-
-#ifndef OPUS_H
-#define OPUS_H
-
-#include "opus_types.h"
-#include "opus_defines.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @mainpage Opus
- *
- * The Opus codec is designed for interactive speech and audio transmission over the Internet.
- * It is designed by the IETF Codec Working Group and incorporates technology from
- * Skype's SILK codec and Xiph.Org's CELT codec.
- *
- * The Opus codec is designed to handle a wide range of interactive audio applications,
- * including Voice over IP, videoconferencing, in-game chat, and even remote live music
- * performances. It can scale from low bit-rate narrowband speech to very high quality
- * stereo music. Its main features are:
-
- * @li Sampling rates from 8 to 48 kHz
- * @li Bit-rates from 6 kb/s to 510 kb/s
- * @li Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
- * @li Audio bandwidth from narrowband to full-band
- * @li Support for speech and music
- * @li Support for mono and stereo
- * @li Support for multichannel (up to 255 channels)
- * @li Frame sizes from 2.5 ms to 60 ms
- * @li Good loss robustness and packet loss concealment (PLC)
- * @li Floating point and fixed-point implementation
- *
- * Documentation sections:
- * @li @ref opus_encoder
- * @li @ref opus_decoder
- * @li @ref opus_repacketizer
- * @li @ref opus_multistream
- * @li @ref opus_libinfo
- * @li @ref opus_custom
- */
-
-/** @defgroup opus_encoder Opus Encoder
-  * @{
-  *
-  * @brief This page describes the process and functions used to encode Opus.
-  *
-  * Since Opus is a stateful codec, the encoding process starts with creating an encoder
-  * state. This can be done with:
-  *
-  * @code
-  * int          error;
-  * OpusEncoder *enc;
-  * enc = opus_encoder_create(Fs, channels, application, &error);
-  * @endcode
-  *
-  * From this point, @c enc can be used for encoding an audio stream. An encoder state
-  * @b must @b not be used for more than one stream at the same time. Similarly, the encoder
-  * state @b must @b not be re-initialized for each frame.
-  *
-  * While opus_encoder_create() allocates memory for the state, it's also possible
-  * to initialize pre-allocated memory:
-  *
-  * @code
-  * int          size;
-  * int          error;
-  * OpusEncoder *enc;
-  * size = opus_encoder_get_size(channels);
-  * enc = malloc(size);
-  * error = opus_encoder_init(enc, Fs, channels, application);
-  * @endcode
-  *
-  * where opus_encoder_get_size() returns the required size for the encoder state. Note that
-  * future versions of this code may change the size, so no assuptions should be made about it.
-  *
-  * The encoder state is always continuous in memory and only a shallow copy is sufficient
-  * to copy it (e.g. memcpy())
-  *
-  * It is possible to change some of the encoder's settings using the opus_encoder_ctl()
-  * interface. All these settings already default to the recommended value, so they should
-  * only be changed when necessary. The most common settings one may want to change are:
-  *
-  * @code
-  * opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate));
-  * opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
-  * opus_encoder_ctl(enc, OPUS_SET_SIGNAL(signal_type));
-  * @endcode
-  *
-  * where
-  *
-  * @arg bitrate is in bits per second (b/s)
-  * @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
-  * @arg signal_type is either OPUS_AUTO (default), OPUS_SIGNAL_VOICE, or OPUS_SIGNAL_MUSIC
-  *
-  * See @ref opus_encoderctls and @ref opus_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
-  *
-  * To encode a frame, opus_encode() or opus_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
-  * @code
-  * len = opus_encode(enc, audio_frame, frame_size, packet, max_packet);
-  * @endcode
-  *
-  * where
-  * <ul>
-  * <li>audio_frame is the audio data in opus_int16 (or float for opus_encode_float())</li>
-  * <li>frame_size is the duration of the frame in samples (per channel)</li>
-  * <li>packet is the byte array to which the compressed data is written</li>
-  * <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
-  *     Do not use max_packet to control VBR target bitrate, instead use the #OPUS_SET_BITRATE CTL.</li>
-  * </ul>
-  *
-  * opus_encode() and opus_encode_float() return the number of bytes actually written to the packet.
-  * The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
-  * is 2 bytes or less, then the packet does not need to be transmitted (DTX).
-  *
-  * Once the encoder state if no longer needed, it can be destroyed with
-  *
-  * @code
-  * opus_encoder_destroy(enc);
-  * @endcode
-  *
-  * If the encoder was created with opus_encoder_init() rather than opus_encoder_create(),
-  * then no action is required aside from potentially freeing the memory that was manually
-  * allocated for it (calling free(enc) for the example above)
-  *
-  */
-
-/** Opus encoder state.
-  * This contains the complete state of an Opus encoder.
-  * It is position independent and can be freely copied.
-  * @see opus_encoder_create,opus_encoder_init
-  */
-typedef struct OpusEncoder OpusEncoder;
-
-/** Gets the size of an <code>OpusEncoder</code> structure.
-  * @param[in] channels <tt>int</tt>: Number of channels.
-  *                                   This must be 1 or 2.
-  * @returns The size in bytes.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
-
-/**
- */
-
-/** Allocates and initializes an encoder state.
- * There are three coding modes:
- *
- * @ref OPUS_APPLICATION_VOIP gives best quality at a given bitrate for voice
- *    signals. It enhances the  input signal by high-pass filtering and
- *    emphasizing formants and harmonics. Optionally  it includes in-band
- *    forward error correction to protect against packet loss. Use this
- *    mode for typical VoIP applications. Because of the enhancement,
- *    even at high bitrates the output may sound different from the input.
- *
- * @ref OPUS_APPLICATION_AUDIO gives best quality at a given bitrate for most
- *    non-voice signals like music. Use this mode for music and mixed
- *    (music/voice) content, broadcast, and applications requiring less
- *    than 15 ms of coding delay.
- *
- * @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY configures low-delay mode that
- *    disables the speech-optimized mode in exchange for slightly reduced delay.
- *    This mode can only be set on an newly initialized or freshly reset encoder
- *    because it changes the codec delay.
- *
- * This is useful when the caller knows that the speech-optimized modes will not be needed (use with caution).
- * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
- *                                     This must be one of 8000, 12000, 16000,
- *                                     24000, or 48000.
- * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
- * @param [in] application <tt>int</tt>: Coding mode (@ref OPUS_APPLICATION_VOIP/@ref OPUS_APPLICATION_AUDIO/@ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
- * @param [out] error <tt>int*</tt>: @ref opus_errorcodes
- * @note Regardless of the sampling rate and number channels selected, the Opus encoder
- * can switch to a lower audio bandwidth or number of channels if the bitrate
- * selected is too low. This also means that it is safe to always use 48 kHz stereo input
- * and let the encoder optimize the encoding.
- */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create(
-    opus_int32 Fs,
-    int channels,
-    int application,
-    int *error
-);
-
-/** Initializes a previously allocated encoder state
-  * The memory pointed to by st must be at least the size returned by opus_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see opus_encoder_create(),opus_encoder_get_size()
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
- *                                      This must be one of 8000, 12000, 16000,
- *                                      24000, or 48000.
-  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
-  * @param [in] application <tt>int</tt>: Coding mode (OPUS_APPLICATION_VOIP/OPUS_APPLICATION_AUDIO/OPUS_APPLICATION_RESTRICTED_LOWDELAY)
-  * @retval #OPUS_OK Success or @ref opus_errorcodes
-  */
-OPUS_EXPORT int opus_encoder_init(
-    OpusEncoder *st,
-    opus_int32 Fs,
-    int channels,
-    int application
-) OPUS_ARG_NONNULL(1);
-
-/** Encodes an Opus frame.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(opus_int16)
-  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
-  *                                      input signal.
-  *                                      This must be an Opus frame size for
-  *                                      the encoder's sampling rate.
-  *                                      For example, at 48 kHz the permitted
-  *                                      values are 120, 240, 480, 960, 1920,
-  *                                      and 2880.
-  *                                      Passing in a duration of less than
-  *                                      10 ms (480 samples at 48 kHz) will
-  *                                      prevent the encoder from using the LPC
-  *                                      or hybrid modes.
-  * @param [out] data <tt>unsigned char*</tt>: Output payload.
-  *                                            This must contain storage for at
-  *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode(
-    OpusEncoder *st,
-    const opus_int16 *pcm,
-    int frame_size,
-    unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
-
-/** Encodes an Opus frame from floating point input.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
-  *          Samples with a range beyond +/-1.0 are supported but will
-  *          be clipped by decoders using the integer API and should
-  *          only be used if it is known that the far end supports
-  *          extended dynamic range.
-  *          length is frame_size*channels*sizeof(float)
-  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
-  *                                      input signal.
-  *                                      This must be an Opus frame size for
-  *                                      the encoder's sampling rate.
-  *                                      For example, at 48 kHz the permitted
-  *                                      values are 120, 240, 480, 960, 1920,
-  *                                      and 2880.
-  *                                      Passing in a duration of less than
-  *                                      10 ms (480 samples at 48 kHz) will
-  *                                      prevent the encoder from using the LPC
-  *                                      or hybrid modes.
-  * @param [out] data <tt>unsigned char*</tt>: Output payload.
-  *                                            This must contain storage for at
-  *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode_float(
-    OpusEncoder *st,
-    const float *pcm,
-    int frame_size,
-    unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
-
-/** Frees an <code>OpusEncoder</code> allocated by opus_encoder_create().
-  * @param[in] st <tt>OpusEncoder*</tt>: State to be freed.
-  */
-OPUS_EXPORT void opus_encoder_destroy(OpusEncoder *st);
-
-/** Perform a CTL function on an Opus encoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @param st <tt>OpusEncoder*</tt>: Encoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls or
-  *                @ref opus_encoderctls.
-  * @see opus_genericctls
-  * @see opus_encoderctls
-  */
-OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
-/**@}*/
-
-/** @defgroup opus_decoder Opus Decoder
-  * @{
-  *
-  * @brief This page describes the process and functions used to decode Opus.
-  *
-  * The decoding process also starts with creating a decoder
-  * state. This can be done with:
-  * @code
-  * int          error;
-  * OpusDecoder *dec;
-  * dec = opus_decoder_create(Fs, channels, &error);
-  * @endcode
-  * where
-  * @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
-  * @li channels is the number of channels (1 or 2)
-  * @li error will hold the error code in case of failure (or #OPUS_OK on success)
-  * @li the return value is a newly created decoder state to be used for decoding
-  *
-  * While opus_decoder_create() allocates memory for the state, it's also possible
-  * to initialize pre-allocated memory:
-  * @code
-  * int          size;
-  * int          error;
-  * OpusDecoder *dec;
-  * size = opus_decoder_get_size(channels);
-  * dec = malloc(size);
-  * error = opus_decoder_init(dec, Fs, channels);
-  * @endcode
-  * where opus_decoder_get_size() returns the required size for the decoder state. Note that
-  * future versions of this code may change the size, so no assuptions should be made about it.
-  *
-  * The decoder state is always continuous in memory and only a shallow copy is sufficient
-  * to copy it (e.g. memcpy())
-  *
-  * To decode a frame, opus_decode() or opus_decode_float() must be called with a packet of compressed audio data:
-  * @code
-  * frame_size = opus_decode(dec, packet, len, decoded, max_size, 0);
-  * @endcode
-  * where
-  *
-  * @li packet is the byte array containing the compressed data
-  * @li len is the exact number of bytes contained in the packet
-  * @li decoded is the decoded audio data in opus_int16 (or float for opus_decode_float())
-  * @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
-  *
-  * opus_decode() and opus_decode_float() return the number of samples (per channel) decoded from the packet.
-  * If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
-  * buffer is too small to hold the decoded audio.
-  *
-  * Opus is a stateful codec with overlapping blocks and as a result Opus
-  * packets are not coded independently of each other. Packets must be
-  * passed into the decoder serially and in the correct order for a correct
-  * decode. Lost packets can be replaced with loss concealment by calling
-  * the decoder with a null pointer and zero length for the missing packet.
-  *
-  * A single codec state may only be accessed from a single thread at
-  * a time and any required locking must be performed by the caller. Separate
-  * streams must be decoded with separate decoder states and can be decoded
-  * in parallel unless the library was compiled with NONTHREADSAFE_PSEUDOSTACK
-  * defined.
-  *
-  */
-
-/** Opus decoder state.
-  * This contains the complete state of an Opus decoder.
-  * It is position independent and can be freely copied.
-  * @see opus_decoder_create,opus_decoder_init
-  */
-typedef struct OpusDecoder OpusDecoder;
-
-/** Gets the size of an <code>OpusDecoder</code> structure.
-  * @param [in] channels <tt>int</tt>: Number of channels.
-  *                                    This must be 1 or 2.
-  * @returns The size in bytes.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_size(int channels);
-
-/** Allocates and initializes a decoder state.
-  * @param [in] Fs <tt>opus_int32</tt>: Sample rate to decode at (Hz).
-  *                                     This must be one of 8000, 12000, 16000,
-  *                                     24000, or 48000.
-  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
-  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
-  *
-  * Internally Opus stores data at 48000 Hz, so that should be the default
-  * value for Fs. However, the decoder can efficiently decode to buffers
-  * at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
-  * data at the full sample rate, or knows the compressed data doesn't
-  * use the full frequency range, it can request decoding at a reduced
-  * rate. Likewise, the decoder is capable of filling in either mono or
-  * interleaved stereo pcm buffers, at the caller's request.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusDecoder *opus_decoder_create(
-    opus_int32 Fs,
-    int channels,
-    int *error
-);
-
-/** Initializes a previously allocated decoder state.
-  * The state must be at least the size returned by opus_decoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc. @see opus_decoder_create,opus_decoder_get_size
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state.
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate to decode to (Hz).
-  *                                     This must be one of 8000, 12000, 16000,
-  *                                     24000, or 48000.
-  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
-  * @retval #OPUS_OK Success or @ref opus_errorcodes
-  */
-OPUS_EXPORT int opus_decoder_init(
-    OpusDecoder *st,
-    opus_int32 Fs,
-    int channels
-) OPUS_ARG_NONNULL(1);
-
-/** Decode an Opus packet.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
-  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(opus_int16)
-  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
-  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
-  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
-  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
-  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
-  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
-  *  decoded. If no such data is available, the frame is decoded as if it were lost.
-  * @returns Number of decoded samples or @ref opus_errorcodes
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode(
-    OpusDecoder *st,
-    const unsigned char *data,
-    opus_int32 len,
-    opus_int16 *pcm,
-    int frame_size,
-    int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
-
-/** Decode an Opus packet with floating point output.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(float)
-  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
-  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
-  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
-  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
-  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
-  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
-  *  decoded. If no such data is available the frame is decoded as if it were lost.
-  * @returns Number of decoded samples or @ref opus_errorcodes
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode_float(
-    OpusDecoder *st,
-    const unsigned char *data,
-    opus_int32 len,
-    float *pcm,
-    int frame_size,
-    int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
-
-/** Perform a CTL function on an Opus decoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @param st <tt>OpusDecoder*</tt>: Decoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls or
-  *                @ref opus_decoderctls.
-  * @see opus_genericctls
-  * @see opus_decoderctls
-  */
-OPUS_EXPORT int opus_decoder_ctl(OpusDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
-
-/** Frees an <code>OpusDecoder</code> allocated by opus_decoder_create().
-  * @param[in] st <tt>OpusDecoder*</tt>: State to be freed.
-  */
-OPUS_EXPORT void opus_decoder_destroy(OpusDecoder *st);
-
-/** Parse an opus packet into one or more frames.
-  * Opus_decode will perform this operation internally so most applications do
-  * not need to use this function.
-  * This function does not copy the frames, the returned pointers are pointers into
-  * the input packet.
-  * @param [in] data <tt>char*</tt>: Opus packet to be parsed
-  * @param [in] len <tt>opus_int32</tt>: size of data
-  * @param [out] out_toc <tt>char*</tt>: TOC pointer
-  * @param [out] frames <tt>char*[48]</tt> encapsulated frames
-  * @param [out] size <tt>opus_int16[48]</tt> sizes of the encapsulated frames
-  * @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
-  * @returns number of frames
-  */
-OPUS_EXPORT int opus_packet_parse(
-   const unsigned char *data,
-   opus_int32 len,
-   unsigned char *out_toc,
-   const unsigned char *frames[48],
-   opus_int16 size[48],
-   int *payload_offset
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
-
-/** Gets the bandwidth of an Opus packet.
-  * @param [in] data <tt>char*</tt>: Opus packet
-  * @retval OPUS_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
-  * @retval OPUS_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
-  * @retval OPUS_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
-  * @retval OPUS_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
-  * @retval OPUS_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_bandwidth(const unsigned char *data) OPUS_ARG_NONNULL(1);
-
-/** Gets the number of samples per frame from an Opus packet.
-  * @param [in] data <tt>char*</tt>: Opus packet.
-  *                                  This must contain at least one byte of
-  *                                  data.
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
-  *                                     This must be a multiple of 400, or
-  *                                     inaccurate results will be returned.
-  * @returns Number of samples per frame.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_samples_per_frame(const unsigned char *data, opus_int32 Fs) OPUS_ARG_NONNULL(1);
-
-/** Gets the number of channels from an Opus packet.
-  * @param [in] data <tt>char*</tt>: Opus packet
-  * @returns Number of channels
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_channels(const unsigned char *data) OPUS_ARG_NONNULL(1);
-
-/** Gets the number of frames in an Opus packet.
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
-  * @returns Number of frames
-  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_frames(const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1);
-
-/** Gets the number of samples of an Opus packet.
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
-  *                                     This must be a multiple of 400, or
-  *                                     inaccurate results will be returned.
-  * @returns Number of samples
-  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_samples(const unsigned char packet[], opus_int32 len, opus_int32 Fs) OPUS_ARG_NONNULL(1);
-
-/** Gets the number of samples of an Opus packet.
-  * @param [in] dec <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
-  * @returns Number of samples
-  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_nb_samples(const OpusDecoder *dec, const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
-
-/** Applies soft-clipping to bring a float signal within the [-1,1] range. If
-  * the signal is already in that range, nothing is done. If there are values
-  * outside of [-1,1], then the signal is clipped as smoothly as possible to
-  * both fit in the range and avoid creating excessive distortion in the
-  * process.
-  * @param [in,out] pcm <tt>float*</tt>: Input PCM and modified PCM
-  * @param [in] frame_size <tt>int</tt> Number of samples per channel to process
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
-  */
-OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
-
-
-/**@}*/
-
-/** @defgroup opus_repacketizer Repacketizer
-  * @{
-  *
-  * The repacketizer can be used to merge multiple Opus packets into a single
-  * packet or alternatively to split Opus packets that have previously been
-  * merged. Splitting valid Opus packets is always guaranteed to succeed,
-  * whereas merging valid packets only succeeds if all frames have the same
-  * mode, bandwidth, and frame size, and when the total duration of the merged
-  * packet is no more than 120 ms. The 120 ms limit comes from the
-  * specification and limits decoder memory requirements at a point where
-  * framing overhead becomes negligible.
-  *
-  * The repacketizer currently only operates on elementary Opus
-  * streams. It will not manipualte multistream packets successfully, except in
-  * the degenerate case where they consist of data from a single stream.
-  *
-  * The repacketizing process starts with creating a repacketizer state, either
-  * by calling opus_repacketizer_create() or by allocating the memory yourself,
-  * e.g.,
-  * @code
-  * OpusRepacketizer *rp;
-  * rp = (OpusRepacketizer*)malloc(opus_repacketizer_get_size());
-  * if (rp != NULL)
-  *     opus_repacketizer_init(rp);
-  * @endcode
-  *
-  * Then the application should submit packets with opus_repacketizer_cat(),
-  * extract new packets with opus_repacketizer_out() or
-  * opus_repacketizer_out_range(), and then reset the state for the next set of
-  * input packets via opus_repacketizer_init().
-  *
-  * For example, to split a sequence of packets into individual frames:
-  * @code
-  * unsigned char *data;
-  * int len;
-  * while (get_next_packet(&data, &len))
-  * {
-  *   unsigned char out[1276];
-  *   opus_int32 out_len;
-  *   int nb_frames;
-  *   int err;
-  *   int i;
-  *   err = opus_repacketizer_cat(rp, data, len);
-  *   if (err != OPUS_OK)
-  *   {
-  *     release_packet(data);
-  *     return err;
-  *   }
-  *   nb_frames = opus_repacketizer_get_nb_frames(rp);
-  *   for (i = 0; i < nb_frames; i++)
-  *   {
-  *     out_len = opus_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
-  *     if (out_len < 0)
-  *     {
-  *        release_packet(data);
-  *        return (int)out_len;
-  *     }
-  *     output_next_packet(out, out_len);
-  *   }
-  *   opus_repacketizer_init(rp);
-  *   release_packet(data);
-  * }
-  * @endcode
-  *
-  * Alternatively, to combine a sequence of frames into packets that each
-  * contain up to <code>TARGET_DURATION_MS</code> milliseconds of data:
-  * @code
-  * // The maximum number of packets with duration TARGET_DURATION_MS occurs
-  * // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
-  * // packets.
-  * unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
-  * opus_int32 len[(TARGET_DURATION_MS*2/5)+1];
-  * int nb_packets;
-  * unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
-  * opus_int32 out_len;
-  * int prev_toc;
-  * nb_packets = 0;
-  * while (get_next_packet(data+nb_packets, len+nb_packets))
-  * {
-  *   int nb_frames;
-  *   int err;
-  *   nb_frames = opus_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
-  *   if (nb_frames < 1)
-  *   {
-  *     release_packets(data, nb_packets+1);
-  *     return nb_frames;
-  *   }
-  *   nb_frames += opus_repacketizer_get_nb_frames(rp);
-  *   // If adding the next packet would exceed our target, or it has an
-  *   // incompatible TOC sequence, output the packets we already have before
-  *   // submitting it.
-  *   // N.B., The nb_packets > 0 check ensures we've submitted at least one
-  *   // packet since the last call to opus_repacketizer_init(). Otherwise a
-  *   // single packet longer than TARGET_DURATION_MS would cause us to try to
-  *   // output an (invalid) empty packet. It also ensures that prev_toc has
-  *   // been set to a valid value. Additionally, len[nb_packets] > 0 is
-  *   // guaranteed by the call to opus_packet_get_nb_frames() above, so the
-  *   // reference to data[nb_packets][0] should be valid.
-  *   if (nb_packets > 0 && (
-  *       ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
-  *       opus_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
-  *       TARGET_DURATION_MS*48))
-  *   {
-  *     out_len = opus_repacketizer_out(rp, out, sizeof(out));
-  *     if (out_len < 0)
-  *     {
-  *        release_packets(data, nb_packets+1);
-  *        return (int)out_len;
-  *     }
-  *     output_next_packet(out, out_len);
-  *     opus_repacketizer_init(rp);
-  *     release_packets(data, nb_packets);
-  *     data[0] = data[nb_packets];
-  *     len[0] = len[nb_packets];
-  *     nb_packets = 0;
-  *   }
-  *   err = opus_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
-  *   if (err != OPUS_OK)
-  *   {
-  *     release_packets(data, nb_packets+1);
-  *     return err;
-  *   }
-  *   prev_toc = data[nb_packets][0];
-  *   nb_packets++;
-  * }
-  * // Output the final, partial packet.
-  * if (nb_packets > 0)
-  * {
-  *   out_len = opus_repacketizer_out(rp, out, sizeof(out));
-  *   release_packets(data, nb_packets);
-  *   if (out_len < 0)
-  *     return (int)out_len;
-  *   output_next_packet(out, out_len);
-  * }
-  * @endcode
-  *
-  * An alternate way of merging packets is to simply call opus_repacketizer_cat()
-  * unconditionally until it fails. At that point, the merged packet can be
-  * obtained with opus_repacketizer_out() and the input packet for which
-  * opus_repacketizer_cat() needs to be re-added to a newly reinitialized
-  * repacketizer state.
-  */
-
-typedef struct OpusRepacketizer OpusRepacketizer;
-
-/** Gets the size of an <code>OpusRepacketizer</code> structure.
-  * @returns The size in bytes.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_size(void);
-
-/** (Re)initializes a previously allocated repacketizer state.
-  * The state must be at least the size returned by opus_repacketizer_get_size().
-  * This can be used for applications which use their own allocator instead of
-  * malloc().
-  * It must also be called to reset the queue of packets waiting to be
-  * repacketized, which is necessary if the maximum packet duration of 120 ms
-  * is reached or if you wish to submit packets with a different Opus
-  * configuration (coding mode, audio bandwidth, frame size, or channel count).
-  * Failure to do so will prevent a new packet from being added with
-  * opus_repacketizer_cat().
-  * @see opus_repacketizer_create
-  * @see opus_repacketizer_get_size
-  * @see opus_repacketizer_cat
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to
-  *                                       (re)initialize.
-  * @returns A pointer to the same repacketizer state that was passed in.
-  */
-OPUS_EXPORT OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
-
-/** Allocates memory and initializes the new repacketizer with
- * opus_repacketizer_init().
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusRepacketizer *opus_repacketizer_create(void);
-
-/** Frees an <code>OpusRepacketizer</code> allocated by
-  * opus_repacketizer_create().
-  * @param[in] rp <tt>OpusRepacketizer*</tt>: State to be freed.
-  */
-OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
-
-/** Add a packet to the current repacketizer state.
-  * This packet must match the configuration of any packets already submitted
-  * for repacketization since the last call to opus_repacketizer_init().
-  * This means that it must have the same coding mode, audio bandwidth, frame
-  * size, and channel count.
-  * This can be checked in advance by examining the top 6 bits of the first
-  * byte of the packet, and ensuring they match the top 6 bits of the first
-  * byte of any previously submitted packet.
-  * The total duration of audio in the repacketizer state also must not exceed
-  * 120 ms, the maximum duration of a single packet, after adding this packet.
-  *
-  * The contents of the current repacketizer state can be extracted into new
-  * packets using opus_repacketizer_out() or opus_repacketizer_out_range().
-  *
-  * In order to add a packet with a different configuration or to add more
-  * audio beyond 120 ms, you must clear the repacketizer state by calling
-  * opus_repacketizer_init().
-  * If a packet is too large to add to the current repacketizer state, no part
-  * of it is added, even if it contains multiple frames, some of which might
-  * fit.
-  * If you wish to be able to add parts of such packets, you should first use
-  * another repacketizer to split the packet into pieces and add them
-  * individually.
-  * @see opus_repacketizer_out_range
-  * @see opus_repacketizer_out
-  * @see opus_repacketizer_init
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to which to
-  *                                       add the packet.
-  * @param[in] data <tt>const unsigned char*</tt>: The packet data.
-  *                                                The application must ensure
-  *                                                this pointer remains valid
-  *                                                until the next call to
-  *                                                opus_repacketizer_init() or
-  *                                                opus_repacketizer_destroy().
-  * @param len <tt>opus_int32</tt>: The number of bytes in the packet data.
-  * @returns An error code indicating whether or not the operation succeeded.
-  * @retval #OPUS_OK The packet's contents have been added to the repacketizer
-  *                  state.
-  * @retval #OPUS_INVALID_PACKET The packet did not have a valid TOC sequence,
-  *                              the packet's TOC sequence was not compatible
-  *                              with previously submitted packets (because
-  *                              the coding mode, audio bandwidth, frame size,
-  *                              or channel count did not match), or adding
-  *                              this packet would increase the total amount of
-  *                              audio stored in the repacketizer state to more
-  *                              than 120 ms.
-  */
-OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
-
-
-/** Construct a new packet from data previously submitted to the repacketizer
-  * state via opus_repacketizer_cat().
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
-  *                                       construct the new packet.
-  * @param begin <tt>int</tt>: The index of the first frame in the current
-  *                            repacketizer state to include in the output.
-  * @param end <tt>int</tt>: One past the index of the last frame in the
-  *                          current repacketizer state to include in the
-  *                          output.
-  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
-  *                                                 store the output packet.
-  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
-  *                                    the output buffer. In order to guarantee
-  *                                    success, this should be at least
-  *                                    <code>1276</code> for a single frame,
-  *                                    or for multiple frames,
-  *                                    <code>1277*(end-begin)</code>.
-  *                                    However, <code>1*(end-begin)</code> plus
-  *                                    the size of all packet data submitted to
-  *                                    the repacketizer since the last call to
-  *                                    opus_repacketizer_init() or
-  *                                    opus_repacketizer_create() is also
-  *                                    sufficient, and possibly much smaller.
-  * @returns The total size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OPUS_BAD_ARG <code>[begin,end)</code> was an invalid range of
-  *                       frames (begin < 0, begin >= end, or end >
-  *                       opus_repacketizer_get_nb_frames()).
-  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
-  *                                complete output packet.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out_range(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
-
-/** Return the total number of frames contained in packet data submitted to
-  * the repacketizer state so far via opus_repacketizer_cat() since the last
-  * call to opus_repacketizer_init() or opus_repacketizer_create().
-  * This defines the valid range of packets that can be extracted with
-  * opus_repacketizer_out_range() or opus_repacketizer_out().
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state containing the
-  *                                       frames.
-  * @returns The total number of frames contained in the packet data submitted
-  *          to the repacketizer state.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_nb_frames(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
-
-/** Construct a new packet from data previously submitted to the repacketizer
-  * state via opus_repacketizer_cat().
-  * This is a convenience routine that returns all the data submitted so far
-  * in a single packet.
-  * It is equivalent to calling
-  * @code
-  * opus_repacketizer_out_range(rp, 0, opus_repacketizer_get_nb_frames(rp),
-  *                             data, maxlen)
-  * @endcode
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
-  *                                       construct the new packet.
-  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
-  *                                                 store the output packet.
-  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
-  *                                    the output buffer. In order to guarantee
-  *                                    success, this should be at least
-  *                                    <code>1277*opus_repacketizer_get_nb_frames(rp)</code>.
-  *                                    However,
-  *                                    <code>1*opus_repacketizer_get_nb_frames(rp)</code>
-  *                                    plus the size of all packet data
-  *                                    submitted to the repacketizer since the
-  *                                    last call to opus_repacketizer_init() or
-  *                                    opus_repacketizer_create() is also
-  *                                    sufficient, and possibly much smaller.
-  * @returns The total size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
-  *                                complete output packet.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out(OpusRepacketizer *rp, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1);
-
-/** Pads a given Opus packet to a larger size (possibly changing the TOC sequence).
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to pad.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
-  *                                 This must be at least as large as len.
-  * @returns an error code
-  * @retval #OPUS_OK \a on success.
-  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
-  */
-OPUS_EXPORT int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len);
-
-/** Remove all padding from a given Opus packet and rewrite the TOC sequence to
-  * minimize space usage.
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to strip.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @returns The new size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OPUS_BAD_ARG \a len was less than 1.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len);
-
-/** Pads a given Opus multi-stream packet to a larger size (possibly changing the TOC sequence).
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to pad.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
-  *                                 This must be at least 1.
-  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
-  *                                 This must be at least as large as len.
-  * @returns an error code
-  * @retval #OPUS_OK \a on success.
-  * @retval #OPUS_BAD_ARG \a len was less than 1.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
-  */
-OPUS_EXPORT int opus_multistream_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len, int nb_streams);
-
-/** Remove all padding from a given Opus multi-stream packet and rewrite the TOC sequence to
-  * minimize space usage.
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to strip.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
-  *                                 This must be at least 1.
-  * @returns The new size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, int nb_streams);
-
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPUS_H */
diff --git a/dependencies2013/win32/include/opus/opus_defines.h b/dependencies2013/win32/include/opus/opus_defines.h
deleted file mode 100644
index 33c5acdb..00000000
--- a/dependencies2013/win32/include/opus/opus_defines.h
+++ /dev/null
@@ -1,785 +0,0 @@
-/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
-   Written by Jean-Marc Valin and Koen Vos */
-/*
-   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.
-
-   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.
-*/
-
-/**
- * @file opus_defines.h
- * @brief Opus reference implementation constants
- */
-
-#ifndef OPUS_DEFINES_H
-#define OPUS_DEFINES_H
-
-#include "opus_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @defgroup opus_errorcodes Error codes
- * @{
- */
-/** No error @hideinitializer*/
-#define OPUS_OK                0
-/** One or more invalid/out of range arguments @hideinitializer*/
-#define OPUS_BAD_ARG          -1
-/** Not enough bytes allocated in the buffer @hideinitializer*/
-#define OPUS_BUFFER_TOO_SMALL -2
-/** An internal error was detected @hideinitializer*/
-#define OPUS_INTERNAL_ERROR   -3
-/** The compressed data passed is corrupted @hideinitializer*/
-#define OPUS_INVALID_PACKET   -4
-/** Invalid/unsupported request number @hideinitializer*/
-#define OPUS_UNIMPLEMENTED    -5
-/** An encoder or decoder structure is invalid or already freed @hideinitializer*/
-#define OPUS_INVALID_STATE    -6
-/** Memory allocation has failed @hideinitializer*/
-#define OPUS_ALLOC_FAIL       -7
-/**@}*/
-
-/** @cond OPUS_INTERNAL_DOC */
-/**Export control for opus functions */
-
-#ifndef OPUS_EXPORT
-# if defined(WIN32)
-#  if defined(OPUS_BUILD) && defined(DLL_EXPORT)
-#   define OPUS_EXPORT __declspec(dllexport)
-#  else
-#   define OPUS_EXPORT
-#  endif
-# elif defined(__GNUC__) && defined(OPUS_BUILD)
-#  define OPUS_EXPORT __attribute__ ((visibility ("default")))
-# else
-#  define OPUS_EXPORT
-# endif
-#endif
-
-# if !defined(OPUS_GNUC_PREREQ)
-#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
-#   define OPUS_GNUC_PREREQ(_maj,_min) \
- ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
-#  else
-#   define OPUS_GNUC_PREREQ(_maj,_min) 0
-#  endif
-# endif
-
-#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-# if OPUS_GNUC_PREREQ(3,0)
-#  define OPUS_RESTRICT __restrict__
-# elif (defined(_MSC_VER) && _MSC_VER >= 1400)
-#  define OPUS_RESTRICT __restrict
-# else
-#  define OPUS_RESTRICT
-# endif
-#else
-# define OPUS_RESTRICT restrict
-#endif
-
-#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-# if OPUS_GNUC_PREREQ(2,7)
-#  define OPUS_INLINE __inline__
-# elif (defined(_MSC_VER))
-#  define OPUS_INLINE __inline
-# else
-#  define OPUS_INLINE
-# endif
-#else
-# define OPUS_INLINE inline
-#endif
-
-/**Warning attributes for opus functions
-  * NONNULL is not used in OPUS_BUILD to avoid the compiler optimizing out
-  * some paranoid null checks. */
-#if defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
-# define OPUS_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
-#else
-# define OPUS_WARN_UNUSED_RESULT
-#endif
-#if !defined(OPUS_BUILD) && defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
-# define OPUS_ARG_NONNULL(_x)  __attribute__ ((__nonnull__(_x)))
-#else
-# define OPUS_ARG_NONNULL(_x)
-#endif
-
-/** These are the actual Encoder CTL ID numbers.
-  * They should not be used directly by applications.
-  * In general, SETs should be even and GETs should be odd.*/
-#define OPUS_SET_APPLICATION_REQUEST         4000
-#define OPUS_GET_APPLICATION_REQUEST         4001
-#define OPUS_SET_BITRATE_REQUEST             4002
-#define OPUS_GET_BITRATE_REQUEST             4003
-#define OPUS_SET_MAX_BANDWIDTH_REQUEST       4004
-#define OPUS_GET_MAX_BANDWIDTH_REQUEST       4005
-#define OPUS_SET_VBR_REQUEST                 4006
-#define OPUS_GET_VBR_REQUEST                 4007
-#define OPUS_SET_BANDWIDTH_REQUEST           4008
-#define OPUS_GET_BANDWIDTH_REQUEST           4009
-#define OPUS_SET_COMPLEXITY_REQUEST          4010
-#define OPUS_GET_COMPLEXITY_REQUEST          4011
-#define OPUS_SET_INBAND_FEC_REQUEST          4012
-#define OPUS_GET_INBAND_FEC_REQUEST          4013
-#define OPUS_SET_PACKET_LOSS_PERC_REQUEST    4014
-#define OPUS_GET_PACKET_LOSS_PERC_REQUEST    4015
-#define OPUS_SET_DTX_REQUEST                 4016
-#define OPUS_GET_DTX_REQUEST                 4017
-#define OPUS_SET_VBR_CONSTRAINT_REQUEST      4020
-#define OPUS_GET_VBR_CONSTRAINT_REQUEST      4021
-#define OPUS_SET_FORCE_CHANNELS_REQUEST      4022
-#define OPUS_GET_FORCE_CHANNELS_REQUEST      4023
-#define OPUS_SET_SIGNAL_REQUEST              4024
-#define OPUS_GET_SIGNAL_REQUEST              4025
-#define OPUS_GET_LOOKAHEAD_REQUEST           4027
-/* #define OPUS_RESET_STATE 4028 */
-#define OPUS_GET_SAMPLE_RATE_REQUEST         4029
-#define OPUS_GET_FINAL_RANGE_REQUEST         4031
-#define OPUS_GET_PITCH_REQUEST               4033
-#define OPUS_SET_GAIN_REQUEST                4034
-#define OPUS_GET_GAIN_REQUEST                4045 /* Should have been 4035 */
-#define OPUS_SET_LSB_DEPTH_REQUEST           4036
-#define OPUS_GET_LSB_DEPTH_REQUEST           4037
-#define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039
-#define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040
-#define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041
-#define OPUS_SET_PREDICTION_DISABLED_REQUEST 4042
-#define OPUS_GET_PREDICTION_DISABLED_REQUEST 4043
-/* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */
-#define OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST 4046
-#define OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST 4047
-
-/* Macros to trigger compilation errors when the wrong types are provided to a CTL */
-#define __opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
-#define __opus_check_int_ptr(ptr) ((ptr) + ((ptr) - (opus_int32*)(ptr)))
-#define __opus_check_uint_ptr(ptr) ((ptr) + ((ptr) - (opus_uint32*)(ptr)))
-#define __opus_check_val16_ptr(ptr) ((ptr) + ((ptr) - (opus_val16*)(ptr)))
-/** @endcond */
-
-/** @defgroup opus_ctlvalues Pre-defined values for CTL interface
-  * @see opus_genericctls, opus_encoderctls
-  * @{
-  */
-/* Values for the various encoder CTLs */
-#define OPUS_AUTO                           -1000 /**<Auto/default setting @hideinitializer*/
-#define OPUS_BITRATE_MAX                       -1 /**<Maximum bitrate @hideinitializer*/
-
-/** Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
- * @hideinitializer */
-#define OPUS_APPLICATION_VOIP                2048
-/** Best for broadcast/high-fidelity application where the decoded audio should be as close as possible to the input
- * @hideinitializer */
-#define OPUS_APPLICATION_AUDIO               2049
-/** Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
- * @hideinitializer */
-#define OPUS_APPLICATION_RESTRICTED_LOWDELAY 2051
-
-#define OPUS_SIGNAL_VOICE                    3001 /**< Signal being encoded is voice */
-#define OPUS_SIGNAL_MUSIC                    3002 /**< Signal being encoded is music */
-#define OPUS_BANDWIDTH_NARROWBAND            1101 /**< 4 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_MEDIUMBAND            1102 /**< 6 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_WIDEBAND              1103 /**< 8 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_SUPERWIDEBAND         1104 /**<12 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_FULLBAND              1105 /**<20 kHz bandpass @hideinitializer*/
-
-#define OPUS_FRAMESIZE_ARG                   5000 /**< Select frame size from the argument (default) */
-#define OPUS_FRAMESIZE_2_5_MS                5001 /**< Use 2.5 ms frames */
-#define OPUS_FRAMESIZE_5_MS                  5002 /**< Use 5 ms frames */
-#define OPUS_FRAMESIZE_10_MS                 5003 /**< Use 10 ms frames */
-#define OPUS_FRAMESIZE_20_MS                 5004 /**< Use 20 ms frames */
-#define OPUS_FRAMESIZE_40_MS                 5005 /**< Use 40 ms frames */
-#define OPUS_FRAMESIZE_60_MS                 5006 /**< Use 60 ms frames */
-#define OPUS_FRAMESIZE_80_MS                 5007 /**< Use 80 ms frames */
-#define OPUS_FRAMESIZE_100_MS                5008 /**< Use 100 ms frames */
-#define OPUS_FRAMESIZE_120_MS                5009 /**< Use 120 ms frames */
-
-/**@}*/
-
-
-/** @defgroup opus_encoderctls Encoder related CTLs
-  *
-  * These are convenience macros for use with the \c opus_encode_ctl
-  * interface. They are used to generate the appropriate series of
-  * arguments for that call, passing the correct type, size and so
-  * on as expected for each particular request.
-  *
-  * Some usage examples:
-  *
-  * @code
-  * int ret;
-  * ret = opus_encoder_ctl(enc_ctx, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-  * if (ret != OPUS_OK) return ret;
-  *
-  * opus_int32 rate;
-  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&rate));
-  *
-  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
-  * @endcode
-  *
-  * @see opus_genericctls, opus_encoder
-  * @{
-  */
-
-/** Configures the encoder's computational complexity.
-  * The supported range is 0-10 inclusive with 10 representing the highest complexity.
-  * @see OPUS_GET_COMPLEXITY
-  * @param[in] x <tt>opus_int32</tt>: Allowed values: 0-10, inclusive.
-  *
-  * @hideinitializer */
-#define OPUS_SET_COMPLEXITY(x) OPUS_SET_COMPLEXITY_REQUEST, __opus_check_int(x)
-/** Gets the encoder's complexity configuration.
-  * @see OPUS_SET_COMPLEXITY
-  * @param[out] x <tt>opus_int32 *</tt>: Returns a value in the range 0-10,
-  *                                      inclusive.
-  * @hideinitializer */
-#define OPUS_GET_COMPLEXITY(x) OPUS_GET_COMPLEXITY_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures the bitrate in the encoder.
-  * Rates from 500 to 512000 bits per second are meaningful, as well as the
-  * special values #OPUS_AUTO and #OPUS_BITRATE_MAX.
-  * The value #OPUS_BITRATE_MAX can be used to cause the codec to use as much
-  * rate as it can, which is useful for controlling the rate by adjusting the
-  * output buffer size.
-  * @see OPUS_GET_BITRATE
-  * @param[in] x <tt>opus_int32</tt>: Bitrate in bits per second. The default
-  *                                   is determined based on the number of
-  *                                   channels and the input sampling rate.
-  * @hideinitializer */
-#define OPUS_SET_BITRATE(x) OPUS_SET_BITRATE_REQUEST, __opus_check_int(x)
-/** Gets the encoder's bitrate configuration.
-  * @see OPUS_SET_BITRATE
-  * @param[out] x <tt>opus_int32 *</tt>: Returns the bitrate in bits per second.
-  *                                      The default is determined based on the
-  *                                      number of channels and the input
-  *                                      sampling rate.
-  * @hideinitializer */
-#define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __opus_check_int_ptr(x)
-
-/** Enables or disables variable bitrate (VBR) in the encoder.
-  * The configured bitrate may not be met exactly because frames must
-  * be an integer number of bytes in length.
-  * @see OPUS_GET_VBR
-  * @see OPUS_SET_VBR_CONSTRAINT
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
-  *               cause noticeable quality degradation.</dd>
-  * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
-  *               #OPUS_SET_VBR_CONSTRAINT.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __opus_check_int(x)
-/** Determine if variable bitrate (VBR) is enabled in the encoder.
-  * @see OPUS_SET_VBR
-  * @see OPUS_GET_VBR_CONSTRAINT
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Hard CBR.</dd>
-  * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
-  *               #OPUS_GET_VBR_CONSTRAINT.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __opus_check_int_ptr(x)
-
-/** Enables or disables constrained VBR in the encoder.
-  * This setting is ignored when the encoder is in CBR mode.
-  * @warning Only the MDCT mode of Opus currently heeds the constraint.
-  *  Speech mode ignores it completely, hybrid mode may fail to obey it
-  *  if the LPC layer uses more bitrate than the constraint would have
-  *  permitted.
-  * @see OPUS_GET_VBR_CONSTRAINT
-  * @see OPUS_SET_VBR
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Unconstrained VBR.</dd>
-  * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
-  *               frame of buffering delay assuming a transport with a
-  *               serialization speed of the nominal bitrate.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_VBR_CONSTRAINT(x) OPUS_SET_VBR_CONSTRAINT_REQUEST, __opus_check_int(x)
-/** Determine if constrained VBR is enabled in the encoder.
-  * @see OPUS_SET_VBR_CONSTRAINT
-  * @see OPUS_GET_VBR
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Unconstrained VBR.</dd>
-  * <dt>1</dt><dd>Constrained VBR (default).</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_VBR_CONSTRAINT(x) OPUS_GET_VBR_CONSTRAINT_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures mono/stereo forcing in the encoder.
-  * This can force the encoder to produce packets encoded as either mono or
-  * stereo, regardless of the format of the input audio. This is useful when
-  * the caller knows that the input signal is currently a mono source embedded
-  * in a stereo stream.
-  * @see OPUS_GET_FORCE_CHANNELS
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
-  * <dt>1</dt>         <dd>Forced mono</dd>
-  * <dt>2</dt>         <dd>Forced stereo</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_FORCE_CHANNELS(x) OPUS_SET_FORCE_CHANNELS_REQUEST, __opus_check_int(x)
-/** Gets the encoder's forced channel configuration.
-  * @see OPUS_SET_FORCE_CHANNELS
-  * @param[out] x <tt>opus_int32 *</tt>:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
-  * <dt>1</dt>         <dd>Forced mono</dd>
-  * <dt>2</dt>         <dd>Forced stereo</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_FORCE_CHANNELS(x) OPUS_GET_FORCE_CHANNELS_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures the maximum bandpass that the encoder will select automatically.
-  * Applications should normally use this instead of #OPUS_SET_BANDWIDTH
-  * (leaving that set to the default, #OPUS_AUTO). This allows the
-  * application to set an upper bound based on the type of input it is
-  * providing, but still gives the encoder the freedom to reduce the bandpass
-  * when the bitrate becomes too low, for better overall quality.
-  * @see OPUS_GET_MAX_BANDWIDTH
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_MAX_BANDWIDTH(x) OPUS_SET_MAX_BANDWIDTH_REQUEST, __opus_check_int(x)
-
-/** Gets the encoder's configured maximum allowed bandpass.
-  * @see OPUS_SET_MAX_BANDWIDTH
-  * @param[out] x <tt>opus_int32 *</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_MAX_BANDWIDTH(x) OPUS_GET_MAX_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
-
-/** Sets the encoder's bandpass to a specific value.
-  * This prevents the encoder from automatically selecting the bandpass based
-  * on the available bitrate. If an application knows the bandpass of the input
-  * audio it is providing, it should normally use #OPUS_SET_MAX_BANDWIDTH
-  * instead, which still gives the encoder the freedom to reduce the bandpass
-  * when the bitrate becomes too low, for better overall quality.
-  * @see OPUS_GET_BANDWIDTH
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
-  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __opus_check_int(x)
-
-/** Configures the type of signal being encoded.
-  * This is a hint which helps the encoder's mode selection.
-  * @see OPUS_GET_SIGNAL
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
-  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
-  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_SIGNAL(x) OPUS_SET_SIGNAL_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured signal type.
-  * @see OPUS_SET_SIGNAL
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
-  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
-  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_SIGNAL(x) OPUS_GET_SIGNAL_REQUEST, __opus_check_int_ptr(x)
-
-
-/** Configures the encoder's intended application.
-  * The initial value is a mandatory argument to the encoder_create function.
-  * @see OPUS_GET_APPLICATION
-  * @param[in] x <tt>opus_int32</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_APPLICATION(x) OPUS_SET_APPLICATION_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured application.
-  * @see OPUS_SET_APPLICATION
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_APPLICATION(x) OPUS_GET_APPLICATION_REQUEST, __opus_check_int_ptr(x)
-
-/** Gets the total samples of delay added by the entire codec.
-  * This can be queried by the encoder and then the provided number of samples can be
-  * skipped on from the start of the decoder's output to provide time aligned input
-  * and output. From the perspective of a decoding application the real data begins this many
-  * samples late.
-  *
-  * The decoder contribution to this delay is identical for all decoders, but the
-  * encoder portion of the delay may vary from implementation to implementation,
-  * version to version, or even depend on the encoder's initial configuration.
-  * Applications needing delay compensation should call this CTL rather than
-  * hard-coding a value.
-  * @param[out] x <tt>opus_int32 *</tt>:   Number of lookahead samples
-  * @hideinitializer */
-#define OPUS_GET_LOOKAHEAD(x) OPUS_GET_LOOKAHEAD_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures the encoder's use of inband forward error correction (FEC).
-  * @note This is only applicable to the LPC layer
-  * @see OPUS_GET_INBAND_FEC
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Disable inband FEC (default).</dd>
-  * <dt>1</dt><dd>Enable inband FEC.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x)
-/** Gets encoder's configured use of inband forward error correction.
-  * @see OPUS_SET_INBAND_FEC
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
-  * <dt>1</dt><dd>Inband FEC enabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures the encoder's expected packet loss percentage.
-  * Higher values trigger progressively more loss resistant behavior in the encoder
-  * at the expense of quality at a given bitrate in the absence of packet loss, but
-  * greater quality under loss.
-  * @see OPUS_GET_PACKET_LOSS_PERC
-  * @param[in] x <tt>opus_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
-  * @hideinitializer */
-#define OPUS_SET_PACKET_LOSS_PERC(x) OPUS_SET_PACKET_LOSS_PERC_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured packet loss percentage.
-  * @see OPUS_SET_PACKET_LOSS_PERC
-  * @param[out] x <tt>opus_int32 *</tt>: Returns the configured loss percentage
-  *                                      in the range 0-100, inclusive (default: 0).
-  * @hideinitializer */
-#define OPUS_GET_PACKET_LOSS_PERC(x) OPUS_GET_PACKET_LOSS_PERC_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures the encoder's use of discontinuous transmission (DTX).
-  * @note This is only applicable to the LPC layer
-  * @see OPUS_GET_DTX
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Disable DTX (default).</dd>
-  * <dt>1</dt><dd>Enabled DTX.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_DTX(x) OPUS_SET_DTX_REQUEST, __opus_check_int(x)
-/** Gets encoder's configured use of discontinuous transmission.
-  * @see OPUS_SET_DTX
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>DTX disabled (default).</dd>
-  * <dt>1</dt><dd>DTX enabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_DTX(x) OPUS_GET_DTX_REQUEST, __opus_check_int_ptr(x)
-/** Configures the depth of signal being encoded.
-  *
-  * This is a hint which helps the encoder identify silence and near-silence.
-  * It represents the number of significant bits of linear intensity below
-  * which the signal contains ignorable quantization or other noise.
-  *
-  * For example, OPUS_SET_LSB_DEPTH(14) would be an appropriate setting
-  * for G.711 u-law input. OPUS_SET_LSB_DEPTH(16) would be appropriate
-  * for 16-bit linear pcm input with opus_encode_float().
-  *
-  * When using opus_encode() instead of opus_encode_float(), or when libopus
-  * is compiled for fixed-point, the encoder uses the minimum of the value
-  * set here and the value 16.
-  *
-  * @see OPUS_GET_LSB_DEPTH
-  * @param[in] x <tt>opus_int32</tt>: Input precision in bits, between 8 and 24
-  *                                   (default: 24).
-  * @hideinitializer */
-#define OPUS_SET_LSB_DEPTH(x) OPUS_SET_LSB_DEPTH_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured signal depth.
-  * @see OPUS_SET_LSB_DEPTH
-  * @param[out] x <tt>opus_int32 *</tt>: Input precision in bits, between 8 and
-  *                                      24 (default: 24).
-  * @hideinitializer */
-#define OPUS_GET_LSB_DEPTH(x) OPUS_GET_LSB_DEPTH_REQUEST, __opus_check_int_ptr(x)
-
-/** Configures the encoder's use of variable duration frames.
-  * When variable duration is enabled, the encoder is free to use a shorter frame
-  * size than the one requested in the opus_encode*() call.
-  * It is then the user's responsibility
-  * to verify how much audio was encoded by checking the ToC byte of the encoded
-  * packet. The part of the audio that was not encoded needs to be resent to the
-  * encoder for the next call. Do not use this option unless you <b>really</b>
-  * know what you are doing.
-  * @see OPUS_GET_EXPERT_FRAME_DURATION
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
-  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_EXPERT_FRAME_DURATION(x) OPUS_SET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured use of variable duration frames.
-  * @see OPUS_SET_EXPERT_FRAME_DURATION
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
-  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int_ptr(x)
-
-/** If set to 1, disables almost all use of prediction, making frames almost
-  * completely independent. This reduces quality.
-  * @see OPUS_GET_PREDICTION_DISABLED
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Enable prediction (default).</dd>
-  * <dt>1</dt><dd>Disable prediction.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_PREDICTION_DISABLED(x) OPUS_SET_PREDICTION_DISABLED_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured prediction status.
-  * @see OPUS_SET_PREDICTION_DISABLED
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Prediction enabled (default).</dd>
-  * <dt>1</dt><dd>Prediction disabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_PREDICTION_DISABLED(x) OPUS_GET_PREDICTION_DISABLED_REQUEST, __opus_check_int_ptr(x)
-
-/**@}*/
-
-/** @defgroup opus_genericctls Generic CTLs
-  *
-  * These macros are used with the \c opus_decoder_ctl and
-  * \c opus_encoder_ctl calls to generate a particular
-  * request.
-  *
-  * When called on an \c OpusDecoder they apply to that
-  * particular decoder instance. When called on an
-  * \c OpusEncoder they apply to the corresponding setting
-  * on that encoder instance, if present.
-  *
-  * Some usage examples:
-  *
-  * @code
-  * int ret;
-  * opus_int32 pitch;
-  * ret = opus_decoder_ctl(dec_ctx, OPUS_GET_PITCH(&pitch));
-  * if (ret == OPUS_OK) return ret;
-  *
-  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
-  * opus_decoder_ctl(dec_ctx, OPUS_RESET_STATE);
-  *
-  * opus_int32 enc_bw, dec_bw;
-  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&enc_bw));
-  * opus_decoder_ctl(dec_ctx, OPUS_GET_BANDWIDTH(&dec_bw));
-  * if (enc_bw != dec_bw) {
-  *   printf("packet bandwidth mismatch!\n");
-  * }
-  * @endcode
-  *
-  * @see opus_encoder, opus_decoder_ctl, opus_encoder_ctl, opus_decoderctls, opus_encoderctls
-  * @{
-  */
-
-/** Resets the codec state to be equivalent to a freshly initialized state.
-  * This should be called when switching streams in order to prevent
-  * the back to back decoding from giving different results from
-  * one at a time decoding.
-  * @hideinitializer */
-#define OPUS_RESET_STATE 4028
-
-/** Gets the final state of the codec's entropy coder.
-  * This is used for testing purposes,
-  * The encoder and decoder state should be identical after coding a payload
-  * (assuming no data corruption or software bugs)
-  *
-  * @param[out] x <tt>opus_uint32 *</tt>: Entropy coder state
-  *
-  * @hideinitializer */
-#define OPUS_GET_FINAL_RANGE(x) OPUS_GET_FINAL_RANGE_REQUEST, __opus_check_uint_ptr(x)
-
-/** Gets the encoder's configured bandpass or the decoder's last bandpass.
-  * @see OPUS_SET_BANDWIDTH
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
-  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
-
-/** Gets the sampling rate the encoder or decoder was initialized with.
-  * This simply returns the <code>Fs</code> value passed to opus_encoder_init()
-  * or opus_decoder_init().
-  * @param[out] x <tt>opus_int32 *</tt>: Sampling rate of encoder or decoder.
-  * @hideinitializer
-  */
-#define OPUS_GET_SAMPLE_RATE(x) OPUS_GET_SAMPLE_RATE_REQUEST, __opus_check_int_ptr(x)
-
-/** If set to 1, disables the use of phase inversion for intensity stereo,
-  * improving the quality of mono downmixes, but slightly reducing normal
-  * stereo quality. Disabling phase inversion in the decoder does not comply
-  * with RFC 6716, although it does not cause any interoperability issue and
-  * is expected to become part of the Opus standard once RFC 6716 is updated
-  * by draft-ietf-codec-opus-update.
-  * @see OPUS_GET_PHASE_INVERSION_DISABLED
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Enable phase inversion (default).</dd>
-  * <dt>1</dt><dd>Disable phase inversion.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_PHASE_INVERSION_DISABLED(x) OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int(x)
-/** Gets the encoder's configured phase inversion status.
-  * @see OPUS_SET_PHASE_INVERSION_DISABLED
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
-  * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_PHASE_INVERSION_DISABLED(x) OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int_ptr(x)
-
-/**@}*/
-
-/** @defgroup opus_decoderctls Decoder related CTLs
-  * @see opus_genericctls, opus_encoderctls, opus_decoder
-  * @{
-  */
-
-/** Configures decoder gain adjustment.
-  * Scales the decoded output by a factor specified in Q8 dB units.
-  * This has a maximum range of -32768 to 32767 inclusive, and returns
-  * OPUS_BAD_ARG otherwise. The default is zero indicating no adjustment.
-  * This setting survives decoder reset.
-  *
-  * gain = pow(10, x/(20.0*256))
-  *
-  * @param[in] x <tt>opus_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
-  * @hideinitializer */
-#define OPUS_SET_GAIN(x) OPUS_SET_GAIN_REQUEST, __opus_check_int(x)
-/** Gets the decoder's configured gain adjustment. @see OPUS_SET_GAIN
-  *
-  * @param[out] x <tt>opus_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
-  * @hideinitializer */
-#define OPUS_GET_GAIN(x) OPUS_GET_GAIN_REQUEST, __opus_check_int_ptr(x)
-
-/** Gets the duration (in samples) of the last packet successfully decoded or concealed.
-  * @param[out] x <tt>opus_int32 *</tt>: Number of samples (at current sampling rate).
-  * @hideinitializer */
-#define OPUS_GET_LAST_PACKET_DURATION(x) OPUS_GET_LAST_PACKET_DURATION_REQUEST, __opus_check_int_ptr(x)
-
-/** Gets the pitch of the last decoded frame, if available.
-  * This can be used for any post-processing algorithm requiring the use of pitch,
-  * e.g. time stretching/shortening. If the last frame was not voiced, or if the
-  * pitch was not coded in the frame, then zero is returned.
-  *
-  * This CTL is only implemented for decoder instances.
-  *
-  * @param[out] x <tt>opus_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
-  *
-  * @hideinitializer */
-#define OPUS_GET_PITCH(x) OPUS_GET_PITCH_REQUEST, __opus_check_int_ptr(x)
-
-/**@}*/
-
-/** @defgroup opus_libinfo Opus library information functions
-  * @{
-  */
-
-/** Converts an opus error code into a human readable string.
-  *
-  * @param[in] error <tt>int</tt>: Error number
-  * @returns Error string
-  */
-OPUS_EXPORT const char *opus_strerror(int error);
-
-/** Gets the libopus version string.
-  *
-  * Applications may look for the substring "-fixed" in the version string to
-  * determine whether they have a fixed-point or floating-point build at
-  * runtime.
-  *
-  * @returns Version string
-  */
-OPUS_EXPORT const char *opus_get_version_string(void);
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPUS_DEFINES_H */
diff --git a/dependencies2013/win32/include/opus/opus_multistream.h b/dependencies2013/win32/include/opus/opus_multistream.h
deleted file mode 100644
index babcee69..00000000
--- a/dependencies2013/win32/include/opus/opus_multistream.h
+++ /dev/null
@@ -1,660 +0,0 @@
-/* Copyright (c) 2011 Xiph.Org Foundation
-   Written by Jean-Marc Valin */
-/*
-   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.
-
-   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.
-*/
-
-/**
- * @file opus_multistream.h
- * @brief Opus reference implementation multistream API
- */
-
-#ifndef OPUS_MULTISTREAM_H
-#define OPUS_MULTISTREAM_H
-
-#include "opus.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @cond OPUS_INTERNAL_DOC */
-
-/** Macros to trigger compilation errors when the wrong types are provided to a
-  * CTL. */
-/**@{*/
-#define __opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(ptr)))
-#define __opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(ptr)))
-/**@}*/
-
-/** These are the actual encoder and decoder CTL ID numbers.
-  * They should not be used directly by applications.
-  * In general, SETs should be even and GETs should be odd.*/
-/**@{*/
-#define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
-#define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
-/**@}*/
-
-/** @endcond */
-
-/** @defgroup opus_multistream_ctls Multistream specific encoder and decoder CTLs
-  *
-  * These are convenience macros that are specific to the
-  * opus_multistream_encoder_ctl() and opus_multistream_decoder_ctl()
-  * interface.
-  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls, and
-  * @ref opus_decoderctls may be applied to a multistream encoder or decoder as
-  * well.
-  * In addition, you may retrieve the encoder or decoder state for an specific
-  * stream via #OPUS_MULTISTREAM_GET_ENCODER_STATE or
-  * #OPUS_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
-  */
-/**@{*/
-
-/** Gets the encoder state for an individual stream of a multistream encoder.
-  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose encoder you
-  *                                   wish to retrieve.
-  *                                   This must be non-negative and less than
-  *                                   the <code>streams</code> parameter used
-  *                                   to initialize the encoder.
-  * @param[out] y <tt>OpusEncoder**</tt>: Returns a pointer to the given
-  *                                       encoder state.
-  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
-  * @hideinitializer
-  */
-#define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST, __opus_check_int(x), __opus_check_encstate_ptr(y)
-
-/** Gets the decoder state for an individual stream of a multistream decoder.
-  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose decoder you
-  *                                   wish to retrieve.
-  *                                   This must be non-negative and less than
-  *                                   the <code>streams</code> parameter used
-  *                                   to initialize the decoder.
-  * @param[out] y <tt>OpusDecoder**</tt>: Returns a pointer to the given
-  *                                       decoder state.
-  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
-  * @hideinitializer
-  */
-#define OPUS_MULTISTREAM_GET_DECODER_STATE(x,y) OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST, __opus_check_int(x), __opus_check_decstate_ptr(y)
-
-/**@}*/
-
-/** @defgroup opus_multistream Opus Multistream API
-  * @{
-  *
-  * The multistream API allows individual Opus streams to be combined into a
-  * single packet, enabling support for up to 255 channels. Unlike an
-  * elementary Opus stream, the encoder and decoder must negotiate the channel
-  * configuration before the decoder can successfully interpret the data in the
-  * packets produced by the encoder. Some basic information, such as packet
-  * duration, can be computed without any special negotiation.
-  *
-  * The format for multistream Opus packets is defined in
-  * <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
-  * and is based on the self-delimited Opus framing described in Appendix B of
-  * <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
-  * Normal Opus packets are just a degenerate case of multistream Opus packets,
-  * and can be encoded or decoded with the multistream API by setting
-  * <code>streams</code> to <code>1</code> when initializing the encoder or
-  * decoder.
-  *
-  * Multistream Opus streams can contain up to 255 elementary Opus streams.
-  * These may be either "uncoupled" or "coupled", indicating that the decoder
-  * is configured to decode them to either 1 or 2 channels, respectively.
-  * The streams are ordered so that all coupled streams appear at the
-  * beginning.
-  *
-  * A <code>mapping</code> table defines which decoded channel <code>i</code>
-  * should be used for each input/output (I/O) channel <code>j</code>. This table is
-  * typically provided as an unsigned char array.
-  * Let <code>i = mapping[j]</code> be the index for I/O channel <code>j</code>.
-  * If <code>i < 2*coupled_streams</code>, then I/O channel <code>j</code> is
-  * encoded as the left channel of stream <code>(i/2)</code> if <code>i</code>
-  * is even, or  as the right channel of stream <code>(i/2)</code> if
-  * <code>i</code> is odd. Otherwise, I/O channel <code>j</code> is encoded as
-  * mono in stream <code>(i - coupled_streams)</code>, unless it has the special
-  * value 255, in which case it is omitted from the encoding entirely (the
-  * decoder will reproduce it as silence). Each value <code>i</code> must either
-  * be the special value 255 or be less than <code>streams + coupled_streams</code>.
-  *
-  * The output channels specified by the encoder
-  * should use the
-  * <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
-  * channel ordering</a>. A decoder may wish to apply an additional permutation
-  * to the mapping the encoder used to achieve a different output channel
-  * order (e.g. for outputing in WAV order).
-  *
-  * Each multistream packet contains an Opus packet for each stream, and all of
-  * the Opus packets in a single multistream packet must have the same
-  * duration. Therefore the duration of a multistream packet can be extracted
-  * from the TOC sequence of the first stream, which is located at the
-  * beginning of the packet, just like an elementary Opus stream:
-  *
-  * @code
-  * int nb_samples;
-  * int nb_frames;
-  * nb_frames = opus_packet_get_nb_frames(data, len);
-  * if (nb_frames < 1)
-  *   return nb_frames;
-  * nb_samples = opus_packet_get_samples_per_frame(data, 48000) * nb_frames;
-  * @endcode
-  *
-  * The general encoding and decoding process proceeds exactly the same as in
-  * the normal @ref opus_encoder and @ref opus_decoder APIs.
-  * See their documentation for an overview of how to use the corresponding
-  * multistream functions.
-  */
-
-/** Opus multistream encoder state.
-  * This contains the complete state of a multistream Opus encoder.
-  * It is position independent and can be freely copied.
-  * @see opus_multistream_encoder_create
-  * @see opus_multistream_encoder_init
-  */
-typedef struct OpusMSEncoder OpusMSEncoder;
-
-/** Opus multistream decoder state.
-  * This contains the complete state of a multistream Opus decoder.
-  * It is position independent and can be freely copied.
-  * @see opus_multistream_decoder_create
-  * @see opus_multistream_decoder_init
-  */
-typedef struct OpusMSDecoder OpusMSDecoder;
-
-/**\name Multistream encoder functions */
-/**@{*/
-
-/** Gets the size of an OpusMSEncoder structure.
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @returns The size in bytes on success, or a negative error code
-  *          (see @ref opus_errorcodes) on error.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_encoder_get_size(
-      int streams,
-      int coupled_streams
-);
-
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_surround_encoder_get_size(
-      int channels,
-      int mapping_family
-);
-
-
-/** Allocates and initializes a multistream encoder state.
-  * Call opus_multistream_encoder_destroy() to release
-  * this object when finished.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels in the input signal.
-  *                               This must be at most 255.
-  *                               It may be greater than the number of
-  *                               coded channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than the number of channels.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than the number of input channels.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    encoded channels to input channels, as described in
-  *                    @ref opus_multistream. As an extra constraint, the
-  *                    multistream encoder does not allow encoding coupled
-  *                    streams for which one channel is unused since this
-  *                    is never a good idea.
-  * @param application <tt>int</tt>: The target encoder application.
-  *                                  This must be one of the following:
-  * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
-  *                                   code (see @ref opus_errorcodes) on
-  *                                   failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_encoder_create(
-      opus_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application,
-      int *error
-) OPUS_ARG_NONNULL(5);
-
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_encoder_create(
-      opus_int32 Fs,
-      int channels,
-      int mapping_family,
-      int *streams,
-      int *coupled_streams,
-      unsigned char *mapping,
-      int application,
-      int *error
-) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
-
-/** Initialize a previously allocated multistream encoder state.
-  * The memory pointed to by \a st must be at least the size returned by
-  * opus_multistream_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of
-  * malloc.
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @see opus_multistream_encoder_create
-  * @see opus_multistream_encoder_get_size
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels in the input signal.
-  *                               This must be at most 255.
-  *                               It may be greater than the number of
-  *                               coded channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than the number of channels.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than the number of input channels.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    encoded channels to input channels, as described in
-  *                    @ref opus_multistream. As an extra constraint, the
-  *                    multistream encoder does not allow encoding coupled
-  *                    streams for which one channel is unused since this
-  *                    is never a good idea.
-  * @param application <tt>int</tt>: The target encoder application.
-  *                                  This must be one of the following:
-  * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
-  *          on failure.
-  */
-OPUS_EXPORT int opus_multistream_encoder_init(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
-
-OPUS_EXPORT int opus_multistream_surround_encoder_init(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
-      int channels,
-      int mapping_family,
-      int *streams,
-      int *coupled_streams,
-      unsigned char *mapping,
-      int application
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6) OPUS_ARG_NONNULL(7);
-
-/** Encodes a multistream Opus frame.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
-  *                                            samples.
-  *                                            This must contain
-  *                                            <code>frame_size*channels</code>
-  *                                            samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Opus frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode(
-    OpusMSEncoder *st,
-    const opus_int16 *pcm,
-    int frame_size,
-    unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
-
-/** Encodes a multistream Opus frame from floating point input.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
-  *                                       samples with a normal range of
-  *                                       +/-1.0.
-  *                                       Samples with a range beyond +/-1.0
-  *                                       are supported but will be clipped by
-  *                                       decoders using the integer API and
-  *                                       should only be used if it is known
-  *                                       that the far end supports extended
-  *                                       dynamic range.
-  *                                       This must contain
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Opus frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode_float(
-      OpusMSEncoder *st,
-      const float *pcm,
-      int frame_size,
-      unsigned char *data,
-      opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
-
-/** Frees an <code>OpusMSEncoder</code> allocated by
-  * opus_multistream_encoder_create().
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to be freed.
-  */
-OPUS_EXPORT void opus_multistream_encoder_destroy(OpusMSEncoder *st);
-
-/** Perform a CTL function on a multistream Opus encoder.
-  *
-  * Generally the request and subsequent arguments are generated by a
-  * convenience macro.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls,
-  *                @ref opus_encoderctls, or @ref opus_multistream_ctls.
-  * @see opus_genericctls
-  * @see opus_encoderctls
-  * @see opus_multistream_ctls
-  */
-OPUS_EXPORT int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
-
-/**@}*/
-
-/**\name Multistream decoder functions */
-/**@{*/
-
-/** Gets the size of an <code>OpusMSDecoder</code> structure.
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @returns The size in bytes on success, or a negative error code
-  *          (see @ref opus_errorcodes) on error.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_decoder_get_size(
-      int streams,
-      int coupled_streams
-);
-
-/** Allocates and initializes a multistream decoder state.
-  * Call opus_multistream_decoder_destroy() to release
-  * this object when finished.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels to output.
-  *                               This must be at most 255.
-  *                               It may be different from the number of coded
-  *                               channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    coded channels to output channels, as described in
-  *                    @ref opus_multistream.
-  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
-  *                                   code (see @ref opus_errorcodes) on
-  *                                   failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_create(
-      opus_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int *error
-) OPUS_ARG_NONNULL(5);
-
-/** Intialize a previously allocated decoder state object.
-  * The memory pointed to by \a st must be at least the size returned by
-  * opus_multistream_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of
-  * malloc.
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @see opus_multistream_decoder_create
-  * @see opus_multistream_deocder_get_size
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels to output.
-  *                               This must be at most 255.
-  *                               It may be different from the number of coded
-  *                               channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    coded channels to output channels, as described in
-  *                    @ref opus_multistream.
-  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
-  *          on failure.
-  */
-OPUS_EXPORT int opus_multistream_decoder_init(
-      OpusMSDecoder *st,
-      opus_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
-
-/** Decode a multistream Opus packet.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
-  *                                       samples.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode(
-    OpusMSDecoder *st,
-    const unsigned char *data,
-    opus_int32 len,
-    opus_int16 *pcm,
-    int frame_size,
-    int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
-
-/** Decode a multistream Opus packet with floating point output.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
-  *                                       samples.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
-  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode_float(
-    OpusMSDecoder *st,
-    const unsigned char *data,
-    opus_int32 len,
-    float *pcm,
-    int frame_size,
-    int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
-
-/** Perform a CTL function on a multistream Opus decoder.
-  *
-  * Generally the request and subsequent arguments are generated by a
-  * convenience macro.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls,
-  *                @ref opus_decoderctls, or @ref opus_multistream_ctls.
-  * @see opus_genericctls
-  * @see opus_decoderctls
-  * @see opus_multistream_ctls
-  */
-OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
-
-/** Frees an <code>OpusMSDecoder</code> allocated by
-  * opus_multistream_decoder_create().
-  * @param st <tt>OpusMSDecoder</tt>: Multistream decoder state to be freed.
-  */
-OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
-
-/**@}*/
-
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPUS_MULTISTREAM_H */
diff --git a/dependencies2013/win32/include/opus/opus_types.h b/dependencies2013/win32/include/opus/opus_types.h
deleted file mode 100644
index 71808266..00000000
--- a/dependencies2013/win32/include/opus/opus_types.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
-/* Modified by Jean-Marc Valin */
-/*
-   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.
-
-   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.
-*/
-/* opus_types.h based on ogg_types.h from libogg */
-
-/**
-   @file opus_types.h
-   @brief Opus reference implementation types
-*/
-#ifndef OPUS_TYPES_H
-#define OPUS_TYPES_H
-
-/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
-#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
-#include <stdint.h>
-
-   typedef int16_t opus_int16;
-   typedef uint16_t opus_uint16;
-   typedef int32_t opus_int32;
-   typedef uint32_t opus_uint32;
-#elif defined(_WIN32)
-
-#  if defined(__CYGWIN__)
-#    include <_G_config.h>
-     typedef _G_int32_t opus_int32;
-     typedef _G_uint32_t opus_uint32;
-     typedef _G_int16 opus_int16;
-     typedef _G_uint16 opus_uint16;
-#  elif defined(__MINGW32__)
-     typedef short opus_int16;
-     typedef unsigned short opus_uint16;
-     typedef int opus_int32;
-     typedef unsigned int opus_uint32;
-#  elif defined(__MWERKS__)
-     typedef int opus_int32;
-     typedef unsigned int opus_uint32;
-     typedef short opus_int16;
-     typedef unsigned short opus_uint16;
-#  else
-     /* MSVC/Borland */
-     typedef __int32 opus_int32;
-     typedef unsigned __int32 opus_uint32;
-     typedef __int16 opus_int16;
-     typedef unsigned __int16 opus_uint16;
-#  endif
-
-#elif defined(__MACOS__)
-
-#  include <sys/types.h>
-   typedef SInt16 opus_int16;
-   typedef UInt16 opus_uint16;
-   typedef SInt32 opus_int32;
-   typedef UInt32 opus_uint32;
-
-#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
-
-#  include <sys/types.h>
-   typedef int16_t opus_int16;
-   typedef u_int16_t opus_uint16;
-   typedef int32_t opus_int32;
-   typedef u_int32_t opus_uint32;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16 opus_int16;
-   typedef u_int16 opus_uint16;
-   typedef int32_t opus_int32;
-   typedef u_int32_t opus_uint32;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef int opus_int32;
-   typedef unsigned opus_uint32;
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef signed int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
-
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef long opus_int32;
-   typedef unsigned long opus_uint32;
-
-#elif defined(CONFIG_TI_C6X)
-
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#else
-
-   /* Give up, take a reasonable guess */
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#endif
-
-#define opus_int         int                     /* used for counters etc; at least 16 bits */
-#define opus_int64       long long
-#define opus_int8        signed char
-
-#define opus_uint        unsigned int            /* used for counters etc; at least 16 bits */
-#define opus_uint64      unsigned long long
-#define opus_uint8       unsigned char
-
-#endif  /* OPUS_TYPES_H */
diff --git a/dependencies2013/win32/include/python/Python-ast.h b/dependencies2013/win32/include/python/Python-ast.h
deleted file mode 100644
index 70494b70..00000000
--- a/dependencies2013/win32/include/python/Python-ast.h
+++ /dev/null
@@ -1,637 +0,0 @@
-/* File automatically generated by Parser/asdl_c.py. */
-
-#include "asdl.h"
-
-typedef struct _mod *mod_ty;
-
-typedef struct _stmt *stmt_ty;
-
-typedef struct _expr *expr_ty;
-
-typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5,
-                             Param=6 } expr_context_ty;
-
-typedef struct _slice *slice_ty;
-
-typedef enum _boolop { And=1, Or=2 } boolop_ty;
-
-typedef enum _operator { Add=1, Sub=2, Mult=3, MatMult=4, Div=5, Mod=6, Pow=7,
-                         LShift=8, RShift=9, BitOr=10, BitXor=11, BitAnd=12,
-                         FloorDiv=13 } operator_ty;
-
-typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty;
-
-typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8,
-                      In=9, NotIn=10 } cmpop_ty;
-
-typedef struct _comprehension *comprehension_ty;
-
-typedef struct _excepthandler *excepthandler_ty;
-
-typedef struct _arguments *arguments_ty;
-
-typedef struct _arg *arg_ty;
-
-typedef struct _keyword *keyword_ty;
-
-typedef struct _alias *alias_ty;
-
-typedef struct _withitem *withitem_ty;
-
-
-enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3,
-                 Suite_kind=4};
-struct _mod {
-    enum _mod_kind kind;
-    union {
-        struct {
-            asdl_seq *body;
-        } Module;
-        
-        struct {
-            asdl_seq *body;
-        } Interactive;
-        
-        struct {
-            expr_ty body;
-        } Expression;
-        
-        struct {
-            asdl_seq *body;
-        } Suite;
-        
-    } v;
-};
-
-enum _stmt_kind {FunctionDef_kind=1, AsyncFunctionDef_kind=2, ClassDef_kind=3,
-                  Return_kind=4, Delete_kind=5, Assign_kind=6,
-                  AugAssign_kind=7, AnnAssign_kind=8, For_kind=9,
-                  AsyncFor_kind=10, While_kind=11, If_kind=12, With_kind=13,
-                  AsyncWith_kind=14, Raise_kind=15, Try_kind=16,
-                  Assert_kind=17, Import_kind=18, ImportFrom_kind=19,
-                  Global_kind=20, Nonlocal_kind=21, Expr_kind=22, Pass_kind=23,
-                  Break_kind=24, Continue_kind=25};
-struct _stmt {
-    enum _stmt_kind kind;
-    union {
-        struct {
-            identifier name;
-            arguments_ty args;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-            expr_ty returns;
-        } FunctionDef;
-        
-        struct {
-            identifier name;
-            arguments_ty args;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-            expr_ty returns;
-        } AsyncFunctionDef;
-        
-        struct {
-            identifier name;
-            asdl_seq *bases;
-            asdl_seq *keywords;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-        } ClassDef;
-        
-        struct {
-            expr_ty value;
-        } Return;
-        
-        struct {
-            asdl_seq *targets;
-        } Delete;
-        
-        struct {
-            asdl_seq *targets;
-            expr_ty value;
-        } Assign;
-        
-        struct {
-            expr_ty target;
-            operator_ty op;
-            expr_ty value;
-        } AugAssign;
-        
-        struct {
-            expr_ty target;
-            expr_ty annotation;
-            expr_ty value;
-            int simple;
-        } AnnAssign;
-        
-        struct {
-            expr_ty target;
-            expr_ty iter;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } For;
-        
-        struct {
-            expr_ty target;
-            expr_ty iter;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } AsyncFor;
-        
-        struct {
-            expr_ty test;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } While;
-        
-        struct {
-            expr_ty test;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } If;
-        
-        struct {
-            asdl_seq *items;
-            asdl_seq *body;
-        } With;
-        
-        struct {
-            asdl_seq *items;
-            asdl_seq *body;
-        } AsyncWith;
-        
-        struct {
-            expr_ty exc;
-            expr_ty cause;
-        } Raise;
-        
-        struct {
-            asdl_seq *body;
-            asdl_seq *handlers;
-            asdl_seq *orelse;
-            asdl_seq *finalbody;
-        } Try;
-        
-        struct {
-            expr_ty test;
-            expr_ty msg;
-        } Assert;
-        
-        struct {
-            asdl_seq *names;
-        } Import;
-        
-        struct {
-            identifier module;
-            asdl_seq *names;
-            int level;
-        } ImportFrom;
-        
-        struct {
-            asdl_seq *names;
-        } Global;
-        
-        struct {
-            asdl_seq *names;
-        } Nonlocal;
-        
-        struct {
-            expr_ty value;
-        } Expr;
-        
-    } v;
-    int lineno;
-    int col_offset;
-};
-
-enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4,
-                  IfExp_kind=5, Dict_kind=6, Set_kind=7, ListComp_kind=8,
-                  SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11,
-                  Await_kind=12, Yield_kind=13, YieldFrom_kind=14,
-                  Compare_kind=15, Call_kind=16, Num_kind=17, Str_kind=18,
-                  FormattedValue_kind=19, JoinedStr_kind=20, Bytes_kind=21,
-                  NameConstant_kind=22, Ellipsis_kind=23, Constant_kind=24,
-                  Attribute_kind=25, Subscript_kind=26, Starred_kind=27,
-                  Name_kind=28, List_kind=29, Tuple_kind=30};
-struct _expr {
-    enum _expr_kind kind;
-    union {
-        struct {
-            boolop_ty op;
-            asdl_seq *values;
-        } BoolOp;
-        
-        struct {
-            expr_ty left;
-            operator_ty op;
-            expr_ty right;
-        } BinOp;
-        
-        struct {
-            unaryop_ty op;
-            expr_ty operand;
-        } UnaryOp;
-        
-        struct {
-            arguments_ty args;
-            expr_ty body;
-        } Lambda;
-        
-        struct {
-            expr_ty test;
-            expr_ty body;
-            expr_ty orelse;
-        } IfExp;
-        
-        struct {
-            asdl_seq *keys;
-            asdl_seq *values;
-        } Dict;
-        
-        struct {
-            asdl_seq *elts;
-        } Set;
-        
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } ListComp;
-        
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } SetComp;
-        
-        struct {
-            expr_ty key;
-            expr_ty value;
-            asdl_seq *generators;
-        } DictComp;
-        
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } GeneratorExp;
-        
-        struct {
-            expr_ty value;
-        } Await;
-        
-        struct {
-            expr_ty value;
-        } Yield;
-        
-        struct {
-            expr_ty value;
-        } YieldFrom;
-        
-        struct {
-            expr_ty left;
-            asdl_int_seq *ops;
-            asdl_seq *comparators;
-        } Compare;
-        
-        struct {
-            expr_ty func;
-            asdl_seq *args;
-            asdl_seq *keywords;
-        } Call;
-        
-        struct {
-            object n;
-        } Num;
-        
-        struct {
-            string s;
-        } Str;
-        
-        struct {
-            expr_ty value;
-            int conversion;
-            expr_ty format_spec;
-        } FormattedValue;
-        
-        struct {
-            asdl_seq *values;
-        } JoinedStr;
-        
-        struct {
-            bytes s;
-        } Bytes;
-        
-        struct {
-            singleton value;
-        } NameConstant;
-        
-        struct {
-            constant value;
-        } Constant;
-        
-        struct {
-            expr_ty value;
-            identifier attr;
-            expr_context_ty ctx;
-        } Attribute;
-        
-        struct {
-            expr_ty value;
-            slice_ty slice;
-            expr_context_ty ctx;
-        } Subscript;
-        
-        struct {
-            expr_ty value;
-            expr_context_ty ctx;
-        } Starred;
-        
-        struct {
-            identifier id;
-            expr_context_ty ctx;
-        } Name;
-        
-        struct {
-            asdl_seq *elts;
-            expr_context_ty ctx;
-        } List;
-        
-        struct {
-            asdl_seq *elts;
-            expr_context_ty ctx;
-        } Tuple;
-        
-    } v;
-    int lineno;
-    int col_offset;
-};
-
-enum _slice_kind {Slice_kind=1, ExtSlice_kind=2, Index_kind=3};
-struct _slice {
-    enum _slice_kind kind;
-    union {
-        struct {
-            expr_ty lower;
-            expr_ty upper;
-            expr_ty step;
-        } Slice;
-        
-        struct {
-            asdl_seq *dims;
-        } ExtSlice;
-        
-        struct {
-            expr_ty value;
-        } Index;
-        
-    } v;
-};
-
-struct _comprehension {
-    expr_ty target;
-    expr_ty iter;
-    asdl_seq *ifs;
-    int is_async;
-};
-
-enum _excepthandler_kind {ExceptHandler_kind=1};
-struct _excepthandler {
-    enum _excepthandler_kind kind;
-    union {
-        struct {
-            expr_ty type;
-            identifier name;
-            asdl_seq *body;
-        } ExceptHandler;
-        
-    } v;
-    int lineno;
-    int col_offset;
-};
-
-struct _arguments {
-    asdl_seq *args;
-    arg_ty vararg;
-    asdl_seq *kwonlyargs;
-    asdl_seq *kw_defaults;
-    arg_ty kwarg;
-    asdl_seq *defaults;
-};
-
-struct _arg {
-    identifier arg;
-    expr_ty annotation;
-    int lineno;
-    int col_offset;
-};
-
-struct _keyword {
-    identifier arg;
-    expr_ty value;
-};
-
-struct _alias {
-    identifier name;
-    identifier asname;
-};
-
-struct _withitem {
-    expr_ty context_expr;
-    expr_ty optional_vars;
-};
-
-
-#define Module(a0, a1) _Py_Module(a0, a1)
-mod_ty _Py_Module(asdl_seq * body, PyArena *arena);
-#define Interactive(a0, a1) _Py_Interactive(a0, a1)
-mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena);
-#define Expression(a0, a1) _Py_Expression(a0, a1)
-mod_ty _Py_Expression(expr_ty body, PyArena *arena);
-#define Suite(a0, a1) _Py_Suite(a0, a1)
-mod_ty _Py_Suite(asdl_seq * body, PyArena *arena);
-#define FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
-                        asdl_seq * decorator_list, expr_ty returns, int lineno,
-                        int col_offset, PyArena *arena);
-#define AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_AsyncFunctionDef(identifier name, arguments_ty args, asdl_seq *
-                             body, asdl_seq * decorator_list, expr_ty returns,
-                             int lineno, int col_offset, PyArena *arena);
-#define ClassDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * keywords,
-                     asdl_seq * body, asdl_seq * decorator_list, int lineno,
-                     int col_offset, PyArena *arena);
-#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3)
-stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3)
-stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena
-                   *arena);
-#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4)
-stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int
-                   col_offset, PyArena *arena);
-#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int
-                      lineno, int col_offset, PyArena *arena);
-#define AnnAssign(a0, a1, a2, a3, a4, a5, a6) _Py_AnnAssign(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int
-                      simple, int lineno, int col_offset, PyArena *arena);
-#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                orelse, int lineno, int col_offset, PyArena *arena);
-#define AsyncFor(a0, a1, a2, a3, a4, a5, a6) _Py_AsyncFor(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_AsyncFor(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                     orelse, int lineno, int col_offset, PyArena *arena);
-#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-                  int col_offset, PyArena *arena);
-#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-               int col_offset, PyArena *arena);
-#define With(a0, a1, a2, a3, a4) _Py_With(a0, a1, a2, a3, a4)
-stmt_ty _Py_With(asdl_seq * items, asdl_seq * body, int lineno, int col_offset,
-                 PyArena *arena);
-#define AsyncWith(a0, a1, a2, a3, a4) _Py_AsyncWith(a0, a1, a2, a3, a4)
-stmt_ty _Py_AsyncWith(asdl_seq * items, asdl_seq * body, int lineno, int
-                      col_offset, PyArena *arena);
-#define Raise(a0, a1, a2, a3, a4) _Py_Raise(a0, a1, a2, a3, a4)
-stmt_ty _Py_Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset,
-                  PyArena *arena);
-#define Try(a0, a1, a2, a3, a4, a5, a6) _Py_Try(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_Try(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse,
-                asdl_seq * finalbody, int lineno, int col_offset, PyArena
-                *arena);
-#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4)
-stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset,
-                   PyArena *arena);
-#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3)
-stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena
-                   *arena);
-#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int
-                       lineno, int col_offset, PyArena *arena);
-#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3)
-stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena
-                   *arena);
-#define Nonlocal(a0, a1, a2, a3) _Py_Nonlocal(a0, a1, a2, a3)
-stmt_ty _Py_Nonlocal(asdl_seq * names, int lineno, int col_offset, PyArena
-                     *arena);
-#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3)
-stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2)
-stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena);
-#define Break(a0, a1, a2) _Py_Break(a0, a1, a2)
-stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena);
-#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2)
-stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena);
-#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4)
-expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
-                   PyArena *arena);
-#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
-                  col_offset, PyArena *arena);
-#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4)
-expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
-                    PyArena *arena);
-#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4)
-expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
-                   PyArena *arena);
-#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
-                  col_offset, PyArena *arena);
-#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4)
-expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int
-                 col_offset, PyArena *arena);
-#define Set(a0, a1, a2, a3) _Py_Set(a0, a1, a2, a3)
-expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena);
-#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4)
-expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                     col_offset, PyArena *arena);
-#define SetComp(a0, a1, a2, a3, a4) _Py_SetComp(a0, a1, a2, a3, a4)
-expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                    col_offset, PyArena *arena);
-#define DictComp(a0, a1, a2, a3, a4, a5) _Py_DictComp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int
-                     lineno, int col_offset, PyArena *arena);
-#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4)
-expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
-                         col_offset, PyArena *arena);
-#define Await(a0, a1, a2, a3) _Py_Await(a0, a1, a2, a3)
-expr_ty _Py_Await(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3)
-expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define YieldFrom(a0, a1, a2, a3) _Py_YieldFrom(a0, a1, a2, a3)
-expr_ty _Py_YieldFrom(expr_ty value, int lineno, int col_offset, PyArena
-                      *arena);
-#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators,
-                    int lineno, int col_offset, PyArena *arena);
-#define Call(a0, a1, a2, a3, a4, a5) _Py_Call(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, int
-                 lineno, int col_offset, PyArena *arena);
-#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3)
-expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena);
-#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3)
-expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena);
-#define FormattedValue(a0, a1, a2, a3, a4, a5) _Py_FormattedValue(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_FormattedValue(expr_ty value, int conversion, expr_ty format_spec,
-                           int lineno, int col_offset, PyArena *arena);
-#define JoinedStr(a0, a1, a2, a3) _Py_JoinedStr(a0, a1, a2, a3)
-expr_ty _Py_JoinedStr(asdl_seq * values, int lineno, int col_offset, PyArena
-                      *arena);
-#define Bytes(a0, a1, a2, a3) _Py_Bytes(a0, a1, a2, a3)
-expr_ty _Py_Bytes(bytes s, int lineno, int col_offset, PyArena *arena);
-#define NameConstant(a0, a1, a2, a3) _Py_NameConstant(a0, a1, a2, a3)
-expr_ty _Py_NameConstant(singleton value, int lineno, int col_offset, PyArena
-                         *arena);
-#define Ellipsis(a0, a1, a2) _Py_Ellipsis(a0, a1, a2)
-expr_ty _Py_Ellipsis(int lineno, int col_offset, PyArena *arena);
-#define Constant(a0, a1, a2, a3) _Py_Constant(a0, a1, a2, a3)
-expr_ty _Py_Constant(constant value, int lineno, int col_offset, PyArena
-                     *arena);
-#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
-                      lineno, int col_offset, PyArena *arena);
-#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
-                      lineno, int col_offset, PyArena *arena);
-#define Starred(a0, a1, a2, a3, a4) _Py_Starred(a0, a1, a2, a3, a4)
-expr_ty _Py_Starred(expr_ty value, expr_context_ty ctx, int lineno, int
-                    col_offset, PyArena *arena);
-#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4)
-expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int
-                 col_offset, PyArena *arena);
-#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4)
-expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                 col_offset, PyArena *arena);
-#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4)
-expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                  col_offset, PyArena *arena);
-#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3)
-slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena);
-#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1)
-slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena);
-#define Index(a0, a1) _Py_Index(a0, a1)
-slice_ty _Py_Index(expr_ty value, PyArena *arena);
-#define comprehension(a0, a1, a2, a3, a4) _Py_comprehension(a0, a1, a2, a3, a4)
-comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
-                                   ifs, int is_async, PyArena *arena);
-#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5)
-excepthandler_ty _Py_ExceptHandler(expr_ty type, identifier name, asdl_seq *
-                                   body, int lineno, int col_offset, PyArena
-                                   *arena);
-#define arguments(a0, a1, a2, a3, a4, a5, a6) _Py_arguments(a0, a1, a2, a3, a4, a5, a6)
-arguments_ty _Py_arguments(asdl_seq * args, arg_ty vararg, asdl_seq *
-                           kwonlyargs, asdl_seq * kw_defaults, arg_ty kwarg,
-                           asdl_seq * defaults, PyArena *arena);
-#define arg(a0, a1, a2, a3, a4) _Py_arg(a0, a1, a2, a3, a4)
-arg_ty _Py_arg(identifier arg, expr_ty annotation, int lineno, int col_offset,
-               PyArena *arena);
-#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2)
-keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
-#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
-alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
-#define withitem(a0, a1, a2) _Py_withitem(a0, a1, a2)
-withitem_ty _Py_withitem(expr_ty context_expr, expr_ty optional_vars, PyArena
-                         *arena);
-
-PyObject* PyAST_mod2obj(mod_ty t);
-mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);
-int PyAST_Check(PyObject* obj);
diff --git a/dependencies2013/win32/include/python/Python.h b/dependencies2013/win32/include/python/Python.h
deleted file mode 100644
index 4c7c9a48..00000000
--- a/dependencies2013/win32/include/python/Python.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef Py_PYTHON_H
-#define Py_PYTHON_H
-/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
-
-/* Include nearly all Python header files */
-
-#include "patchlevel.h"
-#include "pyconfig.h"
-#include "pymacconfig.h"
-
-#include <limits.h>
-
-#ifndef UCHAR_MAX
-#error "Something's broken.  UCHAR_MAX should be defined in limits.h."
-#endif
-
-#if UCHAR_MAX != 255
-#error "Python's source code assumes C's unsigned char is an 8-bit type."
-#endif
-
-#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
-#define _SGI_MP_SOURCE
-#endif
-
-#include <stdio.h>
-#ifndef NULL
-#   error "Python.h requires that stdio.h define NULL."
-#endif
-
-#include <string.h>
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-/* For size_t? */
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-/* CAUTION:  Build setups should ensure that NDEBUG is defined on the
- * compiler command line when building Python in release mode; else
- * assert() calls won't be removed.
- */
-#include <assert.h>
-
-#include "pyport.h"
-#include "pymacro.h"
-
-#include "pyatomic.h"
-
-/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
- *  PYMALLOC_DEBUG is in error if pymalloc is not in use.
- */
-#if defined(Py_DEBUG) && defined(WITH_PYMALLOC) && !defined(PYMALLOC_DEBUG)
-#define PYMALLOC_DEBUG
-#endif
-#if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC)
-#error "PYMALLOC_DEBUG requires WITH_PYMALLOC"
-#endif
-#include "pymath.h"
-#include "pytime.h"
-#include "pymem.h"
-
-#include "object.h"
-#include "objimpl.h"
-#include "typeslots.h"
-#include "pyhash.h"
-
-#include "pydebug.h"
-
-#include "bytearrayobject.h"
-#include "bytesobject.h"
-#include "unicodeobject.h"
-#include "longobject.h"
-#include "longintrepr.h"
-#include "boolobject.h"
-#include "floatobject.h"
-#include "complexobject.h"
-#include "rangeobject.h"
-#include "memoryobject.h"
-#include "tupleobject.h"
-#include "listobject.h"
-#include "dictobject.h"
-#include "odictobject.h"
-#include "enumobject.h"
-#include "setobject.h"
-#include "methodobject.h"
-#include "moduleobject.h"
-#include "funcobject.h"
-#include "classobject.h"
-#include "fileobject.h"
-#include "pycapsule.h"
-#include "traceback.h"
-#include "sliceobject.h"
-#include "cellobject.h"
-#include "iterobject.h"
-#include "genobject.h"
-#include "descrobject.h"
-#include "warnings.h"
-#include "weakrefobject.h"
-#include "structseq.h"
-#include "namespaceobject.h"
-
-#include "codecs.h"
-#include "pyerrors.h"
-
-#include "pystate.h"
-
-#include "pyarena.h"
-#include "modsupport.h"
-#include "pythonrun.h"
-#include "pylifecycle.h"
-#include "ceval.h"
-#include "sysmodule.h"
-#include "osmodule.h"
-#include "intrcheck.h"
-#include "import.h"
-
-#include "abstract.h"
-#include "bltinmodule.h"
-
-#include "compile.h"
-#include "eval.h"
-
-#include "pyctype.h"
-#include "pystrtod.h"
-#include "pystrcmp.h"
-#include "dtoa.h"
-#include "fileutils.h"
-#include "pyfpe.h"
-
-#endif /* !Py_PYTHON_H */
diff --git a/dependencies2013/win32/include/python/abstract.h b/dependencies2013/win32/include/python/abstract.h
deleted file mode 100644
index 6bb76ec9..00000000
--- a/dependencies2013/win32/include/python/abstract.h
+++ /dev/null
@@ -1,1377 +0,0 @@
-#ifndef Py_ABSTRACTOBJECT_H
-#define Py_ABSTRACTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef PY_SSIZE_T_CLEAN
-#define PyObject_CallFunction _PyObject_CallFunction_SizeT
-#define PyObject_CallMethod _PyObject_CallMethod_SizeT
-#ifndef Py_LIMITED_API
-#define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT
-#endif /* !Py_LIMITED_API */
-#endif
-
-/* Abstract Object Interface (many thanks to Jim Fulton) */
-
-/*
-   PROPOSAL: A Generic Python Object Interface for Python C Modules
-
-Problem
-
-  Python modules written in C that must access Python objects must do
-  so through routines whose interfaces are described by a set of
-  include files.  Unfortunately, these routines vary according to the
-  object accessed.  To use these routines, the C programmer must check
-  the type of the object being used and must call a routine based on
-  the object type.  For example, to access an element of a sequence,
-  the programmer must determine whether the sequence is a list or a
-  tuple:
-
-    if(is_tupleobject(o))
-      e=gettupleitem(o,i)
-    else if(is_listitem(o))
-      e=getlistitem(o,i)
-
-  If the programmer wants to get an item from another type of object
-  that provides sequence behavior, there is no clear way to do it
-  correctly.
-
-  The persistent programmer may peruse object.h and find that the
-  _typeobject structure provides a means of invoking up to (currently
-  about) 41 special operators.  So, for example, a routine can get an
-  item from any object that provides sequence behavior. However, to
-  use this mechanism, the programmer must make their code dependent on
-  the current Python implementation.
-
-  Also, certain semantics, especially memory management semantics, may
-  differ by the type of object being used.  Unfortunately, these
-  semantics are not clearly described in the current include files.
-  An abstract interface providing more consistent semantics is needed.
-
-Proposal
-
-  I propose the creation of a standard interface (with an associated
-  library of routines and/or macros) for generically obtaining the
-  services of Python objects.  This proposal can be viewed as one
-  components of a Python C interface consisting of several components.
-
-  From the viewpoint of C access to Python services, we have (as
-  suggested by Guido in off-line discussions):
-
-  - "Very high level layer": two or three functions that let you exec or
-    eval arbitrary Python code given as a string in a module whose name is
-    given, passing C values in and getting C values out using
-    mkvalue/getargs style format strings.  This does not require the user
-    to declare any variables of type "PyObject *".  This should be enough
-    to write a simple application that gets Python code from the user,
-    execs it, and returns the output or errors.  (Error handling must also
-    be part of this API.)
-
-  - "Abstract objects layer": which is the subject of this proposal.
-    It has many functions operating on objects, and lest you do many
-    things from C that you can also write in Python, without going
-    through the Python parser.
-
-  - "Concrete objects layer": This is the public type-dependent
-    interface provided by the standard built-in types, such as floats,
-    strings, and lists.  This interface exists and is currently
-    documented by the collection of include files provided with the
-    Python distributions.
-
-  From the point of view of Python accessing services provided by C
-  modules:
-
-  - "Python module interface": this interface consist of the basic
-    routines used to define modules and their members.  Most of the
-    current extensions-writing guide deals with this interface.
-
-  - "Built-in object interface": this is the interface that a new
-    built-in type must provide and the mechanisms and rules that a
-    developer of a new built-in type must use and follow.
-
-  This proposal is a "first-cut" that is intended to spur
-  discussion. See especially the lists of notes.
-
-  The Python C object interface will provide four protocols: object,
-  numeric, sequence, and mapping.  Each protocol consists of a
-  collection of related operations.  If an operation that is not
-  provided by a particular type is invoked, then a standard exception,
-  NotImplementedError is raised with an operation name as an argument.
-  In addition, for convenience this interface defines a set of
-  constructors for building objects of built-in types.  This is needed
-  so new objects can be returned from C functions that otherwise treat
-  objects generically.
-
-Memory Management
-
-  For all of the functions described in this proposal, if a function
-  retains a reference to a Python object passed as an argument, then the
-  function will increase the reference count of the object.  It is
-  unnecessary for the caller to increase the reference count of an
-  argument in anticipation of the object's retention.
-
-  All Python objects returned from functions should be treated as new
-  objects.  Functions that return objects assume that the caller will
-  retain a reference and the reference count of the object has already
-  been incremented to account for this fact.  A caller that does not
-  retain a reference to an object that is returned from a function
-  must decrement the reference count of the object (using
-  DECREF(object)) to prevent memory leaks.
-
-  Note that the behavior mentioned here is different from the current
-  behavior for some objects (e.g. lists and tuples) when certain
-  type-specific routines are called directly (e.g. setlistitem).  The
-  proposed abstraction layer will provide a consistent memory
-  management interface, correcting for inconsistent behavior for some
-  built-in types.
-
-Protocols
-
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
-
-/*  Object Protocol: */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Print(PyObject *o, FILE *fp, int flags);
-
-     Print an object, o, on file, fp.  Returns -1 on
-     error.  The flags argument is used to enable certain printing
-     options. The only option currently supported is Py_Print_RAW.
-
-     (What should be said about Py_Print_RAW?)
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_HasAttrString(PyObject *o, const char *attr_name);
-
-     Returns 1 if o has the attribute attr_name, and 0 otherwise.
-     This is equivalent to the Python expression:
-     hasattr(o,attr_name).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject* PyObject_GetAttrString(PyObject *o, const char *attr_name);
-
-     Retrieve an attributed named attr_name form object o.
-     Returns the attribute value on success, or NULL on failure.
-     This is the equivalent of the Python expression: o.attr_name.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
-
-     Returns 1 if o has the attribute attr_name, and 0 otherwise.
-     This is equivalent to the Python expression:
-     hasattr(o,attr_name).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
-
-     Retrieve an attributed named attr_name form object o.
-     Returns the attribute value on success, or NULL on failure.
-     This is the equivalent of the Python expression: o.attr_name.
-
-       */
-
-
-     /* Implemented elsewhere:
-
-     int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v);
-
-     Set the value of the attribute named attr_name, for object o,
-     to the value v. Raise an exception and return -1 on failure; return 0 on
-     success.  This is the equivalent of the Python statement o.attr_name=v.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
-
-     Set the value of the attribute named attr_name, for object o,
-     to the value v. Raise an exception and return -1 on failure; return 0 on
-     success.  This is the equivalent of the Python statement o.attr_name=v.
-
-       */
-
-     /* implemented as a macro:
-
-     int PyObject_DelAttrString(PyObject *o, const char *attr_name);
-
-     Delete attribute named attr_name, for object o. Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: del o.attr_name.
-
-       */
-#define  PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL)
-
-     /* implemented as a macro:
-
-     int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
-
-     Delete attribute named attr_name, for object o. Returns -1
-     on failure.  This is the equivalent of the Python
-     statement: del o.attr_name.
-
-       */
-#define  PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL)
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Repr(PyObject *o);
-
-     Compute the string representation of object, o.  Returns the
-     string representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: repr(o).
-
-     Called by the repr() built-in function.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Str(PyObject *o);
-
-     Compute the string representation of object, o.  Returns the
-     string representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: str(o).)
-
-     Called by the str() and print() built-in functions.
-
-       */
-
-       /* Declared elsewhere
-
-     PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
-
-     Determine if the object, o, is callable.  Return 1 if the
-     object is callable and 0 otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object,
-                                          PyObject *args, PyObject *kwargs);
-
-       /*
-     Call a callable Python object, callable_object, with
-     arguments and keywords arguments.  The 'args' argument can not be
-     NULL.
-       */
-
-#ifndef Py_LIMITED_API
-    PyAPI_FUNC(PyObject*) _PyStack_AsTuple(
-        PyObject **stack,
-        Py_ssize_t nargs);
-
-    /* Convert keyword arguments from the (stack, kwnames) format to a Python
-       dictionary.
-
-       kwnames must only contains str strings, no subclass, and all keys must
-       be unique. kwnames is not checked, usually these checks are done before or later
-       calling _PyStack_AsDict(). For example, _PyArg_ParseStack() raises an
-       error if a key is not a string. */
-    PyAPI_FUNC(PyObject *) _PyStack_AsDict(
-        PyObject **values,
-        PyObject *kwnames);
-
-    /* Convert (args, nargs, kwargs: dict) into (stack, nargs, kwnames: tuple).
-
-       Return 0 on success, raise an exception and return -1 on error.
-
-       Write the new stack into *p_stack. If *p_stack is differen than args, it
-       must be released by PyMem_Free().
-
-       The stack uses borrowed references.
-
-       The type of keyword keys is not checked, these checks should be done
-       later (ex: _PyArg_ParseStackAndKeywords). */
-    PyAPI_FUNC(int) _PyStack_UnpackDict(
-        PyObject **args,
-        Py_ssize_t nargs,
-        PyObject *kwargs,
-        PyObject ***p_stack,
-        PyObject **p_kwnames);
-
-    /* Call the callable object func with the "fast call" calling convention:
-       args is a C array for positional arguments (nargs is the number of
-       positional arguments), kwargs is a dictionary for keyword arguments.
-
-       If nargs is equal to zero, args can be NULL. kwargs can be NULL.
-       nargs must be greater or equal to zero.
-
-       Return the result on success. Raise an exception on return NULL on
-       error. */
-    PyAPI_FUNC(PyObject *) _PyObject_FastCallDict(PyObject *func,
-                                                  PyObject **args, Py_ssize_t nargs,
-                                                  PyObject *kwargs);
-
-    /* Call the callable object func with the "fast call" calling convention:
-       args is a C array for positional arguments followed by values of
-       keyword arguments. Keys of keyword arguments are stored as a tuple
-       of strings in kwnames. nargs is the number of positional parameters at
-       the beginning of stack. The size of kwnames gives the number of keyword
-       values in the stack after positional arguments.
-
-       kwnames must only contains str strings, no subclass, and all keys must
-       be unique.
-
-       If nargs is equal to zero and there is no keyword argument (kwnames is
-       NULL or its size is zero), args can be NULL.
-
-       Return the result on success. Raise an exception and return NULL on
-       error. */
-    PyAPI_FUNC(PyObject *) _PyObject_FastCallKeywords
-       (PyObject *func,
-        PyObject **args,
-        Py_ssize_t nargs,
-        PyObject *kwnames);
-
-#define _PyObject_FastCall(func, args, nargs) \
-    _PyObject_FastCallDict((func), (args), (nargs), NULL)
-
-#define _PyObject_CallNoArg(func) \
-    _PyObject_FastCall((func), NULL, 0)
-
-#define _PyObject_CallArg1(func, arg) \
-    _PyObject_FastCall((func), &(arg), 1)
-
-    PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(PyObject *func,
-                                                  PyObject *obj, PyObject *args,
-                                                  PyObject *kwargs);
-
-     PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(PyObject *func,
-                                                    PyObject *result,
-                                                    const char *where);
-#endif   /* Py_LIMITED_API */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object,
-                                                PyObject *args);
-
-       /*
-     Call a callable Python object, callable_object, with
-     arguments given by the tuple, args.  If no arguments are
-     needed, then args may be NULL.  Returns the result of the
-     call on success, or NULL on failure.  This is the equivalent
-     of the Python expression: o(*args).
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object,
-                                                  const char *format, ...);
-
-       /*
-     Call a callable Python object, callable_object, with a
-     variable number of C arguments. The C arguments are described
-     using a mkvalue-style format string. The format may be NULL,
-     indicating that no arguments are provided.  Returns the
-     result of the call on success, or NULL on failure.  This is
-     the equivalent of the Python expression: o(*args).
-       */
-
-
-     PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o,
-                                                const char *method,
-                                                const char *format, ...);
-
-       /*
-     Call the method named m of object o with a variable number of
-     C arguments.  The C arguments are described by a mkvalue
-     format string.  The format may be NULL, indicating that no
-     arguments are provided. Returns the result of the call on
-     success, or NULL on failure.  This is the equivalent of the
-     Python expression: o.method(args).
-       */
-
-#ifndef Py_LIMITED_API
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o,
-                                                   _Py_Identifier *method,
-                                                   const char *format, ...);
-
-       /*
-         Like PyObject_CallMethod, but expect a _Py_Identifier* as the
-         method name.
-       */
-#endif /* !Py_LIMITED_API */
-
-     PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
-                                                         const char *format,
-                                                         ...);
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o,
-                                                       const char *name,
-                                                       const char *format,
-                                                       ...);
-#ifndef Py_LIMITED_API
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *o,
-                                                       _Py_Identifier *name,
-                                                       const char *format,
-                                                       ...);
-#endif /* !Py_LIMITED_API */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
-                                                         ...);
-
-       /*
-     Call a callable Python object, callable_object, with a
-     variable number of C arguments.  The C arguments are provided
-     as PyObject * values, terminated by a NULL.  Returns the
-     result of the call on success, or NULL on failure.  This is
-     the equivalent of the Python expression: o(*args).
-       */
-
-
-     PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
-                                                       PyObject *method, ...);
-#ifndef Py_LIMITED_API
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o,
-                                               struct _Py_Identifier *method,
-                                               ...);
-#endif /* !Py_LIMITED_API */
-
-       /*
-     Call the method named m of object o with a variable number of
-     C arguments.  The C arguments are provided as PyObject *
-     values, terminated by NULL.  Returns the result of the call
-     on success, or NULL on failure.  This is the equivalent of
-     the Python expression: o.method(args).
-       */
-
-
-     /* Implemented elsewhere:
-
-     long PyObject_Hash(PyObject *o);
-
-     Compute and return the hash, hash_value, of an object, o.  On
-     failure, return -1.  This is the equivalent of the Python
-     expression: hash(o).
-       */
-
-
-     /* Implemented elsewhere:
-
-     int PyObject_IsTrue(PyObject *o);
-
-     Returns 1 if the object, o, is considered to be true, 0 if o is
-     considered to be false and -1 on failure. This is equivalent to the
-     Python expression: not not o
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Not(PyObject *o);
-
-     Returns 0 if the object, o, is considered to be true, 1 if o is
-     considered to be false and -1 on failure. This is equivalent to the
-     Python expression: not o
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o);
-
-       /*
-     On success, returns a type object corresponding to the object
-     type of object o. On failure, returns NULL.  This is
-     equivalent to the Python expression: type(o).
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o);
-
-       /*
-     Return the size of object o.  If the object, o, provides
-     both sequence and mapping protocols, the sequence size is
-     returned. On error, -1 is returned.  This is the equivalent
-     to the Python expression: len(o).
-       */
-
-       /* For DLL compatibility */
-#undef PyObject_Length
-     PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
-#define PyObject_Length PyObject_Size
-
-#ifndef Py_LIMITED_API
-     PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
-     PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t);
-#endif
-
-       /*
-     Guess the size of object o using len(o) or o.__length_hint__().
-     If neither of those return a non-negative value, then return the
-     default value.  If one of the calls fails, this function returns -1.
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);
-
-       /*
-     Return element of o corresponding to the object, key, or NULL
-     on failure. This is the equivalent of the Python expression:
-     o[key].
-       */
-
-     PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
-
-       /*
-     Map the object key to the value v.  Raise an exception and return -1
-     on failure; return 0 on success.  This is the equivalent of the Python
-     statement o[key]=v.
-       */
-
-     PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key);
-
-       /*
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-
-     PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key);
-
-       /*
-     Delete the mapping for key from *o.  Returns -1 on failure.
-     This is the equivalent of the Python statement: del o[key].
-       */
-
-    /* old buffer API
-       FIXME:  usage of these should all be replaced in Python itself
-       but for backwards compatibility we will implement them.
-       Their usage without a corresponding "unlock" mechanism
-       may create issues (but they would already be there). */
-
-     PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj,
-                                           const char **buffer,
-                                           Py_ssize_t *buffer_len);
-
-       /*
-      Takes an arbitrary object which must support the (character,
-      single segment) buffer interface and returns a pointer to a
-      read-only memory location useable as character based input
-      for subsequent processing.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs. Otherwise, -1 is returned and
-      an exception set.
-       */
-
-     PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj);
-
-      /*
-      Checks whether an arbitrary object supports the (character,
-      single segment) buffer interface.  Returns 1 on success, 0
-      on failure.
-      */
-
-     PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
-                                           const void **buffer,
-                                           Py_ssize_t *buffer_len);
-
-       /*
-      Same as PyObject_AsCharBuffer() except that this API expects
-      (readable, single segment) buffer interface and returns a
-      pointer to a read-only memory location which can contain
-      arbitrary data.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs.  Otherwise, -1 is returned and
-      an exception set.
-       */
-
-     PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj,
-                                            void **buffer,
-                                            Py_ssize_t *buffer_len);
-
-       /*
-      Takes an arbitrary object which must support the (writable,
-      single segment) buffer interface and returns a pointer to a
-      writable memory location in buffer of size buffer_len.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs. Otherwise, -1 is returned and
-      an exception set.
-       */
-
-    /* new buffer API */
-
-#ifndef Py_LIMITED_API
-#define PyObject_CheckBuffer(obj) \
-    (((obj)->ob_type->tp_as_buffer != NULL) &&  \
-     ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL))
-
-    /* Return 1 if the getbuffer function is available, otherwise
-       return 0 */
-
-     PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view,
-                                        int flags);
-
-    /* This is a C-API version of the getbuffer function call.  It checks
-       to make sure object has the required function pointer and issues the
-       call.  Returns -1 and raises an error on failure and returns 0 on
-       success
-    */
-
-
-     PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices);
-
-    /* Get the memory area pointed to by the indices for the buffer given.
-       Note that view->ndim is the assumed size of indices
-    */
-
-     PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *);
-
-    /* Return the implied itemsize of the data-format area from a
-       struct-style description */
-
-
-
-     /* Implementation in memoryobject.c */
-     PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view,
-                                           Py_ssize_t len, char order);
-
-     PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf,
-                                             Py_ssize_t len, char order);
-
-
-    /* Copy len bytes of data from the contiguous chunk of memory
-       pointed to by buf into the buffer exported by obj.  Return
-       0 on success and return -1 and raise a PyBuffer_Error on
-       error (i.e. the object does not have a buffer interface or
-       it is not working).
-
-       If fort is 'F', then if the object is multi-dimensional,
-       then the data will be copied into the array in
-       Fortran-style (first dimension varies the fastest).  If
-       fort is 'C', then the data will be copied into the array
-       in C-style (last dimension varies the fastest).  If fort
-       is 'A', then it does not matter and the copy will be made
-       in whatever way is more efficient.
-
-    */
-
-     PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src);
-
-    /* Copy the data from the src buffer to the buffer of destination
-     */
-
-     PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char fort);
-
-
-     PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
-                                                    Py_ssize_t *shape,
-                                                    Py_ssize_t *strides,
-                                                    int itemsize,
-                                                    char fort);
-
-    /*  Fill the strides array with byte-strides of a contiguous
-        (Fortran-style if fort is 'F' or C-style otherwise)
-        array of the given shape with the given number of bytes
-        per element.
-    */
-
-     PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf,
-                                       Py_ssize_t len, int readonly,
-                                       int flags);
-
-    /* Fills in a buffer-info structure correctly for an exporter
-       that can only share a contiguous chunk of memory of
-       "unsigned bytes" of the given length. Returns 0 on success
-       and -1 (with raising an error) on error.
-     */
-
-     PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
-
-       /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*.
-    */
-#endif /* Py_LIMITED_API */
-
-     PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj,
-                                            PyObject *format_spec);
-       /*
-     Takes an arbitrary object and returns the result of
-     calling obj.__format__(format_spec).
-       */
-
-/* Iterators */
-
-     PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
-     /* Takes an object and returns an iterator for it.
-    This is typically a new iterator but if the argument
-    is an iterator, this returns itself. */
-
-#define PyIter_Check(obj) \
-    ((obj)->ob_type->tp_iternext != NULL && \
-     (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented)
-
-     PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *);
-     /* Takes an iterator object and calls its tp_iternext slot,
-    returning the next value.  If the iterator is exhausted,
-    this returns NULL without setting an exception.
-    NULL with an exception means an error occurred. */
-
-/*  Number Protocol:*/
-
-     PyAPI_FUNC(int) PyNumber_Check(PyObject *o);
-
-       /*
-     Returns 1 if the object, o, provides numeric protocols, and
-     false otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of adding o1 and o2, or null on failure.
-     This is the equivalent of the Python expression: o1+o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of subtracting o2 from o1, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1-o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of multiplying o1 and o2, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1*o2.
-       */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-     PyAPI_FUNC(PyObject *) PyNumber_MatrixMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     This is the equivalent of the Python expression: o1 @ o2.
-       */
-#endif
-
-     PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving an integral result,
-     or null on failure.
-     This is the equivalent of the Python expression: o1//o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving a float result,
-     or null on failure.
-     This is the equivalent of the Python expression: o1/o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the remainder of dividing o1 by o2, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1%o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);
-
-       /*
-     See the built-in function divmod.  Returns NULL on failure.
-     This is the equivalent of the Python expression:
-     divmod(o1,o2).
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
-                                           PyObject *o3);
-
-       /*
-     See the built-in function pow.  Returns NULL on failure.
-     This is the equivalent of the Python expression:
-     pow(o1,o2,o3), where o3 is optional.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o);
-
-       /*
-     Returns the negation of o on success, or null on failure.
-     This is the equivalent of the Python expression: -o.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o);
-
-       /*
-     Returns the (what?) of o on success, or NULL on failure.
-     This is the equivalent of the Python expression: +o.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o);
-
-       /*
-     Returns the absolute value of o, or null on failure.  This is
-     the equivalent of the Python expression: abs(o).
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o);
-
-       /*
-     Returns the bitwise negation of o on success, or NULL on
-     failure.  This is the equivalent of the Python expression:
-     ~o.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of left shifting o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1 << o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of right shifting o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1 >> o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise and of o1 and o2 on success, or
-     NULL on failure. This is the equivalent of the Python
-     expression: o1&o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the bitwise exclusive or of o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1^o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise or on o1 and o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1|o2.
-       */
-
-#define PyIndex_Check(obj) \
-   ((obj)->ob_type->tp_as_number != NULL && \
-    (obj)->ob_type->tp_as_number->nb_index != NULL)
-
-     PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o);
-
-       /*
-     Returns the object converted to a Python int
-     or NULL with an error raised on failure.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc);
-
-       /*
-    Returns the object converted to Py_ssize_t by going through
-    PyNumber_Index first.  If an overflow error occurs while
-    converting the int to Py_ssize_t, then the second argument
-    is the error-type to return.  If it is NULL, then the overflow error
-    is cleared and the value is clipped.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
-
-       /*
-     Returns the o converted to an integer object on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: int(o).
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
-
-       /*
-     Returns the o converted to a float object on success, or NULL
-     on failure.  This is the equivalent of the Python expression:
-     float(o).
-       */
-
-/*  In-place variants of (some of) the above number protocol functions */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of adding o2 to o1, possibly in-place, or null
-     on failure.  This is the equivalent of the Python expression:
-     o1 += o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of subtracting o2 from o1, possibly in-place or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 -= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of multiplying o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 *= o2.
-       */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceMatrixMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     This is the equivalent of the Python expression: o1 @= o2.
-       */
-#endif
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1,
-                                                        PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving an integral result,
-     possibly in-place, or null on failure.
-     This is the equivalent of the Python expression:
-     o1 /= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1,
-                                                       PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving a float result,
-     possibly in-place, or null on failure.
-     This is the equivalent of the Python expression:
-     o1 /= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the remainder of dividing o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 %= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2,
-                                                  PyObject *o3);
-
-       /*
-     Returns the result of raising o1 to the power of o2, possibly
-     in-place, or null on failure.  This is the equivalent of the Python
-     expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of left shifting o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 <<= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of right shifting o1 by o2, possibly in-place or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 >>= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise and of o1 and o2, possibly in-place,
-     or null on failure. This is the equivalent of the Python
-     expression: o1 &= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the bitwise exclusive or of o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 ^= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise or of o1 and o2, possibly in-place,
-     or null on failure.  This is the equivalent of the Python
-     expression: o1 |= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);
-
-       /*
-     Returns the integer n converted to a string with a base, with a base
-     marker of 0b, 0o or 0x prefixed if applicable.
-     If n is not an int object, it is converted with PyNumber_Index first.
-       */
-
-
-/*  Sequence protocol:*/
-
-     PyAPI_FUNC(int) PySequence_Check(PyObject *o);
-
-       /*
-     Return 1 if the object provides sequence protocol, and zero
-     otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o);
-
-       /*
-     Return the size of sequence object o, or -1 on failure.
-       */
-
-       /* For DLL compatibility */
-#undef PySequence_Length
-     PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o);
-#define PySequence_Length PySequence_Size
-
-
-     PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
-
-       /*
-     Return the concatenation of o1 and o2 on success, and NULL on
-     failure.   This is the equivalent of the Python
-     expression: o1+o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count);
-
-       /*
-     Return the result of repeating sequence object o count times,
-     or NULL on failure.  This is the equivalent of the Python
-     expression: o1*count.
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i);
-
-       /*
-     Return the ith element of o, or NULL on failure. This is the
-     equivalent of the Python expression: o[i].
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-       /*
-     Return the slice of sequence object o between i1 and i2, or
-     NULL on failure. This is the equivalent of the Python
-     expression: o[i1:i2].
-       */
-
-     PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
-
-       /*
-     Assign object v to the ith element of o.  Raise an exception and return
-     -1 on failure; return 0 on success.  This is the equivalent of the
-     Python statement o[i]=v.
-       */
-
-     PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
-
-       /*
-     Delete the ith element of object v.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: del o[i].
-       */
-
-     PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2,
-                                         PyObject *v);
-
-       /*
-     Assign the sequence object, v, to the slice in sequence
-     object, o, from i1 to i2.  Returns -1 on failure. This is the
-     equivalent of the Python statement: o[i1:i2]=v.
-       */
-
-     PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-       /*
-     Delete the slice in sequence object, o, from i1 to i2.
-     Returns -1 on failure. This is the equivalent of the Python
-     statement: del o[i1:i2].
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o);
-
-       /*
-     Returns the sequence, o, as a tuple on success, and NULL on failure.
-     This is equivalent to the Python expression: tuple(o)
-       */
-
-
-     PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o);
-       /*
-     Returns the sequence, o, as a list on success, and NULL on failure.
-     This is equivalent to the Python expression: list(o)
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
-       /*
-     Return the sequence, o, as a list, unless it's already a
-     tuple or list.  Use PySequence_Fast_GET_ITEM to access the
-     members of this list, and PySequence_Fast_GET_SIZE to get its length.
-
-     Returns NULL on failure.  If the object does not support iteration,
-     raises a TypeError exception with m as the message text.
-       */
-
-#define PySequence_Fast_GET_SIZE(o) \
-    (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o))
-       /*
-     Return the size of o, assuming that o was returned by
-     PySequence_Fast and is not NULL.
-       */
-
-#define PySequence_Fast_GET_ITEM(o, i)\
-     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
-       /*
-     Return the ith element of o, assuming that o was returned by
-     PySequence_Fast, and that i is within bounds.
-       */
-
-#define PySequence_ITEM(o, i)\
-    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) )
-       /* Assume tp_as_sequence and sq_item exist and that i does not
-      need to be corrected for a negative index
-       */
-
-#define PySequence_Fast_ITEMS(sf) \
-    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
-                      : ((PyTupleObject *)(sf))->ob_item)
-    /* Return a pointer to the underlying item array for
-       an object retured by PySequence_Fast */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value);
-
-       /*
-     Return the number of occurrences on value on o, that is,
-     return the number of keys for which o[key]==value.  On
-     failure, return -1.  This is equivalent to the Python
-     expression: o.count(value).
-       */
-
-     PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob);
-       /*
-     Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
-     Use __contains__ if possible, else _PySequence_IterSearch().
-       */
-
-#ifndef Py_LIMITED_API
-#define PY_ITERSEARCH_COUNT    1
-#define PY_ITERSEARCH_INDEX    2
-#define PY_ITERSEARCH_CONTAINS 3
-     PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
-                                        PyObject *obj, int operation);
-#endif
-    /*
-      Iterate over seq.  Result depends on the operation:
-      PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if
-        error.
-      PY_ITERSEARCH_INDEX:  return 0-based index of first occurrence of
-        obj in seq; set ValueError and return -1 if none found;
-        also return -1 on error.
-      PY_ITERSEARCH_CONTAINS:  return 1 if obj in seq, else 0; -1 on
-        error.
-    */
-
-/* For DLL-level backwards compatibility */
-#undef PySequence_In
-     PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value);
-
-/* For source-level backwards compatibility */
-#define PySequence_In PySequence_Contains
-
-       /*
-     Determine if o contains value.  If an item in o is equal to
-     X, return 1, otherwise return 0.  On error, return -1.  This
-     is equivalent to the Python expression: value in o.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value);
-
-       /*
-     Return the first index for which o[i]=value.  On error,
-     return -1.    This is equivalent to the Python
-     expression: o.index(value).
-       */
-
-/* In-place versions of some of the above Sequence functions. */
-
-     PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2);
-
-       /*
-     Append o2 to o1, in-place when possible. Return the resulting
-     object, which could be o1, or NULL on failure.  This is the
-     equivalent of the Python expression: o1 += o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count);
-
-       /*
-     Repeat o1 by count, in-place when possible. Return the resulting
-     object, which could be o1, or NULL on failure.  This is the
-     equivalent of the Python expression: o1 *= count.
-
-       */
-
-/*  Mapping protocol:*/
-
-     PyAPI_FUNC(int) PyMapping_Check(PyObject *o);
-
-       /*
-     Return 1 if the object provides mapping protocol, and zero
-     otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o);
-
-       /*
-     Returns the number of keys in object o on success, and -1 on
-     failure.  For objects that do not provide sequence protocol,
-     this is equivalent to the Python expression: len(o).
-       */
-
-       /* For DLL compatibility */
-#undef PyMapping_Length
-     PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o);
-#define PyMapping_Length PyMapping_Size
-
-
-     /* implemented as a macro:
-
-     int PyMapping_DelItemString(PyObject *o, const char *key);
-
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K))
-
-     /* implemented as a macro:
-
-     int PyMapping_DelItem(PyObject *o, PyObject *key);
-
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K))
-
-     PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, const char *key);
-
-       /*
-     On success, return 1 if the mapping object has the key, key,
-     and 0 otherwise.  This is equivalent to the Python expression:
-     key in o.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key);
-
-       /*
-     Return 1 if the mapping object has the key, key,
-     and 0 otherwise.  This is equivalent to the Python expression:
-     key in o.
-
-     This function always succeeds.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o);
-
-       /*
-     On success, return a list or tuple of the keys in object o.
-     On failure, return NULL.
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o);
-
-       /*
-     On success, return a list or tuple of the values in object o.
-     On failure, return NULL.
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o);
-
-       /*
-     On success, return a list or tuple of the items in object o,
-     where each item is a tuple containing a key-value pair.
-     On failure, return NULL.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o,
-                                                    const char *key);
-
-       /*
-     Return element of o corresponding to the object, key, or NULL
-     on failure. This is the equivalent of the Python expression:
-     o[key].
-       */
-
-     PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, const char *key,
-                                            PyObject *value);
-
-       /*
-     Map the object, key, to the value, v.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: o[key]=v.
-      */
-
-
-PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
-      /* isinstance(object, typeorclass) */
-
-PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
-      /* issubclass(object, typeorclass) */
-
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
-
-PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
-
-PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self);
-
-PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]);
-
-/* For internal use by buffer API functions */
-PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-#endif /* !Py_LIMITED_API */
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* Py_ABSTRACTOBJECT_H */
diff --git a/dependencies2013/win32/include/python/accu.h b/dependencies2013/win32/include/python/accu.h
deleted file mode 100644
index 3636ea6c..00000000
--- a/dependencies2013/win32/include/python/accu.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_ACCU_H
-#define Py_ACCU_H
-
-/*** This is a private API for use by the interpreter and the stdlib.
- *** Its definition may be changed or removed at any moment.
- ***/
-
-/*
- * A two-level accumulator of unicode objects that avoids both the overhead
- * of keeping a huge number of small separate objects, and the quadratic
- * behaviour of using a naive repeated concatenation scheme.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef small /* defined by some Windows headers */
-
-typedef struct {
-    PyObject *large;  /* A list of previously accumulated large strings */
-    PyObject *small;  /* Pending small strings */
-} _PyAccu;
-
-PyAPI_FUNC(int) _PyAccu_Init(_PyAccu *acc);
-PyAPI_FUNC(int) _PyAccu_Accumulate(_PyAccu *acc, PyObject *unicode);
-PyAPI_FUNC(PyObject *) _PyAccu_FinishAsList(_PyAccu *acc);
-PyAPI_FUNC(PyObject *) _PyAccu_Finish(_PyAccu *acc);
-PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* Py_ACCU_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/asdl.h b/dependencies2013/win32/include/python/asdl.h
deleted file mode 100644
index 35e9fa18..00000000
--- a/dependencies2013/win32/include/python/asdl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef Py_ASDL_H
-#define Py_ASDL_H
-
-typedef PyObject * identifier;
-typedef PyObject * string;
-typedef PyObject * bytes;
-typedef PyObject * object;
-typedef PyObject * singleton;
-typedef PyObject * constant;
-
-/* It would be nice if the code generated by asdl_c.py was completely
-   independent of Python, but it is a goal the requires too much work
-   at this stage.  So, for example, I'll represent identifiers as
-   interned Python strings.
-*/
-
-/* XXX A sequence should be typed so that its use can be typechecked. */
-
-typedef struct {
-    Py_ssize_t size;
-    void *elements[1];
-} asdl_seq;
-
-typedef struct {
-    Py_ssize_t size;
-    int elements[1];
-} asdl_int_seq;
-
-asdl_seq *_Py_asdl_seq_new(Py_ssize_t size, PyArena *arena);
-asdl_int_seq *_Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena);
-
-#define asdl_seq_GET(S, I) (S)->elements[(I)]
-#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size)
-#ifdef Py_DEBUG
-#define asdl_seq_SET(S, I, V) \
-    do { \
-        Py_ssize_t _asdl_i = (I); \
-        assert((S) != NULL); \
-        assert(_asdl_i < (S)->size); \
-        (S)->elements[_asdl_i] = (V); \
-    } while (0)
-#else
-#define asdl_seq_SET(S, I, V) (S)->elements[I] = (V)
-#endif
-
-#endif /* !Py_ASDL_H */
diff --git a/dependencies2013/win32/include/python/ast.h b/dependencies2013/win32/include/python/ast.h
deleted file mode 100644
index 6a8c8165..00000000
--- a/dependencies2013/win32/include/python/ast.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Py_AST_H
-#define Py_AST_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyAST_Validate(mod_ty);
-PyAPI_FUNC(mod_ty) PyAST_FromNode(
-    const node *n,
-    PyCompilerFlags *flags,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyArena *arena);
-PyAPI_FUNC(mod_ty) PyAST_FromNodeObject(
-    const node *n,
-    PyCompilerFlags *flags,
-    PyObject *filename,
-    PyArena *arena);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_AST_H */
diff --git a/dependencies2013/win32/include/python/bitset.h b/dependencies2013/win32/include/python/bitset.h
deleted file mode 100644
index faeb4191..00000000
--- a/dependencies2013/win32/include/python/bitset.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#ifndef Py_BITSET_H
-#define Py_BITSET_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Bitset interface */
-
-#define BYTE		char
-
-typedef BYTE *bitset;
-
-bitset newbitset(int nbits);
-void delbitset(bitset bs);
-#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0)
-int addbit(bitset bs, int ibit); /* Returns 0 if already set */
-int samebitset(bitset bs1, bitset bs2, int nbits);
-void mergebitset(bitset bs1, bitset bs2, int nbits);
-
-#define BITSPERBYTE	(8*sizeof(BYTE))
-#define NBYTES(nbits)	(((nbits) + BITSPERBYTE - 1) / BITSPERBYTE)
-
-#define BIT2BYTE(ibit)	((ibit) / BITSPERBYTE)
-#define BIT2SHIFT(ibit)	((ibit) % BITSPERBYTE)
-#define BIT2MASK(ibit)	(1 << BIT2SHIFT(ibit))
-#define BYTE2BIT(ibyte)	((ibyte) * BITSPERBYTE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BITSET_H */
diff --git a/dependencies2013/win32/include/python/bltinmodule.h b/dependencies2013/win32/include/python/bltinmodule.h
deleted file mode 100644
index 868c9e64..00000000
--- a/dependencies2013/win32/include/python/bltinmodule.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef Py_BLTINMODULE_H
-#define Py_BLTINMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyFilter_Type;
-PyAPI_DATA(PyTypeObject) PyMap_Type;
-PyAPI_DATA(PyTypeObject) PyZip_Type;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BLTINMODULE_H */
diff --git a/dependencies2013/win32/include/python/boolobject.h b/dependencies2013/win32/include/python/boolobject.h
deleted file mode 100644
index 7cc2f1fe..00000000
--- a/dependencies2013/win32/include/python/boolobject.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Boolean object interface */
-
-#ifndef Py_BOOLOBJECT_H
-#define Py_BOOLOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_DATA(PyTypeObject) PyBool_Type;
-
-#define PyBool_Check(x) (Py_TYPE(x) == &PyBool_Type)
-
-/* Py_False and Py_True are the only two bools in existence.
-Don't forget to apply Py_INCREF() when returning either!!! */
-
-/* Don't use these directly */
-PyAPI_DATA(struct _longobject) _Py_FalseStruct, _Py_TrueStruct;
-
-/* Use these macros */
-#define Py_False ((PyObject *) &_Py_FalseStruct)
-#define Py_True ((PyObject *) &_Py_TrueStruct)
-
-/* Macros for returning Py_True or Py_False, respectively */
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-
-/* Function to return a bool from a C long */
-PyAPI_FUNC(PyObject *) PyBool_FromLong(long);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BOOLOBJECT_H */
diff --git a/dependencies2013/win32/include/python/bytearrayobject.h b/dependencies2013/win32/include/python/bytearrayobject.h
deleted file mode 100644
index a757b880..00000000
--- a/dependencies2013/win32/include/python/bytearrayobject.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ByteArray object interface */
-
-#ifndef Py_BYTEARRAYOBJECT_H
-#define Py_BYTEARRAYOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-
-/* Type PyByteArrayObject represents a mutable array of bytes.
- * The Python API is that of a sequence;
- * the bytes are mapped to ints in [0, 256).
- * Bytes are not characters; they may be used to encode characters.
- * The only way to go between bytes and str/unicode is via encoding
- * and decoding.
- * For the convenience of C programmers, the bytes type is considered
- * to contain a char pointer, not an unsigned char pointer.
- */
-
-/* Object layout */
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_VAR_HEAD
-    Py_ssize_t ob_alloc; /* How many bytes allocated in ob_bytes */
-    char *ob_bytes;      /* Physical backing buffer */
-    char *ob_start;      /* Logical start inside ob_bytes */
-    /* XXX(nnorwitz): should ob_exports be Py_ssize_t? */
-    int ob_exports;      /* How many buffer exports */
-} PyByteArrayObject;
-#endif
-
-/* Type object */
-PyAPI_DATA(PyTypeObject) PyByteArray_Type;
-PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type;
-
-/* Type check macros */
-#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type)
-#define PyByteArray_CheckExact(self) (Py_TYPE(self) == &PyByteArray_Type)
-
-/* Direct API functions */
-PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t);
-PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *);
-PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *);
-PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
-
-/* Macros, trading safety for speed */
-#ifndef Py_LIMITED_API
-#define PyByteArray_AS_STRING(self) \
-    (assert(PyByteArray_Check(self)), \
-     Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_start : _PyByteArray_empty_string)
-#define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)), Py_SIZE(self))
-
-PyAPI_DATA(char) _PyByteArray_empty_string[];
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BYTEARRAYOBJECT_H */
diff --git a/dependencies2013/win32/include/python/bytes_methods.h b/dependencies2013/win32/include/python/bytes_methods.h
deleted file mode 100644
index 7fa7540c..00000000
--- a/dependencies2013/win32/include/python/bytes_methods.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_BYTES_CTYPE_H
-#define Py_BYTES_CTYPE_H
-
-/*
- * The internal implementation behind PyBytes (bytes) and PyByteArray (bytearray)
- * methods of the given names, they operate on ASCII byte strings.
- */
-extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len);
-
-/* These store their len sized answer in the given preallocated *result arg. */
-extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_title(char *result, const char *s, Py_ssize_t len);
-extern void _Py_bytes_capitalize(char *result, const char *s, Py_ssize_t len);
-extern void _Py_bytes_swapcase(char *result, const char *s, Py_ssize_t len);
-
-extern PyObject *_Py_bytes_find(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_index(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_rfind(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_rindex(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args);
-extern int _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg);
-extern PyObject *_Py_bytes_startswith(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_endswith(const char *str, Py_ssize_t len, PyObject *args);
-
-/* The maketrans() static method. */
-extern PyObject* _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to);
-
-/* Shared __doc__ strings. */
-extern const char _Py_isspace__doc__[];
-extern const char _Py_isalpha__doc__[];
-extern const char _Py_isalnum__doc__[];
-extern const char _Py_isdigit__doc__[];
-extern const char _Py_islower__doc__[];
-extern const char _Py_isupper__doc__[];
-extern const char _Py_istitle__doc__[];
-extern const char _Py_lower__doc__[];
-extern const char _Py_upper__doc__[];
-extern const char _Py_title__doc__[];
-extern const char _Py_capitalize__doc__[];
-extern const char _Py_swapcase__doc__[];
-extern const char _Py_count__doc__[];
-extern const char _Py_find__doc__[];
-extern const char _Py_index__doc__[];
-extern const char _Py_rfind__doc__[];
-extern const char _Py_rindex__doc__[];
-extern const char _Py_startswith__doc__[];
-extern const char _Py_endswith__doc__[];
-extern const char _Py_maketrans__doc__[];
-extern const char _Py_expandtabs__doc__[];
-extern const char _Py_ljust__doc__[];
-extern const char _Py_rjust__doc__[];
-extern const char _Py_center__doc__[];
-extern const char _Py_zfill__doc__[];
-
-/* this is needed because some docs are shared from the .o, not static */
-#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str)
-
-#endif /* !Py_BYTES_CTYPE_H */
-#endif /* !Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/bytesobject.h b/dependencies2013/win32/include/python/bytesobject.h
deleted file mode 100644
index 0f0bf9f3..00000000
--- a/dependencies2013/win32/include/python/bytesobject.h
+++ /dev/null
@@ -1,224 +0,0 @@
-
-/* Bytes (String) object interface */
-
-#ifndef Py_BYTESOBJECT_H
-#define Py_BYTESOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-
-/*
-Type PyBytesObject represents a character string.  An extra zero byte is
-reserved at the end to ensure it is zero-terminated, but a size is
-present so strings with null bytes in them can be represented.  This
-is an immutable object type.
-
-There are functions to create new string objects, to test
-an object for string-ness, and to get the
-string value.  The latter function returns a null pointer
-if the object is not of the proper type.
-There is a variant that takes an explicit size as well as a
-variant that assumes a zero-terminated string.  Note that none of the
-functions should be applied to nil objects.
-*/
-
-/* Caching the hash (ob_shash) saves recalculation of a string's hash value.
-   This significantly speeds up dict lookups. */
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_VAR_HEAD
-    Py_hash_t ob_shash;
-    char ob_sval[1];
-
-    /* Invariants:
-     *     ob_sval contains space for 'ob_size+1' elements.
-     *     ob_sval[ob_size] == 0.
-     *     ob_shash is the hash of the string or -1 if not computed yet.
-     */
-} PyBytesObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyBytes_Type;
-PyAPI_DATA(PyTypeObject) PyBytesIter_Type;
-
-#define PyBytes_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_BYTES_SUBCLASS)
-#define PyBytes_CheckExact(op) (Py_TYPE(op) == &PyBytes_Type)
-
-PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
-PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyBytes_FromFormatV(const char*, va_list)
-				Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
-PyAPI_FUNC(PyObject *) PyBytes_FromFormat(const char*, ...)
-				Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
-PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
-PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
-PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *);
-PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t);
-PyAPI_FUNC(PyObject*) _PyBytes_FormatEx(
-    const char *format,
-    Py_ssize_t format_len,
-    PyObject *args,
-    int use_bytearray);
-PyAPI_FUNC(PyObject*) _PyBytes_FromHex(
-    PyObject *string,
-    int use_bytearray);
-#endif
-PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
-						   const char *, Py_ssize_t,
-						   const char *);
-#ifndef Py_LIMITED_API
-/* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */
-PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t,
-                                             const char *, Py_ssize_t,
-                                             const char *,
-                                             const char **);
-#endif
-
-/* Macro, trading safety for speed */
-#ifndef Py_LIMITED_API
-#define PyBytes_AS_STRING(op) (assert(PyBytes_Check(op)), \
-                                (((PyBytesObject *)(op))->ob_sval))
-#define PyBytes_GET_SIZE(op)  (assert(PyBytes_Check(op)),Py_SIZE(op))
-#endif
-
-/* _PyBytes_Join(sep, x) is like sep.join(x).  sep must be PyBytesObject*,
-   x must be an iterable object. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyBytes_Join(PyObject *sep, PyObject *x);
-#endif
-
-/* Provides access to the internal data buffer and size of a string
-   object or the default encoded version of a Unicode object. Passing
-   NULL as *len parameter will force the string buffer to be
-   0-terminated (passing a string with embedded NULL characters will
-   cause an exception).  */
-PyAPI_FUNC(int) PyBytes_AsStringAndSize(
-    PyObject *obj,      /* string or Unicode object */
-    char **s,           /* pointer to buffer variable */
-    Py_ssize_t *len     /* pointer to length variable or NULL
-                           (only possible for 0-terminated
-                           strings) */
-    );
-
-/* Using the current locale, insert the thousands grouping
-   into the string pointed to by buffer.  For the argument descriptions,
-   see Objects/stringlib/localeutil.h */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGroupingLocale(char *buffer,
-                                                   Py_ssize_t n_buffer,
-                                                   char *digits,
-                                                   Py_ssize_t n_digits,
-                                                   Py_ssize_t min_width);
-
-/* Using explicit passed-in values, insert the thousands grouping
-   into the string pointed to by buffer.  For the argument descriptions,
-   see Objects/stringlib/localeutil.h */
-PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGrouping(char *buffer,
-                                                   Py_ssize_t n_buffer,
-                                                   char *digits,
-                                                   Py_ssize_t n_digits,
-                                                   Py_ssize_t min_width,
-                                                   const char *grouping,
-                                                   const char *thousands_sep);
-#endif
-
-/* Flags used by string formatting */
-#define F_LJUST (1<<0)
-#define F_SIGN	(1<<1)
-#define F_BLANK (1<<2)
-#define F_ALT	(1<<3)
-#define F_ZERO	(1<<4)
-
-#ifndef Py_LIMITED_API
-/* The _PyBytesWriter structure is big: it contains an embedded "stack buffer".
-   A _PyBytesWriter variable must be declared at the end of variables in a
-   function to optimize the memory allocation on the stack. */
-typedef struct {
-    /* bytes, bytearray or NULL (when the small buffer is used) */
-    PyObject *buffer;
-
-    /* Number of allocated size. */
-    Py_ssize_t allocated;
-
-    /* Minimum number of allocated bytes,
-       incremented by _PyBytesWriter_Prepare() */
-    Py_ssize_t min_size;
-
-    /* If non-zero, use a bytearray instead of a bytes object for buffer. */
-    int use_bytearray;
-
-    /* If non-zero, overallocate the buffer (default: 0).
-       This flag must be zero if use_bytearray is non-zero. */
-    int overallocate;
-
-    /* Stack buffer */
-    int use_small_buffer;
-    char small_buffer[512];
-} _PyBytesWriter;
-
-/* Initialize a bytes writer
-
-   By default, the overallocation is disabled. Set the overallocate attribute
-   to control the allocation of the buffer. */
-PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer);
-
-/* Get the buffer content and reset the writer.
-   Return a bytes object, or a bytearray object if use_bytearray is non-zero.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer,
-    void *str);
-
-/* Deallocate memory of a writer (clear its internal buffer). */
-PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer);
-
-/* Allocate the buffer to write size bytes.
-   Return the pointer to the beginning of buffer data.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer,
-    Py_ssize_t size);
-
-/* Ensure that the buffer is large enough to write *size* bytes.
-   Add size to the writer minimum size (min_size attribute).
-
-   str is the current pointer inside the buffer.
-   Return the updated current pointer inside the buffer.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer,
-    void *str,
-    Py_ssize_t size);
-
-/* Resize the buffer to make it larger.
-   The new buffer may be larger than size bytes because of overallocation.
-   Return the updated current pointer inside the buffer.
-   Raise an exception and return NULL on error.
-
-   Note: size must be greater than the number of allocated bytes in the writer.
-
-   This function doesn't use the writer minimum size (min_size attribute).
-
-   See also _PyBytesWriter_Prepare().
-   */
-PyAPI_FUNC(void*) _PyBytesWriter_Resize(_PyBytesWriter *writer,
-    void *str,
-    Py_ssize_t size);
-
-/* Write bytes.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer,
-    void *str,
-    const void *bytes,
-    Py_ssize_t size);
-#endif   /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BYTESOBJECT_H */
diff --git a/dependencies2013/win32/include/python/cellobject.h b/dependencies2013/win32/include/python/cellobject.h
deleted file mode 100644
index a0aa4d94..00000000
--- a/dependencies2013/win32/include/python/cellobject.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Cell object interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_CELLOBJECT_H
-#define Py_CELLOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-	PyObject_HEAD
-	PyObject *ob_ref;	/* Content of the cell or NULL when empty */
-} PyCellObject;
-
-PyAPI_DATA(PyTypeObject) PyCell_Type;
-
-#define PyCell_Check(op) (Py_TYPE(op) == &PyCell_Type)
-
-PyAPI_FUNC(PyObject *) PyCell_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *);
-PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *);
-
-#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref)
-#define PyCell_SET(op, v) (((PyCellObject *)(op))->ob_ref = v)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TUPLEOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/ceval.h b/dependencies2013/win32/include/python/ceval.h
deleted file mode 100644
index 38d47099..00000000
--- a/dependencies2013/win32/include/python/ceval.h
+++ /dev/null
@@ -1,236 +0,0 @@
-#ifndef Py_CEVAL_H
-#define Py_CEVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Interface to random parts in ceval.c */
-
-PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
-    PyObject *func, PyObject *args, PyObject *kwargs);
-
-/* Inline this */
-#define PyEval_CallObject(func,arg) \
-    PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
-
-PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj,
-                                           const char *format, ...);
-PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj,
-                                         const char *methodname,
-                                         const char *format, ...);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
-PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
-PyAPI_FUNC(void) _PyEval_SetCoroutineWrapper(PyObject *);
-PyAPI_FUNC(PyObject *) _PyEval_GetCoroutineWrapper(void);
-PyAPI_FUNC(void) _PyEval_SetAsyncGenFirstiter(PyObject *);
-PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void);
-PyAPI_FUNC(void) _PyEval_SetAsyncGenFinalizer(PyObject *);
-PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
-#endif
-
-struct _frame; /* Avoid including frameobject.h */
-
-PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void);
-PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void);
-PyAPI_FUNC(PyObject *) PyEval_GetLocals(void);
-PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void);
-
-/* Look at the current frame's (if any) code's co_flags, and turn on
-   the corresponding compiler flags in cf->cf_flags.  Return 1 if any
-   flag was set, else return 0. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
-#endif
-
-PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg);
-PyAPI_FUNC(void) _PyEval_SignalReceived(void);
-PyAPI_FUNC(int) Py_MakePendingCalls(void);
-
-/* Protection against deeply nested recursive calls
-
-   In Python 3.0, this protection has two levels:
-   * normal anti-recursion protection is triggered when the recursion level
-     exceeds the current recursion limit. It raises a RecursionError, and sets
-     the "overflowed" flag in the thread state structure. This flag
-     temporarily *disables* the normal protection; this allows cleanup code
-     to potentially outgrow the recursion limit while processing the
-     RecursionError.
-   * "last chance" anti-recursion protection is triggered when the recursion
-     level exceeds "current recursion limit + 50". By construction, this
-     protection can only be triggered when the "overflowed" flag is set. It
-     means the cleanup code has itself gone into an infinite loop, or the
-     RecursionError has been mistakingly ignored. When this protection is
-     triggered, the interpreter aborts with a Fatal Error.
-
-   In addition, the "overflowed" flag is automatically reset when the
-   recursion level drops below "current recursion limit - 50". This heuristic
-   is meant to ensure that the normal anti-recursion protection doesn't get
-   disabled too long.
-
-   Please note: this scheme has its own limitations. See:
-   http://mail.python.org/pipermail/python-dev/2008-August/082106.html
-   for some observations.
-*/
-PyAPI_FUNC(void) Py_SetRecursionLimit(int);
-PyAPI_FUNC(int) Py_GetRecursionLimit(void);
-
-#define Py_EnterRecursiveCall(where)  \
-            (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) &&  \
-             _Py_CheckRecursiveCall(where))
-#define Py_LeaveRecursiveCall()                         \
-    do{ if(_Py_MakeEndRecCheck(PyThreadState_GET()->recursion_depth))  \
-      PyThreadState_GET()->overflowed = 0;  \
-    } while(0)
-PyAPI_FUNC(int) _Py_CheckRecursiveCall(const char *where);
-PyAPI_DATA(int) _Py_CheckRecursionLimit;
-
-#ifdef USE_STACKCHECK
-/* With USE_STACKCHECK, we artificially decrement the recursion limit in order
-   to trigger regular stack checks in _Py_CheckRecursiveCall(), except if
-   the "overflowed" flag is set, in which case we need the true value
-   of _Py_CheckRecursionLimit for _Py_MakeEndRecCheck() to function properly.
-*/
-#  define _Py_MakeRecCheck(x)  \
-    (++(x) > (_Py_CheckRecursionLimit += PyThreadState_GET()->overflowed - 1))
-#else
-#  define _Py_MakeRecCheck(x)  (++(x) > _Py_CheckRecursionLimit)
-#endif
-
-/* Compute the "lower-water mark" for a recursion limit. When
- * Py_LeaveRecursiveCall() is called with a recursion depth below this mark,
- * the overflowed flag is reset to 0. */
-#define _Py_RecursionLimitLowerWaterMark(limit) \
-    (((limit) > 200) \
-        ? ((limit) - 50) \
-        : (3 * ((limit) >> 2)))
-
-#define _Py_MakeEndRecCheck(x) \
-    (--(x) < _Py_RecursionLimitLowerWaterMark(_Py_CheckRecursionLimit))
-
-#define Py_ALLOW_RECURSION \
-  do { unsigned char _old = PyThreadState_GET()->recursion_critical;\
-    PyThreadState_GET()->recursion_critical = 1;
-
-#define Py_END_ALLOW_RECURSION \
-    PyThreadState_GET()->recursion_critical = _old; \
-  } while(0);
-
-PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *);
-PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *);
-PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *);
-PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(struct _frame *f, int exc);
-#endif
-
-/* Interface for threads.
-
-   A module that plans to do a blocking system call (or something else
-   that lasts a long time and doesn't touch Python data) can allow other
-   threads to run as follows:
-
-    ...preparations here...
-    Py_BEGIN_ALLOW_THREADS
-    ...blocking system call here...
-    Py_END_ALLOW_THREADS
-    ...interpret result here...
-
-   The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a
-   {}-surrounded block.
-   To leave the block in the middle (e.g., with return), you must insert
-   a line containing Py_BLOCK_THREADS before the return, e.g.
-
-    if (...premature_exit...) {
-        Py_BLOCK_THREADS
-        PyErr_SetFromErrno(PyExc_IOError);
-        return NULL;
-    }
-
-   An alternative is:
-
-    Py_BLOCK_THREADS
-    if (...premature_exit...) {
-        PyErr_SetFromErrno(PyExc_IOError);
-        return NULL;
-    }
-    Py_UNBLOCK_THREADS
-
-   For convenience, that the value of 'errno' is restored across
-   Py_END_ALLOW_THREADS and Py_BLOCK_THREADS.
-
-   WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND
-   Py_END_ALLOW_THREADS!!!
-
-   The function PyEval_InitThreads() should be called only from
-   init_thread() in "_threadmodule.c".
-
-   Note that not yet all candidates have been converted to use this
-   mechanism!
-*/
-
-PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void);
-PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *);
-
-#ifdef WITH_THREAD
-
-PyAPI_FUNC(int)  PyEval_ThreadsInitialized(void);
-PyAPI_FUNC(void) PyEval_InitThreads(void);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyEval_FiniThreads(void);
-#endif /* !Py_LIMITED_API */
-PyAPI_FUNC(void) PyEval_AcquireLock(void);
-PyAPI_FUNC(void) PyEval_ReleaseLock(void);
-PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate);
-PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
-PyAPI_FUNC(void) PyEval_ReInitThreads(void);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
-PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
-#endif
-
-#define Py_BEGIN_ALLOW_THREADS { \
-                        PyThreadState *_save; \
-                        _save = PyEval_SaveThread();
-#define Py_BLOCK_THREADS        PyEval_RestoreThread(_save);
-#define Py_UNBLOCK_THREADS      _save = PyEval_SaveThread();
-#define Py_END_ALLOW_THREADS    PyEval_RestoreThread(_save); \
-                 }
-
-#else /* !WITH_THREAD */
-
-#define Py_BEGIN_ALLOW_THREADS {
-#define Py_BLOCK_THREADS
-#define Py_UNBLOCK_THREADS
-#define Py_END_ALLOW_THREADS }
-
-#endif /* !WITH_THREAD */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(void) _PyEval_SignalAsyncExc(void);
-#endif
-
-/* Masks and values used by FORMAT_VALUE opcode. */
-#define FVC_MASK      0x3
-#define FVC_NONE      0x0
-#define FVC_STR       0x1
-#define FVC_REPR      0x2
-#define FVC_ASCII     0x3
-#define FVS_MASK      0x4
-#define FVS_HAVE_SPEC 0x4
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CEVAL_H */
diff --git a/dependencies2013/win32/include/python/classobject.h b/dependencies2013/win32/include/python/classobject.h
deleted file mode 100644
index eeeb3e95..00000000
--- a/dependencies2013/win32/include/python/classobject.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Former class object interface -- now only bound methods are here  */
-
-/* Revealing some structures (not for general use) */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_CLASSOBJECT_H
-#define Py_CLASSOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *im_func;   /* The callable object implementing the method */
-    PyObject *im_self;   /* The instance it is bound to */
-    PyObject *im_weakreflist; /* List of weak references */
-} PyMethodObject;
-
-PyAPI_DATA(PyTypeObject) PyMethod_Type;
-
-#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)
-
-PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *);
-PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyMethod_GET_FUNCTION(meth) \
-        (((PyMethodObject *)meth) -> im_func)
-#define PyMethod_GET_SELF(meth) \
-	(((PyMethodObject *)meth) -> im_self)
-
-PyAPI_FUNC(int) PyMethod_ClearFreeList(void);
-
-typedef struct {
-	PyObject_HEAD
-	PyObject *func;
-} PyInstanceMethodObject;
-
-PyAPI_DATA(PyTypeObject) PyInstanceMethod_Type;
-
-#define PyInstanceMethod_Check(op) ((op)->ob_type == &PyInstanceMethod_Type)
-
-PyAPI_FUNC(PyObject *) PyInstanceMethod_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyInstanceMethod_Function(PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyInstanceMethod_GET_FUNCTION(meth) \
-        (((PyInstanceMethodObject *)meth) -> func)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CLASSOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/code.h b/dependencies2013/win32/include/python/code.h
deleted file mode 100644
index c5fce3c9..00000000
--- a/dependencies2013/win32/include/python/code.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Definitions for bytecode */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_CODE_H
-#define Py_CODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef uint16_t _Py_CODEUNIT;
-
-#ifdef WORDS_BIGENDIAN
-#  define _Py_OPCODE(word) ((word) >> 8)
-#  define _Py_OPARG(word) ((word) & 255)
-#else
-#  define _Py_OPCODE(word) ((word) & 255)
-#  define _Py_OPARG(word) ((word) >> 8)
-#endif
-
-/* Bytecode object */
-typedef struct {
-    PyObject_HEAD
-    int co_argcount;		/* #arguments, except *args */
-    int co_kwonlyargcount;	/* #keyword only arguments */
-    int co_nlocals;		/* #local variables */
-    int co_stacksize;		/* #entries needed for evaluation stack */
-    int co_flags;		/* CO_..., see below */
-    int co_firstlineno;   /* first source line number */
-    PyObject *co_code;		/* instruction opcodes */
-    PyObject *co_consts;	/* list (constants used) */
-    PyObject *co_names;		/* list of strings (names used) */
-    PyObject *co_varnames;	/* tuple of strings (local variable names) */
-    PyObject *co_freevars;	/* tuple of strings (free variable names) */
-    PyObject *co_cellvars;      /* tuple of strings (cell variable names) */
-    /* The rest aren't used in either hash or comparisons, except for co_name,
-       used in both. This is done to preserve the name and line number
-       for tracebacks and debuggers; otherwise, constant de-duplication
-       would collapse identical functions/lambdas defined on different lines.
-    */
-    unsigned char *co_cell2arg; /* Maps cell vars which are arguments. */
-    PyObject *co_filename;	/* unicode (where it was loaded from) */
-    PyObject *co_name;		/* unicode (name, for reference) */
-    PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) See
-				   Objects/lnotab_notes.txt for details. */
-    void *co_zombieframe;     /* for optimization only (see frameobject.c) */
-    PyObject *co_weakreflist;   /* to support weakrefs to code objects */
-    /* Scratch space for extra data relating to the code object.
-       Type is a void* to keep the format private in codeobject.c to force
-       people to go through the proper APIs. */
-    void *co_extra;
-} PyCodeObject;
-
-/* Masks for co_flags above */
-#define CO_OPTIMIZED	0x0001
-#define CO_NEWLOCALS	0x0002
-#define CO_VARARGS	0x0004
-#define CO_VARKEYWORDS	0x0008
-#define CO_NESTED       0x0010
-#define CO_GENERATOR    0x0020
-/* The CO_NOFREE flag is set if there are no free or cell variables.
-   This information is redundant, but it allows a single flag test
-   to determine whether there is any extra work to be done when the
-   call frame it setup.
-*/
-#define CO_NOFREE       0x0040
-
-/* The CO_COROUTINE flag is set for coroutine functions (defined with
-   ``async def`` keywords) */
-#define CO_COROUTINE            0x0080
-#define CO_ITERABLE_COROUTINE   0x0100
-#define CO_ASYNC_GENERATOR      0x0200
-
-/* These are no longer used. */
-#if 0
-#define CO_GENERATOR_ALLOWED    0x1000
-#endif
-#define CO_FUTURE_DIVISION    	0x2000
-#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
-#define CO_FUTURE_WITH_STATEMENT  0x8000
-#define CO_FUTURE_PRINT_FUNCTION  0x10000
-#define CO_FUTURE_UNICODE_LITERALS 0x20000
-
-#define CO_FUTURE_BARRY_AS_BDFL  0x40000
-#define CO_FUTURE_GENERATOR_STOP  0x80000
-
-/* This value is found in the co_cell2arg array when the associated cell
-   variable does not correspond to an argument. The maximum number of
-   arguments is 255 (indexed up to 254), so 255 work as a special flag.*/
-#define CO_CELL_NOT_AN_ARG 255
-
-/* This should be defined if a future statement modifies the syntax.
-   For example, when a keyword is added.
-*/
-#define PY_PARSER_REQUIRES_FUTURE_KEYWORD
-
-#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
-
-PyAPI_DATA(PyTypeObject) PyCode_Type;
-
-#define PyCode_Check(op) (Py_TYPE(op) == &PyCode_Type)
-#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars))
-
-/* Public interface */
-PyAPI_FUNC(PyCodeObject *) PyCode_New(
-	int, int, int, int, int, PyObject *, PyObject *,
-	PyObject *, PyObject *, PyObject *, PyObject *,
-	PyObject *, PyObject *, int, PyObject *);
-        /* same as struct above */
-
-/* Creates a new empty code object with the specified source location. */
-PyAPI_FUNC(PyCodeObject *)
-PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno);
-
-/* Return the line number associated with the specified bytecode index
-   in this code object.  If you just need the line number of a frame,
-   use PyFrame_GetLineNumber() instead. */
-PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);
-
-/* for internal use only */
-typedef struct _addr_pair {
-        int ap_lower;
-        int ap_upper;
-} PyAddrPair;
-
-#ifndef Py_LIMITED_API
-/* Update *bounds to describe the first and one-past-the-last instructions in the
-   same line as lasti.  Return the number of that line.
-*/
-PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
-                                        int lasti, PyAddrPair *bounds);
-
-/* Create a comparable key used to compare constants taking in account the
- * object type. It is used to make sure types are not coerced (e.g., float and
- * complex) _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms
- *
- * Return (type(obj), obj, ...): a tuple with variable size (at least 2 items)
- * depending on the type and the value. The type is the first item to not
- * compare bytes and str which can raise a BytesWarning exception. */
-PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
-#endif
-
-PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
-                                      PyObject *names, PyObject *lnotab);
-
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index,
-                                 void **extra);
-PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index,
-                                 void *extra);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CODE_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/codecs.h b/dependencies2013/win32/include/python/codecs.h
deleted file mode 100644
index 3ad0f2b5..00000000
--- a/dependencies2013/win32/include/python/codecs.h
+++ /dev/null
@@ -1,240 +0,0 @@
-#ifndef Py_CODECREGISTRY_H
-#define Py_CODECREGISTRY_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------------------------------------------------------------
-
-   Python Codec Registry and support functions
-
-
-Written by Marc-Andre Lemburg (mal@lemburg.com).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-   ------------------------------------------------------------------------ */
-
-/* Register a new codec search function.
-
-   As side effect, this tries to load the encodings package, if not
-   yet done, to make sure that it is always first in the list of
-   search functions.
-
-   The search_function's refcount is incremented by this function. */
-
-PyAPI_FUNC(int) PyCodec_Register(
-       PyObject *search_function
-       );
-
-/* Codec registry lookup API.
-
-   Looks up the given encoding and returns a CodecInfo object with
-   function attributes which implement the different aspects of
-   processing the encoding.
-
-   The encoding string is looked up converted to all lower-case
-   characters. This makes encodings looked up through this mechanism
-   effectively case-insensitive.
-
-   If no codec is found, a KeyError is set and NULL returned.
-
-   As side effect, this tries to load the encodings package, if not
-   yet done. This is part of the lazy load strategy for the encodings
-   package.
-
- */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
-       const char *encoding
-       );
-
-PyAPI_FUNC(int) _PyCodec_Forget(
-       const char *encoding
-       );
-#endif
-
-/* Codec registry encoding check API.
-
-   Returns 1/0 depending on whether there is a registered codec for
-   the given encoding.
-
-*/
-
-PyAPI_FUNC(int) PyCodec_KnownEncoding(
-       const char *encoding
-       );
-
-/* Generic codec based encoding API.
-
-   object is passed through the encoder function found for the given
-   encoding using the error handling method defined by errors. errors
-   may be NULL to use the default method defined for the codec.
-
-   Raises a LookupError in case no encoder can be found.
-
- */
-
-PyAPI_FUNC(PyObject *) PyCodec_Encode(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-/* Generic codec based decoding API.
-
-   object is passed through the decoder function found for the given
-   encoding using the error handling method defined by errors. errors
-   may be NULL to use the default method defined for the codec.
-
-   Raises a LookupError in case no encoder can be found.
-
- */
-
-PyAPI_FUNC(PyObject *) PyCodec_Decode(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-#ifndef Py_LIMITED_API
-/* Text codec specific encoding and decoding API.
-
-   Checks the encoding against a list of codecs which do not
-   implement a str<->bytes encoding before attempting the
-   operation.
-
-   Please note that these APIs are internal and should not
-   be used in Python C extensions.
-
-   XXX (ncoghlan): should we make these, or something like them, public
-   in Python 3.5+?
-
- */
-PyAPI_FUNC(PyObject *) _PyCodec_LookupTextEncoding(
-       const char *encoding,
-       const char *alternate_command
-       );
-
-PyAPI_FUNC(PyObject *) _PyCodec_EncodeText(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-PyAPI_FUNC(PyObject *) _PyCodec_DecodeText(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-/* These two aren't actually text encoding specific, but _io.TextIOWrapper
- * is the only current API consumer.
- */
-PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalDecoder(
-       PyObject *codec_info,
-       const char *errors
-       );
-
-PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalEncoder(
-       PyObject *codec_info,
-       const char *errors
-       );
-#endif
-
-
-
-/* --- Codec Lookup APIs --------------------------------------------------
-
-   All APIs return a codec object with incremented refcount and are
-   based on _PyCodec_Lookup().  The same comments w/r to the encoding
-   name also apply to these APIs.
-
-*/
-
-/* Get an encoder function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_Encoder(
-       const char *encoding
-       );
-
-/* Get a decoder function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_Decoder(
-       const char *encoding
-       );
-
-/* Get an IncrementalEncoder object for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder(
-       const char *encoding,
-       const char *errors
-       );
-
-/* Get an IncrementalDecoder object function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder(
-       const char *encoding,
-       const char *errors
-       );
-
-/* Get a StreamReader factory function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_StreamReader(
-       const char *encoding,
-       PyObject *stream,
-       const char *errors
-       );
-
-/* Get a StreamWriter factory function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_StreamWriter(
-       const char *encoding,
-       PyObject *stream,
-       const char *errors
-       );
-
-/* Unicode encoding error handling callback registry API */
-
-/* Register the error handling callback function error under the given
-   name. This function will be called by the codec when it encounters
-   unencodable characters/undecodable bytes and doesn't know the
-   callback name, when name is specified as the error parameter
-   in the call to the encode/decode function.
-   Return 0 on success, -1 on error */
-PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error);
-
-/* Lookup the error handling callback function registered under the given
-   name. As a special case NULL can be passed, in which case
-   the error handling callback for "strict" will be returned. */
-PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name);
-
-/* raise exc as an exception */
-PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc);
-
-/* ignore the unicode error, skipping the faulty input */
-PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc);
-
-/* replace the unicode encode error with ? or U+FFFD */
-PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc);
-
-/* replace the unicode encode error with XML character references */
-PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc);
-
-/* replace the unicode encode error with backslash escapes (\x, \u and \U) */
-PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* replace the unicode encode error with backslash escapes (\N, \x, \u and \U) */
-PyAPI_FUNC(PyObject *) PyCodec_NameReplaceErrors(PyObject *exc);
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(const char *) Py_hexdigits;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CODECREGISTRY_H */
diff --git a/dependencies2013/win32/include/python/compile.h b/dependencies2013/win32/include/python/compile.h
deleted file mode 100644
index ecd8dc1d..00000000
--- a/dependencies2013/win32/include/python/compile.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef Py_COMPILE_H
-#define Py_COMPILE_H
-
-#ifndef Py_LIMITED_API
-#include "code.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public interface */
-struct _node; /* Declare the existence of this type */
-PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
-
-/* Future feature support */
-
-typedef struct {
-    int ff_features;      /* flags set by future statements */
-    int ff_lineno;        /* line number of last future statement */
-} PyFutureFeatures;
-
-#define FUTURE_NESTED_SCOPES "nested_scopes"
-#define FUTURE_GENERATORS "generators"
-#define FUTURE_DIVISION "division"
-#define FUTURE_ABSOLUTE_IMPORT "absolute_import"
-#define FUTURE_WITH_STATEMENT "with_statement"
-#define FUTURE_PRINT_FUNCTION "print_function"
-#define FUTURE_UNICODE_LITERALS "unicode_literals"
-#define FUTURE_BARRY_AS_BDFL "barry_as_FLUFL"
-#define FUTURE_GENERATOR_STOP "generator_stop"
-
-struct _mod; /* Declare the existence of this type */
-#define PyAST_Compile(mod, s, f, ar) PyAST_CompileEx(mod, s, f, -1, ar)
-PyAPI_FUNC(PyCodeObject *) PyAST_CompileEx(
-    struct _mod *mod,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyCompilerFlags *flags,
-    int optimize,
-    PyArena *arena);
-PyAPI_FUNC(PyCodeObject *) PyAST_CompileObject(
-    struct _mod *mod,
-    PyObject *filename,
-    PyCompilerFlags *flags,
-    int optimize,
-    PyArena *arena);
-PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromAST(
-    struct _mod * mod,
-    const char *filename        /* decoded from the filesystem encoding */
-    );
-PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromASTObject(
-    struct _mod * mod,
-    PyObject *filename
-    );
-
-/* _Py_Mangle is defined in compile.c */
-PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
-
-#define PY_INVALID_STACK_EFFECT INT_MAX
-PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_LIMITED_API */
-
-/* These definitions must match corresponding definitions in graminit.h.
-   There's code in compile.c that checks that they are the same. */
-#define Py_single_input 256
-#define Py_file_input 257
-#define Py_eval_input 258
-
-#endif /* !Py_COMPILE_H */
diff --git a/dependencies2013/win32/include/python/complexobject.h b/dependencies2013/win32/include/python/complexobject.h
deleted file mode 100644
index cb8c52c5..00000000
--- a/dependencies2013/win32/include/python/complexobject.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Complex number structure */
-
-#ifndef Py_COMPLEXOBJECT_H
-#define Py_COMPLEXOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    double real;
-    double imag;
-} Py_complex;
-
-/* Operations on complex numbers from complexmodule.c */
-
-PyAPI_FUNC(Py_complex) _Py_c_sum(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_diff(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_neg(Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_prod(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_quot(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_pow(Py_complex, Py_complex);
-PyAPI_FUNC(double) _Py_c_abs(Py_complex);
-#endif
-
-/* Complex object interface */
-
-/*
-PyComplexObject represents a complex number with double-precision
-real and imaginary parts.
-*/
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_HEAD
-    Py_complex cval;
-} PyComplexObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyComplex_Type;
-
-#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type)
-#define PyComplex_CheckExact(op) (Py_TYPE(op) == &PyComplex_Type)
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex);
-#endif
-PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag);
-
-PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op);
-PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op);
-#endif
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyComplex_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_COMPLEXOBJECT_H */
diff --git a/dependencies2013/win32/include/python/datetime.h b/dependencies2013/win32/include/python/datetime.h
deleted file mode 100644
index 3bf35cbb..00000000
--- a/dependencies2013/win32/include/python/datetime.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*  datetime.h
- */
-#ifndef Py_LIMITED_API
-#ifndef DATETIME_H
-#define DATETIME_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Fields are packed into successive bytes, each viewed as unsigned and
- * big-endian, unless otherwise noted:
- *
- * byte offset
- *  0           year     2 bytes, 1-9999
- *  2           month    1 byte, 1-12
- *  3           day      1 byte, 1-31
- *  4           hour     1 byte, 0-23
- *  5           minute   1 byte, 0-59
- *  6           second   1 byte, 0-59
- *  7           usecond  3 bytes, 0-999999
- * 10
- */
-
-/* # of bytes for year, month, and day. */
-#define _PyDateTime_DATE_DATASIZE 4
-
-/* # of bytes for hour, minute, second, and usecond. */
-#define _PyDateTime_TIME_DATASIZE 6
-
-/* # of bytes for year, month, day, hour, minute, second, and usecond. */
-#define _PyDateTime_DATETIME_DATASIZE 10
-
-
-typedef struct
-{
-    PyObject_HEAD
-    Py_hash_t hashcode;         /* -1 when unknown */
-    int days;                   /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */
-    int seconds;                /* 0 <= seconds < 24*3600 is invariant */
-    int microseconds;           /* 0 <= microseconds < 1000000 is invariant */
-} PyDateTime_Delta;
-
-typedef struct
-{
-    PyObject_HEAD               /* a pure abstract base class */
-} PyDateTime_TZInfo;
-
-
-/* The datetime and time types have hashcodes, and an optional tzinfo member,
- * present if and only if hastzinfo is true.
- */
-#define _PyTZINFO_HEAD          \
-    PyObject_HEAD               \
-    Py_hash_t hashcode;         \
-    char hastzinfo;             /* boolean flag */
-
-/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something
- * convenient to cast to, when getting at the hastzinfo member of objects
- * starting with _PyTZINFO_HEAD.
- */
-typedef struct
-{
-    _PyTZINFO_HEAD
-} _PyDateTime_BaseTZInfo;
-
-/* All time objects are of PyDateTime_TimeType, but that can be allocated
- * in two ways, with or without a tzinfo member.  Without is the same as
- * tzinfo == None, but consumes less memory.  _PyDateTime_BaseTime is an
- * internal struct used to allocate the right amount of space for the
- * "without" case.
- */
-#define _PyDateTime_TIMEHEAD    \
-    _PyTZINFO_HEAD              \
-    unsigned char data[_PyDateTime_TIME_DATASIZE];
-
-typedef struct
-{
-    _PyDateTime_TIMEHEAD
-} _PyDateTime_BaseTime;         /* hastzinfo false */
-
-typedef struct
-{
-    _PyDateTime_TIMEHEAD
-    unsigned char fold;
-    PyObject *tzinfo;
-} PyDateTime_Time;              /* hastzinfo true */
-
-
-/* All datetime objects are of PyDateTime_DateTimeType, but that can be
- * allocated in two ways too, just like for time objects above.  In addition,
- * the plain date type is a base class for datetime, so it must also have
- * a hastzinfo member (although it's unused there).
- */
-typedef struct
-{
-    _PyTZINFO_HEAD
-    unsigned char data[_PyDateTime_DATE_DATASIZE];
-} PyDateTime_Date;
-
-#define _PyDateTime_DATETIMEHEAD        \
-    _PyTZINFO_HEAD                      \
-    unsigned char data[_PyDateTime_DATETIME_DATASIZE];
-
-typedef struct
-{
-    _PyDateTime_DATETIMEHEAD
-} _PyDateTime_BaseDateTime;     /* hastzinfo false */
-
-typedef struct
-{
-    _PyDateTime_DATETIMEHEAD
-    unsigned char fold;
-    PyObject *tzinfo;
-} PyDateTime_DateTime;          /* hastzinfo true */
-
-
-/* Apply for date and datetime instances. */
-#define PyDateTime_GET_YEAR(o)     ((((PyDateTime_Date*)o)->data[0] << 8) | \
-                     ((PyDateTime_Date*)o)->data[1])
-#define PyDateTime_GET_MONTH(o)    (((PyDateTime_Date*)o)->data[2])
-#define PyDateTime_GET_DAY(o)      (((PyDateTime_Date*)o)->data[3])
-
-#define PyDateTime_DATE_GET_HOUR(o)        (((PyDateTime_DateTime*)o)->data[4])
-#define PyDateTime_DATE_GET_MINUTE(o)      (((PyDateTime_DateTime*)o)->data[5])
-#define PyDateTime_DATE_GET_SECOND(o)      (((PyDateTime_DateTime*)o)->data[6])
-#define PyDateTime_DATE_GET_MICROSECOND(o)              \
-    ((((PyDateTime_DateTime*)o)->data[7] << 16) |       \
-     (((PyDateTime_DateTime*)o)->data[8] << 8)  |       \
-      ((PyDateTime_DateTime*)o)->data[9])
-#define PyDateTime_DATE_GET_FOLD(o)        (((PyDateTime_DateTime*)o)->fold)
-
-/* Apply for time instances. */
-#define PyDateTime_TIME_GET_HOUR(o)        (((PyDateTime_Time*)o)->data[0])
-#define PyDateTime_TIME_GET_MINUTE(o)      (((PyDateTime_Time*)o)->data[1])
-#define PyDateTime_TIME_GET_SECOND(o)      (((PyDateTime_Time*)o)->data[2])
-#define PyDateTime_TIME_GET_MICROSECOND(o)              \
-    ((((PyDateTime_Time*)o)->data[3] << 16) |           \
-     (((PyDateTime_Time*)o)->data[4] << 8)  |           \
-      ((PyDateTime_Time*)o)->data[5])
-#define PyDateTime_TIME_GET_FOLD(o)        (((PyDateTime_Time*)o)->fold)
-
-/* Apply for time delta instances */
-#define PyDateTime_DELTA_GET_DAYS(o)         (((PyDateTime_Delta*)o)->days)
-#define PyDateTime_DELTA_GET_SECONDS(o)      (((PyDateTime_Delta*)o)->seconds)
-#define PyDateTime_DELTA_GET_MICROSECONDS(o)            \
-    (((PyDateTime_Delta*)o)->microseconds)
-
-
-/* Define structure for C API. */
-typedef struct {
-    /* type objects */
-    PyTypeObject *DateType;
-    PyTypeObject *DateTimeType;
-    PyTypeObject *TimeType;
-    PyTypeObject *DeltaType;
-    PyTypeObject *TZInfoType;
-
-    /* constructors */
-    PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*);
-    PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int,
-        PyObject*, PyTypeObject*);
-    PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*);
-    PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*);
-
-    /* constructors for the DB API */
-    PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*);
-    PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*);
-
-    /* PEP 495 constructors */
-    PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int,
-        PyObject*, int, PyTypeObject*);
-    PyObject *(*Time_FromTimeAndFold)(int, int, int, int, PyObject*, int, PyTypeObject*);
-
-} PyDateTime_CAPI;
-
-#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI"
-
-
-#ifdef Py_BUILD_CORE
-
-/* Macros for type checking when building the Python core. */
-#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType)
-#define PyDate_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateType)
-
-#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType)
-#define PyDateTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateTimeType)
-
-#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType)
-#define PyTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TimeType)
-
-#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType)
-#define PyDelta_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DeltaType)
-
-#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType)
-#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType)
-
-#else
-
-/* Define global variable for the C API and a macro for setting it. */
-static PyDateTime_CAPI *PyDateTimeAPI = NULL;
-
-#define PyDateTime_IMPORT \
-    PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)
-
-/* Macros for type checking when not building the Python core. */
-#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType)
-#define PyDate_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateType)
-
-#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType)
-#define PyDateTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateTimeType)
-
-#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType)
-#define PyTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeType)
-
-#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType)
-#define PyDelta_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DeltaType)
-
-#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType)
-#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType)
-
-/* Macros for accessing constructors in a simplified fashion. */
-#define PyDate_FromDate(year, month, day) \
-    PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType)
-
-#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \
-    PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \
-        min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType)
-
-#define PyDateTime_FromDateAndTimeAndFold(year, month, day, hour, min, sec, usec, fold) \
-    PyDateTimeAPI->DateTime_FromDateAndTimeAndFold(year, month, day, hour, \
-        min, sec, usec, Py_None, fold, PyDateTimeAPI->DateTimeType)
-
-#define PyTime_FromTime(hour, minute, second, usecond) \
-    PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \
-        Py_None, PyDateTimeAPI->TimeType)
-
-#define PyTime_FromTimeAndFold(hour, minute, second, usecond, fold) \
-    PyDateTimeAPI->Time_FromTimeAndFold(hour, minute, second, usecond, \
-        Py_None, fold, PyDateTimeAPI->TimeType)
-
-#define PyDelta_FromDSU(days, seconds, useconds) \
-    PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \
-        PyDateTimeAPI->DeltaType)
-
-/* Macros supporting the DB API. */
-#define PyDateTime_FromTimestamp(args) \
-    PyDateTimeAPI->DateTime_FromTimestamp( \
-        (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL)
-
-#define PyDate_FromTimestamp(args) \
-    PyDateTimeAPI->Date_FromTimestamp( \
-        (PyObject*) (PyDateTimeAPI->DateType), args)
-
-#endif  /* Py_BUILD_CORE */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-#endif /* !Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/descrobject.h b/dependencies2013/win32/include/python/descrobject.h
deleted file mode 100644
index 8f3e84c3..00000000
--- a/dependencies2013/win32/include/python/descrobject.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Descriptors */
-#ifndef Py_DESCROBJECT_H
-#define Py_DESCROBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef PyObject *(*getter)(PyObject *, void *);
-typedef int (*setter)(PyObject *, PyObject *, void *);
-
-typedef struct PyGetSetDef {
-    char *name;
-    getter get;
-    setter set;
-    char *doc;
-    void *closure;
-} PyGetSetDef;
-
-#ifndef Py_LIMITED_API
-typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args,
-                                 void *wrapped);
-
-typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args,
-                                      void *wrapped, PyObject *kwds);
-
-struct wrapperbase {
-    char *name;
-    int offset;
-    void *function;
-    wrapperfunc wrapper;
-    char *doc;
-    int flags;
-    PyObject *name_strobj;
-};
-
-/* Flags for above struct */
-#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */
-
-/* Various kinds of descriptor objects */
-
-typedef struct {
-    PyObject_HEAD
-    PyTypeObject *d_type;
-    PyObject *d_name;
-    PyObject *d_qualname;
-} PyDescrObject;
-
-#define PyDescr_COMMON PyDescrObject d_common
-
-#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
-#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
-
-typedef struct {
-    PyDescr_COMMON;
-    PyMethodDef *d_method;
-} PyMethodDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    struct PyMemberDef *d_member;
-} PyMemberDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    PyGetSetDef *d_getset;
-} PyGetSetDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    struct wrapperbase *d_base;
-    void *d_wrapped; /* This can be any function pointer */
-} PyWrapperDescrObject;
-#endif /* Py_LIMITED_API */
-
-PyAPI_DATA(PyTypeObject) PyClassMethodDescr_Type;
-PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
-PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
-PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyMethodWrapper_Type;
-#endif /* Py_LIMITED_API */
-
-PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);
-struct PyMemberDef; /* forward declaration for following prototype */
-PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *,
-                                               struct PyMemberDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
-                                               struct PyGetSetDef *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
-                                                struct wrapperbase *, void *);
-#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL)
-#endif
-
-PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *);
-
-
-PyAPI_DATA(PyTypeObject) PyProperty_Type;
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DESCROBJECT_H */
-
diff --git a/dependencies2013/win32/include/python/dictobject.h b/dependencies2013/win32/include/python/dictobject.h
deleted file mode 100644
index c4f2e2f5..00000000
--- a/dependencies2013/win32/include/python/dictobject.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#ifndef Py_DICTOBJECT_H
-#define Py_DICTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Dictionary object type -- mapping from hashable object to object */
-
-/* The distribution includes a separate file, Objects/dictnotes.txt,
-   describing explorations into dictionary design and optimization.
-   It covers typical dictionary use patterns, the parameters for
-   tuning dictionaries, and several ideas for possible optimizations.
-*/
-
-#ifndef Py_LIMITED_API
-
-typedef struct _dictkeysobject PyDictKeysObject;
-
-/* The ma_values pointer is NULL for a combined table
- * or points to an array of PyObject* for a split table
- */
-typedef struct {
-    PyObject_HEAD
-
-    /* Number of items in the dictionary */
-    Py_ssize_t ma_used;
-
-    /* Dictionary version: globally unique, value change each time
-       the dictionary is modified */
-    uint64_t ma_version_tag;
-
-    PyDictKeysObject *ma_keys;
-
-    /* If ma_values is NULL, the table is "combined": keys and values
-       are stored in ma_keys.
-
-       If ma_values is not NULL, the table is splitted:
-       keys are stored in ma_keys and values are stored in ma_values */
-    PyObject **ma_values;
-} PyDictObject;
-
-typedef struct {
-    PyObject_HEAD
-    PyDictObject *dv_dict;
-} _PyDictViewObject;
-
-#endif /* Py_LIMITED_API */
-
-PyAPI_DATA(PyTypeObject) PyDict_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterKey_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterValue_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterItem_Type;
-PyAPI_DATA(PyTypeObject) PyDictKeys_Type;
-PyAPI_DATA(PyTypeObject) PyDictItems_Type;
-PyAPI_DATA(PyTypeObject) PyDictValues_Type;
-
-#define PyDict_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS)
-#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
-#define PyDictKeys_Check(op) PyObject_TypeCheck(op, &PyDictKeys_Type)
-#define PyDictItems_Check(op) PyObject_TypeCheck(op, &PyDictItems_Type)
-#define PyDictValues_Check(op) PyObject_TypeCheck(op, &PyDictValues_Type)
-/* This excludes Values, since they are not sets. */
-# define PyDictViewSet_Check(op) \
-    (PyDictKeys_Check(op) || PyDictItems_Check(op))
-
-
-PyAPI_FUNC(PyObject *) PyDict_New(void);
-PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
-                                       Py_hash_t hash);
-#endif
-PyAPI_FUNC(PyObject *) PyDict_GetItemWithError(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp,
-                                                  struct _Py_Identifier *key);
-PyAPI_FUNC(PyObject *) PyDict_SetDefault(
-    PyObject *mp, PyObject *key, PyObject *defaultobj);
-#endif
-PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key,
-                                          PyObject *item, Py_hash_t hash);
-#endif
-PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
-                                          Py_hash_t hash);
-PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key,
-                                  int (*predicate)(PyObject *value));
-#endif
-PyAPI_FUNC(void) PyDict_Clear(PyObject *mp);
-PyAPI_FUNC(int) PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value);
-#ifndef Py_LIMITED_API
-PyDictKeysObject *_PyDict_NewKeysForClass(void);
-PyAPI_FUNC(PyObject *) PyObject_GenericGetDict(PyObject *, void *);
-PyAPI_FUNC(int) _PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);
-PyObject *_PyDictView_New(PyObject *, PyTypeObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp);
-PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp);
-PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, Py_hash_t hash);
-PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
-PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
-PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
-Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
-Py_ssize_t _PyDict_SizeOf(PyDictObject *);
-PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *);
-PyObject *_PyDict_Pop_KnownHash(PyObject *, PyObject *, Py_hash_t, PyObject *);
-PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
-#define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
-
-PyAPI_FUNC(int) PyDict_ClearFreeList(void);
-#endif
-
-/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */
-PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other);
-
-/* PyDict_Merge updates/merges from a mapping object (an object that
-   supports PyMapping_Keys() and PyObject_GetItem()).  If override is true,
-   the last occurrence of a key wins, else the first.  The Python
-   dict.update(other) is equivalent to PyDict_Merge(dict, other, 1).
-*/
-PyAPI_FUNC(int) PyDict_Merge(PyObject *mp,
-                                   PyObject *other,
-                                   int override);
-
-#ifndef Py_LIMITED_API
-/* Like PyDict_Merge, but override can be 0, 1 or 2.  If override is 0,
-   the first occurrence of a key wins, if override is 1, the last occurrence
-   of a key wins, if override is 2, a KeyError with conflicting key as
-   argument is raised.
-*/
-PyAPI_FUNC(int) _PyDict_MergeEx(PyObject *mp, PyObject *other, int override);
-PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
-#endif
-
-/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing
-   iterable objects of length 2.  If override is true, the last occurrence
-   of a key wins, else the first.  The Python dict constructor dict(seq2)
-   is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1).
-*/
-PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d,
-                                           PyObject *seq2,
-                                           int override);
-
-PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key);
-#endif /* !Py_LIMITED_API */
-PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyObject *item);
-#endif /* !Py_LIMITED_API */
-PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_DelItemId(PyObject *mp, struct _Py_Identifier *key);
-PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out);
-
-int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value);
-PyObject *_PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DICTOBJECT_H */
diff --git a/dependencies2013/win32/include/python/dtoa.h b/dependencies2013/win32/include/python/dtoa.h
deleted file mode 100644
index 9bfb6251..00000000
--- a/dependencies2013/win32/include/python/dtoa.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef PY_NO_SHORT_FLOAT_REPR
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr);
-PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits,
-                        int *decpt, int *sign, char **rve);
-PyAPI_FUNC(void) _Py_dg_freedtoa(char *s);
-PyAPI_FUNC(double) _Py_dg_stdnan(int sign);
-PyAPI_FUNC(double) _Py_dg_infinity(int sign);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-#endif
diff --git a/dependencies2013/win32/include/python/dynamic_annotations.h b/dependencies2013/win32/include/python/dynamic_annotations.h
deleted file mode 100644
index 0bd1a833..00000000
--- a/dependencies2013/win32/include/python/dynamic_annotations.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* Copyright (c) 2008-2009, Google Inc.
- * 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.
- *     * Neither the name of Google Inc. 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.
- *
- * ---
- * Author: Kostya Serebryany
- * Copied to CPython by Jeffrey Yasskin, with all macros renamed to
- * start with _Py_ to avoid colliding with users embedding Python, and
- * with deprecated macros removed.
- */
-
-/* This file defines dynamic annotations for use with dynamic analysis
-   tool such as valgrind, PIN, etc.
-
-   Dynamic annotation is a source code annotation that affects
-   the generated code (that is, the annotation is not a comment).
-   Each such annotation is attached to a particular
-   instruction and/or to a particular object (address) in the program.
-
-   The annotations that should be used by users are macros in all upper-case
-   (e.g., _Py_ANNOTATE_NEW_MEMORY).
-
-   Actual implementation of these macros may differ depending on the
-   dynamic analysis tool being used.
-
-   See http://code.google.com/p/data-race-test/  for more information.
-
-   This file supports the following dynamic analysis tools:
-   - None (DYNAMIC_ANNOTATIONS_ENABLED is not defined or zero).
-      Macros are defined empty.
-   - ThreadSanitizer, Helgrind, DRD (DYNAMIC_ANNOTATIONS_ENABLED is 1).
-      Macros are defined as calls to non-inlinable empty functions
-      that are intercepted by Valgrind. */
-
-#ifndef __DYNAMIC_ANNOTATIONS_H__
-#define __DYNAMIC_ANNOTATIONS_H__
-
-#ifndef DYNAMIC_ANNOTATIONS_ENABLED
-# define DYNAMIC_ANNOTATIONS_ENABLED 0
-#endif
-
-#if DYNAMIC_ANNOTATIONS_ENABLED != 0
-
-  /* -------------------------------------------------------------
-     Annotations useful when implementing condition variables such as CondVar,
-     using conditional critical sections (Await/LockWhen) and when constructing
-     user-defined synchronization mechanisms.
-
-     The annotations _Py_ANNOTATE_HAPPENS_BEFORE() and
-     _Py_ANNOTATE_HAPPENS_AFTER() can be used to define happens-before arcs in
-     user-defined synchronization mechanisms: the race detector will infer an
-     arc from the former to the latter when they share the same argument
-     pointer.
-
-     Example 1 (reference counting):
-
-     void Unref() {
-       _Py_ANNOTATE_HAPPENS_BEFORE(&refcount_);
-       if (AtomicDecrementByOne(&refcount_) == 0) {
-         _Py_ANNOTATE_HAPPENS_AFTER(&refcount_);
-         delete this;
-       }
-     }
-
-     Example 2 (message queue):
-
-     void MyQueue::Put(Type *e) {
-       MutexLock lock(&mu_);
-       _Py_ANNOTATE_HAPPENS_BEFORE(e);
-       PutElementIntoMyQueue(e);
-     }
-
-     Type *MyQueue::Get() {
-       MutexLock lock(&mu_);
-       Type *e = GetElementFromMyQueue();
-       _Py_ANNOTATE_HAPPENS_AFTER(e);
-       return e;
-     }
-
-     Note: when possible, please use the existing reference counting and message
-     queue implementations instead of inventing new ones. */
-
-  /* Report that wait on the condition variable at address "cv" has succeeded
-     and the lock at address "lock" is held. */
-#define _Py_ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) \
-    AnnotateCondVarWait(__FILE__, __LINE__, cv, lock)
-
-  /* Report that wait on the condition variable at "cv" has succeeded.  Variant
-     w/o lock. */
-#define _Py_ANNOTATE_CONDVAR_WAIT(cv) \
-    AnnotateCondVarWait(__FILE__, __LINE__, cv, NULL)
-
-  /* Report that we are about to signal on the condition variable at address
-     "cv". */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL(cv) \
-    AnnotateCondVarSignal(__FILE__, __LINE__, cv)
-
-  /* Report that we are about to signal_all on the condition variable at "cv". */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL_ALL(cv) \
-    AnnotateCondVarSignalAll(__FILE__, __LINE__, cv)
-
-  /* Annotations for user-defined synchronization mechanisms. */
-#define _Py_ANNOTATE_HAPPENS_BEFORE(obj) _Py_ANNOTATE_CONDVAR_SIGNAL(obj)
-#define _Py_ANNOTATE_HAPPENS_AFTER(obj)  _Py_ANNOTATE_CONDVAR_WAIT(obj)
-
-  /* Report that the bytes in the range [pointer, pointer+size) are about
-     to be published safely. The race checker will create a happens-before
-     arc from the call _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) to
-     subsequent accesses to this memory.
-     Note: this annotation may not work properly if the race detector uses
-     sampling, i.e. does not observe all memory accesses.
-     */
-#define _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) \
-    AnnotatePublishMemoryRange(__FILE__, __LINE__, pointer, size)
-
-  /* Instruct the tool to create a happens-before arc between mu->Unlock() and
-     mu->Lock(). This annotation may slow down the race detector and hide real
-     races. Normally it is used only when it would be difficult to annotate each
-     of the mutex's critical sections individually using the annotations above.
-     This annotation makes sense only for hybrid race detectors. For pure
-     happens-before detectors this is a no-op. For more details see
-     http://code.google.com/p/data-race-test/wiki/PureHappensBeforeVsHybrid . */
-#define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) \
-    AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu)
-
-  /* -------------------------------------------------------------
-     Annotations useful when defining memory allocators, or when memory that
-     was protected in one way starts to be protected in another. */
-
-  /* Report that a new memory at "address" of size "size" has been allocated.
-     This might be used when the memory has been retrieved from a free list and
-     is about to be reused, or when the locking discipline for a variable
-     changes. */
-#define _Py_ANNOTATE_NEW_MEMORY(address, size) \
-    AnnotateNewMemory(__FILE__, __LINE__, address, size)
-
-  /* -------------------------------------------------------------
-     Annotations useful when defining FIFO queues that transfer data between
-     threads. */
-
-  /* Report that the producer-consumer queue (such as ProducerConsumerQueue) at
-     address "pcq" has been created.  The _Py_ANNOTATE_PCQ_* annotations should
-     be used only for FIFO queues.  For non-FIFO queues use
-     _Py_ANNOTATE_HAPPENS_BEFORE (for put) and _Py_ANNOTATE_HAPPENS_AFTER (for
-     get). */
-#define _Py_ANNOTATE_PCQ_CREATE(pcq) \
-    AnnotatePCQCreate(__FILE__, __LINE__, pcq)
-
-  /* Report that the queue at address "pcq" is about to be destroyed. */
-#define _Py_ANNOTATE_PCQ_DESTROY(pcq) \
-    AnnotatePCQDestroy(__FILE__, __LINE__, pcq)
-
-  /* Report that we are about to put an element into a FIFO queue at address
-     "pcq". */
-#define _Py_ANNOTATE_PCQ_PUT(pcq) \
-    AnnotatePCQPut(__FILE__, __LINE__, pcq)
-
-  /* Report that we've just got an element from a FIFO queue at address "pcq". */
-#define _Py_ANNOTATE_PCQ_GET(pcq) \
-    AnnotatePCQGet(__FILE__, __LINE__, pcq)
-
-  /* -------------------------------------------------------------
-     Annotations that suppress errors.  It is usually better to express the
-     program's synchronization using the other annotations, but these can
-     be used when all else fails. */
-
-  /* Report that we may have a benign race at "pointer", with size
-     "sizeof(*(pointer))". "pointer" must be a non-void* pointer.  Insert at the
-     point where "pointer" has been allocated, preferably close to the point
-     where the race happens.  See also _Py_ANNOTATE_BENIGN_RACE_STATIC. */
-#define _Py_ANNOTATE_BENIGN_RACE(pointer, description) \
-    AnnotateBenignRaceSized(__FILE__, __LINE__, pointer, \
-                            sizeof(*(pointer)), description)
-
-  /* Same as _Py_ANNOTATE_BENIGN_RACE(address, description), but applies to
-     the memory range [address, address+size). */
-#define _Py_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) \
-    AnnotateBenignRaceSized(__FILE__, __LINE__, address, size, description)
-
-  /* Request the analysis tool to ignore all reads in the current thread
-     until _Py_ANNOTATE_IGNORE_READS_END is called.
-     Useful to ignore intentional racey reads, while still checking
-     other reads and all writes.
-     See also _Py_ANNOTATE_UNPROTECTED_READ. */
-#define _Py_ANNOTATE_IGNORE_READS_BEGIN() \
-    AnnotateIgnoreReadsBegin(__FILE__, __LINE__)
-
-  /* Stop ignoring reads. */
-#define _Py_ANNOTATE_IGNORE_READS_END() \
-    AnnotateIgnoreReadsEnd(__FILE__, __LINE__)
-
-  /* Similar to _Py_ANNOTATE_IGNORE_READS_BEGIN, but ignore writes. */
-#define _Py_ANNOTATE_IGNORE_WRITES_BEGIN() \
-    AnnotateIgnoreWritesBegin(__FILE__, __LINE__)
-
-  /* Stop ignoring writes. */
-#define _Py_ANNOTATE_IGNORE_WRITES_END() \
-    AnnotateIgnoreWritesEnd(__FILE__, __LINE__)
-
-  /* Start ignoring all memory accesses (reads and writes). */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() \
-    do {\
-      _Py_ANNOTATE_IGNORE_READS_BEGIN();\
-      _Py_ANNOTATE_IGNORE_WRITES_BEGIN();\
-    }while(0)\
-
-  /* Stop ignoring all memory accesses. */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_END() \
-    do {\
-      _Py_ANNOTATE_IGNORE_WRITES_END();\
-      _Py_ANNOTATE_IGNORE_READS_END();\
-    }while(0)\
-
-  /* Similar to _Py_ANNOTATE_IGNORE_READS_BEGIN, but ignore synchronization events:
-     RWLOCK* and CONDVAR*. */
-#define _Py_ANNOTATE_IGNORE_SYNC_BEGIN() \
-    AnnotateIgnoreSyncBegin(__FILE__, __LINE__)
-
-  /* Stop ignoring sync events. */
-#define _Py_ANNOTATE_IGNORE_SYNC_END() \
-    AnnotateIgnoreSyncEnd(__FILE__, __LINE__)
-
-
-  /* Enable (enable!=0) or disable (enable==0) race detection for all threads.
-     This annotation could be useful if you want to skip expensive race analysis
-     during some period of program execution, e.g. during initialization. */
-#define _Py_ANNOTATE_ENABLE_RACE_DETECTION(enable) \
-    AnnotateEnableRaceDetection(__FILE__, __LINE__, enable)
-
-  /* -------------------------------------------------------------
-     Annotations useful for debugging. */
-
-  /* Request to trace every access to "address". */
-#define _Py_ANNOTATE_TRACE_MEMORY(address) \
-    AnnotateTraceMemory(__FILE__, __LINE__, address)
-
-  /* Report the current thread name to a race detector. */
-#define _Py_ANNOTATE_THREAD_NAME(name) \
-    AnnotateThreadName(__FILE__, __LINE__, name)
-
-  /* -------------------------------------------------------------
-     Annotations useful when implementing locks.  They are not
-     normally needed by modules that merely use locks.
-     The "lock" argument is a pointer to the lock object. */
-
-  /* Report that a lock has been created at address "lock". */
-#define _Py_ANNOTATE_RWLOCK_CREATE(lock) \
-    AnnotateRWLockCreate(__FILE__, __LINE__, lock)
-
-  /* Report that the lock at address "lock" is about to be destroyed. */
-#define _Py_ANNOTATE_RWLOCK_DESTROY(lock) \
-    AnnotateRWLockDestroy(__FILE__, __LINE__, lock)
-
-  /* Report that the lock at address "lock" has been acquired.
-     is_w=1 for writer lock, is_w=0 for reader lock. */
-#define _Py_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) \
-    AnnotateRWLockAcquired(__FILE__, __LINE__, lock, is_w)
-
-  /* Report that the lock at address "lock" is about to be released. */
-#define _Py_ANNOTATE_RWLOCK_RELEASED(lock, is_w) \
-    AnnotateRWLockReleased(__FILE__, __LINE__, lock, is_w)
-
-  /* -------------------------------------------------------------
-     Annotations useful when implementing barriers.  They are not
-     normally needed by modules that merely use barriers.
-     The "barrier" argument is a pointer to the barrier object. */
-
-  /* Report that the "barrier" has been initialized with initial "count".
-   If 'reinitialization_allowed' is true, initialization is allowed to happen
-   multiple times w/o calling barrier_destroy() */
-#define _Py_ANNOTATE_BARRIER_INIT(barrier, count, reinitialization_allowed) \
-    AnnotateBarrierInit(__FILE__, __LINE__, barrier, count, \
-                        reinitialization_allowed)
-
-  /* Report that we are about to enter barrier_wait("barrier"). */
-#define _Py_ANNOTATE_BARRIER_WAIT_BEFORE(barrier) \
-    AnnotateBarrierWaitBefore(__FILE__, __LINE__, barrier)
-
-  /* Report that we just exited barrier_wait("barrier"). */
-#define _Py_ANNOTATE_BARRIER_WAIT_AFTER(barrier) \
-    AnnotateBarrierWaitAfter(__FILE__, __LINE__, barrier)
-
-  /* Report that the "barrier" has been destroyed. */
-#define _Py_ANNOTATE_BARRIER_DESTROY(barrier) \
-    AnnotateBarrierDestroy(__FILE__, __LINE__, barrier)
-
-  /* -------------------------------------------------------------
-     Annotations useful for testing race detectors. */
-
-  /* Report that we expect a race on the variable at "address".
-     Use only in unit tests for a race detector. */
-#define _Py_ANNOTATE_EXPECT_RACE(address, description) \
-    AnnotateExpectRace(__FILE__, __LINE__, address, description)
-
-  /* A no-op. Insert where you like to test the interceptors. */
-#define _Py_ANNOTATE_NO_OP(arg) \
-    AnnotateNoOp(__FILE__, __LINE__, arg)
-
-  /* Force the race detector to flush its state. The actual effect depends on
-   * the implementation of the detector. */
-#define _Py_ANNOTATE_FLUSH_STATE() \
-    AnnotateFlushState(__FILE__, __LINE__)
-
-
-#else  /* DYNAMIC_ANNOTATIONS_ENABLED == 0 */
-
-#define _Py_ANNOTATE_RWLOCK_CREATE(lock) /* empty */
-#define _Py_ANNOTATE_RWLOCK_DESTROY(lock) /* empty */
-#define _Py_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) /* empty */
-#define _Py_ANNOTATE_RWLOCK_RELEASED(lock, is_w) /* empty */
-#define _Py_ANNOTATE_BARRIER_INIT(barrier, count, reinitialization_allowed) /* */
-#define _Py_ANNOTATE_BARRIER_WAIT_BEFORE(barrier) /* empty */
-#define _Py_ANNOTATE_BARRIER_WAIT_AFTER(barrier) /* empty */
-#define _Py_ANNOTATE_BARRIER_DESTROY(barrier) /* empty */
-#define _Py_ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) /* empty */
-#define _Py_ANNOTATE_CONDVAR_WAIT(cv) /* empty */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL(cv) /* empty */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL_ALL(cv) /* empty */
-#define _Py_ANNOTATE_HAPPENS_BEFORE(obj) /* empty */
-#define _Py_ANNOTATE_HAPPENS_AFTER(obj) /* empty */
-#define _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(address, size) /* empty */
-#define _Py_ANNOTATE_UNPUBLISH_MEMORY_RANGE(address, size)  /* empty */
-#define _Py_ANNOTATE_SWAP_MEMORY_RANGE(address, size)  /* empty */
-#define _Py_ANNOTATE_PCQ_CREATE(pcq) /* empty */
-#define _Py_ANNOTATE_PCQ_DESTROY(pcq) /* empty */
-#define _Py_ANNOTATE_PCQ_PUT(pcq) /* empty */
-#define _Py_ANNOTATE_PCQ_GET(pcq) /* empty */
-#define _Py_ANNOTATE_NEW_MEMORY(address, size) /* empty */
-#define _Py_ANNOTATE_EXPECT_RACE(address, description) /* empty */
-#define _Py_ANNOTATE_BENIGN_RACE(address, description) /* empty */
-#define _Py_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) /* empty */
-#define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) /* empty */
-#define _Py_ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) /* empty */
-#define _Py_ANNOTATE_TRACE_MEMORY(arg) /* empty */
-#define _Py_ANNOTATE_THREAD_NAME(name) /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_END() /* empty */
-#define _Py_ANNOTATE_IGNORE_WRITES_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_WRITES_END() /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_END() /* empty */
-#define _Py_ANNOTATE_IGNORE_SYNC_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_SYNC_END() /* empty */
-#define _Py_ANNOTATE_ENABLE_RACE_DETECTION(enable) /* empty */
-#define _Py_ANNOTATE_NO_OP(arg) /* empty */
-#define _Py_ANNOTATE_FLUSH_STATE() /* empty */
-
-#endif  /* DYNAMIC_ANNOTATIONS_ENABLED */
-
-/* Use the macros above rather than using these functions directly. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void AnnotateRWLockCreate(const char *file, int line,
-                          const volatile void *lock);
-void AnnotateRWLockDestroy(const char *file, int line,
-                           const volatile void *lock);
-void AnnotateRWLockAcquired(const char *file, int line,
-                            const volatile void *lock, long is_w);
-void AnnotateRWLockReleased(const char *file, int line,
-                            const volatile void *lock, long is_w);
-void AnnotateBarrierInit(const char *file, int line,
-                         const volatile void *barrier, long count,
-                         long reinitialization_allowed);
-void AnnotateBarrierWaitBefore(const char *file, int line,
-                               const volatile void *barrier);
-void AnnotateBarrierWaitAfter(const char *file, int line,
-                              const volatile void *barrier);
-void AnnotateBarrierDestroy(const char *file, int line,
-                            const volatile void *barrier);
-void AnnotateCondVarWait(const char *file, int line,
-                         const volatile void *cv,
-                         const volatile void *lock);
-void AnnotateCondVarSignal(const char *file, int line,
-                           const volatile void *cv);
-void AnnotateCondVarSignalAll(const char *file, int line,
-                              const volatile void *cv);
-void AnnotatePublishMemoryRange(const char *file, int line,
-                                const volatile void *address,
-                                long size);
-void AnnotateUnpublishMemoryRange(const char *file, int line,
-                                  const volatile void *address,
-                                  long size);
-void AnnotatePCQCreate(const char *file, int line,
-                       const volatile void *pcq);
-void AnnotatePCQDestroy(const char *file, int line,
-                        const volatile void *pcq);
-void AnnotatePCQPut(const char *file, int line,
-                    const volatile void *pcq);
-void AnnotatePCQGet(const char *file, int line,
-                    const volatile void *pcq);
-void AnnotateNewMemory(const char *file, int line,
-                       const volatile void *address,
-                       long size);
-void AnnotateExpectRace(const char *file, int line,
-                        const volatile void *address,
-                        const char *description);
-void AnnotateBenignRace(const char *file, int line,
-                        const volatile void *address,
-                        const char *description);
-void AnnotateBenignRaceSized(const char *file, int line,
-                        const volatile void *address,
-                        long size,
-                        const char *description);
-void AnnotateMutexIsUsedAsCondVar(const char *file, int line,
-                                  const volatile void *mu);
-void AnnotateTraceMemory(const char *file, int line,
-                         const volatile void *arg);
-void AnnotateThreadName(const char *file, int line,
-                        const char *name);
-void AnnotateIgnoreReadsBegin(const char *file, int line);
-void AnnotateIgnoreReadsEnd(const char *file, int line);
-void AnnotateIgnoreWritesBegin(const char *file, int line);
-void AnnotateIgnoreWritesEnd(const char *file, int line);
-void AnnotateEnableRaceDetection(const char *file, int line, int enable);
-void AnnotateNoOp(const char *file, int line,
-                  const volatile void *arg);
-void AnnotateFlushState(const char *file, int line);
-
-/* Return non-zero value if running under valgrind.
-
-  If "valgrind.h" is included into dynamic_annotations.c,
-  the regular valgrind mechanism will be used.
-  See http://valgrind.org/docs/manual/manual-core-adv.html about
-  RUNNING_ON_VALGRIND and other valgrind "client requests".
-  The file "valgrind.h" may be obtained by doing
-     svn co svn://svn.valgrind.org/valgrind/trunk/include
-
-  If for some reason you can't use "valgrind.h" or want to fake valgrind,
-  there are two ways to make this function return non-zero:
-    - Use environment variable: export RUNNING_ON_VALGRIND=1
-    - Make your tool intercept the function RunningOnValgrind() and
-      change its return value.
- */
-int RunningOnValgrind(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#if DYNAMIC_ANNOTATIONS_ENABLED != 0 && defined(__cplusplus)
-
-  /* _Py_ANNOTATE_UNPROTECTED_READ is the preferred way to annotate racey reads.
-
-     Instead of doing
-        _Py_ANNOTATE_IGNORE_READS_BEGIN();
-        ... = x;
-        _Py_ANNOTATE_IGNORE_READS_END();
-     one can use
-        ... = _Py_ANNOTATE_UNPROTECTED_READ(x); */
-  template <class T>
-  inline T _Py_ANNOTATE_UNPROTECTED_READ(const volatile T &x) {
-    _Py_ANNOTATE_IGNORE_READS_BEGIN();
-    T res = x;
-    _Py_ANNOTATE_IGNORE_READS_END();
-    return res;
-  }
-  /* Apply _Py_ANNOTATE_BENIGN_RACE_SIZED to a static variable. */
-#define _Py_ANNOTATE_BENIGN_RACE_STATIC(static_var, description)        \
-    namespace {                                                       \
-      class static_var ## _annotator {                                \
-       public:                                                        \
-        static_var ## _annotator() {                                  \
-          _Py_ANNOTATE_BENIGN_RACE_SIZED(&static_var,                     \
-                                      sizeof(static_var),             \
-            # static_var ": " description);                           \
-        }                                                             \
-      };                                                              \
-      static static_var ## _annotator the ## static_var ## _annotator;\
-    }
-#else /* DYNAMIC_ANNOTATIONS_ENABLED == 0 */
-
-#define _Py_ANNOTATE_UNPROTECTED_READ(x) (x)
-#define _Py_ANNOTATE_BENIGN_RACE_STATIC(static_var, description)  /* empty */
-
-#endif /* DYNAMIC_ANNOTATIONS_ENABLED */
-
-#endif  /* __DYNAMIC_ANNOTATIONS_H__ */
diff --git a/dependencies2013/win32/include/python/enumobject.h b/dependencies2013/win32/include/python/enumobject.h
deleted file mode 100644
index c14dbfc8..00000000
--- a/dependencies2013/win32/include/python/enumobject.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef Py_ENUMOBJECT_H
-#define Py_ENUMOBJECT_H
-
-/* Enumerate Object */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyEnum_Type;
-PyAPI_DATA(PyTypeObject) PyReversed_Type;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_ENUMOBJECT_H */
diff --git a/dependencies2013/win32/include/python/errcode.h b/dependencies2013/win32/include/python/errcode.h
deleted file mode 100644
index 5946686c..00000000
--- a/dependencies2013/win32/include/python/errcode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef Py_ERRCODE_H
-#define Py_ERRCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Error codes passed around between file input, tokenizer, parser and
-   interpreter.  This is necessary so we can turn them into Python
-   exceptions at a higher level.  Note that some errors have a
-   slightly different meaning when passed from the tokenizer to the
-   parser than when passed from the parser to the interpreter; e.g.
-   the parser only returns E_EOF when it hits EOF immediately, and it
-   never returns E_OK. */
-
-#define E_OK		10	/* No error */
-#define E_EOF		11	/* End Of File */
-#define E_INTR		12	/* Interrupted */
-#define E_TOKEN		13	/* Bad token */
-#define E_SYNTAX	14	/* Syntax error */
-#define E_NOMEM		15	/* Ran out of memory */
-#define E_DONE		16	/* Parsing complete */
-#define E_ERROR		17	/* Execution error */
-#define E_TABSPACE	18	/* Inconsistent mixing of tabs and spaces */
-#define E_OVERFLOW      19	/* Node had too many children */
-#define E_TOODEEP	20	/* Too many indentation levels */
-#define E_DEDENT	21	/* No matching outer block for dedent */
-#define E_DECODE	22	/* Error in decoding into Unicode */
-#define E_EOFS		23	/* EOF in triple-quoted string */
-#define E_EOLS		24	/* EOL in single-quoted string */
-#define E_LINECONT	25	/* Unexpected characters after a line continuation */
-#define E_IDENTIFIER    26      /* Invalid characters in identifier */
-#define E_BADSINGLE	27	/* Ill-formed single statement input */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRCODE_H */
diff --git a/dependencies2013/win32/include/python/eval.h b/dependencies2013/win32/include/python/eval.h
deleted file mode 100644
index a1c6e817..00000000
--- a/dependencies2013/win32/include/python/eval.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Interface to execute compiled code */
-
-#ifndef Py_EVAL_H
-#define Py_EVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyObject *, PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyObject *co,
-					PyObject *globals,
-					PyObject *locals,
-					PyObject **args, int argc,
-					PyObject **kwds, int kwdc,
-					PyObject **defs, int defc,
-					PyObject *kwdefs, PyObject *closure);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_EVAL_H */
diff --git a/dependencies2013/win32/include/python/fileobject.h b/dependencies2013/win32/include/python/fileobject.h
deleted file mode 100644
index 1dde17e1..00000000
--- a/dependencies2013/win32/include/python/fileobject.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* File object interface (what's left of it -- see io.py) */
-
-#ifndef Py_FILEOBJECT_H
-#define Py_FILEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PY_STDIOTEXTMODE "b"
-
-PyAPI_FUNC(PyObject *) PyFile_FromFd(int, const char *, const char *, int,
-                                     const char *, const char *,
-                                     const char *, int);
-PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int);
-PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int);
-PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *);
-PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
-#endif
-
-/* The default encoding used by the platform file system APIs
-   If non-NULL, this is different than the default encoding for strings
-*/
-PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
-#endif
-PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
-
-/* Internal API
-
-   The std printer acts as a preliminary sys.stderr until the new io
-   infrastructure is in place. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);
-PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
-#endif /* Py_LIMITED_API */
-
-/* A routine to check if a file descriptor can be select()-ed. */
-#ifdef HAVE_SELECT
- #define _PyIsSelectable_fd(FD) ((unsigned int)(FD) < (unsigned int)FD_SETSIZE)
-#else
- #define _PyIsSelectable_fd(FD) (1)
-#endif /* HAVE_SELECT */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FILEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/fileutils.h b/dependencies2013/win32/include/python/fileutils.h
deleted file mode 100644
index 900c70fa..00000000
--- a/dependencies2013/win32/include/python/fileutils.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef Py_FILEUTILS_H
-#define Py_FILEUTILS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(wchar_t *) Py_DecodeLocale(
-    const char *arg,
-    size_t *size);
-
-PyAPI_FUNC(char*) Py_EncodeLocale(
-    const wchar_t *text,
-    size_t *error_pos);
-#endif
-
-#ifndef Py_LIMITED_API
-
-PyAPI_FUNC(PyObject *) _Py_device_encoding(int);
-
-#ifdef MS_WINDOWS
-struct _Py_stat_struct {
-    unsigned long st_dev;
-    uint64_t st_ino;
-    unsigned short st_mode;
-    int st_nlink;
-    int st_uid;
-    int st_gid;
-    unsigned long st_rdev;
-    __int64 st_size;
-    time_t st_atime;
-    int st_atime_nsec;
-    time_t st_mtime;
-    int st_mtime_nsec;
-    time_t st_ctime;
-    int st_ctime_nsec;
-    unsigned long st_file_attributes;
-};
-#else
-#  define _Py_stat_struct stat
-#endif
-
-PyAPI_FUNC(int) _Py_fstat(
-    int fd,
-    struct _Py_stat_struct *status);
-
-PyAPI_FUNC(int) _Py_fstat_noraise(
-    int fd,
-    struct _Py_stat_struct *status);
-
-PyAPI_FUNC(int) _Py_stat(
-    PyObject *path,
-    struct stat *status);
-
-PyAPI_FUNC(int) _Py_open(
-    const char *pathname,
-    int flags);
-
-PyAPI_FUNC(int) _Py_open_noraise(
-    const char *pathname,
-    int flags);
-
-PyAPI_FUNC(FILE *) _Py_wfopen(
-    const wchar_t *path,
-    const wchar_t *mode);
-
-PyAPI_FUNC(FILE*) _Py_fopen(
-    const char *pathname,
-    const char *mode);
-
-PyAPI_FUNC(FILE*) _Py_fopen_obj(
-    PyObject *path,
-    const char *mode);
-
-PyAPI_FUNC(Py_ssize_t) _Py_read(
-    int fd,
-    void *buf,
-    size_t count);
-
-PyAPI_FUNC(Py_ssize_t) _Py_write(
-    int fd,
-    const void *buf,
-    size_t count);
-
-PyAPI_FUNC(Py_ssize_t) _Py_write_noraise(
-    int fd,
-    const void *buf,
-    size_t count);
-
-#ifdef HAVE_READLINK
-PyAPI_FUNC(int) _Py_wreadlink(
-    const wchar_t *path,
-    wchar_t *buf,
-    size_t bufsiz);
-#endif
-
-#ifdef HAVE_REALPATH
-PyAPI_FUNC(wchar_t*) _Py_wrealpath(
-    const wchar_t *path,
-    wchar_t *resolved_path,
-    size_t resolved_path_size);
-#endif
-
-PyAPI_FUNC(wchar_t*) _Py_wgetcwd(
-    wchar_t *buf,
-    size_t size);
-
-PyAPI_FUNC(int) _Py_get_inheritable(int fd);
-
-PyAPI_FUNC(int) _Py_set_inheritable(int fd, int inheritable,
-                                    int *atomic_flag_works);
-
-PyAPI_FUNC(int) _Py_dup(int fd);
-
-#ifndef MS_WINDOWS
-PyAPI_FUNC(int) _Py_get_blocking(int fd);
-
-PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking);
-#endif   /* !MS_WINDOWS */
-
-#endif   /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_FILEUTILS_H */
diff --git a/dependencies2013/win32/include/python/floatobject.h b/dependencies2013/win32/include/python/floatobject.h
deleted file mode 100644
index f1044d64..00000000
--- a/dependencies2013/win32/include/python/floatobject.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-/* Float object interface */
-
-/*
-PyFloatObject represents a (double precision) floating point number.
-*/
-
-#ifndef Py_FLOATOBJECT_H
-#define Py_FLOATOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_HEAD
-    double ob_fval;
-} PyFloatObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyFloat_Type;
-
-#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type)
-#define PyFloat_CheckExact(op) (Py_TYPE(op) == &PyFloat_Type)
-
-#ifdef Py_NAN
-#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN)
-#endif
-
-#define Py_RETURN_INF(sign) do                     \
-    if (copysign(1., sign) == 1.) {                \
-        return PyFloat_FromDouble(Py_HUGE_VAL);    \
-    } else {                        \
-        return PyFloat_FromDouble(-Py_HUGE_VAL);   \
-    } while(0)
-
-PyAPI_FUNC(double) PyFloat_GetMax(void);
-PyAPI_FUNC(double) PyFloat_GetMin(void);
-PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void);
-
-/* Return Python float from string PyObject. */
-PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*);
-
-/* Return Python float from C double. */
-PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double);
-
-/* Extract C double from Python float.  The macro version trades safety for
-   speed. */
-PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *);
-#ifndef Py_LIMITED_API
-#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval)
-#endif
-
-#ifndef Py_LIMITED_API
-/* _PyFloat_{Pack,Unpack}{4,8}
- *
- * The struct and pickle (at least) modules need an efficient platform-
- * independent way to store floating-point values as byte strings.
- * The Pack routines produce a string from a C double, and the Unpack
- * routines produce a C double from such a string.  The suffix (4 or 8)
- * specifies the number of bytes in the string.
- *
- * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats
- * these functions work by copying bits.  On other platforms, the formats the
- * 4- byte format is identical to the IEEE-754 single precision format, and
- * the 8-byte format to the IEEE-754 double precision format, although the
- * packing of INFs and NaNs (if such things exist on the platform) isn't
- * handled correctly, and attempting to unpack a string containing an IEEE
- * INF or NaN will raise an exception.
- *
- * On non-IEEE platforms with more precision, or larger dynamic range, than
- * 754 supports, not all values can be packed; on non-IEEE platforms with less
- * precision, or smaller dynamic range, not all values can be unpacked.  What
- * happens in such cases is partly accidental (alas).
- */
-
-/* The pack routines write 2, 4 or 8 bytes, starting at p.  le is a bool
- * argument, true if you want the string in little-endian format (exponent
- * last, at p+1, p+3 or p+7), false if you want big-endian format (exponent
- * first, at p).
- * Return value:  0 if all is OK, -1 if error (and an exception is
- * set, most likely OverflowError).
- * There are two problems on non-IEEE platforms:
- * 1):  What this does is undefined if x is a NaN or infinity.
- * 2):  -0.0 and +0.0 produce the same string.
- */
-PyAPI_FUNC(int) _PyFloat_Pack2(double x, unsigned char *p, int le);
-PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le);
-PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le);
-
-/* Needed for the old way for marshal to store a floating point number.
-   Returns the string length copied into p, -1 on error.
- */
-PyAPI_FUNC(int) _PyFloat_Repr(double x, char *p, size_t len);
-
-/* Used to get the important decimal digits of a double */
-PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum);
-PyAPI_FUNC(void) _PyFloat_DigitsInit(void);
-
-/* The unpack routines read 2, 4 or 8 bytes, starting at p.  le is a bool
- * argument, true if the string is in little-endian format (exponent
- * last, at p+1, p+3 or p+7), false if big-endian (exponent first, at p).
- * Return value:  The unpacked double.  On error, this is -1.0 and
- * PyErr_Occurred() is true (and an exception is set, most likely
- * OverflowError).  Note that on a non-IEEE platform this will refuse
- * to unpack a string that represents a NaN or infinity.
- */
-PyAPI_FUNC(double) _PyFloat_Unpack2(const unsigned char *p, int le);
-PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le);
-PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le);
-
-/* free list api */
-PyAPI_FUNC(int) PyFloat_ClearFreeList(void);
-
-PyAPI_FUNC(void) _PyFloat_DebugMallocStats(FILE* out);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(int) _PyFloat_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FLOATOBJECT_H */
diff --git a/dependencies2013/win32/include/python/frameobject.h b/dependencies2013/win32/include/python/frameobject.h
deleted file mode 100644
index 00c50933..00000000
--- a/dependencies2013/win32/include/python/frameobject.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-/* Frame object interface */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_FRAMEOBJECT_H
-#define Py_FRAMEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int b_type;                 /* what kind of block this is */
-    int b_handler;              /* where to jump to find handler */
-    int b_level;                /* value stack level to pop to */
-} PyTryBlock;
-
-typedef struct _frame {
-    PyObject_VAR_HEAD
-    struct _frame *f_back;      /* previous frame, or NULL */
-    PyCodeObject *f_code;       /* code segment */
-    PyObject *f_builtins;       /* builtin symbol table (PyDictObject) */
-    PyObject *f_globals;        /* global symbol table (PyDictObject) */
-    PyObject *f_locals;         /* local symbol table (any mapping) */
-    PyObject **f_valuestack;    /* points after the last local */
-    /* Next free slot in f_valuestack.  Frame creation sets to f_valuestack.
-       Frame evaluation usually NULLs it, but a frame that yields sets it
-       to the current stack top. */
-    PyObject **f_stacktop;
-    PyObject *f_trace;          /* Trace function */
-
-    /* In a generator, we need to be able to swap between the exception
-       state inside the generator and the exception state of the calling
-       frame (which shouldn't be impacted when the generator "yields"
-       from an except handler).
-       These three fields exist exactly for that, and are unused for
-       non-generator frames. See the save_exc_state and swap_exc_state
-       functions in ceval.c for details of their use. */
-    PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
-    /* Borrowed reference to a generator, or NULL */
-    PyObject *f_gen;
-
-    int f_lasti;                /* Last instruction if called */
-    /* Call PyFrame_GetLineNumber() instead of reading this field
-       directly.  As of 2.3 f_lineno is only valid when tracing is
-       active (i.e. when f_trace is set).  At other times we use
-       PyCode_Addr2Line to calculate the line from the current
-       bytecode index. */
-    int f_lineno;               /* Current line number */
-    int f_iblock;               /* index in f_blockstack */
-    char f_executing;           /* whether the frame is still executing */
-    PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
-    PyObject *f_localsplus[1];  /* locals+stack, dynamically sized */
-} PyFrameObject;
-
-
-/* Standard object interface */
-
-PyAPI_DATA(PyTypeObject) PyFrame_Type;
-
-#define PyFrame_Check(op) (Py_TYPE(op) == &PyFrame_Type)
-
-PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
-                                       PyObject *, PyObject *);
-
-
-/* The rest of the interface is specific for frame objects */
-
-/* Block management functions */
-
-PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int);
-PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *);
-
-/* Extend the value stack */
-
-PyAPI_FUNC(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int);
-
-/* Conversions between "fast locals" and locals in dictionary */
-
-PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int);
-
-PyAPI_FUNC(int) PyFrame_FastToLocalsWithError(PyFrameObject *f);
-PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *);
-
-PyAPI_FUNC(int) PyFrame_ClearFreeList(void);
-
-PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out);
-
-/* Return the line of code the frame is currently executing. */
-PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FRAMEOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/funcobject.h b/dependencies2013/win32/include/python/funcobject.h
deleted file mode 100644
index 77bb8c39..00000000
--- a/dependencies2013/win32/include/python/funcobject.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/* Function object interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_FUNCOBJECT_H
-#define Py_FUNCOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Function objects and code objects should not be confused with each other:
- *
- * Function objects are created by the execution of the 'def' statement.
- * They reference a code object in their __code__ attribute, which is a
- * purely syntactic object, i.e. nothing more than a compiled version of some
- * source code lines.  There is one code object per source code "fragment",
- * but each code object can be referenced by zero or many function objects
- * depending only on how many times the 'def' statement in the source was
- * executed so far.
- */
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *func_code;	/* A code object, the __code__ attribute */
-    PyObject *func_globals;	/* A dictionary (other mappings won't do) */
-    PyObject *func_defaults;	/* NULL or a tuple */
-    PyObject *func_kwdefaults;	/* NULL or a dict */
-    PyObject *func_closure;	/* NULL or a tuple of cell objects */
-    PyObject *func_doc;		/* The __doc__ attribute, can be anything */
-    PyObject *func_name;	/* The __name__ attribute, a string object */
-    PyObject *func_dict;	/* The __dict__ attribute, a dict or NULL */
-    PyObject *func_weakreflist;	/* List of weak references */
-    PyObject *func_module;	/* The __module__ attribute, can be anything */
-    PyObject *func_annotations;	/* Annotations, a dict or NULL */
-    PyObject *func_qualname;    /* The qualified name */
-
-    /* Invariant:
-     *     func_closure contains the bindings for func_code->co_freevars, so
-     *     PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code)
-     *     (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0).
-     */
-} PyFunctionObject;
-
-PyAPI_DATA(PyTypeObject) PyFunction_Type;
-
-#define PyFunction_Check(op) (Py_TYPE(op) == &PyFunction_Type)
-
-PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_NewWithQualName(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetKwDefaults(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetKwDefaults(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetAnnotations(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyFunction_FastCallDict(
-    PyObject *func,
-    PyObject **args,
-    Py_ssize_t nargs,
-    PyObject *kwargs);
-
-PyAPI_FUNC(PyObject *) _PyFunction_FastCallKeywords(
-    PyObject *func,
-    PyObject **stack,
-    Py_ssize_t nargs,
-    PyObject *kwnames);
-#endif
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyFunction_GET_CODE(func) \
-        (((PyFunctionObject *)func) -> func_code)
-#define PyFunction_GET_GLOBALS(func) \
-	(((PyFunctionObject *)func) -> func_globals)
-#define PyFunction_GET_MODULE(func) \
-	(((PyFunctionObject *)func) -> func_module)
-#define PyFunction_GET_DEFAULTS(func) \
-	(((PyFunctionObject *)func) -> func_defaults)
-#define PyFunction_GET_KW_DEFAULTS(func) \
-	(((PyFunctionObject *)func) -> func_kwdefaults)
-#define PyFunction_GET_CLOSURE(func) \
-	(((PyFunctionObject *)func) -> func_closure)
-#define PyFunction_GET_ANNOTATIONS(func) \
-	(((PyFunctionObject *)func) -> func_annotations)
-
-/* The classmethod and staticmethod types lives here, too */
-PyAPI_DATA(PyTypeObject) PyClassMethod_Type;
-PyAPI_DATA(PyTypeObject) PyStaticMethod_Type;
-
-PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FUNCOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/genobject.h b/dependencies2013/win32/include/python/genobject.h
deleted file mode 100644
index 8c1825fc..00000000
--- a/dependencies2013/win32/include/python/genobject.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-/* Generator object interface */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_GENOBJECT_H
-#define Py_GENOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _frame; /* Avoid including frameobject.h */
-
-/* _PyGenObject_HEAD defines the initial segment of generator
-   and coroutine objects. */
-#define _PyGenObject_HEAD(prefix)                                           \
-    PyObject_HEAD                                                           \
-    /* Note: gi_frame can be NULL if the generator is "finished" */         \
-    struct _frame *prefix##_frame;                                          \
-    /* True if generator is being executed. */                              \
-    char prefix##_running;                                                  \
-    /* The code object backing the generator */                             \
-    PyObject *prefix##_code;                                                \
-    /* List of weak reference. */                                           \
-    PyObject *prefix##_weakreflist;                                         \
-    /* Name of the generator. */                                            \
-    PyObject *prefix##_name;                                                \
-    /* Qualified name of the generator. */                                  \
-    PyObject *prefix##_qualname;
-
-typedef struct {
-    /* The gi_ prefix is intended to remind of generator-iterator. */
-    _PyGenObject_HEAD(gi)
-} PyGenObject;
-
-PyAPI_DATA(PyTypeObject) PyGen_Type;
-
-#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type)
-#define PyGen_CheckExact(op) (Py_TYPE(op) == &PyGen_Type)
-
-PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *);
-PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(struct _frame *,
-    PyObject *name, PyObject *qualname);
-PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *);
-PyAPI_FUNC(int) _PyGen_SetStopIterationValue(PyObject *);
-PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
-PyAPI_FUNC(PyObject *) _PyGen_Send(PyGenObject *, PyObject *);
-PyObject *_PyGen_yf(PyGenObject *);
-PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self);
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    _PyGenObject_HEAD(cr)
-} PyCoroObject;
-
-PyAPI_DATA(PyTypeObject) PyCoro_Type;
-PyAPI_DATA(PyTypeObject) _PyCoroWrapper_Type;
-
-PyAPI_DATA(PyTypeObject) _PyAIterWrapper_Type;
-PyObject *_PyAIterWrapper_New(PyObject *aiter);
-
-#define PyCoro_CheckExact(op) (Py_TYPE(op) == &PyCoro_Type)
-PyObject *_PyCoro_GetAwaitableIter(PyObject *o);
-PyAPI_FUNC(PyObject *) PyCoro_New(struct _frame *,
-    PyObject *name, PyObject *qualname);
-
-/* Asynchronous Generators */
-
-typedef struct {
-    _PyGenObject_HEAD(ag)
-    PyObject *ag_finalizer;
-
-    /* Flag is set to 1 when hooks set up by sys.set_asyncgen_hooks
-       were called on the generator, to avoid calling them more
-       than once. */
-    int ag_hooks_inited;
-
-    /* Flag is set to 1 when aclose() is called for the first time, or
-       when a StopAsyncIteration exception is raised. */
-    int ag_closed;
-} PyAsyncGenObject;
-
-PyAPI_DATA(PyTypeObject) PyAsyncGen_Type;
-PyAPI_DATA(PyTypeObject) _PyAsyncGenASend_Type;
-PyAPI_DATA(PyTypeObject) _PyAsyncGenWrappedValue_Type;
-PyAPI_DATA(PyTypeObject) _PyAsyncGenAThrow_Type;
-
-PyAPI_FUNC(PyObject *) PyAsyncGen_New(struct _frame *,
-    PyObject *name, PyObject *qualname);
-
-#define PyAsyncGen_CheckExact(op) (Py_TYPE(op) == &PyAsyncGen_Type)
-
-PyObject *_PyAsyncGenValueWrapperNew(PyObject *);
-
-int PyAsyncGen_ClearFreeLists(void);
-
-#endif
-
-#undef _PyGenObject_HEAD
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GENOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/graminit.h b/dependencies2013/win32/include/python/graminit.h
deleted file mode 100644
index e9b4a938..00000000
--- a/dependencies2013/win32/include/python/graminit.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Generated by Parser/pgen */
-
-#define single_input 256
-#define file_input 257
-#define eval_input 258
-#define decorator 259
-#define decorators 260
-#define decorated 261
-#define async_funcdef 262
-#define funcdef 263
-#define parameters 264
-#define typedargslist 265
-#define tfpdef 266
-#define varargslist 267
-#define vfpdef 268
-#define stmt 269
-#define simple_stmt 270
-#define small_stmt 271
-#define expr_stmt 272
-#define annassign 273
-#define testlist_star_expr 274
-#define augassign 275
-#define del_stmt 276
-#define pass_stmt 277
-#define flow_stmt 278
-#define break_stmt 279
-#define continue_stmt 280
-#define return_stmt 281
-#define yield_stmt 282
-#define raise_stmt 283
-#define import_stmt 284
-#define import_name 285
-#define import_from 286
-#define import_as_name 287
-#define dotted_as_name 288
-#define import_as_names 289
-#define dotted_as_names 290
-#define dotted_name 291
-#define global_stmt 292
-#define nonlocal_stmt 293
-#define assert_stmt 294
-#define compound_stmt 295
-#define async_stmt 296
-#define if_stmt 297
-#define while_stmt 298
-#define for_stmt 299
-#define try_stmt 300
-#define with_stmt 301
-#define with_item 302
-#define except_clause 303
-#define suite 304
-#define test 305
-#define test_nocond 306
-#define lambdef 307
-#define lambdef_nocond 308
-#define or_test 309
-#define and_test 310
-#define not_test 311
-#define comparison 312
-#define comp_op 313
-#define star_expr 314
-#define expr 315
-#define xor_expr 316
-#define and_expr 317
-#define shift_expr 318
-#define arith_expr 319
-#define term 320
-#define factor 321
-#define power 322
-#define atom_expr 323
-#define atom 324
-#define testlist_comp 325
-#define trailer 326
-#define subscriptlist 327
-#define subscript 328
-#define sliceop 329
-#define exprlist 330
-#define testlist 331
-#define dictorsetmaker 332
-#define classdef 333
-#define arglist 334
-#define argument 335
-#define comp_iter 336
-#define comp_for 337
-#define comp_if 338
-#define encoding_decl 339
-#define yield_expr 340
-#define yield_arg 341
diff --git a/dependencies2013/win32/include/python/grammar.h b/dependencies2013/win32/include/python/grammar.h
deleted file mode 100644
index f775f963..00000000
--- a/dependencies2013/win32/include/python/grammar.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-/* Grammar interface */
-
-#ifndef Py_GRAMMAR_H
-#define Py_GRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "bitset.h" /* Sigh... */
-
-/* A label of an arc */
-
-typedef struct {
-    int		 lb_type;
-    char	*lb_str;
-} label;
-
-#define EMPTY 0		/* Label number 0 is by definition the empty label */
-
-/* A list of labels */
-
-typedef struct {
-    int		 ll_nlabels;
-    label	*ll_label;
-} labellist;
-
-/* An arc from one state to another */
-
-typedef struct {
-    short	a_lbl;		/* Label of this arc */
-    short	a_arrow;	/* State where this arc goes to */
-} arc;
-
-/* A state in a DFA */
-
-typedef struct {
-    int		 s_narcs;
-    arc		*s_arc;		/* Array of arcs */
-
-    /* Optional accelerators */
-    int		 s_lower;	/* Lowest label index */
-    int		 s_upper;	/* Highest label index */
-    int		*s_accel;	/* Accelerator */
-    int		 s_accept;	/* Nonzero for accepting state */
-} state;
-
-/* A DFA */
-
-typedef struct {
-    int		 d_type;	/* Non-terminal this represents */
-    char	*d_name;	/* For printing */
-    int		 d_initial;	/* Initial state */
-    int		 d_nstates;
-    state	*d_state;	/* Array of states */
-    bitset	 d_first;
-} dfa;
-
-/* A grammar */
-
-typedef struct {
-    int		 g_ndfas;
-    dfa		*g_dfa;		/* Array of DFAs */
-    labellist	 g_ll;
-    int		 g_start;	/* Start symbol of the grammar */
-    int		 g_accel;	/* Set if accelerators present */
-} grammar;
-
-/* FUNCTIONS */
-
-grammar *newgrammar(int start);
-void freegrammar(grammar *g);
-dfa *adddfa(grammar *g, int type, const char *name);
-int addstate(dfa *d);
-void addarc(dfa *d, int from, int to, int lbl);
-dfa *PyGrammar_FindDFA(grammar *g, int type);
-
-int addlabel(labellist *ll, int type, const char *str);
-int findlabel(labellist *ll, int type, const char *str);
-const char *PyGrammar_LabelRepr(label *lb);
-void translatelabels(grammar *g);
-
-void addfirstsets(grammar *g);
-
-void PyGrammar_AddAccelerators(grammar *g);
-void PyGrammar_RemoveAccelerators(grammar *);
-
-void printgrammar(grammar *g, FILE *fp);
-void printnonterminals(grammar *g, FILE *fp);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GRAMMAR_H */
diff --git a/dependencies2013/win32/include/python/import.h b/dependencies2013/win32/include/python/import.h
deleted file mode 100644
index bb6beba6..00000000
--- a/dependencies2013/win32/include/python/import.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-/* Module definition and import interface */
-
-#ifndef Py_IMPORT_H
-#define Py_IMPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyImportZip_Init(void);
-
-PyMODINIT_FUNC PyInit_imp(void);
-#endif /* !Py_LIMITED_API */
-PyAPI_FUNC(long) PyImport_GetMagicNumber(void);
-PyAPI_FUNC(const char *) PyImport_GetMagicTag(void);
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *co
-    );
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *co,
-    const char *pathname        /* decoded from the filesystem encoding */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleWithPathnames(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *co,
-    const char *pathname,       /* decoded from the filesystem encoding */
-    const char *cpathname       /* decoded from the filesystem encoding */
-    );
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(
-    PyObject *name,
-    PyObject *co,
-    PyObject *pathname,
-    PyObject *cpathname
-    );
-#endif
-PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(
-    PyObject *name
-    );
-#endif
-PyAPI_FUNC(PyObject *) PyImport_AddModule(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ImportModule(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *globals,
-    PyObject *locals,
-    PyObject *fromlist,
-    int level
-    );
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevelObject(
-    PyObject *name,
-    PyObject *globals,
-    PyObject *locals,
-    PyObject *fromlist,
-    int level
-    );
-#endif
-
-#define PyImport_ImportModuleEx(n, g, l, f) \
-    PyImport_ImportModuleLevel(n, g, l, f, 0)
-
-PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
-PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
-PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
-PyAPI_FUNC(void) PyImport_Cleanup(void);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(int) PyImport_ImportFrozenModuleObject(
-    PyObject *name
-    );
-#endif
-PyAPI_FUNC(int) PyImport_ImportFrozenModule(
-    const char *name            /* UTF-8 encoded string */
-    );
-
-#ifndef Py_LIMITED_API
-#ifdef WITH_THREAD
-PyAPI_FUNC(void) _PyImport_AcquireLock(void);
-PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
-#else
-#define _PyImport_AcquireLock()
-#define _PyImport_ReleaseLock() 1
-#endif
-
-PyAPI_FUNC(void) _PyImport_ReInitLock(void);
-
-PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
-PyAPI_FUNC(int) _PyImport_FixupBuiltin(
-    PyObject *mod,
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
-
-struct _inittab {
-    const char *name;           /* ASCII encoded string */
-    PyObject* (*initfunc)(void);
-};
-PyAPI_DATA(struct _inittab *) PyImport_Inittab;
-PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
-#endif /* Py_LIMITED_API */
-
-PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
-
-PyAPI_FUNC(int) PyImport_AppendInittab(
-    const char *name,           /* ASCII encoded string */
-    PyObject* (*initfunc)(void)
-    );
-
-#ifndef Py_LIMITED_API
-struct _frozen {
-    const char *name;                 /* ASCII encoded string */
-    const unsigned char *code;
-    int size;
-};
-
-/* Embedding apps may change this pointer to point to their favorite
-   collection of frozen modules: */
-
-PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_IMPORT_H */
diff --git a/dependencies2013/win32/include/python/intrcheck.h b/dependencies2013/win32/include/python/intrcheck.h
deleted file mode 100644
index 8fb96cf9..00000000
--- a/dependencies2013/win32/include/python/intrcheck.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#ifndef Py_INTRCHECK_H
-#define Py_INTRCHECK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_InterruptOccurred(void);
-PyAPI_FUNC(void) PyOS_InitInterrupts(void);
-PyAPI_FUNC(void) PyOS_AfterFork(void);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyOS_IsMainThread(void);
-
-#ifdef MS_WINDOWS
-/* windows.h is not included by Python.h so use void* instead of HANDLE */
-PyAPI_FUNC(void*) _PyOS_SigintEvent(void);
-#endif
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTRCHECK_H */
diff --git a/dependencies2013/win32/include/python/iterobject.h b/dependencies2013/win32/include/python/iterobject.h
deleted file mode 100644
index f61726f1..00000000
--- a/dependencies2013/win32/include/python/iterobject.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef Py_ITEROBJECT_H
-#define Py_ITEROBJECT_H
-/* Iterators (the basic kind, over a sequence) */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PySeqIter_Type;
-PyAPI_DATA(PyTypeObject) PyCallIter_Type;
-PyAPI_DATA(PyTypeObject) PyCmpWrapper_Type;
-
-#define PySeqIter_Check(op) (Py_TYPE(op) == &PySeqIter_Type)
-
-PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *);
-
-
-#define PyCallIter_Check(op) (Py_TYPE(op) == &PyCallIter_Type)
-
-PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ITEROBJECT_H */
-
diff --git a/dependencies2013/win32/include/python/listobject.h b/dependencies2013/win32/include/python/listobject.h
deleted file mode 100644
index 31843b5d..00000000
--- a/dependencies2013/win32/include/python/listobject.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* List object interface */
-
-/*
-Another generally useful object type is a list of object pointers.
-This is a mutable type: the list items can be changed, and items can be
-added or removed.  Out-of-range indices or non-list objects are ignored.
-
-*** WARNING *** PyList_SetItem does not increment the new item's reference
-count, but does decrement the reference count of the item it replaces,
-if not nil.  It does *decrement* the reference count if it is *not*
-inserted in the list.  Similarly, PyList_GetItem does not increment the
-returned item's reference count.
-*/
-
-#ifndef Py_LISTOBJECT_H
-#define Py_LISTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_VAR_HEAD
-    /* Vector of pointers to list elements.  list[0] is ob_item[0], etc. */
-    PyObject **ob_item;
-
-    /* ob_item contains space for 'allocated' elements.  The number
-     * currently in use is ob_size.
-     * Invariants:
-     *     0 <= ob_size <= allocated
-     *     len(list) == ob_size
-     *     ob_item == NULL implies ob_size == allocated == 0
-     * list.sort() temporarily sets allocated to -1 to detect mutations.
-     *
-     * Items must normally not be NULL, except during construction when
-     * the list is not yet visible outside the function that builds it.
-     */
-    Py_ssize_t allocated;
-} PyListObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyList_Type;
-PyAPI_DATA(PyTypeObject) PyListIter_Type;
-PyAPI_DATA(PyTypeObject) PyListRevIter_Type;
-PyAPI_DATA(PyTypeObject) PySortWrapper_Type;
-
-#define PyList_Check(op) \
-    PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
-#define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type)
-
-PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size);
-PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *);
-PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Sort(PyObject *);
-PyAPI_FUNC(int) PyList_Reverse(PyObject *);
-PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *);
-
-PyAPI_FUNC(int) PyList_ClearFreeList(void);
-PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);
-#endif
-
-/* Macro, trading safety for speed */
-#ifndef Py_LIMITED_API
-#define PyList_GET_ITEM(op, i) (((PyListObject *)(op))->ob_item[i])
-#define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v))
-#define PyList_GET_SIZE(op)    Py_SIZE(op)
-#define _PyList_ITEMS(op)      (((PyListObject *)(op))->ob_item)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LISTOBJECT_H */
diff --git a/dependencies2013/win32/include/python/longintrepr.h b/dependencies2013/win32/include/python/longintrepr.h
deleted file mode 100644
index a3b74b4f..00000000
--- a/dependencies2013/win32/include/python/longintrepr.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_LONGINTREPR_H
-#define Py_LONGINTREPR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* This is published for the benefit of "friends" marshal.c and _decimal.c. */
-
-/* Parameters of the integer representation.  There are two different
-   sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit
-   integer type, and one set for 15-bit digits with each digit stored in an
-   unsigned short.  The value of PYLONG_BITS_IN_DIGIT, defined either at
-   configure time or in pyport.h, is used to decide which digit size to use.
-
-   Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits'
-   should be an unsigned integer type able to hold all integers up to
-   PyLong_BASE*PyLong_BASE-1.  x_sub assumes that 'digit' is an unsigned type,
-   and that overflow is handled by taking the result modulo 2**N for some N >
-   PyLong_SHIFT.  The majority of the code doesn't care about the precise
-   value of PyLong_SHIFT, but there are some notable exceptions:
-
-   - long_pow() requires that PyLong_SHIFT be divisible by 5
-
-   - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8
-
-   - long_hash() requires that PyLong_SHIFT is *strictly* less than the number
-     of bits in an unsigned long, as do the PyLong <-> long (or unsigned long)
-     conversion functions
-
-   - the Python int <-> size_t/Py_ssize_t conversion functions expect that
-     PyLong_SHIFT is strictly less than the number of bits in a size_t
-
-   - the marshal code currently expects that PyLong_SHIFT is a multiple of 15
-
-   - NSMALLNEGINTS and NSMALLPOSINTS should be small enough to fit in a single
-     digit; with the current values this forces PyLong_SHIFT >= 9
-
-  The values 15 and 30 should fit all of the above requirements, on any
-  platform.
-*/
-
-#if PYLONG_BITS_IN_DIGIT == 30
-typedef uint32_t digit;
-typedef int32_t sdigit; /* signed variant of digit */
-typedef uint64_t twodigits;
-typedef int64_t stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT	30
-#define _PyLong_DECIMAL_SHIFT	9 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE	((digit)1000000000) /* 10 ** DECIMAL_SHIFT */
-#elif PYLONG_BITS_IN_DIGIT == 15
-typedef unsigned short digit;
-typedef short sdigit; /* signed variant of digit */
-typedef unsigned long twodigits;
-typedef long stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT	15
-#define _PyLong_DECIMAL_SHIFT	4 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE	((digit)10000) /* 10 ** DECIMAL_SHIFT */
-#else
-#error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
-#endif
-#define PyLong_BASE	((digit)1 << PyLong_SHIFT)
-#define PyLong_MASK	((digit)(PyLong_BASE - 1))
-
-#if PyLong_SHIFT % 5 != 0
-#error "longobject.c requires that PyLong_SHIFT be divisible by 5"
-#endif
-
-/* Long integer representation.
-   The absolute value of a number is equal to
-   	SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i)
-   Negative numbers are represented with ob_size < 0;
-   zero is represented by ob_size == 0.
-   In a normalized number, ob_digit[abs(ob_size)-1] (the most significant
-   digit) is never zero.  Also, in all cases, for all valid i,
-   	0 <= ob_digit[i] <= MASK.
-   The allocation function takes care of allocating extra memory
-   so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available.
-
-   CAUTION:  Generic code manipulating subtypes of PyVarObject has to
-   aware that ints abuse  ob_size's sign bit.
-*/
-
-struct _longobject {
-	PyObject_VAR_HEAD
-	digit ob_digit[1];
-};
-
-PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t);
-
-/* Return a copy of src. */
-PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LONGINTREPR_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/longobject.h b/dependencies2013/win32/include/python/longobject.h
deleted file mode 100644
index efd409c7..00000000
--- a/dependencies2013/win32/include/python/longobject.h
+++ /dev/null
@@ -1,215 +0,0 @@
-#ifndef Py_LONGOBJECT_H
-#define Py_LONGOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Long (arbitrary precision) integer object interface */
-
-typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */
-
-PyAPI_DATA(PyTypeObject) PyLong_Type;
-
-#define PyLong_Check(op) \
-        PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS)
-#define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type)
-
-PyAPI_FUNC(PyObject *) PyLong_FromLong(long);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long);
-PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t);
-PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyLong_FromDouble(double);
-PyAPI_FUNC(long) PyLong_AsLong(PyObject *);
-PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *);
-PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *);
-PyAPI_FUNC(size_t) PyLong_AsSize_t(PyObject *);
-PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *);
-PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyLong_AsInt(PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyLong_GetInfo(void);
-
-/* It may be useful in the future. I've added it in the PyInt -> PyLong
-   cleanup to keep the extra information. [CH] */
-#define PyLong_AS_LONG(op) PyLong_AsLong(op)
-
-/* Issue #1983: pid_t can be longer than a C long on some systems */
-#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT
-#define _Py_PARSE_PID "i"
-#define PyLong_FromPid PyLong_FromLong
-#define PyLong_AsPid PyLong_AsLong
-#elif SIZEOF_PID_T == SIZEOF_LONG
-#define _Py_PARSE_PID "l"
-#define PyLong_FromPid PyLong_FromLong
-#define PyLong_AsPid PyLong_AsLong
-#elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG
-#define _Py_PARSE_PID "L"
-#define PyLong_FromPid PyLong_FromLongLong
-#define PyLong_AsPid PyLong_AsLongLong
-#else
-#error "sizeof(pid_t) is neither sizeof(int), sizeof(long) or sizeof(long long)"
-#endif /* SIZEOF_PID_T */
-
-#if SIZEOF_VOID_P == SIZEOF_INT
-#  define _Py_PARSE_INTPTR "i"
-#  define _Py_PARSE_UINTPTR "I"
-#elif SIZEOF_VOID_P == SIZEOF_LONG
-#  define _Py_PARSE_INTPTR "l"
-#  define _Py_PARSE_UINTPTR "k"
-#elif defined(SIZEOF_LONG_LONG) && SIZEOF_VOID_P == SIZEOF_LONG_LONG
-#  define _Py_PARSE_INTPTR "L"
-#  define _Py_PARSE_UINTPTR "K"
-#else
-#  error "void* different in size from int, long and long long"
-#endif /* SIZEOF_VOID_P */
-
-/* Used by Python/mystrtoul.c, _PyBytes_FromHex(),
-   _PyBytes_DecodeEscapeRecode(), etc. */
-#ifndef Py_LIMITED_API
-PyAPI_DATA(unsigned char) _PyLong_DigitValue[256];
-#endif
-
-/* _PyLong_Frexp returns a double x and an exponent e such that the
-   true value is approximately equal to x * 2**e.  e is >= 0.  x is
-   0.0 if and only if the input is 0 (in which case, e and x are both
-   zeroes); otherwise, 0.5 <= abs(x) < 1.0.  On overflow, which is
-   possible if the number of bits doesn't fit into a Py_ssize_t, sets
-   OverflowError and returns -1.0 for x, 0 for e. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e);
-#endif
-
-PyAPI_FUNC(double) PyLong_AsDouble(PyObject *);
-PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *);
-PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *);
-
-PyAPI_FUNC(PyObject *) PyLong_FromLongLong(long long);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned long long);
-PyAPI_FUNC(long long) PyLong_AsLongLong(PyObject *);
-PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLong(PyObject *);
-PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLongMask(PyObject *);
-PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *);
-
-PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
-PyAPI_FUNC(PyObject *) PyLong_FromUnicodeObject(PyObject *u, int base);
-PyAPI_FUNC(PyObject *) _PyLong_FromBytes(const char *, Py_ssize_t, int);
-#endif
-
-#ifndef Py_LIMITED_API
-/* _PyLong_Sign.  Return 0 if v is 0, -1 if v < 0, +1 if v > 0.
-   v must not be NULL, and must be a normalized long.
-   There are no error cases.
-*/
-PyAPI_FUNC(int) _PyLong_Sign(PyObject *v);
-
-
-/* _PyLong_NumBits.  Return the number of bits needed to represent the
-   absolute value of a long.  For example, this returns 1 for 1 and -1, 2
-   for 2 and -2, and 2 for 3 and -3.  It returns 0 for 0.
-   v must not be NULL, and must be a normalized long.
-   (size_t)-1 is returned and OverflowError set if the true result doesn't
-   fit in a size_t.
-*/
-PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v);
-
-/* _PyLong_DivmodNear.  Given integers a and b, compute the nearest
-   integer q to the exact quotient a / b, rounding to the nearest even integer
-   in the case of a tie.  Return (q, r), where r = a - q*b.  The remainder r
-   will satisfy abs(r) <= abs(b)/2, with equality possible only if q is
-   even.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_DivmodNear(PyObject *, PyObject *);
-
-/* _PyLong_FromByteArray:  View the n unsigned bytes as a binary integer in
-   base 256, and return a Python int with the same numeric value.
-   If n is 0, the integer is 0.  Else:
-   If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB;
-   else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the
-   LSB.
-   If is_signed is 0/false, view the bytes as a non-negative integer.
-   If is_signed is 1/true, view the bytes as a 2's-complement integer,
-   non-negative if bit 0x80 of the MSB is clear, negative if set.
-   Error returns:
-   + Return NULL with the appropriate exception set if there's not
-     enough memory to create the Python int.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_FromByteArray(
-    const unsigned char* bytes, size_t n,
-    int little_endian, int is_signed);
-
-/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long
-   v to a base-256 integer, stored in array bytes.  Normally return 0,
-   return -1 on error.
-   If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at
-   bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and
-   the LSB at bytes[n-1].
-   If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes
-   are filled and there's nothing special about bit 0x80 of the MSB.
-   If is_signed is 1/true, bytes is filled with the 2's-complement
-   representation of v's value.  Bit 0x80 of the MSB is the sign bit.
-   Error returns (-1):
-   + is_signed is 0 and v < 0.  TypeError is set in this case, and bytes
-     isn't altered.
-   + n isn't big enough to hold the full mathematical value of v.  For
-     example, if is_signed is 0 and there are more digits in the v than
-     fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of
-     being large enough to hold a sign bit.  OverflowError is set in this
-     case, but bytes holds the least-significant n bytes of the true value.
-*/
-PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v,
-    unsigned char* bytes, size_t n,
-    int little_endian, int is_signed);
-
-/* _PyLong_FromNbInt: Convert the given object to a PyLongObject
-   using the nb_int slot, if available.  Raise TypeError if either the
-   nb_int slot is not available or the result of the call to nb_int
-   returns something not of type int.
-*/
-PyAPI_FUNC(PyLongObject *)_PyLong_FromNbInt(PyObject *);
-
-/* _PyLong_Format: Convert the long to a string object with given base,
-   appending a base prefix of 0[box] if base is 2, 8 or 16. */
-PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *obj, int base);
-
-PyAPI_FUNC(int) _PyLong_FormatWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    int base,
-    int alternate);
-
-PyAPI_FUNC(char*) _PyLong_FormatBytesWriter(
-    _PyBytesWriter *writer,
-    char *str,
-    PyObject *obj,
-    int base,
-    int alternate);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif /* Py_LIMITED_API */
-
-/* These aren't really part of the int object, but they're handy. The
-   functions are in Python/mystrtoul.c.
- */
-PyAPI_FUNC(unsigned long) PyOS_strtoul(const char *, char **, int);
-PyAPI_FUNC(long) PyOS_strtol(const char *, char **, int);
-
-#ifndef Py_LIMITED_API
-/* For use by the gcd function in mathmodule.c */
-PyAPI_FUNC(PyObject *) _PyLong_GCD(PyObject *, PyObject *);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LONGOBJECT_H */
diff --git a/dependencies2013/win32/include/python/marshal.h b/dependencies2013/win32/include/python/marshal.h
deleted file mode 100644
index 09d9337e..00000000
--- a/dependencies2013/win32/include/python/marshal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-/* Interface for marshal.c */
-
-#ifndef Py_MARSHAL_H
-#define Py_MARSHAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define Py_MARSHAL_VERSION 4
-
-PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int);
-PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int);
-PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *);
-PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *);
-#endif
-PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(const char *,
-                                                      Py_ssize_t);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MARSHAL_H */
diff --git a/dependencies2013/win32/include/python/memoryobject.h b/dependencies2013/win32/include/python/memoryobject.h
deleted file mode 100644
index 990a716f..00000000
--- a/dependencies2013/win32/include/python/memoryobject.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Memory view object. In Python this is available as "memoryview". */
-
-#ifndef Py_MEMORYOBJECT_H
-#define Py_MEMORYOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyManagedBuffer_Type;
-#endif
-PyAPI_DATA(PyTypeObject) PyMemoryView_Type;
-
-#define PyMemoryView_Check(op) (Py_TYPE(op) == &PyMemoryView_Type)
-
-#ifndef Py_LIMITED_API
-/* Get a pointer to the memoryview's private copy of the exporter's buffer. */
-#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view)
-/* Get a pointer to the exporting object (this may be NULL!). */
-#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj)
-#endif
-
-PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyMemoryView_FromMemory(char *mem, Py_ssize_t size,
-                                               int flags);
-#endif
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info);
-#endif
-PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base,
-                                                  int buffertype,
-                                                  char order);
-
-
-/* The structs are declared here so that macros can work, but they shouldn't
-   be considered public. Don't access their fields directly, use the macros
-   and functions instead! */
-#ifndef Py_LIMITED_API
-#define _Py_MANAGED_BUFFER_RELEASED    0x001  /* access to exporter blocked */
-#define _Py_MANAGED_BUFFER_FREE_FORMAT 0x002  /* free format */
-typedef struct {
-    PyObject_HEAD
-    int flags;          /* state flags */
-    Py_ssize_t exports; /* number of direct memoryview exports */
-    Py_buffer master; /* snapshot buffer obtained from the original exporter */
-} _PyManagedBufferObject;
-
-
-/* memoryview state flags */
-#define _Py_MEMORYVIEW_RELEASED    0x001  /* access to master buffer blocked */
-#define _Py_MEMORYVIEW_C           0x002  /* C-contiguous layout */
-#define _Py_MEMORYVIEW_FORTRAN     0x004  /* Fortran contiguous layout */
-#define _Py_MEMORYVIEW_SCALAR      0x008  /* scalar: ndim = 0 */
-#define _Py_MEMORYVIEW_PIL         0x010  /* PIL-style layout */
-
-typedef struct {
-    PyObject_VAR_HEAD
-    _PyManagedBufferObject *mbuf; /* managed buffer */
-    Py_hash_t hash;               /* hash value for read-only views */
-    int flags;                    /* state flags */
-    Py_ssize_t exports;           /* number of buffer re-exports */
-    Py_buffer view;               /* private copy of the exporter's view */
-    PyObject *weakreflist;
-    Py_ssize_t ob_array[1];       /* shape, strides, suboffsets */
-} PyMemoryViewObject;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MEMORYOBJECT_H */
diff --git a/dependencies2013/win32/include/python/metagrammar.h b/dependencies2013/win32/include/python/metagrammar.h
deleted file mode 100644
index 15c8ef8f..00000000
--- a/dependencies2013/win32/include/python/metagrammar.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef Py_METAGRAMMAR_H
-#define Py_METAGRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define MSTART 256
-#define RULE 257
-#define RHS 258
-#define ALT 259
-#define ITEM 260
-#define ATOM 261
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_METAGRAMMAR_H */
diff --git a/dependencies2013/win32/include/python/methodobject.h b/dependencies2013/win32/include/python/methodobject.h
deleted file mode 100644
index 79fad823..00000000
--- a/dependencies2013/win32/include/python/methodobject.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-/* Method object interface */
-
-#ifndef Py_METHODOBJECT_H
-#define Py_METHODOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is about the type 'builtin_function_or_method',
-   not Python methods in user-defined classes.  See classobject.h
-   for the latter. */
-
-PyAPI_DATA(PyTypeObject) PyCFunction_Type;
-
-#define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type)
-
-typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
-typedef PyObject *(*_PyCFunctionFast) (PyObject *self, PyObject **args,
-                                       Py_ssize_t nargs, PyObject *kwnames);
-typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
-                                             PyObject *);
-typedef PyObject *(*PyNoArgsFunction)(PyObject *);
-
-PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
-PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *);
-PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#ifndef Py_LIMITED_API
-#define PyCFunction_GET_FUNCTION(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_meth)
-#define PyCFunction_GET_SELF(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_STATIC ? \
-         NULL : ((PyCFunctionObject *)func) -> m_self)
-#define PyCFunction_GET_FLAGS(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_flags)
-#endif
-PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func,
-    PyObject **args,
-    Py_ssize_t nargs,
-    PyObject *kwargs);
-
-PyAPI_FUNC(PyObject *) _PyCFunction_FastCallKeywords(PyObject *func,
-    PyObject **stack,
-    Py_ssize_t nargs,
-    PyObject *kwnames);
-#endif
-
-struct PyMethodDef {
-    const char  *ml_name;   /* The name of the built-in function/method */
-    PyCFunction ml_meth;    /* The C function that implements it */
-    int         ml_flags;   /* Combination of METH_xxx flags, which mostly
-                               describe the args expected by the C func */
-    const char  *ml_doc;    /* The __doc__ attribute, or NULL */
-};
-typedef struct PyMethodDef PyMethodDef;
-
-#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL)
-PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *,
-                                         PyObject *);
-
-/* Flag passed to newmethodobject */
-/* #define METH_OLDARGS  0x0000   -- unsupported now */
-#define METH_VARARGS  0x0001
-#define METH_KEYWORDS 0x0002
-/* METH_NOARGS and METH_O must not be combined with the flags above. */
-#define METH_NOARGS   0x0004
-#define METH_O        0x0008
-
-/* METH_CLASS and METH_STATIC are a little different; these control
-   the construction of methods for a class.  These cannot be used for
-   functions in modules. */
-#define METH_CLASS    0x0010
-#define METH_STATIC   0x0020
-
-/* METH_COEXIST allows a method to be entered even though a slot has
-   already filled the entry.  When defined, the flag allows a separate
-   method, "__contains__" for example, to coexist with a defined
-   slot like sq_contains. */
-
-#define METH_COEXIST   0x0040
-
-#ifndef Py_LIMITED_API
-#define METH_FASTCALL  0x0080
-
-typedef struct {
-    PyObject_HEAD
-    PyMethodDef *m_ml; /* Description of the C function to call */
-    PyObject    *m_self; /* Passed as 'self' arg to the C func, can be NULL */
-    PyObject    *m_module; /* The __module__ attribute, can be anything */
-    PyObject    *m_weakreflist; /* List of weak references */
-} PyCFunctionObject;
-#endif
-
-PyAPI_FUNC(int) PyCFunction_ClearFreeList(void);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyCFunction_DebugMallocStats(FILE *out);
-PyAPI_FUNC(void) _PyMethod_DebugMallocStats(FILE *out);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_METHODOBJECT_H */
diff --git a/dependencies2013/win32/include/python/modsupport.h b/dependencies2013/win32/include/python/modsupport.h
deleted file mode 100644
index 86719c6e..00000000
--- a/dependencies2013/win32/include/python/modsupport.h
+++ /dev/null
@@ -1,183 +0,0 @@
-
-#ifndef Py_MODSUPPORT_H
-#define Py_MODSUPPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Module support interface */
-
-#include <stdarg.h>
-
-/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier
-   to mean Py_ssize_t */
-#ifdef PY_SSIZE_T_CLEAN
-#define PyArg_Parse                     _PyArg_Parse_SizeT
-#define PyArg_ParseTuple                _PyArg_ParseTuple_SizeT
-#define PyArg_ParseTupleAndKeywords     _PyArg_ParseTupleAndKeywords_SizeT
-#define PyArg_VaParse                   _PyArg_VaParse_SizeT
-#define PyArg_VaParseTupleAndKeywords   _PyArg_VaParseTupleAndKeywords_SizeT
-#define Py_BuildValue                   _Py_BuildValue_SizeT
-#define Py_VaBuildValue                 _Py_VaBuildValue_SizeT
-#else
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list);
-#endif /* !Py_LIMITED_API */
-#endif
-
-/* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
-#if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
-PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
-                                                  const char *, char **, ...);
-PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);
-PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
-                                                  const char *, char **, va_list);
-#endif
-PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
-PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
-PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
-PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw);
-PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args);
-#endif
-PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
-
-#ifndef Py_LIMITED_API
-typedef struct _PyArg_Parser {
-    const char *format;
-    const char * const *keywords;
-    const char *fname;
-    const char *custom_msg;
-    int pos;            /* number of positional-only arguments */
-    int min;            /* minimal number of arguments */
-    int max;            /* maximal number of positional arguments */
-    PyObject *kwtuple;  /* tuple of keyword parameter names */
-    struct _PyArg_Parser *next;
-} _PyArg_Parser;
-#ifdef PY_SSIZE_T_CLEAN
-#define _PyArg_ParseTupleAndKeywordsFast  _PyArg_ParseTupleAndKeywordsFast_SizeT
-#define _PyArg_ParseStack  _PyArg_ParseStack_SizeT
-#define _PyArg_VaParseTupleAndKeywordsFast  _PyArg_VaParseTupleAndKeywordsFast_SizeT
-#endif
-PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywordsFast(PyObject *, PyObject *,
-                                                 struct _PyArg_Parser *, ...);
-PyAPI_FUNC(int) _PyArg_ParseStack(PyObject **args, Py_ssize_t nargs, PyObject *kwnames,
-                                  struct _PyArg_Parser *, ...);
-PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywordsFast(PyObject *, PyObject *,
-                                                   struct _PyArg_Parser *, va_list);
-void _PyArg_Fini(void);
-#endif
-
-PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
-PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
-PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
-#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
-#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *);
-PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *);
-PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def);
-#endif
-
-#define Py_CLEANUP_SUPPORTED 0x20000
-
-#define PYTHON_API_VERSION 1013
-#define PYTHON_API_STRING "1013"
-/* The API version is maintained (independently from the Python version)
-   so we can detect mismatches between the interpreter and dynamically
-   loaded modules.  These are diagnosed by an error message but
-   the module is still loaded (because the mismatch can only be tested
-   after loading the module).  The error message is intended to
-   explain the core dump a few seconds later.
-
-   The symbol PYTHON_API_STRING defines the same value as a string
-   literal.  *** PLEASE MAKE SURE THE DEFINITIONS MATCH. ***
-
-   Please add a line or two to the top of this log for each API
-   version change:
-
-   22-Feb-2006  MvL     1013    PEP 353 - long indices for sequence lengths
-
-   19-Aug-2002  GvR     1012    Changes to string object struct for
-                                interning changes, saving 3 bytes.
-
-   17-Jul-2001  GvR     1011    Descr-branch, just to be on the safe side
-
-   25-Jan-2001  FLD     1010    Parameters added to PyCode_New() and
-                                PyFrame_New(); Python 2.1a2
-
-   14-Mar-2000  GvR     1009    Unicode API added
-
-   3-Jan-1999   GvR     1007    Decided to change back!  (Don't reuse 1008!)
-
-   3-Dec-1998   GvR     1008    Python 1.5.2b1
-
-   18-Jan-1997  GvR     1007    string interning and other speedups
-
-   11-Oct-1996  GvR     renamed Py_Ellipses to Py_Ellipsis :-(
-
-   30-Jul-1996  GvR     Slice and ellipses syntax added
-
-   23-Jul-1996  GvR     For 1.4 -- better safe than sorry this time :-)
-
-   7-Nov-1995   GvR     Keyword arguments (should've been done at 1.3 :-( )
-
-   10-Jan-1995  GvR     Renamed globals to new naming scheme
-
-   9-Jan-1995   GvR     Initial version (incompatible with older API)
-*/
-
-/* The PYTHON_ABI_VERSION is introduced in PEP 384. For the lifetime of
-   Python 3, it will stay at the value of 3; changes to the limited API
-   must be performed in a strictly backwards-compatible manner. */
-#define PYTHON_ABI_VERSION 3
-#define PYTHON_ABI_STRING "3"
-
-#ifdef Py_TRACE_REFS
- /* When we are tracing reference counts, rename module creation functions so
-    modules compiled with incompatible settings will generate a
-    link-time error. */
- #define PyModule_Create2 PyModule_Create2TraceRefs
- #define PyModule_FromDefAndSpec2 PyModule_FromDefAndSpec2TraceRefs
-#endif
-
-PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*,
-                                     int apiver);
-
-#ifdef Py_LIMITED_API
-#define PyModule_Create(module) \
-        PyModule_Create2(module, PYTHON_ABI_VERSION)
-#else
-#define PyModule_Create(module) \
-        PyModule_Create2(module, PYTHON_API_VERSION)
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-PyAPI_FUNC(PyObject *) PyModule_FromDefAndSpec2(PyModuleDef *def,
-                                                PyObject *spec,
-                                                int module_api_version);
-
-#ifdef Py_LIMITED_API
-#define PyModule_FromDefAndSpec(module, spec) \
-    PyModule_FromDefAndSpec2(module, spec, PYTHON_ABI_VERSION)
-#else
-#define PyModule_FromDefAndSpec(module, spec) \
-    PyModule_FromDefAndSpec2(module, spec, PYTHON_API_VERSION)
-#endif /* Py_LIMITED_API */
-#endif /* New in 3.5 */
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(char *) _Py_PackageContext;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MODSUPPORT_H */
diff --git a/dependencies2013/win32/include/python/moduleobject.h b/dependencies2013/win32/include/python/moduleobject.h
deleted file mode 100644
index b6e49333..00000000
--- a/dependencies2013/win32/include/python/moduleobject.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-/* Module object interface */
-
-#ifndef Py_MODULEOBJECT_H
-#define Py_MODULEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyModule_Type;
-
-#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type)
-#define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type)
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyModule_NewObject(
-    PyObject *name
-    );
-#endif
-PyAPI_FUNC(PyObject *) PyModule_New(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyModule_GetNameObject(PyObject *);
-#endif
-PyAPI_FUNC(const char *) PyModule_GetName(PyObject *);
-PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);
-PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyModule_Clear(PyObject *);
-PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *);
-#endif
-PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*);
-PyAPI_FUNC(void*) PyModule_GetState(PyObject*);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-PyAPI_FUNC(PyObject *) PyModuleDef_Init(struct PyModuleDef*);
-PyAPI_DATA(PyTypeObject) PyModuleDef_Type;
-#endif
-
-typedef struct PyModuleDef_Base {
-  PyObject_HEAD
-  PyObject* (*m_init)(void);
-  Py_ssize_t m_index;
-  PyObject* m_copy;
-} PyModuleDef_Base;
-
-#define PyModuleDef_HEAD_INIT { \
-    PyObject_HEAD_INIT(NULL)    \
-    NULL, /* m_init */          \
-    0,    /* m_index */         \
-    NULL, /* m_copy */          \
-  }
-
-struct PyModuleDef_Slot;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-typedef struct PyModuleDef_Slot{
-    int slot;
-    void *value;
-} PyModuleDef_Slot;
-
-#define Py_mod_create 1
-#define Py_mod_exec 2
-
-#ifndef Py_LIMITED_API
-#define _Py_mod_LAST_SLOT 2
-#endif
-
-#endif /* New in 3.5 */
-
-typedef struct PyModuleDef{
-  PyModuleDef_Base m_base;
-  const char* m_name;
-  const char* m_doc;
-  Py_ssize_t m_size;
-  PyMethodDef *m_methods;
-  struct PyModuleDef_Slot* m_slots;
-  traverseproc m_traverse;
-  inquiry m_clear;
-  freefunc m_free;
-} PyModuleDef;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MODULEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/namespaceobject.h b/dependencies2013/win32/include/python/namespaceobject.h
deleted file mode 100644
index 0c8d95c0..00000000
--- a/dependencies2013/win32/include/python/namespaceobject.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/* simple namespace object interface */
-
-#ifndef NAMESPACEOBJECT_H
-#define NAMESPACEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyNamespace_Type;
-
-PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !NAMESPACEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/node.h b/dependencies2013/win32/include/python/node.h
deleted file mode 100644
index 654ad858..00000000
--- a/dependencies2013/win32/include/python/node.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/* Parse tree node interface */
-
-#ifndef Py_NODE_H
-#define Py_NODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _node {
-    short		n_type;
-    char		*n_str;
-    int			n_lineno;
-    int			n_col_offset;
-    int			n_nchildren;
-    struct _node	*n_child;
-} node;
-
-PyAPI_FUNC(node *) PyNode_New(int type);
-PyAPI_FUNC(int) PyNode_AddChild(node *n, int type,
-                                      char *str, int lineno, int col_offset);
-PyAPI_FUNC(void) PyNode_Free(node *n);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
-#endif
-
-/* Node access functions */
-#define NCH(n)		((n)->n_nchildren)
-
-#define CHILD(n, i)	(&(n)->n_child[i])
-#define RCHILD(n, i)	(CHILD(n, NCH(n) + i))
-#define TYPE(n)		((n)->n_type)
-#define STR(n)		((n)->n_str)
-#define LINENO(n)       ((n)->n_lineno)
-
-/* Assert that the type of a node is what we expect */
-#define REQ(n, type) assert(TYPE(n) == (type))
-
-PyAPI_FUNC(void) PyNode_ListTree(node *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_NODE_H */
diff --git a/dependencies2013/win32/include/python/object.h b/dependencies2013/win32/include/python/object.h
deleted file mode 100644
index 63e37b8d..00000000
--- a/dependencies2013/win32/include/python/object.h
+++ /dev/null
@@ -1,1077 +0,0 @@
-#ifndef Py_OBJECT_H
-#define Py_OBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Object and type object interface */
-
-/*
-Objects are structures allocated on the heap.  Special rules apply to
-the use of objects to ensure they are properly garbage-collected.
-Objects are never allocated statically or on the stack; they must be
-accessed through special macros and functions only.  (Type objects are
-exceptions to the first rule; the standard types are represented by
-statically initialized type objects, although work on type/class unification
-for Python 2.2 made it possible to have heap-allocated type objects too).
-
-An object has a 'reference count' that is increased or decreased when a
-pointer to the object is copied or deleted; when the reference count
-reaches zero there are no references to the object left and it can be
-removed from the heap.
-
-An object has a 'type' that determines what it represents and what kind
-of data it contains.  An object's type is fixed when it is created.
-Types themselves are represented as objects; an object contains a
-pointer to the corresponding type object.  The type itself has a type
-pointer pointing to the object representing the type 'type', which
-contains a pointer to itself!).
-
-Objects do not float around in memory; once allocated an object keeps
-the same size and address.  Objects that must hold variable-size data
-can contain pointers to variable-size parts of the object.  Not all
-objects of the same type have the same size; but the size cannot change
-after allocation.  (These restrictions are made so a reference to an
-object can be simply a pointer -- moving an object would require
-updating all the pointers, and changing an object's size would require
-moving it if there was another object right next to it.)
-
-Objects are always accessed through pointers of the type 'PyObject *'.
-The type 'PyObject' is a structure that only contains the reference count
-and the type pointer.  The actual memory allocated for an object
-contains other data that can only be accessed after casting the pointer
-to a pointer to a longer structure type.  This longer type must start
-with the reference count and type fields; the macro PyObject_HEAD should be
-used for this (to accommodate for future changes).  The implementation
-of a particular object type can cast the object pointer to the proper
-type and back.
-
-A standard interface exists for objects that contain an array of items
-whose size is determined when the object is allocated.
-*/
-
-/* Py_DEBUG implies Py_TRACE_REFS. */
-#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS)
-#define Py_TRACE_REFS
-#endif
-
-/* Py_TRACE_REFS implies Py_REF_DEBUG. */
-#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG)
-#define Py_REF_DEBUG
-#endif
-
-#if defined(Py_LIMITED_API) && defined(Py_REF_DEBUG)
-#error Py_LIMITED_API is incompatible with Py_DEBUG, Py_TRACE_REFS, and Py_REF_DEBUG
-#endif
-
-
-#ifdef Py_TRACE_REFS
-/* Define pointers to support a doubly-linked list of all live heap objects. */
-#define _PyObject_HEAD_EXTRA            \
-    struct _object *_ob_next;           \
-    struct _object *_ob_prev;
-
-#define _PyObject_EXTRA_INIT 0, 0,
-
-#else
-#define _PyObject_HEAD_EXTRA
-#define _PyObject_EXTRA_INIT
-#endif
-
-/* PyObject_HEAD defines the initial segment of every PyObject. */
-#define PyObject_HEAD                   PyObject ob_base;
-
-#define PyObject_HEAD_INIT(type)        \
-    { _PyObject_EXTRA_INIT              \
-    1, type },
-
-#define PyVarObject_HEAD_INIT(type, size)       \
-    { PyObject_HEAD_INIT(type) size },
-
-/* PyObject_VAR_HEAD defines the initial segment of all variable-size
- * container objects.  These end with a declaration of an array with 1
- * element, but enough space is malloc'ed so that the array actually
- * has room for ob_size elements.  Note that ob_size is an element count,
- * not necessarily a byte count.
- */
-#define PyObject_VAR_HEAD      PyVarObject ob_base;
-#define Py_INVALID_SIZE (Py_ssize_t)-1
-
-/* Nothing is actually declared to be a PyObject, but every pointer to
- * a Python object can be cast to a PyObject*.  This is inheritance built
- * by hand.  Similarly every pointer to a variable-size Python object can,
- * in addition, be cast to PyVarObject*.
- */
-typedef struct _object {
-    _PyObject_HEAD_EXTRA
-    Py_ssize_t ob_refcnt;
-    struct _typeobject *ob_type;
-} PyObject;
-
-typedef struct {
-    PyObject ob_base;
-    Py_ssize_t ob_size; /* Number of items in variable part */
-} PyVarObject;
-
-#define Py_REFCNT(ob)           (((PyObject*)(ob))->ob_refcnt)
-#define Py_TYPE(ob)             (((PyObject*)(ob))->ob_type)
-#define Py_SIZE(ob)             (((PyVarObject*)(ob))->ob_size)
-
-#ifndef Py_LIMITED_API
-/********************* String Literals ****************************************/
-/* This structure helps managing static strings. The basic usage goes like this:
-   Instead of doing
-
-       r = PyObject_CallMethod(o, "foo", "args", ...);
-
-   do
-
-       _Py_IDENTIFIER(foo);
-       ...
-       r = _PyObject_CallMethodId(o, &PyId_foo, "args", ...);
-
-   PyId_foo is a static variable, either on block level or file level. On first
-   usage, the string "foo" is interned, and the structures are linked. On interpreter
-   shutdown, all strings are released (through _PyUnicode_ClearStaticStrings).
-
-   Alternatively, _Py_static_string allows choosing the variable name.
-   _PyUnicode_FromId returns a borrowed reference to the interned string.
-   _PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*.
-*/
-typedef struct _Py_Identifier {
-    struct _Py_Identifier *next;
-    const char* string;
-    PyObject *object;
-} _Py_Identifier;
-
-#define _Py_static_string_init(value) { .next = NULL, .string = value, .object = NULL }
-#define _Py_static_string(varname, value)  static _Py_Identifier varname = _Py_static_string_init(value)
-#define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname)
-
-#endif /* !Py_LIMITED_API */
-
-/*
-Type objects contain a string containing the type name (to help somewhat
-in debugging), the allocation parameters (see PyObject_New() and
-PyObject_NewVar()),
-and methods for accessing objects of the type.  Methods are optional, a
-nil pointer meaning that particular kind of access is not available for
-this type.  The Py_DECREF() macro uses the tp_dealloc method without
-checking for a nil pointer; it should always be implemented except if
-the implementation can guarantee that the reference count will never
-reach zero (e.g., for statically allocated type objects).
-
-NB: the methods for certain type groups are now contained in separate
-method blocks.
-*/
-
-typedef PyObject * (*unaryfunc)(PyObject *);
-typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
-typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *);
-typedef int (*inquiry)(PyObject *);
-typedef Py_ssize_t (*lenfunc)(PyObject *);
-typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
-typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
-typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
-typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
-typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *);
-
-#ifndef Py_LIMITED_API
-/* buffer interface */
-typedef struct bufferinfo {
-    void *buf;
-    PyObject *obj;        /* owned reference */
-    Py_ssize_t len;
-    Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be
-                             pointed to by strides in simple case.*/
-    int readonly;
-    int ndim;
-    char *format;
-    Py_ssize_t *shape;
-    Py_ssize_t *strides;
-    Py_ssize_t *suboffsets;
-    void *internal;
-} Py_buffer;
-
-typedef int (*getbufferproc)(PyObject *, Py_buffer *, int);
-typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
-
-/* Maximum number of dimensions */
-#define PyBUF_MAX_NDIM 64
-
-/* Flags for getting buffers */
-#define PyBUF_SIMPLE 0
-#define PyBUF_WRITABLE 0x0001
-/*  we used to include an E, backwards compatible alias  */
-#define PyBUF_WRITEABLE PyBUF_WRITABLE
-#define PyBUF_FORMAT 0x0004
-#define PyBUF_ND 0x0008
-#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
-#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
-#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
-#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
-#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
-
-#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
-#define PyBUF_CONTIG_RO (PyBUF_ND)
-
-#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
-#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
-
-#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
-
-#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
-
-
-#define PyBUF_READ  0x100
-#define PyBUF_WRITE 0x200
-
-/* End buffer interface */
-#endif /* Py_LIMITED_API */
-
-typedef int (*objobjproc)(PyObject *, PyObject *);
-typedef int (*visitproc)(PyObject *, void *);
-typedef int (*traverseproc)(PyObject *, visitproc, void *);
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    /* Number implementations must check *both*
-       arguments for proper type and implement the necessary conversions
-       in the slot functions themselves. */
-
-    binaryfunc nb_add;
-    binaryfunc nb_subtract;
-    binaryfunc nb_multiply;
-    binaryfunc nb_remainder;
-    binaryfunc nb_divmod;
-    ternaryfunc nb_power;
-    unaryfunc nb_negative;
-    unaryfunc nb_positive;
-    unaryfunc nb_absolute;
-    inquiry nb_bool;
-    unaryfunc nb_invert;
-    binaryfunc nb_lshift;
-    binaryfunc nb_rshift;
-    binaryfunc nb_and;
-    binaryfunc nb_xor;
-    binaryfunc nb_or;
-    unaryfunc nb_int;
-    void *nb_reserved;  /* the slot formerly known as nb_long */
-    unaryfunc nb_float;
-
-    binaryfunc nb_inplace_add;
-    binaryfunc nb_inplace_subtract;
-    binaryfunc nb_inplace_multiply;
-    binaryfunc nb_inplace_remainder;
-    ternaryfunc nb_inplace_power;
-    binaryfunc nb_inplace_lshift;
-    binaryfunc nb_inplace_rshift;
-    binaryfunc nb_inplace_and;
-    binaryfunc nb_inplace_xor;
-    binaryfunc nb_inplace_or;
-
-    binaryfunc nb_floor_divide;
-    binaryfunc nb_true_divide;
-    binaryfunc nb_inplace_floor_divide;
-    binaryfunc nb_inplace_true_divide;
-
-    unaryfunc nb_index;
-
-    binaryfunc nb_matrix_multiply;
-    binaryfunc nb_inplace_matrix_multiply;
-} PyNumberMethods;
-
-typedef struct {
-    lenfunc sq_length;
-    binaryfunc sq_concat;
-    ssizeargfunc sq_repeat;
-    ssizeargfunc sq_item;
-    void *was_sq_slice;
-    ssizeobjargproc sq_ass_item;
-    void *was_sq_ass_slice;
-    objobjproc sq_contains;
-
-    binaryfunc sq_inplace_concat;
-    ssizeargfunc sq_inplace_repeat;
-} PySequenceMethods;
-
-typedef struct {
-    lenfunc mp_length;
-    binaryfunc mp_subscript;
-    objobjargproc mp_ass_subscript;
-} PyMappingMethods;
-
-typedef struct {
-    unaryfunc am_await;
-    unaryfunc am_aiter;
-    unaryfunc am_anext;
-} PyAsyncMethods;
-
-typedef struct {
-     getbufferproc bf_getbuffer;
-     releasebufferproc bf_releasebuffer;
-} PyBufferProcs;
-#endif /* Py_LIMITED_API */
-
-typedef void (*freefunc)(void *);
-typedef void (*destructor)(PyObject *);
-#ifndef Py_LIMITED_API
-/* We can't provide a full compile-time check that limited-API
-   users won't implement tp_print. However, not defining printfunc
-   and making tp_print of a different function pointer type
-   should at least cause a warning in most cases. */
-typedef int (*printfunc)(PyObject *, FILE *, int);
-#endif
-typedef PyObject *(*getattrfunc)(PyObject *, char *);
-typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
-typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
-typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *);
-typedef PyObject *(*reprfunc)(PyObject *);
-typedef Py_hash_t (*hashfunc)(PyObject *);
-typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int);
-typedef PyObject *(*getiterfunc) (PyObject *);
-typedef PyObject *(*iternextfunc) (PyObject *);
-typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
-typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
-typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
-typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *);
-typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t);
-
-#ifdef Py_LIMITED_API
-typedef struct _typeobject PyTypeObject; /* opaque */
-#else
-typedef struct _typeobject {
-    PyObject_VAR_HEAD
-    const char *tp_name; /* For printing, in format "<module>.<name>" */
-    Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
-
-    /* Methods to implement standard operations */
-
-    destructor tp_dealloc;
-    printfunc tp_print;
-    getattrfunc tp_getattr;
-    setattrfunc tp_setattr;
-    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
-                                    or tp_reserved (Python 3) */
-    reprfunc tp_repr;
-
-    /* Method suites for standard classes */
-
-    PyNumberMethods *tp_as_number;
-    PySequenceMethods *tp_as_sequence;
-    PyMappingMethods *tp_as_mapping;
-
-    /* More standard operations (here for binary compatibility) */
-
-    hashfunc tp_hash;
-    ternaryfunc tp_call;
-    reprfunc tp_str;
-    getattrofunc tp_getattro;
-    setattrofunc tp_setattro;
-
-    /* Functions to access object as input/output buffer */
-    PyBufferProcs *tp_as_buffer;
-
-    /* Flags to define presence of optional/expanded features */
-    unsigned long tp_flags;
-
-    const char *tp_doc; /* Documentation string */
-
-    /* Assigned meaning in release 2.0 */
-    /* call function for all accessible objects */
-    traverseproc tp_traverse;
-
-    /* delete references to contained objects */
-    inquiry tp_clear;
-
-    /* Assigned meaning in release 2.1 */
-    /* rich comparisons */
-    richcmpfunc tp_richcompare;
-
-    /* weak reference enabler */
-    Py_ssize_t tp_weaklistoffset;
-
-    /* Iterators */
-    getiterfunc tp_iter;
-    iternextfunc tp_iternext;
-
-    /* Attribute descriptor and subclassing stuff */
-    struct PyMethodDef *tp_methods;
-    struct PyMemberDef *tp_members;
-    struct PyGetSetDef *tp_getset;
-    struct _typeobject *tp_base;
-    PyObject *tp_dict;
-    descrgetfunc tp_descr_get;
-    descrsetfunc tp_descr_set;
-    Py_ssize_t tp_dictoffset;
-    initproc tp_init;
-    allocfunc tp_alloc;
-    newfunc tp_new;
-    freefunc tp_free; /* Low-level free-memory routine */
-    inquiry tp_is_gc; /* For PyObject_IS_GC */
-    PyObject *tp_bases;
-    PyObject *tp_mro; /* method resolution order */
-    PyObject *tp_cache;
-    PyObject *tp_subclasses;
-    PyObject *tp_weaklist;
-    destructor tp_del;
-
-    /* Type attribute cache version tag. Added in version 2.6 */
-    unsigned int tp_version_tag;
-
-    destructor tp_finalize;
-
-#ifdef COUNT_ALLOCS
-    /* these must be last and never explicitly initialized */
-    Py_ssize_t tp_allocs;
-    Py_ssize_t tp_frees;
-    Py_ssize_t tp_maxalloc;
-    struct _typeobject *tp_prev;
-    struct _typeobject *tp_next;
-#endif
-} PyTypeObject;
-#endif
-
-typedef struct{
-    int slot;    /* slot id, see below */
-    void *pfunc; /* function pointer */
-} PyType_Slot;
-
-typedef struct{
-    const char* name;
-    int basicsize;
-    int itemsize;
-    unsigned int flags;
-    PyType_Slot *slots; /* terminated by slot==0. */
-} PyType_Spec;
-
-PyAPI_FUNC(PyObject*) PyType_FromSpec(PyType_Spec*);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyType_FromSpecWithBases(PyType_Spec*, PyObject*);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(void*) PyType_GetSlot(PyTypeObject*, int);
-#endif
-
-#ifndef Py_LIMITED_API
-/* The *real* layout of a type object when allocated on the heap */
-typedef struct _heaptypeobject {
-    /* Note: there's a dependency on the order of these members
-       in slotptr() in typeobject.c . */
-    PyTypeObject ht_type;
-    PyAsyncMethods as_async;
-    PyNumberMethods as_number;
-    PyMappingMethods as_mapping;
-    PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
-                                      so that the mapping wins when both
-                                      the mapping and the sequence define
-                                      a given operator (e.g. __getitem__).
-                                      see add_operators() in typeobject.c . */
-    PyBufferProcs as_buffer;
-    PyObject *ht_name, *ht_slots, *ht_qualname;
-    struct _dictkeysobject *ht_cached_keys;
-    /* here are optional user slots, followed by the members. */
-} PyHeapTypeObject;
-
-/* access macro to the members which are floating "behind" the object */
-#define PyHeapType_GET_MEMBERS(etype) \
-    ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize))
-#endif
-
-/* Generic type check */
-PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);
-#define PyObject_TypeCheck(ob, tp) \
-    (Py_TYPE(ob) == (tp) || PyType_IsSubtype(Py_TYPE(ob), (tp)))
-
-PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */
-PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */
-PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */
-
-PyAPI_FUNC(unsigned long) PyType_GetFlags(PyTypeObject*);
-
-#define PyType_Check(op) \
-    PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS)
-#define PyType_CheckExact(op) (Py_TYPE(op) == &PyType_Type)
-
-PyAPI_FUNC(int) PyType_Ready(PyTypeObject *);
-PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
-                                               PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *);
-PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
-PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
-#endif
-PyAPI_FUNC(unsigned int) PyType_ClearCache(void);
-PyAPI_FUNC(void) PyType_Modified(PyTypeObject *);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
-PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
-#endif
-
-/* Generic operations on objects */
-#ifndef Py_LIMITED_API
-struct _Py_Identifier;
-PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
-PyAPI_FUNC(void) _Py_BreakPoint(void);
-PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_ASCII(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_Bytes(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
-PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);
-PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *);
-PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *);
-PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);
-PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyObject_IsAbstract(PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_GetAttrId(PyObject *, struct _Py_Identifier *);
-PyAPI_FUNC(int) _PyObject_SetAttrId(PyObject *, struct _Py_Identifier *, PyObject *);
-PyAPI_FUNC(int) _PyObject_HasAttrId(PyObject *, struct _Py_Identifier *);
-PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *,
-                                              PyObject *, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(int) PyObject_GenericSetDict(PyObject *, PyObject *, void *);
-#endif
-PyAPI_FUNC(Py_hash_t) PyObject_Hash(PyObject *);
-PyAPI_FUNC(Py_hash_t) PyObject_HashNotImplemented(PyObject *);
-PyAPI_FUNC(int) PyObject_IsTrue(PyObject *);
-PyAPI_FUNC(int) PyObject_Not(PyObject *);
-PyAPI_FUNC(int) PyCallable_Check(PyObject *);
-
-PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *);
-PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *);
-#endif
-
-#ifndef Py_LIMITED_API
-/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
-   dict as the last parameter. */
-PyAPI_FUNC(PyObject *)
-_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(int)
-_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *,
-                                 PyObject *, PyObject *);
-#endif /* !Py_LIMITED_API */
-
-/* Helper to look up a builtin object */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *)
-_PyObject_GetBuiltin(const char *name);
-#endif
-
-/* PyObject_Dir(obj) acts like Python builtins.dir(obj), returning a
-   list of strings.  PyObject_Dir(NULL) is like builtins.dir(),
-   returning the names of the current locals.  In this case, if there are
-   no current locals, NULL is returned, and PyErr_Occurred() is false.
-*/
-PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *);
-
-
-/* Helpers for printing recursive container types */
-PyAPI_FUNC(int) Py_ReprEnter(PyObject *);
-PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
-
-/* Flag bits for printing: */
-#define Py_PRINT_RAW    1       /* No string quotes etc. */
-
-/*
-`Type flags (tp_flags)
-
-These flags are used to extend the type structure in a backwards-compatible
-fashion. Extensions can use the flags to indicate (and test) when a given
-type structure contains a new feature. The Python core will use these when
-introducing new functionality between major revisions (to avoid mid-version
-changes in the PYTHON_API_VERSION).
-
-Arbitration of the flag bit positions will need to be coordinated among
-all extension writers who publically release their extensions (this will
-be fewer than you might expect!)..
-
-Most flags were removed as of Python 3.0 to make room for new flags.  (Some
-flags are not for backwards compatibility but to indicate the presence of an
-optional feature; these flags remain of course.)
-
-Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value.
-
-Code can use PyType_HasFeature(type_ob, flag_value) to test whether the
-given type object has a specified feature.
-*/
-
-/* Set if the type object is dynamically allocated */
-#define Py_TPFLAGS_HEAPTYPE (1UL << 9)
-
-/* Set if the type allows subclassing */
-#define Py_TPFLAGS_BASETYPE (1UL << 10)
-
-/* Set if the type is 'ready' -- fully initialized */
-#define Py_TPFLAGS_READY (1UL << 12)
-
-/* Set while the type is being 'readied', to prevent recursive ready calls */
-#define Py_TPFLAGS_READYING (1UL << 13)
-
-/* Objects support garbage collection (see objimp.h) */
-#define Py_TPFLAGS_HAVE_GC (1UL << 14)
-
-/* These two bits are preserved for Stackless Python, next after this is 17 */
-#ifdef STACKLESS
-#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3UL << 15)
-#else
-#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0
-#endif
-
-/* Objects support type attribute cache */
-#define Py_TPFLAGS_HAVE_VERSION_TAG   (1UL << 18)
-#define Py_TPFLAGS_VALID_VERSION_TAG  (1UL << 19)
-
-/* Type is abstract and cannot be instantiated */
-#define Py_TPFLAGS_IS_ABSTRACT (1UL << 20)
-
-/* These flags are used to determine if a type is a subclass. */
-#define Py_TPFLAGS_LONG_SUBCLASS        (1UL << 24)
-#define Py_TPFLAGS_LIST_SUBCLASS        (1UL << 25)
-#define Py_TPFLAGS_TUPLE_SUBCLASS       (1UL << 26)
-#define Py_TPFLAGS_BYTES_SUBCLASS       (1UL << 27)
-#define Py_TPFLAGS_UNICODE_SUBCLASS     (1UL << 28)
-#define Py_TPFLAGS_DICT_SUBCLASS        (1UL << 29)
-#define Py_TPFLAGS_BASE_EXC_SUBCLASS    (1UL << 30)
-#define Py_TPFLAGS_TYPE_SUBCLASS        (1UL << 31)
-
-#define Py_TPFLAGS_DEFAULT  ( \
-                 Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \
-                 Py_TPFLAGS_HAVE_VERSION_TAG | \
-                0)
-
-/* NOTE: The following flags reuse lower bits (removed as part of the
- * Python 3.0 transition). */
-
-/* Type structure has tp_finalize member (3.4) */
-#define Py_TPFLAGS_HAVE_FINALIZE (1UL << 0)
-
-#ifdef Py_LIMITED_API
-#define PyType_HasFeature(t,f)  ((PyType_GetFlags(t) & (f)) != 0)
-#else
-#define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)
-#endif
-#define PyType_FastSubclass(t,f)  PyType_HasFeature(t,f)
-
-
-/*
-The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement
-reference counts.  Py_DECREF calls the object's deallocator function when
-the refcount falls to 0; for
-objects that don't contain references to other objects or heap memory
-this can be the standard function free().  Both macros can be used
-wherever a void expression is allowed.  The argument must not be a
-NULL pointer.  If it may be NULL, use Py_XINCREF/Py_XDECREF instead.
-The macro _Py_NewReference(op) initialize reference counts to 1, and
-in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional
-bookkeeping appropriate to the special build.
-
-We assume that the reference count field can never overflow; this can
-be proven when the size of the field is the same as the pointer size, so
-we ignore the possibility.  Provided a C int is at least 32 bits (which
-is implicitly assumed in many parts of this code), that's enough for
-about 2**31 references to an object.
-
-XXX The following became out of date in Python 2.2, but I'm not sure
-XXX what the full truth is now.  Certainly, heap-allocated type objects
-XXX can and should be deallocated.
-Type objects should never be deallocated; the type pointer in an object
-is not considered to be a reference to the type object, to save
-complications in the deallocation function.  (This is actually a
-decision that's up to the implementer of each new type so if you want,
-you can count such references to the type object.)
-*/
-
-/* First define a pile of simple helper macros, one set per special
- * build symbol.  These either expand to the obvious things, or to
- * nothing at all when the special mode isn't in effect.  The main
- * macros can later be defined just once then, yet expand to different
- * things depending on which special build options are and aren't in effect.
- * Trust me <wink>:  while painful, this is 20x easier to understand than,
- * e.g, defining _Py_NewReference five different times in a maze of nested
- * #ifdefs (we used to do that -- it was impenetrable).
- */
-#ifdef Py_REF_DEBUG
-PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
-PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname,
-                                            int lineno, PyObject *op);
-PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
-#define _Py_INC_REFTOTAL        _Py_RefTotal++
-#define _Py_DEC_REFTOTAL        _Py_RefTotal--
-#define _Py_REF_DEBUG_COMMA     ,
-#define _Py_CHECK_REFCNT(OP)                                    \
-{       if (((PyObject*)OP)->ob_refcnt < 0)                             \
-                _Py_NegativeRefcount(__FILE__, __LINE__,        \
-                                     (PyObject *)(OP));         \
-}
-/* Py_REF_DEBUG also controls the display of refcounts and memory block
- * allocations at the interactive prompt and at interpreter shutdown
- */
-PyAPI_FUNC(void) _PyDebug_PrintTotalRefs(void);
-#define _PY_DEBUG_PRINT_TOTAL_REFS() _PyDebug_PrintTotalRefs()
-#else
-#define _Py_INC_REFTOTAL
-#define _Py_DEC_REFTOTAL
-#define _Py_REF_DEBUG_COMMA
-#define _Py_CHECK_REFCNT(OP)    /* a semicolon */;
-#define _PY_DEBUG_PRINT_TOTAL_REFS()
-#endif /* Py_REF_DEBUG */
-
-#ifdef COUNT_ALLOCS
-PyAPI_FUNC(void) inc_count(PyTypeObject *);
-PyAPI_FUNC(void) dec_count(PyTypeObject *);
-#define _Py_INC_TPALLOCS(OP)    inc_count(Py_TYPE(OP))
-#define _Py_INC_TPFREES(OP)     dec_count(Py_TYPE(OP))
-#define _Py_DEC_TPFREES(OP)     Py_TYPE(OP)->tp_frees--
-#define _Py_COUNT_ALLOCS_COMMA  ,
-#else
-#define _Py_INC_TPALLOCS(OP)
-#define _Py_INC_TPFREES(OP)
-#define _Py_DEC_TPFREES(OP)
-#define _Py_COUNT_ALLOCS_COMMA
-#endif /* COUNT_ALLOCS */
-
-#ifdef Py_TRACE_REFS
-/* Py_TRACE_REFS is such major surgery that we call external routines. */
-PyAPI_FUNC(void) _Py_NewReference(PyObject *);
-PyAPI_FUNC(void) _Py_ForgetReference(PyObject *);
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
-PyAPI_FUNC(void) _Py_PrintReferences(FILE *);
-PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *);
-PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
-
-#else
-/* Without Py_TRACE_REFS, there's little enough to do that we expand code
- * inline.
- */
-#define _Py_NewReference(op) (                          \
-    _Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA         \
-    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA               \
-    Py_REFCNT(op) = 1)
-
-#define _Py_ForgetReference(op) _Py_INC_TPFREES(op)
-
-#ifdef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
-#else
-#define _Py_Dealloc(op) (                               \
-    _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA          \
-    (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op)))
-#endif
-#endif /* !Py_TRACE_REFS */
-
-#define Py_INCREF(op) (                         \
-    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-    ((PyObject *)(op))->ob_refcnt++)
-
-#define Py_DECREF(op)                                   \
-    do {                                                \
-        PyObject *_py_decref_tmp = (PyObject *)(op);    \
-        if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-        --(_py_decref_tmp)->ob_refcnt != 0)             \
-            _Py_CHECK_REFCNT(_py_decref_tmp)            \
-        else                                            \
-            _Py_Dealloc(_py_decref_tmp);                \
-    } while (0)
-
-/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
- * and tp_dealloc implementations.
- *
- * Note that "the obvious" code can be deadly:
- *
- *     Py_XDECREF(op);
- *     op = NULL;
- *
- * Typically, `op` is something like self->containee, and `self` is done
- * using its `containee` member.  In the code sequence above, suppose
- * `containee` is non-NULL with a refcount of 1.  Its refcount falls to
- * 0 on the first line, which can trigger an arbitrary amount of code,
- * possibly including finalizers (like __del__ methods or weakref callbacks)
- * coded in Python, which in turn can release the GIL and allow other threads
- * to run, etc.  Such code may even invoke methods of `self` again, or cause
- * cyclic gc to trigger, but-- oops! --self->containee still points to the
- * object being torn down, and it may be in an insane state while being torn
- * down.  This has in fact been a rich historic source of miserable (rare &
- * hard-to-diagnose) segfaulting (and other) bugs.
- *
- * The safe way is:
- *
- *      Py_CLEAR(op);
- *
- * That arranges to set `op` to NULL _before_ decref'ing, so that any code
- * triggered as a side-effect of `op` getting torn down no longer believes
- * `op` points to a valid object.
- *
- * There are cases where it's safe to use the naive code, but they're brittle.
- * For example, if `op` points to a Python integer, you know that destroying
- * one of those can't cause problems -- but in part that relies on that
- * Python integers aren't currently weakly referencable.  Best practice is
- * to use Py_CLEAR() even if you can't think of a reason for why you need to.
- */
-#define Py_CLEAR(op)                            \
-    do {                                        \
-        PyObject *_py_tmp = (PyObject *)(op);   \
-        if (_py_tmp != NULL) {                  \
-            (op) = NULL;                        \
-            Py_DECREF(_py_tmp);                 \
-        }                                       \
-    } while (0)
-
-/* Macros to use in case the object pointer may be NULL: */
-#define Py_XINCREF(op)                                \
-    do {                                              \
-        PyObject *_py_xincref_tmp = (PyObject *)(op); \
-        if (_py_xincref_tmp != NULL)                  \
-            Py_INCREF(_py_xincref_tmp);               \
-    } while (0)
-
-#define Py_XDECREF(op)                                \
-    do {                                              \
-        PyObject *_py_xdecref_tmp = (PyObject *)(op); \
-        if (_py_xdecref_tmp != NULL)                  \
-            Py_DECREF(_py_xdecref_tmp);               \
-    } while (0)
-
-#ifndef Py_LIMITED_API
-/* Safely decref `op` and set `op` to `op2`.
- *
- * As in case of Py_CLEAR "the obvious" code can be deadly:
- *
- *     Py_DECREF(op);
- *     op = op2;
- *
- * The safe way is:
- *
- *      Py_SETREF(op, op2);
- *
- * That arranges to set `op` to `op2` _before_ decref'ing, so that any code
- * triggered as a side-effect of `op` getting torn down no longer believes
- * `op` points to a valid object.
- *
- * Py_XSETREF is a variant of Py_SETREF that uses Py_XDECREF instead of
- * Py_DECREF.
- */
-
-#define Py_SETREF(op, op2)                      \
-    do {                                        \
-        PyObject *_py_tmp = (PyObject *)(op);   \
-        (op) = (op2);                           \
-        Py_DECREF(_py_tmp);                     \
-    } while (0)
-
-#define Py_XSETREF(op, op2)                     \
-    do {                                        \
-        PyObject *_py_tmp = (PyObject *)(op);   \
-        (op) = (op2);                           \
-        Py_XDECREF(_py_tmp);                    \
-    } while (0)
-
-#endif /* ifndef Py_LIMITED_API */
-
-/*
-These are provided as conveniences to Python runtime embedders, so that
-they can have object code that is not dependent on Python compilation flags.
-*/
-PyAPI_FUNC(void) Py_IncRef(PyObject *);
-PyAPI_FUNC(void) Py_DecRef(PyObject *);
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyNone_Type;
-PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;
-#endif /* !Py_LIMITED_API */
-
-/*
-_Py_NoneStruct is an object of undefined type which can be used in contexts
-where NULL (nil) is not suitable (since NULL often means 'error').
-
-Don't forget to apply Py_INCREF() when returning this value!!!
-*/
-PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
-#define Py_None (&_Py_NoneStruct)
-
-/* Macro for returning Py_None from a function */
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-
-/*
-Py_NotImplemented is a singleton used to signal that an operation is
-not implemented for a given type combination.
-*/
-PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */
-#define Py_NotImplemented (&_Py_NotImplementedStruct)
-
-/* Macro for returning Py_NotImplemented from a function */
-#define Py_RETURN_NOTIMPLEMENTED \
-    return Py_INCREF(Py_NotImplemented), Py_NotImplemented
-
-/* Rich comparison opcodes */
-#define Py_LT 0
-#define Py_LE 1
-#define Py_EQ 2
-#define Py_NE 3
-#define Py_GT 4
-#define Py_GE 5
-
-#ifndef Py_LIMITED_API
-/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
- * Defined in object.c.
- */
-PyAPI_DATA(int) _Py_SwappedOp[];
-#endif /* !Py_LIMITED_API */
-
-
-/*
-More conventions
-================
-
-Argument Checking
------------------
-
-Functions that take objects as arguments normally don't check for nil
-arguments, but they do check the type of the argument, and return an
-error if the function doesn't apply to the type.
-
-Failure Modes
--------------
-
-Functions may fail for a variety of reasons, including running out of
-memory.  This is communicated to the caller in two ways: an error string
-is set (see errors.h), and the function result differs: functions that
-normally return a pointer return NULL for failure, functions returning
-an integer return -1 (which could be a legal return value too!), and
-other functions return 0 for success and -1 for failure.
-Callers should always check for errors before using the result.  If
-an error was set, the caller must either explicitly clear it, or pass
-the error on to its caller.
-
-Reference Counts
-----------------
-
-It takes a while to get used to the proper usage of reference counts.
-
-Functions that create an object set the reference count to 1; such new
-objects must be stored somewhere or destroyed again with Py_DECREF().
-Some functions that 'store' objects, such as PyTuple_SetItem() and
-PyList_SetItem(),
-don't increment the reference count of the object, since the most
-frequent use is to store a fresh object.  Functions that 'retrieve'
-objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also
-don't increment
-the reference count, since most frequently the object is only looked at
-quickly.  Thus, to retrieve an object and store it again, the caller
-must call Py_INCREF() explicitly.
-
-NOTE: functions that 'consume' a reference count, like
-PyList_SetItem(), consume the reference even if the object wasn't
-successfully stored, to simplify error handling.
-
-It seems attractive to make other functions that take an object as
-argument consume a reference count; however, this may quickly get
-confusing (even the current practice is already confusing).  Consider
-it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at
-times.
-*/
-
-
-/* Trashcan mechanism, thanks to Christian Tismer.
-
-When deallocating a container object, it's possible to trigger an unbounded
-chain of deallocations, as each Py_DECREF in turn drops the refcount on "the
-next" object in the chain to 0.  This can easily lead to stack faults, and
-especially in threads (which typically have less stack space to work with).
-
-A container object that participates in cyclic gc can avoid this by
-bracketing the body of its tp_dealloc function with a pair of macros:
-
-static void
-mytype_dealloc(mytype *p)
-{
-    ... declarations go here ...
-
-    PyObject_GC_UnTrack(p);        // must untrack first
-    Py_TRASHCAN_SAFE_BEGIN(p)
-    ... The body of the deallocator goes here, including all calls ...
-    ... to Py_DECREF on contained objects.                         ...
-    Py_TRASHCAN_SAFE_END(p)
-}
-
-CAUTION:  Never return from the middle of the body!  If the body needs to
-"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END
-call, and goto it.  Else the call-depth counter (see below) will stay
-above 0 forever, and the trashcan will never get emptied.
-
-How it works:  The BEGIN macro increments a call-depth counter.  So long
-as this counter is small, the body of the deallocator is run directly without
-further ado.  But if the counter gets large, it instead adds p to a list of
-objects to be deallocated later, skips the body of the deallocator, and
-resumes execution after the END macro.  The tp_dealloc routine then returns
-without deallocating anything (and so unbounded call-stack depth is avoided).
-
-When the call stack finishes unwinding again, code generated by the END macro
-notices this, and calls another routine to deallocate all the objects that
-may have been added to the list of deferred deallocations.  In effect, a
-chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces,
-with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
-*/
-
-#ifndef Py_LIMITED_API
-/* This is the old private API, invoked by the macros before 3.2.4.
-   Kept for binary compatibility of extensions using the stable ABI. */
-PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
-PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
-PyAPI_DATA(int) _PyTrash_delete_nesting;
-PyAPI_DATA(PyObject *) _PyTrash_delete_later;
-#endif /* !Py_LIMITED_API */
-
-/* The new thread-safe private API, invoked by the macros below. */
-PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
-PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
-
-#define PyTrash_UNWIND_LEVEL 50
-
-#define Py_TRASHCAN_SAFE_BEGIN(op) \
-    do { \
-        PyThreadState *_tstate = PyThreadState_GET(); \
-        if (_tstate->trash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
-            ++_tstate->trash_delete_nesting;
-            /* The body of the deallocator is here. */
-#define Py_TRASHCAN_SAFE_END(op) \
-            --_tstate->trash_delete_nesting; \
-            if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \
-                _PyTrash_thread_destroy_chain(); \
-        } \
-        else \
-            _PyTrash_thread_deposit_object((PyObject*)op); \
-    } while (0);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void)
-_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,
-                       size_t sizeof_block);
-PyAPI_FUNC(void)
-_PyObject_DebugTypeStats(FILE *out);
-#endif /* ifndef Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OBJECT_H */
diff --git a/dependencies2013/win32/include/python/objimpl.h b/dependencies2013/win32/include/python/objimpl.h
deleted file mode 100644
index 746f9c92..00000000
--- a/dependencies2013/win32/include/python/objimpl.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/* The PyObject_ memory family:  high-level object memory interfaces.
-   See pymem.h for the low-level PyMem_ family.
-*/
-
-#ifndef Py_OBJIMPL_H
-#define Py_OBJIMPL_H
-
-#include "pymem.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* BEWARE:
-
-   Each interface exports both functions and macros.  Extension modules should
-   use the functions, to ensure binary compatibility across Python versions.
-   Because the Python implementation is free to change internal details, and
-   the macros may (or may not) expose details for speed, if you do use the
-   macros you must recompile your extensions with each Python release.
-
-   Never mix calls to PyObject_ memory functions with calls to the platform
-   malloc/realloc/ calloc/free, or with calls to PyMem_.
-*/
-
-/*
-Functions and macros for modules that implement new object types.
-
- - PyObject_New(type, typeobj) allocates memory for a new object of the given
-   type, and initializes part of it.  'type' must be the C structure type used
-   to represent the object, and 'typeobj' the address of the corresponding
-   type object.  Reference count and type pointer are filled in; the rest of
-   the bytes of the object are *undefined*!  The resulting expression type is
-   'type *'.  The size of the object is determined by the tp_basicsize field
-   of the type object.
-
- - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size
-   object with room for n items.  In addition to the refcount and type pointer
-   fields, this also fills in the ob_size field.
-
- - PyObject_Del(op) releases the memory allocated for an object.  It does not
-   run a destructor -- it only frees the memory.  PyObject_Free is identical.
-
- - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't
-   allocate memory.  Instead of a 'type' parameter, they take a pointer to a
-   new object (allocated by an arbitrary allocator), and initialize its object
-   header fields.
-
-Note that objects created with PyObject_{New, NewVar} are allocated using the
-specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is
-enabled.  In addition, a special debugging allocator is used if PYMALLOC_DEBUG
-is also #defined.
-
-In case a specific form of memory management is needed (for example, if you
-must use the platform malloc heap(s), or shared memory, or C++ local storage or
-operator new), you must first allocate the object with your custom allocator,
-then pass its pointer to PyObject_{Init, InitVar} for filling in its Python-
-specific fields:  reference count, type pointer, possibly others.  You should
-be aware that Python no control over these objects because they don't
-cooperate with the Python memory manager.  Such objects may not be eligible
-for automatic garbage collection and you have to make sure that they are
-released accordingly whenever their destructor gets called (cf. the specific
-form of memory management you're using).
-
-Unless you have specific memory management requirements, use
-PyObject_{New, NewVar, Del}.
-*/
-
-/*
- * Raw object memory interface
- * ===========================
- */
-
-/* Functions to call the same malloc/realloc/free as used by Python's
-   object allocator.  If WITH_PYMALLOC is enabled, these may differ from
-   the platform malloc/realloc/free.  The Python object allocator is
-   designed for fast, cache-conscious allocation of many "small" objects,
-   and with low hidden memory overhead.
-
-   PyObject_Malloc(0) returns a unique non-NULL pointer if possible.
-
-   PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n).
-   PyObject_Realloc(p != NULL, 0) does not return  NULL, or free the memory
-   at p.
-
-   Returned pointers must be checked for NULL explicitly; no action is
-   performed on failure other than to return NULL (no warning it printed, no
-   exception is set, etc).
-
-   For allocating objects, use PyObject_{New, NewVar} instead whenever
-   possible.  The PyObject_{Malloc, Realloc, Free} family is exposed
-   so that you can exploit Python's small-block allocator for non-object
-   uses.  If you must use these routines to allocate object memory, make sure
-   the object gets initialized via PyObject_{Init, InitVar} after obtaining
-   the raw memory.
-*/
-PyAPI_FUNC(void *) PyObject_Malloc(size_t size);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(void *) PyObject_Calloc(size_t nelem, size_t elsize);
-#endif
-PyAPI_FUNC(void *) PyObject_Realloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyObject_Free(void *ptr);
-
-#ifndef Py_LIMITED_API
-/* This function returns the number of allocated memory blocks, regardless of size */
-PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void);
-#endif /* !Py_LIMITED_API */
-
-/* Macros */
-#ifdef WITH_PYMALLOC
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyObject_DebugMallocStats(FILE *out);
-#endif /* #ifndef Py_LIMITED_API */
-#endif
-
-/* Macros */
-#define PyObject_MALLOC         PyObject_Malloc
-#define PyObject_REALLOC        PyObject_Realloc
-#define PyObject_FREE           PyObject_Free
-#define PyObject_Del            PyObject_Free
-#define PyObject_DEL            PyObject_Free
-
-
-/*
- * Generic object allocator interface
- * ==================================
- */
-
-/* Functions */
-PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *,
-                                                 PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t);
-
-#define PyObject_New(type, typeobj) \
-                ( (type *) _PyObject_New(typeobj) )
-#define PyObject_NewVar(type, typeobj, n) \
-                ( (type *) _PyObject_NewVar((typeobj), (n)) )
-
-/* Macros trading binary compatibility for speed. See also pymem.h.
-   Note that these macros expect non-NULL object pointers.*/
-#define PyObject_INIT(op, typeobj) \
-    ( Py_TYPE(op) = (typeobj), _Py_NewReference((PyObject *)(op)), (op) )
-#define PyObject_INIT_VAR(op, typeobj, size) \
-    ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) )
-
-#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize )
-
-/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a
-   vrbl-size object with nitems items, exclusive of gc overhead (if any).  The
-   value is rounded up to the closest multiple of sizeof(void *), in order to
-   ensure that pointer fields at the end of the object are correctly aligned
-   for the platform (this is of special importance for subclasses of, e.g.,
-   str or int, so that pointers can be stored after the embedded data).
-
-   Note that there's no memory wastage in doing this, as malloc has to
-   return (at worst) pointer-aligned memory anyway.
-*/
-#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0
-#   error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2"
-#endif
-
-#define _PyObject_VAR_SIZE(typeobj, nitems)     \
-    _Py_SIZE_ROUND_UP((typeobj)->tp_basicsize + \
-        (nitems)*(typeobj)->tp_itemsize,        \
-        SIZEOF_VOID_P)
-
-#define PyObject_NEW(type, typeobj) \
-( (type *) PyObject_Init( \
-    (PyObject *) PyObject_MALLOC( _PyObject_SIZE(typeobj) ), (typeobj)) )
-
-#define PyObject_NEW_VAR(type, typeobj, n) \
-( (type *) PyObject_InitVar( \
-      (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE((typeobj),(n)) ),\
-      (typeobj), (n)) )
-
-/* This example code implements an object constructor with a custom
-   allocator, where PyObject_New is inlined, and shows the important
-   distinction between two steps (at least):
-       1) the actual allocation of the object storage;
-       2) the initialization of the Python specific fields
-      in this storage with PyObject_{Init, InitVar}.
-
-   PyObject *
-   YourObject_New(...)
-   {
-       PyObject *op;
-
-       op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct));
-       if (op == NULL)
-       return PyErr_NoMemory();
-
-       PyObject_Init(op, &YourTypeStruct);
-
-       op->ob_field = value;
-       ...
-       return op;
-   }
-
-   Note that in C++, the use of the new operator usually implies that
-   the 1st step is performed automatically for you, so in a C++ class
-   constructor you would start directly with PyObject_Init/InitVar
-*/
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    /* user context passed as the first argument to the 2 functions */
-    void *ctx;
-
-    /* allocate an arena of size bytes */
-    void* (*alloc) (void *ctx, size_t size);
-
-    /* free an arena */
-    void (*free) (void *ctx, void *ptr, size_t size);
-} PyObjectArenaAllocator;
-
-/* Get the arena allocator. */
-PyAPI_FUNC(void) PyObject_GetArenaAllocator(PyObjectArenaAllocator *allocator);
-
-/* Set the arena allocator. */
-PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator);
-#endif
-
-
-/*
- * Garbage Collection Support
- * ==========================
- */
-
-/* C equivalent of gc.collect() which ignores the state of gc.enabled. */
-PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyGC_CollectNoFail(void);
-PyAPI_FUNC(Py_ssize_t) _PyGC_CollectIfEnabled(void);
-#endif
-
-/* Test if a type has a GC head */
-#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
-
-/* Test if an object has a GC head */
-#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \
-    (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o)))
-
-PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
-#define PyObject_GC_Resize(type, op, n) \
-                ( (type *) _PyObject_GC_Resize((PyVarObject *)(op), (n)) )
-
-/* GC information is stored BEFORE the object structure. */
-#ifndef Py_LIMITED_API
-typedef union _gc_head {
-    struct {
-        union _gc_head *gc_next;
-        union _gc_head *gc_prev;
-        Py_ssize_t gc_refs;
-    } gc;
-    double dummy;  /* force worst-case alignment */
-} PyGC_Head;
-
-extern PyGC_Head *_PyGC_generation0;
-
-#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1)
-
-/* Bit 0 is set when tp_finalize is called */
-#define _PyGC_REFS_MASK_FINALIZED  (1 << 0)
-/* The (N-1) most significant bits contain the gc state / refcount */
-#define _PyGC_REFS_SHIFT           (1)
-#define _PyGC_REFS_MASK            (((size_t) -1) << _PyGC_REFS_SHIFT)
-
-#define _PyGCHead_REFS(g) ((g)->gc.gc_refs >> _PyGC_REFS_SHIFT)
-#define _PyGCHead_SET_REFS(g, v) do { \
-    (g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK) \
-        | (((size_t)(v)) << _PyGC_REFS_SHIFT);             \
-    } while (0)
-#define _PyGCHead_DECREF(g) ((g)->gc.gc_refs -= 1 << _PyGC_REFS_SHIFT)
-
-#define _PyGCHead_FINALIZED(g) (((g)->gc.gc_refs & _PyGC_REFS_MASK_FINALIZED) != 0)
-#define _PyGCHead_SET_FINALIZED(g, v) do {  \
-    (g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK_FINALIZED) \
-        | (v != 0); \
-    } while (0)
-
-#define _PyGC_FINALIZED(o) _PyGCHead_FINALIZED(_Py_AS_GC(o))
-#define _PyGC_SET_FINALIZED(o, v) _PyGCHead_SET_FINALIZED(_Py_AS_GC(o), v)
-
-#define _PyGC_REFS(o) _PyGCHead_REFS(_Py_AS_GC(o))
-
-#define _PyGC_REFS_UNTRACKED                    (-2)
-#define _PyGC_REFS_REACHABLE                    (-3)
-#define _PyGC_REFS_TENTATIVELY_UNREACHABLE      (-4)
-
-/* Tell the GC to track this object.  NB: While the object is tracked the
- * collector it must be safe to call the ob_traverse method. */
-#define _PyObject_GC_TRACK(o) do { \
-    PyGC_Head *g = _Py_AS_GC(o); \
-    if (_PyGCHead_REFS(g) != _PyGC_REFS_UNTRACKED) \
-        Py_FatalError("GC object already tracked"); \
-    _PyGCHead_SET_REFS(g, _PyGC_REFS_REACHABLE); \
-    g->gc.gc_next = _PyGC_generation0; \
-    g->gc.gc_prev = _PyGC_generation0->gc.gc_prev; \
-    g->gc.gc_prev->gc.gc_next = g; \
-    _PyGC_generation0->gc.gc_prev = g; \
-    } while (0);
-
-/* Tell the GC to stop tracking this object.
- * gc_next doesn't need to be set to NULL, but doing so is a good
- * way to provoke memory errors if calling code is confused.
- */
-#define _PyObject_GC_UNTRACK(o) do { \
-    PyGC_Head *g = _Py_AS_GC(o); \
-    assert(_PyGCHead_REFS(g) != _PyGC_REFS_UNTRACKED); \
-    _PyGCHead_SET_REFS(g, _PyGC_REFS_UNTRACKED); \
-    g->gc.gc_prev->gc.gc_next = g->gc.gc_next; \
-    g->gc.gc_next->gc.gc_prev = g->gc.gc_prev; \
-    g->gc.gc_next = NULL; \
-    } while (0);
-
-/* True if the object is currently tracked by the GC. */
-#define _PyObject_GC_IS_TRACKED(o) \
-    (_PyGC_REFS(o) != _PyGC_REFS_UNTRACKED)
-
-/* True if the object may be tracked by the GC in the future, or already is.
-   This can be useful to implement some optimizations. */
-#define _PyObject_GC_MAY_BE_TRACKED(obj) \
-    (PyObject_IS_GC(obj) && \
-        (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj)))
-#endif /* Py_LIMITED_API */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t size);
-PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size);
-#endif /* !Py_LIMITED_API */
-PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(void) PyObject_GC_Track(void *);
-PyAPI_FUNC(void) PyObject_GC_UnTrack(void *);
-PyAPI_FUNC(void) PyObject_GC_Del(void *);
-
-#define PyObject_GC_New(type, typeobj) \
-                ( (type *) _PyObject_GC_New(typeobj) )
-#define PyObject_GC_NewVar(type, typeobj, n) \
-                ( (type *) _PyObject_GC_NewVar((typeobj), (n)) )
-
-
-/* Utility macro to help write tp_traverse functions.
- * To use this macro, the tp_traverse function must name its arguments
- * "visit" and "arg".  This is intended to keep tp_traverse functions
- * looking as much alike as possible.
- */
-#define Py_VISIT(op)                                                    \
-    do {                                                                \
-        if (op) {                                                       \
-            int vret = visit((PyObject *)(op), arg);                    \
-            if (vret)                                                   \
-                return vret;                                            \
-        }                                                               \
-    } while (0)
-
-
-/* Test if a type supports weak references */
-#define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0)
-
-#define PyObject_GET_WEAKREFS_LISTPTR(o) \
-    ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OBJIMPL_H */
diff --git a/dependencies2013/win32/include/python/odictobject.h b/dependencies2013/win32/include/python/odictobject.h
deleted file mode 100644
index 381de58b..00000000
--- a/dependencies2013/win32/include/python/odictobject.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef Py_ODICTOBJECT_H
-#define Py_ODICTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* OrderedDict */
-
-#ifndef Py_LIMITED_API
-
-typedef struct _odictobject PyODictObject;
-
-PyAPI_DATA(PyTypeObject) PyODict_Type;
-PyAPI_DATA(PyTypeObject) PyODictIter_Type;
-PyAPI_DATA(PyTypeObject) PyODictKeys_Type;
-PyAPI_DATA(PyTypeObject) PyODictItems_Type;
-PyAPI_DATA(PyTypeObject) PyODictValues_Type;
-
-#define PyODict_Check(op) PyObject_TypeCheck(op, &PyODict_Type)
-#define PyODict_CheckExact(op) (Py_TYPE(op) == &PyODict_Type)
-#define PyODict_SIZE(op) ((PyDictObject *)op)->ma_used
-
-#endif /* Py_LIMITED_API */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-
-PyAPI_FUNC(PyObject *) PyODict_New(void);
-PyAPI_FUNC(int) PyODict_SetItem(PyObject *od, PyObject *key, PyObject *item);
-PyAPI_FUNC(int) PyODict_DelItem(PyObject *od, PyObject *key);
-
-/* wrappers around PyDict* functions */
-#define PyODict_GetItem(od, key) PyDict_GetItem((PyObject *)od, key)
-#define PyODict_GetItemWithError(od, key) \
-    PyDict_GetItemWithError((PyObject *)od, key)
-#define PyODict_Contains(od, key) PyDict_Contains((PyObject *)od, key)
-#define PyODict_Size(od) PyDict_Size((PyObject *)od)
-#define PyODict_GetItemString(od, key) \
-    PyDict_GetItemString((PyObject *)od, key)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ODICTOBJECT_H */
diff --git a/dependencies2013/win32/include/python/opcode.h b/dependencies2013/win32/include/python/opcode.h
deleted file mode 100644
index be360e10..00000000
--- a/dependencies2013/win32/include/python/opcode.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Auto-generated by Tools/scripts/generate_opcode_h.py */
-#ifndef Py_OPCODE_H
-#define Py_OPCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-    /* Instruction opcodes for compiled code */
-#define POP_TOP                   1
-#define ROT_TWO                   2
-#define ROT_THREE                 3
-#define DUP_TOP                   4
-#define DUP_TOP_TWO               5
-#define NOP                       9
-#define UNARY_POSITIVE           10
-#define UNARY_NEGATIVE           11
-#define UNARY_NOT                12
-#define UNARY_INVERT             15
-#define BINARY_MATRIX_MULTIPLY   16
-#define INPLACE_MATRIX_MULTIPLY  17
-#define BINARY_POWER             19
-#define BINARY_MULTIPLY          20
-#define BINARY_MODULO            22
-#define BINARY_ADD               23
-#define BINARY_SUBTRACT          24
-#define BINARY_SUBSCR            25
-#define BINARY_FLOOR_DIVIDE      26
-#define BINARY_TRUE_DIVIDE       27
-#define INPLACE_FLOOR_DIVIDE     28
-#define INPLACE_TRUE_DIVIDE      29
-#define GET_AITER                50
-#define GET_ANEXT                51
-#define BEFORE_ASYNC_WITH        52
-#define INPLACE_ADD              55
-#define INPLACE_SUBTRACT         56
-#define INPLACE_MULTIPLY         57
-#define INPLACE_MODULO           59
-#define STORE_SUBSCR             60
-#define DELETE_SUBSCR            61
-#define BINARY_LSHIFT            62
-#define BINARY_RSHIFT            63
-#define BINARY_AND               64
-#define BINARY_XOR               65
-#define BINARY_OR                66
-#define INPLACE_POWER            67
-#define GET_ITER                 68
-#define GET_YIELD_FROM_ITER      69
-#define PRINT_EXPR               70
-#define LOAD_BUILD_CLASS         71
-#define YIELD_FROM               72
-#define GET_AWAITABLE            73
-#define INPLACE_LSHIFT           75
-#define INPLACE_RSHIFT           76
-#define INPLACE_AND              77
-#define INPLACE_XOR              78
-#define INPLACE_OR               79
-#define BREAK_LOOP               80
-#define WITH_CLEANUP_START       81
-#define WITH_CLEANUP_FINISH      82
-#define RETURN_VALUE             83
-#define IMPORT_STAR              84
-#define SETUP_ANNOTATIONS        85
-#define YIELD_VALUE              86
-#define POP_BLOCK                87
-#define END_FINALLY              88
-#define POP_EXCEPT               89
-#define HAVE_ARGUMENT            90
-#define STORE_NAME               90
-#define DELETE_NAME              91
-#define UNPACK_SEQUENCE          92
-#define FOR_ITER                 93
-#define UNPACK_EX                94
-#define STORE_ATTR               95
-#define DELETE_ATTR              96
-#define STORE_GLOBAL             97
-#define DELETE_GLOBAL            98
-#define LOAD_CONST              100
-#define LOAD_NAME               101
-#define BUILD_TUPLE             102
-#define BUILD_LIST              103
-#define BUILD_SET               104
-#define BUILD_MAP               105
-#define LOAD_ATTR               106
-#define COMPARE_OP              107
-#define IMPORT_NAME             108
-#define IMPORT_FROM             109
-#define JUMP_FORWARD            110
-#define JUMP_IF_FALSE_OR_POP    111
-#define JUMP_IF_TRUE_OR_POP     112
-#define JUMP_ABSOLUTE           113
-#define POP_JUMP_IF_FALSE       114
-#define POP_JUMP_IF_TRUE        115
-#define LOAD_GLOBAL             116
-#define CONTINUE_LOOP           119
-#define SETUP_LOOP              120
-#define SETUP_EXCEPT            121
-#define SETUP_FINALLY           122
-#define LOAD_FAST               124
-#define STORE_FAST              125
-#define DELETE_FAST             126
-#define STORE_ANNOTATION        127
-#define RAISE_VARARGS           130
-#define CALL_FUNCTION           131
-#define MAKE_FUNCTION           132
-#define BUILD_SLICE             133
-#define LOAD_CLOSURE            135
-#define LOAD_DEREF              136
-#define STORE_DEREF             137
-#define DELETE_DEREF            138
-#define CALL_FUNCTION_KW        141
-#define CALL_FUNCTION_EX        142
-#define SETUP_WITH              143
-#define EXTENDED_ARG            144
-#define LIST_APPEND             145
-#define SET_ADD                 146
-#define MAP_ADD                 147
-#define LOAD_CLASSDEREF         148
-#define BUILD_LIST_UNPACK       149
-#define BUILD_MAP_UNPACK        150
-#define BUILD_MAP_UNPACK_WITH_CALL 151
-#define BUILD_TUPLE_UNPACK      152
-#define BUILD_SET_UNPACK        153
-#define SETUP_ASYNC_WITH        154
-#define FORMAT_VALUE            155
-#define BUILD_CONST_KEY_MAP     156
-#define BUILD_STRING            157
-#define BUILD_TUPLE_UNPACK_WITH_CALL 158
-
-/* EXCEPT_HANDLER is a special, implicit block type which is created when
-   entering an except handler. It is not an opcode but we define it here
-   as we want it to be available to both frameobject.c and ceval.c, while
-   remaining private.*/
-#define EXCEPT_HANDLER 257
-
-
-enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE,
-                PyCmp_GT=Py_GT, PyCmp_GE=Py_GE, PyCmp_IN, PyCmp_NOT_IN,
-                PyCmp_IS, PyCmp_IS_NOT, PyCmp_EXC_MATCH, PyCmp_BAD};
-
-#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OPCODE_H */
diff --git a/dependencies2013/win32/include/python/osdefs.h b/dependencies2013/win32/include/python/osdefs.h
deleted file mode 100644
index bd84c1c1..00000000
--- a/dependencies2013/win32/include/python/osdefs.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef Py_OSDEFS_H
-#define Py_OSDEFS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Operating system dependencies */
-
-#ifdef MS_WINDOWS
-#define SEP L'\\'
-#define ALTSEP L'/'
-#define MAXPATHLEN 256
-#define DELIM L';'
-#endif
-
-/* Filename separator */
-#ifndef SEP
-#define SEP L'/'
-#endif
-
-/* Max pathname length */
-#ifdef __hpux
-#include <sys/param.h>
-#include <limits.h>
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-#endif
-
-#ifndef MAXPATHLEN
-#if defined(PATH_MAX) && PATH_MAX > 1024
-#define MAXPATHLEN PATH_MAX
-#else
-#define MAXPATHLEN 1024
-#endif
-#endif
-
-/* Search path entry delimiter */
-#ifndef DELIM
-#define DELIM L':'
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OSDEFS_H */
diff --git a/dependencies2013/win32/include/python/osmodule.h b/dependencies2013/win32/include/python/osmodule.h
deleted file mode 100644
index 9095c2fd..00000000
--- a/dependencies2013/win32/include/python/osmodule.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* os module interface */
-
-#ifndef Py_OSMODULE_H
-#define Py_OSMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_FUNC(PyObject *) PyOS_FSPath(PyObject *path);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OSMODULE_H */
diff --git a/dependencies2013/win32/include/python/parsetok.h b/dependencies2013/win32/include/python/parsetok.h
deleted file mode 100644
index 2acb8546..00000000
--- a/dependencies2013/win32/include/python/parsetok.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-/* Parser-tokenizer link interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_PARSETOK_H
-#define Py_PARSETOK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int error;
-#ifndef PGEN
-    /* The filename is useless for pgen, see comment in tok_state structure */
-    PyObject *filename;
-#endif
-    int lineno;
-    int offset;
-    char *text;                 /* UTF-8-encoded string */
-    int token;
-    int expected;
-} perrdetail;
-
-#if 0
-#define PyPARSE_YIELD_IS_KEYWORD	0x0001
-#endif
-
-#define PyPARSE_DONT_IMPLY_DEDENT	0x0002
-
-#if 0
-#define PyPARSE_WITH_IS_KEYWORD		0x0003
-#define PyPARSE_PRINT_IS_FUNCTION       0x0004
-#define PyPARSE_UNICODE_LITERALS        0x0008
-#endif
-
-#define PyPARSE_IGNORE_COOKIE 0x0010
-#define PyPARSE_BARRY_AS_BDFL 0x0020
-
-PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
-                                              perrdetail *);
-PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int,
-                                             const char *, const char *,
-                                             perrdetail *);
-
-PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int,
-                                              perrdetail *, int);
-PyAPI_FUNC(node *) PyParser_ParseFileFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    const char *enc,
-    grammar *g,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    perrdetail *err_ret,
-    int flags);
-PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    const char *enc,
-    grammar *g,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    perrdetail *err_ret,
-    int *flags);
-PyAPI_FUNC(node *) PyParser_ParseFileObject(
-    FILE *fp,
-    PyObject *filename,
-    const char *enc,
-    grammar *g,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    perrdetail *err_ret,
-    int *flags);
-
-PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(
-    const char *s,
-    const char *filename,       /* decoded from the filesystem encoding */
-    grammar *g,
-    int start,
-    perrdetail *err_ret,
-    int flags);
-PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(
-    const char *s,
-    const char *filename,       /* decoded from the filesystem encoding */
-    grammar *g,
-    int start,
-    perrdetail *err_ret,
-    int *flags);
-PyAPI_FUNC(node *) PyParser_ParseStringObject(
-    const char *s,
-    PyObject *filename,
-    grammar *g,
-    int start,
-    perrdetail *err_ret,
-    int *flags);
-
-/* Note that the following functions are defined in pythonrun.c,
-   not in parsetok.c */
-PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
-PyAPI_FUNC(void) PyParser_ClearError(perrdetail *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PARSETOK_H */
-#endif /* !Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/patchlevel.h b/dependencies2013/win32/include/python/patchlevel.h
deleted file mode 100644
index e909bb24..00000000
--- a/dependencies2013/win32/include/python/patchlevel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* Python version identification scheme.
-
-   When the major or minor version changes, the VERSION variable in
-   configure.ac must also be changed.
-
-   There is also (independent) API version information in modsupport.h.
-*/
-
-/* Values for PY_RELEASE_LEVEL */
-#define PY_RELEASE_LEVEL_ALPHA	0xA
-#define PY_RELEASE_LEVEL_BETA	0xB
-#define PY_RELEASE_LEVEL_GAMMA	0xC     /* For release candidates */
-#define PY_RELEASE_LEVEL_FINAL	0xF	/* Serial should be 0 here */
-					/* Higher for patch releases */
-
-/* Version parsed out into numeric values */
-/*--start constants--*/
-#define PY_MAJOR_VERSION	3
-#define PY_MINOR_VERSION	6
-#define PY_MICRO_VERSION	4
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
-
-/* Version as a string */
-#define PY_VERSION      	"3.6.4"
-/*--end constants--*/
-
-/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
-   Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
-#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
-			(PY_MINOR_VERSION << 16) | \
-			(PY_MICRO_VERSION <<  8) | \
-			(PY_RELEASE_LEVEL <<  4) | \
-			(PY_RELEASE_SERIAL << 0))
diff --git a/dependencies2013/win32/include/python/pgen.h b/dependencies2013/win32/include/python/pgen.h
deleted file mode 100644
index 8a325ed0..00000000
--- a/dependencies2013/win32/include/python/pgen.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef Py_PGEN_H
-#define Py_PGEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Parser generator interface */
-
-extern grammar *meta_grammar(void);
-
-struct _node;
-extern grammar *pgen(struct _node *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PGEN_H */
diff --git a/dependencies2013/win32/include/python/pgenheaders.h b/dependencies2013/win32/include/python/pgenheaders.h
deleted file mode 100644
index 4843de6c..00000000
--- a/dependencies2013/win32/include/python/pgenheaders.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef Py_PGENHEADERS_H
-#define Py_PGENHEADERS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Include files and extern declarations used by most of the parser. */
-
-#include "Python.h"
-
-PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-
-#define addarc _Py_addarc
-#define addbit _Py_addbit
-#define adddfa _Py_adddfa
-#define addfirstsets _Py_addfirstsets
-#define addlabel _Py_addlabel
-#define addstate _Py_addstate
-#define delbitset _Py_delbitset
-#define dumptree _Py_dumptree
-#define findlabel _Py_findlabel
-#define freegrammar _Py_freegrammar
-#define mergebitset _Py_mergebitset
-#define meta_grammar _Py_meta_grammar
-#define newbitset _Py_newbitset
-#define newgrammar _Py_newgrammar
-#define pgen _Py_pgen
-#define printgrammar _Py_printgrammar
-#define printnonterminals _Py_printnonterminals
-#define printtree _Py_printtree
-#define samebitset _Py_samebitset
-#define showtree _Py_showtree
-#define tok_dump _Py_tok_dump
-#define translatelabels _Py_translatelabels
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PGENHEADERS_H */
diff --git a/dependencies2013/win32/include/python/py_curses.h b/dependencies2013/win32/include/python/py_curses.h
deleted file mode 100644
index b09dde48..00000000
--- a/dependencies2013/win32/include/python/py_curses.h
+++ /dev/null
@@ -1,178 +0,0 @@
-
-#ifndef Py_CURSES_H
-#define Py_CURSES_H
-
-#ifdef __APPLE__
-/*
-** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
-** against multiple definition of wchar_t.
-*/
-#ifdef _BSD_WCHAR_T_DEFINED_
-#define _WCHAR_T
-#endif
-#endif /* __APPLE__ */
-
-#ifdef __FreeBSD__
-/*
-** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-** against multiple definition of wchar_t and wint_t.
-*/
-#ifdef _XOPEN_SOURCE_EXTENDED
-#ifndef __FreeBSD_version
-#include <osreldate.h>
-#endif
-#if __FreeBSD_version >= 500000
-#ifndef __wchar_t
-#define __wchar_t
-#endif
-#ifndef __wint_t
-#define __wint_t
-#endif
-#else
-#ifndef _WCHAR_T
-#define _WCHAR_T
-#endif
-#ifndef _WINT_T
-#define _WINT_T
-#endif
-#endif
-#endif
-#endif
-
-#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS)
-/* The following definition is necessary for ncurses 5.7; without it,
-   some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python
-   can't get at the WINDOW flags field. */
-#define NCURSES_OPAQUE 0
-#endif
-
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif
-
-#ifdef HAVE_NCURSES_H
-/* configure was checking <curses.h>, but we will
-   use <ncurses.h>, which has some or all these features. */
-#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0)
-#define WINDOW_HAS_FLAGS 1
-#endif
-#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906
-#define HAVE_CURSES_IS_PAD 1
-#endif
-#ifndef MVWDELCH_IS_EXPRESSION
-#define MVWDELCH_IS_EXPRESSION 1
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PyCurses_API_pointers 4
-
-/* Type declarations */
-
-typedef struct {
-    PyObject_HEAD
-    WINDOW *win;
-    char *encoding;
-} PyCursesWindowObject;
-
-#define PyCursesWindow_Check(v)  (Py_TYPE(v) == &PyCursesWindow_Type)
-
-#define PyCurses_CAPSULE_NAME "_curses._C_API"
-
-
-#ifdef CURSES_MODULE
-/* This section is used when compiling _cursesmodule.c */
-
-#else
-/* This section is used in modules that use the _cursesmodule API */
-
-static void **PyCurses_API;
-
-#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0])
-#define PyCursesSetupTermCalled  {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;}
-#define PyCursesInitialised      {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;}
-#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;}
-
-#define import_curses() \
-    PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1);
-
-#endif
-
-/* general error messages */
-static const char catchall_ERR[]  = "curses function returned ERR";
-static const char catchall_NULL[] = "curses function returned NULL";
-
-/* Function Prototype Macros - They are ugly but very, very useful. ;-)
-
-   X - function name
-   TYPE - parameter Type
-   ERGSTR - format string for construction of the return value
-   PARSESTR - format string for argument parsing
-   */
-
-#define NoArgNoReturnFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  return PyCursesCheckERR(X(), # X); }
-
-#define NoArgOrFlagNoReturnFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
-{ \
-  int flag = 0; \
-  PyCursesInitialised \
-  switch(PyTuple_Size(args)) { \
-  case 0: \
-    return PyCursesCheckERR(X(), # X); \
-  case 1: \
-    if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \
-    if (flag) return PyCursesCheckERR(X(), # X); \
-    else return PyCursesCheckERR(no ## X (), # X); \
-  default: \
-    PyErr_SetString(PyExc_TypeError, # X " requires 0 or 1 arguments"); \
-    return NULL; } }
-
-#define NoArgReturnIntFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
- PyCursesInitialised \
- return PyLong_FromLong((long) X()); }
-
-
-#define NoArgReturnStringFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  return PyBytes_FromString(X()); }
-
-#define NoArgTrueFalseFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  if (X () == FALSE) { \
-    Py_INCREF(Py_False); \
-    return Py_False; \
-  } \
-  Py_INCREF(Py_True); \
-  return Py_True; }
-
-#define NoArgNoReturnVoidFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  X(); \
-  Py_INCREF(Py_None); \
-  return Py_None; }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(Py_CURSES_H) */
-
-
diff --git a/dependencies2013/win32/include/python/pyarena.h b/dependencies2013/win32/include/python/pyarena.h
deleted file mode 100644
index db3ad018..00000000
--- a/dependencies2013/win32/include/python/pyarena.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* An arena-like memory interface for the compiler.
- */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_PYARENA_H
-#define Py_PYARENA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  typedef struct _arena PyArena;
-
-  /* PyArena_New() and PyArena_Free() create a new arena and free it,
-     respectively.  Once an arena has been created, it can be used
-     to allocate memory via PyArena_Malloc().  Pointers to PyObject can
-     also be registered with the arena via PyArena_AddPyObject(), and the
-     arena will ensure that the PyObjects stay alive at least until
-     PyArena_Free() is called.  When an arena is freed, all the memory it
-     allocated is freed, the arena releases internal references to registered
-     PyObject*, and none of its pointers are valid.
-     XXX (tim) What does "none of its pointers are valid" mean?  Does it
-     XXX mean that pointers previously obtained via PyArena_Malloc() are
-     XXX no longer valid?  (That's clearly true, but not sure that's what
-     XXX the text is trying to say.)
-
-     PyArena_New() returns an arena pointer.  On error, it
-     returns a negative number and sets an exception.
-     XXX (tim):  Not true.  On error, PyArena_New() actually returns NULL,
-     XXX and looks like it may or may not set an exception (e.g., if the
-     XXX internal PyList_New(0) returns NULL, PyArena_New() passes that on
-     XXX and an exception is set; OTOH, if the internal
-     XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but
-     XXX an exception is not set in that case).
-  */
-  PyAPI_FUNC(PyArena *) PyArena_New(void);
-  PyAPI_FUNC(void) PyArena_Free(PyArena *);
-
-  /* Mostly like malloc(), return the address of a block of memory spanning
-   * `size` bytes, or return NULL (without setting an exception) if enough
-   * new memory can't be obtained.  Unlike malloc(0), PyArena_Malloc() with
-   * size=0 does not guarantee to return a unique pointer (the pointer
-   * returned may equal one or more other pointers obtained from
-   * PyArena_Malloc()).
-   * Note that pointers obtained via PyArena_Malloc() must never be passed to
-   * the system free() or realloc(), or to any of Python's similar memory-
-   * management functions.  PyArena_Malloc()-obtained pointers remain valid
-   * until PyArena_Free(ar) is called, at which point all pointers obtained
-   * from the arena `ar` become invalid simultaneously.
-   */
-  PyAPI_FUNC(void *) PyArena_Malloc(PyArena *, size_t size);
-
-  /* This routine isn't a proper arena allocation routine.  It takes
-   * a PyObject* and records it so that it can be DECREFed when the
-   * arena is freed.
-   */
-  PyAPI_FUNC(int) PyArena_AddPyObject(PyArena *, PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYARENA_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/pyatomic.h b/dependencies2013/win32/include/python/pyatomic.h
deleted file mode 100644
index 893d30d2..00000000
--- a/dependencies2013/win32/include/python/pyatomic.h
+++ /dev/null
@@ -1,250 +0,0 @@
-#ifndef Py_ATOMIC_H
-#define Py_ATOMIC_H
-#ifdef Py_BUILD_CORE
-
-#include "dynamic_annotations.h"
-
-#include "pyconfig.h"
-
-#if defined(HAVE_STD_ATOMIC)
-#include <stdatomic.h>
-#endif
-
-/* This is modeled after the atomics interface from C1x, according to
- * the draft at
- * http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1425.pdf.
- * Operations and types are named the same except with a _Py_ prefix
- * and have the same semantics.
- *
- * Beware, the implementations here are deep magic.
- */
-
-#if defined(HAVE_STD_ATOMIC)
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed = memory_order_relaxed,
-    _Py_memory_order_acquire = memory_order_acquire,
-    _Py_memory_order_release = memory_order_release,
-    _Py_memory_order_acq_rel = memory_order_acq_rel,
-    _Py_memory_order_seq_cst = memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    atomic_uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    atomic_int _value;
-} _Py_atomic_int;
-
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
-    atomic_signal_fence(ORDER)
-
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
-    atomic_thread_fence(ORDER)
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    atomic_store_explicit(&(ATOMIC_VAL)->_value, NEW_VAL, ORDER)
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    atomic_load_explicit(&(ATOMIC_VAL)->_value, ORDER)
-
-/* Use builtin atomic operations in GCC >= 4.7 */
-#elif defined(HAVE_BUILTIN_ATOMIC)
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed = __ATOMIC_RELAXED,
-    _Py_memory_order_acquire = __ATOMIC_ACQUIRE,
-    _Py_memory_order_release = __ATOMIC_RELEASE,
-    _Py_memory_order_acq_rel = __ATOMIC_ACQ_REL,
-    _Py_memory_order_seq_cst = __ATOMIC_SEQ_CST
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
-    __atomic_signal_fence(ORDER)
-
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
-    __atomic_thread_fence(ORDER)
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    (assert((ORDER) == __ATOMIC_RELAXED                       \
-            || (ORDER) == __ATOMIC_SEQ_CST                    \
-            || (ORDER) == __ATOMIC_RELEASE),                  \
-     __atomic_store_n(&(ATOMIC_VAL)->_value, NEW_VAL, ORDER))
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER)           \
-    (assert((ORDER) == __ATOMIC_RELAXED                       \
-            || (ORDER) == __ATOMIC_SEQ_CST                    \
-            || (ORDER) == __ATOMIC_ACQUIRE                    \
-            || (ORDER) == __ATOMIC_CONSUME),                  \
-     __atomic_load_n(&(ATOMIC_VAL)->_value, ORDER))
-
-#else
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed,
-    _Py_memory_order_acquire,
-    _Py_memory_order_release,
-    _Py_memory_order_acq_rel,
-    _Py_memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-
-/* Only support GCC (for expression statements) and x86 (for simple
- * atomic semantics) for now */
-#if defined(__GNUC__) && (defined(__i386__) || defined(__amd64))
-
-static __inline__ void
-_Py_atomic_signal_fence(_Py_memory_order order)
-{
-    if (order != _Py_memory_order_relaxed)
-        __asm__ volatile("":::"memory");
-}
-
-static __inline__ void
-_Py_atomic_thread_fence(_Py_memory_order order)
-{
-    if (order != _Py_memory_order_relaxed)
-        __asm__ volatile("mfence":::"memory");
-}
-
-/* Tell the race checker about this operation's effects. */
-static __inline__ void
-_Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
-{
-    (void)address;		/* shut up -Wunused-parameter */
-    switch(order) {
-    case _Py_memory_order_release:
-    case _Py_memory_order_acq_rel:
-    case _Py_memory_order_seq_cst:
-        _Py_ANNOTATE_HAPPENS_BEFORE(address);
-        break;
-    case _Py_memory_order_relaxed:
-    case _Py_memory_order_acquire:
-        break;
-    }
-    switch(order) {
-    case _Py_memory_order_acquire:
-    case _Py_memory_order_acq_rel:
-    case _Py_memory_order_seq_cst:
-        _Py_ANNOTATE_HAPPENS_AFTER(address);
-        break;
-    case _Py_memory_order_relaxed:
-    case _Py_memory_order_release:
-        break;
-    }
-}
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    __extension__ ({ \
-        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
-        __typeof__(atomic_val->_value) new_val = NEW_VAL;\
-        volatile __typeof__(new_val) *volatile_data = &atomic_val->_value; \
-        _Py_memory_order order = ORDER; \
-        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
-        \
-        /* Perform the operation. */ \
-        _Py_ANNOTATE_IGNORE_WRITES_BEGIN(); \
-        switch(order) { \
-        case _Py_memory_order_release: \
-            _Py_atomic_signal_fence(_Py_memory_order_release); \
-            /* fallthrough */ \
-        case _Py_memory_order_relaxed: \
-            *volatile_data = new_val; \
-            break; \
-        \
-        case _Py_memory_order_acquire: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            __asm__ volatile("xchg %0, %1" \
-                         : "+r"(new_val) \
-                         : "m"(atomic_val->_value) \
-                         : "memory"); \
-            break; \
-        } \
-        _Py_ANNOTATE_IGNORE_WRITES_END(); \
-    })
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    __extension__ ({  \
-        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
-        __typeof__(atomic_val->_value) result; \
-        volatile __typeof__(result) *volatile_data = &atomic_val->_value; \
-        _Py_memory_order order = ORDER; \
-        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
-        \
-        /* Perform the operation. */ \
-        _Py_ANNOTATE_IGNORE_READS_BEGIN(); \
-        switch(order) { \
-        case _Py_memory_order_release: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            /* Loads on x86 are not releases by default, so need a */ \
-            /* thread fence. */ \
-            _Py_atomic_thread_fence(_Py_memory_order_release); \
-            break; \
-        default: \
-            /* No fence */ \
-            break; \
-        } \
-        result = *volatile_data; \
-        switch(order) { \
-        case _Py_memory_order_acquire: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            /* Loads on x86 are automatically acquire operations so */ \
-            /* can get by with just a compiler fence. */ \
-            _Py_atomic_signal_fence(_Py_memory_order_acquire); \
-            break; \
-        default: \
-            /* No fence */ \
-            break; \
-        } \
-        _Py_ANNOTATE_IGNORE_READS_END(); \
-        result; \
-    })
-
-#else  /* !gcc x86 */
-/* Fall back to other compilers and processors by assuming that simple
-   volatile accesses are atomic.  This is false, so people should port
-   this. */
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) ((void)0)
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) ((void)0)
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    ((ATOMIC_VAL)->_value = NEW_VAL)
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    ((ATOMIC_VAL)->_value)
-
-#endif  /* !gcc x86 */
-#endif
-
-/* Standardized shortcuts. */
-#define _Py_atomic_store(ATOMIC_VAL, NEW_VAL) \
-    _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_seq_cst)
-#define _Py_atomic_load(ATOMIC_VAL) \
-    _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_seq_cst)
-
-/* Python-local extensions */
-
-#define _Py_atomic_store_relaxed(ATOMIC_VAL, NEW_VAL) \
-    _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_relaxed)
-#define _Py_atomic_load_relaxed(ATOMIC_VAL) \
-    _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed)
-
-#endif  /* Py_BUILD_CORE */
-#endif  /* Py_ATOMIC_H */
diff --git a/dependencies2013/win32/include/python/pycapsule.h b/dependencies2013/win32/include/python/pycapsule.h
deleted file mode 100644
index d9ecda7a..00000000
--- a/dependencies2013/win32/include/python/pycapsule.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/* Capsule objects let you wrap a C "void *" pointer in a Python
-   object.  They're a way of passing data through the Python interpreter
-   without creating your own custom type.
-
-   Capsules are used for communication between extension modules.
-   They provide a way for an extension module to export a C interface
-   to other extension modules, so that extension modules can use the
-   Python import mechanism to link to one another.
-
-   For more information, please see "c-api/capsule.html" in the
-   documentation.
-*/
-
-#ifndef Py_CAPSULE_H
-#define Py_CAPSULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyCapsule_Type;
-
-typedef void (*PyCapsule_Destructor)(PyObject *);
-
-#define PyCapsule_CheckExact(op) (Py_TYPE(op) == &PyCapsule_Type)
-
-
-PyAPI_FUNC(PyObject *) PyCapsule_New(
-    void *pointer,
-    const char *name,
-    PyCapsule_Destructor destructor);
-
-PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule);
-
-PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule);
-
-PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule);
-
-PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer);
-
-PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor);
-
-PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context);
-
-PyAPI_FUNC(void *) PyCapsule_Import(
-    const char *name,           /* UTF-8 encoded string */
-    int no_block);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CAPSULE_H */
diff --git a/dependencies2013/win32/include/python/pyconfig.h b/dependencies2013/win32/include/python/pyconfig.h
deleted file mode 100644
index 64e7aecb..00000000
--- a/dependencies2013/win32/include/python/pyconfig.h
+++ /dev/null
@@ -1,687 +0,0 @@
-#ifndef Py_CONFIG_H
-#define Py_CONFIG_H
-
-/* pyconfig.h.  NOT Generated automatically by configure.
-
-This is a manually maintained version used for the Watcom,
-Borland and Microsoft Visual C++ compilers.  It is a
-standard part of the Python distribution.
-
-WINDOWS DEFINES:
-The code specific to Windows should be wrapped around one of
-the following #defines
-
-MS_WIN64 - Code specific to the MS Win64 API
-MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs)
-MS_WINDOWS - Code specific to Windows, but all versions.
-Py_ENABLE_SHARED - Code if the Python core is built as a DLL.
-
-Also note that neither "_M_IX86" or "_MSC_VER" should be used for
-any purpose other than "Windows Intel x86 specific" and "Microsoft
-compiler specific".  Therefore, these should be very rare.
-
-
-NOTE: The following symbols are deprecated:
-NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT
-MS_CORE_DLL.
-
-WIN32 is still required for the locale module.
-
-*/
-
-/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */
-#ifdef USE_DL_EXPORT
-#	define Py_BUILD_CORE
-#endif /* USE_DL_EXPORT */
-
-/* Visual Studio 2005 introduces deprecation warnings for
-   "insecure" and POSIX functions. The insecure functions should
-   be replaced by *_s versions (according to Microsoft); the
-   POSIX functions by _* versions (which, according to Microsoft,
-   would be ISO C conforming). Neither renaming is feasible, so
-   we just silence the warnings. */
-
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif
-
-#define HAVE_IO_H
-#define HAVE_SYS_UTIME_H
-#define HAVE_TEMPNAM
-#define HAVE_TMPFILE
-#define HAVE_TMPNAM
-#define HAVE_CLOCK
-#define HAVE_STRERROR
-
-#include <io.h>
-
-#define HAVE_HYPOT
-#define HAVE_STRFTIME
-#define DONT_HAVE_SIG_ALARM
-#define DONT_HAVE_SIG_PAUSE
-#define LONG_BIT	32
-#define WORD_BIT 32
-
-#define MS_WIN32 /* only support win32 and greater. */
-#define MS_WINDOWS
-#ifndef PYTHONPATH
-#	define PYTHONPATH L".\\DLLs;.\\lib"
-#endif
-#define NT_THREADS
-#define WITH_THREAD
-#ifndef NETSCAPE_PI
-#define USE_SOCKET
-#endif
-
-
-/* Compiler specific defines */
-
-/* ------------------------------------------------------------------------*/
-/* Microsoft C defines _MSC_VER */
-#ifdef _MSC_VER
-
-/* We want COMPILER to expand to a string containing _MSC_VER's *value*.
- * This is horridly tricky, because the stringization operator only works
- * on macro arguments, and doesn't evaluate macros passed *as* arguments.
- * Attempts simpler than the following appear doomed to produce "_MSC_VER"
- * literally in the string.
- */
-#define _Py_PASTE_VERSION(SUFFIX) \
-	("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]")
-/* e.g., this produces, after compile-time string catenation,
- * 	("[MSC v.1200 32 bit (Intel)]")
- *
- * _Py_STRINGIZE(_MSC_VER) expands to
- * _Py_STRINGIZE1((_MSC_VER)) expands to
- * _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting
- *      it's scanned again for macros and so further expands to (under MSVC 6)
- * _Py_STRINGIZE2(1200) which then expands to
- * "1200"
- */
-#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
-#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
-#define _Py_STRINGIZE2(X) #X
-
-/* MSVC defines _WINxx to differentiate the windows platform types
-
-   Note that for compatibility reasons _WIN32 is defined on Win32
-   *and* on Win64. For the same reasons, in Python, MS_WIN32 is
-   defined on Win32 *and* Win64. Win32 only code must therefore be
-   guarded as follows:
-   	#if defined(MS_WIN32) && !defined(MS_WIN64)
-   Some modules are disabled on Itanium processors, therefore we
-   have MS_WINI64 set for those targets, otherwise MS_WINX64
-*/
-#ifdef _WIN64
-#define MS_WIN64
-#endif
-
-/* set the COMPILER */
-#ifdef MS_WIN64
-#if defined(_M_IA64)
-#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
-#define MS_WINI64
-#define PYD_PLATFORM_TAG "win_ia64"
-#elif defined(_M_X64) || defined(_M_AMD64)
-#if defined(__INTEL_COMPILER)
-#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
-#else
-#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
-#endif /* __INTEL_COMPILER */
-#define MS_WINX64
-#define PYD_PLATFORM_TAG "win_amd64"
-#else
-#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
-#endif
-#endif /* MS_WIN64 */
-
-/* set the version macros for the windows headers */
-/* Python 3.5+ requires Windows Vista or greater */
-#define Py_WINVER 0x0600 /* _WIN32_WINNT_VISTA */
-#define Py_NTDDI NTDDI_VISTA
-
-/* We only set these values when building Python - we don't want to force
-   these values on extensions, as that will affect the prototypes and
-   structures exposed in the Windows headers. Even when building Python, we
-   allow a single source file to override this - they may need access to
-   structures etc so it can optionally use new Windows features if it
-   determines at runtime they are available.
-*/
-#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
-#ifndef NTDDI_VERSION
-#define NTDDI_VERSION Py_NTDDI
-#endif
-#ifndef WINVER
-#define WINVER Py_WINVER
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT Py_WINVER
-#endif
-#endif
-
-/* _W64 is not defined for VC6 or eVC4 */
-#ifndef _W64
-#define _W64
-#endif
-
-/* Define like size_t, omitting the "unsigned" */
-#ifdef MS_WIN64
-typedef __int64 ssize_t;
-#else
-typedef _W64 int ssize_t;
-#endif
-#define HAVE_SSIZE_T 1
-
-#if defined(MS_WIN32) && !defined(MS_WIN64)
-#if defined(_M_IX86)
-#if defined(__INTEL_COMPILER)
-#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
-#else
-#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
-#endif /* __INTEL_COMPILER */
-#define PYD_PLATFORM_TAG "win32"
-#elif defined(_M_ARM)
-#define COMPILER _Py_PASTE_VERSION("32 bit (ARM)")
-#define PYD_PLATFORM_TAG "win_arm"
-#else
-#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")
-#endif
-#endif /* MS_WIN32 && !MS_WIN64 */
-
-typedef int pid_t;
-
-#include <float.h>
-#define Py_IS_NAN _isnan
-#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
-#define Py_IS_FINITE(X) _finite(X)
-#define copysign _copysign
-
-/* VS 2010 and above already defines hypot as _hypot */
-#if _MSC_VER < 1600
-#define hypot _hypot
-#endif
-
-/* VS 2015 defines these names with a leading underscore */
-#if _MSC_VER >= 1900
-#define timezone _timezone
-#define daylight _daylight
-#define tzname _tzname
-#endif
-
-/* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/
-#if _MSC_VER >= 1400 && _MSC_VER < 1600
-#define HAVE_SXS 1
-#endif
-
-/* define some ANSI types that are not defined in earlier Win headers */
-#if _MSC_VER >= 1200
-/* This file only exists in VC 6.0 or higher */
-#include <basetsd.h>
-#endif
-
-#endif /* _MSC_VER */
-
-/* ------------------------------------------------------------------------*/
-/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */
-#if defined(__GNUC__) && defined(_WIN32)
-/* XXX These defines are likely incomplete, but should be easy to fix.
-   They should be complete enough to build extension modules. */
-/* Suggested by Rene Liebscher <R.Liebscher@gmx.de> to avoid a GCC 2.91.*
-   bug that requires structure imports.  More recent versions of the
-   compiler don't exhibit this bug.
-*/
-#if (__GNUC__==2) && (__GNUC_MINOR__<=91)
-#warning "Please use an up-to-date version of gcc! (>2.91 recommended)"
-#endif
-
-#define COMPILER "[gcc]"
-#define hypot _hypot
-#define PY_LONG_LONG long long
-#define PY_LLONG_MIN LLONG_MIN
-#define PY_LLONG_MAX LLONG_MAX
-#define PY_ULLONG_MAX ULLONG_MAX
-#endif /* GNUC */
-
-/* ------------------------------------------------------------------------*/
-/* lcc-win32 defines __LCC__ */
-#if defined(__LCC__)
-/* XXX These defines are likely incomplete, but should be easy to fix.
-   They should be complete enough to build extension modules. */
-
-#define COMPILER "[lcc-win32]"
-typedef int pid_t;
-/* __declspec() is supported here too - do nothing to get the defaults */
-
-#endif /* LCC */
-
-/* ------------------------------------------------------------------------*/
-/* End of compilers - finish up */
-
-#ifndef NO_STDIO_H
-#	include <stdio.h>
-#endif
-
-/* 64 bit ints are usually spelt __int64 unless compiler has overridden */
-#ifndef PY_LONG_LONG
-#	define PY_LONG_LONG __int64
-#	define PY_LLONG_MAX _I64_MAX
-#	define PY_LLONG_MIN _I64_MIN
-#	define PY_ULLONG_MAX _UI64_MAX
-#endif
-
-/* For Windows the Python core is in a DLL by default.  Test
-Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
-#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED)
-#	define Py_ENABLE_SHARED 1 /* standard symbol for shared library */
-#	define MS_COREDLL	/* deprecated old symbol */
-#endif /* !MS_NO_COREDLL && ... */
-
-/*  All windows compilers that use this header support __declspec */
-#define HAVE_DECLSPEC_DLL
-
-/* For an MSVC DLL, we can nominate the .lib files used by extensions */
-#ifdef MS_COREDLL
-#	ifndef Py_BUILD_CORE /* not building the core - must be an ext */
-#		if defined(_MSC_VER)
-			/* So MSVC users need not specify the .lib file in
-			their Makefile (other compilers are generally
-			taken care of by distutils.) */
-#			if defined(_DEBUG)
-#				pragma comment(lib,"python36_d.lib")
-#			elif defined(Py_LIMITED_API)
-#				pragma comment(lib,"python3.lib")
-#			else
-#				pragma comment(lib,"python36.lib")
-#			endif /* _DEBUG */
-#		endif /* _MSC_VER */
-#	endif /* Py_BUILD_CORE */
-#endif /* MS_COREDLL */
-
-#if defined(MS_WIN64)
-/* maintain "win32" sys.platform for backward compatibility of Python code,
-   the Win64 API should be close enough to the Win32 API to make this
-   preferable */
-#	define PLATFORM "win32"
-#	define SIZEOF_VOID_P 8
-#	define SIZEOF_TIME_T 8
-#	define SIZEOF_OFF_T 4
-#	define SIZEOF_FPOS_T 8
-#	define SIZEOF_HKEY 8
-#	define SIZEOF_SIZE_T 8
-/* configure.ac defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
-   sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
-   On Win64 the second condition is not true, but if fpos_t replaces off_t
-   then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
-   should define this. */
-#	define HAVE_LARGEFILE_SUPPORT
-#elif defined(MS_WIN32)
-#	define PLATFORM "win32"
-#	define HAVE_LARGEFILE_SUPPORT
-#	define SIZEOF_VOID_P 4
-#	define SIZEOF_OFF_T 4
-#	define SIZEOF_FPOS_T 8
-#	define SIZEOF_HKEY 4
-#	define SIZEOF_SIZE_T 4
-	/* MS VS2005 changes time_t to a 64-bit type on all platforms */
-#	if defined(_MSC_VER) && _MSC_VER >= 1400
-#	define SIZEOF_TIME_T 8
-#	else
-#	define SIZEOF_TIME_T 4
-#	endif
-#endif
-
-#ifdef _DEBUG
-#	define Py_DEBUG
-#endif
-
-
-#ifdef MS_WIN32
-
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF_DOUBLE 8
-#define SIZEOF_FLOAT 4
-
-/* VC 7.1 has them and VC 6.0 does not.  VC 6.0 has a version number of 1200.
-   Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't
-   define these.
-   If some compiler does not provide them, modify the #if appropriately. */
-#if defined(_MSC_VER)
-#if _MSC_VER > 1300
-#define HAVE_UINTPTR_T 1
-#define HAVE_INTPTR_T 1
-#else
-/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */
-#define Py_LL(x) x##I64
-#endif  /* _MSC_VER > 1300  */
-#endif  /* _MSC_VER */
-
-#endif
-
-/* define signed and unsigned exact-width 32-bit and 64-bit types, used in the
-   implementation of Python integers. */
-#define PY_UINT32_T uint32_t
-#define PY_UINT64_T uint64_t
-#define PY_INT32_T int32_t
-#define PY_INT64_T int64_t
-
-/* Fairly standard from here! */
-
-/* Define to 1 if you have the `copysign' function. */
-#define HAVE_COPYSIGN 1
-
-/* Define to 1 if you have the `round' function. */
-#if _MSC_VER >= 1800
-#define HAVE_ROUND 1
-#endif
-
-/* Define to 1 if you have the `isinf' macro. */
-#define HAVE_DECL_ISINF 1
-
-/* Define to 1 if you have the `isnan' function. */
-#define HAVE_DECL_ISNAN 1
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define to empty if the keyword does not work.  */
-/* #define const  */
-
-/* Define to 1 if you have the <conio.h> header file. */
-#define HAVE_CONIO_H 1
-
-/* Define to 1 if you have the <direct.h> header file. */
-#define HAVE_DIRECT_H 1
-
-/* Define if you have dirent.h.  */
-/* #define DIRENT 1 */
-
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-/* #undef GETGROUPS_T */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if your struct tm has tm_zone.  */
-/* #undef HAVE_TM_ZONE */
-
-/* Define if you don't have tm_zone but do have the external array
-   tzname.  */
-#define HAVE_TZNAME
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define if you don't have dirent.h, but have ndir.h.  */
-/* #undef NDIR */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you don't have dirent.h, but have sys/dir.h.  */
-/* #undef SYSDIR */
-
-/* Define if you don't have dirent.h, but have sys/ndir.h.  */
-/* #undef SYSNDIR */
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-/* #undef TIME_WITH_SYS_TIME */
-
-/* Define if your <sys/time.h> declares struct tm.  */
-/* #define TM_IN_SYS_TIME 1 */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
-
-/* Define if the closedir function returns void instead of int.  */
-/* #undef VOID_CLOSEDIR */
-
-/* Define if getpgrp() must be called as getpgrp(0)
-   and (consequently) setpgrp() as setpgrp(0, 0). */
-/* #undef GETPGRP_HAVE_ARGS */
-
-/* Define this if your time.h defines altzone */
-/* #define HAVE_ALTZONE */
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV
-
-/* Define if your compiler supports function prototypes */
-#define HAVE_PROTOTYPES
-
-/* Define if  you can safely include both <sys/select.h> and <sys/time.h>
-   (which you can't on SCO ODT 3.0). */
-/* #undef SYS_SELECT_WITH_SYS_TIME */
-
-/* Define if you want documentation strings in extension modules */
-#define WITH_DOC_STRINGS 1
-
-/* Define if you want to compile in rudimentary thread support */
-/* #undef WITH_THREAD */
-
-/* Define if you want to use the GNU readline library */
-/* #define WITH_READLINE 1 */
-
-/* Use Python's own small-block memory-allocator. */
-#define WITH_PYMALLOC 1
-
-/* Define if you have clock.  */
-/* #define HAVE_CLOCK */
-
-/* Define when any dynamic module loading is enabled */
-#define HAVE_DYNAMIC_LOADING
-
-/* Define if you have ftime.  */
-#define HAVE_FTIME
-
-/* Define if you have getpeername.  */
-#define HAVE_GETPEERNAME
-
-/* Define if you have getpgrp.  */
-/* #undef HAVE_GETPGRP */
-
-/* Define if you have getpid.  */
-#define HAVE_GETPID
-
-/* Define if you have gettimeofday.  */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define if you have getwd.  */
-/* #undef HAVE_GETWD */
-
-/* Define if you have lstat.  */
-/* #undef HAVE_LSTAT */
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME
-
-/* Define if you have nice.  */
-/* #undef HAVE_NICE */
-
-/* Define if you have readlink.  */
-/* #undef HAVE_READLINK */
-
-/* Define if you have select.  */
-/* #undef HAVE_SELECT */
-
-/* Define if you have setpgid.  */
-/* #undef HAVE_SETPGID */
-
-/* Define if you have setpgrp.  */
-/* #undef HAVE_SETPGRP */
-
-/* Define if you have setsid.  */
-/* #undef HAVE_SETSID */
-
-/* Define if you have setvbuf.  */
-#define HAVE_SETVBUF
-
-/* Define if you have siginterrupt.  */
-/* #undef HAVE_SIGINTERRUPT */
-
-/* Define if you have symlink.  */
-/* #undef HAVE_SYMLINK */
-
-/* Define if you have tcgetpgrp.  */
-/* #undef HAVE_TCGETPGRP */
-
-/* Define if you have tcsetpgrp.  */
-/* #undef HAVE_TCSETPGRP */
-
-/* Define if you have times.  */
-/* #undef HAVE_TIMES */
-
-/* Define if you have uname.  */
-/* #undef HAVE_UNAME */
-
-/* Define if you have waitpid.  */
-/* #undef HAVE_WAITPID */
-
-/* Define to 1 if you have the `wcsftime' function. */
-#if defined(_MSC_VER) && _MSC_VER >= 1310
-#define HAVE_WCSFTIME 1
-#endif
-
-/* Define to 1 if you have the `wcscoll' function. */
-#define HAVE_WCSCOLL 1
-
-/* Define to 1 if you have the `wcsxfrm' function. */
-#define HAVE_WCSXFRM 1
-
-/* Define if the zlib library has inflateCopy */
-#define HAVE_ZLIB_COPY 1
-
-/* Define if you have the <dlfcn.h> header file.  */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <process.h> header file. */
-#define HAVE_PROCESS_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stdarg.h> prototypes.  */
-#define HAVE_STDARG_PROTOTYPES
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <sys/audioio.h> header file.  */
-/* #undef HAVE_SYS_AUDIOIO_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-/* #define HAVE_SYS_PARAM_H 1 */
-
-/* Define if you have the <sys/select.h> header file.  */
-/* #define HAVE_SYS_SELECT_H 1 */
-
-/* Define to 1 if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/time.h> header file.  */
-/* #define HAVE_SYS_TIME_H 1 */
-
-/* Define if you have the <sys/times.h> header file.  */
-/* #define HAVE_SYS_TIMES_H 1 */
-
-/* Define to 1 if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <sys/un.h> header file.  */
-/* #define HAVE_SYS_UN_H 1 */
-
-/* Define if you have the <sys/utime.h> header file.  */
-/* #define HAVE_SYS_UTIME_H 1 */
-
-/* Define if you have the <sys/utsname.h> header file.  */
-/* #define HAVE_SYS_UTSNAME_H 1 */
-
-/* Define if you have the <unistd.h> header file.  */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define if you have the <utime.h> header file.  */
-/* #define HAVE_UTIME_H 1 */
-
-/* Define if the compiler provides a wchar.h header file. */
-#define HAVE_WCHAR_H 1
-
-/* The size of `wchar_t', as computed by sizeof. */
-#define SIZEOF_WCHAR_T 2
-
-/* The size of `_Bool', as computed by sizeof. */
-#define SIZEOF__BOOL 1
-
-/* The size of `pid_t', as computed by sizeof. */
-#define SIZEOF_PID_T SIZEOF_INT
-
-/* Define if you have the dl library (-ldl).  */
-/* #undef HAVE_LIBDL */
-
-/* Define if you have the mpc library (-lmpc).  */
-/* #undef HAVE_LIBMPC */
-
-/* Define if you have the nsl library (-lnsl).  */
-#define HAVE_LIBNSL 1
-
-/* Define if you have the seq library (-lseq).  */
-/* #undef HAVE_LIBSEQ */
-
-/* Define if you have the socket library (-lsocket).  */
-#define HAVE_LIBSOCKET 1
-
-/* Define if you have the sun library (-lsun).  */
-/* #undef HAVE_LIBSUN */
-
-/* Define if you have the termcap library (-ltermcap).  */
-/* #undef HAVE_LIBTERMCAP */
-
-/* Define if you have the termlib library (-ltermlib).  */
-/* #undef HAVE_LIBTERMLIB */
-
-/* Define if you have the thread library (-lthread).  */
-/* #undef HAVE_LIBTHREAD */
-
-/* WinSock does not use a bitmask in select, and uses
-   socket handles greater than FD_SETSIZE */
-#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
-
-/* Define if C doubles are 64-bit IEEE 754 binary format, stored with the
-   least significant byte first */
-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
-
-#endif /* !Py_CONFIG_H */
diff --git a/dependencies2013/win32/include/python/pyctype.h b/dependencies2013/win32/include/python/pyctype.h
deleted file mode 100644
index 6bce63ee..00000000
--- a/dependencies2013/win32/include/python/pyctype.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef PYCTYPE_H
-#define PYCTYPE_H
-
-#define PY_CTF_LOWER  0x01
-#define PY_CTF_UPPER  0x02
-#define PY_CTF_ALPHA  (PY_CTF_LOWER|PY_CTF_UPPER)
-#define PY_CTF_DIGIT  0x04
-#define PY_CTF_ALNUM  (PY_CTF_ALPHA|PY_CTF_DIGIT)
-#define PY_CTF_SPACE  0x08
-#define PY_CTF_XDIGIT 0x10
-
-PyAPI_DATA(const unsigned int) _Py_ctype_table[256];
-
-/* Unlike their C counterparts, the following macros are not meant to
- * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument
- * must be a signed/unsigned char. */
-#define Py_ISLOWER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER)
-#define Py_ISUPPER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER)
-#define Py_ISALPHA(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA)
-#define Py_ISDIGIT(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT)
-#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT)
-#define Py_ISALNUM(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM)
-#define Py_ISSPACE(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE)
-
-PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256];
-PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256];
-
-#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)])
-#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)])
-
-#endif /* !PYCTYPE_H */
-#endif /* !Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/pydebug.h b/dependencies2013/win32/include/python/pydebug.h
deleted file mode 100644
index 6e23a896..00000000
--- a/dependencies2013/win32/include/python/pydebug.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_PYDEBUG_H
-#define Py_PYDEBUG_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* These global variable are defined in pylifecycle.c */
-/* XXX (ncoghlan): move these declarations to pylifecycle.h? */
-PyAPI_DATA(int) Py_DebugFlag;
-PyAPI_DATA(int) Py_VerboseFlag;
-PyAPI_DATA(int) Py_QuietFlag;
-PyAPI_DATA(int) Py_InteractiveFlag;
-PyAPI_DATA(int) Py_InspectFlag;
-PyAPI_DATA(int) Py_OptimizeFlag;
-PyAPI_DATA(int) Py_NoSiteFlag;
-PyAPI_DATA(int) Py_BytesWarningFlag;
-PyAPI_DATA(int) Py_UseClassExceptionsFlag;
-PyAPI_DATA(int) Py_FrozenFlag;
-PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
-PyAPI_DATA(int) Py_DontWriteBytecodeFlag;
-PyAPI_DATA(int) Py_NoUserSiteDirectory;
-PyAPI_DATA(int) Py_UnbufferedStdioFlag;
-PyAPI_DATA(int) Py_HashRandomizationFlag;
-PyAPI_DATA(int) Py_IsolatedFlag;
-
-#ifdef MS_WINDOWS
-PyAPI_DATA(int) Py_LegacyWindowsStdioFlag;
-#endif
-
-/* this is a wrapper around getenv() that pays attention to
-   Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
-   PYTHONPATH and PYTHONHOME from the environment */
-#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYDEBUG_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/pydtrace.h b/dependencies2013/win32/include/python/pydtrace.h
deleted file mode 100644
index c43a253d..00000000
--- a/dependencies2013/win32/include/python/pydtrace.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Static DTrace probes interface */
-
-#ifndef Py_DTRACE_H
-#define Py_DTRACE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WITH_DTRACE
-
-#include "pydtrace_probes.h"
-
-/* pydtrace_probes.h, on systems with DTrace, is auto-generated to include
-   `PyDTrace_{PROBE}` and `PyDTrace_{PROBE}_ENABLED()` macros for every probe
-   defined in pydtrace_provider.d.
-
-   Calling these functions must be guarded by a `PyDTrace_{PROBE}_ENABLED()`
-   check to minimize performance impact when probing is off. For example:
-
-       if (PyDTrace_FUNCTION_ENTRY_ENABLED())
-           PyDTrace_FUNCTION_ENTRY(f);
-*/
-
-#else
-
-/* Without DTrace, compile to nothing. */
-
-static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {}
-static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2)  {}
-static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {}
-static inline void PyDTrace_GC_START(int arg0) {}
-static inline void PyDTrace_GC_DONE(int arg0) {}
-static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {}
-static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {}
-static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {}
-static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {}
-
-static inline int PyDTrace_LINE_ENABLED(void) { return 0; }
-static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; }
-static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; }
-static inline int PyDTrace_GC_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; }
-
-#endif /* !WITH_DTRACE */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DTRACE_H */
diff --git a/dependencies2013/win32/include/python/pyerrors.h b/dependencies2013/win32/include/python/pyerrors.h
deleted file mode 100644
index c28c1373..00000000
--- a/dependencies2013/win32/include/python/pyerrors.h
+++ /dev/null
@@ -1,503 +0,0 @@
-#ifndef Py_ERRORS_H
-#define Py_ERRORS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Error objects */
-
-#ifndef Py_LIMITED_API
-/* PyException_HEAD defines the initial segment of every exception class. */
-#define PyException_HEAD PyObject_HEAD PyObject *dict;\
-             PyObject *args; PyObject *traceback;\
-             PyObject *context; PyObject *cause;\
-             char suppress_context;
-
-typedef struct {
-    PyException_HEAD
-} PyBaseExceptionObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *msg;
-    PyObject *filename;
-    PyObject *lineno;
-    PyObject *offset;
-    PyObject *text;
-    PyObject *print_file_and_line;
-} PySyntaxErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *msg;
-    PyObject *name;
-    PyObject *path;
-} PyImportErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *encoding;
-    PyObject *object;
-    Py_ssize_t start;
-    Py_ssize_t end;
-    PyObject *reason;
-} PyUnicodeErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *code;
-} PySystemExitObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *myerrno;
-    PyObject *strerror;
-    PyObject *filename;
-    PyObject *filename2;
-#ifdef MS_WINDOWS
-    PyObject *winerror;
-#endif
-    Py_ssize_t written;   /* only for BlockingIOError, -1 otherwise */
-} PyOSErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *value;
-} PyStopIterationObject;
-
-/* Compatibility typedefs */
-typedef PyOSErrorObject PyEnvironmentErrorObject;
-#ifdef MS_WINDOWS
-typedef PyOSErrorObject PyWindowsErrorObject;
-#endif
-#endif /* !Py_LIMITED_API */
-
-/* Error handling definitions */
-
-PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
-PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
-#endif
-PyAPI_FUNC(void) PyErr_SetString(
-    PyObject *exception,
-    const char *string   /* decoded from utf-8 */
-    );
-PyAPI_FUNC(PyObject *) PyErr_Occurred(void);
-PyAPI_FUNC(void) PyErr_Clear(void);
-PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
-PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(void) PyErr_GetExcInfo(PyObject **, PyObject **, PyObject **);
-PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *);
-#endif
-
-#if defined(__clang__) || \
-    (defined(__GNUC_MAJOR__) && \
-     ((__GNUC_MAJOR__ >= 3) || \
-      (__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5)))
-#define _Py_NO_RETURN __attribute__((__noreturn__))
-#else
-#define _Py_NO_RETURN
-#endif
-
-/* Defined in Python/pylifecycle.c */
-PyAPI_FUNC(void) Py_FatalError(const char *message) _Py_NO_RETURN;
-
-#if defined(Py_DEBUG) || defined(Py_LIMITED_API)
-#define _PyErr_OCCURRED() PyErr_Occurred()
-#else
-#define _PyErr_OCCURRED() (PyThreadState_GET()->curexc_type)
-#endif
-
-/* Error testing and normalization */
-PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *);
-PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
-
-/* Traceback manipulation (PEP 3134) */
-PyAPI_FUNC(int) PyException_SetTraceback(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyException_GetTraceback(PyObject *);
-
-/* Cause manipulation (PEP 3134) */
-PyAPI_FUNC(PyObject *) PyException_GetCause(PyObject *);
-PyAPI_FUNC(void) PyException_SetCause(PyObject *, PyObject *);
-
-/* Context manipulation (PEP 3134) */
-PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *);
-PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
-#endif
-
-/* */
-
-#define PyExceptionClass_Check(x)                                       \
-    (PyType_Check((x)) &&                                               \
-     PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))
-
-#define PyExceptionInstance_Check(x)                    \
-    PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS)
-
-#define PyExceptionClass_Name(x) \
-     ((char *)(((PyTypeObject*)(x))->tp_name))
-
-#define PyExceptionInstance_Class(x) ((PyObject*)((x)->ob_type))
-
-
-/* Predefined exceptions */
-
-PyAPI_DATA(PyObject *) PyExc_BaseException;
-PyAPI_DATA(PyObject *) PyExc_Exception;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_DATA(PyObject *) PyExc_StopAsyncIteration;
-#endif
-PyAPI_DATA(PyObject *) PyExc_StopIteration;
-PyAPI_DATA(PyObject *) PyExc_GeneratorExit;
-PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
-PyAPI_DATA(PyObject *) PyExc_LookupError;
-
-PyAPI_DATA(PyObject *) PyExc_AssertionError;
-PyAPI_DATA(PyObject *) PyExc_AttributeError;
-PyAPI_DATA(PyObject *) PyExc_BufferError;
-PyAPI_DATA(PyObject *) PyExc_EOFError;
-PyAPI_DATA(PyObject *) PyExc_FloatingPointError;
-PyAPI_DATA(PyObject *) PyExc_OSError;
-PyAPI_DATA(PyObject *) PyExc_ImportError;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_DATA(PyObject *) PyExc_ModuleNotFoundError;
-#endif
-PyAPI_DATA(PyObject *) PyExc_IndexError;
-PyAPI_DATA(PyObject *) PyExc_KeyError;
-PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt;
-PyAPI_DATA(PyObject *) PyExc_MemoryError;
-PyAPI_DATA(PyObject *) PyExc_NameError;
-PyAPI_DATA(PyObject *) PyExc_OverflowError;
-PyAPI_DATA(PyObject *) PyExc_RuntimeError;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_DATA(PyObject *) PyExc_RecursionError;
-#endif
-PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
-PyAPI_DATA(PyObject *) PyExc_SyntaxError;
-PyAPI_DATA(PyObject *) PyExc_IndentationError;
-PyAPI_DATA(PyObject *) PyExc_TabError;
-PyAPI_DATA(PyObject *) PyExc_ReferenceError;
-PyAPI_DATA(PyObject *) PyExc_SystemError;
-PyAPI_DATA(PyObject *) PyExc_SystemExit;
-PyAPI_DATA(PyObject *) PyExc_TypeError;
-PyAPI_DATA(PyObject *) PyExc_UnboundLocalError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError;
-PyAPI_DATA(PyObject *) PyExc_ValueError;
-PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
-PyAPI_DATA(PyObject *) PyExc_BrokenPipeError;
-PyAPI_DATA(PyObject *) PyExc_ChildProcessError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionAbortedError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionRefusedError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionResetError;
-PyAPI_DATA(PyObject *) PyExc_FileExistsError;
-PyAPI_DATA(PyObject *) PyExc_FileNotFoundError;
-PyAPI_DATA(PyObject *) PyExc_InterruptedError;
-PyAPI_DATA(PyObject *) PyExc_IsADirectoryError;
-PyAPI_DATA(PyObject *) PyExc_NotADirectoryError;
-PyAPI_DATA(PyObject *) PyExc_PermissionError;
-PyAPI_DATA(PyObject *) PyExc_ProcessLookupError;
-PyAPI_DATA(PyObject *) PyExc_TimeoutError;
-#endif
-
-
-/* Compatibility aliases */
-PyAPI_DATA(PyObject *) PyExc_EnvironmentError;
-PyAPI_DATA(PyObject *) PyExc_IOError;
-#ifdef MS_WINDOWS
-PyAPI_DATA(PyObject *) PyExc_WindowsError;
-#endif
-
-/* Predefined warning categories */
-PyAPI_DATA(PyObject *) PyExc_Warning;
-PyAPI_DATA(PyObject *) PyExc_UserWarning;
-PyAPI_DATA(PyObject *) PyExc_DeprecationWarning;
-PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning;
-PyAPI_DATA(PyObject *) PyExc_SyntaxWarning;
-PyAPI_DATA(PyObject *) PyExc_RuntimeWarning;
-PyAPI_DATA(PyObject *) PyExc_FutureWarning;
-PyAPI_DATA(PyObject *) PyExc_ImportWarning;
-PyAPI_DATA(PyObject *) PyExc_UnicodeWarning;
-PyAPI_DATA(PyObject *) PyExc_BytesWarning;
-PyAPI_DATA(PyObject *) PyExc_ResourceWarning;
-
-
-/* Convenience functions */
-
-PyAPI_FUNC(int) PyErr_BadArgument(void);
-PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
-    PyObject *, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObjects(
-    PyObject *, PyObject *, PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(
-    PyObject *exc,
-    const char *filename   /* decoded from the filesystem encoding */
-    );
-#if defined(MS_WINDOWS) && !defined(Py_LIMITED_API)
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
-    PyObject *, const Py_UNICODE *);
-#endif /* MS_WINDOWS */
-
-PyAPI_FUNC(PyObject *) PyErr_Format(
-    PyObject *exception,
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(PyObject *) PyErr_FormatV(
-    PyObject *exception,
-    const char *format,
-    va_list vargs);
-#endif
-
-#ifndef Py_LIMITED_API
-/* Like PyErr_Format(), but saves current exception as __context__ and
-   __cause__.
- */
-PyAPI_FUNC(PyObject *) _PyErr_FormatFromCause(
-    PyObject *exception,
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-#endif
-
-#ifdef MS_WINDOWS
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
-    int ierr,
-    const char *filename        /* decoded from the filesystem encoding */
-    );
-#ifndef Py_LIMITED_API
-/* XXX redeclare to use WSTRING */
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
-    int, const Py_UNICODE *);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
-    PyObject *,int, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObjects(
-    PyObject *,int, PyObject *, PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
-    PyObject *exc,
-    int ierr,
-    const char *filename        /* decoded from the filesystem encoding */
-    );
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
-    PyObject *,int, const Py_UNICODE *);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
-#endif /* MS_WINDOWS */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_FUNC(PyObject *) PyErr_SetImportErrorSubclass(PyObject *, PyObject *,
-    PyObject *, PyObject *);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *,
-    PyObject *);
-#endif
-
-/* Export the old function so that the existing API remains available: */
-PyAPI_FUNC(void) PyErr_BadInternalCall(void);
-PyAPI_FUNC(void) _PyErr_BadInternalCall(const char *filename, int lineno);
-/* Mask the old API with a call to the new API for code compiled under
-   Python 2.0: */
-#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
-
-/* Function to create a new exception */
-PyAPI_FUNC(PyObject *) PyErr_NewException(
-    const char *name, PyObject *base, PyObject *dict);
-PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc(
-    const char *name, const char *doc, PyObject *base, PyObject *dict);
-PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
-
-/* In exceptions.c */
-#ifndef Py_LIMITED_API
-/* Helper that attempts to replace the current exception with one of the
- * same type but with a prefix added to the exception text. The resulting
- * exception description looks like:
- *
- *     prefix (exc_type: original_exc_str)
- *
- * Only some exceptions can be safely replaced. If the function determines
- * it isn't safe to perform the replacement, it will leave the original
- * unmodified exception in place.
- *
- * Returns a borrowed reference to the new exception (if any), NULL if the
- * existing exception was left in place.
- */
-PyAPI_FUNC(PyObject *) _PyErr_TrySetFromCause(
-    const char *prefix_format,   /* ASCII-encoded string  */
-    ...
-    );
-#endif
-
-
-/* In sigcheck.c or signalmodule.c */
-PyAPI_FUNC(int) PyErr_CheckSignals(void);
-PyAPI_FUNC(void) PyErr_SetInterrupt(void);
-
-/* In signalmodule.c */
-#ifndef Py_LIMITED_API
-int PySignal_SetWakeupFd(int fd);
-#endif
-
-/* Support for adding program text to SyntaxErrors */
-PyAPI_FUNC(void) PyErr_SyntaxLocation(
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno);
-PyAPI_FUNC(void) PyErr_SyntaxLocationEx(
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno,
-    int col_offset);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyErr_SyntaxLocationObject(
-    PyObject *filename,
-    int lineno,
-    int col_offset);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_ProgramText(
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyErr_ProgramTextObject(
-    PyObject *filename,
-    int lineno);
-#endif
-
-/* The following functions are used to create and modify unicode
-   exceptions from C */
-
-/* create a UnicodeDecodeError object */
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create(
-    const char *encoding,       /* UTF-8 encoded string */
-    const char *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-
-/* create a UnicodeEncodeError object */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
-    const char *encoding,       /* UTF-8 encoded string */
-    const Py_UNICODE *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-#endif
-
-/* create a UnicodeTranslateError object */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
-    const Py_UNICODE *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create(
-    PyObject *object,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-#endif
-
-/* get the encoding attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *);
-
-/* get the object attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *);
-
-/* get the value of the start attribute (the int * may not be NULL)
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *);
-
-/* assign a new value to the start attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t);
-
-/* get the value of the end attribute (the int *may not be NULL)
- return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *);
-
-/* assign a new value to the end attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t);
-
-/* get the value of the reason attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *);
-
-/* assign a new value to the reason attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason(
-    PyObject *exc,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason(
-    PyObject *exc,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason(
-    PyObject *exc,
-    const char *reason          /* UTF-8 encoded string */
-    );
-
-/* These APIs aren't really part of the error implementation, but
-   often needed to format error messages; the native C lib APIs are
-   not available on all platforms, which is why we provide emulations
-   for those platforms in Python/mysnprintf.c,
-   WARNING:  The return value of snprintf varies across platforms; do
-   not rely on any particular behavior; eventually the C99 defn may
-   be reliable.
-*/
-#if defined(MS_WIN32) && !defined(HAVE_SNPRINTF)
-# define HAVE_SNPRINTF
-# define snprintf _snprintf
-# define vsnprintf _vsnprintf
-#endif
-
-#include <stdarg.h>
-PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char  *format, ...)
-                        Py_GCC_ATTRIBUTE((format(printf, 3, 4)));
-PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
-                        Py_GCC_ATTRIBUTE((format(printf, 3, 0)));
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRORS_H */
diff --git a/dependencies2013/win32/include/python/pyexpat.h b/dependencies2013/win32/include/python/pyexpat.h
deleted file mode 100644
index 44259bf6..00000000
--- a/dependencies2013/win32/include/python/pyexpat.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Stuff to export relevant 'expat' entry points from pyexpat to other
- * parser modules, such as cElementTree. */
-
-/* note: you must import expat.h before importing this module! */
-
-#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.0"
-#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
-
-struct PyExpat_CAPI
-{
-    char* magic; /* set to PyExpat_CAPI_MAGIC */
-    int size; /* set to sizeof(struct PyExpat_CAPI) */
-    int MAJOR_VERSION;
-    int MINOR_VERSION;
-    int MICRO_VERSION;
-    /* pointers to selected expat functions.  add new functions at
-       the end, if needed */
-    const XML_LChar * (*ErrorString)(enum XML_Error code);
-    enum XML_Error (*GetErrorCode)(XML_Parser parser);
-    XML_Size (*GetErrorColumnNumber)(XML_Parser parser);
-    XML_Size (*GetErrorLineNumber)(XML_Parser parser);
-    enum XML_Status (*Parse)(
-        XML_Parser parser, const char *s, int len, int isFinal);
-    XML_Parser (*ParserCreate_MM)(
-        const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite,
-        const XML_Char *namespaceSeparator);
-    void (*ParserFree)(XML_Parser parser);
-    void (*SetCharacterDataHandler)(
-        XML_Parser parser, XML_CharacterDataHandler handler);
-    void (*SetCommentHandler)(
-        XML_Parser parser, XML_CommentHandler handler);
-    void (*SetDefaultHandlerExpand)(
-        XML_Parser parser, XML_DefaultHandler handler);
-    void (*SetElementHandler)(
-        XML_Parser parser, XML_StartElementHandler start,
-        XML_EndElementHandler end);
-    void (*SetNamespaceDeclHandler)(
-        XML_Parser parser, XML_StartNamespaceDeclHandler start,
-        XML_EndNamespaceDeclHandler end);
-    void (*SetProcessingInstructionHandler)(
-        XML_Parser parser, XML_ProcessingInstructionHandler handler);
-    void (*SetUnknownEncodingHandler)(
-        XML_Parser parser, XML_UnknownEncodingHandler handler,
-        void *encodingHandlerData);
-    void (*SetUserData)(XML_Parser parser, void *userData);
-    void (*SetStartDoctypeDeclHandler)(XML_Parser parser,
-                                       XML_StartDoctypeDeclHandler start);
-    enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding);
-    int (*DefaultUnknownEncodingHandler)(
-        void *encodingHandlerData, const XML_Char *name, XML_Encoding *info);
-    /* always add new stuff to the end! */
-};
-
diff --git a/dependencies2013/win32/include/python/pyfpe.h b/dependencies2013/win32/include/python/pyfpe.h
deleted file mode 100644
index f9a15e62..00000000
--- a/dependencies2013/win32/include/python/pyfpe.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef Py_PYFPE_H
-#define Py_PYFPE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
-     ---------------------------------------------------------------------
-    /                       Copyright (c) 1996.                           \
-   |          The Regents of the University of California.                 |
-   |                        All rights reserved.                           |
-   |                                                                       |
-   |   Permission to use, copy, modify, and distribute this software for   |
-   |   any purpose without fee is hereby granted, provided that this en-   |
-   |   tire notice is included in all copies of any software which is or   |
-   |   includes  a  copy  or  modification  of  this software and in all   |
-   |   copies of the supporting documentation for such software.           |
-   |                                                                       |
-   |   This  work was produced at the University of California, Lawrence   |
-   |   Livermore National Laboratory under  contract  no.  W-7405-ENG-48   |
-   |   between  the  U.S.  Department  of  Energy and The Regents of the   |
-   |   University of California for the operation of UC LLNL.              |
-   |                                                                       |
-   |                              DISCLAIMER                               |
-   |                                                                       |
-   |   This  software was prepared as an account of work sponsored by an   |
-   |   agency of the United States Government. Neither the United States   |
-   |   Government  nor the University of California nor any of their em-   |
-   |   ployees, makes any warranty, express or implied, or  assumes  any   |
-   |   liability  or  responsibility  for the accuracy, completeness, or   |
-   |   usefulness of any information,  apparatus,  product,  or  process   |
-   |   disclosed,   or  represents  that  its  use  would  not  infringe   |
-   |   privately-owned rights. Reference herein to any specific  commer-   |
-   |   cial  products,  process,  or  service  by trade name, trademark,   |
-   |   manufacturer, or otherwise, does not  necessarily  constitute  or   |
-   |   imply  its endorsement, recommendation, or favoring by the United   |
-   |   States Government or the University of California. The views  and   |
-   |   opinions  of authors expressed herein do not necessarily state or   |
-   |   reflect those of the United States Government or  the  University   |
-   |   of  California,  and shall not be used for advertising or product   |
-    \  endorsement purposes.                                              /
-     ---------------------------------------------------------------------
-*/
-
-/*
- *       Define macros for handling SIGFPE.
- *       Lee Busby, LLNL, November, 1996
- *       busby1@llnl.gov
- *
- *********************************************
- * Overview of the system for handling SIGFPE:
- *
- * This file (Include/pyfpe.h) defines a couple of "wrapper" macros for
- * insertion into your Python C code of choice. Their proper use is
- * discussed below. The file Python/pyfpe.c defines a pair of global
- * variables PyFPE_jbuf and PyFPE_counter which are used by the signal
- * handler for SIGFPE to decide if a particular exception was protected
- * by the macros. The signal handler itself, and code for enabling the
- * generation of SIGFPE in the first place, is in a (new) Python module
- * named fpectl. This module is standard in every respect. It can be loaded
- * either statically or dynamically as you choose, and like any other
- * Python module, has no effect until you import it.
- *
- * In the general case, there are three steps toward handling SIGFPE in any
- * Python code:
- *
- * 1) Add the *_PROTECT macros to your C code as required to protect
- *    dangerous floating point sections.
- *
- * 2) Turn on the inclusion of the code by adding the ``--with-fpectl''
- *    flag at the time you run configure.  If the fpectl or other modules
- *    which use the *_PROTECT macros are to be dynamically loaded, be
- *    sure they are compiled with WANT_SIGFPE_HANDLER defined.
- *
- * 3) When python is built and running, import fpectl, and execute
- *    fpectl.turnon_sigfpe(). This sets up the signal handler and enables
- *    generation of SIGFPE whenever an exception occurs. From this point
- *    on, any properly trapped SIGFPE should result in the Python
- *    FloatingPointError exception.
- *
- * Step 1 has been done already for the Python kernel code, and should be
- * done soon for the NumPy array package.  Step 2 is usually done once at
- * python install time. Python's behavior with respect to SIGFPE is not
- * changed unless you also do step 3. Thus you can control this new
- * facility at compile time, or run time, or both.
- *
- ********************************
- * Using the macros in your code:
- *
- * static PyObject *foobar(PyObject *self,PyObject *args)
- * {
- *     ....
- *     PyFPE_START_PROTECT("Error in foobar", return 0)
- *     result = dangerous_op(somearg1, somearg2, ...);
- *     PyFPE_END_PROTECT(result)
- *     ....
- * }
- *
- * If a floating point error occurs in dangerous_op, foobar returns 0 (NULL),
- * after setting the associated value of the FloatingPointError exception to
- * "Error in foobar". ``Dangerous_op'' can be a single operation, or a block
- * of code, function calls, or any combination, so long as no alternate
- * return is possible before the PyFPE_END_PROTECT macro is reached.
- *
- * The macros can only be used in a function context where an error return
- * can be recognized as signaling a Python exception. (Generally, most
- * functions that return a PyObject * will qualify.)
- *
- * Guido's original design suggestion for PyFPE_START_PROTECT and
- * PyFPE_END_PROTECT had them open and close a local block, with a locally
- * defined jmp_buf and jmp_buf pointer. This would allow recursive nesting
- * of the macros. The Ansi C standard makes it clear that such local
- * variables need to be declared with the "volatile" type qualifier to keep
- * setjmp from corrupting their values. Some current implementations seem
- * to be more restrictive. For example, the HPUX man page for setjmp says
- *
- *   Upon the return from a setjmp() call caused by a longjmp(), the
- *   values of any non-static local variables belonging to the routine
- *   from which setjmp() was called are undefined. Code which depends on
- *   such values is not guaranteed to be portable.
- *
- * I therefore decided on a more limited form of nesting, using a counter
- * variable (PyFPE_counter) to keep track of any recursion.  If an exception
- * occurs in an ``inner'' pair of macros, the return will apparently
- * come from the outermost level.
- *
- */
-
-#ifdef WANT_SIGFPE_HANDLER
-#include <signal.h>
-#include <setjmp.h>
-#include <math.h>
-extern jmp_buf PyFPE_jbuf;
-extern int PyFPE_counter;
-extern double PyFPE_dummy(void *);
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt) \
-if (!PyFPE_counter++ && setjmp(PyFPE_jbuf)) { \
-	PyErr_SetString(PyExc_FloatingPointError, err_string); \
-	PyFPE_counter = 0; \
-	leave_stmt; \
-}
-
-/*
- * This (following) is a heck of a way to decrement a counter. However,
- * unless the macro argument is provided, code optimizers will sometimes move
- * this statement so that it gets executed *before* the unsafe expression
- * which we're trying to protect.  That pretty well messes things up,
- * of course.
- *
- * If the expression(s) you're trying to protect don't happen to return a
- * value, you will need to manufacture a dummy result just to preserve the
- * correct ordering of statements.  Note that the macro passes the address
- * of its argument (so you need to give it something which is addressable).
- * If your expression returns multiple results, pass the last such result
- * to PyFPE_END_PROTECT.
- *
- * Note that PyFPE_dummy returns a double, which is cast to int.
- * This seeming insanity is to tickle the Floating Point Unit (FPU).
- * If an exception has occurred in a preceding floating point operation,
- * some architectures (notably Intel 80x86) will not deliver the interrupt
- * until the *next* floating point operation.  This is painful if you've
- * already decremented PyFPE_counter.
- */
-#define PyFPE_END_PROTECT(v) PyFPE_counter -= (int)PyFPE_dummy(&(v));
-
-#else
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt)
-#define PyFPE_END_PROTECT(v)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYFPE_H */
diff --git a/dependencies2013/win32/include/python/pygetopt.h b/dependencies2013/win32/include/python/pygetopt.h
deleted file mode 100644
index 962720c8..00000000
--- a/dependencies2013/win32/include/python/pygetopt.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#ifndef Py_PYGETOPT_H
-#define Py_PYGETOPT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(int) _PyOS_opterr;
-PyAPI_DATA(int) _PyOS_optind;
-PyAPI_DATA(wchar_t *) _PyOS_optarg;
-
-PyAPI_FUNC(void) _PyOS_ResetGetOpt(void);
-
-PyAPI_FUNC(int) _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYGETOPT_H */
diff --git a/dependencies2013/win32/include/python/pyhash.h b/dependencies2013/win32/include/python/pyhash.h
deleted file mode 100644
index 9cfd071e..00000000
--- a/dependencies2013/win32/include/python/pyhash.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef Py_HASH_H
-
-#define Py_HASH_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Helpers for hash functions */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_hash_t) _Py_HashDouble(double);
-PyAPI_FUNC(Py_hash_t) _Py_HashPointer(void*);
-PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t);
-#endif
-
-/* Prime multiplier used in string and various other hashes. */
-#define _PyHASH_MULTIPLIER 1000003UL  /* 0xf4243 */
-
-/* Parameters used for the numeric hash implementation.  See notes for
-   _Py_HashDouble in Python/pyhash.c.  Numeric hashes are based on
-   reduction modulo the prime 2**_PyHASH_BITS - 1. */
-
-#if SIZEOF_VOID_P >= 8
-#  define _PyHASH_BITS 61
-#else
-#  define _PyHASH_BITS 31
-#endif
-
-#define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
-#define _PyHASH_INF 314159
-#define _PyHASH_NAN 0
-#define _PyHASH_IMAG _PyHASH_MULTIPLIER
-
-
-/* hash secret
- *
- * memory layout on 64 bit systems
- *   cccccccc cccccccc cccccccc  uc -- unsigned char[24]
- *   pppppppp ssssssss ........  fnv -- two Py_hash_t
- *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t
- *   ........ ........ ssssssss  djbx33a -- 16 bytes padding + one Py_hash_t
- *   ........ ........ eeeeeeee  pyexpat XML hash salt
- *
- * memory layout on 32 bit systems
- *   cccccccc cccccccc cccccccc  uc
- *   ppppssss ........ ........  fnv -- two Py_hash_t
- *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t (*)
- *   ........ ........ ssss....  djbx33a -- 16 bytes padding + one Py_hash_t
- *   ........ ........ eeee....  pyexpat XML hash salt
- *
- * (*) The siphash member may not be available on 32 bit platforms without
- *     an unsigned int64 data type.
- */
-#ifndef Py_LIMITED_API
-typedef union {
-    /* ensure 24 bytes */
-    unsigned char uc[24];
-    /* two Py_hash_t for FNV */
-    struct {
-        Py_hash_t prefix;
-        Py_hash_t suffix;
-    } fnv;
-    /* two uint64 for SipHash24 */
-    struct {
-        uint64_t k0;
-        uint64_t k1;
-    } siphash;
-    /* a different (!) Py_hash_t for small string optimization */
-    struct {
-        unsigned char padding[16];
-        Py_hash_t suffix;
-    } djbx33a;
-    struct {
-        unsigned char padding[16];
-        Py_hash_t hashsalt;
-    } expat;
-} _Py_HashSecret_t;
-PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret;
-#endif
-
-#ifdef Py_DEBUG
-PyAPI_DATA(int) _Py_HashSecret_Initialized;
-#endif
-
-
-/* hash function definition */
-#ifndef Py_LIMITED_API
-typedef struct {
-    Py_hash_t (*const hash)(const void *, Py_ssize_t);
-    const char *name;
-    const int hash_bits;
-    const int seed_bits;
-} PyHash_FuncDef;
-
-PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void);
-#endif
-
-
-/* cutoff for small string DJBX33A optimization in range [1, cutoff).
- *
- * About 50% of the strings in a typical Python application are smaller than
- * 6 to 7 chars. However DJBX33A is vulnerable to hash collision attacks.
- * NEVER use DJBX33A for long strings!
- *
- * A Py_HASH_CUTOFF of 0 disables small string optimization. 32 bit platforms
- * should use a smaller cutoff because it is easier to create colliding
- * strings. A cutoff of 7 on 64bit platforms and 5 on 32bit platforms should
- * provide a decent safety margin.
- */
-#ifndef Py_HASH_CUTOFF
-#  define Py_HASH_CUTOFF 0
-#elif (Py_HASH_CUTOFF > 7 || Py_HASH_CUTOFF < 0)
-#  error Py_HASH_CUTOFF must in range 0...7.
-#endif /* Py_HASH_CUTOFF */
-
-
-/* hash algorithm selection
- *
- * The values for Py_HASH_SIPHASH24 and Py_HASH_FNV are hard-coded in the
- * configure script.
- *
- * - FNV is available on all platforms and architectures.
- * - SIPHASH24 only works on plaforms that don't require aligned memory for integers.
- * - With EXTERNAL embedders can provide an alternative implementation with::
- *
- *     PyHash_FuncDef PyHash_Func = {...};
- *
- * XXX: Figure out __declspec() for extern PyHash_FuncDef.
- */
-#define Py_HASH_EXTERNAL 0
-#define Py_HASH_SIPHASH24 1
-#define Py_HASH_FNV 2
-
-#ifndef Py_HASH_ALGORITHM
-#  ifndef HAVE_ALIGNED_REQUIRED
-#    define Py_HASH_ALGORITHM Py_HASH_SIPHASH24
-#  else
-#    define Py_HASH_ALGORITHM Py_HASH_FNV
-#  endif /* uint64_t && uint32_t && aligned */
-#endif /* Py_HASH_ALGORITHM */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_HASH_H */
diff --git a/dependencies2013/win32/include/python/pylifecycle.h b/dependencies2013/win32/include/python/pylifecycle.h
deleted file mode 100644
index 01abfa9f..00000000
--- a/dependencies2013/win32/include/python/pylifecycle.h
+++ /dev/null
@@ -1,129 +0,0 @@
-
-/* Interfaces to configure, query, create & destroy the Python runtime */
-
-#ifndef Py_PYLIFECYCLE_H
-#define Py_PYLIFECYCLE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void) Py_SetProgramName(wchar_t *);
-PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
-
-PyAPI_FUNC(void) Py_SetPythonHome(wchar_t *);
-PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void);
-
-#ifndef Py_LIMITED_API
-/* Only used by applications that embed the interpreter and need to
- * override the standard encoding determination mechanism
- */
-PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding,
-                                             const char *errors);
-#endif
-
-PyAPI_FUNC(void) Py_Initialize(void);
-PyAPI_FUNC(void) Py_InitializeEx(int);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_InitializeEx_Private(int, int);
-#endif
-PyAPI_FUNC(void) Py_Finalize(void);
-PyAPI_FUNC(int) Py_FinalizeEx(void);
-PyAPI_FUNC(int) Py_IsInitialized(void);
-PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
-PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
-
-
-/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
- * exit functions.
- */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(void));
-#endif
-PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
-
-PyAPI_FUNC(void) Py_Exit(int);
-
-/* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_RestoreSignals(void);
-
-PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
-#endif
-
-/* Bootstrap __main__ (defined in Modules/main.c) */
-PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv);
-
-/* In getpath.c */
-PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void);
-PyAPI_FUNC(wchar_t *) Py_GetPrefix(void);
-PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);
-PyAPI_FUNC(wchar_t *) Py_GetPath(void);
-PyAPI_FUNC(void)      Py_SetPath(const wchar_t *);
-#ifdef MS_WINDOWS
-int _Py_CheckPython3();
-#endif
-
-/* In their own files */
-PyAPI_FUNC(const char *) Py_GetVersion(void);
-PyAPI_FUNC(const char *) Py_GetPlatform(void);
-PyAPI_FUNC(const char *) Py_GetCopyright(void);
-PyAPI_FUNC(const char *) Py_GetCompiler(void);
-PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(const char *) _Py_gitidentifier(void);
-PyAPI_FUNC(const char *) _Py_gitversion(void);
-#endif
-
-/* Internal -- various one-time initializations */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
-PyAPI_FUNC(PyObject *) _PySys_Init(void);
-PyAPI_FUNC(void) _PyImport_Init(void);
-PyAPI_FUNC(void) _PyExc_Init(PyObject * bltinmod);
-PyAPI_FUNC(void) _PyImportHooks_Init(void);
-PyAPI_FUNC(int) _PyFrame_Init(void);
-PyAPI_FUNC(int) _PyFloat_Init(void);
-PyAPI_FUNC(int) PyByteArray_Init(void);
-PyAPI_FUNC(void) _PyRandom_Init(void);
-#endif
-
-/* Various internal finalizers */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyExc_Fini(void);
-PyAPI_FUNC(void) _PyImport_Fini(void);
-PyAPI_FUNC(void) PyMethod_Fini(void);
-PyAPI_FUNC(void) PyFrame_Fini(void);
-PyAPI_FUNC(void) PyCFunction_Fini(void);
-PyAPI_FUNC(void) PyDict_Fini(void);
-PyAPI_FUNC(void) PyTuple_Fini(void);
-PyAPI_FUNC(void) PyList_Fini(void);
-PyAPI_FUNC(void) PySet_Fini(void);
-PyAPI_FUNC(void) PyBytes_Fini(void);
-PyAPI_FUNC(void) PyByteArray_Fini(void);
-PyAPI_FUNC(void) PyFloat_Fini(void);
-PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
-PyAPI_FUNC(void) _PyGC_DumpShutdownStats(void);
-PyAPI_FUNC(void) _PyGC_Fini(void);
-PyAPI_FUNC(void) PySlice_Fini(void);
-PyAPI_FUNC(void) _PyType_Fini(void);
-PyAPI_FUNC(void) _PyRandom_Fini(void);
-PyAPI_FUNC(void) PyAsyncGen_Fini(void);
-
-PyAPI_DATA(PyThreadState *) _Py_Finalizing;
-#endif
-
-/* Signals */
-typedef void (*PyOS_sighandler_t)(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
-
-#ifndef Py_LIMITED_API
-/* Random */
-PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size);
-PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYLIFECYCLE_H */
diff --git a/dependencies2013/win32/include/python/pymacconfig.h b/dependencies2013/win32/include/python/pymacconfig.h
deleted file mode 100644
index 9dde11bd..00000000
--- a/dependencies2013/win32/include/python/pymacconfig.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef PYMACCONFIG_H
-#define PYMACCONFIG_H
-     /*
-      * This file moves some of the autoconf magic to compile-time
-      * when building on MacOSX. This is needed for building 4-way
-      * universal binaries and for 64-bit universal binaries because
-      * the values redefined below aren't configure-time constant but
-      * only compile-time constant in these scenarios.
-      */
-
-#if defined(__APPLE__)
-
-# undef SIZEOF_LONG
-# undef SIZEOF_PTHREAD_T
-# undef SIZEOF_SIZE_T
-# undef SIZEOF_TIME_T
-# undef SIZEOF_VOID_P
-# undef SIZEOF__BOOL
-# undef SIZEOF_UINTPTR_T
-# undef SIZEOF_PTHREAD_T
-# undef WORDS_BIGENDIAN
-# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
-# undef DOUBLE_IS_BIG_ENDIAN_IEEE754
-# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-# undef HAVE_GCC_ASM_FOR_X87
-
-#    undef VA_LIST_IS_ARRAY
-#    if defined(__LP64__) && defined(__x86_64__)
-#        define VA_LIST_IS_ARRAY 1
-#    endif
-
-#    undef HAVE_LARGEFILE_SUPPORT
-#    ifndef __LP64__
-#         define HAVE_LARGEFILE_SUPPORT 1
-#    endif
-
-#    undef SIZEOF_LONG
-#    ifdef __LP64__
-#        define SIZEOF__BOOL            1
-#        define SIZEOF__BOOL            1
-#        define SIZEOF_LONG             8
-#        define SIZEOF_PTHREAD_T        8
-#        define SIZEOF_SIZE_T           8
-#        define SIZEOF_TIME_T           8
-#        define SIZEOF_VOID_P           8
-#        define SIZEOF_UINTPTR_T        8
-#        define SIZEOF_PTHREAD_T        8
-#    else
-#        ifdef __ppc__
-#           define SIZEOF__BOOL         4
-#        else
-#           define SIZEOF__BOOL         1
-#        endif
-#        define SIZEOF_LONG             4
-#        define SIZEOF_PTHREAD_T        4
-#        define SIZEOF_SIZE_T           4
-#        define SIZEOF_TIME_T           4
-#        define SIZEOF_VOID_P           4
-#        define SIZEOF_UINTPTR_T        4
-#        define SIZEOF_PTHREAD_T        4
-#    endif
-
-#    if defined(__LP64__)
-     /* MacOSX 10.4 (the first release to support 64-bit code
-      * at all) only supports 64-bit in the UNIX layer.
-      * Therefore suppress the toolbox-glue in 64-bit mode.
-      */
-
-    /* In 64-bit mode setpgrp always has no arguments, in 32-bit
-     * mode that depends on the compilation environment
-     */
-#       undef SETPGRP_HAVE_ARG
-
-#    endif
-
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN 1
-#define DOUBLE_IS_BIG_ENDIAN_IEEE754
-#else
-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-#endif /* __BIG_ENDIAN */
-
-#ifdef __i386__
-# define HAVE_GCC_ASM_FOR_X87
-#endif
-
-    /*
-     * The definition in pyconfig.h is only valid on the OS release
-     * where configure ran on and not necessarily for all systems where
-     * the executable can be used on.
-     *
-     * Specifically: OSX 10.4 has limited supported for '%zd', while
-     * 10.5 has full support for '%zd'. A binary built on 10.5 won't
-     * work properly on 10.4 unless we suppress the definition
-     * of PY_FORMAT_SIZE_T
-     */
-#undef  PY_FORMAT_SIZE_T
-
-
-#endif /* defined(_APPLE__) */
-
-#endif /* PYMACCONFIG_H */
diff --git a/dependencies2013/win32/include/python/pymacro.h b/dependencies2013/win32/include/python/pymacro.h
deleted file mode 100644
index 2a839abf..00000000
--- a/dependencies2013/win32/include/python/pymacro.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef Py_PYMACRO_H
-#define Py_PYMACRO_H
-
-/* Minimum value between x and y */
-#define Py_MIN(x, y) (((x) > (y)) ? (y) : (x))
-
-/* Maximum value between x and y */
-#define Py_MAX(x, y) (((x) > (y)) ? (x) : (y))
-
-/* Absolute value of the number x */
-#define Py_ABS(x) ((x) < 0 ? -(x) : (x))
-
-#define _Py_XSTRINGIFY(x) #x
-
-/* Convert the argument to a string. For example, Py_STRINGIFY(123) is replaced
-   with "123" by the preprocessor. Defines are also replaced by their value.
-   For example Py_STRINGIFY(__LINE__) is replaced by the line number, not
-   by "__LINE__". */
-#define Py_STRINGIFY(x) _Py_XSTRINGIFY(x)
-
-/* Get the size of a structure member in bytes */
-#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
-
-/* Argument must be a char or an int in [-128, 127] or [0, 255]. */
-#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
-
-/* Assert a build-time dependency, as an expression.
-
-   Your compile will fail if the condition isn't true, or can't be evaluated
-   by the compiler. This can be used in an expression: its value is 0.
-
-   Example:
-
-   #define foo_to_char(foo)  \
-       ((char *)(foo)        \
-        + Py_BUILD_ASSERT_EXPR(offsetof(struct foo, string) == 0))
-
-   Written by Rusty Russell, public domain, http://ccodearchive.net/ */
-#define Py_BUILD_ASSERT_EXPR(cond) \
-    (sizeof(char [1 - 2*!(cond)]) - 1)
-
-#define Py_BUILD_ASSERT(cond)  do {         \
-        (void)Py_BUILD_ASSERT_EXPR(cond);   \
-    } while(0)
-
-/* Get the number of elements in a visible array
-
-   This does not work on pointers, or arrays declared as [], or function
-   parameters. With correct compiler support, such usage will cause a build
-   error (see Py_BUILD_ASSERT_EXPR).
-
-   Written by Rusty Russell, public domain, http://ccodearchive.net/
-
-   Requires at GCC 3.1+ */
-#if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && \
-    (((__GNUC__ == 3) && (__GNU_MINOR__ >= 1)) || (__GNUC__ >= 4)))
-/* Two gcc extensions.
-   &a[0] degrades to a pointer: a different type from an array */
-#define Py_ARRAY_LENGTH(array) \
-    (sizeof(array) / sizeof((array)[0]) \
-     + Py_BUILD_ASSERT_EXPR(!__builtin_types_compatible_p(typeof(array), \
-                                                          typeof(&(array)[0]))))
-#else
-#define Py_ARRAY_LENGTH(array) \
-    (sizeof(array) / sizeof((array)[0]))
-#endif
-
-
-/* Define macros for inline documentation. */
-#define PyDoc_VAR(name) static char name[]
-#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
-#ifdef WITH_DOC_STRINGS
-#define PyDoc_STR(str) str
-#else
-#define PyDoc_STR(str) ""
-#endif
-
-/* Below "a" is a power of 2. */
-/* Round down size "n" to be a multiple of "a". */
-#define _Py_SIZE_ROUND_DOWN(n, a) ((size_t)(n) & ~(size_t)((a) - 1))
-/* Round up size "n" to be a multiple of "a". */
-#define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \
-        (size_t)((a) - 1)) & ~(size_t)((a) - 1))
-/* Round pointer "p" down to the closest "a"-aligned address <= "p". */
-#define _Py_ALIGN_DOWN(p, a) ((void *)((uintptr_t)(p) & ~(uintptr_t)((a) - 1)))
-/* Round pointer "p" up to the closest "a"-aligned address >= "p". */
-#define _Py_ALIGN_UP(p, a) ((void *)(((uintptr_t)(p) + \
-        (uintptr_t)((a) - 1)) & ~(uintptr_t)((a) - 1)))
-/* Check if pointer "p" is aligned to "a"-bytes boundary. */
-#define _Py_IS_ALIGNED(p, a) (!((uintptr_t)(p) & (uintptr_t)((a) - 1)))
-
-#ifdef __GNUC__
-#define Py_UNUSED(name) _unused_ ## name __attribute__((unused))
-#else
-#define Py_UNUSED(name) _unused_ ## name
-#endif
-
-#endif /* Py_PYMACRO_H */
diff --git a/dependencies2013/win32/include/python/pymath.h b/dependencies2013/win32/include/python/pymath.h
deleted file mode 100644
index 6cf69f98..00000000
--- a/dependencies2013/win32/include/python/pymath.h
+++ /dev/null
@@ -1,230 +0,0 @@
-#ifndef Py_PYMATH_H
-#define Py_PYMATH_H
-
-#include "pyconfig.h" /* include for defines */
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to mathematical
-functions and constants
-**************************************************************************/
-
-/* Python provides implementations for copysign, round and hypot in
- * Python/pymath.c just in case your math library doesn't provide the
- * functions.
- *
- *Note: PC/pyconfig.h defines copysign as _copysign
- */
-#ifndef HAVE_COPYSIGN
-extern double copysign(double, double);
-#endif
-
-#ifndef HAVE_ROUND
-extern double round(double);
-#endif
-
-#ifndef HAVE_HYPOT
-extern double hypot(double, double);
-#endif
-
-/* extra declarations */
-#ifndef _MSC_VER
-#ifndef __STDC__
-extern double fmod (double, double);
-extern double frexp (double, int *);
-extern double ldexp (double, int);
-extern double modf (double, double *);
-extern double pow(double, double);
-#endif /* __STDC__ */
-#endif /* _MSC_VER */
-
-/* High precision definition of pi and e (Euler)
- * The values are taken from libc6's math.h.
- */
-#ifndef Py_MATH_PIl
-#define Py_MATH_PIl 3.1415926535897932384626433832795029L
-#endif
-#ifndef Py_MATH_PI
-#define Py_MATH_PI 3.14159265358979323846
-#endif
-
-#ifndef Py_MATH_El
-#define Py_MATH_El 2.7182818284590452353602874713526625L
-#endif
-
-#ifndef Py_MATH_E
-#define Py_MATH_E 2.7182818284590452354
-#endif
-
-/* Tau (2pi) to 40 digits, taken from tauday.com/tau-digits. */
-#ifndef Py_MATH_TAU
-#define Py_MATH_TAU 6.2831853071795864769252867665590057683943L
-#endif
-
-
-/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU
-   register and into a 64-bit memory location, rounding from extended
-   precision to double precision in the process.  On other platforms it does
-   nothing. */
-
-/* we take double rounding as evidence of x87 usage */
-#ifndef Py_LIMITED_API
-#ifndef Py_FORCE_DOUBLE
-#  ifdef X87_DOUBLE_ROUNDING
-PyAPI_FUNC(double) _Py_force_double(double);
-#    define Py_FORCE_DOUBLE(X) (_Py_force_double(X))
-#  else
-#    define Py_FORCE_DOUBLE(X) (X)
-#  endif
-#endif
-#endif
-
-#ifndef Py_LIMITED_API
-#ifdef HAVE_GCC_ASM_FOR_X87
-PyAPI_FUNC(unsigned short) _Py_get_387controlword(void);
-PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
-#endif
-#endif
-
-/* Py_IS_NAN(X)
- * Return 1 if float or double arg is a NaN, else 0.
- * Caution:
- *     X is evaluated more than once.
- *     This may not work on all platforms.  Each platform has *some*
- *     way to spell this, though -- override in pyconfig.h if you have
- *     a platform where it doesn't work.
- * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan
- */
-#ifndef Py_IS_NAN
-#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1
-#define Py_IS_NAN(X) isnan(X)
-#else
-#define Py_IS_NAN(X) ((X) != (X))
-#endif
-#endif
-
-/* Py_IS_INFINITY(X)
- * Return 1 if float or double arg is an infinity, else 0.
- * Caution:
- *    X is evaluated more than once.
- *    This implementation may set the underflow flag if |X| is very small;
- *    it really can't be implemented correctly (& easily) before C99.
- *    Override in pyconfig.h if you have a better spelling on your platform.
- *  Py_FORCE_DOUBLE is used to avoid getting false negatives from a
- *    non-infinite value v sitting in an 80-bit x87 register such that
- *    v becomes infinite when spilled from the register to 64-bit memory.
- * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf
- */
-#ifndef Py_IS_INFINITY
-#  if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1
-#    define Py_IS_INFINITY(X) isinf(X)
-#  else
-#    define Py_IS_INFINITY(X) ((X) &&                                   \
-                               (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X)))
-#  endif
-#endif
-
-/* Py_IS_FINITE(X)
- * Return 1 if float or double arg is neither infinite nor NAN, else 0.
- * Some compilers (e.g. VisualStudio) have intrisics for this, so a special
- * macro for this particular test is useful
- * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite
- */
-#ifndef Py_IS_FINITE
-#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1
-#define Py_IS_FINITE(X) isfinite(X)
-#elif defined HAVE_FINITE
-#define Py_IS_FINITE(X) finite(X)
-#else
-#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
-#endif
-#endif
-
-/* HUGE_VAL is supposed to expand to a positive double infinity.  Python
- * uses Py_HUGE_VAL instead because some platforms are broken in this
- * respect.  We used to embed code in pyport.h to try to worm around that,
- * but different platforms are broken in conflicting ways.  If you're on
- * a platform where HUGE_VAL is defined incorrectly, fiddle your Python
- * config to #define Py_HUGE_VAL to something that works on your platform.
- */
-#ifndef Py_HUGE_VAL
-#define Py_HUGE_VAL HUGE_VAL
-#endif
-
-/* Py_NAN
- * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or
- * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform
- * doesn't support NaNs.
- */
-#if !defined(Py_NAN) && !defined(Py_NO_NAN)
-#if !defined(__INTEL_COMPILER)
-    #define Py_NAN (Py_HUGE_VAL * 0.)
-#else /* __INTEL_COMPILER */
-    #if defined(ICC_NAN_STRICT)
-        #pragma float_control(push)
-        #pragma float_control(precise, on)
-        #pragma float_control(except,  on)
-        #if defined(_MSC_VER)
-            __declspec(noinline)
-        #else /* Linux */
-            __attribute__((noinline))
-        #endif /* _MSC_VER */
-        static double __icc_nan()
-        {
-            return sqrt(-1.0);
-        }
-        #pragma float_control (pop)
-        #define Py_NAN __icc_nan()
-    #else /* ICC_NAN_RELAXED as default for Intel Compiler */
-        static const union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
-        #define Py_NAN (__nan_store.__icc_nan)
-    #endif /* ICC_NAN_STRICT */
-#endif /* __INTEL_COMPILER */
-#endif
-
-/* Py_OVERFLOWED(X)
- * Return 1 iff a libm function overflowed.  Set errno to 0 before calling
- * a libm function, and invoke this macro after, passing the function
- * result.
- * Caution:
- *    This isn't reliable.  C99 no longer requires libm to set errno under
- *        any exceptional condition, but does require +- HUGE_VAL return
- *        values on overflow.  A 754 box *probably* maps HUGE_VAL to a
- *        double infinity, and we're cool if that's so, unless the input
- *        was an infinity and an infinity is the expected result.  A C89
- *        system sets errno to ERANGE, so we check for that too.  We're
- *        out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or
- *        if the returned result is a NaN, or if a C89 box returns HUGE_VAL
- *        in non-overflow cases.
- *    X is evaluated more than once.
- * Some platforms have better way to spell this, so expect some #ifdef'ery.
- *
- * OpenBSD uses 'isinf()' because a compiler bug on that platform causes
- * the longer macro version to be mis-compiled. This isn't optimal, and
- * should be removed once a newer compiler is available on that platform.
- * The system that had the failure was running OpenBSD 3.2 on Intel, with
- * gcc 2.95.3.
- *
- * According to Tim's checkin, the FreeBSD systems use isinf() to work
- * around a FPE bug on that platform.
- */
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#define Py_OVERFLOWED(X) isinf(X)
-#else
-#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE ||    \
-                                         (X) == Py_HUGE_VAL || \
-                                         (X) == -Py_HUGE_VAL))
-#endif
-
-/* Return whether integral type *type* is signed or not. */
-#define _Py_IntegralTypeSigned(type) ((type)(-1) < 0)
-/* Return the maximum value of integral type *type*. */
-#define _Py_IntegralTypeMax(type) ((_Py_IntegralTypeSigned(type)) ? (((((type)1 << (sizeof(type)*CHAR_BIT - 2)) - 1) << 1) + 1) : ~(type)0)
-/* Return the minimum value of integral type *type*. */
-#define _Py_IntegralTypeMin(type) ((_Py_IntegralTypeSigned(type)) ? -_Py_IntegralTypeMax(type) - 1 : 0)
-/* Check whether *v* is in the range of integral type *type*. This is most
- * useful if *v* is floating-point, since demoting a floating-point *v* to an
- * integral type that cannot represent *v*'s integral part is undefined
- * behavior. */
-#define _Py_InIntegralTypeRange(type, v) (_Py_IntegralTypeMin(type) <= v && v <= _Py_IntegralTypeMax(type))
-
-#endif /* Py_PYMATH_H */
diff --git a/dependencies2013/win32/include/python/pymem.h b/dependencies2013/win32/include/python/pymem.h
deleted file mode 100644
index a7eb4d2e..00000000
--- a/dependencies2013/win32/include/python/pymem.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* The PyMem_ family:  low-level memory allocation interfaces.
-   See objimpl.h for the PyObject_ memory family.
-*/
-
-#ifndef Py_PYMEM_H
-#define Py_PYMEM_H
-
-#include "pyport.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size);
-PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize);
-PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
-
-/* Configure the Python memory allocators. Pass NULL to use default
-   allocators. */
-PyAPI_FUNC(int) _PyMem_SetupAllocators(const char *opt);
-
-#ifdef WITH_PYMALLOC
-PyAPI_FUNC(int) _PyMem_PymallocEnabled(void);
-#endif
-
-/* Identifier of an address space (domain) in tracemalloc */
-typedef unsigned int _PyTraceMalloc_domain_t;
-
-/* Track an allocated memory block in the tracemalloc module.
-   Return 0 on success, return -1 on error (failed to allocate memory to store
-   the trace).
-
-   Return -2 if tracemalloc is disabled.
-
-   If memory block is already tracked, update the existing trace. */
-PyAPI_FUNC(int) _PyTraceMalloc_Track(
-    _PyTraceMalloc_domain_t domain,
-    uintptr_t ptr,
-    size_t size);
-
-/* Untrack an allocated memory block in the tracemalloc module.
-   Do nothing if the block was not tracked.
-
-   Return -2 if tracemalloc is disabled, otherwise return 0. */
-PyAPI_FUNC(int) _PyTraceMalloc_Untrack(
-    _PyTraceMalloc_domain_t domain,
-    uintptr_t ptr);
-
-/* Get the traceback where a memory block was allocated.
-
-   Return a tuple of (filename: str, lineno: int) tuples.
-
-   Return None if the tracemalloc module is disabled or if the memory block
-   is not tracked by tracemalloc.
-
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(PyObject*) _PyTraceMalloc_GetTraceback(
-    _PyTraceMalloc_domain_t domain,
-    uintptr_t ptr);
-#endif   /* !Py_LIMITED_API */
-
-
-/* BEWARE:
-
-   Each interface exports both functions and macros.  Extension modules should
-   use the functions, to ensure binary compatibility across Python versions.
-   Because the Python implementation is free to change internal details, and
-   the macros may (or may not) expose details for speed, if you do use the
-   macros you must recompile your extensions with each Python release.
-
-   Never mix calls to PyMem_ with calls to the platform malloc/realloc/
-   calloc/free.  For example, on Windows different DLLs may end up using
-   different heaps, and if you use PyMem_Malloc you'll get the memory from the
-   heap used by the Python DLL; it could be a disaster if you free()'ed that
-   directly in your own extension.  Using PyMem_Free instead ensures Python
-   can return the memory to the proper heap.  As another example, in
-   PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_
-   memory functions in special debugging wrappers that add additional
-   debugging info to dynamic memory blocks.  The system routines have no idea
-   what to do with that stuff, and the Python wrappers have no idea what to do
-   with raw blocks obtained directly by the system routines then.
-
-   The GIL must be held when using these APIs.
-*/
-
-/*
- * Raw memory interface
- * ====================
- */
-
-/* Functions
-
-   Functions supplying platform-independent semantics for malloc/realloc/
-   free.  These functions make sure that allocating 0 bytes returns a distinct
-   non-NULL pointer (whenever possible -- if we're flat out of memory, NULL
-   may be returned), even if the platform malloc and realloc don't.
-   Returned pointers must be checked for NULL explicitly.  No action is
-   performed on failure (no exception is set, no warning is printed, etc).
-*/
-
-PyAPI_FUNC(void *) PyMem_Malloc(size_t size);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize);
-#endif
-PyAPI_FUNC(void *) PyMem_Realloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyMem_Free(void *ptr);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str);
-PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
-#endif
-
-/* Macros. */
-
-/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL
-   for malloc(0), which would be treated as an error. Some platforms
-   would return a pointer with no memory behind it, which would break
-   pymalloc. To solve these problems, allocate an extra byte. */
-/* Returns NULL to indicate error if a negative size or size larger than
-   Py_ssize_t can represent is supplied.  Helps prevents security holes. */
-#define PyMem_MALLOC(n)         PyMem_Malloc(n)
-#define PyMem_REALLOC(p, n)     PyMem_Realloc(p, n)
-#define PyMem_FREE(p)           PyMem_Free(p)
-
-/*
- * Type-oriented memory interface
- * ==============================
- *
- * Allocate memory for n objects of the given type.  Returns a new pointer
- * or NULL if the request was too large or memory allocation failed.  Use
- * these macros rather than doing the multiplication yourself so that proper
- * overflow checking is always done.
- */
-
-#define PyMem_New(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
-#define PyMem_NEW(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
-
-/*
- * The value of (p) is always clobbered by this macro regardless of success.
- * The caller MUST check if (p) is NULL afterwards and deal with the memory
- * error if so.  This means the original value of (p) MUST be saved for the
- * caller's memory error handler to not lose track of it.
- */
-#define PyMem_Resize(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
-#define PyMem_RESIZE(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
-
-/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
- * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
- */
-#define PyMem_Del		PyMem_Free
-#define PyMem_DEL		PyMem_FREE
-
-#ifndef Py_LIMITED_API
-typedef enum {
-    /* PyMem_RawMalloc(), PyMem_RawRealloc() and PyMem_RawFree() */
-    PYMEM_DOMAIN_RAW,
-
-    /* PyMem_Malloc(), PyMem_Realloc() and PyMem_Free() */
-    PYMEM_DOMAIN_MEM,
-
-    /* PyObject_Malloc(), PyObject_Realloc() and PyObject_Free() */
-    PYMEM_DOMAIN_OBJ
-} PyMemAllocatorDomain;
-
-typedef struct {
-    /* user context passed as the first argument to the 4 functions */
-    void *ctx;
-
-    /* allocate a memory block */
-    void* (*malloc) (void *ctx, size_t size);
-
-    /* allocate a memory block initialized by zeros */
-    void* (*calloc) (void *ctx, size_t nelem, size_t elsize);
-
-    /* allocate or resize a memory block */
-    void* (*realloc) (void *ctx, void *ptr, size_t new_size);
-
-    /* release a memory block */
-    void (*free) (void *ctx, void *ptr);
-} PyMemAllocatorEx;
-
-/* Get the memory block allocator of the specified domain. */
-PyAPI_FUNC(void) PyMem_GetAllocator(PyMemAllocatorDomain domain,
-                                    PyMemAllocatorEx *allocator);
-
-/* Set the memory block allocator of the specified domain.
-
-   The new allocator must return a distinct non-NULL pointer when requesting
-   zero bytes.
-
-   For the PYMEM_DOMAIN_RAW domain, the allocator must be thread-safe: the GIL
-   is not held when the allocator is called.
-
-   If the new allocator is not a hook (don't call the previous allocator), the
-   PyMem_SetupDebugHooks() function must be called to reinstall the debug hooks
-   on top on the new allocator. */
-PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain,
-                                    PyMemAllocatorEx *allocator);
-
-/* Setup hooks to detect bugs in the following Python memory allocator
-   functions:
-
-   - PyMem_RawMalloc(), PyMem_RawRealloc(), PyMem_RawFree()
-   - PyMem_Malloc(), PyMem_Realloc(), PyMem_Free()
-   - PyObject_Malloc(), PyObject_Realloc() and PyObject_Free()
-
-   Newly allocated memory is filled with the byte 0xCB, freed memory is filled
-   with the byte 0xDB. Additionnal checks:
-
-   - detect API violations, ex: PyObject_Free() called on a buffer allocated
-     by PyMem_Malloc()
-   - detect write before the start of the buffer (buffer underflow)
-   - detect write after the end of the buffer (buffer overflow)
-
-   The function does nothing if Python is not compiled is debug mode. */
-PyAPI_FUNC(void) PyMem_SetupDebugHooks(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYMEM_H */
diff --git a/dependencies2013/win32/include/python/pyport.h b/dependencies2013/win32/include/python/pyport.h
deleted file mode 100644
index 426822a8..00000000
--- a/dependencies2013/win32/include/python/pyport.h
+++ /dev/null
@@ -1,767 +0,0 @@
-#ifndef Py_PYPORT_H
-#define Py_PYPORT_H
-
-#include "pyconfig.h" /* include for defines */
-
-#include <inttypes.h>
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to basic
-C language & library operations whose spellings vary across platforms.
-
-Please try to make documentation here as clear as possible:  by definition,
-the stuff here is trying to illuminate C's darkest corners.
-
-Config #defines referenced here:
-
-SIGNED_RIGHT_SHIFT_ZERO_FILLS
-Meaning:  To be defined iff i>>j does not extend the sign bit when i is a
-          signed integral type and i < 0.
-Used in:  Py_ARITHMETIC_RIGHT_SHIFT
-
-Py_DEBUG
-Meaning:  Extra checks compiled in for debug mode.
-Used in:  Py_SAFE_DOWNCAST
-
-**************************************************************************/
-
-/* typedefs for some C9X-defined synonyms for integral types.
- *
- * The names in Python are exactly the same as the C9X names, except with a
- * Py_ prefix.  Until C9X is universally implemented, this is the only way
- * to ensure that Python gets reliable names that don't conflict with names
- * in non-Python code that are playing their own tricks to define the C9X
- * names.
- *
- * NOTE: don't go nuts here!  Python has no use for *most* of the C9X
- * integral synonyms.  Only define the ones we actually need.
- */
-
-/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG 1
-#endif
-#ifndef PY_LONG_LONG
-#define PY_LONG_LONG long long
-/* If LLONG_MAX is defined in limits.h, use that. */
-#define PY_LLONG_MIN LLONG_MIN
-#define PY_LLONG_MAX LLONG_MAX
-#define PY_ULLONG_MAX ULLONG_MAX
-#endif
-
-#define PY_UINT32_T uint32_t
-#define PY_UINT64_T uint64_t
-
-/* Signed variants of the above */
-#define PY_INT32_T int32_t
-#define PY_INT64_T int64_t
-
-/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all
-   the necessary integer types are available, and we're on a 64-bit platform
-   (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */
-
-#ifndef PYLONG_BITS_IN_DIGIT
-#if SIZEOF_VOID_P >= 8
-#define PYLONG_BITS_IN_DIGIT 30
-#else
-#define PYLONG_BITS_IN_DIGIT 15
-#endif
-#endif
-
-/* uintptr_t is the C9X name for an unsigned integral type such that a
- * legitimate void* can be cast to uintptr_t and then back to void* again
- * without loss of information.  Similarly for intptr_t, wrt a signed
- * integral type.
- */
-typedef uintptr_t       Py_uintptr_t;
-typedef intptr_t        Py_intptr_t;
-
-/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) ==
- * sizeof(size_t).  C99 doesn't define such a thing directly (size_t is an
- * unsigned integral type).  See PEP 353 for details.
- */
-#ifdef HAVE_SSIZE_T
-typedef ssize_t         Py_ssize_t;
-#elif SIZEOF_VOID_P == SIZEOF_SIZE_T
-typedef Py_intptr_t     Py_ssize_t;
-#else
-#   error "Python needs a typedef for Py_ssize_t in pyport.h."
-#endif
-
-/* Py_hash_t is the same size as a pointer. */
-#define SIZEOF_PY_HASH_T SIZEOF_SIZE_T
-typedef Py_ssize_t Py_hash_t;
-/* Py_uhash_t is the unsigned equivalent needed to calculate numeric hash. */
-#define SIZEOF_PY_UHASH_T SIZEOF_SIZE_T
-typedef size_t Py_uhash_t;
-
-/* Only used for compatibility with code that may not be PY_SSIZE_T_CLEAN. */
-#ifdef PY_SSIZE_T_CLEAN
-typedef Py_ssize_t Py_ssize_clean_t;
-#else
-typedef int Py_ssize_clean_t;
-#endif
-
-/* Largest possible value of size_t. */
-#define PY_SIZE_MAX SIZE_MAX
-
-/* Largest positive value of type Py_ssize_t. */
-#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
-/* Smallest negative value of type Py_ssize_t. */
-#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
-
-/* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf
- * format to convert an argument with the width of a size_t or Py_ssize_t.
- * C99 introduced "z" for this purpose, but not all platforms support that;
- * e.g., MS compilers use "I" instead.
- *
- * These "high level" Python format functions interpret "z" correctly on
- * all platforms (Python interprets the format string itself, and does whatever
- * the platform C requires to convert a size_t/Py_ssize_t argument):
- *
- *     PyBytes_FromFormat
- *     PyErr_Format
- *     PyBytes_FromFormatV
- *     PyUnicode_FromFormatV
- *
- * Lower-level uses require that you interpolate the correct format modifier
- * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for
- * example,
- *
- *     Py_ssize_t index;
- *     fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index);
- *
- * That will expand to %ld, or %Id, or to something else correct for a
- * Py_ssize_t on the platform.
- */
-#ifndef PY_FORMAT_SIZE_T
-#   if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__)
-#       define PY_FORMAT_SIZE_T ""
-#   elif SIZEOF_SIZE_T == SIZEOF_LONG
-#       define PY_FORMAT_SIZE_T "l"
-#   elif defined(MS_WINDOWS)
-#       define PY_FORMAT_SIZE_T "I"
-#   else
-#       error "This platform's pyconfig.h needs to define PY_FORMAT_SIZE_T"
-#   endif
-#endif
-
-/* Py_LOCAL can be used instead of static to get the fastest possible calling
- * convention for functions that are local to a given module.
- *
- * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining,
- * for platforms that support that.
- *
- * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more
- * "aggressive" inlining/optimization is enabled for the entire module.  This
- * may lead to code bloat, and may slow things down for those reasons.  It may
- * also lead to errors, if the code relies on pointer aliasing.  Use with
- * care.
- *
- * NOTE: You can only use this for functions that are entirely local to a
- * module; functions that are exported via method tables, callbacks, etc,
- * should keep using static.
- */
-
-#if defined(_MSC_VER)
-#if defined(PY_LOCAL_AGGRESSIVE)
-/* enable more aggressive optimization for visual studio */
-#pragma optimize("agtw", on)
-#endif
-/* ignore warnings if the compiler decides not to inline a function */
-#pragma warning(disable: 4710)
-/* fastest possible local call under MSVC */
-#define Py_LOCAL(type) static type __fastcall
-#define Py_LOCAL_INLINE(type) static __inline type __fastcall
-#elif defined(USE_INLINE)
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static inline type
-#else
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static type
-#endif
-
-/* Py_MEMCPY is kept for backwards compatibility,
- * see https://bugs.python.org/issue28126 */
-#define Py_MEMCPY memcpy
-
-#include <stdlib.h>
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>  /* needed for 'finite' declaration on some platforms */
-#endif
-
-#include <math.h> /* Moved here from the math section, before extern "C" */
-
-/********************************************
- * WRAPPER FOR <time.h> and/or <sys/time.h> *
- ********************************************/
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else /* !TIME_WITH_SYS_TIME */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else /* !HAVE_SYS_TIME_H */
-#include <time.h>
-#endif /* !HAVE_SYS_TIME_H */
-#endif /* !TIME_WITH_SYS_TIME */
-
-
-/******************************
- * WRAPPER FOR <sys/select.h> *
- ******************************/
-
-/* NB caller must include <sys/types.h> */
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif /* !HAVE_SYS_SELECT_H */
-
-/*******************************
- * stat() and fstat() fiddling *
- *******************************/
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#elif defined(HAVE_STAT_H)
-#include <stat.h>
-#endif
-
-#ifndef S_IFMT
-/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
-#define S_IFMT 0170000
-#endif
-
-#ifndef S_IFLNK
-/* Windows doesn't define S_IFLNK but posixmodule.c maps
- * IO_REPARSE_TAG_SYMLINK to S_IFLNK */
-#  define S_IFLNK 0120000
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR)
-#endif
-
-#ifndef S_ISCHR
-#define S_ISCHR(x) (((x) & S_IFMT) == S_IFCHR)
-#endif
-
-#ifdef __cplusplus
-/* Move this down here since some C++ #include's don't like to be included
-   inside an extern "C" */
-extern "C" {
-#endif
-
-
-/* Py_ARITHMETIC_RIGHT_SHIFT
- * C doesn't define whether a right-shift of a signed integer sign-extends
- * or zero-fills.  Here a macro to force sign extension:
- * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J)
- *    Return I >> J, forcing sign extension.  Arithmetically, return the
- *    floor of I/2**J.
- * Requirements:
- *    I should have signed integer type.  In the terminology of C99, this can
- *    be either one of the five standard signed integer types (signed char,
- *    short, int, long, long long) or an extended signed integer type.
- *    J is an integer >= 0 and strictly less than the number of bits in the
- *    type of I (because C doesn't define what happens for J outside that
- *    range either).
- *    TYPE used to specify the type of I, but is now ignored.  It's been left
- *    in for backwards compatibility with versions <= 2.6 or 3.0.
- * Caution:
- *    I may be evaluated more than once.
- */
-#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS
-#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \
-    ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J))
-#else
-#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J))
-#endif
-
-/* Py_FORCE_EXPANSION(X)
- * "Simply" returns its argument.  However, macro expansions within the
- * argument are evaluated.  This unfortunate trickery is needed to get
- * token-pasting to work as desired in some cases.
- */
-#define Py_FORCE_EXPANSION(X) X
-
-/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW)
- * Cast VALUE to type NARROW from type WIDE.  In Py_DEBUG mode, this
- * assert-fails if any information is lost.
- * Caution:
- *    VALUE may be evaluated more than once.
- */
-#ifdef Py_DEBUG
-#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \
-    (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE))
-#else
-#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE)
-#endif
-
-/* Py_SET_ERRNO_ON_MATH_ERROR(x)
- * If a libm function did not set errno, but it looks like the result
- * overflowed or not-a-number, set errno to ERANGE or EDOM.  Set errno
- * to 0 before calling a libm function, and invoke this macro after,
- * passing the function result.
- * Caution:
- *    This isn't reliable.  See Py_OVERFLOWED comments.
- *    X is evaluated more than once.
- */
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64))
-#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM;
-#else
-#define _Py_SET_EDOM_FOR_NAN(X) ;
-#endif
-#define Py_SET_ERRNO_ON_MATH_ERROR(X) \
-    do { \
-        if (errno == 0) { \
-            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \
-                errno = ERANGE; \
-            else _Py_SET_EDOM_FOR_NAN(X) \
-        } \
-    } while(0)
-
-/* Py_SET_ERANGE_ON_OVERFLOW(x)
- * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility.
- */
-#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X)
-
-/* Py_ADJUST_ERANGE1(x)
- * Py_ADJUST_ERANGE2(x, y)
- * Set errno to 0 before calling a libm function, and invoke one of these
- * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful
- * for functions returning complex results).  This makes two kinds of
- * adjustments to errno:  (A) If it looks like the platform libm set
- * errno=ERANGE due to underflow, clear errno. (B) If it looks like the
- * platform libm overflowed but didn't set errno, force errno to ERANGE.  In
- * effect, we're trying to force a useful implementation of C89 errno
- * behavior.
- * Caution:
- *    This isn't reliable.  See Py_OVERFLOWED comments.
- *    X and Y may be evaluated more than once.
- */
-#define Py_ADJUST_ERANGE1(X)                                            \
-    do {                                                                \
-        if (errno == 0) {                                               \
-            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL)              \
-                errno = ERANGE;                                         \
-        }                                                               \
-        else if (errno == ERANGE && (X) == 0.0)                         \
-            errno = 0;                                                  \
-    } while(0)
-
-#define Py_ADJUST_ERANGE2(X, Y)                                         \
-    do {                                                                \
-        if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL ||                \
-            (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) {                \
-                        if (errno == 0)                                 \
-                                errno = ERANGE;                         \
-        }                                                               \
-        else if (errno == ERANGE)                                       \
-            errno = 0;                                                  \
-    } while(0)
-
-/*  The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are
- *  required to support the short float repr introduced in Python 3.1) require
- *  that the floating-point unit that's being used for arithmetic operations
- *  on C doubles is set to use 53-bit precision.  It also requires that the
- *  FPU rounding mode is round-half-to-even, but that's less often an issue.
- *
- *  If your FPU isn't already set to 53-bit precision/round-half-to-even, and
- *  you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should
- *
- *     #define HAVE_PY_SET_53BIT_PRECISION 1
- *
- *  and also give appropriate definitions for the following three macros:
- *
- *    _PY_SET_53BIT_PRECISION_START : store original FPU settings, and
- *        set FPU to 53-bit precision/round-half-to-even
- *    _PY_SET_53BIT_PRECISION_END : restore original FPU settings
- *    _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to
- *        use the two macros above.
- *
- * The macros are designed to be used within a single C function: see
- * Python/pystrtod.c for an example of their use.
- */
-
-/* get and set x87 control word for gcc/x86 */
-#ifdef HAVE_GCC_ASM_FOR_X87
-#define HAVE_PY_SET_53BIT_PRECISION 1
-/* _Py_get/set_387controlword functions are defined in Python/pymath.c */
-#define _Py_SET_53BIT_PRECISION_HEADER                          \
-    unsigned short old_387controlword, new_387controlword
-#define _Py_SET_53BIT_PRECISION_START                                   \
-    do {                                                                \
-        old_387controlword = _Py_get_387controlword();                  \
-        new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \
-        if (new_387controlword != old_387controlword)                   \
-            _Py_set_387controlword(new_387controlword);                 \
-    } while (0)
-#define _Py_SET_53BIT_PRECISION_END                             \
-    if (new_387controlword != old_387controlword)               \
-        _Py_set_387controlword(old_387controlword)
-#endif
-
-/* get and set x87 control word for VisualStudio/x86 */
-#if defined(_MSC_VER) && !defined(_WIN64) /* x87 not supported in 64-bit */
-#define HAVE_PY_SET_53BIT_PRECISION 1
-#define _Py_SET_53BIT_PRECISION_HEADER \
-    unsigned int old_387controlword, new_387controlword, out_387controlword
-/* We use the __control87_2 function to set only the x87 control word.
-   The SSE control word is unaffected. */
-#define _Py_SET_53BIT_PRECISION_START                                   \
-    do {                                                                \
-        __control87_2(0, 0, &old_387controlword, NULL);                 \
-        new_387controlword =                                            \
-          (old_387controlword & ~(_MCW_PC | _MCW_RC)) | (_PC_53 | _RC_NEAR); \
-        if (new_387controlword != old_387controlword)                   \
-            __control87_2(new_387controlword, _MCW_PC | _MCW_RC,        \
-                          &out_387controlword, NULL);                   \
-    } while (0)
-#define _Py_SET_53BIT_PRECISION_END                                     \
-    do {                                                                \
-        if (new_387controlword != old_387controlword)                   \
-            __control87_2(old_387controlword, _MCW_PC | _MCW_RC,        \
-                          &out_387controlword, NULL);                   \
-    } while (0)
-#endif
-
-#ifdef HAVE_GCC_ASM_FOR_MC68881
-#define HAVE_PY_SET_53BIT_PRECISION 1
-#define _Py_SET_53BIT_PRECISION_HEADER \
-  unsigned int old_fpcr, new_fpcr
-#define _Py_SET_53BIT_PRECISION_START                                   \
-  do {                                                                  \
-    __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr));                    \
-    /* Set double precision / round to nearest.  */                     \
-    new_fpcr = (old_fpcr & ~0xf0) | 0x80;                               \
-    if (new_fpcr != old_fpcr)                                           \
-      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr));        \
-  } while (0)
-#define _Py_SET_53BIT_PRECISION_END                                     \
-  do {                                                                  \
-    if (new_fpcr != old_fpcr)                                           \
-      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr));        \
-  } while (0)
-#endif
-
-/* default definitions are empty */
-#ifndef HAVE_PY_SET_53BIT_PRECISION
-#define _Py_SET_53BIT_PRECISION_HEADER
-#define _Py_SET_53BIT_PRECISION_START
-#define _Py_SET_53BIT_PRECISION_END
-#endif
-
-/* If we can't guarantee 53-bit precision, don't use the code
-   in Python/dtoa.c, but fall back to standard code.  This
-   means that repr of a float will be long (17 sig digits).
-
-   Realistically, there are two things that could go wrong:
-
-   (1) doubles aren't IEEE 754 doubles, or
-   (2) we're on x86 with the rounding precision set to 64-bits
-       (extended precision), and we don't know how to change
-       the rounding precision.
- */
-
-#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \
-    !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \
-    !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754)
-#define PY_NO_SHORT_FLOAT_REPR
-#endif
-
-/* double rounding is symptomatic of use of extended precision on x86.  If
-   we're seeing double rounding, and we don't have any mechanism available for
-   changing the FPU rounding precision, then don't use Python/dtoa.c. */
-#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION)
-#define PY_NO_SHORT_FLOAT_REPR
-#endif
-
-
-/* Py_DEPRECATED(version)
- * Declare a variable, type, or function deprecated.
- * Usage:
- *    extern int old_var Py_DEPRECATED(2.3);
- *    typedef int T1 Py_DEPRECATED(2.4);
- *    extern int x() Py_DEPRECATED(2.5);
- */
-#if defined(__GNUC__) && ((__GNUC__ >= 4) || \
-              (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
-#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__))
-#else
-#define Py_DEPRECATED(VERSION_UNUSED)
-#endif
-
-/**************************************************************************
-Prototypes that are missing from the standard include files on some systems
-(and possibly only some versions of such systems.)
-
-Please be conservative with adding new ones, document them and enclose them
-in platform-specific #ifdefs.
-**************************************************************************/
-
-#ifdef SOLARIS
-/* Unchecked */
-extern int gethostname(char *, int);
-#endif
-
-#ifdef HAVE__GETPTY
-#include <sys/types.h>          /* we need to import mode_t */
-extern char * _getpty(int *, int, mode_t, int);
-#endif
-
-/* On QNX 6, struct termio must be declared by including sys/termio.h
-   if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must
-   be included before termios.h or it will generate an error. */
-#if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux)
-#include <sys/termio.h>
-#endif
-
-#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY)
-#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H)
-/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
-   functions, even though they are included in libutil. */
-#include <termios.h>
-extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
-extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
-#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
-#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */
-
-
-/* On 4.4BSD-descendants, ctype functions serves the whole range of
- * wchar_t character set rather than single byte code points only.
- * This characteristic can break some operations of string object
- * including str.upper() and str.split() on UTF-8 locales.  This
- * workaround was provided by Tim Robbins of FreeBSD project.
- */
-
-#ifdef __FreeBSD__
-#include <osreldate.h>
-#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
-    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
-    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
-# define _PY_PORT_CTYPE_UTF8_ISSUE
-#endif
-#endif
-
-
-#if defined(__APPLE__)
-# define _PY_PORT_CTYPE_UTF8_ISSUE
-#endif
-
-#ifdef _PY_PORT_CTYPE_UTF8_ISSUE
-#ifndef __cplusplus
-   /* The workaround below is unsafe in C++ because
-    * the <locale> defines these symbols as real functions,
-    * with a slightly different signature.
-    * See issue #10910
-    */
-#include <ctype.h>
-#include <wctype.h>
-#undef isalnum
-#define isalnum(c) iswalnum(btowc(c))
-#undef isalpha
-#define isalpha(c) iswalpha(btowc(c))
-#undef islower
-#define islower(c) iswlower(btowc(c))
-#undef isspace
-#define isspace(c) iswspace(btowc(c))
-#undef isupper
-#define isupper(c) iswupper(btowc(c))
-#undef tolower
-#define tolower(c) towlower(btowc(c))
-#undef toupper
-#define toupper(c) towupper(btowc(c))
-#endif
-#endif
-
-
-/* Declarations for symbol visibility.
-
-  PyAPI_FUNC(type): Declares a public Python API function and return type
-  PyAPI_DATA(type): Declares public Python data and its type
-  PyMODINIT_FUNC:   A Python module init function.  If these functions are
-                    inside the Python core, they are private to the core.
-                    If in an extension module, it may be declared with
-                    external linkage depending on the platform.
-
-  As a number of platforms support/require "__declspec(dllimport/dllexport)",
-  we support a HAVE_DECLSPEC_DLL macro to save duplication.
-*/
-
-/*
-  All windows ports, except cygwin, are handled in PC/pyconfig.h.
-
-  Cygwin is the only other autoconf platform requiring special
-  linkage handling and it uses __declspec().
-*/
-#if defined(__CYGWIN__)
-#       define HAVE_DECLSPEC_DLL
-#endif
-
-/* only get special linkage if built as shared or platform is Cygwin */
-#if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__)
-#       if defined(HAVE_DECLSPEC_DLL)
-#               ifdef Py_BUILD_CORE
-#                       define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE
-#                       define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE
-        /* module init functions inside the core need no external linkage */
-        /* except for Cygwin to handle embedding */
-#                       if defined(__CYGWIN__)
-#                               define PyMODINIT_FUNC __declspec(dllexport) PyObject*
-#                       else /* __CYGWIN__ */
-#                               define PyMODINIT_FUNC PyObject*
-#                       endif /* __CYGWIN__ */
-#               else /* Py_BUILD_CORE */
-        /* Building an extension module, or an embedded situation */
-        /* public Python functions and data are imported */
-        /* Under Cygwin, auto-import functions to prevent compilation */
-        /* failures similar to those described at the bottom of 4.1: */
-        /* http://docs.python.org/extending/windows.html#a-cookbook-approach */
-#                       if !defined(__CYGWIN__)
-#                               define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE
-#                       endif /* !__CYGWIN__ */
-#                       define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE
-        /* module init functions outside the core must be exported */
-#                       if defined(__cplusplus)
-#                               define PyMODINIT_FUNC extern "C" __declspec(dllexport) PyObject*
-#                       else /* __cplusplus */
-#                               define PyMODINIT_FUNC __declspec(dllexport) PyObject*
-#                       endif /* __cplusplus */
-#               endif /* Py_BUILD_CORE */
-#       endif /* HAVE_DECLSPEC */
-#endif /* Py_ENABLE_SHARED */
-
-/* If no external linkage macros defined by now, create defaults */
-#ifndef PyAPI_FUNC
-#       define PyAPI_FUNC(RTYPE) RTYPE
-#endif
-#ifndef PyAPI_DATA
-#       define PyAPI_DATA(RTYPE) extern RTYPE
-#endif
-#ifndef PyMODINIT_FUNC
-#       if defined(__cplusplus)
-#               define PyMODINIT_FUNC extern "C" PyObject*
-#       else /* __cplusplus */
-#               define PyMODINIT_FUNC PyObject*
-#       endif /* __cplusplus */
-#endif
-
-/* limits.h constants that may be missing */
-
-#ifndef INT_MAX
-#define INT_MAX 2147483647
-#endif
-
-#ifndef LONG_MAX
-#if SIZEOF_LONG == 4
-#define LONG_MAX 0X7FFFFFFFL
-#elif SIZEOF_LONG == 8
-#define LONG_MAX 0X7FFFFFFFFFFFFFFFL
-#else
-#error "could not set LONG_MAX in pyport.h"
-#endif
-#endif
-
-#ifndef LONG_MIN
-#define LONG_MIN (-LONG_MAX-1)
-#endif
-
-#ifndef LONG_BIT
-#define LONG_BIT (8 * SIZEOF_LONG)
-#endif
-
-#if LONG_BIT != 8 * SIZEOF_LONG
-/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent
- * 32-bit platforms using gcc.  We try to catch that here at compile-time
- * rather than waiting for integer multiplication to trigger bogus
- * overflows.
- */
-#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * Hide GCC attributes from compilers that don't support them.
- */
-#if (!defined(__GNUC__) || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) )
-#define Py_GCC_ATTRIBUTE(x)
-#else
-#define Py_GCC_ATTRIBUTE(x) __attribute__(x)
-#endif
-
-/*
- * Specify alignment on compilers that support it.
- */
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define Py_ALIGNED(x) __attribute__((aligned(x)))
-#else
-#define Py_ALIGNED(x)
-#endif
-
-/* Eliminate end-of-loop code not reached warnings from SunPro C
- * when using do{...}while(0) macros
- */
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
-#ifndef Py_LL
-#define Py_LL(x) x##LL
-#endif
-
-#ifndef Py_ULL
-#define Py_ULL(x) Py_LL(x##U)
-#endif
-
-#define Py_VA_COPY va_copy
-
-/*
- * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is
- * detected by configure and defined in pyconfig.h. The code in pyconfig.h
- * also takes care of Apple's universal builds.
- */
-
-#ifdef WORDS_BIGENDIAN
-#define PY_BIG_ENDIAN 1
-#define PY_LITTLE_ENDIAN 0
-#else
-#define PY_BIG_ENDIAN 0
-#define PY_LITTLE_ENDIAN 1
-#endif
-
-#ifdef Py_BUILD_CORE
-/*
- * Macros to protect CRT calls against instant termination when passed an
- * invalid parameter (issue23524).
- */
-#if defined _MSC_VER && _MSC_VER >= 1900
-
-extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
-#define _Py_BEGIN_SUPPRESS_IPH { _invalid_parameter_handler _Py_old_handler = \
-    _set_thread_local_invalid_parameter_handler(_Py_silent_invalid_parameter_handler);
-#define _Py_END_SUPPRESS_IPH _set_thread_local_invalid_parameter_handler(_Py_old_handler); }
-
-#else
-
-#define _Py_BEGIN_SUPPRESS_IPH
-#define _Py_END_SUPPRESS_IPH
-
-#endif /* _MSC_VER >= 1900 */
-#endif /* Py_BUILD_CORE */
-
-#ifdef __ANDROID__
-#include <android/api-level.h>
-#endif
-
-#endif /* Py_PYPORT_H */
diff --git a/dependencies2013/win32/include/python/pystate.h b/dependencies2013/win32/include/python/pystate.h
deleted file mode 100644
index 1838fa40..00000000
--- a/dependencies2013/win32/include/python/pystate.h
+++ /dev/null
@@ -1,324 +0,0 @@
-
-/* Thread and interpreter state structures and their interfaces */
-
-
-#ifndef Py_PYSTATE_H
-#define Py_PYSTATE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This limitation is for performance and simplicity. If needed it can be
-removed (with effort). */
-#define MAX_CO_EXTRA_USERS 255
-
-/* State shared between threads */
-
-struct _ts; /* Forward */
-struct _is; /* Forward */
-struct _frame; /* Forward declaration for PyFrameObject. */
-
-#ifdef Py_LIMITED_API
-typedef struct _is PyInterpreterState;
-#else
-typedef PyObject* (*_PyFrameEvalFunction)(struct _frame *, int);
-
-typedef struct _is {
-
-    struct _is *next;
-    struct _ts *tstate_head;
-
-    PyObject *modules;
-    PyObject *modules_by_index;
-    PyObject *sysdict;
-    PyObject *builtins;
-    PyObject *importlib;
-
-    PyObject *codec_search_path;
-    PyObject *codec_search_cache;
-    PyObject *codec_error_registry;
-    int codecs_initialized;
-    int fscodec_initialized;
-
-#ifdef HAVE_DLOPEN
-    int dlopenflags;
-#endif
-
-    PyObject *builtins_copy;
-    PyObject *import_func;
-    /* Initialized to PyEval_EvalFrameDefault(). */
-    _PyFrameEvalFunction eval_frame;
-} PyInterpreterState;
-#endif
-
-typedef struct _co_extra_state {
-    struct _co_extra_state *next;
-    PyInterpreterState* interp;
-
-    Py_ssize_t co_extra_user_count;
-    freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS];
-} __PyCodeExtraState;
-
-/* This is temporary for backwards compat in 3.6 and will be removed in 3.7 */
-__PyCodeExtraState* __PyCodeExtraState_Get(void);
-
-/* State unique per thread */
-
-#ifndef Py_LIMITED_API
-/* Py_tracefunc return -1 when raising an exception, or 0 for success. */
-typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *);
-
-/* The following values are used for 'what' for tracefunc functions: */
-#define PyTrace_CALL 0
-#define PyTrace_EXCEPTION 1
-#define PyTrace_LINE 2
-#define PyTrace_RETURN 3
-#define PyTrace_C_CALL 4
-#define PyTrace_C_EXCEPTION 5
-#define PyTrace_C_RETURN 6
-#endif
-
-#ifdef Py_LIMITED_API
-typedef struct _ts PyThreadState;
-#else
-typedef struct _ts {
-    /* See Python/ceval.c for comments explaining most fields */
-
-    struct _ts *prev;
-    struct _ts *next;
-    PyInterpreterState *interp;
-
-    struct _frame *frame;
-    int recursion_depth;
-    char overflowed; /* The stack has overflowed. Allow 50 more calls
-                        to handle the runtime error. */
-    char recursion_critical; /* The current calls must not cause
-                                a stack overflow. */
-    /* 'tracing' keeps track of the execution depth when tracing/profiling.
-       This is to prevent the actual trace/profile code from being recorded in
-       the trace/profile. */
-    int tracing;
-    int use_tracing;
-
-    Py_tracefunc c_profilefunc;
-    Py_tracefunc c_tracefunc;
-    PyObject *c_profileobj;
-    PyObject *c_traceobj;
-
-    PyObject *curexc_type;
-    PyObject *curexc_value;
-    PyObject *curexc_traceback;
-
-    PyObject *exc_type;
-    PyObject *exc_value;
-    PyObject *exc_traceback;
-
-    PyObject *dict;  /* Stores per-thread state */
-
-    int gilstate_counter;
-
-    PyObject *async_exc; /* Asynchronous exception to raise */
-    long thread_id; /* Thread id where this tstate was created */
-
-    int trash_delete_nesting;
-    PyObject *trash_delete_later;
-
-    /* Called when a thread state is deleted normally, but not when it
-     * is destroyed after fork().
-     * Pain:  to prevent rare but fatal shutdown errors (issue 18808),
-     * Thread.join() must wait for the join'ed thread's tstate to be unlinked
-     * from the tstate chain.  That happens at the end of a thread's life,
-     * in pystate.c.
-     * The obvious way doesn't quite work:  create a lock which the tstate
-     * unlinking code releases, and have Thread.join() wait to acquire that
-     * lock.  The problem is that we _are_ at the end of the thread's life:
-     * if the thread holds the last reference to the lock, decref'ing the
-     * lock will delete the lock, and that may trigger arbitrary Python code
-     * if there's a weakref, with a callback, to the lock.  But by this time
-     * _PyThreadState_Current is already NULL, so only the simplest of C code
-     * can be allowed to run (in particular it must not be possible to
-     * release the GIL).
-     * So instead of holding the lock directly, the tstate holds a weakref to
-     * the lock:  that's the value of on_delete_data below.  Decref'ing a
-     * weakref is harmless.
-     * on_delete points to _threadmodule.c's static release_sentinel() function.
-     * After the tstate is unlinked, release_sentinel is called with the
-     * weakref-to-lock (on_delete_data) argument, and release_sentinel releases
-     * the indirectly held lock.
-     */
-    void (*on_delete)(void *);
-    void *on_delete_data;
-
-    PyObject *coroutine_wrapper;
-    int in_coroutine_wrapper;
-
-    /* Now used from PyInterpreterState, kept here for ABI
-       compatibility with PyThreadState */
-    Py_ssize_t _preserve_36_ABI_1;
-    freefunc _preserve_36_ABI_2[MAX_CO_EXTRA_USERS];
-
-    PyObject *async_gen_firstiter;
-    PyObject *async_gen_finalizer;
-
-    /* XXX signal handlers should also be here */
-
-} PyThreadState;
-#endif
-
-
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void);
-PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
-PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
-#endif /* !Py_LIMITED_API */
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* New in 3.3 */
-PyAPI_FUNC(int) PyState_AddModule(PyObject*, struct PyModuleDef*);
-PyAPI_FUNC(int) PyState_RemoveModule(struct PyModuleDef*);
-#endif
-PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyState_ClearModules(void);
-#endif
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
-PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *);
-#endif /* !Py_LIMITED_API */
-PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyThreadState_DeleteExcept(PyThreadState *tstate);
-#endif /* !Py_LIMITED_API */
-#ifdef WITH_THREAD
-PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyGILState_Reinit(void);
-#endif /* !Py_LIMITED_API */
-#endif
-
-/* Return the current thread state. The global interpreter lock must be held.
- * When the current thread state is NULL, this issues a fatal error (so that
- * the caller needn't check for NULL). */
-PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-
-#ifndef Py_LIMITED_API
-/* Similar to PyThreadState_Get(), but don't issue a fatal error
- * if it is NULL. */
-PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void);
-#endif /* !Py_LIMITED_API */
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *);
-PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void);
-PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *);
-
-
-/* Variable and macro for in-line access to current thread state */
-
-/* Assuming the current thread holds the GIL, this is the
-   PyThreadState for the current thread. */
-#ifdef Py_BUILD_CORE
-PyAPI_DATA(_Py_atomic_address) _PyThreadState_Current;
-#  define PyThreadState_GET() \
-             ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current))
-#else
-#  define PyThreadState_GET() PyThreadState_Get()
-#endif
-
-typedef
-    enum {PyGILState_LOCKED, PyGILState_UNLOCKED}
-        PyGILState_STATE;
-
-#ifdef WITH_THREAD
-
-/* Ensure that the current thread is ready to call the Python
-   C API, regardless of the current state of Python, or of its
-   thread lock.  This may be called as many times as desired
-   by a thread so long as each call is matched with a call to
-   PyGILState_Release().  In general, other thread-state APIs may
-   be used between _Ensure() and _Release() calls, so long as the
-   thread-state is restored to its previous state before the Release().
-   For example, normal use of the Py_BEGIN_ALLOW_THREADS/
-   Py_END_ALLOW_THREADS macros are acceptable.
-
-   The return value is an opaque "handle" to the thread state when
-   PyGILState_Ensure() was called, and must be passed to
-   PyGILState_Release() to ensure Python is left in the same state. Even
-   though recursive calls are allowed, these handles can *not* be shared -
-   each unique call to PyGILState_Ensure must save the handle for its
-   call to PyGILState_Release.
-
-   When the function returns, the current thread will hold the GIL.
-
-   Failure is a fatal error.
-*/
-PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void);
-
-/* Release any resources previously acquired.  After this call, Python's
-   state will be the same as it was prior to the corresponding
-   PyGILState_Ensure() call (but generally this state will be unknown to
-   the caller, hence the use of the GILState API.)
-
-   Every call to PyGILState_Ensure must be matched by a call to
-   PyGILState_Release on the same thread.
-*/
-PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE);
-
-/* Helper/diagnostic function - get the current thread state for
-   this thread.  May return NULL if no GILState API has been used
-   on the current thread.  Note that the main thread always has such a
-   thread-state, even if no auto-thread-state call has been made
-   on the main thread.
-*/
-PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
-
-#ifndef Py_LIMITED_API
-/* Issue #26558: Flag to disable PyGILState_Check().
-   If set to non-zero, PyGILState_Check() always return 1. */
-PyAPI_DATA(int) _PyGILState_check_enabled;
-
-/* Helper/diagnostic function - return 1 if the current thread
-   currently holds the GIL, 0 otherwise.
-
-   The function returns 1 if _PyGILState_check_enabled is non-zero. */
-PyAPI_FUNC(int) PyGILState_Check(void);
-
-/* Unsafe function to get the single PyInterpreterState used by this process'
-   GILState implementation.
-
-   Return NULL before _PyGILState_Init() is called and after _PyGILState_Fini()
-   is called. */
-PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
-#endif
-
-#endif   /* #ifdef WITH_THREAD */
-
-/* The implementation of sys._current_frames()  Returns a dict mapping
-   thread id to that thread's current frame.
-*/
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
-#endif
-
-/* Routines for advanced debuggers, requested by David Beazley.
-   Don't use unless you know what you are doing! */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void);
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *);
-
-typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_);
-#endif
-
-/* hook for PyEval_GetFrame(), requested for Psyco */
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYSTATE_H */
diff --git a/dependencies2013/win32/include/python/pystrcmp.h b/dependencies2013/win32/include/python/pystrcmp.h
deleted file mode 100644
index edb12397..00000000
--- a/dependencies2013/win32/include/python/pystrcmp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef Py_STRCMP_H
-#define Py_STRCMP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t);
-PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *);
-
-#ifdef MS_WINDOWS
-#define PyOS_strnicmp strnicmp
-#define PyOS_stricmp stricmp
-#else
-#define PyOS_strnicmp PyOS_mystrnicmp
-#define PyOS_stricmp PyOS_mystricmp
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRCMP_H */
diff --git a/dependencies2013/win32/include/python/pystrhex.h b/dependencies2013/win32/include/python/pystrhex.h
deleted file mode 100644
index 66a30e22..00000000
--- a/dependencies2013/win32/include/python/pystrhex.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef Py_STRHEX_H
-#define Py_STRHEX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-/* Returns a str() containing the hex representation of argbuf. */
-PyAPI_FUNC(PyObject*) _Py_strhex(const char* argbuf, const Py_ssize_t arglen);
-/* Returns a bytes() containing the ASCII hex representation of argbuf. */
-PyAPI_FUNC(PyObject*) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRHEX_H */
diff --git a/dependencies2013/win32/include/python/pystrtod.h b/dependencies2013/win32/include/python/pystrtod.h
deleted file mode 100644
index c1e84de6..00000000
--- a/dependencies2013/win32/include/python/pystrtod.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef Py_STRTOD_H
-#define Py_STRTOD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_FUNC(double) PyOS_string_to_double(const char *str,
-                                         char **endptr,
-                                         PyObject *overflow_exception);
-
-/* The caller is responsible for calling PyMem_Free to free the buffer
-   that's is returned. */
-PyAPI_FUNC(char *) PyOS_double_to_string(double val,
-                                         char format_code,
-                                         int precision,
-                                         int flags,
-                                         int *type);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _Py_string_to_number_with_underscores(
-    const char *str, Py_ssize_t len, const char *what, PyObject *obj, void *arg,
-    PyObject *(*innerfunc)(const char *, Py_ssize_t, void *));
-
-PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr);
-#endif
-
-
-/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */
-#define Py_DTSF_SIGN      0x01 /* always add the sign */
-#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */
-#define Py_DTSF_ALT       0x04 /* "alternate" formatting. it's format_code
-                                  specific */
-
-/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */
-#define Py_DTST_FINITE 0
-#define Py_DTST_INFINITE 1
-#define Py_DTST_NAN 2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRTOD_H */
diff --git a/dependencies2013/win32/include/python/pythonrun.h b/dependencies2013/win32/include/python/pythonrun.h
deleted file mode 100644
index efc613f6..00000000
--- a/dependencies2013/win32/include/python/pythonrun.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-/* Interfaces to parse and execute pieces of python code */
-
-#ifndef Py_PYTHONRUN_H
-#define Py_PYTHONRUN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
-                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
-                   CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL | \
-                   CO_FUTURE_GENERATOR_STOP)
-#define PyCF_MASK_OBSOLETE (CO_NESTED)
-#define PyCF_SOURCE_IS_UTF8  0x0100
-#define PyCF_DONT_IMPLY_DEDENT 0x0200
-#define PyCF_ONLY_AST 0x0400
-#define PyCF_IGNORE_COOKIE 0x0800
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
-} PyCompilerFlags;
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_AnyFileExFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int closeit,
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_SimpleFileExFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int closeit,
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_InteractiveOneFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_InteractiveOneObject(
-    FILE *fp,
-    PyObject *filename,
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyCompilerFlags *flags);
-
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(
-    const char *s,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromStringObject(
-    const char *s,
-    PyObject *filename,
-    int start,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    const char* enc,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    PyCompilerFlags *flags,
-    int *errcode,
-    PyArena *arena);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromFileObject(
-    FILE *fp,
-    PyObject *filename,
-    const char* enc,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    PyCompilerFlags *flags,
-    int *errcode,
-    PyArena *arena);
-#endif
-
-#ifndef PyParser_SimpleParseString
-#define PyParser_SimpleParseString(S, B) \
-    PyParser_SimpleParseStringFlags(S, B, 0)
-#define PyParser_SimpleParseFile(FP, S, B) \
-    PyParser_SimpleParseFileFlags(FP, S, B, 0)
-#endif
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int,
-                                                           int);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlagsFilename(const char *,
-                                                                   const char *,
-                                                                   int, int);
-#endif
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *,
-                                                         int, int);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *,
-                                         PyObject *, PyCompilerFlags *);
-
-PyAPI_FUNC(PyObject *) PyRun_FileExFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start,
-    PyObject *globals,
-    PyObject *locals,
-    int closeit,
-    PyCompilerFlags *flags);
-#endif
-
-#ifdef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) Py_CompileString(const char *, const char *, int);
-#else
-#define Py_CompileString(str, p, s) Py_CompileStringExFlags(str, p, s, NULL, -1)
-#define Py_CompileStringFlags(str, p, s, f) Py_CompileStringExFlags(str, p, s, f, -1)
-PyAPI_FUNC(PyObject *) Py_CompileStringExFlags(
-    const char *str,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start,
-    PyCompilerFlags *flags,
-    int optimize);
-PyAPI_FUNC(PyObject *) Py_CompileStringObject(
-    const char *str,
-    PyObject *filename, int start,
-    PyCompilerFlags *flags,
-    int optimize);
-#endif
-PyAPI_FUNC(struct symtable *) Py_SymtableString(
-    const char *str,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(struct symtable *) Py_SymtableStringObject(
-    const char *str,
-    PyObject *filename,
-    int start);
-#endif
-
-PyAPI_FUNC(void) PyErr_Print(void);
-PyAPI_FUNC(void) PyErr_PrintEx(int);
-PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *);
-
-#ifndef Py_LIMITED_API
-/* Use macros for a bunch of old variants */
-#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL)
-#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL)
-#define PyRun_AnyFileEx(fp, name, closeit) \
-    PyRun_AnyFileExFlags(fp, name, closeit, NULL)
-#define PyRun_AnyFileFlags(fp, name, flags) \
-    PyRun_AnyFileExFlags(fp, name, 0, flags)
-#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL)
-#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL)
-#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL)
-#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL)
-#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL)
-#define PyRun_File(fp, p, s, g, l) \
-    PyRun_FileExFlags(fp, p, s, g, l, 0, NULL)
-#define PyRun_FileEx(fp, p, s, g, l, c) \
-    PyRun_FileExFlags(fp, p, s, g, l, c, NULL)
-#define PyRun_FileFlags(fp, p, s, g, l, flags) \
-    PyRun_FileExFlags(fp, p, s, g, l, 0, flags)
-#endif
-
-/* Stuff with no proper home (yet) */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, const char *);
-#endif
-PyAPI_DATA(int) (*PyOS_InputHook)(void);
-PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, const char *);
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
-#endif
-
-/* Stack size, in "pointers" (so we get extra safety margins
-   on 64-bit platforms).  On a 32-bit platform, this translates
-   to an 8k margin. */
-#define PYOS_STACK_MARGIN 2048
-
-#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300
-/* Enable stack checking under Microsoft C */
-#define USE_STACKCHECK
-#endif
-
-#ifdef USE_STACKCHECK
-/* Check that we aren't overflowing our stack */
-PyAPI_FUNC(int) PyOS_CheckStack(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYTHONRUN_H */
diff --git a/dependencies2013/win32/include/python/pythread.h b/dependencies2013/win32/include/python/pythread.h
deleted file mode 100644
index 88c4873a..00000000
--- a/dependencies2013/win32/include/python/pythread.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-#ifndef Py_PYTHREAD_H
-#define Py_PYTHREAD_H
-
-typedef void *PyThread_type_lock;
-typedef void *PyThread_type_sema;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Return status codes for Python lock acquisition.  Chosen for maximum
- * backwards compatibility, ie failure -> 0, success -> 1.  */
-typedef enum PyLockStatus {
-    PY_LOCK_FAILURE = 0,
-    PY_LOCK_ACQUIRED = 1,
-    PY_LOCK_INTR
-} PyLockStatus;
-
-PyAPI_FUNC(void) PyThread_init_thread(void);
-PyAPI_FUNC(long) PyThread_start_new_thread(void (*)(void *), void *);
-PyAPI_FUNC(void) PyThread_exit_thread(void);
-PyAPI_FUNC(long) PyThread_get_thread_ident(void);
-
-PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void);
-PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock);
-PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
-#define WAIT_LOCK	1
-#define NOWAIT_LOCK	0
-
-/* PY_TIMEOUT_T is the integral type used to specify timeouts when waiting
-   on a lock (see PyThread_acquire_lock_timed() below).
-   PY_TIMEOUT_MAX is the highest usable value (in microseconds) of that
-   type, and depends on the system threading API.
-
-   NOTE: this isn't the same value as `_thread.TIMEOUT_MAX`.  The _thread
-   module exposes a higher-level API, with timeouts expressed in seconds
-   and floating-point numbers allowed.
-*/
-#define PY_TIMEOUT_T long long
-#define PY_TIMEOUT_MAX PY_LLONG_MAX
-
-/* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
-#if defined (NT_THREADS)
-#if 0xFFFFFFFFLL * 1000 < PY_TIMEOUT_MAX
-#undef PY_TIMEOUT_MAX
-#define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000)
-#endif
-#endif
-
-/* If microseconds == 0, the call is non-blocking: it returns immediately
-   even when the lock can't be acquired.
-   If microseconds > 0, the call waits up to the specified duration.
-   If microseconds < 0, the call waits until success (or abnormal failure)
-
-   microseconds must be less than PY_TIMEOUT_MAX. Behaviour otherwise is
-   undefined.
-
-   If intr_flag is true and the acquire is interrupted by a signal, then the
-   call will return PY_LOCK_INTR.  The caller may reattempt to acquire the
-   lock.
-*/
-PyAPI_FUNC(PyLockStatus) PyThread_acquire_lock_timed(PyThread_type_lock,
-                                                     PY_TIMEOUT_T microseconds,
-                                                     int intr_flag);
-
-PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock);
-
-PyAPI_FUNC(size_t) PyThread_get_stacksize(void);
-PyAPI_FUNC(int) PyThread_set_stacksize(size_t);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyThread_GetInfo(void);
-#endif
-
-/* Thread Local Storage (TLS) API */
-PyAPI_FUNC(int) PyThread_create_key(void);
-PyAPI_FUNC(void) PyThread_delete_key(int);
-PyAPI_FUNC(int) PyThread_set_key_value(int, void *);
-PyAPI_FUNC(void *) PyThread_get_key_value(int);
-PyAPI_FUNC(void) PyThread_delete_key_value(int key);
-
-/* Cleanup after a fork */
-PyAPI_FUNC(void) PyThread_ReInitTLS(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYTHREAD_H */
diff --git a/dependencies2013/win32/include/python/pytime.h b/dependencies2013/win32/include/python/pytime.h
deleted file mode 100644
index 158c460a..00000000
--- a/dependencies2013/win32/include/python/pytime.h
+++ /dev/null
@@ -1,211 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_PYTIME_H
-#define Py_PYTIME_H
-
-#include "pyconfig.h" /* include for defines */
-#include "object.h"
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to time related
-functions and constants
-**************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* _PyTime_t: Python timestamp with subsecond precision. It can be used to
-   store a duration, and so indirectly a date (related to another date, like
-   UNIX epoch). */
-typedef int64_t _PyTime_t;
-#define _PyTime_MIN PY_LLONG_MIN
-#define _PyTime_MAX PY_LLONG_MAX
-
-typedef enum {
-    /* Round towards minus infinity (-inf).
-       For example, used to read a clock. */
-    _PyTime_ROUND_FLOOR=0,
-    /* Round towards infinity (+inf).
-       For example, used for timeout to wait "at least" N seconds. */
-    _PyTime_ROUND_CEILING=1,
-    /* Round to nearest with ties going to nearest even integer.
-       For example, used to round from a Python float. */
-    _PyTime_ROUND_HALF_EVEN=2,
-    /* Round away from zero
-       For example, used for timeout. _PyTime_ROUND_CEILING rounds
-       -1e-9 to 0 milliseconds which causes bpo-31786 issue.
-       _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
-       the timeout sign as expected. select.poll(timeout) must block
-       for negative values." */
-    _PyTime_ROUND_UP=3,
-    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be
-       used for timeouts. */
-    _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
-} _PyTime_round_t;
-
-
-/* Convert a time_t to a PyLong. */
-PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
-    time_t sec);
-
-/* Convert a PyLong to a time_t. */
-PyAPI_FUNC(time_t) _PyLong_AsTime_t(
-    PyObject *obj);
-
-/* Convert a number of seconds, int or float, to time_t. */
-PyAPI_FUNC(int) _PyTime_ObjectToTime_t(
-    PyObject *obj,
-    time_t *sec,
-    _PyTime_round_t);
-
-/* Convert a number of seconds, int or float, to a timeval structure.
-   usec is in the range [0; 999999] and rounded towards zero.
-   For example, -1.2 is converted to (-2, 800000). */
-PyAPI_FUNC(int) _PyTime_ObjectToTimeval(
-    PyObject *obj,
-    time_t *sec,
-    long *usec,
-    _PyTime_round_t);
-
-/* Convert a number of seconds, int or float, to a timespec structure.
-   nsec is in the range [0; 999999999] and rounded towards zero.
-   For example, -1.2 is converted to (-2, 800000000). */
-PyAPI_FUNC(int) _PyTime_ObjectToTimespec(
-    PyObject *obj,
-    time_t *sec,
-    long *nsec,
-    _PyTime_round_t);
-
-
-/* Create a timestamp from a number of seconds. */
-PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds);
-
-/* Macro to create a timestamp from a number of seconds, no integer overflow.
-   Only use the macro for small values, prefer _PyTime_FromSeconds(). */
-#define _PYTIME_FROMSECONDS(seconds) \
-            ((_PyTime_t)(seconds) * (1000 * 1000 * 1000))
-
-/* Create a timestamp from a number of nanoseconds. */
-PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(long long ns);
-
-/* Convert a number of seconds (Python float or int) to a timetamp.
-   Raise an exception and return -1 on error, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_FromSecondsObject(_PyTime_t *t,
-    PyObject *obj,
-    _PyTime_round_t round);
-
-/* Convert a number of milliseconds (Python float or int, 10^-3) to a timetamp.
-   Raise an exception and return -1 on error, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_FromMillisecondsObject(_PyTime_t *t,
-    PyObject *obj,
-    _PyTime_round_t round);
-
-/* Convert a timestamp to a number of seconds as a C double. */
-PyAPI_FUNC(double) _PyTime_AsSecondsDouble(_PyTime_t t);
-
-/* Convert timestamp to a number of milliseconds (10^-3 seconds). */
-PyAPI_FUNC(_PyTime_t) _PyTime_AsMilliseconds(_PyTime_t t,
-    _PyTime_round_t round);
-
-/* Convert timestamp to a number of microseconds (10^-6 seconds). */
-PyAPI_FUNC(_PyTime_t) _PyTime_AsMicroseconds(_PyTime_t t,
-    _PyTime_round_t round);
-
-/* Convert timestamp to a number of nanoseconds (10^-9 seconds) as a Python int
-   object. */
-PyAPI_FUNC(PyObject *) _PyTime_AsNanosecondsObject(_PyTime_t t);
-
-/* Convert a timestamp to a timeval structure (microsecond resolution).
-   tv_usec is always positive.
-   Raise an exception and return -1 if the conversion overflowed,
-   return 0 on success. */
-PyAPI_FUNC(int) _PyTime_AsTimeval(_PyTime_t t,
-    struct timeval *tv,
-    _PyTime_round_t round);
-
-/* Similar to _PyTime_AsTimeval(), but don't raise an exception on error. */
-PyAPI_FUNC(int) _PyTime_AsTimeval_noraise(_PyTime_t t,
-    struct timeval *tv,
-    _PyTime_round_t round);
-
-/* Convert a timestamp to a number of seconds (secs) and microseconds (us).
-   us is always positive. This function is similar to _PyTime_AsTimeval()
-   except that secs is always a time_t type, whereas the timeval structure
-   uses a C long for tv_sec on Windows.
-   Raise an exception and return -1 if the conversion overflowed,
-   return 0 on success. */
-PyAPI_FUNC(int) _PyTime_AsTimevalTime_t(
-    _PyTime_t t,
-    time_t *secs,
-    int *us,
-    _PyTime_round_t round);
-
-#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE)
-/* Convert a timestamp to a timespec structure (nanosecond resolution).
-   tv_nsec is always positive.
-   Raise an exception and return -1 on error, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts);
-#endif
-
-/* Get the current time from the system clock.
-
-   The function cannot fail. _PyTime_Init() ensures that the system clock
-   works. */
-PyAPI_FUNC(_PyTime_t) _PyTime_GetSystemClock(void);
-
-/* Get the time of a monotonic clock, i.e. a clock that cannot go backwards.
-   The clock is not affected by system clock updates. The reference point of
-   the returned value is undefined, so that only the difference between the
-   results of consecutive calls is valid.
-
-   The function cannot fail. _PyTime_Init() ensures that a monotonic clock
-   is available and works. */
-PyAPI_FUNC(_PyTime_t) _PyTime_GetMonotonicClock(void);
-
-
-/* Structure used by time.get_clock_info() */
-typedef struct {
-    const char *implementation;
-    int monotonic;
-    int adjustable;
-    double resolution;
-} _Py_clock_info_t;
-
-/* Get the current time from the system clock.
- * Fill clock information if info is not NULL.
- * Raise an exception and return -1 on error, return 0 on success.
- */
-PyAPI_FUNC(int) _PyTime_GetSystemClockWithInfo(
-    _PyTime_t *t,
-    _Py_clock_info_t *info);
-
-/* Get the time of a monotonic clock, i.e. a clock that cannot go backwards.
-   The clock is not affected by system clock updates. The reference point of
-   the returned value is undefined, so that only the difference between the
-   results of consecutive calls is valid.
-
-   Fill info (if set) with information of the function used to get the time.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_GetMonotonicClockWithInfo(
-    _PyTime_t *t,
-    _Py_clock_info_t *info);
-
-
-/* Initialize time.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_Init(void);
-
-/* Converts a timestamp to the Gregorian time, using the local time zone.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm);
-
-/* Converts a timestamp to the Gregorian time, assuming UTC.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* Py_PYTIME_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/rangeobject.h b/dependencies2013/win32/include/python/rangeobject.h
deleted file mode 100644
index 7e4dc288..00000000
--- a/dependencies2013/win32/include/python/rangeobject.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Range object interface */
-
-#ifndef Py_RANGEOBJECT_H
-#define Py_RANGEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-A range object represents an integer range.  This is an immutable object;
-a range cannot change its value after creation.
-
-Range objects behave like the corresponding tuple objects except that
-they are represented by a start, stop, and step datamembers.
-*/
-
-PyAPI_DATA(PyTypeObject) PyRange_Type;
-PyAPI_DATA(PyTypeObject) PyRangeIter_Type;
-PyAPI_DATA(PyTypeObject) PyLongRangeIter_Type;
-
-#define PyRange_Check(op) (Py_TYPE(op) == &PyRange_Type)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_RANGEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/setobject.h b/dependencies2013/win32/include/python/setobject.h
deleted file mode 100644
index 87ec1c8a..00000000
--- a/dependencies2013/win32/include/python/setobject.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Set object interface */
-
-#ifndef Py_SETOBJECT_H
-#define Py_SETOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-
-/* There are three kinds of entries in the table:
-
-1. Unused:  key == NULL and hash == 0
-2. Dummy:   key == dummy and hash == -1
-3. Active:  key != NULL and key != dummy and hash != -1
-
-The hash field of Unused slots is always zero.
-
-The hash field of Dummy slots are set to -1
-meaning that dummy entries can be detected by
-either entry->key==dummy or by entry->hash==-1.
-*/
-
-#define PySet_MINSIZE 8
-
-typedef struct {
-    PyObject *key;
-    Py_hash_t hash;             /* Cached hash code of the key */
-} setentry;
-
-/* The SetObject data structure is shared by set and frozenset objects.
-
-Invariant for sets:
- - hash is -1
-
-Invariants for frozensets:
- - data is immutable.
- - hash is the hash of the frozenset or -1 if not computed yet.
-
-*/
-
-typedef struct {
-    PyObject_HEAD
-
-    Py_ssize_t fill;            /* Number active and dummy entries*/
-    Py_ssize_t used;            /* Number active entries */
-
-    /* The table contains mask + 1 slots, and that's a power of 2.
-     * We store the mask instead of the size because the mask is more
-     * frequently needed.
-     */
-    Py_ssize_t mask;
-
-    /* The table points to a fixed-size smalltable for small tables
-     * or to additional malloc'ed memory for bigger tables.
-     * The table pointer is never NULL which saves us from repeated
-     * runtime null-tests.
-     */
-    setentry *table;
-    Py_hash_t hash;             /* Only used by frozenset objects */
-    Py_ssize_t finger;          /* Search finger for pop() */
-
-    setentry smalltable[PySet_MINSIZE];
-    PyObject *weakreflist;      /* List of weak references */
-} PySetObject;
-
-#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used)
-
-PyAPI_DATA(PyObject *) _PySet_Dummy;
-
-PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, Py_hash_t *hash);
-PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
-PyAPI_FUNC(int) PySet_ClearFreeList(void);
-
-#endif /* Section excluded by Py_LIMITED_API */
-
-PyAPI_DATA(PyTypeObject) PySet_Type;
-PyAPI_DATA(PyTypeObject) PyFrozenSet_Type;
-PyAPI_DATA(PyTypeObject) PySetIter_Type;
-
-PyAPI_FUNC(PyObject *) PySet_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *);
-
-PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
-PyAPI_FUNC(int) PySet_Clear(PyObject *set);
-PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
-PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
-PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
-PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset);
-
-#define PyFrozenSet_CheckExact(ob) (Py_TYPE(ob) == &PyFrozenSet_Type)
-#define PyAnySet_CheckExact(ob) \
-    (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type)
-#define PyAnySet_Check(ob) \
-    (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type || \
-      PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \
-      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
-#define PySet_Check(ob) \
-    (Py_TYPE(ob) == &PySet_Type || \
-    PyType_IsSubtype(Py_TYPE(ob), &PySet_Type))
-#define   PyFrozenSet_Check(ob) \
-    (Py_TYPE(ob) == &PyFrozenSet_Type || \
-      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SETOBJECT_H */
diff --git a/dependencies2013/win32/include/python/sliceobject.h b/dependencies2013/win32/include/python/sliceobject.h
deleted file mode 100644
index 579ac073..00000000
--- a/dependencies2013/win32/include/python/sliceobject.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef Py_SLICEOBJECT_H
-#define Py_SLICEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The unique ellipsis object "..." */
-
-PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */
-
-#define Py_Ellipsis (&_Py_EllipsisObject)
-
-/* Slice object interface */
-
-/*
-
-A slice object containing start, stop, and step data members (the
-names are from range).  After much talk with Guido, it was decided to
-let these be any arbitrary python type.  Py_None stands for omitted values.
-*/
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_HEAD
-    PyObject *start, *stop, *step;	/* not NULL */
-} PySliceObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PySlice_Type;
-PyAPI_DATA(PyTypeObject) PyEllipsis_Type;
-
-#define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type)
-
-PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop,
-                                  PyObject* step);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop);
-PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length,
-                                 PyObject **start_ptr, PyObject **stop_ptr,
-                                 PyObject **step_ptr);
-#endif
-PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length,
-                                  Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
-PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,
-                                     Py_ssize_t *start, Py_ssize_t *stop,
-                                     Py_ssize_t *step, Py_ssize_t *slicelength);
-
-#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100
-#ifdef Py_LIMITED_API
-#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) (  \
-    PySlice_Unpack((slice), (start), (stop), (step)) < 0 ?                  \
-    ((*(slicelen) = 0), -1) :                                               \
-    ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \
-     0))
-#endif
-PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice,
-                               Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
-PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,
-                                             Py_ssize_t *start, Py_ssize_t *stop,
-                                             Py_ssize_t step);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SLICEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/structmember.h b/dependencies2013/win32/include/python/structmember.h
deleted file mode 100644
index 5da8a466..00000000
--- a/dependencies2013/win32/include/python/structmember.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef Py_STRUCTMEMBER_H
-#define Py_STRUCTMEMBER_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Interface to map C struct members to Python object attributes */
-
-#include <stddef.h> /* For offsetof */
-
-/* An array of PyMemberDef structures defines the name, type and offset
-   of selected members of a C structure.  These can be read by
-   PyMember_GetOne() and set by PyMember_SetOne() (except if their READONLY
-   flag is set).  The array must be terminated with an entry whose name
-   pointer is NULL. */
-
-typedef struct PyMemberDef {
-    char *name;
-    int type;
-    Py_ssize_t offset;
-    int flags;
-    char *doc;
-} PyMemberDef;
-
-/* Types */
-#define T_SHORT     0
-#define T_INT       1
-#define T_LONG      2
-#define T_FLOAT     3
-#define T_DOUBLE    4
-#define T_STRING    5
-#define T_OBJECT    6
-/* XXX the ordering here is weird for binary compatibility */
-#define T_CHAR      7   /* 1-character string */
-#define T_BYTE      8   /* 8-bit signed int */
-/* unsigned variants: */
-#define T_UBYTE     9
-#define T_USHORT    10
-#define T_UINT      11
-#define T_ULONG     12
-
-/* Added by Jack: strings contained in the structure */
-#define T_STRING_INPLACE    13
-
-/* Added by Lillo: bools contained in the structure (assumed char) */
-#define T_BOOL      14
-
-#define T_OBJECT_EX 16  /* Like T_OBJECT, but raises AttributeError
-                           when the value is NULL, instead of
-                           converting to None. */
-#define T_LONGLONG      17
-#define T_ULONGLONG     18
-
-#define T_PYSSIZET      19      /* Py_ssize_t */
-#define T_NONE          20      /* Value is always None */
-
-
-/* Flags */
-#define READONLY            1
-#define READ_RESTRICTED     2
-#define PY_WRITE_RESTRICTED 4
-#define RESTRICTED          (READ_RESTRICTED | PY_WRITE_RESTRICTED)
-
-
-/* Current API, use this */
-PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *);
-PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRUCTMEMBER_H */
diff --git a/dependencies2013/win32/include/python/structseq.h b/dependencies2013/win32/include/python/structseq.h
deleted file mode 100644
index af227164..00000000
--- a/dependencies2013/win32/include/python/structseq.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/* Named tuple object interface */
-
-#ifndef Py_STRUCTSEQ_H
-#define Py_STRUCTSEQ_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct PyStructSequence_Field {
-    char *name;
-    char *doc;
-} PyStructSequence_Field;
-
-typedef struct PyStructSequence_Desc {
-    char *name;
-    char *doc;
-    struct PyStructSequence_Field *fields;
-    int n_in_sequence;
-} PyStructSequence_Desc;
-
-extern char* PyStructSequence_UnnamedField;
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type,
-                                           PyStructSequence_Desc *desc);
-PyAPI_FUNC(int) PyStructSequence_InitType2(PyTypeObject *type,
-                                           PyStructSequence_Desc *desc);
-#endif
-PyAPI_FUNC(PyTypeObject*) PyStructSequence_NewType(PyStructSequence_Desc *desc);
-
-PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type);
-
-#ifndef Py_LIMITED_API
-typedef PyTupleObject PyStructSequence;
-
-/* Macro, *only* to be used to fill in brand new objects */
-#define PyStructSequence_SET_ITEM(op, i, v) PyTuple_SET_ITEM(op, i, v)
-
-#define PyStructSequence_GET_ITEM(op, i) PyTuple_GET_ITEM(op, i)
-#endif
-
-PyAPI_FUNC(void) PyStructSequence_SetItem(PyObject*, Py_ssize_t, PyObject*);
-PyAPI_FUNC(PyObject*) PyStructSequence_GetItem(PyObject*, Py_ssize_t);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRUCTSEQ_H */
diff --git a/dependencies2013/win32/include/python/symtable.h b/dependencies2013/win32/include/python/symtable.h
deleted file mode 100644
index 86ae3c28..00000000
--- a/dependencies2013/win32/include/python/symtable.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_SYMTABLE_H
-#define Py_SYMTABLE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* XXX(ncoghlan): This is a weird mix of public names and interpreter internal
- *                names.
- */
-
-typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock }
-    _Py_block_ty;
-
-struct _symtable_entry;
-
-struct symtable {
-    PyObject *st_filename;          /* name of file being compiled,
-                                       decoded from the filesystem encoding */
-    struct _symtable_entry *st_cur; /* current symbol table entry */
-    struct _symtable_entry *st_top; /* symbol table entry for module */
-    PyObject *st_blocks;            /* dict: map AST node addresses
-                                     *       to symbol table entries */
-    PyObject *st_stack;             /* list: stack of namespace info */
-    PyObject *st_global;            /* borrowed ref to st_top->ste_symbols */
-    int st_nblocks;                 /* number of blocks used. kept for
-                                       consistency with the corresponding
-                                       compiler structure */
-    PyObject *st_private;           /* name of current class or NULL */
-    PyFutureFeatures *st_future;    /* module's future features that affect
-                                       the symbol table */
-    int recursion_depth;            /* current recursion depth */
-    int recursion_limit;            /* recursion limit */
-};
-
-typedef struct _symtable_entry {
-    PyObject_HEAD
-    PyObject *ste_id;        /* int: key in ste_table->st_blocks */
-    PyObject *ste_symbols;   /* dict: variable names to flags */
-    PyObject *ste_name;      /* string: name of current block */
-    PyObject *ste_varnames;  /* list of function parameters */
-    PyObject *ste_children;  /* list of child blocks */
-    PyObject *ste_directives;/* locations of global and nonlocal statements */
-    _Py_block_ty ste_type;   /* module, class, or function */
-    int ste_nested;      /* true if block is nested */
-    unsigned ste_free : 1;        /* true if block has free variables */
-    unsigned ste_child_free : 1;  /* true if a child block has free vars,
-                                     including free refs to globals */
-    unsigned ste_generator : 1;   /* true if namespace is a generator */
-    unsigned ste_coroutine : 1;   /* true if namespace is a coroutine */
-    unsigned ste_varargs : 1;     /* true if block has varargs */
-    unsigned ste_varkeywords : 1; /* true if block has varkeywords */
-    unsigned ste_returns_value : 1;  /* true if namespace uses return with
-                                        an argument */
-    unsigned ste_needs_class_closure : 1; /* for class scopes, true if a
-                                             closure over __class__
-                                             should be created */
-    int ste_lineno;          /* first line of block */
-    int ste_col_offset;      /* offset of first line of block */
-    int ste_opt_lineno;      /* lineno of last exec or import * */
-    int ste_opt_col_offset;  /* offset of last exec or import * */
-    int ste_tmpname;         /* counter for listcomp temp vars */
-    struct symtable *ste_table;
-} PySTEntryObject;
-
-PyAPI_DATA(PyTypeObject) PySTEntry_Type;
-
-#define PySTEntry_Check(op) (Py_TYPE(op) == &PySTEntry_Type)
-
-PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *);
-
-PyAPI_FUNC(struct symtable *) PySymtable_Build(
-    mod_ty mod,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyFutureFeatures *future);
-PyAPI_FUNC(struct symtable *) PySymtable_BuildObject(
-    mod_ty mod,
-    PyObject *filename,
-    PyFutureFeatures *future);
-PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *);
-
-PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
-
-/* Flags for def-use information */
-
-#define DEF_GLOBAL 1           /* global stmt */
-#define DEF_LOCAL 2            /* assignment in code block */
-#define DEF_PARAM 2<<1         /* formal parameter */
-#define DEF_NONLOCAL 2<<2      /* nonlocal stmt */
-#define USE 2<<3               /* name is used */
-#define DEF_FREE 2<<4          /* name used but not defined in nested block */
-#define DEF_FREE_CLASS 2<<5    /* free variable from class's method */
-#define DEF_IMPORT 2<<6        /* assignment occurred via import */
-#define DEF_ANNOT 2<<7         /* this name is annotated */
-
-#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT)
-
-/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol
-   table.  GLOBAL is returned from PyST_GetScope() for either of them.
-   It is stored in ste_symbols at bits 12-15.
-*/
-#define SCOPE_OFFSET 11
-#define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
-
-#define LOCAL 1
-#define GLOBAL_EXPLICIT 2
-#define GLOBAL_IMPLICIT 3
-#define FREE 4
-#define CELL 5
-
-#define GENERATOR 1
-#define GENERATOR_EXPRESSION 2
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SYMTABLE_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/sysmodule.h b/dependencies2013/win32/include/python/sysmodule.h
deleted file mode 100644
index c5547ff6..00000000
--- a/dependencies2013/win32/include/python/sysmodule.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/* System module interface */
-
-#ifndef Py_SYSMODULE_H
-#define Py_SYSMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) PySys_GetObject(const char *);
-PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key);
-PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *);
-#endif
-
-PyAPI_FUNC(void) PySys_SetArgv(int, wchar_t **);
-PyAPI_FUNC(void) PySys_SetArgvEx(int, wchar_t **, int);
-PyAPI_FUNC(void) PySys_SetPath(const wchar_t *);
-
-PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
-                 Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
-                 Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_FormatStdout(const char *format, ...);
-PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);
-
-PyAPI_FUNC(void) PySys_ResetWarnOptions(void);
-PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *);
-PyAPI_FUNC(void) PySys_AddWarnOptionUnicode(PyObject *);
-PyAPI_FUNC(int) PySys_HasWarnOptions(void);
-
-PyAPI_FUNC(void) PySys_AddXOption(const wchar_t *);
-PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SYSMODULE_H */
diff --git a/dependencies2013/win32/include/python/token.h b/dependencies2013/win32/include/python/token.h
deleted file mode 100644
index 595afa01..00000000
--- a/dependencies2013/win32/include/python/token.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-/* Token types */
-#ifndef Py_LIMITED_API
-#ifndef Py_TOKEN_H
-#define Py_TOKEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
-
-#define ENDMARKER	0
-#define NAME		1
-#define NUMBER		2
-#define STRING		3
-#define NEWLINE		4
-#define INDENT		5
-#define DEDENT		6
-#define LPAR		7
-#define RPAR		8
-#define LSQB		9
-#define RSQB		10
-#define COLON		11
-#define COMMA		12
-#define SEMI		13
-#define PLUS		14
-#define MINUS		15
-#define STAR		16
-#define SLASH		17
-#define VBAR		18
-#define AMPER		19
-#define LESS		20
-#define GREATER		21
-#define EQUAL		22
-#define DOT		23
-#define PERCENT		24
-#define LBRACE		25
-#define RBRACE		26
-#define EQEQUAL		27
-#define NOTEQUAL	28
-#define LESSEQUAL	29
-#define GREATEREQUAL	30
-#define TILDE		31
-#define CIRCUMFLEX	32
-#define LEFTSHIFT	33
-#define RIGHTSHIFT	34
-#define DOUBLESTAR	35
-#define PLUSEQUAL	36
-#define MINEQUAL	37
-#define STAREQUAL	38
-#define SLASHEQUAL	39
-#define PERCENTEQUAL	40
-#define AMPEREQUAL	41
-#define VBAREQUAL	42
-#define CIRCUMFLEXEQUAL	43
-#define LEFTSHIFTEQUAL	44
-#define RIGHTSHIFTEQUAL	45
-#define DOUBLESTAREQUAL	46
-#define DOUBLESLASH	47
-#define DOUBLESLASHEQUAL 48
-#define AT              49
-#define ATEQUAL		50
-#define RARROW          51
-#define ELLIPSIS        52
-/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
-#define OP		53
-#define AWAIT		54
-#define ASYNC		55
-#define ERRORTOKEN	56
-#define N_TOKENS	57
-
-/* Special definitions for cooperation with parser */
-
-#define NT_OFFSET		256
-
-#define ISTERMINAL(x)		((x) < NT_OFFSET)
-#define ISNONTERMINAL(x)	((x) >= NT_OFFSET)
-#define ISEOF(x)		((x) == ENDMARKER)
-
-
-PyAPI_DATA(const char *) _PyParser_TokenNames[]; /* Token names */
-PyAPI_FUNC(int) PyToken_OneChar(int);
-PyAPI_FUNC(int) PyToken_TwoChars(int, int);
-PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TOKEN_H */
-#endif /* Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/traceback.h b/dependencies2013/win32/include/python/traceback.h
deleted file mode 100644
index b5874100..00000000
--- a/dependencies2013/win32/include/python/traceback.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-#ifndef Py_TRACEBACK_H
-#define Py_TRACEBACK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "pystate.h"
-
-struct _frame;
-
-/* Traceback interface */
-#ifndef Py_LIMITED_API
-typedef struct _traceback {
-    PyObject_HEAD
-    struct _traceback *tb_next;
-    struct _frame *tb_frame;
-    int tb_lasti;
-    int tb_lineno;
-} PyTracebackObject;
-#endif
-
-PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *);
-PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int);
-PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int);
-#endif
-
-/* Reveal traceback type so we can typecheck traceback objects */
-PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
-#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type)
-
-#ifndef Py_LIMITED_API
-/* Write the Python traceback into the file 'fd'. For example:
-
-       Traceback (most recent call first):
-         File "xxx", line xxx in <xxx>
-         File "xxx", line xxx in <xxx>
-         ...
-         File "xxx", line xxx in <xxx>
-
-   This function is written for debug purpose only, to dump the traceback in
-   the worst case: after a segmentation fault, at fatal error, etc. That's why,
-   it is very limited. Strings are truncated to 100 characters and encoded to
-   ASCII with backslashreplace. It doesn't write the source code, only the
-   function name, filename and line number of each frame. Write only the first
-   100 frames: if the traceback is truncated, write the line " ...".
-
-   This function is signal safe. */
-
-PyAPI_FUNC(void) _Py_DumpTraceback(
-    int fd,
-    PyThreadState *tstate);
-
-/* Write the traceback of all threads into the file 'fd'. current_thread can be
-   NULL.
-
-   Return NULL on success, or an error message on error.
-
-   This function is written for debug purpose only. It calls
-   _Py_DumpTraceback() for each thread, and so has the same limitations. It
-   only write the traceback of the first 100 threads: write "..." if there are
-   more threads.
-
-   If current_tstate is NULL, the function tries to get the Python thread state
-   of the current thread. It is not an error if the function is unable to get
-   the current Python thread state.
-
-   If interp is NULL, the function tries to get the interpreter state from
-   the current Python thread state, or from
-   _PyGILState_GetInterpreterStateUnsafe() in last resort.
-
-   It is better to pass NULL to interp and current_tstate, the function tries
-   different options to retrieve these informations.
-
-   This function is signal safe. */
-
-PyAPI_FUNC(const char*) _Py_DumpTracebackThreads(
-    int fd,
-    PyInterpreterState *interp,
-    PyThreadState *current_tstate);
-#endif /* !Py_LIMITED_API */
-
-#ifndef Py_LIMITED_API
-
-/* Write a Unicode object into the file descriptor fd. Encode the string to
-   ASCII using the backslashreplace error handler.
-
-   Do nothing if text is not a Unicode object. The function accepts Unicode
-   string which is not ready (PyUnicode_WCHAR_KIND).
-
-   This function is signal safe. */
-PyAPI_FUNC(void) _Py_DumpASCII(int fd, PyObject *text);
-
-/* Format an integer as decimal into the file descriptor fd.
-
-   This function is signal safe. */
-PyAPI_FUNC(void) _Py_DumpDecimal(
-    int fd,
-    unsigned long value);
-
-/* Format an integer as hexadecimal into the file descriptor fd with at least
-   width digits.
-
-   The maximum width is sizeof(unsigned long)*2 digits.
-
-   This function is signal safe. */
-PyAPI_FUNC(void) _Py_DumpHexadecimal(
-    int fd,
-    unsigned long value,
-    Py_ssize_t width);
-
-#endif   /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TRACEBACK_H */
diff --git a/dependencies2013/win32/include/python/tupleobject.h b/dependencies2013/win32/include/python/tupleobject.h
deleted file mode 100644
index c273ce7d..00000000
--- a/dependencies2013/win32/include/python/tupleobject.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/* Tuple object interface */
-
-#ifndef Py_TUPLEOBJECT_H
-#define Py_TUPLEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-Another generally useful object type is a tuple of object pointers.
-For Python, this is an immutable type.  C code can change the tuple items
-(but not their number), and even use tuples are general-purpose arrays of
-object references, but in general only brand new tuples should be mutated,
-not ones that might already have been exposed to Python code.
-
-*** WARNING *** PyTuple_SetItem does not increment the new item's reference
-count, but does decrement the reference count of the item it replaces,
-if not nil.  It does *decrement* the reference count if it is *not*
-inserted in the tuple.  Similarly, PyTuple_GetItem does not increment the
-returned item's reference count.
-*/
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_VAR_HEAD
-    PyObject *ob_item[1];
-
-    /* ob_item contains space for 'ob_size' elements.
-     * Items must normally not be NULL, except during construction when
-     * the tuple is not yet visible outside the function that builds it.
-     */
-} PyTupleObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyTuple_Type;
-PyAPI_DATA(PyTypeObject) PyTupleIter_Type;
-
-#define PyTuple_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS)
-#define PyTuple_CheckExact(op) (Py_TYPE(op) == &PyTuple_Type)
-
-PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size);
-PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *);
-PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t);
-#endif
-PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
-#endif
-
-/* Macro, trading safety for speed */
-#ifndef Py_LIMITED_API
-#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i])
-#define PyTuple_GET_SIZE(op)    Py_SIZE(op)
-
-/* Macro, *only* to be used to fill in brand new tuples */
-#define PyTuple_SET_ITEM(op, i, v) (((PyTupleObject *)(op))->ob_item[i] = v)
-#endif
-
-PyAPI_FUNC(int) PyTuple_ClearFreeList(void);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
-#endif /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TUPLEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/typeslots.h b/dependencies2013/win32/include/python/typeslots.h
deleted file mode 100644
index 0ce6a377..00000000
--- a/dependencies2013/win32/include/python/typeslots.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Do not renumber the file; these numbers are part of the stable ABI. */
-/* Disabled, see #10181 */
-#undef Py_bf_getbuffer
-#undef Py_bf_releasebuffer
-#define Py_mp_ass_subscript 3
-#define Py_mp_length 4
-#define Py_mp_subscript 5
-#define Py_nb_absolute 6
-#define Py_nb_add 7
-#define Py_nb_and 8
-#define Py_nb_bool 9
-#define Py_nb_divmod 10
-#define Py_nb_float 11
-#define Py_nb_floor_divide 12
-#define Py_nb_index 13
-#define Py_nb_inplace_add 14
-#define Py_nb_inplace_and 15
-#define Py_nb_inplace_floor_divide 16
-#define Py_nb_inplace_lshift 17
-#define Py_nb_inplace_multiply 18
-#define Py_nb_inplace_or 19
-#define Py_nb_inplace_power 20
-#define Py_nb_inplace_remainder 21
-#define Py_nb_inplace_rshift 22
-#define Py_nb_inplace_subtract 23
-#define Py_nb_inplace_true_divide 24
-#define Py_nb_inplace_xor 25
-#define Py_nb_int 26
-#define Py_nb_invert 27
-#define Py_nb_lshift 28
-#define Py_nb_multiply 29
-#define Py_nb_negative 30
-#define Py_nb_or 31
-#define Py_nb_positive 32
-#define Py_nb_power 33
-#define Py_nb_remainder 34
-#define Py_nb_rshift 35
-#define Py_nb_subtract 36
-#define Py_nb_true_divide 37
-#define Py_nb_xor 38
-#define Py_sq_ass_item 39
-#define Py_sq_concat 40
-#define Py_sq_contains 41
-#define Py_sq_inplace_concat 42
-#define Py_sq_inplace_repeat 43
-#define Py_sq_item 44
-#define Py_sq_length 45
-#define Py_sq_repeat 46
-#define Py_tp_alloc 47
-#define Py_tp_base 48
-#define Py_tp_bases 49
-#define Py_tp_call 50
-#define Py_tp_clear 51
-#define Py_tp_dealloc 52
-#define Py_tp_del 53
-#define Py_tp_descr_get 54
-#define Py_tp_descr_set 55
-#define Py_tp_doc 56
-#define Py_tp_getattr 57
-#define Py_tp_getattro 58
-#define Py_tp_hash 59
-#define Py_tp_init 60
-#define Py_tp_is_gc 61
-#define Py_tp_iter 62
-#define Py_tp_iternext 63
-#define Py_tp_methods 64
-#define Py_tp_new 65
-#define Py_tp_repr 66
-#define Py_tp_richcompare 67
-#define Py_tp_setattr 68
-#define Py_tp_setattro 69
-#define Py_tp_str 70
-#define Py_tp_traverse 71
-#define Py_tp_members 72
-#define Py_tp_getset 73
-#define Py_tp_free 74
-#define Py_nb_matrix_multiply 75
-#define Py_nb_inplace_matrix_multiply 76
-#define Py_am_await 77
-#define Py_am_aiter 78
-#define Py_am_anext 79
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-#define Py_tp_finalize 80
-#endif
diff --git a/dependencies2013/win32/include/python/ucnhash.h b/dependencies2013/win32/include/python/ucnhash.h
deleted file mode 100644
index 45362e99..00000000
--- a/dependencies2013/win32/include/python/ucnhash.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Unicode name database interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_UCNHASH_H
-#define Py_UCNHASH_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* revised ucnhash CAPI interface (exported through a "wrapper") */
-
-#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI"
-
-typedef struct {
-
-    /* Size of this struct */
-    int size;
-
-    /* Get name for a given character code.  Returns non-zero if
-       success, zero if not.  Does not set Python exceptions.
-       If self is NULL, data come from the default version of the database.
-       If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */
-    int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen,
-                   int with_alias_and_seq);
-
-    /* Get character code for a given name.  Same error handling
-       as for getname. */
-    int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code,
-                   int with_named_seq);
-
-} _PyUnicode_Name_CAPI;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_UCNHASH_H */
-#endif /* !Py_LIMITED_API */
diff --git a/dependencies2013/win32/include/python/unicodeobject.h b/dependencies2013/win32/include/python/unicodeobject.h
deleted file mode 100644
index f4988738..00000000
--- a/dependencies2013/win32/include/python/unicodeobject.h
+++ /dev/null
@@ -1,2342 +0,0 @@
-#ifndef Py_UNICODEOBJECT_H
-#define Py_UNICODEOBJECT_H
-
-#include <stdarg.h>
-
-/*
-
-Unicode implementation based on original code by Fredrik Lundh,
-modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
-Unicode Integration Proposal. (See
-http://www.egenix.com/files/python/unicode-proposal.txt).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-
- Original header:
- --------------------------------------------------------------------
-
- * Yet another Unicode string type for Python.  This type supports the
- * 16-bit Basic Multilingual Plane (BMP) only.
- *
- * Written by Fredrik Lundh, January 1999.
- *
- * Copyright (c) 1999 by Secret Labs AB.
- * Copyright (c) 1999 by Fredrik Lundh.
- *
- * fredrik@pythonware.com
- * http://www.pythonware.com
- *
- * --------------------------------------------------------------------
- * This Unicode String Type is
- *
- * Copyright (c) 1999 by Secret Labs AB
- * Copyright (c) 1999 by Fredrik Lundh
- *
- * By obtaining, using, and/or copying this software and/or its
- * associated documentation, you agree that you have read, understood,
- * and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * associated documentation for any purpose and without fee is hereby
- * granted, provided that the above copyright notice appears in all
- * copies, and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Secret Labs
- * AB or the author not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR 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.
- * -------------------------------------------------------------------- */
-
-#include <ctype.h>
-
-/* === Internal API ======================================================= */
-
-/* --- Internal Unicode Format -------------------------------------------- */
-
-/* Python 3.x requires unicode */
-#define Py_USING_UNICODE
-
-#ifndef SIZEOF_WCHAR_T
-#error Must define SIZEOF_WCHAR_T
-#endif
-
-#define Py_UNICODE_SIZE SIZEOF_WCHAR_T
-
-/* If wchar_t can be used for UCS-4 storage, set Py_UNICODE_WIDE.
-   Otherwise, Unicode strings are stored as UCS-2 (with limited support
-   for UTF-16) */
-
-#if Py_UNICODE_SIZE >= 4
-#define Py_UNICODE_WIDE
-#endif
-
-/* Set these flags if the platform has "wchar.h" and the
-   wchar_t type is a 16-bit unsigned type */
-/* #define HAVE_WCHAR_H */
-/* #define HAVE_USABLE_WCHAR_T */
-
-/* Py_UNICODE was the native Unicode storage format (code unit) used by
-   Python and represents a single Unicode element in the Unicode type.
-   With PEP 393, Py_UNICODE is deprecated and replaced with a
-   typedef to wchar_t. */
-
-#ifndef Py_LIMITED_API
-#define PY_UNICODE_TYPE wchar_t
-typedef wchar_t Py_UNICODE;
-#endif
-
-/* If the compiler provides a wchar_t type we try to support it
-   through the interface functions PyUnicode_FromWideChar(),
-   PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(). */
-
-#ifdef HAVE_USABLE_WCHAR_T
-# ifndef HAVE_WCHAR_H
-#  define HAVE_WCHAR_H
-# endif
-#endif
-
-#ifdef HAVE_WCHAR_H
-/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
-# ifdef _HAVE_BSDI
-#  include <time.h>
-# endif
-#  include <wchar.h>
-#endif
-
-/* Py_UCS4 and Py_UCS2 are typedefs for the respective
-   unicode representations. */
-typedef uint32_t Py_UCS4;
-typedef uint16_t Py_UCS2;
-typedef uint8_t Py_UCS1;
-
-/* --- Internal Unicode Operations ---------------------------------------- */
-
-/* Since splitting on whitespace is an important use case, and
-   whitespace in most situations is solely ASCII whitespace, we
-   optimize for the common case by using a quick look-up table
-   _Py_ascii_whitespace (see below) with an inlined check.
-
- */
-#ifndef Py_LIMITED_API
-#define Py_UNICODE_ISSPACE(ch) \
-    ((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch))
-
-#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch)
-#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch)
-#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch)
-#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch)
-
-#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch)
-#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch)
-#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch)
-
-#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch)
-#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch)
-#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch)
-#define Py_UNICODE_ISPRINTABLE(ch) _PyUnicode_IsPrintable(ch)
-
-#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch)
-#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
-#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
-
-#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch)
-
-#define Py_UNICODE_ISALNUM(ch) \
-       (Py_UNICODE_ISALPHA(ch) || \
-    Py_UNICODE_ISDECIMAL(ch) || \
-    Py_UNICODE_ISDIGIT(ch) || \
-    Py_UNICODE_ISNUMERIC(ch))
-
-#define Py_UNICODE_COPY(target, source, length) \
-    memcpy((target), (source), (length)*sizeof(Py_UNICODE))
-
-#define Py_UNICODE_FILL(target, value, length) \
-    do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\
-        for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\
-    } while (0)
-
-/* macros to work with surrogates */
-#define Py_UNICODE_IS_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDFFF)
-#define Py_UNICODE_IS_HIGH_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDBFF)
-#define Py_UNICODE_IS_LOW_SURROGATE(ch) (0xDC00 <= (ch) && (ch) <= 0xDFFF)
-/* Join two surrogate characters and return a single Py_UCS4 value. */
-#define Py_UNICODE_JOIN_SURROGATES(high, low)  \
-    (((((Py_UCS4)(high) & 0x03FF) << 10) |      \
-      ((Py_UCS4)(low) & 0x03FF)) + 0x10000)
-/* high surrogate = top 10 bits added to D800 */
-#define Py_UNICODE_HIGH_SURROGATE(ch) (0xD800 - (0x10000 >> 10) + ((ch) >> 10))
-/* low surrogate = bottom 10 bits added to DC00 */
-#define Py_UNICODE_LOW_SURROGATE(ch) (0xDC00 + ((ch) & 0x3FF))
-
-/* Check if substring matches at given offset.  The offset must be
-   valid, and the substring must not be empty. */
-
-#define Py_UNICODE_MATCH(string, offset, substring) \
-    ((*((string)->wstr + (offset)) == *((substring)->wstr)) && \
-     ((*((string)->wstr + (offset) + (substring)->wstr_length-1) == *((substring)->wstr + (substring)->wstr_length-1))) && \
-     !memcmp((string)->wstr + (offset), (substring)->wstr, (substring)->wstr_length*sizeof(Py_UNICODE)))
-
-#endif /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* --- Unicode Type ------------------------------------------------------- */
-
-#ifndef Py_LIMITED_API
-
-/* ASCII-only strings created through PyUnicode_New use the PyASCIIObject
-   structure. state.ascii and state.compact are set, and the data
-   immediately follow the structure. utf8_length and wstr_length can be found
-   in the length field; the utf8 pointer is equal to the data pointer. */
-typedef struct {
-    /* There are 4 forms of Unicode strings:
-
-       - compact ascii:
-
-         * structure = PyASCIIObject
-         * test: PyUnicode_IS_COMPACT_ASCII(op)
-         * kind = PyUnicode_1BYTE_KIND
-         * compact = 1
-         * ascii = 1
-         * ready = 1
-         * (length is the length of the utf8 and wstr strings)
-         * (data starts just after the structure)
-         * (since ASCII is decoded from UTF-8, the utf8 string are the data)
-
-       - compact:
-
-         * structure = PyCompactUnicodeObject
-         * test: PyUnicode_IS_COMPACT(op) && !PyUnicode_IS_ASCII(op)
-         * kind = PyUnicode_1BYTE_KIND, PyUnicode_2BYTE_KIND or
-           PyUnicode_4BYTE_KIND
-         * compact = 1
-         * ready = 1
-         * ascii = 0
-         * utf8 is not shared with data
-         * utf8_length = 0 if utf8 is NULL
-         * wstr is shared with data and wstr_length=length
-           if kind=PyUnicode_2BYTE_KIND and sizeof(wchar_t)=2
-           or if kind=PyUnicode_4BYTE_KIND and sizeof(wchar_t)=4
-         * wstr_length = 0 if wstr is NULL
-         * (data starts just after the structure)
-
-       - legacy string, not ready:
-
-         * structure = PyUnicodeObject
-         * test: kind == PyUnicode_WCHAR_KIND
-         * length = 0 (use wstr_length)
-         * hash = -1
-         * kind = PyUnicode_WCHAR_KIND
-         * compact = 0
-         * ascii = 0
-         * ready = 0
-         * interned = SSTATE_NOT_INTERNED
-         * wstr is not NULL
-         * data.any is NULL
-         * utf8 is NULL
-         * utf8_length = 0
-
-       - legacy string, ready:
-
-         * structure = PyUnicodeObject structure
-         * test: !PyUnicode_IS_COMPACT(op) && kind != PyUnicode_WCHAR_KIND
-         * kind = PyUnicode_1BYTE_KIND, PyUnicode_2BYTE_KIND or
-           PyUnicode_4BYTE_KIND
-         * compact = 0
-         * ready = 1
-         * data.any is not NULL
-         * utf8 is shared and utf8_length = length with data.any if ascii = 1
-         * utf8_length = 0 if utf8 is NULL
-         * wstr is shared with data.any and wstr_length = length
-           if kind=PyUnicode_2BYTE_KIND and sizeof(wchar_t)=2
-           or if kind=PyUnicode_4BYTE_KIND and sizeof(wchar_4)=4
-         * wstr_length = 0 if wstr is NULL
-
-       Compact strings use only one memory block (structure + characters),
-       whereas legacy strings use one block for the structure and one block
-       for characters.
-
-       Legacy strings are created by PyUnicode_FromUnicode() and
-       PyUnicode_FromStringAndSize(NULL, size) functions. They become ready
-       when PyUnicode_READY() is called.
-
-       See also _PyUnicode_CheckConsistency().
-    */
-    PyObject_HEAD
-    Py_ssize_t length;          /* Number of code points in the string */
-    Py_hash_t hash;             /* Hash value; -1 if not set */
-    struct {
-        /*
-           SSTATE_NOT_INTERNED (0)
-           SSTATE_INTERNED_MORTAL (1)
-           SSTATE_INTERNED_IMMORTAL (2)
-
-           If interned != SSTATE_NOT_INTERNED, the two references from the
-           dictionary to this object are *not* counted in ob_refcnt.
-         */
-        unsigned int interned:2;
-        /* Character size:
-
-           - PyUnicode_WCHAR_KIND (0):
-
-             * character type = wchar_t (16 or 32 bits, depending on the
-               platform)
-
-           - PyUnicode_1BYTE_KIND (1):
-
-             * character type = Py_UCS1 (8 bits, unsigned)
-             * all characters are in the range U+0000-U+00FF (latin1)
-             * if ascii is set, all characters are in the range U+0000-U+007F
-               (ASCII), otherwise at least one character is in the range
-               U+0080-U+00FF
-
-           - PyUnicode_2BYTE_KIND (2):
-
-             * character type = Py_UCS2 (16 bits, unsigned)
-             * all characters are in the range U+0000-U+FFFF (BMP)
-             * at least one character is in the range U+0100-U+FFFF
-
-           - PyUnicode_4BYTE_KIND (4):
-
-             * character type = Py_UCS4 (32 bits, unsigned)
-             * all characters are in the range U+0000-U+10FFFF
-             * at least one character is in the range U+10000-U+10FFFF
-         */
-        unsigned int kind:3;
-        /* Compact is with respect to the allocation scheme. Compact unicode
-           objects only require one memory block while non-compact objects use
-           one block for the PyUnicodeObject struct and another for its data
-           buffer. */
-        unsigned int compact:1;
-        /* The string only contains characters in the range U+0000-U+007F (ASCII)
-           and the kind is PyUnicode_1BYTE_KIND. If ascii is set and compact is
-           set, use the PyASCIIObject structure. */
-        unsigned int ascii:1;
-        /* The ready flag indicates whether the object layout is initialized
-           completely. This means that this is either a compact object, or
-           the data pointer is filled out. The bit is redundant, and helps
-           to minimize the test in PyUnicode_IS_READY(). */
-        unsigned int ready:1;
-        /* Padding to ensure that PyUnicode_DATA() is always aligned to
-           4 bytes (see issue #19537 on m68k). */
-        unsigned int :24;
-    } state;
-    wchar_t *wstr;              /* wchar_t representation (null-terminated) */
-} PyASCIIObject;
-
-/* Non-ASCII strings allocated through PyUnicode_New use the
-   PyCompactUnicodeObject structure. state.compact is set, and the data
-   immediately follow the structure. */
-typedef struct {
-    PyASCIIObject _base;
-    Py_ssize_t utf8_length;     /* Number of bytes in utf8, excluding the
-                                 * terminating \0. */
-    char *utf8;                 /* UTF-8 representation (null-terminated) */
-    Py_ssize_t wstr_length;     /* Number of code points in wstr, possible
-                                 * surrogates count as two code points. */
-} PyCompactUnicodeObject;
-
-/* Strings allocated through PyUnicode_FromUnicode(NULL, len) use the
-   PyUnicodeObject structure. The actual string data is initially in the wstr
-   block, and copied into the data block using _PyUnicode_Ready. */
-typedef struct {
-    PyCompactUnicodeObject _base;
-    union {
-        void *any;
-        Py_UCS1 *latin1;
-        Py_UCS2 *ucs2;
-        Py_UCS4 *ucs4;
-    } data;                     /* Canonical, smallest-form Unicode buffer */
-} PyUnicodeObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyUnicode_Type;
-PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
-
-#define PyUnicode_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS)
-#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type)
-
-/* Fast access macros */
-#ifndef Py_LIMITED_API
-
-#define PyUnicode_WSTR_LENGTH(op) \
-    (PyUnicode_IS_COMPACT_ASCII(op) ?                  \
-     ((PyASCIIObject*)op)->length :                    \
-     ((PyCompactUnicodeObject*)op)->wstr_length)
-
-/* Returns the deprecated Py_UNICODE representation's size in code units
-   (this includes surrogate pairs as 2 units).
-   If the Py_UNICODE representation is not available, it will be computed
-   on request.  Use PyUnicode_GET_LENGTH() for the length in code points. */
-
-#define PyUnicode_GET_SIZE(op)                       \
-    (assert(PyUnicode_Check(op)),                    \
-     (((PyASCIIObject *)(op))->wstr) ?               \
-      PyUnicode_WSTR_LENGTH(op) :                    \
-      ((void)PyUnicode_AsUnicode((PyObject *)(op)),  \
-       assert(((PyASCIIObject *)(op))->wstr),        \
-       PyUnicode_WSTR_LENGTH(op)))
-
-#define PyUnicode_GET_DATA_SIZE(op) \
-    (PyUnicode_GET_SIZE(op) * Py_UNICODE_SIZE)
-
-/* Alias for PyUnicode_AsUnicode().  This will create a wchar_t/Py_UNICODE
-   representation on demand.  Using this macro is very inefficient now,
-   try to port your code to use the new PyUnicode_*BYTE_DATA() macros or
-   use PyUnicode_WRITE() and PyUnicode_READ(). */
-
-#define PyUnicode_AS_UNICODE(op) \
-    (assert(PyUnicode_Check(op)), \
-     (((PyASCIIObject *)(op))->wstr) ? (((PyASCIIObject *)(op))->wstr) : \
-      PyUnicode_AsUnicode((PyObject *)(op)))
-
-#define PyUnicode_AS_DATA(op) \
-    ((const char *)(PyUnicode_AS_UNICODE(op)))
-
-
-/* --- Flexible String Representation Helper Macros (PEP 393) -------------- */
-
-/* Values for PyASCIIObject.state: */
-
-/* Interning state. */
-#define SSTATE_NOT_INTERNED 0
-#define SSTATE_INTERNED_MORTAL 1
-#define SSTATE_INTERNED_IMMORTAL 2
-
-/* Return true if the string contains only ASCII characters, or 0 if not. The
-   string may be compact (PyUnicode_IS_COMPACT_ASCII) or not, but must be
-   ready. */
-#define PyUnicode_IS_ASCII(op)                   \
-    (assert(PyUnicode_Check(op)),                \
-     assert(PyUnicode_IS_READY(op)),             \
-     ((PyASCIIObject*)op)->state.ascii)
-
-/* Return true if the string is compact or 0 if not.
-   No type checks or Ready calls are performed. */
-#define PyUnicode_IS_COMPACT(op) \
-    (((PyASCIIObject*)(op))->state.compact)
-
-/* Return true if the string is a compact ASCII string (use PyASCIIObject
-   structure), or 0 if not.  No type checks or Ready calls are performed. */
-#define PyUnicode_IS_COMPACT_ASCII(op)                 \
-    (((PyASCIIObject*)op)->state.ascii && PyUnicode_IS_COMPACT(op))
-
-enum PyUnicode_Kind {
-/* String contains only wstr byte characters.  This is only possible
-   when the string was created with a legacy API and _PyUnicode_Ready()
-   has not been called yet.  */
-    PyUnicode_WCHAR_KIND = 0,
-/* Return values of the PyUnicode_KIND() macro: */
-    PyUnicode_1BYTE_KIND = 1,
-    PyUnicode_2BYTE_KIND = 2,
-    PyUnicode_4BYTE_KIND = 4
-};
-
-/* Return pointers to the canonical representation cast to unsigned char,
-   Py_UCS2, or Py_UCS4 for direct character access.
-   No checks are performed, use PyUnicode_KIND() before to ensure
-   these will work correctly. */
-
-#define PyUnicode_1BYTE_DATA(op) ((Py_UCS1*)PyUnicode_DATA(op))
-#define PyUnicode_2BYTE_DATA(op) ((Py_UCS2*)PyUnicode_DATA(op))
-#define PyUnicode_4BYTE_DATA(op) ((Py_UCS4*)PyUnicode_DATA(op))
-
-/* Return one of the PyUnicode_*_KIND values defined above. */
-#define PyUnicode_KIND(op) \
-    (assert(PyUnicode_Check(op)), \
-     assert(PyUnicode_IS_READY(op)),            \
-     ((PyASCIIObject *)(op))->state.kind)
-
-/* Return a void pointer to the raw unicode buffer. */
-#define _PyUnicode_COMPACT_DATA(op)                     \
-    (PyUnicode_IS_ASCII(op) ?                   \
-     ((void*)((PyASCIIObject*)(op) + 1)) :              \
-     ((void*)((PyCompactUnicodeObject*)(op) + 1)))
-
-#define _PyUnicode_NONCOMPACT_DATA(op)                  \
-    (assert(((PyUnicodeObject*)(op))->data.any),        \
-     ((((PyUnicodeObject *)(op))->data.any)))
-
-#define PyUnicode_DATA(op) \
-    (assert(PyUnicode_Check(op)), \
-     PyUnicode_IS_COMPACT(op) ? _PyUnicode_COMPACT_DATA(op) :   \
-     _PyUnicode_NONCOMPACT_DATA(op))
-
-/* In the access macros below, "kind" may be evaluated more than once.
-   All other macro parameters are evaluated exactly once, so it is safe
-   to put side effects into them (such as increasing the index). */
-
-/* Write into the canonical representation, this macro does not do any sanity
-   checks and is intended for usage in loops.  The caller should cache the
-   kind and data pointers obtained from other macro calls.
-   index is the index in the string (starts at 0) and value is the new
-   code point value which should be written to that location. */
-#define PyUnicode_WRITE(kind, data, index, value) \
-    do { \
-        switch ((kind)) { \
-        case PyUnicode_1BYTE_KIND: { \
-            ((Py_UCS1 *)(data))[(index)] = (Py_UCS1)(value); \
-            break; \
-        } \
-        case PyUnicode_2BYTE_KIND: { \
-            ((Py_UCS2 *)(data))[(index)] = (Py_UCS2)(value); \
-            break; \
-        } \
-        default: { \
-            assert((kind) == PyUnicode_4BYTE_KIND); \
-            ((Py_UCS4 *)(data))[(index)] = (Py_UCS4)(value); \
-        } \
-        } \
-    } while (0)
-
-/* Read a code point from the string's canonical representation.  No checks
-   or ready calls are performed. */
-#define PyUnicode_READ(kind, data, index) \
-    ((Py_UCS4) \
-    ((kind) == PyUnicode_1BYTE_KIND ? \
-        ((const Py_UCS1 *)(data))[(index)] : \
-        ((kind) == PyUnicode_2BYTE_KIND ? \
-            ((const Py_UCS2 *)(data))[(index)] : \
-            ((const Py_UCS4 *)(data))[(index)] \
-        ) \
-    ))
-
-/* PyUnicode_READ_CHAR() is less efficient than PyUnicode_READ() because it
-   calls PyUnicode_KIND() and might call it twice.  For single reads, use
-   PyUnicode_READ_CHAR, for multiple consecutive reads callers should
-   cache kind and use PyUnicode_READ instead. */
-#define PyUnicode_READ_CHAR(unicode, index) \
-    (assert(PyUnicode_Check(unicode)),          \
-     assert(PyUnicode_IS_READY(unicode)),       \
-     (Py_UCS4)                                  \
-        (PyUnicode_KIND((unicode)) == PyUnicode_1BYTE_KIND ? \
-            ((const Py_UCS1 *)(PyUnicode_DATA((unicode))))[(index)] : \
-            (PyUnicode_KIND((unicode)) == PyUnicode_2BYTE_KIND ? \
-                ((const Py_UCS2 *)(PyUnicode_DATA((unicode))))[(index)] : \
-                ((const Py_UCS4 *)(PyUnicode_DATA((unicode))))[(index)] \
-            ) \
-        ))
-
-/* Returns the length of the unicode string. The caller has to make sure that
-   the string has it's canonical representation set before calling
-   this macro.  Call PyUnicode_(FAST_)Ready to ensure that. */
-#define PyUnicode_GET_LENGTH(op)                \
-    (assert(PyUnicode_Check(op)),               \
-     assert(PyUnicode_IS_READY(op)),            \
-     ((PyASCIIObject *)(op))->length)
-
-
-/* Fast check to determine whether an object is ready. Equivalent to
-   PyUnicode_IS_COMPACT(op) || ((PyUnicodeObject*)(op))->data.any) */
-
-#define PyUnicode_IS_READY(op) (((PyASCIIObject*)op)->state.ready)
-
-/* PyUnicode_READY() does less work than _PyUnicode_Ready() in the best
-   case.  If the canonical representation is not yet set, it will still call
-   _PyUnicode_Ready().
-   Returns 0 on success and -1 on errors. */
-#define PyUnicode_READY(op)                        \
-    (assert(PyUnicode_Check(op)),                       \
-     (PyUnicode_IS_READY(op) ?                          \
-      0 : _PyUnicode_Ready((PyObject *)(op))))
-
-/* Return a maximum character value which is suitable for creating another
-   string based on op.  This is always an approximation but more efficient
-   than iterating over the string. */
-#define PyUnicode_MAX_CHAR_VALUE(op) \
-    (assert(PyUnicode_IS_READY(op)),                                    \
-     (PyUnicode_IS_ASCII(op) ?                                          \
-      (0x7f) :                                                          \
-      (PyUnicode_KIND(op) == PyUnicode_1BYTE_KIND ?                     \
-       (0xffU) :                                                        \
-       (PyUnicode_KIND(op) == PyUnicode_2BYTE_KIND ?                    \
-        (0xffffU) :                                                     \
-        (0x10ffffU)))))
-
-#endif
-
-/* --- Constants ---------------------------------------------------------- */
-
-/* This Unicode character will be used as replacement character during
-   decoding if the errors argument is set to "replace". Note: the
-   Unicode character U+FFFD is the official REPLACEMENT CHARACTER in
-   Unicode 3.0. */
-
-#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UCS4) 0xFFFD)
-
-/* === Public API ========================================================= */
-
-/* --- Plain Py_UNICODE --------------------------------------------------- */
-
-/* With PEP 393, this is the recommended way to allocate a new unicode object.
-   This function will allocate the object and its buffer in a single memory
-   block.  Objects created using this function are not resizable. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_New(
-    Py_ssize_t size,            /* Number of code points in the new string */
-    Py_UCS4 maxchar             /* maximum code point value in the string */
-    );
-#endif
-
-/* Initializes the canonical string representation from the deprecated
-   wstr/Py_UNICODE representation. This function is used to convert Unicode
-   objects which were created using the old API to the new flexible format
-   introduced with PEP 393.
-
-   Don't call this function directly, use the public PyUnicode_READY() macro
-   instead. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyUnicode_Ready(
-    PyObject *unicode           /* Unicode object */
-    );
-#endif
-
-/* Get a copy of a Unicode string. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyUnicode_Copy(
-    PyObject *unicode
-    );
-#endif
-
-/* Copy character from one unicode object into another, this function performs
-   character conversion when necessary and falls back to memcpy() if possible.
-
-   Fail if to is too small (smaller than *how_many* or smaller than
-   len(from)-from_start), or if kind(from[from_start:from_start+how_many]) >
-   kind(to), or if *to* has more than 1 reference.
-
-   Return the number of written character, or return -1 and raise an exception
-   on error.
-
-   Pseudo-code:
-
-       how_many = min(how_many, len(from) - from_start)
-       to[to_start:to_start+how_many] = from[from_start:from_start+how_many]
-       return how_many
-
-   Note: The function doesn't write a terminating null character.
-   */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) PyUnicode_CopyCharacters(
-    PyObject *to,
-    Py_ssize_t to_start,
-    PyObject *from,
-    Py_ssize_t from_start,
-    Py_ssize_t how_many
-    );
-
-/* Unsafe version of PyUnicode_CopyCharacters(): don't check arguments and so
-   may crash if parameters are invalid (e.g. if the output string
-   is too short). */
-PyAPI_FUNC(void) _PyUnicode_FastCopyCharacters(
-    PyObject *to,
-    Py_ssize_t to_start,
-    PyObject *from,
-    Py_ssize_t from_start,
-    Py_ssize_t how_many
-    );
-#endif
-
-#ifndef Py_LIMITED_API
-/* Fill a string with a character: write fill_char into
-   unicode[start:start+length].
-
-   Fail if fill_char is bigger than the string maximum character, or if the
-   string has more than 1 reference.
-
-   Return the number of written character, or return -1 and raise an exception
-   on error. */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Fill(
-    PyObject *unicode,
-    Py_ssize_t start,
-    Py_ssize_t length,
-    Py_UCS4 fill_char
-    );
-
-/* Unsafe version of PyUnicode_Fill(): don't check arguments and so may crash
-   if parameters are invalid (e.g. if length is longer than the string). */
-PyAPI_FUNC(void) _PyUnicode_FastFill(
-    PyObject *unicode,
-    Py_ssize_t start,
-    Py_ssize_t length,
-    Py_UCS4 fill_char
-    );
-#endif
-
-/* Create a Unicode Object from the Py_UNICODE buffer u of the given
-   size.
-
-   u may be NULL which causes the contents to be undefined. It is the
-   user's responsibility to fill in the needed data afterwards. Note
-   that modifying the Unicode object contents after construction is
-   only allowed if u was set to NULL.
-
-   The buffer is copied into the new object. */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode(
-    const Py_UNICODE *u,        /* Unicode buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-#endif
-
-/* Similar to PyUnicode_FromUnicode(), but u points to UTF-8 encoded bytes */
-PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize(
-    const char *u,             /* UTF-8 encoded string */
-    Py_ssize_t size            /* size of buffer */
-    );
-
-/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated
-   UTF-8 encoded bytes.  The size is determined with strlen(). */
-PyAPI_FUNC(PyObject*) PyUnicode_FromString(
-    const char *u              /* UTF-8 encoded string */
-    );
-
-#ifndef Py_LIMITED_API
-/* Create a new string from a buffer of Py_UCS1, Py_UCS2 or Py_UCS4 characters.
-   Scan the string to find the maximum character. */
-PyAPI_FUNC(PyObject*) PyUnicode_FromKindAndData(
-    int kind,
-    const void *buffer,
-    Py_ssize_t size);
-
-/* Create a new string from a buffer of ASCII characters.
-   WARNING: Don't check if the string contains any non-ASCII character. */
-PyAPI_FUNC(PyObject*) _PyUnicode_FromASCII(
-    const char *buffer,
-    Py_ssize_t size);
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyUnicode_Substring(
-    PyObject *str,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif
-
-#ifndef Py_LIMITED_API
-/* Compute the maximum character of the substring unicode[start:end].
-   Return 127 for an empty string. */
-PyAPI_FUNC(Py_UCS4) _PyUnicode_FindMaxChar (
-    PyObject *unicode,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Copy the string into a UCS4 buffer including the null character if copy_null
-   is set. Return NULL and raise an exception on error. Raise a SystemError if
-   the buffer is smaller than the string. Return buffer on success.
-
-   buflen is the length of the buffer in (Py_UCS4) characters. */
-PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4(
-    PyObject *unicode,
-    Py_UCS4* buffer,
-    Py_ssize_t buflen,
-    int copy_null);
-
-/* Copy the string into a UCS4 buffer. A new buffer is allocated using
- * PyMem_Malloc; if this fails, NULL is returned with a memory error
-   exception set. */
-PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4Copy(PyObject *unicode);
-#endif
-
-#ifndef Py_LIMITED_API
-/* Return a read-only pointer to the Unicode object's internal
-   Py_UNICODE buffer.
-   If the wchar_t/Py_UNICODE representation is not yet available, this
-   function will calculate it. */
-
-PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Similar to PyUnicode_AsUnicode(), but raises a ValueError if the string
-   contains null characters. */
-PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Return a read-only pointer to the Unicode object's internal
-   Py_UNICODE buffer and save the length at size.
-   If the wchar_t/Py_UNICODE representation is not yet available, this
-   function will calculate it. */
-
-PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicodeAndSize(
-    PyObject *unicode,          /* Unicode object */
-    Py_ssize_t *size            /* location where to save the length */
-    );
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Get the length of the Unicode object. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetLength(
-    PyObject *unicode
-);
-#endif
-
-/* Get the number of Py_UNICODE units in the
-   string representation. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Read a character from the string. */
-
-PyAPI_FUNC(Py_UCS4) PyUnicode_ReadChar(
-    PyObject *unicode,
-    Py_ssize_t index
-    );
-
-/* Write a character to the string. The string must have been created through
-   PyUnicode_New, must not be shared, and must not have been hashed yet.
-
-   Return 0 on success, -1 on error. */
-
-PyAPI_FUNC(int) PyUnicode_WriteChar(
-    PyObject *unicode,
-    Py_ssize_t index,
-    Py_UCS4 character
-    );
-#endif
-
-#ifndef Py_LIMITED_API
-/* Get the maximum ordinal for a Unicode character. */
-PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void);
-#endif
-
-/* Resize a Unicode object. The length is the number of characters, except
-   if the kind of the string is PyUnicode_WCHAR_KIND: in this case, the length
-   is the number of Py_UNICODE characters.
-
-   *unicode is modified to point to the new (resized) object and 0
-   returned on success.
-
-   Try to resize the string in place (which is usually faster than allocating
-   a new string and copy characters), or create a new string.
-
-   Error handling is implemented as follows: an exception is set, -1
-   is returned and *unicode left untouched.
-
-   WARNING: The function doesn't check string content, the result may not be a
-            string in canonical representation. */
-
-PyAPI_FUNC(int) PyUnicode_Resize(
-    PyObject **unicode,         /* Pointer to the Unicode object */
-    Py_ssize_t length           /* New length */
-    );
-
-/* Decode obj to a Unicode object.
-
-   bytes, bytearray and other bytes-like objects are decoded according to the
-   given encoding and error handler. The encoding and error handler can be
-   NULL to have the interface use UTF-8 and "strict".
-
-   All other objects (including Unicode objects) raise an exception.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject(
-    PyObject *obj,              /* Object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Copy an instance of a Unicode subtype to a new true Unicode object if
-   necessary. If obj is already a true Unicode object (not a subtype), return
-   the reference with *incremented* refcount.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromObject(
-    PyObject *obj      /* Object */
-    );
-
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(
-    const char *format,   /* ASCII-encoded string  */
-    va_list vargs
-    );
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject *buffer;
-    void *data;
-    enum PyUnicode_Kind kind;
-    Py_UCS4 maxchar;
-    Py_ssize_t size;
-    Py_ssize_t pos;
-
-    /* minimum number of allocated characters (default: 0) */
-    Py_ssize_t min_length;
-
-    /* minimum character (default: 127, ASCII) */
-    Py_UCS4 min_char;
-
-    /* If non-zero, overallocate the buffer (default: 0). */
-    unsigned char overallocate;
-
-    /* If readonly is 1, buffer is a shared string (cannot be modified)
-       and size is set to 0. */
-    unsigned char readonly;
-} _PyUnicodeWriter ;
-
-/* Initialize a Unicode writer.
- *
- * By default, the minimum buffer size is 0 character and overallocation is
- * disabled. Set min_length, min_char and overallocate attributes to control
- * the allocation of the buffer. */
-PyAPI_FUNC(void)
-_PyUnicodeWriter_Init(_PyUnicodeWriter *writer);
-
-/* Prepare the buffer to write 'length' characters
-   with the specified maximum character.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-#define _PyUnicodeWriter_Prepare(WRITER, LENGTH, MAXCHAR)             \
-    (((MAXCHAR) <= (WRITER)->maxchar                                  \
-      && (LENGTH) <= (WRITER)->size - (WRITER)->pos)                  \
-     ? 0                                                              \
-     : (((LENGTH) == 0)                                               \
-        ? 0                                                           \
-        : _PyUnicodeWriter_PrepareInternal((WRITER), (LENGTH), (MAXCHAR))))
-
-/* Don't call this function directly, use the _PyUnicodeWriter_Prepare() macro
-   instead. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer,
-                                 Py_ssize_t length, Py_UCS4 maxchar);
-
-/* Prepare the buffer to have at least the kind KIND.
-   For example, kind=PyUnicode_2BYTE_KIND ensures that the writer will
-   support characters in range U+000-U+FFFF.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-#define _PyUnicodeWriter_PrepareKind(WRITER, KIND)                    \
-    (assert((KIND) != PyUnicode_WCHAR_KIND),                          \
-     (KIND) <= (WRITER)->kind                                         \
-     ? 0                                                              \
-     : _PyUnicodeWriter_PrepareKindInternal((WRITER), (KIND)))
-
-/* Don't call this function directly, use the _PyUnicodeWriter_PrepareKind()
-   macro instead. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer,
-                                     enum PyUnicode_Kind kind);
-
-/* Append a Unicode character.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteChar(_PyUnicodeWriter *writer,
-    Py_UCS4 ch
-    );
-
-/* Append a Unicode string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteStr(_PyUnicodeWriter *writer,
-    PyObject *str               /* Unicode string */
-    );
-
-/* Append a substring of a Unicode string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteSubstring(_PyUnicodeWriter *writer,
-    PyObject *str,              /* Unicode string */
-    Py_ssize_t start,
-    Py_ssize_t end
-    );
-
-/* Append an ASCII-encoded byte string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteASCIIString(_PyUnicodeWriter *writer,
-    const char *str,           /* ASCII-encoded byte string */
-    Py_ssize_t len             /* number of bytes, or -1 if unknown */
-    );
-
-/* Append a latin1-encoded byte string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteLatin1String(_PyUnicodeWriter *writer,
-    const char *str,           /* latin1-encoded byte string */
-    Py_ssize_t len             /* length in bytes */
-    );
-
-/* Get the value of the writer as a Unicode string. Clear the
-   buffer of the writer. Raise an exception and return NULL
-   on error. */
-PyAPI_FUNC(PyObject *)
-_PyUnicodeWriter_Finish(_PyUnicodeWriter *writer);
-
-/* Deallocate memory of a writer (clear its internal buffer). */
-PyAPI_FUNC(void)
-_PyUnicodeWriter_Dealloc(_PyUnicodeWriter *writer);
-#endif
-
-#ifndef Py_LIMITED_API
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(int) _PyUnicode_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif
-
-PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **);
-PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **);
-PyAPI_FUNC(PyObject *) PyUnicode_InternFromString(
-    const char *u              /* UTF-8 encoded string */
-    );
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_ReleaseInternedUnicodeStrings(void);
-#endif
-
-/* Use only if you know it's a string */
-#define PyUnicode_CHECK_INTERNED(op) \
-    (((PyASCIIObject *)(op))->state.interned)
-
-/* --- wchar_t support for platforms which support it --------------------- */
-
-#ifdef HAVE_WCHAR_H
-
-/* Create a Unicode Object from the wchar_t buffer w of the given
-   size.
-
-   The buffer is copied into the new object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar(
-    const wchar_t *w,           /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Copies the Unicode Object contents into the wchar_t buffer w.  At
-   most size wchar_t characters are copied.
-
-   Note that the resulting wchar_t string may or may not be
-   0-terminated.  It is the responsibility of the caller to make sure
-   that the wchar_t string is 0-terminated in case this is required by
-   the application.
-
-   Returns the number of wchar_t characters copied (excluding a
-   possibly trailing 0-termination character) or -1 in case of an
-   error. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
-    PyObject *unicode,          /* Unicode object */
-    wchar_t *w,                 /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Convert the Unicode object to a wide character string. The output string
-   always ends with a nul character. If size is not NULL, write the number of
-   wide characters (excluding the null character) into *size.
-
-   Returns a buffer allocated by PyMem_Malloc() (use PyMem_Free() to free it)
-   on success. On error, returns NULL, *size is undefined and raises a
-   MemoryError. */
-
-PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
-    PyObject *unicode,          /* Unicode object */
-    Py_ssize_t *size            /* number of characters of the result */
-    );
-
-#ifndef Py_LIMITED_API
-/* Similar to PyUnicode_AsWideCharString(unicode, NULL), but check if
-   the string contains null characters. */
-PyAPI_FUNC(wchar_t*) _PyUnicode_AsWideCharString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(void*) _PyUnicode_AsKind(PyObject *s, unsigned int kind);
-#endif
-
-#endif
-
-/* --- Unicode ordinals --------------------------------------------------- */
-
-/* Create a Unicode Object from the given Unicode code point ordinal.
-
-   The ordinal must be in range(0x110000). A ValueError is
-   raised in case it is not.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
-
-/* --- Free-list management ----------------------------------------------- */
-
-/* Clear the free list used by the Unicode implementation.
-
-   This can be used to release memory used for objects on the free
-   list back to the Python memory allocator.
-
-*/
-
-PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
-
-/* === Builtin Codecs =====================================================
-
-   Many of these APIs take two arguments encoding and errors. These
-   parameters encoding and errors have the same semantics as the ones
-   of the builtin str() API.
-
-   Setting encoding to NULL causes the default encoding (UTF-8) to be used.
-
-   Error handling is set by errors which may also be set to NULL
-   meaning to use the default handling defined for the codec. Default
-   error handling for all builtin codecs is "strict" (ValueErrors are
-   raised).
-
-   The codecs all use a similar interface. Only deviation from the
-   generic ones are documented.
-
-*/
-
-/* --- Manage the default encoding ---------------------------------------- */
-
-/* Returns a pointer to the default encoding (UTF-8) of the
-   Unicode object unicode and the size of the encoded representation
-   in bytes stored in *size.
-
-   In case of an error, no *size is set.
-
-   This function caches the UTF-8 encoded string in the unicodeobject
-   and subsequent calls will return the same string.  The memory is released
-   when the unicodeobject is deallocated.
-
-   _PyUnicode_AsStringAndSize is a #define for PyUnicode_AsUTF8AndSize to
-   support the previous internal function with the same behaviour.
-
-   *** This API is for interpreter INTERNAL USE ONLY and will likely
-   *** be removed or changed in the future.
-
-   *** If you need to access the Unicode object as UTF-8 bytes string,
-   *** please use PyUnicode_AsUTF8String() instead.
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) PyUnicode_AsUTF8AndSize(
-    PyObject *unicode,
-    Py_ssize_t *size);
-#define _PyUnicode_AsStringAndSize PyUnicode_AsUTF8AndSize
-#endif
-
-/* Returns a pointer to the default encoding (UTF-8) of the
-   Unicode object unicode.
-
-   Like PyUnicode_AsUTF8AndSize(), this also caches the UTF-8 representation
-   in the unicodeobject.
-
-   _PyUnicode_AsString is a #define for PyUnicode_AsUTF8 to
-   support the previous internal function with the same behaviour.
-
-   Use of this API is DEPRECATED since no size information can be
-   extracted from the returned data.
-
-   *** This API is for interpreter INTERNAL USE ONLY and will likely
-   *** be removed or changed for Python 3.1.
-
-   *** If you need to access the Unicode object as UTF-8 bytes string,
-   *** please use PyUnicode_AsUTF8String() instead.
-
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) PyUnicode_AsUTF8(PyObject *unicode);
-#define _PyUnicode_AsString PyUnicode_AsUTF8
-#endif
-
-/* Returns "utf-8".  */
-
-PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void);
-
-/* --- Generic Codecs ----------------------------------------------------- */
-
-/* Create a Unicode object by decoding the encoded string s of the
-   given size. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Decode(
-    const char *s,              /* encoded string */
-    Py_ssize_t size,            /* size of buffer */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Decode a Unicode object unicode and return the result as Python
-   object.
-
-   This API is DEPRECATED. The only supported standard encoding is rot13.
-   Use PyCodec_Decode() to decode with rot13 and non-standard codecs
-   that decode from str. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    ) Py_DEPRECATED(3.6);
-
-/* Decode a Unicode object unicode and return the result as Unicode
-   object.
-
-   This API is DEPRECATED. The only supported standard encoding is rot13.
-   Use PyCodec_Decode() to decode with rot13 and non-standard codecs
-   that decode from str to str. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    ) Py_DEPRECATED(3.6);
-
-/* Encodes a Py_UNICODE buffer of the given size and returns a
-   Python string object. */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_Encode(
-    const Py_UNICODE *s,        /* Unicode char buffer */
-    Py_ssize_t size,            /* number of Py_UNICODE chars to encode */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* Encodes a Unicode object and returns the result as Python
-   object.
-
-   This API is DEPRECATED.  It is superceeded by PyUnicode_AsEncodedString()
-   since all standard encodings (except rot13) encode str to bytes.
-   Use PyCodec_Encode() for encoding with rot13 and non-standard codecs
-   that encode form str to non-bytes. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    ) Py_DEPRECATED(3.6);
-
-/* Encodes a Unicode object and returns the result as Python string
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Unicode
-   object.
-
-   This API is DEPRECATED.  The only supported standard encodings is rot13.
-   Use PyCodec_Encode() to encode with rot13 and non-standard codecs
-   that encode from str to str. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    ) Py_DEPRECATED(3.6);
-
-/* Build an encoding map. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap(
-    PyObject* string            /* 256 character map */
-   );
-
-/* --- UTF-7 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
-    int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
-    const char *errors          /* error handling */
-    );
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF7(
-    PyObject *unicode,          /* Unicode object */
-    int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
-    int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* --- UTF-8 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyUnicode_AsUTF8String(
-    PyObject *unicode,
-    const char *errors);
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* --- UTF-32 Codecs ------------------------------------------------------ */
-
-/* Decodes length bytes from a UTF-32 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first four bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-32 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Returns a Python string object holding the UTF-32 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF32(
-    PyObject *object,           /* Unicode object */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-#endif
-
-/* --- UTF-16 Codecs ------------------------------------------------------ */
-
-/* Decodes length bytes from a UTF-16 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first two bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-16 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Returns a Python string object holding the UTF-16 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-   Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
-   UCS-2. This trick makes it possible to add full UTF-16 capabilities
-   at a later point without compromising the APIs.
-
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF16(
-    PyObject* unicode,          /* Unicode object */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-#endif
-
-/* --- Unicode-Escape Codecs ---------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape(
-    const char *string,         /* Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-#ifndef Py_LIMITED_API
-/* Helper for PyUnicode_DecodeUnicodeEscape that detects invalid escape
-   chars. */
-PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscape(
-        const char *string,     /* Unicode-Escape encoded string */
-        Py_ssize_t length,      /* size of string */
-        const char *errors,     /* error handling */
-        const char **first_invalid_escape  /* on return, points to first
-                                              invalid escaped char in
-                                              string. */
-);
-#endif
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length           /* Number of Py_UNICODE chars to encode */
-    );
-#endif
-
-/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape(
-    const char *string,         /* Raw-Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length           /* Number of Py_UNICODE chars to encode */
-    );
-#endif
-
-/* --- Unicode Internal Codec ---------------------------------------------
-
-    Only for internal use in _codecsmodule.c */
-
-#ifndef Py_LIMITED_API
-PyObject *_PyUnicode_DecodeUnicodeInternal(
-    const char *string,
-    Py_ssize_t length,
-    const char *errors
-    );
-#endif
-
-/* --- Latin-1 Codecs -----------------------------------------------------
-
-   Note: Latin-1 corresponds to the first 256 Unicode ordinals.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1(
-    const char *string,         /* Latin-1 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyUnicode_AsLatin1String(
-    PyObject* unicode,
-    const char* errors);
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* --- ASCII Codecs -------------------------------------------------------
-
-   Only 7-bit ASCII data is excepted. All other codes generate errors.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII(
-    const char *string,         /* ASCII encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyUnicode_AsASCIIString(
-    PyObject* unicode,
-    const char* errors);
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* --- Character Map Codecs -----------------------------------------------
-
-   This codec uses mappings to encode and decode characters.
-
-   Decoding mappings must map byte ordinals (integers in the range from 0 to
-   255) to Unicode strings, integers (which are then interpreted as Unicode
-   ordinals) or None.  Unmapped data bytes (ones which cause a LookupError)
-   as well as mapped to None, 0xFFFE or '\ufffe' are treated as "undefined
-   mapping" and cause an error.
-
-   Encoding mappings must map Unicode ordinal integers to bytes objects,
-   integers in the range from 0 to 255 or None.  Unmapped character
-   ordinals (ones which cause a LookupError) as well as mapped to
-   None are treated as "undefined mapping" and cause an error.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap(
-    const char *string,         /* Encoded string */
-    Py_ssize_t length,          /* size of string */
-    PyObject *mapping,          /* decoding mapping */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString(
-    PyObject *unicode,          /* Unicode object */
-    PyObject *mapping           /* encoding mapping */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    PyObject *mapping,          /* encoding mapping */
-    const char *errors          /* error handling */
-    );
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeCharmap(
-    PyObject *unicode,          /* Unicode object */
-    PyObject *mapping,          /* encoding mapping */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* Translate a Py_UNICODE buffer of the given length by applying a
-   character mapping table to it and return the resulting Unicode
-   object.
-
-   The mapping table must map Unicode ordinal integers to Unicode strings,
-   Unicode ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-#endif
-
-#ifdef MS_WINDOWS
-
-/* --- MBCS codecs for Windows -------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCodePageStateful(
-    int code_page,              /* code page number */
-    const char *string,         /* encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-#endif
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage(
-    int code_page,              /* code page number */
-    PyObject *unicode,          /* Unicode object */
-    const char *errors          /* error handling */
-    );
-#endif
-
-#endif /* MS_WINDOWS */
-
-/* --- Decimal Encoder ---------------------------------------------------- */
-
-/* Takes a Unicode string holding a decimal value and writes it into
-   an output buffer using standard ASCII digit codes.
-
-   The output buffer has to provide at least length+1 bytes of storage
-   area. The output string is 0-terminated.
-
-   The encoder converts whitespace to ' ', decimal characters to their
-   corresponding ASCII digit and all other Latin-1 characters except
-   \0 as-is. Characters outside this range (Unicode ordinals 1-256)
-   are treated as errors. This includes embedded NULL bytes.
-
-   Error handling is defined by the errors argument:
-
-      NULL or "strict": raise a ValueError
-      "ignore": ignore the wrong characters (these are not copied to the
-                output buffer)
-      "replace": replaces illegal characters with '?'
-
-   Returns 0 on success, -1 on failure.
-
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
-    Py_UNICODE *s,              /* Unicode buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    char *output,               /* Output buffer; must have size >= length */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* Transforms code points that have decimal digit property to the
-   corresponding ASCII digit code points.
-
-   Returns a new Unicode string on success, NULL on failure.
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_TransformDecimalToASCII(
-    Py_UNICODE *s,              /* Unicode buffer */
-    Py_ssize_t length           /* Number of Py_UNICODE chars to transform */
-    );
-#endif
-
-/* Similar to PyUnicode_TransformDecimalToASCII(), but takes a PyObject
-   as argument instead of a raw buffer and length.  This function additionally
-   transforms spaces to ASCII because this is what the callers in longobject,
-   floatobject, and complexobject did anyways. */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII(
-    PyObject *unicode           /* Unicode object */
-    );
-#endif
-
-/* --- Locale encoding --------------------------------------------------- */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the 'surrogateescape'
-   error handler (PEP 383) to escape undecodable bytes. If a byte sequence can
-   be decoded as a surrogate character and *surrogateescape* is not equal to
-   zero, the byte sequence is escaped using the 'surrogateescape' error handler
-   instead of being decoded. *str* must end with a null character but cannot
-   contain embedded null characters. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocaleAndSize(
-    const char *str,
-    Py_ssize_t len,
-    const char *errors);
-
-/* Similar to PyUnicode_DecodeLocaleAndSize(), but compute the string
-   length using strlen(). */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocale(
-    const char *str,
-    const char *errors);
-
-/* Encode a Unicode object to the current locale encoding. The encoder is
-   strict is *surrogateescape* is equal to zero, otherwise the
-   "surrogateescape" error handler is used. Return a bytes object. The string
-   cannot contain embedded null characters. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeLocale(
-    PyObject *unicode,
-    const char *errors
-    );
-#endif
-
-/* --- File system encoding ---------------------------------------------- */
-
-/* ParseTuple converter: encode str objects to bytes using
-   PyUnicode_EncodeFSDefault(); bytes objects are output as-is. */
-
-PyAPI_FUNC(int) PyUnicode_FSConverter(PyObject*, void*);
-
-/* ParseTuple converter: decode bytes objects to unicode using
-   PyUnicode_DecodeFSDefaultAndSize(); str objects are output as-is. */
-
-PyAPI_FUNC(int) PyUnicode_FSDecoder(PyObject*, void*);
-
-/* Decode a null-terminated string using Py_FileSystemDefaultEncoding
-   and the "surrogateescape" error handler.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-
-   Use PyUnicode_DecodeFSDefaultAndSize() if the string length is known.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault(
-    const char *s               /* encoded string */
-    );
-
-/* Decode a string using Py_FileSystemDefaultEncoding
-   and the "surrogateescape" error handler.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize(
-    const char *s,               /* encoded string */
-    Py_ssize_t size              /* size */
-    );
-
-/* Encode a Unicode object to Py_FileSystemDefaultEncoding with the
-   "surrogateescape" error handler, and return bytes.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeFSDefault(
-    PyObject *unicode
-    );
-
-/* --- Methods & Slots ----------------------------------------------------
-
-   These are capable of handling Unicode objects and strings on input
-   (we refer to them as strings in the descriptions) and return
-   Unicode objects or integers as appropriate. */
-
-/* Concat two strings giving a new Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Concat(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Concat two strings and put the result in *pleft
-   (sets *pleft to NULL on error) */
-
-PyAPI_FUNC(void) PyUnicode_Append(
-    PyObject **pleft,           /* Pointer to left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Concat two strings, put the result in *pleft and drop the right object
-   (sets *pleft to NULL on error) */
-
-PyAPI_FUNC(void) PyUnicode_AppendAndDel(
-    PyObject **pleft,           /* Pointer to left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. If negative, no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_Split(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Dito, but split at line breaks.
-
-   CRLF is considered to be one line break. Line breaks are not
-   included in the resulting list. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Splitlines(
-    PyObject *s,                /* String to split */
-    int keepends                /* If true, line end markers are included */
-    );
-
-/* Partition a string using a given separator. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Partition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Partition a string using a given separator, searching from the end of the
-   string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_RPartition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. But unlike PyUnicode_Split
-   PyUnicode_RSplit splits from the end of the string. If negative,
-   no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_RSplit(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Translate a string by applying a character mapping table to it and
-   return the resulting Unicode object.
-
-   The mapping table must map Unicode ordinal integers to Unicode strings,
-   Unicode ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_Translate(
-    PyObject *str,              /* String */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-
-/* Join a sequence of strings using the given separator and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Join(
-    PyObject *separator,        /* Separator string */
-    PyObject *seq               /* Sequence object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyUnicode_JoinArray(
-    PyObject *separator,
-    PyObject **items,
-    Py_ssize_t seqlen
-    );
-#endif /* Py_LIMITED_API */
-
-/* Return 1 if substr matches str[start:end] at the given tail end, 0
-   otherwise. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Prefix or Suffix string */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Tail end: -1 prefix, +1 suffix */
-    );
-
-/* Return the first position of substr in str[start:end] using the
-   given search direction or -1 if not found. -2 is returned in case
-   an error occurred and an exception is set. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Find(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Find direction: +1 forward, -1 backward */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Like PyUnicode_Find, but search for single character only. */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_FindChar(
-    PyObject *str,
-    Py_UCS4 ch,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    int direction
-    );
-#endif
-
-/* Count the number of occurrences of substr in str[start:end]. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Count(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to count */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end              /* Stop index */
-    );
-
-/* Replace at most maxcount occurrences of substr in str with replstr
-   and return the resulting Unicode object. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Replace(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    PyObject *replstr,          /* Substring to replace */
-    Py_ssize_t maxcount         /* Max. number of replacements to apply;
-                                   -1 = all */
-    );
-
-/* Compare two strings and return -1, 0, 1 for less than, equal,
-   greater than resp.
-   Raise an exception and return -1 on error. */
-
-PyAPI_FUNC(int) PyUnicode_Compare(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-#ifndef Py_LIMITED_API
-/* Test whether a unicode is equal to ASCII identifier.  Return 1 if true,
-   0 otherwise.  The right argument must be ASCII identifier.
-   Any error occurs inside will be cleared before return. */
-
-PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId(
-    PyObject *left,             /* Left string */
-    _Py_Identifier *right       /* Right identifier */
-    );
-#endif
-
-/* Compare a Unicode object with C string and return -1, 0, 1 for less than,
-   equal, and greater than, respectively.  It is best to pass only
-   ASCII-encoded strings, but the function interprets the input string as
-   ISO-8859-1 if it contains non-ASCII characters.
-   This function does not raise exceptions. */
-
-PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString(
-    PyObject *left,
-    const char *right           /* ASCII-encoded string */
-    );
-
-#ifndef Py_LIMITED_API
-/* Test whether a unicode is equal to ASCII string.  Return 1 if true,
-   0 otherwise.  The right argument must be ASCII-encoded string.
-   Any error occurs inside will be cleared before return. */
-
-PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString(
-    PyObject *left,
-    const char *right           /* ASCII-encoded string */
-    );
-#endif
-
-/* Rich compare two strings and return one of the following:
-
-   - NULL in case an exception was raised
-   - Py_True or Py_False for successful comparisons
-   - Py_NotImplemented in case the type combination is unknown
-
-   Possible values for op:
-
-     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_RichCompare(
-    PyObject *left,             /* Left string */
-    PyObject *right,            /* Right string */
-    int op                      /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
-    );
-
-/* Apply an argument tuple or dictionary to a format string and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Format(
-    PyObject *format,           /* Format string */
-    PyObject *args              /* Argument tuple or dictionary */
-    );
-
-/* Checks whether element is contained in container and return 1/0
-   accordingly.
-
-   element has to coerce to a one element Unicode string. -1 is
-   returned in case of an error. */
-
-PyAPI_FUNC(int) PyUnicode_Contains(
-    PyObject *container,        /* Container string */
-    PyObject *element           /* Element string */
-    );
-
-/* Checks whether argument is a valid identifier. */
-
-PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
-
-#ifndef Py_LIMITED_API
-/* Externally visible for str.strip(unicode) */
-PyAPI_FUNC(PyObject *) _PyUnicode_XStrip(
-    PyObject *self,
-    int striptype,
-    PyObject *sepobj
-    );
-#endif
-
-/* Using explicit passed-in values, insert the thousands grouping
-   into the string pointed to by buffer.  For the argument descriptions,
-   see Objects/stringlib/localeutil.h */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyUnicode_InsertThousandsGrouping(
-    PyObject *unicode,
-    Py_ssize_t index,
-    Py_ssize_t n_buffer,
-    void *digits,
-    Py_ssize_t n_digits,
-    Py_ssize_t min_width,
-    const char *grouping,
-    PyObject *thousands_sep,
-    Py_UCS4 *maxchar);
-#endif
-/* === Characters Type APIs =============================================== */
-
-/* Helper array used by Py_UNICODE_ISSPACE(). */
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
-
-/* These should not be used directly. Use the Py_UNICODE_IS* and
-   Py_UNICODE_TO* macros instead.
-
-   These APIs are implemented in Objects/unicodectype.c.
-
-*/
-
-PyAPI_FUNC(int) _PyUnicode_IsLowercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsUppercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsTitlecase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsXidStart(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsXidContinue(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsWhitespace(
-    const Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsLinebreak(
-    const Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(Py_UCS4) _PyUnicode_ToLowercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(Py_UCS4) _PyUnicode_ToUppercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(Py_UCS4) _PyUnicode_ToTitlecase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToLowerFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToTitleFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToUpperFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToFoldedFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsCaseIgnorable(
-    Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsCased(
-    Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(double) _PyUnicode_ToNumeric(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsNumeric(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsPrintable(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsAlpha(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(size_t) Py_UNICODE_strlen(
-    const Py_UNICODE *u
-    );
-
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcpy(
-    Py_UNICODE *s1,
-    const Py_UNICODE *s2);
-
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcat(
-    Py_UNICODE *s1, const Py_UNICODE *s2);
-
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strncpy(
-    Py_UNICODE *s1,
-    const Py_UNICODE *s2,
-    size_t n);
-
-PyAPI_FUNC(int) Py_UNICODE_strcmp(
-    const Py_UNICODE *s1,
-    const Py_UNICODE *s2
-    );
-
-PyAPI_FUNC(int) Py_UNICODE_strncmp(
-    const Py_UNICODE *s1,
-    const Py_UNICODE *s2,
-    size_t n
-    );
-
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strchr(
-    const Py_UNICODE *s,
-    Py_UNICODE c
-    );
-
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strrchr(
-    const Py_UNICODE *s,
-    Py_UNICODE c
-    );
-
-PyAPI_FUNC(PyObject*) _PyUnicode_FormatLong(PyObject *, int, int, int);
-
-/* Create a copy of a unicode string ending with a nul character. Return NULL
-   and raise a MemoryError exception on memory allocation failure, otherwise
-   return a new allocated buffer (use PyMem_Free() to free the buffer). */
-
-PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy(
-    PyObject *unicode
-    );
-#endif /* Py_LIMITED_API */
-
-#if defined(Py_DEBUG) && !defined(Py_LIMITED_API)
-PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
-    PyObject *op,
-    int check_content);
-#elif !defined(NDEBUG)
-/* For asserts that call _PyUnicode_CheckConsistency(), which would
- * otherwise be a problem when building with asserts but without Py_DEBUG. */
-#define _PyUnicode_CheckConsistency(op, check_content) PyUnicode_Check(op)
-#endif
-
-#ifndef Py_LIMITED_API
-/* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/
-PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*);
-/* Clear all static strings. */
-PyAPI_FUNC(void) _PyUnicode_ClearStaticStrings(void);
-
-/* Fast equality check when the inputs are known to be exact unicode types
-   and where the hash values are equal (i.e. a very probable match) */
-PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_UNICODEOBJECT_H */
diff --git a/dependencies2013/win32/include/python/warnings.h b/dependencies2013/win32/include/python/warnings.h
deleted file mode 100644
index a3f83ff6..00000000
--- a/dependencies2013/win32/include/python/warnings.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef Py_WARNINGS_H
-#define Py_WARNINGS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyWarnings_Init(void);
-#endif
-
-PyAPI_FUNC(int) PyErr_WarnEx(
-    PyObject *category,
-    const char *message,        /* UTF-8 encoded string */
-    Py_ssize_t stack_level);
-PyAPI_FUNC(int) PyErr_WarnFormat(
-    PyObject *category,
-    Py_ssize_t stack_level,
-    const char *format,         /* ASCII-encoded string  */
-    ...);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-/* Emit a ResourceWarning warning */
-PyAPI_FUNC(int) PyErr_ResourceWarning(
-    PyObject *source,
-    Py_ssize_t stack_level,
-    const char *format,         /* ASCII-encoded string  */
-    ...);
-#endif
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyErr_WarnExplicitObject(
-    PyObject *category,
-    PyObject *message,
-    PyObject *filename,
-    int lineno,
-    PyObject *module,
-    PyObject *registry);
-#endif
-PyAPI_FUNC(int) PyErr_WarnExplicit(
-    PyObject *category,
-    const char *message,        /* UTF-8 encoded string */
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno,
-    const char *module,         /* UTF-8 encoded string */
-    PyObject *registry);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int)
-PyErr_WarnExplicitFormat(PyObject *category,
-                         const char *filename, int lineno,
-                         const char *module, PyObject *registry,
-                         const char *format, ...);
-#endif
-
-/* DEPRECATED: Use PyErr_WarnEx() instead. */
-#ifndef Py_LIMITED_API
-#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_WARNINGS_H */
-
diff --git a/dependencies2013/win32/include/python/weakrefobject.h b/dependencies2013/win32/include/python/weakrefobject.h
deleted file mode 100644
index 17051568..00000000
--- a/dependencies2013/win32/include/python/weakrefobject.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Weak references objects for Python. */
-
-#ifndef Py_WEAKREFOBJECT_H
-#define Py_WEAKREFOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct _PyWeakReference PyWeakReference;
-
-/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType,
- * and CallableProxyType.
- */
-#ifndef Py_LIMITED_API
-struct _PyWeakReference {
-    PyObject_HEAD
-
-    /* The object to which this is a weak reference, or Py_None if none.
-     * Note that this is a stealth reference:  wr_object's refcount is
-     * not incremented to reflect this pointer.
-     */
-    PyObject *wr_object;
-
-    /* A callable to invoke when wr_object dies, or NULL if none. */
-    PyObject *wr_callback;
-
-    /* A cache for wr_object's hash code.  As usual for hashes, this is -1
-     * if the hash code isn't known yet.
-     */
-    Py_hash_t hash;
-
-    /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL-
-     * terminated list of weak references to it.  These are the list pointers.
-     * If wr_object goes away, wr_object is set to Py_None, and these pointers
-     * have no meaning then.
-     */
-    PyWeakReference *wr_prev;
-    PyWeakReference *wr_next;
-};
-#endif
-
-PyAPI_DATA(PyTypeObject) _PyWeakref_RefType;
-PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType;
-PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType;
-
-#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType)
-#define PyWeakref_CheckRefExact(op) \
-        (Py_TYPE(op) == &_PyWeakref_RefType)
-#define PyWeakref_CheckProxy(op) \
-        ((Py_TYPE(op) == &_PyWeakref_ProxyType) || \
-         (Py_TYPE(op) == &_PyWeakref_CallableProxyType))
-
-#define PyWeakref_Check(op) \
-        (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op))
-
-
-PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob,
-                                              PyObject *callback);
-PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob,
-                                                PyObject *callback);
-PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head);
-
-PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self);
-#endif
-
-/* Explanation for the Py_REFCNT() check: when a weakref's target is part
-   of a long chain of deallocations which triggers the trashcan mechanism,
-   clearing the weakrefs can be delayed long after the target's refcount
-   has dropped to zero.  In the meantime, code accessing the weakref will
-   be able to "see" the target object even though it is supposed to be
-   unreachable.  See issue #16602. */
-
-#define PyWeakref_GET_OBJECT(ref)                           \
-    (Py_REFCNT(((PyWeakReference *)(ref))->wr_object) > 0   \
-     ? ((PyWeakReference *)(ref))->wr_object                \
-     : Py_None)
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_WEAKREFOBJECT_H */
diff --git a/dependencies2013/win32/include/speex/speex_buffer.h b/dependencies2013/win32/include/speex/speex_buffer.h
deleted file mode 100644
index 9e85cfcf..00000000
--- a/dependencies2013/win32/include/speex/speex_buffer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 2007 Jean-Marc Valin
-
-   File: speex_buffer.h
-   This is a very simple ring buffer implementation. It is not thread-safe
-   so you need to do your own locking.
-
-   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 name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 SPEEX_BUFFER_H
-#define SPEEX_BUFFER_H
-
-#include "speexdsp_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct SpeexBuffer_;
-typedef struct SpeexBuffer_ SpeexBuffer;
-
-SpeexBuffer *speex_buffer_init(int size);
-
-void speex_buffer_destroy(SpeexBuffer *st);
-
-int speex_buffer_write(SpeexBuffer *st, void *data, int len);
-
-int speex_buffer_writezeros(SpeexBuffer *st, int len);
-
-int speex_buffer_read(SpeexBuffer *st, void *data, int len);
-
-int speex_buffer_get_available(SpeexBuffer *st);
-
-int speex_buffer_resize(SpeexBuffer *st, int len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-
-
diff --git a/dependencies2013/win32/include/speex/speex_echo.h b/dependencies2013/win32/include/speex/speex_echo.h
deleted file mode 100644
index 4c1aa5a5..00000000
--- a/dependencies2013/win32/include/speex/speex_echo.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright (C) Jean-Marc Valin */
-/**
-   @file speex_echo.h
-   @brief Echo cancellation
-*/
-/*
-   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 name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 SPEEX_ECHO_H
-#define SPEEX_ECHO_H
-/** @defgroup SpeexEchoState SpeexEchoState: Acoustic echo canceller
- *  This is the acoustic echo canceller module.
- *  @{
- */
-#include "speexdsp_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Obtain frame size used by the AEC */
-#define SPEEX_ECHO_GET_FRAME_SIZE 3
-
-/** Set sampling rate */
-#define SPEEX_ECHO_SET_SAMPLING_RATE 24
-/** Get sampling rate */
-#define SPEEX_ECHO_GET_SAMPLING_RATE 25
-
-/* Can't set window sizes */
-/** Get size of impulse response (int32) */
-#define SPEEX_ECHO_GET_IMPULSE_RESPONSE_SIZE 27
-
-/* Can't set window content */
-/** Get impulse response (int32[]) */
-#define SPEEX_ECHO_GET_IMPULSE_RESPONSE 29
-
-/** Internal echo canceller state. Should never be accessed directly. */
-struct SpeexEchoState_;
-
-/** @class SpeexEchoState
- * This holds the state of the echo canceller. You need one per channel.
-*/
-
-/** Internal echo canceller state. Should never be accessed directly. */
-typedef struct SpeexEchoState_ SpeexEchoState;
-
-/** Creates a new echo canceller state
- * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms)
- * @param filter_length Number of samples of echo to cancel (should generally correspond to 100-500 ms)
- * @return Newly-created echo canceller state
- */
-SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length);
-
-/** Creates a new multi-channel echo canceller state
- * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms)
- * @param filter_length Number of samples of echo to cancel (should generally correspond to 100-500 ms)
- * @param nb_mic Number of microphone channels
- * @param nb_speakers Number of speaker channels
- * @return Newly-created echo canceller state
- */
-SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_length, int nb_mic, int nb_speakers);
-
-/** Destroys an echo canceller state
- * @param st Echo canceller state
-*/
-void speex_echo_state_destroy(SpeexEchoState *st);
-
-/** Performs echo cancellation a frame, based on the audio sent to the speaker (no delay is added
- * to playback in this form)
- *
- * @param st Echo canceller state
- * @param rec Signal from the microphone (near end + far end echo)
- * @param play Signal played to the speaker (received from far end)
- * @param out Returns near-end signal with echo removed
- */
-void speex_echo_cancellation(SpeexEchoState *st, const spx_int16_t *rec, const spx_int16_t *play, spx_int16_t *out);
-
-/** Performs echo cancellation a frame (deprecated) */
-void speex_echo_cancel(SpeexEchoState *st, const spx_int16_t *rec, const spx_int16_t *play, spx_int16_t *out, spx_int32_t *Yout);
-
-/** Perform echo cancellation using internal playback buffer, which is delayed by two frames
- * to account for the delay introduced by most soundcards (but it could be off!)
- * @param st Echo canceller state
- * @param rec Signal from the microphone (near end + far end echo)
- * @param out Returns near-end signal with echo removed
-*/
-void speex_echo_capture(SpeexEchoState *st, const spx_int16_t *rec, spx_int16_t *out);
-
-/** Let the echo canceller know that a frame was just queued to the soundcard
- * @param st Echo canceller state
- * @param play Signal played to the speaker (received from far end)
-*/
-void speex_echo_playback(SpeexEchoState *st, const spx_int16_t *play);
-
-/** Reset the echo canceller to its original state
- * @param st Echo canceller state
- */
-void speex_echo_state_reset(SpeexEchoState *st);
-
-/** Used like the ioctl function to control the echo canceller parameters
- *
- * @param st Echo canceller state
- * @param request ioctl-type request (one of the SPEEX_ECHO_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown
- */
-int speex_echo_ctl(SpeexEchoState *st, int request, void *ptr);
-
-
-
-struct SpeexDecorrState_;
-
-typedef struct SpeexDecorrState_ SpeexDecorrState;
-
-
-/** Create a state for the channel decorrelation algorithm
-    This is useful for multi-channel echo cancellation only
- * @param rate Sampling rate
- * @param channels Number of channels (it's a bit pointless if you don't have at least 2)
- * @param frame_size Size of the frame to process at ones (counting samples *per* channel)
-*/
-SpeexDecorrState *speex_decorrelate_new(int rate, int channels, int frame_size);
-
-/** Remove correlation between the channels by modifying the phase and possibly
-    adding noise in a way that is not (or little) perceptible.
- * @param st Decorrelator state
- * @param in Input audio in interleaved format
- * @param out Result of the decorrelation (out *may* alias in)
- * @param strength How much alteration of the audio to apply from 0 to 100.
-*/
-void speex_decorrelate(SpeexDecorrState *st, const spx_int16_t *in, spx_int16_t *out, int strength);
-
-/** Destroy a Decorrelation state
- * @param st State to destroy
-*/
-void speex_decorrelate_destroy(SpeexDecorrState *st);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-/** @}*/
-#endif
diff --git a/dependencies2013/win32/include/speex/speex_jitter.h b/dependencies2013/win32/include/speex/speex_jitter.h
deleted file mode 100644
index 8fc8d7ec..00000000
--- a/dependencies2013/win32/include/speex/speex_jitter.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
-/**
-   @file speex_jitter.h
-   @brief Adaptive jitter buffer for Speex
-*/
-/*
-   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 Xiph.org Foundation 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 FOUNDATION 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 SPEEX_JITTER_H
-#define SPEEX_JITTER_H
-/** @defgroup JitterBuffer JitterBuffer: Adaptive jitter buffer
- *  This is the jitter buffer that reorders UDP/RTP packets and adjusts the buffer size
- * to maintain good quality and low latency.
- *  @{
- */
-
-#include "speexdsp_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Generic adaptive jitter buffer state */
-struct JitterBuffer_;
-
-/** Generic adaptive jitter buffer state */
-typedef struct JitterBuffer_ JitterBuffer;
-
-/** Definition of an incoming packet */
-typedef struct _JitterBufferPacket JitterBufferPacket;
-
-/** Definition of an incoming packet */
-struct _JitterBufferPacket {
-   char        *data;       /**< Data bytes contained in the packet */
-   spx_uint32_t len;        /**< Length of the packet in bytes */
-   spx_uint32_t timestamp;  /**< Timestamp for the packet */
-   spx_uint32_t span;       /**< Time covered by the packet (same units as timestamp) */
-   spx_uint16_t sequence;   /**< RTP Sequence number if available (0 otherwise) */
-   spx_uint32_t user_data;  /**< Put whatever data you like here (it's ignored by the jitter buffer) */
-};
-
-/** Packet has been retrieved */
-#define JITTER_BUFFER_OK 0
-/** Packet is lost or is late */
-#define JITTER_BUFFER_MISSING 1
-/** A "fake" packet is meant to be inserted here to increase buffering */
-#define JITTER_BUFFER_INSERTION 2
-/** There was an error in the jitter buffer */
-#define JITTER_BUFFER_INTERNAL_ERROR -1
-/** Invalid argument */
-#define JITTER_BUFFER_BAD_ARGUMENT -2
-
-
-/** Set minimum amount of extra buffering required (margin) */
-#define JITTER_BUFFER_SET_MARGIN 0
-/** Get minimum amount of extra buffering required (margin) */
-#define JITTER_BUFFER_GET_MARGIN 1
-/* JITTER_BUFFER_SET_AVAILABLE_COUNT wouldn't make sense */
-
-/** Get the amount of available packets currently buffered */
-#define JITTER_BUFFER_GET_AVAILABLE_COUNT 3
-/** Included because of an early misspelling (will remove in next release) */
-#define JITTER_BUFFER_GET_AVALIABLE_COUNT 3
-
-/** Assign a function to destroy unused packet. When setting that, the jitter
-    buffer no longer copies packet data. */
-#define JITTER_BUFFER_SET_DESTROY_CALLBACK 4
-/**  */
-#define JITTER_BUFFER_GET_DESTROY_CALLBACK 5
-
-/** Tell the jitter buffer to only adjust the delay in multiples of the step parameter provided */
-#define JITTER_BUFFER_SET_DELAY_STEP 6
-/**  */
-#define JITTER_BUFFER_GET_DELAY_STEP 7
-
-/** Tell the jitter buffer to only do concealment in multiples of the size parameter provided */
-#define JITTER_BUFFER_SET_CONCEALMENT_SIZE 8
-#define JITTER_BUFFER_GET_CONCEALMENT_SIZE 9
-
-/** Absolute max amount of loss that can be tolerated regardless of the delay. Typical loss
-    should be half of that or less. */
-#define JITTER_BUFFER_SET_MAX_LATE_RATE 10
-#define JITTER_BUFFER_GET_MAX_LATE_RATE 11
-
-/** Equivalent cost of one percent late packet in timestamp units */
-#define JITTER_BUFFER_SET_LATE_COST 12
-#define JITTER_BUFFER_GET_LATE_COST 13
-
-
-/** Initialises jitter buffer
- *
- * @param step_size Starting value for the size of concleanment packets and delay
-       adjustment steps. Can be changed at any time using JITTER_BUFFER_SET_DELAY_STEP
-       and JITTER_BUFFER_GET_CONCEALMENT_SIZE.
- * @return Newly created jitter buffer state
- */
-JitterBuffer *jitter_buffer_init(int step_size);
-
-/** Restores jitter buffer to its original state
- *
- * @param jitter Jitter buffer state
- */
-void jitter_buffer_reset(JitterBuffer *jitter);
-
-/** Destroys jitter buffer
- *
- * @param jitter Jitter buffer state
- */
-void jitter_buffer_destroy(JitterBuffer *jitter);
-
-/** Put one packet into the jitter buffer
- *
- * @param jitter Jitter buffer state
- * @param packet Incoming packet
-*/
-void jitter_buffer_put(JitterBuffer *jitter, const JitterBufferPacket *packet);
-
-/** Get one packet from the jitter buffer
- *
- * @param jitter Jitter buffer state
- * @param packet Returned packet
- * @param desired_span Number of samples (or units) we wish to get from the buffer (no guarantee)
- * @param current_timestamp Timestamp for the returned packet
-*/
-int jitter_buffer_get(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t desired_span, spx_int32_t *start_offset);
-
-/** Used right after jitter_buffer_get() to obtain another packet that would have the same timestamp.
- * This is mainly useful for media where a single "frame" can be split into several packets.
- *
- * @param jitter Jitter buffer state
- * @param packet Returned packet
- */
-int jitter_buffer_get_another(JitterBuffer *jitter, JitterBufferPacket *packet);
-
-/** Get pointer timestamp of jitter buffer
- *
- * @param jitter Jitter buffer state
-*/
-int jitter_buffer_get_pointer_timestamp(JitterBuffer *jitter);
-
-/** Advance by one tick
- *
- * @param jitter Jitter buffer state
-*/
-void jitter_buffer_tick(JitterBuffer *jitter);
-
-/** Telling the jitter buffer about the remaining data in the application buffer
- * @param jitter Jitter buffer state
- * @param rem Amount of data buffered by the application (timestamp units)
- */
-void jitter_buffer_remaining_span(JitterBuffer *jitter, spx_uint32_t rem);
-
-/** Used like the ioctl function to control the jitter buffer parameters
- *
- * @param jitter Jitter buffer state
- * @param request ioctl-type request (one of the JITTER_BUFFER_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown
-*/
-int jitter_buffer_ctl(JitterBuffer *jitter, int request, void *ptr);
-
-int jitter_buffer_update_delay(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t *start_offset);
-
-/* @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/speex/speex_preprocess.h b/dependencies2013/win32/include/speex/speex_preprocess.h
deleted file mode 100644
index a2e1210d..00000000
--- a/dependencies2013/win32/include/speex/speex_preprocess.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright (C) 2003 Epic Games
-   Written by Jean-Marc Valin */
-/**
- *  @file speex_preprocess.h
- *  @brief Speex preprocessor. The preprocess can do noise suppression,
- * residual echo suppression (after using the echo canceller), automatic
- * gain control (AGC) and voice activity detection (VAD).
-*/
-/*
-   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 name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 SPEEX_PREPROCESS_H
-#define SPEEX_PREPROCESS_H
-/** @defgroup SpeexPreprocessState SpeexPreprocessState: The Speex preprocessor
- *  This is the Speex preprocessor. The preprocess can do noise suppression,
- * residual echo suppression (after using the echo canceller), automatic
- * gain control (AGC) and voice activity detection (VAD).
- *  @{
- */
-
-#include "speexdsp_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** State of the preprocessor (one per channel). Should never be accessed directly. */
-struct SpeexPreprocessState_;
-
-/** State of the preprocessor (one per channel). Should never be accessed directly. */
-typedef struct SpeexPreprocessState_ SpeexPreprocessState;
-
-
-/** Creates a new preprocessing state. You MUST create one state per channel processed.
- * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms). Must be
- * the same value as that used for the echo canceller for residual echo cancellation to work.
- * @param sampling_rate Sampling rate used for the input.
- * @return Newly created preprocessor state
-*/
-SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampling_rate);
-
-/** Destroys a preprocessor state
- * @param st Preprocessor state to destroy
-*/
-void speex_preprocess_state_destroy(SpeexPreprocessState *st);
-
-/** Preprocess a frame
- * @param st Preprocessor state
- * @param x Audio sample vector (in and out). Must be same size as specified in speex_preprocess_state_init().
- * @return Bool value for voice activity (1 for speech, 0 for noise/silence), ONLY if VAD turned on.
-*/
-int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x);
-
-/** Preprocess a frame (deprecated, use speex_preprocess_run() instead)*/
-int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, spx_int32_t *echo);
-
-/** Update preprocessor state, but do not compute the output
- * @param st Preprocessor state
- * @param x Audio sample vector (in only). Must be same size as specified in speex_preprocess_state_init().
-*/
-void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t *x);
-
-/** Used like the ioctl function to control the preprocessor parameters
- * @param st Preprocessor state
- * @param request ioctl-type request (one of the SPEEX_PREPROCESS_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown
-*/
-int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr);
-
-
-
-/** Set preprocessor denoiser state */
-#define SPEEX_PREPROCESS_SET_DENOISE 0
-/** Get preprocessor denoiser state */
-#define SPEEX_PREPROCESS_GET_DENOISE 1
-
-/** Set preprocessor Automatic Gain Control state */
-#define SPEEX_PREPROCESS_SET_AGC 2
-/** Get preprocessor Automatic Gain Control state */
-#define SPEEX_PREPROCESS_GET_AGC 3
-
-/** Set preprocessor Voice Activity Detection state */
-#define SPEEX_PREPROCESS_SET_VAD 4
-/** Get preprocessor Voice Activity Detection state */
-#define SPEEX_PREPROCESS_GET_VAD 5
-
-/** Set preprocessor Automatic Gain Control level (float) */
-#define SPEEX_PREPROCESS_SET_AGC_LEVEL 6
-/** Get preprocessor Automatic Gain Control level (float) */
-#define SPEEX_PREPROCESS_GET_AGC_LEVEL 7
-
-/** Set preprocessor dereverb state */
-#define SPEEX_PREPROCESS_SET_DEREVERB 8
-/** Get preprocessor dereverb state */
-#define SPEEX_PREPROCESS_GET_DEREVERB 9
-
-/** Set preprocessor dereverb level */
-#define SPEEX_PREPROCESS_SET_DEREVERB_LEVEL 10
-/** Get preprocessor dereverb level */
-#define SPEEX_PREPROCESS_GET_DEREVERB_LEVEL 11
-
-/** Set preprocessor dereverb decay */
-#define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12
-/** Get preprocessor dereverb decay */
-#define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13
-
-/** Set probability required for the VAD to go from silence to voice */
-#define SPEEX_PREPROCESS_SET_PROB_START 14
-/** Get probability required for the VAD to go from silence to voice */
-#define SPEEX_PREPROCESS_GET_PROB_START 15
-
-/** Set probability required for the VAD to stay in the voice state (integer percent) */
-#define SPEEX_PREPROCESS_SET_PROB_CONTINUE 16
-/** Get probability required for the VAD to stay in the voice state (integer percent) */
-#define SPEEX_PREPROCESS_GET_PROB_CONTINUE 17
-
-/** Set maximum attenuation of the noise in dB (negative number) */
-#define SPEEX_PREPROCESS_SET_NOISE_SUPPRESS 18
-/** Get maximum attenuation of the noise in dB (negative number) */
-#define SPEEX_PREPROCESS_GET_NOISE_SUPPRESS 19
-
-/** Set maximum attenuation of the residual echo in dB (negative number) */
-#define SPEEX_PREPROCESS_SET_ECHO_SUPPRESS 20
-/** Get maximum attenuation of the residual echo in dB (negative number) */
-#define SPEEX_PREPROCESS_GET_ECHO_SUPPRESS 21
-
-/** Set maximum attenuation of the residual echo in dB when near end is active (negative number) */
-#define SPEEX_PREPROCESS_SET_ECHO_SUPPRESS_ACTIVE 22
-/** Get maximum attenuation of the residual echo in dB when near end is active (negative number) */
-#define SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE 23
-
-/** Set the corresponding echo canceller state so that residual echo suppression can be performed (NULL for no residual echo suppression) */
-#define SPEEX_PREPROCESS_SET_ECHO_STATE 24
-/** Get the corresponding echo canceller state */
-#define SPEEX_PREPROCESS_GET_ECHO_STATE 25
-
-/** Set maximal gain increase in dB/second (int32) */
-#define SPEEX_PREPROCESS_SET_AGC_INCREMENT 26
-
-/** Get maximal gain increase in dB/second (int32) */
-#define SPEEX_PREPROCESS_GET_AGC_INCREMENT 27
-
-/** Set maximal gain decrease in dB/second (int32) */
-#define SPEEX_PREPROCESS_SET_AGC_DECREMENT 28
-
-/** Get maximal gain decrease in dB/second (int32) */
-#define SPEEX_PREPROCESS_GET_AGC_DECREMENT 29
-
-/** Set maximal gain in dB (int32) */
-#define SPEEX_PREPROCESS_SET_AGC_MAX_GAIN 30
-
-/** Get maximal gain in dB (int32) */
-#define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31
-
-/*  Can't set loudness */
-/** Get loudness */
-#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 33
-
-/*  Can't set gain */
-/** Get current gain (int32 percent) */
-#define SPEEX_PREPROCESS_GET_AGC_GAIN 35
-
-/*  Can't set spectrum size */
-/** Get spectrum size for power spectrum (int32) */
-#define SPEEX_PREPROCESS_GET_PSD_SIZE 37
-
-/*  Can't set power spectrum */
-/** Get power spectrum (int32[] of squared values) */
-#define SPEEX_PREPROCESS_GET_PSD 39
-
-/*  Can't set noise size */
-/** Get spectrum size for noise estimate (int32)  */
-#define SPEEX_PREPROCESS_GET_NOISE_PSD_SIZE 41
-
-/*  Can't set noise estimate */
-/** Get noise estimate (int32[] of squared values) */
-#define SPEEX_PREPROCESS_GET_NOISE_PSD 43
-
-/* Can't set speech probability */
-/** Get speech probability in last frame (int32).  */
-#define SPEEX_PREPROCESS_GET_PROB 45
-
-/** Set preprocessor Automatic Gain Control level (int32) */
-#define SPEEX_PREPROCESS_SET_AGC_TARGET 46
-/** Get preprocessor Automatic Gain Control level (int32) */
-#define SPEEX_PREPROCESS_GET_AGC_TARGET 47
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @}*/
-#endif
diff --git a/dependencies2013/win32/include/speex/speex_resampler.h b/dependencies2013/win32/include/speex/speex_resampler.h
deleted file mode 100644
index 901de37b..00000000
--- a/dependencies2013/win32/include/speex/speex_resampler.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Copyright (C) 2007 Jean-Marc Valin
-
-   File: speex_resampler.h
-   Resampling code
-
-   The design goals of this code are:
-      - Very fast algorithm
-      - Low memory requirement
-      - Good *perceptual* quality (and not best SNR)
-
-   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 name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 SPEEX_RESAMPLER_H
-#define SPEEX_RESAMPLER_H
-
-#ifdef OUTSIDE_SPEEX
-
-/********* WARNING: MENTAL SANITY ENDS HERE *************/
-
-/* If the resampler is defined outside of Speex, we change the symbol names so that
-   there won't be any clash if linking with Speex later on. */
-
-/* #define RANDOM_PREFIX your software name here */
-#ifndef RANDOM_PREFIX
-#error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes"
-#endif
-
-#define CAT_PREFIX2(a,b) a ## b
-#define CAT_PREFIX(a,b) CAT_PREFIX2(a, b)
-
-#define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init)
-#define speex_resampler_init_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_init_frac)
-#define speex_resampler_destroy CAT_PREFIX(RANDOM_PREFIX,_resampler_destroy)
-#define speex_resampler_process_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_float)
-#define speex_resampler_process_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_int)
-#define speex_resampler_process_interleaved_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_float)
-#define speex_resampler_process_interleaved_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_int)
-#define speex_resampler_set_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate)
-#define speex_resampler_get_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_get_rate)
-#define speex_resampler_set_rate_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate_frac)
-#define speex_resampler_get_ratio CAT_PREFIX(RANDOM_PREFIX,_resampler_get_ratio)
-#define speex_resampler_set_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_set_quality)
-#define speex_resampler_get_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_get_quality)
-#define speex_resampler_set_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_input_stride)
-#define speex_resampler_get_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_stride)
-#define speex_resampler_set_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_output_stride)
-#define speex_resampler_get_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_stride)
-#define speex_resampler_get_input_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_latency)
-#define speex_resampler_get_output_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_latency)
-#define speex_resampler_skip_zeros CAT_PREFIX(RANDOM_PREFIX,_resampler_skip_zeros)
-#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
-#define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror)
-
-#define spx_int16_t short
-#define spx_int32_t int
-#define spx_uint16_t unsigned short
-#define spx_uint32_t unsigned int
-
-#define speex_assert(cond)
-
-#else /* OUTSIDE_SPEEX */
-
-#include "speexdsp_types.h"
-
-#endif /* OUTSIDE_SPEEX */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SPEEX_RESAMPLER_QUALITY_MAX 10
-#define SPEEX_RESAMPLER_QUALITY_MIN 0
-#define SPEEX_RESAMPLER_QUALITY_DEFAULT 4
-#define SPEEX_RESAMPLER_QUALITY_VOIP 3
-#define SPEEX_RESAMPLER_QUALITY_DESKTOP 5
-
-enum {
-   RESAMPLER_ERR_SUCCESS         = 0,
-   RESAMPLER_ERR_ALLOC_FAILED    = 1,
-   RESAMPLER_ERR_BAD_STATE       = 2,
-   RESAMPLER_ERR_INVALID_ARG     = 3,
-   RESAMPLER_ERR_PTR_OVERLAP     = 4,
-   RESAMPLER_ERR_OVERFLOW        = 5,
-
-   RESAMPLER_ERR_MAX_ERROR
-};
-
-struct SpeexResamplerState_;
-typedef struct SpeexResamplerState_ SpeexResamplerState;
-
-/** Create a new resampler with integer input and output rates.
- * @param nb_channels Number of channels to be processed
- * @param in_rate Input sampling rate (integer number of Hz).
- * @param out_rate Output sampling rate (integer number of Hz).
- * @param quality Resampling quality between 0 and 10, where 0 has poor quality
- * and 10 has very high quality.
- * @return Newly created resampler state
- * @retval NULL Error: not enough memory
- */
-SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels,
-                                          spx_uint32_t in_rate,
-                                          spx_uint32_t out_rate,
-                                          int quality,
-                                          int *err);
-
-/** Create a new resampler with fractional input/output rates. The sampling
- * rate ratio is an arbitrary rational number with both the numerator and
- * denominator being 32-bit integers.
- * @param nb_channels Number of channels to be processed
- * @param ratio_num Numerator of the sampling rate ratio
- * @param ratio_den Denominator of the sampling rate ratio
- * @param in_rate Input sampling rate rounded to the nearest integer (in Hz).
- * @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
- * @param quality Resampling quality between 0 and 10, where 0 has poor quality
- * and 10 has very high quality.
- * @return Newly created resampler state
- * @retval NULL Error: not enough memory
- */
-SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels,
-                                               spx_uint32_t ratio_num,
-                                               spx_uint32_t ratio_den,
-                                               spx_uint32_t in_rate,
-                                               spx_uint32_t out_rate,
-                                               int quality,
-                                               int *err);
-
-/** Destroy a resampler state.
- * @param st Resampler state
- */
-void speex_resampler_destroy(SpeexResamplerState *st);
-
-/** Resample a float array. The input and output buffers must *not* overlap.
- * @param st Resampler state
- * @param channel_index Index of the channel to process for the multi-channel
- * base (0 otherwise)
- * @param in Input buffer
- * @param in_len Number of input samples in the input buffer. Returns the
- * number of samples processed
- * @param out Output buffer
- * @param out_len Size of the output buffer. Returns the number of samples written
- */
-int speex_resampler_process_float(SpeexResamplerState *st,
-                                   spx_uint32_t channel_index,
-                                   const float *in,
-                                   spx_uint32_t *in_len,
-                                   float *out,
-                                   spx_uint32_t *out_len);
-
-/** Resample an int array. The input and output buffers must *not* overlap.
- * @param st Resampler state
- * @param channel_index Index of the channel to process for the multi-channel
- * base (0 otherwise)
- * @param in Input buffer
- * @param in_len Number of input samples in the input buffer. Returns the number
- * of samples processed
- * @param out Output buffer
- * @param out_len Size of the output buffer. Returns the number of samples written
- */
-int speex_resampler_process_int(SpeexResamplerState *st,
-                                 spx_uint32_t channel_index,
-                                 const spx_int16_t *in,
-                                 spx_uint32_t *in_len,
-                                 spx_int16_t *out,
-                                 spx_uint32_t *out_len);
-
-/** Resample an interleaved float array. The input and output buffers must *not* overlap.
- * @param st Resampler state
- * @param in Input buffer
- * @param in_len Number of input samples in the input buffer. Returns the number
- * of samples processed. This is all per-channel.
- * @param out Output buffer
- * @param out_len Size of the output buffer. Returns the number of samples written.
- * This is all per-channel.
- */
-int speex_resampler_process_interleaved_float(SpeexResamplerState *st,
-                                               const float *in,
-                                               spx_uint32_t *in_len,
-                                               float *out,
-                                               spx_uint32_t *out_len);
-
-/** Resample an interleaved int array. The input and output buffers must *not* overlap.
- * @param st Resampler state
- * @param in Input buffer
- * @param in_len Number of input samples in the input buffer. Returns the number
- * of samples processed. This is all per-channel.
- * @param out Output buffer
- * @param out_len Size of the output buffer. Returns the number of samples written.
- * This is all per-channel.
- */
-int speex_resampler_process_interleaved_int(SpeexResamplerState *st,
-                                             const spx_int16_t *in,
-                                             spx_uint32_t *in_len,
-                                             spx_int16_t *out,
-                                             spx_uint32_t *out_len);
-
-/** Set (change) the input/output sampling rates (integer value).
- * @param st Resampler state
- * @param in_rate Input sampling rate (integer number of Hz).
- * @param out_rate Output sampling rate (integer number of Hz).
- */
-int speex_resampler_set_rate(SpeexResamplerState *st,
-                              spx_uint32_t in_rate,
-                              spx_uint32_t out_rate);
-
-/** Get the current input/output sampling rates (integer value).
- * @param st Resampler state
- * @param in_rate Input sampling rate (integer number of Hz) copied.
- * @param out_rate Output sampling rate (integer number of Hz) copied.
- */
-void speex_resampler_get_rate(SpeexResamplerState *st,
-                              spx_uint32_t *in_rate,
-                              spx_uint32_t *out_rate);
-
-/** Set (change) the input/output sampling rates and resampling ratio
- * (fractional values in Hz supported).
- * @param st Resampler state
- * @param ratio_num Numerator of the sampling rate ratio
- * @param ratio_den Denominator of the sampling rate ratio
- * @param in_rate Input sampling rate rounded to the nearest integer (in Hz).
- * @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
- */
-int speex_resampler_set_rate_frac(SpeexResamplerState *st,
-                                   spx_uint32_t ratio_num,
-                                   spx_uint32_t ratio_den,
-                                   spx_uint32_t in_rate,
-                                   spx_uint32_t out_rate);
-
-/** Get the current resampling ratio. This will be reduced to the least
- * common denominator.
- * @param st Resampler state
- * @param ratio_num Numerator of the sampling rate ratio copied
- * @param ratio_den Denominator of the sampling rate ratio copied
- */
-void speex_resampler_get_ratio(SpeexResamplerState *st,
-                               spx_uint32_t *ratio_num,
-                               spx_uint32_t *ratio_den);
-
-/** Set (change) the conversion quality.
- * @param st Resampler state
- * @param quality Resampling quality between 0 and 10, where 0 has poor
- * quality and 10 has very high quality.
- */
-int speex_resampler_set_quality(SpeexResamplerState *st,
-                                 int quality);
-
-/** Get the conversion quality.
- * @param st Resampler state
- * @param quality Resampling quality between 0 and 10, where 0 has poor
- * quality and 10 has very high quality.
- */
-void speex_resampler_get_quality(SpeexResamplerState *st,
-                                 int *quality);
-
-/** Set (change) the input stride.
- * @param st Resampler state
- * @param stride Input stride
- */
-void speex_resampler_set_input_stride(SpeexResamplerState *st,
-                                      spx_uint32_t stride);
-
-/** Get the input stride.
- * @param st Resampler state
- * @param stride Input stride copied
- */
-void speex_resampler_get_input_stride(SpeexResamplerState *st,
-                                      spx_uint32_t *stride);
-
-/** Set (change) the output stride.
- * @param st Resampler state
- * @param stride Output stride
- */
-void speex_resampler_set_output_stride(SpeexResamplerState *st,
-                                      spx_uint32_t stride);
-
-/** Get the output stride.
- * @param st Resampler state copied
- * @param stride Output stride
- */
-void speex_resampler_get_output_stride(SpeexResamplerState *st,
-                                      spx_uint32_t *stride);
-
-/** Get the latency introduced by the resampler measured in input samples.
- * @param st Resampler state
- */
-int speex_resampler_get_input_latency(SpeexResamplerState *st);
-
-/** Get the latency introduced by the resampler measured in output samples.
- * @param st Resampler state
- */
-int speex_resampler_get_output_latency(SpeexResamplerState *st);
-
-/** Make sure that the first samples to go out of the resamplers don't have
- * leading zeros. This is only useful before starting to use a newly created
- * resampler. It is recommended to use that when resampling an audio file, as
- * it will generate a file with the same length. For real-time processing,
- * it is probably easier not to use this call (so that the output duration
- * is the same for the first frame).
- * @param st Resampler state
- */
-int speex_resampler_skip_zeros(SpeexResamplerState *st);
-
-/** Reset a resampler so a new (unrelated) stream can be processed.
- * @param st Resampler state
- */
-int speex_resampler_reset_mem(SpeexResamplerState *st);
-
-/** Returns the English meaning for an error code
- * @param err Error code
- * @return English string
- */
-const char *speex_resampler_strerror(int err);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/speex/speexdsp_types.h b/dependencies2013/win32/include/speex/speexdsp_types.h
deleted file mode 100644
index 4b4a76a4..00000000
--- a/dependencies2013/win32/include/speex/speexdsp_types.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* speexdsp_types.h taken from libogg */
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h 7524 2004-08-11 04:20:36Z conrad $
-
- ********************************************************************/
-/**
-   @file speexdsp_types.h
-   @brief Speex types
-*/
-#ifndef _SPEEX_TYPES_H
-#define _SPEEX_TYPES_H
-
-#if defined(_WIN32)
-
-#  if defined(__CYGWIN__)
-#    include <_G_config.h>
-     typedef _G_int32_t spx_int32_t;
-     typedef _G_uint32_t spx_uint32_t;
-     typedef _G_int16_t spx_int16_t;
-     typedef _G_uint16_t spx_uint16_t;
-#  elif defined(__MINGW32__)
-     typedef short spx_int16_t;
-     typedef unsigned short spx_uint16_t;
-     typedef int spx_int32_t;
-     typedef unsigned int spx_uint32_t;
-#  elif defined(__MWERKS__)
-     typedef int spx_int32_t;
-     typedef unsigned int spx_uint32_t;
-     typedef short spx_int16_t;
-     typedef unsigned short spx_uint16_t;
-#  else
-     /* MSVC/Borland */
-     typedef __int32 spx_int32_t;
-     typedef unsigned __int32 spx_uint32_t;
-     typedef __int16 spx_int16_t;
-     typedef unsigned __int16 spx_uint16_t;
-#  endif
-
-#elif defined(__MACOS__)
-
-#  include <sys/types.h>
-   typedef SInt16 spx_int16_t;
-   typedef UInt16 spx_uint16_t;
-   typedef SInt32 spx_int32_t;
-   typedef UInt32 spx_uint32_t;
-
-#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
-
-#  include <sys/types.h>
-   typedef int16_t spx_int16_t;
-   typedef u_int16_t spx_uint16_t;
-   typedef int32_t spx_int32_t;
-   typedef u_int32_t spx_uint32_t;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16_t spx_int16_t;
-   typedef u_int16_t spx_uint16_t;
-   typedef int32_t spx_int32_t;
-   typedef u_int32_t spx_uint32_t;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short spx_int16_t;
-   typedef unsigned short spx_uint16_t;
-   typedef int spx_int32_t;
-   typedef unsigned int spx_uint32_t;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short spx_int16_t;
-   typedef int spx_int32_t;
-   typedef unsigned int spx_uint32_t;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef int spx_int32_t;
-   typedef unsigned spx_uint32_t;
-   typedef short spx_int16_t;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short spx_int16_t;
-   typedef unsigned short spx_uint16_t;
-   typedef signed int spx_int32_t;
-   typedef unsigned int spx_uint32_t;
-
-#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
-
-   typedef short spx_int16_t;
-   typedef unsigned short spx_uint16_t;
-   typedef long spx_int32_t;
-   typedef unsigned long spx_uint32_t;
-
-#elif defined(CONFIG_TI_C6X)
-
-   typedef short spx_int16_t;
-   typedef unsigned short spx_uint16_t;
-   typedef int spx_int32_t;
-   typedef unsigned int spx_uint32_t;
-
-#else
-
-#include "speexdsp_config_types.h"
-
-#endif
-
-#endif  /* _SPEEX_TYPES_H */
diff --git a/dependencies2013/win32/include/vorbis/codec.h b/dependencies2013/win32/include/vorbis/codec.h
deleted file mode 100644
index 42aa2913..00000000
--- a/dependencies2013/win32/include/vorbis/codec.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
-
- ********************************************************************
-
- function: libvorbis codec headers
-
- ********************************************************************/
-
-#ifndef _vorbis_codec_h_
-#define _vorbis_codec_h_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <ogg/ogg.h>
-
-typedef struct vorbis_info{
-  int version;
-  int channels;
-  long rate;
-
-  /* The below bitrate declarations are *hints*.
-     Combinations of the three values carry the following implications:
-
-     all three set to the same value:
-       implies a fixed rate bitstream
-     only nominal set:
-       implies a VBR stream that averages the nominal bitrate.  No hard
-       upper/lower limit
-     upper and or lower set:
-       implies a VBR bitstream that obeys the bitrate limits. nominal
-       may also be set to give a nominal rate.
-     none set:
-       the coder does not care to speculate.
-  */
-
-  long bitrate_upper;
-  long bitrate_nominal;
-  long bitrate_lower;
-  long bitrate_window;
-
-  void *codec_setup;
-} vorbis_info;
-
-/* vorbis_dsp_state buffers the current vorbis audio
-   analysis/synthesis state.  The DSP state belongs to a specific
-   logical bitstream ****************************************************/
-typedef struct vorbis_dsp_state{
-  int analysisp;
-  vorbis_info *vi;
-
-  float **pcm;
-  float **pcmret;
-  int      pcm_storage;
-  int      pcm_current;
-  int      pcm_returned;
-
-  int  preextrapolate;
-  int  eofflag;
-
-  long lW;
-  long W;
-  long nW;
-  long centerW;
-
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-
-  ogg_int64_t glue_bits;
-  ogg_int64_t time_bits;
-  ogg_int64_t floor_bits;
-  ogg_int64_t res_bits;
-
-  void       *backend_state;
-} vorbis_dsp_state;
-
-typedef struct vorbis_block{
-  /* necessary stream state for linking to the framing abstraction */
-  float  **pcm;       /* this is a pointer into local storage */
-  oggpack_buffer opb;
-
-  long  lW;
-  long  W;
-  long  nW;
-  int   pcmend;
-  int   mode;
-
-  int         eofflag;
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-  vorbis_dsp_state *vd; /* For read-only access of configuration */
-
-  /* local storage to avoid remallocing; it's up to the mapping to
-     structure it */
-  void               *localstore;
-  long                localtop;
-  long                localalloc;
-  long                totaluse;
-  struct alloc_chain *reap;
-
-  /* bitmetrics for the frame */
-  long glue_bits;
-  long time_bits;
-  long floor_bits;
-  long res_bits;
-
-  void *internal;
-
-} vorbis_block;
-
-/* vorbis_block is a single block of data to be processed as part of
-the analysis/synthesis stream; it belongs to a specific logical
-bitstream, but is independent from other vorbis_blocks belonging to
-that logical bitstream. *************************************************/
-
-struct alloc_chain{
-  void *ptr;
-  struct alloc_chain *next;
-};
-
-/* vorbis_info contains all the setup information specific to the
-   specific compression/decompression mode in progress (eg,
-   psychoacoustic settings, channel setup, options, codebook
-   etc). vorbis_info and substructures are in backends.h.
-*********************************************************************/
-
-/* the comments are not part of vorbis_info so that vorbis_info can be
-   static storage */
-typedef struct vorbis_comment{
-  /* unlimited user comment fields.  libvorbis writes 'libvorbis'
-     whatever vendor is set to in encode */
-  char **user_comments;
-  int   *comment_lengths;
-  int    comments;
-  char  *vendor;
-
-} vorbis_comment;
-
-
-/* libvorbis encodes in two abstraction layers; first we perform DSP
-   and produce a packet (see docs/analysis.txt).  The packet is then
-   coded into a framed OggSquish bitstream by the second layer (see
-   docs/framing.txt).  Decode is the reverse process; we sync/frame
-   the bitstream and extract individual packets, then decode the
-   packet back into PCM audio.
-
-   The extra framing/packetizing is used in streaming formats, such as
-   files.  Over the net (such as with UDP), the framing and
-   packetization aren't necessary as they're provided by the transport
-   and the streaming layer is not used */
-
-/* Vorbis PRIMITIVES: general ***************************************/
-
-extern void     vorbis_info_init(vorbis_info *vi);
-extern void     vorbis_info_clear(vorbis_info *vi);
-extern int      vorbis_info_blocksize(vorbis_info *vi,int zo);
-extern void     vorbis_comment_init(vorbis_comment *vc);
-extern void     vorbis_comment_add(vorbis_comment *vc, const char *comment);
-extern void     vorbis_comment_add_tag(vorbis_comment *vc,
-                                       const char *tag, const char *contents);
-extern char    *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count);
-extern int      vorbis_comment_query_count(vorbis_comment *vc, const char *tag);
-extern void     vorbis_comment_clear(vorbis_comment *vc);
-
-extern int      vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
-extern int      vorbis_block_clear(vorbis_block *vb);
-extern void     vorbis_dsp_clear(vorbis_dsp_state *v);
-extern double   vorbis_granule_time(vorbis_dsp_state *v,
-                                    ogg_int64_t granulepos);
-
-extern const char *vorbis_version_string(void);
-
-/* Vorbis PRIMITIVES: analysis/DSP layer ****************************/
-
-extern int      vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op);
-extern int      vorbis_analysis_headerout(vorbis_dsp_state *v,
-                                          vorbis_comment *vc,
-                                          ogg_packet *op,
-                                          ogg_packet *op_comm,
-                                          ogg_packet *op_code);
-extern float  **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_analysis(vorbis_block *vb,ogg_packet *op);
-
-extern int      vorbis_bitrate_addblock(vorbis_block *vb);
-extern int      vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,
-                                           ogg_packet *op);
-
-/* Vorbis PRIMITIVES: synthesis layer *******************************/
-extern int      vorbis_synthesis_idheader(ogg_packet *op);
-extern int      vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,
-                                          ogg_packet *op);
-
-extern int      vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_synthesis_restart(vorbis_dsp_state *v);
-extern int      vorbis_synthesis(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_read(vorbis_dsp_state *v,int samples);
-extern long     vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op);
-
-extern int      vorbis_synthesis_halfrate(vorbis_info *v,int flag);
-extern int      vorbis_synthesis_halfrate_p(vorbis_info *v);
-
-/* Vorbis ERRORS and return codes ***********************************/
-
-#define OV_FALSE      -1
-#define OV_EOF        -2
-#define OV_HOLE       -3
-
-#define OV_EREAD      -128
-#define OV_EFAULT     -129
-#define OV_EIMPL      -130
-#define OV_EINVAL     -131
-#define OV_ENOTVORBIS -132
-#define OV_EBADHEADER -133
-#define OV_EVERSION   -134
-#define OV_ENOTAUDIO  -135
-#define OV_EBADPACKET -136
-#define OV_EBADLINK   -137
-#define OV_ENOSEEK    -138
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/dependencies2013/win32/include/vorbis/vorbisenc.h b/dependencies2013/win32/include/vorbis/vorbisenc.h
deleted file mode 100644
index 55f3b4a6..00000000
--- a/dependencies2013/win32/include/vorbis/vorbisenc.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: vorbis encode-engine setup
-
- ********************************************************************/
-
-/** \file
- * Libvorbisenc is a convenient API for setting up an encoding
- * environment using libvorbis. Libvorbisenc encapsulates the
- * actions needed to set up the encoder properly.
- */
-
-#ifndef _OV_ENC_H_
-#define _OV_ENC_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include "codec.h"
-
-/**
- * This is the primary function within libvorbisenc for setting up managed
- * bitrate modes.
- *
- * Before this function is called, the \ref vorbis_info
- * struct should be initialized by using vorbis_info_init() from the libvorbis
- * API.  After encoding, vorbis_info_clear() should be called.
- *
- * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set
- * constraints for the encoded file.  This function uses these settings to
- * select the appropriate encoding mode and set it up.
- *
- * \param vi               Pointer to an initialized \ref vorbis_info struct.
- * \param channels         The number of channels to be encoded.
- * \param rate             The sampling rate of the source audio.
- * \param max_bitrate      Desired maximum bitrate (limit). -1 indicates unset.
- * \param nominal_bitrate  Desired average, or central, bitrate. -1 indicates unset.
- * \param min_bitrate      Desired minimum bitrate. -1 indicates unset.
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval 0          Success.
- * \retval OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL  Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL   Unimplemented mode; unable to comply with bitrate request.
- */
-extern int vorbis_encode_init(vorbis_info *vi,
-                              long channels,
-                              long rate,
-
-                              long max_bitrate,
-                              long nominal_bitrate,
-                              long min_bitrate);
-
-/**
- * This function performs step-one of a three-step bitrate-managed encode
- * setup.  It functions similarly to the one-step setup performed by \ref
- * vorbis_encode_init but allows an application to make further encode setup
- * tweaks using \ref vorbis_encode_ctl before finally calling \ref
- * vorbis_encode_setup_init to complete the setup process.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API.  After
- * encoding, vorbis_info_clear() should be called.
- *
- * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set
- * constraints for the encoded file.  This function uses these settings to
- * select the appropriate encoding mode and set it up.
- *
- * \param vi                Pointer to an initialized vorbis_info struct.
- * \param channels          The number of channels to be encoded.
- * \param rate              The sampling rate of the source audio.
- * \param max_bitrate       Desired maximum bitrate (limit). -1 indicates unset.
- * \param nominal_bitrate   Desired average, or central, bitrate. -1 indicates unset.
- * \param min_bitrate       Desired minimum bitrate. -1 indicates unset.
- *
- * \return Zero for success, and negative for failure.
- *
- * \retval 0           Success
- * \retval OV_EFAULT   Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL   Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL    Unimplemented mode; unable to comply with bitrate request.
- */
-extern int vorbis_encode_setup_managed(vorbis_info *vi,
-                                       long channels,
-                                       long rate,
-
-                                       long max_bitrate,
-                                       long nominal_bitrate,
-                                       long min_bitrate);
-
-/**
- * This function performs step-one of a three-step variable bitrate
- * (quality-based) encode setup.  It functions similarly to the one-step setup
- * performed by \ref vorbis_encode_init_vbr() but allows an application to
- * make further encode setup tweaks using \ref vorbis_encode_ctl() before
- * finally calling \ref vorbis_encode_setup_init to complete the setup
- * process.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using \ref vorbis_info_init() from the libvorbis API.  After
- * encoding, vorbis_info_clear() should be called.
- *
- * \param vi        Pointer to an initialized vorbis_info struct.
- * \param channels  The number of channels to be encoded.
- * \param rate      The sampling rate of the source audio.
- * \param quality   Desired quality level, currently from -0.1 to 1.0 (lo to hi).
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval  0          Success
- * \retval  OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval  OV_EINVAL  Invalid setup request, eg, out of range argument.
- * \retval  OV_EIMPL   Unimplemented mode; unable to comply with quality level request.
- */
-extern int vorbis_encode_setup_vbr(vorbis_info *vi,
-                                  long channels,
-                                  long rate,
-
-                                  float quality
-                                  );
-
-/**
- * This is the primary function within libvorbisenc for setting up variable
- * bitrate ("quality" based) modes.
- *
- *
- * Before this function is called, the vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API. After
- * encoding, vorbis_info_clear() should be called.
- *
- * \param vi           Pointer to an initialized vorbis_info struct.
- * \param channels     The number of channels to be encoded.
- * \param rate         The sampling rate of the source audio.
- * \param base_quality Desired quality level, currently from -0.1 to 1.0 (lo to hi).
- *
- *
- * \return Zero for success, or a negative number for failure.
- *
- * \retval 0           Success
- * \retval OV_EFAULT   Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL   Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL    Unimplemented mode; unable to comply with quality level request.
- */
-extern int vorbis_encode_init_vbr(vorbis_info *vi,
-                                  long channels,
-                                  long rate,
-
-                                  float base_quality
-                                  );
-
-/**
- * This function performs the last stage of three-step encoding setup, as
- * described in the API overview under managed bitrate modes.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API, one of
- * \ref vorbis_encode_setup_managed() or \ref vorbis_encode_setup_vbr() called to
- * initialize the high-level encoding setup, and \ref vorbis_encode_ctl()
- * called if necessary to make encoding setup changes.
- * vorbis_encode_setup_init() finalizes the highlevel encoding structure into
- * a complete encoding setup after which the application may make no further
- * setup changes.
- *
- * After encoding, vorbis_info_clear() should be called.
- *
- * \param vi Pointer to an initialized \ref vorbis_info struct.
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval  0           Success.
- * \retval  OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- *
- * \retval OV_EINVAL   Attempt to use vorbis_encode_setup_init() without first
- * calling one of vorbis_encode_setup_managed() or vorbis_encode_setup_vbr() to
- * initialize the high-level encoding setup
- *
- */
-extern int vorbis_encode_setup_init(vorbis_info *vi);
-
-/**
- * This function implements a generic interface to miscellaneous encoder
- * settings similar to the classic UNIX 'ioctl()' system call.  Applications
- * may use vorbis_encode_ctl() to query or set bitrate management or quality
- * mode details by using one of several \e request arguments detailed below.
- * vorbis_encode_ctl() must be called after one of
- * vorbis_encode_setup_managed() or vorbis_encode_setup_vbr().  When used
- * to modify settings, \ref vorbis_encode_ctl() must be called before \ref
- * vorbis_encode_setup_init().
- *
- * \param vi      Pointer to an initialized vorbis_info struct.
- *
- * \param number Specifies the desired action; See \ref encctlcodes "the list
- * of available requests".
- *
- * \param arg void * pointing to a data structure matching the request
- * argument.
- *
- * \retval 0          Success. Any further return information (such as the result of a
- * query) is placed into the storage pointed to by *arg.
- *
- * \retval OV_EINVAL  Invalid argument, or an attempt to modify a setting after
- * calling vorbis_encode_setup_init().
- *
- * \retval OV_EIMPL   Unimplemented or unknown request
- */
-extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
-
-/**
- * \deprecated This is a deprecated interface. Please use vorbis_encode_ctl()
- * with the \ref ovectl_ratemanage2_arg struct and \ref
- * OV_ECTL_RATEMANAGE2_GET and \ref OV_ECTL_RATEMANAGE2_SET calls in new code.
- *
- * The \ref ovectl_ratemanage_arg structure is used with vorbis_encode_ctl()
- * and the \ref OV_ECTL_RATEMANAGE_GET, \ref OV_ECTL_RATEMANAGE_SET, \ref
- * OV_ECTL_RATEMANAGE_AVG, \ref OV_ECTL_RATEMANAGE_HARD calls in order to
- * query and modify specifics of the encoder's bitrate management
- * configuration.
-*/
-struct ovectl_ratemanage_arg {
-  int    management_active; /**< nonzero if bitrate management is active*/
-/** hard lower limit (in kilobits per second) below which the stream bitrate
-    will never be allowed for any given bitrate_hard_window seconds of time.*/
-  long   bitrate_hard_min;
-/** hard upper limit (in kilobits per second) above which the stream bitrate
-    will never be allowed for any given bitrate_hard_window seconds of time.*/
-  long   bitrate_hard_max;
-/** the window period (in seconds) used to regulate the hard bitrate minimum
-    and maximum*/
-  double bitrate_hard_window;
-/** soft lower limit (in kilobits per second) below which the average bitrate
-    tracker will start nudging the bitrate higher.*/
-  long   bitrate_av_lo;
-/** soft upper limit (in kilobits per second) above which the average bitrate
-    tracker will start nudging the bitrate lower.*/
-  long   bitrate_av_hi;
-/** the window period (in seconds) used to regulate the average bitrate
-    minimum and maximum.*/
-  double bitrate_av_window;
-/** Regulates the relative centering of the average and hard windows; in
-    libvorbis 1.0 and 1.0.1, the hard window regulation overlapped but
-    followed the average window regulation. In libvorbis 1.1 a bit-reservoir
-    interface replaces the old windowing interface; the older windowing
-    interface is simulated and this field has no effect.*/
-  double bitrate_av_window_center;
-};
-
-/**
- * \name struct ovectl_ratemanage2_arg
- *
- * The ovectl_ratemanage2_arg structure is used with vorbis_encode_ctl() and
- * the OV_ECTL_RATEMANAGE2_GET and OV_ECTL_RATEMANAGE2_SET calls in order to
- * query and modify specifics of the encoder's bitrate management
- * configuration.
- *
-*/
-struct ovectl_ratemanage2_arg {
-  int    management_active; /**< nonzero if bitrate management is active */
-/** Lower allowed bitrate limit in kilobits per second */
-  long   bitrate_limit_min_kbps;
-/** Upper allowed bitrate limit in kilobits per second */
-  long   bitrate_limit_max_kbps;
-  long   bitrate_limit_reservoir_bits; /**<Size of the bitrate reservoir in bits */
-/** Regulates the bitrate reservoir's preferred fill level in a range from 0.0
- * to 1.0; 0.0 tries to bank bits to buffer against future bitrate spikes, 1.0
- * buffers against future sudden drops in instantaneous bitrate. Default is
- * 0.1
- */
-  double bitrate_limit_reservoir_bias;
-/** Average bitrate setting in kilobits per second */
-  long   bitrate_average_kbps;
-/** Slew rate limit setting for average bitrate adjustment; sets the minimum
- *  time in seconds the bitrate tracker may swing from one extreme to the
- *  other when boosting or damping average bitrate.
- */
-  double bitrate_average_damping;
-};
-
-
-/**
- * \name vorbis_encode_ctl() codes
- *
- * \anchor encctlcodes
- *
- * These values are passed as the \c number parameter of vorbis_encode_ctl().
- * The type of the referent of that function's \c arg pointer depends on these
- * codes.
- */
-/*@{*/
-
-/**
- * Query the current encoder bitrate management setting.
- *
- *Argument: <tt>struct ovectl_ratemanage2_arg *</tt>
- *
- * Used to query the current encoder bitrate management setting. Also used to
- * initialize fields of an ovectl_ratemanage2_arg structure for use with
- * \ref OV_ECTL_RATEMANAGE2_SET.
- */
-#define OV_ECTL_RATEMANAGE2_GET      0x14
-
-/**
- * Set the current encoder bitrate management settings.
- *
- * Argument: <tt>struct ovectl_ratemanage2_arg *</tt>
- *
- * Used to set the current encoder bitrate management settings to the values
- * listed in the ovectl_ratemanage2_arg. Passing a NULL pointer will disable
- * bitrate management.
-*/
-#define OV_ECTL_RATEMANAGE2_SET      0x15
-
-/**
- * Returns the current encoder hard-lowpass setting (kHz) in the double
- * pointed to by arg.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_LOWPASS_GET          0x20
-
-/**
- *  Sets the encoder hard-lowpass to the value (kHz) pointed to by arg. Valid
- *  lowpass settings range from 2 to 99.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_LOWPASS_SET          0x21
-
-/**
- *  Returns the current encoder impulse block setting in the double pointed
- *  to by arg.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_IBLOCK_GET           0x30
-
-/**
- *  Sets the impulse block bias to the the value pointed to by arg.
- *
- * Argument: <tt>double *</tt>
- *
- *  Valid range is -15.0 to 0.0 [default]. A negative impulse block bias will
- *  direct to encoder to use more bits when incoding short blocks that contain
- *  strong impulses, thus improving the accuracy of impulse encoding.
- */
-#define OV_ECTL_IBLOCK_SET           0x31
-
-/**
- *  Returns the current encoder coupling setting in the int pointed
- *  to by arg.
- *
- * Argument: <tt>int *</tt>
-*/
-#define OV_ECTL_COUPLING_GET         0x40
-
-/**
- *  Enables/disables channel coupling in multichannel encoding according to arg.
- *
- * Argument: <tt>int *</tt>
- *
- *  Zero disables channel coupling for multichannel inputs, nonzer enables
- *  channel coupling.  Setting has no effect on monophonic encoding or
- *  multichannel counts that do not offer coupling.  At present, coupling is
- *  available for stereo and 5.1 encoding.
- */
-#define OV_ECTL_COUPLING_SET         0x41
-
-  /* deprecated rate management supported only for compatibility */
-
-/**
- * Old interface to querying bitrate management settings.
- *
- * Deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
-
- * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_GET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_GET       0x10
-/**
- * Old interface to modifying bitrate management settings.
- *
- *  deprecated after move to bit-reservoir style management in 1.1 rendered
- *  this interface partially obsolete.
- *
- * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_SET       0x11
-/**
- * Old interface to setting average-bitrate encoding mode.
- *
- * Deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
- *
- *  \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_AVG       0x12
-/**
- * Old interface to setting bounded-bitrate encoding modes.
- *
- * deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
- *
- *  \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_HARD      0x13
-
-/*@}*/
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/dependencies2013/win32/include/vorbis/vorbisfile.h b/dependencies2013/win32/include/vorbis/vorbisfile.h
deleted file mode 100644
index 56626119..00000000
--- a/dependencies2013/win32/include/vorbis/vorbisfile.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: stdio-based convenience library for opening/seeking/decoding
-
- ********************************************************************/
-
-#ifndef _OV_FILE_H_
-#define _OV_FILE_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <stdio.h>
-#include "codec.h"
-
-/* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell.
- * The one difference is that the FILE * arguments have been replaced with
- * a void * - this is to be used as a pointer to whatever internal data these
- * functions might need. In the stdio case, it's just a FILE * cast to a void *
- *
- * If you use other functions, check the docs for these functions and return
- * the right values. For seek_func(), you *MUST* return -1 if the stream is
- * unseekable
- */
-typedef struct {
-  size_t (*read_func)  (void *ptr, size_t size, size_t nmemb, void *datasource);
-  int    (*seek_func)  (void *datasource, ogg_int64_t offset, int whence);
-  int    (*close_func) (void *datasource);
-  long   (*tell_func)  (void *datasource);
-} ov_callbacks;
-
-#ifndef OV_EXCLUDE_STATIC_CALLBACKS
-
-/* a few sets of convenient callbacks, especially for use under
- * Windows where ov_open_callbacks() should always be used instead of
- * ov_open() to avoid problems with incompatible crt.o version linking
- * issues. */
-
-static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){
-  if(f==NULL)return(-1);
-
-#ifdef __MINGW32__
-  return fseeko64(f,off,whence);
-#elif defined (_WIN32)
-  return _fseeki64(f,off,whence);
-#else
-  return fseek(f,off,whence);
-#endif
-}
-
-/* These structs below (OV_CALLBACKS_DEFAULT etc) are defined here as
- * static data. That means that every file which includes this header
- * will get its own copy of these structs whether it uses them or
- * not unless it #defines OV_EXCLUDE_STATIC_CALLBACKS.
- * These static symbols are essential on platforms such as Windows on
- * which several different versions of stdio support may be linked to
- * by different DLLs, and we need to be certain we know which one
- * we're using (the same one as the main application).
- */
-
-static ov_callbacks OV_CALLBACKS_DEFAULT = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            NULL
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            NULL
-};
-
-#endif
-
-#define  NOTOPEN   0
-#define  PARTOPEN  1
-#define  OPENED    2
-#define  STREAMSET 3
-#define  INITSET   4
-
-typedef struct OggVorbis_File {
-  void            *datasource; /* Pointer to a FILE *, etc. */
-  int              seekable;
-  ogg_int64_t      offset;
-  ogg_int64_t      end;
-  ogg_sync_state   oy;
-
-  /* If the FILE handle isn't seekable (eg, a pipe), only the current
-     stream appears */
-  int              links;
-  ogg_int64_t     *offsets;
-  ogg_int64_t     *dataoffsets;
-  long            *serialnos;
-  ogg_int64_t     *pcmlengths; /* overloaded to maintain binary
-                                  compatibility; x2 size, stores both
-                                  beginning and end values */
-  vorbis_info     *vi;
-  vorbis_comment  *vc;
-
-  /* Decoding working state local storage */
-  ogg_int64_t      pcm_offset;
-  int              ready_state;
-  long             current_serialno;
-  int              current_link;
-
-  double           bittrack;
-  double           samptrack;
-
-  ogg_stream_state os; /* take physical pages, weld into a logical
-                          stream of packets */
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-
-  ov_callbacks callbacks;
-
-} OggVorbis_File;
-
-
-extern int ov_clear(OggVorbis_File *vf);
-extern int ov_fopen(const char *path,OggVorbis_File *vf);
-extern int ov_open(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes);
-extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf,
-                const char *initial, long ibytes, ov_callbacks callbacks);
-
-extern int ov_test(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes);
-extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf,
-                const char *initial, long ibytes, ov_callbacks callbacks);
-extern int ov_test_open(OggVorbis_File *vf);
-
-extern long ov_bitrate(OggVorbis_File *vf,int i);
-extern long ov_bitrate_instant(OggVorbis_File *vf);
-extern long ov_streams(OggVorbis_File *vf);
-extern long ov_seekable(OggVorbis_File *vf);
-extern long ov_serialnumber(OggVorbis_File *vf,int i);
-
-extern ogg_int64_t ov_raw_total(OggVorbis_File *vf,int i);
-extern ogg_int64_t ov_pcm_total(OggVorbis_File *vf,int i);
-extern double ov_time_total(OggVorbis_File *vf,int i);
-
-extern int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page(OggVorbis_File *vf,double pos);
-
-extern int ov_raw_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek_lap(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page_lap(OggVorbis_File *vf,double pos);
-
-extern ogg_int64_t ov_raw_tell(OggVorbis_File *vf);
-extern ogg_int64_t ov_pcm_tell(OggVorbis_File *vf);
-extern double ov_time_tell(OggVorbis_File *vf);
-
-extern vorbis_info *ov_info(OggVorbis_File *vf,int link);
-extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link);
-
-extern long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int samples,
-                          int *bitstream);
-extern long ov_read_filter(OggVorbis_File *vf,char *buffer,int length,
-                          int bigendianp,int word,int sgned,int *bitstream,
-                          void (*filter)(float **pcm,long channels,long samples,void *filter_param),void *filter_param);
-extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
-                    int bigendianp,int word,int sgned,int *bitstream);
-extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2);
-
-extern int ov_halfrate(OggVorbis_File *vf,int flag);
-extern int ov_halfrate_p(OggVorbis_File *vf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/dependencies2013/win32/include/vpx/vp8.h b/dependencies2013/win32/include/vpx/vp8.h
deleted file mode 100644
index 059c9d0f..00000000
--- a/dependencies2013/win32/include/vpx/vp8.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*!\defgroup vp8 VP8
- * \ingroup codecs
- * VP8 is vpx's newest video compression algorithm that uses motion
- * compensated prediction, Discrete Cosine Transform (DCT) coding of the
- * prediction error signal and context dependent entropy coding techniques
- * based on arithmetic principles. It features:
- *  - YUV 4:2:0 image format
- *  - Macro-block based coding (16x16 luma plus two 8x8 chroma)
- *  - 1/4 (1/8) pixel accuracy motion compensated prediction
- *  - 4x4 DCT transform
- *  - 128 level linear quantizer
- *  - In loop deblocking filter
- *  - Context-based entropy coding
- *
- * @{
- */
-/*!\file
- * \brief Provides controls common to both the VP8 encoder and decoder.
- */
-#ifndef VPX_VP8_H_
-#define VPX_VP8_H_
-
-#include "./vpx_codec.h"
-#include "./vpx_image.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!\brief Control functions
- *
- * The set of macros define the control functions of VP8 interface
- */
-enum vp8_com_control_id {
-  /*!\brief pass in an external frame into decoder to be used as reference frame
-   */
-  VP8_SET_REFERENCE = 1,
-  VP8_COPY_REFERENCE = 2, /**< get a copy of reference frame from the decoder */
-  VP8_SET_POSTPROC = 3,   /**< set the decoder's post processing settings  */
-  VP8_SET_DBG_COLOR_REF_FRAME = 4, /**< \deprecated */
-  VP8_SET_DBG_COLOR_MB_MODES = 5,  /**< \deprecated */
-  VP8_SET_DBG_COLOR_B_MODES = 6,   /**< \deprecated */
-  VP8_SET_DBG_DISPLAY_MV = 7,      /**< \deprecated */
-
-  /* TODO(jkoleszar): The encoder incorrectly reuses some of these values (5+)
-   * for its control ids. These should be migrated to something like the
-   * VP8_DECODER_CTRL_ID_START range next time we're ready to break the ABI.
-   */
-  VP9_GET_REFERENCE = 128, /**< get a pointer to a reference frame */
-  VP8_COMMON_CTRL_ID_MAX,
-  VP8_DECODER_CTRL_ID_START = 256
-};
-
-/*!\brief post process flags
- *
- * The set of macros define VP8 decoder post processing flags
- */
-enum vp8_postproc_level {
-  VP8_NOFILTERING = 0,
-  VP8_DEBLOCK = 1 << 0,
-  VP8_DEMACROBLOCK = 1 << 1,
-  VP8_ADDNOISE = 1 << 2,
-  VP8_DEBUG_TXT_FRAME_INFO = 1 << 3, /**< print frame information */
-  VP8_DEBUG_TXT_MBLK_MODES =
-      1 << 4, /**< print macro block modes over each macro block */
-  VP8_DEBUG_TXT_DC_DIFF = 1 << 5,   /**< print dc diff for each macro block */
-  VP8_DEBUG_TXT_RATE_INFO = 1 << 6, /**< print video rate info (encoder only) */
-  VP8_MFQE = 1 << 10
-};
-
-/*!\brief post process flags
- *
- * This define a structure that describe the post processing settings. For
- * the best objective measure (using the PSNR metric) set post_proc_flag
- * to VP8_DEBLOCK and deblocking_level to 1.
- */
-
-typedef struct vp8_postproc_cfg {
-  /*!\brief the types of post processing to be done, should be combination of
-   * "vp8_postproc_level" */
-  int post_proc_flag;
-  int deblocking_level; /**< the strength of deblocking, valid range [0, 16] */
-  int noise_level; /**< the strength of additive noise, valid range [0, 16] */
-} vp8_postproc_cfg_t;
-
-/*!\brief reference frame type
- *
- * The set of macros define the type of VP8 reference frames
- */
-typedef enum vpx_ref_frame_type {
-  VP8_LAST_FRAME = 1,
-  VP8_GOLD_FRAME = 2,
-  VP8_ALTR_FRAME = 4
-} vpx_ref_frame_type_t;
-
-/*!\brief reference frame data struct
- *
- * Define the data struct to access vp8 reference frames.
- */
-typedef struct vpx_ref_frame {
-  vpx_ref_frame_type_t frame_type; /**< which reference frame */
-  vpx_image_t img;                 /**< reference frame data in image format */
-} vpx_ref_frame_t;
-
-/*!\brief VP9 specific reference frame data struct
- *
- * Define the data struct to access vp9 reference frames.
- */
-typedef struct vp9_ref_frame {
-  int idx;         /**< frame index to get (input) */
-  vpx_image_t img; /**< img structure to populate (output) */
-} vp9_ref_frame_t;
-
-/*!\cond */
-/*!\brief vp8 decoder control function parameter type
- *
- * defines the data type for each of VP8 decoder control function requires
- */
-VPX_CTRL_USE_TYPE(VP8_SET_REFERENCE, vpx_ref_frame_t *)
-#define VPX_CTRL_VP8_SET_REFERENCE
-VPX_CTRL_USE_TYPE(VP8_COPY_REFERENCE, vpx_ref_frame_t *)
-#define VPX_CTRL_VP8_COPY_REFERENCE
-VPX_CTRL_USE_TYPE(VP8_SET_POSTPROC, vp8_postproc_cfg_t *)
-#define VPX_CTRL_VP8_SET_POSTPROC
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_COLOR_REF_FRAME, int)
-#define VPX_CTRL_VP8_SET_DBG_COLOR_REF_FRAME
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_COLOR_MB_MODES, int)
-#define VPX_CTRL_VP8_SET_DBG_COLOR_MB_MODES
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_COLOR_B_MODES, int)
-#define VPX_CTRL_VP8_SET_DBG_COLOR_B_MODES
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_DISPLAY_MV, int)
-#define VPX_CTRL_VP8_SET_DBG_DISPLAY_MV
-VPX_CTRL_USE_TYPE(VP9_GET_REFERENCE, vp9_ref_frame_t *)
-#define VPX_CTRL_VP9_GET_REFERENCE
-
-/*!\endcond */
-/*! @} - end defgroup vp8 */
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // VPX_VP8_H_
diff --git a/dependencies2013/win32/include/vpx/vp8cx.h b/dependencies2013/win32/include/vpx/vp8cx.h
deleted file mode 100644
index 7acd7a07..00000000
--- a/dependencies2013/win32/include/vpx/vp8cx.h
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef VPX_VP8CX_H_
-#define VPX_VP8CX_H_
-
-/*!\defgroup vp8_encoder WebM VP8/VP9 Encoder
- * \ingroup vp8
- *
- * @{
- */
-#include "./vp8.h"
-#include "./vpx_encoder.h"
-
-/*!\file
- * \brief Provides definitions for using VP8 or VP9 encoder algorithm within the
- *        vpx Codec Interface.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!\name Algorithm interface for VP8
- *
- * This interface provides the capability to encode raw VP8 streams.
- * @{
- */
-extern vpx_codec_iface_t vpx_codec_vp8_cx_algo;
-extern vpx_codec_iface_t *vpx_codec_vp8_cx(void);
-/*!@} - end algorithm interface member group*/
-
-/*!\name Algorithm interface for VP9
- *
- * This interface provides the capability to encode raw VP9 streams.
- * @{
- */
-extern vpx_codec_iface_t vpx_codec_vp9_cx_algo;
-extern vpx_codec_iface_t *vpx_codec_vp9_cx(void);
-/*!@} - end algorithm interface member group*/
-
-/*
- * Algorithm Flags
- */
-
-/*!\brief Don't reference the last frame
- *
- * When this flag is set, the encoder will not use the last frame as a
- * predictor. When not set, the encoder will choose whether to use the
- * last frame or not automatically.
- */
-#define VP8_EFLAG_NO_REF_LAST (1 << 16)
-
-/*!\brief Don't reference the golden frame
- *
- * When this flag is set, the encoder will not use the golden frame as a
- * predictor. When not set, the encoder will choose whether to use the
- * golden frame or not automatically.
- */
-#define VP8_EFLAG_NO_REF_GF (1 << 17)
-
-/*!\brief Don't reference the alternate reference frame
- *
- * When this flag is set, the encoder will not use the alt ref frame as a
- * predictor. When not set, the encoder will choose whether to use the
- * alt ref frame or not automatically.
- */
-#define VP8_EFLAG_NO_REF_ARF (1 << 21)
-
-/*!\brief Don't update the last frame
- *
- * When this flag is set, the encoder will not update the last frame with
- * the contents of the current frame.
- */
-#define VP8_EFLAG_NO_UPD_LAST (1 << 18)
-
-/*!\brief Don't update the golden frame
- *
- * When this flag is set, the encoder will not update the golden frame with
- * the contents of the current frame.
- */
-#define VP8_EFLAG_NO_UPD_GF (1 << 22)
-
-/*!\brief Don't update the alternate reference frame
- *
- * When this flag is set, the encoder will not update the alt ref frame with
- * the contents of the current frame.
- */
-#define VP8_EFLAG_NO_UPD_ARF (1 << 23)
-
-/*!\brief Force golden frame update
- *
- * When this flag is set, the encoder copy the contents of the current frame
- * to the golden frame buffer.
- */
-#define VP8_EFLAG_FORCE_GF (1 << 19)
-
-/*!\brief Force alternate reference frame update
- *
- * When this flag is set, the encoder copy the contents of the current frame
- * to the alternate reference frame buffer.
- */
-#define VP8_EFLAG_FORCE_ARF (1 << 24)
-
-/*!\brief Disable entropy update
- *
- * When this flag is set, the encoder will not update its internal entropy
- * model based on the entropy of this frame.
- */
-#define VP8_EFLAG_NO_UPD_ENTROPY (1 << 20)
-
-/*!\brief VPx encoder control functions
- *
- * This set of macros define the control functions available for VPx
- * encoder interface.
- *
- * \sa #vpx_codec_control
- */
-enum vp8e_enc_control_id {
-  /*!\brief Codec control function to pass an ROI map to encoder.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_ROI_MAP = 8,
-
-  /*!\brief Codec control function to pass an Active map to encoder.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_ACTIVEMAP,
-
-  /*!\brief Codec control function to set encoder scaling mode.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_SCALEMODE = 11,
-
-  /*!\brief Codec control function to set encoder internal speed settings.
-   *
-   * Changes in this value influences, among others, the encoder's selection
-   * of motion estimation methods. Values greater than 0 will increase encoder
-   * speed at the expense of quality.
-   *
-   * \note Valid range for VP8: -16..16
-   * \note Valid range for VP9: -8..8
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_CPUUSED = 13,
-
-  /*!\brief Codec control function to enable automatic set and use alf frames.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_ENABLEAUTOALTREF,
-
-  /*!\brief control function to set noise sensitivity
-   *
-   * 0: off, 1: OnYOnly, 2: OnYUV,
-   * 3: OnYUVAggressive, 4: Adaptive
-   *
-   * Supported in codecs: VP8
-   */
-  VP8E_SET_NOISE_SENSITIVITY,
-
-  /*!\brief Codec control function to set sharpness.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_SHARPNESS,
-
-  /*!\brief Codec control function to set the threshold for MBs treated static.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_STATIC_THRESHOLD,
-
-  /*!\brief Codec control function to set the number of token partitions.
-   *
-   * Supported in codecs: VP8
-   */
-  VP8E_SET_TOKEN_PARTITIONS,
-
-  /*!\brief Codec control function to get last quantizer chosen by the encoder.
-   *
-   * Return value uses internal quantizer scale defined by the codec.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_GET_LAST_QUANTIZER,
-
-  /*!\brief Codec control function to get last quantizer chosen by the encoder.
-   *
-   * Return value uses the 0..63 scale as used by the rc_*_quantizer config
-   * parameters.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_GET_LAST_QUANTIZER_64,
-
-  /*!\brief Codec control function to set the max no of frames to create arf.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_ARNR_MAXFRAMES,
-
-  /*!\brief Codec control function to set the filter strength for the arf.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_ARNR_STRENGTH,
-
-  /*!\deprecated control function to set the filter type to use for the arf. */
-  VP8E_SET_ARNR_TYPE,
-
-  /*!\brief Codec control function to set visual tuning.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_TUNING,
-
-  /*!\brief Codec control function to set constrained quality level.
-   *
-   * \attention For this value to be used vpx_codec_enc_cfg_t::g_usage must be
-   *            set to #VPX_CQ.
-   * \note Valid range: 0..63
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_CQ_LEVEL,
-
-  /*!\brief Codec control function to set Max data rate for Intra frames.
-   *
-   * This value controls additional clamping on the maximum size of a
-   * keyframe. It is expressed as a percentage of the average
-   * per-frame bitrate, with the special (and default) value 0 meaning
-   * unlimited, or no additional clamping beyond the codec's built-in
-   * algorithm.
-   *
-   * For example, to allocate no more than 4.5 frames worth of bitrate
-   * to a keyframe, set this to 450.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VP8E_SET_MAX_INTRA_BITRATE_PCT,
-
-  /*!\brief Codec control function to set reference and update frame flags.
-   *
-   *  Supported in codecs: VP8
-   */
-  VP8E_SET_FRAME_FLAGS,
-
-  /*!\brief Codec control function to set max data rate for Inter frames.
-   *
-   * This value controls additional clamping on the maximum size of an
-   * inter frame. It is expressed as a percentage of the average
-   * per-frame bitrate, with the special (and default) value 0 meaning
-   * unlimited, or no additional clamping beyond the codec's built-in
-   * algorithm.
-   *
-   * For example, to allow no more than 4.5 frames worth of bitrate
-   * to an inter frame, set this to 450.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_MAX_INTER_BITRATE_PCT,
-
-  /*!\brief Boost percentage for Golden Frame in CBR mode.
-   *
-   * This value controls the amount of boost given to Golden Frame in
-   * CBR mode. It is expressed as a percentage of the average
-   * per-frame bitrate, with the special (and default) value 0 meaning
-   * the feature is off, i.e., no golden frame boost in CBR mode and
-   * average bitrate target is used.
-   *
-   * For example, to allow 100% more bits, i.e, 2X, in a golden frame
-   * than average frame, set this to 100.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_GF_CBR_BOOST_PCT,
-
-  /*!\brief Codec control function to set the temporal layer id.
-   *
-   * For temporal scalability: this control allows the application to set the
-   * layer id for each frame to be encoded. Note that this control must be set
-   * for every frame prior to encoding. The usage of this control function
-   * supersedes the internal temporal pattern counter, which is now deprecated.
-   *
-   * Supported in codecs: VP8
-   */
-  VP8E_SET_TEMPORAL_LAYER_ID,
-
-  /*!\brief Codec control function to set encoder screen content mode.
-   *
-   * 0: off, 1: On, 2: On with more aggressive rate control.
-   *
-   * Supported in codecs: VP8
-   */
-  VP8E_SET_SCREEN_CONTENT_MODE,
-
-  /*!\brief Codec control function to set lossless encoding mode.
-   *
-   * VP9 can operate in lossless encoding mode, in which the bitstream
-   * produced will be able to decode and reconstruct a perfect copy of
-   * input source. This control function provides a mean to switch encoder
-   * into lossless coding mode(1) or normal coding mode(0) that may be lossy.
-   *                          0 = lossy coding mode
-   *                          1 = lossless coding mode
-   *
-   *  By default, encoder operates in normal coding mode (maybe lossy).
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_LOSSLESS,
-
-  /*!\brief Codec control function to set number of tile columns.
-   *
-   * In encoding and decoding, VP9 allows an input image frame be partitioned
-   * into separated vertical tile columns, which can be encoded or decoded
-   * independently. This enables easy implementation of parallel encoding and
-   * decoding. This control requests the encoder to use column tiles in
-   * encoding an input frame, with number of tile columns (in Log2 unit) as
-   * the parameter:
-   *             0 = 1 tile column
-   *             1 = 2 tile columns
-   *             2 = 4 tile columns
-   *             .....
-   *             n = 2**n tile columns
-   * The requested tile columns will be capped by the encoder based on image
-   * size limitations (The minimum width of a tile column is 256 pixels, the
-   * maximum is 4096).
-   *
-   * By default, the value is 6, i.e., the maximum number of tiles supported by
-   * the resolution.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_TILE_COLUMNS,
-
-  /*!\brief Codec control function to set number of tile rows.
-   *
-   * In encoding and decoding, VP9 allows an input image frame be partitioned
-   * into separated horizontal tile rows. Tile rows are encoded or decoded
-   * sequentially. Even though encoding/decoding of later tile rows depends on
-   * earlier ones, this allows the encoder to output data packets for tile rows
-   * prior to completely processing all tile rows in a frame, thereby reducing
-   * the latency in processing between input and output. The parameter
-   * for this control describes the number of tile rows, which has a valid
-   * range [0, 2]:
-   *            0 = 1 tile row
-   *            1 = 2 tile rows
-   *            2 = 4 tile rows
-   *
-   * By default, the value is 0, i.e. one single row tile for entire image.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_TILE_ROWS,
-
-  /*!\brief Codec control function to enable frame parallel decoding feature.
-   *
-   * VP9 has a bitstream feature to reduce decoding dependency between frames
-   * by turning off backward update of probability context used in encoding
-   * and decoding. This allows staged parallel processing of more than one
-   * video frame in the decoder. This control function provides a means to
-   * turn this feature on or off for bitstreams produced by encoder.
-   *
-   * By default, this feature is on.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_FRAME_PARALLEL_DECODING,
-
-  /*!\brief Codec control function to set adaptive quantization mode.
-   *
-   * VP9 has a segment based feature that allows encoder to adaptively change
-   * quantization parameter for each segment within a frame to improve the
-   * subjective quality. This control makes encoder operate in one of the
-   * several AQ_modes supported.
-   *
-   * By default, encoder operates with AQ_Mode 0(adaptive quantization off).
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_AQ_MODE,
-
-  /*!\brief Codec control function to enable/disable periodic Q boost.
-   *
-   * One VP9 encoder speed feature is to enable quality boost by lowering
-   * frame level Q periodically. This control function provides a mean to
-   * turn on/off this feature.
-   *               0 = off
-   *               1 = on
-   *
-   * By default, the encoder is allowed to use this feature for appropriate
-   * encoding modes.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_FRAME_PERIODIC_BOOST,
-
-  /*!\brief Codec control function to set noise sensitivity.
-   *
-   *  0: off, 1: On(YOnly)
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_NOISE_SENSITIVITY,
-
-  /*!\brief Codec control function to turn on/off SVC in encoder.
-   * \note Return value is VPX_CODEC_INVALID_PARAM if the encoder does not
-   *       support SVC in its current encoding mode
-   *  0: off, 1: on
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_SVC,
-
-  /*!\brief Codec control function to set parameters for SVC.
-   * \note Parameters contain min_q, max_q, scaling factor for each of the
-   *       SVC layers.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_SVC_PARAMETERS,
-
-  /*!\brief Codec control function to set svc layer for spatial and temporal.
-   * \note Valid ranges: 0..#vpx_codec_enc_cfg::ss_number_layers for spatial
-   *                     layer and 0..#vpx_codec_enc_cfg::ts_number_layers for
-   *                     temporal layer.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_SVC_LAYER_ID,
-
-  /*!\brief Codec control function to set content type.
-   * \note Valid parameter range:
-   *              VP9E_CONTENT_DEFAULT = Regular video content (Default)
-   *              VP9E_CONTENT_SCREEN  = Screen capture content
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_TUNE_CONTENT,
-
-  /*!\brief Codec control function to get svc layer ID.
-   * \note The layer ID returned is for the data packet from the registered
-   *       callback function.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_GET_SVC_LAYER_ID,
-
-  /*!\brief Codec control function to register callback to get per layer packet.
-   * \note Parameter for this control function is a structure with a callback
-   *       function and a pointer to private data used by the callback.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_REGISTER_CX_CALLBACK,
-
-  /*!\brief Codec control function to set color space info.
-   * \note Valid ranges: 0..7, default is "UNKNOWN".
-   *                     0 = UNKNOWN,
-   *                     1 = BT_601
-   *                     2 = BT_709
-   *                     3 = SMPTE_170
-   *                     4 = SMPTE_240
-   *                     5 = BT_2020
-   *                     6 = RESERVED
-   *                     7 = SRGB
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_COLOR_SPACE,
-
-  /*!\brief Codec control function to set temporal layering mode.
-   * \note Valid ranges: 0..3, default is "0"
-   * (VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING).
-   *                     0 = VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING
-   *                     1 = VP9E_TEMPORAL_LAYERING_MODE_BYPASS
-   *                     2 = VP9E_TEMPORAL_LAYERING_MODE_0101
-   *                     3 = VP9E_TEMPORAL_LAYERING_MODE_0212
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_TEMPORAL_LAYERING_MODE,
-
-  /*!\brief Codec control function to set minimum interval between GF/ARF frames
-   *
-   * By default the value is set as 4.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_MIN_GF_INTERVAL,
-
-  /*!\brief Codec control function to set minimum interval between GF/ARF frames
-   *
-   * By default the value is set as 16.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_MAX_GF_INTERVAL,
-
-  /*!\brief Codec control function to get an Active map back from the encoder.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_GET_ACTIVEMAP,
-
-  /*!\brief Codec control function to set color range bit.
-   * \note Valid ranges: 0..1, default is 0
-   *                     0 = Limited range (16..235 or HBD equivalent)
-   *                     1 = Full range (0..255 or HBD equivalent)
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_COLOR_RANGE,
-
-  /*!\brief Codec control function to set the frame flags and buffer indices
-   * for spatial layers. The frame flags and buffer indices are set using the
-   * struct #vpx_svc_ref_frame_config defined below.
-   *
-   * Supported in codecs: VP9
-  */
-  VP9E_SET_SVC_REF_FRAME_CONFIG,
-
-  /*!\brief Codec control function to set intended rendering image size.
-   *
-   * By default, this is identical to the image size in pixels.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_RENDER_SIZE,
-
-  /*!\brief Codec control function to set target level.
-   *
-   * 255: off (default); 0: only keep level stats; 10: target for level 1.0;
-   * 11: target for level 1.1; ... 62: target for level 6.2
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_TARGET_LEVEL,
-
-  /*!\brief Codec control function to set row level multi-threading.
-  *
-  * 0 : off, 1 : on
-  *
-  * Supported in codecs: VP9
-  */
-  VP9E_SET_ROW_MT,
-
-  /*!\brief Codec control function to get bitstream level.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_GET_LEVEL,
-
-  /*!\brief Codec control function to enable/disable special mode for altref
-   *        adaptive quantization. You can use it with --aq-mode concurrently.
-   *
-   * Enable special adaptive quantization for altref frames based on their
-   * expected prediction quality for the future frames.
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_SET_ALT_REF_AQ,
-
-  /*!\brief Boost percentage for Golden Frame in CBR mode.
-    *
-    * This value controls the amount of boost given to Golden Frame in
-    * CBR mode. It is expressed as a percentage of the average
-    * per-frame bitrate, with the special (and default) value 0 meaning
-    * the feature is off, i.e., no golden frame boost in CBR mode and
-    * average bitrate target is used.
-    *
-    * For example, to allow 100% more bits, i.e, 2X, in a golden frame
-    * than average frame, set this to 100.
-    *
-    * Supported in codecs: VP8
-    */
-  VP8E_SET_GF_CBR_BOOST_PCT,
-
-  /*!\brief Codec control function to enable the extreme motion vector unit test
-   * in VP9. Please note that this is only used in motion vector unit test.
-   *
-   * 0 : off, 1 : MAX_EXTREME_MV, 2 : MIN_EXTREME_MV
-   *
-   * Supported in codecs: VP9
-   */
-  VP9E_ENABLE_MOTION_VECTOR_UNIT_TEST,
-};
-
-/*!\brief vpx 1-D scaling mode
- *
- * This set of constants define 1-D vpx scaling modes
- */
-typedef enum vpx_scaling_mode_1d {
-  VP8E_NORMAL = 0,
-  VP8E_FOURFIVE = 1,
-  VP8E_THREEFIVE = 2,
-  VP8E_ONETWO = 3
-} VPX_SCALING_MODE;
-
-/*!\brief Temporal layering mode enum for VP9 SVC.
- *
- * This set of macros define the different temporal layering modes.
- * Supported codecs: VP9 (in SVC mode)
- *
- */
-typedef enum vp9e_temporal_layering_mode {
-  /*!\brief No temporal layering.
-   * Used when only spatial layering is used.
-   */
-  VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING = 0,
-
-  /*!\brief Bypass mode.
-   * Used when application needs to control temporal layering.
-   * This will only work when the number of spatial layers equals 1.
-   */
-  VP9E_TEMPORAL_LAYERING_MODE_BYPASS = 1,
-
-  /*!\brief 0-1-0-1... temporal layering scheme with two temporal layers.
-   */
-  VP9E_TEMPORAL_LAYERING_MODE_0101 = 2,
-
-  /*!\brief 0-2-1-2... temporal layering scheme with three temporal layers.
-   */
-  VP9E_TEMPORAL_LAYERING_MODE_0212 = 3
-} VP9E_TEMPORAL_LAYERING_MODE;
-
-/*!\brief  vpx region of interest map
- *
- * These defines the data structures for the region of interest map
- *
- */
-
-typedef struct vpx_roi_map {
-  /*! An id between 0 and 3 for each 16x16 region within a frame. */
-  unsigned char *roi_map;
-  unsigned int rows; /**< Number of rows. */
-  unsigned int cols; /**< Number of columns. */
-  // TODO(paulwilkins): broken for VP9 which has 8 segments
-  // q and loop filter deltas for each segment
-  // (see MAX_MB_SEGMENTS)
-  int delta_q[4];  /**< Quantizer deltas. */
-  int delta_lf[4]; /**< Loop filter deltas. */
-  /*! Static breakout threshold for each segment. */
-  unsigned int static_threshold[4];
-} vpx_roi_map_t;
-
-/*!\brief  vpx active region map
- *
- * These defines the data structures for active region map
- *
- */
-
-typedef struct vpx_active_map {
-  /*!\brief specify an on (1) or off (0) each 16x16 region within a frame */
-  unsigned char *active_map;
-  unsigned int rows; /**< number of rows */
-  unsigned int cols; /**< number of cols */
-} vpx_active_map_t;
-
-/*!\brief  vpx image scaling mode
- *
- * This defines the data structure for image scaling mode
- *
- */
-typedef struct vpx_scaling_mode {
-  VPX_SCALING_MODE h_scaling_mode; /**< horizontal scaling mode */
-  VPX_SCALING_MODE v_scaling_mode; /**< vertical scaling mode   */
-} vpx_scaling_mode_t;
-
-/*!\brief VP8 token partition mode
- *
- * This defines VP8 partitioning mode for compressed data, i.e., the number of
- * sub-streams in the bitstream. Used for parallelized decoding.
- *
- */
-
-typedef enum {
-  VP8_ONE_TOKENPARTITION = 0,
-  VP8_TWO_TOKENPARTITION = 1,
-  VP8_FOUR_TOKENPARTITION = 2,
-  VP8_EIGHT_TOKENPARTITION = 3
-} vp8e_token_partitions;
-
-/*!brief VP9 encoder content type */
-typedef enum {
-  VP9E_CONTENT_DEFAULT,
-  VP9E_CONTENT_SCREEN,
-  VP9E_CONTENT_INVALID
-} vp9e_tune_content;
-
-/*!\brief VP8 model tuning parameters
- *
- * Changes the encoder to tune for certain types of input material.
- *
- */
-typedef enum { VP8_TUNE_PSNR, VP8_TUNE_SSIM } vp8e_tuning;
-
-/*!\brief  vp9 svc layer parameters
- *
- * This defines the spatial and temporal layer id numbers for svc encoding.
- * This is used with the #VP9E_SET_SVC_LAYER_ID control to set the spatial and
- * temporal layer id for the current frame.
- *
- */
-typedef struct vpx_svc_layer_id {
-  int spatial_layer_id;  /**< Spatial layer id number. */
-  int temporal_layer_id; /**< Temporal layer id number. */
-} vpx_svc_layer_id_t;
-
-/*!\brief  vp9 svc frame flag parameters.
- *
- * This defines the frame flags and buffer indices for each spatial layer for
- * svc encoding.
- * This is used with the #VP9E_SET_SVC_REF_FRAME_CONFIG control to set frame
- * flags and buffer indices for each spatial layer for the current (super)frame.
- *
- */
-typedef struct vpx_svc_ref_frame_config {
-  int frame_flags[VPX_TS_MAX_LAYERS]; /**< Frame flags. */
-  int lst_fb_idx[VPX_TS_MAX_LAYERS];  /**< Last buffer index. */
-  int gld_fb_idx[VPX_TS_MAX_LAYERS];  /**< Golden buffer index. */
-  int alt_fb_idx[VPX_TS_MAX_LAYERS];  /**< Altref buffer index. */
-} vpx_svc_ref_frame_config_t;
-
-/*!\cond */
-/*!\brief VP8 encoder control function parameter type
- *
- * Defines the data types that VP8E control functions take. Note that
- * additional common controls are defined in vp8.h
- *
- */
-
-VPX_CTRL_USE_TYPE(VP8E_SET_FRAME_FLAGS, int)
-#define VPX_CTRL_VP8E_SET_FRAME_FLAGS
-VPX_CTRL_USE_TYPE(VP8E_SET_TEMPORAL_LAYER_ID, int)
-#define VPX_CTRL_VP8E_SET_TEMPORAL_LAYER_ID
-VPX_CTRL_USE_TYPE(VP8E_SET_ROI_MAP, vpx_roi_map_t *)
-#define VPX_CTRL_VP8E_SET_ROI_MAP
-VPX_CTRL_USE_TYPE(VP8E_SET_ACTIVEMAP, vpx_active_map_t *)
-#define VPX_CTRL_VP8E_SET_ACTIVEMAP
-VPX_CTRL_USE_TYPE(VP8E_SET_SCALEMODE, vpx_scaling_mode_t *)
-#define VPX_CTRL_VP8E_SET_SCALEMODE
-
-VPX_CTRL_USE_TYPE(VP9E_SET_SVC, int)
-#define VPX_CTRL_VP9E_SET_SVC
-VPX_CTRL_USE_TYPE(VP9E_SET_SVC_PARAMETERS, void *)
-#define VPX_CTRL_VP9E_SET_SVC_PARAMETERS
-VPX_CTRL_USE_TYPE(VP9E_REGISTER_CX_CALLBACK, void *)
-#define VPX_CTRL_VP9E_REGISTER_CX_CALLBACK
-VPX_CTRL_USE_TYPE(VP9E_SET_SVC_LAYER_ID, vpx_svc_layer_id_t *)
-#define VPX_CTRL_VP9E_SET_SVC_LAYER_ID
-
-VPX_CTRL_USE_TYPE(VP8E_SET_CPUUSED, int)
-#define VPX_CTRL_VP8E_SET_CPUUSED
-VPX_CTRL_USE_TYPE(VP8E_SET_ENABLEAUTOALTREF, unsigned int)
-#define VPX_CTRL_VP8E_SET_ENABLEAUTOALTREF
-VPX_CTRL_USE_TYPE(VP8E_SET_NOISE_SENSITIVITY, unsigned int)
-#define VPX_CTRL_VP8E_SET_NOISE_SENSITIVITY
-VPX_CTRL_USE_TYPE(VP8E_SET_SHARPNESS, unsigned int)
-#define VPX_CTRL_VP8E_SET_SHARPNESS
-VPX_CTRL_USE_TYPE(VP8E_SET_STATIC_THRESHOLD, unsigned int)
-#define VPX_CTRL_VP8E_SET_STATIC_THRESHOLD
-VPX_CTRL_USE_TYPE(VP8E_SET_TOKEN_PARTITIONS, int) /* vp8e_token_partitions */
-#define VPX_CTRL_VP8E_SET_TOKEN_PARTITIONS
-
-VPX_CTRL_USE_TYPE(VP8E_SET_ARNR_MAXFRAMES, unsigned int)
-#define VPX_CTRL_VP8E_SET_ARNR_MAXFRAMES
-VPX_CTRL_USE_TYPE(VP8E_SET_ARNR_STRENGTH, unsigned int)
-#define VPX_CTRL_VP8E_SET_ARNR_STRENGTH
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_ARNR_TYPE, unsigned int)
-#define VPX_CTRL_VP8E_SET_ARNR_TYPE
-VPX_CTRL_USE_TYPE(VP8E_SET_TUNING, int) /* vp8e_tuning */
-#define VPX_CTRL_VP8E_SET_TUNING
-VPX_CTRL_USE_TYPE(VP8E_SET_CQ_LEVEL, unsigned int)
-#define VPX_CTRL_VP8E_SET_CQ_LEVEL
-
-VPX_CTRL_USE_TYPE(VP9E_SET_TILE_COLUMNS, int)
-#define VPX_CTRL_VP9E_SET_TILE_COLUMNS
-VPX_CTRL_USE_TYPE(VP9E_SET_TILE_ROWS, int)
-#define VPX_CTRL_VP9E_SET_TILE_ROWS
-
-VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER, int *)
-#define VPX_CTRL_VP8E_GET_LAST_QUANTIZER
-VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER_64, int *)
-#define VPX_CTRL_VP8E_GET_LAST_QUANTIZER_64
-VPX_CTRL_USE_TYPE(VP9E_GET_SVC_LAYER_ID, vpx_svc_layer_id_t *)
-#define VPX_CTRL_VP9E_GET_SVC_LAYER_ID
-
-VPX_CTRL_USE_TYPE(VP8E_SET_MAX_INTRA_BITRATE_PCT, unsigned int)
-#define VPX_CTRL_VP8E_SET_MAX_INTRA_BITRATE_PCT
-VPX_CTRL_USE_TYPE(VP8E_SET_MAX_INTER_BITRATE_PCT, unsigned int)
-#define VPX_CTRL_VP8E_SET_MAX_INTER_BITRATE_PCT
-
-VPX_CTRL_USE_TYPE(VP8E_SET_GF_CBR_BOOST_PCT, unsigned int)
-#define VPX_CTRL_VP8E_SET_GF_CBR_BOOST_PCT
-
-VPX_CTRL_USE_TYPE(VP8E_SET_SCREEN_CONTENT_MODE, unsigned int)
-#define VPX_CTRL_VP8E_SET_SCREEN_CONTENT_MODE
-
-VPX_CTRL_USE_TYPE(VP9E_SET_GF_CBR_BOOST_PCT, unsigned int)
-#define VPX_CTRL_VP9E_SET_GF_CBR_BOOST_PCT
-
-VPX_CTRL_USE_TYPE(VP9E_SET_LOSSLESS, unsigned int)
-#define VPX_CTRL_VP9E_SET_LOSSLESS
-
-VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PARALLEL_DECODING, unsigned int)
-#define VPX_CTRL_VP9E_SET_FRAME_PARALLEL_DECODING
-
-VPX_CTRL_USE_TYPE(VP9E_SET_AQ_MODE, unsigned int)
-#define VPX_CTRL_VP9E_SET_AQ_MODE
-
-VPX_CTRL_USE_TYPE(VP9E_SET_ALT_REF_AQ, int)
-#define VPX_CTRL_VP9E_SET_ALT_REF_AQ
-
-VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PERIODIC_BOOST, unsigned int)
-#define VPX_CTRL_VP9E_SET_FRAME_PERIODIC_BOOST
-
-VPX_CTRL_USE_TYPE(VP9E_SET_NOISE_SENSITIVITY, unsigned int)
-#define VPX_CTRL_VP9E_SET_NOISE_SENSITIVITY
-
-VPX_CTRL_USE_TYPE(VP9E_SET_TUNE_CONTENT, int) /* vp9e_tune_content */
-#define VPX_CTRL_VP9E_SET_TUNE_CONTENT
-
-VPX_CTRL_USE_TYPE(VP9E_SET_COLOR_SPACE, int)
-#define VPX_CTRL_VP9E_SET_COLOR_SPACE
-
-VPX_CTRL_USE_TYPE(VP9E_SET_MIN_GF_INTERVAL, unsigned int)
-#define VPX_CTRL_VP9E_SET_MIN_GF_INTERVAL
-
-VPX_CTRL_USE_TYPE(VP9E_SET_MAX_GF_INTERVAL, unsigned int)
-#define VPX_CTRL_VP9E_SET_MAX_GF_INTERVAL
-
-VPX_CTRL_USE_TYPE(VP9E_GET_ACTIVEMAP, vpx_active_map_t *)
-#define VPX_CTRL_VP9E_GET_ACTIVEMAP
-
-VPX_CTRL_USE_TYPE(VP9E_SET_COLOR_RANGE, int)
-#define VPX_CTRL_VP9E_SET_COLOR_RANGE
-
-VPX_CTRL_USE_TYPE(VP9E_SET_SVC_REF_FRAME_CONFIG, vpx_svc_ref_frame_config_t *)
-#define VPX_CTRL_VP9E_SET_SVC_REF_FRAME_CONFIG
-
-VPX_CTRL_USE_TYPE(VP9E_SET_RENDER_SIZE, int *)
-#define VPX_CTRL_VP9E_SET_RENDER_SIZE
-
-VPX_CTRL_USE_TYPE(VP9E_SET_TARGET_LEVEL, unsigned int)
-#define VPX_CTRL_VP9E_SET_TARGET_LEVEL
-
-VPX_CTRL_USE_TYPE(VP9E_SET_ROW_MT, unsigned int)
-#define VPX_CTRL_VP9E_SET_ROW_MT
-
-VPX_CTRL_USE_TYPE(VP9E_GET_LEVEL, int *)
-#define VPX_CTRL_VP9E_GET_LEVEL
-
-VPX_CTRL_USE_TYPE(VP9E_ENABLE_MOTION_VECTOR_UNIT_TEST, unsigned int)
-#define VPX_CTRL_VP9E_ENABLE_MOTION_VECTOR_UNIT_TEST
-
-/*!\endcond */
-/*! @} - end defgroup vp8_encoder */
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // VPX_VP8CX_H_
diff --git a/dependencies2013/win32/include/vpx/vp8dx.h b/dependencies2013/win32/include/vpx/vp8dx.h
deleted file mode 100644
index 41c53e48..00000000
--- a/dependencies2013/win32/include/vpx/vp8dx.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*!\defgroup vp8_decoder WebM VP8/VP9 Decoder
- * \ingroup vp8
- *
- * @{
- */
-/*!\file
- * \brief Provides definitions for using VP8 or VP9 within the vpx Decoder
- *        interface.
- */
-#ifndef VPX_VP8DX_H_
-#define VPX_VP8DX_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Include controls common to both the encoder and decoder */
-#include "./vp8.h"
-
-/*!\name Algorithm interface for VP8
- *
- * This interface provides the capability to decode VP8 streams.
- * @{
- */
-extern vpx_codec_iface_t vpx_codec_vp8_dx_algo;
-extern vpx_codec_iface_t *vpx_codec_vp8_dx(void);
-/*!@} - end algorithm interface member group*/
-
-/*!\name Algorithm interface for VP9
- *
- * This interface provides the capability to decode VP9 streams.
- * @{
- */
-extern vpx_codec_iface_t vpx_codec_vp9_dx_algo;
-extern vpx_codec_iface_t *vpx_codec_vp9_dx(void);
-/*!@} - end algorithm interface member group*/
-
-/*!\enum vp8_dec_control_id
- * \brief VP8 decoder control functions
- *
- * This set of macros define the control functions available for the VP8
- * decoder interface.
- *
- * \sa #vpx_codec_control
- */
-enum vp8_dec_control_id {
-  /** control function to get info on which reference frames were updated
-   *  by the last decode
-   */
-  VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START,
-
-  /** check if the indicated frame is corrupted */
-  VP8D_GET_FRAME_CORRUPTED,
-
-  /** control function to get info on which reference frames were used
-   *  by the last decode
-   */
-  VP8D_GET_LAST_REF_USED,
-
-  /** decryption function to decrypt encoded buffer data immediately
-   * before decoding. Takes a vpx_decrypt_init, which contains
-   * a callback function and opaque context pointer.
-   */
-  VPXD_SET_DECRYPTOR,
-  VP8D_SET_DECRYPTOR = VPXD_SET_DECRYPTOR,
-
-  /** control function to get the dimensions that the current frame is decoded
-   * at. This may be different to the intended display size for the frame as
-   * specified in the wrapper or frame header (see VP9D_GET_DISPLAY_SIZE). */
-  VP9D_GET_FRAME_SIZE,
-
-  /** control function to get the current frame's intended display dimensions
-   * (as specified in the wrapper or frame header). This may be different to
-   * the decoded dimensions of this frame (see VP9D_GET_FRAME_SIZE). */
-  VP9D_GET_DISPLAY_SIZE,
-
-  /** control function to get the bit depth of the stream. */
-  VP9D_GET_BIT_DEPTH,
-
-  /** control function to set the byte alignment of the planes in the reference
-   * buffers. Valid values are power of 2, from 32 to 1024. A value of 0 sets
-   * legacy alignment. I.e. Y plane is aligned to 32 bytes, U plane directly
-   * follows Y plane, and V plane directly follows U plane. Default value is 0.
-   */
-  VP9_SET_BYTE_ALIGNMENT,
-
-  /** control function to invert the decoding order to from right to left. The
-   * function is used in a test to confirm the decoding independence of tile
-   * columns. The function may be used in application where this order
-   * of decoding is desired.
-   *
-   * TODO(yaowu): Rework the unit test that uses this control, and in a future
-   *              release, this test-only control shall be removed.
-   */
-  VP9_INVERT_TILE_DECODE_ORDER,
-
-  /** control function to set the skip loop filter flag. Valid values are
-   * integers. The decoder will skip the loop filter when its value is set to
-   * nonzero. If the loop filter is skipped the decoder may accumulate decode
-   * artifacts. The default value is 0.
-   */
-  VP9_SET_SKIP_LOOP_FILTER,
-
-  /** control function to decode SVC stream up to the x spatial layers,
-   * where x is passed in through the control, and is 0 for base layer.
-   */
-  VP9_DECODE_SVC_SPATIAL_LAYER,
-
-  /*!\brief Codec control function to get last decoded frame quantizer.
-   *
-   * Return value uses internal quantizer scale defined by the codec.
-   *
-   * Supported in codecs: VP8, VP9
-   */
-  VPXD_GET_LAST_QUANTIZER,
-
-  VP8_DECODER_CTRL_ID_MAX
-};
-
-/** Decrypt n bytes of data from input -> output, using the decrypt_state
- *  passed in VPXD_SET_DECRYPTOR.
- */
-typedef void (*vpx_decrypt_cb)(void *decrypt_state, const unsigned char *input,
-                               unsigned char *output, int count);
-
-/*!\brief Structure to hold decryption state
- *
- * Defines a structure to hold the decryption state and access function.
- */
-typedef struct vpx_decrypt_init {
-  /*! Decrypt callback. */
-  vpx_decrypt_cb decrypt_cb;
-
-  /*! Decryption state. */
-  void *decrypt_state;
-} vpx_decrypt_init;
-
-/*!\brief A deprecated alias for vpx_decrypt_init.
- */
-typedef vpx_decrypt_init vp8_decrypt_init;
-
-/*!\cond */
-/*!\brief VP8 decoder control function parameter type
- *
- * Defines the data types that VP8D control functions take. Note that
- * additional common controls are defined in vp8.h
- *
- */
-
-VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *)
-#define VPX_CTRL_VP8D_GET_LAST_REF_UPDATES
-VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *)
-#define VPX_CTRL_VP8D_GET_FRAME_CORRUPTED
-VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *)
-#define VPX_CTRL_VP8D_GET_LAST_REF_USED
-VPX_CTRL_USE_TYPE(VPXD_GET_LAST_QUANTIZER, int *)
-#define VPX_CTRL_VPXD_GET_LAST_QUANTIZER
-VPX_CTRL_USE_TYPE(VPXD_SET_DECRYPTOR, vpx_decrypt_init *)
-#define VPX_CTRL_VPXD_SET_DECRYPTOR
-VPX_CTRL_USE_TYPE(VP8D_SET_DECRYPTOR, vpx_decrypt_init *)
-#define VPX_CTRL_VP8D_SET_DECRYPTOR
-VPX_CTRL_USE_TYPE(VP9D_GET_DISPLAY_SIZE, int *)
-#define VPX_CTRL_VP9D_GET_DISPLAY_SIZE
-VPX_CTRL_USE_TYPE(VP9D_GET_BIT_DEPTH, unsigned int *)
-#define VPX_CTRL_VP9D_GET_BIT_DEPTH
-VPX_CTRL_USE_TYPE(VP9D_GET_FRAME_SIZE, int *)
-#define VPX_CTRL_VP9D_GET_FRAME_SIZE
-VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int)
-#define VPX_CTRL_VP9_INVERT_TILE_DECODE_ORDER
-#define VPX_CTRL_VP9_DECODE_SVC_SPATIAL_LAYER
-VPX_CTRL_USE_TYPE(VP9_DECODE_SVC_SPATIAL_LAYER, int)
-
-/*!\endcond */
-/*! @} - end defgroup vp8_decoder */
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // VPX_VP8DX_H_
diff --git a/dependencies2013/win32/include/vpx/vpx_codec.h b/dependencies2013/win32/include/vpx/vpx_codec.h
deleted file mode 100644
index ad05f4c7..00000000
--- a/dependencies2013/win32/include/vpx/vpx_codec.h
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*!\defgroup codec Common Algorithm Interface
- * This abstraction allows applications to easily support multiple video
- * formats with minimal code duplication. This section describes the interface
- * common to all codecs (both encoders and decoders).
- * @{
- */
-
-/*!\file
- * \brief Describes the codec algorithm interface to applications.
- *
- * This file describes the interface between an application and a
- * video codec algorithm.
- *
- * An application instantiates a specific codec instance by using
- * vpx_codec_init() and a pointer to the algorithm's interface structure:
- *     <pre>
- *     my_app.c:
- *       extern vpx_codec_iface_t my_codec;
- *       {
- *           vpx_codec_ctx_t algo;
- *           res = vpx_codec_init(&algo, &my_codec);
- *       }
- *     </pre>
- *
- * Once initialized, the instance is manged using other functions from
- * the vpx_codec_* family.
- */
-#ifndef VPX_VPX_CODEC_H_
-#define VPX_VPX_CODEC_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "./vpx_image.h"
-#include "./vpx_integer.h"
-
-/*!\brief Decorator indicating a function is deprecated */
-#ifndef VPX_DEPRECATED
-#if defined(__GNUC__) && __GNUC__
-#define VPX_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#define VPX_DEPRECATED
-#else
-#define VPX_DEPRECATED
-#endif
-#endif /* VPX_DEPRECATED */
-
-#ifndef VPX_DECLSPEC_DEPRECATED
-#if defined(__GNUC__) && __GNUC__
-#define VPX_DECLSPEC_DEPRECATED /**< \copydoc #VPX_DEPRECATED */
-#elif defined(_MSC_VER)
-/*!\brief \copydoc #VPX_DEPRECATED */
-#define VPX_DECLSPEC_DEPRECATED __declspec(deprecated)
-#else
-#define VPX_DECLSPEC_DEPRECATED /**< \copydoc #VPX_DEPRECATED */
-#endif
-#endif /* VPX_DECLSPEC_DEPRECATED */
-
-/*!\brief Decorator indicating a function is potentially unused */
-#ifndef VPX_UNUSED
-#if defined(__GNUC__) || defined(__clang__)
-#define VPX_UNUSED __attribute__((unused))
-#else
-#define VPX_UNUSED
-#endif
-#endif /* VPX_UNUSED */
-
-/*!\brief Current ABI version number
- *
- * \internal
- * If this file is altered in any way that changes the ABI, this value
- * must be bumped.  Examples include, but are not limited to, changing
- * types, removing or reassigning enums, adding/removing/rearranging
- * fields to structures
- */
-#define VPX_CODEC_ABI_VERSION (4 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/
-
-/*!\brief Algorithm return codes */
-typedef enum {
-  /*!\brief Operation completed without error */
-  VPX_CODEC_OK,
-
-  /*!\brief Unspecified error */
-  VPX_CODEC_ERROR,
-
-  /*!\brief Memory operation failed */
-  VPX_CODEC_MEM_ERROR,
-
-  /*!\brief ABI version mismatch */
-  VPX_CODEC_ABI_MISMATCH,
-
-  /*!\brief Algorithm does not have required capability */
-  VPX_CODEC_INCAPABLE,
-
-  /*!\brief The given bitstream is not supported.
-   *
-   * The bitstream was unable to be parsed at the highest level. The decoder
-   * is unable to proceed. This error \ref SHOULD be treated as fatal to the
-   * stream. */
-  VPX_CODEC_UNSUP_BITSTREAM,
-
-  /*!\brief Encoded bitstream uses an unsupported feature
-   *
-   * The decoder does not implement a feature required by the encoder. This
-   * return code should only be used for features that prevent future
-   * pictures from being properly decoded. This error \ref MAY be treated as
-   * fatal to the stream or \ref MAY be treated as fatal to the current GOP.
-   */
-  VPX_CODEC_UNSUP_FEATURE,
-
-  /*!\brief The coded data for this stream is corrupt or incomplete
-   *
-   * There was a problem decoding the current frame.  This return code
-   * should only be used for failures that prevent future pictures from
-   * being properly decoded. This error \ref MAY be treated as fatal to the
-   * stream or \ref MAY be treated as fatal to the current GOP. If decoding
-   * is continued for the current GOP, artifacts may be present.
-   */
-  VPX_CODEC_CORRUPT_FRAME,
-
-  /*!\brief An application-supplied parameter is not valid.
-   *
-   */
-  VPX_CODEC_INVALID_PARAM,
-
-  /*!\brief An iterator reached the end of list.
-   *
-   */
-  VPX_CODEC_LIST_END
-
-} vpx_codec_err_t;
-
-/*! \brief Codec capabilities bitfield
- *
- *  Each codec advertises the capabilities it supports as part of its
- *  ::vpx_codec_iface_t interface structure. Capabilities are extra interfaces
- *  or functionality, and are not required to be supported.
- *
- *  The available flags are specified by VPX_CODEC_CAP_* defines.
- */
-typedef long vpx_codec_caps_t;
-#define VPX_CODEC_CAP_DECODER 0x1 /**< Is a decoder */
-#define VPX_CODEC_CAP_ENCODER 0x2 /**< Is an encoder */
-
-/*! Can support images at greater than 8 bitdepth.
- */
-#define VPX_CODEC_CAP_HIGHBITDEPTH 0x4
-
-/*! \brief Initialization-time Feature Enabling
- *
- *  Certain codec features must be known at initialization time, to allow for
- *  proper memory allocation.
- *
- *  The available flags are specified by VPX_CODEC_USE_* defines.
- */
-typedef long vpx_codec_flags_t;
-
-/*!\brief Codec interface structure.
- *
- * Contains function pointers and other data private to the codec
- * implementation. This structure is opaque to the application.
- */
-typedef const struct vpx_codec_iface vpx_codec_iface_t;
-
-/*!\brief Codec private data structure.
- *
- * Contains data private to the codec implementation. This structure is opaque
- * to the application.
- */
-typedef struct vpx_codec_priv vpx_codec_priv_t;
-
-/*!\brief Iterator
- *
- * Opaque storage used for iterating over lists.
- */
-typedef const void *vpx_codec_iter_t;
-
-/*!\brief Codec context structure
- *
- * All codecs \ref MUST support this context structure fully. In general,
- * this data should be considered private to the codec algorithm, and
- * not be manipulated or examined by the calling application. Applications
- * may reference the 'name' member to get a printable description of the
- * algorithm.
- */
-typedef struct vpx_codec_ctx {
-  const char *name;             /**< Printable interface name */
-  vpx_codec_iface_t *iface;     /**< Interface pointers */
-  vpx_codec_err_t err;          /**< Last returned error */
-  const char *err_detail;       /**< Detailed info, if available */
-  vpx_codec_flags_t init_flags; /**< Flags passed at init time */
-  union {
-    /**< Decoder Configuration Pointer */
-    const struct vpx_codec_dec_cfg *dec;
-    /**< Encoder Configuration Pointer */
-    const struct vpx_codec_enc_cfg *enc;
-    const void *raw;
-  } config;               /**< Configuration pointer aliasing union */
-  vpx_codec_priv_t *priv; /**< Algorithm private storage */
-} vpx_codec_ctx_t;
-
-/*!\brief Bit depth for codec
- * *
- * This enumeration determines the bit depth of the codec.
- */
-typedef enum vpx_bit_depth {
-  VPX_BITS_8 = 8,   /**<  8 bits */
-  VPX_BITS_10 = 10, /**< 10 bits */
-  VPX_BITS_12 = 12, /**< 12 bits */
-} vpx_bit_depth_t;
-
-/*
- * Library Version Number Interface
- *
- * For example, see the following sample return values:
- *     vpx_codec_version()           (1<<16 | 2<<8 | 3)
- *     vpx_codec_version_str()       "v1.2.3-rc1-16-gec6a1ba"
- *     vpx_codec_version_extra_str() "rc1-16-gec6a1ba"
- */
-
-/*!\brief Return the version information (as an integer)
- *
- * Returns a packed encoding of the library version number. This will only
- * include
- * the major.minor.patch component of the version number. Note that this encoded
- * value should be accessed through the macros provided, as the encoding may
- * change
- * in the future.
- *
- */
-int vpx_codec_version(void);
-#define VPX_VERSION_MAJOR(v) \
-  ((v >> 16) & 0xff) /**< extract major from packed version */
-#define VPX_VERSION_MINOR(v) \
-  ((v >> 8) & 0xff) /**< extract minor from packed version */
-#define VPX_VERSION_PATCH(v) \
-  ((v >> 0) & 0xff) /**< extract patch from packed version */
-
-/*!\brief Return the version major number */
-#define vpx_codec_version_major() ((vpx_codec_version() >> 16) & 0xff)
-
-/*!\brief Return the version minor number */
-#define vpx_codec_version_minor() ((vpx_codec_version() >> 8) & 0xff)
-
-/*!\brief Return the version patch number */
-#define vpx_codec_version_patch() ((vpx_codec_version() >> 0) & 0xff)
-
-/*!\brief Return the version information (as a string)
- *
- * Returns a printable string containing the full library version number. This
- * may
- * contain additional text following the three digit version number, as to
- * indicate
- * release candidates, prerelease versions, etc.
- *
- */
-const char *vpx_codec_version_str(void);
-
-/*!\brief Return the version information (as a string)
- *
- * Returns a printable "extra string". This is the component of the string
- * returned
- * by vpx_codec_version_str() following the three digit version number.
- *
- */
-const char *vpx_codec_version_extra_str(void);
-
-/*!\brief Return the build configuration
- *
- * Returns a printable string containing an encoded version of the build
- * configuration. This may be useful to vpx support.
- *
- */
-const char *vpx_codec_build_config(void);
-
-/*!\brief Return the name for a given interface
- *
- * Returns a human readable string for name of the given codec interface.
- *
- * \param[in]    iface     Interface pointer
- *
- */
-const char *vpx_codec_iface_name(vpx_codec_iface_t *iface);
-
-/*!\brief Convert error number to printable string
- *
- * Returns a human readable string for the last error returned by the
- * algorithm. The returned error will be one line and will not contain
- * any newline characters.
- *
- *
- * \param[in]    err     Error number.
- *
- */
-const char *vpx_codec_err_to_string(vpx_codec_err_t err);
-
-/*!\brief Retrieve error synopsis for codec context
- *
- * Returns a human readable string for the last error returned by the
- * algorithm. The returned error will be one line and will not contain
- * any newline characters.
- *
- *
- * \param[in]    ctx     Pointer to this instance's context.
- *
- */
-const char *vpx_codec_error(vpx_codec_ctx_t *ctx);
-
-/*!\brief Retrieve detailed error information for codec context
- *
- * Returns a human readable string providing detailed information about
- * the last error.
- *
- * \param[in]    ctx     Pointer to this instance's context.
- *
- * \retval NULL
- *     No detailed information is available.
- */
-const char *vpx_codec_error_detail(vpx_codec_ctx_t *ctx);
-
-/* REQUIRED FUNCTIONS
- *
- * The following functions are required to be implemented for all codecs.
- * They represent the base case functionality expected of all codecs.
- */
-
-/*!\brief Destroy a codec instance
- *
- * Destroys a codec context, freeing any associated memory buffers.
- *
- * \param[in] ctx   Pointer to this instance's context
- *
- * \retval #VPX_CODEC_OK
- *     The codec algorithm initialized.
- * \retval #VPX_CODEC_MEM_ERROR
- *     Memory allocation failed.
- */
-vpx_codec_err_t vpx_codec_destroy(vpx_codec_ctx_t *ctx);
-
-/*!\brief Get the capabilities of an algorithm.
- *
- * Retrieves the capabilities bitfield from the algorithm's interface.
- *
- * \param[in] iface   Pointer to the algorithm interface
- *
- */
-vpx_codec_caps_t vpx_codec_get_caps(vpx_codec_iface_t *iface);
-
-/*!\brief Control algorithm
- *
- * This function is used to exchange algorithm specific data with the codec
- * instance. This can be used to implement features specific to a particular
- * algorithm.
- *
- * This wrapper function dispatches the request to the helper function
- * associated with the given ctrl_id. It tries to call this function
- * transparently, but will return #VPX_CODEC_ERROR if the request could not
- * be dispatched.
- *
- * Note that this function should not be used directly. Call the
- * #vpx_codec_control wrapper macro instead.
- *
- * \param[in]     ctx              Pointer to this instance's context
- * \param[in]     ctrl_id          Algorithm specific control identifier
- *
- * \retval #VPX_CODEC_OK
- *     The control request was processed.
- * \retval #VPX_CODEC_ERROR
- *     The control request was not processed.
- * \retval #VPX_CODEC_INVALID_PARAM
- *     The data was not valid.
- */
-vpx_codec_err_t vpx_codec_control_(vpx_codec_ctx_t *ctx, int ctrl_id, ...);
-#if defined(VPX_DISABLE_CTRL_TYPECHECKS) && VPX_DISABLE_CTRL_TYPECHECKS
-#define vpx_codec_control(ctx, id, data) vpx_codec_control_(ctx, id, data)
-#define VPX_CTRL_USE_TYPE(id, typ)
-#define VPX_CTRL_USE_TYPE_DEPRECATED(id, typ)
-#define VPX_CTRL_VOID(id, typ)
-
-#else
-/*!\brief vpx_codec_control wrapper macro
- *
- * This macro allows for type safe conversions across the variadic parameter
- * to vpx_codec_control_().
- *
- * \internal
- * It works by dispatching the call to the control function through a wrapper
- * function named with the id parameter.
- */
-#define vpx_codec_control(ctx, id, data) \
-  vpx_codec_control_##id(ctx, id, data) /**<\hideinitializer*/
-
-/*!\brief vpx_codec_control type definition macro
- *
- * This macro allows for type safe conversions across the variadic parameter
- * to vpx_codec_control_(). It defines the type of the argument for a given
- * control identifier.
- *
- * \internal
- * It defines a static function with
- * the correctly typed arguments as a wrapper to the type-unsafe internal
- * function.
- */
-#define VPX_CTRL_USE_TYPE(id, typ)                                           \
-  static vpx_codec_err_t vpx_codec_control_##id(vpx_codec_ctx_t *, int, typ) \
-      VPX_UNUSED;                                                            \
-                                                                             \
-  static vpx_codec_err_t vpx_codec_control_##id(vpx_codec_ctx_t *ctx,        \
-                                                int ctrl_id, typ data) {     \
-    return vpx_codec_control_(ctx, ctrl_id, data);                           \
-  } /**<\hideinitializer*/
-
-/*!\brief vpx_codec_control deprecated type definition macro
- *
- * Like #VPX_CTRL_USE_TYPE, but indicates that the specified control is
- * deprecated and should not be used. Consult the documentation for your
- * codec for more information.
- *
- * \internal
- * It defines a static function with the correctly typed arguments as a
- * wrapper to the type-unsafe internal function.
- */
-#define VPX_CTRL_USE_TYPE_DEPRECATED(id, typ)                            \
-  VPX_DECLSPEC_DEPRECATED static vpx_codec_err_t vpx_codec_control_##id( \
-      vpx_codec_ctx_t *, int, typ) VPX_DEPRECATED VPX_UNUSED;            \
-                                                                         \
-  VPX_DECLSPEC_DEPRECATED static vpx_codec_err_t vpx_codec_control_##id( \
-      vpx_codec_ctx_t *ctx, int ctrl_id, typ data) {                     \
-    return vpx_codec_control_(ctx, ctrl_id, data);                       \
-  } /**<\hideinitializer*/
-
-/*!\brief vpx_codec_control void type definition macro
- *
- * This macro allows for type safe conversions across the variadic parameter
- * to vpx_codec_control_(). It indicates that a given control identifier takes
- * no argument.
- *
- * \internal
- * It defines a static function without a data argument as a wrapper to the
- * type-unsafe internal function.
- */
-#define VPX_CTRL_VOID(id)                                               \
-  static vpx_codec_err_t vpx_codec_control_##id(vpx_codec_ctx_t *, int) \
-      VPX_UNUSED;                                                       \
-                                                                        \
-  static vpx_codec_err_t vpx_codec_control_##id(vpx_codec_ctx_t *ctx,   \
-                                                int ctrl_id) {          \
-    return vpx_codec_control_(ctx, ctrl_id);                            \
-  } /**<\hideinitializer*/
-
-#endif
-
-/*!@} - end defgroup codec*/
-#ifdef __cplusplus
-}
-#endif
-#endif  // VPX_VPX_CODEC_H_
diff --git a/dependencies2013/win32/include/vpx/vpx_decoder.h b/dependencies2013/win32/include/vpx/vpx_decoder.h
deleted file mode 100644
index 2ff12112..00000000
--- a/dependencies2013/win32/include/vpx/vpx_decoder.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef VPX_VPX_DECODER_H_
-#define VPX_VPX_DECODER_H_
-
-/*!\defgroup decoder Decoder Algorithm Interface
- * \ingroup codec
- * This abstraction allows applications using this decoder to easily support
- * multiple video formats with minimal code duplication. This section describes
- * the interface common to all decoders.
- * @{
- */
-
-/*!\file
- * \brief Describes the decoder algorithm interface to applications.
- *
- * This file describes the interface between an application and a
- * video decoder algorithm.
- *
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "./vpx_codec.h"
-#include "./vpx_frame_buffer.h"
-
-/*!\brief Current ABI version number
- *
- * \internal
- * If this file is altered in any way that changes the ABI, this value
- * must be bumped.  Examples include, but are not limited to, changing
- * types, removing or reassigning enums, adding/removing/rearranging
- * fields to structures
- */
-#define VPX_DECODER_ABI_VERSION \
-  (3 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
-
-/*! \brief Decoder capabilities bitfield
- *
- *  Each decoder advertises the capabilities it supports as part of its
- *  ::vpx_codec_iface_t interface structure. Capabilities are extra interfaces
- *  or functionality, and are not required to be supported by a decoder.
- *
- *  The available flags are specified by VPX_CODEC_CAP_* defines.
- */
-#define VPX_CODEC_CAP_PUT_SLICE 0x10000 /**< Will issue put_slice callbacks */
-#define VPX_CODEC_CAP_PUT_FRAME 0x20000 /**< Will issue put_frame callbacks */
-#define VPX_CODEC_CAP_POSTPROC 0x40000  /**< Can postprocess decoded frame */
-/*!\brief Can conceal errors due to packet loss */
-#define VPX_CODEC_CAP_ERROR_CONCEALMENT 0x80000
-/*!\brief Can receive encoded frames one fragment at a time */
-#define VPX_CODEC_CAP_INPUT_FRAGMENTS 0x100000
-
-/*! \brief Initialization-time Feature Enabling
- *
- *  Certain codec features must be known at initialization time, to allow for
- *  proper memory allocation.
- *
- *  The available flags are specified by VPX_CODEC_USE_* defines.
- */
-/*!\brief Can support frame-based multi-threading */
-#define VPX_CODEC_CAP_FRAME_THREADING 0x200000
-/*!brief Can support external frame buffers */
-#define VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER 0x400000
-
-#define VPX_CODEC_USE_POSTPROC 0x10000 /**< Postprocess decoded frame */
-/*!\brief Conceal errors in decoded frames */
-#define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000
-/*!\brief The input frame should be passed to the decoder one fragment at a
- * time */
-#define VPX_CODEC_USE_INPUT_FRAGMENTS 0x40000
-/*!\brief Enable frame-based multi-threading */
-#define VPX_CODEC_USE_FRAME_THREADING 0x80000
-
-/*!\brief Stream properties
- *
- * This structure is used to query or set properties of the decoded
- * stream. Algorithms may extend this structure with data specific
- * to their bitstream by setting the sz member appropriately.
- */
-typedef struct vpx_codec_stream_info {
-  unsigned int sz;    /**< Size of this structure */
-  unsigned int w;     /**< Width (or 0 for unknown/default) */
-  unsigned int h;     /**< Height (or 0 for unknown/default) */
-  unsigned int is_kf; /**< Current frame is a keyframe */
-} vpx_codec_stream_info_t;
-
-/* REQUIRED FUNCTIONS
- *
- * The following functions are required to be implemented for all decoders.
- * They represent the base case functionality expected of all decoders.
- */
-
-/*!\brief Initialization Configurations
- *
- * This structure is used to pass init time configuration options to the
- * decoder.
- */
-typedef struct vpx_codec_dec_cfg {
-  unsigned int threads; /**< Maximum number of threads to use, default 1 */
-  unsigned int w;       /**< Width */
-  unsigned int h;       /**< Height */
-} vpx_codec_dec_cfg_t;  /**< alias for struct vpx_codec_dec_cfg */
-
-/*!\brief Initialize a decoder instance
- *
- * Initializes a decoder context using the given interface. Applications
- * should call the vpx_codec_dec_init convenience macro instead of this
- * function directly, to ensure that the ABI version number parameter
- * is properly initialized.
- *
- * If the library was configured with --disable-multithread, this call
- * is not thread safe and should be guarded with a lock if being used
- * in a multithreaded context.
- *
- * \param[in]    ctx     Pointer to this instance's context.
- * \param[in]    iface   Pointer to the algorithm interface to use.
- * \param[in]    cfg     Configuration to use, if known. May be NULL.
- * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
- * \param[in]    ver     ABI version number. Must be set to
- *                       VPX_DECODER_ABI_VERSION
- * \retval #VPX_CODEC_OK
- *     The decoder algorithm initialized.
- * \retval #VPX_CODEC_MEM_ERROR
- *     Memory allocation failed.
- */
-vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx,
-                                       vpx_codec_iface_t *iface,
-                                       const vpx_codec_dec_cfg_t *cfg,
-                                       vpx_codec_flags_t flags, int ver);
-
-/*!\brief Convenience macro for vpx_codec_dec_init_ver()
- *
- * Ensures the ABI version parameter is properly set.
- */
-#define vpx_codec_dec_init(ctx, iface, cfg, flags) \
-  vpx_codec_dec_init_ver(ctx, iface, cfg, flags, VPX_DECODER_ABI_VERSION)
-
-/*!\brief Parse stream info from a buffer
- *
- * Performs high level parsing of the bitstream. Construction of a decoder
- * context is not necessary. Can be used to determine if the bitstream is
- * of the proper format, and to extract information from the stream.
- *
- * \param[in]      iface   Pointer to the algorithm interface
- * \param[in]      data    Pointer to a block of data to parse
- * \param[in]      data_sz Size of the data buffer
- * \param[in,out]  si      Pointer to stream info to update. The size member
- *                         \ref MUST be properly initialized, but \ref MAY be
- *                         clobbered by the algorithm. This parameter \ref MAY
- *                         be NULL.
- *
- * \retval #VPX_CODEC_OK
- *     Bitstream is parsable and stream information updated
- */
-vpx_codec_err_t vpx_codec_peek_stream_info(vpx_codec_iface_t *iface,
-                                           const uint8_t *data,
-                                           unsigned int data_sz,
-                                           vpx_codec_stream_info_t *si);
-
-/*!\brief Return information about the current stream.
- *
- * Returns information about the stream that has been parsed during decoding.
- *
- * \param[in]      ctx     Pointer to this instance's context
- * \param[in,out]  si      Pointer to stream info to update. The size member
- *                         \ref MUST be properly initialized, but \ref MAY be
- *                         clobbered by the algorithm. This parameter \ref MAY
- *                         be NULL.
- *
- * \retval #VPX_CODEC_OK
- *     Bitstream is parsable and stream information updated
- */
-vpx_codec_err_t vpx_codec_get_stream_info(vpx_codec_ctx_t *ctx,
-                                          vpx_codec_stream_info_t *si);
-
-/*!\brief Decode data
- *
- * Processes a buffer of coded data. If the processing results in a new
- * decoded frame becoming available, PUT_SLICE and PUT_FRAME events may be
- * generated, as appropriate. Encoded data \ref MUST be passed in DTS (decode
- * time stamp) order. Frames produced will always be in PTS (presentation
- * time stamp) order.
- * If the decoder is configured with VPX_CODEC_USE_INPUT_FRAGMENTS enabled,
- * data and data_sz can contain a fragment of the encoded frame. Fragment
- * \#n must contain at least partition \#n, but can also contain subsequent
- * partitions (\#n+1 - \#n+i), and if so, fragments \#n+1, .., \#n+i must
- * be empty. When no more data is available, this function should be called
- * with NULL as data and 0 as data_sz. The memory passed to this function
- * must be available until the frame has been decoded.
- *
- * \param[in] ctx          Pointer to this instance's context
- * \param[in] data         Pointer to this block of new coded data. If
- *                         NULL, a VPX_CODEC_CB_PUT_FRAME event is posted
- *                         for the previously decoded frame.
- * \param[in] data_sz      Size of the coded data, in bytes.
- * \param[in] user_priv    Application specific data to associate with
- *                         this frame.
- * \param[in] deadline     Soft deadline the decoder should attempt to meet,
- *                         in us. Set to zero for unlimited.
- *
- * \return Returns #VPX_CODEC_OK if the coded data was processed completely
- *         and future pictures can be decoded without error. Otherwise,
- *         see the descriptions of the other error codes in ::vpx_codec_err_t
- *         for recoverability capabilities.
- */
-vpx_codec_err_t vpx_codec_decode(vpx_codec_ctx_t *ctx, const uint8_t *data,
-                                 unsigned int data_sz, void *user_priv,
-                                 long deadline);
-
-/*!\brief Decoded frames iterator
- *
- * Iterates over a list of the frames available for display. The iterator
- * storage should be initialized to NULL to start the iteration. Iteration is
- * complete when this function returns NULL.
- *
- * The list of available frames becomes valid upon completion of the
- * vpx_codec_decode call, and remains valid until the next call to
- * vpx_codec_decode.
- *
- * \param[in]     ctx      Pointer to this instance's context
- * \param[in,out] iter     Iterator storage, initialized to NULL
- *
- * \return Returns a pointer to an image, if one is ready for display. Frames
- *         produced will always be in PTS (presentation time stamp) order.
- */
-vpx_image_t *vpx_codec_get_frame(vpx_codec_ctx_t *ctx, vpx_codec_iter_t *iter);
-
-/*!\defgroup cap_put_frame Frame-Based Decoding Functions
- *
- * The following functions are required to be implemented for all decoders
- * that advertise the VPX_CODEC_CAP_PUT_FRAME capability. Calling these
- * functions
- * for codecs that don't advertise this capability will result in an error
- * code being returned, usually VPX_CODEC_ERROR
- * @{
- */
-
-/*!\brief put frame callback prototype
- *
- * This callback is invoked by the decoder to notify the application of
- * the availability of decoded image data.
- */
-typedef void (*vpx_codec_put_frame_cb_fn_t)(void *user_priv,
-                                            const vpx_image_t *img);
-
-/*!\brief Register for notification of frame completion.
- *
- * Registers a given function to be called when a decoded frame is
- * available.
- *
- * \param[in] ctx          Pointer to this instance's context
- * \param[in] cb           Pointer to the callback function
- * \param[in] user_priv    User's private data
- *
- * \retval #VPX_CODEC_OK
- *     Callback successfully registered.
- * \retval #VPX_CODEC_ERROR
- *     Decoder context not initialized, or algorithm not capable of
- *     posting slice completion.
- */
-vpx_codec_err_t vpx_codec_register_put_frame_cb(vpx_codec_ctx_t *ctx,
-                                                vpx_codec_put_frame_cb_fn_t cb,
-                                                void *user_priv);
-
-/*!@} - end defgroup cap_put_frame */
-
-/*!\defgroup cap_put_slice Slice-Based Decoding Functions
- *
- * The following functions are required to be implemented for all decoders
- * that advertise the VPX_CODEC_CAP_PUT_SLICE capability. Calling these
- * functions
- * for codecs that don't advertise this capability will result in an error
- * code being returned, usually VPX_CODEC_ERROR
- * @{
- */
-
-/*!\brief put slice callback prototype
- *
- * This callback is invoked by the decoder to notify the application of
- * the availability of partially decoded image data. The
- */
-typedef void (*vpx_codec_put_slice_cb_fn_t)(void *user_priv,
-                                            const vpx_image_t *img,
-                                            const vpx_image_rect_t *valid,
-                                            const vpx_image_rect_t *update);
-
-/*!\brief Register for notification of slice completion.
- *
- * Registers a given function to be called when a decoded slice is
- * available.
- *
- * \param[in] ctx          Pointer to this instance's context
- * \param[in] cb           Pointer to the callback function
- * \param[in] user_priv    User's private data
- *
- * \retval #VPX_CODEC_OK
- *     Callback successfully registered.
- * \retval #VPX_CODEC_ERROR
- *     Decoder context not initialized, or algorithm not capable of
- *     posting slice completion.
- */
-vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx,
-                                                vpx_codec_put_slice_cb_fn_t cb,
-                                                void *user_priv);
-
-/*!@} - end defgroup cap_put_slice*/
-
-/*!\defgroup cap_external_frame_buffer External Frame Buffer Functions
- *
- * The following section is required to be implemented for all decoders
- * that advertise the VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER capability.
- * Calling this function for codecs that don't advertise this capability
- * will result in an error code being returned, usually VPX_CODEC_ERROR.
- *
- * \note
- * Currently this only works with VP9.
- * @{
- */
-
-/*!\brief Pass in external frame buffers for the decoder to use.
- *
- * Registers functions to be called when libvpx needs a frame buffer
- * to decode the current frame and a function to be called when libvpx does
- * not internally reference the frame buffer. This set function must
- * be called before the first call to decode or libvpx will assume the
- * default behavior of allocating frame buffers internally.
- *
- * \param[in] ctx          Pointer to this instance's context
- * \param[in] cb_get       Pointer to the get callback function
- * \param[in] cb_release   Pointer to the release callback function
- * \param[in] cb_priv      Callback's private data
- *
- * \retval #VPX_CODEC_OK
- *     External frame buffers will be used by libvpx.
- * \retval #VPX_CODEC_INVALID_PARAM
- *     One or more of the callbacks were NULL.
- * \retval #VPX_CODEC_ERROR
- *     Decoder context not initialized, or algorithm not capable of
- *     using external frame buffers.
- *
- * \note
- * When decoding VP9, the application may be required to pass in at least
- * #VP9_MAXIMUM_REF_BUFFERS + #VPX_MAXIMUM_WORK_BUFFERS external frame
- * buffers.
- */
-vpx_codec_err_t vpx_codec_set_frame_buffer_functions(
-    vpx_codec_ctx_t *ctx, vpx_get_frame_buffer_cb_fn_t cb_get,
-    vpx_release_frame_buffer_cb_fn_t cb_release, void *cb_priv);
-
-/*!@} - end defgroup cap_external_frame_buffer */
-
-/*!@} - end defgroup decoder*/
-#ifdef __cplusplus
-}
-#endif
-#endif  // VPX_VPX_DECODER_H_
diff --git a/dependencies2013/win32/include/vpx/vpx_encoder.h b/dependencies2013/win32/include/vpx/vpx_encoder.h
deleted file mode 100644
index c915ed67..00000000
--- a/dependencies2013/win32/include/vpx/vpx_encoder.h
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef VPX_VPX_ENCODER_H_
-#define VPX_VPX_ENCODER_H_
-
-/*!\defgroup encoder Encoder Algorithm Interface
- * \ingroup codec
- * This abstraction allows applications using this encoder to easily support
- * multiple video formats with minimal code duplication. This section describes
- * the interface common to all encoders.
- * @{
- */
-
-/*!\file
- * \brief Describes the encoder algorithm interface to applications.
- *
- * This file describes the interface between an application and a
- * video encoder algorithm.
- *
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "./vpx_codec.h"
-
-/*! Temporal Scalability: Maximum length of the sequence defining frame
- * layer membership
- */
-#define VPX_TS_MAX_PERIODICITY 16
-
-/*! Temporal Scalability: Maximum number of coding layers */
-#define VPX_TS_MAX_LAYERS 5
-
-/*!\deprecated Use #VPX_TS_MAX_PERIODICITY instead. */
-#define MAX_PERIODICITY VPX_TS_MAX_PERIODICITY
-
-/*! Temporal+Spatial Scalability: Maximum number of coding layers */
-#define VPX_MAX_LAYERS 12  // 3 temporal + 4 spatial layers are allowed.
-
-/*!\deprecated Use #VPX_MAX_LAYERS instead. */
-#define MAX_LAYERS VPX_MAX_LAYERS  // 3 temporal + 4 spatial layers allowed.
-
-/*! Spatial Scalability: Maximum number of coding layers */
-#define VPX_SS_MAX_LAYERS 5
-
-/*! Spatial Scalability: Default number of coding layers */
-#define VPX_SS_DEFAULT_LAYERS 1
-
-/*!\brief Current ABI version number
- *
- * \internal
- * If this file is altered in any way that changes the ABI, this value
- * must be bumped.  Examples include, but are not limited to, changing
- * types, removing or reassigning enums, adding/removing/rearranging
- * fields to structures
- */
-#define VPX_ENCODER_ABI_VERSION \
-  (5 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
-
-/*! \brief Encoder capabilities bitfield
- *
- *  Each encoder advertises the capabilities it supports as part of its
- *  ::vpx_codec_iface_t interface structure. Capabilities are extra
- *  interfaces or functionality, and are not required to be supported
- *  by an encoder.
- *
- *  The available flags are specified by VPX_CODEC_CAP_* defines.
- */
-#define VPX_CODEC_CAP_PSNR 0x10000 /**< Can issue PSNR packets */
-
-/*! Can output one partition at a time. Each partition is returned in its
- *  own VPX_CODEC_CX_FRAME_PKT, with the FRAME_IS_FRAGMENT flag set for
- *  every partition but the last. In this mode all frames are always
- *  returned partition by partition.
- */
-#define VPX_CODEC_CAP_OUTPUT_PARTITION 0x20000
-
-/*! \brief Initialization-time Feature Enabling
- *
- *  Certain codec features must be known at initialization time, to allow
- *  for proper memory allocation.
- *
- *  The available flags are specified by VPX_CODEC_USE_* defines.
- */
-#define VPX_CODEC_USE_PSNR 0x10000 /**< Calculate PSNR on each frame */
-/*!\brief Make the encoder output one  partition at a time. */
-#define VPX_CODEC_USE_OUTPUT_PARTITION 0x20000
-#define VPX_CODEC_USE_HIGHBITDEPTH 0x40000 /**< Use high bitdepth */
-
-/*!\brief Generic fixed size buffer structure
- *
- * This structure is able to hold a reference to any fixed size buffer.
- */
-typedef struct vpx_fixed_buf {
-  void *buf;       /**< Pointer to the data */
-  size_t sz;       /**< Length of the buffer, in chars */
-} vpx_fixed_buf_t; /**< alias for struct vpx_fixed_buf */
-
-/*!\brief Time Stamp Type
- *
- * An integer, which when multiplied by the stream's time base, provides
- * the absolute time of a sample.
- */
-typedef int64_t vpx_codec_pts_t;
-
-/*!\brief Compressed Frame Flags
- *
- * This type represents a bitfield containing information about a compressed
- * frame that may be useful to an application. The most significant 16 bits
- * can be used by an algorithm to provide additional detail, for example to
- * support frame types that are codec specific (MPEG-1 D-frames for example)
- */
-typedef uint32_t vpx_codec_frame_flags_t;
-#define VPX_FRAME_IS_KEY 0x1 /**< frame is the start of a GOP */
-/*!\brief frame can be dropped without affecting the stream (no future frame
- * depends on this one) */
-#define VPX_FRAME_IS_DROPPABLE 0x2
-/*!\brief frame should be decoded but will not be shown */
-#define VPX_FRAME_IS_INVISIBLE 0x4
-/*!\brief this is a fragment of the encoded frame */
-#define VPX_FRAME_IS_FRAGMENT 0x8
-
-/*!\brief Error Resilient flags
- *
- * These flags define which error resilient features to enable in the
- * encoder. The flags are specified through the
- * vpx_codec_enc_cfg::g_error_resilient variable.
- */
-typedef uint32_t vpx_codec_er_flags_t;
-/*!\brief Improve resiliency against losses of whole frames */
-#define VPX_ERROR_RESILIENT_DEFAULT 0x1
-/*!\brief The frame partitions are independently decodable by the bool decoder,
- * meaning that partitions can be decoded even though earlier partitions have
- * been lost. Note that intra prediction is still done over the partition
- * boundary. */
-#define VPX_ERROR_RESILIENT_PARTITIONS 0x2
-
-/*!\brief Encoder output packet variants
- *
- * This enumeration lists the different kinds of data packets that can be
- * returned by calls to vpx_codec_get_cx_data(). Algorithms \ref MAY
- * extend this list to provide additional functionality.
- */
-enum vpx_codec_cx_pkt_kind {
-  VPX_CODEC_CX_FRAME_PKT,   /**< Compressed video frame */
-  VPX_CODEC_STATS_PKT,      /**< Two-pass statistics for this frame */
-  VPX_CODEC_FPMB_STATS_PKT, /**< first pass mb statistics for this frame */
-  VPX_CODEC_PSNR_PKT,       /**< PSNR statistics for this frame */
-// Spatial SVC is still experimental and may be removed before the next ABI
-// bump.
-#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION)
-  VPX_CODEC_SPATIAL_SVC_LAYER_SIZES, /**< Sizes for each layer in this frame*/
-  VPX_CODEC_SPATIAL_SVC_LAYER_PSNR,  /**< PSNR for each layer in this frame*/
-#endif
-  VPX_CODEC_CUSTOM_PKT = 256 /**< Algorithm extensions  */
-};
-
-/*!\brief Encoder output packet
- *
- * This structure contains the different kinds of output data the encoder
- * may produce while compressing a frame.
- */
-typedef struct vpx_codec_cx_pkt {
-  enum vpx_codec_cx_pkt_kind kind; /**< packet variant */
-  union {
-    struct {
-      void *buf; /**< compressed data buffer */
-      size_t sz; /**< length of compressed data */
-      /*!\brief time stamp to show frame (in timebase units) */
-      vpx_codec_pts_t pts;
-      /*!\brief duration to show frame (in timebase units) */
-      unsigned long duration;
-      vpx_codec_frame_flags_t flags; /**< flags for this frame */
-      /*!\brief the partition id defines the decoding order of the partitions.
-       * Only applicable when "output partition" mode is enabled. First
-       * partition has id 0.*/
-      int partition_id;
-    } frame;                            /**< data for compressed frame packet */
-    vpx_fixed_buf_t twopass_stats;      /**< data for two-pass packet */
-    vpx_fixed_buf_t firstpass_mb_stats; /**< first pass mb packet */
-    struct vpx_psnr_pkt {
-      unsigned int samples[4]; /**< Number of samples, total/y/u/v */
-      uint64_t sse[4];         /**< sum squared error, total/y/u/v */
-      double psnr[4];          /**< PSNR, total/y/u/v */
-    } psnr;                    /**< data for PSNR packet */
-    vpx_fixed_buf_t raw;       /**< data for arbitrary packets */
-// Spatial SVC is still experimental and may be removed before the next
-// ABI bump.
-#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION)
-    size_t layer_sizes[VPX_SS_MAX_LAYERS];
-    struct vpx_psnr_pkt layer_psnr[VPX_SS_MAX_LAYERS];
-#endif
-
-    /* This packet size is fixed to allow codecs to extend this
-     * interface without having to manage storage for raw packets,
-     * i.e., if it's smaller than 128 bytes, you can store in the
-     * packet list directly.
-     */
-    char pad[128 - sizeof(enum vpx_codec_cx_pkt_kind)]; /**< fixed sz */
-  } data;                                               /**< packet data */
-} vpx_codec_cx_pkt_t; /**< alias for struct vpx_codec_cx_pkt */
-
-/*!\brief Encoder return output buffer callback
- *
- * This callback function, when registered, returns with packets when each
- * spatial layer is encoded.
- */
-// putting the definitions here for now. (agrange: find if there
-// is a better place for this)
-typedef void (*vpx_codec_enc_output_cx_pkt_cb_fn_t)(vpx_codec_cx_pkt_t *pkt,
-                                                    void *user_data);
-
-/*!\brief Callback function pointer / user data pair storage */
-typedef struct vpx_codec_enc_output_cx_cb_pair {
-  vpx_codec_enc_output_cx_pkt_cb_fn_t output_cx_pkt; /**< Callback function */
-  void *user_priv; /**< Pointer to private data */
-} vpx_codec_priv_output_cx_pkt_cb_pair_t;
-
-/*!\brief Rational Number
- *
- * This structure holds a fractional value.
- */
-typedef struct vpx_rational {
-  int num;        /**< fraction numerator */
-  int den;        /**< fraction denominator */
-} vpx_rational_t; /**< alias for struct vpx_rational */
-
-/*!\brief Multi-pass Encoding Pass */
-enum vpx_enc_pass {
-  VPX_RC_ONE_PASS,   /**< Single pass mode */
-  VPX_RC_FIRST_PASS, /**< First pass of multi-pass mode */
-  VPX_RC_LAST_PASS   /**< Final pass of multi-pass mode */
-};
-
-/*!\brief Rate control mode */
-enum vpx_rc_mode {
-  VPX_VBR, /**< Variable Bit Rate (VBR) mode */
-  VPX_CBR, /**< Constant Bit Rate (CBR) mode */
-  VPX_CQ,  /**< Constrained Quality (CQ)  mode */
-  VPX_Q,   /**< Constant Quality (Q) mode */
-};
-
-/*!\brief Keyframe placement mode.
- *
- * This enumeration determines whether keyframes are placed automatically by
- * the encoder or whether this behavior is disabled. Older releases of this
- * SDK were implemented such that VPX_KF_FIXED meant keyframes were disabled.
- * This name is confusing for this behavior, so the new symbols to be used
- * are VPX_KF_AUTO and VPX_KF_DISABLED.
- */
-enum vpx_kf_mode {
-  VPX_KF_FIXED,       /**< deprecated, implies VPX_KF_DISABLED */
-  VPX_KF_AUTO,        /**< Encoder determines optimal placement automatically */
-  VPX_KF_DISABLED = 0 /**< Encoder does not place keyframes. */
-};
-
-/*!\brief Encoded Frame Flags
- *
- * This type indicates a bitfield to be passed to vpx_codec_encode(), defining
- * per-frame boolean values. By convention, bits common to all codecs will be
- * named VPX_EFLAG_*, and bits specific to an algorithm will be named
- * /algo/_eflag_*. The lower order 16 bits are reserved for common use.
- */
-typedef long vpx_enc_frame_flags_t;
-#define VPX_EFLAG_FORCE_KF (1 << 0) /**< Force this frame to be a keyframe */
-
-/*!\brief Encoder configuration structure
- *
- * This structure contains the encoder settings that have common representations
- * across all codecs. This doesn't imply that all codecs support all features,
- * however.
- */
-typedef struct vpx_codec_enc_cfg {
-  /*
-   * generic settings (g)
-   */
-
-  /*!\brief Algorithm specific "usage" value
-   *
-   * Algorithms may define multiple values for usage, which may convey the
-   * intent of how the application intends to use the stream. If this value
-   * is non-zero, consult the documentation for the codec to determine its
-   * meaning.
-   */
-  unsigned int g_usage;
-
-  /*!\brief Maximum number of threads to use
-   *
-   * For multi-threaded implementations, use no more than this number of
-   * threads. The codec may use fewer threads than allowed. The value
-   * 0 is equivalent to the value 1.
-   */
-  unsigned int g_threads;
-
-  /*!\brief Bitstream profile to use
-   *
-   * Some codecs support a notion of multiple bitstream profiles. Typically
-   * this maps to a set of features that are turned on or off. Often the
-   * profile to use is determined by the features of the intended decoder.
-   * Consult the documentation for the codec to determine the valid values
-   * for this parameter, or set to zero for a sane default.
-   */
-  unsigned int g_profile; /**< profile of bitstream to use */
-
-  /*!\brief Width of the frame
-   *
-   * This value identifies the presentation resolution of the frame,
-   * in pixels. Note that the frames passed as input to the encoder must
-   * have this resolution. Frames will be presented by the decoder in this
-   * resolution, independent of any spatial resampling the encoder may do.
-   */
-  unsigned int g_w;
-
-  /*!\brief Height of the frame
-   *
-   * This value identifies the presentation resolution of the frame,
-   * in pixels. Note that the frames passed as input to the encoder must
-   * have this resolution. Frames will be presented by the decoder in this
-   * resolution, independent of any spatial resampling the encoder may do.
-   */
-  unsigned int g_h;
-
-  /*!\brief Bit-depth of the codec
-   *
-   * This value identifies the bit_depth of the codec,
-   * Only certain bit-depths are supported as identified in the
-   * vpx_bit_depth_t enum.
-   */
-  vpx_bit_depth_t g_bit_depth;
-
-  /*!\brief Bit-depth of the input frames
-   *
-   * This value identifies the bit_depth of the input frames in bits.
-   * Note that the frames passed as input to the encoder must have
-   * this bit-depth.
-   */
-  unsigned int g_input_bit_depth;
-
-  /*!\brief Stream timebase units
-   *
-   * Indicates the smallest interval of time, in seconds, used by the stream.
-   * For fixed frame rate material, or variable frame rate material where
-   * frames are timed at a multiple of a given clock (ex: video capture),
-   * the \ref RECOMMENDED method is to set the timebase to the reciprocal
-   * of the frame rate (ex: 1001/30000 for 29.970 Hz NTSC). This allows the
-   * pts to correspond to the frame number, which can be handy. For
-   * re-encoding video from containers with absolute time timestamps, the
-   * \ref RECOMMENDED method is to set the timebase to that of the parent
-   * container or multimedia framework (ex: 1/1000 for ms, as in FLV).
-   */
-  struct vpx_rational g_timebase;
-
-  /*!\brief Enable error resilient modes.
-   *
-   * The error resilient bitfield indicates to the encoder which features
-   * it should enable to take measures for streaming over lossy or noisy
-   * links.
-   */
-  vpx_codec_er_flags_t g_error_resilient;
-
-  /*!\brief Multi-pass Encoding Mode
-   *
-   * This value should be set to the current phase for multi-pass encoding.
-   * For single pass, set to #VPX_RC_ONE_PASS.
-   */
-  enum vpx_enc_pass g_pass;
-
-  /*!\brief Allow lagged encoding
-   *
-   * If set, this value allows the encoder to consume a number of input
-   * frames before producing output frames. This allows the encoder to
-   * base decisions for the current frame on future frames. This does
-   * increase the latency of the encoding pipeline, so it is not appropriate
-   * in all situations (ex: realtime encoding).
-   *
-   * Note that this is a maximum value -- the encoder may produce frames
-   * sooner than the given limit. Set this value to 0 to disable this
-   * feature.
-   */
-  unsigned int g_lag_in_frames;
-
-  /*
-   * rate control settings (rc)
-   */
-
-  /*!\brief Temporal resampling configuration, if supported by the codec.
-   *
-   * Temporal resampling allows the codec to "drop" frames as a strategy to
-   * meet its target data rate. This can cause temporal discontinuities in
-   * the encoded video, which may appear as stuttering during playback. This
-   * trade-off is often acceptable, but for many applications is not. It can
-   * be disabled in these cases.
-   *
-   * Note that not all codecs support this feature. All vpx VPx codecs do.
-   * For other codecs, consult the documentation for that algorithm.
-   *
-   * This threshold is described as a percentage of the target data buffer.
-   * When the data buffer falls below this percentage of fullness, a
-   * dropped frame is indicated. Set the threshold to zero (0) to disable
-   * this feature.
-   */
-  unsigned int rc_dropframe_thresh;
-
-  /*!\brief Enable/disable spatial resampling, if supported by the codec.
-   *
-   * Spatial resampling allows the codec to compress a lower resolution
-   * version of the frame, which is then upscaled by the encoder to the
-   * correct presentation resolution. This increases visual quality at
-   * low data rates, at the expense of CPU time on the encoder/decoder.
-   */
-  unsigned int rc_resize_allowed;
-
-  /*!\brief Internal coded frame width.
-   *
-   * If spatial resampling is enabled this specifies the width of the
-   * encoded frame.
-   */
-  unsigned int rc_scaled_width;
-
-  /*!\brief Internal coded frame height.
-   *
-   * If spatial resampling is enabled this specifies the height of the
-   * encoded frame.
-   */
-  unsigned int rc_scaled_height;
-
-  /*!\brief Spatial resampling up watermark.
-   *
-   * This threshold is described as a percentage of the target data buffer.
-   * When the data buffer rises above this percentage of fullness, the
-   * encoder will step up to a higher resolution version of the frame.
-   */
-  unsigned int rc_resize_up_thresh;
-
-  /*!\brief Spatial resampling down watermark.
-   *
-   * This threshold is described as a percentage of the target data buffer.
-   * When the data buffer falls below this percentage of fullness, the
-   * encoder will step down to a lower resolution version of the frame.
-   */
-  unsigned int rc_resize_down_thresh;
-
-  /*!\brief Rate control algorithm to use.
-   *
-   * Indicates whether the end usage of this stream is to be streamed over
-   * a bandwidth constrained link, indicating that Constant Bit Rate (CBR)
-   * mode should be used, or whether it will be played back on a high
-   * bandwidth link, as from a local disk, where higher variations in
-   * bitrate are acceptable.
-   */
-  enum vpx_rc_mode rc_end_usage;
-
-  /*!\brief Two-pass stats buffer.
-   *
-   * A buffer containing all of the stats packets produced in the first
-   * pass, concatenated.
-   */
-  vpx_fixed_buf_t rc_twopass_stats_in;
-
-  /*!\brief first pass mb stats buffer.
-   *
-   * A buffer containing all of the first pass mb stats packets produced
-   * in the first pass, concatenated.
-   */
-  vpx_fixed_buf_t rc_firstpass_mb_stats_in;
-
-  /*!\brief Target data rate
-   *
-   * Target bandwidth to use for this stream, in kilobits per second.
-   */
-  unsigned int rc_target_bitrate;
-
-  /*
-   * quantizer settings
-   */
-
-  /*!\brief Minimum (Best Quality) Quantizer
-   *
-   * The quantizer is the most direct control over the quality of the
-   * encoded image. The range of valid values for the quantizer is codec
-   * specific. Consult the documentation for the codec to determine the
-   * values to use. To determine the range programmatically, call
-   * vpx_codec_enc_config_default() with a usage value of 0.
-   */
-  unsigned int rc_min_quantizer;
-
-  /*!\brief Maximum (Worst Quality) Quantizer
-   *
-   * The quantizer is the most direct control over the quality of the
-   * encoded image. The range of valid values for the quantizer is codec
-   * specific. Consult the documentation for the codec to determine the
-   * values to use. To determine the range programmatically, call
-   * vpx_codec_enc_config_default() with a usage value of 0.
-   */
-  unsigned int rc_max_quantizer;
-
-  /*
-   * bitrate tolerance
-   */
-
-  /*!\brief Rate control adaptation undershoot control
-   *
-   * This value, expressed as a percentage of the target bitrate,
-   * controls the maximum allowed adaptation speed of the codec.
-   * This factor controls the maximum amount of bits that can
-   * be subtracted from the target bitrate in order to compensate
-   * for prior overshoot.
-   *
-   * Valid values in the range 0-1000.
-   */
-  unsigned int rc_undershoot_pct;
-
-  /*!\brief Rate control adaptation overshoot control
-   *
-   * This value, expressed as a percentage of the target bitrate,
-   * controls the maximum allowed adaptation speed of the codec.
-   * This factor controls the maximum amount of bits that can
-   * be added to the target bitrate in order to compensate for
-   * prior undershoot.
-   *
-   * Valid values in the range 0-1000.
-   */
-  unsigned int rc_overshoot_pct;
-
-  /*
-   * decoder buffer model parameters
-   */
-
-  /*!\brief Decoder Buffer Size
-   *
-   * This value indicates the amount of data that may be buffered by the
-   * decoding application. Note that this value is expressed in units of
-   * time (milliseconds). For example, a value of 5000 indicates that the
-   * client will buffer (at least) 5000ms worth of encoded data. Use the
-   * target bitrate (#rc_target_bitrate) to convert to bits/bytes, if
-   * necessary.
-   */
-  unsigned int rc_buf_sz;
-
-  /*!\brief Decoder Buffer Initial Size
-   *
-   * This value indicates the amount of data that will be buffered by the
-   * decoding application prior to beginning playback. This value is
-   * expressed in units of time (milliseconds). Use the target bitrate
-   * (#rc_target_bitrate) to convert to bits/bytes, if necessary.
-   */
-  unsigned int rc_buf_initial_sz;
-
-  /*!\brief Decoder Buffer Optimal Size
-   *
-   * This value indicates the amount of data that the encoder should try
-   * to maintain in the decoder's buffer. This value is expressed in units
-   * of time (milliseconds). Use the target bitrate (#rc_target_bitrate)
-   * to convert to bits/bytes, if necessary.
-   */
-  unsigned int rc_buf_optimal_sz;
-
-  /*
-   * 2 pass rate control parameters
-   */
-
-  /*!\brief Two-pass mode CBR/VBR bias
-   *
-   * Bias, expressed on a scale of 0 to 100, for determining target size
-   * for the current frame. The value 0 indicates the optimal CBR mode
-   * value should be used. The value 100 indicates the optimal VBR mode
-   * value should be used. Values in between indicate which way the
-   * encoder should "lean."
-   */
-  unsigned int rc_2pass_vbr_bias_pct;
-
-  /*!\brief Two-pass mode per-GOP minimum bitrate
-   *
-   * This value, expressed as a percentage of the target bitrate, indicates
-   * the minimum bitrate to be used for a single GOP (aka "section")
-   */
-  unsigned int rc_2pass_vbr_minsection_pct;
-
-  /*!\brief Two-pass mode per-GOP maximum bitrate
-   *
-   * This value, expressed as a percentage of the target bitrate, indicates
-   * the maximum bitrate to be used for a single GOP (aka "section")
-   */
-  unsigned int rc_2pass_vbr_maxsection_pct;
-
-  /*
-   * keyframing settings (kf)
-   */
-
-  /*!\brief Keyframe placement mode
-   *
-   * This value indicates whether the encoder should place keyframes at a
-   * fixed interval, or determine the optimal placement automatically
-   * (as governed by the #kf_min_dist and #kf_max_dist parameters)
-   */
-  enum vpx_kf_mode kf_mode;
-
-  /*!\brief Keyframe minimum interval
-   *
-   * This value, expressed as a number of frames, prevents the encoder from
-   * placing a keyframe nearer than kf_min_dist to the previous keyframe. At
-   * least kf_min_dist frames non-keyframes will be coded before the next
-   * keyframe. Set kf_min_dist equal to kf_max_dist for a fixed interval.
-   */
-  unsigned int kf_min_dist;
-
-  /*!\brief Keyframe maximum interval
-   *
-   * This value, expressed as a number of frames, forces the encoder to code
-   * a keyframe if one has not been coded in the last kf_max_dist frames.
-   * A value of 0 implies all frames will be keyframes. Set kf_min_dist
-   * equal to kf_max_dist for a fixed interval.
-   */
-  unsigned int kf_max_dist;
-
-  /*
-   * Spatial scalability settings (ss)
-   */
-
-  /*!\brief Number of spatial coding layers.
-   *
-   * This value specifies the number of spatial coding layers to be used.
-   */
-  unsigned int ss_number_layers;
-
-  /*!\brief Enable auto alt reference flags for each spatial layer.
-   *
-   * These values specify if auto alt reference frame is enabled for each
-   * spatial layer.
-   */
-  int ss_enable_auto_alt_ref[VPX_SS_MAX_LAYERS];
-
-  /*!\brief Target bitrate for each spatial layer.
-   *
-   * These values specify the target coding bitrate to be used for each
-   * spatial layer.
-   */
-  unsigned int ss_target_bitrate[VPX_SS_MAX_LAYERS];
-
-  /*!\brief Number of temporal coding layers.
-   *
-   * This value specifies the number of temporal layers to be used.
-   */
-  unsigned int ts_number_layers;
-
-  /*!\brief Target bitrate for each temporal layer.
-   *
-   * These values specify the target coding bitrate to be used for each
-   * temporal layer.
-   */
-  unsigned int ts_target_bitrate[VPX_TS_MAX_LAYERS];
-
-  /*!\brief Frame rate decimation factor for each temporal layer.
-   *
-   * These values specify the frame rate decimation factors to apply
-   * to each temporal layer.
-   */
-  unsigned int ts_rate_decimator[VPX_TS_MAX_LAYERS];
-
-  /*!\brief Length of the sequence defining frame temporal layer membership.
-   *
-   * This value specifies the length of the sequence that defines the
-   * membership of frames to temporal layers. For example, if the
-   * ts_periodicity = 8, then the frames are assigned to coding layers with a
-   * repeated sequence of length 8.
-  */
-  unsigned int ts_periodicity;
-
-  /*!\brief Template defining the membership of frames to temporal layers.
-   *
-   * This array defines the membership of frames to temporal coding layers.
-   * For a 2-layer encoding that assigns even numbered frames to one temporal
-   * layer (0) and odd numbered frames to a second temporal layer (1) with
-   * ts_periodicity=8, then ts_layer_id = (0,1,0,1,0,1,0,1).
-  */
-  unsigned int ts_layer_id[VPX_TS_MAX_PERIODICITY];
-
-  /*!\brief Target bitrate for each spatial/temporal layer.
-   *
-   * These values specify the target coding bitrate to be used for each
-   * spatial/temporal layer.
-   *
-   */
-  unsigned int layer_target_bitrate[VPX_MAX_LAYERS];
-
-  /*!\brief Temporal layering mode indicating which temporal layering scheme to
-   * use.
-   *
-   * The value (refer to VP9E_TEMPORAL_LAYERING_MODE) specifies the
-   * temporal layering mode to use.
-   *
-   */
-  int temporal_layering_mode;
-} vpx_codec_enc_cfg_t; /**< alias for struct vpx_codec_enc_cfg */
-
-/*!\brief  vp9 svc extra configure parameters
- *
- * This defines max/min quantizers and scale factors for each layer
- *
- */
-typedef struct vpx_svc_parameters {
-  int max_quantizers[VPX_MAX_LAYERS];     /**< Max Q for each layer */
-  int min_quantizers[VPX_MAX_LAYERS];     /**< Min Q for each layer */
-  int scaling_factor_num[VPX_MAX_LAYERS]; /**< Scaling factor-numerator */
-  int scaling_factor_den[VPX_MAX_LAYERS]; /**< Scaling factor-denominator */
-  int speed_per_layer[VPX_MAX_LAYERS];    /**< Speed setting for each sl */
-  int temporal_layering_mode;             /**< Temporal layering mode */
-} vpx_svc_extra_cfg_t;
-
-/*!\brief Initialize an encoder instance
- *
- * Initializes a encoder context using the given interface. Applications
- * should call the vpx_codec_enc_init convenience macro instead of this
- * function directly, to ensure that the ABI version number parameter
- * is properly initialized.
- *
- * If the library was configured with --disable-multithread, this call
- * is not thread safe and should be guarded with a lock if being used
- * in a multithreaded context.
- *
- * \param[in]    ctx     Pointer to this instance's context.
- * \param[in]    iface   Pointer to the algorithm interface to use.
- * \param[in]    cfg     Configuration to use, if known. May be NULL.
- * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
- * \param[in]    ver     ABI version number. Must be set to
- *                       VPX_ENCODER_ABI_VERSION
- * \retval #VPX_CODEC_OK
- *     The decoder algorithm initialized.
- * \retval #VPX_CODEC_MEM_ERROR
- *     Memory allocation failed.
- */
-vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx,
-                                       vpx_codec_iface_t *iface,
-                                       const vpx_codec_enc_cfg_t *cfg,
-                                       vpx_codec_flags_t flags, int ver);
-
-/*!\brief Convenience macro for vpx_codec_enc_init_ver()
- *
- * Ensures the ABI version parameter is properly set.
- */
-#define vpx_codec_enc_init(ctx, iface, cfg, flags) \
-  vpx_codec_enc_init_ver(ctx, iface, cfg, flags, VPX_ENCODER_ABI_VERSION)
-
-/*!\brief Initialize multi-encoder instance
- *
- * Initializes multi-encoder context using the given interface.
- * Applications should call the vpx_codec_enc_init_multi convenience macro
- * instead of this function directly, to ensure that the ABI version number
- * parameter is properly initialized.
- *
- * \param[in]    ctx     Pointer to this instance's context.
- * \param[in]    iface   Pointer to the algorithm interface to use.
- * \param[in]    cfg     Configuration to use, if known. May be NULL.
- * \param[in]    num_enc Total number of encoders.
- * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
- * \param[in]    dsf     Pointer to down-sampling factors.
- * \param[in]    ver     ABI version number. Must be set to
- *                       VPX_ENCODER_ABI_VERSION
- * \retval #VPX_CODEC_OK
- *     The decoder algorithm initialized.
- * \retval #VPX_CODEC_MEM_ERROR
- *     Memory allocation failed.
- */
-vpx_codec_err_t vpx_codec_enc_init_multi_ver(
-    vpx_codec_ctx_t *ctx, vpx_codec_iface_t *iface, vpx_codec_enc_cfg_t *cfg,
-    int num_enc, vpx_codec_flags_t flags, vpx_rational_t *dsf, int ver);
-
-/*!\brief Convenience macro for vpx_codec_enc_init_multi_ver()
- *
- * Ensures the ABI version parameter is properly set.
- */
-#define vpx_codec_enc_init_multi(ctx, iface, cfg, num_enc, flags, dsf) \
-  vpx_codec_enc_init_multi_ver(ctx, iface, cfg, num_enc, flags, dsf,   \
-                               VPX_ENCODER_ABI_VERSION)
-
-/*!\brief Get a default configuration
- *
- * Initializes a encoder configuration structure with default values. Supports
- * the notion of "usages" so that an algorithm may offer different default
- * settings depending on the user's intended goal. This function \ref SHOULD
- * be called by all applications to initialize the configuration structure
- * before specializing the configuration with application specific values.
- *
- * \param[in]    iface     Pointer to the algorithm interface to use.
- * \param[out]   cfg       Configuration buffer to populate.
- * \param[in]    reserved  Must set to 0 for VP8 and VP9.
- *
- * \retval #VPX_CODEC_OK
- *     The configuration was populated.
- * \retval #VPX_CODEC_INCAPABLE
- *     Interface is not an encoder interface.
- * \retval #VPX_CODEC_INVALID_PARAM
- *     A parameter was NULL, or the usage value was not recognized.
- */
-vpx_codec_err_t vpx_codec_enc_config_default(vpx_codec_iface_t *iface,
-                                             vpx_codec_enc_cfg_t *cfg,
-                                             unsigned int reserved);
-
-/*!\brief Set or change configuration
- *
- * Reconfigures an encoder instance according to the given configuration.
- *
- * \param[in]    ctx     Pointer to this instance's context
- * \param[in]    cfg     Configuration buffer to use
- *
- * \retval #VPX_CODEC_OK
- *     The configuration was populated.
- * \retval #VPX_CODEC_INCAPABLE
- *     Interface is not an encoder interface.
- * \retval #VPX_CODEC_INVALID_PARAM
- *     A parameter was NULL, or the usage value was not recognized.
- */
-vpx_codec_err_t vpx_codec_enc_config_set(vpx_codec_ctx_t *ctx,
-                                         const vpx_codec_enc_cfg_t *cfg);
-
-/*!\brief Get global stream headers
- *
- * Retrieves a stream level global header packet, if supported by the codec.
- *
- * \param[in]    ctx     Pointer to this instance's context
- *
- * \retval NULL
- *     Encoder does not support global header
- * \retval Non-NULL
- *     Pointer to buffer containing global header packet
- */
-vpx_fixed_buf_t *vpx_codec_get_global_headers(vpx_codec_ctx_t *ctx);
-
-/*!\brief deadline parameter analogous to VPx REALTIME mode. */
-#define VPX_DL_REALTIME (1)
-/*!\brief deadline parameter analogous to  VPx GOOD QUALITY mode. */
-#define VPX_DL_GOOD_QUALITY (1000000)
-/*!\brief deadline parameter analogous to VPx BEST QUALITY mode. */
-#define VPX_DL_BEST_QUALITY (0)
-/*!\brief Encode a frame
- *
- * Encodes a video frame at the given "presentation time." The presentation
- * time stamp (PTS) \ref MUST be strictly increasing.
- *
- * The encoder supports the notion of a soft real-time deadline. Given a
- * non-zero value to the deadline parameter, the encoder will make a "best
- * effort" guarantee to  return before the given time slice expires. It is
- * implicit that limiting the available time to encode will degrade the
- * output quality. The encoder can be given an unlimited time to produce the
- * best possible frame by specifying a deadline of '0'. This deadline
- * supercedes the VPx notion of "best quality, good quality, realtime".
- * Applications that wish to map these former settings to the new deadline
- * based system can use the symbols #VPX_DL_REALTIME, #VPX_DL_GOOD_QUALITY,
- * and #VPX_DL_BEST_QUALITY.
- *
- * When the last frame has been passed to the encoder, this function should
- * continue to be called, with the img parameter set to NULL. This will
- * signal the end-of-stream condition to the encoder and allow it to encode
- * any held buffers. Encoding is complete when vpx_codec_encode() is called
- * and vpx_codec_get_cx_data() returns no data.
- *
- * \param[in]    ctx       Pointer to this instance's context
- * \param[in]    img       Image data to encode, NULL to flush.
- * \param[in]    pts       Presentation time stamp, in timebase units.
- * \param[in]    duration  Duration to show frame, in timebase units.
- * \param[in]    flags     Flags to use for encoding this frame.
- * \param[in]    deadline  Time to spend encoding, in microseconds. (0=infinite)
- *
- * \retval #VPX_CODEC_OK
- *     The configuration was populated.
- * \retval #VPX_CODEC_INCAPABLE
- *     Interface is not an encoder interface.
- * \retval #VPX_CODEC_INVALID_PARAM
- *     A parameter was NULL, the image format is unsupported, etc.
- */
-vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx, const vpx_image_t *img,
-                                 vpx_codec_pts_t pts, unsigned long duration,
-                                 vpx_enc_frame_flags_t flags,
-                                 unsigned long deadline);
-
-/*!\brief Set compressed data output buffer
- *
- * Sets the buffer that the codec should output the compressed data
- * into. This call effectively sets the buffer pointer returned in the
- * next VPX_CODEC_CX_FRAME_PKT packet. Subsequent packets will be
- * appended into this buffer. The buffer is preserved across frames,
- * so applications must periodically call this function after flushing
- * the accumulated compressed data to disk or to the network to reset
- * the pointer to the buffer's head.
- *
- * `pad_before` bytes will be skipped before writing the compressed
- * data, and `pad_after` bytes will be appended to the packet. The size
- * of the packet will be the sum of the size of the actual compressed
- * data, pad_before, and pad_after. The padding bytes will be preserved
- * (not overwritten).
- *
- * Note that calling this function does not guarantee that the returned
- * compressed data will be placed into the specified buffer. In the
- * event that the encoded data will not fit into the buffer provided,
- * the returned packet \ref MAY point to an internal buffer, as it would
- * if this call were never used. In this event, the output packet will
- * NOT have any padding, and the application must free space and copy it
- * to the proper place. This is of particular note in configurations
- * that may output multiple packets for a single encoded frame (e.g., lagged
- * encoding) or if the application does not reset the buffer periodically.
- *
- * Applications may restore the default behavior of the codec providing
- * the compressed data buffer by calling this function with a NULL
- * buffer.
- *
- * Applications \ref MUSTNOT call this function during iteration of
- * vpx_codec_get_cx_data().
- *
- * \param[in]    ctx         Pointer to this instance's context
- * \param[in]    buf         Buffer to store compressed data into
- * \param[in]    pad_before  Bytes to skip before writing compressed data
- * \param[in]    pad_after   Bytes to skip after writing compressed data
- *
- * \retval #VPX_CODEC_OK
- *     The buffer was set successfully.
- * \retval #VPX_CODEC_INVALID_PARAM
- *     A parameter was NULL, the image format is unsupported, etc.
- */
-vpx_codec_err_t vpx_codec_set_cx_data_buf(vpx_codec_ctx_t *ctx,
-                                          const vpx_fixed_buf_t *buf,
-                                          unsigned int pad_before,
-                                          unsigned int pad_after);
-
-/*!\brief Encoded data iterator
- *
- * Iterates over a list of data packets to be passed from the encoder to the
- * application. The different kinds of packets available are enumerated in
- * #vpx_codec_cx_pkt_kind.
- *
- * #VPX_CODEC_CX_FRAME_PKT packets should be passed to the application's
- * muxer. Multiple compressed frames may be in the list.
- * #VPX_CODEC_STATS_PKT packets should be appended to a global buffer.
- *
- * The application \ref MUST silently ignore any packet kinds that it does
- * not recognize or support.
- *
- * The data buffers returned from this function are only guaranteed to be
- * valid until the application makes another call to any vpx_codec_* function.
- *
- * \param[in]     ctx      Pointer to this instance's context
- * \param[in,out] iter     Iterator storage, initialized to NULL
- *
- * \return Returns a pointer to an output data packet (compressed frame data,
- *         two-pass statistics, etc.) or NULL to signal end-of-list.
- *
- */
-const vpx_codec_cx_pkt_t *vpx_codec_get_cx_data(vpx_codec_ctx_t *ctx,
-                                                vpx_codec_iter_t *iter);
-
-/*!\brief Get Preview Frame
- *
- * Returns an image that can be used as a preview. Shows the image as it would
- * exist at the decompressor. The application \ref MUST NOT write into this
- * image buffer.
- *
- * \param[in]     ctx      Pointer to this instance's context
- *
- * \return Returns a pointer to a preview image, or NULL if no image is
- *         available.
- *
- */
-const vpx_image_t *vpx_codec_get_preview_frame(vpx_codec_ctx_t *ctx);
-
-/*!@} - end defgroup encoder*/
-#ifdef __cplusplus
-}
-#endif
-#endif  // VPX_VPX_ENCODER_H_
diff --git a/dependencies2013/win32/include/vpx/vpx_frame_buffer.h b/dependencies2013/win32/include/vpx/vpx_frame_buffer.h
deleted file mode 100644
index ad70cdd5..00000000
--- a/dependencies2013/win32/include/vpx/vpx_frame_buffer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef VPX_VPX_FRAME_BUFFER_H_
-#define VPX_VPX_FRAME_BUFFER_H_
-
-/*!\file
- * \brief Describes the decoder external frame buffer interface.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "./vpx_integer.h"
-
-/*!\brief The maximum number of work buffers used by libvpx.
- *  Support maximum 4 threads to decode video in parallel.
- *  Each thread will use one work buffer.
- * TODO(hkuang): Add support to set number of worker threads dynamically.
- */
-#define VPX_MAXIMUM_WORK_BUFFERS 8
-
-/*!\brief The maximum number of reference buffers that a VP9 encoder may use.
- */
-#define VP9_MAXIMUM_REF_BUFFERS 8
-
-/*!\brief External frame buffer
- *
- * This structure holds allocated frame buffers used by the decoder.
- */
-typedef struct vpx_codec_frame_buffer {
-  uint8_t *data; /**< Pointer to the data buffer */
-  size_t size;   /**< Size of data in bytes */
-  void *priv;    /**< Frame's private data */
-} vpx_codec_frame_buffer_t;
-
-/*!\brief get frame buffer callback prototype
- *
- * This callback is invoked by the decoder to retrieve data for the frame
- * buffer in order for the decode call to complete. The callback must
- * allocate at least min_size in bytes and assign it to fb->data. The callback
- * must zero out all the data allocated. Then the callback must set fb->size
- * to the allocated size. The application does not need to align the allocated
- * data. The callback is triggered when the decoder needs a frame buffer to
- * decode a compressed image into. This function may be called more than once
- * for every call to vpx_codec_decode. The application may set fb->priv to
- * some data which will be passed back in the ximage and the release function
- * call. |fb| is guaranteed to not be NULL. On success the callback must
- * return 0. Any failure the callback must return a value less than 0.
- *
- * \param[in] priv         Callback's private data
- * \param[in] new_size     Size in bytes needed by the buffer
- * \param[in,out] fb       Pointer to vpx_codec_frame_buffer_t
- */
-typedef int (*vpx_get_frame_buffer_cb_fn_t)(void *priv, size_t min_size,
-                                            vpx_codec_frame_buffer_t *fb);
-
-/*!\brief release frame buffer callback prototype
- *
- * This callback is invoked by the decoder when the frame buffer is not
- * referenced by any other buffers. |fb| is guaranteed to not be NULL. On
- * success the callback must return 0. Any failure the callback must return
- * a value less than 0.
- *
- * \param[in] priv         Callback's private data
- * \param[in] fb           Pointer to vpx_codec_frame_buffer_t
- */
-typedef int (*vpx_release_frame_buffer_cb_fn_t)(void *priv,
-                                                vpx_codec_frame_buffer_t *fb);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // VPX_VPX_FRAME_BUFFER_H_
diff --git a/dependencies2013/win32/include/vpx/vpx_image.h b/dependencies2013/win32/include/vpx/vpx_image.h
deleted file mode 100644
index d6d3166d..00000000
--- a/dependencies2013/win32/include/vpx/vpx_image.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*!\file
- * \brief Describes the vpx image descriptor and associated operations
- *
- */
-#ifndef VPX_VPX_IMAGE_H_
-#define VPX_VPX_IMAGE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!\brief Current ABI version number
- *
- * \internal
- * If this file is altered in any way that changes the ABI, this value
- * must be bumped.  Examples include, but are not limited to, changing
- * types, removing or reassigning enums, adding/removing/rearranging
- * fields to structures
- */
-#define VPX_IMAGE_ABI_VERSION (4) /**<\hideinitializer*/
-
-#define VPX_IMG_FMT_PLANAR 0x100       /**< Image is a planar format. */
-#define VPX_IMG_FMT_UV_FLIP 0x200      /**< V plane precedes U in memory. */
-#define VPX_IMG_FMT_HAS_ALPHA 0x400    /**< Image has an alpha channel. */
-#define VPX_IMG_FMT_HIGHBITDEPTH 0x800 /**< Image uses 16bit framebuffer. */
-
-/*!\brief List of supported image formats */
-typedef enum vpx_img_fmt {
-  VPX_IMG_FMT_NONE,
-  VPX_IMG_FMT_RGB24,     /**< 24 bit per pixel packed RGB */
-  VPX_IMG_FMT_RGB32,     /**< 32 bit per pixel packed 0RGB */
-  VPX_IMG_FMT_RGB565,    /**< 16 bit per pixel, 565 */
-  VPX_IMG_FMT_RGB555,    /**< 16 bit per pixel, 555 */
-  VPX_IMG_FMT_UYVY,      /**< UYVY packed YUV */
-  VPX_IMG_FMT_YUY2,      /**< YUYV packed YUV */
-  VPX_IMG_FMT_YVYU,      /**< YVYU packed YUV */
-  VPX_IMG_FMT_BGR24,     /**< 24 bit per pixel packed BGR */
-  VPX_IMG_FMT_RGB32_LE,  /**< 32 bit packed BGR0 */
-  VPX_IMG_FMT_ARGB,      /**< 32 bit packed ARGB, alpha=255 */
-  VPX_IMG_FMT_ARGB_LE,   /**< 32 bit packed BGRA, alpha=255 */
-  VPX_IMG_FMT_RGB565_LE, /**< 16 bit per pixel, gggbbbbb rrrrrggg */
-  VPX_IMG_FMT_RGB555_LE, /**< 16 bit per pixel, gggbbbbb 0rrrrrgg */
-  VPX_IMG_FMT_YV12 =
-      VPX_IMG_FMT_PLANAR | VPX_IMG_FMT_UV_FLIP | 1, /**< planar YVU */
-  VPX_IMG_FMT_I420 = VPX_IMG_FMT_PLANAR | 2,
-  VPX_IMG_FMT_VPXYV12 = VPX_IMG_FMT_PLANAR | VPX_IMG_FMT_UV_FLIP |
-                        3, /** < planar 4:2:0 format with vpx color space */
-  VPX_IMG_FMT_VPXI420 = VPX_IMG_FMT_PLANAR | 4,
-  VPX_IMG_FMT_I422 = VPX_IMG_FMT_PLANAR | 5,
-  VPX_IMG_FMT_I444 = VPX_IMG_FMT_PLANAR | 6,
-  VPX_IMG_FMT_I440 = VPX_IMG_FMT_PLANAR | 7,
-  VPX_IMG_FMT_444A = VPX_IMG_FMT_PLANAR | VPX_IMG_FMT_HAS_ALPHA | 6,
-  VPX_IMG_FMT_I42016 = VPX_IMG_FMT_I420 | VPX_IMG_FMT_HIGHBITDEPTH,
-  VPX_IMG_FMT_I42216 = VPX_IMG_FMT_I422 | VPX_IMG_FMT_HIGHBITDEPTH,
-  VPX_IMG_FMT_I44416 = VPX_IMG_FMT_I444 | VPX_IMG_FMT_HIGHBITDEPTH,
-  VPX_IMG_FMT_I44016 = VPX_IMG_FMT_I440 | VPX_IMG_FMT_HIGHBITDEPTH
-} vpx_img_fmt_t; /**< alias for enum vpx_img_fmt */
-
-/*!\brief List of supported color spaces */
-typedef enum vpx_color_space {
-  VPX_CS_UNKNOWN = 0,   /**< Unknown */
-  VPX_CS_BT_601 = 1,    /**< BT.601 */
-  VPX_CS_BT_709 = 2,    /**< BT.709 */
-  VPX_CS_SMPTE_170 = 3, /**< SMPTE.170 */
-  VPX_CS_SMPTE_240 = 4, /**< SMPTE.240 */
-  VPX_CS_BT_2020 = 5,   /**< BT.2020 */
-  VPX_CS_RESERVED = 6,  /**< Reserved */
-  VPX_CS_SRGB = 7       /**< sRGB */
-} vpx_color_space_t;    /**< alias for enum vpx_color_space */
-
-/*!\brief List of supported color range */
-typedef enum vpx_color_range {
-  VPX_CR_STUDIO_RANGE = 0, /**< Y [16..235], UV [16..240] */
-  VPX_CR_FULL_RANGE = 1    /**< YUV/RGB [0..255] */
-} vpx_color_range_t;       /**< alias for enum vpx_color_range */
-
-/**\brief Image Descriptor */
-typedef struct vpx_image {
-  vpx_img_fmt_t fmt;       /**< Image Format */
-  vpx_color_space_t cs;    /**< Color Space */
-  vpx_color_range_t range; /**< Color Range */
-
-  /* Image storage dimensions */
-  unsigned int w;         /**< Stored image width */
-  unsigned int h;         /**< Stored image height */
-  unsigned int bit_depth; /**< Stored image bit-depth */
-
-  /* Image display dimensions */
-  unsigned int d_w; /**< Displayed image width */
-  unsigned int d_h; /**< Displayed image height */
-
-  /* Image intended rendering dimensions */
-  unsigned int r_w; /**< Intended rendering image width */
-  unsigned int r_h; /**< Intended rendering image height */
-
-  /* Chroma subsampling info */
-  unsigned int x_chroma_shift; /**< subsampling order, X */
-  unsigned int y_chroma_shift; /**< subsampling order, Y */
-
-/* Image data pointers. */
-#define VPX_PLANE_PACKED 0  /**< To be used for all packed formats */
-#define VPX_PLANE_Y 0       /**< Y (Luminance) plane */
-#define VPX_PLANE_U 1       /**< U (Chroma) plane */
-#define VPX_PLANE_V 2       /**< V (Chroma) plane */
-#define VPX_PLANE_ALPHA 3   /**< A (Transparency) plane */
-  unsigned char *planes[4]; /**< pointer to the top left pixel for each plane */
-  int stride[4];            /**< stride between rows for each plane */
-
-  int bps; /**< bits per sample (for packed formats) */
-
-  /*!\brief The following member may be set by the application to associate
-   * data with this image.
-   */
-  void *user_priv;
-
-  /* The following members should be treated as private. */
-  unsigned char *img_data; /**< private */
-  int img_data_owner;      /**< private */
-  int self_allocd;         /**< private */
-
-  void *fb_priv; /**< Frame buffer data associated with the image. */
-} vpx_image_t;   /**< alias for struct vpx_image */
-
-/**\brief Representation of a rectangle on a surface */
-typedef struct vpx_image_rect {
-  unsigned int x;   /**< leftmost column */
-  unsigned int y;   /**< topmost row */
-  unsigned int w;   /**< width */
-  unsigned int h;   /**< height */
-} vpx_image_rect_t; /**< alias for struct vpx_image_rect */
-
-/*!\brief Open a descriptor, allocating storage for the underlying image
- *
- * Returns a descriptor for storing an image of the given format. The
- * storage for the descriptor is allocated on the heap.
- *
- * \param[in]    img       Pointer to storage for descriptor. If this parameter
- *                         is NULL, the storage for the descriptor will be
- *                         allocated on the heap.
- * \param[in]    fmt       Format for the image
- * \param[in]    d_w       Width of the image
- * \param[in]    d_h       Height of the image
- * \param[in]    align     Alignment, in bytes, of the image buffer and
- *                         each row in the image(stride).
- *
- * \return Returns a pointer to the initialized image descriptor. If the img
- *         parameter is non-null, the value of the img parameter will be
- *         returned.
- */
-vpx_image_t *vpx_img_alloc(vpx_image_t *img, vpx_img_fmt_t fmt,
-                           unsigned int d_w, unsigned int d_h,
-                           unsigned int align);
-
-/*!\brief Open a descriptor, using existing storage for the underlying image
- *
- * Returns a descriptor for storing an image of the given format. The
- * storage for descriptor has been allocated elsewhere, and a descriptor is
- * desired to "wrap" that storage.
- *
- * \param[in]    img       Pointer to storage for descriptor. If this parameter
- *                         is NULL, the storage for the descriptor will be
- *                         allocated on the heap.
- * \param[in]    fmt       Format for the image
- * \param[in]    d_w       Width of the image
- * \param[in]    d_h       Height of the image
- * \param[in]    align     Alignment, in bytes, of each row in the image.
- * \param[in]    img_data  Storage to use for the image
- *
- * \return Returns a pointer to the initialized image descriptor. If the img
- *         parameter is non-null, the value of the img parameter will be
- *         returned.
- */
-vpx_image_t *vpx_img_wrap(vpx_image_t *img, vpx_img_fmt_t fmt, unsigned int d_w,
-                          unsigned int d_h, unsigned int align,
-                          unsigned char *img_data);
-
-/*!\brief Set the rectangle identifying the displayed portion of the image
- *
- * Updates the displayed rectangle (aka viewport) on the image surface to
- * match the specified coordinates and size.
- *
- * \param[in]    img       Image descriptor
- * \param[in]    x         leftmost column
- * \param[in]    y         topmost row
- * \param[in]    w         width
- * \param[in]    h         height
- *
- * \return 0 if the requested rectangle is valid, nonzero otherwise.
- */
-int vpx_img_set_rect(vpx_image_t *img, unsigned int x, unsigned int y,
-                     unsigned int w, unsigned int h);
-
-/*!\brief Flip the image vertically (top for bottom)
- *
- * Adjusts the image descriptor's pointers and strides to make the image
- * be referenced upside-down.
- *
- * \param[in]    img       Image descriptor
- */
-void vpx_img_flip(vpx_image_t *img);
-
-/*!\brief Close an image descriptor
- *
- * Frees all allocated storage associated with an image descriptor.
- *
- * \param[in]    img       Image descriptor
- */
-void vpx_img_free(vpx_image_t *img);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // VPX_VPX_IMAGE_H_
diff --git a/dependencies2013/win32/include/vpx/vpx_integer.h b/dependencies2013/win32/include/vpx/vpx_integer.h
deleted file mode 100644
index 09bad922..00000000
--- a/dependencies2013/win32/include/vpx/vpx_integer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef VPX_VPX_INTEGER_H_
-#define VPX_VPX_INTEGER_H_
-
-/* get ptrdiff_t, size_t, wchar_t, NULL */
-#include <stddef.h>
-
-#if defined(_MSC_VER)
-#define VPX_FORCE_INLINE __forceinline
-#define VPX_INLINE __inline
-#else
-#define VPX_FORCE_INLINE __inline__ __attribute__(always_inline)
-// TODO(jbb): Allow a way to force inline off for older compilers.
-#define VPX_INLINE inline
-#endif
-
-#if defined(VPX_EMULATE_INTTYPES)
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-
-#ifndef _UINTPTR_T_DEFINED
-typedef size_t uintptr_t;
-#endif
-
-#else
-
-/* Most platforms have the C99 standard integer types. */
-
-#if defined(__cplusplus)
-#if !defined(__STDC_FORMAT_MACROS)
-#define __STDC_FORMAT_MACROS
-#endif
-#if !defined(__STDC_LIMIT_MACROS)
-#define __STDC_LIMIT_MACROS
-#endif
-#endif  // __cplusplus
-
-#include <stdint.h>
-
-#endif
-
-/* VS2010 defines stdint.h, but not inttypes.h */
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#define PRId64 "I64d"
-#else
-#include <inttypes.h>
-#endif
-
-#endif  // VPX_VPX_INTEGER_H_
diff --git a/dependencies2013/win32/include/x264.h b/dependencies2013/win32/include/x264.h
deleted file mode 100644
index 0f340672..00000000
--- a/dependencies2013/win32/include/x264.h
+++ /dev/null
@@ -1,962 +0,0 @@
-/*****************************************************************************
- * x264.h: x264 public header
- *****************************************************************************
- * Copyright (C) 2003-2017 x264 project
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *          Loren Merritt <lorenm@u.washington.edu>
- *          Fiona Glaser <fiona@x264.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
- *
- * This program is also available under a commercial proprietary license.
- * For more information, contact us at licensing@x264.com.
- *****************************************************************************/
-
-#ifndef X264_X264_H
-#define X264_X264_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) && !defined(_STDINT) &&\
-    !defined(_SYS_STDINT_H_) && !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES)
-# ifdef _MSC_VER
-#  pragma message("You must include stdint.h or inttypes.h before x264.h")
-# else
-#  warning You must include stdint.h or inttypes.h before x264.h
-# endif
-#endif
-
-#include <stdarg.h>
-
-#include "x264_config.h"
-
-#define X264_BUILD 152
-
-/* Application developers planning to link against a shared library version of
- * libx264 from a Microsoft Visual Studio or similar development environment
- * will need to define X264_API_IMPORTS before including this header.
- * This clause does not apply to MinGW, similar development environments, or non
- * Windows platforms. */
-#ifdef X264_API_IMPORTS
-#define X264_API __declspec(dllimport)
-#else
-#define X264_API
-#endif
-
-/* x264_t:
- *      opaque handler for encoder */
-typedef struct x264_t x264_t;
-
-/****************************************************************************
- * NAL structure and functions
- ****************************************************************************/
-
-enum nal_unit_type_e
-{
-    NAL_UNKNOWN     = 0,
-    NAL_SLICE       = 1,
-    NAL_SLICE_DPA   = 2,
-    NAL_SLICE_DPB   = 3,
-    NAL_SLICE_DPC   = 4,
-    NAL_SLICE_IDR   = 5,    /* ref_idc != 0 */
-    NAL_SEI         = 6,    /* ref_idc == 0 */
-    NAL_SPS         = 7,
-    NAL_PPS         = 8,
-    NAL_AUD         = 9,
-    NAL_FILLER      = 12,
-    /* ref_idc == 0 for 6,9,10,11,12 */
-};
-enum nal_priority_e
-{
-    NAL_PRIORITY_DISPOSABLE = 0,
-    NAL_PRIORITY_LOW        = 1,
-    NAL_PRIORITY_HIGH       = 2,
-    NAL_PRIORITY_HIGHEST    = 3,
-};
-
-/* The data within the payload is already NAL-encapsulated; the ref_idc and type
- * are merely in the struct for easy access by the calling application.
- * All data returned in an x264_nal_t, including the data in p_payload, is no longer
- * valid after the next call to x264_encoder_encode.  Thus it must be used or copied
- * before calling x264_encoder_encode or x264_encoder_headers again. */
-typedef struct x264_nal_t
-{
-    int i_ref_idc;  /* nal_priority_e */
-    int i_type;     /* nal_unit_type_e */
-    int b_long_startcode;
-    int i_first_mb; /* If this NAL is a slice, the index of the first MB in the slice. */
-    int i_last_mb;  /* If this NAL is a slice, the index of the last MB in the slice. */
-
-    /* Size of payload (including any padding) in bytes. */
-    int     i_payload;
-    /* If param->b_annexb is set, Annex-B bytestream with startcode.
-     * Otherwise, startcode is replaced with a 4-byte size.
-     * This size is the size used in mp4/similar muxing; it is equal to i_payload-4 */
-    uint8_t *p_payload;
-
-    /* Size of padding in bytes. */
-    int i_padding;
-} x264_nal_t;
-
-/****************************************************************************
- * Encoder parameters
- ****************************************************************************/
-/* CPU flags */
-
-/* x86 */
-#define X264_CPU_MMX                (1<<0)
-#define X264_CPU_MMX2               (1<<1)  /* MMX2 aka MMXEXT aka ISSE */
-#define X264_CPU_MMXEXT             X264_CPU_MMX2
-#define X264_CPU_SSE                (1<<2)
-#define X264_CPU_SSE2               (1<<3)
-#define X264_CPU_LZCNT              (1<<4)
-#define X264_CPU_SSE3               (1<<5)
-#define X264_CPU_SSSE3              (1<<6)
-#define X264_CPU_SSE4               (1<<7)  /* SSE4.1 */
-#define X264_CPU_SSE42              (1<<8)  /* SSE4.2 */
-#define X264_CPU_AVX                (1<<9)  /* Requires OS support even if YMM registers aren't used */
-#define X264_CPU_XOP                (1<<10) /* AMD XOP */
-#define X264_CPU_FMA4               (1<<11) /* AMD FMA4 */
-#define X264_CPU_FMA3               (1<<12)
-#define X264_CPU_BMI1               (1<<13)
-#define X264_CPU_BMI2               (1<<14)
-#define X264_CPU_AVX2               (1<<15)
-#define X264_CPU_AVX512             (1<<16) /* AVX-512 {F, CD, BW, DQ, VL}, requires OS support */
-/* x86 modifiers */
-#define X264_CPU_CACHELINE_32       (1<<17) /* avoid memory loads that span the border between two cachelines */
-#define X264_CPU_CACHELINE_64       (1<<18) /* 32/64 is the size of a cacheline in bytes */
-#define X264_CPU_SSE2_IS_SLOW       (1<<19) /* avoid most SSE2 functions on Athlon64 */
-#define X264_CPU_SSE2_IS_FAST       (1<<20) /* a few functions are only faster on Core2 and Phenom */
-#define X264_CPU_SLOW_SHUFFLE       (1<<21) /* The Conroe has a slow shuffle unit (relative to overall SSE performance) */
-#define X264_CPU_STACK_MOD4         (1<<22) /* if stack is only mod4 and not mod16 */
-#define X264_CPU_SLOW_ATOM          (1<<23) /* The Atom is terrible: slow SSE unaligned loads, slow
-                                             * SIMD multiplies, slow SIMD variable shifts, slow pshufb,
-                                             * cacheline split penalties -- gather everything here that
-                                             * isn't shared by other CPUs to avoid making half a dozen
-                                             * new SLOW flags. */
-#define X264_CPU_SLOW_PSHUFB        (1<<24) /* such as on the Intel Atom */
-#define X264_CPU_SLOW_PALIGNR       (1<<25) /* such as on the AMD Bobcat */
-
-/* PowerPC */
-#define X264_CPU_ALTIVEC         0x0000001
-
-/* ARM and AArch64 */
-#define X264_CPU_ARMV6           0x0000001
-#define X264_CPU_NEON            0x0000002  /* ARM NEON */
-#define X264_CPU_FAST_NEON_MRC   0x0000004  /* Transfer from NEON to ARM register is fast (Cortex-A9) */
-#define X264_CPU_ARMV8           0x0000008
-
-/* MIPS */
-#define X264_CPU_MSA             0x0000001  /* MIPS MSA */
-
-/* Analyse flags */
-#define X264_ANALYSE_I4x4       0x0001  /* Analyse i4x4 */
-#define X264_ANALYSE_I8x8       0x0002  /* Analyse i8x8 (requires 8x8 transform) */
-#define X264_ANALYSE_PSUB16x16  0x0010  /* Analyse p16x8, p8x16 and p8x8 */
-#define X264_ANALYSE_PSUB8x8    0x0020  /* Analyse p8x4, p4x8, p4x4 */
-#define X264_ANALYSE_BSUB16x16  0x0100  /* Analyse b16x8, b8x16 and b8x8 */
-#define X264_DIRECT_PRED_NONE        0
-#define X264_DIRECT_PRED_SPATIAL     1
-#define X264_DIRECT_PRED_TEMPORAL    2
-#define X264_DIRECT_PRED_AUTO        3
-#define X264_ME_DIA                  0
-#define X264_ME_HEX                  1
-#define X264_ME_UMH                  2
-#define X264_ME_ESA                  3
-#define X264_ME_TESA                 4
-#define X264_CQM_FLAT                0
-#define X264_CQM_JVT                 1
-#define X264_CQM_CUSTOM              2
-#define X264_RC_CQP                  0
-#define X264_RC_CRF                  1
-#define X264_RC_ABR                  2
-#define X264_QP_AUTO                 0
-#define X264_AQ_NONE                 0
-#define X264_AQ_VARIANCE             1
-#define X264_AQ_AUTOVARIANCE         2
-#define X264_AQ_AUTOVARIANCE_BIASED  3
-#define X264_B_ADAPT_NONE            0
-#define X264_B_ADAPT_FAST            1
-#define X264_B_ADAPT_TRELLIS         2
-#define X264_WEIGHTP_NONE            0
-#define X264_WEIGHTP_SIMPLE          1
-#define X264_WEIGHTP_SMART           2
-#define X264_B_PYRAMID_NONE          0
-#define X264_B_PYRAMID_STRICT        1
-#define X264_B_PYRAMID_NORMAL        2
-#define X264_KEYINT_MIN_AUTO         0
-#define X264_KEYINT_MAX_INFINITE     (1<<30)
-
-static const char * const x264_direct_pred_names[] = { "none", "spatial", "temporal", "auto", 0 };
-static const char * const x264_motion_est_names[] = { "dia", "hex", "umh", "esa", "tesa", 0 };
-static const char * const x264_b_pyramid_names[] = { "none", "strict", "normal", 0 };
-static const char * const x264_overscan_names[] = { "undef", "show", "crop", 0 };
-static const char * const x264_vidformat_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", 0 };
-static const char * const x264_fullrange_names[] = { "off", "on", 0 };
-static const char * const x264_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", "smpte428",
-                                                     "smpte431", "smpte432", 0 };
-static const char * const x264_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316",
-                                                    "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", "smpte2084", "smpte428", 0 };
-static const char * const x264_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", "bt2020nc", "bt2020c",
-                                                     "smpte2085", 0 };
-static const char * const x264_nal_hrd_names[] = { "none", "vbr", "cbr", 0 };
-
-/* Colorspace type */
-#define X264_CSP_MASK           0x00ff  /* */
-#define X264_CSP_NONE           0x0000  /* Invalid mode     */
-#define X264_CSP_I420           0x0001  /* yuv 4:2:0 planar */
-#define X264_CSP_YV12           0x0002  /* yvu 4:2:0 planar */
-#define X264_CSP_NV12           0x0003  /* yuv 4:2:0, with one y plane and one packed u+v */
-#define X264_CSP_NV21           0x0004  /* yuv 4:2:0, with one y plane and one packed v+u */
-#define X264_CSP_I422           0x0005  /* yuv 4:2:2 planar */
-#define X264_CSP_YV16           0x0006  /* yvu 4:2:2 planar */
-#define X264_CSP_NV16           0x0007  /* yuv 4:2:2, with one y plane and one packed u+v */
-#define X264_CSP_YUYV           0x0008  /* yuyv 4:2:2 packed */
-#define X264_CSP_UYVY           0x0009  /* uyvy 4:2:2 packed */
-#define X264_CSP_V210           0x000a  /* 10-bit yuv 4:2:2 packed in 32 */
-#define X264_CSP_I444           0x000b  /* yuv 4:4:4 planar */
-#define X264_CSP_YV24           0x000c  /* yvu 4:4:4 planar */
-#define X264_CSP_BGR            0x000d  /* packed bgr 24bits */
-#define X264_CSP_BGRA           0x000e  /* packed bgr 32bits */
-#define X264_CSP_RGB            0x000f  /* packed rgb 24bits */
-#define X264_CSP_MAX            0x0010  /* end of list */
-#define X264_CSP_VFLIP          0x1000  /* the csp is vertically flipped */
-#define X264_CSP_HIGH_DEPTH     0x2000  /* the csp has a depth of 16 bits per pixel component */
-
-/* Slice type */
-#define X264_TYPE_AUTO          0x0000  /* Let x264 choose the right type */
-#define X264_TYPE_IDR           0x0001
-#define X264_TYPE_I             0x0002
-#define X264_TYPE_P             0x0003
-#define X264_TYPE_BREF          0x0004  /* Non-disposable B-frame */
-#define X264_TYPE_B             0x0005
-#define X264_TYPE_KEYFRAME      0x0006  /* IDR or I depending on b_open_gop option */
-#define IS_X264_TYPE_I(x) ((x)==X264_TYPE_I || (x)==X264_TYPE_IDR || (x)==X264_TYPE_KEYFRAME)
-#define IS_X264_TYPE_B(x) ((x)==X264_TYPE_B || (x)==X264_TYPE_BREF)
-
-/* Log level */
-#define X264_LOG_NONE          (-1)
-#define X264_LOG_ERROR          0
-#define X264_LOG_WARNING        1
-#define X264_LOG_INFO           2
-#define X264_LOG_DEBUG          3
-
-/* Threading */
-#define X264_THREADS_AUTO 0 /* Automatically select optimal number of threads */
-#define X264_SYNC_LOOKAHEAD_AUTO (-1) /* Automatically select optimal lookahead thread buffer size */
-
-/* HRD */
-#define X264_NAL_HRD_NONE            0
-#define X264_NAL_HRD_VBR             1
-#define X264_NAL_HRD_CBR             2
-
-/* Zones: override ratecontrol or other options for specific sections of the video.
- * See x264_encoder_reconfig() for which options can be changed.
- * If zones overlap, whichever comes later in the list takes precedence. */
-typedef struct x264_zone_t
-{
-    int i_start, i_end; /* range of frame numbers */
-    int b_force_qp; /* whether to use qp vs bitrate factor */
-    int i_qp;
-    float f_bitrate_factor;
-    struct x264_param_t *param;
-} x264_zone_t;
-
-typedef struct x264_param_t
-{
-    /* CPU flags */
-    unsigned int cpu;
-    int         i_threads;           /* encode multiple frames in parallel */
-    int         i_lookahead_threads; /* multiple threads for lookahead analysis */
-    int         b_sliced_threads;  /* Whether to use slice-based threading. */
-    int         b_deterministic; /* whether to allow non-deterministic optimizations when threaded */
-    int         b_cpu_independent; /* force canonical behavior rather than cpu-dependent optimal algorithms */
-    int         i_sync_lookahead; /* threaded lookahead buffer */
-
-    /* Video Properties */
-    int         i_width;
-    int         i_height;
-    int         i_csp;         /* CSP of encoded bitstream */
-    int         i_level_idc;
-    int         i_frame_total; /* number of frames to encode if known, else 0 */
-
-    /* NAL HRD
-     * Uses Buffering and Picture Timing SEIs to signal HRD
-     * The HRD in H.264 was not designed with VFR in mind.
-     * It is therefore not recommendeded to use NAL HRD with VFR.
-     * Furthermore, reconfiguring the VBV (via x264_encoder_reconfig)
-     * will currently generate invalid HRD. */
-    int         i_nal_hrd;
-
-    struct
-    {
-        /* they will be reduced to be 0 < x <= 65535 and prime */
-        int         i_sar_height;
-        int         i_sar_width;
-
-        int         i_overscan;    /* 0=undef, 1=no overscan, 2=overscan */
-
-        /* see h264 annex E for the values of the following */
-        int         i_vidformat;
-        int         b_fullrange;
-        int         i_colorprim;
-        int         i_transfer;
-        int         i_colmatrix;
-        int         i_chroma_loc;    /* both top & bottom */
-    } vui;
-
-    /* Bitstream parameters */
-    int         i_frame_reference;  /* Maximum number of reference frames */
-    int         i_dpb_size;         /* Force a DPB size larger than that implied by B-frames and reference frames.
-                                     * Useful in combination with interactive error resilience. */
-    int         i_keyint_max;       /* Force an IDR keyframe at this interval */
-    int         i_keyint_min;       /* Scenecuts closer together than this are coded as I, not IDR. */
-    int         i_scenecut_threshold; /* how aggressively to insert extra I frames */
-    int         b_intra_refresh;    /* Whether or not to use periodic intra refresh instead of IDR frames. */
-
-    int         i_bframe;   /* how many b-frame between 2 references pictures */
-    int         i_bframe_adaptive;
-    int         i_bframe_bias;
-    int         i_bframe_pyramid;   /* Keep some B-frames as references: 0=off, 1=strict hierarchical, 2=normal */
-    int         b_open_gop;
-    int         b_bluray_compat;
-    int         i_avcintra_class;
-
-    int         b_deblocking_filter;
-    int         i_deblocking_filter_alphac0;    /* [-6, 6] -6 light filter, 6 strong */
-    int         i_deblocking_filter_beta;       /* [-6, 6]  idem */
-
-    int         b_cabac;
-    int         i_cabac_init_idc;
-
-    int         b_interlaced;
-    int         b_constrained_intra;
-
-    int         i_cqm_preset;
-    char        *psz_cqm_file;      /* filename (in UTF-8) of CQM file, JM format */
-    uint8_t     cqm_4iy[16];        /* used only if i_cqm_preset == X264_CQM_CUSTOM */
-    uint8_t     cqm_4py[16];
-    uint8_t     cqm_4ic[16];
-    uint8_t     cqm_4pc[16];
-    uint8_t     cqm_8iy[64];
-    uint8_t     cqm_8py[64];
-    uint8_t     cqm_8ic[64];
-    uint8_t     cqm_8pc[64];
-
-    /* Log */
-    void        (*pf_log)( void *, int i_level, const char *psz, va_list );
-    void        *p_log_private;
-    int         i_log_level;
-    int         b_full_recon;   /* fully reconstruct frames, even when not necessary for encoding.  Implied by psz_dump_yuv */
-    char        *psz_dump_yuv;  /* filename (in UTF-8) for reconstructed frames */
-
-    /* Encoder analyser parameters */
-    struct
-    {
-        unsigned int intra;     /* intra partitions */
-        unsigned int inter;     /* inter partitions */
-
-        int          b_transform_8x8;
-        int          i_weighted_pred; /* weighting for P-frames */
-        int          b_weighted_bipred; /* implicit weighting for B-frames */
-        int          i_direct_mv_pred; /* spatial vs temporal mv prediction */
-        int          i_chroma_qp_offset;
-
-        int          i_me_method; /* motion estimation algorithm to use (X264_ME_*) */
-        int          i_me_range; /* integer pixel motion estimation search range (from predicted mv) */
-        int          i_mv_range; /* maximum length of a mv (in pixels). -1 = auto, based on level */
-        int          i_mv_range_thread; /* minimum space between threads. -1 = auto, based on number of threads. */
-        int          i_subpel_refine; /* subpixel motion estimation quality */
-        int          b_chroma_me; /* chroma ME for subpel and mode decision in P-frames */
-        int          b_mixed_references; /* allow each mb partition to have its own reference number */
-        int          i_trellis;  /* trellis RD quantization */
-        int          b_fast_pskip; /* early SKIP detection on P-frames */
-        int          b_dct_decimate; /* transform coefficient thresholding on P-frames */
-        int          i_noise_reduction; /* adaptive pseudo-deadzone */
-        float        f_psy_rd; /* Psy RD strength */
-        float        f_psy_trellis; /* Psy trellis strength */
-        int          b_psy; /* Toggle all psy optimizations */
-
-        int          b_mb_info;            /* Use input mb_info data in x264_picture_t */
-        int          b_mb_info_update; /* Update the values in mb_info according to the results of encoding. */
-
-        /* the deadzone size that will be used in luma quantization */
-        int          i_luma_deadzone[2]; /* {inter, intra} */
-
-        int          b_psnr;    /* compute and print PSNR stats */
-        int          b_ssim;    /* compute and print SSIM stats */
-    } analyse;
-
-    /* Rate control parameters */
-    struct
-    {
-        int         i_rc_method;    /* X264_RC_* */
-
-        int         i_qp_constant;  /* 0 to (51 + 6*(x264_bit_depth-8)). 0=lossless */
-        int         i_qp_min;       /* min allowed QP value */
-        int         i_qp_max;       /* max allowed QP value */
-        int         i_qp_step;      /* max QP step between frames */
-
-        int         i_bitrate;
-        float       f_rf_constant;  /* 1pass VBR, nominal QP */
-        float       f_rf_constant_max;  /* In CRF mode, maximum CRF as caused by VBV */
-        float       f_rate_tolerance;
-        int         i_vbv_max_bitrate;
-        int         i_vbv_buffer_size;
-        float       f_vbv_buffer_init; /* <=1: fraction of buffer_size. >1: kbit */
-        float       f_ip_factor;
-        float       f_pb_factor;
-
-        /* VBV filler: force CBR VBV and use filler bytes to ensure hard-CBR.
-         * Implied by NAL-HRD CBR. */
-        int         b_filler;
-
-        int         i_aq_mode;      /* psy adaptive QP. (X264_AQ_*) */
-        float       f_aq_strength;
-        int         b_mb_tree;      /* Macroblock-tree ratecontrol. */
-        int         i_lookahead;
-
-        /* 2pass */
-        int         b_stat_write;   /* Enable stat writing in psz_stat_out */
-        char        *psz_stat_out;  /* output filename (in UTF-8) of the 2pass stats file */
-        int         b_stat_read;    /* Read stat from psz_stat_in and use it */
-        char        *psz_stat_in;   /* input filename (in UTF-8) of the 2pass stats file */
-
-        /* 2pass params (same as ffmpeg ones) */
-        float       f_qcompress;    /* 0.0 => cbr, 1.0 => constant qp */
-        float       f_qblur;        /* temporally blur quants */
-        float       f_complexity_blur; /* temporally blur complexity */
-        x264_zone_t *zones;         /* ratecontrol overrides */
-        int         i_zones;        /* number of zone_t's */
-        char        *psz_zones;     /* alternate method of specifying zones */
-    } rc;
-
-    /* Cropping Rectangle parameters: added to those implicitly defined by
-       non-mod16 video resolutions. */
-    struct
-    {
-        unsigned int i_left;
-        unsigned int i_top;
-        unsigned int i_right;
-        unsigned int i_bottom;
-    } crop_rect;
-
-    /* frame packing arrangement flag */
-    int i_frame_packing;
-
-    /* Muxing parameters */
-    int b_aud;                  /* generate access unit delimiters */
-    int b_repeat_headers;       /* put SPS/PPS before each keyframe */
-    int b_annexb;               /* if set, place start codes (4 bytes) before NAL units,
-                                 * otherwise place size (4 bytes) before NAL units. */
-    int i_sps_id;               /* SPS and PPS id number */
-    int b_vfr_input;            /* VFR input.  If 1, use timebase and timestamps for ratecontrol purposes.
-                                 * If 0, use fps only. */
-    int b_pulldown;             /* use explicity set timebase for CFR */
-    uint32_t i_fps_num;
-    uint32_t i_fps_den;
-    uint32_t i_timebase_num;    /* Timebase numerator */
-    uint32_t i_timebase_den;    /* Timebase denominator */
-
-    int b_tff;
-
-    /* Pulldown:
-     * The correct pic_struct must be passed with each input frame.
-     * The input timebase should be the timebase corresponding to the output framerate. This should be constant.
-     * e.g. for 3:2 pulldown timebase should be 1001/30000
-     * The PTS passed with each frame must be the PTS of the frame after pulldown is applied.
-     * Frame doubling and tripling require b_vfr_input set to zero (see H.264 Table D-1)
-     *
-     * Pulldown changes are not clearly defined in H.264. Therefore, it is the calling app's responsibility to manage this.
-     */
-
-    int b_pic_struct;
-
-    /* Fake Interlaced.
-     *
-     * Used only when b_interlaced=0. Setting this flag makes it possible to flag the stream as PAFF interlaced yet
-     * encode all frames progessively. It is useful for encoding 25p and 30p Blu-Ray streams.
-     */
-
-    int b_fake_interlaced;
-
-    /* Don't optimize header parameters based on video content, e.g. ensure that splitting an input video, compressing
-     * each part, and stitching them back together will result in identical SPS/PPS. This is necessary for stitching
-     * with container formats that don't allow multiple SPS/PPS. */
-    int b_stitchable;
-
-    int b_opencl;            /* use OpenCL when available */
-    int i_opencl_device;     /* specify count of GPU devices to skip, for CLI users */
-    void *opencl_device_id;  /* pass explicit cl_device_id as void*, for API users */
-    char *psz_clbin_file;    /* filename (in UTF-8) of the compiled OpenCL kernel cache file */
-
-    /* Slicing parameters */
-    int i_slice_max_size;    /* Max size per slice in bytes; includes estimated NAL overhead. */
-    int i_slice_max_mbs;     /* Max number of MBs per slice; overrides i_slice_count. */
-    int i_slice_min_mbs;     /* Min number of MBs per slice */
-    int i_slice_count;       /* Number of slices per frame: forces rectangular slices. */
-    int i_slice_count_max;   /* Absolute cap on slices per frame; stops applying slice-max-size
-                              * and slice-max-mbs if this is reached. */
-
-    /* Optional callback for freeing this x264_param_t when it is done being used.
-     * Only used when the x264_param_t sits in memory for an indefinite period of time,
-     * i.e. when an x264_param_t is passed to x264_t in an x264_picture_t or in zones.
-     * Not used when x264_encoder_reconfig is called directly. */
-    void (*param_free)( void* );
-
-    /* Optional low-level callback for low-latency encoding.  Called for each output NAL unit
-     * immediately after the NAL unit is finished encoding.  This allows the calling application
-     * to begin processing video data (e.g. by sending packets over a network) before the frame
-     * is done encoding.
-     *
-     * This callback MUST do the following in order to work correctly:
-     * 1) Have available an output buffer of at least size nal->i_payload*3/2 + 5 + 64.
-     * 2) Call x264_nal_encode( h, dst, nal ), where dst is the output buffer.
-     * After these steps, the content of nal is valid and can be used in the same way as if
-     * the NAL unit were output by x264_encoder_encode.
-     *
-     * This does not need to be synchronous with the encoding process: the data pointed to
-     * by nal (both before and after x264_nal_encode) will remain valid until the next
-     * x264_encoder_encode call.  The callback must be re-entrant.
-     *
-     * This callback does not work with frame-based threads; threads must be disabled
-     * or sliced-threads enabled.  This callback also does not work as one would expect
-     * with HRD -- since the buffering period SEI cannot be calculated until the frame
-     * is finished encoding, it will not be sent via this callback.
-     *
-     * Note also that the NALs are not necessarily returned in order when sliced threads is
-     * enabled.  Accordingly, the variable i_first_mb and i_last_mb are available in
-     * x264_nal_t to help the calling application reorder the slices if necessary.
-     *
-     * When this callback is enabled, x264_encoder_encode does not return valid NALs;
-     * the calling application is expected to acquire all output NALs through the callback.
-     *
-     * It is generally sensible to combine this callback with a use of slice-max-mbs or
-     * slice-max-size.
-     *
-     * The opaque pointer is the opaque pointer from the input frame associated with this
-     * NAL unit. This helps distinguish between nalu_process calls from different sources,
-     * e.g. if doing multiple encodes in one process.
-     */
-    void (*nalu_process)( x264_t *h, x264_nal_t *nal, void *opaque );
-} x264_param_t;
-
-void x264_nal_encode( x264_t *h, uint8_t *dst, x264_nal_t *nal );
-
-/****************************************************************************
- * H.264 level restriction information
- ****************************************************************************/
-
-typedef struct x264_level_t
-{
-    uint8_t  level_idc;
-    uint32_t mbps;        /* max macroblock processing rate (macroblocks/sec) */
-    uint32_t frame_size;  /* max frame size (macroblocks) */
-    uint32_t dpb;         /* max decoded picture buffer (mbs) */
-    uint32_t bitrate;     /* max bitrate (kbit/sec) */
-    uint32_t cpb;         /* max vbv buffer (kbit) */
-    uint16_t mv_range;    /* max vertical mv component range (pixels) */
-    uint8_t  mvs_per_2mb; /* max mvs per 2 consecutive mbs. */
-    uint8_t  slice_rate;  /* ?? */
-    uint8_t  mincr;       /* min compression ratio */
-    uint8_t  bipred8x8;   /* limit bipred to >=8x8 */
-    uint8_t  direct8x8;   /* limit b_direct to >=8x8 */
-    uint8_t  frame_only;  /* forbid interlacing */
-} x264_level_t;
-
-/* all of the levels defined in the standard, terminated by .level_idc=0 */
-X264_API extern const x264_level_t x264_levels[];
-
-/****************************************************************************
- * Basic parameter handling functions
- ****************************************************************************/
-
-/* x264_param_default:
- *      fill x264_param_t with default values and do CPU detection */
-void    x264_param_default( x264_param_t * );
-
-/* x264_param_parse:
- *  set one parameter by name.
- *  returns 0 on success, or returns one of the following errors.
- *  note: BAD_VALUE occurs only if it can't even parse the value,
- *  numerical range is not checked until x264_encoder_open() or
- *  x264_encoder_reconfig().
- *  value=NULL means "true" for boolean options, but is a BAD_VALUE for non-booleans. */
-#define X264_PARAM_BAD_NAME  (-1)
-#define X264_PARAM_BAD_VALUE (-2)
-int x264_param_parse( x264_param_t *, const char *name, const char *value );
-
-/****************************************************************************
- * Advanced parameter handling functions
- ****************************************************************************/
-
-/* These functions expose the full power of x264's preset-tune-profile system for
- * easy adjustment of large numbers of internal parameters.
- *
- * In order to replicate x264CLI's option handling, these functions MUST be called
- * in the following order:
- * 1) x264_param_default_preset
- * 2) Custom user options (via param_parse or directly assigned variables)
- * 3) x264_param_apply_fastfirstpass
- * 4) x264_param_apply_profile
- *
- * Additionally, x264CLI does not apply step 3 if the preset chosen is "placebo"
- * or --slow-firstpass is set. */
-
-/* x264_param_default_preset:
- *      The same as x264_param_default, but also use the passed preset and tune
- *      to modify the default settings.
- *      (either can be NULL, which implies no preset or no tune, respectively)
- *
- *      Currently available presets are, ordered from fastest to slowest: */
-static const char * const x264_preset_names[] = { "ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo", 0 };
-
-/*      The presets can also be indexed numerically, as in:
- *      x264_param_default_preset( &param, "3", ... )
- *      with ultrafast mapping to "0" and placebo mapping to "9".  This mapping may
- *      of course change if new presets are added in between, but will always be
- *      ordered from fastest to slowest.
- *
- *      Warning: the speed of these presets scales dramatically.  Ultrafast is a full
- *      100 times faster than placebo!
- *
- *      Currently available tunings are: */
-static const char * const x264_tune_names[] = { "film", "animation", "grain", "stillimage", "psnr", "ssim", "fastdecode", "zerolatency", 0 };
-
-/*      Multiple tunings can be used if separated by a delimiter in ",./-+",
- *      however multiple psy tunings cannot be used.
- *      film, animation, grain, stillimage, psnr, and ssim are psy tunings.
- *
- *      returns 0 on success, negative on failure (e.g. invalid preset/tune name). */
-int     x264_param_default_preset( x264_param_t *, const char *preset, const char *tune );
-
-/* x264_param_apply_fastfirstpass:
- *      If first-pass mode is set (rc.b_stat_read == 0, rc.b_stat_write == 1),
- *      modify the encoder settings to disable options generally not useful on
- *      the first pass. */
-void    x264_param_apply_fastfirstpass( x264_param_t * );
-
-/* x264_param_apply_profile:
- *      Applies the restrictions of the given profile.
- *      Currently available profiles are, from most to least restrictive: */
-static const char * const x264_profile_names[] = { "baseline", "main", "high", "high10", "high422", "high444", 0 };
-
-/*      (can be NULL, in which case the function will do nothing)
- *
- *      Does NOT guarantee that the given profile will be used: if the restrictions
- *      of "High" are applied to settings that are already Baseline-compatible, the
- *      stream will remain baseline.  In short, it does not increase settings, only
- *      decrease them.
- *
- *      returns 0 on success, negative on failure (e.g. invalid profile name). */
-int     x264_param_apply_profile( x264_param_t *, const char *profile );
-
-/****************************************************************************
- * Picture structures and functions
- ****************************************************************************/
-
-/* x264_bit_depth:
- *      Specifies the number of bits per pixel that x264 uses. This is also the
- *      bit depth that x264 encodes in. If this value is > 8, x264 will read
- *      two bytes of input data for each pixel sample, and expect the upper
- *      (16-x264_bit_depth) bits to be zero.
- *      Note: The flag X264_CSP_HIGH_DEPTH must be used to specify the
- *      colorspace depth as well. */
-X264_API extern const int x264_bit_depth;
-
-/* x264_chroma_format:
- *      Specifies the chroma formats that x264 supports encoding. When this
- *      value is non-zero, then it represents a X264_CSP_* that is the only
- *      chroma format that x264 supports encoding. If the value is 0 then
- *      there are no restrictions. */
-X264_API extern const int x264_chroma_format;
-
-enum pic_struct_e
-{
-    PIC_STRUCT_AUTO              = 0, // automatically decide (default)
-    PIC_STRUCT_PROGRESSIVE       = 1, // progressive frame
-    // "TOP" and "BOTTOM" are not supported in x264 (PAFF only)
-    PIC_STRUCT_TOP_BOTTOM        = 4, // top field followed by bottom
-    PIC_STRUCT_BOTTOM_TOP        = 5, // bottom field followed by top
-    PIC_STRUCT_TOP_BOTTOM_TOP    = 6, // top field, bottom field, top field repeated
-    PIC_STRUCT_BOTTOM_TOP_BOTTOM = 7, // bottom field, top field, bottom field repeated
-    PIC_STRUCT_DOUBLE            = 8, // double frame
-    PIC_STRUCT_TRIPLE            = 9, // triple frame
-};
-
-typedef struct x264_hrd_t
-{
-    double cpb_initial_arrival_time;
-    double cpb_final_arrival_time;
-    double cpb_removal_time;
-
-    double dpb_output_time;
-} x264_hrd_t;
-
-/* Arbitrary user SEI:
- * Payload size is in bytes and the payload pointer must be valid.
- * Payload types and syntax can be found in Annex D of the H.264 Specification.
- * SEI payload alignment bits as described in Annex D must be included at the
- * end of the payload if needed.
- * The payload should not be NAL-encapsulated.
- * Payloads are written first in order of input, apart from in the case when HRD
- * is enabled where payloads are written after the Buffering Period SEI. */
-
-typedef struct x264_sei_payload_t
-{
-    int payload_size;
-    int payload_type;
-    uint8_t *payload;
-} x264_sei_payload_t;
-
-typedef struct x264_sei_t
-{
-    int num_payloads;
-    x264_sei_payload_t *payloads;
-    /* In: optional callback to free each payload AND x264_sei_payload_t when used. */
-    void (*sei_free)( void* );
-} x264_sei_t;
-
-typedef struct x264_image_t
-{
-    int     i_csp;       /* Colorspace */
-    int     i_plane;     /* Number of image planes */
-    int     i_stride[4]; /* Strides for each plane */
-    uint8_t *plane[4];   /* Pointers to each plane */
-} x264_image_t;
-
-typedef struct x264_image_properties_t
-{
-    /* All arrays of data here are ordered as follows:
-     * each array contains one offset per macroblock, in raster scan order.  In interlaced
-     * mode, top-field MBs and bottom-field MBs are interleaved at the row level.
-     * Macroblocks are 16x16 blocks of pixels (with respect to the luma plane).  For the
-     * purposes of calculating the number of macroblocks, width and height are rounded up to
-     * the nearest 16.  If in interlaced mode, height is rounded up to the nearest 32 instead. */
-
-    /* In: an array of quantizer offsets to be applied to this image during encoding.
-     *     These are added on top of the decisions made by x264.
-     *     Offsets can be fractional; they are added before QPs are rounded to integer.
-     *     Adaptive quantization must be enabled to use this feature.  Behavior if quant
-     *     offsets differ between encoding passes is undefined. */
-    float *quant_offsets;
-    /* In: optional callback to free quant_offsets when used.
-     *     Useful if one wants to use a different quant_offset array for each frame. */
-    void (*quant_offsets_free)( void* );
-
-    /* In: optional array of flags for each macroblock.
-     *     Allows specifying additional information for the encoder such as which macroblocks
-     *     remain unchanged.  Usable flags are listed below.
-     *     x264_param_t.analyse.b_mb_info must be set to use this, since x264 needs to track
-     *     extra data internally to make full use of this information.
-     *
-     * Out: if b_mb_info_update is set, x264 will update this array as a result of encoding.
-     *
-     *      For "MBINFO_CONSTANT", it will remove this flag on any macroblock whose decoded
-     *      pixels have changed.  This can be useful for e.g. noting which areas of the
-     *      frame need to actually be blitted. Note: this intentionally ignores the effects
-     *      of deblocking for the current frame, which should be fine unless one needs exact
-     *      pixel-perfect accuracy.
-     *
-     *      Results for MBINFO_CONSTANT are currently only set for P-frames, and are not
-     *      guaranteed to enumerate all blocks which haven't changed.  (There may be false
-     *      negatives, but no false positives.)
-     */
-    uint8_t *mb_info;
-    /* In: optional callback to free mb_info when used. */
-    void (*mb_info_free)( void* );
-
-    /* The macroblock is constant and remains unchanged from the previous frame. */
-    #define X264_MBINFO_CONSTANT   (1<<0)
-    /* More flags may be added in the future. */
-
-    /* Out: SSIM of the the frame luma (if x264_param_t.b_ssim is set) */
-    double f_ssim;
-    /* Out: Average PSNR of the frame (if x264_param_t.b_psnr is set) */
-    double f_psnr_avg;
-    /* Out: PSNR of Y, U, and V (if x264_param_t.b_psnr is set) */
-    double f_psnr[3];
-
-    /* Out: Average effective CRF of the encoded frame */
-    double f_crf_avg;
-} x264_image_properties_t;
-
-typedef struct x264_picture_t
-{
-    /* In: force picture type (if not auto)
-     *     If x264 encoding parameters are violated in the forcing of picture types,
-     *     x264 will correct the input picture type and log a warning.
-     * Out: type of the picture encoded */
-    int     i_type;
-    /* In: force quantizer for != X264_QP_AUTO */
-    int     i_qpplus1;
-    /* In: pic_struct, for pulldown/doubling/etc...used only if b_pic_struct=1.
-     *     use pic_struct_e for pic_struct inputs
-     * Out: pic_struct element associated with frame */
-    int     i_pic_struct;
-    /* Out: whether this frame is a keyframe.  Important when using modes that result in
-     * SEI recovery points being used instead of IDR frames. */
-    int     b_keyframe;
-    /* In: user pts, Out: pts of encoded picture (user)*/
-    int64_t i_pts;
-    /* Out: frame dts. When the pts of the first frame is close to zero,
-     *      initial frames may have a negative dts which must be dealt with by any muxer */
-    int64_t i_dts;
-    /* In: custom encoding parameters to be set from this frame forwards
-           (in coded order, not display order). If NULL, continue using
-           parameters from the previous frame.  Some parameters, such as
-           aspect ratio, can only be changed per-GOP due to the limitations
-           of H.264 itself; in this case, the caller must force an IDR frame
-           if it needs the changed parameter to apply immediately. */
-    x264_param_t *param;
-    /* In: raw image data */
-    /* Out: reconstructed image data.  x264 may skip part of the reconstruction process,
-            e.g. deblocking, in frames where it isn't necessary.  To force complete
-            reconstruction, at a small speed cost, set b_full_recon. */
-    x264_image_t img;
-    /* In: optional information to modify encoder decisions for this frame
-     * Out: information about the encoded frame */
-    x264_image_properties_t prop;
-    /* Out: HRD timing information. Output only when i_nal_hrd is set. */
-    x264_hrd_t hrd_timing;
-    /* In: arbitrary user SEI (e.g subtitles, AFDs) */
-    x264_sei_t extra_sei;
-    /* private user data. copied from input to output frames. */
-    void *opaque;
-} x264_picture_t;
-
-/* x264_picture_init:
- *  initialize an x264_picture_t.  Needs to be done if the calling application
- *  allocates its own x264_picture_t as opposed to using x264_picture_alloc. */
-void x264_picture_init( x264_picture_t *pic );
-
-/* x264_picture_alloc:
- *  alloc data for a picture. You must call x264_picture_clean on it.
- *  returns 0 on success, or -1 on malloc failure or invalid colorspace. */
-int x264_picture_alloc( x264_picture_t *pic, int i_csp, int i_width, int i_height );
-
-/* x264_picture_clean:
- *  free associated resource for a x264_picture_t allocated with
- *  x264_picture_alloc ONLY */
-void x264_picture_clean( x264_picture_t *pic );
-
-/****************************************************************************
- * Encoder functions
- ****************************************************************************/
-
-/* Force a link error in the case of linking against an incompatible API version.
- * Glue #defines exist to force correct macro expansion; the final output of the macro
- * is x264_encoder_open_##X264_BUILD (for purposes of dlopen). */
-#define x264_encoder_glue1(x,y) x##y
-#define x264_encoder_glue2(x,y) x264_encoder_glue1(x,y)
-#define x264_encoder_open x264_encoder_glue2(x264_encoder_open_,X264_BUILD)
-
-/* x264_encoder_open:
- *      create a new encoder handler, all parameters from x264_param_t are copied */
-x264_t *x264_encoder_open( x264_param_t * );
-
-/* x264_encoder_reconfig:
- *      various parameters from x264_param_t are copied.
- *      this takes effect immediately, on whichever frame is encoded next;
- *      due to delay, this may not be the next frame passed to encoder_encode.
- *      if the change should apply to some particular frame, use x264_picture_t->param instead.
- *      returns 0 on success, negative on parameter validation error.
- *      not all parameters can be changed; see the actual function for a detailed breakdown.
- *
- *      since not all parameters can be changed, moving from preset to preset may not always
- *      fully copy all relevant parameters, but should still work usably in practice. however,
- *      more so than for other presets, many of the speed shortcuts used in ultrafast cannot be
- *      switched out of; using reconfig to switch between ultrafast and other presets is not
- *      recommended without a more fine-grained breakdown of parameters to take this into account. */
-int     x264_encoder_reconfig( x264_t *, x264_param_t * );
-/* x264_encoder_parameters:
- *      copies the current internal set of parameters to the pointer provided
- *      by the caller.  useful when the calling application needs to know
- *      how x264_encoder_open has changed the parameters, or the current state
- *      of the encoder after multiple x264_encoder_reconfig calls.
- *      note that the data accessible through pointers in the returned param struct
- *      (e.g. filenames) should not be modified by the calling application. */
-void    x264_encoder_parameters( x264_t *, x264_param_t * );
-/* x264_encoder_headers:
- *      return the SPS and PPS that will be used for the whole stream.
- *      *pi_nal is the number of NAL units outputted in pp_nal.
- *      returns the number of bytes in the returned NALs.
- *      returns negative on error.
- *      the payloads of all output NALs are guaranteed to be sequential in memory. */
-int     x264_encoder_headers( x264_t *, x264_nal_t **pp_nal, int *pi_nal );
-/* x264_encoder_encode:
- *      encode one picture.
- *      *pi_nal is the number of NAL units outputted in pp_nal.
- *      returns the number of bytes in the returned NALs.
- *      returns negative on error and zero if no NAL units returned.
- *      the payloads of all output NALs are guaranteed to be sequential in memory. */
-int     x264_encoder_encode( x264_t *, x264_nal_t **pp_nal, int *pi_nal, x264_picture_t *pic_in, x264_picture_t *pic_out );
-/* x264_encoder_close:
- *      close an encoder handler */
-void    x264_encoder_close( x264_t * );
-/* x264_encoder_delayed_frames:
- *      return the number of currently delayed (buffered) frames
- *      this should be used at the end of the stream, to know when you have all the encoded frames. */
-int     x264_encoder_delayed_frames( x264_t * );
-/* x264_encoder_maximum_delayed_frames( x264_t *h ):
- *      return the maximum number of delayed (buffered) frames that can occur with the current
- *      parameters. */
-int     x264_encoder_maximum_delayed_frames( x264_t *h );
-/* x264_encoder_intra_refresh:
- *      If an intra refresh is not in progress, begin one with the next P-frame.
- *      If an intra refresh is in progress, begin one as soon as the current one finishes.
- *      Requires that b_intra_refresh be set.
- *
- *      Useful for interactive streaming where the client can tell the server that packet loss has
- *      occurred.  In this case, keyint can be set to an extremely high value so that intra refreshes
- *      only occur when calling x264_encoder_intra_refresh.
- *
- *      In multi-pass encoding, if x264_encoder_intra_refresh is called differently in each pass,
- *      behavior is undefined.
- *
- *      Should not be called during an x264_encoder_encode. */
-void    x264_encoder_intra_refresh( x264_t * );
-/* x264_encoder_invalidate_reference:
- *      An interactive error resilience tool, designed for use in a low-latency one-encoder-few-clients
- *      system.  When the client has packet loss or otherwise incorrectly decodes a frame, the encoder
- *      can be told with this command to "forget" the frame and all frames that depend on it, referencing
- *      only frames that occurred before the loss.  This will force a keyframe if no frames are left to
- *      reference after the aforementioned "forgetting".
- *
- *      It is strongly recommended to use a large i_dpb_size in this case, which allows the encoder to
- *      keep around extra, older frames to fall back on in case more recent frames are all invalidated.
- *      Unlike increasing i_frame_reference, this does not increase the number of frames used for motion
- *      estimation and thus has no speed impact.  It is also recommended to set a very large keyframe
- *      interval, so that keyframes are not used except as necessary for error recovery.
- *
- *      x264_encoder_invalidate_reference is not currently compatible with the use of B-frames or intra
- *      refresh.
- *
- *      In multi-pass encoding, if x264_encoder_invalidate_reference is called differently in each pass,
- *      behavior is undefined.
- *
- *      Should not be called during an x264_encoder_encode, but multiple calls can be made simultaneously.
- *
- *      Returns 0 on success, negative on failure. */
-int x264_encoder_invalidate_reference( x264_t *, int64_t pts );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dependencies2013/win32/include/x264_config.h b/dependencies2013/win32/include/x264_config.h
deleted file mode 100644
index 33ef4e40..00000000
--- a/dependencies2013/win32/include/x264_config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define X264_BIT_DEPTH     8
-#define X264_GPL           1
-#define X264_INTERLACED    0
-#define X264_CHROMA_FORMAT 0
-#define X264_REV 2851
-#define X264_REV_DIFF 0
-#define X264_VERSION " r2851 ba24899"
-#define X264_POINTVER "0.152.2851 ba24899"
diff --git a/dependencies2013/win32/include/zconf.h b/dependencies2013/win32/include/zconf.h
deleted file mode 100644
index a5e34528..00000000
--- a/dependencies2013/win32/include/zconf.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-/* #undef Z_PREFIX */
-#define Z_HAVE_UNISTD_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-//#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/dependencies2013/win32/include/zlib.h b/dependencies2013/win32/include/zlib.h
deleted file mode 100644
index f09cdaf1..00000000
--- a/dependencies2013/win32/include/zlib.h
+++ /dev/null
@@ -1,1912 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.11, January 15th, 2017
-
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x12b0
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip and raw deflate streams in
-  memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in the case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte will go here */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text
-                           for deflate, or the decoding state for inflate */
-    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
-   Z_NULL on entry to the initialization function, they are set to internal
-   routines that use the standard library functions malloc() and free().
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use by the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field for deflate() */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary.  Some output may be provided even if
-    flush is zero.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
-  in that case.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed
-  codes block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  function must be called again with Z_FINISH and more output space (updated
-  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  on the stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  compression is to be done in a single step.  In order to complete in one
-  call, avail_out must be at least the value returned by deflateBound (see
-  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  output space is provided, deflate will not return Z_STREAM_END, and it must
-  be called again as described above.
-
-    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).  If a gzip stream is being generated, then
-  strm->adler will be the CRC-32 checksum of the input read so far.  (See
-  deflateInit2 below.)
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  considered binary.  This field is only for information purposes and does not
-  affect the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL or the state was inadvertently written over
-  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  deflate() can be called again with more input and more output space to
-  continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  In the current version of inflate, the provided input is not
-   read or consumed.  The allocation of a sliding window will be deferred to
-   the first call of inflate (if the decompression does not complete on the
-   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
-   them to use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression.
-   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   next_out, and avail_out are unused and unchanged.  The current
-   implementation of inflateInit() does not process any header information --
-   that is deferred until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), then next_in and avail_in are updated
-    accordingly, and processing will resume at this point for the next call of
-    inflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  If the
-  caller of inflate() does not provide both available input and available
-  output space, it is possible that there will be no progress made.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.)  The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed Adler-32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained unless inflateGetHeader() is used.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
-  uncompressed length, modulo 2^32.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value, in which case strm->msg points to a string with a more specific
-  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL, or the state was inadvertently written over
-  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
-  if no progress was possible or if there was not enough room in the output
-  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is to be attempted.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     For the current implementation of deflate(), a windowBits value of 8 (a
-   window size of 256 bytes) is not supported.  As a result, a request for 8
-   will result in 9 (a 512-byte window).  In that case, providing 8 to
-   inflateInit2() will result in an error when the zlib header with 9 is
-   checked against the initialization of inflate().  The remedy is to not use 8
-   with deflateInit2() with this initialization, or at least in that case use 9
-   with inflateInit2().
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute a check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to the appropriate value,
-   if the operating system was determined at compile time.  If a gzip stream is
-   being written, strm->adler is a CRC-32 instead of an Adler-32.
-
-     For raw deflate or gzip encoding, a request for a 256-byte window is
-   rejected as invalid, since only the zlib header provides a means of
-   transmitting the window size to the decompressor.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the Adler-32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The Adler-32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   Adler-32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by deflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If deflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     deflateGetDictionary() may return a length less than the window size, even
-   when more than the window size in input has been provided. It may return up
-   to 258 bytes less in that case, due to how zlib's implementation of deflate
-   manages the sliding window and lookahead for matches, where matches can be
-   up to 258 bytes long. If the application needs the last window-size bytes of
-   input, then that would need to be saved by the application outside of zlib.
-
-     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit, but
-   does not free and reallocate the internal compression state.  The stream
-   will leave the compression level and any other attributes that may have been
-   set unchanged.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2().  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
-
-     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   not have enough output space to complete, then the parameter change will not
-   take effect.  In this case, deflateParams() can be called again with the
-   same parameters and more output space to try again.
-
-     In order to assure a change in the parameters on the first try, the
-   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   request until strm.avail_out is not zero, before calling deflateParams().
-   Then no more input data should be provided before the deflateParams() call.
-   If this is done, the old level and strategy will be applied to the data
-   compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
-
-     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
-   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
-   there was not enough output space to complete the compression of the
-   available input data before a change in the strategy or approach.  Note that
-   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
-   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
-   retried with more output space.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will not automatically decode concatenated gzip streams.
-   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
-   would need to be reset to continue decoding a subsequent gzip stream.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the Adler-32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.  If the window size is changed, then the
-   memory allocated for the window is freed, and the window will be reallocated
-   by inflate() if needed.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above, or -65536 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects a zlib header and trailer around the
-   deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero -- buf is ignored in that
-   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   out() should return zero on success, or non-zero on failure.  If out()
-   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   out() are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.)  Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: ZLIB_DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.  compress() is equivalent to compress2() with a level
-   parameter of Z_DEFAULT_COMPRESSION.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed data.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong *sourceLen));
-/*
-     Same as uncompress, except that sourceLen is a pointer, where the
-   length of the source is *sourceLen.  On return, *sourceLen is the number of
-   source bytes consumed.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Three times that size in buffer space is allocated.  A larger buffer
-   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.  Previously provided
-   data is flushed before the parameter change.
-
-     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing, Z_ERRNO if there is an error writing the flushed data,
-   or Z_MEM_ERROR if there is a memory allocation error.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.  If len is too large to fit in an int,
-   then nothing is read, -1 is returned, and the error state is set to
-   Z_STREAM_ERROR.
-*/
-
-ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
-                                     gzFile file));
-/*
-     Read up to nitems items of size size from file to buf, otherwise operating
-   as gzread() does.  This duplicates the interface of stdio's fread(), with
-   size_t request and return types.  If the library defines size_t, then
-   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
-   integer type that can contain a pointer.
-
-     gzfread() returns the number of full items read of size size, or zero if
-   the end of the file was reached and a full item could not be read, or if
-   there was an error.  gzerror() must be consulted if zero is returned in
-   order to determine if there was an error.  If the multiplication of size and
-   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
-   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
-
-     In the event that the end of file is reached and only a partial item is
-   available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
-   and the end-of-file flag is set.  The length of the partial item read is not
-   provided, but could be inferred from the result of gztell().  This behavior
-   is the same as the behavior of fread() implementations in common libraries,
-   but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
-                                      z_size_t nitems, gzFile file));
-/*
-     gzfwrite() writes nitems items of size size from buf to file, duplicating
-   the interface of stdio's fwrite(), with size_t request and return types.  If
-   the library defines size_t, then z_size_t is identical to size_t.  If not,
-   then z_size_t is an unsigned integer type that can contain a pointer.
-
-     gzfwrite() returns the number of full items written of size size, or zero
-   if there was an error.  If the multiplication of size and nitems overflows,
-   i.e. the product does not fit in a z_size_t, then nothing is written, zero
-   is returned, and the error state is set to Z_STREAM_ERROR.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or a negative zlib error code in case
-   of error.  The number of uncompressed bytes written is limited to 8191, or
-   one less than the buffer size given to gzbuffer().  The caller should assure
-   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   return an error (0) with nothing written.  In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-   This can be determined using zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatenated gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
-                                    z_size_t len));
-/*
-     Same as adler32(), but with a size_t length.
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
-                                  z_size_t len));
-/*
-     Same as crc32(), but with a size_t length.
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#ifdef Z_PREFIX_SET
-#  define z_deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define z_inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#else
-#  define deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#endif
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/dependencies2013/win32/swig/.travis.yml b/dependencies2013/win32/swig/.travis.yml
deleted file mode 100644
index 27237815..00000000
--- a/dependencies2013/win32/swig/.travis.yml
+++ /dev/null
@@ -1,334 +0,0 @@
-language: cpp
-matrix:
-  include:
-    - compiler: clang
-      os: linux
-      env: SWIGLANG=
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG= SWIG_CC=gcc-6 SWIG_CXX=g++-6
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=csharp
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=d
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=go
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=go VER=1.5
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=guile
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=java
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=javascript ENGINE=node
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=javascript ENGINE=jsc
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=javascript ENGINE=v8
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=lua
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=lua VER=5.3
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=octave SWIGJOBS=-j2 # 3.8
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.2 CPP11=1
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=perl5
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=php5
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=php VER=7.0
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=php VER=7.1
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python VER=2.4
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python VER=2.5
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python VER=2.6
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python # 2.7
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python PY3=3 VER=3.2
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python PY3=3 VER=3.3
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python PY3=3 VER=3.4
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python PY3=3 VER=3.5
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-builtin VER=2.6
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-builtin
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.4
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.5
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.5 SWIGOPTPY3=
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-O
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-classic
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=r
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=ruby VER=1.9.3
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=ruby VER=2.0.0
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=ruby VER=2.3.0
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=scilab
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=tcl
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG=csharp SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG=java SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG=python SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG=csharp SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG=java SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
-      sudo: required
-      dist: trusty
-    - os: linux
-      env: SWIGLANG=python SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: osx
-      env: SWIGLANG=
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=csharp
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=go
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=guile
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=java
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=lua
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=perl5
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=php5
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=python
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=python PY3=3
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=ruby
-    - compiler: clang
-      os: osx
-      env: SWIGLANG=tcl
-
-  allow_failures:
-    # Lots of failing tests currently
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=ocaml
-      sudo: required
-      dist: trusty
-    # Not quite working yet
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=python SWIG_FEATURES=-O
-      sudo: required
-      dist: trusty
-before_install:
-  - date -u
-  - uname -a
-  - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu && cat /proc/cpuinfo | grep "model name" && cat /proc/meminfo | grep MemTotal; fi
-  - if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi
-    # Travis overrides CC environment with compiler predefined values
-  - if test -n "$SWIG_CC"; then export CC="$SWIG_CC"; fi
-  - if test -n "$SWIG_CXX"; then export CXX="$SWIG_CXX"; fi
-install:
-  - if test "$TRAVIS_OS_NAME" = "linux"; then source Tools/travis-linux-install.sh; fi
-  - if test "$TRAVIS_OS_NAME" = "osx"; then source Tools/travis-osx-install.sh; fi
-  - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi
-  - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi
-  - ls -la $(which $CC)
-  - ls -la $(which $CXX)
-  - $CC --version
-  - $CXX --version
-script:
-  - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
-  - if test -n "$SWIGLANG"; then CONFIGOPTS+=(--without-alllang --with-$WITHLANG); fi
-  - echo "${CONFIGOPTS[@]}"
-  - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure "${CONFIGOPTS[@]}"
-  - echo -en 'travis_fold:end:script.1\\r'
-  - make -s $SWIGJOBS
-  - ./swig -version && ./swig -pcreversion
-  - if test -z "$SWIGLANG"; then make -s $SWIGJOBS check-ccache; fi
-  - if test -z "$SWIGLANG"; then make -s $SWIGJOBS check-errors-test-suite; fi
-  - echo 'Installing...' && echo -en 'travis_fold:start:script.2\\r'
-  - if test -z "$SWIGLANG"; then sudo make -s install && swig -version && ccache-swig -V; fi
-  - echo -en 'travis_fold:end:script.2\\r'
-  # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
-  - if test -n "$SWIGLANG"; then cflags=$($TRAVIS_BUILD_DIR/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC) && echo $cflags; fi
-  - if test -n "$SWIGLANG"; then cxxflags=$($TRAVIS_BUILD_DIR/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC) && echo $cxxflags; fi
-  - if test -n "$SWIGLANG"; then make -s check-$SWIGLANG-version; fi
-  - if test -n "$SWIGLANG"; then make check-$SWIGLANG-enabled; fi
-  - if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi
-  - if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-test-suite CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi
-  - echo 'Cleaning...' && echo -en 'travis_fold:start:script.3\\r'
-  - make check-maintainer-clean && ../../configure $CONFIGOPTS
-  - echo -en 'travis_fold:end:script.3\\r'
diff --git a/dependencies2013/win32/swig/ANNOUNCE b/dependencies2013/win32/swig/ANNOUNCE
deleted file mode 100644
index 2c7c5a7c..00000000
--- a/dependencies2013/win32/swig/ANNOUNCE
+++ /dev/null
@@ -1,40 +0,0 @@
-*** ANNOUNCE: SWIG 3.0.12 (27 Jan 2017) ***
-
-http://www.swig.org
-
-We're pleased to announce SWIG-3.0.12, the latest SWIG release.
-
-What is SWIG?
-=============
-
-SWIG is a software development tool that reads C/C++ header files and
-generates the wrapper code needed to make C and C++ code accessible
-from other programming languages including Perl, Python, Tcl, Ruby,
-PHP, C#, Go, Java, Javascript, Lua, Scheme (Guile, MzScheme, CHICKEN),
-D, Ocaml, Pike, Modula-3, Octave, R, Scilab, Common Lisp (CLISP,
-Allegro CL, CFFI, UFFI).  SWIG can also export its parse tree in
-the form of XML and Lisp s-expressions.  Major applications of SWIG
-include generation of scripting language extension modules, rapid
-prototyping, testing, and user interface development for large
-C/C++ systems.
-
-Release Notes
-=============
-Detailed release notes are available with the release and are also
-published on the SWIG web site at http://swig.org/release.html.
-
-Availability
-============
-The release is available for download on Sourceforge at
-
-     http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz
-
-A Windows version is also available at
-
-     http://prdownloads.sourceforge.net/swig/swigwin-3.0.12.zip
-
-Please report problems with this release to the swig-devel mailing list,
-details at http://www.swig.org/mail.html.
-
---- The SWIG Developers
-
diff --git a/dependencies2013/win32/swig/CCache/COPYING b/dependencies2013/win32/swig/CCache/COPYING
deleted file mode 100644
index a43ea212..00000000
--- a/dependencies2013/win32/swig/CCache/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/dependencies2013/win32/swig/CCache/README b/dependencies2013/win32/swig/CCache/README
deleted file mode 100644
index 6e68a6eb..00000000
--- a/dependencies2013/win32/swig/CCache/README
+++ /dev/null
@@ -1,31 +0,0 @@
-This is a re-implementation of "compilercache" in C
-
-The original compilercache scripts were by Erik Thiele
-(erikyyy@erikyyy.de) and I would like to thank him for an excellent
-piece of work. See http://www.erikyyy.de/compilercache/ for the
-original shell scripts.
-
-I wrote ccache because I wanted to get a bit more speed out of a
-compiler cache and I wanted to remove some of the limitations of the
-shell-script version.
-
-Please see the manual page and documentation at
-http://ccache.samba.org/
-
-INSTALLATION
-------------
-
-Please run:
-
-  ./configure
-  make
-  make install
-
-then read the ccache manual page
-
------------
-
-Andrew Tridgell
-http://samba.org/~tridge/
-bugs@ccache.samba.org
-
diff --git a/dependencies2013/win32/swig/CCache/README.swig b/dependencies2013/win32/swig/CCache/README.swig
deleted file mode 100644
index aea0f3d8..00000000
--- a/dependencies2013/win32/swig/CCache/README.swig
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory contains a version of ccache. The initial version was based on ccache-2.4 plus 
-debian patches 01-02, 04-14, see the debian/patches subdirectory. The ccache-win32-2.4 modifications
-to ccache-2.4 have also been merged in.
-
-Changes have been made to support cacheing the output from SWIG. The ability to cache c/c++ compiler 
-output has been retained.
-
-Additional features added are the CCACHE_VERBOSE and CCACHE_SWIG environment variables, see docs.
diff --git a/dependencies2013/win32/swig/CCache/args.c b/dependencies2013/win32/swig/CCache/args.c
deleted file mode 100644
index 31e5471c..00000000
--- a/dependencies2013/win32/swig/CCache/args.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-  convenient routines for argument list handling
-
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "ccache.h"
-
-ARGS *args_init(int init_argc, char **init_args)
-{
-	ARGS *args;
-	int i;
-	args = (ARGS *)x_malloc(sizeof(ARGS));
-	args->argc = 0;
-	args->argv = (char **)x_malloc(sizeof(char *));
-	args->argv[0] = NULL;
-	for (i=0;i<init_argc;i++) {
-		args_add(args, init_args[i]);
-	}
-	return args;
-}
-
-
-void args_add(ARGS *args, const char *s)
-{
-	args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
-	args->argv[args->argc] = x_strdup(s);
-	args->argc++;
-	args->argv[args->argc] = NULL;
-}
-
-/* pop the last element off the args list */
-void args_pop(ARGS *args, int n)
-{
-	while (n--) {
-		args->argc--;
-		free(args->argv[args->argc]);
-		args->argv[args->argc] = NULL;
-	}
-}
-
-/* remove the first element of the argument list */
-void args_remove_first(ARGS *args)
-{
-	free(args->argv[0]);
-	memmove(&args->argv[0], 
-		&args->argv[1],
-		args->argc * sizeof(args->argv[0]));
-	args->argc--;
-}
-
-/* add an argument into the front of the argument list */
-void args_add_prefix(ARGS *args, const char *s)
-{
-	args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
-	memmove(&args->argv[1], &args->argv[0], 
-		(args->argc+1) * sizeof(args->argv[0]));
-	args->argv[0] = x_strdup(s);
-	args->argc++;
-}
-
-/* strip any arguments beginning with the specified prefix */
-void args_strip(ARGS *args, const char *prefix)
-{
-	int i;
-	for (i=0; i<args->argc; ) {
-		if (strncmp(args->argv[i], prefix, strlen(prefix)) == 0) {
-			free(args->argv[i]);
-			memmove(&args->argv[i], 
-				&args->argv[i+1], 
-				args->argc * sizeof(args->argv[i]));
-			args->argc--;
-		} else {
-			i++;
-		}
-	}
-}
diff --git a/dependencies2013/win32/swig/CCache/ccache.c b/dependencies2013/win32/swig/CCache/ccache.c
deleted file mode 100644
index c5c51038..00000000
--- a/dependencies2013/win32/swig/CCache/ccache.c
+++ /dev/null
@@ -1,1400 +0,0 @@
-/*
-  a re-implementation of the compilercache scripts in C
-
-  The idea is based on the shell-script compilercache by Erik Thiele <erikyyy@erikyyy.de>
-
-   Copyright (C) Andrew Tridgell 2002
-   Copyright (C) Martin Pool 2003
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "ccache.h"
-
-/* verbose mode */
-int ccache_verbose = 0;
-
-/* the base cache directory */
-char *cache_dir = NULL;
-
-/* the directory for temporary files */
-static char *temp_dir = NULL;
-
-/* the debug logfile name, if set */
-char *cache_logfile = NULL;
-
-/* the argument list after processing */
-static ARGS *stripped_args;
-
-/* the original argument list */
-static ARGS *orig_args;
-
-/* the output filename being compiled to */
-static char *output_file;
-
-/* the source file */
-static char *input_file;
-
-/* the name of the file containing the cached object code */
-static char *hashname;
-
-/* the extension of the file after pre-processing */
-static const char *i_extension;
-
-/* the name of the temporary pre-processor file */
-static char *i_tmpfile;
-
-/* are we compiling a .i or .ii file directly? */
-static int direct_i_file;
-
-/* the name of the cpp stderr file */
-static char *cpp_stderr;
-
-/* the name of the statistics file */
-char *stats_file = NULL;
-
-/* can we safely use the unification hashing backend? */
-static int enable_unify;
-
-/* should we strip -c when running the preprocessor only? */
-static int strip_c_option;
-
-/* customisation for using the SWIG compiler */
-static int swig;
-
-/* a list of supported file extensions, and the equivalent
-   extension for code that has been through the pre-processor
-*/
-static struct {
-	char *extension;
-	char *i_extension;
-} extensions[] = {
-	{"c", "i"},
-	{"C", "ii"},
-	{"m", "mi"},
-	{"cc", "ii"},
-	{"CC", "ii"},
-	{"cpp", "ii"},
-	{"CPP", "ii"},
-	{"cxx", "ii"},
-	{"CXX", "ii"},
-	{"c++", "ii"},
-	{"C++", "ii"},
-	{"i", "i"},
-	{"ii", "ii"},
-	{NULL, NULL}};
-
-/*
-  something went badly wrong - just execute the real compiler
-*/
-static void failed(void)
-{
-	char *e;
-
-	/* delete intermediate pre-processor file if needed */
-	if (i_tmpfile) {
-		if (!direct_i_file) {
-			unlink(i_tmpfile);
-		}
-		free(i_tmpfile);
-		i_tmpfile = NULL;
-	}
-
-	/* delete the cpp stderr file if necessary */
-	if (cpp_stderr) {
-		unlink(cpp_stderr);
-		free(cpp_stderr);
-		cpp_stderr = NULL;
-	}
-
-	/* strip any local args */
-	args_strip(orig_args, "--ccache-");
-
-	if ((e=getenv("CCACHE_PREFIX"))) {
-		char *p = find_executable(e, MYNAME);
-		if (!p) {
-			cc_log("could not find executable (%s)\n", e);
-			perror(e);
-			exit(1);
-		}
-		args_add_prefix(orig_args, p);
-		free(p);
-	}
-
-	if (ccache_verbose) {
-		display_execute_args(orig_args->argv);
-	}
-
-	if (swig) {
-		putenv("CCACHE_OUTFILES");
-	}
-
-#ifndef _WIN32
-	execv(orig_args->argv[0], orig_args->argv);
-	cc_log("execv returned (%s)!\n", strerror(errno));
-	perror(orig_args->argv[0]);
-	exit(1);
-#else
-	/* execv on Windows causes the 'non-regular' testcase to fail, so use Win32 API instead */
-	{
-		PROCESS_INFORMATION pinfo; 
-		STARTUPINFO sinfo;
-		BOOL ret; 
-		DWORD exitcode;
-		char *args;
-
-		ZeroMemory(&pinfo, sizeof(PROCESS_INFORMATION));
-		ZeroMemory(&sinfo, sizeof(STARTUPINFO));
-		sinfo.cb = sizeof(STARTUPINFO); 
-		args = argvtos(orig_args->argv);
-		ret = CreateProcessA(orig_args->argv[0], args, NULL, NULL, TRUE, 0, NULL, NULL,
-				     &sinfo, &pinfo);
-		if (!ret) {
-			exitcode = 1;
-			cc_log("CreateProcessA failed starting %s\n", orig_args->argv[0]);
-			perror_win32(orig_args->argv[0]);
-		} else {
-			WaitForSingleObject(pinfo.hProcess, INFINITE);
-			GetExitCodeProcess(pinfo.hProcess, &exitcode);
-			CloseHandle(pinfo.hProcess);
-			CloseHandle(pinfo.hThread);
-		}
-		free(args);
-		exit(exitcode);
-	}
-#endif
-}
-
-
-/* return a string to be used to distinguish temporary files 
-   this also tries to cope with NFS by adding the local hostname 
-*/
-static const char *tmp_string(void)
-{
-	static char *ret;
-
-	if (!ret) {
-		char hostname[200];
-		strcpy(hostname, "unknown");
-#if HAVE_GETHOSTNAME
-		gethostname(hostname, sizeof(hostname)-1);
-#endif
-		hostname[sizeof(hostname)-1] = 0;
-		if (asprintf(&ret, "%s.%u", hostname, (unsigned)getpid()) == -1) {
-			fatal("could not allocate tmp_string");
-		}
-	}
-
-	return ret;
-}
-
-/* update cached file sizes and count helper function for to_cache() */
-static void to_cache_stats_helper(struct stat *pstat, char *cached_filename, char *tmp_outfiles, int *files_size, int *cached_files_count)
-{
-#if ENABLE_ZLIB
-	/* do an extra stat on the cache file for the size statistics */
-	if (stat(cached_filename, pstat) != 0) {
-		cc_log("failed to stat cache files - %s\n", strerror(errno));
-		stats_update(STATS_ERROR);
-		if (tmp_outfiles) {
-			unlink(tmp_outfiles);
-		}
-		failed();
-	}
-#else
-        (void)cached_filename;
-        (void)tmp_outfiles;
-#endif
-	(*files_size) += file_size(pstat);
-	(*cached_files_count)++;
-}
-
-/* run the real compiler and put the result in cache */
-static void to_cache(ARGS *args)
-{
-	char *path_stderr;
-	char *tmp_stdout, *tmp_stderr, *tmp_outfiles;
-	struct stat st1;
-	int status;
-	int cached_files_count = 0;
-	int files_size = 0;
-
-	x_asprintf(&tmp_stdout, "%s/tmp.stdout.%s", temp_dir, tmp_string());
-	x_asprintf(&tmp_stderr, "%s/tmp.stderr.%s", temp_dir, tmp_string());
-	x_asprintf(&tmp_outfiles, "%s/tmp.outfiles.%s", temp_dir, tmp_string());
-
-	if (strip_c_option && !swig) {
-		args_add(stripped_args, "-c");
-	}
-
-	if (output_file) {
-		args_add(args, "-o");
-		args_add(args, output_file);
-	}
-
-	/* Turn off DEPENDENCIES_OUTPUT when running cc1, because
-	 * otherwise it will emit a line like
-	 *
-	 *  tmp.stdout.vexed.732.o: /home/mbp/.ccache/tmp.stdout.vexed.732.i
-	 *
-	 * unsetenv() is on BSD and Linux but not portable. */
-	putenv("DEPENDENCIES_OUTPUT");
-
-	/* Give SWIG a filename for it to create and populate with a list of files that it generates */
-	if (swig) {
-		char *ccache_outfiles;
-		x_asprintf(&ccache_outfiles, "CCACHE_OUTFILES=%s", tmp_outfiles);
-		unlink(tmp_outfiles);
-		if (getenv("CCACHE_OUTFILES") || putenv(ccache_outfiles) == -1) {
-			cc_log("CCACHE_OUTFILES env variable already set or could not be set\n");
-			stats_update(STATS_ERROR);
-			failed();
-		}
-	}
-	
-	if (getenv("CCACHE_CPP2")) {
-		args_add(args, input_file);
-	} else {
-		if (swig) {
-			args_add(args, "-nopreprocess");
-		}
-		args_add(args, i_tmpfile);
-	}
-	status = execute(args->argv, tmp_stdout, tmp_stderr);
-	args_pop(args, 3);
-
-	if (stat(tmp_stdout, &st1) != 0 || st1.st_size != 0) {
-		cc_log("compiler produced stdout for %s\n", input_file);
-		stats_update(STATS_STDOUT);
-		unlink(tmp_stdout);
-		unlink(tmp_stderr);
-		unlink(tmp_outfiles);
-		if (!swig) unlink(output_file);
-		failed();
-	}
-	unlink(tmp_stdout);
-
-	if (status != 0) {
-		int fd;
-		cc_log("compile of %s gave status = %d\n", input_file, status);
-		stats_update(STATS_STATUS);
-
-		fd = open(tmp_stderr, O_RDONLY | O_BINARY);
-		if (fd != -1) {
-			if (cpp_stderr) {
-				/* we might have some stderr from cpp */
-				int fd2 = open(cpp_stderr, O_RDONLY | O_BINARY);
-				if (fd2 != -1) {
-					copy_fd(fd2, 2);
-					close(fd2);
-					unlink(cpp_stderr);
-					cpp_stderr = NULL;
-				}
-			}
-
-			/* we can use a quick method of
-			   getting the failed output */
-			copy_fd(fd, 2);
-			close(fd);
-			unlink(tmp_stderr);
-			if (i_tmpfile && !direct_i_file) {
-				unlink(i_tmpfile);
-			}
-			exit(status);
-		}
-		
-		unlink(tmp_stderr);
-		unlink(tmp_outfiles);
-		if (!swig) unlink(output_file);
-		failed();
-	} else {
-		int hardlink = (getenv("CCACHE_NOCOMPRESS") != 0) && (getenv("CCACHE_HARDLINK") != 0);
-		if (swig) {
-			/* read the list of generated files and copy each of them into the cache */
-			FILE *file;
-			file = fopen(tmp_outfiles, "r");
-			if (file) {
-				char out_filename[FILENAME_MAX + 1];
-				char out_filename_cache[FILENAME_MAX + 1];
-				while (fgets(out_filename, FILENAME_MAX, file)) {
-					char *linefeed = strchr(out_filename, '\n');
-					if (linefeed) {
-						char *potential_cr = linefeed - 1;
-						if (potential_cr >= out_filename && *potential_cr == '\r')
-						  *potential_cr = 0;
-						*linefeed = 0;
-
-						if (cached_files_count == 0) {
-							strcpy(out_filename_cache, hashname);
-						} else {
-							sprintf(out_filename_cache, "%s.%d", hashname, cached_files_count);
-						}
-
-						if (commit_to_cache(out_filename, out_filename_cache, hardlink) != 0) {
-							fclose(file);
-							unlink(tmp_outfiles);
-							failed();
-						}
-						to_cache_stats_helper(&st1, out_filename_cache, tmp_outfiles, &files_size, &cached_files_count);
-					} else {
-						cached_files_count = 0;
-						break;
-					}
-				}
-				fclose(file);
-				if (cached_files_count == 0) {
-					cc_log("failed to copy output files to cache - internal error\n");
-					stats_update(STATS_ERROR);
-					unlink(tmp_outfiles);
-					failed();
-				}
-
-				/* also copy the (uncompressed) file containing the list of generated files into the cache */
-				sprintf(out_filename_cache, "%s.outfiles", hashname);
-				if (stat(tmp_outfiles, &st1) != 0 ||
-					safe_rename(tmp_outfiles, out_filename_cache) != 0) {
-					cc_log("failed to copy outfiles file to cache - %s\n", strerror(errno));
-					stats_update(STATS_ERROR);
-					unlink(tmp_outfiles);
-					failed();
-				}
-				to_cache_stats_helper(&st1, out_filename_cache, tmp_outfiles, &files_size, &cached_files_count);
-				unlink(tmp_outfiles);
-			} else {
-				cc_log("failed to open temp outfiles file - %s\n", strerror(errno));
-				stats_update(STATS_ERROR);
-				failed();
-			}
-		} else {
-			if (commit_to_cache(output_file, hashname, hardlink) != 0) {
-				failed();
-			}
-			to_cache_stats_helper(&st1, hashname, 0, &files_size, &cached_files_count);
-		}
-	}
-
-	x_asprintf(&path_stderr, "%s.stderr", hashname);
-
-	if (stat(tmp_stderr, &st1) != 0 ||
-		move_file(tmp_stderr, path_stderr) != 0) {
-		cc_log("failed to rename tmp files - %s\n", strerror(errno));
-		stats_update(STATS_ERROR);
-		failed();
-	}
-
-	to_cache_stats_helper(&st1, path_stderr, 0, &files_size, &cached_files_count);
-
-	cc_log("Placed %d files for %s into cache\n", cached_files_count, input_file);
-	stats_tocache(files_size, cached_files_count);
-
-	free(tmp_stderr);
-	free(tmp_stdout);
-	free(tmp_outfiles);
-	free(path_stderr);
-}
-
-/* find the hash for a command. The hash includes all argument lists,
-   plus the output from running the compiler with -E */
-static void find_hash(ARGS *args)
-{
-	int i;
-	char *path_stdout, *path_stderr;
-	char *hash_dir;
-	char *s;
-	struct stat st;
-	int status;
-	int nlevels = 2;
-	char *input_base;
-	char *tmp;
-	
-	if ((s = getenv("CCACHE_NLEVELS"))) {
-		nlevels = atoi(s);
-		if (nlevels < 1) nlevels = 1;
-		if (nlevels > 8) nlevels = 8;
-	}
-
-	hash_start();
-
-	/* when we are doing the unifying tricks we need to include
-           the input file name in the hash to get the warnings right */
-	if (enable_unify || swig) {
-		hash_string(input_file);
-	}
-
-	if (swig) {
-		if (output_file) {
-			hash_string(output_file);
-		}
-	} else {
-		/* we have to hash the extension, as a .i file isn't treated the same
-		   by the compiler as a .ii file */
-		hash_string(i_extension);
-	}
-
-	/* first the arguments */
-	for (i=1;i<args->argc;i++) {
-		/* some arguments don't contribute to the hash. The
-		   theory is that these arguments will change the
-		   output of -E if they are going to have any effect
-		   at all, or they only affect linking */
-		if (i < args->argc-1) {
-			if (strcmp(args->argv[i], "-I") == 0 ||
-			    strcmp(args->argv[i], "-include") == 0 ||
-			    strcmp(args->argv[i], "-L") == 0 ||
-			    strcmp(args->argv[i], "-D") == 0 ||
-			    strcmp(args->argv[i], "-idirafter") == 0 ||
-			    strcmp(args->argv[i], "-isystem") == 0) {
-				i++;
-				continue;
-			}
-		}
-		if (strncmp(args->argv[i], "-I", 2) == 0 ||
-		    strncmp(args->argv[i], "-L", 2) == 0 ||
-		    strncmp(args->argv[i], "-D", 2) == 0 ||
-		    strncmp(args->argv[i], "-idirafter", 10) == 0 ||
-		    strncmp(args->argv[i], "-isystem", 8) == 0) {
-			continue;
-		}
-
-		if (strncmp(args->argv[i], "--specs=", 8) == 0 &&
-		    stat(args->argv[i]+8, &st) == 0) {
-			/* if given a explicit specs file, then hash that file, but
-			   don't include the path to it in the hash */
-			hash_file(args->argv[i]+8);
-			continue;
-		}
-
-		/* all other arguments are included in the hash */
-		hash_string(args->argv[i]);
-	}
-
-	/* the compiler driver size and date. This is a simple minded way
-	   to try and detect compiler upgrades. It is not 100% reliable */
-	if (stat(args->argv[0], &st) != 0) {
-		cc_log("Couldn't stat the compiler!? (argv[0]='%s')\n", args->argv[0]);
-		stats_update(STATS_COMPILER);
-		failed();
-	}
-
-	/* also include the hash of the compiler name - as some compilers
-	   use hard links and behave differently depending on the real name */
-	if (st.st_nlink > 1) {
-		char *path = str_basename(args->argv[0]);
-		hash_string(path);
-		free(path);
-	}
-
-	hash_int(st.st_size);
-	hash_int(st.st_mtime);
-
-	/* possibly hash the current working directory */
-	if (getenv("CCACHE_HASHDIR")) {
-		char *cwd = gnu_getcwd();
-		if (cwd) {
-			hash_string(cwd);
-			free(cwd);
-		}
-	}
-
-	/* ~/hello.c -> tmp.hello.123.i 
-	   limit the basename to 10
-	   characters in order to cope with filesystem with small
-	   maximum filename length limits */
-	input_base = str_basename(input_file);
-	tmp = strchr(input_base, '.');
-	if (tmp != NULL) {
-		*tmp = 0;
-	}
-	if (strlen(input_base) > 10) {
-		input_base[10] = 0;
-	}
-
-	/* now the run */
-	x_asprintf(&path_stdout, "%s/%s.tmp.%s.%s", temp_dir,
-		   input_base, tmp_string(), 
-		   i_extension);
-	x_asprintf(&path_stderr, "%s/tmp.cpp_stderr.%s", temp_dir, tmp_string());
-	free(input_base);
-
-	if (!direct_i_file) {
-		/* run cpp on the input file to obtain the .i */
-		args_add(args, "-E");
-		args_add(args, input_file);
-		status = execute(args->argv, path_stdout, path_stderr);
-		args_pop(args, 2);
-	} else {
-		/* we are compiling a .i or .ii file - that means we
-		   can skip the cpp stage and directly form the
-		   correct i_tmpfile */
-		path_stdout = x_strdup(input_file);
-		if (create_empty_file(path_stderr) != 0) {
-			cc_log("failed to create empty stderr file\n");
-			stats_update(STATS_ERROR);
-			failed();
-		}
-		status = 0;
-	}
-
-	if (status != 0) {
-		if (!direct_i_file) {
-			unlink(path_stdout);
-		}
-		unlink(path_stderr);
-		cc_log("the preprocessor gave %d\n", status);
-		stats_update(STATS_PREPROCESSOR);
-		failed();
-	}
-
-	/* if the compilation is with -g then we have to include the whole of the
-	   preprocessor output, which means we are sensitive to line number
-	   information. Otherwise we can discard line number info, which makes
-	   us less sensitive to reformatting changes 
-
-	   Note! I have now disabled the unification code by default
-	   as it gives the wrong line numbers for warnings. Pity.
-	*/
-	if (!enable_unify) {
-		hash_file(path_stdout);
-	} else {
-		if (unify_hash(path_stdout) != 0) {
-			stats_update(STATS_ERROR);
-			failed();
-		}
-	}
-	hash_file(path_stderr);
-
-	i_tmpfile = path_stdout;
-
-	if (!getenv("CCACHE_CPP2")) {
-		/* if we are using the CPP trick then we need to remember this stderr
-		   data and output it just before the main stderr from the compiler
-		   pass */
-		cpp_stderr = path_stderr;
-	} else {	
-		unlink(path_stderr);
-		free(path_stderr);
-	}
-
-	/* we use a N level subdir for the cache path to reduce the impact
-	   on filesystems which are slow for large directories
-	*/
-	s = hash_result();
-	x_asprintf(&hash_dir, "%s/%c", cache_dir, s[0]);
-	x_asprintf(&stats_file, "%s/stats", hash_dir);
-	for (i=1; i<nlevels; i++) {
-		char *p;
-		if (create_dir(hash_dir) != 0) {
-			cc_log("failed to create %s\n", hash_dir);
-			stats_update(STATS_ERROR);
-			failed();
-		}
-		x_asprintf(&p, "%s/%c", hash_dir, s[i]);
-		free(hash_dir);
-		hash_dir = p;
-	}
-	if (create_dir(hash_dir) != 0) {
-		cc_log("failed to create %s\n", hash_dir);
-		stats_update(STATS_ERROR);
-		failed();
-	}
-	x_asprintf(&hashname, "%s/%s", hash_dir, s+nlevels);
-	free(hash_dir);
-}
-
-/* 
-   try to return the compile result from cache. If we can return from
-   cache then this function exits with the correct status code,
-   otherwise it returns */
-static void from_cache(int first)
-{
-	int fd_stderr, fd_cpp_stderr;
-	char *stderr_file;
-	struct stat st;
-
-	x_asprintf(&stderr_file, "%s.stderr", hashname);
-	fd_stderr = open(stderr_file, O_RDONLY | O_BINARY);
-	if (fd_stderr == -1) {
-		/* it isn't in cache ... */
-		free(stderr_file);
-		return;
-	}
-
-	/* make sure the output is there too */
-	if (stat(hashname, &st) != 0) {
-		close(fd_stderr);
-		unlink(stderr_file);
-		free(stderr_file);
-		return;
-	}
-
-	/* the user might be disabling cache hits */
-#ifndef ENABLE_ZLIB
-	/* if the cache file is compressed we must recache */
-	if ((first && getenv("CCACHE_RECACHE")) ||
-		test_if_compressed(hashname) == 1)
-#else
-	if (first && getenv("CCACHE_RECACHE"))
-#endif
-	{
-		close(fd_stderr);
-		unlink(stderr_file);
-		free(stderr_file);
-		return;
-	}
-
-	if (first) {
-		int hardlink;
-		int passfail = -1;
-
-		/* update timestamps for LRU cleanup
-		   also gives output_file a sensible mtime when hard-linking (for make) */
-		x_utimes(stderr_file);
-
-		hardlink = (getenv("CCACHE_HARDLINK") != 0);
-
-		if (swig) {
-			/* read the list of generated files and copy each of them out of the cache */
-			FILE *file;
-			char *outfiles;
-			x_asprintf(&outfiles, "%s.outfiles", hashname);
-			file = fopen(outfiles, "r");
-			if (file) {
-				char out_filename[FILENAME_MAX + 1];
-				char out_filename_cache[FILENAME_MAX + 1];
-				int retrieved_files_count = 0;
-				x_utimes(outfiles);
-				while (fgets(out_filename, FILENAME_MAX, file)) {
-					char *linefeed = strchr(out_filename, '\n');
-					if (linefeed) {
-						char *potential_cr = linefeed - 1;
-						if (potential_cr >= out_filename && *potential_cr == '\r')
-						  *potential_cr = 0;
-						*linefeed = 0;
-
-						if (retrieved_files_count == 0) {
-							strcpy(out_filename_cache, hashname);
-						} else {
-							sprintf(out_filename_cache, "%s.%d", hashname, retrieved_files_count);
-						}
-
-						passfail = retrieve_from_cache(out_filename_cache, out_filename, hardlink);
-						if (passfail == -1) {
-							break;
-						}
-
-						retrieved_files_count++;
-					} else {
-						cc_log("failed to copy output files from cache - internal error\n");
-						stats_update(STATS_ERROR);
-						passfail = -1;
-						break;
-					}
-				}
-				if (retrieved_files_count == 0) {
-					cc_log("failed to copy output files from cache - internal error\n");
-					stats_update(STATS_ERROR);
-					passfail = -1;
-				}
-				fclose(file);
-			} else {
-				cc_log("failed to open cached outfiles file - %s\n", strerror(errno));
-				stats_update(STATS_ERROR);
-			}
-		} else {
-			passfail = retrieve_from_cache(hashname, output_file, hardlink);
-		}
-
-		if (passfail == -1) {
-			close(fd_stderr);
-			unlink(stderr_file);
-			free(stderr_file);
-			return;
-		}
-		free(stderr_file);
-	}
-
-	/* get rid of the intermediate preprocessor file */
-	if (i_tmpfile) {
-		if (!direct_i_file) {
-			unlink(i_tmpfile);
-		}
-		free(i_tmpfile);
-		i_tmpfile = NULL;
-	}
-
-	/* send the cpp stderr, if applicable */
-	fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY);
-	if (fd_cpp_stderr != -1) {
-		copy_fd(fd_cpp_stderr, 2);
-		close(fd_cpp_stderr);
-		unlink(cpp_stderr);
-		free(cpp_stderr);
-		cpp_stderr = NULL;
-	}
-
-	/* send the stderr */
-	copy_fd(fd_stderr, 2);
-	close(fd_stderr);
-
-	/* and exit with the right status code */
-	if (first) {
-		cc_log("got cached result for %s\n", input_file);
-		stats_update(STATS_CACHED);
-	}
-
-	exit(0);
-}
-
-/* find the real compiler. We just search the PATH to find a executable of the 
-   same name that isn't a link to ourselves */
-static void find_compiler(int argc, char **argv)
-{
-	char *base;
-	char *path;
-
-	orig_args = args_init(argc, argv);
-
-	base = str_basename(argv[0]);
-
-	/* we might be being invoked like "ccache gcc -c foo.c" */
-	if (strcmp(base, MYNAME) == 0) {
-		args_remove_first(orig_args);
-		free(base);
-		if (strchr(argv[1],'/')
-#ifdef _WIN32
-                    || strchr(argv[1],'\\')
-#endif
-                    ) {
-			/* a full path was given */
-			return;
-		}
-		base = str_basename(argv[1]);
-	}
-
-	/* support user override of the compiler */
-	if ((path=getenv("CCACHE_CC"))) {
-		free(base);
-		base = x_strdup(path);
-	}
-
-	orig_args->argv[0] = find_executable(base, MYNAME);
-
-	/* can't find the compiler! */
-	if (!orig_args->argv[0]) {
-		stats_update(STATS_COMPILER);
-		cc_log("could not find compiler (%s)\n", base);
-		perror(base);
-		free(base);
-		exit(1);
-	}
-  	free(base);
-}
-
-
-/* check a filename for C/C++ extension. Return the pre-processor
-   extension */
-static const char *check_extension(const char *fname, int *direct_i)
-{
-	int i;
-	const char *p;
-
-	if (direct_i) {
-		*direct_i = 0;
-	}
-
-	if (swig) return "ii"; /* any file extension is acceptable as input for SWIG */
-
-	p = strrchr(fname, '.');
-	if (!p) return NULL;
-	p++;
-	for (i=0; extensions[i].extension; i++) {
-		if (strcmp(p, extensions[i].extension) == 0) {
-			if (direct_i && strcmp(p, extensions[i].i_extension) == 0) {
-				*direct_i = 1;
-			}
-			p = getenv("CCACHE_EXTENSION");
-			if (p) return p;
-			return extensions[i].i_extension;
-		}
-	}
-	return NULL;
-}
-
-
-/* 
-   process the compiler options to form the correct set of options 
-   for obtaining the preprocessor output
-*/
-static void process_args(int argc, char **argv)
-{
-	int i;
-	int found_c_opt = 0;
-	int found_S_opt = 0;
-	struct stat st;
-	char *e;
-	/* is gcc being asked to output dependencies? */
-	int generating_dependencies = 0;
-	/* is the dependency makefile name overridden with -MF? */
-	int dependency_filename_specified = 0;
-	/* is the dependency makefile target name specified with -MQ or -MF? */
-	int dependency_target_specified = 0;
-
-
-	stripped_args = args_init(0, NULL);
-
-	args_add(stripped_args, argv[0]);
-
-	/* -c not required for SWIG */
-	if (swig) {
-		found_c_opt = 1;
-	}
-
-	for (i=1; i<argc; i++) {
-		/* some options will never work ... */
-		if (strcmp(argv[i], "-E") == 0) {
-			failed();
-		}
-
-		/* these are too hard */
-		if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
-		    strcmp(argv[i], "-fprofile-arcs") == 0 ||
-		    strcmp(argv[i], "-ftest-coverage") == 0 ||
-		    strcmp(argv[i], "--coverage") == 0 ||
-		    strcmp(argv[i], "-M") == 0 ||
-		    strcmp(argv[i], "-MM") == 0 ||
-		    strcmp(argv[i], "-x") == 0) {
-			cc_log("argument %s is unsupported\n", argv[i]);
-			stats_update(STATS_UNSUPPORTED);
-			failed();
-			continue;
-		}
-
-		/* we must have -c */
-		if (strcmp(argv[i], "-c") == 0) {
-			if (!strip_c_option) {
-				args_add(stripped_args, argv[i]);
-			}
-			found_c_opt = 1;
-			continue;
-		}
-
-		/* -S changes the default extension */
-		if (strcmp(argv[i], "-S") == 0) {
-			args_add(stripped_args, argv[i]);
-			found_S_opt = 1;
-			continue;
-		}
-		
-		/* we need to work out where the output was meant to go */
-		if (strcmp(argv[i], "-o") == 0) {
-			if (i == argc-1) {
-				cc_log("missing argument to %s\n", argv[i]);
-				stats_update(STATS_ARGS);
-				failed();
-			}
-			output_file = argv[i+1];
-			i++;
-			continue;
-		}
-		
-		/* alternate form of -o, with no space */
-		if (!swig) { /* some of SWIG's arguments begin with -o */
-			if (strncmp(argv[i], "-o", 2) == 0) {
-				output_file = &argv[i][2];
-				continue;
-			}
-		}
-
-		/* debugging is handled specially, so that we know if we
-		   can strip line number info 
-		*/
-		if (strncmp(argv[i], "-g", 2) == 0) {
-			args_add(stripped_args, argv[i]);
-			if (strcmp(argv[i], "-g0") != 0) {
-				enable_unify = 0;
-			}
-			continue;
-		}
-
-		/* The user knows best: just swallow the next arg */
-		if (strcmp(argv[i], "--ccache-skip") == 0) {
-			i++;
-			if (i == argc) {
-				failed();
-			}
-			args_add(stripped_args, argv[i]);
-			continue;
-		}
-
-		/* These options require special handling, because they
-		   behave differently with gcc -E, when the output
-		   file is not specified. */
-
-		if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
-			generating_dependencies = 1;
-		} else if (strcmp(argv[i], "-MF") == 0) {
-			dependency_filename_specified = 1;
-		} else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
-			dependency_target_specified = 1;
-		}
-
-		/* the input file is already preprocessed */
-		if (swig && strcmp(argv[i], "-nopreprocess") == 0) {
-			direct_i_file = 1;
-			continue;
-		}
-
-		/* options that take an argument */
-		{
-			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
-					      "-iwithprefix", "-iwithprefixbefore",
-					      "-L", "-D", "-U", "-x", "-MF", 
-					      "-MT", "-MQ", "-isystem", "-aux-info",
-					      "--param", "-A", "-Xlinker", "-u",
-					      "-idirafter", 
-					      NULL};
-			int j;
-			for (j=0;opts[j];j++) {
-				if (strcmp(argv[i], opts[j]) == 0) {
-					if (i == argc-1) {
-						cc_log("missing argument to %s\n", 
-						       argv[i]);
-						stats_update(STATS_ARGS);
-						failed();
-					}
-						
-					args_add(stripped_args, argv[i]);
-					args_add(stripped_args, argv[i+1]);
-					i++;
-					break;
-				}
-			}
-			if (opts[j]) continue;
-		}
-
-		/* other options */
-		if (argv[i][0] == '-') {
-			args_add(stripped_args, argv[i]);
-			continue;
-		}
-
-		/* if an argument isn't a plain file then assume its
-		   an option, not an input file. This allows us to
-		   cope better with unusual compiler options */
-		if (stat(argv[i], &st) != 0 || !S_ISREG(st.st_mode)) {
-			args_add(stripped_args, argv[i]);
-			continue;			
-		}
-
-		if (input_file) {
-			if (check_extension(argv[i], NULL)) {
-				cc_log("multiple input files (%s and %s)\n",
-				       input_file, argv[i]);
-				stats_update(STATS_MULTIPLE);
-			} else if (!found_c_opt) {
-				cc_log("called for link with %s\n", argv[i]);
-				if (strstr(argv[i], "conftest.")) {
-					stats_update(STATS_CONFTEST);
-				} else {
-					stats_update(STATS_LINK);
-				}
-			} else {
-				cc_log("non C/C++ file %s\n", argv[i]);
-				stats_update(STATS_NOTC);
-			}
-			failed();
-		}
-
-		input_file = argv[i];
-	}
-
-	if (!input_file) {
-		cc_log("No input file found\n");
-		stats_update(STATS_NOINPUT);
-		failed();
-	}
-
-	if (swig) {
-		i_extension = check_extension(input_file, NULL);
-	} else {
-		i_extension = check_extension(input_file, &direct_i_file);
-	}
-	if (i_extension == NULL) {
-		cc_log("Not a C/C++ file - %s\n", input_file);
-		stats_update(STATS_NOTC);
-		failed();
-	}
-
-	if (!found_c_opt) {
-		cc_log("No -c option found for %s\n", input_file);
-		/* I find that having a separate statistic for autoconf tests is useful,
-		   as they are the dominant form of "called for link" in many cases */
-		if (strstr(input_file, "conftest.")) {
-			stats_update(STATS_CONFTEST);
-		} else {
-			stats_update(STATS_LINK);
-		}
-		failed();
-	}
-
-
-	/* don't try to second guess the compilers heuristics for stdout handling */
-	if (output_file && strcmp(output_file, "-") == 0) {
-		stats_update(STATS_OUTSTDOUT);
-		failed();
-	}
-
-	if (!swig && !output_file) {
-		char *p;
-		output_file = x_strdup(input_file);
-		if ((p = strrchr(output_file, '/'))) {
-			output_file = p+1;
-		}
-		p = strrchr(output_file, '.');
-		if (!p || !p[1]) {
-			cc_log("badly formed output_file %s\n", output_file);
-			stats_update(STATS_ARGS);
-			failed();
-		}
-		p[1] = found_S_opt ? 's' : 'o';
-		p[2] = 0;
-	}
-
-	/* If dependencies are generated, configure the preprocessor */
-
-	if (generating_dependencies && output_file) {
-		if (!dependency_filename_specified) {
-			char *default_depfile_name = x_strdup(output_file);
-			char *p = strrchr(default_depfile_name, '.');
-
-			if (p) {
-				if (strlen(p) < 2) {
-					cc_log("badly formed dependency file %s\n", output_file);
-					stats_update(STATS_ARGS);
-					free(default_depfile_name);
-					failed();
-					return;
-				}
-				*p = 0;
-			}
-			else  {
-				int len = p - default_depfile_name;
-				
-				p = x_malloc(len + 3);
-				strncpy(default_depfile_name, p, len - 1);
-				free(default_depfile_name);
-				default_depfile_name = p;
-			}
-
-			strcat(default_depfile_name, ".d");
-			args_add(stripped_args, "-MF");
-			args_add(stripped_args, default_depfile_name);
-			free(default_depfile_name);
-		}
-
-		if (!dependency_target_specified) {
-			args_add(stripped_args, "-MT");
-			args_add(stripped_args, output_file);
-		}
-	}
-
-	/* cope with -o /dev/null */
-	if (output_file && strcmp(output_file,"/dev/null") != 0 && stat(output_file, &st) == 0 && !S_ISREG(st.st_mode)) {
-		cc_log("Not a regular file %s\n", output_file);
-		stats_update(STATS_DEVICE);
-		failed();
-	}
-
-	if ((e=getenv("CCACHE_PREFIX"))) {
-		char *p = find_executable(e, MYNAME);
-		if (!p) {
-			cc_log("could not find executable (%s)\n", e);
-			stats_update(STATS_ENVIRONMMENT);
-			perror(e);
-			exit(1);
-		}
-		args_add_prefix(stripped_args, p);
-		free(p);
-	}
-}
-
-static void detect_swig()
-{
-	char *basename = str_basename(orig_args->argv[0]);
-	if (strstr(basename, "swig") || getenv("CCACHE_SWIG")) {
-		swig = 1;
-	}
-	free(basename);
-}
-
-/* the main ccache driver function */
-static void ccache(int argc, char *argv[])
-{
-	/* find the real compiler */
-	find_compiler(argc, argv);
-
-	/* use the real compiler if HOME is not set */
-	if (!cache_dir) {
-		cc_log("Unable to determine home directory\n");
-		cc_log("ccache is disabled\n");
-		failed();
-	}
-	
-	/* we might be disabled */
-	if (getenv("CCACHE_DISABLE")) {
-		cc_log("ccache is disabled\n");
-		failed();
-	}
-
-	if (getenv("CCACHE_STRIPC")) {
-		strip_c_option = 1;
-	}
-
-	if (getenv("CCACHE_UNIFY")) {
-		enable_unify = 1;
-	}
-
-	detect_swig();
-
-	/* process argument list, returning a new set of arguments for pre-processing */
-	process_args(orig_args->argc, orig_args->argv);
-
-	/* run with -E to find the hash */
-	find_hash(stripped_args);
-
-	/* if we can return from cache at this point then do */
-	from_cache(1);
-
-	if (getenv("CCACHE_READONLY")) {
-		cc_log("read-only set - doing real compile\n");
-		failed();
-	}
-	
-	/* run real compiler, sending output to cache */
-	to_cache(stripped_args);
-
-	/* return from cache */
-	from_cache(0);
-
-	/* oh oh! */
-	cc_log("secondary from_cache failed!\n");
-	stats_update(STATS_ERROR);
-	failed();
-}
-
-
-static void usage(void)
-{
-	printf("%s, a compiler cache including support for SWIG. Version %s\n", MYNAME, CCACHE_VERSION);
-	printf("Copyright Andrew Tridgell, 2002\n\n");
-	
-	printf("Usage:\n");
-	printf("\t" MYNAME " [options]\n");
-	printf("\t" MYNAME " compiler [compile options]\n");
-	printf("\tcompiler [compile options]    (via symbolic link)\n");
-	printf("\nOptions:\n");
-
-	printf("-s                      show statistics summary\n");
-	printf("-z                      zero statistics\n");
-	printf("-c                      run a cache cleanup\n");
-	printf("-C                      clear the cache completely\n");
-	printf("-F <maxfiles>           set maximum files in cache\n");
-	printf("-M <maxsize>            set maximum size of cache (use G, M or K)\n");
-	printf("-h                      this help page\n");
-	printf("-V                      print version number\n");
-}
-
-static void check_cache_dir(void)
-{
-	if (!cache_dir) {
-		fatal("Unable to determine home directory");
-	}
-}
-
-/* the main program when not doing a compile */
-static int ccache_main(int argc, char *argv[])
-{
-	int c;
-	size_t v;
-
-	while ((c = getopt(argc, argv, "hszcCF:M:V")) != -1) {
-		switch (c) {
-		case 'V':
-			printf("%s version %s\n", MYNAME, CCACHE_VERSION);
-			printf("Copyright Andrew Tridgell 2002\n");
-			printf("Released under the GNU GPL v2 or later\n");
-			exit(0);
-
-		case 'h':
-			usage();
-			exit(0);
-			
-		case 's':
-			check_cache_dir();
-			stats_summary();
-			break;
-
-		case 'c':
-			check_cache_dir();
-			cleanup_all(cache_dir);
-			printf("Cleaned cache\n");
-			break;
-
-		case 'C':
-			check_cache_dir();
-			wipe_all(cache_dir);
-			printf("Cleared cache\n");
-			break;
-
-		case 'z':
-			check_cache_dir();
-			stats_zero();
-			printf("Statistics cleared\n");
-			break;
-
-		case 'F':
-			check_cache_dir();
-			v = atoi(optarg);
-			if (stats_set_limits(v, -1) == 0) {
-				printf("Set cache file limit to %u\n", (unsigned)v);
-			} else {
-				printf("Could not set cache file limit.\n");
-				exit(1);
-			}
-			break;
-
-		case 'M':
-			check_cache_dir();
-			v = value_units(optarg);
-			if (stats_set_limits(-1, v) == 0) {
-				printf("Set cache size limit to %uk\n", (unsigned)v);
-			} else {
-				printf("Could not set cache size limit.\n");
-				exit(1);
-			}
-			break;
-
-		default:
-			usage();
-			exit(1);
-		}
-	}
-
-	return 0;
-}
-
-
-/* Make a copy of stderr that will not be cached, so things like
-   distcc can send networking errors to it. */
-static void setup_uncached_err(void)
-{
-	char *buf;
-	int uncached_fd;
-	
-	uncached_fd = dup(2);
-	if (uncached_fd == -1) {
-		cc_log("dup(2) failed\n");
-		stats_update(STATS_ERROR);
-		failed();
-	}
-
-	/* leak a pointer to the environment */
-	x_asprintf(&buf, "UNCACHED_ERR_FD=%d", uncached_fd);
-
-	if (putenv(buf) == -1) {
-		cc_log("putenv failed\n");
-		close(uncached_fd);
-		stats_update(STATS_ERROR);
-		failed();
-	}
-}
-
-
-int main(int argc, char *argv[])
-{
-	char *p;
-
-	cache_dir = getenv("CCACHE_DIR");
-	if (!cache_dir) {
-		const char *home_directory = get_home_directory();
-		if (home_directory) {
-			x_asprintf(&cache_dir, "%s/.ccache", home_directory);
-		}
-	}
-
-	cache_logfile = getenv("CCACHE_LOGFILE");
-
-	if (getenv("CCACHE_VERBOSE")) {
-		ccache_verbose = 1;
-	}
-
-	setup_uncached_err();
-	
-
-	/* the user might have set CCACHE_UMASK */
-	p = getenv("CCACHE_UMASK");
-	if (p) {
-		mode_t mask;
-		errno = 0;
-		mask = strtol(p, NULL, 8);
-		if (errno == 0) {
-			umask(mask);
-		}
-	}
-
-
-	/* check if we are being invoked as "ccache" */
-	if (strlen(argv[0]) >= strlen(MYNAME) &&
-	    strcmp(argv[0] + strlen(argv[0]) - strlen(MYNAME), MYNAME) == 0) {
-		if (argc < 2) {
-			usage();
-			exit(1);
-		}
-		/* if the first argument isn't an option, then assume we are
-		   being passed a compiler name and options */
-		if (argv[1][0] == '-') {
-			return ccache_main(argc, argv);
-		}
-	}
-
-	/* make sure the cache dir exists */
-	if (cache_dir && (create_dir(cache_dir) != 0)) {
-		fprintf(stderr,"ccache: failed to create %s (%s)\n", 
-			cache_dir, strerror(errno));
-		exit(1);
-	}
-
-	temp_dir = getenv("CCACHE_TEMPDIR");
-	if (!temp_dir) {
-		x_asprintf(&temp_dir, "%s/temp", cache_dir);
-		/* make sure temp dir exists if not supplied by user */
-		if (temp_dir && create_dir(temp_dir) != 0) {
-			fprintf(stderr,"ccache: failed to create %s (%s)\n", 
-				temp_dir, strerror(errno));
-			exit(1);
-		}
-	}
-
-	if (!getenv("CCACHE_READONLY")) {
-		if (create_cachedirtag(cache_dir) != 0) {
-			fprintf(stderr,"ccache: failed to create %s/CACHEDIR.TAG (%s)\n",
-				cache_dir, strerror(errno));
-			exit(1);
-		}
-	}
-
-	ccache(argc, argv);
-	return 1;
-}
diff --git a/dependencies2013/win32/swig/CCache/ccache.h b/dependencies2013/win32/swig/CCache/ccache.h
deleted file mode 100644
index a79d8832..00000000
--- a/dependencies2013/win32/swig/CCache/ccache.h
+++ /dev/null
@@ -1,209 +0,0 @@
-#include "ccache_swig_config.h"
-
-#define CCACHE_VERSION SWIG_VERSION
-
-#ifndef _WIN32
-#include "config.h"
-#else
-#include <sys/locking.h>
-#define PACKAGE_NAME "ccache-swig.exe"
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#ifndef _WIN32
- #include <sys/wait.h>
- #include <sys/mman.h>
-#else
-#ifndef _WIN32_WINNT
- #define _WIN32_WINNT 0x0500
-#endif
- #include <windows.h>
- #include <shlobj.h>
-#endif
-
-#include <sys/file.h>
-#include <fcntl.h>
-#include <time.h>
-#include <string.h>
-#include <ctype.h>
-#include <utime.h>
-#include <stdarg.h>
-#include <dirent.h>
-#include <limits.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef ENABLE_ZLIB
-#include <zlib.h>
-#endif
-
-#define STATUS_NOTFOUND 3
-#define STATUS_FATAL 4
-#define STATUS_NOCACHE 5
-
-#define MYNAME PACKAGE_NAME
-
-#define LIMIT_MULTIPLE 0.8
-
-/* default maximum cache size */
-#ifndef DEFAULT_MAXSIZE
-#define DEFAULT_MAXSIZE (1000*1000)
-#endif
-
-/* file copy mode */
-#ifdef ENABLE_ZLIB
-#define COPY_UNCOMPRESSED 0
-#define COPY_FROM_CACHE 1
-#define COPY_TO_CACHE 2
-#endif
-
-enum stats {
-	STATS_NONE=0,
-	STATS_STDOUT,
-	STATS_STATUS,
-	STATS_ERROR,
-	STATS_TOCACHE,
-	STATS_PREPROCESSOR,
-	STATS_COMPILER,
-	STATS_MISSING,
-	STATS_CACHED,
-	STATS_ARGS,
-	STATS_LINK,
-	STATS_NUMFILES,
-	STATS_TOTALSIZE,
-	STATS_MAXFILES,
-	STATS_MAXSIZE,
-	STATS_NOTC,
-	STATS_DEVICE,
-	STATS_NOINPUT,
-	STATS_ENVIRONMMENT,
-	STATS_MULTIPLE,
-	STATS_CONFTEST,
-	STATS_UNSUPPORTED,
-	STATS_OUTSTDOUT,
-
-	STATS_END
-};
-
-typedef unsigned uint32;
-
-#include "mdfour.h"
-
-void hash_start(void);
-void hash_string(const char *s);
-void hash_int(int x);
-void hash_file(const char *fname);
-char *hash_result(void);
-void hash_buffer(const char *s, int len);
-
-void cc_log(const char *format, ...);
-void fatal(const char *msg);
-
-void copy_fd(int fd_in, int fd_out);
-int safe_rename(const char* oldpath, const char* newpath);
-int move_file(const char *src, const char *dest);
-int test_if_compressed(const char *filename);
-
-int commit_to_cache(const char *src, const char *dest, int hardlink);
-int retrieve_from_cache(const char *src, const char *dest, int hardlink);
-
-int create_dir(const char *dir);
-int create_cachedirtag(const char *dir);
-void x_asprintf(char **ptr, const char *format, ...);
-char *x_strdup(const char *s);
-void *x_realloc(void *ptr, size_t size);
-void *x_malloc(size_t size);
-void traverse(const char *dir, void (*fn)(const char *, struct stat *));
-char *str_basename(const char *s);
-char *dirname(char *s);
-int lock_fd(int fd);
-size_t file_size(struct stat *st);
-int safe_open(const char *fname);
-char *x_realpath(const char *path);
-char *gnu_getcwd(void);
-int create_empty_file(const char *fname);
-const char *get_home_directory(void);
-int x_utimes(const char *filename);
-#ifdef _WIN32
-void perror_win32(LPTSTR pszFunction);
-#endif
-
-void stats_update(enum stats stat);
-void stats_zero(void);
-void stats_summary(void);
-void stats_tocache(size_t size, size_t numfiles);
-void stats_read(const char *stats_file, unsigned counters[STATS_END]);
-int stats_set_limits(long maxfiles, long maxsize);
-size_t value_units(const char *s);
-void display_size(unsigned v);
-void stats_set_sizes(const char *dir, size_t num_files, size_t total_size);
-
-int unify_hash(const char *fname);
-
-#ifndef HAVE_VASPRINTF
-int vasprintf(char **, const char *, va_list );
-#endif
-#ifndef HAVE_ASPRINTF
-int asprintf(char **ptr, const char *format, ...);
-#endif
-
-#ifndef HAVE_SNPRINTF
-int snprintf(char *,size_t ,const char *, ...);
-#endif
-
-void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize, size_t minfiles);
-void cleanup_all(const char *dir);
-void wipe_all(const char *dir);
-
-#ifdef _WIN32
-char *argvtos(char **argv);
-#endif
-int execute(char **argv, 
-	    const char *path_stdout,
-	    const char *path_stderr);
-char *find_executable(const char *name, const char *exclude_name);
-void display_execute_args(char **argv);
-
-typedef struct {
-	char **argv;
-	int argc;
-} ARGS;
-
-
-ARGS *args_init(int , char **);
-void args_add(ARGS *args, const char *s);
-void args_add_prefix(ARGS *args, const char *s);
-void args_pop(ARGS *args, int n);
-void args_strip(ARGS *args, const char *prefix);
-void args_remove_first(ARGS *args);
-
-extern int ccache_verbose;
-
-#if HAVE_COMPAR_FN_T
-#define COMPAR_FN_T __compar_fn_t
-#else
-typedef int (*COMPAR_FN_T)(const void *, const void *);
-#endif
-
-/* work with silly DOS binary open */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-/* mkstemp() on some versions of cygwin don't handle binary files, so
-   override */
-/* Seems okay in Cygwin 1.7.0
-#ifdef __CYGWIN__
-#undef HAVE_MKSTEMP
-#endif
-*/
diff --git a/dependencies2013/win32/swig/CCache/ccache.yo b/dependencies2013/win32/swig/CCache/ccache.yo
deleted file mode 100644
index 2477662d..00000000
--- a/dependencies2013/win32/swig/CCache/ccache.yo
+++ /dev/null
@@ -1,422 +0,0 @@
-whenman(
-COMMENT(html output not great if included when using html2doc)
-manpage(ccache-swig)(1)()()()
-)
-
-whenhtml(htmlcommand(
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>ccache-swig(1) manpage</title>
-<link rel="stylesheet" type="text/css" href="style.css">
-</head>
-
-<body bgcolor="#ffffff">
-<H1><a name="CCache"></a>Using SWIG with ccache - ccache-swig(1) manpage</H1>
-<!-- INDEX -->
-<div class="sectiontoc">
-<!-- INDEX -->
-
-))
-
-
-manpagename(ccache-swig)(a fast compiler cache)
-
-whenhtml(htmlcommand(
-ccache-swig - a fast compiler cache
-))
-
-manpagesynopsis()
-
-ccache-swig [OPTION]
-
-ccache-swig <compiler> [COMPILER OPTIONS]
-
-<compiler> [COMPILER OPTIONS]
-
-manpagedescription()
-
-ccache-swig is a compiler cache. It speeds up re-compilation of C/C++/SWIG code 
-by caching previous compiles and detecting when the same compile is
-being done again. ccache-swig is ccache plus support for SWIG. ccache
-and ccache-swig are used interchangeably in this document.
-
-manpagesection(OPTIONS SUMMARY)
-
-Here is a summary of the options to ccache-swig.
-
-verb(
--s                      show statistics summary
--z                      zero statistics
--c                      run a cache cleanup
--C                      clear the cache completely
--F <n>                  set maximum files in cache
--M <n>                  set maximum size of cache (use G, M or K)
--h                      this help page
--V                      print version number
-)
-
-manpageoptions()
-
-These options only apply when you invoke ccache as "ccache-swig". When
-invoked as a compiler none of these options apply. In that case your
-normal compiler options apply and you should refer to your compilers
-documentation.
-
-startdit()
-dit(bf(-h)) Print a options summary page
-
-dit(bf(-s)) Print the current statistics summary for the cache. The
-statistics are stored spread across the subdirectories of the
-cache. Using "ccache-swig -s" adds up the statistics across all
-subdirectories and prints the totals.
-
-dit(bf(-z)) Zero the cache statistics. 
-
-dit(bf(-V)) Print the ccache version number
-
-dit(bf(-c)) Clean the cache and re-calculate the cache file count and
-size totals. Normally the -c option should not be necessary as ccache
-keeps the cache below the specified limits at runtime and keeps
-statistics up to date on each compile. This option is mostly useful
-if you manually modify the cache contents or believe that the cache
-size statistics may be inaccurate.
-
-dit(bf(-C)) Clear the entire cache, removing all cached files.
-
-dit(bf(-F <maxfiles>)) This sets the maximum number of files allowed in
-the cache. The value is stored inside the cache directory and applies
-to all future compiles. Due to the way the value is stored the actual
-value used is always rounded down to the nearest multiple of 16.
-
-dit(bf(-M <maxsize>)) This sets the maximum cache size. You can specify
-a value in gigabytes, megabytes or kilobytes by appending a G, M or K
-to the value. The default is gigabytes. The actual value stored is
-rounded down to the nearest multiple of 16 kilobytes.
-
-enddit()
-
-manpagesection(INSTALLATION)
-
-There are two ways to use ccache. You can either prefix your compile
-commands with "ccache-swig" or you can create a symbolic link between
-ccache-swig and the names of your compilers. The first method is most
-convenient if you just want to try out ccache or wish to use it for
-some specific projects. The second method is most useful for when you
-wish to use ccache for all your compiles.
-
-To install for usage by the first method just copy ccache-swig to somewhere
-in your path. 
-
-To install for the second method do something like this:
-verb(
-  cp ccache-swig /usr/local/bin/
-  ln -s /usr/local/bin/ccache-swig /usr/local/bin/gcc
-  ln -s /usr/local/bin/ccache-swig /usr/local/bin/g++
-  ln -s /usr/local/bin/ccache-swig /usr/local/bin/cc
-  ln -s /usr/local/bin/ccache-swig /usr/local/bin/swig
-)
-This will work as long as /usr/local/bin comes before the path to gcc
-(which is usually in /usr/bin). After installing you may wish to run
-"which gcc" to make sure that the correct link is being used.
-
-Note! Do not use a hard link, use a symbolic link. A hardlink will
-cause "interesting" problems.
-
-manpagesection(EXTRA OPTIONS)
-
-When run as a compiler front end ccache usually just takes the same
-command line options as the compiler you are using. The only exception
-to this is the option '--ccache-skip'. That option can be used to tell
-ccache that the next option is definitely not a input filename, and
-should be passed along to the compiler as-is. 
-
-The reason this can be important is that ccache does need to parse the
-command line and determine what is an input filename and what is a
-compiler option, as it needs the input filename to determine the name
-of the resulting object file (among other things). The heuristic
-ccache uses in this parse is that any string on the command line that
-exists as a file is treated as an input file name (usually a C
-file). By using --ccache-skip you can force an option to not be
-treated as an input file name and instead be passed along to the
-compiler as a command line option.
-
-manpagesection(ENVIRONMENT VARIABLES)
-
-ccache uses a number of environment variables to control operation. In
-most cases you won't need any of these as the defaults will be fine.
-
-startdit()
-
-dit(bf(CCACHE_DIR)) the CCACHE_DIR environment variable specifies
-where ccache will keep its cached compiler output. The default is
-"$HOME/.ccache".
-
-dit(bf(CCACHE_TEMPDIR)) the CCACHE_TEMPDIR environment variable specifies
-where ccache will put temporary files. The default is the same as
-CCACHE_DIR. Note that the CCACHE_TEMPDIR path must be on the same
-filesystem as the CCACHE_DIR path, so that renames of files between
-the two directories can work.
-
-dit(bf(CCACHE_LOGFILE)) If you set the CCACHE_LOGFILE environment
-variable then ccache will write some log information on cache hits
-and misses in that file. This is useful for tracking down problems.
-
-dit(bf(CCACHE_VERBOSE)) If you set the CCACHE_VERBOSE environment
-variable then ccache will display on stdout all the compiler invocations
-that it makes. This can useful for debugging unexpected problems.
-
-dit(bf(CCACHE_PATH)) You can optionally set CCACHE_PATH to a colon
-separated path where ccache will look for the real compilers. If you
-don't do this then ccache will look for the first executable matching
-the compiler name in the normal PATH that isn't a symbolic link to
-ccache itself.
-
-dit(bf(CCACHE_CC)) You can optionally set CCACHE_CC to force the name
-of the compiler to use. If you don't do this then ccache works it out
-from the command line.
-
-dit(bf(CCACHE_PREFIX)) This option adds a prefix to the command line
-that ccache runs when invoking the compiler. Also see the section
-below on using ccache with distcc.
-
-dit(bf(CCACHE_DISABLE)) If you set the environment variable
-CCACHE_DISABLE then ccache will just call the real compiler,
-bypassing the cache completely.
-
-dit(bf(CCACHE_READONLY)) the CCACHE_READONLY environment variable
-tells ccache to attempt to use existing cached object files, but not
-to try to add anything new to the cache. If you are using this because
-your CCACHE_DIR is read-only, then you may find that you also need to
-set CCACHE_TEMPDIR as otherwise ccache will fail to create the
-temporary files.
-
-dit(bf(CCACHE_CPP2)) If you set the environment variable CCACHE_CPP2
-then ccache will not use the optimisation of avoiding the 2nd call to
-the pre-processor by compiling the pre-processed output that was used
-for finding the hash in the case of a cache miss. This is primarily a
-debugging option, although it is possible that some unusual compilers
-will have problems with the intermediate filename extensions used in
-this optimisation, in which case this option could allow ccache to be
-used.
-
-dit(bf(CCACHE_NOCOMPRESS)) If you set the environment variable
-CCACHE_NOCOMPRESS then there is no compression used on files that go
-into the cache. However, this setting has no effect on how files are
-retrieved from the cache, compressed results will still be usable.
-
-dit(bf(CCACHE_NOSTATS)) If you set the environment variable
-CCACHE_NOSTATS then ccache will not update the statistics files on
-each compile.
-
-dit(bf(CCACHE_NLEVELS)) The environment variable CCACHE_NLEVELS allows
-you to choose the number of levels of hash in the cache directory. The
-default is 2. The minimum is 1 and the maximum is 8. 
-
-dit(bf(CCACHE_HARDLINK)) If you set the environment variable
-CCACHE_HARDLINK then ccache will attempt to use hard links from the
-cache directory when creating the compiler output rather than using a
-file copy. Using hard links is faster, but can confuse programs like
-'make' that rely on modification times. Hard links are never made for
-compressed cache files.
-
-dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached
-results, even if it finds them. New results are still cached, but
-existing cache entries are ignored.
-
-dit(bf(CCACHE_UMASK)) This sets the umask for ccache and all child
-processes (such as the compiler). This is mostly useful when you wish
-to share your cache with other users. Note that this also affects the
-file permissions set on the object files created from your
-compilations.
-
-dit(bf(CCACHE_HASHDIR)) This tells ccache to hash the current working
-directory when calculating the hash that is used to distinguish two
-compiles. This prevents a problem with the storage of the current
-working directory in the debug info of a object file, which can lead
-ccache to give a cached object file that has the working directory in
-the debug info set incorrectly. This option is off by default as the
-incorrect setting of this debug info rarely causes problems. If you
-strike problems with gdb not using the correct directory then enable
-this option.
-
-dit(bf(CCACHE_UNIFY)) If you set the environment variable CCACHE_UNIFY
-then ccache will use the C/C++ unifier when hashing the pre-processor
-output if -g is not used in the compile. The unifier is slower than a
-normal hash, so setting this environment variable loses a little bit
-of speed, but it means that ccache can take advantage of not
-recompiling when the changes to the source code consist of
-reformatting only. Note that using CCACHE_UNIFY changes the hash, so
-cached compiles with CCACHE_UNIFY set cannot be used when
-CCACHE_UNIFY is not set and vice versa. The reason the unifier is off
-by default is that it can give incorrect line number information in
-compiler warning messages.
-
-dit(bf(CCACHE_EXTENSION)) Normally ccache tries to automatically
-determine the extension to use for intermediate C pre-processor files
-based on the type of file being compiled. Unfortunately this sometimes
-doesn't work, for example when using the aCC compiler on HP-UX. On
-systems like this you can use the CCACHE_EXTENSION option to override
-the default. On HP-UX set this environment variable to "i" if you use
-the aCC compiler.
-
-dit(bf(CCACHE_STRIPC)) If you set the environment variable 
-CCACHE_STRIPC then ccache will strip the -c option when invoking
-the preprocessor. This option is primarily for the Sun Workshop
-C++ compiler as without this option an unwarranted warning is displayed:
-CC: Warning: "-E" redefines product from "object" to "source (stdout)"
-when -E and -c is used together.
-
-dit(bf(CCACHE_SWIG)) When using SWIG as the compiler and it does not
-have 'swig' in the executable name, then the CCACHE_SWIG environment 
-variable needs to be set in order for ccache to work correctly with 
-SWIG. The use of CCACHE_CPP2 is also recommended for SWIG due to some
-preprocessor quirks, however, use of CCACHE_CPP2 can often be skipped
--- check your generated code with and without this option set. Known
-problems are using preprocessor directives within %inline blocks and
-the use of '#pragma SWIG'.
-
-enddit()
-
-manpagesection(CACHE SIZE MANAGEMENT)
-
-By default ccache has a one gigabyte limit on the cache size and no
-maximum number of files. You can set a different limit using the
-"ccache -M" and "ccache -F" options, which set the size and number of
-files limits.
-
-When these limits are reached ccache will reduce the cache to 20%
-below the numbers you specified in order to avoid doing the cache
-clean operation too often.
-
-manpagesection(CACHE COMPRESSION)
-
-By default on most platforms ccache will compress all files it puts 
-into the cache
-using the zlib compression. While this involves a negligible
-performance slowdown, it significantly increases the number of files
-that fit in the cache. You can turn off compression setting the
-CCACHE_NOCOMPRESS environment variable.
-
-manpagesection(HOW IT WORKS)
-
-The basic idea is to detect when you are compiling exactly the same
-code a 2nd time and use the previously compiled output. You detect
-that it is the same code by forming a hash of:
-
-itemization(
-  it() the pre-processor output from running the compiler with -E
-  it() the command line options
-  it() the real compilers size and modification time
-  it() any stderr output generated by the compiler
-)
-
-These are hashed using md4 (a strong hash) and a cache file is formed
-based on that hash result. When the same compilation is done a second
-time ccache is able to supply the correct compiler output (including
-all warnings etc) from the cache.
-
-ccache has been carefully written to always produce exactly the same
-compiler output that you would get without the cache. If you ever
-discover a case where ccache changes the output of your compiler then
-please let me know.
-
-manpagesection(USING CCACHE WITH DISTCC)
-
-distcc is a very useful program for distributing compilation across a
-range of compiler servers. It is often useful to combine distcc with
-ccache, so that compiles that are done are sped up by distcc, but that
-ccache avoids the compile completely where possible.
-
-To use distcc with ccache I recommend using the CCACHE_PREFIX
-option. You just need to set the environment variable CCACHE_PREFIX to
-'distcc' and ccache will prefix the command line used with the
-compiler with the command 'distcc'. 
-
-manpagesection(SHARING A CACHE)
-
-A group of developers can increase the cache hit rate by sharing a
-cache directory.  The hard links however cause unwanted side effects,
-as all links to a cached file share the file's modification timestamp.
-This results in false dependencies to be triggered by timestamp-based
-build systems whenever another user links to an existing
-file. Typically, users will see that their libraries and binaries are
-relinked without reason.  To share a cache without side effects, the
-following conditions need to be met:
-
-itemization(
-  it() Use the same bf(CCACHE_DIR) environment variable setting
-  it() Unset the bf(CCACHE_HARDLINK) environment variable
-  it() Make sure everyone sets the CCACHE_UMASK environment variable
-  to 002, this ensures that cached files are accessible to everyone in
-  the group.
-  it() Make sure that all users have write permission in the entire
-  cache directory (and that you trust all users of the shared cache). 
-  it() Make sure that the setgid bit is set on all directories in the
-  cache. This tells the filesystem to inherit group ownership for new
-  directories. The command "chmod g+s `find $CCACHE_DIR -type d`" might
-  be useful for this.
-  it() Set bf(CCACHE_NOCOMPRESS) for all users, if there are users with
-  versions of ccache that do not support compression.
-)
-
-manpagesection(HISTORY)
-
-ccache was inspired by the compilercache shell script script written
-by Erik Thiele and I would like to thank him for an excellent piece of
-work. See 
-url(http://www.erikyyy.de/compilercache/)(http://www.erikyyy.de/compilercache/)
-for the Erik's scripts.
-ccache-swig is a port of the original ccache with support added for use
-with SWIG.
-
-I wrote ccache because I wanted to get a bit more speed out of a
-compiler cache and I wanted to remove some of the limitations of the
-shell-script version.
-
-manpagesection(DIFFERENCES FROM COMPILERCACHE)
-
-The biggest differences between Erik's compilercache script and ccache
-are:
-itemization(
-it() ccache is written in C, which makes it a bit faster (calling out to
-  external programs is mostly what slowed down the scripts).
-it() ccache can automatically find the real compiler
-it() ccache keeps statistics on hits/misses
-it() ccache can do automatic cache management
-it() ccache can cache compiler output that includes warnings. In many
-  cases this gives ccache a much higher cache hit rate.
-it() ccache can handle a much wider ranger of compiler options
-it() ccache avoids a double call to cpp on a cache miss
-)
-
-manpagesection(CREDITS)
-
-Thanks to the following people for their contributions to ccache
-itemization(
- it() Erik Thiele for the original compilercache script
- it() Luciano Rocha for the idea of compiling the pre-processor output
- to avoid a 2nd cpp pass
- it() Paul Russell for many suggestions and the debian packaging
-)
-
-manpageauthor()
-
-ccache was written by Andrew Tridgell
-url(http://samba.org/~tridge/)(http://samba.org/~tridge/).
-ccache was adapted to create ccache-swig for use with SWIG by William Fulton.
-
-If you wish to report a problem or make a suggestion then please email
-the SWIG developers on the swig-devel mailing list, see
-url(http://www.swig.org/mail.html)(http://www.swig.org/mail.html)
-
-ccache is released under the GNU General Public License version 2 or
-later. Please see the file COPYING for license details.
-
-whenhtml(htmlcommand(
-
-</body>
-</html>
-
-))
diff --git a/dependencies2013/win32/swig/CCache/ccache_swig_config.h.in b/dependencies2013/win32/swig/CCache/ccache_swig_config.h.in
deleted file mode 100644
index bbb205f7..00000000
--- a/dependencies2013/win32/swig/CCache/ccache_swig_config.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#define SWIG_VERSION "@PACKAGE_VERSION@"
diff --git a/dependencies2013/win32/swig/CCache/cleanup.c b/dependencies2013/win32/swig/CCache/cleanup.c
deleted file mode 100644
index f54ee54d..00000000
--- a/dependencies2013/win32/swig/CCache/cleanup.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-  functions to cleanup the cache directory when it gets too large 
- */
-
-#include "ccache.h"
-
-static struct files {
-	char *fname;
-	time_t mtime;
-	size_t size;
-} **files;
-static unsigned allocated;
-static unsigned num_files;
-static size_t total_size;
-static size_t total_files;
-static size_t size_threshold;
-static size_t files_threshold;
-
-/* file comparison function to try to delete the oldest files first */
-static int files_compare(struct files **f1, struct files **f2)
-{
-	if ((*f2)->mtime == (*f1)->mtime) {
-		return strcmp((*f2)->fname, (*f1)->fname);
-	}
-	if ((*f2)->mtime > (*f1)->mtime) {
-		return -1;
-	}
-	return 1;
-}
-
-/* this builds the list of files in the cache */
-static void traverse_fn(const char *fname, struct stat *st)
-{
-	char *p;
-
-	if (!S_ISREG(st->st_mode)) return;
-
-	p = str_basename(fname);
-	if (strcmp(p, "stats") == 0) {
-		free(p);
-		return;
-	}
-	free(p);
-
-	if (num_files == allocated) {
-		allocated = 10000 + num_files*2;
-		files = (struct files **)x_realloc(files, 
-						   sizeof(struct files *)*allocated);
-	}
-
-	files[num_files] = (struct files *)x_malloc(sizeof(struct files));
-	files[num_files]->fname = x_strdup(fname);
-	files[num_files]->mtime = st->st_mtime;
-	files[num_files]->size = file_size(st) / 1024;
-	total_size += files[num_files]->size;
-	num_files++;
-}
-
-/* sort the files we've found and delete the oldest ones until we are
-   below the thresholds */
-static void sort_and_clean(size_t minfiles)
-{
-	unsigned i;
-	size_t adjusted_minfiles = minfiles;
-
-	if (num_files > 1) {
-		/* sort in ascending data order */
-		qsort(files, num_files, sizeof(struct files *), 
-		      (COMPAR_FN_T)files_compare);
-	}
-	/* ensure newly cached files (minfiles) are kept - instead of matching
-	   the filenames of those newly cached, a faster and simpler approach
-	   assumes these are the most recent in the cache and if any other
-	   cached files have an identical time stamp, they will also be kept -
-	   this approach would not be needed if the cleanup was done at exit. */
-	if (minfiles != 0 && minfiles < num_files) {
-		unsigned minfiles_index = num_files - minfiles;
-		time_t minfiles_time = files[minfiles_index]->mtime;
-		for (i=1; i<=minfiles_index; i++) {
-			if (files[minfiles_index-i]->mtime == minfiles_time)
-				adjusted_minfiles++;
-			else
-				break;
-		}
-	}
-	
-	/* delete enough files to bring us below the threshold */
-	for (i=0;i<num_files; i++) {
-		if ((size_threshold==0 || total_size < size_threshold) &&
-		    (files_threshold==0 || (num_files-i) < files_threshold)) break;
-
-		if (adjusted_minfiles != 0 && num_files-i <= adjusted_minfiles)
-			break;
-
-		if (unlink(files[i]->fname) != 0 && errno != ENOENT) {
-			fprintf(stderr, "unlink %s - %s\n", 
-				files[i]->fname, strerror(errno));
-			continue;
-		}
-		
-		total_size -= files[i]->size;
-	}	
-
-	total_files = num_files - i;
-}
-
-/* cleanup in one cache subdir */
-void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize, size_t minfiles)
-{
-	unsigned i;
-
-	size_threshold = maxsize * LIMIT_MULTIPLE;
-	files_threshold = maxfiles * LIMIT_MULTIPLE;
-
-	num_files = 0;
-	total_size = 0;
-
-	/* build a list of files */
-	traverse(dir, traverse_fn);
-
-	/* clean the cache */
-	sort_and_clean(minfiles);
-
-	stats_set_sizes(dir, total_files, total_size);
-
-	/* free it up */
-	for (i=0;i<num_files;i++) {
-		free(files[i]->fname);
-		free(files[i]);
-		files[i] = NULL;
-	}
-	if (files) free(files);
-	allocated = 0;
-	files = NULL;
-
-	num_files = 0;
-	total_size = 0;
-}
-
-/* cleanup in all cache subdirs */
-void cleanup_all(const char *dir)
-{
-	unsigned counters[STATS_END];
-	char *dname, *sfile;
-	int i;
-	
-	for (i=0;i<=0xF;i++) {
-		x_asprintf(&dname, "%s/%1x", dir, i);
-		x_asprintf(&sfile, "%s/%1x/stats", dir, i);
-
-		memset(counters, 0, sizeof(counters));
-		stats_read(sfile, counters);
-
-		cleanup_dir(dname, 
-			    counters[STATS_MAXFILES], 
-			    counters[STATS_MAXSIZE],
-			    0);
-		free(dname);
-		free(sfile);
-	}
-}
-
-
-/* traverse function for wiping files */
-static void wipe_fn(const char *fname, struct stat *st)
-{
-	char *p;
-
-	if (!S_ISREG(st->st_mode)) return;
-
-	p = str_basename(fname);
-	if (strcmp(p, "stats") == 0) {
-		free(p);
-		return;
-	}
-	free(p);
-
-	unlink(fname);
-}
-
-
-/* wipe all cached files in all subdirs */
-void wipe_all(const char *dir)
-{
-	char *dname;
-	int i;
-	
-	for (i=0;i<=0xF;i++) {
-		x_asprintf(&dname, "%s/%1x", dir, i);
-		traverse(dir, wipe_fn);
-		free(dname);
-	}
-
-	/* and fix the counters */
-	cleanup_all(dir);
-}
diff --git a/dependencies2013/win32/swig/CCache/config.h.in b/dependencies2013/win32/swig/CCache/config.h.in
deleted file mode 100644
index 0a288fec..00000000
--- a/dependencies2013/win32/swig/CCache/config.h.in
+++ /dev/null
@@ -1,118 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you would like to have zlib compression for ccache. */
-#undef ENABLE_ZLIB
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* */
-#undef HAVE_C99_VSNPRINTF
-
-/* */
-#undef HAVE_COMPAR_FN_T
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define to 1 if you have the `getpwuid' function. */
-#undef HAVE_GETPWUID
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
-
-/* Define to 1 if you have the `realpath' function. */
-#undef HAVE_REALPATH
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* 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. */
-#undef HAVE_STDLIB_H
-
-/* 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. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* 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. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `utimes' function. */
-#undef HAVE_UTIMES
-
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define _GNU_SOURCE so that we get all necessary prototypes */
-#undef _GNU_SOURCE
diff --git a/dependencies2013/win32/swig/CCache/configure.ac b/dependencies2013/win32/swig/CCache/configure.ac
deleted file mode 100644
index dfbf86db..00000000
--- a/dependencies2013/win32/swig/CCache/configure.ac
+++ /dev/null
@@ -1,87 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([ccache-swig], [0.0]) # Get version from SWIG in ccache_swig_config.h.in
-AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR([ccache.h])
-
-AC_MSG_NOTICE([Configuring ccache])
-
-AC_CONFIG_HEADER(config.h)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_ARG_PROGRAM # for program_transform_name
-
-AC_DEFINE([_GNU_SOURCE], 1,
-          [Define _GNU_SOURCE so that we get all necessary prototypes])
-
-# If GCC, turn on warnings.
-if test "x$GCC" = "xyes"
-then
-	CFLAGS="$CFLAGS -Wall -W"
-else
-	CFLAGS="$CFLAGS -O"
-fi
-
-AC_HEADER_DIRENT
-AC_HEADER_TIME
-AC_HEADER_SYS_WAIT
-
-AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h)
-
-AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp)
-AC_CHECK_FUNCS(gethostname getpwuid)
-AC_CHECK_FUNCS(utimes)
-
-AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
-    AC_TRY_COMPILE(
-[#include <stdlib.h>],
-[
-void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
-],
-	ccache_cv_COMPAR_FN_T=yes,ccache_cv_COMPAR_FN_T=no)])
-if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then
-   AC_DEFINE(HAVE_COMPAR_FN_T, 1, [ ])
-fi
-
-dnl Note: This could be replaced by AC_FUNC_SNPRINTF() in the autoconf macro archive
-AC_CACHE_CHECK([for C99 vsnprintf],ccache_cv_HAVE_C99_VSNPRINTF,[
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <stdarg.h>
-void foo(const char *format, ...) { 
-       va_list ap;
-       int len;
-       char buf[5];
-
-       va_start(ap, format);
-       len = vsnprintf(0, 0, format, ap);
-       va_end(ap);
-       if (len != 5) exit(1);
-
-       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1);
-
-       exit(0);
-}
-main() { foo("hello"); }
-],
-ccache_cv_HAVE_C99_VSNPRINTF=yes,ccache_cv_HAVE_C99_VSNPRINTF=no,ccache_cv_HAVE_C99_VSNPRINTF=cross)])
-if test x"$ccache_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-    AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ])
-fi
-
-dnl Check for zlib.
-dnl Note: This could be replaced by CHECK_ZLIB() in the autoconf macro archive
-AC_ARG_ENABLE([zlib],
-              AS_HELP_STRING([--enable-zlib], [enable zlib support for ccache compression]),,
-              [enable_zlib=yes])
-
-if test x"$enable_zlib" = x"yes"; then
-    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzdopen, [LIBS="-lz $LIBS"
-						      AC_DEFINE([ENABLE_ZLIB], 1, [Define to 1 if you would like to have zlib compression for ccache.]) ] ))
-fi
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/dependencies2013/win32/swig/CCache/debian/NEWS b/dependencies2013/win32/swig/CCache/debian/NEWS
deleted file mode 100644
index be245dc7..00000000
--- a/dependencies2013/win32/swig/CCache/debian/NEWS
+++ /dev/null
@@ -1,22 +0,0 @@
-ccache (2.4-8) unstable; urgency=high
-
-  zlib compression is now enabled by default in order to increase the amount
-  of object files that can fit in the cache.
-
-  The impact on performance is supposed to be almost negligible
-  (see http://www.gustaebel.de/lars/ccache/). If you do want to disable
-  it however, simply export the CCACHE_NOCOMPRESS environment variable.
-
-  Note that a zlib-enabled ccache will still read your existing
-  uncompressed cache.  If you want to compress/uncompress your cache,
-  see the manage-cache.sh script under /usr/share/doc/ccache/examples/.
-
- -- Francois Marier <francois@debian.org>  Sun, 20 May 2007 19:45:07 +1200
-
-ccache (2.4-1) unstable; urgency=low
-
-  * This release changes the hash input slighly, so you will probably find 
-    that you will not get any hits against your existing cache when you 
-    upgrade.
-
- -- Francois Marier <francois@debian.org>  Sat, 11 Jun 2005 13:54:33 -0400
diff --git a/dependencies2013/win32/swig/CCache/debian/README.Debian b/dependencies2013/win32/swig/CCache/debian/README.Debian
deleted file mode 100644
index 5478bb72..00000000
--- a/dependencies2013/win32/swig/CCache/debian/README.Debian
+++ /dev/null
@@ -1,59 +0,0 @@
-Installing ccache
------------------
-
-The recommended way to use this with Debian is to either create "cc"
-and "gcc" symlinks to /usr/bin/ccache in your private bin directory
-(which must be before the real cc and gcc in your path), or use
-CC="ccache gcc" on the make command line.
-
-Another option is to just prepend /usr/lib/ccache in your PATH
-environment variable, like
-
-  export PATH="/usr/lib/ccache:$PATH"
-
-Note that ccache works with both native and cross compilers.
-
-Ignoring whitespace
--------------------
-
-If you wish to set up ccache so that it ignores blank lines, have a
-look at the CCACHE_UNIFY option.  However, please note that this
-option is off by default since the reported line numbers may not
-match the source files anymore.
-
-
-NFS Issues
-----------
-
-(from John Coiner <john.coiner@amd.com> on the ccache mailing list)
-
-When CCache creates a hardlinked output file, it calls utime() to update
-the timestamp on the object, so that Make realizes that the object has
-changed.
-
-On NFS, utime() has no coherency guarantee, AFAIK. When utime() runs on
-host A, and our parallel implementation of Make is running on host B,
-sometimes Make doesn't see the new timestamp soon enough -- and neglects
-to relink the final binary. That's a one-way ticket to Silent Mysterious
-Failure Town.
-
-Instead of relying on the object file timestamp, we create a dummy file
-with a reliable timestamp:
-
-objs/foo.o objs/foo.o.built :
-        if ( ccache gcc -o foo.o -c foo.c ) ; \
-        then touch objs/foo.o.built ; \
-        else exit 1; \
-        fi
-
-binary : objs/foo.o.built
-        gcc -o binary objs/foo.o
-
-NFS does make a coherency guarantee, that if a file is written and
-close()d on host A, and subsequently open()ed on host B, that the second
-open() will reflect all modifications and attributes from the close().
-Since Make does open() when checking timestamps, and the dummy file is
-close()d when it's created, the binary will always relink after the
-object is recompiled.
-
- -- Francois Marier <francois@debian.org>  Sun, 20 May 2007 17:35:36 +1200
diff --git a/dependencies2013/win32/swig/CCache/debian/changelog b/dependencies2013/win32/swig/CCache/debian/changelog
deleted file mode 100644
index 45500d4b..00000000
--- a/dependencies2013/win32/swig/CCache/debian/changelog
+++ /dev/null
@@ -1,221 +0,0 @@
-ccache (2.4-15) unstable; urgency=low
-
-  * Add a new patch which improve the consistency of timestamps on cached
-    objects to make sure clean-up is based on least recently used objects.
-  * Patch the set_limit call so that non-writable cache directories return
-    an error when attempting to size the max(files|size) (closes: #332527)
-
- -- Francois Marier <francois@debian.org>  Sun, 13 Apr 2008 15:07:05 +1200
-
-ccache (2.4-14) unstable; urgency=low
-
-  * Mention the long options everywhere in the manpage
-  * Merge Gentoo patches:
-    - respect user's LDFLAGS
-    - use utimes() for timestamp if possible
-
- -- Francois Marier <francois@debian.org>  Sun, 23 Mar 2008 16:30:11 +1300
-
-ccache (2.4-13) unstable; urgency=low
-
-  * Update CACHEDIR.TAG patch to avoid creating the tag file when the
-    CCACHE_READONLY environment variable is set. (closes: #464356)
-  * Mention the GNU-style long options in the manpage
-
- -- Francois Marier <francois@debian.org>  Thu, 07 Feb 2008 10:50:42 +1300
-
-ccache (2.4-12) unstable; urgency=low
-
-  * Add symlink for gcc 4.3 (closes: #463590)
-  * Add support for the CACHEDIR.TAG spec, thanks to Karl Chen.
-    (see http://www.brynosaurus.com/cachedir/)
-  * Fix hyphens in manpage (lintian notice)
-  * Bump Standards-Version up to 3.7.3 (no changes)
-  * Bump debhelper compatibility to 6
-
- -- Francois Marier <francois@debian.org>  Sat, 02 Feb 2008 10:37:22 +1300
-
-ccache (2.4-11) unstable; urgency=low
-
-  * Add the collab-maint repo to debian/control
-
- -- Francois Marier <francois@debian.org>  Tue, 20 Nov 2007 15:26:37 +1300
-
-ccache (2.4-10) unstable; urgency=low
-
-  * Document where the patches are from in debian/patches/CREDITS
-  * debian/rules:
-    - Fixed "make distclean" lintian warning
-    - Removed commented-out entries
-  * Set debhelper compatibility to 5
-  * Add homepage field in debian/control
-  * Add symlinks for MinGW (closes: #445782)
-  * Bump the version to 5 in the debhelper dependency
-
- -- Francois Marier <francois@debian.org>  Fri, 19 Oct 2007 16:04:37 +1300
-
-ccache (2.4-9) unstable; urgency=low
-
-  * Add a symlink for gcc 4.2 (closes: #431007)
-  * Fix dependencies when using -o (closes: #217713)
-
- -- Francois Marier <francois@debian.org>  Sat, 30 Jun 2007 17:58:44 +1200
-
-ccache (2.4-8) unstable; urgency=low
-
-  * Enable zlib compression of the cache by default (closes: #409848).
-    Thanks to Sami Liedes for suggesting this.
-  * Disable ccache when profiling (closes: #215849).
-    Thanks to Ted Percival for the Patch.
-  * Fix NFS renaming issues and add instructions to the README.
-    Thanks to John Coiner and instructions.
-  * Put all patches in debian/patches and apply them at build time.
-
- -- Francois Marier <francois@debian.org>  Sun, 20 May 2007 19:42:34 +1200
-
-ccache (2.4-7) unstable; urgency=low
-
-  * Use the real compiler when HOME is not set (closes: #396350)
-  * Include user script under doc/examples (closes: #392435)
-    Thanks to Behan Webster!
-  * Add support for GNU --long options (closes: #297126)
-
- -- Francois Marier <francois@debian.org>  Sat, 18 Nov 2006 00:50:59 -0500
-
-ccache (2.4-6) unstable; urgency=low
-
-  * Include symlinks for gcc 4.1 (closes: #372838)
-  * Update watch file
-
- -- Francois Marier <francois@debian.org>  Tue, 13 Jun 2006 22:17:37 -0400
-
-ccache (2.4-5) unstable; urgency=low
-
-  * Document the fact that cross-compiling is supported (closes: #349221)
-  * Bump Standards-Version up to 3.7.2 (no changes)
-
- -- Francois Marier <francois@debian.org>  Sun,  4 Jun 2006 01:20:07 -0400
-
-ccache (2.4-4) unstable; urgency=low
-
-  * Mention another way to use ccache in README.Debian (thanks to Benjamin
-    Drieu for the suggestion) (closes: #267632)
-  * Update FSF address
-  * Fix watch file
-
- -- Francois Marier <francois@debian.org>  Sat, 26 Nov 2005 00:15:13 -0500
-
-ccache (2.4-3) unstable; urgency=low
-
-  * Actually use the configuration flags in debian/rules
-  * Bump Standards-Version up to 3.6.2 (no changes)
-
- -- Francois Marier <francois@debian.org>  Sun, 26 Jun 2005 13:33:19 -0400
-
-ccache (2.4-2) unstable; urgency=low
-
-  * Add gcc and g++ symlinks to /usr/lib/ccache (closes: #313490)
-  * Remove invalid entry from Depends
-
- -- Francois Marier <francois@debian.org>  Wed, 15 Jun 2005 20:51:03 -0400
-
-ccache (2.4-1) unstable; urgency=low
-
-  * New maintainer (closes: #312867)
-  * New upstream version: (closes: #273753, #239640)
-    - New CCACHE_READONLY and CCACHE_TEMPDIR options
-    - Fixed handling of hard-linked compilers on AIX
-    - Fixed handling of HOME environment variable (closes: #299880)
-    - Show cache directory in stats output
-  * Fix copyright file
-  * Add 'distcc' to Suggests (closes: #269158)
-  * Add a note about whitespace in README.Debian (closes: #229116)
-  * Update rules to add symmlinks for gcc 3.4 & 4.0 (closes: #261177)
-  * Acknowledge NMUs (closes: #200185, #177129, #174417)
-
- -- Francois Marier <francois@debian.org>  Sun, 12 Jun 2005 12:05:34 -0400
-
-ccache (2.3-1.1) unstable; urgency=low
-
-  * Non-maintainer upload during BSP
-  * Re-apply patch for
-    #200185 ccache: Incorrect symlinks in /usr/lib/ccache
-    (Closes: #200185)
-
- -- Frank Lichtenheld <djpig@debian.org>  Fri, 19 Mar 2004 11:14:50 +0100
-
-ccache (2.3-1) unstable; urgency=low
-
-  * New upstream release: obsoletes existing caches.
-  * Tweak package description in arbitrary way (closes: #181721)
-
- -- Paul Russell <prussell@debian.org>  Mon, 29 Sep 2003 02:53:20 +0200
-
-ccache (2.2-2) unstable; urgency=low
-
-  * Insert more symlinks in ccache dir (closes: #197468)
-
- -- Paul Russell <prussell@debian.org>  Mon, 16 Jun 2003 10:52:50 +0100
-
-ccache (2.2-1) unstable; urgency=low
-
-  * New upstream release (closes: #150755)
-  * Insert more symlinks in ccache dir (closes: #144462)
-
- -- Paul Russell <prussell@debian.org>  Mon, 17 Feb 2003 07:19:36 +0100
-
-ccache (2.1.1-2) unstable; urgency=low
-
-  * Restored /usr/lib/ccache symlinks (closes: #179393)
-  * Fixed manpage typo (closes: #179564)
-  * With thanks to Andreas Rottmann.
-
- -- Paul Russell <prussell@debian.org>  Wed,  5 Feb 2003 10:01:10 +0100
-
-ccache (2.1.1-1) unstable; urgency=low
-
-  * NMU (with maintainer consent).
-  * New upstream release (closes: #174417, #177129).
-  * debian/control:
-    + Build-Depend on and use dephelper 4 (DH_COMPAT = 4).
-    + Bumped Standards-Version to 3.5.8.
-    + No full stop on short package description (fixes linda warning).
-  * debian/copright:
-    + Make lintian feel comfortable; fixes warnings:
-      - copyright-should-refer-to-common-license-file-for-gpl
-      - copyright-lists-upstream-authors-with-dh_make-boilerplate
-  * Built with g++ 3.2 :-).
-  
- -- Andreas Rottmann <rotty@debian.org>  Thu, 16 Jan 2003 11:42:38 +0100
-
-ccache (1.9-1) unstable; urgency=low
-
-  * New upstream release (closes: #144920)
-
- -- Paul Russell <prussell@debian.org>  Mon, 13 May 2002 10:01:09 +0200
-
-ccache (1.8-1) unstable; urgency=low
-
-  * New upstream release (closes: #145401)
-
- -- Paul Russell <prussell@debian.org>  Fri,  3 May 2002 02:26:32 +0200
-
-ccache (1.7-1) unstable; urgency=low
-
-  * New upstream release
-  * Install symlinks in /usr/lib/ccache (closes: #141337)
-
- -- Paul Russell <prussell@debian.org>  Wed, 10 Apr 2002 17:51:21 +0200
-
-ccache (1.4-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Paul Russell <prussell@debian.org>  Wed,  3 Apr 2002 03:41:46 +0200
-
-ccache (1.2-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Paul Russell <prussell@debian.org>  Sun, 31 Mar 2002 14:08:57 +0200
-
diff --git a/dependencies2013/win32/swig/CCache/debian/compat b/dependencies2013/win32/swig/CCache/debian/compat
deleted file mode 100644
index 1e8b3149..00000000
--- a/dependencies2013/win32/swig/CCache/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/dependencies2013/win32/swig/CCache/debian/control b/dependencies2013/win32/swig/CCache/debian/control
deleted file mode 100644
index 0b7e5728..00000000
--- a/dependencies2013/win32/swig/CCache/debian/control
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: ccache
-Section: devel
-Priority: optional
-Maintainer: Francois Marier <francois@debian.org>
-Build-Depends: debhelper (>> 6), autotools-dev, zlib1g-dev
-Standards-Version: 3.7.3
-Homepage: http://ccache.samba.org
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/ccache/
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/ccache/
-
-Package: ccache
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: distcc
-Description: Compiler results cacher, for fast recompiles
- ccache is a compiler cache. It speeds up re-compilation of C/C++ code 
- by caching previous compiles and detecting when the same compile is
- being done again.
- .
- This is similar to, but faster than, the compilercache package.
diff --git a/dependencies2013/win32/swig/CCache/debian/copyright b/dependencies2013/win32/swig/CCache/debian/copyright
deleted file mode 100644
index 7ac791dc..00000000
--- a/dependencies2013/win32/swig/CCache/debian/copyright
+++ /dev/null
@@ -1,29 +0,0 @@
-This package was debianized by Paul Russell <prussell@debian.org> on
-Sun, 31 Mar 2002 14:08:57 +0200.
-
-It was downloaded from http://ccache.samba.org/ftp/ccache/
-
-The ccache-zlib patch was downloaded from http://www.gustaebel.de/lars/ccache/
-
-Upstream Author: Andrew Tridgell <tridge@samba.org>
-
-Copyright: 2002-2005 Andrew Tridgell <tridge@samba.org>
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program 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 General Public License for more details.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA
-
-You are free to distribute this software under the terms of the GNU General
-Public License. On Debian systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL file.
diff --git a/dependencies2013/win32/swig/CCache/debian/dirs b/dependencies2013/win32/swig/CCache/debian/dirs
deleted file mode 100644
index 8ceb4c4e..00000000
--- a/dependencies2013/win32/swig/CCache/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/ccache
-usr/share/man/man1
diff --git a/dependencies2013/win32/swig/CCache/debian/docs b/dependencies2013/win32/swig/CCache/debian/docs
deleted file mode 100644
index e845566c..00000000
--- a/dependencies2013/win32/swig/CCache/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/dependencies2013/win32/swig/CCache/debian/examples b/dependencies2013/win32/swig/CCache/debian/examples
deleted file mode 100644
index fc549228..00000000
--- a/dependencies2013/win32/swig/CCache/debian/examples
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/update-ccache
-manage-cache.sh
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/01_no_home.diff b/dependencies2013/win32/swig/CCache/debian/patches/01_no_home.diff
deleted file mode 100644
index 019634c0..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/01_no_home.diff
+++ /dev/null
@@ -1,100 +0,0 @@
---- ccache.c
-+++ ccache.c
-@@ -836,6 +836,13 @@
- {
- 	/* find the real compiler */
- 	find_compiler(argc, argv);
-+
-+	/* use the real compiler if HOME is not set */
-+	if (!cache_dir) {
-+		cc_log("Unable to determine home directory\n");
-+		cc_log("ccache is disabled\n");
-+		failed();
-+	}
- 	
- 	/* we might be disabled */
- 	if (getenv("CCACHE_DISABLE")) {
-@@ -895,6 +902,13 @@
- 	printf("-V                      print version number\n");
- }
- 
-+static void check_cache_dir(void)
-+{
-+	if (!cache_dir) {
-+		fatal("Unable to determine home directory");
-+	}
-+}
-+
- /* the main program when not doing a compile */
- static int ccache_main(int argc, char *argv[])
- {
-@@ -914,31 +928,37 @@
- 			exit(0);
- 			
- 		case 's':
-+			check_cache_dir();
- 			stats_summary();
- 			break;
- 
- 		case 'c':
-+			check_cache_dir();
- 			cleanup_all(cache_dir);
- 			printf("Cleaned cache\n");
- 			break;
- 
- 		case 'C':
-+			check_cache_dir();
- 			wipe_all(cache_dir);
- 			printf("Cleared cache\n");
- 			break;
- 
- 		case 'z':
-+			check_cache_dir();
- 			stats_zero();
- 			printf("Statistics cleared\n");
- 			break;
- 
- 		case 'F':
-+			check_cache_dir();
- 			v = atoi(optarg);
- 			stats_set_limits(v, -1);
- 			printf("Set cache file limit to %u\n", (unsigned)v);
- 			break;
- 
- 		case 'M':
-+			check_cache_dir();
- 			v = value_units(optarg);
- 			stats_set_limits(-1, v);
- 			printf("Set cache size limit to %uk\n", (unsigned)v);
-@@ -983,7 +1003,10 @@
- 
- 	cache_dir = getenv("CCACHE_DIR");
- 	if (!cache_dir) {
--		x_asprintf(&cache_dir, "%s/.ccache", get_home_directory());
-+		const char *home_directory = get_home_directory();
-+		if (home_directory) {
-+			x_asprintf(&cache_dir, "%s/.ccache", home_directory);
-+		}
- 	}
- 
- 	temp_dir = getenv("CCACHE_TEMPDIR");
-@@ -1023,7 +1046,7 @@
- 	}
- 
- 	/* make sure the cache dir exists */
--	if (create_dir(cache_dir) != 0) {
-+	if (cache_dir && (create_dir(cache_dir) != 0)) {
- 		fprintf(stderr,"ccache: failed to create %s (%s)\n", 
- 			cache_dir, strerror(errno));
- 		exit(1);
---- util.c
-+++ util.c
-@@ -448,7 +448,7 @@
- 		}
- 	}
- #endif
--	fatal("Unable to determine home directory");
-+	cc_log("Unable to determine home directory");
- 	return NULL;
- }
- 
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/02_ccache-compressed.diff b/dependencies2013/win32/swig/CCache/debian/patches/02_ccache-compressed.diff
deleted file mode 100644
index 5740c2ca..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/02_ccache-compressed.diff
+++ /dev/null
@@ -1,1026 +0,0 @@
-Index: ccache.1
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/ccache.1,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.6
-diff -u -r1.1.1.1.2.1 -r1.6
---- ccache.1	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ ccache.1	21 Nov 2004 18:19:28 -0000	1.6
-@@ -210,7 +210,8 @@
- CCACHE_HARDLINK then ccache will attempt to use hard links from the
- cache directory when creating the compiler output rather than using a
- file copy\&. Using hard links is faster, but can confuse programs like
--\&'make\&' that rely on modification times\&.
-+\&'make\&' that rely on modification times\&. Hard links are never made for
-+compressed cache files\&.
- .IP 
- .IP "\fBCCACHE_RECACHE\fP" 
- This forces ccache to not use any cached
-@@ -257,6 +258,11 @@
- the default\&. On HP-UX set this environment variable to "i" if you use
- the aCC compiler\&.
- .IP 
-+.IP "\fBCCACHE_NOCOMPRESS\fP" 
-+If you set the environment variable
-+CCACHE_NOCOMPRESS then there is no compression used on files that go
-+into the cache\&.
-+.IP 
- .PP 
- .SH "CACHE SIZE MANAGEMENT" 
- .PP 
-@@ -269,6 +275,14 @@
- below the numbers you specified in order to avoid doing the cache
- clean operation too often\&.
- .PP 
-+.SH "CACHE COMPRESSION" 
-+.PP 
-+By default ccache will compress all files it puts into the cache
-+using the zlib compression\&. While this involves a negligible
-+performance slowdown, it significantly increases the number of files
-+that fit in the cache\&. You can turn off compression setting the
-+CCACHE_NOCOMPRESS environment variable\&.
-+.PP 
- .SH "HOW IT WORKS" 
- .PP 
- The basic idea is to detect when you are compiling exactly the same
-Index: ccache.c
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/ccache.c,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.9
-diff -u -r1.1.1.1.2.1 -r1.9
---- ccache.c	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ ccache.c	21 Nov 2004 18:19:28 -0000	1.9
-@@ -199,7 +199,7 @@
- 		fd = open(tmp_stderr, O_RDONLY | O_BINARY);
- 		if (fd != -1) {
- 			if (strcmp(output_file, "/dev/null") == 0 ||
--			    rename(tmp_hashname, output_file) == 0 || errno == ENOENT) {
-+			    move_file(tmp_hashname, output_file) == 0 || errno == ENOENT) {
- 				if (cpp_stderr) {
- 					/* we might have some stderr from cpp */
- 					int fd2 = open(cpp_stderr, O_RDONLY | O_BINARY);
-@@ -231,14 +231,25 @@
- 	x_asprintf(&path_stderr, "%s.stderr", hashname);
- 
- 	if (stat(tmp_stderr, &st1) != 0 ||
--	    stat(tmp_hashname, &st2) != 0 ||
--	    rename(tmp_hashname, hashname) != 0 ||
--	    rename(tmp_stderr, path_stderr) != 0) {
-+		stat(tmp_hashname, &st2) != 0 ||
-+		move_file(tmp_hashname, hashname) != 0 ||
-+		move_file(tmp_stderr, path_stderr) != 0) {
- 		cc_log("failed to rename tmp files - %s\n", strerror(errno));
- 		stats_update(STATS_ERROR);
- 		failed();
- 	}
- 
-+#if ENABLE_ZLIB
-+	/* do an extra stat on the cache files for
-+	   the size statistics */
-+	if (stat(path_stderr, &st1) != 0 ||
-+		stat(hashname, &st2) != 0) {
-+		cc_log("failed to stat cache files - %s\n", strerror(errno));
-+		stats_update(STATS_ERROR);
-+		failed();
-+    }
-+#endif
-+
- 	cc_log("Placed %s into cache\n", output_file);
- 	stats_tocache(file_size(&st1) + file_size(&st2));
- 
-@@ -474,7 +485,13 @@
- 	}
- 
- 	/* the user might be disabling cache hits */
-+#ifndef ENABLE_ZLIB
-+	/* if the cache file is compressed we must recache */
-+	if ((first && getenv("CCACHE_RECACHE")) ||
-+		test_if_compressed(hashname) == 1) {
-+#else
- 	if (first && getenv("CCACHE_RECACHE")) {
-+#endif
- 		close(fd_stderr);
- 		unlink(stderr_file);
- 		free(stderr_file);
-@@ -487,7 +504,9 @@
- 		ret = 0;
- 	} else {
- 		unlink(output_file);
--		if (getenv("CCACHE_HARDLINK")) {
-+		/* only make a hardlink if the cache file is uncompressed */
-+		if (getenv("CCACHE_HARDLINK") &&
-+			test_if_compressed(hashname) == 0) {
- 			ret = link(hashname, output_file);
- 		} else {
- 			ret = copy_file(hashname, output_file);
-Index: ccache.h
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/ccache.h,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.7
-diff -u -r1.1.1.1.2.1 -r1.7
---- ccache.h	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ ccache.h	21 Nov 2004 18:19:28 -0000	1.7
-@@ -23,6 +23,10 @@
- #include <pwd.h>
- #endif
- 
-+#ifdef ENABLE_ZLIB
-+#include <zlib.h>
-+#endif
-+
- #define STATUS_NOTFOUND 3
- #define STATUS_FATAL 4
- #define STATUS_NOCACHE 5
-@@ -36,6 +40,13 @@
- #define DEFAULT_MAXSIZE (1000*1000)
- #endif
- 
-+/* file copy mode */
-+#ifdef ENABLE_ZLIB
-+#define COPY_UNCOMPRESSED 0
-+#define COPY_FROM_CACHE 1
-+#define COPY_TO_CACHE 2
-+#endif
-+
- enum stats {
- 	STATS_NONE=0,
- 	STATS_STDOUT,
-@@ -79,6 +90,8 @@
- 
- void copy_fd(int fd_in, int fd_out);
- int copy_file(const char *src, const char *dest);
-+int move_file(const char *src, const char *dest);
-+int test_if_compressed(const char *filename);
- 
- int create_dir(const char *dir);
- void x_asprintf(char **ptr, const char *format, ...);
-Index: ccache.yo
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/ccache.yo,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.5
-diff -u -r1.1.1.1.2.1 -r1.5
---- ccache.yo	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ ccache.yo	21 Nov 2004 18:19:28 -0000	1.5
-@@ -169,6 +169,11 @@
- this optimisation, in which case this option could allow ccache to be
- used.
- 
-+dit(bf(CCACHE_NOCOMPRESS)) If you set the environment variable
-+CCACHE_NOCOMPRESS then there is no compression used on files that go
-+into the cache. However, this setting has no effect on how files are
-+retrieved from the cache, compressed results will still be usable.
-+
- dit(bf(CCACHE_NOSTATS)) If you set the environment variable
- CCACHE_NOSTATS then ccache will not update the statistics files on
- each compile.
-@@ -181,7 +186,8 @@
- CCACHE_HARDLINK then ccache will attempt to use hard links from the
- cache directory when creating the compiler output rather than using a
- file copy. Using hard links is faster, but can confuse programs like
--'make' that rely on modification times.
-+'make' that rely on modification times. Hard links are never made for
-+compressed cache files.
- 
- dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached
- results, even if it finds them. New results are still cached, but
-@@ -236,6 +242,14 @@
- below the numbers you specified in order to avoid doing the cache
- clean operation too often.
- 
-+manpagesection(CACHE COMPRESSION)
-+
-+By default ccache will compress all files it puts into the cache
-+using the zlib compression. While this involves a negligible
-+performance slowdown, it significantly increases the number of files
-+that fit in the cache. You can turn off compression setting the
-+CCACHE_NOCOMPRESS environment variable.
-+
- manpagesection(HOW IT WORKS)
- 
- The basic idea is to detect when you are compiling exactly the same
-@@ -294,6 +308,8 @@
-   cache. This tells the filesystem to inherit group ownership for new
-   directories. The command "chmod g+s `find $CCACHE_DIR -type d`" might
-   be useful for this.
-+  it() Set bf(CCACHE_NOCOMPRESS) for all users, if there are users with
-+  versions of ccache that do not support compression.
- )
- 
- manpagesection(HISTORY)
-Index: config.h.in
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/config.h.in,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- config.h.in	30 Apr 2004 13:13:41 -0000	1.1.1.1
-+++ config.h.in	4 May 2004 20:49:26 -0000	1.2
-@@ -98,3 +98,6 @@
- 
- /* Define _GNU_SOURCE so that we get all necessary prototypes */
- #undef _GNU_SOURCE
-+
-+/* Define to 1 if you like to have zlib compression for the ccache. */
-+#undef ENABLE_ZLIB
-Index: configure
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/configure,v
-retrieving revision 1.1.1.1.2.1
-diff -u -r1.1.1.1.2.1 configure
---- configure	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ configure	21 Nov 2004 18:24:42 -0000
-@@ -836,6 +836,11 @@
- 
-   cat <<\_ACEOF
- 
-+Optional Features:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --enable-zlib           enable zlib support for ccache compression
-+
- Some influential environment variables:
-   CC          C compiler command
-   CFLAGS      C compiler flags
-@@ -936,7 +941,7 @@
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -1859,7 +1864,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -1917,7 +1923,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2033,7 +2040,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2087,7 +2095,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2132,7 +2141,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2176,7 +2186,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2609,7 +2620,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2681,7 +2693,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2735,7 +2748,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2806,7 +2820,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2860,7 +2875,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2927,7 +2943,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2997,7 +3014,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3078,7 +3096,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3248,7 +3267,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3319,7 +3339,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3509,7 +3530,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3611,7 +3633,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3676,7 +3699,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3775,6 +3799,229 @@
- 
- fi
- 
-+# Check whether --enable-zlib or --disable-zlib was given.
-+if test "${enable_zlib+set}" = set; then
-+  enableval="$enable_zlib"
-+
-+else
-+  enable_zlib=yes
-+fi;
-+
-+if test x"$enable_zlib" = x"yes"; then
-+    if test "${ac_cv_header_zlib_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+if test "${ac_cv_header_zlib_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking zlib.h usability" >&5
-+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <zlib.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking zlib.h presence" >&5
-+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <zlib.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists.  ##
-+## ------------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+if test "${ac_cv_header_zlib_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_zlib_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+
-+fi
-+if test $ac_cv_header_zlib_h = yes; then
-+  echo "$as_me:$LINENO: checking for gzdopen in -lz" >&5
-+echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6
-+if test "${ac_cv_lib_z_gzdopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char gzdopen ();
-+int
-+main ()
-+{
-+gzdopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_z_gzdopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_z_gzdopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzdopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_gzdopen" >&6
-+if test $ac_cv_lib_z_gzdopen = yes; then
-+  LIBS="-lz $LIBS"; cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_ZLIB 1
-+_ACEOF
-+
-+fi
-+
-+fi
-+
-+
-+fi
-+
-           ac_config_files="$ac_config_files Makefile"
- 
- cat >confcache <<\_ACEOF
-@@ -4568,6 +4815,11 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -4606,12 +4858,6 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-Index: configure.in
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/configure.in,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.4
-diff -u -r1.1.1.1.2.1 -r1.4
---- configure.in	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ configure.in	21 Nov 2004 18:19:28 -0000	1.4
-@@ -68,5 +68,14 @@
-     AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ])
- fi
- 
-+dnl Check for zlib.
-+AC_ARG_ENABLE([zlib],
-+              AS_HELP_STRING([--enable-zlib], [enable zlib support for ccache compression]),,
-+              [enable_zlib=yes])
-+
-+if test x"$enable_zlib" = x"yes"; then
-+    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzdopen, LIBS="-lz $LIBS"; AC_DEFINE(ENABLE_ZLIB)))
-+fi
-+
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
-Index: util.c
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/util.c,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.11
-diff -u -r1.1.1.1.2.1 -r1.11
---- util.c	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ util.c	21 Nov 2004 18:19:28 -0000	1.11
-@@ -44,6 +44,7 @@
- 	exit(1);
- }
- 
-+#ifndef ENABLE_ZLIB
- /* copy all data from one file descriptor to another */
- void copy_fd(int fd_in, int fd_out)
- {
-@@ -57,6 +58,11 @@
- 	}
- }
- 
-+/* move a file using rename */
-+int move_file(const char *src, const char *dest) {
-+	return rename(src, dest);
-+}
-+
- /* copy a file - used when hard links don't work 
-    the copy is done via a temporary file and atomic rename
- */
-@@ -120,6 +126,174 @@
- 	return 0;
- }
- 
-+#else /* ENABLE_ZLIB */
-+
-+/* copy all data from one file descriptor to another
-+   possibly decompressing it
-+*/
-+void copy_fd(int fd_in, int fd_out) {
-+	char buf[10240];
-+	int n;
-+	gzFile gz_in;
-+
-+	gz_in = gzdopen(dup(fd_in), "rb");
-+
-+	if (!gz_in) {
-+		fatal("Failed to copy fd");
-+	}
-+
-+	while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) {
-+		if (write(fd_out, buf, n) != n) {
-+			fatal("Failed to copy fd");
-+		}
-+	}
-+}
-+
-+static int _copy_file(const char *src, const char *dest, int mode) {
-+	int fd_in, fd_out;
-+	gzFile gz_in, gz_out = NULL;
-+	char buf[10240];
-+	int n, ret;
-+	char *tmp_name;
-+	mode_t mask;
-+	struct stat st;
-+
-+	x_asprintf(&tmp_name, "%s.XXXXXX", dest);
-+
-+	if (getenv("CCACHE_NOCOMPRESS")) {
-+		mode = COPY_UNCOMPRESSED;
-+	}
-+
-+	/* open source file */
-+	fd_in = open(src, O_RDONLY);
-+	if (fd_in == -1) {
-+		return -1;
-+	}
-+
-+	gz_in = gzdopen(fd_in, "rb");
-+	if (!gz_in) {
-+		close(fd_in);
-+		return -1;
-+	}
-+
-+	/* open destination file */
-+	fd_out = mkstemp(tmp_name);
-+	if (fd_out == -1) {
-+		gzclose(gz_in);
-+		free(tmp_name);
-+		return -1;
-+	}
-+
-+	if (mode == COPY_TO_CACHE) {
-+		/* The gzip file format occupies at least 20 bytes. So
-+		   it will always occupy an entire filesystem block,
-+		   even for empty files.
-+		   Since most stderr files will be empty, we turn off
-+		   compression in this case to save space.
-+		*/
-+		if (fstat(fd_in, &st) != 0) {
-+			gzclose(gz_in);
-+			close(fd_out);
-+			free(tmp_name);
-+			return -1;
-+		}
-+		if (file_size(&st) == 0) {
-+			mode = COPY_UNCOMPRESSED;
-+		}
-+	}
-+
-+	if (mode == COPY_TO_CACHE) {
-+		gz_out = gzdopen(dup(fd_out), "wb");
-+		if (!gz_out) {
-+			gzclose(gz_in);
-+			close(fd_out);
-+			free(tmp_name);
-+			return -1;
-+		}
-+	}
-+
-+	while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) {
-+		if (mode == COPY_TO_CACHE) {
-+			ret = gzwrite(gz_out, buf, n);
-+		} else {
-+			ret = write(fd_out, buf, n);
-+		}
-+		if (ret != n) {
-+			gzclose(gz_in);
-+			if (gz_out) {
-+				gzclose(gz_out);
-+			}
-+			close(fd_out);
-+			unlink(tmp_name);
-+			free(tmp_name);
-+			return -1;
-+		}
-+	}
-+
-+	gzclose(gz_in);
-+	if (gz_out) {
-+		gzclose(gz_out);
-+	}
-+
-+	/* get perms right on the tmp file */
-+	mask = umask(0);
-+	fchmod(fd_out, 0666 & ~mask);
-+	umask(mask);
-+
-+	/* the close can fail on NFS if out of space */
-+	if (close(fd_out) == -1) {
-+		unlink(tmp_name);
-+		free(tmp_name);
-+		return -1;
-+	}
-+
-+	unlink(dest);
-+
-+	if (rename(tmp_name, dest) == -1) {
-+		unlink(tmp_name);
-+		free(tmp_name);
-+		return -1;
-+	}
-+
-+	free(tmp_name);
-+
-+	return 0;
-+}
-+
-+/* move a file to the cache, compressing it */
-+int move_file(const char *src, const char *dest) {
-+	int ret;
-+
-+	ret = _copy_file(src, dest, COPY_TO_CACHE);
-+	if (ret != -1) unlink(src);
-+	return ret;
-+}
-+
-+/* copy a file from the cache, decompressing it */
-+int copy_file(const char *src, const char *dest) {
-+	return _copy_file(src, dest, COPY_FROM_CACHE);
-+}
-+#endif /* ENABLE_ZLIB */
-+
-+/* test if a file is zlib compressed */
-+int test_if_compressed(const char *filename) {
-+	FILE *f;
-+
-+	f = fopen(filename, "rb");
-+	if (!f) {
-+		return 0;
-+	}
-+
-+	/* test if file starts with 1F8B, which is zlib's
-+	 * magic number */
-+	if ((fgetc(f) != 0x1f) || (fgetc(f) != 0x8b)) {
-+		fclose(f);
-+		return 0;
-+	}
-+	
-+	fclose(f);
-+	return 1;
-+}
- 
- /* make sure a directory exists */
- int create_dir(const char *dir)
-Index: manage-cache.sh
-===================================================================
-RCS file: manage-cache.sh
-diff -N manage-cache.sh
---- manage-cache.sh	1 Jan 1970 00:00:00 -0000
-+++ manage-cache.sh-cache.sh	12 May 2004 19:22:20 -0000	1.1
-@@ -0,0 +1,68 @@
-+#!/bin/bash
-+#
-+# 2004-05-12 lars@gustaebel.de
-+
-+CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache}
-+
-+echo "Do you want to compress or decompress the ccache in $CCACHE_DIR?"
-+read -p "Type c or d: " mode
-+
-+if [ "$mode" != "c" ] && [ "$mode" != "d" ]
-+then
-+    exit 1
-+fi
-+
-+is_compressed() {
-+    test "$(head -c 2 $1)" = $'\x1f\x8b'
-+    return $?
-+}
-+
-+tmpfile=$(mktemp)
-+
-+for dir in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-+do
-+    # process ccache subdir
-+    echo -n "$dir "
-+
-+    # find cache files
-+    find $CCACHE_DIR/$dir -type f -name '*-*' |
-+    sort > $tmpfile
-+
-+    oldsize=$(cat $CCACHE_DIR/$dir/stats | cut -d ' ' -f 13)
-+    newsize=0
-+
-+    while read file
-+    do
-+        # empty files will be ignored since compressing
-+        # them makes them bigger
-+        test $(stat -c %s $file) -eq 0 && continue
-+
-+        if [ $mode = c ]
-+        then
-+            if ! is_compressed $file
-+            then
-+                gzip $file
-+                mv $file.gz $file
-+            fi
-+        else
-+            if is_compressed $file
-+            then
-+                mv $file $file.gz
-+                gzip -d $file.gz
-+            fi
-+        fi
-+
-+        # calculate new size statistic for this subdir
-+        let newsize=$newsize+$(stat -c "%B*%b" $file)/1024
-+    done < $tmpfile
-+
-+    # update statistic file
-+    read -a numbers < $CCACHE_DIR/$dir/stats
-+    numbers[12]=$newsize
-+    echo "${numbers[*]} " > $CCACHE_DIR/$dir/stats
-+done
-+echo
-+
-+# clean up
-+rm $tmpfile
-+
-Index: Makefile.in
-===================================================================
-RCS file: /home/cvsroot/lars/ccache/Makefile.in,v
-retrieving revision 1.1.1.1.2.1
-retrieving revision 1.12
-diff -u -r1.1.1.1.2.1 -r1.12
---- Makefile.in	21 Nov 2004 17:55:36 -0000	1.1.1.1.2.1
-+++ Makefile.in	21 Nov 2004 18:19:28 -0000	1.12
-@@ -11,6 +11,7 @@
- CFLAGS=@CFLAGS@ -I.
- EXEEXT=@EXEEXT@
- 
-+LIBS= @LIBS@
- OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \
- 	cleanup.o snprintf.o unify.o
- HEADERS = ccache.h mdfour.h
-@@ -20,7 +21,7 @@
- docs: ccache.1 web/ccache-man.html
- 
- ccache$(EXEEXT): $(OBJS) $(HEADERS)
--	$(CC) $(CFLAGS) -o $@ $(OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- ccache.1: ccache.yo
- 	-yodl2man -o ccache.1 ccache.yo
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/03_long_options.diff b/dependencies2013/win32/swig/CCache/debian/patches/03_long_options.diff
deleted file mode 100644
index 3235c380..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/03_long_options.diff
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: ccache.c
-===================================================================
---- ccache.c	(révision 7695)
-+++ ccache.c	(copie de travail)
-@@ -22,6 +22,7 @@
- */
- 
- #include "ccache.h"
-+#include <getopt.h>
- 
- /* the base cache directory */
- char *cache_dir = NULL;
-@@ -885,14 +886,14 @@
- 	printf("\tcompiler [compile options]    (via symbolic link)\n");
- 	printf("\nOptions:\n");
- 
--	printf("-s                      show statistics summary\n");
--	printf("-z                      zero statistics\n");
--	printf("-c                      run a cache cleanup\n");
--	printf("-C                      clear the cache completely\n");
--	printf("-F <maxfiles>           set maximum files in cache\n");
--	printf("-M <maxsize>            set maximum size of cache (use G, M or K)\n");
--	printf("-h                      this help page\n");
--	printf("-V                      print version number\n");
-+	printf("-s, --show-stats         show statistics summary\n");
-+	printf("-z, --zero-stats         zero statistics\n");
-+	printf("-c, --cleanup            run a cache cleanup\n");
-+	printf("-C, --clear              clear the cache completely\n");
-+	printf("-F <n>, --max-files=<n>  set maximum files in cache\n");
-+	printf("-M <n>, --max-size=<n>   set maximum size of cache (use G, M or K)\n");
-+	printf("-h, --help               this help page\n");
-+	printf("-V, --version            print version number\n");
- }
- 
- /* the main program when not doing a compile */
-@@ -901,7 +902,21 @@
- 	int c;
- 	size_t v;
- 
--	while ((c = getopt(argc, argv, "hszcCF:M:V")) != -1) {
-+	static struct option long_options[] =
-+        {
-+		{"show-stats", no_argument,       0, 's'},
-+		{"zero-stats", no_argument,       0, 'z'},
-+		{"cleanup",    no_argument,       0, 'c'},
-+		{"clear",      no_argument,       0, 'C'},
-+		{"max-files",  required_argument, 0, 'F'},
-+		{"max-size",   required_argument, 0, 'M'},
-+		{"help",       no_argument,       0, 'h'},
-+		{"version",    no_argument,       0, 'V'},
-+		{0, 0, 0, 0}
-+        };
-+	int option_index = 0;
-+
-+	while ((c = getopt_long(argc, argv, "hszcCF:M:V", long_options, &option_index)) != -1) {
- 		switch (c) {
- 		case 'V':
- 			printf("ccache version %s\n", CCACHE_VERSION);
-Index: ccache.1
-===================================================================
---- ccache.1	(révision 7695)
-+++ ccache.1	(copie de travail)
-@@ -23,14 +23,14 @@
- .nf 
-  
- 
---s                      show statistics summary
---z                      zero statistics
---c                      run a cache cleanup
---C                      clear the cache completely
---F <maxfiles>           set maximum files in cache
---M <maxsize>            set maximum size of cache (use G, M or K)
---h                      this help page
---V                      print version number
-+\-s, \-\-show-stats        show statistics summary
-+\-z, \-\-zero-stats        zero statistics
-+\-c, \-\-cleanup           run a cache cleanup
-+\-C, \-\-clear             clear the cache completely
-+\-F <n>, \-\-max-files=<n> set maximum files in cache
-+\-M <n>, \-\-max-size=<n>  set maximum size of cache (use G, M or K)
-+\-h, \-\-help              this help page
-+\-V, \-\-version           print version number
- 
- .fi 
-  
-@@ -43,22 +43,22 @@
- normal compiler options apply and you should refer to your compilers
- documentation\&.
- .PP 
--.IP "\fB-h\fP" 
-+.IP "\fB-h, --help\fP"
- Print a options summary page
- .IP 
--.IP "\fB-s\fP" 
-+.IP "\fB-s, --show-stats\fP"
- Print the current statistics summary for the cache\&. The
- statistics are stored spread across the subdirectories of the
- cache\&. Using "ccache -s" adds up the statistics across all
- subdirectories and prints the totals\&.
- .IP 
--.IP "\fB-z\fP" 
-+.IP "\fB-z, --zero-stats\fP"
- Zero the cache statistics\&. 
- .IP 
--.IP "\fB-V\fP" 
-+.IP "\fB-V, --version\fP" 
- Print the ccache version number
- .IP 
--.IP "\fB-c\fP" 
-+.IP "\fB-c, --cleanup\fP" 
- Clean the cache and re-calculate the cache file count and
- size totals\&. Normally the -c option should not be necessary as ccache
- keeps the cache below the specified limits at runtime and keeps
-@@ -66,16 +66,16 @@
- if you manually modify the cache contents or believe that the cache
- size statistics may be inaccurate\&.
- .IP 
--.IP "\fB-C\fP" 
-+.IP "\fB-C, --clear\fP" 
- Clear the entire cache, removing all cached files\&.
- .IP 
--.IP "\fB-F maxfiles\fP" 
-+.IP "\fB-F <maxfiles>, --max-files=<maxfiles>\fP" 
- This sets the maximum number of files allowed in
- the cache\&. The value is stored inside the cache directory and applies
- to all future compiles\&. Due to the way the value is stored the actual
- value used is always rounded down to the nearest multiple of 16\&.
- .IP 
--.IP "\fB-M maxsize\fP" 
-+.IP "\fB-M <maxsize>, --max-size=<maxsize>\fP" 
- This sets the maximum cache size\&. You can specify
- a value in gigabytes, megabytes or kilobytes by appending a G, M or K
- to the value\&. The default is gigabytes\&. The actual value stored is
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/04_ignore_profile.diff b/dependencies2013/win32/swig/CCache/debian/patches/04_ignore_profile.diff
deleted file mode 100644
index 56837509..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/04_ignore_profile.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru ccache-2.4/ccache.c ccache-2.4-tp/ccache.c
---- ccache.c	2007-05-20 03:14:19.000000000 +1000
-+++ ccache.c	2007-05-20 03:17:54.000000000 +1000
-@@ -641,6 +641,9 @@
- 
- 		/* these are too hard */
- 		if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
-+		    strcmp(argv[i], "-fprofile-arcs") == 0 ||
-+		    strcmp(argv[i], "-ftest-coverage") == 0 ||
-+		    strcmp(argv[i], "--coverage") == 0 ||
- 		    strcmp(argv[i], "-M") == 0 ||
- 		    strcmp(argv[i], "-MM") == 0 ||
- 		    strcmp(argv[i], "-x") == 0) {
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/05_nfs_fix.diff b/dependencies2013/win32/swig/CCache/debian/patches/05_nfs_fix.diff
deleted file mode 100644
index 662d9763..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/05_nfs_fix.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- ccache.1.orig	2007-05-20 17:30:57.000000000 +1200
-+++ ccache.1	2007-05-20 17:31:27.000000000 +1200
-@@ -367,12 +367,6 @@
- .IP o 
- ccache avoids a double call to cpp on a cache miss
- .PP 
--.SH "BUGS" 
--.PP 
--When the cache is stored on an NFS filesystem, the filesystem must be
--exported with the \fBno_subtree_check\fP option to make renames between
--directories reliable\&.
--.PP 
- .SH "CREDITS" 
- .PP 
- Thanks to the following people for their contributions to ccache
---- util.c.patched	2007-05-20 18:19:11.000000000 +1200
-+++ util.c	2007-05-20 18:20:55.000000000 +1200
-@@ -58,9 +58,26 @@
- 	}
- }
- 
-+static int safe_rename(const char* oldpath, const char* newpath)
-+{
-+    /* safe_rename is for creating entries in the cache.
-+
-+       Works like rename(), but it never overwrites an existing
-+       cache entry. This avoids corruption on NFS. */
-+    int status = link( oldpath, newpath );
-+    if( status == 0 || errno == EEXIST )
-+    {
-+	return unlink( oldpath );
-+    }
-+    else
-+    {
-+	return -1;
-+    }
-+}
-+ 
- /* move a file using rename */
- int move_file(const char *src, const char *dest) {
--	return rename(src, dest);
-+	return safe_rename(src, dest);
- }
- 
- /* copy a file - used when hard links don't work 
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/06_md.diff b/dependencies2013/win32/swig/CCache/debian/patches/06_md.diff
deleted file mode 100644
index 3f68850c..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/06_md.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- ccache.c	Mon Sep 13 11:38:30 2004
-+++ ccache.c	Thu Jun 21 22:17:32 2007
-@@ -627,6 +627,13 @@ static void process_args(int argc, char 
- 	int found_S_opt = 0;
- 	struct stat st;
- 	char *e;
-+	/* is gcc being asked to output dependencies? */
-+	int generating_dependencies = 0;
-+	/* is the dependency makefile name overridden with -MF? */
-+	int dependency_filename_specified = 0;
-+	/* is the dependency makefile target name specified with -MQ or -MF? */
-+	int dependency_target_specified = 0;
-+
- 
- 	stripped_args = args_init(0, NULL);
- 
-@@ -702,6 +709,18 @@ static void process_args(int argc, char 
- 			continue;
- 		}
- 
-+		/* These options require special handling, because they
-+		   behave differently with gcc -E, when the output
-+		   file is not specified. */
-+
-+		if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
-+			generating_dependencies = 1;
-+		} else if (strcmp(argv[i], "-MF") == 0) {
-+			dependency_filename_specified = 1;
-+		} else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
-+			dependency_target_specified = 1;
-+		}
-+
- 		/* options that take an argument */
- 		{
- 			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
-@@ -812,6 +831,41 @@ static void process_args(int argc, char 
- 		}
- 		p[1] = found_S_opt ? 's' : 'o';
- 		p[2] = 0;
-+	}
-+
-+	/* If dependencies are generated, configure the preprocessor */
-+
-+	if (generating_dependencies && output_file) {
-+		if (!dependency_filename_specified) {
-+			char *default_depfile_name = x_strdup(output_file);
-+			char *p = strrchr(default_depfile_name, '.');
-+
-+			if (p) {
-+				if (strlen(p) < 2) {
-+					stats_update(STATS_ARGS);
-+					failed();
-+					return;
-+				}
-+				*p = 0;
-+			}
-+			else  {
-+				int len = p - default_depfile_name;
-+				
-+				p = x_malloc(len + 3);
-+				strncpy(default_depfile_name, p, len - 1);
-+				free(default_depfile_name);
-+				default_depfile_name = p;
-+			}
-+
-+			strcat(default_depfile_name, ".d");
-+			args_add(stripped_args, "-MF");
-+			args_add(stripped_args, default_depfile_name);
-+		}
-+
-+		if (!dependency_target_specified) {
-+			args_add(stripped_args, "-MT");
-+			args_add(stripped_args, output_file);
-+		}
- 	}
- 
- 	/* cope with -o /dev/null */
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/07_cachedirtag.diff b/dependencies2013/win32/swig/CCache/debian/patches/07_cachedirtag.diff
deleted file mode 100644
index 683b48d1..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/07_cachedirtag.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: ccache.c
-===================================================================
---- ccache.c	(révision 7695)
-+++ ccache.c	(copie de travail)
-@@ -1029,6 +1029,14 @@
- 		exit(1);
- 	}
- 
-+	if (!getenv("CCACHE_READONLY")) {
-+		if (create_cachedirtag(cache_dir) != 0) {
-+			fprintf(stderr,"ccache: failed to create %s/CACHEDIR.TAG (%s)\n",
-+				cache_dir, strerror(errno));
-+			exit(1);
-+		}
-+	}
-+
- 	ccache(argc, argv);
- 	return 1;
- }
-Index: ccache.h
-===================================================================
---- ccache.h	(révision 7695)
-+++ ccache.h	(copie de travail)
-@@ -81,6 +81,7 @@
- int copy_file(const char *src, const char *dest);
- 
- int create_dir(const char *dir);
-+int create_cachedirtag(const char *dir);
- void x_asprintf(char **ptr, const char *format, ...);
- char *x_strdup(const char *s);
- void *x_realloc(void *ptr, size_t size);
-Index: util.c
-===================================================================
---- util.c	(révision 7695)
-+++ util.c	(copie de travail)
-@@ -138,6 +138,39 @@
- 	return 0;
- }
- 
-+char const CACHEDIR_TAG[] =
-+	"Signature: 8a477f597d28d172789f06886806bc55\n"
-+	"# This file is a cache directory tag created by ccache.\n"
-+	"# For information about cache directory tags, see:\n"
-+	"#	http://www.brynosaurus.com/cachedir/\n";
-+
-+int create_cachedirtag(const char *dir)
-+{
-+	char *filename;
-+	struct stat st;
-+	FILE *f;
-+	x_asprintf(&filename, "%s/CACHEDIR.TAG", dir);
-+	if (stat(filename, &st) == 0) {
-+		if (S_ISREG(st.st_mode)) {
-+			goto success;
-+		}
-+		errno = EEXIST;
-+		goto error;
-+	}
-+	f = fopen(filename, "w");
-+	if (!f) goto error;
-+	if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) {
-+		goto error;
-+	}
-+	if (fclose(f)) goto error;
-+success:
-+	free(filename);
-+	return 0;
-+error:
-+	free(filename);
-+	return 1;
-+}
-+
- /*
-   this is like asprintf() but dies if the malloc fails
-   note that we use vsnprintf in a rather poor way to make this more portable
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/08_manpage_hyphens.diff b/dependencies2013/win32/swig/CCache/debian/patches/08_manpage_hyphens.diff
deleted file mode 100644
index 55ced4a2..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/08_manpage_hyphens.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: ccache.1
-===================================================================
---- ccache.1	(révision 7695)
-+++ ccache.1	(copie de travail)
-@@ -49,7 +49,7 @@
- .IP "\fB-s\fP" 
- Print the current statistics summary for the cache\&. The
- statistics are stored spread across the subdirectories of the
--cache\&. Using "ccache -s" adds up the statistics across all
-+cache\&. Using "ccache \-s" adds up the statistics across all
- subdirectories and prints the totals\&.
- .IP 
- .IP "\fB-z\fP" 
-@@ -60,7 +60,7 @@
- .IP 
- .IP "\fB-c\fP" 
- Clean the cache and re-calculate the cache file count and
--size totals\&. Normally the -c option should not be necessary as ccache
-+size totals\&. Normally the \-c option should not be necessary as ccache
- keeps the cache below the specified limits at runtime and keeps
- statistics up to date on each compile\&. This option is mostly useful
- if you manually modify the cache contents or believe that the cache
-@@ -100,9 +100,9 @@
-  
- 
-   cp ccache /usr/local/bin/
--  ln -s /usr/local/bin/ccache /usr/local/bin/gcc
--  ln -s /usr/local/bin/ccache /usr/local/bin/g++
--  ln -s /usr/local/bin/ccache /usr/local/bin/cc
-+  ln \-s /usr/local/bin/ccache /usr/local/bin/gcc
-+  ln \-s /usr/local/bin/ccache /usr/local/bin/g++
-+  ln \-s /usr/local/bin/ccache /usr/local/bin/cc
- 
- .fi 
-  
-@@ -118,7 +118,7 @@
- .PP 
- When run as a compiler front end ccache usually just takes the same
- command line options as the compiler you are using\&. The only exception
--to this is the option \&'--ccache-skip\&'\&. That option can be used to tell
-+to this is the option \&'\-\-ccache-skip\&'\&. That option can be used to tell
- ccache that the next option is definitely not a input filename, and
- should be passed along to the compiler as-is\&. 
- .PP 
-@@ -128,7 +128,7 @@
- of the resulting object file (among other things)\&. The heuristic
- ccache uses in this parse is that any string on the command line that
- exists as a file is treated as an input file name (usually a C
--file)\&. By using --ccache-skip you can force an option to not be
-+file)\&. By using \-\-ccache-skip you can force an option to not be
- treated as an input file name and instead be passed along to the
- compiler as a command line option\&.
- .PP 
-@@ -238,7 +238,7 @@
- .IP "\fBCCACHE_UNIFY\fP" 
- If you set the environment variable CCACHE_UNIFY
- then ccache will use the C/C++ unifier when hashing the pre-processor
--output if -g is not used in the compile\&. The unifier is slower than a
-+output if \-g is not used in the compile\&. The unifier is slower than a
- normal hash, so setting this environment variable loses a little bit
- of speed, but it means that ccache can take advantage of not
- recompiling when the changes to the source code consist of
-@@ -262,7 +262,7 @@
- .PP 
- By default ccache has a one gigabyte limit on the cache size and no
- maximum number of files\&. You can set a different limit using the
--"ccache -M" and "ccache -F" options, which set the size and number of
-+"ccache \-M" and "ccache \-F" options, which set the size and number of
- files limits\&.
- .PP 
- When these limits are reached ccache will reduce the cache to 20%
-@@ -276,7 +276,7 @@
- that it is the same code by forming a hash of:
- .PP 
- .IP o 
--the pre-processor output from running the compiler with -E
-+the pre-processor output from running the compiler with \-E
- .IP o 
- the command line options
- .IP o 
-@@ -331,7 +331,7 @@
- .IP o 
- Make sure that the setgid bit is set on all directories in the
- cache\&. This tells the filesystem to inherit group ownership for new
--directories\&. The command "chmod g+s `find $CCACHE_DIR -type d`" might
-+directories\&. The command "chmod g+s `find $CCACHE_DIR \-type d`" might
- be useful for this\&.
- .PP 
- .SH "HISTORY" 
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/09_respect_ldflags.diff b/dependencies2013/win32/swig/CCache/debian/patches/09_respect_ldflags.diff
deleted file mode 100644
index 0ce2c2de..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/09_respect_ldflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-03-23 17:01:19.000000000 +1300
-+++ Makefile.in	2008-03-23 17:03:03.000000000 +1300
-@@ -21,7 +21,7 @@
- docs: ccache.1 web/ccache-man.html
- 
- ccache$(EXEEXT): $(OBJS) $(HEADERS)
--	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- ccache.1: ccache.yo
- 	-yodl2man -o ccache.1 ccache.yo
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/10_lru_cleanup.diff b/dependencies2013/win32/swig/CCache/debian/patches/10_lru_cleanup.diff
deleted file mode 100644
index 24463e52..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/10_lru_cleanup.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- ccache.c	(révision 8804)
-+++ ccache.c	(copie de travail)
-@@ -481,6 +481,9 @@
- 		return;
- 	}
- 
-+	/* update timestamps for LRU cleanup
-+	   also gives output_file a sensible mtime when hard-linking (for make) */
-+	utime(hashname, NULL);
- 	utime(stderr_file, NULL);
- 
- 	if (strcmp(output_file, "/dev/null") == 0) {
-@@ -513,10 +516,6 @@
- 			failed();
- 		}
- 	}
--	if (ret == 0) {
--		/* update the mtime on the file so that make doesn't get confused */
--		utime(output_file, NULL);
--	}
- 
- 	/* get rid of the intermediate preprocessor file */
- 	if (i_tmpfile) {
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/11_utimes.diff b/dependencies2013/win32/swig/CCache/debian/patches/11_utimes.diff
deleted file mode 100644
index 2886bf3d..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/11_utimes.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- ccache.c	2004-09-13 03:38:30.000000000 -0700
-+++ ccache.c	2006-06-09 16:29:16.695117780 -0700
-@@ -481,8 +481,13 @@
- 
- 	/* update timestamps for LRU cleanup
- 	   also gives output_file a sensible mtime when hard-linking (for make) */
-+#ifdef HAVE_UTIMES
-+       utimes(hashname, NULL);
-+	utimes(stderr_file, NULL);
-+#else
- 	utime(hashname, NULL);
- 	utime(stderr_file, NULL);
-+#endif
- 
- 	if (strcmp(output_file, "/dev/null") == 0) {
- 		ret = 0;
---- ccache.h	2004-09-13 03:38:30.000000000 -0700
-+++ ccache.h	2006-06-09 16:28:16.601658626 -0700
-@@ -22,6 +22,9 @@
- #ifdef HAVE_PWD_H
- #include <pwd.h>
- #endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- 
- #define STATUS_NOTFOUND 3
- #define STATUS_FATAL 4
---- config.h.in	2003-09-27 21:48:17.000000000 -0700
-+++ config.h.in	2006-06-09 16:25:43.000000000 -0700
-@@ -19,6 +19,9 @@
- /* Define to 1 if you have the `gethostname' function. */
- #undef HAVE_GETHOSTNAME
- 
-+/* Define to 1 if you have the `getpwuid' function. */
-+#undef HAVE_GETPWUID
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
- 
-@@ -31,6 +34,9 @@
- /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
- #undef HAVE_NDIR_H
- 
-+/* Define to 1 if you have the <pwd.h> header file. */
-+#undef HAVE_PWD_H
-+
- /* Define to 1 if you have the `realpath' function. */
- #undef HAVE_REALPATH
- 
-@@ -60,6 +66,9 @@
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
- 
-+/* 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. */
- #undef HAVE_SYS_TYPES_H
- 
-@@ -69,6 +78,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the `utimes' function. */
-+#undef HAVE_UTIMES
-+
- /* Define to 1 if you have the `vasprintf' function. */
- #undef HAVE_VASPRINTF
- 
---- configure.in	2004-09-13 03:38:30.000000000 -0700
-+++ configure.in	2006-06-09 16:25:15.541288184 -0700
-@@ -27,10 +27,11 @@
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
- 
--AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h)
-+AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h)
- 
- AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp)
- AC_CHECK_FUNCS(gethostname getpwuid)
-+AC_CHECK_FUNCS(utimes)
- 
- AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
-     AC_TRY_COMPILE(
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/12_cachesize_permissions.diff b/dependencies2013/win32/swig/CCache/debian/patches/12_cachesize_permissions.diff
deleted file mode 100644
index 28801b77..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/12_cachesize_permissions.diff
+++ /dev/null
@@ -1,83 +0,0 @@
---- stats.c	(révision 8804)
-+++ stats.c	(copie de travail)
-@@ -286,7 +286,7 @@
- 
- 
- /* set the per directory limits */
--void stats_set_limits(long maxfiles, long maxsize)
-+int stats_set_limits(long maxfiles, long maxsize)
- {
- 	int dir;
- 	unsigned counters[STATS_END];
-@@ -298,7 +298,9 @@
- 		maxsize /= 16;
- 	}
- 
--	create_dir(cache_dir);
-+	if (create_dir(cache_dir) != 0) {
-+		return 1;
-+	}
- 
- 	/* set the limits in each directory */
- 	for (dir=0;dir<=0xF;dir++) {
-@@ -306,7 +308,9 @@
- 		int fd;
- 
- 		x_asprintf(&cdir, "%s/%1x", cache_dir, dir);
--		create_dir(cdir);
-+		if (create_dir(cdir) != 0) {
-+			return 1;
-+		}
- 		x_asprintf(&fname, "%s/stats", cdir);
- 		free(cdir);
- 
-@@ -326,6 +330,8 @@
- 		}
- 		free(fname);
- 	}
-+
-+	return 0;
- }
- 
- /* set the per directory sizes */
---- ccache.c	(révision 8804)
-+++ ccache.c	(copie de travail)
-@@ -935,15 +934,23 @@
- 		case 'F':
- 			check_cache_dir();
- 			v = atoi(optarg);
--			stats_set_limits(v, -1);
--			printf("Set cache file limit to %u\n", (unsigned)v);
-+			if (stats_set_limits(v, -1) == 0) {
-+				printf("Set cache file limit to %u\n", (unsigned)v);
-+			} else {
-+				printf("Could not set cache file limit.\n");
-+				exit(1);
-+			}
- 			break;
- 
- 		case 'M':
- 			check_cache_dir();
- 			v = value_units(optarg);
--			stats_set_limits(-1, v);
--			printf("Set cache size limit to %uk\n", (unsigned)v);
-+			if (stats_set_limits(-1, v) == 0) {
-+				printf("Set cache size limit to %uk\n", (unsigned)v);
-+			} else {
-+				printf("Could not set cache size limit.\n");
-+				exit(1);
-+			}
- 			break;
- 
- 		default:
---- ccache.h	(révision 8804)
-+++ ccache.h	(copie de travail)
-@@ -101,7 +101,7 @@
- void stats_summary(void);
- void stats_tocache(size_t size);
- void stats_read(const char *stats_file, unsigned counters[STATS_END]);
--void stats_set_limits(long maxfiles, long maxsize);
-+int stats_set_limits(long maxfiles, long maxsize);
- size_t value_units(const char *s);
- void display_size(unsigned v);
- void stats_set_sizes(const char *dir, size_t num_files, size_t total_size);
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/13_html_links.diff b/dependencies2013/win32/swig/CCache/debian/patches/13_html_links.diff
deleted file mode 100644
index dadf1b6c..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/13_html_links.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- web/index.html~	2004-09-13 13:38:30.000000000 +0300
-+++ web/index.html	2004-09-26 01:04:38.458008118 +0300
-@@ -29,10 +29,10 @@
- <li>fixed handling of HOME environment variable
- </ul>
- 
--See the <a href="/ccache/ccache-man.html">manual page</a> for details
-+See the <a href="ccache-man.html">manual page</a> for details
- on the new options.<p>
- 
--You can get this release from the <a href="/ftp/ccache/">download directory</a> 
-+You can get this release from the <a href="http://ccache.samba.org/ftp/ccache/">download directory</a> 
- 
- <p>NOTE! This release changes the hash input slighly, so you will
- probably find that you will not get any hits against your existing
-@@ -87,7 +87,7 @@
- 
- <h2>Documentation</h2>
- 
--See the <a href="/ccache/ccache-man.html">manual page</a>
-+See the <a href="ccache-man.html">manual page</a>
- 
- 
- <h2>Performance</h2>
-@@ -116,7 +116,7 @@
- <h2>Download</h2>
- 
- You can download the latest release from the <a
--href="/ftp/ccache/">download directory</a>.<p>
-+href="http://ccache.samba.org/ftp/ccache/">download directory</a>.<p>
- 
- For the bleeding edge, you can fetch ccache via CVS or
- rsync. To fetch via cvs use the following command:
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/14_hardlink_doc.diff b/dependencies2013/win32/swig/CCache/debian/patches/14_hardlink_doc.diff
deleted file mode 100644
index bd9e25ba..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/14_hardlink_doc.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: ccache.1
-===================================================================
-RCS file: /cvsroot/ccache/ccache.1,v
-retrieving revision 1.26
-diff -u -r1.26 ccache.1
---- ccache.1	24 Nov 2005 21:10:08 -0000	1.26
-+++ ccache.1	21 Jul 2007 21:03:32 -0000
-@@ -330,7 +330,7 @@
- .IP o 
- Use the same \fBCCACHE_DIR\fP environment variable setting
- .IP o 
--Set the \fBCCACHE_NOLINK\fP environment variable
-+Unset the \fBCCACHE_HARDLINK\fP environment variable
- .IP o 
- Make sure everyone sets the CCACHE_UMASK environment variable
- to 002, this ensures that cached files are accessible to everyone in
-Index: ccache.yo
-===================================================================
-RCS file: /cvsroot/ccache/ccache.yo,v
-retrieving revision 1.27
-diff -u -r1.27 ccache.yo
---- ccache.yo	24 Nov 2005 21:54:09 -0000	1.27
-+++ ccache.yo	21 Jul 2007 21:03:32 -0000
-@@ -289,7 +289,7 @@
- 
- itemize(
-   it() Use the same bf(CCACHE_DIR) environment variable setting
--  it() Set the bf(CCACHE_NOLINK) environment variable
-+  it() Unset the bf(CCACHE_HARDLINK) environment variable
-   it() Make sure everyone sets the CCACHE_UMASK environment variable
-   to 002, this ensures that cached files are accessible to everyone in
-   the group.
-Index: web/ccache-man.html
-===================================================================
-RCS file: /cvsroot/ccache/web/ccache-man.html,v
-retrieving revision 1.25
-diff -u -r1.25 ccache-man.html
---- web/ccache-man.html	13 Sep 2004 10:38:17 -0000	1.25
-+++ web/ccache-man.html	21 Jul 2007 21:03:32 -0000
-@@ -256,7 +256,7 @@
- following conditions need to be met:
- <p><ul>
-   <li > Use the same <strong>CCACHE_DIR</strong> environment variable setting
--  <li > Set the <strong>CCACHE_NOLINK</strong> environment variable
-+  <li > Unset the <strong>CCACHE_HARDLINK</strong> environment variable
-   <li > Make sure everyone sets the CCACHE_UMASK environment variable
-   to 002, this ensures that cached files are accessible to everyone in
-   the group.
diff --git a/dependencies2013/win32/swig/CCache/debian/patches/CREDITS b/dependencies2013/win32/swig/CCache/debian/patches/CREDITS
deleted file mode 100644
index c4e323b7..00000000
--- a/dependencies2013/win32/swig/CCache/debian/patches/CREDITS
+++ /dev/null
@@ -1,47 +0,0 @@
-01_no_home.diff:
-  Francois Marier <francois@debian.org>
-  Made especially for the Debian package.
-
-02_ccache_compressed.diff:
-  Lars Gust�bel <lars@gustaebel.de>
-  http://www.gustaebel.de/lars/ccache/ (downloaded on 2007-05-20)
-
-03_long_options.diff:
-  Francois Marier <francois@debian.org>
-  Made especially for the Debian package.
-
-04_ignore_profile.diff:
-  Ted Percival <ted@midg3t.net>
-  http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=20;filename=ccache-profile.patch;att=1;bug=215849
-
-05_nfs_fix.diff:
-  John Coiner <john.coiner@amd.com>
-  http://lists.samba.org/archive/ccache/2007q1/000265.html
-
-06_md.diff:
-  Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  http://darkircop.org/ccache/ccache-2.4-md.patch (downloaded on 2007-06-30)
-
-07_cachedirtag.diff:
-  Karl Chen <quarl@cs.berkeley.edu>
-  http://lists.samba.org/archive/ccache/2008q1/000316.html (downloaded on 2008-02-02)
-
-08_manpage_hyphens.diff:
-  Francois Marier <francois@debian.org>
-  Made especially for the Debian package.
-
-09_respect_ldflags.diff:
-  Lisa Seelye <lisa@gentoo.org>
-  http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ccache/files/ccache-2.4-respectflags.patch?rev=1.1&view=markup
-
-10_lru_cleanup.diff:
-  RW <fbsd06@mlists.homeunix.com>
-  http://lists.samba.org/archive/ccache/2008q2/000339.html (downloaded on 2008-04-11)
-
-11_utimes.diff:
-  Robin H. Johnson <robbat2@gentoo.org>
-  http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ccache/files/ccache-2.4-utimes.patch?rev=1.1&view=markup
-
-12_cachesize_permissions.diff:
-  Francois Marier <francois@debian.org>
-  Made especially for the Debian package to fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=332527
diff --git a/dependencies2013/win32/swig/CCache/debian/rules b/dependencies2013/win32/swig/CCache/debian/rules
deleted file mode 100644
index c5b538b7..00000000
--- a/dependencies2013/win32/swig/CCache/debian/rules
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-        confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-        confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
-	dh_testdir
-
-        # Apply Debian specific patches
-	cp $(CURDIR)/ccache.c $(CURDIR)/ccache.c.unpatched
-	cp $(CURDIR)/util.c $(CURDIR)/util.c.unpatched
-	cp $(CURDIR)/ccache.1 $(CURDIR)/ccache.1.unpatched
-	cp $(CURDIR)/ccache.h $(CURDIR)/ccache.h.unpatched
-	cp $(CURDIR)/ccache.yo $(CURDIR)/ccache.yo.unpatched
-	cp $(CURDIR)/config.h.in $(CURDIR)/config.h.in.unpatched
-	cp $(CURDIR)/configure $(CURDIR)/configure.unpatched
-	cp $(CURDIR)/configure.in $(CURDIR)/configure.in.unpatched
-	cp $(CURDIR)/Makefile.in $(CURDIR)/Makefile.in.unpatched
-	if test ! -f patch-stamp; then \
-		for patch in $(CURDIR)/debian/patches/*.diff ;\
-		do \
-			echo APPLYING PATCH\: $${patch##*/};\
-			patch -p0 < $$patch ;\
-		done ;\
-		touch patch-stamp ;\
-	fi
-	chmod +x $(CURDIR)/manage-cache.sh
-
-	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Unapply patches
-	-test -r $(CURDIR)/ccache.c.unpatched && mv $(CURDIR)/ccache.c.unpatched $(CURDIR)/ccache.c
-	-test -r $(CURDIR)/util.c.unpatched && mv $(CURDIR)/util.c.unpatched $(CURDIR)/util.c
-	-test -r $(CURDIR)/ccache.1.unpatched && mv $(CURDIR)/ccache.1.unpatched $(CURDIR)/ccache.1
-	-test -r $(CURDIR)/ccache.h.unpatched && mv $(CURDIR)/ccache.h.unpatched $(CURDIR)/ccache.h
-	-test -r $(CURDIR)/ccache.yo.unpatched && mv $(CURDIR)/ccache.yo.unpatched $(CURDIR)/ccache.yo
-	-test -r $(CURDIR)/config.h.in.unpatched && mv $(CURDIR)/config.h.in.unpatched $(CURDIR)/config.h.in
-	-test -r $(CURDIR)/configure.unpatched && mv $(CURDIR)/configure.unpatched $(CURDIR)/configure
-	-test -r $(CURDIR)/configure.in.unpatched && mv $(CURDIR)/configure.in.unpatched $(CURDIR)/configure.in
-	-test -r $(CURDIR)/Makefile.in.unpatched && mv $(CURDIR)/Makefile.in.unpatched $(CURDIR)/Makefile.in
-	-rm -f $(CURDIR)/manage-cache.sh
-	-rm -f patch-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-	# Update config.sub and config.guess
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess config.guess
-
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/ccache.
-	$(MAKE) install prefix=$(CURDIR)/debian/ccache/usr
-
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-gcc
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-g++
-	set -e; for ver in 2.95 3.0 3.2 3.3 3.4 4.0 4.1 4.2 4.3; do \
-		ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-gcc-$$ver; \
-		ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/gcc-$$ver; \
-		ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-g++-$$ver; \
-		ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/g++-$$ver; \
-	done
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/cc
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/c++
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/gcc
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/g++
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-c++
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-cc
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-g++
-	ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-gcc
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/dependencies2013/win32/swig/CCache/debian/update-ccache b/dependencies2013/win32/swig/CCache/debian/update-ccache
deleted file mode 100644
index 0ef97a14..00000000
--- a/dependencies2013/win32/swig/CCache/debian/update-ccache
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Update compiler links to ccache (in /usr/local/bin)
-#
-# The idea is that /usr/local/bin is ahead of /usr/bin in your PATH, so adding
-# the link /usr/local/bin/cc -> /usr/bin/ccache means that it is run instead of
-# /usr/bin/cc
-#
-# Written by: Behan Webster <behanw@websterwood.com>
-#
-
-DIRECTORY=/usr/local/bin
-CCACHE=/usr/bin/ccache
-CCDIR=/usr/lib/ccache
-
-usage() {
-    echo "Usage: `basename $0` [--directory <dir>] [--remove]"
-    exit 0
-}
-
-while [ $# -gt 0 ] ; do
-    case "$1" in
-        -d*|--d*|--directory) DIRECTORY=$2; shift; shift;;
-        -h*|--h*|--help) usage;;
-        -r*|--r*|--remove) REMOVE=1; shift;;
-        -t*|--t*|--test) TEST=echo; shift;;
-    esac
-done
-
-for FILE in `cd $CCDIR; ls` ; do
-    LINK=$DIRECTORY/$FILE
-    if [ -z "$REMOVE" ] ; then
-        # Add link
-        $TEST ln -fs $CCACHE $LINK
-    else
-        # Remove link
-        if [ -L "$LINK" ] ; then
-            $TEST rm -f $LINK
-        fi
-    fi
-done
-
-# vim: sw=4 ts=4
diff --git a/dependencies2013/win32/swig/CCache/debian/watch b/dependencies2013/win32/swig/CCache/debian/watch
deleted file mode 100644
index a72959e5..00000000
--- a/dependencies2013/win32/swig/CCache/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=2
-http://samba.org/ftp/ccache/ccache-(.*)\.tar\.gz
diff --git a/dependencies2013/win32/swig/CCache/execute.c b/dependencies2013/win32/swig/CCache/execute.c
deleted file mode 100644
index 6df025e9..00000000
--- a/dependencies2013/win32/swig/CCache/execute.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "ccache.h"
-
-#ifdef _WIN32
-char *argvtos(char **argv)
-{
-	int i, len;
-	char *ptr, *str;
-
-	for (i = 0, len = 0; argv[i]; i++) {
-		len += strlen(argv[i]) + 3;
-	}
-
-	str = ptr = (char *)malloc(len + 1);
-	if (str == NULL)
-		return NULL;
-
-	for (i = 0; argv[i]; i++) {
-		len = strlen(argv[i]);
-		*ptr++ = '"';
-		memcpy(ptr, argv[i], len);
-		ptr += len;
-		*ptr++ = '"';
-		*ptr++ = ' ';
-	}
-	*ptr = 0;
-
-	return str;
-}
-#endif
-
-/*
-  execute a compiler backend, capturing all output to the given paths
-  the full path to the compiler to run is in argv[0]
-*/
-int execute(char **argv, 
-	    const char *path_stdout,
-	    const char *path_stderr)
-{
-#ifdef _WIN32
-
-#if 1
-	PROCESS_INFORMATION pinfo; 
-	STARTUPINFO sinfo;
-	BOOL ret; 
-	DWORD exitcode;
-	char *args;
-	HANDLE fd_out, fd_err;
-	SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
-
-	/* TODO: needs moving after possible exit() below, but before stdout is redirected */
-	if (ccache_verbose) {
-		display_execute_args(argv);
-	}
-
-	fd_out = CreateFile(path_stdout, GENERIC_WRITE, 0, &sa, CREATE_ALWAYS,
-                            FILE_ATTRIBUTE_NORMAL, NULL);
-	if (fd_out == INVALID_HANDLE_VALUE) {
-		return STATUS_NOCACHE;
-	}
-
-	fd_err = CreateFile(path_stderr, GENERIC_WRITE, 0, &sa, CREATE_ALWAYS,
-                            FILE_ATTRIBUTE_NORMAL, NULL);
-	if (fd_err == INVALID_HANDLE_VALUE) {
-		return STATUS_NOCACHE;
-	}
-   
-	ZeroMemory(&pinfo, sizeof(PROCESS_INFORMATION));
-	ZeroMemory(&sinfo, sizeof(STARTUPINFO));
-
-	sinfo.cb = sizeof(STARTUPINFO); 
-	sinfo.hStdError = fd_err;
-	sinfo.hStdOutput = fd_out;
-	sinfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-	sinfo.dwFlags |= STARTF_USESTDHANDLES;
- 
-	args = argvtos(argv);
-
-	ret = CreateProcessA(argv[0], args, NULL, NULL, TRUE, 0, NULL, NULL,
-	                     &sinfo, &pinfo);
-
-	free(args);
-	CloseHandle(fd_out);
-	CloseHandle(fd_err);
-
-	if (ret == 0)
-		return -1;
-
-	WaitForSingleObject(pinfo.hProcess, INFINITE);
-	GetExitCodeProcess(pinfo.hProcess, &exitcode);
-	CloseHandle(pinfo.hProcess);
-	CloseHandle(pinfo.hThread);
-
-	return exitcode;
-#else /* possibly slightly faster */
-	/* needs fixing to quote commandline options to handle spaces in CCACHE_DIR etc */
-	int   status = -2;
-	int   fd, std_od = -1, std_ed = -1;
-
-	/* TODO: needs moving after possible exit() below, but before stdout is redirected */
-	if (ccache_verbose) {
-		display_execute_args(argv);
-	}
-
-	unlink(path_stdout);
-	std_od = _dup(1);
-	fd = _open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
-	if (fd == -1) {
-		exit(STATUS_NOCACHE);
-	}
-	_dup2(fd, 1);
-	_close(fd);
-
-	unlink(path_stderr);
-	fd = _open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
-	std_ed = _dup(2);
-	if (fd == -1) {
-		exit(STATUS_NOCACHE);
-	}
-	_dup2(fd, 2);
-	_close(fd);
-
-	/* Spawn process (_exec* familly doesn't return) */
-	status = _spawnv(_P_WAIT, argv[0], (const char **)argv);
-
-	/* Restore descriptors */
-	if (std_od != -1) _dup2(std_od, 1);
-	if (std_ed != -1) _dup2(std_ed, 2);
-	_flushall();
-
-	return (status>0);
-
-#endif
-
-#else
-	pid_t pid;
-	int status;
-
-	pid = fork();
-	if (pid == -1) fatal("Failed to fork");
-	
-	if (pid == 0) {
-		int fd;
-
-		/* TODO: needs moving after possible exit() below, but before stdout is redirected */
-		if (ccache_verbose) {
-			display_execute_args(argv);
-		}
-
-		unlink(path_stdout);
-		fd = open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
-		if (fd == -1) {
-			exit(STATUS_NOCACHE);
-		}
-		dup2(fd, 1);
-		close(fd);
-
-		unlink(path_stderr);
-		fd = open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
-		if (fd == -1) {
-			exit(STATUS_NOCACHE);
-		}
-		dup2(fd, 2);
-		close(fd);
-
-		exit(execv(argv[0], argv));
-	}
-
-	if (waitpid(pid, &status, 0) != pid) {
-		fatal("waitpid failed");
-	}
-
-	if (WEXITSTATUS(status) == 0 && WIFSIGNALED(status)) {
-		return -1;
-	}
-
-	return WEXITSTATUS(status);
-#endif
-}
-
-
-/*
-  find an executable by name in $PATH. Exclude any that are links to exclude_name 
-*/
-char *find_executable(const char *name, const char *exclude_name)
-{
-#if _WIN32
-	(void)exclude_name;
-	DWORD ret;
-	char namebuf[MAX_PATH];
-
-	ret = SearchPathA(getenv("CCACHE_PATH"), name, ".exe",
-			  sizeof(namebuf), namebuf, NULL);
-	if (ret != 0) {
-		return x_strdup(namebuf);
-	}
-
-	return NULL;
-#else
-	char *path;
-	char *tok;
-	struct stat st1, st2;
-
-	if (*name == '/') {
-		return x_strdup(name);
-	}
-
-	path = getenv("CCACHE_PATH");
-	if (!path) {
-		path = getenv("PATH");
-	}
-	if (!path) {
-		cc_log("no PATH variable!?\n");
-		stats_update(STATS_ENVIRONMMENT);
-		return NULL;
-	}
-
-	path = x_strdup(path);
-	
-	/* search the path looking for the first compiler of the right name
-	   that isn't us */
-	for (tok=strtok(path,":"); tok; tok = strtok(NULL, ":")) {
-		char *fname;
-		x_asprintf(&fname, "%s/%s", tok, name);
-		/* look for a normal executable file */
-		if (access(fname, X_OK) == 0 &&
-		    lstat(fname, &st1) == 0 &&
-		    stat(fname, &st2) == 0 &&
-		    S_ISREG(st2.st_mode)) {
-			/* if its a symlink then ensure it doesn't
-                           point at something called exclude_name */
-			if (S_ISLNK(st1.st_mode)) {
-				char *buf = x_realpath(fname);
-				if (buf) {
-					char *p = str_basename(buf);
-					if (strcmp(p, exclude_name) == 0) {
-						/* its a link to "ccache" ! */
-						free(p);
-						free(buf);
-						continue;
-					}
-					free(buf);
-					free(p);
-				}
-			}
-
-			/* found it! */
-			free(path);
-			return fname;
-		}
-		free(fname);
-	}
-	free(path);
-
-	return NULL;
-#endif
-}
-
-void display_execute_args(char **argv)
-{
-	if (argv) {
-		printf("ccache executing: ");
-		while (*argv) {
-			printf("%s ", *argv);
-			++argv;
-		}
-		printf("\n");
-		fflush(stdout);
-	}
-}
diff --git a/dependencies2013/win32/swig/CCache/hash.c b/dependencies2013/win32/swig/CCache/hash.c
deleted file mode 100644
index d0ce8a6b..00000000
--- a/dependencies2013/win32/swig/CCache/hash.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-  simple front-end functions to mdfour code
-*/
-
-#include "ccache.h"
-
-static struct mdfour md;
-
-void hash_buffer(const char *s, int len)
-{
-	mdfour_update(&md, (unsigned char *)s, len);
-}
-
-void hash_start(void)
-{
-	mdfour_begin(&md);
-}
-
-void hash_string(const char *s)
-{
-	hash_buffer(s, strlen(s));
-}
-
-void hash_int(int x)
-{
-	hash_buffer((char *)&x, sizeof(x));
-}
-
-/* add contents of a file to the hash */
-void hash_file(const char *fname)
-{
-	char buf[1024];
-	int fd, n;
-
-	fd = open(fname, O_RDONLY|O_BINARY);
-	if (fd == -1) {
-		cc_log("Failed to open %s\n", fname);
-		fatal("hash_file");
-	}
-
-	while ((n = read(fd, buf, sizeof(buf))) > 0) {
-		hash_buffer(buf, n);
-	}
-	close(fd);
-}
-
-/* return the hash result as a static string */
-char *hash_result(void)
-{
-	unsigned char sum[16];
-	static char ret[53];
-	int i;
-
-	hash_buffer(NULL, 0);
-	mdfour_result(&md, sum);
-	
-	for (i=0;i<16;i++) {
-		sprintf(&ret[i*2], "%02x", (unsigned)sum[i]);
-	}
-	sprintf(&ret[i*2], "-%u", (unsigned)md.totalN);
-
-	return ret;
-}
diff --git a/dependencies2013/win32/swig/CCache/mdfour.c b/dependencies2013/win32/swig/CCache/mdfour.c
deleted file mode 100644
index b098e021..00000000
--- a/dependencies2013/win32/swig/CCache/mdfour.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* 
-   a implementation of MD4 designed for use in the SMB authentication protocol
-   Copyright (C) Andrew Tridgell 1997-1998.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "ccache.h"
-
-/* NOTE: This code makes no attempt to be fast! 
-
-   It assumes that a int is at least 32 bits long
-*/
-
-static struct mdfour *m;
-
-#define MASK32 (0xffffffff)
-
-#define F(X,Y,Z) ((((X)&(Y)) | ((~(X))&(Z))))
-#define G(X,Y,Z) ((((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z))))
-#define H(X,Y,Z) (((X)^(Y)^(Z)))
-#define lshift(x,s) (((((x)<<(s))&MASK32) | (((x)>>(32-(s)))&MASK32)))
-
-#define ROUND1(a,b,c,d,k,s) a = lshift((a + F(b,c,d) + M[k])&MASK32, s)
-#define ROUND2(a,b,c,d,k,s) a = lshift((a + G(b,c,d) + M[k] + 0x5A827999)&MASK32,s)
-#define ROUND3(a,b,c,d,k,s) a = lshift((a + H(b,c,d) + M[k] + 0x6ED9EBA1)&MASK32,s)
-
-/* this applies md4 to 64 byte chunks */
-static void mdfour64(uint32 *M)
-{
-	uint32 AA, BB, CC, DD;
-	uint32 A,B,C,D;
-
-	A = m->A; B = m->B; C = m->C; D = m->D; 
-	AA = A; BB = B; CC = C; DD = D;
-
-        ROUND1(A,B,C,D,  0,  3);  ROUND1(D,A,B,C,  1,  7);  
-	ROUND1(C,D,A,B,  2, 11);  ROUND1(B,C,D,A,  3, 19);
-        ROUND1(A,B,C,D,  4,  3);  ROUND1(D,A,B,C,  5,  7);  
-	ROUND1(C,D,A,B,  6, 11);  ROUND1(B,C,D,A,  7, 19);
-        ROUND1(A,B,C,D,  8,  3);  ROUND1(D,A,B,C,  9,  7);  
-	ROUND1(C,D,A,B, 10, 11);  ROUND1(B,C,D,A, 11, 19);
-        ROUND1(A,B,C,D, 12,  3);  ROUND1(D,A,B,C, 13,  7);  
-	ROUND1(C,D,A,B, 14, 11);  ROUND1(B,C,D,A, 15, 19);	
-
-
-        ROUND2(A,B,C,D,  0,  3);  ROUND2(D,A,B,C,  4,  5);  
-	ROUND2(C,D,A,B,  8,  9);  ROUND2(B,C,D,A, 12, 13);
-        ROUND2(A,B,C,D,  1,  3);  ROUND2(D,A,B,C,  5,  5);  
-	ROUND2(C,D,A,B,  9,  9);  ROUND2(B,C,D,A, 13, 13);
-        ROUND2(A,B,C,D,  2,  3);  ROUND2(D,A,B,C,  6,  5);  
-	ROUND2(C,D,A,B, 10,  9);  ROUND2(B,C,D,A, 14, 13);
-        ROUND2(A,B,C,D,  3,  3);  ROUND2(D,A,B,C,  7,  5);  
-	ROUND2(C,D,A,B, 11,  9);  ROUND2(B,C,D,A, 15, 13);
-
-	ROUND3(A,B,C,D,  0,  3);  ROUND3(D,A,B,C,  8,  9);  
-	ROUND3(C,D,A,B,  4, 11);  ROUND3(B,C,D,A, 12, 15);
-        ROUND3(A,B,C,D,  2,  3);  ROUND3(D,A,B,C, 10,  9);  
-	ROUND3(C,D,A,B,  6, 11);  ROUND3(B,C,D,A, 14, 15);
-        ROUND3(A,B,C,D,  1,  3);  ROUND3(D,A,B,C,  9,  9);  
-	ROUND3(C,D,A,B,  5, 11);  ROUND3(B,C,D,A, 13, 15);
-        ROUND3(A,B,C,D,  3,  3);  ROUND3(D,A,B,C, 11,  9);  
-	ROUND3(C,D,A,B,  7, 11);  ROUND3(B,C,D,A, 15, 15);
-
-	A += AA; B += BB; 
-	C += CC; D += DD;
-	
-	A &= MASK32; B &= MASK32; 
-	C &= MASK32; D &= MASK32;
-
-	m->A = A; m->B = B; m->C = C; m->D = D;
-}
-
-static void copy64(uint32 *M, const unsigned char *in)
-{
-	int i;
-
-	for (i=0;i<16;i++)
-		M[i] = (in[i*4+3]<<24) | (in[i*4+2]<<16) |
-			(in[i*4+1]<<8) | (in[i*4+0]<<0);
-}
-
-static void copy4(unsigned char *out,uint32 x)
-{
-	out[0] = x&0xFF;
-	out[1] = (x>>8)&0xFF;
-	out[2] = (x>>16)&0xFF;
-	out[3] = (x>>24)&0xFF;
-}
-
-void mdfour_begin(struct mdfour *md)
-{
-	md->A = 0x67452301;
-	md->B = 0xefcdab89;
-	md->C = 0x98badcfe;
-	md->D = 0x10325476;
-	md->totalN = 0;
-	md->tail_len = 0;
-}
-
-
-static void mdfour_tail(const unsigned char *in, int n)
-{
-	unsigned char buf[128];
-	uint32 M[16];
-	uint32 b;
-
-	m->totalN += n;
-
-	b = m->totalN * 8;
-
-	memset(buf, 0, 128);
-	if (n) memcpy(buf, in, n);
-	buf[n] = 0x80;
-
-	if (n <= 55) {
-		copy4(buf+56, b);
-		copy64(M, buf);
-		mdfour64(M);
-	} else {
-		copy4(buf+120, b); 
-		copy64(M, buf);
-		mdfour64(M);
-		copy64(M, buf+64);
-		mdfour64(M);
-	}
-}
-
-void mdfour_update(struct mdfour *md, const unsigned char *in, int n)
-{
-	uint32 M[16];
-
-	m = md;
-
-	if (in == NULL) {
-		mdfour_tail(md->tail, md->tail_len);
-		return;
-	}
-
-	if (md->tail_len) {
-		int len = 64 - md->tail_len;
-		if (len > n) len = n;
-		memcpy(md->tail+md->tail_len, in, len);
-		md->tail_len += len;
-		n -= len;
-		in += len;
-		if (md->tail_len == 64) {
-			copy64(M, md->tail);
-			mdfour64(M);
-			m->totalN += 64;
-			md->tail_len = 0;
-		}
-	}
-
-	while (n >= 64) {
-		copy64(M, in);
-		mdfour64(M);
-		in += 64;
-		n -= 64;
-		m->totalN += 64;
-	}
-
-	if (n) {
-		memcpy(md->tail, in, n);
-		md->tail_len = n;
-	}
-}
-
-
-void mdfour_result(struct mdfour *md, unsigned char *out)
-{
-	m = md;
-
-	copy4(out, m->A);
-	copy4(out+4, m->B);
-	copy4(out+8, m->C);
-	copy4(out+12, m->D);
-}
-
-
-void mdfour(unsigned char *out, const unsigned char *in, int n)
-{
-	struct mdfour md;
-	mdfour_begin(&md);
-	mdfour_update(&md, in, n);
-	mdfour_update(&md, NULL, 0);
-	mdfour_result(&md, out);
-}
-
-#ifdef TEST_MDFOUR
-static void file_checksum1(char *fname)
-{
-	int fd, i;
-	struct mdfour md;
-	unsigned char buf[1024], sum[16];
-	unsigned chunk;
-	
-	fd = open(fname,O_RDONLY|O_BINARY);
-	if (fd == -1) {
-		perror("fname");
-		exit(1);
-	}
-
-	chunk = 1 + random() % (sizeof(buf) - 1);
-	
-	mdfour_begin(&md);
-
-	while (1) {
-		int n = read(fd, buf, chunk);
-		if (n >= 0) {
-			mdfour_update(&md, buf, n);
-		}
-		if (n < chunk) break;
-	}
-
-	close(fd);
-
-	mdfour_update(&md, NULL, 0);
-
-	mdfour_result(&md, sum);
-
-	for (i=0;i<16;i++)
-		printf("%02x", sum[i]);
-	printf("\n");
-}
-
-#if 0
-#include "../md4.h"
-
-static void file_checksum2(char *fname)
-{
-	int fd, i;
-	MDstruct md;
-	unsigned char buf[64], sum[16];
-
-	fd = open(fname,O_RDONLY|O_BINARY);
-	if (fd == -1) {
-		perror("fname");
-		exit(1);
-	}
-	
-	MDbegin(&md);
-
-	while (1) {
-		int n = read(fd, buf, sizeof(buf));
-		if (n <= 0) break;
-		MDupdate(&md, buf, n*8);
-	}
-
-	if (!md.done) {
-		MDupdate(&md, buf, 0);
-	}
-
-	close(fd);
-
-	memcpy(sum, md.buffer, 16);
-
-	for (i=0;i<16;i++)
-		printf("%02x", sum[i]);
-	printf("\n");
-}
-#endif
-
- int main(int argc, char *argv[])
-{
-	file_checksum1(argv[1]);
-#if 0
-	file_checksum2(argv[1]);
-#endif
-	return 0;
-}
-#endif
diff --git a/dependencies2013/win32/swig/CCache/mdfour.h b/dependencies2013/win32/swig/CCache/mdfour.h
deleted file mode 100644
index 92ef2f83..00000000
--- a/dependencies2013/win32/swig/CCache/mdfour.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
-   a implementation of MD4 designed for use in the SMB authentication protocol
-   Copyright (C) Andrew Tridgell 1997-1998.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-struct mdfour {
-	uint32 A, B, C, D;
-	uint32 totalN;
-	unsigned char tail[64];
-	unsigned tail_len;	
-};
-
-void mdfour_begin(struct mdfour *md);
-void mdfour_update(struct mdfour *md, const unsigned char *in, int n);
-void mdfour_result(struct mdfour *md, unsigned char *out);
-void mdfour(unsigned char *out, const unsigned char *in, int n);
-
-
-
-
diff --git a/dependencies2013/win32/swig/CCache/packaging/README b/dependencies2013/win32/swig/CCache/packaging/README
deleted file mode 100644
index fadc342c..00000000
--- a/dependencies2013/win32/swig/CCache/packaging/README
+++ /dev/null
@@ -1,5 +0,0 @@
-These packaging files are contributd by users of ccache. I do not
-maintain them, and they may well need updating before you use them.
-
-I don't distribute binary packages of ccache myself, but if you wish
-to add ccache to a distribution then that's OK
diff --git a/dependencies2013/win32/swig/CCache/packaging/ccache.spec b/dependencies2013/win32/swig/CCache/packaging/ccache.spec
deleted file mode 100644
index 0972121d..00000000
--- a/dependencies2013/win32/swig/CCache/packaging/ccache.spec
+++ /dev/null
@@ -1,37 +0,0 @@
-Summary: Compiler Cache
-Name: ccache
-Version: 2.3
-Release: 1
-Group: Development/Languages
-License: GPL
-URL: http://ccache.samba.org/
-Source: ccache-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-ccache caches gcc output files
-
-%prep
-%setup -q
-
-%build
-%configure
-make
-
-install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 ccache $RPM_BUILD_ROOT%{_bindir}
-install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0644 ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-%files
-%defattr(-,root,root)
-%doc README
-%{_mandir}/man1/ccache.1*
-%{_bindir}/ccache
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%changelog
-* Mon Apr 01 2002 Peter Jones <pjones@redhat.com>
-- Created the package
diff --git a/dependencies2013/win32/swig/CCache/snprintf.c b/dependencies2013/win32/swig/CCache/snprintf.c
deleted file mode 100644
index 32187c1a..00000000
--- a/dependencies2013/win32/swig/CCache/snprintf.c
+++ /dev/null
@@ -1,962 +0,0 @@
-/*
- * Copyright Patrick Powell 1995
- * This code is based on code written by Patrick Powell (papowell@astart.com)
- * It may be used for any purpose as long as this notice remains intact
- * on all source code distributions
- */
-
-/**************************************************************
- * Original:
- * Patrick Powell Tue Apr 11 09:48:21 PDT 1995
- * A bombproof version of doprnt (dopr) included.
- * Sigh.  This sort of thing is always nasty do deal with.  Note that
- * the version here does not include floating point...
- *
- * snprintf() is used instead of sprintf() as it does limit checks
- * for string length.  This covers a nasty loophole.
- *
- * The other functions are there to prevent NULL pointers from
- * causing nast effects.
- *
- * More Recently:
- *  Brandon Long <blong@fiction.net> 9/15/96 for mutt 0.43
- *  This was ugly.  It is still ugly.  I opted out of floating point
- *  numbers, but the formatter understands just about everything
- *  from the normal C string format, at least as far as I can tell from
- *  the Solaris 2.5 printf(3S) man page.
- *
- *  Brandon Long <blong@fiction.net> 10/22/97 for mutt 0.87.1
- *    Ok, added some minimal floating point support, which means this
- *    probably requires libm on most operating systems.  Don't yet
- *    support the exponent (e,E) and sigfig (g,G).  Also, fmtint()
- *    was pretty badly broken, it just wasn't being exercised in ways
- *    which showed it, so that's been fixed.  Also, formated the code
- *    to mutt conventions, and removed dead code left over from the
- *    original.  Also, there is now a builtin-test, just compile with:
- *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
- *    and run snprintf for results.
- * 
- *  Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
- *    The PGP code was using unsigned hexadecimal formats. 
- *    Unfortunately, unsigned formats simply didn't work.
- *
- *  Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
- *    The original code assumed that both snprintf() and vsnprintf() were
- *    missing.  Some systems only have snprintf() but not vsnprintf(), so
- *    the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
- *
- *  Andrew Tridgell (tridge@samba.org) Oct 1998
- *    fixed handling of %.0f
- *    added test for HAVE_LONG_DOUBLE
- *
- * tridge@samba.org, idra@samba.org, April 2001
- *    got rid of fcvt code (twas buggy and made testing harder)
- *    added C99 semantics
- *
- **************************************************************/
-
-#ifndef NO_CONFIG_H /* for some tests */
-#include "config.h"
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#include <sys/types.h>
-#include <stdarg.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) && defined(HAVE_C99_VSNPRINTF)
-/* only include stdio.h if we are not re-defining snprintf or vsnprintf */
-#include <stdio.h>
- /* make the compiler happy with an empty file */
- void dummy_snprintf(void) {} 
-#else
-
-#ifdef HAVE_LONG_DOUBLE
-#define LDOUBLE long double
-#else
-#define LDOUBLE double
-#endif
-
-#ifdef HAVE_LONG_LONG
-#define LLONG long long
-#else
-#define LLONG long
-#endif
-
-static size_t dopr(char *buffer, size_t maxlen, const char *format, 
-		   va_list args);
-static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
-		    char *value, int flags, int min, int max);
-static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
-		    long value, int base, int min, int max, int flags);
-static void fmtfp(char *buffer, size_t *currlen, size_t maxlen,
-		   LDOUBLE fvalue, int min, int max, int flags);
-static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
-
-/*
- * dopr(): poor man's version of doprintf
- */
-
-/* format read states */
-#define DP_S_DEFAULT 0
-#define DP_S_FLAGS   1
-#define DP_S_MIN     2
-#define DP_S_DOT     3
-#define DP_S_MAX     4
-#define DP_S_MOD     5
-#define DP_S_CONV    6
-#define DP_S_DONE    7
-
-/* format flags - Bits */
-#define DP_F_MINUS 	(1 << 0)
-#define DP_F_PLUS  	(1 << 1)
-#define DP_F_SPACE 	(1 << 2)
-#define DP_F_NUM   	(1 << 3)
-#define DP_F_ZERO  	(1 << 4)
-#define DP_F_UP    	(1 << 5)
-#define DP_F_UNSIGNED 	(1 << 6)
-
-/* Conversion Flags */
-#define DP_C_SHORT   1
-#define DP_C_LONG    2
-#define DP_C_LDOUBLE 3
-#define DP_C_LLONG   4
-
-#define char_to_int(p) ((p)- '0')
-#ifndef MAX
-#define MAX(p,q) (((p) >= (q)) ? (p) : (q))
-#endif
-
-static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args)
-{
-	char ch;
-	LLONG value;
-	LDOUBLE fvalue;
-	char *strvalue;
-	int min;
-	int max;
-	int state;
-	int flags;
-	int cflags;
-	size_t currlen;
-	
-	state = DP_S_DEFAULT;
-	currlen = flags = cflags = min = 0;
-	max = -1;
-	ch = *format++;
-	
-	while (state != DP_S_DONE) {
-		if (ch == '\0') 
-			state = DP_S_DONE;
-
-		switch(state) {
-		case DP_S_DEFAULT:
-			if (ch == '%') 
-				state = DP_S_FLAGS;
-			else 
-				dopr_outch (buffer, &currlen, maxlen, ch);
-			ch = *format++;
-			break;
-		case DP_S_FLAGS:
-			switch (ch) {
-			case '-':
-				flags |= DP_F_MINUS;
-				ch = *format++;
-				break;
-			case '+':
-				flags |= DP_F_PLUS;
-				ch = *format++;
-				break;
-			case ' ':
-				flags |= DP_F_SPACE;
-				ch = *format++;
-				break;
-			case '#':
-				flags |= DP_F_NUM;
-				ch = *format++;
-				break;
-			case '0':
-				flags |= DP_F_ZERO;
-				ch = *format++;
-				break;
-			default:
-				state = DP_S_MIN;
-				break;
-			}
-			break;
-		case DP_S_MIN:
-			if (isdigit((unsigned char)ch)) {
-				min = 10*min + char_to_int (ch);
-				ch = *format++;
-			} else if (ch == '*') {
-				min = va_arg (args, int);
-				ch = *format++;
-				state = DP_S_DOT;
-			} else {
-				state = DP_S_DOT;
-			}
-			break;
-		case DP_S_DOT:
-			if (ch == '.') {
-				state = DP_S_MAX;
-				ch = *format++;
-			} else { 
-				state = DP_S_MOD;
-			}
-			break;
-		case DP_S_MAX:
-			if (isdigit((unsigned char)ch)) {
-				if (max < 0)
-					max = 0;
-				max = 10*max + char_to_int (ch);
-				ch = *format++;
-			} else if (ch == '*') {
-				max = va_arg (args, int);
-				ch = *format++;
-				state = DP_S_MOD;
-			} else {
-				state = DP_S_MOD;
-			}
-			break;
-		case DP_S_MOD:
-			switch (ch) {
-			case 'h':
-				cflags = DP_C_SHORT;
-				ch = *format++;
-				break;
-			case 'l':
-				cflags = DP_C_LONG;
-				ch = *format++;
-				if (ch == 'l') {	/* It's a long long */
-					cflags = DP_C_LLONG;
-					ch = *format++;
-				}
-				break;
-			case 'L':
-				cflags = DP_C_LDOUBLE;
-				ch = *format++;
-				break;
-			default:
-				break;
-			}
-			state = DP_S_CONV;
-			break;
-		case DP_S_CONV:
-			switch (ch) {
-			case 'd':
-			case 'i':
-				if (cflags == DP_C_SHORT) 
-					value = va_arg (args, int);
-				else if (cflags == DP_C_LONG)
-					value = va_arg (args, long int);
-				else if (cflags == DP_C_LLONG)
-					value = va_arg (args, LLONG);
-				else
-					value = va_arg (args, int);
-				fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
-				break;
-			case 'o':
-				flags |= DP_F_UNSIGNED;
-				if (cflags == DP_C_SHORT)
-					value = va_arg (args, unsigned int);
-				else if (cflags == DP_C_LONG)
-					value = (long)va_arg (args, unsigned long int);
-				else if (cflags == DP_C_LLONG)
-					value = (long)va_arg (args, unsigned LLONG);
-				else
-					value = (long)va_arg (args, unsigned int);
-				fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags);
-				break;
-			case 'u':
-				flags |= DP_F_UNSIGNED;
-				if (cflags == DP_C_SHORT)
-					value = va_arg (args, unsigned int);
-				else if (cflags == DP_C_LONG)
-					value = (long)va_arg (args, unsigned long int);
-				else if (cflags == DP_C_LLONG)
-					value = (LLONG)va_arg (args, unsigned LLONG);
-				else
-					value = (long)va_arg (args, unsigned int);
-				fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
-				break;
-			case 'X':
-				flags |= DP_F_UP;
-			case 'x':
-				flags |= DP_F_UNSIGNED;
-				if (cflags == DP_C_SHORT)
-					value = va_arg (args, unsigned int);
-				else if (cflags == DP_C_LONG)
-					value = (long)va_arg (args, unsigned long int);
-				else if (cflags == DP_C_LLONG)
-					value = (LLONG)va_arg (args, unsigned LLONG);
-				else
-					value = (long)va_arg (args, unsigned int);
-				fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
-				break;
-			case 'f':
-				if (cflags == DP_C_LDOUBLE)
-					fvalue = va_arg (args, LDOUBLE);
-				else
-					fvalue = va_arg (args, double);
-				/* um, floating point? */
-				fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags);
-				break;
-			case 'E':
-				flags |= DP_F_UP;
-			case 'e':
-				if (cflags == DP_C_LDOUBLE)
-					fvalue = va_arg (args, LDOUBLE);
-				else
-					fvalue = va_arg (args, double);
-				break;
-			case 'G':
-				flags |= DP_F_UP;
-			case 'g':
-				if (cflags == DP_C_LDOUBLE)
-					fvalue = va_arg (args, LDOUBLE);
-				else
-					fvalue = va_arg (args, double);
-				break;
-			case 'c':
-				dopr_outch (buffer, &currlen, maxlen, va_arg (args, int));
-				break;
-			case 's':
-				strvalue = va_arg (args, char *);
-				if (!strvalue) strvalue = "(NULL)";
-				if (max == -1) {
-					max = strlen(strvalue);
-				}
-				if (min > 0 && max >= 0 && min > max) max = min;
-				fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
-				break;
-			case 'p':
-				strvalue = (char *)va_arg(args, void *);
-				fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
-				break;
-			case 'n':
-				if (cflags == DP_C_SHORT) {
-					short int *num;
-					num = va_arg (args, short int *);
-					*num = currlen;
-				} else if (cflags == DP_C_LONG) {
-					long int *num;
-					num = va_arg (args, long int *);
-					*num = (long int)currlen;
-				} else if (cflags == DP_C_LLONG) {
-					LLONG *num;
-					num = va_arg (args, LLONG *);
-					*num = (LLONG)currlen;
-				} else {
-					int *num;
-					num = va_arg (args, int *);
-					*num = currlen;
-				}
-				break;
-			case '%':
-				dopr_outch (buffer, &currlen, maxlen, ch);
-				break;
-			case 'w':
-				/* not supported yet, treat as next char */
-				ch = *format++;
-				break;
-			default:
-				/* Unknown, skip */
-				break;
-			}
-			ch = *format++;
-			state = DP_S_DEFAULT;
-			flags = cflags = min = 0;
-			max = -1;
-			break;
-		case DP_S_DONE:
-			break;
-		default:
-			/* hmm? */
-			break; /* some picky compilers need this */
-		}
-	}
-	if (maxlen != 0) {
-		if (currlen < maxlen - 1) 
-			buffer[currlen] = '\0';
-		else if (maxlen > 0) 
-			buffer[maxlen - 1] = '\0';
-	}
-	
-	return currlen;
-}
-
-static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
-		    char *value, int flags, int min, int max)
-{
-	int padlen, strln;     /* amount to pad */
-	int cnt = 0;
-
-#ifdef DEBUG_SNPRINTF
-	printf("fmtstr min=%d max=%d s=[%s]\n", min, max, value);
-#endif
-	if (value == 0) {
-		value = "<NULL>";
-	}
-
-	for (strln = 0; value[strln]; ++strln); /* strlen */
-	padlen = min - strln;
-	if (padlen < 0) 
-		padlen = 0;
-	if (flags & DP_F_MINUS) 
-		padlen = -padlen; /* Left Justify */
-	
-	while ((padlen > 0) && (cnt < max)) {
-		dopr_outch (buffer, currlen, maxlen, ' ');
-		--padlen;
-		++cnt;
-	}
-	while (*value && (cnt < max)) {
-		dopr_outch (buffer, currlen, maxlen, *value++);
-		++cnt;
-	}
-	while ((padlen < 0) && (cnt < max)) {
-		dopr_outch (buffer, currlen, maxlen, ' ');
-		++padlen;
-		++cnt;
-	}
-}
-
-/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
-
-static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
-		    long value, int base, int min, int max, int flags)
-{
-	int signvalue = 0;
-	unsigned long uvalue;
-	char convert[20];
-	int place = 0;
-	int spadlen = 0; /* amount to space pad */
-	int zpadlen = 0; /* amount to zero pad */
-	int caps = 0;
-	
-	if (max < 0)
-		max = 0;
-	
-	uvalue = value;
-	
-	if(!(flags & DP_F_UNSIGNED)) {
-		if( value < 0 ) {
-			signvalue = '-';
-			uvalue = -value;
-		} else {
-			if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
-				signvalue = '+';
-			else if (flags & DP_F_SPACE)
-				signvalue = ' ';
-		}
-	}
-  
-	if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
-
-	do {
-		convert[place++] =
-			(caps? "0123456789ABCDEF":"0123456789abcdef")
-			[uvalue % (unsigned)base  ];
-		uvalue = (uvalue / (unsigned)base );
-	} while(uvalue && (place < 20));
-	if (place == 20) place--;
-	convert[place] = 0;
-
-	zpadlen = max - place;
-	spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
-	if (zpadlen < 0) zpadlen = 0;
-	if (spadlen < 0) spadlen = 0;
-	if (flags & DP_F_ZERO) {
-		zpadlen = MAX(zpadlen, spadlen);
-		spadlen = 0;
-	}
-	if (flags & DP_F_MINUS) 
-		spadlen = -spadlen; /* Left Justifty */
-
-#ifdef DEBUG_SNPRINTF
-	printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
-	       zpadlen, spadlen, min, max, place);
-#endif
-
-	/* Spaces */
-	while (spadlen > 0) {
-		dopr_outch (buffer, currlen, maxlen, ' ');
-		--spadlen;
-	}
-
-	/* Sign */
-	if (signvalue) 
-		dopr_outch (buffer, currlen, maxlen, signvalue);
-
-	/* Zeros */
-	if (zpadlen > 0) {
-		while (zpadlen > 0) {
-			dopr_outch (buffer, currlen, maxlen, '0');
-			--zpadlen;
-		}
-	}
-
-	/* Digits */
-	while (place > 0) 
-		dopr_outch (buffer, currlen, maxlen, convert[--place]);
-  
-	/* Left Justified spaces */
-	while (spadlen < 0) {
-		dopr_outch (buffer, currlen, maxlen, ' ');
-		++spadlen;
-	}
-}
-
-static LDOUBLE abs_val(LDOUBLE value)
-{
-	LDOUBLE result = value;
-
-	if (value < 0)
-		result = -value;
-	
-	return result;
-}
-
-static LDOUBLE POW10(int exp)
-{
-	LDOUBLE result = 1;
-	
-	while (exp) {
-		result *= 10;
-		exp--;
-	}
-  
-	return result;
-}
-
-static LLONG ROUND(LDOUBLE value)
-{
-	LLONG intpart;
-
-	intpart = (LLONG)value;
-	value = value - intpart;
-	if (value >= 0.5) intpart++;
-	
-	return intpart;
-}
-
-/* a replacement for modf that doesn't need the math library. Should
-   be portable, but slow */
-static double my_modf(double x0, double *iptr)
-{
-	int i;
-	long l;
-	double x = x0;
-	double f = 1.0;
-
-	for (i=0;i<100;i++) {
-		l = (long)x;
-		if (l <= (x+1) && l >= (x-1)) break;
-		x *= 0.1;
-		f *= 10.0;
-	}
-
-	if (i == 100) {
-		/* yikes! the number is beyond what we can handle. What do we do? */
-		(*iptr) = 0;
-		return 0;
-	}
-
-	if (i != 0) {
-		double i2;
-		double ret;
-
-		ret = my_modf(x0-l*f, &i2);
-		(*iptr) = l*f + i2;
-		return ret;
-	} 
-
-	(*iptr) = l;
-	return x - (*iptr);
-}
-
-
-static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
-		   LDOUBLE fvalue, int min, int max, int flags)
-{
-	int signvalue = 0;
-	double ufvalue;
-	char iconvert[311];
-	char fconvert[311];
-	int iplace = 0;
-	int fplace = 0;
-	int padlen = 0; /* amount to pad */
-	int zpadlen = 0; 
-	int caps = 0;
-	int index;
-	double intpart;
-	double fracpart;
-	double temp;
-  
-	/* 
-	 * AIX manpage says the default is 0, but Solaris says the default
-	 * is 6, and sprintf on AIX defaults to 6
-	 */
-	if (max < 0)
-		max = 6;
-
-	ufvalue = abs_val (fvalue);
-
-	if (fvalue < 0) {
-		signvalue = '-';
-	} else {
-		if (flags & DP_F_PLUS) { /* Do a sign (+/i) */
-			signvalue = '+';
-		} else {
-			if (flags & DP_F_SPACE)
-				signvalue = ' ';
-		}
-	}
-
-#if 0
-	if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
-#endif
-
-#if 0
-	 if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */
-#endif
-
-	/* 
-	 * Sorry, we only support 16 digits past the decimal because of our 
-	 * conversion method
-	 */
-	if (max > 16)
-		max = 16;
-
-	/* We "cheat" by converting the fractional part to integer by
-	 * multiplying by a factor of 10
-	 */
-
-	temp = ufvalue;
-	my_modf(temp, &intpart);
-
-	fracpart = ROUND((POW10(max)) * (ufvalue - intpart));
-	
-	if (fracpart >= POW10(max)) {
-		intpart++;
-		fracpart -= POW10(max);
-	}
-
-
-	/* Convert integer part */
-	do {
-		temp = intpart;
-		my_modf(intpart*0.1, &intpart);
-		temp = temp*0.1;
-		index = (int) ((temp -intpart +0.05)* 10.0);
-		/* index = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */
-		/* printf ("%llf, %f, %x\n", temp, intpart, index); */
-		iconvert[iplace++] =
-			(caps? "0123456789ABCDEF":"0123456789abcdef")[index];
-	} while (intpart && (iplace < 311));
-	if (iplace == 311) iplace--;
-	iconvert[iplace] = 0;
-
-	/* Convert fractional part */
-	if (fracpart)
-	{
-		do {
-			temp = fracpart;
-			my_modf(fracpart*0.1, &fracpart);
-			temp = temp*0.1;
-			index = (int) ((temp -fracpart +0.05)* 10.0);
-			/* index = (int) ((((temp/10) -fracpart) +0.05) *10); */
-			/* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */
-			fconvert[fplace++] =
-			(caps? "0123456789ABCDEF":"0123456789abcdef")[index];
-		} while(fracpart && (fplace < 311));
-		if (fplace == 311) fplace--;
-	}
-	fconvert[fplace] = 0;
-  
-	/* -1 for decimal point, another -1 if we are printing a sign */
-	padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); 
-	zpadlen = max - fplace;
-	if (zpadlen < 0) zpadlen = 0;
-	if (padlen < 0) 
-		padlen = 0;
-	if (flags & DP_F_MINUS) 
-		padlen = -padlen; /* Left Justifty */
-	
-	if ((flags & DP_F_ZERO) && (padlen > 0)) {
-		if (signvalue) {
-			dopr_outch (buffer, currlen, maxlen, signvalue);
-			--padlen;
-			signvalue = 0;
-		}
-		while (padlen > 0) {
-			dopr_outch (buffer, currlen, maxlen, '0');
-			--padlen;
-		}
-	}
-	while (padlen > 0) {
-		dopr_outch (buffer, currlen, maxlen, ' ');
-		--padlen;
-	}
-	if (signvalue) 
-		dopr_outch (buffer, currlen, maxlen, signvalue);
-	
-	while (iplace > 0) 
-		dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
-
-#ifdef DEBUG_SNPRINTF
-	printf("fmtfp: fplace=%d zpadlen=%d\n", fplace, zpadlen);
-#endif
-
-	/*
-	 * Decimal point.  This should probably use locale to find the correct
-	 * char to print out.
-	 */
-	if (max > 0) {
-		dopr_outch (buffer, currlen, maxlen, '.');
-		
-		while (fplace > 0) 
-			dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
-	}
-	
-	while (zpadlen > 0) {
-		dopr_outch (buffer, currlen, maxlen, '0');
-		--zpadlen;
-	}
-
-	while (padlen < 0) {
-		dopr_outch (buffer, currlen, maxlen, ' ');
-		++padlen;
-	}
-}
-
-static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
-{
-	if (*currlen < maxlen) {
-		buffer[(*currlen)] = c;
-	}
-	(*currlen)++;
-}
-
-/* yes this really must be a ||. Don't muck with this (tridge) */
-#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
- int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
-{
-	return dopr(str, count, fmt, args);
-}
-#endif
-
-/* yes this really must be a ||. Don't muck wiith this (tridge)
- *
- * The logic for these two is that we need our own definition if the
- * OS *either* has no definition of *sprintf, or if it does have one
- * that doesn't work properly according to the autoconf test.  Perhaps
- * these should really be smb_snprintf to avoid conflicts with buggy
- * linkers? -- mbp
- */
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_SNPRINTF)
- int snprintf(char *str,size_t count,const char *fmt,...)
-{
-	size_t ret;
-	va_list ap;
-    
-	va_start(ap, fmt);
-	ret = vsnprintf(str, count, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-#endif
-
-#endif 
-
-#ifndef HAVE_VASPRINTF
- int vasprintf(char **ptr, const char *format, va_list ap)
-{
-	int ret;
-	
-	ret = vsnprintf(0, 0, format, ap);
-	if (ret <= 0) return ret;
-
-	(*ptr) = (char *)malloc(ret+1);
-	if (!*ptr) return -1;
-	ret = vsnprintf(*ptr, ret+1, format, ap);
-
-	return ret;
-}
-#endif
-
-
-#ifndef HAVE_ASPRINTF
- int asprintf(char **ptr, const char *format, ...)
-{
-	va_list ap;
-	int ret;
-	
-	*ptr = 0;
-	va_start(ap, format);
-	ret = vasprintf(ptr, format, ap);
-	va_end(ap);
-
-	return ret;
-}
-#endif
-
-#ifndef HAVE_VSYSLOG
-#ifdef HAVE_SYSLOG
- void vsyslog (int facility_priority, char *format, va_list arglist)
-{
-	char *msg = 0;
-	vasprintf(&msg, format, arglist);
-        if (!msg)
-                return;
-        syslog(facility_priority, "%s", msg);
-        free(msg);
-}
-#endif /* HAVE_SYSLOG */
-#endif /* HAVE_VSYSLOG */
-
-#ifdef TEST_SNPRINTF
-
- int sprintf(char *str,const char *fmt,...);
-
- int main (void)
-{
-	char buf1[1024];
-	char buf2[1024];
-	char *fp_fmt[] = {
-		"%1.1f",
-		"%-1.5f",
-		"%1.5f",
-		"%123.9f",
-		"%10.5f",
-		"% 10.5f",
-		"%+22.9f",
-		"%+4.9f",
-		"%01.3f",
-		"%4f",
-		"%3.1f",
-		"%3.2f",
-		"%.0f",
-		"%f",
-		"-16.16f",
-		0
-	};
-	double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, 
-			     0.9996, 1.996, 4.136,  0};
-	char *int_fmt[] = {
-		"%-1.5d",
-		"%1.5d",
-		"%123.9d",
-		"%5.5d",
-		"%10.5d",
-		"% 10.5d",
-		"%+22.33d",
-		"%01.3d",
-		"%4d",
-		"%d",
-		0
-	};
-	long int_nums[] = { -1, 134, 91340, 341, 0203, 0};
-	char *str_fmt[] = {
-		"10.5s",
-		"5.10s",
-		"10.1s",
-		"0.10s",
-		"10.0s",
-		"1.10s",
-		"%s",
-		"%.1s",
-		"%.10s",
-		"%10s",
-		0
-	};
-	char *str_vals[] = {"hello", "a", "", "a longer string", 0};
-	int x, y;
-	int fail = 0;
-	int num = 0;
-
-	printf ("Testing snprintf format codes against system sprintf...\n");
-
-	for (x = 0; fp_fmt[x] ; x++) {
-		for (y = 0; fp_nums[y] != 0 ; y++) {
-			int l1 = snprintf(0, 0, fp_fmt[x], fp_nums[y]);
-			int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]);
-			sprintf (buf2, fp_fmt[x], fp_nums[y]);
-			if (strcmp (buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", 
-				       fp_fmt[x], buf1, buf2);
-				fail++;
-			}
-			if (l1 != l2) {
-				printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, fp_fmt[x]);
-				fail++;
-			}
-			num++;
-		}
-	}
-
-	for (x = 0; int_fmt[x] ; x++) {
-		for (y = 0; int_nums[y] != 0 ; y++) {
-			int l1 = snprintf(0, 0, int_fmt[x], int_nums[y]);
-			int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]);
-			sprintf (buf2, int_fmt[x], int_nums[y]);
-			if (strcmp (buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", 
-				       int_fmt[x], buf1, buf2);
-				fail++;
-			}
-			if (l1 != l2) {
-				printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, int_fmt[x]);
-				fail++;
-			}
-			num++;
-		}
-	}
-
-	for (x = 0; str_fmt[x] ; x++) {
-		for (y = 0; str_vals[y] != 0 ; y++) {
-			int l1 = snprintf(0, 0, str_fmt[x], str_vals[y]);
-			int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x], str_vals[y]);
-			sprintf (buf2, str_fmt[x], str_vals[y]);
-			if (strcmp (buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", 
-				       str_fmt[x], buf1, buf2);
-				fail++;
-			}
-			if (l1 != l2) {
-				printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, str_fmt[x]);
-				fail++;
-			}
-			num++;
-		}
-	}
-
-	printf ("%d tests failed out of %d.\n", fail, num);
-
-	printf("seeing how many digits we support\n");
-	{
-		double v0 = 0.12345678901234567890123456789012345678901;
-		for (x=0; x<100; x++) {
-			snprintf(buf1, sizeof(buf1), "%1.1f", v0*pow(10, x));
-			sprintf(buf2,                "%1.1f", v0*pow(10, x));
-			if (strcmp(buf1, buf2)) {
-				printf("we seem to support %d digits\n", x-1);
-				break;
-			}
-		}
-	}
-
-	return 0;
-}
-#endif /* SNPRINTF_TEST */
diff --git a/dependencies2013/win32/swig/CCache/stats.c b/dependencies2013/win32/swig/CCache/stats.c
deleted file mode 100644
index 4d01d2af..00000000
--- a/dependencies2013/win32/swig/CCache/stats.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-  routines to handle the stats files
-
-  the stats file is stored one per cache subdirectory to make this more
-  scalable
- */
-
-#include "ccache.h"
-
-extern char *stats_file;
-extern char *cache_dir;
-
-#define STATS_VERSION 1
-
-#define FLAG_NOZERO 1 /* don't zero with the -z option */
-#define FLAG_ALWAYS 2 /* always show, even if zero */
-
-static struct {
-	enum stats stat;
-	char *message;
-	void (*fn)(unsigned );
-	unsigned flags;
-} stats_info[] = {
-	{ STATS_CACHED,       "cache hit                      ", NULL, FLAG_ALWAYS },
-	{ STATS_TOCACHE,      "cache miss                     ", NULL, FLAG_ALWAYS },
-	{ STATS_LINK,         "called for link                ", NULL, 0 },
-	{ STATS_MULTIPLE,     "multiple source files          ", NULL, 0 },
-	{ STATS_STDOUT,       "compiler produced stdout       ", NULL, 0 },
-	{ STATS_STATUS,       "compile failed                 ", NULL, 0 },
-	{ STATS_ERROR,        "ccache internal error          ", NULL, 0 },
-	{ STATS_PREPROCESSOR, "preprocessor error             ", NULL, 0 },
-	{ STATS_COMPILER,     "couldn't find the compiler     ", NULL, 0 },
-	{ STATS_MISSING,      "cache file missing             ", NULL, 0 },
-	{ STATS_ARGS,         "bad compiler arguments         ", NULL, 0 },
-	{ STATS_NOTC,         "not a C/C++ file               ", NULL, 0 },
-	{ STATS_CONFTEST,     "autoconf compile/link          ", NULL, 0 },
-	{ STATS_UNSUPPORTED,  "unsupported compiler option    ", NULL, 0 },
-	{ STATS_OUTSTDOUT,    "output to stdout               ", NULL, 0 },
-	{ STATS_DEVICE,       "output to a non-regular file   ", NULL, 0 },
-	{ STATS_NOINPUT,      "no input file                  ", NULL, 0 },
-	{ STATS_ENVIRONMMENT, "error due to bad env variable  ", NULL, 0 },
-	{ STATS_NUMFILES,     "files in cache                 ", NULL, FLAG_NOZERO|FLAG_ALWAYS },
-	{ STATS_TOTALSIZE,    "cache size                     ", display_size , FLAG_NOZERO|FLAG_ALWAYS },
-	{ STATS_MAXFILES,     "max files                      ", NULL, FLAG_NOZERO },
-	{ STATS_MAXSIZE,      "max cache size                 ", display_size, FLAG_NOZERO },
-	{ STATS_NONE, NULL, NULL, 0 }
-};
-
-/* parse a stats file from a buffer - adding to the counters */
-static void parse_stats(unsigned counters[STATS_END], char *buf)
-{
-	int i;
-	char *p, *p2;
-
-	p = buf;
-	for (i=0;i<STATS_END;i++) {
-		counters[i] += strtol(p, &p2, 10);
-		if (!p2 || p2 == p) break;
-		p = p2;
-	}
-}
-
-/* write out a stats file */
-static void write_stats(int fd, unsigned counters[STATS_END])
-{
-	int i;
-	int len = 0;
-	char buf[1024];
-
-	for (i=0;i<STATS_END;i++) {
-		len += snprintf(buf+len, sizeof(buf)-(len+1), "%u ", counters[i]);
-		if (len >= (int)sizeof(buf)-1) fatal("stats too long?!");
-	}
-	len += snprintf(buf+len, sizeof(buf)-(len+1), "\n");
-	if (len >= (int)sizeof(buf)-1) fatal("stats too long?!");
-
-	lseek(fd, 0, SEEK_SET);
-	if (write(fd, buf, len) == -1) fatal("could not write stats");
-}
-
-
-/* fill in some default stats values */
-static void stats_default(unsigned counters[STATS_END])
-{
-	counters[STATS_MAXSIZE] += DEFAULT_MAXSIZE / 16;
-}
-
-/* read in the stats from one dir and add to the counters */
-static void stats_read_fd(int fd, unsigned counters[STATS_END])
-{
-	char buf[1024];
-	int len;
-	len = read(fd, buf, sizeof(buf)-1);
-	if (len <= 0) {
-		stats_default(counters);
-		return;
-	}
-	buf[len] = 0;
-	parse_stats(counters, buf);
-}
-
-/* update the stats counter for this compile */
-static void stats_update_size(enum stats stat, size_t size, size_t numfiles)
-{
-	int fd;
-	unsigned counters[STATS_END];
-	int need_cleanup = 0;
-
-	if (getenv("CCACHE_NOSTATS")) return;
-
-	if (!stats_file) {
-		if (!cache_dir) return;
-		x_asprintf(&stats_file, "%s/stats", cache_dir);
-	}
-
-	/* open safely to try to prevent symlink races */
-	fd = safe_open(stats_file);
-
-	/* still can't get it? don't bother ... */
-	if (fd == -1) return;
-
-	memset(counters, 0, sizeof(counters));
-
-	if (lock_fd(fd) != 0) {
-		close(fd);
-		return;
-	}
-
-	/* read in the old stats */
-	stats_read_fd(fd, counters);
-
-	/* update them */
-	counters[stat]++;
-
-	/* on a cache miss we up the file count and size */
-	if (stat == STATS_TOCACHE) {
-		counters[STATS_NUMFILES] += numfiles;
-		counters[STATS_TOTALSIZE] += size;
-	}
-
-	/* and write them out */
-	write_stats(fd, counters);
-	close(fd);
-
-	/* we might need to cleanup if the cache has now got too big */
-	if (counters[STATS_MAXFILES] != 0 &&
-	    counters[STATS_NUMFILES] > counters[STATS_MAXFILES]) {
-		need_cleanup = 1;
-	}
-	if (counters[STATS_MAXSIZE] != 0 &&
-	    counters[STATS_TOTALSIZE] > counters[STATS_MAXSIZE]) {
-		need_cleanup = 1;
-	}
-
-	if (need_cleanup) {
-		char *p = dirname(stats_file);
-		cleanup_dir(p, counters[STATS_MAXFILES], counters[STATS_MAXSIZE],
-			    numfiles);
-		free(p);
-	}
-}
-
-/* record a cache miss */
-void stats_tocache(size_t size, size_t numfiles)
-{
-	/* convert size to kilobytes */
-	size = size / 1024;
-
-	stats_update_size(STATS_TOCACHE, size, numfiles);
-}
-
-/* update a normal stat */
-void stats_update(enum stats stat)
-{
-	stats_update_size(stat, 0, 0);
-}
-
-/* read in the stats from one dir and add to the counters */
-void stats_read(const char *stats_file, unsigned counters[STATS_END])
-{
-	int fd;
-
-	fd = open(stats_file, O_RDONLY|O_BINARY);
-	if (fd == -1) {
-		stats_default(counters);
-		return;
-	}
-	lock_fd(fd);
-	stats_read_fd(fd, counters);
-	close(fd);
-}
-
-/* sum and display the total stats for all cache dirs */
-void stats_summary(void)
-{
-	int dir, i;
-	unsigned counters[STATS_END];
-
-	memset(counters, 0, sizeof(counters));
-
-	/* add up the stats in each directory */
-	for (dir=-1;dir<=0xF;dir++) {
-		char *fname;
-
-		if (dir == -1) {
-			x_asprintf(&fname, "%s/stats", cache_dir);
-		} else {
-			x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir);
-		}
-
-		stats_read(fname, counters);
-		free(fname);
-
-		/* oh what a nasty hack ... */
-		if (dir == -1) {
-			counters[STATS_MAXSIZE] = 0;
-		}
-
-	}
-
-	printf("cache directory                     %s\n", cache_dir);
-
-	/* and display them */
-	for (i=0;stats_info[i].message;i++) {
-		enum stats stat = stats_info[i].stat;
-
-		if (counters[stat] == 0 && 
-		    !(stats_info[i].flags & FLAG_ALWAYS)) {
-			continue;
-		}
-
-		printf("%s ", stats_info[i].message);
-		if (stats_info[i].fn) {
-			stats_info[i].fn(counters[stat]);
-			printf("\n");
-		} else {
-			printf("%8u\n", counters[stat]);
-		}
-	}
-}
-
-/* zero all the stats structures */
-void stats_zero(void)
-{
-	int dir, fd;
-	unsigned i;
-	char *fname;
-	unsigned counters[STATS_END];
-
-	x_asprintf(&fname, "%s/stats", cache_dir);
-	unlink(fname);
-	free(fname);
-
-	for (dir=0;dir<=0xF;dir++) {
-		x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir);
-		fd = safe_open(fname);
-		if (fd == -1) {
-			free(fname);
-			continue;
-		}
-		memset(counters, 0, sizeof(counters));
-		lock_fd(fd);
-		stats_read_fd(fd, counters);
-		for (i=0;stats_info[i].message;i++) {
-			if (!(stats_info[i].flags & FLAG_NOZERO)) {
-				counters[stats_info[i].stat] = 0;
-			}
-		}
-		write_stats(fd, counters);
-		close(fd);
-		free(fname);
-	}
-}
-
-
-/* set the per directory limits */
-int stats_set_limits(long maxfiles, long maxsize)
-{
-	int dir;
-	unsigned counters[STATS_END];
-
-	if (maxfiles != -1) {
-		maxfiles /= 16;
-	}
-	if (maxsize != -1) {
-		maxsize /= 16;
-	}
-
-	if (create_dir(cache_dir) != 0) {
-		return 1;
-	}
-
-	/* set the limits in each directory */
-	for (dir=0;dir<=0xF;dir++) {
-		char *fname, *cdir;
-		int fd;
-
-		x_asprintf(&cdir, "%s/%1x", cache_dir, dir);
-		if (create_dir(cdir) != 0) {
-			return 1;
-		}
-		x_asprintf(&fname, "%s/stats", cdir);
-		free(cdir);
-
-		memset(counters, 0, sizeof(counters));
-		fd = safe_open(fname);
-		if (fd != -1) {
-			lock_fd(fd);
-			stats_read_fd(fd, counters);
-			if (maxfiles != -1) {
-				counters[STATS_MAXFILES] = maxfiles;
-			}
-			if (maxsize != -1) {
-				counters[STATS_MAXSIZE] = maxsize;
-			}
-			write_stats(fd, counters);
-			close(fd);
-		}
-		free(fname);
-	}
-
-	return 0;
-}
-
-/* set the per directory sizes */
-void stats_set_sizes(const char *dir, size_t num_files, size_t total_size)
-{
-	int fd;
-	unsigned counters[STATS_END];
-	char *stats_file;
-
-	create_dir(dir);
-	x_asprintf(&stats_file, "%s/stats", dir);
-
-	memset(counters, 0, sizeof(counters));
-
-	fd = safe_open(stats_file);
-	if (fd != -1) {
-		lock_fd(fd);
-		stats_read_fd(fd, counters);
-		counters[STATS_NUMFILES] = num_files;
-		counters[STATS_TOTALSIZE] = total_size;
-		write_stats(fd, counters);
-		close(fd);
-	}
-
-	free(stats_file);
-}
diff --git a/dependencies2013/win32/swig/CCache/test.sh b/dependencies2013/win32/swig/CCache/test.sh
deleted file mode 100644
index 438e782c..00000000
--- a/dependencies2013/win32/swig/CCache/test.sh
+++ /dev/null
@@ -1,480 +0,0 @@
-#!/bin/sh
-
-# a simple test suite for ccache
-# tridge@samba.org
-
-if test -n "$CC"; then
- COMPILER="$CC"
-else
- COMPILER=cc
-fi
-
-if test -n "$SWIG"; then
- SWIG="$SWIG"
-else
- SWIG=swig
-fi
-
-# fix: Remove ccache from $PATH if it exists
-#      as it will influence the unit tests
-PATH="`echo $PATH | \
- sed -e 's!:/usr\(/local\)*/lib\([0-9]\)*/ccache\(/\)*!!g'`"
-
-CCACHE=../ccache-swig
-TESTDIR=test.$$
-
-test_failed() {
-    reason="$1"
-    echo $1
-    $CCACHE -s
-    cd ..
-    rm -rf $TESTDIR
-    echo TEST FAILED
-    exit 1
-}
-
-randcode() {
-    outfile="$1"
-    nlines=$2
-    i=0;
-    (
-    while [ $i -lt $nlines ]; do
-	echo "int foo$nlines$i(int x) { return x; }"
-	i=`expr $i + 1`
-    done
-    ) >> "$outfile"
-}
-
-genswigcode() {
-    outfile="$1"
-    nlines=$2
-    i=0;
-    (
-    echo "%module swigtest$2;"
-    while [ $i -lt $nlines ]; do
-        echo "int foo$nlines$i(int x);"
-        echo "struct Bar$nlines$i { int y; };"
-        i=`expr $i + 1`
-    done
-    ) >> "$outfile"
-}
-
-
-getstat() {
-    stat="$1"
-    value=`$CCACHE -s | grep "$stat" | cut -c34-40`
-    echo $value
-}
-
-checkstat() {
-    stat="$1"
-    expected_value="$2"
-    value=`getstat "$stat"`
-#    echo "exp: $expected_value got: $value $testname"
-    if [ "$expected_value" != "$value" ]; then
-	test_failed "SUITE: $testsuite TEST: $testname - Expected $stat to be $expected_value got $value"
-    fi
-}
-
-
-basetests() {
-    echo "starting testsuite $testsuite"
-    rm -rf "$CCACHE_DIR"
-    checkstat 'cache hit' 0
-    checkstat 'cache miss' 0
-
-    j=1
-    rm -f *.c
-    while [ $j -lt 32 ]; do
-	randcode test$j.c $j
-	j=`expr $j + 1`
-    done
-
-    testname="BASIC"
-    $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 0
-    checkstat 'cache miss' 1
-    
-    testname="BASIC2"
-    $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 1
-    checkstat 'cache miss' 1
-    
-    testname="debug"
-    $CCACHE_COMPILE -c test1.c -g
-    checkstat 'cache hit' 1
-    checkstat 'cache miss' 2
-    
-    testname="debug2"
-    $CCACHE_COMPILE -c test1.c -g
-    checkstat 'cache hit' 2
-    checkstat 'cache miss' 2
-    
-    testname="output"
-    $CCACHE_COMPILE -c test1.c -o foo.o
-    checkstat 'cache hit' 3
-    checkstat 'cache miss' 2
-
-    testname="link"
-    $CCACHE_COMPILE test1.c -o test 2> /dev/null
-    checkstat 'called for link' 1
-
-    testname="multiple"
-    $CCACHE_COMPILE -c test1.c test2.c
-    checkstat 'multiple source files' 1
-
-    testname="find"
-    $CCACHE blahblah -c test1.c 2> /dev/null
-    checkstat "couldn't find the compiler" 1 
-
-    testname="bad"
-    $CCACHE_COMPILE -c test1.c -I 2> /dev/null
-    checkstat 'bad compiler arguments' 1
-
-    testname="c/c++"
-    ln -f test1.c test1.ccc
-    $CCACHE_COMPILE -c test1.ccc 2> /dev/null
-    checkstat 'not a C/C++ file' 1
-
-    testname="unsupported"
-    $CCACHE_COMPILE -M foo -c test1.c > /dev/null 2>&1
-    checkstat 'unsupported compiler option' 1
-
-    testname="stdout"
-    $CCACHE echo foo -c test1.c > /dev/null
-    checkstat 'compiler produced stdout' 1
-
-    testname="non-regular"
-    mkdir testd
-    $CCACHE_COMPILE -o testd -c test1.c > /dev/null 2>&1
-    rm -rf testd
-    checkstat 'output to a non-regular file' 1
-
-    testname="no-input"
-    $CCACHE_COMPILE -c -O2 2> /dev/null
-    checkstat 'no input file' 1
-
-
-    testname="CCACHE_DISABLE"
-    CCACHE_DISABLE=1 $CCACHE_COMPILE -c test1.c 2> /dev/null
-    checkstat 'cache hit' 3 
-    $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 4 
-
-    testname="CCACHE_CPP2"
-    CCACHE_CPP2=1 $CCACHE_COMPILE -c test1.c -O -O
-    checkstat 'cache hit' 4 
-    checkstat 'cache miss' 3
-
-    CCACHE_CPP2=1 $CCACHE_COMPILE -c test1.c -O -O
-    checkstat 'cache hit' 5 
-    checkstat 'cache miss' 3
-
-    testname="CCACHE_NOSTATS"
-    CCACHE_NOSTATS=1 $CCACHE_COMPILE -c test1.c -O -O
-    checkstat 'cache hit' 5
-    checkstat 'cache miss' 3
-    
-    testname="CCACHE_RECACHE"
-    CCACHE_RECACHE=1 $CCACHE_COMPILE -c test1.c -O -O
-    checkstat 'cache hit' 5 
-    checkstat 'cache miss' 4
-
-    # strictly speaking should be 6 - RECACHE causes a double counting!
-    checkstat 'files in cache' 8 
-    $CCACHE -c > /dev/null
-    checkstat 'files in cache' 6
-
-
-    testname="CCACHE_HASHDIR"
-    CCACHE_HASHDIR=1 $CCACHE_COMPILE -c test1.c -O -O
-    checkstat 'cache hit' 5
-    checkstat 'cache miss' 5
-
-    CCACHE_HASHDIR=1 $CCACHE_COMPILE -c test1.c -O -O
-    checkstat 'cache hit' 6
-    checkstat 'cache miss' 5
-
-    checkstat 'files in cache' 8
-    
-    testname="comments"
-    echo '/* a silly comment */' > test1-comment.c
-    cat test1.c >> test1-comment.c
-    $CCACHE_COMPILE -c test1-comment.c
-    rm -f test1-comment*
-    checkstat 'cache hit' 6
-    checkstat 'cache miss' 6
-
-    testname="CCACHE_UNIFY"
-    CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 6
-    checkstat 'cache miss' 7
-    mv test1.c test1-saved.c
-    echo '/* another comment */' > test1.c
-    cat test1-saved.c >> test1.c
-    CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c
-    mv test1-saved.c test1.c
-    checkstat 'cache hit' 7
-    checkstat 'cache miss' 7
-
-    testname="cache-size"
-    for f in *.c; do
-	$CCACHE_COMPILE -c $f
-    done
-    checkstat 'cache hit' 8
-    checkstat 'cache miss' 37
-    checkstat 'files in cache' 72
-    $CCACHE -F 48 -c > /dev/null
-    if [ `getstat 'files in cache'` -gt 48 ]; then
-	test_failed '-F test failed'
-    fi
-
-    testname="cpp call"
-    $CCACHE_COMPILE -c test1.c -E > test1.i
-    checkstat 'cache hit' 8
-    checkstat 'cache miss' 37
-
-    testname="direct .i compile"
-    $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 8
-    checkstat 'cache miss' 38
-
-    $CCACHE_COMPILE -c test1.i
-    checkstat 'cache hit' 9
-    checkstat 'cache miss' 38
-
-    $CCACHE_COMPILE -c test1.i
-    checkstat 'cache hit' 10
-    checkstat 'cache miss' 38
-
-    # removed these tests as some compilers (including newer versions of gcc)
-    # determine which language to use based on .ii/.i extension, and C++ may 
-    # not be installed
-#     testname="direct .ii file"
-#     mv test1.i test1.ii
-#     $CCACHE_COMPILE -c test1.ii
-#     checkstat 'cache hit' 10
-#     checkstat 'cache miss' 39
-
-#     $CCACHE_COMPILE -c test1.ii
-#     checkstat 'cache hit' 11
-#     checkstat 'cache miss' 39
-    
-    testname="stripc" # This test might not be portable
-    CCACHE_STRIPC=1 $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 10
-    checkstat 'cache miss' 39
-
-    CCACHE_STRIPC=1 $CCACHE_COMPILE -c test1.c
-    checkstat 'cache hit' 11
-    checkstat 'cache miss' 39
-
-    testname="zero-stats"
-    $CCACHE -z > /dev/null
-    checkstat 'cache hit' 0
-    checkstat 'cache miss' 0
-
-    testname="clear"
-    $CCACHE -C > /dev/null
-    checkstat 'files in cache' 0
-
-
-    rm -f test1.c
-}
-
-swigtests() {
-    echo "starting swig testsuite $testsuite"
-    rm -rf "$CCACHE_DIR"
-    checkstat 'cache hit' 0
-    checkstat 'cache miss' 0
-
-    j=1
-    rm -f *.i
-    genswigcode testswig1.i 1
-
-    testname="BASIC"
-    $CCACHE_COMPILE -java testswig1.i
-    checkstat 'cache hit' 0
-    checkstat 'cache miss' 1
-    
-    checkstat 'files in cache' 6
-
-    testname="BASIC2"
-    $CCACHE_COMPILE -java testswig1.i
-    checkstat 'cache hit' 1
-    checkstat 'cache miss' 1
-    
-    testname="output"
-    $CCACHE_COMPILE -java testswig1.i -o foo_wrap.c
-    checkstat 'cache hit' 1
-    checkstat 'cache miss' 2
-
-    testname="bad"
-    $CCACHE_COMPILE -java testswig1.i -I 2> /dev/null
-    checkstat 'bad compiler arguments' 1
-
-    testname="stdout"
-    $CCACHE_COMPILE -v -java testswig1.i > /dev/null
-    checkstat 'compiler produced stdout' 1
-
-    testname="non-regular"
-    mkdir testd
-    $CCACHE_COMPILE -o testd -java testswig1.i > /dev/null 2>&1
-    rm -rf testd
-    checkstat 'output to a non-regular file' 1
-
-    testname="no-input"
-    $CCACHE_COMPILE -java 2> /dev/null
-    checkstat 'no input file' 1
-
-
-    testname="CCACHE_DISABLE"
-    CCACHE_DISABLE=1 $CCACHE_COMPILE -java testswig1.i 2> /dev/null
-    checkstat 'cache hit' 1 
-    $CCACHE_COMPILE -java testswig1.i
-    checkstat 'cache hit' 2 
-
-    testname="CCACHE_CPP2"
-    CCACHE_CPP2=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 2 
-    checkstat 'cache miss' 3
-
-    CCACHE_CPP2=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 3 
-    checkstat 'cache miss' 3
-
-    testname="CCACHE_NOSTATS"
-    CCACHE_NOSTATS=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 3
-    checkstat 'cache miss' 3
-    
-    testname="CCACHE_RECACHE"
-    CCACHE_RECACHE=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 3 
-    checkstat 'cache miss' 4
-
-    # strictly speaking should be 3x6=18 instead of 4x6=24 - RECACHE causes a double counting!
-    checkstat 'files in cache' 24 
-    $CCACHE -c > /dev/null
-    checkstat 'files in cache' 18
-
-
-    testname="CCACHE_HASHDIR"
-    CCACHE_HASHDIR=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 3
-    checkstat 'cache miss' 5
-
-    CCACHE_HASHDIR=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 4
-    checkstat 'cache miss' 5
-
-    checkstat 'files in cache' 24
-    
-    testname="cpp call"
-    $CCACHE_COMPILE -java -E testswig1.i > testswig1-preproc.i
-    checkstat 'cache hit' 4
-    checkstat 'cache miss' 5
-
-    testname="direct .i compile"
-    $CCACHE_COMPILE -java testswig1.i
-    checkstat 'cache hit' 5
-    checkstat 'cache miss' 5
-
-    # No cache hit due to different input file name, -nopreprocess should not be given twice to SWIG
-    $CCACHE_COMPILE -java -nopreprocess testswig1-preproc.i
-    checkstat 'cache hit' 5
-    checkstat 'cache miss' 6
-
-    $CCACHE_COMPILE -java -nopreprocess testswig1-preproc.i
-    checkstat 'cache hit' 6
-    checkstat 'cache miss' 6
-
-    testname="stripc"
-    CCACHE_STRIPC=1 $CCACHE_COMPILE -java -O -O testswig1.i
-    checkstat 'cache hit' 7
-    checkstat 'cache miss' 6
-
-    CCACHE_STRIPC=1 $CCACHE_COMPILE -java -O -O -O testswig1.i
-    checkstat 'cache hit' 7
-    checkstat 'cache miss' 7
-
-    rm -f testswig1-preproc.i
-    rm -f testswig1.i
-}
-
-######
-# main program
-rm -rf $TESTDIR
-mkdir $TESTDIR
-cd $TESTDIR || exit 1
-
-unset CCACHE_DIR
-unset CCACHE_TEMPDIR
-unset CCACHE_LOGFILE
-unset CCACHE_VERBOSE
-unset CCACHE_PATH
-unset CCACHE_CC
-unset CCACHE_PREFIX
-unset CCACHE_DISABLE
-unset CCACHE_READONLY
-unset CCACHE_CPP2
-unset CCACHE_NOCOMPRESS
-unset CCACHE_NOSTATS
-unset CCACHE_NLEVELS
-unset CCACHE_HARDLINK
-unset CCACHE_RECACHE
-unset CCACHE_UMASK
-unset CCACHE_HASHDIR
-unset CCACHE_UNIFY
-unset CCACHE_EXTENSION
-unset CCACHE_STRIPC
-unset CCACHE_SWIG
-
-CCACHE_DIR="ccache dir" # with space in directory name (like Windows default)
-mkdir "$CCACHE_DIR"
-export CCACHE_DIR
-
-testsuite="base"
-CCACHE_COMPILE="$CCACHE $COMPILER"
-basetests
-CCACHE_COMPILE="$CCACHE $SWIG"
-swigtests
-
-if test -z "$NOSOFTLINKSTEST"; then
-  testsuite="link"
-  ln -s $CCACHE $COMPILER
-  CCACHE_COMPILE="./$COMPILER"
-  basetests
-  rm "./$COMPILER"
-  ln -s $CCACHE $SWIG
-  CCACHE_COMPILE="./$SWIG"
-  swigtests
-  rm "./$SWIG"
-else
-  echo "skipping testsuite link"
-fi
-
-testsuite="hardlink"
-CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $COMPILER"
-basetests
-CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $SWIG"
-swigtests
-
-testsuite="cpp2"
-CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $COMPILER"
-basetests
-CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $SWIG"
-swigtests
-
-testsuite="nlevels4"
-CCACHE_COMPILE="env CCACHE_NLEVELS=4 $CCACHE $COMPILER"
-basetests
-
-testsuite="nlevels1"
-CCACHE_COMPILE="env CCACHE_NLEVELS=1 $CCACHE $COMPILER"
-basetests
-
-cd ..
-rm -rf $TESTDIR
-echo test done - OK
-exit 0
diff --git a/dependencies2013/win32/swig/CCache/unify.c b/dependencies2013/win32/swig/CCache/unify.c
deleted file mode 100644
index 7a36476a..00000000
--- a/dependencies2013/win32/swig/CCache/unify.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-  C/C++ unifier
-
-  the idea is that changes that don't affect the resulting C code
-  should not change the hash. This is achieved by folding white-space
-  and other non-semantic fluff in the input into a single unified format.
-
-  This unifier was design to match the output of the unifier in
-  compilercache, which is flex based. The major difference is that
-  this unifier is much faster (about 2x) and more forgiving of
-  syntactic errors. Continuing on syntactic errors is important to
-  cope with C/C++ extensions in the local compiler (for example,
-  inline assembly systems).  
-*/
-
-#include "ccache.h"
-
-static char *s_tokens[] = {
-	"...",	">>=",	"<<=",	"+=",	"-=",	"*=",	"/=",	"%=",	"&=",	"^=",
-	"|=",	">>",	"<<",	"++",	"--",	"->",	"&&",	"||",	"<=",	">=",
-	"==",	"!=",	";",	"{",	"<%",	"}",	"%>",	",",	":",	"=",
-	"(",	")",	"[",	"<:",	"]",	":>",	".",	"&",	"!",	"~",
-	"-",	"+",	"*",	"/",	"%",	"<",	">",	"^",	"|",	"?",
-	0
-};
-
-#define C_ALPHA 1
-#define C_SPACE 2
-#define C_TOKEN 4
-#define C_QUOTE 8
-#define C_DIGIT 16
-#define C_HEX   32
-#define C_FLOAT 64
-#define C_SIGN  128
-
-static struct {
-	unsigned char type;
-	unsigned char num_toks;
-	char *toks[7];
-} tokens[256];
-
-/* build up the table used by the unifier */
-static void build_table(void)
-{
-	unsigned char c;
-	int i;
-	static int done;
-
-	if (done) return;
-	done = 1;
-
-	memset(tokens, 0, sizeof(tokens));
-	for (c=0;c<128;c++) {
-		if (isalpha(c) || c == '_') tokens[c].type |= C_ALPHA;
-		if (isdigit(c)) tokens[c].type |= C_DIGIT;
-		if (isspace(c)) tokens[c].type |= C_SPACE;
-		if (isxdigit(c)) tokens[c].type |= C_HEX;
-	}
-	tokens['\''].type |= C_QUOTE;
-	tokens['"'].type |= C_QUOTE;
-	tokens['l'].type |= C_FLOAT;
-	tokens['L'].type |= C_FLOAT;
-	tokens['f'].type |= C_FLOAT;
-	tokens['F'].type |= C_FLOAT;
-	tokens['U'].type |= C_FLOAT;
-	tokens['u'].type |= C_FLOAT;
-
-	tokens['-'].type |= C_SIGN;
-	tokens['+'].type |= C_SIGN;
-
-	for (i=0;s_tokens[i];i++) {
-		c = s_tokens[i][0];
-		tokens[c].type |= C_TOKEN;
-		tokens[c].toks[tokens[c].num_toks] = s_tokens[i];
-		tokens[c].num_toks++;
-	}
-}
-
-/* buffer up characters before hashing them */
-static void pushchar(unsigned char c)
-{
-	static unsigned char buf[64];
-	static int len;
-
-	if (c == 0) {
-		if (len > 0) {
-			hash_buffer((char *)buf, len);
-			len = 0;
-		}
-		hash_buffer(NULL, 0);
-		return;
-	}
-
-	buf[len++] = c;
-	if (len == 64) {
-		hash_buffer((char *)buf, len);
-		len = 0;
-	}
-}
-
-/* hash some C/C++ code after unifying */
-static void unify(unsigned char *p, size_t size)
-{
-	size_t ofs;
-	unsigned char q;
-	int i;
-
-	build_table();
-
-	for (ofs=0; ofs<size;) {
-		if (p[ofs] == '#') {
-			if ((size-ofs) > 2 && p[ofs+1] == ' ' && isdigit(p[ofs+2])) {
-				do {
-					ofs++;
-				} while (ofs < size && p[ofs] != '\n');
-				ofs++;
-			} else {
-				do {
-					pushchar(p[ofs]);
-					ofs++;
-				} while (ofs < size && p[ofs] != '\n');
-				pushchar('\n');
-				ofs++;
-			}
-			continue;
-		}
-
-		if (tokens[p[ofs]].type & C_ALPHA) {
-			do {
-				pushchar(p[ofs]);
-				ofs++;
-			} while (ofs < size && 
-				 (tokens[p[ofs]].type & (C_ALPHA|C_DIGIT)));
-			pushchar('\n');
-			continue;
-		}
-
-		if (tokens[p[ofs]].type & C_DIGIT) {
-			do {
-				pushchar(p[ofs]);
-				ofs++;
-			} while (ofs < size && 
-				 ((tokens[p[ofs]].type & C_DIGIT) || p[ofs] == '.'));
-			if (ofs < size && (p[ofs] == 'x' || p[ofs] == 'X')) {
-				do {
-					pushchar(p[ofs]);
-					ofs++;
-				} while (ofs < size && (tokens[p[ofs]].type & C_HEX));
-			}
-			if (ofs < size && (p[ofs] == 'E' || p[ofs] == 'e')) {
-				pushchar(p[ofs]);
-				ofs++;
-				while (ofs < size && 
-				       (tokens[p[ofs]].type & (C_DIGIT|C_SIGN))) {
-					pushchar(p[ofs]);
-					ofs++;
-				}
-			}
-			while (ofs < size && (tokens[p[ofs]].type & C_FLOAT)) {
-				pushchar(p[ofs]);
-				ofs++;
-			}
-			pushchar('\n');
-			continue;
-		}
-
-		if (tokens[p[ofs]].type & C_SPACE) {
-			do {
-				ofs++;
-			} while (ofs < size && (tokens[p[ofs]].type & C_SPACE));
-			continue;
-		}
-			
-		if (tokens[p[ofs]].type & C_QUOTE) {
-			q = p[ofs];
-			pushchar(p[ofs]);
-			do {
-				ofs++;
-				while (ofs < size-1 && p[ofs] == '\\') {
-					pushchar(p[ofs]);
-					pushchar(p[ofs+1]);
-					ofs+=2;
-				}
-				pushchar(p[ofs]);
-			} while (ofs < size && p[ofs] != q);
-			pushchar('\n');
-			ofs++;
-			continue;
-		}
-
-		if (tokens[p[ofs]].type & C_TOKEN) {
-			q = p[ofs];
-			for (i=0;i<tokens[q].num_toks;i++) {
-				unsigned char *s = (unsigned char *)tokens[q].toks[i];
-				int len = strlen((char *)s);
-				if (size >= ofs+len && memcmp(&p[ofs], s, len) == 0) {
-					int j;
-					for (j=0;s[j];j++) {
-						pushchar(s[j]);
-						ofs++;
-					}
-					pushchar('\n');
-					break;
-				}
-			}
-			if (i < tokens[q].num_toks) {
-				continue;
-			}
-		}
-
-		pushchar(p[ofs]);
-		pushchar('\n');
-		ofs++;
-	}
-	pushchar(0);
-}
-
-
-/* hash a file that consists of preprocessor output, but remove any line 
-   number information from the hash
-*/
-int unify_hash(const char *fname)
-{
-#ifdef _WIN32
-	HANDLE file;
-	HANDLE section;
-	DWORD filesize_low;
-	char *map;
-	int ret = -1;
-
-	file = CreateFileA(fname, GENERIC_READ, FILE_SHARE_READ, NULL,
-	                   OPEN_EXISTING, 0, NULL);
-	if (file != INVALID_HANDLE_VALUE) {
-		filesize_low = GetFileSize(file, NULL);
-		if (!(filesize_low == INVALID_FILE_SIZE && GetLastError() != NO_ERROR)) {
-			section = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL);
-			CloseHandle(file);
-			if (section != NULL) {
-				map = MapViewOfFile(section, FILE_MAP_READ, 0, 0, 0);
-				CloseHandle(section);
-				if (map != NULL)
-					ret = 0;
-			}
-		}
-	}
-
-	if (ret == -1) {
-		cc_log("Failed to open preprocessor output %s\n", fname);
-		stats_update(STATS_PREPROCESSOR);
-		return -1;
-	}
-
-	/* pass it through the unifier */
-	unify((unsigned char *)map, filesize_low);
-
-	UnmapViewOfFile(map);
-
-	return 0;
-#else
-	int fd;
-	struct stat st;	
-	char *map;
-
-	fd = open(fname, O_RDONLY|O_BINARY);
-	if (fd == -1 || fstat(fd, &st) != 0) {
-		cc_log("Failed to open preprocessor output %s\n", fname);
-		if (fd != -1) close(fd);
-		stats_update(STATS_PREPROCESSOR);
-		return -1;
-	}
-
-	/* we use mmap() to make it easy to handle arbitrarily long
-           lines in preprocessor output. I have seen lines of over
-           100k in length, so this is well worth it */
-	map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-	close(fd);
-	if (map == (char *)-1) {
-		cc_log("Failed to mmap %s\n", fname);
-		stats_update(STATS_PREPROCESSOR);
-		return -1;
-	}
-
-	/* pass it through the unifier */
-	unify((unsigned char *)map, st.st_size);
-
-	munmap(map, st.st_size);
-
-	return 0;
-#endif
-}
-
diff --git a/dependencies2013/win32/swig/CCache/util.c b/dependencies2013/win32/swig/CCache/util.c
deleted file mode 100644
index ef90e233..00000000
--- a/dependencies2013/win32/swig/CCache/util.c
+++ /dev/null
@@ -1,889 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program 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 General Public License for more details.
-   
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "ccache.h"
-
-static FILE *logfile;
-
-/* log a message to the CCACHE_LOGFILE location */
-void cc_log(const char *format, ...)
-{
-	va_list ap;
-	extern char *cache_logfile;
-
-	if (!cache_logfile) return;
-
-	if (!logfile) logfile = fopen(cache_logfile, "a");
-	if (!logfile) return;
-	
-	va_start(ap, format);
-	vfprintf(logfile, format, ap);
-	va_end(ap);
-	fflush(logfile);
-}
-
-/* something went badly wrong! */
-void fatal(const char *msg)
-{
-	cc_log("FATAL: %s\n", msg);
-	exit(1);
-}
-
-int safe_rename(const char* oldpath, const char* newpath)
-{
-	/* safe_rename is for creating entries in the cache.
-
-	   Works like rename(), but it never overwrites an existing
-	   cache entry. This avoids corruption on NFS. */
-#ifndef _WIN32
-	int status = link(oldpath, newpath);
-	if( status == 0 || errno == EEXIST )
-#else
-	int status = CreateHardLinkA(newpath, oldpath, NULL) ? 0 : -1;
-	if( status == 0 || GetLastError() == ERROR_ALREADY_EXISTS )
-#endif
-	{
-		return unlink( oldpath );
-	}
-	else
-	{
-		return -1;
-	}
-}
- 
-#ifndef ENABLE_ZLIB
-/* copy all data from one file descriptor to another */
-void copy_fd(int fd_in, int fd_out)
-{
-	char buf[10240];
-	int n;
-
-	while ((n = read(fd_in, buf, sizeof(buf))) > 0) {
-		if (write(fd_out, buf, n) != n) {
-			fatal("Failed to copy fd");
-		}
-	}
-}
-
-#ifndef HAVE_MKSTEMP
-/* cheap and nasty mkstemp replacement */
-int mkstemp(char *template)
-{
-	mktemp(template);
-	return open(template, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600);
-}
-#endif
-
-/* move a file using rename */
-int move_file(const char *src, const char *dest) {
-	return safe_rename(src, dest);
-}
-
-/* copy a file - used when hard links don't work 
-   the copy is done via a temporary file and atomic rename
-*/
-static int copy_file(const char *src, const char *dest)
-{
-	int fd1, fd2;
-	char buf[10240];
-	int n;
-	char *tmp_name;
-	mode_t mask;
-
-	x_asprintf(&tmp_name, "%s.XXXXXX", dest);
-
-	fd1 = open(src, O_RDONLY|O_BINARY);
-	if (fd1 == -1) {
-		free(tmp_name);
-		return -1;
-	}
-
-	fd2 = mkstemp(tmp_name);
-	if (fd2 == -1) {
-		close(fd1);
-		free(tmp_name);
-		return -1;
-	}
-
-	while ((n = read(fd1, buf, sizeof(buf))) > 0) {
-		if (write(fd2, buf, n) != n) {
-			close(fd2);
-			close(fd1);
-			unlink(tmp_name);
-			free(tmp_name);
-			return -1;
-		}
-	}
-
-	close(fd1);
-
-	/* get perms right on the tmp file */
-#ifndef _WIN32
-	mask = umask(0);
-	fchmod(fd2, 0666 & ~mask);
-	umask(mask);
-#else
-	(void)mask;
-#endif
-
-	/* the close can fail on NFS if out of space */
-	if (close(fd2) == -1) {
-		unlink(tmp_name);
-		free(tmp_name);
-		return -1;
-	}
-
-	unlink(dest);
-
-	if (rename(tmp_name, dest) == -1) {
-		unlink(tmp_name);
-		free(tmp_name);
-		return -1;
-	}
-
-	free(tmp_name);
-
-	return 0;
-}
-
-/* copy a file to the cache */
-static int copy_file_to_cache(const char *src, const char *dest) {
-	return copy_file(src, dest);
-}
-
-/* copy a file from the cache */
-static int copy_file_from_cache(const char *src, const char *dest) {
-	return copy_file(src, dest);
-}
-
-#else /* ENABLE_ZLIB */
-
-/* copy all data from one file descriptor to another
-   possibly decompressing it
-*/
-void copy_fd(int fd_in, int fd_out) {
-	char buf[10240];
-	int n;
-	gzFile gz_in;
-
-	gz_in = gzdopen(dup(fd_in), "rb");
-
-	if (!gz_in) {
-		fatal("Failed to copy fd");
-	}
-
-	while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) {
-		if (write(fd_out, buf, n) != n) {
-			gzclose(gz_in);
-			fatal("Failed to copy fd");
-		}
-	}
-	gzclose(gz_in);
-}
-
-static int _copy_file(const char *src, const char *dest, int mode) {
-	int fd_in, fd_out;
-	gzFile gz_in, gz_out = NULL;
-	char buf[10240];
-	int n, ret;
-	char *tmp_name;
-	mode_t mask;
-	struct stat st;
-
-	x_asprintf(&tmp_name, "%s.XXXXXX", dest);
-
-	if (getenv("CCACHE_NOCOMPRESS")) {
-		mode = COPY_UNCOMPRESSED;
-	}
-
-	/* open source file */
-	fd_in = open(src, O_RDONLY);
-	if (fd_in == -1) {
-		return -1;
-	}
-
-	gz_in = gzdopen(fd_in, "rb");
-	if (!gz_in) {
-		close(fd_in);
-		return -1;
-	}
-
-	/* open destination file */
-	fd_out = mkstemp(tmp_name);
-	if (fd_out == -1) {
-		gzclose(gz_in);
-		free(tmp_name);
-		return -1;
-	}
-
-	if (mode == COPY_TO_CACHE) {
-		/* The gzip file format occupies at least 20 bytes. So
-		   it will always occupy an entire filesystem block,
-		   even for empty files.
-		   Since most stderr files will be empty, we turn off
-		   compression in this case to save space.
-		*/
-		if (fstat(fd_in, &st) != 0) {
-			gzclose(gz_in);
-			close(fd_out);
-			free(tmp_name);
-			return -1;
-		}
-		if (file_size(&st) == 0) {
-			mode = COPY_UNCOMPRESSED;
-		}
-	}
-
-	if (mode == COPY_TO_CACHE) {
-		int dup_fd_out = dup(fd_out);
-		gz_out = gzdopen(dup_fd_out, "wb");
-		if (!gz_out) {
-			gzclose(gz_in);
-			close(dup_fd_out);
-			close(fd_out);
-			free(tmp_name);
-			return -1;
-		}
-	}
-
-	while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) {
-		if (mode == COPY_TO_CACHE) {
-			ret = gzwrite(gz_out, buf, n);
-		} else {
-			ret = write(fd_out, buf, n);
-		}
-		if (ret != n) {
-			gzclose(gz_in);
-			if (gz_out) {
-				gzclose(gz_out);
-			}
-			close(fd_out);
-			unlink(tmp_name);
-			free(tmp_name);
-			return -1;
-		}
-	}
-
-	gzclose(gz_in);
-	if (gz_out) {
-		gzclose(gz_out);
-	}
-
-	/* get perms right on the tmp file */
-	mask = umask(0);
-	fchmod(fd_out, 0666 & ~mask);
-	umask(mask);
-
-	/* the close can fail on NFS if out of space */
-	if (close(fd_out) == -1) {
-		unlink(tmp_name);
-		free(tmp_name);
-		return -1;
-	}
-
-	unlink(dest);
-
-	if (rename(tmp_name, dest) == -1) {
-		unlink(tmp_name);
-		free(tmp_name);
-		return -1;
-	}
-
-	free(tmp_name);
-
-	return 0;
-}
-
-/* move a file to the cache, compressing it */
-int move_file(const char *src, const char *dest) {
-	int ret;
-
-	ret = _copy_file(src, dest, COPY_TO_CACHE);
-	if (ret != -1) unlink(src);
-	return ret;
-}
-
-/* copy a file to the cache, compressing it */
-static int copy_file_to_cache(const char *src, const char *dest) {
-	return _copy_file(src, dest, COPY_TO_CACHE);
-}
-
-/* copy a file from the cache, decompressing it */
-static int copy_file_from_cache(const char *src, const char *dest) {
-	return _copy_file(src, dest, COPY_FROM_CACHE);
-}
-#endif /* ENABLE_ZLIB */
-
-/* test if a file is zlib compressed */
-int test_if_compressed(const char *filename) {
-	FILE *f;
-
-	f = fopen(filename, "rb");
-	if (!f) {
-		return 0;
-	}
-
-	/* test if file starts with 1F8B, which is zlib's
-	 * magic number */
-	if ((fgetc(f) != 0x1f) || (fgetc(f) != 0x8b)) {
-		fclose(f);
-		return 0;
-	}
-	
-	fclose(f);
-	return 1;
-}
-
-/* copy file to the cache with error checking taking into account compression and hard linking if desired */
-int commit_to_cache(const char *src, const char *dest, int hardlink)
-{
-	int ret = -1;
-	struct stat st;
-	if (stat(src, &st) == 0) {
-		unlink(dest);
-		if (hardlink) {
-#ifdef _WIN32
-			ret = CreateHardLinkA(dest, src, NULL) ? 0 : -1;
-#else
-			ret = link(src, dest);
-#endif
-		}
-		if (ret == -1) {
-			ret = copy_file_to_cache(src, dest);
-			if (ret == -1) {
-				cc_log("failed to commit %s -> %s (%s)\n", src, dest, strerror(errno));
-				stats_update(STATS_ERROR);
-			}
-		}
-	} else {
-		cc_log("failed to put %s in the cache (%s)\n", src, strerror(errno));
-		stats_update(STATS_ERROR);
-	}
-	return ret;
-}
-
-/* copy file out of the cache with error checking taking into account compression and hard linking if desired */
-int retrieve_from_cache(const char *src, const char *dest, int hardlink)
-{
-	int ret = 0;
-
-	x_utimes(src);
-
-	if (strcmp(dest, "/dev/null") == 0) {
-		ret = 0;
-	} else {
-		unlink(dest);
-		/* only make a hardlink if the cache file is uncompressed */
-		if (hardlink && test_if_compressed(src) == 0) {
-#ifdef _WIN32
-			ret = CreateHardLinkA(dest, src, NULL) ? 0 : -1;
-#else
-			ret = link(src, dest);
-#endif
-		} else {
-			ret = copy_file_from_cache(src, dest);
-		}
-	}
-
-	/* the cached file might have been deleted by some external process */
-	if (ret == -1 && errno == ENOENT) {
-		cc_log("hashfile missing for %s\n", dest);
-		stats_update(STATS_MISSING);
-		return -1;
-	}
-
-	if (ret == -1) {
-		ret = copy_file_from_cache(src, dest);
-		if (ret == -1) {
-			cc_log("failed to retrieve %s -> %s (%s)\n", src, dest, strerror(errno));
-			stats_update(STATS_ERROR);
-			return -1;
-		}
-	}
-	return ret;
-}
-
-/* make sure a directory exists */
-int create_dir(const char *dir)
-{
-	struct stat st;
-	if (stat(dir, &st) == 0) {
-		if (S_ISDIR(st.st_mode)) {
-			return 0;
-		}
-		errno = ENOTDIR;
-		return 1;
-	}
-#ifdef _WIN32
-	if (mkdir(dir) != 0 && errno != EEXIST) {
-		return 1;
-	}
-#else
-	if (mkdir(dir, 0777) != 0 && errno != EEXIST) {
-		return 1;
-	}
-#endif
-	return 0;
-}
-
-char const CACHEDIR_TAG[] =
-	"Signature: 8a477f597d28d172789f06886806bc55\n"
-	"# This file is a cache directory tag created by ccache.\n"
-	"# For information about cache directory tags, see:\n"
-	"#	http://www.brynosaurus.com/cachedir/\n";
-
-int create_cachedirtag(const char *dir)
-{
-	char *filename;
-	struct stat st;
-	FILE *f;
-	x_asprintf(&filename, "%s/CACHEDIR.TAG", dir);
-	if (stat(filename, &st) == 0) {
-		if (S_ISREG(st.st_mode)) {
-			goto success;
-		}
-		errno = EEXIST;
-		goto error;
-	}
-	f = fopen(filename, "w");
-	if (!f) goto error;
-	if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) {
-		fclose(f);
-		goto error;
-	}
-	if (fclose(f)) goto error;
-success:
-	free(filename);
-	return 0;
-error:
-	free(filename);
-	return 1;
-}
-
-/*
-  this is like asprintf() but dies if the malloc fails
-  note that we use vsnprintf in a rather poor way to make this more portable
-*/
-void x_asprintf(char **ptr, const char *format, ...)
-{
-	va_list ap;
-
-	*ptr = NULL;
-	va_start(ap, format);
-	if (vasprintf(ptr, format, ap) == -1) {
-		fatal("out of memory in x_asprintf");
-	}
-	va_end(ap);
-	
-	if (!*ptr) fatal("out of memory in x_asprintf");
-}
-
-/*
-  this is like strdup() but dies if the malloc fails
-*/
-char *x_strdup(const char *s)
-{
-	char *ret;
-	ret = strdup(s);
-	if (!ret) {
-		fatal("out of memory in strdup\n");
-	}
-	return ret;
-}
-
-/*
-  this is like malloc() but dies if the malloc fails
-*/
-void *x_malloc(size_t size)
-{
-	void *ret;
-	ret = malloc(size);
-	if (!ret) {
-		fatal("out of memory in malloc\n");
-	}
-	return ret;
-}
-
-/*
-  this is like realloc() but dies if the malloc fails
-*/
-void *x_realloc(void *ptr, size_t size)
-{
-	void *p2;
-#if 1
-	/* Avoid invalid read in memcpy below */
-	p2 = realloc(ptr, size);
-	if (!p2) {
-		fatal("out of memory in x_realloc");
-	}
-#else
-	if (!ptr) return x_malloc(size);
-	p2 = malloc(size);
-	if (!p2) {
-		fatal("out of memory in x_realloc");
-	}
-	if (ptr) {
-		/* Note invalid read as the memcpy reads beyond the memory allocated by ptr */
-		memcpy(p2, ptr, size);
-		free(ptr);
-	}
-#endif
-	return p2;
-}
-
-
-/* 
-   revsusive directory traversal - used for cleanup
-   fn() is called on all files/dirs in the tree
- */
-void traverse(const char *dir, void (*fn)(const char *, struct stat *))
-{
-	DIR *d;
-	struct dirent *de;
-
-	d = opendir(dir);
-	if (!d) return;
-
-	while ((de = readdir(d))) {
-		char *fname;
-		struct stat st;
-
-		if (strcmp(de->d_name,".") == 0) continue;
-		if (strcmp(de->d_name,"..") == 0) continue;
-
-		if (strlen(de->d_name) == 0) continue;
-
-		x_asprintf(&fname, "%s/%s", dir, de->d_name);
-#ifdef _WIN32
-		if (stat(fname, &st))
-#else
- 		if (lstat(fname, &st))
-#endif
-                {
-			if (errno != ENOENT) {
-				perror(fname);
-			}
-			free(fname);
-			continue;
-		}
-
-		if (S_ISDIR(st.st_mode)) {
-			traverse(fname, fn);
-		}
-
-		fn(fname, &st);
-		free(fname);
-	}
-
-	closedir(d);
-}
-
-
-/* return the base name of a file - caller frees */
-char *str_basename(const char *s)
-{
-	char *p = strrchr(s, '/');
-	if (p) {
-		s = (p+1);
-	}
-
-#ifdef _WIN32
-	p = strrchr(s, '\\');
-
-	if (p) {
-		s = (p+1);
-	}
-#endif
-
-	return x_strdup(s);
-}
-
-/* return the dir name of a file - caller frees */
-char *dirname(char *s)
-{
-	char *p;
-	s = x_strdup(s);
-	p = strrchr(s, '/');
-#ifdef _WIN32
-	p = strrchr(s, '\\');
-#endif
-	if (p) {
-		*p = 0;
-	} 
-	return s;
-}
-
-/*
-  http://www.ecst.csuchico.edu/~beej/guide/ipc/flock.html
-  http://cvs.php.net/viewvc.cgi/php-src/win32/flock.c?revision=1.2&view=markup
-  Should return 0 for success, >0 otherwise
- */
-int lock_fd(int fd)
-{
-#ifdef _WIN32
-#  if 1
-	return _locking(fd, _LK_NBLCK, 1);
-#  else
-	HANDLE fl = (HANDLE)_get_osfhandle(fd);
-	OVERLAPPED o;
-	memset(&o, 0, sizeof(o));
-	return (LockFileEx(fl, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &o))
-		? 0 : GetLastError();
-#  endif
-#else
-	struct flock fl;
-	int ret;
-
-	fl.l_type = F_WRLCK;
-	fl.l_whence = SEEK_SET;
-	fl.l_start = 0;
-	fl.l_len = 1;
-	fl.l_pid = 0;
-
-	/* not sure why we would be getting a signal here,
-	   but one user claimed it is possible */
-	do {
-		ret = fcntl(fd, F_SETLKW, &fl);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-#endif
-}
-
-/* return size on disk of a file */
-size_t file_size(struct stat *st)
-{
-#ifdef _WIN32
-	return (st->st_size + 1023) & ~1023;
-#else
-	size_t size = st->st_blocks * 512;
-	if ((size_t)st->st_size > size) {
-		/* probably a broken stat() call ... */
-		size = (st->st_size + 1023) & ~1023;
-	}
-	return size;
-#endif
-}
-
-
-/* a safe open/create for read-write */
-int safe_open(const char *fname)
-{
-	int fd = open(fname, O_RDWR|O_BINARY);
-	if (fd == -1 && errno == ENOENT) {
-		fd = open(fname, O_RDWR|O_CREAT|O_EXCL|O_BINARY, 0666);
-		if (fd == -1 && errno == EEXIST) {
-			fd = open(fname, O_RDWR|O_BINARY);
-		}
-	}
-	return fd;
-}
-
-/* display a kilobyte unsigned value in M, k or G */
-void display_size(unsigned v)
-{
-	if (v > 1024*1024) {
-		printf("%8.1f Gbytes", v/((double)(1024*1024)));
-	} else if (v > 1024) {
-		printf("%8.1f Mbytes", v/((double)(1024)));
-	} else {
-		printf("%8u Kbytes", v);
-	}
-}
-
-/* return a value in multiples of 1024 give a string that can end
-   in K, M or G
-*/
-size_t value_units(const char *s)
-{
-	char m;
-	double v = atof(s);
-	m = s[strlen(s)-1];
-	switch (m) {
-	case 'G':
-	case 'g':
-	default:
-		v *= 1024*1024;
-		break;
-	case 'M':
-	case 'm':
-		v *= 1024;
-		break;
-	case 'K':
-	case 'k':
-		v *= 1;
-		break;
-	}
-	return (size_t)v;
-}
-
-
-/*
-  a sane realpath() function, trying to cope with stupid path limits and 
-  a broken API
-*/
-char *x_realpath(const char *path)
-{
-#ifdef _WIN32
-	char namebuf[MAX_PATH];
-	DWORD ret;
-
-	ret = GetFullPathNameA(path, sizeof(namebuf), namebuf, NULL);
-	if (ret == 0 || ret >= sizeof(namebuf)) {
-		return NULL;
-	}
-
-	return x_strdup(namebuf);
-#else
-	int maxlen;
-	char *ret, *p;
-#ifdef PATH_MAX
-	maxlen = PATH_MAX;
-#elif defined(MAXPATHLEN)
-	maxlen = MAXPATHLEN;
-#elif defined(_PC_PATH_MAX)
-	maxlen = pathconf(path, _PC_PATH_MAX);
-#endif
-	if (maxlen < 4096) maxlen = 4096;
-	
-	ret = x_malloc(maxlen);
-
-#if HAVE_REALPATH
-	p = realpath(path, ret);
-#else
-	/* yes, there are such systems. This replacement relies on
-	   the fact that when we call x_realpath we only care about symlinks */
-	{
-		int len = readlink(path, ret, maxlen-1);
-		if (len == -1) {
-			free(ret);
-			return NULL;
-		}
-		ret[len] = 0;
-		p = ret;
-	}
-#endif
-	if (p) {
-		p = x_strdup(p);
-		free(ret);
-		return p;
-	}
-	free(ret);
-	return NULL;
-#endif
-}
-
-/* a getcwd that will returns an allocated buffer */
-char *gnu_getcwd(void)
-{
-	unsigned size = 128;
-
-	while (1) {
-		char *buffer = (char *)x_malloc(size);
-		if (getcwd(buffer, size) == buffer) {
-			return buffer;
-		}
-		free(buffer);
-		if (errno != ERANGE) {
-			return 0;
-		}
-		size *= 2;
-	}
-}
-
-/* create an empty file */
-int create_empty_file(const char *fname)
-{
-	int fd;
-
-	fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
-	if (fd == -1) {
-		return -1;
-	}
-	close(fd);
-	return 0;
-}
-
-/*
-  return current users home directory or die
-*/
-const char *get_home_directory(void)
-{
-#ifdef _WIN32
-	static char home_path[MAX_PATH] = {0};
-	HRESULT ret;
-
-	/* we already have the path */
-	if (home_path[0] != 0) {
-		return home_path;
-	}
-
-	/* get the path to "Application Data" folder */
-	ret = SHGetFolderPathA(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, home_path);
-	if (SUCCEEDED(ret)) {
-		return home_path;
-	}
-
-	fprintf(stderr, "ccache: Unable to determine home directory\n");
-	return NULL;
-#else
-	const char *p = getenv("HOME");
-	if (p) {
-		return p;
-	}
-#ifdef HAVE_GETPWUID
-	{
-		struct passwd *pwd = getpwuid(getuid());
-		if (pwd) {
-			return pwd->pw_dir;
-		}
-	}
-#endif
-	fatal("Unable to determine home directory");
-	return NULL;
-#endif
-}
-
-int x_utimes(const char *filename)
-{
-#ifdef HAVE_UTIMES
-	return utimes(filename, NULL);
-#else
-	return utime(filename, NULL);
-#endif
-}
-
-#ifdef _WIN32
-/* perror for Win32 API calls, using GetLastError() instead of errno */
-void perror_win32(LPTSTR pszFunction)
-{
-	LPTSTR pszMessage;
-	DWORD dwLastError = GetLastError();
-
-	FormatMessage(	FORMAT_MESSAGE_ALLOCATE_BUFFER |
-			FORMAT_MESSAGE_FROM_SYSTEM |
-			FORMAT_MESSAGE_IGNORE_INSERTS,
-			NULL,
-			dwLastError,
-			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-			(LPTSTR)&pszMessage,
-			0, NULL );
-
-	fprintf(stderr, "%s: %s\n", pszFunction, pszMessage);
-	LocalFree(pszMessage);
-}
-#endif
diff --git a/dependencies2013/win32/swig/CCache/web/index.html b/dependencies2013/win32/swig/CCache/web/index.html
deleted file mode 100644
index 4af83913..00000000
--- a/dependencies2013/win32/swig/CCache/web/index.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<TITLE>ccache</TITLE>
-</HEAD>
-<BODY BGCOLOR="#ffffff" TEXT="#000000" VLINK="#292555" LINK="#292555" ALINK="#cc0033">
-<h2>ccache</h2>
-
-ccache is a compiler cache. It acts as a caching pre-processor to
-C/C++ compilers, using the -E compiler switch and a hash to detect
-when a compilation can be satisfied from cache. This often results in
-a 5 to 10 times speedup in common compilations.<p>
-
-The idea came from Erik Thiele wrote the original <a
-href="http://compilercache.sourceforge.net/">compilercache</a> program
-as a bourne shell script. ccache is a re-implementation of Erik's idea
-in C with more features and better performance.<p>
-
-<h2>Latest release</h2>
-
-The latest release is ccache 2.4.
-
-<ul>
-<li>Added CCACHE_READONLY option
-<li>Added CCACHE_TEMPDIR option
-<li>fixed handling of hard-linked compilers on AIX
-<li>added O_BINARY support, to try and support win32 compiles
-<li>show cache directory in stats output
-<li>fixed handling of HOME environment variable
-</ul>
-
-See the <a href="ccache-man.html">manual page</a> for details
-on the new options.<p>
-
-You can get this release from the <a href="http://ccache.samba.org/ftp/ccache/">download directory</a> 
-
-<p>NOTE! This release changes the hash input slighly, so you will
-probably find that you will not get any hits against your existing
-cache when you upgrade.
-
-<h2>Why bother?</h2>
-
-Why bother with a compiler cache? If you ever run "make clean; make"
-then you can probably benefit from ccache. It is very common for
-developers to do a clean build of a project for a whole host of
-reasons, and this throws away all the information from your previous
-compiles.<p>
-
-By using ccache you can get exactly the same effect as "make clean;
-make" but much faster. It also helps a lot when doing RPM builds,
-as RPM can make doing incremental builds tricky.<p>
-
-I put the effort into writing ccache for 2 reasons. The first is the
-Samba build farm 
-(<a href="http://build.samba.org/">http://build.samba.org/</a>) 
-which constantly does clean builds of Samba on about 30 machines after each
-CVS commit. On some of those machines the build took over an hour. By
-using ccache we get the same effect as clean builds but about 6 times
-faster.<p>
-
-The second reason is the autobuild system I used to run for
-Quantum. That system builds our whole Linux based OS from scratch
-after every CVS commit to catch compilation problems quickly. Using
-ccache those builds are much faster.
-
-<h2>Is it safe?</h2>
-
-Yes. The most important aspect of a compiler cache is to <b>always</b>
-produce exactly the same output that the real compiler would
-produce. The includes providing exactly the same object files and
-exactly the same compiler warnings that would be produced if you use
-the real compiler. The only way you should be able to tell that you
-are using ccache is the speed.<p>
-
-I have coded ccache very carefully to try to provide these guarantees.
-
-<h2>Features</h2>
-
-<ul>
-<li> keeps statistics on hits/misses
-<li> automatic cache size management
-<li> can cache compiles that generate warnings
-<li> easy installation
-<li> very low overhead
-<li> uses hard links where possible to avoid copies
-</ul>
-
-<h2>Documentation</h2>
-
-See the <a href="ccache-man.html">manual page</a>
-
-
-<h2>Performance</h2>
-
-Here are some results for compiling Samba on my Linux laptop. I have
-also included the results of using Erik's compilercache program
-(version 1.0.10) for comparison.<p>
-
-<table border=1>
-<tr><th>              </th>      <th>&nbsp;&nbsp;&nbsp;&nbsp;ccache</th>     <th>&nbsp;compilercache</th>    </tr>
-<tr><td>normal        </td>      <td align=right>13m 4s     </td><td align=right>13m 4s</td> </tr>
-<tr><td>uncached      </td>      <td align=right>13m 15s     </td><td align=right>15m 41s</td> </tr>
-<tr><td>cached        </td>      <td align=right>2m 45s     </td><td align=right>4m 26s</td> </tr>
-</table>
-
-<h2>How to use it</h2>
-
-You can use ccache in two ways. The first is just to prefix your
-compile commands with "ccache". For example, you could change the
-"CC=gcc" line in your Makefile to be "CC=ccache gcc".<p>
-
-Alternatively, you can create symbolic links from your compilers name
-to ccache. This allows you to use ccache without any changes to your
-build system.
-
-<h2>Download</h2>
-
-You can download the latest release from the <a
-href="http://ccache.samba.org/ftp/ccache/">download directory</a>.<p>
-
-For the bleeding edge, you can fetch ccache via CVS or
-rsync. To fetch via cvs use the following command:
-
-<pre>
-  cvs -d :pserver:cvs@pserver.samba.org:/cvsroot co ccache
-</pre>
-
-To fetch via rsync use this command:
-
-<pre>
-  rsync -Pavz samba.org::ftp/unpacked/ccache .
-</pre>
-
-<h2>Related projects</h2>
-
-Here are some related programs you may find interesting
-
-<ul>
-<li> <a href="http://distcc.samba.org/">distcc</a> - a distributed compilation system
-<li> <a href="http://cachecc1.sourceforge.net/">cachecc1</a> - a gcc specific cache
-<li> <a href="http://sourceforge.net/projects/gocache/">gocache</a> - a cross platform compiler cache
-</ul>
-<p>
-
-<h2>Mailing list</h2>
-
-<p>A <a href="http://lists.samba.org/mailman/listinfo/ccache/">mailing
-list</a> is available for discussion of ccache.
-
-
-<hr>
-<tiny>
-<a href="http://samba.org/~tridge/">Andrew Tridgell</a><br>
-<a href="mailto:bugs@ccache.samba.org">bugs@ccache.samba.org</a>
-</tiny>
-
-</BODY>
-</HTML>
diff --git a/dependencies2013/win32/swig/CHANGES b/dependencies2013/win32/swig/CHANGES
deleted file mode 100644
index 5884efbf..00000000
--- a/dependencies2013/win32/swig/CHANGES
+++ /dev/null
@@ -1,24768 +0,0 @@
-SWIG (Simplified Wrapper and Interface Generator)
-
-See the CHANGES.current file for changes in the current version.
-See the RELEASENOTES file for a summary of changes in each release.
-Issue # numbers mentioned below can be found on Github. For more details, add
-the issue number to the end of the URL: https://github.com/swig/swig/issues/
-
-Version 3.0.11 (29 Dec 2016)
-============================
-
-2016-12-24: wsfulton
-            [C#] Add %feature("csdirectordelegatemodifiers") to enable customization
-            of the delegate access modifiers generated in director classes.
-            Fixes issue #748.
-
-2016-12-23: wsfulton
-            [Python] Fix builtin "python:slot" feature failing for tp_hash when using
-            hashfunc closure with a "Wrong type for hash function" for Python 2.
-            Issue #843.
-
-2016-12-21: joequamt
-            Changed generation of functions so that only functions
-            that end in _set generate accessor functions rather than
-	    looking for "set".
-	    Change generation of operators to not have underscores
-	    to start in R. Users need to provide custom names for these operator overloads.
-
-2016-12-21: olly
-	    Fix isfinite() checks to work with all C++11 compilers.
-	    Fixes issues #615, #788 and #849.
-
-2016-12-20: wsfulton
-            %namewarn unnecessarily caused keyword warnings for non-instantiated template classes
-            and duplicate warnings for instantiated template classes when keywords were used.
-            Issue #845.
-
-2016-12-18: ezralanglois 
-            [Python, Ruby, Octave] Memory leak fix on error in std::pair wrappers.
-            Issue #851.
-
-2016-12-18: wsfulton
-            Zero initialize arrays when using %array_class and %array_functions.
-
-2016-12-18: t-ikegami
-            [Python] Fix #446
-            Python %array_class of carrays.i failed with -builtin option.
-
-2016-12-16: briancaine
-            [Guile] Patch #744 Added support for Guile's native pointer functionality
-
-2016-12-01: wsfulton
-            [Python] Issue #769.
-            Add optional moduleimport attribute to %module so that the
-            default module import code can be overridden. See the "Searching for the wrapper module"
-            documentation in Python.html. Example:
-
-              %module(moduleimport="import _foo") foo
-
-            $module also expands to the low-level C/C++ module name, so the following is the
-            same as above
-
-              %module(moduleimport="import $module") foo
-
-2016-11-30: olly
-	    [PHP] Add support for PHP7.  PHP5's C extension API has changed
-	    substantially so you need to use -php7 to specify you want PHP7
-	    compatible wrappers.  The default extension for generated wrappers
-	    is now .cxx (to match SWIG's default for every other language - to
-	    generate foo_wrap.cpp you can run SWIG with -cppext cpp).  Fixes
-	    issue #571.
-
-	    As part of this change, the language subdirectory for PHP5 has
-	    changed from "php" to "php5" - if you are making use of the search
-	    path feature where the language subdirectory of each directory
-	    is also searched, you'll need to update your bindings.  A simple
-	    fix which works for older and newer SWIG is to add a symlink:
-	    ln -s php php5
-
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2016-11-30: olly
-	    [PHP] Only emit one copy of each distinct arginfo.  Previously we
-	    emitted a separate one for every wrapped function, but typically
-	    many functions have the same number of parameters and combinations
-	    of parameters passed by reference or not.
-
-	    This change significantly reduces both the size of the generated
-	    wrapper, and of the compiled PHP extension module (e.g. by ~6% for
-	    the stripped extension module for Xapian's PHP7 bindings).
-
-2016-11-28: wsfulton
-            Fix %rename override of wildcard %rename for templates. For example:
-
-              %rename(GlobalIntOperator) *::operator bool; // wildcard %rename
-
-              %rename(XIntOperator) X::operator bool; // fix now overrides first %rename above
-              OR
-              %rename(XIntOperator) X<int>::operator bool; // fix now overrides first %rename above
-
-              template<typename T> struct X {
-                operator bool();
-                ...
-              };
-              %template(Xint) X<int>;
-
-            This also fixes %rename override of global %rename for templates. For example:
-
-              // Global rename to make all functions start with a lower case letter
-              %rename("%(firstlowercase)s", %$isfunction ) "";
-              %rename(woohoo) W::Woo; // fix now overrides above %rename
-
-              template<typename T> struct W {
-                W Woo();
-                ...
-              };
-              %template(Wint) W<int>;
-
-            The above also introduces a possibly unexpected change. Many of the STL containers
-            provided by SWIG use %rename to rename some methods, eg in std::vector, push_back
-            is renamed to add in Java. Previously this intended rename did not happen when using
-            using global %rename rules and the method would remain as push_back, but is now
-            renamed to add. Some more info in issue #856.
-
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2016-11-26: m7thon
-            [Python] Issue #709 - improved wrapping of division operators
-            'from __future__ import division' now works in Python 2 whether or not the
-            -py3 flag is used.
-
-2016-11-12: joequant
-            [R] Issue #697 - fix comma issue with overload methods
-
-2016-11-12: joequant
-	    [R] Issue #555 - R runtime needs stdio.h
-
-2016-11-02: wsfulton
-            [Python] Issue #816 - fix compilation error when using -extranative and -builtin.
-
-2016-11-02: liorgold
-            Patch #741 - Add support for C++11 alias templates, see updated CPlusPlus11.html
-            documentation.
-
-2016-10-30: myd7349
-            [C#] Patch #740 Add std_array.i for C# for wrapping std::array.
-
-            Patch also enhances std::vector<std::wstring> C# wrappers with additional functions
-            (Contains, IndexOf, LastIndexOf and Remove).
-
-2016-10-30: tobilau
-            [Java] Fix wrappers for wstring parameters in director methods to cleanup local
-            ref after director callback has finished.
-
-2016-10-23: wsfulton
-            [C#] Add missing csdirectorin VOID_INT_PTR and csdirectorout VOID_INT_PTR typemaps.
-
-2016-10-23: jiulongw
-            Patch #781 - Fix wrapping of C compound expressions containing char constants
-            in quotes such as:
-
-              #define H_SUPPRESS_SCALING_MAGIC (('s'<<24) | ('u'<<16) | ('p'<<8) | 'p')
-
-              enum DifferentTypes {
-                typecharcompound='A'+1,
-                typecharcompound2='B' << 2
-              };
-
-2016-10-13: wsfulton
-            [Python] Issue #808 - fix Python pickling and metaclass for builtin wrappers.
-
-            The metaclass (SwigPyObjectType) for SWIG objects was not defined in
-            a way that let importlib successfully import the Python wrappers.
-            The pickle module previously failed to pickle objects because it couldn't
-            determine what module the SWIG wrapped objects were in.
-
-2016-09-29: wsfulton
-            [Allegrocl, CFFI, GO, Javascript, Ocaml, R, Scilab]
-            Add missing support for the "ret" typemap in a few target languages.
-            The documentation also now has info on the "ret" typemap.
-
-2016-09-27: ahmed-usman
-            [xml] Handle template parameters correctly.
-
-2016-09-27: dontpanic92
-            [Go] Fix argument names in inherited functions taking more than 8
-            parameters.  Fixes #795.
-
-2016-09-26: smarchetto
-            [Scilab] mlists that map pointers can be given a custom type name.
-
-2016-09-25: wsfulton
-            Patch #793 from q-p to expand exception handling to include std::bad_cast
-            in std_except.i.
-
-2016-09-24: olly
-            [PHP] Fix code generated for feature("director:except") -
-            previously the return value of call_user_function() was ignored and
-            we checked an uninitialised value instead.  Fixes #627.  Based on
-            patch from Sergey Seroshtan.
-
-2016-09-22: wsfulton
-            [Python] More flexible python builtin slots for overloaded C++ function.
-
-            The closure names used for builtin slots are mangled with their functype so
-            that overloaded C++ method names can be used for multiple slots.
-            For example:
-
-              %feature("python:slot", "mp_subscript", functype="binaryfunc") SimpleArray::__getitem__;
-              %feature("python:slot", "sq_item", functype="ssizeargfunc") SimpleArray::__getitem__(Py_ssize_t n);
-
-            will generate closures:
-
-              SWIGPY_SSIZEARGFUNC_CLOSURE(_wrap_SimpleArray___getitem__) /* defines _wrap_SimpleArray___getitem___ssizeargfunc_closure */
-              SWIGPY_BINARYFUNC_CLOSURE(_wrap_SimpleArray___getitem__) /* defines _wrap_SimpleArray___getitem___binaryfunc_closure */
-
-            Previously only one name was defined: _wrap_SimpleArray___getitem___closure.
-            Hence the overloaded __getitem__ method can be used to support both mp_subscript and sq_item slots.
-
-2016-09-17: wsfulton
-            [Python] Fix iterators for containers of NULL pointers (or Python None) when using
-            -builtin. Previously iteration would stop at the first element that was NULL.
-
-2016-09-16: olly
-            [Javascript] Fix SWIG_exception() macro to return from the current
-            function.  Fixes #789, reported by Julien Dutriaux.
-
-2016-09-16: olly
-            [PHP] Fix SWIG_exception() macro to return from the current function.
-            Fixes #240, reported by Sergey Seroshtan.
-
-2016-09-12: xypron
-            [C#] Patch #786 Keyword rename to be CLS compliant by adding an underscore
-            suffix instead of an underscore prefix to the C symbol name. Please use an explicit
-            %rename to rename the symbol with a _ prefix if you want the old symbol name.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2016-09-09: olly
-            [Python] Fix import handling for Python 2.6 to work in a frozen
-            application.  Fixes #145, reported by Thomas Kluyver.
-
-2016-09-02: smarchetto
-            [Scilab] Pointers are mapped to mlist instead of tlist
-            (mlist better for scilab overloading)
-
-2016-09-02: olly
-            [PHP] Fix "out" typemap for member function pointers and "in"
-            typemap for char INPUT[ANY].
-
-2016-09-01: wsfulton
-            [Python] More efficient Python slicing.
-            Call reserve for container types that support it to avoid repeated
-            memory reallocations for new slices or slices that grow in size.
-
-2016-09-01: wsfulton
-            [Python] #771 - Make builtin types hashable by default.
-            Default hash is the underlying C/C++ pointer. This matches up with testing for
-            equivalence (Py_EQ in SwigPyObject_richcompare) which compares the pointers.
-
-2016-08-22: wsfulton
-            [Python] The following builtin slots can be customized like other slots via the
-            "python:<x>" and "python:slot" features where <x> is the appropriate slot name:
-              tp_allocs
-              tp_bases
-              tp_basicsize
-              tp_cache
-              tp_del
-              tp_dealloc
-              tp_flags
-              tp_frees
-              tp_getset
-              tp_is_gc
-              tp_maxalloc
-              tp_methods
-              tp_mro
-              tp_new
-              tp_next
-              tp_prev
-              tp_richcompare
-              tp_subclasses
-              tp_weaklist
-              was_sq_ass_slice
-              was_sq_slice
-
-            A few documentation improvements for slot customization.
-
-2016-08-09: joequant
-            [R] Patch #765 Fix extern "C" header includes for C++ code.
-
-2016-08-05: olly
-            [xml] Fix how the output filename is built to avoid problems when
-            it contains the embedded strings ".c", ".cpp" or ".cxx".
-            Fixes #540 reported by djack42.
-
-2016-07-01: wsfulton
-            Fix corner case of wrapping std::vector of T pointers where a pointer to a pointer of T
-            also exists in the wrapped code. SF Bug 2359417 (967).
-
-2016-06-26: wkalinin
-            [Java, C#] Patch #681 Fix seg fault when ignoring nested classes.
-
-2016-06-25: mromberg
-            [Python] #711 Fix -castmode and conversion of signed and unsigned integer types.
-            See 2015-12-23 CHANGES entry for details of these improvements when they were
-            implemented for the default options (ie not using -castmode).
-
-2016-06-25: ahnolds
-            Patch #730 - Fix %implicitconv for overloaded functions when using
-            -castmode or -fastdispatch options.
-
-            The result is that in all overload cases where there are multiple possibilities
-            with the same number of arguments, the dispatch function will first check for
-            exact (aka non implicit) matches, and then subsequently check for implicit
-            casting matches. This was already happening in the normal dispatch situation,
-            and in the -fastdispatch case two passes through the candidates were happening,
-            just with SWIG_POINTER_IMPLICIT_CONV always set. After this patch, it is not set
-            on the first pass, and then set on the second pass.
-
-2016-06-25: liorgold
-            Patch #727 - Add support for C++11 type aliasing.
-
-Version 3.0.10 (12 Jun 2016)
-============================
-
-2016-06-06: mromberg
-            [Python] Patch #698. Add support for -relativeimport for python 2.7, so -py3 is no
-            longer also required for relative import support.
-
-2016-06-05: mromberg
-            [Python] Patch #694 - Fix package import regressions introduced in swig-3.0.9.
-
-            1) The code in 3.0.9 did not fall back to 'import _foo' if 'import bar._foo' failed
-            (assuming bar.foo was the main module). Every place _foo is imported now first tries
-            it from the package where foo was found and if that fails tries _foo as a global module.
-
-            2) The separate block of Python code that injected code to pull in the attributes
-            from _foo when -builtin is used made use of the -py3 switch to either do
-            'from ._foo import *' or "from _foo import *". This block of code no longer does this
-            and instead checks the Python version at runtime to switch between the two syntaxes.
-
-            In summary, swig-3.0.10 has been modified to ease the creation of wrapper modules
-            that can be fully made part of a Python package.  SWIG no longer
-            assumes the dynamically linked C module is a global module.
-            The dynamic module can now be placed into either the same package as the pure Python
-            module or as a global module.  Both locations are used by the Python wrapper to
-            locate the C module.
-
-            However, this could cause a backwards incompatibility with some code
-            that was relying on the ability of "from package import _module" to
-            pull attributes out of the package directly.  If your code populates a
-            module (which is also a package) with attributes that are SWIG
-            generated modules which were not loaded in a conventional way,
-            swig-3.0.8 and earlier may have worked due to 'from package import
-            _module' bypassing a real import and pulling your module in as an
-            attribute. This will no longer work.  Since this is not a common (or
-            even recommended) practice, most folk should not be affected.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2016-05-31: wsfulton
-            Fix #690 - Smart pointer to %ignored class doesn't expose inherited methods.
-            Regression introduced in swig-3.0.9.
-
-Version 3.0.9 (29 May 2016)
-===========================
-
-2016-05-24: mromberg
-            [Python] Patch #612 - Add support for Python's implicit namespace packages.
-
-2016-05-23: wsfulton
-            [Ruby] Fix #602 - Error handling regression of opaque pointers introduced
-            in swig-3.0.8 when C functions explicitly reset a pointer using 'DATA_PTR(self) = 0'.
-            An ObjectPreviouslyDeleted error was incorrectly thrown when the pointer was used
-            as a parameter.
-
-2016-05-17: tamuratak
-            [Ruby] Patch #651 - Correct overloaded function error message when function is
-            using %newobject.
-
-2016-05-17: aurelj
-            [Ruby] Patch #582 - add support for docstring option in %module()
-
-2016-05-14: wsfulton
-            Fix #434 - Passing classes by value as parameters in director methods did not create
-            a copy of the argument leading to invalid memory accesses if the object was used
-            after the upcall into the target language. Passing arguments by value shouldn't give
-            rise to these sorts of memory problems and so the objects are now copied and ownership
-            of their lifetime is controlled by the target language.
-
-2016-05-07: wsfulton
-            Fix #611. Fix assertion handling defaultargs when using %extend for a template
-            class and the extended methods contain default arguments.
-
-2016-05-05: ejulian
-            [Python] Patch #617. Fix operator/ wrappers.
-
-2016-05-02: wsfulton
-            Fix #669. Don't issue warning about ignoring base classes when the derived class is
-            itself ignored.
-
-2016-04-18: ianlancetaylor
-	    [Go] Fix use of goout typemap when calling base method by
-	    forcing the "type" attribute to the value we need.
-
-2016-04-17: ianlancetaylor
-	    [Go] Fixes for Go 1.6: avoid returning Go pointers from
-	    directors that return string values; add a trailing 0 byte
-	    when treating Go string as C char*.
-
-2016-04-06: smarchetto
-            [Scilab] #552 Make Scilab runtime keep track of pointer types
-            Instead of a Scilab pointer which has no type, SWIG Scilab maps a
-            pointer to a structure tlist containing the pointer adress and its type.
-
-2016-04-02: ahnolds
-            [Python] Apply #598. Fix misleading error message when attempting to read a non-existent
-            attribute. The previous cryptic error message:
-              AttributeError: type object 'object' has no attribute '__getattr__'
-            is now replaced with one mentioning the attribute name, eg:
-              AttributeError: 'Foo' object has no attribute 'bar'
-
-2016-04-02: derkuci
-            [Python] Patch #610 to fix #607.
-            Fix single arguments when using python -builtin -O with %feature("compactdefaultargs")
-
-2016-03-31: wsfulton
-            Fixes #594. Fix assertion for some languages when wrapping a C++11 enum class that
-            is private in a class.
-
-            Also don't wrap private enums for a few languages that attempted to do so.
-
-2016-03-31: wsfulton
-            [Java] unsigned long long marshalling improvements when a negative number
-            is passed from Java to C. A cast to signed long long in the C layer will now
-            result in the expected value. No change for positive numbers passed to C.
-            Fixes #623.
-
-2016-03-22: alexwarg
-	    [Lua] #398 Fix lua __getitem + inheritance
-            The new handling of classes in Lua (not merging methods into the derived classes)
-            breaks for classes that provide a __getitem function. The __getitem function
-            prevents method calls to any method defined in a base class. This fix calls
-            __getitem only if the member is not found using recursive lookup.
-
-2016-03-18: ptomulik
-	    [Python] #563 Stop generating unnecessary _swigconstant helpers.
-
-2016-03-16: richardbeare
-	    [R] #636 Add extra std::vector numeric types
-
-2016-03-14: wsfulton
-	    [Java] Add std_array.i for C++11 std::array support.
-
-2016-03-12: wsfulton
-	    [Java, C#, D] Fix static const char member variables wrappers with %javaconst(1)
-            %csconst(1) or %dmanifestconst.
-            This fixes the case when an integer is used as the initializer, such as:
-
-              struct W { static const char w = 100; };
-
-	    Fix generated code parsing enum values using char escape sequences
-            when these values appear in the Java code (usually when using %javaconst(1))
-            such as:
-
-              enum X { x1 = '\n', x2 = '\1' };
-
-            Similarly for static const member char variables such as:
-
-              struct Y { static const char y = '\n'; }
-
-            Likewise for D and %dmanifestconstant. For C# and %csconst(1), char
-            values in C# are now hex escaped as C# doesn't support C octal escaping.
-
-2016-03-11: wsfulton
-            [Java C#] Add support for treating C++ base classes as Java interfaces
-            instead of Java proxy classes. This enable some sort of support for
-            multiple inheritance. The implementation is in swiginterface.i and
-            provides additional macros (see Java.html for full documentation):
-
-              %interface(CTYPE)
-              %interface_impl(CTYPE)
-              %interface_custom("PROXY", "INTERFACE", CTYPE)
-
-2016-03-01: wsfulton
-            Add rstrip encoder for use in %rename. This is like the strip encoder but
-            strips the symbol's suffix instead of the prefix. The example below
-            will rename SomeThingCls to SomeThing and AnotherThingCls to AnotherThing:
-
-              %rename("%(rstrip:[Cls])s") "";
-
-              class SomeThingCls {};
-              struct AnotherThingCls {};
-
-2016-03-01: olly
-	    Fix isfinite() check to work with GCC6.  Fixes
-	    issue #615 reported by jplesnik.
-
-2016-02-17: olly
-	    [Python] Add missing keywords 'as' and 'with' to pythonkw.swg.
-
-2016-02-07: kwwette
-            [Octave] recognise various unary functions
-            * Use __float__() for numeric conversions, e.g. when calling double()
-            * Map various unary functions, e.g. abs() to __abs__(), see full list
-              in section 32.3.10 of manual; only available in Octave 3.8.0 or later
-
-2016-02-07: kwwette
-            [Octave] export function swig_octave_prereq() for testing Octave version
-
-2016-02-06: pjohangustavsson
-            [C#] Fix duplicate symbol problems when linking the source generated
-            from multiple SWIG modules into one shared library for the -namespace
-            option. The namespace is now mangled into the global PInvoke function
-            names.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2016-01-27: ahnolds
-            [Python] Added support for differentiating between Python Bytes
-            and Unicode objects using by defining SWIG_PYTHON_STRICT_BYTE_CHAR
-            and SWIG_PYTHON_STRICT_UNICODE_WCHAR.
-
-2016-01-27: steeve
-            [Go] Ensure structs are properly packed between gc and GCC/clang.
-
-2016-01-25: ahnolds
-            [Python] Support the full Python test suite in -classic mode
-            * Convert long/unsigned long/long long/unsigned long long to PyInt
-              rather than PyLong when possible. Certain python functions like
-              len() require a PyInt when operating on old-style classes.
-            * Add support for static methods in classic mode, including support
-              for pythonappend, pythonprepend, and docstrings.
-            * Removing the use of __swig_getmethods__ for static member methods
-              since they will always be found by the standard argument lookup
-            * Fix a bug where the wrong type of exception was caught when
-              checking for new-style class support
-
-2016-01-23: ahnolds
-            [Go] Enable support for the Go test-suite on OSX:
-            * The linker on OSX requires that all symbols (even weak symbols)
-              are defined at link time. Because the function _cgo_topofstack is
-              only defined starting in Go version 1.4, we explicitly mark it as
-              undefined for older versions of Go on OSX.
-            * Avoid writing empty swigargs structs, since empty structs are not
-              allowed in extern "C" blocks.
-
-2016-01-12: olly
-	    [Javascript] Look for "nodejs" as well as "node", as it's packaged
-	    as the former on Debian.
-
-2016-01-12: olly
-	    [Javascript] For v8 >= 4.3.0, use V8_MAJOR_VERSION.
-	    Fixes issue 561.
-
-2016-01-10: ahnolds
-            Improved size_t and ptrdiff_t typemaps to support large values
-            on platforms where sizeof(size_t) > sizeof(unsigned long) and
-            sizeof(ptrdiff_t) > sizeof(long).
-
-Version 3.0.8 (31 Dec 2015)
-===========================
-
-2015-12-30: wsfulton
-            The pdf documentation is now generated by wkhtmltopdf and has colour
-            for the code snippets just like the html documentation!
-
-2015-12-23: ahnolds
-            [Python] Fixes for conversion of signed and unsigned integer types:
-
-            No longer check for PyInt objects in Python3. Because PyInt_Check
-            and friends are #defined to the corresponding PyLong methods, this
-            had caused errors in Python3 where values greater than what could be
-            stored in a long were incorrectly interpreted as the value -1 with
-            the Python error indicator set to OverflowError. This applies to
-            both the conversions PyLong->long and PyLong->double.
-
-            Conversion from PyLong to long, unsigned long, long long, and
-            unsigned long long now raise OverflowError instead of TypeError in
-            both Python2 and Python3 for PyLong values outside the range
-            expressible by the corresponding C type. This matches the existing
-            behavior for other integral types (signed and unsigned ints, shorts,
-            and chars), as well as the conversion for PyInt to all numeric
-            types. This also indirectly applies to the size_t and ptrdiff_t
-            types, which depend on the conversions for unsigned long and long.
-
-2015-12-19: wsfulton
-            [Python] Python 2 Unicode UTF-8 strings can be used as inputs to char * or
-            std::string types if the generated C/C++ code has SWIG_PYTHON_2_UNICODE defined.
-
-2015-12-17: wsfulton
-            Issues #286, #128
-            Remove ccache-swig.1 man page - please use the CCache.html docs instead.
-            The yodl2man and yodl2html tools are no longer used and so SWIG no
-            longer has a dependency on these packages which were required when
-            building from git.
-
-2015-12-16: zturner/coleb
-            [Python] Fix Python3.5 interpreter assertions when objects are being
-            deleted due to an existing exception. Most notably in generators
-            which terminate using a StopIteration exception. Fixes #559 #560 #573.
-            If a further exception is raised during an object destruction,
-            PyErr_WriteUnraisable is used on this second exception and the
-            original exception bubbles through.
-
-2015-12-14: ahnolds/wsfulton
-            [Python] Add in missing initializers for tp_finalize,
-            nb_matrix_multiply, nb_inplace_matrix_multiply, ht_qualname
-            ht_cached_keys and tp_prev.
-
-2015-12-12: wsfulton
-            Fix STL wrappers to not generate <: digraphs.
-            For example std::vector<::X::Y> was sometimes generated, now
-            corrected to std::vector< ::X::Y >.
-
-2015-11-25: wsfulton
-            [Ruby] STL ranges and slices fixes.
-
-            Ruby STL container setting slices fixes:
-
-            Setting an STL container wrapper slice better matches the way Ruby
-            arrays work. The behaviour is now the same as Ruby arrays. The only
-            exception is the default value used when expanding a container
-            cannot be nil as this is not a valid type/value for C++ container
-            elements.
-
-            Obtaining a Ruby STL container ranges and slices fixes:
-
-            Access via ranges and slices now behave identically to Ruby arrays.
-            The fixes are mostly for out of range indices and lengths.
-            - Zero length slice requests return an empty container instead of nil.
-            - Slices which request a length greater than the size of the container
-              no longer chop off the last element.
-            - Ranges which used to return nil now return an empty array when the
-              the start element is a valid index.
-
-            Ruby STL container negative indexing support improved.
-
-            Using negative indexes to set values works the same as Ruby arrays, eg
-
-            %template(IntVector) std::vector<int>;
-
-            iv = IntVector.new([1,2,3,4])
-            iv[-4] = 9 # => [1,2,3,9]
-            iv[-5] = 9 # => IndexError
-
-2015-11-21: wsfulton
-            [Ruby, Python] Add std::array container wrappers.
-
-            These work much like any of the other STL containers except Python/Ruby slicing
-            is somewhat limited because the array is a fixed size. Only slices of
-            the full size are supported.
-
-2015-10-10: wsfulton
-            [Python] #539 - Support Python 3.5 and -builtin.  PyAsyncMethods is a new
-            member in PyHeapTypeObject.
-
-2015-10-06: ianlancetaylor
-	    [Go] Don't emit a constructor function for a director
-	    class with an abstract method, since the function will
-	    always panic.
-
-2015-10-01: wsfulton
-            Fix %shared_ptr support for private and protected inheritance.
-            - Remove unnecessary Warning 520: Derived class 'Derived' of 'Base'
-              is not similarly marked as a smart pointer
-            - Do not generate code that attempts to cast up the inheritance chain in the
-              type system runtime in such cases as it doesn't compile and can't be used.
-            Remove unnecessary warning 520 for %shared_ptr when the base class is ignored.
-
-2015-10-01: vkalinin
-            Fix #508: Fix segfault parsing anonymous typedef nested classes.
-
-2015-09-26: wsfulton
-            [Ruby] Add shared_ptr support
-
-2015-09-13: kkaempf
-            [Ruby] Resolve tracking bug - issue #225.
-            The bug is that the tracking code uses a ruby hash and thus may
-            allocate objects (Bignum) while running the GC. This was tolerated in
-            1.8 but is invalid (raises an exception) in 1.9.
-            The patch uses a C hash (also used by ruby) instead.
-
-2015-09-09: lyze
-            [CFFI] Extend the "export" feature in the CFFI module to support
-            exporting to a specified package.
-
-2015-09-04: olly
-	    [Python] Fix docstrings for %callback functions.
-
-2015-09-03: demi-rluddy
-            [Go] Removed golang stringing for signed/unsigned char
-
-            Changed default handling of signed char* and unsigned char* to be
-            opaque pointers rather than strings, similarly to how other
-            languages work.
-
-            Any existing code relying on treating signed char* or unsigned
-            char* as a string can restore the old behavior with typemaps.i by
-            using %apply to copy the [unchanged] char* behavior.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2015-08-07: talby
-            [Perl] tidy -Wtautological-constant-out-of-range-compare warnings when building generated code under clang
-
-2015-08-07: xantares
-            [Python] pep257 & numpydoc conforming docstrings:
-            - Mono-line module docsstring
-            - Rewrite autodoc parameters section in numpydoc style:
-              https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
-            - One line summary should end with "."
-            - Adds a blank line after class docstring
-
-2015-08-05: vadz
-            [Java] Make (char* STRING, size_t LENGTH) typemaps usable for
-            strings of other types, e.g. "unsigned char*".
-
-Version 3.0.7 (3 Aug 2015)
-==========================
-
-2015-08-02: wsfulton
-            [Java] Fix potential security exploit in generated Java classes.
-            The swigCPtr and swigCMemOwn member variables in the generated Java
-            classes are now declared 'transient' by default. Further details of the exploit
-            in Android is being published in an academic paper as part of USENIX WOOT '15:
-            https://www.usenix.org/conference/woot15/workshop-program/presentation/peles.
-
-            In the unlikely event that you are relying on these members being serializable,
-            then you will need to override the default javabody and javabody_derived typemaps
-            to generate the old generated code. The relevant typemaps are in the Lib directory
-            in the java.swg, boost_shared_ptr.i and boost_intrusive_ptr.i files. Copy the
-            relevant default typemaps into your interface file and remove the 'transient' keyword.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2015-08-01: vadz
-            Make configure --without-alllang option more useful: it can now be overridden by the following
-            --with-xxx options, allowing to easily enable just one or two languages.
-
-2015-07-30: wsfulton
-            Fix #440 - Initialise all newly created arrays when using %array_functions and %array_class
-            in the carrays.i library - bug is only relevant when using C++.
-
-2015-07-29: wsfulton
-            [Python] Improve indentation warning and error messages for code in the following directives:
-
-              %pythonprepend
-              %pythonappend
-              %pythoncode
-              %pythonbegin
-              %feature("shadow")
-
-            Old error example:
-              Error: Line indented less than expected (line 3 of pythoncode)
-
-            New error example:
-              Error: Line indented less than expected (line 3 of %pythoncode or %insert("python") block)
-              as no line should be indented less than the indentation in line 1
-
-            Old warning example:
-              Warning 740: Whitespace prefix doesn't match (line 2 of %pythoncode or %insert("python") block)
-
-            New warning example:
-              Warning 740: Whitespace indentation is inconsistent compared to earlier lines (line 3 of
-              %pythoncode or %insert("python") block)
-
-            
-2015-07-28: wsfulton
-            [Python] Fix #475. Improve docstring indentation handling.
-            
-            SWIG-3.0.5 and earlier sometimes truncated text provided in the docstring feature.
-            This occurred when the indentation (whitespace) in the docstring was less in the
-            second or later lines when compared to the first line.
-            SWIG-3.0.6 gave a 'Line indented less than expected' error instead of truncating
-            the docstring text.
-            Now the indentation for the 'docstring' feature is smarter and is appropriately
-            adjusted so that no truncation occurs.
-
-2015-07-22: wsfulton
-            Support for special variable expansion in typemap attributes. Example usage expansion
-            in the 'out' attribute (C# specific):
-
-              %typemap(ctype, out="$*1_ltype") unsigned int& "$*1_ltype"
-
-            is equivalent to the following as $*1_ltype expands to 'unsigned int':
-
-              %typemap(ctype, out="unsigned int") unsigned int& "unsigned int"
-
-            Special variables can be used within special variable macros too. Example usage expansion:
-
-              %typemap(cstype) unsigned int "uint"
-              %typemap(cstype, out="$typemap(cstype, $*1_ltype)") unsigned int& "$typemap(cstype, $*1_ltype)"
-
-            Special variables are expanded first and hence the above is equivalent to:
-
-              %typemap(cstype, out="$typemap(cstype, unsigned int)") unsigned int& "$typemap(cstype, unsigned int)"
-
-            which then expands to:
-
-              %typemap(cstype, out="uint") unsigned int& "uint"
-
-2015-07-22: lindleyf
-	    Apply patch #439 - support for $typemap() (aka embedded typemaps or special variable
-            macros) in typemap attributes. A simple example where $typemap() is expanded in the
-            'out' attribute (C# specific):
-
-              %typemap(cstype) unsigned int "uint"
-              %typemap(cstype, out="$typemap(cstype, unsigned int)") unsigned int& "$typemap(cstype, unsigned int)"
-
-            is equivalent to:
-
-              %typemap(cstype, out="uint") unsigned int& "uint"
-
-2015-07-18: m7thon
-	    [Python] Docstrings provided via %feature("docstring") are now quoted and added to
-            the tp_doc slot when using python builtin classes (-builtin). When no docstring is
-            provided, the tp_doc slot is set to the fully qualified C/C++ class name.
-            Github issues #445 and #461.
-
-2015-07-17: kwwette
-            [octave] Support Octave version 4.0.0 (thanks to patches from Orion Poplawski).
-
-2015-07-07: wsfulton
-	    SWIG no longer generates a wrapper for a class' constructor if that class has
-            any base class with a private destructor. This is because your compiler should
-            not allow a class to be instantiated if a base has a private destructor. Some
-            compilers do, so if you need the old behaviour, use the "notabstract" feature, eg:
-
-              %feature("notabstract") Derived;
-              class Base {
-                ~Base() {}
-              };
-              struct Derived : Base {};
-
-Version 3.0.6 (5 Jul 2015)
-==========================
-
-2015-07-02: wsfulton
-	    Fix syntax error when the template keyword is used in types, eg:
-
-              std::template vector<int> v;
-
-2015-07-02: ngladitz
-	    [Lua] Push characters as unformatted 1-character strings to avoid
-	    unprintable characters such as (char)127 being converted to
-	    "<\127>" with Lua 5.3 and later.  (github PR #452)
-
-2015-06-29: olly
-	    [Python] Improve handling of whitespace in %pythoncode.
-
-	    Previously SWIG looked at the indentation of the first line and
-	    removed that many characters from each subsequent line, regardless
-	    of what those characters were.  This was made worse because SWIG's
-	    preprocessor removes any whitespace before a '#'.  Fixes github
-	    issue #379, reported by Joe Orton.
-
-2015-06-12: wsfulton
-	    [R] Fix #430 - call to SWIG_createNewRef in copyToC was incorrectly named.
-
-2015-06-11: sghirate
-	    [C#] Patch #427 adds in new command line option -outfile to combine all the
-            generated C# code into a single file.
-
-2015-06-09: wsfulton
-	    Fix seg fault processing C++11 type aliasing. Issue #424.
-
-2015-05-28: wsfulton
-	    [Python] Add new feature "python:cdefaultargs" to control default argument
-            code generation. By default, SWIG attempts to convert C/C++ default argument values
-            into Python values and generates code into the Python layer with these values.
-            Recent versions of SWIG are able to convert more of these values, however, the
-            new behaviour can be circumvented if desired via this new feature, such that
-            the default argument values are obtained from the C layer and not the Python layer.
-            For example:
-
-              struct CDA {
-                int fff(int a = 1, bool b = false);
-              };
-
-            The default code generation in the Python layer is:
-
-              class CDA(_object):
-                  ...
-                  def fff(self, a=1, b=False):
-                      return _default_args.CDA_fff(self, a, b)
-
-            Adding the feature:
-
-              %feature("python:cdefaultargs") CDA::fff;
-
-            Results in:
-
-              class CDA(_object):
-                  ...
-                  def fff(self, *args):
-                      return _default_args.CDA_fff(self, *args)
-
-            Some code generation modes, eg -builtin and -fastproxy, are unaffected by this as
-            the default values are always obtained from the C layer.
-
-2015-05-27: wsfulton
-	    [Python] Deal with an integer as the default value of a typedef to bool
-	    parameter in the C++ prototype.  See #327. Regression from 3.0.0 onwards.
-
-2015-05-19: olly
-	    [Python] Fix warning when compiling generated code with MSVC.
-	    (Fixes https://sourceforge.net/p/swig/patches/351/ reported by
-	    Mateusz Szyma�ski).
-
-2015-05-14: wsfulton
-            Fix seg fault wrapping shared_ptr of classes with private constructors and destructors. 
-            This also fixes the "unref" feature when used on classes with private destructors.
-
-2015-05-10: wsfulton
-            [Java] Fix multi-argument typemaps (char *STRING, size_t LENGTH)
-            so that they can be applied to a wider range of types. Fixes #385.
-
-2015-05-07: olly
-	    [Python] Deal with an integer as the default value of a bool
-	    parameter in the C++ prototype.  Fixes github #327, reported by
-	    Greg Allen.
-
-2015-05-07: LindleyF
-	    [Java] Allow feature("director") and feature("ref") to be used
-	    together.  Github PR#403.
-
-2015-05-05: olly
-	    Suppress warning 325 "Nested class not currently supported (Foo
-	    ignored)" when Foo has already been explicitly ignored with "%ignore".
-
-2015-05-04: wsfulton
-            Add support for friend templates, including operator overloading - fixes #196. Considering
-            the example below, previously the operator gave a syntax error and friendfunc incorrectly
-            warned with:
-
-             "Warning 503: Can't wrap 'friendfunc<(Type)>' unless renamed to a valid identifier."
-
-              template <class Type> class MyClass {
-                friend int friendfunc <Type>(double is, MyClass <Type> & x);
-                friend int operator<< <Type>(double un, const MyClass <Type> &x);
-              };
-
-            The following also previously incorrectly warned with:
-
-              "Warning 302: Identifier 'template_friend' redefined (ignored),"
-
-              template<typename T> T template_friend(T);
-              struct MyTemplate {
-                template<typename T> friend T template_friend(T);
-              };
-
-2015-05-01: wsfulton
-            Fix handling of conversion operators where the operator is split over multiple
-            lines or has comments within the operator type. Fixes #401.
-
-            Also fix similar problem with normal operators which gave a syntax error if split over
-            multiple lines or had a comment within the operator declaration.
-
-2015-04-30: olly
-	    Ignore unknown preprocessor directives which are inside an inactive
-	    conditional (github issue #394, reported by Dan Wilcox).
-	    Regression introduced in 3.0.3.
-
-2015-04-27: vadz
-            [Python] Fix "default" typemap used after an argument with "numinputs=0" (#377).
-
-2015-04-24: wsfulton
-            [Python] Fix #256. Code generated with '-builtin -modernargs' segfaults for any
-            method taking zero arguments.
-
-            Also fixes: "SystemError: error return without exception set" during error checking
-            when using just -builtin and the incorrect number of arguments is passed to a class
-            method expecting zero arguments.
-
-2015-04-23: wsfulton
-            [Java] Bug #386 - Memory leak fix in (char *STRING, size_t LENGTH) typemaps.
-
-2015-04-23: vadz
-            [Python] Make "default" typemap work again (#330, #377).
-
-2015-04-23: vadz
-            [Python] Fix the use of default values for the pointer types (#365, #376).
-
-2015-04-23: wsfulton
-            Fix 'make check-ccache' which is part of 'make check' when one of the CCACHE_
-            environment variables, for example CCACHE_DISABLE, is set.
-
-2015-04-14: wsfulton
-            Clearer warning message for badly constructed typecheck typemaps. For example, was:
-
-              example.i:3: Warning 467: Overloaded foo(int) not supported (no type checking
-              rule for 'int').
-
-            Now:
-
-              example.i:3: Warning 467: Overloaded foo(int) not supported (incomplete type checking
-              rule - no precedence level in typecheck typemap for 'int').
-
-2015-04-11: wsfulton
-            [Java] Fix #353 - Linker multiple definition of 'ExceptionMatches' when
-            using directors and multiple modules.
-
-2015-04-11: wsfulton
-            Merge #320 - Make __dict__ accessible for Python builtin classes.
-
-2015-04-07: wsfulton
-            Fix #375 - parsing of extern "C" and typedef for example:
-              extern "C" typedef void (*Hook2_t)(int, const char *);
-              extern "C" typedef int Integer;
-
-2015-03-12: olly
-	    -DSWIG_DIRECTOR_STATIC is now supported for all languages with
-	    director support, not only Python and PHP.
-
-2015-03-02: ianlancetaylor
-	    [Go] Add -cgo option, required for Go versions 1.5 and
-	    later.
-
-2015-02-26: olly
-	    Fix segmentation fault when top==NULL, introduced by nested class
-	    handling (reported in issue#346 by Pawe� Tomulik).
-
-2015-02-09: wsfulton
-            [Guile] Fix generated code for static const char member variables when
-            defined and declared inline.
-
-2015-02-09: mishas
-            [Go] Fix %import of files in sub directories.
-
-2015-02-05: ianlancetaylor
-            [Go] Ignore Go specific type maps (goin, goout, etc.) if they are empty.
-
-2015-02-05: ianlancetaylor
-            [Go] Generated Go code no longer calls _swig_goallocate or
-            _swig_makegostring, as they will no longer work as of Go 1.5.
-
-Version 3.0.5 (31 Jan 2015)
-===========================
-
-2015-01-30: wsfulton
-            [Python] Fix Python -classic and property setting. Setting properties on classic classes
-            was broken in swig-3.0.3 by attempting to use __setattr__. This regression is fixed now
-            by using __dict__ again when using -classic.
-            Fixes patch #232.
-
-2015-01-27: smarchetto
-	    [Scilab] Support for the Scilab language has been added
-
-2015-01-23: olly
-	    [PHP] When wrapping a returned resource as an object, check if all
-	    cases wrap it in the same class, and if so eliminate the pointless
-	    switch statement wrapper we previously generated.
-
-2015-01-22: wsfulton
-            [Octave] Merge patch #297 for SF bug #1277 - Octave shared_ptr support
-
-2015-01-15: wsfulton
-            [Python] Merge patch #250 - Fixes for using %constant and objects (non-primitive types)
-
-2015-01-15: wsfulton
-            [C# Go] Merge patch #308 and fix #307 - C++11 strongly typed enum support
-            in directors
-
-2015-01-15: wsfulton
-            [Python] Second fix for #294 #296 - Regression introduced in SWIG-3.0.3 when
-            wrapping functions with default arguments, this time when using kwargs.
-
-Version 3.0.4 (14 Jan 2015)
-===========================
-
-2015-01-12: olly
-	    [PHP] Fix segfault in director upcall check when using PHP built with
-	    ZTS enabled.  Fixes #155, reported by Pierre Labastie.
-
-2015-01-12: vadz
-            [Python] Fix #294 #296 - Regression introduced in SWIG-3.0.3 when
-            wrapping functions with default arguments. Invalid or missing default
-            arguments were sometimes being generated into the python layer.
-
-2015-01-08: olly
-	    Allow C++11 "explicit constexpr".  Fixes github issue #284 reported
-	    by Pawel Tomulik.  Also handle "constexpr explicit" and "constexpr
-	    static".
-
-2015-01-08: olly
-	    When reporting an error for a construct which hasn't been
-	    terminated when the end of the file is reached, report it at the
-	    start line rather than "EOF" as then tools like editors and IDEs
-	    will take you to a generally more useful place for fixing the
-	    problem.
-
-2015-01-08: olly
-	    Improve error messages for a few cases which previously gave the
-	    one of the cryptic catch-all errors "Syntax error in input".
-
-2015-01-08: olly
-	    Provide -cppext as a general command line option for setting the
-	    extension used for generated C++ files (previously it was specific
-	    to the PHP backend).  Deprecate the equivalent -suffix option
-	    provided by the Ocaml backend, but continue to support that for
-	    now.
-
-Version 3.0.3 (30 Dec 2014)
-===========================
-
-2014-12-27: wsfulton
-            Fix #280 - abort using all default template parameters within other template
-            parameters.
-
-2014-12-27: talby
-            [Perl] Issue #282 perl5 archlib vs archlibexp
-            [Perl] tidy "warning: duplicate 'extern' declaration specifier" when building generated code
-            under clang
-
-2014-12-18: wsfulton
-            Add support for %constant and structs/classes - issue #272
-
-2014-12-09: wsfulton
-            Fix #245 - regression (since swig-3.0.0) in templated constructors.
-            Templated constructors could not be instantiated - they were incorrectly ignored with a warning 504:
-            "Function: xyz must have a return type. Ignored."
-
-2014-12-07: wsfulton
-            Add support for C++11 strongly typed enumerations.
-
-2014-11-21: wsfulton
-            [Java C#] Fix multiply defined error when using %rename of enum items when using the "simple enum"
-            wrappers.
-
-2014-10-28: vadz
-            [Python] Patch #201 The generated .py file no longer uses *args for all Python parameters.
-            Instead, the parameters are named using the C++ parameter names.
-
-            "compactdefaultargs" feature can be enabled to restore the old behaviour.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2014-10-24: timotheecour
-            [D] Patch #204 Use core.atomic.atomicOp to mutate shared variables
-
-2014-10-21: wsfulton
-            Fix issue #242 - Use of the "kwargs" feature no longer automatically turns on the
-            "compactdefaultargs" feature if the target language does not support kwargs.
-            This change affects all languages except Python and Ruby.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-10-10: diorcety
-            [Python] Patch #232 Fix property access using directors
-
-2014-10-06: wsfulton
-            [Python] Fixes when using -builtin and std::vector/std::list wrappers to allow deletion
-            of single elements, such as 'del vec[0]'.
-
-2014-09-30: oliverb
-            [Javascript] Merge patch #216 by Richie765 - Added support for many versions of v8 javascript.
-
-2014-09-30: oliverb
-            [Javascript] Merge patch #195 by zittix - Fixed JSClassRef declaration not using the static one.
-
-2014-09-30: ianlancetaylor
-	    [Go] In configure script, require Go 1.1 or later.
-
-2014-09-30: wsfulton
-            [Python] Patch #207 - Fix No module error with -relativeimport when using single
-            header file import.
-
-2014-09-27: wsfulton
-            Patch #208 - Initialise newly created array when using array_functions in the
-            carrays.i library (C++ usage).
-
-2014-09-27: wsfulton
-            [Ruby] Patch #187 - Fix crash on shutdown of the Ruby interpreter if more than one
-            module was loaded at a time when data is being shared between modules.
-
-2014-09-27: wsfulton
-            [Java] Patch #168 - Fix leak in Java director string handling after the Java
-            upcall when called from a native thread.
-
-2014-09-25: ianlancetaylor
-	    [Go] Adjust generated code to work with upcoming Go 1.4
-	    release.
-
-2014-09-23: wsfulton
-            [Python] Add patch from Thomas Maslach to fix crash in wrappers when using -threads in
-            the STL iterators (SwigPyIterator destructor).
-
-2014-09-17: wsfulton
-            [C#] Merge patch #229 from contre - Add bool array types to arrays_csharp.i
-
-2014-09-12: olly
-	    [PHP] Add support for specifying any PHP interfaces a wrapped class
-	    implements, e.g.: %typemap("phpinterfaces") MyIterator "Iterator";
-
-2014-09-11: olly
-	    [PHP] Fix throwing a PHP exception through C++ from a subclassed
-	    director method - PHP NULL gets returned by the subclassed method
-	    in this case, so the directorout typemap needs to allow that (at
-	    least if an exception is active).
-
-2014-09-09: ianlancetaylor
-	    [Go] Add goargout typemap.
-
-2014-09-09: olly
-	    [PHP] Fix segmentation faults with directors in PHP >= 5.4, and
-	    reenable runme tests for director_basic testcase.  Fix from
-	    pavel-charvat in issue#164.
-
-2014-09-05: ianlancetaylor
-	    [Go] Add imtype, goin, goout, godirectorin, and
-	    godirectorout typemaps, to support writing Go code to
-	    convert between types.
-
-2014-09-02: olly
-	    [Python] Fix regression in indentation of python code produced with
-	    -modern, introduced by changes in #188.  Reported by fabiencastan
-	    in #218.
-
-2014-09-01: olly
-	    Issue an error for unknown SWIG preprocessor directives, rather
-	    than quietly ignoring them.  Reported by jrhelsey in issue#217.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-08-15: talby
-            [Perl] Include guard fix for nested modules from Anthony Heading (SF Patch #350).
-
-2014-08-04: wsfulton
-            [C#] Merge patch #200 from gpetrou - Changed CSharp license header to include auto-generated
-            tag so that StyleCop ignores the files.
-
-2014-08-04: wsfulton
-            [Java] Merge patch #198 from Yuval Kashtan - Support for java.nio.ByteBuffer mapping to
-            unsigned char * in various.i in NIOBUFFER typemaps.
-
-2014-07-14: ianlancetaylor
-	    [Go] Change struct definition to use void *, not uint8, so
-	    that the type is recorded as possibly containing
-	    pointers.  This ensures that the 1.3 garbage collector
-	    does not collect pointers passed to C++ code.
-
-2014-07-01: wsfulton
-            Fix SF Bug #1375 - Expansion of the $parentclassname special variable incorrectly contains
-            brackets in the expanded name.
-
-Version 3.0.2 (4 Jun 2014)
-==========================
-
-2014-06-02: v-for-vandal
-            [Lua] Pull request #176:
-            If class has no __eq implemented, then default __eq is generated. 
-            Default __eq compares actual pointers stored inside Lua userdata.
-
-2014-06-02: vkalinin
-            Fix #183 - %extend and unnamed nested structs
-
-2014-05-28: kwwette
-            Fix install failure when using an 'out of source' build using the shipped
-            tarball - regression introduced in swig-3.0.1.
-
-2014-05-24: kwwette
-            [Octave] Remove deprecated -global/-noglobal command-line arguments
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-Version 3.0.1 (27 May 2014)
-===========================
-
-2014-05-25: hfalcic
-	    [Python] Python 3 byte string output: use errors="surrogateescape"
-            if available on the version of Python that's in use. This allows
-            obtaining the original byte string (and potentially trying a fallback
-            encoding) if the bytes can't be decoded as UTF-8.
-
-            Previously, a UnicodeDecodeError would be raised with no way to treat
-            the data as bytes or try another codec.
-
-2014-05-18: vkalinin
-	    Bug #175 - Restore %extend to work for unnamed nested structures by using a C
-            symbol comprising the outer structure name and unnamed variable instance name.
-
-2014-05-15: kwwette
-	    Add #166 - 'make check' now works out of source. This required the examples to build
-            out of source. The main languages have been tested - C#, Go, Guile, Java, Javascript,
-            Lua, Octave, Perl, PHP, Python, Ruby and Tcl.
-
-2014-05-01: Oliver Buchtala
-	    Javascript support added, see Javascript chapter in the documentation.
-
-2014-05-01: olly
-	    [PHP] The generated __isset() method now returns true for read-only properties.
-
-2014-04-24: kwwette
-            [Go] Fix go ./configure parsing of gccgo --version, and
-            goruntime.swg typo in __GNUC_PATCHLEVEL__ (SF Bug #1298)
-
-2014-04-24: kwwette
-            Fix {python|perl5|ruby|tcl}/java examples
-
-            In Lib/gcj/cni.i, for compatibility with newer gcj versions:
-
-            - remove JvAllocObject() which gcj no longer defines, from gcj Changelog:
-              2004-04-16  Bryce McKinlay  <mckinlay@redhat.com>
-                * gcj/cni.h (JvAllocObject): Remove these obsolete,
-                undocumented CNI calls.
-
-            - change JvCreateJavaVM() argument from void* to JvVMInitArgs*, from gcj Changelog:
-              2005-02-23  Thomas Fitzsimmons  <fitzsim@redhat.com>
-              PR libgcj/16923
-              ...
-              (JvCreateJavaVM): Declare vm_args as JvVMInitArgs* rather than void*.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-04-08: wsfulton
-            SF Bug #1366 - Remove duplicate declarations of strtoimax and strtoumax in inttypes.i
-
-2014-04-08: wsfulton
-            [Java C#] Enums which have been ignored via %ignore and are subsequently
-            used are handled slightly differently. Type wrapper classes are now generated
-            which are effectively a wrapper of an empty enum. Previously in Java uncompilable
-            code was generated and in C# an int was used.
-
-2014-04-04: wsfulton
-            Fix regression in 3.0.0 where legal code following an operator<< definition might
-            give a syntax error. SF Bug #1365.
-
-2014-04-03: olly
-	    [PHP] Fix wrapping director constructors with default parameters
-	    with a ZTS-enabled build of PHP.
-
-2014-04-02: olly
-	    [PHP] Pass the ZTS context we already have to avoid needing to
-	    call TSRMLS_FETCH, which is relatively expensive.
-
-2014-04-02: olly
-	    [PHP] Pass ZTS context through to t_output_helper() so it works
-	    with a ZTS-enabled build of PHP.  Reported by Pierre Labastie in
-	    github PR#155.
-
-2014-03-28: wsfulton
-            [Java C# D Go] Fixes for C enums used in an API and the definition of the enum
-            has not been parsed. For D, this fixes a segfault in SWIG. The other languages
-            now produce code that compiles, although the definition of the enum is needed
-            in order to use the enum properly from the target language.
-
-2014-03-23: v-for-vandal
-            [Lua] Fix for usage of snprintf in Lua runtime which Visual Studio does not have.
-
-Version 3.0.0 (16 Mar 2014)
-===========================
-
-2014-03-16: wsfulton
-            C++11 support initially developed as C++0x support by Matevz Jekovec as a Google Summer of Code
-            project has been further extended. The C++11 support is comprehensive, but by no means complete
-            or without limitations. Full details for each new feature in C++11 is covered in the
-            CPlusPlus11.html chapter in the documentation which is included in SWIG and also available
-            online at http://www.swig.org/Doc3.0/CPlusPlus11.html.
-
-2014-03-14: v-for-vandal
-            [Lua] Numerous Lua improvements:
-            1. %nspace support has been added. Namespaces are mapped to tables in the module, with the same
-               name as the C++ namespace.
-            2. Inheritance is now handled differently. Each class metatable keeps a list of class bases instead
-               of merging all members of all bases into the derived class.
-            3. The new metatables result in differences in accessing class members. For example:
-
-                 %module example
-                 struct Test {
-                     enum { TEST1 = 10, TEST2 = 20 };
-                     static const int ICONST = 12;
-                 };
-
-                 Now this can be used as follows:
-                   print(example.Test.TEST1)
-                   print(example.Test.ICONST)
-                 The old way was:
-                   print(example.Test_TEST1)
-                   print(example.Test_ICONST)
-
-            4. The special class metatable member ".constructor" was removed. Now SWIG generates the proxy
-               function by itself and assigns it directly to the class table "__call" method.
-            5. eLua should also now support inheritance.
-            6. 'const' subtable in eLua is considered deprecated.
-
-            Changes in behaviour:
-            a. You can no longer assign to non-existing class members in classes without a __setitem__ method.
-               It will cause a Lua error.
-            b. You can no longer iterate over a module table and copy everything into the global namespace.
-               Actually, this was never the case, but it is now explicitly prohibited.
-            c. Now changing a base class will immediately affect all derived classes.
-            d. There might be some issues with inheritance. Although the bases iteration scheme is the same
-               as was used for merging base classes into derived one, some unknown issues may arise.
-
-            The old metatable behaviour can be restored by using the -no-old-metatable-bindings option.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-03-06: wsfulton
-            [Python] Change in default behaviour wrapping C++ bool. Only a Python True or False
-            will now work for C++ bool parameters. This fixes overloading bool with other types.
-            Python 2.3 minimum is now required for wrapping bool.
-
-            When wrapping:
-
-              const char* overloaded(bool value) { return "bool"; }
-              const char* overloaded(int value) { return "int"; }
-
-            Previous behaviour:
-              >>> overloaded(False)
-              'int'
-              >>> overloaded(True)
-              'int'
-              >>> overloaded(0)
-              'int'
-
-            Now we get the expected behaviour:
-              >>> overloaded(False)
-              'bool'
-              >>> overloaded(0)
-              'int'
-
-            The consequence is when wrapping bool in non-overloaded functions:
-
-              const char* boolfunction(bool value) { return value ? "true" : "false"; }
-
-            The previous behaviour was very Pythonic:
-              >>> boolfunction("")
-              'false'
-              >>> boolfunction("hi")
-              'true'
-              >>> boolfunction(12.34)
-              'true'
-              >>> boolfunction(0)
-              'false'
-              >>> boolfunction(1)
-              'true'
-
-            Now the new behaviour more along the lines of C++ due to stricter type checking. The
-            above calls result in an exception and need to be explicitly converted into a bool as
-            follows:
-              >>> boolfunction(0)
-              Traceback (most recent call last):
-                File "<stdin>", line 1, in <module>
-              TypeError: in method 'boolfunction', argument 1 of type 'bool'
-              >>> boolfunction(bool(0))
-              'false'
-
-            The old behaviour can be resurrected by passing the -DSWIG_PYTHON_LEGACY_BOOL command line
-            parameter when executing SWIG. Typemaps can of course be written to customise the behaviour
-            for specific parameters.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-03-06: wsfulton
-	    Fix SF Bug #1363 - Problem with method overloading when some methods are added by %extend
-            and others are real methods and using template default parameters with smart pointers.
-            This is noticeable as a regression since 2.0.12 when using the default smart pointer
-            handling for some languages when the smart pointer wraps std::map and other STL containers.
-
-2014-03-02: wsfulton
-	    [Python] SF Patch #346 from Jens Krueger. Correct exception thrown attempting to
-            access a non-existent C/C++ global variable on the 'cvar' object. The exception thrown
-            used to be a NameError. However, as this access is via a primary, an AttributeError
-            is more correct and so the exception thrown now is an AttributeError. Reference:
-            http://docs.python.org/2/reference/expressions.html#attribute-references
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-03-01: wsfulton
-	    [Python] Patch #143 Fix type shown when using type() to include the module and package
-            name when using -builtin.
-
-2014-03-01: wsfulton
-	    [Python] SF patch #347 Fix missing argument count checking with -modern.
-            Fixes regression introduced when builtin changes were introduced in SWIG-2.0.3.
-
-2014-02-21: wsfulton
-	    [PHP] Fix warning suppression using %warnfilter for PHP reserved class names.
-
-2014-02-19: olly
-	    [Lua] Add keyword warnings for Lua keywords and Basic Functions.
-
-2014-02-19: olly
-	    -Wallkw now includes keywords for all languages with keyword
-	    warnings (previously Go and R were missing).
-
-2014-02-19: olly
-	    [PHP] Update the lists of PHP keywords with new ones from PHP 5.4
-	    and newer (and some missing ones from 5.3).  Reserved PHP constants
-	    names are now checked against enum values and constants, instead
-	    of against function and method names.  Built-in PHP function names
-	    no longer match methods added by %extend.  Functions and methods
-	    named '__sleep', '__wakeup', 'not', 'parent', or 'virtual' are no
-	    longer needlessly renamed.
-
-2014-02-15: wsfulton
-	    Fix the %$ismember %rename predicates to also apply to members added via %extend.
-
-            Add %$isextendmember for %rename of members added via %extend. This can be used to
-            distinguish between normal class/struct members and %extend members. For example
-            '%$ismember, %$not %$isextendmember' will now identify just class/struct members.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-02-16: hfalcic
-            [Python] Patch #137 - fix crashes/exceptions in exception handling in Python 3.3
-
-2014-02-15: wsfulton
-            [Java] Add support for the cdata library.
-
-2014-02-08: vkalinin
-            Nested class support added. This primarily allows SWIG to properly parse nested
-            classes and keep the nested class information in the parse tree. Java and C#
-            have utilised this information wrapping the C++ nested classes as Java/C#
-            nested classes. The remaining target languages ignore nested classes as in
-            previous versions. Help is needed by users of these remaining languages to
-            design how C++ nested classes can be best wrapped. Please talk to us on the
-            swig-devel mailing list if you think you can help.
-
-            Previously, there was limited nested class support. Nested classes were treated
-            as opaque pointers. However, the "nestedworkaround" feature provided a way to
-            wrap a nested class as if it was a global class. This feature no longer exists
-            and is replaced by the new "flatnested" feature. This effectively does the same
-            thing with less manual code to be written. Please see the 'Nested classes'
-            section in the documentation in SWIGPlus.html if you were previously using this
-            feature.
-
-            SWIG now parses the contents of nested classes where previously it did not. You
-            may find that you will need to make adjustments to your interface file as
-            effectively extra code is being wrapped.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2014-02-06: gjanssens
-            [Guile] Patch #133. Make scm to string conversion work with non-ascii strings.
-            Guile 2 has a completely rewritten string implementation. SWIG made some assumptions
-            that are no longer valid as to the internals of guile's string representation.
-
-2014-01-30: wsfulton
-            [C#] Add new swigtype_inout.i library containing SWIGTYPE *& OUTPUT typemaps.
-
-            Example usage wrapping:
-
-              void f(XXX *& x) { x = new XXX(111); }
-
-            would be:
-
-              XXX x = null;
-              f(out x);
-              // use x
-              x.Dispose(); // manually clear memory or otherwise leave out and leave it to the garbage collector
-
-2014-01-21: ianlancetaylor
-	    [Go] Add %go_import directive.
-
-2014-01-21: ianlancetaylor
-	    [Go] Add support for Go 1.3, not yet released.
-
-2014-01-20: wsfulton
-            Director exceptions (Swig::DirectorException) now derive from std::exception
-            and hence provide the what() method. In Python and Ruby, this replaces the now
-            deprecated DirectorException::getMessage() method.
-
-2014-01-14: diorcety
-            Patch #112 - Fix symbol resolution involving scopes that have multiple levels
-            of typedefs - fixes some template resolutions as well as some typemap searches.
-
-2014-01-11: wsfulton
-            Fix and document the naturalvar feature override behaviour - the naturalvar
-            feature attached to a variable name has precedence over the naturalvar
-            feature attached to the variable's type. The overriding was not working
-            when turning the feature off on the variable's name.
-
-            Fix so that any use of the naturalvar feature will override the global
-            setting. Previously when set globally by -naturalvar or %module(naturalvar=1),
-            use of the naturalvar feature was not always honoured.
-
-2014-01-06: ianlancetaylor
-	    [Go] Fix bug that broke using directors from a thread not
-	    created by Go.
-
-2013-12-24: ptomulik
-            [Python] SF Bug #1297
-
-            Resolve several issues related to python imports.
-            For example, it's now possible to import modules having the same module
-            names, but belonging in different packages.
-            
-            From the user's viewpoint, this patch gives a little bit more control on
-            import statements generated by SWIG. The user may choose to use relative
-            or absolute imports.
-            
-            Some details:
-              - we (still) generate import statements in the form 'import a.b.c' which
-                corresponds to absolute imports in python3 and (the only available)
-                ambiguous one in python2.
-              - added -relativeimport option to use explicit relative import syntax
-                (python3),
-
-            The "Python Packages" section in the documentation discusses how to work
-            with importing packages including the new -relativeimport command line option.
-
-2013-12-23: vadz
-            [Octave, Perl, Python, R, Ruby, Tcl] Change the length of strings created from fixed-size char
-            buffers in C code.
-
-            This is a potential backwards compatibility break: a "char buf[5]" containing "ho\0la" was
-            returned as a string of length 5 before, but is returned as a string of length 2 now. Also,
-            it was possible to assign a (non-NUL-terminated) string "hello" to such a buffer before but
-            now this fails and only "helo" can fit.
-
-            Apply "char FIXSIZE[ANY]" typemaps to explicitly choose the old behaviour.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2013-12-23: talby
-            [Perl] Add support for directors.
-
-2013-12-18: ianlancetaylor
-	    [Go] Don't require that Go environment variables be set
-	    when running examples or testsuite when using Go 1 or
-	    later.
-
-2013-12-17: ianlancetaylor
-	    [Go] Remove -longsize option (for backward compatibility,
-	    ignore it if seen).
-
-2013-12-17: ianlancetaylor
-	    [Go] Add -go-pkgpath option.
-
-2013-12-16: ianlancetaylor
-	    [Go] Update for Go 1.2 release.  Add support for linking
-	    SWIG code directly into executable, rather than using a
-	    shared library.
-
-2013-12-13: ianlancetaylor
-	    [Go] Add SWIG source file name as comments in generated
-	    files.  This can be used by Go documentation tools.
-
-2013-12-12: jleveque
-	    [Lua] Fix typo (wchar instead of wchar_t) which made wchar.i
-	    for Lua useless.
-
-2013-12-12: vmiklos
-	    [PHP] PHP's peculiar call-time pass-by-reference feature was
-	    deprecated in PHP 5.3 and removed in PHP 5.4, so update the REF
-	    typemaps in phppointers.i to specify pass-by-reference in the
-	    function definition.  Examples/php/pointer has been updated
-	    accordingly.
-
-2013-12-12: olly
-	    [PHP] The usage of $input in PHP directorout typemaps has been
-	    changed to be consistent with other languages.  The typemaps
-	    provided by SWIG have been updated accordingly, but if you
-	    have written your own directorout typemaps, you'll need to
-	    update $input to &$input (or make equivalent changes).
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2013-11-27: vadz
-            [C#, Java, Python] Add std_auto_ptr.i defining typemaps for returning std::auto_ptr<>.
-
-2013-11-09: wsfulton
-            [C#] Apply patch #79 from Brant Kyser
-              - Remove using directives from the generated C# code and fully qualify the use of all .NET
-                framework types in order to minimize potential name collisions from input files defining
-                types, namespace, etc with the same name as .NET framework members.
-              - Globally qualify the use of .NET framework types in the System namespace
-              - Remove .NET 1.1 support, .NET 2 is the minimum for the C# module
-
-            This is a potential backwards compatibility break if code has been added relying on these using
-            statements that used to be generated:
-
-              using System;
-              using System.Runtime.InteropServices;
-
-            The quick fix to add these back in is to add the -DSWIG2_CSHARP command line option when
-            executing SWIG. See CSharp.html documentation for more info.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2013-11-05: wsfulton
-            [Java] Fix some corner cases for the $packagepath/$javaclassname special variable substitution.
-
-2013-11-05: wsfulton
-            [Java] Apply patch #91 from Marvin Greenberg - Add director:except feature for improved
-            exception handling in director methods for Java.
-
-2013-10-15: vadz
-            Allow using \l, \L, \u, \U and \E in the substitution part of %(regex:/pattern/subst/)
-            inside %rename to change the case of the text being replaced.
-
-2013-10-12: wsfulton
-            [CFFI] Apply #96 - superclass not lispify
-
-2013-10-12: wsfulton
-            Merge in C++11 support from the gsoc2009-matevz branch where Matevz Jekovec first
-            started the C++0x additions. Documentation of the C++11 features supported is in a
-            new Chapter of the documentation, "SWIG and C++11" in Doc/Manual/CPlusPlus11.html.
-
-2013-10-04: wsfulton
-            Fix %naturalvar not having any affect on templated classes instantiated with an
-            enum as the template parameter type. Problem reported by Vadim Zeitlin.
-
-2013-09-20: wsfulton
-            [Java] Fix a memory leak for the java char **STRING_ARRAY typemaps.
-
-Version 2.0.12 (9 Feb 2014)
-===========================
-
-2014-01-16: wsfulton
-            [PHP] Fix compilation error in ZTS mode (64 bit windows) due to incorrect placement
-            of TSRMLS_FETCH() in SWIG_Php_GetModule() as reported by Mark Dawson-Butterworth.
-
-2014-01-13: kwwette
-            [Octave] update support to Octave version 3.8.0
-
-            - Octave 3.8.0 no longer defines OCTAVE_API_VERSION_NUMBER, but 3.8.1
-              will define OCTAVE_{MAJOR,MINOR,PATCH}_VERSION instead: see
-                http://hg.savannah.gnu.org/hgweb/octave/rev/b6b6e0dc700e
-              So we now use a new macro SWIG_OCTAVE_PREREQ(major,minor,patch) to
-              enable features requiring Octave version major.minor.patch or later.
-
-              For Octave versions prior to 3.8.1, we reconstruct values for
-              OCTAVE_{MAJOR,MINOR,PATCH}_VERSION based on OCTAVE_API_VERSION_NUMBER,
-              extracted from Octave's ChangeLogs. An additional hack is needed to
-              distinguish between Octave <= 3.2.x and 3.8.0, neither of which define
-              OCTAVE_API_VERSION_NUMBER.
-
-            - Octave 3.8.0 deprecates symbol_table::varref(), so remove its use
-              for this and future versions of Octave.
-
-            - Octave 3.8.0 removes octave_value::is_real_nd_array(), used in
-              octave_swig_type::dims(). Its use is not required here, so remove it.
-
-            - Retested against Octave versions 3.0.5, 3.2.4, 3.4.3, 3.6.4, and 3.8.0.
-
-            - Updated Octave documentation with tested Octave versions, and added a
-              warning against using versions <= 3.x.x, which are no longer tested.
-
-2013-12-22: wsfulton
-            C++11 support for new versions of erase and insert in the STL containers.
-
-            The erase and insert methods in the containers use const_iterator instead
-            of iterator in C++11.  There are times when the methods wrapped must match
-            the parameters exactly. Specifically when full type information for
-            template types is missing or SWIG fails to look up the type correctly,
-            for example:
-
-              %include <std_vector.i>
-              typedef float Real;
-              %template(RealVector) std::vector<Real>;
-
-            SWIG does not find std::vector<Real>::iterator because %template using
-            typedefs does not always work and so SWIG doesn't know if the type is
-            copyable and so uses SwigValueWrapper<iterator> which does
-            not support conversion to another type (const_iterator). This resulted
-            in compilation errors when using the C++11 version of the containers.
-
-            Closes #73
-
-2013-10-17: wsfulton
-            [R] Fix SF #1340 - Visual Studio compile error in C++ wrappers due to #include <exception>
-            within extern "C" block.
-
-2013-10-17: wsfulton
-            [Python] Fix SF #1345 - Missing #include <stddef.h> for offsetof when using -builtin.
-
-2013-10-12: wsfulton
-            [Lua] Apply #92 - missing return statements for SWIG_Lua_add_namespace_details()
-            and SWIG_Lua_namespace_register().
-
-Version 2.0.11 (15 Sep 2013)
-============================
-
-2013-09-15: wsfulton
-            [R] Fix attempt to free a non-heap object in OUTPUT typemaps for:
-              unsigned short *OUTPUT
-              unsigned long *OUTPUT
-              signed long long *OUTPUT
-              char *OUTPUT
-              signed char*OUTPUT
-              unsigned char*OUTPUT
-
-2013-09-12: wsfulton
-            [Lua] Pull Git patch #62.
-              1) Static members and static functions inside class can be accessed as
-                 ModuleName.ClassName.FunctionName (MemberName respectively). Old way such as
-                 ModuleName.ClassName_FunctionName still works.
-              2) Same goes for enums inside classes: ModuleName.ClassName.EnumValue1 etc.
-
-2013-09-12: wsfulton
-            [UTL] Infinity is now by default an acceptable value for type 'float'. This fix makes
-            the handling of type 'float' and 'double' the same. The implementation requires the
-            C99 isfinite() macro, or otherwise some platform dependent equivalents, to be available.
-
-            Users requiring the old behaviour of not accepting infinity, can define a 'check' typemap
-            wherever a float is used, such as:
-
-              %typemap(check,fragment="<float.h>") float, const float & %{
-                if ($1 < -FLT_MAX || $1 > FLT_MAX) {
-                  SWIG_exception_fail(SWIG_TypeError, "Overflow in type float");
-                }
-              %}
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2013-08-30: wsfulton
-            [Lua] Pull Git patch #81: Include Lua error locus in SWIG error messages.  
-            This is standard information in Lua error messages, and makes it much
-            easier to find bugs.
-
-2013-08-29: wsfulton
-            Pull Git patch #75: Handle UTF-8 files with BOM at beginning of file. Was giving an
-            'Illegal token' syntax error.
-
-2013-08-29: wsfulton
-            [C#] Pull Git patch #77: Allow exporting std::map using non-default comparison function.
-
-2013-08-28: wsfulton
-            [Python] %implicitconv is improved for overloaded functions. Like in C++, the methods
-            with the actual types are considered before trying implicit conversions. Example:
-
-              %implicitconv A;
-              struct A {
-                A(int i);
-              };
-              class CCC {
-                public:
-                  int xx(int i) { return 11; }
-                  int xx(const A& i) { return 22; }
-              };
-
-            The following python code:
-
-              CCC().xx(-1)
-
-            will now return 11 instead of 22 - the implicit conversion is not done.
-
-2013-08-23: olly
-	    [Python] Fix clang++ warning in generated wrapper code.
-
-2013-08-16: wsfulton
-            [Python] %implicitconv will now accept None where the implicit conversion takes a C/C++ pointer.
-            Problem highlighted by Bo Peng. Closes SF patch #230.
-
-2013-08-07: wsfulton
-            [Python] SF Patch #326 from Kris Thielemans - Remove SwigPyObject_print and SwigPyObject_str and
-            make the generated wrapper use the default python implementations, which will fall back to repr
-            (for -builtin option).
-
-            Advantages:
-            - it avoids the swig user having to jump through hoops to get print to work as expected when
-              redefining repr/str slots.
-            - typing the name of a variable on the python prompt now prints the result of a (possibly redefined)
-              repr, without the swig user having to do any extra work.
-            - when redefining repr, the swig user doesn't necessarily have to redefine str as it will call the
-              redefined repr
-            - the behaviour is exactly the same as without the -builtin option while requiring no extra work
-              by the user (aside from adding the %feature("python:slot...) statements of course)
-
-            Disadvantage:
-            - default str() will give different (but clearer?) output on swigged classes
-
-2013-07-30: wsfulton
-            [Python, Ruby] Fix #64 #65: Missing code in std::multimap wrappers. Previously an instantiation
-            of a std::map was erroneously required in addition to an instantiation of std::multimap with the
-            same template parameters to prevent compilation errors for the wrappers of a std::multimap.
-
-2013-07-14: joequant
-            [R] Change types file to allow for SEXP return values
-
-2013-07-05: wsfulton
-            [Python] Add %pythonbegin directive which works like %pythoncode, except the specified code is
-            added at the beginning of the generated .py file. This is primarily needed for importing from
-            __future__ statements required to be at the very beginning of the file. Example:
-
-              %pythonbegin %{
-              from __future__ import print_function
-              print("Loading", "Whizz", "Bang", sep=' ... ')
-              %}
-
-2013-07-01: wsfulton
-            [Python] Apply SF patch #340 - Uninitialized variable fix in SWIG_Python_NonDynamicSetAttr
-            when using -builtin.
-
-2013-07-01: wsfulton
-            [Python, Ruby, Ocaml] Apply SF patch #341 - fix a const_cast in generated code that was generating
-            a <:: digraph when using the unary scope operator (::) (global scope) in a template type.
-
-2013-07-01: wsfulton
-            [Python] Add SF patch #342 from Christian Delbaere to fix some director classes crashing on
-            object deletion when using -builtin. Fixes SF bug #1301.
-
-2013-06-11: wsfulton
-            [Python] Add SWIG_PYTHON_INTERPRETER_NO_DEBUG macro which can be defined to use the Release version
-            of the Python interpreter in Debug builds of the wrappers. The Visual Studio .dsp example
-            files have been modified to use this so that Debug builds will now work without having
-            to install or build a Debug build of the interpreter.
-
-2013-06-07: wsfulton
-	    [Ruby] Git issue #52. Fix regression with missing rb_complex_new function for Ruby
-            versions prior to 1.9 using std::complex wrappers if just using std::complex as an output type.
-            Also fix the Complex helper functions external visibility (to static by default).
-
-2013-06-04: olly
-	    [PHP] Fix SWIG_ZTS_ConvertResourcePtr() not to dereference NULL
-	    if the type lookup fails.
-
-Version 2.0.10 (27 May 2013)
-============================
-
-2013-05-25: wsfulton
-            [Python] Fix Python 3 inconsistency when negative numbers are passed
-            where a parameter expects an unsigned C type. An OverFlow error is
-            now consistently thrown instead of a TypeError.
-
-2013-05-25: Artem Serebriyskiy
-            SVN Patch ticket #338 - fixes to %attribute macros for template usage
-            with %arg.
-
-2013-05-19: wsfulton
-            Fix ccache-swig internal error bug due to premature file cleanup.
-
-            Fixes SF bug 1319 which shows up as a failure in the ccache tests on
-            Debian 64 bit Wheezy, possibly because ENABLE_ZLIB is defined.
-
-            This is a corner case which will be hit when the maximum number of files
-            in the cache is set to be quite low (-F option), resulting in a cache miss.
-
-2013-05-09: kwwette
-            [Octave] Fix bugs in Octave module loading:
-            - fix a memory leak in setting of global variables
-            - install functions only once, to speed up module loads
-
-2013-04-28: gjanssens
-            [Guile] Updates in guile module:
-            - Add support for guile 2.0
-            - Drop support for guile 1.6
-            - Drop support for generating wrappers using guile's gh interface.
-              All generated wrappers will use the scm interface from now on.
-            - Deprecate -gh and -scm options. They are no longer needed.
-              A warning will be issued when these options are still used.
-            - Fix all tests and examples to have a successful travis test
-
-2013-04-18: wsfulton
-            Apply Patch #36 from Jesus Lopez to add support for $descriptor() special variable macro expansion 
-            in fragments. For example:
-
-              %fragment("nameDescriptor", "header")
-              %{
-                static const char *nameDescriptor = "$descriptor(Name)";
-              %}
-
-            which will generate into the wrapper if the fragment is used:
-
-              static const char *nameDescriptor = "SWIGTYPE_Name";
-
-2013-04-18: wsfulton
-            Fix SF Bug #428 - Syntax error when preprocessor macros are defined inside of enum lists, such as:
-
-              typedef enum {
-                eZero = 0
-              #define ONE 1
-              } EFoo;
-
-            The macros are silently ignored.
-
-2013-04-17: wsfulton
-            [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjunction with directors.
-
-2013-04-15: kwwette
-            [Octave] Fix bugs in output of cleanup code.
-            - Cleanup code is now written also after the "fail:" label, so it will be called if
-              a SWIG_exception is raised by the wrapping function, consistent with other modules.
-            - Octave module now also recognises the "$cleanup" special variable, if needed.
-
-2013-04-08: kwwette
-            Add -MP option to SWIG for generating phony targets for all dependencies.
-            - Prevents make from complaining if header files have been deleted before
-              the dependency file has been updated.
-            - Modelled on similar option in GCC.
-
-2013-04-09: olly
-	    [PHP] Add missing directorin typemap for char* and char[] which
-	    fixes director_string testcase failure.
-
-2013-04-05: wsfulton
-            [Ruby] SF Bug #1292 - Runtime fixes for Proc changes in ruby-1.9 when using STL
-            wrappers that override the default predicate, such as:
-
-              %template(Map) std::map<swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ, swig::BinaryPredicate<> >;
-
-2013-04-05: wsfulton
-            [Ruby] SF Bug #1159 - Correctly check rb_respond_to call return values to fix some
-            further 1.9 problems with functors and use of Complex wrappers.
-
-2013-04-02: wsfulton
-            [Ruby] Runtime fixes for std::complex wrappers for ruby-1.9 - new native Ruby complex numbers are used.
-
-2013-03-30: wsfulton
-            [Ruby] Fix seg fault when using STL containers of generic Ruby types, GC_VALUE or LANGUAGE_OBJECT,
-            on exit of the Ruby interpreter. More frequently observed in ruby-1.9.
-
-2013-03-29: wsfulton
-            [Ruby] Fix delete_if (reject!) for the STL container wrappers which previously would
-            sometimes seg fault or not work.
-
-2013-03-25: wsfulton
-            [Python] Fix some undefined behaviour deleting slices in the STL containers.
-
-2013-03-19: wsfulton
-            [C#, Java, D] Fix seg fault in SWIG using directors when class and virtual method names are
-            the same except being in different namespaces when the %nspace feature is not being used.
-
-2013-02-19: kwwette
-            Fix bug in SWIG's handling of qualified (e.g. const) variables of array type. Given the typedef
-              a(7).q(volatile).double myarray     // typedef volatile double[7] myarray;
-            the type
-              q(const).myarray                    // const myarray
-            becomes
-              a(7).q(const volatile).double       // const volatile double[7]
-            Previously, SwigType_typedef_resolve() produces the type
-              q(const).a(7).q(volatile).double    // non-sensical type
-            which would never match %typemap declarations, whose types were parsed correctly.
-            Add typemap_array_qualifiers.i to the test suite which checks for the correct behaviour.
-
-2013-02-18: wsfulton
-            Deprecate typedef names used as constructor and destructor names in %extend. The real
-            class/struct name should be used.
-
-              typedef struct tagEStruct {
-                int ivar;
-              } EStruct;
-
-              %extend tagEStruct {
-                EStruct() // illegal name, should be tagEStruct()
-                {
-                  EStruct *s = new EStruct();
-                  s->ivar = ivar0;
-                  return s;
-                }
-                ~EStruct() // illegal name, should be ~tagEStruct()
-                {
-                  delete $self;
-                }
-              }
-
-            For now these trigger a warning:
-
-              extend_constructor_destructor.i:107: Warning 522: Use of an illegal constructor name 'EStruct' in
-              %extend is deprecated, the constructor name should be 'tagEStruct'.
-              extend_constructor_destructor.i:111: Warning 523: Use of an illegal destructor name 'EStruct' in
-              %extend is deprecated, the destructor name should be 'tagEStruct'.
-
-            These %extend destructor and constructor names were valid up to swig-2.0.4, however swig-2.0.5 ignored
-            them altogether for C code as reported in SF bug #1306. The old behaviour of using them has been
-            restored for now, but is officially deprecated. This does not apply to anonymously defined typedef
-            classes/structs such as:
-
-              typedef struct {...} X;
-
-2013-02-17: kwwette
-            When generating functions provided by %extend, use "(void)" for no-argument functions
-            instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes".
-
-2013-02-17: kwwette
-            [Octave] Minor fix to autodoc generation: get the right type for functions returning structs.
-
-2013-02-15: wsfulton
-            Deprecate typedef names used in %extend that are not the real class/struct name. For example:
-
-              typedef struct StructBName {
-                int myint;
-              } StructB;
-
-              %extend StructB {
-                void method() {}
-              }
-
-            will now trigger a warning:
-
-              swig_extend.i:19: Warning 326: Deprecated %extend name used - the struct name StructBName
-              should be used instead of the typedef name StructB.
-
-            This is only partially working anyway (the %extend only worked if placed after the class
-            definition). 
-
-2013-02-09: wsfulton
-            [CFFI] Apply patch #22 - Fix missing package before &body
-
-2013-01-29: wsfulton
-            [Java] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5.
-
-2013-01-28: wsfulton
-            [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False.
-
-2013-01-28: wsfulton
-            [Java] Apply patch SF #335 - Truly ignore constructors in directors with %ignore.
-
-2013-01-18: Brant Kyser
-            [Java] Patch #15 - Allow the use of the nspace feature without the -package commandline option.
-            This works as long and the new jniclasspackage pragma is used to place the JNI intermediate class
-            into a package and the nspace feature is used to place all exposed types into a package.
-
-2013-01-15: wsfulton
-            Fix Visual Studio examples to work when SWIG is unzipped into a directory containing spaces.
-
-2013-01-15: wsfulton
-            [C#] Fix cstype typemap lookup for member variables so that a fully qualified variable name
-            matches. For example:
-              %typemap(cstype) bool MVar::mvar "MyBool"
-              struct MVar {
-                bool mvar;
-              };
-
-2013-01-11: Brant Kyser
-	    [Java, C#, D] SF Bug #1299 - Fix generated names for when %nspace is used on
-            classes with the same name in two different namespaces.
-
-2013-01-11: Vladimir Kalinin
-	    [C#] Add support for csdirectorin 'pre', 'post' and 'terminator' attributes.
-
-2013-01-08: olly
-	    [PHP] Fix to work with a ZTS build of PHP (broken in 2.0.7).
-
-2013-01-07: olly
-	    Fix bashism in configure, introduced in 2.0.9.
-
-2013-01-06: wsfulton
-            Pull patch #4 from ptomulik to fix SF Bug #1296 - Fix incorrect warning for virtual destructors
-            in templates, such as:
-             Warning 521: Illegal destructor name B< A >::~B(). Ignored.
-
-2013-01-05: wsfulton
-            [Python] Pull patch #3 from ptomulik to fix SF Bug #1295 - standard exceptions as
-            classes using the SWIG_STD_EXCEPTIONS_AS_CLASSES macro.
-
-2013-01-04: wsfulton
-            [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction
-            with directors.
-
-2013-01-03: wsfulton
-            [Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when
-            multilevel namespaces are used.
-
-Version 2.0.9 (16 December 2012)
-================================
-
-2012-12-16: wsfulton
-            Fix garbage line number / empty file name reporting for some missing
-            '}' or ')' error messages.
-
-2012-12-15: kkaempf
-            [Ruby] Apply patch 3530444, Class#methods and Class#constants returns array of
-            symbols in Ruby 1.9+
-
-2012-12-14: kkaempf
-            [Ruby] Apply patch 3530439 and finally replace all occurrences of the STR2CSTR() macro
-            with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9
-
-2012-12-14: kkaempf
-            [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include
-            paths to match Ruby 1.9+
-
-2012-12-14: wsfulton
-            [CFFI] Fix #3161614 - Some string constants are incorrect
-
-2012-12-13: wsfulton
-            [CFFI] Fix #3529690 - Fix incorrect constant names.
-
-2012-12-12: drjoe
-	    [R] add fix to finalizer that was missed earlier
-
-2012-12-11: wsfulton
-            [Python] Apply patch #3590522 - fully qualified package paths for Python 3 even if a module is in the
-            same package.
-
-2012-12-08: wsfulton
-            [Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types.
-
-2012-12-08: wsfulton
-            [Perl] Fix bug #3571361 - C++ comment in C wrappers.
-
-2012-12-07: wsfulton
-            [C#] Apply patch #3571029 which adds missing director support for const unsigned long long &.
-
-2012-11-28: kwwette
-            [Octave] Simplified module loading: now just the syntax
-            $ example;
-            is accepted, which loads functions globally but constants and variables relative to the current scope.
-            This make module loading behaviour reliably consistent, and reduces problems when loading modules which
-            depend on other modules which may not have been previously loaded.
-
-2012-11-27: wsfulton
-            [cffi] Fix junk output when wrapping single character literal constants.
-
-2012-11-17: wsfulton
-            [Tcl, Modula3] Add missing support for -outdir.
-
-2012-11-17: wsfulton
-            Fix segfaults when using filename paths greater than 1024 characters in length.
-
-2012-11-14: wsfulton
-            [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using
-            memory after it has been deleted.
-
-2012-11-09: vzeitlin
-            [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type.
-
-2012-11-09: wsfulton
-            Fix some feature matching issues for implicit destructors and implicit constructors and implicit
-            copy constructors added with %copyctor. Previously a feature for these had to be fully qualified
-            in order to match. Now the following will also match:
-
-              %feature("xyz") ~XXX();
-              struct XXX {};
-
-2012-11-09: wsfulton
-            Further consistency in named output typemap lookups for implicit constructors and destructors and
-            implicit copy constructors added with %copyctor. Previously only the fully qualified name was being
-            used, now the unqualified name will also be used. For example, previously:
-
-              example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More
-                Looking for: void Space::More::~More
-                Looking for: void
-
-            Now the unqualified name is also used:
-
-              example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More
-                Looking for: void Space::More::~More
-                Looking for: void ~More
-                Looking for: void
-
-2012-11-02: wsfulton
-            Fix some subtle named output typemap lookup misses, the fully qualified name was not always being
-            used for variables, for example:
-
-              struct Glob {
-                int MyVar;
-              };
-
-            Previously the search rules (as shown by -debug-tmsearch) for the getter wrapper were:
-
-              example.i:44: Searching for a suitable 'out' typemap for: int MyVar
-                Looking for: int MyVar
-                Looking for: int
-
-            Now the scope is named correctly:
-
-              example.i:44: Searching for a suitable 'out' typemap for: int Glob::MyVar
-                Looking for: int Glob::MyVar
-                Looking for: int MyVar
-                Looking for: int
-
-2012-10-26: wsfulton
-            Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously
-            the name was ignored during the typemap search. Applies to the following list of typemaps: 
-            directorout, csdirectorout, cstype, imtype, ctype, ddirectorout, dtype, gotype, jtype, jni, javadirectorout.
-
-2012-10-11: wsfulton
-            Most of the special variables available for use in %exception are now also available for expansion in
-            %extend blocks. These are: $name $symname $overname $decl $fulldecl $parentclassname $parentclasssymname, see docs
-            on "Class extension" in SWIGPlus.html. Patch based on submission from Kris Thielemans.
-
-2012-10-10: wsfulton
-            Additional new special variables in %exception are expanded as follows:
-              $parentclassname - The parent class name (if any) for a method.
-              $parentclasssymname - The target language parent class name (if any) for a method.
-
-2012-10-08: iant
-	    [Go] Generating Go code now requires using the -intgosize option to
-	    indicate the size of the 'int' type in Go.  This is because the
-	    size of the type is changing from Go 1.0 to Go 1.1 for x86_64. 
-
-2012-09-14: wsfulton
-	    Add new warning if the empty template instantiation is used as a base class, for example:
-
-              template <typename T> class Base {};
-              %template() Base<int>;
-              class Derived : public Base<int> {};
-
-            gives the following warning instead of silently ignoring the base:
-
-            cpp_inherit.i:52: Warning 401: Base class 'Base< int >' has no name as it is an empty template instantiated with '%template()'. Ignored.
-            cpp_inherit.i:51: Warning 401: The %template directive must be written before 'Base< int >' is used as a base class and be declared with a name.
-
-
-2012-09-11: wsfulton
-	    [Java] Fix #3535304 - Direct use of a weak global reference in directors
-            sometimes causing seg faults especially on Android.
-
-2012-09-06: wsfulton
-	    [Java] Fix (char *STRING, size_t LENGTH) typemaps to accept NULL string.
-
-2012-08-26: drjoe
-	    [R] make ExternalReference slot ref to contain reference
-
-2012-08-26: drjoe
-	    [R] fix Examples/Makefile to use C in $(CC) rather than $(CXX)
-
-Version 2.0.8 (20 August 2012)
-==============================
-
-2012-08-15: wsfulton
-            [Perl] Add size_type, value_type, const_reference to the STL containers.
-
-2012-08-15: wsfulton
-            [Python] Add discard and add methods to std::set wrappers so that pyabc.i can be used ensuring
-            MutableSet is a valid abstract base class for std::set. As reported by Alexey Sokolov.
-            Similarly for std::multiset.
-
-2012-08-15: wsfulton
-            [Python] Fix #3541744 - Missing PyInt_FromSize_t calls for Python 3.
-
-2012-08-13: wsfulton
-            [Java] Patch from David Baum to add the assumeoverride feature for Java directors to
-            improve performance when all overridden methods can be assumed to be overridden.
-
-2012-08-05: wsfulton
-            [Python] #3530021 Fix unused variable warning.
-
-2012-08-05: wsfulton
-            [C#] Fix #3536360 - Invalid code sometimes being generated for director methods
-            with many arguments.
-
-2012-08-05: wsfulton
-            [Perl] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using 
-            Perl 5.16 and later.
-
-2012-08-04: wsfulton
-            Remove incorrect warning (314) about target language keywords which were triggered
-            by using declarations and using directives. For example 'string' is a keyword in C#:
-              namespace std { class string; }
-              using std::string;
-
-2012-07-21: wsfulton
-            Fix display of pointers in various places on 64 bit systems - only 32 bits were being shown.
-
-2012-07-21: wsfulton
-            Fix gdb debugger functions 'swigprint' and 'locswigprint' to display to the gdb output window
-            rather than stdout. This fixes display problems in gdbtui and the ensures the output
-            appears where expected in other gdb based debuggers such as Eclipse CDT.
-
-2012-07-20: kwwette
-            [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit().
-
-2012-07-02: wsfulton
-            Fix Debian bug http://bugs.debian.org/672035, typemap copy failure - regression introduced 
-            in swig-2.0.5:
-              %include<stl.i>
-              using std::pair;
-              %template(StrPair) pair<std::string, std::string>;
-
-2012-07-02: wsfulton
-            Fix using declarations combined with using directives with forward class declarations so that
-            types are correctly found in scope for templates. Example:
-
-              namespace Outer2 {
-                namespace Space2 {
-                  template<typename T> class Thing2;
-                }
-              }
-              using namespace Outer2;
-              using Space2::Thing2;
-              template<typename T> class Thing2 {};
-              // STILL BROKEN void useit2(Thing2<int> t) {}
-              void useit2a(Outer2::Space2::Thing2<int> t) {}
-              void useit2b(::Outer2::Space2::Thing2<int> t) {}
-              void useit2c(Space2::Thing2<int> t) {}
-              namespace Outer2 {
-                void useit2d(Space2::Thing2<int> t) {}
-              }
-
-              %template(Thing2Int) Thing2<int>;
-
-
-2012-06-30: wsfulton
-            Fix template namespace problems for symbols declared with a forward class declarations, such as:
-
-              namespace Space1 {
-                namespace Space2 {
-                  template<typename T> struct YYY;
-                }
-                template<typename T> struct Space2::YYY {
-                  T yyy(T h) {
-                    return h;
-                  }    
-                };
-                void testYYY1(Space1::Space2::YYY<int> yy) {}
-                void testYYY2(Space2::YYY<int> yy) {}
-                void testYYY3(::Space1::Space2::YYY<int> yy) {}
-              }
-
-              %template(YYYInt) Space1::Space2::YYY<int>;
-
-2012-06-30: wsfulton
-            Fix namespace problems for symbols declared with a forward class declarations, such as:
-
-              namespace Space1 {
-                namespace Space2 {
-                  struct XXX;
-                  struct YYY;
-                }
-
-                struct Space2::YYY {};
-                struct Space1::Space2::XXX {};
-
-                void testXXX2(Space2::XXX xx) {}
-                void testYYY2(Space2::YYY yy) {}
-              }
-
-            where xx and yy were not recognised as the proxy classes XXX and YYY.
-
-2012-06-30: wsfulton
-            Fix using declarations combined with using directives with forward class declarations so that
-            types are correctly found in scope. 
-
-              namespace Outer2 {
-                namespace Space2 {
-                  class Thing2;
-                }
-              }
-              using namespace Outer2;
-              using Space2::Thing2;
-              class Thing2 {};
-              // None of the methods below correctly used the Thing2 proxy class
-              void useit2(Thing2 t) {}
-              void useit2a(Outer2::Space2::Thing2 t) {}
-              void useit2b(::Outer2::Space2::Thing2 t) {}
-              void useit2c(Space2::Thing2 t) {}
-              namespace Outer2 {
-                void useit2d(Space2::Thing2 t) {}
-              }
-
-2012-06-25: wsfulton
-            Fix using declarations combined with using directives so that types are correctly found in scope.
-            Example:
-
-              namespace Outer2 {
-                namespace Space2 {
-                  class Thing2 {};
-                }
-              }
-              using namespace Outer2; // using directive
-              using Space2::Thing2; // using declaration
-              void useit2(Thing2 t) {}
-
-            Similarly for templated classes.
-
-2012-05-29: wsfulton
-            Fix #3529601 - seg fault when a protected method has the "director"
-            feature but the parent class does not. Also fix similar problems with
-            the allprotected feature.
-
-2012-05-28: wsfulton
-            Fix seg fault when attempting to warn about an illegal destructor - #3530055, 3530078 and #3530118.
-
-Version 2.0.7 (26 May 2012)
-===========================
-2012-05-26: wsfulton
-            std::string typemap modifications so they can be used with %apply for other string
-            classes.
-
-2012-05-25: wsfulton
-            [Lua] Fixes for -external-runtime to work again.
-
-2012-05-22: szager
-	    [python] Disambiguate SWIG_From_unsigned_SS_int and SWIG_From_unsigned_SS_long.
-
-2012-05-18: olly
-	    [PHP] Fix getters for template members. (SF#3428833, SF#3528035)
-
-2012-05-14: wsfulton
-            Fix some language's std::map wrappers to recognise difference_type, size_type, key_type
-            and mapped_type.
-
-2012-05-14: kwwette (signed off by xavier98)
-            [Octave] Prevent Octave from seg-faulting at exit when SWIG
-            modules are loaded, due to bugs in Octave's cleanup code:
-            * Wrapping functions now declared with Octave DEFUN_DLD macro,
-              and loaded through Octave's dynamic module loader
-            * Global variables of swigref type are now assigned a new()
-              copy of the swigref class, to prevent double-free errors
-            * SWIG module at-exit cleanup function now created in Octave
-              through eval(), so not dependent on loaded .oct library
-            * For Octave versions 3.1.* to 3.3.*, register C-level at-exit
-              function which terminates Octave immediately (with correct
-              status code) without performing memory cleanup. This function
-              can be controlled with macros in Lib/octave/octruntime.swg
-
-            [Octave] New syntax for determing whether SWIG module should be
-            loaded globally or non-globally. To load module "example" globally,
-            type the module name
-            $ example;
-            as before; to load module non-globally, assign it to a variable:
-            $ example = example;
-            or
-            $ ex = example;
-            for a shorter (local) module name. -global/-noglobal command-line
-            options and module command line are deprecated. Added usage info
-            to module, so typing
-            $ help example
-            or incorrect usage should display proper usage, with examples.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2012-05-12: olly
-	    [PHP] Fix memory leak in code generated for a callback.  Patch from
-	    SF bug #3510806.
-
-2012-05-12: olly
-	    [PHP] Avoid using zend_error_noreturn() as it doesn't work with all
-	    builds of PHP (SF bug #3166423).  Instead we now wrap it in a
-	    SWIG_FAIL() function which we annotate as "noreturn" for GCC to
-	    avoids warnings.  This also reduces the size of the compiled
-	    wrapper (e.g. the stripped size is reduced by 6% for Xapian's PHP
-	    bindings).
-
-2012-05-11: wsfulton
-            [Java] SF patch #3522855 Fix unintended uninitialised memory access in OUTPUT typemaps.
-
-2012-05-11: wsfulton
-            [Java] SF patch #3522674 Fix possible uninitialised memory access in char **STRING_OUT
-            typemap.
-
-2012-05-11: wsfulton
-            [Java] SF patch #3522611 Fix uninitialised size regression in char **STRING_ARRAY
-            introduced in swig-2.0.6.
-
-2012-05-11: wsfulton
-            SF bug #3525050 - Fix regression introduced in swig-2.0.5 whereby defining one typemap
-            method such as an 'out' typemap may hide another typemap method such as an 'in' typemap -
-            only occurs when the type is a template type where the template parameters are the same
-            via a typedef.
-
-2012-05-10: olly
-	    [PHP] Fix the constant typemaps for SWIGTYPE, etc - previously
-	    these used the wrong name for renamed constants.  Add
-	    autodoc_runme.php to the testsuite as a regression test for this.
-
-2012-05-02: ianlancetaylor
-	    [Go] Remove compatibility support for gccgo 4.6.  Using
-	    SWIG with gccgo will now require gccgo 4.7.  Using SWIG
-	    with the more commonly used gc compiler is unaffected.
-
-2012-05-01: wsfulton
-            Fix generated code for C forward enum declarations in some languages.
-
-Version 2.0.6 (30 April 2012)
-=============================
-
-2012-04-25: wsfulton
-            [Lua] Fix uninitialised variable in SWIGTYPE **OUTPUT typemaps as reported by Jim Anderson.
-
-2012-04-28: wsfulton
-            [Python] Fix compilation errors when wrapping STL containers on Mac OS X and possibly other systems.
-
-2012-04-28: wsfulton
-            [Java] Patch 3521811 from Leo Davis - char **STRING_ARRAY typemaps fixed to handle
-            null pointers.
-
-Version 2.0.5 (19 April 2012)
-=============================
-
-2012-04-14: wsfulton
-            [Lua] Apply patch #3517435 from Miles Bader - prefer to use Lua_pushglobaltable
-
-2012-04-14: wsfulton
-            [Ruby] Apply patch #3517769 from Robin Stocker to fix compile error on MacRuby using RSTRING_PTR.
-
-2012-04-13: wsfulton
-            Apply patch #3511009 from Leif Middelschulte for slightly optimised char * variable wrappers.
-
-2012-04-13: wsfulton
-            [Lua] Apply #3219676 from Shane Liesegang which adds:
-            - support for %factory
-            - a __tostring method
-            - a __disown method
-
-2012-04-13: wsfulton
-            [Xml] Apply #3513569 which adds a catchlist to the xml output.
-
-2012-04-05: olly
-	    [Lua] Add support for Lua 5.2 (patch SF#3514593 from Miles Bader)
-
-2012-03-26: xavier98
-	    [octave] Apply patch #3425993 from jgillis: add extra logic to the octave_swig_type::dims(void) method: it checks if the user has defined a __dims__ method and uses this in stead of returning (1,1)
-	    [octave] Apply patch #3424833 from jgillis: make is_object return true for swig types
-
-2012-03-24: wsfulton
-            [D] Apply #3502431 to fix duplicate symbols in multiple modules.
-
-2012-03-21: wsfulton
-            Fix #3494791 - %$isglobal for %rename matching.
-
-2012-03-20: wsfulton
-            Fix #3487706 and #3391906 - missing stddef.h include for ptrdiff_t when using %import
-            for STL containers and compiling with g++-4.6. An include of stddef.h is now only
-            generated when SWIG generates STL helper templates which require ptrdiff_t. If you 
-            were previously relying on "#include <stddef.h>" always being generated when using a
-            %include of an STL header, you may now need to add this in manually.
-
-2012-03-16: wsfulton
-            Apply patch #3392264 from Sebastien Bine to parse (unsigned) long long types in enum value assignment.
-
-2012-03-16: wsfulton
-            Apply patch #3505530 from Karl Wette to allow custom allocators in STL string classes for the UTL languages.
-
-2012-03-13: wsfulton
-            Apply patch #3468362 from Karl Wette to fix %include inside %define.
-
-2012-03-13: wsfulton
-            [Python, Ruby, Octave, R] Fix #3475492 - iterating through std::vector wrappers of enumerations.
-
-2012-02-27: xavier98 (patches from Karl Wette)
-	    [Octave] Use -globals . to load global variables in module namespace
-	    [Octave] Comment declaration of unimplemented function swig_register_director
-	    [Octave] Fix OCTAVE_PATH in octave Makefiles
-	    [Octave] Add support for std::list - fix li_std_containers_int test
-	    [Octave] Fix imports test
-
-2012-02-16: wsfulton
-            [Java] Make generated support functions in arrays_java.i static so that generated code
-            from multiple instances of SWIG can be compiled and linked together - problem reported by
-            Evan Krause.
-
-2012-01-24: wsfulton
-            Fix crash with bad regex - bug #3474250.
-
-2012-01-24: wsfulton
-            [Python] Add Python stepped slicing support to the STL wrappers (std::vector, std::list).
-            Assigning to a slice, reading a slice and deleting a slice with steps now work.
-            For example:
-
-            %template(vector_i) std::vector<int>
-
-              vi = vector_i(range(10))
-              print list(vi)
-              vi[1:4:2] = [111, 333]
-              print list(vi)
-              del vi[3:10:3]
-              print list(vi)
-              print list(vi[::-1])
-
-            gives (same behaviour as native Python sequences such as list):
-
-              [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-              [0, 111, 2, 333, 4, 5, 6, 7, 8, 9]
-              [0, 111, 2, 4, 5, 7, 8]
-              [8, 7, 5, 4, 2, 111, 0]
-
-2012-01-23: klickverbot
-            [D] Correctly annotate function pointers with C linkage.
-            [D] Exception and Error have become blessed names; removed d_exception_name test case.
-
-2012-01-20: wsfulton
-            [Python] Fix some indexing bugs in Python STL wrappers when the index is negative, eg:
-
-            %template(vector_i) std::vector<int>
-
-              iv=vector_i([0,1,2,3,4,5])
-              iv[-7:]
-
-            now returns [0, 1, 2, 3, 4, 5] instead of [5].
-
-              vv[7:9] = [22,33]
-
-            now returns [0, 1, 2, 3, 4, 5, 22, 33] instead of "index out range" error.
-
-            Also fix some segfaults when replacing ranges, eg when il is a std::list wrapper:
-
-              il[0:2] = [11]
-
-2012-01-17: wsfulton
-            [Go] Fix forward class declaration within a class when used as a base.
-
-2012-01-07: wsfulton
-            [C#] Add support for %nspace when using directors.
-
-2012-01-06: wsfulton
-            [Java] Patch #3452560 from Brant Kyser - add support for %nspace when using directors.
-
-2011-12-21: wsfulton
-            The 'directorin' typemap now accepts $1, $2 etc expansions instead of having to use workarounds -
-            $1_name, $2_name etc.
-
-2011-12-20: wsfulton
-            [Java] Add (char *STRING, size_t LENGTH) director typemaps.
-
-2011-12-20: wsfulton
-            [C#, Go, Java, D] Add support for the 'directorargout' typemap.
-
-2011-12-20: wsfulton
-            [Ocaml, Octave, PHP, Python, Ruby] Correct special variables in 'directorargout' typemap.
-            This change will break any 'directorargout' typemaps you may have written. Please change:
-              $result to $1
-              $input to $result
-
-            Also fix the named 'directorargout' DIRECTOROUT typemaps for these languages which didn't
-            previously compile and add in $1, $2 etc expansion.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2011-12-10: talby
-            [perl5] SWIG_error() now gets decorated with perl source file/line number.
-            [perl5] error handling now conforms to public XS api (fixes perl v5.14 issue).
-
-2011-12-10: wsfulton
-            [Android/Java] Fix directors to compile on Android.
-
-            Added documentation and examples for Android.
-
-2011-12-08: vadz
-	    Bug fix: Handle methods renamed or ignored in the base class correctly in the derived classes
-	    (they could be sometimes mysteriously not renamed or ignored there before).
-
-2011-12-03: klickverbot
-            [D] Fix exception glue code for newer DMD 2 versions.
-            [D] Do not default to 32 bit glue code for DMD anymore.
-            [D] Use stdc.config.c_long/c_ulong to represent C long types.
-
-2011-12-01: szager
-	    [python] Fixed bug 3447426: memory leak in vector.__getitem__.
-
-2011-11-30: wsfulton
-            [R] Remove C++ comments from generated C code.
-
-2011-11-27: olly
-	    [Python] Fix some warnings when compiling generated wrappers with
-	    certain GCC warning options (Debian bug #650246).
-
-2011-11-28: wsfulton
-            Fix #3433541 %typemap(in, numinputs=0) with 10+ arguments.
-
-2011-11-28: olly
-	    [Perl] Fix warnings when compiling generated wrappers with certain
-	    GCC warning options (Debian bug #436711).
-
-2011-11-28: olly
-	    [PHP] Update keyword list to include keywords added in PHP releases up to 5.3.
-
-2011-11-25: wsfulton
-            [C#] Provide an easy way to override the default visibility for the proxy class pointer
-            constructors and getCPtr() method. The visibility is 'internal' by default and if multiple
-            SWIG modules are being used and compiled into different assemblies, then they need to be 
-            'public' in order to use the constructor or getCPtr() method from a different assembly.
-            Use the following macros to change the visibilities in the proxy and type wrapper class:
-
-              SWIG_CSBODY_PROXY(public, public, SWIGTYPE)
-              SWIG_CSBODY_TYPEWRAPPER(public, public, public, SWIGTYPE)
-
-            [Java] Provide an easy way to override the default visibility for the proxy class pointer
-            constructors and getCPtr() method. The visibility is 'protected' by default and if multiple
-            SWIG modules are being used and compiled into different packages, then they need to be 
-            'public' in order to use the constructor or getCPtr() method from a different package.
-            Use the following macros to change the visibilities in the proxy and type wrapper class:
-
-              SWIG_JAVABODY_PROXY(public, public, SWIGTYPE)
-              SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE)
-
-            The default for Java has changed from public to protected for the proxy classes. Use the
-            SWIG_JAVABODY_PROXY macro above to restore to the previous visibilities.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2011-11-22: szager
-	    [python] Bug 3440044: #ifdef out SWIG_Python_NonDynamicSetAttr if -builtin
-	    isn't being used, to avoid unnecessary binary incompatibilities between
-	    python installations.
-
-2011-11-17: wsfulton
-            Bug fix: Remove root directory from directory search list in Windows.
-
-2011-11-13: wsfulton
-            [Ruby] Apply patch #3421876 from Robin Stocker to fix #3416818 - same class name in 
-            different namespaces confusion when using multiple modules.
-
-2011-11-11: wsfulton
-            Fix pcre-build.sh to work with non-compressed tarballs - problem reported by Adrian Blakely.
-
-2011-11-03: wsfulton
-            Expand special variables in typemap warnings, eg:
-
-              %typemap(in, warning="1000:Test warning for 'in' typemap for $1_type $1_name") int "..."
-
-2011-11-01: wsfulton
-            Fix named output typemaps not being used when the symbol uses a qualifier and contains
-            a number, eg:
-
-              %typemap(out) double ABC::m1 "..."
-
-2011-10-24: talby
-            [perl5] SF bug #3423119 - overload dispatch stack corruption fix.  Better, but more research
-            is needed on a stable path for tail calls in XS.
-
-            Also, fix for large long longs in 32 bit perl.
-
-2011-10-13: xavier98
-	    [octave] Allow Octave modules to be re-loaded after a "clear all".
-
-2011-09-19: wsfulton
-            Fix regression introduced in swig-2.0.1 reported by Teemu Ikonone leading to uncompilable code
-            when using typedef and function pointer references, for example: 
-
-              typedef int FN(const int &a, int b);
-              void *typedef_call1(FN *& precallback, FN * postcallback);
-
-2011-09-14: wsfulton
-            [Lua] Patch #3408012 from Raman Gopalan - add support for embedded Lua (eLua)
-            including options for targeting Lua Tiny RAM (LTR).
-
-2011-09-14: wsfulton
-            [C#] Add boost_intrusive_ptr.i library contribution from patch #3401571.
-
-2011-09-13: wsfulton
-            Add warnings for badly named destructors, eg:
-
-              struct KStruct {
-                ~NOT_KStruct() {}
-              };
-
-            cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored.
-
-2011-09-13: wsfulton
-            Fix %extend and destructors for templates. The destructor in %extend was not always wrapped,
-            for example:
-
-              %extend FooT {
-                ~FooT() { delete $self; } // was not wrapped as expected
-              };
-              template<class T> class FooT {};
-              %template(FooTi) FooT<int>;
-
-2011-09-13: wsfulton
-            Fix special variables such as "$decl" and "$fulldecl" in destructors to include the ~ character.
-
-2011-09-10: talby
-            [perl5] SF bug #1481958 - Improve range checking for integer types.
-            Enhance li_typemaps_runme.pl
-
-2011-09-08: wsfulton
-            Fix %extend on typedef classes in a namespace using the typedef name, for example:
-            namespace Space {
-              %extend CStruct {
-                ...
-              }
-              typedef struct tagCStruct { ... } CStruct;
-            }
-
-2011-08-31: xavier98
-	    [octave] patches from Karl Wette: improvements to module loading behavior;
-	    added example of friend operator to operator example; fixed octave panic/crash in 3.0.5;
-	    documentation improvements
-
-2011-08-30: szager
-	    [python] Bug 3400486, fix error signalling for built-in constructors.
-
-2011-08-26: wsfulton
-            [Go] Fix file/line number display for "gotype" when using typemap debugging options
-            -tmsearch and -tmused.
-
-2011-08-26: wsfulton
-            [C#, D] Fix %callback which was generating uncompilable code.
-
-2011-08-25: wsfulton
-            Fix constructors in named typedef class declarations as reported by Gregory Bronner:
-
-            typedef struct A {
-              A(){} // Constructor which was not accepted by SWIG
-              B(){} // NOT a constructor --illegal, but was accepted by SWIG
-            } B;
-
-            For C code, the fix now results in the use of 'struct A *' instead of just 'B *' in
-            the generated code when wrapping members in A, but ultimately this does not matter, as
-            they are the same thing.
-
-2011-08-23: wsfulton
-            Fix %newobject when used in conjunction with %feature("ref") as reported by Jan Becker. The
-            code from the "ref" feature was not always being generated for the function specified by %newobject.
-            Documentation for "ref" and "unref" moved from Python to the C++ chapter.
-
-2011-08-22: szager
-	    [python] Fixed memory leak with --builtin option (bug 3385089).
-
-2011-08-22: wsfulton
-            [Lua] SF patch #3394339 from Torsten Landschoff - new option -nomoduleglobal to disable installing 
-            the module table into the global namespace. Require call also returns the module table instead 
-            of a string.
-
-2011-08-09: xavier98
-            Fix bug 3387394; Octave patches for 3.4.0 compatibility, etc. (from Karl Wette)
-
-2011-08-04: wsfulton
-            Add in $symname expansion for director methods.
-
-2011-07-29: olly
-	    [PHP] Don't generate "return $r;" in cases where $r hasn't been set.
-	    This was basically harmless, except it generated a PHP E_NOTICE if
-	    the calling code had enabled them.
-
-2011-07-26: wsfulton
-            Fix scoping of forward class declarations nested within a class (for C++). Previously the symbol
-            was incorrectly put into the outer namespace, eg
-
-            namespace std {
-              template<class Key, class T> struct map {
-                class iterator;
-              };
-            }
-
-            iterator was scoped as std::iterator, but now it is correctly std::map<Key, T>::iterator;
-
-            Also fixed is %template and template parameters that are a typedef when the template contains
-            default template parameters, eg:
-
-            namespace Std {
-              template<class Key, class T, class C = int> struct Map {
-                typedef Key key_type;
-                typedef T mapped_type;
-              };
-            }
-            typedef double DOUBLE;
-            %template(MM) Std::Map<int, DOUBLE>;
-
-            All symbols within Map will be resolved correctly, eg key_type and mapped_type no matter if the
-            wrapped code uses Std::Map<int, double> or std::Map<int, DOUBLE> or Std::Map<int, double, int>
-
-            Also fixes bug #3378145 - regression introduced in 2.0.4 - %template using traits.
-
-2011-07-20  szager
-	    [python] Fix closure for tp_call slot.
-
-2011-07-16: wsfulton
-	    [python] Fix director typemap using PyObject *.
-
-2011-07-13: szager
-	    [python] SF patch #3365908 - Add all template parameters to map support code in std_map.i
-
-2011-07-13: szager
-	    [python] Fix for bug 3324753: %rename member variables with -builtin.
-
-2011-07-01: wsfulton
-	    Fix some scope and symbol lookup problems when template default parameters are being
-            used with typedef. For example:
-
-            template<typename XX, typename TT = SomeType> struct Foo {
-              typedef XX X;
-              typedef TT T;
-            };
-            template<typename TT> struct UsesFoo {
-              void x(typename Foo<TT>::T, typename Foo<TT>::X);
-            };
-
-            Also fixes use of std::vector<int>::size_type for Python as reported by Aubrey Barnard.
-
-2011-06-23: olly
-	    [PHP] Fix director code to work when PHP is built with ZTS enabled,
-	    which is the standard configuration on Microsoft Windows.
-
-2011-06-21: mutandiz
-	    [allegrocl]
-	    - various small tweaks and bug fixes.
-	    - Avoid name conflicts between smart pointer wrappers and the wrappers for
-	    the actual class.
-	    - Fix default typemaps for C bindings, which were incorrectly attempting to
-	    call non-existent destructors on user-defined types.
-	    - New feature, feature:aclmixins, for adding superclass to the foreign class
-	    wrappers.
-	    - Improve longlong typemaps.
-
-2011-06-19: wsfulton
-	    Fix incorrect typemaps being used for a symbol within a templated type, eg:
-            A<int>::value_type would incorrectly use a typemap for type A.
-
-2011-06-18: olly
-	    [Tcl] Fix variable declarations in middle of blocks which isn't
-	    permitted in C90 (issue probably introduced in 2.0.3 by patch #3224663).
-	    Reported by Paul Obermeier in SF#3288586.
-
-2011-06-17: wsfulton
-	    [Java] SF #3312505 - slightly easier to wrap char[] or char[ANY] with a Java byte[]
-            using arrays_java.i.
-
-2011-06-13: wsfulton
-	    [Ruby, Octave] SF #3310528 Autodoc fixes similar to those described below for Python.
-
-2011-06-10: wsfulton
-	    [Python] Few subtle bugfixes in autodoc documentation generation,
-            - Unnamed argument names fix for autodoc levels > 0.
-            - Display of template types fixed for autodoc levels > 1.
-            - Fix SF #3310528 - display of typedef structs for autodoc levels > 1.
-            - Add missing type for self for autodoc levels 1 and 3.
-            - autodoc levels 2 and 3 documented.
-            - Minor tweaks to autodoc style to conform with PEP8.
-
-2011-05-30: olly
-	    [PHP] Fix handling of directors when -prefix is used.
-
-2011-05-24: olly
-	    [PHP] Fix handling of methods of classes with a virtual base class (SF#3124665).
-
-Version 2.0.4 (21 May 2011)
-===========================
-
-2011-05-19: wsfulton
-	    [Guile] Patch #3191625 fixing overloading of integer types.
-
-2011-05-19: wsfulton
-	    [Perl] Patch #3260265 fixing overloading of non-primitive types and integers in 
-            Perl 5.12 and later.
-
-2011-05-19: wsfulton
-	    [Ruby] Fix %import where one of the imported files %include one of the STL include
-            files such as std_vector.i.
-
-2011-05-17: wsfulton
-	    [Java] Apply #3289851 from Alan Harder to fix memory leak in directors when checking
-            for pending exceptions.
-
-2011-05-17: wsfulton
-	    [Tcl] Apply #3300072 from Christian Delbaere to fix multiple module loading not
-            always sharing variables across modules.
-
-2011-05-16: xavier98
-	    [octave] Fix an incompatibility with never versions of Octave. Case on Octave
-	    API >= 40 to handle rename of Octave_map to octave_map.
-	    [octave] Add support for y.__rop__(x) operators when x.__op__(y) doesn't exist.
-	    [octave] Allow global operators to be defined by SWIG-wrapped functions.
-	    [octave] Fix several bugs around module namespaces; add -global, -noglobal,
-	    -globals <name> command line options to the module.
-
-2011-05-14: wsfulton
-	    %varargs when used with a numeric argument used to create an additional argument 
-            which was intended to provide a guaranteed sentinel value. This never worked and now
-            the additional argument is not generated.
-
-2011-05-13: wsfulton
-	    [python] Additional fixes for python3.2 support.
-
-2011-05-07: szager
-	    [python] Fixed PyGetSetDescr for python3.2.
-
-2011-05-05: wsfulton
-            [Lua, Python, Tcl] C/C++ prototypes shown in error message when calling an overloaded
-            method with incorrect arguments improved to show always show fully qualified name
-            and if a const method. 
-
-            Also fixed other Lua error messages in generated code which weren't consistently
-            using the fully qualified C++ name - requested by Gedalia Pasternak.
-
-2011-04-29: szager
-	    Bug 2635919: Convenience method to convert std::map to a python dict.
-
-2011-04-29: szager
-	    [Python] Fixed bug 2811549: return non-const iterators from STL
-	    methods begin(), end(), rbegin(), rend().
-
-2011-04-25: szager
-	    [Python] Fixed bug 1498929: Access to member fields in map elements
-
-2011-04-23: klickverbot
-            [D] nspace: Correctly generate identifiers for base classes when
-            not in split proxy mode.
-
-2011-04-13: szager
-	    Fixed bug 3286333: infinite recursion with mutual 'using namespace' clauses.
-
-2011-04-12: szager
-	    Fixed bug 1163440: vararg typemaps.
-
-2011-04-12: szager
-	    Fixed bug #3285386: parse error from 'operator T*&()'.  Added operator_pointer_ref
-	    test case to demonstrate.
-
-2011-04-11: szager
-	    [Python] Fixed PyVarObject_HEAD_INIT to eliminate VC++ compiler errors about
-	    static initialization of struct members with pointers.
-
-2011-04-11: wsfulton
-            [Tcl] Apply patch #3284326 from Colin McDonald to fix some compiler warnings.
-
-2011-04-11: szager
-	    [Python] Fixed PyVarObject_HEAD_INIT to eliminate VC++ compiler errors about
-	    static initialization of struct members with pointers.
-
-2011-04-10: klickverbot
-            [D] Fixed wrapping of enums that are type char, for example:
-            enum { X = 'X'; } (this was already in 2.0.3 for C# and Java)
-
-2011-04-10: klickverbot
-            [D] nspace: Fixed referencing types in the root namespace when
-            not in split proxy mode.
-
-2011-04-09: szager
-	    [Python] Applied patch #1932484: migrate PyCObject to PyCapsule.
-
-2011-04-09: szager
-	    [Python] Added preprocessor guards for python functions PyUnicode_AsWideChar and
-	    PySlice_GetIndices, which changed signatures in python3.2.
-
-2011-04-07: wsfulton
-            Fix wrapping of const array typedefs which were generating uncompilable code as
-            reported by Karl Wette.
-
-2011-04-03: szager
-	    [Python] Fixed the behavior of %pythonnondynamic to conform to the spec in Lib/pyuserdir.swg.
-
-2011-04-03: szager
-	    [Python] Merged in the szager-python-builtin branch, adding the -builtin feature
-	    for python.  The -builtin option may provide a significant performance gain
-	    in python wrappers.  For full details and limitations, refer to Doc/Manual/Python.html.
-	    A small test suite designed to demonstrate the performance gain is in
-	    Examples/python/performance.
-
-2011-04-01: wsfulton
-            Add in missing wrappers for friend functions for some target languages, mostly
-            the non-scripting languages like Java and C#.
-
-Version 2.0.3 (29 March 2011)
-=============================
-
-2011-03-29: wsfulton
-            [R] Apply patch #3239076 from Marie White fixing strings for R >= 2.7.0
-
-2011-03-29: wsfulton
-            [Tcl] Apply patch #3248280 from Christian Delbaere which adds better error messages when
-            the incorrect number or type of arguments are passed to overloaded methods.
-
-2011-03-29: wsfulton
-            [Tcl] Apply patch #3224663 from Christian Delbaere.
-            1. Fix when function returns a NULL value, a "NULL" command will be created in the Tcl interpreter
-            and calling this command will cause a segmentation fault. 
-
-            2. Previous implementation searches for class methods using a linear search causing performance issues
-            in wrappers for classes with many member functions. The patch adds a method hash table to classes and
-            changes method name lookup to use the hash table instead of doing a linear search.
-
-2011-03-26: wsfulton
-	    [C#, Java] SF bug #3195112 - fix wrapping of enums that are type char, for example:
-              enum { X = 'X'; }
-
-2011-03-21: vadz
-	    Allow setting PCRE_CFLAGS and PCRE_LIBS during configuration to override the values returned by
-	    pcre-config, e.g. to allow using a static version of PCRE library.
-
-2011-03-17: wsfulton
-	    [UTL] Add missing headers in generated STL wrappers to fix compilation with gcc-4.6.
-
-2011-03-17: wsfulton
-	    Fix regression introduced in swig-2.0.2 where filenames with spaces were not found
-	    when used with %include and %import. Reported by Shane Liesegang.
-
-2011-03-15: wsfulton
-	    [UTL] Fix overloading when using const char[], problem reported by David Maxwell.
-            Similarly for char[ANY] and const char[ANY].
-
-2011-03-15: wsfulton
-	    [C#] Apply patch #3212624 fixing std::map Keys property.
-
-2011-03-14: olly
-	    [PHP] Fix handling of overloaded methods/functions where some
-	    return void and others don't - whether this worked or not depended
-	    on the order they were encountered in (SF#3208299).
-	
-2011-03-13: klickverbot
-            [D] Extended support for C++ namespaces (nspace feature).
-
-2011-03-12: olly
-	    [PHP] Fix sharing of type information between multiple SWIG-wrapped
-	    modules (SF#3202463).
-
-2011-03-09: wsfulton
-	    [Python] Fix SF #3194294 - corner case bug when 'NULL' is used as the default value
-            for a primitive type parameter in a method declaration.
-
-2011-03-07: olly
-	    [PHP] Don't use zend_error_noreturn() for cases where the function
-	    returns void - now this issue can only matter if you have a function
-	    or method which is directed and returns non-void.
-
-2011-03-06: olly
-	    [PHP] Add casts to the typemaps for long long and unsigned long
-	    long to avoid issues when they are used with shorter types via
-	    %apply.
-
-2011-03-02: wsfulton
-	    Templated smart pointers overloaded with both const and non const operator-> generated uncompilable
-	    code when the pointee was a class with either public member variables or static methods.
-	    Regression in 2.0.x reported as working in 1.3.40 by xantares on swig-user mailing list.
-
-Version 2.0.2 (20 February 2011)
-================================
-
-2011-02-19: wsfulton
-	    [PHP] Add missing INPUT, OUTPUT and INOUT typemaps in the typemaps.i library
-            for primitive reference types as well as signed char * and bool *.
-
-2011-02-19: olly
-	    [PHP] Address bug in PHP on some platforms/architectures which
-	    results in zend_error_noreturn() not being available using
-	    SWIG_ZEND_ERROR_NORETURN which defaults to zend_error_noreturn but
-	    can be overridden when building the module by passing
-	    -DSWIG_ZEND_ERROR_NORETURN=zend_error to the compiler.  This may
-	    result in compiler warnings, but should at least allow a module
-	    to be built on those platforms/architectures (SF#3166423).
-
-2011-02-18: wsfulton
-            Fix #3184549 - vararg functions and function overloading when using the -fastdispatch option.
-
-2011-02-18: olly
-	    [PHP] An overloaded method which can return an object or a
-	    primitive type no longer causes SWIG to segfault.  Reported by Paul
-	    Colby in SF#3168531.
-
-2011-02-18: olly
-	    [PHP] Fix invalid erase during iteration of std::map in generated
-	    director code.  Reported by Cory Bennett in SF#3175820.
-
-2011-02-17: wsfulton
-            Preprocessing now warns if extra tokens appear after #else and #end.
-
-2011-02-16: wsfulton
-            Fix #1653092 Preprocessor does not error out when #elif is missing an expression.
-            This and other cases of missing preprocessor expressions now result in an error.
-
-2011-02-14: wsfulton
-            [Ocaml] Apply patch #3151788 from Joel Reymont. Brings Ocaml support up to date 
-            (ver 3.11 and 3.12), including std::string.
-
-2011-02-13: wsfulton
-            [Ruby] Apply patch #3176274 from James Masters - typecheck typemap for time_t.
-
-2011-02-13: wsfulton
-            Apply patch #3171793 from szager - protected director methods failing when -fvirtual is used.
-
-2011-02-13: wsfulton
-            Fix #1927852 - #include directives don't preprocess the file passed to it. The fix is for
-            #include with -importall or -includeall, %include and %import, for example:
-              #define FILENAME "abc.h"
-              %include FILENAME
-
-2011-02-12: wsfulton
-            Fix #1940536, overactive preprocessor which was expanding defined(...) outside of #if and #elif
-            preprocessor directives.
-
-2011-02-05: wsfulton
-            [MzScheme] SF #2942899 Add user supplied documentation to help getting started with MzScheme.
-            Update chapter name to MzScheme/Racket accounting for the rename of MzScheme to Racket.
-
-2011-02-05: wsfulton
-            [C#] SF #3085906 - Possible fix running test-suite on Mac OS X.
-
-2011-02-05: wsfulton
-            SF #3173367 Better information during configure about Boost prerequisite for running
-            the test-suite.
-
-2011-02-05: wsfulton
-            SF #3127633 Fix infinite loop in recursive typedef resolution.
-
-2011-02-04: wsfulton
-            [R] SF #3168676 Fix %rename not working for member variables and methods.
-
-2011-02-04: wsfulton
-            [clisp] SF #3148200 Fix segfault parsing nested unions.
-
-2011-02-01: wsfulton
-            [C#] Directors - a call to a method being defined in the base class, not
-            overridden in a subclass, but again overridden in a class derived from
-            the first subclass was not being dispatched correctly to the most derived class.
-            See director_alternating.i for an example.
-
-2011-02-01: wsfulton
-            [C#, Java] Any 'using' statements in the protected section of a class were previously
-            ignored with director protected (dirprot) mode.
-
-2011-01-30: wsfulton
-            Fix overloading with const pointer reference (SWIGTYPE *const&) parameters for a
-            number of scripting languages.
-
-2011-01-17: wsfulton
-            New warning for smart pointers if only some of the classes in the inheritance
-            chain are marked as smart pointer, eg, %shared_ptr should be used for all classes
-            in an inheritance hierarchy, so this new warning highlights code where this is
-            not the case.
-
-              example.i:12: Warning 520: Base class 'A' of 'B' is not similarly marked as a smart pointer.
-              example.i:16: Warning 520: Derived class 'C' of 'B' is not similarly marked as a smart pointer.
-
-2011-01-14: wsfulton
-            Added some missing multi-argument typemaps: (char *STRING, size_t LENGTH) and 
-            (char *STRING, int LENGTH). Documentation for this updated. Java patch from
-            Volker Grabsch.
-
-2011-01-11: iant
-	    Require Go version 7077 or later.
-
-2010-12-30: klickverbot
-            [C#, D, Java] Check for collision of parameter names with target
-            language keywords when generating the director glue code.
-            
-            The situation in which the generated could would previously be
-            invalid is illustrated in the new 'director_keywords' test case.
-
-2010-12-23: wsfulton
-            [C#] Fix $csinput special variable not being expanded for csvarin typemaps
-            when used for global variables. Reported by Vadim Zeitlin.
-
-2010-12-14: wsfulton
-            Fix $basemangle expansion in array typemaps. For example if type is int *[3],
-            $basemangle expands to _p_int.
-
-2010-12-07: iant
-	    Check that we are using a sufficiently new version of the
-	    6g or 8g Go compiler during configure time. If not, disable Go.
-            Minimum version is now 6707.
-
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2010-12-06: wsfulton
-            Fix #3127394 - use of network paths on Windows/MSys.
-
-2010-11-18: klickverbot
-	    [D] Added the D language module.
-
-2010-11-12: vadz
-	    Fix handling of multiple regex-using %renames attached to the same
-	    declaration. For example, now
-
-	      %rename("%(regex:/^Set(.*)/put\\1/)s") "";
-	      %rename("%(regex:/^Get(.*)/get\\1/)s") "";
-
-	    works as expected whereas before only the last anonymous rename was
-	    taken into account.
-
-2010-10-17: drjoe
-	    [R] Fix failure in overloaded functions which was breaking
-	    QuantLib-SWIG
-
-2010-10-14: olly
-	    [PHP] Allow compilation on non-conforming Microsoft C++ compilers
-	    which don't accept: return function_returning_void();
-	    Reported by Frank Vanden Berghen on the SWIG mailing list.
-
-2010-10-12: wsfulton
-            Fix unary scope operator (::) (global scope) regression introduced in 2.0.0, reported by
-            Ben Walker. The mangled symbol names were incorrect, sometimes resulting in types being
-            incorrectly treated as opaque types.
-
-            Also fixes #2958781 and some other type problems due to better typedef resolution, eg 
-            std::vector<T *>::value_type didn't resolve to T * when it should have. The mangled type
-            was incorrectly SWIGTYPE_std__vectorT_Test_p_std__allocatorT_Test_p_t_t__value_type and now
-            it is correctly SWIGTYPE_p_Test.
-
-Version 2.0.1 (4 October 2010)
-==============================
-
-2010-10-03: wsfulton
-            Apply patch #3066958 from Mikael Johansson to fix default smart pointer
-            handling when the smart pointer contains both a const and non-const operator->.
-
-2010-10-01: wsfulton
-            Add -pcreversion option to display PCRE version information.
-
-2010-10-01: olly
-	    [Ruby] Avoid segfault when a method node has no parentNode
-	    (SF#3034054).
-
-2010-10-01: olly
-	    [Python] Allow reinitialisation to work with an embedded Python
-	    interpreter (patch from Jim Carroll in SF#3075178).
-
-2010-09-28: wsfulton
-            [C#] Apply patch from Tomas Dirvanauskas for std::map wrappers to avoid
-            throwing exceptions with normal usage of iterators.
-
-2010-09-27: olly
-	    [Python] Improve error message given when a parameter of the wrong
-	    type is passed to an overloaded method (SF#3027355).
-
-2010-09-25: wsfulton
-            Apply SF patch #3075150 - Java directors using static variables in
-            named namespace.
-
-2010-09-24: wsfulton
-            More file and line error/warning reporting fixes where SWIG macros
-            are used within {} braces (where the preprocessor expands macros),
-            for example macros within %inline {...} and %fragment(...) {...}
-            and nested structs.
-
-2010-09-18: wsfulton
-            More file and line error/warning reporting fixes for various inherited
-            class problems.
-
-2010-09-15: wsfulton
-            A much improved debugging of SWIG source experience is now available and
-            documented in the "Debugging SWIG" section in the Doc/Devel/internals.html
-            file, including a swig.dbg support file for the gdb debugger.
-
-2010-09-11: wsfulton
-            Fix incorrect line number reporting in errors/warnings when a macro
-            definition ends with '/' and it is not the end of a C comment.
-
-2010-09-11: wsfulton
-            Fix incorrect line number reporting in errors/warnings after parsing
-            macro invocations with parameters given over more than one line.
-
-2010-09-10: wsfulton
-            Remove extraneous extra line in preprocessed output after including files
-            which would sometimes lead to error/warning messages two lines after the
-            end of the file.
-
-2010-09-10: wsfulton
-            Fix #2149523 - Incorrect line number reporting in errors after parsing macros
-            containing C++ comments.
-
-2010-09-08: olly
-	    [PHP] Fix handling of OUTPUT typemaps (Patch from Ryan in SF#3058394).
-
-2010-09-03: wsfulton
-            Fix erroneous line numbers in error messages for macro expansions, for example,
-            the error message now points to instantiation of the macro, ie the last line here:
-
-              #define MACRO2(a, b) 
-
-              #define MACRO1(NAME) MACRO2(NAME,2,3) 
-
-              MACRO1(abc)
-
-2010-09-02: wsfulton
-            Fix line numbers in error and warning messages for preprocessor messages within
-            %inline, for example:
-
-              %inline %{
-              #define FOOBAR 1
-              #define FOOBAR "hi"
-              %}
-
-2010-09-02: wsfulton
-            Fix line numbers in error and warning messages which were cumulatively one
-            less than they should have been after parsing each %include/%import - bug
-            introduced in swig-1.3.32. Also fix line numbers in error and warning messages
-            when new line characters appear between the %include / %import statement and
-            the filename.
-
-2010-08-30: wsfulton
-            Fix line number and file name reporting for some macro preprocessor warnings.
-            The line number of the macro argument has been corrected and the line number
-            of the start of the macro instead of one past the end of the macro is used.
-            Some examples:
-              file.h:11: Error: Illegal macro argument name '..'
-              file.h:19: Error: Macro 'DUPLICATE' redefined,
-              file.h:15: Error: previous definition of 'DUPLICATE'.
-              file.h:25: Error: Variable-length macro argument must be last parameter
-              file.h:32: Error: Illegal character in macro argument name
-              file.i:37: Error: Macro 'SIT' expects 2 arguments
-
-2010-08-26: wsfulton
-            Fix __LINE__ and __FILE__ expansion reported by Camille Gillot. Mostly this
-            did not work at all. Also fixes SF #2822822.
-
-2010-08-17: wsfulton
-            [Perl] Fix corner case marshalling of doubles - errno was not being correctly
-            set before calling strtod - patch from Justin Vallon - SF Bug #3038936.
-
-2010-08-17: wsfulton
-            Fix make distclean when some of the more obscure languages are detected by
-            configure - fixes from Torsten Landschoff.
-
-2010-07-28: wsfulton
-            Restore configuring out of source for the test-suite since it broke in 1.3.37.
-            As previously, if running 'make check-test-suite' out of source, it needs to be
-            done by invoking configure with a relative path. Invoking configure with an
-            absolute path will not work. Running the full 'make check' still needs to be
-            done in the source tree.
-
-2010-07-16: wsfulton
-            Fix wrapping of function pointers and member function pointers when the function
-            returns by reference.
-
-2010-07-13: vadz
-            Removed support for the old experimental "rxspencer" encoder and
-            "[not]rxsmatch" in %rename (see the 01/16/2006 entry). The new and
-            officially supported "regex" encoder and "[not]regexmatch" checks
-            should be used instead (see the two previous entries). Please
-            replace "%(rxspencer:[pat][subst])s" with "%(regex:/pat/subst/)s"
-            when upgrading. Notice that you will also need to replace the back-
-            references of form "@1" with the more standard "\\1" and may need to
-            adjust your regular expressions syntax as the new regex encoder uses
-            Perl-compatible syntax and not (extended) POSIX syntax as the old one.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2010-07-13: vadz
-            Add "regexmatch", "regextarget" and "notregexmatch" which can be
-            used to apply %rename directives to the declarations matching the
-            specified regular expression only. The first two can be used
-            interchangeably, both of the %renames below do the same thing:
-
-                %rename("$ignore", regexmatch$name="Old$") "";
-                %rename("$ignore", regextarget=1) "Old$";
-
-            (namely ignore the declarations having "Old" suffix).
-
-            "notregexmatch" restricts the match to only the declarations which
-            do not match the regular expression, e.g. here is how to rename to
-            lower case versions all declarations except those consisting from
-            capital letters only:
-
-                %rename("$(lowercase)s", notregexmatch$name="^[A-Z]+$") "";
-
-2010-07-13: vadz
-            Add the new "regex" encoder that can be used in %rename, e.g.
-
-                %rename("regex:/(\\w+)_(.*)/\\2/") "";
-
-            to remove any alphabetical prefix from all identifiers. The syntax
-            of the regular expressions is Perl-like and PCRE library
-            (http://www.pcre.org/) is used to implement this feature but notice
-            that backslashes need to be escaped as usual inside C strings.
-
-            Original patch from Torsten Landschoff.
-
-2010-07-08: wsfulton
-            Fix #3024875 - shared_ptr of classes with non-public destructors. This also fixes
-            the "unref" feature when used on classes with non-public destructors.
-
-2010-06-17: ianlancetaylor
-            [Go] Add the Go language module.
-
-2010-06-10: wsfulton
-            [Lua] Fix SWIG_lua_isnilstring multiply defined when using multiple
-            modules and wrapping strings. Patch from 'Number Cruncher'.
-
-2010-06-10: olly
-	    [PHP] Fix directors to correctly call a method with has a
-	    different name in PHP to C++ (we were always using the C++ name
-	    in this case).
-
-2010-06-03: wsfulton
-            Fix uncompilable code when %rename results in two enum items
-            with the same name. Reported by Vadim Zeitlin.
-
-Version 2.0.0 (2 June 2010)
-===========================
-
-2010-06-02: wsfulton
-            [C#] Fix SWIG_STD_VECTOR_ENHANCED macro used in std::vector to work with
-            types containing commas, for example:
-
-              SWIG_STD_VECTOR_ENHANCED(std::pair< double, std::string >)
-
-2010-06-01: wsfulton
-            Add in std_shared_ptr.i for wrapping std::shared_ptr. Requires the %shared_ptr
-            macro like in the boost_shared_ptr.i library. std::tr1::shared_ptr can also be
-            wrapped if the following macro is defined:
-
-              #define SWIG_SHARED_PTR_SUBNAMESPACE tr1
-              %include <std_shared_ptr.i>
-
-            shared_ptr is also documented in Library.html now.
-
-2010-05-27: wsfulton
-            Add the ability for $typemap special variable macros to call other $typemap
-            special variable macros, for example:
-
-              %typemap(cstype) CC "CC"
-              %typemap(cstype) BB "$typemap(cstype, CC)"
-              %typemap(cstype) AA "$typemap(cstype, BB)"
-              void hah(AA aa);
-
-            This also fixes C# std::vector containers of shared_ptr and %shared_ptr.
-
-            Also added diagnostics for $typemap with -debug-tmsearch, for example, the
-            above displays additional diagnostic lines starting "Containing: ":
-
-              example.i:34: Searching for a suitable 'cstype' typemap for: AA aa
-                Looking for: AA aa
-                Looking for: AA
-                Using: %typemap(cstype) AA
-                Containing: $typemap(cstype, BB)
-              example.i:31: Searching for a suitable 'cstype' typemap for: BB
-                Looking for: BB
-                Using: %typemap(cstype) BB
-                Containing: $typemap(cstype, CC)
-              example.i:29: Searching for a suitable 'cstype' typemap for: CC
-                Looking for: CC
-                Using: %typemap(cstype) CC
-
-2010-05-26: olly
-	    Fix %attribute2ref not to produce a syntax error if the last
-	    argument (AccessorMethod) is omitted.  Patch from David Piepgras
-	    in SF#2235756.
-
-2010-05-26: olly
-	    [PHP] When using %throws or %catches, SWIG-generated PHP5 wrappers
-	    now throw PHP Exception objects instead of giving a PHP error of
-	    type E_ERROR.
-
-	    This change shouldn't cause incompatibility issues, since you can't
-	    set an error handler for E_ERROR, so previously PHP would just exit
-	    which also happens for unhandled exceptions.  The benefit is you can
-	    now catch them if you want to.
-
-	    Fixes SF#2545578 and SF#2955522.
-
-2010-05-25: olly
-	    [PHP] Add missing directorin typemap for const std::string &.
-	    Fixes SF#3006404 reported by t-Legiaw.
-
-2010-05-23: wsfulton
-            [C#] Fix #2957375 - SWIGStringHelper and SWIGExceptionHelper not always being
-            initialized before use in .NET 4 as the classes were not marked beforefieldinit.
-            A static constructor has been added to the intermediary class like this:
-
-              %pragma(csharp) imclasscode=%{
-                static $imclassname() {
-                }
-              %}
-
-            If you had added your own custom static constructor to the intermediary class in
-            the same way as above, you will have to modify your approach to use static variable
-            initialization or define SWIG_CSHARP_NO_IMCLASS_STATIC_CONSTRUCTOR - See csharphead.swg.
-
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2010-05-23: wsfulton
-            Fix #2408232. Improve shared_ptr and intrusive_ptr wrappers for classes in an
-            inheritance hierarchy. No special treatment is needed for derived classes.
-            The proxy class also no longer needs to be specified, it is automatically
-            deduced. The following macros are deprecated:
-              SWIG_SHARED_PTR(PROXYCLASS, TYPE)
-              SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE)
-            and have been replaced by
-              %shared_ptr(TYPE)
-            Similarly for intrusive_ptr wrappers, the following macro is deprecated:
-              SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE)
-              SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE)
-            and have been replaced by
-              %intrusive_ptr(TYPE)
-
-2010-05-21: olly
-	    [PHP] Stop generating a bogus line of code in certain constructors.
-	    This was mostly harmless, but caused a PHP notice to be issued, if
-	    enabled (SF#2985684).
-
-2010-05-18: wsfulton
-            [Java] Fix member pointers on 64 bit platforms.
-
-2010-05-14: wsfulton
-            Fix wrapping of C++ enum boolean values reported by Torsten Landschoff:
-              typedef enum { PLAY = true, STOP = false } play_state;
-
-2010-05-14: olly
-	    [PHP] Fix wrapping of global variables which was producing
-	    uncompilable code in some cases.
-
-2010-05-12: drjoe
-	    [R] Add two more changes from Wil Nolan.  Get garbage
-	    collection to work.  Implement newfree
-
-2010-05-09: drjoe
-            Fix bug reported by Wil Nolan change creation of string so
-            that R 2.7.0+ can use char hashes
-
-2010-05-07: wsfulton
-            Apply patch #2955146 from Sergey Satskiy to fix expressions containing divide by
-            operator in constructor initialization lists.
-
-2010-05-05: wsfulton
-            [R] Memory leak fix handling const std::string & inputs, reported by Will Nolan.
-
-2010-05-01: wsfulton
-            Typemap matching enhancement for non-default typemaps. Previously all
-            qualifiers were stripped in one step, now they are stripped one at a time
-            starting with the left most qualifier. For example, int const*const 
-            is first stripped to int *const then int *.
-
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2010-04-25: bhy
-            [Python] Fix #2985655 - broken constructor renaming.
-
-2010-04-14: wsfulton
-            Typemap fragments are now official and documented in Typemaps.html.
-
-2010-04-09: wsfulton
-            [Ruby] Fix #2048064 and #2408020.
-            Apply Ubuntu patch to fix Ruby and std::vector wrappers with -minherit.
-            https://bugs.launchpad.net/ubuntu/+source/swig1.3/+bug/522874
-
-2010-04-09: wsfulton
-            [Mzscheme] Apply Ubuntu patch to fix std::map wrappers:
-            https://bugs.launchpad.net/ubuntu/+source/swig1.3/+bug/203876
-
-2010-04-09: wsfulton
-            [Python] Apply patch #2952374 - fix directors and the -nortti option.
-
-2010-04-09: wsfulton
-            [Lua] Fix #2887254 and #2946032 - SWIG_Lua_typename using wrong stack index.
-
-2010-04-03: wsfulton
-            [Python] Fix exceptions being thrown with the -threads option based on patch from Arto Vuori.
-            Fixes bug #2818499.
-
-2010-04-03: wsfulton
-            Fix Makefile targets: distclean and maintainer-clean
-
-2010-04-02: wsfulton
-            [Lua] Fix char pointers, wchar_t pointers and char arrays so that nil can be passed as a
-            valid value. Bug reported by Gedalia Pasternak.
-
-2010-04-01: wsfulton
-            Numerous subtle typemap matching rule fixes when using the default type. The typemap
-            matching rules are to take a type and find the best default typemap (SWIGTYPE, SWIGTYPE* etc),
-            then look for the next best match by reducing the chosen default type. The type deduction
-            now follows C++ class template partial specialization matching rules.
-
-            Below are the set of changes made showing the default type deduction
-            along with the old reduced type and the new version of the reduced type:
-
-                   SWIGTYPE const &[ANY]
-              new: SWIGTYPE const &[]
-              old: SWIGTYPE (&)[ANY]
-
-                   SWIGTYPE *const [ANY]
-              new: SWIGTYPE const [ANY]
-              old: SWIGTYPE *[ANY]
-
-                   SWIGTYPE const *const [ANY]
-              new: SWIGTYPE *const [ANY]
-              old: SWIGTYPE const *[ANY]
-
-                   SWIGTYPE const *const &
-              new: SWIGTYPE *const &
-              old: SWIGTYPE const *&
-
-                   SWIGTYPE *const *
-              new: SWIGTYPE const *
-              old: SWIGTYPE **
-
-                   SWIGTYPE *const &
-              new: SWIGTYPE const &
-              old: SWIGTYPE *&
-
-            Additionally, a const SWIGTYPE lookup is used now for any constant type. Some examples, where
-            T is some reduced type, eg int, struct Foo:
-
-                   T const
-              new: SWIGTYPE const
-              old: SWIGTYPE
-
-                   T *const
-              new: SWIGTYPE *const
-              old: SWIGTYPE *
-
-                   T const[]
-              new: SWIGTYPE const[]
-              old: SWIGTYPE[]
-
-                   enum T const
-              new: enum SWIGTYPE const
-              old: enum SWIGTYPE
-
-                   T (*const )[]
-              new: SWIGTYPE (*const )[]
-              old: SWIGTYPE (*)[]
-
-            Reminder: the typemap matching rules can now be seen for any types being wrapped by using
-            either the -debug-tmsearch or -debug-tmused options.
-
-            In practice this leads to some subtle matching rule changes and the majority of users
-            won't notice any changes, except in the prime area of motivation for this change: Improve
-            STL containers of const pointers and passing const pointers by reference. This is fixed
-            because many of the STL containers use a type 'T const&' as parameters and when T is 
-            a const pointer, for example, 'K const*', then the full type is 'K const*const&'. This
-            means that the 'SWIGTYPE *const&' typemaps now match when T is either a non-const or
-            const pointer. Furthermore, some target languages incorrectly had 'SWIGTYPE *&' typemaps
-            when these should have been 'SWIGTYPE *const&'. These have been corrected (Java, C#, Lua, PHP).
-
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2010-03-13: wsfulton
-            [Java] Some very old deprecated pragma warnings are now errors.
-
-2010-03-13: wsfulton
-            Improve handling of file names and directories containing double/multiple path separators.
-
-2010-03-10: mutandiz (Mikel Bancroft)
-	    [allegrocl] Use fully qualified symbol name of cl::identity in emit_defun().
-
-2010-03-06: wsfulton
-            [Java] The intermediary JNI class modifiers are now public by default meaning these
-            intermediary low level functions are now accessible by default from outside any package
-            used. The proxy class pointer constructor and getCPtr() methods are also now public.
-            These are needed in order for the nspace option to work without any other mods.
-            The previous default of protected access can be restored using:
-
-              SWIG_JAVABODY_METHODS(protected, protected, SWIGTYPE)
-              %pragma(java) jniclassclassmodifiers = "class"
-
-2010-03-06: wsfulton
-            [C#] Added the nspace feature for C#. Documentation for the nspace feature is now available.
-
-2010-03-04: wsfulton
-            Added the nspace feature. This adds some improved namespace support. Currently only Java
-            is supported for target languages, where C++ namespaces are automatically translated into
-            Java packages. The feature only applies to classes,struct,unions and enums declared within
-            a namespace. Methods and variables declared in namespaces still effectively have their
-            namespaces flattened. Example usage:
-
-              %feature(nspace) Outer::Inner1::Color;
-              %feature(nspace) Outer::Inner2::Color;
-
-              namespace Outer {
-                namespace Inner1 {
-                  struct Color {
-                    ...
-                  };
-                }
-                namespace Inner2 {
-                  struct Color {
-                    ...
-                  };
-                }
-              }
-
-            For Java, the -package option is also required when using the nspace feature. Say
-            we use -package com.myco, the two classes can then be accessed as follows from Java:
-
-              com.myco.Outer.Inner1.Color and com.myco.Outer.Inner2.Color.
-
-2010-02-27: wsfulton
-            [Python] Remove -dirvtable from the optimizations included by -O as it this option
-            currently leads to memory leaks as reported by Johan Blake.
-
-2010-02-27: wsfulton
-            License code changes: SWIG Source is GPL-v3 and library code license is now clearer
-            and is provided under a very permissive license. See http://www.swig.org/legal.html.
-
-2010-02-13: wsfulton
-            [Ruby] A few fixes for compiling under ruby-1.9.x including patch from 'Nibble'.
-
-2010-02-13: wsfulton
-            [Ruby] Apply patch from Patrick Bennett to fix RARRAY_LEN and RARRAY_PTR usage for Ruby 1.9.x
-            used in various STL wrappers.
-
-2010-02-13: wsfulton
-            [C#, Java] Fix incorrect multiply defined symbol name error when an enum item
-            and class name have the same name, as reported by Nathan Krieger. Example:
-
-              class Vector {};
-              namespace Text {
-                enum Preference { Vector };
-              }
-
-            This also fixes other incorrect corner case target language symbol name clashes.
-
-2010-02-11: wsfulton
-            Add the -debug-lsymbols option for displaying the target language layer symbols.
-
-2010-02-09: wsfulton
-            Fix -MM and -MMD options on Windows. They were not omitting files in the SWIG library as
-            they should be.
-
-2010-02-08: wsfulton
-            Fix #1807329 - When Makefile dependencies are being generated using the -M family of options
-            on Windows, the file paths have been corrected to use single backslashes rather than double
-            backslashes as path separators.
-
-2010-02-06: wsfulton
-            Fix #2918902 - language specific files not being generated in correct directory on
-            Windows when using forward slashes for -o, for example:
-              swig -python -c++ -o subdirectory/theinterface_wrap.cpp subdirectory/theinterface.i
-
-2010-02-05: wsfulton
-            Fix #2894405 - assertion when using -xmlout.
-
-2010-01-28: wsfulton
-            Fix typemap matching bug when a templated type has a typemap both specialized and not
-            specialized. For example:
-
-              template<typename T> struct XX { ... };
-              %typemap(in) const XX & "..."
-              %typemap(in) const XX< int > & "..."
-
-            resulted in the 2nd typemap being applied for all T in XX< T >.
-
-2010-01-22: wsfulton
-            Fix #2933129 - typemaps not being found when the unary scope operator (::) is used to denote
-            global scope, the typemap is now used in situations like this:
-
-              struct X {};
-              %typemap(in) const X & "..."
-              void m(const ::X &);
-
-            and this:
-
-              struct X {};
-              %typemap(in) const ::X & "..."
-              void m(const X &);
-
-2010-01-20: wsfulton
-            Fix some unary scope operator (::) denoting global scope problems in the types generated
-            into the C++ layer. Previously the unary scope operator was dropped in the generated code
-            if the type had any sort of qualifier, for example when using pointers, references, like
-            ::foo*, ::foo&, bar< ::foo* >.
-
-2010-01-13: olly
-	    [PHP] Add datetime to the list of PHP predefined classes (patch
-	    from David Fletcher in SF#2931042).
-
-2010-01-11: wsfulton
-            Slight change to warning, error and diagnostic reporting. The warning number is no 
-            longer shown within brackets. This is to help default parsing of warning messages by
-            other tools, vim on Unix in particular.
-
-            Example original display using -Fstandard:
-              example.i:20: Warning(401): Nothing known about base class 'B'. Ignored.
-            New display:
-              example.i:20: Warning 401: Nothing known about base class 'B'. Ignored.
-
-            Also subtle fix to -Fmicrosoft format adding in missing space. Example original display:
-              example.i(20): Warning(401): Nothing known about base class 'Base'. Ignored.
-            New display:
-              example.i(20) : Warning 401: Nothing known about base class 'Base'. Ignored.
-
-2010-01-10: wsfulton
-            Fix a few inconsistencies in reporting of file/line numberings including modifying
-            the overload warnings 509, 512, 516, 474, 475 to now be two line warnings.
-
-2010-01-10: wsfulton
-            Modify -debug-tags output to use standard file name/line reporting so that editors
-            can easily navigate to the appropriate lines.
-            Was typically:
-              . top . include . include (/usr/share/swig/temp/trunk/Lib/swig.swg:312)
-              . top . include . include . include (/usr/share/swig/temp/trunk/Lib/swigwarnings.swg:39)
-            now:
-              /usr/share/swig/temp/trunk/Lib/swig.swg:312:  . top . include . include
-              /usr/share/swig/temp/trunk/Lib/swigwarnings.swg:39:  . top . include . include . include
-
-2010-01-03: wsfulton
-            Fix missing file/line numbers for typemap warnings and in output from the
-           -debug-tmsearch/-debug-tmused options.
-
-2010-01-03: wsfulton
-            Add typemaps used debugging option (-debug-tmused). When used each line displays
-            the typemap used for each type for which code is being generated including the file
-            and line number related to the type. This is effectively a condensed form of the
-            -debug-tmsearch option. Documented in Typemaps.html.
-
-2009-12-23: wsfulton
-            Fix for %javaexception and directors so that all the appropriate throws clauses 
-            are generated. Problem reported by Peter Greenwood.
-
-2009-12-20: wsfulton
-            Add -debug-tmsearch option for debugging the typemap pattern matching rules.
-            Documented in Typemaps.html.
-
-2009-12-12: wsfulton
-            [Octave] Remove the -api option and use the new OCTAVE_API_VERSION_NUMBER
-            macro provided in the octave headers for determining the api version instead.
-
-2009-12-04: olly
-	    [Ruby] Improve support for Ruby 1.9 under GCC.  Addresses part of
-	    SF#2859614.
-
-2009-12-04: olly
-	    Fix handling of modulo operator (%) in constant expressions
-	    (SF#2818562).
-
-2009-12-04: olly
-	    [PHP] "empty" is a reserved word in PHP, so rename empty() method
-	    on STL classes to "is_empty()" (previously this was automatically
-	    renamed to "c_empty()").
-	    *** POTENTIAL INCOMPATIBILITY ***
-
-2009-12-03: olly
-	    [PHP] Add typemaps for long long and unsigned long long, and for
-	    pointer to method.
-
-2009-12-02: olly
-	    [PHP] Fix warning and rename of reserved class name to be case
-	    insensitive.
-
-2009-12-01: wsfulton
-            Revert support for %extend and memberin typemaps added in swig-1.3.39. The
-	    memberin typemaps are ignored again for member variables within a %extend block.
-            Documentation inconsistency reported by Torsten Landschoff.
-
-2009-11-29: wsfulton
-            [Java, C#] Fix generated quoting when using %javaconst(1)/%csconst(1) for 
-            static const char member variables.
-
-              %javaconst(1) A;
-              %csconst(1) A;
-              struct X {
-                static const char A = 'A'; 
-              };
-
-2009-11-26: wsfulton
-            [Java, C#] Fix %javaconst(1)/%csconst(1) for static const member variables to
-            use the actual constant value if it is specified, rather than the C++ code to
-            access the member.
-
-              %javaconst(1) EN;
-              %csconst(1) EN;
-              struct X {
-                static const int EN = 2;
-              };
-
-2009-11-23: wsfulton
-            C++ nested typedef classes can now be handled too, for example:
-              struct Outer {
-                typedef Foo { } FooTypedef1, FooTypedef2;
-              };
-
-2009-11-18: wsfulton
-            The wrappers for C nested structs are now generated in the same order as declared 
-            in the parsed code.
-
-2009-11-18: wsfulton
-            Fix #491476 - multiple declarations of nested structs, for example:
-              struct Outer {
-                struct {
-                  int val;
-                } inner1, inner2, *inner3, inner4[1];
-              } outer;
-
-2009-11-17: wsfulton
-            Fix parsing of enum declaration and initialization, for example:
-
-              enum ABC {
-                a,
-                b,
-                c
-              } A = a, *pC = &C, array[3] = {a, b, c};
-
-2009-11-17: wsfulton
-            Fix parsing of struct declaration and initialization, for example:
-
-              struct S {
-                 int x;
-              } instance = { 10 };
-
-2009-11-15: wsfulton
-            Fix #1960977 - Syntax error parsing derived nested class declaration and member
-            variable instance.
-
-2009-11-14: wsfulton
-            Fix #2310483 - function pointer typedef within extern "C" block.
-
-2009-11-13: wsfulton
-            Fix usage of nested template classes within templated classes so that compilable code 
-            is generated.
-
-2009-11-13: olly
-	    [php] Fix place where class prefix (as specified with -prefix)
-	    wasn't being used.  Patch from gverbruggen in SF#2892647.
-
-2009-11-12: wsfulton
-            Fix usage of nested template classes so that compilable code is generated - the nested
-            template class is now treated like a normal nested classes, that is, as an opaque type
-            unless the nestedworkaround feature is used.
-
-2009-11-12: wsfulton
-            Replace SWIGWARN_PARSE_NESTED_CLASS with SWIGWARN_PARSE_NAMED_NESTED_CLASS and
-            SWIGWARN_PARSE_UNNAMED_NESTED_CLASS for named and unnamed nested classes respectively.
-
-            Named nested class ignored warnings can now be suppressed by name using %warnfilter, eg:
-
-              %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::Inner;
-
-            but clearly unnamed nested classes cannot and the global suppression is still required, eg:
-
-              #pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
-
-2009-11-11: wsfulton
-            Added the nestedworkaround feature as a way to use the full functionality of a nested class 
-            (C++ mode only). It removes the nested class from SWIG's type information so it is as if SWIG
-            had never parsed the nested class. The documented nested class workarounds using a global
-            fake class stopped working when SWIG treated the nested class as an opaque pointer, and
-            this feature reverts this behaviour. The documentation has been updated with details of how
-            to use and implement it, see the "Nested classes" section in SWIGPlus.html.
-
-2009-11-11: wsfulton
-            There were a number of C++ cases where nested classes/structs/unions were being handled
-            as if C code was being parsed which would oftentimes lead to uncompilable code as an
-            attempt was made to wrap the nested structs like it is documented for C code. Now all
-            nested structs/classes/unions are ignored in C++ mode, as was always documented. However,
-            there is an improvement as usage of nested structs/classes/unions is now always treated
-            as an opaque type by default, resulting in generated code that should always compile.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2009-11-09: drjoe
-	    Fix R for -fcompact and add std_map.i
-
-2009-11-08: wsfulton
-            Fix inconsistency for nested structs/unions/classes. Uncompilable code was being
-            generated when inner struct and union declarations were used as types within the
-            inner struct. The inner struct/union is now treated as a forward declaration making the
-            behaviour the same as an inner class. (C++ code), eg:
-
-              struct Outer {
-                struct InnerStruct { int x; };
-                InnerStruct* getInnerStruct();
-              };
-
-2009-11-08: wsfulton
-	    Ignored nested class/struct warnings now display the name of the ignored class/struct.
-
-2009-11-07: wsfulton
-	    Bug #1514681 - Fix nested template classes within a namespace generated uncompilable
-            code and introduced strange side effects to other wrapper code especially code
-            after the nested template class. Note that nested template classes are still ignored.
-
-2009-11-07: wsfulton
-	    Add new debug options:
-              -debug-symtabs    - Display symbol tables information
-              -debug-symbols    - Display target language symbols in the symbol tables
-              -debug-csymbols   - Display C symbols in the symbol tables
-
-2009-11-03: wsfulton
-	    Fix some usage of unary scope operator (::) denoting global scope, for example:
-
-              namespace AA { /* ... */ }
-              using namespace ::AA;
-
-            and bug #1816802 - SwigValueWrapper should be used:
-
-              struct CC {
-                CC(int); // no default constructor
-              };
-              ::CC x();
-
-            and in template parameter specializations:
-
-              struct S {};
-              template <typename T> struct X { void a() {} };
-              template <> struct X<S> { void b() {} };
-              %template(MyTConcrete) X< ::S >;
-
-            plus probably some other corner case usage of ::.
-
-2009-11-02: olly
-	    [Python] Fix potential memory leak in initialisation code for the
-	    generated module.
-
-2009-10-23: wsfulton
-	    Fix seg fault when using a named nested template instantiation using %template(name) 
-            within a class. A warning that these are not supported is now issued plus processing 
-            continues as if no name was given.
-
-2009-10-20: wsfulton
-	    [Python] Fix std::vector<const T*>. This would previously compile, but not run correctly.
-
-2009-10-20: wsfulton
-	    Fixed previously fairly poor template partial specialization and explicit 
-            specialization support. Numerous bugs in this area have been fixed including:
-
-            - Template argument deduction implemented for template type arguments, eg this now
-              works:
-                template<typename T> class X      {};
-                template<typename T> class X<T *> {};
-                %template(X1) X<const int *>; // Chooses T * specialization
-
-              and more complex cases with multiple parameters and a mix of template argument
-              deduction and explicitly specialised parameters, eg:
-                template <typename T1, typename T2> struct TwoParm               { void a() {} };
-                template <typename T1>              struct TwoParm<T1 *, int *>  { void e() {} };
-                %template(E) TwoParm<int **, int *>;
-
-            Note that the primary template must now be in scope, like in C++, when
-            an explicit or partial specialization is instantiated with %template.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2009-09-14: wsfulton
-	    [C#] Add %csattributes for adding C# attributes to enum values, see docs for example.
-
-2009-09-11: wsfulton
-	    Fix memmove regression in cdata.i as reported by Adriaan Renting.
-
-2009-09-07: wsfulton
-	    Fix constant expressions containing <= or >=.
-
-2009-09-02: wsfulton
-	    The following operators in constant expressions now result in type bool for C++ 
-            wrappers and remain as type int for C wrappers, as per each standard: 
-
-              && || == != < > <= >= (Actually the last 4 are still broken). For example:
-
-              #define A 10
-              #define B 10
-              #define A_EQ_B  A == B // now wrapped as type bool for C++
-              #define A_AND_B A && B // now wrapped as type bool for C++
-
-2009-09-02: wsfulton
-	    Fix #2845746. true and false are now recognised keywords (only when wrapping C++).
-            Constants such as the following are now wrapped (as type bool):
-              #define FOO true
-              #define BAR FOO && false
-
-Version 1.3.40 (18 August 2009)
-===============================
-
-2009-08-17: olly
-	    [Perl] Add "#undef do_exec" to our clean up of Perl global
-	    namespace pollution.
-
-2009-08-17: olly
-	    [PHP] Fix to wrap a resource returned by __get() in a PHP object (SF#2549217).
-
-2009-08-17: wsfulton
-            Fix #2797485 After doing a 'make clean', install fails if yodl2man or yodl2html 
-            is not available.
-
-2009-08-16: wsfulton
-            [Octave] Caught exceptions display the type of the C++ exception instead of the
-            generic "c++-side threw an exception" message.
-
-2009-08-16: wsfulton
-            [Java] When %catches is used, fix so that any classes specified in the "throws"
-            attribute of the "throws" typemap are generated into the Java method's throws clause.
-
-2009-08-16: wsfulton
-            [C#] Fix exception handling when %catches is used, reported by Juan Manuel Alvarez.
-
-2009-08-15: wsfulton
-            Fix %template seg fault on some cases of overloading the templated method.
-            Bug reported by Jan Kupec.
-
-2009-08-15: wsfulton
-	    [Ruby] Add numerous missing wrapped methods for std::vector<bool> specialization
-            as reported by Youssef Jones.
-
-2009-08-14: wsfulton
-	    [Perl] Add SWIG_ConvertPtrAndOwn() method into the runtime for smart pointer 
-            memory ownership control. shared_ptr support still to be added. Patch from 
-            David Fletcher.
-
-2009-08-14: olly
-	    [PHP] PHP5 now wraps static member variables as documented.
-
-2009-08-14: olly
-	    [PHP] Update the PHP "class" example to work with PHP5 and use
-	    modern wrapping features.
-
-2009-08-13: wsfulton
-	    [PHP] std::vector wrappers overhaul. They no longer require the 
-            specialize_std_vector() macro. Added wrappers for capacity() and reserve().
-
-2009-08-13: wsfulton
-	    [PHP] Add const reference typemaps. const reference primitive types are
-            now passed by value rather than pointer like the other target languages.
-	    Fixes SF#2524029.
-
-2009-08-08: wsfulton
-	    [Python] More user friendly AttributeError is raised when there are
-            no constructors generated for the proxy class in the event that the
-            class is abstract - the error message is now 
-            "No constructor defined - class is abstract" whereas if there are no
-            public constructors for any other reason and the class is not abstract,
-            the message remains
-            "No constructor defined".
-            [tcl] Similarly for tcl when using -itcl.
-
-2009-08-04: olly
-	    [PHP] Fix generated code to work with PHP 5.3.
-
-2009-08-04: vmiklos
-            [PHP] Various mathematical functions (which would conflict
-            with the built-in PHP ones) are now automatically handled by
-            adding a 'c_' prefix.
-
-2009-08-03: wsfulton
-            [C#] The std::vector<T> implementation is improved and now uses $typemap such
-            that the proxy class for T no longer has to be specified in some macros
-            for correct C# compilation; the following macros are deprecated, where
-            CSTYPE was the C# type for the C++ class CTYPE:
-
-            SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(CSTYPE, CTYPE)
-              usage should be removed altogether
-
-            SWIG_STD_VECTOR_SPECIALIZE(CSTYPE, CTYPE)
-              should be replaced with:
-            SWIG_STD_VECTOR_ENHANCED(CTYPE)
-
-            Some more details in csharp/std_vector.i
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2009-07-31: olly
-	    [Python] Fix indentation so that we give a useful error if the
-	    module can't be loaded.  Patch from Gaetan Lehmann in SF#2829853.
-
-2009-07-29: wsfulton
-            Add $typemap(method, typelist) special variable macro. This allows
-            the contents of a typemap to be inserted within another typemap.
-            Fully documented in Typemaps.html.
-
-2009-07-29: vmiklos
-            [PHP] Static member variables are now prefixed with the
-            class name. This allows static member variables with the
-            same name in different classes.
-
-2009-07-29: olly
-	    [Python] Add missing locks to std::map wrappers.  Patch from 
-	    Paul Hampson in SF#2813836.
-
-2009-07-29: olly
-	    [PHP] Fix memory leak in PHP OUTPUT typemaps.  Reported by Hitoshi
-	    Amano in SF#2826322.
-
-2009-07-29: olly
-	    [PHP] Fix memory leak in PHP resource destructor for classes
-	    without a destructor and non-class types.  Patch from Hitoshi Amano
-	    in SF#2825303.
-
-2009-07-28: olly
-	    [PHP] Update warnings about clashes between identifiers and PHP
-	    keywords and automatic renaming to work with the PHP5 class
-	    wrappers.  Fixes SF#1613679.
-
-2009-07-28: vmiklos
-            [PHP] If a member function is not public but it has a base
-            which is public, then now a warning is issued and the member
-            function will be public, as PHP requires this.
-
-2009-07-21: vmiklos
-            [PHP] Director support added.
-
-2009-07-15: olly
-	    [Perl] Don't specify Perl prototype "()" for a constructor with a
-	    different name to the class, as such constructors can still take
-	    parameters.
-
-2009-07-12: xavier98
-	    [Octave] Add support for Octave 3.2 API
-
-2009-07-05: olly
-	    [PHP] Update the list of PHP keywords - "cfunction" is no longer a
-	    keyword in PHP5 and PHP 5.3 added "goto", "namespace", "__DIR__",
-	    and "__NAMESPACE__".
-
-2009-07-03: olly
-	    [Tcl] To complement USE_TCL_STUBS, add support for USE_TK_STUBS
-	    and SWIG_TCL_STUBS_VERSION.  Document all three in the Tcl chapter
-	    of the manual.  Based on patch from SF#2810380 by Christian
-	    Gollwitzer.
-
-2009-07-02: vmiklos
-            [PHP] Added factory.i for PHP, see the li_factory testcase
-            for more info on how to use it.
-
-2009-07-02: wsfulton
-            Fix -Wallkw option as reported by Solomon Gibbs.
-
-2009-07-02: wsfulton
-            Fix syntax error when a nested struct contains a comment containing a * followed 
-            eventually by a /. Regression from 1.3.37, reported by Solomon Gibbs.
-
-2009-07-01: vmiklos
-            [PHP] Unknown properties are no longer ignored in proxy
-            classes.
-
-2009-07-01: vmiklos
-            [PHP] Fixed %newobject behaviour, previously any method
-            marked with %newobject was handled as a constructor.
-
-2009-06-30: olly
-	    [Ruby] Undefine close and connect macros defined by Ruby API
-	    headers as we don't need them and they can clash with C++ methods
-	    being wrapped.  Patch from Vit Ondruch in SF#2814430.
-
-2009-06-26: olly
-	    [Ruby] Fix to handle FIXNUM values greater than MAXINT passed for a
-	    double parameter.
-
-2009-06-24: wsfulton
-            Fix wrapping methods with default arguments and the compactdefaultargs feature 
-            where a class is passed by value and is assigned a default value. The SwigValueWrapper
-            template workaround for a missing default constructor is no longer used as the code 
-            generated does not call the default constructor.
-
-2009-06-16: wsfulton
-	    [Java,C#] Fix enum marshalling when %ignore is used on one of the enum items.
-            Incorrect enum values were being passed to the C++ layer or compilation errors resulted.
-
-2009-06-02: talby
-	    [Perl] Resolved reference.i overload support problem
-	    identified by John Potowsky.
-
-2009-05-26: wsfulton
-	    [C#] Improved std::map wrappers based on patch from Yuval Baror. The C# proxy
-            now implements System.Collections.Generic.IDictionary<>.
-
-	    These std:map wrappers have a non-backwards compatible overhaul to make them
-            like a .NET IDictionary. Some method names have changed as following:
-              set -> setitem (use this[] property now)
-              get -> getitem (use this[] property now)
-              has_key -> ContainsKey
-              del -> Remove
-              clear -> Clear
-
-            The following macros used for std::map wrappers are deprecated and will no longer work:
-              specialize_std_map_on_key
-              specialize_std_map_on_value
-              specialize_std_map_on_both
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2009-05-20: vmiklos
-            [PHP] Add the 'thisown' member to classes. The usage of it
-            is the same as the Python thisown one: it's 1 by default and
-            you can set it to 0 if you want to prevent freeing it. (For
-            example to prevent a double free.)
-
-2009-05-14: bhy
-            [Python] Fix the wrong pointer value returned by SwigPyObject_repr().
-
-2009-05-13: mutandiz (Mikel Bancroft)
-	    [allegrocl] Minor tweak when wrapping in -nocwrap mode.
-
-2009-05-11: wsfulton
-	    [C#] Improved std::vector wrappers on the C# proxy side from Yuval Baror. These
-	    implement IList<> instead of IEnumerable<> where possible.
-
-2009-04-29: wsfulton
-	    [Java, C#] Add the 'notderived' attribute to the javabase and csbase typemaps.
-	    When this attribute is set, the typemap will not apply to classes that are derived
-	    from a C++ base class, eg 
-	      %typemap(csbase, notderived="1") SWIGTYPE "CommonBase"
-
-2009-04-29: olly
-	    [Python] Don't attempt to acquire the GIL in situations where we
-	    know that it will already be locked.  This avoids some dead-locks
-	    with mod_python (due to mod_python bugs which are apparently
-	    unlikely to ever be fixed), and results in smaller wrappers which
-	    run a little faster (in tests with Xapian on x86-64 Ubuntu 9.04,
-	    the stripped wrapper library was 11% smaller and ran 2.7% faster).
-
-2009-04-21: wsfulton
-	    [C#] Fix #2753469 - bool &OUTPUT and bool *OUTPUT typemaps initialisation.
-
-2009-04-09: wsfulton
-	    Fix #2746858 - C macro expression using floating point numbers
-
-2009-03-30: olly
-	    [PHP] The default out typemap for char[ANY] now returns the string up to a
-	    zero byte, or the end of the array if there is no zero byte.  This
-	    is the same as Python does, and seems more generally useful than
-	    the previous behaviour of returning the whole contents of the array
-	    including any zero bytes.  If you want the old behaviour, you can provide
-	    your own typemap to do this:
-
-	    %typemap(out) char [ANY]
-	    %{
-		RETVAL_STRINGL($1, $1_dim0, 1);
-	    %}
-
-Version 1.3.39 (21 March 2009)
-==============================
-
-2009-03-19: bhy
-            [Python] Fix the memory leak related to Python 3 unicode and C char* conversion,
-            which can be shown in the following example before this fix:
-            
-                  from li_cstring import *
-                  i=0
-                  while True:
-                      i += 1
-                      n = str(i)*10
-                      test3(n)
-
-            This fix affected SWIG_AsCharPtrAndSize() so you cannot call this function with
-            a null alloc and non-null cptr argument in Python 3, otherwise a runtime error
-            will be raised.
-
-2009-03-18: wsfulton
-	    [C#] std::vector<T> wrapper improvements for .NET 2 and also providing the
-	    necessary machinery to use the std::vector<T> wrappers with more advanced features such
-	    as LINQ - the C# proxy class now derives from IEnumerable<>. The default is now to 
-	    generate code requiring .NET 2 as a minimum, although the C# code can be compiled 
-	    for .NET 1 by defining the SWIG_DOTNET_1 C# preprocessor constant. See the 
-	    std_vector.i file for more details.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2009-03-12: wsfulton
-	    [Ruby] Fix #2676738 SWIG generated symbol name clashes.
-
-2009-03-01: bhy
-            [Python] Some fixes for Python 3.0.1 and higher support. In 3.0.1, the C API function
-            PyObject_Compare is removed, so PyObject_RichCompareBool is used for replacement.
-            Struct initilization of SwigPyObject and SwigPyObject_as_number changed to reflect
-            the drop of tp_compare and nb_long.
-
-2009-03-01: bhy
-            [Python] Fix SF#2583160. Now the importer in Python shadow wrapper take care of the
-            case that module already imported at other place.
-
-2009-02-28: bhy
-            [Python] Fix SF#2637352. Move struct declaration of SWIG_module in pyinit.swg before
-            the method calls, since some C compiler don't allow declaration in middle of function
-            body.
-
-2009-02-21: wsfulton
-	    [Allegrocl] Fix seg fault wrapping some constant variable (%constant) types.
-
-2009-02-20: wsfulton
-	    [CFFI] Fix seg faults when for %extend and using statements.
-
-2009-02-20: wsfulton
-	    Fix SF #2605955: -co option which broke in 1.3.37. 
-
-2009-02-20: wsfulton
-	    New %insert("begin") section added. Also can be used as %begin. This is a new
-	    code section reserved entirely for users and the code within the section is generated
-	    at the top of the C/C++ wrapper file and so provides a means to put custom code
-	    into the wrapper file before anything else that SWIG generates.
-
-2009-02-17: wsfulton
-	    'make clean-test-suite' will now run clean on ALL languages. Previously it only
-	    ran the correctly configured languages. This way it is now possible to clean up
-	    properly after running 'make partialcheck-test-suite'.
-
-2009-02-14: wsfulton
-	    Extend attribute library support for structs/classes and the accessor functions use
-	    pass/return by value semantics. Two new macros are available and usage is identical
-	    to %attribute. These are %attributeval for structs/classes and %attributestring for
-	    string classes, like std::string. See attribute.swg for more details.
-
-2009-02-13: wsfulton
-	    Add support for %extend and memberin typemaps. Previously the memberin typemaps were
-	    ignored for member variables within a %extend block.
-
-2009-02-12: wsfulton
-	    Remove unnecessary temporary variable when wrapping return values that are references. 
-	    Example of generated code for wrapping:
-
-	      struct XYZ {
-		std::string& refReturn();
-	      };
-
-	    used to be:
-
-              std::string *result = 0 ;
-              ...
-              {
-                std::string &_result_ref = (arg1)->refReturn();
-                result = (std::string *) &_result_ref;
-              }
-
-	     Now it is:
-
-              std::string *result = 0 ;
-              ...
-              result = (std::string *) &(arg1)->refReturn();
-
-2009-02-08: bhy
-            Change the SIZE mapped by %pybuffer_mutable_binary and %pybuffer_binary in pybuffer.i from
-            the length of the buffer to the number of items in the buffer.
-
-2009-02-08: wsfulton
-            Fix %feature not working for conversion operators, reported by Matt Sprague, for example:
-	      %feature("cs:methodmodifiers") operator bool "protected";
-
-2009-02-07: wsfulton
-            [MzScheme] Apply #2081967 configure changes for examples to build with recent PLT versions.
-	    Also fixes Makefile errors building SWIG executable when mzscheme package is installed 
-	    (version 3.72 approx and later).
-
-2009-02-04: talby
-            [Perl] Fix SF#2564192 reported by David Kolovratnk.
-            SWIG_AsCharPtrAndSize() now handles "get" magic.
-
-Version 1.3.38 (31 January 2009)
-================================
-
-2009-01-31: bhy
-            [Python] Fix SF#2552488 reported by Gaetan Lehmann. Now %pythonprepend
-            and %pythonappend have correct indentation.
-
-2009-01-31: bhy
-            [Python] Fix SF#2552048 reported by Gaetan Lehmann. The parameter list
-            of static member function in generated proxy code should not have the
-            'self' parameter.
-
-2009-01-29: wsfulton
-	    Fix regression introduced in 1.3.37 where the default output directory
-	    for target language specific files (in the absence of -outdir) was no
-	    longer the same directory as the generated c/c++ file.
-
-2009-01-28: wsfulton
-	    [Java, C#] Fix proxy class not being used when the global scope operator
-	    was used for parameters passed by value. Reported by David Piepgrass.
-
-2009-01-15: wsfulton
-	    [Perl] Fix seg fault when running with -v option, reported by John Ky.
-
-Version 1.3.37 (13 January 2009)
-================================
-
-2009-01-13: mgossage
-	    [Lua] Added contract support for requiring that unsigned numbers are >=0
-	    Rewrote much of Examples/Lua/embed3. 
-	    Added a lot to the Lua documentation.
-
-2009-01-13: wsfulton
-	    Fix compilation error when using directors on protected virtual overloaded 
-	    methods reported by Sam Hendley.
-
-2009-01-12: drjoe
-            [R] Fixed handling of integer arrays
-
-2009-01-10: drjoe
-	    [R] Fix integer handling in r to deal correctly with signed
-	    and unsigned issues
-
-2009-01-10: wsfulton
-	    Patch  #1992756 from Colin McDonald - %contract not working for classes 
-	    in namespace
-
-2009-01-05: olly
-	    Mark SWIGPERL5, SWIGPHP5, and SWIGTCL8 as deprecated in the source
-	    code and remove documentation of them.
-
-2008-12-30: wsfulton
-	    Bug #2430756. All the languages now define a macro in the generated C/C++
-	    wrapper file indicating which language is being wrapped. The macro name is the
-	    same as those defined when SWIG is run, eg SWIGJAVA, SWIGOCTAVE, SWIGCSHARP etc
-	    and are listed in the "Conditional Compilation" section in the documentation.
-
-2008-12-23: wsfulton
-	    [Java] Fix #2153773 - %nojavaexception was clearing the exception feature
-            instead of disabling it. Clearing checked Java exceptions also didn't work. 
-	    The new %clearjavaexception can be used for clearing the exception feature.
-
-2008-12-22: wsfulton
-	    Fix #2432801 - Make SwigValueWrapper exception safe for when copy constructors
-	    throw exceptions.
-
-2008-12-21: wsfulton
-	    Apply patch #2440046 which fixes possible seg faults for member and global
-	    variable char arrays when the strings are larger than the string array size.
-
-2008-12-20: wsfulton
-	    The ccache compiler cache has been adapted to work with SWIG and
-	    named ccache-swig. It now works with C/C++ compilers as well as SWIG
-	    and can result in impressive speedups when used to recompile unchanged
-	    code with either a C/C++ compiler or SWIG. Documentation is in CCache.html
-	    or the installed ccache-swig man page.
-
-2008-12-12: wsfulton
-	    Apply patch from Kalyanov Dmitry which fixes parsing of nested structs
-	    containing comments.
-
-2008-12-12: wsfulton
-	    Fix error message in some nested struct and %inline parsing error situations
-	    such as unterminated strings and comments.
-
-2008-12-07: olly
-	    [PHP] Fix warnings when compiling generated wrapper with GCC 4.3.
-
-2008-12-06: wsfulton
-	    [PHP] Deprecate %pragma(php4). Please use %pragma(php) instead.
-	    The following two warnings have been renamed:
-	    WARN_PHP4_MULTIPLE_INHERITANCE -> WARN_PHP_MULTIPLE_INHERITANCE
-	    WARN_PHP4_UNKNOWN_PRAGMA       -> WARN_PHP_UNKNOWN_PRAGMA
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2008-12-04: bhy
-            [Python] Applied patch SF#2158938: all the SWIG symbol names started with Py
-            are changed, since they are inappropriate and discouraged in Python
-            documentation (from http://www.python.org/doc/2.5.2/api/includes.html):
-
-            "All user visible names defined by Python.h (except those defined by
-            the included standard headers) have one of the prefixes "Py" or "_Py".
-            Names beginning with "_Py" are for internal use by the Python implementation
-            and should not be used by extension writers. Structure member names do
-            not have a reserved prefix.
-
-            Important: user code should never define names that begin with "Py" or "_Py".
-            This confuses the reader, and jeopardizes the portability of the user
-            code to future Python versions, which may define additional names beginning
-            with one of these prefixes."
-
-            Here is a brief list of what changed:
-
-                PySwig* -> SwigPy*
-                PyObject_ptr -> SwigPtr_PyObject
-                PyObject_var -> SwigVar_PyObject
-                PySequence_Base, PySequence_Cont, PySequence_Ref ->
-                        SwigPySequence_Base, SwigPySequence_Cont, SwigPySequence_Ref
-                PyMap* -> SwigPyMap*
-
-            We provided a pyname_compat.i for backward compatibility. Users whose code having
-            these symbols and do not want to change it could simply include this file
-            at front of your code. A better solution is to run the converting tool on
-            your code, which has been put in SWIG's SVN trunk (Tools/pyname_patch.py) and
-            you can download it here:
-            https://swig.svn.sourceforge.net/svnroot/swig/trunk/Tools/pyname_patch.py 
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2008-12-02: wsfulton
-	    [Python] Apply patch #2143727 from Serge Monkewitz to fix importing base classes 
-	    when the package option is specified in %module and that module is %import'ed.
-
-2008-11-28: wsfulton
-	    [UTL] Fix #2080497. Some incorrect acceptance of types in the STL, eg a double * element
-	    passed into a vector<int *> constructor would be accepted, but the ensuing behaviour
-	    was undefined. Now the type conversion correctly raises an exception.
-
-2008-11-24: wsfulton
-	    Add -outcurrentdir option. This sets the default output directory to the current 
-	    directory instead of the path specified by the input file. This option enables
-	    behaviour similar to c/c++ compilers. Note that this controls the output directory,
-	    but only in the absence of the -o and/or -outdir options.
-
-2008-11-23: wsfulton
-	    [ruby] Apply patch #2263850 to fix ruby/file.i ... rubyio.h filename change in 
-	    ruby 1.9.
-
-2008-11-23: wsfulton
-	    Apply patch #2319790 from Johan Hake to fix shared_ptr usage in std::tr1 namespace.
-
-2008-11-21: wsfulton
-	    The use of the include path to find the input file is now deprecated.
-	    This makes the behaviour of SWIG the same as C/C++ compilers in preparation
-	    for use with ccache.
-
-2008-11-16: wsfulton
-	    Fix -nopreprocess option to:
-	    - correctly report file names in warning and error messages.
-	    - use the original input filename that created the preprocessed output when 
-	      determining the C++ wrapper file name (in the absence of -o). Previously 
-	      the name of the input file containing the preprocessed output was used.
-
-2008-11-11: wsfulton
-	    [Java] Add patch #2152691 from MATSUURA Takanori which fixes compiles using the
-	    Intel compiler
-
-2008-11-01: wsfulton
-            Add patch #2128249 from Anatoly Techtonik which corrects the C/C++ proxy
-            class being reported for Python docstrings when %rename is used.
-
-2008-11-01: wsfulton
-            Add the strip encoder patch from Anatoly Techtonik #2130016. This enables an 
-            easy way to rename symbols by stripping a commonly used prefix in all the
-            function/struct names. It works in the same way as the other encoders, such as
-            title, lower, command etc outlined in CHANGES file dated 12/30/2005. Example
-            below will rename wxAnotherWidget to AnotherWidget and wxDoSomething to 
-            DoSomething:
-
-              %rename("%(strip:[wx])s") ""; 
-
-              struct wxAnotherWidget {
-                  void wxDoSomething();
-              };
-
-2008-09-26: mutandiz
-	    [allegrocl]
-	    Lots of test-suite work.
-	    - Fix ordering of wrapper output and %{ %} header output.
-	    - Fix declarations of local vars in C wrappers.
-	    - Fix declaration of defined constants in C wrappers.
-	    - Fix declaration of EnumValues in C wrappers.
-	    - add some const typemaps to allegrocl.swg
-	    - add rename for operator bool() overloads.
-	
-2008-09-25: olly
-	    [PHP5] Fill in typemaps for SWIGTYPE and void * (SF#2095186).
-
-2008-09-22: mutandiz (Mikel Bancroft)
-	    [allegrocl]
-	    - Support wrapping of types whose definitions are not seen by
-	    SWIG. They are treated as forward-referenced classes and if a
-	    definition is not seen are treated as (* :void).
-	    - Don't wrap the contents of unnamed namespaces.
-	    - More code cleanup. Removed some extraneous warnings.
-	    - start work on having the allegrocl mod pass the cpp test-suite.
-
-2008-09-19: olly
-	    [PHP5] Add typemaps for long long and unsigned long long.
-
-2008-09-18: wsfulton
-            [C#] Added C# array typemaps provided by Antti Karanta.
-            The arrays provide a way to use MarshalAs(UnmanagedType.LPArray)
-            and pinning the array using 'fixed'. See arrays_csharp.i library file
-            for details.
-
-2008-09-18: wsfulton
-	    Document the optional module attribute in the %import directive,
-            see Modules.html. Add a warning for Python wrappers when the
-            module name for an imported base class is missing, requiring the
-            module attribute to be added to %import, eg 
-
-              %import(module="FooModule") foo.h
-
-2008-09-18: olly
-	    [PHP5] Change the default input typemap for char * to turn PHP
-	    Null into C NULL (previously it was converted to an empty string).
-	    The new behaviour is consistent with how the corresponding output
-	    typemap works (SF#2025719).
-
-	    If you want to keep the old behaviour, add the following typemap
-	    to your interface file (PHP's convert_to_string_ex() function does
-	    the converting from PHP Null to an empty string):
-
-	    %typemap(in) char * {
-		convert_to_string_ex($input);
-		$1 = Z_STRVAL_PP($input);
-	    }
-
-2008-09-18: olly
-	    [PHP5] Fix extra code added to proxy class constructors in the case
-	    where the only constructor takes no arguments.
-
-2008-09-18: olly
-	    [PHP5] Fix wrapping of a renamed enumerated value of an enum class
-	    member (SF#2095273).
-
-2008-09-17: mutandiz (Mikel Bancroft)
-	    [allegrocl]
-	    - Fix how forward reference typedefs are handled, so as not to conflict
-	    with other legit typedefs.
-	    - Don't (for now) perform an ffitype typemap lookup when trying to
-	    when calling compose_foreign_type(). This is actually a useful thing
-	    to do in certain cases, the test cases for which I can't currently
-	    locate :/. It's breaking some wrapping behavior that is more commonly
-	    seen, however. I'll readd in a more appropriate way when I can
-	    recreate the needed test case, or a user complains (which means
-	    they probably have a test case).
-	    - document the -isolate command-line arg in the 'swig -help' output.
-	    It was in the html docs, but not there.
-	    - small amount of code cleanup, removed some unused code.
-	    - some minor aesthetic changes.
-
-2008-09-12: bhy
-            [Python] Python 3.0 support branch merged into SWIG trunk. Thanks to
-            Google Summer of Code 2008 for supporting this project! By default
-            SWIG will generate interface files compatible with both Python 2.x
-            and 3.0. And there's also some Python 3 new features that can be
-            enabled by passing a "-py3" command line option to SWIG. These
-            features are:
-
-              - Function annotation support
-                  Also, the parameter list of proxy function will be generated,
-                  even without the "-py3" option. However, the parameter list
-                  will fallback to *args if the function (or method) is overloaded.
-              - Buffer interface support
-              - Abstract base class support
-
-            For details of Python 3 support and these features, please see the
-            "Python 3 Support" section in the "SWIG and Python" chapter of the SWIG
-            documentation.
-
-            The "-apply" command line option and support of generating codes
-            using apply() is removed. Since this is only required by very old
-            Python.
-
-            This merge also patched SWIG's parser to solve a bug. By this patch,
-            SWIG features able to be correctly applied on C++ conversion operator,
-            such like this:
-              
-              %feature("shadow")  *::operator bool %{ ... %}
-
-2008-09-02: richardb
-	    [Python] Commit patch #2089149: Director exception handling mangles
-	    returned exception.  Exceptions raised by Python code in directors
-	    are now passed through to the caller without change.  Also, remove
-	    the ": " prefix which used to be added to other director exceptions
-	    (eg, those due to incorrect return types).
-
-2008-09-02: wsfulton
-            [Python] Commit patch #1988296 GCItem multiple module linking issue when using 
-            directors.
-
-2008-09-02: wsfulton
-            [C#] Support for 'using' and 'fixed' blocks in the 'csin' typemap is now
-            possible through the use of the pre attribute and the new terminator attribute, eg
-
-              %typemap(csin, 
-                       pre="    using (CDate temp$csinput = new CDate($csinput)) {",
-                       terminator="    } // terminate temp$csinput using block",
-                      ) const CDate &
-                       "$csclassname.getCPtr(temp$csinput)"
-
-            See CSharp.html for more info.
-
-2008-09-01: wsfulton
-            [CFFI] Commit patch #2079381 submitted by Boris Smilga - constant exprs put into 
-            no-eval context in DEFCENUM
-
-2008-08-02: wuzzeb
-            [Chicken,Allegro] Commit Patch 2019314
-            Fixes a build error in chicken, and several build errors and other errors
-            in Allegro CL
-
-2008-07-19: wsfulton
-            Fix building of Tcl examples/test-suite on Mac OS X reported by Gideon Simpson.
-
-2008-07-17: wsfulton
-            Fix SF #2019156 Configuring with --without-octave or --without-alllang
-            did not disable octave.
-
-2008-07-14: wsfulton
-            [Java, C#] Fix director typemaps for pointers so that NULL pointers are correctly 
-            marshalled to C#/Java null in director methods.
-
-2008-07-04: olly
-	    [PHP] For std_vector.i and std_map.i, rename empty() to is_empty()
-	    since "empty" is a PHP reserved word.  Based on patch from Mark Klein
-	    in SF#1943417.
-
-2008-07-04: olly
-	    [PHP] The deprecated command line option "-make" has been removed.  
-	    Searches on Google codesearch suggest that nobody is using it now
-	    anyway.
-
-2008-07-04: olly
-	    [PHP] The SWIG cdata.i library module is now supported.
-
-2008-07-03: olly
-	    [PHP] The deprecated command line option "-phpfull" has been
-	    removed.  We recommend building your extension as a dynamically
-	    loadable module.
-
-2008-07-02: olly
-	    [PHP4] Support for PHP4 has been removed.  The PHP developers are
-	    no longer making new PHP4 releases, and won't even be providing
-	    patches for critical security issues after 2008-08-08.
-
-2008-07-02: olly
-	    [Python] Import the C extension differently for Python 2.6 and
-	    later so that an implicit relative import doesn't produce a
-	    deprecation warning for 2.6 and a failure for 2.7 and later.
-	    Patch from Richard Boulton in SF#2008229, plus follow-up patches
-	    from Richard and Haoyu Bai.
-
-Version 1.3.36 (24 June 2008)
-=============================
-
-06/24/2008: wsfulton
-            Remove deprecated -c commandline option (runtime library generation).
-
-06/24/2008: olly
-	    [PHP] Fix assertion failure when handling %typemap(in,numinputs=0)
-	    (testcase ignore_parameter).
-
-06/24/2008: olly
-	    [PHP] Fix segfault when wrapping a non-class function marked with
-	    %newobject (testcase char_strings).
-
-06/22/2008: wsfulton
-            [Java] Add a way to use AttachCurrentThreadAsDaemon instead of AttachCurrentThread
-            in director code. Define the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro, see
-            Lib/java/director.swg.
-
-06/21/2008: wsfulton
-            [Ruby] Fix crashing in the STL wrappers (reject! and delete_if methods)
-
-06/19/2008: wsfulton
-            [Java, C#] C# and Java keywords will be renamed instead of just issuing a warning
-            and then generating uncompilable code. Warning 314 gives the new name when a 
-            keyword is found.
-
-06/19/2008: wsfulton
-            [R] Keyword handling added. R Keywords will be renamed as necessary.
-            Warning 314 gives the new name when a keyword is found.
-
-06/17/2008: mgossage
-            [Lua] Added missing support for bool& and bool*. Added runtest for li_typemaps testcase.
-            (Bug #1938142)
-
-06/07/2008: bhy
-            Added test case keyword_rename, then made the keyword renaming works properly
-            by fixing Swig_name_make() for a incomplete condition checking.
-
-06/02/2008: wsfulton
-            [Java, C#] Fix enum wrappers when using -noproxy.
-
-05/30/2008: bhy
-            Added std::wstring into Lib/typemaps/primtypes.swg, since it is also a primitive 
-            type in SWIG - fixed SF #1976978.
-
-05/29/2008: wsfulton
-            [Java, C#] Fix variable wrappers when using -noproxy.
-
-05/29/2008: bhy
-            [Python] Fixed a typo of %#ifdef in Lib/python/pycontainer.swg, which is related 
-            to -extranative SWIG option - SF #1971977.
-
-05/20/2008: wsfulton
-            New partialcheck makefile targets for partial testing of the test-suite. These
-            just invoke SWIG, ie no compilation and no runtime testing. It can be faster
-            when developing by just doing a directory diff of the files SWIG generates
-            against those from a previous run. Example usage from the top level directory:
-
-              make partialcheck-test-suite
-              make partialcheck-java-test-suite
-
-            This change also encompasses more flexibility in running the test-suite, eg
-            it is possible to prefix the command line which runs any target language test
-            with a tool. See the RUNTOOL, COMPILETOOL and SWIGTOOL targets in the common.mk
-            file and makefiles in the test-suite directory. For example it is possible to 
-            run the runtime tests through valgrind using:
-
-              make check RUNTOOL="valgrind --leak-check=full"
-
-            or invoke SWIG under valgrind using:
-
-              make check SWIGTOOL="valgrind --tool=memcheck"
-
-05/19/2008: drjoe
-            [R] Fixed define that was breaking pre-2.7.  Checked in
-            patch from Soren Sonnenburg that creates strings in  
-	    version independent way
-
-05/15/2008: wsfulton
-            [Java] Fix variable name clash in directors - SF #1963316 reported by Tristan.
-
-05/14/2008: wsfulton
-            Add an optimisation for functions that return objects by value, reducing
-            the number of copies of the object that are made. Implemented using an
-            optional attribute in the "out" typemap called "optimal". Details in 
-            Typemaps.html.
-
-05/11/2008: olly
-	    [PHP] Check for %feature("notabstract") when generating PHP5 class
-	    wrapper.
-
-05/11/2008: wsfulton
-            Fix SF #1943608 - $self substitution in %contract, patch submitted by
-            Toon Verstraelen.
-
-05/09/2008: olly
-	    [PHP] Fix char * typemaps to work when applied to signed char * and
-	    unsigned char * (uncovered by testcase apply_strings).
-
-05/09/2008: wsfulton
-            Fix wrapping of char * member variables when using allprotected mode.
-            Bug reported by Warren Wang.
-
-05/09/2008: olly
-	    [PHP] Fix bad PHP code generated when wrapping an enum in a
-	    namespace (uncovered by testcase arrays_scope).
-
-05/09/2008: olly
-	    [PHP] SWIG now runs the PHP testsuite using PHP5, not PHP4.  PHP4
-	    is essentially obsolete now, so we care much more about solid PHP5
-	    support.
-
-05/07/2008: wsfulton
-            STL fixes when using %import rather than %include and the Solaris Workshop
-            compiler and the Roguewave STL.
-
-05/07/2008: wsfulton
-            Fix wrapping of overloaded protected methods when using allprotected mode.
-            Bug reported by Warren Wang.
-
-05/03/2008: wsfulton
-            Commit patch #1956607 to add -MT support from Richard Boulton.
-            This patch mirrors the gcc -MT option which allows one to change the default
-            Makefile target being generated when generating makefiles with the -M family
-            of options. For example:
-
-              $ swig -java -MM -MT overriddenname -c++  example.i
-              overriddenname: \
-               example.i \
-               example.h 
-
-04/30/2008: mgossage
-	    [Lua] Removed generation of _wrap_delete_XXXXX (wrappered destructor)
-	    which was unused and causing warning with g++ -Wall.
-	    Removed other unused warning in typemaps.i and other places.
-	    Added Examples/lua/embed3, and run tests a few test cases.
-
-04/24/2008: olly
-	    [Python] Fix generated code for IBM's C++ compiler on AIX (patch
-	    from Goeran Uddeborg in SF#1928048).
-
-04/24/2008: olly
-	    Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to
-	    avoid a clash with BSIZE defined by headers on AIX with Perl
-	    (reported in SF#1928048).
-
-04/20/2008: wsfulton
-            Add the ability to wrap all protected members when using directors.
-            Previously only the virtual methods were available to the target language.
-            Now all protected members, (static and non-static variables, non-virtual methods
-            and static methods) are wrapped when using the allprotected mode. The allprotected
-            mode is turned on in the module declaration:
-
-              %module(directors="1", allprotected="1") modulename
-
-Version 1.3.35 (7 April 2008)
-=============================
-
-04/07/2008: wsfulton
-            [Lua] Add missing pointer reference typemaps
-
-04/06/2008: wsfulton
-            Fix stack overflow when using typemap warning suppression, eg 
-              %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK_MSG)
-
-04/05/2008: wsfulton
-            [Python] Fix shared_ptr typemaps so that %pythonnondynamic can be used. Also corrects
-            display of the proxy class type. Reported by Robert Lupton.
-
-04/04/2008: olly
-	    [Python] Add %newobject reference to python memory management subsection of manual
-	    (patch from mdbeachy in SF#1894610).
-
-03/27/2008: wsfulton
-            [Python] Fix shared_ptr typemaps where the pointer type is a templated type with
-            with more than one parameter. Reported by Robert Lupton.
-
-03/27/2008: mgossage
-            [Lua] Added a typemap DISOWN for SWIGTYPE* and SWIGTYPE[], and support for %delobject feature.
-            Added Examples/lua/owner which demonstrates the use of the memory management.
-
-03/26/2008: wsfulton
-            [Java] Apply patch #1844301 from Monty Taylor to suppress enum constructor
-            unused warnings.
-
-03/26/2008: wsfulton
-            [Python] Apply patch #1924524 from Casey Raymondson which ensures the
-            "No constructor defined" message is displayed when attempting to call a
-            constructor on a class that doesn't have a constructor wrapper, eg if
-            the C++ class is abstract.
-
-03/26/2008: wsfulton
-            [Python] Apply patch #1925702 from Casey Raymondson which removes warning 512
-            for std::vector wrappers.
-
-03/26/2008: olly
-	    [Python] Apply GCC 4.3 warnings patch from Philipp Thomas
-	    (SF#1925122).
-
-03/21/2008: wsfulton
-            [Python] Thread safety patch for STL iterators from Abhinandan Jain.
-
-03/17/2008: mgossage
-            [Lua] Added %luacode feature to add source code into wrappers.
-            Updated documentation to document this.
-            Added Examples/lua/arrays to show its use (and typemaps)
-
-03/17/2008: olly
-	    Fix nonportable sed usage which failed on Mac OS X (and probably
-	    other platforms).  Fixes SF#1903612.
-
-03/17/2008: olly
-	    Fix memory leak in SWIG's parser (based on patch from Russell
-	    Bryant in SF#1914023).
-
-03/12/2008: wsfulton
-            Fix bug #1878285 - unnecessary cast for C struct creation wrappers.
-
-03/12/2008: wsfulton
-            [Python] Remove debugging info when using shared_ptr support
-
-03/06/2008: mgossage
-            [Lua] Updated documentation for Lua exceptions.
-            Added Examples/lua/exception and Examples/lua/embed2.
-            Small updates to the typemaps.
-
-03/04/2008: wsfulton
-            [Java, C#] Add char *& typemaps.
-
-03/04/2008: wsfulton
-            Fix occasional seg fault when attempting to report overloaded methods as being ignored.
-
-02/29/2008: wsfulton
-            [Perl] Fix #1904537 Swig causes a Perl warning "x used only once" in Perl 5.10
-            reported by Ari Jolma
-
-02/29/2008: wsfulton
-            [Python] Add shared_ptr varin/varout typemaps for wrapping global variables.
-
-02/25/2008: wsfulton
-            Fix $wrapname to work in %exception (fixes some wrap:name assertions)
-
-Version 1.3.34 (27 February 2008)
-=================================
-
-02/13/2008: wsfulton
-            [R] Fix wrapping of global function pointer variables.
-
-02/13/2008: wsfulton
-            Add new special variables for use within %exception:
-              $wrapname - language specific wrapper name
-              $overname - if a method is overloaded this contains the extra mangling used on 
-                          the overloaded method
-              $decl     - the fully qualified C/C++ declaration of the method being wrapped 
-                          without the return type
-              $fulldecl - the fully qualified C/C++ declaration of the method being wrapped 
-                          including the return type
-
-02/12/2008: drjoe
-            [R] Now setting S4 flag in SWIG created objects.  This
-            fixes R-SWIG for 2.6 and warning for 2.6 failure has been removed.
-
-02/11/2008: mgossage
-            [Lua] Added a patch by Torsten Landschoff to fix the unary minus issue
-            Ran 'astyle --style=kr -2' across lua.cxx to neaten it up
-
-02/10/2008: wsfulton
-            Bump SWIG_RUNTIME_VERSION to 4. This is because of the recently introduced API 
-            change in the conversion functions, ie change in definition of swig_converter_func.
-            Anyone calling SWIG_TypeCast must pass in a valid value for the new additional
-            (third) parameter and then handle the newly created memory if the returned value
-            is set to SWIG_CAST_NEW_MEMORY else a memory leak will ensue.
-
-02/09/2008: wsfulton
-            [Python] Experimental shared_ptr typemaps added. Usage is the same as the recently
-            added Java and C# shared_ptr typemaps. Two macros are available, although these
-            may well change in a future version:
-
-            For base classes or classes not in an inheritance chain:
-              SWIG_SHARED_PTR(PROXYCLASS, TYPE)
-            For derived classes:
-              SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE)
-
-            The PROXYCLASS is the name of the proxy class, but is only required for Java/C#.
-            Example usage:
-
-              %include "boost_shared_ptr.i"
-
-              SWIG_SHARED_PTR(Klass, Space::Klass)
-              SWIG_SHARED_PTR_DERIVED(KlassDerived, Space::Klass, Space::KlassDerived)
-
-              namespace Space {
-                struct Klass { ... };
-                struct KlassDerived : Klass { ... };
-              }
-
-            Further details to follow in future documentation, but the following features
-            should be noted:
-
-            - Not restricted to boost::shared_ptr, eg std::tr1::shared_ptr can also be used.
-            - Available typemap groups:
-              (a) Typemaps for shared_ptr passed by value, reference, pointer and pointer 
-                  reference.
-            - (b) Typemaps for passing by raw value, raw pointer, raw reference, raw pointer
-                  reference. 
-            - The code being wrapped does not even have to use shared_ptr, SWIG can use
-              shared_ptr as the underlying storage mechanism instead of a raw pointer due to 
-              the typemaps in group (b) above.
-            - No array support as shared_ptr does not support arrays.
-            - This works quite differently to the usual SWIG smart pointer support when
-              operator-> is parsed by SWIG:
-              - An additional smart pointer class is not generated reducing code bloat in
-                the wrappers.
-              - Using smart pointers and raw pointers can be mixed seamlessly.
-              - Missing constructors for the smart pointers is no longer a problem and so
-                separate factory type functions do not have to be written and wrapped.
-              - The implicit C++ shared_ptr< derived class > to shared_ptr< base class >
-                cast also works in the target language. This negates the necessity to write
-                an explicit helper cast function providing the upcast which would need
-                calling prior to passing a derived class to a method taking a shared_ptr to
-                a base class.
-
-02/09/2008: wsfulton
-            [Python] Add support for overriding the class registration function via a new
-            "smartptr" feature. This is a very low level of customisation most users
-            would never need to know. The feature will typically be used for intrusive 
-            smart pointers along with additional typemaps. Example usage of the feature:
-
-              %feature("smartptr", noblock=1) Foo { boost::shared_ptr< Foo > }
-              class Foo {};
-
-            The generated Foo_swigregister function will then register boost::shared < Foo >
-            (SWIGTYPE_p_boost__shared_ptrTFoo_t instead of SWIGTYPE_p_Foo) as the underlying
-            type for instantiations of Foo.
-
-02/09/2008: wsfulton
-            Features now supports the optional 'noblock' attribute for all usage of %feature. 
-            When specified, the { } braces are removed from the feature code. This is identical
-            in behaviour to usage of 'noblock' in typemaps and is used when the preprocessor
-            is required to operate on the code in the feature and the enclosing { } braces
-            are not required. Example:
-
-              #define FOO foo
-              %feature("smartptr", noblock="1") { FOO::bar }
-
-            The preprocessor then reduces this as if this had been used instead:
-
-              %feature("smartptr") "foo::bar"
-
-02/01/2008: olly
-	    [Python] Fix format string bug (SF#1882220).
-
-01/31/2008: wsfulton
-            Additions to the %types directive. Now the conversion / casting code can be
-            overridden to some custom code in the %types directive, like so:
-
-              %types(fromtype = totype) %{
-                ... code to convert fromtype to totype and return ...
-              %}
-
-            The special variable $from will be replaced by the name of the parameter of the
-            type being converted from. The code must return the totype cast to void *. Example:
-
-              class Time;
-              class Date;
-              Date &Time::dateFromTime();
-
-              %types(Time = Date) %{
-                Time *t = (Time *)$from;
-                Date &d = t->dateFromTime();
-                return (void *) &d;
-              %}
-
-            resulting in the conversion / casting code looking something like:
-
-              static void *_p_TimeTo_p_Date(void *x) {
-                Time *t = (Time *)x;
-                Date &d = t->dateFromTime();
-                return (void *) &d;
-              }
-
-            This is advanced usage, please use only if you understand the runtime type system.
-
-01/30/2008: mgossage
-	    Small update to documentation in Typemaps.html, to warn about use of local 
-	    variables in typemaps for multiple types.
-
-01/25/2008: wsfulton
-	    [Java] Fix bug reported by Kevin Mills in ARRAYSOFCLASSES typemaps where any
-            changes made to an array element passed from Java to C are not reflected back
-            into Java.
-
-01/24/2008: mgossage
-	    More updates to the configure script for detecting lua.
-	    Also looks in /usr/include/lua*
-	    Also changed typemaps.i not to check for NULL before freeing a pointer
-
-01/21/2008: wsfulton
-	    [Python] For STL containers, SWIG no longer attempts to convert from one
-            STL container to another, eg from std::vector<int> to std::vector<double>
-            or std::list<int> to std::vector<int> or even std::vector<Foo> to
-            std::vector<Bar> as it previously did. In fact SWIG no longer attempts to
-            convert any SWIG wrapped C++ proxy class that is also a Python sequence,
-            whereas previously it would. Any non-SWIG Python sequence will still be
-            accepted wherever an STL container is accepted. Overloaded methods using
-            containers should be faster.
-
-01/18/2008: wsfulton
-	    [C#] Add 'directorinattributes' and 'directoroutattributes' typemap attributes
-            for the imtype typemap. These should contain C# attributes which will
-            be generated into the C# director delegate methods.
-
-01/18/2008: olly
-	    Fix handling of byte value 255 in input files on platforms where
-	    char is signed (it was getting mapped to EOF).  Fixes SF#1518219.
-
-01/16/2008: wsfulton
-	    Fix template member variables wrapped by a smart pointer. Bug reported 
-            by Robert Lupton.
-
-01/14/2008: mgossage
-	    Substantial changes to configure script for detecting lua.
-	      Code can now link to liblua.a, liblua50.a or liblua51.a
-	      It's also a lot neater now.
-
-12/16/2007: wsfulton
-	    [Perl] Backed out #1798728 - numbers can be passed to functions taking char *
-
-12/16/2007: wsfulton
-	    Fix #1832613 - Templates and some typedefs involving pointers or function pointers
-
-12/12/2007: wsfulton
-	    [Java] Fix #1632625 - Compilation errors on Visual C++ 6 when using directors.
-
-12/12/2007: wsfulton
-	    [Perl] Fix #1798728 - numbers can be passed to functions taking char *.
-
-12/12/2007: wsfulton
-	    Fix #1819847 %template with just one default template parameter 
-
-              template<typename T = int> class Foo {...};
-              %template(FooDefault) Foo<>;
-
-12/12/2007: mgossage
-	    [Lua] Small correction on Lua.html
-
-12/09/2007: wsfulton
-	    Apply patch #1838248 from Monty Taylor for vpath builds of SWIG.
-
-12/08/2007: wsfulton
-	    [Lua] Fixes to remove gcc-4.2 warnings
-
-12/06/2007: wsfulton
-	    Fix #1734415 - template template parameters with default arguments such as:
-
-              template<typename t_item, template<typename> class t_alloc = pfc::alloc_fast >
-                class list_t : public list_impl_t<t_item,pfc::array_t<t_item,t_alloc> > { ... };
-
-12/04/2007: mgossage
-	    [lua] Fix a bug in the class hierachy code, where the methods were not propagated, 
-	    if the name ordering was in a certain order.
-	    Added new example programs (dual, embed) and runtime tests for test-suite.
-
-11/30/2007: wsfulton
-	    Fix using statements using a base class method where the methods were overloaded.
-            Depending on the order of the using statements and method declarations, these
-            were previously generating uncompilable wrappers, eg:
-
-              struct Derived : Base {
-                virtual void funk();
-                using Base::funk;
-              };
-
-Version 1.3.33 (November 23, 2007)
-==================================
-
-11/21/2007: mikel
-	    [allegrocl] omit private slot type info in the classes/types
-	    defined on the lisp side. Fix bug in mapping of C/++ types
-	    to lisp types. Fix typo in modules generated defpackage form.
-	    Have std::string *'s automatically marshalled between foreign
-	    and lisp strings.
-	
-11/20/2007: olly
-	    [Python] Fill in Python Dictionary functions list (patch from
-	    Jelmer Vernooij posted to swig-devel).
-
-11/20/2007: beazley
-            Fixed a bug in the C scanner related to backslash characters.
-
-11/19/2007: wsfulton
-	    [Perl] Fix broken compilation of C++ wrappers on some compilers.
-
-11/16/2007: olly
-	    [Python] Don't pass Py_ssize_t for a %d printf-like format as
-	    that's undefined behaviour when sizeof(Py_ssize_t) != sizeof(int).
-
-Version 1.3.32 (November 15, 2007)
-==================================
-
-11/14/2007: wsfulton
-            [R] Package name and dll name is now the same as the SWIG module
-            name. It used to be the module name with _wrap as a suffix. The package
-            and dll names can be modified using the -package and -dll commandline
-            options.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-11/11/2007: wsfulton
-            [R] Add support for Windows (Visual C++ 8 tested)
-
-11/10/2007: olly
-	    [php] Fix makefile generated by -make (SF#1633679).  Update
-	    documentation to mark "-make" as deprecated (none of the other
-	    SWIG backends seem to offer such a feature, it can't realistically
-	    generate a fully portable makefile, and the commands to build an
-	    extension are easy enough to write for the user's preferred build
-	    tool).  Also recommend against the use of "-phpfull" (it's only
-	    really useful when static linking, and a dynamically loadable
-	    module is virtually always the better approach).
-
-11/09/2007: olly
-	    Fix --help output to note that `export SWIG_FEATURES' is required.
-
-10/29/2007: wsfulton
-            [R] Fix seg fault on Windows
-            [R] Examples R scripts are now platform independent
-
-10/30/2007: mgossage
-	    [lua] fixed bug in template classes which cases template_default2
-	    and template_specialization_defarg to fail.
-	    Added several warning filters into the overload's test cases.
-	    Added runtime tests for several codes.
-	    You can now make check-lua-test-suite with no errors and only a few warnings.
-
-10/30/2007: olly
-	    [guile] Fix the configure test to put GUILELINK in LIBS not LDFLAGS
-	    (SF#1822430).
-
-10/30/2007: olly
-	    [guile] Fix the guile examples on 64-bit platforms.
-
-10/29/2007: wsfulton
-            [C#] Fix member pointers on 64 bit platforms.
-
-10/28/2007: olly
-	    [lua] Fix swig_lua_class instances to be static to allow multiple
-	    SWIG wrappers to be compiled into the same executable statically.
-	    Patch from Andreas Fredriksson (posted to the swig mailing list).
-
-10/28/2007: olly
-	    [lua] Fix Examples/lua to pass SRCS for C tests rather than CXXSRCS.
-	    The code as it was happened to work on x86, but broke on x86_64 (and
-	    probably any other platforms which require -fPIC).
-
-10/28/2007: wsfulton
-            [Java, C#] New approach for fixing uninitialised variable usage on error in director
-            methods using the new templated initialisation function SwigValueInit().
-
-10/28/2007: wsfulton
-            [Perl] Use more efficient SvPV_nolen(x) instead of SvPV(x,PL_na) if SvPV_nolen is
-            supported.
-
-10/26/2007: wuzzeb
-	    [Chicken] Fix global variables of class member function pointers.
-	    Other minor fixes, so all tests in the chicken test suite now pass
-
-10/25/2007: olly
-	    Fix UTL typecheck macro for a function taking char[] or const
-	    char[] (SF#1820132).
-
-10/22/2007: mkoeppe
-	    [Guile] Filter out -ansi -pedantic from CFLAGS while compiling test programs for Guile
-	    in configure.  This enables running the test suite for Guile if it is installed and
-	    usable.
-
-10/22/2007: mkoeppe
-	    [Guile -scm] Fix testcases apply_signed_char and apply_strings
-	    by adding explicit casts to the appropriate $ltype.
-
-10/22/2007: wsfulton
-            [Java, C#] Fix uninitialised variable usage on error in director methods.
-
-10/19/2007: wsfulton
-            [Java, C#] Bug #1794247 - fix generated code for derived classes when csbase or javabase
-            typemaps are used with the replace="1" attribute.
-
-10/19/2007: wsfulton
-            [Python] Docs updated to suggest using distutils. Patch #1796681 from Christopher Barker.
-
-10/19/2007: olly
-	    [perl5] Clear errno before calls to strtol(), strtoul(), strtoll()
-	    and strtoull() which we check errno after to avoid seeing a junk
-	    value of errno if there isn't an error in the call.
-
-10/16/2007: wsfulton
-            Deprecate %attribute_ref and replace with %attributeref. There is just an argument
-            order change in order to maintain consistency with %attribute, from:
-
-              %attribute_ref(Class, AttributeType, AccessorMethod, AttributeName)
-            to
-              %attributeref(Class, AttributeType, AttributeName, AccessorMethod)
-
-10/16/2007: olly
-	    [Tcl] Fix several occurrences of "warning: deprecated conversion
-	    from string constant to 'char*'" from GCC 4.2 in generated C/C++
-	    code.
-
-10/16/2007: olly
-	    [PHP] Fix many occurrences of "warning: deprecated conversion from
-	    string constant to 'char*'" from GCC 4.2 in generated C/C++ code
-	    when compiling with a new enough version of PHP 5 (tested with
-	    PHP 5.2.3, but PHP 5.2.1 is probably the minimum requirement).
-
-10/15/2007: wsfulton
-            Patch #1797133 from David Piepgrass fixes %attribute when the getter has the same name
-            as the attribute name and no longer generate non-functional setter for read-only attributes.
-
-10/15/2007: olly
-	    [Tcl] Prevent SWIG_Tcl_ConvertPtr from calling the unknown proc.
-	    Add Examples/tcl/std_vector/ which this change fixes.  Patch
-	    is from "Cliff C" in SF#1809819.
-
-10/12/2007: wsfulton
-            [Java] Add DetachCurrentThread back in for directors. See entry dated 08/11/2006 and
-            search for DetachCurrentThread on the mailing lists for details. The crashes on Solaris
-            seem to be only present in jdk-1.4.2 and lower (jdk-1.5.0 and jdk-1.6.0 are okay), so
-            anyone using directors should use a recent jdk on Solaris, or define (see director.swg)
-            SWIG_JAVA_NO_DETACH_CURRENT_THREAD to the C++ compiler to get old behaviour.
-
-10/12/2007: wsfulton
-	    [Java] Ensure the premature garbage collection prevention parameter (pgcpp) is generated
-            when there are C comments in the jtype and jstype typemaps.
-
-10/12/2007: wuzzeb
-	    Added a testsuite entry for Bug #1735931
-
-10/09/2007: olly
-	    Automatically rerun autogen.sh if configure.in is modified.
-
-10/09/2007: olly
-	    Enhance check-%-test-suite rule and friends to give a more helpful
-	    error message if you try them for a language which doesn't exist
-	    (e.g. "make check-php-test-suite" rather than the correct
-	    "make check-php4-test-suite").
-
-10/09/2007: olly
-	    Add make rule to regenerate Makefile from Makefile.in if it has
-	    changed.
-
-10/09/2007: olly
-	    [php] Fix long-standing memory leak in wrapped constructors and
-	    wrapped functions/methods which return an object.
-
-10/08/2007: olly
-	    Fix Makefile.in to read check.list files correctly in a VPATH
-	    build.
-
-10/07/2007: wsfulton
-            [C#, Java] Experimental shared_ptr typemaps added
-
-09/27/2007: mgossage
-	    [lua] added more verbose error messages for incorrect typechecks.
-	    Added a routine which checks the exact number of parameters passed to a function
-	    (breaks operator_overloading for unary minus operator, currently disabled).
-	    Reorganised the luatypemaps.swg to tidy it up.
-	    Added a lot of %ignores on the operators not supported by lua.
-	    Added support for constant member function pointers & runtest for member_pointer.i
-	    Added first version of wchar.i
-
-09/25/2007: wsfulton
-            [C#, Java] throws typemaps for std::wstring using C# patch #1799064 from David Piepgrass
-
-09/24/2007: wsfulton
-            [Tcl] Apply #1771313 to fix bug #1650229 - fixes long long and unsigned long long
-            handling.
-
-09/20/2007: olly
-	    [Java] Eliminate some unnecessary uses of a temporary buffer
-	    allocated using new[].  SF#1796609.
-
-09/19/2007: wsfulton
-            [C#] The $csinput special variable can be used in the csvarin typemap where it is always
-            expanded to 'value'.
-
-09/19/2007: wsfulton
-            [C#] Fix bug reported by Glenn A Watson and #1795260 where the cstype typemap used the 'ref'
-            keyword in the typemap body, it produced uncompilable C# properties (variable wrappers).
-            The type for the property now correctly comes from the 'out' attribute in the cstype typemap.
-
-09/19/2007: wsfulton
-            [Java] Fix const std::wstring& typemaps
-
-09/19/2007: wsfulton
-	    [Java] Ensure the premature garbage collection prevention parameter (pgcpp) is generated
-            where a parameter is passed by pointer reference, eg in the std::vector wrappers. The pgcpp
-            is also generated now when user's custom typemaps use a proxy class in the jstype typemap
-            and a 'long' in the jtype typemap.
-
-09/18/2007: olly
-	    [php] Add typemaps for handling parameters of type std::string &
-	    which are modified by the wrapped function.
-
-09/17/2007: olly
-	    [python] Split potentially long string literals to avoid hitting
-	    MSVC's low fixed limit on string literal length - patch from
-	    SF#1723770, also reported as SF#1630855.
-
-09/17/2007: olly
-	    [ocaml] Fix renaming of overloaded methods in the method_table -
-	    my patch from SF#940399.
-
-09/17/2007: olly
-	    [python] Simpler code for SWIG_AsVal_bool() which fixes a "strict
-	    aliasing" warning from GCC - patch from SF#1724581 by Andrew
-	    Baumann.
-
-09/17/2007: olly
-	    [perl5] Use sv_setpvn() to set a scalar from a pointer and length
-	    - patch from SF#174460 by "matsubaray".
-
-09/17/2007: olly
-	    When wrapping C++ code, generate code which uses
-	    std::string::assign(PTR, LEN) rather than assigning
-	    std::string(PTR, LEN).  Using assign generates more efficient code
-	    (tested with GCC 4.1.2).
-
-09/07/2007: wsfulton
-	    Fix %ignore on constructors which are not explicitly declared [SF #1777712]
-
-09/05/2007: wuzzeb (John Lenz)
-	    - Change r_ltype in typesys.c to store a hashtable instead of a single value.
-	      several very subtle bugs were being caused by multiple ltypes being mapped
-	      to a single mangled type, mostly when using typedefed template parameters.
-	      Now, r_ltype stores a hashtable of possible ltypes, and when generating the
-	      type table, all the ltypes are added into the swig_type_info structure.
-
-08/31/2007: wsfulton
-            SF #1754967 from James Bigler.
-            - Fix bug in turning on warnings that were turned off by default. Eg 'swig -w+309' will now
-              turn on the normally suppressed warning 309.
-
-            - New -Wextra commandline option which enables the extra warning numbers:
-              202,309,403,512,321,322 (this is the list of warnings that have always been suppressed by
-              default). By specifying -Wextra, all warnings will be turned on, but unlike -Wall,
-              warnings can still be selectively turned on/off using %warnfilter,
-              #pragma SWIG nowarn or further -w commandline options, eg:
-                swig -Wextra -w309
-              will turn on all warnings except 309.
-
-08/28/2007: wsfulton
-            - New debugging options, -debug-module <n> and -debug-top <n> to display the parse tree at
-              various stages, where <n> is a comma separated list of stages 1-4.For example, to
-              display top of parse tree at stages 1 and 3:
-                swig -debug-top 1,3
-
-            - Deprecate the following options which have equivalents below:
-              -dump_parse_module    =>   -debug-module 1
-              -dump_module          =>   -debug-module 4
-              -dump_parse_top       =>   -debug-top 1
-              -dump_top             =>   -debug-top 4
-
-            - Renamed some commandline options for naming consistency across all options:
-              -debug_template  =>   -debug-template
-              -debug_typemap   =>   -debug-typemap
-              -dump_classes    =>   -debug-classes
-              -dump_tags       =>   -debug-tags
-              -dump_typedef    =>   -debug-typedef
-              -dump_memory     =>   -debug-memory
-
-08/25/2007: olly
-	    [PHP5] Fix handling of double or float parameters with an integer
-	    default value.
-
-08/25/2007: olly
-	    [PHP5] Generate __isset() methods for setters for PHP 5.1 and later.
-
-08/20/2007: wsfulton
-            [Java C#] Fix director bug #1776651 reported by Stephane Routelous which occurred when
-            the director class name is the same as the start of some other symbols used within
-            the director class.
-
-08/17/2007: wsfulton
-            Correct behaviour for templated methods used with %rename or %ignore and the empty
-            template declaration - %template(). A warning is issued if the method has not been
-            renamed.
-
-08/16/2007: mutandiz (Mikel Bancroft)
-	    [allegrocl] Name generated cl file based on input file rather than by
-	    module name. It was possible to end up with a mypackage.cl and a test_wrap.c
-	    when parsing a test.i input file. Confusing. Also, include external-format
-	    templates for :fat and :fat-le automatically to avoid these being compiled
-	    at runtime.
-
-08/15/2007: efuzzyone
-            [cffi] Apply patch #1766076 from Leigh Smith adding support for newly introduced
-            in cffi :long-long and :unsigned-long-long.
-
-08/10/2007: wsfulton
-            [Java] Add documentation patch #1743573 from Jeffrey Sorensen. It contains a neat
-            idea with respect to better memory management by the JVM of C++ allocated memory.
-
-08/10/2007: wsfulton
-            [Perl] Apply patch #1771410 from Wade Brainerd to fix typedef XS(SwigPerlWrapper) in
-            perlrun.swg for ActiveState Perl build 822 and Perl 5.8.9 and 5.10 branches.
-
-08/10/2007: wsfulton
-            [Lua] const enum reference typemaps fixed.
-
-08/09/2007: wsfulton
-            [C#] Added missing support for C++ class member pointers.
-
-08/09/2007: wsfulton
-            [C#, Java] Add support for $owner in the "out" typemaps like in the scripting
-            language modules. Note that $owner has always been supported in the "javaout" / "csout"
-            typemaps.
-
-08/01/2007: wsfulton
-            Fix smart pointer handling for classes that have templated methods within the smart
-            pointer type. Problem reported by craigdo at ee.washington.edu.
-
-07/31/2007: efuzzyone
-            [cffi] fixed memory access after being freed bug. thanks to Martin Percossi.
-            package name clos changed to cl. thanks to Ralf Mattes
-
-07/24/2007: wsfulton
-            Parallel make support added for the examples and test-suite for developers who have
-            more than one CPU. Now parallel make can be used for checking in addition to building
-            the SWIG executable. Some typical checking examples:
-
-              make -j8 -k check
-              make -j4 check-java-test-suite
-              make -j2 check-java-examples
-
-07/19/2007: mgossage
-            Fixed bug that stopped configure working on mingw (applied dos2unix to configure.in)
-
-07/10/2007: mgossage
-            [lua] Extra compatibility with Lua 5.1 (updated SWIG_init, docs, examples, test suite)
-	    Removed name clash for static link of multiple modules
-
-07/05/2007: mgossage
-            [lua] Fix a bug in SWIG_ALLOC_ARRAY()
-            improved the error messages for incorrect arguments.
-            Changed the output of swig_type() to use the human readable form of the type,
-	    rather than the raw swig type.
-
-07/03/2007: wsfulton
-            [C#] Fix directors for some overloaded methods where the imtype resulted in identical
-            methods being generated in the C# director class, eg void foo(int *) and void foo(double *)
-            used to generated two of these:
-
-              private void SwigDirectorfoo(IntPtr p) { ... }
-
-06/25/2007: wsfulton
-            [Java, C#] Some parameter name changes in std_vector.i allowing better targeting
-            of typemaps for method parameters (for memory management of containers of pointers).
-
-06/07/2007: mutandiz (Mikel Bancroft)
-	    [allegrocl]
-	    fix foreign-type constructor to properly look for ffitype typemap
-	    bindings. fix inout_typemaps.i for strings.
-
-06/06/2007: olly
-	    [Ruby]
-	    Use whichever of "long" or "long long" is the same size as "void*"
-	    to hold pointers as integers, rather than whichever matches off_t.
-	    Fixes compilation on OS X and GCC warnings on platforms where
-	    sizeof(void*) < sizeof(off_t) (SF patch #1731979).
-
-06/06/2007: olly
-	    [PHP5]
-	    Fix handling of a particular case involving overloaded functions
-	    with default parameters.
-
-06/05/2007: mutandiz (Mikel Bancroft)
-	    [allegrocl]
-	    Fix case where we'd pass fully qualified identifiers
-	    (i.e. NS1::NS2::FOO) to swig-insert-id. All namespaces
-	    should be stripped.
-
-	    Fix bug in TypedefHandler introduced by last fix.
-
-06/05/2007: olly
-	    Fix reporting of filenames in errors after %include (patch from
-	    Leigh Smith in #1731040; also reported as #1699940).
-
-05/31/2007: olly
-	    [Python]
-	    Fix "missing initialiser" warning when compiling generated C/C++
-	    wrapper code with Python 2.5 with warnings enabled (patch from
-	    bug#1727668 from Luke Moore).
-
-05/29/2007: olly
-	    [Python]
-	    Split docstrings into separate string literals at each newline when
-	    generating C/C++ wrapper code (the C/C++ compiler will just combine
-	    them back into a single string literal).  This avoids MSVC
-	    complaining that the strings are too long (problem reported by
-	    Bo Peng on the mailing list).
-
-05/28/2007: olly
-	    [Python]
-	    Escape backslashes in docstrings.
-
-05/26/2007: olly
-	    [Python]
-	    Fix autodoc generation of enums to be more consistent with how the
-	    enums are wrapped - patch #1697226 from Josh Cherry.
-
-05/26/2007: olly
-	    [PHP5]
-	    Fix wrapping of methods and functions which return a pointer to a
-	    class (bug#1700788) and those which have overloaded forms returning
-	    both classes and non-classes (bug#1712717, thanks to Simon
-	    Berthiaume for the patch).
-
-05/25/2007: wsfulton
-            Fixed %rename inconsistency in conversion operators as reported by Zhong Ren. The matching
-            is now done on the operator name in the same way as it is done for parameters. For example:
-
-              %rename(opABC) Space::ABC::operator ABC() const;
-              %rename(methodABC) Space::ABC::method(ABC a) const;
-              namespace Space {
-                class ABC {
-                  public:
-                    void method(ABC a) const {}
-                    operator ABC() const { ABC a; return a; }
-                };
-              }
-
-            Note that qualifying the conversion operator previously may or may not have matched.
-            Now it definitely won't, so this will not match:
-
-              %rename(opABC) Space::ABC::operator Space::ABC() const;
-
-            in the same way that this does not match:
-
-              %rename(methodABC) Space::ABC::method(Space::ABC a) const;
-
-            The documentation has been improved with respect to %rename, namespaces and templates.
-            Conversion operators documentation too.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-05/16/2007: mutandiz
-	    [allegrocl]
-	    Fix bad generation of local var ltype's in functionWrapper().
-	    Try to work better with the backward order in which swig
-	    unrolls nested class definitions.
-	    cleaned up a little unnecessary code/debug printf's.
-	    Remove warning when replacing $ldestructor for ff:foreign-pointer
-
-05/12/2007: olly
-	    [Python]
-	    swig -python -threads now generates C/C++ code which uses Python's
-	    own threading abstraction (from pythread.h) rather than OS specific
-	    code.  The old code failed to compile on MS Windows.  (See SF patch
-	    tracker #1710341).
-
-05/04/2007: gga
-	    [Ruby]
-	    Changed STL renames to be global renames.  This fixes
-	    STL functions not being renamed when autorename is on.
-            This is a not a totally perfect work-around, but better.
-	    Someone really needs to fix the template renaming code.
-	    (See bug #1545634)
-
-05/04/2007  gga
-	    [All]
-            Changed %rename("%(undercase)s") a little so that single
-	    numbers at the end of a function are not undercased.  That is:
-		getSomething -> get_something
-		get2D	     -> get_2d
-		get234	     -> get_234
-	    BUT:
-		asFloat2     -> as_float2
-	    (Bug #1699714)
-
-05/03/2007: gga
-	    [Ruby]
-	    Made __swigtype__ => @__swigtype__ so it can be accessed
-	    from the scripting language (and follows Ruby's official
-            documentation, just in case).
-	    Made tracking => @__trackings__ for same reason.
-	    Currently storing ivars without the @ seems valid, but
-	    the PickAxe says this is not correct, so just in case...
-
-05/03/2007: gga
-	    [Ruby]
-	    Applied patch for -minherit bug and exception classes.
-	    This issue should be revisited more closely, as Multiple
-	    Inheritance in Ruby is still problematic.
-	    (patch/bug #1604878)
-
-05/03/2007: gga
-	    [Ruby]
-	    Overloaded functions in ruby will now report to the user
-            the possible prototypes when the user mistypes the number or
-            type of a parameter.
-
-05/03/2007: gga
-	    [Ruby]
-	    Forgot to document the bug fixing of an old bug regarding
-	    exceptions.
-	    (bug #1458247)
-
-05/03/2007: gga
-	    [Ruby]
-	    Fixed Ruby documentation to use the proper css styles for
-	    each section. Added autodoc section to Ruby's docs to
-	    document the features supported by Ruby in documenting its modules.
-	    Made rdoc documentation spit out the full name of the class +
-	    method name.  Albeit this will make the current rdoc not recognize
-            the method, this is still needed to disambiguate between different
-            classes with similar methods (rdoc was created to document the
-	    ruby source which only contains one class per c file, unlike swig)
-            I have patched rdoc to make it more friendly to swig.  This
-            patch needs to be merged in the ruby std library now.
-
-05/03/2007: gga
-	    [Ruby]
-	    Changed flag -feature to be -init_name to better reflect its
-	    purpose and avoid confusion with -features.
-
-05/03/2007: gga
-	    [Ruby]
-	    Improved autodoc generation.
-	    Added autodoc .swg files to Ruby library for easily adding
-	    documentation to common Ruby methods and STL methods.
-	    Fixed autodoc documenting of getters and setters and module.
-	    Made test suite always generate autodocs.
-
-05/03/2007: gga
-	    [Ruby]
-	    Removed some warnings from STL and test suite.
-
-05/02/2007: mgossage
-            [Lua] Fixed issues with C++ classes and hierachies across multiple
-	    source files. Fixed imports test case & added run test.
-	    Added Examples/imports.
-	    Added typename for raw lua_State*
-	    Added documentation on native functions.
-
-05/02/2007: gga
-	    [Ruby]
-	    Docstrings are now supported.
-	    %feature("autodoc") and %feature("docstring") are now
-	    properly supported in Ruby.  These features will generate
-	    a _wrap.cxx file with rdoc comments in them.
-
-05/02/2007: gga
-	    [Ruby]
-	    STL files have been upgraded to follow the new swig/python
-	    Lib/std conventions.
-	    This means std::vector, std::set, std::map, set::multimap,
-	    std::multiset, std::deque and std::string are now properly
-	    supported, including their iterators, support for containing
-	    ruby objects (swig::GC_VALUE) and several other ruby
-	    enhancements.
-	    std::complex, std::ios, std::iostream, std::iostreambuf and
-	    std::sstream are now also supported.
-	    std::wstring, std::wios, std::wiostream, std::wiostreambuf
-	    and std::wsstream are supported verbatim with no unicode
-	    conversion.
-
-	    std_vector.i now mimics the behavior of Ruby Arrays much more
-	    closely, supporting slicing, shifting, unshifting,
-            multiple indexing and proper return values on assignment.
-
-	    COMPATABILITY NOTE: this changes the older api a little bit in
-	    that improper indexing would previously (incorrectly) raise
-	    exceptions.  Now, nil is returned instead, following ruby's
-	    standard Array behavior.
-
-05/02/2007: gga
-	    [Ruby]
-	    Changed the value of SWIG_TYPECHECK_BOOL to be 10000 (ie. higher
-	    than that of all integers).
-	    This is because Ruby allows typecasting
-	    integers down to booleans which can make overloaded functions on
-	    bools and integers to fail.
-	    (bug# 1488142)
-
-05/02/2007: gga
-	    [Ruby]
-	    Fixed a subtle bug in multiple argouts that could get triggered if
-	    the user returned two or more arguments and the first one was an
-	    array.
-
-05/01/2007: gga
-	    [Ruby]
-	    Improved the documentation to document the new features
-            added, add directorin/out/argout typemaps, etc.
-
-05/01/2007: gga
-	    [Ruby]
-	    Added %initstack and %ignorestack directives for director
-	    functions.  These allow you to control whether a director
-	    function should re-init the Ruby stack.
-	    This is sometimes needed for an embedded Ruby where the
-	    director method is used as a C++ callback and not called
-            by the user from ruby code.
-	    Explanation:
-	    Ruby's GC needs to be aware of the running OS stack in order to
-	    mark any VALUE (Ruby objects) it finds there to avoid collection
-	    of them.  This allows the ruby API to be very simple and allows
-	    you to write code like "VALUE a = sth" anywhere without needing
-	    to do things like refcounting like python.
-	    By default, the start of the stack is set when ruby_init() is
-	    called.   If ruby is inited within main(), as it usually is the
-	    case with the main ruby executable, ruby will be able to calculate
-	    its stack properly.  However, when this is not possible, as when
-	    ruby is embedded as a plugin to an application where main is not
-	    available, ruby_init() will be called in the wrong place, and
-	    ruby will be incorrectly tracking the stack from the function
-	    that called ruby_init() forwards only, which can lead to
-	    all sorts of weird crashes or to ruby thinking it has run out of
-	    stack space incorrectly.
-	    To avoid this, director (callback) functions can now be tagged
-	    to try to reset the ruby stack, which will solve the issues.
-	    NOTE: ruby1.8.6 still contains a bug in it in that its function
-	    to reset the stack will not always do so.  This bug is triggered
-	    very rarely, when ruby is called from two very distinct places
-	    in memory, like a branch of main() and another dso.  This bug
-	    has now been reported to ruby-core and is pending further
-	    investigation.
-	    (bug #1700535 and patch #1702907)
-
-04/30/2007: wsfulton
-            Fix #1707582 - Restore building from read-only source directories.
-
-04/30/2007: gga
-	    [Ruby]
-	    Ruby will now report the parameter index properly on type
-	    errors as well as the class and value of the incorrect
-	    argument passed.
-	    (feature request #1699670)
-
-04/30/2007: gga
-	    [Ruby]
-	    Ruby no longer creates the free_Class function if the class
-	    contains its own user defined free function (%freefunc).
-	    (bug #1702882)
-
-04/30/2007: gga
-	    [Ruby]
-	    Made directors raise a ruby exception for incorrect argout
-	    returned values if RUBY_EMBEDDED is set, instead of throwing
-	    an actual SwigDirector exception.
-	    This will prevent crashes when ruby is embedded and unaware
-	    of the SwigDirector exception.
-
-04/30/2007: gga
-	    [Ruby]
-	    Removed the need for -DSWIGEXTERN.
-	    Changed swig_ruby_trackings to be a static variable, but also
-	    be kept within a hidden instance variable in the SWIG module.
-	    This allows properly dealing with trackings across multiple
-	    DSOs, which was previously broken.
-	    (bug #1700535 and improvement to patch #1702907)
-
-04/29/2007: gga
-	    [Ruby] Fixed GC memory issues with trackings that could lead
-	    to segfaults when dealing, mainly, with static variables.
-	    (bug #1700535 and patch #1702907)
-
-04/29/2007: gga
-	    [Ruby]
-	    Fixed String conversion using old ruby1.6 macros.  Now
-	    StringValuePtr() is used if available.  This removes warnings
-	    when converting strings with \0 in them.
-	    (bug #1700535 and patch #1702907)
-
-04/29/2007: gga
-	    [Ruby]
-	    Fixed the argout count in directors for Ruby.  Previously,
-	    ignored or "numinputs=0" typemaps would incorrectly not get
-	    counted towards the argout count.
-	    (bug/patch #1545585)
-
-04/29/2007: gga
-	    [Ruby]
-	    Upgraded Ruby converter to recognize "numinputs=0".  Previously,
-	    only the old "ignore" flag was checked (which would currently
-	    still work properly, but is deprecated).
-
-04/29/2007: gga
-	    [Ruby - but should be made generic]
-
-	    %feature("numoutputs","0") added.
-
-	    This feature allows you to ignore the output of a function so
-	    that it is not added to a list of output values
-	    ( ie. argouts ).
-	    This should also become a feature of %typemap(directorout)
-	    as "numoutputs"=0, just like "numinputs"=0 exists.
-
-	    %feature("directors"=1)
-
-	    %include <typemaps.i>
-
-	    %feature("numoutputs","0") { Class::member_function1 };
-	    %typemap(out) MStatus { // some code, like check mstatus
-	                            // and raise exception if wrong };
-
-	    %inline %{
-	      typedef int MStatus;
-	      class Class {
-
-	      // one argument returned, but director out code added
-	      // MStatus is discarded as a return (out) parameter.
-	      virtual MStatus member_function1( int& OUTPUT );
-
-	      // two arguments returned, director out code added
-	      // MStatus is not discarded
-	      virtual MStatus member_function2( int& OUTPUT );
-	      };
-            %}
-
-
-04/21/2007: olly
-	    Fix parsing of float constants with an exponent (e.g. 1e-02f)
-	    (bug #1699646).
-
-04/20/2007: olly
-	    [Python] Fix lack of generation of docstrings when -O is used.
-	    Also, fix generation of docstrings containing a double quote
-	    character.  Patch from Richard Boulton in bug#1700146.
-
-04/17/2007: wsfulton
-            [Java, C#] Support for adding in Java/C# code before and after the intermediary call,
-            specifically related to the marshalling of the proxy type to the intermediary type.
-            The javain/csin typemap now supports the 'pre' and 'post' attributes to achieve this.
-            The javain typemap also supports an optional 'pgcppname' attribute for premature garbage
-            collection prevention parameter naming and the csin typemap supports an optional 'cshin'
-            attribute for the parameter type used in a constructor helper generated when the type is used
-            in a constructor. Details in the Java.html and CSharp.html documentation.
-
-04/16/2007: olly
-	    Don't treat `restrict' as a reserved identifier in C++ mode
-	    (bug#1685534).
-
-04/16/2007: olly
-	    [PHP5] Fix how zend_throw_exception() is called (bug #1700785).
-
-04/10/2007: olly
-	    Define SWIGTEMPLATEDISAMBIGUATOR to template for aCC (reported on
-	    swig-user that this is needed).
-
-04/04/2007: olly
-	    [PHP5] If ZTS is enabled, release <module>_globals_id in MSHUTDOWN
-	    to avoid PHP interpreter crash on shutdown.  This solution was
-	    suggested here: http://bugs.php.net/bug.php?id=40985
-
-04/03/2007: olly
-	    [PHP4] Add missing ZTS annotations to generated C++ wrapper code
-	    to fix compilation failures when using ZTS enabled SWIG (Linux
-	    distributions tend to disable ZTS, but notably the Windows build
-	    uses it by default).
-
-04/01/2007: efuzzyone
-            [CFFI] Patch #1684261: fixes handling of unsigned int literals, thanks Leigh Smith.
-            Also, improved documentation.
-
-03/30/2007: olly
-	    Avoid generating '<:' token when using SwigValueWrapper<> on a type
-	    which starts with '::' (patch #1690948).
-
-03/25/2007: wuzzeb (John Lenz)
-	    [perl5] Add SWIG_fail to the SWIG_exception macro.  Fixes a few problems reported
-	    on the mailing list.
-
-03/23/2007: wsfulton
-            String copying patch from Josh Cherry reducing memory consumption by about 25%.
-
-03/21/2007: wsfulton
-            [Java] Apply patch #1631987 from Ulrik Peterson - bool INOUT typemaps
-            fail on big endian machines.
-
-03/16/2007: wsfulton
-            Fix seg fault given dodgy C++ code: namespace abc::def { }
-
-03/16/2007: wsfulton
-            [Java] Fixes so that ARRAYSOFCLASSES and ARRAYSOFENUMS in arrays_java.i can be applied
-            to pointer types.
-
-03/03/2007: olly
-	    [PHP5] When we know the literal numeric value for a constant, use
-	    that to initialise the const member in the PHP wrapper class.
-
-03/02/2007: olly
-	    [PHP5] Fix PHP wrapper code generated for certain cases of
-	    overloaded forms with default arguments.
-
-02/26/2007: efuzzyone
-            [CFFI] Patch #1656395: fixed hex and octal values bug, thanks to Arthur Smyles.
-
-02/22/2007: mgossage
-            [Lua] Fixed bug in typemaps which caused derived_byvalue and rname test cases to fail.
-	    Updated derived_byvalue.i to explain how to find and fix the problem
-
-01/25/2007: wsfulton
-            Fix #1538522 and #1338527, forward templated class declarations without a
-            name for the templated class parameters, such as:
-
-              template <typename, class> class X;
-
-01/23/2007: mgossage
-            [Lua] Patch #1640862: <malloc.h> replaced by <stdlib.h>
-	    Patch #1598063 Typo in typemaps.i
-
-01/22/2007: mgossage
-            [Lua] Added a lua specific carrays.i which adds the operator[] support.
-	    modified the main code to make it not emit all the class member functions & accessors
-	    Note: C structs are created using new_XXX() while C++ classes use XXX() (should be standardised)
-	    Updated test case: li_carrays
-	    Updated the documentation.
-
-01/12/2007: wsfulton
-            [Php] Add support for newfree typemaps (sometimes used by %newobject)
-
-01/12/2007: beazley
-            New command line option -macroerrors.   When supplied, this will force
-            the C scanner/parser to report proper location information for code contained
-            inside SWIG macros (defined with %define).  By default, SWIG merely reports
-            errors on the line at which a macro is used.  With this option, you
-            can expand the error back to its source---something which may simplify
-            debugging.
-
-01/12/2007: beazley
-            [Internals] Major overhaul of C/C++ scanning implementation.  For quite
-            some time, SWIG contained two completely independent C/C++ tokenizers--
-            the legacy scanner in CParse/cscanner.c and a general purpose scanner
-            in Swig/scanner.c. SWIG still has two scanning modules, but the C parser
-            scanner (CParse/cscanner.c) now relies upon the general purpose
-            scanner found in Swig/scanner.c.  As a result, it is much smaller and
-            less complicated.  This change also makes it possible to maintain all
-            of the low-level C tokenizing in one central location instead of two
-            places as before.
-
-            ***POTENTIAL FLAKINESS***
-            This change may cause problems with accurate line number reporting
-            as well as error reporting more generally. I have tried to resolve this
-            as much as possible, but there might be some corner cases.
-
-01/12/2007: mgossage
-            [Lua] Added typemap throws for std::string*, typemap for SWIGTYPE DYNAMIC,
-	    changed the existing throws typemap to throw a string instead of making a copy of
-	    the object (updating a few test cases to deal with the change).
-	    fixed test case: dynamic_casts, exception_partial_info, li_std_string, size_t
-
-01/03/2007: beazley
-            [Internals].  Use of swigkeys.c/.h variables is revoked.  Please use
-            simple strings for attribute names.
-
-12/30/2006: beazley
-            Internal API functions HashGetAttr() and HashCheckAttr() have been revoked.
-            Please use Getattr() to retrieve attributes.  The function Checkattr() can
-            be used to check attributes.  Note:  These functions have been revoked
-            because they only added a marginal performance improvement at the expense
-            code clarity.
-
-12/26/2006: mgossage
-            [Lua] Added more STL (more exceptions, map, size_t),
-	    fixed test case: conversion_ns_template.
-
-12/21/2006: mgossage
-            [Lua] Update to throw errors when setting immutables,
-	    and allowing user addition of module variables.
-
-12/20/2006: wsfulton
-            Fix typedef'd variable wrappers that use %naturalvar, eg, std::string.
-
-12/14/2006: wsfulton
-            [C#] Add std::wstring and wchar_t typemaps
-
-12/14/2006: olly
-	    [php] Fix bug #1613673 (bad PHP5 code generated for getters and
-	    setters).
-
-12/02/2006: wsfulton, John Lenz, Dave Beazley
-            Move from cvs to Subversion for source control
-
-11/30/2006: beazley
-            Cleaned up swigwarnings.swg file not to use nested macro
-            definitions.
-
-11/12/2006: wsfulton
-            [Java, C#] Fix for %extend to work for static member variables.
-
-Version 1.3.31 (November 20, 2006)
-==================================
-
-11/12/2006: Luigi Ballabio
-            [Python] Alternate fix for Python exceptions bug #1578346 (the previous one broke Python
-            properties in modern classes)
-
-11/12/2006: wsfulton
-            -fakeversion commandline option now generates the fake version into the generated wrappers
-            as well as displaying it when the -version commandline option is used.
-
-14/11/2006: mgossage
-	    [lua] update to typemap for object by value, to make it c89 compliant
-
-Version 1.3.30 (November 13, 2006)
-==================================
-
-11/12/2006: wsfulton
-            [java] Remove DetachCurrentThread patch from  08/11/2006 - it causes segfaults
-            on some systems.
-
-11/12/2006: wsfulton
-            [python] Fix #1578346 - Python exceptions with -modern
-
-11/10/2006: wsfulton
-            Fix #1593291 - Smart pointers and inheriting from templates 
-
-11/09/2006: wsfulton
-            Fix director operator pointer/reference casts - #1592173.
-
-11/07/2006: wsfulton
-            Add $self special variable for %extend methods. Please use this instead of just 'self'
-            as the C++ 'this' pointer.
-
-11/07/2006: mutandiz
-	    [allegrocl] 
-	    allegrocl.swg: swig-defvar updated to allow specifying of
-	    		   non-default foreign type (via :ftype keyword arg).
-	    allegrocl.cxx: Specify proper access type for enum values.
-
-11/03/2006: wsfulton
-            [Java/C#] Fix const std::string& return types for directors as reported by
-            Mark Donselzmann
-
-10/29/2006: wsfulton
-            [Java] Remove DeleteLocalRef from end of director methods for now as it is causing a
-            seg fault when run on Solaris 8.
-
-10/29/2006: wuzzeb (John Lenz)
-	    [Guile] Patch from Chris Shoemaker to clean up some warnings in the generated code.
-
-10/29/2006: wsfulton
-            [Java] Important fix to prevent early garbage collection of the Java proxy class
-            while it is being used in a native method. The finalizer could destroy the underlying
-            C++ object while it was being used. The problem occurs when the proxy class is no
-            longer strongly reachable after a native call.  The problem seems to occur in
-            memory stress situations on some JVMs. It does not seem to occur on the
-            Sun client JVM up to jdk 1.5. However the 1.6 client jdk has a more aggressive garbage
-            collector and so the problem does occur. It does occur on the Sun server
-            JVMs (certainly 1.4 onwards). The fix entails passing the proxy class into the native
-            method in addition to the C++ pointer in the long parameter, as Java classes are not
-            collected when they are passed into JNI methods. The extra parameter can be suppressed
-            by setting the nopgcpp attribute in the jtype typemap to "1" or using the new -nopgcpp
-            commandline option.
-
-            See Java.html#java_pgcpp for further details on this topic.
-
-10/24/2006: wsfulton
-            [C#] Fix smart pointer wrappers. The virtual/override/new keyword is not generated
-            for each method as the smart pointer class does not mirror the underlying pointer
-            class inheritance hierarchy. SF #1496535
-
-10/24/2006: mgossage
-            [lua] added support for native methods & member function pointers.
-            fixed test cases arrays_dimensionless & cpp_basic. Added new example (functor).
-            tidied up a little of the code (around classHandler).
-
-10/17/2006: wsfulton
-            [C#, Java] directorout typemap changes to fall in line with the other director
-            languages. $result is now used where $1 used to be used. Please change your typemaps
-            if you have a custom directorout typemap.
-
-10/18/2006: wsfulton
-            Some fixes for applying the char array typemaps to unsigned char arrays.
-
-10/17/2006: wsfulton
-            [C#, Java] Add in const size_t& and const std::size_t& typemaps.
-
-10/15/2006: efuzzyone 
-            [CFFI] Suppress generating defctype for enums, thanks to Arthur Smyles. Patch 1560983. 
-
-10/14/2006: wuzzeb (John Lenz)
-            [Chicken] Minor fix to make SWIG work with the (as yet unreleased) chicken 2.5
-
-            [Guile,Chicken] Fix SF Bug 1573892.  Added an ext_test to the test suite to test
-            this bug, but this test can not really be made generic because the external code must
-            plug into the target language interpreter directly.
-            See Examples/test-suite/chicken/ext_test.i and ext_test_external.cxx
-
-            Added a %.externaltest to common.mk, and any interested language modules can
-            copy and slightly modify either the chicken or the guile ext_test.i
-
-10/14/2006: mgossage
-            [Lua] added OUTPUT& for all number types, added a long long type
-            fixed several test cases.
-            update: changed typemaps to use SWIG_ConvertPtr rather than SWIG_MustGetPointer
-            started spliting lua.swg into smaller parts to make it neater
-
-10/13/2006: wsfulton
-            [C#, Java] Marginally better support for multiple inheritance only in that you can
-            control what the base class is. This is done using the new 'replace' attribute in the 
-            javabase/csbase typemap, eg in the following, 'Me' will be the base class,
-            no matter what Foo is really derived from in the C++ layer.
-
-              %typemap(javabase, replace="1") Foo "Me";
-              %typemap(csbase, replace="1") Foo "Me";
-
-            Previously it was not possible for the javabase/csbase typemaps to override the C++ base.
-
-10/12/2006: wsfulton
-            [Java] Remove potential race condition on the proxy class' delete() method 
-            (it is now a synchronized method, but is now customisable by changing the 
-            methodmodifiers attribute in the javadestruct or javadestruct_derived typemap)
-
-            [C#] Remove potential race condition on the proxy class' Dispose() method, 
-            similar to Java's delete() above.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-10/12/2006: wsfulton
-            [Ruby, Python] Remove redundant director code in %extend methods (%extend
-            methods cannot be director methods)
-
-10/12/2006: wsfulton
-            [Ruby, Python] Fix #1505594 - director objects not returned as director objects
-            in %extend methods.
-
-10/11/2006: wsfulton
-            [Java] Fix #1238798 - Directors using unsigned long long or any other type
-            marshalled across the JNI boundary using a Java class (where the jni typemap 
-            contains jobject).
-
-10/06/2006: wsfulton
-            Fix #1162194 - #include/%include within a structure
-
-10/06/2006: wsfulton
-            Fix #1450661, string truncation in String_seek truncating Java/C# enums.
-
-10/06/2006: mgossage
-            [Lua] Fix #1569587. The name is now correct.
-
-10/04/2006: wsfulton
-            Director fixes for virtual conversion operators
-
-10/04/2006: olly
-	    [php] Fix #1569587 for PHP.  Don't use sizeof() except with string
-	    literals.  Change some "//" comments to "/* */" for portability.
-
-10/04/2006: mgossage
-            [Lua] Partial Fix #1569587. The type is now correct, but the name is still not correct.
-
-10/03/2006: wsfulton
-            [Ruby] Fix #1527885 - Overloaded director virtual methods sometimes produced
-            uncompilable code when used with the director:except feature.
-
-10/03/2006: wsfulton
-            Directors: Directors are output in the order in which they are declared in 
-            the C++ class rather than in some pseudo-random order.
-
-10/03/2006: mmatus
-            Fix #1486281 and #1471039.
-
-10/03/2006: olly
-	    [Perl] Fix for handling strings with zero bytes from Stephen Hutsal.
-
-09/30/2006: efuzzyone
-            [CFFI] Bitfield support and vararg support due to Arthur Smyles.
-            C expression to Lisp conversion, thanks to Arthur Smyles for the initial
-            idea, it now supports conversion for a whole range of C expressions. 
-
-09/28/2006: wsfulton
-            Fix #1508327 - Overloaded methods are hidden when using -fvirtual optimisation.
-            Overloaded methods are no longer candidates for elimination - this mimics
-            C++ behaviour where all overloaded methods must be defined and implemented
-            in a derived class in order for them to be available.
-
-09/25/2006: wsfulton
-            [Ruby, Python, Ocaml] Fix #1505591 Throwing exceptions in extended directors
-
-09/25/2006: wsfulton
-            Fix #1056100 - virtual operators. 
-
-09/24/2006: olly
-	    Don't accidentally create a "<:" token (which is the same as "[" in C++).
-	    Fixes bug # 1521788.
-
-09/23/2006: olly
-	    [Ruby] Support building with recent versions of the Ruby 1.9
-	    development branch.  Fixes bug #1560092.
-
-09/23/2006: olly
-	    Templates can now be instantiated using negative numbers and
-	    constant expressions, e.g.:
-
-	    template<int q> class x {};
-	    %template(x_minus1) x<-1>;
-	    %template(x_1plus2) x<1+2>;
-
-	    Also, constant expressions can now include comparisons (>, <, >=,
-	    <=, !=, ==), modulus (%), and ternary conditionals (a ? b : c).
-
-	    Fixes bugs #646275, #925555, #956282, #994301.
-
-09/22/2006: wsfulton
-            Fix %ignore on director methods - Bugs #1546254, #1543533
-
-09/20/2006: wsfulton
-            Fix %ignore on director constructors
-
-09/20/2006: wsfulton
-            Fix seg faults and asserts when director methods are ignored (#1543533)
-
-09/20/2006: wsfulton
-            Fix out of source builds - bug #1544718
-
-09/20/2006: olly
-	    Treat a nested class definition as a forward declaration rather
-	    than ignoring it completely, so that we generate correct code for
-	    passing opaque pointers to the nested class (fixes SF bug #909387).
-
-09/20/2006: olly
-            *** POTENTIAL INCOMPATIBILITY ***
-	    [php] Overload resolution now works.  However to allow this, SWIG
-	    generated wrappers no longer coerce PHP types (which reverts a change
-	    made in 1.3.26).  So for example, if a method takes a string, you
-	    can no longer pass a number without explicitly converting it to a
-	    string in PHP using: (string)x
-
-09/18/2006: mgossage
-            [ALL] fix on swiginit.swg, has been reported to crash on several test cases
-	    found and fixed problem in imports under python (mingw)
-
-09/16/2006: wsfulton
-            [Python] Patch from Michal Marek for Python 2.5 to fix 64 bit array indexes on
-            64 bit machines.
-
-09/13/2006: wsfulton
-            The explicitcall feature has been scrapped. This feature was introduced primarily
-            to solve recursive director method calls. Director upcall improvements made instead:
-
-            [Python, Ruby, Ocaml] The swig_up flag is no longer used. The required mutexes
-            wrapping this flag are also no longer needed. The recursive calls going from C++
-            to the target language and back again etc are now avoided by a subtlely different
-            approach. Instead of using the swig_up flag in each director method to indicate
-            whether the explicit C++ call to the appropriate base class method or a normal
-            polymorphic C++ call should be made, the new approach makes one of these calls
-            directly from the wrapper method.
-
-            [Java, C#] The recursive call problem when calling a C++ base class method from
-            Java/C# is now fixed. The implementation is slightly different to the other languages
-            as the detection as to whether the explicit call or a normal polymorphic call is made
-            in the Java/C# layer rather than in the C++ layer.
-
-09/11/2006: mgossage
-            [ALL] updated swiginit.swg to allow multiple interpreters to use multiple
-	    swig modules at once. This has been tested in Lua (mingw & linux),
-	    perl5 & python (linux) only.
-
-09/11/2006: mgossage
-            [lua] added support for passing function pointers as well as native lua object
-            into wrappered function.
-            Added example funcptr3 to demonstrate this feature
-
-09/05/2006: olly
-	    [php] Rename ErrorCode and ErrorMsg #define-s to SWIG_ErrorCode
-	    and SWIG_ErrorMsg to avoid clashes with code the user might be
-	    wrapping (patch from Darren Warner in SF bug #1466086).  Any
-	    user typemaps which use ErrorCode and/or ErrorMsg directly will
-	    need adjusting - you can easily fix them to work with both old
-	    and new SWIG by changing to use SWIG_ErrorMsg and adding:
-
-		#ifndef SWIG_ErrorMsg
-		#define SWIG_ErrorMsg() ErrorMsg()
-		#endif
-
-08/29/2006: olly
-	    [php] Move constant initialisation from RINIT to MINIT to fix a
-	    warning when using Apache and mod_php.  We only need to create
-	    PHP constants once when we're first initialised, not for every HTTP
-	    request.
-
-08/21/2006: mgossage
-            [Lua]
-	    Bugfix #1542466 added code to allow mapping Lua nil's <-> C/C++ NULL's
-	    updated various typemaps to work correctly with the changes
-	    added voidtest_runme.lua to show the features working
-
-08/19/2006: wuzzeb (John Lenz)
-	    [Guile] Add feature:constasvar to export constants as variables instead of functions
-            that return the constant value.
-
-08/11/2006: wsfulton
-            [Java] DetachCurrentThread calls have been added so that natively created threads
-            no longer prevent the JVM from exiting. Bug reported by Thomas Dudziak and
-            Paul Noll.
-
-08/10/2006: wsfulton
-            [C#] Fix director protected methods so they work
-
-07/25/2006: mutandiz
-	    [allegrocl]
-	    more additions to std::string, some tweaks and small bug fixes
-	    -nocwrap mode.
-
-07/21/2006: mgossage
-            [Lua]
-	    Bugfix #1526022 pdated std::string to support strings with '\0' inside them
-	    updated typemaps.i to add support for pointer to pointers
-
-07/19/2006: mutandiz
-	    [allegrocl]
-	    - Add std_string.i support.
-	    - Add newobject patch submitted by mkoeppe (thanks!)
-	    - Fix type name mismatch issue for nested type definitions.
-	      specifically typedefs in templated class defns.
-
-07/18/2006: mgossage
-	    Bugfix #1522858
-	    updated lua.cxx to support -external-runtime command
-
-07/14/2006: wuzzeb (John Lenz)
-	    Increment the SWIG_RUNTIME_VERSION to 3, because of the
-	    addition of the owndata member in swig_type_info.
-	    Reported by: Prabhu Ramachandran
-
-07/05/2006: wsfulton
-            Search path fixes:
-            - Fix search path for library files to behave as documented in Library.html.
-            - Fix mingw/msys builds which did not find the SWIG library when installed.
-            - Windows builds also output the mingw/msys install location when running
-              swig -swiglib.
-            - The non-existent and undocumented config directory in the search path has
-              been removed.
-
-07/05/2006: wsfulton
-            Fix $symname special variable expansion.
-
-07/04/2006: wuzzeb (John Lenz)
-	    [Chicken]
-	    Add %feature("constasvar"), which instead of exporting a constant as a
-	    scheme function, exports the constant as a scheme variable.  Update the
-	    documentation as well.
-
-07/04/2006: wsfulton
-            [See entry of 09/13/2006 - explicitcall feature and documentation to it removed]
-            New explicitcall feature which generates additional wrappers for virtual methods
-            that call the method explicitly, not relying on polymorphism to make the method
-            call. The feature is a feature flag and is enabled like any other feature flag.
-            It also recognises an attribute, "suffix" for mangling the feature name, see
-            SWIGPlus.html#SWIGPlus_explicitcall documentation for more details.
-
-            [Java, C#]
-            The explicitcall feature is also a workaround for solving the recursive calls
-            problem when a director method makes a call to a base class method. See
-            Java.html#java_directors_explicitcall for updated documentation.
-
-06/28/2006: joe (Joseph Wang)
-	    [r] Initial support for R
-
-06/20/2006: wuzzeb (John Lenz)
-	    [Chicken]
-            Minor fixes to get apply_strings.i testsuite to pass
-	    Remove integers_runme.scm from the testsuite, because SWIG and Chicken does
-            handle overflows.
-
-06/19/2005: olly
-	    [php] Add support for generating PHP5 class wrappers for C++
-	    classes (use "swig -php5").
-
-06/17/2006: olly
-	    [php] Added some missing keywords to the PHP4 keyword list, and
-	    fixed __LINE__ and __FILE__ which were in the wrong category.
-	    Also added all the keywords new in PHP5, and added comments
-	    noting the PHP4 keywords which aren't keywords in PHP5.
-
-06/17/2006: olly
-	    [php] Don't segfault if PHP Null is passed as this pointer (e.g.
-	    Class_method(Null)) - give a PHP Error instead.
-
-06/15/2006: mutandiz
-	    [allegrocl]
-	    Add initial support for std::list container class.
-	    Fix a few bugs in helper functions.
-
-05/13/2006: wsfulton
-            [Java] Replace JNIEXPORT with SWIGEXPORT, thereby enabling the possibility
-            of using gcc -fvisibility=hidden for potentially smaller faster loading wrappers.
-
-05/13/2006: wsfulton
-            Fix for Makefiles for autoconf-2.60 beta
-
-05/13/2006: wsfulton
-            Vladimir Menshakov patch for compiling wrappers with python-2.5 alpha.
-
-05/12/2006: wsfulton
-            Fix buffer overflow error when using large %feature(docstring) reported
-            by Joseph Winston.
-
-05/12/2006: wsfulton
-            [Perl] Operator overload fix from Daniel Moore.
-
-05/25/2006: mutandiz
-	    [allegrocl]
-	    Fix bug in generation of CLOS type declarations for unions
-	    and equivalent types.
-
-05/24/2006: mutandiz
-	    [allegrocl]
-	    Don't require a full class definition to generate a CLOS wrapper.
-
-05/20/2006: olly
-	    [php] GCC Visibility support now works with PHP.
-
-05/19/2006: olly
-	    [php] Removed support for -dlname (use -module instead).  Fixed
-	    naming of PHP extension module to be consistent with PHP
-	    conventions (no "php_" prefix on Unix; on PHP >= 4.3.0, handle Unix
-	    platforms which use something other than ".so" as the extension.)
-
-05/13/2006: wsfulton
-            [C#] Director support added
-
-05/07/2006: olly
-	    [php] Don't segfault if PHP Null is passed where a C++ reference
-	    is wanted.
-
-05/05/2006: olly
-	    [php] Fix wrappers generated for global 'char' variables to not
-	    include a terminating zero byte in the PHP string.
-
-05/03/2006: wsfulton
-            Modify typemaps so that char * can be applied to unsigned char * or signed char *
-            types and visa versa.
-
-05/03/2006: efuzzyone
-	    [cffi]Thanks to Luke J Crook for this idea.
-             - a struct/enum/union is replaced with :pointer only if
-               that slot is actually a pointer to that type. So,: 
-                    struct a_struct { int x; } and
-                    struct b_struct { a_struct struct_1; }; 
-               will be converted as:
-                   (cffi:defcstruct b_struct
-                           (struct_1 a_struct))
-             - Other minor fixes in lispifying names.
-
-05/02/2006: wsfulton
-            Fix possible redefinition of _CRT_SECURE_NO_DEPRECATE for VC++.
-
-04/14/2006: efuzzyone
-	    [cffi]
-            Thanks to Thomas Weidner for the patch.
-            - when feature export is set (export 'foo) is 
-              generated for every symbol
-            - when feature inline is set (declaim (inline foo)) is 
-              generated before every function definition
-            - when feature intern_function is set 
-              #.(value-of-intern-function "name" "nodeType" package)
-              is emitted instead of the plain symbol. A sample swig-lispify 
-              is provided.
-            - every symbol is prefixed by it's package.
-
-04/13/2006: efuzzyone
-	    [cffi]
-	    Fixed the generation of wrappers for global variables. 
-            Added the option [no]swig-lisp which turns on/off generation 
-            of code for swig helper lisp macro, functions, etc.
-
-Version 1.3.29 (March 21, 2006)
-===============================
-
-04/05/2006: mutandiz
-	    [allegrocl]
-	    Fix output typemap of char so it produces a character instead
-	    of an integer. Also adds input/output typemaps for 'char *'.
-
-	    add command-line argument -isolate to generate an interface
-	    file that won't interfere with other SWIG generated files that
-	    may be used in the same application.
-
-03/20/2005: mutandiz
-	    [allegrocl]
-	    More tweaks to INPUT/OUTPUT typemaps for bool.
-
-	    Fix constantWrapper for char and string literals.
-
-	    find-definition keybindings should work in ELI/SLIME.
-	    Output (in-package <module-name>) to lisp wrapper
-	    instead of (in-package #.*swig-module-name*).
-
-	    slight rework of multiple return values.
-
-	    doc updates.
-
-03/17/2005: mutandiz
-	    [allegrocl]
-	    mangle names of constants generated via constantWrapper.
-	    
-	    When using OUTPUT typemaps and the function has a non-void
-	    return value, it should be first in the values-list, followed
-	    by the OUTPUT mapped values.
-
-	    Fix bug with boolean parameters, which needed to be
-	    passed in as int values, rather than T or NIL.
-
-03/15/2006: mutandiz
-	    [allegrocl]
-	    Generate wrappers for constants when in C++ or -cwrap mode.
-	    Make -cwrap the default, since it is most correct. Users
-	    can use the -nocwrap option to avoid the creation of a .cxx
-	    file when interfacing to C code.
-
-	    When in -nocwrap mode, improve the handling of converting
- 	    infix literals to prefix notation for lisp. This is very
-	    basic and not likely to be improved upon since this only
-	    applies to the -nocwrap case. Literals we can't figure out
-	    will result in a warning and be included in the generated
-	    code.
-
-	    validIdentifier now more closely approximates what may be
-	    a legal common lisp symbol.
-
-	    Fix typemap error in allegrocl.swg
-	    
-03/12/2006: mutandiz
-	    [allegrocl]
-	    fix up INPUT/OUTPUT typemaps for bool.
-	    Generate c++ style wrapper functions for struct/union members
-	    when -cwrap option specified.
-
-03/10/2006: mutandiz
-	    [allegrocl]
-	    Fix bug in C wrapper generation introduced by last allegrocl
-	    commit.
-
-03/10/2006: wsfulton
-            [Java]
-            Commit #1447337 - Delete LocalRefs at the end of director methods to fix potential leak
-
-03/10/2006: wsfulton
-            Fix #1444949 - configure does not honor --program-prefix.
-            Removed non-standard configure option --with-release-suffix. Fix the autoconf standard
-            options --program-prefix and --program-suffix which were being shown in the help,
-            but were being ignored. Use --program-suffix instead of --with-release-suffix now.
-
-03/10/2006: wsfulton
-            [Java]
-            Fix #1446319 with patch from andreasth - more than one wstring parameter in director methods
-
-03/07/2006: mkoeppe
-	    [Guile] 
-	    Fix for module names containing a "-" in non-"shadow" mode.
-	    Patch from Aaron VanDevender (#1441474).
-
-03/04/2006: mmatus
-	    - Add -O to the main program, which now enables -fastdispatch
-	    
-	    [Python]
-
-	    - Add the -fastinit option to enable faster __init__
-              methods. Setting 'this' as 'self.this.append(this)' in the python
-	      code confuses PyLucene. Now the initialization is done in the
-	      the C++ side, as reported by Andi and Robin.
-
-	    - Add the -fastquery option to enable faster SWIG_TypeQuery via a
-              python dict cache, as proposed by Andi Vajda
-
-	    - Avoid to call PyObject_GetAttr inside SWIG_Python_GetSwigThis,
-	      since this confuses PyLucene, as reported by Andi Vajda.
-	    
-03/02/2006: wsfulton
-            [Java]
-            Removed extra (void *) cast when casting pointers to and from jlong as this
-            was suppressing gcc's "dereferencing type-punned pointer will break strict-aliasing rules"
-            warning. This warning could be ignored in versions of gcc prior to 4.0, but now the
-            warning is useful as gcc -O2 and higher optimisation levels includes -fstrict-aliasing which
-            generates code that doesn't work with these casts. The assignment is simply never made.
-            Please use -fno-strict-aliasing to both suppress the warning and fix the bad assembly
-            code generated. Note that the warning is only generated by the C compiler, but not
-            the C++ compiler, yet the C++ compiler will also generate broken code. Alternatively use 
-            -Wno-strict-aliasing to suppress the warning for gcc-3.x. The typemaps affected
-            are the "in" and "out" typemaps in java.swg and arrays_java.swg. Users ought to fix
-            their own typemaps to do the same. Note that removal of the void * cast simply prevents
-            suppression of the warning for the C compiler and nothing else. Typical change:
-
-            From:
-              %typemap(in) SWIGTYPE * %{ $1 = *($&1_ltype)(void *)&$input; %}
-            To:
-              %typemap(in) SWIGTYPE * %{ $1 = *($&1_ltype)&$input; %}
-
-            From:
-              %typemap(out) SWIGTYPE * %{ *($&1_ltype)(void *)&$result = $1; %} 
-            To:
-              %typemap(out) SWIGTYPE * %{ *($&1_ltype)&$result = $1; %} 
-
-03/02/2006: mkoeppe
-	    [Guile -scm]
-	    Add typemaps for "long long"; whether the generated code compiles, however, depends
-	    on the version and configuration of Guile.
-
-03/02/2006: wsfulton
-            [C#]
-            Add support for inner exceptions. If any of the delegates are called which construct
-            a pending exception and there is already a pending exception, it will create the new
-            exception with the pending exception as an inner exception.
-
-03/02/2006: wsfulton
-            [Php]
-            Added support for Php5 exceptions if compiling against Php5 (patch from Olly Betts).
-
-03/01/2006: mmatus
-	    Use the GCC visibility attribute in SWIGEXPORT.
-
-	    Now you can compile (with gcc 3.4 or later) using
-	    CFLAGS="-fvisibility=hidden".
-	    
-	    Check the difference for the 'std_containers.i' python 
-	    test case:
- 
-            Sizes:
-
-	      3305432 _std_containers.so
-	      2383992 _std_containers.so.hidden
-
-	    Exported symbols (nm -D <file>.so | wc -l):
-
-              6146 _std_containers.so 
-              174  _std_containers.so.hidden 
-
-	    Execution times:
-
-	      real 0m0.050s user 0m0.039s sys 0m0.005s   _std_containers.so
-              real 0m0.039s user 0m0.026s sys 0m0.007s   _std_containers.so.hidden
-
-	    Read http://gcc.gnu.org/wiki/Visibility for more details.
-
-
-02/27/2006: mutandiz
-	    [allegrocl]
-	    Add support for INPUT, OUTPUT, and INOUT typemaps.
-	    For OUTPUT variables, the lisp wrapper returns multiple
-	    values.
-
-02/26/2006: mmatus
-
-	    [Ruby] add argcargv.i library file.
-	    
-	    Use it as follow:
-
-		%include argcargv.i
-	      									 
-   	        %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) } 
-	      									 
-   	        %inline {				
-   	          int mainApp(size_t argc, const char **argv) 	
-   	          {						
-   	            return argc;					
-   	          }
-                }							
-	      							
-   	    then in the ruby side:					
-	      								
-   	        args = ["asdf", "asdf2"]				
-   	        n = mainApp(args);
-	
-
-	    This is the similar to the python version Lib/python/argcargv.i
-
-02/24/2006: mgossage
-
-	    Small update Lua documents on troubleshooting problems
-	    
-02/22/2006: mmatus 
-
-	    Fix all the errors reported for 1.3.28.
-	    - fix bug #1158178
-	    - fix bug #1060789
-	    - fix bug #1263457
-	    - fix 'const  char*&' typemap in the UTL, reported by Geoff Hutchison
-	    - fixes for python 2.1 and the runtime library
-	    - fix copyctor + template bug #1432125
-	    - fix [ 1432152 ] %rename friend operators in namespace
-	    - fix gcc warning reported by R. Bernstein
-	    - avoid assert when finding a recursive scope inheritance,
-	      emit a warning in the worst case, reported by Nitro 
-	    - fix premature object deletion reported by Paul in tcl3d
-	    - fix warning reported by Nitro in VC7
-	    - more fixes for old Solaris compiler
-	    - fix for python 2.3 and gc_refs issue reported by Luigi
-	    - fix fastproxy for methods using kwargs
-	    - fix overload + protected member issue reported by Colin McDonald
-	    - fix seterrormsg as reported by Colin McDonald
-	    - fix directors, now the test-suite runs again using -directors
-	    - fix for friend operator and Visual studio and bug 1432152
-	    - fix bug #1435090
-	    - fix using + %extend as reported by William
-	    - fix bug #1094964
-	    - fix for Py_NotImplemented as reported by Olly and Amaury
-	    - fix nested namespace issue reported by Charlie
-
-	    and also:
-	    
-	    - allow director protected members by default
-	    - delete extra new lines in swigmacros[UTL]
-	    - cosmetic for generated python code
-	    - add the factory.i library for UTL
-	    - add swigregister proxy method and move __repr__ to a
-	      single global module  [python]
-
-02/22/2006: mmatus 
-
-	    When using directors, now swig will emit all the virtual
-	    protected methods by default. 
-
-	    In previous releases, you needed to use the 'dirprot'
-	    option to achieve the same.
-
-	    If you want, you can disable the new default behaviour,
-	    use the 'nodirprot' option: 
-
-	       swig -nodirprot ...
-
-	    and/or the %nodirector feature for specific methods, i.e.:
-
-	       %nodirector Foo::bar;
-
-	       struct Foo {
-	         virtual ~Foo();
-
-	       protected:
-	         virtual void bar();
-	       };
-	    
-
-	    As before, pure abstract protected members are allways
-	    emitted, independent of the 'dirprot/nodirprot' options.
-
-
-02/22/2006: mmatus
-	    Add the factory.i library for languages using the UTL (python,tcl,ruby,perl).
-	    
-            factory.i implements a more natural wrap for factory methods. 
-
-	    For example, if you have:							    
-	    								    
-  	    ----  geometry.h --------					    
-  	         struct Geometry {                          		    
-  	           enum GeomType{			     			    
-  	             POINT,				     		    
-  	             CIRCLE				     		    
-  	           };					     		    
-  	           					     		    
-  	           virtual ~Geometry() {}    		     		    
-  	           virtual int draw() = 0;				    
-  	    	 							    
-  	    	 //							    
-  	    	 // Factory method for all the Geometry objects		    
-  	    	 //							    
-  	           static Geometry *create(GeomType i);     		    
-  	         };					     		    
-  	         					     			    
-  	         struct Point : Geometry  {		     		    
-  	           int draw() { return 1; }		     		    
-  	           double width() { return 1.0; }    	     		    
-  	         };					     		    
-  	         					     			    
-  	         struct Circle : Geometry  {		     		    
-  	           int draw() { return 2; }		     		    
-  	           double radius() { return 1.5; }          		    
-  	         }; 					     		    
-  	         								    
-  	         //							    
-  	         // Factory method for all the Geometry objects		    
-  	         //							    
-  	         Geometry *Geometry::create(GeomType type) {		    
-  	           switch (type) {			     		    
-  	           case POINT: return new Point();	     		    
-  	           case CIRCLE: return new Circle(); 	     		    
-  	           default: return 0;			     		    
-  	           }					     		    
-  	         }					    		    
-  	    ----  geometry.h --------					    
-	    								    
-	    								    
-	    You can use the %factory with the Geometry::create method as follows:
-	    								    
-  	      %newobject Geometry::create;				    
-  	      %factory(Geometry *Geometry::create, Point, Circle);	    
-  	      %include "geometry.h"					    
-	    								    
-  	    and Geometry::create will return a 'Point' or 'Circle' instance   
-  	    instead of the plain 'Geometry' type. For example, in python:	    
-	    								    
-  	      circle = Geometry.create(Geometry.CIRCLE)			    
-  	      r = circle.radius()						    
-	    								    
-  	    where 'circle' now is a Circle proxy instance.	    		    
-
-
-02/17/2006: mkoeppe
-	    [MzScheme] Typemaps for all integral types now accept the full range of integral
-	    values, and they signal an error when a value outside the valid range is passed.
-	    [Guile] Typemaps for all integral types now signal an error when a value outside
-	    the valid range is passed.
-
-02/13/2006: mgossage
-            [Documents] updated the extending documents to give a skeleton swigging code
-            with a few typemaps.
-            [Lua] added an extra typemap for void* [in], so a function which requires a void*
-            can take any kind of pointer
-
-Version 1.3.28 (February 12, 2006)
-==================================
-
-02/11/2006: mmatus
-	    Fix many issues with line counting and error reports.
-
-02/11/2006: mmatus
-	    [Python] Better static data member support, if you have
-	    
-                struct Foo {
-                  static int bar;
-                };
-
-            then now is valid to access the static data member, ie:
-
-                f = Foo()
-                f.bar = 3
-
-	    just as in C++.
-
-
-02/11/2006: wsfulton
-            [Perl]
-            Fixed code generation to work again with old versions of Perl
-            (5.004 and later tested)
-
-02/04/2006: mmatus
-	    [Python] Add the %extend_smart_pointer() directive to extend
-	    SWIG smart pointer support in python. 
-
-	    For example, if you have a smart pointer as:
-	    
-	      template <class Type> class RCPtr {
-	      public:
-	        ...
-	        RCPtr(Type *p);
-		Type * operator->() const;
-		...
-	      };
-	      
-	    you use the %extend_smart_pointer directive as:
-	    
-	      %extend_smart_pointer(RCPtr<A>);
-	      %template(RCPtr_A)  RCPtr<A>;
-	    
-	    then, if you have something like:
-
-	      RCPtr<A> make_ptr();
-	      int foo(A *);
-
-	    you can do the following:
-
-	      a = make_ptr();
-	      b = foo(a);
-
-            ie, swig will accept a RCPtr<A> object where a 'A *' is
-            expected.
-
-	    Also, when using vectors
-	    
-	      %extend_smart_pointer(RCPtr<A>);
-	      %template(RCPtr_A) RCPtr<A>;
-	      %template(vector_A) std::vector<RCPtr<A> >;
-		
-	    you can type
-
-	      a = A();
-	      v = vector_A(2)
-	      v[0] = a
-
-            ie, an 'A *' object is accepted, via implicit conversion, 
-	    where a RCPtr<A> object is expected. Additionally
-
-	      x = v[0]
-
-	    returns (and sets 'x' as) a copy of v[0], making reference
-	    counting possible and consistent.
-
-	    %extend_smart_pointer is just a collections of new/old
-	    tricks, including %typemaps and the new %implicitconv
-	    directive.
-
-02/02/2006: mgossage
-            bugfix #1356577, changed double=>lua_number in a few places.
-            added the std::pair wrapping
-
-01/30/2006: wsfulton
-            std::string and std::wstring member variables and global variables now use
-            %naturalvar by default, meaning they will now be wrapped as expected in all languages.
-            Previously these were wrapped as a pointer rather than a target language string.
-            It is no longer necessary to add the following workaround to wrap these as strings:
-
-		%apply const std::string & { std::string *}
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-01/28/2006: mkoeppe
-	    [Guile -scm] 
-	    Add typemaps for handling of member function pointers.
-
-01/24/2006: mmatus
-	    - Better support for the %naturalvar directive, now it
-	      works with the scripting languages as well as
-	      Java/C#.
-	      
-	      Now, it can also be applied to class types:
-
-	        %naturalvar std::string;
-	        %include <std_string.i>
-	      
-              that will tell swig to use the 'natural' wrapping
-              mechanism to all std::string global and member
-              variables.
-
-	    - Add support for the %allowexcept feature along the
-              scripting languages, which allows the %exception feature
-              to be applied to the variable access methods. Also, add
-              the %exceptionvar directive to specify a distintic
-              exception mechanism only for variables.
-	      
-	    
-	    - Add more docs for the %delobject directive to mark a method as a
-	      destructor, 'disowning' the first argument. For example:
-
-	        %newobject create_foo;
-	        %delobject destroy_foo;
-
-	        Foo *create_foo() { return new Foo(); }
-	        void destroy_foo(Foo *foo) { delete foo; }
-
-	      or in a member method as:
-
-	        %delobject Foo::destroy;
-
-	        class Foo {
-	        public:
-	          void destroy() { delete this;}
-
-	        private:
-	          ~Foo();
-               };
-
-
-01/24/2006: mgossage
-            [Lua]
-	    - Removed the type swig_lua_command_info & replace with luaL_reg
-	      (which then broke the code), fixed this
-	    - added an additional cast in the typemaps for enum's
-	      due to the issue that VC.Net will not allow casting of
-	      a double to an enum directly. Therefore cast to int then to enum
-	      (thanks to Jason Rego for this observation)
-
-01/16/2006: mmatus (Change disabled... will be back in CVS soon)
-	    Add initial support for regexp via the external library
-	    RxSpencer. SWIG doesn't require this library to compile
-	    and/or run. But if you specify --with-rxspencer, and the
-	    library is found during installation, then swig will use
-	    it in three places:
-
-	    - In %renames rules, via the new rxsmatch rules, for example:
-	    	  
-	    	  %rename("%(lowercase)",rxsmatch$name="GSL_.*") "";
-	    	  %rename("%(lowercase)",rxsmatch$nodeType="enum GSL_.*") "";
-	    	 
-              rxsmatch is similar to the match rule, it just uses
-              the RxSpencer regexp library to decide if there is a
-              match with the provided regexp. As with the match
-              rule, you can also use the negate rule notrxsmatch.
-
-	    - In the %rename target name via the rxstarget option, for example:
-	    		 
-	    	  %rename("%(lowercase)",rxstarget=1) "GSL_.*";
-
-	    	where the target name "GSL.*" is now understood as a
-	    	regexp to be matched.  
-	    	 
-            - In the new encoder "rxspencer", which looks like:
-
-	    	  %(rxspencer:[regexp][replace])s
-
-	    	where "regexp" is the regular expression and "replace"
-	    	is a string used as a replacement, where the @0,@1,...,@9
-	    	pseudo arguments are used to represent the
-	    	corresponding matching items in the reg expression.
-
-	    	For example:
-	    		      
-	        %(rxspencer:[GSL.*][@0])s       <- Hello    -> 
-	        %(rxspencer:[GSL.*][@0])s       <- GSLHello -> GSLHello
-	        %(rxspencer:[GSL(.*)][@1])s     <- GSLHello -> Hello
-	        %(rxspencer:[GSL(.*)][gsl@1])s  <- GSLHello -> gslHello
-
-	    	Another example could be:
-
-                %rename("%(lowercase)s",sourcefmt="%(rxspencer:[GSL_(.*)][@1])s",%$isfunction) "";
-
-	    	which take out the prefix "GSL_" and returns all the
-	    	function names in lower cases, as following:
-
-	    	    void GSL_Hello();   ->   hello();
-	    	    void GSL_Hi();      ->   hi();
-	    	    const int GSL_MAX;  ->   GSL_MAX;  // no change, is not a function
-	
-	    We use the RxSpencer as an initial test bed to
-            implemention while we decide which library will be
-            finally added to swig.
-
-            You can obtain the RxSpencer library from 
-	    
-	      http://arglist.com/regex (Unix)
-
-	    or
-	     
-	      http://gnuwin32.sourceforge.net/packages.html (Windows)
-
-	    Once installed, use "man rxspencer" to get more info
-	    about the regexp format, or just google rxspencer.
-
-	    Since now you can enable the rxsmatch rules (see above),
-            the simple or '|' support for the match rules
-            (01/12/2006: mmatus) is disabled. Still, if you have
-            problems with the rxspencer library, you can re-enable
-            the simple 'match or' support using
-            -DSWIG_USE_SIMPLE_MATCHOR.
-	  
-
-01/16/2006: mmatus
-	    Change the %rename predicates to use the prefix '%$', as in:
-	    
-	      %rename("%(utitle)s",%$isfunction,%$ismember) ""; 
-	   	
-            to avoid clashes with other swig macros/directives.
-
-01/14/2006: cfisavage
-            [Ruby]
-	    Added support for Ruby bang! methods via a new %bang feature.
-	    Bang methods end in exclamation points and indicate that the
-	    object being processed will be modified in-place as 
-	    opposed to being copied.
-
-01/12/2006: cfisavage
-            [Ruby]
-	    Updated the Ruby module to automatically convert
-	    method names to lower_case_with_underscores using the
-	    new %rename functionality.
-
-01/12/2006: mmatus
-	    - Add aliases for 'case' encoders used with %rename/%namewarn
-
-	      %(uppercase)s   hello_world -> HELLO_WORLD
-	      %(lowercase)s   HelloWorld  -> helloworld
-	      %(camelcase)s   hello_world -> HelloWorld
-	      %(undercase)s   HelloWorld  -> hello_world
-
-
-01/12/2006: mmatus
-	    - Add the -dump_parse_module and -dump_parse_top options,
-	    which are similar to -dump_module and -dump_top, but they
-	    dump the node trees just after parsing, showing only the 
-	    attributes visible at the parsing stage, and not the added
-	    later in typemap.cxx, allocate.cxx, lang.cxx or elsewhere.
-	    
-	    Besides debugging porpuses, these options are very useful
-	    if you plan to use %rename in an "advance way", since it
-	    shows only and all the node's attributes you can use
-	    inside the match rules.
-
-
-01/12/2006: mmatus
-	    - Add predicates to %rename, so, you don't need to
-	      remember, for example, how to match a member function.
-
-	      Now it is easy, for example to use the 'utitle' encoder 
-	      in all the member methods, you type:
-
-	        %rename("%(utitle)s",%isfunction,%ismember) "";
-
-	      or to ignore all the enumitems in a given class:
-
-	        %rename("$ignore", %isenumitem, %classname="MyClass") "";  
-
-	      Available predicates are (see swig.swg):
-
-                %isenum         
-		%isenumitem     
-		%isaccess       
-		%isclass        
-		%isextend       
-		%isextend       
-		%isconstructor  
-		%isdestructor   
-		%isnamespace    
-		%istemplate     
-		%isconstant     
-					
-		%isunion        
-		%isfunction     
-		%isvariable     
-		%isimmutable    
-					
-		%isstatic       
-		%isfriend       
-		%istypedef      
-		%isvirtual      
-		%isexplicit     
-		%isextern       
-					
-		%ismember       
-		%isglobal 
-		%innamespace
-
-		%ispublic    
-		%isprotected 
-		%isprivate   
-				     
-		%classname   
-
-              These predicates correspond to specific 'match'
-              declarations, which sometimes are not as evident as the
-              predicates names.
-
-
-            - Add the or '|' operation in %rename match, for
-              example to capitalize all the constants (%constant or
-              const cdecl):
-
-                 %rename("%(upper)s",match="cdecl|constant",%isimmutable) "";
-                
-
-
-01/12/2006: mgossage
-	    -	Partial fixed of errors under C89, bug #1356574
-	    	(converted C++ style comments to C style)
-	    -	Added patches from neomantra@users.sf.net #1379988 and #1388343
-	    	missing a 'return' statement for error conditions
-	    	also updated the %init block bug #1356586
-		 
-01/10/2006: mmatus
-	    - Add the 'utitle' encoder, as an example of how to add
-	      your own encoder. I added the encoder method in misc.c 
-	      but developers can add others, the same way, inside any
-	      target language.
-	      
-	      Well, 'utitle' is the reverse of 'ctitle', ie:
-
-	         %rename("%(ctitle)s") camel_case;  -> CamelCase;
-	         %rename("%(utitle)s") CamelCase;   -> camel_case;
-		 
-
-01/10/2006: cfisavage
-            [Ruby]
-            Updated Ruby Exception handling.  Classes that are specified in throws clauses, 
-            or are marked as %exceptionclass, are now inherited from rb_eRuntimeError. 
-            This allows instances of these classes to be returned to Ruby as exceptions. 
-            Thus if a C++ method throws an instance of MyException, the calling Ruby 
-            method will get back a MyException object.  To see an example, 
-            look at ruby/examples/exception_class.
-
-01/10/2006: mmatus
-	    
-            - Add the %catches directive, which complements the %exception
-	    directive in a more automatic way. For example, if you have
-
-                int foo() throw(E1);
-
-            swig generates the proper try/catch code to dispatch E1.
-	    
-	    But if you have:
-
-
-	          int barfoo(int i) {
-                    if (i == 1) {
-	               throw E1();
-                    } else {
-	              throw E2();
-                    }
-                    return 0;
-                  }
-
-            ie, where there is no explicit exception specification in the decl, you 
-	    end up doing:
-		  
-               %exception barfoo {			
-	         try {				
-	           $action			
-	         } catch(E1) {	... }				  
-	         } catch(E2) {	... }				  
-	       }				
-	    
-	    which is very tedious. Well, the %catches directive defines
-	    the list of exceptions to catch, and from swig:
- 	
-	       %catches(E1,E2) barfoo(int i);
-	       int barfoo(int i);
-
-            is equivalent to 
-
-	       int barfoo(int i) throw(E1,E2);
-
-	    Note, however, that the %catches list doesn't have to
-	    correspond to the C++ exception specification. For example, if you
-	    have:
-
-		struct E {};
-		struct E1 : E {};
-		struct E2 : E {};
-
-  	        int barfoo(int i) throw(E1,E2);
-
-            you can define
-	        
-		%catches(E) barfoo(int i);
-	
-	    and swig will generate an action code equivalent to
-
-	         try {				
-	           $action			
-	         } catch(E &_e) { 
-		   <raise _e>;
-		 }	
-
-            Of course, you still have to satisfy the C++ restrictions,
-	    and the catches list must be compatible (not the same)
-	    as the original list of types in the exception specification.
-
-	    Also, you can now specify that you want to catch the
-	    unknown exception '...', for example:
-
-	       %catches(E1,E2,...) barfoo(int);
-
-	    In any case, the %catches directive will emit the
-	    code to convert into the target language error/exception
-            using the 'throws' typemap.
-
-	    For the '...' case to work, you need to
-	    write the proper typemap in your target language. In the
-	    UTL, this looks like:
-
-	      %typemap(throws) (...) {
-	        SWIG_exception(SWIG_RuntimeError,"unknown exception");
-              }
-
-01/09/2006: mutandiz
-	    [Allegrocl]
-
-            Fixes a number of SEGVs primarily in the handling of
-            various anonymous types. Found in a pass through the
-            swig test-suite. Still more to do here, but this is a
-            good checkpoint.
-
-            Adds -cwrap and -nocwrap as an allegrocl specific
-            command-line argument. Controls generating of a C
-            wrapper file when wrapping C code. By default only a
-            lisp file is created for C code wrapping.
-
-            Doc updates for the command-line arguments and fixes as
-            pointed out on swig-devel
-
-01/05/2006: wsfulton
-            [Java] Fix unsigned long long and const unsigned long long & typemaps
-            - Bug #1398394  with patch from Dries Decock
-
-01/06/2006: mmatus
-	    Add 'named' warning codes, now in addition to:
-	    
-	      %warnfilter(813);
-	   
-	    you can use
-
-	      %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE);
-
-	    just use the same code name found in  Source/Include/swigwarn.h 
-	    plus the 'SWIG' prefix.
-
-	    If a developer adds a new warning code, the Lib/swigwarn.swg file
-            will be generated when running the top level make.
-
-01/05/2006: cfisavage
-            [Ruby]
-	    Reimplemented object tracking for Ruby.  The new implementation works
-	    by expanding the swig_class structure for Ruby by adding a trackObjects
-	    field.  This field can be set/unset via %trackobjects as explained
-	    in the Ruby documentation.  The new implementation is more robust
-	    and takes less code to implement.
-		
-01/05/2006: wsfulton
-            Fix for %extend and static const integral types, eg:
-
-              class Foo {
-                public:
-                %extend {
-                    static const int bar = 42;
-                }
-              }; 
-
-12/30/2005: mmatus
-
-	  - Add info for old and new debug options:
-              
-            -dump_top       - Print information of the entire node tree, including system nodes    
-     	    -dump_module    - Print information of the module node tree, avoiding system nodes     
-     	    -dump_classes   - Print information about the classes found in the interface	       
-     	    -dump_typedef   - Print information about the types and typedefs found in the interface
-     	    -dump_tags      - Print information about the tags found in the interface	       
-     	    -debug_typemap  - Print information for debugging typemaps			       
-            -debug_template - Print information for debugging templates			        
-
-	  - Add the fakeversion. If you have a project that uses
-            configure/setup.py, or another automatic building system
-            and requires a specific swig version, let say 1.3.22 
-	    you can use:
-
-	       SWIG_FEATURES="-fakeversion 1.3.22"
-
-	     or
- 
-               swig -fakeversion 1.3.22
-
-             and then swig -version will report 1.3.22 instead of the
-             current version.
-
-	     Typical use would be
-
-	       SWIG_FEATURES="-fakeversion 1.3.22" ./configure 	     
-
-12/30/2005: mmatus
-
-	  - Add option/format support to %rename and %namewarn.	
-	    Now %namewarn can force renaming, for example:
-
-	      %namewarn("314: import is a keyword",rename="_%s") "import";
-	    
-	    and rename can also support format forms:
-
-	       %rename("swig_%s") import;
-
-	    Now, since the format is processed via swig Printf, you
-	    can use encoders as follows:
-
-	       %rename("%(title)s")  import;     -> Import
-	       %rename("%(upper)s")  import;     -> IMPORT
-	       %rename("%(lower)s")  Import;     -> import
-	       %rename("%(ctitle)s") camel_case; -> CamelCase
-	       
-	    This will allow us to add more encoders, as the 
-	    expected one for regular expressions. 
-
-	  - Add the above 'ctitle' encoder, which does the camel case:
-
-	        camel_case -> CamelCase
-  
-	  - Also, while we get the regexp support, add the 'command' encoder,
-            you can use it as follows
-
-               %rename("%(command:sed -e 's/\([a-z]\)/\U\\1/' <<< )s") import; 
-
-	    then swig will popen the command
-	    
-		"sed -e 's/\([a-z]\)/\U\\1/' <<< import"
-		
-            see below for anonymous renames for better examples.		
-
-          - The rename directive now also allows:
-
-	    - simple match: only apply the rename if a type match
-	      happen, for example
-
-		 %rename(%(title)s,match="enumitem") hello;
-
-		 enum Hello {
-		   hi, hello  ->  hi, Hello  
-		 };
-		 int hello()  ->  hello; 
-
-	    - extended match: only apply the rename if the 'extended attribute' match
-	      occurred, for example: 
-
-	         // same as simple match 		
-		 %rename(%(title)s,match$nodeType="enumitem") hello; 
-
-		 enum Hello {
-		   hi, hello  ->  hi, Hello  
-		 };
-
-	       Note that the symbol '$' is used to define the attribute name in
-	       a 'recursive' way, for example:
-
-		 // match only hello in 'enum Hello'
-		 %rename(%(title)s,match$parentNode$type="enum Hello") hello; 
-
-		 enum Hello {
- 		   hi, hello  ->  hi, Hello   // match
-		 };
-
-		 enum Hi {
- 		   hi, hello  ->  hi, hello   // no match
-		 };
-
-               here, for Hello::hi, the "parentNode" is "Hello", and its "type"
-               is "enum Hello".
-	       
-	       
-            - Anonymous renames: you can use 'anonymous' rename directives, for example: 
-
-	         // rename all the enum items in Hello
-		 %rename(%(title)s,match$parentNode$type="enum Hello") ""; 
-
-		 enum Hello {
- 		   hi, hello  ->  Hi, Hello   // match both
-		 };
-
-		 enum Hi {
- 		   hi, hello  ->  hi, hello   // no match
-		 };
-		 
-	         // rename all the enum items 
-		 %rename(%(title)s,match$nodeType="enumitem") ""; 
-
-	         // rename all the items in given command (sloooow, but...)
-		 %rename(%(command:<my external cmd>)s) ""; 
-
-	
-	      Anonymous renames with commands can be very powerful, since you
-	      can 'outsource' all the renaming mechanism (or part of it) to an
-	      external program:
-	      
-	        // Uppercase all (and only) the names that start with 'i'
-	        %rename("%(command:awk '/^i/{print toupper($1)}' <<<)s") "";   
-	       
-	        int imported() -> IMPORTED;
-	        int hello()    -> hello
-
-	      Note that if the 'command' encoder returns an empty string, swig
-	      understands that no rename is necessary.
-
-	      Also note that %rename 'passes' the matched name. For example, in
-	      this case
-
-	        namespace ns1 {
-		  int foo();
-		}
-
-	        namespace ns2 {
-		  int bar();
-		}
-
-	      the external program only receives "foo" and "bar". If needed,
-	      however, you can request the 'fullname' 
-	       	
-	        %rename("%(command:awk 'awk '/ns1::/{l=split($1,a,"::"); print toupper(a[l])}'' <<<)s",fullname=1) "";   
-                
-		ns1::foo -> FOO
-		ns2::bar -> bar	
-	
-	    - Mixing encoders and matching: of course, you can do mix commands
-	      and match fields, for example:
-
-	        %rename("%(<my encoder for fncs>)",match="cdecl") "";
-	        %rename("%(<my encoder for enums>)",match="enumitem") "";
-	        %rename("%(<my encoder for enums inside a class>)",match="enumitem",
-		        match$parentNode$parentNode$nodeType="class") "";
-		
-	      Use "swig -dump_parse_module" to see the attribute names you can use to
-	      match a specific case.
-	
-            - 'sourcefmt' and 'targetfmt': sometimes you need to
-              process the 'source' name before comparing, for example
-
-	        %namewarn("314: empty is a keyword",sourcefmt="%(lower)s") "empty";
-
-	      then if you have
-
-	        int Empty();  // "Empty" is the source 
-		
-	      you will get the keyword warning since 'Empty' will be
-	      lower cased, via the sourcefmt="%(lower)s" option,
-	      before been compared to the 'target' "empty".
-
-	      There is an additional 'targetfmt' option to process the
-	      'target' before comparing.
-
-	    - complementing 'match': you can use 'notmatch', for example
-	      
-	        %namewarn("314: empty is a keyword",sourcefmt="%(lower)s",notmatch="namespace") "empty";
-
-	      here, the name warning will be applied to all the symbols except namespaces.
-	    
-      	
-12/30/2005: mmatus
-
-	  - Add initial support for gcj and Java -> <target language> mechanism.
-
-	    See	examples in:  
-	  
-		Examples/python/java
-		Examples/ruby/java
-		Examples/tcl/java
-
-            to see how to use gcj+swig to export java classes into
-            python/ruby/tcl.
-	    
-	    The idea is to put all the common code for gcj inside
-
-	          Lib/gcj
-
-            and localize specific types such as jstring, as can be found
-            in
-
-	         Lib/python/jstring.i
-	         Lib/ruby/jstring.i
-	         Lib/tcl/jstring.i
-
-            Using the UTL, this is very easy, and the perl version for
-            jstring.i will be next.
-		 	    
-
-12/29/2005: mmatus
-	  - Add the copyctor feature/directive/option to enable the automatic
-	    generation of copy constructors. Use as in:
-
-	      %copyctor A;
-
-	      struct A {
-
-              };
-
-	    then this will work
-
-	      a1 = A();
-	      a2 = A(a1);
-
-	    Also, since it is a feature, if you just type
-
-	      %copyctor;
-
-	    that will  enable the automatic generation for all the
-	    classes. It is also equivalent to
-
-	       swig -copyctor -c++ ...
-
-	    Notes: 
-
-	    1.- The feature only works in C++ mode.
-
-	    2.- The automatic creation of the copy constructor will
-	        usually produce overloading. Hence, if the target
-	        language doesn't support overloading, a special name
-	        will be used (A_copy).
-	    
-	    3.- For the overloading reasons above, it is probably not
-                a good idea to use the flag when, for example, you are
-		using keywords in Python.
-
-            4.- The copyctor automatic mechanism follows more or less
-	        the same rules as the default constructor mechanism,
-	        i.e., a copy constructor will not be added if the
-	        class is abstract or if there is a pertinent non-public 
-		copy ctor in the class or its hierarchy.
-
-		Hence, it might be necessary for you to complete the
-		class declaration with the proper non-public copy ctor
-		to avoid a wrong constructor addition.
-		
-          - Fix features/rename for templates ctor/dtor and other
-            things around while adding the copyctor mechanism.
-	    
-
-12/27/2005: mmatus
-	  - Add the 'match' option to typemaps. Assume you have:
-
-	      %typemap(in) SWIGTYPE * (int res) {..}
-	      %typemap(freearg) SWIGTYPE * { if (res$argnum) ...}
-
-	    then if you do
- 
-	      %typemap(in) A * {...}
-
-	    swig will 'overload the 'in' typemap, but the 'freearg' 
-	    typemap will be also applied, even when this is wrong. The old
-	    solutions is to write:
-
-	      %typemap(in) A * {...}
-  	      %typemap(freeag) A * "";
-
-	    overload 'freearg' with an empty definition.
-
-	    The problem is, however, there is no way to know you need
-	    to do that until you start getting broken C++ code, or
-	    worse, broken runtime code.
-
-	    The same applies to the infamous 'typecheck' typemap,
-	    which always confuses people, since the first thing you do
-	    is to just write the 'in' typemap.
-
-	    The 'match' option solves the problem, and if instead you write:
-
-	      %typemap(in) SWIGTYPE * (int res) {..}
-	      %typemap(freearg,match="in") SWIGTYPE * { if (res$argnum) ...}
-	      %typemap(typecheck,match="in",precedence...) SWIGTYPE * {...}
-	    
-	    it will tell swig to apply the 'freearg/typecheck'
-	    typemaps only if they 'match' the type of the 'in'
-	    typemap. The same can be done with other typemaps as:
-
-	      %typemap(directorout) SWIGTYPE * {...}
-	      %typemap(directorfree,match="directorout") SWIGTYPE * {...}
-	    
-
-12/27/2005: mmatus
-	  - Add the 'naturalvar' option/mode/feature to treat member
-	    variables in a more natural way, ie, similar to the global
-	    variable behavior.
-
-	    You can use it in a global way via the command line
-
-	      swig -naturalvar ...
-
-	    or the module mode option
- 
-	      %module(naturalvar=1)
-
-	    both forms make swig treat all the member variables in the
-	    same way it treats global variables. 
-
-	    Also, you can use it in a case by case approach for
-	    specific member variables using the directive form:
-
-	      %naturalvar Bar::s;
-	    
-	    Then, in the following case for example:
-
-	       std::string s;
-	       struct Bar {
-		 std::string s;
-               };
-
-            you can do:  
-
-	       b = Bar()
-	       b.s ="hello"
-	       cvar.s = "hello"
-	       
-	       if (b.s != cvar.s):
-	          raise RuntimeError
-
-		  
-            This is valid for all the languages, and the
-            implementation is based on forcing the use of the 
-            const SWIGTYPE& (C++)/SWIGTYPE (C) typemaps for the
-            get/set methods instead of the SWIGTYPE * typemaps.
-	    Hence, for 'naturalvar' to work, each target language
-	    must implement 'typemap(in/out) const Type&' properly.
-
-	    The 'naturalvar' option replaces or makes workarounds such  as:
-	    
-		%apply const std::string & { std::string *}
-
-            unnecessary.
-
-	    Note1: If your interface has other kinds of workarounds to
-	    deal with the old 'unnatural' way to deal with member
-	    variables (returning/expecting pointers), the
-	    'naturalvar' option could break them.
-	    
-	    Note2: the option has no effect on unnamed types, such
-	    as unnamed nested unions.
-	    
-	  
-12/27/2005: mmatus
-	  - Add more 'expressive' result states for the typemap
-            libraries.
-
-	    In the past, for scripting languages, you would do checking something like:
-
-	      if (ConvertPtr(obj,&vptr,ty,flags) != -1) {
-	        // success
-              } else {
-	        // error
-	      }
-
-	    Now the result state can carry more information,
-	    including:
-
-	      - Error state: like the old -1/0, but with error codes from swigerrors.swg.
-
-	         int res = ConvertPtr(obj,&vptr,ty,flags);
-		 if (SWIG_IsOK(res)) {
-		   // success code
-                 } else {
-		   SWIG_Error(res); // res carries the error code
-                 }
-
-	      - Cast rank: when returning a simple successful
-                conversion, you just return SWIG_OK, but if you need
-                to do a 'cast', you can add the casting rank, ie:
-		
-		  if (PyFloat_Check(obj)) {
-		    value = PyFloat_AsDouble(obj);
-		    return SWIG_OK;
-		  } else if (PyInt_Check(obj)) {
-		    value = (double) PyInt_AsLong(obj);
-		    return SWIG_AddCast(SWIG_OK);		    
-                  }
-		
-		later, the casting rank is used to properly dispatch
-		the overloaded function, for example. This of course
-		requires your language to support and use the new
-		dispatch cast/rank mechanism (Now mainly supported in
-		perl and python, and easily expandable to ruby and tcl).
-	      
-	  - [UTL] Add support for the new 'expressive' result states.
-
-12/27/2005: mmatus
-	  - Add support for the C++ implicit conversion mechanism, which
-            required some modifications in parser.y (to recognize
-            'explicit') and overload.cxx (to replace $implicitconv as
-            needed).
-	    
-	    Still, real support in each target language requires each
-	    target language to be modified. Python provides an example,
-            see below.
-
-
-	  - Add support for native C++ implicit conversions, ie, if you
-            have
-
-	        %implicitconv A;
-
-	        struct A {
-		   int ii;
-		   A() {ii = 1;}
-		   A(int) {ii = 2;}
-		   A(double) {ii = 3;}
-		   explicit A(char *s) {ii = 4;}
-		};
-		
-		int get(const A& a) {return a.ii;}
-
-            you can call:
-
-	        a = A()
-	        ai = A(1)
-	        ad = A(1.0)
-	        as = A("hello")
-		
-		# old forms
-	        get(a)  -> 1
-	        get(ai) -> 2
-	        get(ad) -> 3
-	        get(as) -> 4
-		
-		#implicit conversions
-	        get(1)       -> 2
-	        get(1.0)     -> 3
-	        get("hello") -> Error, explicit constructor
-
-            Also, as in C++, now implicit conversions are supported in
-            variable assigments, and if you have:
-
-	      A ga;
-	      struct Bar {
-	        A a;
-              };
-
-	    you can do:
-
-	      cvar.ga = A(1)
-	      cvar.ga = 1
-	      cvar.ga = 1.0
-	      cvar.ga = A("hello") 
-	      cvar.ga = "hello" -> error, explicit constructor
-
-	      b = Bar()
-	      b.a = A("hello")
-	      b.a = 1
-	      b.a = 1.0
-	      b.a = "hello" -> error, explicit constructor
-
-	    Note that the last case, assigning a member var directly, 
-	    also requires the 'naturalvar' option.
-
-	    This support now makes the old '%implicit' macro, which
-	    was found in 'implicit.i' and it was fragile in many ways,
-	    obsolete, and you should use the new '%implicitconv'
-	    directive instead.
-
-	    Note that we follow the C++ conventions, ie, in the
-	    following the implicit conversion is allowed:
-
-		int get(A a) {return a.ii;}
-		int get(const A& a) {return a.ii;}
-	    
-	    but not in these cases:
-
-		int get(A *a) {return a->ii;}
-		int get(A& a) {return a.ii;}
-		
-	    Also, it works for director methods that return a by value
-	    result, ie, the following will work:
-
-                virtual A get_a() = 0;
-
-		def get_a(self):
-		   return 1
-
-            but not in this case:
-
-                virtual const A& get_a() = 0;
-                virtual A& get_a() = 0;
-                virtual A* get_a() = 0;
-	    
-	  Notes:
-
-	  - the implicitconv mechanism is implemented by directly
-	    calling/dispatching the python constructor, triggering a
-	    call to the __init__method. Hence, if you expanded the
-	    __init__ method, like in:
-
-	        class A:
-		   def __init__(self,args):
-		      <swig code>
-		      <my code here>
-
-            then 'my code' will also be executed.
-	    
-	  - Since the %implicitconv directive is a SWIG feature, if you type:
-	    
-  	       %implicitconv;  
-
-	    that will enable implicit conversion for all the classes in
-	    your module.
-
-	    But if you are worried about performance, maybe that will be
-	    too much, especially if you have overloaded methods, since
-	    to resolve the dispatching problem, python will efectively
-	    try to call all the implicit constructors as needed.
-
-	  - For the same reason, it is highly recommended that you use
-            the new 'castmode' when mixing implicit conversion and
-            overloading.
-
-	 - [python] The %implicit directive is declared obsolete, and
-           you should use %implicitconv instead. If you include
-	   the implicit.i file, a warning will remind you of this.
-
-	   Note: Since %implicit is fragile, just replacing it by
-	   %implicitconv could lead to different behavior. Hence, we
-	   don't automatically switch from to the other, and the user
-	   must migrate to the new %implicitconv directive manually.
-
-
-12/26/2005: wsfulton
-            [C#]
-            Modify std::vector wrappers to use std::vector::value_type as this is
-            closer to the real STL declarations for some methods, eg for push_back().
-            Fixes some compilation errors for some compilers eg when the templated
-            type is a pointer.
-
-            [Java]
-            std::vector improvements - a few more methods are wrapped and specializations are
-            no longer required. The specialize_std_vector macro is no longer needed (a
-            warning is issued if an attempt is made to use it).
-
-12/26/2005: wsfulton
-            [Java, C#]
-            Add in pointer reference typemaps. This also enables one to easily wrap
-            std::vector<T> where T is a pointer.
-
-12/24/2005: efuzzyone
-            [CFFI] The cffi module for SWIG:
-              - Fully supports C, but provides limited supports for C++, in
-               particular C++ support for templates and overloading needs to
-               be worked upon. 
-
-12/23/2005: mmatus
-	    [python] Add the castmode that allows the python
-	    type casting to occur.
-
-	    For example, if you have 'int foo(int)', now
-	    
-	      class Ai():
-	         def __init__(self,x): 
-		    self.x = x
-	         def __int__(self): 
-		    return self.x
-
-	      foo(1)   // Ok
-	      foo(1.0) // Ok
-	      foo(1.3) // Error
-	      a = Ai(4)
-              foo(ai)  // Ok
-
-            The castmode, which can be enabled either with the
-            '-castmode' option or the %module("castmode") option, uses
-            the new cast/rank dispatch mechanism. Hence, now if you
-            have 'int foo(int); int foo(double);', the following works
-            as expected:
-
-	      foo(1)   -> foo(int)
-	      foo(1.0) -> foo(double)
-	      ai = Ai(4)
-	      foo(ai)  -> foo(int)
-
-	    Note1: the 'castmode' could disrupt some specialized
-	    typemaps. In particular, the "implicit.i" library seems to
-	    have problem with the castmode. But besides that one, the
-	    entire test-suite compiles fine with and without the
-	    castmode.
-
- 	    Note2: the cast mode can't be combined with the fast
-	    dispatch mode, ie, the -fastdispatch option has no effect
-	    when the cast mode is selected. The penalties, however,
-	    are minimum since the cast dispatch code is already based
-	    on the same fast dispatch mechanism.
-
-	    See the file overload_dispatch_cast_runme.py file for
-	    new cases and examples.
-
-12/22/2005: mmatus
-	    Add the cast and rank mechanism to dispatch overloading
-	    functions. The UTF supports it now, but for each language
-	    it must be decided how to implement and/or when to use it.
-
-	    [perl] Now perl uses the new cast and rank dispatch
-	    mechanism, which solves all the past problems known 
-	    in perl, such as the old '+ 1' problem:
-
-	        int foo(int);
-	    
-		$n = 1
-                $n = $n + 1
-                $r = foo(n)
-
-            also works:
-
-                 foo(1);
-                 foo("1");
-                 foo(1.0);
-                 foo("1.0");
-
-             but fails
-
-                 foo("l");
-
-             and when overloading  foo(int) and foo(double);
-
-                 foo(1) -> foo(int)
-                 foo(1.0) -> foo(double)
-                 foo("1") -> foo(int)
-                 foo("1.0") -> foo(double)
-                 foo("l") -> error
-		 foo($n) -> foo(int)  for good perl versions
-		 foo($n) -> foo(double)  for old bad perl versions
-
-	     when overloading foo(int), foo(char*) and foo(double):
-
-                 foo(1) -> foo(int)
-                 foo(1.0) -> foo(double)
-                 foo("1") -> foo(char*)
-                 foo("1.0") -> foo(char*)
-                 foo("l") -> foo(char*)
-
-             Note: In perl the old dispatch mechanism was broken,
-             so, we don't provide an option to enable the old one
-	     since, again, it was really really broken.
-
-	     See 'overload_simple_runme.pl' for more cases and tests.
-
-	     PS: all the old known issues are declared resolved, any
-	     new "problem" that could be discovered is declared, 
-	     a priori, as "features" of the new dispatch mechanism
-	     (until we find another solution at least).
-	     
-	     
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-	    As with the introduction of the UTF, some things could
-	    now start to work as expected, and people used to deal or
-	    workaround previous bugs related to the dispatch
-	    mechanism, could see now a difference in perl behavior.
-
-12/21/2005: mmatus
-	  - The '-nodefault' flag (pragma and feature) now generates
-	    a warning, and recommends to use the explicit
-	    -nodefaultctor and  -nodefaultdtor options.
-	    
-	    The reason to split the 'nodefault' behavior is that, in
-	    general, ignoring the default destructor generates memory
-	    leaks in the target language. Hence, is too risky just to
-	    disable both the default constructor and destructor
-	    at the same time.
-
-	    If you need to disable the default destructor, it is
-	    also recommended you use the directive form:
-
-	       %nodefaultdtor  MyVerySpecialClass;
-
-            for specific classes, and always avoid using the global
-            -nodefault and -nodefaultdtor options.
-	    
-12/21/2005: wsfulton
-            [Java, C#]
-            Fix incorrect code generation when the intermediary classname is changed
-            in the module directive from its default. For example:
-
-              %module(jniclassname="myimclassnewname") "mymodule" // Java
-              %module(imclassname="myimclassnewname") "mymodule" // C#
-
-            Add in new special variable $imclassname. See docs.
-
-12/17/2005: mmatus
-	  [Python]
-	  - Add the -aliasobj0/-noaliasobj0 options to use with
-	    -fastunpack and/or -O and old typemaps that use 'obj0'
-	    directly.
-
-	    So, if you compile your code using -O and get errors about
-	    the undeclared 'obj0' variable, run again using 
-
-		swig -O -aliasobj0 -python ....
-	    
-	    For new typemaps, never use 'obj0' directly, if needed,
-	    use the '$self' name that will be properly  expanded to
-	    'obj0' (nofastunpack) or 'swig_obj[0]' (fastunpack). 
-  
-	    If you have no idea what I am talking about, better, that
-	    means you have no typemap with this problem.
-
-
-12/14/2005: mmatus 	 
-	  [Python]
-	  - Add the -fastunpack/-nofastunpack options to enable/disable
-	    the use of the internal UnpackTuple method, instead of
-	    calling the one from the python C API.
-
-	    The option -O now also implies -fastunpack.
-	    
-
-12/11/2005: mmatus 
-	  [Python]
-	  - Add the -proxydel/-noproxydel options to enable/disable
-	    the generation of proxy/shadow __del__ methods, even
-	    when now they are redundant, since they are empty.
-	    However, old interfaces could rely on calling them.
-
-	    The default behavior is to generate the __del__ methods
-	    as in 1.3.27 or older swig versions.
-
-	    The option -O now also implies -noproxydel.
-
-12/10/2005: mmatus 
-	  [UTF]
-          - Fix unnecessary calls to SWIG_TypeQuery for 'char *'
-	    and 'wchar_t *', problem found by Clay Culver while
-	    profiling the PyOgre project.
-
-	  
-	  [Python] 
-	  - Add the -dirvtable/-nodirvtable to enable/disable
-	    a pseudo virtual table used for directors, avoiding
-	    the need to resolve the python method at each call.
-	    
-	  - Add the -safecstrings/-nosafecstrings options to
-	    enable/disable the use of safe conversions from PyString
-	    to char *. Python requires you to never change the internal
-	    buffer directly, and hence 'safectrings' warranties that
-	    but returning a copy of the internal python string buffer.
-
-	    The default, as in previous releases, is to return a
-	    pointer to the buffer (nosafecstrings), so, it is the user's
-	    responsibility to avoid its modification.
-	    
-	  - Add the -O option to enable all the optimization options
-	    at once, initially equivalent to
-
-	    -modern -fastdispatch -dirvtable -nosafecstrings -fvirtual
-
-12/08/2005: mmatus 
-
-	  - Add the -fastdispatch option (fastdispatch feature). This
-	    enables the "fast dispatch" mechanism for overloaded
-	    methods provided by Salvador Fandi~no Garc'ia (#930586).
-
-	    The resulting code is smaller and faster since less type
-	    checking is performed. However, the error messages you
-	    get when the overloading is not resolved could be
-	    different from what the traditional method returns.
-
-	    With the old method you always get an error such as 
-
-	       "No matching function for overloaded ..."
-
-            with the new method you can also get errors such as
-
-	       "Type error in argument 1 of type ..."
-
-	    See bug report #930586 for more details.
-            
-  	    So, this optimization must be explicitly enabled by users.
-
-	    The new mechanism can be used as:
-
-              swig -fastdispatch
-
-            or using the feature form
-
-	      %feature("fastdispatch") method;
-            or
-              %fastdispatch method;
-	    
-
-12/06/2005: mmatus 
-
-          - Several memory and speed improvements, specially for
-	    templates. Now swig is up to 20 faster than before for
-	    large template interfaces, such as the std_containers.i
-	    and template_matrix.i files in the python test-suite.
-
-	    Memory footprint is also reduced in consideration of small
-	    pcs/architectures.
-
-	  - add commandline options -cpperraswarn and -nocpperraswarn" to force
-            the swig preprocessor to treat the #error directive as a #warning.
-	    
-	    the pragmas
-
-               #pragma SWIG cpperraswarn=1
-               #pragma SWIG cpperraswarn=0
-	       
-	    are equivalent to the command line options, respectively.
-             
-
-12/06/2005: mmatus
-	    [Python] The generated code is now more portable, especially
-	    for Windows. Following 
-
-                 http://www.python.org/doc/faq/windows.html
-
-            Py_None is never accessed as a structure, plus other
-            tricks mentioned there.
-
-12/06/2005: mmatus
-	    [Python] Added initial support for threads based in the
-	    proposal by Joseph Winston.
-
-	    The user interface is as follows:
-
-	    1.- the module thread support is enable via the "threads" module
-                option, i.e.
-
-                  %module("threads"=1)
-
-            2.- Equivalent to that, is the new '-threads' swig option
-
-                  swig -threads -python ...
-
-            3.- You can partially disable thread support for a given
-                method using:
-
-                  %feature("nothread") method;
-                or
-		  %nothread method;
-
-                also, you can disable sections of the thread support, 
-                for example
-
-                  %feature("nothreadblock") method;
-                or
-		  %nothreadblock method;
-
-                  %feature("nothreadallow") method;
-                or
-		  %nothreadallow method;
-
-                the first disables the C++/python thread protection, and the
-                second disables the python/C++ thread protection. 
-
-            4.- The current thread support is based in the PyGIL
-                extension present in python version 2.3 or later, but
-                you can provide the thread code for older versions by
-                defining the macros in pythreads.swg.
-
-		If you get a working implementation for older versions,
-		please send us a patch.
-
-            For the curious about performance, here are some numbers
-            for the profiletest.i test, which is used to check the speed
-	    of the wrapped code:
-
-	        nothread           9.6s  (no thread code)
-		nothreadblock     12.2s  (only 'allow' code)
-		nothreadallow     13.6s  (only 'block' code)
-                full thread       15.5s  ('allow' + 'block' code)
-	    
-	    i.e., full thread code decreases the wrapping performance by
-	    around 60%. If that is important to your application, you
-	    can tune each method using the different 'nothread',
-	    'nothreadblock' or 'nothreadallow' features as
-	    needed. Note that for some methods deactivating the
-	    'thread block' or 'thread allow' code is not an option,
-	    so, be careful.
-	    
-
-11/26/2005: wsfulton
-            SWIG library files use system angle brackets everywhere for %include, eg
-              %include "std_common.i"
-            becomes
-              %include <std_common.i>
-
-11/26/2005: wsfulton
-            [Java, C#]
-            Typesafe enums and proper enums have an extra constructor so that enum item values that
-            are initialised by another enum item value can be wrapped without having to use %javaconstvalue/
-            %csconstvalue for when using %javaconst(1)/%csconst(1). Suggestion by
-            Bob Marinier/Douglas Pearson.
-            For example:
-
-              typedef enum
-              {
-                 xyz,
-                 last = xyz
-              } repeat;
-
-11/21/2005: mmatus
-	    [ruby + python]
-
-	    Fixes for directors + pointers. This is an ugly problem without an easy
-	    solution. Before we identified this case as problematic:
-
-	          virtual const MyClass& my_method();
-
-            but it turns out that all the cases where a pointer, array or
-            reference is returned, are problematic, even for 
-	    primitive types (as int, double, char*, etc).
-
-	    To try to fix the issue, a new typemap was added,
-	    'directorfree', which is used to 'free' the resources
-	    allocated during the 'directorout' phase. At the same
-	    time, a primitive garbage collector engine was added to
-	    deal with orphaned addresses, when needed.
-	    
-	    The situation is much better now, but still it is possible to have
-	    memory exhaustation if recursion is used.
-
-	    So, still you need to avoid returning pointers, arrays or
-	    references when using director methods.
-
-	    - Added stdint.i - typemaps for latest C99 integral types found in stdint.h.
-	    
-11/14/2005: wsfulton
-            More types added to windows.i, eg UINT8, WORD, BYTE etc. 
-            Including windows.i will also enable SWIG to parse the __declspec Microsoft
-            extension, eg __declspec(dllimport). Also other Windows calling conventions
-            such as __stdcall.
-
-11/10/2005: wsfulton
-            New library file for Windows - windows.i. This file will contain useful type
-            information for users who include windows.h. Initial support is for the
-            non ISO integral types: __int8, __int16, __int32, __int64 and unsigned versions.
-            The unsigned versions previously could not be parsed by SWIG.  SF #872013.
-
-11/09/2005: wsfulton
-            [Java, C#] Portability warning for files which will overwrite each other on case
-            insensitive file systems such as FAT32/NTFS. This will occur, for example, when two
-            class names are the same barring case. The warning is issued on all platforms and
-            can be suppressed with the usual warning suppression techniques. SF bug #1084507.
-
-11/09/2005: wsfulton
-            ./configure --with-python --with-ruby --with-perl5 etc enable these languages,
-            ie the --with-xxxx options, where no path is specified, work the same as if 
-            the option was not specified at all. Based on patches #1335042 #1329048 #1329047.
-
-11/09/2005: dancy
-
-	    [Allegrocl]
-	    Add C++ support to the Allegrocl module. Further
-	    enhances the C support as well. Some of the
-	    features:
-
-	    - MUCH better generation of foreign types based on
-	    the C/C++ types for use in defining the FFI on
-	    the lisp side. We don't pass everything as a (* :void)
-	    any longer.
-
-	    - Uses typemaps for better control of type conversions
-	    and code generation in the generated lisp and c++ wrapper
-	    code.
-
-	    - CLOS wrapping of pointers returned from foreign space
-	    makes it easier to differentiate pointers in user code.
-	    The wrapping objects can be passed directly to FF calls.
-
-	    - Defun wrapping of FF calls, allowing for more lispy
-	    interface. Conversion, GCing, of lisp objects to 
-	    foreign objects can be done in the wrapping defun via
-	    the use of typemaps.
-	    
-	    - overload dispatching implemented on the lisp side
-	    using generic functions.
-
-	    - Templates and synonymous types supported.
-
-11/07/2005: mmatus
-
-	    [Python] Adding proper support for multi-inheritance in
-	    the python side, ie, if you have two C++ wrapped class, Foo
-	    and Bar, now:
-
-	       class MyPythonClass(Foo,Bar):
-	          ....
-
-            will properly work, even with directors, and the
-            deallocation of Foo.this and Bar.this will follow
-            correctly. Before, a class could only have one 'this'
-            instance (unlike C++), only the last base class was
-            properly deleted, or detected with directors.
-
-	    Now 'self.this' can be a list, which will contain the C++
-	    instance pointers for all the base classes.
-	    
-	    Also, swig.this is responsible for deallocating the C++
-	    instance(s), and the __del__ method is not emitted unless
-	    the user preppend/append some code to it.
-
-	  - Swig can now detect memory leaks, ie, if you still
-	    don't use proxy/shadow classes, and type something like
-	    
-	         import _example
-	         f = _example.new_Foo()
-
-	    and forget to call _example.delete_Foo(f), then swig will
-	    tell you that there is a memory leak.
-
-	    Otherwise, if you always use the proxy classes, you probably
-	    you will never ever see this warning unless there is
-	    something wrong inside the swig wrapping code.
-	       
-	
-            *** POTENTIAL INCOMPATIBILITY ***
-	    
-	    If you overloaded the __del__ method, and call the base
-	    one	 without a try block, as in
-
-	           class MyClass(SwigClass):
-
-	              def __del__(self):
-		          <your code here>
-		          SwigClass.__del__(self)
-			  
-            python could complain that the method SwigClass.__del__ is
-            undefined. Try to use instead:
-	    
-	              def __del__(self):
-		          <your code here>
-		          try: SwigClass.__del__(self)
-			  except: pass
-
-	    or simply 		  
-
-	              def __del__(self):
-		          <your code here>
-
-11/02/2005: mmatus
-
-	    [Python] Adding more fun to STL/STD containers, now you
-	    can do
-
-	       %template(pyset) std::set<PyObject *>;		
-	       %template(pyvector) std::vector<PyObject *>;	
-	       %template() std::pair<PyObject *,PyObject *>;	
-	       %template(pyvector) std::map<PyObject *,PyObject *>;
-	       ....
-
-	    The same  applies to std::list, std::deque, std::multiset, etc.
-
-	    Then, at the python side you can do now:
-
-	       # C++ std::vector as native python sequence
-	       v = pyvector([1,"hello",(1,2)])
-	       print v[1]
-	       >> 'hello'
-	       print v[2]
-	       >> (1,2)
-	       					   
-	       # C++ std::set as native python sequence
-	       s = pyset()			   
-	       s.insert((1,2))		   
-	       s.insert(1)			   
-	       s.insert("hello")
-	       sum=()
-	       for i in s:
-	         sum +=(i,)
-	       print sum
-	       >>> (1, 'hello', (1, 2))
-	       				   
-	       # C++ std::map as native python sequence
-	       m = pymap()			   
-	       m["foo"] = "hello"		   
-	       m[1] = (1,2)
-	       pm = {}
-	       for k in m:	    	   
-	         pm[k] = m[k]
-	       print pm
-	       >>> {1: (1, 2), 'foo': 'hello'}
-
-	    ie, the STD/STL containers work as real native python
-	    container, with arbitrary item types and so.
-
-	    But since normal C++ containers do not properly ref/unref
-	    their items, you should use the safer versions:
-	    
-	      %template(pyset) std::set<swig::PyObject_ptr>;
-	      %template(pyvector) std::vector<swig::PyObject_ptr>;
-	      %template() std::pair<swig::PyObject_ptr, swig::PyObject_ptr>;
-	      %template(pyvector) std::map<swig::PyObject_ptr,swig::PyObject_ptr>;
-	      ....
-
-	    where swig::PyObject_ptr is a PyObject * envelope class provided
-	    to safely incref/decref the python object. 
-	    
-	    So, now you can use all the STL/STD containers as native
-	    Python containers. 
-
-	    Note 1: std::map, std::set and the other 'ordered'
-	    containers will properly use PyObject_Compare for sorting,
-	    when needed.
-
-	    Note 2: all the STL/STD containers have a limit size of
-	    SIZE_MAX, ie, you can have manage containers larger than
-	    INT_MAX, the python limit.
-	    
-	      
-11/02/2005: mmatus
-
-	    [Python]
-	    - add 'iterator()' method for all sequences and additionally
-	      'key_iterator()' for maps.
-
-	      'iterator()' will always return the native C++ iterator.
-	      Additionally, in maps, 'key_iterator()' will return a python
-	      iterator using only the map keys.
-	      
-	      In general the sequence method __iter__ will call
-	      'iterator()', returning the native C++ iterator, but in
-	      maps it will call 'key_iterator()', maintaining
-	      backward compatibility.
-
-	      Hence, for std::maps, you can play then with the native
-	      C++ iterator, which value is a (key, value) pair, by
-	      calling map.iterator(), as with map.begin(), map.end(), etc.
-
-	      The difference is that map.iterator() returns a safe
-	      'closed' iterator, while map.begin() and map.end() are
-	      'open' iterators.
-
-	      A 'closed' iterator knows the begin and the end of the
-	      sequence, and it never can seg. fault. An 'open'
-	      iterator, as in C++, can seg. fault at the C++ side.
-
-	         # a closed iterator is safe in the following example.
-		 # the next() method will throw a StopIteration
-	         # exception as needed
-	
-	         i = seq.iterator()
-		 try:
-                      while True:
-		        sum += i.next()
-		 except: pass
-		 
-		 # an open iterator always need to be checked,
-		 # or it will crash at the C++ side
-
-	         current = seq.begin()
-                 end = seq.end()
-		 while (current != end):
-		    sum += current.next()
-	      
-	      
-	    [Python]
-	    - Finally, when we call 
-
-	        f = Foo()
-
-	      the construction is 'one-way'. Before construction  was done
-	      something like
-
-	          Foo() (python) -> _new_Foo() (C++) 
-                  new_Foo() (C++) -> FooPtr() (python) 
-                  FooPtr() (python) -> Foo() (python)
-
-              and returning a pointer was done like
-
-                  NewPointerObj() (C++) -> FooPtr() (python)
-                  FooPtr(python) -> Foo() (python)
-                  		  
-
-	      ie, we when going back and forward between the C++ and
-	      python side.
-
-	      Now since there is no FooPtr the construction process is
-
-	          Foo() (python) -> _new_Foo() (C++)
-                  _new_Foo() (C++) -> NewPointerObj() (C++) (no shadow class)
-
-              and returning a pointer is done
-
-                  NewPointerObj() (C++) (with shadow class) -> NewInstaceObj() (C++)
-
-	      where NewInstanceObj creates a new instance without
-	      calling __init__ and it doesn't go 'back' to python, is
-	      'pure' C API.
-
-	     - With this change, and the other ones in the
-               PySwigObject type, which now carries the thisown and
-               swig_type_info pointer, the generated code should be as
-               fast as boost::Python and/or the other python wrappers
-               based in pure Python/C API calls.
-
-	       As a reference, the profiletest_runme.py example, which
-	       does a simple call function many times, such as this code:
-
-                    import profiletest       
-		                             
-		    a = profiletest.A()      
-		    b = profiletest.B()      
-		    for i in range(0,1000000)
-	              a = b.fn(a)            
-
-
-	       where fn is defined as 'A* B::fn(A *a) {return a;}',
-	       produces  the following times
-
-                               nomodern    modern
-	         swig-1.3.26    19.70s      5.98s
-                 swig-CVS        0.99s      0.98s
-	       
-
-	       Clearly, there is a large improvement for the python
-	       'nomodern' mode. Still, the 'modern' mode is around
-	       6 times faster than before. For the same test, but
-	       using the non-shadow version of the module, we get
-
-	                       _profiletest (non-shadow)
-	         swig-1.3.26     0.80s 
-                 swig-CVS        0.60s 
-
-	       Hence, now for practical purposes, the proxy overhead
-	       is insignificant.
-
-	       Note that the performance numbers we are showing is for
-	       a simple module (two types) and a simple function (one
-	       argument). For real situations, for modules with many
-	       more types and/or functions with many more parameters,
-	       you will see even better results.
-	       
-		  	      
-10/31/2005: mmatus
-	    [Python]
-
-	    - Finally, no more ClassPtr proxy classes. You will see
-	      only a clean Class proxy class in the .py file.
-
-	    - No more 'real' thisown attribute either, the PySwigObject now
-              carries the ownership info.
-
-	      You can also do something like
-
-	          print self.this.own() 
-		  >>> True
-		  
-		  self.this.disown()
-		  self.this.own(0)
-	          print self.this.own() 
-		  >>> False		  
-
-		  self.this.acquire()
-		  self.this.own(1)
-	          print self.this.own() 
-		  >>> True
-
-	      Still the old way,
-	      
-	          print self.thisown
-		  >>> True
-
-		  self.thisown = 0
-	          print self.thisown
-		  >>> False		  
-
-		  self.thisown = 1
-	          print self.thisown
-		  >>> True
-
-              is supported, and python dispatches the proper method
-              calls as needed. 		  
-	       
-
-	    - Support for iterators in STL/STD containers, for example, if you have
-
-                    %template<set_string> std::set<std::string>;
-	          
-               you can use the C++ iterators as:  
-
-                     s = set_string()
-		                     
-		     s.append("c")   
-		     s.append("a")   
-	             s.append("b")
-
-                     b = s.begin()      
-		     e = s.end()        
-		     sum = ""           
-		     while (b != e):    
-                         sum += b.next()        
-                     print sum
-
-                     >>> "abc" 
-
-		advance the iterator as in C++
-
-                     current = s.begin()      
-		     current += 1
-                     print current.value()
-		     >>> "b"
-		     
-		now using the reverse operators
-
-                     b = s.rbegin()      
-		     e = s.rend()        
-		     sum = ""           
-		     while (b != e):    
-                         sum += b.next()        
-                     print sum
-
-                     >>> "cba" 
-
-	        or the 'previous' method
-
-                     b = s.begin()      
-		     e = s.end()        
-		     sum = ""           
-		     while (b != e):    
-                         sum += e.previous()
-                     print sum
-
-                     >>> "cba" 
-
-                or just as in a python fashion
-
-                     for i in s:
-                         sum += i        
-                           
-                Note 1: Iterators in C++ are very powerful, but
-                dangerous too. And in python you can shoot yourself in the foot
-                just like in C++, so, be careful.
-		
-		Note 2: the iterators are 'light', ie, they do not
-		convert sequence elements until you request to do so, via
-		next(), value() or previous(). If you just increment/decrement one
-		no conversion is performed, for example:
-
-                      
-                     b = s.begin()      
-	             b += 1
-                     b.incr()
-                     b.incr(2)
-		     b.decr(2)
-                     b.decr()
-                     b -= 1
-
-		 only the iterator is modified, and not value wrapper
-		 is generated. Other typical C++ operations are also 
-		 available, such as:
-
-		     print s.end() - s.begin()
-		     >>> 3
-		     f = s.begin() + 1
-		     print f.value()
-		     >>> "b"
-		     l = s.end() - 1
-		     print l.value()
-		     >>> "c"
-		 
-		 etc.  Of course, the 'find', 'insert', 'erase', and
-		 so on methods also supports iterators now, ie:
-
-		      i = s.begin()
-		      i += 1
-		      s.erase(i)
-                      for i in s:
-                         sum += i
-		      print sum
-		      >>> "ac"
-		      
-            *** POTENTIAL INCOMPATIBILITY ***
-
-	    There is no more 'thisown' attribute. If you use it, python
-	    will translate the following code as follows:
-
-                if (self.thisown):   ==>   if (self.this.own()):
-		self.thisown = 1     ==>   self.this.own(1)
-                self.thisown = 0     ==>   self.this.own(0)
-
-	    Still, maybe in some unusual cases the translation will not be
-	    100% correct, so if you have a problem, please report it
-	    and/or use the new 'self.this.own()' accessor.
-	    
-	    
-            *** POTENTIAL INCOMPATIBILITY ***
-	    
-	    There is no more ClassPtr classes in the python code. Hence,
-	    if in the past you needed to resort to some kind of trickery
-	    with them, or overcome their presence, it is no longer
-	    required, but the extra code you added could now break
-	    things.
-
-	    If needed, you can use the option -classptr, i.e.,
-
-               swig -classptr -python ...
-
-	    to generate the old ClassPtr classes.
-
-
-10/30/2005: mkoeppe 
-	    [Guile] Make declared and defined linkage of SWIG_init consistent.  
-	    Reported by Steven G. Johnson (SF patch 1315498).
-
-10/26/2005: mmatus
-
-	  - Added the attribute.i file to the global library director.
-	    Now it can be used from other languages that do not use
-	    the unified typemap library as well.
-
-	    So, if you have something like:
-
-	       %include attribute.i
-
-               %attribute(A, int, a, get_a, set_a);
-	       				      	  
-	       struct A			      	  
-	       {    				  
-	         int get_a() const; 		  
-	         void set_a(int aa); 		  
-	       };				  
-
-               %attribute_ref(B, int, c);
-	       				
-	       struct B			
-	       {    			
-	         int& c(); 		
-	       }; 
-
-	    then in the target language the 'A.a' and 'B.c' attributes will
-	    be visible, ie, you can access them as plain variables:
-
-               f   = A()
-               f.a = 3
-               g   = B()
-               g.c = 3 
-           
-	       h   = f.a + g.c
-
-	    and the proper get/set methods will be dispatched. See
-	    attribute.i for more info.
-   
-          - More cleanups around and adding more test-cases. The
-            DISOWN typemap now is tested and working in all the
-            languages that use the unified typemap library, ie, tcl,
-            ruby, perl and python.
-	    
-
-10/25/2005: mmatus
-
-	    - Perl, complete the DISOWN typemap.
-	    
-	    - added the attribute.i file to the unified typemap
-              library (before was only usable from python).
-
-	    - unify the names for the setter and getter methods in
-	      perl,tcl,ruby and python, so, the attribute.i library
-	      can work across them.
-	      
-	    - see the li_attribute.i test-case or the library file
-
- 	        Lib/typemaps/attribute.swg
-
-              for more info about how to use it.
-
- 
-	      
-
-10/24/2005: mmatus
-
-	    - Perl now uses the unified typemap library.
-
-	    - Changes in ruby to use the $track option in typemaps.
-
-	    - Changes in the unified typemap library to follow the
-	      convention that all macros that are not used in the
-	      C/C++ side starts with %, such as
-
-	           %delete
-		   %new_array
-
-              etc.
-	      
-	    - Documenting fragments, see fragments.swg.
-
-	    - Cleaner way to use the unified typemap library, include
-	      just <typemaps/swigtypes.swg>.
-
-	      Check some of the supported languages: perl, tcl, ruby,
-	      python.
-
-	      Always start with the head file, such as
-
-	         python/python.swg
-	         tcl/tcl8.swg
-	         ruby/ruby.swg
-	         perl5/perl5.swg
-
-              and the principal file that invokes the unified library, such as
-
-	         python/pytypemaps.swg	    
-	         tcl/tcltypemaps.swg	    
-	         ruby/rubytypemaps.swg	    
-	         perl/perltypemaps.swg	    
-	    
-	      The file that provide the specialization for each
-	      language are the one that provides the basic types:
-
-	         python/pyprimtypes.swg	
-	         ruby/rubyprimtypes.swg	
-	         tcl/tclprimtypes.swg	
-	         perl5/perlprimtypes.swg
-
-	      and the string manipulation:  	 
-	    
-	         python/pystrings.swg	
-	         ruby/rubystrings.swg	
-	         tcl/tclstrings.swg	
-	         perl5/perlstrings.swg
-
-		 
-	      The rest of the files, such as carray.i, are mostly one 
-	      line files that include the proper typemap library
-	      version.
-
-            *** POTENTIAL INCOMPATIBILITY in Perl ***
-
-	    Some missing/wrong typemaps could start working properly,
-	    and change the old expected behavior in Perl.
-
-10/23/2005: wuzzeb
-            Chicken:
-              + pointers to member functions finally work properly
-              + add test of member function pointers to cpp_basic.i
-
-10/20/2005: dancy
-	    [allegrocl] Added C++ support. Large update, many changes. See
-	    newly added Allegro Common Lisp section in lisp.html
-
-10/20/2005: mmatus
-	    Ruby, Tcl, Python:
-
-	    - Uniform way to fail (label fail:), now finally
-	      SWIG_exception works across the three languages and all
-	      the typemaps.
-
-	    - Add proper cleanup code to ruby
-
-	    - More valgrind fixes
-
-	    - Simplify the inline use, it seems a small interface of
-	      20,000 lines (plus many many templates) can break 
-	      gcc -O3 easily.
-
-	    - Finalize the typemaps library. All the old  *.i files
-	      (carray.i, cpointer.i, exception.i) had been implemented
-	      in the new typemaps library.
-	    
-
-10/19/2005: wuzzeb
-	    Update the Runtime Typemap documentation in Typemaps.html
-
-10/18/2005: wuzzeb
-	    Chicken:
-	      - Correctly handle %ignored classes
-              - Correctly convert long, long long, unsigned long, etc
-                to chicken primitives. (Thanks to Felix Winkelmann)
-              - Using argout parameters when the return value was a
-                wrapped pointer caused a memory corruption.  The chicken
-                garbage collector moved a pointer out from under us.
-                This is now fixed by running all the proxy creation
-                functions as continuations after the wrapper function
-                returns.  As part of this, we no longer need the
-                chickenfastproxy flag on output typemaps.
-              - using -proxy and -nocollection together works now
-                Before, it was not exporting the destructor in the proxy
-                wrapper.
-
-10/18/2005: mmatus
-	    
-	    Added the Unified Typemap Library (UTL). It unifies the typemaps for
-
- 	        python, ruby, tcl
-
-	    and in the process, fixes several problems in each of the three
-	    languages to work in a "canonical" way now established in
-	    the typemap library
-	    
-	       SWIG/Lib/typempas
-
-	    The current status of the unification is that everything
-	    compiles and runs inside the test-suite and examples
-	    directories. And for the first time we have three
-	    languages than pass the primitive_types.i case.
-
-	    Also, we have a uniform way to treat the errors, for example
-	    if you do something like
-
-	      >>> from primitive_types import *
-              >>> print val_uchar(10)
-              10
-	      >>> print val_uchar(1000)
-              Traceback (most recent call last):		      
-	        File "<stdin>", line 1, in ?			    
-	      OverflowError: in argument 1 of type 'unsigned char'
-
-	    you get the same exception in all the three languages.
-	    
-	    And well, many more good things will come from this
-	    unification, for example, proper support of the STL/STD classes
-	    for all the languages, and hopefully, we can keep
-	    adding other languages.
-
-	    The hardest part, writing a common typemap library
-	    that suites the three different languages, is done,
-	    and adding another language should now be easy. 
-
-	    Still the global unification is not complete, the STL/STD 
-	    part is next, and probably as well as adding one or two more
-	    languages.
-
-	    If you are curious, look at the python, ruby and/or tcl
-	    directories to see what is needed to support the new
-	    common typemaps library.  Still, the final way to
-	    integrate a new language could change as we move to
-	    integrate the STD/STL.
-
-            *** POTENTIAL INCOMPATIBILITY in Ruby/Tcl ***
-
-	    Some missing/wrong typemaps could start working properly,
-	    and change the old behavior, specially in ruby and tcl.
-
-Version 1.3.27 (October 15, 2005)
-=================================
-
-10/15/2005: wsfulton
-            [Java] Fix for typesafe enum wrapping so that it is possible to
-            overload a method with 2 different enum types.
-
-10/15/2005: wsfulton
-            Fix for %feature("immutable","0") attempting to generate setters
-            for constants.
-
-            Restored %immutable and %makedefault to clear the feature as it
-            behaved in SWIG-1.3.25 and earlier.
-
-10/14/2005: mmatus
-            Fix bug in anonymous typedef structures which was leading to
-            strange behaviour.
-
-10/13/2005: mmatus
-	    Several minor changes:
-	    
-	    - Improve the wchar_t type support
-	    - Add a warning for when you define the 'in' typemap but
-	      you don't define the 'typecheck' one. Very common mistake.
-	    - Add proper default rule for function pointers, now you
-	      can define a typemap such as:
-
-	      %typemap(in) SWIGTYPE ((*)(ANY)) {...}
-
-	      That will apply to all the pointer to functions. The
-	      rule in C++ also apply to the function 'reference', ie,
-	      in both cases
-
-	        typedef  int (*fptr)(int a);
-	        typedef  int (func)(int a);
-
-	      This was needed since it seems to be 'illegal' in C++ to
-	      do something like:
-
-	         void *ptr = static_cast<void *>(fptr);
-
-	      and probably, as for member functions, it is not
-	      warrantied that the pointer sizes will match.
-
-	    - Add the #error/#warning directives to swig's cpp.
-
-	    - Add the noblock option for typemaps, which is used as
-              follows: supposed you a typemap, like this
-
-	      
-	      %typemap(in,noblock=1) Hello {			   
-	         ....
-              }
-
-	      then the typemap will be inserted without the block
-	      imposed by the brackets, similar to
-
-	       %typemap(in) Hello "...";
-
-	      So, why you don't just use the quote style?, because:
-	      
-	         1.- The quote style doesn't get preprocessed, for example
-	      
-	              %typemap(in) Hello "$1= SWIG_macro($1);";
-	      
-	             here, SWIG_macro doesn't get expanded
-
-                 2.- Inside a quote typemap, you have to use 
-                     quotes carefully
-
-		      %typemap(in) Hello "$1 = \"hello\" ";
-
-		 3.- You can't make emacs and/or other editors
-		     to indent inside a string!. 
-
-
-	      So, why do you want to remove the block?, because an extra
-	      block when not needed (no local variables in it):
-
-	          1.- makes the code harder to read
-                  2.- makes the code larger
-                  3.- or in short, for the same reason we have the quote style.
-
-Version 1.3.26 (October 9, 2005)
-================================
-
-10/08/2005: wsfulton
-            [Php] Added 'throws' typemaps.
-
-10/08/2005: wsfulton
-            Fixes for languages that don't support multiple inheritance. The
-            first non-ignored class in the public base class list is used for inheritance.
-            by the proxy class. Previously, if the first class in the list was ignored, then
-            the proxy class wouldn't have any base classes.
-
-10/07/2005: mmatus
-	     Update more features to follow new convention, including:
-
-	       callback
-	       ref/unref
-	       except
-	    
-	     All of them use not only the feature as a flag, but also
-	     as code value. To deal with those features, we use now
-	     GetFlagAttr, which is similar to GetFlag, but instead or
-	     returning 1 or 0, it returns the attr value, if happens
-	     to be different of "0" of course.
-
-	     Now there are also more uniform directive names for the 
-	     ones based in features, for example, for the old
-	     %newobject directive now we have tree directives defined:
-	     
-
-	     #define %newobject        %feature("new")
-	     #define %nonewobject      %feature("new","0")
-	     #define %clearnewobject   %feature("new","")
-
-	     and so on for all the other feature directives.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-09/30/2005: wsfulton
-            Subtle change to some features. Previously it was not possible to disable many
-            features once they had been enabled. This was for most features that behave as
-            flags. These features now work as follows:
-
-              %feature("name")              // enables the feature
-              %feature("name", "1")         // enables the feature
-              %feature("name", "0")         // disables the feature
-              %feature("name", "")          // clears the feature
-
-            In fact any non-empty value other than "0" will enable the feature (like C boolean logic).
-            Previously "1", "0" or any other non-empty value would enable the feature and it would
-            only be possible to disable the feature by clearing it (assuming there was no global enable).
-
-            The following features are affected:
-
-              allowexcept
-              compactdefaultargs
-              classic                (Python)
-              cs:const               (C#)
-              director
-              exceptionclass         (Python)
-              ignore
-              immutable
-              java:const             (Java)
-              java:downcast          (Java)
-              kwargs
-              modern                 (Python)
-              new
-              noautodoc              (Python)
-              nodefault
-              nodirector
-              noref
-              notabstract
-              nounref
-              novaluewrapper
-              python:maybecall       (Python)
-              python:nondynamic      (Python)
-              modula3:multiretval    (Modula3)
-              predicate              (Ruby)
-              trackobjects           (Ruby)
-              valuewrapper
-
-            It is now possible, for example to ignore all methods/classes in a header file, except for a
-            few targetted methods, for example:
-
-              %feature("ignore");                                // ignore all methods/classes
-              %feature("ignore","0") some_function(int, double); // do not ignore this function
-              %feature("ignore","0") SomeClass;                  // do not ignore this Class
-              %feature("ignore","0") SomeClass::method;          // do not ignore this method
-              %include "bigheader.h"
-
-            Removed %pythondynamic - it never worked properly. Use %pythonnondynamic instead.
-            Removed %feature("nokwargs") - it wasn't fully implemented  - use %feature("kwargs","0") instead.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-09/25/2005: mkoeppe
-	    [Guile] Add "throws" typemaps.
-
-09/24/2005: cfisavage
-            [Ruby] Adds new %trackobjects functionality that maps C++ objects to
-            Ruby objects.  This functionality makes it much easier to implement
-            mark functions for the garbage collector.  For more information
-            refer to the update documentation and examples.
-            
-09/20/2005: wsfulton
-            [Perl] Patch 1116431 from Josh Cherry. Fixes non member functions inadvertently
-            being called instead of member functions.
-
-09/20/2005: wsfulton
-            [Lua] Patch from Mark Gossage to add support for Lua-5.1, std::string,
-            std::vector, std::exception and documentation.
-
-09/14/2005: mmatus
-	    [Python] Add -nocppcast. Now the default behavior is to
-	    always use the cppcast operators. Before that was the case
-	    only when you used the -cppcast option.
-
-            If this seems to break your code... your welcome!, it
-	    means it was broken before, and you never notice. 
-
-	    If you thing the error is due to one of the SWIG typemaps,
-	    send us an example.
-
-	    Use -nocppcast only with very old C++ compilers that
-	    do not support the cppcast operations. 
-
-	    So, here applies:
-
-		This change doesn't break compatibility, it was broken before.
-
-09/13/2005: wsfulton
-            [Java] Fix for director methods when a class is passed by value as a
-            parameter.
-
-09/11/2005: mmatus
-            Adding the module option to the %import directive. Now you
-            can use it as
-
-	        %import(module="BigModule") foo.i
-
-	    where subfile could (or not) define the module name via
-	    the %module directive. The module option take precedence
-	    and it has the same effects than having the directive 
-
-	        %module BigModule  
-
-	    inside the imported file foo.i.
-
-	    You can use the option in mainly two cases:
-
-	    1.- You used the -module option when you generated the
-                module to be imported, and hence the module name in
-                the imported %module directive is not really useful.
-
-	    2.- The module you want to import is very large, and it
-                has several .i/.h files. Then, if you just one to
-                import a class or so from the module, says 'foo', and
-                not the entire module via importing the main
-                BigModule.i file, then you just do:
-
- 		    %import(module="BigModule") foo.h
-
-   	        or
-		
- 		    %import(module="BigModule") foo.i
-
-		where foo.i contains the 'foo' declaration and maybe a
-		couple of extra %include directives, as needed.
-
-	    
-09/11/2005: mmatus
-	    Fix bug #1282637, about the -module option not having effect
-	    in places where it was needed.
-
-09/11/2005: wsfulton
-            When wrapping variables, ensure that none of the typemaps used for the
-            set wrappers are used when generating the get wrappers. I doubt this was a
-            problem for any languages except for the recently introduced null attribute
-            in the out typemap (C# only).
-
-09/08/2005: wsfulton
-            More descriptive error messages when files fail to open.
-
-09/06/2005: mmatus 
-
-	    Allow a %define a macro inside another %define macro, for example
-
-	      %define hello(name, Type)
-	      %define name ## a(Type)
-	      %typemap(in) Type "hello;";
-	      %enddef
-	      %enddef
-	      
-	    To learn how to use this new features in your own typemaps library, see
-	    python/cstring.i, python/cwstring.i and python/cwstrbase.i.	    
-
-            [Python] Normalize the cstring.i implementation to use fragments, and add
-            cwstring.i, which implements the same typemaps but for wchar_t strings.
-
-	    [Python] Bug fixed: 1247477, 1245591, 1249878 and others.
-
-08/18/2005: wsfulton
-            [Ruby] Implement support for SWIGTYPE* DISOWN typemap (like in Python) for
-            better control of memory management, eg when adding an object created in Ruby
-            to a C++ container. Patch #1261692 from Charlie Savage.
-
-08/18/2005: wsfulton
-            [Tcl] 64 bit platform fixes for the varargs handling in SWIG_GetArgs. This is an
-            improved fix for bug #1011604 as suggested by Jeremy Lin.
-
-08/18/2005: wsfulton
-            [Tcl] Bug #1240469 - %newobject support for Tcl. Patch from Bob Marinier.
-
-08/16/2005: wsfulton
-            [Perl] Bug #1254494 - Fix for global namespace pollution by perl header files
-            (bool define) prevented STL headers from being used on some systems, eg
-            Windows with Visual Studio.
-
-08/16/2005: wsfulton
-            [Java] Bug #1240937 - Redefinition of __int64 typedef for Intel compilers.
-
-08/15/2005: wsfulton
-            [Xml] Bug #1251832 -  C++ template may generate invalid XML file
-
-08/15/2005: wsfulton
-            [Lua] Support added for Lua. Patch #1242772 from Mark Gossage.
-            It supports most C/C++ features (functions, struct, classes, arrays, pointers,
-            exceptions), as well as lots of documentation and a few test cases & examples.
-
-08/14/2005: wsfulton
-            [Xml] Fix incorrect xml escaping in base class name when base class is a template.
-
-08/13/2005: efuzzyone
-	    [CLISP] Added support for handling enums. Does not adds the return type declaration
-	    to the function definition, if a function returns void.
-
-08/09/2005: mkoeppe
-	    New language module, Common Lisp with UFFI, from Utz-Uwe Haus.
-
-08/09/2005: mkoeppe
-	    Fix the Lisp s-expression output module; it no longer complains about "unknown targets".
-
-07/27/2005: wsfulton
-            Modifications to STL wrappers so that it is possible for a user's %exception directive
-            to be applied to the STL wrapper methods. Previously the following global %exception
-            directive would not be used on the wrapper methods:
-
-                %exception { 
-                  try {
-                    $action
-                  } catch (...) {
-                    // handle uncaught exceptions
-                  }
-                }
-
-            This has been implemented by replacing %exception directives for specific STL wrapper
-            methods with an exception specification declared on the wrapper methods. throws typemaps
-            are now supplied for handling the STL exception specification. These can also be easily
-            overridden, for example the std::out_of_range exception, which is used a lot in the STL
-            wrappers, can be customised easily:
-
-              %include "std_vector.i"
-              %typemap(throws) std::out_of_range {
-                // custom exception handler
-              }
-              %template(VectInt) std::vector<int>;
-
-07/22/2005: efuzzyone
-            [CLISP] The clisp module for SWIG:
-              - It can only handle C, clisp currently does not supports ffi bindings to C++.
-              - It has two options, (a) -extern-all this will generate wrappers for all functions
-        	and variablestions, (b) -generate-typedef this will generate wrappers "def-c-type"
-	        wrappers for typedefs
-	      - Can handle pointers to functions, complex types such as n-dimensional arrays of 
-	 	pointers of depth d
-	      - Generates wrappers for constants as well as variables
-	      - Correctly distinguishes between the declaration of variables in structures and functions
-	      - Creates a defpackage "declaration" with the module name as the package name, the created 
-	    	package exports both functions and variables
-	      - tries to guess when should a pointer variable be declared as c-ptr or c-pointer
-
-07/22/2005: wsfulton
-            [C#] Changes to support C# structs returned by value. The changes required are:
-              - Using an optional 'null' attribute in the out typemap. If this attribute is specified,
-                then it is used for the $null special variable substitution.
-              - The ctype used in the C/C++ wrappers is no longer initialised to 0 on declaration.
-            Both of these changes fix the situations where an attempt was made to assign 0 to the
-            returned struct. Marshalling structs as value types still requires user defined typemaps.
-            See documentation for an example.
-
-07/22/2005: wsfulton
-            [C#, Java] Fix SWIG_exception usage to work with compilers that don't support empty macro
-            arguments. Unfortunately this fix will stop usage of SWIG_exception being used within typemaps
-            that use "" or %{ %} delimiters, but continues to work with typemaps using {} delimiters.
-            Please use the SWIG_CSharpSetPendingExceptionArgument or SWIG_JavaThrowException methods instead
-            as SWIG_exception is really intended as a platform independent macro for the SWIG library writers.
-
-07/16/2005: mkoeppe
-	    [Allegro CL] Use specific foreign types rather than (* :void). 
-	    Use *swig-identifier-converter*.
-
-06/27/2005: wsfulton
-            Functions declared as 'extern' no longer have an additional function declaration added to the 
-            wrapper files. There are some cases where SWIG does not get this right, eg bug #1205859 (extern
-            functions with default arguments declared in a namespace). Also SWIG cannot get non-standard
-            calling conventions correct, eg Windows calling conventions are usually handled like this:
-
-              %{
-              #define DLLIMPORT __declspec(dllimport)
-              #define STDCALL __stdcall
-              %}
-              #define DLLIMPORT
-              #define STDCALL
-              %inline %{
-              DLLIMPORT extern STDCALL void function(int);
-              %}
-
-            SWIG incorrectly generates:
-
-            extern void function(int);
-
-            To which there is no solution as SWIG doesn't handle non-standard calling conventions. The extra
-            'extern' function that SWIG generates is superfluous unless a user has forgotten to add the function
-            declaration into the wrappers.
-
-            The -noextern commandline argument is now redundant and a new commandline argument -addextern can
-            be used to obtain the original behaviour. This shouldn't be necessary unless the header file
-            containing the function declaration was inadvertently not added to the wrappers. To fix this
-            add the function declaration into your wrappers, For example, replace:
-
-              extern void foo(int);
-
-            with:
-
-              %inline %{
-              extern void foo(int);
-              %}
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-06/22/2005: wsfulton
-            [C#, Java, Modula3, Ocaml]
-            The intermediary function names have been changed when wrapping variables to
-            match the other language modules so that %extend for a member variable works
-            uniformly across all language modules, eg:
-
-              %extend ExtendMe {
-                Var;
-              };
-
-              %{
-                void ExtendMe_Var_set(ExtendMe *, double) {...}
-                double ExtendMe_Var_get(ExtendMe *) {...}
-              %}
-
-            The methods implementing the get/set used to be:
-
-              %{
-                void set_ExtendMe_Var(ExtendMe *, double) {...}
-                double get_ExtendMe_Var(ExtendMe *) {...}
-              %}
-
-            This also changes the name of variable wrapper functions when using -noproxy.
-            The original names can be generated with the -oldvarnames commandline option.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-Version 1.3.25 (June 11, 2005)
-==============================
-
-06/11/2006: mkoeppe
-	    [Guile] Fix handling of anonymous-enum variables.
-
-06/10/2005: mkoeppe
-	    [Guile] Fix for function arguments that are passed by
-	    copy-of-value.  Fix for global "const char *" variables.
-	    Fix testcases arrays_dimensionless, arrays_global.
-
-06/08/2005: wsfulton
-            Fix for when a base class defines a symbol as a member variable and a derived class defines
-            the same symbol as a member method.
-
-06/08/2005: wsfulton
-            [C#] More fixes for virtual/new/override modifiers - when a method has protected access 
-            in base and public access in derived class.
-
-06/02/2005: wsfulton
-            Fix #1066363 - Follow convention of release tarball name matching directory name.
-
-06/02/2005: wsfulton
-            [C#, Java] Fix #1211353 - typesafe enums (and Java proper enums) wrappers when enum value
-            is negative.
-
-05/27/2005: wsfulton
-            Modernised and tidied up Windows macros --> SWIGEXPORT, SWIGSTDCALL. They can be overridden
-            by users via -D compiler directives if need be.
-
-05/26/2005: wsfulton
-            %csmethodmodifiers can be applied to variables as well as methods now.
-
-            In addition to the default 'public' modifier that SWIG generates, %csmethodmodifiers will also
-            replace the virtual/new/override modifiers that SWIG thinks is appropriate. This feature is
-            useful for some obscure cases where SWIG might get the modifiers incorrect, for example
-            with multiple inheritance and overriding a method in the base class.
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-05/25/2005: wsfulton
-            Added missing constructors to std::pair wrappers (std_pair.i) for all languages.
-
-05/25/2005: wsfulton
-            [C#] Added std::pair wrappers in std_pair.i
-
-05/25/2005: wsfulton
-            [C#] The C# 'new' and 'override' modifiers will be generated when a C++ class inherits methods
-            via a C++ 'using' declaration.
-
-05/25/2005: wsfulton
-            Fix for exception specifications previously being ignored in classes that inherited methods
-            from 'using' declarations, eg calls to Derived::bar below will convert C++ exceptions into
-            a target language exception/error, like it always has done for Base::Bar.
-
-            class Base {
-              virtual bar() throw (std::string);
-            };
-            class Derived : public Base {
-              using Base::bar;
-            };
-
-05/23/2005: wsfulton
-            Fixes for detecting virtual methods in %extend for the -fvirtual option and C# override and new
-            method modifiers.
-
-05/23/2005: wsfulton
-            [C#] The 'new' modifier is now generated on the proxy method when a method in a derived
-            class is not polymorphic and the same method exists in the derived class (ie it hides
-            the base class' non-virtual method).
-
-05/23/2005: wsfulton
-            [Java, C#] Fixes to detection of covariant return types - when the class hierarchy is more
-            than 2 classes deep.
-
-05/21/2005: wsfulton
-            [Java] std::wstring typemaps moved from std_string.i to std_wstring.i
-
-05/21/2005: wsfulton
-            Fix for crash in DohStrstr, bug #1190921
-
-05/21/2005: wsfulton
-            [TCL] Fix for methods with similar names when showing list of names on error - bug #1191828.
-            Patch from Jeroen Dobbelaere.
-
-05/21/2005: wsfulton
-            [TCL] long long overloading fix - bug #1191835, patch from Jeroen Dobbelaere.
-
-05/21/2005: wsfulton
-            Fix bug #1196755 to remove debug from swigtcl8.swg.
-
-05/19/2005: wsfulton
-            [C# and -fvirtual option] Fix for the override key not being generated in the derived class when a
-            virtual method's return type was a typedef in either the base or derived class. Also ensures the
-            method is eliminated when using the -fvirtual option. For example, Derived.method now has the C#
-            override keyword generated:
-
-              typedef int* IntegerPtr;
-
-              struct Base {
-                virtual IntegerPtr method();
-              };
-
-              struct Derived : Base {
-                int * method() const;
-              };
-
-            [C#] Fix for the override key being incorrectly generated for virtual methods when a base class
-            is ignored with %ignore.
-
-05/13/2005: wsfulton
-            [Java] Fixes to remove "dereferencing type-punned pointer will break strict-aliasing rules"
-            warnings in C wrappers when compiling C code with 'gcc -Wall -fstrict-aliasing'. Patch from
-            Michael Cahill. This modifies many of the casts slightly, for example
-              arg1 = *(DB_ENV **)&jarg1;
-            to
-              arg1 = *(DB_ENV **)(void *)&jarg1;
-
-05/12/2005: wsfulton
-            [C#] Support for C# attributes. C# attributes can be generated:
-            1) On a C/C++ type basis by specifying an inattributes and/or outattributes typemap attribute
-               in the imtype or cstype typemaps (for C# return type or C# parameter type attributes).
-            2) On a wrapped method or variable by specifying a csattributes feature (%feature).
-            3) On a wrapped proxy class or enum by specifying a csattributes typemap.
-
-            Examples are in the C# documentation (CSharp.html).
-
-04/29/2005: wsfulton
-            New configure option to turn off the default maximum compiler warning as
-            they couldn't be removed even when overriding CFLAGS and CXXFLAGS with configure
-            (./configure CFLAGS= CXXFLAGS=). To turn the maximum warnings off, run:  
-
-              ./configure --without-maximum-compile-warnings
-
-04/28/2005: wsfulton
-            Patch from Scott Michel which reworks the Java constructor and finalize/destructor typemaps,
-            for directors to reduce the number of overall Java typemaps. Added the director_take and 
-            director_release typemaps to emulate other modules' __disown__ functionality.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA DIRECTORS ***
-
-04/28/2005: wsfulton
-            [C#] Fixed problems due to the over eager garbage collector. Occasionally the
-            garbage collector would collect a C# proxy class instance while it was being used
-            in unmanaged code if the object was passed as a parameter to a wrapped function.
-            Needless to say this caused havoc as the C# proxy class calls the C++ destructor
-            when it is collected. Proxy classes and type wrapper classes now use a HandleRef,
-            which holds an IntPtr, instead of a plain IntPtr to marshal the C++ pointer to unmanaged
-            code. There doesn't appear to be any performance degradation as a result of this
-            modification.
-
-            The changes are in the proxy and type wrapper classes. The swigCPtr is now of type HandleRef
-            instead of IntPtr and consequently the getCPtr method return type has also changed. The net
-            effect is that any custom written typemaps might have to be modified to suite. Affected users
-            should note that the implementation uses the new 'out' attribute in the imtype typemap as the
-            input type is now a HandleRef and the output type is still an IntPtr.
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-04/28/2005: wsfulton
-            [C#] Support for asymmetric type marshalling added. Sometimes the output type needs to be
-            different to the input type. Support for this comes in the form of a new optional 'out'
-            attribute for the ctype, imtype and cstype typemaps. If this typemap attribute is not
-            specified, then the type used for both input and output is the type specified in the
-            typemap, as has always previously been the case. If this typemap attribute is specified,
-            then the type specified in the attribute is used for output types and the type specified
-            in the typemap itself is used for the input type. An output type is a return value from
-            a wrapped method or wrapped constant and an input type is a parameter in a wrapped method.
-
-            An example shows that char * could be marshalled in different ways, 
-
-              %typemap(imtype, out="IntPtr") char * "string"
-              char * function(char *);
-
-            The output type is thus IntPtr and the input type is string. The resulting intermediary C# code is:
-
-              public static extern IntPtr function(string jarg1);
-
-04/22/2005: mkoeppe (Matthias Koeppe)
-	    [Guile] Fix generation of "define-method" for methods of
-	    classes with a constructor.  Reported by Luigi Ballabio.
-
-04/15/2005: wuzzeb (John Lenz)
-	    [Chicken]
-	    For wrapped functions that return multiple values (using argout),
-	    SWIG CHICKEN now returns them as multiple values instead of as
-	    a list.  They can then be accessed using (call-with-values).
-
-04/14/2005: wuzzeb (John Lenz)
-            [Chicken]
-            + Added a whole bunch of new _runme scripts into the chicken test
-            suite.  Also fix some bugs these new scripts turned up.
-
-            + Added optimization when returning a wrapped proxy class.  Before,
-            a minor garbage collection was invoked every time a function returned.
-
-	    + All the chicken Examples should now run correctly
-
-04/14/2005: wsfulton
-            [C#] More fixes for typemap matching when wrapping variables, in particular
-            std::string, so that std::string variables can be easily marshalled with
-            a C# string property using:
-
-              %include "std_string.i"
-              %apply const std::string & { std::string *variable_name };
-              std::string variable_name;
-
-            (Recall that all class variables are wrapped using pointers)
-
-04/05/2005: wuzzeb (John Lenz)
-	    [Chicken]
-	    + Added Examples/chicken/egg, an example on how to build a chicken
-	      extension library in the form of an egg.  Also updated the
-	      documentation on the different linking options.
-
-	    + chicken test-suite now has support to check SWIG with the -proxy
-	      argument if there exists a _proxy_runme.ss file.
-
-	    + More fixes for overloaded functions and -proxy
-
-03/31/2005: wsfulton
-            Turned on extra template features for all languages which were
-            previously only available to Python.
-
-            This enables typemaps defined within a templated class to be used as
-            expected. Requires %template on the templated class, %template() will
-            also pick up the typemaps. Example:
-
-              template <typename T> struct Foo {
-                ...
-                %typemap(in) Foo "in typemap for Foo<T> "
-                or
-                %typemap(in) Foo<T> "in typemap for Foo<T> "
-              };
-              
-              %template(Foo_i) Foo<int>;
-              %template() Foo<double>;
-              
-            will generate the proper 'in' typemaps wherever Foo<int> and Foo<double>
-            are used.
-
-03/30/2005: mkoeppe (Matthias Koeppe)
-	    [MzScheme] Patch from Hans Oesterholt for supporting MzScheme 30x.
-
-03/29/2005: wuzzeb (John Lenz)
-	    [Chicken]
-	    + Reallow older versions of chicken (1.40 to 1.89) by passing -nocollection
-	      argument to SWIG
-	    + %import now works correctly with tinyclos.  (declare (uses ...)) will be
-	      exported correctly.
-	    + TinyCLOS proxy classes now work correctly with overloaded functions
-	      and constructors.
-
-03/29/2005: wsfulton
-            [Java] Patch from Scott Michel for directorout typemaps. Java directors
-            require the directorout typemaps like the other languages now. The new
-            typemaps provide fixes for methods where the return type is returned
-            by reference (this cannot automatically be made thread safe though).
-
-03/22/2005: wsfulton
-            Enum casting fixes. Visual C++ didn't like the C type casting SWIG produced
-            when wrapping C++ enum references, as reported by Admire Kandawasvika.
-
-03/21/2005: wsfulton
-            [Perl] SF #1124490. Fix Perl macro clashes when using Visual Studio's STL string,
-            so now projects can #include <string>.
-
-03/21/2005: wsfulton
-            Fixed %varargs which got broken with the recent default argument changes.
-            Also works for Java and C# for the first time now.
-
-03/17/2005: wuzzeb (John Lenz)
-            [Chicken] 
-	    + Fix a whole bunch of bugs in the chicken module.  The entire
-              test suite now compiles, with the exception of the tests that require
-	      std_vector.i, std_deque.i, and so on, which chicken does not have yet.
-
-	    + Add support for %exception and %typemap(exceptions).  Exceptions are
-	      thrown with a call to (abort) and can be handled by (handle-exceptions)
-
-03/15/2005: wsfulton
-            [Java] Patch from Scott Michel for directors. Modifications to the typemaps
-            giving users fine control over memory ownership and lifetime of director classes.
-            Director classes no longer live forever by default as they are now collectable
-            by the GC.
-
-03/15/2005: wuzzeb (John Lenz)
-	    [Chicken] Add support for adding finalizers garbage collected objects.
-	    Functions that return new objects should be marked with %newobject and
-	    input arguments which consume (or take ownership) of a pointer should
-	    be marked with the DISOWN typemap.
-
-	    Also add support for correctly checking the number of arguments passed
-	    to a function, and raising an error if the wrong number are passed.
-
-03/14/2005: wuzzeb (John Lenz)
-            Add --without-alllang option to configure.in, which is the same as
-            passing all the --without-python --without-perl5 etc... that Matthias added.
-
-03/09/2005: wsfulton
-            [Php] Memory leak fix for functions returning classes/structs by value.
-
-03/08/2005: wsfulton
-            [Perl] Fix for Perl incorrectly taking memory ownership for return types that
-            are typedefs to a struct/class pointer. Reported by Josh Cherry.
-
-03/07/2005: wsfulton
-            [C#] Various exception changes for the std::vector wrappers. These now more
-            accurately mirror the same exceptions that System.Collections.ArrayList throw.
-
-03/07/2005: wsfulton
-            [C#] Fix undefined behaviour after any of the std::vector methods
-            throw an exception.
-
-03/07/2005: wsfulton
-            [C#] When null is passed for a C++ reference or value parameter, the 
-            exception thrown has been corrected to an ArgumentNullException instead
-            of NullReferenceException as recommended in the .NET Framework documentation.
-
-            The default throws typemaps turn a C++ exception into an ApplicationException,
-            not a SystemException now.
-
-03/07/2005: wsfulton
-            [C#] Numerous changes in C# exception handling have been made over the past
-            few weeks. A summary follows:
-
-            The way in which C++ exceptions are mapped to C# exceptions is quite different.
-            The change is to fix C# exceptions so that the C++ exception stack is correctly
-            unwound as previously C++ exceptions were being thrown across the C PInvoke layer
-            into the managed world.
-
-            New typemap attributes (canthrow and excode) have been introduced to control the
-            mapping of C++ to C# exceptions. Essentially a callback into the unmanaged world
-            is made to set a pending exception. The exception to throw is stored in thread local
-            storage (so the approach is thread-safe). The typemaps are expected to return
-            from unmanaged code as soon as the pending exception is set. Any pending exceptions
-            are checked for and thrown once managed code starts executing. There should
-            be minimal impact on execution speed during normal behaviour. Full details will be
-            documented in CSharp.html.
-
-            The SWIG_CSharpThrowException() function has been removed and replaced with the
-            SWIG_CSharpSetPendingExceptionArgument() and SWIG_CSharpSetPendingException()
-            functions. The original name has been deliberately changed to break old code as
-            the old approach was somewhat flawed. Any user defined exceptions that follow the
-            same pattern as the old approach should also be fixed.
-
-            Numerous new .NET framework exceptions are now available for easy throwing from 
-            unmanaged code. The complete list is: 
-
-              ApplicationException, ArithmeticException, DivideByZeroException, 
-              IndexOutOfRangeException, InvalidOperationException, IOException, 
-              NullReferenceException, OutOfMemoryException, OverflowException, 
-              SystemException, ArgumentException, ArgumentNullException and
-              ArgumentOutOfRangeException.
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-05/05/2005: mmatus
-	    
-	    Fix several memory leaks around. Even when we survive  knowning
-	    swig is a memory leak factory, it was a little out of
-	    control. To run std_containers.i in the python test-suite,
-	    swig was using ~260MB, now it uses 'only' ~40MB, which is
-	    the same ammount that g++ uses, so, is not that bad.
-	    In the process, I found a couple of extra Deletes, which
-	    in some cases could trigger seg. faults and/or
-	    DOH/asserts.
-	    
-	    [python] Better support for directors + exception. More
-	    verbose errors and added an unexpected exception handler.
-
-	    [python] Fix memory leak for the
-
-	    	    std::vector<std::vector<int> > 
-
-	    case,reported by Bo Peng.
-
-	    [python] Fix SwigPyObject compare problem reporte by
-	    Cameron Patrick. 
-
-	    [python] Fix several warnings in the generated code 
-	    for gnu-gcc, Intel and VC7.1  compilers.
-
-
-02/25/2005: wuzzeb (John Lenz)
-	    Update documentation to use CSS and <div> instead of <blockquote>
-	    I used a script to convert the docs, and it set all the box classes
-	    to be "code".  There are actually 4 different classes,
-	    "shell", "code", "targetlang", and "diagram".  We need to go through
-	    and convert the divs depending on what they contain.
-
-02/23/2005: mmatus
-
-	    [Python] Added option -nortti to disable the use of native
-	    C++ RTTI with directors (dynamic_cast<> is not used).
-
-	    Add more code for directors to detect and report errors in
-	    the python side.
-
-	    Extend the use of SWIGINTERN whenever is possible.
-
-	    Remove template warnings reported by VC7.1.
-
-	    Remove warnings reported by gcc/g++. Finally you can
-	    compile using
-
-	       g++ -W -Wall -c mymodule_wrap.cxx
-
-	    and no spurious errors will be generated in the wrapper
-	    code.
-
-02/23/2005: wuzzeb (John Lenz)
-	    Added -external-runtime argument.  This argument is used to dump
-	    out all the code needed for external access to the runtime system,
-	    and it replaces including the files directly.  This change adds
-	    two new virtual functions to the Language class, which are used
-	    to find the language specific runtime code.  I also updated
-	    all languages that use the runtime to implement these two functions.
-
-02/22/2005: mmatus 
-	    Fix %template + private error SF#1099976.
-
-02/21/2005: mmatus 
-
-	    Fix swigrun.swg warnings reported when using "gcc -W -Wall"
-	    (static/inline not used in front of a function
-	    declaration), and add SWIGUNUSED attribute to avoid
-	    unused warnings elsewhere.
-
-	    Fix unused variable warnings.
-
-	    [Python] Use new SWIGUNUSED attribute to avoid warnings in
-	    SWIGINTERN methods.
-
-	    [Python] Fix PyOS_snprintf for python versions < 2.2 (SF #1104919).
-
-	    [Python] Fix map/multimap to allow empty maps (reported by
-  	    Philippe Hetroy).
-
-	    [Docs] Add some documentation to Python.html and
-	    SWIGPlus.html, including for example the fact that
-	    'friends' are now supported.
-
-02/21/2005: wsfulton
-            [PHP] Patch from Olly Betts, so that wrappers compile with Zend thread safety enabled.
-
-02/17/2005: wsfulton
-            Memory leak fix in some of the scripting language modules when using default
-            arguments in constructors. The scripting language was not taking ownership of the
-            C++ object memory when any of the constructors that use default arguments was called.
-
-02/16/2005: wsfulton
-            SF #1115055: Failed make install. Patch from Rob Stone.
-
-02/16/2005: wsfulton
-            [Java] SF #1123416 from Paul Moore. Correct memory allocation for STRINGARRAY
-            typemaps in various.i.
-
-02/15/2005: wsfulton
-            Disabled typemap search changes for now (see entry 19/12/2004). It breaks
-            old typemaps, lengthens the execution time by about 25% and introduces
-            inconsistencies.
-
-02/15/2005: wsfulton
-            swig -help follows other software by printing to stdout instead of stderr now.
-            swig -version also displays to stdout instead of stderr now.
-            Behaviour reported by Torsten Landschoff.
-
-02/15/2005: wsfulton
-            [Ruby] Fix for the less commonly used ordering of %include and #include, so
-            that the generated code compiles. Bug reported by reported by Max Bowsher.
-              %include foo.h
-              %{
-              #include foo.h
-              %} 
-
-02/15/2005: wsfulton
-            [C#, Java] SWIG_exception macro will now return from unmanaged code / native code
-            as soon as it is called. Fixes possible JVM crashes and other code unexpectedly
-            being executed. Note SWIG_exception is only occasionally used by SWIG library
-            writers, and is best avoided by SWIG users.
-
-02/15/2005: wsfulton
-            [C#, Java] Typemaps can now be targeted at global variable names
-            and static member variable names. Previously the typemaps for 
-            the setters were ignored, for example:
-
-              %typemap(in) int globalint "..."
-              int globalint;
-
-02/13/2005: mkoeppe (Matthias Koeppe)
-	    [Guile] Add %typecheck for SWIGTYPE, add %typecheck for ptrdiff_t, fix
-	    typemaps for size_t.
-
-	    [Pike] Merge patch from Torsten Landschoff for improved Pike configuration.
-
-02/12/2005: mkoeppe (Matthias Koeppe)
-	    New configure switches --without-tcl, --without-python etc. allow to
-            disable the search for installed languages.
-
-01/31/2005: wuzzeb (John Lenz)
-            - Add DohSortList to DOH
-	    
-	    - Improve the runtime type system:
-               + Speed. Type loading is now O(n log n) instead of O(N^2), which
-	         for large modules is a huge improvement.
-               + A whole bunch of functions in swigrun.swg no longer need the 
-                 swig_type_list_handle passed to them.  The only one left is 
-		 TypeQuery.  This also makes runtime.swg a lot smaller.
-	       + Split up swig_type_info structure into two structures
-	         (swig_type_info and swig_cast_info)
-	       + Store a pointer to a swig_type_info rather than just the type
-	         name string in the linked list of casts. First off, this makes
-	         the guile module a little faster, and second, the
-	         SWIG_TypeClientData() function is faster too. 
-	       + Add the idea of a module into the type system.  Before, all the
-	         types were stored in one huge linked list. Now, another level is
-	         added, and the type system stores a linked list of modules, each
-	         of which stores an array of types associated with it.
-	       + For more information of how the runtime type system now works,
-	         please see Doc/Manual/typemaps.html and Doc/Devel/runtime.txt
-		 
-	    - Update all language modules to use the new type system.  The changes
-	      to each language module are minor.  All languages are now able to
-	      use runtime.swg for external access to the type system.  Before
-	      only python and perl did.
-
-	    - [guile, mzscheme, ocaml, and php4]  These languages opened up the
-	      init function inside the .cxx code, and any code in the .swg files
-	      in the init section was inside this function.  This was a problem
-	      for swiginit.swg, which needs to be inserted before the SWIG_init
-	      function is opened.  Thus I changed these languages to be like
-	      python or perl, where the init function is declared in the .swg
-	      file.
-	      
-	    - [Ruby] Instead of moving the init function to the .swg file, I
-	      added a new section initbeforefunc, and then added
-	      %insert(initbeforefunc) "swiginit.swg"
-
-	    - [MzScheme] Fix enums and fix Examples/Makefile.in so that if
-	      multiple -I arguments are specified in the INCLUDES variable, each
-	      gets a ++ccf.
-
-	    - [Guile GH] Update Guile GH to use the new type system.  See
-	      Doc/Manual/Guile.html for how smobs are now used.
-
-01/11/2005: wsfulton
-            [C#] New typemap called 'csconstruct'. The code in this typemaps was previously hard
-            coded and could not be customised by a user. This typemap contains the code that is
-            generated into a proxy class's constructor.
-
-            [Java] New typemap called 'javaconstruct'. The code in this typemaps was previously hard
-            coded and could not be customised by a user. This typemap contains the code that is
-            generated into a proxy class's constructor. Another typemap named 'javaconstruct_director'
-            is used instead when the proxy class is a director class.
-
-            [C#, Java] If a C++ class did not have a default constructor, a protected default constructor
-            was automatically generated by SWIG. This seems is unnecessary and has been removed
-            and thereby giving the user almost complete control over the generated code along with the
-            new typemaps above.
-
-19/12/2004: mmatus
-            [Disabled, see entry 02/15/2004]
-            - Fix typemap search, now the "out" typemap search is done as follows
-
-                 int *Foo::foo(int bar)   ->  int *Foo::foo(int bar)
-                                          ->  int *Foo::foo
-                                          ->  int *foo(int bar)
-                                          ->  int *foo
-                                          ->  int *
-
-               then, now you can be more specific, and define
-
-              /* apply only for  'Foo::foo' method */
-              %typemap(out) int * Foo::foo(int *bar) ...; 
-
-              /* apply for all 'foo' functions/methods */
-              %typemap(out) int * foo(int *bar) ...; 
-
-              %inline {
-                struct Foo {
-                   int *foo(int *bar);
-                };
-              }
-	  
-
-15/12/2004: mmatus
-            - More fixes for templates and template default args.
-              See template_default.i for scary cases that now are 
-              supported, besides the already ugly STL/std cases.
-              
-            - Cosmetics and more use of 'const' where it was implicit.
-            - Other fixes for OSS, which is now working again with 1.3.25.
-	
-Version 1.3.24 (December 14, 2004)
-==================================
-
-12/12/2004: wuzzeb (John Lenz)
-            [Chicken] Fix a bunch of bugs relating to -proxy support
-	      + non-class variables now export properly using -proxy
-	      + static member functions now export properly using -proxy
-	      + member class variables now export properly using -proxy
-	      + added a -nounit argument, which does not export the (declare (unit ...))
-	      + correctly install swigclosprefix.scm
-	      + constants (enums, defines) now correcly export when using -proxy
-
-12/11/2004: wsfulton
-            configure fix for when more than one version of jni_md.h is found
-            in the Java include directory (was generating lots of sed error
-            messages).
-
-12/08/2004: wsfulton
-            [Java] Fixes to arrays_java.i so that one can apply the array
-            typemaps to functions taking pointers as input, eg
-
-                %include "arrays_java.i"
-                %apply int[] {int*};
-                void foo(int *a);
-
-12/05/2004: wsfulton
-            [Java] Director mods contributed by Scott Michel. New typemaps
-            directordisconnect and directordisconnect_derived for the 
-            swigDirectorDisconnect() method. Also fix to get the javapackage
-            typemap working again.
-
-12/05/2004: mmatus
-	    - Finishing the fixes for templates + default template
-	      args + specializations.
-
-            - [Python] Now we use the new templates + default template
-	      args in the std/STL library. That means the internal
-	      swig files are getting uglier since we now support the
-	      original declarations:
-
-	        template<class _Tp, class _Alloc = std::allocator< _Tp > >
-		class vector {
-		....
-		};
-	      	     
-                template<class _Key, class _Tp, class _Compare = std::less<_Key >,
-	        class _Alloc = std::allocator<std::pair<const _Key, _Tp > > >
-                class map {
-		....
-		};
- 
-              and the user can use the %template directive as
-
-	        %template() std::vector<int>;
-	        %template() std::vector<int, std::allocator<int> >;
-	        %template() std::vector<int, MyAllocator<int> >;
-
-              Now we are closer to the cleaning/rewriting of the
-	      python std/STL support, such that we recover support for
-	      MSVC++ 6.0, and we can add support for other languages
-	      too.
-
-
-12/02/2004: wsfulton
-            [Java] Fix for directors when wrapping methods using a member enum
-            and typesafe/proper enums enabled.
-
-12/01/2004: mmatus
-	    - Fix typemaps to work with templates and default template
-	      args, ie
-
-	       template <class A, class B = int>
-               struct Foo {
-	       };
-
-	       %typemap(in) Foo<int> *{...}
-	       %typemap(out) Foo<int,int> *{...}
-
-	       Foo<int> * foo( Foo<int> *f1, Foo<int,int> *f2);
-
-	      now 'f1', 'f2' and the return value resolve the provided
-	      typemaps properly.
-
-	      This is highly needed for proper STL support, see new 
-	      std_basic_string.i, std_sstream.i, etc.
-
-	    - Added std_sstream.i, and fix std_basic_string.i to use
-	      the new typemaps + template def. arg mechanism. Also,
-	      added the needed std_alloc.i. Now, all the containers
-	      can be modified to support std::allocator, like in:
-	      
-	        template<class T, class A = std::allocator<T > >
-		class vector {
-		public:
-		....
-		};
-	      
-	      This change is only completed by now for basic_string.
-
-	    - Fix for smart pointers + members + extensions:
-
-	      %extend Foo {
-	        int extension(int i, int j) { return i; }
-		int extension() { return 1; }
-	      }
-
-	      %inline %{
-
-	      class Foo {
-	      public:
-		int y;
-		static const int z;
-	      };
-  
-	      class Bar {
-	        Foo *f;
-	      public:
-	        Bar(Foo *f) : f(f) { }
-		Foo *operator->() {
-		  return f;
-		}
-	      };
-
-	      now you can 
-	     
-	      f = Foo()
-	      f.y = 3
-	      a = f.z
-	      f->extension()
- 
-	      b = Bar(f)
-	      b.y = 3
-	      a = b.z
-	      b->extension()
-
-	    - Other small errors fixes, mostly python.
-
-11/25/2004: wsfulton
-            [Java] Numerous director bug fixes so that the correct java types
-            and canonicalized types in the JNI code are emitted. Use of the
-            $javaclassname special variables in the director typemaps now
-            consistent with the non-director typemaps. The types used for 
-            typemap lookups are also corrected in a few places. If you 
-            previously had your own director typemaps, ensure they are using the
-            correct C++ type.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA DIRECTORS ***
-
-11/25/2004: wsfulton
-            const enum SWIGTYPE & typemaps added. These wrap const enum references
-            as if they were passed by value. Const enum references thus work the
-            same as const reference primitive types such as const double &, 
-            const int & etc. Typemaps added for Java, C#, Ruby, Tcl, Perl and Pike.
-
-11/25/2004: wsfulton
-            [Java, C#] New special variable: $*javaclassname, similar to $javaclassname
-            and $&javaclassname. The new one removes a pointer from the C type before
-            obtaining the Java class name. One or more of $javaclassname,
-            $&javaclassname or $*javaclassname may now appear in a typemap. Likewise for
-            C# using csclassname instead of javaclassname.
-
-11/25/2004: wsfulton
-            The last vestiges of enums being handled as integers removed from the
-            internals. The wrapper methods use the enum type rather than an int
-            now. The net result is added type safety for enums when handled as
-            pointers, references etc. Previously in situations such as a method
-            taking a pointer to an enum, a pointer to an int or a pointer to an
-            enum of some other type could inadvertantly be passed to the method.
-            This is now fixed as the descriptor for an enum is no longer based on
-            an int, but the enum type instead. Anonymous enums are still handled
-            as integers.
-
-            The consequence for scripting language users in correct usage of enums
-            should not be noticeable. There is no change for any of the languages
-            where enums are passed by value - most of the scripting languages will
-            still accept an integer for an enum value and the strongly typed
-            languages still use either typesafe enums, integers or proper enums
-            depending on what the user configures. For Java and C# users a change
-            in the typewrapper class name has occurred (for enum pointers,
-            references etc). For example:
-
-              enum Numbers { one=1, two };
-              enum Numbers* number();
-
-            In Java and C# this must now be coded as
-
-              SWIGTYPE_p_Numbers n = modulename.number();
-
-            rather than
-
-              SWIGTYPE_p_int n = modulename.number();
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-11/21/2004: wsfulton/mmatus
-            Added missing deprecated warning for %name and remove remaining %name
-            usage in the SWIG libraries.
-
-11/21/04: mmatus
-	    - [Python] Adding the PySwigObject to be used for carrying
-	      the instance C/C++ pointers. This is used instead of
-	      string and PyCObjects.
-
-	      The new PySwigObject is even safer than PyCObject, and
-	      more friendly than plain strings:
-
-	      now you can do
-
-	        print a.this
-		<Swig Object at _00691608_p_A>
-
-		print str(a.this)
-		_00691608_p_A
-
-		print long(a.this)
-		135686400
-
-		print "%s 0x%x" % (a.this, a.this)
-		_00691608_p_A 0x8166900
-
-	      the last one is very useful when debugging the C/C++
-	      side, since is the pointer value you will usually get
-	      from the debugger.
-
-	      Also, if you have some old code that uses the string
-	      representation "_00691608_p_A", you can use it now again
-	      using 'str(ptr)', or by calling 'str = PyObject_Str(obj)'
-	      in the C/C++ side.
- 
-	      This change is mainly for nostalgic swig users that miss
-	      the string representation, but also allows to say again
-
-	        if a.this == b.this:
-		  return "a is b"
-
-	      and well, since the change were really simple, maybe in
-	      the future we will be able to do
-   
-		next = a.this + 1
-
-	      or add native python iteration over native C/C++ arrays,
-	      ie, no need to create/copy new tuples when returning and
-	      array or vector.
-
-	      Also, a PySwigPacked object was adding to carry a member
-	      method pointer, but this is probably a temporal solution
-	      until a more general object for methods is added.
-
-	      Be aware that to simplify maintaining and compatibility
-	      with other tools, the old string and PyCObjects
-	      representation could disappear very soon, and the
-	      SWIG_COBJECTS_TYPES or SWIG_NO_OBJECT_TYPES macros will
-	      have no effect at compilation time. Still, the three
-	      mechanisms are present in the code just for testing,
-	      debugging and comparison purposes.
-	      
-11/21/04: mmatus
-
-	    - [Python] Adding back support for using the swig runtime code
-	      inside the user code. We just allow the user to include
-	      the minimal code needed to implement the runtime
-	      mechanism statically, just as in done in the swig
-	      modules.
-	      
-	      To use the swig runtime code, for example with python,
-	      the user needs include the following:
- 
-               #include <Python.h>         // or using your favorite language
-               #include <swigrun.swg>
-               #include <python/pyrun.swg> // or using your favorite language
-               #include <runtime.swg>
-
-	      the files swigrun.swg, pyrun.swg and runtime.swg can 
-	      be checked out by using swig -co, or they can simply 
-	      be found by adding the swig lib directory to the
-	      compiler include directory list, for example
-
-	       SWIGLIB=`swig -swiglib`
-	       c++ -I${SWIGLIB} ..
-
-	      of better, using the CPPFLAGS, but that depends on your
-	      environment.
-	       
-	      This change can be ported to the other languages too,
-	      you just need to isolate the needed runtime code in
-	      a single file like 'pyrun.swg', and provide the 
-	      SWIG_Runtime_GetTypeList() method. Look at the
-	      Lib/python/pyrun.swg file and the Examples/python/swigrun
-	      example.
-
-11/15/04: mmatus
-	    - Fix mixed_types.i + gcc-3.4, ie, arrays + references +
-	      typedefs
-
-	    - Fix multidim arrays + typedefs,ie
-
-	       typedef char character[1];
-	       typedef character word[64];
-
-	    - Process protected/private bases in the same way before
-	      we process protected/private members, ie, we check
-	      for constructors, operator new, virtual members, etc.
-   
-	    - Fix Ruby/Java to work (or ignore) multi-inheritance +
-              directors. Allow other languages to define if it is
-              supported or not.
-	    
-	    - Now you can run
-
-                SWIG_FEATURES="-directors -dirprot" 
-                make check-ruby-test-suite
-                make check-python-test-suite
-                make check-java-test-suite
-                make check-ocaml-test-suite
-
-	      and you will get only 'real' errors. ruby and python
-	      compile with no errors, java shows some problems.	
-
-Version 1.3.23 (November 11, 2004)
-==================================
-
-11/05/2004: wsfulton
-            Patch #982753 from Fabrice Salvaire: Adds dependencies generation for
-            constructing makefiles. New command line options -MF -MD -MMD to work
-            with the current options -M and -MM. These options are named the same
-            and work the same as in gcc.
-
-11/05/2004: wsfulton
-            %ignore/%rename changes for methods with default arguments to mirror
-            %feature behaviour. See previous entry.
-
-                      *** POTENTIAL INCOMPATIBILITY ***
-
-11/04/2004: wsfulton
-            %feature improvements for fine tuning when wrapping methods with
-            default arguments. Any %feature targeting a method with default arguments
-            will apply to all the extra overloaded methods that SWIG generates if the
-            default arguments are specified in the feature. If the default arguments are
-            not specified in the feature, then the feature will match that exact
-            wrapper method only and not the extra overloaded methods that SWIG generates.
-            For example:
-
-              %feature("except") hello(int i=0, double d=0.0);
-              void hello(int i=0, double d=0.0);
-
-           will apply the feature to all three wrapper methods, that is:
-
-              void hello(int i, double d);
-              void hello(int i);
-              void hello();
-
-           If the default arguments are not specified in the feature:
-
-              %feature("except") hello(int i, double d);
-              void hello(int i=0, double d=0.0);
-
-           then the feature will only apply to this wrapper method:
-
-              void hello(int i, double d);
-
-           and not these wrapper methods:
-
-              void hello(int i);
-              void hello();
-
-           This has been introduced to make %feature more powerful to ease the migration
-           to new default arguments wrapping approach.
-
-                      *** POTENTIAL INCOMPATIBILITY ***
-
-           If you previously had a %feature and didn't specify the default arguments,
-           you will have to add them in now or you can obtain the original behaviour
-           by using %feature("compactdefaultargs").
-
-11/04/2004: wsfulton
-            [C#] Typemaps for std::vector added into std_vector.i. The proxy classes
-            generated are modelled on the .NET ArrayList class. This isn't quite
-            ready for general consumption yet, but will work with vectors of primitive
-            types and some classes.
-
-10/3/2004: wuzzeb (John Lenz)
-            [GUILE] The -scm interface is now the default.  The old GH interface can
-	    still be enabled by passing -gh to SWIG.
-
-10/2/2004: mmatus
-
-	    - More fixes for namespace + class declarations.
-	      As an extra bonus, we get %template support for static/members class
-	      methods, ie, now you can say:
-
-	        namespace space {
-                 struct A			    
-	         {				    
-	           template <class Y>	    
-	           static void fooT(Y y) { }
-	         };	
-		}			    
-	      	      			    
-	        struct B			    
-	        {				    
-	          template <class Y>		    
-	          void barT(Y y) {} 
-	        };                           
-
-		%template(foo) space::A::fooT<double>;
-		%template(foo) space::A::fooT<int>;
-		%template(foo) space::A::fooT<char>;
-                                                                                
-		%template(bar) B::barT<double>;
-		%template(bar) B::barT<int>;
-		%template(bar) B::barT<char>;
-
-	      and call
-
-	        A.foo(1)
-		b = B()
-		b.bar(1)
-	      
-	      note the methods are emitted inside the classes,
-	      and hence, the %template name refers to the 'member'
-	      method name, not a global namespace name.
-
-10/31/2004: mmatus
-	    - Solve namespace + class declarations, as in
-
-	       namespace foo {
-                 struct Bar;
-		 struct Foo {
-                 };
-               }
-
-               struct foo::Bar : Foo {
-               };
-
-	       see namespace_class.i for more examples.
-
-            - Fix %template directive to properly use namespaces,
-              including the case:
-
-		   namespace one
-		   {
-		       template <typename T>
-		       struct Ptr {};
-                   }
-
-		   namespace one
-		   {		  
-		       struct Obj1 {};
-		       typedef Ptr<Obj1> Obj1_ptr;
-  		       %template(Obj1_ptr) Ptr<Obj1>; 
-		   }				  
-		   				  
-		   namespace two  
-		   {
-		       struct Obj2 {};	
-		       typedef one::Ptr<Obj2> Obj2_ptr;
-		       %template(Obj2_ptr) one::Ptr<Obj2>;
-		   }
-
-	      this is done by using the namespace name 'one' to create
-              a namespace node to emit the template instantiation,
-              just as before, but the template parameters are resolved
-              and qualified in the current namespace ('one' or 'two').
-              This is same way that typedef works. 
-
-	      This resolve the smart_pointer_namespace2.i case, and at
-              the same time, several other ones where before swig was
-              generating the
-
-	        "Can't instantiate template 'xx' inside namespace 'yy'"
-	      
-	      error message. In fact, that error doesn't exist
-	      anymore. You can only get an error if you use a bad
-	      namespace name or so.
-
-10/30/2004: mmatus
-	    - [ruby] Directors fixes:
-	      - enums and std::strings are working now (several
-	        reports in bug track system)
-	      - added patch 1025861 for director + exceptions
-		
-              *** Attention ***: ruby with directors + protected
-              members work with version 1.7+. Older versions seems to
-              have a broken signature for'rb_protect'.
-		
-	      If you need to use an old version, look at
-
-	      http://excruby.sourceforge.net/docs/html/ruby__hacks_8hpp-source.html
-  	      for workarounds.
-	      
-            - [ruby] Fix memory allocation problem in typemap (bug 1037259)
-
-	    - [tcl] Fix (enums|constants) + namespace option 
-	            (reported by jason.m.surprise@intel.com).
-
-            - [perl] Add patch 962168 for multiple inheretance
-	    
-	    - Fix 'defined' as variable name.
-
-10/29/2004: wsfulton
-            Seg fault fix for global scope operator used for friend methods:
-
-              class B {
-                friend void ::globalscope();
-                ...
-              };
-
-10/28/2004:mmatus
-	    - Added module and swig option "templatereduce" to force swig
-	      to reduce any type needed with templates, ie, in these cases
-
-                %module("templatereduce") test
-
-                template <class T> struct A { };
-
-                typedef int Int;
-	        %template(A_Int) A<Int>  ==>  %template(A_Int) A<int>
-
-                typedef B* Bp;
-	        %template(A_Bp) A<Bp>  ==>  %template(A_Bp) A<B*>
-
-              swig reduces the types Int and Bp to their primitives
-              int and B*. This is closer to the usual compiler
-              resolution mechanism, and it is really needed sometimes
-              when you mix templates + typedefs + specializations.
-
-	      Don't use it if you don't have any problem already,
-	      since the type reduction can interfere with some
-	      user typemaps, specially if you defined something like
-
-		   typedef int Int;
-		   %typemap(in) Int ...;
-
-              in this case, when you use the "templatereduce" option,
-	      swig will ignore the user typemap, since the "typedef int Int"
-	      will take precedence, and the usual "int" typemap will be
-	      applied. 
-
-	      Note that the previous case is not common, and should be
-	      avoided, ie, is not recommended to use a typedef and a
-	      typemap at the same time, specially if you are going to
-	      use templates + specializations.
-
-	    - Directors:
-
-	        virtual destructor is always emitted now, this doesn't
-	        cause any harm, and could solve some nasty and
-	        mysterious errors, like the one mentioned by Scott.
-
-		also the destructor is not in-lined, so, that can solve
-		some other mysterious errors when mixing directors +
-		imports + embedded applications + some specific compilers.
-		
-10/27/2004: wsfulton
-            [C#] typemaps.i library file with INPUT, OUTPUT and INOUT typemaps added.
-
-10/27/2004: wsfulton
-            [Java] std::wstring typemap fixes in std_string.i from Russell Keith-Magee.
-
-10/25/2004: mmatus 
-
-	    - Using + namespace is working now (using_namespace.i).
-
-	    - Derived + nested classes is working now
-	      (deriver_nested.i), but of course, we are still waiting
-	      for the nested class support.
-	    
-	    - Directors:
-	      - unnamed parameters support,
-
-	      - protected constructor support (automatic and with
-                dirprot mode),
-
-	      - detection of really needed protected declarations
-                (members and constructors) now is done automatically.
-                Even if you don't use the 'dirprot' mode, swig will
-                wrap what is minimally needed (and protected) for the
-                code to compile.
-		
-		what is public, as usual, is always wrapped, and if
-		you use the 'dirport'
-		
-
-	    - Final fixes for the OSS to compile with SWIG 1.3.23 (my
-	      very very ugly C++ + templates + everything mounters wrap).
-
-10/25/2004: wsfulton
-            [C#] New commandline option -dllimport. This enables one to specify
-            the name of the DLL for the DllImport attribute. Normally this name
-            comes from the module name, so now it is possible to override this:
-
-              swig -csharp -dllimport xyz example.i
-
-            will generate for all the wrapped PInvoke methods:
-
-              [DllImport("xyz", EntryPoint="...")]
-              public static extern ...
-
-            The wrappers from many different SWIG invocations can thus be compiled
-            into one DLL.
-
-            A new special variable $dllimport can also be used in typemaps, pragmas,
-            features etc. This will get translated into the value specified by -dllimport
-            if specified, otherwise the module name.
-
-10/22/2004: wsfulton
-            [Java] Patch #1049496 from Scott Michel fixes directors methods with 
-            enums when wrapped with typesafe or proper Java enums.
-
-10/21/2004: wsfulton
-            Fixes for default arguments in director constructors (Python, Ruby, Ocaml).
-
-10/21/2004: mmatus
-	    - [Python] Add the '-cpluscast' option to enable the 'new'
-	      C++ casting operators, such as 'static_cast', inside the
-	      typemaps. By default swig use the old C cast style, even
-	      when parsing C++.
-	      
-	    - [Python] Add the '-new_vwm' option to enable the new
-              SwigValueWrapper mode. Now this is mainly for testing
-              that the typemaps are really safe for any future
-              solution, but you can use it if you have a very strange
-              error with default cosntructors missing + %apply +
-              %typemap, and if everything else fails (see
-              valuwrapper_opaque.i for alternative and current
-              solutions). If you are a user that don't know what is
-              SwigValueWrapper, don't even try it.
-
-	    - [Python] Add the '-noh' option to be used with directors
-	      and when you prefer to disable the generation of the
-	      director header file. If not used, swig will work as
-	      usual generating both the wrap.cxx and wrap.h files. If
-	      you use it, swig will only generate wrap.cxx.
-
-10/21/2004: wuzzeb (John Lenz)
-            - If you define SWIG_TYPE_TABLE when compiling a wrapper file,
-	      the runtime types will be stored in the given type table name.
-	      Using this, you can seperate different modules to share their
-	      own type systems.  -DSWIG_TYPE_TABLE=Mytable
-
-	    - [Python] If you define SWIG_STATIC_RUNTIME then the type information
-	      will be static to this wrapper.  Nothing will be shared with any
-	      other modules
-
-	    - [Python] If you define SWIG_LINK_RUNTIME, then instead of using
-	      the new way of sharing type information, the wrapper will expect
-	      to be linked against the Lib/linkruntime.c file.  Any modules compiled
-	      with SWIG_LINK_RUNTIME and linked against linkruntime.c will all
-	      share type information.
-
-10/20/2004: mmatus
-	    - [Python] Initial fix for python/import example. Please
-	      update the Makefile (autoconf, configure, etc, expert),
-	      since now probably is only working with g++, icc and a
-	      few other compilers that have the -shared option.
-
-	      We need to create additional shared libraries for the
-	      virtual destructors. Old and usually forgotten C++
-	      requirement.
-	      
-	      Same fix need to be used in perl, I think.
-
-            - [Python] Fix generation of header file for directors,
-              now directors.swg is also included, so, it can be really
-	      used from C++, and it solves some problem with compiler
-	      that require that, even with the simple swig inclusion.  
-
-            - [Python] Reordering the methods and moving some bodies
-              outside the class declaration. This is needed due to
-              some gcc-2.96 internal compiler errors. It seems the
-              PYTHON class is getting too large to been declared and
-              defined at the same time.
-
-	    - Add the -oh option to change the output header file name
-              if needed:
-
-                 swig -c++ -python test.i -o test.CC -oh test.HH
-	      
-              this is mainly needed when using directors, and if the
-              current default header file name is not good for you,
-              which is generated as follow:	      
-
-                 swig -c++ -python test.i             => test_wrap.h
-                 swig -c++ -python test.i -o test.CC  => test.h
-
-
-10/20/2004: wsfulton
-            1) Compact default arguments feature added. This feature allows one
-              to use the default argument code generation that was used in
-              SWIG-1.3.22 and earlier versions. It produces more compact wrappers
-              as only one wrapper method is generated for any method with default
-              arguments. So the advantage is it generates less code but has the
-              original limitations, like it it does not work with all default arguments
-              and default arguments cannot be taken advantage of in the strongly typed
-              languages (C# and Java). It is implemented via the usual %feature mechanism:
-
-                %feature("compactdefaultargs");
-
-            2) Keyword arguments (kwargs) are working again for default arguments
-               in the languages that support it, ie, Python and Ruby. The new default
-               argument wrapping approach using overloaded methods cannot support kwargs
-               so the compact default argument feature is automatically turned on when
-               kwargs are specified, by %feature("kwargs").
-
-            3) Compact default arguments are also automatically turned on when wrapping
-               C (not C++) code. This is to support the bizarre notion of default arguments
-               for C code.
-
-10/20/2004: wsfulton
-            Overloaded templated functions in namespaces also working now.
-            Templated functions with default arguments in namespaces too.
-
-10/19/2004: mmatus
-
-	    - Allow to disable the new SwigValueWrapper mechanism,
-	      if you add the following line in your language main.
-
-		 /* Turn on safe value wrapper use mode */
-                 Swig_value_wrapper_mode(1);
-
-	      
-	      Now is only active in python. All the other languages
-	      are using the old resolution, but they  can also use the
-	      "valuewrapper"/"novaluewrapper" features to fix some
-	      of the old broken cases. Note, however,  that not all 
-	      the broken cases can be solved in that way.
-
-	      The new mechanism seems to be working fine in perl, ruby
-	      and tcl, but failing in some typemaps in java.
-
-	      Hence, is upto the language maintainer to test it, and
-	      decide to enable it or not.
-
-	      Look at the valuewrapper_opaque.i for examples.
-
-	    - Fix more SwigValueWrapper cases when the new mechanism
-	      is active. Now it also check for local typemap
-	      variables, see valuewrapper_opaque.i for an example when
-	      this is needed. But again, this extra checking will only
-	      be activated when using the new value wrapper mode.
-
-	    - [Python] Fix variable wrapping of classes with private
-	      assign operators. It should be easy to fix in all the 
-	      other modules, instead of checking
-
-	         if (!Getattr(n,"immutable")) ...
-	
-	      you need to verify
-
-	         if (is_assignable(n)) ...
-
-	      Look at the private_assign.i for an example.
-
-10/18/2004: mmatus
-	    - %features "director"/"nodirector" now work as expected.
-            - General fixes in %feature to resolve function decl
-	      properly,
-	      
-	        %feature("hello") foo();
-	        char foo() ->  f()    // was working
-	        char *foo() -> f().p  // it wasn't
- 
-
-            - Template + specialization + default template args now is
-	      working, (don't confuse with template + default arg
-	      values, that was solved before), now this ugly case is
-	      working:
-
-	        template <class T, class A = Alloc<T> >
-		struct Vector
-		{
-		   Vector(T a){}
-		};		   
-
-		template <>
-		struct Vector<double>
-		{
-		  Vector(){}
-		  int foo() { return 0; }
-                };
-
-	        %template(V_c) Vector<char, Alloc<char> >;
-	        %template(V_i) Vector<int>;    // picks Vector<int,Alloc<int> >
-	        %template(V_d) Vector<double>; // picks the specialization
-	      
-              this is needed for automatic STL support (later will
-              be).
-
-	    - Fix the template + typedef errors in test-suite, which
-              probably will fix another group of strange template +
-              namespaces + typedefs errors.
-
-	    - %warnfilter is working better now, parser.y tries to use
-	      them when needed.
-
-	    - **** New default type resolution method (stype.c) ***** 
-
-	      It preserves the original mixed types, then it goes
-	      'backward' first deleting the qualifier, then the inner
-	      types, for example:
-    		 							  
-    		 typedef A *Aptr;				  
-    		 const Aptr&;						
-    		 r.q(const).Aptr       -> r.q(const).p.SWIGTYPE		
-    		 r.q(const).p.SWIGTYPE -> r.p.SWIGTYPE			
-    		 r.p.SWIGTYPE          -> r.SWIGTYPE			
-    		 r.SWIGTYPE            -> SWIGTYPE			
-		 							
-    		 enum Hello {};						
-    		 const Hello& hi;					
-    		 r.q(const).Hello          -> r.q(const).enum SWIGTYPE	
-    		 r.q(const).enum SWIGTYPE  -> r.enum SWIGTYPE		
-    		 r.enum SWIGTYPE           -> r.SWIGTYPE		
-    		 r.SWIGTYPE                -> SWIGTYPE			
-		 							
-    		 int a[2][4];						
-    		 a(2).a(4).int           -> a(ANY).a(ANY).SWIGTYPE	
-    		 a(ANY).a(ANY).SWIGTYPE  -> a(ANY).a().SWIGTYPE		
-    		 a(ANY).a().SWIGTYPE     -> a(ANY).p.SWIGTYPE		
-    		 a(ANY).p.SWIGTYPE       -> a(ANY).SWIGTYPE		
-    		 a(ANY).SWIGTYPE         -> a().SWIGTYPE		
-    		 a().SWIGTYPE            -> p.SWIGTYPE			
-    		 p.SWIGTYPE              -> SWIGTYPE                    
-
-	      before it always stops after finding ref/pointer/enum/array/etc.
-	       
-	      Now, then, you can define (use and apply) 'higher' typemaps such as:
-
-                %typemap(in) SWIGTYPE* const&  
-	        %typemap(out) char FIXSIZE[ANY]
-                %typemap(in) SWIGTYPE* const&  
-	        %typemap(in) const enum SWIGTYPE&
-	        %typemap(in) SWIGTYPE[ANY][ANY]
-	        %typemap(in) const char (&)[ANY]
-	       
-	      It is possible with this change that previous typemaps
-	      that were defined (but ignored), now will start to work.
-
-	      Also, it is necessary check for the '%typemap(varin) SWIGTYPE[]',
-	      before it was usually not defined (but char[] was),
-	      and that can produce some inconsistencies.
-
-                      *** POTENTIAL INCOMPATIBILITY ***
-
-	      This change was needed for STL, since std::vector<enum Hello> 
-	      std::vector<A*>, etc, will always generate methods that
-	      mix const references with the vector type.
-
-	      Now that is working, all the std::container<T*>
-	      specialization will not be needed anymore, well, in
-	      theory. 
-
-	      In the practice, everythin is working as before until
-	      the proper mixed types are defined and the libraries
-	      simplified to use them.
-
-	    - Change the behavior of extern "java"/"fortran"/"etc", 
-	      now swig produces a warning, and use extern "C" instead.
-	      The warning can also be disable with the "-w 313" flag.
-	      (WARN_PARSE_UNDEFINED_EXTERN).
-
-	    - SwigValueWrapper is now more selective (lang.cxx).
-
-            [Perl/Tcl]
-	    - Fix some typemaps (perl/tcl) to work properly with
-	      SwigValueWrapper. This was not a problem with
-	      SwigValueWrapper, but with the typemaps that now are
-	      safe to use with %apply.
-
-	    [Python]
-
-            - Fix %callback/%pythoncallback work now as before after
-	      the def args changes. Also, %callback now is an alias
-	      for %pythoncallback, so, they do the same.
-
-	    [Python/Ruby]
-	    - %callback is more usable and uniform:
-
-                 %callback("%s_cb") foo();  // for both, python/ruby
-                 %callback("%s_cb");        // for both, python/ruby
-                 %callback(1) foo();        // only in python.
-
-10/17/2004: arty
-	    [OCAML]
-	    - Tweak to enum typing for soundness in the presence of multiple
-	      modules.
-	    - global functions are now unambiguous in multiple loaded modules.
-	    - Fixed test case code to build multimodule test cases correctly.
-	    - There is no way to share overload resolution across modules
-	      because of soundness issues.  If the user wants to call some
-	      function foo from an arbitrary module bar, they will have to
-	      use Bar._foo to call it correctly.  Later I will fix the 
-	      camlp4 module to do something clever in this case.  
-            - Promided performance overhaul of class mechanism.
-	    - Removed symbol hack for ocaml-3.07 and below which is not needed
-	      for ocaml-3.08 and above.
-
-10/16/2004: wuzzeb (John Lenz)
-            [CHICKEN]
-	    - Completly change how chicken.cxx handles CLOS and generic code.
-	      chicken no longer exports -clos.scm and -generic.scm.  The clos
-	      code is exported directly into the module.scm file if -proxy is passed.
-	    - The code now always exports a unit.  Running the test-suite is now
-	      majorly broken, and needs to be fixed.
-	    - CLOS now generates virtual slots for member variables similar to how
-	      GOOPS support works in the guile module.
-	    - chicken no longer prefixes symbols by the module name, and no longer
-	      forces all names to lower case.  It now has -useclassprefix and -closprefix
-	      similar to how guile handles GOOPS names.
-
-10/16/2004: wsfulton
-            Templated functions with default arguments working with new default argument
-            wrapping approach. The new approach no longer fails with the following default
-            argument pattern (previously failed with some primitive types, like 
-            unsigned primitive types):
-
-              template<typename T> int foo(const T& u = T());
-              %template(foo) foo<unsigned int>;
-
-            This relies on the templated function overloading support just added, so all
-            the combinations of overloading by template parameters and normal parameters
-            as well as overloading with default parameters works.
-
-10/16/2004: wsfulton
-            Added support for the large range of templated function overloading that C++
-            supports.
-
-            - Overloaded templated functions, eg
-
-              template<typename T> int overload(T t);
-              template<typename T> int overload(T t, const T &r);
-
-            - Fixes where the templated type is not used in the parameter list, eg
-
-              template<typename T> void xyz();
-              template<> void xyz<double>();
-
-            - Fixes for overloading of plain functions by a templated function:
-
-              void abc(double d);
-              template<typename T> void abc(T t);
-
-            - Overloading by templated parameters fixed:
-
-              template<typename T> void foo(T t) {}
-              template<typename T, typename U> void foo(T t, U u) {}
-
-              %template(foo) foo<double, double>;
-
-            - All combinations of the above also working including specializations, eg:
-
-              void abc(double d);
-              template<typename T> void abc(T t);
-              template<> void abc<double>(double t);
-              template<> void abc(int t);
-
-10/16/2004: wuzzeb (John Lenz)
-            - Remove the ability to share type information by using c linking.
-              All type sharing happens through a global variable in the target language.
-                + Remove SWIG_NOIMPORT, SWIG_RUNTIME, and related defines.
-                + Deprecate -runtime, -noruntime command line options
-                + Update test-suite common.mk to correctly build multicpptest
-                + Remove reference to precommon.swg
-                + Update the guile_gh interface to share data by a global var instead
-                  of c linkage.
-
-            - Remove Advanced.html, since everything in it is now obsolete
-
-10/09/2004: mmatus
-	    - Split the python std/STL C++ library files, now
-	      all the language independent definitions are under
-	      the directory
-	      
-		Lib/std
-
-	      and hence, can be used from other languages.
-
-	    - Add more documentation to the Python STL, and
-	      clean unnecessary code.
-
-	    - Add initial C99 complex support, and some fixes
-	      for long double.
-
-10/08/2004: mmatus
-	    - Fix the SwigValueWrapper for opaque types, now it is 
-	      applied for opaque templates and classes, for which we
-	      don't know if there is or not a default constructor, ie
-
-                 struct A { 
-                   A(int);
-                 };
- 
-              Still, if you know that you class has a default
-              constructor, and for some very very particular reason
-              you want to avoid the SwigValueWrapper, and you don't
-              want or can't expose the class to swig, now you can
-              say
-
-                 %feature("novaluewrapper") A;    
-                 class A;
-               
-              or the other way around, if the class has a default
-              constructor, but you want to use the value wrapper, you
-              can say
-
-                 %feature("valuewrapper") A;
-                 struct A { 
-                   A();
-		   ....
-                 };   
-      
-	    - Fix for char > 128, ie
-
-                const char tilde_a = '\341';
-
-            - Add patch 1041858 for $lextype, which carries the 
-              literal type of a symbol. See lextype.i in the
-              test-suite for more details.
-
-                            
- 
-
-10/07/2004: wsfulton
-	    {Ruby, Java] Fix director + 'empty' throws
-
-		    struct A {
-		      A() throw();
-		      virtual ~A() throw();
-		      int foo() throw();
-		    };
-
-
-10/06/2004: wuzzeb (John Lenz)
-            [TCL]
-            - Fix bug reported by William A. Hoffman propagating clientdata
-            between modules.  Added clientdata_prop.multicpptest to check for
-            this bug.  The fix involved the following changes:
-                + SwigType_clientdata_collect does not need to check
-                types in r_resolved because we only want to propagate clientdata
-                to typedefed classes, and r_mangled already takes care of typedefs.
-
-                + SWIG_TypeRegister now copies the clientdata field correctly
-
-                + Move SWIG_Guile_PropagateClientData function from guile module
-                into common.swg, because we need to call it from both guile and tcl.
-
-                + Add base_names to swig_class to delay the lookup of bases.  SWIG
-                now exports the base names and only when the base swig_class is
-                needed is SWIG_TypeQuery(name)->clientdata looked up.
-
-            - conversion_ns_template testsuite test was failing because
-            the name of the wrapped constructor function was not calculated
-            correctly for structs.  Fixed.
-
-10/06/2004: wsfulton
-            Fixes for default arguments used in directors - in virtual
-            methods and director constructors.
-
-10/06/2004: mmatus
-	    Fix the __cplusplus macro, and bug 1041170.
-	    Now it is working as supposed, ie, you can safely use
-
-	      #ifdef __cplusplus
-	      ...
-	    
-	    all over swig, including inside %defines and %{ %} bodies.
-
-	    
-                      *** POTENTIAL INCOMPATIBILITY ***
-
-	    The old trick of using
-
-	      #if __cplusplus
-
-	    doesn't work any more. So, if you have your own typemaps
-	    using that syntax, you will need to migrate them to use
-	    "#ifdef __cplusplus".
-
-10/05/2004: wuzzeb (John Lenz)
-            - Reorganize how runtime type information is stored and shared
-	    between modules.  For chicken and mzscheme, I removed
-	    the ability to use runtime libraries, while perl, tcl, python, and
-	    ruby default to using the new method but can go back to the old
-	    method by declaring SWIG_ALLOW_RUNTIME.
-
-	    - line 582 in mzscheme.cxx was generating a segfault on 
-	    imports.multicpptest, so I fixed it.
-
-10/05/2004: wsfulton
-            Fixes for %extend and overloaded static methods with default
-            arguments.
-
-10/05/2004: mmatus
-	    - [python] Fix director + method with 'empty' throw, ie
-
-		    struct A {
-		      virtual int foo() throw();
-		    };
-		    
-	      other languages should also easy to fix, look for
-	      Getattr(n,"throw") in python.cxx.
-
-	    - Fix director + destructor with 'empty' throw
-
-		    struct A {
-		      virtual ~A() throw();
-		    };
-
-	    - Now SWIG_FEATURES parse all and the same  options you
-              can pass to swig in the command line.
-	      
-	    - New command line flag: -features <list>, as in
-
-	        swig -features autodoc=3,director
-
-	      ie, any global feature can be initialized from the
-	      command line. This is mainly for testing, but users
-	      can also take advantage of it.
-
-10/04/2004: mmatus
-	    - Properly qualify type in syntax as 'long(2)' or 'Foo()',
-	      this solve old problem with default args, and probably
-	      other problems around. However, the default arg problem
-	      was also already solved by William (see bellow).
-
-	    - Fix feature_set and feature_get methods. Before
-	      they look from particular to general and keep the first
-	      feature found. This didn't work well with templates.
-	      Now the methods look from general to particular, and
-	      override any found feature.
-
-            - Previously a feature could not be applied to constructors
-              or destructors that weren't explicitly declared in the class.
-              This is now fixed, for example:
-
-                %feature("featurename") Foo() "..."
-                %feature("featurename") ~Foo() "..."
-                class Foo {
-                  // implicit Foo() and ~Foo()
-                };
-
-	    - Fix missing features for default const/dest, by really
-	      'creating' the methods and applying the features.
-
-	    - Fix return_const_value.i case by adding SwigValueWrapper<const T>
-	      specialization.
-
-	    - Fix %extend + overload, including overloading actual
-              class methods. 
-
-	    - Adding more cases in related files in the test-suite.  
-
-10/04/2004: wsfulton
-            Changes to the way default arguments are wrapped. Previously a single
-            method was generated for each method that had default arguments. If
-            a method had 5 arguments, say, of which 1 had a default argument
-            then the call to the wrapped method would pass 5 arguments. The default
-            value was copied into the wrapper method and used if the scripting
-            language passed just 4 arguments. However, this was flawed as the
-            default argument sometimes does not have global access, for example
-            SWIG would generate code that couldn't compile when wrapping:
-
-              class Tricky {
-              public:
-                void foo(int val = privatevalue);
-                void bar(int val = Tricky::getDefault());
-              private:
-                static int getDefault();
-                enum { privatevalue = 200 };
-              };
-
-            Also bugs in resolving symbols generated code that wouldn't compile, for example
-            (probably fixable though):
-
-              namespace Space {
-                class Klass {
-                };
-                Klass constructorcall(const Klass& k = Klass());
-              }
-
-            The approach also does not work for statically typed languages (C# and Java)
-            as these languages do not allow methods to have variable number of arguments.
-            Although C# has a mechanism to pass a variable number of arguments they
-            must be of the same type and are more like varargs.
-
-            The new approach solves the above problems and wraps methods with default
-            arguments as if the method was overloaded. So SWIG will now treat
-
-              void foo(int val=0);
-
-            as if it had parsed:
-
-              void foo(int);
-              void foo();
-
-            The code generated is then exactly the same as if SWIG had parsed the two
-            overloaded methods. The scripting languages count the arguments passed and call
-            the appropriate method, just like overloaded methods. C# and Java are now able
-            to properly wrap methods with default arguments by generating extra methods,
-            again as if the method was overloaded, so for:
-
-              void bar(string s="hello", double d=10.0, int i=0);
-
-            the following proxy methods are generated:
-
-              void bar(string s, double d, int i);
-              void bar(string s, double d);
-              void bar(string s);
-              void bar();
-
-            The new approach comes with a couple of minor knock on effects.
-
-            1) SWIG support for default arguments for C (not C++) code no longer works.
-            Previously you could have this interface:
-
-              %{
-              void foo(int val);
-              %}
-              void foo(int val=0);
-
-            and call the wrapped method from a scripting language and pass no arguments
-            whereupon the default of 0 was used. You can get the same behaviour for C
-            code by using the "default" typemap:
-
-              %typemap(default) int val "$1 = 0;";
-              %{
-              void foo(int val);
-              %}
-              void foo(int val);
-
-            or you could of course compile your code as C++ if you want C++ features :) :
-
-              %{
-              void foo(int val=0);
-              %}
-              void foo(int val=0);
-
-            A couple of SWIG's libraries used this C extension and these have been modified
-            to use the "default" typemap. The "default" typemap is thus unchanged (and still
-            is not and is not fully supported by C# and Java, and is likely to remain so).
-
-
-            2) All features (%feature, %rename, %ignore etc) no longer work as if the method
-            with default arguments is just one method. For example, previously
-
-              %ignore foo(int);
-
-            would have ignored the method completely. Now it will only ignore foo(int) but
-            not the extra foo() method. Instead use:
-
-              %ignore foo;
-
-            to ignore them all. or
-
-              %ignore foo(int);
-              %ignore foo();
-
-            This of course allows one to fine tune the wrapping, for example one could use:
-
-              %rename(fooint) foo(int);
-              %rename(foodefaults) foo();
-              void foo(int val=0);
-
-            and call them from any language like so:
-
-              fooint(200)
-              foodefaults()
-
-            or for example ignore the extra overloaded method, so the defaults cannot be used:
-
-              %ignore foo();
-              void foo(int val=0);
-
-                      *** POTENTIAL INCOMPATIBILITY ***
-
-10/2/2004: mmatus
-	   [Python]
-	   - More cleaning up and uniformation on the Python Lib
-
-	   - Added Robin's docstring patch, plus some fixes, plus
-	     some extensions, see autodoc.i example in the test-suite,
-	     and try using %feature("autodoc","extended").
-	    
-	     This patch is not a complete solution for the
-	     documentation problem, just enough to inform python about
-	     the parameter list.
-
-	     The expected swig documentation support is far far away yet.
-	     
-
-10/1/2004: mmatus
-	   - Fix the %callback feature (only used in ruby and python examples,
-	     by now, but it should be generic), now member callbacks
-	     are working again
-	     
-	   - Fix wrapping of functions pointers like
-
-		 std::ostream& std::endl(std::ostream&);
-
-	     ie, the ones that return references or enums.
-	 
-	   [Python] Add the %pythoncallback directive, which is 
-	   an improved version of %callback, ie,
-
-	     %pythoncallback(1) foo;
-	     %pythoncallback(1) A::bar;
-	     %pythoncallback(1) A::barm;
-
-	     int foo(int a) {
-	         return a;
-	     }
-  
-	     struct A 
-	     {
-	       static int bar(int a);
-	       int barm(int a);
-
-	     };
-
-             int foobar(int a, int (*pf)(int a));
-
-	   in python you can use
-
-             foo(2)
-	     foobar(2,foo)
-             A.bar(2)
-	     foobar(2,A.bar)
-          
-           ie, no additional pointer elements are created, and
-	   the original 'foo' and 'A.bar' can be used as parameters.
-
-	   In the case of member fucntion however, still you need
-	   to use the special variable Class::<fnc_name>_cb_ptr, ie:
-
- 	     foobarm(3, a, A.barm_cb_ptr)
-	   
-	   we will try to fix this situation also, but later.  
-
-	   [Python] Add more elements from the STL library, now
-	   you can use
-
-	     import std
-	     std.cout << "hello " << 123 << std.endl
-
-	   [Python] Fix in/out return mechanism, now swig will behave
-	   as 1.3.21 but using a python list when needed. The problem
-	   is that the types std::pair,std::vector,etc, use tuples,
-	   and they interfer with the previous inout tuple type.
-
-	   By using lists we solve the conflicts, swig acts as before,
-	   but returns a list when more than one parameter are using
-	   the OUT typemap. See the new inout.i example in the
-	   test-suite.
-
-            *** POTENTIAL INCOMPATIBILITY FOR PYTHON MODULE ***
-		   
-           [Python] Much better error messages for bad arguments, now
-	   you always get the argument number where the error occurred.
-
-09/27/2004: wsfulton
-            Patch from Bill Clarke -
-            1) Warning emitted when -importall and -includeall is used together,
-               with -includeall taking precedence.
-            2) Ensure SWIGIMPORTED is always defined when a file is being
-               imported with %import. Note that this is not the same as SWIGIMPORT,
-               which gets defined in all generated wrapper files.
-
-09/26/2004: mmatus
-
-	    - add %feature("exceptionclass") to identify a class used
-	      as exception. Before swig identified and marked a class
-	      using the "cplus:exceptionclass" attribute. However, the
-	      class needed to appear on an throw() statement.  Now
-	      swig keeps trying to identify the exception classes, as
-	      before, but it also allows the user to mark a class by
-	      using the %feature explicitly. (mostly relevant for
-	      python and chicken)
-
-	    [Python]
-
-	    - fix -modern option + exceptions, which mix old class
-	      style with the new one. So, we always need to emit
-	      the "nonmodern" python code.
-
-	    - add the "python:nondynamic" feature and its handler
-
-	      now if you have
-	      
-	      %pythonnondynamic A;
-	      
-	      struct A {
-	       int a;
-	       int b;
-	      };
-
-	      then, in the python side
-	      
-	      aa = A()
-	      
-	      aa.a = 1 # ok
-	      aa.b = 2 # ok
-	      aa.c = 3 # error, the class can not be extended dynamically.
-
-	    
-	    Since this is a feature, you can use
-
-	      %pythonnondynamic;
-
-            or 
-
-	      %pythondynamic; [ Note: %pythondynamic since deprecated ]
-   
-	    to force all the wrapped classes to be "nondynamic" ones.
-
-	    The default, as in regular python, is that all the wrapped
-	    classes are dynamics. So, careful with your spelling.
-
-09/14/2004: mmatus 
-	    - Support the -I- option.
-
-	    - Differentiate between %include <file> and %include "file".
-	      This fix several corner cases.
-
-	    
-	    [Python] Several patches:
-
-	    - Normalize the Lib file names: 
-		*.swg internal files, 
-		*.i   user files.
-
-	    - Fix Char[ANY] typemaps, so they also delete any extra '\0' chars,
-	      now they behave as before (1.3.21). Still, you can use
-	      the SWIG_PRESERVE_CARRAY_SIZE macro if you need to
-	      preserve the original size (see pystrbase.swg).
-
-	    - Add the Char FIXSIZE[ANY] typemaps, to preserve the
-              original C array sizes (see above). Though, you can't
-              use them yet since %apply and arrays are not working
-              together.
-
-            - Add pyfragments.swg, now the user can add fragments
-	      to override the default ones.
-
-09/10/2004: wsfulton
-            Patch from Bill Clarke which fixes spurious preprocessor bug which
-            shows on Solaris and gcc, eg:
-                Warning(202): Could not evaluate '!defined(SWIGJAVA) &&
-                !(defined(SWIGCSHARP)'
-            Also fixes a bug where '#if "a" == "b" == 1' wouldn't have worked 
-
-09/10/2004: wsfulton
-            Restored multiple build directories for the test-suite. Patch from
-            Bill Clarke.
-
-09/06/2004: wsfulton
-            Added the missing runtime.dsp Visual Studio project files for the
-            import examples to work.
-
-
-Version 1.3.22 (September 4, 2004)
-==================================
-
-09/03/2004: wsfulton
-            The swig.m4 macro for use with the Autoconf/Automake/Libtool has
-            been removed and is no longer installed. Please use the new and better
-            maintained version derived from swig.m4 in the Autoconf macro archive.
-            See http://www.gnu.org/software/ac-archive/htmldoc/ac_pkg_swig.html and
-            http://www.gnu.org/software/ac-archive/htmldoc/ac_python_devel.html.
-
-09/01/2004: wsfulton
-            [Perl] Applied patch #1019669 from Christoph Flamm. Adds support
-            for %feature("shadow") in the same way as it works in Python. This
-            enables one to override the generated shadow/proxy methods, including
-            constructors and destructors. For example:
-
-              /* Let's make the constructor of the class Square more verbose */
-
-              %feature("shadow") Square(double w)
-              %{
-                sub new {
-                  my $pkg = shift;
-                  my $self = examplec::new_Square(@_);
-                  print STDERR "Constructed an @{[ref($self)]}\n";
-                  bless $self, $pkg if defined($self);
-                }
-              %}
-
-              class Square {
-              public:
-                Square(double w);
-                ...
-              };
-
-08/31/2004: mmatus 
-	    [Python] Incompatibility reported by Bill Clarke (llib@computer.org):
-	    
-	    If you are using Sun Studio 8 (and possibly earlier
-	    versions) to compile the output produced by swig
-	    1.3.22rc1, and you are using C++ and STL templates then
-	    you need to use either "-runtime" or "-noruntime".  If you
-	    use neither of these options then you will probably get
-	    compiler errors when trying to compile the wrapper file;
-	    the error message will be like this: The name
-	    SWIG_Python_ConvertPtr[...] is unusable in static
-	    swigpy::traits_asptr[...]  If you get this error message,
-	    you need to regenerate your wrapper file using 'swig
-	    -runtime' or 'swig -noruntime'.
-
-	    You shouldn't get this problem with Sun Studio 9.
-
-            *** POTENTIAL INCOMPATIBILITY FOR PYTHON MODULE ***
-	    
-08/26/2004: wsfulton
-            [Perl] Applied #932333 from Ikegami Tsutomu. Fixes long long *OUTPUT
-            and unsigned long long *OUTPUT typemaps in typemaps.i.
-
-08/26/2004: wsfulton
-            Applied patch #857344 from Art Yerkes. Workaround for autoconf bug when
-            running 'make install'.
-
-08/26/2004: wsfulton
-            [Perl] Part of patch #982753 applied. This implements a %perlcode directive.
-            It allows one to add Perl code to the generated .pm file. Works the same 
-            as %pythoncode.
-
-08/26/2004: wsfulton
-            [Java] Fix for directors when wrapping virtual methods with exception
-            specifications that were not simple types. Previously code was generated that
-            didn't compile, for example when the exception specification was a pointer.
-
-08/25/2004: wsfulton
-            [C#] Typemap fix for methods that return char *. The CLR would incorrectly
-            delete the memory pointed to by char *. Also applied the same correction to
-            the char array typemaps.
-
-08/24/2004: wsfulton
-            Fixes for -fmicrosoft error/warning message display: 
-            - End of file (EOF) warning messages not displaying in correct format
-            - Some messages containing a file path were displaying a double backslash
-              instead of a single backslash
-
-08/23/2004: wsfulton
-            Applied patch #1011604 submitted by Charles Schwieters. Fix for 64 bit tcl
-            interpreters.
-
-08/23/2004: wsfulton
-            Fix for bug #875583 - enum forward declarations previously gave a syntax error.
-
-08/23/2004: mkoeppe
-	    [Allegro CL] Use typemaps "ffitype" and "lisptype" to determine the FFI type
-	    specifiers from the C type.  This makes it possible, for instance, to control
-	    whether a C "char" argument takes a Lisp character or a Lisp integer value.
-	    The default (taking Lisp characters) is done by these built-in typemaps:
-	      %typemap(ffitype) char ":char"; %typemap(lisptype) char "character";
-	    If char means an integer instead, use these typemaps:
-	      %typemap(ffitype) char ":char"; %typemap(lisptype) char "integer";
-
-08/22/2004: wsfulton
-            As discussed in bug #772453, the SWIG library directory is now installed
-            into a different default directory. The library used to be installed to
-            /usr/local/lib/swig1.3. It is now in the more usual architecture independent
-            directory and I have additionally used a version specific subdirectory as
-            the library will rarely work with older versions of SWIG. This release
-            will thus use /usr/local/share/swig/1.3.22 by default, which can be
-            tailored as before using './configure --swiglibdir'.
-
-08/17/2004: mkoeppe
-	    [MzScheme] Add support to create native MzScheme structures from C structures.
-	    To convert a C structure to an MzScheme structure, use the new runtime macro
-	    SWIG_NewStructFromPtr in a typemap.  Patch from Dmitriy Zavin. 
-
-08/12/2004: wsfulton
-            Patch #837715 from Ben Reser to correctly detect Python lib directory
-            on 64 bit systems.
-
-08/12/2004: wsfulton
-            [C# and Java] Prevent memory leaks in the case of early return
-            from wrapper methods using const std::string & parameters. Modified
-            Mark Traudt patch #951565.
-
-08/12/2004: wsfulton
-            Bug #943783 with patch fixes php char * out typemap NULL values.
-
-08/03/2004: Ahmon Dancy  <dancy@dancy>
-
-            [allegrocl] Additional case mode fixes.  Also, make sure
-	    foreign types are exported.
-
-07/24/2004: mkoeppe 
-	    [Guile] In -scm mode, SWIG modules now exchange their pointer type
-	    information via the Guile interpreter.  It is no longer necessary to build a
-	    runtime library or to use -noruntime and -runtime etc.
-	    
-	    The module (Swig swigrun) which was introduced in the change of 05/17/2004 is
-	    no longer automatically built.  If you need it, run SWIG on the interface file
-	    swigrun.i. 
-
-07/23/2004: wsfulton
-            [C#] Bug #917601 Mapping C++ bool fix from Mark Traudt
-
-07/23/2004: wsfulton
-            RPM fixes for latest CVS version including removal of runtime
-            library.
-
-07/23/2004: wsfulton
-            Patch #908955 from Robert H De Vries.
-            RPM file generation fix for Fedore Core 1 and Redhat AS2.1.
-
-07/12/2004: wsfulton
-            Patch #864689 from Robin Dunn:
-
-            This patch corrects two problems in the XML output of SWIG:
-             
-              1. There were often extra '/>\n' in the output.
-              
-              2. value attributes were output with '\n' in them but
-              since that is not technically legal most (all?) XML
-              parsers will strip them out. Replacing the '\n' with
-              the '&#10;' entity reference solves this as that is
-              legal and XML parsers will convert it to a '\n' when
-              reading the values back in.
-              
-              This patch also adds a new global command line option
-              that will allow the parse tree to be written out in XML
-              *after* some other language module has been run, in
-              order to be able to get extra info that the language
-              module puts in the tree. In this way the XML is a
-              post-processed version of the tree rather than a
-              pre-processed version. 
- 
-              Command line option is -dump_xml or -xmlout <file>
-
-07/12/2004: wsfulton
-            [Java] Patch from Scott Michel to fix typesafe enums and proper enums
-            with directors.
-
-07/12/2004: wsfulton
-            HTML documentation (makechap.py) file generator missing end of line
-            patch #908951 from Robert de Vries.
-
-07/08/2004: wsfulton
-            The deprecated runtime library build has been removed. This also removes
-            the dependency on Libtool. Libtool is no longer required to build SWIG.
-            The associated -ldflags SWIG commandline option has also been removed.
-
-            The examples and test-suite testcases that used the runtime library have
-            been updated to use the replacement approach to using SWIG across 
-            multiple modules, that is they use the -noruntime and -runtime commandline
-            options, see Modules.html. Effectively they build their own runtime
-            libraries using -runtime. The examples are import and import_template.
-            The test cases are in the imports and template_typedef_import directories.
-
-            Anyone who wants the original runtime libraries can either run the test-suite
-            or build the examples and use the appropriate shared object/DLL that is
-            generated with the -runtime commandline option. For example libimports_runtime.so
-            (Python calls it lib_imports_runtime.so) is generated after running the 
-            'make imports.multicpptest' testcase in the Examples/test-suite/<lang>
-            directory. Or use libruntime.so / runtime.dll after building the import
-            examples in Examples/<lang>/import.
-
-07/07/2004: mkoeppe
-	    [Allegro CL] Convert character and string literals in constants to 
-	    CL syntax.  Fix FF:DEF-FOREIGN-CALL for mixed-case C functions.
-
-06/27/2004: wsfulton
-            [Java] New feature for Java exceptions with format %javaexception(exceptionclasses).
-            This feature is a slight enhancement to %exception and the only difference is the 
-            addition of the exception classes which are generated into a throws clause.
-            The 'exceptionclasses' is a comma separated list of classes which will be
-            added to the associated proxy method's throws clause. The 'exceptionclasses'
-            are specified like the exception classes in the 'throws' attribute in the
-            typemaps. This feature should be used for correctly handling checked exceptions
-            thrown from JNI code. For example:
-
-              %javaexception("java.lang.Exception") throwException %{
-                ... convert a std::logic_error into a java.lang.Exception using JNI code ...
-              %}
-
-              #include <stdexcept>
-              void throwException() {
-                throw std::logic_error("Logic error!");
-              }
-
-            will generate a method with a throws clause in the module class:
-
-              public static void throwException() throws java.lang.Exception { ... }
-
-06/27/2004: wsfulton
-            [C#] New %csconstvalue(value) feature directive for use with constants and
-            enums. This works the same way as %javaconstvalue. For C#, this directive
-            is the only way that one can fix wrapping of C/C++ enums with proper C#
-            enums if the enum item's initialiser cannot compile as C# code. This is
-            because Java enums can use a call into C code to initialise the enum item,
-            whereas in C#, the enum value must be a compile time constant. That is,
-            using %csconst(0) cannot be used in C# to initialise the C# enum item via
-            a PINVOKE call.
-
-06/27/2004: wsfulton
-            [Java] New %javaconstvalue(value) feature directive for use with constants and
-            enums. Sometimes the use of %javaconst(1) will produce code that won't compile
-            under Java. If a compile time constant is required, %javaconst(0) is not an
-            option. The %javaconstvalue directive achieves this goal and the value specified
-            is generated as Java code to initialise the constant.  For example:
-
-              %javaconst(1);
-              %javaconstvalue(1000) BIG;
-              %javaconstvalue("new java.math.BigInteger(\"2000\")") LARGE;
-              %javaconstvalue(10) bar;
-              %{
-                const int bar = 10;
-              %}
-              %inline %{
-                #define BIG 1000LL
-                #define LARGE 2000ULL
-                enum Foo { BAR = ::bar };
-              %}
-
-            Generates:
-
-              public interface exampleConstants {
-                public final static long BIG = 1000;
-                public final static java.math.BigInteger LARGE = new java.math.BigInteger("2000");
-              }
-              public final class Foo {
-                public final static Foo BAR = new Foo("BAR", 10);
-                ...
-              }
-
-            Previously, none of BIG, LARGE or BAR would have produced compilable code
-            when using %javaconst(1).
-
-06/27/2004: wsfulton
-            %feature enhancements. Features can now take an unlimited number of attributes
-            in addition to the feature name and feature value. The attributes are optional 
-            and are much the same as the typemap attributes. For example, the following
-            specifies two optional attributes, attrib1 and attrib2:
-
-             %feature(featurename, attrib1="attribval1", attrib2="attribval2") name "val";
-             %feature(featurename, val, attrib1="attribval1", attrib2="attribval2") name;
-
-06/27/2004: wsfulton
-            %feature improvements for the syntax that takes the feature value within the
-            %feature() brackets. The value specified is no longer restricted to being just
-            a string. It can be a string or a number. For example, this is now acceptable
-            syntax:
-              %feature("featurename",20.0);
-            whereas previously it would have to have been:
-              %feature("featurename","20.0");
-            Useful for features that are implemented as a macro, for example:
-              #define %somefeature(value)      %feature("somefeature",value)
-            These will now work accepting either a string or a number:
-              %somefeature("Fred");
-              %somefeature(4);
-
-06/06/2004: wuzzeb (John Lenz)
-            [Chicken, Guile]
-             - Created the Examples/test-suite/schemerunme directory, which holds all the
-	       runme scripts for guile and chicken (and possibly mzscheme...).  The guile
-	       and chicken _runme files then (load "../schemerunme/foo.scm").
-             - In chicken module, fix a few bugs invlolving dynamic casts.
-
-06/03/2004: wsfulton
-            Patch to fix wrapping of templated methods. ISO compliant compilers, like
-            Comeau and GCC-3.4.0, don't like the template specifier that SWIG was generating
-            when calling the method. This fix may break some non standard compliant compilers,
-            for example, Sun workshop compilers prior to version 6.2.p2. Patch submitted
-            by Bill Clarke.
-
-06/03/2004: wsfulton
-            [Java, C#] Undocumented special variable $imclassname removed.
-            New special variable $module is replaced by the module name, as specified
-            by %module or -module commandline option. $imclassname can be created from $module.
-
-06/03/2004: wsfulton
-            [C#] Same as for Java below. The new typemaps are named differently, namely,
-            csbody and csbody_derived. The deprecated typemaps are csgetcptr and
-            csptrconstructormodifiers.
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-06/03/2004: wsfulton
-            [Java] Typemap changes for the Java proxy / typewrapper and enum classes. A new
-            typemap called javabody contains the essential support code for generation into the body
-            of these classes. There is also a new javabody_derived typemap which is used instead for
-            wrapped classes that have a wrapped base class. The code is basically, the getCPtr()
-            method and swigCPtr and swigCMemOwn member variables. These used to be hard coded
-            with no way to modify the code. The introduction of this typemap makes it possible for
-            the user to tailor nearly every aspect of the code generation.
-            The exception now is the code for director classes.
-
-            The javagetcptr and javaptrconstructormodifiers typemaps are deprecated and are
-            no longer used as the code that these generated can be put in the more flexible
-            javabody and javabody_derived typemaps.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-            The following macros contributed by Scott Michel may help you upgrade if you have used
-            the javagetcptr typemap:
-
-                /* Utility macro for manipulating the Java body code method attributes */
-                %define SWIGJAVA_ATTRIBS(TYPENAME, CTOR_ATTRIB, GETCPTR_ATTRIB)
-                %typemap(javabody) TYPENAME %{
-                  private long swigCPtr;
-                  protected boolean swigCMemOwn;
-
-                  CTOR_ATTRIB $javaclassname(long cPtr, boolean cMemoryOwn) {
-                    swigCMemOwn = cMemoryOwn;
-                    swigCPtr = cPtr;
-                  }
-
-                  GETCPTR_ATTRIB static long getCPtr($javaclassname obj) {
-                    return (obj == null) ? 0 : obj.swigCPtr;
-                  }
-                %}
-
-                %typemap(javabody_derived) TYPENAME %{
-                  private long swigCPtr;
-
-                  CTOR_ATTRIB $javaclassname(long cPtr, boolean cMemoryOwn) {
-                    super($moduleJNI.SWIG$javaclassnameUpcast(cPtr), cMemoryOwn);
-                    swigCPtr = cPtr;
-                  }
-
-                  GETCPTR_ATTRIB static long getCPtr($javaclassname obj) {
-                    return (obj == null) ? 0 : obj.swigCPtr;
-                  }
-                %}
-                %enddef
-
-                /* The default is protected getCPtr, protected constructor */
-                SWIGJAVA_ATTRIBS(SWIGTYPE, protected, protected)
-
-                /* Public getCPtr method, protected constructor */
-                %define PUBLIC_GETCPTR(TYPENAME)
-                SWIGJAVA_ATTRIBS(TYPENAME, protected, public)
-                %enddef
-
-                /* Public getCPtr method, public constructor */
-                %define PUBLIC_BODYMETHODS(TYPENAME)
-                SWIGJAVA_ATTRIBS(TYPENAME, public, public)
-                %enddef
-
-06/03/2004: wsfulton
-            [Java, C#] The contents of the class modifier typemaps and pragmas have changed.
-            They must now include the class type. Previously 'class' was hard coded.
-            This change enables flexibility into what type of class is generated,
-            for example the proxy class could be an interface instead of a class.
-
-            For Java this affects the javaclassmodifiers typemap and the jniclassclassmodifiers
-            and moduleclassmodifiers pragmas.
-
-            For C# this affects the csclassmodifiers typemap and the imclassclassmodifiers
-            and moduleclassmodifiers pragmas.
-
-            Unless you have overridden the default versions of these typemaps or pragmas, you
-            shouldn't be affected. However, if you have, upgrading is easy, for example
-
-                class Foo {};
-                %typemap(javaclassmodifiers) Foo "public final"
-
-            must now be:
-
-                class Foo {};
-                %typemap(javaclassmodifiers) Foo "public final class"
-
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-05/31/2004: wsfulton
-            Fix for C++ exception specifications that are references. Problem reported by
-            Oren Miller. Also improves the generated exception declarations in the
-            catch handler for pointers - a pointer is used instead of a reference to
-            a pointer. Added default throws typemaps for SWIGTYPE &, SWIGTYPE * and
-            SWIGTYPE[ANY] (Java and C#).
-
-05/31/2004: wsfulton
-            [Java, C#] Some minor typesafe enum improvements, including storing the name of
-            the enum item. The toSring() / ToString() methods are overridden to return this name.
-
-05/30/2004: wuzzeb (John Lenz)
-            [Chicken] 
-	     - Update how examples and the test suite are built.
-	     - Symbol names are no longer converted to lower case
-	     - Added union_runme.ss, which was copied and modified from the guile module
-
-05/26/2004: lballabio (Luigi Ballabio)
-            Committed on behalf of Marcelo (who still has problems with 
-	    the SourceForge CVS.)
-
-	    Added Python typemaps for FILE* with (Python-only) test.
-
-5/24/2004:  dancy
-
-	* Allegro CL module:  Now using some macros (defined in
-	Lib/allegrocl/allegrocl.swg), swig-defconstant and swig-defun, for
-	defining constants and foreign functions.  This makes the
-	generated file a bit neater.    
-
-	Now strips a layer of parenthesis from constants.
-
-	Uses (* :void) instead of :foreign-address now.
-
-05/20/2004: wsfulton
-            Unnamed enum global variables are now supported in addition
-            to the recently added support for unnamed enum member variables.
-            For example:
-
-                struct Foo {
-                  enum { enum1, enum2 } MemberInstance;
-                };
-                enum { enum3, enum4 } GlobalInstance;
-
-            The int typemaps are used for wrapping the get/set accessor methods.
-            If the sizeof an enum is not the same size as an int then setting the
-            variable will silently do nothing as the casts cannot be easily and portably
-            generated. If you need to solve this highly obscure situation, write
-            the assignment using the %exception feature.
-
-05/20/2004: wsfulton
-            [C#] C# enum wrapping mods. Similar to the Java module, enums can be wrapped using
-            one of 3 approaches:
-
-            1) Proper C# enums - use %include "enums.swg"
-            2) Typesafe enums - use %include "enumtypesafe.swg"
-            3) Simple constant integers (original approach) - use %include "enumsimple.swg"
-
-            See each of these files for further details. Each of these files use typemaps
-            and a new feature to control the generated code. The feature is:
-
-                %csenum(wrapapproach);
-
-            where wrapapproach should be one of: "proper", "typesafe", "typeunsafe" or "simple".
-            [No implementation deemed necessary for type unsafe enums].
-
-            The default approach is proper C# enums. Anonymous enums are always wrapped by
-            constant integers. 
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-05/20/2004: wsfulton
-            [Java] Java enum support added. There are now 4 ways in which enums can be wrapped:
-
-            1) Proper Java enums - use %include "enums.swg"
-            2) Typesafe enums - use %include "enumtypesafe.swg"
-            3) Type unsafe enums (constant integers) - use %include "enumtypeunsafe.swg"
-            4) Simple constant integers (original approach) - use %include "enumsimple.swg"
-
-            See each of these files for further details. Each of these files use typemaps
-            and a new feature to control the generated code. The feature is:
-
-                %javaenum(wrapapproach);
-
-            where wrapapproach should be one of: "proper", "typesafe", "typeunsafe" or "simple".
-            The default typemaps will handle enums that may or may not have specified initial
-            values, for example ten is specified:
-
-                enum Numbers { zero, ten(10) };
-
-            However, the amount of generated Java code can be cut down, by modifying these typemaps
-            if none of the enums have initial values (proper Java enums and typesafe enums approach).
-            
-            The default approach is typesafe enums. Anonymous enums are always wrapped by
-            constant integers. 
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-05/11/2004: wsfulton
-            [Java, C#] Fix bug using %rename on enum items and when using
-            %javaconst(1) / %csconst(1)
-            For example, the following used to generate code that wouldn't compile:
-
-                %rename(Obj) Object;
-                enum Grammar { Subject, Object };
-
-04/28/2004: wsfulton
-            [Java, C#] Minor fixes when using combinations of the 
-            javainterfaces, javabase, csinterfaces and csbase typemaps.
-
-05/18/2004: wsfulton
-            [Java] JVM link failure on some systems fixed when using std_vector.i.
-            Also adds default vector constructor for use from Java.
-
-05/17/2004: mkoeppe (Matthias Koeppe)
-
-	    [Guile] New runtime functions SWIG_PointerAddress,
-	    SWIG_PointerType, SWIG_IsPointerOfType, SWIG_IsPointer.
-
-	    [Guile] In -scm mode, wrap several SWIG runtime functions
-	    and export them into the module (Swig swigrun).  The
-	    runtime module is now built with "module" linkage.
-
-	    [Guile] GOOPS proxy objects now also print the pointer
-	    address of the C object.
-
-05/14/2004: lyle
-            Added Kou's patch for the Ruby %import directive so that modules
-            with "nested" names are handled properly. Consider an interface
-            file foo.i that has this %module declaration at its top:
-
-                %module "misc::text::foo"
-
-            Now consider another interface file spam.i that imports foo.i:
-
-                %import foo.i
-            
-            Before this patch, this would result in the following code being
-            generated for spam_wrap.c:
-
-                rb_require("misc::text::foo");
-
-            With this patch, however, you'll get the correct path name
-            for the call to rb_require(), e.g.
-
-                rb_require("misc/text/foo");
-
-            See SourceForge Bug #928299.
-
-05/12/2004: wsfulton
-            Patch for emitting directors when %feature("director") specified
-            for a class with no virtual methods, but does have a virtual destructor.
-            Submitted by Kevin Smith.
-
-05/06/2004: mkoeppe (Matthias Koeppe)
-	    New SWIG runtime function SWIG_TypePrettyName, which 
-	    returns an unmangled type name for a swig_type_info
-	    object. 
-
-	    [Guile]: Use it for printing pointer objects.
-
-05/03/2004:  dancy (Ahmon Dancy)
-
-	* Lib/allegrocl/allegrocl.swg:  Updated comments about identifer
-	conversion.  
-
-	* Sources/Modules/allegrocl.cxx:  Register /dev/null for "header"
-	target.   Also, disregard "const" qualifiers during type
-	conversion.  
-
-	
-05/02/2004: wuzzeb (John Lenz)
-	    [Chicken] Fix bug 782468.
-	    To fix this bug, the runtime code has been rewritten, and
-	    pointers are now represented as a C_SWIG_POINTER_TYPE.
-
-	    Chicken version > 1.40 is now required!
-
-	    * Typemap incompatibility:  typemaps no longer use chicken_words.
-	      If a typemap needs some space, it should just call C_alloc
-
-	    * argout typemaps no longer use the /* if ONE */ construct to
-	      build an output list.  A SWIG_APPEND_VALUE macro, exactly like
-	      guile and mzscheme is now used.
-
-04/25/2004: mkoeppe (Matthias Koeppe)
-	    [Guile] In the generated GOOPS code, don't create methods
-	    that would not specialize any arguments; simply re-export
-	    the primitive functions.  (This is a performance
-	    optimization which reduces load time and execution time.)
-
-	    [Guile] In -gh mode, fix the "too many initializers" error
-	    which was caused by an incompatible swig_type_info layout.
-
-	    [Guile] The typemap for FILE * in ports.i now also accepts
-	    a regular FILE * pointer object.  Also a bug with Scheme
-	    file ports that are open for input and output has been
-	    fixed. 
-
-04/25/2004: wsfulton
-            Change entry 03/21/2004 revoked. The change introduced another
-            inconsistency (reference typemaps beings used instead of
-            pointer typemaps for member variables as well as static
-            member variables and global variables for some languages,
-            but only for C++ and not C). This would break user's current
-            typemaps and introduce further inconsistencies. Alternative
-            solution required and being discussed.
-
-04/10/2004: mmatus (Marcelo Matus) 
-	    
-	    Added the -directors flag. This enables the director
-	    mode for the interface and all the classes that
-	    don't set the "feature:nodirector" explicitly.
-
-	    You can use this in your module if you want to use the
-	    director feature in all your classes, but it is most
-	    intended for testing purposes, like:
-
-	      make check-python-test-suite SWIG="../../../swig  -directors"
-	      make check-ruby-test-suite SWIG="../../../swig  -directors"
-	      make check-java-test-suite SWIG="../../../../swig  -directors"
-
-	    These commands will run the entire test-suite using
-	    directors, and not only the specific 'directors_*'
-	    cases. This should be done from time to time.
-
-04/10/2004: mmatus (Marcelo Matus) 
-	    
-	    [python] Added support for std::wstring and wchar_t,
-	    for compiler and python versions that support them.
-	    
-	    When needed, use 
-
-	     %inlcude std_string.i      // 'char' strings
-	     %inlcude std_wstring.i     // 'wchar_t' strings
-	    
-
-04/10/2004: mmatus (Marcelo Matus) 
-	    
-	    [python] Fix the default behaviour (seg. fault) when an
-	    inplace operator (+=,-=,...) was wrapped, as reported by
-	    Lucriz (lucriz@sitilandia.it), when the most common
-	    form was used:
-
-                   A&  A::operator+=(int i) { ...; return *this; }
-                  ^^^^                                    ^^^^^^
-	    
-
-	    ie, an object is returned and its contains the same 'this'
-	    value than the input object, which is deleted after the
-	    operation "a += b", leaving the result with no real
-	    object, but a seg. fault.
-
-	    To fix it, we needed to introduce a new feature and use an
-	    old one:
-
-               %feature("self:disown") A::operator+=;
-               %feature("new") A::operator+=;
-	    
-	    here, "self:disown" disable the ownership of the 'self'
-	    or input object, and the "new" feature transfers the
-	    ownership to the result object.
-	    
-	    The feature/solution could also be used in other languages
-	    that use gc and implement the inplace operators, or other
-	    operators, in a similar way.
-
-            *** POTENTIAL INCOMPATIBILITY FOR Python MODULE ***
-
-	    If you already are using the inplace operators in python,
-	    and you implemented some kind of workaround to the problem
-	    fixed here, it is possible you could end with 'free'
-	    objects that never get deleted. If that is the case, and
-	    you want to disable the current fix, use:
-
-               %feature("self:disown","") A::operator+=;
-               %feature("new","") A::operator+=;
-
-
-04/07/2004: cheetah (William Fulton)
-            [C#] C++ enums are no longer wrapped by integers, they are now wrapped by 
-            C# enums. For Example, given C++:
-
-                enum AnEnum { foo, bar };
-                typedef AnEnum AnEnumeration;
-                void something(AnEnum e, AnEnumeration f);
-
-            The following is generated:
-
-                public enum AnEnum {
-                  foo,
-                  bar
-                }
-                public static void something(AnEnum e, AnEnum f) {...}
-
-            Note that a global enum like AnEnum above is generated into its own
-            file called AnEnum.cs. Enums defined within a C++ class are defined
-            within the C# proxy class. Some of the typemaps for modifying C# proxy
-            classes also work for enums. For example global enums can use
-
-                %typemap(csimports) to add in extra using statements.
-
-            Global enums and class enums can use
-
-                %typemap(csclassmodifiers) to make the enum private, public etc.
-                %typemap(csbase) to change the underlying enum type (enum base)
-
-            If we add this for the above example:
-
-                %typemap(csclassmodifiers) AnEnum "protected"
-                %typemap(csbase) AnEnum "long"
-
-            the following is generated:
-            
-                protected enum AnEnum : long {
-                  foo,
-                  bar
-                }
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-04/07/2004: cheetah (William Fulton)
-            Seg fault fix for empty enums, like
-                enum Foo {};
-
-03/21/2004: mmatus
-            [Note: this change revoked on 04/25/2004]
-	    [Python] Makes the following 'var' cases more uniform:
-
-                std::string ga;
- 
-                struct A {
-                  static std::string sa;
-                  std::string ma;
-                };
-
-
-            now the three variables (ga, sa, ma) can be assigned as:
-
-
-                  cvar.ga = "hello";
-                  A.sa = "hello";
-                  a.ma = "hello";
-
-            ie, now 'ma' will also use a std::string typemap 'in' if
-            defined, before it was only accepting a 'p_std_string'
-            pointer.  Note, however, that 'ma' will not use the
-            'varin/varout' typemaps (that probably could be more
-            natural), but it will pick up the 'in' typemap for const
-            std::string& (which is easier).
-
-	    The changes in cwrap.c and lang.cxx will probably fix the
-	    behaviour in other languages that do not overload the
-	    membervarHandler method "too much".
- 
-            
-03/21/2004: mmatus
-	    [Python] Disabling the default instantiations like:
-
-	      %template() std::pair<int,int>;
-
-            for all the primitive types and STL containers/classes.
-	    They are expensive, specially for pair and map, and the
-	    previous behaviour also requires the user to perform
-	    manual instantiations. Still, if the speed difference is
-	    not important, it can be re-enabled by defining the macro
-	    SWIG_STD_DEFAULT_INSTANTIATION (see std_common.i).
-
-	    Also, normalizing the INPUT/OUTPUT/INOUT typemaps. Now
-	    they use the same conversors than the rest of the
-	    typemaps, and you can use them for std::pair, std::string
-	    and all the other STL types, like in:
-
-	      void p_inoutd(std::pair<double, double> *INOUT);
-
-	    Added the attribute.i and implicit.i files with macros to
-	    transform functions pairs like 'set_x'/'get_x' 
-	    (or 'T& x()'/'const T& x() const') into an attribute,
-	    and allowing the use of implicit constructors in typemaps
-	    (see the files for more details).
-
-03/21/2004: mkoeppe
-	    [Guile] Fix the documentation strings of functions with
-	    anonymous arguments.
-
-03/18/2004: mmatus
-	    [Python] More general std_string.i interface.
-	    Now you can wrap it using
-
-	      %template(string) std::basic_string<char>;
-
-            and use the std::string as a base class:
-
-	      struct A : std::string {
-              };
-
-	    But more important, swig will recognize 
-	    both std::basic_string<char> and std::string as
-	    the same type.
-
-03/16/2004: mmatus
-	    Previously added, but not mentioned before:
-
-	    - friend declaration support, swig now emits a global
-	      function in the same class scope.
-
-	    - ref/unref features: to mix ref counting C++ classes
-	      and native script ref counting mechanisms (like in python).
-	    
-	      Use it like:
-
- 	        %feature("ref")   RCObj "$this->ref();"
-                %feature("unref") RCObj "$this->unref();"
-
-	      And the class RCObj, and all the derived ones, will
-	      perform the right ref/unref calls when a new pointer  
-	      is returned to the target language, or when the target
-	      language attempts to delete the object.
-	      
-	      See the refcount.i file in the test-suite for more
-	      details.
-
-	    
-03/16/2004: mmatus
-	    [Python] Using the new %fragment support, major rewrote 
-	    of the python swig library, including:
-
-	    - Almost automatic template/typemap instantiation for
-	      the STL components. For example, now you can write:
-
-		   %template(vector_i) std::vector<int>;
-
-              and a specialized vector_i class is emitted with all
-	      the needed typemaps. No need to use the old
-	      'specialize_vector' macros.
-
-	      Note you can also define
-
-	          %template(matrix_i)   std::vector<std::vector<int> >;
-	          %template(vector_pii) std::vector<std::pair<int,int> >;
-
-	    - The empty template instantiation 
- 	 
-           	  %template() std::vector<int>;
-
-	      defines the vector typemaps, but no proxy class. For all the
-              fundamental types, the empty template instantiation are
-              defined, so, you can say
-
-	      %include std_vector
-
-	      int func(const std::vector<int>& a);
-	      
-	      where the proper typemap is applied to 'a', but no
-	      std::vector<int> proxy is generated.
-	      
-
-            - All the STL containers present a more uniform behavior and
-	      more complete interface declaration. The following are 
-	      now supported:
-
-		  std::vector<T>
-		  std::list<T>
-		  std::deque<T>
-		  std::set<T>
-		  std::multiset<T>
-		  std::map<T>
-		  std::multimap<T>
-              
-              not a container, but also supported:
-
-		  std::pair<T,U>
-
-              also, more typemaps are defined for all of them,
-	      including varin, varout, typecheck, etc.
-
-            - Initial attempt to implement the STL containers
-              considering allocators, ie:
-
-	          std::vector<T,A>			
-
-	      it is partially working, but it is just a workaround
-	      while swig improves its template type support.
-	      
-	      
-	     Please test with your particular setup. It seems to be
-	     working with g++ 3.2.2, g++ 2.96, Intel icc and SGI CC
-	     compilers, plus python 1.5.2, 2.0 and 2.3, but since
-	     we are using templates, there is a chance you can find
-	     some problems when using with an old C++ compiler.
-
-03/16/2004: mmatus
-
-            - Allowing the empty %template directive, such as
-
-                 %template() std::vector<int>;
-
-	      to process the class "typedef"s and "typemap"s. Before
-	      only the internal "typedef"s were processed.
-
-              This makes possible to emit the default in/out
-              typemaps without the need of wrapping an specialized
-              vector instance.
-
-	    - Adding the preprocessor extension #@ which mangles the
-              following macro argument, like in:
-
-                #define macro(X)  #@X
-                macro(int)         -> int
-                macro(std::string) -> std_s_s_string
-                
-	    - Fragments can now be "type specialized", as the typemaps. The
-	      syntax is as follows
- 
-                %fragment("name","header") 
-                  { /* a type independent fragment (old syntax) */ }
-                %fragment("name" {Type}, "header") 
-                  { /* the fragment is type dependent */}
- 
-              Now fragments can also be used inside templates: 
-
-                template <class T>
-                struct A {
-                   %fragment("incode"{A<T>},"header") {
-		      /* 'incode' specialized fragment */
-		   }
- 
-		   %typemap(in,fragment="incode"{A<T>}) {
-		      /*
-		         here we use the 'type specialized' 
-                         fragment "incode"{A<T>}
-                      */
-		    }
-                };
-			     	
-
-03/11/2004: cheetah (William Fulton)
-            [Java] Director bug which meant that some virtual functions overridden in
-            Java were not being called on some operating systems. Bug reported and fixed
-            by Robert de Vries and Scott Michel.
-
-03/02/2004: mkoeppe (Matthias Koeppe)
-	    [Guile] In -scm mode, don't forget to check the type of string arguments.
-
-02/24/2004: cheetah (William Fulton)
-            [C#] New commandline option -namespace <name>. This allows one to specify
-            a C# namespace into which all C# classes are generated.
-
-02/23/2004: mkoeppe (Matthias Koeppe) 
-	    [MzScheme] Use FUNC_NAME rather than a bogus typemap variable for signalling
-	    errors.  Call scheme_wrong_type with a zero-based argument number.  
-	    Reported by Ondrej Pacovsky, SF #902621.
-
-	    [Guile] Define FUNC_NAME also in the dispatch wrapper for overloaded
-	    functions.  Patch by John Lenz, SF #896255.
-
-02/22/2004: mkoeppe (Matthias Koeppe)
-	    [Guile] In -scm mode, don't try to invoke a null destructor function.
-
-02/20/2004: cheetah (William Fulton)
-            Fixes so that the SWIG source will compile using the Digital Mars Compiler
-            (formerly Symantic compiler) on Windows. Submitted by Scott Michel.
-
-02/13/2004: mkoeppe (Matthias Koeppe)
-	    [MzScheme] New command-line argument -noinit.  Use it for building
-	    the runtime library, where we don't want to define the functions
-	    scheme_initialize etc.  Reported by Tim Brown, SF #891754.
-
-	    [MzScheme] Don't produce invalid C code when invoked with the
-	    -declaremodule option.  Reported by Tim Brown, SF #891108.
-	    
-	    [Guile] Build the runtime library with passive linkage, to rename
-	    the SWIG_init function uniquely.
-
-02/12/2004: cheetah (William Fulton)
-            [Java, C#] Patch submitted by Bill Hoffman which prevents SWIG from crashing
-            when a file for the typewrapper class cannot be opened.
-
-02/11/2004: cheetah (William Fulton)
-            [Java, C#] Overloading changes:
-              - Methods which are overloaded in const only no longer generate Java
-                code that won't compile - the first method parsed is used and a
-                warning is displayed. Note that this behaviour is slightly different
-                to the scripting languages which always uses the non-const method.
-              - Warning messages 509 and 512 replaced by new warning number 516, which 
-                is more relevant to these statically typed languages as the overloaded
-                methods aren't 'shadowed', they are ignored.
-
-01/23/2004: mkoeppe (Matthias Koeppe)
-	    [Guile] Replace the "known_classes" hash table by a node
-	    attribute.  Methods of classes in C++ namespaces now get
-	    the proper specializer in the GOOPS declaration.
-	    Reported by rm@mh-freiburg.de.
-
-01/23/2004: mkoeppe (Matthias Koeppe)
-	    [Guile] Uniquify the argument names in GOOPS shadow method
-	    declarations.  Reported by rm@mh-freiburg.de.
-
-01/21/2004: sunshine (Eric Sunshine)
-            Revived the NextStep port of SWIG.
-
-            Fixed fatal problem in DohStrstr() caused by difference in strstr()
-            implementation which made %apply become entirely dysfunctional.  On
-            NextStep, strstr("foo","") evaluates to NULL; whereas, on modern
-            platforms, it evaluates to "foo".  %apply relies extensively upon
-            strstr("foo","") evaluating to non-NULL, therefore it failed
-            catastrophically when faced with NextStep's strstr().
-
-            Added `bool' check to configure.in since NextStep's C++ compiler
-            does not supply this type.  swig.h now fakes up `bool' if needed.
-
-            Worked around NextStep C++ compiler bug in which C++ code is
-            disallowed inside extern "C" functions.  This problem affected all
-            language modules, since they publish hook functions of the form:
-                extern "C" Language *swig_foo(void) { return new FOO(); }
-            Fixed by creating a C++ wrapper:
-                static Language *new_swig_foo() { return new FOO(); }
-                extern "C" Language *swig_foo(void) { return new_swig_foo(); }
-
-            Ensured that Swig_copy_string() is used in place of strdup() since
-            NextStep does not supply strdup().
-
-            Fixed detection of Ruby library name and location in configure.in.
-            Problem 1: Assumed that library always resided in Ruby's "archdir",
-            which was correct for Ruby 1.6.x, but which is incorrect for Ruby
-            1.8.x, in which case the library normally resides in Ruby's
-            "libdir".  Problem 2: Assumed that the library could always be
-            linked via "-l"+RUBY_INSTALL_NAME (where RUBY_INSTALL_NAME
-            typically is "ruby"), however this failed for platforms, such as
-            NextStep, which do not support shared libraries.  In this case, the
-            static library name in 1.8.x is libruby-static.a, thus
-            -lruby-static is required.  The new logic works correctly for
-            static and shared libraries for 1.6.x and 1.8.x.
-
-            Fixed detection of Perl CFLAGS in configure.in for NextStep.
-            Detection code extracted CFLAGS from Perl's %Config hash but
-            neglected to add a newline to the value before passing it through
-            `sed'.  NextStep's ancient `sed' discards input which is not
-            terminated with a newline, thus Perl CFLAGS always evaluated to the
-            empty string.
-
-01/16/2004: cheetah (William Fulton)
-            Tidy up in the exception handling code that is generated when
-            C++ exception specifications are wrapped with the throws typemap.
-            This redundant code is no longer generated:
-
-                catch(...) {
-                    throw; 
-                }
-
-01/12/2004: wsfulton on behalf of mmatus (marcelo matus) 
-            if a method uses %exception and the method requires the use
-            of the throws typemap, the code in a throws typemap will be
-            generated inside the try body. For example:
-
-              %exception method {
-                try {
-                  // method action 
-                  $action
-                } catch (int i) {
-                  // method int catch handler
-                } catch (...) {
-                  // method generic catch handler
-                }
-              }
-              %typemap(throws) Except %{
-                // throws typemap Except catch handler
-              %}
-
-              %inline %{
-              class Except {};
-              void method(int i) throw (Except);
-
-            Will generate:
-
-              {
-                  try {
-                      // method action 
-                      try {
-                          method(arg1);
-                      }
-                      catch(Except &_e) {
-                          // throws typemap Except catch handler
-                          
-                      }
-                      
-                  } catch (int i) {
-                      // method int catch handler
-                  } catch (...) {
-                      // method generic catch handler
-                  }
-              }
-
-
-            As can be seen, the inner try catch block is for the throws typemaps.
-            Previously, this was reversed so that the inner try catch block
-            was the %exception code. In the example above, it would have been
-            impossible to catch Except as the catch all (...) would catch the
-            exception instead.
-
-Version 1.3.21 (January 11, 2004)
-=================================
-
-01/10/2004: cheetah (William Fulton)
-            The output format for both warnings and errors can be selected for
-            integration with your favourite IDE/editor. Editors and IDEs can usually
-            parse error messages and if in the appropriate format will easily take you 
-            directly to the source of the error. The standard format is used by 
-            default except on Windows where the Microsoft format is used by default.
-            These can be overridden using command line options, for example:
-
-                $ swig -python -Fstandard example.i
-                example.i:4: Syntax error in input.
-                $ swig -python -Fmicrosoft example.i
-                example.i(4): Syntax error in input.
-
-01/09/2004: beazley
-            Fixed [ 871909 ] simple namespace problem.
-            This was a problem using anonymous structures in a namespace.
-            For example:
-
-                namespace ns {
-                   typedef struct  {
-                      int n;
-                   } S;
-                };
-
-            Reported by Josh Cherry.
-
-01/09/2004: beazley
-            Fixed some broken Perl examples.
-
-12/28/2003: cheetah (William Fulton)
-            [Java and C#] Fixes for wrapping covariant (polymorphic) return types.
-            For example:
-
-                struct Base {
-                  virtual ~Base();
-                  virtual Base* copy() const = 0;
-                };
-                struct Derived : Base {
-                  virtual Derived* copy() const;
-                };
-
-            The Derived::copy proxy method returns Base not Derived. A warning is issued
-            about this. Previously the pointer used by the proxy class was incorrectly
-            treated as a Base* instead of a Derived*.
-
-12/18/2003: cheetah (William Fulton)
-            Fix so that Windows paths are displayed correctly when reporting errors.
-            An error previously would have been shown something like:
-
-              .?xample.i:14: Syntax error in input.
-
-            instead of:
-
-              .\example.i:14: Syntax error in input.
-
-
-Version 1.3.20 (December 17, 2003)
-==================================
-
-12/17/2003: beazley
-            Last minute modifications.   Perl5 module now generates shadow classes
-            by default like all of the other modules.  PHP4 wrappers no longer
-            include "config.h". 
-
-12/14/2003: beazley
-            Weakened warning message related to constructor names so that an
-            unusual nested-class wrapping technique would work again (apparently
-            it worked in some older SWIG releases).   For example:
-
-               class Scope {
-                   class ClassA;
-                   class ClassB;
-               };
-               class Scope::ClassA {
-               ...
-               };
-               class Scope::ClassB {
-               ...
-               }
-
-            Note:  There is still some odd interaction with the SWIG symbol
-            table/type system that will need to be looked at in a future release.
-            Reported by Gustavo Niemeyer.
-
-
-12/11/2003: cheetah (William Fulton)
-            [Java] Protected class methods are wrapped as protected Java methods 
-            when using the dirprot director feature. This can be changed using
-            %javamethodmodifiers to something else should the need arise, for
-            example, private or package access.
-
-12/11/2003: cheetah (William Fulton)
-            [Java, C#] 
-            %javamethodmodifiers (Java) and %csmethodmodifiers (C#) operate slightly 
-            differently. Previously this feature had to be present to set the method
-            modifiers. Now it is only used if it exists for the method being wrapped.
-            The default is "public" as previous however, when wrapping protected
-            director methods it is "protected". This change will not affect existing
-            use of the %javamethodmodifiers or %csmethodmodifiers.
-
-12/11/2003: mmatus (Marcelo Matus)
-
-	    This fix some recurring reports about keywords not been
-	    properly identified and warned, and it solves the problem
-	    of how to add a test file to the test-suite such that it
-	    doesn't use any keyword of all the supported languages
-	    (and doing it without compiling the test for all the
-	    supported languages, thing that is not always possible,
-	    and without requiring you to know all the supported
-	    language keywords, thing that is always impossible).
-
-	    So these are the changes globally speaking:
-
-	    - Uniform the definition of the keyword warnings through
-	      the supported languages: all the languages has now a
-	      separate file that defines the keywords or bad names:
-
-		  python/pythonkw.swg
-		  chicken/chickenkw.swg
-                  ....
-
-	    - Added keyword list for most of the languages that didn't
-	      have one (using the new separated file).
-		    	    
-	    - Added the "All keywords" warning support: -Wallkw option.
-
-              This option allows you to include all the known keywords
-	      for all the supported languages, and can be used as:
-
-                 swig -Wallkw ....
-	    
-	      This will help to the process of adding a test-suite
-	      file that can be compiled in all the swig supported
-	      languages, and it will be also helpful for users who
-	      want to create multi-language libraries.
-	    
-	    And these are the detailed changes (mostly file addition):
-
-	    - For the languages that already have some sort of keyword
-	      warning list, move it to an external languagekw.swg
-	      file, ie:
-	    
-	         move keywords from python.swg -> pythonkw.swg
-	         move keywords from chicken.swg -> chickenkw.swg
-	         move keywords from tcl8.swg -> tclkw.swg
- 
-              and re-include languagekw.swg from language.swg.
-	    
-	    - For the language that didn't have a keyword list, and
-	      for the ones that I could find a list, add the
-	      languagekw.swg file, ie:
-
-                 csharp/csharpkw.swg
-                 java/javakw.swg
-                 php4/phpkw.swg
-		 pike/pikekw.swg	 
-		 ruby/rubykw.swg
-
-
-              also add a line in language.swg to include
-	      languagekw.swg, but now it is commented!!!, like in
-	      java.swg:
-
-                  /* java keywords */
-                  /* please test and activate */
-                  //%include "javakw.swg"
-
-	      ie, there will be no change in how swig runs normally
-	      until the language maintainer test and uncomment that
-	      line.
-	      
-	      So, please check each languagekw.swg file (I left the
-	      link to the keyword list source for checking), and after
-	      testing, uncomment the %include line.
-
-	    - Added the file allkw.swg, which includes all the
-              languagekw.swg files.
-
-	      For the languages that has no languagekw.swg file right
-	      now, and if they need one, add the file into the
-	      language directory, and add the corresponding include
-	      line into the allkw.swg file.
-	      
-	    - Added the -Wallkw that includes the allkw.swg file.
-	      Note that the old -lallkw.swg option couldn't be used
-	      since it include the file after it would be needed.
-
-
-	    Hopefully, the -Wallkw option will be added to the default
-	    rules in the related test-suite Makefiles, so, when
-	    creating a new test, or adding a new swig library file
-	    (like _std_deque.i), swig will warn you if you are using a
-	    bad name, considering all the language where it needs to
-	    run.
-	    
-	    Right now you can test it by using:
-
-               make check-python-test-suite SWIG="swig -Wallkw"
-
-	    or using your favorite target language, it doesn't matter.
-
-	    And yes, there are several examples that are using
-	    reserved keywords, specially from csharp.
-          
-	    *** Remember ****: the new keyword warning lists are not
-	    included by default in any of language that before didn't
-	    have one. To enable the keyword warnings as the default
-	    behavior, the inclusion of the languagekw.swg file has to
-	    be uncommented at each language.swg file.
-
-	    So, all the language maintainers, please check the
-	    keywords list. 
-
-	    Also, you can add buit-in names, and not only keywords, like
-	    'True/False' in python.  Remember that you can be more
-	    specific and refer only to member names, like *::configure
-	    or *::cget (see an example in the tcl8/tcl8kw.swg file),
-	    or only global names, like ::range (see an example in the
-	    python/pythonkw.swg file.
-
-	    Just to be consistent, use the following codes:
-
-	    - Use code 314 for keyword and/or fatal bad names.
-	    - Use code 321 for buit-in and/or not fatal bad names.
-           
-            so, they can't be disabled/enabled independently (see
-	    python/pyhtonkw.swg for examples).
-
-	    **** And don't add any new test file without checking it
-	    with the -Wallkw option!! (that includes me) *****.
-	  
-
-12/11/2003: cheetah (William Fulton)
-            SF bug #854634
-            Added support for accepting the Unix directory separator '/' on 
-            Windows and the Mac in addition to the native one ( '\' on 
-            Windows). This can be used in %import, %include and commandline 
-            options taking a path, for example -I. On Cygwin, both the Windows
-            and Unix directory separator can now be used (was '/' only).
-            
-12/10/2003: mmatus (Marcelo Matus)
-
-            [python] Implementing the runtime "reprotected" director
-	    members, if you have:
-    
-                %feature("director") B;
-
-                class Bar {
-                public:
-                  virtual ~Bar();
-                  virtual int hello() { return do_hello();)
-
-                protected:
-                  virtual int do_hi() {return 0;}
-                  virtual int do_hello() {return 0;}
-                };
-
-            then, at the python side
-
-                import my_module
-
-                class Foo(my_module.Bar):
-                  def do_hello(self):
-                    return 1
-                  pass
-                 
-	        b = Bar() # Pure C++ Director class
-                f = Foo() # C++ Director + python methods
-
-                b.hello() # Ok, and it calls C++ Bar::do_hello()
-                f.hello() # Ok, and it calls Python Foo::do_hello()
-
-                b.do_hi() # RuntimeError, do_hi() is protected!!
-                f.do_hi() # RuntimeError, do_hi() is protected!!
- 
-                b.do_hello() # RuntimeError, do_hello() is protected!!
-                f.do_hello() # Ok, since it its redefined in python.
-
-            Here Bar.do_hello is always protected, but Foo.do_hello
-            is "public", because it is redefined in python. Before,
-	    all the 'do_hello' methods were public.
-
-	    This seems to be a good compromise between C++ and python
-	    philosophies, ie, all the director protected methods keep
-	    protected at the user side (C++ way) until they are
-	    redefined (python way, were all defined methods are always
-	    public). And this is not only a good compromise, it also
-	    seems to be the only way to do it :).
-
-	    Now ruby has native director protected members, and python
-	    pure runtime support. I guess these are the two possible
-	    extreme cases. And hopefully, they could be used as
-	    templates to modify the other languages that support
-	    directors, so they can "reprotect" the protected director
-	    members at the target language side.
-
-	    This finished the director protected support for the 
-	    python language. Ocalm will need to add the
-	    "reprotection" later.
-
-12/10/2003: mmatus (Marcelo Matus)
-
-	    The following case (reported by Lyle Johnson) was fixed:
-
-	      %rename(x) Foo::y();
- 
-	      class Foo { 
-	      public:
-	        void y();
-
-	      protected:
-	        int x;
-	      };
-
-	   swig warned that the symbol 'x' was already defined, and
-           the renaming fails. 'x' was not emitted, since it is
-           protected, but it was kept in the symbol table with too
-           much information.
-
-	   Now swig works for all the cases (plain, director and
-	   dirprot) again. This was fixed by allowing the parser.y to
-	   decide much closer what to do with 'x'. Before all the
-	   discarding or generation was resolved at the lang.cxx
-	   stage. Also the changes in parser.y to implement the
-	   director protected mode are now much more encapsulated, and
-	   they get disabled if the mode is not enabled. Before the
-	   deactivation was done at the generation stage (lang.cxx).
-
-	   By the other hand, if the director mode is enabled, and
-	   %rename is done, reusing a protected member name, there is
-	   a pathological case:
-
-	     %rename(x) Foo::y();
- 
-             class Foo : public A {
-	     public:
-	       void y();
-
-	     protected:
-	       int x;            /* works */
-	       static  int x;    /* works */
-	       static  void x(); /* works */
-	       typedef void x(); /* works */
-
-	       virtual void x(); /* always fails, as it should, since
-                                    Foo::x() will be emitted in the
-                                    director */
-
-	       void x(); /* always fails, but sometimes it shouldn't,
-                            since the Foo::x() will not be emitted if
-                            it is not virtual */
-
-	     };
-
-	   The last case is not always right because at the parser.py
-	   stage it is not possible to decide if the protected member
-	   Foo::x() could or not conflict with the renamed Foo::y(),
-	   since Foo::x() could be virtual by inheritance.
-
-	   I guess this just an intrinsic limitation, and no much can
-	   be done about it without resorting into larger changes to
-	   postpone, under certain conditions, the multiply symbol
-	   detection (lang.cxx stage).
-	   
-	   So, by now, it is just considered a well known "feature" in
-	   the director protected mode. The good news is that it seems
-	   to be a rare case, and it can be avoided by the user by
-	   hiding 'x' before renaming 'y':
-
-	     %rename(_x) Foo::x();
-	     %rename(x) Foo::y();
-	   
-
-12/08/2003: mmatus (Marcelo Matus)
-	    The virtual method detections now properly
-	    treats the following cases:
-
-             namespace foo { typedef int Int; }
-	     struct A {};
-	     typedef A B;
-
-             struct Foo {
-               virtual ~Foo() {}
-
-               virtual Foo* cloner() = 0;
-	       virtual int get_value() = 0;
-	       virtual A* get_class() = 0;
-	       virtual void just_do_it() = 0;
-	     };
-
-             struct Bar : Foo
-             {
-               Bar* cloner();
-               foo::Int get_value();
-               B* get_class();
-               void just_do_it();
-             };
- 
-            All the Foo and Bar methods are virtual.  A new attribute
-	    "virtual:type" record the base polymorphic type. In the
-	    previous cases we have:
-
-	       type : Bar       virtual:type : Foo
-	       type : foo::Int  virtual:type : int
-	       type : B         virtual:type : A
-	       type : void      virtual:type : void
-
-            This attribute is useful in languages (java+directors)
-	    that could have problems redefining Bar* Bar::cloner().
-
-	    If you never had code like the above, you will see no
-	    effects. But if you have some code like that, you
-	    will see some effects since some methods that
-	    before were not properly treated as virtual,
-	    will start to act like that. This could enlarge
-	    your director classes.
-	    
-
-12/08/2003: mmatus (Marcelo Matus)
-	    The director protected member support (dirprot)
-	    is disabled by default.
-	    
-	    It can be enable by using '-dirprot' or by adding
-	    the option to the module declaration, like:
-
-            %module(directors="1",dirprot="1") my_module
-
-	    This module option was added to properly compile the
-	    director_protected.i and director_nested.i examples.
-	    
-	    The feature has been tested with python[2.2,2.3] 
-	    and ruby[1.6.7], both at compilation and runtime, and 
-	    java[j2sdk1.4.1_01], but only at compilation (my java
-	    installation doesn't run any of the director examples,
-	    olds nor news).
-
-	    Please test for ocaml and java.
-	    
-	    The errors reported by William and Scott were fixed,
-	    except for a warning about  SWIG_JavaThrowExecption()
-	    multiply defined. I can't reproduce this error with my
-	    examples. We will wait for Scott to send us a minimal
-	    case.
-
-
-12/07/2003: mmatus (Marcelo Matus)
-	    The director protected member support has been
-	    completly moved out from python.cxx, and now
-	    resides in the common lang.cxx, emit.cxx and
-	    allocate.cxx files. 
-
-	    This means it should work for all the other languages
-	    that currently support directors, ie, python, java, ocalm
-	    and ruby.
-
-	    The change has been tested with python (compilation+runtime)
-	    and java (just compilation).
-	    
-	    Please add runtime tests for the missing languages 
-	    and test it.
-
-	    The '-nodirprot' option was moved to the principal main,
-	    and can be used from all the languages.
-
-12/07/2003: cheetah (William Fulton)
-            [Java] Fixed and improved error checking of STRING_OUT typemaps in 
-            various.i.
-
-12/04/2003: mmatus (Marcelo Matus)
-
-	    - Now the virtual members with no explicit declarator
-	    are properly identified:
-	    
-                struct A  {
-                 virtual int f() = 0;
-                };
-
-                struct B : A {
-                  int f();
-                };
-
-	    Here, B::f() is virtual, and the director and the
-	    virtual elimination mechanism now recognize that.
-
-            - [C#] This fix also fixes the problem where 'override' was not being 
-            used on any overridden virtual method, so for struct B above, 
-            this C# code is generated:
-
-                public class B : A {
-                  ...
-                  public override int f() {
-                    ...
-                  }
-                  ...
-                }
-
-	    - Initial support for protected virtual methods. They are now
-	    properly emitted when using with director (python only by
-	    now).
-	    
-                %feature("director") A;    
-                struct A  {
-                protected:
-                 virtual int f1() = 0;
-                };
-
-                %feature("director") B;
-                struct B : A{
-                protected:
-                  int f1();
-                  virtual f2();
-                };
-
-	    This can be dissabled by using the '-nodirprot' option.
-
-	    - The feature 'nodirector' is working now at the top level,
-	    so, it must work for all the languages:
-
-                %feature("director") A;
-                %feature("nodirector") A::f2;
-
-                struct A {
-                 virtual int f1();
-                 virtual int f2();
-                };
-                
-	    in this case, only 'f1' is exported to the director class.
-	    
-	    - Added director support for const TYPE& arguments (python).
-
-12/02/2003: cheetah (William Fulton)
-            [Java] Fix for INOUT and OUTPUT typemaps in typemaps.i for when the JNI type 
-            is bigger than the C type. For example, unsigned long (32bits on most systems)
-            is mapped to jlong (64bits). Returned value was incorrect. Bug reported by 
-            Brian Hawley.
-
-12/02/2003: cheetah (William Fulton)
-            [C# and Java] Better fix for entry dated 05/11/2003. Fixes the following
-            typemaps:
-
-            Java: javabase, javainterfaces, javaimports, javaclassmodifiers,
-            javaptrconstructormodifiers, javafinalize, javagetcptr & javacode.
-            C#: csbase, csinterfaces, csimports, csclassmodifiers,
-            csptrconstructormodifiers, csfinalize, csgetcptr & cscode.
-
-            It also fixes bug in using arrays of C structs with arrays_java.i 
-            as reported Scott Michel.
-
-12/02/2003: beazley
-            [Perl] Fixed [ 852119 ] recursive inheritance in output .pm, perl5.
-            Reported by William Dowling.
-
-12/02/2003: beazley
-            [Tcl] Fixed [ 755382 ] calling func(const vector<T>& p) evaluates p[0] in interp.
-            The Tcl type checker was improperly handling the interpreter result when
-            type violations were supposed to be ignored.
-            Reported by Flaviu Popp-Nowak.
-
-11/30/2003: cheetah (William Fulton)
-            Fixed [ 545058 ] configure's --with-tclincl has no effect
-
-11/30/2003: cheetah (William Fulton)
-            [Java] Fixed [ 766409 ] missing symbol SWIG_JavaThrowException during module load
-            SWIG's internal functions are all static as there is no need for different SWIG
-            generated modules to share any code at runtime.
-
-11/30/2003: beazley
-            [Tcl] Added support for C++ pointers to members.
-
-11/28/2003: cheetah (William Fulton)
-            Fixed [ 848335 ] Directors: #include wrapper .h file - was incorrectly
-            adding a directory to the generated #include "foo_wrap.h" statement
-            in some situations.
-
-11/28/2003: cheetah (William Fulton)
-            [Java] Fixed [ 849064 ] JAVA : Access modifier for derived class wrong.
-            The delete() method is always public now. It used to be protected whenever a 
-            destructor was non public. An UnsupportedOperationException runtime 
-            exception is thrown instead of making delete() protected now.
-
-11/28/2003: beazley
-            [Perl5] Added support for C++ pointers to members.
-
-11/28/2003: beazley
-            Fixed [ 850151 ] PYVERSION with python2.3 in configure of SWIG 1.3.19 (Maybe).
-
-11/28/2003: beazley
-            Fixed  [ 850666 ] #include extra line added.  
-            This should fix some problems with getting correct line numbers on
-            error messages.
-
-11/26/2003: beazley
-            Fixed another one of Marcelo's evil template bugs (infinite
-            recursion). [ 849504 ] template and typedef -> inf. recursion.
-
-11/26/2003: beazley
-            Fixed parsing problem with declarations like this:
-
-	         int *x = &somearray[0];
-
-11/25/2003: beazley
-            Fixed [ 756552 ] missing default argument class scope with "|".
-            This is really only a band-aid fix for use of class-enums in
-            expressions.  For example:
-
-                  class A {
-                  public:
-                     enum Flag { flag1 = 0x1, flag2 = 0x2 };
-                     void foo(int x = flag1 | flag2);
-                  };
-
-            Note: there are still some (more subtle) cases that are broken,
-            but hard to fix due to an issue with template expansion. Will
-            address later.
-            Reported by Dmitry Mironov.
-
-11/25/2003: beazley
-            Incorporated [ 840878 ] support for %inline { ... } (PATCH).
-            This adds support for the following:
-
-                  %inline {
-                      ... some code ...
-                  }
-
-            The difference between this and %inline %{ ... %} is that the
-            enclosed text is processed by the SWIG preprocessor.   This
-            allows special macros and other processing to be used in 
-            conjunction with %inline.
-            Contributed by Salvador Fandino Garcia.
-
-11/25/2003: beazley
-            Fixed [ 836903 ] C++ inconsistency (with void arguments).
-            SWIG was having difficulty with f() vs f(void) in C++ programs.
-            For instance:
-
-                  class A {
-                  public:
-                      virtual void f(void) = 0;
-                  };
-
-                  class B {
-                  public:
-                      virtual void f();    // Not matched to f(void) correctly
-                  }; 
-
-            The parser now normalizes all declarations of the form f(void) 
-            in C++ classes to f().  This should fix a variety of subtle 
-            problems with inheritance, optimizations, overloading, etc.
-            Problem reported by Partho Bhowmick.
- 
-11/25/2003: beazley
-            [Perl5] Incorporated [ 841074 ] better croaking (PATCH).  This fixes some problems
-            with strings and provides some new error functions. 
-            Contributed by Salvador Fandino Garcia.
-            
-11/25/2003: beazley
-            Fixed [ 791835 ] Default argument with cast: txt = (char *)"txt" syntax Error.
-            The parser should now accept things like this:
-
-                 void foo(char *s = (char *) "Hello");
-
-            Problem reported by Claudius Schnorr.
-
-11/24/2003: beazley
-            [Tcl] Fixed problem with cross module linking.  Previously modules referred
-            to base classes through a global variable.   Now, the module looks up base
-            classes through the type system itself---avoiding the need to link to a global
-            like before.  Caveat:  modules with base classes must be loaded before
-            modules with derived classes.
- 
-11/24/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] In -scm mode, use () to represent null pointers,
-	    as it is done in -gh mode.
-
-11/23/2003: mkoeppe (Matthias Koeppe)
-	    Add a generated script "preinst-swig", which can be used
-	    to invoke SWIG before it has been installed.  It arranges
-	    that the runtime libraries from the source directory are
-	    used. 
-
-11/23/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] In -gh mode, don't forget to call SWIG_Guile_Init.
-	    Add a SWIG_contract_assert macro.
-
-11/23/2003: mkoeppe (Matthias Koeppe)
-	    [MzScheme] Update the configure check for the dynext object to work
-	    with MzScheme 205.
-
-11/20/2003: mmatus
-	    Fixed the include/import error reported by Kerim Borchaev,
-	    where two files with names like
-
-	    'dir1/hello.i'
-	    'dir2/hello.i'
-	    
-	    can not be include at the same time. Swig was including
-	    just the first one, assuming the second one was not a
-	    different one, since it was checking/keeping just the
-	    basename 'hello.i'.
-
-11/19/2003: beazley
-            Changes to the SWIG runtime library support. 
-              -  The -c command line option has been renamed to -noruntime
-              -  New command line option: -runtime.  When supplied, this
-                 inserts the symbol SWIG_GLOBAL into the wrapper code.  This,
-                 in turn, makes all of the runtime support functions globally
-                 visible.
-               - New library file: swigrun.i.   Used to create modules
-                 for runtime library (if needed).
-    
-11/18/2003: cheetah (William Fulton)
-            'make srcrpm' rpmbuild fix - patch from Joe Cooper
-
-11/18/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Change meaning of configure option --with-guile to
-	    the name of the Guile executable.  The new option --with-guile-prefix 
-	    can be used to specify the tree where Guile is
-	    installed.  (However, usually it suffices to use the
-	    single option --with-guile-config.)  
-	    When running the run tests test-suite, make sure to use the
-	    version of Guile that SWIG was configured for.
-
-11/17/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Improvements to object-ownership management in 
-	    "-scm" mode.  (They do not apply to the default "-gh" mode.)
-	    * Renamed the smob type that indicates that the object can
-	      be garbage collected from "collected swig" to "collectable
-	      swig", which is more precise.  
-	    * Export the destructor functions again.  It is now
- 	      allowed to explicitly call destructors, even for
-	      garbage-collected pointer objects.  A pointer object
-	      that has been passed to a destructor is marked in a
-	      special way using a new smob type, "destroyed swig".
-	      (This helps avoid nasty memory bugs, where references to
-	      dead C objects are still held in Scheme. Moreover, the
-	      garbage collector will not try to free a destroyed
-	      object once more.)
-	    * Destructor-like functions can also mark their arguments 
-	      as destroyed by applying the typemap SWIGTYPE *DESTROYED.
-	      (It calls the function SWIG_Guile_MarkPointerDestroyed.)
-	    * Functions that "consume" their objects (or that "own"
-	      them after the call) can mark their arguments as
-	      not garbage collectable.  This can be done by applying
-	      the typemap SWIGTYPE *CONSUMED.  (It calls the function
-	      SWIG_Guile_MarkPointerNoncollectable.)
-	    * The macro TYPEMAP_POINTER_INPUT_OUTPUT from library
-	      pointer-in-out.i creates additional typemaps 
-	      PTRTYPE *INPUT_CONSUMED, PTRTYPE *INPUT_DESTROYED.
-	      They mark the passed pointer object likewise.
-	      The typemap PTRTYPE *OUTPUT creates a garbage-collectable
-	      pointer object, like %newobject does for a returned 
-	      pointer.  Use the new typemap PTRTYPE *OUTPUT_NONCOLLECTABLE
-	      to create a pointer object that will not be garbage collected.
-
-11/17/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Handle $input in "freearg" typemaps.
-	    Never qualify GOOPS slot names with the class name. 
-	    Handle optional arguments properly in the GOOPS methods.
-
-11/16/2003: cheetah (William Fulton)
-            Fixes for installation to work with the upcoming Automake-1.8.
-            mkinstalldirs was being used by a non-Automake makefile. 
-            mkinstalldirs is being phased out and so was not being
-            created by Automake. install-sh used instead.
-
-11/16/2003: cheetah (William Fulton)
-            [Java] Numerous director improvements, tweaks and bug fixes since 
-            the initial implementation have been contributed by Scott Michel.
-
-11/12/2003: beazley
-            [Python] When %feature("shadow") is used to add code to shadow
-            classes, the special variable $action expands to the name of the
-            underlying wrapper function that would have been called normally.
-
-11/12/2003: beazley
-            [Python] When generating proxy class code, SWIG emits a few
-            default methods for __repr__() and other Python special
-            methods.  Some of these methods are emitted after all of the
-            contents of a class. However, this makes it hard to override
-            the methods using %pythoncode and some other directives that
-            allow code to be inserted into a class.  These special methods
-            are now emitted into the code *before* all of the other methods.
-            Suggested by Eric Jones.
- 
-11/11/2003: beazley
-            Preprocessor enhancement.   For include statements like this:
-
-                  %include "foo/bar.i"
-
-            the directory "foo" is now added to the search path while 
-            processing the contents of bar.i.  Thus, if bar.i includes other
-            files in the same directory, they will be found. Previously,
-            you would have to add additional directories using -I to make this
-            work correctly.  Note: the C preprocessor seems to behave in
-            an identical manner on many (most? all?) systems.
-            Suggested by Kerim Borchaev.
-
-11/11/2003: beazley
-            Configuration changes to make SWIG work on Mac OS X 10.3.x (Panther).
-            Tested with Python, Tcl, Perl, and Ruby---all of which seem to work.
-
-11/08/2003: cheetah (William Fulton)
-            [Java] Fixed the typemaps in various.i which were mostly broken.
-            char **STRING_IN and char **STRING_RET typemaps replaced with 
-            STRING_ARRAY. float *FLOAT_ARRAY_RETURN typemap removed.
-
-11/08/2003: beazley
-            [Tcl] Tcl module now emits a safe module initialization function by
-            default.  It can be removed by running 'swig -nosafe'.
-
-11/04/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Only use the SCM_ API when the function
-	    `scm_slot_exists_p' exists (needed for GOOPS support).  
-	    This function was renamed during the Guile 1.5 series
-	    from `scm_slots_exists_p'.
-	    Report the right runtime library when invoked with
-	    -scm -ldflags.
-
-11/03/2003: mkoeppe (Matthias Koeppe)
-	    [Chicken] Fix #782052.  The --with-chickencfg configure
-	    option (and others) were not accepted.
-
-11/02/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Merge new set of GOOPS changes by John Lenz.
-	    GOOPS objects are now manipulated directly by the C code.
-	    Some fixes to typemap-GOOPS interaction.
-
-11/02/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Remove the file argument to -scmstub and -goops.
-	    The Scheme files are now always called MODULE.scm or
-	    MODULE-primitive.scm, where MODULE is the module name and 
-	    "primitive" can be changed by the -primsuffix option.
-	    The Scheme files are now placed in the directory given by
-	    the -outdir option, or the current directory.
-	    (Patch by John Lenz, slightly modified.)
-
-	    *** INCOMPATIBILITY [Guile] ***
-
-11/02/2003: mkoeppe (Matthias Koeppe)
-	    Unify the pointer-conversion runtime API.  The standard
-	    functions are:
-	     * SWIG_NewPointerObj (POINTER, TYPE, FLAGS)
-	        -- Create an scripting object that represents a typed
-		   pointer. FLAGS are language specific.
-	     * SWIG_ConvertPtr (INPUT, RESULT, TYPE, FLAGS)
-	        -- Get a pointer from the scripting object INPUT and
-		   store it in the place RESULT.  When a type mismatch 
-		   occurs, return nonzero.
-	     * SWIG_MustGetPtr (INPUT, TYPE, ARGNUM, FLAGS)
-	        -- Get a pointer from the scripting object INPUT and
-		   return it.  When a type mismatch occurs, throw an
-		   exception.  If ARGNUM > 0, report it as the 
-		   argument number that has the type mismatch.
-            [Guile]:    No changes.
-	    [MzScheme]: No changes.
-	    [Perl]:     Add the function SWIG_NewPointerObj.
-		        The function SWIG_MakePtr is kept.
-			The function SWIG_MustGetPtr is currently not
-			supported.
-	    [Python]:   Add the function SWIG_MustGetPtr.
-	    [Ruby]:     Add the function SWIG_MustGetPtr.
-	    [Tcl]:      Remove the "interp" argument of
-		        SWIG_NewInstanceObj, SWIG_ConvertPtr,
-		        SWIG_ConvertPacked, and SWIG_ConvertPtrFromString.
-			The function SWIG_MustGetPtr is currently 
-			not supported.
-	    No changes to Pike because its pointer conversion code did
-	    not look complete.  No changes to PHP4, because I did not
-	    understand its runtime code.  No changes to Chicken
-	    because major changes are expected soon anyway.  No
-	    changes to Java, OCaml, C# because they do not seem to
-	    have a pointer-conversion runtime API.
-
-            *** INCOMPATIBILITY [Tcl] ***
-
-11/02/2003: mkoeppe (Matthias Koeppe)
-	    [Perl5, PHP4, Pike, Python, Ruby, Tcl]: Use the
-	    preprocessor to rename external functions of the SWIG
-	    runtime API to follow the naming convention
-	    SWIG_<language>_<function>.  This should allow linking
-	    more than one interpreter into a program.
-
-10/31/2003: cheetah (William Fulton)
-            [C#] Fix since introducing the exception and std::string delegates.
-            The fix overcomes linker errors when using more than one SWIG module.
-            Problem reported by Andreas Sch�rk.
-
-10/31/2003: beazley
-            Incorporated patch: [ 823302 ] Incr Tcl support.
-            Contributed by Alexey Dyachenko.
-            Note: needs documentation.
-
-10/31/2003: beazley
-            Incorporated patch: [ 829325 ] new Python Module options and features.
-            Robin Dunn writes:
-
-            This patch makes a number of changes to the SWIG python module.
-
-            1. Add -apply option, and change the default code
-            output to use the foo(*args, **kw) calling syntax
-            instead of using apply(). If the -apply option is
-            given then code is generated as before. This is very
-            similar to Patch #737281 but the new -modern option
-            makes the second half of that patch unnecessary so it
-            is not included here.
-	    
-            2. Add -new_repr option. This is the same as my Patch
-            #797002 which I will mark as closed since it is no
-            longer needed. When this new option is used then the
-            __repr__ methods that are generated for proxy classes
-            will be more informative and give details about the
-            python class and the C++ class.
-	    
-            3. Add %feature("addtofunc"). It allows you to insert
-            one or more lines of code inside the shadow method or
-            function that is already generated, instead of
-            replacing the whole thing like %feature("shadow") does.
-            For __init__ it goes at the end, for __del__ it goes
-            at the begining and for all others the code generated
-            is expanded out to be like
-	    
-            def Bar(*args, **kwargs):
-            val = _module.Foo_Bar(*args, **kwargs)
-            return val
-	    
-            and the "addtofunc" code is inserted just before the
-            return statement. If the feature is not used for a
-            particular method or function then the shorter code is
-            generated just like before.
-	    
-            4. A little bit of refactoring to make implementing
-            addtofunc a little easier.
-	    
-            5. Added a -modern command-line flag that will cause
-            SWIG to omit the cruft in the proxy modules that allows
-            it to work with versions of Python prior to 2.2. The
-            result is a simpler, cleaner and faster python proxy
-            module, but one that requires Python 2.2 or greater. 
-
-10/31/2003: beazley 
-            Incorporated patch: [ 829319 ] XML module tweaks.
-            This adds a new command line option -xmllite that 
-            greatly reduces the amount of emitted XML code by
-            eliminating some fields mostly used in SWIG's
-            internal processing.  Contributed by Robin Dunn.
-
-10/31/2003: beazley
-            Incorporated patch: [ 829317 ] Adds DohSplitLines function.
-            Contributed by Robin Dunn.
-
-10/29/2003: beazley
-            Fixed [ 827907 ] argout objects not being wrapped properly (PATH).
-            Patch contributed by Salvador Fandi�o Garc�a.
-	     
-10/29/2003: beazley
-            Fixed [ 826996 ] perl type checking ignores perl subclasses.
-            This enhancement makes it so wrapped classes and structs can
-            be subclassed in Perl and used normally. 
-            Patch contributed by Salvador Fandi�o Garc�a.
-
-10/16/2003: cheetah (William Fulton)
-            [C#] IntPtr marshalled with a void* instead of int in C function 
-            declarations. The casts thus look more conventional, for example:
-
-                // old
-                DllExport double SWIGSTDCALL CSharp_get_Shape_x(int jarg1) {
-                    ...
-                    Shape *arg1 = (Shape *) 0 ;
-                    arg1 = *(Shape **)&jarg1; 
-                    ...
-                }
-                // new
-                DllExport double SWIGSTDCALL CSharp_get_Shape_x(void * jarg1) {
-                    ...
-                    Shape *arg1 = (Shape *) 0 ;
-                    arg1 = (Shape *)jarg1; 
-                    ...
-                }
-
-
-10/14/2003: beazley
-            Fixed a subtle problem with overloaded methods and smart pointers.
-            If a class has overloaded methods like this:
-
-                 class Foo {
-                 public:
-                     int bar(int x);
-                     static int bar(int x, int y);
-                 };
-
-            and the class is used as a smart pointer:
-
-                class FooPtr {
-                public:
-                     Foo *operator->();
-                };
-
-            The SWIG would try to expose the static member Foo::bar
-            through FooPtr---resulting bogus wrapper code and a compiler
-            error.
-
-            Due to the way in which overloading is handled, it is
-            extremely difficult to eliminate the static method in
-            this case.  Therefore, it is still exposed.  However,
-            the generated code now compiles and works.
-
-10/05/2003: mkoeppe (Matthias Koeppe)
-	    [Guile, MzScheme, Chicken]: Remove symbol clashes between
-	    the runtime libraries by renaming all extern common.swg
-	    functions with the preprocessor.
-
-10/05/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Added basic GOOPS support, contributed by John Lenz.
-	    See the documentation for details.
-	    
-            *** NEW FEATURE ***
-
-10/04/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] New option, -only-setters, which disables
-	    traditional getter and setter procedures for structure slots.
-
-10/03/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Added run test for reference_global_vars by John Lenz.
-
-09/30/2003: beazley
-            Partial solution to [ 792180 ] C++ smart-pointer/namespace mixup revisited.
-            The problem is not easy to fix (at least it doesn't seem so), but is
-            related to the instantiation of qualified templates inside of other
-            namespaces.   SWIG now generates an error message in this case rather
-            than generating broken wrappers.
-
-09/30/2003: beazley
-            Fixed [ 800012 ] ENTER macro from CORE/scope.h clashes with libc search.h.
-            Reported by Britton Leo Kerin.
-
-09/30/2003: beazley
-            Fixed [ 811518 ] Casting ints to doubles (w/ solution?)
-            Addresses a problem with overloading in the Perl module.
-            Reported by Gerald Dalley.
-
-09/28/2003: mkoeppe
-	    [Guile with -scm option] Fix typo in generated code for
-	    procedures-with-setters.  Reported by John Lenz.
-
-09/26/2003: beazley
-            Fixed [ 812528 ] externs not correct when throw is in signature.
-            Reported by Joseph Winston.
-            
-09/23/2003: cheetah (William Fulton)
-            SWIG was generating a number of symbols that didn't comply with 
-            the ISO C/C++ standard, in particular ISO/IEC 14882:1998(E) 17.4.3.1.2
-            where double underscores are forbidden as well as symbols starting with
-            an underscore followed by an upper case letter. Most of these have
-            been rooted out. See new section added to internals.html development
-            manual 'Symbol Naming Guidelines for Generated C/C++ Code'.
-
-09/23/2003: cheetah (William Fulton)
-            Director typemap name changes:
-            inv     => directorin
-            outv    => directorout
-            argoutv => directorargout
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-09/19/2003: mrose (Mark Rose)
-            [Python] Director constructors now default to __disown = 0, 
-	    which is the intended behavior and fixes the director_finalizer 
-	    test case under python.
-
-09/12/2003: cheetah (William Fulton)
-            [C#] - Typemaps added for std::string and const std::string &.
-                 - New delegate for creating a C# string given a char *. It
-                   can be used by calling SWIG_csharp_string_callback as shown
-                   in the std::string 'out' typemap. Useful if the return type is
-                   mapped to a C# string and the calling function is responsible 
-                   for cleaning up memory as the C# garbage collector doesn't
-                   free the memory created in C/C++ and then returned as a C# string.
-                 - The exception delegates have moved into an inner class in the
-                   intermediate class, thereby freeing up the static constructor.
-
-09/11/2003: beazley
-            (Internals)
-            Major refactoring of iteration over lists and hashes.  The
-            DOH library now uses iterators.  They work like this:
-
-                List *l = (some list);
-
-                Iterator i;
-                for (i = First(l); i.item; i = Next(i)) {
-                    // i.item contains the actual list item.
-                    // i.item is NULL at end of list
-                    ...
-                }
-
-                Hash *h = (some hash);
-                Iterator j;
-                for (j = First(h); j.item; j = Next(j)) {
-                    // j.item contains hash table item
-                    // j.key  contains hash table key
-                    // Both j.item and j.key are NULL at end
-                    ...
-                }
- 
-            The old iteration functions Firstitem(), Nextitem(), Firstkey(),
-            and Nextkey() are gone.  
-
-            The new iterators are simpler, result in better memory use,
-            and may be faster.  Also, there are no longer any problems
-            iterating over the same list/hash in multiple places at
-            the same time.  For example, this is fine:
-
-                 Iterator i,j;
-                 for (i = First(l); i.item; i = Next(i)) {
-                    for (j = First(l); j.item; j = Next(j)) {
-                         ...
-                    }
-                 }
-
-            (This never worked in previous versions).
-            *** POTENTIAL INCOMPATIBILITY ***.  This will probably break 
-            third party extensions to SWIG (or give them further encouragement
-            to join the SWIG CVS-tree :-).
-
-09/10/2003: mkoeppe (Matthias Koeppe)
-	    [Guile] Fix memory leaks in the "list-vector.i" typemaps.
-
-09/09/2003: mkoeppe (Matthias Koeppe)
-	    [Chicken] Use C_mk_bool rather than C_mkbool.  This fixes
-	    the wrapping of boolean values for Chicken 1.10 and newer.
-	    Reported by Dave <hundo@yahoo.com> / Felix Winkelmann
-	    <felix@proxima-mt.de>.
-
-09/05/2003: cheetah (William Fulton)
-            [Java] Directors implemented for Java. In summary this is a big new feature 
-            which supports upcalls from C++ to Java. Code is generated to support C++ 
-            callbacks to call into Java and true polymorphic behaviour for Java classes 
-            derived from C++ classes. See java.html for details. Contributed by 
-            Scott Michel.
-
-09/05/2003: Tiger
-            Created contract example directory at /SWIG/Examples/contract
-            Added simple contract examples (simple_c & simple_cxx)
-            Modified contract module's output format
-
-            *** NEW FEATURE ***
-
-09/01/2003: cheetah (William Fulton)
-            Test-suite build improvements:
-            - Multiple build directories working for the test suite, so it is now
-              possible to run configure in multiple subdirectories and run the test
-              suite in each of these sub directories.
-            - 'make distclean' fixed so it doesn't bomb out on the Examples directory
-              when using multiple subdiretory builds. Required the following directories
-              to be moved:
-                Examples/GIFPlot/Perl -> Examples/GIFPlot/Perl5
-                Examples/GIFPlot/Php  -> Examples/GIFPlot/Php4
-              These new directories used to be symbolic links to the old directory.
-              Also the Examples/test-suite/Perl symbolic link has been removed.
-            - Running the test-suite, other than from the root directory, say
-              in Examples/test-suite/python will now display all the code being
-              executed.
-            - The following 3 C# compilers are detected during configure and work with 
-              the test-suite: Mono, Portable.NET and Microsoft.
-
-09/01/2003: Tiger
-            Added inheritance support for design by contract feature.
-
-09/01/2003: beazley
-            Fixed [ 794914 ] Wrong types in template specialization.
-            SWIG was not handling arguments correctly in template 
-            partial specialization.  For example,
-
-                template<class T> class Foo<T *> {
-                public:
-                    T *blah();
-                };
-
-                %template(FooInt) Foo<int *>;
-
-            in this class, the return type of blah was set to
-            'int **', but it should really be 'int *'.  This has been
-            fixed, but it will affect all prior uses of partial
-            specialization.
- 
-09/01/2003: beazley
-            Fixed [ 786394 ] Patch for generated perl code does not compile under RedHat9.
-            Reported by Scott Finneran.
-
-09/01/2003: beazley
-            Fixed [ 791579 ] (unsigned) long long handled incorrectly (Tcl).
-            This was an error in the Tcl typemaps.i file. 
-            Reported by Kjell Wooding.
-        
-09/01/2003: beazley
-            Fixed [ 797573 ] no way to rename classes coming from C structures.
-            This problem relates to renaming of anonymous structures with a
-            typedef.  For example: 
-
-                  %rename(Bar) Foo;
-                  typedef struct {
-                     ...
-                  } Foo;
-
-            Reported by Britton Leo Kerin.
-            
-09/01/2003: beazley
-            Fixed [ 797576 ] -help seems to imply that only tcl-specific options exist.
-            Added a comment to alert user to other options.
-            Reported by Britton Leo Kerin.
-
-09/01/2003: beazley
-            Fixed [ 798205 ] Segfault in SWIG_ConvertPtr.
-            Reported by Prabhu Ramachandran.
-
-08/30/2003: mrose (Mark Rose)
-            Modified the director typemaps in python/std_complex.i to use the 
-	    new-style macro and conversion functions, which eliminated some
-	    redundant code.  Fixed a few bugs in these typemaps as well, although
-	    more testing is needed.
-
-08/29/2003: mrose (Mark Rose)
-            Completed initial support for wrapping abstract classes with directors.
-	    Constructor wrappers will be generated for abstract classes that have
-	    directors, and instances of the director classes will be created regardless
-	    of whether the proxy class has been subclassed in the target language.
-	    No checks are made during construction to ensure that all pure virtual
-	    methods are implemented in the target language.  Instead, calls to
-	    unimplemented methods will throw SWIG_DIRECTOR_PURE_VIRTUAL_EXCEPTION
-	    exceptions in C++.
-
-	    Integrated Prabhu Ramachandran's typemap patches, which provide director
-	    typemap support for enums and std::size_t, and fix a couple bugs in the 
-	    director std::vector<> typemaps.
-
-08/29/2003: cheetah (William Fulton)
-            [C#] Implemented exception handling for throwing C# exceptions from C/C++ code.
-            A few delegate functions are available for calling which then throw the C#
-            exception. Use the SWIG_CSharpThrowException function from C/C++ typemaps.
-            See the generated wrapper code or csharphead.swg for all available exceptions.
-            Example:
-
-              SWIG_CSharpThrowException(SWIG_CSharpException, "exception description");
-
-            The 'throws' typemaps are also now implemented, so code is automatically 
-            generated to convert any C++ exception into a C# System.Exception when the C++ 
-            method declares an exception specification such as:
-
-               int foo() throw(Bar);
-
-            Also any parameters that are references to a C++ class or a class passed by value
-            and are passed as a C# null will now throw a C# NullReferenceException.
-
-08/29/2003: cheetah (William Fulton)
-            [C#] Fix to match the calling convention of all pinvoke methods so that they
-            match the calling convention used by default in the C# 'static extern' declarations 
-            (__stdcall is used on Windows).
-
-08/19/2003: cheetah (William Fulton)
-            [Java] Reworked std::string typemaps. Fixes a number of string in std namespace 
-            problems. For example %template vector<string>. The templated class' get method 
-            wasn't returning a Java String, but a SWIGTYPE_p_string. Reported
-            by Zach Baum.
-
-08/15/2003: beazley
-            Fixed [ 763522 ] 1.3.19 segfault in SwigType_add_pointer/DohInsertitem.
-            Related to problem with unnamed class handling in Perl module.
-
-08/15/2003: beazley
-            Fixed [ 763563 ] Missing indication of optional arguments.
-            Tcl module.  Reported by Krzysztof Kozminski.
-
-08/15/2003: beazley
-            Fixed [ 787432 ] long param handled as int.  Tcl module
-            now uses Tcl_GetLongFromObj to convert integer values.
-
-08/11/2003: beazley
-            Fixed [ 775989 ] numeric template parameters.   There were
-            some errors in template expansion related to the use of
-            arrays where the array dimension was a template parameter.
-            It should work now.  Reported by Bryan Green.
-
-08/10/2003: mrose (Mark Rose)
-            Added a director typemap (outv) for return by value and cleaned up up a few 
-	    of the commented director typemaps.
-
-08/10/2003: mrose (Mark Rose)
-            Fixed constructor generation for director classes to ignore private
-	    constructors.  Protected constructors are also ignored for now, pending
-	    a solution to the problem of wrapping classes that only define protected
-	    constructors.
-
-08/07/2003: cheetah (William Fulton)
-            New commandline option -outdir <dir> to specify where the language specific
-            files are to be generated. This is useful for target languages like Python,
-            Java etc which generate proxy files in the appropriate language.
-            This option does not apply to the C/C++ wrapper file.
-
-08/07/2003: cheetah (William Fulton)
-            On Windows the generated files (other than the _wrap.c or _wrap.cxx files)
-            were sometimes incorrectly being generated into the current directory unless
-            the input file used the Unix path separator. The Windows path separator 
-            should now be used. Bug reported by Robert Davies.
-
-08/07/2003: beazley
-            Added array variable set typemap to Perl module.
-
-08/07/2003: beazley
-            Fixed [ 775677 ] Array init causes codegen bug..
-
-08/07/2003: beazley
-            Fixed [ 779062 ] Class"\n"::foo not supported.  SWIG
-            should now correctly handle whitespace in between 
-            namespace qualifiers.  For example "A :: Foo :: Bar".
-            
-07/31/2003: cheetah (William Fulton)
-            Fixes for parameters which are classes that are passed by value and have 
-            a default value. A copy constructor for SwigValueWrapper is required 
-            (SF #780056). Also fixed memory leak in these circumstances. These mods
-            also fix SF #780054.
-
-07/28/2003: beazley
-            Improved run-time error message for pointers in Python module.
-            Contributed by Zooko.
-
-07/10/2003: ballabio (Luigi Ballabio)
-            [Almost all languages] Wrappers for std::pair added.
-	    Typemaps for Python, Ruby, Guile and MzScheme.
-
-07/01/2003: mkoeppe (Matthias Koeppe)
-	    [Chicken] Handle the case of more than one argout typemap
-	    per function.
-
-06/29/2003: cheetah (William Fulton)
-            [Java, C#] SF #670949 request. The destructor wrapper function name is now 
-            configurable.  A new attribute called methodname in the 
-            javadestruct/javadestruct_derived (Java) or csdestruct/csdestruct_derived (C#)
-            typemaps specifies the method name. For example in Java the destructor is 
-            wrapped by default with the delete method:
-
-                %typemap(javadestruct, methodname="delete") SWIGTYPE {...}
-
-06/27/2003: cheetah (William Fulton)
-            [Java, C#] The throws attribute for adding exception classes to the throws
-            clause also now works with the following typemaps: 
-            newfree
-            javain, javaout (Java)
-            csin, csout (C#)
-
-            For example, the 'AnException' will be added to the throws clause in the
-            proxy function:
-
-            %typemap(javaout, throws="AnException") int {
-                int returnValue=$jnicall;
-                if (returnValue==0) throw new AnException("Value must not be zero");
-                return returnValue;
-            }
-
-06/25/2003: mrose (Mark Rose)
-            [Python] Director typemap marshalling checks for null pointers when
-	    walking the parameter list instead of relying soley on the parameter
-	    count.  Cures a segfault that occurred for multiple argument inv typemaps.
-	    Someone with more Swig experience should probably review this code.
-
-06/24/2003: mkoeppe (Matthias Koeppe)
-	    [Chicken] Don't emit calls to "C_check_for_interrupt",
-	    which may result in an endless loop.  Patch by felix@proxima-mt.de.
-
-06/20/2003: cheetah (William Fulton)
-            [C#] Finalizers now use destructor syntax as the override which was used in 
-            the Finalize method is not in the ECMA standards, spotted by the MS compiler.
-
-06/10/2003: cheetah (William Fulton)
-            [C#] A number of changes have been made to remove the Java naming 
-            that was used in the C# module.
-            
-            Typemap name changes:
-            jni                         -> ctype
-            jtype                       -> imtype
-            jstype                      -> cstype
-            javain                      -> csin
-            javaout                     -> csout
-            javainterfaces              -> csinterfaces
-            javabase                    -> csbase
-            javaclassmodifiers          -> csclassmodifiers
-            javacode                    -> cscode
-            javaimports                 -> csimports
-            javaptrconstructormodifiers -> csptrconstructormodifiers
-            javagetcptr                 -> csgetcptr
-            javafinalize                -> csfinalize
-
-            Feature name changes:
-            javaconst                   -> csconst
-            javamethodmodifiers         -> csmethodmodifiers
-
-            Pragma changes:
-            pragma(java)                -> pragma(csharp)
-            jniclassbase                -> imclassbase
-            jniclassclassmodifiers      -> imclassclassmodifiers
-            jniclasscode                -> imclasscode
-            jniclassimports             -> imclassimports
-            jniclassinterfaces          -> imclassinterfaces
-
-            Special variable name changes:
-            $javaclassname              -> $csclassname
-            $javainput                  -> $csinput
-            $jnicall                    -> $imcall
-
-            This will break SWIG interface files that use these typemaps, features
-            and pragmas. Please update your code or use macros for backwards
-            compatibility.
-
-            *** POTENTIAL INCOMPATIBILITY FOR C# MODULE ***
-
-06/10/2003: mkoeppe (Matthias Koeppe)
-	    [MzScheme] Applied MzScheme module updates contributed by
-	    John Lenz <jelenz@students.wisc.edu>.
-
-            - Updated mzscheme to use SWIG's common runtime type
-              system from common.swg. 
-
-	    - The Lib/mzscheme directory has been reorganized to
-              standardize names across the language modules:
-              mzscheme.i was moved to mzscheme.swg, mzscheme.swg and
-              mzschemedec.swg have been removed, mzrun.swg (which
-              contains the runtime code) has been added.
-
-            - The swig_proxy structure was renamed to swig_mz_proxy.
-              swig_mz_proxy now contains a pointer to a swig_type_info
-              structure.  
-
-	    - Added varin and varout typemaps for SWIGTYPE [] and
-              SWIGTYPE &.
-
-	    - Garbage collection by calling scheme_add_finalizer() has
-              been added.
-
-	    *** NEW FEATURE [MzScheme] ***
-
-06/10/2003: cheetah (William Fulton)
-            [Java] New typemaps: javadestruct and javadestruct_derived
-            for the C++ destructor wrapper. The javadestruct version gets used by
-            classes at the top of an inheritance chain and the javadestruct_derived 
-            version gets used by other classes.
-
-            [C#] cildispose and cildisposeoverride typemaps replaced by
-            csdestruct and csdestruct_derived typemaps. The delete()
-            method has been removed and its functionality put into these
-            typemaps designed for the Dispose() method.
-
-            - New typemaps csinterfaces and csinterfaces_derived replace
-            the javainterfaces typemap. Also fixes the peculiarity of all classes
-            in an inheritance chain individually deriving from the IDisposable 
-            interface.
-
-            - New typemap csfinalize for finalizers. C++ destructors are now called
-            by garbage collector during finalization. Problem reported by 
-            Andreas Sch�rk.
-
-06/10/2003: Tiger
-	    Modified contract code for error message output.
-            Contract code can now print out simple error message.
-            Modified contract code to prepare for inheritance
-            
-06/03/2003: mkoeppe
-	    [Guile] Applied Guile module updates contributed by 
-	    John Lenz <jelenz@students.wisc.edu>. 
-
-	    - SWIG currently uses Guile's gh_ API, which is marked as
-	      deprecated in Guile 1.6 and will be removed in Guile
-	      1.9.  This change introduces a command-line flag "-scm"
-	      which causes SWIG to generate wrappers that use Guile's
-	      SCM API instead; this requires Guile >= 1.6.
-	    
-	    - The Lib/guile directory has been reorganized to
-              standardize names across language modules: guiledec.swg
-              and guile.swg have been moved into guile_gh_run.swg,
-              guile.i has been moved to guile_gh.swg, guile_scm.swg
-              and guile_scm_run.swg which contain the SCM API stuff
-              have been added
-
-	    - ghinterface.i, which contains the defines from the gh_
-              functions to the scm_functions has been added
-
-	    - The API for dealing with pointer objects is now
-	      SWIG_ConvertPtr, SWIG_MustGetPtr, SWIG_NewPointerObj.
-
-            - Added varin and varout typemaps for SWIGTYPE [] and SWIGTYPE &
-
-            - Garbage collection has been added.
-
-            *** NEW FEATURE [Guile] ***
-	    	
-06/01/2003: cheetah (William Fulton)
-            Dimensionless arrays such as 
-
-                int foo[] = {1, 2};
-                extern int bar[];
-
-            produce a warning that the variable is read-only. Depending on the target
-            language, this used to cause compile errors or generate a setter that
-            generated a runtime error. A setter cannot be automatically generated
-            because the array size cannot be determined by SWIG. A varin, globalin 
-            or memberin typemap (depending on the target language) must be written 
-            by the user.
-
-05/29/2003: beazley
-            Refinement to default typemap matching and arrays.  When an
-            array is declared like this:
-
-                       int foo[4];
-
-            The default typemap now resolves to 
-
-                       SWIGTYPE [ANY]
-
-            If no match is found for that, it then resolves to
-
-                       SWIGTYPE []
-
-            If no array dimension is specified in the original declaration,
-            the SWIGTYPE [] is used right away. 
-
-            Note: This change has been made to resolve problems related to
-            arrays with and without dimensions.  For example, sometimes SWIG
-            was generating setter functions for array variables with no dimensions
-            (an error). Likewise, SWIG sometimes made arrays with dimensions
-            read-only (also an error).  This fixes the arrays_global test
-            problem.
-                        
-05/28/2003: beazley
-            Fixed subtle type handling bug with references and pointers.
-            If you had functions like this:
-
-                  typedef Foo Bar;
-
-                  Foo *func1();
-                  void func2(Bar &x);
-
-            Then func2() wouldn't accept objects returned by func1()
-            because of a type error.   It should work now.
-            Reported by Brian Yang.
-
-05/21/2003: cheetah (William Fulton)
-            Fixes to some of the Visual C++ example project files which would not 
-            work with spaces in the paths held in the environment variables used to 
-            point to the target language's library / include directory.
-            SF bug #740769
-
-05/21/2003:  songyanf (Tiger)
-            Added -contracts option.
-            First try of the idea of "Wrap by Contract": 
-            build up realiable cross-language module by wrapping with SWIG.
-            Implemented basic assertion
-            (preassertion & postassertion & invariant)
-            for simple C/C++ functions.
-            
-            Current format of contracts are:
-            %contract class_name :: func_name (paras...) {
-            require:
-                   boolean exprs;
-                   exprs;
-            ensure:
-                   boolean expr;
-                   exprs;
-            invariant:
-                   boolean expr;
-                   exprs;
-            }
-
-            *** NEW FEATURE ***
-	    	
-05/19/2003: cheetah (William Fulton)
-            Build tweaks. There were a few preprocessor definitions which were
-            specified in the Makefile for passing on the commandline when compiling.
-            These are now all defined in swigconfig.h. Autoconf doesn't normally 
-            allow installation directories to be defined in this config header file, 
-            but an autoconf archive macro enables this. This macro along with future 
-            autoconf macros are going to be put in the Tools/config directory.
-
-            'swig -version' now reports the target build platform.
-
-05/11/2003: cheetah (William Fulton)
-            [C# and Java] Fix to the following typemaps:
-
-            javabase, javainterfaces, javaimports, javaclassmodifiers,
-            javaptrconstructormodifiers, javafinalize, javagetcptr & javacode.
-
-            These are the typemaps for modifying/generating proxy classes.
-            Previously the typemaps would use the proxy class name and not the 
-            C++ type, which was inconsistent with all other typemaps. 
-
-            In most circumstances the proxy class name and the C++ class name/type 
-            is the same except for classes in namespace, templated classes etc. so
-            this shouldn't affect most cases.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA and C# MODULES ***
-
-05/09/2003: cheetah (William Fulton)
-            Visual C++ Project files have been added so that the runtime libraries
-            can be built on Windows (for Tcl, Perl, Python and Ruby).
-
-05/01/2003: beazley
-            Fixed problem with return by value, const, and private constructors.
-            For example:
-
-                class B {
-                private:
-                   B();
-                public:
-                   B(const B&);
-                };
-
-                class A {
-                   ...
-                   const B returnB() const;
-                   ...
-                };
-
-            Problem and patch suggestion reported by Bill Hoffman.
-
-04/29/2003: cheetah (William Fulton)
-            Build changes:
-            - Single autoconf invocation - autoconf in the Tools directory has gone.
-
-            - Libtool bootstrapped when running autogen.sh. This requires anyone
-              using the cvs version of SWIG to have libtool installed on their
-              machine. Suggest version 1.4.2 or higher, preferably the latest - 1.5.
-
-            - Automake is now used to build the runtime libraries in conjunction 
-              with libtool.
-
-            - Runtime libraries are now successfully built as DLLs on Cygwin.
-
-            - Skipping languages is no longer just determined in the top level 
-              makefile but in configure.in. This info is used for building
-              the runtime libraries and for running the examples and test-suite.
-
-            - These changes have fixed multiple build directory builds, that is
-              building from directories other than the top level directory. 
-              Installation from multiple build directories also working. An initial
-              configure in the top level directory is no longer needed as described
-              in 04/02/2003 entry. A 'make distclean' will be needed before building
-              in a directory other than the top level directory if the autotools 
-              have been run from this top level directory at some point, but 
-              autoconf will tell you this. Note that 'make check' only works from 
-              the top level directory at the moment.
-
-04/28/2003: beazley
-            Fixed [ 723471 ] Wrapper_print() fails with preprocessor directives.
-
-04/28/2003: beazley
-            Minor refinement of const static member variable handling 
-            described in CHANGES 08/11/2002.   Previously, SWIG merely
-            checked to see if there was an initializer in the declaration.
-            Now, SWIG additionally checks to make sure the static member
-            is const.
-
-04/25/2003: ljohnson (Lyle Johnson)
-            [Ruby] Added a kind of limited support for multiple inheritance,
-            activated using the -minherit command-line option. I've also updated
-            the "C++ Inheritance" section of the Ruby documentation to discuss
-            how this works, and its limitations. Also also modified the minherit.i
-            test case to run against this.
-
-04/25/2003: ljohnson (Lyle Johnson)
-            [Ruby] Added the -globalmodule command-line option for the Ruby
-            module, for wrapping stuff into the global module (Kernel) instead
-            of a nested module. Updated documentation accordingly.
-
-04/23/2003: mrose (Mark Rose)
-            Fixed symname error in director calls to Python methods
-	    that extend C++ operators.
-
-	    Stopped director destructor wrappers from calling __set_up,
-	    which was leaving the director flag in an inconsistent state.
-
-04/23/2003: beazley
-            Fixed problem with namespace resolution and nested namespaces.
-            Reported by Alfred Lorber (and Marcelo Matus).
-
-04/16/2003: cheetah (William Fulton)
-            Patch for Java examples and test-suite to run on Mac OS X.
-
-04/15/2003: ljohnson (Lyle Johnson)
-            [Ruby] Incorporated Nobu Nakada's patches for supporting the Ruby
-            1.8 allocation framework.
-
-04/15/2003: ljohnson (Lyle Johnson)
-            [Ruby] Replaced all uses of the deprecated STR2CSTR() macro with the
-            safer StringValuePtr() macro. For more information, see ruby-talk:67059
-            and follow-ups to that post.
-
-04/11/2003: beazley
-            Fixed problem with preprocessor macro expansion.  For example:
- 
-                #define min(x,y) ((x) < (y)) ? (x) : (y) 
-                int f(int min);
-
-            Reported by Sebastien Recio.
-
-04/10/2003: cheetah (William Fulton)
-            [Java] Added a runtime check to typemaps in arrays_java.i library to check 
-            that the Java array passed in is the same size as the C array and throw an 
-            exception if not.
-
-            Also fix to use delete instead of free for arrays created using new.
-
-04/07/2003: cheetah (William Fulton)
-            Remove GCC3 warning when compiling the examples and test-suite:
-
-              cc1plus: warning: changing search order for system directory "/usr/include"
-              cc1plus: warning: as it has already been specified as a non-system directory 
-
-            See SF patch #715531 submitted by Gerald Williams
-
-04/03/2003: cheetah (William Fulton)
-            [C#] Improved wrapping of enums and constants. These were previously
-            wrapped as C# variables rather than constants. Either these are wrapped
-            as readonly (runtime) constants or compile time constants, depending on
-            the %javaconst directive (The directive is likely to change name soon).
-            For example wrapping:
-              %javaconst(0);
-              #define ABC 22
-              %javaconst(1) XYZ;
-              #define XYZ 33
-            is now:
-              public static readonly int ABC = examplePINVOKE.get_ABC();
-              public const int XYZ = 33;
-
-04/03/2003: cheetah (William Fulton)
-            [Java] Global constants and enums are put in their own interface called
-            xxxConstants, where xxx is the module name. This is an improvement as 
-            it is possible to derive (implement) a Java class from the xxxConstants
-            interface to improve the syntax; namely when wrapping:
-              enum {ONE=1, TWO, THREE};
-            accessing these from a Java class implementing xxxConstants is neater:
-              int number = ONE;
-            than the previous:
-              int number = xxx.ONE;
-
-            Patch submitted by Dave Dribin.
-
-04/02/2003: cheetah (William Fulton)
-            Build improvements for multiple builds. This allows one to build
-            the SWIG executable and runtime libraries for different platforms/compilers 
-            etc by running configure in different directories. This isn't 100% just 
-            yet and won't be until libtool is better configured... a 'configure' and 
-            'make distclean' needs to be run in the root directory before it all works.
-            For example:
-              $ ./configure
-              $ make distclean
-              $ mkdir config1; cd config1; ../configure CC=gcc CXX=g++; make; cd ..
-              $ mkdir config2; cd config2; ../configure CC=cc CXX=c++; make; cd ..
-            
-            To be improved. A 'make check' does not work yet either. 
-
-04/01/2003: beazley
-            Fixed template partial specialization argument expansion bug.
-            This showed up when trying to use std_vector.i with vectors
-            of pointers.
-
-03/31/2003: cheetah (William Fulton)
-            Fix for parallel make builds of SWIG, for example
-              make -j 4
-            Build failure reported by Bill Clarke.
-
-03/28/2003: beazley
-            Released 1.3.19.
-
-
-
-Version 1.3.19 (March 28, 2003)
-===============================
-
-03/28/2003: beazley
-            Variety of minor bug fixes to the 1.3.18 release including:
-
-                - Segmentation fault with %extend directive.
-                - Typemap variable substitution bug.
-                - Expression evaluation bug.
-                - Large memory leak with template expansion.
-
-Version 1.3.18 (March 23, 2003)
-===============================
-
-03/21/2003: beazley
-            Fixed two problems with the %extend directive, overloading, and
-            template expansion.  See the 'template_extend_overload' and
-            'template_extend_overload_2' tests in Examples/test-suite for
-            details.
-
-03/20/2003: cheetah (William Fulton)
-            [C#] Added some typemaps as suggested by Andreas Schoerk for handling
-            parameters that are passed as pointers or by reference. These have
-            been put in typemaps.i.
-
-03/20/2003: beazley
-            Fixed a C++ scoping bug related to code like this:
-
-                class Foo {
-                public:
-                     int Foo::bar();
-                };
-
-            Previously, SWIG just tossed out the Foo::bar() declaration. Now,
-            the declaration is wrapped provided that the prefix is exactly the
-            same as the current scope (including any enclosing namespaces).
-            Reported by Bruce Lowery.
-
-03/20/2003: beazley
-            Incorporated [ 696516 ] Enabling exception processing for data member access.
-            In some compilers, attribute access can generate exceptions.  However,
-            SWIG ordinarily assumes that no exceptions will be raised.  To disable this,
-            use the %feature("allowexcept").  For example:
-
-                  %feature("allowexcept") Foo::x;
-                  ...
-                  class Foo {
-                  public:
-                      int x;     /* Exception handling enabled */
-                      ...
-                  };
-
-            Patch contributed by Yakov Markovitch. 
- 
-03/20/2003: beazley
-            Incorporated Patch. [ 701860 ] Improve Performance (python proxies).
-            Gives a performance boost to proxy class code and the management of the
-            .this and .thisown attributes.  Contributed by Mike Romberg.
-
-03/19/2003: cheetah (William Fulton)
-            [C# and Java] Added missing vararg support.
-
-03/18/2003: mrose (Mark Rose)
-            Removed code related to tagging individual methods for directors.
-	    The concept of having directors for some but not all virtual methods
-	    of a class is deeply flawed.  The %feature("nodirector") tag is also
-	    gone.  
-	    
-	    Directors are off by default.  To enable them for a class, issue
-	    %feature("director") classname; which will create director methods
-	    for every virtual method in the hierarchy of the class.
-
-03/17/2003: beazley
-            Fixed a subtle problem with passing arguments of type function.  For
-            example:
-
-               int foo(int x(int, int));
-
-            or
-
-               typedef int binop_t(int, int);
-               int foo(binop_t x);
-
-            In old versions, this would produce code that wouldn't compile.  Now,
-            SWIG merely adds an extra pointer, making these declarations the same
-            as:
-
-               int foo(int (*x)(int, int));
-
-               typedef int binop_t(int, int);
-               int foo(binop_t *x);
-
-            Reported by Garth Bushell.
-
-03/17/2003: mrose (Mark Rose)
-            Fixed the return statement for director base class calls that have no
-            return value.
-
-03/15/2003: beazley
-            Fixed a problem with const smart-pointer wrapping.  For example:
-
-                 class Foo {
-                 public:
-                    int x;
-                    void bar() const;
-                    void spam();
-                };
-
-                class Blah {
-                ...
-                   const Foo *operator->();
-                ...
-                };
-
-            In this case, only "x" and "bar" are visible from Blah (since application
-            of spam violates constness).  Moreover, access to "x" is read-only.
-           
-03/15/2003: mrose (Mark Rose)
-            Cleaned up two signed versus unsigned comparisons in python/std_vector.i.
-	    
-03/15/2003: cheetah (William Fulton)
-            [C#] Global variables are wrapped using properties instead of get and set methods.
-            Member variable wrapping bug fixes, for example wrapping pointers work now.
-            Typemaps are used for all variable wrapping to generate the property code.
-
-03/13/2003: mrose (Mark Rose)
-            Fixed a bug in the virtual method unrolling for directors. 
-	    The order of unrolling is now from base to derived, to ensure
-	    that the most derived implementation of a director method is
-	    found.
-
-	    Director methods for pure virtual methods now throw
-	    DIRECTOR_PURE_VIRTUAL_EXCEPTION if _up is set.
-
-03/12/2003: cheetah (William Fulton)
-            [C#] Polymorphism fix: virtual functions now use the appropriate
-            keyword in the C# proxy class, virtual or override.
-            Some 'using System;' statement fixes needed by the Mono compiler.
-
-03/11/2003: beazley
-            Fixed subtle bug in the application of SwigValueWrapper<> to
-            template classes with default constructors.  Reported by
-            Bruce Lowery.
-
-03/11/2003: beazley
-            The $descriptor(type) variable is now expanded in code supplied to
-            %extend.  This is useful for certain kinds of advanced wrapping 
-            (especially container classes).
-
-03/11/2003: luigi
-            Support for std::map.
-            (a) Integration with scripting language (a la std::vector) for
-                Python, Ruby, MzScheme, and Guile;
-            (b) Simple wrapper for other languages
-
-03/10/2003: beazley
-            Fixed problem with escape sequences in string and character constants.  SWIG
-            wasn't parsing certain octal codes correctly.
-
-03/07/2003: beazley
-            Fixed a variety of subtle preprocessor problems reported by
-            Sebastien Recio.
-
-            (a) Empty preprocessor values no longer generate "bad constant
-            value" errors.  For example:
-
-                  #define FOO
-                  #define FOO BAR
-
-            (b) Macro names can now span multiple lines (technically valid,
-            although questionable practice).  For example:
-
-                  #define A_LONG_MACRO_\
-                  NAME 42
-
-            (c) Whitespace is no longer required before certain macro values.
-            For example:
-
-                  #define FOO"Hello"
-                  #define BAR\
-                  "Hello"
- 
-03/07/2003: ljohnson (Lyle Johnson)
-            [Ruby] Added missing long long and unsigned long long typemaps
-            in the Lib/ruby/typemaps.i library file.
-
-03/07/2003: mrose (Mark Rose)
-            Added Examples/python/callback to demostrate how directors can
-	    be used to implement callbacks in Python
-	    Added Examples/python/extend to demonstrate virtual method
-	    calls from C++ to Python (really the same as the callback
-	    example, just a different context).
-	    Added four tests for very basic director functionality.  These
-	    have runtime tests under python.
-	    The Python module now emits #define SWIG_DIRECTORS near the
-	    top of the output file if directors are enabled.  This is useful
-	    for disabling parts of tests in target languages that don't
-	    support directors.
-
-03/06/2003: mrose (Mark Rose)
-            Added a section to Doc/Manual/Python.html on cross language
-	    polymorphism (directors).
-
-03/06/2003: mrose (Mark Rose)
-            The short-lived "-fdirectors" command line option has been
-	    removed.  To enable directors, instead use the extended %module 
-	    directive as follows:
-
-	        %module(directors="1") modulename
-
-03/06/2003: cheetah (William Fulton)
-            The long long typemaps have been rewritten so that they can be more
-            easily used with non ISO compilers, like Visual C++. For example
-            if you are wrapping the Windows 64 bit type __int64 the long long
-            typemaps can be used with %apply:
-
-                %apply long long { __int64 };
-                __int64 value1(__int64 x);
-
-            __int64 will now appear in the generated code instead of long long.
-            
-03/06/2003: beazley
-            *** DEVELOPER CHANGE ***
-            Swig module mutation has been changed slightly.  When a language
-            class method wants to save node attributes, it now uses one of the
-            following functions:
-
-                  Swig_require()
-                  Swig_save()
-
-            The first argument to these functions is a namespace in which
-            saved attributes are placed.  For example,this code
-
-                  Node *n;
-                  Swig_save("cDeclaration",n,"type","parms","name",NIL);
-
-            saves the attributes as "cDeclaration:type", "cDeclaration:parms",
-            and so forth.   If necessary, a language module can refer to
-            old values by using this special namespace qualifier.
-
-            In addition to this, a special attribute "view" contains the name
-            of the last namespace used to save attributes.  In the above 
-            example, "view" would have the value "cDeclaration".   The value
-            of "cDeclaration:view" would have the previous view and so forth.
-
-            Swig_restore(n) restores a node to the state before the last
-            Swig_require() or Swig_save() call.
-
-            Note:  This change makes it easier for language modules to refer
-            to old values of attributes.  
-
-
-03/06/2003: mrose (Mark Rose)
-            Merged the cross-language polymorphism patch.  When enabled, C++ 
-	    "proxy" classes (called directors) are generated for each specified 
-	    C++ class.  Directors pass method calls from C++ to Python, similar 
-	    to the way the usual proxy (shadow) classes pass method calls from 
-	    Python to C++.  Together, these two types of proxies allow C++ 
-	    classes that are extended in Python to behave just like ordinary 
-	    C++ classes and be used in C++ like native objects.  
-	    
-	    This feature is still very experimental and is disabled by default.
-	    To enable director support, specify '-fdirectors' on the SWIG command
-	    line or in the SWIG_FEATURES environment variable.  In the interface
-	    file, add %feature("director") to generate directors for all classes
-	    that have virtual methods.  
-	    
-	    See http://stm.lbl.gov/~tm2/swig/ProxyDoc.html for more details.
-	    
-
-03/03/2003: beazley
-            Fixed a small glitch in typemap local variable replacement.  If you had
-            a typemap like this:
-
-                 %typemap(in) type ($1_type temp) {
-                      ...
-                      temp = ...;
-                      ...
-                 }
-
-            and no occurrence of "$1_type" appeared in the body, then the local
-            variable type wouldn't be substituted.
-
-03/03/2003: cheetah (William Fulton)
-            [C#] New version of the CSharp module which is typemap based.
-            It also uses ECMA C# and no longer uses Microsoft Visual C++.NET 
-            glue. This means that it will work on non-Windows platforms.
-            Contributed by Neil Cawse.
-
-02/27/2003: beazley
-            Fixed [ 653548 ] error parsing casting operator definition.
-            SWIG now ignores casting operators declared outside of a class.
-            For example:
-
-                inline A::operator char *() { ... }
-
-            Bug reported by Martin Casado.
-
-02/27/2003: beazley
-            Added support for anonymous bit-fields.  For example:
-
-                 struct Foo {
-                      int x : 4;
-                      int   : 4;
-                      int y : 8;
-                 };
-
-            Anonymous bit-fields are ignored by SWIG.   Problem
-            reported by Franz H�pfinger.
-
-02/26/2003: cheetah (William Fulton)
-            [Java] Better typemaps in the Examples/java/typemap example and also 
-            fixes subtle bug when using the StringBuffer typemaps more than once.
-
-02/26/2003: beazley
-            Fixed [ 642112 ] Constants char bug.
-
-02/26/2003: beazley
-            Fixed [ 675337 ] Partial template specialization not entirely working.
-            There was a subtle problem related to the naming and ordering of
-            template partial specialization arguments.  Matching worked okay,
-            the resulting templates weren't expanded correctly.
-
-02/25/2003: beazley
-            Fixed problem with parsing (and generating code) for 
-            references to arrays.  For example:
-
-                int foo(int (&x)[10]);
-  
-02/25/2003: beazley
-            Fixed [ 635347 ] Compilation warning from libpy.c.
-            Reported by Daniel L. Rall.
- 
-02/25/2003: beazley
-            Fixed a subtle problem with virtual method implementation
-            checking and typedef.
-
-                 typedef int *intptr;
-
-                 struct A {
-                    virtual int *foo() = 0;
-                 };
-                 struct B : public A {
-                    virtual intptr foo() { };
-                 };
-
-            SWIG was treating these declarations as different even though
-            they are the same (via typedef).
-
-02/25/2003: ljohnson (Lyle Johnson)
-            [Ruby] Added range checking for the NUM2USHRT macro, per [ 675353 ].
-
-02/24/2003: beazley
-            Fixed a subtle problem with the code that determined if a class is abstract
-            and can be instantiated.    If you had classes like this:
-
-                  struct A {
-                     virtual int foo(int) = 0;
-                  };
-                  struct B : virtual A {
-                     virtual int foo(int);
-                  };
-
-                  struct C : virtual A { 
-                  };
-
-                  /* Note order of base classes */	
-                  struct D : B, C { };    /* Ok */
-                  struct E : C, B { };    /* Broken */
-
-            then SWIG determined that it could instantiate D(), but not E().
-            This inconsistency arose from the depth-first search of the 
-            inheritance hierarchy to locate the implementations of virtual
-            methods.   This problem should now be fixed---SWIG will attempt
-            to locate any valid implementation of a virtual method by
-            traversing over the entire hierarchy.
-
-02/22/2003: cheetah (William Fulton)
-            [Java] Fix for using enum typemaps. The Java final static variable type
-            can be set using the jstype typemap, enabling enums to be mapped to 
-            something other than int. Bug reported by Heiner Petith.
-
-02/21/2003: songyanf (Tiger)
-            Added CSharp (C#) module prototype
-            i.e. csharp.cxx & csharp.h at Source/Modules/.
-            They are for test usage only now and need improvement.
-            The interface also need to be modified.
-
-            *** NEW FEATURE ***
-        
-02/20/2003: songyanf (Tiger)
-            Fixed problem with typedef with -fvirtual.
-            Similar as beazley's modification today.
-
-02/20/2003: beazley
-            Added support for gcc-style variadic preprocessor macros.  
-            Patch [ 623258 ] GCC-style vararg macro support.
-            Contributed by Joe Mason.
-
-02/20/2003: beazley
-            Fixed [ 605162 ] Typemap local variables.
-            Reported by Lyle Johnson.
-
-02/20/2003: beazley
-            Fixed problem with abstract classes and typedef.  For example:
-
-               class Foo {
-               public:
-                  virtual void foo(int x) = 0;
-               };
-
-               typedef int Integer;
-               class Bar : public Foo {
-               public:
-                  virtual void foo(Integer x);
-               };
-
-            SWIG was getting confused about the latter method---making Bar
-            abstract.  Reported by Marcelo Matus.
-
-02/19/2003: cheetah (William Fulton)
-            [Java] %javaconst(flag) can also be used on enums as well as constants.
-            This feature enables true Java compiler constants so that they can be 
-            used in Java switch statements. Thanks to Heiner Petith for patches.
-
-02/19/2003: songyanf (Tiger)
-            Modified -fcompact feature to deal with PP lines
-
-02/18/2003: beazley
-            Fixed [ 689040 ] Missing return value in std_vector.i.
-            Reported by Robert H. de Vries.
-
-02/18/2003: beazley
-            Fixed a few evil scoping problems with templates, namespaces, and the
-            %extend directive.  Problem reported by Luigi Ballabio.
-
-
-02/18/2003: cheetah (William Fulton)
-            [Ruby] Improved support for Visual C++ and other native Windows compilers. 
-            It is no longer necessary to specify "/EXPORT:Init_<module>", where <module> is the
-            swig module name when linking using these native Windows compilers.
-
-02/15/2003: songyanf (Tiger)
-            Added -fvirtual option.
-            Reduce the lines and size of the wrapper file
-            by omitting redifined virtual function in children classes.
-
-            Modified -compact option to -fcompact option
-
-            Added -small option.
-            -small = -fvirtual -fcompact
-            And it can be extended by future feature options,
-            which are used to reduce wrapper file szie.
-
-            Added SWIG_FEATURES environment variable check.
-            To dynamically set the feature options such as -fcompact & -fvirtual
-            *** NEW FEATURE ***
-
-02/13/2003: lenz
-            Updated Doc/Manual/Perl5.html to talk about C++ compile problems
-            configure.in now checks for PERL5_CCFLAGS
-            Runtime/Makefile.in and Example/Makefile.in now use PERL5_CCFLAGS
-            Added Lib/perl5/noembed.h which contains all the known macro conflicts
-
-02/12/2003: beazley
-            Fixed [ 685410 ] C++ Explicit template instantiation causes SWIG to exit.
-            Fixes a syntax error with declarations similar to this:
-
-                 template class std::vector<int>;
-
-            SWIG now ignores the instantiation and generates a warning message.
-            We might do more later.  Reported by Thomas Williamson.
-
-02/11/2003: cheetah (William Fulton)
-            Rewrote bool typemaps to remove performance warning for compiling generated code
-            under Visual C++.
-
-02/11/2003: cheetah (William Fulton)
-            Fix for wrapping reference variables (const non-primitive and all non-const types) 
-            for example:
-              int& i;
-              Class& c;
-              const Class& c;
-
-02/11/2003: beazley
-            Fixed more very subtle preprocessor corner cases related to recursive
-            macro expansion.  For example:
-
-                   #define cat(x,y) x ## y
-
-                   cat(cat(1,2),3)    // Produces: cat(1,2)3
-                   
-                   #define xcat(x,y) cat(x,y)
-
-                   xcat(xcat(1,2),3)  // Produces 123
-
-            See K&R, 2nd Ed. p. 231.
-
-02/10/2003: cheetah (William Fulton)
-            Fixed [ 683882 ] - patch submitted by F. Postma for SWIG to compile on HP-UX.
-
-02/10/2003: beazley
-            Fixed subtle preprocessor argument expansion bug. Reported by Marcelo Matus.
-
-02/10/2003: songyanf
-            Added -compact option.
-            Reduce the lines and size of the wrapper file
-            by omitting comments and combining short lines.
-            *** NEW FEATURE ***
- 
-02/07/2003: beazley
-            Fixed [ 651355 ] Syntax error with cstring.i
-            Reported by Omri Barel.
-
-02/07/2003: beazley
-            Fixed [ 663632 ] incompatibility with standard cpp.
-            This is a refinement that fixes this problem:
-
-                 // Some macro with an argument
-                 #define FOO(x)       x
-
-                 int FOO;        /* Not a macro---no arguments */
- 
-02/05/2003: beazley
-            Fixed [ 675491 ] parse error with global namespace qualification.
-            Submitted by Jeremy Yallop.
-
-02/04/2003: beazley
-            Fixed bug in varargs processing introduced by the numinputs typemap parameter.
-
-01/08/2003: ttn
-	    [xml] Fix string-replacement ordering buglet.
-	    Thanks to Gary Herron.
-
-12/23/2002: cheetah (William Fulton)
-            Further build changes:
-            - The SWIG executable is now built using a single Makefile.
-            - This makefile is generated by Automake (Source/Makefile.am).
-            - Dependency tracking and tags support are in this makefile.
-            - Automake 1.7.2 and Autoconf 2.54 minimum versions are needed to build SWIG from CVS.
-            - Running ./autogen.sh now installs Autoconf/Automake support files into
-              Tools/config and these files are no longer stored in CVS.
-            - Bug fixes in 'make install' for systems using .exe executable extension and
-              ./configure --with-release-suffix=whatever
-
-12/16/2002: cheetah (William Fulton)
-            More build changes:
-            - Autoconf's AC_CANONICAL_HOST replaces proprietary approach for detecting build host.
-            - Autoconf support files moved to Tools/config.
-
-12/16/2002: cheetah (William Fulton)
-            Modifications to run on MacOS, submitted by Bernard Desgraupes.
-            Mainly ensuring generated files are output in the appropriate directory for
-            some modules.
-
-12/11/2002: cheetah (William Fulton)
-            Various build modifications and bug fixes:
-            - Simplification of version string. Use autoconf's PACKAGE_VERSION instead.
-            - Build time removed from SWIG version.
-            - Using standard autoconf config header generation.
-            - Updated old autoconf macros as reported by autoupdate.
-            - Removed $prefix in autoconf from search paths as autoconf won't expand them.
-            - Subtle bug fix where 'make prefix=/somewhere; make clean; make prefix=/somwhere/else'
-              produced an executable using the incorrect library directories.
-            - Added -ldflags commandline option for MzScheme, Ocaml, Pike and PHP.
-            - Fixed reporting of compiler used when using -version commandline option.
-            - SWIG web address added to -version commandline option.
-
-12/11/2002: beazley
-            Minor fix to Tcl dynamic cast typemaps. Reported by
-            Kristopher Blom.
-
-12/10/2002: beazley
-            Fixed subtle template argument replace bug.  Reported by
-            Chris Flatley.
-
-12/10/2002: beazley
-            Reverted CHANGES 09/03/2002, preprocessor argument evaluation.  Arguments
-            are not evaluated during collection, K&R, p. 230.
-
-12/06/2002: beazley
-            Fixed [ 649022 ] Compilation problems with KAI/KCC
-
-12/02/2002: beazley
-            SWIG 'rel-1-3' CVS branch merged back into the main branch.
-
-
-Version 1.3.17 (November 22, 2002)
-==================================
-
-11/19/2002: beazley
-            Fixed [ 613922 ] preprocessor errors with HAVE_LONG_LONG.
-            
-11/19/2002: beazley
-            Fixed [ 615480 ] mzscheme SWIG_MustGetPtr_.
-
-11/19/2002: beazley
-            Fixed [ 635119 ] SWIG_croak causes compiler warning.
-
-11/16/2002: cheetah (William Fulton)
-            [Java] Added typemaps for pointers to class members.
-
-11/15/2002: cheetah (William Fulton)
-            [Java] Bug fix: Overloaded C++ functions which cannot be overloaded in Java 
-            once again issue a warning.
-
-11/14/2002: cheetah (William Fulton)
-            [Java] Handling of NULL pointers is improved. A java null object will now
-            be translated to and from a NULL C/C++ pointer by default. Previously when 
-            wrapping:
-
-                class SomeClass {...};
-                void foo(SomeClass *s);
-
-            and it was called from Java with null:
-
-                modulename.foo(null)
-
-            a Java NullPointerException was thrown. Extra typemaps had to be written in
-            order to obtain a NULL pointer to pass to functions like this one. Now the 
-            default wrapping will detect 'null' and translate it into a NULL pointer.
-            Also if a function returns a NULL pointer, eg:
-            
-                SomeClass *bar() { return NULL; }
-            
-            Then this used to be wrapped with a SomeClass proxy class holding a NULL
-            pointer. Now null is returned instead. These changes are subtle but useful.
-            The original behaviour can be obtained by using the original typemaps:
-
-                %typemap(javaout) SWIGTYPE {
-                    return new $&javaclassname($jnicall, true);
-                  }
-                %typemap(javaout) SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] {
-                    return new $javaclassname($jnicall, $owner);
-                  }
-                %typemap(javagetcptr) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] %{
-                  protected static long getCPtr($javaclassname obj) {
-                    return obj.swigCPtr;
-                  }
-                %}
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-
-11/12/2002: beazley
-            Fixed problem with abstract methods and signatures.  For example:
-
-            class abstract_foo { 
-            public: 
-                virtual int   meth(int meth_param) = 0; 
-            }; 
- 
- 
-            class abstract_bar : public abstract_foo { 
-            public: 
-                int meth(int meth_param_1, int meth_param_2) { return 0; }
-            };
-
-            In this case, abstract_bar is still abstract.
-
-            Fixes [ 628438 ] Derived abstract class not abstract.
-            Reported and patched by Scott Michel.
-
-11/11/2002: beazley
-            Fixed a matching problem with typemaps and array dimensions.  For example, if you
-            had this:
-
-               typedef char blah[20];
-
-            and a typemap:
-
-               %typemap() char [ANY] {
-                   ... $1_dim0 ...
-               }
-
-            then $1_dim* variables weren't be expanded properly.  It should work now.
-            Problem reported by Pankaj Kumar Goel.
-               
-11/07/2002: mkoeppe
-	    Added an experimental new module that dumps SWIG's parse
-	    tree as (Common) Lisp s-expressions.  The module is
-	    invoked with SWIG's -sexp command-line switch.  The output
-	    can be read into Common Lisp.  There is (prototype)
-	    example Lisp code that generates Foreign Function Interface
-	    definitions for use with Kevin Rosenberg's UFFI.
-
-	    *** EXPERIMENTAL NEW FEATURE ***
-
-11/07/2002: mkoeppe
-	    Removed duplicate declaration of "cpp_template_decl" in
-	    parser.y; bison 1.75 complained.
-
-11/06/2002: cheetah (William Fulton)
-            [Java] Default primitive array handling has changed like arrays of classes. 
-            C primitive arrays are no longer wrapped by a Java array but with a pointer 
-            (type wrapper class). Again the changes have been made for efficiency reasons. 
-            The original typemaps have been moved into arrays_java.i, so the original 
-            behaviour can be obtained merely including this file:
-
-                %include "arrays_java.i"
-
-            The array support functions are no longer generated by default. They are only
-            generated when including this file, thus this often unused code is only
-            generated when specifically requiring this type of array support.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-11/05/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added support for nested module declarations (as was
-            previously added for the Perl module). So a %module directive
-            of the form:
-
-                %module "Outer::Inner::Foo"
-
-            will nest everything as (in Ruby code):
-
-                module Outer
-                  module Inner
-                    module Foo
-                      # stuff goes here
-                    end
-                  end
-                end
- 
-11/05/2002: mkoeppe 
-	    [MzScheme] Add an argument (-declaremodule) that generates
-	    code to correctly declare a primitive module extension.
-	    Patch submitted by Bruce Butterfield.
-
-11/02/2002: cheetah (William Fulton)
-            [Java] Added patch submitted by Michael Cahill to remove unused parameter
-            warnings for the jenv and cls parameters. This patch also also allows one
-            to use "void" in the jni typemap for any type without code being generated
-            attempting to return a value.
-
-10/29/2002: cheetah (William Fulton)
-            [Java] Array handling is different. Arrays of classes are no longer wrapped
-            with proxy arrays, eg wrapping
-
-                class X {...};
-                X foo[10];
-            
-            used to be wrapped with these Java getters and setters:
-
-                public static void setFoo(X[] value) {...}
-                public static X[] getFoo() {...}
-
-            This approach is very inefficient as the entire array is copied numerous
-            times on each invocation of the getter or setter. These arrays are now
-            wrapped with a pointer so it is only possible to access the first array element 
-            using a proxy class:
-
-                public static void setFoo(X value) {...}
-                public static X getFoo() {...}
-
-            Arrays of enums have also been similarly changed. This behaviour is now like the 
-            other SWIG language's implementation and the array library should be used to 
-            access the other elements. The original behaviour can be achieved using the 
-            macros and typemaps in arrays_java.i, for example:
-
-                %include "arrays_java.i"
-                JAVA_ARRAYSOFCLASSES(X)
-                class X {...};
-                X foo[10];
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-10/29/2002: cheetah (William Fulton)
-            [Java] Two new typemaps javain and javaout for generating the proxy class 
-            and type wrapper class method calls to the JNI class. The new typemaps are 
-            really used for transforming the jstype (used in proxy class and type wrapper
-            classes) to the jtype (used in the JNI class) and visa versa. A javain typemap
-            is required whenever an in typemap is written and similarly javaout for an out
-            typemap. An example is probably best to show them working:
-
-                %typemap(javain) Class "Class.getCPtr($javainput)"
-                %typemap(javain) unsigned short "$javainput"
-                %typemap(javaout) Class * {
-                    return new Class($jnicall, $owner);
-                  }
-
-                %inline %{
-                    class Class {};
-                    Class * bar(Class cls, unsigned short ush) { return new Class(); };
-                %}
-
-            The generated proxy code is then:
-
-                public static Class bar(Class cls, int ush) {
-                  return new Class(exampleJNI.bar(Class.getCPtr(cls), ush), false);
-                }
-
-
-            Some new special variables have been introduced in order to use these typemaps.
-            Here $javainput has been replaced by 'cls' and 'ush'. $jnicall has been replaced by 
-            the native method call, 'exampleJNI.bar(...)' and $owner has been replaced by 'false'.
-            $javainput is analogous to the $input special variable. It is replaced by the parameter name.
-            $jnicall is analogous to $action in %exception. It is replaced by the call to the native
-            method in the JNI class.
-            $owner is replaced by either true if %newobject has been used otherwise false.
-
-            The java.swg file contains default javain and javout typemaps which will produce the same code
-            as previously. This change is only of concern to those who have written their own typemaps as
-            you will then most likely have to write your own javain and javaout typemaps.
-
-            The javaout typemap also makes it possible to use a Java downcast to be used on abstract 
-            proxy base classes. See the Java documentation on dynamic_cast.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-10/24/2002: ttn
-	    [Methodology] Upgaded to libtool 1.4.3, presumably w/ better
-	    support for newish platforms (like MacOS X).
-
-10/21/2002: ttn
-	    Fixed Runtime/Makefile.in bug -- thanks to Richard Calmbach.
-
-10/18/2002: ttn
-	    Fixed typo in doh.h -- thanks to Max Horn.
-
-Version 1.3.16 (October 14, 2002)
-=================================
-
-10/13/2002: beazley
-            Fixed bug with %extend directive and %feature reported
-            by William Fulton.
-
-10/13/2002: beazley
-            Added OpenVMS build directory (vms).  Contributed by 
-            Jean-Fran�ois Pieronne.
-
-10/09/2002: cheetah (William Fulton)
-            [Java] Added throws clause to the native functions in the JNI class.
-            The throws clause is the same as the one generated for proxy functions
-            and module class functions.
-
-09/27/2002: beazley
-            Fixed some problems with the %import directive and classes that
-            were defined but not wrapped.  Problem reported by Leslie Brooks,
-            Gerry Woods, and others.
-
-09/23/2002: cheetah (William Fulton)
-            [Java] Some error checking added:
-            1) OutOfMemoryException check in the char * typemaps. 
-            2) As SWIG treats pointers, references and passing by value all the
-            same, it is possible to pass a NULL pointer to a function that expects
-            an object passed by value or by reference. A NullPointerException is 
-            now thrown under this scenario.
-
-09/20/2002: ttn
-	    [Methodology] Reworked "make clean" and "make install"
-			  to be more table driven.
-	    [Docs] Explain how to extend "make install" w/ extra-install.list.
-
-09/15/2002: beazley
-            Deprecation of the "ignore" typemap.   The "ignore" typemap has
-            been deprecated in favor of a generalization of the "in" typemap.
-            To ignore an argument, use something like this instead:
-
-                %typemap(in,numinputs=0) int *output (int temp) {
-                     $1 = &temp;
-                }
-
-            This change fixes a number of subtle bugs related to the interaction
-            of the "in" and "ignore" typemaps (which were supposed to be
-            mutually exclusive).
-
-            The use of the numinputs argument is reserved for future expansion.
-            Currently, values >1 will generate an error.  However, future
-            releases of SWIG may utilize that to support multi-input typemaps.
-
-            %typemap(ignore) still works, but generates a warning message and is
-            translated to %typemap(in,numinputs=0).
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            *** NEW FEATURE ***
-
-09/15/2002: beazley
-            Fixed segmentation fault for unnamed structures.  For example:
-
-               typedef struct {
-               } *blah;
-
-
-            Reported by Roger Gibson.
-            Note: we might be able to generate wrappers in special cases.
-
-09/13/2002: beazley
-            Minor modification to generated wrapper functions.  Pointer arguments are now
-            always set to an initial value of 0.   Simplifies typemap writing and cleanup
-            code (since you can rely on zero-value initialization).   This also greatly
-            reduces the need to ever write an "arginit" typemap.
-
-09/12/2002: beazley
-            Minor enhancement to smart-pointer support.  If operator->()
-            is part of an ignored base class like this,
-
-                 %ignore Bar;
-
-                 class Foo {
-                 public:
-                     int blah();
-                 };
-
-                 class Bar {         /* Ignored */
-                 public:
-                     ...
-                     Foo *operator->();
-                     ...
-                 };
-
-                 class Spam : public Bar { };
-
-            then methods from Foo are still available.  For example,
-
-                 >>> s = Spam()
-                 >>> s.blah()
-                 0
-                 >>>
-
-             The only catch is that the operator->() itself is not available
-             (since it wasn't wrapped).   Therefore, there won't be any
-             __deref__() operation unless it is explicitly added to Spam
-             (either using %extend or just placing operator->() in the
-             definition of Spam).
-
-09/11/2002: ttn
-	    [Methodology] Reworked "make check" to be more table driven.
-	    [Docs] Docuemented methodology in Manual/Extending.html.
-
-09/11/2002: ttn
-	    [Docs] Prefixed Manual/*.html with "<!DOCTYPE html ...>" to
-	    pander dotingly to (over-)sensitive editors.
-
-09/10/2002: ttn
-	    [Guile] Converted Examples/guile/simple "make check"
-	    behavior to actually check execution results.  Reduced
-	    iteration counts so that the test doesn't take too long.
-
-09/10/2002: beazley
-            SWIG-1.3.15 released.
-
-
-Version 1.3.15 (September 9, 2002)
-==================================
-
-09/09/2002: beazley
-            Fixed nasty runtime type checking bug with subtypes and inheritance
-            and templates. 
-
-09/09/2002: cheetah (William Fulton)
-            [Java] Java exception classes for a method's throws clause can be generated by 
-            specifying them in a comma separated list in the throws attribute in any one
-            of the following typemaps: in, out, check, freearg, argout and throws. A classic
-            example would be to convert C++ exceptions into a standard Java exception:
-
-                %typemap(throws, throws="java.io.IOException") file_exception {
-                    jclass excep = jenv->FindClass("java/io/IOException");
-                    if (excep)
-                        jenv->ThrowNew(excep, $1.what());
-                    return $null; // or use SWIG_fail
-                }
-
-                class file_exception {...};
-                void open(const char *filename) throw(file_exception);
-
-            The Java method will then be declared with a throws clause:
-
-                public static void open(String filename) throws java.io.IOException {...}
-
-09/08/2002: mkoeppe
-	  * [Guile] Improved the documentation system.  The arglist no
-	    longer gets cluttered with type specification, making it
-	    more readable.  (Also the ILISP function C-u M-x
-	    `arglist-lisp' RET works better this way.)  The types of
-	    arguments are explained in an extra sentence after the
-	    arglist. 
-	    
-	    There are now two documentation-related typemap arguments:
-
-	        %typemap(in, doc="$NAME is a vector of integers", 
-			 arglist="$name")  int *VECTOR { ... }
-			 
-            The "arglist" texts of all arguments of a function make up
-	    its arglist in the documentation.  The "doc" texts of all
-	    arguments are collected to make a sentence that describes
-	    the types of the arguments.  Reasonable defaults are
-	    provided. 
-
-	    As usual, $name is substituted by the name of the
-	    argument. The new typemap variable $NAME is like $name,
-	    but marked-up as a variable.  This means that it is
-	    upper-cased; in TeXinfo mode ("-procdocformat texinfo") it
-	    comes out as @var{name}. 
-	    
-	    The directives %values_as_list, %values_as_vector,
-	    %multiple_values now also have an effect on the
-	    documentation. (This is achieved via the new pragmas
-	    return_nothing_doc, return_one_doc, return_multi_doc.)
-
-	    Documentation has also improved for variables that are
-	    wrapped as procedures-with-setters (command-line switch
-	    "-emit-setters").
-
-          * [Guile] Emit constants as _immutable_ variables.  (This
-            was broken recently.)
-
-09/07/2002: mkoeppe
-	    [Guile] Updated the typemaps in list-vector.i.
-
-09/07/2002: mkoeppe
-	    Short-circuit the typechecks for overloaded functions.
-	    (The changes in code generation are visible in the new
-	    testcase "overload_complicated".)
-
-09/06/2002: cheetah (William Fulton)
-            [Java] Solution for [ 596413 ]
-            New typemap so that the Java proxy classes and type wrapper classes
-            wrapper constructor modifier can be tailored by users. The default value is 
-            protected. Normally SWIG generates a constructor like this which can only 
-            be accessed within one package:
-
-              protected Bar(long cPtr, boolean cMemoryOwn) {
-              ...
-              }
-            
-            If you are using SWIG across multiple packages or want to use this constructor
-            anyway, it can now be accessed outside the package. To modify use for example:
-
-              %typemap(javaptrconstructormodifiers) SWIGTYPE "public"
-
-            to change to public for all proxy classes and similarly for all type wrapper classes:
-            
-              %typemap(javaptrconstructormodifiers) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] "public"
-
-09/06/2002: cheetah (William Fulton)
-            [Java] Added throws typemaps for the Java module. C++ exceptions get converted into
-            java.lang.RuntimeException Java exceptions. 
-            
-            Warning: This may change from java.lang.Runtime exception in the future.
-
-09/05/2002: cheetah (William Fulton)
-            [Java] Fix for variables declared as references.
-
-09/05/2002: beazley
-            Fixed [ 605162 ] Typemap local variables. Reported by Lyle Johnson.
-
-09/05/2002: ljohnson (Lyle Johnson)
-            [Ruby] More updates to the Ruby module documentation, including
-	    a new typemap example that demonstrates how to collect key-value
-	    pairs from an argument list into a Hash.
-
-09/05/2002: beazley
-            Fixed bug with template expansion and constructors.
-
-                template<class T> class Foo {
-                public:
-                    Foo<T>() { }
-                };
-
-            The extra <T> in the constructor was carried through in the
-            name--causing runtime problems in generated modules.
-            Reported by Jordi Arnabat Benedicto.
- 
-09/05/2002: mkoeppe
-	    [Guile] Support overloading.
-
-09/04/2002: ljohnson (Lyle Johnson)
-            [Ruby] Updated typemaps for long long and unsigned long long types
-	    to use Ruby 1.7 support for these types when available.
-
-09/04/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added output typemaps for const reference to primitive
-	    types.
-
-09/04/2002: mkoeppe
-	    [Guile] Fix pass-by-value typemaps.  Reported by Arno
-	    Peters via Debian bugtracking (#156902), patch by Torsten
-	    Landschoff <torsten@debian.org>.
-
-09/03/2002: samjam (Sam Liddicott)
-	    Better reference support.
-	    Functions that want a void** can take a NULL by reference and
-	    the void* will be made for you and then passed-by-reference
-
-	    Also all integer-class native types can be passed by reference
-	    where an int* or int& etc is needed
-
-09/03/2002: beazley
-            Changed the evaluation order of preprocessor macro arguments.
-            Arguments are now expanded by the preprocessor *before* they
-            are passed to macro expansion.  This fixes a subtle expansion
-            bug reported by Anthony Heading.
-
-09/03/2002: beazley
-            Fixed the file include order (again, apparently). See 2/27/99.
-
-09/02/2002: beazley
-            [Perl] Better exception handling support.  Since Perl error handling
-            relies on setjmp/longjmp, wrapper functions have been modified slightly
-            to provide an extra block scope:
-
-                XS(foo) {
-                   char _swigmsg[SWIG_MAX_ERRMSG] = "";
-                   const char *_swigerr = _swigmsg;
-                   {
-                      /* Normal wrapper function here */
-                      ...
-                      SWIG_croak("An error occurred\n");
-                      ...
-                      XSRETURN(argvi);      /* Successful return */
-                      fail:
-                        /* cleanup code */
-                   }
-                   croak(_swig_err);
-                }
-
-            The macro SWIG_croak(x) sets the value of _swigerr to x and
-            executes a "goto fail".  The whole wrapper function is enclosed
-            block scope to provide proper cleanup of C++ objects.  Since
-            croak executes a longjmp(), there is no way to properly reclaim
-            resources if this executes in the same scope as the wrapper
-            function.
-
-            The _swigmsg[] variable is normally unused, but can be used
-            to store small error messages using sprintf or snprintf. It
-            has a capacity of at least 256 bytes (SWIG_MAX_ERRMSG).
-            
-09/02/2002: beazley
-            [Tcl] Added better support for exceptions.  Instead of returning TCL_ERROR,
-            use the macro SWIG_fail to return with an error.  This ensures that
-            arguments are properly cleaned up.  Exception specifiers are now
-            handled by default.
-
-09/02/2002: ljohnson (Lyle Johnson)
-            [Ruby] The type-checking system for the Ruby module has had a flaw
-	    in that some types which should be considered equivalent
-	    weren't. This bug was best demonstrated by the inherit_missing.i
-	    test suite case, which defines a base class "Foo" that is
-	    subclassed by "Bar". The "Foo" class isn't actually wrapped (i.e.
-	    it's not directly accessible from Ruby) but we'd still like to be
-	    able to pass "Bar" instances to functions expecting Foos and have
-	    that work; it wasn't. The revised implementation (similar to that
-	    used for some other language modules) adds a new instance variable
-	    (__swigtype__) to each object that indicates its SWIG type;
-	    that is, each "Bar" instance will now have a string instance
-	    variable called "__swigtype__" whose value is "_p_Bar".
-
-            Unless developers were taking advantage of this low-level
-	    implementation detail, they shouldn't notice any compatibility
-	    problems; nevertheless, I'm marking it as a "potential
-	    incompatibility".
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-09/01/2002: ljohnson (Lyle Johnson)
-            [Ruby] Fixed SF Bug #603199.
-
-08/08/2002: cheetah (William Fulton)
-            [Java] Added OUTPUT, INPUT and INOUT typemaps in typemaps.i for C++ 
-            references.
-
-08/27/2002: mkoeppe
-	    [Guile] Fixed error in "lib_std_vector" testcase and
-	    compiler warning in "lib_cdata" testcase.
-
-08/27/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added the "%mixin" directive, which allows the user to
-	    specify a comma-separated list of module names to mix-in to a
-	    class. So, for example, if you'd like to specify that Ruby's
-	    Enumerable module should be mixed-in to your class Foo, you'd
-	    write:
-	    
-	        %mixin Foo "Enumerable";
-		
-            or to specify that the modules Fee, Fie and Fo should be mixed
-	    in to Foo:
-	    
-	        %mixin Foo "Fee,Fie,Fo";
-		
-	    *** NEW FEATURE ***
-
-08/27/2002: ljohnson (Lyle Johnson)
-            [Ruby] Modified the %alias directive so that multiple aliases
-	    can be specified for an instance method by using a comma-separated
-	    list of aliases.
-
-08/27/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added "throw" typemaps for the Ruby module.
-
-08/26/2002: beazley
-            Two new command line options for printing dependencies.
-            'swig -M' lists all file dependencies.  'swig -MM' lists
-            dependencies, but excludes files in the SWIG library. 
-            Example:
-
-               % swig -M -python example.i
-               example_wrap.cxx: \
-                /u0/beazley/Projects/lib/swig1.3/swig.swg \
-                /u0/beazley/Projects/lib/swig1.3/python/python.swg \
-                example.i \
-                example.h 
-
-               % swig -MM -python example.i
-               example_wrap.cxx: \
-                example.i \
-                example.h 
-
-            *** NEW FEATURE ***
-
-08/26/2002: beazley
-            Fixed [ 597599 ] union in class: incorrect scope.
-            Reported by Art Yerkes.
-
-08/26/2002: beazley
-            Fixed [ 600132 ] Default argument with namespace. 
-            Reported by Shibukawa Yoshiki.
- 
-08/24/2002: beazley
-            Automatic C++ exception handling enabled for all language modules.    This is
-            pretty simple.  If you have a class like this:
-
-                class Foo {
-                };
-                class Bar {
-                public:
-                    void blah() throw(Foo);
-                }
-
-            then the generated wrapper code looks like this:
-
-                  wrap_Bar_blah() {
-                       ...
-                       try {
-                           arg1->blah();
-                       } 
-                       catch (Foo &_e) {
-                           /* "throw" typemap code inserted. $1 = _e */
-                       }
-                       catch (...) {
-                          throw;
-                       }
-                  }
-            The "throw" typemap can be used to raise an error in the target 
-            language.  It can do anything.  Here is a very simple example:
-
-                 %typemap("throw") Foo {
-                     PyErr_SetString(PyExc_RuntimeError, "Foo exception");
-                     return NULL;
-                 }
-
-            To make this work in each language module, simply define a few default
-            "throw" typemaps for SWIGTYPE, SWIGTYPE *, int, const char *, and a
-            few common exception types.   That's all there is to it.
-
-            Automatic exception handling can be disabled using -noexcept or
-            setting the NoExcept global variable to 1.
-            *** NEW FEATURE ***
-
-08/23/2002: beazley
-            [ Python ]
-            Automatic translation of C++ exception specifications into error handling code.
-            For example:
- 
-                class Foo {
-                };
-                class Bar {
-                public:
-                    void blah() throw(Foo);
-                }
-
-            In this case, Foo is wrapped as a classic-style class (compatible
-            with exception handling).  Furthermore, you can write Python code
-            like this:
-
-                b = Bar()
-                try:
-                    b.blah();
-                except Foo,e:     # Note use of exception class here!
-                    # Handle Foo error
-                    ...
-
-            The object "e" in the exception handler is just a wrapped Foo
-            object.  Access it like a normal object.
-
-            If an exception is not wrapped as a class, a RuntimeError
-            exception is raised.  The argument to this exception is
-            the exception object.  For example:
- 
-                class Bar {
-                public:
-                    void blah() throw(int);
-                }
-
-                b = Bar()
-                try:
-                   b.blah();
-                except RuntimeError,e:
-                   print e.args[0]       # Integer exception value
-
-            Comments:
-
-                -  If a class is used as an exception, it *must* be wrapped
-                   as a Python classic-style class (new classes don't work).
-
-                -  Automatic exception handling is compatible with %exception.
-
-                -  Use -noexcept to turn off this feature.
-
-                -  The newly introduced "throw" typemap is used to raise
-                   Python errors (naturally).
-
-            *** EXPERIMENTAL NEW FEATURE ***
-
-08/23/2002: beazley
-            Information from throw() specifiers is now stored in the parse
-            tree.  For example:
-
-                class Foo {
-                public:
-                     int blah() throw(spam,bar);
-                }
-
-            The stored information is fully corrected for namespaces and works
-            with templates.  Uses will follow.
-            
-08/22/2002: beazley
-            Exception handling code is no longer applied to member access
-            function.  For example, in this code
-
-                %exception {
-                   try {
-                      $action
-                   } catch(whatever) {
-                      ...
-                   }
-                }
-
-                class Foo {
-                public:
-                    int x;
-                    ...
-                }
-
-            The exception handling code is not applied to accessor functions
-            for Foo::x.   This should reduce the amount of extra code
-            generated.
-
-            Caveat:  Exception handling code *is* used when attributes are
-            accessed through a smart-pointer or a synthesized attributed
-            added with %extend is used.
-
-08/22/2002: beazley
-            Made more patches to hopefully eliminate problems when compiling SWIG 
-            as a 64-bit executable.
-
-08/22/2002: beazley
-            Fixed a bug with const reference members, variables, and static members.
-            For example:
-
-                  class Foo {
-                  public:
-                       static const int &ref;
-                  };
-
-            SWIG was trying to generate "set" functions which wouldn't compile. 
-
-08/21/2002: beazley
-            Made the warning message for "Class X might abstract" off by default.
-            Enable with -Wall.
-
-08/21/2002: beazley
-            Refined handling of const and non-const overloaded methods.  If
-            a class defines a method like this:
-
-                class Foo {
-                public:
-                    int bar(int);
-                    int bar(int) const;
-                }
-
-            Then the non-const method is *always* selected in overloading and
-            the const method silently discarded.  If running with -Wall, a warning
-            message will be generated.
-
-08/19/2002: beazley
-            Better support for using declarations and inheritance.   Consider this:
-
-                class Foo {
-                public:
-                      int blah(int x);
-                };
-
-                class Bar {
-                public:
-                      double blah(double x);
-                };
-
-                class FooBar : public Foo, public Bar {
-                public:
-                      char *blah(char *x);
-                      using Foo::blah;
-                      using Bar::blah;
-                };
-
-            Now SWIG wraps FooBar::blah as an overloaded method that uses all
-            accessible versions of blah().  See section 15.2.2 in Stroustrup, 3rd Ed.
-
-            SWIG also supports access change through using declarations.  For example:
-
-                class Foo {
-                protected:
-                     int x;
-                     int blah(int x);
-                };
-
-                class Bar : public Foo {
-                public:
-                     using Foo::x;
-                     using Foo::blah;
-                };
-
-
-            Caveat:   SWIG does not actually check to see if declarations imported
-            via 'using' are in the inheritance hierarchy.  If this occurs, the
-            wrapper code won't compile anyways---not sure it's worth worrying about.
-          
-08/18/2002: beazley
-            Modified overloading dispatch to not include nodes with an "error" attribute.
-            A language module can set this if a node couldn't be wrapped and you don't want
-            it included in the dispatch function.
-
-08/18/2002: beazley
-            Enhancement to overloaded function dispatch.   The dispatcher is now aware of
-            inheritance relationships.   For example:
-
-                   class Foo { };
-                   class Bar : public Foo { };
-                    
-                   void spam(Foo *f);
-                   void spam(Bar *b);
-
-            In this case, the dispatcher re-orders the functions so that spam(Bar *b) is
-            checked first---it is more specific than spam(Foo *f).
-
-08/17/2002: beazley
-            Added -Werror command line option.   If supplied, warning messages are treated
-            as errors and SWIG will return a non-zero exit code.
-
-08/17/2002: beazley
-            Fixed [ 596135 ] Typedef of reference can't compile.  For example:
-
-                 typedef int &IntRef;
-                 void foo(IntRef i);
-
-            SWIG-1.3.14 generated code that wouldn't compile.
-
-Version 1.3.14 (August 12, 2002)
-================================
-
-08/11/2002: mmatus
-	    Static const members initialized during declaration, and
-	    only them, ie:
-
-	    struct A
-	    {		 
-		static const int a = 1 ;  // this one
-		static const int b;       // not this one
-            };     
-
-	    are emitted like constants (equivalent to enums or
-	    explicit %constant).
-	    
-	    This is because they cannot be added directly to 'cvar'
-	    since they lack the needed reference (well, you can force
-	    them to have a real reference, but in an ugly way which
-	    goes completely again the original purpose of initialize
-	    them during declaration, you also have to deal with extra
-	    linking matters, and it take a while to figure out what is
-	    the problem and how to solve it).
-	    
-	    Please test it with your preferred target language, and
-	    not only the code generation, but really run the example
-	    in the test-suite (static-const-member-2.i) because the
-	    problem and the solution cannot be "fully" appreciated
-	    until you try to load the module and run it.
-
-	    In some target languages (python specially), this can
-	    produces a difference in the way that the static constant
-	    members 'a' and 'b' are internally wrapped. Hopefully,
-	    they still can be accessed in the same way.
-
-
-08/11/2002: mmatus
-	    [python] Now static const members can be accessed in a more
-	    natural way, ie, if you have
-
-	    struct A
-             {		 
-		typedef unsigned int viewflags;
-		static const viewflags forward_field = 0;
-		static const viewflags backward_field;
-            };     
-	    
-	    now you can do:
-
-		print A.backward_field
-
-	    and also
-
-	        a = A()
-		print a.forward_field
-		
-	    Note that if the static const members don't have an
-	    initializer (like backward_field), still you can access
-	    them in the same way in the python side, but the
-	    implementation is a quite different: backward_field will
-	    still appear in the cvar entity, and also, you are 
-	    responsible to initialize it in some code unit, and link it
-	    properly. forward_field, by the other hand, will not
-	    appear in the cvar entity but only as a A member, similar
-	    to what happen with enum or %constant members.
-
-08/11/2002: mmatus
-	    [python] Common code in the __setattr__/__getattr__ now
-	    goes to two "free" methods at the beginning of the proxy
-	    file, from where each class use it. This change reduces
-	    the size of the proxy file, specially if you wrap a lot of
-	    small classes in one module (up to 33% in some cases),
-	    making it faster to load too.
-
-08/09/2002: beazley
-            [Perl5] If a function that returns char * returns NULL,
-            undef is returned to the Perl interpreter.
- 
-08/09/2002: beazley
-            Fix to conversion operators and namespaces.  For example:
-
-                namespace ns {
-                    struct Foo { };
-                    struct Bar {
-                        operator Foo*();
-                    };
-                }
-
-            In the wrapper code, SWIG was using ->operator Foo*()
-            when it should have been using ->operator ns::Foo*().
-
-            Note: if using %rename with a conversion operator, you
-            might have to do this:
-
-               %rename(toFooPtr) ns::operator ns::Foo*();
-                                      //      ^^^^ note extra qualifier
-               namespace ns {
-                    ...
-
-            
-08/09/2002: beazley
-            [Python] Minor enhancement to 'const' variable declarations. 
-            Normally const declarations are wrapped as read-only variables
-            accessible only through the cvar attribute (see SWIG.html for
-            a discussion of why).  However, in many programs, "const" 
-            declarations may just be constants---making the cvar. access
-            awkward.  To fix this, "const" declarations are now available
-            both through cvar. and as a simple name.  For example:
-
-                 const int FOO = 42;
-
-            In Python:
-
-                 >>> print example.cvar.FOO
-                 42
-                 >>> print example.FOO
-                 42
-
-            Note: There are cases where the value of a "const" variable
-            might change.  For example:
-
-                 char *const BAR = "Hello World";
-
-            In this case, the pointer itself can not change, but the 
-            data being pointed to could be modified.  In these situations,
-            cvar.BAR should be accessed to obtained the current value.
-
-08/08/2002: beazley
-            [Python] Fixed generation of the proxy code (.py files) to more
-            closely follow the order of declarations as they appear in
-            the .i file.   In the past, all of the class wrappers appeared
-            first, followed by function stubs, inserted Python code, and
-            other details.
-
-08/08/2002: cheetah (William Fulton)
-            [Java] Proxy method _delete() changed to delete(). There shouldn't ever
-            be a wrapped function called delete() as it is a C++ keyword and there
-            is no such thing as a member function in C.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-            Backwards compatibility can be achieved by adding the function back in
-            for all proxy classes:
-            %typemap(javacode) SWIGTYPE %{
-              public void _delete() {
-                delete();
-              }
-            %}
-
-            Java backwards compatibility summary
-            ------------------------------------
-
-            There are a number of changes that have been made in improving the Java module 
-            for ver 1.3.14.  If at all possible change your code to take advantages of the 
-            improvements. If you were using proxy classes you may not notice any backwards 
-            compatibility issues. Here is an example which will help with most backwards 
-            compatibility problems where it is not possible to modify the code that uses
-            the generated output:
-
-            Replace:
-                %module modulename
-
-            With:
-                %module (jniclassname="modulename") modulename;
-                %typemap(javacode) SWIGTYPE %{
-                    public long getCPtr$javaclassname() {
-                        return swigCPtr;
-                    }
-                    public void _delete() {
-                      delete();
-                    }
-                %}
-                %pragma(java) jniclassclassmodifiers="public";
-
-            The proxy constructors that took parameters (long cPtr, boolean cMemoryOwn)
-            were public and are now protected. If you were making use of these then you'll 
-            have to modify your code and the best solution would be to use the new type 
-            wrapper classes.
-
-            The other main areas are the pragmas and global variable wrapping. Replace 
-            the pragmas with one of the new directives or typemaps mentioned below and use
-            %rename on the variables.
-
-            If you were not using proxy classes, you will have to define a jstype typemap
-            as well as a jtype typemap.
-
-08/08/2002: cheetah (William Fulton)
-            [Java] Fix for wrapping two dimension array variables.
-
-08/07/2002: beazley
-            [Python,Tcl]
-            Object management now has a much better sense of ownership.
-            Ownership bits is changed whenever an object is stored in a
-            global variable or structure member.  For example:
-
-                struct Foo {
-                    int val;
-                    Foo *next;
-                };
-
-            Now in Python
-
-               >>> f = Foo()
-               >>> f.thisown
-               1
-               >>> g = Foo()
-               >>> g.next = f          # Assign a pointer
-               >>> f.thisown           # Notice ownership change
-               0
-               >>>
-
-            This scheme is mostly a conservative heuristic designed to 
-            provide segmentation faults.  It could cause a memory leak
-            if ownership is changed unnecessarily.  In this case, you can
-            either write a typemap (that doesn't change ownership), or
-            manually set the thisown attribute back to 1.
-
-08/07/2002: beazley
-            [Tcl] Major usability improvements to the object interface.
-            Suppose you had code like this:
-
-                 struct Foo { 
-                     int x;
-                     int spam();
-                 };
-
-                 void  blah(Foo *f);
-
-            In past versions of SWIG, you could create objects and use
-            them like this:
-
-                % Foo f
-                % f configure -x 3
-                % f spam
-                37
-    
-            The only problem is that if you tried to call blah(), it didn't
-            work:
-
-                % blah f
-                Type Error. Expected _p_Foo
-                %
-
-            Instead, you had to do this:
-
-                % blah [f cget -this]
-  
-            SWIG now automatically extracts the -this pointer, avoiding this
-            problem.  This means that saying "blah f" is perfectly legal and
-            everything will still work normally.
-
-            Caveat: Since pointer strings start with a leading underscore (_),
-            don't use this in object names.  For example:
-
-                % Foo _f 
-                % blah _f        # Potential crash
-
-            Objects now have a -thisown attribute that shows the ownership.
-            This builds upon the CHANGES 11/24/2001 entry.
-
-08/07/2002: samjam, Sam Liddicott
-            Properly implemented pointer system using php resources.
-            Still need to work out whether or not to let script-users call
-            destructors directly
-
-08/06/2002: beazley
-            Upgraded mzscheme module to support version 201 and added
-            overloading support.
-
-08/05/2002: beazley
-            Added parsing support for extra grouping (in very limited cases).
-            For example:
-
-                    typedef int (FuncPtr)(int, double);
-
-            *** EXPERIMENTAL ***
-            
-08/03/2002: ljohnson (Lyle Johnson)
-            [Ruby] Updates to typemaps.i as those done previously for Perl,
-            Python and Tcl modules. Now supports reference types with INPUT,
-            OUTPUT and INOUT typemaps.
-
-08/02/2002: beazley
-            New library file cstring.i added.  Provides macros for
-            manipulating char * data.
- 
-08/02/2002: beazley
-            Deprecated the %new directive.  Use %newobject instead.  For
-            example:
-
-               %newobject foo;
-               ...
-               char *foo();
-
-            %newobject follows the same rules as %rename, %ignore, %feature,
-            etc.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-08/01/2002: cheetah (William Fulton)
-            [Java] New attribute 'jniclassname' for the module directive allows a way of
-            changing the JNI class name from the default which uses the modulename with JNI
-            appended after it.
-
-                %module (jniclassname="name") modulename
-
-            If 'name' is the same as 'modulename' then the module class name gets changed
-            from 'modulename' to modulenameModule.
-
-08/01/2002: beazley
-            Fixed problem with file include order.  Language specific
-            directories should take precedence over generic directories.
-            For example:  "swig_lib/python/foo.i" should be loaded before
-            "swig_lib/foo.i".    I thought this was the case already, but
-            apparently it has been broken for quite some time.
-
-08/01/2002: beazley
-            Added std_deque.i library file.  Work in progress.
-
-08/01/2002: beazley
-            [Python,Tcl,Perl]
-            Improvements to typemaps.i.  INPUT/INOUT typemaps perform better
-            error checking.  Typemaps are now supplied for references like 
-            int &OUTPUT, double &INOUT, etc.
-          
-08/01/2002: beazley
-            [Python] Deprecated the T_* and L_* typemaps in typemaps.i.
-            Multiple return values are always placed in a tuple. Deprecated
-            the BOTH typemaps.  This is now INOUT (e.g., int *INOUT).
-
-            *** POTENTIAL INCOMPATIBILITY FOR PYTHON MODULE ***
-
-08/01/2002: beazley
-            Deprecated the array.i, carray.i, and timer.i library files.
-
-08/01/2002: beazley
-            Deprecated the pointer.i library file.  Use cpointer.i instead.
-            *** POTENTIAL INCOMPATIBILITY ***
-            
-08/01/2002: cheetah (William Fulton)
-            [Java] For consistency the global variable getters and setters use the JavaBean 
-            property design pattern like member variables always have. This means if you are 
-            wrapping a variable called foo, the getter is called getFoo() and the setter is 
-            called setFoo(). Before the recent changes to the Java module the getters and 
-            setters were called get_foo() and set_foo(). If you really want the original 
-            function names use the %rename directive like this: %rename(_foo) Foo;
-
-07/31/2002: beazley
-            Fixed casting problem with multiple inheritance.  If you had this,
-
-                  class foo {};
-                  class bar : public foo {};
-                  class baz : public foo {};
-                  class spam : public bar, public baz {};
-
-            then the wrappers wouldn't compile due to an ambiguous cast.
-            Reported by Art Yerkes.
-
-07/30/2002: cheetah (William Fulton)
-            [Java] Due to new static typechecking all pointers held in a Java long are part of 
-            the internal workings and this pointer value in the Java long has become abstracted
-            data. The type wrapper constructor and getCPtr() methods are as such protected.
-            If you need to mess around with pointers from Java or for example create a proxy 
-            class or type wrapper class around a null pointer, add a function/constructor 
-            to do so with the %javacode typemap. You can also make getCPtr() public again with
-            the %javagetcptr typemap.
-
-07/30/2002: cheetah (William Fulton)
-            [Java] Fixes for %typemap(ignore). In particular when ignoring the last parameter
-            in a function. Also for all parameters in constructors. These mods have also fixed
-            multi-argument typemaps for proxy classes - SF 581791.
-
-07/30/2002: cheetah (William Fulton)
-            [Java] %newobject (replacement for %new) now implemented for Java. 
-
-07/29/2002: beazley
-            Fixed problem with typemap copies, %apply, and %clear inside
-            C++ namespaces.
-
-07/28/2002: cheetah (William Fulton)
-            [Java] The JNI class now has package access as the class modifier
-            has been changed from "public" to nothing. This has been done
-            as this class is now more for the internal workings of SWIG since the module
-            class has static type checking for all types.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-            Backwards compatibility can be achieved by using the %jniclassclassmodifier 
-            pragma to change it back to "public".
-
-07/28/2002: cheetah (William Fulton)
-            [Java] Proxy/Shadow classes are generated by default. The -proxy and 
-            -shadow command line options are deprecated. If you want to use the 
-            low-level functional interface then use the new -noproxy commandline option.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-07/28/2002: cheetah (William Fulton)
-            [Java] Remaining pragmas shakeup. These were the remaining pragmas and their
-            new names where changed:
-
-            modulebase
-            modulecode
-            moduleclassmodifiers
-            moduleimport => moduleimports
-            moduleinterface => moduleinterfaces
-
-            The moduleimports works slightly differently to how the moduleimport pragma worked. 
-            Now it actually takes code which gets placed before the class definition so the 
-            whole import statement has to be given, for example:
-
-            %pragma(java) moduleimports=%{
-            import java.io.*;
-            import java.math.*;
-            %}
-
-            The moduleinterfaces is slightly different to the old moduleinterface in that if 
-            more than one interface is required they must be comma separated in one use of 
-            the pragma, for example:
-
-            %pragma(java) moduleinterfaces="Serializable, MyInterface"
-
-            These last two pragmas are consistent with the javainterfaces and javaimports 
-            typemap.
-
-            A similar set of pragmas has been introduced, namely:
-
-            jniclassbase
-            jniclasscode
-            jniclassclassmodifiers
-            jniclassimport
-            jniclassinterface
-
-            These work in the same way as their module counterparts. Note that previously
-            the moduleXXX pragmas worked on the old module class which is now called the
-            JNI class (the class with the native functions). The jniclassXXX pragmas now 
-            work on the new module class (the class that has all the global functions and
-            global variable getters and setters when using proxy classes, plus all other
-            remaining functions when using the low-level procedural interface).
-
-            In summary the contents of the pragmas make up a class like this:
-
-            <jniclassimports>
-            <jniclassmodifiers> class modulename extends <jniclassbase> implements <jniclassinterfaces> {
-                <jniclasscode>
-                ... SWIG generated functions ...
-            }
-}
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-07/28/2002: cheetah (William Fulton)
-            [Java] Deprecated modulemethodmodifiers pragma and replaced with 
-            a better %feature based directive called %javamethodmodifiers.
-            A useful example would be for synchronisation in multi-threaded apps:
-
-            %javamethodmodifiers foo(int a) "public synchronized";
-
-            Changes this function from the default ("public") to "public synchronized".
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-07/26/2002: beazley
-            Several directives now allow optional configuration parameters.
-            These include:
-
-                %module(name="value", name="value", ...) modulename
-                %import(name="value", ...) "filename.i"
-                %extend(name="value", ...) classname {
-                   ...
-                }
-
-            These currently have no effect and are reserved for
-            future expansion.
-               
-07/26/2002: beazley
-            Enhancements to smart-pointer handling.  SWIG only provides
-            extra support for a smart-pointer if operator->() returns
-            a proper pointer.  For example:
-
-                 Foo *operator->();
-
-            If operator->() returns an object by value or reference,
-            then SWIG examines the returned object to see if it also
-            implements operator->().  If so, SWIG chases operator->()
-            until it can find one that returns a pointer.  This allows
-            cases like this to work:
-
-                 class Foo {
-                 public:
-                     void blah();
-                 };
-
-                 class Bar {
-                   ...
-                   Foo *operator->();
-                   ...
-                 };
-
-                 class Spam {
-                   ...
-                   Bar operator->();
-                   ...
-                 };
-
-            For example:
-
-                 >>> s = Spam()
-                 >>> s.blah()      # Invokes Foo::blah()
-
-            The s.blah() call actually invokes:
-
-                  ((s.operator->()).operator->())->blah();
- 
-07/26/2002: beazley
-            Fixed a bug with typedef and references.  For example:
-
-                 typedef Foo & FooRef;
-                 FooRef blah();
-
-            Previous versions of SWIG generated code that wouldn't
-            compile.
-
-07/25/2002: beazley
-            Wrapping of static methods has been improved in proxy classes.  In older
-            versions of SWIG, if you had this:
-
-                  class Foo {
-                  public:
-                     static void bar();
-                  };
-
-            The static method was only available as a function Foo_bar().  For example:
-
-                  >>> Foo_bar()
-
-            Now, the static method can also be invoked through an instance like this:
-
-                  >>> f = Foo()
-                  >>> f.bar()        # Invokes static method
-
-            This works with all versions of Python.  Additionally, for Python-2.2,
-            the static method can be invoked as:
-
-                  >>> Foo.bar()
-
-            The old-style function is still support for backwards compatibility. If
-            you care about making your code across different versions of Python,
-            either use Foo_bar() or access the method through an instance.
- 
-07/25/2002: beazley
-            Changes to the Python module.  Proxy classes now utilize new Python-2.2
-            features including properties and static methods.  However, these features
-            are supported in a way that provides backwards compatibility with older
-            Python versions.  In other words, proxy classes work with all versions
-            of Python and only use new features when running on Python-2.2.
-
-
-07/25/2002: beazley
-            Modified %extend so that overloaded methods can be added.  For example:
-
-                %extend Foo {
-                     void bar(int x) { };
-                     void bar(char *s) { };
-                     ...
-                }
-
-            This works with both C++ *and* C.
-
-07/24/2002: cheetah (William Fulton)
-            [Java] More new typemaps so that the Java proxy classes and type wrapper classes
-            can be further tailored by users. These are the default code for generating the 
-            finalize() methods (proxy classes only) and the getCPtr() methods for proxy 
-            classes and type wrapper classes:
-
-            %typemap(javafinalize) SWIGTYPE %{
-              protected void finalize() {
-                _delete();
-              }
-            %}
-            
-            %typemap(javagetcptr) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] %{
-              public static long getCPtr($javaclassname obj) {
-                return obj.swigCPtr;
-              }
-            %}
-
-            The javagetcptr typemap will enable users to handle Java null by overriding
-            this typemap - a requested feature.
-
-            The -nofinalize commandline option has been deprecated. The javafinalize
-            typemap is more powerful as it will allow the removal of the finalize methods 
-            for all or any one or more particular proxy class.
-
-07/23/2002: cheetah (William Fulton)
-            [Java] The getCPtrXXX() function has been changed to a static function and
-            is now of the form:
-
-            protected static long getCPtr(XXX obj) {...}
-
-            This is a requested change which will allow Java null pointers to be used as null
-            can be passed in for obj. However, to achieve this the appropriate code must be
-            written using the new javagetcptr typemap directive.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-            Backwards compatibility can be achieved by adding this function back in using the
-            new javacode typemap:
-
-            %typemap(javacode) SWIGTYPE %{
-
-              // SWIG-1.3.12 and SWIG-1.3.13
-              public long getCPtr$javaclassname() {
-                return swigCPtr;
-              }
-              // SWIG-1.3.11 and earlier
-              public long getCPtr() {
-                return swigCPtr;
-              }
-
-            %}
-
-
-07/23/2002: cheetah (William Fulton)
-            [Java] New directive to control constant code generation - %javaconst.
-            The default handling for handling constants is to get the value through
-            a JNI call, eg
-
-            #define YELLOW 5
-            #define BIG 1234LL
-
-            results in:
-
-            public final static int YELLOW = modulename.get_YELLOW();
-            public final static long BIG = modulename.get_BIG();
-
-            Earlier versions of the Java module initialised the value using the C value:
-
-            public final static int YELLOW = 5;
-            public final static long BIG = 1234LL;
-
-            This works in most cases, but the value for BIG won't compile as 1234LL is not
-            valid Java code and this is one of the reasons why the default is now to get the 
-            values through a JNI call. The side effect is that these 'constants' cannot be used 
-            in switch statements. The %javaconst directive allows one to specify the
-            way the constant value is initialised and works like other %feature
-            directives, eg
-
-            %javaconst(0);     // all constants from this point on are initialised using the C value
-            %javaconst(1) BIG; // just BIG initialised using JNI call (must be parsed before BIG is defined)
-
-07/23/2002: beazley
-            *** IMPORTANT CHANGES TO THE PYTHON MODULE ***
-
-            (1) The Python module now enables shadow/proxy classes by default.
-            This means that two files are always created by SWIG.  For
-            instance, if you have this:
-
-                 // file: foo.i
-                 %module foo
-                 ...
-
-            Then swig generates two files "foo_wrap.c" and "foo.py".
-
-            (2) The name of the low-level C extension module has been changed
-            to start with a leading underscore.   This means that you have
-            to compile the module as follows:
-
-                $ cc -c -I/usr/local/include/python2.2 foo_wrap.c
-                $ cc -shared foo_wrap.o $(OBJS) -o _foo.so
-                                                   ^^^^
-                                                   note extra underscore
-
-            This naming scheme is consistent with other Python modules that
-            utilize extension code.  For instance, the socket module consists
-            of "_socket.so" and "socket.py".  In previous versions of SWIG,
-            the shared object file was named "foocmodule.so".
-
-            (3) A new directive can be used to insert Python code into
-            the corresponding .py file.  For example:
-
-                %pythoncode %{
-                def foo():
-                    print "Hello World"
-                %}
-
-             This directive allows you to create modules as a mix of C and Python.
-             Python code is seamlessly added to the module.
-
-            (4) The -shadow command line option is deprecated.  This is turned on
-            by default.
-
-            (5) To disable the generation of the extra python file, use the "-noproxy"
-            command line option.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            This change will likely break the build environment of projects that
-            utilize shadow classes.   To fix this, you probably only need to
-            change the name of the target .so file.  For example, if you have
-            Makefile information like this:
-
-                   TARGET = examplecmodule.so
-
-            Just change it to:
-
-                   TARGET = _example.so
-
-            *** DOCUMENTATION UPDATE ***
-            The file Doc/Manual/Python.html has been updated to describe these changes.
-
-
-07/23/2002: beazley
-            Added -noextern option.   If supplied, SWIG will not generate
-            extra extern declarations.  This is sometimes an issue on 
-            non-unix platforms.
-
-07/23/2002: beazley
-            Added a warning for ignored friend functions.
-
-07/23/2002: beazley
-            Fixed [ 574498 ] -proxy and %include "pointer.i" clash.
-            Reported by David Creasy.
-
-07/23/2002: beazley
-            Fixed [ 576103 ] global destruction warning with shadow.
-            Perl extensions should no longer report the warning
-
-               "Use of uninitialized value during global destruction."
- 
-            when running with "perl -w".  Reported by
-            Brett Williams.
-
-07/23/2002: beazley
-            In C++ mode, SWIG now always defines namespace std.  By default,
-            it's empty.  However, this will silence errors from programs
-            that include statements such as "using namespace std;".
-            This fixes Bug [ 584017 ] using namespace std generates error.
-            Reported by Joseph Winston.
-
-07/22/2002: beazley
-            Added a new warning message for %apply.  If you use %apply but no typemaps
-            are defined, you will get a warning message.  This should help with
-            problems like this:
-
-                   %apply char *OUTPUT { ... };
-
-            In old versions of SWIG, this silently did nothing.  Now you get an error like this:
-  
-                   file:line. Warning. Can't apply (char *OUTPUT). No typemaps are defined.
-
-07/22/2002: cheetah (William Fulton)
-            [Java] Started Java pragma deprecation. Replacements use %typemap based 
-            directives and enable proxy classes and the new type wrapper classes to be 
-            tailored in various ways. These are the new typemaps:
-            
-            %typemap(javabase)           - base (extends) for Java class
-            %typemap(javaclassmodifiers) - class modifiers for the Java class: default is "public"
-            %typemap(javacode)           - java code is copied verbatim to the Java class
-            %typemap(javaimports)        - import statements for Java class
-            %typemap(javainterfaces)     - interfaces (extends) for Java class
-            
-            And these are the %pragma directives being deprecated:
-            allshadowbase
-            allshadowclassmodifiers
-            allshadowcode
-            allshadowimport
-            allshadowinterface
-            shadowbase
-            shadowclassmodifiers
-            shadowcode
-            shadowimport
-            shadowinterface
-            
-            Note that it is possible to target a particular proxy class:
-            %typemap(javaimports) Foo "import java.util.*";
-            or a particular type wrapper class:
-            %typemap(javaimports) double* "import java.math.*";
-            Note that $javaclassname in these typemaps are substituted with either the proxy 
-            classname when using proxy classes or the SWIGTYPE class name.
-
-07/18/2002: cheetah (William Fulton)
-            [Java] Java module overhaul to implement static type checking of all 
-            types. 
-            
-            1) Changes when using Java Proxy classes
-            ----------------------------------------
-
-            Previously when wrapping global functions: 
-
-            class SomeClass{};
-            void foo(SomeClass* s);
-            SomeClass* bar();
-
-            The native method prototypes used a long for pointers and looked like this:
-
-            public class modulename  {
-                ...
-                public final static native void foo(long jarg1);
-                public final static native long bar();
-            }
-
-            and unlike member functions of a C++ class there was no wrapper around the native calls 
-            to make the use of them more user friendly. They would be used from Java like this:
-
-            SomeClass s = new SomeClass(modulename.bar(), false);
-            modulename.foo(s.getCPtrSomeClass());
-
-            Note that the following will have the same effect, but then it would not have 
-            been possible to call any proxy member functions in SomeClass:
-
-            long s = modulename.bar();
-            modulename.foo(s);
-
-            Now wrapper functions are generated:
-
-            public class modulename  {
-                public static void foo(SomeClass s) {
-                    // calls the native function
-                }
-
-                public static SomeClass bar() {
-                    // calls the native function
-                }
-            }
-
-            Which means these functions can now be used more naturally with proxy classes:
-
-            SomeClass s = modulename.bar();
-            modulename.foo(s);
-
-            2) Changes when not using Java Proxy classes
-            --------------------------------------------
-
-            The so called low-level interface was rather low-level indeed. The 
-            new static type checking implementation makes it less so but it remains a
-            functional interface to the C/C++ world. Proxy classes are the obvious way to use
-            SWIG generated code, but for those who want a functional interface all non-primitive
-            types now have a simple Java class wrapper around the C/C++ type. Pointers and
-            references to primitive types are also wrapped by type wrapper classes. The type
-            wrapper classnames are based on the SWIG descriptors used by the other language 
-            modules. For example:
-
-            C/C++ type      Java type wrapper class name
-            ----------      ----------------------------
-            int*            SWIGTYPE_p_int
-            double**        SWIGTYPE_p_p_double
-            SomeClass*      SWIGTYPE_p_SomeClass
-            SomeClass&      SWIGTYPE_p_SomeClass
-            SomeClass       SWIGTYPE_p_SomeClass
-
-            Note that everything wrapped by SWIG is accessed via a pointer even when wrapping 
-            functions that pass by value or reference. So the previous example would now be 
-            used like this:
-
-            SWIGTYPE_p_SomeClass s = example.bar();
-            example.foo(s);
-
-            Note that typedefs that SWIG knows about are resolved, so that if one has 
-
-            class Foo{};
-            typedef Foo Bar;
-
-            then any use of Bar will require one to use SWIGTYPE_p_Foo;
-
-            Some considerations:
-            Make sure you make a firm decision to use either proxy classes or the functional 
-            interface early on as the classnames are different.
-
-            3) Pointers and non-parsed types
-            --------------------------------
-            Sometimes SWIG cannot generate a proxy class. This occurs when the definition of 
-            a type is not parsed by SWIG, but is then used as a variable or a parameter. 
-            For example,
-
-            void foo(Snazzy sds);
-
-            If SWIG has not parsed Snazzy it handles it simply as a pointer to a Snazzy.
-            The Java module gives it a type wrapper class around the pointer and calls it 
-            SWIGTYPE_p_Snazzy. In other words it handles it in the same manner as types are 
-            handled in the low-level functional interface. This approach is used for all 
-            non-proxy classes, eg all pointer to pointers and pointers to primitive types.
-
-            4) Backwards compatibility
-            -----------------------
-            Backwards compatibility is not an issue if you have been using proxy classes and 
-            no global variables/functions. Otherwise some changes will have to be made. 
-            The native methods still exist but they are now in a JNI class, which is called 
-            modulenameJNI. As this class is really part of the internal workings,
-            it should not be required so the class has become protected. Some pragmas/directives
-            will hopefully be added to help with backwards compatibility.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-07/18/2002: beazley
-            Modified wrapping of uninstantiated templates returned by
-            value.  Just to be safe, they are now wrapped by SwigValueWrapper<>
-            just in case they don't define a default constructor.  This
-            would be used if you had code like this
-
-                 Foo<int> blah();
-                 void     moreblah(Foo<int> x);
-
-            but you didn't instantiate Foo<int> using %template.  
-            We should probably add a warning for this.
-
-07/17/2002: beazley
-            Added an error check to detect shadowed template paramaters.
-            For example:
-
-                  template<class T> class Foo {
-                  public:
-                        int T;
-                  };
-
-            This results in an error, not a warning.  This warning is
-            also needed to fix some rather insidious problems like
-            this:
-
-                 struct T {
-                      int  blah;
-                 };
-
-                 template<class T> class Foo {
-                 public:
-                      typedef T Traits;    // Which T is this????
-                 };
-
-            In this case, the template parameter T shadows the outer
-            structure (which is what you want).
-
-07/16/2002: beazley
-            Improved support for templates with integer arguments.  SWIG is
-            much more aware of situations such as this:
-
-                const int Size = 100;
-
-                %template(Foo100) Foo<100>;
-                void bar(Foo<Size> *x);   // Knows that Foo<Size> is the same as Foo<100>;
-
-07/15/2002: beazley
-            Fixed bug with %feature/%ignore/%rename and namespaces.
-            For example:
-
-                %ignore Foo::Bar
-                namespace Foo {
-                     class Bar {
-                     ...
-                     };
-                }
-
-            Reported by Marcelo Matus.
-
-07/09/2002: beazley
-            Added parsing support for constructors that try to catch
-            exceptions in initializers.   For example:
-
-              class Foo {
-                 Bar b;
-              public:
-                 Foo(int x) try 
-                     : b(x) { ... }
-                 catch(int) {
-                     ...
-                 }
-              }
-
-            This has no effect on the generated wrappers.  However, the try and catch
-            parts of the declaration are ignored.  See Stroustrup, 3rd Ed, section 
-            14.4.6.1 for details.
-                   
-07/06/2002: beazley
-            Fixed bug in template symbol table management.  This fixes
-            two bugs.  First, mixing abstract methods, templates, and 
-            inheritance no longer generates a failed assertion.
- 
-                template <class T>
-                class A {
-                public:
-                   virtual void foo() = 0;
-                };
- 
-               template <class T>
-               class B : public A<T>
-               {
-               };
-               %template(A_int) A<int>;
-               %template(B_int) B<int>;
-
-            This fix also fixes a subtle problem with default values and
-            templates.  For example:
-
-               template <class C>
-               struct B {
-                   typedef unsigned int size_type;
-                   static const size_type nindex = static_cast<size_type>(-1);
-                   void foo(size_type index = nindex);
-               };
-
-            Bugs reported by Marcelo Matus.
-
-
-07/05/2002: ljohnson (Lyle Johnson)
-            [Ruby] Changed the definition of the SWIG_ConvertPtr() function
-	    for the SWIG/Ruby runtime support so that it looks like the
-	    Python version. If the last argument (flags) is non-zero,
-	    SWIG_ConvertPtr() will raise an exception for type mismatches
-	    as before. If flags is zero, this function will return -1 for
-	    type mismatches without raising an exception. 
-
-            *** POTENTIAL INCOMPATIBILITY FOR RUBY MODULE ***
-
-07/04/2002: beazley
-            Overloaded functions/methods/constructors now work in many language
-            modules.  The support is completely transparent--just call the
-            function normally and SWIG will dispatch to the correct implementation.
-            There are a variety of issues associated with this.  Please refer
-            to the overloading section of Doc/Manual/SWIGPlus.html for details.
-            *** NEW FEATURE ***
-            
-07/04/2002: beazley
-            Fixed a bug with namespaces, enums, and templates.  For example:
-
-               namespace hello {
-                  enum Hello { Hi, Hola };
- 
-                  template <Hello H>
-                      struct traits
-                      {
-                          typedef double value_type;
-                      };
- 
-                 traits<Hi>::value_type say_hi()
-                 {
-                    return traits<Hi>::value_type(1);
-                 }
-               }
-            SWIG wasn't generating wrappers that properly qualified 
-            traits<Hi>.  Reported by Marcelo Matus.         
-
-06/30/2002: beazley
-            Supplied array variable typemaps for Tcl module.   If you have a
-            variable like this:
-
-                int foo[10];
-
-            then a set function like this is generated:
-
-                void foo_set(int *x) {
-                   memmove(foo,x,10*sizeof(int));
-                }
-
-06/30/2002: beazley
-            New %fragment directive.   When writing typemaps, it can be easy to
-            get carried away and write a lot of code.  However, doing so causes
-            tremendous code bloat.   A common way to solve this is to write 
-            helper functions.  For example:
-
-                %{
-                void some_helper_function() {
-                     ...
-                }
-                %}
-
-                %typemap(in) type {
-                   some_helper_function(...);
-                }
-
-            The only problem with this is that the wrapper file gets polluted
-            with helper functions even if they aren't used.    To fix this,
-            a new fragment directive is available.  For example:
-
-               (corrected typo in line below - 06/26/2008)
-               %fragment("type_header","header") %{
-                  void some_helper_function() {
-                      ...
-                  }
-               %}
-
-               %typemap(in, fragment="type_header") type {
-                   some_helper_function(...);
-               }
-
-            In this case, the code fragment is only emitted if the typemap is
-            actually used.   A similar capability is provided for declaration
-            annotation and the %feature directive.  For example:
-
-               %feature("fragment","type_header")  SomeDeclaration;
-
-            The first argument to %fragment is the fragment name.  The second argument
-            is the file section where the fragment should be emitted.  
-
-            The primary use of this directive is for writers of language modules
-            and advanced users wanting to streamline typemap code.
-
-            *** EXPERIMENTAL NEW FEATURE ***
-
-06/30/2002: beazley
-            Supplied memberin typemaps for all arrays in an attempt to eliminate
-            confusion about their use.
-
-06/29/2002: beazley
-            Experimental support for smart-pointers.  When a class defines
-            operator->() like this
-
-               class Foo {
-                  ...
-                  Bar *operator->();
-                  ...
-               };
-
-            SWIG locates class Bar and tries to wrap its member variables and
-            methods as part of Foo.  For example, if Bar was defined like this:
-
-               class Bar {
-               public:
-                    int x;
-                    int spam();
-               };
-
-            You could do this (in the target language):
-
-              f = Foo()
-              f.x = 4            # Accesses Bar::x
-              f.spam()           # Accesses Bar::spam
-
-            The primary use of this feature is to emulate the behavior of C++
-            smart-pointers---which allow attributes to accessed transparently
-            through operator->.
-
-            This feature is supported automatically in SWIG---no special directives
-            are needed.   To disable this behavior.  Use %ignore to ignore 
-            operator->.
-            *** NEW FEATURE ***
-
-06/26/2002: beazley
-            Deprecated the %except directive.   %exception should be used instead.
-
-06/25/2002: beazley
-            Major cleanup of the modules directory.  Eliminated most
-            header files, consolidated module code into single files.
-
-06/24/2002: beazley
-            Reworked the instantiation of language modules.  All language
-            modules must now define a factory function similar to this:
-
-                extern "C" Language *
-                swig_python(void) {
-                   return new PYTHON();
-                }
-
-            This function is then placed in a table and associated with
-            a command line option in swigmain.cxx.  
-
-            This approach has a number of benefits.  It decouples the 
-            SWIG main program from having to know about the class
-            definitions for each module.  Also, by using a factory
-            function, it will be easier to implement dynamic loading
-            of modules (simply load the file and invoke the factory
-            function).
-
-06/24/2002: beazley
-            Fixed syntax error for reference conversions.  For example:
-
-                     operator Foo &();
-
-06/24/2002: beazley
-            Fixed syntax error for operator new[] and operator delete[].
-
-06/24/2002: beazley
-            Fixed code generation problem for constants and default arguments
-            involving templates.
-
-06/19/2002: ljohnson (Lyle Johnson)
-            [Ruby] Fixed a bug for the '-feature' command line argument;
-            that setting was effectively being ignored and so the feature
-            name was always set equal to the module name.
-
-06/17/2002: beazley
-            Fixed problems with static members and enums in templates.
-
-Version 1.3.13 (June 17, 2002)
-==============================
-
-06/16/2002: beazley
-            Fixed a bug with __FILE__ expansion in the preprocessor.   On Windows,
-            the backslash (\) is now converted to (\\) in the string literal
-            used for __FILE__.  Reported by Steve Glaser.
-
-06/14/2002: beazley
-            Fixed warning message about 'name private in this context'.  The
-            warning is only generated for public methods.  Reported by
-            Scott Michel.
- 
-06/14/2002: beazley
-            Fixed some problems related to template instantiation 
-            and namespaces.   When SWIG expands a template, it does
-            so with fully resolved types.  For example, if you have this:
-
-                template<class T> class foo { };
-                typedef double Double;
-                %template(foo_d) foo<Double>;
-
-            then, it is handled as foo<double> in the typesystem.
-            This fixes a number of subtle problems with inheritance
-            and templates.
-
-06/14/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added missing bool typemaps for INPUT, OUTPUT and
-	    INOUT in Lib/ruby/typemaps.i.
-
-05/29/2002: cheetah (William Fulton)
-            [Java] Fix for a couple of broken pragmas.
-
-05/29/2002: cheetah (William Fulton)
-            Fix for unnecessary cast when wrapping global variable where 
-            the type is not parsed by SWIG - Java variables example 
-            failure as reported by Larry Virden.
-
-06/10/2002: beazley
-            Modified %template to allow for empty instantiations.
-
-                  %template() foo<int,int>;
-
-            This registers foo<int,int> with the type system, but
-            doesn't wrap it (same as %ignore).   This may only be a
-            temporary measure.   SWIG might be able to automatically
-            instantiate templates in certain cases.
-
-06/10/2002: beazley
-            Fixed function prototype problems with Tcl 8.4
-
-06/09/2002: beazley
-            Fixed problem with templates and location of base classes.  
-            This one is a little mind-bending, but here is an example
-            that illustrates:
- 
-             template <class ArgType, class ResType>
-             struct traits
-             {
-                  typedef ArgType arg_type;
-                  typedef ResType res_type;
-             };
- 
-             template <class ArgType, class ResType>
-             struct Function
-             {
-             };
- 
-             template <class AF, class AG>
-             struct Class : Function<typename traits<AF, AG>::arg_type,
-                                     typename traits<AF, AG>::res_type>
-             {
-             };
-
-             %template(traits_dd) traits <double, double>;
-             %template(Function_dd) Function <double, double>;
-             %template(Class_dd) Class <double, double>;
-
-
-            In this example, the base class of 'Class' is determined from
-            the Function template, but the types are obtained through typedefs.
-            Because of this, SWIG could not locate the wrapped base class
-            (Function<double,double>).   Should be fixed in 1.3.13 even
-            though I can think of a million other things that might
-            also be broken.
-
-06/07/2002: beazley
-            Fixed a problem with conversion operators.  If you had an
-            operator like this,
-
-                  operator double() const;
-
-            SWIG was ommitting the "const" qualifier.  This affected
-            %rename and other directives.  Reported by Zhong Ren.
-
-06/07/2002: beazley
-            Lessened the strictness of abstract class checking.  If
-            you have code like this:
-
-                class Foo {
-                public:
-                   virtual int method() = 0;
-                };
-
-                class Bar : public Foo {
-                public:
-                    Bar();
-                   ~Bar();
-                };
-
-             SWIG will go ahead and generate constructor/destructors
-             for Bar.  However, it will also generate a warning message 
-             that "Bar" might be abstract (since method() isn't defined).
-             In SWIG-1.3.12, SWIG refused to generate a constructor at all.
-
-06/07/2002: beazley
-            Change to %template directive.  If you specify something like this:
-
-                %template(vi) std::vector<int>;
-
-            It is *exactly* the same as this:
- 
-                namespace std {
-                    %template(vi) vector<int>;
-                }
-
-            SWIG-1.3.12 tried to instantiate the template outside of the namespace
-            using some trick.  However, this was extremely problematic and full
-            holes.   This version is safer.
-
-06/07/2002: beazley
-            Fixed bug with scope qualification and templates.  For example:
-
-                 A<B::C>::DD
-
-            Before, this was separated as scopes A<B, C>, and DD.  Fixed now.
-
-06/06/2002: beazley
-            Allow the following syntax: 
-               
-               class A { };
-               struct B : A { ... };
-
-            A base class without a specifier is assumed to be public for a struct.
- 
-06/06/2002: beazley
-            Fixed syntax error with template constructor initializers.
-            Reported by Marcelo Matus.
-
-06/06/2002: beazley
-            Fixed bug with default template arguments. 
-            Reported by Marcelo Matus.
-
-06/05/2002: beazley
-            Fixed subtle problems with %rename directive and template
-            expansion.
-
-            Code like this should now work:
-
-               %rename(blah) foo<double>::method;
-               ...
-               template<class T> class foo {
-               public:
-                   void method();
-               };
-
-               %template(whatever) foo<double>;
-
-06/05/2002: beazley
-            Resolved some tricky issues of multi-pass compilation and 
-            and inheritance.  The following situation now generates
-            an error:
-
-                  class Foo : public Bar {
-                  ...
-                  };
-
-                  class Bar {
-                  ...
-                  };
-
-            The following code generates a warning about incomplete classes.
-
-                  class Bar;
-                  class Foo : public Bar { };
-
-            The following code generates a warning about an undefined class.
-
-                  class Foo : public Bar { };  // Bar undefined
-
-            This fixes a failed assertion bug reported by Jason Stewart.
-
-06/05/2002: ljohnson
-            [Ruby] Added a warning message for the Ruby module about the lack
-            of support for multiple inheritance. Only the first base class
-            listed is used and the others are ignored. (Reported by Craig
-            Files).
-            
-06/03/2002: beazley
-            Fixed a bug with struct declarations and typedef. For example:
-
-                 typedef struct Foo Foo;
-                 struct Foo {
-                    ...
-                 };
-
-            A few other subtle struct related typing problems were
-            also resolved.
-
-Version 1.3.12 (June 2, 2002)
-=============================
-            
-05/30/2002: beazley
-            Fixed problem related to forward template class declarations and
-            namespaces.  Bug reported by Marcelo Matus.
-
-05/30/2002: beazley
-            Added 'make uninstall' target.  Contributed by Joel Reed.
-
-05/29/2002: beazley
-            Fixed rather insidious bug with %rename, %feature and template specialization.
-            For example:
-
-                %exception vector::__getitem__ {
-                     ... some exception ...
-                }
-
-                template<class T> class vector {
-                    ...
-                    T __getitem__(int index);       // Fine
-                    ...
-                };
-
-                template<> class vector<int> {
-                    ...
-                    T __getitem__(int index);       // Oops.
-                    ...
-                };
-
-            Now, the %exception directive (and other features) should correctly apply to
-            both vector and specializations.
-
-05/29/2002: beazley
-            Subtle changes to %template() directive.   Template arguments are now
-            reduced to primitive types in template matching.  For example:
-
-               template<class T> class vector<T *> {
-                ... partial specialization ...
-               }
-
-               typedef int *IntPtr;     // Gross typedef
-
-               // Gets the above partial specialization
-               %template(vectorIntPtr) vector<IntPtr>;
-
-            This change is extremely subtle, but it fixes a number of potential
-            holes in Luigi's STL library modules.    For example:
-
-                typedef int Integer;
-                %template(vectori) vector<int>;
-
-05/29/2002: beazley
-            Fixed rather insidious typemap bug related to const.  const
-            was being discarded through typedefs.
-
-05/29/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added input typemaps for const references to primitive
-            types (in Lib/ruby/ruby.swg).
-
-05/29/2002: cheetah (William Fulton)
-            [Java] The java arrray support functions are enclosed by 
-            a SWIG_NOARRAYS #define. Useful if not using arrays and 
-            it is desirable to minimise the amount of compiled code.
-
-05/29/2002: cheetah (William Fulton)
-            [Java] Enums were not renamed when using %name or %rename
-            fix.
-
-05/28/2002: ljohnson
-            [Ruby] Modified the name of the wrapper functions for the
-	    "new" singleton method and "initialize" instance method for
-	    consistency with the other language modules. The wrapper name
-	    for the function that implements "new" is alloc_classname and
-	    the wrapper name for the function that implements "initialize"
-	    is new_classname.
-
-
-05/27/2002: beazley
-            Changes to runtime.  Pointer conversion/creation functions
-            now almost always have an extra "flags" argument.  For
-            example:
-
-              SWIG_ConvertPtr(obj, void **, swig_type_info *ty, int flags);
-                                                                ^^^^^^^^^^
-            This extra parameter is reserved for future expansion and will
-            be used for more control over pointers in future versions.
-
-05/27/2002: beazley
-            Fix for C++ classes with private assignment operators.  It
-            is now possible to safely return objects like this by value.
-            Caveat:  the class must provide a copy constructor.
-	    
-05/26/2002: beazley
-            -proxy option added to many language modules.  This is the
-            same as -shadow.  We are merely changing terminology.
-            
-05/26/2002: beazley
-            [perl] Fixed some inconsistencies in the -package option.
-            -package merely sets the package name to be used on the
-            wrappers.  It does not change the name of the shared library
-            file or the name of the generated .pm file.  This was
-            broken at some point, but works again now.
-
-05/25/2002: beazley
-            [perl] Fixed [ 475452 ] memory leak in return-by-value.
-            Problem related to static member variables returning newly
-            allocated objects. Reported by Roy Lecates.
- 
-05/25/2002: beazley
-            [perl] Fixed [ 513134 ] %BLESSEDMEMBERS isn't always right.
-            Reported by Fleur Diana Dragan.
-
-05/25/2002: beazley
-            Fixed [ 540735 ] -importall and the -I option.
-
-05/25/2002: beazley
-            [guile] Fixed [ 532723 ] Default arg for char* can SegV.  
-            Error in guile module.  Reported by Brett Williams.
-
-05/25/2002: beazley
-            Subtle change to typemap application code.  The "freearg"
-            typemap must exactly match up with the "in" or "ignore"
-            typemap.  For example:
-
-                 %typemap(in) (char *data, int len) { ... };
-                 %typemap(freearg) char *data { ... }; 
-
-                 void foo(char *data, int len);
-
-             In this case, the "in" typemap is applied, but the
-             freearg typemap is not.  This is because the freearg
-             typemap doesn't match up with the input argument sequence.
-
-05/25/2002: beazley
-            Fixed [ 548272 ] Default argument code missing braces.
-            Reported by Brett Williams.
-
-05/25/2002: beazley
-            Fixed [ 547730 ] SwigValueWrapper needed for constructors.
-            Reported by William Fulton.
-
-05/25/2002: beazley
-            Undefined identifiers now evaluate to 0 when evaluating
-            preprocessor expressions.  For example:
-
-                  #if !FOO
-                  ...
-                  #endif
-      
-            where FOO is undefined or set to some non-numeric value.
-
-            Fixes [ 540868 ] #if defined whatever - not parsed.
-            Reported by Adam Hupp.
-
- 
-05/24/2002: beazley
-            SWIG now ignores the C++ 'export' keyword.
-
-05/23/2002: beazley
-            Some refinement of type-name mangling to account for pointers, arrays,
-            references, and other embedded type constructs.
-
-05/23/2002: beazley
-            Initial attempt at supporting template partial specialization.  At
-            the very least, it is parsed and the classes are stored.  Matching
-            of instantiations to specialized version is more limited and based on
-            the SWIG default typemap rules:
-
-                     SWIGTYPE *
-                     SWIGTYPE []
-                     SWIGTYPE &
-
-            Now, why in the world would you want to use this feature?  Other
-            than allowing for slightly modified class APIs, this capability is
-            primarily used to provide advanced wrapping support for STL-like
-            objects.  It can also be mixed with typemaps.  Here is an example:
-
-
-                /* Generic version */
-                template<class T> class vector {
-                    %typemap(in) vector<T> * {
-                        // A container of objects 
-                    }
-                };
-                /* Partial specialization (pointers) */
-                template<class T> class vector<T *> {
-                    %typemap(in) vector<T> * {
-                        // A container of pointers to objects.
-                    }
-                };
-                /* Specialization (integers). */
-                template<> class vector<int> {
-                    %typemap(in) vector<int> * {
-                        // A container of integers.
-                    }
-                };
-
-             *** EXPERIMENTAL FEATURE ***
-            
-05/23/2002: beazley
-            Enhancement to typemaps.   Normally, typemap variables are
-            renamed to avoid conflicts.  For example:
-
-               %typemap(in) int * (int temp) {
-                    $1 = &temp;
-               }
-
-            This results in code that creates and uses variables "temp1","temp2", 
-            "temp3" and so forth depending on how many times the typemap is used.
-            Sometimes you want a single variable instead.  To do that, using
-            the following naming scheme:
-
-                %typemap(in) int *(int _global_temp) {
-                }
- 
-            Is this case, a single variable _global_temp is emitted in the
-            wrapper functions.  It is shared across all typemaps.  Repeated
-            typemaps do not replicate the variable---they use the first one
-            emitted.
-            *** NEW FEATURE ***
-           
-05/23/2002: beazley
-            Minor enhancement to typemaps.  If you have this code,
-
-               %typemap(in) Foo (int somevar = 3) {
-                     ...
-               }
-
-            the default value for somevar is now emitted into the wrapper code.
-
-05/22/2002: beazley
-            Fixed %extend to be better behaved in namespaces.  If you have code
-            like this:
-
-                namespace foo {
-                     struct bar {
-                        %extend {
-                             void blah();
-                        };
-                     };
-                }
-  
-            SWIG matches the blah() method to a C function named 
-            void foo_bar_blah(foo::bar *self).
-
-            This is consistent with the non-namespace version.
-            Bug reported by Marcelo Matus.
-
-05/22/2002: beazley
-            New library files: cpointer.i, carrays.i, cmalloc.i.  These
-            provide access to C pointers and memory allocation functions.
-            See Doc/Manual/Library.html for details.
-
-05/22/2002: cheetah (William Fulton)
-            [Java] C type char no longer maps to Java type byte, but to Java type char.
-            It is now treated as a character rather than a signed number. This fits in
-            with the other language modules and is a more natural mapping as char* is 
-            mapped as a string of characters. Note that the C signed char type is still
-            mapped to a Java byte.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-05/22/2002: cheetah (William Fulton)
-            [Java] Improved constants wrapping. Constants (#define and %constant) values 
-            are now obtained through a JNI call. Previously the value was compiled as 
-            Java code, but this didn't work for all cases, eg #define 123ULL.
-
-05/22/2002: beazley
-            Fixed bogus error message with %extend directive and C++
-            access specifiers.  Reported by Marcelo Matus.
-
-05/22/2002: beazley
-            Namespaces and enums now work correctly.  For example:
-
-                namespace Foo {
-                    enum Bar { A, B };
-                }
-
-            Bug reported by Marcelo Matus.
-
-05/21/2002: beazley
-            The %types directive can now be used to specify inheritance relationships
-            in the runtime type system.  For example,
-
-                %types(Foo = Bar);
-
-            specifies that Foo isa Bar.    Using this is potentially quite dangerous.
-            However, this is useful in certain cases (and in the SWIG library).
-            
-05/20/2002: beazley
-            %nodefault and %makedefault directives now require a trailing semicolon.
-            For example:
-
-                %nodefault;
-                ...
-                %makedefault;
-
-            In addition both directives can take a class name.  For example:
-
-                %nodefault Foo;
-
-                class Foo {   /* No default constructor/destructor */
-                };
-
-                class Bar {  /* Default constructor/destructor generated */
-                };
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            If you don't use the trailing semicolon, things will mysteriously break.
-
-05/20/2002: beazley
-            More improvements to type system handling.  SWIG now correctly handles
-            template names and parameters in a namespace. For example:
-
-                namespace foo {
-                    template<class T> class bar { };
-                    typedef int Integer;
-
-                    void blah(bar<Integer> *x);
-                };
-
-            In the generated code, all of the typenames are properly qualified.
-
-05/17/2002: cheetah (William Fulton)
-            [Java] deprecated broken -jnic and -jnicpp commandline options. The C or C++ 
-            JNI calling convention is now determined from the -c++ commandline option.
-
-05/16/2002: cheetah (William Fulton)
-            [Java] The JCALL macros which exist so that the same typemaps can be used
-            for generating both the C and C++ JNI calling conventions no longer appear
-            in the generated code. This is because the output is now passed through the 
-            SWIG preprocessor which does the macro expansion for either C or C++ (depending
-            on whether -c++ is passed on the SWIG commandline).
-
-            The generation of the functions used in the array typemaps have been adjusted 
-            to take account of this. The side effect is that any typemaps which contained 
-            JCALL macros within %{ %} brackets will have to be moved within {} brackets 
-            so that the SWIG preprocessor can expand the macros.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-05/13/2002: beazley
-            Class templates may now be used as template parameters.  For example:
-
-              template<class T, template<class> class C> class Foo {
-                  ...
-              };
-              template<class T> class Bar {
-                  ...
-              };
-
-              %template(Fooi) Foo<int, Bar>;
-     
-            SWIG doesn't really do anything special with this---it's just
-            another way of specifying a template parameter.  
-         
-05/13/2002: beazley
-            Minor refinement of template support.  Template parameter names are no longer
-            required for types.  For example:
-
-                template<bool> class Foo {
-                };
-
-            Obviously, names are required for template<class T>;
-
-05/12/2002: beazley
-            New macro expansion in typemaps.  The sequence:
-
-                $descriptor(type)
-
-            Will expand into the SWIG type descriptor structor for
-            the given type.  Type may be any abstract datatype.
-            For example:
-
-                $descriptor(int *)
-                $descriptor(int (*)(int,double))
-                $descriptor(vector<int> *)
-
-            Caveat: It is *NOT* currently legal to use other typemap
-            substitution variables in the macro.  For example 
-            $descriptor($1_type).
-
-            The primary purpose of this modification is to better
-            support typemaps for container objects or to allow typemaps
-            that might be performing type conversions.
-            *** NEW FEATURE ***
-
-05/11/2002: beazley
-            The wrapping of references to primitive types has been
-            changed as follows:
-
-            Arguments of type 'const primitive &' are now passed
-            by value as opposed to pointers.  Return values of
-            type 'const primitive &' are returned as values instead of
-            pointers.
-
-            'primitive' is any one of int, short, long, long long,
-            char, float, double, bool (as well as unsigned variants).
-            
-            This change is being made to better support C++ wrapping--especially
-            code that makes use of templates and the STL.
-            
-05/11/2002: beazley
-            The %template directive can now be used to access templates
-            in a namespace.  For example:
-
-                namespace std {
-                    template<class T> class complex {
-                       T re, im;
-                    public:
-                       complex(T _r = T(), T _i = T()) : re(_r), im(_i) { }
-                       T real() { return re; }
-                       T imag() { return im; }
-                    };
-                }
-
-                %template(complex) std::complex<double>;
-
-            Note: There are some very subtle namespace/symbol table 
-            management issues involved in the implementation of this.
-            It may not work in certain cases.
-
-05/10/2002: beazley
-            Member template constructor support added.  For example:
-
-               template<typename _T1, typename _T2> 
-               struct pair {
-                 _T1 first;
-                 _T2 second;
-                 pair() : first(_T1()), second(_T2()) { }
-                 template<class _U1, class _U2> pair(const pair<_U1,_U2> &x);
-               };
-
-            To instantiate the template, use %template and %extend.
-            For example, this expands the constructor into a default
-            copy constructor:
-
-               %extend pair {
-                  %template(pair) pair<_T1,_T2>;
-               }
-            
-            Highly experimental.  Other uses may be broken.
-
-05/10/2002: beazley
-            The %extend (%addmethods) directive no longer works unless
-            it appears in the public section of a class.   An error
-            message is now generated (as opposed to a segmentation fault).
-
-05/09/2002: beazley
-            New %warnfilter() directive.  This directive attaches a warning
-            filter to specific declarations and has the same semantics as
-            %rename, %ignore, %feature, and so forth.  For example:
-
-               %warnfilter(501) foo;   // Suppress overloaded warning
-               int foo(int);
-               int foo(double); 
-
-            or
-
-               %warnfilter(501) Object::foo(double);
-               class Object {
-               public:
-                  int foo(int);
-                  int foo(double);
-               };
-
-            This feature only suppresses warnings in later stages of code
-            generation.  It does not suppress warnings related to preprocessing
-            or parsing.
-            *** NEW FEATURE ***
-
-05/09/2002: beazley
-            SWIG now supports C99 variadic preprocessor macros.  For example:
-
-               #define debugf(fmt,...) fprintf(stderr,fmt,__VA_ARGS__)
-
-            The argument "..." is used to indicate variable arguments which
-            are all placed into the special argument name __VA_ARGS__ in
-            the macro expansion.  
-
-            SWIG also implements the GNU (##) extension for swallowing the
-            preceding comma when __VA_ARGS__ is empty. For example:
-
-               #define debugf(fmt,...) fprintf(stderr,fmt, ##__VA_ARGS__)
-
-            Here is how this is expanded:
-
-               debugf("%d", 3)  --> fprintf(stderr,"%d",3)
-               debugf("Hello")  --> fprintf(stderr,"Hello" )
-
-            (notice the deleted comma).
-            *** NEW FEATURE ***
-
-05/08/2002: samjam (Sam Liddicott)
-            Many changes to php module.  Shadow classes are now implemented
-            entirely in native C and no need for php-code shadow wrappers
-            Populated template config.m4 and Makefile.in as needed by
-            phpize are generated.
-
-05/08/2002: ljohnson (Lyle Johnson)
-            [Ruby] A copy constructor is now turned into a "clone"
-            instance method (see Dave's change for copy constructors
-            dated 4/7/2002). This seems like the appropriate thing
-            to do for Ruby code.
-
-05/08/2002: ljohnson (Lyle Johnson)
-            [Ruby] Fixed [ 553864 ] Inline destructor code not written.
-
-05/08/2002: beazley
-            %ignore behaves better with constructors, destructors, and the
-            type system in general.   For constructors and destructors,
-            %ignore now suppresses the creation of a default constructor
-            or destructor.  For example:
-
-                 %ignore ~Foo;
-                 class Foo {
-                 public:
-                     Foo();
-                    ~Foo();
-                     ...
-                 };
-
-            In SWIG-1.3.11, ~Foo() simply "disappeared" and the code generator
-            created a wrapper for a default destructor (as if it was never
-            declared in the interface).  In SWIG-1.3.12, %ignore suppresses
-            the creation of a destructor if one is actually defined. 
-
-            Similarly, even though a declaration is ignored, information
-            may still be needed to properly handle types. For example, here
-            is a very subtle error that is fixed by this change:
-
-                %ignore std::string;         // Prevent class wrapping
-                namespace std {
-                   class string {
-                        ...
-                   };
-                   %typemap(in) string * {
-                        ...
-                   }
-                }
-                
-                void foo(std::string *s);   // Broken.
-
-            Before this fix, %ignore would cause the class definition to disappear.
-            This, in turn, would cause the typemap to be misapplied. 
- 
-05/08/2002: beazley
-            Minor changes to %rename, %ignore, %feature, and related directives
-            for better support of destructors.  Destructors can now be precisely
-            tagged.  For example:
-
-                  %ignore Foo::~Foo;
-                  %feature("action") ~Bar {
-                      ...
-                  }
-             
-            *Developer warning* 
-            Operations such as renaming and feature attachment for classes used to
-            be applied to destructors as well.  For instance, if you did this:
- 
-                 %rename(Bar) Foo;
-
-            The operation applied to the class itself, the constructor, and
-            the destructor.   This is no longer the case.  Now such operations
-            will only apply to the class and the constructor.  Note: if you
-            were relying on this for class renaming, be aware that renamed
-            classes should really only be handled at the level of the class itself
-            and not the level of individual declarations in the class (although
-            they can be renamed individually if needed).  As far as I know,
-            the Language class is already taking care of this case correctly.
-
-05/07/2002: beazley
-            New set of tests.  The Examples/test-suite/errors directory contains
-            tests that try to exercise all of SWIG's error and warning messages.
-
-05/07/2002: beazley
-            Start of a warning framework.  Warning messages are now assigned numeric values
-            that are shown in warning messages.   These can be suppressed using the
-            -w option.  For example:
-
-                 swig -w302 example.i
-                 swig -w302,305 example.i
-
-            Alternatively, the #pragma preprocessor directive can be used to disable this:
-
-                 #pragma SWIG nowarn=302
-                 #pragma SWIG nowarn=302,305
-
-            Note: Since SWIG is a multi-pass compiler, this pragma should
-            only be used to change global settings of the warning filter.  It should
-            not be used to selectively enable/disable warnings in an interface file.
-            The handling of #pragma occurs in the C++ preprocoessor and affects all 
-            subsequent stages of compilation.
-
-            The -Wall option turns on all warnings and overrides any filters that
-            might have been set.
-
-            Warnings can be issued from an interface using %warn.  For example:
-
-                 %warn "110:%section is deprecated"
-
-            The first part of a warning message is an optional warning number.
-            A complete set of warning numbers is found in Source/Include/swigwarn.h.
-            *** NEW FEATURE ***
-
-05/07/2002: beazley
-            Internal parsing change.   Directives to include files now use brackets [ ... ]
-            instead of { ... }.   
-
-                  %includefile "foo.i" [
-                     ...
-                  ]
-
-            The use of { ... } was a bad choice because they were included implicitly by
-            the preprocessor and made it impossible to properly detect legitimate missing '}' 
-            errors.
-
-04/16/2002-
-05/02/2002: beazley
-            SWIG European Tour: Paris-Amsterdam-Bath.
-
-04/23/2002: beazley
-            The %addmethods directive has been renamed to %extend.
-            For example:
-
-                class Foo {
-                ...
-                };
-
-                %extend Foo {
-                   int blah() { ... };
-                   int bar() { ... };
-                   ...
-                };
-
-            Motivation: the %addmethods directive can be used for many
-            other tasks including adding synthesized attributes, constructors,
-            and typemaps. Because of this, "addmethods" is somewhat misleading.
-            %extend more precisely describes this operation---extension of a
-            class or structure.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            %addmethods still works via a macro definition.   However,
-            a warning message may be generated.   Errors involving %addmethods
-            will actually refer to the %extend directive.  
-            
-04/23/2002: beazley
-            Further refinement of the type system.  Typedef now
-            propagates through functions, pointers to functions,
-            and pointers to member functions.
-            For example:
-
-               typedef int Integer;
-               void foo(int (*x)(int), Integer (*y)(Integer));
-
-            In this case, arguments 'x' and 'y' have exactly
-            the same type (and would obviously accept objects
-            of either type).
-
-            Similarly, consider this:
-
-               class Foo {
-               };
-
-               typedef Foo Bar;
-               void bar(int (Foo::*x)(int), int (Bar::*y)(int));
-
-            In this case, arguments x and y are the same 
-            type (via typedef).
-            
-04/22/2002: beazley
-            SWIG now generates a warning message if any part of
-            an expression involves values from a private part of a class.
-            For example:
-
-                class Foo {
-                private:
-                    static int X;
-                public:
-                     void blah(int a, int b = X);   // Warning
-                };
-
-            In this case, the default argument is ignored.  There
-            are workarounds, but they are rather clumsy.  For instance,
-            you might do this:
-
-                    %feature("action") blah(int,int) {
-                       if ($nargs == 1) {
-                          result = blah(arg1);
-                       } else {
-                          result = blah(arg1,arg2);
-                       }
-                    }
-                    void blah(int a, int b = 0);
-
-
-04/21/2002: beazley
-            Use of the %inline directive inside a namespace is
-            forbidden and now generates an error message.   This is
-            not allowed since the inlined code that is emitted is
-            not placed inside a namespace.  This confuses other
-            stages of parsing.
-                    
-04/21/2002: beazley
-            Some bug fixes to casting operations and expression
-            parsing.   Due to some parsing issues, it is not 
-            currently possible to use casts for all possible
-            datatypes.   However, the common cases work.
-
-04/20/2002: beazley (Amsterdam)
-            Member templates now work.  Simply use the %template
-            directive inside a class or %addmethods to create
-            instantiations (see Doc/Manual/SWIGPlus.html).  Supporting
-            this was easy---earlier changes to templates made it
-            possible using only a two-line modification to the parser
-            and a few minor modifications elsewhere.  Hmmm, come to 
-            think of it, the smoke was rather thick in that Internet "cafe".
-            *** NEW FEATURE ***
-            
-04/19/2002: beazley (TGV)
-            Improved handling of non-type template parameters.  For example:
-
-                 vector<int,100>;
-
-            Simple numbers and strings can be used with the %template
-            directive as well.  For example:
-
-                 %template(vecint100) vector<int,100>;
-
-            Note: Arithmetic expressions are not currently allowed.
-            
-            Default template arguments now work and do not have to
-            be given to %template.
-                        
-04/18/2002: beazley (Paris)
-            Change in internal template handling.  Template
-            parameters are now fully integrated into the type
-            system and are aware of typedefs, etc.  This builds
-            upon the change below.   
-
-            *** DEVELOPER WARNING ***
-            Word of caution to language module writers.  The "name"
-            parameter of certain parse tree nodes (classes, functions, etc.)
-            may be parameterized with types.   This parameterization is
-            done using SWIG type-strings and not the underlying C version.
-            For example,
-
-               int max<int *>(int *,int *)  
-
-            has a name of "max<(p.int)>".  If you use the name directly,
-            you may get syntax errors in the generated code.  To fix this,
-            use SwigType_namestr(name) to convert a parameterized name 
-            to a C name with valid syntax.  The internal version is
-            used to reduce template types to a common representation 
-            and to handle issues of typedef.
-            
-04/16/2002: beazley (somewhere over the Atlantic)
-            Enhancement of typedef resolution.  The type system is now
-            aware of template arguments and typedef.  For example:
-
-                  typedef int Integer;
-                 
-                  foo(vector<int> *x, vector<Integer> *y);
-
-            In this case, vector<int> and vector<Integer> are
-            the same type.   There is some interaction between this
-            mechanism and the implementation of typemaps.  For example,
-            a typemap defined for vector<int> * would apply to either type.
-            However, a typemap for vector<Integer> * would only apply to
-            that type.
-
-            Typedefs and typemaps and matched by left-most expansion.
-            For example:
-
-              vector<Integer,Integer> --> 
-              vector<int, Integer> -->
-              vector<int, int>
-
-
-04/24/2002: cheetah (William Fulton)
-            [Java] Changes to Java shadow classes.
-            Overcomes a bug where the module assumed that a pointer to a derived
-            class could be used in place of a pointer to a base class. Thanks 
-            to Stephen McCaul for analysing the bug and submitting patches.
-
-            A consequence is that the getCPtr() method in each shadow class has
-            disappeared and has been replaced with a getCPtrXXX(), where XXX is the 
-            shadow class name. If you have code that previously used getCPtr(), 
-            and the associated class is wrapping a C struct or a C++ class that
-            is not involved in an inheritance chain, just use the new method. If
-            however, the class is involved in an inheritance chain, you'll have
-            to choose which pointer you really want. Backwards compatibility 
-            has been broken as not using the correct pointer can lead to weird bugs
-            through ill-defined behaviour. If you are sure you want the old methods, 
-            you could add them back into all shadow classes by adding this at the 
-            beginning of your interface file:
-
-            %pragma(java) allshadowcode=%{
-              public long getCPtr(){
-                return swigCPtr;
-              }
-            %}
-
-            Please see entry dated 07/23/2002 to see how to do this after the deprecation
-            of the allshadowcode pragma.
-
-            *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-04/13/2002: beazley
-            Fixed problem with default arguments and references.   Declarations such 
-            as this should now work:
-
-                void foo(const string &x = "Hello");
-
-04/12/2002: beazley
-            Added typemap $* substitutions for typemaps involving arrays.
-            Requested by William Fulton.
-
-04/11/2002: beazley
-            Template specialization is now supported.  For example:
-
-               template<> class vector<int> {
-               ...
-               };
-
-            When the %template directive is used, it will use a specialization
-            if one is defined.   There are still some limitations. Partial
-            specialization is not supported.  A template of type <void *> does
-            not match all pointers.
-            *** NEW FEATURE ***
-
-04/11/2002: beazley
-            Major change to template wrapping internals. Template declarations are
-            no longer processed as macros but now result in real parse-tree
-            nodes.  The %template directive expands these nodes into a
-            specific instantiation.   This change enables a number of
-            new and interesting capabilities:
-
-            Directives such as %rename, %feature, and %addmethods can
-            now be applied to uninstantiated templates.  For example:
-
-              %rename(barsize) vector::bar(char *buf, int len);
-              ...
-              template<typename T> class vector {
-              public:
-                 ...
-                 void bar(char *buf);
-                 void bar(char *buf, int len);   // Renamed
-                 ...
-              };
-
-              %template(intvector) vector<int>;   // Renaming carries through
-
-            
-            By parsing templates into an internal data structure, it will
-            be possible to support specialization (and maybe partial
-            specialization).
-            
-            This is highly experimental and a work in progress.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            In SWIG-1.3.11, template declarations were simply processed
-            as weird macros.  No other information was retained.   This 
-            made it impossible to support more advanced features and 
-            complicated many other parts of the implementation.
-
-04/09/2002: beazley
-            Change to template class wrapping.   There were a variety of
-            "issues" with the old approach related to parsing, the type
-            system, and namespaces.   These changes are meant to rectify
-            some of these problems:
-
-            A specific instantiation of a template can now be specified
-            by including the class inline like this:
- 
-                  class vector<int> {
-                  public:
-                       vector();
-                      ~vector();
-                       ... whatever ...
-	                  };
-
-            This is template specialization, but partial specialization is
-            not yet implemented.
-            
-            The %template directive has been modified to expand roughly as
-            follows:
-
-                 %template(vecint) vector<int>;
-
-            becomes
-
-                 %rename(vecint> vector<int>;
-                 class vector<int> {
-                 public:
-                     vector();
-                     ...
-                 };
-
-            Note that this simply builds upon the code above (templates
-            included inline).
-
-            This modified approach to wrapping fixes some subtle type
-            issues.  For instance, you can now define typemaps and typedefs
-            like this:
-
-                 %typemap(in) vector<int> * {
-                 ...
-                 }
-                 typedef vector<int> intvector;
-                 ...
-                 void blah(intvector *v);   // Gets the above typemap
-
-            This did not work in SWIG-1.3.11 due to a peculiarity of
-            the template implementation.
-
-            %template(name) no longer installs the template as a class
-            with name "name".   This might break %addmethods as described
-            in the manual.  For example:
-
-                 %template(vecint) vector<int>;
-                 %addmethods vecint {    // Fails. vecint not a class
-                   ...
-                 };
-           
-            To fix this, just use the template name instead:
-
-                 %addmethods vector<int> {
-                     ...
-                 }
-
-            Note: This technique might be a way to implement some bizarre
-            template specialization techniques.   For example:
-
-                 %addmethods vector<int> {
-                     // Only applied if vector<int> instantiated later
-                     %typemap(in) vector<int> * {
-                        ...
-                     }
-                     ...
-                 };
-
-            *** POTENTIAL INCOMPATIBILITY ***
-             
-04/08/2002: beazley
-            Fixed [ 540868 ] #if defined whatever - not parsed.  SWIG should
-            now correctly handle preprocessor directives like this:
-
-                #if defined __cplusplus
-                ...
-                #endif
-             
-            Note: was implemented previously, but there was a minor bug.
-            Reported by Adam Hupp.
-                   
-04/07/2002: beazley
-            %readonly and %readwrite are deprecated due to a change in the 
-            implementation.  Instead of being pragmas, mutability is now
-            controlled as a "feature" using the following two directives:
-
-                 %immutable;
-                 int x;           // read-only variable
-                 int y;           // read-only variable
-                 %mutable;
-                 int z;           // Modifiable
-
-            %immutable and %mutable are much more powerful than their older
-            counterparts.  They can now pinpoint a specific declaration like
-            this:
-
-               %immutable  x;         /* Any x */
-               %immutable  Foo::x;    /* x in class Foo */
-
-            In fact, the matching algorithm is the same as for %rename, 
-            %ignore, and other directives.   This means that the declaration
-      
-               %immutable  Foo::x;
-
-            would not only apply to class Foo but to all derived classes
-            as well.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            %immutable and %mutable must be terminated by a semi-colon.  This
-            differs slightly from the older %readonly and %readwrite directives.
-            Since %immutable and %mutable can be applied to declarations the
-            semicolon is needed to distinguish between a global feature and 
-            one targeted to a single declaration.  Note: this incompatibility is the
-            primary reason for changing the name of the directive.
-
-04/07/2002: beazley
-            New handling of copy constructors.  If a class defines 
-            constructors like this:
-
-                class Foo {
-                public:
-                      Foo();
-                      Foo(const Foo &);       // Copy constructor
-                      ...
-                };
-
-            SWIG now generates a function copy_Foo() for the copy
-            constructor.
-
-            In previous verions, this generated a name-clash and an
-            error message.   To preserve backwards compatibility, SWIG
-            does not change the behavior if %rename is used to resolve
-            the name conflict.   However, if no name resolution is made,
-            this new approach is used.
-
-            Copy constructors may be handled as a special case in the
-            target language.  However, this is up to the language module
-            itself.
-                  
-04/07/2002: beazley
-            The %template directive is now namespace aware.   This allows
-            code like this:
-
-                namespace foo {
-                    template<typename T> max(T a, T b) { return a > b ? a : b; }
-                }
-
-                using namespace foo;
-                %template(maxint) max<int>;            // Ok
-
-                namespace bar {
-                   using foo::max;
-                   %template(maxdouble) max<double>;   // Ok
-                }
-
-            Caveat: the template name supplied to %template must be defined in the
-            same scope in which the %template directive appears.   This code is
-            illegal:
-
-                %template(maxint) foo::max<int>;
-
-04/07/2002: beazley
-            Minor enhancement to preprocessor.   The preprocessor can now perform
-            string comparison.   For example:
-
-               #define A "hello"
-               ...
-               #if A == "hello"
-               ...
-               #endif
-
-            The primary use of this is in SWIG macros.  For example:
-
-              %define FOO(x) 
-              #if #x == "int"
-              /* Special handling for int */
-              ...
-              #endif
-              %enddef
-
-            Normal users can probably safely ignore this feature.  However, it may
-            be used in parts of the SWIG library.
-
-04/07/2002: beazley
-            Further refinement of default constructor/destructor wrapper generation.
-            SWIG is now much more aware of pure virtual methods. For instance:
-
-              class A {             /* Abstract */
-              public:
-                 virtual void method1() = 0;
-                 virtual void method2() = 0;
-              };
-              class B : public A {  /* Abstract */
-              public:
-                 virtual void method1() { };
-              };
-
-              class C : public B {  /* Ok */
-              public:
-                 virtual void method2() { };
-              };
-
-            In this case, SWIG will only generate default constructors for C.
-            Even though B looks fine, it's missing a required method and is abstract.
-
-04/04/2002: beazley
-            Subtle change to structure data member access.  If you
-            have a structure like this:
-
-                struct Foo {
-                    Bar   b;
-                };
-
-            The accessor functions for b are generated as follows:
-
-            (1) If b is *not* defined as a structure or class:
-
-                Bar Foo_b_get(Foo *self) {
-                    return self->b;
-                }
-                void Foo_b_set(Foo *self, Bar value) {
-                    self->b = value;
-                }
-
-            (2) If b *is* defined as a structure or class:
-
-                Bar *Foo_b_get(Foo *self) {
-                    return &self->b;
-                }
-                void Foo_b_set(Foo *self, Bar *value) {
-                    self->b = *value;
-                }
-            See the "Structure data members" section of Doc/Manual/SWIG.html
-            for further details.
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            This may break interfaces that relied on a lot of a undeclared
-            structure and class names.    To get the old behavior, simply
-            use a forward declaration such as "struct Bar;"
-            
-04/04/2002: beazley
-            C++ namespace support added.  SWIG supports all aspects of
-            namespaces including namespace, using, and namespace alias
-            declarations.    The default behavior of SWIG is to flatten
-            namespaces in the target language.  However, namespaces are
-            fully supported at the C++ level and in the type system.
-            See Doc/Manual/SWIGPlus.html for details on the implementation.
-     
-04/02/2002: cheetah (William Fulton)
-            [Java] Sun has modified javac in jdk1.4 to no longer compile
-            an import of an unnamed namespace. To fix this SWIG no longer 
-            generates the import for packageless classes.
-            http://developer.java.sun.com/developer/bugParade/bugs/4361575.html
-            As reported SF #538415.
-
-03/27/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added support for pointer-to-member, similar to that
-            for the Python module. Remarkably similar. Also added a new
-            example for this (Examples/ruby/mpointer), which is remarkably
-            similar to the Python example of the same name.
-
-03/26/2002: ljohnson (Lyle Johnson)
-            [Ruby] Made a few minor edits to the "Advanced Topics"
-            chapter of the SWIG manual and added a new major section
-            about how to create multi-module Ruby packages with SWIG.
-
-03/26/2002: ljohnson (Lyle Johnson)
-            [Ruby] Removed all of the old Ruby pragmas. If any of this
-            functionality is truly missed we can resurrect it, preferably
-            with some kind of feature-based directive.
-            
-03/25/2002: ljohnson (Lyle Johnson)
-            [Ruby] Fixed SWIG exception library support for Ruby, which
-            has apparently been broken for some time. Luckily, no one seems
-            to have noticed.
-
-03/23/2002: beazley
-            C++-namespace support in SWIG directives.
-
-            %addmethods: 
-
-            The %addmethods directive now accepts a fully qualified classname
-            and can be used inside C++ namespace declarations.  For example:
-
-                 // Attaches to the class Foo::Bar below
-                 %addmethods Foo::Bar {
-                     int somemethod() { ... }
-                 };
-
-                 namespace Foo {
-                    class Bar {
-                    public:
-                        ...
-                    };
-                 
-                    // Attaches to the class Bar above
-                    %addmethods Bar {
-                      int othermethod() { ... };
-                    }
-                 }
-
-            %feature, %rename, %ignore, %exception, and related directives:
-
-            Namespaces are fully integrated into the renaming and declaration
-            matcher.  For example:
-
-                 %rename(display) Foo::print;          // Rename in namespace Foo
-                 %ignore Foo::Bar::blah;               // Ignore a declaration
-
-            %rename directives can be placed inside namespace blocks as well. For
-            example:
-
-                namespace Foo {
-                   %rename(display) print;         // Applies to print below
-
-                   void print();
-                };
-
-            Most other SWIG directives should work properly inside namespaces.
-            No other changes are needed.
-      
-03/22/2002: beazley
-            Some changes to internal symbol table handling.   SWIG no longer
-            manages structures and unions in a separate namespace than normal
-            declarations like ANSI C.  This means you can't have a structure
-            with the same name as a function.  For example:
-
-                 struct Foo {
-                 ...
-                 }
- 
-                 int Foo() { ... }
-
-            This approach is more like C++.   It's not clear that SWIG ever
-            really supported the ANSI C anyways---using the same name would
-            almost certainly generate a name-clash in the target language.
-
-03/22/2002: ljohnson (Lyle Johnson)
-            [Ruby] Fixed [ 517302 ] for handling of renamed overloaded
-            constructors. Now, renamed overloaded constructors are converted
-            into class singleton methods (basically acting as "factory"
-            methods).
-
-03/21/2002: beazley
-            Fixed [ 532957 ] %ignore parse error and casting operator.
-            Reported by William Fulton.
-
-03/18/2002: beazley (** ADVANCED USERS ONLY **)
-            Added support for dynamic casting in return values.  A somewhat
-            common problem in certain C++ programs is functions that hide
-            the identity of underlying objects when they are returned 
-            from methods and functions.  For example, a program might include
-            some generic method like this:
-
-                      Node *getNode();
-
-            However, Node * may just be base class to a whole hierarchy
-            of different objects.   Instead of returning this generic Node *,
-            it might be nice to automatically downcast the object into the
-            appropriate type using some kind dynamic cast.
-
-            Assuming you understand the peril involved, a downcast can now
-            be performed using the following function in the run-time type
-            checker:
-
-              swig_type_info *SWIG_TypeDynamicCast(swig_type_info *, void **ptr);
-
-            This function checks to see if the type can be converted to another
-            type.  If so, a different type descriptor (for the converted type)
-            is returned.   This type descriptor would then be used to create
-            a pointer in the target language.
-
-            To use this, you would write a typemap similar to this:
-
-              %typemap(out) Node * {
-                swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1);
-                $result = SWIG_NewPointerObj($1, ty);
-              }
-
-            Alternatively,
-
-              %typemap(out) Node * = SWIGTYPE *DYNAMIC;
-
-            To make the typemap have any effect, you have to write a supporting 
-            function that knows how to perform downcasting. For example:
-
-              %{
-              static swig_type_info *
-              Node_dynamic_cast(void **ptr) {
-                 Node **nptr = (Node **) ptr;
-                 Element *e = dynamic_cast<Element *>(*nptr);
-                 if (e) {
-                    *ptr = (void *) e;
-                    return SWIGTYPE_p_Element;
-                 }
-                 Data *d = dynamic_cast<Data *>(*nptr);
-                 if (d) {
-                    *ptr = (void *) d;
-                    return SWIGTYPE_p_Data;
-                 }
-                 return 0;
-              }
-              %}
-
-            There is no restriction on how types are determined. dynamic_cast<>
-            uses C++ RTTI.  However, if you had some other mechanism for determining
-            the type, you could use that here.  Note: it is important to save
-            the new pointer value back into the argument as shown.  When downcasting,
-            the value of the pointer could change. 
-
-            Finally, to make the casting function available, you have to register
-            it with the run-time type checker. Put this macro in your interface file.
-
-               DYNAMIC_CAST(SWIGTYPE_p_Node, Node_dynamic_cast);
-
-            Note: this feature does not introduce a performance penalty on 
-            normal SWIG operation.  The feature is only enabled by writing
-            a new typemap that explicitly calls SWIG_TypeDynamicCast() to
-            make a conversion. 
-  
-            Examples/test-suite/dynamic_cast.i contains a simple example.
-            This feature is not supported in the Java module due to differences
-            in the type-checking implementation.
-
-            *** EXPERIMENTAL FEATURE ***
-
-03/17/2002: beazley
-            Small change to type-name handling of unnamed structures and
-            typedef.  If a structure of this form appears:
-
-                   typedef struct {
-                        ...
-                   } Foo;
-
-            Then 'Foo' is used as the proper typename for the structure.
-            Furthermore, Foo can now be used as a name in C++ inheritance.
-            SWIG was already kind of doing this, but this modification refines
-            the implementation to more closely follow the C++ ARM, section
-            7.1.3, p. 106.  This fixes a couple of obscure corner cases.
-
-03/16/2002: beazley
-            Modified C++ inheritance with a few enhancements.  First, type information
-            needed for casting and type-equivalence is generated even when base-classes
-            aren't defined in the interface.  For example:
-
-                class Foo : public Bar  {    /* Bar unspecified */
-                public:
-                  ...
-                };
-
-               void blah(Bar *b);
-
-            In this case, the blah() function still accepts Foo * even though nothing
-            is really known about Bar.   Previous SWIG versions would just generate
-            a type error.
-
-            Inheritance has also been modified to work through typedef.  For example:
-
-               class Bar {
-               };
-
-               typedef Bar OtherBar;
-               class Foo: public OtherBar {
-               }
-
-            In this case, the base class of OtherBar is correctly resolved back to
-            Bar.   The use of the name OtherBar is lost in this resolution (the wrappers
-            will simply use Bar instead of the typedef name OtherBar).
-           
-03/13/2002: beazley
-            %typemap, %apply, and related directives can now appear inside
-            class definitions.   
-
-03/13/2002: beazley
-            Fixed a variety of problems related to compiling SWIG on 64-bit
-            platforms.
-
-03/12/2002: beazley
-            Fixed problem with "ignore" and "in" typemaps.  Local variables
-            associated with "in" were being added to the wrapper function even
-            though they were never used.   Mostly harmless, but it would lead
-            to a variety of compilation warnings.
-  
-03/12/2002: beazley
-            Some changes to the internal type system and handling of nested C++
-            types.   In previous versions of SWIG, if you had the following:
-
-                 class Foo {
-                 public:
-                      typedef int Blah;
-                 };
-                 class Bar : public Foo {
-                 public:
-                       void somemethod(Blah x);
-                 };
-
-            The argument type in somemethod() would implicitly be set to Bar::Blah.
-            Although this is technically allowed, it breaks typemaps.  For example:
-
-                 %typemap(in) Foo::Blah { ... }
-
-            doesn't match like you expect.   This has been changed in SWIG-1.3.12.
-            Now, types are expanded using the class in which they were defined.
-            So, the argument type in somemethod() will be Foo::Blah---since the
-            type Blah was defined in Foo.
- 
-03/10/2002: beazley
-            Fixed some subtle type scoping problems with typedef and C++ classes.
-            For example:
- 
-                typedef int Blah;
-                class Bar {
-                public:
-                    typedef double Blah;
-                    void foo(Blah x, ::Blah y);
-                ...
-                }
-
-03/10/2002: beazley
-            Highly experimental change to handle variable length arguments.
-            First, there is no portable or reliable way to wrap
-            a varargs function in full generality.  However, you *can* change
-            the function signature using %varargs.
-
-               %varargs(char *) fprintf;
-               ...
-               void fprintf(FILE *f, char *fmt, ...);
-
-            In this case, the variable length parameter "..." is
-            simply replaced by the parameters given in %varargs. This
-            results in a function like this:
-
-               void fprintf(FILE *f, char *fmt, char *s);
-
-            More than one argument can be used and default values
-            can be defined.  For example, this code specifies a
-            maximum of four arguments.
-
-               %varargs(char *x1 = 0, char *x2 = 0, char *x3 = 0, char *x4 = 0) fprintf;
- 
-            *** EXPERIMENTAL NEW FEATURE ***
- 
-03/10/2002: beazley
-            Change to handling of variable length arguments.  varargs
-            is now handled as a proper parameter and is passed to the
-            code generator.  However, it still can't be handled correctly
-            (and will generate a typemap warning).   This change has been
-            made to better incorporate variable length arguments with other
-            directives such as %ignore, %rename, %feature, and so forth.
-
-03/10/2002: beazley
-            Fixed [ 522555 ] Syntax error parsing "define" construct. SWIG
-            is a little more restrictive in determining #define statements
-            that will be wrapped as constants.  Also added a better parser
-            error rule for handling bad constants.
-
-03/08/2002: cheetah (William Fulton)
-            [Java] Bug fix: Classes renamed with %rename that are derived from 
-            another class generate more appropriate shadow class code.
-
-03/08/2002: cheetah (William Fulton)
-            [Java] Fixed SF [ #523632 ] and [ #513335 ] both reported by Israel 
-            Tanner. Support for types that are used which are in a typedef. The
-            appropriate shadow class name is generated. Also generated correct
-            shadow classname when a templated class is used within another 
-            templated class. See the cpp_typedef.i testcase.
-
-03/08/2002: cheetah (William Fulton)
-            [Java] Bug fix: No type was generated in shadow classes for types 
-            that weren't wrapped by SWIG.  The type is treated as a raw 
-            pointer, ie no shadow class.
-
-02/22/2002: beazley
-            Refined the matching algorithm used by %rename, %ignore, and
-            %feature.   If a type signature is supplied, it must exactly
-            match that used in the declaration---including any use of
-            const.  For example:
-
-                %rename(foo1)   foo(int);
-                %rename(bar1)   bar(int) const;
-
-                class Blah {
-                   public:
-                      void foo(int);       // Matched --> foo1
-                      void foo(int) const; // Not matched 
-                      void bar(int);       // Not matched
-                      void bar(int) const; // Matched --> bar1
-                }
-
-            In previous versions, a non-const specification would match
-            both the non-const and const declarations.  However, the whole
-            point of %rename and related directives is that they be able
-            to precisely pinpoint exact declarations in an interface.  This
-            fixes the problem.
-
-02/21/2002: beazley
-            Reworked the handling of default constructor and destructors.
-            SWIG now makes a preliminary pass over the parse tree to discover
-            which classes support default allocation.   This fixes a number
-            of very subtle issues in code generation and call/return by value.
-
-02/18/2002: cheetah (William Fulton)
-            Improved support on Cygwin: Perl, Python, Tcl, Ruby and Java should
-            work out of the box, barring the runtime library. Removed dllwrap 
-            and replaced with newly working gcc -shared instead for Cygwin. 
-            All this will require the new improved binutils 20010802 and later,
-            but the latest Cygwin is usually the best recommendation.
-
-02/15/2002: beazley
-            Fixed some problems related to wrapping of global variables
-            and Perl shadow classes. Reported by Chia-liang Kao.
-
-02/15/2002: ljohnson (Lyle Johnson)
-            [Ruby] Made a fix to the code generation for C++ class
-            constructors so that we get both a "new" singleton method
-            and an "initialize" instance method for each class. This
-            change enables developers to derive new Ruby classes from
-            SWIG-wrapped C++ classes and then override their initialize
-            methods to provide subclass-specific instance initialization.
-
-02/15/2002: ljohnson (Lyle Johnson)
-            [Ruby] Massive documentation update for the Ruby module,
-            contributed by Craig Files.
-
-02/14/2002: ljohnson (Lyle Johnson)
-            [Ruby] Bug fix: An error in the SWIG runtime support for Ruby
-            was causing several of the examples to fail. Reported by
-            William Fulton.
-
-02/14/2002: ljohnson (Lyle Johnson)
-            [Ruby] Bug fix: Enumerations defined within a class (such
-            as those seen in the Examples/ruby/enum example) were not
-            being exported with the correct names. Reported by William
-            Fulton.
-
-02/13/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added a warning message when we run across overloaded
-            class constructors for C++ code, that this is currently not
-            supported (even if the overloads have been %renamed). For an
-            example of where this doesn't work, see Examples/ruby/operator.
-
-02/13/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added an "ignored" warning message when the parser runs
-            across an operator!=() declaration for C++ code.
-
-02/11/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added the "import", "import_template", "operator" and
-            "template" examples.
-
-02/11/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added multi-module support.
-
-02/09/2002: ljohnson (Lyle Johnson)
-            [Ruby] Added the missing "#define SWIG_NOINCLUDE" at the top of
-            the wrapper code when the '-c' option is used.
-
-02/09/2002: ljohnson (Lyle Johnson)
-            Corrected a minor off-by-one error for the size of the
-            swig_types[] array that's generated in the wrapper code.
-
-02/08/2002: beazley
-            Fixed SF [ #515058 ] Wrong code for C++ templates.
-            Reported by Israel Taller.
-
-Version 1.3.11 (January 31, 2002)
-=================================
-
-01/30/2002: beazley
-            Fix to pass/return by value for C++ objects that define
-            no default constructor.  Changes to the typemap system
-            made it impossible to wrap C++ objects with no default
-            constructor.   This has been fixed, but the solution 
-            involves some clever template magic contributed by 
-            William Fulton.  Please see the comments in the file
-            Lib/swig.swg for further details.  This solution is
-            experimental and may be refined in a future release.
-
-01/30/2002: beazley
-            Global variables and member data of type "const char *"
-            can be set, but the old value is silently discarded without
-            any garbage collection.   This may generate a memory leak.
-            This change is needed to more safely handle variables
-            like this:
-
-                   const char *foo = "Hello World\n";
-
-            In this case, it's not safe to free the old value.  However,
-            SWIG can dynamically allocate a new value and make foo point
-            to it.   To fix this memory leak, you can probably do this:
-
-               %clear const char *foo;
-               %apply char * {const char *foo};
-
-            *** POTENTIAL INCOMPATIBILITY ***
-            
-01/30/2002: beazley
-            Two minor typemap enhancements have been added.  First,
-            typemaps can issue a warning message by including a special
-            warning attribute. For example:
-
-             %typemap(in,warning="I'm going to do something dangerous") ...
-
-            The warning message will show up whenever the typemap is
-            applied.
-
-            Second, a typemap can force a no-match by defining
-
-             %typemap(in) sometype "pass";
-
-            If this is used, the typemap system will *not* record a
-            typemap match for "sometype".   This can be used to block
-            selected typemaps.  For example, if you wanted to disable
-            a typemap feature for some type, you could do this.
-
-               // Do not allow global variables of type 'const char *' to be set.
-               %typemap(varin) const char * "pass";
-
-            It might also be possible to use this to do subtle and
-            strange things with typemaps.  For example, if you wanted to
-            make 'blah *' an output value and 'const blah *' an input
-            parameter, you might do this:
-
-                %typemap(ignore) blah *(blah temp) {
-                    $1 = &temp;
-                }
-                %typemap(argout) blah * {
-                    ... return a value ...
-                }
-                /* Block unqualified typemaps defined above */
-                %typemap(ignore) const blah * "pass";
-                %typemap(argout) const blah * "pass";
-                %typemap(in)     const blah * {
-                    ... get input value ...
-                }
-
-             (This potential applications of typemaps suggested by Greg Stein).
-            *** NEW FEATURE ***
-
-01/29/2002: cheetah (william fulton)
-           [Java] Bug fix: No enumerations were wrapped when the -shadow 
-           commandline option was not specified. Reported by Israel Taller.
-
-01/28/2002: cheetah (william fulton)
-           [Java] Global arrays are successfully wrapped. In fact they started
-           mostly working in SWIG-1.3.10.
-
-01/28/2002:richardp
-	   Added first attempt at C++ and -shadow support for PHP4 module,
-	   please test and mail me if any problems/ideas on improving it.
-
-	   There is a known problem with uninitialized member variables,
-	   please see Examples/php4/sync/README for details.
-
-	   Also more PHP documentation added to Doc/Manual/Php.html
-
-01/27/2002:beazley
-           The ANSI C size_t type is now recognized as an integer by default.
-
-01/26/2002:beazley
-           long long and unsigned long long support added to many language modules.
-           This is not a portable feature and will require compiler support
-           for the long long type.  In target languages that do not support
-           long long (e.g., Tcl and Perl), numbers are converted to a string
-           of digits.  This prevents their use in arithmetic calculations, but
-           still allows values to be set from a string.  
-
-           long long support requires the use of the strtoll() and strtoull()
-           functions as well as the 'lld' and 'llu' format specifiers
-           of sprintf().
-
-01/26/2002:beazley
-           Fixed [ #501827 ] Delete method is not called.   The Tcl
-           module wasn't correctly calling destructors when they
-           were defined using %addmethods.  This has been fixed.
-           Reported by Reinhard Fobbe.
-
-01/26/2002: beazley
-           Better support for long long and unsigned long long.  Typemaps
-           have been included in a number of modules for handling these types.
-           In addition, the parser has been modified to accept long long
-           literals such as 1234LL and 1234ULL.
-
-01/27/2002: cheetah (william fulton)
-           [Java] A C char[] is mapped to a Java String which is the default 
-           SWIG handling of char[] and char*. It used to be mapped to byte[]. 
-           Note that a C signed char[] array is mapped to byte[].
-
-           *** POTENTIAL INCOMPATIBILITY ***
-
-01/25/2002: beazley
-           Fixed a problem with return-by-value, C++, and
-           objects that define no default constructor.
-           Reported by Joel Reed.
-
-01/25/2002: cheetah (william fulton)
-           [Java] Overhaul of the Java module. The C code generation is now 
-           done from typemaps.
-
-01/24/2002: cheetah (william fulton)
-           [Java] Support for arrays of enum pointers
-
-01/20/2002: cheetah (william fulton)
-           [Java] Error checking for null Java objects being passed to native 
-           functions.  Exception thrown now whereas before the JVM crashed.
-
-01/18/2002: cheetah (william fulton)
-           [Java] Corrected behaviour for functions that take arrays. For 
-           example, when this c function: 
-
-           void arrayfn(int array[]);
-           
-           is wrapped the corresponding native function
-
-           public final static native void arrayfn(int[] array);
-
-           is produced. Previously if the C function made any changes to the 
-           array elements, these were not reflected back into the Java array. 
-           This has now been corrected so that the changes are propogated back
-           to Java and the calling function will see these changes. This is 
-           how pure Java functions work, ie arrays are passed by reference.
-
-01/15/2002:mkoeppe
-           [Guile] New file cplusplus.i with C++ typemaps contributed
-           by Marcio Luis Teixeira <marciot@holly.colostate.edu>.
-
-01/11/2002: cheetah (william fulton)
-           [Java] Changed mapping of C long to Java type. Was mapped to Java
-           long, now mapped to Java int. If you want the previous mapping to 
-           Java long use this approach in your interface file:
-           
-             %clear long;
-             %typemap(jni) long             "jlong"
-             %typemap(jtype) long           "long"
-             %typemap(jstype) long          "long"
-
-             %clear long[ANY];
-             %typemap(jni) long[ANY]        "jlongArray"
-             %typemap(jtype) long[ANY]      "long[]"
-             %typemap(jstype) long[ANY]     "long[]"
-             %typemap(in) long[ANY]         {write me for array support}
-             %typemap(out) long[ANY]        {write me for array support}
-             %typemap(argout) long[ANY]     {write me for array support}
-             %typemap(freearg) long[ANY]    {write me for array support}
-
-           *** POTENTIAL INCOMPATIBILITY ***
-
-           This new mapping is more appropriate when interfacing to 32 bit 
-           applications which are used in the current 32-bit JVMs. For future 
-           64-bit JVMs you may have to change these mappings - eg on Unix LP64 
-           systems, but not on Microsoft 64bit Windows which will be using a 
-           P64 IL32 model. This may be automated in a future version of SWIG.
-
-01/10/2002:beazley
-           Fixed [ 501677 ] %init block in wrong place. Reported
-           by Luigi Ballabio.
-
-01/09/2002: cheetah (william fulton)
-           [Java] Default support for the long long type. signed long long is 
-           mapped to a Java long. unsigned long long is mapped to BigInteger.
-
-01/09/2002:beazley
-           Experimental change to parser to better support mixing of
-           int, long, short, unsigned, float, and double.   The parser
-           should now support types like this:
-    
-                short unsigned int
-                int   unsigned short
-                unsigned short int
-                unsigned int short
-
-            This change also enables a type of 'long double' (previously
-            unsupported) to be used.
-            *** NEW FEATURE ***
-
-01/05/2002: cheetah (william fulton)
-           [Java] Casting fix for when function return type is a pointer as 
-           reported by Gary Pennington 2002-01-05. The upper 32bits of the 
-           64 bit jlong will have contained junk for 32bit pointers.
-
-01/05/2002: cheetah (william fulton)
-           [Java] Better pointer handling in Java is possible as the 
-           INPUT, OUTPUT and INOUT typemaps have been added into typemaps.i.
-
-01/05/2002: cheetah (william fulton)
-           [Java] $null can be used in input typemaps to return early from JNI 
-           functions that have either void or a non-void return type. Example:
-
-             %typemap(check) int * %{ 
-               if (error) {
-                 SWIG_exception(SWIG_IndexError, "Array element error");
-                 return $null;
-               }
-             %}
-
-           If the typemap gets put into a function with void as return, $null 
-           will expand to nothing:
-
-             void jni_fn(...) {
-                 if (error) {
-                   SWIG_exception(SWIG_IndexError, "Array element error");
-                   return ;
-                 }
-               ...
-             }
-
-           otherwise $null expands to zero, where javareturntype is either a 
-           pointer or a primitive type:
-
-             javareturntype jni_fn(...) {
-                 if (error) {
-                   SWIG_exception(SWIG_IndexError, "Array element error");
-                   return 0;
-                 }
-               ...
-             }
-
-01/02/2002: cheetah (william fulton)
-           [Java] The Java module incorrectly used argout typemaps for 
-           strings. This is now corrected and the code now resides
-           in the freearg typemap. The argout array typemaps have been split into 
-           argout and freearg typemaps. This correction may require some user 
-           written typemaps to be modified. 
-           *** POTENTIAL INCOMPATIBILITY ***
-
-12/28/2001: cheetah (william fulton)
-           [Java] Multi typemaps now working for Java see multimap example.
-           [Java] Fix for recently introduced bug - freearg typemap code was appearing
-           before the function call.
-
-12/28/2001: cheetah (william fulton)
-           [Java] JCALL macro for JNI calls that work in both C and C++ typemaps
-           have been replaced with JCALL0, JCALL1, JCALL2, JCALL3 and JCALL4 
-           macros.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-12/22/2001:beazley
-           Resolved some inconsistent behavior with %rename and class renaming.
-           If you specify the following:
- 
-               %rename(Foo)  Bar;
-
-               class Bar {
-               public:
-                    Bar();
-                    ~Bar();
-               }
-
-           Then the %rename directive applies to the class itself, the constructor,
-           and the destructor (all will be renamed to Foo).
-
-           If a class defines more than one constructor, the overloaded variants
-           can still be renamed by specifying parameters to %rename.  For example:
-
-               %rename(Bar_copy) Bar(Bar &);
-               class Bar {
-               public:
-                     Bar();
-                     Bar(Bar &);
-                    ~Bar();
-               };
-
-           There are still some odd corner cases.  If you specify
-
-               %rename(Foo) ::Bar;
-
-           then only the name of the class is changed and the constructor/destructor
-           names are left unmodified.  If you specify 
-
-               %rename(Foo) *::Bar;
-
-           then the names of the constructor/destructor functions are modified but
-           the name of the class is not.
-
-12/21/2001: cheetah (william fulton)
-           [Java] jni, jtype and jstype typemaps no longer hardcoded but real 
-           typemaps. New variable substitution, $javaclassname, can be used in
-           the jstype typemaps. It is replaced with the Java shadow class name
-           where applicable.
-           [Java] Fix for recently introduced bug to do with inheritance when 
-           using %import.
-           [Java] A few more bug fixes, todo with %rename and using the kind
-           with the type, eg 
-           void fn(union uni myuni, struct str mystr, class cl mycl);
-
-12/20/2001:beazley
-           Fixed [ #494524 ] Preprocessor bug - apostrophe and #subst.
-
-12/20/2001:beazley
-           Added SWIG_VERSION preprocessor symbol.   This is a hexadecimal
-           integer such as 0x010311 (corresponding to SWIG-1.3.11).  This can
-           be used in the interface as follows:
-
-               #if SWIG_VERSION >= 0x010311
-               /* Use some fancy new feature */
-               #endif
-
-           Note: The version symbol is not defined in the generated SWIG
-           wrapper file.
-
-           *** NEW FEATURE ***
-
-12/20/2001:mkoeppe
-	   [MzScheme]: Renamed mzswig_make_boolean to
-	   swig_make_boolean, as the latter is used in the typemaps.
-	   Reported by Luigi Ballabio.
-
-12/17/2001:mkoeppe
-	   [Guile]: Rewrote list-vector.i using multi-dispatch
-	   typemaps.  Updated pointer-in-out.i.  Make the
-	   deprecated typemap-substitution of "$source" in "argout"
-	   work as before.
-
-12/16/2001:mkoeppe
-	   [Guile]: Fixed macros %values_as_list, %values_as_vector,
-	   %multiple_values to use the proper %pragma syntax.  New
-	   Guile example/test "multivalue"; new Guile run-test for
-	   test-suite item "list-vector" (currently broken).
-
-12/14/2001:mkoeppe
-	   [Guile]: Fixed typemap-substition bug for "varin".  Relaxed
-	   valid-identifier check to allow all R5RS identifiers.
-
-
-Version 1.3.10 (December 10, 2001)
-==================================
-
-12/08/2001:beazley
-           Modified %typemap so that %{ ... %} can also be used as a
-           code block (mostly for completeness).  For example:
- 
-              %typemap(in) blah %{
-                 ...
-              %}
-
-           This form does not introduce a new block scope.  Also, the
-           code enclosed in %{ ... %} is not processed by the preprocessor.
-
-12/08/2001:beazley
-           Fixed [ #459614 ] SWIG with multiple TCL interpreters.
-
-12/08/2001:beazley
-           Fixed [ #417141 ] rubydec.swg is wrong
-           Reported by Paul Brannan.
-
-12/08/2001:beazley
-           Fixed [ #410557 ] Problem with %addmethods on NT.
-           Reported by Magnus Ljung.
-
-12/08/2001:beazley
-           Fixed [ #445233 ] Enhancement: handle access change.
-           SWIG now parses (but ignores) C++ access changes for the
-           the following:
-
-             class A {
-             protected:
-                void something() { }
-             public:
-                A() {}
-             };
-
-             class B : private A {
-             public:
-                B() : A() { }
-             protected:
-                A::something;    <---- Parsed, but ignored
-             };
- 
-           Suggested by Krzysztof Kozminski.
-
-12/08/2001: cheetah (william fulton)
-           Fix for Ruby to work using Visual C++.
-
-12/06/2001:beazley
-           Fixed [ #465687 ] unsigned short parameters fail.
-           Reported by Gerald Williams.
-
-12/06/2001:beazley
-           Fixed SF [ #489594 ] PyString_FromString can't take NULL arg.
-           Reported by John Merritt.   SWIG now converts string values
-           to Python using code like this:
-
-           resultobj = result ? PyString_FromString(result) : Py_BuildValue("");
-
-12/06/2001:beazley
-           Fixed SF [ #463561 ] Type conversions not generated.
-           Reported by Gerald Williams.
-	
-12/04/2001:beazley
-           Fixed SF [ #470217 ] Tcl default argument handling.
-           Reported by Shaun Lowry.
-
-12/04/2001:beazley
-           Fixed SF [ #472088 ] defined(MACRO) expanded everywhere.
-           Embedded preprocessor directives such as
-
-              %#if defined(FOO)
-
-           are not expanded by the SWIG preprocessor.
-           Reported by Gerald Williams.
-
-12/04/2001:beazley
-           Fixed SF [ #476467 ] Problems with #define & commas.
-
-12/04/2001:beazley
-           Fixed SF [ #477547 ] wrong declaration of pointer functions.
-           Bad prototypes in Lib/tcl/ptrlang.i.
-
-12/04/2001:beazley
-           Fixed SF [ #483182 ] Constants can take args by mistake. 
-           When swig -perl5 -const is used, constants are declared
-           with a void prototype.  For example:
-
-                sub ICONST () { $examplec::ICONST }
-
-           Patch submitted by Rich Wales.
-
-12/03/2001:beazley
-           New %exception directive.   This is intended to replace %except.
-           It works in exactly the same manner except it does not accept a 
-           language specifier. For example:
-
-               %exception {
-                   try {
-                      $action
-                   } 
-                   catch(SomeError) {
-                       error
-                   }
-               }
-
-           %exception is also name aware---allowing it to be applied to
-           specific declarations in an interface.  For example:
-
-              %exception foo {
-                  ...
-                  exception for any function/method foo
-                  ...
-              }
-
-              %exception Foo::bar {
-                  ...
-                  exception for method bar in class Foo
-                  ...
-              }
- 
-              %exception Foo::bar(double) {
-                  ...
-                  exception for method bar(double) in class Foo
-                  ...
-              }
-
-           The semantics of this name matching is exactly the same as for %rename.
-           *** NEW FEATURE ***
-           
-12/03/2001:beazley
-           Substantial cleanup of the Python shadow class code.  Shadow classes
-           used to be created in this rather complicated manner involving about
-           a half-dozen strings created in bits and pieces.   Shadow classes
-           are now generated in a more straightforward manner--in the same
-           order that appears in the interface file.
-
-           *** POTENTIAL INCOMPATIBILITY ***
-           The order in which declarations appear in the shadow file may differ.
-           
-12/03/2001:beazley
-           The %insert directive (%{ ... %}, %runtime, %header, %wrapper, etc.)
-           can now be used inside of a class definition.   This has potential
-           uses when generating shadow class code.  For example:
-
-                 class Foo {
-                     ...
-                 %insert("shadow") %{
-                 # Some python code
-                 def blah(self):
-                      print "I'm blah!"
-                 %}
-                     ...
-                 };
-
-           The support for class code insertion depends on the language module.
-           However, the intent of this feature is to simplify the task of extending
-           shadow class code.   In the Python module, this inserts code with the
-           proper level of indendation (regardless of what was used in the SWIG
-           interface).
-           *** NEW FEATURE ***
-
-11/29/2001: cheetah (william fulton)
-           Modifications for Java and Python modules to work on cygwin.
-           Unfortunately a lot of the python module has started to produces code 
-           which cannot be auto-imported using cygwin libtools so most of it is 
-           still broken.
-
-11/28/2001:beazley
-           The %rename and %feature directive can now be used inside
-           of a class definition. For example:
-
-             class Foo {
-                 %rename(foo_i) foo(int);
-                 %rename(foo_d) foo(double);
-             public:
-                 ...
-                 void foo(int);
-                 void foo(double);
-                 ...
-             };
-
-           When used in this manner, the %rename directive only applies
-           to members of the class in which it appears as well as all
-           derived classes.  In fact, this is really just the same
-           as saying:
-
-             %rename(foo_i) Foo::foo(int);
-             %rename(foo_d) Foo::foo(double);
-             class Foo {
-                ...
-             };
-
-           *** NEW FEATURE ***
-
-11/26/2001:beazley
-           Added the experimental %feature directive.  %feature can be
-           used to attach arbitrary string attributes to parse tree nodes.
-           For example:
-
-               %feature("except") blah {
-                   try {
-                      $function
-                   } catch (Error) {
-                       whatever;      
-                   }
-               }
-
-           or
-
-              %feature("set") *::x_set "x";
-
-           or
-
-              %feature("blah") Foo::bar(int,double) const "spam";
-
-           The syntax is borrowed from the %rename directive.  In fact, the
-           exact same semantics apply (inheritance, matching, etc.).
-
-           %feature is a very powerful low-level primitive that can be used to
-           customize individual language modules and to provide hints to 
-           any stage of code generation.   Features are attached to
-           parse tree nodes as attributes with names like "feature:*" where * 
-           is replaced by the feature name (e.g., "feature:except", "feature:set", 
-           etc.).   Language modules can then look for the features using 
-           a simple attribute lookup.
-
-           %feature is intended to be a replacement for a number of
-           older SWIG directives including %except and specialized
-           pragmas. It is more powerful (due to its parameterized
-           name matching) and it provides very precise control over
-           how customization features are attached to individual
-           declarations.   There are future expansion plans that will
-           build upon this capability as well.
-
-           It's not certain that %feature will ever be used directly
-           by SWIG users.  Instead, it may be a low-level primitive
-           that is used in high-level macro definitions.  For instance,
-           to support properties, you might define a macro like this:
-
-           %define %property(name, setf, getf)
-           %feature("set") setf #name;
-           %feature("get") getf #name;
-           %enddef
-
-           Which allows a user to specify things like this:
-
-           %property(p, get_p, set_p);
-
-           class Blah {
-           public:
-              int  get_p();
-              void set_p(int);
-           };
-
-           *** EXPERIMENTAL NEW FEATURE ***
-  
-11/24/2001:beazley
-           The Tcl module has been expanded with some new features for
-           managing object ownership.  For example:
-         
-                set c [Circle -args 20]
-                $c area             # Invoke a method
-                $c -disown          # Releases ownership of the object
-                $c -acquire         # Acquires ownership of the object
-
-           If Tcl owns the object, its destructor is invoked when the 
-           corresponding object command is deleted in Tcl.  
-
-           To simplify the destruction of objects, the following syntax
-           can be used:
-
-                $c -delete         # Delete an object
-
-           This is an alternative for the more obscure variant of 
-
-                rename $c {}
-
-           These features also add functionality at the C API level.
-           The following functions manage ownership from C and
-           can be used in typemaps.
-
-                SWIG_Acquire(void *ptr);
-                SWIG_Disown(void *ptr);
-
-           A new function for constructing instances is also available:
-
-                Tcl_Obj *
-                SWIG_NewInstanceObj(Tcl_Interp *interp, void *ptr,
-                                    swig_type_info *type, int own);
-
-           When used in a typemap, this creates a pointer object and
-           an interpreter command that can be used to issue methods and
-           access attributes as shown above.
-           *** NEW FEATURE ***
-           
-11/23/2001:beazley
-           All Python-related %pragma operations have been eliminated.
-           Most of these were written for older SWIG versions in order to
-           compensate for limitations in earlier releases.  In an effort
-           to reduce the amount of code-clutter and potential for errors,
-           it is easier to simply eliminate the pragmas and to start over
-           (if needed).  To be honest, I'm not even sure the pragmas
-           worked in 1.3.9 and recent releases.
-
-           Note: If you need to insert code into the shadow class file
-           created by SWIG, simply use the %shadow directive like this:
-
-              %shadow %{
-              def some_python_code():         
-                  print "blah!"
-              %}
-
-           *** POTENTIAL INCOMPATIBILITY ***
-
-11/22/2001:beazley
-           Sweeping changes to the way in which the Python module handles
-           shadow classes.   In early implementations, shadow classes were
-           merely Python wrappers around typed pointer objects. However, 
-           some users actually wanted to receive the shadow class object in C.
-           To accommodate this, the dereferencing of the "this" pointer in
-           a shadow class was moved to C as described in CHANGES [8/8/99].
-           However, the process of returning pointers to Python was still
-           somewhat problematic.  Specifically, shadow classes never worked
-           in situations such as these:
-
-             -   Use of any kind of output typemap ('out' or 'argout')
-             -   Global variables (broken as far as I can tell).
-
-           In the past, some users have dealt with this by manually trying
-           to create shadow class objects themselves from C/C++.  However,
-           this was difficult because the C wrappers don't really know how
-           to get access to the corresponding Python class.
-
-           The Python module has now been modified to automatically attach
-           shadow class objects to pointers when they are returned to 
-           Python.   This process occurs in the function SWIG_NewPointerObj()
-           so the process is completely transparent to users.    As a result,
-           shadow classes are now more seamlessly integrated with typemaps
-           and other features of SWIG.
-
-           This change may introduce a number of incompatibilities.  The
-           SWIG_NewPointerObj() now takes an extra parameter "own" to 
-           indicate object ownership.   This can be used to return a pointer
-           to Python that Python should destroy.   In addition, older code
-           that tries to manually construct shadow class objects or which
-           expects bare pointers may break---such pointers may already be
-           encapsulated by a shadow class.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-11/20/2001:beazley
-           Modified the %insert directive to accept single braces { ... }.
-           For example:
-
-                %insert("header") {
-                   ... some code ...
-                }
-
-           This works exactly like %{ ... %} except that the code in the
-           braces is processed using the preprocessor.   This can be useful
-           in certain contexts such as low-level code generation in 
-           language modules.
-           *** NEW FEATURE ***
-           
-11/20/2001:beazley
-           Command line options are now translated into preprocessor
-           symbols.  For example:
-	
-              ./swig -python -shadow -module blah interface.i
-
-           Creates the symbols:
-
-              SWIGOPT_PYTHON 1
-              SWIGOPT_SHADOW 1
-              SWIGOPT_MODULE blah
-              
-           Modules can look for these symbols to alter their code generation
-           if needed.
-           *** NEW FEATURE ***
-             
-11/20/2001:beazley
-           Massive overhaul of the Perl5 module.  A lot of code generation is
-           now driven by tables and typemaps.   The generated wrapper code 
-           also makes use of tables to install constants, variables, and
-           functions instead of inlining a bunch of procedure calls.  The
-           separate variable initialization function is gone.   Most
-           code generation is controlled via the perl5.swg file in the
-           library.
-           *** POTENTIAL INCOMPATIBILITY ***
-           
-11/13/2001:beazley
-           Added parsing support for the C++ typename keyword.  Primarily this
-           is added to better support templates.  For example:
-
-             template<typename T> void  blah(C& v) {
-                 typename C::iterator i = v.begin();
-             }
-
-           Note: typename is supported in the parser in the same way as 'struct'
-           or 'class'.  You probably shouldn't use it anywhere except in templates.
-           *** NEW FEATURE ***
-
-11/11/2001:beazley
-           Massive overhaul of the language module API.   Most functions now
-           use a common, very simple,  API.   There are also a number of
-           interesting semantic side-effects of how code is actually generated.
-           Details will be forthcoming in Doc/Manual/Extending.html.
-
-           *** POTENTIAL INCOMPATIBILITY *** Language modules written for
-           previous versions of SWIG will no longer work,
-
-11/10/2001:beazley
-           Fixed a very subtle bug due to unnamed class wrapping. For example, if
-           you did this
-
-              typedef struct {
-                  int x,y;
-              } gdPoint, *gdPointPtr;
-
-              void foo(gdPointPtr x);
-
-           Then the foo function would get a type-error.   The problem has
-           to do with internal typedef handling and the fact that the typedef
-           declarations after the struct appear later in the parse tree.
-           It should work now.  Problem reported by Vin Jovanovic.
-
-11/09/2001:beazley
-           Subtle change to "out" typemaps (and related variations).  The name
-           that is attached to the typemap is now the raw C identifier that
-           appears on a declaration.  This changes the behavior of
-           member functions.  For example:
-
-               %typemap(out) int foo {
-                  ...
-               }
-
-               class Blah {
-                   public:
-                      int foo();    // typemap gets applied
-               }
-            
-           Previous versions never really specified how this was supposed to
-           work.  In SWIG1.1, you could probably write a typemap for the
-           wrapper name like this:
-
-                %typemap(out) int Blah_foo { ... }
-
-           However, this old behavior is now withdrawn and not supported. 
-           Just use the member name without any sort of special prefix.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-11/06/2001:beazley
-           Changes to Tcl module initialization:
-
-           (1) SWIG now automatically includes the code needed to work with
-                Tcl stubs.  Simply compile with -DUSE_TCL_STUBS.
-
-           (2) SWIG now automatically calls Tcl_PkgProvide to register
-               a package name.  The package name is the same as the name
-               specified with the %module directive.  The version number is
-               set to "0.0" by default.  To change the version number, use
-               swig -pkgversion 1.2 interface.i.
-
-           *** POTENTIAL INCOMPATIBILITY ***
-           Modules that provided stubs and Tcl_PkgProvide on their own might
-           break.  Simply remove that code.
-
-11/05/2001:beazley
-           Changed code generation of constants in the Tcl module.  Constants
-           are now stored in a large table that get installed at module startup.
-           There are also no longer any static variables so it should generate
-           somewhat less code.
-
-11/04/2001:beazley
-           The "const" typemap has been renamed to "constant" in many language
-           modules.  "const" is a C keyword which made the handling of the typemap
-           directive somewhat awkward in the parser.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-11/04/2001:beazley
-           %typemap directive can now accept nearly arbitrary keyword parameters.
-           For example:
-
-              %typemap(in,parse="i",doc="integer") int "...";
-
-           The purpose of the keyword parameters is to supply code generation
-           hints to the target language module.   The intepretation of the
-           parameters is language specific.
-           *** NEW FEATURE ***
-
-11/04/2001:beazley
-           Slight semantic change to internal call/return by value handling.
-           In previous versions of SWIG, call-by-value was translated
-           into pointers.  For example:
-
-               double dot_product(Vector a, Vector b);
-
-           turned into this:
-
-               double wrap_dot_product(Vector *a, Vector *b) {
-                  return dot_product(*a,*b);
-               }
-
-           This translation was normally performed by the SWIG core, outside
-           of the control of language modules.  However, a side effect
-           of this was a lot of bizarre typemap behavior.   For example,
-           if you did something like this:
-
-                %typemap(in) int32 {
-                    ...
-                }
-
-           You would find that int32 was transformed into a pointer everywhere!
-           (needless to say, such behavior is unexpected and quite awkward to
-           deal with).  To make matters worse, if a typedef was also used,
-           the pointer behavior suddenly disappeared.
-
-           To fix this, the pointer transformation is now pushed to the
-           language modules.   This produces wrappers that look roughly
-           like this:
-
-               double wrap_dot_product(Vector *a, Vector *b) {
-                  Vector arg1 = *a;
-                  Vector arg2 = *b;
-                  return dot_product(arg1,arg2);
-               }
-
-           This change also makes it easy to define typemaps for
-           arbitrary undefined types.  For example, you can do this (and it
-           will work regardless what int32 is):
-
-               %typemap(in) int32 {
-                  $1 = (int32) PyInt_AsLong($input);
-               }
-
-           *** POTENTIAL IMCOMPATIBILITY ***
-           This change may break call/return by value code generation in
-           some language modules.
-
-11/03/2001:beazley
-           Changed the name of the default typemaps to the following:
-
-               %typemap() SWIGTYPE  { 
-                   ... an object ...
-               }
-               %typemap() SWIGTYPE * {
-                   ... a pointer ...
-               }
-               %typemap() SWIGTYPE & {
-                   ... a reference ...
-               }
-               %typemap() SWIGTYPE [] {
-                   ... an array ...
-               }
-               %typemap() enum SWIGTYPE {
-                  ... an enum value ...
-               }
-               %typemap() SWIGTYPE (CLASS::*) {
-                   ... pointer to member ...
-               }
-
-
-           These types are used as the default for all types that don't match
-           anything else.  See CHANGES log entry for 8/27/2000 for the
-           old behavior.  The role of these types is also described in 
-           Doc/Manual/Typemaps.html
-
-           *** POTENTIAL INCOMPATIBILITY ***
-          
-10/25/2001:beazley
-           Modified Guile and Mzscheme modules to support
-           multi-argument typemaps.
-
-10/25/2001: cheetah (william fulton)
-           [Java] Fix to handle pointers to arrays.
-
-10/24/2001:beazley
-           Defining a typemap rule for enum SWIGENUM can now be used
-           to define default behavior for enum variables.
-
-10/22/2001:beazley
-           Ruby module modified to support multi-argument typemaps.
-
-10/22/2001:beazley
-           The Ruby module can now handle functions with an arbitrary
-           number of arguments.  Previous versions were limited to 
-           to functions with only 9 or 16 arguments depending on
-           the use of default arguments.   Note: from some inspection
-           of the Ruby interpreter source, the new approach might be
-           a little faster as well.
-
-10/18/2001:beazley
-           Fixed a bug with forward class declarations and
-           templates.
-
-                 class Foo <S,T>;
-
-           Bug reported by Irina Kotlova.
-
-10/16/2001:beazley
-           Support for multivalued typemaps added.  The typemaps
-           are specified using the syntax below.   Within each
-           typemap, variable substitution is handled as follows:
-
-              %typemap(in) (int argc, char *argv[]) {
-                  $arg;  // The input object in the target language
-                  $1;    // C local variable for first argument
-                  $2;    // C local variable for second argument
-
-                  // These variables refer to either argument
-                  $1_type, $1_ltype, $1_basetype, etc...  (argc)
-                  $2_type, $2_ltype, $2_basetype, etc...  (argv[])
-
-                  // Array dimension of argv
-                  $2_dim0
-              }
-
-           Basically any variable that was available in normal typemaps
-           is available for either argument by prefacing the variable
-           name by '$n_' where n is the argument position.
-
-           Notes:  
-           (1) Multi-valued typemaps can only be applied to a single
-               object in the target scripting language.   For example,
-               you can split a string into a (char *, int) pair or
-               split a list into a (int, char []) pair.  It is not
-               possible to map multiple objects to multiple arguments.
-
-           (2) To maintain compatibility with older SWIG versions, the
-               variables such as $target and $type are preserved and
-               are mapped onto the first argument only.
-
-           (3) This should not affect compatibility with older code.
-               Multi-valued typemaps are an extension to typemap handling.
-               Single valued typemaps can be specified in the usual
-               way.
-
-           The old $source and $target variables are officially
-           deprecated.  Input variables are referenced through
-           $arg$ and output values are reference through $result$.
-
-           *** NEW FEATURE ***
-
-10/16/2001:beazley
-           Added parsing support for multivalued typemaps.  The syntax
-           is a little funky, but here goes:
-
-              // Define a multivalued typemap
-              %typemap(in) (int argc, char *argv[]) {
-                    ... typemap code ...
-              }
-
-              // Multivalued typemap with locals
-              %typemap(in) (int argc, char *argv[])(int temp) {
-                    ... typemap code ...
-              }
-              
-              // Copy a multivalued typemap
-              %typemap(in) (int argcount, char **argv) = (int argc, char *argv[]);
-
-              // Apply a multivalued typemap
-              %apply (int argc, char *argv[]) { (int argcount, char **argv) };
-
-           Note: this extra parsing support is added for future extension.
-           No language modules currently support multi-valued typemaps.
-
-10/11/2001:beazley
-           Modified the typemap matching code to discard qualifiers when
-           checking for a match.   For example, if you have a declaration
-           like this:
-
-                 void blah(const char *x);
-
-           The typemap checker checks for a match in the following order:
-
-                 const char *x
-                 const char *
-                 char *x
-                 char *
-
-           If typedef's are involved, qualifier stripping occurs before
-           typedef resolution.  So if you had this,
-
-                typedef char *string;
-                void blah(const string x);
-
-           typemap checking would be as follows:
-
-                const string x
-                const string
-                string x
-                string
-                const char *x
-                const char *
-                char *x
-                char *
-
-           The primary reason for this change is to simplify the implementation
-           of language modules.  Without qualifier stripping, one has to write
-           seperate typemaps for all variations of const and volatile (which
-           is a pain).
-
-           *** POTENTIAL INCOMPATIBILITY ***  Typemaps might be applied in
-           places where they weren't before.
-
-
-10/9/2001: beazley
-           SWIG now generates wrappers that properly disambiguate
-           overloaded methods that only vary in constness.  For
-           example:
-
-               class Foo {
-                  ...
-                  void blah();
-                  void blah() const;
-                  ...
-               };
-
-           To handle this, the %rename directive can be used normally.
-           
-               %rename(blah_const) blah() const;
-
-           In the resulting wrapper code, method calls like this
-           are now generated:
-
-               (obj)->blah()               // Non-const version
-               ((Foo const *)obj)->blah()  // const version
-
-           This should force the right method to be invoked.
-           Admittedly, this is probably obscure, but we might
-           as well get it right.
-
-10/8/2001: beazley
-           The preprocessor now ignores '\r' in the input.
-           This should fix the following bug:
-           [ #468416 ] SWIG thinks macro defs are declarations?
-
-10/8/2001: beazley
-           Added support for ||, &&, and ! in constants.  This
-           fixes SF [ #468988 ] Logical ops break preprocessor.
-           However, at this time, constants using these operators
-           are not supported (the parser will issue a warning).
-
-10/4/2001: beazley
-           Added -show_templates command line option.  This makes
-           SWIG display the code it actually parses to generate
-           template wrappers.  Mostly useful for debugging.
-           *** NEW FEATURE ***
-
-10/4/2001: beazley
-           Change to semantics of %template directive.  When
-           using %template, the template arguments are handled
-           as types by default.  For example:
-
-                %template(vecint) vector<int>;
-                %template(vecdouble) vector<double>;
-
-           To specify a template argument that is *not* a type, you
-           need to use default-value syntax. For example:
-
-                %template(vecint) vector<int,int=50>;
-                %template(vecdouble) vector<int,size=100>;
-
-           In this case, the type name doesn't really matter--only
-           the default value (e.g., 50, 100) is used during
-           expansion.  This differs from normal C++, but I couldn't
-           figure out a better way to do it in the parser.  Might
-           implement an alternative later.
-           *** POTENTIAL INCOMPATIBILITY ***
-       
-10/4/2001: beazley
-           Major changes to template handling in order to provide
-           better integration with the C++ type-system. The main
-           problem is as follows:
-
-           Suppose you have a template like this:
-
-              template<class T> void blah(const T x) { stuff };
-                   
-           Now suppose, that you instantiate the template on a
-           type like this in SWIG:
-
-              %template(blahint) blah<int *>;
-
-           In C++, this is *supposed* to generate code like this:
-
-              void blah(int *const x) { stuff };
-
-           However, in SWIG-1.3.9, the template substitution gets it wrong
-           and produces
-
-              void blah(const int *x) { stuff };
-
-           (notice the bad placement of the 'const' qualifier).
-
-           To fix this, the SWIG parser now generates implicit typedefs
-           for template type arguments that produces code roughly
-           equivalent to doing this:
-
-              typedef int *__swigtmpl1;
-              %template(blahint) blah<__swigtmpl1>;
-
-           which generates code like this:
-
-              void blah(const __swigtmpl1 x) { stuff };
-
-           Since this is correct in both C++ and SWIG, it provides the right
-           semantics and allows everything to compile properly.  However,
-           to clean up the generated code a little bit, the parser keeps
-           track of the template types and performs back-substitution to
-           the original type when building the parse tree.  Thus, even
-           though the implicit typedef is used in the input and may appear
-           in the generated wrapper file (for proper compilation), the parse
-           tree will hide a lot of these details.   For example:
-
-              void blah(const __swigtmpl1 x) { stuff };
-
-           will look like it was declared as follows (which is what
-           you want):
-
-              void blah(int *const x) { stuff }
-
-           The only place you are likely to notice the typedef hack
-           is in bodies of template functions.  For example, if you
-           did this,
-
-              template<class T> class blah {
-                   ...
-                   %addmethods {
-                       void spam() {
-                          T  tempvalue;
-                          ...
-                       }
-                   }
-              }
-
-           you will find that 'T tempvalue' got expanded into some
-           strange typedef type.  This *still* compiles correctly 
-           so it's not a big deal (other than looking kind of ugly
-           in the wrapper file).
-
-10/4/2001: beazley
-           Fixed some inheritance problems in Tcl Object interface.
-
-10/1/2001: beazley
-           Tcl module has changed to use byte-backed pointer strings.  This
-           implementation should be safe on 64-bit platforms.  However,
-           the order in which digits appear in pointer values no longer
-           directly corresponds to the actual numerical value of a
-           pointer (on little-endian machines, pairs of digits appear
-           in reverse order).
-
-10/1/2001: beazley
-           Perl5 module is now driven by a configuration file 'perl5.swg'
-           in the SWIG library.
-
-10/1/2001: beazley
-           The perl5 module no longer tries to apply the "out" typemap
-           in code generated for magic variables.  I'm surprised that
-           this ever worked at all (since all of the code that was there
-           was wrong anyways).   Use the "varout" typemap to handle
-           global variables.
-
-10/1/2001: beazley
-           Fixed a bug related to character array members of structures.
-           For example:
-
-                struct Foo {
-                   char name[32];
-                };
-
-           SWIG is normally supposed to return a string, but this was
-           broken in 1.3.9.   The reason it was broken was actually
-           due to a subtle new feature of typemaps.  When a data member
-           is set to an array like this, the return type of the related
-           accessor function is actually set to an array.  This means
-           that you can now write typemaps like this:
-
-              %typemap(python,out) char [ANY] {
-                 $target = PyString_FromStringAndSize($source,$dim0);
-              }
-
-           This functionality can be used to replace the defunct
-           memberout typemap in a more elegant manner.
-
-9/29/2001: beazley
-           Some further refinement of qualified C++ member functions.
-           For example:
-
-               class Foo {
-                  ...
-                  void foo() const;
-                  ...
-               };
-
-           (i) The SWIG parser was extended slightly to allow 'volatile'
-           and combinations of 'const' and 'volatile' to be used.  This
-           is probably rare, but technically legal.  Only added for
-           completeness.
-
-           (ii) For the purposes of overloading, qualified and non-qualified
-           functions are different.  Thus, when a class has methods like this:
-
-                 void foo();
-                 void foo() const;
-
-           Two distinct methods are declared.  To deal with this, %rename
-           and similar directives have been extended to recognize const.
-           Thus, one can disambiguate the two functions like this:
-
-                %rename(fooconst) Foo::foo() const;
-
-           or simply ignore the const variant like this:
-
-                %ignore Foo::foo() const;
-
-           Note: SWIG currently has no way to actually invoke the const
-           member since the 'const' is discarded when generating wrappers
-           for objects.  
-
-9/27/2001: beazley
-           New directive. %namewarn can be used to issue warning
-           messages for certain declaration names.   The name
-           matching is the same as for the %rename directive.
-           The intent of this directive is to issue warnings for
-           possible namespace conflicts.  For example:
-
-              %namewarn("print is a python keyword") print;
-
-           The name matching algorithm is performed after a name
-           has been resolved using %rename.  Therefore, a
-           declaration like this will not generate a warning:
-
-              %rename("Print") print;
-              ...
-              void print();    /* No warning generated */
-
-           Since the warning mechanism follows %rename semantics, it is
-           also to issue warnings for specific classes or just for
-           certain member function names.
-
-           (Dave - I've been thinking about adding something like this
-           for quite some time.  Just never got around to it)
-           *** NEW FEATURE ***
-
-
-9/27/2001: beazley
-           Enhanced the %ignore directive so that warning messages
-           can be issued to users.   This is done using %ignorewarn
-           like this:
-
-             %ignorewarn("operator new ignored") operator new;
-
-           The names and semantics of %ignorewarn is exactly the 
-           same as %ignore. The primary purpose of this directive
-           is for module writers who want to ignore certain types
-           of declarations, but who also want to alert users about it.
-           A user might also use this for debugging (since messages
-           will appear whenever an ignored declaration appears).
-           *** NEW FEATURE ***
-
-9/26/2001: beazley
-           Super-experimental support for overloaded operators. 
-           This implementation consists of a few different parts.
-
-           (i) Operator names such as 'operator+' are now allowed
-           as valid declarator names.  Thus the 'operator' syntax
-           can appear *anyplace* a normal declarator name was used
-           before.  On the surface, this means that operators can
-           be parsed just like normal functions and methods. 
-           However, it also means that operator names can be used
-           in many other SWIG directives like %rename.  For example:
-
-            %rename(__add__) Complex::operator+(const Complex &);
-
-           (ii) Operators are wrapped *exactly* like normal functions
-           and methods.  Internally, the operator name is used 
-           directly meaning that the wrapper code might contain
-           statements like this:
-
-                arg0->operator*((Complex const &)*arg1);
-
-           This all seems to parse and compile correctly (at least
-           on my machine).
-
-           (iii) SWIG will no longer wrap a declaration if its symbol
-           table name contains illegal identifier characters.  If
-           illegal characters are detected, you will see an error
-           like this:
- 
-                Warning. Can't wrap operator* unless renamed to a valid identifier.
-
-           The only way to fix this is to use %rename or %name to bind
-           the operator to a nice name like "add" or something. Note:
-           the legal identifier characters are determined by the target
-           language.
-
-           There are certain issues with friend functions and operators.
-           Sometimes, friends are used to define mixed operators such
-           as adding a Complex and a double together.  Currently, SWIG
-           ignores all friend declarations in a class.  A global operator
-           declaration can probably be made to work, but you'll have to
-           rename it and it probably won't work very cleanly in the
-           target language since it's not a class member.
-
-           SWIG doesn't know how to handle operator specifications 
-           sometimes used for automatic type conversion. For example:
-
-           class String {
-              ...
-              operator const char*();
-              ...
-           };
-
-           (this doesn't parse correctly and generates a syntax error).
-
-           Also: operators no longer show up as separate parse-tree
-           nodes (instead they are normal 'cdecl' nodes).  I may
-           separate them as a special case later.
-
-           See Examples/python/operator for an example.
-
-           *** SUPER-EXPERIMENTAL NEW FEATURE ***
-
-Version 1.3.9 (September 25, 2001)
-==================================
-
-9/25/2001: beazley
-           Fixed parsing problem with type declarations like 
-           'char ** const'.  SWIG parsed this correctly, but the
-           internal type was represented incorrectly (the pointers
-           and qualifiers were in the wrong order).
-
-9/25/2001: beazley
-           Withdrew experimental feature (noted below) that was
-           causing serious parsing problems.
-
-Version 1.3.8 (September 23, 2001)
-==================================
-
-9/23/2001: beazley
-           Included improved distutils setup.py file in the Tools 
-           directory (look for the setup.py.tmpl file).  Contributed by
-           Tony Seward.
-
-9/23/2001: beazley
-           Included two new RPM spec files in the Tools directory. Contributed
-           by Tony Seward and Uwe Steinmann.
-  
-9/21/2001: beazley
-           Fixed SF Bug [ #463635 ] Perl5.swg does not compile in Visual C++
-
-9/21/2001: beazley
-           Two new directives control the creation of default
-           constructors and destructors:
-
-                %nodefault
-                %makedefault
-
-           These replace %pragma nodefault and %pragma makedefault.
-           (old code will still work, but documentation will only
-           describe the new directives).
-
-9/21/2001: beazley
-           Fixed SF Bug [ #462354 ] %import broken in 1.3.7.
-
-9/20/2001: beazley
-
-           Parser modified to ignore out-of-class constructor
-           and destructor declarations.  For example:
-
-               inline Foo::Foo() :
-                    Bar("foo")
-               { 
-               } 
-
-               inline Foo::~Foo() {
-               }
-
-           Suggested by Jason Stewart.
-           *** EXPERIMENTAL FEATURE ***
-
-9/20/2001: beazley
-           Modified the parser to ignore forward template class
-           declarations.  For example:
-
-              template <class V, long S> class MapIter;
-
-           Suggested by an email example from Irina Kotlova.
-
-9/20/2001: beazley
-           Fixed problem with undeclared tcl_result variable in 
-           the "out" typemap for Tcl.  Reported by Shaun Lowry.
-
-9/20/2001: beazley
-           Incorporated changes to make SWIG work with ActivePerl.  
-           Contributed by Joel Reed.
-
-9/20/2001: beazley
-           Slight change to the parsing of C++ constructor initializers.
-           For example:
-
-           class Foo : public Bar {
-           public:
-                  Foo() : Bar(...) {...}
-           };
-
-           SWIG now discards the contents of the (...) regardless of 
-           what might enclosed (even if syntactically wrong).  SWIG
-           doesn't need this information and there is no reason to
-           needless add syntax rules to handle all of the possibilities
-           here.
-
-9/20/2001: beazley
-           Change to typemaps for structure members.  If you have a
-           structure like this:
-
-              struct Vector {
-                int *bar;
-              };
-
-           The member name 'bar' is now used in any accessor functions.
-           This allows the "in" typemap to be used when setting the value.
-           For example, this typemap
-
-               %typemap(python,in) int *bar {
-                   ...
-               }
-
-           now matches Vector::bar.  It should be noted that this will also
-           match any function with an argument of "int *bar" (so you should
-           be careful).
-           *** NEW FEATURE. POTENTIAL INCOMPATIBILITY ***
-
-9/20/2001: beazley
-           Fixed SF bug #462642 setting string values in structures
-
-9/20/2001: beazley
-           Fixed SF bug #462398 problem with nested templates.
-
-9/20/2001: beazley
-           Fixed SF bug #461626 problem with formatting and C++ comments.
-            
-9/20/2001: beazley
-           Fixed SF bug #462845 Wrong ownership of returned objects.
-           
-9/19/2001: beazley
-           Fixed SF bug #459367.  Default constructors for classes
-           with pure virtual methods.
-
-9/19/2001: beazley
-           Fixed problem with default arguments and class scope.  For
-           example:
-
-               class Foo {
-               public:
-                  enum bar { FOO, BAR };
-                  void blah(bar b = FOO);
-                  ...
-               }
-
-           SWIG now correctly generates a default value of "Foo::FOO" for
-           the blah() method above.  This used to work in 1.1, but was
-           broken in 1.3.7.   Bug reported by Mike Romberg.
-
-Version 1.3.7  (September 3, 2001)
-==================================
-
-9/02/2001: beazley
-           Added special %ignore directive to ignore declarations.  This
-           feature works exactly like %rename.  For example:
-
-             %ignore  foo;        // Ignore all declarations foo
-             %ignore  ::foo;      // Only ignore foo in global scope
-             %ignore  Spam::foo;  // Only ignore in class Spam
-             %ignore  *::foo;     // Ignore in all classes
-
-           %ignore can also be parameterized.  For example:
-
-             %ignore foo(int);
-             %ignore ::foo(int);
-             %ignore Spam::foo(int);
-             %ignore *::foo(int);
-
-           *** NEW FEATURE ***
-            
-
-9/02/2001: cheetah (william fulton)
-           [Java] shadowcode pragma modified so that the code that is output 
-           in the shadow file is placed relative to where it is placed in the 
-           c/c++ code. This allows support for JavaDoc function comments. 
-
-9/01/2001: beazley
-           Fixed SF Patch [ #447791 ] Fix for python -interface option.
-           Submitted by Tarn Weisner Burton.
-
-9/01/2001: beazley
-           SWIG no longer generates default constructors/destructors
-           for a class if it only defines a private/protected constructor
-           or destructor or if any one of its base classes only has
-           private constructors/destructors.  This was reported in
-           SF Patch [ #444281 ] nonpublic/default/inhereted ctor/dtor
-           by Marcelo Matus.
-
-9/01/2001: beazley
-           Added patch to Perl5 module that allows constants to be
-           wrapped as constants that don't require the leading $.
-           This feature is enabled using the -const option.
-           Patch contributed by Rich Wales.
-           *** NEW FEATURE ***
-
-8/31/2001: beazley
-           Added parsing support for the 'volatile' type qualifier.
-           volatile doesn't mean anything to SWIG, but it is
-           needed to properly generate prototypes for declarations
-           that use it.  It's also been added to make the SWIG type
-           system more complete.
-           *** NEW FEATURE ***
-
-8/30/2001: beazley
-           Added support for parameterized %rename directive.  *** This
-           new feature can be used to greatly simplify the task of
-           resolving overloaded methods and functions. ***
-           
-           In prior versions of SWIG, the %rename directive was
-           used to consistently apply an identifier renaming. For 
-           example, if you said this:
-
-                %rename foo bar;
-
-           Every occurrence of 'foo' would be renamed to 'bar'. 
-           Although this works fine for resolving a conflict with a
-           target language reserved word, it is useless for
-           for dealing with overloaded methods.    This is because
-           all methods are simply renamed to the same thing 
-           (generating the same conflict as before).
-
-           Therefore, the only way to deal with overloaded methods
-           was to go through and individually rename them all using
-           %name.  For example:
-
-             class Foo {
-             public:
-                 virtual void bar(void);
-                 %name(bar_i) virtual void bar(int);
-                 ...
-             };
-
-           To make matters worse, you had to do this for all
-           derived classes too.
-
-             class Spam : public Foo {
-             public:
-                 virtual void bar(void);
-                 %name(bar_i) virtual void bar(int);
-                 ...
-             };
-
-           Needless to say, this makes it extremely hard to resolve
-           overloading without a lot of work and makes it almost
-           impossible to use SWIG on raw C++ .h files.
-
-           To fix this, %rename now accepts parameter declarators.
-           The syntax has also been changed slightly.  For example,
-           the following declaration renames all occurrences of 'bar(int)'
-           to 'bar_i', leaving any other occurrence of 'bar' alone.
-
-             %rename(bar_i) bar(int);
-
-           Using this feature, you can now selectively rename 
-           certain declarations in advance.  For example:
-
-             %rename(bar_i) bar(int);
-             %rename(bar_d) bar(double);
-
-             // Include raw C++ header    
-             %include "header.h"
-
-           When %rename is used in this manner, all occurrence of bar(int)
-           are renamed wherever they might occur.  More control is obtained
-           through explicit qualification. For example,
-
-              %rename(bar_i) ::bar(int);
-
-           only applies the renaming if bar(int) is defined in the global scope.
-           The declaration,
-     
-              %rename(bar_i) Foo::bar(int);
-
-           applies the renaming if bar(int) is defined in a class Foo.
-           This latter form also supports inheritance.  Therefore, if you
-           had a class like this:
-
-               class Spam : public Foo {
-               public:
-                   void bar(int);
-               }
-
-           The Spam::bar(int) method would also be renamed (since Spam 
-           is a subclass of Foo).   This latter feature makes it easy
-           for SWIG to apply a consistent renaming across an entire
-           class hierarchy simply by specifying renaming rules for
-           the base class.
-
-           A class wildcard of * can be used if you want to renaming
-           all matching members of all classes.  For example:
-
-              %rename(bar_i) *::bar(int);
-
-           will rename all members bar(int) that are defined in classes.
-           It will not renamed definitions of bar(int) in the global
-           scope.
-
-           The old use of %rename is still supported, but is somewhat
-           enhanced.  
-
-              %rename(foo) bar;      // Renames all occurrences of 'bar'.
-              %rename(foo) ::bar;    // Rename all 'bar' in global scope only.
-              %rename(foo) *::bar;   // Rename all 'bar' in classes only.
-              %rename(foo) Foo::bar; // Rename all 'bar' defined in class Foo.
-
-           *** NEW FEATURE ***
-
-8/30/2001: beazley
-           Added support for data-member to member-function 
-           transformation.  For example, suppose you had a
-           structure like this:
-
-                struct Vector {
-                    double x,y;
-                };
-
-           Now suppose that you wanted to access x and y 
-           through a member function interface instead 
-           of the usual SWIG behavior. For example:
-
-              f.set_x(3.4)      # instead of f.x = 3.4
-              x = f.get_x()     # instead of x = f.x
-
-           To do this, simply use the new %attributefunc
-           directive.  For example:
-
-              %attributefunc(get_%s,set_%s)
-              struct Vector {
-                 double x,y;
-              };
-              %noattributefunc
-
-           The arguments to %attributefunc are C-style printf
-           format strings that determine the naming convention
-           to use.  %s is replaced with the actual name of the
-           data member. SWIG provides a number of printf
-           extensions that might help.  For example, if you
-           wanted to title case all of the attributes, you
-           could do this:
-
-              %attributefunc(get%(title)s,set%(title)s);
-
-           This will turn an attribute 'bar' to 'getBar()' and 'setBar()'.
-
-           (someone requested this long ago, but I finally figured
-           how to implement it in a straightforward manner).
-           *** EXPERIMENTAL NEW FEATURE ***
-           
-8/30/2001: beazley
-           SWIG now automatically generates default constructors
-           and destructors if none are defined.  This used to be
-           enabled with a command line switch -make_default, but
-           most people want these functions anyways.  To turn
-           off this behavior use the -no_default option or include
-           the following pragma in the interface file:
- 
-                 %pragma no_default;
-  
-           This may break certain interfaces that defined their
-           own constructors/destructors using the same naming
-           convention as SWIG.  If so, you will get duplicate
-           symbols when compiling the SWIG wrapper file.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-8/29/2001: beazley
-           Changes to Perl5 shadow class code generation.  Iterators
-           are no longer supported (FIRSTKEY, NEXTKEY).  Also, attribute
-           access has been changed to rely on inheritance in order
-           to provide better behavior across modules.  
-
-8/28/2001: beazley
-           Various obscure improvements to the type system and classes.
-           Strange declarations like this are now wrapped correctly
-           (i.e., the generated wrapper code doesn't cause the C++
-            compiler to die with a type error).
-
-            class Foo {
-            public:
-                 typedef double Real;
-                 Real foo(Real (*op)(Real,Real), Real x, Real y);
-            };
-
-           Inheritance of types is also handled correctly.
-           
-8/28/2001: beazley
-           Changes to class wrappers.   When SWIG sees two classes like this,
- 
-           class X {
-           public:
-             void foo();
-             ...
-           }
- 
-           class Y : public X {
-           public:
-             void bar();
-             ...
-           }
- 
-           it now only generates two wrapper functions:
- 
-             X_foo(X *x) { x->foo(); }
-             Y_bar(Y *y) { y->bar(); }
- 
-           Unlike SWIG1.15, the foo() method does *not* propagate to a wrapper
-           function Y_foo(). Instead, the base class method X_foo() must be
-           used.
-
-           This change should not affect modules that use shadow classes, but
-           it might break modules that directly use the low-level C wrappers.
-           This change is being made for a number of reasons:
-
-               -  It greatly simplifies the implementation of SWIG--especially
-                  with anticipated future changes such as overloaded methods.
-
-               -  It results in substantially less wrapper code--especially
-                  for big C++ class hierarchies (inherited declarations
-                  are no longer copied into every single derived class).
-
-               -  It allows for better code generation across multiple
-                  SWIG generated modules (code isn't replicated in
-                  every single module).
-
-           *** POTENTIAL INCOMPATIBILITY ***                                    
-
-8/22/2001: cheetah (william fulton)
-           Provided some Windows documentation in the Win directory and some
-           Visual C++ project files for running examples on Windows.
-
-8/28/2001: mkoeppe
-	   [Guile] Handle renamed overloaded functions properly;
-	   thanks to Marc Zonzon <Marc.Zonzon@univ-rennes1.fr> for the
-	   patch.  See the new test case name_cxx.
-
-8/27/2001: mkoeppe
-	   [Tcl] Removed lots of warnings issued by the Sun Forte
-	   compilers, which were caused by mixing function pointers
-	   of different linkages (C++/C). 
-
-8/23/2001: mkoeppe
-	   Improved the MzScheme module by porting Guile's pointer
-	   type checking system and making type dispatch
-	   typemap-driven. 
-
-8/22/2001: beazley
-           Entirely new symbol table processing.   SWIG should be able to
-           report much better error messages for multiple declarations. 
-           Also, the new symbol table allows for overloaded functions
-           (although overloading isn't quite supported in the language
-           modules yet).
-
-8/22/2001: cheetah (william fulton)
-           * [Java] %new support added.
-           * [Java] Package JNI name refixed!
-
-8/19/2001: beazley
-           Python module modified to support pointers to C++ members.  This
-           is an experimental feature.
-           *** NEW FEATURE ***
-     
-8/19/2001: beazley
-           Added limited parsing and full type-system support for pointers to
-           members. None of SWIG's language modules really know how to deal with
-           this so this is really only provided for completeness and future
-           expansion.  Note: SWIG does not support pointers to members which 
-           are themselves pointers to members, references to pointers to members,
-           or other complicated declarations like this.
-           *** NEW FEATURE ***
-
-8/19/2001: beazley
-           SWIG is much better at parsing certain C++ declarations. Operators and
-           friends generally don't cause anymore syntax errors.  However, neither
-           are really supported.
-
-8/18/2001: beazley
-           Added *highly* experimental support for wrapping of C++
-           template declarations.  Since C++ templates are essentially
-           glorified macros and SWIG has a fully operational C 
-           preprocessor with macro support, the parser now converts
-           template declarations to macros.  For example, a function
-           template like this
-
-               template<class T> T max(T a, T b);
-
-           is internally converted into a macro like this:
-
-               %define %_template_max(__name,T)
-               %name(__name) T max(T a, T b);
-               %enddef
-
-           To instantiate a version of the template, a special %template declaration
-           is used like this:
-
-               %template(maxint) max<int>;          
-               %template(maxdouble) max<double>;
-
-           The parameter to the %template directive must be proper C identifier that's
-           used to uniquely name the resulting instantiation.   When used, the
-           the expanded macro looks like this:
-
-              %name(maxint) int max(int a, int b);
-              %name(maxdouble) double max(double a, double b);
-
-           A similar technique is used for template classes.   For instance:
-
-              template<class T> class vector {
-                 T *data;
-                 int sz;
-              public:
-                 vector(int nitems);
-                 T *get(int n);
-                 ...
-              };
-
-           Gets converted into a macro like this:
-
-              %define %_template_vector(__name, T)
-              %{
-              typedef vector<T> __name;
-              %}
-              class __name {
-                 T *data;
-                 int sz;
-              public:
-                 __name(int nitems);
-                 T *get(int n);
-                 ...
-              };
-              typedef __name vector<T>;
-              %enddef
-
-           An a specific instantiation is created in exactly the same way:
-
-             %template(intvec) vector<int>;
-
-           The resulting code parsed by SWIG is then:
-
-              %{
-              typedef vector<int> intvec;
-              %}
-              class intvec {
-                  int *data;
-                  int sz;
-              public:
-                  intvec(int nitems);
-                  int *get(int n);
-                  ...
-              };
-              typedef intvec vector<int>;
-
-           Note: the last typedef is non-standard C and is used by SWIG to provide
-           an association between the name "intvec" and the template type 
-           "vector<int>".
-
-           CAUTION:  This is an experimental feature and the first time SWIG has
-           supported C++ templates.   Error reporting is essential non-existent.
-           It will probably break in certain cases.
-           *** EXPERIMENTAL NEW FEATURE ****
-
-8/15/2001: beazley
-           Change to wrapping of multi-dimensional arrays.  Arrays
-           are now properly mapped to a pointer to an array of
-           one less dimension.  For example:
-
-                int [10];              -->  int *
-                int [10][20];          -->  int (*)[20];
-                int [10][20][30];      -->  int (*)[20][30];
-
-           This change may break certain SWIG extensions because
-           older versions simply mapped all arrays into a single
-           pointer such as "int *".   Although possibly unusual, 
-           the new version is correct in terms of the C type system.
-           *** POTENTIAL INCOMPATIBILITY ***
-    
-8/06/2001: cheetah (william fulton)
-           * [Java] Array setters generated for struct/class array members.
-
-8/13/2001: beazley
-           Many improvements to Tcl/Perl/Python modules to better
-           work with multiple interface files and the %import directive.
-
-8/13/2001: beazley
-           Fixed up the behavior of %import in the Python module.
-           SWIG no longer pollutes the module namespace by using
-           'from module import *' to refer to the other module. 
-           Instead, it does a proper 'import module'.   Also, SWIG
-           may work a lot better when importing modules that include
-           references to other imported modules.
-
-8/13/2001: mkoeppe
-	   Added new typemap substitutions, generalizing those of the
-	   Guile-specific 5/27/2001 changes: 
-	   * $descriptor is the same as SWIGTYPE$mangle, but also
-	     ensures that the type descriptor of this name gets
-	     defined.
-	   * $*type, $*ltype, $*mangle, $*descriptor are the same as
-	     the variants without star, but they REMOVE one level of
-	     pointers from the type. (This is only valid for pointer 
-	     types.)
-	   * $&type, $&ltype, $&mangle, $&descriptor are the same as
-	     the variants without ampersand, but they ADD one level of
-	     pointers to the type.
-	   The Guile-specific substitution $basedescriptor was removed
-	   because it was useless.
-
-8/12/2001: beazley
-           The %extern directive is now deprecated and withdrawn.  The
-           purpose of this directive was to import selected definitions
-           from other interface files and headers.  However, the same
-           functionality is better handled through %import.   This
-           leaves SWIG with two file inclusion directives:
-
-              %include filename     - Inserts into current interface
-              %import filename      - Import types and classes from 
-                                      another module
-
-           *** POTENTIAL INCOMPATIBILITY ***
-
-8/09/2001: beazley
-           Added new support for wrapping C/C++ callback functions. 
-           A common problem with some C libraries is that many
-           functions take a function pointer as an argument. For example:
-
-              int do_op(..., int (*op)(int,int), ...);
-
-           Unfortunately, the only way to call such a function is to
-           pass it a function pointer of some compatible type.  In
-           previous versions of SWIG, you had to solve this problem
-           with some really gross hacks.  For example, if you wanted to
-           use the following function as a callback,
-
-               int foo(int, int);
-
-           you had to install a pointer to it as a constant.  For example:
-
-               %constant int (*FOO)(int,int) = foo;
-
-           or 
-
-               const int (*FOO)(int,int) = foo;
-
-           or if you had a really old SWIG version:
-
-               typedef int (*OP_FUNC)(int,int);
-               int do_op(..., OP_FUNC, ...);
-               const OP_FUNC FOO = foo;
-
-           
-           Now, you can do one of two things:
-
-               %constant int foo(int,int);
-
-           This creates a constant 'foo' of type int (*)(int,int).
-           Alternatively, you can do this:
-
-               %callback("%s");
-               int foo(int,int);
-               int bar(int,int);
-               %nocallback;
-
-           In this case, the functions are installed as constants where
-           the name is defined by the format string given to %callback().
-           If the names generated by the format string differ from the
-           actual function name, both a function wrapper and a callback 
-           constant are created.  For example:
-
-               %callback("%(upper)s");
-               int foo(int,int);
-               int bar(int,int);
-               %nocallback;
-           
-           Creates two wrapper functions 'foo', 'bar' and additionally
-           creates two callback constants 'FOO', 'BAR'.
-
-           Note: SWIG still does not provide automatic support for 
-           writing callback functions in the target language.
-           *** NEW FEATURE ***
-
-8/06/2001: cheetah (william fulton)
-           * struct nesting fixes as per SF bug #447488.
-
-8/03/2001: beazley
-           The %name directive now applies to constants created with
-           #define and %constant.  However, most language modules
-           were never written to support this and will have to be
-           modified to make it work.  Tcl, Python, and Perl modules
-           are working now.
-           *** NEW FEATURE ***
-
-8/03/2001: beazley
-           Massive changes and simplification of C declaration parsing.
-           Although SWIG is still not a full C parser, its ability
-           to handle complex datatypes including pointers to functions
-           and pointers to arrays has been vastly improved.  
-
-8/03/2001: cheetah (william fulton)
-           * Distribution fixes: autoconf no longer needed to install SWIG.
-
-8/02/2001: beazley
-           Removed two undocumented parsing features.  SWIG no longer
-           supports out-of-class static function or variable
-           declarations.  For example:
-
-                static int Foo::bar;
-
-           This feature may return if there is sufficient demand. 
-           However, since SWIG is most often used with header files,
-           it is more likely for these definitions to be included
-           in the class definition.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-8/02/2001: cheetah (william fulton)
-	   * Cleanup of the GIFPlot examples. Upgraded Java GIFPlot example.
-
-8/01/2001: cheetah (william fulton)
-	   * [Java] Efficiency changes: _cPtr used where possible rather than
-	     getCPtr(). Bug fixes for inheritance - derived class sometimes
-	     didn't delete the c memory when _delete() was called.
-	   * [Java] Abstract c++ classes are wrapped with a java abstract shadow
-	     class. Also a pure virtual function is mapped with an abstract method.
-	   * The default output file has always been <module>_wrap.c. It is now
-	     <module>_wrap.cxx if the -c++ commandline option is passed to swig.
-	     This has been done as otherwise c++ code would appear in a c file.
-           *** POTENTIAL INCOMPATIBILITY *** 
-
-7/31/2001: beazley
-           Modified the %constant directive to be more C-like in syntax.
-           The syntax is now:
-
-                %constant NAME = VALUE;
-                %constant TYPE NAME = VALUE;
- 
-           For example:
-
-                %constant Foo *Bar = &Spam;
-
-           A more subtle case is as follows:
-
-               %constant int (*FOO)(int,int) = blah;
-
-           *** POTENTIAL INCOMPATIBILITY ***  Modules that were using
-           the %constant directive directly will need to be modified.
-      
-7/30/2001: beazley
-           Removed obscure and undocumented form of the %inline directive:
-
-               %inline int blah(int a, int b) {
-                  ...
-               }
-
-           *** POTENTIAL INCOMPATIBILITY *** 
-           (note: this feature was never documented and is withdrawn)
-
-7/30/2001: beazley
-           Removed support for functions with no explicitly declared
-           return type.  For example:
-
-                  foo(int);
-
-           In C, such functions were implicitly assumed to return an 'int'.
-           In C++, this is illegal.  Either way, it's considered bad
-           style.  Removing support for this in SWIG will simplify
-           certain issues in parsing.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-7/30/2001: mkoeppe
-	   * Partial merge from the CVS trunk.  The Source/DOH directory
-	     and most of the Source/Swig directory is up-to-date now.
-	   * [Guile] %scheme is now a macro for %insert("scheme").  
-	     New syntax:  %scheme "FILENAME"; 
-	     New syntax:  %scheme %{ SCHEME-CODE %}
-	     New macros %multiple_values, %values_as_list,
-	     %values_as_vector. 
-
-7/29/2001: beazley
-           %readonly and %readwrite have been turned into SWIG pragmas.
-           %pragma(swig) readonly and %pragma(swig) readwrite.  Macros
-           are used to provide backwards compatibility.
-
-7/29/2001: beazley
-           Minor changes to %pragma directive.  %pragma must always
-           be directed to a specific language.  For example:
-
-              %pragma(swig) make_default;
-              %pragma(perl5) include = "blah.i";
-
-           Also extended the pragma directive to allow code blocks
- 
-              %pragma(foo) code = %{
-                  ... some code ...
-              %}
-
-           *** POTENTIAL INCOMPATIBILITY ***
-
-7/29/2001: beazley
-           Change to the way 'const' variables are wrapped.  In 
-           previous versions of SWIG, a 'const' variable was
-           wrapped as a constant.   Now, 'const' variables are
-           wrapped as read-only variables.  There are several
-           reasons for making this change, mostly pertaining to
-           subtle details of how 'const' actually works. 
-
-           This will probably break old interfaces that used 'const'
-           to create constants.   As a replacement, consider using this:
-
-           const int a = 4;   ===>   %constant int a = 4;
-           *** POTENTIAL INCOMPATIBILITY ***
-
-7/29/2001: beazley
-           Reorganization and simplification of type parsing.
-           Types with 'const' should work correctly now.
-
-7/29/2001: beazley
-           Most swig directives related to the documentation system
-           are now deprecated.
-
-7/29/2001: beazley
-           Removed support for Objective-C in order to simplify
-           parser reconstruction.  Will return if there is sufficient
-           demand.
-           *** POTENTIAL INCOMPATIBILITY ***
-
-7/29/2001: beazley
-           Code inclusion has been modified in the parser.  A common
-           directive %insert is now used for everything.  This
-           inserts a file into the output:
-
-               %insert(header) "foo.swg"
-
-           This inserts some inline code into the output
-
-               %insert(header) %{
-                   ... some code ... 
-               %}
-
-           There are five predefined targets for the insert directive:
-
-               "header"    - Header section of wrapper file
-               "runtime"   - Runtime section of wrapper file
-               "wrapper"   - Wrapper section
-               "init"      - Initialization function
-               "null"      - Nothing. Discard.
-
-           The following directives are still supported, but are
-           now defined in terms of macros:
-
-               %{ ... %}           -> %insert(header)  %{ ... %}
-               %init %{ ... %}     -> %insert(init)    %{ ... %}
-               %wrapper %{ ... %}  -> %insert(wrapper) %{ ... %}
-               %runtime %{ ... %}  -> %insert(runtime) %{ ... %}
-
-           Language modules can define new named targets by using the
-           C API function Swig_register_filebyname() (see main.cxx).
-           For example, if you wanted to expose a shadow class file,
-           you could do this:
-
-              Swig_register_filebyname("shadow", f_shadow);
-
-           Then in the interface file:
-
-              %insert(shadow) %{ ... %}
-
-           Note: this change should not affect any old interfaces, but
-           does open up new possibilities for enhancements.
-
-7/29/2001: beazley
-           SWIG now always includes a standard library file 'swig.swg'.
-           This file defines a large number of macro definitions
-           that define the behavior of various SWIG directives.
-           Previously, all SWIG directives were handled as special
-           cases in the parser.  This made the parser a large 
-           bloated mess.  Now, the parser is stripped down to a few
-           simple directives and macros are used to handle everything else.
-
-7/26/2001: cheetah (william fulton)
-	   * Fixes for Sourceforge bug #444748 - new testcase cpp_static:
-	     [TCL] Class with just static member variable/function fix
-	     [Java] Fixed static variables support
-	     [Ruby] Static variables workaround removed
-
-7/27/2001: mkoeppe
-	   * stype.c (SwigType_default): Strip qualifiers first. The
-	     default type of "int * const" is now "SWIGPOINTER *".
-	   * main.cxx: Define "__cplusplus" in SWIG's preprocessor if
-	     in C++ mode.
-	   * [Guile]: Added some support for arrays and C++
-	     references, fixing the "constant_pointers" test case.
-	   * Moved most tests from the old Guile-specific test-suite
-	     to the new test-suite.  Also moved perl5/pointer-cxx
-	     example there.
-
-7/26/2001: cheetah (william fulton)
-	   * Test-suite added.
-	   * Initial testcases: constant_pointers cpp_enum defines
-	     sizeof_pointers unions virtual_destructor
-	   * Make clean improvements.
-
-7/24/2001: cheetah (william fulton)
-	   * [Java] Underscores in the package name and/or module name
-	   no longer give linking problems.
-
-7/17/2001: cheetah (william fulton)
-	   * More parser bug fixes for constant pointers
-
-7/19/2001: mkoeppe
-	   * [Guile] Aesthetic improvement in variable wrappers.
-
-7/18/2001: beazley
-           * Fixed core-dump problem in pointer library when 
-             freeing character arrays.
-             SF Bug [ #415837 ] pointer lib core dump
-
-7/18/2001: beazley
-           * Fixed problem with default destructors and shadow
-             classes.  SF bug #221128.
-
-7/18/2001: beazley
-           * To provide better line-number tracking in interfaces
-             with lots of macros, special locator comments are
-             now generated by the SWIG preprocessor.  For example:
-
-                 /*@foo.i,42,BLAH@*/expanded macro/*@@*/
-
-             The first /*@...@*/ sequence sets the context
-             to point to the macro code.  The /*@@*/ comment
-             terminates the context.  The SWIG parser should
-             ignore all of the locator comments as should
-             the C compiler (should such comments end up
-             in generated wrapper code).
-
-7/18/2001: mkoeppe
-	   * The parser now handles severely constified types in
-	   typemaps.  This introduced a new shift/reduce conflict, but
-	   only with a heuristic function-pointer catch-all rule.  
-	   * [Guile]: Added typemaps for severely constified types. 
-	   * Fixed the "template-whitespace" problem by canonicalizing
-	     whitespace, especially around angle brackets and commas. 
-
-7/17/2001: mkoeppe
-	   * [Guile]: A Scheme file is emitted if the -scmstub FILE.SCM
-	   command-line option is used.  The %scheme directive
-	   (implemented as a macro for a pragma) allows to insert
-	   arbitrary code here.  In "simple" and "passive" linkage,
-	   the file gets filled with define-module and export
-	   declarations.
-
-7/17/2001: cheetah (william fulton)
-	   * Parser bug fix to support constant pointers, eg int* const ptr.
-	   Fixed everywhere - variables, parameters, return types etc. Note that
-	   when wrapping a constant pointer variable only the getter is generated.
-
-7/17/2001: mkoeppe
-	   * Fixed SF bug #441470 (#define X "//" would not be parsed,
-	     see test-suite entry "preproc-1"), reported by T. W. Burton
-	     <twburton@users.sf.net>.
-	   * Changed the type of character constants to "char", rather
-	     than "char *".  Changed the individual language modules
-	     to keep the old behaviour, except for the Guile module,
-	     where it is desired to make them Scheme characters.  This
-	     fixes SF bug #231409, test-suite entry "char-constant".
-	   * Applied patch for DOH/Doh/memory.c by Les Schaffer
-	     <schaffer@optonline.net> (avoid required side effects in
-	     assert). 
-
-7/17/2001: cheetah (william fulton)
-	   * Bug fix in parser for virtual destructor with void as parameter
-	   * Bug fix in parser #defines embedded within classes/structs/unions
-	   Consequently %constant can now also be placed within a struct/class/union.
-	   * Bug fix in parser to allow sizeof(*I_am_a_pointer) within a #define
-
-7/16/2001: mkoeppe
-	   * Added changes for the Macintosh contributed by Luigi
-	   Ballabio <ballabio@mac.com>. 
-	   * Some "const" fixes in the code.
-	   * [Guile]: Made the constant-wrapper functions much shorter.
-
-7/13/2001: mkoeppe
-	   * [Guile]: Some "const" fixes for Guile version 1.3.4.
-	   * Handle anonymous arguments with default values and static
-	     array members of classes.  Both bugs reported by Annalisa Terracina
-	     <annalisa.terracina@datamat.it>; see the files
-	     Examples/guile/test-suite/static-array-member.i and
-	     anonymous-arg.i.
-
-Version 1.3.6  (July 9, 2001)
-=============================
-
-7/09/2001: cheetah (william fulton)
-	   * GIFPlot examples: FOREGROUND and BACKGROUND definition missing 
-	   after TRANSPARENT #define fix in GIFPlot
-
-7/03/2001: beazley
-           Fixed up the version numbers so that the release is known
-           as 1.3.6.  All future releases should have a similar
-           version format.
-
-7/02/2001: mkoeppe
-	   * [Python]: Prevent the problem of self.thisown not being
-	   defined if the C++ class constructor raised an exception.
-	   Thanks to Luigi Ballabio <ballabio@mac.com>.
-
-6/29/2001: mkoeppe
-	   * More portability fixes; fixed "gcc -Wall" warnings.
-
-6/29/2001: cheetah (william fulton)
-	   * GIFPlot examples: TRANSPARENT #define multiple times on Solaris 
-	   (clashes with stream.h).
-	   * Multiple definition bug fix for shadow classes. The perl and python 
-	   modules had workarounds which have been replaced with fixes in 
-	   the core. Many of the Language::cpp_xxxx functions now set a 
-	   flag which the derived classes can access through 
-	   is_multiple_definition() to see whether or not code should be 
-	   generated.  The code below would have produced varying degrees 
-	   of incorrect shadow class code for the various modules:
-	   class TestClass
-	   {
-	   public:
-	     TestClass() {}
-	     TestClass(int a) {}
-	     ~TestClass() {}
-	     unsigned long xyz(short k) {}
-	     unsigned long xyz(int n) {}
-	     static void static_func() {}
-	     static void static_func(int a) {}
-	   };
-	   void delete_TestClass(int a);
-
-6/27/2001: mkoeppe
-	   * [Perl] Another const-related portability fix.
-
-6/26/2001: cheetah (william fulton)
-	   * [Java] Added in cpp_pragma() support with a host of new pragmas - see 
-	   jswig.html. These are designed for better mixing of Java and c++. It 
-	   enables the user to specify pure Java classes as bases and/or interfaces 
-	   for the wrapped c/c++.
-	   * [Java] Old pragmas renamed. Warning given for the moment if used.
-          *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-6/25/2001: mkoeppe
-	   * Incorporated more build changes contributed by Wyss Clemens
-	   <WYS@helbling.ch> for swig/ruby on cygwin.
-
-6/20/2001: cheetah (william fulton)
-	   * Makefile mods so that 'make check' uses the swig options in the makefiles
-	   * [Java] Removed Generating wrappers message
-	   * [Java] NULL pointer bug fix
-	   * [Java] Bug fix for Kaffe JVM
-
-6/20/2001: mkoeppe
-	   * SWIG_TypeQuery from common.swg now returns a
-	   swig_type_info* rather than a void*.  This fixes a problem
-	   when using pointer.i and C++, as illustrated by the new
-	   test-suite example perl5/pointer-cxx.
-	   * Portability fixes (const char *). 
-	   * Incorporated build changes contributed by Wyss Clemens
-	   <WYS@helbling.ch>, which make swig runnable on cygwin.
-
-6/19/2001: cheetah (william fulton)
-	   * [Java] Bug fix for SF bug #211144. This fix is a workaround 
-	     until fixed in the core.
-
-6/19/2001: mkoeppe
-	   * [Guile]: Portability fixes for use with the Sun Forte
-	   compilers. 
-	   * [Tcl]: Portability fix (const char *).
-	   * [Tcl]: Configure now first tries to find a tclConfig.sh
-	   file in order to find the Tcl include directory, library
-	   location and library name.
-	   * [Python]: Added a few possible library locations.
-
-6/18/2001: mkoeppe
-	   * [Guile]: Don't call scm_c_export if nothing is to be
-	     exported.  Don't warn on %module if module has been set
-	     already (this frequently occurs when %import is used).
-
-6/16/2001: mkoeppe
-	   * [Guile]: New "passive" linkage, which is appropriate for
-	     multi-module extensions without Guile module magic.
-
-6/15/2001: mkoeppe
-	   * [Guile]: Fixed printing of smobs (space and angle were
-	     missing). 
-	   * Properly generate type information for base classes
-	     imported with the %import directive.  Thanks to Marcelo
-	     Matus <mmatus@acms.arizona.edu> for the report and the
-	     patch; this closes SF bug #231619; see also
-	     Examples/guile/test-suite/import*. 
-	   * [Guile]: Fix casting between class and base class; the
-	     runtime type system had it the wrong way around; see
-	     Examples/guile/test-suite/casts.i
-	   * Make typemaps for SWIGPOINTER * with arg name take
-	     precedence over those without arg name, to match normal
-	     typemap precedence rules.
-	   * Fixed the random-line-numbers problem reported as SF bug
-	     #217310; thanks to Michael Scharf <scharf@users.sf.net>.
-	   * [Guile]: Handle the %name and %rename directives.
-	   * New syntax: %name and %rename now optionally take double
-	     quotes around the scripting name.  This is to allow scripting
-	     names that aren't valid C identifiers.
-
-6/14/2001: beazley
-           Made a minor change to the way files are loaded in
-           order to get file/line number reporting correct in
-           the preprocessor.
-
-6/14/2001: mkoeppe
-	   * The parser now understands the (non-standard) "long long"
-	     types. It is up to the individual language modules to
-	     provide typemaps if needed. Reported by Sam Steingold, SF
-	     bug #429176.
-	   * The parser now understands arguments like "const int *
-	     const i". This fixes SF bug #215649.
-	   * Fixed the Guile test-suite.
-
-6/13/2001: mkoeppe
-	   Partial merge from the CVS trunk at tag
-	   "mkoeppe-merge-1". This covers the following changes:
-
-| 01/16/01: ttn
-|	   Wrote table of contents for Doc/engineering.html.  Added section
-|	   on CVS tagging conventions.  Added copyright to other docs.
-| 9/25/00 : beazley
-| 	   Modified the preprocessor so that macro names can start with a '%'.
-| 	   This may allow new SWIG "directives" to be defined as macros instead
-| 	   of having to be hard-coded into the parser.  
-|
-| *** Also a yet-to-be-documented quoting mechanism with backquotes
-| *** has been implemented?
-
-6/13/2001: mkoeppe
-	 * When configure does not find a language, don't use default
-	   paths like /usr/local/include; this only causes build
-	   problems.
-	 * New directory: Examples/Guile/test-suite, where a few
-	   bugs in 1.3a5 are demonstrated. 
-	 * Handle C++ methods that have both a "const" and a "throw"
-	   directive (see Examples/Guile/test-suite/cplusplus-throw.i); 
-	   thanks to Scott B. Drummonds for the report and the fix. 
-	 * Handle C++ pointer-reference arguments (like "int *& arg") 
-	   (see Examples/Guile/test-suite/pointer-reference.i,
-	   reported as SF bug #432224).
-	 * [Ruby] Fixed typo in rubydec.swg; thanks to Lyle Johnson!
-	 * Don't stop testing when one test fails.
-	 * [Guile, MzScheme] Don't print "Generating wrappers...".
-
-6/12/2001: mkoeppe
-	   [Guile] VECTORLENINPUT and LISTLENINPUT now have separate
-	   list length variables. TYPEMAP_POINTER_INPUT_OUTPUT
-	   attaches argument documentation involving SCM_TYPE to the
-	   standard pointer typemaps. INOUT is now an alias for BOTH.
-
-6/12/2001: cheetah (william fulton)
-	   Some Java documentation added.
-	   [Java] Fixed bugs in import pragma and shadow pragma. 
-
-6/12/2001: mkoeppe
-	   Fix declarations of SWIG_define_class
-	   (Lib/ruby/rubydec.swg) and SWIG_TypeQuery
-	   (Lib/common.swg). Thanks to Lyle Johnson
-	   <ljohnson@resgen.com> for the patches.
-
-6/11/2001: mkoeppe
-	   [Guile] Use long instead of scm_bits_t; this makes the
-	   generated wrapper code compatible with Guile 1.3.4
-	   again. Thanks to Masaki Fukushima for pointing this out.
-
-6/11/2001: cheetah (william fulton)
-	   The generic INSTALL file from autoconf added. Few changes to README file.
-
-6/11/2001: mkoeppe
-	   Fixed typo in Makefile.in; thanks to Greg Troxel
-	   <gdt@ir.bbn.com>. 
-
-6/08/2001: cheetah (william fulton)
-	   make check works again. Examples/GIFPlot configure generated by
-	   top level autoconf now.
-
-6/08/2001: mkoeppe
-	   Another build change: The new script autogen.sh runs
-	   autoconf in the appropriate directories.  The top-level
-	   configure also configures in Examples/GIFPlot.
-
-6/07/2001: mkoeppe
-	   Made the Makefile work with non-GNU make again.
-
-6/07/2001: cheetah (william fulton)
-	   [Java] Class/struct members that are arrays of pointers to classes/structs -
-	   Shadow class's get/set accessors now use Java classes instead of longs (pointers).
-	   [Java] Shadow classes will now clean up memory if function return type 
-	   is a class/struct.
-	   [Java] New example called reference based on the same example from other modules.
-
-6/06/2001: mkoeppe
-	   New configure option --with-release-suffix allows for
-	   attaching a suffix to the swig binary and the swig runtime
-	   libraries.  Minor changes to the build system.  "swig
-	   -swiglib" works again.  If invoked with the new option
-	   "-ldflags", SWIG prints a line of linker flags needed to
-	   link with the runtime library of the selected language
-	   module. 
-
-6/06/2001: mkoeppe
-	   [Guile] gswig_list_p is an int, not a SCM.  This typo
-	   caused warnings when compiling with a Guile configured with
-	   strict C type checking. In INPUT and BOTH typemaps
-	   generated by the SIMPLE_MAP macro, use the SCM_TO_C
-	   function to convert from Guile to C (rather than C_TO_SCM).
-	   Use scm_intprint to print pointers (rather than
-	   sprintf). Allow using "-linkage" instead of "-Linkage". 
-
-6/05/2001: cheetah (william fulton)
-	   [Java] Mods for using inherited c++ classes from Java
-	   [Java] New example called class based on the same example from other modules
-
-6/05/2001: cheetah (william fulton)
-	   [Java] destructor (_delete()) was not aware of %name renaming
-	   [Java] extends baseclass did not know about %name renaming
-	   [Java] extends baseclass did extend even when the baseclass was not known to swig
-	   [Java] sometimes enum-declarations occurred before the Java class declaration
-	   [Java] unrelated enum initialisations no longer appear in Java class
-	   [Java] if module ends in '_' correct JNI names are now produced
-
-6/04/2001: cheetah (william fulton)
-	   [Java] Shadow class mods - Modified constructor replaces
-	   newInstance(). _delete() now thread safe. getCPtr() replaces
-	   _self. _selfClass() removed as now redundant. 
-          *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-	   [Java] Not all output java files had SWIG banner. New banner.
-
-	   [Java] Shadow class finalizers are output by default: Command
-	   line option -finalize deprecated and replaced with -nofinalize.
-          *** POTENTIAL INCOMPATIBILITY FOR JAVA MODULE ***
-
-6/ 1/2001: mkoeppe
-	   [Guile] Cast SCM_CAR() to scm_bits_t before shifting it.
-	   This is required for compiling with a Guile configured with
-	   strict C type checking.  
-
-6/ 1/2001: mkoeppe
-	   Added configure option "--with-swiglibdir".
-
-5/31/2001: mkoeppe
-	   [Guile] Support multiple parallel lists or vectors in
-	   the typemaps provided by list-vector.i.  New typemaps file,
-	   pointer-in-out.i. 
-
-5/25/2001: cheetah (william fulton)
-	   [Java] HTML update for examples.
-
-5/28/2001: mkoeppe
-	   Minor changes to the build system.  Added subdirectory for
-	   Debian package control files.
-
-5/28/2001: mkoeppe
-	   [Guile] Build a runtime library, libswigguile.
-
-5/28/2001: mkoeppe
-	   [Guile] New typemap substitution $*descriptor.  Use the {}
-	   syntax, rather than the "" syntax for the standard
-	   typemaps, in order to work around strange macro-expansion
-	   behavior of the SWIG preprocessor.  This introduces some
-	   extra braces.
-
-5/27/2001: mkoeppe
-	   [Guile] Handle pointer types with typemaps, rather than
-	   hard-coded. New typemap substitutions $descriptor,
-	   $basedescriptor; see documentation. Some clean-up in the
-	   variable/constants wrapper generator code.  New convenience
-	   macro SWIG_Guile_MustGetPtr, which allows getting pointers
-	   from smobs in a functional style.  New typemap file
-	   "list-vector.i", providing macros that define typemaps for
-	   converting between C arrays and Scheme lists and vectors.
-
-5/25/2001: cheetah (william fulton)
-	   [Java] STL string moved into its own typemap as it is c++ code and 
-	   it break any c code using the typemaps.i file.
-	   - Fixes for wrappers around global variables - applies to primitive 
-	   types and user types (class/struct) and pointers to these.
-	   - Structure member variables and class public member variables getters 
-	   and setters pass a pointer to the member as was in 1.3a3 and 1.1 
-	   (1.3a5 was passing by value)
-	   - Parameters that were arrays and return types were incorrectly 
-	   being passed to create_function() as pointers.
-	   - Fix for arrays of enums. 
-	   [Java] Updated java examples and added two more.
-	   [Java] Java module updated from SWIG1.3a3 including code cleanup etc.
-	   [Java] enum support added.
-	   [Java] Array support implemented
-	   [Java] Shadow classes improved - Java objects used rather than 
-	   longs holding the c pointer to the wrapped structure/c++class
-
-5/22/2001: mkoeppe
-	   [Guile] Fixed extern "C" declarations in C++ mode. Thanks
-	   to Greg Troxel <gdt@ir.bbn.com>.
-
-5/21/2001: mkoeppe
-	   [Guile] New linkage "module" for creating Guile modules for
-	   Guile versions >= 1.5.0. 
-
-4/18/2001: mkoeppe
-	   [MzScheme] Added typemaps for passing through Scheme_Object
-	   pointers. 
-
-4/9/2001 : mkoeppe 
-	   [MzScheme] Added typemaps for `bool'.  Inclusion of headers
-	   and support routines is now data-driven via mzscheme.i.
-	   Headers come from the new file mzschemdec.swg.  Don't abort
-	   immediately when a type-handling error is reported.  When
-	   searching for typemaps for enums, fall back to using int,
-	   like the Guile backend does.  Support char constants.  Emit
-	   correct wrapper code for variables.
-
-3/12/2001: mkoeppe
-	   [Guile] Fixed typemaps for char **OUTPUT, char **BOTH.
-
-3/2/2001 : mkoeppe 
-	   [Guile] Every wrapper function now gets a boolean variable
-	   gswig_list_p which indicates whether multiple values are
-	   present. The macros GUILE_APPEND_RESULT, GUILE_MAYBE_VALUES
-	   and GUILE_MAYBE_VECTOR use this variable, rather than
-	   checking whether the current return value is a list. This
-	   allows for typemaps returning a list as a single value (a
-	   list was erroneously converted into a vector or a
-	   multiple-value object in this case).
-
-3/1/2001 : mkoeppe
-	   [Guile] Added support for returning multiple values as
-	   vectors, or passing them to a muliple-value
-	   continuation. By default, multiple values still get
-	   returned as a list.
-
-3/1/2001 : mkoeppe
-	   [Guile] Added a "beforereturn" pragma. The value of this
-	   pragma is inserted just before every return statement.
-
-3/1/2001 : mkoeppe
-	   [Guile] Added support for Guile 1.4.1 procedure
-	   documentation formats, see internals.html.
-
-2/26/2001: mkoeppe
-	   [Guile] Made the wrapper code compile with C++ if the
-	   "-c++" command-line switch is given.  Thanks to
-	   <monkeyiq@dingoblue.net.au>. 
-
-2/26/2001: mkoeppe
-	   [Guile] Now two type tables, swig_types and
-	   swig_types_initial, are used, as all other SWIG language
-	   modules do.  This removes the need for the tricky
-	   construction used before that the broken Redhat 7.0 gcc
-	   doesn't parse. Reported by <monkeyiq@dingoblue.net.au>. 
-
-2/26/2001: mkoeppe
-	   [Guile] Fixed typemaps for char *OUTPUT, char *BOTH; a bad
-	   free() would be emitted.  Added typemap for SCM.
-
-
-Version 1.3 Alpha 5 
-===================
-
-9/19/00 : beazley
-          [Python] Python module generates more efficient code for
-          creating the return value of a wrapper function. Modification
-          suggested by Jon Travis.
-
-9/19/00 : beazley
-          Library files specified with the -l option are now included at the
-          end of the interface file (reverting to the old behavior).
-
-9/19/00 : beazley
-          Fixed some problems with enum handling.  enums are now manipulated as
-          'int', but cast into the enum type when values are passed to the 
-          corresponding C function.
-
-9/19/00 : mkoeppe
-	  [Guile] Removed "-with-smobs" command-line option, as this is the
-	  default now.  Added "-emit-setters" command-line option,
-	  which turns on generating procedures-with-setters; see
-	  internals.html.
-
-9/18/00 : mkoeppe
-	  Incorporated patch #101430, fixing bugs in the Guile module: 
-	  1. Some arguments were erroneously taken as *optional* arguments when
-	     ignored arguments were present. 
-	  2. Guile 1.3.4 was not supported since functions introduced in Guile
-	      1.4 were used.	  
-	  3. Added handling of `const char *'.
-
-9/17/00 : beazley
-          Fixed problem with failed assertion and large files.
-
-9/17/00 : beazley
-          Fixed problem with the '%' character appearing in added methods
-          and function bodies.  Preprocessor bug.
-
-Version 1.3 Alpha 4 (September 4, 2000)
-=======================================
-
-9/3/00  : ttn
-          Added instructions for maintainers in Examples/README on how
-          to make examples also be useful in the testing framework.
-          Also, "make check" now uses ./Lib by via env var `SWIG_LIB'.
-          This is overridable like so:
-             make chk-swiglib=/my/experimental/swig/Lib check
-
-9/3/00  : beazley
-          Added $typemap variable to typemaps.  This gets replaced with
-          a string indicating the typemap that is applied.  Feature
-          request from rsalz.
-
-9/3/00  : beazley
-          Experimental optimization to code generation for virtual
-          member functions.  If you have two classes like this:
-
-                 class A() {
-                   virtual void foo();
-                 }
-
-                 class B() : public A {
-                   virtual void foo();
-                 }
-
-          Swig now will generate a single wrapper function for this
-
-                A_foo(A *a) {
-                    a->foo();
-                }
-
-          and use it as the implementation of both A_foo() and B_foo().
-          This optimization only takes place if both methods are declared
-          as virtual and both take identical parameters.
-          *** EXPERIMENTAL FEATURE ***
-
-9/3/00  : beazley
-          Restored the "memberin" typemap for setting structure members.
-          Unlike the old version, the new version is expanded inline in the
-          wrapper function allowing access to scripting language
-          internals (a sometimes requested feature). The "memberout" typemap
-          is gone. Use the "out" typemaps instead.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-9/3/00  : beazley
-          Attribute set methods no longer return the value of a member.
-          For example:
-
-               struct Foo {
-                    int x;
-                    ...
-               }
-
-          now gets set as follows:
-
-              void Foo_x_set(Foo *f, int x) {
-                    f->x = x;
-              }
-
-          In SWIG1.1 it used to be this:
-
-              int Foo_x_set(Foo *f, int x) {
-                   return (f->x = x);
-              }
-
-          This has been changed due to the complexity created by trying
-          to do this with more exotic datatypes such as arrays.  It also
-          complicates inlining and handling of the "memberin" typemap.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-9/2/00  : beazley
-          Removed the ptrcast() and ptrmap() functions from the
-          pointer.i library file.  Old implementation is incompatible
-          with new type system.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-9/2/00  : beazley
-          New runtime function SWIG_TypeQuery(const char *name) added.
-          This function can be used to extract the type info structure
-          that is used for type-checking.  It works with either the
-          nice C name or mangled version of a datatype.  For example:
-
-              swig_type_info *ty = Swig_TypeQuery("int *");
-              swig_type_info *ty = Swig_TypeQuery("_p_int");
-
-          This is an advanced feature that has been added to support some
-          exotic extension modules that need to directly manipulate
-          scripting language objects.
-          *** NEW FEATURE ***
-
-9/2/00  : beazley
-          New directive %types() added.  This is used to
-          explicitly list datatypes that should be included in
-          the runtime type-checking code. Normally it is never
-          necessary to use this but sometimes advanced extensions
-          (such as the pointer.i library) may need to manually
-          add types to the type-checker.
-          *** NEW FEATURE ***
-
-8/31/00 : beazley
-          Improved handling of string array variables. For example,
-          a global variable of the form "char name[64]" is automatically
-          managed as a 64 character string.  Previously this didn't
-          work at all or required the use of a special typemap.
-          *** NEW FEATURE (Tcl, Perl, Python) ***
-
-8/31/00 : ttn
-	  Added Makefile target `check-c++-examples', which uses new
-	  files under Examples/C++ contributed by Tal Shalif.  Now "make
-	  check" also does "make check-c++-examples".  Also, expanded
-	  actions in `check-gifplot-example' and `check-aliveness'.
-
-8/30/00 : mkoeppe
-	  Major clean-up in the Guile module. Added typemap-driven
-	  documentation system. Changed to handle more than 10
-	  args. Updated and extended examples.
-	  *** NEW FEATURE ***
-
-8/29/00 : beazley
-          Added new %insert directive that inserts the contents of a file
-          into a portion of the output wrapper file.  This is only intended
-          for use by writers of language modules.  Works as follows:
-
-               %insert(headers)  "file.swg";
-               %insert(runtime)  "file.swg";
-               %insert(wrappers) "file.swg";
-               %insert(init)     "file.swg";
-
-          *** NEW FEATURE ***
-
-8/29/00 : beazley
-          Added new %runtime directive which includes code into the runtime
-          portion of the wrapper code. For example:
-
-              %runtime %{
-                    ... some internal runtime code ...
-              %}
-
-          There is no practical reason for ordinary users to use this
-          feature (almost everything can be done using %{ ... %}
-          instead).   However, writers of language modules may want to
-          use this in language configuration files.
-          *** NEW FEATURE ***
-
-8/28/00 : beazley
-          Typemaps can now be specified using string literals like
-          this:
-
-              %typemap(in) int "$target = SvIV($source);";
-
-          When code is specified like this, it is *NOT* enclosed
-          inside a local scope (as with older typemap declarations).
-          Note: character escape sequences are interpreted in the
-          code string so if you want to include a quote or some
-          other special character, make sure you use a (\).
-          *** NEW FEATURE ***
-
-8/27/00 : beazley
-          Typemaps have been modified to follow typedef declarations.
-          For example, if you have this:
-
-              typedef int Number;
-
-              %typemap(in) int {
-                      ... get an integer ...
-              }
-
-              void foo(Number a);
-
-          The typemap for 'int' will be applied to the argument 'Number a'.
-          Of course, if you specify a typemap for 'Number' it will take
-          precedence (nor will it ever be applied to an 'int').
-          *** POTENTIAL INCOMPATIBILITY ***
-
-8/27/00 : beazley
-          Default typemap specification has changed.   In older
-          versions of swig, you could do this:
-
-               %typemap(in) int SWIG_DEFAULT_TYPE {
-                   ...
-               }
-
-          To specify the default handling of a datatype.   Now that
-          SWIG follows typedef declarations, this is unnecessary.
-          Simply specifying a typemap for 'int' will work for all
-          variations of integers that are typedef'd to 'int'.
-
-          Caveat, specifying the default behavior for pointers,
-          references, arrays, and user defined types is a little
-          different.  This must be done as follows:
-
-               %typemap() SWIGPOINTER * {
-                      ... a pointer ...
-               }
-               %typemap() SWIGREFERENCE & {
-                      ... a reference ...
-               }
-               %typemap() SWIGARRAY [] {
-                      ... an array ...
-               }
-               %typemap() SWIGTYPE {
-                      ... a user-defined type (by value) ...
-               }
-          *** POTENTIAL INCOMPATIBILITY ***
-
-8/15/00 : dustin
-          The file swig-1.3a1-1.spec has been added to the Tools directory.
-          It can be used to build a redhat package for SWIG, although it
-          will need to be updated for the next public release.
-
-8/15/00 : beazley
-          Typemaps have been completely rewritten.  Eventually they may be
-          replaced with something better, but for now they stay.  However,
-          there are a number of a significant changes that may trip some
-          people up:
-
-          1.  Typemap scoping is currently broken.  Because of this, the
-              following code won't work.
-
-              %typemap(in) blah * {
-                   ...
-              }
-              class Foo {
-                   ...
-                   int bar(blah *x);
-              }
-              %typemap(in) blah *;   /* Clear typemap */
-
-              (this breaks because the code for the class Foo is actually
-              generated after the entire interface file has been processed).
-              This is only a temporary bug.
-
-          2.  In SWIG1.1, the %apply directive worked by performing a
-              very complex type-aliasing procedure.  From this point on,
-              %apply is simply a generalized typemap copy operation.
-              For example,
-
-                  %apply double *OUTPUT { double *x, double *y };
-
-              Copies *ALL* currently defined typemaps for 'double *OUTPUT' and
-              copies them to 'double *x' and 'double *y'.
-
-              Most people probably won't even notice this change in
-              %apply.  However, where it will break things is in code like
-              this:
-
-                  %apply double *OUTPUT { double *x };
-                  %typemap(in) double *OUTPUT {
-                       ... whatever ...
-                  }
-
-                  void foo(double *x);
-
-              In SWIG1.1, you will find that 'foo' uses the 'double *OUTPUT' rule
-              even though it was defined after the %apply directive (this is
-              the weird aliasing scheme at work).  In SWIG1.3 and later,
-              the 'double *OUTPUT' rule is ignored because it is defined
-              after the %apply directive.
-
-          3.  The %clear directive has been modified to erase all currently
-              defined typemaps for a particular type.  This differs from
-              SWIG1.1 where %clear only removed rules that were added using
-              the %apply directive.
-
-          4.  Typemap matching is now performed using *exact* types.
-              This means that things like this
-
-                   %typemap(in) char * { }
-                   %typemap(in) const char * { }
-
-              are different typemaps.    A similar rule applies for pointers,
-              arrays, and references.  For example:
-
-                   %typemap(in) double * { }
-
-              used to apply to 'double &', 'double []',  Now, it only applies
-              to 'double *'.  If you want a 'double &', you'll need to handle
-              that separately.
-
-          5.  Array matching has been simplfied.  In SWIG1.1, array matching
-              was performed by trying various combinations of dimensions.
-              For example, 'double a[10][20]' was matched as follows:
-
-                   double [10][20]
-                   double [ANY][20]
-                   double [10][ANY]
-                   double [ANY][ANY]
-
-              In SWIG1.3, only the following matches are attempted:
-
-                   double [10][20]
-                   double [ANY][ANY]
-
-          On the positive side, typemap matching is now *significantly* faster
-          than before.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-8/15/00 : beazley
-          Secret developer feature.  Since datatypes are now represented as 
-          strings internally, you can bypass limitations of the parser and
-          create a wild datatype by simply enclosing the raw string encoding
-          in backticks (``) and sticking it in the interface file anywhere a
-          type is expected.  For example, `a(20).a(10).p.f(int,int)`.  This 
-          feature is only intended for testing (i.e., you want to see what
-          happens to your language module if it gets a reference to a pointer
-          to an array of pointers to functions or something). 
-          *** SICK HACK ***
-
-8/14/00 : beazley
-          Completely new type-system added to the implementation.
-          More details later.
-
-8/11/00 : beazley
-          Cleaned up some of the I/O handling.  SWIG no longer generates
-          any temporary files such as _wrap.wrap, _wrap.ii, _wrap.init.
-          Instead, these "files" are kept around in memory as strings
-          (although this is transparent to language modules).
-
-8/4/00  : ttn
-	  Added Makefile target "check" and variants.
-	  This can be used like "make check" or, to explicitly skip a
-	  language LANG: "make skip-LANG=true check".  LANG is skipped
-	  automatically if ./configure determines that LANG support is
-	  insufficient.
-
-	  Currently, the check is limited to doing the equivalent of
-	  "make all" in some of the Examples directories.  This should
-	  be expanded both horizontally (different types of tests) and
-	  vertically (after "make all" in an Examples subdir succeeds,
-	  do some additional tests with the resulting interpreter, etc).
-
-8/4/00  : ttn
-	  Added Makefile target "distclean", which deletes all the
-	  files ./configure creates, including config.status and friends.
-
-8/3/00  : harcoh
-	  java changes??? [todo: document changes]
-
-7/23/00 : beazley
-          Typemaps have been modified to key off of the real datatypes
-          used in the interface file.  This means that typemaps for
-          "const char *" and "char *" will be difference as will typemaps
-          for "Vector" and "Vector *."
-          *** POTENTIAL INCOMPATIBILITY ***
-          This is likely to break interfaces that rely on the odd type
-          handling behavior of typemaps in SWIG1.1--especially with
-          respect to interfaces involving pass-by-value.
-
-7/23/00 : beazley
-          New %constant directive.  This directive can be used to
-          create true constants in the target scripting language.
-          It's most simple form is something like this:
-
-             %constant FOO 42;
-
-          In this case, the type is inferred from the syntax of the
-          value (in reality, all #define macros are translated into
-          directives of this form).
-
-          An expanded version is as follows:
-
-            %constant(Foo *) FOO = &FooObj;
-
-          In this case, an explicit type can be specified.  This
-          latter form may be useful for creating constants that
-          used to be specified as
-
-             const Foo *FOO = &FooObj;
-
-          (which are now treated as variables).
-          *** EXPERIMENTAL FEATURE *** The syntax may change in
-          the final release.
-
-7/23/00 : beazley
-          Modified the parser so that variable declarations of the form
-          "const type *a" are handled as variables, not constants.
-          Note: SWIG1.1 handled this case erroneously because
-          const char *a is a pointer variable that can be reassigned.
-          *** POTENTIAL INCOMPATIBILITY ***
-          Note: just because this is the "right" way to do things,
-          doesn't mean it's the most appropriate interpretation.
-          I suspect that many C programmers might use 'const char *'
-          with the intent of creating a constant, without realizing
-          that they've created a reassignable global variable.
-
-7/23/00 : beazley
-          The C/C++ wrapping layer has been completely redesigned and
-          reimplemented.  This change should iron out a few rough
-          spots with the handling of datatypes.  In addition, the
-          wrapper code is somewhat cleaner.
-          *** POTENTIAL INCOMPATIBILITY ***
-          This change may break interfaces that involve
-          subtle corner-cases with typemaps and the %addmethods
-          directive since some of these features had somewhat
-          type handling behavior in SWIG1.1.
-
-7/23/00 : beazley
-          The "memberin" and "memberout" typemaps are gone for the
-          moment, but they might return as soon as I figure out
-          how to integrate them with some of the streamlined C wrapper
-          functions.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-7/22/00 : beazley
-          A variety of old type handling functions such as print_type(),
-          print_full(), print_mangle(), etc... are gone and have been
-          replaced with a smaller set of functions.  See the file
-          Doc/internals.html for details.  This will break all third
-          party language modules.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-7/20/00 : beazley
-          Deprecated the %val and %out directives.  These directives
-          shouldn't really be necessary since typemaps can be used
-          to achieve similar results.   This also cleans up the
-          handling of types and parameters quite a bit.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-7/20/00 : ttn
-	  Fixed unspecified-module bug in Guile support and removed
-	  more non-"with-smobs" functionality using patches submitted
-	  by Matthias Koeppe.
-
-	  Re-enable recognition of "-with-smobs" (with no effect since
-	  we use smobs by default now) for the time being.  After the
-	  1.3a4 release, this option will signal an error.
-
-7/17/00 : ttn
-	  Fixed NULL-input bug in parameter list handling.
-	  Reported by Matthias Koeppe.
-
-7/12/00 : beazley
-          Fixed memory leak in Python type-checking code. Reported by
-          Keith Davidson.  Bug #109379.
-
-7/10/00 : beazley
-          Changed internal data structures related to function parameters.
-
-7/10/00 : beazley
-          Fixed some bugs related to the handling of the %name() directive
-          and classes in the Tcl module. Problem reported by James Bailey.
-
-7/10/00 : beazley
-          Fixed parsing and enum handling problems with character constants.
-          Reported by Greg Kochanski.
-
-7/10/00 : beazley
-          Removed WrapperFunction class from the core and updated the language
-          module.  This will break third party modules.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-7/9/00  : beazley
-          Implementation of SWIG no longer makes use of C++ operator overloading.
-          This will almost certainly break *all* third party language modules
-          that are not part of the main SWIG CVS tree. Sorry.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-7/8/00  : beazley
-          Removed the experimental and undocumented "build" typemap that
-          was intended to work with multiple arguments. Simply too weird
-          to keep around.  Besides, a better replacement is in the works.
-
-7/6/00  : ttn
-          Removed non-"with-smobs" functionality (Guile support), i.e.,
-          "-with-smobs" is now the default and no longer needs to be
-	  specified on the command-line.
-
-7/5/00  : ttn
-          Incorporated Ruby support contributed by Masaki Fukushima.
-
-6/28/00 : ttn
-          Applied more-than-10-args bugfix patch contributed
-	  by Matthias Koeppe.
-
-6/27/00 : beazley
-          Rewrote some of the string handling and eliminated the C++
-          implementation (which is now just a wrapper).
-
-6/27/00 : ttn
-          Added Doc/index.html and Doc/internals.html.  The target
-          audience for the latter is new SWIG developers.
-
-
-Version 1.3 Alpha 3 (June 18, 2000)
-===================================
-
-6/18/00 : beazley
-          Removed the naming.cxx, hash.cxx, and symbol.cxx files from
-          the SWIG1.1 directory.   Continued to migrate things away
-          from the C++ base (although there's still a lot of work to do).
-
-6/17/00 : beazley
-          Added a few more examples to the Examples directory.  Still
-          need to do a lot of work on this.
-
-6/16/00 : beazley
-          Added -includeall to follow all #include statements in the
-          preprocessor.
-
-6/15/00 : beazley
-          Tried to fix as many C++ warnings as possible when compiling
-          with the Sun Workshop C++ compiler.  Unfortunately, this means
-          that there are a lot of statements that contain string literals
-          of the form (char*)"Blah".
-
-6/15/00:  beazley
-          A variety of cleanup and performance optimization in the
-          low-level DOH library.   This seems to result in a speedup
-          of 50-100% for preprocessing and other related tasks.
-
-5/10/00 : ttn
-	  Applied variable-wrapping bugfix patch contributed
-	  by Matthias Koeppe.
-
-4/17/00 : ttn
-	  Updated MzScheme support contributed by Oleg Tolmatcev.
-	  We now use a `Scheme_Type'-based structure to wrap pointers.
-
-4/11/00 : ttn
-	  Incorporated further Guile-support patch by Matthias Koeppe.
-	  Typemaps previously deleted have been re-added.  There is now
-	  exception handling (see Doc/engineering.html).  `SWIG_init' is now
-	  declared extern only for simple linkage.  Some bugs were fixed.
-
-4/06/00 : ttn
-	  Incorporated MzScheme support contributed by Oleg Tolmatcev.
-	  This includes new directories Lib/mzscheme and Examples/mzscheme.
-
-4/03/00 : ttn
-	  Added Examples/guile and children.  This is an adaptation of
-	  the same-named directory from the SWIG-1.1p5 distribution.
-	  Added Guile-specific section to Doc/engineering.html.
-
-4/02/00 : ttn
-	  Incorporated new guilemain.i by Martin Froehlich.
-	  Incorporated Guile-support rewrite patch by Matthias Koeppe.
-	  The command line option "-with-smobs" enables implementation of
-	  pointer type handling using smobs, the canonical mechanism for
-	  defining new types in Guile.  Previous implementation (using
-	  strings) is at the moment still supported but deprecated.  At
-	  some point, "-with-smobs" will be the default and no longer
-	  required.
-
-3/13/00 : beazley
-          Added purify patches submitted by Ram Bhamidipaty.
-
-3/02/00 : ttn
-          Added support for different Guile "linkage" schemes.
-	  Currently, "-Linkage hobbit" works.
-
-
-Version 1.3 Alpha 2 (March 1, 2000)
-===================================
-
-2/29/00 : beazley
-          Made SWIG ignore the 'mutable' keyword.
-
-2/29/00 : beazley
-          Incorporated some patches to the Perl5 module related to
-          the -hide option and the destruction of objects.
-          Patch submitted by Karl Forner.
-
-2/27/00 : ttn
-	  Incorporated Guile support contributed by Matthias Koeppe.
-	  This includes a cpp macro in Lib/guile/guile.swg and the
-	  entire file Lib/guile/typemaps.i.
-
-2/25/00 : ttn
-	  Modified configure.in and Makefile.in files to support
-	  non-local build (useful in multi-arch environments).
-
-2/24/00 : ttn
-	  Incorporated Guile support contributed by Clark McGrew.
-	  This works with Guile 1.3, but since it depends heavily
-	  on the gh_ interface, it should work for all later versions.
-	  It has not been tested with versions before 1.3.
-	  WARNING: Code is unstable due to experimentation by ttn.
-
-2/16/00 : beazley
-          A variety of performance improvements to the Python shadow
-          class code generation.  Many of these result in substantial
-          runtime performance gains.  However, these have come at
-          a cost of requiring the use of Python 1.5.2.  For older
-          versions, use 'swig -noopt -python' to turn off these
-          optimization features.
-
-Version 1.3 Alpha 1 (February 11, 2000)
-=======================================
-
-2/11/00 : Added 'void' to prototype of Python module initializer.
-          Reported by Mark Howson (1/20/00).
-
-2/11/00 : beazley
-          Modified the Python shadow class code to discard ownership of an
-          object whenever it is assigned to a member of another object.
-          This problem has been around for awhile, but was most recently
-          reported by Burkhard Kloss (12/30/99).
-
-2/11/00 : beazley
-          Added braces around macros in the exception.i library.  Reported
-          by Buck Hodges (12/19/99)
-
-2/11/00 : beazley
-          Fixed bug in the constraints.i library. Reported by Buck
-          Hodges (12/14/99)
-
-2/11/00 : beazley
-          The %native directive now generates Tcl8 object-style command calls.
-          A full solution for Tcl7 and Tcl8 is still needed. Patch suggested
-          by Mike Weiblen (11/29/99)
-
-2/11/00 : beazley
-          Modified the typemap code to include the $ndim variable for arrays.
-          Patch provided by Michel Sanner (11/12/99).
-
-2/11/00 : beazley
-          Modified the Python module to raise a Runtime error if an attempt
-          is made to set a read-only member of a shadow class.  Reported by
-          Michel Sanner (11/5/99).
-
-2/10/00 : The documentation system has been removed. However, it is likely
-          to return at some point in the future.
-
-2/1/00  : Added a number of performance enhancements to the Python shadow
-          classing and type-checking code.  Contributed by Vadim Chugunov.
-
-          1. Remove _kwargs argument from the shadow wrappers when -keyword
-             option is not specified. This saves us a construction of keyword
-             dictionary on each method call.
-
-             def method1(self, *_args, **_kwargs):
-                 val = apply(test2c.PyClass1_method1, (self,) + _args, _kwargs)
-                 return val
-
-             becomes
-
-             def method1(self, *_args):
-                 val = apply(test2c.PyClass1_method1, (self,) + _args)
-                 return val
-
-          2. Incorporate self into the _args tuple.  This saves at least one tuple
-             allocation per method call.
-
-             def method1(self, *_args):
-                 val = apply(test2c.PyClass1_method1, (self,) + _args)
-                 return val
-
-             becomes
-
-             def method1(*_args):
-                 val = apply(test2c.PyClass1_method1, _args)
-                 return val
-
-          3. Remove *Ptr classes.
-             Assume that we are SWIGging a c++ class CppClass.
-             Currently SWIG will generate both CppClassPtr class
-             that hosts all methods and also CppClass that is derived
-             from the former and contains just the constructor.
-             When CppClass method is called, the interpreter will try
-             to find it in the CppClass's dictionary first, and only then
-             check the base class.
-
-             CppClassPtr functionality may be emulated with:
-
-             import new
-             _new_instance = new.instance
-             def CppClassPtr(this):
-                  return _new_instance(CppClass, {"this":this,"thisown":0})
-
-             This saves us one dictionary lookup per call.
-
-             <DB>The new module was first added in Python-1.5.2 so it
-             won't work with older versions.  I've implemented an
-             alternative that achieves the same thing</DB>
-
-          4. Use CObjects instead of strings for pointers.
-
-          Dave: This enhancements result in speedups of up to 50% in some
-          of the preliminary tests I ran.
-
-2/1/00  : Upgraded the Python module to use a new type-checking scheme that
-          is more memory efficient, provides better performance, and
-          is less error prone. Unfortunately, it will break all code that
-          depends on the SWIG_GetPtr() function call in typemaps.
-          These functions should be changed as follows:
-
-                if (SWIG_GetPtr(string,&ptr,"_Foo_p")) {
-                    return NULL;
-                }
-
-          becomes
-
-                if (SWIG_ConvertPtr(pyobj, &ptr, SWIG_TYPE_Foo_p) == -1) {
-                    return NULL;
-                }
-
-          Note: In the new implementation SWIG_TYPE_Foo_p is no longer
-          a type-signature string, but rather an index into a type
-          encoding table that contains type information.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-1/30/00 : loic
-	  Conditionally compile experimental code with --enable-experiment
-	  configure flag.
-	  Fix .cvsignore to ignore configure & yacc generated files
-
-1/28/00 : loic
-	  Apply automake everywhere
-	  Keep configure scripts so that people are not *forced* to autoconf
-          Keep sources generated by yacc so that compilation without yacc
-	  is possible.
-	  Source/LParse/cscanner.c: change lyacc.h into parser.h to please
-	  default yacc generation rules.
-	  Use AC_CONFIG_SUBDIRS in configure.in instead of hand made script.
-	  Update all relevant .cvsignore to include .deps
-	  Fixed missing ; line 136 Source/Swig/swig.h
-
-1/13/00 : beazley
-          Fixed a number of minor end-of-file parsing problems in the
-          preprocessor.
-
-1/13/00 : beazley
-          Added -freeze option that forces SWIG to freeze upon exit.
-          This is only used as a debugging tool so that I can more
-          easily examine SWIG's memory footprint.
-
-1/13/00 : beazley
-          Added patch to guile module for supporting optional arguments
-          Patch contributed by Dieter Baron.
-
-1/13/00 : loic
-	  Added .cvsignore, Examples/.cvsignore, Source/DOH/Doh/.cvsignore
-	  Source/SWIG1.1/main.cxx: Fixed -I handling bug
-	  Source/Modules1.1/java.cxx: fixed char* -> const char* warnings that are
-	  errors when compiling with gcc-2.95.2
-	  Source/SWIG1.1/main.cxx: cast const char* to char* for String_replace
-	  token and rep should really be const.
-
-1/12/00 : beazley
-          Added Harco's Java modules.
-
-1/12/00 : beazley
-          Revoked the %ifdef, %ifndef, %endif, %if, %elif, and %else
-          directives.  These are no longer needed as SWIG now has a real
-          preprocessor.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-1/12/00 : beazley
-          Moved the documentation modules from the SWIG directory
-          to the Modules directory (where they really should have been
-          to begin with).
-
-1/12/00 : beazley
-          Removed the -stat option for printing statistics. The
-          statistics reporting was inadequate and mostly broken
-          anyway.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-1/12/00 : beazley
-          Removed the -t option for reading a typemap file.  More
-          trouble than it's worth.  Just include typemaps at the top
-          of the interface file.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-1/12/00 : beazley
-          Removed the %checkout directive.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-1/12/00 : beazley
-          Removed the -ci option for file checkin.   Too problematic
-          to implement.  Probably better to just put your SWIG library
-          under CVS instead.
-          *** POTENTIAL INCOMPATIBILITY ***.
-
-1/11/00 : beazley
-          Deleted the LATEX module.  Sorry... Didn't know anyone
-          who was using it.  Besides, I'm looking to simplify
-          the documentation system.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-1/11/00 : beazley
-          Modified the ASCII documentation module to use a .txt
-          suffix for its output file instead of .doc.
-
-1/11/00 : beazley
-          Added the long-lost SWIG preprocessor back to the system.
-          It should be enabled by default.  Raw preprocessed output
-          can be viewed using swig -E file.i.
-          *** NEW FEATURE ***
-
-1/11/00 : beazley and djmitche
-          Completely reorganized the SWIG directory structure.  The
-          basic organization is now:
-
-                Source/         SWIG source code
-                Lib/            SWIG library files (swig_lib)
-                Doc/            Documentation
-                Examples/       Examples
-
-          More directories will be added as needed.
-
-12/08/99: Loic Dachary (loic@senga.org)
-	  Enhanced package handling for perl5 and c++.
-
-	  With new option -hide Foo::Bar, every perl5 object (Frob) is
-	  qualified by Foo::Bar::Frob. The package name is solely used
-	  to encapsulate C/C++ wrappers output in <module>_wrap.c and the
-	  corresponding perl package in <module>.pm. Note that a package
-	  name may contain :: (Frob::Nitz) and will be relative to the
-	  package name provided by -hide (Foo::Bar::Frob::Nitz).
-
-	  In *_wrap.c, SWIG_init macro is used. Was previously defined
-	  but not used and simplifies code.
-
-	  Added typemap(perl5,perl5in) and typemap(perl5,perl5out) that
-	  do the equivalent of typemap(perl5,in) and typemap(perl5,out)
-	  but contain perl code and applies to wrappers generated by
-	  -shadow.
-
-	  Lacking proper regression tests I used
-	  Examples/perl5/{c++,constraint,defarg,except,
-	  graph/graph[1234],multinherit,nested,shadow,simple,tree,
-	  typemaps/{argv,argv2,arraymember,database,file,ignore,integer,
-	  output,passref,reference,return}}/. I ran swig with and without
-	  the patches, diff the generatedsources, run the .pl files
-	  and checked that the results are identical. In all those examples
-	  I had no error.
-
-11/21/99: Modified the Tcl module to provide full variable linking capabilities
-          to all datatypes.   In previous versions, a pair of accessor functions
-          were created for datatypes incompatible with the Tcl_LinkVar() function.
-          Now, we simply use variable traces to support everything. This may
-          break scripts that rely upon the older behavior.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-11/21/99: Added slight tweak to wrapper generator to collect local variables
-          of similar type.  Produces somewhat more compact wrapper code.
-
-11/20/99: Modified the Tcl module to use SWIG_GetArgs() to parse
-          arguments.    This is a technique borrowed from Python in which
-          arguments are converted using a format string convention similiar
-          to fprintf().   This results in a *substantial* reduction in the
-          size of the resulting wrapper code with only a modest runtime overhead
-          in going through the extra conversion function.
-
-11/13/99: Completely rewrote the class/structure generation code for the
-          Tcl module.  Now, a small set of runtime functions are used
-          to implement the functionality for all classes (instead of a
-          massive amount of runtime code being generated for each class).
-          Class specific information is simply encoded in a series of
-          static tables.   This results in a *HUGE* reduction in wrapper
-          code size--especially for C++.
-
-11/13/99: Removed the -tcl (Tcl 7.x) module.  Tcl 8.0 is now several
-          years old and the defacto standard--no real reason to keep
-          supporting the old version at this point.
-
-11/13/99: Cleaned up -c option for Python module.  The pyexp.swg file
-          is now gone.
-
-11/13/99: Fixed external declarations to work better with static linking
-          on Windows.  Static linking should now be possible by defining
-          the -DSTATIC_LINK option on the command line.  Patch contributed
-          by Alberto Fonseca.
-
-11/5/99 : Fixed an obscure code generation bug related to the generation
-          of default constructors.   Bug reported by Brad Clements.
-
-11/5/99 : Fixed a few memory problems found by purify.
-
-11/5/99 : Officially deprecated the -htcl, -htk, and -plugin options
-          from the Tcl and Tcl8 modules.
-
-10/26/99: Removed unused variable from python/typemaps.i.  Patch
-          contributed by Keith Davidson.
-
-8/16/99 : Added _WIN32 symbol to libraries to better support Windows.
-
-8/16/99 : Deprecated the Perl4 module.   It is no longer included in the
-          distribution and no longer supported.  In the entire 3 years SWIG
-          has been around I never received a single comment about it so I'm
-          assuming no one will miss it...
-
-8/16/99 : Modified the type-checking code to register type mappings using a
-          table instead of repeated calls to SWIG_RegisterMapping().  This
-          reduces the size of the module initialization function somewhat.
-
-8/15/99 : Cleaned up the pointer type-checking code in the Tcl module.
-
-8/15/99 : Many changes to the libraries to support runtime libraries.
-
-8/13/99 : Eliminated C++ compiler warning messages about extern "C" linkage.
-
-8/13/99 : Some cleanup of Python .swg files to better support runtime libraries
-          on Windows.
-
-8/13/99 : Modified the %pragma directive to attach pragmas declared inside
-          a class definition to the class itself. For example:
-
-               class foo {
-                    ...
-                    %pragma(python) addtomethod = "insert:print `hello world'"
-                    ...
-               }
-
-          Most people don't need to worry about how this works.  For people
-          writing backend modules, class-based pragmas work like this:
-
-              lang->cpp_open_class()             // Open a class
-              lang->cpp_pragma()                 // Supply pragmas
-              ...                                // Emit members
-
-              lang->cpp_close_class()            // Close the class
-
-          All of the pragmas are passed first since they might be used to
-          affect the code generation of other members.   Please see
-          the Python module for an example.   Patches contributed
-          by Robin Dunn.
-
-8/13/99 : Patch to Python shadow classes to eliminate ignored
-          exception errors in destructors.  Patch contributed
-          by Robin Dunn.
-
-8/11/99 : Minor patch to swig_lib/python/swigptr.swg  (added SWIGSTATIC
-          declaration).  Patch contributed by Lyle Johnson.
-
-8/11/99 : Added FIRSTKEY/NEXTKEY methods to Perl5 shadow classes
-          Patch contributed by Dennis Marsa.
-
-8/11/99 : Modified Python module so that NULL pointers are returned
-          and passed as 'None.'  Patch contributed by Tal Shalif.
-
-8/10/99 : Fixed missing 'int' specifiers in various places.
-
-8/10/99 : Added Windows makefile for Runtime libraries.  Contributed
-          by Bob Techentin.
-
-8/10/99 : Fixed minor problem in Python runtime makefile introduced
-          by keyword arguments.
-
-8/8/99  : Changed $target of perl5(out) typemap from ST(0) to
-          ST(argvi).  Patch contributed by Geoffrey Hort.
-
-8/8/99  : Fixed bug in typemap checking related to the ANY keyword
-          in arrays and ignored arguments.  Error reported by
-          Geoffrey Hort.
-
-8/8/99  : %enabledoc and %disabledoc directives can now be used
-          inside class/structure definitions.   However, no check
-          is made to see if they are balanced (i.e., a %disabledoc
-          directive inside a class does not have to have a matching
-          %enabledoc in the same class).
-
-8/8/99  : Keyword argument handling is now supported in the Python
-          module.   For example:
-
-               int foo(char *bar, int spam, double x);
-
-          Can be called from Python as
-
-               foo(x = 3.4, bar="hello", spam=42)
-
-          To enable this feature, run SWIG with the '-keyword' command
-          line option.    Mixing keyword and default arguments
-          should work as well.   Unnamed arguments are assigned names
-          such as "arg1", "arg2", etc...
-
-          *** POTENTIAL INCOMPATIBILITY ***
-          Functions with duplicate argument names such as
-          bar(int *OUTPUT, int *OUTPUT) will likely cause problematic
-          wrapper code to be generated.   To fix this,  use different
-          names or use %apply to map typemaps to alternate names.
-
-8/8/99  : Handling of the 'this' pointer has been changed in Python shadow
-          classes.  Previously, dereferencing of '.this' occurred in the
-          Python shadow class itself.   Now, this step occurs in the C
-          wrappers using the following function:
-
-                SWIG_GetPtrObj(PyObject *, void **ptr, char *type)
-
-          This function can accept either a string containing a pointer
-          or a shadow class instance with a '.this' attribute of
-          appropriate type.  This change allows the following:
-
-          1.  The real shadow class instance for an object is
-              passed to the C wrappers where it can be examined/modified
-              by typemaps.
-
-          2.  Handling of default/keyword arguments is now greatly
-              simplified.
-
-          3.  The Python wrapper code is much more simple.
-
-          Plus, it eliminated more than 300 lines of C++ code in the
-          Python module.
-
-          *** CAVEAT : This requires the abstract object interface.
-          It should work with Python 1.4, but probably nothing older
-          than that.
-
-
-8/8/99  : Fixed handling of "const" and pointers in classes.  In particular,
-          declarations such as
-
-           class foo {
-             ...
-             const char *msg;
-             const int  *iptr;
-          }
-
-          are handled as assignable variables as opposed to constant
-          values (this is the correct behavior in C/C++).   Note:
-          declarations such as "char *const msg" are still unsupported.
-          Constants declared at the global level using const are also
-          broken (because I have a number of interfaces that rely upon
-          this behavior).
-
-          *** POTENTIAL INCOMPATIBILITY ***  This may break interfaces that
-          mistakenly treat 'const char *' types as constant values.
-
-8/8/99  : Modified the parser to support bit-fields.    For example:
-
-          typedef struct {
-              unsigned int is_keyword : 1;
-              unsigned int is_extern  : 1;
-              unsigned int is_static  : 1;
-          } flags;
-
-          Bit-fields can only be applied to integer types and their
-          are other restrictions.  SWIG performs no such type-checking
-          (although the C compiler will catch problems when it tries to
-          compile the wrapper code).
-
-8/8/99  : Removed trailing space of $basetype substitution in typemaps.
-          This is to allow things like this:
-
-          %typemap(python, argout) spam** OUTPUT{
-              ...
-              char* a = "$basetype_p";
-              ...
-          }
-
-          (Patch suggested by Nathan Dunfield).
-
-6/22/99 : Made a very slight tweak to the Perl5 shadow class
-          code that allows typemaps to alter the return type
-          of objects (to support polymorphic types).  Patch
-          contributed by Drake Diedrich.
-
-4/8/99  : Fixed null pointer handling bug in Perl module.
-          Patch contributed by Junio Hamano.
-
-3/17/99 : Fixed bug in perl5ptr.swg for ActiveState Perl.
-          Patch contributed by Greg Anderson.
-
-2/27/99 : Eliminated segmentation fault when Swig runs on
-          empty files.
-
-2/27/99 : Added patch to Guile module to eliminate unused
-          variables.   Contributed by Mike Simons.
-
-2/27/99 : Fixed problem with %addmethods returning references.
-
-2/27/99 : Fixed Runtime/Makefile. Patch contributed by
-          Mike Romberg.
-
-2/27/99 : Incorporated patches to the type-checker.
-
-2/27/99 : Fixed problem with -exportall switch and shadow classes
-          in Perl5 module.  Patch contributed by Dennis Marsa.
-
-2/27/99 : Modified Perl5 module to recognize 'undef' as a NULL char *.
-          Patch contributed by Junio Hamano.
-
-2/27/99 : Fixed the Perl5 module to support the newer versions of
-          ActiveState Perl for Win32.
-
-2/27/99 : Fixed the include order of files specified with the
-          -I option.
-
-2/5/98- : Dave finishes his dissertation, goes job hunting, moves to
-2/5/99    Chicago and generally thrashes about.
-
-Version 1.1 Patch 5 (February 5, 1998)
-======================================
-
-2/4/98  : Fixed a bug in the configure script when different package
-          locations are specified (--with-tclincl, etc...).
-
-2/2/98  : Fixed name-clash bug related to the switch to C macros for accessor
-          functions.  The new scheme did not work correctly for objects
-          with members such as 'obj', 'val', etc...   Fixed the bug by
-          appending the word 'swig' to macro argument names.  Patch
-          contributed by Rudy Albachten.
-
-2/2/98  : Slight fix to the Perl5 module to eliminate warning messages
-          about 'varname used only once : possible typo'.  Fix
-          contributed by Rudy Albachten.
-
-1/9/98  : Fixed a bug in the Perl 5 module related to the creation of
-          constants and shadow classes.
-
-1/9/98  : Fixed linking bug with Python 1.5 embed.i library file.
-
-Version 1.1 Patch 4 (January 4, 1998)
-=====================================
-
-1/4/98  : Changed structured of the Examples directory to be more friendly
-          to Borland C++.
-
-1/4/98  : Added the function Makefile.win.bc for compiling the examples
-          under Borland 5.2.
-
-1/4/98  : Slight change to the perl5 module and C++ compilation.  The
-          <math.h> library is now included before any Perl headers
-          because Perl the extern "C" linkage of math.h screws alot
-          of things up (especially on Windows).
-
-1/2/98  : Change to the Python module that reduces the number of constants
-          created by C++ classes, inheritance, and shadow classes.   This
-          modification may introduce a few slight incompatibilities if
-          you attempt to use the non-shadow class interface with shadow
-          classes enabled.    Patch contributed by Mike Romberg.
-
-1/2/98  : Support for Tcl 8.0 namespaces has been added.   This *replaces*
-          the original SWIG mechanism that assumed [incr Tcl] namespaces.
-          To use namespaces, simply run SWIG with the following options
-
-             swig -tcl -namespace  foo.i
-
-                    This places everything in a namespace that matches
-                    the module name
-
-             swig -tcl -namespace -prefix bar foo.i
-
-                    This places everything in the namespace 'bar'
-
-          The use of namespaces is new in Tcl 8.0.  However, the wrapper code
-          generated by SWIG will still work with all versions of Tcl newer
-          than and including Tcl 7.3/Tk3.6 even if the -namespace option is
-          used.
-
-          *** POTENTIAL INCOMPATIBILITY ***
-          This change may break existing applications that relied on the
-          -prefix and -namespace options.
-
-1/2/98  : Added the following constants to the Tcl wrapper code
-
-                 SWIG_name      - Name of the SWIG module
-                 SWIG_prefix    - Prefix/namespace appended to command names
-                 SWIG_namespace - Name of the namespace
-
-          SWIG library writers can use these to their advantages.
-
-1/2/98  : Fixed a bug in the Tcl8 module related to the creation of
-          pointer constants (the function SWIG_MakePtr was missing from
-          the wrapper code).
-
-1/2/98  : Added the consthash.i library file to the Tcl and Tcl8 modules.
-
-1/1/98  : Changed and cleaned up the Python typemaps.i file.   The following
-          significant changes were made :
-
-                1.  The OUTPUT typemap now returns Python tuples instead of
-                    lists.   Lists can be returned as before by using the
-                    L_OUTPUT type.    If compatibility with older versions
-                    is needed, run SWIG with the -DOUTPUT_LIST option.
-
-                2.  The BOTH typemap has been renamed to INOUT.  For backwards
-                    compatibility, the "BOTH" method still exists however.
-
-                3.  Output typemaps now generate less code than before.
-
-          Changes to typemaps.i may break existing Python scripts that assume
-          output in the form of a list.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-12/31/97: Fixed long overdue problems with the testing scripts and certain
-          makefiles that required the use of the bash shell.   Everything should
-          work properly with the standard Bourne shell (sh) now.
-
-12/31/97: Modified typemaps to allow $basetype as a valid local variable.
-          This allows for all sorts of bizarre hackish typemaps that
-          do cool things.   Patch contributed by Dominique Dumont.
-
-12/31/97: Switched accessor functions generated for member data to
-          C preprocessor macros (except in cases involving typemaps
-          or char *).
-
-12/31/97: Fixed a bug related to C++ member data involving references.
-
-12/31/97: Changed accessor functions for C++ member functions to
-          preprocessor macros.   This cleans up the wrapper code
-          and results in fewer function definitions.
-
-12/31/97: Changed the default C constructor to use calloc() instead
-          of malloc()
-
-12/30/97: Changed the creation of constants in the Perl5 module.
-          For all practical purposes, they should work in exactly the
-          same way as before except that they now require much less
-          wrapper code.   Modules containing large numbers of
-          constants may see greater than a 50% reduction in wrapper
-          code size.
-
-12/30/97: Modified the Python module to be more intelligent about the
-          creation of constants.  SWIG no longer generates redundant
-          global variables and the size of the module initialization
-          function should be reduced.   (Many thanks to Jim Fulton).
-
-12/29/97: Fixed a bug in C++ code generation related to member functions,
-          default arguments, and references.
-
-12/29/97: Fixed configure script and a few makefiles to support Python 1.5
-
-12/29/97: Added 'embed15.i' library file.  This file should be used to
-          statically link versions of Python 1.5.    To make it the default,
-          simply copy 'swig_lib/python/embed15.i' to 'swig_lib/python/embed.i'
-
-Version 1.1 Patch 3 (November 24, 1997)
-========================================
-
-11/23/97: Fixed a bug in the Perl5 module with shadow classes and
-          static class functions that return class instances.
-          Note : The fix for this bug requires a slight restructuring of
-          of the .pm files created by SWIG.
-
-11/23/97: Fixed a bug in the Tcl/Tcl8 modules related to variable linking
-          of character arrays.  If you declared a global variable 'char foo[10]',
-          the generated wrapper code would either cause a segmentation fault
-          immediately upon loading or weird memory corruption elsewhere.
-          This should now be fixed although character arrays can only be
-          read-only.
-
-11/23/97: Fixed a bug with the %import directive that caused it to
-          fail if files were imported from directories other than
-          the current working directory.
-
-11/23/97: Fixed incorrect diagnostic message in the ASCII documentation
-          module.
-
-11/23/97: Changed the behavior of the -o option when used with shadow
-          classes. If -o was used to specify both the pathname and filename
-          of SWIG's output such as
-
-                 swig -o /home/swig/wrapper.c -shadow -perl5 foo.i
-
-          The wrapper code would be placed the file specified with -o,
-          but the .pm file and documentation would be placed in the
-          directory where SWIG was run.   Now, these files are placed
-          in the same directory as the file specified with the -o option.
-          This change is also needed for proper operation on the
-          Macintosh.
-
-11/23/97: Added a 'this()' method to Perl5 shadow classes.   This can
-          be used to return the normal pointer value from a shadow
-          class that is represented as a tied hash.   To use just
-          invoke as a method like this :
-
-              $l = new List;       # Create an object
-              $ptr = $l->this();   # Get the normal pointer value
-
-          *** NEW FEATURE ***
-
-11/23/97: Fixed the Tcl 8 pointer.i library file (which was completely
-          broken in 1.1p2).
-
-11/23/97: Modified the Perl5 type-checker to fix a few problems
-          with global variables of pointer types and to allow
-          tied hashes to be used interchangably with normal
-          pointer values.
-
-11/23/97: Modified the typemap mechanism to allow output
-          typemaps of type 'void'.   These were ignored previously,
-          but now if you specify,
-
-                %typemap(lang,out) void {
-                      ... return a void ...
-                }
-
-          You can change or assign a return value to the function.
-
-11/23/97: Fixed processing of 'bool' datatypes in the Python module.
-
-11/23/97: Fixed minor parsing error with C++ initializers. For example,
-
-                 class B : public A {
-                 public:
-                       B() : A() { ... };
-                       ...
-                 }
-
-11/23/97: Fixed the Tcl8 module so that C functions that call back into
-          Tcl don't corrupt the return result object (SWIG was gathering
-          the result object too early which leads to problems if subsequent
-          Tcl calls are made).
-
-11/23/97: Fixed a code generation bug in the Python module when two or
-          more output parameters were used as the first arguments of a
-          function.  For example :
-
-                 %include typemaps.i
-                 void foo(double *OUTPUT, double *OUTPUT, double a);
-
-          Previously, doing this resulted in the creation of an
-          extraneous comma in the output, resulting in a C syntax error.
-
-11/22/97: Fixed a bug when template handling that was stripping whitespace
-          around nested templates.   For example :
-
-                 Foo<Bar<double> >
-
-          was getting munged into Foo<Bar>> which is a syntax error in
-          in the C++ compiler.
-
-11/22/97: Fixed bugs in the Borland C++ makefiles.
-
-11/22/97: Fixed memory corruption bug when processing integer
-          arguments in Tcl8 module.
-
-11/21/97: Fixed a bug in the Runtime/Makefile related to Tcl 8.
-
-11/21/97: Fixed a bug with the %new directive and Perl5 shadow classes.
-          No longer generates a perl syntax error.
-
-11/9/97 : Changed a strncpy() to strcpy() in the pointer type-checker.
-          This results in a substantial performance improvement in
-          type-checking.
-
-10/29/97: Fixed a bug in the code generation of default arguments and
-          user-defined types.  For example :
-
-                 void foo(Vector a, Vector b = d);
-
-          should now work properly.
-
-Version 1.1 Patch 2 (September 4, 1997)
-=======================================
-
-9/4/97  : Fixed problem with handling of virtual functions that
-          was introduced by some changes in the C++ module.
-
-Version 1.1 Patch 1 (August 27, 1997)
-=====================================
-
-8/26/97 : Fixed compilation and run-time bugs with Tcl 8.0 final.
-
-8/21/97 : Fixed code generation bug with arrays appearing as arguments
-          to C++ member functions.  For example :
-
-                class Foo {
-                public:
-                      void Bar(int a[20][20]);
-                };
-
-          There is still a bug using arrays with added methods
-          however.
-
-8/20/97 : Fixed a bug with generating the code for added methods
-          involving pass-by-value.
-
-8/19/97 : Modified the typemapper to substitute the '$arg' value
-          when declaring local variables.    For example :
-
-              %typemap(in) double * (double temp_$arg) {
-                    ... do something ...
-              }
-
-          When applied to a real function such as the following :
-
-              void foo(double *a, double *b, double *result);
-
-          three local variables will be created as follows :
-
-              double temp_a;
-              double temp_b;
-              double temp_result;
-
-          This can be used when writing multiple typemaps that need
-          to access the same local variables.
-
-
-7/27/97 : Fixed a variety of problems with the %apply directive and arrays.
-          The following types of declarations should now work :
-
-               %apply double [ANY] { Real [ANY] };
-               %apply double [4] { double [10] };
-
-          A generic version of apply like this :
-
-               %apply double { Real };
-
-          should now work--even if arrays involving doubles and Reals are
-          used later.
-
-7/27/97 : Changed warning message about "Array X has been converted to Y" to
-          only appear if running SWIG in verbose mode.
-
-7/27/97 : Added the variables $parmname and $basemangle to the typemap
-          generator.    $parmname is the name of the parameter used
-          when the typemap was matched.  It may be "" if no parameter
-          was used.   $basemangle is a mangled version of the base
-          datatype.    Sometimes used for array handling.
-
-7/27/97 : Changed the behavior of output arguments with Python shadow classes.
-          Originally, if a function returned an object 'Foo', the shadow class
-          mechanism would create code like this :
-
-                def return_foo():
-                      val = FooPtr(shadowc.return_foo())
-                      val.this = 1
-                      return val
-
-          The problem with this is that typemaps allow a user to redefine
-          the output behavior of a function--as a result, we can no longer
-          make any assumptions about the return type being a pointer or
-          even being a single value for that matter (it could be a list,
-          tuple, etc...).   If SWIG detects the use of output typemaps
-          (either "out" or "argout") it returns the result unmodified like
-          this :
-
-                def return_foo():
-                      val = shadowc.return_foo()
-                      return val
-
-          In this case, it is up to the user to figure out what to do
-          with the return value (including the possibility of converting it
-          into a Python class).
-
-7/26/97 : Fixed a parsing problem with types like 'unsigned long int',
-          'unsigned short int', etc...
-
-7/24/97 : Minor bug fix to Tcl 8 module to parse enums properly.  Also
-          fixed a memory corruption problem in the type-checker.
-          (patch contributed by Henry Rowley.
-
-7/24/97 : Added Python-tuple typemaps contributed by Robin Dunn.
-
-7/24/97 : Incorporated some changes to the Python module in support of
-          Mark Hammond's COM support.  I'm not entirely sure they
-          work yet however.  Needs documentation and testing.
-
-7/24/97 : Fixed code generation bugs when structures had array members
-          and typemaps were used.  For example :
-
-              %typemap(memberin) double [20][20] {
-                      ... get a double [20][20] ...
-              }
-              struct Foo {
-                     double a[20][20];
-              }
-
-          Originally, this would generate a compiler-type error when
-          the wrapper code was compiled.   Now, a helper function like
-          this is generated :
-
-                double *Foo_a_set(Foo *a, double val[20][20]) {
-                         ... memberin typemap here ...
-                         return (double *) val;
-                }
-
-          When writing typemaps, one can assume that the source variable
-          is an array of the *same* type as the structure member. This
-          may break some codes that managed to work around the array bug.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-7/13/97 : Fixed bug in Perl5 module when using C global variables that
-          are pointers.  When used in function calls and other operations,
-          the value of the pointer would be invalid---causing core
-          dumps and other problems.  SWIG implements global variables
-          using Perl magic variables.  As it turns out, the error
-          was caused by the fact that the pointer-extraction code
-          was somehow bypassing the procedure used to resolve magical
-          variables (hence, leaving the value undefined).  To fix
-          the problem, SWIG now explicitly resolves magic before
-          extracting pointer values.
-
-7/12/97 : Eliminated the last remnants of free() and malloc() from
-          the SWIG compiler.
-
-7/12/97 : Fixed parsing problems with typemaps involving arrays and
-          temporary variables of arrays.    Also made it possible for
-          SWIG to handle typemaps like this :
-
-                 %typemap(in) double [ANY] (double temp[$dim0]) {
-		      ... store data in temp[$dim0] ...
-                 }
-
-          Not only does this typemap match any double [] array, it
-          creates a local variable with precisely the right dimensions.
-          (ie. $dim0 gets filled in with the real number of dimensions).
-          Of course, off the record, this will be a way to add more
-          functionality to the typemaps.i libraries.
-
-7/9/97  : Fixed some problems with Perl5, static linking, and shadow
-          classes.  When statically linking multiple modules together, write
-          a top-level interface file like this when shadow classes are not
-          used :
-
-                 %module swig, foo, bar, glob;
-                 %include perlmain.i
-
-          When shadow classes are used, the module names have an extra 'c'
-          appended so it should read as :
-
-                 %module swig, fooc, barc, globc;
-                 %include perlmain.i
-
-          When linking multiple modules, consider using the SWIG runtime
-          library.
-
-7/8/97  : Incorporated fixed versions of the Borland C++ Makefiles.
-
-7/8/97  : First cut at trying to eliminate excessive compiler warnings.
-          As it turns out, alot of warnings go away if you just make
-          declarations like this
-
-                  clientData = clientData;
-
-          in the resulting wrapper code.  Most compilers should just
-          ignore this code (at least would can hope).
-
-7/8/97  : Fixed bizarre code generation bug with typemaps and C++ classes.
-          In some cases, typemaps containing printf formatting strings such as
-
-                  %typemap(memberout) int * {
-                         printf("%d",42);
-                  }
-
-          Would generate completely bogus code with garbage replacing
-          the '%d'.   Caused by one faulty use of printf (wasn't able to find
-          any other occurrences).
-
-7/7/97  : Fixed bug in Python shadow class generation with non-member
-          functions that are returning more than one value.
-
-7/7/97  : Incorporated modifications to make SWIG work with Guile 1.2.
-          Still need to test it out, but it is rumored to work.
-
-7/2/97  : Fixed some bugs related to output arguments and Python shadow
-          classes.    If an output argument is detected, SWIG assumes
-          that the result is a list and handles it appropriately.
-          If the normal return type of an function is an object,
-          it will be converted into a shadow class as before, but
-          with the assumption that it is the first element of a
-          list.  *** NOTE : This behavior has been subsequently changed ***
-
-6/29/97 : Changed EXPORT to SWIGEXPORT in all of the language modules.
-          Should provide better compatibility with Windows.
-
-6/29/97 : Modified Python shadow classes so that output arguments
-          work correctly (when typemaps are used).
-
-Version 1.1 (June 24, 1997)
-===========================
-
-6/24/97 : Fixed Objective-C constructor bug when working with Perl5
-          shadow classes.
-
-6/23/97 : Fixed some parsing problems with Objective-C.  Declarations
-          such as the following should work now :
-
-               - foo : (int) a with: (int) b;
-
-6/22/97 : Added SWIG Runtime library.   This library contains
-          the SWIG pointer type-checker and support functions
-          that are normally included in every module.  By using
-          the library, it is easier to work with multiple SWIG
-          generated modules.
-
-6/22/97 : Fixed minor bug in Perl5 module related to static linking
-          of multiple modules.
-
-6/22/97 : Fixed some bugs with the %import directive. When used with
-          Perl5 shadow classes, this generates a 'require' statement
-          to load in external modules.
-
-6/22/97 : Added -swiglib option.  This prints out the location of the
-          SWIG library and exits.  This option is only really useful to
-          configuration tools that are looking for SWIG and its library
-          location (e.g. autoconf, configure, etc...).
-
-6/21/97 : Fixed export bug with Perl5.004 on Windows-NT.
-
-6/20/97 : Minor change to code generation of class/structure members in
-          order to work better with typemaps. Should have no noticable
-          impact on existing SWIG modules.
-
-6/19/97 : Added -t option. This allows SWIG to load a typemap file before
-          processing any declarations.  For example :
-
-                 swig -t typemaps.i -python example.i
-
-          At most, only one typemap file can be specified in this manner.
-          *** NEW FEATURE ***
-
-6/18/97 : Need a Makefile fast? Type
-
-                 swig [-tcl, -perl5, -python] -co Makefile
-
-          and you will get a Makefile specific to that target language.
-          You just need to modify it for your application and you're
-          ready to run.
-
-6/18/97 : Completed the -ci option.  This option checks a file into the
-          SWIG library.   It should be used in conjunction with a
-          language option. For example :
-
-                  swig -tcl -ci foobar.i
-
-          Checks the file foobar.i into the Tcl part of the library.
-          In order to check a file into the general library (accessible
-          to all languages modules), do the following
-
-                  swig -ci -o ../foobar.i foobar.i
-
-          (Admittedly this looks a little strange but is unavoidable).
-          The check-in option is primarily designed for SWIG maintenance
-          and library development. The command will fail if the user does
-          not have write permission to the SWIG library.  Third party library
-          extensions can easily install themselves by simply providing
-          a shell script that uses 'swig -ci' to install the appropriate
-          library files.  It is not necessary to know where the SWIG library
-          is located if you use this mechanism.
-          *** NEW FEATURE ***
-
-6/16/97 : Fixed a bug in shadow class generation when %name() was applied
-          to a class definition.   Unfortunately, fixing the bug required
-          a change in the Language C API by adding an extra argument to
-          the Language::cpp_class_decl() function.  This may break
-          SWIG C++ extensions.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-6/15/97 : Added a warning message if no module name is specified with the
-          %module directive or -module option.
-
-6/15/97 : Fixed line number bug when reporting errors for undefined
-          base classes.
-
-6/15/97 : Added new %rename directive.  This allows the forward declaration
-          of a renaming.  For example :
-
-                 %rename OldName NewName;
-
-                 .... later ...
-                 int OldName(int);
-
-          Unlike %name, %rename will rename any occurrence of the old name.
-          This applies to functions, variables, class members and so forth.
-          There is no way to disable %rename once set, but you can change the
-          name by redeclaring it to something else.
-          *** NEW FEATURE ***
-
-6/15/97 : Improved the implementation of the %name directive so that it
-          could be used with conditional compilation :
-
-                    #ifdef SWIG
-                    %name(NewName)
-                    #endif
-                    int OldName(int);
-
-6/15/97 : Added support for functions with no return datatype.  In this case,
-          SWIG assumes a return type of 'int'.
-
-6/11/97 : Improved error reporting in the parser.  It should be a little
-          less sensitive to errors that occur inside class definitions
-          now.  Also reports errors for function pointers.
-
-6/11/97 : Made '$' a legal symbol in identifiers.  This is to support
-          some Objective-C libraries.  Some compilers (such as gcc) may also
-          allow identifiers to contain a $ in C/C++ code as well (this is
-          an obscure feature of C). When '$' appears in identifier, SWIG
-          remaps it to the string '_S_' when creating the scripting language
-          function. Thus a function 'foo$bar' would be called 'foo_S_bar'.
-
-6/11/97 : Fixed bug in Python shadow classes with __repr__ method.  If
-          supplied by the user, it was ignored, but now it should work.
-
-6/9/97  : Fixed the Tcl 8.0 module to work with Tcl 8.0b1.   SWIG is no
-          longer compatible with *any* alpha release of Tcl 8.0.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-6/7/97  : Put a maximal error count in (currently set to 20). SWIG will bail out
-          if it generates more errors than this (useful for preventing SWIG
-          from printing 4000 syntax errors when it gets confused).
-
-6/7/97  : Fixed segmentation fault when parsing variable length arguments.
-
-6/7/97  : Minor change to Perl5 module.  C++ static functions are now
-          put in the same package as their class when using shadow classes.
-
-6/7/97  : Centralized the naming of functions, members, wrappers etc... By
-          centralizing the naming scheme, it should be possible to make
-          some multi-file optimizations.  Also, it should be possible to
-          change SWIG's naming scheme (perhaps a new feature to be added
-          later).
-
-6/2/97  : Added 'arginit' typemap.   This can be used to assign initial values
-          to function arguments.  Doing so makes it somewhat easier to detect
-          improper argument passing when working with other typemaps.
-
-6/2/97  : Fixed code generation bug when read-only variables were inherited
-          into other classes.  Under inheritance, the variables would
-          become writable, but this has now been corrected.
-
-5/30/97 : An empty %name() directive is no longer allowed or supported.
-          This directive was originally used to strip the prefix
-          off of a class or structure.  Unfortunately, this never really
-          seemed to work right and it complicated the C++ code generator
-          significantly.   As far as I can tell no one uses it, so it
-          is now history.  *** POTENTIAL INCOMPATIBILITY ***
-
-5/28/97 : Fixed a parsing bug with #define and C++ comments.  Declarations
-          such as the following now work properly :
-
-                   #define CONST   4     // A Comment
-
-5/28/97 : Made some performance improvements to the SWIG String class.
-          (only affects the SWIG compiler itself).
-
-5/28/97 : Modified the parser to skip template definitions and issue a
-          warning message.
-
-5/28/97 : Preliminary support for parameterized types added (ie. templates).
-          Types such as the following should pass through the SWIG compiler
-
-                    void foo(vector<complex> *a, vector<double> *b);
-
-          When used, the entire name 'vector<complex>' becomes the name
-          of the datatype.      Due to space limitations in datatype
-          representations, the name should not exceed 96 characters.
-
-          Note : This is only part of what is needed for template support.
-          Template class definitions are not yet supported by SWIG.
-
-          The template notation above may also be used when specifying
-          Objective-C protocol lists.
-          *** NEW FEATURE ***
-
-5/24/97 : First cut at Objective-C support added.   As it turns out, almost
-          everything can be handled with only a few minor modifications to
-          the C++ module.
-          *** NEW FEATURE ***
-
-5/23/97 : Fixed repeated definition bug in multiple inheritance handling
-          when multiple base classes share a common base class (ie.
-          the evil diamond).
-
-5/21/97 : Fixed rather embarrassing typo that worked its way into the
-          Tests/Build directory.
-
-5/19/97 : Fixed code generation bug when using native methods and
-          shadow classes with Python and Perl5 modules.
-
-5/19/97 : Modified the %apply directive slightly so that it would work
-          with pointers a little better. For example :
-
-                  %apply unsigned long { DWORD };
-
-          Applies *all* typemaps associated with "unsigned long" to
-          "DWORD".   This now includes pointers to the two datatypes.
-          For example, a typemap applied to "unsigned long **" would
-          also be applied to any occurrence of "DWORD **" as well.
-
-5/19/97 : Fixed an ownership assignment bug in the Perl5 module when
-          class members were returning new objects belonging to
-          different classes.
-
-5/17/97 : Added a few more typemap variables.
-
-                  $name          - Name of function/variable/member
-                  $basetype      - Base datatype (type without pointers)
-                  $argnum        - Argument number
-
-5/16/97 : Fixed embarrassing underscore error in local variable
-          allocator.
-
-5/16/97 : Fixed namespace clash bug in parameterized typemaps
-          when creating arrays as new local variables.
-
-5/15/97 : Fixed some bugs with inheritance of added methods across
-          multiple files.   SWIG now uses names of base classes
-          when generating such functions.
-
-5/14/97 : Finished support for default typemaps.  Primarily used
-          internally, they can be used to match the basic
-          built-in datatypes used inside of SWIG.   You can
-          specify them in interface files as well like this :
-
-               %typemap(tcl,in) int SWIG_DEFAULT_TYPE {
-                        $target = atoi($target);
-               }
-
-          Unlike normal typemaps, this default map will get applied
-          to *all* integer datatypes encountered, including those
-          renamed with typedef, etc...
-
-5/13/97 : Fixed substring bug in type checker.
-
-5/12/97 : Fixed bug in parameterized typemaps when declaring local
-          variables of structures.
-
-Version 1.1 Beta6 (May 9, 1997)
-===============================
-
-5/9/97  : Fixed bizarre NULL pointer handling bug in Perl5 module.
-
-5/8/97  : Fixed mysterious segmentation fault when running SWIG on an
-          empty file.
-
-5/7/97  : The code generator will now replace the special symbol "$cleanup"
-          with the cleanup code specified with the "freearg" typemap.
-          This change needed to properly manage memory and exceptions.
-
-5/5/97  : Added the 'typemaps.i' library file.  This contains a
-          variety of common typemaps for input values, pointers,
-          and so on.
-
-5/5/97  : Changed behavior of "argout" typemap in Python module.
-          Old versions automatically turned the result into a
-          Python list.  The new version does nothing, leaving the
-          implementation up to the user.  This provides more flexibility
-          but may break older codes that rely on typemaps.
-          *** POTENTIAL INCOMPATIBILITY ***
-
-5/5/97  : Fixed bug in Python module related to the interaction of
-          "argout" and "ignore" typemaps.
-
-5/5/97  : Fixed bug in Python module that would generate incorrect code
-          if all function arguments are "ignored".
-
-5/4/97  : Added %apply and %clear directives.   These form a higher level
-          interface to the typemap mechanism.  In a nutshell, they
-          can be used to change the processing of various datatypes without
-          ever having to write a typemap.  See the SWIG documentation
-          for more details.  ** NEW FEATURE **
-
-5/4/97  : Added a local variable extension to the typemap handler.
-          For example :
-
-                 %typemap(tcl,in) double *(double temp) {
-		        temp = atof($source);
-                        $target = &temp;
-                 }
-
-          In this case, 'temp' is a local variable that exists
-          in the entire wrapper function (not just the typemap
-          code).  This mechanism provides better support for
-          certain types of argument handling and also makes it
-          possible to write thread-safe typemaps.  Any number
-          local variables can be declared by supplying a comma
-          separated list.   Local variables are guaranteed to be
-          unique, even if the same typemap is applied many times
-          in a given function.
-          ** Not currently supported in Perl4 or Guile modules.
-
-5/2/97  : Fixed processing of %ifdef, %endif, %if, etc...  (These are
-          SWIG equivalents of the C preprocessor directives that
-          can pass through the C preprocessor without modification).
-
-5/2/97  : Fixed major (but subtle) bug in the run-time type checker
-          related to searching and type-checking for C++ inheritance.
-          To make a long story short, if you had two classes named
-          "Foo" and "FooObject" the type checker would sometimes
-          get confused and be unable to locate "Foo" in an internal
-          table.
-
-5/2/97  : Fixed some bugs in the -co option.
-
-4/24/97 : Pointer library added to the SWIG library.
-
-4/19/97 : Added the %new directive.   This is a "hint" that can be used
-          to tell SWIG that a function is returning a new object. For
-          example :
-
-                  %new Foo *create_foo();
-
-          This tells SWIG that create_foo() is creating a new object
-          and returning a pointer to it.   Many language modules may
-          choose to ignore the hint, but when working with shadow classes,
-          the %new is used to handle proper ownership of objects.
-
-          %new can also be used with dynamically allocated strings.
-          For example :
-
-                  %new char *create_string();
-
-          When used, all of the language modules will automatically cleanup
-          the returned string--eliminating memory leaks.
-          ** NEW FEATURE **
-
-4/19/97 : Added a new typemap "newfree".   This is used in conjunction with
-          the %new directive and can be used to change the method by which
-          a new object returned by a function is deleted.
-
-4/19/97 : The symbol "__cplusplus" is now defined in the SWIG interpreter
-          when running with the -c++ option.
-
-4/17/97 : Added support for static member functions when used inside the
-          %addmethods directive.
-
-4/15/97 : Added a special typemap symbol PREVIOUS that can be used to
-          restore a previous typemap. For example :
-
-	         %typemap(tcl,in) int * = PREVIOUS;
-
-          This is primarily used in library files.
-
-4/13/97 : Added %pragma directive for Perl5 module.   Two new pragmas are
-          available :
-
-                 %pragma(perl5) code = "string"
-                 %pragma(perl5) include = "file.pl"
-
-          Both insert code into the .pm file created by SWIG.  This can
-          be used to automatically customize the .pm file created by SWIG.
-
-4/13/97 : Scanner modified to only recognize C++ keywords when the -c++
-          option has been specified.  This provides support for C programs
-          that make use of these keywords for identifiers.
-          SWIG may need to be explicitly run with the -c++ option when
-          compiling C++ code (this was allowed, but not recommended in
-          previous versions). **POTENTIAL INCOMPATIBILITY**
-
-4/11/97 : Fixed a rather nasty bug in the Perl5 module related to using
-          variable linking with complex datatypes and pointers.   On Unix,
-          code would work (somehow), but would cause an access violation
-          under Windows-NT.  The fix should correct the problem,
-          but there may still be a problem using global variables of
-          complex datatypes in conjunction with shadow classes.  Fortunately,
-          this sort of thing seems to be relatively rare (considering
-          that the bug has been around for more than a year - yikes!).
-
-4/11/97 : Fixed bizarre constant evaluation bug in Perl5 code generation
-          when running under Windows-NT.
-
-4/8/97  : Bug when using default arguments and C++ references fixed.
-
-4/8/97  : Fixed code generation bugs in Python and Perl5 modules related to
-          using class renaming (applying the %name directive to a class
-          definition) and shadow classes.
-
-4/7/97  : Fixed minor bugs in swigptr.swg, tcl8ptr.swg, and perl5ptr.swg to
-          prevent infinite loops when weird datatypes are passed.
-
-3/29/97 : 'Makefile.win' added.   This is used to build most of the examples
-          in the Examples directory under Windows NT/95.
-
-3/27/97 : Fixes to SWIG's error return codes.   SWIG now returns non-zero
-          exit codes for certain kinds of errors (which makes it more
-          friendly to makefiles).     An overhaul of the error handling
-          is on the to-do list and will probably show up in a later release.
-
-3/25/97 : Bug fix.  "freearg" and "argout" typemaps have been fixed in
-          the Perl5 module.  In previous versions, function input parameters
-          and function output parameters shared the same memory space--causing
-          all sorts of nasty problems when trying to pass perl values by
-          reference.   SWIG now internally makes a "copy" (which is really
-          just a pointer) of affected parameters and uses that.   This
-          is done transparently so there is no noticable impact on any
-          SWIG generated modules.   This change is probably only noticable
-          to expert users.
-
-3/25/97 : Added type-check to verbose and stat mode.  SWIG will now generate a list
-          of all datatypes that were used but undefined (useful for tracking
-          down weird bugs).   This is enabled with the -v option (which
-          is now officially known as "overly verbose" mode) or the -stat option.
-
-3/25/97 : Slight change to the parser to make include guards work correctly.
-          For example :
-
-                #ifndef INTERFACE_I
-                #define INTERFACE_I
-                %module foobar.i
-                ... declarations ...
-                #endif
-
-3/24/97 : %checkout directive added.   This allows an interface file to
-          extract files from the SWIG library and place them in the
-          current directory.   This can be used to extract scripts and
-          other helper code that might be associated with library files.
-          For example :
-
-                %checkout array.tcl
-
-          Will look for a file "array.tcl" in the library and copy it
-          to the current directory.    If the file already exists in the
-          directory, this directive does nothing (it will not overwrite an
-          existing file).  This only an experimental feature for now.
-
-3/24/97 : SWIG will now look in the SWIG Library for a file if it can't
-          find it in the current directory.  As a result, it is easy to
-          make modules from SWIG library files.  For example, if you
-          want to make a Python module from the SWIG timers library, just
-          type this in any directory :
-
-                swig -python timers.i
-
-          You will get the files timers_wrap.c and timers_wrap.doc in
-          the current directory that you can now compile.   The file
-          remains in the SWIG library (although you can check it out
-          using the -co option).  *** New Feature ***
-
-3/24/97 : -co option added to SWIG to allow easy access to the SWIG library.
-          When used, this instructs SWIG to check out a library file and
-          place it in the current directory.  For example :
-
-                unix > swig -co array.i
-                array.i checked out from the SWIG library
-                unix >
-
-          Once in your directory you can customize the file to suit your
-          particular purposes.  The checkout option makes it easy to
-          grab library files without knowing anything about the SWIG
-          installation, but it also makes it possible to start
-          including scripts, C code, and other miscellaneous files
-          in the library.  For example, you could put a cool script
-          in the library and check it out whenever you wanted to use it.
-          *** New Feature ***
-
-3/24/97 : #pragma export directives added to Tcl output for compiling
-          shared libraries on the Mac.
-
-3/24/97 : Minor changes to wish.i and tclsh.i library files to provide
-          support for the Macintosh.
-
-3/19/97 : SWIG's policy towards NULL pointers has been relaxed.  The
-          policy of requiring a special compiler directive -DALLOW_NULL
-          to use NULL pointers is no longer supported.  While this may
-          seem "unsafe", it turns out that you can use a "check"
-          typemap to achieve some safety.   For example :
-
-                %typemap(perl5,check) Node * {
-                       if (!$target)
-                            croak("NULL Pointers not allowed.");
-                }
-
-          This prevents any NULL value of a "Node *" pointer to be
-          passed to a function.   (I think this is much cleaner
-          than the old -DALLOW_NULL hack anyways).
-
-3/19/97 : Fixed pointer handling errors in Perl5 module.  Modules no
-          longer core dump when a Perl reference is inadvertently
-          passed in as a C pointer.
-
-3/18/97 : Added a "check" typemap.   This can be used to check the
-          validity of function input values.  For example :
-
-                %typemap(perl5,check) int posint {
-                       if ($target < 0)
-                           croak("Argument is not a positive integer");
-                }
-
-3/18/97 : Added an $arg variable to Tcl typemaps.   This makes it easier
-          to return argument values by "reference".
-
-3/18/97 : Fixed a code generation bug when using C++ references and
-          the %addmethods directive.
-
-3/18/97 : Fixed a few glitches in the typemap module with respect to
-          chaining. For example :
-
-                %typemap(tcl,in) int {
-                       $in                // Inserts prexisting typemap
-                       printf("Received a %d\n", $target);
-                }
-
-          This has been allowed for quite some time, but didn't work
-          if no existing typemap was defined.  Now, it still doesn't
-          work if no existing typemap is defined, but it issues a
-          warning message.   There is some support using default typemaps,
-          but none of the language modules take advantage of it.  This
-          should be considered experimental at this time.
-
-Version 1.1b5 Patch 1 (March 16, 1997)
-======================================
-
-3/16/97 : Fixed references bug with C++ code generation.
-
-3/16/97 : Fixed initialization bug in the documentation system that
-          was causing weird problems.
-
-3/16/97 : Fixed fatal bug with -c option in the Python module.
-
-3/13/97 : Fixed bug in the documentation system involving the %text directive
-          and sorting. In the old system, %text entries would float to the
-          top of a section because they were "nameless".   Now they are
-          attached to the previous declaration and will stay in the proper
-          location relative to the previous entry.
-
-Version 1.1b5 (March 12, 1997)
-==============================
-
-3/11/97 : Fixed compilation problems introduced by Tcl/Tk 8.0a2.
-          *** INCOMPATIBILITY *** SWIG no longer works with Tcl/Tk 8.0a1.
-
-3/10/97 : Fixed bug with ignored arguments and C++ member functions in
-          the Python module.
-
-3/9/97  : Parsing bugs with nested class definitions and privately
-          declared nested class definitions fixed.
-
-3/9/97  : Fixed a few minor code generation bugs with C++ classes and
-          constructors.   In some cases, the resulting wrapper code
-          would not compile properly.   SWIG now attempts to use
-          the default copy constructor instead.
-
-3/8/97  : Added a -l option to SWIG that allows additional SWIG library files
-          to be grabbed without having them specified in the interface file.
-          This makes it easier to keep the interface file clean and move certain
-          options into a Makefile.   For example :
-
-              swig -tcl example.i              #  Build a normal Tcl extension
-              swig -tcl -lwish.i example.i     #  Build it as a wish extension
-                                               #  by including the 'wish.i' file.
-
-              swig -python example.i           # Build a dynamically loaded extension
-              swig -python -lembed.i example.i # Build a static extension
-
-          These kinds of options could previously be accomplished with
-          conditional compilation such as :
-
-                   %module example
-                   ...
-                   #ifdef STATIC
-                   %include embed.i
-                   #endif
-
-3/8/97  : Incorporated changes to Guile module to use the new gh interface
-          in FSF Guile 1.0.    The older gscm interface used in Cygnus
-          Guile releases is no longer supported by SWIG.
-
-3/8/97  : Cleaned up the Tcl Netscape plugin example.   It should work with
-          version 1.1 of the plugin now.
-
-3/8/97  : Added better array support to the typemap module.  The keyword
-          ANY can now be used to match any array dimension.  For example :
-
-                    %typemap(tcl,in) double [ANY] {
-                           ... get an array ...
-                    }
-
-          This will match any single-dimensional double array.   The array
-          dimension is passed in the variables $dim0, $dim1, ... $dim9.  For
-          example :
-
-		    %typemap(tcl,in) double [ANY][ANY][ANY] {
-			printf("Received a double[%d][%d][%d]\n",$dim0,$dim1,$dim2);
-	            }
-
-          Any typemap involving a specific array dimension will override any
-          specified with the ANY tag.  Thus, a %typemap(tcl,in) double [5][4][ANY] {}
-          would override a double [ANY][ANY][ANY].  However, overuse of the ANY
-          tag in arrays of high-dimensions may not work as you expect due to
-          the pattern matching rule used. For example, which of the following
-          typemaps has precedence?
-
-                      %typemap(in) double [ANY][5] {}     // Avoid this!
-                      %typemap(in) double [5][ANY] {}
-
-3/7/97  : Fixed a number of bugs related to multi-dimensional array handling.
-          Typedefs involving multi-dimensional arrays now works correctly.
-          For example :
-
-                    typedef double MATRIX[4][4];
-
-                    ...
-                    extern double foo(MATRIX a);
-
-          Typecasting of pointers into multi-dimensional arrays is now
-          implemented properly when making C/C++ function calls.
-
-3/6/97  : Fixed potentially dangerous bug in the Tcl Object-oriented
-          interface.  Well, actually, didn't fix it but issued a
-          Tcl error instead.   The bug would manifest itself as follows:
-
-                 % set l [List]           # Create an object
-                 ...
-                 % set m [List -this $l]  # Make $m into an object assuming $l
-                                          # contains a pointer.
-                                          # Since $m == $l, $l gets destroyed
-                                          # (since its the same command name)
-                 % $m insert Foo
-                 Segmentation fault       # Note : the list no longer exists!
-
-          Now, an error will be generated instead of redefining the command.
-          As in :
-
-                 % set l [List]
-                 ...
-                 % set m [List -this $l]
-                 Object name already exists!
-
-          Use catch{} to ignore the error.
-
-3/3/97  : Better support for enums added.   Datatypes of 'enum MyEnum'
-          and typedefs such as 'typedef enum MyEnum Foo;' now work.
-
-3/3/97  : Parser modified to ignore constructor initializers such as :
-
-               class Foo : public Bar {
-               int a,b;
-               public:
-                     Foo(int i) : a(0), b(i), Bar(i,0) { };
-               };
-
-3/3/97  : Modified parser to ignore C++ exception specifications such as :
-
-               int foo(double) throw(X,Y);
-
-3/3/97  : Added %import directive.  This works exactly like %extern
-          except it tells the language module that the declarations are
-          coming from a separate module.   This is usually only
-          needed when working with shadow classes.
-
-3/2/97  : Changed pointer type-checker to be significantly more
-          efficient when working with derived datatypes.  This
-          has been accomplished by storing type-mappings in sorted
-          order, using binary search schemes, and caching recently
-          used datatypes.   For SWIG generated C++ modules that
-          make a large number of C function calls with derived types,
-          this could result in speedups of between 100 and 50000 percent.
-          However, due to the required sorting operation, module
-          loading time may increased slightly when there are lots of
-          datatypes.
-
-3/2/97  : Fixed some C++ compilation problems with Python
-          embed.i library files.
-
-2/27/97 : Slight change to C++ code generation to use copy constructors
-          when returning complex data type by value.
-
-2/26/97 : Fixed bug in Python module with -c option.
-
-2/26/97 : Slight tweak of parser to allow trailing comma in enumerations
-          such as
-
-                enum Value (ALE, STOUT, LAGER, };
-
-2/25/97 : Fixed code generation bug in Tcl module when using the
-          %name() directive on a classname.
-
-2/25/97 : Finished code-size optimization of C++ code generation with
-          inheritance of attributes.    Inherited attributes now
-          only generate one set of wrapper functions that are re-used
-          in any derived classes.   This could provide big code
-          size improvements in some scripting language interfaces.
-
-2/25/97 : Perl5 module modified to support both the Unix and Windows
-          versions.  The windows version has been tested with the
-          Activeware port of Perl 5.003 running under Windows 95.
-          The C source generated by SWIG should compile without
-          modification under both versions of Perl, but is now
-          even more hideous than before.
-
-2/25/97 : Modified parser to allow scope resolution operation to
-          appear in expressions and default arguments as in :
-
-                void foo(int a =  Bar::defvalue);
-
-2/25/97 : Fixed bug when resolving symbols inside C++ classes.
-          For example :
-
-               class Foo {
-               public:
-                   enum Value {ALE, STOUT, LAGER};
-                   ...
-                   void defarg(Value v = STOUT);
-
-              };
-
-2/24/97 : Fixed bug with member functions returning void *.
-
-2/23/97 : Modified Python module to be better behaved under Windows
-
-            -  Module initialization function is now properly exported.
-               It should not be necessary to explicitly export this function
-               yourself.
-
-            -  Bizarre compilation problems when compiling the SWIG wrapper
-               code as ANSI C under Visual C++ 4.x fixed.
-
-            -  Tested with both the stock Python-1.4 distribution and Pythonwin
-               running under Win95.
-
-2/19/97 : Fixed typedef handling bug in Perl5 shadow classes.
-
-2/19/97 : Added exception support.  To use it, do the following :
-
-              %except(lang) {
-                  ... try part of the exception ...
-                  $function
-                  ... catch part of exception ...
-              }
-
-          $function is a SWIG variable that will be replaced by the
-          actual C/C++ function call in a wrapper function.  Thus,
-          a real exception specification might look like this :
-
-             %except(perl5) {
-                  try {
-                  $function
-                  } catch (char *& sz) {
-                    ... process an exception ...
-                  } catch(...) {
-                    croak("Unknown exception. Bailing out...");
-                  }
-             }
-
-2/19/97 : Added support for managing generic code fragments (needed
-          for exceptions).
-
-2/19/97 : Fixed some really obscure typemap scoping bugs in the C++
-          handler.
-
-2/18/97 : Cleaned up perlmain.i file by removing some problematic,
-          but seemingly unnecessary declarations.
-
-2/18/97 : Optimized handling of member functions under inheritance.
-          SWIG can now use wrapper functions generated for a
-          base class instead of regenerating wrappers for
-          the same functions in a derived class.    This could
-          make a drastic reduction in wrapper code size for C++
-          applications with deep inheritance hierarchies and
-          lots of functions.
-
-2/18/97 : Additional methods specified with %addmethods can now
-          be inherited along with normal C++ member functions.
-
-2/18/97 : Minor internal fixes to make SWIG's string handling a little
-          safer.
-
-2/16/97 : Moved some code generation of Tcl shadow classes to
-          library files.
-
-2/16/97 : Fixed documentation error of '-configure' method in
-          Tcl modules.
-
-2/16/97 : Modified Perl5 module slightly to allow typemaps
-          to use Perl references.
-
-2/12/97 : Fixed argument checking bug that was introduced by
-          default arguments (function calls with too many
-          arguments would still be executed).  Functions now
-          must have the same number of arguments as C version
-          (with possibility of default/optional arguments
-          still supported).
-
-2/12/97 : Fixed default argument bug in Perl5 module when
-          generating wrapper functions involving default
-          arguments of complex datatypes.
-
-2/12/97 : Fixed typemap scoping problems.  For example :
-
-              %typemap(tcl,in) double {
-                    .. get a double ..
-              }
-
-              class Foo {
-              public:
-                   double bar(double);
-              }
-
-              %typemap(tcl,in) double {
-                    .. new get double ..
-              }
-
-          Would apply the second typemap to all functions in Foo
-          due to delayed generation of C++ wrapper code (clearly this
-          is not the desired effect).   Problem has been fixed by
-          assigning unique numerical identifiers to every datatype in
-          an interface file and recording the "range of effect" of each
-          typemap.
-
-2/11/97 : Added support for "ignore" and "default" typemaps.  Only use
-          if you absolutely know what you're doing.
-
-2/9/97  : Added automatic creation of constructors and destructors for
-          C structs and C++ classes that do not specify any sort of
-          constructor or destructor.   This feature can be enabled by
-          running SWIG with the '-make_default' option or by inserting
-          the following pragma into an interface file :
-
-                 %pragma make_default
-
-          The following pragma disables automatic constructor generation
-
-                 %pragma no_default
-
-2/9/97  : Added -make_default option for producing default constructors
-          and destructors for classes without them.
-
-2/9/97  : Changed the syntax of the SWIG %pragma directive to
-          %pragma option=value or %pragma(lang) option=value.
-          This change makes the syntax a little more consistent
-          between general pragmas and language-specific pragmas.
-          The old syntax still works, but will probably be phased
-          out (a warning message is currently printed).
-
-2/9/97  : Improved Tcl support of global variables that are of
-          structures, classes, and unions.
-
-2/9/97  : Fixed C++ compilation problem in Python 'embed.i' library file.
-
-2/9/97  : Fixed missing return value in perlmain.i library file.
-
-2/9/97  : Fixed Python shadow classes to return an AttributeError when
-          undefined attributes are accessed (older versions returned
-          a NameError).
-
-2/9/97  : Fixed bug when %addmethods is used after a class definition whose
-          last section is protected or private.
-
-2/8/97  : Made slight changes in include file processing to support
-          the Macintosh.
-
-2/8/97  : Extended swigmain.cxx to provide a rudimentary Macintosh interface.
-          It's a really bad interface, but works until something better
-          is written.
-
-1/29/97 : Fixed type-casting bug introduced by 1.1b4 when setting/getting the
-          value of global variables involving complex data types.
-
-1/29/97 : Removed erroneous white space before an #endif in the code generated
-          by the Python module (was causing errors on DEC Alpha compilers).
-
-1/26/97 : Fixed errors when using default/optional arguments in Python shadow
-	  shadow classes.
-
-1/23/97 : Fixed bug with nested %extern declarations.
-
-1/21/97 : Fixed problem with typedef involving const datatypes.
-
-1/21/97 : Somewhat obscure, but serious bug with having multiple levels
-          of typedefs fixed.  For example :
-
-		typedef char *String;
-                typedef String  Name;
-
-Version 1.1 Beta4 (January 16, 1997)
-====================================
-
-Note : SWIG 1.1b3 crashed and burned shortly after take off due
-to a few major run-time problems that surfaced after release.
-This release should fix most, if not all, of those problems.
-
-1/16/97 : Fixed major memory management bug on Linux
-
-1/14/97 : Fixed bug in functions returning constant C++ references.
-
-1/14/97 : Modified C++ module to handle datatypes better.
-
-1/14/97 : Modified parser to allow a *single* scope resolution
-          operator in datatypes.  Ie : Foo::bar.   SWIG doesn't
-          yet handle nested classes, so this should be
-          sufficient for now.
-
-1/14/97 : Modified parser to allow typedef inside a C++ class.
-
-1/14/97 : Fixed some problems related to datatypes defined inside
-          a C++ class.  SWIG was not generating correct code,
-          but a new scoping mechanism and method for handling
-          datatypes inside a C++ class have been added.
-
-1/14/97 : Changed enumerations to use the value name instead
-          of any values that might have appeared in the interface
-          file.  This makes the code a little more friendly to
-          C++ compilers.
-
-1/14/97 : Removed typedef bug that made all enumerations
-          equivalent to each other in the type checker (since
-          it generated alot of unnecessary code).
-
-Version 1.1 Beta3 (January 9, 1997)
-===================================
-
-Note : A *huge* number of changes related to ongoing modifications.
-
-1.  Support for C++ multiple inheritance added.
-
-2.  Typemaps added.
-
-3.  Some support for nested structure definitions added.
-
-4.  Default argument handling added.
-
-5.  -c option added for building bare wrapper code modules.
-
-6.  Rewrote Pointer type-checking to support multiple inheritance
-    correctly.
-
-7.  Tcl 8.0 module added.
-
-8.  Perl4 and Guile modules resurrected from the dead (well, they
-    at least work again).
-
-9.  New Object Oriented Tcl interface added.
-
-10. Bug fixes to Perl5 shadow classes.
-
-11. Cleaned up many of the internal modules of the parser.
-
-12. Tons of examples and testing modules added.
-
-13. Fixed bugs related to use of "const" return values.
-
-14. Fixed bug with C++ member functions returning void *.
-
-15. Changed SWIG configuration script.
-
-Version 1.1 Beta2 (December 3, 1996)
-====================================
-
-1. Completely rewrote the SWIG documentation system.  The changes
-   involved are too numerous to mention.  Basically, take everything
-   you knew about the old system, throw them out, and read the
-   file Doc/doc.ps.
-
-2. Limited support for #if defined() added.
-
-3. Type casts are now allowed in constant expressions.  ie
-
-         #define  A   (int) 3
-
-4. Added support for typedef lists.  For example :
-
-	typedef struct {
-	        double x,y,z;
-        } Vector, *VectorPtr;
-
-5. New SWIG directives (related to documentation system)
-
-	%style
-	%localstyle
-	%subsection
-	%subsubsection
-
-6. Reorganized the C++ handling and made it a little easier to
-   work with internally.
-
-7.  Fixed problem with inheriting data members in Python
-    shadow classes.
-
-8.  Fixed symbol table problems with shadow classes in both
-    Python and Perl.
-
-9.  Fixed annoying segmentation fault bug in wrapper code
-    generated for Perl5.
-
-10. Fixed bug with %addmethods directive.  Now it can be placed
-    anywhere in a class.
-
-11. More test cases added to the SWIG self-test.   Documentation
-    tests are now performed along with other things.
-
-12. Reorganized the SWIG library a little bit and set it up to
-    self-document itself using SWIG.
-
-13. Lots and lots of minor bug fixes (mostly obscure, but bugs
-    nonetheless).
-
-
-Version 1.1 Beta1 (October 30, 1996)
-====================================
-
-1. Added new %extern directive for handling multiple files
-
-2. Perl5 shadow classes added
-
-3. Rewrote conditional compilation to work better
-
-4. Added 'bool' datatype
-
-5. %{,%} block is now optional.
-
-6. Fixed some bugs in the Python shadow class module
-
-7. Rewrote all of the SWIG tests to be more informative
-   (and less scary).
-
-8. Rewrote parameter list handling to be more memory
-   efficient and flexible.
-
-9. Changed parser to ignore 'static' declarations.
-
-10. Initializers are now ignored.  For example :
-
-	struct FooBar a = {3,4,5};
-
-11. Somewhat better parsing of arrays (although it's
-    usually just a better error message now).
-
-12. Lot's of minor bug fixes.
-
-
-Version 1.0 Final (August 31, 1996)
-===================================
-
-1. Fixed minor bug in C++ module
-
-2. Fixed minor bug in pointer type-checker when using
-   -DALLOW_NULL.
-
-3. Fixed configure script to work with Python 1.4beta3
-
-4. Changed configure script to allow compilation without
-   yacc or bison.
-
-Version 1.0 Final (August 28, 1996)
-===================================
-
-1.  Changed parser to support more C/C++ datatypes (well,
-    more variants).   Types like "unsigned", "short int",
-    "long int", etc... now work.
-
-2.  "unions" added to parser.
-
-3.  Use of "typedef" as in :
-
-	typedef struct {
-	     double x,y,z;
-	} Vector;
-
-    Now works correctly.   The name of the typedef is used as
-    the structure name.
-
-4.  Conditional compilation with #ifdef, #else, #endif, etc...
-    added.
-
-5.  New %disabledoc, %enabledoc directives allow documentation
-    to selectively be disabled for certain parts of a wrapper
-    file.
-
-6.  New Python module supports better variable linking, constants,
-    and shadow classes.
-
-7.  Perl5 module improved with better compatibility with XS
-    and xsubpp.   SWIG pointers and now created so that they
-    are compatible with xsubpp pointers.
-
-8.  Support for [incr Tcl] namespaces added to Tcl module.
-
-9.  %pragma directive added.
-
-10. %addmethods directive added.
-
-11. %native directive added to allow pre-existing wrapper functions
-    to be used.
-
-12. Wrote configure script for SWIG installation.
-
-13. Function pointers now allowed with typedef statements.
-
-14. %typedef modified to insert a corresponding C typedef into
-    the output file.
-
-15. Fixed some problems related to C++ references.
-
-16. New String and WrapperFunction classes add to make generating
-    wrapper code easier.
-
-17. Fixed command line option processing to eliminate core dumps
-    and to allow help messages.
-
-18. Lot's of minor bug fixes to almost all code modules
-
-
-Version 1.0 Beta 3 (Patch 1) July 17, 1996
-==========================================
-
-1.0 Final is not quite ready yet, but this release fixes a
-number of immediate problems :
-
-1.  Compiler errors when using -strict 1 type checking have been fixed.
-
-2.  Pointer type checker now recognizes pointers of the form
-    _0_Type correctly.
-
-3.  A few minor fixes were made in the Makefile
-
-Version 1.0 Beta 3 (June 14, 1996)
-==================================
-
-
-There are lots of changes in this release :
-
-1.  SWIG is now invoked using the "swig" command instead of "wrap".
-    Hey, swig sounds cooler.
-
-2.  The SWIG_LIB environment variable can be set to change the
-    location where SWIG looks for library files.
-
-3.  C++ support has been added.   You should use the -c++ option
-    to enable it.
-
-4.  The %init directive has been replaced by the %module directive.
-    %module constructs a valid name for the initialization function
-    for whatever target language you're using (actually this makes
-    SWIG files a little cleaner).  The old %init directive still works.
-
-5.  The syntax of the %name directive has been changed.   Use of the
-    old one should generate a warning message, but may still work.
-
-6.  To support Tcl/Tk on non-unix platforms, SWIG imports a file called
-    swigtcl.cfg from the $(SWIG_LIB)/tcl directory.   I don't have access
-    to an NT machine, but this file is supposedly allows SWIG to
-    produce wrapper code that compiles on both UNIX and non UNIX machines.
-    If this doesn't work, you'll have to edit the file swigtcl.cfg. Please
-    let me know if this doesn't work so I can update the file as
-    necessary.
-
-7.  The SWIG run-time typechecker has been improved.    You can also
-    now redefine how it works by supplying a file called "swigptr.cfg"
-    in the same directory as your SWIG interface files.   By default,
-    SWIG reads this file from $(SWIG_LIB)/config.
-
-8.  The documentation system has been changed to support the following :
-
-	-  Documentation order is printed in interface file order by
-           default.   This can be overridden by putting an %alpha
-           directive in the beginning of the interface file.
-
-        -  You can supply additional documentation text using
-
-           %text %{ put your text here %}
-
-        -  A few minor bugs were fixed.
-
-9.  A few improvements have been made to the handling of command line
-    options (but it's still not finished).
-
-10.  Lots of minor bug fixes in most of the language modules have been
-     made.
-
-11. Filenames have been changed to 8.3 for compatibility with a SWIG
-    port to non-unix platforms (work in progress).
-
-12. C++ file suffix is now .cxx (for same reason).
-
-13. The documentation has been upgraded significantly and is now
-    around 100 pages.    I added new examples and a section on
-    C++.  The documentation now includes a Table of Contents.
-
-14. The SWIG Examples directory is still woefully sparse, but is
-    getting better.
-
-Special notice about C++
-------------------------
-This is the first version of SWIG to support C++ parsing.  Currently
-the C++ is far from complete, but seems to work for simple cases.
-No work has been done to add special C++ processing to any of
-the target languages.   See the user manual for details about how
-C++ is handled.   If you find problems with the C++ implementation,
-please let me know.  Expect major improvements in this area.
-
-Note : I have only successfully used SWIG and C++ with Tcl and
-Python.
-
-Notice about Version 1.0Final
------------------------------
-
-Version 1.0B3 is the last Beta release before version 1.0 Final is
-released.  I have frozen the list of features supported in version 1.0
-and will only fix bugs as they show up.  Work on SWIG version 2.0 is
-already in progress, but is going to result in rather significant
-changes to SWIG's internal structure (hopefully for the better).  No
-anticipated date for version 2.0 is set, but if you've got an idea,
-let me know.
-
-Version 1.0 Beta 2 (April 26, 1996)
-===================================
-
-This release is identical to Beta1 except a few minor bugs are
-fixed and the SWIG library has been updated to work with Tcl 7.5/Tk 4.1.
-A tcl7.5 examples directory is now included.
-
-- Fixed a bug in the Makefile that didn't install the libraries
-  correctly.
-
-- SWIG Library files are now updated to work with Tcl 7.5 and Tk 4.1.
-
-- Minor bug fixes in other modules.
-
-
-Version 1.0 Beta 1  (April 10, 1996).
-=====================================
-
-This is the first "semi-official" release of SWIG.    It has a
-number of substantial improvements over the Alpha release.   These
-notes are in no particular order--hope I remembered everything....
-
-1.  Tcl/Tk
-
-SWIG is known to work with Tcl7.3, Tk3.6 and later versions.
-I've also tested SWIG with expect-5.19.
-
-Normally SWIG expects to use the header files "tcl.h" and "tk.h".
-Newer versions of Tcl/Tk use version numbers.   You can specify these
-in SWIG as follows :
-
-        % wrap -htcl tcl7.4.h -htk tk4.0.h example.i
-
-Of course, I prefer to simply set up symbolic links between "tcl.h" and
-the most recent stable version on the machine.
-
-2.  Perl4
-
-This implementation has been based on Perl-4.035.  SWIG's interface to
-Perl4 is based on the documentation provided in the "Programming Perl"
-book by Larry Wall, and files located in the "usub" directory of the
-Perl4 distribution.
-
-In order to compile with Perl4, you'll need to link with the uperl.o
-file found in the Perl4 source directory.  You may want to move this
-file to a more convenient location.
-
-3.  Perl5
-
-This is a somewhat experimental implementation, but is alot less
-buggy than the alpha release.     SWIG operates independently of
-the XS language and xsubpp supplied with Perl5.  Currently SWIG
-produces the necessary C code and .pm file needed to dynamically
-load a module into Perl5.
-
-To support Perl5's notion of modules and packages (as with xsubpp),
-you can use the following command line options :
-
-        % wrap -perl5 -module MyModule -package MyPackage example.i
-
-Note : In order for dynamic loading to be effective, you need to be
-careful about naming.    For a module named "MyModule", you'll need to
-create a shared object file called "MyModule.so" using something like
-
-        % ld -shared my_obj.o -o MyModule.so
-
-The use of the %init directive must match the module name since Perl5
-calls a function "boot_ModuleName" in order to initialize things.
-See the Examples directory for some examples of how to get things
-to work.
-
-4.  Python1.3
-
-This is the first release supporting Python.    The Python port is
-experimental and may be rewritten.   Variable linkage is done through
-functions which is sort of a kludge.  I also think it would be nice
-to import SWIG pointers into Python as a new object (instead of strings).
-Of course, this needs a little more work.
-
-5.  Guile3
-
-If you really want to live on the edge, pick up a copy of Guile-iii and
-play around with this.      This is highly experimental---especially since
-I'm not sure what the official state of Guile is these days.  This
-implementation may change at any time should I suddenly figure out better
-ways to do things.
-
-6.  Extending SWIG
-
-SWIG is written in C++ although I tend to think of the code as mostly
-being ANSI C with a little inheritance thrown in.   Each target language
-is implemented as a C++ class that can be plugged into the system.
-If you want to add your own modifications, see Appendix C of the user
-manual.   Then take a look at the "user" directory which contains some
-code for building your own extenions.
-
-7. The SWIG library
-
-The SWIG library is still incomplete.  Some of the files mentioned in
-the user manual are unavailable.    These files will be made available
-when they are ready.   Subscribe to the SWIG mailing list for announcements
-and updates.
-
-8. SWIG Documentation
-
-I have sometimes experienced problems viewing the SWIG documentation in
-some postscript viewers.   However, the documentation seems to print
-normally.    I'm working on making much of the documentation online,
-but this takes time.
-
-Version 0.1 Alpha (February 9, 1996)
-====================================
-
-1.  Run-time type-checking of SWIG pointers.   Pointers are now represented
-    as strings with both numeric and encoded type information.    This makes
-    it a little harder to shoot yourself in the foot (and it eliminates
-    some segmentation faults and other oddities).
-
-2.  Python 1.3 now supported.
-
-3.  #define and enum can be used to install constants.
-
-4.  Completely rewrote the %include directive and made it alot more powerful.
-
-5.  Restructured the SWIG library to make it work better.
-
-6.  Various bug fixes to Tcl, Perl4, Perl5, and Guile implementations.
-
-7.  Better implementation of %typedef directive.
-
-8.  Made some changes to SWIG's class structure to make it easier to expand.
-    SWIG is now built into a library file that you can use to make your
-    own extenions.
-
-9.  Made extensive changes to the documentation.
-
-10. Minor changes to the SWIG parser to make it use less memory.
-    Also took out some extraneous rules that were undocumented and
-    didn't work in the first place.
-
-11. The SWIG library files "tclsh", "wish", "expect", etc... in the first
-    release have been restructured and renamed to "tclsh.i", "wish.i",
-    and so on.
diff --git a/dependencies2013/win32/swig/CHANGES.current b/dependencies2013/win32/swig/CHANGES.current
deleted file mode 100644
index 197ec773..00000000
--- a/dependencies2013/win32/swig/CHANGES.current
+++ /dev/null
@@ -1,133 +0,0 @@
-Below are the changes for the current release.
-See the CHANGES file for changes in older releases.
-See the RELEASENOTES file for a summary of changes in each release.
-Issue # numbers mentioned below can be found on Github. For more details, add
-the issue number to the end of the URL: https://github.com/swig/swig/issues/
-
-Version 3.0.12 (27 Jan 2017)
-============================
-
-2017-01-27: wsfulton
-            [C#] #882 Fix missing filename in error messages when there is a problem
-            writing out C# files.
-
-2017-01-27: briancaine
-            [Guile] #744 Fix compilation errors in Guile wrappers - regression
-            introduced in swig-3.0.11.
-
-2017-01-24: andrey-starodubtsev
-            [Java] Apply #704 - director typemap improvements.
-            Memory leak fixes, add support for "directorargout" typemap and
-            add director support to typemaps.i.
-
-2017-01-24: wsfulton
-            Enhance %extend to extend a class with template constructors, eg:
-
-              struct Foo {
-                %extend {
-                  template<typename T>
-                  Foo(int a, T b) {
-                    ...
-                  }
-                }
-              };
-              %template(Foo) Foo::Foo<double>;
-
-2017-01-22: wsfulton
-            Issue #876 Enhance %extend to extend a class with template methods, eg:
-
-              struct Foo {
-                %extend {
-                  template<typename T>
-                  void do_stuff(int a, T b) {
-                    ...
-                  }
-                }
-              };
-              %template(do_stuff_inst) Foo::do_stuff<double>;
-
-              Similarly for static template methods.
-
-2017-01-22: kwwette
-            [Octave] add support for version 4.2
-            - The Octave API now uses some C++11 features. It is recommended to use
-              the mkoctfile program supplied by Octave to compile the SWIG-generated
-              wrapper code, as mkoctfile will ensure the correct C++ compiler/options
-              are used. Otherwise, the value of `mkoctfile -p CXX` should be parsed
-              for any -std=* flags which might be present.
-            - Octave has dropped support for << and >> operators, so SWIG now
-              ignores them.
-            - The Octave error() function now raises C++ exceptions to propagate
-              Octave errors, so %exception directives may need to be modified.
-              For convenience the SWIG_RETHROW_OCTAVE_EXCEPTIONS macro can be used
-              to rethrow any Octave exceptions for Octave itself to handle, e.g.:
-
-                try {
-                  $action                        // may call error()
-                }
-                SWIG_RETHROW_OCTAVE_EXCEPTIONS   // error() exceptions are rethrown
-                catch(...) {
-                  ...                            // all other exceptions
-                }
-
-            *** POTENTIAL INCOMPATIBILITY ***
-
-2017-01-16: wkalinin
-            [C#] Fix #733 regression introduced in swig-3.0.9.
-            Missing virtual function override in C# layer when using %import.
-
-2017-01-16: fschlimb
-            Fix #813 template symbol name lookup bug when typedef names are the same but in different
-            namespaces.
-
-2017-01-15: wsfulton
-            [C# D Java]
-            The SWIG library no longer uses the javatype, dtype or cstype typemaps, thereby
-            completely freeing them up for users to use without having to replicate the library
-            code that they previously added. The code previously generated by these typemaps
-            has been replaced by the new %proxycode directive. Their use in the library code
-            was fairly minimal:
-
-              C#   cstype:   std_array.i std_map.i std_vector.i
-              D    dtype:    std_vector.i
-              Java javatype: arrays_java.i
-
-2017-01-14: wsfulton
-            The %extend directive can now optionally support one of the 'class', 'struct' or 'union'
-            keywords before the identifier name, for example:
-
-              struct X { ... };
-              %extend struct X { ... }
-
-            Previously this had to specified as:
-
-              struct X { ... };
-              %extend X { ... }
-
-2017-01-13: wsfulton
-	    [C# D Java] Add new %proxycode directive which is a macro for %insert("proxycode").
-            This is a way of adding pure C#/D/Java code into the appropriate proxy class, eg:
-
-              %extend Proxy2 {
-              %proxycode %{
-                public int proxycode2(int i) {
-                  return i+2;
-                }
-              %}
-              }
-
-              %inline %{
-              struct Proxy2 {};
-              %}
-
-            There will then be a pure Java/C#/D method called proxycode2 in the Proxy2 class.
-
-2016-12-31: ajrheading1
-	    Issue #860 - Remove use of std::unary_function and std::binary_function
-            which is deprecated in C++11.
-
-2016-12-30: olly
-	    [PHP7] Register internal 'swig_runtime_data_type_pointer' constant
-	    as "CONST_PERSISTENT" to avoid segmentation fault on module unload.
-	    Fixes #859 reported by Timotheus Pokorra. Thanks also to Javier Torres
-	    for a minimal reproducer.
diff --git a/dependencies2013/win32/swig/COPYRIGHT b/dependencies2013/win32/swig/COPYRIGHT
deleted file mode 100644
index c3fbbdeb..00000000
--- a/dependencies2013/win32/swig/COPYRIGHT
+++ /dev/null
@@ -1,111 +0,0 @@
-SWIG Copyright and Authors
---------------------------
-
-Copyright (c) 1995-2011 The SWIG Developers
-Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona).
-Copyright (c) 1998-2005 University of Chicago.
-Copyright (c) 1995-1998 The University of Utah and the Regents of the University of California
-
-Portions also copyrighted by:
- Network Applied Communication Laboratory, Inc
- Information-technology Promotion Agency, Japan
-
-Active SWIG Developers:
- William Fulton (wsf@fultondesigns.co.uk)                 (SWIG core, Java, C#, Windows, Cygwin)
- Olly Betts (olly@survex.com)                             (PHP)
- Joseph Wang (joequant@gmail.com)                         (R)
- Xavier Delacour (xavier.delacour@gmail.com)              (Octave)
- David Nadlinger (code@klickverbot.at)                    (D)
- Oliver Buchtala (oliver.buchtala@gmail.com)              (Javascript)
- Neha Narang (narangneha03@gmail.com)                     (Javascript)
- Simon Marchetto (simon.marchetto@scilab-enterprises.com) (Scilab)
-
-Past SWIG developers and major contributors include:
- Dave Beazley (dave-swig@dabeaz.com)                      (SWIG core, Python, Tcl, Perl)
- Henning Thielemann (swig@henning-thielemann.de)          (Modula3)
- Matthias Köppe (mkoeppe@mail.math.uni-magdeburg.de)      (Guile, MzScheme)
- Luigi Ballabio (luigi.ballabio@fastwebnet.it)            (STL wrapping)
- Mikel Bancroft (mikel@franz.com)                         (Allegro CL)
- Surendra Singhi (efuzzyone@netscape.net)                 (CLISP, CFFI)
- Marcelo Matus (mmatus@acms.arizona.edu)                  (SWIG core, Python, UTL[python,perl,tcl,ruby])
- Art Yerkes (ayerkes@speakeasy.net)                       (Ocaml)
- Lyle Johnson (lyle@users.sourceforge.net)                (Ruby)
- Charlie Savage (cfis@interserv.com)                      (Ruby)
- Thien-Thi Nguyen (ttn@glug.org)                          (build/test/misc)
- Richard Palmer (richard@magicality.org)                  (PHP)
- Sam Liddicott - Ananova Ltd (saml@liddicott.com)         (PHP)
- Tim Hockin - Sun Microsystems (thockin@sun.com)          (PHP)
- Kevin Ruland                                             (PHP)
- Shibukawa Yoshiki                                        (Japanese Translation)
- Jason Stewart (jason@openinformatics.com)                (Perl5)
- Loic Dachary                                             (Perl5)
- David Fletcher                                           (Perl5)
- Gary Holt                                                (Perl5)
- Masaki Fukushima                                         (Ruby)
- Scott Michel (scottm@cs.ucla.edu)                        (Java directors)
- Tiger Feng (songyanf@cs.uchicago.edu)                    (SWIG core)
- Mark Rose (mrose@stm.lbl.gov)                            (Directors)
- Jonah Beckford (beckford@usermail.com)                   (CHICKEN)
- Ahmon Dancy (dancy@franz.com)                            (Allegro CL)
- Dirk Gerrits                                             (Allegro CL)
- Neil Cawse                                               (C#)
- Harco de Hilster                                         (Java)
- Alexey Dyachenko (dyachenko@fromru.com)                  (Tcl)
- Bob Techentin                                            (Tcl)
- Martin Froehlich <MartinFroehlich@ACM.org>               (Guile)
- Marcio Luis Teixeira <marciot@holly.colostate.edu>       (Guile)
- Duncan Temple Lang                                       (R)
- Miklos Vajna <vmiklos@frugalware.org>                    (PHP directors)
- Mark Gossage (mark@gossage.cjb.net)                      (Lua)
- Raman Gopalan (ramangopalan@gmail.com)                   (eLua)
- Gonzalo Garramuno (ggarra@advancedsl.com.ar)             (Ruby, Ruby's UTL)
- John Lenz                                                (Guile, MzScheme updates, Chicken module, runtime system)
- Baozeng Ding  <sploving1@163.com>                        (Scilab)
- Ian Lance Taylor                                         (Go)
- Vadim Zeitlin                                            (PCRE, Python)
- Stefan Zager (szager@gmail.com)                          (Python)
- Vincent Couvert                                          (Scilab)
- Sylvestre Ledru                                          (Scilab)
- Wolfgang Frisch                                          (Scilab)
-
-Past contributors include:
- James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran
- Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn,
- Edward Zimmermann, David Ascher, Dominique Dumont, Pier Giorgio Esposito, Hasan Baran Kovuk,
- Klaus Wiederänders, Richard Beare, Hans Oesterholt.
- (See CHANGES and CHANGES.current and the bug tracker for a more complete list).
-
-Past students:
- Songyan Feng (Chicago).
- Xinghua Shi (Chicago).
- Jing Cao (Chicago).
- Aquinas Hobor (Chicago).
-
-Historically, the following people contributed to early versions of SWIG.
-Peter Lomdahl, Brad Holian, Shujia Zhou, Niels Jensen, and Tim Germann
-at Los Alamos National Laboratory were the first users. Patrick
-Tullmann at the University of Utah suggested the idea of automatic
-documentation generation. John Schmidt and Kurtis Bleeker at the
-University of Utah tested out the early versions.  Chris Johnson
-supported SWIG's developed at the University of Utah. John Buckman,
-Larry Virden, and Tom Schwaller provided valuable input on the first
-releases and improving the portability of SWIG. David Fletcher and
-Gary Holt have provided a great deal of input on improving SWIG's
-Perl5 implementation. Kevin Butler contributed the first Windows NT
-port.
-
-Early bug reports and patches:
-Adam Hupp, Arthur Smyles, Brad Clements, Brett Williams, Buck Hodges,
-Burkhard Kloss, Chia-Liang Kao, Craig Files, Dennis Marsa, Dieter Baron,
-Drake Diedrich, Fleur Diana Dragan, Gary Pennington, Geoffrey Hort, Gerald Williams,
-Greg Anderson, Greg Kochanski, Greg Troxel, Henry Rowley, Irina Kotlova,
-Israel Taller, James Bailey, Jim Fulton, Joel Reed, Jon Travis,
-Junio Hamano, Justin Heyes-Jones, Karl Forner, Keith Davidson,
-Krzysztof Kozminski, Larry Virden, Luke J Crook, Magnus Ljung, Marc Zonzon,
-Mark Howson, Micahel Scharf, Michel Sanner, Mike Romberg, Mike Simons,
-Mike Weiblen, Paul Brannan, Ram Bhamidipaty, Reinhard Fobbe, Rich Wales,
-Richard Salz, Roy Lecates, Rudy Albachten, Scott Drummonds
-Scott Michel, Shaun Lowry, Steve Galser, Tarn Weisner Burton,
-Thomas Weidner, Tony Seward, Uwe Steinmann, Vadim Chugunov, Wyss Clemens,
-Zhong Ren.
-
diff --git a/dependencies2013/win32/swig/INSTALL b/dependencies2013/win32/swig/INSTALL
deleted file mode 100644
index 666ffd9f..00000000
--- a/dependencies2013/win32/swig/INSTALL
+++ /dev/null
@@ -1,226 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for variables by setting
-them in the environment.  You can do that on the command line like this:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Environment Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it cannot guess the host type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the host
-platform (i.e., that on which the generated programs will eventually be
-run) with `--host=TYPE'.  In this case, you should also specify the
-build platform with `--build=TYPE', because, in this case, it may not
-be possible to guess the build platform (it sometimes involves
-compiling and running simple test programs, and this can't be done if
-the compiler is a cross compiler).
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Environment Variables
-=====================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to configure.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/dependencies2013/win32/swig/LICENSE b/dependencies2013/win32/swig/LICENSE
deleted file mode 100644
index d7a422fd..00000000
--- a/dependencies2013/win32/swig/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-SWIG is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version. See the LICENSE-GPL file for
-the full terms of the GNU General Public license version 3.
-
-Portions of SWIG are also licensed under the terms of the licenses
-in the file LICENSE-UNIVERSITIES. You must observe the terms of
-these licenses, as well as the terms of the GNU General Public License,
-when you distribute SWIG.
-
-The SWIG library and examples, under the Lib and Examples top level 
-directories, are distributed under the following terms:
-
-  You may copy, modify, distribute, and make derivative works based on
-  this software, in source code or object code form, without
-  restriction. If you distribute the software to others, you may do
-  so according to the terms of your choice. This software is offered as
-  is, without warranty of any kind.
-
-See the COPYRIGHT file for a list of contributors to SWIG and their
-copyright notices.
diff --git a/dependencies2013/win32/swig/LICENSE-GPL b/dependencies2013/win32/swig/LICENSE-GPL
deleted file mode 100644
index 94a9ed02..00000000
--- a/dependencies2013/win32/swig/LICENSE-GPL
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/dependencies2013/win32/swig/LICENSE-UNIVERSITIES b/dependencies2013/win32/swig/LICENSE-UNIVERSITIES
deleted file mode 100644
index 44fcaa13..00000000
--- a/dependencies2013/win32/swig/LICENSE-UNIVERSITIES
+++ /dev/null
@@ -1,95 +0,0 @@
-SWIG is distributed under the following terms:
-
-I.  
-
-Copyright (c) 1995-1998
-The University of Utah and the Regents of the University of California
-All Rights Reserved
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that 
-(1) The above copyright notice and the following two paragraphs
-appear in all copies of the source code and (2) redistributions
-including binaries reproduces these notices in the supporting
-documentation.   Substantial modifications to this software may be
-copyrighted by their authors and need not follow the licensing terms
-described here, provided that the new terms are clearly indicated in
-all files where they apply.
-
-IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE 
-UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY
-PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,
-EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH
-SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND 
-THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE,
-SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-
-II. 
-
-This software includes contributions that are Copyright (c) 1998-2005
-University of Chicago.
-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 University of Chicago 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 UNIVERSITY OF CHICAGO 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 UNIVERSITY OF
-CHICAGO 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.
-
-
-III.  
-
-This software includes contributions that are Copyright (c) 2005-2006
-Arizona Board of Regents (University of Arizona).
-All Rights Reserved
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that 
-(1) The above copyright notice and the following paragraph
-appear in all copies of the source code and (2) redistributions
-including binaries reproduces these notices in the supporting
-documentation.   Substantial modifications to this software may be
-copyrighted by their authors and need not follow the licensing terms
-described here, provided that the new terms are clearly indicated in
-all files where they apply.
-
-THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF ARIZONA 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 UNIVERSITY OF
-ARIZONA 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/dependencies2013/win32/swig/Lib/allegrocl/allegrocl.swg b/dependencies2013/win32/swig/Lib/allegrocl/allegrocl.swg
deleted file mode 100644
index 152e5e6f..00000000
--- a/dependencies2013/win32/swig/Lib/allegrocl/allegrocl.swg
+++ /dev/null
@@ -1,613 +0,0 @@
-/* Define a C preprocessor symbol that can be used in interface files
-   to distinguish between the SWIG language modules. */ 
-
-#define SWIG_ALLEGRO_CL
-
-#define %ffargs(...) %feature("ffargs", "1", ##__VA_ARGS__)
-%ffargs(strings_convert="t");
-
-/* typemaps for argument and result type conversions. */
-%typemap(lin,numinputs=1)	SWIGTYPE 	"(cl::let (($out $in))\n  $body)";
-
-%typemap(lout) bool, char, unsigned char, signed char,
-               short, signed short, unsigned short,
-               int, signed int, unsigned int,
-               long, signed long, unsigned long,
-               float, double, long double, char *, void *,
-               enum SWIGTYPE    "(cl::setq ACL_ffresult $body)";
-%typemap(lout) void "$body";
-#ifdef __cplusplus
-%typemap(lout) SWIGTYPE[ANY], SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&
-%{ (cl:let* ((address $body)
-	  (new-inst (cl:make-instance '$lclass :foreign-address address)))
-     (cl:when (cl:and $owner (cl:not (cl:zerop address)))
-       (excl:schedule-finalization new-inst #'$ldestructor))
-     (cl:setq ACL_ffresult new-inst)) %}
-
-%typemap(lout) SWIGTYPE         "(cl::let* ((address $body)\n         (new-inst (cl::make-instance '$lclass :foreign-address address)))\n    (cl::unless (cl::zerop address)\n      (excl:schedule-finalization new-inst #'$ldestructor))\n    (cl::setq ACL_ffresult new-inst))";
-#else
-%typemap(lout) SWIGTYPE[ANY], SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE
-%{ (cl:let* ((address $body)
-	  (new-inst (cl:make-instance '$lclass :foreign-address address)))
-     (cl:setq ACL_ffresult new-inst)) %}
-#endif
-
-%typemap(lisptype) bool, const bool "cl:boolean";
-%typemap(lisptype) char, const char "cl:character";
-%typemap(lisptype) unsigned char, const unsigned char "cl:integer";
-%typemap(lisptype) signed char, const signed char "cl:integer";
-
-%typemap(ffitype) bool, const bool ":int";
-%typemap(ffitype) char, const char,
-		  signed char, const signed char ":char";
-%typemap(ffitype) unsigned char, const unsigned char ":unsigned-char";
-%typemap(ffitype) short, const short,
-		  signed short, const signed short ":short";
-%typemap(ffitype) unsigned short, const unsigned short ":unsigned-short";
-%typemap(ffitype) int, const int, signed int, const signed int ":int";
-%typemap(ffitype) unsigned int, const unsigned int ":unsigned-int";
-%typemap(ffitype) long, const long, signed long, const signed long ":long";
-%typemap(ffitype) unsigned long, const unsigned long ":unsigned-long";
-%typemap(ffitype) float, const float ":float";
-%typemap(ffitype) double, const double ":double";
-%typemap(ffitype) char *, const char *, signed char *,
-		  const signed char *, signed char &,
-		  const signed char &			 "(* :char)";
-%typemap(ffitype) unsigned char *, const unsigned char *,
-		  unsigned char &, const unsigned char & "(* :unsigned-char)";
-%typemap(ffitype) short *, const short *, short &,
-		  const short &				"(* :short)";
-%typemap(ffitype) unsigned short *, const unsigned short *,
-		  unsigned short &, const unsigned short & "(* :unsigned-short)";
-%typemap(ffitype) int *, const int *, int &, const int & "(* :int)";
-%typemap(ffitype) unsigned int *, const unsigned int *,
-		  unsigned int &, const unsigned int &	"(* :unsigned-int)";
-%typemap(ffitype) void * "(* :void)";
-%typemap(ffitype) void ":void";
-%typemap(ffitype) enum SWIGTYPE ":int";
-%typemap(ffitype) SWIGTYPE & "(* :void)";
-%typemap(ffitype) SWIGTYPE && "(* :void)";
-
-/* const typemaps
-idea: marshall all primitive c types to their respective lisp types
-to maintain const corretness. For pointers/references, all bets
-are off if you try to modify them.
-
-idea: add a constant-p slot to the base foreign-pointer class. For
-constant pointer/references check this value when setting (around method?)
-and error if a setf operation is performed on the address of this object.
-
-*/
-
-/* 
-%exception %{
-   try {
-      $action
-   } catch (...) {
-      return $null;
-   }
-%}
-
-*/
-
-// %typemap(throws) SWIGTYPE {
-//   (void)$1;
-//   SWIG_fail;
-// }
-
-%typemap(ctype) bool, const bool		"int";
-%typemap(ctype) char, unsigned char, signed char,
-                short, signed short, unsigned short,
-                int, signed int, unsigned int,
-                long, signed long, unsigned long,
-                float, double, long double, char *, void *, void,
-                enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[],
-                SWIGTYPE[ANY], SWIGTYPE &, SWIGTYPE &&, const SWIGTYPE  "$1_ltype";
-%typemap(ctype) SWIGTYPE                   "$&1_type";
-
-%typemap(in) bool                          "$1 = (bool)$input;";
-%typemap(in) char, unsigned char, signed char,
-             short, signed short, unsigned short,
-             int, signed int, unsigned int,
-             long, signed long, unsigned long,
-             float, double, long double, char *, void *, void,
-             enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[],
-             SWIGTYPE[ANY], SWIGTYPE &, SWIGTYPE && "$1 = $input;";
-%typemap(in) SWIGTYPE                      "$1 = *$input;";
-
-/* We don't need to do any actual C-side typechecking, but need to
-   use the precedence values to choose which overloaded function
-   interfaces to generate when conflicts arise. */
-
-/* predefined precedence values
-
-Symbolic Name                   Precedence Value
-------------------------------  ------------------
-SWIG_TYPECHECK_POINTER           0  
-SWIG_TYPECHECK_VOIDPTR           10 
-SWIG_TYPECHECK_BOOL              15 
-SWIG_TYPECHECK_UINT8             20 
-SWIG_TYPECHECK_INT8              25 
-SWIG_TYPECHECK_UINT16            30 
-SWIG_TYPECHECK_INT16             35 
-SWIG_TYPECHECK_UINT32            40 
-SWIG_TYPECHECK_INT32             45 
-SWIG_TYPECHECK_UINT64            50 
-SWIG_TYPECHECK_INT64             55 
-SWIG_TYPECHECK_UINT128           60 
-SWIG_TYPECHECK_INT128            65 
-SWIG_TYPECHECK_INTEGER           70 
-SWIG_TYPECHECK_FLOAT             80 
-SWIG_TYPECHECK_DOUBLE            90 
-SWIG_TYPECHECK_COMPLEX           100 
-SWIG_TYPECHECK_UNICHAR           110 
-SWIG_TYPECHECK_UNISTRING         120 
-SWIG_TYPECHECK_CHAR              130 
-SWIG_TYPECHECK_STRING            140 
-SWIG_TYPECHECK_BOOL_ARRAY        1015 
-SWIG_TYPECHECK_INT8_ARRAY        1025 
-SWIG_TYPECHECK_INT16_ARRAY       1035 
-SWIG_TYPECHECK_INT32_ARRAY       1045 
-SWIG_TYPECHECK_INT64_ARRAY       1055 
-SWIG_TYPECHECK_INT128_ARRAY      1065 
-SWIG_TYPECHECK_FLOAT_ARRAY       1080 
-SWIG_TYPECHECK_DOUBLE_ARRAY      1090 
-SWIG_TYPECHECK_CHAR_ARRAY        1130 
-SWIG_TYPECHECK_STRING_ARRAY      1140
-*/
-
-%typecheck(SWIG_TYPECHECK_BOOL) bool { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_CHAR) char { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_FLOAT) float { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_DOUBLE) double { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_STRING) char * { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_INTEGER)
-                    unsigned char, signed char,
-                    short, signed short, unsigned short,
-                    int, signed int, unsigned int,
-                    long, signed long, unsigned long,
-                    enum SWIGTYPE { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&,
-				   SWIGTYPE[], SWIGTYPE[ANY],
-				   SWIGTYPE { $1 = 1; };
-
-/* This maps C/C++ types to Lisp classes for overload dispatch */
-
-%typemap(lispclass) bool "t";
-%typemap(lispclass) char "cl:character";
-%typemap(lispclass) unsigned char, signed char,
-                    short, signed short, unsigned short,
-                    int, signed int, unsigned int,
-                    long, signed long, unsigned long,
-                    enum SWIGTYPE       "cl:integer";
-%typemap(lispclass) float "cl:single-float";
-%typemap(lispclass) double "cl:double-float";
-%typemap(lispclass) char * "cl:string";
-
-%typemap(out) void                          "";
-%typemap(out) bool                          "$result = (int)$1;";
-%typemap(out) char, unsigned char, signed char,
-              short, signed short, unsigned short,
-              int, signed int, unsigned int,
-              long, signed long, unsigned long,
-              float, double, long double, char *, void *,
-              enum SWIGTYPE, SWIGTYPE *,
-              SWIGTYPE[ANY], SWIGTYPE &, SWIGTYPE && "$result = $1;";
-#ifdef __cplusplus
-%typemap(out) SWIGTYPE                     "$result = new $1_ltype($1);";
-#else
-%typemap(out) SWIGTYPE {
-  $result = ($&1_ltype) malloc(sizeof($1_type));
-  memmove($result, &$1, sizeof($1_type));
-}
-#endif
-
-//////////////////////////////////////////////////////////////
-// UCS-2 string conversion
-
-// should this be SWIG_TYPECHECK_CHAR?
-%typecheck(SWIG_TYPECHECK_UNICHAR) wchar_t { $1 = 1; };
-
-%typemap(in)        wchar_t "$1 = $input;";
-%typemap(lin,numinputs=1)       wchar_t "(cl::let (($out (cl:char-code $in)))\n  $body)";
-%typemap(lin,numinputs=1)       wchar_t * "(excl:with-native-string ($out $in
-:external-format #+little-endian :fat-le #-little-endian :fat)\n
-$body)"
-
-%typemap(out)       wchar_t "$result = $1;";
-%typemap(lout)      wchar_t "(cl::setq ACL_ffresult (cl::code-char $body))";
-%typemap(lout)      wchar_t * "(cl::setq ACL_ffresult (excl:native-to-string $body
-:external-format #+little-endian :fat-le #-little-endian :fat))";
-
-%typemap(ffitype)   wchar_t ":unsigned-short";
-%typemap(lisptype)  wchar_t "";
-%typemap(ctype)     wchar_t "wchar_t";
-%typemap(lispclass) wchar_t "cl:character";
-%typemap(lispclass) wchar_t * "cl:string";
-//////////////////////////////////////////////////////////////
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* name conversion for overloaded operators. */
-#ifdef __cplusplus
-%rename(__add__)	     *::operator+;
-%rename(__pos__)	     *::operator+();
-%rename(__pos__)	     *::operator+() const;
-
-%rename(__sub__)	     *::operator-;
-%rename(__neg__)	     *::operator-() const;
-%rename(__neg__)	     *::operator-();
-
-%rename(__mul__)	     *::operator*;
-%rename(__deref__)	     *::operator*();
-%rename(__deref__)	     *::operator*() const;
-
-%rename(__div__)	     *::operator/;
-%rename(__mod__)	     *::operator%;
-%rename(__logxor__)	     *::operator^;
-%rename(__logand__)	     *::operator&;
-%rename(__logior__)	     *::operator|;
-%rename(__lognot__)	     *::operator~();
-%rename(__lognot__)	     *::operator~() const;
-
-%rename(__not__)	     *::operator!();
-%rename(__not__)	     *::operator!() const;
-
-%rename(__assign__)	     *::operator=;
-
-%rename(__add_assign__)      *::operator+=;
-%rename(__sub_assign__)	     *::operator-=;
-%rename(__mul_assign__)	     *::operator*=;
-%rename(__div_assign__)	     *::operator/=;
-%rename(__mod_assign__)	     *::operator%=;
-%rename(__logxor_assign__)   *::operator^=;
-%rename(__logand_assign__)   *::operator&=;
-%rename(__logior_assign__)   *::operator|=;
-
-%rename(__lshift__)	     *::operator<<;
-%rename(__lshift_assign__)   *::operator<<=;
-%rename(__rshift__)	     *::operator>>;
-%rename(__rshift_assign__)   *::operator>>=;
-
-%rename(__eq__)		     *::operator==;
-%rename(__ne__)		     *::operator!=;
-%rename(__lt__)		     *::operator<;
-%rename(__gt__)		     *::operator>;
-%rename(__lte__)	     *::operator<=;
-%rename(__gte__)	     *::operator>=;
-
-%rename(__and__)	     *::operator&&;
-%rename(__or__)		     *::operator||;
-
-%rename(__preincr__)	     *::operator++();
-%rename(__postincr__)	     *::operator++(int);
-%rename(__predecr__)	     *::operator--();
-%rename(__postdecr__)	     *::operator--(int);
-
-%rename(__comma__)	     *::operator,();
-%rename(__comma__)	     *::operator,() const;
-
-%rename(__member_ref__)      *::operator->;
-%rename(__member_func_ref__) *::operator->*;
-
-%rename(__funcall__)	     *::operator();
-%rename(__aref__)	     *::operator[];
-
-%rename(__bool__)	     *::operator bool();
-%rename(__bool__)	     *::operator bool() const;
-#endif
-
-%insert("lisphead") %{
-(eval-when (:compile-toplevel :load-toplevel :execute)
-
-  ;; avoid compiling ef-templates at runtime
-  (excl:find-external-format :fat)
-  (excl:find-external-format :fat-le)
-
-;;; You can define your own identifier converter if you want.
-;;; Use the -identifier-converter command line argument to
-;;; specify its name.
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-   (cl::defparameter *swig-export-list* nil))
-
-(cl::defconstant *void* :..void..)
-
-;; parsers to aid in finding SWIG definitions in files.
-(cl::defun scm-p1 (form)
-  (let* ((info (cl::second form))
-	 (id (car info))
-	 (id-args (if (eq (cl::car form) 'swig-dispatcher)
-		      (cl::cdr info)
-		      (cl::cddr info))))
-    (cl::apply *swig-identifier-converter* id 
-	   (cl::progn (cl::when (cl::eq (cl::car form) 'swig-dispatcher)
-		    (cl::remf id-args :arities))
-		  id-args))))
-
-(cl::defmacro defswig1 (name (&rest args) &body body)
-  `(cl::progn (cl::defmacro ,name ,args
-	    ,@body)
-	  (excl::define-simple-parser ,name scm-p1)) )
-
-(cl::defmacro defswig2 (name (&rest args) &body body)
-  `(cl::progn (cl::defmacro ,name ,args
-	    ,@body)
-	  (excl::define-simple-parser ,name second)))
-
-(defun read-symbol-from-string (string)
-  (cl::multiple-value-bind (result position)
-      (cl::read-from-string string nil "eof" :preserve-whitespace t)
-    (cl::if (cl::and (cl::symbolp result)
-    	             (cl::eql position (cl::length string)))
-        result
-	(cl::multiple-value-bind (sym)
-	    (cl::intern string)
-	  sym))))
-
-(cl::defun full-name (id type arity class)
-  ; We need some kind of a hack here to handle template classes
-  ; and other synonym types right. We need the original name.
-  (let*( (sym (read-symbol-from-string 
-                (if (eq *swig-identifier-converter* 'identifier-convert-lispify)
-                  (string-lispify id)
-                  id)))
-         (sym-class (find-class sym nil))
-         (id (cond ( (not sym-class)
-                     id )
-                   ( (and sym-class
-                          (not (eq (class-name sym-class)
-                                sym)))
-                     (class-name sym-class) )
-                   ( t
-                     id ))) )
-    (cl::case type
-      (:getter (cl::format nil "~@[~A_~]~A" class id))
-      (:constructor (cl::format nil "new_~A~@[~A~]" id arity))
-      (:destructor (cl::format nil "delete_~A" id))
-      (:type (cl::format nil "ff_~A" id))
-      (:slot id)
-      (:ff-operator (cl::format nil "ffi_~A" id))
-      (otherwise (cl::format nil "~@[~A_~]~A~@[~A~]"
-                         class id arity)))))
-  
-(cl::defun identifier-convert-null (id &key type class arity)
-  (cl::if (cl::eq type :setter)
-      `(cl::setf ,(identifier-convert-null
-               id :type :getter :class class :arity arity))
-      (read-symbol-from-string (full-name id type arity class))))
-
-(cl::defun string-lispify (str)
-  (cl::let ( (cname (excl::replace-regexp str "_" "-"))
-             (lastcase :other)
-             newcase char res ) 
-    (cl::dotimes (n (cl::length cname))
-      (cl::setf char (cl::schar cname n))
-      (excl::if* (cl::alpha-char-p char)
-         then
-              (cl::setf newcase (cl::if (cl::upper-case-p char) :upper :lower))
-              (cl::when (cl::and (cl::eq lastcase :lower)
-                                 (cl::eq newcase :upper))
-                ;; case change... add a dash
-                (cl::push #\- res)
-                (cl::setf newcase :other))
-              (cl::push (cl::char-downcase char) res)
-              (cl::setf lastcase newcase)
-         else
-              (cl::push char res)
-              (cl::setf lastcase :other)))
-    (cl::coerce (cl::nreverse res) 'string)))
-  
-(cl::defun identifier-convert-lispify (cname &key type class arity)
-  (cl::assert (cl::stringp cname))
-  (cl::when (cl::eq type :setter)
-    (cl::return-from identifier-convert-lispify
-      `(cl::setf ,(identifier-convert-lispify
-               cname :type :getter :class class :arity arity))))
-  (cl::setq cname (full-name cname type arity class))
-  (cl::if (cl::eq type :constant)
-      (cl::setf cname (cl::format nil "*~A*" cname)))
-  (read-symbol-from-string (string-lispify cname)))
-
-(cl::defun id-convert-and-export (name &rest kwargs)
-  (cl::multiple-value-bind (symbol package)
-      (cl::apply *swig-identifier-converter* name kwargs)
-    (cl::let ((args (cl::list (cl::if (cl::consp symbol)
-    	     	    	         (cl::cadr symbol) symbol)
-                      (cl::or package cl::*package*))))
-      (cl::apply #'cl::export args)
-      (cl::pushnew args *swig-export-list*))
-    symbol))
-
-(cl::defmacro swig-insert-id (name namespace &key (type :type) class)
-  `(cl::let ((cl::*package* (cl::find-package ,(package-name-for-namespace namespace))))
-    (id-convert-and-export ,name :type ,type :class ,class)))
-
-(defswig2 swig-defconstant (string value)
-  (cl::let ((symbol (id-convert-and-export string :type :constant)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-       (cl::defconstant ,symbol ,value))))
-
-(cl::defun maybe-reorder-args (funcname arglist)
-  ;; in the foreign setter function the new value will be the last argument
-  ;; in Lisp it needs to be the first
-  (cl::if (cl::consp funcname)
-      (cl::append (cl::last arglist) (cl::butlast arglist))
-      arglist))
-
-(cl::defun maybe-return-value (funcname arglist)
-  ;; setf functions should return the new value
-  (cl::when (cl::consp funcname)
-    `(,(cl::if (cl::consp (cl::car arglist))
-           (cl::caar arglist)
-           (cl::car arglist)))))
-
-(cl::defun swig-anyvarargs-p (arglist)
-  (cl::member :SWIG__varargs_ arglist))
-
-(defswig1 swig-defun ((name &optional (mangled-name name)
-                            &key (type :operator) class arity)
-                      arglist kwargs
-		      &body body)
-  (cl::let* ((symbol (id-convert-and-export name :type type
-                          :arity arity :class class))
-             (mangle (excl::if* (cl::string-equal name mangled-name)
-                      then (id-convert-and-export 
-				    (cl::cond
-					  ((cl::eq type :setter) (cl::format nil "~A-set" name))
-					  ((cl::eq type :getter) (cl::format nil "~A-get" name))
-					  (t name))
-				    :type :ff-operator :arity arity :class class)
-                      else (cl::intern mangled-name)))
-         (defun-args (maybe-reorder-args
-                      symbol
-		      (cl::mapcar #'cl::car (cl::and (cl::not (cl::equal arglist '(:void)))
-					 (cl::loop as i in arglist
-					       when (cl::eq (cl::car i) :p+)
-					       collect (cl::cdr i))))))
-	 (ffargs (cl::if (cl::equal arglist '(:void))
-	 	      arglist
-		    (cl::mapcar #'cl::cdr arglist)))
-	 )
-    (cl::when (swig-anyvarargs-p ffargs)
-      (cl::setq ffargs '()))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-       (excl::compiler-let ((*record-xref-info* nil))
-         (ff:def-foreign-call (,mangle ,mangled-name) ,ffargs ,@kwargs))
-       (cl::macrolet ((swig-ff-call (&rest args)
-                      (cl::cons ',mangle args)))
-         (cl::defun ,symbol ,defun-args
-           ,@body
-           ,@(maybe-return-value symbol defun-args))))))
-
-(defswig1 swig-defmethod ((name &optional (mangled-name name)
-	  	                &key (type :operator) class arity)
-                          ffargs kwargs
-                          &body body)
-  (cl::let* ((symbol (id-convert-and-export name :type type
-                          :arity arity :class class))
-         (mangle (cl::intern mangled-name))
-         (defmethod-args (maybe-reorder-args
-                          symbol
-                          (cl::unless (cl::equal ffargs '(:void))
-                            (cl::loop for (lisparg name dispatch) in ffargs
-			    	  when (eq lisparg :p+)
-                                  collect `(,name ,dispatch)))))
-         (ffargs (cl::if (cl::equal ffargs '(:void))
-                     ffargs
-                     (cl::loop for (nil name nil . ffi) in ffargs
-                           collect `(,name ,@ffi)))))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-       (excl::compiler-let ((*record-xref-info* nil))
-         (ff:def-foreign-call (,mangle ,mangled-name) ,ffargs ,@kwargs))
-       (cl::macrolet ((swig-ff-call (&rest args)
-                      (cl::cons ',mangle args)))
-         (cl::defmethod ,symbol ,defmethod-args
-           ,@body
-           ,@(maybe-return-value symbol defmethod-args))))))
-
-(defswig1 swig-dispatcher ((name &key (type :operator) class arities))
-  (cl::let ((symbol (id-convert-and-export name
-                         :type type :class class)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-       (cl::defun ,symbol (&rest args)
-         (cl::case (cl::length args)
-           ,@(cl::loop for arity in arities
-                   for symbol-n = (id-convert-and-export name
-                                           :type type :class class :arity arity)
-                   collect `(,arity (cl::apply #',symbol-n args)))
-	   (t (cl::error "No applicable wrapper-methods for foreign call ~a with args ~a of classes ~a" ',symbol args (cl::mapcar #'(cl::lambda (x) (cl::class-name (cl::class-of x))) args)))
-	   )))))
-
-(defswig2 swig-def-foreign-stub (name)
-  (cl::let ((lsymbol (id-convert-and-export name :type :class))
-	    (symbol (id-convert-and-export name :type :type)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-	(ff:def-foreign-type ,symbol (:class ))
-	(cl::defclass ,lsymbol (ff:foreign-pointer) ()))))
-
-(defswig2 swig-def-foreign-class (name supers &rest rest)
-  (cl::let ((lsymbol (id-convert-and-export name :type :class))
-	    (symbol (id-convert-and-export name :type :type)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-       (ff:def-foreign-type ,symbol ,@rest)
-       (cl::defclass ,lsymbol ,supers
-	 ((foreign-type :initform ',symbol :initarg :foreign-type
-			:accessor foreign-pointer-type))))))
-
-(defswig2 swig-def-foreign-type (name &rest rest)
-  (cl::let ((symbol (id-convert-and-export name :type :type)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-       (ff:def-foreign-type ,symbol ,@rest))))
-
-(defswig2 swig-def-synonym-type (synonym of ff-synonym)
-  `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-     (cl::setf (cl::find-class ',synonym) (cl::find-class ',of))
-     (ff:def-foreign-type ,ff-synonym (:struct ))))
-
-(cl::defun package-name-for-namespace (namespace)
-  (excl::list-to-delimited-string
-   (cl::cons *swig-module-name*
-         (cl::mapcar #'(cl::lambda (name)
-                     (cl::string
-                      (cl::funcall *swig-identifier-converter*
-                               name
-                               :type :namespace)))
-                 namespace))
-   "."))
-
-(cl::defmacro swig-defpackage (namespace)
-  (cl::let* ((parent-namespaces (cl::maplist #'cl::reverse (cl::cdr (cl::reverse namespace))))
-             (parent-strings (cl::mapcar #'package-name-for-namespace
-                                 parent-namespaces))
-             (string (package-name-for-namespace namespace)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-      (cl::defpackage ,string
-        (:use :swig :ff #+ignore '(:common-lisp :ff :excl)
-              ,@parent-strings ,*swig-module-name*)
-	(:import-from :cl :* :nil :t)))))
-
-(cl::defmacro swig-in-package (namespace)
-  `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-    (cl::in-package ,(package-name-for-namespace namespace))))
-
-(defswig2 swig-defvar (name mangled-name &key type (ftype :unsigned-natural))
-  (cl::let ((symbol (id-convert-and-export name :type type)))
-    `(cl::eval-when (:compile-toplevel :load-toplevel :execute)
-      (ff:def-foreign-variable (,symbol ,mangled-name) :type ,ftype))))
-
-) ;; eval-when
-
-(cl::eval-when (:compile-toplevel :execute)
-  (cl::flet ((starts-with-p (str prefix)
-              (cl::and (cl::>= (cl::length str) (cl::length prefix))
-                (cl::string= str prefix :end1 (cl::length prefix)))))
-    (cl::export (cl::loop for sym being each present-symbol of cl::*package*
-                  when (cl::or (starts-with-p (cl::symbol-name sym) (cl::symbol-name :swig-))
-                           (starts-with-p (cl::symbol-name sym) (cl::symbol-name :identifier-convert-)))
-                  collect sym))))
-
-%}
-
-typedef void *__SWIGACL_FwdReference;
-
-%{
-
-#ifdef __cplusplus
-#  define EXTERN   extern "C"
-#else
-#  define EXTERN   extern
-#endif
-
-#define EXPORT   EXTERN SWIGEXPORT
-
-typedef void *__SWIGACL_FwdReference;
-
-#include <string.h>
-#include <stdlib.h>
-%}
diff --git a/dependencies2013/win32/swig/Lib/allegrocl/inout_typemaps.i b/dependencies2013/win32/swig/Lib/allegrocl/inout_typemaps.i
deleted file mode 100644
index d8d61fee..00000000
--- a/dependencies2013/win32/swig/Lib/allegrocl/inout_typemaps.i
+++ /dev/null
@@ -1,111 +0,0 @@
-/* inout_typemaps.i
-
-   Support for INPUT, OUTPUT, and INOUT typemaps. OUTPUT variables are returned
-   as multiple values.
-
-*/
-
-
-/* Note that this macro automatically adds a pointer to the type passed in.
-   As a result, INOUT typemaps for char are for 'char *'. The definition
-   of typemaps for 'char' takes advantage of this, believing that it's more
-   likely to see an INOUT argument for strings, than a single char. */
-%define INOUT_TYPEMAP(type_, OUTresult_, INbind_)
-// OUTPUT map.
-%typemap(lin,numinputs=0) type_ *OUTPUT, type_ &OUTPUT
-%{(cl::let (($out (ff:allocate-fobject '$*in_fftype :c)))
-     $body
-     OUTresult_
-     (ff:free-fobject $out)) %}
-
-// INPUT map.
-%typemap(in) type_ *INPUT, type_ &INPUT
-%{ $1 = &$input; %}
-
-%typemap(ctype) type_ *INPUT, type_ &INPUT "$*1_ltype";
-
-
-// INOUT map.
-// careful here. the input string is converted to a C string
-// with length equal to the input string. This should be large
-// enough to contain whatever OUTPUT value will be stored in it.
-%typemap(lin,numinputs=1) type_ *INOUT, type_ &INOUT
-%{(cl::let (($out (ff:allocate-fobject '$*in_fftype :c)))
-     INbind_
-     $body
-     OUTresult_
-     (ff:free-fobject $out)) %}
-
-%enddef
-
-// $in, $out, $lclass,
-// $in_fftype, $*in_fftype
-
-INOUT_TYPEMAP(int,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(short,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(long,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(unsigned int,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(unsigned short,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(unsigned long,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-// char * mapping for passing strings. didn't quite work
-// INOUT_TYPEMAP(char,
-//              (cl::push (excl:native-to-string $out) ACL_result),
-//	      (cl::setf (ff:fslot-value-typed (cl::quote $in_fftype) :c $out)
-//		    (excl:string-to-native $in)))
-INOUT_TYPEMAP(float,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(double,
-	      (cl::push (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
-INOUT_TYPEMAP(bool,
-	      (cl::push (not (zerop (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out)))
-		    ACL_result),
-	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) (if $in 1 0)));
-
-%typemap(lisptype) bool *INPUT, bool &INPUT "boolean";
-
-// long long support not yet complete
-// INOUT_TYPEMAP(long long);
-// INOUT_TYPEMAP(unsigned long long);
-
-// char *OUTPUT map.
-// for this to work, swig needs to know how large an array to allocate.
-// you can fake this by 
-// %typemap(ffitype) char *myarg	"(:array :char 30)";
-// %apply char *OUTPUT { char *myarg };
-%typemap(lin,numinputs=0) char *OUTPUT, char &OUTPUT
-%{(cl::let (($out (ff:allocate-fobject '$*in_fftype :c)))
-     $body
-     (cl::push (excl:native-to-string $out) ACL_result)
-     (ff:free-fobject $out)) %}
-
-// char *INPUT map.
-%typemap(in) char *INPUT, char &INPUT
-%{ $1 = &$input; %}
-%typemap(ctype) char *INPUT, char &INPUT "$*1_ltype";
-
-// char *INOUT map.
-%typemap(lin,numinputs=1) char *INOUT, char &INOUT
-%{(cl::let (($out (excl:string-to-native $in)))
-     $body
-     (cl::push (excl:native-to-string $out) ACL_result)
-     (ff:free-fobject $out)) %}
-
-// uncomment this if you want INOUT mappings for chars instead of strings.
-// INOUT_TYPEMAP(char,
-// 	      (cl::push (code-char (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out))
-//		    ACL_result),
-//	      (cl::setf (ff:fslot-value-typed (cl::quote $*in_fftype) :c $out) $in));
diff --git a/dependencies2013/win32/swig/Lib/allegrocl/longlongs.i b/dependencies2013/win32/swig/Lib/allegrocl/longlongs.i
deleted file mode 100644
index a15adcdd..00000000
--- a/dependencies2013/win32/swig/Lib/allegrocl/longlongs.i
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -----------------------------------------------------------------------------
- * longlongs.i
- *
- * Typemap addition for support of 'long long' type and 'unsigned long long 
- * Makes use of swig-def-foreign-class, so this header should be loaded
- * after allegrocl.swg and after any custom user identifier-conversion
- * functions have been defined.
- * ----------------------------------------------------------------------------- */
-
-#ifdef Acl64Bit
-%typemap(ctype) long long, unsigned long long "$1_ltype";
-%typemap(out) long long, unsigned long long "$result = $1;";
-
-%typemap(ffitype) long long ":nat";
-%typemap(ffitype) unsigned long long ":unsigned-nat";
-
-%typemap(lout) long long, unsigned long long "  #+64bit (cl::setq ACL_ffresult $body)";
-
-#else
-%typemap(out) long long, unsigned long long "$result = &$1;";
-%typemap(ffitype) long long "(:struct (l1 :long) (l2 :long))";
-
-%typemap(ffitype) unsigned long long "(:struct (l1 :unsigned-long) (l2 :unsigned-long))";
-
-%typemap(lout) long long 
-"  (cl::setq ACL_ffresult (make-instance '#.(swig-insert-id \"longlong\" () :type :class)
-                  :foreign-address $body))";
-
-%typemap(lout) unsigned long long
-"  (cl:setq ACL_ffresult (make-instance '#.(swig-insert-id \"ulonglong\" () :type :class)
-                  :foreign-address $body))";
-
-#endif
-
-%typemap(in) long long, unsigned long long "$1 = $input;";
-
-
-%insert("lisphead") %{
-
-#-64bit
-(swig-def-foreign-class "longlong"
- (ff:foreign-pointer)
- (:struct (l1 :long) (l2 :long)))
-
-#-64bit
-(swig-def-foreign-class "ulonglong"
- (ff:foreign-pointer)
- (:struct (l1 :unsigned-long) (l2 :unsigned-long)))
-%}
diff --git a/dependencies2013/win32/swig/Lib/allegrocl/std_list.i b/dependencies2013/win32/swig/Lib/allegrocl/std_list.i
deleted file mode 100644
index 4e260897..00000000
--- a/dependencies2013/win32/swig/Lib/allegrocl/std_list.i
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_list.i
- *
- * SWIG typemaps for std::list types
- * 
- * To use, add:
- * 
- * %include "std_list.i"
- *
- * to your interface file. You will also need to include a template directive
- * for each instance of the list container you want to use in your application.
- * e.g.
- * 
- * %template (intlist) std::list<int>;
- * %template (floatlist) std::list<float>;
- * ----------------------------------------------------------------------------- */
-
-%module std_list
-%warnfilter(468) std::list;
-
-%{
-#include <list>
-#include <stdexcept>
-%}
-
-
-namespace std{
-    template<class T> class list
-    {
-    public:
-	     
-	typedef T &reference;
-	typedef const T& const_reference;
-	typedef T &iterator;
-	typedef const T& const_iterator; 
-	    
-	list();
-	list(unsigned int size, const T& value = T());
-	list(const list<T> &);
-
-	~list();
-	void assign(unsigned int n, const T& value);
-	void swap(list<T> &x);
-
-	const_reference front();
-	const_reference back();
-	const_iterator begin();
-	const_iterator end();
-	     
-	void resize(unsigned int n, T c = T());
-	bool empty() const;
-
-	void push_front(const T& INPUT);
-	void push_back(const T& INPUT);
-
-
-	void pop_front();
-	void pop_back();
-	void clear();
-	unsigned int size() const;
-	unsigned int max_size() const;
-	void resize(unsigned int n, const T& INPUT);
-		
-	void remove(const T& INPUT);
-	void unique();
-	void reverse();
-	void sort();
-
-	%extend 
-	    {
-	        %typemap(lout) T &__getitem__ "(cl::setq ACL_ffresult (ff:fslot-value-typed '$*out_fftype :c $body))";
-		%typemap(lout) T *__getitem__ "(cl::setq ACL_ffresult (make-instance '$lclass :foreign-address $body))";
-
-		const_reference __getitem__(int i) throw (std::out_of_range) 
-		    {
-			std::list<T>::iterator first = self->begin(); 
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (i>=0 && i<size)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    return *first;
-			}
-			else throw std::out_of_range("list index out of range");
-		    }
-		void __setitem__(int i, const T& INPUT) throw (std::out_of_range)
-		    {
-			std::list<T>::iterator first = self->begin(); 
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (i>=0 && i<size)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    *first = INPUT;
-			}
-			else throw std::out_of_range("list index out of range");
-		    }
-		void __delitem__(int i) throw (std::out_of_range)
-		    {
-			std::list<T>::iterator first = self->begin(); 
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (i>=0 && i<size)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    self->erase(first);
-			}
-			else throw std::out_of_range("list index out of range");
-		    }	     
-		std::list<T> __getslice__(int i,int j) 
-		    {
-			std::list<T>::iterator first = self->begin();
-			std::list<T>::iterator end = self->end();
-
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (j<0) j += size;
-			if (i<0) i = 0;
-			if (j>size) j = size;
-			if (i>=j) i=j;
-			if (i>=0 && i<size && j>=0)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    for (int m=0;m<j;m++)
-			    {
-				end++;
-			    }
-			    std::list<T> tmp(j-i);
-			    if (j>i) std::copy(first,end,tmp.begin());
-			    return tmp;
-			}
-			else throw std::out_of_range("list index out of range");
-		    }
-		void __delslice__(int i,int j) 
-		    {
-			std::list<T>::iterator first = self->begin();
-			std::list<T>::iterator end = self->end();
-
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (j<0) j += size;
-			if (i<0) i = 0;
-			if (j>size) j = size;
-	
-			for (int k=0;k<i;k++)
-			{
-			    first++;
-			}
-			for (int m=0;m<=j;m++)
-			{
-			    end++;
-			}		   
-			self->erase(first,end);		
-		    }
-		void __setslice__(int i,int j, const std::list<T>& v) 
-		    {
-			std::list<T>::iterator first = self->begin();
-			std::list<T>::iterator end = self->end();
-
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (j<0) j += size;
-			if (i<0) i = 0;
-			if (j>size) j = size;
-		
-			for (int k=0;k<i;k++)
-			{
-			    first++;
-			}
-			for (int m=0;m<=j;m++)
-			{
-			    end++;
-			}
-			if (int(v.size()) == j-i) 
-			{
-			    std::copy(v.begin(),v.end(),first);
-			}
-			else {
-			    self->erase(first,end);
-			    if (i+1 <= int(self->size())) 
-			    {
-				first = self->begin();
-				for (int k=0;k<i;k++)
-				{
-				    first++;
-				}
-				self->insert(first,v.begin(),v.end());
-			    }
-			    else self->insert(self->end(),v.begin(),v.end());
-			}
-			   	
-		    }
-		unsigned int __len__() 
-		    {
-			return self->size();
-		    }	
-		bool __nonzero__()
-		    {
-			return !(self->empty());
-		    }
-		void append(const T& INPUT)
-		    {
-			self->push_back(INPUT);
-		    }
-		void pop()
-		    {
-			self->pop_back();
-		    }
-	      
-	    };   
-    };
-}
-
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/allegrocl/std_string.i b/dependencies2013/win32/swig/Lib/allegrocl/std_string.i
deleted file mode 100644
index cbcd250a..00000000
--- a/dependencies2013/win32/swig/Lib/allegrocl/std_string.i
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string
- * ----------------------------------------------------------------------------- */
-
-// ------------------------------------------------------------------------
-// std::string is typemapped by value
-// This can prevent exporting methods which return a string
-// in order for the user to modify it.
-// However, I think I'll wait until someone asks for it...
-// ------------------------------------------------------------------------
-
-// %include <exception.i>
-%warnfilter(404) std::string;
-%warnfilter(404) std::wstring;
-
-%{
-#include <string>
-%}
-
-// %include <std_vector.i>
-
-// %naturalvar std::string;
-// %naturalvar std::wstring;
-
-namespace std {
-    typedef unsigned long size_t;
-    typedef signed long ptrdiff_t;
-
-    template <class charT> class basic_string {
-    public:
-	typedef charT *pointer;
-	typedef charT &reference;
-	typedef const charT &const_reference;
-	typedef size_t size_type;
-	typedef ptrdiff_t difference_type;
-	basic_string();
-	basic_string( charT *str );
-	size_type size();
-	charT operator []( int pos ) const;
-	charT *c_str() const;
-	basic_string<charT> &operator = ( const basic_string &ws );
-	basic_string<charT> &operator = ( const charT *str );
-	basic_string<charT> &append( const basic_string<charT> &other );
-	basic_string<charT> &append( const charT *str );
-	void push_back( charT c );
-	void clear();
-	void reserve( size_type t );
-	void resize( size_type n, charT c = charT() );
-	int compare( const basic_string<charT> &other ) const;
-	int compare( const charT *str ) const;
-	basic_string<charT> &insert( size_type pos, 
-				     const basic_string<charT> &str );
-	size_type find( const basic_string<charT> &other, int pos = 0 ) const;
-	size_type find( charT c, int pos = 0 ) const;
-	%extend {
-	    bool operator == ( const basic_string<charT> &other ) const {
-		return self->compare( other ) == 0;
-	    }
-	    bool operator != ( const basic_string<charT> &other ) const {
-		return self->compare( other ) != 0;
-	    }
-	    bool operator < ( const basic_string<charT> &other ) const {
-		return self->compare( other ) == -1;
-	    }
-	    bool operator > ( const basic_string<charT> &other ) const {
-		return self->compare( other ) == 1;
-	    }
-	    bool operator <= ( const basic_string<charT> &other ) const {
-		return self->compare( other ) != 1;
-	    }
-	    bool operator >= ( const basic_string<charT> &other ) const {
-		return self->compare( other ) != -1;
-	    }
-
-	}
-    };
-
-    %template(string) basic_string<char>;
-    %template(wstring) basic_string<wchar_t>;
-
-    %apply char * { string };
-    %apply wchar_t * { wstring };
-
-    typedef basic_string<char> string;
-    typedef basic_string<wchar_t> wstring;
-
-    // automatically convert constant std::strings to cl:strings
-    %typemap(ctype) string "char *";
-    %typemap(in) string "$1.assign($input);";
-    %typemap(out) string "$result = (char *)(&$1)->c_str();";
-    %typemap(lisptype) string "cl:string";
-    %typemap(lout) string "(cl::setq ACL_ffresult $body)";
-
-    %typemap(ctype) const string *"char *";
-    %typemap(in) const string * "$1.assign($input);";
-    %typemap(out) const string * "$result = (char *)($1)->c_str();";
-    %typemap(lisptype) const string * "cl:string";
-    %typemap(lout) const string * "(cl::setq ACL_ffresult $body)";
-
-    %typemap(ctype) wstring "wchar_t *";
-    %typemap(in) wstring "$1.assign($input);";
-    %typemap(out) wstring "$result = (wchar_t *)(&$1)->c_str();";
-    %typemap(lisptype) wstring "cl:string";
-    %typemap(lout) wstring "(cl::setq ACL_ffresult (excl:native-to-string $body
-:external-format #+little-endian :fat-le #-little-endian :fat))";
-
-    %typemap(ctype) const wstring *"char *";
-    %typemap(in) const wstring * "$1.assign($input);";
-    %typemap(out) const wstring * "$result = (char *)($1)->c_str();";
-    %typemap(lisptype) const wstring * "cl:string";
-    %typemap(lout) const wstring * "(cl::setq ACL_ffresult $body)";
-
-    /* Overloading check */
-//     %typemap(in) string {
-//         if (caml_ptr_check($input))
-//             $1.assign((char *)caml_ptr_val($input,0),
-// 			 caml_string_len($input));
-//         else
-//             SWIG_exception(SWIG_TypeError, "string expected");
-//     }
-
-//     %typemap(in) const string & ($*1_ltype temp) {
-//         if (caml_ptr_check($input)) {
-//             temp.assign((char *)caml_ptr_val($input,0),
-// 			   caml_string_len($input));
-//             $1 = &temp;
-//         } else {
-//             SWIG_exception(SWIG_TypeError, "string expected");
-//         }
-//     }
-
-//     %typemap(in) string & ($*1_ltype temp) {
-//         if (caml_ptr_check($input)) {
-//             temp.assign((char *)caml_ptr_val($input,0),
-// 			   caml_string_len($input));
-//             $1 = &temp;
-//         } else {
-//             SWIG_exception(SWIG_TypeError, "string expected");
-//         }
-//     }
-
-//     %typemap(in) string * ($*1_ltype *temp) {
-//         if (caml_ptr_check($input)) {
-//             temp = new $*1_ltype((char *)caml_ptr_val($input,0),
-// 				   caml_string_len($input));
-//             $1 = temp;
-//         } else {
-//             SWIG_exception(SWIG_TypeError, "string expected");
-//         }
-//     }
-
-//     %typemap(free) string * ($*1_ltype *temp) {
-// 	delete temp;
-//     }
-
-//    %typemap(argout) string & {
-//	caml_list_append(swig_result,caml_val_string_len((*$1).c_str(),
-//							 (*$1).size()));
-//    }
-
-//    %typemap(directorout) string {
-//	$result.assign((char *)caml_ptr_val($input,0),
-//		       caml_string_len($input));
-//    }
-
-//    %typemap(out) string {
-//        $result = caml_val_string_len($1.c_str(),$1.size());
-//    }
-
-//    %typemap(out) string * {
-//	$result = caml_val_string_len((*$1).c_str(),(*$1).size());
-//    }
-}
-
-// #ifdef ENABLE_CHARPTR_ARRAY
-// char **c_charptr_array( const std::vector <string > &str_v );
-
-// %{
-//   SWIGEXT char **c_charptr_array( const std::vector <string > &str_v ) {
-//     char **out = new char *[str_v.size() + 1];
-//     out[str_v.size()] = 0;
-//     for( int i = 0; i < str_v.size(); i++ ) {
-//       out[i] = (char *)str_v[i].c_str();
-//     }
-//     return out;
-//   }
-// %}
-// #endif
-
-// #ifdef ENABLE_STRING_VECTOR
-// %template (StringVector) std::vector<string >;
-
-// %insert(ml) %{
-//   (* Some STL convenience items *)
-
-//   let string_array_to_vector sa = 
-//     let nv = _new_StringVector C_void in
-//       array_to_vector nv (fun x -> C_string x) sa ; nv
-	
-//   let c_string_array ar = 
-//     _c_charptr_array (string_array_to_vector ar)
-// %}
-
-// %insert(mli) %{
-//   val c_string_array: string array -> c_obj
-// %}
-// #endif
diff --git a/dependencies2013/win32/swig/Lib/allegrocl/typemaps.i b/dependencies2013/win32/swig/Lib/allegrocl/typemaps.i
deleted file mode 100644
index 293d1cd3..00000000
--- a/dependencies2013/win32/swig/Lib/allegrocl/typemaps.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Unused for Allegro CL module */
-
-%include "inout_typemaps.i"
-%include "longlongs.i"
diff --git a/dependencies2013/win32/swig/Lib/allkw.swg b/dependencies2013/win32/swig/Lib/allkw.swg
deleted file mode 100644
index b9413191..00000000
--- a/dependencies2013/win32/swig/Lib/allkw.swg
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __Lib_allkw_swg__
-#define __Lib_allkw_swg__
-
-
-/*  
-  Include all the known keyword warnings.  Very useful for adding test
-  files to the test-suite, or checking if your own library is ok for all
-  the swig supported languages.
-
-  Use as 
-
-    swig -Wallkw ...
-
-  If you add a new language, remember to create a separate languagekw.swg
-  file, and add it here.
-  
-*/
-
-%include <chicken/chickenkw.swg>
-%include <csharp/csharpkw.swg>
-%include <d/dkw.swg>
-%include <go/gokw.swg>
-%include <java/javakw.swg>
-%include <lua/luakw.swg>
-%include <ocaml/ocamlkw.swg>
-%include <perl5/perlkw.swg>
-%include <php5/phpkw.swg>
-%include <php/phpkw.swg>
-%include <pike/pikekw.swg>
-%include <python/pythonkw.swg>
-%include <r/rkw.swg>
-%include <ruby/rubykw.swg>
-%include <tcl/tclkw.swg>
-
-
-#endif //__Lib_allkw_swg__
diff --git a/dependencies2013/win32/swig/Lib/attribute.i b/dependencies2013/win32/swig/Lib/attribute.i
deleted file mode 100644
index d580dbfe..00000000
--- a/dependencies2013/win32/swig/Lib/attribute.i
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -----------------------------------------------------------------------------
- * attribute.i
- *
- * SWIG library file for implementing attributes.
- * ----------------------------------------------------------------------------- */
-
-/* we use a simple exception warning here */
-%{
-#include <stdio.h>
-%}
-#define %attribute_exception(code,msg) printf("%s\n",msg)
-
-#ifndef %arg
-#define %arg(x...) x
-#endif
-
-#ifndef %mangle
-#define %mangle(Type...)  #@Type
-#endif
-
-%include <typemaps/attribute.swg>
diff --git a/dependencies2013/win32/swig/Lib/carrays.i b/dependencies2013/win32/swig/Lib/carrays.i
deleted file mode 100644
index 3a9c3cfe..00000000
--- a/dependencies2013/win32/swig/Lib/carrays.i
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -----------------------------------------------------------------------------
- * carrays.i
- *
- * SWIG library file containing macros that can be used to manipulate simple
- * pointers as arrays.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * %array_functions(TYPE,NAME)
- *
- * Generates functions for creating and accessing elements of a C array
- * (as pointers).  Creates the following functions:
- *
- *        TYPE *new_NAME(int nelements)
- *        void delete_NAME(TYPE *);
- *        TYPE NAME_getitem(TYPE *, int index);
- *        void NAME_setitem(TYPE *, int index, TYPE value);
- * 
- * ----------------------------------------------------------------------------- */
-
-%define %array_functions(TYPE,NAME)
-%{
-static TYPE *new_##NAME(int nelements) { %}
-#ifdef __cplusplus
-%{  return new TYPE[nelements](); %}
-#else
-%{  return (TYPE *) calloc(nelements,sizeof(TYPE)); %}
-#endif
-%{}
-
-static void delete_##NAME(TYPE *ary) { %}
-#ifdef __cplusplus
-%{  delete [] ary; %}
-#else
-%{  free(ary); %}
-#endif
-%{}
-
-static TYPE NAME##_getitem(TYPE *ary, int index) {
-    return ary[index];
-}
-static void NAME##_setitem(TYPE *ary, int index, TYPE value) {
-    ary[index] = value;
-}
-%}
-
-TYPE *new_##NAME(int nelements);
-void delete_##NAME(TYPE *ary);
-TYPE NAME##_getitem(TYPE *ary, int index);
-void NAME##_setitem(TYPE *ary, int index, TYPE value);
-
-%enddef
-
-
-/* -----------------------------------------------------------------------------
- * %array_class(TYPE,NAME)
- *
- * Generates a class wrapper around a C array.  The class has the following
- * interface:
- *
- *          struct NAME {
- *              NAME(int nelements);
- *             ~NAME();
- *              TYPE getitem(int index);
- *              void setitem(int index, TYPE value);
- *              TYPE * cast();
- *              static NAME *frompointer(TYPE *t);
-  *         }
- *
- * ----------------------------------------------------------------------------- */
-
-%define %array_class(TYPE,NAME)
-%{
-typedef TYPE NAME;
-%}
-typedef struct {
-  /* Put language specific enhancements here */
-} NAME;
-
-%extend NAME {
-
-#ifdef __cplusplus
-NAME(int nelements) {
-  return new TYPE[nelements]();
-}
-~NAME() {
-  delete [] self;
-}
-#else
-NAME(int nelements) {
-  return (TYPE *) calloc(nelements,sizeof(TYPE));
-}
-~NAME() {
-  free(self);
-}
-#endif
-
-TYPE getitem(int index) {
-  return self[index];
-}
-void setitem(int index, TYPE value) {
-  self[index] = value;
-}
-TYPE * cast() {
-  return self;
-}
-static NAME *frompointer(TYPE *t) {
-  return (NAME *) t;
-}
-
-};
-
-%types(NAME = TYPE);
-
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/cdata.i b/dependencies2013/win32/swig/Lib/cdata.i
deleted file mode 100644
index 3ac693cf..00000000
--- a/dependencies2013/win32/swig/Lib/cdata.i
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cdata.i
- *
- * SWIG library file containing macros for manipulating raw C data as strings.
- * ----------------------------------------------------------------------------- */
-
-%{
-typedef struct SWIGCDATA {
-    char *data;
-    int   len;
-} SWIGCDATA;
-%}
-
-/* -----------------------------------------------------------------------------
- * Typemaps for returning binary data
- * ----------------------------------------------------------------------------- */
-
-#if SWIGGUILE
-%typemap(out) SWIGCDATA {
-   $result = scm_from_locale_stringn($1.data,$1.len);
-}
-%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH);
-
-#elif SWIGCHICKEN
-
-%typemap(out) SWIGCDATA {
-  C_word *string_space = C_alloc(C_SIZEOF_STRING($1.len));
-  $result = C_string(&string_space, $1.len, $1.data);
-}
-%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH);
-
-#elif SWIGPHP5
-
-%typemap(out) SWIGCDATA {
-  ZVAL_STRINGL($result, $1.data, $1.len, 1);
-}
-%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH);
-
-#elif SWIGPHP7
-
-%typemap(out) SWIGCDATA {
-  ZVAL_STRINGL($result, $1.data, $1.len);
-}
-%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH);
-
-#elif SWIGJAVA
-
-%apply (char *STRING, int LENGTH) { (const void *indata, int inlen) }
-%typemap(jni) SWIGCDATA "jbyteArray"
-%typemap(jtype) SWIGCDATA "byte[]"
-%typemap(jstype) SWIGCDATA "byte[]"
-%fragment("SWIG_JavaArrayOutCDATA", "header") {
-static jbyteArray SWIG_JavaArrayOutCDATA(JNIEnv *jenv, char *result, jsize sz) {
-  jbyte *arr;
-  int i;
-  jbyteArray jresult = JCALL1(NewByteArray, jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = JCALL2(GetByteArrayElements, jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jbyte)result[i];
-  JCALL3(ReleaseByteArrayElements, jenv, jresult, arr, 0);
-  return jresult;
-}
-}
-%typemap(out, fragment="SWIG_JavaArrayOutCDATA") SWIGCDATA
-%{$result = SWIG_JavaArrayOutCDATA(jenv, (char *)$1.data, $1.len); %}
-%typemap(javaout) SWIGCDATA {
-    return $jnicall;
-  }
-
-#endif
-
-
-/* -----------------------------------------------------------------------------
- * %cdata(TYPE [, NAME]) 
- *
- * Convert raw C data to a binary string.
- * ----------------------------------------------------------------------------- */
-
-%define %cdata(TYPE,NAME...)
-
-%insert("header") {
-#if #NAME == ""
-static SWIGCDATA cdata_##TYPE(TYPE *ptr, int nelements) {
-#else
-static SWIGCDATA cdata_##NAME(TYPE *ptr, int nelements) {
-#endif
-   SWIGCDATA d;
-   d.data = (char *) ptr;
-#if #TYPE != "void"
-   d.len  = nelements*sizeof(TYPE);
-#else
-   d.len  = nelements;
-#endif
-   return d;
-}
-}
-
-%typemap(default) int nelements "$1 = 1;"
-
-#if #NAME == ""
-SWIGCDATA cdata_##TYPE(TYPE *ptr, int nelements);
-#else
-SWIGCDATA cdata_##NAME(TYPE *ptr, int nelements);
-#endif
-%enddef
-
-%typemap(default) int nelements;
-
-%rename(cdata) ::cdata_void(void *ptr, int nelements);
-
-%cdata(void);
-
-/* Memory move function. Due to multi-argument typemaps this appears to be wrapped as
-void memmove(void *data, const char *s); */
-void memmove(void *data, const void *indata, int inlen);
diff --git a/dependencies2013/win32/swig/Lib/cffi/cffi.swg b/dependencies2013/win32/swig/Lib/cffi/cffi.swg
deleted file mode 100644
index 3ad767ef..00000000
--- a/dependencies2013/win32/swig/Lib/cffi/cffi.swg
+++ /dev/null
@@ -1,292 +0,0 @@
-/* Define a C preprocessor symbol that can be used in interface files
-   to distinguish between the SWIG language modules. */ 
-
-#define SWIG_CFFI
-
-/* Typespecs for basic types. */
-
-%typemap(cin) void ":void";
-
-%typemap(cin) char ":char";
-%typemap(cin) char * ":string";
-%typemap(cin) unsigned char ":unsigned-char";
-%typemap(cin) signed char ":char";
-
-%typemap(cin) short ":short";
-%typemap(cin) signed short ":short";
-%typemap(cin) unsigned short ":unsigned-short";
-
-%typemap(cin) int ":int";
-%typemap(cin) signed int ":int";
-%typemap(cin) unsigned int ":unsigned-int";
-
-%typemap(cin) long ":long";
-%typemap(cin) signed long ":long";
-%typemap(cin) unsigned long ":unsigned-long";
-
-%typemap(cin) long long ":long-long";
-%typemap(cin) signed long long ":long-long";
-%typemap(cin) unsigned long long ":unsigned-long-long";
-
-%typemap(cin) float ":float";
-%typemap(cin) double ":double";
-%typemap(cin) SWIGTYPE ":pointer";
-
-%typemap(cout) void ":void";
-
-%typemap(cout) char ":char";
-%typemap(cout) char * ":string";
-%typemap(cout) unsigned char ":unsigned-char";
-%typemap(cout) signed char ":char";
-
-%typemap(cout) short ":short";
-%typemap(cout) signed short ":short";
-%typemap(cout) unsigned short ":unsigned-short";
-
-%typemap(cout) int ":int";
-%typemap(cout) signed int ":int";
-%typemap(cout) unsigned int ":unsigned-int";
-
-%typemap(cout) long ":long";
-%typemap(cout) signed long ":long";
-%typemap(cout) unsigned long ":unsigned-long";
-
-%typemap(cout) long long ":long-long";
-%typemap(cout) signed long long ":long-long";
-%typemap(cout) unsigned long long ":unsigned-long-long";
-
-%typemap(cout) float ":float";
-%typemap(cout) double ":double";
-%typemap(cout) SWIGTYPE ":pointer";
-
-
-%typemap(ctype) bool                       "int";
-%typemap(ctype) char, unsigned char, signed char,
-                short, signed short, unsigned short,
-                int, signed int, unsigned int,
-                long, signed long, unsigned long,
-                float, double, long double, char *, void *, void,
-                enum SWIGTYPE, SWIGTYPE *,
-                SWIGTYPE[ANY], SWIGTYPE &, SWIGTYPE && "$1_ltype";
-%typemap(ctype) SWIGTYPE                   "$&1_type";
-
-%typemap(in) bool                          "$1 = (bool)$input;";
-%typemap(in) char, unsigned char, signed char,
-             short, signed short, unsigned short,
-             int, signed int, unsigned int,
-             long, signed long, unsigned long,
-             float, double, long double, char *, void *, void,
-             enum SWIGTYPE, SWIGTYPE *,
-             SWIGTYPE[ANY], SWIGTYPE &, SWIGTYPE && "$1 = $input;";
-%typemap(in) SWIGTYPE                      "$1 = *$input;";
-
-%typemap(out) void                         "";
-%typemap(out) bool                          "$result = (int)$1;";
-%typemap(out) char, unsigned char, signed char,
-              short, signed short, unsigned short,
-              int, signed int, unsigned int,
-              long, signed long, unsigned long,
-              float, double, long double, char *, void *,
-              enum SWIGTYPE, SWIGTYPE *,
-              SWIGTYPE[ANY], SWIGTYPE &, SWIGTYPE && "$result = $1;";
-#ifdef __cplusplus
-%typemap(out) SWIGTYPE                     "$result = new $1_type($1);";
-#else
-%typemap(out) SWIGTYPE {
-  $result = ($&1_ltype) malloc(sizeof($1_type));
-  memmove($result, &$1, sizeof($1_type));
-}
-#endif
-
-%typecheck(SWIG_TYPECHECK_BOOL) bool { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_CHAR) char { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_FLOAT) float { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_DOUBLE) double { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_STRING) char * { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_INTEGER)
-                    unsigned char, signed char,
-                    short, signed short, unsigned short,
-                    int, signed int, unsigned int,
-                    long, signed long, unsigned long,
-                    enum SWIGTYPE { $1 = 1; };
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&,
-                                   SWIGTYPE[ANY], SWIGTYPE { $1 = 1; };
-/* This maps C/C++ types to Lisp classes for overload dispatch */
-
-%typemap(lisptype) bool "cl:boolean";
-%typemap(lisptype) char "cl:character";
-%typemap(lisptype) unsigned char "cl:integer";
-%typemap(lisptype) signed char "cl:integer";
-
-%typemap(lispclass) bool "t";
-%typemap(lispclass) char "cl:character";
-%typemap(lispclass) unsigned char, signed char,
-                    short, signed short, unsigned short,
-                    int, signed int, unsigned int,
-                    long, signed long, unsigned long,
-                    enum SWIGTYPE       "cl:integer";
-/* CLOS methods can't be specialized on single-float or double-float */
-%typemap(lispclass) float "cl:number";
-%typemap(lispclass) double "cl:number";
-%typemap(lispclass) char * "cl:string";
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-%{
-
-#ifdef __cplusplus
-#  define EXTERN   extern "C"
-#else
-#  define EXTERN   extern
-#endif
-
-#define EXPORT   EXTERN SWIGEXPORT
-
-#include <string.h>
-%}
-
-%insert("swiglisp") %{
-;;;SWIG wrapper code starts here
-
-(cl:defmacro defanonenum (cl:&body enums)
-   "Converts anonymous enums to defconstants."
-  `(cl:progn ,@(cl:loop for value in enums
-                        for index = 0 then (cl:1+ index)
-                        when (cl:listp value) do (cl:setf index (cl:second value)
-                                                          value (cl:first value))
-                        collect `(cl:defconstant ,value ,index))))
-
-(cl:eval-when (:compile-toplevel :load-toplevel)
-  (cl:unless (cl:fboundp 'swig-lispify)
-    (cl:defun swig-lispify (name flag cl:&optional (package cl:*package*))
-      (cl:labels ((helper (lst last rest cl:&aux (c (cl:car lst)))
-                    (cl:cond
-                      ((cl:null lst)
-                       rest)
-                      ((cl:upper-case-p c)
-                       (helper (cl:cdr lst) 'upper
-                               (cl:case last
-                                 ((lower digit) (cl:list* c #\- rest))
-                                 (cl:t (cl:cons c rest)))))
-                      ((cl:lower-case-p c)
-                       (helper (cl:cdr lst) 'lower (cl:cons (cl:char-upcase c) rest)))
-                      ((cl:digit-char-p c)
-                       (helper (cl:cdr lst) 'digit 
-                               (cl:case last
-                                 ((upper lower) (cl:list* c #\- rest))
-                                 (cl:t (cl:cons c rest)))))
-                      ((cl:char-equal c #\_)
-                       (helper (cl:cdr lst) '_ (cl:cons #\- rest)))
-                      (cl:t
-                       (cl:error "Invalid character: ~A" c)))))
-        (cl:let ((fix (cl:case flag
-                        ((constant enumvalue) "+")
-                        (variable "*")
-                        (cl:t ""))))
-          (cl:intern
-           (cl:concatenate
-            'cl:string
-            fix
-            (cl:nreverse (helper (cl:concatenate 'cl:list name) cl:nil cl:nil))
-            fix)
-           package))))))
-
-;;;SWIG wrapper code ends here
-%}
-
-#ifdef __cplusplus
-%typemap(out) SWIGTYPE                     "$result = new $1_type($1);";
-#else
-%typemap(out) SWIGTYPE {
-  $result = ($&1_ltype) malloc(sizeof($1_type));
-  memmove($result, &$1, sizeof($1_type));
-}
-#endif
-
-//////////////////////////////////////////////////////////////
-
-/* name conversion for overloaded operators. */
-#ifdef __cplusplus
-%rename(__add__)	     *::operator+;
-%rename(__pos__)	     *::operator+();
-%rename(__pos__)	     *::operator+() const;
-
-%rename(__sub__)	     *::operator-;
-%rename(__neg__)	     *::operator-() const;
-%rename(__neg__)	     *::operator-();
-
-%rename(__mul__)	     *::operator*;
-%rename(__deref__)	     *::operator*();
-%rename(__deref__)	     *::operator*() const;
-
-%rename(__div__)	     *::operator/;
-%rename(__mod__)	     *::operator%;
-%rename(__logxor__)	     *::operator^;
-%rename(__logand__)	     *::operator&;
-%rename(__logior__)	     *::operator|;
-%rename(__lognot__)	     *::operator~();
-%rename(__lognot__)	     *::operator~() const;
-
-%rename(__not__)	     *::operator!();
-%rename(__not__)	     *::operator!() const;
-
-%rename(__assign__)	     *::operator=;
-
-%rename(__add_assign__)      *::operator+=;
-%rename(__sub_assign__)	     *::operator-=;
-%rename(__mul_assign__)	     *::operator*=;
-%rename(__div_assign__)	     *::operator/=;
-%rename(__mod_assign__)	     *::operator%=;
-%rename(__logxor_assign__)   *::operator^=;
-%rename(__logand_assign__)   *::operator&=;
-%rename(__logior_assign__)   *::operator|=;
-
-%rename(__lshift__)	     *::operator<<;
-%rename(__lshift_assign__)   *::operator<<=;
-%rename(__rshift__)	     *::operator>>;
-%rename(__rshift_assign__)   *::operator>>=;
-
-%rename(__eq__)		     *::operator==;
-%rename(__ne__)		     *::operator!=;
-%rename(__lt__)		     *::operator<;
-%rename(__gt__)		     *::operator>;
-%rename(__lte__)	     *::operator<=;
-%rename(__gte__)	     *::operator>=;
-
-%rename(__and__)	     *::operator&&;
-%rename(__or__)		     *::operator||;
-
-%rename(__preincr__)	     *::operator++();
-%rename(__postincr__)	     *::operator++(int);
-%rename(__predecr__)	     *::operator--();
-%rename(__postdecr__)	     *::operator--(int);
-
-%rename(__comma__)	     *::operator,();
-%rename(__comma__)	     *::operator,() const;
-
-%rename(__member_ref__)      *::operator->;
-%rename(__member_func_ref__) *::operator->*;
-
-%rename(__funcall__)	     *::operator();
-%rename(__aref__)	     *::operator[];
-#endif
-
-
-%{
-
-#ifdef __cplusplus
-#  define EXTERN   extern "C"
-#else
-#  define EXTERN   extern
-#endif
-
-#define EXPORT   EXTERN SWIGEXPORT
-
-#include <string.h>
-#include <stdlib.h>
-%}
diff --git a/dependencies2013/win32/swig/Lib/chicken/chicken.swg b/dependencies2013/win32/swig/Lib/chicken/chicken.swg
deleted file mode 100644
index 17f0d0ac..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/chicken.swg
+++ /dev/null
@@ -1,809 +0,0 @@
-/* -----------------------------------------------------------------------------
- * chicken.swg
- *
- * CHICKEN configuration module.
- * ----------------------------------------------------------------------------- */
-
-/* chicken.h has to appear first. */
-
-%insert(runtime) %{
-#include <assert.h>
-#include <chicken.h>
-%}
-
-%insert(runtime) "swigrun.swg";            // Common C API type-checking code
-%insert(runtime) "chickenrun.swg";      // CHICKEN run-time code
-
-/* -----------------------------------------------------------------------------
- *                          standard typemaps
- * ----------------------------------------------------------------------------- */
-
-/*
-  CHICKEN: C
-  ----------
-
-  fixnum: int, short, unsigned int, unsigned short, unsigned char,
-  signed char
-
-  char: char
-
-  bool: bool
-
-  flonum: float, double, long, long long, unsigned long, unsigned long
-  long
- */
-
-/* --- Primitive types --- */
-
-%define SIMPLE_TYPEMAP(type_, from_scheme, to_scheme, checker, convtype, storage_)
-
-%typemap(in) type_ 
-%{  if (!checker ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument #$argnum is not of type 'type_'");
-  }
-  $1 = ($1_ltype) from_scheme ($input); %}
-
-/* Const primitive references.  Passed by value */
-
-%typemap(in) const type_ & ($*1_ltype temp)
-%{  if (!checker ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument #$argnum is not of type 'type_'");
-  }
-  temp = ($*1_ltype) from_scheme ($input); 
-  $1 = &temp; %}
-
-/* --- Variable input --- */
-%typemap(varin) type_
-%{  if (!checker ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Cannot use '$1_ltype' for variable '$name' of type 'type_'");
-  }
-  $1 = ($1_ltype) from_scheme ($input); %}
-
-#if "storage_" == "0"
-
-%typemap(out) type_ 
-%{
-  $result = to_scheme (convtype ($1));
-%}
-
-/* References to primitive types.  Return by value */
-
-%typemap(out) const type_ &
-%{
-  $result = to_scheme (convtype (*$1));
-%}
-
-/* --- Variable output --- */
-%typemap(varout) type_ 
-%{
-  $result = to_scheme (convtype ($varname));
-%}
-
-%typemap(throws) type_
-%{
-  SWIG_Chicken_ThrowException(to_scheme ( convtype ($1)));
-%}
-
-#else
-
-%typemap(out) type_ 
-%{
-  {
-  C_word *space = C_alloc(storage_);
-  $result = to_scheme (&space, convtype ($1));
-  }
-%}
-
-/* References to primitive types.  Return by value */
-
-%typemap(out) const type_ &
-%{
-  {
-  C_word *space = C_alloc(storage_);
-  $result = to_scheme (&space, convtype (*$1));
-  }
-%}
-
-/* --- Variable output --- */
-%typemap(varout) type_ 
-%{
-  {
-  C_word *space = C_alloc(storage_);
-  $result = to_scheme (&space, convtype ($varname));
-  }
-%}
-
-%typemap(throws) type_
-%{
-  {
-  C_word *space = C_alloc(storage_);
-  SWIG_Chicken_ThrowException(to_scheme (&space, convtype ($1)));
-  }
-%}
-
-#endif
-
-/* --- Constants --- */
-
-%typemap(constcode) type_
-"static const $1_type $result = $value;"
-
-%enddef
-
-SIMPLE_TYPEMAP(int, C_num_to_int, C_fix, C_swig_is_number, (int), 0);
-//SIMPLE_TYPEMAP(enum SWIGTYPE, C_unfix, C_fix, C_swig_is_fixnum, (int), 0);
-SIMPLE_TYPEMAP(short, C_num_to_int, C_fix, C_swig_is_number, (int), 0);
-SIMPLE_TYPEMAP(long, C_num_to_long, C_long_to_num, C_swig_is_long, (long), C_SIZEOF_FLONUM);
-SIMPLE_TYPEMAP(long long, C_num_to_long, C_long_to_num, C_swig_is_long, (long), C_SIZEOF_FLONUM);
-SIMPLE_TYPEMAP(unsigned int, C_num_to_unsigned_int, C_unsigned_int_to_num, C_swig_is_number, (unsigned int), C_SIZEOF_FLONUM);
-SIMPLE_TYPEMAP(unsigned short, C_num_to_unsigned_int, C_fix, C_swig_is_number, (unsigned int), 0);
-SIMPLE_TYPEMAP(unsigned long, C_num_to_unsigned_long, C_unsigned_long_to_num, C_swig_is_long, (unsigned long), C_SIZEOF_FLONUM);
-SIMPLE_TYPEMAP(unsigned long long, C_num_to_unsigned_long, C_unsigned_long_to_num, C_swig_is_long, (unsigned long), C_SIZEOF_FLONUM);
-SIMPLE_TYPEMAP(unsigned char, C_character_code, C_make_character, C_swig_is_char, (unsigned int), 0);
-SIMPLE_TYPEMAP(signed char, C_character_code, C_make_character, C_swig_is_char, (int), 0);
-SIMPLE_TYPEMAP(char, C_character_code, C_make_character, C_swig_is_char, (char), 0);
-SIMPLE_TYPEMAP(bool, C_truep, C_mk_bool, C_swig_is_bool, (bool), 0);
-SIMPLE_TYPEMAP(float, C_c_double, C_flonum, C_swig_is_number, (double), C_SIZEOF_FLONUM);
-SIMPLE_TYPEMAP(double, C_c_double, C_flonum, C_swig_is_number, (double), C_SIZEOF_FLONUM);
-
-/* enum SWIGTYPE */
-%apply int { enum SWIGTYPE };
-%apply const int& { const enum SWIGTYPE& };
-%apply const int& { const enum SWIGTYPE&& };
-
-%typemap(varin) enum SWIGTYPE
-{
-  if (!C_swig_is_fixnum($input) && sizeof(int) != sizeof($1)) {
-    swig_barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, "enum variable '$name' can not be set");
-  }
-  *((int *)(void *)&$1) = C_unfix($input);
-}
-
-
-/* --- Input arguments --- */
-
-/* Strings */
-
-%typemap(in) char * 
-{ if ($input == C_SCHEME_FALSE) {
-  $1 = NULL;
- }
- else { 
-   if (!C_swig_is_string ($input)) {
-     swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument #$argnum is not of type 'char *'");
-   }
-   $1 = ($ltype) SWIG_MakeString ($input);
- }
-}
-
-%typemap(freearg) char * "if ($1 != NULL) { free ($1); }"
-
-/* Pointers, references, and arrays */
-%typemap(in,closcode="(slot-ref $input 'swig-this)") SWIGTYPE *, SWIGTYPE [], SWIGTYPE &, SWIGTYPE &&  {
-   $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, $argnum, $disown);
-}
-
-%typemap(in,closcode="(slot-ref $input 'swig-this)") SWIGTYPE *DISOWN {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, $argnum, SWIG_POINTER_DISOWN);
-}
-
-/* Void pointer.  Accepts any kind of pointer */
-%typemap(in) void * {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, NULL, $argnum, 0);
-}
-
-%typemap(varin,closcode="(slot-ref $input 'swig-this)") SWIGTYPE * {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, SWIG_POINTER_DISOWN);
-}
-
-%typemap(varin,closcode="(slot-ref $input 'swig-this)") SWIGTYPE & {
-  $1 = *(($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0));
-}
-
-%typemap(varin,closcode="(slot-ref $input 'swig-this)") SWIGTYPE && {
-  $1 = *(($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0));
-}
-
-%typemap(varin) SWIGTYPE [] {
-  SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, "Type error");
-}
-
-%typemap(varin) SWIGTYPE [ANY] {
-  void *temp;
-  int ii;
-  $1_basetype *b = 0;
-  temp = SWIG_MustGetPtr($input, $1_descriptor, 1, 0);
-  b = ($1_basetype *) $1;
-  for (ii = 0; ii < $1_size; ii++) b[ii] = *(($1_basetype *) temp + ii);
-}
-
-%typemap(varin) void * {
-  $1 = SWIG_MustGetPtr($input, NULL, 1, 0);
-}
-
-%typemap(out) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  $result = SWIG_NewPointerObj($1, $descriptor, $owner);
-}
-
-%typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor,(void **) &$1);
-  $result = SWIG_NewPointerObj($1, ty, $owner);
-}
-    
-%typemap(varout) SWIGTYPE *, SWIGTYPE [] {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  $result = SWIG_NewPointerObj($varname, $descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE & {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  $result = SWIG_NewPointerObj((void *) &$varname, $1_descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE && {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  $result = SWIG_NewPointerObj((void *) &$varname, $1_descriptor, 0);
-}
-
-/* special typemaps for class pointers */
-%typemap(in) SWIGTYPE (CLASS::*) {
-  char err_msg[256];
-
-  if (C_swig_is_pair($input)) {
-    /* try and convert pointer object */
-    void *result;
-    if (!SWIG_ConvertPtr(C_block_item($input,1), &result, $descriptor, 0)) {
-      C_word ptr = C_block_item($input,0);
-      if (C_swig_is_string(ptr)) {
-        SWIG_UnpackData(C_c_string(ptr), (void *) &$1, sizeof($type));
-      } else {
-        snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", $argnum, ($descriptor->str ? $descriptor->str : $descriptor->name));
-        SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-      }
-    } else {
-      snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", $argnum, ($descriptor->str ? $descriptor->str : $descriptor->name));
-      SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-    }
-  } else {
-    snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", $argnum, ($descriptor->str ? $descriptor->str : $descriptor->name));
-    SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-  }
-}
-
-%typemap(out) SWIGTYPE (CLASS::*) {
-  size_t ptr_size = sizeof($type);
-  C_word *known_space = C_alloc(C_SIZEOF_PAIR + C_SIZEOF_STRING(2*ptr_size) + C_SIZEOF_SWIG_POINTER);
-  char *temp = (char *)malloc(2*ptr_size);
-  C_word ptr = SWIG_NewPointerObj((void *) known_space, $descriptor, 0);
-
-  SWIG_PackData(temp, (void *) &$1, ptr_size);
-  $result = C_pair(&known_space, C_string(&known_space, 2*ptr_size, temp), ptr);
-  free(temp);
-}
-
-%typemap(varin) SWIGTYPE (CLASS::*) {
-  char err_msg[256];
-
-  if (C_swig_is_pair($input)) {
-    /* try and convert pointer object */
-    void *result;
-    if (!SWIG_ConvertPtr(C_block_item($input,1), &result, $descriptor, 0)) {
-      C_word ptr = C_block_item($input,0);
-      if (C_swig_is_string(ptr)) {
-        SWIG_UnpackData(C_c_string(ptr), (void *) &$1, sizeof($type));
-      } else {
-        snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", 1, ($descriptor->str ? $descriptor->str : $descriptor->name));
-        SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-      }
-    } else {
-      snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", 1, ($descriptor->str ? $descriptor->str : $descriptor->name));
-      SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-    }
-  } else {
-    snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", 1, ($descriptor->str ? $descriptor->str : $descriptor->name));
-    SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-  }
-}
-
-%typemap(varout) SWIGTYPE (CLASS::*) {
-  size_t ptr_size = sizeof($type);
-  C_word *known_space = C_alloc(C_SIZEOF_PAIR + C_SIZEOF_STRING(2*ptr_size) + C_SIZEOF_SWIG_POINTER);
-  char *temp = (char *)malloc(2*ptr_size);
-  C_word ptr = SWIG_NewPointerObj((void *) known_space, $descriptor, 0);
-
-  SWIG_PackData(temp, (void *) &$varname, ptr_size);
-  $result = C_pair(&known_space, C_string(&known_space, 2*ptr_size, temp), ptr);
-  free(temp);
-}
-
-  
-
-/* Pass-by-value */
-
-%typemap(in,closcode="(slot-ref $input 'swig-this)") SWIGTYPE($&1_ltype argp) {
-  argp = ($&1_ltype)SWIG_MustGetPtr($input, $&1_descriptor, $argnum, 0);
-  $1 = *argp;
-}
-
-%typemap(varin,closcode="(slot-ref $input 'swig-this)") SWIGTYPE {
-  $&1_ltype argp;
-  argp = ($&1_ltype)SWIG_MustGetPtr($input, $&1_descriptor, 1, 0);
-  $1 = *argp;
-}
-
-%typemap(out) SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  resultptr = new $1_ltype((const $1_ltype &) $1);
-  $result =  SWIG_NewPointerObj(resultptr, $&1_descriptor, 1);
-} 
-#else
-{
-  $&1_ltype resultptr;
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  $result = SWIG_NewPointerObj(resultptr, $&1_descriptor, 1);
-}
-#endif
-
-%typemap(varout) SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  resultptr = new $1_ltype((const $1_ltype&) $1);
-  $result =  SWIG_NewPointerObj(resultptr, $&1_descriptor, 0);
-} 
-#else
-{
-  $&1_ltype resultptr;
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  $result = SWIG_NewPointerObj(resultptr, $&1_descriptor, 0);
-}
-#endif
-
-/* --- Output values --- */
-
-/* Strings */
-
-%typemap(out) 
-  char *
-{ char *s = (char*) $1;
-  if ($1 == NULL) {
-    $result = C_SCHEME_FALSE;
-  } 
-  else {
-    int string_len = strlen ((char *) ($1));
-    C_word *string_space = C_alloc (C_SIZEOF_STRING (string_len));
-    $result = C_string (&string_space, string_len, s);
-  }
-}
-
-%typemap(varout) 
-  char *
-{ char *s = (char*) $varname;
-  if ($varname == NULL) {
-    $result = C_SCHEME_FALSE;
-  } 
-  else {
-    int string_len = strlen ($varname);
-    C_word *string_space = C_alloc (C_SIZEOF_STRING (string_len));
-    $result = C_string (&string_space, string_len, s);
-  }
-}
-
-%typemap(throws) char *
-{ 
-  if ($1 == NULL) {
-    SWIG_Chicken_ThrowException(C_SCHEME_FALSE);
-  } else {
-    int string_len = strlen($1);
-    C_word *string_space = C_alloc(C_SIZEOF_STRING(string_len));
-    SWIG_Chicken_ThrowException(C_string(&string_space, string_len, (char *) $1));
-  }
-}
-
-/* Void */
-%typemap(out) void
-%{
-$result = C_SCHEME_UNDEFINED;
-%}
-
-/* Special typemap for character array return values */
-
-%typemap(out) 
-  char [ANY], const char [ANY] 
-%{ if ($1 == NULL) {
-  $result = C_SCHEME_FALSE;
- }
- else {
-   const int string_len = strlen ($1);
-   C_word *string_space = C_alloc (C_SIZEOF_STRING (string_len));
-   $result = C_string (&string_space, string_len, $1);
- } %}
-
-/* Primitive types--return by value */
-
-/* --- Variable input --- */
-
-/* A string */
-#ifdef __cplusplus
-%typemap(varin) char * {
-  if ($input == C_SCHEME_FALSE) {
-    $1 = NULL;
-  }
-  else if (!C_swig_is_string ($input)) {
-      swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "C variable '$name ($1_ltype)'");
-  }
-  else {
-    char *temp = C_c_string ($input);
-    int  len   = C_header_size ($input);
-    if ($1) delete [] $1;
-    $1 = ($type) new char[len+1];
-    strncpy((char*)$1, temp, len);
-    ((char*)$1) [len] = 0;
-  }
-}
-%typemap(varin,warning="451:Setting const char * variable may leak memory") const char * {
-  if ($input == C_SCHEME_FALSE) {
-    $1 = NULL;
-  }
-  else if (!C_swig_is_string ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "C variable '$name ($1_ltype)'");
-  }
-  else {
-    char *temp = C_c_string ($input);
-    int  len   = C_header_size ($input);
-    $1 = ($type) new char[len+1];
-    strncpy((char*)$1,temp,len);
-    ((char*)$1) [len] = 0;
-  }
-}
-#else
-%typemap(varin) char * {
-  if ($input == C_SCHEME_FALSE) {
-    $1 = NULL;
-  }
-  else if (!C_swig_is_string ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "C variable '$name ($1_ltype)'");
-  }
-  else {
-    char *temp = C_c_string ($input);
-    int  len   = C_header_size ($input);
-    if ($1) free((char*) $1);
-    $1 = ($type) malloc(len+1);
-    strncpy((char*)$1,temp,len);
-    ((char*)$1) [len] = 0;
-  }
-}
-%typemap(varin,warning="451:Setting const char * variable may leak memory") const char * {
-  if ($input == C_SCHEME_FALSE) {
-    $1 = NULL;
-  }
-  else if (!C_swig_is_string ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "C variable '$name ($1_ltype)'");
-  }
-  else {
-    char *temp = C_c_string ($input);
-    int  len   = C_header_size ($input);
-    $1 = ($type) malloc(len+1);
-    strncpy((char*)$1,temp,len);
-    ((char*)$1) [len] = 0;
-  }
-}
-#endif
-
-%typemap(varin) char [] {
-  swig_barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, "C/C++ variable '$name' is read-only");
-}
-
-/* Special case for string array variables */
-%typemap(varin) char [ANY] {
-  if ($input == C_SCHEME_FALSE) {
-    memset($1,0,$1_dim0*sizeof(char));
-  }
-  else if (!C_swig_is_string ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "C variable '$name ($1_ltype)'");
-  }
-  else {
-    char *temp = C_c_string ($input);
-    strncpy($1,temp,$1_dim0*sizeof(char));
-  }
-}
-
-/* --- Variable output --- */
-
-/* Void */
-%typemap(varout) void "$result = C_SCHEME_UNDEFINED;";
-
-/* Special typemap for character array return values */
-%typemap(varout) char [ANY], const char [ANY] 
-%{  if ($varname == NULL) {
-    $result = C_SCHEME_FALSE;
-  }
-  else {
-   const int string_len = strlen ($varname);
-   C_word *string_space = C_alloc (C_SIZEOF_STRING (string_len));
-   $result = C_string (&string_space, string_len, (char *) $varname);
-  }
-%}
-
-
-/* --- Constants --- */
-
-%typemap(constcode) char *
-"static const char *$result = $value;"
-
-%typemap(constcode) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE []
-"static const void *$result = (void*) $value;"
-
-/* ------------------------------------------------------------
- * String & length
- * ------------------------------------------------------------ */
-
-%typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) {
-  if ($input == C_SCHEME_FALSE) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Cannot use a null/#f string for a char*, int arguments");
-  }
-  else if (C_swig_is_string ($input)) {
-    $1 = ($1_ltype) C_c_string ($input);
-    $2 = ($2_ltype) C_header_size ($input);
-  }
-  else {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument #$argnum is not of type 'string'");
-  }
-}
-
-/* ------------------------------------------------------------
- * CHICKEN types
- * ------------------------------------------------------------ */
-
-%typemap(in)   C_word "$1 = $input;";
-%typemap(out)  C_word "$result = $1;";
-
-/* ------------------------------------------------------------
- * Typechecking rules
- * ------------------------------------------------------------ */
-
-%typecheck(SWIG_TYPECHECK_INTEGER)
-         bool, const bool & 
-{
-  $1 = C_swig_is_bool ($input);
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER)
-	 int, short, 
- 	 unsigned int, unsigned short,
-	 signed char, unsigned char,
-	 const int &, const short &, 
- 	 const unsigned int &, const unsigned short &,
-	 enum SWIGTYPE
-{
-  $1 = C_swig_is_fixnum ($input);
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER)
-	 long,
- 	 unsigned long,
-	 long long, unsigned long long,
-	 const long &,
- 	 const unsigned long &,
-	 const long long &, const unsigned long long &
-{
-  $1 = (C_swig_is_bool ($input) || 
-    C_swig_is_fixnum ($input) || 
-    C_swig_is_flonum ($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_DOUBLE)
-	float, double,
-	const float &, const double &
-{
-  $1 = C_swig_is_flonum ($input);
-}
-
-%typecheck(SWIG_TYPECHECK_CHAR) char {
-  $1 = C_swig_is_string ($input);
-}
-
-%typecheck(SWIG_TYPECHECK_STRING) char * {
-  $1 = C_swig_is_string ($input);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  void *ptr;
-  $1 = !SWIG_ConvertPtr($input, &ptr, $1_descriptor, 0);
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void * {
-  void *ptr;
-  $1 = !SWIG_ConvertPtr($input, &ptr, 0, 0);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE &
-{
-  void *ptr = 0;
-  if (SWIG_ConvertPtr($input, &ptr, $descriptor, 0)) {
-    /* error */
-    $1 = 0;
-  } else {
-    $1 = (ptr != 0);
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE &&
-{
-  void *ptr = 0;
-  if (SWIG_ConvertPtr($input, &ptr, $descriptor, 0)) {
-    /* error */
-    $1 = 0;
-  } else {
-    $1 = (ptr != 0);
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE 
-{
-  void *ptr = 0;
-  if (SWIG_ConvertPtr($input, &ptr, $&descriptor, 0)) {
-    /* error */
-    $1 = 0;
-  } else {
-    $1 = (ptr != 0);
-  }
-}
-
-
-/* ------------------------------------------------------------
- * Exception handling
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- * --- Exception handling ---
- * ------------------------------------------------------------ */
-
-%typemap(throws) SWIGTYPE {
-  $&ltype temp = new $ltype($1);
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  C_word ptr = SWIG_NewPointerObj(temp, $&descriptor,1);
-  SWIG_Chicken_ThrowException(ptr);
-}
-
-%typemap(throws) SWIGTYPE * {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  C_word ptr = SWIG_NewPointerObj((void *) $1, $descriptor, 0);
-  SWIG_Chicken_ThrowException(ptr);
-}
-
-%typemap(throws) SWIGTYPE [ANY] {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  C_word ptr = SWIG_NewPointerObj((void *) $1, $descriptor, 0);
-  SWIG_Chicken_ThrowException(ptr);
-}
-
-%typemap(throws) SWIGTYPE & {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  C_word ptr = SWIG_NewPointerObj((void *)&($1),$descriptor,0);
-  SWIG_Chicken_ThrowException(ptr);
-}
-
-%typemap(throws) SWIGTYPE && {
-  C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER);
-  C_word ptr = SWIG_NewPointerObj((void *)&($1),$descriptor,0);
-  SWIG_Chicken_ThrowException(ptr);
-}
-
-/* ------------------------------------------------------------
- * ANSI C typemaps
- * ------------------------------------------------------------ */
-
-%apply unsigned long { size_t };
-
-/* ------------------------------------------------------------
- * Various
- * ------------------------------------------------------------ */
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* ------------------------------------------------------------
- * Overloaded operator support
- * ------------------------------------------------------------ */
-
-#ifdef __cplusplus
-%rename(__add__)      *::operator+;
-%rename(__pos__)      *::operator+();
-%rename(__pos__)      *::operator+() const;
-%rename(__sub__)      *::operator-;
-%rename(__neg__)      *::operator-();
-%rename(__neg__)      *::operator-() const;
-%rename(__mul__)      *::operator*;
-%rename(__div__)      *::operator/;
-%rename(__mod__)      *::operator%;
-%rename(__lshift__)   *::operator<<;
-%rename(__rshift__)   *::operator>>;
-%rename(__and__)      *::operator&;
-%rename(__or__)       *::operator|;
-%rename(__xor__)      *::operator^;
-%rename(__invert__)   *::operator~;
-%rename(__iadd__)     *::operator+=;
-%rename(__isub__)     *::operator-=;
-%rename(__imul__)     *::operator*=;
-%rename(__idiv__)     *::operator/=;
-%rename(__imod__)     *::operator%=;
-%rename(__ilshift__)  *::operator<<=;
-%rename(__irshift__)  *::operator>>=;
-%rename(__iand__)     *::operator&=;
-%rename(__ior__)      *::operator|=;
-%rename(__ixor__)     *::operator^=;
-%rename(__lt__)       *::operator<;
-%rename(__le__)       *::operator<=;
-%rename(__gt__)       *::operator>;
-%rename(__ge__)       *::operator>=;
-%rename(__eq__)       *::operator==;
-%rename(__ne__)       *::operator!=;
-
-/* Special cases */
-%rename(__call__)     *::operator();
-
-#endif
-/* Warnings for certain CHICKEN keywords */
-%include <chickenkw.swg>
-
-/* TinyCLOS <--> Low-level CHICKEN */
-
-%typemap("clos_in") SIMPLE_CLOS_OBJECT * "(slot-ref $input (quote this))"
-%typemap("clos_out") SIMPLE_CLOS_OBJECT * "(make $class (quote this) $1)"
-
-%insert(header) %{
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Chicken initialization function */
-SWIGEXPORT void SWIG_init(C_word, C_word, C_word) C_noret;
-#ifdef __cplusplus
-}
-#endif
-%}
-
-%insert(closprefix) "swigclosprefix.scm"
-
-%insert(init) "swiginit.swg"
-
-%insert(init) %{
-/* CHICKEN initialization function */
-#ifdef __cplusplus
-extern "C" {
-#endif
-SWIGEXPORT void SWIG_init(C_word argc, C_word closure, C_word continuation) {
-  int       i;
-  C_word sym;
-  C_word tmp;
-  C_word *a;
-  C_word ret;
-  C_word *return_vec;
-
-  SWIG_InitializeModule(0);
-  SWIG_PropagateClientData();
-  ret = C_SCHEME_TRUE;
-  
-#if $veclength
-  return_vec = C_alloc(C_SIZEOF_VECTOR($veclength));
-  ret = (C_word) return_vec;
-  *(return_vec++) = C_VECTOR_TYPE | $veclength;
-#endif
-
-  a = C_alloc(2*$nummethods$symsize);
-
-%}
diff --git a/dependencies2013/win32/swig/Lib/chicken/chickenkw.swg b/dependencies2013/win32/swig/Lib/chicken/chickenkw.swg
deleted file mode 100644
index d2c26c74..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/chickenkw.swg
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef CHICKEN_CHICKENKW_SWG_
-#define CHICKEN_CHICKENKW_SWG_
-
-/* Warnings for certain CHICKEN keywords. From Section 7.1.1 of
-   Revised^5 Report on the Algorithmic Language Scheme */
-#define CHICKENKW(x) %namewarn("314: '" #x "' is a R^5RS syntatic keyword")  #x
-
-CHICKENKW(else);
-CHICKENKW(=>);
-CHICKENKW(define);
-CHICKENKW(unquote);
-CHICKENKW(unquote-splicing);
-CHICKENKW(quote);
-CHICKENKW(lambda);
-CHICKENKW(if);
-CHICKENKW(set!);
-CHICKENKW(begin);
-CHICKENKW(cond);
-CHICKENKW(and);
-CHICKENKW(or);
-CHICKENKW(case);
-CHICKENKW(let);
-CHICKENKW(let*);
-CHICKENKW(letrec);
-CHICKENKW(do);
-CHICKENKW(delay);
-CHICKENKW(quasiquote);
-
-#undef CHICKENKW 
-
-#endif //CHICKEN_CHICKENKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/chicken/chickenrun.swg b/dependencies2013/win32/swig/Lib/chicken/chickenrun.swg
deleted file mode 100644
index f1340018..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/chickenrun.swg
+++ /dev/null
@@ -1,374 +0,0 @@
-/* -----------------------------------------------------------------------------
- * chickenrun.swg
- * ----------------------------------------------------------------------------- */
-
-#include <chicken.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-# ifndef snprintf
-#  define snprintf _snprintf
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SWIG_malloc(size) \
-  malloc(size)
-#define SWIG_free(mem) \
-  free(mem)
-#define SWIG_MakeString(c) \
-  SWIG_Chicken_MakeString(c)
-#define SWIG_ConvertPtr(s, result, type, flags) \
-  SWIG_Chicken_ConvertPtr(s, result, type, flags)
-#define SWIG_MustGetPtr(s, type, argnum, flags) \
-  SWIG_Chicken_MustGetPtr(s, type, argnum, flags)
-#define SWIG_NewPointerObj(ptr, type, owner) \
-  SWIG_Chicken_NewPointerObj((void*)ptr, type, owner, &known_space)
-#define swig_barf SWIG_Chicken_Barf
-#define SWIG_ThrowException(val) SWIG_Chicken_ThrowException(val)
-
-#define SWIG_contract_assert(expr, message) if (!(expr)) { \
-                                              SWIG_Chicken_Barf(SWIG_BARF1_CONTRACT_ASSERT, C_text(message)); } else
-
-/* Runtime API */
-#define SWIG_GetModule(clientdata) SWIG_Chicken_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer) SWIG_Chicken_SetModule(pointer)
-
-#define C_swig_is_bool(x) C_truep (C_booleanp (x))
-#define C_swig_is_char(x) C_truep (C_charp (x))
-#define C_swig_is_fixnum(x) C_truep (C_fixnump (x))
-#define C_swig_is_flonum(x) (C_truep (C_blockp (x)) && C_truep (C_flonump (x)))
-#define C_swig_is_string(x) (C_truep (C_blockp (x)) && C_truep (C_stringp (x)))
-#define C_swig_is_vector(x) (C_truep (C_blockp (x)) && C_truep (C_vectorp (x)))
-#define C_swig_is_list(x) (C_truep (C_i_listp (x)))
-#define C_swig_is_pair(x) (C_truep (C_blockp(x)) && C_truep (C_pairp(x)))
-#define C_swig_is_ptr(x) (C_truep (C_blockp (x)) && C_truep (C_pointerp (x)))
-#define C_swig_is_swigpointer(x) (C_truep (C_blockp(x)) && C_truep (C_swigpointerp(x)))
-#define C_swig_is_closurep(x) (C_truep (C_blockp(x)) && C_truep(C_closurep(x)))
-#define C_swig_is_number(x) (C_swig_is_fixnum(x) || C_swig_is_flonum(x))
-#define C_swig_is_long(x) C_swig_is_number(x)
-
-#define C_swig_sizeof_closure(num) (num+1)
-
-#define SWIG_Chicken_SetupArgout { \
-  C_word *a = C_alloc(C_swig_sizeof_closure(2)); \
-  C_word *closure = a; \
-  *(a++)=C_CLOSURE_TYPE|2; \
-  *(a++)=(C_word)SWIG_Chicken_ApplyResults; \
-  *(a++)=continuation; \
-  continuation=(C_word)closure; \
-}
-
-#define SWIG_APPEND_VALUE(obj) { \
-  C_word val = (C_word)(obj); \
-  if (val != C_SCHEME_UNDEFINED) { \
-    C_word *a = C_alloc(C_swig_sizeof_closure(3)); \
-    C_word *closure = a; \
-    *(a++)=C_CLOSURE_TYPE|3; \
-    *(a++)=(C_word)SWIG_Chicken_MultiResultBuild; \
-    *(a++)=(C_word)continuation; \
-    *(a++)=val; \
-    continuation=(C_word)closure; \
-  } }
-
-#define SWIG_Chicken_FindCreateProxy(func,obj) \
-  if (C_swig_is_swigpointer(obj)) { \
-    swig_type_info *t = (swig_type_info *) C_block_item(obj, 1); \
-    if (t && t->clientdata &&    ((swig_chicken_clientdata *)t->clientdata)->gc_proxy_create) { \
-      func = CHICKEN_gc_root_ref( ((swig_chicken_clientdata *)t->clientdata)->gc_proxy_create); \
-    } else { \
-      func = C_SCHEME_FALSE; \
-    } \
-  } else { \
-    func = C_SCHEME_FALSE; \
-  }
-
-
-enum {
-  SWIG_BARF1_BAD_ARGUMENT_TYPE /* 1 arg */,
-  SWIG_BARF1_ARGUMENT_NULL /* 1 arg */,
-  SWIG_BARF1_CONTRACT_ASSERT /* 1 arg */,
-};
-
-typedef C_word (*swig_chicken_destructor)(C_word,C_word,C_word,C_word);
-typedef struct swig_chicken_clientdata {
-  void *gc_proxy_create;
-  swig_chicken_destructor destroy;
-} swig_chicken_clientdata;
-  
-static char *
-SWIG_Chicken_MakeString(C_word str) {
-  char *ret;
-  size_t l;
-
-  l = C_header_size(str);
-  ret = (char *) SWIG_malloc( (l + 1) * sizeof(char));
-  if (!ret) return NULL;
-
-  memcpy(ret, C_c_string(str), l);
-  ret[l] = '\0';
-  return ret;
-}
-
-static C_word SWIG_Chicken_LookupSymbol(char *name, C_SYMBOL_TABLE *stable) {
-  C_word *a = C_alloc(C_SIZEOF_STRING (strlen (name)));
-  C_word n = C_string2(&a, name);
-  C_word sym = C_find_symbol(n, stable);
-  if (C_truep(sym)) {
-    return C_symbol_value(sym);
-  } else {
-    return C_SCHEME_FALSE;
-  }
-}
-
-/* Just a helper function.  Do not export it */
-static void SWIG_Chicken_Panic (C_char *) C_noret;
-static void SWIG_Chicken_Panic (C_char *msg)
-{
-  C_word *a = C_alloc (C_SIZEOF_STRING (strlen (msg)));
-  C_word scmmsg = C_string2 (&a, msg);
-  C_halt (scmmsg);
-  exit (5); /* should never get here */
-}
-
-static void
-SWIG_Chicken_Barf(int code, C_char *msg, ...) C_noret;
-static void
-SWIG_Chicken_Barf(int code, C_char *msg, ...)
-{
-  char *errorhook = C_text("\003syserror-hook");
-  C_word *a = C_alloc (C_SIZEOF_STRING (strlen (errorhook)));
-  C_word err = C_intern2 (&a, errorhook);
-  int c = -1;
-  int i, barfval;
-  va_list v;
-
-  
-  C_temporary_stack = C_temporary_stack_bottom;
-  err = C_block_item(err, 0);
-
-  if(C_immediatep (err))
-    SWIG_Chicken_Panic (C_text ("`##sys#error-hook' is not defined"));
-
-  switch (code) {
-  case SWIG_BARF1_BAD_ARGUMENT_TYPE:
-    barfval = C_BAD_ARGUMENT_TYPE_ERROR;
-    c = 1;
-    break;
-  case SWIG_BARF1_ARGUMENT_NULL:
-    barfval = C_BAD_ARGUMENT_TYPE_ERROR;
-    c = 1;
-    break;
-  case SWIG_BARF1_CONTRACT_ASSERT:
-    barfval = C_BAD_ARGUMENT_TYPE_ERROR;
-    c = 1;
-    break;
-  default:
-    SWIG_Chicken_Panic (C_text (msg));
-  };
-
-  if(c > 0 && !C_immediatep (err)) {
-    C_save (C_fix (barfval));
-
-    i = c;
-    if (i) {
-      C_word *b = C_alloc (C_SIZEOF_STRING (strlen (msg)));
-      C_word scmmsg = C_string2 (&b, msg);
-      C_save (scmmsg);
-      i--;
-    }
-
-    va_start (v, msg);
-
-    while(i--)
-      C_save (va_arg (v, C_word));
-
-    va_end (v);
-    C_do_apply (c + 1, err, 
-		C_SCHEME_UNDEFINED);  /* <- no continuation is passed:
-					 '##sys#error-hook' may not
-					 return! */
-  }
-  else if (msg) {
-    SWIG_Chicken_Panic (msg);
-  }
-  else {
-    SWIG_Chicken_Panic (C_text ("unspecified panic"));
-  }
-}
-
-static void SWIG_Chicken_ThrowException(C_word value) C_noret;
-static void SWIG_Chicken_ThrowException(C_word value)
-{
-  char *aborthook = C_text("\003sysabort");
-  C_word *a = C_alloc(C_SIZEOF_STRING(strlen(aborthook)));
-  C_word abort = C_intern2(&a, aborthook);
-
-  abort = C_block_item(abort, 0);
-  if (C_immediatep(abort))
-    SWIG_Chicken_Panic(C_text("`##sys#abort' is not defined"));
-
-  C_save(value);
-  C_do_apply(1, abort, C_SCHEME_UNDEFINED);
-}
-
-static void
-SWIG_Chicken_Finalizer(C_word argc, C_word closure, C_word continuation, C_word s)
-{
-  swig_type_info *type;
-  swig_chicken_clientdata *cdata;
-
-  if (argc == 3 && s != C_SCHEME_FALSE && C_swig_is_swigpointer(s)) {
-    type = (swig_type_info *) C_block_item(s, 1);
-    if (type) {
-      cdata = (swig_chicken_clientdata *) type->clientdata;
-      if (cdata && cdata->destroy) {
-	/* this will not return, but will continue correctly */
-        cdata->destroy(3,closure,continuation,s);
-      }
-    }
-  }
-  C_kontinue(continuation, C_SCHEME_UNDEFINED);
-}
-static C_word finalizer_obj[2] = {(C_word) (C_CLOSURE_TYPE|1), (C_word) SWIG_Chicken_Finalizer};
-
-static C_word
-SWIG_Chicken_NewPointerObj(void *ptr, swig_type_info *type, int owner, C_word **data)
-{
-  swig_chicken_clientdata *cdata = (swig_chicken_clientdata *) type->clientdata;
-
-  if (ptr == NULL)
-    return C_SCHEME_FALSE;
-  else {
-    C_word cptr = C_swigmpointer(data, ptr, type);
-    /* add finalizer to object */
-    #ifndef SWIG_CHICKEN_NO_COLLECTION
-    if (owner)
-      C_do_register_finalizer(cptr, (C_word) finalizer_obj);
-    #endif
-
-    return cptr;
-  }
-}
-
-/* Return 0 if successful. */
-static int
-SWIG_Chicken_ConvertPtr(C_word s, void **result, swig_type_info *type, int flags)
-{
-  swig_cast_info *cast;
-  swig_type_info *from;
-
-  if (s == C_SCHEME_FALSE) {
-    *result = NULL;
-  } else if (C_swig_is_swigpointer(s)) {
-    /* try and convert type */
-    from = (swig_type_info *) C_block_item(s, 1);
-    if (!from) return 1;
-    if (type) {
-      cast = SWIG_TypeCheckStruct(from, type);
-      if (cast) {
-        int newmemory = 0;
-        *result = SWIG_TypeCast(cast, (void *) C_block_item(s, 0), &newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return 1;
-      }
-    } else {
-      *result = (void *) C_block_item(s, 0);
-    }
-
-    /* check if we are disowning this object */
-    if (flags & SWIG_POINTER_DISOWN) {
-      C_do_unregister_finalizer(s);
-    }
-  } else {
-    return 1;
-  }
-
-  return 0;
-}
-
-static SWIGINLINE void *
-SWIG_Chicken_MustGetPtr (C_word s, swig_type_info *type, int argnum, int flags)
-{
-  void *result;
-  char err_msg[256];
-  if (SWIG_Chicken_ConvertPtr(s, &result, type, flags)) {
-    /* type mismatch */
-    snprintf(err_msg, sizeof(err_msg), "Type error in argument #%i: expected %s", argnum, (type->str ? type->str : type->name));
-    SWIG_Chicken_Barf(SWIG_BARF1_BAD_ARGUMENT_TYPE, err_msg);
-  }
-  return result;
-}
-
-static char *chicken_runtimevar_name = "type_pointer" SWIG_TYPE_TABLE_NAME;
-
-static swig_module_info *
-SWIG_Chicken_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
-    swig_module_info *ret = 0;
-    C_word sym;
-
-    /* lookup the type pointer... it is stored in its own symbol table */
-    C_SYMBOL_TABLE *stable = C_find_symbol_table("swig_runtime_data" SWIG_RUNTIME_VERSION);
-    if (stable != NULL) {
-      sym = SWIG_Chicken_LookupSymbol(chicken_runtimevar_name, stable);
-      if (C_truep(sym) && C_swig_is_ptr(sym)) {
-        ret = (swig_module_info *) C_block_item(sym, 0);
-      }
-    }
-
-    return ret;
-}
-
-static void
-SWIG_Chicken_SetModule(swig_module_info *module) {
-    C_word *a;
-    C_SYMBOL_TABLE *stable;
-    C_word sym;
-    C_word pointer;
-    static C_word *space = 0;
-    
-    /* type pointer is stored in its own symbol table */
-    stable = C_find_symbol_table("swig_runtime_data" SWIG_RUNTIME_VERSION);
-    if (stable == NULL) {
-      stable = C_new_symbol_table("swig_runtime_data" SWIG_RUNTIME_VERSION, 16);
-    }
-
-    if (!space) {
-      space = (C_word *) C_malloc((C_SIZEOF_POINTER + C_SIZEOF_INTERNED_SYMBOL(C_strlen(chicken_runtimevar_name))) * sizeof(C_word));
-    }
-    a = space;
-    pointer = C_mpointer(&a, (void *) module);
-    sym = C_intern_in(&a, C_strlen(chicken_runtimevar_name), chicken_runtimevar_name, stable);
-    C_set_block_item(sym, 0, pointer);
-}
-
-static C_word SWIG_Chicken_MultiResultBuild(C_word num, C_word closure, C_word lst) {
-  C_word cont = C_block_item(closure,1);
-  C_word obj = C_block_item(closure,2);
-  C_word func;
-
-  SWIG_Chicken_FindCreateProxy(func,obj);
-
-  if (C_swig_is_closurep(func)) {
-    ((C_proc4)(void *)C_block_item(func, 0))(4,func,cont,obj,lst);
-  } else {
-    C_word *a = C_alloc(C_SIZEOF_PAIR);
-    C_kontinue(cont,C_pair(&a,obj,lst));
-  }
-  return C_SCHEME_UNDEFINED; /* never reached */
-}
-
-static C_word SWIG_Chicken_ApplyResults(C_word num, C_word closure, C_word result) {
-  C_apply_values(3,C_SCHEME_UNDEFINED,C_block_item(closure,1),result);
-  return C_SCHEME_UNDEFINED; /* never reached */
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/chicken/extra-install.list b/dependencies2013/win32/swig/Lib/chicken/extra-install.list
deleted file mode 100644
index 48721cee..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/extra-install.list
+++ /dev/null
@@ -1,3 +0,0 @@
-swigclosprefix.scm
-multi-generic.scm
-tinyclos-multi-generic.patch
diff --git a/dependencies2013/win32/swig/Lib/chicken/multi-generic.scm b/dependencies2013/win32/swig/Lib/chicken/multi-generic.scm
deleted file mode 100644
index 9d2e31d3..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/multi-generic.scm
+++ /dev/null
@@ -1,152 +0,0 @@
-;; This file is no longer necessary with Chicken versions above 1.92
-;; 
-;; This file overrides two functions inside TinyCLOS to provide support
-;; for multi-argument generics.  There are many ways of linking this file
-;; into your code... all that needs to happen is this file must be
-;; executed after loading TinyCLOS but before any SWIG modules are loaded
-;;
-;; something like the following
-;; (require 'tinyclos)
-;; (load "multi-generic")
-;; (declare (uses swigmod))
-;;
-;; An alternative to loading this scheme code directly is to add a
-;; (declare (unit multi-generic)) to the top of this file, and then
-;; compile this into the final executable or something.  Or compile
-;; this into an extension.
-
-;; Lastly, to override TinyCLOS method creation, two functions are
-;; overridden: see the end of this file for which two are overridden.
-;; You might want to remove those two lines and then exert more control over
-;; which functions are used when.
-
-;; Comments, bugs, suggestions: send either to chicken-users@nongnu.org or to
-;; Most code copied from TinyCLOS
-
-(define <multi-generic> (make <entity-class>
-			  'name "multi-generic"
-			  'direct-supers (list <generic>)
-			  'direct-slots '()))
-
-(letrec ([applicable?
-          (lambda (c arg)
-            (memq c (class-cpl (class-of arg))))]
-
-         [more-specific?
-          (lambda (c1 c2 arg)
-            (memq c2 (memq c1 (class-cpl (class-of arg)))))]
-
-         [filter-in
-           (lambda (f l)
-             (if (null? l)
-                 '()
-                 (let ([h (##sys#slot l 0)]
-	               [r (##sys#slot l 1)] )
-	           (if (f h)
-	               (cons h (filter-in f r))
-	               (filter-in f r) ) ) ) )])
-
-(add-method compute-apply-generic
-  (make-method (list <multi-generic>)
-    (lambda (call-next-method generic)
-      (lambda args
-		(let ([cam (let ([x (compute-apply-methods generic)]
-				 [y ((compute-methods generic) args)] )
-			     (lambda (args) (x y args)) ) ] )
-		  (cam args) ) ) ) ) )
-
-
-
-(add-method compute-methods
-  (make-method (list <multi-generic>)
-    (lambda (call-next-method generic)
-      (lambda (args)
-	(let ([applicable
-	       (filter-in (lambda (method)
-                            (let check-applicable ([list1 (method-specializers method)]
-                                                   [list2 args])
-                              (cond ((null? list1) #t)
-                                    ((null? list2) #f)
-                                    (else
-                                      (and (applicable? (##sys#slot list1 0) (##sys#slot list2 0))
-                                           (check-applicable (##sys#slot list1 1) (##sys#slot list2 1)))))))
-			  (generic-methods generic) ) ] )
-	  (if (or (null? applicable) (null? (##sys#slot applicable 1))) 
-	      applicable
-	      (let ([cmms (compute-method-more-specific? generic)])
-		(sort applicable (lambda (m1 m2) (cmms m1 m2 args))) ) ) ) ) ) ) )
-
-(add-method compute-method-more-specific?
-  (make-method (list <multi-generic>)
-    (lambda (call-next-method generic)
-      (lambda (m1 m2 args)
-	(let loop ((specls1 (method-specializers m1))
-		   (specls2 (method-specializers m2))
-		   (args args))
-	  (cond-expand
-	   [unsafe
-	    (let ((c1  (##sys#slot specls1 0))
-		  (c2  (##sys#slot specls2 0))
-		  (arg (##sys#slot args 0)))
-	      (if (eq? c1 c2)
-		  (loop (##sys#slot specls1 1)
-			(##sys#slot specls2 1)
-			(##sys#slot args 1))
-		  (more-specific? c1 c2 arg))) ] 
-	   [else
-	    (cond ((and (null? specls1) (null? specls2))
-		   (##sys#error "two methods are equally specific" generic))
-		  ;((or (null? specls1) (null? specls2))
-		  ; (##sys#error "two methods have different number of specializers" generic))
-                  ((null? specls1) #f)
-                  ((null? specls2) #t)
-		  ((null? args)
-		   (##sys#error "fewer arguments than specializers" generic))
-		  (else
-		   (let ((c1  (##sys#slot specls1 0))
-			 (c2  (##sys#slot specls2 0))
-			 (arg (##sys#slot args 0)))
-		     (if (eq? c1 c2)
-			 (loop (##sys#slot specls1 1)
-			       (##sys#slot specls2 1)
-			       (##sys#slot args 1))
-			 (more-specific? c1 c2 arg)))) ) ] ) ) ) ) ) )
-
-) ;; end of letrec
-
-(define multi-add-method
-  (lambda (generic method)
-    (slot-set!
-     generic
-     'methods
-       (let filter-in-method ([methods (slot-ref generic 'methods)])
-         (if (null? methods)
-           (list method)
-           (let ([l1 (length (method-specializers method))]
-		 [l2 (length (method-specializers (##sys#slot methods 0)))])
-             (cond ((> l1 l2)
-                    (cons (##sys#slot methods 0) (filter-in-method (##sys#slot methods 1))))
-                   ((< l1 l2)
-                    (cons method methods))
-                   (else
-                     (let check-method ([ms1 (method-specializers method)]
-                                        [ms2 (method-specializers (##sys#slot methods 0))])
-                       (cond ((and (null? ms1) (null? ms2))
-                              (cons method (##sys#slot methods 1))) ;; skip the method already in the generic
-                             ((eq? (##sys#slot ms1 0) (##sys#slot ms2 0))
-                              (check-method (##sys#slot ms1 1) (##sys#slot ms2 1)))
-                             (else
-                               (cons (##sys#slot methods 0) (filter-in-method (##sys#slot methods 1))))))))))))
-
-    (##sys#setslot (##sys#slot generic (- (##sys#size generic) 2)) 1 (compute-apply-generic generic)) ))
-
-(define (multi-add-global-method val sym specializers proc)
-  (let ((generic (if (procedure? val) val (make <multi-generic> 'name (##sys#symbol->string sym)))))
-    (multi-add-method generic (make-method specializers proc))
-    generic))
-
-;; Might want to remove these, or perhaps do something like
-;; (define old-add-method ##tinyclos#add-method)
-;; and then you can switch between creating multi-generics and TinyCLOS generics.
-(set! ##tinyclos#add-method multi-add-method)
-(set! ##tinyclos#add-global-method multi-add-global-method)
diff --git a/dependencies2013/win32/swig/Lib/chicken/std_string.i b/dependencies2013/win32/swig/Lib/chicken/std_string.i
deleted file mode 100644
index fa77c153..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/std_string.i
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-namespace std {
-    %naturalvar string;
-  
-
-    %insert(closprefix) %{ (declare (hide <std-string>)) %}
-    %nodefault string;
-    %rename("std-string") string;
-    class string {
-      public:
-	~string() {}
-    };
-    %extend string {
-      char *str;
-    }
-    %{
-      #define std_string_str_get(s) ((char *)((s)->c_str()))
-      #define std_string_str_set(s,v) (s->assign((char *)(v)))
-    %}
-
-    %typemap(typecheck) string = char *;
-    %typemap(typecheck) const string & = char *;
-
-    %typemap(in) string (char * tempptr) {
-      if ($input == C_SCHEME_FALSE) {
-	$1.resize(0);
-      } else { 
-	if (!C_swig_is_string ($input)) {
-	  swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, 
-		     "Argument #$argnum is not a string");
-	}
-	tempptr = SWIG_MakeString($input);
-	$1.assign(tempptr);
-	if (tempptr) SWIG_free(tempptr);
-      }
-    }
-
-    %typemap(in) const string& ($*1_ltype temp, char *tempptr) {
-
-      if ($input == C_SCHEME_FALSE) {
-	temp.resize(0);
-	$1 = &temp;
-      } else { 
-	if (!C_swig_is_string ($input)) {
-	  swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, 
-		     "Argument #$argnum is not a string");
-	}
-	tempptr = SWIG_MakeString($input);
-	temp.assign(tempptr);
-	if (tempptr) SWIG_free(tempptr);
-	$1 = &temp;
-      }
-    }
-
-    %typemap(out) string { 
-      int size = $1.size();
-      C_word *space = C_alloc (C_SIZEOF_STRING (size));
-      $result = C_string (&space, size, (char *) $1.c_str());
-    }
-
-    %typemap(out) const string& { 
-      int size = $1->size();
-      C_word *space = C_alloc (C_SIZEOF_STRING (size));
-      $result = C_string (&space, size, (char *) $1->c_str());
-    }
-
-    %typemap(varin) string {
-      if ($input == C_SCHEME_FALSE) {
-	$1.resize(0);
-      } else { 
-        char *tempptr;
-	if (!C_swig_is_string ($input)) {
-	  swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, 
-		     "Argument #$argnum is not a string");
-   	}
-	tempptr = SWIG_MakeString($input);
-	$1.assign(tempptr);
-	if (tempptr) SWIG_free(tempptr);
-      }
-    }
-
-    %typemap(varout) string { 
-      int size = $1.size();
-      C_word *space = C_alloc (C_SIZEOF_STRING (size));
-      $result = C_string (&space, size, (char *) $1.c_str());
-    }
-}
diff --git a/dependencies2013/win32/swig/Lib/chicken/swigclosprefix.scm b/dependencies2013/win32/swig/Lib/chicken/swigclosprefix.scm
deleted file mode 100644
index e4bd72b7..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/swigclosprefix.scm
+++ /dev/null
@@ -1,31 +0,0 @@
-(declare (hide swig-initialize))
-
-(define (swig-initialize obj initargs create)
-     (slot-set! obj 'swig-this
-        (if (memq 'swig-this initargs)
-            (cadr initargs)
-            (let ((ret (apply create initargs)))
-              (if (instance? ret)
-                (slot-ref ret 'swig-this)
-                ret)))))
-
-(define-class <swig-metaclass-$module> (<class>) (void))
-
-(define-method (compute-getter-and-setter (class <swig-metaclass-$module>) slot allocator)
-  (if (not (memq ':swig-virtual slot))
-    (call-next-method)
-    (let ((getter (let search-get ((lst slot))
-                    (if (null? lst)
-                      #f
-                      (if (eq? (car lst) ':swig-get)
-                        (cadr lst)
-                        (search-get (cdr lst))))))
-          (setter (let search-set ((lst slot))
-                    (if (null? lst)
-                      #f
-                      (if (eq? (car lst) ':swig-set)
-                        (cadr lst)
-                        (search-set (cdr lst)))))))
-      (values
-        (lambda (o) (getter (slot-ref o 'swig-this)))
-	(lambda (o new) (setter (slot-ref o 'swig-this) new) new)))))
diff --git a/dependencies2013/win32/swig/Lib/chicken/tinyclos-multi-generic.patch b/dependencies2013/win32/swig/Lib/chicken/tinyclos-multi-generic.patch
deleted file mode 100644
index 2e585960..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/tinyclos-multi-generic.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-# This patch is against chicken 1.92, but it should work just fine
-# with older versions of chicken.  It adds support for mulit-argument
-# generics, that is, generics now correctly handle adding methods
-# with different lengths of specializer lists
-
-# This patch has been committed into the CHICKEN darcs repository,
-# so chicken versions above 1.92 work fine.
-
-# Comments, bugs, suggestions send to chicken-users@nongnu.org
-
-# Patch written by John Lenz <lenz@cs.wisc.edu>
-
---- tinyclos.scm.old	2005-04-05 01:13:56.000000000 -0500
-+++ tinyclos.scm	2005-04-11 16:37:23.746181489 -0500
-@@ -37,8 +37,10 @@
- 
- (include "parameters")
- 
-+(cond-expand [(not chicken-compile-shared) (declare (unit tinyclos))]
-+	     [else] )
-+
- (declare
--  (unit tinyclos)
-   (uses extras)
-   (usual-integrations)
-   (fixnum) 
-@@ -234,7 +236,10 @@
-             y = C_block_item(y, 1);
-           }
-         }
--        return(C_block_item(v, i + 1));
-+        if (x == C_SCHEME_END_OF_LIST && y == C_SCHEME_END_OF_LIST)
-+          return(C_block_item(v, i + 1));
-+        else
-+          goto mismatch;
-       }
-       else if(free_index == -1) free_index = i;
-     mismatch:
-@@ -438,7 +443,7 @@
- (define hash-arg-list
-   (foreign-lambda* unsigned-int ((scheme-object args) (scheme-object svector)) "
-     C_word tag, h, x;
--    int n, i, j;
-+    int n, i, j, len = 0;
-     for(i = 0; args != C_SCHEME_END_OF_LIST; args = C_block_item(args, 1)) {
-       x = C_block_item(args, 0);
-       if(C_immediatep(x)) {
-@@ -481,8 +486,9 @@
-         default: i += 255;
-         }
-       }
-+      ++len;
-     }
--    return(i & (C_METHOD_CACHE_SIZE - 1));") )
-+    return((i + len) & (C_METHOD_CACHE_SIZE - 1));") )
- 
- 
- ;
-@@ -868,13 +874,27 @@
-     (##tinyclos#slot-set!
-      generic
-      'methods
--     (cons method
--	   (filter-in
--	    (lambda (m) 
--	      (let ([ms1 (method-specializers m)]
--		    [ms2 (method-specializers method)] )
--		(not (every2 (lambda (x y) (eq? x y)) ms1 ms2) ) ) )
--	    (##tinyclos#slot-ref generic 'methods))))
-+     (let* ([ms1 (method-specializers method)]
-+	    [l1 (length ms1)] )
-+       (let filter-in-method ([methods (##tinyclos#slot-ref generic 'methods)])
-+	 (if (null? methods)
-+	     (list method)
-+	     (let* ([mm (##sys#slot methods 0)]
-+		    [ms2 (method-specializers mm)]
-+		    [l2 (length ms2)])
-+	       (cond ((> l1 l2)
-+		      (cons mm (filter-in-method (##sys#slot methods 1))))
-+		     ((< l1 l2)
-+		      (cons method methods))
-+		     (else
-+		      (let check-method ([ms1 ms1]
-+					 [ms2 ms2])
-+			(cond ((and (null? ms1) (null? ms2))
-+			       (cons method (##sys#slot methods 1))) ;; skip the method already in the generic
-+			      ((eq? (##sys#slot ms1 0) (##sys#slot ms2 0))
-+			       (check-method (##sys#slot ms1 1) (##sys#slot ms2 1)))
-+			      (else
-+			       (cons mm (filter-in-method (##sys#slot methods 1)))))))))))))
-     (if (memq generic generic-invocation-generics)
- 	(set! method-cache-tag (vector))
- 	(%entity-cache-set! generic #f) )
-@@ -925,11 +945,13 @@
- 				(memq (car args) generic-invocation-generics))
- 			   (let ([proc 
- 				  (method-procedure
-+				    ; select the first method of one argument
- 				   (let lp ([lis (generic-methods generic)])
--				     (let ([tail (##sys#slot lis 1)])
--				       (if (null? tail)
--					   (##sys#slot lis 0)
--					   (lp tail)) ) ) ) ] )
-+				     (if (null? lis)
-+				       (##sys#error "Unable to find original compute-apply-generic")
-+				       (if (= (length (method-specializers (##sys#slot lis 0))) 1)
-+					 (##sys#slot lis 0)
-+					 (lp (##sys#slot lis 1)))))) ] )
- 			     (lambda (args) (apply proc #f args)) )
- 			   (let ([x (compute-apply-methods generic)]
- 				 [y ((compute-methods generic) args)] )
-@@ -946,9 +968,13 @@
-       (lambda (args)
- 	(let ([applicable
- 	       (filter-in (lambda (method)
--			    (every2 applicable?
--				   (method-specializers method)
--				   args))
-+                            (let check-applicable ([list1 (method-specializers method)]
-+                                                   [list2 args])
-+                              (cond ((null? list1) #t)
-+                                    ((null? list2) #f)
-+                                    (else
-+                                      (and (applicable? (##sys#slot list1 0) (##sys#slot list2 0))
-+                                           (check-applicable (##sys#slot list1 1) (##sys#slot list2 1)))))))
- 			  (generic-methods generic) ) ] )
- 	  (if (or (null? applicable) (null? (##sys#slot applicable 1))) 
- 	      applicable
-@@ -975,8 +1001,10 @@
- 	   [else
- 	    (cond ((and (null? specls1) (null? specls2))
- 		   (##sys#error "two methods are equally specific" generic))
--		  ((or (null? specls1) (null? specls2))
--		   (##sys#error "two methods have different number of specializers" generic))
-+		  ;((or (null? specls1) (null? specls2))
-+		  ; (##sys#error "two methods have different number of specializers" generic))
-+                  ((null? specls1) #f)
-+                  ((null? specls2) #t)
- 		  ((null? args)
- 		   (##sys#error "fewer arguments than specializers" generic))
- 		  (else
-@@ -1210,7 +1238,7 @@
- (define <structure>      (make-primitive-class "structure"))
- (define <procedure> (make-primitive-class "procedure" <procedure-class>))
- (define <end-of-file> (make-primitive-class "end-of-file"))
--(define <environment> (make-primitive-class "environment" <structure>))	; (Benedikt insisted on this)
-+(define <environment> (make-primitive-class "environment" <structure>))
- (define <hash-table> (make-primitive-class "hash-table" <structure>))
- (define <promise> (make-primitive-class "promise" <structure>))
- (define <queue> (make-primitive-class "queue" <structure>))
diff --git a/dependencies2013/win32/swig/Lib/chicken/typemaps.i b/dependencies2013/win32/swig/Lib/chicken/typemaps.i
deleted file mode 100644
index fd587fd6..00000000
--- a/dependencies2013/win32/swig/Lib/chicken/typemaps.i
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer handling
- *
- * These mappings provide support for input/output arguments and
- * common uses for C/C++ pointers.  INOUT mappings allow for C/C++
- * pointer variables in addition to input/output arguments.
- * ----------------------------------------------------------------------------- */
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/* 
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-	 long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         char           *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/* 
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Scheme list.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         char           *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-*/
-
-//----------------------------------------------------------------------
-//
-// T_OUTPUT typemap (and helper function) to return multiple argouts as
-// a tuple instead of a list.
-//
-//----------------------------------------------------------------------
-
-// Simple types
-
-%define INOUT_TYPEMAP(type_, from_scheme, to_scheme, checker, convtype, storage_)
-
-%typemap(in) type_ *INPUT($*1_ltype temp), type_ &INPUT($*1_ltype temp)
-%{  if (!checker ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument #$argnum is not of type 'type_'");
-  }
-  temp = ($*1_ltype) from_scheme ($input);
-  $1 = &temp; %}
-
-%typemap(typecheck) type_ *INPUT = type_;
-%typemap(typecheck) type_ &INPUT = type_;
-
-%typemap(in, numinputs=0) type_ *OUTPUT($*1_ltype temp), type_ &OUTPUT($*1_ltype temp)
-"  $1 = &temp;"
-
-#if "storage_" == "0"
-
-%typemap(argout) type_ *OUTPUT, type_ &OUTPUT 
-%{ 
-  if ($1 == NULL) {
-    swig_barf (SWIG_BARF1_ARGUMENT_NULL, "Argument #$argnum must be non-null");
-  }
-  SWIG_APPEND_VALUE(to_scheme (convtype (*$1)));
-%}
-
-#else
-
-%typemap(argout) type_ *OUTPUT, type_ &OUTPUT 
-%{
-  {
-    C_word *known_space = C_alloc(storage_);
-    if ($1 == NULL) {
-      swig_barf (SWIG_BARF1_ARGUMENT_NULL, "Variable '$1' must be non-null");
-    }
-    SWIG_APPEND_VALUE(to_scheme (&known_space, convtype (*$1)));
-  }
-%}
-
-#endif
-
-%enddef
-
-INOUT_TYPEMAP(int, C_num_to_int, C_fix, C_swig_is_number, (int), 0);
-INOUT_TYPEMAP(enum SWIGTYPE, C_num_to_int, C_fix, C_swig_is_number, (int), 0);
-INOUT_TYPEMAP(short, C_num_to_int, C_fix, C_swig_is_number, (int), 0);
-INOUT_TYPEMAP(long, C_num_to_long, C_long_to_num, C_swig_is_long, (long), C_SIZEOF_FLONUM);
-INOUT_TYPEMAP(long long, C_num_to_long, C_long_to_num, C_swig_is_long, (long), C_SIZEOF_FLONUM);
-INOUT_TYPEMAP(unsigned int, C_num_to_unsigned_int, C_unsigned_int_to_num, C_swig_is_number, (int), C_SIZEOF_FLONUM);
-INOUT_TYPEMAP(unsigned short, C_num_to_unsigned_int, C_fix, C_swig_is_number, (unsigned int), 0);
-INOUT_TYPEMAP(unsigned long, C_num_to_unsigned_long, C_unsigned_long_to_num, C_swig_is_long, (unsigned long), C_SIZEOF_FLONUM);
-INOUT_TYPEMAP(unsigned long long, C_num_to_unsigned_long, C_unsigned_long_to_num, C_swig_is_long, (unsigned long), C_SIZEOF_FLONUM);
-INOUT_TYPEMAP(unsigned char, C_character_code, C_make_character, C_swig_is_char, (unsigned int), 0);
-INOUT_TYPEMAP(signed char, C_character_code, C_make_character, C_swig_is_char, (int), 0);
-INOUT_TYPEMAP(char, C_character_code, C_make_character, C_swig_is_char, (char), 0);
-INOUT_TYPEMAP(bool, C_truep, C_mk_bool, C_swig_is_bool, (bool), 0);
-INOUT_TYPEMAP(float, C_c_double, C_flonum, C_swig_is_number, (double), C_SIZEOF_FLONUM);
-INOUT_TYPEMAP(double, C_c_double, C_flonum, C_swig_is_number, (double), C_SIZEOF_FLONUM);
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a CHICKEN tuple.  
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         char           *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-As well, you can wrap variables with :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *y };
-        extern double *y;
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in CHICKEN).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a CHICKEN variable you might do this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(in) enum SWIGTYPE *INOUT = enum SWIGTYPE *INPUT;
-%typemap(in) short *INOUT = short *INPUT;
-%typemap(in) long *INOUT = long *INPUT;
-%typemap(in) long long *INOUT = long long *INPUT;
-%typemap(in) unsigned *INOUT = unsigned *INPUT;
-%typemap(in) unsigned short *INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long *INOUT = unsigned long *INPUT;
-%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT;
-%typemap(in) unsigned char *INOUT = unsigned char *INPUT;
-%typemap(in) char *INOUT = char *INPUT;
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(in) float *INOUT = float *INPUT;
-%typemap(in) double *INOUT = double *INPUT;
-
-%typemap(in) int &INOUT = int &INPUT;
-%typemap(in) enum SWIGTYPE &INOUT = enum SWIGTYPE &INPUT;
-%typemap(in) short &INOUT = short &INPUT;
-%typemap(in) long &INOUT = long &INPUT;
-%typemap(in) long long &INOUT = long long &INPUT;
-%typemap(in) unsigned &INOUT = unsigned &INPUT;
-%typemap(in) unsigned short &INOUT = unsigned short &INPUT;
-%typemap(in) unsigned long &INOUT = unsigned long &INPUT;
-%typemap(in) unsigned long long &INOUT = unsigned long long &INPUT;
-%typemap(in) unsigned char &INOUT = unsigned char &INPUT;
-%typemap(in) char &INOUT = char &INPUT;
-%typemap(in) bool &INOUT = bool &INPUT;
-%typemap(in) float &INOUT = float &INPUT;
-%typemap(in) double &INOUT = double &INPUT;
-
-%typemap(argout) int *INOUT = int *OUTPUT;
-%typemap(argout) enum SWIGTYPE *INOUT = enum SWIGTYPE *OUTPUT;
-%typemap(argout) short *INOUT = short *OUTPUT;
-%typemap(argout) long *INOUT = long *OUTPUT;
-%typemap(argout) long long *INOUT = long long *OUTPUT;
-%typemap(argout) unsigned *INOUT = unsigned *OUTPUT;
-%typemap(argout) unsigned short *INOUT = unsigned short *OUTPUT;
-%typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(argout) float *INOUT = float *OUTPUT;
-%typemap(argout) double *INOUT = double *OUTPUT;
-
-%typemap(argout) int &INOUT = int &OUTPUT;
-%typemap(argout) enum SWIGTYPE &INOUT = enum SWIGTYPE &OUTPUT;
-%typemap(argout) short &INOUT = short &OUTPUT;
-%typemap(argout) long &INOUT = long &OUTPUT;
-%typemap(argout) long long &INOUT = long long &OUTPUT;
-%typemap(argout) unsigned &INOUT = unsigned &OUTPUT;
-%typemap(argout) unsigned short &INOUT = unsigned short &OUTPUT;
-%typemap(argout) unsigned long &INOUT = unsigned long &OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long &OUTPUT;
-%typemap(argout) unsigned char &INOUT = unsigned char &OUTPUT;
-%typemap(argout) char &INOUT = char &OUTPUT;
-%typemap(argout) bool &INOUT = bool &OUTPUT;
-%typemap(argout) float &INOUT = float &OUTPUT;
-%typemap(argout) double &INOUT = double &OUTPUT;
-
-/* Overloading information */
-
-%typemap(typecheck) double *INOUT = double;
-%typemap(typecheck) bool *INOUT = bool;
-%typemap(typecheck) char *INOUT = char;
-%typemap(typecheck) signed char *INOUT = signed char;
-%typemap(typecheck) unsigned char *INOUT = unsigned char;
-%typemap(typecheck) unsigned long *INOUT = unsigned long;
-%typemap(typecheck) unsigned long long *INOUT = unsigned long long;
-%typemap(typecheck) unsigned short *INOUT = unsigned short;
-%typemap(typecheck) unsigned int *INOUT = unsigned int;
-%typemap(typecheck) long *INOUT = long;
-%typemap(typecheck) long long *INOUT = long long;
-%typemap(typecheck) short *INOUT = short;
-%typemap(typecheck) int *INOUT = int;
-%typemap(typecheck) enum SWIGTYPE *INOUT = enum SWIGTYPE;
-%typemap(typecheck) float *INOUT = float;
-
-%typemap(typecheck) double &INOUT = double;
-%typemap(typecheck) bool &INOUT = bool;
-%typemap(typecheck) char &INOUT = char;
-%typemap(typecheck) signed char &INOUT = signed char;
-%typemap(typecheck) unsigned char &INOUT = unsigned char;
-%typemap(typecheck) unsigned long &INOUT = unsigned long;
-%typemap(typecheck) unsigned long long &INOUT = unsigned long long;
-%typemap(typecheck) unsigned short &INOUT = unsigned short;
-%typemap(typecheck) unsigned int &INOUT = unsigned int;
-%typemap(typecheck) long &INOUT = long;
-%typemap(typecheck) long long &INOUT = long long;
-%typemap(typecheck) short &INOUT = short;
-%typemap(typecheck) int &INOUT = int;
-%typemap(typecheck) enum SWIGTYPE &INOUT = enum SWIGTYPE;
-%typemap(typecheck) float &INOUT = float;
diff --git a/dependencies2013/win32/swig/Lib/clisp/clisp.swg b/dependencies2013/win32/swig/Lib/clisp/clisp.swg
deleted file mode 100644
index e1d330cb..00000000
--- a/dependencies2013/win32/swig/Lib/clisp/clisp.swg
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -----------------------------------------------------------------------------
- * clisp.swg
- * ----------------------------------------------------------------------------- */
-
-/* Define a C preprocessor symbol that can be used in interface files
-   to distinguish between the SWIG language modules. */ 
-
-#define SWIG_CLISP
-
-/* Typespecs for basic types. */
-
-%typemap(in) void "NIL";
-
-%typemap(in) char "character";
-%typemap(in) char * "ffi:c-string";
-%typemap(in) unsigned char "ffi:uchar";
-%typemap(in) signed char "ffi:char";
-
-%typemap(in) short "ffi:short";
-%typemap(in) signed short "ffi:short";
-%typemap(in) unsigned short "ffi:ushort";
-
-%typemap(in) int "ffi:int";
-%typemap(in) signed int "ffi:int";
-%typemap(in) unsigned int "ffi:uint";
-
-%typemap(in) long "ffi:long";
-%typemap(in) signed long "ffi:long";
-%typemap(in) unsigned long "ffi:ulong";
-
-%typemap(in) float "SINGLE-FLOAT";
-%typemap(in) double "DOUBLE-FLOAT";
diff --git a/dependencies2013/win32/swig/Lib/cmalloc.i b/dependencies2013/win32/swig/Lib/cmalloc.i
deleted file mode 100644
index 9f58bc03..00000000
--- a/dependencies2013/win32/swig/Lib/cmalloc.i
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cmalloc.i
- *
- * SWIG library file containing macros that can be used to create objects using
- * the C malloc function.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <stdlib.h>
-%}
-
-/* %malloc(TYPE [, NAME = TYPE])
-   %calloc(TYPE [, NAME = TYPE])
-   %realloc(TYPE [, NAME = TYPE])
-   %free(TYPE [, NAME = TYPE])
-   %allocators(TYPE [,NAME = TYPE])
-
-   Creates functions for allocating/reallocating memory.
-
-   TYPE *malloc_NAME(int nbytes = sizeof(TYPE);
-   TYPE *calloc_NAME(int nobj=1, int size=sizeof(TYPE));
-   TYPE *realloc_NAME(TYPE *ptr, int nbytes);
-   void free_NAME(TYPE *ptr);
-
-*/
-
-%define %malloc(TYPE,NAME...)
-#if #NAME != ""
-%rename(malloc_##NAME) ::malloc(int nbytes);
-#else
-%rename(malloc_##TYPE) ::malloc(int nbytes);
-#endif
-
-#if #TYPE != "void"
-%typemap(default) int nbytes "$1 = (int) sizeof(TYPE);"
-#endif
-TYPE *malloc(int nbytes);
-%typemap(default) int nbytes;
-%enddef
-
-%define %calloc(TYPE,NAME...)
-#if #NAME != ""
-%rename(calloc_##NAME) ::calloc(int nobj, int sz);
-#else
-%rename(calloc_##TYPE) ::calloc(int nobj, int sz);
-#endif
-#if #TYPE != "void"
-%typemap(default) int sz "$1 = (int) sizeof(TYPE);"
-#else
-%typemap(default) int sz "$1 = 1;"
-#endif
-%typemap(default) int nobj "$1 = 1;"
-TYPE *calloc(int nobj, int sz);
-%typemap(default) int sz;
-%typemap(default) int nobj;
-%enddef
-
-%define %realloc(TYPE,NAME...)
-%insert("header") {
-#if #NAME != ""
-TYPE *realloc_##NAME(TYPE *ptr, int nitems)
-#else
-TYPE *realloc_##TYPE(TYPE *ptr, int nitems)
-#endif
-{
-#if #TYPE != "void"
-return (TYPE *) realloc(ptr, nitems*sizeof(TYPE));
-#else
-return (TYPE *) realloc(ptr, nitems);
-#endif
-}
-}
-#if #NAME != ""
-TYPE *realloc_##NAME(TYPE *ptr, int nitems);
-#else
-TYPE *realloc_##TYPE(TYPE *ptr, int nitems);
-#endif
-%enddef
-
-%define %free(TYPE,NAME...)
-#if #NAME != ""
-%rename(free_##NAME) ::free(TYPE *ptr);
-#else
-%rename(free_##TYPE) ::free(TYPE *ptr);
-#endif
-void free(TYPE *ptr);
-%enddef
-
-%define %sizeof(TYPE,NAME...)
-#if #NAME != ""
-%constant int sizeof_##NAME = sizeof(TYPE);
-#else
-%constant int sizeof_##TYPE = sizeof(TYPE);
-#endif
-%enddef
-
-%define %allocators(TYPE,NAME...)
-%malloc(TYPE,NAME)
-%calloc(TYPE,NAME)
-%realloc(TYPE,NAME)
-%free(TYPE,NAME)
-#if #TYPE != "void"
-%sizeof(TYPE,NAME)
-#endif
-%enddef
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/constraints.i b/dependencies2013/win32/swig/Lib/constraints.i
deleted file mode 100644
index 8bc7f915..00000000
--- a/dependencies2013/win32/swig/Lib/constraints.i
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -----------------------------------------------------------------------------
- * constraints.i
- *
- * SWIG constraints library.
- *
- * SWIG library file containing typemaps for implementing various kinds of 
- * constraints.  Depends upon the SWIG exception library for generating
- * errors in a language-independent manner.
- * ----------------------------------------------------------------------------- */
-
-#ifdef AUTODOC
-%text %{
-%include <constraints.i>
-
-This library provides support for applying constraints to function
-arguments.  Using a constraint, you can restrict arguments to be
-positive numbers, non-NULL pointers, and so on.   The following
-constraints are available :
-
-      Number  POSITIVE        - Positive number (not zero)
-      Number  NEGATIVE        - Negative number (not zero)
-      Number  NONZERO         - Nonzero number
-      Number  NONNEGATIVE     - Positive number (including zero)
-      Number  NONPOSITIVE     - Negative number (including zero)
-      Pointer NONNULL         - Non-NULL pointer
-      Pointer ALIGN8          - 8-byte aligned pointer
-      Pointer ALIGN4          - 4-byte aligned pointer
-      Pointer ALIGN2          - 2-byte aligned pointer
-
-To use the constraints, you need to "apply" them to specific
-function arguments in your code.  This is done using the %apply
-directive.   For example :
-
-  %apply Number NONNEGATIVE { double nonneg };
-  double sqrt(double nonneg);         // Name of argument must match
-  
-  %apply Pointer NONNULL { void *ptr };
-  void *malloc(int POSITIVE);       // May return a NULL pointer
-  void free(void *ptr);             // May not accept a NULL pointer
-
-Any function argument of the type you specify with the %apply directive
-will be checked with the appropriate constraint.   Multiple types may
-be specified as follows :
-
-  %apply Pointer NONNULL { void *, Vector *, List *, double *};
-
-In this case, all of the types listed would be checked for non-NULL 
-pointers.
-
-The common datatypes of int, short, long, unsigned int, unsigned long,
-unsigned short, unsigned char, signed char, float, and double can be
-checked without using the %apply directive by simply using the 
-constraint name as the parameter name. For example :
-
-  double sqrt(double NONNEGATIVE);
-  double log(double POSITIVE);
-
-If you have used typedef to change type-names, you can also do this :
-
-  %apply double { Real };       // Make everything defined for doubles
-                                // work for Reals.
-  Real sqrt(Real NONNEGATIVE);
-  Real log(Real POSITIVE);
-
-%}
-#endif
-
-%include <exception.i>
-
-#ifdef SWIGCSHARP
-// Required attribute for C# exception handling
-#define SWIGCSHARPCANTHROW , canthrow=1
-#else
-#define SWIGCSHARPCANTHROW
-#endif
-
-
-// Positive numbers
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                int               POSITIVE,
-                short             POSITIVE,
-                long              POSITIVE,
-                unsigned int      POSITIVE,
-                unsigned short    POSITIVE,
-                unsigned long     POSITIVE,
-                signed char       POSITIVE,
-                unsigned char     POSITIVE,
-                float             POSITIVE,
-                double            POSITIVE,
-                Number            POSITIVE
-{
-  if ($1 <= 0) {
-    SWIG_exception(SWIG_ValueError,"Expected a positive value.");
-  }
-}
-
-// Negative numbers
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                int               NEGATIVE,
-                short             NEGATIVE,
-                long              NEGATIVE,
-                unsigned int      NEGATIVE,
-                unsigned short    NEGATIVE,
-                unsigned long     NEGATIVE,
-                signed char       NEGATIVE,
-                unsigned char     NEGATIVE,
-                float             NEGATIVE,
-                double            NEGATIVE,
-                Number            NEGATIVE
-{
-  if ($1 >= 0) {
-    SWIG_exception(SWIG_ValueError,"Expected a negative value.");
-  }
-}
-
-// Nonzero numbers
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                int               NONZERO,
-                short             NONZERO,
-                long              NONZERO,
-                unsigned int      NONZERO,
-                unsigned short    NONZERO,
-                unsigned long     NONZERO,
-                signed char       NONZERO,
-                unsigned char     NONZERO,
-                float             NONZERO,
-                double            NONZERO,
-                Number            NONZERO
-{
-  if ($1 == 0) {
-    SWIG_exception(SWIG_ValueError,"Expected a nonzero value.");
-  }
-}
-
-// Nonnegative numbers
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                int               NONNEGATIVE,
-                short             NONNEGATIVE,
-                long              NONNEGATIVE,
-                unsigned int      NONNEGATIVE,
-                unsigned short    NONNEGATIVE,
-                unsigned long     NONNEGATIVE,
-                signed char       NONNEGATIVE,
-                unsigned char     NONNEGATIVE,
-                float             NONNEGATIVE,
-                double            NONNEGATIVE,
-                Number            NONNEGATIVE
-{
-  if ($1 < 0) {
-    SWIG_exception(SWIG_ValueError,"Expected a non-negative value.");
-  }
-}
-
-// Nonpositive numbers
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                int               NONPOSITIVE,
-                short             NONPOSITIVE,
-                long              NONPOSITIVE,
-                unsigned int      NONPOSITIVE,
-                unsigned short    NONPOSITIVE,
-                unsigned long     NONPOSITIVE,
-                signed char       NONPOSITIVE,
-                unsigned char     NONPOSITIVE,
-                float             NONPOSITIVE,
-                double            NONPOSITIVE,
-                Number            NONPOSITIVE
-{
-  if ($1 > 0) {
-    SWIG_exception(SWIG_ValueError,"Expected a non-positive value.");
-  }
-}
-                
-// Non-NULL pointer
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                void *            NONNULL,
-                Pointer           NONNULL
-{
-  if (!$1) {
-    SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
-  }
-}
-
-// Aligned pointers
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                void *            ALIGN8,
-                Pointer           ALIGN8
-{
-   unsigned long long tmp;
-   tmp = (unsigned long long) $1;
-   if (tmp & 7) {
-     SWIG_exception(SWIG_ValueError,"Pointer must be 8-byte aligned.");
-   }
-}
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                void *            ALIGN4,
-                Pointer           ALIGN4
-{
-   unsigned long long tmp;
-   tmp = (unsigned long long) $1;
-   if (tmp & 3) {
-     SWIG_exception(SWIG_ValueError,"Pointer must be 4-byte aligned.");
-   }
-}
-
-%typemap(check SWIGCSHARPCANTHROW) 
-                void *            ALIGN2,
-                Pointer           ALIGN2
-{
-   unsigned long long tmp;
-   tmp = (unsigned long long) $1;
-   if (tmp & 1) {
-     SWIG_exception(SWIG_ValueError,"Pointer must be 2-byte aligned.");
-   }
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/cpointer.i b/dependencies2013/win32/swig/Lib/cpointer.i
deleted file mode 100644
index 881c511f..00000000
--- a/dependencies2013/win32/swig/Lib/cpointer.i
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cpointer.i
- *
- * SWIG library file containing macros that can be used to manipulate simple
- * pointer objects.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * %pointer_class(type,name)
- *
- * Places a simple proxy around a simple type like 'int', 'float', or whatever.
- * The proxy provides this interface:
- *
- *       class type {
- *       public:
- *           type();
- *          ~type();
- *           type value();
- *           void assign(type value);
- *       };
- *         
- * Example:
- *
- *    %pointer_class(int, intp);
- *
- *    int add(int *x, int *y) { return *x + *y; }
- *
- * In python (with proxies)
- *
- *    >>> a = intp()
- *    >>> a.assign(10)
- *    >>> a.value()
- *    10
- *    >>> b = intp()
- *    >>> b.assign(20)
- *    >>> print add(a,b)
- *    30
- *
- * As a general rule, this macro should not be used on class/structures that
- * are already defined in the interface.
- * ----------------------------------------------------------------------------- */
-
-
-%define %pointer_class(TYPE, NAME)
-%{
-typedef TYPE NAME;
-%}
-
-typedef struct {
-} NAME;
-
-%extend NAME {
-#ifdef __cplusplus
-NAME() {
-  return new TYPE();
-}
-~NAME() {
-  if ($self) delete $self;
-}
-#else
-NAME() {
-  return (TYPE *) calloc(1,sizeof(TYPE));
-}
-~NAME() {
-  if ($self) free($self);
-}
-#endif
-}
-
-%extend NAME {
-
-void assign(TYPE value) {
-  *$self = value;
-}
-TYPE value() {
-  return *$self;
-}
-TYPE * cast() {
-  return $self;
-}
-static NAME * frompointer(TYPE *t) {
-  return (NAME *) t;
-}
-
-}
-
-%types(NAME = TYPE);
-
-%enddef
-
-/* ----------------------------------------------------------------------------- 
- * %pointer_functions(type,name)
- *
- * Create functions for allocating/deallocating pointers.   This can be used
- * if you don't want to create a proxy class or if the pointer is complex.
- *
- *    %pointer_functions(int, intp)
- *
- *    int add(int *x, int *y) { return *x + *y; }
- *
- * In python (with proxies)
- *
- *    >>> a = copy_intp(10)
- *    >>> intp_value(a)
- *    10
- *    >>> b = new_intp()
- *    >>> intp_assign(b,20)
- *    >>> print add(a,b)
- *    30
- *    >>> delete_intp(a)
- *    >>> delete_intp(b)
- * 
- * ----------------------------------------------------------------------------- */
-
-%define %pointer_functions(TYPE,NAME)
-%{
-static TYPE *new_##NAME() { %}
-#ifdef __cplusplus
-%{  return new TYPE(); %}
-#else
-%{  return (TYPE *) calloc(1,sizeof(TYPE)); %}
-#endif
-%{}
-
-static TYPE *copy_##NAME(TYPE value) { %}
-#ifdef __cplusplus
-%{  return new TYPE(value); %}
-#else
-%{  TYPE *obj = (TYPE *) calloc(1,sizeof(TYPE));
-  *obj = value;
-  return obj; %}
-#endif
-%{}
-
-static void delete_##NAME(TYPE *obj) { %}
-#ifdef __cplusplus
-%{  if (obj) delete obj; %}
-#else
-%{  if (obj) free(obj); %}
-#endif
-%{}
-
-static void NAME ##_assign(TYPE *obj, TYPE value) {
-  *obj = value;
-}
-
-static TYPE NAME ##_value(TYPE *obj) {
-  return *obj;
-}
-%}
-
-TYPE *new_##NAME();
-TYPE *copy_##NAME(TYPE value);
-void  delete_##NAME(TYPE *obj);
-void  NAME##_assign(TYPE *obj, TYPE value);
-TYPE  NAME##_value(TYPE *obj);
-
-%enddef
-
-/* -----------------------------------------------------------------------------
- * %pointer_cast(type1,type2,name)
- *
- * Generates a pointer casting function.
- * ----------------------------------------------------------------------------- */
-
-%define %pointer_cast(TYPE1,TYPE2,NAME)
-%inline %{
-TYPE2 NAME(TYPE1 x) {
-   return (TYPE2) x;
-}
-%}
-%enddef
-
-
-
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/arrays_csharp.i b/dependencies2013/win32/swig/Lib/csharp/arrays_csharp.i
deleted file mode 100644
index 237067a8..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/arrays_csharp.i
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -----------------------------------------------------------------------------
- * arrays_csharp.i
- *
- * This file contains a two approaches to marshaling arrays. The first uses
- * default p/invoke marshaling and the second uses pinning of the arrays.
- *
- * Default marshaling approach
- * ----------------------------
- * Array typemaps using default p/invoke marshaling. The data is copied to a separately
- * allocated buffer when passing over the managed-native boundary.
- * 
- * There are separate typemaps for in, out and inout arrays to enable avoiding 
- * unnecessary copying.
- * 
- * Example usage:
- *
- *   %include "arrays_csharp.i"
- *   %apply int INPUT[]  { int* sourceArray }
- *   %apply int OUTPUT[] { int* targetArray }
- *   void myArrayCopy( int* sourceArray, int* targetArray, int nitems );
- *
- *   %apply int INOUT[] { int* array1, int *array2 }
- *   void myArraySwap( int* array1, int* array2, int nitems );
- *
- * If handling large arrays you should consider using the pinning array typemaps
- * described next.
- *
- * Pinning approach
- * ----------------
- * Array typemaps using pinning. These typemaps pin the managed array given
- * as parameter and pass a pointer to it to the c/c++ side. This is very
- * efficient as no copying is done (unlike in the default array marshaling),
- * but it makes garbage collection more difficult. When considering using
- * these typemaps, think carefully whether you have callbacks that may cause
- * the control to re-enter the managed side from within the call (and produce
- * garbage for the gc) or whether other threads may produce enough garbage to 
- * trigger gc while the call is being executed. In those cases it may be
- * wiser to use the default marshaling typemaps.
- * 
- * Please note that when using fixed arrays, you have to mark your corresponding 
- * module class method unsafe using 
- * %csmethodmodifiers "public unsafe"
- * (the visibility of the method is up to you).
- *
- * Example usage:
- *
- *   %include "arrays_csharp.i"
- *   %apply int FIXED[] { int* sourceArray, int *targetArray }
- *   %csmethodmodifiers myArrayCopy "public unsafe";
- *   void myArrayCopy( int *sourceArray, int* targetArray, int nitems );
- *
- * ----------------------------------------------------------------------------- */
-
-%define CSHARP_ARRAYS( CTYPE, CSTYPE )
-
-// input only arrays
-
-%typemap(ctype)   CTYPE INPUT[] "CTYPE*"
-%typemap(cstype)  CTYPE INPUT[] "CSTYPE[]"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]") CTYPE INPUT[] "CSTYPE[]"
-%typemap(csin)    CTYPE INPUT[] "$csinput"
-
-%typemap(in)      CTYPE INPUT[] "$1 = $input;"
-%typemap(freearg) CTYPE INPUT[] ""
-%typemap(argout)  CTYPE INPUT[] ""
-
-// output only arrays
-
-%typemap(ctype)   CTYPE OUTPUT[] "CTYPE*"
-%typemap(cstype)  CTYPE OUTPUT[] "CSTYPE[]"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.Out, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]") CTYPE OUTPUT[] "CSTYPE[]"
-%typemap(csin)    CTYPE OUTPUT[] "$csinput"
-
-%typemap(in)      CTYPE OUTPUT[] "$1 = $input;"
-%typemap(freearg) CTYPE OUTPUT[] ""
-%typemap(argout)  CTYPE OUTPUT[] ""
-
-// inout arrays
-
-%typemap(ctype)   CTYPE INOUT[] "CTYPE*"
-%typemap(cstype)  CTYPE INOUT[] "CSTYPE[]"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.Out, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]") CTYPE INOUT[] "CSTYPE[]"
-%typemap(csin)    CTYPE INOUT[] "$csinput"
-
-%typemap(in)      CTYPE INOUT[] "$1 = $input;"
-%typemap(freearg) CTYPE INOUT[] ""
-%typemap(argout)  CTYPE INOUT[] ""
-
-%enddef // CSHARP_ARRAYS
-
-CSHARP_ARRAYS(signed char, sbyte)
-CSHARP_ARRAYS(unsigned char, byte)
-CSHARP_ARRAYS(short, short)
-CSHARP_ARRAYS(unsigned short, ushort)
-CSHARP_ARRAYS(int, int)
-CSHARP_ARRAYS(unsigned int, uint)
-// FIXME - on Unix 64 bit, long is 8 bytes but is 4 bytes on Windows 64 bit.
-//         How can this be handled sensibly?
-//         See e.g. http://www.xml.com/ldd/chapter/book/ch10.html
-CSHARP_ARRAYS(long, int)
-CSHARP_ARRAYS(unsigned long, uint)
-CSHARP_ARRAYS(long long, long)
-CSHARP_ARRAYS(unsigned long long, ulong)
-CSHARP_ARRAYS(float, float)
-CSHARP_ARRAYS(double, double)
-CSHARP_ARRAYS(bool, bool)
-
-
-%define CSHARP_ARRAYS_FIXED( CTYPE, CSTYPE )
-
-%typemap(ctype)   CTYPE FIXED[] "CTYPE*"
-%typemap(imtype)  CTYPE FIXED[] "global::System.IntPtr"
-%typemap(cstype)  CTYPE FIXED[] "CSTYPE[]"
-%typemap(csin,
-           pre=       "    fixed ( CSTYPE* swig_ptrTo_$csinput = $csinput ) {",
-           terminator="    }") 
-                  CTYPE FIXED[] "(global::System.IntPtr)swig_ptrTo_$csinput"
-
-%typemap(in)      CTYPE FIXED[] "$1 = $input;"
-%typemap(freearg) CTYPE FIXED[] ""
-%typemap(argout)  CTYPE FIXED[] ""
-
-
-%enddef // CSHARP_ARRAYS_FIXED
-
-CSHARP_ARRAYS_FIXED(signed char, sbyte)
-CSHARP_ARRAYS_FIXED(unsigned char, byte)
-CSHARP_ARRAYS_FIXED(short, short)
-CSHARP_ARRAYS_FIXED(unsigned short, ushort)
-CSHARP_ARRAYS_FIXED(int, int)
-CSHARP_ARRAYS_FIXED(unsigned int, uint)
-CSHARP_ARRAYS_FIXED(long, int)
-CSHARP_ARRAYS_FIXED(unsigned long, uint)
-CSHARP_ARRAYS_FIXED(long long, long)
-CSHARP_ARRAYS_FIXED(unsigned long long, ulong)
-CSHARP_ARRAYS_FIXED(float, float)
-CSHARP_ARRAYS_FIXED(double, double)
-CSHARP_ARRAYS_FIXED(bool, bool)
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/boost_intrusive_ptr.i b/dependencies2013/win32/swig/Lib/csharp/boost_intrusive_ptr.i
deleted file mode 100644
index d0a048d1..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/boost_intrusive_ptr.i
+++ /dev/null
@@ -1,510 +0,0 @@
-// Users can provide their own SWIG_INTRUSIVE_PTR_TYPEMAPS or SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP macros before including this file to change the
-// visibility of the constructor and getCPtr method if desired to public if using multiple modules.
-#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS
-#define SWIG_INTRUSIVE_PTR_TYPEMAPS(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(internal, internal, CONST, TYPE)
-#endif
-#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP
-#define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(internal, internal, CONST, TYPE)
-#endif
-
-%include <intrusive_ptr.i>
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-%typemap(in, canthrow=1) CONST TYPE ($&1_type argp = 0) %{
-  // plain value
-  argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0;
-  if (!argp) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0);
-    return $null;
-  }
-  $1 = *argp;
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") CONST TYPE %{
-  //plain value(out)
-  $1_ltype* resultp = new $1_ltype(($1_ltype &)$1);
-  intrusive_ptr_add_ref(resultp);
-  *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(resultp, SWIG_intrusive_deleter< CONST TYPE >());
-%}
-
-%typemap(in, canthrow=1) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  // plain pointer
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0);
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE * %{
-  //plain pointer(out)
-  #if ($owner)
-  if ($1) {
-    intrusive_ptr_add_ref($1);
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-  #else
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  #endif
-%}
-
-%typemap(in, canthrow=1) CONST TYPE & %{
-  // plain reference
-  $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  if(!$1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0);
-    return $null;
-  }
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE & %{
-  //plain reference(out)
-  #if ($owner)
-  if ($1) {
-    intrusive_ptr_add_ref($1);
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-  #else
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  #endif
-%}
-
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0) %{
-  // plain pointer by reference
-  temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  $1 = &temp;
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") TYPE *CONST& %{
-  // plain pointer by reference(out)
-  #if ($owner)
-  if (*$1) {
-    intrusive_ptr_add_ref(*$1);
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1, SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-  #else
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_0);
-  #endif
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{
-  // intrusive_ptr by value
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input;
-  if (smartarg) {
-    $1 = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-  }
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{
-  if ($1) {
-    intrusive_ptr_add_ref($1.get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1.get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-%}
-
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{
-  // shared_ptr by value
-  smartarg = *($&1_ltype*)&$input;
-  if (smartarg) $1 = *smartarg;
-%}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{
-  *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0;
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{
-  // intrusive_ptr by reference
-  if ( $input ) {
-    smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input;
-    temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-    $1 = &temp;
-  } else {
-    $1 = &tempnull;
-  }
-%}
-%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{
-  delete &($1);
-  if ($self) {
-    SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * temp = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input);
-    $1 = *temp;
-  }
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{
-  if (*$1) {
-    intrusive_ptr_add_ref($1->get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{
-  // intrusive_ptr by pointer
-  if ( $input ) {
-    smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input;
-    temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-    $1 = &temp;
-  } else {
-    $1 = &tempnull;
-  }
-%}
-%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{
-  delete $1;
-  if ($self) $1 = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input);
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{
-  if ($1 && *$1) {
-    intrusive_ptr_add_ref($1->get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-  if ($owner) delete $1;
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& (SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > temp, $*1_ltype tempp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{
-  // intrusive_ptr by pointer reference
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input;
-  if ($input) {
-    temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-  }
-  tempp = &temp;
-  $1 = &tempp;
-%}
-%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{
-  if ($self) $1 = *$input;
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{
-  if (*$1 && **$1) {
-    intrusive_ptr_add_ref((*$1)->get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >((*$1)->get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-%}
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (ctype)    SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "void *"
-%typemap (imtype, out="global::System.IntPtr")  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "global::System.Runtime.InteropServices.HandleRef"
-%typemap (cstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(cstype, TYPE)"
-%typemap(csin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                 SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                 SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                 SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                 SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(cstype, TYPE).getCPtr($csinput)"
-
-%typemap(csout, excode=SWIGEXCODE) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csvarout, excode=SWIGEXCODE2) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{
-    get {
-      $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >& %{
-    get {
-      $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >* %{
-    get {
-      $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-      return ret;
-    } %}
-
-
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE {
-    $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE & {
-    $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE * {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) TYPE *CONST& {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-
-// Base proxy classes
-%typemap(csbody) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  private bool swigCMemOwnBase;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwnBase = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(csbody_derived) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  private bool swigCMemOwnDerived;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclazznameSWIGSmartPtrUpcast(cPtr), true) {
-    swigCMemOwnDerived = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-%typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwnBase) {
-          swigCMemOwnBase = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwnDerived) {
-          swigCMemOwnDerived = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-// CONST version needed ???? also for C#
-%typemap(imtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "global::System.Runtime.InteropServices.HandleRef"
-%typemap(imtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "global::System.Runtime.InteropServices.HandleRef"
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%template() SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >;
-%enddef
-
-
-/////////////////////////////////////////////////////////////////////
-
-
-%include <shared_ptr.i>
-
-%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...)
-
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor mods
-%feature("unref") TYPE "(void)arg1; delete smartarg1;"
-
-
-// plain value
-%typemap(in, canthrow=1) CONST TYPE ($&1_type argp = 0) %{
-  argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0;
-  if (!argp) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0);
-    return $null;
-  }
-  $1 = *argp; %}
-%typemap(out) CONST TYPE
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %}
-
-// plain pointer
-%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{
-  *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-%}
-
-// plain reference
-%typemap(in, canthrow=1) CONST TYPE & %{
-  $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  if (!$1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0);
-    return $null;
-  } %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE &
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// plain pointer by reference
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0)
-%{ temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-   $1 = &temp; %}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST&
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %}
-
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{
-  // shared_ptr by value
-  smartarg = *($&1_ltype*)&$input;
-  if (smartarg) $1 = *smartarg;
-%}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{
-  *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0;
-%}
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (ctype)    SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "void *"
-%typemap (imtype)  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "void *"
-%typemap (cstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(cstype, TYPE)"
-%typemap (csin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(cstype, TYPE).getCPtr($csinput)"
-%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-    global::System.IntPtr cPtr = $imcall;
-    return (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);
-  }
-
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE {
-    return new $typemap(cstype, TYPE)($imcall, true);
-  }
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE & {
-    return new $typemap(cstype, TYPE)($imcall, true);
-  }
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE * {
-    global::System.IntPtr cPtr = $imcall;
-    return (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);
-  }
-%typemap(csout, excode=SWIGEXCODE) TYPE *CONST& {
-    global::System.IntPtr cPtr = $imcall;
-    return (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);
-  }
-
-// Base proxy classes
-%typemap(csbody) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  private bool swigCMemOwnBase;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwnBase = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(csbody_derived) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  private bool swigCMemOwnDerived;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclazznameSWIGSmartPtrUpcast(cPtr), true) {
-    swigCMemOwnDerived = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-%typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwnBase) {
-          swigCMemOwnBase = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwnDerived) {
-          swigCMemOwnDerived = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-// CONST version needed ???? also for C#
-%typemap(imtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "global::System.Runtime.InteropServices.HandleRef"
-%typemap(imtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "global::System.Runtime.InteropServices.HandleRef"
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/csharp/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/csharp/boost_shared_ptr.i
deleted file mode 100644
index 2b65bf20..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/boost_shared_ptr.i
+++ /dev/null
@@ -1,238 +0,0 @@
-// Users can provide their own SWIG_SHARED_PTR_TYPEMAPS macro before including this file to change the
-// visibility of the constructor and getCPtr method if desired to public if using multiple modules.
-#ifndef SWIG_SHARED_PTR_TYPEMAPS
-#define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...) SWIG_SHARED_PTR_TYPEMAPS_IMPLEMENTATION(internal, internal, CONST, TYPE)
-#endif
-
-%include <shared_ptr.i>
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor mods
-%feature("unref") TYPE 
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-// plain value
-%typemap(in, canthrow=1) CONST TYPE ($&1_type argp = 0) %{
-  argp = ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0;
-  if (!argp) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0);
-    return $null;
-  }
-  $1 = *argp; %}
-%typemap(out) CONST TYPE 
-%{ $result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %}
-
-// plain pointer
-%typemap(in, canthrow=1) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  smartarg = (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{
-  $result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-%}
-
-// plain reference
-%typemap(in, canthrow=1) CONST TYPE & %{
-  $1 = ($1_ltype)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0);
-  if (!$1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0);
-    return $null;
-  } %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE &
-%{ $result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// plain pointer by reference
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0)
-%{ temp = (TYPE *)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0);
-   $1 = &temp; %}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST&
-%{ $result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >
-%{ if ($input) $1 = *($&1_ltype)$input; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >
-%{ $result = $1 ? new $1_ltype($1) : 0; %}
-
-// shared_ptr by reference
-%typemap(in, canthrow=1) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & ($*1_ltype tempnull)
-%{ $1 = $input ? ($1_ltype)$input : &tempnull; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &
-%{ $result = *$1 ? new $*1_ltype(*$1) : 0; %} 
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * ($*1_ltype tempnull)
-%{ $1 = $input ? ($1_ltype)$input : &tempnull; %}
-%typemap(out, fragment="SWIG_null_deleter") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *
-%{ $result = ($1 && *$1) ? new $*1_ltype(*($1_ltype)$1) : 0;
-   if ($owner) delete $1; %}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempnull, $*1_ltype temp = 0)
-%{ temp = $input ? *($1_ltype)&$input : &tempnull;
-   $1 = &temp; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *&
-%{ *($1_ltype)&$result = (*$1 && **$1) ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0; %} 
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (ctype)  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "void *"
-%typemap (imtype, out="global::System.IntPtr") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                                SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                                SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                                SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "global::System.Runtime.InteropServices.HandleRef"
-%typemap (cstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(cstype, TYPE)"
-
-%typemap(csin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-               SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-               SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-               SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(cstype, TYPE).getCPtr($csinput)"
-
-%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-
-
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE {
-    $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE & {
-    $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CONST TYPE * {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) TYPE *CONST& {
-    global::System.IntPtr cPtr = $imcall;
-    $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) CONST TYPE & %{
-    get {
-      $csclassname ret = new $csclassname($imcall, true);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) CONST TYPE * %{
-    get {
-      global::System.IntPtr cPtr = $imcall;
-      $csclassname ret = (cPtr == global::System.IntPtr.Zero) ? null : new $csclassname(cPtr, true);$excode
-      return ret;
-    } %}
-
-%typemap(csvarout, excode=SWIGEXCODE2) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-    get {
-      global::System.IntPtr cPtr = $imcall;
-      $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-    get {
-      global::System.IntPtr cPtr = $imcall;
-      $typemap(cstype, TYPE) ret = (cPtr == global::System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-      return ret;
-    } %}
-
-
-// Proxy classes (base classes, ie, not derived classes)
-%typemap(csbody) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  private bool swigCMemOwnBase;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwnBase = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(csbody_derived) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  private bool swigCMemOwnDerived;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclazznameSWIGSmartPtrUpcast(cPtr), true) {
-    swigCMemOwnDerived = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-%typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwnBase) {
-          swigCMemOwnBase = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwnDerived) {
-          swigCMemOwnDerived = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/csharp.swg b/dependencies2013/win32/swig/Lib/csharp/csharp.swg
deleted file mode 100644
index 8dc2ba81..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/csharp.swg
+++ /dev/null
@@ -1,1056 +0,0 @@
-/* -----------------------------------------------------------------------------
- * csharp.swg
- *
- * C# typemaps
- * ----------------------------------------------------------------------------- */
-
-%include <csharphead.swg>
-
-/* The ctype, imtype and cstype typemaps work together and so there should be one of each. 
- * The ctype typemap contains the PInvoke type used in the PInvoke (C/C++) code. 
- * The imtype typemap contains the C# type used in the intermediary class. 
- * The cstype typemap contains the C# type used in the C# proxy classes, type wrapper classes and module class. */
-
-/* SWIG 3 no longer inserts using directives into generated C# code. For backwards compatibility, the SWIG2_CSHARP
-   macro can be defined to have SWIG 3 generate using directives similar to those generated by SWIG 2. */
-#ifdef SWIG2_CSHARP
-
-%typemap(csimports)                   SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "\nusing global::System;\nusing global::System.Runtime.InteropServices;\n"
-
-%pragma(csharp) moduleimports=%{
-using global::System;
-using global::System.Runtime.InteropServices;
-%}
-
-%pragma(csharp) imclassimports=%{
-using global::System;
-using global::System.Runtime.InteropServices;
-%}
-
-#endif
-
-
-/* Fragments */
-%fragment("SWIG_PackData", "header") {
-/* Pack binary data into a string */
-SWIGINTERN char * SWIG_PackData(char *c, void *ptr, size_t sz) {
-  static const char hex[17] = "0123456789abcdef";
-  const unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu =  u + sz;
-  for (; u != eu; ++u) {
-    unsigned char uu = *u;
-    *(c++) = hex[(uu & 0xf0) >> 4];
-    *(c++) = hex[uu & 0xf];
-  }
-  return c;
-}
-}
-
-%fragment("SWIG_UnPackData", "header") {
-/* Unpack binary data from a string */
-SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu = u + sz;
-  for (; u != eu; ++u) {
-    char d = *(c++);
-    unsigned char uu;
-    if ((d >= '0') && (d <= '9'))
-      uu = ((d - '0') << 4);
-    else if ((d >= 'a') && (d <= 'f'))
-      uu = ((d - ('a'-10)) << 4);
-    else 
-      return (char *) 0;
-    d = *(c++);
-    if ((d >= '0') && (d <= '9'))
-      uu |= (d - '0');
-    else if ((d >= 'a') && (d <= 'f'))
-      uu |= (d - ('a'-10));
-    else 
-      return (char *) 0;
-    *u = uu;
-  }
-  return c;
-}
-}
-
-/* Primitive types */
-%typemap(ctype) bool,               const bool &               "unsigned int"
-%typemap(ctype) char,               const char &               "char"
-%typemap(ctype) signed char,        const signed char &        "signed char"
-%typemap(ctype) unsigned char,      const unsigned char &      "unsigned char"
-%typemap(ctype) short,              const short &              "short"
-%typemap(ctype) unsigned short,     const unsigned short &     "unsigned short"
-%typemap(ctype) int,                const int &                "int"
-%typemap(ctype) unsigned int,       const unsigned int &       "unsigned int"
-%typemap(ctype) long,               const long &               "long"
-%typemap(ctype) unsigned long,      const unsigned long &      "unsigned long"
-%typemap(ctype) long long,          const long long &          "long long"
-%typemap(ctype) unsigned long long, const unsigned long long & "unsigned long long"
-%typemap(ctype) float,              const float &              "float"
-%typemap(ctype) double,             const double &             "double"
-%typemap(ctype) void                                           "void"
-
-%typemap(imtype) bool,               const bool &               "bool"
-%typemap(imtype) char,               const char &               "char"
-%typemap(imtype) signed char,        const signed char &        "sbyte"
-%typemap(imtype) unsigned char,      const unsigned char &      "byte"
-%typemap(imtype) short,              const short &              "short"
-%typemap(imtype) unsigned short,     const unsigned short &     "ushort"
-%typemap(imtype) int,                const int &                "int"
-%typemap(imtype) unsigned int,       const unsigned int &       "uint"
-%typemap(imtype) long,               const long &               "int"
-%typemap(imtype) unsigned long,      const unsigned long &      "uint"
-%typemap(imtype) long long,          const long long &          "long"
-%typemap(imtype) unsigned long long, const unsigned long long & "ulong"
-%typemap(imtype) float,              const float &              "float"
-%typemap(imtype) double,             const double &             "double"
-%typemap(imtype) void                                           "void"
-
-%typemap(cstype) bool,               const bool &               "bool"
-%typemap(cstype) char,               const char &               "char"
-%typemap(cstype) signed char,        const signed char &        "sbyte"
-%typemap(cstype) unsigned char,      const unsigned char &      "byte"
-%typemap(cstype) short,              const short &              "short"
-%typemap(cstype) unsigned short,     const unsigned short &     "ushort"
-%typemap(cstype) int,                const int &                "int"
-%typemap(cstype) unsigned int,       const unsigned int &       "uint"
-%typemap(cstype) long,               const long &               "int"
-%typemap(cstype) unsigned long,      const unsigned long &      "uint"
-%typemap(cstype) long long,          const long long &          "long"
-%typemap(cstype) unsigned long long, const unsigned long long & "ulong"
-%typemap(cstype) float,              const float &              "float"
-%typemap(cstype) double,             const double &             "double"
-%typemap(cstype) void                                           "void"
-
-%typemap(ctype) char *, char *&, char[ANY], char[]   "char *"
-%typemap(imtype) char *, char *&, char[ANY], char[]   "string"
-%typemap(cstype) char *, char *&, char[ANY], char[]   "string"
-
-/* Non primitive types */
-%typemap(ctype) SWIGTYPE "void *"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE "global::System.Runtime.InteropServices.HandleRef"
-%typemap(cstype) SWIGTYPE "$&csclassname"
-
-%typemap(ctype) SWIGTYPE [] "void *"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE [] "global::System.Runtime.InteropServices.HandleRef"
-%typemap(cstype) SWIGTYPE [] "$csclassname"
-
-%typemap(ctype) SWIGTYPE * "void *"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE * "global::System.Runtime.InteropServices.HandleRef"
-%typemap(cstype) SWIGTYPE * "$csclassname"
-
-%typemap(ctype) SWIGTYPE & "void *"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE & "global::System.Runtime.InteropServices.HandleRef"
-%typemap(cstype) SWIGTYPE & "$csclassname"
-
-%typemap(ctype) SWIGTYPE && "void *"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE && "global::System.Runtime.InteropServices.HandleRef"
-%typemap(cstype) SWIGTYPE && "$csclassname"
-
-/* pointer to a class member */
-%typemap(ctype) SWIGTYPE (CLASS::*) "char *"
-%typemap(imtype) SWIGTYPE (CLASS::*) "string"
-%typemap(cstype) SWIGTYPE (CLASS::*) "$csclassname"
-
-/* The following are the in and out typemaps. These are the PInvoke code generating typemaps for converting from C# to C and visa versa. */
-
-/* primitive types */
-%typemap(in) bool
-%{ $1 = $input ? true : false; %}
-
-%typemap(directorout) bool
-%{ $result = $input ? true : false; %}
-
-%typemap(csdirectorin) bool "$iminput"
-%typemap(csdirectorout) bool "$cscall"
-
-%typemap(in) char, 
-             signed char, 
-             unsigned char, 
-             short, 
-             unsigned short, 
-             int, 
-             unsigned int, 
-             long, 
-             unsigned long, 
-             long long, 
-             unsigned long long, 
-             float, 
-             double
-%{ $1 = ($1_ltype)$input; %}
-
-%typemap(directorout) char, 
-             signed char, 
-             unsigned char, 
-             short, 
-             unsigned short, 
-             int, 
-             unsigned int, 
-             long, 
-             unsigned long, 
-             long long, 
-             unsigned long long, 
-             float, 
-             double
-%{ $result = ($1_ltype)$input; %}
-
-%typemap(directorin) bool               "$input = $1;"
-%typemap(directorin) char               "$input = $1;"
-%typemap(directorin) signed char        "$input = $1;"
-%typemap(directorin) unsigned char      "$input = $1;"
-%typemap(directorin) short              "$input = $1;"
-%typemap(directorin) unsigned short     "$input = $1;"
-%typemap(directorin) int                "$input = $1;"
-%typemap(directorin) unsigned int       "$input = $1;"
-%typemap(directorin) long               "$input = $1;"
-%typemap(directorin) unsigned long      "$input = (unsigned long)$1;"
-%typemap(directorin) long long          "$input = $1;"
-%typemap(directorin) unsigned long long "$input = $1;"
-%typemap(directorin) float              "$input = $1;"
-%typemap(directorin) double             "$input = $1;"
-
-%typemap(csdirectorin) char, 
-                       signed char, 
-                       unsigned char, 
-                       short, 
-                       unsigned short, 
-                       int, 
-                       unsigned int, 
-                       long, 
-                       unsigned long, 
-                       long long, 
-                       unsigned long long, 
-                       float, 
-                       double
-  "$iminput"
-
-%typemap(csdirectorout) char, 
-                        signed char, 
-                        unsigned char, 
-                        short, 
-                        unsigned short, 
-                        int, 
-                        unsigned int, 
-                        long, 
-                        unsigned long, 
-                        long long, 
-                        unsigned long long, 
-                        float, 
-                        double
-  "$cscall"
-
-%typemap(out) bool               %{ $result = $1; %}
-%typemap(out) char               %{ $result = $1; %}
-%typemap(out) signed char        %{ $result = $1; %}
-%typemap(out) unsigned char      %{ $result = $1; %}
-%typemap(out) short              %{ $result = $1; %}
-%typemap(out) unsigned short     %{ $result = $1; %}
-%typemap(out) int                %{ $result = $1; %}
-%typemap(out) unsigned int       %{ $result = $1; %}
-%typemap(out) long               %{ $result = $1; %}
-%typemap(out) unsigned long      %{ $result = (unsigned long)$1; %}
-%typemap(out) long long          %{ $result = $1; %}
-%typemap(out) unsigned long long %{ $result = $1; %}
-%typemap(out) float              %{ $result = $1; %}
-%typemap(out) double             %{ $result = $1; %}
-
-/* char * - treat as String */
-%typemap(in) char * %{ $1 = ($1_ltype)$input; %}
-%typemap(out) char * %{ $result = SWIG_csharp_string_callback((const char *)$1); %}
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) char * %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) char * %{ $input = SWIG_csharp_string_callback((const char *)$1); %}
-%typemap(csdirectorin) char * "$iminput"
-%typemap(csdirectorout) char * "$cscall"
-
-/* char *& - treat as String */
-%typemap(in) char *& ($*1_ltype temp = 0) %{ 
-  temp = ($*1_ltype)$input;
-  $1 = &temp;
-%}
-%typemap(out) char *& %{ if ($1) $result = SWIG_csharp_string_callback((const char *)*$1); %}
-
-%typemap(out, null="") void ""
-%typemap(csdirectorin) void "$iminput"
-%typemap(csdirectorout) void "$cscall"
-%typemap(directorin) void ""
-
-/* primitive types by const reference */
-%typemap(in) const bool & ($*1_ltype temp)
-%{ temp = $input ? true : false; 
-   $1 = &temp; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const bool &
-%{ static $*1_ltype temp;
-   temp = $input ? true : false; 
-   $result = &temp; %}
-
-%typemap(csdirectorin) const bool & "$iminput"
-%typemap(csdirectorout) const bool & "$cscall"
-
-%typemap(in) const char & ($*1_ltype temp), 
-             const signed char & ($*1_ltype temp), 
-             const unsigned char & ($*1_ltype temp), 
-             const short & ($*1_ltype temp), 
-             const unsigned short & ($*1_ltype temp), 
-             const int & ($*1_ltype temp), 
-             const unsigned int & ($*1_ltype temp), 
-             const long & ($*1_ltype temp), 
-             const unsigned long & ($*1_ltype temp), 
-             const long long & ($*1_ltype temp), 
-             const unsigned long long & ($*1_ltype temp), 
-             const float & ($*1_ltype temp), 
-             const double & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const char &,
-             const signed char &,
-             const unsigned char &,
-             const short &,
-             const unsigned short &,
-             const int &,
-             const unsigned int &,
-             const long &,
-             const unsigned long &,
-             const long long &,
-             const unsigned long long &,
-             const float &,
-             const double &
-%{ static $*1_ltype temp;
-   temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-
-%typemap(directorin) const bool &           "$input = $1;"
-%typemap(directorin) const char &           "$input = $1;"
-%typemap(directorin) const signed char &    "$input = $1;"
-%typemap(directorin) const unsigned char &  "$input = $1;"
-%typemap(directorin) const short &          "$input = $1;"
-%typemap(directorin) const unsigned short & "$input = $1;"
-%typemap(directorin) const int &            "$input = $1;"
-%typemap(directorin) const unsigned int &   "$input = $1;"
-%typemap(directorin) const long &           "$input = $1;"
-%typemap(directorin) const unsigned long &  "$input = $1;"
-%typemap(directorin) const long long &      "$input = $1;"
-%typemap(directorin) const unsigned long long & "$input = $1;"
-%typemap(directorin) const float &          "$input = $1;"
-%typemap(directorin) const double &         "$input = $1;"
-
-%typemap(csdirectorin) const char & ($*1_ltype temp), 
-                       const signed char & ($*1_ltype temp), 
-                       const unsigned char & ($*1_ltype temp), 
-                       const short & ($*1_ltype temp), 
-                       const unsigned short & ($*1_ltype temp), 
-                       const int & ($*1_ltype temp), 
-                       const unsigned int & ($*1_ltype temp), 
-                       const long & ($*1_ltype temp), 
-                       const unsigned long & ($*1_ltype temp), 
-                       const long long & ($*1_ltype temp), 
-                       const unsigned long long & ($*1_ltype temp), 
-                       const float & ($*1_ltype temp), 
-                       const double & ($*1_ltype temp)
-  "$iminput"
-
-%typemap(csdirectorout) const char & ($*1_ltype temp), 
-                        const signed char & ($*1_ltype temp), 
-                        const unsigned char & ($*1_ltype temp), 
-                        const short & ($*1_ltype temp), 
-                        const unsigned short & ($*1_ltype temp), 
-                        const int & ($*1_ltype temp), 
-                        const unsigned int & ($*1_ltype temp), 
-                        const long & ($*1_ltype temp), 
-                        const unsigned long & ($*1_ltype temp), 
-                        const long long & ($*1_ltype temp), 
-                        const unsigned long long & ($*1_ltype temp), 
-                        const float & ($*1_ltype temp), 
-                        const double & ($*1_ltype temp)
-  "$cscall"
-
-
-%typemap(out) const bool &               %{ $result = *$1; %}
-%typemap(out) const char &               %{ $result = *$1; %}
-%typemap(out) const signed char &        %{ $result = *$1; %}
-%typemap(out) const unsigned char &      %{ $result = *$1; %}
-%typemap(out) const short &              %{ $result = *$1; %}
-%typemap(out) const unsigned short &     %{ $result = *$1; %}
-%typemap(out) const int &                %{ $result = *$1; %}
-%typemap(out) const unsigned int &       %{ $result = *$1; %}
-%typemap(out) const long &               %{ $result = *$1; %}
-%typemap(out) const unsigned long &      %{ $result = (unsigned long)*$1; %}
-%typemap(out) const long long &          %{ $result = *$1; %}
-%typemap(out) const unsigned long long & %{ $result = *$1; %}
-%typemap(out) const float &              %{ $result = *$1; %}
-%typemap(out) const double &             %{ $result = *$1; %}
-
-/* Default handling. Object passed by value. Convert to a pointer */
-%typemap(in, canthrow=1) SWIGTYPE ($&1_type argp)
-%{ argp = ($&1_ltype)$input; 
-   if (!argp) {
-     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0);
-     return $null;
-   }
-   $1 = *argp; %}
-
-%typemap(directorout) SWIGTYPE
-%{ if (!$input) {
-     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type $1_type", 0);
-     return $null;
-   }
-   $result = *($&1_ltype)$input; %}
-
-%typemap(out) SWIGTYPE 
-#ifdef __cplusplus
-%{ $result = new $1_ltype((const $1_ltype &)$1); %}
-#else
-{
-  $&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype));
-  memmove($1ptr, &$1, sizeof($1_type));
-  $result = $1ptr;
-}
-#endif
-
-%typemap(directorin) SWIGTYPE 
-%{ $input = (void *)new $1_ltype((const $1_ltype &)$1); %}
-%typemap(csdirectorin) SWIGTYPE "new $&csclassname($iminput, true)"
-%typemap(csdirectorout) SWIGTYPE "$&csclassname.getCPtr($cscall).Handle"
-
-/* Generic pointers and references */
-%typemap(in) SWIGTYPE * %{ $1 = ($1_ltype)$input; %}
-%typemap(in, fragment="SWIG_UnPackData") SWIGTYPE (CLASS::*) %{ 
-  SWIG_UnpackData($input, (void *)&$1, sizeof($1));
-%}
-%typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input;
-  if (!$1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0);
-    return $null;
-  } %}
-%typemap(in, canthrow=1) SWIGTYPE && %{ $1 = ($1_ltype)$input;
-  if (!$1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0);
-    return $null;
-  } %}
-%typemap(out) SWIGTYPE * %{ $result = (void *)$1; %} 
-%typemap(out, fragment="SWIG_PackData") SWIGTYPE (CLASS::*) %{
-  char buf[128];
-  char *data = SWIG_PackData(buf, (void *)&$1, sizeof($1));
-  *data = '\0';
-  $result = SWIG_csharp_string_callback(buf);
-%}
-%typemap(out) SWIGTYPE & %{ $result = (void *)$1; %} 
-%typemap(out) SWIGTYPE && %{ $result = (void *)$1; %} 
-
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE *
-%{ $result = ($1_ltype)$input; %}
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE (CLASS::*)
-%{ $result = ($1_ltype)$input; %}
-
-%typemap(directorin) SWIGTYPE *
-%{ $input = (void *) $1; %}
-%typemap(directorin) SWIGTYPE (CLASS::*)
-%{ $input = (void *) $1; %}
-
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE &
-%{ if (!$input) {
-     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type $1_type", 0);
-     return $null;
-   }
-   $result = ($1_ltype)$input; %}
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE &&
-%{ if (!$input) {
-     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type $1_type", 0);
-     return $null;
-   }
-   $result = ($1_ltype)$input; %}
-%typemap(directorin) SWIGTYPE &
-%{ $input = ($1_ltype) &$1; %}
-%typemap(directorin) SWIGTYPE &&
-%{ $input = ($1_ltype) &$1; %}
-
-%typemap(csdirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*) "($iminput == global::System.IntPtr.Zero) ? null : new $csclassname($iminput, false)"
-%typemap(csdirectorin) SWIGTYPE & "new $csclassname($iminput, false)"
-%typemap(csdirectorin) SWIGTYPE && "new $csclassname($iminput, false)"
-%typemap(csdirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, SWIGTYPE && "$csclassname.getCPtr($cscall).Handle"
-
-/* Default array handling */
-%typemap(in) SWIGTYPE [] %{ $1 = ($1_ltype)$input; %}
-%typemap(out) SWIGTYPE [] %{ $result = $1; %} 
-
-/* char arrays - treat as String */
-%typemap(in) char[ANY], char[] %{ $1 = ($1_ltype)$input; %}
-%typemap(out) char[ANY], char[] %{ $result = SWIG_csharp_string_callback((const char *)$1); %}
-
-%typemap(directorout) char[ANY], char[] %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) char[ANY], char[] %{ $input = SWIG_csharp_string_callback((const char *)$1); %}
-
-%typemap(csdirectorin) char[ANY], char[] "$iminput"
-%typemap(csdirectorout) char[ANY], char[] "$cscall"
-
-
-/* Typecheck typemaps - The purpose of these is merely to issue a warning for overloaded C++ functions 
- * that cannot be overloaded in C# as more than one C++ type maps to a single C# type */
-
-%typecheck(SWIG_TYPECHECK_BOOL)
-    bool,
-    const bool &
-    ""
-
-%typecheck(SWIG_TYPECHECK_CHAR)
-    char, 
-    const char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8)
-    signed char,
-    const signed char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT8)
-    unsigned char, 
-    const unsigned char & 
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16)
-    short, 
-    const short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT16)
-    unsigned short, 
-    const unsigned short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32)
-    int, 
-    long, 
-    const int &, 
-    const long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT32)
-    unsigned int, 
-    unsigned long, 
-    const unsigned int &, 
-    const unsigned long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64)
-    long long, 
-    const long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT64)
-    unsigned long long,
-    const unsigned long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT)
-    float,
-    const float &
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE)
-    double,
-    const double &
-    ""
-
-%typecheck(SWIG_TYPECHECK_STRING)
-    char *,
-    char *&,
-    char[ANY],
-    char[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_POINTER)
-    SWIGTYPE, 
-    SWIGTYPE *, 
-    SWIGTYPE &, 
-    SWIGTYPE &&, 
-    SWIGTYPE *const&, 
-    SWIGTYPE [],
-    SWIGTYPE (CLASS::*)
-    ""
-
-/* Exception handling */
-
-%typemap(throws, canthrow=1) int, 
-                 long, 
-                 short, 
-                 unsigned int, 
-                 unsigned long, 
-                 unsigned short
-%{ char error_msg[256];
-   sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, error_msg);
-   return $null; %}
-
-%typemap(throws, canthrow=1) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE *, SWIGTYPE [ANY]
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(throws, canthrow=1) char *
-%{ SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1);
-   return $null; %}
-
-
-/* Typemaps for code generation in proxy classes and C# type wrapper classes */
-
-/* The csin typemap is used for converting function parameter types from the type 
- * used in the proxy, module or type wrapper class to the type used in the PInvoke class. */
-%typemap(csin)   bool,               const bool &,
-                 char,               const char &,
-                 signed char,        const signed char &,
-                 unsigned char,      const unsigned char &,
-                 short,              const short &,
-                 unsigned short,     const unsigned short &,
-                 int,                const int &,
-                 unsigned int,       const unsigned int &,
-                 long,               const long &,
-                 unsigned long,      const unsigned long &,
-                 long long,          const long long &,
-                 unsigned long long, const unsigned long long &,
-                 float,              const float &,
-                 double,             const double &
-    "$csinput"
-%typemap(csin) char *, char *&, char[ANY], char[] "$csinput"
-%typemap(csin) SWIGTYPE "$&csclassname.getCPtr($csinput)"
-%typemap(csin) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] "$csclassname.getCPtr($csinput)"
-%typemap(csin) SWIGTYPE (CLASS::*) "$csclassname.getCMemberPtr($csinput)"
-
-/* The csout typemap is used for converting function return types from the return type
- * used in the PInvoke class to the type returned by the proxy, module or type wrapper class.
- * The $excode special variable is replaced by the excode typemap attribute code if the
- * method can throw any exceptions from unmanaged code, otherwise replaced by nothing. */
-
-// Macro used by the $excode special variable
-%define SWIGEXCODE "\n    if ($imclassname.SWIGPendingException.Pending) throw $imclassname.SWIGPendingException.Retrieve();" %enddef
-%define SWIGEXCODE2 "\n      if ($imclassname.SWIGPendingException.Pending) throw $imclassname.SWIGPendingException.Retrieve();" %enddef
-
-%typemap(csout, excode=SWIGEXCODE) bool,               const bool &               {
-    bool ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) char,               const char &               {
-    char ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) signed char,        const signed char &        {
-    sbyte ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) unsigned char,      const unsigned char &      {
-    byte ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) short,              const short &              {
-    short ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) unsigned short,     const unsigned short &     {
-    ushort ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) int,                const int &                {
-    int ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) unsigned int,       const unsigned int &       {
-    uint ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) long,               const long &               {
-    int ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) unsigned long,      const unsigned long &      {
-    uint ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) long long,          const long long &          {
-    long ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) unsigned long long, const unsigned long long & {
-    ulong ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) float,              const float &              {
-    float ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) double,             const double &             {
-    double ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) char *, char *&, char[ANY], char[] {
-    string ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) void {
-    $imcall;$excode
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIGTYPE {
-    $&csclassname ret = new $&csclassname($imcall, true);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIGTYPE & {
-    $csclassname ret = new $csclassname($imcall, $owner);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIGTYPE && {
-    $csclassname ret = new $csclassname($imcall, $owner);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIGTYPE *, SWIGTYPE [] {
-    global::System.IntPtr cPtr = $imcall;
-    $csclassname ret = (cPtr == global::System.IntPtr.Zero) ? null : new $csclassname(cPtr, $owner);$excode
-    return ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) SWIGTYPE (CLASS::*) {
-    string cMemberPtr = $imcall;
-    $csclassname ret = (cMemberPtr == null) ? null : new $csclassname(cMemberPtr, $owner);$excode
-    return ret;
-  }
-
-
-/* Properties */
-%typemap(csvarin, excode=SWIGEXCODE2) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) %{
-    set {
-      $imcall;$excode
-    } %}
-
-%typemap(csvarin, excode=SWIGEXCODE2) char *, char *&, char[ANY], char[] %{
-    set {
-      $imcall;$excode
-    } %}
-
-%typemap(csvarout, excode=SWIGEXCODE2) bool,               const bool &               %{
-    get {
-      bool ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) char,               const char &               %{
-    get {
-      char ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) signed char,        const signed char &        %{
-    get {
-      sbyte ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) unsigned char,      const unsigned char &      %{
-    get {
-      byte ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) short,              const short &              %{
-    get {
-      short ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) unsigned short,     const unsigned short &     %{
-    get {
-      ushort ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) int,                const int &                %{
-    get {
-      int ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) unsigned int,       const unsigned int &       %{
-    get {
-      uint ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) long,               const long &               %{
-    get {
-      int ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) unsigned long,      const unsigned long &      %{
-    get {
-      uint ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) long long,          const long long &          %{
-    get {
-      long ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) unsigned long long, const unsigned long long & %{
-    get {
-      ulong ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) float,              const float &              %{
-    get {
-      float ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) double,             const double &             %{
-    get {
-      double ret = $imcall;$excode
-      return ret;
-    } %}
-
-
-%typemap(csvarout, excode=SWIGEXCODE2) char *, char *&, char[ANY], char[] %{
-    get {
-      string ret = $imcall;$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) void %{
-    get {
-      $imcall;$excode
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE %{
-    get {
-      $&csclassname ret = new $&csclassname($imcall, true);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE & %{
-    get {
-      $csclassname ret = new $csclassname($imcall, $owner);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE && %{
-    get {
-      $csclassname ret = new $csclassname($imcall, $owner);$excode
-      return ret;
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE *, SWIGTYPE [] %{
-    get {
-      global::System.IntPtr cPtr = $imcall;
-      $csclassname ret = (cPtr == global::System.IntPtr.Zero) ? null : new $csclassname(cPtr, $owner);$excode
-      return ret;
-    } %}
-
-%typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE (CLASS::*) %{
-    get {
-      string cMemberPtr = $imcall;
-      $csclassname ret = (cMemberPtr == null) ? null : new $csclassname(cMemberPtr, $owner);$excode
-      return ret;
-    } %}
-
-/* Pointer reference typemaps */
-%typemap(ctype) SWIGTYPE *const& "void *"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE *const& "global::System.Runtime.InteropServices.HandleRef"
-%typemap(cstype) SWIGTYPE *const& "$*csclassname"
-%typemap(csin) SWIGTYPE *const& "$*csclassname.getCPtr($csinput)"
-%typemap(csout, excode=SWIGEXCODE) SWIGTYPE *const& {
-    global::System.IntPtr cPtr = $imcall;
-    $*csclassname ret = (cPtr == global::System.IntPtr.Zero) ? null : new $*csclassname(cPtr, $owner);$excode
-    return ret;
-  }
-%typemap(in) SWIGTYPE *const& ($*1_ltype temp = 0)
-%{ temp = ($*1_ltype)$input;
-   $1 = ($1_ltype)&temp; %}
-%typemap(out) SWIGTYPE *const&
-%{ $result = (void *)*$1; %} 
-
-/* Marshal C/C++ pointer to global::System.IntPtr */
-%typemap(ctype) void *VOID_INT_PTR "void *"
-%typemap(imtype) void *VOID_INT_PTR "global::System.IntPtr"
-%typemap(cstype) void *VOID_INT_PTR "global::System.IntPtr"
-%typemap(in) void *VOID_INT_PTR %{ $1 = ($1_ltype)$input; %}
-%typemap(out) void *VOID_INT_PTR %{ $result = (void *)$1; %} 
-%typemap(csin) void *VOID_INT_PTR "$csinput"
-%typemap(csout, excode=SWIGEXCODE) void *VOID_INT_PTR {
-    global::System.IntPtr ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csdirectorin) void *VOID_INT_PTR "$iminput"
-%typemap(csdirectorout) void *VOID_INT_PTR "$cscall"
-
-/* Typemaps used for the generation of proxy and type wrapper class code */
-%typemap(csbase)                      SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(csclassmodifiers)            SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "public class"
-%typemap(cscode)                      SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(csinterfaces)                SWIGTYPE "global::System.IDisposable"
-%typemap(csinterfaces)                          SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(csinterfaces_derived)        SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-
-
-// csbody typemaps... these are in macros so that the visibility of the methods can be easily changed by users.
-
-%define SWIG_CSBODY_PROXY(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, TYPE...)
-// Proxy classes (base classes, ie, not derived classes)
-%typemap(csbody) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(csbody_derived) TYPE %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclazznameSWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-%enddef
-
-%define SWIG_CSBODY_TYPEWRAPPER(PTRCTOR_VISIBILITY, DEFAULTCTOR_VISIBILITY, CPTR_VISIBILITY, TYPE...)
-// Typewrapper classes
-%typemap(csbody) TYPE *, TYPE &, TYPE &&, TYPE [] %{
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  PTRCTOR_VISIBILITY $csclassname(global::System.IntPtr cPtr, bool futureUse) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  DEFAULTCTOR_VISIBILITY $csclassname() {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-  }
-
-  CPTR_VISIBILITY static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-%}
-
-%typemap(csbody) TYPE (CLASS::*) %{
-  private string swigCMemberPtr;
-
-  PTRCTOR_VISIBILITY $csclassname(string cMemberPtr, bool futureUse) {
-    swigCMemberPtr = cMemberPtr;
-  }
-
-  DEFAULTCTOR_VISIBILITY $csclassname() {
-    swigCMemberPtr = null;
-  }
-
-  CPTR_VISIBILITY static string getCMemberPtr($csclassname obj) {
-    return obj.swigCMemberPtr;
-  }
-%}
-%enddef
-
-/* Set the default csbody typemaps to use internal visibility.
-   Use the macros to change to public if using multiple modules. */
-SWIG_CSBODY_PROXY(internal, internal, SWIGTYPE)
-SWIG_CSBODY_TYPEWRAPPER(internal, protected, internal, SWIGTYPE)
-
-%typemap(csfinalize) SWIGTYPE %{
-  ~$csclassname() {
-    Dispose();
-  }
-%}
-
-%typemap(csconstruct, excode=SWIGEXCODE,directorconnect="\n    SwigDirectorConnect();") SWIGTYPE %{: this($imcall, true) {$excode$directorconnect
-  }
-%}
-
-%typemap(csdestruct, methodname="Dispose", methodmodifiers="public") SWIGTYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") SWIGTYPE {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          $imcall;
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-%typemap(directordisconnect, methodname="swigDirectorDisconnect") SWIGTYPE %{
-  protected void $methodname() {
-    swigCMemOwn = false;
-    $imcall;
-  }
-%}
-
-/* C# specific directives */
-#define %csconst(flag)              %feature("cs:const","flag")
-#define %csconstvalue(value)        %feature("cs:constvalue",value)
-#define %csenum(wrapapproach)       %feature("cs:enum","wrapapproach")
-#define %csmethodmodifiers          %feature("cs:methodmodifiers")
-#define %csnothrowexception         %feature("except")
-#define %csattributes               %feature("cs:attributes")
-#define %proxycode                  %insert("proxycode")
-
-%pragma(csharp) imclassclassmodifiers="class"
-%pragma(csharp) moduleclassmodifiers="public class"
-
-/* Some ANSI C typemaps */
-
-%apply unsigned long { size_t };
-%apply const unsigned long & { const size_t & };
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* csharp keywords */
-%include <csharpkw.swg>
-
-// Default enum handling
-%include <enums.swg>
-
-// For vararg handling in macros, from swigmacros.swg
-#define %arg(X...) X
-
-/*
-// Alternative char * typemaps.
-%pragma(csharp) imclasscode=%{
-  public class SWIGStringMarshal : global::System.IDisposable {
-    public readonly global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    public SWIGStringMarshal(string str) {
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, global::System.Runtime.InteropServices.Marshal.StringToHGlobalAnsi(str));
-    }
-    public virtual void Dispose() {
-      global::System.Runtime.InteropServices.Marshal.FreeHGlobal(swigCPtr.Handle);
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-%}
-
-%typemap(imtype, out="global::System.IntPtr") char *, char[ANY], char[]   "global::System.Runtime.InteropServices.HandleRef"
-%typemap(out) char *, char[ANY], char[] %{ $result = $1; %}
-%typemap(csin) char *, char[ANY], char[] "new $imclassname.SWIGStringMarshal($csinput).swigCPtr"
-%typemap(csout, excode=SWIGEXCODE) char *, char[ANY], char[] {
-    string ret = global::System.Runtime.InteropServices.Marshal.PtrToStringAnsi($imcall);$excode
-    return ret;
-  }
-%typemap(csvarin, excode=SWIGEXCODE2) char *, char[ANY], char[] %{
-    set {
-      $imcall;$excode
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) char *, char[ANY], char[] %{
-    get {
-      string ret = global::System.Runtime.InteropServices.Marshal.PtrToStringAnsi($imcall);$excode
-      return ret;
-    } %}
-*/
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/csharphead.swg b/dependencies2013/win32/swig/Lib/csharp/csharphead.swg
deleted file mode 100644
index 0b55635b..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/csharphead.swg
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -----------------------------------------------------------------------------
- * csharphead.swg
- *
- * Support code for exceptions if the SWIG_CSHARP_NO_EXCEPTION_HELPER is not defined
- * Support code for strings if the SWIG_CSHARP_NO_STRING_HELPER is not defined
- * ----------------------------------------------------------------------------- */
-
-%insert(runtime) %{
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-%}
-
-#if !defined(SWIG_CSHARP_NO_EXCEPTION_HELPER)
-%insert(runtime) %{
-/* Support for throwing C# exceptions from C/C++. There are two types: 
- * Exceptions that take a message and ArgumentExceptions that take a message and a parameter name. */
-typedef enum {
-  SWIG_CSharpApplicationException,
-  SWIG_CSharpArithmeticException,
-  SWIG_CSharpDivideByZeroException,
-  SWIG_CSharpIndexOutOfRangeException,
-  SWIG_CSharpInvalidCastException,
-  SWIG_CSharpInvalidOperationException,
-  SWIG_CSharpIOException,
-  SWIG_CSharpNullReferenceException,
-  SWIG_CSharpOutOfMemoryException,
-  SWIG_CSharpOverflowException,
-  SWIG_CSharpSystemException
-} SWIG_CSharpExceptionCodes;
-
-typedef enum {
-  SWIG_CSharpArgumentException,
-  SWIG_CSharpArgumentNullException,
-  SWIG_CSharpArgumentOutOfRangeException
-} SWIG_CSharpExceptionArgumentCodes;
-
-typedef void (SWIGSTDCALL* SWIG_CSharpExceptionCallback_t)(const char *);
-typedef void (SWIGSTDCALL* SWIG_CSharpExceptionArgumentCallback_t)(const char *, const char *);
-
-typedef struct {
-  SWIG_CSharpExceptionCodes code;
-  SWIG_CSharpExceptionCallback_t callback;
-} SWIG_CSharpException_t;
-
-typedef struct {
-  SWIG_CSharpExceptionArgumentCodes code;
-  SWIG_CSharpExceptionArgumentCallback_t callback;
-} SWIG_CSharpExceptionArgument_t;
-
-static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
-  { SWIG_CSharpApplicationException, NULL },
-  { SWIG_CSharpArithmeticException, NULL },
-  { SWIG_CSharpDivideByZeroException, NULL },
-  { SWIG_CSharpIndexOutOfRangeException, NULL },
-  { SWIG_CSharpInvalidCastException, NULL },
-  { SWIG_CSharpInvalidOperationException, NULL },
-  { SWIG_CSharpIOException, NULL },
-  { SWIG_CSharpNullReferenceException, NULL },
-  { SWIG_CSharpOutOfMemoryException, NULL },
-  { SWIG_CSharpOverflowException, NULL },
-  { SWIG_CSharpSystemException, NULL }
-};
-
-static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
-  { SWIG_CSharpArgumentException, NULL },
-  { SWIG_CSharpArgumentNullException, NULL },
-  { SWIG_CSharpArgumentOutOfRangeException, NULL }
-};
-
-static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
-  SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
-  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
-    callback = SWIG_csharp_exceptions[code].callback;
-  }
-  callback(msg);
-}
-
-static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
-  SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
-  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
-    callback = SWIG_csharp_exceptions_argument[code].callback;
-  }
-  callback(msg, param_name);
-}
-%}
-
-%insert(runtime) %{
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_$module(
-                                                SWIG_CSharpExceptionCallback_t applicationCallback,
-                                                SWIG_CSharpExceptionCallback_t arithmeticCallback,
-                                                SWIG_CSharpExceptionCallback_t divideByZeroCallback, 
-                                                SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback, 
-                                                SWIG_CSharpExceptionCallback_t invalidCastCallback,
-                                                SWIG_CSharpExceptionCallback_t invalidOperationCallback,
-                                                SWIG_CSharpExceptionCallback_t ioCallback,
-                                                SWIG_CSharpExceptionCallback_t nullReferenceCallback,
-                                                SWIG_CSharpExceptionCallback_t outOfMemoryCallback, 
-                                                SWIG_CSharpExceptionCallback_t overflowCallback, 
-                                                SWIG_CSharpExceptionCallback_t systemCallback) {
-  SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpDivideByZeroException].callback = divideByZeroCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpIndexOutOfRangeException].callback = indexOutOfRangeCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpInvalidCastException].callback = invalidCastCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpInvalidOperationException].callback = invalidOperationCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpIOException].callback = ioCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpNullReferenceException].callback = nullReferenceCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpOutOfMemoryException].callback = outOfMemoryCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpOverflowException].callback = overflowCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpSystemException].callback = systemCallback;
-}
-
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionArgumentCallbacks_$module(
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentCallback,
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentNullCallback,
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentOutOfRangeCallback) {
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback = argumentCallback;
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentNullException].callback = argumentNullCallback;
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentOutOfRangeException].callback = argumentOutOfRangeCallback;
-}
-%}
-
-%pragma(csharp) imclasscode=%{
-  protected class SWIGExceptionHelper {
-
-    public delegate void ExceptionDelegate(string message);
-    public delegate void ExceptionArgumentDelegate(string message, string paramName);
-
-    static ExceptionDelegate applicationDelegate = new ExceptionDelegate(SetPendingApplicationException);
-    static ExceptionDelegate arithmeticDelegate = new ExceptionDelegate(SetPendingArithmeticException);
-    static ExceptionDelegate divideByZeroDelegate = new ExceptionDelegate(SetPendingDivideByZeroException);
-    static ExceptionDelegate indexOutOfRangeDelegate = new ExceptionDelegate(SetPendingIndexOutOfRangeException);
-    static ExceptionDelegate invalidCastDelegate = new ExceptionDelegate(SetPendingInvalidCastException);
-    static ExceptionDelegate invalidOperationDelegate = new ExceptionDelegate(SetPendingInvalidOperationException);
-    static ExceptionDelegate ioDelegate = new ExceptionDelegate(SetPendingIOException);
-    static ExceptionDelegate nullReferenceDelegate = new ExceptionDelegate(SetPendingNullReferenceException);
-    static ExceptionDelegate outOfMemoryDelegate = new ExceptionDelegate(SetPendingOutOfMemoryException);
-    static ExceptionDelegate overflowDelegate = new ExceptionDelegate(SetPendingOverflowException);
-    static ExceptionDelegate systemDelegate = new ExceptionDelegate(SetPendingSystemException);
-
-    static ExceptionArgumentDelegate argumentDelegate = new ExceptionArgumentDelegate(SetPendingArgumentException);
-    static ExceptionArgumentDelegate argumentNullDelegate = new ExceptionArgumentDelegate(SetPendingArgumentNullException);
-    static ExceptionArgumentDelegate argumentOutOfRangeDelegate = new ExceptionArgumentDelegate(SetPendingArgumentOutOfRangeException);
-
-    [global::System.Runtime.InteropServices.DllImport("$dllimport", EntryPoint="SWIGRegisterExceptionCallbacks_$module")]
-    public static extern void SWIGRegisterExceptionCallbacks_$module(
-                                ExceptionDelegate applicationDelegate,
-                                ExceptionDelegate arithmeticDelegate,
-                                ExceptionDelegate divideByZeroDelegate, 
-                                ExceptionDelegate indexOutOfRangeDelegate, 
-                                ExceptionDelegate invalidCastDelegate,
-                                ExceptionDelegate invalidOperationDelegate,
-                                ExceptionDelegate ioDelegate,
-                                ExceptionDelegate nullReferenceDelegate,
-                                ExceptionDelegate outOfMemoryDelegate, 
-                                ExceptionDelegate overflowDelegate, 
-                                ExceptionDelegate systemExceptionDelegate);
-
-    [global::System.Runtime.InteropServices.DllImport("$dllimport", EntryPoint="SWIGRegisterExceptionArgumentCallbacks_$module")]
-    public static extern void SWIGRegisterExceptionCallbacksArgument_$module(
-                                ExceptionArgumentDelegate argumentDelegate,
-                                ExceptionArgumentDelegate argumentNullDelegate,
-                                ExceptionArgumentDelegate argumentOutOfRangeDelegate);
-
-    static void SetPendingApplicationException(string message) {
-      SWIGPendingException.Set(new global::System.ApplicationException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingArithmeticException(string message) {
-      SWIGPendingException.Set(new global::System.ArithmeticException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingDivideByZeroException(string message) {
-      SWIGPendingException.Set(new global::System.DivideByZeroException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingIndexOutOfRangeException(string message) {
-      SWIGPendingException.Set(new global::System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingInvalidCastException(string message) {
-      SWIGPendingException.Set(new global::System.InvalidCastException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingInvalidOperationException(string message) {
-      SWIGPendingException.Set(new global::System.InvalidOperationException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingIOException(string message) {
-      SWIGPendingException.Set(new global::System.IO.IOException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingNullReferenceException(string message) {
-      SWIGPendingException.Set(new global::System.NullReferenceException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingOutOfMemoryException(string message) {
-      SWIGPendingException.Set(new global::System.OutOfMemoryException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingOverflowException(string message) {
-      SWIGPendingException.Set(new global::System.OverflowException(message, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingSystemException(string message) {
-      SWIGPendingException.Set(new global::System.SystemException(message, SWIGPendingException.Retrieve()));
-    }
-
-    static void SetPendingArgumentException(string message, string paramName) {
-      SWIGPendingException.Set(new global::System.ArgumentException(message, paramName, SWIGPendingException.Retrieve()));
-    }
-    static void SetPendingArgumentNullException(string message, string paramName) {
-      global::System.Exception e = SWIGPendingException.Retrieve();
-      if (e != null) message = message + " Inner Exception: " + e.Message;
-      SWIGPendingException.Set(new global::System.ArgumentNullException(paramName, message));
-    }
-    static void SetPendingArgumentOutOfRangeException(string message, string paramName) {
-      global::System.Exception e = SWIGPendingException.Retrieve();
-      if (e != null) message = message + " Inner Exception: " + e.Message;
-      SWIGPendingException.Set(new global::System.ArgumentOutOfRangeException(paramName, message));
-    }
-
-    static SWIGExceptionHelper() {
-      SWIGRegisterExceptionCallbacks_$module(
-                                applicationDelegate,
-                                arithmeticDelegate,
-                                divideByZeroDelegate,
-                                indexOutOfRangeDelegate,
-                                invalidCastDelegate,
-                                invalidOperationDelegate,
-                                ioDelegate,
-                                nullReferenceDelegate,
-                                outOfMemoryDelegate,
-                                overflowDelegate,
-                                systemDelegate);
-
-      SWIGRegisterExceptionCallbacksArgument_$module(
-                                argumentDelegate,
-                                argumentNullDelegate,
-                                argumentOutOfRangeDelegate);
-    }
-  }
-
-  protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper();
-
-  public class SWIGPendingException {
-    [global::System.ThreadStatic]
-    private static global::System.Exception pendingException = null;
-    private static int numExceptionsPending = 0;
-
-    public static bool Pending {
-      get {
-        bool pending = false;
-        if (numExceptionsPending > 0)
-          if (pendingException != null)
-            pending = true;
-        return pending;
-      } 
-    }
-
-    public static void Set(global::System.Exception e) {
-      if (pendingException != null)
-        throw new global::System.ApplicationException("FATAL: An earlier pending exception from unmanaged code was missed and thus not thrown (" + pendingException.ToString() + ")", e);
-      pendingException = e;
-      lock(typeof($imclassname)) {
-        numExceptionsPending++;
-      }
-    }
-
-    public static global::System.Exception Retrieve() {
-      global::System.Exception e = null;
-      if (numExceptionsPending > 0) {
-        if (pendingException != null) {
-          e = pendingException;
-          pendingException = null;
-          lock(typeof($imclassname)) {
-            numExceptionsPending--;
-          }
-        }
-      }
-      return e;
-    }
-  }
-%}
-#endif // SWIG_CSHARP_NO_EXCEPTION_HELPER
-
-#if !defined(SWIG_CSHARP_NO_STRING_HELPER)
-%insert(runtime) %{
-/* Callback for returning strings to C# without leaking memory */
-typedef char * (SWIGSTDCALL* SWIG_CSharpStringHelperCallback)(const char *);
-static SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback = NULL;
-%}
-
-%pragma(csharp) imclasscode=%{
-  protected class SWIGStringHelper {
-
-    public delegate string SWIGStringDelegate(string message);
-    static SWIGStringDelegate stringDelegate = new SWIGStringDelegate(CreateString);
-
-    [global::System.Runtime.InteropServices.DllImport("$dllimport", EntryPoint="SWIGRegisterStringCallback_$module")]
-    public static extern void SWIGRegisterStringCallback_$module(SWIGStringDelegate stringDelegate);
-
-    static string CreateString(string cString) {
-      return cString;
-    }
-
-    static SWIGStringHelper() {
-      SWIGRegisterStringCallback_$module(stringDelegate);
-    }
-  }
-
-  static protected SWIGStringHelper swigStringHelper = new SWIGStringHelper();
-%}
-
-%insert(runtime) %{
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_$module(SWIG_CSharpStringHelperCallback callback) {
-  SWIG_csharp_string_callback = callback;
-}
-%}
-#endif // SWIG_CSHARP_NO_STRING_HELPER
-
-#if !defined(SWIG_CSHARP_NO_IMCLASS_STATIC_CONSTRUCTOR)
-// Ensure the class is not marked beforefieldinit
-%pragma(csharp) imclasscode=%{
-  static $imclassname() {
-  }
-%}
-#endif
-
-%insert(runtime) %{
-/* Contract support */
-
-#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, msg, ""); return nullreturn; } else
-%}
diff --git a/dependencies2013/win32/swig/Lib/csharp/csharpkw.swg b/dependencies2013/win32/swig/Lib/csharp/csharpkw.swg
deleted file mode 100644
index 824f6187..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/csharpkw.swg
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef CSHARP_CSHARPKW_SWG_
-#define CSHARP_CSHARPKW_SWG_
-
-/* Warnings for C# keywords */
-#define CSHARPKW(x) %keywordwarn("'" `x` "' is a C# keyword, renaming to '" `x` "_'",rename="%s_")  `x`
-
-#define CSHARPCLASSKW(x) %keywordwarn("'" `x` "' is a special method name used in the C# wrapper classes, class renamed to '" `x` "_'",%$isclass,rename="%s_") `x`
-
-/*
-   from
-   http://www.jaggersoft.com/csharp_grammar.html#1.7%20Keywords
-
-*/
-
-CSHARPKW(abstract);
-CSHARPKW(as);
-CSHARPKW(base);
-CSHARPKW(bool);
-CSHARPKW(break);
-CSHARPKW(byte);
-CSHARPKW(case);
-CSHARPKW(catch);
-CSHARPKW(char);
-CSHARPKW(checked);
-CSHARPKW(class);
-CSHARPKW(const);
-CSHARPKW(continue);
-CSHARPKW(decimal);
-CSHARPKW(default);
-CSHARPKW(delegate);
-CSHARPKW(do);
-CSHARPKW(double);
-CSHARPKW(else);
-CSHARPKW(enum);
-CSHARPKW(event);
-CSHARPKW(explicit);
-CSHARPKW(extern);
-CSHARPKW(false);
-CSHARPKW(finally);
-CSHARPKW(fixed);
-CSHARPKW(float);
-CSHARPKW(for);
-CSHARPKW(foreach);
-CSHARPKW(goto);
-CSHARPKW(if);
-CSHARPKW(implicit);
-CSHARPKW(in);
-CSHARPKW(int);
-CSHARPKW(interface);
-CSHARPKW(internal);
-CSHARPKW(is);
-CSHARPKW(lock);
-CSHARPKW(long);
-CSHARPKW(namespace);
-CSHARPKW(new);
-CSHARPKW(null);
-CSHARPKW(object);
-CSHARPKW(operator);
-CSHARPKW(out);
-CSHARPKW(override);
-CSHARPKW(params);
-CSHARPKW(private);
-CSHARPKW(protected);
-CSHARPKW(public);
-CSHARPKW(readonly);
-CSHARPKW(ref);
-CSHARPKW(return);
-CSHARPKW(sbyte);
-CSHARPKW(sealed);
-CSHARPKW(short);
-CSHARPKW(sizeof);
-CSHARPKW(stackalloc);
-CSHARPKW(static);
-CSHARPKW(struct);
-CSHARPKW(string);
-CSHARPKW(switch);
-CSHARPKW(this);
-CSHARPKW(throw);
-CSHARPKW(true);
-CSHARPKW(try);
-CSHARPKW(typeof);
-CSHARPKW(uint);
-CSHARPKW(ulong);
-CSHARPKW(unchecked);
-CSHARPKW(unsafe);
-CSHARPKW(ushort);
-CSHARPKW(using);
-CSHARPKW(virtual);
-CSHARPKW(void);
-CSHARPKW(volatile);
-CSHARPKW(while);
-
-CSHARPCLASSKW(delete);
-
-#undef CSHARPKW
-
-#endif //CSHARP_CSHARPKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/csharp/director.swg b/dependencies2013/win32/swig/Lib/csharp/director.swg
deleted file mode 100644
index 3438f2bf..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/director.swg
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that C# proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#if defined(DEBUG_DIRECTOR_OWNED)
-#include <iostream>
-#endif
-#include <string>
-#include <exception>
-
-namespace Swig {
-  /* Director base class - not currently used in C# directors */
-  class Director {
-  };
-
-  /* Base class for director exceptions */
-  class DirectorException : public std::exception {
-  protected:
-    std::string swig_msg;
-
-  public:
-    DirectorException(const char *msg) : swig_msg(msg) {
-    }
-
-    DirectorException(const std::string &msg) : swig_msg(msg) {
-    }
-
-    virtual ~DirectorException() throw() {
-    }
-
-    const char *what() const throw() {
-      return swig_msg.c_str();
-    }
-  };
-
-  /* Pure virtual method exception */
-  class DirectorPureVirtualException : public DirectorException {
-  public:
-    DirectorPureVirtualException(const char *msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
-    }
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/enums.swg b/dependencies2013/win32/swig/Lib/csharp/enums.swg
deleted file mode 100644
index 5cc26547..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/enums.swg
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enums.swg
- *
- * Include this file in order for C/C++ enums to be wrapped by proper C# enums.
- * Note that the PINVOKE layer handles the enum as an int.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(ctype) const enum SWIGTYPE & "int"
-%typemap(imtype) const enum SWIGTYPE & "int"
-%typemap(cstype) const enum SWIGTYPE & "$*csclassname"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE & %{ $result = (int)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin) const enum SWIGTYPE & "$input = (int)$1;"
-%typemap(csdirectorin) const enum SWIGTYPE & "($*csclassname)$iminput"
-%typemap(csdirectorout) const enum SWIGTYPE & "(int)$cscall"
-
-%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
-
-%typemap(throws, canthrow=1) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(csin) const enum SWIGTYPE & "(int)$csinput"
-%typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & {
-    $*csclassname ret = ($*csclassname)$imcall;$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) const enum SWIGTYPE & %{
-    get {
-      $*csclassname ret = ($*csclassname)$imcall;$excode
-      return ret;
-    } %}
-
-
-// enum SWIGTYPE typemaps
-%typemap(ctype) enum SWIGTYPE "int"
-%typemap(imtype) enum SWIGTYPE "int"
-%typemap(cstype) enum SWIGTYPE "$csclassname"
-
-%typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE %{ $result = (int)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) enum SWIGTYPE "$input = (int)$1;"
-%typemap(csdirectorin) enum SWIGTYPE "($csclassname)$iminput"
-%typemap(csdirectorout) enum SWIGTYPE "(int)$cscall"
-
-%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
-
-%typemap(throws, canthrow=1) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(csin) enum SWIGTYPE "(int)$csinput"
-%typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE {
-    $csclassname ret = ($csclassname)$imcall;$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) enum SWIGTYPE %{
-    get {
-      $csclassname ret = ($csclassname)$imcall;$excode
-      return ret;
-    } %}
-
-%typemap(csbase)           enum SWIGTYPE ""
-%typemap(csclassmodifiers) enum SWIGTYPE "public enum"
-%typemap(cscode)           enum SWIGTYPE ""
-%typemap(csimports)        enum SWIGTYPE ""
-%typemap(csinterfaces)     enum SWIGTYPE ""
-
-%typemap(csbody) enum SWIGTYPE ""
-
-%csenum(proper);
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/enumsimple.swg b/dependencies2013/win32/swig/Lib/csharp/enumsimple.swg
deleted file mode 100644
index 24e4bcf1..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/enumsimple.swg
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enumsimple.swg
- *
- * This file provides backwards compatible enum wrapping. SWIG versions 1.3.21
- * and earlier wrapped global enums with constant integers in the module
- * class. Enums declared within a C++ class were wrapped by constant integers
- * in the C# proxy class.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(ctype) const enum SWIGTYPE & "int"
-%typemap(imtype) const enum SWIGTYPE & "int"
-%typemap(cstype) const enum SWIGTYPE & "int"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE & %{ $result = (int)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin) const enum SWIGTYPE & "$input = (int)$1;"
-%typemap(csdirectorin) const enum SWIGTYPE & "$iminput"
-%typemap(csdirectorout) const enum SWIGTYPE & "$cscall"
-
-%typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & ""
-
-%typemap(throws, canthrow=1) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(csin) const enum SWIGTYPE & "$csinput"
-%typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & {
-    int ret = $imcall;$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) const enum SWIGTYPE & %{
-    get {
-      int ret = $imcall;$excode
-      return ret;
-    } %}
-
-
-// enum SWIGTYPE typemaps
-%typemap(ctype) enum SWIGTYPE "int"
-%typemap(imtype) enum SWIGTYPE "int"
-%typemap(cstype) enum SWIGTYPE "int"
-
-%typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE %{ $result = (int)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) enum SWIGTYPE "$input = (int)$1;"
-%typemap(csdirectorin) enum SWIGTYPE "$iminput"
-%typemap(csdirectorout) enum SWIGTYPE "$cscall"
-
-%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
-
-%typemap(throws, canthrow=1) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(csin) enum SWIGTYPE "$csinput"
-%typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE {
-    int ret = $imcall;$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) enum SWIGTYPE %{
-    get {
-      int ret = $imcall;$excode
-      return ret;
-    } %}
-
-%typemap(csbase)           enum SWIGTYPE ""
-%typemap(csclassmodifiers) enum SWIGTYPE ""
-%typemap(cscode)           enum SWIGTYPE ""
-%typemap(csimports)        enum SWIGTYPE ""
-%typemap(csinterfaces)     enum SWIGTYPE ""
-
-%typemap(csbody) enum SWIGTYPE ""
-
-%csenum(simple);
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/enumtypesafe.swg b/dependencies2013/win32/swig/Lib/csharp/enumtypesafe.swg
deleted file mode 100644
index fd680173..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/enumtypesafe.swg
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enumtypesafe.swg
- *
- * Include this file in order for C/C++ enums to be wrapped by the so called
- * typesafe enum pattern. Each enum has an equivalent C# class named after the
- * enum and each enum item is a static instance of this class.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(ctype) const enum SWIGTYPE & "int"
-%typemap(imtype) const enum SWIGTYPE & "int"
-%typemap(cstype) const enum SWIGTYPE & "$*csclassname"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE & %{ $result = (int)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin) const enum SWIGTYPE & "$input = (int)$1;"
-%typemap(csdirectorin) const enum SWIGTYPE & "$*csclassname.swigToEnum($iminput)"
-%typemap(csdirectorout) const enum SWIGTYPE & "$cscall.swigValue"
-
-%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
-
-%typemap(throws, canthrow=1) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(csin) const enum SWIGTYPE & "$csinput.swigValue"
-%typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & {
-    $*csclassname ret = $*csclassname.swigToEnum($imcall);$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) const enum SWIGTYPE & %{
-    get {
-      $*csclassname ret = $*csclassname.swigToEnum($imcall);$excode
-      return ret;
-    } %}
-
-
-// enum SWIGTYPE typemaps
-%typemap(ctype) enum SWIGTYPE "int"
-%typemap(imtype) enum SWIGTYPE "int"
-%typemap(cstype) enum SWIGTYPE "$csclassname"
-
-%typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE %{ $result = (int)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) enum SWIGTYPE "$input = (int)$1;"
-%typemap(csdirectorin) enum SWIGTYPE "$csclassname.swigToEnum($iminput)"
-%typemap(csdirectorout) enum SWIGTYPE "$cscall.swigValue"
-
-%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
-
-%typemap(throws, canthrow=1) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(csin) enum SWIGTYPE "$csinput.swigValue"
-%typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE {
-    $csclassname ret = $csclassname.swigToEnum($imcall);$excode
-    return ret;
-  }
-
-%typemap(csvarout, excode=SWIGEXCODE2) enum SWIGTYPE %{
-    get {
-      $csclassname ret = $csclassname.swigToEnum($imcall);$excode
-      return ret;
-    } %}
-
-%typemap(csbase)           enum SWIGTYPE ""
-%typemap(csclassmodifiers) enum SWIGTYPE "public sealed class"
-%typemap(cscode)           enum SWIGTYPE ""
-%typemap(csimports)        enum SWIGTYPE ""
-%typemap(csinterfaces)     enum SWIGTYPE ""
-
-/*
- * The swigToEnum method is used to find the C# enum from a C++ enum integer value. The default one here takes 
- * advantage of the fact that most enums do not have initial values specified, so the lookup is fast. If initial
- * values are specified then a lengthy linear search through all possible enums might occur. Specific typemaps could be
- * written to possibly optimise this lookup by taking advantage of characteristics peculiar to the targeted enum.
- * The special variable, $enumvalues, is replaced with a comma separated list of all the enum values.
- */
-%typemap(csbody) enum SWIGTYPE %{
-  public readonly int swigValue;
-
-  public static $csclassname swigToEnum(int swigValue) {
-    if (swigValue < swigValues.Length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
-      return swigValues[swigValue];
-    for (int i = 0; i < swigValues.Length; i++)
-      if (swigValues[i].swigValue == swigValue)
-        return swigValues[i];
-    throw new global::System.ArgumentOutOfRangeException("No enum $csclassname with value " + swigValue);
-  }
-
-  public override string ToString() {
-    return swigName;
-  }
-
-  private $csclassname(string swigName) {
-    this.swigName = swigName;
-    this.swigValue = swigNext++;
-  }
-
-  private $csclassname(string swigName, int swigValue) {
-    this.swigName = swigName;
-    this.swigValue = swigValue;
-    swigNext = swigValue+1;
-  }
-
-  private $csclassname(string swigName, $csclassname swigEnum) {
-    this.swigName = swigName;
-    this.swigValue = swigEnum.swigValue;
-    swigNext = this.swigValue+1;
-  }
-
-  private static $csclassname[] swigValues = { $enumvalues };
-  private static int swigNext = 0;
-  private readonly string swigName;
-%}
-
-%csenum(typesafe);
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_array.i b/dependencies2013/win32/swig/Lib/csharp/std_array.i
deleted file mode 100644
index 61bb510d..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_array.i
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_array.i
- *
- * SWIG typemaps for std::array<T, N>
- * C# implementation
- * The C# wrapper is made to look and feel like a C# System.Collections.Generic.IReadOnlyList<> collection.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <algorithm>
-#include <array>
-#include <stdexcept>
-%}
-
-%include <std_common.i>
-
-
-%define SWIG_STD_ARRAY_INTERNAL(T, N)
-%typemap(csinterfaces) std::array< T, N > "global::System.IDisposable, global::System.Collections.IEnumerable\n    , global::System.Collections.Generic.IEnumerable<$typemap(cstype, T)>\n";
-%proxycode %{
-  public $csclassname(global::System.Collections.ICollection c) : this() {
-    if (c == null)
-      throw new global::System.ArgumentNullException("c");
-    int end = global::System.Math.Min(this.Count, c.Count);
-    int i = 0;
-    foreach ($typemap(cstype, T) elem in c) {
-      if (i >= end)
-        break;
-      this[i++] = elem;
-    }
-  }
-
-  public int Count {
-    get {
-      return (int)size();
-    }
-  }
-
-  public $typemap(cstype, T) this[int index]  {
-    get {
-      return getitem(index);
-    }
-    set {
-      setitem(index, value);
-    }
-  }
-
-  public bool IsEmpty {
-    get {
-      return empty();
-    }
-  }
-
-  public void CopyTo($typemap(cstype, T)[] array)
-  {
-    CopyTo(0, array, 0, this.Count);
-  }
-
-  public void CopyTo($typemap(cstype, T)[] array, int arrayIndex)
-  {
-    CopyTo(0, array, arrayIndex, this.Count);
-  }
-
-  public void CopyTo(int index, $typemap(cstype, T)[] array, int arrayIndex, int count)
-  {
-    if (array == null)
-      throw new global::System.ArgumentNullException("array");
-    if (index < 0)
-      throw new global::System.ArgumentOutOfRangeException("index", "Value is less than zero");
-    if (arrayIndex < 0)
-      throw new global::System.ArgumentOutOfRangeException("arrayIndex", "Value is less than zero");
-    if (count < 0)
-      throw new global::System.ArgumentOutOfRangeException("count", "Value is less than zero");
-    if (array.Rank > 1)
-      throw new global::System.ArgumentException("Multi dimensional array.", "array");
-    if (index+count > this.Count || arrayIndex+count > array.Length)
-      throw new global::System.ArgumentException("Number of elements to copy is too large.");
-    for (int i=0; i<count; i++)
-      array.SetValue(getitemcopy(index+i), arrayIndex+i);
-  }
-
-  global::System.Collections.Generic.IEnumerator<$typemap(cstype, T)> global::System.Collections.Generic.IEnumerable<$typemap(cstype, T)>.GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  public $csclassnameEnumerator GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  // Type-safe enumerator
-  /// Note that the IEnumerator documentation requires an InvalidOperationException to be thrown
-  /// whenever the collection is modified. This has been done for changes in the size of the
-  /// collection but not when one of the elements of the collection is modified as it is a bit
-  /// tricky to detect unmanaged code that modifies the collection under our feet.
-  public sealed class $csclassnameEnumerator : global::System.Collections.IEnumerator
-    , global::System.Collections.Generic.IEnumerator<$typemap(cstype, T)>
-  {
-    private $csclassname collectionRef;
-    private int currentIndex;
-    private object currentObject;
-    private int currentSize;
-
-    public $csclassnameEnumerator($csclassname collection) {
-      collectionRef = collection;
-      currentIndex = -1;
-      currentObject = null;
-      currentSize = collectionRef.Count;
-    }
-
-    // Type-safe iterator Current
-    public $typemap(cstype, T) Current {
-      get {
-        if (currentIndex == -1)
-          throw new global::System.InvalidOperationException("Enumeration not started.");
-        if (currentIndex > currentSize - 1)
-          throw new global::System.InvalidOperationException("Enumeration finished.");
-        if (currentObject == null)
-          throw new global::System.InvalidOperationException("Collection modified.");
-        return ($typemap(cstype, T))currentObject;
-      }
-    }
-
-    // Type-unsafe IEnumerator.Current
-    object global::System.Collections.IEnumerator.Current {
-      get {
-        return Current;
-      }
-    }
-
-    public bool MoveNext() {
-      int size = collectionRef.Count;
-      bool moveOkay = (currentIndex+1 < size) && (size == currentSize);
-      if (moveOkay) {
-        currentIndex++;
-        currentObject = collectionRef[currentIndex];
-      } else {
-        currentObject = null;
-      }
-      return moveOkay;
-    }
-
-    public void Reset() {
-      currentIndex = -1;
-      currentObject = null;
-      if (collectionRef.Count != currentSize) {
-        throw new global::System.InvalidOperationException("Collection modified.");
-      }
-    }
-
-    public void Dispose() {
-        currentIndex = -1;
-        currentObject = null;
-    }
-  }
-%}
-
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-
-    array();
-    array(const array &other);
-
-    size_type size() const;
-    bool empty() const;
-
-    %rename(Fill) fill;
-    void fill(const value_type& val);
-
-    %rename(Swap) swap;
-    void swap(array& other);
-
-    %extend {
-      T getitemcopy(int index) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          return (*$self)[index];
-        else
-          throw std::out_of_range("index");
-      }
-      const_reference getitem(int index) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          return (*$self)[index];
-        else
-          throw std::out_of_range("index");
-      }
-      void setitem(int index, const_reference val) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          (*$self)[index] = val;
-        else
-          throw std::out_of_range("index");
-      }
-      void Reverse() {
-        std::reverse($self->begin(), $self->end());
-      }
-      void Reverse(int index, int count) throw (std::out_of_range, std::invalid_argument) {
-        if (index < 0)
-          throw std::out_of_range("index");
-        if (count < 0)
-          throw std::out_of_range("count");
-        if (index >= (int)$self->size()+1 || index+count > (int)$self->size())
-          throw std::invalid_argument("invalid range");
-        std::reverse($self->begin()+index, $self->begin()+index+count);
-      }
-    }
-%enddef
-
-
-%csmethodmodifiers std::array::empty "private"
-%csmethodmodifiers std::array::getitemcopy "private"
-%csmethodmodifiers std::array::getitem "private"
-%csmethodmodifiers std::array::setitem "private"
-%csmethodmodifiers std::array::size "private"
-
-namespace std {
-  template<class T, size_t N> class array {
-    SWIG_STD_ARRAY_INTERNAL(T, N)
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_auto_ptr.i b/dependencies2013/win32/swig/Lib/csharp/std_auto_ptr.i
deleted file mode 100644
index d7e5f167..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_auto_ptr.i
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-    The typemaps here allow to handle functions returning std::auto_ptr<>,
-    which is the most common use of this type. If you have functions taking it
-    as parameter, these typemaps can't be used for them and you need to do
-    something else (e.g. use shared_ptr<> which SWIG supports fully).
- */
-
-%define %auto_ptr(TYPE)
-%typemap (ctype) std::auto_ptr<TYPE > "void *"
-%typemap (imtype, out="System.IntPtr") std::auto_ptr<TYPE > "HandleRef"
-%typemap (cstype) std::auto_ptr<TYPE > "$typemap(cstype, TYPE)"
-%typemap (out) std::auto_ptr<TYPE > %{
-   $result = (void *)$1.release();
-%}
-%typemap(csout, excode=SWIGEXCODE) std::auto_ptr<TYPE > {
-     System.IntPtr cPtr = $imcall;
-     $typemap(cstype, TYPE) ret = (cPtr == System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-     return ret;
-   }
-%template() std::auto_ptr<TYPE >;
-%enddef
-
-namespace std {
-   template <class T> class auto_ptr {};
-} 
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_common.i b/dependencies2013/win32/swig/Lib/csharp/std_common.i
deleted file mode 100644
index cee11e8c..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_common.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_deque.i b/dependencies2013/win32/swig/Lib/csharp/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_except.i b/dependencies2013/win32/swig/Lib/csharp/std_except.i
deleted file mode 100644
index c983bd0f..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_except.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_except.i
- *
- * Typemaps used by the STL wrappers that throw exceptions. These typemaps are
- * used when methods are declared with an STL exception specification, such as
- *   size_t at() const throw (std::out_of_range);
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-namespace std 
-{
-  %ignore exception;
-  struct exception {};
-}
-
-%typemap(throws, canthrow=1) std::bad_cast          "SWIG_CSharpSetPendingException(SWIG_CSharpInvalidCastException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::bad_exception     "SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::domain_error      "SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::exception         "SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::invalid_argument  "SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, $1.what(), \"\");\n return $null;"
-%typemap(throws, canthrow=1) std::length_error      "SWIG_CSharpSetPendingException(SWIG_CSharpIndexOutOfRangeException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::logic_error       "SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::out_of_range      "SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::overflow_error    "SWIG_CSharpSetPendingException(SWIG_CSharpOverflowException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::range_error       "SWIG_CSharpSetPendingException(SWIG_CSharpIndexOutOfRangeException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::runtime_error     "SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::underflow_error   "SWIG_CSharpSetPendingException(SWIG_CSharpOverflowException, $1.what());\n return $null;"
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_map.i b/dependencies2013/win32/swig/Lib/csharp/std_map.i
deleted file mode 100644
index 90a86507..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_map.i
+++ /dev/null
@@ -1,307 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map< K, T, C >
- *
- * The C# wrapper is made to look and feel like a C# System.Collections.Generic.IDictionary<>.
- * 
- * Using this wrapper is fairly simple. For example, to create a map from integers to doubles use:
- *
- *   %include <std_map.i>
- *   %template(MapIntDouble) std::map<int, double>
- *
- * Notes:
- * 1) IEnumerable<> is implemented in the proxy class which is useful for using LINQ with 
- *    C++ std::map wrappers.
- *
- * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents!
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-/* K is the C++ key type, T is the C++ value type */
-%define SWIG_STD_MAP_INTERNAL(K, T, C)
-
-%typemap(csinterfaces) std::map< K, T, C > "global::System.IDisposable \n    , global::System.Collections.Generic.IDictionary<$typemap(cstype, K), $typemap(cstype, T)>\n";
-%proxycode %{
-
-  public $typemap(cstype, T) this[$typemap(cstype, K) key] {
-    get {
-      return getitem(key);
-    }
-
-    set {
-      setitem(key, value);
-    }
-  }
-
-  public bool TryGetValue($typemap(cstype, K) key, out $typemap(cstype, T) value) {
-    if (this.ContainsKey(key)) {
-      value = this[key];
-      return true;
-    }
-    value = default($typemap(cstype, T));
-    return false;
-  }
-
-  public int Count {
-    get {
-      return (int)size();
-    }
-  }
-
-  public bool IsReadOnly {
-    get { 
-      return false; 
-    }
-  }
-
-  public global::System.Collections.Generic.ICollection<$typemap(cstype, K)> Keys {
-    get {
-      global::System.Collections.Generic.ICollection<$typemap(cstype, K)> keys = new global::System.Collections.Generic.List<$typemap(cstype, K)>();
-      int size = this.Count;
-      if (size > 0) {
-        global::System.IntPtr iter = create_iterator_begin();
-        for (int i = 0; i < size; i++) {
-          keys.Add(get_next_key(iter));
-        }
-        destroy_iterator(iter);
-      }
-      return keys;
-    }
-  }
-
-  public global::System.Collections.Generic.ICollection<$typemap(cstype, T)> Values {
-    get {
-      global::System.Collections.Generic.ICollection<$typemap(cstype, T)> vals = new global::System.Collections.Generic.List<$typemap(cstype, T)>();
-      foreach (global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)> pair in this) {
-        vals.Add(pair.Value);
-      }
-      return vals;
-    }
-  }
-  
-  public void Add(global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)> item) {
-    Add(item.Key, item.Value);
-  }
-
-  public bool Remove(global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)> item) {
-    if (Contains(item)) {
-      return Remove(item.Key);
-    } else {
-      return false;
-    }
-  }
-
-  public bool Contains(global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)> item) {
-    if (this[item.Key] == item.Value) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  public void CopyTo(global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>[] array) {
-    CopyTo(array, 0);
-  }
-
-  public void CopyTo(global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>[] array, int arrayIndex) {
-    if (array == null)
-      throw new global::System.ArgumentNullException("array");
-    if (arrayIndex < 0)
-      throw new global::System.ArgumentOutOfRangeException("arrayIndex", "Value is less than zero");
-    if (array.Rank > 1)
-      throw new global::System.ArgumentException("Multi dimensional array.", "array");
-    if (arrayIndex+this.Count > array.Length)
-      throw new global::System.ArgumentException("Number of elements to copy is too large.");
-
-    global::System.Collections.Generic.IList<$typemap(cstype, K)> keyList = new global::System.Collections.Generic.List<$typemap(cstype, K)>(this.Keys);
-    for (int i = 0; i < keyList.Count; i++) {
-      $typemap(cstype, K) currentKey = keyList[i];
-      array.SetValue(new global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>(currentKey, this[currentKey]), arrayIndex+i);
-    }
-  }
-
-  global::System.Collections.Generic.IEnumerator<global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>> global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>>.GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  public $csclassnameEnumerator GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  // Type-safe enumerator
-  /// Note that the IEnumerator documentation requires an InvalidOperationException to be thrown
-  /// whenever the collection is modified. This has been done for changes in the size of the
-  /// collection but not when one of the elements of the collection is modified as it is a bit
-  /// tricky to detect unmanaged code that modifies the collection under our feet.
-  public sealed class $csclassnameEnumerator : global::System.Collections.IEnumerator, 
-      global::System.Collections.Generic.IEnumerator<global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>>
-  {
-    private $csclassname collectionRef;
-    private global::System.Collections.Generic.IList<$typemap(cstype, K)> keyCollection;
-    private int currentIndex;
-    private object currentObject;
-    private int currentSize;
-
-    public $csclassnameEnumerator($csclassname collection) {
-      collectionRef = collection;
-      keyCollection = new global::System.Collections.Generic.List<$typemap(cstype, K)>(collection.Keys);
-      currentIndex = -1;
-      currentObject = null;
-      currentSize = collectionRef.Count;
-    }
-
-    // Type-safe iterator Current
-    public global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)> Current {
-      get {
-        if (currentIndex == -1)
-          throw new global::System.InvalidOperationException("Enumeration not started.");
-        if (currentIndex > currentSize - 1)
-          throw new global::System.InvalidOperationException("Enumeration finished.");
-        if (currentObject == null)
-          throw new global::System.InvalidOperationException("Collection modified.");
-        return (global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>)currentObject;
-      }
-    }
-
-    // Type-unsafe IEnumerator.Current
-    object global::System.Collections.IEnumerator.Current {
-      get {
-        return Current;
-      }
-    }
-
-    public bool MoveNext() {
-      int size = collectionRef.Count;
-      bool moveOkay = (currentIndex+1 < size) && (size == currentSize);
-      if (moveOkay) {
-        currentIndex++;
-        $typemap(cstype, K) currentKey = keyCollection[currentIndex];
-        currentObject = new global::System.Collections.Generic.KeyValuePair<$typemap(cstype, K), $typemap(cstype, T)>(currentKey, collectionRef[currentKey]);
-      } else {
-        currentObject = null;
-      }
-      return moveOkay;
-    }
-
-    public void Reset() {
-      currentIndex = -1;
-      currentObject = null;
-      if (collectionRef.Count != currentSize) {
-        throw new global::System.InvalidOperationException("Collection modified.");
-      }
-    }
-
-    public void Dispose() {
-      currentIndex = -1;
-      currentObject = null;
-    }
-  }
-  
-%}
-
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef K key_type;
-    typedef T mapped_type;
-
-    map();
-    map(const map< K, T, C > &other);
-    size_type size() const;
-    bool empty() const;
-    %rename(Clear) clear;
-    void clear();
-    %extend {
-      const mapped_type& getitem(const key_type& key) throw (std::out_of_range) {
-        std::map< K, T, C >::iterator iter = $self->find(key);
-        if (iter != $self->end())
-          return iter->second;
-        else
-          throw std::out_of_range("key not found");
-      }
-
-      void setitem(const key_type& key, const mapped_type& x) {
-        (*$self)[key] = x;
-      }
-
-      bool ContainsKey(const key_type& key) {
-        std::map< K, T, C >::iterator iter = $self->find(key);
-        return iter != $self->end();
-      }
-
-      void Add(const key_type& key, const mapped_type& val) throw (std::out_of_range) {
-        std::map< K, T, C >::iterator iter = $self->find(key);
-        if (iter != $self->end())
-          throw std::out_of_range("key already exists");
-        $self->insert(std::pair< K, T >(key, val));
-      }
-
-      bool Remove(const key_type& key) {
-        std::map< K, T, C >::iterator iter = $self->find(key);
-        if (iter != $self->end()) {
-          $self->erase(iter);
-          return true;
-        }                
-        return false;
-      }
-
-      // create_iterator_begin(), get_next_key() and destroy_iterator work together to provide a collection of keys to C#
-      %apply void *VOID_INT_PTR { std::map< K, T, C >::iterator *create_iterator_begin }
-      %apply void *VOID_INT_PTR { std::map< K, T, C >::iterator *swigiterator }
-
-      std::map< K, T, C >::iterator *create_iterator_begin() {
-        return new std::map< K, T, C >::iterator($self->begin());
-      }
-
-      const key_type& get_next_key(std::map< K, T, C >::iterator *swigiterator) {
-        std::map< K, T, C >::iterator iter = *swigiterator;
-        (*swigiterator)++;
-        return (*iter).first;
-      }
-
-      void destroy_iterator(std::map< K, T, C >::iterator *swigiterator) {
-        delete swigiterator;
-      }
-    }
-
-
-%enddef
-
-%csmethodmodifiers std::map::size "private"
-%csmethodmodifiers std::map::getitem "private"
-%csmethodmodifiers std::map::setitem "private"
-%csmethodmodifiers std::map::create_iterator_begin "private"
-%csmethodmodifiers std::map::get_next_key "private"
-%csmethodmodifiers std::map::destroy_iterator "private"
-
-// Default implementation
-namespace std {   
-  template<class K, class T, class C = std::less<K> > class map {
-    SWIG_STD_MAP_INTERNAL(K, T, C)
-  };
-}
- 
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_pair.i b/dependencies2013/win32/swig/Lib/csharp/std_pair.i
deleted file mode 100644
index 0712ad76..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T t, U u);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_shared_ptr.i b/dependencies2013/win32/swig/Lib/csharp/std_shared_ptr.i
deleted file mode 100644
index df873679..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_shared_ptr.i
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SWIG_SHARED_PTR_NAMESPACE std
-%include <boost_shared_ptr.i>
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_string.i b/dependencies2013/win32/swig/Lib/csharp/std_string.i
deleted file mode 100644
index 5f8fa44c..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_string.i
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * Typemaps for std::string and const std::string&
- * These are mapped to a C# String and are passed around by value.
- *
- * To use non-const std::string references use the following %apply.  Note 
- * that they are passed by value.
- * %apply const std::string & {std::string &};
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-%naturalvar string;
-
-class string;
-
-// string
-%typemap(ctype) string "char *"
-%typemap(imtype) string "string"
-%typemap(cstype) string "string"
-
-%typemap(csdirectorin) string "$iminput"
-%typemap(csdirectorout) string "$cscall"
-
-%typemap(in, canthrow=1) string 
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return $null;
-   }
-   $1.assign($input); %}
-%typemap(out) string %{ $result = SWIG_csharp_string_callback($1.c_str()); %}
-
-%typemap(directorout, canthrow=1) string 
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return $null;
-   }
-   $result.assign($input); %}
-
-%typemap(directorin) string %{ $input = SWIG_csharp_string_callback($1.c_str()); %}
-
-%typemap(csin) string "$csinput"
-%typemap(csout, excode=SWIGEXCODE) string {
-    string ret = $imcall;$excode
-    return ret;
-  }
-
-%typemap(typecheck) string = char *;
-
-%typemap(throws, canthrow=1) string
-%{ SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.c_str());
-   return $null; %}
-
-// const string &
-%typemap(ctype) const string & "char *"
-%typemap(imtype) const string & "string"
-%typemap(cstype) const string & "string"
-
-%typemap(csdirectorin) const string & "$iminput"
-%typemap(csdirectorout) const string & "$cscall"
-
-%typemap(in, canthrow=1) const string &
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return $null;
-   }
-   $*1_ltype $1_str($input);
-   $1 = &$1_str; %}
-%typemap(out) const string & %{ $result = SWIG_csharp_string_callback($1->c_str()); %}
-
-%typemap(csin) const string & "$csinput"
-%typemap(csout, excode=SWIGEXCODE) const string & {
-    string ret = $imcall;$excode
-    return ret;
-  }
-
-%typemap(directorout, canthrow=1, warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return $null;
-   }
-   /* possible thread/reentrant code problem */
-   static $*1_ltype $1_str;
-   $1_str = $input;
-   $result = &$1_str; %}
-
-%typemap(directorin) const string & %{ $input = SWIG_csharp_string_callback($1.c_str()); %}
-
-%typemap(csvarin, excode=SWIGEXCODE2) const string & %{
-    set {
-      $imcall;$excode
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) const string & %{
-    get {
-      string ret = $imcall;$excode
-      return ret;
-    } %}
-
-%typemap(typecheck) const string & = char *;
-
-%typemap(throws, canthrow=1) const string &
-%{ SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.c_str());
-   return $null; %}
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_vector.i b/dependencies2013/win32/swig/Lib/csharp/std_vector.i
deleted file mode 100644
index 12220aa5..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_vector.i
+++ /dev/null
@@ -1,402 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * SWIG typemaps for std::vector<T>
- * C# implementation
- * The C# wrapper is made to look and feel like a C# System.Collections.Generic.List<> collection.
- *
- * Note that IEnumerable<> is implemented in the proxy class which is useful for using LINQ with 
- * C++ std::vector wrappers. The IList<> interface is also implemented to provide enhanced functionality
- * whenever we are confident that the required C++ operator== is available. This is the case for when 
- * T is a primitive type or a pointer. If T does define an operator==, then use the SWIG_STD_VECTOR_ENHANCED
- * macro to obtain this enhanced functionality, for example:
- *
- *   SWIG_STD_VECTOR_ENHANCED(SomeNamespace::Klass)
- *   %template(VectKlass) std::vector<SomeNamespace::Klass>;
- *
- * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents!
- * ----------------------------------------------------------------------------- */
-
-// Warning: Use the typemaps here in the expectation that the macros they are in will change name.
-
-
-%include <std_common.i>
-
-// MACRO for use within the std::vector class body
-%define SWIG_STD_VECTOR_MINIMUM_INTERNAL(CSINTERFACE, CONST_REFERENCE, CTYPE...)
-%typemap(csinterfaces) std::vector< CTYPE > "global::System.IDisposable, global::System.Collections.IEnumerable\n    , global::System.Collections.Generic.CSINTERFACE<$typemap(cstype, CTYPE)>\n";
-%proxycode %{
-  public $csclassname(global::System.Collections.ICollection c) : this() {
-    if (c == null)
-      throw new global::System.ArgumentNullException("c");
-    foreach ($typemap(cstype, CTYPE) element in c) {
-      this.Add(element);
-    }
-  }
-
-  public bool IsFixedSize {
-    get {
-      return false;
-    }
-  }
-
-  public bool IsReadOnly {
-    get {
-      return false;
-    }
-  }
-
-  public $typemap(cstype, CTYPE) this[int index]  {
-    get {
-      return getitem(index);
-    }
-    set {
-      setitem(index, value);
-    }
-  }
-
-  public int Capacity {
-    get {
-      return (int)capacity();
-    }
-    set {
-      if (value < size())
-        throw new global::System.ArgumentOutOfRangeException("Capacity");
-      reserve((uint)value);
-    }
-  }
-
-  public int Count {
-    get {
-      return (int)size();
-    }
-  }
-
-  public bool IsSynchronized {
-    get {
-      return false;
-    }
-  }
-
-  public void CopyTo($typemap(cstype, CTYPE)[] array)
-  {
-    CopyTo(0, array, 0, this.Count);
-  }
-
-  public void CopyTo($typemap(cstype, CTYPE)[] array, int arrayIndex)
-  {
-    CopyTo(0, array, arrayIndex, this.Count);
-  }
-
-  public void CopyTo(int index, $typemap(cstype, CTYPE)[] array, int arrayIndex, int count)
-  {
-    if (array == null)
-      throw new global::System.ArgumentNullException("array");
-    if (index < 0)
-      throw new global::System.ArgumentOutOfRangeException("index", "Value is less than zero");
-    if (arrayIndex < 0)
-      throw new global::System.ArgumentOutOfRangeException("arrayIndex", "Value is less than zero");
-    if (count < 0)
-      throw new global::System.ArgumentOutOfRangeException("count", "Value is less than zero");
-    if (array.Rank > 1)
-      throw new global::System.ArgumentException("Multi dimensional array.", "array");
-    if (index+count > this.Count || arrayIndex+count > array.Length)
-      throw new global::System.ArgumentException("Number of elements to copy is too large.");
-    for (int i=0; i<count; i++)
-      array.SetValue(getitemcopy(index+i), arrayIndex+i);
-  }
-
-  global::System.Collections.Generic.IEnumerator<$typemap(cstype, CTYPE)> global::System.Collections.Generic.IEnumerable<$typemap(cstype, CTYPE)>.GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  public $csclassnameEnumerator GetEnumerator() {
-    return new $csclassnameEnumerator(this);
-  }
-
-  // Type-safe enumerator
-  /// Note that the IEnumerator documentation requires an InvalidOperationException to be thrown
-  /// whenever the collection is modified. This has been done for changes in the size of the
-  /// collection but not when one of the elements of the collection is modified as it is a bit
-  /// tricky to detect unmanaged code that modifies the collection under our feet.
-  public sealed class $csclassnameEnumerator : global::System.Collections.IEnumerator
-    , global::System.Collections.Generic.IEnumerator<$typemap(cstype, CTYPE)>
-  {
-    private $csclassname collectionRef;
-    private int currentIndex;
-    private object currentObject;
-    private int currentSize;
-
-    public $csclassnameEnumerator($csclassname collection) {
-      collectionRef = collection;
-      currentIndex = -1;
-      currentObject = null;
-      currentSize = collectionRef.Count;
-    }
-
-    // Type-safe iterator Current
-    public $typemap(cstype, CTYPE) Current {
-      get {
-        if (currentIndex == -1)
-          throw new global::System.InvalidOperationException("Enumeration not started.");
-        if (currentIndex > currentSize - 1)
-          throw new global::System.InvalidOperationException("Enumeration finished.");
-        if (currentObject == null)
-          throw new global::System.InvalidOperationException("Collection modified.");
-        return ($typemap(cstype, CTYPE))currentObject;
-      }
-    }
-
-    // Type-unsafe IEnumerator.Current
-    object global::System.Collections.IEnumerator.Current {
-      get {
-        return Current;
-      }
-    }
-
-    public bool MoveNext() {
-      int size = collectionRef.Count;
-      bool moveOkay = (currentIndex+1 < size) && (size == currentSize);
-      if (moveOkay) {
-        currentIndex++;
-        currentObject = collectionRef[currentIndex];
-      } else {
-        currentObject = null;
-      }
-      return moveOkay;
-    }
-
-    public void Reset() {
-      currentIndex = -1;
-      currentObject = null;
-      if (collectionRef.Count != currentSize) {
-        throw new global::System.InvalidOperationException("Collection modified.");
-      }
-    }
-
-    public void Dispose() {
-        currentIndex = -1;
-        currentObject = null;
-    }
-  }
-%}
-
-  public:
-    typedef size_t size_type;
-    typedef CTYPE value_type;
-    typedef CONST_REFERENCE const_reference;
-    %rename(Clear) clear;
-    void clear();
-    %rename(Add) push_back;
-    void push_back(CTYPE const& x);
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n);
-    %newobject GetRange(int index, int count);
-    %newobject Repeat(CTYPE const& value, int count);
-    vector();
-    vector(const vector &other);
-    %extend {
-      vector(int capacity) throw (std::out_of_range) {
-        std::vector< CTYPE >* pv = 0;
-        if (capacity >= 0) {
-          pv = new std::vector< CTYPE >();
-          pv->reserve(capacity);
-       } else {
-          throw std::out_of_range("capacity");
-       }
-       return pv;
-      }
-      CTYPE getitemcopy(int index) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          return (*$self)[index];
-        else
-          throw std::out_of_range("index");
-      }
-      CONST_REFERENCE getitem(int index) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          return (*$self)[index];
-        else
-          throw std::out_of_range("index");
-      }
-      void setitem(int index, CTYPE const& val) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          (*$self)[index] = val;
-        else
-          throw std::out_of_range("index");
-      }
-      // Takes a deep copy of the elements unlike ArrayList.AddRange
-      void AddRange(const std::vector< CTYPE >& values) {
-        $self->insert($self->end(), values.begin(), values.end());
-      }
-      // Takes a deep copy of the elements unlike ArrayList.GetRange
-      std::vector< CTYPE > *GetRange(int index, int count) throw (std::out_of_range, std::invalid_argument) {
-        if (index < 0)
-          throw std::out_of_range("index");
-        if (count < 0)
-          throw std::out_of_range("count");
-        if (index >= (int)$self->size()+1 || index+count > (int)$self->size())
-          throw std::invalid_argument("invalid range");
-        return new std::vector< CTYPE >($self->begin()+index, $self->begin()+index+count);
-      }
-      void Insert(int index, CTYPE const& x) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size()+1)
-          $self->insert($self->begin()+index, x);
-        else
-          throw std::out_of_range("index");
-      }
-      // Takes a deep copy of the elements unlike ArrayList.InsertRange
-      void InsertRange(int index, const std::vector< CTYPE >& values) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size()+1)
-          $self->insert($self->begin()+index, values.begin(), values.end());
-        else
-          throw std::out_of_range("index");
-      }
-      void RemoveAt(int index) throw (std::out_of_range) {
-        if (index>=0 && index<(int)$self->size())
-          $self->erase($self->begin() + index);
-        else
-          throw std::out_of_range("index");
-      }
-      void RemoveRange(int index, int count) throw (std::out_of_range, std::invalid_argument) {
-        if (index < 0)
-          throw std::out_of_range("index");
-        if (count < 0)
-          throw std::out_of_range("count");
-        if (index >= (int)$self->size()+1 || index+count > (int)$self->size())
-          throw std::invalid_argument("invalid range");
-        $self->erase($self->begin()+index, $self->begin()+index+count);
-      }
-      static std::vector< CTYPE > *Repeat(CTYPE const& value, int count) throw (std::out_of_range) {
-        if (count < 0)
-          throw std::out_of_range("count");
-        return new std::vector< CTYPE >(count, value);
-      }
-      void Reverse() {
-        std::reverse($self->begin(), $self->end());
-      }
-      void Reverse(int index, int count) throw (std::out_of_range, std::invalid_argument) {
-        if (index < 0)
-          throw std::out_of_range("index");
-        if (count < 0)
-          throw std::out_of_range("count");
-        if (index >= (int)$self->size()+1 || index+count > (int)$self->size())
-          throw std::invalid_argument("invalid range");
-        std::reverse($self->begin()+index, $self->begin()+index+count);
-      }
-      // Takes a deep copy of the elements unlike ArrayList.SetRange
-      void SetRange(int index, const std::vector< CTYPE >& values) throw (std::out_of_range) {
-        if (index < 0)
-          throw std::out_of_range("index");
-        if (index+values.size() > $self->size())
-          throw std::out_of_range("index");
-        std::copy(values.begin(), values.end(), $self->begin()+index);
-      }
-    }
-%enddef
-
-// Extra methods added to the collection class if operator== is defined for the class being wrapped
-// The class will then implement IList<>, which adds extra functionality
-%define SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CTYPE...)
-    %extend {
-      bool Contains(CTYPE const& value) {
-        return std::find($self->begin(), $self->end(), value) != $self->end();
-      }
-      int IndexOf(CTYPE const& value) {
-        int index = -1;
-        std::vector< CTYPE >::iterator it = std::find($self->begin(), $self->end(), value);
-        if (it != $self->end())
-          index = (int)(it - $self->begin());
-        return index;
-      }
-      int LastIndexOf(CTYPE const& value) {
-        int index = -1;
-        std::vector< CTYPE >::reverse_iterator rit = std::find($self->rbegin(), $self->rend(), value);
-        if (rit != $self->rend())
-          index = (int)($self->rend() - 1 - rit);
-        return index;
-      }
-      bool Remove(CTYPE const& value) {
-        std::vector< CTYPE >::iterator it = std::find($self->begin(), $self->end(), value);
-        if (it != $self->end()) {
-          $self->erase(it);
-	  return true;
-        }
-        return false;
-      }
-    }
-%enddef
-
-// Macros for std::vector class specializations/enhancements
-%define SWIG_STD_VECTOR_ENHANCED(CTYPE...)
-namespace std {
-  template<> class vector< CTYPE > {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(IList, %arg(CTYPE const&), %arg(CTYPE))
-    SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CTYPE)
-  };
-}
-%enddef
-
-// Legacy macros
-%define SWIG_STD_VECTOR_SPECIALIZE(CSTYPE, CTYPE...)
-#warning SWIG_STD_VECTOR_SPECIALIZE macro deprecated, please see csharp/std_vector.i and switch to SWIG_STD_VECTOR_ENHANCED
-SWIG_STD_VECTOR_ENHANCED(CTYPE)
-%enddef
-
-%define SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(CSTYPE, CTYPE...)
-#warning SWIG_STD_VECTOR_SPECIALIZE_MINIMUM macro deprecated, it is no longer required
-%enddef
-
-%{
-#include <vector>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-%csmethodmodifiers std::vector::getitemcopy "private"
-%csmethodmodifiers std::vector::getitem "private"
-%csmethodmodifiers std::vector::setitem "private"
-%csmethodmodifiers std::vector::size "private"
-%csmethodmodifiers std::vector::capacity "private"
-%csmethodmodifiers std::vector::reserve "private"
-
-namespace std {
-  // primary (unspecialized) class template for std::vector
-  // does not require operator== to be defined
-  template<class T> class vector {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(IEnumerable, T const&, T)
-  };
-  // specialization for pointers
-  template<class T> class vector<T *> {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(IList, T *const&, T *)
-    SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(T *)
-  };
-  // bool is specialized in the C++ standard - const_reference in particular
-  template<> class vector<bool> {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(IList, bool, bool)
-    SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(bool)
-  };
-}
-
-// template specializations for std::vector
-// these provide extra collections methods as operator== is defined
-SWIG_STD_VECTOR_ENHANCED(char)
-SWIG_STD_VECTOR_ENHANCED(signed char)
-SWIG_STD_VECTOR_ENHANCED(unsigned char)
-SWIG_STD_VECTOR_ENHANCED(short)
-SWIG_STD_VECTOR_ENHANCED(unsigned short)
-SWIG_STD_VECTOR_ENHANCED(int)
-SWIG_STD_VECTOR_ENHANCED(unsigned int)
-SWIG_STD_VECTOR_ENHANCED(long)
-SWIG_STD_VECTOR_ENHANCED(unsigned long)
-SWIG_STD_VECTOR_ENHANCED(long long)
-SWIG_STD_VECTOR_ENHANCED(unsigned long long)
-SWIG_STD_VECTOR_ENHANCED(float)
-SWIG_STD_VECTOR_ENHANCED(double)
-SWIG_STD_VECTOR_ENHANCED(std::string) // also requires a %include <std_string.i>
-SWIG_STD_VECTOR_ENHANCED(std::wstring) // also requires a %include <std_wstring.i>
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/std_wstring.i b/dependencies2013/win32/swig/Lib/csharp/std_wstring.i
deleted file mode 100644
index 09bdaaaa..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/std_wstring.i
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_wstring.i
- *
- * Typemaps for std::wstring and const std::wstring&
- * These are mapped to a C# String and are passed around by value.
- *
- * To use non-const std::wstring references use the following %apply.  Note 
- * that they are passed by value.
- * %apply const std::wstring & {std::wstring &};
- * ----------------------------------------------------------------------------- */
-
-%include <wchar.i>
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-%naturalvar wstring;
-
-class wstring;
-
-// wstring
-%typemap(ctype, out="void *") wstring "wchar_t *"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]") wstring "string"
-%typemap(cstype) wstring "string"
-%typemap(csdirectorin) wstring "$iminput"
-%typemap(csdirectorout) wstring "$cscall"
-
-%typemap(in, canthrow=1) wstring 
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null wstring", 0);
-    return $null;
-   }
-   $1.assign($input); %}
-%typemap(out) wstring %{ $result = SWIG_csharp_wstring_callback($1.c_str()); %}
-
-%typemap(directorout, canthrow=1) wstring 
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null wstring", 0);
-    return $null;
-   }
-   $result.assign($input); %}
-
-%typemap(directorin) wstring %{ $input = SWIG_csharp_wstring_callback($1.c_str()); %}
-
-%typemap(csin) wstring "$csinput"
-%typemap(csout, excode=SWIGEXCODE) wstring {
-    string ret = $imcall;$excode
-    return ret;
-  }
-
-%typemap(typecheck) wstring = wchar_t *;
-
-%typemap(throws, canthrow=1) wstring
-%{ std::string message($1.begin(), $1.end());
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, message.c_str());
-   return $null; %}
-
-// const wstring &
-%typemap(ctype, out="void *") const wstring & "wchar_t *"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]") const wstring & "string"  
-%typemap(cstype) const wstring & "string"
-
-%typemap(csdirectorin) const wstring & "$iminput"
-%typemap(csdirectorout) const wstring & "$cscall"
-
-%typemap(in, canthrow=1) const wstring &
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null wstring", 0);
-    return $null;
-   }
-   std::wstring $1_str($input);
-   $1 = &$1_str; %}
-%typemap(out) const wstring & %{ $result = SWIG_csharp_wstring_callback($1->c_str()); %}
-
-%typemap(csin) const wstring & "$csinput"
-%typemap(csout, excode=SWIGEXCODE) const wstring & {
-    string ret = $imcall;$excode
-    return ret;
-  }
-
-%typemap(directorout, canthrow=1, warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const wstring &
-%{ if (!$input) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null wstring", 0);
-    return $null;
-   }
-   /* possible thread/reentrant code problem */
-   static std::wstring $1_str;
-   $1_str = $input;
-   $result = &$1_str; %}
-
-%typemap(directorin) const wstring & %{ $input = SWIG_csharp_wstring_callback($1.c_str()); %}
-
-%typemap(csvarin, excode=SWIGEXCODE2) const wstring & %{
-    set {
-      $imcall;$excode
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) const wstring & %{
-    get {
-      string ret = $imcall;$excode
-      return ret;
-    } %}
-
-%typemap(typecheck) const wstring & = wchar_t *;
-
-%typemap(throws, canthrow=1) const wstring &
-%{ std::string message($1.begin(), $1.end());
-   SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, message.c_str());
-   return $null; %}
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/stl.i b/dependencies2013/win32/swig/Lib/csharp/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/swiginterface.i b/dependencies2013/win32/swig/Lib/csharp/swiginterface.i
deleted file mode 100644
index e5bfd23a..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/swiginterface.i
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swiginterface.i
- *
- * SWIG interface feature and typemaps implementation providing:
- *   %interface
- *   %interface_impl
- *   %interface_custom
- * ----------------------------------------------------------------------------- */
-
-%define INTERFACE_TYPEMAPS(CTYPE...)
-%typemap(cstype) CTYPE "$&csinterfacename"
-%typemap(cstype) CTYPE *, CTYPE [], CTYPE & "$csinterfacename"
-%typemap(cstype) CTYPE *const& "$*csinterfacename"
-%typemap(csin) CTYPE, CTYPE & "$csinput.GetInterfaceCPtr()"
-%typemap(csin) CTYPE *, CTYPE *const&, CTYPE [] "$csinput == null ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : $csinput.GetInterfaceCPtr()"
-%typemap(csout, excode=SWIGEXCODE) CTYPE {
-    $&csclassname ret = new $&csclassname($imcall, true);$excode
-    return ($&csinterfacename)ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CTYPE & {
-    $csclassname ret = new $csclassname($imcall, $owner);$excode
-    return ($csinterfacename)ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CTYPE *, CTYPE [] {
-    global::System.IntPtr cPtr = $imcall;
-    $csclassname ret = (cPtr == global::System.IntPtr.Zero) ? null : new $csclassname(cPtr, $owner);$excode
-    return ($csinterfacename)ret;
-  }
-%typemap(csout, excode=SWIGEXCODE) CTYPE *const& {
-    global::System.IntPtr cPtr = $imcall;
-    $*csclassname ret = (cPtr == global::System.IntPtr.Zero) ? null : new $*csclassname(cPtr, $owner);$excode
-    return ($*csinterfacename)ret;
-  }
-%typemap(csdirectorin) CTYPE "($&csinterfacename)new $&csclassname($iminput, true)"
-%typemap(csdirectorin) CTYPE & "($csinterfacename)new $csclassname($iminput, false)"
-%typemap(csdirectorin) CTYPE *, CTYPE [] "($iminput == global::System.IntPtr.Zero) ? null : ($csinterfacename)new $csclassname($iminput, false)"
-%typemap(csdirectorin) CTYPE *const& "($iminput == global::System.IntPtr.Zero) ? null : ($*csinterfacename)new $*csclassname($iminput, false)"
-%typemap(csdirectorout) CTYPE, CTYPE *, CTYPE *const&, CTYPE [], CTYPE & "$cscall.GetInterfaceCPtr()"
-%typemap(csinterfacecode, declaration="  [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]\n  global::System.Runtime.InteropServices.HandleRef GetInterfaceCPtr();\n", cptrmethod="$interfacename_GetInterfaceCPtr") CTYPE %{
-  [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-  global::System.Runtime.InteropServices.HandleRef $interfacename.GetInterfaceCPtr() {
-    return new global::System.Runtime.InteropServices.HandleRef(this, $imclassname.$csclazzname$interfacename_GetInterfaceCPtr(swigCPtr.Handle));
-  }
-%}
-%enddef
-
-%define %interface(CTYPE...)
-%feature("interface", name="%sSwigInterface") CTYPE;
-INTERFACE_TYPEMAPS(CTYPE)
-%enddef
-
-%define %interface_impl(CTYPE...)
-%rename("%sSwigImpl") CTYPE;
-%feature("interface", name="%(rstrip:[SwigImpl])s") CTYPE;
-INTERFACE_TYPEMAPS(CTYPE)
-%enddef
-
-%define %interface_custom(PROXY, INTERFACE, CTYPE...)
-%rename(PROXY) CTYPE;
-%feature("interface", name=INTERFACE) CTYPE;
-INTERFACE_TYPEMAPS(CTYPE)
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/swigtype_inout.i b/dependencies2013/win32/swig/Lib/csharp/swigtype_inout.i
deleted file mode 100644
index e7312e8f..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/swigtype_inout.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swigtype_inout.i
- *
- * Pointer pointer and pointer reference handling typemap library for non-primitive types
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointer references and pointer to pointers.
- *
- * These are named typemaps (OUTPUT) and can be used like any named typemap.
- * Alternatively they can be made the default by using %apply:
- *   %apply SWIGTYPE *& OUTPUT { SWIGTYPE *& }
- * ----------------------------------------------------------------------------- */
-
-/*
- * OUTPUT typemaps. Example usage wrapping:
- *
- *   void f(XXX *& x) { x = new XXX(111); }
- *
- * would be:
- *
- *   XXX x = null;
- *   f(out x);
- *   // use x
- *   x.Dispose(); // manually clear memory or otherwise leave out and leave it to the garbage collector
- */
-%typemap(ctype) SWIGTYPE *& OUTPUT "void **"
-%typemap(imtype, out="global::System.IntPtr") SWIGTYPE *& OUTPUT "out global::System.IntPtr"
-%typemap(cstype) SWIGTYPE *& OUTPUT "out $*csclassname"
-%typemap(csin,
-         pre="    global::System.IntPtr cPtr_$csinput = global::System.IntPtr.Zero;",
-         post="      $csinput = (cPtr_$csinput == global::System.IntPtr.Zero) ? null : new $*csclassname(cPtr_$csinput, true);",
-         cshin="out $csinput") SWIGTYPE *& OUTPUT "out cPtr_$csinput"
-%typemap(in) SWIGTYPE *& OUTPUT %{ $1 = ($1_ltype)$input; %}
-%typemap(freearg) SWIGTYPE *& OUTPUT ""
diff --git a/dependencies2013/win32/swig/Lib/csharp/typemaps.i b/dependencies2013/win32/swig/Lib/csharp/typemaps.i
deleted file mode 100644
index b6f9bddb..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/typemaps.i
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer and reference handling typemap library
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers and C++ references.
- * ----------------------------------------------------------------------------- */
-
-/*
-INPUT typemaps
---------------
-
-These typemaps are used for pointer/reference parameters that are input only
-and are mapped to a C# input parameter.
-
-The following typemaps can be applied to turn a pointer or reference into a simple
-input value.  That is, instead of passing a pointer or reference to an object,
-you would use a real value instead.
-
-        bool               *INPUT, bool               &INPUT
-        signed char        *INPUT, signed char        &INPUT
-        unsigned char      *INPUT, unsigned char      &INPUT
-        short              *INPUT, short              &INPUT
-        unsigned short     *INPUT, unsigned short     &INPUT
-        int                *INPUT, int                &INPUT
-        unsigned int       *INPUT, unsigned int       &INPUT
-        long               *INPUT, long               &INPUT
-        unsigned long      *INPUT, unsigned long      &INPUT
-        long long          *INPUT, long long          &INPUT
-        unsigned long long *INPUT, unsigned long long &INPUT
-        float              *INPUT, float              &INPUT
-        double             *INPUT, double             &INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-In C# you could then use it like this:
-        double answer = modulename.fadd(10.0, 20.0);
-*/
-
-%define INPUT_TYPEMAP(TYPE, CTYPE, CSTYPE)
-%typemap(ctype, out="void *") TYPE *INPUT, TYPE &INPUT "CTYPE"
-%typemap(imtype, out="global::System.IntPtr") TYPE *INPUT, TYPE &INPUT "CSTYPE"
-%typemap(cstype, out="$csclassname") TYPE *INPUT, TYPE &INPUT "CSTYPE"
-%typemap(csin) TYPE *INPUT, TYPE &INPUT "$csinput"
-
-%typemap(in) TYPE *INPUT, TYPE &INPUT
-%{ $1 = ($1_ltype)&$input; %}
-
-%typemap(typecheck) TYPE *INPUT = TYPE;
-%typemap(typecheck) TYPE &INPUT = TYPE;
-%enddef
-
-INPUT_TYPEMAP(bool,               unsigned int,         bool)
-//INPUT_TYPEMAP(char,               char,                 char)
-INPUT_TYPEMAP(signed char,        signed char,          sbyte)
-INPUT_TYPEMAP(unsigned char,      unsigned char,        byte)
-INPUT_TYPEMAP(short,              short,                short)
-INPUT_TYPEMAP(unsigned short,     unsigned short,       ushort)
-INPUT_TYPEMAP(int,                int,                  int)
-INPUT_TYPEMAP(unsigned int,       unsigned int,         uint)
-INPUT_TYPEMAP(long,               long,                 int)
-INPUT_TYPEMAP(unsigned long,      unsigned long,        uint)
-INPUT_TYPEMAP(long long,          long long,            long)
-INPUT_TYPEMAP(unsigned long long, unsigned long long,   ulong)
-INPUT_TYPEMAP(float,              float,                float)
-INPUT_TYPEMAP(double,             double,               double)
-
-#undef INPUT_TYPEMAP
-
-/*
-OUTPUT typemaps
----------------
-
-These typemaps are used for pointer/reference parameters that are output only and
-are mapped to a C# output parameter.
-
-The following typemaps can be applied to turn a pointer or reference into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned. In C#, the 'out' keyword is
-used when passing the parameter to a function that takes an output parameter.
-
-        bool               *OUTPUT, bool               &OUTPUT
-        signed char        *OUTPUT, signed char        &OUTPUT
-        unsigned char      *OUTPUT, unsigned char      &OUTPUT
-        short              *OUTPUT, short              &OUTPUT
-        unsigned short     *OUTPUT, unsigned short     &OUTPUT
-        int                *OUTPUT, int                &OUTPUT
-        unsigned int       *OUTPUT, unsigned int       &OUTPUT
-        long               *OUTPUT, long               &OUTPUT
-        unsigned long      *OUTPUT, unsigned long      &OUTPUT
-        long long          *OUTPUT, long long          &OUTPUT
-        unsigned long long *OUTPUT, unsigned long long &OUTPUT
-        float              *OUTPUT, float              &OUTPUT
-        double             *OUTPUT, double             &OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters):
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The C# output of the function would be the function return value and the 
-value returned in the second output parameter. In C# you would use it like this:
-
-    double dptr;
-    double fraction = modulename.modf(5, out dptr);
-*/
-
-%define OUTPUT_TYPEMAP(TYPE, CTYPE, CSTYPE, TYPECHECKPRECEDENCE)
-%typemap(ctype, out="void *") TYPE *OUTPUT, TYPE &OUTPUT "CTYPE *"
-%typemap(imtype, out="global::System.IntPtr") TYPE *OUTPUT, TYPE &OUTPUT "out CSTYPE"
-%typemap(cstype, out="$csclassname") TYPE *OUTPUT, TYPE &OUTPUT "out CSTYPE"
-%typemap(csin) TYPE *OUTPUT, TYPE &OUTPUT "out $csinput"
-
-%typemap(in) TYPE *OUTPUT, TYPE &OUTPUT
-%{ $1 = ($1_ltype)$input; %}
-
-%typecheck(SWIG_TYPECHECK_##TYPECHECKPRECEDENCE) TYPE *OUTPUT, TYPE &OUTPUT ""
-%enddef
-
-OUTPUT_TYPEMAP(bool,               unsigned int,         bool,     BOOL_PTR)
-//OUTPUT_TYPEMAP(char,               char,                 char,     CHAR_PTR)
-OUTPUT_TYPEMAP(signed char,        signed char,          sbyte,    INT8_PTR)
-OUTPUT_TYPEMAP(unsigned char,      unsigned char,        byte,     UINT8_PTR)
-OUTPUT_TYPEMAP(short,              short,                short,    INT16_PTR)
-OUTPUT_TYPEMAP(unsigned short,     unsigned short,       ushort,   UINT16_PTR)
-OUTPUT_TYPEMAP(int,                int,                  int,      INT32_PTR)
-OUTPUT_TYPEMAP(unsigned int,       unsigned int,         uint,     UINT32_PTR)
-OUTPUT_TYPEMAP(long,               long,                 int,      INT32_PTR)
-OUTPUT_TYPEMAP(unsigned long,      unsigned long,        uint,     UINT32_PTR)
-OUTPUT_TYPEMAP(long long,          long long,            long,     INT64_PTR)
-OUTPUT_TYPEMAP(unsigned long long, unsigned long long,   ulong,    UINT64_PTR)
-OUTPUT_TYPEMAP(float,              float,                float,    FLOAT_PTR)
-OUTPUT_TYPEMAP(double,             double,               double,   DOUBLE_PTR)
-
-#undef OUTPUT_TYPEMAP
-
-%typemap(in) bool *OUTPUT, bool &OUTPUT
-%{ *$input = 0; 
-   $1 = ($1_ltype)$input; %}
-
-
-/*
-INOUT typemaps
---------------
-
-These typemaps are for pointer/reference parameters that are both input and
-output and are mapped to a C# reference parameter.
-
-The following typemaps can be applied to turn a pointer or reference into a
-reference parameters, that is the parameter is both an input and an output.
-In C#, the 'ref' keyword is used for reference parameters.
-
-        bool               *INOUT, bool               &INOUT
-        signed char        *INOUT, signed char        &INOUT
-        unsigned char      *INOUT, unsigned char      &INOUT
-        short              *INOUT, short              &INOUT
-        unsigned short     *INOUT, unsigned short     &INOUT
-        int                *INOUT, int                &INOUT
-        unsigned int       *INOUT, unsigned int       &INOUT
-        long               *INOUT, long               &INOUT
-        unsigned long      *INOUT, unsigned long      &INOUT
-        long long          *INOUT, long long          &INOUT
-        unsigned long long *INOUT, unsigned long long &INOUT
-        float              *INOUT, float              &INOUT
-        double             *INOUT, double             &INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-The C# output of the function would be the new value returned by the 
-reference parameter. In C# you would use it like this:
-
-
-       double x = 5.0;
-       neg(ref x);
-
-The implementation of the OUTPUT and INOUT typemaps is different to the scripting
-languages in that the scripting languages will return the output value as part 
-of the function return value.
-
-*/
-
-%define INOUT_TYPEMAP(TYPE, CTYPE, CSTYPE, TYPECHECKPRECEDENCE)
-%typemap(ctype, out="void *") TYPE *INOUT, TYPE &INOUT "CTYPE *"
-%typemap(imtype, out="global::System.IntPtr") TYPE *INOUT, TYPE &INOUT "ref CSTYPE"
-%typemap(cstype, out="$csclassname") TYPE *INOUT, TYPE &INOUT "ref CSTYPE"
-%typemap(csin) TYPE *INOUT, TYPE &INOUT "ref $csinput"
-
-%typemap(in) TYPE *INOUT, TYPE &INOUT
-%{ $1 = ($1_ltype)$input; %}
-
-%typecheck(SWIG_TYPECHECK_##TYPECHECKPRECEDENCE) TYPE *INOUT, TYPE &INOUT ""
-%enddef
-
-INOUT_TYPEMAP(bool,               unsigned int,         bool,     BOOL_PTR)
-//INOUT_TYPEMAP(char,               char,                 char,     CHAR_PTR)
-INOUT_TYPEMAP(signed char,        signed char,          sbyte,    INT8_PTR)
-INOUT_TYPEMAP(unsigned char,      unsigned char,        byte,     UINT8_PTR)
-INOUT_TYPEMAP(short,              short,                short,    INT16_PTR)
-INOUT_TYPEMAP(unsigned short,     unsigned short,       ushort,   UINT16_PTR)
-INOUT_TYPEMAP(int,                int,                  int,      INT32_PTR)
-INOUT_TYPEMAP(unsigned int,       unsigned int,         uint,     UINT32_PTR)
-INOUT_TYPEMAP(long,               long,                 int,      INT32_PTR)
-INOUT_TYPEMAP(unsigned long,      unsigned long,        uint,     UINT32_PTR)
-INOUT_TYPEMAP(long long,          long long,            long,     INT64_PTR)
-INOUT_TYPEMAP(unsigned long long, unsigned long long,   ulong,    UINT64_PTR)
-INOUT_TYPEMAP(float,              float,                float,    FLOAT_PTR)
-INOUT_TYPEMAP(double,             double,               double,   DOUBLE_PTR)
-
-#undef INOUT_TYPEMAP
-
diff --git a/dependencies2013/win32/swig/Lib/csharp/wchar.i b/dependencies2013/win32/swig/Lib/csharp/wchar.i
deleted file mode 100644
index 9361edf6..00000000
--- a/dependencies2013/win32/swig/Lib/csharp/wchar.i
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -----------------------------------------------------------------------------
- * wchar.i
- *
- * Typemaps for the wchar_t type
- * These are mapped to a C# String and are passed around by value.
- *
- * Support code for wide strings can be turned off by defining SWIG_CSHARP_NO_WSTRING_HELPER
- *
- * ----------------------------------------------------------------------------- */
-
-#if !defined(SWIG_CSHARP_NO_WSTRING_HELPER)
-#if !defined(SWIG_CSHARP_WSTRING_HELPER_)
-#define SWIG_CSHARP_WSTRING_HELPER_
-%insert(runtime) %{
-/* Callback for returning strings to C# without leaking memory */
-typedef void * (SWIGSTDCALL* SWIG_CSharpWStringHelperCallback)(const wchar_t *);
-static SWIG_CSharpWStringHelperCallback SWIG_csharp_wstring_callback = NULL;
-%}
-
-%pragma(csharp) imclasscode=%{
-  protected class SWIGWStringHelper {
-
-    public delegate string SWIGWStringDelegate(global::System.IntPtr message);
-    static SWIGWStringDelegate wstringDelegate = new SWIGWStringDelegate(CreateWString);
-
-    [global::System.Runtime.InteropServices.DllImport("$dllimport", EntryPoint="SWIGRegisterWStringCallback_$module")]
-    public static extern void SWIGRegisterWStringCallback_$module(SWIGWStringDelegate wstringDelegate);
-
-    static string CreateWString([global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]global::System.IntPtr cString) {
-      return global::System.Runtime.InteropServices.Marshal.PtrToStringUni(cString);
-    }
-
-    static SWIGWStringHelper() {
-      SWIGRegisterWStringCallback_$module(wstringDelegate);
-    }
-  }
-
-  static protected SWIGWStringHelper swigWStringHelper = new SWIGWStringHelper();
-%}
-
-%insert(runtime) %{
-#ifdef __cplusplus
-extern "C"
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStringHelperCallback callback) {
-  SWIG_csharp_wstring_callback = callback;
-}
-%}
-#endif // SWIG_CSHARP_WSTRING_HELPER_
-#endif // SWIG_CSHARP_NO_WSTRING_HELPER
-
-
-// wchar_t
-%typemap(ctype) wchar_t "wchar_t"
-%typemap(imtype) wchar_t "char"
-%typemap(cstype) wchar_t "char"
-
-%typemap(csin) wchar_t "$csinput"
-%typemap(csout, excode=SWIGEXCODE) wchar_t {
-    char ret = $imcall;$excode
-    return ret;
-  }
-%typemap(csvarin, excode=SWIGEXCODE2) wchar_t %{
-    set {
-      $imcall;$excode
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) wchar_t %{
-    get {
-      char ret = $imcall;$excode
-      return ret;
-    } %}
-
-%typemap(in) wchar_t %{ $1 = ($1_ltype)$input; %}
-%typemap(out) wchar_t %{ $result = (wchar_t)$1; %}
-
-%typemap(typecheck) wchar_t = char;
-
-// wchar_t *
-%typemap(ctype) wchar_t * "wchar_t *"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]", out="global::System.IntPtr" ) wchar_t * "string"
-%typemap(cstype) wchar_t * "string"
-
-%typemap(csin) wchar_t * "$csinput"
-%typemap(csout, excode=SWIGEXCODE) wchar_t * {
-    string ret = global::System.Runtime.InteropServices.Marshal.PtrToStringUni($imcall);$excode
-    return ret;
-  }
-%typemap(csvarin, excode=SWIGEXCODE2) wchar_t * %{
-    set {
-      $imcall;$excode
-    } %}
-%typemap(csvarout, excode=SWIGEXCODE2) wchar_t * %{
-    get {
-      string ret = $imcall;$excode
-      return ret;
-    } %}
-
-%typemap(in) wchar_t * %{ $1 = ($1_ltype)$input; %}
-%typemap(out) wchar_t * %{ $result = (wchar_t *)$1; %}
-
-%typemap(typecheck) wchar_t * = char *;
-
diff --git a/dependencies2013/win32/swig/Lib/cstring.i b/dependencies2013/win32/swig/Lib/cstring.i
deleted file mode 100644
index 6829f759..00000000
--- a/dependencies2013/win32/swig/Lib/cstring.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cstring.i
- * ----------------------------------------------------------------------------- */
-
-%echo "cstring.i not implemented for this target"
-#define SWIG_CSTRING_UNIMPL
-
-/* old name keep for compatibility */
-#define _CSTRING_UNIMPL 
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/cwstring.i b/dependencies2013/win32/swig/Lib/cwstring.i
deleted file mode 100644
index f0631d32..00000000
--- a/dependencies2013/win32/swig/Lib/cwstring.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cwstring.i
- * ----------------------------------------------------------------------------- */
-
-%echo "cwstring.i not implemented for this target"
-#define SWIG_CWSTRING_UNIMPL
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/d/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/d/boost_shared_ptr.i
deleted file mode 100644
index 5c171555..00000000
--- a/dependencies2013/win32/swig/Lib/d/boost_shared_ptr.i
+++ /dev/null
@@ -1,201 +0,0 @@
-%include <shared_ptr.i>
-
-%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
-
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor mods
-%feature("unref") TYPE
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ((*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\"))) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-
-// plain value
-%typemap(in, canthrow=1) CONST TYPE ($&1_type argp = 0) %{
-  argp = ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0;
-  if (!argp) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "Attempt to dereference null $1_type");
-    return $null;
-  }
-  $1 = *argp; %}
-%typemap(out) CONST TYPE
-%{ $result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %}
-
-// plain pointer
-%typemap(in, canthrow=1) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  smartarg = (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{
-  $result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-%}
-
-// plain reference
-%typemap(in, canthrow=1) CONST TYPE & %{
-  $1 = ($1_ltype)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0);
-  if (!$1) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "$1_type reference is null");
-    return $null;
-  } %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE &
-%{ $result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// plain pointer by reference
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0)
-%{ temp = (TYPE *)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0);
-   $1 = &temp; %}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST&
-%{ $result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >
-%{ if ($input) $1 = *($&1_ltype)$input; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >
-%{ $result = $1 ? new $1_ltype($1) : 0; %}
-
-// shared_ptr by reference
-%typemap(in, canthrow=1) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & ($*1_ltype tempnull)
-%{ $1 = $input ? ($1_ltype)$input : &tempnull; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &
-%{ $result = *$1 ? new $*1_ltype(*$1) : 0; %}
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * ($*1_ltype tempnull)
-%{ $1 = $input ? ($1_ltype)$input : &tempnull; %}
-%typemap(out, fragment="SWIG_null_deleter") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *
-%{ $result = ($1 && *$1) ? new $*1_ltype(*($1_ltype)$1) : 0;
-   if ($owner) delete $1; %}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempnull, $*1_ltype temp = 0)
-%{ temp = $input ? *($1_ltype)&$input : &tempnull;
-   $1 = &temp; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *&
-%{ *($1_ltype)&$result = (*$1 && **$1) ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0; %}
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (ctype)  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "void *"
-%typemap (imtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "void*"
-%typemap (dtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(dtype, TYPE)"
-
-%typemap(din) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-               SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-               SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-               SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(dtype, TYPE).swigGetCPtr($dinput)"
-
-%typemap(dout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  void* cPtr = $imcall;
-  auto ret = (cPtr is null) ? null : new $typemap(dtype, TYPE)(cPtr, true);$excode
-  return ret;
-}
-%typemap(dout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-  void* cPtr = $imcall;
-  auto ret = (cPtr is null) ? null : new $typemap(dtype, TYPE)(cPtr, true);$excode
-  return ret;
-}
-%typemap(dout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-  void* cPtr = $imcall;
-  auto ret = (cPtr is null) ? null : new $typemap(dtype, TYPE)(cPtr, true);$excode
-  return ret;
-}
-%typemap(dout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  void* cPtr = $imcall;
-  auto ret = (cPtr is null) ? null : new $typemap(dtype, TYPE)(cPtr, true);$excode
-  return ret;
-}
-
-
-%typemap(dout, excode=SWIGEXCODE) CONST TYPE {
-  auto ret = new $typemap(dtype, TYPE)($imcall, true);$excode
-  return ret;
-}
-%typemap(dout, excode=SWIGEXCODE) CONST TYPE & {
-  auto ret = new $typemap(dtype, TYPE)($imcall, true);$excode
-  return ret;
-}
-%typemap(dout, excode=SWIGEXCODE) CONST TYPE * {
-  void* cPtr = $imcall;
-  auto ret = (cPtr is null) ? null : new $typemap(dtype, TYPE)(cPtr, true);$excode
-  return ret;
-}
-%typemap(dout, excode=SWIGEXCODE) TYPE *CONST& {
-  void* cPtr = $imcall;
-  auto ret = (cPtr is null) ? null : new $typemap(dtype, TYPE)(cPtr, true);$excode
-  return ret;
-}
-
-// For shared pointers, both the derived and the base class have to »own« their
-// pointer; otherwise the reference count is not decreased properly on destruction.
-%typemap(dbody) SWIGTYPE %{
-private void* swigCPtr;
-private bool swigCMemOwn;
-
-public this(void* cObject, bool ownCObject) {
-  swigCPtr = cObject;
-  swigCMemOwn = ownCObject;
-}
-
-public static void* swigGetCPtr(typeof(this) obj) {
-  return (obj is null) ? null : obj.swigCPtr;
-}
-%}
-
-%typemap(dbody_derived) SWIGTYPE %{
-private void* swigCPtr;
-private bool swigCMemOwn;
-
-public this(void* cObject, bool ownCObject) {
-  super($imdmodule.$dclazznameSmartPtrUpcast(cObject), ownCObject);
-  swigCPtr = cObject;
-  swigCMemOwn = ownCObject;
-}
-
-public static void* swigGetCPtr(typeof(this) obj) {
-  return (obj is null) ? null : obj.swigCPtr;
-}
-%}
-
-%typemap(ddispose, methodname="dispose", methodmodifiers="public") TYPE {
-  synchronized(this) {
-    if (swigCPtr !is null) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $imcall;
-      }
-      swigCPtr = null;
-    }
-  }
-}
-
-%typemap(ddispose_derived, methodname="dispose", methodmodifiers="public") TYPE {
-  synchronized(this) {
-    if (swigCPtr !is null) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $imcall;
-      }
-      swigCPtr = null;
-      super.dispose();
-    }
-  }
-}
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/d/carrays.i b/dependencies2013/win32/swig/Lib/d/carrays.i
deleted file mode 100644
index f2803ea4..00000000
--- a/dependencies2013/win32/swig/Lib/d/carrays.i
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -----------------------------------------------------------------------------
- * carrays.i
- *
- * D-specific version of ../carrays.i.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * %array_functions(TYPE,NAME)
- *
- * Generates functions for creating and accessing elements of a C array
- * (as pointers).  Creates the following functions:
- *
- *        TYPE *new_NAME(int nelements)
- *        void delete_NAME(TYPE *);
- *        TYPE NAME_getitem(TYPE *, int index);
- *        void NAME_setitem(TYPE *, int index, TYPE value);
- *
- * ----------------------------------------------------------------------------- */
-
-%define %array_functions(TYPE,NAME)
-%{
-static TYPE *new_##NAME(int nelements) { %}
-#ifdef __cplusplus
-%{  return new TYPE[nelements](); %}
-#else
-%{  return (TYPE *) calloc(nelements,sizeof(TYPE)); %}
-#endif
-%{}
-
-static void delete_##NAME(TYPE *ary) { %}
-#ifdef __cplusplus
-%{  delete [] ary; %}
-#else
-%{  free(ary); %}
-#endif
-%{}
-
-static TYPE NAME##_getitem(TYPE *ary, int index) {
-    return ary[index];
-}
-static void NAME##_setitem(TYPE *ary, int index, TYPE value) {
-    ary[index] = value;
-}
-%}
-
-TYPE *new_##NAME(int nelements);
-void delete_##NAME(TYPE *ary);
-TYPE NAME##_getitem(TYPE *ary, int index);
-void NAME##_setitem(TYPE *ary, int index, TYPE value);
-
-%enddef
-
-
-/* -----------------------------------------------------------------------------
- * %array_class(TYPE,NAME)
- *
- * Generates a class wrapper around a C array.  The class has the following
- * interface:
- *
- *          struct NAME {
- *              NAME(int nelements);
- *             ~NAME();
- *              TYPE getitem(int index);
- *              void setitem(int index, TYPE value);
- *              TYPE * ptr();
- *              static NAME *frompointer(TYPE *t);
-  *         }
- *
- * ----------------------------------------------------------------------------- */
-
-%define %array_class(TYPE,NAME)
-%{
-typedef TYPE NAME;
-%}
-
-typedef struct {} NAME;
-
-%extend NAME {
-#ifdef __cplusplus
-  NAME(int nelements) {
-    return new TYPE[nelements]();
-  }
-  ~NAME() {
-    delete [] self;
-  }
-#else
-  NAME(int nelements) {
-    return (TYPE *) calloc(nelements,sizeof(TYPE));
-  }
-  ~NAME() {
-    free(self);
-  }
-#endif
-
-  TYPE getitem(int index) {
-    return self[index];
-  }
-  void setitem(int index, TYPE value) {
-    self[index] = value;
-  }
-  TYPE * ptr() {
-    return self;
-  }
-  static NAME *frompointer(TYPE *t) {
-    return (NAME *) t;
-  }
-};
-
-%types(NAME = TYPE);
-
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/d/cpointer.i b/dependencies2013/win32/swig/Lib/d/cpointer.i
deleted file mode 100644
index 75e610f6..00000000
--- a/dependencies2013/win32/swig/Lib/d/cpointer.i
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cpointer.i
- *
- * D-specific version of ../cpointer.i.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * %pointer_class(type,name)
- *
- * Places a simple proxy around a simple type like 'int', 'float', or whatever.
- * The proxy provides this interface:
- *
- *       class type {
- *       public:
- *           type();
- *          ~type();
- *           type value();
- *           void assign(type value);
- *       };
- *
- * Example:
- *
- *    %pointer_class(int, intp);
- *
- *    int add(int *x, int *y) { return *x + *y; }
- *
- * In python (with proxies)
- *
- *    >>> a = intp()
- *    >>> a.assign(10)
- *    >>> a.value()
- *    10
- *    >>> b = intp()
- *    >>> b.assign(20)
- *    >>> print add(a,b)
- *    30
- *
- * As a general rule, this macro should not be used on class/structures that
- * are already defined in the interface.
- * ----------------------------------------------------------------------------- */
-
-
-%define %pointer_class(TYPE, NAME)
-%{
-typedef TYPE NAME;
-%}
-
-typedef struct {
-} NAME;
-
-%extend NAME {
-#ifdef __cplusplus
-NAME() {
-  return new TYPE();
-}
-~NAME() {
-  if (self) delete self;
-}
-#else
-NAME() {
-  return (TYPE *) calloc(1,sizeof(TYPE));
-}
-~NAME() {
-  if (self) free(self);
-}
-#endif
-}
-
-%extend NAME {
-
-void assign(TYPE value) {
-  *self = value;
-}
-TYPE value() {
-  return *self;
-}
-TYPE * ptr() {
-  return self;
-}
-static NAME * frompointer(TYPE *t) {
-  return (NAME *) t;
-}
-
-}
-
-%types(NAME = TYPE);
-
-%enddef
-
-/* -----------------------------------------------------------------------------
- * %pointer_functions(type,name)
- *
- * Create functions for allocating/deallocating pointers.   This can be used
- * if you don't want to create a proxy class or if the pointer is complex.
- *
- *    %pointer_functions(int, intp)
- *
- *    int add(int *x, int *y) { return *x + *y; }
- *
- * In python (with proxies)
- *
- *    >>> a = copy_intp(10)
- *    >>> intp_value(a)
- *    10
- *    >>> b = new_intp()
- *    >>> intp_assign(b,20)
- *    >>> print add(a,b)
- *    30
- *    >>> delete_intp(a)
- *    >>> delete_intp(b)
- *
- * ----------------------------------------------------------------------------- */
-
-%define %pointer_functions(TYPE,NAME)
-%{
-static TYPE *new_##NAME() { %}
-#ifdef __cplusplus
-%{  return new TYPE(); %}
-#else
-%{  return (TYPE *) calloc(1,sizeof(TYPE)); %}
-#endif
-%{}
-
-static TYPE *copy_##NAME(TYPE value) { %}
-#ifdef __cplusplus
-%{  return new TYPE(value); %}
-#else
-%{  TYPE *self = (TYPE *) calloc(1,sizeof(TYPE));
-  *self = value;
-  return self; %}
-#endif
-%{}
-
-static void delete_##NAME(TYPE *self) { %}
-#ifdef __cplusplus
-%{  if (self) delete self; %}
-#else
-%{  if (self) free(self); %}
-#endif
-%{}
-
-static void NAME ##_assign(TYPE *self, TYPE value) {
-  *self = value;
-}
-
-static TYPE NAME ##_value(TYPE *self) {
-  return *self;
-}
-%}
-
-TYPE *new_##NAME();
-TYPE *copy_##NAME(TYPE value);
-void  delete_##NAME(TYPE *self);
-void  NAME##_assign(TYPE *self, TYPE value);
-TYPE  NAME##_value(TYPE *self);
-
-%enddef
-
-/* -----------------------------------------------------------------------------
- * %pointer_cast(type1,type2,name)
- *
- * Generates a pointer casting function.
- * ----------------------------------------------------------------------------- */
-
-%define %pointer_cast(TYPE1,TYPE2,NAME)
-%inline %{
-TYPE2 NAME(TYPE1 x) {
-   return (TYPE2) x;
-}
-%}
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/d/d.swg b/dependencies2013/win32/swig/Lib/d/d.swg
deleted file mode 100644
index f5bb4596..00000000
--- a/dependencies2013/win32/swig/Lib/d/d.swg
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -----------------------------------------------------------------------------
- * d.swg
- *
- * Main library file for the D language module. See the D chapter in the SWIG
- * manual for explanation on the typemaps, pragmas, etc. used.
- * ----------------------------------------------------------------------------- */
-
-// Typemaps for exception handling.
-%include <dexception.swg>
-
-// Typemaps for primitive types.
-%include <dprimitives.swg>
-
-// Typemaps for non-primitive types (C/C++ classes and structs).
-%include <dswigtype.swg>
-
-// Typemaps for enumeration types.
-%include <denums.swg>
-
-// Typemaps for member function pointers.
-%include <dmemberfunctionpointers.swg>
-
-// Typemaps for wrapping pointers to/arrays of C chars as D strings.
-%include <dstrings.swg>
-
-// Typemaps for handling void function return types and empty parameter lists.
-%include <dvoid.swg>
-
-// Typemaps containing D code used when generating D proxy classes.
-%include <dclassgen.swg>
-
-// Mapping of C++ operator overloading methods to D.
-%include <doperators.swg>
-
-// Helper code string and exception handling.
-%include <dhead.swg>
-
-// Wrapper loader code for dynamically linking the C wrapper library from the D
-// wrapper module.
-%include <wrapperloader.swg>
-
-// List of all reserved D keywords.
-%include <dkw.swg>
-
-// D-specific directives.
-%include <ddirectives.swg>
diff --git a/dependencies2013/win32/swig/Lib/d/dclassgen.swg b/dependencies2013/win32/swig/Lib/d/dclassgen.swg
deleted file mode 100644
index 68910b41..00000000
--- a/dependencies2013/win32/swig/Lib/d/dclassgen.swg
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dclassgen.swg
- *
- * Typemaps containing D code used when generating D proxy classes.
- * ----------------------------------------------------------------------------- */
-
-%typemap(dbase)               SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(dclassmodifiers)     SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) "class"
-%typemap(dcode)               SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(dimports)            SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(dinterfaces)         SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(dinterfaces_derived) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-
-// See <denums.swg>.
-%typemap(dclassmodifiers) enum SWIGTYPE "enum"
-%typemap(dcode) enum SWIGTYPE ""
-
-
-/*
- * Proxy classes.
- */
-
-%typemap(dconstructor, excode=SWIGEXCODE,directorconnect="\n  swigDirectorConnect();") SWIGTYPE {
-  this($imcall, true);$excode$directorconnect
-}
-
-%typemap(ddestructor) SWIGTYPE %{
-~this() {
-  dispose();
-}
-%}
-
-// We do not use »override« attribute for generated dispose() methods to stay
-// somewhat compatible to Phobos and older Tango versions where Object.dispose()
-// does not exist.
-%typemap(ddispose, methodname="dispose", methodmodifiers="public") SWIGTYPE {
-  synchronized(this) {
-    if (swigCPtr !is null) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $imcall;
-      }
-      swigCPtr = null;
-    }
-  }
-}
-
-%typemap(ddispose_derived, methodname="dispose", methodmodifiers="public") SWIGTYPE {
-  synchronized(this) {
-    if (swigCPtr !is null) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $imcall;
-      }
-      swigCPtr = null;
-      super.dispose();
-    }
-  }
-}
-
-
-// Unfortunately, the »package« visibility attribute does not work in D when the
-// module in question is in the root package (happens if no -package is specified
-// at the SWIG command line), so we are stuck with public visibility for
-// swigGetCPtr().
-%typemap(dbody) SWIGTYPE %{
-private void* swigCPtr;
-protected bool swigCMemOwn;
-
-public this(void* cObject, bool ownCObject) {
-  swigCPtr = cObject;
-  swigCMemOwn = ownCObject;
-}
-
-public static void* swigGetCPtr(typeof(this) obj) {
-  return (obj is null) ? null : obj.swigCPtr;
-}
-
-mixin $imdmodule.SwigOperatorDefinitions;
-%}
-
-
-%typemap(dbody_derived) SWIGTYPE %{
-private void* swigCPtr;
-
-public this(void* cObject, bool ownCObject) {
-  super($imdmodule.$dclazznameUpcast(cObject), ownCObject);
-  swigCPtr = cObject;
-}
-
-public static void* swigGetCPtr(typeof(this) obj) {
-  return (obj is null) ? null : obj.swigCPtr;
-}
-
-mixin $imdmodule.SwigOperatorDefinitions;
-%}
-
-
-/*
- * Type wrapper classes.
- */
-
-%typemap(dbody) SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] %{
-private void* swigCPtr;
-
-public this(void* cObject, bool futureUse) {
-  swigCPtr = cObject;
-}
-
-protected this() {
-  swigCPtr = null;
-}
-
-public static void* swigGetCPtr(typeof(this) obj) {
-  return (obj is null) ? null : obj.swigCPtr;
-}
-
-mixin $imdmodule.SwigOperatorDefinitions;
-%}
-
-
-/*
- * Member function pointer wrapper classes (see <dmemberfunctionpointers.swg>).
- */
-
-%typemap(dbody) SWIGTYPE (CLASS::*) %{
-private char* swigCPtr;
-
-public this(char* cMemberPtr, bool futureUse) {
-  swigCPtr = cMemberPtr;
-}
-
-protected this() {
-  swigCPtr = null;
-}
-
-package static char* swigGetCMemberPtr(typeof(this) obj) {
-  return (obj is null) ? null : obj.swigCPtr;
-}
-
-mixin $imdmodule.SwigOperatorDefinitions;
-%}
diff --git a/dependencies2013/win32/swig/Lib/d/ddirectives.swg b/dependencies2013/win32/swig/Lib/d/ddirectives.swg
deleted file mode 100644
index 145cf01f..00000000
--- a/dependencies2013/win32/swig/Lib/d/ddirectives.swg
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ddirectives.swg
- *
- * D-specifiv directives.
- * ----------------------------------------------------------------------------- */
-
-#define %dmanifestconst             %feature("d:manifestconst")
-#define %dconstvalue(value)         %feature("d:constvalue",value)
-#define %dmethodmodifiers           %feature("d:methodmodifiers")
-#define %dnothrowexception          %feature("except")
-#define %proxycode                  %insert("proxycode")
diff --git a/dependencies2013/win32/swig/Lib/d/denums.swg b/dependencies2013/win32/swig/Lib/d/denums.swg
deleted file mode 100644
index 3f812466..00000000
--- a/dependencies2013/win32/swig/Lib/d/denums.swg
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -----------------------------------------------------------------------------
- * denums.swg
- *
- * Typemaps for enumerations.
- * ----------------------------------------------------------------------------- */
-
-
-/*
- * Typemaps for enumeration types.
- */
-
-%typemap(ctype) enum SWIGTYPE "int"
-%typemap(imtype) enum SWIGTYPE "int"
-%typemap(dtype, cprimitive="1") enum SWIGTYPE "$dclassname"
-
-%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
-
-%typemap(in) enum SWIGTYPE %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE %{ $result = (int)$1; %}
-
-%typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) enum SWIGTYPE "$input = (int)$1;"
-%typemap(ddirectorin) enum SWIGTYPE "cast($dclassname)$winput"
-%typemap(ddirectorout) enum SWIGTYPE "cast(int)$dcall"
-
-%typemap(din) enum SWIGTYPE "cast(int)$dinput"
-%typemap(dout, excode=SWIGEXCODE) enum SWIGTYPE {
-  $dclassname ret = cast($dclassname)$imcall;$excode
-  return ret;
-}
-
-
-/*
- * Typemaps for (const) references to enumeration types.
- */
-
-%typemap(ctype) const enum SWIGTYPE & "int"
-%typemap(imtype) const enum SWIGTYPE & "int"
-%typemap(dtype) const enum SWIGTYPE & "$*dclassname"
-
-%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input;
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE & %{ $result = (int)*$1; %}
-
-%typemap(directorin) const enum SWIGTYPE & "$input = (int)$1;"
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input;
-   $result = &temp; %}
-
-%typemap(ddirectorin) const enum SWIGTYPE & "cast($*dclassname)$winput"
-%typemap(ddirectorout) const enum SWIGTYPE & "cast(int)$dcall"
-
-%typemap(din) const enum SWIGTYPE & "cast(int)$dinput"
-%typemap(dout, excode=SWIGEXCODE) const enum SWIGTYPE & {
-  $*dclassname ret = cast($*dclassname)$imcall;$excode
-  return ret;
-}
diff --git a/dependencies2013/win32/swig/Lib/d/dexception.swg b/dependencies2013/win32/swig/Lib/d/dexception.swg
deleted file mode 100644
index 1aadbaad..00000000
--- a/dependencies2013/win32/swig/Lib/d/dexception.swg
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dexception.swg
- *
- * Typemaps used for propagating C++ exceptions to D.
- * ----------------------------------------------------------------------------- */
-
-// Code which is inserted into the dout typemaps and class constructors via
-// excode if exceptions can be thrown.
-%define SWIGEXCODE "\n  if ($imdmodule.SwigPendingException.isPending) throw $imdmodule.SwigPendingException.retrieve();" %enddef
-
-%typemap(throws, canthrow=1) int,
-                 long,
-                 short,
-                 unsigned int,
-                 unsigned long,
-                 unsigned short
-%{ char error_msg[256];
-   sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
-   SWIG_DSetPendingException(SWIG_DException, error_msg);
-   return $null; %}
-
-%typemap(throws, canthrow=1) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY],
-  enum SWIGTYPE, const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_DSetPendingException(SWIG_DException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(throws, canthrow=1) char *
-%{ SWIG_DSetPendingException(SWIG_DException, $1);
-   return $null; %}
diff --git a/dependencies2013/win32/swig/Lib/d/dhead.swg b/dependencies2013/win32/swig/Lib/d/dhead.swg
deleted file mode 100644
index 50e9c2e8..00000000
--- a/dependencies2013/win32/swig/Lib/d/dhead.swg
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dhead.swg
- *
- * Support code for exceptions if the SWIG_D_NO_EXCEPTION_HELPER is not defined
- * Support code for strings if the SWIG_D_NO_STRING_HELPER is not defined
- *
- * Support code for function pointers. ----------------------------------------------------------------------------- */
-
-%insert(runtime) %{
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-/* Contract support. */
-#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_DSetPendingException(SWIG_DException, msg); return nullreturn; } else
-%}
-
-
-/*
- * Exception support code.
- */
-
-#if !defined(SWIG_D_NO_EXCEPTION_HELPER)
-%insert(runtime) %{
-// Support for throwing D exceptions from C/C++.
-typedef enum {
-  SWIG_DException = 0,
-  SWIG_DIllegalArgumentException,
-  SWIG_DIllegalElementException,
-  SWIG_DIOException,
-  SWIG_DNoSuchElementException
-} SWIG_DExceptionCodes;
-
-typedef void (* SWIG_DExceptionCallback_t)(const char *);
-
-typedef struct {
-  SWIG_DExceptionCodes code;
-  SWIG_DExceptionCallback_t callback;
-} SWIG_DException_t;
-
-static SWIG_DException_t SWIG_d_exceptions[] = {
-  { SWIG_DException, NULL },
-  { SWIG_DIllegalArgumentException, NULL },
-  { SWIG_DIllegalElementException, NULL },
-  { SWIG_DIOException, NULL },
-  { SWIG_DNoSuchElementException, NULL }
-};
-
-static void SWIGUNUSED SWIG_DSetPendingException(SWIG_DExceptionCodes code, const char *msg) {
-  if ((size_t)code < sizeof(SWIG_d_exceptions)/sizeof(SWIG_DException_t)) {
-    SWIG_d_exceptions[code].callback(msg);
-  } else {
-    SWIG_d_exceptions[SWIG_DException].callback(msg);
-  }
-}
-
-#ifdef __cplusplus
-extern "C"
-#endif
-SWIGEXPORT void SWIGRegisterExceptionCallbacks_$module(
-  SWIG_DExceptionCallback_t exceptionCallback,
-  SWIG_DExceptionCallback_t illegalArgumentCallback,
-  SWIG_DExceptionCallback_t illegalElementCallback,
-  SWIG_DExceptionCallback_t ioCallback,
-  SWIG_DExceptionCallback_t noSuchElementCallback) {
-  SWIG_d_exceptions[SWIG_DException].callback = exceptionCallback;
-  SWIG_d_exceptions[SWIG_DIllegalArgumentException].callback = illegalArgumentCallback;
-  SWIG_d_exceptions[SWIG_DIllegalElementException].callback = illegalElementCallback;
-  SWIG_d_exceptions[SWIG_DIOException].callback = ioCallback;
-  SWIG_d_exceptions[SWIG_DNoSuchElementException].callback = noSuchElementCallback;
-}
-%}
-
-#if (SWIG_D_VERSION == 1)
-%pragma(d) imdmoduleimports=%{
-// Exception throwing support currently requires Tango, but there is no reason
-// why it could not support Phobos.
-static import tango.core.Exception;
-static import tango.core.Thread;
-static import tango.stdc.stringz;
-%}
-
-%pragma(d) imdmodulecode=%{
-private class SwigExceptionHelper {
-  static this() {
-    swigRegisterExceptionCallbacks$module(
-      &setException,
-      &setIllegalArgumentException,
-      &setIllegalElementException,
-      &setIOException,
-      &setNoSuchElementException);
-  }
-
-  static void setException(char* message) {
-    auto exception = new object.Exception(tango.stdc.stringz.fromStringz(message).dup);
-    SwigPendingException.set(exception);
-  }
-
-  static void setIllegalArgumentException(char* message) {
-    auto exception = new tango.core.Exception.IllegalArgumentException(tango.stdc.stringz.fromStringz(message).dup);
-    SwigPendingException.set(exception);
-  }
-
-  static void setIllegalElementException(char* message) {
-    auto exception = new tango.core.Exception.IllegalElementException(tango.stdc.stringz.fromStringz(message).dup);
-    SwigPendingException.set(exception);
-  }
-
-  static void setIOException(char* message) {
-    auto exception = new tango.core.Exception.IOException(tango.stdc.stringz.fromStringz(message).dup);
-    SwigPendingException.set(exception);
-  }
-
-  static void setNoSuchElementException(char* message) {
-    auto exception = new tango.core.Exception.NoSuchElementException(tango.stdc.stringz.fromStringz(message).dup);
-    SwigPendingException.set(exception);
-  }
-}
-
-package class SwigPendingException {
-public:
-  static this() {
-    m_sPendingException = new ThreadLocalData(null);
-  }
-
-  static bool isPending() {
-    return m_sPendingException.val !is null;
-  }
-
-  static void set(object.Exception e) {
-    auto pending = m_sPendingException.val;
-    if (pending !is null) {
-      e.next = pending;
-      throw new object.Exception("FATAL: An earlier pending exception from C/C++ " ~
-        "code was missed and thus not thrown (" ~ pending.classinfo.name ~ ": " ~
-        pending.msg ~ ")!", e);
-    }
-    m_sPendingException.val = e;
-  }
-
-  static object.Exception retrieve() {
-    auto e = m_sPendingException.val;
-    m_sPendingException.val = null;
-    return e;
-  }
-
-private:
-  // The reference to the pending exception (if any) is stored thread-local.
-  alias tango.core.Thread.ThreadLocal!(object.Exception) ThreadLocalData;
-  static ThreadLocalData m_sPendingException;
-}
-alias void function(char* message) SwigExceptionCallback;
-%}
-#else
-%pragma(d) imdmoduleimports=%{
-static import std.conv;
-%}
-
-%pragma(d) imdmodulecode=%{
-private class SwigExceptionHelper {
-  static this() {
-	// The D1/Tango version maps C++ exceptions to multiple exception types.
-    swigRegisterExceptionCallbacks$module(
-      &setException,
-      &setException,
-      &setException,
-      &setException,
-      &setException
-    );
-  }
-
-  static void setException(const char* message) {
-    auto exception = new object.Exception(std.conv.to!string(message));
-    SwigPendingException.set(exception);
-  }
-}
-
-package struct SwigPendingException {
-public:
-  static this() {
-    m_sPendingException = null;
-  }
-
-  static bool isPending() {
-    return m_sPendingException !is null;
-  }
-
-  static void set(object.Exception e) {
-    if (m_sPendingException !is null) {
-      e.next = m_sPendingException;
-      throw new object.Exception("FATAL: An earlier pending exception from C/C++ code " ~
-        "was missed and thus not thrown (" ~ m_sPendingException.classinfo.name ~
-        ": " ~ m_sPendingException.msg ~ ")!", e);
-    }
-
-    m_sPendingException = e;
-  }
-
-  static object.Exception retrieve() {
-    auto e = m_sPendingException;
-    m_sPendingException = null;
-    return e;
-  }
-
-private:
-  // The reference to the pending exception (if any) is stored thread-local.
-  static object.Exception m_sPendingException;
-}
-alias void function(const char* message) SwigExceptionCallback;
-%}
-#endif
-// Callback registering function in wrapperloader.swg.
-#endif // SWIG_D_NO_EXCEPTION_HELPER
-
-
-/*
- * String support code.
- */
-
-#if !defined(SWIG_D_NO_STRING_HELPER)
-%insert(runtime) %{
-// Callback for returning strings to D without leaking memory.
-typedef char * (* SWIG_DStringHelperCallback)(const char *);
-static SWIG_DStringHelperCallback SWIG_d_string_callback = NULL;
-
-#ifdef __cplusplus
-extern "C"
-#endif
-SWIGEXPORT void SWIGRegisterStringCallback_$module(SWIG_DStringHelperCallback callback) {
-  SWIG_d_string_callback = callback;
-}
-%}
-
-#if (SWIG_D_VERSION == 1)
-%pragma(d) imdmoduleimports = "static import tango.stdc.stringz;";
-
-%pragma(d) imdmodulecode = %{
-private class SwigStringHelper {
-  static this() {
-    swigRegisterStringCallback$module(&createString);
-  }
-
-  static char* createString(char* cString) {
-    // We are effectively dup'ing the string here.
-    return tango.stdc.stringz.toStringz(tango.stdc.stringz.fromStringz(cString));
-  }
-}
-alias char* function(char* cString) SwigStringCallback;
-%}
-#else
-%pragma(d) imdmoduleimports = %{
-static import std.conv;
-static import std.string;
-%}
-
-%pragma(d) imdmodulecode = %{
-private class SwigStringHelper {
-  static this() {
-    swigRegisterStringCallback$module(&createString);
-  }
-
-  static const(char)* createString(const(char*) cString) {
-    // We are effectively dup'ing the string here.
-    // TODO: Is this also correct for D2/Phobos?
-    return std.string.toStringz(std.conv.to!string(cString));
-  }
-}
-alias const(char)* function(const(char*) cString) SwigStringCallback;
-%}
-#endif
-// Callback registering function in wrapperloader.swg.
-#endif // SWIG_D_NO_STRING_HELPER
-
-
-/*
- * Function pointer support code.
- */
-#if (SWIG_D_VERSION == 1)
-%pragma(d) imdmodulecode = %{
-template SwigExternC(T) {
-  static if (is(typeof(*(T.init)) R == return)) {
-    static if (is(typeof(*(T.init)) P == function)) {
-      alias extern(C) R function(P) SwigExternC;
-    }
-  }
-}
-%}
-#else
-%pragma(d) imdmodulecode = %{
-template SwigExternC(T) if (is(typeof(*(T.init)) P == function)) {
-  static if (is(typeof(*(T.init)) R == return)) {
-    static if (is(typeof(*(T.init)) P == function)) {
-      alias extern(C) R function(P) SwigExternC;
-    }
-  }
-}
-%}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/d/director.swg b/dependencies2013/win32/swig/Lib/d/director.swg
deleted file mode 100644
index a7d9c768..00000000
--- a/dependencies2013/win32/swig/Lib/d/director.swg
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that D proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#if defined(DEBUG_DIRECTOR_OWNED)
-#include <iostream>
-#endif
-#include <string>
-#include <exception>
-
-namespace Swig {
-
-  // Director base class – not used in D directors.
-  class Director {
-  };
-
-  // Base class for director exceptions.
-  class DirectorException : public std::exception {
-  protected:
-    std::string swig_msg;
-
-  public:
-    DirectorException(const std::string &msg) : swig_msg(msg) {
-    }
-
-    virtual ~DirectorException() throw() {
-    }
-
-    const char *what() const throw() {
-      return swig_msg.c_str();
-    }
-  };
-
-  // Exception which is thrown when attempting to call a pure virtual method
-  // from D code through the director layer.
-  class DirectorPureVirtualException : public DirectorException {
-  public:
-    DirectorPureVirtualException(const char *msg) : DirectorException(std::string("Attempted to invoke pure virtual method ") + msg) {
-    }
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/d/dkw.swg b/dependencies2013/win32/swig/Lib/d/dkw.swg
deleted file mode 100644
index 581093f9..00000000
--- a/dependencies2013/win32/swig/Lib/d/dkw.swg
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef D_DKW_SWG_
-#define D_DKW_SWG_
-
-/* Warnings for D keywords */
-#define DKEYWORD(x) %keywordwarn("'" `x` "' is a D keyword, renaming to '_" `x` "'",rename="_%s")  `x`
-
-// Source: http://www.digitalmars.com/d/{1.0,2.0}/lex.html and
-DKEYWORD(Error);
-DKEYWORD(Exception);
-DKEYWORD(Object);
-DKEYWORD(__FILE__);
-DKEYWORD(__LINE__);
-DKEYWORD(__gshared);
-DKEYWORD(__thread);
-DKEYWORD(__traits);
-DKEYWORD(abstract);
-DKEYWORD(alias);
-DKEYWORD(align);
-DKEYWORD(asm);
-DKEYWORD(assert);
-DKEYWORD(auto);
-DKEYWORD(body);
-DKEYWORD(bool);
-DKEYWORD(break);
-DKEYWORD(byte);
-DKEYWORD(case);
-DKEYWORD(cast);
-DKEYWORD(catch);
-DKEYWORD(cdouble);
-DKEYWORD(cent);
-DKEYWORD(cfloat);
-DKEYWORD(char);
-DKEYWORD(class);
-DKEYWORD(const);
-DKEYWORD(continue);
-DKEYWORD(creal);
-DKEYWORD(dchar);
-DKEYWORD(debug);
-DKEYWORD(default);
-DKEYWORD(delegate);
-DKEYWORD(delete);
-DKEYWORD(deprecated);
-DKEYWORD(do);
-DKEYWORD(double);
-DKEYWORD(dstring);
-DKEYWORD(else);
-DKEYWORD(enum);
-DKEYWORD(export);
-DKEYWORD(extern);
-DKEYWORD(false);
-DKEYWORD(final);
-DKEYWORD(finally);
-DKEYWORD(float);
-DKEYWORD(for);
-DKEYWORD(foreach);
-DKEYWORD(foreach_reverse);
-DKEYWORD(function);
-DKEYWORD(goto);
-DKEYWORD(idouble);
-DKEYWORD(if);
-DKEYWORD(ifloat);
-DKEYWORD(immutable);
-DKEYWORD(import);
-DKEYWORD(in);
-DKEYWORD(inout);
-DKEYWORD(int);
-DKEYWORD(interface);
-DKEYWORD(invariant);
-DKEYWORD(ireal);
-DKEYWORD(is);
-DKEYWORD(lazy);
-DKEYWORD(long);
-DKEYWORD(macro);
-DKEYWORD(mixin);
-DKEYWORD(module);
-DKEYWORD(new);
-DKEYWORD(nothrow);
-DKEYWORD(null);
-DKEYWORD(out);
-DKEYWORD(override);
-DKEYWORD(package);
-DKEYWORD(pragma);
-DKEYWORD(private);
-DKEYWORD(protected);
-DKEYWORD(public);
-DKEYWORD(pure);
-DKEYWORD(real);
-DKEYWORD(ref);
-DKEYWORD(return);
-DKEYWORD(scope);
-DKEYWORD(shared);
-DKEYWORD(short);
-DKEYWORD(static);
-DKEYWORD(string);
-DKEYWORD(struct);
-DKEYWORD(super);
-DKEYWORD(switch);
-DKEYWORD(synchronized);
-DKEYWORD(template);
-DKEYWORD(this);
-DKEYWORD(throw);
-DKEYWORD(true);
-DKEYWORD(try);
-DKEYWORD(typedef);
-DKEYWORD(typeid);
-DKEYWORD(typeof);
-DKEYWORD(ubyte);
-DKEYWORD(ucent);
-DKEYWORD(uint);
-DKEYWORD(ulong);
-DKEYWORD(union);
-DKEYWORD(unittest);
-DKEYWORD(ushort);
-DKEYWORD(version);
-DKEYWORD(void);
-DKEYWORD(volatile);
-DKEYWORD(wchar);
-DKEYWORD(while);
-DKEYWORD(with);
-DKEYWORD(wstring);
-
-// Not really a keyword, but dispose() methods are generated in proxy classes
-// and it's a special method name for D1/Tango.
-DKEYWORD(dispose);
-
-#undef DKEYWORD
-
-#endif //D_DKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/d/dmemberfunctionpointers.swg b/dependencies2013/win32/swig/Lib/d/dmemberfunctionpointers.swg
deleted file mode 100644
index c63eca23..00000000
--- a/dependencies2013/win32/swig/Lib/d/dmemberfunctionpointers.swg
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dmemberfunctionpointers.swg
- *
- * Typemaps for member function pointers.
- * ----------------------------------------------------------------------------- */
-
-
-%typemap(ctype) SWIGTYPE (CLASS::*) "char *"
-%typemap(imtype) SWIGTYPE (CLASS::*) "char*"
-%typemap(dtype) SWIGTYPE (CLASS::*) "$dclassname"
-
-%typecheck(SWIG_TYPECHECK_POINTER)
-  SWIGTYPE (CLASS::*)
-  ""
-
-
-/*
- * Conversion generation typemaps.
- */
-
-%typemap(in, fragment="SWIG_UnPackData") SWIGTYPE (CLASS::*) %{
-  SWIG_UnpackData($input, (void *)&$1, sizeof($1));
-%}
-%typemap(out, fragment="SWIG_PackData") SWIGTYPE (CLASS::*) %{
-  char buf[128];
-  char *data = SWIG_PackData(buf, (void *)&$1, sizeof($1));
-  *data = '\0';
-  $result = SWIG_d_string_callback(buf);
-%}
-
-%typemap(directorin) SWIGTYPE (CLASS::*) "$input = (void *) $1;"
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE (CLASS::*)
-  "$result = ($1_ltype)$input;"
-
-%typemap(ddirectorin) SWIGTYPE (CLASS::*)
-  "($winput is null) ? null : new $dclassname($winput, false)"
-%typemap(ddirectorout) SWIGTYPE (CLASS::*) "$dclassname.swigGetCPtr($dcall)"
-
-%typemap(din) SWIGTYPE (CLASS::*) "$dclassname.swigGetCMemberPtr($dinput)"
-%typemap(dout, excode=SWIGEXCODE) SWIGTYPE (CLASS::*) {
-  char* cMemberPtr = $imcall;
-  $dclassname ret = (cMemberPtr is null) ? null : new $dclassname(cMemberPtr, $owner);$excode
-  return ret;
-}
-
-
-/*
- * Helper functions to pack/unpack arbitrary binary data (member function
- * pointers in this case) into a string.
- */
-
-%fragment("SWIG_PackData", "header") {
-/* Pack binary data into a string */
-SWIGINTERN char * SWIG_PackData(char *c, void *ptr, size_t sz) {
-  static const char hex[17] = "0123456789abcdef";
-  const unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu =  u + sz;
-  for (; u != eu; ++u) {
-    unsigned char uu = *u;
-    *(c++) = hex[(uu & 0xf0) >> 4];
-    *(c++) = hex[uu & 0xf];
-  }
-  return c;
-}
-}
-
-%fragment("SWIG_UnPackData", "header") {
-/* Unpack binary data from a string */
-SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu = u + sz;
-  for (; u != eu; ++u) {
-    char d = *(c++);
-    unsigned char uu;
-    if ((d >= '0') && (d <= '9'))
-      uu = ((d - '0') << 4);
-    else if ((d >= 'a') && (d <= 'f'))
-      uu = ((d - ('a'-10)) << 4);
-    else
-      return (char *) 0;
-    d = *(c++);
-    if ((d >= '0') && (d <= '9'))
-      uu |= (d - '0');
-    else if ((d >= 'a') && (d <= 'f'))
-      uu |= (d - ('a'-10));
-    else
-      return (char *) 0;
-    *u = uu;
-  }
-  return c;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/d/doperators.swg b/dependencies2013/win32/swig/Lib/d/doperators.swg
deleted file mode 100644
index 0cb63533..00000000
--- a/dependencies2013/win32/swig/Lib/d/doperators.swg
+++ /dev/null
@@ -1,259 +0,0 @@
-/* -----------------------------------------------------------------------------
- * doperators.swg
- *
- * Mapping of C++ operator overloading methods to D.
- * ----------------------------------------------------------------------------- */
-
-#if (SWIG_D_VERSION == 1)
-
-%pragma(d) imdmodulecode=%{
-template SwigOperatorDefinitions() {
-  public override int opEquals(Object o) {
-    if (auto rhs = cast(typeof(this))o) {
-      if (swigCPtr == rhs.swigCPtr) return 1;
-      static if (is(typeof(swigOpEquals(rhs)))) {
-        return swigOpEquals(rhs) ? 1 : 0;
-      } else {
-        return 0; 
-      }
-    }
-    return super.opEquals(o);
-  }
-%}
-// opEquals is emitted in pure C mode as well to define two proxy classes
-// pointing to the same struct as equal.
-
-#ifdef __cplusplus
-%rename(opPos) *::operator+();
-%rename(opPos) *::operator+() const;
-%rename(opNeg) *::operator-();
-%rename(opNeg) *::operator-() const;
-%rename(opCom) *::operator~();
-%rename(opCom) *::operator~() const;
-
-%rename(opAdd) *::operator+;
-%rename(opAddAssign) *::operator+=;
-%rename(opSub) *::operator-;
-%rename(opSubAssign) *::operator-=;
-%rename(opMul) *::operator*;
-%rename(opMulAssign) *::operator*=;
-%rename(opDiv) *::operator/;
-%rename(opDivAssign) *::operator/=;
-%rename(opMod) *::operator%;
-%rename(opModAssign) *::operator%=;
-%rename(opAnd) *::operator&;
-%rename(opAndAssign) *::operator&=;
-%rename(opOr) *::operator|;
-%rename(opOrAssign) *::operator|=;
-%rename(opXor) *::operator^;
-%rename(opXorAssign) *::operator^=;
-%rename(opShl) *::operator<<;
-%rename(opShlAssign) *::operator<<=;
-%rename(opShr) *::operator>>;
-%rename(opShrAssign) *::operator>>=;
-
-%rename(opIndex) *::operator[](unsigned) const;
-// opIndexAssign is not currently generated, it needs more extensive support
-// mechanisms.
-
-%rename(opCall) *::operator();
-  
-// !a is not overrideable in D1.
-%ignoreoperator(LNOT) operator!;
-
-// opCmp is used in D.
-%rename(swigOpEquals) *::operator==;
-%rename(swigOpLt) *::operator<;
-%rename(swigOpLtEquals) *::operator<=;
-%rename(swigOpGt) *::operator>;
-%rename(swigOpGtEquals) *::operator>=;
-
-// a != b is rewritten as !a.opEquals(b) in D.
-%ignoreoperator(NOTEQUAL) operator!=;
-
-// The logic operators are not overrideable in D.
-%ignoreoperator(LAND) operator&&;
-%ignoreoperator(LOR) operator||;
-
-// ++/--a is rewritten as a +/-= 1 in D1,so ignore the prefix operators.
-%ignoreoperator(PLUSPLUS) *::operator++();
-%ignoreoperator(MINUSMINUS) *::operator--();
-%rename(swigOpInc) *::operator++(int);
-%rename(swigOpDec) *::operator--(int);
-
-// The C++ assignment operator does not translate well to D where the proxy
-// classes have reference semantics.
-%ignoreoperator(EQ) operator=;
-
-%pragma(d) imdmodulecode=%{
-  public override int opCmp(Object o) {
-    static if (is(typeof(swigOpLt(typeof(this).init) &&
-        swigOpEquals(typeof(this).init)))) {
-      if (auto rhs = cast(typeof(this))o) {
-        if (swigOpLt(rhs)) {
-          return -1;
-        } else if (swigOpEquals(rhs)) {
-          return 0;
-        } else {
-          return 1;
-        }
-      }
-    }
-    return super.opCmp(o);
-  }
-
-  public typeof(this) opPostInc(T = int)(T unused = 0) {
-    static assert(
-      is(typeof(swigOpInc(int.init))),
-      "opPostInc called on " ~ typeof(this).stringof ~ ", but no postfix " ~
-        "increment operator exists in the corresponding C++ class."
-    );
-    return swigOpInc(int.init);
-  }
-
-  public typeof(this) opPostDec(T = int)(T unused = 0) {
-    static assert(
-      is(typeof(swigOpDec(int.init))),
-      "opPostInc called on " ~ typeof(this).stringof ~ ", but no postfix " ~
-        "decrement operator exists in the corresponding C++ class."
-    );
-    return swigOpDec(int.init);
-  }
-%}
-#endif
-
-%pragma(d) imdmodulecode=%{
-}
-%}
-
-#else
-%pragma(d) imdmodulecode=%{
-mixin template SwigOperatorDefinitions() {
-  public override bool opEquals(Object o) {
-    if (auto rhs = cast(typeof(this))o) {
-      if (swigCPtr == rhs.swigCPtr) return true;
-      static if (is(typeof(swigOpEquals(rhs)))) {
-        return swigOpEquals(rhs);
-      } else {
-        return false; 
-      }
-    }
-    return super.opEquals(o);
-  }
-%}
-// opEquals is emitted in pure C mode as well to define two proxy classes
-// pointing to the same struct as equal.
-
-#ifdef __cplusplus
-%rename(swigOpPos) *::operator+();
-%rename(swigOpPos) *::operator+() const;
-%rename(swigOpNeg) *::operator-();
-%rename(swigOpNeg) *::operator-() const;
-%rename(swigOpCom) *::operator~();
-%rename(swigOpCom) *::operator~() const;
-%rename(swigOpInc) *::operator++();
-%rename(swigOpDec) *::operator--();
-%ignoreoperator(PLUSPLUS) *::operator++(int);
-%ignoreoperator(MINUSMINUS) *::operator--(int);
-// The postfix increment/decrement operators are ignored because they are
-// rewritten to (auto t = e, ++e, t) in D2. The unary * operator (used for
-// pointer dereferencing in C/C++) isn't mapped to opUnary("*") by default,
-// despite this would be possible in D2 – the difference in member access
-// semantics would only lead to confusion in most cases.
-
-%rename(swigOpAdd) *::operator+;
-%rename(swigOpSub) *::operator-;
-%rename(swigOpMul) *::operator*;
-%rename(swigOpDiv) *::operator/;
-%rename(swigOpMod) *::operator%;
-%rename(swigOpAnd) *::operator&;
-%rename(swigOpOr) *::operator|;
-%rename(swigOpXor) *::operator^;
-%rename(swigOpShl) *::operator<<;
-%rename(swigOpShr) *::operator>>;
-
-%rename(swigOpAddAssign) *::operator+=;
-%rename(swigOpSubAssign) *::operator-=;
-%rename(swigOpMulAssign) *::operator*=;
-%rename(swigOpDivAssign) *::operator/=;
-%rename(swigOpModAssign) *::operator%=;
-%rename(swigOpAndAssign) *::operator&=;
-%rename(swigOpOrAssign) *::operator|=;
-%rename(swigOpXorAssign) *::operator^=;
-%rename(swigOpShlAssign) *::operator<<=;
-%rename(swigOpShrAssign) *::operator>>=;
-
-%rename(opIndex) *::operator[];
-// opIndexAssign is not currently generated, it needs more extensive support
-// mechanisms.
-
-%rename(opCall) *::operator();
-
-%rename(swigOpEquals) *::operator==;
-%rename(swigOpLt) *::operator<;
-%rename(swigOpLtEquals) *::operator<=;
-%rename(swigOpGt) *::operator>;
-%rename(swigOpGtEquals) *::operator>=;
-
-// a != b is rewritten as !a.opEquals(b) in D.
-%ignoreoperator(NOTEQUAL) operator!=;
-
-// The logic operators are not overrideable in D.
-%ignoreoperator(LAND) operator&&;
-%ignoreoperator(LOR) operator||;
-
-// The C++ assignment operator does not translate well to D where the proxy
-// classes have reference semantics.
-%ignoreoperator(EQ) operator=;
-
-%pragma(d) imdmodulecode=%{  
-  public override int opCmp(Object o) {
-    static if (__traits(compiles, swigOpLt(typeof(this).init) &&
-        swigOpEquals(typeof(this).init))) {
-      if (auto rhs = cast(typeof(this))o) {
-        if (swigOpLt(rhs)) {
-          return -1;
-        } else if (swigOpEquals(rhs)) {
-          return 0;
-        } else {
-          return 1;
-        }
-      }
-    }
-    return super.opCmp(o);
-  }
-
-  private template swigOpBinary(string operator, string name) {
-    enum swigOpBinary = `public void opOpAssign(string op, T)(T rhs) if (op == "` ~ operator ~
-      `" && __traits(compiles, swigOp` ~ name ~ `Assign(rhs))) { swigOp` ~ name ~ `Assign(rhs);}` ~
-      `public auto opBinary(string op, T)(T rhs) if (op == "` ~ operator ~
-      `" && __traits(compiles, swigOp` ~ name ~ `(rhs))) { return swigOp` ~ name ~ `(rhs);}`;
-  }
-  mixin(swigOpBinary!("+", "Add"));
-  mixin(swigOpBinary!("-", "Sub"));
-  mixin(swigOpBinary!("*", "Mul"));
-  mixin(swigOpBinary!("/", "Div"));
-  mixin(swigOpBinary!("%", "Mod"));
-  mixin(swigOpBinary!("&", "And"));
-  mixin(swigOpBinary!("|", "Or"));
-  mixin(swigOpBinary!("^", "Xor"));
-  mixin(swigOpBinary!("<<", "Shl"));
-  mixin(swigOpBinary!(">>", "Shr"));
-  
-  private template swigOpUnary(string operator, string name) {
-    enum swigOpUnary = `public auto opUnary(string op)() if (op == "` ~ operator ~
-      `" && __traits(compiles, swigOp` ~ name ~ `())) { return swigOp` ~ name ~ `();}`;   
-  }
-  mixin(swigOpUnary!("+", "Pos"));
-  mixin(swigOpUnary!("-", "Neg"));
-  mixin(swigOpUnary!("~", "Com"));
-  mixin(swigOpUnary!("++", "Inc"));
-  mixin(swigOpUnary!("--", "Dec"));
-%}
-#endif
-
-%pragma(d) imdmodulecode=%{
-}
-%}
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/d/dprimitives.swg b/dependencies2013/win32/swig/Lib/d/dprimitives.swg
deleted file mode 100644
index 44543795..00000000
--- a/dependencies2013/win32/swig/Lib/d/dprimitives.swg
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dprimitves.swg
- *
- * Typemaps for primitive types.
- * ----------------------------------------------------------------------------- */
-
-// C long/ulong width depends on the target arch, use stdlib aliases for them.
-#if (SWIG_D_VERSION == 1)
-%pragma(d) imdmoduleimports = "static import tango.stdc.config;"
-%pragma(d) globalproxyimports = "static import tango.stdc.config;"
-#define SWIG_LONG_DTYPE tango.stdc.config.c_long
-#define SWIG_ULONG_DTYPE tango.stdc.config.c_ulong
-#else
-%pragma(d) imdmoduleimports = "static import core.stdc.config;"
-%pragma(d) globalproxyimports = "static import core.stdc.config;"
-#define SWIG_LONG_DTYPE core.stdc.config.c_long
-#define SWIG_ULONG_DTYPE core.stdc.config.c_ulong
-#endif
-
-/*
- * The SWIG_D_PRIMITIVE macro is used to define the typemaps for the primitive
- * types, because are more or less the same for all of them. The few special
- * cases are handeled below.
- */
-%define SWIG_D_PRIMITIVE(TYPE, DTYPE)
-%typemap(ctype) TYPE, const TYPE & "TYPE"
-%typemap(imtype) TYPE, const TYPE & "DTYPE"
-%typemap(dtype, cprimitive="1") TYPE, const TYPE & "DTYPE"
-
-%typemap(in) TYPE "$1 = ($1_ltype)$input;"
-%typemap(out) TYPE "$result = $1;"
-%typemap(directorin) TYPE "$input = $1;"
-%typemap(directorout) TYPE "$result = ($1_ltype)$input;"
-%typemap(ddirectorin) TYPE "$winput"
-%typemap(ddirectorout) TYPE "$dcall"
-
-%typemap(in) const TYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input;
-   $1 = &temp; %}
-%typemap(out) const TYPE & "$result = *$1;"
-%typemap(directorin) const TYPE & "$input = $1;"
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const TYPE &
-%{ static $*1_ltype temp;
-   temp = ($*1_ltype)$input;
-   $result = &temp; %}
-%typemap(ddirectorin) const TYPE & "$winput"
-%typemap(ddirectorout) const TYPE & "$dcall"
-
-%typemap(din) TYPE, const TYPE & "$dinput"
-%typemap(dout, excode=SWIGEXCODE) TYPE, const TYPE & {
-  auto ret = $imcall;$excode
-  return ret;
-}
-%enddef
-
-
-SWIG_D_PRIMITIVE(bool, bool)
-SWIG_D_PRIMITIVE(char, char)
-SWIG_D_PRIMITIVE(signed char, byte)
-SWIG_D_PRIMITIVE(unsigned char, ubyte)
-SWIG_D_PRIMITIVE(short, short)
-SWIG_D_PRIMITIVE(unsigned short, ushort)
-SWIG_D_PRIMITIVE(int, int)
-SWIG_D_PRIMITIVE(unsigned int, uint)
-SWIG_D_PRIMITIVE(long, SWIG_LONG_DTYPE)
-SWIG_D_PRIMITIVE(unsigned long, SWIG_ULONG_DTYPE)
-SWIG_D_PRIMITIVE(size_t, size_t)
-SWIG_D_PRIMITIVE(long long, long)
-SWIG_D_PRIMITIVE(unsigned long long, ulong)
-SWIG_D_PRIMITIVE(float, float)
-SWIG_D_PRIMITIVE(double, double)
-
-
-// The C++ boolean type needs some special casing since it is not part of the
-// C standard and is thus represented as unsigned int in the C wrapper layer.
-%typemap(ctype) bool, const bool & "unsigned int"
-%typemap(imtype) bool, const bool & "uint"
-
-%typemap(in) bool "$1 = $input ? true : false;"
-%typemap(in) const bool & ($*1_ltype temp)
-%{ temp = $input ? true : false;
-   $1 = &temp; %}
-
-%typemap(directorout) bool
-  "$result = $input ? true : false;"
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const bool &
-%{ static $*1_ltype temp;
-   temp = $input ? true : false;
-   $result = &temp; %}
-
-%typemap(ddirectorin) bool "($winput ? true : false)"
-
-%typemap(dout, excode=SWIGEXCODE) bool, const bool & {
-  bool ret = $imcall ? true : false;$excode
-  return ret;
-}
-
-
-// Judging from the history of the C# module, the explicit casts are needed for
-// certain versions of VC++.
-%typemap(out) unsigned long "$result = (unsigned long)$1;"
-%typemap(out) const unsigned long & "$result = (unsigned long)*$1;"
-
-
-/*
- * Typecheck typemaps.
- */
-
-%typecheck(SWIG_TYPECHECK_BOOL)
-    bool,
-    const bool &
-    ""
-
-%typecheck(SWIG_TYPECHECK_CHAR)
-    char,
-    const char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8)
-    signed char,
-    const signed char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT8)
-    unsigned char,
-    const unsigned char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16)
-    short,
-    const short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT16)
-    unsigned short,
-    const unsigned short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32)
-    int,
-    long,
-    const int &,
-    const long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT32)
-    unsigned int,
-    unsigned long,
-    const unsigned int &,
-    const unsigned long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64)
-    long long,
-    const long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_UINT64)
-    unsigned long long,
-    const unsigned long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT)
-    float,
-    const float &
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE)
-    double,
-    const double &
-    ""
diff --git a/dependencies2013/win32/swig/Lib/d/dstrings.swg b/dependencies2013/win32/swig/Lib/d/dstrings.swg
deleted file mode 100644
index 02895c15..00000000
--- a/dependencies2013/win32/swig/Lib/d/dstrings.swg
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dstrings.swg
- *
- * Typemaps for wrapping pointers to/arrays of C chars as D strings.
- * ----------------------------------------------------------------------------- */
-
-%define SWIGD_STRING_TYPEMAPS(DW_STRING_TYPE, DP_STRING_TYPE, FROM_STRINGZ, TO_STRINGZ)
-%typemap(ctype) char *, char *&, char[ANY], char[]   "char *"
-%typemap(imtype) char *, char *&, char[ANY], char[]   #DW_STRING_TYPE
-%typemap(dtype) char *, char *&, char[ANY], char[]   #DP_STRING_TYPE
-
-
-/*
- * char* typemaps.
- */
-
-%typemap(in) char * %{ $1 = ($1_ltype)$input; %}
-%typemap(out) char * %{ $result = SWIG_d_string_callback((const char *)$1); %}
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) char * %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) char * %{ $input = SWIG_d_string_callback((const char *)$1); %}
-%typemap(ddirectorin) char * "FROM_STRINGZ($winput)"
-%typemap(ddirectorout) char * "TO_STRINGZ($dcall)"
-
-
-/*
- * char*& typemaps.
- */
-
-%typemap(in) char *& ($*1_ltype temp = 0) %{
-  temp = ($*1_ltype)$input;
-  $1 = &temp;
-%}
-%typemap(out) char *& %{ if ($1) $result = SWIG_d_string_callback((const char *)*$1); %}
-
-
-/*
- * char array typemaps.
- */
-
-%typemap(in) char[ANY], char[] %{ $1 = ($1_ltype)$input; %}
-%typemap(out) char[ANY], char[] %{ $result = SWIG_d_string_callback((const char *)$1); %}
-
-%typemap(directorout) char[ANY], char[] %{ $result = ($1_ltype)$input; %}
-%typemap(directorin) char[ANY], char[] %{ $input = SWIG_d_string_callback((const char *)$1); %}
-
-%typemap(ddirectorin) char[ANY], char[] "$winput"
-%typemap(ddirectorout) char[ANY], char[] "$dcall"
-
-
-%typemap(din) char *, char *&, char[ANY], char[] "($dinput ? TO_STRINGZ($dinput) : null)"
-%typemap(dout, excode=SWIGEXCODE) char *, char *&, char[ANY], char[] {
-  DP_STRING_TYPE ret = FROM_STRINGZ ## ($imcall);$excode
-  return ret;
-}
-
-%typecheck(SWIG_TYPECHECK_STRING)
-    char *,
-    char *&,
-    char[ANY],
-    char[]
-  ""
-%enddef
-
-
-// We need to have the \0-terminated string conversion functions available in
-// the D proxy modules.
-#if (SWIG_D_VERSION == 1)
-// Could be easily extended to support Phobos as well.
-SWIGD_STRING_TYPEMAPS(char*, char[], tango.stdc.stringz.fromStringz, tango.stdc.stringz.toStringz)
-
-%pragma(d) globalproxyimports = "static import tango.stdc.stringz;";
-#else
-SWIGD_STRING_TYPEMAPS(const(char)*, string, std.conv.to!string, std.string.toStringz)
-
-%pragma(d) globalproxyimports = %{
-static import std.conv;
-static import std.string;
-%}
-#endif
-#undef SWIGD_STRING_TYPEMAPS
diff --git a/dependencies2013/win32/swig/Lib/d/dswigtype.swg b/dependencies2013/win32/swig/Lib/d/dswigtype.swg
deleted file mode 100644
index f91d6dfe..00000000
--- a/dependencies2013/win32/swig/Lib/d/dswigtype.swg
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dswigtype.swg
- *
- * Typemaps for non-primitive types (C/C++ classes and structs).
- * ----------------------------------------------------------------------------- */
-
-%typemap(ctype) SWIGTYPE "void *"
-%typemap(imtype) SWIGTYPE "void*"
-%typemap(dtype) SWIGTYPE "$&dclassname"
-
-%typemap(ctype) SWIGTYPE [] "void *"
-%typemap(imtype) SWIGTYPE [] "void*"
-%typemap(dtype) SWIGTYPE [] "$dclassname"
-
-%typemap(ctype) SWIGTYPE * "void *"
-%typemap(imtype) SWIGTYPE * "void*"
-%typemap(dtype, nativepointer="$dtype") SWIGTYPE * "$dclassname"
-
-%typemap(ctype) SWIGTYPE & "void *"
-%typemap(imtype) SWIGTYPE & "void*"
-%typemap(dtype, nativepointer="$dtype") SWIGTYPE & "$dclassname"
-
-%typemap(ctype) SWIGTYPE *const& "void *"
-%typemap(imtype) SWIGTYPE *const& "void*"
-%typemap(dtype) SWIGTYPE *const& "$*dclassname"
-
-%typecheck(SWIG_TYPECHECK_POINTER)
-    SWIGTYPE,
-    SWIGTYPE *,
-    SWIGTYPE &,
-    SWIGTYPE [],
-    SWIGTYPE *const&
-  ""
-
-
-/*
- * By-value conversion typemaps (parameter is converted to a pointer).
- */
-
-%typemap(in, canthrow=1) SWIGTYPE ($&1_type argp)
-%{ argp = ($&1_ltype)$input;
-   if (!argp) {
-     SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "Attempt to dereference null $1_type");
-     return $null;
-   }
-   $1 = *argp; %}
-
-%typemap(out) SWIGTYPE
-#ifdef __cplusplus
-%{ $result = new $1_ltype((const $1_ltype &)$1); %}
-#else
-{
-  $&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype));
-  memmove($1ptr, &$1, sizeof($1_type));
-  $result = $1ptr;
-}
-#endif
-
-%typemap(directorin) SWIGTYPE
-  "$input = (void *)new $1_ltype((const $1_ltype &)$1);"
-%typemap(directorout) SWIGTYPE
-%{ if (!$input) {
-     SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "Unexpected null return for type $1_type");
-     return $null;
-   }
-   $result = *($&1_ltype)$input; %}
-
-%typemap(ddirectorin) SWIGTYPE "new $&dclassname($winput, true)"
-%typemap(ddirectorout) SWIGTYPE "$&dclassname.swigGetCPtr($dcall)"
-
-%typemap(din) SWIGTYPE "$&dclassname.swigGetCPtr($dinput)"
-%typemap(dout, excode=SWIGEXCODE) SWIGTYPE {
-  $&dclassname ret = new $&dclassname($imcall, true);$excode
-  return ret;
-}
-
-
-/*
- * Pointer conversion typemaps.
- */
-
-%typemap(in) SWIGTYPE * "$1 = ($1_ltype)$input;"
-%typemap(out) SWIGTYPE * "$result = (void *)$1;"
-
-%typemap(directorin) SWIGTYPE *
-  "$input = (void *) $1;"
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE *
-  "$result = ($1_ltype)$input;"
-
-%typemap(ddirectorin,
-  nativepointer="cast($dtype)$winput"
-) SWIGTYPE * "($winput is null) ? null : new $dclassname($winput, false)"
-
-%typemap(ddirectorout,
-  nativepointer="cast(void*)$dcall"
-) SWIGTYPE * "$dclassname.swigGetCPtr($dcall)"
-
-%typemap(din,
-  nativepointer="cast(void*)$dinput"
-) SWIGTYPE * "$dclassname.swigGetCPtr($dinput)"
-
-%typemap(dout, excode=SWIGEXCODE,
-  nativepointer="{\n  auto ret = cast($dtype)$imcall;$excode\n  return ret;\n}"
-) SWIGTYPE * {
-  void* cPtr = $imcall;
-  $dclassname ret = (cPtr is null) ? null : new $dclassname(cPtr, $owner);$excode
-  return ret;
-}
-
-// Use the same typemaps for const pointers.
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-
-/*
- * Reference conversion typemaps.
- */
-
-%typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input;
-  if (!$1) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "$1_type type is null");
-    return $null;
-  } %}
-%typemap(out) SWIGTYPE & "$result = (void *)$1;"
-
-%typemap(directorin) SWIGTYPE &
-  "$input = ($1_ltype) &$1;"
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE &
-%{ if (!$input) {
-     SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "Unexpected null return for type $1_type");
-     return $null;
-   }
-   $result = ($1_ltype)$input; %}
-
-%typemap(ddirectorin,
-  nativepointer="cast($dtype)$winput"
-) SWIGTYPE & "new $dclassname($winput, false)"
-%typemap(ddirectorout,
-  nativepointer="cast(void*)$dcall"
-) SWIGTYPE & "$dclassname.swigGetCPtr($dcall)"
-
-%typemap(din,
-  nativepointer="cast(void*)$dinput"
-) SWIGTYPE & "$dclassname.swigGetCPtr($dinput)"
-%typemap(dout, excode=SWIGEXCODE,
-  nativepointer="{\n  auto ret = cast($dtype)$imcall;$excode\n  return ret;\n}") SWIGTYPE & {
-  $dclassname ret = new $dclassname($imcall, $owner);$excode
-  return ret;
-}
-
-
-/*
- * Array conversion typemaps.
- */
-
-%typemap(in) SWIGTYPE [] %{ $1 = ($1_ltype)$input; %}
-%typemap(out) SWIGTYPE [] %{ $result = $1; %}
-
-%typemap(din) SWIGTYPE [] "$dclassname.swigGetCPtr($dinput)"
-%typemap(dout, excode=SWIGEXCODE) SWIGTYPE [] {
-  void* cPtr = $imcall;
-  $dclassname ret = (cPtr is null) ? null : new $dclassname(cPtr, $owner);$excode
-  return ret;
-}
-
-// Treat references to arrays like like references to a single element.
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-
-
-/*
- * Pointer reference conversion typemaps.
- */
-
-%typemap(in) SWIGTYPE *const& ($*1_ltype temp = 0)
-%{ temp = ($*1_ltype)$input;
-   $1 = ($1_ltype)&temp; %}
-%typemap(out) SWIGTYPE *const&
-%{ $result = (void *)*$1; %}
-
-%typemap(din) SWIGTYPE *const& "$*dclassname.swigGetCPtr($dinput)"
-%typemap(dout, excode=SWIGEXCODE) SWIGTYPE *const& {
-  void* cPtr = $imcall;
-  $*dclassname ret = (cPtr is null) ? null : new $*dclassname(cPtr, $owner);$excode
-  return ret;
-}
diff --git a/dependencies2013/win32/swig/Lib/d/dvoid.swg b/dependencies2013/win32/swig/Lib/d/dvoid.swg
deleted file mode 100644
index 805f1e71..00000000
--- a/dependencies2013/win32/swig/Lib/d/dvoid.swg
+++ /dev/null
@@ -1,18 +0,0 @@
-/* -----------------------------------------------------------------------------
- * dvoid.swg
- *
- * Typemaps for handling void function return types and empty parameter lists.
- * ----------------------------------------------------------------------------- */
-
-%typemap(ctype) void "void"
-%typemap(imtype) void "void"
-%typemap(dtype, cprimitive="1") void "void"
-
-%typemap(out, null="") void ""
-%typemap(ddirectorin) void "$winput"
-%typemap(ddirectorout) void "$dcall"
-%typemap(directorin) void ""
-
-%typemap(dout, excode=SWIGEXCODE) void {
-  $imcall;$excode
-}
diff --git a/dependencies2013/win32/swig/Lib/d/std_common.i b/dependencies2013/win32/swig/Lib/d/std_common.i
deleted file mode 100644
index cee11e8c..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_common.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
diff --git a/dependencies2013/win32/swig/Lib/d/std_deque.i b/dependencies2013/win32/swig/Lib/d/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/d/std_except.i b/dependencies2013/win32/swig/Lib/d/std_except.i
deleted file mode 100644
index fbfd6c33..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_except.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_except.i
- *
- * Typemaps used by the STL wrappers that throw exceptions. These typemaps are
- * used when methods are declared with an STL exception specification, such as
- *   size_t at() const throw (std::out_of_range);
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-namespace std
-{
-  %ignore exception;
-  struct exception {};
-}
-
-%typemap(throws, canthrow=1) std::bad_cast          "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::bad_exception     "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::domain_error      "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::exception         "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::invalid_argument  "SWIG_DSetPendingException(SWIG_DIllegalArgumentException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::length_error      "SWIG_DSetPendingException(SWIG_DNoSuchElementException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::logic_error       "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::out_of_range      "SWIG_DSetPendingException(SWIG_DNoSuchElementException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::overflow_error    "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::range_error       "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::runtime_error     "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-%typemap(throws, canthrow=1) std::underflow_error   "SWIG_DSetPendingException(SWIG_DException, $1.what());\n return $null;"
-
diff --git a/dependencies2013/win32/swig/Lib/d/std_map.i b/dependencies2013/win32/swig/Lib/d/std_map.i
deleted file mode 100644
index 0e8574b8..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_map.i
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-}
diff --git a/dependencies2013/win32/swig/Lib/d/std_pair.i b/dependencies2013/win32/swig/Lib/d/std_pair.i
deleted file mode 100644
index 0712ad76..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T t, U u);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/d/std_shared_ptr.i b/dependencies2013/win32/swig/Lib/d/std_shared_ptr.i
deleted file mode 100644
index df873679..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_shared_ptr.i
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SWIG_SHARED_PTR_NAMESPACE std
-%include <boost_shared_ptr.i>
diff --git a/dependencies2013/win32/swig/Lib/d/std_string.i b/dependencies2013/win32/swig/Lib/d/std_string.i
deleted file mode 100644
index 8d75d23e..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_string.i
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * Typemaps for std::string and const std::string&
- * These are mapped to a D char[] and are passed around by value.
- *
- * To use non-const std::string references, use the following %apply. Note
- * that they are passed by value.
- * %apply const std::string & {std::string &};
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-%naturalvar string;
-
-class string;
-
-%define SWIGD_STD_STRING_TYPEMAPS(DW_STRING_TYPE, DP_STRING_TYPE, FROM_STRINGZ, TO_STRINGZ)
-// string
-%typemap(ctype) string, const string & "char *"
-%typemap(imtype) string, const string & #DW_STRING_TYPE
-%typemap(dtype) string, const string & #DP_STRING_TYPE
-
-%typemap(in, canthrow=1) string, const string &
-%{ if (!$input) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "null string");
-    return $null;
-  }
-  $1.assign($input); %}
-%typemap(in, canthrow=1) const string &
-%{ if (!$input) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "null string");
-    return $null;
-   }
-   $*1_ltype $1_str($input);
-   $1 = &$1_str; %}
-
-%typemap(out) string %{ $result = SWIG_d_string_callback($1.c_str()); %}
-%typemap(out) const string & %{ $result = SWIG_d_string_callback($1->c_str()); %}
-
-%typemap(din) string, const string & "($dinput ? TO_STRINGZ($dinput) : null)"
-%typemap(dout, excode=SWIGEXCODE) string, const string & {
-  DP_STRING_TYPE ret = FROM_STRINGZ($imcall);$excode
-  return ret;
-}
-
-%typemap(directorin) string, const string & %{ $input = SWIG_d_string_callback($1.c_str()); %}
-
-%typemap(directorout, canthrow=1) string
-%{ if (!$input) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "null string");
-    return $null;
-  }
-  $result.assign($input); %}
-
-%typemap(directorout, canthrow=1, warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
-%{ if (!$input) {
-    SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "null string");
-    return $null;
-  }
-  /* possible thread/reentrant code problem */
-  static $*1_ltype $1_str;
-  $1_str = $input;
-  $result = &$1_str; %}
-
-%typemap(ddirectorin) string, const string & "FROM_STRINGZ($winput)"
-%typemap(ddirectorout) string, const string & "TO_STRINGZ($dcall)"
-
-%typemap(throws, canthrow=1) string, const string &
-%{ SWIG_DSetPendingException(SWIG_DException, $1.c_str());
-  return $null; %}
-
-%typemap(typecheck) string, const string & = char *;
-%enddef
-
-// We need to have the \0-terminated string conversion functions available in
-// the D proxy modules.
-#if (SWIG_D_VERSION == 1)
-// Could be easily extended to support Phobos as well.
-SWIGD_STD_STRING_TYPEMAPS(char*, char[], tango.stdc.stringz.fromStringz, tango.stdc.stringz.toStringz)
-
-%pragma(d) globalproxyimports = "static import tango.stdc.stringz;";
-#else
-SWIGD_STD_STRING_TYPEMAPS(const(char)*, string, std.conv.to!string, std.string.toStringz)
-
-%pragma(d) globalproxyimports = %{
-static import std.conv;
-static import std.string;
-%}
-#endif
-
-#undef SWIGD_STD_STRING_TYPEMAPS
-
-} // namespace std
diff --git a/dependencies2013/win32/swig/Lib/d/std_vector.i b/dependencies2013/win32/swig/Lib/d/std_vector.i
deleted file mode 100644
index 56f7188c..00000000
--- a/dependencies2013/win32/swig/Lib/d/std_vector.i
+++ /dev/null
@@ -1,591 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * SWIG typemaps for std::vector<T>, D implementation.
- *
- * The D wrapper is made to loosely resemble a tango.util.container.more.Vector
- * and to provide built-in array-like access.
- *
- * If T does define an operator==, then use the SWIG_STD_VECTOR_ENHANCED
- * macro to obtain enhanced functionality (none yet), for example:
- *
- *   SWIG_STD_VECTOR_ENHANCED(SomeNamespace::Klass)
- *   %template(VectKlass) std::vector<SomeNamespace::Klass>;
- *
- * Warning: heavy macro usage in this file. Use swig -E to get a sane view on
- * the real file contents!
- * ----------------------------------------------------------------------------- */
-
-// Warning: Use the typemaps here in the expectation that the macros they are in will change name.
-
-%include <std_common.i>
-
-// MACRO for use within the std::vector class body
-%define SWIG_STD_VECTOR_MINIMUM_INTERNAL(CONST_REFERENCE, CTYPE...)
-#if (SWIG_D_VERSION == 1)
-%typemap(dimports) std::vector< CTYPE > "static import tango.core.Exception;"
-%proxycode %{
-public this($typemap(dtype, CTYPE)[] values) {
-  this();
-  append(values);
-}
-
-alias push_back add;
-alias push_back push;
-alias push_back opCatAssign;
-alias size length;
-alias opSlice slice;
-
-public $typemap(dtype, CTYPE) opIndexAssign($typemap(dtype, CTYPE) value, size_t index) {
-  if (index >= size()) {
-    throw new tango.core.Exception.NoSuchElementException("Tried to assign to element out of vector bounds.");
-  }
-  setElement(index, value);
-  return value;
-}
-
-public $typemap(dtype, CTYPE) opIndex(size_t index) {
-  if (index >= size()) {
-    throw new tango.core.Exception.NoSuchElementException("Tried to read from element out of vector bounds.");
-  }
-  return getElement(index);
-}
-
-public void append($typemap(dtype, CTYPE)[] value...) {
-  foreach (v; value) {
-    add(v);
-  }
-}
-
-public $typemap(dtype, CTYPE)[] opSlice() {
-  $typemap(dtype, CTYPE)[] array = new $typemap(dtype, CTYPE)[size()];
-  foreach (i, ref value; array) {
-    value = getElement(i);
-  }
-  return array;
-}
-
-public int opApply(int delegate(ref $typemap(dtype, CTYPE) value) dg) {
-  int result;
-
-  size_t currentSize = size();
-  for (size_t i = 0; i < currentSize; ++i) {
-    auto value = getElement(i);
-    result = dg(value);
-    setElement(i, value);
-  }
-  return result;
-}
-
-public int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg) {
-  int result;
-
-  size_t currentSize = size();
-  for (size_t i = 0; i < currentSize; ++i) {
-    auto value = getElement(i);
-
-    // Workaround for http://d.puremagic.com/issues/show_bug.cgi?id=2443.
-    auto index = i;
-
-    result = dg(index, value);
-    setElement(i, value);
-  }
-  return result;
-}
-
-public void capacity(size_t value) {
-  if (value < size()) {
-    throw new tango.core.Exception.IllegalArgumentException("Tried to make the capacity of a vector smaller than its size.");
-  }
-
-  reserve(value);
-}
-%}
-
-  public:
-    typedef size_t size_type;
-    typedef CTYPE value_type;
-    typedef CONST_REFERENCE const_reference;
-    void clear();
-    void push_back(CTYPE const& x);
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n) throw (std::length_error);
-    vector();
-    vector(const vector &other);
-    %extend {
-      vector(size_type capacity) throw (std::length_error) {
-        std::vector< CTYPE >* pv = 0;
-        pv = new std::vector< CTYPE >();
-
-        // Might throw std::length_error.
-        pv->reserve(capacity);
-
-        return pv;
-      }
-
-      size_type unused() const {
-        return $self->capacity() - $self->size();
-      }
-
-      CONST_REFERENCE remove() throw (std::out_of_range) {
-        if ($self->empty()) {
-          throw std::out_of_range("Tried to remove last element from empty vector.");
-        }
-
-        std::vector< CTYPE >::const_reference value = $self->back();
-        $self->pop_back();
-        return value;
-      }
-
-      CONST_REFERENCE remove(size_type index) throw (std::out_of_range) {
-        if (index >= $self->size()) {
-          throw std::out_of_range("Tried to remove element with invalid index.");
-        }
-
-        std::vector< CTYPE >::iterator it = $self->begin() + index;
-        std::vector< CTYPE >::const_reference value = *it;
-        $self->erase(it);
-        return value;
-      }
-    }
-
-    // Wrappers for setting/getting items with the possibly thrown exception
-    // specified (important for SWIG wrapper generation).
-    %extend {
-      CONST_REFERENCE getElement(size_type index) throw (std::out_of_range) {
-        if ((index < 0) || ($self->size() <= index)) {
-          throw std::out_of_range("Tried to get value of element with invalid index.");
-        }
-        return (*$self)[index];
-      }
-    }
-
-    // Use CTYPE const& instead of const_reference to work around SWIG code
-    // generation issue when using const pointers as vector elements (like
-    // std::vector< const int* >).
-    %extend {
-      void setElement(size_type index, CTYPE const& val) throw (std::out_of_range) {
-        if ((index < 0) || ($self->size() <= index)) {
-          throw std::out_of_range("Tried to set value of element with invalid index.");
-        }
-        (*$self)[index] = val;
-      }
-    }
-
-%dmethodmodifiers std::vector::getElement "private"
-%dmethodmodifiers std::vector::setElement "private"
-%dmethodmodifiers std::vector::reserve "private"
-
-#else
-
-%typemap(dimports) std::vector< CTYPE > %{
-static import std.algorithm;
-static import std.exception;
-static import std.range;
-static import std.traits;
-%}
-%proxycode %{
-alias size_t KeyType;
-alias $typemap(dtype, CTYPE) ValueType;
-
-this(ValueType[] values...) {
-  this();
-  reserve(values.length);
-  foreach (e; values) {
-    this ~= e;
-  }
-}
-
-struct Range {
-  private $typemap(dtype, std::vector< CTYPE >) _outer;
-  private size_t _a, _b;
-
-  this($typemap(dtype, std::vector< CTYPE >) data, size_t a, size_t b) {
-    _outer = data;
-    _a = a;
-    _b = b;
-  }
-
-  @property bool empty() const {
-    assert((cast($typemap(dtype, std::vector< CTYPE >))_outer).length >= _b);
-    return _a >= _b;
-  }
-
-  @property Range save() {
-    return this;
-  }
-
-  @property ValueType front() {
-    std.exception.enforce(!empty);
-    return _outer[_a];
-  }
-
-  @property void front(ValueType value) {
-    std.exception.enforce(!empty);
-    _outer[_a] = std.algorithm.move(value);
-  }
-
-  void popFront() {
-    std.exception.enforce(!empty);
-    ++_a;
-  }
-
-  void opIndexAssign(ValueType value, size_t i) {
-    i += _a;
-    std.exception.enforce(i < _b && _b <= _outer.length);
-    _outer[i] = value;
-  }
-
-  void opIndexOpAssign(string op)(ValueType value, size_t i) {
-    std.exception.enforce(_outer && _a + i < _b && _b <= _outer.length);
-    auto element = _outer[i];
-    mixin("element "~op~"= value;");
-    _outer[i] = element;
-  }
-}
-
-// TODO: dup?
-
-Range opSlice() {
-  return Range(this, 0, length);
-}
-
-Range opSlice(size_t a, size_t b) {
-  std.exception.enforce(a <= b && b <= length);
-  return Range(this, a, b);
-}
-
-size_t opDollar() const {
-  return length;
-}
-
-@property ValueType front() {
-  std.exception.enforce(!empty);
-  return getElement(0);
-}
-
-@property void front(ValueType value) {
-  std.exception.enforce(!empty);
-  setElement(0, value);
-}
-
-@property ValueType back() {
-  std.exception.enforce(!empty);
-  return getElement(length - 1);
-}
-
-@property void back(ValueType value) {
-  std.exception.enforce(!empty);
-  setElement(length - 1, value);
-}
-
-ValueType opIndex(size_t i) {
-  return getElement(i);
-}
-
-void opIndexAssign(ValueType value, size_t i) {
-  setElement(i, value);
-}
-
-void opIndexOpAssign(string op)(ValueType value, size_t i) {
-  auto element = this[i];
-  mixin("element "~op~"= value;");
-  this[i] = element;
-}
-
-ValueType[] opBinary(string op, Stuff)(Stuff stuff) if (op == "~") {
-  ValueType[] result;
-  result ~= this[];
-  assert(result.length == length);
-  result ~= stuff[];
-  return result;
-}
-
-void opOpAssign(string op, Stuff)(Stuff stuff) if (op == "~") {
-  static if (is(typeof(insertBack(stuff)))) {
-    insertBack(stuff);
-  } else if (is(typeof(insertBack(stuff[])))) {
-    insertBack(stuff[]);
-  } else {
-    static assert(false, "Cannot append " ~ Stuff.stringof ~ " to " ~ typeof(this).stringof);
-  }
-}
-
-alias size length;
-
-alias remove removeAny;
-alias removeAny stableRemoveAny;
-
-size_t insertBack(Stuff)(Stuff stuff)
-if (std.traits.isImplicitlyConvertible!(Stuff, ValueType)){
-  push_back(stuff);
-  return 1;
-}
-size_t insertBack(Stuff)(Stuff stuff)
-if (std.range.isInputRange!Stuff &&
-    std.traits.isImplicitlyConvertible!(std.range.ElementType!Stuff, ValueType)) {
-  size_t itemCount;
-  foreach(item; stuff) {
-    insertBack(item);
-    ++itemCount;
-  }
-  return itemCount;
-}
-alias insertBack insert;
-
-alias pop_back removeBack;
-alias pop_back stableRemoveBack;
-
-size_t insertBefore(Stuff)(Range r, Stuff stuff)
-if (std.traits.isImplicitlyConvertible!(Stuff, ValueType)) {
-  std.exception.enforce(r._outer.swigCPtr == swigCPtr && r._a < length);
-  insertAt(r._a, stuff);
-  return 1;
-}
-
-size_t insertBefore(Stuff)(Range r, Stuff stuff)
-if (std.range.isInputRange!Stuff && std.traits.isImplicitlyConvertible!(ElementType!Stuff, ValueType)) {
-  std.exception.enforce(r._outer.swigCPtr == swigCPtr && r._a <= length);
-
-  size_t insertCount;
-  foreach(i, item; stuff) {
-    insertAt(r._a + i, item);
-    ++insertCount;
-  }
-
-  return insertCount;
-}
-
-size_t insertAfter(Stuff)(Range r, Stuff stuff) {
-  // TODO: optimize
-  immutable offset = r._a + r.length;
-  std.exception.enforce(offset <= length);
-  auto result = insertBack(stuff);
-  std.algorithm.bringToFront(this[offset .. length - result],
-    this[length - result .. length]);
-  return result;
-}
-
-size_t replace(Stuff)(Range r, Stuff stuff)
-if (std.range.isInputRange!Stuff &&
-    std.traits.isImplicitlyConvertible!(ElementType!Stuff, ValueType)) {
-  immutable offset = r._a;
-  std.exception.enforce(offset <= length);
-  size_t result;
-  for (; !stuff.empty; stuff.popFront()) {
-    if (r.empty) {
-      // append the rest
-      return result + insertBack(stuff);
-    }
-    r.front = stuff.front;
-    r.popFront();
-    ++result;
-  }
-  // Remove remaining stuff in r
-  remove(r);
-  return result;
-}
-
-size_t replace(Stuff)(Range r, Stuff stuff)
-if (std.traits.isImplicitlyConvertible!(Stuff, ValueType))
-{
-    if (r.empty)
-    {
-        insertBefore(r, stuff);
-    }
-    else
-    {
-        r.front = stuff;
-        r.popFront();
-        remove(r);
-    }
-    return 1;
-}
-
-Range linearRemove(Range r) {
-  std.exception.enforce(r._a <= r._b && r._b <= length);
-  immutable tailLength = length - r._b;
-  linearRemove(r._a, r._b);
-  return this[length - tailLength .. length];
-}
-alias remove stableLinearRemove;
-
-int opApply(int delegate(ref $typemap(dtype, CTYPE) value) dg) {
-  int result;
-
-  size_t currentSize = size();
-  for (size_t i = 0; i < currentSize; ++i) {
-    auto value = getElement(i);
-    result = dg(value);
-    setElement(i, value);
-  }
-  return result;
-}
-
-int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg) {
-  int result;
-
-  size_t currentSize = size();
-  for (size_t i = 0; i < currentSize; ++i) {
-    auto value = getElement(i);
-
-    // Workaround for http://d.puremagic.com/issues/show_bug.cgi?id=2443.
-    auto index = i;
-
-    result = dg(index, value);
-    setElement(i, value);
-  }
-  return result;
-}
-%}
-
-  public:
-    typedef size_t size_type;
-    typedef CTYPE value_type;
-    typedef CONST_REFERENCE const_reference;
-    bool empty() const;
-    void clear();
-    void push_back(CTYPE const& x);
-    void pop_back();
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n) throw (std::length_error);
-    vector();
-    vector(const vector &other);
-    %extend {
-      vector(size_type capacity) throw (std::length_error) {
-        std::vector< CTYPE >* pv = 0;
-        pv = new std::vector< CTYPE >();
-
-        // Might throw std::length_error.
-        pv->reserve(capacity);
-
-        return pv;
-      }
-
-      CONST_REFERENCE remove() throw (std::out_of_range) {
-        if ($self->empty()) {
-          throw std::out_of_range("Tried to remove last element from empty vector.");
-        }
-
-        std::vector< CTYPE >::const_reference value = $self->back();
-        $self->pop_back();
-        return value;
-      }
-
-      CONST_REFERENCE remove(size_type index) throw (std::out_of_range) {
-        if (index >= $self->size()) {
-          throw std::out_of_range("Tried to remove element with invalid index.");
-        }
-
-        std::vector< CTYPE >::iterator it = $self->begin() + index;
-        std::vector< CTYPE >::const_reference value = *it;
-        $self->erase(it);
-        return value;
-      }
-
-      void removeBack(size_type how_many) throw (std::out_of_range) {
-        std::vector< CTYPE >::iterator end = $self->end();
-        std::vector< CTYPE >::iterator start = end - how_many;
-        $self->erase(start, end);
-      }
-
-      void linearRemove(size_type start_index, size_type end_index) throw (std::out_of_range) {
-        std::vector< CTYPE >::iterator start = $self->begin() + start_index;
-        std::vector< CTYPE >::iterator end = $self->begin() + end_index;
-        $self->erase(start, end);
-      }
-
-      void insertAt(size_type index, CTYPE const& x) throw (std::out_of_range) {
-        std::vector< CTYPE >::iterator it = $self->begin() + index;
-        $self->insert(it, x);
-      }
-    }
-
-    // Wrappers for setting/getting items with the possibly thrown exception
-    // specified (important for SWIG wrapper generation).
-    %extend {
-      CONST_REFERENCE getElement(size_type index) throw (std::out_of_range) {
-        if ((index < 0) || ($self->size() <= index)) {
-          throw std::out_of_range("Tried to get value of element with invalid index.");
-        }
-        return (*$self)[index];
-      }
-    }
-    // Use CTYPE const& instead of const_reference to work around SWIG code
-    // generation issue when using const pointers as vector elements (like
-    // std::vector< const int* >).
-    %extend {
-      void setElement(size_type index, CTYPE const& val) throw (std::out_of_range) {
-        if ((index < 0) || ($self->size() <= index)) {
-          throw std::out_of_range("Tried to set value of element with invalid index.");
-        }
-        (*$self)[index] = val;
-      }
-    }
-
-%dmethodmodifiers std::vector::getElement "private"
-%dmethodmodifiers std::vector::setElement "private"
-#endif
-%enddef
-
-// Extra methods added to the collection class if operator== is defined for the class being wrapped
-// The class will then implement IList<>, which adds extra functionality
-%define SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CTYPE...)
-    %extend {
-    }
-%enddef
-
-// For vararg handling in macros, from swigmacros.swg
-#define %arg(X...) X
-
-// Macros for std::vector class specializations/enhancements
-%define SWIG_STD_VECTOR_ENHANCED(CTYPE...)
-namespace std {
-  template<> class vector<CTYPE > {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(%arg(CTYPE const&), %arg(CTYPE))
-    SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CTYPE)
-  };
-}
-%enddef
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-  // primary (unspecialized) class template for std::vector
-  // does not require operator== to be defined
-  template<class T> class vector {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(T const&, T)
-  };
-  // specializations for pointers
-  template<class T> class vector<T *> {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(T *const&, T *)
-    SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(T *)
-  };
-  // bool is a bit different in the C++ standard - const_reference in particular
-  template<> class vector<bool> {
-    SWIG_STD_VECTOR_MINIMUM_INTERNAL(bool, bool)
-    SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(bool)
-  };
-}
-
-// template specializations for std::vector
-// these provide extra collections methods as operator== is defined
-SWIG_STD_VECTOR_ENHANCED(char)
-SWIG_STD_VECTOR_ENHANCED(signed char)
-SWIG_STD_VECTOR_ENHANCED(unsigned char)
-SWIG_STD_VECTOR_ENHANCED(short)
-SWIG_STD_VECTOR_ENHANCED(unsigned short)
-SWIG_STD_VECTOR_ENHANCED(int)
-SWIG_STD_VECTOR_ENHANCED(unsigned int)
-SWIG_STD_VECTOR_ENHANCED(long)
-SWIG_STD_VECTOR_ENHANCED(unsigned long)
-SWIG_STD_VECTOR_ENHANCED(long long)
-SWIG_STD_VECTOR_ENHANCED(unsigned long long)
-SWIG_STD_VECTOR_ENHANCED(float)
-SWIG_STD_VECTOR_ENHANCED(double)
-SWIG_STD_VECTOR_ENHANCED(std::string) // also requires a %include <std_string.i>
diff --git a/dependencies2013/win32/swig/Lib/d/stl.i b/dependencies2013/win32/swig/Lib/d/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/d/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/d/typemaps.i b/dependencies2013/win32/swig/Lib/d/typemaps.i
deleted file mode 100644
index 4f1b5997..00000000
--- a/dependencies2013/win32/swig/Lib/d/typemaps.i
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer and reference handling typemap library
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers and C++ references.
- * ----------------------------------------------------------------------------- */
-
-/*
-INPUT typemaps
---------------
-
-These typemaps are used for pointer/reference parameters that are input only
-and are mapped to a D input parameter.
-
-The following typemaps can be applied to turn a pointer or reference into a simple
-input value.  That is, instead of passing a pointer or reference to an object,
-you would use a real value instead.
-
-        bool               *INPUT, bool               &INPUT
-        signed char        *INPUT, signed char        &INPUT
-        unsigned char      *INPUT, unsigned char      &INPUT
-        short              *INPUT, short              &INPUT
-        unsigned short     *INPUT, unsigned short     &INPUT
-        int                *INPUT, int                &INPUT
-        unsigned int       *INPUT, unsigned int       &INPUT
-        long               *INPUT, long               &INPUT
-        unsigned long      *INPUT, unsigned long      &INPUT
-        long long          *INPUT, long long          &INPUT
-        unsigned long long *INPUT, unsigned long long &INPUT
-        float              *INPUT, float              &INPUT
-        double             *INPUT, double             &INPUT
-
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-In D you could then use it like this:
-        double answer = fadd(10.0, 20.0);
-*/
-
-%define INPUT_TYPEMAP(TYPE, CTYPE, DTYPE)
-%typemap(ctype, out="void *") TYPE *INPUT, TYPE &INPUT "CTYPE"
-%typemap(imtype, out="void*") TYPE *INPUT, TYPE &INPUT "DTYPE"
-%typemap(dtype, out="DTYPE*") TYPE *INPUT, TYPE &INPUT "DTYPE"
-%typemap(din) TYPE *INPUT, TYPE &INPUT "$dinput"
-
-%typemap(in) TYPE *INPUT, TYPE &INPUT
-%{ $1 = ($1_ltype)&$input; %}
-
-%typemap(typecheck) TYPE *INPUT = TYPE;
-%typemap(typecheck) TYPE &INPUT = TYPE;
-%enddef
-
-INPUT_TYPEMAP(bool,               unsigned int,         bool)
-//INPUT_TYPEMAP(char,               char,                 char) // Why was this commented out?
-INPUT_TYPEMAP(signed char,        signed char,          byte)
-INPUT_TYPEMAP(unsigned char,      unsigned char,        ubyte)
-INPUT_TYPEMAP(short,              short,                short)
-INPUT_TYPEMAP(unsigned short,     unsigned short,       ushort)
-INPUT_TYPEMAP(int,                int,                  int)
-INPUT_TYPEMAP(unsigned int,       unsigned int,         uint)
-INPUT_TYPEMAP(long,               long,                 SWIG_LONG_DTYPE)
-INPUT_TYPEMAP(unsigned long,      unsigned long,        SWIG_ULONG_DTYPE)
-INPUT_TYPEMAP(long long,          long long,            long)
-INPUT_TYPEMAP(unsigned long long, unsigned long long,   ulong)
-INPUT_TYPEMAP(float,              float,                float)
-INPUT_TYPEMAP(double,             double,               double)
-
-INPUT_TYPEMAP(enum SWIGTYPE,      unsigned int,         int)
-%typemap(dtype) enum SWIGTYPE *INPUT, enum SWIGTYPE &INPUT "$*dclassname"
-
-#undef INPUT_TYPEMAP
-
-
-/*
-OUTPUT typemaps
----------------
-
-These typemaps are used for pointer/reference parameters that are output only and
-are mapped to a D output parameter.
-
-The following typemaps can be applied to turn a pointer or reference into an
-"output" value. When calling a function, no input value would be given for
-a parameter, but an output value would be returned. In D, the 'out' keyword is
-used when passing the parameter to a function that takes an output parameter.
-
-        bool               *OUTPUT, bool               &OUTPUT
-        signed char        *OUTPUT, signed char        &OUTPUT
-        unsigned char      *OUTPUT, unsigned char      &OUTPUT
-        short              *OUTPUT, short              &OUTPUT
-        unsigned short     *OUTPUT, unsigned short     &OUTPUT
-        int                *OUTPUT, int                &OUTPUT
-        unsigned int       *OUTPUT, unsigned int       &OUTPUT
-        long               *OUTPUT, long               &OUTPUT
-        unsigned long      *OUTPUT, unsigned long      &OUTPUT
-        long long          *OUTPUT, long long          &OUTPUT
-        unsigned long long *OUTPUT, unsigned long long &OUTPUT
-        float              *OUTPUT, float              &OUTPUT
-        double             *OUTPUT, double             &OUTPUT
-
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters):
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The D output of the function would be the function return value and the
-value returned in the second output parameter. In D you would use it like this:
-
-    double dptr;
-    double fraction = modf(5, dptr);
-*/
-
-%define OUTPUT_TYPEMAP(TYPE, CTYPE, DTYPE, TYPECHECKPRECEDENCE)
-%typemap(ctype, out="void *") TYPE *OUTPUT, TYPE &OUTPUT "CTYPE *"
-%typemap(imtype, out="void*") TYPE *OUTPUT, TYPE &OUTPUT "out DTYPE"
-%typemap(dtype, out="DTYPE*") TYPE *OUTPUT, TYPE &OUTPUT "out DTYPE"
-%typemap(din) TYPE *OUTPUT, TYPE &OUTPUT "$dinput"
-
-%typemap(in) TYPE *OUTPUT, TYPE &OUTPUT
-%{ $1 = ($1_ltype)$input; %}
-
-%typecheck(SWIG_TYPECHECK_##TYPECHECKPRECEDENCE) TYPE *OUTPUT, TYPE &OUTPUT ""
-%enddef
-
-OUTPUT_TYPEMAP(bool,               unsigned int,         bool,     BOOL_PTR)
-//OUTPUT_TYPEMAP(char,               char,                 char,     CHAR_PTR) // Why was this commented out?
-OUTPUT_TYPEMAP(signed char,        signed char,          byte,     INT8_PTR)
-OUTPUT_TYPEMAP(unsigned char,      unsigned char,        ubyte,    UINT8_PTR)
-OUTPUT_TYPEMAP(short,              short,                short,    INT16_PTR)
-OUTPUT_TYPEMAP(unsigned short,     unsigned short,       ushort,   UINT16_PTR)
-OUTPUT_TYPEMAP(int,                int,                  int,      INT32_PTR)
-OUTPUT_TYPEMAP(unsigned int,       unsigned int,         uint,     UINT32_PTR)
-OUTPUT_TYPEMAP(long,               long,           SWIG_LONG_DTYPE,INT32_PTR)
-OUTPUT_TYPEMAP(unsigned long,      unsigned long, SWIG_ULONG_DTYPE,UINT32_PTR)
-OUTPUT_TYPEMAP(long long,          long long,            long,     INT64_PTR)
-OUTPUT_TYPEMAP(unsigned long long, unsigned long long,   ulong,    UINT64_PTR)
-OUTPUT_TYPEMAP(float,              float,                float,    FLOAT_PTR)
-OUTPUT_TYPEMAP(double,             double,               double,   DOUBLE_PTR)
-
-OUTPUT_TYPEMAP(enum SWIGTYPE,      unsigned int,         int,      INT32_PTR)
-%typemap(dtype) enum SWIGTYPE *OUTPUT, enum SWIGTYPE &OUTPUT "out $*dclassname"
-
-#undef OUTPUT_TYPEMAP
-
-%typemap(in) bool *OUTPUT, bool &OUTPUT
-%{ *$input = 0;
-   $1 = ($1_ltype)$input; %}
-
-
-/*
-INOUT typemaps
---------------
-
-These typemaps are for pointer/reference parameters that are both input and
-output and are mapped to a D reference parameter.
-
-The following typemaps can be applied to turn a pointer or reference into a
-reference parameters, that is the parameter is both an input and an output.
-In D, the 'ref' keyword is used for reference parameters.
-
-        bool               *INOUT, bool               &INOUT
-        signed char        *INOUT, signed char        &INOUT
-        unsigned char      *INOUT, unsigned char      &INOUT
-        short              *INOUT, short              &INOUT
-        unsigned short     *INOUT, unsigned short     &INOUT
-        int                *INOUT, int                &INOUT
-        unsigned int       *INOUT, unsigned int       &INOUT
-        long               *INOUT, long               &INOUT
-        unsigned long      *INOUT, unsigned long      &INOUT
-        long long          *INOUT, long long          &INOUT
-        unsigned long long *INOUT, unsigned long long &INOUT
-        float              *INOUT, float              &INOUT
-        double             *INOUT, double             &INOUT
-
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-The D output of the function would be the new value returned by the
-reference parameter. In D you would use it like this:
-
-
-       double x = 5.0;
-       neg(x);
-
-The implementation of the OUTPUT and INOUT typemaps is different to the scripting
-languages in that the scripting languages will return the output value as part
-of the function return value.
-*/
-
-%define INOUT_TYPEMAP(TYPE, CTYPE, DTYPE, TYPECHECKPRECEDENCE)
-%typemap(ctype, out="void *") TYPE *INOUT, TYPE &INOUT "CTYPE *"
-%typemap(imtype, out="void*") TYPE *INOUT, TYPE &INOUT "ref DTYPE"
-%typemap(dtype, out="DTYPE*") TYPE *INOUT, TYPE &INOUT "ref DTYPE"
-%typemap(din) TYPE *INOUT, TYPE &INOUT "$dinput"
-
-%typemap(in) TYPE *INOUT, TYPE &INOUT
-%{ $1 = ($1_ltype)$input; %}
-
-%typecheck(SWIG_TYPECHECK_##TYPECHECKPRECEDENCE) TYPE *INOUT, TYPE &INOUT ""
-%enddef
-
-INOUT_TYPEMAP(bool,               unsigned int,         bool,     BOOL_PTR)
-//INOUT_TYPEMAP(char,               char,                 char,     CHAR_PTR)
-INOUT_TYPEMAP(signed char,        signed char,          byte,     INT8_PTR)
-INOUT_TYPEMAP(unsigned char,      unsigned char,        ubyte,    UINT8_PTR)
-INOUT_TYPEMAP(short,              short,                short,    INT16_PTR)
-INOUT_TYPEMAP(unsigned short,     unsigned short,       ushort,   UINT16_PTR)
-INOUT_TYPEMAP(int,                int,                  int,      INT32_PTR)
-INOUT_TYPEMAP(unsigned int,       unsigned int,         uint,     UINT32_PTR)
-INOUT_TYPEMAP(long,               long,           SWIG_LONG_DTYPE,INT32_PTR)
-INOUT_TYPEMAP(unsigned long,      unsigned long, SWIG_ULONG_DTYPE,UINT32_PTR)
-INOUT_TYPEMAP(long long,          long long,            long,     INT64_PTR)
-INOUT_TYPEMAP(unsigned long long, unsigned long long,   ulong,    UINT64_PTR)
-INOUT_TYPEMAP(float,              float,                float,    FLOAT_PTR)
-INOUT_TYPEMAP(double,             double,               double,   DOUBLE_PTR)
-
-INOUT_TYPEMAP(enum SWIGTYPE,      unsigned int,         int,      INT32_PTR)
-%typemap(dtype) enum SWIGTYPE *INOUT, enum SWIGTYPE &INOUT "ref $*dclassname"
-
-#undef INOUT_TYPEMAP
diff --git a/dependencies2013/win32/swig/Lib/d/wrapperloader.swg b/dependencies2013/win32/swig/Lib/d/wrapperloader.swg
deleted file mode 100644
index b3c1d0dc..00000000
--- a/dependencies2013/win32/swig/Lib/d/wrapperloader.swg
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -----------------------------------------------------------------------------
- * wrapperloader.swg
- *
- * Support code for dynamically linking the C wrapper library from the D
- * wrapper module.
- *
- * The loading code was adapted from the Derelict project and is used with
- * permission from Michael Parker, the original author.
- * ----------------------------------------------------------------------------- */
-
-%pragma(d) wrapperloadercode = %{
-private {
-  version(linux) {
-    version = Nix;
-  } else version(darwin) {
-    version = Nix;
-  } else version(OSX) {
-    version = Nix;
-  } else version(FreeBSD) {
-    version = Nix;
-    version = freebsd;
-  } else version(freebsd) {
-    version = Nix;
-  } else version(Unix) {
-    version = Nix;
-  } else version(Posix) {
-    version = Nix;
-  }
-
-  version(Tango) {
-    static import tango.stdc.string;
-    static import tango.stdc.stringz;
-
-    version (PhobosCompatibility) {
-    } else {
-      alias char[] string;
-      alias wchar[] wstring;
-      alias dchar[] dstring;
-    }
-  } else {
-    version(D_Version2) {
-      static import std.conv;
-    }
-    static import std.string;
-    static import std.c.string;
-  }
-
-  version(D_Version2) {
-    mixin("alias const(char)* CCPTR;");
-  } else {
-    alias char* CCPTR;
-  }
-
-  CCPTR swigToCString(string str) {
-    version(Tango) {
-      return tango.stdc.stringz.toStringz(str);
-    } else {
-      return std.string.toStringz(str);
-    }
-  }
-
-  string swigToDString(CCPTR cstr) {
-    version(Tango) {
-      return tango.stdc.stringz.fromStringz(cstr);
-    } else {
-      version(D_Version2) {
-        mixin("return std.conv.to!string(cstr);");
-      } else {
-        return std.c.string.toString(cstr);
-      }
-    }
-  }
-}
-
-class SwigSwigSharedLibLoadException : Exception {
-  this(in string[] libNames, in string[] reasons) {
-    string msg = "Failed to load one or more shared libraries:";
-    foreach(i, n; libNames) {
-      msg ~= "\n\t" ~ n ~ " - ";
-      if(i < reasons.length)
-        msg ~= reasons[i];
-      else
-        msg ~= "Unknown";
-    }
-    super(msg);
-  }
-}
-
-class SwigSymbolLoadException : Exception {
-  this(string SwigSharedLibName, string symbolName) {
-    super("Failed to load symbol " ~ symbolName ~ " from shared library " ~ SwigSharedLibName);
-    _symbolName = symbolName;
-  }
-
-  string symbolName() {
-    return _symbolName;
-  }
-
-private:
-  string _symbolName;
-}
-
-private {
-  version(Nix) {
-    version(freebsd) {
-      // the dl* functions are in libc on FreeBSD
-    }
-    else {
-      pragma(lib, "dl");
-    }
-
-    version(Tango) {
-      import tango.sys.Common;
-    } else version(linux) {
-      import std.c.linux.linux;
-    } else {
-      extern(C) {
-        const RTLD_NOW = 2;
-
-        void *dlopen(CCPTR file, int mode);
-        int dlclose(void* handle);
-        void *dlsym(void* handle, CCPTR name);
-        CCPTR dlerror();
-      }
-    }
-
-    alias void* SwigSharedLibHandle;
-
-    SwigSharedLibHandle swigLoadSharedLib(string libName) {
-      return dlopen(swigToCString(libName), RTLD_NOW);
-    }
-
-    void swigUnloadSharedLib(SwigSharedLibHandle hlib) {
-      dlclose(hlib);
-    }
-
-    void* swigGetSymbol(SwigSharedLibHandle hlib, string symbolName) {
-      return dlsym(hlib, swigToCString(symbolName));
-    }
-
-    string swigGetErrorStr() {
-      CCPTR err = dlerror();
-      if (err is null) {
-        return "Unknown Error";
-      }
-      return swigToDString(err);
-    }
-  } else version(Windows) {
-    alias ushort WORD;
-    alias uint DWORD;
-    alias CCPTR LPCSTR;
-    alias void* HMODULE;
-    alias void* HLOCAL;
-    alias int function() FARPROC;
-    struct VA_LIST {}
-
-    extern (Windows) {
-      HMODULE LoadLibraryA(LPCSTR);
-      FARPROC GetProcAddress(HMODULE, LPCSTR);
-      void FreeLibrary(HMODULE);
-      DWORD GetLastError();
-      DWORD FormatMessageA(DWORD, in void*, DWORD, DWORD, LPCSTR, DWORD, VA_LIST*);
-      HLOCAL LocalFree(HLOCAL);
-    }
-
-    DWORD MAKELANGID(WORD p, WORD s) {
-      return (((cast(WORD)s) << 10) | cast(WORD)p);
-    }
-
-    enum {
-      LANG_NEUTRAL                    = 0,
-      SUBLANG_DEFAULT                 = 1,
-      FORMAT_MESSAGE_ALLOCATE_BUFFER  = 256,
-      FORMAT_MESSAGE_IGNORE_INSERTS   = 512,
-      FORMAT_MESSAGE_FROM_SYSTEM      = 4096
-    }
-
-    alias HMODULE SwigSharedLibHandle;
-
-    SwigSharedLibHandle swigLoadSharedLib(string libName) {
-      return LoadLibraryA(swigToCString(libName));
-    }
-
-    void swigUnloadSharedLib(SwigSharedLibHandle hlib) {
-      FreeLibrary(hlib);
-    }
-
-    void* swigGetSymbol(SwigSharedLibHandle hlib, string symbolName) {
-      return GetProcAddress(hlib, swigToCString(symbolName));
-    }
-
-    string swigGetErrorStr() {
-      DWORD errcode = GetLastError();
-
-      LPCSTR msgBuf;
-      DWORD i = FormatMessageA(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER |
-        FORMAT_MESSAGE_FROM_SYSTEM |
-        FORMAT_MESSAGE_IGNORE_INSERTS,
-        null,
-        errcode,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        cast(LPCSTR)&msgBuf,
-        0,
-        null);
-
-      string text = swigToDString(msgBuf);
-      LocalFree(cast(HLOCAL)msgBuf);
-
-      if (i >= 2) {
-        i -= 2;
-      }
-      return text[0 .. i];
-    }
-  } else {
-    static assert(0, "Operating system not supported by the wrapper loading code.");
-  }
-
-  final class SwigSharedLib {
-    void load(string[] names) {
-      if (_hlib !is null) return;
-
-      string[] failedLibs;
-      string[] reasons;
-
-      foreach(n; names) {
-        _hlib = swigLoadSharedLib(n);
-        if (_hlib is null) {
-          failedLibs ~= n;
-          reasons ~= swigGetErrorStr();
-          continue;
-        }
-        _name = n;
-        break;
-      }
-
-      if (_hlib is null) {
-        throw new SwigSwigSharedLibLoadException(failedLibs, reasons);
-      }
-    }
-
-    void* loadSymbol(string symbolName, bool doThrow = true) {
-      void* sym = swigGetSymbol(_hlib, symbolName);
-      if(doThrow && (sym is null)) {
-        throw new SwigSymbolLoadException(_name, symbolName);
-      }
-      return sym;
-    }
-
-    void unload() {
-      if(_hlib !is null) {
-        swigUnloadSharedLib(_hlib);
-        _hlib = null;
-      }
-    }
-
-  private:
-    string _name;
-    SwigSharedLibHandle _hlib;
-  }
-}
-
-static this() {
-  string[] possibleFileNames;
-  version (Posix) {
-    version (OSX) {
-      possibleFileNames ~= ["lib$wraplibrary.dylib", "lib$wraplibrary.bundle"];
-    }
-    possibleFileNames ~= ["lib$wraplibrary.so"];
-  } else version (Windows) {
-    possibleFileNames ~= ["$wraplibrary.dll", "lib$wraplibrary.so"];
-  } else {
-    static assert(false, "Operating system not supported by the wrapper loading code.");
-  }
-
-  auto library = new SwigSharedLib;
-  library.load(possibleFileNames);
-
-  string bindCode(string functionPointer, string symbol) {
-    return functionPointer ~ " = cast(typeof(" ~ functionPointer ~
-      "))library.loadSymbol(`" ~ symbol ~ "`);";
-  }
-
-  //#if !defined(SWIG_D_NO_EXCEPTION_HELPER)
-  mixin(bindCode("swigRegisterExceptionCallbacks$module", "SWIGRegisterExceptionCallbacks_$module"));
-  //#endif // SWIG_D_NO_EXCEPTION_HELPER
-  //#if !defined(SWIG_D_NO_STRING_HELPER)
-  mixin(bindCode("swigRegisterStringCallback$module", "SWIGRegisterStringCallback_$module"));
-  //#endif // SWIG_D_NO_STRING_HELPER
-  $wrapperloaderbindcode
-}
-
-//#if !defined(SWIG_D_NO_EXCEPTION_HELPER)
-extern(C) void function(
-  SwigExceptionCallback exceptionCallback,
-  SwigExceptionCallback illegalArgumentCallback,
-  SwigExceptionCallback illegalElementCallback,
-  SwigExceptionCallback ioCallback,
-  SwigExceptionCallback noSuchElementCallback) swigRegisterExceptionCallbacks$module;
-//#endif // SWIG_D_NO_EXCEPTION_HELPER
-
-//#if !defined(SWIG_D_NO_STRING_HELPER)
-extern(C) void function(SwigStringCallback callback) swigRegisterStringCallback$module;
-//#endif // SWIG_D_NO_STRING_HELPER
-%}
-
-%pragma(d) wrapperloaderbindcommand = %{
-  mixin(bindCode("$function", "$symbol"));%}
diff --git a/dependencies2013/win32/swig/Lib/director_common.swg b/dependencies2013/win32/swig/Lib/director_common.swg
deleted file mode 100644
index 9ce93c7e..00000000
--- a/dependencies2013/win32/swig/Lib/director_common.swg
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director_common.swg
- *
- * This file contains support for director classes which is common between
- * languages.
- * ----------------------------------------------------------------------------- */
-
-/*
-  Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
-  'Swig' namespace. This could be useful for multi-modules projects.
-*/
-#ifdef SWIG_DIRECTOR_STATIC
-/* Force anonymous (static) namespace */
-#define Swig
-#endif
diff --git a/dependencies2013/win32/swig/Lib/exception.i b/dependencies2013/win32/swig/Lib/exception.i
deleted file mode 100644
index da0d56cd..00000000
--- a/dependencies2013/win32/swig/Lib/exception.i
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -----------------------------------------------------------------------------
- * exception.i
- *
- * SWIG library file providing language independent exception handling
- * ----------------------------------------------------------------------------- */
-
-#if defined(SWIGUTL)
-#error "This version of exception.i should not be used"
-#endif
-
-
-%insert("runtime") "swigerrors.swg"
-
-
-#ifdef SWIGPHP5
-%{
-#include "zend_exceptions.h"
-#define SWIG_exception(code, msg) do { zend_throw_exception(NULL, (char*)msg, code TSRMLS_CC); goto thrown; } while (0)
-%}
-#endif
-
-#ifdef SWIGPHP7
-%{
-#include "zend_exceptions.h"
-#define SWIG_exception(code, msg) do { zend_throw_exception(NULL, (char*)msg, code); goto thrown; } while (0)
-%}
-#endif
-
-#ifdef SWIGGUILE
-%{
-  SWIGINTERN void SWIG_exception_ (int code, const char *msg,
-                               const char *subr) {
-#define ERROR(scmerr)					\
-	scm_error(scm_from_locale_string((char *) (scmerr)),	\
-		  (char *) subr, (char *) msg,		\
-		  SCM_EOL, SCM_BOOL_F)
-#define MAP(swigerr, scmerr)			\
-	case swigerr:				\
-	  ERROR(scmerr);			\
-	  break
-    switch (code) {
-      MAP(SWIG_MemoryError,	"swig-memory-error");
-      MAP(SWIG_IOError,		"swig-io-error");
-      MAP(SWIG_RuntimeError,	"swig-runtime-error");
-      MAP(SWIG_IndexError,	"swig-index-error");
-      MAP(SWIG_TypeError,	"swig-type-error");
-      MAP(SWIG_DivisionByZero,	"swig-division-by-zero");
-      MAP(SWIG_OverflowError,	"swig-overflow-error");
-      MAP(SWIG_SyntaxError,	"swig-syntax-error");
-      MAP(SWIG_ValueError,	"swig-value-error");
-      MAP(SWIG_SystemError,	"swig-system-error");
-    default:
-      ERROR("swig-error");
-    }
-#undef ERROR
-#undef MAP
-  }
-
-#define SWIG_exception(a,b) SWIG_exception_(a, b, FUNC_NAME)
-%}
-#endif
-
-#ifdef SWIGMZSCHEME
-
-%{
-SWIGINTERN void SWIG_exception_ (int code, const char *msg) {
-#define ERROR(errname)				\
-	scheme_signal_error(errname " (%s)", msg);
-#define MAP(swigerr, errname)			\
-	case swigerr:				\
-	  ERROR(errname);			\
-	  break
-    switch (code) {
-      MAP(SWIG_MemoryError,	"swig-memory-error");
-      MAP(SWIG_IOError,		"swig-io-error");
-      MAP(SWIG_RuntimeError,	"swig-runtime-error");
-      MAP(SWIG_IndexError,	"swig-index-error");
-      MAP(SWIG_TypeError,	"swig-type-error");
-      MAP(SWIG_DivisionByZero,	"swig-division-by-zero");
-      MAP(SWIG_OverflowError,	"swig-overflow-error");
-      MAP(SWIG_SyntaxError,	"swig-syntax-error");
-      MAP(SWIG_ValueError,	"swig-value-error");
-      MAP(SWIG_SystemError,	"swig-system-error");
-    default:
-      ERROR("swig-error");
-    }
-#undef ERROR
-#undef MAP
-  }
-
-#define SWIG_exception(a,b) SWIG_exception_(a, b)
-%}
-#endif
-
-#ifdef SWIGJAVA
-%{
-SWIGINTERN void SWIG_JavaException(JNIEnv *jenv, int code, const char *msg) {
-  SWIG_JavaExceptionCodes exception_code = SWIG_JavaUnknownError;
-  switch(code) {
-  case SWIG_MemoryError:
-    exception_code = SWIG_JavaOutOfMemoryError;
-    break;
-  case SWIG_IOError:
-    exception_code = SWIG_JavaIOException;
-    break;
-  case SWIG_SystemError:
-  case SWIG_RuntimeError:
-    exception_code = SWIG_JavaRuntimeException;
-    break;
-  case SWIG_OverflowError:
-  case SWIG_IndexError:
-    exception_code = SWIG_JavaIndexOutOfBoundsException;
-    break;
-  case SWIG_DivisionByZero:
-    exception_code = SWIG_JavaArithmeticException;
-    break;
-  case SWIG_SyntaxError:
-  case SWIG_ValueError:
-  case SWIG_TypeError:
-    exception_code = SWIG_JavaIllegalArgumentException;
-    break;
-  case SWIG_UnknownError:
-  default:
-    exception_code = SWIG_JavaUnknownError;
-    break;
-  }
-  SWIG_JavaThrowException(jenv, exception_code, msg);
-}
-%}
-
-#define SWIG_exception(code, msg)\
-{ SWIG_JavaException(jenv, code, msg); return $null; }
-#endif // SWIGJAVA
-
-#ifdef SWIGOCAML
-%{
-#define OCAML_MSG_BUF_LEN 1024
-SWIGINTERN void SWIG_exception_(int code, const char *msg) {
-  char msg_buf[OCAML_MSG_BUF_LEN];
-  sprintf( msg_buf, "Exception(%d): %s\n", code, msg );
-  failwith( msg_buf );
-}
-#define SWIG_exception(a,b) SWIG_exception_((a),(b))
-%}
-#endif
-
-
-#ifdef SWIGCHICKEN
-%{
-SWIGINTERN void SWIG_exception_(int code, const char *msg) {
-  C_word *a;
-  C_word scmmsg;
-  C_word list;
-
-  a = C_alloc (C_SIZEOF_STRING (strlen (msg)) + C_SIZEOF_LIST(2));
-  scmmsg = C_string2 (&a, (char *) msg);
-  list = C_list(&a, 2, C_fix(code), scmmsg);
-  SWIG_ThrowException(list);
-}
-#define SWIG_exception(a,b) SWIG_exception_((a),(b))
-%}
-#endif
-
-#ifdef SWIGCSHARP
-%{
-SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
-  if (code == SWIG_ValueError) {
-    SWIG_CSharpExceptionArgumentCodes exception_code = SWIG_CSharpArgumentOutOfRangeException;
-    SWIG_CSharpSetPendingExceptionArgument(exception_code, msg, 0);
-  } else {
-    SWIG_CSharpExceptionCodes exception_code = SWIG_CSharpApplicationException;
-    switch(code) {
-    case SWIG_MemoryError:
-      exception_code = SWIG_CSharpOutOfMemoryException;
-      break;
-    case SWIG_IndexError:
-      exception_code = SWIG_CSharpIndexOutOfRangeException;
-      break;
-    case SWIG_DivisionByZero:
-      exception_code = SWIG_CSharpDivideByZeroException;
-      break;
-    case SWIG_IOError:
-      exception_code = SWIG_CSharpIOException;
-      break;
-    case SWIG_OverflowError:
-      exception_code = SWIG_CSharpOverflowException;
-      break;
-    case SWIG_RuntimeError:
-    case SWIG_TypeError:
-    case SWIG_SyntaxError:
-    case SWIG_SystemError:
-    case SWIG_UnknownError:
-    default:
-      exception_code = SWIG_CSharpApplicationException;
-      break;
-    }
-    SWIG_CSharpSetPendingException(exception_code, msg);
-  }
-}
-%}
-
-#define SWIG_exception(code, msg)\
-{ SWIG_CSharpException(code, msg); return $null; }
-#endif // SWIGCSHARP
-
-#ifdef SWIGLUA
-
-%{
-#define SWIG_exception(a,b)\
-{ lua_pushfstring(L,"%s:%s",#a,b);SWIG_fail; }
-%}
-
-#endif // SWIGLUA
-
-#ifdef SWIGD
-%{
-SWIGINTERN void SWIG_DThrowException(int code, const char *msg) {
-  SWIG_DExceptionCodes exception_code;
-  switch(code) {
-  case SWIG_IndexError:
-    exception_code = SWIG_DNoSuchElementException;
-    break;
-  case SWIG_IOError:
-    exception_code = SWIG_DIOException;
-    break;
-  case SWIG_ValueError:
-    exception_code = SWIG_DIllegalArgumentException;
-    break;
-  case SWIG_DivisionByZero:
-  case SWIG_MemoryError:
-  case SWIG_OverflowError:
-  case SWIG_RuntimeError:
-  case SWIG_TypeError:
-  case SWIG_SyntaxError:
-  case SWIG_SystemError:
-  case SWIG_UnknownError:
-  default:
-    exception_code = SWIG_DException;
-    break;
-  }
-  SWIG_DSetPendingException(exception_code, msg);
-}
-%}
-
-#define SWIG_exception(code, msg)\
-{ SWIG_DThrowException(code, msg); return $null; }
-#endif // SWIGD
-
-#ifdef __cplusplus
-/*
-  You can use the SWIG_CATCH_STDEXCEPT macro with the %exception
-  directive as follows:
-
-  %exception {
-    try {
-      $action
-    }
-    catch (my_except& e) {
-      ...
-    }
-    SWIG_CATCH_STDEXCEPT // catch std::exception
-    catch (...) {
-     SWIG_exception(SWIG_UnknownError, "Unknown exception");
-    }
-  }
-*/
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-%define SWIG_CATCH_STDEXCEPT
-  /* catching std::exception  */
-  catch (std::invalid_argument& e) {
-    SWIG_exception(SWIG_ValueError, e.what() );
-  } catch (std::domain_error& e) {
-    SWIG_exception(SWIG_ValueError, e.what() );
-  } catch (std::overflow_error& e) {
-    SWIG_exception(SWIG_OverflowError, e.what() );
-  } catch (std::out_of_range& e) {
-    SWIG_exception(SWIG_IndexError, e.what() );
-  } catch (std::length_error& e) {
-    SWIG_exception(SWIG_IndexError, e.what() );
-  } catch (std::runtime_error& e) {
-    SWIG_exception(SWIG_RuntimeError, e.what() );
-  } catch (std::bad_cast& e) {
-    SWIG_exception(SWIG_TypeError, e.what() );
-  } catch (std::exception& e) {
-    SWIG_exception(SWIG_SystemError, e.what() );
-  }
-%enddef
-%define SWIG_CATCH_UNKNOWN
-  catch (std::exception& e) {
-    SWIG_exception(SWIG_SystemError, e.what() );
-  }
-  catch (...) {
-    SWIG_exception(SWIG_UnknownError, "unknown exception");
-  }
-%enddef
-
-/* rethrow the unknown exception */
-
-#if defined(SWIGCSHARP) || defined(SWIGD)
-%typemap(throws,noblock=1, canthrow=1) (...) {
-  SWIG_exception(SWIG_RuntimeError,"unknown exception");
-}
-#else
-%typemap(throws,noblock=1) (...) {
-  SWIG_exception(SWIG_RuntimeError,"unknown exception");
-}
-#endif
-
-#endif /* __cplusplus */
-
-/* exception.i ends here */
diff --git a/dependencies2013/win32/swig/Lib/gcj/cni.i b/dependencies2013/win32/swig/Lib/gcj/cni.i
deleted file mode 100644
index fcc56687..00000000
--- a/dependencies2013/win32/swig/Lib/gcj/cni.i
+++ /dev/null
@@ -1,39 +0,0 @@
-%{
-#include <gcj/cni.h>
-%}
-
-%include <gcj/javaprims.i>
-
-extern void JvInitClass (jclass cls);
-
-extern jstring JvAllocString (jsize sz);
-
-extern jstring JvNewString (const jchar *chars, jsize len);
-
-extern jstring JvNewStringLatin1 (const char *bytes, jsize len);
-
-extern jstring JvNewStringLatin1 (const char *bytes);
-
-extern jchar* JvGetStringChars (jstring str);
-
-extern jsize JvGetStringUTFLength (jstring string);
-
-extern jsize JvGetStringUTFRegion (jstring str, jsize start, jsize len, char *buf);
-
-extern jstring JvNewStringUTF (const char *bytes);
-
-extern void *JvMalloc (jsize size);
-
-extern void JvFree (void *ptr);
-
-extern jint JvCreateJavaVM (JvVMInitArgs* vm_args);
-
-extern java::lang::Thread* JvAttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
-
-extern java::lang::Thread* JvAttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
-
-extern jint JvDetachCurrentThread (void);
-
-
-%include <gcj/cni.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/gcj/cni.swg b/dependencies2013/win32/swig/Lib/gcj/cni.swg
deleted file mode 100644
index 4bd07df0..00000000
--- a/dependencies2013/win32/swig/Lib/gcj/cni.swg
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cni.swg
- * ----------------------------------------------------------------------------- */
-
-#ifdef SWIG
-
-#define __attribute__(...)
-%ignore class$;
-#pragma SWIG nowarn=313,402
-
-%nodefaultdtor;
-
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/gcj/javaprims.i b/dependencies2013/win32/swig/Lib/gcj/javaprims.i
deleted file mode 100644
index 12c92a79..00000000
--- a/dependencies2013/win32/swig/Lib/gcj/javaprims.i
+++ /dev/null
@@ -1,422 +0,0 @@
-%include <stdint.i>
-
-typedef int8_t jbyte;
-typedef int16_t jshort;
-typedef int32_t jint;
-typedef int64_t jlong;
-typedef float jfloat;
-typedef double jdouble;
-typedef jint jsize;
-typedef int8_t jboolean;
-
-extern "Java" 
-{
-  namespace java
-  {
-    namespace io
-    {
-      class BufferedInputStream;
-      class BufferedOutputStream;
-      class BufferedReader;
-      class BufferedWriter;
-      class ByteArrayInputStream;
-      class ByteArrayOutputStream;
-      class CharArrayReader;
-      class CharArrayWriter;
-      class CharConversionException;
-      class DataInput;
-      class DataInputStream;
-      class DataOutput;
-      class DataOutputStream;
-      class EOFException;
-      class Externalizable;
-      class File;
-      class FileDescriptor;
-      class FileFilter;
-      class FileInputStream;
-      class FileNotFoundException;
-      class FileOutputStream;
-      class FilePermission;
-      class FileReader;
-      class FileWriter;
-      class FilenameFilter;
-      class FilterInputStream;
-      class FilterOutputStream;
-      class FilterReader;
-      class FilterWriter;
-      class IOException;
-      class InputStream;
-      class InputStreamReader;
-      class InterfaceComparator;
-      class InterruptedIOException;
-      class InvalidClassException;
-      class InvalidObjectException;
-      class LineNumberInputStream;
-      class LineNumberReader;
-      class MemberComparator;
-      class NotActiveException;
-      class NotSerializableException;
-      class ObjectInput;
-      class ObjectInputStream;
-      class ObjectInputStream$GetField;
-      class ObjectInputValidation;
-      class ObjectOutput;
-      class ObjectOutputStream;
-      class ObjectOutputStream$PutField;
-      class ObjectStreamClass;
-      class ObjectStreamConstants;
-      class ObjectStreamException;
-      class ObjectStreamField;
-      class OptionalDataException;
-      class OutputStream;
-      class OutputStreamWriter;
-      class PipedInputStream;
-      class PipedOutputStream;
-      class PipedReader;
-      class PipedWriter;
-      class PrintStream;
-      class PrintWriter;
-      class PushbackInputStream;
-      class PushbackReader;
-      class RandomAccessFile;
-      class Reader;
-      class SequenceInputStream;
-      class Serializable;
-      class SerializablePermission;
-      class StreamCorruptedException;
-      class StreamTokenizer;
-      class StringBufferInputStream;
-      class StringReader;
-      class StringWriter;
-      class SyncFailedException;
-      class UTFDataFormatException;
-      class UnsupportedEncodingException;
-      class VMObjectStreamClass;
-      class ValidatorAndPriority;
-      class WriteAbortedException;
-      class Writer;
-    }
-
-    namespace lang
-    {
-      class AbstractMethodError;
-      class ArithmeticException;
-      class ArrayIndexOutOfBoundsException;
-      class ArrayStoreException;
-      class AssertionError;
-      class Boolean;
-      class Byte;
-      class CharSequence;
-      class Character;
-      class Character$Subset;
-      class Character$UnicodeBlock;
-      class Class;
-      class ClassCastException;
-      class ClassCircularityError;
-      class ClassFormatError;
-      class ClassLoader;
-      class ClassNotFoundException;
-      class CloneNotSupportedException;
-      class Cloneable;
-      class Comparable;
-      class Compiler;
-      class ConcreteProcess;
-      class Double;
-      class Error;
-      class Exception;
-      class ExceptionInInitializerError;
-      class Float;
-      class IllegalAccessError;
-      class IllegalAccessException;
-      class IllegalArgumentException;
-      class IllegalMonitorStateException;
-      class IllegalStateException;
-      class IllegalThreadStateException;
-      class IncompatibleClassChangeError;
-      class IndexOutOfBoundsException;
-      class InheritableThreadLocal;
-      class InstantiationError;
-      class InstantiationException;
-      class Integer;
-      class InternalError;
-      class InterruptedException;
-      class LinkageError;
-      class Long;
-      class Math;
-      class NegativeArraySizeException;
-      class NoClassDefFoundError;
-      class NoSuchFieldError;
-      class NoSuchFieldException;
-      class NoSuchMethodError;
-      class NoSuchMethodException;
-      class NullPointerException;
-      class Number;
-      class NumberFormatException;
-      class Object;
-      class OutOfMemoryError;
-      class Package;
-      class Process;
-      class Runnable;
-      class Runtime;
-      class RuntimeException;
-      class RuntimePermission;
-      class SecurityContext;
-      class SecurityException;
-      class SecurityManager;
-      class Short;
-      class StackOverflowError;
-      class StackTraceElement;
-      class StrictMath;
-      class String;
-      class String$CaseInsensitiveComparator;
-      class StringBuffer;
-      class StringIndexOutOfBoundsException;
-      class System;
-      class Thread;
-      class ThreadDeath;
-      class ThreadGroup;
-      class ThreadLocal;
-      class Throwable;
-      class UnknownError;
-      class UnsatisfiedLinkError;
-      class UnsupportedClassVersionError;
-      class UnsupportedOperationException;
-      class VMClassLoader;
-      class VMSecurityManager;
-      class VMThrowable;
-      class VerifyError;
-      class VirtualMachineError;
-      class Void;
-      namespace ref
-      {
-        class PhantomReference;
-        class Reference;
-        class ReferenceQueue;
-        class SoftReference;
-        class WeakReference;
-      }
-
-      namespace reflect
-      {
-        class AccessibleObject;
-        class Array;
-        class Constructor;
-        class Field;
-        class InvocationHandler;
-        class InvocationTargetException;
-        class Member;
-        class Method;
-        class Modifier;
-        class Proxy;
-        class Proxy$ClassFactory;
-        class Proxy$ProxyData;
-        class Proxy$ProxySignature;
-        class Proxy$ProxyType;
-        class ReflectPermission;
-        class UndeclaredThrowableException;
-      }
-    }
-
-    namespace util
-    {
-      class AbstractCollection;
-      class AbstractList;
-      class AbstractMap;
-      class AbstractMap$BasicMapEntry;
-      class AbstractSequentialList;
-      class AbstractSet;
-      class ArrayList;
-      class Arrays;
-      class Arrays$ArrayList;
-      class BitSet;
-      class Calendar;
-      class Collection;
-      class Collections;
-      class Collections$CopiesList;
-      class Collections$EmptyList;
-      class Collections$EmptyMap;
-      class Collections$EmptySet;
-      class Collections$ReverseComparator;
-      class Collections$SingletonList;
-      class Collections$SingletonMap;
-      class Collections$SingletonSet;
-      class Collections$SynchronizedCollection;
-      class Collections$SynchronizedIterator;
-      class Collections$SynchronizedList;
-      class Collections$SynchronizedListIterator;
-      class Collections$SynchronizedMap;
-      class Collections$SynchronizedMapEntry;
-      class Collections$SynchronizedRandomAccessList;
-      class Collections$SynchronizedSet;
-      class Collections$SynchronizedSortedMap;
-      class Collections$SynchronizedSortedSet;
-      class Collections$UnmodifiableCollection;
-      class Collections$UnmodifiableEntrySet;
-      class Collections$UnmodifiableIterator;
-      class Collections$UnmodifiableList;
-      class Collections$UnmodifiableListIterator;
-      class Collections$UnmodifiableMap;
-      class Collections$UnmodifiableRandomAccessList;
-      class Collections$UnmodifiableSet;
-      class Collections$UnmodifiableSortedMap;
-      class Collections$UnmodifiableSortedSet;
-      class Comparator;
-      class ConcurrentModificationException;
-      class Currency;
-      class Date;
-      class Dictionary;
-      class EmptyStackException;
-      class Enumeration;
-      class EventListener;
-      class EventListenerProxy;
-      class EventObject;
-      class GregorianCalendar;
-      class HashMap;
-      class HashMap$HashEntry;
-      class HashMap$HashIterator;
-      class HashSet;
-      class Hashtable;
-      class Hashtable$Enumerator;
-      class Hashtable$HashEntry;
-      class Hashtable$HashIterator;
-      class IdentityHashMap;
-      class IdentityHashMap$IdentityEntry;
-      class IdentityHashMap$IdentityIterator;
-      class Iterator;
-      class LinkedHashMap;
-      class LinkedHashMap$LinkedHashEntry;
-      class LinkedHashSet;
-      class LinkedList;
-      class LinkedList$Entry;
-      class LinkedList$LinkedListItr;
-      class List;
-      class ListIterator;
-      class ListResourceBundle;
-      class Locale;
-      class Map;
-      class Map$Entry;
-      class Map$Map;
-      class MissingResourceException;
-      class MyResources;
-      class NoSuchElementException;
-      class Observable;
-      class Observer;
-      class Properties;
-      class PropertyPermission;
-      class PropertyPermissionCollection;
-      class PropertyResourceBundle;
-      class Random;
-      class RandomAccess;
-      class RandomAccessSubList;
-      class ResourceBundle;
-      class Set;
-      class SimpleTimeZone;
-      class SortedMap;
-      class SortedSet;
-      class Stack;
-      class StringTokenizer;
-      class SubList;
-      class TimeZone;
-      class Timer;
-      class Timer$Scheduler;
-      class Timer$TaskQueue;
-      class TimerTask;
-      class TooManyListenersException;
-      class TreeMap;
-      class TreeMap$Node;
-      class TreeMap$SubMap;
-      class TreeMap$TreeIterator;
-      class TreeSet;
-      class Vector;
-      class WeakHashMap;
-      class WeakHashMap$WeakBucket;
-      class WeakHashMap$WeakEntry;
-      class WeakHashMap$WeakEntrySet;
-      namespace jar
-      {
-        class Attributes;
-        class Attributes$Name;
-        class JarEntry;
-        class JarException;
-        class JarFile;
-        class JarFile$JarEnumeration;
-        class JarInputStream;
-        class JarOutputStream;
-        class Manifest;
-      }
-
-      namespace logging
-      {
-        class ConsoleHandler;
-        class ErrorManager;
-        class FileHandler;
-        class Filter;
-        class Formatter;
-        class Handler;
-        class Level;
-        class LogManager;
-        class LogRecord;
-        class Logger;
-        class LoggingPermission;
-        class MemoryHandler;
-        class SimpleFormatter;
-        class SocketHandler;
-        class StreamHandler;
-        class XMLFormatter;
-      }
-
-      namespace prefs
-      {
-        class AbstractPreferences;
-        class BackingStoreException;
-        class InvalidPreferencesFormatException;
-        class NodeChangeEvent;
-        class NodeChangeListener;
-        class PreferenceChangeEvent;
-        class PreferenceChangeListener;
-        class Preferences;
-        class PreferencesFactory;
-      }
-
-      namespace regex
-      {
-        class Matcher;
-        class Pattern;
-        class PatternSyntaxException;
-      }
-
-      namespace zip
-      {
-        class Adler32;
-        class CRC32;
-        class CheckedInputStream;
-        class CheckedOutputStream;
-        class Checksum;
-        class DataFormatException;
-        class Deflater;
-        class DeflaterOutputStream;
-        class GZIPInputStream;
-        class GZIPOutputStream;
-        class Inflater;
-        class InflaterInputStream;
-        class ZipConstants;
-        class ZipEntry;
-        class ZipException;
-        class ZipFile;
-        class ZipFile$PartialInputStream;
-        class ZipFile$ZipEntryEnumeration;
-        class ZipInputStream;
-        class ZipOutputStream;
-      }
-    }
-  }
-}
-  
-typedef class java::lang::Object* jobject;
-typedef class java::lang::Class* jclass;
-typedef class java::lang::Throwable* jthrowable;
-typedef class java::lang::String* jstring;
-
-
-%include <gcj/cni.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/go/cdata.i b/dependencies2013/win32/swig/Lib/go/cdata.i
deleted file mode 100644
index b4411af9..00000000
--- a/dependencies2013/win32/swig/Lib/go/cdata.i
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cdata.i
- *
- * SWIG library file containing macros for manipulating raw C data as strings.
- * ----------------------------------------------------------------------------- */
-
-%{
-typedef struct SWIGCDATA {
-    char *data;
-    intgo len;
-} SWIGCDATA;
-%}
-
-%fragment("cdata", "header") %{
-struct swigcdata {
-  intgo size;
-  void *data;
-};
-%}
-
-%typemap(gotype) SWIGCDATA "[]byte"
-
-%typemap(imtype) SWIGCDATA "uint64"
-
-%typemap(out, fragment="cdata") SWIGCDATA(struct swigcdata *swig_out) %{
-  swig_out = (struct swigcdata *)malloc(sizeof(*swig_out));
-  if (swig_out) {
-    swig_out->size = $1.len;
-    swig_out->data = malloc(swig_out->size);
-    if (swig_out->data) {
-      memcpy(swig_out->data, $1.data, swig_out->size);
-    }
-  }
-  $result = *(long long *)(void **)&swig_out;
-%}
-
-%typemap(goout) SWIGCDATA %{
-  {
-    type swigcdata struct { size int; data uintptr }
-    p := (*swigcdata)(unsafe.Pointer(uintptr($1)))
-    if p == nil || p.data == 0 {
-      $result = nil
-    } else {
-      b := make([]byte, p.size)
-      a := (*[0x7fffffff]byte)(unsafe.Pointer(p.data))[:p.size]
-      copy(b, a)
-      Swig_free(p.data)
-      Swig_free(uintptr(unsafe.Pointer(p)))
-      $result = b
-    }
-  }
-%}
-
-/* -----------------------------------------------------------------------------
- * %cdata(TYPE [, NAME]) 
- *
- * Convert raw C data to a binary string.
- * ----------------------------------------------------------------------------- */
-
-%define %cdata(TYPE,NAME...)
-
-%insert("header") {
-#if #NAME == ""
-static SWIGCDATA cdata_##TYPE(TYPE *ptr, int nelements) {
-#else
-static SWIGCDATA cdata_##NAME(TYPE *ptr, int nelements) {
-#endif
-   SWIGCDATA d;
-   d.data = (char *) ptr;
-#if #TYPE != "void"
-   d.len  = nelements*sizeof(TYPE);
-#else
-   d.len  = nelements;
-#endif
-   return d;
-}
-}
-
-%typemap(default) int nelements "$1 = 1;"
-
-#if #NAME == ""
-SWIGCDATA cdata_##TYPE(TYPE *ptr, int nelements);
-#else
-SWIGCDATA cdata_##NAME(TYPE *ptr, int nelements);
-#endif
-%enddef
-
-%typemap(default) int nelements;
-
-%rename(cdata) ::cdata_void(void *ptr, int nelements);
-
-%cdata(void);
-
-/* Memory move function. Due to multi-argument typemaps this appears
-   to be wrapped as
-   void memmove(void *data, const char *s); */
-void memmove(void *data, char *indata, int inlen);
diff --git a/dependencies2013/win32/swig/Lib/go/exception.i b/dependencies2013/win32/swig/Lib/go/exception.i
deleted file mode 100644
index 5abd306a..00000000
--- a/dependencies2013/win32/swig/Lib/go/exception.i
+++ /dev/null
@@ -1,7 +0,0 @@
-%typemap(throws,noblock=1) (...) {
-  SWIG_exception(SWIG_RuntimeError,"unknown exception");
-}
-
-%insert("runtime") %{
-#define SWIG_exception(code, msg) _swig_gopanic(msg)
-%}
diff --git a/dependencies2013/win32/swig/Lib/go/go.swg b/dependencies2013/win32/swig/Lib/go/go.swg
deleted file mode 100644
index 53b653f7..00000000
--- a/dependencies2013/win32/swig/Lib/go/go.swg
+++ /dev/null
@@ -1,698 +0,0 @@
-/* ------------------------------------------------------------
- * go.swg
- *
- * Go configuration module.
- * ------------------------------------------------------------ */
-
-%include <gostring.swg>
-
-/* Code insertion directives */
-#define %go_import(...) %insert(go_imports) %{__VA_ARGS__%}
-
-/* Basic types */
-
-%typemap(gotype) bool,               const bool &               "bool"
-%typemap(gotype) char,               const char &               "byte"
-%typemap(gotype) signed char,        const signed char &        "int8"
-%typemap(gotype) unsigned char,      const unsigned char &      "byte"
-%typemap(gotype) short,              const short &              "int16"
-%typemap(gotype) unsigned short,     const unsigned short &     "uint16"
-%typemap(gotype) int,                const int &                "int"
-%typemap(gotype) unsigned int,       const unsigned int &       "uint"
-%typemap(gotype) long,               const long &               "int64"
-%typemap(gotype) unsigned long,      const unsigned long &      "uint64"
-%typemap(gotype) long long,          const long long &          "int64"
-%typemap(gotype) unsigned long long, const unsigned long long & "uint64"
-%typemap(gotype) float,              const float &              "float32"
-%typemap(gotype) double,             const double &             "float64"
-
-%typemap(in) bool,
-	     char,
-	     signed char,
-	     unsigned char,
-	     short,
-	     unsigned short,
-	     int,
-	     unsigned int,
-	     long,
-	     unsigned long,
-	     long long,
-	     unsigned long long,
-	     float,
-	     double
-%{ $1 = ($1_ltype)$input; %}
-
-%typemap(in) const bool &,
-	     const char &,
-	     const signed char &,
-	     const unsigned char &,
-	     const short &,
-	     const unsigned short &,
-	     const int &,
-	     const unsigned int &,
-	     const long long &,
-	     const unsigned long long &,
-	     const float &,
-	     const double &
-%{ $1 = ($1_ltype)&$input; %}
-
-%typemap(in) const long & ($*1_ltype temp),
-	     const unsigned long & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input;
-   $1 = ($1_ltype)&temp; %}
-
-%typemap(out) bool,
-	      char,
-	      signed char,
-	      unsigned char,
-	      short,
-	      unsigned short,
-	      int,
-	      unsigned int,
-	      long,
-	      unsigned long,
-	      long long,
-	      unsigned long long,
-	      float,
-	      double
-%{ $result = $1; %}
-
-%typemap(goout) bool,
-	      char,
-	      signed char,
-	      unsigned char,
-	      short,
-	      unsigned short,
-	      int,
-	      unsigned int,
-	      long,
-	      unsigned long,
-	      long long,
-	      unsigned long long,
-	      float,
-	      double
-""
-
-%typemap(out) const bool &,
-	      const char &,
-	      const signed char &,
-	      const unsigned char &,
-	      const short &,
-	      const unsigned short &,
-	      const int &,
-	      const unsigned int &,
-	      const long &,
-	      const unsigned long &,
-	      const long long &,
-	      const unsigned long long &,
-	      const float &,
-	      const double &
-%{ $result = ($*1_ltype)*$1; %}
-
-%typemap(goout) const bool &,
-	      const char &,
-	      const signed char &,
-	      const unsigned char &,
-	      const short &,
-	      const unsigned short &,
-	      const int &,
-	      const unsigned int &,
-	      const long &,
-	      const unsigned long &,
-	      const long long &,
-	      const unsigned long long &,
-	      const float &,
-	      const double &
-""
-
-%typemap(out) void ""
-
-%typemap(goout) void ""
-
-%typemap(directorin) bool,
-		     char,
-		     signed char,
-		     unsigned char,
-		     short,
-		     unsigned short,
-		     int,
-		     unsigned int,
-		     long,
-		     unsigned long,
-		     long long,
-		     unsigned long long,
-		     float,
-		     double
-%{ $input = ($1_ltype)$1; %}
-
-%typemap(godirectorin) bool,
-		     char,
-		     signed char,
-		     unsigned char,
-		     short,
-		     unsigned short,
-		     int,
-		     unsigned int,
-		     long,
-		     unsigned long,
-		     long long,
-		     unsigned long long,
-		     float,
-		     double
-""
-
-%typemap(directorin) const bool &,
-		     const char &,
-		     const signed char &,
-		     const unsigned char &,
-		     const short &,
-		     const unsigned short &,
-		     const int &,
-		     const unsigned int &,
-		     const long &,
-		     const unsigned long &,
-		     const long long &,
-		     const unsigned long long &,
-		     const float &,
-		     const double &
-%{ $input = ($*1_ltype)$1; %}
-
-%typemap(godirectorin) const bool &,
-		     const char &,
-		     const signed char &,
-		     const unsigned char &,
-		     const short &,
-		     const unsigned short &,
-		     const int &,
-		     const unsigned int &,
-		     const long &,
-		     const unsigned long &,
-		     const long long &,
-		     const unsigned long long &,
-		     const float &,
-		     const double &
-""
-
-%typemap(directorout) bool,
-		      char,
-		      signed char,
-		      unsigned char,
-		      short,
-		      unsigned short,
-		      int,
-		      unsigned int,
-		      long,
-		      unsigned long,
-		      long long,
-		      unsigned long long,
-		      float,
-		      double
-%{ $result = ($1_ltype)$input; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) const bool &,
-		      const char &,
-		      const signed char &,
-		      const unsigned char &,
-		      const short &,
-		      const unsigned short &,
-		      const int &,
-		      const unsigned int &,
-		      const long &,
-		      const unsigned long &,
-		      const long long &,
-		      const unsigned long long &,
-		      const float &,
-		      const double &
-%{
-  $result = new $*1_ltype($input);
-  swig_acquire_pointer(&swig_mem, $result);
-%}
-
-/* The size_t type.  */
-
-%typemap(gotype) size_t, const size_t & %{int64%}
-
-%typemap(in) size_t
-%{ $1 = (size_t)$input; %}
-
-%typemap(in) const size_t &
-%{ $1 = ($1_ltype)&$input; %}
-
-%typemap(out) size_t
-%{ $result = $1; %}
-
-%typemap(goout) size_t ""
-
-%typemap(out) const size_t &
-%{ $result = ($*1_ltype)*$1; %}
-
-%typemap(goout) const size_t & ""
-
-%typemap(directorin) size_t
-%{ $input = (size_t)$1; %}
-
-%typemap(godirectorin) size_t ""
-
-%typemap(directorin) const size_t &
-%{ $input = ($*1_ltype)$1; %}
-
-%typemap(godirectorin) const size_t & ""
-
-%typemap(directorout) size_t
-%{ $result = ($1_ltype)$input; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) const size_t &
-%{
-  $result = new $*1_ltype($input);
-  swig_acquire_pointer(&swig_mem, $result);
-%}
-
-/* Member pointers.  */
-
-%typemap(gotype) SWIGTYPE (CLASS::*)
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE (CLASS::*)
-%{ $1 = *($&1_ltype)$input; %}
-
-%typemap(out) SWIGTYPE (CLASS::*)
-%{
-  struct swig_out_type { intgo size; void* val; } *swig_out;
-  swig_out = (struct swig_out_type*)malloc(sizeof(*swig_out));
-  if (swig_out) {
-    swig_out->size = sizeof($1_ltype);
-    swig_out->val = malloc(swig_out->size);
-    if (swig_out->val) {
-      *($&1_ltype)(swig_out->val) = $1;
-    }
-  }
-  $result = swig_out;
-%}
-
-%typemap(goout) SWIGTYPE (CLASS::*)
-%{
-  {
-    type swig_out_type struct { size int; val uintptr }
-    p := (*swig_out_type)(unsafe.Pointer($1))
-    if p == nil || p.val == 0 {
-      $result = nil
-    } else {
-      m := make([]byte, p.size)
-      a := (*[1024]byte)(unsafe.Pointer(p.val))[:p.size]
-      copy(m, a)
-      Swig_free(p.val)
-      Swig_free(uintptr(unsafe.Pointer(p)))
-      $result = &m[0]
-    }
-  }
-%}
-
-%typemap(directorin) SWIGTYPE (CLASS::*)
-%{ $input = *($&1_ltype)$1; %}
-
-%typemap(godirectorin) SWIGTYPE (CLASS::*) ""
-
-%typemap(directorout) SWIGTYPE (CLASS::*)
-%{
-  $result = new $1_ltype($input);
-  swig_acquire_pointer(&swig_mem, $result);
-%}
-
-/* Pointers.  */
-
-/* We can't translate pointers using a typemap, so that is handled in
-   the C++ code.  */
-%typemap(gotype) SWIGTYPE *
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE *
-%{ $1 = *($&1_ltype)&$input; %}
-
-%typemap(out) SWIGTYPE *
-%{ *($&1_ltype)&$result = ($1_ltype)$1; %}
-
-%typemap(goout) SWIGTYPE * ""
-
-%typemap(directorin) SWIGTYPE *
-%{ *($&1_ltype)&$input = ($1_ltype)$1; %}
-
-%typemap(godirectorin) SWIGTYPE * ""
-
-%typemap(directorout) SWIGTYPE *
-%{ $result = *($&1_ltype)&$input; %}
-
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* Pointer references.  */
-
-%typemap(gotype) SWIGTYPE *const&
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE *const& ($*1_ltype temp = 0)
-%{
-  temp = *($1_ltype)&$input;
-  $1 = ($1_ltype)&temp;
-%}
-
-%typemap(out) SWIGTYPE *const&
-%{ *($1_ltype)&$result = *$1; %}
-
-%typemap(goout) SWIGTYPE *const& ""
-
-/* References.  */
-
-/* Converting a C++ reference to Go has to be handled in the C++
-   code.  */
-%typemap(gotype) SWIGTYPE &
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE &
-%{ $1 = *($&1_ltype)&$input; %}
-
-%typemap(out) SWIGTYPE &
-%{ *($&1_ltype)&$result = $1; %}
-
-%typemap(goout) SWIGTYPE & ""
-
-%typemap(directorin) SWIGTYPE &
-%{ $input = ($1_ltype)&$1; %}
-
-%typemap(godirectorin) SWIGTYPE & ""
-
-%typemap(directorout) SWIGTYPE &
-%{ *($&1_ltype)&$result = $input; %}
-
-%typemap(gotype) SWIGTYPE &&
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE &&
-%{ $1 = *($&1_ltype)&$input; %}
-
-%typemap(out) SWIGTYPE &&
-%{ *($&1_ltype)&$result = $1; %}
-
-%typemap(goout) SWIGTYPE && ""
-
-%typemap(directorin) SWIGTYPE &&
-%{ $input = ($1_ltype)&$1_name; %}
-
-%typemap(godirectorin) SWIGTYPE && ""
-
-%typemap(directorout) SWIGTYPE &&
-%{ *($&1_ltype)&$result = $input; %}
-
-/* C arrays turn into Go pointers.  If we know the length we can use a
-   slice.  */
-
-%typemap(gotype) SWIGTYPE []
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE []
-%{ $1 = *($&1_ltype)&$input; %}
-
-%typemap(out) SWIGTYPE []
-%{ *($&1_ltype)&$result = $1; %}
-
-%typemap(goout) SWIGTYPE [] ""
-
-%typemap(directorin) SWIGTYPE []
-%{ $input = *($1_ltype)&$1; %}
-
-%typemap(godirectorin) SWIGTYPE [] ""
-
-%typemap(directorout) SWIGTYPE []
-%{ *($&1_ltype)&$result = $input; %}
-
-/* Strings.  */
-
-%typemap(gotype)
-	char *, char *&, char[ANY], char[] "string"
-
-/* Needed to avoid confusion with the way the go module handles
-   references.  */
-%typemap(gotype) char&, unsigned char& "*byte"
-%typemap(gotype) signed char& "*int8"
-
-%typemap(in)
-	char *, char[ANY], char[]
-%{
-  $1 = ($1_ltype)malloc($input.n + 1);
-  memcpy($1, $input.p, $input.n);
-  $1[$input.n] = '\0';
-%}
-
-%typemap(in) char *& (char *temp)
-%{
-  temp = (char *)malloc($input.n + 1);
-  memcpy(temp, $input.p, $input.n);
-  temp[$input.n] = '\0';
-  $1 = ($1_ltype)&temp;
-%}
-
-%typemap(freearg)
-	char *, char *&, char[ANY], char[]
-%{ free($1); %}
-
-%typemap(out,fragment="AllocateString")
-	char *, char *&, char[ANY], char[]
-%{ $result = Swig_AllocateString((char*)$1, $1 ? strlen((char*)$1) : 0); %}
-
-%typemap(goout,fragment="CopyString")
-	char *, char *&, char[ANY], char[]
-%{ $result = swigCopyString($1) %}
-
-%typemap(directorin,fragment="AllocateString")
-	char *, char *&, char[ANY], char[]
-%{
-  $input = Swig_AllocateString((char*)$1, $1 ? strlen((char*)$1) : 0);
-%}
-
-%typemap(godirectorin,fragment="CopyString")
-	char *, char *&, char[ANY], char[]
-%{
-  $result = swigCopyString($input)
-%}
-
-%typemap(godirectorout)
-	char *, char *&, char[ANY], char[]
-%{
-  {
-    p := Swig_malloc(len($input) + 1)
-    s := (*[1<<30]byte)(unsafe.Pointer(p))[:len($input) + 1]
-    copy(s, $input)
-    s[len($input)] = 0
-    $result = *(*string)(unsafe.Pointer(&s))
-  }
-%}
-
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG)
-	char *, char *&, char[ANY], char[]
-%{ $result = ($1_ltype)$input.p; %}
-
-/* String & length */
-
-%typemap(gotype) (char *STRING, size_t LENGTH) "string"
-
-%typemap(in) (char *STRING, size_t LENGTH)
-%{
-  $1 = ($1_ltype)$input.p;
-  $2 = ($2_ltype)$input.n;
-%}
-
-%typemap(out,fragment="AllocateString") (char *STRING, size_t LENGTH)
-%{ $result = Swig_AllocateString((char*)$1, (size_t)$2); %}
-
-%typemap(goout,fragment="CopyString") (char *STRING, size_t LENGTH)
-%{ $result = swigCopyString($1) %}
-
-%typemap(directorin,fragment="AllocateString") (char *STRING, size_t LENGTH)
-%{ $input = Swig_AllocateString((char*)$1, $2); %}
-
-%typemap(godirectorin,fragment="CopyString") (char *STRING, size_t LENGTH)
-%{ $result = swigCopyString($input) %}
-
-%typemap(directorout) (char *STRING, size_t LENGTH)
-%{
-  $1 = ($1_ltype)$input.p;
-  $2 = ($2_ltype)$input.n;
-%}
-
-/* Enums.  We can't do the right thing for enums in typemap(gotype) so
-   we deliberately don't define them.  The right thing would be to
-   capitalize the name.  This is instead done in go.cxx.  */
-
-%typemap(gotype) enum SWIGTYPE
-%{$gotypename%}
-
-%typemap(in) enum SWIGTYPE
-%{ $1 = ($1_ltype)$input; %}
-
-%typemap(out) enum SWIGTYPE
-%{ $result = (intgo)$1; %}
-
-%typemap(goout) enum SWIGTYPE ""
-
-%typemap(directorin) enum SWIGTYPE
-%{ $input = (intgo)$1; %}
-
-%typemap(godirectorin) enum SWIGTYPE ""
-
-%typemap(directorout) enum SWIGTYPE
-%{ $result = ($1_ltype)$input; %}
-
-%typemap(directorin) enum SWIGTYPE & (intgo e)
-%{
-  e = (intgo)$1;
-  $input = ($1_ltype)&e;
-%}
-
-%typemap(godirectorin) enum SWIGTYPE & ""
-
-%typemap(directorout) enum SWIGTYPE &
-%{
-  $*1_ltype f = ($*1_ltype)*$input;
-  $result = ($1_ltype)&f;
-%}
-
-/* Arbitrary type.  This is a type passed by value in the C/C++ code.
-   We convert it to a pointer for the Go code.  Note that all basic
-   types are explicitly handled above.  */
-
-%typemap(gotype) SWIGTYPE
-%{$gotypename%}
-
-%typemap(in) SWIGTYPE ($&1_type argp)
-%{
-  argp = ($&1_ltype)$input;
-  if (argp == NULL) {
-    _swig_gopanic("Attempt to dereference null $1_type");
-  }
-  $1 = ($1_ltype)*argp;
-%}
-
-%typemap(out) SWIGTYPE
-#ifdef __cplusplus
-%{ *($&1_ltype*)&$result = new $1_ltype($1); %}
-#else
-{
-  $&1_ltype $1ptr = ($&1_ltype)malloc(sizeof($1_ltype));
-  memmove($1ptr, &$1, sizeof($1_type));
-  *($&1_ltype*)&$result = $1ptr;
-}
-#endif
-
-%typemap(goout) SWIGTYPE ""
-
-%typemap(directorin) SWIGTYPE
-%{ $input = new $1_ltype((const $1_ltype &)$1); %}
-
-%typemap(godirectorin) SWIGTYPE ""
-
-%typemap(directorout) SWIGTYPE
-%{ $result = *($&1_ltype)$input; %}
-
-/* Exception handling */
-
-%typemap(throws) char *
-%{ _swig_gopanic($1); %}
-
-%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE *, SWIGTYPE [], SWIGTYPE [ANY]
-%{
-  (void)$1;
-  _swig_gopanic("C++ $1_type exception thrown");
-%}
-
-/* Typecheck typemaps.  The purpose of these is merely to issue a
-   warning for overloaded C++ functions that cannot be overloaded in
-   Go as more than one C++ type maps to a single Go type.  */
-
-%typecheck(SWIG_TYPECHECK_BOOL) /* Go bool */
-    bool,
-    const bool &
-    ""
-
-%typecheck(SWIG_TYPECHECK_CHAR) /* Go byte */
-    char,
-    const char &,
-    unsigned char,
-    const unsigned char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8) /* Go int8 */
-    signed char,
-    const signed char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16) /* Go int16 */
-    short,
-    const short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16) /* Go uint16 */
-    unsigned short,
-    const unsigned short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32) /* Go int */
-    int,
-    const int &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32) /* Go uint */
-    unsigned int,
-    const unsigned int &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64) /* Go int64 */
-    long, 
-    const long &, 
-    long long,
-    const long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64) /* Go uint64 */
-    unsigned long, 
-    const unsigned long &, 
-    unsigned long long,
-    const unsigned long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT) /* Go float32 */
-    float,
-    const float &
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE) /* Go float64 */
-    double,
-    const double &
-    ""
-
-%typecheck(SWIG_TYPECHECK_STRING) /* Go string */
-    char *,
-    char *&,
-    char[ANY],
-    char [],
-    signed char *,
-    signed char *&,
-    signed char[ANY],
-    signed char [],
-    unsigned char *,
-    unsigned char *&,
-    unsigned char[ANY],
-    unsigned char []
-    ""
-
-%typecheck(SWIG_TYPECHECK_POINTER)
-    SWIGTYPE,
-    SWIGTYPE *,
-    SWIGTYPE &,
-    SWIGTYPE &&,
-    SWIGTYPE *const&,
-    SWIGTYPE [],
-    SWIGTYPE (CLASS::*)
-    ""
-
-/* Go keywords.  */
-%include <gokw.swg>
-
-%include <goruntime.swg>
diff --git a/dependencies2013/win32/swig/Lib/go/gokw.swg b/dependencies2013/win32/swig/Lib/go/gokw.swg
deleted file mode 100644
index dd9f35aa..00000000
--- a/dependencies2013/win32/swig/Lib/go/gokw.swg
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Rename keywords.  */
-
-#define GOKW(x) %keywordwarn("'" `x` "' is a Go keyword, renaming to 'X"`x`"'",rename="X%s")  `x`
-#define GOBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in Go")  "::"`x`
-
-GOKW(break);
-GOKW(case);
-GOKW(chan);
-GOKW(const);
-GOKW(continue);
-GOKW(default);
-GOKW(defer);
-GOKW(else);
-GOKW(fallthrough);
-GOKW(for);
-GOKW(func);
-GOKW(go);
-GOKW(goto);
-GOKW(if);
-GOKW(import);
-GOKW(interface);
-GOKW(package);
-GOKW(range);
-GOKW(return);
-GOKW(select);
-GOKW(struct);
-GOKW(switch);
-GOKW(type);
-GOKW(var);
-
-GOBN(map);
-
-#undef GOKW
diff --git a/dependencies2013/win32/swig/Lib/go/goruntime.swg b/dependencies2013/win32/swig/Lib/go/goruntime.swg
deleted file mode 100644
index dc6193d0..00000000
--- a/dependencies2013/win32/swig/Lib/go/goruntime.swg
+++ /dev/null
@@ -1,471 +0,0 @@
-/* ------------------------------------------------------------
- * goruntime.swg
- *
- * Go runtime code for the various generated files.
- * ------------------------------------------------------------ */
-
-%inline %{
-static void Swig_free(void* p) {
-  free(p);
-}
-
-static void* Swig_malloc(int c) {
-  return malloc(c);
-}
-%}
-
-%insert(runtime) %{
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-%}
-
-#if SWIGGO_CGO
-%insert(cgo_comment_typedefs) %{
-#include <stdint.h>
-%}
-#endif
-
-#if SWIGGO_INTGO_SIZE == 32
-%insert(runtime) %{
-typedef int intgo;
-typedef unsigned int uintgo;
-%}
-#if SWIGGO_CGO
-%insert(cgo_comment_typedefs) %{
-typedef int intgo;
-typedef unsigned int uintgo;
-%}
-#endif
-#elif SWIGGO_INTGO_SIZE == 64
-%insert(runtime) %{
-typedef long long intgo;
-typedef unsigned long long uintgo;
-%}
-#if SWIGGO_CGO
-%insert(cgo_comment_typedefs) %{
-typedef long long intgo;
-typedef unsigned long long uintgo;
-%}
-#endif
-#else
-%insert(runtime) %{
-typedef ptrdiff_t intgo;
-typedef size_t uintgo;
-%}
-#if SWIGGO_CGO
-%insert(cgo_comment_typedefs) %{
-typedef ptrdiff_t intgo;
-typedef size_t uintgo;
-%}
-#endif
-#endif
-
-#ifndef SWIGGO_GCCGO
-// Set the host compiler struct attribute that will be
-// used to match gc's struct layout. For example, on 386 Windows,
-// gcc wants to 8-align int64s, but gc does not.
-// Use __gcc_struct__ to work around http://gcc.gnu.org/PR52991 on x86,
-// and https://golang.org/issue/5603.
-// See: https://github.com/golang/go/blob/fcbf04f9b93b4cd8addd05c2ed784118eb50a46c/src/cmd/cgo/out.go#L663
-%insert(runtime) %{
-# if !defined(__clang__) && (defined(__i386__) || defined(__x86_64__))
-#   define SWIGSTRUCTPACKED __attribute__((__packed__, __gcc_struct__))
-# else
-#   define SWIGSTRUCTPACKED __attribute__((__packed__))
-# endif
-%}
-#else
-# define SWIGSTRUCTPACKED
-#endif
-
-%insert(runtime) %{
-
-typedef struct { char *p; intgo n; } _gostring_;
-typedef struct { void* array; intgo len; intgo cap; } _goslice_;
-
-%}
-
-#ifdef SWIGGO_CGO
-
-%insert(cgo_comment_typedefs) %{
-
-typedef struct { char *p; intgo n; } _gostring_;
-typedef struct { void* array; intgo len; intgo cap; } _goslice_;
-
-%}
-
-#endif
-
-#ifndef SWIGGO_GCCGO
-/* Boilerplate for C/C++ code when using 6g/8g.  This code is compiled
-   with gcc.  */
-%insert(runtime) %{
-
-#define swiggo_size_assert_eq(x, y, name) typedef char name[(x-y)*(x-y)*-2+1];
-#define swiggo_size_assert(t, n) swiggo_size_assert_eq(sizeof(t), n, swiggo_sizeof_##t##_is_not_##n)
-
-swiggo_size_assert(char, 1)
-swiggo_size_assert(short, 2)
-swiggo_size_assert(int, 4)
-typedef long long swiggo_long_long;
-swiggo_size_assert(swiggo_long_long, 8)
-swiggo_size_assert(float, 4)
-swiggo_size_assert(double, 8)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void crosscall2(void (*fn)(void *, int), void *, int);
-extern char* _cgo_topofstack(void) __attribute__ ((weak));
-extern void _cgo_allocate(void *, int);
-extern void _cgo_panic(void *, int);
-#ifdef __cplusplus
-}
-#endif
-
-static char *_swig_topofstack() {
-  if (_cgo_topofstack) {
-    return _cgo_topofstack();
-  } else {
-    return 0;
-  }
-}
-
-static void _swig_gopanic(const char *p) {
-  struct {
-    const char *p;
-  } SWIGSTRUCTPACKED a;
-  a.p = p;
-  crosscall2(_cgo_panic, &a, (int) sizeof a);
-}
-
-%}
-
-#if !SWIGGO_CGO
-
-/* This is here for backward compatibility, but it will not work
-   with Go 1.5 or later.  Do not use it in new code.  */
-%insert(runtime) %{
-
-static void *_swig_goallocate(size_t len) {
-  struct {
-    size_t len;
-    void *ret;
-  } SWIGSTRUCTPACKED a;
-  a.len = len;
-  crosscall2(_cgo_allocate, &a, (int) sizeof a);
-  return a.ret;
-}
-
-%}
-
-#endif
-
-#if !SWIGGO_CGO
-
-/* Boilerplate for C code when using 6g/8g.  This code is compiled
-   with 6c/8c.  */
-%insert(gc_header) %{
-#include "runtime.h"
-#include "cgocall.h"
-
-#pragma dataflag 16
-static void *cgocall = runtime·cgocall;
-#pragma dataflag 16
-void *·_cgo_runtime_cgocall = &cgocall;
-
-%}
-
-#endif
-
-#else
-
-/* Boilerplate for C/C++ code when using gccgo.  */
-%insert(runtime) %{
-#define SWIGGO_GCCGO
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void *_cgo_allocate(size_t);
-extern void _cgo_panic(const char *);
-#ifdef __cplusplus
-}
-#endif
-
-#define _swig_goallocate _cgo_allocate
-#define _swig_gopanic _cgo_panic
-%}
-
-#if !SWIGGO_CGO
-
-%insert(runtime) %{
-
-/* Implementations of SwigCgocall and friends for different versions
-   of gccgo.  The Go code will call these functions using C names with
-   a prefix of the module name.  The implementations here call the
-   routine in libgo.  The routines to call vary depending on the gccgo
-   version.  We assume that the version of gcc used to compile this
-   file is the same as the version of gccgo.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SWIG_GCC_VERSION \
-  (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-
-#if SWIG_GCC_VERSION < 40700
-#define SwigDoCgocall()
-#define SwigDoCgocallDone()
-#define SwigDoCgocallBack()
-#define SwigDoCgocallBackDone()
-#elif SWIG_GCC_VERSION == 40700
-void SwigDoCgocall(void) __asm__("libgo_syscall.syscall.Entersyscall");
-void SwigDoCgocallDone(void) __asm__("libgo_syscall.syscall.Exitsyscall");
-void SwigDoCgocallBack(void) __asm__("libgo_syscall.syscall.Exitsyscall");
-void SwigDoCgocallBackDone(void) __asm__("libgo_syscall.syscall.Entersyscall");
-#else
-void SwigDoCgocall(void) __asm__("syscall.Cgocall");
-void SwigDoCgocallDone(void) __asm__("syscall.CgocallDone");
-void SwigDoCgocallBack(void) __asm__("syscall.CgocallBack");
-void SwigDoCgocallBackDone(void) __asm__("syscall.CgocallBackDone");
-#endif
-
-#define SWIGSTRINGIFY2(s) #s
-#define SWIGSTRINGIFY(s) SWIGSTRINGIFY2(s)
-
-void SwigCgocall()
-  __asm__(SWIGSTRINGIFY(SWIGGO_PREFIX) ".SwigCgocall");
-void SwigCgocall() {
-  SwigDoCgocall();
-}
-
-void SwigCgocallDone()
-  __asm__(SWIGSTRINGIFY(SWIGGO_PREFIX) ".SwigCgocallDone");
-void SwigCgocallDone() {
-  SwigDoCgocallDone();
-}
-
-void SwigCgocallBack()
-  __asm__(SWIGSTRINGIFY(SWIGGO_PREFIX) ".SwigCgocallBack");
-void SwigCgocallBack() {
-  SwigDoCgocallBack();
-}
-
-void SwigCgocallBackDone()
-  __asm__(SWIGSTRINGIFY(SWIGGO_PREFIX) ".SwigCgocallBackDone");
-void SwigCgocallBackDone() {
-  SwigDoCgocallBackDone();
-}
-
-#undef SWIGSTRINGIFY
-#undef SWIGSTRINGIFY2
-
-#ifdef __cplusplus
-}
-#endif
-
-%}
-
-#endif
-
-#endif
-
-#if !SWIGGO_CGO
-
-%insert(runtime) %{
-
-/* This is here for backward compatibility, but it will not work
-   with Go 1.5 or later.  Do not use it in new code.  */
-static _gostring_ _swig_makegostring(const char *p, size_t l) {
-  _gostring_ ret;
-  ret.p = (char*)_swig_goallocate(l + 1);
-  memcpy(ret.p, p, l);
-  ret.n = l;
-  return ret;
-}
-
-%}
-
-#endif
-
-%insert(runtime) %{
-
-#define SWIG_contract_assert(expr, msg) \
-  if (!(expr)) { _swig_gopanic(msg); } else
-%}
-
-#ifndef SWIGGO_GCCGO
-
-%go_import("unsafe", _ "runtime/cgo")
-
-#if !SWIGGO_CGO
-%insert(go_header) %{
-var _cgo_runtime_cgocall func(unsafe.Pointer, uintptr)
-%}
-#endif
-
-#else
-
-%go_import("syscall", "unsafe")
-
-%insert(go_header) %{
-
-type _ syscall.Sockaddr
-
-%}
-
-#endif
-
-%insert(go_header) %{
-
-type _ unsafe.Pointer
-
-%}
-
-/* Swig_always_false is used to conditionally assign parameters to
-   Swig_escape_val so that the compiler thinks that they escape.  We
-   only assign them if Swig_always_false is true, which it never is.
-   We export the variable so that the compiler doesn't realize that it
-   is never set. */
-%insert(go_header) %{
-var Swig_escape_always_false bool
-var Swig_escape_val interface{}
-%}
-
-/* Function pointers are translated by the code in go.cxx into
-   _swig_fnptr.  Member pointers are translated to _swig_memberptr.  */
-
-%insert(go_header) %{
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-%}
-
-/* Handle memory management for directors.  */
-
-%insert(director) %{
-#include <map>
-
-namespace {
-  struct GCItem {
-    virtual ~GCItem() {}
-  };
-
-  struct GCItem_var {
-    GCItem_var(GCItem *item = 0) : _item(item) {
-    }
-
-    GCItem_var& operator=(GCItem *item) {
-      GCItem *tmp = _item;
-      _item = item;
-      delete tmp;
-      return *this;
-    }
-
-    ~GCItem_var() {
-      delete _item;
-    }
-
-    GCItem* operator->() {
-      return _item;
-    }
-
-    private:
-      GCItem *_item;
-  };
-
-  template <typename Type>
-  struct GCItem_T : GCItem {
-    GCItem_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCItem_T() {
-      delete _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-}
-
-class Swig_memory {
-public:
-  template <typename Type>
-  void swig_acquire_pointer(Type* vptr) {
-    if (vptr) {
-      swig_owner[vptr] = new GCItem_T<Type>(vptr);
-    }
-  }
-private:
-  typedef std::map<void *, GCItem_var> swig_ownership_map;
-  swig_ownership_map swig_owner;
-};
-
-template <typename Type>
-static void swig_acquire_pointer(Swig_memory** pmem, Type* ptr) {
-  if (!pmem) {
-    *pmem = new Swig_memory;
-  }
-  (*pmem)->swig_acquire_pointer(ptr);
-}
-%}
-
-/* For directors we need C++ to track a Go pointer.  Since we can't
-   pass a Go pointer into C++, we use a map to track the pointers on
-   the Go side.  */
-
-%go_import("sync")
-
-%insert(go_header) %{
-type _ sync.Mutex
-%}
-
-%insert(go_director) %{
-
-var swigDirectorTrack struct {
-	sync.Mutex
-	m map[int]interface{}
-	c int
-}
-
-func swigDirectorAdd(v interface{}) int {
-	swigDirectorTrack.Lock()
-	defer swigDirectorTrack.Unlock()
-	if swigDirectorTrack.m == nil {
-		swigDirectorTrack.m = make(map[int]interface{})
-	}
-	swigDirectorTrack.c++
-	ret := swigDirectorTrack.c
-	swigDirectorTrack.m[ret] = v
-	return ret
-}
-
-func swigDirectorLookup(c int) interface{} {
-	swigDirectorTrack.Lock()
-	defer swigDirectorTrack.Unlock()
-	ret := swigDirectorTrack.m[c]
-	if ret == nil {
-		panic("C++ director pointer not found (possible	use-after-free)")
-	}
-	return ret
-}
-
-func swigDirectorDelete(c int) {
-	swigDirectorTrack.Lock()
-	defer swigDirectorTrack.Unlock()
-	if swigDirectorTrack.m[c] == nil {
-		if c > swigDirectorTrack.c {
-			panic("C++ director pointer invalid (possible memory corruption")
-		} else {
-			panic("C++ director pointer not found (possible use-after-free)")
-		}
-	}
-	delete(swigDirectorTrack.m, c)
-}
-
-%}
diff --git a/dependencies2013/win32/swig/Lib/go/gostring.swg b/dependencies2013/win32/swig/Lib/go/gostring.swg
deleted file mode 100644
index 44cbbb8e..00000000
--- a/dependencies2013/win32/swig/Lib/go/gostring.swg
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ------------------------------------------------------------
- * gostring.swg
- *
- * Support for returning strings from C to Go.
- * ------------------------------------------------------------ */
-
-// C/C++ code to convert a memory buffer into a Go string allocated in
-// C/C++ memory.
-%fragment("AllocateString", "runtime") %{
-static _gostring_ Swig_AllocateString(const char *p, size_t l) {
-  _gostring_ ret;
-  ret.p = (char*)malloc(l);
-  memcpy(ret.p, p, l);
-  ret.n = l;
-  return ret;
-}
-%}
-
-// Go code to convert a string allocated in C++ memory to one
-// allocated in Go memory.
-%fragment("CopyString", "go_runtime") %{
-type swig_gostring struct { p uintptr; n int }
-func swigCopyString(s string) string {
-  p := *(*swig_gostring)(unsafe.Pointer(&s))
-  r := string((*[0x7fffffff]byte)(unsafe.Pointer(p.p))[:p.n])
-  Swig_free(p.p)
-  return r
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/go/std_common.i b/dependencies2013/win32/swig/Lib/go/std_common.i
deleted file mode 100644
index c010faca..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_common.i
+++ /dev/null
@@ -1,4 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
diff --git a/dependencies2013/win32/swig/Lib/go/std_deque.i b/dependencies2013/win32/swig/Lib/go/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/go/std_except.i b/dependencies2013/win32/swig/Lib/go/std_except.i
deleted file mode 100644
index 4f021a12..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_except.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_except.i
- *
- * Typemaps used by the STL wrappers that throw exceptions.
- * These typemaps are used when methods are declared with an STL exception specification, such as
- *   size_t at() const throw (std::out_of_range);
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-namespace std 
-{
-  %ignore exception;
-  struct exception {};
-}
-
-%typemap(throws) std::bad_cast		%{_swig_gopanic($1.what());%}
-%typemap(throws) std::bad_exception	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::domain_error	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::exception		%{_swig_gopanic($1.what());%}
-%typemap(throws) std::invalid_argument	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::length_error	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::logic_error	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::out_of_range	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::overflow_error	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::range_error	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::runtime_error	%{_swig_gopanic($1.what());%}
-%typemap(throws) std::underflow_error	%{_swig_gopanic($1.what());%}
diff --git a/dependencies2013/win32/swig/Lib/go/std_list.i b/dependencies2013/win32/swig/Lib/go/std_list.i
deleted file mode 100644
index e0262331..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_list.i
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <list>
-#include <stdexcept>
-%}
-
-namespace std {
-
-  template<class T, class Alloc = allocator<T> >
-  class list {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef Alloc allocator_type;
-
-    list();
-    size_type size() const;
-    bool empty() const;
-    %rename(isEmpty) empty;
-    void clear();
-    void push_front(const value_type& x);
-    void pop_front();
-    void push_back(const value_type& x);
-    void pop_back();
-    void remove(value_type x);
-    void reverse();
-    void unique();
-    void sort();
-    void merge(list& x);
-  };
-
-}
diff --git a/dependencies2013/win32/swig/Lib/go/std_map.i b/dependencies2013/win32/swig/Lib/go/std_map.i
deleted file mode 100644
index 84b0c74f..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_map.i
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-}
diff --git a/dependencies2013/win32/swig/Lib/go/std_pair.i b/dependencies2013/win32/swig/Lib/go/std_pair.i
deleted file mode 100644
index fe45ee67..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/go/std_string.i b/dependencies2013/win32/swig/Lib/go/std_string.i
deleted file mode 100644
index 099ae84d..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_string.i
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * Typemaps for std::string and const std::string&
- * These are mapped to a Go string and are passed around by value.
- *
- * To use non-const std::string references use the following %apply.  Note 
- * that they are passed by value.
- * %apply const std::string & {std::string &};
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-%naturalvar string;
-
-class string;
-
-%typemap(gotype) string, const string & "string"
-
-%typemap(in) string
-%{ $1.assign($input.p, $input.n); %}
-
-%typemap(godirectorout) string
-%{
-  {
-    p := Swig_malloc(len($input))
-    s := (*[1<<30]byte)(unsafe.Pointer(p))[:len($input)]
-    copy(s, $input)
-    $result = *(*string)(unsafe.Pointer(&s))
-  }
-%}
-
-%typemap(directorout) string
-%{
-  $result.assign($input.p, $input.n);
-  free($input.p);
-%}
-
-%typemap(out,fragment="AllocateString") string
-%{ $result = Swig_AllocateString($1.data(), $1.length()); %}
-
-%typemap(goout,fragment="CopyString") string
-%{ $result = swigCopyString($1) %}
-
-%typemap(directorin,fragment="AllocateString") string
-%{ $input = Swig_AllocateString($1.data(), $1.length()); %}
-
-%typemap(godirectorin,fragment="CopyString") string
-%{ $result = swigCopyString($input) %}
-
-%typemap(in) const string &
-%{
-  $*1_ltype $1_str($input.p, $input.n);
-  $1 = &$1_str;
-%}
-
-%typemap(godirectorout) const string &
-%{
-  {
-    p := Swig_malloc(len($input))
-    s := (*[1<<30]byte)(unsafe.Pointer(p))[:len($input)]
-    copy(s, $input)
-    $result = *(*string)(unsafe.Pointer(&s))
-  }
-%}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
-%{
-  static $*1_ltype $1_str;
-  $1_str.assign($input.p, $input.n);
-  free($input.p);
-  $result = &$1_str;
-%}
-
-%typemap(out,fragment="AllocateString") const string &
-%{ $result = Swig_AllocateString((*$1).data(), (*$1).length()); %}
-
-%typemap(goout,fragment="CopyString") const string &
-%{ $result = swigCopyString($1) %}
-
-%typemap(directorin,fragment="AllocateString") const string &
-%{ $input = Swig_AllocateString($1.data(), $1.length()); %}
-
-%typemap(godirectorin,fragment="CopyString") const string &
-%{ $result = swigCopyString($input) %}
-
-}
diff --git a/dependencies2013/win32/swig/Lib/go/std_vector.i b/dependencies2013/win32/swig/Lib/go/std_vector.i
deleted file mode 100644
index 29bcd139..00000000
--- a/dependencies2013/win32/swig/Lib/go/std_vector.i
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-    
-    template<class T> class vector {
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            const_reference get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-    // bool specialization
-    template<> class vector<bool> {
-      public:
-        typedef size_t size_type;
-        typedef bool value_type;
-        typedef bool const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            bool get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-}
diff --git a/dependencies2013/win32/swig/Lib/go/stl.i b/dependencies2013/win32/swig/Lib/go/stl.i
deleted file mode 100644
index 38aba67b..00000000
--- a/dependencies2013/win32/swig/Lib/go/stl.i
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
diff --git a/dependencies2013/win32/swig/Lib/go/typemaps.i b/dependencies2013/win32/swig/Lib/go/typemaps.i
deleted file mode 100644
index d2e60d37..00000000
--- a/dependencies2013/win32/swig/Lib/go/typemaps.i
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer and reference handling typemap library
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers and C++ references.
- * ----------------------------------------------------------------------------- */
-
-/*
-INPUT typemaps
---------------
-
-These typemaps remap a C pointer or C++ reference to be an "INPUT" value which is
-passed by value instead of reference.
-
-The following typemaps can be applied to turn a pointer or reference into a simple
-input value.  That is, instead of passing a pointer or reference to an object,
-you would use a real value instead.
-
-        bool               *INPUT, bool               &INPUT
-        signed char        *INPUT, signed char        &INPUT
-        unsigned char      *INPUT, unsigned char      &INPUT
-        short              *INPUT, short              &INPUT
-        unsigned short     *INPUT, unsigned short     &INPUT
-        int                *INPUT, int                &INPUT
-        unsigned int       *INPUT, unsigned int       &INPUT
-        long               *INPUT, long               &INPUT
-        unsigned long      *INPUT, unsigned long      &INPUT
-        long long          *INPUT, long long          &INPUT
-        unsigned long long *INPUT, unsigned long long &INPUT
-        float              *INPUT, float              &INPUT
-        double             *INPUT, double             &INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-In Go you could then use it like this:
-        answer := modulename.Fadd(10.0, 20.0)
-
-There are no char *INPUT typemaps, however you can apply the signed
-char * typemaps instead:
-        %include <typemaps.i>
-        %apply signed char *INPUT {char *input};
-        void f(char *input);
-*/
-
-%define INPUT_TYPEMAP(TYPE, GOTYPE)
-%typemap(gotype) TYPE *INPUT, TYPE &INPUT "GOTYPE"
-
- %typemap(in) TYPE *INPUT, TYPE &INPUT
-%{ $1 = ($1_ltype)&$input; %}
-
-%typemap(out) TYPE *INPUT, TYPE &INPUT ""
-
-%typemap(goout) TYPE *INPUT, TYPE &INPUT ""
-
-%typemap(freearg) TYPE *INPUT, TYPE &INPUT ""
-
-%typemap(argout) TYPE *INPUT, TYPE &INPUT ""
-
-// %typemap(typecheck) TYPE *INPUT = TYPE;
-// %typemap(typecheck) TYPE &INPUT = TYPE;
-%enddef
-
-INPUT_TYPEMAP(bool, bool);
-INPUT_TYPEMAP(signed char, int8);
-INPUT_TYPEMAP(char, byte);
-INPUT_TYPEMAP(unsigned char, byte);
-INPUT_TYPEMAP(short, int16);
-INPUT_TYPEMAP(unsigned short, uint16);
-INPUT_TYPEMAP(int, int);
-INPUT_TYPEMAP(unsigned int, uint);
-INPUT_TYPEMAP(long, int64);
-INPUT_TYPEMAP(unsigned long, uint64);
-INPUT_TYPEMAP(long long, int64);
-INPUT_TYPEMAP(unsigned long long, uint64);
-INPUT_TYPEMAP(float, float32);
-INPUT_TYPEMAP(double, float64);
-
-#undef INPUT_TYPEMAP
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   An array replaces the c pointer or reference parameter. 
-// The output value is returned in this array passed in. 
-
-/*
-OUTPUT typemaps
----------------
-
-The following typemaps can be applied to turn a pointer or reference
-into an "output" value.  When calling a function, no input value would
-be given for a parameter, but an output value would be returned.  This
-works by a Go slice being passed as a parameter where a c pointer or
-reference is required.  As with any Go function, the array is passed
-by reference so that any modifications to the array will be picked up
-in the calling function.  Note that the array passed in MUST have at
-least one element, but as the c function does not require any input,
-the value can be set to anything.
-
-        bool               *OUTPUT, bool               &OUTPUT
-        signed char        *OUTPUT, signed char        &OUTPUT
-        unsigned char      *OUTPUT, unsigned char      &OUTPUT
-        short              *OUTPUT, short              &OUTPUT
-        unsigned short     *OUTPUT, unsigned short     &OUTPUT
-        int                *OUTPUT, int                &OUTPUT
-        unsigned int       *OUTPUT, unsigned int       &OUTPUT
-        long               *OUTPUT, long               &OUTPUT
-        unsigned long      *OUTPUT, unsigned long      &OUTPUT
-        long long          *OUTPUT, long long          &OUTPUT
-        unsigned long long *OUTPUT, unsigned long long &OUTPUT
-        float              *OUTPUT, float              &OUTPUT
-        double             *OUTPUT, double             &OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters):
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Go output of the function would be the function return value and the 
-value in the single element array. In Go you would use it like this:
-
-    ptr := []float64{0.0}
-    fraction := modulename.Modf(5.0,ptr)
-
-There are no char *OUTPUT typemaps, however you can apply the signed
-char * typemaps instead:
-        %include <typemaps.i>
-        %apply signed char *OUTPUT {char *output};
-        void f(char *output);
-*/
-
-%define OUTPUT_TYPEMAP(TYPE, GOTYPE)
-%typemap(gotype) TYPE *OUTPUT, TYPE &OUTPUT %{[]GOTYPE%}
-
-%typemap(in) TYPE *OUTPUT($*1_ltype temp), TYPE &OUTPUT($*1_ltype temp)
-{
-  if ($input.len == 0) {
-    _swig_gopanic("array must contain at least 1 element");
-  }
-  $1 = &temp;
-}
-
-%typemap(out) TYPE *OUTPUT, TYPE &OUTPUT ""
-
-%typemap(goout) TYPE *INPUT, TYPE &INPUT ""
-
-%typemap(freearg) TYPE *OUTPUT, TYPE &OUTPUT ""
-
-%typemap(argout) TYPE *OUTPUT, TYPE &OUTPUT
-{
-  TYPE* a = (TYPE *) $input.array;
-  a[0] = temp$argnum;
-}
-
-%enddef
-
-OUTPUT_TYPEMAP(bool, bool);
-OUTPUT_TYPEMAP(signed char, int8);
-OUTPUT_TYPEMAP(char, byte);
-OUTPUT_TYPEMAP(unsigned char, byte);
-OUTPUT_TYPEMAP(short, int16);
-OUTPUT_TYPEMAP(unsigned short, uint16);
-OUTPUT_TYPEMAP(int, int);
-OUTPUT_TYPEMAP(unsigned int, uint);
-OUTPUT_TYPEMAP(long, int64);
-OUTPUT_TYPEMAP(unsigned long, uint64);
-OUTPUT_TYPEMAP(long long, int64);
-OUTPUT_TYPEMAP(unsigned long long, uint64);
-OUTPUT_TYPEMAP(float, float32);
-OUTPUT_TYPEMAP(double, float64);
-
-#undef OUTPUT_TYPEMAP
-
-/*
-INOUT typemaps
---------------
-
-Mappings for a parameter that is both an input and an output parameter
-
-The following typemaps can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" typemaps described earlier.  Output values are
-returned as an element in a Go slice.
-
-        bool               *INOUT, bool               &INOUT
-        signed char        *INOUT, signed char        &INOUT
-        unsigned char      *INOUT, unsigned char      &INOUT
-        short              *INOUT, short              &INOUT
-        unsigned short     *INOUT, unsigned short     &INOUT
-        int                *INOUT, int                &INOUT
-        unsigned int       *INOUT, unsigned int       &INOUT
-        long               *INOUT, long               &INOUT
-        unsigned long      *INOUT, unsigned long      &INOUT
-        long long          *INOUT, long long          &INOUT
-        unsigned long long *INOUT, unsigned long long &INOUT
-        float              *INOUT, float              &INOUT
-        double             *INOUT, double             &INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-This works similarly to C in that the mapping directly modifies the
-input value - the input must be an array with a minimum of one element. 
-The element in the array is the input and the output is the element in 
-the array.
-
-       x := []float64{5.0}
-       Neg(x);
-
-The implementation of the OUTPUT and INOUT typemaps is different to
-other languages in that other languages will return the output value
-as part of the function return value. This difference is due to Go
-being a typed language.
-
-There are no char *INOUT typemaps, however you can apply the signed
-char * typemaps instead:
-        %include <typemaps.i>
-        %apply signed char *INOUT {char *inout};
-        void f(char *inout);
-*/
-
-%define INOUT_TYPEMAP(TYPE, GOTYPE)
-%typemap(gotype) TYPE *INOUT, TYPE &INOUT %{[]GOTYPE%}
-
-%typemap(in) TYPE *INOUT, TYPE &INOUT {
-  if ($input.len == 0) {
-    _swig_gopanic("array must contain at least 1 element");
-  }
-  $1 = ($1_ltype) $input.array;
-}
-
-%typemap(out) TYPE *INOUT, TYPE &INOUT ""
-
-%typemap(goout) TYPE *INOUT, TYPE &INOUT ""
-
-%typemap(freearg) TYPE *INOUT, TYPE &INOUT ""
-
-%typemap(argout) TYPE *INOUT, TYPE &INOUT ""
-
-%enddef
-
-INOUT_TYPEMAP(bool, bool);
-INOUT_TYPEMAP(signed char, int8);
-INOUT_TYPEMAP(char, byte);
-INOUT_TYPEMAP(unsigned char, byte);
-INOUT_TYPEMAP(short, int16);
-INOUT_TYPEMAP(unsigned short, uint16);
-INOUT_TYPEMAP(int, int);
-INOUT_TYPEMAP(unsigned int, uint);
-INOUT_TYPEMAP(long, int64);
-INOUT_TYPEMAP(unsigned long, uint64);
-INOUT_TYPEMAP(long long, int64);
-INOUT_TYPEMAP(unsigned long long, uint64);
-INOUT_TYPEMAP(float, float32);
-INOUT_TYPEMAP(double, float64);
-
-#undef INOUT_TYPEMAP
diff --git a/dependencies2013/win32/swig/Lib/guile/common.scm b/dependencies2013/win32/swig/Lib/guile/common.scm
deleted file mode 100644
index 17c9ab58..00000000
--- a/dependencies2013/win32/swig/Lib/guile/common.scm
+++ /dev/null
@@ -1,70 +0,0 @@
-;;;************************************************************************
-;;;*common.scm
-;;;*
-;;;*     This file contains generic SWIG GOOPS classes for generated
-;;;*     GOOPS file support
-;;;************************************************************************
-
-(define-module (Swig swigrun))
-
-(define-module (Swig common)
-  #:use-module (oop goops)
-  #:use-module (Swig swigrun))
-
-(define-class <swig-metaclass> (<class>)
-  (new-function #:init-value #f))
-
-(define-method (initialize (class <swig-metaclass>) initargs)
-  (slot-set! class 'new-function (get-keyword #:new-function initargs #f))
-  (next-method))
-
-(define-class <swig> () 
-  (swig-smob #:init-value #f)
-  #:metaclass <swig-metaclass>
-)
-
-(define-method (initialize (obj <swig>) initargs)
-  (next-method)
-  (slot-set! obj 'swig-smob
-    (let ((arg (get-keyword #:init-smob initargs #f)))
-      (if arg
-        arg
-        (let ((ret (apply (slot-ref (class-of obj) 'new-function) (get-keyword #:args initargs '()))))
-          ;; if the class is registered with runtime environment,
-          ;; new-Function will return a <swig> goops class.  In that case, extract the smob
-          ;; from that goops class and set it as the current smob.
-          (if (slot-exists? ret 'swig-smob)
-            (slot-ref ret 'swig-smob)
-            ret))))))
-
-(define (display-address o file)
-  (display (number->string (object-address o) 16) file))
-
-(define (display-pointer-address o file)
-  ;; Don't fail if the function SWIG-PointerAddress is not present.
-  (let ((address (false-if-exception (SWIG-PointerAddress o))))
-    (if address
-	(begin
-	  (display " @ " file)
-	  (display (number->string address 16) file)))))
-
-(define-method (write (o <swig>) file)
-  ;; We display _two_ addresses to show the object's identity:
-  ;;  * first the address of the GOOPS proxy object,
-  ;;  * second the pointer address.
-  ;; The reason is that proxy objects are created and discarded on the
-  ;; fly, so different proxy objects for the same C object will appear.
-  (let ((class (class-of o)))
-    (if (slot-bound? class 'name)
-	(begin
-	  (display "#<" file)
-	  (display (class-name class) file)
-	  (display #\space file)
-	  (display-address o file)
-	  (display-pointer-address o file)
-	  (display ">" file))
-	(next-method))))
-                                              
-(export <swig-metaclass> <swig>)
-
-;;; common.scm ends here
diff --git a/dependencies2013/win32/swig/Lib/guile/cplusplus.i b/dependencies2013/win32/swig/Lib/guile/cplusplus.i
deleted file mode 100644
index d5d65efa..00000000
--- a/dependencies2013/win32/swig/Lib/guile/cplusplus.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cplusplus.i
- *
- * SWIG typemaps for C++
- * ----------------------------------------------------------------------------- */
-
-%typemap(guile,out) string, std::string {
-  $result = SWIG_str02scm(const_cast<char*>($1.c_str()));
-}
-%typemap(guile,in) string, std::string {
-  $1 = SWIG_scm2str($input);
-}
-
-%typemap(guile,out) complex, complex<double>, std::complex<double> {
-  $result = scm_make_rectangular( scm_from_double ($1.real ()),
-           scm_from_double ($1.imag ()) );
-}
-%typemap(guile,in) complex, complex<double>, std::complex<double> {
-  $1 = std::complex<double>( scm_to_double (scm_real_part ($input)),
-           scm_to_double (scm_imag_part ($input)) );
-}
-
diff --git a/dependencies2013/win32/swig/Lib/guile/extra-install.list b/dependencies2013/win32/swig/Lib/guile/extra-install.list
deleted file mode 100644
index 05d2c0c4..00000000
--- a/dependencies2013/win32/swig/Lib/guile/extra-install.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# see top-level Makefile.in
-common.scm
diff --git a/dependencies2013/win32/swig/Lib/guile/guile.i b/dependencies2013/win32/swig/Lib/guile/guile.i
deleted file mode 100644
index ef270d74..00000000
--- a/dependencies2013/win32/swig/Lib/guile/guile.i
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -----------------------------------------------------------------------------
- * guile.i
- *
- * SWIG Configuration File for Guile.
- * ----------------------------------------------------------------------------- */
-
-/* Macro for inserting Scheme code into the stub */
-#define %scheme	    %insert("scheme")
-#define %goops      %insert("goops")
-
-/* Return-styles */
-%pragma(guile) return_nothing_doc = "Returns unspecified."
-%pragma(guile) return_one_doc = "Returns $values."
-
-%define %values_as_list
-  %pragma(guile) beforereturn = ""
-  %pragma(guile) return_multi_doc = "Returns a list of $num_values values: $values."
-%enddef
-%values_as_list /* the default style */
-
-%define %values_as_vector
-  %pragma(guile) beforereturn = "GUILE_MAYBE_VECTOR"
-  %pragma(guile) return_multi_doc = "Returns a vector of $num_values values: $values."
-%enddef
-
-%define %multiple_values
-  %pragma(guile) beforereturn = "GUILE_MAYBE_VALUES"
-  %pragma(guile) return_multi_doc = "Returns $num_values values: $values."
-%enddef
-
-#define GUILE_APPEND_RESULT SWIG_APPEND_VALUE
-
-%include <typemaps.i>
diff --git a/dependencies2013/win32/swig/Lib/guile/guile_scm.swg b/dependencies2013/win32/swig/Lib/guile/guile_scm.swg
deleted file mode 100644
index dfd5da27..00000000
--- a/dependencies2013/win32/swig/Lib/guile/guile_scm.swg
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -----------------------------------------------------------------------------
- * guile_scm.swg
- *
- * This SWIG interface file is processed if the Guile module is run
- * with SCM_ flavor.
- * ----------------------------------------------------------------------------- */
-
-#define SWIGGUILE_SCM
-
-%runtime "swigrun.swg"       // Common C API type-checking code
-
-%runtime "guile_scm_run.swg"
-%include <guile.i>
-
-%runtime %{
-
-#define GUILE_MAYBE_VALUES \
-      if (gswig_list_p) gswig_result = scm_values(gswig_result);
-
-#define GUILE_MAYBE_VECTOR \
-      if (gswig_list_p) gswig_result = scm_vector(gswig_result);
-
-#define SWIG_APPEND_VALUE(object)						\
-    if (gswig_result == SCM_UNSPECIFIED)						\
-        gswig_result = object;							\
-    else {									\
-      if (!gswig_list_p) {							\
-	      gswig_list_p = 1;							\
-	      gswig_result = scm_listify(gswig_result, object, SCM_UNDEFINED);	\
-      }									\
-      else									\
-            gswig_result = scm_append(scm_listify(gswig_result, scm_listify(object, SCM_UNDEFINED), SCM_UNDEFINED));		\
-    }
-
-%}
-
-%insert(init) "swiginit.swg"
-
-%init %{
-SWIG_GUILE_INIT_STATIC void
-SWIG_init(void)
-{
-  SWIG_InitializeModule(0);
-  SWIG_PropagateClientData();
-%}
diff --git a/dependencies2013/win32/swig/Lib/guile/guile_scm_run.swg b/dependencies2013/win32/swig/Lib/guile/guile_scm_run.swg
deleted file mode 100644
index 1cc08b02..00000000
--- a/dependencies2013/win32/swig/Lib/guile/guile_scm_run.swg
+++ /dev/null
@@ -1,495 +0,0 @@
-/* -----------------------------------------------------------------------------
- * guile_scm_run.swg
- * ----------------------------------------------------------------------------- */
-
-#include <libguile.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* In the code below, use guile 2.0 compatible functions where possible.
-   Functions that don't exist in older versions will be mapped to
-   a deprecated equivalent for those versions only */
-#if defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION < 2)
-
-static SCM
-scm_module_variable (SCM module, SCM sym)
-{
-  return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
-}
-
-#endif
-
-#if SCM_MAJOR_VERSION >= 2
-/* scm_c_define_gsubr takes a different parameter type depending on the guile version */
-
-typedef scm_t_subr swig_guile_proc;
-#else
-typedef SCM (*swig_guile_proc)();
-#endif
-typedef SCM (*guile_destructor)(SCM);
-
-typedef struct swig_guile_clientdata {
-  guile_destructor destroy;
-  SCM goops_class;
-} swig_guile_clientdata;
-
-#if SCM_MAJOR_VERSION <= 2
-#define scm_to_utf8_string scm_to_locale_string
-#define scm_from_utf8_string scm_from_locale_string
-#endif
-#define SWIG_scm2str(s) \
-  SWIG_Guile_scm2newstr(s, NULL)
-#define SWIG_str02scm(str) \
-  str ? scm_from_utf8_string(str) : SCM_BOOL_F 
-# define SWIG_malloc(size) \
-  scm_malloc(size)
-# define SWIG_free(mem) \
-  free(mem)
-#define SWIG_ConvertPtr(s, result, type, flags) \
-  SWIG_Guile_ConvertPtr(s, result, type, flags)
-#define SWIG_MustGetPtr(s, type, argnum, flags) \
-  SWIG_Guile_MustGetPtr(s, type, argnum, flags, FUNC_NAME)
-#define SWIG_NewPointerObj(ptr, type, owner) \
-  SWIG_Guile_NewPointerObj((void*)ptr, type, owner)
-#define SWIG_PointerAddress(object) \
-  SWIG_Guile_PointerAddress(object)
-#define SWIG_PointerType(object) \
-  SWIG_Guile_PointerType(object)
-#define SWIG_IsPointerOfType(object, type) \
-  SWIG_Guile_IsPointerOfType(object, type)
-#define SWIG_IsPointer(object) \
-  SWIG_Guile_IsPointer(object)
-#define SWIG_contract_assert(expr, msg)				\
-  if (!(expr))							\
-    scm_error(scm_from_locale_symbol("swig-contract-assertion-failed"),	\
-	      (char *) FUNC_NAME, (char *) msg,			\
-	      SCM_EOL, SCM_BOOL_F); else
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty) \
-  SWIG_Guile_ConvertMember(obj, ptr, sz, ty, FUNC_NAME)
-#define SWIG_NewMemberObj(ptr, sz, type) \
-  SWIG_Guile_NewMemberObj(ptr, sz, type, FUNC_NAME)
-  
-/* Runtime API */
-static swig_module_info *SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata));
-#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
-  
-SWIGINTERN char *
-SWIG_Guile_scm2newstr(SCM str, size_t *len) {
-#define FUNC_NAME "SWIG_Guile_scm2newstr"
-  char *ret;
-
-  SCM_ASSERT (scm_is_string(str), str, 1, FUNC_NAME);
-
-  ret = scm_to_utf8_string(str);
-  if (!ret) return NULL;
-
-  if (len) *len = strlen(ret) - 1;
-  return ret;
-#undef FUNC_NAME
-}
-
-static int swig_initialized = 0;
-static scm_t_bits swig_tag = 0;
-static scm_t_bits swig_collectable_tag = 0;
-static scm_t_bits swig_destroyed_tag = 0;
-static scm_t_bits swig_member_function_tag = 0;
-static SCM swig_make_func = SCM_EOL;
-static SCM swig_keyword = SCM_EOL;
-static SCM swig_symbol = SCM_EOL;
-
-#define SWIG_Guile_GetSmob(x) \
-  ( !scm_is_null(x) && SCM_INSTANCEP(x) && scm_is_true(scm_slot_exists_p(x, swig_symbol)) \
-      ? scm_slot_ref(x, swig_symbol) : (x) )
-
-SWIGINTERN SCM
-SWIG_Guile_NewPointerObj(void *ptr, swig_type_info *type, int owner)
-{
-  if (ptr == NULL)
-    return SCM_EOL;
-  else {
-    SCM smob;
-    swig_guile_clientdata *cdata = (swig_guile_clientdata *) type->clientdata;
-    if (owner)
-      SCM_NEWSMOB2(smob, swig_collectable_tag, ptr, (void *) type);
-    else
-      SCM_NEWSMOB2(smob, swig_tag, ptr, (void *) type);
-
-    if (!cdata || SCM_NULLP(cdata->goops_class) || swig_make_func == SCM_EOL ) {
-      return smob;
-    } else {
-      /* the scm_make() C function only handles the creation of gf,
-	 methods and classes (no instances) the (make ...) function is
-	 later redefined in goops.scm.  So we need to call that
-	 Scheme function. */
-      return scm_apply(swig_make_func,
-		       scm_list_3(cdata->goops_class,
-				  swig_keyword,
-				  smob),
-		       SCM_EOL);
-    }
-  }
-}
-
-SWIGINTERN unsigned long
-SWIG_Guile_PointerAddress(SCM object)
-{
-  SCM smob = SWIG_Guile_GetSmob(object);
-  if (SCM_NULLP(smob)) return 0;
-  else if (SCM_SMOB_PREDICATE(swig_tag, smob)
-	   || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)
-	   || SCM_SMOB_PREDICATE(swig_destroyed_tag, smob)) {
-    return (unsigned long) (void *) SCM_CELL_WORD_1(smob);
-  }
-  else scm_wrong_type_arg("SWIG-Guile-PointerAddress", 1, object);
-}
-
-SWIGINTERN swig_type_info *
-SWIG_Guile_PointerType(SCM object)
-{
-  SCM smob = SWIG_Guile_GetSmob(object);
-  if (SCM_NULLP(smob)) return NULL;
-  else if (SCM_SMOB_PREDICATE(swig_tag, smob)
-	   || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)
-	   || SCM_SMOB_PREDICATE(swig_destroyed_tag, smob)) {
-    return (swig_type_info *) SCM_CELL_WORD_2(smob);
-  }
-  else scm_wrong_type_arg("SWIG-Guile-PointerType", 1, object);
-}
-  
-SWIGINTERN int
-SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags)
-{
-  swig_cast_info *cast;
-  swig_type_info *from;
-  SCM smob = SWIG_Guile_GetSmob(s);
-
-  if (SCM_NULLP(smob)) {
-    *result = NULL;
-    return SWIG_OK;
-#if SCM_MAJOR_VERSION >= 2
-  } else if (SCM_POINTER_P(s)) {
-    *result = SCM_POINTER_VALUE(s);
-    return SWIG_OK;
-#endif /* if SCM_MAJOR_VERSION >= 2 */
-  } else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) {
-    /* we do not accept smobs representing destroyed pointers */
-    from = (swig_type_info *) SCM_CELL_WORD_2(smob);
-    if (!from) return SWIG_ERROR;
-    if (type) {
-      cast = SWIG_TypeCheckStruct(from, type);
-      if (cast) {
-        int newmemory = 0;
-        *result = SWIG_TypeCast(cast, (void *) SCM_CELL_WORD_1(smob), &newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-        return SWIG_OK;
-      } else {
-        return SWIG_ERROR;
-      }
-    } else {
-      *result = (void *) SCM_CELL_WORD_1(smob);
-      return SWIG_OK;
-    }
-  }
-  return SWIG_ERROR;
-}
-
-SWIGINTERNINLINE void *
-SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type,
-		       int argnum, int flags, const char *func_name)
-{
-  void *result;
-  int res = SWIG_Guile_ConvertPtr(s, &result, type, flags);
-  if (!SWIG_IsOK(res)) {
-    /* type mismatch */
-    scm_wrong_type_arg((char *) func_name, argnum, s);
-  }
-  return result;
-}
-
-SWIGINTERNINLINE int
-SWIG_Guile_IsPointerOfType (SCM s, swig_type_info *type)
-{
-  void *result;
-  if (SWIG_Guile_ConvertPtr(s, &result, type, 0)) {
-    /* type mismatch */
-    return 0;
-  }
-  else return 1;
-}
-
-SWIGINTERNINLINE int
-SWIG_Guile_IsPointer (SCM s)
-{
-  /* module might not be initialized yet, so initialize it */
-  SWIG_GetModule(0);
-  return SWIG_Guile_IsPointerOfType (s, NULL);
-}
-
-/* Mark a pointer object non-collectable */
-SWIGINTERN void
-SWIG_Guile_MarkPointerNoncollectable(SCM s)
-{
-  SCM smob = SWIG_Guile_GetSmob(s);
-  if (!SCM_NULLP(smob)) {
-    if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) {
-      SCM_SET_CELL_TYPE(smob, swig_tag);
-    }
-    else scm_wrong_type_arg(NULL, 0, s);
-  }
-}
-
-/* Mark a pointer object destroyed */
-SWIGINTERN void
-SWIG_Guile_MarkPointerDestroyed(SCM s)
-{
-  SCM smob = SWIG_Guile_GetSmob(s);
-  if (!SCM_NULLP(smob)) {
-    if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) {
-      SCM_SET_CELL_TYPE(smob, swig_destroyed_tag);
-    }
-    else scm_wrong_type_arg(NULL, 0, s);
-  }
-}
-
-/* Member functions */
-
-SWIGINTERN SCM
-SWIG_Guile_NewMemberObj(void *ptr, size_t sz, swig_type_info *type,
-			const char *func_name)
-{
-  SCM smob;
-  void *copy = malloc(sz);
-  memcpy(copy, ptr, sz);
-  SCM_NEWSMOB2(smob, swig_member_function_tag, copy, (void *) type);
-  return smob;
-}
-
-SWIGINTERN int
-SWIG_Guile_ConvertMember(SCM smob, void *ptr, size_t sz, swig_type_info *type,
-			 const char *func_name)
-{
-  swig_cast_info *cast;
-  swig_type_info *from;
-
-  if (SCM_SMOB_PREDICATE(swig_member_function_tag, smob)) {
-    from = (swig_type_info *) SCM_CELL_WORD_2(smob);
-    if (!from) return SWIG_ERROR;
-    if (type) {
-      cast = SWIG_TypeCheckStruct(from, type);
-      if (!cast) return SWIG_ERROR;
-    }
-    memcpy(ptr, (void *) SCM_CELL_WORD_1(smob), sz);
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-     
-
-/* Init */
-
-SWIGINTERN int
-print_swig_aux (SCM swig_smob, SCM port, scm_print_state *pstate, 
-                const char *attribute)
-{
-  swig_type_info *type;
-  
-  type = (swig_type_info *) SCM_CELL_WORD_2(swig_smob);
-  if (type) {
-    scm_puts((char *) "#<", port);
-    scm_puts((char *) attribute, port);
-    scm_puts((char *) "swig-pointer ", port);
-    scm_puts((char *) SWIG_TypePrettyName(type), port);
-    scm_puts((char *) " ", port);
-    scm_intprint((long) SCM_CELL_WORD_1(swig_smob), 16, port);
-    scm_puts((char *) ">", port);
-    /* non-zero means success */
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-  
-SWIGINTERN int
-print_swig (SCM swig_smob, SCM port, scm_print_state *pstate)
-{
-  return print_swig_aux(swig_smob, port, pstate, "");
-}
-
-SWIGINTERN int
-print_collectable_swig (SCM swig_smob, SCM port, scm_print_state *pstate)
-{
-  return print_swig_aux(swig_smob, port, pstate, "collectable-");
-}
-
-SWIGINTERN int
-print_destroyed_swig (SCM swig_smob, SCM port, scm_print_state *pstate)
-{
-  return print_swig_aux(swig_smob, port, pstate, "destroyed-");
-}
-
-SWIGINTERN int
-print_member_function_swig (SCM swig_smob, SCM port, scm_print_state *pstate)
-{
-  swig_type_info *type;
-  type = (swig_type_info *) SCM_CELL_WORD_2(swig_smob);
-  if (type) {
-    scm_puts((char *) "#<", port);
-    scm_puts((char *) "swig-member-function-pointer ", port);
-    scm_puts((char *) SWIG_TypePrettyName(type), port);
-    scm_puts((char *) " >", port);
-    /* non-zero means success */
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-SWIGINTERN SCM
-equalp_swig (SCM A, SCM B)
-{
-  if (SCM_CELL_WORD_0(A) == SCM_CELL_WORD_0(B) && SCM_CELL_WORD_1(A) == SCM_CELL_WORD_1(B) 
-      && SCM_CELL_WORD_2(A) == SCM_CELL_WORD_2(B))
-    return SCM_BOOL_T;
-  else return SCM_BOOL_F;
-}
-
-SWIGINTERN size_t
-free_swig(SCM A)
-{
-  swig_type_info *type = (swig_type_info *) SCM_CELL_WORD_2(A);
-  if (type) {
-    if (type->clientdata && ((swig_guile_clientdata *)type->clientdata)->destroy)
-      ((swig_guile_clientdata *)type->clientdata)->destroy(A);
-  } 
-  return 0;
-}
-
-SWIGINTERN size_t
-free_swig_member_function(SCM A)
-{
-  free((swig_type_info *) SCM_CELL_WORD_1(A));
-  return 0;
-}
-
-SWIGINTERN int
-ensure_smob_tag(SCM swig_module,
-		scm_t_bits *tag_variable,
-		const char *smob_name,
-		const char *scheme_variable_name)
-{
-  SCM variable = scm_module_variable(swig_module,
-                             scm_from_locale_symbol(scheme_variable_name));
-  if (scm_is_false(variable)) {
-    *tag_variable = scm_make_smob_type((char*)scheme_variable_name, 0);
-    scm_c_module_define(swig_module, scheme_variable_name, 
-                        scm_from_ulong(*tag_variable));
-    return 1;
-  }
-  else {
-    *tag_variable = scm_to_ulong(SCM_VARIABLE_REF(variable));
-    return 0;
-  }
-}
-
-SWIGINTERN SCM
-SWIG_Guile_Init ()
-{
-  static SCM swig_module;
-  
-  if (swig_initialized) return swig_module;
-  swig_initialized = 1;
-
-  swig_module = scm_c_resolve_module("Swig swigrun");
-  if (ensure_smob_tag(swig_module, &swig_tag,
-		      "swig-pointer", "swig-pointer-tag")) {
-    scm_set_smob_print(swig_tag, print_swig);
-    scm_set_smob_equalp(swig_tag, equalp_swig);
-  }
-  if (ensure_smob_tag(swig_module, &swig_collectable_tag,
-		      "collectable-swig-pointer", "collectable-swig-pointer-tag")) {
-    scm_set_smob_print(swig_collectable_tag, print_collectable_swig);
-    scm_set_smob_equalp(swig_collectable_tag, equalp_swig);
-    scm_set_smob_free(swig_collectable_tag, free_swig);
-  }
-  if (ensure_smob_tag(swig_module, &swig_destroyed_tag,
-		      "destroyed-swig-pointer", "destroyed-swig-pointer-tag")) {
-    scm_set_smob_print(swig_destroyed_tag, print_destroyed_swig);
-    scm_set_smob_equalp(swig_destroyed_tag, equalp_swig);
-  }
-  if (ensure_smob_tag(swig_module, &swig_member_function_tag,
-		      "swig-member-function-pointer", "swig-member-function-pointer-tag")) {
-    scm_set_smob_print(swig_member_function_tag, print_member_function_swig);
-    scm_set_smob_free(swig_member_function_tag, free_swig_member_function);
-  }
-  swig_make_func = scm_permanent_object(
-  scm_variable_ref(scm_c_module_lookup(scm_c_resolve_module("oop goops"), "make")));
-  swig_keyword = scm_permanent_object(scm_from_locale_keyword((char*) "init-smob"));
-  swig_symbol = scm_permanent_object(scm_from_locale_symbol("swig-smob"));
-#ifdef SWIG_INIT_RUNTIME_MODULE
-  SWIG_INIT_RUNTIME_MODULE
-#endif
-
-  return swig_module;
-}
-
-SWIGINTERN swig_module_info *
-SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata))
-{
-  SCM module = SWIG_Guile_Init();
-  SCM variable = scm_module_variable(module, scm_from_locale_symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME));
-  if (scm_is_false(variable)) {
-    return NULL;
-  } else {
-    return (swig_module_info *) scm_to_ulong(SCM_VARIABLE_REF(variable));
-  }
-}
-
-SWIGINTERN void
-SWIG_Guile_SetModule(swig_module_info *swig_module)
-{
-  SCM module = SWIG_Guile_Init();
-  scm_module_define(module,
-                    scm_from_locale_symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME),
-                    scm_from_ulong((unsigned long) swig_module));
-}
-
-SWIGINTERN int
-SWIG_Guile_GetArgs (SCM *dest, SCM rest,
-		    int reqargs, int optargs,
-		    const char *procname)
-{
-  int i;
-  int num_args_passed = 0;
-  for (i = 0; i<reqargs; i++) {
-    if (!SCM_CONSP(rest))
-      scm_wrong_num_args(scm_from_utf8_string(procname ? (char *) procname : "unknown procedure"));
-    *dest++ = SCM_CAR(rest);
-    rest = SCM_CDR(rest);
-    num_args_passed++;
-  }
-  for (i = 0; i<optargs && SCM_CONSP(rest); i++) {
-    *dest++ = SCM_CAR(rest);
-    rest = SCM_CDR(rest);
-    num_args_passed++;
-  }
-  for (; i<optargs; i++)
-    *dest++ = SCM_UNDEFINED;
-  if (!SCM_NULLP(rest))
-      scm_wrong_num_args(scm_from_utf8_string(procname ? (char *) procname : "unknown procedure"));
-  return num_args_passed;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/guile/guilemain.i b/dependencies2013/win32/swig/Lib/guile/guilemain.i
deleted file mode 100644
index 925b81fe..00000000
--- a/dependencies2013/win32/swig/Lib/guile/guilemain.i
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -----------------------------------------------------------------------------
- * guilemain.i
- *
- * The main functions for a user augmented guile
- * version that can handle wrapped calls as generated by SWIG
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <libguile.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Debugger interface (don't change the order of the following lines) */
-#define GDB_TYPE SCM
-#include <libguile/gdb_interface.h>
-GDB_INTERFACE;
-
-static void
-inner_main(void *closure, int argc, char **argv)
-{
-#ifdef SWIGINIT
-  SWIGINIT
-#else
-  SWIG_init();			/* SWIG init function */
-#endif
-  scm_shell(argc, argv);	/* scheme interpreter */
-  /* never reached: scm_shell will perform an exit */
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-int
-main(int argc, char **argv)
-{
-  /* put any default initialisation code here: e.g. exit handlers */
-  scm_boot_guile(argc, argv, inner_main, 0); /* make a stack entry for the
-						garbage collector */
-  return 0; /* never reached, but avoids a warning */
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/guile/interpreter.i b/dependencies2013/win32/swig/Lib/guile/interpreter.i
deleted file mode 100644
index 524e0694..00000000
--- a/dependencies2013/win32/swig/Lib/guile/interpreter.i
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -----------------------------------------------------------------------------
- * interpreter.i
- *
- * SWIG file for a simple Guile interpreter
- * ----------------------------------------------------------------------------- */
-
-%{
-
-#include <stdio.h>
-GSCM_status guile_init();
-
-int main(int argc, char **argv) {
-  GSCM_status status;
-  GSCM_top_level toplev;
-  char *eval_answer;
-  char input_str[16384];
-  int done;
-
-  /* start a scheme interpreter */
-  status = gscm_run_scm(argc, argv, 0, stdout, stderr, guile_init, 0, "#t");
-  if (status != GSCM_OK) {
-    fputs(gscm_error_msg(status), stderr);
-    fputc('\n', stderr);
-    printf("Error in startup.\n");
-    exit(1);
-  }
-
-  /* create the top level environment */
-  status = gscm_create_top_level(&toplev);
-  if (status != GSCM_OK) {
-    fputs(gscm_error_msg(status), stderr);
-    fputc('\n', stderr);
-    exit(1);
-  }
-
-  /* now sit in a scheme eval loop: I input the expressions, have guile
-   * evaluate them, and then get another expression.
-   */
-  done = 0;
-  fprintf(stdout,"Guile > ");
-  while (!done) {
-    if (fgets(input_str,16384,stdin) == NULL) {
-      exit(1);
-    } else {
-      if (strncmp(input_str,"quit",4) == 0) exit(1);
-      status = gscm_eval_str(&eval_answer, toplev, input_str);
-      fprintf(stdout,"%s\n", eval_answer);
-      fprintf(stdout,"Guile > ");
-    }
-  }
-
-  /* now clean up and quit */
-  gscm_destroy_top_level(toplev);
-}
-
-%}
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/guile/list-vector.i b/dependencies2013/win32/swig/Lib/guile/list-vector.i
deleted file mode 100644
index 057a1da5..00000000
--- a/dependencies2013/win32/swig/Lib/guile/list-vector.i
+++ /dev/null
@@ -1,488 +0,0 @@
-/* -----------------------------------------------------------------------------
- * list_vector.i
- *
- * Guile typemaps for converting between arrays and Scheme lists or vectors  
- * ----------------------------------------------------------------------------- */
-
-/* Here is a macro that will define typemaps for converting between C
-   arrays and Scheme lists or vectors when passing arguments to the C
-   function.
-
-   TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(C_TYPE, SCM_TO_C, C_TO_SCM, SCM_TYPE)
-   
-   Supported calling conventions:
-
-   func(int VECTORLENINPUT, [const] C_TYPE *VECTORINPUT)
-
-       Scheme wrapper will take one argument, a vector.  A temporary C
-       array of elements of type C_TYPE will be allocated and filled
-       with the elements of the vectors, converted to C with the
-       SCM_TO_C function.  Length and address of the array are passed
-       to the C function.
-
-       SCM_TYPE is used to describe the Scheme type of the elements in
-       the Guile procedure documentation.
-   
-   func(int LISTLENINPUT, [const] C_TYPE *LISTINPUT)
-
-       Likewise, but the Scheme wrapper will take one argument, a list.
-
-   func(int *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT)
-
-       Scheme wrapper will take no arguments.  Addresses of an integer
-       and a C_TYPE * variable will be passed to the C function.  The
-       C function is expected to return address and length of a
-       freshly allocated array of elements of type C_TYPE through
-       these pointers.  The elements of this array are converted to
-       Scheme with the C_TO_SCM function and returned as a Scheme
-       vector. 
-
-       If the function has a void return value, the vector constructed
-       by this typemap becomes the return value of the Scheme wrapper.
-       Otherwise, the function returns multiple values.  (See
-       the documentation on how to deal with multiple values.)
-
-   func(int *LISTLENOUTPUT, C_TYPE **LISTOUTPUT)
-
-       Likewise, but the Scheme wrapper will return a list instead of
-       a vector.
-
-   It is also allowed to use "size_t LISTLENINPUT" rather than "int
-   LISTLENINPUT".  */
-
-%define TYPEMAP_LIST_VECTOR_INPUT_WITH_EXPR(C_TYPE, SCM_TO_C_EXPR, SCM_TYPE)
-
-  /* input */
-     
-     /* We make use of the new multi-dispatch typemaps here. */
-     
-     %typemap(in, doc="$NAME is a vector of " #SCM_TYPE " values")
-       (int VECTORLENINPUT, C_TYPE *VECTORINPUT),
-       (size_t VECTORLENINPUT, C_TYPE *VECTORINPUT)
-     {
-       SCM_VALIDATE_VECTOR($argnum, $input);
-       $1 = scm_c_vector_length($input);
-       if ($1 > 0) {
-	 $1_ltype i;
-	 $2 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE) * $1);
-	 for (i = 0; i<$1; i++) {
-	   SCM swig_scm_value = scm_vector_ref($input, scm_from_long(i));
-	   $2[i] = SCM_TO_C_EXPR;
-	 }
-       }
-       else $2 = NULL;
-     }
-	 
-     %typemap(in, doc="$NAME is a list of " #SCM_TYPE " values")
-       (int LISTLENINPUT, C_TYPE *LISTINPUT),
-       (size_t LISTLENINPUT, C_TYPE *LISTINPUT)
-     {
-       SCM_VALIDATE_LIST($argnum, $input);
-       $1 = scm_to_ulong(scm_length($input));
-       if ($1 > 0) {
-	 $1_ltype i;
-	 SCM rest;
-	 $2 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE) * $1);
-	 for (i = 0, rest = $input;
-	      i<$1;
-	      i++, rest = SCM_CDR(rest)) {
-	   SCM swig_scm_value = SCM_CAR(rest);
-	   $2[i] = SCM_TO_C_EXPR;
-	 }
-       }
-       else $2 = NULL;
-     }
-
-     /* Do not check for NULL pointers (override checks). */
-
-     %typemap(check) (int VECTORLENINPUT, C_TYPE *VECTORINPUT),
-                     (size_t VECTORLENINPUT, C_TYPE *VECTORINPUT),
-                     (int LISTLENINPUT, C_TYPE *LISTINPUT),
-                     (size_t LISTLENINPUT, C_TYPE *LISTINPUT)
-       "/* no check for NULL pointer */";
-
-     /* Discard the temporary array after the call. */
-
-     %typemap(freearg) (int VECTORLENINPUT, C_TYPE *VECTORINPUT),
-                     (size_t VECTORLENINPUT, C_TYPE *VECTORINPUT),
-                     (int LISTLENINPUT, C_TYPE *LISTINPUT),
-                     (size_t LISTLENINPUT, C_TYPE *LISTINPUT)
-       {if ($2!=NULL) SWIG_free($2);}
-
-%enddef
-
-  /* output */
-
-%define TYPEMAP_LIST_VECTOR_OUTPUT_WITH_EXPR(C_TYPE, C_TO_SCM_EXPR, SCM_TYPE)
-
-     /* First we make temporary variables ARRAYLENTEMP and ARRAYTEMP,
-	whose addresses we pass to the C function.  We ignore both
-	arguments for Scheme. */
-
-     %typemap(in,numinputs=0) (int *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT)
-                        (int arraylentemp, C_TYPE *arraytemp),
-                      (int *LISTLENOUTPUT, C_TYPE **LISTOUTPUT)
-                        (int arraylentemp, C_TYPE *arraytemp),
-		      (size_t *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT)
-                        (size_t arraylentemp, C_TYPE *arraytemp),
-                      (size_t *LISTLENOUTPUT, C_TYPE **LISTOUTPUT)
-                        (size_t arraylentemp, C_TYPE *arraytemp)
-     %{
-       $1 = &arraylentemp;
-       $2 = &arraytemp;
-     %}
-
-     /* In the ARGOUT typemaps, we convert the array into a vector or
-        a list and append it to the results. */
-
-     %typemap(argout, doc="$NAME (a vector of " #SCM_TYPE " values)") 
-          (int *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT),
-	  (size_t *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT)
-     {
-       $*1_ltype i;
-       SCM res = scm_make_vector(scm_from_long(*$1),
-				SCM_BOOL_F);
-       for (i = 0; i<*$1; i++) {
-	 C_TYPE swig_c_value = (*$2)[i];
-	 SCM elt = C_TO_SCM_EXPR;
-	 scm_vector_set_x(res, scm_from_long(i), elt);
-       }
-       SWIG_APPEND_VALUE(res);
-     }
-
-     %typemap(argout, doc="$NAME (a list of " #SCM_TYPE " values)")
-          (int *LISTLENOUTPUT, C_TYPE **LISTOUTPUT),
-	  (size_t *LISTLENOUTPUT, C_TYPE **LISTOUTPUT)
-     {
-       int i;
-       SCM res = SCM_EOL;
-       for (i = ((int)(*$1)) - 1; i>=0; i--) {
-         C_TYPE swig_c_value = (*$2)[i];
-	 SCM elt = C_TO_SCM_EXPR;
-	 res = scm_cons(elt, res);
-       }
-       SWIG_APPEND_VALUE(res);
-     }
-
-     /* In the FREEARG typemaps, get rid of the C vector.  
-        (This can be overridden if you want to keep the C vector.) */
-
-     %typemap(freearg) 
-          (int *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT),
-	  (size_t *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT), 
-	  (int *LISTLENOUTPUT, C_TYPE **LISTOUTPUT),
-	  (size_t *LISTLENOUTPUT, C_TYPE **LISTOUTPUT)
-     {
-        if ((*$2)!=NULL) free(*$2);
-     }
-
-%enddef
-
-%define TYPEMAP_LIST_VECTOR_INPUT_OUTPUT_WITH_EXPR(C_TYPE, SCM_TO_C_EXPR, C_TO_SCM_EXPR, SCM_TYPE)
-  TYPEMAP_LIST_VECTOR_INPUT_WITH_EXPR(C_TYPE, SCM_TO_C_EXPR, SCM_TYPE)
-  TYPEMAP_LIST_VECTOR_OUTPUT_WITH_EXPR(C_TYPE, C_TO_SCM_EXPR, SCM_TYPE)
-%enddef
-
-%define TYPEMAP_LIST_VECTOR_INPUT(C_TYPE, SCM_TO_C, SCM_TYPE)
-  TYPEMAP_LIST_VECTOR_INPUT_WITH_EXPR
-     (C_TYPE, SCM_TO_C(swig_scm_value), SCM_TYPE)
-%enddef
-
-%define TYPEMAP_LIST_VECTOR_OUTPUT(C_TYPE, C_TO_SCM, SCM_TYPE)
-  TYPEMAP_LIST_VECTOR_OUTPUT_WITH_EXPR
-     (C_TYPE, C_TO_SCM(swig_c_value), SCM_TYPE)
-%enddef
-
-%define TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(C_TYPE, SCM_TO_C, C_TO_SCM, SCM_TYPE)
-  TYPEMAP_LIST_VECTOR_INPUT_OUTPUT_WITH_EXPR
-     (C_TYPE, SCM_TO_C(swig_scm_value), C_TO_SCM(swig_c_value), SCM_TYPE)
-%enddef
-
-/* We use the macro to define typemaps for some standard types. */
-
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(bool, scm_is_true, scm_from_bool, boolean);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(char, SCM_CHAR, SCM_MAKE_CHAR, char);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned char, SCM_CHAR, SCM_MAKE_CHAR, char);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(int, scm_to_int, scm_from_long, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(short, scm_to_int, scm_from_long, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(long, scm_to_long, scm_from_long, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(ptrdiff_t, scm_to_long, scm_from_long, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned int, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned short, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned long, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(size_t, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(float, scm_to_double, scm_from_double, real);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(double, scm_to_double, scm_from_double, real);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(char *, SWIG_scm2str, SWIG_str02scm, string);
-TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, SWIG_str02scm, string);
-
-/* For the char *, free all strings after converting */
-
-     %typemap(freearg) 
-          (int *VECTORLENOUTPUT, char ***VECTOROUTPUT),
-	  (size_t *VECTORLENOUTPUT, char ***VECTOROUTPUT), 
-	  (int *LISTLENOUTPUT, char ***LISTOUTPUT),
-    (size_t *LISTLENOUTPUT, char ***LISTOUTPUT),
-    (int *VECTORLENOUTPUT, const char ***VECTOROUTPUT),
-    (size_t *VECTORLENOUTPUT, const char ***VECTOROUTPUT), 
-    (int *LISTLENOUTPUT, const char ***LISTOUTPUT),
-    (size_t *LISTLENOUTPUT, const char ***LISTOUTPUT)
-    {
-	 if ((*$2)!=NULL) {
-	     int i;
-	     for (i = 0; i < *$1; i++) {
-		 if ((*$2)[i] != NULL) free((*$2)[i]);
-	     }
-	     free(*$2);
-	 }
-     }
-
-%typemap(freearg) (int VECTORLENINPUT, char **VECTORINPUT),
-    (size_t VECTORLENINPUT, char **VECTORINPUT), 
-    (int LISTLENINPUT, char **LISTINPUT),
-    (size_t LISTLENINPUT, char **LISTINPUT),
-    (int VECTORLENINPUT, const char **VECTORINPUT),
-    (size_t VECTORLENINPUT, const char **VECTORINPUT), 
-    (int LISTLENINPUT, const char **LISTINPUT),
-    (size_t LISTLENINPUT, const char **LISTINPUT)
-{
-    if (($2)!=NULL) {
-	int i;
-	for (i = 0; i< $1; i++)
-	    if (($2)[i] != NULL) free(($2)[i]);
-	free($2);
-    }
-}
-
-
-/* Following is a macro that emits typemaps that are much more
-   flexible.  (They are also messier.)  It supports multiple parallel
-   lists and vectors (sharing one length argument each).
-
-   TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(C_TYPE, SCM_TO_C, C_TO_SCM, SCM_TYPE)
-   
-   Supported calling conventions:
-
-   func(int PARALLEL_VECTORLENINPUT, [const] C_TYPE *PARALLEL_VECTORINPUT, ...)  or
-   func([const] C_TYPE *PARALLEL_VECTORINPUT, ..., int PARALLEL_VECTORLENINPUT)
-
-   func(int PARALLEL_LISTLENINPUT, [const] C_TYPE *PARALLEL_LISTINPUT, ...) or
-   func([const] C_TYPE *PARALLEL_LISTINPUT, ..., int PARALLEL_LISTLENINPUT)
-
-   func(int *PARALLEL_VECTORLENOUTPUT, C_TYPE **PARALLEL_VECTOROUTPUT, ...) or
-   func(C_TYPE **PARALLEL_VECTOROUTPUT, int *PARALLEL_VECTORLENOUTPUT, ...)
-
-   func(int *PARALLEL_LISTLENOUTPUT, C_TYPE **PARALLEL_LISTOUTPUT) or
-   func(C_TYPE **PARALLEL_LISTOUTPUT, int *PARALLEL_LISTLENOUTPUT)
-
-   It is also allowed to use "size_t PARALLEL_LISTLENINPUT" rather than "int
-   PARALLEL_LISTLENINPUT".  */
-
-%define TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_WITH_EXPR(C_TYPE, SCM_TO_C_EXPR, SCM_TYPE)
-
-  /* input */
-     
-     /* Passing data is a little complicated here; just remember:
-	IGNORE typemaps come first, then IN, then CHECK.  But if
-	IGNORE is given, IN won't be used for this type.
-
-	We need to "ignore" one of the parameters because there shall
-	be only one argument on the Scheme side.  Here we only
-	initialize the array length to 0 but save its address for a
-	later change.  */
-     
-     %typemap(in,numinputs=0) int PARALLEL_VECTORLENINPUT (int *_global_vector_length),
-		      size_t PARALLEL_VECTORLENINPUT (size_t *_global_vector_length)
-     {		      
-       $1 = 0;
-       _global_vector_length = &$1;
-     }
-
-     %typemap(in,numinputs=0) int PARALLEL_LISTLENINPUT (int *_global_list_length),   
-		      size_t PARALLEL_LISTLENINPUT (size_t *_global_list_length)
-     {		      
-       $1 = 0;
-       _global_list_length = &$1;
-     }
-
-     /* All the work is done in IN. */
-
-     %typemap(in, doc="$NAME is a vector of " #SCM_TYPE " values") 
-		  C_TYPE *PARALLEL_VECTORINPUT,
-		  const C_TYPE *PARALLEL_VECTORINPUT
-     {
-       SCM_VALIDATE_VECTOR($argnum, $input);
-       *_global_vector_length = scm_c_vector_length($input);
-       if (*_global_vector_length > 0) {
-	 int i;
-	 $1 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE)
-			       * (*_global_vector_length));
-	 for (i = 0; i<*_global_vector_length; i++) {
-	   SCM swig_scm_value = scm_vector_ref($input, scm_from_long(i));
-	   $1[i] = SCM_TO_C_EXPR;
-	 }
-       }
-       else $1 = NULL;
-     }
-	 
-     %typemap(in, doc="$NAME is a list of " #SCM_TYPE " values") 
-		  C_TYPE *PARALLEL_LISTINPUT,
-		  const C_TYPE *PARALLEL_LISTINPUT
-     {
-       SCM_VALIDATE_LIST($argnum, $input);
-       *_global_list_length = scm_to_ulong(scm_length($input));
-       if (*_global_list_length > 0) {
-	 int i;
-	 SCM rest;
-	 $1 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE)
-			       * (*_global_list_length));
-	 for (i = 0, rest = $input;
-	      i<*_global_list_length;
-	      i++, rest = SCM_CDR(rest)) {
-	   SCM swig_scm_value = SCM_CAR(rest);
-	   $1[i] = SCM_TO_C_EXPR;
-	 }
-       }
-       else $1 = NULL;
-     }
-
-     /* Don't check for NULL pointers (override checks). */
-
-     %typemap(check) C_TYPE *PARALLEL_VECTORINPUT, 
-		     const C_TYPE *PARALLEL_VECTORINPUT,
-		     C_TYPE *PARALLEL_LISTINPUT, 
-		     const C_TYPE *PARALLEL_LISTINPUT
-       "/* no check for NULL pointer */";
-
-     /* Discard the temporary array after the call. */
-
-     %typemap(freearg) C_TYPE *PARALLEL_VECTORINPUT, 
-		       const C_TYPE *PARALLEL_VECTORINPUT,
-		       C_TYPE *PARALLEL_LISTINPUT, 
-		       const C_TYPE *PARALLEL_LISTINPUT
-       {if ($1!=NULL) SWIG_free($1);}
-
-%enddef
-
-%define TYPEMAP_PARALLEL_LIST_VECTOR_OUTPUT_WITH_EXPR(C_TYPE, C_TO_SCM_EXPR, SCM_TYPE)
-
-  /* output */
-
-     /* First we make a temporary variable ARRAYLENTEMP, use its
-        address as the ...LENOUTPUT argument for the C function and
-        "ignore" the ...LENOUTPUT argument for Scheme.  */
-
-     %typemap(in,numinputs=0) int *PARALLEL_VECTORLENOUTPUT (int _global_arraylentemp),
-		      size_t *PARALLEL_VECTORLENOUTPUT (size_t _global_arraylentemp),
-		      int *PARALLEL_LISTLENOUTPUT   (int _global_arraylentemp),
-		      size_t *PARALLEL_LISTLENOUTPUT   (size_t _global_arraylentemp)
-       "$1 = &_global_arraylentemp;";
-
-     /* We also need to ignore the ...OUTPUT argument. */
-
-     %typemap(in,numinputs=0) C_TYPE **PARALLEL_VECTOROUTPUT (C_TYPE *arraytemp),
-		      C_TYPE **PARALLEL_LISTOUTPUT   (C_TYPE *arraytemp)
-       "$1 = &arraytemp;";
-
-     /* In the ARGOUT typemaps, we convert the array into a vector or
-        a list and append it to the results. */
-
-     %typemap(argout, doc="$NAME (a vector of " #SCM_TYPE " values)") 
-		      C_TYPE **PARALLEL_VECTOROUTPUT
-     {
-       int i;
-       SCM res = scm_make_vector(scm_from_long(_global_arraylentemp),
-				SCM_BOOL_F);
-       for (i = 0; i<_global_arraylentemp; i++) {
-         C_TYPE swig_c_value = (*$1)[i];
-	 SCM elt = C_TO_SCM_EXPR;
-	 scm_vector_set_x(res, scm_from_long(i), elt);
-       }
-       SWIG_APPEND_VALUE(res);
-     }
-
-     %typemap(argout, doc="$NAME (a list of " #SCM_TYPE " values)") 
-		      C_TYPE **PARALLEL_LISTOUTPUT
-     {
-       int i;
-       SCM res = SCM_EOL;
-       if (_global_arraylentemp > 0) {
-         for (i = _global_arraylentemp - 1; i>=0; i--) {
-	   C_TYPE swig_c_value = (*$1)[i];	 
-	   SCM elt = C_TO_SCM_EXPR;
-	   res = scm_cons(elt, res);
-         }
-       }
-       SWIG_APPEND_VALUE(res);
-     }
-
-     /* In the FREEARG typemaps, get rid of the C vector.  
-        (This can be overridden if you want to keep the C vector.) */
-
-     %typemap(freearg) C_TYPE **PARALLEL_VECTOROUTPUT, 
-		       C_TYPE **PARALLEL_LISTOUTPUT
-     {
-        if ((*$1)!=NULL) free(*$1);
-     }
-
-%enddef
-
-%define TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT_WITH_EXPR(C_TYPE, SCM_TO_C_EXPR, C_TO_SCM_EXPR, SCM_TYPE)
-  TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_WITH_EXPR(C_TYPE, SCM_TO_C_EXPR, SCM_TYPE)
-  TYPEMAP_PARALLEL_LIST_VECTOR_OUTPUT_WITH_EXPR(C_TYPE, C_TO_SCM_EXPR, SCM_TYPE)
-%enddef
-
-%define TYPEMAP_PARALLEL_LIST_VECTOR_INPUT(C_TYPE, SCM_TO_C, SCM_TYPE)
-  TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_WITH_EXPR
-     (C_TYPE, SCM_TO_C(swig_scm_value), SCM_TYPE)
-%enddef
-
-%define TYPEMAP_PARALLEL_LIST_VECTOR_OUTPUT(C_TYPE, C_TO_SCM, SCM_TYPE)
-  TYPEMAP_PARALLEL_LIST_VECTOR_OUTPUT_WITH_EXPR
-     (C_TYPE, C_TO_SCM(swig_c_value), SCM_TYPE)
-%enddef
-
-%define TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(C_TYPE, SCM_TO_C, C_TO_SCM, SCM_TYPE)
-  TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT_WITH_EXPR
-    (C_TYPE, SCM_TO_C(swig_scm_value), C_TO_SCM(swig_c_value), SCM_TYPE)
-%enddef
-
-/* We use the macro to define typemaps for some standard types. */
-
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(bool, scm_is_true, scm_from_bool, boolean);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(char, SCM_CHAR, SCM_MAKE_CHAR, char);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned char, SCM_CHAR, SCM_MAKE_CHAR, char);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(int, scm_to_int, scm_from_long, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(short, scm_to_int, scm_from_long, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(long, scm_to_long, scm_from_long, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(ptrdiff_t, scm_to_long, scm_from_long, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned int, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned short, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned long, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(size_t, scm_to_ulong, scm_from_ulong, integer);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(float, scm_to_double, scm_from_double, real);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(double, scm_to_double, scm_from_double, real);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(char *, SWIG_scm2str, SWIG_str02scm, string);
-TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, SWIG_str02scm, string);
-
-%typemap(freearg) char **PARALLEL_LISTINPUT, char **PARALLEL_VECTORINPUT,
-    const char **PARALLEL_LISTINPUT, const char **PARALLEL_VECTORINPUT
-{
-    if (($1)!=NULL) {
-	int i;
-	for (i = 0; i<*_global_list_length; i++)
-	    if (($1)[i] != NULL) SWIG_free(($1)[i]);
-	SWIG_free($1);
-    }
-}
-
-%typemap(freearg) char ***PARALLEL_LISTOUTPUT, char ***PARALLEL_VECTOROUTPUT,
-    const char ***PARALLEL_LISTOUTPUT, const char ***PARALLEL_VECTOROUTPUT
-{
-    if ((*$1)!=NULL) {
-	int i;
-	for (i = 0; i<_global_arraylentemp; i++)
-	    if ((*$1)[i] != NULL) free((*$1)[i]);
-	free(*$1);
-    }
-}
diff --git a/dependencies2013/win32/swig/Lib/guile/pointer-in-out.i b/dependencies2013/win32/swig/Lib/guile/pointer-in-out.i
deleted file mode 100644
index d8a631ca..00000000
--- a/dependencies2013/win32/swig/Lib/guile/pointer-in-out.i
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pointer-in-out.i
- *
- * Guile typemaps for passing pointers indirectly 
- * ----------------------------------------------------------------------------- */
-
-/* Here is a macro that will define typemaps for passing C pointers indirectly.
-  
-   TYPEMAP_POINTER_INPUT_OUTPUT(PTRTYPE, SCM_TYPE)
-
-   Supported calling conventions (in this example, PTRTYPE is int *):
-
-   func(int **INPUT)
-
-       Scheme wrapper will take one argument, a wrapped C pointer.
-       The address of a variable containing this pointer will be
-       passed to the function.
-
-   func(int **INPUT_CONSUMED)
-
-       Likewise, but mark the pointer object as not garbage
-       collectable.
-
-   func(int **INPUT_DESTROYED)
-
-       Likewise, but mark the pointer object as destroyed.
-       
-   func(int **OUTPUT)
-
-       Scheme wrapper will take no arguments.  The address of an int *
-       variable will be passed to the function.  The function is
-       expected to modify the variable; its value is wrapped and
-       becomes an extra return value.  (See the documentation on how
-       to deal with multiple values.)
-   
-   func(int **OUTPUT_NONCOLLECTABLE)
-
-       Likewise, but make the pointer object not garbage collectable.
-   
-   func(int **BOTH)
-   func(int **INOUT)
-
-       This annotation combines INPUT and OUTPUT.
-
-*/
-
-%define TYPEMAP_POINTER_INPUT_OUTPUT(PTRTYPE, SCM_TYPE)
-
-%typemap(in, doc="$NAME is of type <" #SCM_TYPE ">") PTRTYPE *INPUT(PTRTYPE temp)
-{
-    if (SWIG_ConvertPtr($input, (void **) &temp, $*descriptor, 0)) {
-	scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-    }
-    $1 = &temp;
-}
-
-%typemap(in, doc="$NAME is of type <" #SCM_TYPE "> and is consumed by the function") PTRTYPE *INPUT_CONSUMED(PTRTYPE temp)
-{
-    if (SWIG_ConvertPtr($input, (void **) &temp, $*descriptor, 0)) {
-	scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-    }
-    SWIG_Guile_MarkPointerNoncollectable($input);
-    $1 = &temp;
-}
-
-%typemap(in, doc="$NAME is of type <" #SCM_TYPE "> and is consumed by the function") PTRTYPE *INPUT_DESTROYED(PTRTYPE temp)
-{
-    if (SWIG_ConvertPtr($input, (void **) &temp, $*descriptor, 0)) {
-	scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-    }
-    SWIG_Guile_MarkPointerDestroyed($input);
-    $1 = &temp;
-}
-
-%typemap(in, numinputs=0) PTRTYPE *OUTPUT(PTRTYPE temp),
-                          PTRTYPE *OUTPUT_NONCOLLECTABLE(PTRTYPE temp)
-     "$1 = &temp;";
-
-%typemap(argout, doc="<" #SCM_TYPE ">") PTRTYPE *OUTPUT
-     "SWIG_APPEND_VALUE(SWIG_NewPointerObj(*$1, $*descriptor, 1));"; 
-
-%typemap(argout, doc="<" #SCM_TYPE ">") PTRTYPE *OUTPUT_NONCOLLECTABLE
-     "SWIG_APPEND_VALUE(SWIG_NewPointerObj(*$1, $*descriptor, 0));"; 
-
-%typemap(in) PTRTYPE *BOTH = PTRTYPE *INPUT;
-%typemap(argout) PTRTYPE *BOTH = PTRTYPE *OUTPUT;
-%typemap(in) PTRTYPE *INOUT = PTRTYPE *INPUT;
-%typemap(argout) PTRTYPE *INOUT = PTRTYPE *OUTPUT;
-
-/* As a special convenience measure, also attach docs involving
-   SCM_TYPE to the standard pointer typemaps */
-
-%typemap(in, doc="$NAME is of type <" #SCM_TYPE ">") PTRTYPE {
-  if (SWIG_ConvertPtr($input, (void **) &$1, $descriptor, 0))
-    scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-}
-
-%typemap(out, doc="<" #SCM_TYPE ">") PTRTYPE {
-    $result = SWIG_NewPointerObj ($1, $descriptor, $owner);
-}
-
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/guile/ports.i b/dependencies2013/win32/swig/Lib/guile/ports.i
deleted file mode 100644
index 7691d3e3..00000000
--- a/dependencies2013/win32/swig/Lib/guile/ports.i
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ports.i
- *
- * Guile typemaps for handling ports
- * ----------------------------------------------------------------------------- */
-
-%{
-  #ifndef _POSIX_SOURCE
-  /* This is needed on Solaris for fdopen(). */
-  #  define _POSIX_SOURCE 199506L
-  #endif
-  #include <stdio.h>
-  #include <errno.h>
-  #include <unistd.h>
-%}
-
-/* This typemap for FILE * accepts
-   (1) FILE * pointer objects,
-   (2) Scheme file ports.  In this case, it creates a temporary C stream
-       which reads or writes from a dup'ed file descriptor.
- */
-
-%typemap(in, doc="$NAME is a file port or a FILE * pointer") FILE *
-{
-  if (SWIG_ConvertPtr($input, (void**) &($1), $1_descriptor, 0) != 0) {
-    if (!(SCM_FPORTP($input))) {
-      scm_wrong_type_arg("$symname", $argnum, $input);
-    } else {
-      int fd;
-      if (SCM_OUTPUT_PORT_P($input)) {
-        scm_force_output($input);
-      }
-      fd=dup(SCM_FPORT_FDES($input));
-      if (fd==-1) {
-        scm_misc_error("$symname", strerror(errno), SCM_EOL);
-      }
-      $1=fdopen(fd, SCM_OUTPUT_PORT_P($input) ? (SCM_INPUT_PORT_P($input) ? "r+" : "w") : "r");
-      if ($1==NULL) {
-        scm_misc_error("$symname", strerror(errno), SCM_EOL);
-      }
-    }
-  }
-}
-
-%typemap(freearg) FILE*  {
-  if ($1) {
-    fclose($1);
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Lib/guile/std_common.i b/dependencies2013/win32/swig/Lib/guile/std_common.i
deleted file mode 100644
index 5899c554..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_common.i
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%apply size_t { std::size_t };
-
-#define SWIG_bool2scm(b) scm_from_bool(b ? 1 : 0)
-#define SWIG_string2scm(s) SWIG_str02scm(s.c_str())
-
-%{
-#include <string>
-
-SWIGINTERNINLINE
-std::string SWIG_scm2string(SCM x) {
-    char* temp;
-    temp = SWIG_scm2str(x);
-    std::string s(temp);
-    if (temp) SWIG_free(temp);
-    return s;
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/guile/std_deque.i b/dependencies2013/win32/swig/Lib/guile/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/guile/std_except.i b/dependencies2013/win32/swig/Lib/guile/std_except.i
deleted file mode 100644
index 6c30a319..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_except.i
+++ /dev/null
@@ -1,13 +0,0 @@
-// TODO: STL exception handling
-// Note that the generic std_except.i file did not work
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-namespace std {
-  %ignore exception;
-  struct exception {
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/guile/std_map.i b/dependencies2013/win32/swig/Lib/guile/std_map.i
deleted file mode 100644
index 489acc18..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_map.i
+++ /dev/null
@@ -1,1334 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-//
-// The aim of all that follows would be to integrate std::map with
-// Guile as much as possible, namely, to allow the user to pass and
-// be returned Scheme association lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-//
-//   -- f(std::map<T>), f(const std::map<T>&), f(const std::map<T>*):
-//      the parameter being read-only, either a Scheme alist or a
-//      previously wrapped std::map<T> can be passed.
-//   -- f(std::map<T>&), f(std::map<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::map
-//      can be passed.
-//   -- std::map<T> f():
-//      the map is returned by copy; therefore, a Scheme alist
-//      is returned which is most easily used in other Scheme functions
-//   -- std::map<T>& f(), std::map<T>* f(), const std::map<T>& f(),
-//      const std::map<T>* f():
-//      the map is returned by reference; therefore, a wrapped std::map
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        %typemap(in) map<K,T> {
-            if (scm_is_null($input)) {
-                $1 = std::map< K, T >();
-            } else if (scm_is_pair($input)) {
-                $1 = std::map< K, T >();
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    K* k;
-                    T* x;
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) != 0) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    (($1_type &)$1)[*k] = *x;
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp),
-                     const map<K,T>* (std::map<K,T> temp) {
-            if (scm_is_null($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-            } else if (scm_is_pair($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    K* k;
-                    T* x;
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) != 0) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    temp[*k] = *x;
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            SCM alist = SCM_EOL;
-            for (std::map< K, T >::reverse_iterator i=$i.rbegin(); i!=$i.rend(); ++i) {
-                K* key = new K(i->first);
-                T* val = new T(i->second);
-                SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                SCM x = SWIG_NewPointerObj(val,$descriptor(T *), 1);
-                SCM entry = scm_cons(k,x);
-                alist = scm_cons(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            /* native sequence? */
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                /* check the first element only */
-                K* k;
-                T* x;
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM key = SCM_CAR(head);
-                    SCM val = SCM_CDR(head);
-                    if (SWIG_ConvertPtr(key,(void**) &k,
-                                    $descriptor(K *), 0) != 0) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) == 0) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) == 0)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped map? */
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            /* native sequence? */
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                /* check the first element only */
-                K* k;
-                T* x;
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM key = SCM_CAR(head);
-                    SCM val = SCM_CDR(head);
-                    if (SWIG_ConvertPtr(key,(void**) &k,
-                                    $descriptor(K *), 0) != 0) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) == 0) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) == 0)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped map? */
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map< K, T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& __getitem__(const K& key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(const K& key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map< K, T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            SCM keys() {
-                SCM result = SCM_EOL;
-                for (std::map< K, T >::reverse_iterator i=self->rbegin(); i!=self->rend(); ++i) {
-                    K* key = new K(i->first);
-                    SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                    result = scm_cons(k,result);
-                }
-                return result;
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-
-    template<class T> class map<K,T> {
-        %typemap(in) map<K,T> {
-            if (scm_is_null($input)) {
-                $1 = std::map< K, T >();
-            } else if (scm_is_pair($input)) {
-                $1 = std::map< K, T >();
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    T* x;
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    if (!CHECK(key))
-                        SWIG_exception(SWIG_TypeError,
-                                       "map<" #K "," #T "> expected");
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) != 0) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    (($1_type &)$1)[CONVERT_FROM(key)] = *x;
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp),
-                     const map<K,T>* (std::map<K,T> temp) {
-            if (scm_is_null($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-            } else if (scm_is_pair($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    T* x;
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    if (!CHECK(key))
-                        SWIG_exception(SWIG_TypeError,
-                                       "map<" #K "," #T "> expected");
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) != 0) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    temp[CONVERT_FROM(key)] = *x;
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            SCM alist = SCM_EOL;
-            for (std::map< K, T >::reverse_iterator i=$1.rbegin(); i!=$1.rend(); ++i) {
-                T* val = new T(i->second);
-                SCM k = CONVERT_TO(i->first);
-                SCM x = SWIG_NewPointerObj(val,$descriptor(T *), 1);
-                SCM entry = scm_cons(k,x);
-                alist = scm_cons(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            // native sequence?
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                // check the first element only
-                T* x;
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM key = SCM_CAR(head);
-                    SCM val = SCM_CDR(head);
-                    if (!CHECK(key)) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) == 0) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) == 0)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            // native sequence?
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                // check the first element only
-                T* x;
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM key = SCM_CAR(head);
-                    SCM val = SCM_CDR(head);
-                    if (!CHECK(key)) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) == 0) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) == 0)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        map();
-        map(const map< K, T > &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T& __getitem__(K key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(K key, const T& x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(K key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(K key) {
-                std::map< K, T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            SCM keys() {
-                SCM result = SCM_EOL;
-                for (std::map< K, T >::reverse_iterator i=self->rbegin(); i!=self->rend(); ++i) {
-                    SCM k = CONVERT_TO(i->first);
-                    result = scm_cons(k,result);
-                }
-                return result;
-            }
-        }
-    };
-    %enddef
-
-    %define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<class K> class map<K,T> {
-        %typemap(in) map<K,T> {
-            if (scm_is_null($input)) {
-                $1 = std::map< K, T >();
-            } else if (scm_is_pair($input)) {
-                $1 = std::map< K, T >();
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    K* k;
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (!CHECK(val)) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        if (!CHECK(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    (($1_type &)$1)[*k] = CONVERT_FROM(val);
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp),
-                     const map<K,T>* (std::map<K,T> temp) {
-            if (scm_is_null($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-            } else if (scm_is_pair($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    K* k;
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (!CHECK(val)) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        if (!CHECK(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    temp[*k] = CONVERT_FROM(val);
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            SCM alist = SCM_EOL;
-            for (std::map< K, T >::reverse_iterator i=$1.rbegin(); i!=$1.rend(); ++i) {
-                K* key = new K(i->first);
-                SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                SCM x = CONVERT_TO(i->second);
-                SCM entry = scm_cons(k,x);
-                alist = scm_cons(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            // native sequence?
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                // check the first element only
-                K* k;
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM val = SCM_CDR(head);
-                    if (SWIG_ConvertPtr(val,(void **) &k,
-                                    $descriptor(K *), 0) != 0) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK(val)) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (CHECK(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            // native sequence?
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                // check the first element only
-                K* k;
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM val = SCM_CDR(head);
-                    if (SWIG_ConvertPtr(val,(void **) &k,
-                                    $descriptor(K *), 0) != 0) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK(val)) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (CHECK(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        map();
-        map(const map< K, T > &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T __getitem__(const K& key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(const K& key, T x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(const K& key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map< K, T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            SCM keys() {
-                SCM result = SCM_EOL;
-                for (std::map< K, T >::reverse_iterator i=self->rbegin(); i!=self->rend(); ++i) {
-                    K* key = new K(i->first);
-                    SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                    result = scm_cons(k,result);
-                }
-                return result;
-            }
-        }
-    };
-    %enddef
-
-    %define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO,
-                                       T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-    template<> class map<K,T> {
-        %typemap(in) map<K,T> {
-            if (scm_is_null($input)) {
-                $1 = std::map< K, T >();
-            } else if (scm_is_pair($input)) {
-                $1 = std::map< K, T >();
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    if (!CHECK_K(key))
-                        SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    if (!CHECK_T(val)) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        if (!CHECK_T(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    (($1_type &)$1)[CONVERT_K_FROM(key)] = 
-                                               CONVERT_T_FROM(val);
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp),
-                     const map<K,T>* (std::map<K,T> temp) {
-            if (scm_is_null($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-            } else if (scm_is_pair($input)) {
-                temp = std::map< K, T >();
-                $1 = &temp;
-                SCM alist = $input;
-                while (!scm_is_null(alist)) {
-                    SCM entry, key, val;
-                    entry = SCM_CAR(alist);
-                    if (!scm_is_pair(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = SCM_CAR(entry);
-                    val = SCM_CDR(entry);
-                    if (!CHECK_K(key))
-                        SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    if (!CHECK_T(val)) {
-                        if (!scm_is_pair(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = SCM_CAR(val);
-                        if (!CHECK_T(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    temp[CONVERT_K_FROM(key)] = CONVERT_T_FROM(val);
-                    alist = SCM_CDR(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            SCM alist = SCM_EOL;
-            for (std::map< K, T >::reverse_iterator i=$1.rbegin(); i!=$1.rend(); ++i) {
-                SCM k = CONVERT_K_TO(i->first);
-                SCM x = CONVERT_T_TO(i->second);
-                SCM entry = scm_cons(k,x);
-                alist = scm_cons(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            // native sequence?
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                // check the first element only
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM key = SCM_CAR(head);
-                    SCM val = SCM_CDR(head);
-                    if (!CHECK_K(key)) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK_T(val)) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (CHECK_T(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            // native sequence?
-            if (scm_is_null($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                // check the first element only
-                SCM head = SCM_CAR($input);
-                if (scm_is_pair(head)) {
-                    SCM key = SCM_CAR(head);
-                    SCM val = SCM_CDR(head);
-                    if (!CHECK_K(key)) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK_T(val)) {
-                            $1 = 1;
-                        } else if (scm_is_pair(val)) {
-                            val = SCM_CAR(val);
-                            if (CHECK_T(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map< K, T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        map();
-        map(const map< K, T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T __getitem__(K key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(K key, T x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(K key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(K key) {
-                std::map< K, T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            SCM keys() {
-                SCM result = SCM_EOL;
-                for (std::map< K, T >::reverse_iterator i=self->rbegin(); i!=self->rend(); ++i) {
-                    SCM k = CONVERT_K_TO(i->first);
-                    result = scm_cons(k,result);
-                }
-                return result;
-            }
-        }
-    };
-    %enddef
-
-
-    specialize_std_map_on_key(bool,scm_is_bool,
-                              scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_key(int,scm_is_number,
-                              scm_to_long,scm_from_long);
-    specialize_std_map_on_key(short,scm_is_number,
-                              scm_to_long,scm_from_long);
-    specialize_std_map_on_key(long,scm_is_number,
-                              scm_to_long,scm_from_long);
-    specialize_std_map_on_key(unsigned int,scm_is_number,
-                              scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_key(unsigned short,scm_is_number,
-                              scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_key(unsigned long,scm_is_number,
-                              scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_key(double,scm_is_number,
-                              scm_to_double,scm_from_double);
-    specialize_std_map_on_key(float,scm_is_number,
-                              scm_to_double,scm_from_double);
-    specialize_std_map_on_key(std::string,scm_is_string,
-                              SWIG_scm2string,SWIG_string2scm);
-
-    specialize_std_map_on_value(bool,scm_is_bool,
-                                scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_value(int,scm_is_number,
-                                scm_to_long,scm_from_long);
-    specialize_std_map_on_value(short,scm_is_number,
-                                scm_to_long,scm_from_long);
-    specialize_std_map_on_value(long,scm_is_number,
-                                scm_to_long,scm_from_long);
-    specialize_std_map_on_value(unsigned int,scm_is_number,
-                                scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_value(unsigned short,scm_is_number,
-                                scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_value(unsigned long,scm_is_number,
-                                scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_value(double,scm_is_number,
-                                scm_to_double,scm_from_double);
-    specialize_std_map_on_value(float,scm_is_number,
-                                scm_to_double,scm_from_double);
-    specialize_std_map_on_value(std::string,scm_is_string,
-                                SWIG_scm2string,SWIG_string2scm);
-
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_map_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-}
diff --git a/dependencies2013/win32/swig/Lib/guile/std_pair.i b/dependencies2013/win32/swig/Lib/guile/std_pair.i
deleted file mode 100644
index 92dec5fa..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_pair.i
+++ /dev/null
@@ -1,863 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-//
-// See std_vector.i for the rationale of typemap application
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class T, class U> struct pair {
-        %typemap(in) pair<T,U> %{
-            if (scm_is_pair($input)) {
-                T* x;
-                U* y;
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                $1 = std::make_pair(*x,*y);
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        %}
-        %typemap(in) const pair<T,U>& (std::pair<T,U> *temp = 0),
-                     const pair<T,U>* (std::pair<T,U> *temp = 0) %{
-            if (scm_is_pair($input)) {
-                T* x;
-                U* y;
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                temp = new std::pair< T, U >(*x,*y);
-                $1 = temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        %}
-        %typemap(freearg) const pair<T,U>&, const pair<T,U>* %{ delete temp$argnum; %}
-        %typemap(out) pair<T,U> {
-            T* x = new T($1.first);
-            U* y = new U($1.second);
-            SCM first = SWIG_NewPointerObj(x,$descriptor(T *), 1);
-            SCM second = SWIG_NewPointerObj(y,$descriptor(U *), 1);
-            $result = scm_cons(first,second);
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                T* x;
-                U* y;
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) == 0 &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) == 0) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                T* x;
-                U* y;
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) == 0 &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) == 0) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_pair_on_first(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<class U> struct pair<T,U> {
-        %typemap(in) pair<T,U> %{
-            if (scm_is_pair($input)) {
-                U* y;
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                if (!CHECK(first))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                $1 = std::make_pair(CONVERT_FROM(first),*y);
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        %}
-        %typemap(in) const pair<T,U>& (std::pair<T,U> *temp = 0),
-                     const pair<T,U>* (std::pair<T,U> *temp = 0) %{
-            if (scm_is_pair($input)) {
-                U* y;
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                if (!CHECK(first))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                temp = new std::pair< T, U >(CONVERT_FROM(first),*y);
-                $1 = temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        %}
-        %typemap(freearg) const pair<T,U>&, const pair<T,U>* %{ delete temp$argnum; %}
-        %typemap(out) pair<T,U> {
-            U* y = new U($1.second);
-            SCM second = SWIG_NewPointerObj(y,$descriptor(U *), 1);
-            $result = scm_cons(CONVERT_TO($1.first),second);
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                U* y;
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (CHECK(first) &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) == 0) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                U* y;
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (CHECK(first) &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) == 0) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-    %enddef
-
-    %define specialize_std_pair_on_second(U,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<class T> struct pair<T,U> {
-        %typemap(in) pair<T,U> %{
-            if (scm_is_pair($input)) {
-                T* x;
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                if (!CHECK(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                $1 = std::make_pair(*x,CONVERT_FROM(second));
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        %}
-        %typemap(in) const pair<T,U>& (std::pair<T,U> *temp = 0),
-                     const pair<T,U>* (std::pair<T,U> *temp = 0) %{
-            if (scm_is_pair($input)) {
-                T* x;
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                if (!CHECK(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                temp = new std::pair< T, U >(*x,CONVERT_FROM(second));
-                $1 = temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        %}
-        %typemap(freearg) const pair<T,U>&, const pair<T,U>* %{ delete temp$argnum; %}
-        %typemap(out) pair<T,U> {
-            T* x = new T($1.first);
-            SCM first = SWIG_NewPointerObj(x,$descriptor(T *), 1);
-            $result = scm_cons(first,CONVERT_TO($1.second));
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                T* x;
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) == 0 &&
-                    CHECK(second)) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                T* x;
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) == 0 &&
-                    CHECK(second)) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-    %enddef
-
-    %define specialize_std_pair_on_both(T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO,
-                                        U,CHECK_U,CONVERT_U_FROM,CONVERT_U_TO)
-    template<> struct pair<T,U> {
-        %typemap(in) pair<T,U> %{
-            if (scm_is_pair($input)) {
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                if (!CHECK_T(first) || !CHECK_U(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                $1 = std::make_pair(CONVERT_T_FROM(first),
-                                    CONVERT_U_FROM(second));
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        %}
-        %typemap(in) const pair<T,U>& (std::pair<T,U> *temp = 0),
-                     const pair<T,U>* (std::pair<T,U> *temp = 0) %{
-            if (scm_is_pair($input)) {
-                SCM first, second;
-                first = SCM_CAR($input);
-                second = SCM_CDR($input);
-                if (!CHECK_T(first) || !CHECK_U(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                temp = new std::pair< T, U >(CONVERT_T_FROM(first), CONVERT_U_FROM(second));
-                $1 = temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        %}
-        %typemap(freearg) const pair<T,U>&, const pair<T,U>* %{ delete temp$argnum; %}
-        %typemap(out) pair<T,U> {
-            $result = scm_cons(CONVERT_T_TO($1.first),
-                              CONVERT_U_TO($1.second));
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (CHECK_T(first) && CHECK_U(second)) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $&1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (scm_is_pair($input)) {
-                SCM first = SCM_CAR($input);
-                SCM second = SCM_CDR($input);
-                if (CHECK_T(first) && CHECK_U(second)) {
-                    $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair< T, U >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                    $1_descriptor, 0) == 0)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-    %enddef
-
-
-    specialize_std_pair_on_first(bool,scm_is_bool,
-                              scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_first(int,scm_is_number,
-                              scm_to_long,scm_from_long);
-    specialize_std_pair_on_first(short,scm_is_number,
-                              scm_to_long,scm_from_long);
-    specialize_std_pair_on_first(long,scm_is_number,
-                              scm_to_long,scm_from_long);
-    specialize_std_pair_on_first(unsigned int,scm_is_number,
-                              scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_first(unsigned short,scm_is_number,
-                              scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_first(unsigned long,scm_is_number,
-                              scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_first(double,scm_is_number,
-                              scm_to_double,scm_from_double);
-    specialize_std_pair_on_first(float,scm_is_number,
-                              scm_to_double,scm_from_double);
-    specialize_std_pair_on_first(std::string,scm_is_string,
-                              SWIG_scm2string,SWIG_string2scm);
-
-    specialize_std_pair_on_second(bool,scm_is_bool,
-                                scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_second(int,scm_is_number,
-                                scm_to_long,scm_from_long);
-    specialize_std_pair_on_second(short,scm_is_number,
-                                scm_to_long,scm_from_long);
-    specialize_std_pair_on_second(long,scm_is_number,
-                                scm_to_long,scm_from_long);
-    specialize_std_pair_on_second(unsigned int,scm_is_number,
-                                scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_second(unsigned short,scm_is_number,
-                                scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_second(unsigned long,scm_is_number,
-                                scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_second(double,scm_is_number,
-                                scm_to_double,scm_from_double);
-    specialize_std_pair_on_second(float,scm_is_number,
-                                scm_to_double,scm_from_double);
-    specialize_std_pair_on_second(std::string,scm_is_string,
-                                SWIG_scm2string,SWIG_string2scm);
-
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(int,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(short,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(long,scm_is_number,
-                               scm_to_long,scm_from_long,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(double,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(float,scm_is_number,
-                               scm_to_double,scm_from_double,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               bool,scm_is_bool,
-                               scm_is_true,SWIG_bool2scm);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               int,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               short,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               long,scm_is_number,
-                               scm_to_long,scm_from_long);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               unsigned int,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               unsigned short,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               unsigned long,scm_is_number,
-                               scm_to_ulong,scm_from_ulong);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               double,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               float,scm_is_number,
-                               scm_to_double,scm_from_double);
-    specialize_std_pair_on_both(std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm,
-                               std::string,scm_is_string,
-                               SWIG_scm2string,SWIG_string2scm);
-}
diff --git a/dependencies2013/win32/swig/Lib/guile/std_string.i b/dependencies2013/win32/swig/Lib/guile/std_string.i
deleted file mode 100644
index 6513173e..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_string.i
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string
- * ----------------------------------------------------------------------------- */
-
-// ------------------------------------------------------------------------
-// std::string is typemapped by value
-// This can prevent exporting methods which return a string
-// in order for the user to modify it.
-// However, I think I'll wait until someone asks for it...
-// ------------------------------------------------------------------------
-
-%include <exception.i>
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-    %naturalvar string;
-
-    class string;
-
-    %typemap(typecheck) string = char *;
-    %typemap(typecheck) const string & = char *;
-
-    %typemap(in) string (char * tempptr) {
-        if (scm_is_string($input)) {
-            tempptr = SWIG_scm2str($input);
-            $1.assign(tempptr);
-            if (tempptr) SWIG_free(tempptr);
-        } else {
-            SWIG_exception(SWIG_TypeError, "string expected");
-        }
-    }
-
-    %typemap(in) const string & ($*1_ltype temp, char *tempptr) {
-        if (scm_is_string($input)) {
-            tempptr = SWIG_scm2str($input);
-            temp.assign(tempptr);
-            if (tempptr) SWIG_free(tempptr);
-            $1 = &temp;
-        } else {
-            SWIG_exception(SWIG_TypeError, "string expected");
-        }
-    }
-
-    %typemap(in) string * (char *tempptr) {
-        if (scm_is_string($input)) {
-            tempptr = SWIG_scm2str($input);
-            $1 = new $*1_ltype(tempptr);
-            if (tempptr) SWIG_free(tempptr);
-        } else {
-            SWIG_exception(SWIG_TypeError, "string expected");
-        }
-    }
-
-    %typemap(out) string {
-        $result = SWIG_str02scm($1.c_str());
-    }
-
-    %typemap(out) const string & {
-        $result = SWIG_str02scm($1->c_str());
-    }
-
-    %typemap(out) string * {
-        $result = SWIG_str02scm($1->c_str());
-    }
-
-    %typemap(varin) string {
-        if (scm_is_string($input)) {
-	    char *tempptr = SWIG_scm2str($input);
-            $1.assign(tempptr);
-            if (tempptr) SWIG_free(tempptr);
-        } else {
-            SWIG_exception(SWIG_TypeError, "string expected");
-        }
-    }
-
-    %typemap(varout) string {
-        $result = SWIG_str02scm($1.c_str());
-    }
-
-}
diff --git a/dependencies2013/win32/swig/Lib/guile/std_vector.i b/dependencies2013/win32/swig/Lib/guile/std_vector.i
deleted file mode 100644
index d7a7140c..00000000
--- a/dependencies2013/win32/swig/Lib/guile/std_vector.i
+++ /dev/null
@@ -1,406 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * SWIG typemaps for std::vector
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// Guile as much as possible, namely, to allow the user to pass and 
-// be returned Guile vectors or lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector<T>), f(const std::vector<T>&), f(const std::vector<T>*):
-//      the parameter being read-only, either a Guile sequence or a
-//      previously wrapped std::vector<T> can be passed.
-//   -- f(std::vector<T>&), f(std::vector<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector<T> f():
-//      the vector is returned by copy; therefore, a Guile vector of T:s 
-//      is returned which is most easily used in other Guile functions
-//   -- std::vector<T>& f(), std::vector<T>* f(), const std::vector<T>& f(),
-//      const std::vector<T>* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <vector>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-    
-    template<class T> class vector {
-        %typemap(in) vector<T> {
-            if (scm_is_vector($input)) {
-                unsigned long size = scm_c_vector_length($input);
-                $1 = std::vector< T >(size);
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = scm_vector_ref($input,scm_from_ulong(i));
-                    (($1_type &)$1)[i] =
-                        *((T*) SWIG_MustGetPtr(o,$descriptor(T *),$argnum, 0));
-                }
-            } else if (scm_is_null($input)) {
-                $1 = std::vector< T >();
-            } else if (scm_is_pair($input)) {
-                SCM head, tail;
-                $1 = std::vector< T >();
-                tail = $input;
-                while (!scm_is_null(tail)) {
-                    head = SCM_CAR(tail);
-                    tail = SCM_CDR(tail);
-                    $1.push_back(*((T*)SWIG_MustGetPtr(head,
-                                                       $descriptor(T *),
-                                                       $argnum, 0)));
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp),
-                     const vector<T>* (std::vector<T> temp) {
-            if (scm_is_vector($input)) {
-                unsigned long size = scm_c_vector_length($input);
-                temp = std::vector< T >(size);
-                $1 = &temp;
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = scm_vector_ref($input,scm_from_ulong(i));
-                    temp[i] = *((T*) SWIG_MustGetPtr(o,
-                                                     $descriptor(T *),
-                                                     $argnum, 0));
-                }
-            } else if (scm_is_null($input)) {
-                temp = std::vector< T >();
-                $1 = &temp;
-            } else if (scm_is_pair($input)) {
-                temp = std::vector< T >();
-                $1 = &temp;
-                SCM head, tail;
-                tail = $input;
-                while (!scm_is_null(tail)) {
-                    head = SCM_CAR(tail);
-                    tail = SCM_CDR(tail);
-                    temp.push_back(*((T*) SWIG_MustGetPtr(head,
-                                                          $descriptor(T *),
-                                                          $argnum, 0)));
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) vector<T> {
-            $result = scm_make_vector(scm_from_long($1.size()),SCM_UNSPECIFIED);
-            for (unsigned int i=0; i<$1.size(); i++) {
-                T* x = new T((($1_type &)$1)[i]);
-                scm_vector_set_x($result,scm_from_long(i),
-                                SWIG_NewPointerObj(x, $descriptor(T *), 1));
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            /* native sequence? */
-            if (scm_is_vector($input)) {
-                unsigned int size = scm_c_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    SCM o = scm_vector_ref($input,scm_from_ulong(0));
-                    T* x;
-                    if (SWIG_ConvertPtr(o,(void**) &x,
-                                          $descriptor(T *), 0) != -1)
-                        $1 = 1;
-                    else
-                        $1 = 0;
-                }
-            } else if (scm_is_null($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                /* check the first element only */
-                T* x;
-                SCM head = SCM_CAR($input);
-                if (SWIG_ConvertPtr(head,(void**) &x,
-                                      $descriptor(T *), 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            } else {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                      $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            /* native sequence? */
-            if (scm_is_vector($input)) {
-                unsigned int size = scm_c_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    SCM o = scm_vector_ref($input,scm_from_ulong(0));
-                    if (SWIG_ConvertPtr(o,(void**) &x,
-                                          $descriptor(T *), 0) != -1)
-                        $1 = 1;
-                    else
-                        $1 = 0;
-                }
-            } else if (scm_is_null($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                /* check the first element only */
-                T* x;
-                SCM head = SCM_CAR($input);
-                if (SWIG_ConvertPtr(head,(void**) &x,
-                                      $descriptor(T *), 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            } else {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                      $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T>&);
-        %rename(length) size;
-        unsigned int size() const;
-        %rename("empty?") empty;
-        bool empty() const;
-        %rename("clear!") clear;
-        void clear();
-        %rename("set!") set;
-        %rename("pop!") pop;
-        %rename("push!") push_back;
-        void push_back(const T& x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            const T& ref(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const T& x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-    %define specialize_stl_vector(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<> class vector<T> {
-        %typemap(in) vector<T> {
-            if (scm_is_vector($input)) {
-                unsigned long size = scm_c_vector_length($input);
-                $1 = std::vector< T >(size);
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = scm_vector_ref($input,scm_from_ulong(i));
-                    if (CHECK(o))
-                        (($1_type &)$1)[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else if (scm_is_null($input)) {
-                $1 = std::vector<T >();
-            } else if (scm_is_pair($input)) {
-                SCM v = scm_vector($input);
-                unsigned long size = scm_c_vector_length(v);
-                $1 = std::vector< T >(size);
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = scm_vector_ref(v,scm_from_ulong(i));
-                    if (CHECK(o))
-                        (($1_type &)$1)[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp),
-                     const vector<T>* (std::vector<T> temp) {
-            if (scm_is_vector($input)) {
-                unsigned long size = scm_c_vector_length($input);
-                temp = std::vector< T >(size);
-                $1 = &temp;
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = scm_vector_ref($input,scm_from_ulong(i));
-                    if (CHECK(o))
-                        temp[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else if (scm_is_null($input)) {
-                temp = std::vector< T >();
-                $1 = &temp;
-            } else if (scm_is_pair($input)) {
-                SCM v = scm_vector($input);
-                unsigned long size = scm_c_vector_length(v);
-                temp = std::vector< T >(size);
-                $1 = &temp;
-                for (unsigned long i=0; i<size; i++) {
-                    SCM o = scm_vector_ref(v,scm_from_ulong(i));
-                    if (CHECK(o))
-                        temp[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scm_wrong_type_arg(FUNC_NAME, $argnum, $input);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) vector<T> {
-            $result = scm_make_vector(scm_from_long($1.size()),SCM_UNSPECIFIED);
-            for (unsigned int i=0; i<$1.size(); i++) {
-                SCM x = CONVERT_TO((($1_type &)$1)[i]);
-                scm_vector_set_x($result,scm_from_long(i),x);
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            /* native sequence? */
-            if (scm_is_vector($input)) {
-                unsigned int size = scm_c_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    SCM o = scm_vector_ref($input,scm_from_ulong(0));
-                    $1 = CHECK(o) ? 1 : 0;
-                }
-            } else if (scm_is_null($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                /* check the first element only */
-                SCM head = SCM_CAR($input);
-                $1 = CHECK(head) ? 1 : 0;
-            } else {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                $1 = (SWIG_ConvertPtr($input,(void **) &v, 
-                                        $&1_descriptor, 0) != -1) ? 1 : 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            /* native sequence? */
-            if (scm_is_vector($input)) {
-                unsigned int size = scm_c_vector_length($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    SCM o = scm_vector_ref($input,scm_from_ulong(0));
-                    $1 = CHECK(o) ? 1 : 0;
-                }
-            } else if (scm_is_null($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (scm_is_pair($input)) {
-                /* check the first element only */
-                SCM head = SCM_CAR($input);
-                $1 = CHECK(head) ? 1 : 0;
-            } else {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                $1 = (SWIG_ConvertPtr($input,(void **) &v, 
-                                        $1_descriptor, 0) != -1) ? 1 : 0;
-            }
-        }
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T>&);
-        %rename(length) size;
-        unsigned int size() const;
-        %rename("empty?") empty;
-        bool empty() const;
-        %rename("clear!") clear;
-        void clear();
-        %rename("set!") set;
-        %rename("pop!") pop;
-        %rename("push!") push_back;
-        void push_back(T x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T ref(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, T x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-    %enddef
-
-    specialize_stl_vector(bool,scm_is_bool,scm_is_true,SWIG_bool2scm);
-    specialize_stl_vector(char,scm_is_number,scm_to_long,scm_from_long);
-    specialize_stl_vector(int,scm_is_number,scm_to_long,scm_from_long);
-    specialize_stl_vector(long,scm_is_number,scm_to_long,scm_from_long);
-    specialize_stl_vector(short,scm_is_number,scm_to_long,scm_from_long);
-    specialize_stl_vector(unsigned char,scm_is_number,scm_to_ulong,scm_from_ulong);
-    specialize_stl_vector(unsigned int,scm_is_number,scm_to_ulong,scm_from_ulong);
-    specialize_stl_vector(unsigned long,scm_is_number,scm_to_ulong,scm_from_ulong);
-    specialize_stl_vector(unsigned short,scm_is_number,scm_to_ulong,scm_from_ulong);
-    specialize_stl_vector(float,scm_is_number,scm_to_double,scm_from_double);
-    specialize_stl_vector(double,scm_is_number,scm_to_double,scm_from_double);
-    specialize_stl_vector(std::string,scm_is_string,SWIG_scm2string,SWIG_string2scm);
-}
-
diff --git a/dependencies2013/win32/swig/Lib/guile/stl.i b/dependencies2013/win32/swig/Lib/guile/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/guile/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/guile/swigrun.i b/dependencies2013/win32/swig/Lib/guile/swigrun.i
deleted file mode 100644
index 4b9ea2c7..00000000
--- a/dependencies2013/win32/swig/Lib/guile/swigrun.i
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- mode: c -*- */
-
-%module swigrun
-
-#ifdef SWIGGUILE_SCM
-
-/* Hook the runtime module initialization
-   into the shared initialization function SWIG_Guile_Init. */
-%runtime %{
-/* Hook the runtime module initialization
-   into the shared initialization function SWIG_Guile_Init. */
-#include <libguile.h>
-#ifdef __cplusplus
-extern "C"
-#endif
-SCM scm_init_Swig_swigrun_module (void);
-#define SWIG_INIT_RUNTIME_MODULE scm_init_Swig_swigrun_module();
-%}
-
-/* The runtime type system from common.swg */
-
-typedef struct swig_type_info swig_type_info;
-
-const char *
-SWIG_TypeName(const swig_type_info *type);
-
-const char *
-SWIG_TypePrettyName(const swig_type_info *type);
-
-swig_type_info *
-SWIG_TypeQuery(const char *);
-
-/* Language-specific stuff */
-
-%apply bool { int };
-
-int
-SWIG_IsPointer(SCM object);
-
-int
-SWIG_IsPointerOfType(SCM object, swig_type_info *type);
-
-unsigned long
-SWIG_PointerAddress(SCM object);
-
-swig_type_info *
-SWIG_PointerType(SCM object);
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/guile/typemaps.i b/dependencies2013/win32/swig/Lib/guile/typemaps.i
deleted file mode 100644
index a01e73f6..00000000
--- a/dependencies2013/win32/swig/Lib/guile/typemaps.i
+++ /dev/null
@@ -1,472 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Guile-specific typemaps
- * ----------------------------------------------------------------------------- */
-
-/* Pointers */
-
-%typemap(in) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, $argnum, 0);
-}
-%typemap(freearg) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] "";
-
-%typemap(in) void * {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, NULL, $argnum, 0);
-}
-%typemap(freearg) void * "";
-
-%typemap(varin) SWIGTYPE * {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0);
-}
-
-%typemap(varin) SWIGTYPE & {
-  $1 = *(($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0));
-}
-
-%typemap(varin) SWIGTYPE && {
-  $1 = *(($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0));
-}
-
-%typemap(varin) SWIGTYPE [] {
-  scm_wrong_type_arg((char *) FUNC_NAME, 1, $input);
-}
-
-%typemap(varin) SWIGTYPE [ANY] {
-  void *temp;
-  int ii;
-  $1_basetype *b = 0;
-  temp = SWIG_MustGetPtr($input, $1_descriptor, 1, 0);
-  b = ($1_basetype *) $1;
-  for (ii = 0; ii < $1_size; ii++) b[ii] = *(($1_basetype *) temp + ii);
-}
-
-%typemap(varin) void * {
-  $1 = SWIG_MustGetPtr($input, NULL, 1, 0);
-}
-
-%typemap(out) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  $result = SWIG_NewPointerObj ($1, $descriptor, $owner);
-}
-
-%typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC {
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor,(void **) &$1);
-  $result = SWIG_NewPointerObj ($1, ty, $owner);
-}
-    
-%typemap(varout) SWIGTYPE *, SWIGTYPE [] {
-  $result = SWIG_NewPointerObj ($1, $descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE & {
-  $result = SWIG_NewPointerObj((void *) &$1, $1_descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE && {
-  $result = SWIG_NewPointerObj((void *) &$1, $1_descriptor, 0);
-}
-
-%typemap(throws) SWIGTYPE {
-  $&ltype temp = new $ltype($1);
-  scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	    scm_listify(SWIG_NewPointerObj(temp, $&descriptor, 1),
-		    SCM_UNDEFINED));
-}
-
-%typemap(throws) SWIGTYPE & {
-  scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	    scm_listify(SWIG_NewPointerObj(&$1, $descriptor, 1),
-		    SCM_UNDEFINED));
-}
-
-%typemap(throws) SWIGTYPE && {
-  scm_throw(gh_symbol2scm((char *) "swig-exception"),
-	    gh_list(SWIG_NewPointerObj(&$1, $descriptor, 1),
-		    SCM_UNDEFINED));
-}
-
-%typemap(throws) SWIGTYPE * {
-  scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	    scm_listify(SWIG_NewPointerObj($1, $descriptor, 1),
-		    SCM_UNDEFINED));
-}
-
-%typemap(throws) SWIGTYPE [] {
-  scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	    scm_listify(SWIG_NewPointerObj($1, $descriptor, 1),
-		    SCM_UNDEFINED));
-}
-
-/* Change of object ownership, and interaction of destructor-like functions and the
-   garbage-collector */
-
-%typemap(in, doc="$NAME is of type <$type> and gets destroyed by the function") SWIGTYPE *DESTROYED {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, $argnum, 0);
-}
-
-%typemap(freearg) SWIGTYPE *DESTROYED {
-  SWIG_Guile_MarkPointerDestroyed($input);
-}
-
-%typemap(in, doc="$NAME is of type <$type> and is consumed by the function") SWIGTYPE *CONSUMED {
-  $1 = ($1_ltype)SWIG_MustGetPtr($input, $descriptor, $argnum, 0);
-  SWIG_Guile_MarkPointerNoncollectable($input);
-}
-
-/* Pass-by-value */
-
-%typemap(in) SWIGTYPE($&1_ltype argp) {
-  argp = ($&1_ltype)SWIG_MustGetPtr($input, $&1_descriptor, $argnum, 0);
-  $1 = *argp;
-}
-
-%typemap(varin) SWIGTYPE {
-  $&1_ltype argp;
-  argp = ($&1_ltype)SWIG_MustGetPtr($input, $&1_descriptor, 1, 0);
-  $1 = *argp;
-}
-
-%typemap(out) SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  resultptr = new $1_ltype((const $1_ltype &) $1);
-  $result =  SWIG_NewPointerObj (resultptr, $&1_descriptor, 1);
-} 
-#else
-{
-  $&1_ltype resultptr;
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  $result = SWIG_NewPointerObj(resultptr, $&1_descriptor, 1);
-}
-#endif
-
-%typemap(varout) SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  resultptr = new $1_ltype((const $1_ltype&) $1);
-  $result =  SWIG_NewPointerObj (resultptr, $&1_descriptor, 0);
-} 
-#else
-{
-  $&1_ltype resultptr;
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  $result = SWIG_NewPointerObj(resultptr, $&1_descriptor, 0);
-}
-#endif
-
-/* Enums */
-
-%typemap(in)     enum SWIGTYPE  { $1 = ($1_type) scm_to_int($input); }
-/* The complicated construction below needed to deal with anonymous
-   enums, which cannot be cast to. */
-%typemap(varin)  enum SWIGTYPE  {
-  if (sizeof(int) != sizeof($1)) {
-    scm_error(scm_from_locale_symbol("swig-error"),
-	      (char *) FUNC_NAME,
-	      (char *) "enum variable '$name' cannot be set",
-	      SCM_EOL, SCM_BOOL_F); 
-  }
-  * (int *) &($1) = scm_to_int($input);
-}
-%typemap(out)    enum SWIGTYPE  { $result = scm_from_long((int)$1); }
-%typemap(varout) enum SWIGTYPE  { $result = scm_from_long((int)$1); }
-%typemap(throws) enum SWIGTYPE {
-  scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-     scm_listify(scm_from_long((int)$1), SCM_UNDEFINED));
-}
-
-/* The SIMPLE_MAP_WITH_EXPR macro below defines the whole set of
-   typemaps needed for simple types.
-   -- SCM_TO_C_EXPR is a C expression that translates the Scheme value
-      "swig_scm_value" to a C value.
-   -- C_TO_SCM_EXPR is a C expression that translates the C value
-      "swig_c_value" to a Scheme value. */
-
-%define SIMPLE_MAP_WITH_EXPR(C_NAME, SCM_TO_C_EXPR, C_TO_SCM_EXPR, SCM_NAME)
- %typemap (in,     doc="$NAME is of type <" #SCM_NAME ">") C_NAME
-     { SCM swig_scm_value = $input;
-       $1 = SCM_TO_C_EXPR; }
- %typemap (varin,  doc="NEW-VALUE is of type <" #SCM_NAME ">") C_NAME
-     { SCM swig_scm_value = $input;
-       $1 = SCM_TO_C_EXPR; }
- %typemap (out,    doc="<" #SCM_NAME ">") C_NAME
-     { C_NAME swig_c_value = $1;
-       $result = C_TO_SCM_EXPR; }
- %typemap (varout, doc="<" #SCM_NAME ">") C_NAME
-     { C_NAME swig_c_value = $1;
-       $result = C_TO_SCM_EXPR; }
- /* INPUT and OUTPUT */
- %typemap (in, doc="$NAME is of type <" #SCM_NAME ">)")
-     C_NAME *INPUT(C_NAME temp) {
-       SCM swig_scm_value = $input;
-       temp = (C_NAME) SCM_TO_C_EXPR; $1 = &temp; }
- %typemap (in,numinputs=0)      C_NAME *OUTPUT (C_NAME temp)
-     {$1 = &temp;}
- %typemap (argout,doc="$name (of type <" #SCM_NAME ">)") C_NAME *OUTPUT
-     { C_NAME swig_c_value = *$1;
-       SWIG_APPEND_VALUE(C_TO_SCM_EXPR); }
- %typemap (in)          C_NAME *BOTH = C_NAME *INPUT;
- %typemap (argout)      C_NAME *BOTH = C_NAME *OUTPUT;
- %typemap (in)          C_NAME *INOUT = C_NAME *INPUT;
- %typemap (argout)      C_NAME *INOUT = C_NAME *OUTPUT;
- /* Const primitive references.  Passed by value */
- %typemap(in, doc="$NAME is of type <" #SCM_NAME ">") const C_NAME & (C_NAME temp)
-     { SCM swig_scm_value = $input;
-       temp = SCM_TO_C_EXPR;
-       $1 = &temp; }
- %typemap(out, doc="<" #SCM_NAME ">")  const C_NAME &
-     { C_NAME swig_c_value = *$1;
-       $result = C_TO_SCM_EXPR; }
- /* Throw typemap */
- %typemap(throws) C_NAME {
-   C_NAME swig_c_value = $1;
-   scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	     scm_listify(C_TO_SCM_EXPR, SCM_UNDEFINED));
- }
-%enddef
-
-/* The SIMPLE_MAP macro below defines the whole set of typemaps needed
-   for simple types.  It generates slightly simpler code than the
-   macro above, but it is only suitable for very simple conversion
-   expressions. */
-
-%define SIMPLE_MAP(C_NAME, SCM_TO_C, C_TO_SCM, SCM_NAME)
- %typemap (in,     doc="$NAME is of type <" #SCM_NAME ">")
-     C_NAME {$1 = ($1_ltype) SCM_TO_C($input);}
- %typemap (varin,  doc="NEW-VALUE is of type <" #SCM_NAME ">")
-     C_NAME {$1 = ($1_ltype) SCM_TO_C($input);}
- %typemap (out,    doc="<" #SCM_NAME ">")
-     C_NAME {$result = C_TO_SCM($1);}
- %typemap (varout, doc="<" #SCM_NAME ">")
-     C_NAME {$result = C_TO_SCM($1);}
- /* INPUT and OUTPUT */
- %typemap (in, doc="$NAME is of type <" #SCM_NAME ">)")
-     C_NAME *INPUT(C_NAME temp), C_NAME &INPUT(C_NAME temp) {
-   temp = (C_NAME) SCM_TO_C($input); $1 = &temp;
- }
- %typemap (in,numinputs=0)      C_NAME *OUTPUT (C_NAME temp), C_NAME &OUTPUT(C_NAME temp)
-   {$1 = &temp;}
- %typemap (argout,doc="$name (of type <" #SCM_NAME ">)") C_NAME *OUTPUT, C_NAME &OUTPUT
-   {SWIG_APPEND_VALUE(C_TO_SCM(*$1));}
- %typemap (in)          C_NAME *BOTH = C_NAME *INPUT;
- %typemap (argout)      C_NAME *BOTH = C_NAME *OUTPUT;
- %typemap (in)          C_NAME *INOUT = C_NAME *INPUT;
- %typemap (argout)      C_NAME *INOUT = C_NAME *OUTPUT;
- %typemap (in)          C_NAME &INOUT = C_NAME &INPUT;
- %typemap (argout)      C_NAME &INOUT = C_NAME &OUTPUT;
- /* Const primitive references.  Passed by value */
- %typemap(in, doc="$NAME is of type <" #SCM_NAME ">") const C_NAME & (C_NAME temp) {
-   temp = SCM_TO_C($input);
-   $1 = ($1_ltype) &temp;
- }
- %typemap(out, doc="<" #SCM_NAME ">")  const C_NAME & {
-   $result = C_TO_SCM(*$1);
- }
- /* Throw typemap */
- %typemap(throws) C_NAME {
-   scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	     scm_listify(C_TO_SCM($1), SCM_UNDEFINED));
- }
-%enddef
-
- SIMPLE_MAP(bool, scm_is_true, scm_from_bool, boolean);
- SIMPLE_MAP(char, SCM_CHAR, SCM_MAKE_CHAR, char);
- SIMPLE_MAP(unsigned char, SCM_CHAR, SCM_MAKE_CHAR, char);
- SIMPLE_MAP(signed char, SCM_CHAR, SCM_MAKE_CHAR, char);
- SIMPLE_MAP(int, scm_to_int, scm_from_long, integer);
- SIMPLE_MAP(short, scm_to_short, scm_from_long, integer);
- SIMPLE_MAP(long, scm_to_long, scm_from_long, integer);
- SIMPLE_MAP(ptrdiff_t, scm_to_long, scm_from_long, integer);
- SIMPLE_MAP(unsigned int, scm_to_uint, scm_from_ulong, integer);
- SIMPLE_MAP(unsigned short, scm_to_ushort, scm_from_ulong, integer);
- SIMPLE_MAP(unsigned long, scm_to_ulong, scm_from_ulong, integer);
- SIMPLE_MAP(size_t, scm_to_ulong, scm_from_ulong, integer);
- SIMPLE_MAP(float, scm_to_double, scm_from_double, real);
- SIMPLE_MAP(double, scm_to_double, scm_from_double, real);
-// SIMPLE_MAP(char *, SWIG_scm2str, SWIG_str02scm, string);
-// SIMPLE_MAP(const char *, SWIG_scm2str, SWIG_str02scm, string);
-
-/* Define long long typemaps -- uses functions that are only defined
-   in recent versions of Guile, availability also depends on Guile's
-   configuration. */
-
-SIMPLE_MAP(long long, scm_to_long_long, scm_from_long_long, integer);
-SIMPLE_MAP(unsigned long long, scm_to_ulong_long, scm_from_ulong_long, integer);
-
-/* Strings */
-
- %typemap (in,     doc="$NAME is a string")      char *(int must_free = 0) {
-  $1 = ($1_ltype)SWIG_scm2str($input);
-  must_free = 1;
- }
- %typemap (varin,  doc="NEW-VALUE is a string")  char * {$1 = ($1_ltype)SWIG_scm2str($input);}
- %typemap (out,    doc="<string>")              char * {$result = SWIG_str02scm((const char *)$1);}
- %typemap (varout, doc="<string>")              char * {$result = SWIG_str02scm($1);}
- %typemap (in, doc="$NAME is a string")          char **INPUT(char * temp, int must_free = 0) {
-   temp = (char *) SWIG_scm2str($input); $1 = &temp;
-   must_free = 1;
- }
- %typemap (in,numinputs=0)  char **OUTPUT (char * temp)
-   {$1 = &temp;}
- %typemap (argout,doc="$NAME (a string)") char **OUTPUT
-   {SWIG_APPEND_VALUE(SWIG_str02scm(*$1));}
- %typemap (in)          char **BOTH = char **INPUT;
- %typemap (argout)      char **BOTH = char **OUTPUT;
- %typemap (in)          char **INOUT = char **INPUT;
- %typemap (argout)      char **INOUT = char **OUTPUT;
-
-/* SWIG_scm2str makes a malloc'ed copy of the string, so get rid of it after
-   the function call. */
-
-%typemap (freearg) char * "if (must_free$argnum && $1) SWIG_free($1);";
-%typemap (freearg) char **INPUT, char **BOTH "if (must_free$argnum && (*$1)) SWIG_free(*$1);"
-%typemap (freearg) char **OUTPUT "SWIG_free(*$1);"
-  
-/* But this shall not apply if we try to pass a single char by
-   reference. */
-
-%typemap (freearg) char *OUTPUT, char *BOTH "";
-
-/* If we set a string variable, delete the old result first, unless const. */
-
-%typemap (varin) char * {
-    if ($1) free($1);
-    $1 = ($1_ltype) SWIG_scm2str($input);
-}
-
-%typemap (varin) const char * {
-    $1 = ($1_ltype) SWIG_scm2str($input);
-}
-
-%typemap(throws) char * {
-  scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
-	    scm_listify(SWIG_str02scm($1), SCM_UNDEFINED));
-}
-
-/* Void */
-
-%typemap (out,doc="") void "gswig_result = SCM_UNSPECIFIED;";
-
-/* SCM is passed through */
-
-typedef unsigned long SCM;
-%typemap (in) SCM "$1=$input;";
-%typemap (out) SCM "$result=$1;";
-%typecheck(SWIG_TYPECHECK_POINTER) SCM "$1=1;";
-
-/* ------------------------------------------------------------
- * String & length
- * ------------------------------------------------------------ */
-
-%typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) {
-    size_t temp;
-    $1 = ($1_ltype) SWIG_Guile_scm2newstr($input, &temp);
-    $2 = ($2_ltype) temp;
-}
-
-/* ------------------------------------------------------------
- * CLASS::* (member function pointer) typemaps
- * taken from typemaps/swigtype.swg
- * ------------------------------------------------------------ */
-
-#define %set_output(obj)                  $result = obj
-#define %set_varoutput(obj)               $result = obj
-#define %argument_fail(code, type, name, argn)	scm_wrong_type_arg((char *) FUNC_NAME, argn, $input);
-#define %as_voidptr(ptr)		(void*)(ptr)
-
-%typemap(in) SWIGTYPE (CLASS::*) {  
-  int res = SWIG_ConvertMember($input, %as_voidptr(&$1), sizeof($type),$descriptor);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum); 
-  }
-}
-
-%typemap(out,noblock=1) SWIGTYPE (CLASS::*) {
-  %set_output(SWIG_NewMemberObj(%as_voidptr(&$1), sizeof($type), $descriptor));
-}
-
-%typemap(varin) SWIGTYPE (CLASS::*) {
-  int res = SWIG_ConvertMember($input,%as_voidptr(&$1), sizeof($type), $descriptor);
-  if (!SWIG_IsOK(res)) {
-    scm_wrong_type_arg((char *) FUNC_NAME, 1, $input);
-  }
-}
-
-%typemap(varout,noblock=1) SWIGTYPE (CLASS::*) {
-  %set_varoutput(SWIG_NewMemberObj(%as_voidptr(&$1), sizeof($type), $descriptor));
-}
-
-/* ------------------------------------------------------------
- * Typechecking rules
- * ------------------------------------------------------------ */
-
-/* adapted from python.swg */
-
-%typecheck(SWIG_TYPECHECK_INTEGER)
-	 int, short, long,
- 	 unsigned int, unsigned short, unsigned long,
-	 signed char, unsigned char,
-	 long long, unsigned long long,
-         size_t, ptrdiff_t,
-         std::size_t, std::ptrdiff_t,
-	 const int &, const short &, const long &,
- 	 const unsigned int &, const unsigned short &, const unsigned long &,
-	 const long long &, const unsigned long long &,
-         const size_t &, const ptrdiff_t &,
-         const std::size_t &, const std::ptrdiff_t &,
-	 enum SWIGTYPE
-{
-  $1 = scm_is_true(scm_integer_p($input)) && scm_is_true(scm_exact_p($input))? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_BOOL)
-	bool, bool&, const bool&
-{
-  $1 = SCM_BOOLP($input) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_DOUBLE)
-	float, double,
-	const float &, const double &
-{
-  $1 = scm_is_true(scm_real_p($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_CHAR) char {
-  $1 = SCM_CHARP($input) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_STRING) char * {
-  $1 = scm_is_string($input) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  void *ptr;
-  int res = SWIG_ConvertPtr($input, &ptr, $1_descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE {
-  void *ptr;
-  int res = SWIG_ConvertPtr($input, &ptr, $&descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void * {
-  void *ptr;
-  int res = SWIG_ConvertPtr($input, &ptr, 0, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* typemaps.i ends here */
diff --git a/dependencies2013/win32/swig/Lib/intrusive_ptr.i b/dependencies2013/win32/swig/Lib/intrusive_ptr.i
deleted file mode 100644
index ceaeaf0b..00000000
--- a/dependencies2013/win32/swig/Lib/intrusive_ptr.i
+++ /dev/null
@@ -1,82 +0,0 @@
-// Allow for different namespaces for shared_ptr / intrusive_ptr - they could be boost or std or std::tr1
-// For example for std::tr1, use:
-// #define SWIG_SHARED_PTR_NAMESPACE std
-// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1
-// #define SWIG_INTRUSIVE_PTR_NAMESPACE boost
-// #define SWIG_INTRUSIVE_PTR_SUBNAMESPACE 
-
-#if !defined(SWIG_INTRUSIVE_PTR_NAMESPACE)
-# define SWIG_INTRUSIVE_PTR_NAMESPACE boost
-#endif
-
-#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE)
-# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE::SWIG_INTRUSIVE_PTR_SUBNAMESPACE
-#else
-# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE
-#endif
-
-namespace SWIG_INTRUSIVE_PTR_NAMESPACE {
-#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE)
-  namespace SWIG_INTRUSIVE_PTR_SUBNAMESPACE {
-#endif
-    template <class T> class intrusive_ptr {
-    };
-#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE)
-  }
-#endif
-}
-
-%fragment("SWIG_intrusive_deleter", "header") {
-template<class T> struct SWIG_intrusive_deleter {
-    void operator()(T *p) {
-        if (p) 
-          intrusive_ptr_release(p);
-    }
-};
-}
-
-%fragment("SWIG_null_deleter", "header") {
-struct SWIG_null_deleter {
-  void operator() (void const *) const {
-  }
-};
-%#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter()
-%#define SWIG_NO_NULL_DELETER_1
-}
-
-// Workaround empty first macro argument bug
-#define SWIGEMPTYHACK
-// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types
-%define %intrusive_ptr(TYPE...)
-%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > }
-SWIG_INTRUSIVE_PTR_TYPEMAPS(SWIGEMPTYHACK, TYPE)
-SWIG_INTRUSIVE_PTR_TYPEMAPS(const, TYPE)
-%enddef
-
-%define %intrusive_ptr_no_wrap(TYPE...)
-%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > }
-SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(SWIGEMPTYHACK, TYPE)
-SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(const, TYPE)
-%enddef
-
-// Legacy macros
-%define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...)
-#warning "SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead."
-%intrusive_ptr(TYPE)
-%enddef
-
-%define SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...)
-#warning "SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead."
-%intrusive_ptr(TYPE)
-%enddef
-
-%define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...)
-#warning "SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead."
-%intrusive_ptr_no_wrap(TYPE)
-%enddef
-
-%define SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE...)
-#warning "SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead."
-%intrusive_ptr_no_wrap(TYPE)
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/inttypes.i b/dependencies2013/win32/swig/Lib/inttypes.i
deleted file mode 100644
index 85bd5ada..00000000
--- a/dependencies2013/win32/swig/Lib/inttypes.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -----------------------------------------------------------------------------
- * inttypes.i
- *
- * SWIG library file  for ISO C99 types: 7.8 Format conversion of integer types <inttypes.h>
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <inttypes.h>
-%}
-
-%include <stdint.i>
-%include <wchar.i>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef SWIGWORDSIZE64
-  
-  /* We have to define the `uintmax_t' type using `ldiv_t'.  */
-  typedef struct
-  {
-    long int quot;		/* Quotient.  */
-    long int rem;		/* Remainder.  */
-  } imaxdiv_t;
-  
-#else
-  
-  /* We have to define the `uintmax_t' type using `lldiv_t'.  */
-  typedef struct
-  {
-    long long int quot;		/* Quotient.  */
-    long long int rem;		/* Remainder.  */
-  } imaxdiv_t;
-
-#endif
-
-  /* Compute absolute value of N.  */
-  extern intmax_t imaxabs (intmax_t n);
-
-  /* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */
-  extern imaxdiv_t imaxdiv (intmax_t numer, intmax_t denom);
-  
-#ifdef SWIG_WCHAR
-  /* Like `wcstol' but convert to `intmax_t'.  */
-  extern intmax_t wcstoimax (const wchar_t *nptr, wchar_t **endptr, int base);
-  
-  /* Like `wcstoul' but convert to `uintmax_t'.  */
-  extern uintmax_t wcstoumax (const wchar_t *nptr, wchar_t ** endptr, int base);
-#endif
-
-#ifdef SWIGWORDSIZE64
-  
-  /* Like `strtol' but convert to `intmax_t'.  */
-  extern  intmax_t strtoimax (const char *nptr, char **endptr, int base);
-  
-  /* Like `strtoul' but convert to `uintmax_t'.  */
-  extern  uintmax_t strtoumax (const char *nptr, char **endptr,int base);
-  
-#ifdef SWIG_WCHAR
-  /* Like `wcstol' but convert to `intmax_t'.  */
-  extern  intmax_t wcstoimax (const wchar_t *nptr, wchar_t **endptr, int base);
-  
-  /* Like `wcstoul' but convert to `uintmax_t'.  */
-  extern  uintmax_t wcstoumax (const wchar_t *nptr, wchar_t **endptr, int base);
-#endif
-  
-#else /* SWIGWORDSIZE32 */
-  
-  /* Like `strtol' but convert to `intmax_t'.  */
-  extern  intmax_t strtoimax (const char *nptr, char **endptr, int base);
-  
-  /* Like `strtoul' but convert to `uintmax_t'.  */
-  extern  uintmax_t strtoumax (const char *nptr, char **endptr, int base);
-  
-#ifdef SWIG_WCHAR
-  /* Like `wcstol' but convert to `intmax_t'.  */
-  extern  uintmax_t wcstoumax (const wchar_t *nptr, wchar_t **endptr, int base);
-#endif
-
-#endif /* SWIGWORDSIZE64 */
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/java/arrays_java.i b/dependencies2013/win32/swig/Lib/java/arrays_java.i
deleted file mode 100644
index dd38438a..00000000
--- a/dependencies2013/win32/swig/Lib/java/arrays_java.i
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -----------------------------------------------------------------------------
- * arrays_java.i
- *
- * These typemaps give more natural support for arrays. The typemaps are not efficient
- * as there is a lot of copying of the array values whenever the array is passed to C/C++ 
- * from Java and vice versa. The Java array is expected to be the same size as the C array.
- * An exception is thrown if they are not.
- *
- * Example usage:
- * Wrapping:
- *
- *   %include <arrays_java.i>
- *   %inline %{
- *       short FiddleSticks[3];
- *   %}
- *
- * Use from Java like this:
- *
- *   short[] fs = new short[] {10, 11, 12};
- *   example.setFiddleSticks(fs);
- *   fs = example.getFiddleSticks();
- * ----------------------------------------------------------------------------- */
-
-/* Primitive array support is a combination of SWIG macros and functions in order to reduce 
- * code bloat and aid maintainability. The SWIG preprocessor expands the macros into functions 
- * for inclusion in the generated code. */
-
-/* Array support functions declarations macro */
-%define JAVA_ARRAYS_DECL(CTYPE, JNITYPE, JAVATYPE, JFUNCNAME)
-%{
-static int SWIG_JavaArrayIn##JFUNCNAME (JNIEnv *jenv, JNITYPE **jarr, CTYPE **carr, JNITYPE##Array input);
-static void SWIG_JavaArrayArgout##JFUNCNAME (JNIEnv *jenv, JNITYPE *jarr, CTYPE *carr, JNITYPE##Array input);
-static JNITYPE##Array SWIG_JavaArrayOut##JFUNCNAME (JNIEnv *jenv, CTYPE *result, jsize sz);
-%}
-%enddef
-
-/* Array support functions macro */
-%define JAVA_ARRAYS_IMPL(CTYPE, JNITYPE, JAVATYPE, JFUNCNAME)
-%{
-/* CTYPE[] support */
-static int SWIG_JavaArrayIn##JFUNCNAME (JNIEnv *jenv, JNITYPE **jarr, CTYPE **carr, JNITYPE##Array input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = JCALL1(GetArrayLength, jenv, input);
-  *jarr = JCALL2(Get##JAVATYPE##ArrayElements, jenv, input, 0);
-  if (!*jarr)
-    return 0; %}
-#ifdef __cplusplus
-%{  *carr = new CTYPE[sz]; %}
-#else
-%{  *carr = (CTYPE*) malloc(sz * sizeof(CTYPE)); %}
-#endif
-%{  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    JAVA_TYPEMAP_ARRAY_ELEMENT_ASSIGN(CTYPE)
-  return 1;
-}
-
-static void SWIG_JavaArrayArgout##JFUNCNAME (JNIEnv *jenv, JNITYPE *jarr, CTYPE *carr, JNITYPE##Array input) {
-  int i;
-  jsize sz = JCALL1(GetArrayLength, jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (JNITYPE)carr[i];
-  JCALL3(Release##JAVATYPE##ArrayElements, jenv, input, jarr, 0);
-}
-
-static JNITYPE##Array SWIG_JavaArrayOut##JFUNCNAME (JNIEnv *jenv, CTYPE *result, jsize sz) {
-  JNITYPE *arr;
-  int i;
-  JNITYPE##Array jresult = JCALL1(New##JAVATYPE##Array, jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = JCALL2(Get##JAVATYPE##ArrayElements, jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (JNITYPE)result[i];
-  JCALL3(Release##JAVATYPE##ArrayElements, jenv, jresult, arr, 0);
-  return jresult;
-}
-%}
-%enddef
-
-%{
-#if defined(SWIG_NOINCLUDE) || defined(SWIG_NOARRAYS)
-%}
-
-#ifdef __cplusplus
-JAVA_ARRAYS_DECL(bool, jboolean, Boolean, Bool)       /* bool[] */
-#endif
-
-JAVA_ARRAYS_DECL(signed char, jbyte, Byte, Schar)     /* signed char[] */
-JAVA_ARRAYS_DECL(unsigned char, jshort, Short, Uchar) /* unsigned char[] */
-JAVA_ARRAYS_DECL(short, jshort, Short, Short)         /* short[] */
-JAVA_ARRAYS_DECL(unsigned short, jint, Int, Ushort)   /* unsigned short[] */
-JAVA_ARRAYS_DECL(int, jint, Int, Int)                 /* int[] */
-JAVA_ARRAYS_DECL(unsigned int, jlong, Long, Uint)     /* unsigned int[] */
-JAVA_ARRAYS_DECL(long, jint, Int, Long)               /* long[] */
-JAVA_ARRAYS_DECL(unsigned long, jlong, Long, Ulong)   /* unsigned long[] */
-JAVA_ARRAYS_DECL(jlong, jlong, Long, Longlong)        /* long long[] */
-JAVA_ARRAYS_DECL(float, jfloat, Float, Float)         /* float[] */
-JAVA_ARRAYS_DECL(double, jdouble, Double, Double)     /* double[] */
-
-%{
-#else
-%}
-
-#ifdef __cplusplus
-/* Bool array element assignment different to other types to keep Visual C++ quiet */
-#define JAVA_TYPEMAP_ARRAY_ELEMENT_ASSIGN(CTYPE) (*carr)[i] = ((*jarr)[i] != 0);
-JAVA_ARRAYS_IMPL(bool, jboolean, Boolean, Bool)       /* bool[] */
-#undef JAVA_TYPEMAP_ARRAY_ELEMENT_ASSIGN
-#endif
-
-#define JAVA_TYPEMAP_ARRAY_ELEMENT_ASSIGN(CTYPE) (*carr)[i] = (CTYPE)(*jarr)[i];
-JAVA_ARRAYS_IMPL(signed char, jbyte, Byte, Schar)     /* signed char[] */
-JAVA_ARRAYS_IMPL(unsigned char, jshort, Short, Uchar) /* unsigned char[] */
-JAVA_ARRAYS_IMPL(short, jshort, Short, Short)         /* short[] */
-JAVA_ARRAYS_IMPL(unsigned short, jint, Int, Ushort)   /* unsigned short[] */
-JAVA_ARRAYS_IMPL(int, jint, Int, Int)                 /* int[] */
-JAVA_ARRAYS_IMPL(unsigned int, jlong, Long, Uint)     /* unsigned int[] */
-JAVA_ARRAYS_IMPL(long, jint, Int, Long)               /* long[] */
-JAVA_ARRAYS_IMPL(unsigned long, jlong, Long, Ulong)   /* unsigned long[] */
-JAVA_ARRAYS_IMPL(jlong, jlong, Long, Longlong)        /* long long[] */
-JAVA_ARRAYS_IMPL(float, jfloat, Float, Float)         /* float[] */
-JAVA_ARRAYS_IMPL(double, jdouble, Double, Double)     /* double[] */
-
-%{
-#endif
-%}
-
-
-/* The rest of this file has the array typemaps */
-
-/* Arrays of primitive types use the following macro. The array typemaps use support functions. */
-%define JAVA_ARRAYS_TYPEMAPS(CTYPE, JTYPE, JNITYPE, JFUNCNAME, JNIDESC)
-
-%typemap(jni) CTYPE[ANY], CTYPE[]               %{JNITYPE##Array%}
-%typemap(jtype) CTYPE[ANY], CTYPE[]             %{JTYPE[]%}
-%typemap(jstype) CTYPE[ANY], CTYPE[]            %{JTYPE[]%}
-
-%typemap(in) CTYPE[] (JNITYPE *jarr)
-%{  if (!SWIG_JavaArrayIn##JFUNCNAME(jenv, &jarr, (CTYPE **)&$1, $input)) return $null; %}
-%typemap(in) CTYPE[ANY] (JNITYPE *jarr)
-%{  if ($input && JCALL1(GetArrayLength, jenv, $input) != $1_size) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size");
-    return $null;
-  }
-  if (!SWIG_JavaArrayIn##JFUNCNAME(jenv, &jarr, (CTYPE **)&$1, $input)) return $null; %}
-%typemap(argout) CTYPE[ANY], CTYPE[] 
-%{ SWIG_JavaArrayArgout##JFUNCNAME(jenv, jarr$argnum, (CTYPE *)$1, $input); %}
-%typemap(out) CTYPE[ANY]
-%{$result = SWIG_JavaArrayOut##JFUNCNAME(jenv, (CTYPE *)$1, $1_dim0); %}
-%typemap(out) CTYPE[] 
-%{$result = SWIG_JavaArrayOut##JFUNCNAME(jenv, (CTYPE *)$1, FillMeInAsSizeCannotBeDeterminedAutomatically); %}
-%typemap(freearg) CTYPE[ANY], CTYPE[] 
-#ifdef __cplusplus
-%{ delete [] $1; %}
-#else
-%{ free($1); %}
-#endif
-
-%typemap(javain) CTYPE[ANY], CTYPE[] "$javainput"
-%typemap(javaout) CTYPE[ANY], CTYPE[] {
-    return $jnicall;
-  }
-
-%typemap(memberin) CTYPE[ANY], CTYPE[];
-%typemap(globalin) CTYPE[ANY], CTYPE[];
-%enddef
-
-JAVA_ARRAYS_TYPEMAPS(bool, boolean, jboolean, Bool, "[Z")       /* bool[ANY] */
-JAVA_ARRAYS_TYPEMAPS(signed char, byte, jbyte, Schar, "[B")     /* signed char[ANY] */
-JAVA_ARRAYS_TYPEMAPS(unsigned char, short, jshort, Uchar, "[S") /* unsigned char[ANY] */
-JAVA_ARRAYS_TYPEMAPS(short, short, jshort, Short, "[S")         /* short[ANY] */
-JAVA_ARRAYS_TYPEMAPS(unsigned short, int, jint, Ushort, "[I")   /* unsigned short[ANY] */
-JAVA_ARRAYS_TYPEMAPS(int, int, jint, Int, "[I")                 /* int[ANY] */
-JAVA_ARRAYS_TYPEMAPS(unsigned int, long, jlong, Uint, "[J")     /* unsigned int[ANY] */
-JAVA_ARRAYS_TYPEMAPS(long, int, jint, Long, "[I")               /* long[ANY] */
-JAVA_ARRAYS_TYPEMAPS(unsigned long, long, jlong, Ulong, "[J")   /* unsigned long[ANY] */
-JAVA_ARRAYS_TYPEMAPS(long long, long, jlong, Longlong, "[J")    /* long long[ANY] */
-JAVA_ARRAYS_TYPEMAPS(float, float, jfloat, Float, "[F")         /* float[ANY] */
-JAVA_ARRAYS_TYPEMAPS(double, double, jdouble, Double, "[D")     /* double[ANY] */
-
-
-%typecheck(SWIG_TYPECHECK_BOOL_ARRAY) /* Java boolean[] */
-    bool[ANY], bool[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8_ARRAY) /* Java byte[] */
-    signed char[ANY], signed char[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16_ARRAY) /* Java short[] */
-    unsigned char[ANY], unsigned char[],
-    short[ANY], short[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32_ARRAY) /* Java int[] */
-    unsigned short[ANY], unsigned short[],
-    int[ANY], int[],
-    long[ANY], long[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64_ARRAY) /* Java long[] */
-    unsigned int[ANY], unsigned int[],
-    unsigned long[ANY], unsigned long[],
-    long long[ANY], long long[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT128_ARRAY) /* Java BigInteger[] */
-    unsigned long long[ANY], unsigned long long[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT_ARRAY) /* Java float[] */
-    float[ANY], float[]
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY) /* Java double[] */
-    double[ANY], double[]
-    ""
-
-
-/* Arrays of proxy classes. The typemaps in this macro make it possible to treat an array of 
- * class/struct/unions as an array of Java classes. 
- * Use the following macro to use these typemaps for an array of class/struct/unions called name:
- * JAVA_ARRAYSOFCLASSES(name) 
- * Note that multiple copies of the class/struct is made when using the array as a parameter input. */
-%define JAVA_ARRAYSOFCLASSES(ARRAYSOFCLASSES)
-
-%typemap(jni) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "jlongArray"
-%typemap(jtype) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "long[]"
-%typemap(jstype) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "$javaclassname[]"
-
-%typemap(javain) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "$javaclassname.cArrayUnwrap($javainput)"
-%typemap(javaout) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] {
-    return $javaclassname.cArrayWrap($jnicall, $owner);
-  }
-
-%typemap(in) ARRAYSOFCLASSES[] (jlong *jarr, jsize sz)
-{
-  int i;
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return $null;
-  }
-  sz = JCALL1(GetArrayLength, jenv, $input);
-  jarr = JCALL2(GetLongArrayElements, jenv, $input, 0);
-  if (!jarr) {
-    return $null;
-  }
-#ifdef __cplusplus
-  $1 = new $*1_ltype[sz];
-#else
-  $1 = ($1_ltype) malloc(sz * sizeof($*1_ltype));
-#endif
-  if (!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return $null;
-  }
-  for (i=0; i<sz; i++) {
-    $1[i] = **($&1_ltype)&jarr[i];
-  }
-}
-
-%typemap(in) ARRAYSOFCLASSES[ANY] (jlong *jarr, jsize sz)
-{
-  int i;
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return $null;
-  }
-  sz = JCALL1(GetArrayLength, jenv, $input);
-  if (sz != $1_size) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size");
-    return $null;
-  }
-  jarr = JCALL2(GetLongArrayElements, jenv, $input, 0);
-  if (!jarr) {
-    return $null;
-  }
-#ifdef __cplusplus
-  $1 = new $*1_ltype[sz];
-#else
-  $1 = ($1_ltype) malloc(sz * sizeof($*1_ltype));
-#endif
-  if (!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return $null;
-  }
-  for (i=0; i<sz; i++) {
-    $1[i] = **($&1_ltype)&jarr[i];
-  }
-}
-
-%typemap(argout) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[]
-{
-  int i;
-  for (i=0; i<sz$argnum; i++) {
-    **($&1_ltype)&jarr$argnum[i] = $1[i];
-  }
-  JCALL3(ReleaseLongArrayElements, jenv, $input, jarr$argnum, 0);
-}
-
-%typemap(out) ARRAYSOFCLASSES[ANY]
-{
-  jlong *arr;
-  int i;
-  $result = JCALL1(NewLongArray, jenv, $1_dim0);
-  if (!$result) {
-    return $null;
-  }
-  arr = JCALL2(GetLongArrayElements, jenv, $result, 0);
-  if (!arr) {
-    return $null;
-  }
-  for (i=0; i<$1_dim0; i++) {
-    arr[i] = 0;
-    *($&1_ltype)&arr[i] = &$1[i];
-  }
-  JCALL3(ReleaseLongArrayElements, jenv, $result, arr, 0);
-}
-
-%typemap(freearg) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[]
-#ifdef __cplusplus
-%{ delete [] $1; %}
-#else
-%{ free($1); %}
-#endif
-
-/* Add some code to the proxy class of the array type for converting between type used in 
- * JNI class (long[]) and type used in proxy class ( ARRAYSOFCLASSES[] ) */
-%extend ARRAYSOFCLASSES {
-%proxycode %{
-  protected static long[] cArrayUnwrap($javaclassname[] arrayWrapper) {
-      long[] cArray = new long[arrayWrapper.length];
-      for (int i=0; i<arrayWrapper.length; i++)
-        cArray[i] = $javaclassname.getCPtr(arrayWrapper[i]);
-      return cArray;
-  }
-
-  protected static $javaclassname[] cArrayWrap(long[] cArray, boolean cMemoryOwn) {
-    $javaclassname[] arrayWrapper = new $javaclassname[cArray.length];
-    for (int i=0; i<cArray.length; i++)
-      arrayWrapper[i] = new $javaclassname(cArray[i], cMemoryOwn);
-    return arrayWrapper;
-  }
-%}
-}
-
-%enddef /* JAVA_ARRAYSOFCLASSES */
-
-
-/* Arrays of enums. 
- * Use the following to use these typemaps for an array of enums called name:
- * %apply ARRAYSOFENUMS[ANY] { name[ANY] }; */
-%typemap(jni) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "jintArray"
-%typemap(jtype) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "int[]"
-%typemap(jstype) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "int[]"
-
-%typemap(javain) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "$javainput"
-%typemap(javaout) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] {
-    return $jnicall;
-  }
-
-%typemap(in) ARRAYSOFENUMS[] (jint *jarr)
-%{  if (!SWIG_JavaArrayInInt(jenv, &jarr, (int **)&$1, $input)) return $null; %}
-%typemap(in) ARRAYSOFENUMS[ANY] (jint *jarr) {
-  if ($input && JCALL1(GetArrayLength, jenv, $input) != $1_size) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size");
-    return $null;
-  }
-  if (!SWIG_JavaArrayInInt(jenv, &jarr, (int **)&$1, $input)) return $null;
-}
-%typemap(argout) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] 
-%{ SWIG_JavaArrayArgoutInt(jenv, jarr$argnum, (int *)$1, $input); %}
-%typemap(out) ARRAYSOFENUMS[ANY] 
-%{$result = SWIG_JavaArrayOutInt(jenv, (int *)$1, $1_dim0); %}
-%typemap(freearg) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] 
-#ifdef __cplusplus
-%{ delete [] $1; %}
-#else
-%{ free($1); %}
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/java/boost_intrusive_ptr.i b/dependencies2013/win32/swig/Lib/java/boost_intrusive_ptr.i
deleted file mode 100644
index a484a3b6..00000000
--- a/dependencies2013/win32/swig/Lib/java/boost_intrusive_ptr.i
+++ /dev/null
@@ -1,473 +0,0 @@
-// Users can provide their own SWIG_INTRUSIVE_PTR_TYPEMAPS or SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP macros before including this file to change the
-// visibility of the constructor and getCPtr method if desired to public if using multiple modules.
-#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP
-#define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(protected, protected, CONST, TYPE)
-#endif
-#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS
-#define SWIG_INTRUSIVE_PTR_TYPEMAPS(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(protected, protected, CONST, TYPE)
-#endif
-
-
-%include <intrusive_ptr.i>
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-%typemap(in) CONST TYPE ($&1_type argp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  // plain value
-  argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0;
-  if (!argp) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type");
-    return $null;
-  }
-  $1 = *argp; 
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") CONST TYPE %{ 
-  //plain value(out)
-  $1_ltype* resultp = new $1_ltype(($1_ltype &)$1);
-  intrusive_ptr_add_ref(resultp);
-  *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(resultp, SWIG_intrusive_deleter< CONST TYPE >()); 
-%}
-
-%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  // plain pointer
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0); 
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE * %{
-  //plain pointer(out)
-  #if ($owner)
-  if ($1) {
-    intrusive_ptr_add_ref($1);
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >());  
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-  #else
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  #endif
-%}
-
-%typemap(in) CONST TYPE & (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  // plain reference
-  $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  if(!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    return $null;
-  } 
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE & %{ 
-  //plain reference(out)
-  #if ($owner)
-  if ($1) {
-    intrusive_ptr_add_ref($1);
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >());  
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  } 
-  #else
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  #endif
-%}
-
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ 
-  // plain pointer by reference
-  temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  $1 = &temp; 
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") TYPE *CONST& %{ 
-  // plain pointer by reference(out)
-  #if ($owner)
-  if (*$1) {
-    intrusive_ptr_add_ref(*$1);
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1, SWIG_intrusive_deleter< CONST TYPE >());  
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  } 
-  #else
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_0);
-  #endif
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > ($&1_type argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ 
-  // intrusive_ptr by value
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input;
-  if (smartarg) {
-  	$1 = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); 
-  }
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{ 
-  if ($1) {
-  	intrusive_ptr_add_ref(result.get());
-  	*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(result.get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-   	*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; 
-  }
-%}
-
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{
-  // shared_ptr by value
-  smartarg = *($&1_ltype*)&$input; 
-  if (smartarg) $1 = *smartarg; 
-%}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ 
-  *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; 
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ 
-  // intrusive_ptr by reference
-  if ( $input ) {
-  	smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; 
-  	temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-  	$1 = &temp;
-  } else {
-	$1 = &tempnull;
-  }
-%}
-%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{
-  delete &($1);
-  if ($self) {
-    SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * temp = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input);
-    $1 = *temp;
-  }
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ 
-  if (*$1) {
-    intrusive_ptr_add_ref($1->get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-%} 
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ 
-  // intrusive_ptr by pointer
-  if ( $input ) {
-  	smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; 
-  	temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-  	$1 = &temp; 
-  } else {
-	$1 = &tempnull;
-  }
-%}
-%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{
-  delete $1;
-  if ($self) $1 = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input);
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ 
-  if ($1 && *$1) {
-    intrusive_ptr_add_ref($1->get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-  if ($owner) delete $1; 
-%}
-
-%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& (SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > temp, $*1_ltype tempp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ 
-  // intrusive_ptr by pointer reference
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input;
-  if ($input) {
-    temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true);
-  }
-  tempp = &temp;
-  $1 = &tempp;
-%}
-%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{
-  if ($self) $1 = *$input;
-%}
-%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ 
-  if (*$1 && **$1) {
-    intrusive_ptr_add_ref((*$1)->get());
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >((*$1)->get(), SWIG_intrusive_deleter< CONST TYPE >());
-  } else {
-    *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0;
-  }
-%} 
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (jni)    SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "jlong"
-%typemap (jtype)  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, 
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "long"
-%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)"
-%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
-                 SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                 SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
-                 SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
-                 SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE).getCPtr($javainput)"
-
-%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-
-
-%typemap(javaout) CONST TYPE {
-    return new $typemap(jstype, TYPE)($jnicall, true);
-  }
-%typemap(javaout) CONST TYPE & {
-    return new $typemap(jstype, TYPE)($jnicall, true);
-  }
-%typemap(javaout) CONST TYPE * {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) TYPE *CONST& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-
-// Base proxy classes
-%typemap(javabody) TYPE %{
-  private transient long swigCPtr;
-  private transient boolean swigCMemOwnBase;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwnBase = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(javabody_derived) TYPE %{
-  private transient long swigCPtr;
-  private transient boolean swigCMemOwnDerived;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true);
-    swigCMemOwnDerived = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE {
-    if(swigCPtr != 0 && swigCMemOwnBase) {
-      swigCMemOwnBase = false;
-      $jnicall;
-    }
-    swigCPtr = 0;
-  }
-
-%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE {
-    if(swigCPtr != 0 && swigCMemOwnDerived) {
-      swigCMemOwnDerived = false;
-      $jnicall;
-    }
-    swigCPtr = 0;
-    super.delete();
-  }
-
-// CONST version needed ???? also for C#
-%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long"
-%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long"
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%template() SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >;
-%enddef
-
-
-/////////////////////////////////////////////////////////////////////
-
-
-%include <shared_ptr.i>
-
-%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...)
-
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor mods
-%feature("unref") TYPE "(void)arg1; delete smartarg1;"
-
-
-// plain value
-%typemap(in) CONST TYPE ($&1_type argp = 0) %{
-  argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0;
-  if (!argp) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type");
-    return $null;
-  }
-  $1 = *argp; %}
-%typemap(out) CONST TYPE 
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %}
-
-// plain pointer
-%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{
-  *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-%}
-
-// plain reference
-%typemap(in) CONST TYPE & %{
-  $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  if (!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    return $null;
-  } %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE &
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// plain pointer by reference
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0)
-%{ temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-   $1 = &temp; %}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST&
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %}
-
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{
-  // shared_ptr by value
-  smartarg = *($&1_ltype*)&$input; 
-  if (smartarg) $1 = *smartarg; 
-%}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ 
-  *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; 
-%}
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (jni)    SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong"
-%typemap (jtype)  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long"
-%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE)"
-%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE).getCPtr($javainput)"
-%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-
-%typemap(javaout) CONST TYPE {
-    return new $typemap(jstype, TYPE)($jnicall, true);
-  }
-%typemap(javaout) CONST TYPE & {
-    return new $typemap(jstype, TYPE)($jnicall, true);
-  }
-%typemap(javaout) CONST TYPE * {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) TYPE *CONST& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-
-// Base proxy classes
-%typemap(javabody) TYPE %{
-  private transient long swigCPtr;
-  private transient boolean swigCMemOwnBase;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwnBase = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(javabody_derived) TYPE %{
-  private transient long swigCPtr;
-  private transient boolean swigCMemOwnDerived;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true);
-    swigCMemOwnDerived = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE {
-    if (swigCPtr != 0) {
-      if (swigCMemOwnBase) {
-        swigCMemOwnBase = false;
-        $jnicall;
-      }
-      swigCPtr = 0;
-    }
-  }
-
-%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE {
-    if (swigCPtr != 0) {
-      if (swigCMemOwnDerived) {
-        swigCMemOwnDerived = false;
-        $jnicall;
-      }
-      swigCPtr = 0;
-    }
-    super.delete();
-  }
-
-// CONST version needed ???? also for C#
-%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long"
-%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long"
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/java/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/java/boost_shared_ptr.i
deleted file mode 100644
index 5ed16aa3..00000000
--- a/dependencies2013/win32/swig/Lib/java/boost_shared_ptr.i
+++ /dev/null
@@ -1,201 +0,0 @@
-// Users can provide their own SWIG_SHARED_PTR_TYPEMAPS macro before including this file to change the
-// visibility of the constructor and getCPtr method if desired to public if using multiple modules.
-#ifndef SWIG_SHARED_PTR_TYPEMAPS
-#define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...) SWIG_SHARED_PTR_TYPEMAPS_IMPLEMENTATION(protected, protected, CONST, TYPE)
-#endif
-
-%include <shared_ptr.i>
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE 
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-// plain value
-%typemap(in) CONST TYPE ($&1_type argp = 0) %{
-  argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0;
-  if (!argp) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type");
-    return $null;
-  }
-  $1 = *argp; %}
-%typemap(out) CONST TYPE 
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %}
-
-// plain pointer
-%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
-  smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input;
-  $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{
-  *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-%}
-
-// plain reference
-%typemap(in) CONST TYPE & %{
-  $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-  if (!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    return $null;
-  } %}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE &
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// plain pointer by reference
-%typemap(in) TYPE *CONST& ($*1_ltype temp = 0)
-%{ temp = (TYPE *)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
-   $1 = &temp; %}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST&
-%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ($&1_type argp)
-%{ argp = *($&1_ltype*)&$input; 
-   if (argp) $1 = *argp; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >
-%{ *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; %}
-
-// shared_ptr by reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & ($*1_ltype tempnull)
-%{ $1 = $input ? *($&1_ltype)&$input : &tempnull; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &
-%{ *($&1_ltype)&$result = *$1 ? new $*1_ltype(*$1) : 0; %} 
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * ($*1_ltype tempnull)
-%{ $1 = $input ? *($&1_ltype)&$input : &tempnull; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *
-%{ *($&1_ltype)&$result = ($1 && *$1) ? new $*1_ltype(*$1) : 0;
-   if ($owner) delete $1; %}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempnull, $*1_ltype temp = 0)
-%{ temp = $input ? *($1_ltype)&$input : &tempnull;
-   $1 = &temp; %}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *&
-%{ *($1_ltype)&$result = (*$1 && **$1) ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0; %} 
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%typemap (jni)    SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "jlong"
-%typemap (jtype)  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "long"
-%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)"
-
-%typemap(javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, 
-                 SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                 SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                 SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(jstype, TYPE).getCPtr($javainput)"
-
-%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-
-
-%typemap(javaout) CONST TYPE {
-    return new $typemap(jstype, TYPE)($jnicall, true);
-  }
-%typemap(javaout) CONST TYPE & {
-    return new $typemap(jstype, TYPE)($jnicall, true);
-  }
-%typemap(javaout) CONST TYPE * {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-%typemap(javaout) TYPE *CONST& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-  }
-
-// Base proxy classes
-%typemap(javabody) TYPE %{
-  private transient long swigCPtr;
-  private transient boolean swigCMemOwn;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(javabody_derived) TYPE %{
-  private transient long swigCPtr;
-  private transient boolean swigCMemOwnDerived;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true);
-    swigCMemOwnDerived = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $jnicall;
-      }
-      swigCPtr = 0;
-    }
-  }
-
-%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE {
-    if (swigCPtr != 0) {
-      if (swigCMemOwnDerived) {
-        swigCMemOwnDerived = false;
-        $jnicall;
-      }
-      swigCPtr = 0;
-    }
-    super.delete();
-  }
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/java/director.swg b/dependencies2013/win32/swig/Lib/java/director.swg
deleted file mode 100644
index 355e62d6..00000000
--- a/dependencies2013/win32/swig/Lib/java/director.swg
+++ /dev/null
@@ -1,413 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that Java proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#if defined(DEBUG_DIRECTOR_OWNED) || defined(DEBUG_DIRECTOR_EXCEPTION)
-#include <iostream>
-#endif
-
-#include <exception>
-
-namespace Swig {
-
-  /* Java object wrapper */
-  class JObjectWrapper {
-  public:
-    JObjectWrapper() : jthis_(NULL), weak_global_(true) {
-    }
-
-    ~JObjectWrapper() {
-      jthis_ = NULL;
-      weak_global_ = true;
-    }
-
-    bool set(JNIEnv *jenv, jobject jobj, bool mem_own, bool weak_global) {
-      if (!jthis_) {
-        weak_global_ = weak_global || !mem_own; // hold as weak global if explicitly requested or not owned
-        if (jobj)
-          jthis_ = weak_global_ ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj);
-#if defined(DEBUG_DIRECTOR_OWNED)
-        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> " << jthis_ << std::endl;
-#endif
-        return true;
-      } else {
-#if defined(DEBUG_DIRECTOR_OWNED)
-        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> already set" << std::endl;
-#endif
-        return false;
-      }
-    }
-
-    jobject get(JNIEnv *jenv) const {
-#if defined(DEBUG_DIRECTOR_OWNED)
-      std::cout << "JObjectWrapper::get(";
-      if (jthis_)
-        std::cout << jthis_;
-      else
-        std::cout << "null";
-      std::cout << ") -> return new local ref" << std::endl;
-#endif
-      return (jthis_ ? jenv->NewLocalRef(jthis_) : jthis_);
-    }
-
-    void release(JNIEnv *jenv) {
-#if defined(DEBUG_DIRECTOR_OWNED)
-      std::cout << "JObjectWrapper::release(" << jthis_ << "): " << (weak_global_ ? "weak global ref" : "global ref") << std::endl;
-#endif
-      if (jthis_) {
-        if (weak_global_) {
-          if (jenv->IsSameObject(jthis_, NULL) == JNI_FALSE)
-            jenv->DeleteWeakGlobalRef((jweak)jthis_);
-        } else
-          jenv->DeleteGlobalRef(jthis_);
-      }
-
-      jthis_ = NULL;
-      weak_global_ = true;
-    }
-
-    /* Only call peek if you know what you are doing wrt to weak/global references */
-    jobject peek() {
-      return jthis_;
-    }
-
-    /* Java proxy releases ownership of C++ object, C++ object is now
-       responsible for destruction (creates NewGlobalRef to pin Java proxy) */
-    void java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
-      if (take_or_release) {  /* Java takes ownership of C++ object's lifetime. */
-        if (!weak_global_) {
-          jenv->DeleteGlobalRef(jthis_);
-          jthis_ = jenv->NewWeakGlobalRef(jself);
-          weak_global_ = true;
-        }
-      } else {
-	/* Java releases ownership of C++ object's lifetime */
-        if (weak_global_) {
-          jenv->DeleteWeakGlobalRef((jweak)jthis_);
-          jthis_ = jenv->NewGlobalRef(jself);
-          weak_global_ = false;
-        }
-      }
-    }
-
-  private:
-    /* pointer to Java object */
-    jobject jthis_;
-    /* Local or global reference flag */
-    bool weak_global_;
-  };
-
-  /* Local JNI reference deleter */
-  class LocalRefGuard {
-    JNIEnv *jenv_;
-    jobject jobj_;
-
-    // non-copyable
-    LocalRefGuard(const LocalRefGuard &);
-    LocalRefGuard &operator=(const LocalRefGuard &);
-  public:
-    LocalRefGuard(JNIEnv *jenv, jobject jobj): jenv_(jenv), jobj_(jobj) {}
-    ~LocalRefGuard() {
-      if (jobj_)
-        jenv_->DeleteLocalRef(jobj_);
-    }
-  };
-
-  /* director base class */
-  class Director {
-    /* pointer to Java virtual machine */
-    JavaVM *swig_jvm_;
-
-  protected:
-#if defined (_MSC_VER) && (_MSC_VER<1300)
-    class JNIEnvWrapper;
-    friend class JNIEnvWrapper;
-#endif
-    /* Utility class for managing the JNI environment */
-    class JNIEnvWrapper {
-      const Director *director_;
-      JNIEnv *jenv_;
-      int env_status;
-    public:
-      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0), env_status(0) {
-#if defined(__ANDROID__)
-        JNIEnv **jenv = &jenv_;
-#else
-        void **jenv = (void **)&jenv_;
-#endif
-        env_status = director_->swig_jvm_->GetEnv((void **)&jenv_, JNI_VERSION_1_2);
-#if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON)
-        // Attach a daemon thread to the JVM. Useful when the JVM should not wait for
-        // the thread to exit upon shutdown. Only for jdk-1.4 and later.
-        director_->swig_jvm_->AttachCurrentThreadAsDaemon(jenv, NULL);
-#else
-        director_->swig_jvm_->AttachCurrentThread(jenv, NULL);
-#endif
-      }
-      ~JNIEnvWrapper() {
-#if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
-        // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
-        // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
-        if (env_status == JNI_EDETACHED)
-          director_->swig_jvm_->DetachCurrentThread();
-#endif
-      }
-      JNIEnv *getJNIEnv() const {
-        return jenv_;
-      }
-    };
-
-    /* Java object wrapper */
-    JObjectWrapper swig_self_;
-
-    /* Disconnect director from Java object */
-    void swig_disconnect_director_self(const char *disconn_method) {
-      JNIEnvWrapper jnienv(this) ;
-      JNIEnv *jenv = jnienv.getJNIEnv() ;
-      jobject jobj = swig_self_.get(jenv);
-      LocalRefGuard ref_deleter(jenv, jobj);
-#if defined(DEBUG_DIRECTOR_OWNED)
-      std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
-#endif
-      if (jobj && jenv->IsSameObject(jobj, NULL) == JNI_FALSE) {
-        jmethodID disconn_meth = jenv->GetMethodID(jenv->GetObjectClass(jobj), disconn_method, "()V");
-        if (disconn_meth) {
-#if defined(DEBUG_DIRECTOR_OWNED)
-          std::cout << "Swig::Director::disconnect_director_self upcall to " << disconn_method << std::endl;
-#endif
-          jenv->CallVoidMethod(jobj, disconn_meth);
-        }
-      }
-    }
-
-  public:
-    Director(JNIEnv *jenv) : swig_jvm_((JavaVM *) NULL), swig_self_() {
-      /* Acquire the Java VM pointer */
-      jenv->GetJavaVM(&swig_jvm_);
-    }
-
-    virtual ~Director() {
-      JNIEnvWrapper jnienv(this) ;
-      JNIEnv *jenv = jnienv.getJNIEnv() ;
-      swig_self_.release(jenv);
-    }
-
-    bool swig_set_self(JNIEnv *jenv, jobject jself, bool mem_own, bool weak_global) {
-      return swig_self_.set(jenv, jself, mem_own, weak_global);
-    }
-
-    jobject swig_get_self(JNIEnv *jenv) const {
-      return swig_self_.get(jenv);
-    }
-
-    // Change C++ object's ownership, relative to Java
-    void swig_java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
-      swig_self_.java_change_ownership(jenv, jself, take_or_release);
-    }
-  };
-
-  // Zero initialized bool array
-  template<size_t N> class BoolArray {
-    bool array_[N];
-  public:
-    BoolArray() {
-      memset(array_, 0, sizeof(array_));
-    }
-    bool& operator[](size_t n) {
-      return array_[n];
-    }
-    bool operator[](size_t n) const {
-      return array_[n];
-    }
-  };
-
-  // Utility classes and functions for exception handling.
-
-  // Simple holder for a Java string during exception handling, providing access to a c-style string
-  class JavaString {
-  public:
-    JavaString(JNIEnv *jenv, jstring jstr) : jenv_(jenv), jstr_(jstr), cstr_(0) {
-      if (jenv_ && jstr_)
-	cstr_ = (const char *) jenv_->GetStringUTFChars(jstr_, NULL);
-    }
-
-    ~JavaString() {
-      if (jenv_ && jstr_ && cstr_)
-	jenv_->ReleaseStringUTFChars(jstr_, cstr_);
-    }
-
-    const char *c_str(const char *null_string = "null JavaString") const {
-      return cstr_ ? cstr_ : null_string;
-    }
-
-  private:
-    // non-copyable
-    JavaString(const JavaString &);
-    JavaString &operator=(const JavaString &);
-
-    JNIEnv *jenv_;
-    jstring jstr_;
-    const char *cstr_;
-  };
-
-  // Helper class to extract the exception message from a Java throwable
-  class JavaExceptionMessage {
-  public:
-    JavaExceptionMessage(JNIEnv *jenv, jthrowable throwable) : message_(jenv, exceptionMessageFromThrowable(jenv, throwable)) {
-    }
-
-    const char *message() const {
-      return message_.c_str("Could not get exception message in JavaExceptionMessage");
-    }
-
-  private:
-    // non-copyable
-    JavaExceptionMessage(const JavaExceptionMessage &);
-    JavaExceptionMessage &operator=(const JavaExceptionMessage &);
-
-    // Get exception message by calling Java method Throwable.getMessage()
-    static jstring exceptionMessageFromThrowable(JNIEnv *jenv, jthrowable throwable) {
-      jstring jmsg = NULL;
-      if (jenv && throwable) {
-	jenv->ExceptionClear(); // Cannot invoke methods with any pending exceptions
-	jclass throwclz = jenv->GetObjectClass(throwable);
-	if (throwclz) {
-	  // All Throwable classes have a getMessage() method, so call it to extract the exception message
-	  jmethodID getMessageMethodID = jenv->GetMethodID(throwclz, "getMessage", "()Ljava/lang/String;");
-	  if (getMessageMethodID)
-	    jmsg = (jstring)jenv->CallObjectMethod(throwable, getMessageMethodID);
-	}
-	if (jmsg == NULL && jenv->ExceptionCheck())
-	  jenv->ExceptionClear();
-      }
-      return jmsg;
-    }
-
-    JavaString message_;
-  };
-
-  // C++ Exception class for handling Java exceptions thrown during a director method Java upcall
-  class DirectorException : public std::exception {
-  public:
-
-    // Construct exception from a Java throwable
-    DirectorException(JNIEnv *jenv, jthrowable throwable) : classname_(0), msg_(0) {
-
-      // Call Java method Object.getClass().getName() to obtain the throwable's class name (delimited by '/')
-      if (throwable) {
-	jclass throwclz = jenv->GetObjectClass(throwable);
-	if (throwclz) {
-	  jclass clzclz = jenv->GetObjectClass(throwclz);
-	  if (clzclz) {
-	    jmethodID getNameMethodID = jenv->GetMethodID(clzclz, "getName", "()Ljava/lang/String;");
-	    if (getNameMethodID) {
-	      jstring jstr_classname = (jstring)(jenv->CallObjectMethod(throwclz, getNameMethodID));
-              // Copy strings, since there is no guarantee that jenv will be active when handled
-              if (jstr_classname) {
-                JavaString jsclassname(jenv, jstr_classname);
-                const char *classname = jsclassname.c_str(0);
-                if (classname)
-                  classname_ = copypath(classname);
-              }
-	    }
-	  }
-	}
-      }
-
-      JavaExceptionMessage exceptionmsg(jenv, throwable);
-      msg_ = copystr(exceptionmsg.message());
-    }
-
-    // More general constructor for handling as a java.lang.RuntimeException
-    DirectorException(const char *msg) : classname_(0), msg_(copystr(msg ? msg : "Unspecified DirectorException message")) {
-    }
-
-    ~DirectorException() throw() {
-      delete[] classname_;
-      delete[] msg_;
-    }
-
-    const char *what() const throw() {
-      return msg_;
-    }
-
-    // Reconstruct and raise/throw the Java Exception that caused the DirectorException
-    // Note that any error in the JNI exception handling results in a Java RuntimeException
-    void raiseJavaException(JNIEnv *jenv) const {
-      if (jenv) {
-	jenv->ExceptionClear();
-
-	jmethodID ctorMethodID = 0;
-	jclass throwableclass = 0;
-        if (classname_) {
-          throwableclass = jenv->FindClass(classname_);
-          if (throwableclass)
-            ctorMethodID = jenv->GetMethodID(throwableclass, "<init>", "(Ljava/lang/String;)V");
-	}
-
-	if (ctorMethodID) {
-	  jenv->ThrowNew(throwableclass, what());
-	} else {
-	  SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, what());
-	}
-      }
-    }
-
-  private:
-    static char *copypath(const char *srcmsg) {
-      char *target = copystr(srcmsg);
-      for (char *c=target; *c; ++c) {
-        if ('.' == *c)
-          *c = '/';
-      }
-      return target;
-    }
-
-    static char *copystr(const char *srcmsg) {
-      char *target = 0;
-      if (srcmsg) {
-	size_t msglen = strlen(srcmsg) + 1;
-	target = new char[msglen];
-	strncpy(target, srcmsg, msglen);
-      }
-      return target;
-    }
-
-    const char *classname_;
-    const char *msg_;
-  };
-
-  // Helper method to determine if a Java throwable matches a particular Java class type
-  SWIGINTERN bool ExceptionMatches(JNIEnv *jenv, jthrowable throwable, const char *classname) {
-    bool matches = false;
-
-    if (throwable && jenv && classname) {
-      // Exceptions need to be cleared for correct behavior.
-      // The caller of ExceptionMatches should restore pending exceptions if desired -
-      // the caller already has the throwable.
-      jenv->ExceptionClear();
-
-      jclass clz = jenv->FindClass(classname);
-      if (clz) {
-	jclass classclz = jenv->GetObjectClass(clz);
-	jmethodID isInstanceMethodID = jenv->GetMethodID(classclz, "isInstance", "(Ljava/lang/Object;)Z");
-	if (isInstanceMethodID) {
-	  matches = jenv->CallBooleanMethod(clz, isInstanceMethodID, throwable) != 0;
-	}
-      }
-
-#if defined(DEBUG_DIRECTOR_EXCEPTION)
-      if (jenv->ExceptionCheck()) {
-        // Typically occurs when an invalid classname argument is passed resulting in a ClassNotFoundException
-        JavaExceptionMessage exc(jenv, jenv->ExceptionOccurred());
-        std::cout << "Error: ExceptionMatches: class '" << classname << "' : " << exc.message() << std::endl;
-      }
-#endif
-    }
-    return matches;
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Lib/java/enums.swg b/dependencies2013/win32/swig/Lib/java/enums.swg
deleted file mode 100644
index 81fe5787..00000000
--- a/dependencies2013/win32/swig/Lib/java/enums.swg
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enums.swg
- *
- * Include this file in order for C/C++ enums to be wrapped by proper Java enums.
- * Note that the JNI layer handles the enum as an int. The Java enum has extra
- * code generated to store the C++ int value. This is required for C++ enums that
- * specify a value for the enum item, as native Java enums do not support this.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(jni) const enum SWIGTYPE & "jint"
-%typemap(jtype) const enum SWIGTYPE & "int"
-%typemap(jstype) const enum SWIGTYPE & "$*javaclassname"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE &  %{ $result = (jint)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1;"
-%typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)"
-%typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()"
-
-%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
-
-%typemap(throws) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) const enum SWIGTYPE & "$javainput.swigValue()"
-%typemap(javaout) const enum SWIGTYPE & {
-    return $*javaclassname.swigToEnum($jnicall);
-  }
-
-
-// enum SWIGTYPE typemaps
-%typemap(jni) enum SWIGTYPE "jint"
-%typemap(jtype) enum SWIGTYPE "int"
-%typemap(jstype) enum SWIGTYPE "$javaclassname"
-
-%typemap(in) enum SWIGTYPE  %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE  %{ $result = (jint)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin, descriptor="L$packagepath/$javaclassname;") enum SWIGTYPE "$input = (jint) $1;"
-%typemap(javadirectorin) enum SWIGTYPE "$javaclassname.swigToEnum($jniinput)"
-%typemap(javadirectorout) enum SWIGTYPE "($javacall).swigValue()"
-
-%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
-
-%typemap(throws) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) enum SWIGTYPE "$javainput.swigValue()"
-%typemap(javaout) enum SWIGTYPE {
-    return $javaclassname.swigToEnum($jnicall);
-  }
-
-%typemap(javaclassmodifiers) enum SWIGTYPE "public enum"
-%typemap(javabase)           enum SWIGTYPE ""
-%typemap(javacode)           enum SWIGTYPE ""
-%typemap(javaimports)        enum SWIGTYPE ""
-%typemap(javainterfaces)     enum SWIGTYPE ""
-
-/*
- * SwigNext static inner class used instead of a static int as static fields cannot be accessed from enum initialisers.
- * The swigToEnum method is used to find the Java enum from a C++ enum integer value. The default one here takes 
- * advantage of the fact that most enums do not have initial values specified, so the lookup is fast. If initial
- * values are specified then a lengthy linear search through all possible enums might occur. Specific typemaps could be
- * written to possibly optimise this lookup by taking advantage of characteristics peculiar to the targeted enum.
- */
-%typemap(javabody) enum SWIGTYPE %{
-  public final int swigValue() {
-    return swigValue;
-  }
-
-  public static $javaclassname swigToEnum(int swigValue) {
-    $javaclassname[] swigValues = $javaclassname.class.getEnumConstants();
-    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
-      return swigValues[swigValue];
-    for ($javaclassname swigEnum : swigValues)
-      if (swigEnum.swigValue == swigValue)
-        return swigEnum;
-    throw new IllegalArgumentException("No enum " + $javaclassname.class + " with value " + swigValue);
-  }
-
-  @SuppressWarnings("unused")
-  private $javaclassname() {
-    this.swigValue = SwigNext.next++;
-  }
-
-  @SuppressWarnings("unused")
-  private $javaclassname(int swigValue) {
-    this.swigValue = swigValue;
-    SwigNext.next = swigValue+1;
-  }
-
-  @SuppressWarnings("unused")
-  private $javaclassname($javaclassname swigEnum) {
-    this.swigValue = swigEnum.swigValue;
-    SwigNext.next = this.swigValue+1;
-  }
-
-  private final int swigValue;
-
-  private static class SwigNext {
-    private static int next = 0;
-  }
-%}
-
-%javaenum(proper);
-
diff --git a/dependencies2013/win32/swig/Lib/java/enumsimple.swg b/dependencies2013/win32/swig/Lib/java/enumsimple.swg
deleted file mode 100644
index c270149b..00000000
--- a/dependencies2013/win32/swig/Lib/java/enumsimple.swg
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enumsimple.swg
- *
- * This file provides backwards compatible enum wrapping. SWIG versions 1.3.21
- * and earlier wrapped global enums with constant integers in the module class
- * or Constants interface. Enums declared within a C++ class were wrapped by
- * constant integers in the Java proxy class.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(jni) const enum SWIGTYPE & "jint"
-%typemap(jtype) const enum SWIGTYPE & "int"
-%typemap(jstype) const enum SWIGTYPE & "int"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE &  %{ $result = (jint)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1;"
-%typemap(javadirectorin) const enum SWIGTYPE & "$jniinput"
-%typemap(javadirectorout) const enum SWIGTYPE & "$javacall"
-
-%typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & ""
-
-%typemap(throws) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) const enum SWIGTYPE & "$javainput"
-%typemap(javaout) const enum SWIGTYPE & {
-    return $jnicall;
-  }
-
-
-// enum SWIGTYPE typemaps
-%typemap(jni) enum SWIGTYPE "jint"
-%typemap(jtype) enum SWIGTYPE "int"
-%typemap(jstype) enum SWIGTYPE "int"
-
-%typemap(in) enum SWIGTYPE  %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE  %{ $result = (jint)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin, descriptor="I") enum SWIGTYPE "$input = (jint) $1;"
-%typemap(javadirectorin) enum SWIGTYPE "$jniinput"
-%typemap(javadirectorout) enum SWIGTYPE "$javacall"
-
-%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
-
-%typemap(throws) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) enum SWIGTYPE "$javainput"
-%typemap(javaout) enum SWIGTYPE {
-    return $jnicall;
-  }
-
-%typemap(javaclassmodifiers) enum SWIGTYPE ""
-%typemap(javabase)           enum SWIGTYPE ""
-%typemap(javacode)           enum SWIGTYPE ""
-%typemap(javaimports)        enum SWIGTYPE ""
-%typemap(javainterfaces)     enum SWIGTYPE ""
-%typemap(javabody)           enum SWIGTYPE ""
-
-%javaenum(simple);
-
diff --git a/dependencies2013/win32/swig/Lib/java/enumtypesafe.swg b/dependencies2013/win32/swig/Lib/java/enumtypesafe.swg
deleted file mode 100644
index c2012f56..00000000
--- a/dependencies2013/win32/swig/Lib/java/enumtypesafe.swg
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enumtypesafe.swg
- *
- * Include this file in order for C/C++ enums to be wrapped by the so called
- * typesafe enum pattern. Each enum has an equivalent Java class named after the
- * enum and each enum item is a static instance of this class.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(jni) const enum SWIGTYPE & "jint"
-%typemap(jtype) const enum SWIGTYPE & "int"
-%typemap(jstype) const enum SWIGTYPE & "$*javaclassname"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE &  %{ $result = (jint)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1;"
-%typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)"
-%typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()"
-
-%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
-
-%typemap(throws) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) const enum SWIGTYPE & "$javainput.swigValue()"
-%typemap(javaout) const enum SWIGTYPE & {
-    return $*javaclassname.swigToEnum($jnicall);
-  }
-
-// enum SWIGTYPE typemaps
-%typemap(jni) enum SWIGTYPE "jint"
-%typemap(jtype) enum SWIGTYPE "int"
-%typemap(jstype) enum SWIGTYPE "$javaclassname"
-
-%typemap(in) enum SWIGTYPE  %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE  %{ $result = (jint)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin, descriptor="L$packagepath/$javaclassname;") enum SWIGTYPE "$input = (jint) $1;"
-%typemap(javadirectorin) enum SWIGTYPE "$javaclassname.swigToEnum($jniinput)"
-%typemap(javadirectorout) enum SWIGTYPE "($javacall).swigValue()"
-
-%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
-
-%typemap(throws) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) enum SWIGTYPE "$javainput.swigValue()"
-%typemap(javaout) enum SWIGTYPE {
-    return $javaclassname.swigToEnum($jnicall);
-  }
-
-// '$static' will be replaced with either 'static' or nothing depending on whether the enum is an inner Java class or not
-%typemap(javaclassmodifiers) enum SWIGTYPE "public final $static class"
-%typemap(javabase)           enum SWIGTYPE ""
-%typemap(javacode)           enum SWIGTYPE ""
-%typemap(javaimports)        enum SWIGTYPE ""
-%typemap(javainterfaces)     enum SWIGTYPE ""
-
-/*
- * The swigToEnum method is used to find the Java enum from a C++ enum integer value. The default one here takes 
- * advantage of the fact that most enums do not have initial values specified, so the lookup is fast. If initial
- * values are specified then a lengthy linear search through all possible enums might occur. Specific typemaps could be
- * written to possibly optimise this lookup by taking advantage of characteristics peculiar to the targeted enum.
- * The special variable, $enumvalues, is replaced with a comma separated list of all the enum values.
- */
-%typemap(javabody) enum SWIGTYPE %{
-  public final int swigValue() {
-    return swigValue;
-  }
-
-  public String toString() {
-    return swigName;
-  }
-
-  public static $javaclassname swigToEnum(int swigValue) {
-    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
-      return swigValues[swigValue];
-    for (int i = 0; i < swigValues.length; i++)
-      if (swigValues[i].swigValue == swigValue)
-        return swigValues[i];
-    throw new IllegalArgumentException("No enum " + $javaclassname.class + " with value " + swigValue);
-  }
-
-  private $javaclassname(String swigName) {
-    this.swigName = swigName;
-    this.swigValue = swigNext++;
-  }
-
-  private $javaclassname(String swigName, int swigValue) {
-    this.swigName = swigName;
-    this.swigValue = swigValue;
-    swigNext = swigValue+1;
-  }
-
-  private $javaclassname(String swigName, $javaclassname swigEnum) {
-    this.swigName = swigName;
-    this.swigValue = swigEnum.swigValue;
-    swigNext = this.swigValue+1;
-  }
-
-  private static $javaclassname[] swigValues = { $enumvalues };
-  private static int swigNext = 0;
-  private final int swigValue;
-  private final String swigName;
-%}
-
-%javaenum(typesafe);
-
diff --git a/dependencies2013/win32/swig/Lib/java/enumtypeunsafe.swg b/dependencies2013/win32/swig/Lib/java/enumtypeunsafe.swg
deleted file mode 100644
index 31fb8a79..00000000
--- a/dependencies2013/win32/swig/Lib/java/enumtypeunsafe.swg
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -----------------------------------------------------------------------------
- * enumtypeunsafe.swg
- *
- * Include this file in order for C/C++ enums to be wrapped by integers values.
- * Each enum has an equivalent class named after the enum and the enum items are
- * wrapped by constant integers within this class. The enum items are not
- * typesafe as they are all integers.
- * ----------------------------------------------------------------------------- */
-
-// const enum SWIGTYPE & typemaps
-%typemap(jni) const enum SWIGTYPE & "jint"
-%typemap(jtype) const enum SWIGTYPE & "int"
-%typemap(jstype) const enum SWIGTYPE & "int"
-
-%typemap(in) const enum SWIGTYPE & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-%typemap(out) const enum SWIGTYPE &  %{ $result = (jint)*$1; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
-%{ static $*1_ltype temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-%typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1;"
-%typemap(javadirectorin) const enum SWIGTYPE & "$jniinput"
-%typemap(javadirectorout) const enum SWIGTYPE & "$javacall"
-
-%typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & ""
-
-%typemap(throws) const enum SWIGTYPE &
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) const enum SWIGTYPE & "$javainput"
-%typemap(javaout) const enum SWIGTYPE & {
-    return $jnicall;
-  }
-
-
-// enum SWIGTYPE typemaps
-%typemap(jni) enum SWIGTYPE "jint"
-%typemap(jtype) enum SWIGTYPE "int"
-%typemap(jstype) enum SWIGTYPE "int"
-
-%typemap(in) enum SWIGTYPE  %{ $1 = ($1_ltype)$input; %}
-%typemap(out) enum SWIGTYPE  %{ $result = (jint)$1; %}
-
-%typemap(directorout) enum SWIGTYPE  %{ $result = ($1_ltype)$input; %}
-%typemap(directorin, descriptor="I") enum SWIGTYPE "$input = (jint) $1;"
-%typemap(javadirectorin) enum SWIGTYPE "$jniinput"
-%typemap(javadirectorout) enum SWIGTYPE "$javacall"
-
-%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
-
-%typemap(throws) enum SWIGTYPE
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
-
-%typemap(javain) enum SWIGTYPE "$javainput"
-%typemap(javaout) enum SWIGTYPE {
-    return $jnicall;
-  }
-
-// '$static' will be replaced with either 'static' or nothing depending on whether the enum is an inner Java class or not
-%typemap(javaclassmodifiers) enum SWIGTYPE "public final $static class"
-%typemap(javabase)           enum SWIGTYPE ""
-%typemap(javacode)           enum SWIGTYPE ""
-%typemap(javaimports)        enum SWIGTYPE ""
-%typemap(javainterfaces)     enum SWIGTYPE ""
-%typemap(javabody)           enum SWIGTYPE ""
-
-%javaenum(typeunsafe);
-
diff --git a/dependencies2013/win32/swig/Lib/java/java.swg b/dependencies2013/win32/swig/Lib/java/java.swg
deleted file mode 100644
index d173cb62..00000000
--- a/dependencies2013/win32/swig/Lib/java/java.swg
+++ /dev/null
@@ -1,1379 +0,0 @@
-/* -----------------------------------------------------------------------------
- * java.swg
- *
- * Java typemaps
- * ----------------------------------------------------------------------------- */
-
-%include <javahead.swg>
-
-/* The jni, jtype and jstype typemaps work together and so there should be one of each. 
- * The jni typemap contains the JNI type used in the JNI (C/C++) code. 
- * The jtype typemap contains the Java type used in the JNI intermediary class. 
- * The jstype typemap contains the Java type used in the Java proxy classes, type wrapper classes and module class. */
-
-/* Fragments */
-%fragment("SWIG_PackData", "header") {
-/* Pack binary data into a string */
-SWIGINTERN char * SWIG_PackData(char *c, void *ptr, size_t sz) {
-  static const char hex[17] = "0123456789abcdef";
-  const unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu =  u + sz;
-  for (; u != eu; ++u) {
-    unsigned char uu = *u;
-    *(c++) = hex[(uu & 0xf0) >> 4];
-    *(c++) = hex[uu & 0xf];
-  }
-  return c;
-}
-}
-
-%fragment("SWIG_UnPackData", "header") {
-/* Unpack binary data from a string */
-SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu = u + sz;
-  for (; u != eu; ++u) {
-    char d = *(c++);
-    unsigned char uu;
-    if ((d >= '0') && (d <= '9'))
-      uu = ((d - '0') << 4);
-    else if ((d >= 'a') && (d <= 'f'))
-      uu = ((d - ('a'-10)) << 4);
-    else 
-      return (char *) 0;
-    d = *(c++);
-    if ((d >= '0') && (d <= '9'))
-      uu |= (d - '0');
-    else if ((d >= 'a') && (d <= 'f'))
-      uu |= (d - ('a'-10));
-    else 
-      return (char *) 0;
-    *u = uu;
-  }
-  return c;
-}
-}
-
-/* Primitive types */
-%typemap(jni) bool,               const bool &               "jboolean"
-%typemap(jni) char,               const char &               "jchar"
-%typemap(jni) signed char,        const signed char &        "jbyte"
-%typemap(jni) unsigned char,      const unsigned char &      "jshort"
-%typemap(jni) short,              const short &              "jshort"
-%typemap(jni) unsigned short,     const unsigned short &     "jint"
-%typemap(jni) int,                const int &                "jint"
-%typemap(jni) unsigned int,       const unsigned int &       "jlong"
-%typemap(jni) long,               const long &               "jint"
-%typemap(jni) unsigned long,      const unsigned long &      "jlong"
-%typemap(jni) long long,          const long long &          "jlong"
-%typemap(jni) unsigned long long, const unsigned long long & "jobject"
-%typemap(jni) float,              const float &              "jfloat"
-%typemap(jni) double,             const double &             "jdouble"
-%typemap(jni) void                                           "void"
-
-%typemap(jtype) bool,               const bool &               "boolean"
-%typemap(jtype) char,               const char &               "char"
-%typemap(jtype) signed char,        const signed char &        "byte"
-%typemap(jtype) unsigned char,      const unsigned char &      "short"
-%typemap(jtype) short,              const short &              "short"
-%typemap(jtype) unsigned short,     const unsigned short &     "int"
-%typemap(jtype) int,                const int &                "int"
-%typemap(jtype) unsigned int,       const unsigned int &       "long"
-%typemap(jtype) long,               const long &               "int"
-%typemap(jtype) unsigned long,      const unsigned long &      "long"
-%typemap(jtype) long long,          const long long &          "long"
-%typemap(jtype) unsigned long long, const unsigned long long & "java.math.BigInteger"
-%typemap(jtype) float,              const float &              "float"
-%typemap(jtype) double,             const double &             "double"
-%typemap(jtype) void                                           "void"
-
-%typemap(jstype) bool,               const bool &               "boolean"
-%typemap(jstype) char,               const char &               "char"
-%typemap(jstype) signed char,        const signed char &        "byte"
-%typemap(jstype) unsigned char,      const unsigned char &      "short"
-%typemap(jstype) short,              const short &              "short"
-%typemap(jstype) unsigned short,     const unsigned short &     "int"
-%typemap(jstype) int,                const int &                "int"
-%typemap(jstype) unsigned int,       const unsigned int &       "long"
-%typemap(jstype) long,               const long &               "int"
-%typemap(jstype) unsigned long,      const unsigned long &      "long"
-%typemap(jstype) long long,          const long long &          "long"
-%typemap(jstype) unsigned long long, const unsigned long long & "java.math.BigInteger"
-%typemap(jstype) float,              const float &              "float"
-%typemap(jstype) double,             const double &             "double"
-%typemap(jstype) void                                           "void"
-
-%typemap(jni) char *, char *&, char[ANY], char[]               "jstring"
-%typemap(jtype) char *, char *&, char[ANY], char[]               "String"
-%typemap(jstype) char *, char *&, char[ANY], char[]               "String"
-
-/* JNI types */
-%typemap(jni) jboolean      "jboolean"
-%typemap(jni) jchar         "jchar"
-%typemap(jni) jbyte         "jbyte"
-%typemap(jni) jshort        "jshort"
-%typemap(jni) jint          "jint"
-%typemap(jni) jlong         "jlong"
-%typemap(jni) jfloat        "jfloat"
-%typemap(jni) jdouble       "jdouble"
-%typemap(jni) jstring       "jstring"
-%typemap(jni) jobject       "jobject"
-%typemap(jni) jbooleanArray "jbooleanArray"
-%typemap(jni) jcharArray    "jcharArray"
-%typemap(jni) jbyteArray    "jbyteArray"
-%typemap(jni) jshortArray   "jshortArray"
-%typemap(jni) jintArray     "jintArray"
-%typemap(jni) jlongArray    "jlongArray"
-%typemap(jni) jfloatArray   "jfloatArray"
-%typemap(jni) jdoubleArray  "jdoubleArray"
-%typemap(jni) jobjectArray  "jobjectArray"
-
-%typemap(jtype) jboolean      "boolean"
-%typemap(jtype) jchar         "char"
-%typemap(jtype) jbyte         "byte"
-%typemap(jtype) jshort        "short"
-%typemap(jtype) jint          "int"
-%typemap(jtype) jlong         "long"
-%typemap(jtype) jfloat        "float"
-%typemap(jtype) jdouble       "double"
-%typemap(jtype) jstring       "String"
-%typemap(jtype) jobject       "Object"
-%typemap(jtype) jbooleanArray "boolean[]"
-%typemap(jtype) jcharArray    "char[]"
-%typemap(jtype) jbyteArray    "byte[]"
-%typemap(jtype) jshortArray   "short[]"
-%typemap(jtype) jintArray     "int[]"
-%typemap(jtype) jlongArray    "long[]"
-%typemap(jtype) jfloatArray   "float[]"
-%typemap(jtype) jdoubleArray  "double[]"
-%typemap(jtype) jobjectArray  "Object[]"
-
-%typemap(jstype) jboolean      "boolean"
-%typemap(jstype) jchar         "char"
-%typemap(jstype) jbyte         "byte"
-%typemap(jstype) jshort        "short"
-%typemap(jstype) jint          "int"
-%typemap(jstype) jlong         "long"
-%typemap(jstype) jfloat        "float"
-%typemap(jstype) jdouble       "double"
-%typemap(jstype) jstring       "String"
-%typemap(jstype) jobject       "Object"
-%typemap(jstype) jbooleanArray "boolean[]"
-%typemap(jstype) jcharArray    "char[]"
-%typemap(jstype) jbyteArray    "byte[]"
-%typemap(jstype) jshortArray   "short[]"
-%typemap(jstype) jintArray     "int[]"
-%typemap(jstype) jlongArray    "long[]"
-%typemap(jstype) jfloatArray   "float[]"
-%typemap(jstype) jdoubleArray  "double[]"
-%typemap(jstype) jobjectArray  "Object[]"
-
-/* Non primitive types */
-%typemap(jni) SWIGTYPE "jlong"
-%typemap(jtype) SWIGTYPE "long"
-%typemap(jstype) SWIGTYPE "$&javaclassname"
-
-%typemap(jni) SWIGTYPE [] "jlong"
-%typemap(jtype) SWIGTYPE [] "long"
-%typemap(jstype) SWIGTYPE [] "$javaclassname"
-
-%typemap(jni) SWIGTYPE * "jlong"
-%typemap(jtype) SWIGTYPE * "long"
-%typemap(jstype) SWIGTYPE * "$javaclassname"
-
-%typemap(jni) SWIGTYPE & "jlong"
-%typemap(jtype) SWIGTYPE & "long"
-%typemap(jstype) SWIGTYPE & "$javaclassname"
-
-%typemap(jni) SWIGTYPE && "jlong"
-%typemap(jtype) SWIGTYPE && "long"
-%typemap(jstype) SWIGTYPE && "$javaclassname"
-
-/* pointer to a class member */
-%typemap(jni) SWIGTYPE (CLASS::*) "jstring"
-%typemap(jtype) SWIGTYPE (CLASS::*) "String"
-%typemap(jstype) SWIGTYPE (CLASS::*) "$javaclassname"
-
-/* The following are the in, out, freearg, argout typemaps. These are the JNI code generating typemaps for converting from Java to C and visa versa. */
-
-/* primitive types */
-%typemap(in) bool
-%{ $1 = $input ? true : false; %}
-
-%typemap(directorout) bool
-%{ $result = $input ? true : false; %}
-
-%typemap(javadirectorin) bool "$jniinput"
-%typemap(javadirectorout) bool "$javacall"
-
-%typemap(in) char, 
-             signed char, 
-             unsigned char, 
-             short, 
-             unsigned short, 
-             int, 
-             unsigned int, 
-             long, 
-             unsigned long, 
-             long long, 
-             float, 
-             double
-%{ $1 = ($1_ltype)$input; %}
-
-%typemap(directorout) char, 
-             signed char, 
-             unsigned char, 
-             short, 
-             unsigned short, 
-             int, 
-             unsigned int, 
-             long, 
-             unsigned long, 
-             long long, 
-             float, 
-             double
-%{ $result = ($1_ltype)$input; %}
-
-%typemap(directorin, descriptor="Z") bool             "$input = (jboolean) $1;"
-%typemap(directorin, descriptor="C") char             "$input = (jint) $1;"
-%typemap(directorin, descriptor="B") signed char      "$input = (jbyte) $1;"
-%typemap(directorin, descriptor="S") unsigned char    "$input = (jshort) $1;"
-%typemap(directorin, descriptor="S") short            "$input = (jshort) $1;"
-%typemap(directorin, descriptor="I") unsigned short   "$input = (jint) $1;"
-%typemap(directorin, descriptor="I") int              "$input = (jint) $1;"
-%typemap(directorin, descriptor="J") unsigned int     "$input = (jlong) $1;"
-%typemap(directorin, descriptor="I") long             "$input = (jint) $1;"
-%typemap(directorin, descriptor="J") unsigned long    "$input = (jlong) $1;"
-%typemap(directorin, descriptor="J") long long        "$input = (jlong) $1;"
-%typemap(directorin, descriptor="F") float            "$input = (jfloat) $1;"
-%typemap(directorin, descriptor="D") double           "$input = (jdouble) $1;"
-
-%typemap(javadirectorin) char, 
-                         signed char, 
-                         unsigned char, 
-                         short, 
-                         unsigned short, 
-                         int, 
-                         unsigned int, 
-                         long, 
-                         unsigned long, 
-                         long long, 
-                         float, 
-                         double
-  "$jniinput"
-
-%typemap(javadirectorout) char, 
-                          signed char, 
-                          unsigned char, 
-                          short, 
-                          unsigned short, 
-                          int, 
-                          unsigned int, 
-                          long, 
-                          unsigned long, 
-                          long long, 
-                          float, 
-                          double
-  "$javacall"
-
-%typemap(out) bool           %{ $result = (jboolean)$1; %}
-%typemap(out) char           %{ $result = (jchar)$1; %}
-%typemap(out) signed char    %{ $result = (jbyte)$1; %}
-%typemap(out) unsigned char  %{ $result = (jshort)$1; %}
-%typemap(out) short          %{ $result = (jshort)$1; %}
-%typemap(out) unsigned short %{ $result = (jint)$1; %}
-%typemap(out) int            %{ $result = (jint)$1; %}
-%typemap(out) unsigned int   %{ $result = (jlong)$1; %}
-%typemap(out) long           %{ $result = (jint)$1; %}
-%typemap(out) unsigned long  %{ $result = (jlong)$1; %}
-%typemap(out) long long      %{ $result = (jlong)$1; %}
-%typemap(out) float          %{ $result = (jfloat)$1; %}
-%typemap(out) double         %{ $result = (jdouble)$1; %}
-
-/* unsigned long long */
-/* Convert from BigInteger using the toByteArray member function */
-%typemap(in) unsigned long long { 
-  jclass clazz;
-  jmethodID mid;
-  jbyteArray ba;
-  jbyte* bae;
-  jsize sz;
-  int i;
-
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null");
-    return $null;
-  }
-  clazz = JCALL1(GetObjectClass, jenv, $input);
-  mid = JCALL3(GetMethodID, jenv, clazz, "toByteArray", "()[B");
-  ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid);
-  bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  sz = JCALL1(GetArrayLength, jenv, ba);
-  $1 = 0;
-  if (sz > 0) {
-    $1 = ($1_type)(signed char)bae[0];
-    for(i=1; i<sz; i++) {
-      $1 = ($1 << 8) | ($1_type)(unsigned char)bae[i];
-    }
-  }
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-}
-
-%typemap(directorout) unsigned long long { 
-  jclass clazz;
-  jmethodID mid;
-  jbyteArray ba;
-  jbyte* bae;
-  jsize sz;
-  int i;
-
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null");
-    return $null;
-  }
-  clazz = JCALL1(GetObjectClass, jenv, $input);
-  mid = JCALL3(GetMethodID, jenv, clazz, "toByteArray", "()[B");
-  ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid);
-  bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  sz = JCALL1(GetArrayLength, jenv, ba);
-  $result = 0;
-  if (sz > 0) {
-    $result = ($1_type)(signed char)bae[0];
-    for(i=1; i<sz; i++) {
-      $result = ($result << 8) | ($1_type)(unsigned char)bae[i];
-    }
-  }
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-}
-
-
-/* Convert to BigInteger - byte array holds number in 2's complement big endian format */
-%typemap(out) unsigned long long { 
-  jbyteArray ba = JCALL1(NewByteArray, jenv, 9);
-  jbyte* bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
-  jmethodID mid = JCALL3(GetMethodID, jenv, clazz, "<init>", "([B)V");
-  jobject bigint;
-  int i;
-
-  bae[0] = 0;
-  for(i=1; i<9; i++ ) {
-    bae[i] = (jbyte)($1>>8*(8-i));
-  }
-
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-  bigint = JCALL3(NewObject, jenv, clazz, mid, ba);
-  JCALL1(DeleteLocalRef, jenv, ba);
-  $result = bigint;
-}
-
-/* Convert to BigInteger (see out typemap) */
-%typemap(directorin, descriptor="Ljava/math/BigInteger;", noblock=1) unsigned long long, const unsigned long long & {
-{
-  jbyteArray ba = JCALL1(NewByteArray, jenv, 9);
-  jbyte* bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
-  jmethodID mid = JCALL3(GetMethodID, jenv, clazz, "<init>", "([B)V");
-  jobject bigint;
-  int swig_i;
-
-  bae[0] = 0;
-  for(swig_i=1; swig_i<9; swig_i++ ) {
-    bae[swig_i] = (jbyte)($1>>8*(8-swig_i));
-  }
-
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-  bigint = JCALL3(NewObject, jenv, clazz, mid, ba);
-  JCALL1(DeleteLocalRef, jenv, ba);
-  $input = bigint;
-}
-Swig::LocalRefGuard $1_refguard(jenv, $input); }
-
-%typemap(javadirectorin) unsigned long long "$jniinput"
-%typemap(javadirectorout) unsigned long long "$javacall"
-
-/* char * - treat as String */
-%typemap(in, noblock=1) char * {
- $1 = 0;
-  if ($input) {
-    $1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
-    if (!$1) return $null;
-  }
-}
-
-%typemap(directorout, noblock=1, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) char * {
-  $1 = 0;
-  if ($input) {
-    $result = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
-    if (!$result) return $null;
-  }
-}
-
-%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char * {
-  $input = 0;
-  if ($1) {
-    $input = JCALL1(NewStringUTF, jenv, (const char *)$1);
-    if (!$input) return $null;
-  }
-  Swig::LocalRefGuard $1_refguard(jenv, $input);
-}
-
-%typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); }
-%typemap(out, noblock=1) char * { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); }
-%typemap(javadirectorin) char * "$jniinput"
-%typemap(javadirectorout) char * "$javacall"
-
-/* char *& - treat as String */
-%typemap(in, noblock=1) char *& ($*1_ltype temp = 0) {
- $1 = 0;
-  if ($input) {
-    temp = ($*1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
-    if (!temp) return $null;
-  }
-  $1 = &temp;
-}
-%typemap(freearg, noblock=1) char *& { if ($1 && *$1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)*$1); }
-%typemap(out, noblock=1) char *& { if (*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); }
-
-%typemap(out) void ""
-%typemap(javadirectorin) void "$jniinput"
-%typemap(javadirectorout) void "$javacall"
-%typemap(directorin, descriptor="V") void ""
-
-/* primitive types by reference */
-%typemap(in) const bool & ($*1_ltype temp)
-%{ temp = $input ? true : false; 
-   $1 = &temp; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const bool &
-%{ static $*1_ltype temp;
-   temp = $input ? true : false; 
-   $result = &temp; %}
-
-%typemap(javadirectorin) const bool & "$jniinput"
-%typemap(javadirectorout) const bool & "$javacall"
-
-%typemap(in) const char & ($*1_ltype temp), 
-             const signed char & ($*1_ltype temp), 
-             const unsigned char & ($*1_ltype temp), 
-             const short & ($*1_ltype temp), 
-             const unsigned short & ($*1_ltype temp), 
-             const int & ($*1_ltype temp), 
-             const unsigned int & ($*1_ltype temp), 
-             const long & ($*1_ltype temp), 
-             const unsigned long & ($*1_ltype temp), 
-             const long long & ($*1_ltype temp), 
-             const float & ($*1_ltype temp), 
-             const double & ($*1_ltype temp)
-%{ temp = ($*1_ltype)$input; 
-   $1 = &temp; %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const char &,
-             const signed char &,
-             const unsigned char &,
-             const short &,
-             const unsigned short &,
-             const int &,
-             const unsigned int &,
-             const long &,
-             const unsigned long &,
-             const long long &,
-             const float &,
-             const double &
-%{ static $*1_ltype temp;
-   temp = ($*1_ltype)$input; 
-   $result = &temp; %}
-
-%typemap(directorin, descriptor="Z") const bool &           "$input = (jboolean)$1;"
-%typemap(directorin, descriptor="C") const char &           "$input = (jchar)$1;"
-%typemap(directorin, descriptor="B") const signed char &    "$input = (jbyte)$1;"
-%typemap(directorin, descriptor="S") const unsigned char &  "$input = (jshort)$1;"
-%typemap(directorin, descriptor="S") const short &          "$input = (jshort)$1;"
-%typemap(directorin, descriptor="I") const unsigned short & "$input = (jint)$1;"
-%typemap(directorin, descriptor="I") const int &            "$input = (jint)$1;"
-%typemap(directorin, descriptor="J") const unsigned int &   "$input = (jlong)$1;"
-%typemap(directorin, descriptor="I") const long &           "$input = (jint)$1;"
-%typemap(directorin, descriptor="J") const unsigned long &  "$input = (jlong)$1;"
-%typemap(directorin, descriptor="J") const long long &      "$input = (jlong)$1;"
-%typemap(directorin, descriptor="F") const float &          "$input = (jfloat)$1;"
-%typemap(directorin, descriptor="D") const double &         "$input = (jdouble)$1;"
-
-%typemap(javadirectorin) const char & ($*1_ltype temp), 
-                         const signed char & ($*1_ltype temp), 
-                         const unsigned char & ($*1_ltype temp), 
-                         const short & ($*1_ltype temp), 
-                         const unsigned short & ($*1_ltype temp), 
-                         const int & ($*1_ltype temp), 
-                         const unsigned int & ($*1_ltype temp), 
-                         const long & ($*1_ltype temp), 
-                         const unsigned long & ($*1_ltype temp), 
-                         const long long & ($*1_ltype temp), 
-                         const float & ($*1_ltype temp), 
-                         const double & ($*1_ltype temp)
-  "$jniinput"
-
-%typemap(javadirectorout) const char & ($*1_ltype temp), 
-                          const signed char & ($*1_ltype temp), 
-                          const unsigned char & ($*1_ltype temp), 
-                          const short & ($*1_ltype temp), 
-                          const unsigned short & ($*1_ltype temp), 
-                          const int & ($*1_ltype temp), 
-                          const unsigned int & ($*1_ltype temp), 
-                          const long & ($*1_ltype temp), 
-                          const unsigned long & ($*1_ltype temp), 
-                          const long long & ($*1_ltype temp), 
-                          const float & ($*1_ltype temp), 
-                          const double & ($*1_ltype temp)
-  "$javacall"
-
-
-%typemap(out) const bool &           %{ $result = (jboolean)*$1; %}
-%typemap(out) const char &           %{ $result = (jchar)*$1; %}
-%typemap(out) const signed char &    %{ $result = (jbyte)*$1; %}
-%typemap(out) const unsigned char &  %{ $result = (jshort)*$1; %}
-%typemap(out) const short &          %{ $result = (jshort)*$1; %}
-%typemap(out) const unsigned short & %{ $result = (jint)*$1; %}
-%typemap(out) const int &            %{ $result = (jint)*$1; %}
-%typemap(out) const unsigned int &   %{ $result = (jlong)*$1; %}
-%typemap(out) const long &           %{ $result = (jint)*$1; %}
-%typemap(out) const unsigned long &  %{ $result = (jlong)*$1; %}
-%typemap(out) const long long &      %{ $result = (jlong)*$1; %}
-%typemap(out) const float &          %{ $result = (jfloat)*$1; %}
-%typemap(out) const double &         %{ $result = (jdouble)*$1; %}
-
-/* const unsigned long long & */
-/* Similar to unsigned long long */
-%typemap(in) const unsigned long long & ($*1_ltype temp) { 
-  jclass clazz;
-  jmethodID mid;
-  jbyteArray ba;
-  jbyte* bae;
-  jsize sz;
-  int i;
-
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null");
-    return $null;
-  }
-  clazz = JCALL1(GetObjectClass, jenv, $input);
-  mid = JCALL3(GetMethodID, jenv, clazz, "toByteArray", "()[B");
-  ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid);
-  bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  sz = JCALL1(GetArrayLength, jenv, ba);
-  $1 = &temp;
-  temp = 0;
-  if (sz > 0) {
-    temp = ($*1_ltype)(signed char)bae[0];
-    for(i=1; i<sz; i++) {
-      temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
-    }
-  }
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const unsigned long long & { 
-  static $*1_ltype temp;
-  jclass clazz;
-  jmethodID mid;
-  jbyteArray ba;
-  jbyte* bae;
-  jsize sz;
-  int i;
-
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null");
-    return $null;
-  }
-  clazz = JCALL1(GetObjectClass, jenv, $input);
-  mid = JCALL3(GetMethodID, jenv, clazz, "toByteArray", "()[B");
-  ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid);
-  bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  sz = JCALL1(GetArrayLength, jenv, ba);
-  $result = &temp;
-  temp = 0;
-  if (sz > 0) {
-    temp = ($*1_ltype)(signed char)bae[0];
-    for(i=1; i<sz; i++) {
-      temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
-    }
-  }
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-}
-
-%typemap(out) const unsigned long long & { 
-  jbyteArray ba = JCALL1(NewByteArray, jenv, 9);
-  jbyte* bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
-  jmethodID mid = JCALL3(GetMethodID, jenv, clazz, "<init>", "([B)V");
-  jobject bigint;
-  int i;
-
-  bae[0] = 0;
-  for(i=1; i<9; i++ ) {
-    bae[i] = (jbyte)(*$1>>8*(8-i));
-  }
-
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-  bigint = JCALL3(NewObject, jenv, clazz, mid, ba);
-  JCALL1(DeleteLocalRef, jenv, ba);
-  $result = bigint;
-}
-
-%typemap(javadirectorin) const unsigned long long & "$jniinput"
-%typemap(javadirectorout) const unsigned long long & "$javacall"
-
-/* Default handling. Object passed by value. Convert to a pointer */
-%typemap(in) SWIGTYPE ($&1_type argp)
-%{ argp = *($&1_ltype*)&$input; 
-   if (!argp) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type");
-     return $null;
-   }
-   $1 = *argp; %}
-
-%typemap(directorout) SWIGTYPE ($&1_type argp)
-%{ argp = *($&1_ltype*)&$input; 
-   if (!argp) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Unexpected null return for type $1_type");
-     return $null;
-   }
-   $result = *argp; %}
-
-%typemap(out) SWIGTYPE 
-#ifdef __cplusplus
-%{ *($&1_ltype*)&$result = new $1_ltype((const $1_ltype &)$1); %}
-#else
-{
-  $&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype));
-  memmove($1ptr, &$1, sizeof($1_type));
-  *($&1_ltype*)&$result = $1ptr;
-}
-#endif
-
-%typemap(directorin,descriptor="L$packagepath/$&javaclassname;") SWIGTYPE 
-%{ $input = 0;
-   *(($&1_ltype*)&$input) = new $1_ltype((const $1_ltype &)$1); %}
-%typemap(javadirectorin) SWIGTYPE "new $&javaclassname($jniinput, true)"
-%typemap(javadirectorout) SWIGTYPE "$&javaclassname.getCPtr($javacall)"
-
-/* Generic pointers and references */
-%typemap(in) SWIGTYPE * %{ $1 = *($&1_ltype)&$input; %}
-%typemap(in, fragment="SWIG_UnPackData") SWIGTYPE (CLASS::*) { 
-  const char *temp = 0;
-  if ($input) {
-    temp = JCALL2(GetStringUTFChars, jenv, $input, 0);
-    if (!temp) return $null;
-  }
-  SWIG_UnpackData(temp, (void *)&$1, sizeof($1));
-}
-%typemap(in) SWIGTYPE & %{ $1 = *($&1_ltype)&$input;
-  if (!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    return $null;
-  } %}
-%typemap(in) SWIGTYPE && %{ $1 = *($&1_ltype)&$input;
-  if (!$1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    return $null;
-  } %}
-%typemap(out) SWIGTYPE *
-%{ *($&1_ltype)&$result = $1; %} 
-%typemap(out, fragment="SWIG_PackData", noblock=1) SWIGTYPE (CLASS::*) {
-  char buf[128];
-  char *data = SWIG_PackData(buf, (void *)&$1, sizeof($1));
-  *data = '\0';
-  $result = JCALL1(NewStringUTF, jenv, buf);
-}
-%typemap(out) SWIGTYPE &
-%{ *($&1_ltype)&$result = $1; %} 
-%typemap(out) SWIGTYPE &&
-%{ *($&1_ltype)&$result = $1; %} 
-
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE *
-%{ $result = *($&1_ltype)&$input; %}
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE (CLASS::*)
-%{ $result = *($&1_ltype)&$input; %}
-
-%typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE *
-%{ *(($&1_ltype)&$input) = ($1_ltype) $1; %}
-%typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE (CLASS::*)
-%{ *(($&1_ltype)&$input) = ($1_ltype) $1; %}
-
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE &
-%{ if (!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Unexpected null return for type $1_type");
-     return $null;
-   }
-   $result = *($&1_ltype)&$input; %}
-%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE &&
-%{ if (!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Unexpected null return for type $1_type");
-     return $null;
-   }
-   $result = *($&1_ltype)&$input; %}
-%typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE &
-%{ *($&1_ltype)&$input = ($1_ltype) &$1; %}
-%typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE &&
-%{ *($&1_ltype)&$input = ($1_ltype) &$1; %}
-
-%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*) "($jniinput == 0) ? null : new $javaclassname($jniinput, false)"
-%typemap(javadirectorin) SWIGTYPE & "new $javaclassname($jniinput, false)"
-%typemap(javadirectorin) SWIGTYPE && "new $javaclassname($jniinput, false)"
-%typemap(javadirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, SWIGTYPE && "$javaclassname.getCPtr($javacall)"
-
-/* Default array handling */
-%typemap(in) SWIGTYPE [] %{ $1 = *($&1_ltype)&$input; %}
-%typemap(out) SWIGTYPE [] %{ *($&1_ltype)&$result = $1; %} 
-%typemap(freearg) SWIGTYPE [ANY], SWIGTYPE [] ""
-
-/* char arrays - treat as String */
-%typemap(in, noblock=1) char[ANY], char[] {
-  $1 = 0;
-  if ($input) {
-    $1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
-    if (!$1) return $null;
-  }
-}
-
-%typemap(directorout, noblock=1) char[ANY], char[] {
-  $1 = 0;
-  if ($input) {
-    $result = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
-    if (!$result) return $null;
-  }
-}
-
-%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char[ANY], char[] {
-  $input = 0;
-  if ($1) {
-    $input = JCALL1(NewStringUTF, jenv, (const char *)$1);
-    if (!$input) return $null;
-  }
-  Swig::LocalRefGuard $1_refguard(jenv, $input);
-}
-
-%typemap(argout) char[ANY], char[] ""
-%typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); }
-%typemap(out, noblock=1) char[ANY], char[] { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); }
-%typemap(javadirectorin) char[ANY], char[] "$jniinput"
-%typemap(javadirectorout) char[ANY], char[] "$javacall"
-
-/* JNI types */
-%typemap(in) jboolean,
-             jchar,
-             jbyte,
-             jshort,
-             jint,
-             jlong,
-             jfloat,
-             jdouble,
-             jstring,
-             jobject,
-             jbooleanArray,
-             jcharArray,
-             jbyteArray,
-             jshortArray,
-             jintArray,
-             jlongArray,
-             jfloatArray,
-             jdoubleArray,
-             jobjectArray
-%{ $1 = $input; %}
-
-%typemap(directorout) jboolean,
-             jchar,
-             jbyte,
-             jshort,
-             jint,
-             jlong,
-             jfloat,
-             jdouble,
-             jstring,
-             jobject,
-             jbooleanArray,
-             jcharArray,
-             jbyteArray,
-             jshortArray,
-             jintArray,
-             jlongArray,
-             jfloatArray,
-             jdoubleArray,
-             jobjectArray
-%{ $result = $input; %}
-
-%typemap(out) jboolean,
-              jchar,
-              jbyte,
-              jshort,
-              jint,
-              jlong,
-              jfloat,
-              jdouble,
-              jstring,
-              jobject,
-              jbooleanArray,
-              jcharArray,
-              jbyteArray,
-              jshortArray,
-              jintArray,
-              jlongArray,
-              jfloatArray,
-              jdoubleArray,
-              jobjectArray
-%{ $result = $1; %}
-
-%typemap(directorin,descriptor="Z")  jboolean       "$input = $1;"
-%typemap(directorin,descriptor="C")  jchar          "$input = $1;"
-%typemap(directorin,descriptor="B")  jbyte          "$input = $1;"
-%typemap(directorin,descriptor="S")  jshort         "$input = $1;"
-%typemap(directorin,descriptor="I")  jint           "$input = $1;"
-%typemap(directorin,descriptor="J")  jlong          "$input = $1;"
-%typemap(directorin,descriptor="F")  jfloat         "$input = $1;"
-%typemap(directorin,descriptor="D")  jdouble        "$input = $1;"
-%typemap(directorin,descriptor="Ljava/lang/String;")            jstring        "$input = $1;"
-%typemap(directorin,descriptor="Ljava/lang/Object;",nouse="1")  jobject        "$input = $1;"
-%typemap(directorin,descriptor="[Z")  jbooleanArray "$input = $1;"
-%typemap(directorin,descriptor="[C")  jcharArray    "$input = $1;"
-%typemap(directorin,descriptor="[B")  jbyteArray    "$input = $1;"
-%typemap(directorin,descriptor="[S")  jshortArray   "$input = $1;"
-%typemap(directorin,descriptor="[I")  jintArray     "$input = $1;"
-%typemap(directorin,descriptor="[J")  jlongArray    "$input = $1;"
-%typemap(directorin,descriptor="[F")  jfloatArray   "$input = $1;"
-%typemap(directorin,descriptor="[D")  jdoubleArray  "$input = $1;"
-%typemap(directorin,descriptor="[Ljava/lang/Object;",nouse="1") jobjectArray   "$input = $1;"
-
-%typemap(javadirectorin) jboolean,
-                         jchar,
-                         jbyte,
-                         jshort,
-                         jint,
-                         jlong,
-                         jfloat,
-                         jdouble,
-                         jstring,
-                         jobject,
-                         jbooleanArray,
-                         jcharArray,
-                         jbyteArray,
-                         jshortArray,
-                         jintArray,
-                         jlongArray,
-                         jfloatArray,
-                         jdoubleArray,
-                         jobjectArray
-  "$jniinput"
-
-%typemap(javadirectorout) jboolean,
-                          jchar,
-                          jbyte,
-                          jshort,
-                          jint,
-                          jlong,
-                          jfloat,
-                          jdouble,
-                          jstring,
-                          jobject,
-                          jbooleanArray,
-                          jcharArray,
-                          jbyteArray,
-                          jshortArray,
-                          jintArray,
-                          jlongArray,
-                          jfloatArray,
-                          jdoubleArray,
-                          jobjectArray
-  "$javacall"
-
-/* Typecheck typemaps - The purpose of these is merely to issue a warning for overloaded C++ functions 
- * that cannot be overloaded in Java as more than one C++ type maps to a single Java type */
-
-%typecheck(SWIG_TYPECHECK_BOOL) /* Java boolean */
-    jboolean,
-    bool,
-    const bool &
-    ""
-
-%typecheck(SWIG_TYPECHECK_CHAR) /* Java char */
-    jchar,
-    char, 
-    const char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8) /* Java byte */
-    jbyte,
-    signed char,
-    const signed char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16) /* Java short */
-    jshort,
-    unsigned char, 
-    short, 
-    const unsigned char &, 
-    const short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32) /* Java int */
-    jint,
-    unsigned short, 
-    int, 
-    long, 
-    const unsigned short &, 
-    const int &, 
-    const long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64) /* Java long */
-    jlong,
-    unsigned int, 
-    unsigned long, 
-    long long, 
-    const unsigned int &, 
-    const unsigned long &, 
-    const long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT128) /* Java BigInteger */
-    unsigned long long,
-    const unsigned long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT) /* Java float */
-    jfloat,
-    float,
-    const float &
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE) /* Java double */
-    jdouble,
-    double,
-    const double &
-    ""
-
-%typecheck(SWIG_TYPECHECK_STRING) /* Java String */
-    jstring,
-    char *,
-    char *&,
-    char[ANY],
-    char []
-    ""
-
-%typecheck(SWIG_TYPECHECK_BOOL_ARRAY) /* Java boolean[] */
-    jbooleanArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_CHAR_ARRAY) /* Java char[] */
-    jcharArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8_ARRAY) /* Java byte[] */
-    jbyteArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16_ARRAY) /* Java short[] */
-    jshortArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32_ARRAY) /* Java int[] */
-    jintArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64_ARRAY) /* Java long[] */
-    jlongArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT_ARRAY) /* Java float[] */
-    jfloatArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY) /* Java double[] */
-    jdoubleArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_OBJECT_ARRAY) /* Java jobject[] */
-    jobjectArray
-    ""
-
-%typecheck(SWIG_TYPECHECK_POINTER) /* Default */
-    SWIGTYPE, 
-    SWIGTYPE *, 
-    SWIGTYPE &, 
-    SWIGTYPE &&, 
-    SWIGTYPE *const&, 
-    SWIGTYPE [],
-    SWIGTYPE (CLASS::*)
-    ""
-
-
-/* Exception handling */
-
-%typemap(throws) int, 
-                 long, 
-                 short, 
-                 unsigned int, 
-                 unsigned long, 
-                 unsigned short
-%{ char error_msg[256];
-   sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, error_msg);
-   return $null; %}
-
-%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE *, SWIGTYPE [], SWIGTYPE [ANY]
-%{ (void)$1;
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
-   return $null; %}
-
-%typemap(throws) char *
-%{ SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1);
-   return $null; %}
-
-
-/* Typemaps for code generation in proxy classes and Java type wrapper classes */
-
-/* The javain typemap is used for converting function parameter types from the type 
- * used in the proxy, module or type wrapper class to the type used in the JNI class. */
-%typemap(javain) bool,               const bool &,
-                 char,               const char &,
-                 signed char,        const signed char &,
-                 unsigned char,      const unsigned char &,
-                 short,              const short &,
-                 unsigned short,     const unsigned short &,
-                 int,                const int &,
-                 unsigned int,       const unsigned int &,
-                 long,               const long &,
-                 unsigned long,      const unsigned long &,
-                 long long,          const long long &,
-                 unsigned long long, const unsigned long long &,
-                 float,              const float &,
-                 double,             const double &
-    "$javainput"
-%typemap(javain) char *, char *&, char[ANY], char[] "$javainput"
-%typemap(javain) jboolean,
-                 jchar,
-                 jbyte,
-                 jshort,
-                 jint,
-                 jlong,
-                 jfloat,
-                 jdouble,
-                 jstring,
-                 jobject,
-                 jbooleanArray,
-                 jcharArray,
-                 jbyteArray,
-                 jshortArray,
-                 jintArray,
-                 jlongArray,
-                 jfloatArray,
-                 jdoubleArray,
-                 jobjectArray
-    "$javainput"
-%typemap(javain) SWIGTYPE "$&javaclassname.getCPtr($javainput)"
-%typemap(javain) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] "$javaclassname.getCPtr($javainput)"
-%typemap(javain) SWIGTYPE (CLASS::*) "$javaclassname.getCMemberPtr($javainput)"
-
-/* The javaout typemap is used for converting function return types from the return type
- * used in the JNI class to the type returned by the proxy, module or type wrapper class. */
-%typemap(javaout) bool,               const bool &,
-                  char,               const char &,
-                  signed char,        const signed char &,
-                  unsigned char,      const unsigned char &,
-                  short,              const short &,
-                  unsigned short,     const unsigned short &,
-                  int,                const int &,
-                  unsigned int,       const unsigned int &,
-                  long,               const long &,
-                  unsigned long,      const unsigned long &,
-                  long long,          const long long &,
-                  unsigned long long, const unsigned long long &,
-                  float,              const float &,
-                  double,             const double & {
-    return $jnicall;
-  }
-%typemap(javaout) char *, char *&, char[ANY], char[] {
-    return $jnicall;
-  }
-%typemap(javaout) jboolean,
-                  jchar,
-                  jbyte,
-                  jshort,
-                  jint,
-                  jlong,
-                  jfloat,
-                  jdouble,
-                  jstring,
-                  jobject,
-                  jbooleanArray,
-                  jcharArray,
-                  jbyteArray,
-                  jshortArray,
-                  jintArray,
-                  jlongArray,
-                  jfloatArray,
-                  jdoubleArray,
-                  jobjectArray {
-    return $jnicall;
-  }
-%typemap(javaout) void {
-    $jnicall;
-  }
-%typemap(javaout) SWIGTYPE {
-    return new $&javaclassname($jnicall, true);
-  }
-%typemap(javaout) SWIGTYPE & {
-    return new $javaclassname($jnicall, $owner);
-  }
-%typemap(javaout) SWIGTYPE && {
-    return new $javaclassname($jnicall, $owner);
-  }
-%typemap(javaout) SWIGTYPE *, SWIGTYPE [] {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $javaclassname(cPtr, $owner);
-  }
-%typemap(javaout) SWIGTYPE (CLASS::*) {
-    String cMemberPtr = $jnicall;
-    return (cMemberPtr == null) ? null : new $javaclassname(cMemberPtr, $owner);
-  }
-
-/* Pointer reference typemaps */
-%typemap(jni) SWIGTYPE *const& "jlong"
-%typemap(jtype) SWIGTYPE *const& "long"
-%typemap(jstype) SWIGTYPE *const& "$*javaclassname"
-%typemap(javain) SWIGTYPE *const& "$*javaclassname.getCPtr($javainput)"
-%typemap(javaout) SWIGTYPE *const& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new $*javaclassname(cPtr, $owner);
-  }
-%typemap(in) SWIGTYPE *const& ($*1_ltype temp = 0)
-%{ temp = *($1_ltype)&$input;
-   $1 = ($1_ltype)&temp; %}
-%typemap(out) SWIGTYPE *const&
-%{ *($1_ltype)&$result = *$1; %} 
-
-/* Typemaps used for the generation of proxy and type wrapper class code */
-%typemap(javabase)             SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(javaclassmodifiers)   SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "public class"
-%typemap(javacode)             SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(javaimports)          SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(javainterfaces)       SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-
-/* javabody typemaps */
-
-%define SWIG_JAVABODY_METHODS(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, TYPE...) SWIG_JAVABODY_PROXY(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, TYPE) %enddef // legacy name
-
-%define SWIG_JAVABODY_PROXY(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, TYPE...)
-// Base proxy classes
-%typemap(javabody) TYPE %{
-  private transient long swigCPtr;
-  protected transient boolean swigCMemOwn;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-// Derived proxy classes
-%typemap(javabody_derived) TYPE %{
-  private transient long swigCPtr;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
-    super($imclassname.$javaclazznameSWIGUpcast(cPtr), cMemoryOwn);
-    swigCPtr = cPtr;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-%enddef
-
-%define SWIG_JAVABODY_TYPEWRAPPER(PTRCTOR_VISIBILITY, DEFAULTCTOR_VISIBILITY, CPTR_VISIBILITY, TYPE...)
-// Typewrapper classes
-%typemap(javabody) TYPE *, TYPE &, TYPE &&, TYPE [] %{
-  private transient long swigCPtr;
-
-  PTRCTOR_VISIBILITY $javaclassname(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
-    swigCPtr = cPtr;
-  }
-
-  DEFAULTCTOR_VISIBILITY $javaclassname() {
-    swigCPtr = 0;
-  }
-
-  CPTR_VISIBILITY static long getCPtr($javaclassname obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-%}
-
-%typemap(javabody) TYPE (CLASS::*) %{
-  private transient String swigCMemberPtr;
-
-  PTRCTOR_VISIBILITY $javaclassname(String cMemberPtr, @SuppressWarnings("unused") boolean futureUse) {
-    swigCMemberPtr = cMemberPtr;
-  }
-
-  DEFAULTCTOR_VISIBILITY $javaclassname() {
-    swigCMemberPtr = null;
-  }
-
-  CPTR_VISIBILITY static String getCMemberPtr($javaclassname obj) {
-    return obj.swigCMemberPtr;
-  }
-%}
-%enddef
-
-/* Set the default javabody typemaps to use protected visibility.
-   Use the macros to change to public if using multiple modules. */
-SWIG_JAVABODY_PROXY(protected, protected, SWIGTYPE)
-SWIG_JAVABODY_TYPEWRAPPER(protected, protected, protected, SWIGTYPE)
-
-%typemap(javafinalize) SWIGTYPE %{
-  protected void finalize() {
-    delete();
-  }
-%}
-
-/*
- * Java constructor typemaps:
- *
- * The javaconstruct typemap is inserted when a proxy class's constructor is generated.
- * This typemap allows control over what code is executed in the constructor as
- * well as specifying who owns the underlying C/C++ object. Normally, Java has
- * ownership and the underlying C/C++ object is deallocated when the Java object
- * is finalized (swigCMemOwn is true.) If swigCMemOwn is false, C/C++ is
- * ultimately responsible for deallocating the underlying object's memory.
- *
- * The SWIG_PROXY_CONSTRUCTOR macro defines the javaconstruct typemap for a proxy
- * class for a particular TYPENAME. OWNERSHIP is passed as the value of
- * swigCMemOwn to the pointer constructor method.  WEAKREF determines which kind
- * of Java object reference will be used by the C++ director class (WeakGlobalRef
- * vs. GlobalRef.)
- *
- * The SWIG_DIRECTOR_OWNED macro sets the ownership of director-based proxy
- * classes and the weak reference flag to false, meaning that the underlying C++
- * object will be reclaimed by C++.
- */
-
-%define SWIG_PROXY_CONSTRUCTOR(OWNERSHIP, WEAKREF, TYPENAME...)
-%typemap(javaconstruct,directorconnect="\n    $imclassname.$javaclazznamedirector_connect(this, swigCPtr, swigCMemOwn, WEAKREF);") TYPENAME {
-    this($imcall, OWNERSHIP);$directorconnect
-  }
-%enddef
-
-%define SWIG_DIRECTOR_OWNED(TYPENAME...)
-SWIG_PROXY_CONSTRUCTOR(true, false, TYPENAME)
-%enddef
-
-// Set the default for SWIGTYPE: Java owns the C/C++ object.
-SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
-
-%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $jnicall;
-      }
-      swigCPtr = 0;
-    }
-  }
-
-%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        $jnicall;
-      }
-      swigCPtr = 0;
-    }
-    super.delete();
-  }
-
-%typemap(directordisconnect, methodname="swigDirectorDisconnect") SWIGTYPE %{
-  protected void $methodname() {
-    swigCMemOwn = false;
-    $jnicall;
-  }
-%}
-
-%typemap(directorowner_release, methodname="swigReleaseOwnership") SWIGTYPE %{
-  public void $methodname() {
-    swigCMemOwn = false;
-    $jnicall;
-  }
-%}
-
-%typemap(directorowner_take, methodname="swigTakeOwnership") SWIGTYPE %{
-  public void $methodname() {
-    swigCMemOwn = true;
-    $jnicall;
-  }
-%}
-
-/* Java specific directives */
-#define %javaconst(flag)            %feature("java:const","flag")
-#define %javaconstvalue(value)      %feature("java:constvalue",value)
-#define %javaenum(wrapapproach)     %feature("java:enum","wrapapproach")
-#define %javamethodmodifiers        %feature("java:methodmodifiers")
-#define %javaexception(exceptionclasses) %feature("except",throws=exceptionclasses)
-#define %nojavaexception            %feature("except","0",throws="")
-#define %clearjavaexception         %feature("except","",throws="")
-#define %proxycode                  %insert("proxycode")
-
-%pragma(java) jniclassclassmodifiers="public class"
-%pragma(java) moduleclassmodifiers="public class"
-
-/* Some ANSI C typemaps */
-
-%apply unsigned long { size_t };
-%apply const unsigned long & { const size_t & };
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* String & length */
-%typemap(jni)     (char *STRING, size_t LENGTH) "jbyteArray"
-%typemap(jtype)   (char *STRING, size_t LENGTH) "byte[]"
-%typemap(jstype)  (char *STRING, size_t LENGTH) "byte[]"
-%typemap(javain)  (char *STRING, size_t LENGTH) "$javainput"
-%typemap(freearg) (char *STRING, size_t LENGTH) ""
-%typemap(in)      (char *STRING, size_t LENGTH) {
-  if ($input) {
-    $1 = ($1_ltype) JCALL2(GetByteArrayElements, jenv, $input, 0);
-    $2 = ($2_type) JCALL1(GetArrayLength, jenv, $input);
-  } else {
-    $1 = 0;
-    $2 = 0;
-  }
-}
-%typemap(argout)  (char *STRING, size_t LENGTH) {
-  if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
-}
-%typemap(directorin, descriptor="[B", noblock=1) (char *STRING, size_t LENGTH) {
-  $input = 0;
-  if ($1) {
-    $input = JCALL1(NewByteArray, jenv, (jsize)$2);
-    if (!$input) return $null;
-    JCALL4(SetByteArrayRegion, jenv, $input, 0, (jsize)$2, (jbyte *)$1);
-  }
-  Swig::LocalRefGuard $1_refguard(jenv, $input);
-}
-%typemap(directorargout, noblock=1) (char *STRING, size_t LENGTH)
-{ if ($input && $1) JCALL4(GetByteArrayRegion, jenv, $input, 0, (jsize)$2, (jbyte *)$1); }
-%typemap(javadirectorin, descriptor="[B") (char *STRING, size_t LENGTH) "$jniinput"
-%apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) }
-
-/* java keywords */
-%include <javakw.swg>
-
-// Default enum handling
-%include <enumtypesafe.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/java/javahead.swg b/dependencies2013/win32/swig/Lib/java/javahead.swg
deleted file mode 100644
index 685bba19..00000000
--- a/dependencies2013/win32/swig/Lib/java/javahead.swg
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -----------------------------------------------------------------------------
- * javahead.swg
- *
- * Java support code
- * ----------------------------------------------------------------------------- */
-
-
-/* JNI function calls require different calling conventions for C and C++. These JCALL macros are used so 
- * that the same typemaps can be used for generating code for both C and C++. The SWIG preprocessor can expand
- * the macros thereby generating the correct calling convention. It is thus essential that all typemaps that
- * use the macros are not within %{ %} brackets as they won't be run through the SWIG preprocessor. */
-#ifdef __cplusplus
-#   define JCALL0(func, jenv) jenv->func()
-#   define JCALL1(func, jenv, ar1) jenv->func(ar1)
-#   define JCALL2(func, jenv, ar1, ar2) jenv->func(ar1, ar2)
-#   define JCALL3(func, jenv, ar1, ar2, ar3) jenv->func(ar1, ar2, ar3)
-#   define JCALL4(func, jenv, ar1, ar2, ar3, ar4) jenv->func(ar1, ar2, ar3, ar4)
-#   define JCALL5(func, jenv, ar1, ar2, ar3, ar4, ar5) jenv->func(ar1, ar2, ar3, ar4, ar5)
-#   define JCALL6(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6) jenv->func(ar1, ar2, ar3, ar4, ar5, ar6)
-#   define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) jenv->func(ar1, ar2, ar3, ar4, ar5, ar6, ar7)
-#else
-#   define JCALL0(func, jenv) (*jenv)->func(jenv)
-#   define JCALL1(func, jenv, ar1) (*jenv)->func(jenv, ar1)
-#   define JCALL2(func, jenv, ar1, ar2) (*jenv)->func(jenv, ar1, ar2)
-#   define JCALL3(func, jenv, ar1, ar2, ar3) (*jenv)->func(jenv, ar1, ar2, ar3)
-#   define JCALL4(func, jenv, ar1, ar2, ar3, ar4) (*jenv)->func(jenv, ar1, ar2, ar3, ar4)
-#   define JCALL5(func, jenv, ar1, ar2, ar3, ar4, ar5) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5)
-#   define JCALL6(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6)
-#   define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7)
-#endif
-
-%insert(runtime) %{
-/* Fix for jlong on some versions of gcc on Windows */
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-  typedef long long __int64;
-#endif
-
-/* Fix for jlong on 64-bit x86 Solaris */
-#if defined(__x86_64)
-# ifdef _LP64
-#   undef _LP64
-# endif
-#endif
-
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-%}
-
-%insert(runtime) %{
-/* Support for throwing Java exceptions */
-typedef enum {
-  SWIG_JavaOutOfMemoryError = 1, 
-  SWIG_JavaIOException, 
-  SWIG_JavaRuntimeException, 
-  SWIG_JavaIndexOutOfBoundsException,
-  SWIG_JavaArithmeticException,
-  SWIG_JavaIllegalArgumentException,
-  SWIG_JavaNullPointerException,
-  SWIG_JavaDirectorPureVirtual,
-  SWIG_JavaUnknownError
-} SWIG_JavaExceptionCodes;
-
-typedef struct {
-  SWIG_JavaExceptionCodes code;
-  const char *java_exception;
-} SWIG_JavaExceptions_t;
-%}
-
-%insert(runtime) {
-static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
-  jclass excep;
-  static const SWIG_JavaExceptions_t java_exceptions[] = {
-    { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
-    { SWIG_JavaIOException, "java/io/IOException" },
-    { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
-    { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
-    { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
-    { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
-    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
-    { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
-    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
-  };
-  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
-
-  while (except_ptr->code != code && except_ptr->code)
-    except_ptr++;
-
-  JCALL0(ExceptionClear, jenv);
-  excep = JCALL1(FindClass, jenv, except_ptr->java_exception);
-  if (excep)
-    JCALL2(ThrowNew, jenv, excep, msg);
-}
-}
-
-%insert(runtime) %{
-/* Contract support */
-
-#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
-%}
diff --git a/dependencies2013/win32/swig/Lib/java/javakw.swg b/dependencies2013/win32/swig/Lib/java/javakw.swg
deleted file mode 100644
index 99cd5477..00000000
--- a/dependencies2013/win32/swig/Lib/java/javakw.swg
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef JAVA_JAVAKW_SWG_
-#define JAVA_JAVAKW_SWG_
-
-/* Warnings for Java keywords */
-#define JAVAKW(x) %keywordwarn("'" `x` "' is a java keyword, renaming to '_"`x`"'",rename="_%s")  `x`
-
-/*
-   from
-   http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html 
-*/
-
-JAVAKW(abstract);
-JAVAKW(double);
-JAVAKW(int);
-JAVAKW(strictfp);
-JAVAKW(boolean);
-JAVAKW(else);
-JAVAKW(interface);
-JAVAKW(super);
-JAVAKW(break);
-JAVAKW(extends);	
-JAVAKW(long);	
-JAVAKW(switch);
-JAVAKW(byte);	
-JAVAKW(final);	
-JAVAKW(native);	
-JAVAKW(synchronized);
-JAVAKW(case);	
-JAVAKW(finally);	
-JAVAKW(new);	
-JAVAKW(this);
-JAVAKW(catch);	
-JAVAKW(float);	
-JAVAKW(package);	
-JAVAKW(throw);
-JAVAKW(char);	
-JAVAKW(for);	
-JAVAKW(private);	
-JAVAKW(throws);
-JAVAKW(class);	
-JAVAKW(goto); 	
-JAVAKW(protected);	
-JAVAKW(transient);
-JAVAKW(const); 	
-JAVAKW(if);	
-JAVAKW(public);	
-JAVAKW(try);
-JAVAKW(continue);	
-JAVAKW(implements);	
-JAVAKW(return);	
-JAVAKW(void);
-JAVAKW(default);	
-JAVAKW(import);	
-JAVAKW(short);	
-JAVAKW(volatile);
-JAVAKW(do);	
-JAVAKW(instanceof);	
-JAVAKW(static);	
-JAVAKW(while);
-
-
-/* others bad names */
-
-/* Note here that only *::clone() is bad, and *::clone(int) is ok */
-%namewarn("321:clone() is a java bad method name") *::clone();
-
-
-#undef JAVAKW
-
-#endif //JAVA_JAVAKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/java/std_array.i b/dependencies2013/win32/swig/Lib/java/std_array.i
deleted file mode 100644
index cbacfe67..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_array.i
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_array.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-namespace std {
-
-  template<class T, size_t N> class array {
-  public:
-    typedef T& reference;
-    typedef const T& const_reference;
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef const T* const_pointer;
-    array();
-    array(const array& other);
-    size_type size() const;
-    %rename(isEmpty) empty;
-    bool empty() const;
-    void fill(const T& u);
-    %extend {
-      const_reference get(int i) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          return (*self)[i];
-        else
-          throw std::out_of_range("array index out of range");
-      }
-      void set(int i, const value_type& val) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          (*self)[i] = val;
-        else
-          throw std::out_of_range("array index out of range");
-      }
-    }
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/java/std_auto_ptr.i b/dependencies2013/win32/swig/Lib/java/std_auto_ptr.i
deleted file mode 100644
index 9b3cd731..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_auto_ptr.i
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-    The typemaps here allow to handle functions returning std::auto_ptr<>,
-    which is the most common use of this type. If you have functions taking it
-    as parameter, these typemaps can't be used for them and you need to do
-    something else (e.g. use shared_ptr<> which SWIG supports fully).
- */
-
-%define %auto_ptr(TYPE)
-%typemap (jni) std::auto_ptr<TYPE > "jlong"
-%typemap (jtype) std::auto_ptr<TYPE > "long"
-%typemap (jstype) std::auto_ptr<TYPE > "$typemap(jstype, TYPE)"
-
-%typemap (out) std::auto_ptr<TYPE > %{
-   jlong lpp = 0;
-   *(TYPE**) &lpp = $1.release();
-   $result = lpp;
-%}
-%typemap(javaout) std::auto_ptr<TYPE > {
-     long cPtr = $jnicall;
-     return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-   }
-%template() std::auto_ptr<TYPE >;
-%enddef
-
-namespace std {
-   template <class T> class auto_ptr {};
-} 
diff --git a/dependencies2013/win32/swig/Lib/java/std_common.i b/dependencies2013/win32/swig/Lib/java/std_common.i
deleted file mode 100644
index cee11e8c..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_common.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
diff --git a/dependencies2013/win32/swig/Lib/java/std_deque.i b/dependencies2013/win32/swig/Lib/java/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/java/std_except.i b/dependencies2013/win32/swig/Lib/java/std_except.i
deleted file mode 100644
index 91d2f92c..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_except.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_except.i
- *
- * Typemaps used by the STL wrappers that throw exceptions.
- * These typemaps are used when methods are declared with an STL exception specification, such as
- *   size_t at() const throw (std::out_of_range);
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-namespace std 
-{
-  %ignore exception;
-  struct exception {};
-}
-
-%typemap(throws) std::bad_cast          "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;"
-%typemap(throws) std::bad_exception     "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;"
-%typemap(throws) std::domain_error      "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;"
-%typemap(throws) std::exception         "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;"
-%typemap(throws) std::invalid_argument  "SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, $1.what());\n return $null;"
-%typemap(throws) std::length_error      "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;"
-%typemap(throws) std::logic_error       "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;"
-%typemap(throws) std::out_of_range      "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;"
-%typemap(throws) std::overflow_error    "SWIG_JavaThrowException(jenv, SWIG_JavaArithmeticException, $1.what());\n return $null;"
-%typemap(throws) std::range_error       "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;"
-%typemap(throws) std::runtime_error     "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;"
-%typemap(throws) std::underflow_error   "SWIG_JavaThrowException(jenv, SWIG_JavaArithmeticException, $1.what());\n return $null;"
-
diff --git a/dependencies2013/win32/swig/Lib/java/std_map.i b/dependencies2013/win32/swig/Lib/java/std_map.i
deleted file mode 100644
index e7812f38..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_map.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/java/std_pair.i b/dependencies2013/win32/swig/Lib/java/std_pair.i
deleted file mode 100644
index fe45ee67..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/java/std_shared_ptr.i b/dependencies2013/win32/swig/Lib/java/std_shared_ptr.i
deleted file mode 100644
index df873679..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_shared_ptr.i
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SWIG_SHARED_PTR_NAMESPACE std
-%include <boost_shared_ptr.i>
diff --git a/dependencies2013/win32/swig/Lib/java/std_string.i b/dependencies2013/win32/swig/Lib/java/std_string.i
deleted file mode 100644
index 830a8961..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_string.i
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * Typemaps for std::string and const std::string&
- * These are mapped to a Java String and are passed around by value.
- *
- * To use non-const std::string references use the following %apply.  Note 
- * that they are passed by value.
- * %apply const std::string & {std::string &};
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-%naturalvar string;
-
-class string;
-
-// string
-%typemap(jni) string "jstring"
-%typemap(jtype) string "String"
-%typemap(jstype) string "String"
-%typemap(javadirectorin) string "$jniinput"
-%typemap(javadirectorout) string "$javacall"
-
-%typemap(in) string 
-%{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-     return $null;
-    } 
-    const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
-    if (!$1_pstr) return $null;
-    $1.assign($1_pstr);
-    jenv->ReleaseStringUTFChars($input, $1_pstr); %}
-
-%typemap(directorout) string 
-%{ if(!$input) {
-     if (!jenv->ExceptionCheck()) {
-       SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-     }
-     return $null;
-   } 
-   const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
-   if (!$1_pstr) return $null;
-   $result.assign($1_pstr);
-   jenv->ReleaseStringUTFChars($input, $1_pstr); %}
-
-%typemap(directorin,descriptor="Ljava/lang/String;") string 
-%{ $input = jenv->NewStringUTF($1.c_str());
-   Swig::LocalRefGuard $1_refguard(jenv, $input); %}
-
-%typemap(out) string 
-%{ $result = jenv->NewStringUTF($1.c_str()); %}
-
-%typemap(javain) string "$javainput"
-
-%typemap(javaout) string {
-    return $jnicall;
-  }
-
-%typemap(typecheck) string = char *;
-
-%typemap(throws) string
-%{ SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.c_str());
-   return $null; %}
-
-// const string &
-%typemap(jni) const string & "jstring"
-%typemap(jtype) const string & "String"
-%typemap(jstype) const string & "String"
-%typemap(javadirectorin) const string & "$jniinput"
-%typemap(javadirectorout) const string & "$javacall"
-
-%typemap(in) const string &
-%{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-     return $null;
-   }
-   const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
-   if (!$1_pstr) return $null;
-   $*1_ltype $1_str($1_pstr);
-   $1 = &$1_str;
-   jenv->ReleaseStringUTFChars($input, $1_pstr); %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
-%{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
-     return $null;
-   }
-   const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
-   if (!$1_pstr) return $null;
-   /* possible thread/reentrant code problem */
-   static $*1_ltype $1_str;
-   $1_str = $1_pstr;
-   $result = &$1_str;
-   jenv->ReleaseStringUTFChars($input, $1_pstr); %}
-
-%typemap(directorin,descriptor="Ljava/lang/String;") const string &
-%{ $input = jenv->NewStringUTF($1.c_str());
-   Swig::LocalRefGuard $1_refguard(jenv, $input); %}
-
-%typemap(out) const string & 
-%{ $result = jenv->NewStringUTF($1->c_str()); %}
-
-%typemap(javain) const string & "$javainput"
-
-%typemap(javaout) const string & {
-    return $jnicall;
-  }
-
-%typemap(typecheck) const string & = char *;
-
-%typemap(throws) const string &
-%{ SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.c_str());
-   return $null; %}
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/java/std_vector.i b/dependencies2013/win32/swig/Lib/java/std_vector.i
deleted file mode 100644
index 971b426a..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_vector.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-    
-    template<class T> class vector {
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            const_reference get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-    // bool specialization
-    template<> class vector<bool> {
-      public:
-        typedef size_t size_type;
-        typedef bool value_type;
-        typedef bool const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            bool get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-}
-
-%define specialize_std_vector(T)
-#warning "specialize_std_vector - specialization for type T no longer needed"
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/java/std_wstring.i b/dependencies2013/win32/swig/Lib/java/std_wstring.i
deleted file mode 100644
index dd0b2f5f..00000000
--- a/dependencies2013/win32/swig/Lib/java/std_wstring.i
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_wstring.i
- *
- * Typemaps for std::wstring and const std::wstring&
- *
- * These are mapped to a Java String and are passed around by value.
- * Warning: Unicode / multibyte characters are handled differently on different 
- * OSs so the std::wstring typemaps may not always work as intended.
- *
- * To use non-const std::wstring references use the following %apply.  Note 
- * that they are passed by value.
- * %apply const std::wstring & {std::wstring &};
- * ----------------------------------------------------------------------------- */
-
-namespace std {
-
-%naturalvar wstring;
-
-class wstring;
-
-// wstring
-%typemap(jni) wstring "jstring"
-%typemap(jtype) wstring "String"
-%typemap(jstype) wstring "String"
-%typemap(javadirectorin) wstring "$jniinput"
-%typemap(javadirectorout) wstring "$javacall"
-
-%typemap(in) wstring
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  if ($1_len) {
-    $1.reserve($1_len);
-    for (jsize i = 0; i < $1_len; ++i) {
-      $1.push_back((wchar_t)$1_pstr[i]);
-    }
-  }
-  jenv->ReleaseStringChars($input, $1_pstr);
- %}
-
-%typemap(directorout) wstring
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  if ($1_len) {
-    $result.reserve($1_len);
-    for (jsize i = 0; i < $1_len; ++i) {
-      $result.push_back((wchar_t)$1_pstr[i]);
-    }
-  }
-  jenv->ReleaseStringChars($input, $1_pstr);
- %}
-
-%typemap(directorin,descriptor="Ljava/lang/String;") wstring %{
-  jsize $1_len = $1.length();
-  jchar *$1_conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    $1_conv_buf[i] = (jchar)$1[i];
-  }
-  $input = jenv->NewString($1_conv_buf, $1_len);
-  Swig::LocalRefGuard $1_refguard(jenv, $input);
-  delete [] $1_conv_buf;
-%}
-
-%typemap(out) wstring
-%{jsize $1_len = $1.length();
-  jchar *conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    conv_buf[i] = (jchar)$1[i];
-  }
-  $result = jenv->NewString(conv_buf, $1_len);
-  delete [] conv_buf; %}
-
-%typemap(javain) wstring "$javainput"
-
-%typemap(javaout) wstring {
-    return $jnicall;
-  }
-
-//%typemap(typecheck) wstring = wchar_t *;
-
-%typemap(throws) wstring
-%{ std::string message($1.begin(), $1.end());
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, message.c_str());
-   return $null; %}
-
-// const wstring &
-%typemap(jni) const wstring & "jstring"
-%typemap(jtype) const wstring & "String"
-%typemap(jstype) const wstring & "String"
-%typemap(javadirectorin) const wstring & "$jniinput"
-%typemap(javadirectorout) const wstring & "$javacall"
-
-%typemap(in) const wstring &
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  std::wstring $1_str;
-  if ($1_len) {
-    $1_str.reserve($1_len);
-    for (jsize i = 0; i < $1_len; ++i) {
-      $1_str.push_back((wchar_t)$1_pstr[i]);
-    }
-  }
-  $1 = &$1_str;
-  jenv->ReleaseStringChars($input, $1_pstr);
- %}
-
-%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const wstring & 
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  /* possible thread/reentrant code problem */
-  static std::wstring $1_str;
-  if ($1_len) {
-    $1_str.reserve($1_len);
-    for (jsize i = 0; i < $1_len; ++i) {
-      $1_str.push_back((wchar_t)$1_pstr[i]);
-    }
-  }
-  $result = &$1_str;
-  jenv->ReleaseStringChars($input, $1_pstr); %}
-
-%typemap(directorin,descriptor="Ljava/lang/String;") const wstring & %{
-  jsize $1_len = $1.length();
-  jchar *$1_conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    $1_conv_buf[i] = (jchar)($1)[i];
-  }
-  $input = jenv->NewString($1_conv_buf, $1_len);
-  Swig::LocalRefGuard $1_refguard(jenv, $input);
-  delete [] $1_conv_buf;
-%}
-
-%typemap(out) const wstring & 
-%{jsize $1_len = $1->length();
-  jchar *conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    conv_buf[i] = (jchar)(*$1)[i];
-  }
-  $result = jenv->NewString(conv_buf, $1_len);
-  delete [] conv_buf; %}
-
-%typemap(javain) const wstring & "$javainput"
-
-%typemap(javaout) const wstring & {
-    return $jnicall;
-  }
-
-//%typemap(typecheck) const wstring & = wchar_t *;
-
-%typemap(throws) const wstring &
-%{ std::string message($1.begin(), $1.end());
-   SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, message.c_str());
-   return $null; %}
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/java/stl.i b/dependencies2013/win32/swig/Lib/java/stl.i
deleted file mode 100644
index 04f86014..00000000
--- a/dependencies2013/win32/swig/Lib/java/stl.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/java/swiginterface.i b/dependencies2013/win32/swig/Lib/java/swiginterface.i
deleted file mode 100644
index 33446415..00000000
--- a/dependencies2013/win32/swig/Lib/java/swiginterface.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swiginterface.i
- *
- * SWIG interface feature and typemaps implementation providing:
- *   %interface
- *   %interface_impl
- *   %interface_custom
- * ----------------------------------------------------------------------------- */
-
-%define INTERFACE_TYPEMAPS(CTYPE...)
-%typemap(jtype) CTYPE, CTYPE *, CTYPE *const&, CTYPE [], CTYPE & "long"
-%typemap(jstype) CTYPE "$&javainterfacename"
-%typemap(jstype) CTYPE *, CTYPE [], CTYPE & "$javainterfacename"
-%typemap(jstype) CTYPE *const& "$*javainterfacename"
-%typemap(javain) CTYPE "$javainput.$&interfacename_GetInterfaceCPtr()"
-%typemap(javain) CTYPE & "$javainput.$interfacename_GetInterfaceCPtr()"
-%typemap(javain) CTYPE *, CTYPE [] "($javainput == null) ? 0 : $javainput.$interfacename_GetInterfaceCPtr()"
-%typemap(javain) CTYPE *const& "($javainput == null) ? 0 : $javainput.$*interfacename_GetInterfaceCPtr()"
-%typemap(javaout) CTYPE {
-    return ($&javainterfacename)new $&javaclassname($jnicall, true);
-  }
-%typemap(javaout) CTYPE & {
-    return ($javainterfacename)new $javaclassname($jnicall, $owner);
-  }
-%typemap(javaout) CTYPE *, CTYPE [] {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : ($javainterfacename)new $javaclassname(cPtr, $owner);
-  }
-%typemap(javaout) CTYPE *const& {
-    long cPtr = $jnicall;
-    return (cPtr == 0) ? null : ($javainterfacename)new $javaclassname(cPtr, $owner);
-  }
-
-%typemap(javadirectorin) CTYPE "($&javainterfacename)new $&javaclassname($jniinput, true)"
-%typemap(javadirectorin) CTYPE & "($javainterfacename)new $javaclassname($jniinput, false)"
-%typemap(javadirectorin) CTYPE *, CTYPE [] "($jniinput == 0) ? null : ($javainterfacename)new $javaclassname($jniinput, false)"
-%typemap(javadirectorin) CTYPE *const& "($jniinput == 0) ? null : ($*javainterfacename)new $*javaclassname($jniinput, false)"
-%typemap(javadirectorout) CTYPE "$javacall.$&interfacename_GetInterfaceCPtr()"
-%typemap(javadirectorout) CTYPE *, CTYPE [], CTYPE & "$javacall.$interfacename_GetInterfaceCPtr()"
-%typemap(javadirectorout) CTYPE *const& "$javacall.$*interfacename_GetInterfaceCPtr()"
-%typemap(directorin,descriptor="L$packagepath/$&javainterfacename;") CTYPE
-%{ $input = 0;
-   *(($&1_ltype*)&$input) = new $1_ltype((const $1_ltype &)$1); %}
-%typemap(directorin,descriptor="L$packagepath/$javainterfacename;") CTYPE *, CTYPE []
-%{ *(($&1_ltype)&$input) = ($1_ltype) $1; %}
-%typemap(directorin,descriptor="L$packagepath/$javainterfacename;") CTYPE &
-%{ *($&1_ltype)&$input = ($1_ltype) &$1; %}
-%typemap(directorin,descriptor="L$packagepath/$*javainterfacename;") CTYPE *const&
-%{ *($&1_ltype)&$input = ($1_ltype) &$1; %}
-
-%typemap(javainterfacecode, declaration="  long $interfacename_GetInterfaceCPtr();\n", cptrmethod="$interfacename_GetInterfaceCPtr") CTYPE %{
-  public long $interfacename_GetInterfaceCPtr() {
-    return $imclassname.$javaclazzname$interfacename_GetInterfaceCPtr(swigCPtr);
-  }
-%}
-%enddef
-
-%define %interface(CTYPE...)
-%feature("interface", name="%sSwigInterface") CTYPE;
-INTERFACE_TYPEMAPS(CTYPE)
-%enddef
-
-%define %interface_impl(CTYPE...)
-%rename("%sSwigImpl") CTYPE;
-%feature("interface", name="%(rstrip:[SwigImpl])s") CTYPE;
-INTERFACE_TYPEMAPS(CTYPE)
-%enddef
-
-%define %interface_custom(PROXY, INTERFACE, CTYPE...)
-%rename(PROXY) CTYPE;
-%feature("interface", name=INTERFACE) CTYPE;
-INTERFACE_TYPEMAPS(CTYPE)
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/java/typemaps.i b/dependencies2013/win32/swig/Lib/java/typemaps.i
deleted file mode 100644
index 4170915b..00000000
--- a/dependencies2013/win32/swig/Lib/java/typemaps.i
+++ /dev/null
@@ -1,479 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer and reference handling typemap library
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers and C++ references.
- * ----------------------------------------------------------------------------- */
-
-/*
-INPUT typemaps
---------------
-
-These typemaps remap a C pointer or C++ reference to be an "INPUT" value which is
-passed by value instead of reference.
-
-The following typemaps can be applied to turn a pointer or reference into a simple
-input value.  That is, instead of passing a pointer or reference to an object,
-you would use a real value instead.
-
-        bool               *INPUT, bool               &INPUT
-        signed char        *INPUT, signed char        &INPUT
-        unsigned char      *INPUT, unsigned char      &INPUT
-        short              *INPUT, short              &INPUT
-        unsigned short     *INPUT, unsigned short     &INPUT
-        int                *INPUT, int                &INPUT
-        unsigned int       *INPUT, unsigned int       &INPUT
-        long               *INPUT, long               &INPUT
-        unsigned long      *INPUT, unsigned long      &INPUT
-        long long          *INPUT, long long          &INPUT
-        unsigned long long *INPUT, unsigned long long &INPUT
-        float              *INPUT, float              &INPUT
-        double             *INPUT, double             &INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-In Java you could then use it like this:
-        double answer = modulename.fadd(10.0, 20.0);
-
-There are no char *INPUT typemaps, however you can apply the signed char * typemaps instead:
-        %include <typemaps.i>
-        %apply signed char *INPUT {char *input};
-        void f(char *input);
-*/
-
-%define INPUT_TYPEMAP(TYPE, JNITYPE, JTYPE, JNIDESC)
-%typemap(jni) TYPE *INPUT, TYPE &INPUT "JNITYPE"
-%typemap(jtype) TYPE *INPUT, TYPE &INPUT "JTYPE"
-%typemap(jstype) TYPE *INPUT, TYPE &INPUT "JTYPE"
-%typemap(javain) TYPE *INPUT, TYPE &INPUT "$javainput"
-
-%typemap(in) TYPE *INPUT, TYPE &INPUT
-%{ $1 = ($1_ltype)&$input; %}
-
-%typemap(freearg) TYPE *INPUT, TYPE &INPUT ""
-
-%typemap(typecheck) TYPE *INPUT = TYPE;
-%typemap(typecheck) TYPE &INPUT = TYPE;
-%enddef
-
-INPUT_TYPEMAP(bool, jboolean, boolean, "Z");
-INPUT_TYPEMAP(signed char, jbyte, byte, "B");
-INPUT_TYPEMAP(unsigned char, jshort, short, "S");
-INPUT_TYPEMAP(short, jshort, short, "S");
-INPUT_TYPEMAP(unsigned short, jint, int, "I");
-INPUT_TYPEMAP(int, jint, int, "I");
-INPUT_TYPEMAP(unsigned int, jlong, long, "J");
-INPUT_TYPEMAP(long, jint, int, "I");
-INPUT_TYPEMAP(unsigned long, jlong, long, "J");
-INPUT_TYPEMAP(long long, jlong, long, "J");
-INPUT_TYPEMAP(unsigned long long, jobject, java.math.BigInteger, "Ljava/math/BigInteger;");
-INPUT_TYPEMAP(float, jfloat, float, "F");
-INPUT_TYPEMAP(double, jdouble, double, "D");
-
-#undef INPUT_TYPEMAP
-
-/* Convert from BigInteger using the toByteArray member function */
-/* Overrides the typemap in the INPUT_TYPEMAP macro */
-%typemap(in) unsigned long long *INPUT($*1_ltype temp), unsigned long long &INPUT($*1_ltype temp) {
-  jclass clazz;
-  jmethodID mid;
-  jbyteArray ba;
-  jbyte* bae;
-  jsize sz;
-  int i;
-
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null");
-    return $null;
-  }
-  clazz = JCALL1(GetObjectClass, jenv, $input);
-  mid = JCALL3(GetMethodID, jenv, clazz, "toByteArray", "()[B");
-  ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, $input, mid);
-  bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  sz = JCALL1(GetArrayLength, jenv, ba);
-  temp = 0;
-  if (sz > 0) {
-    temp = ($*1_ltype)(signed char)bae[0];
-    for(i=1; i<sz; i++) {
-      temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
-    }
-  }
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-  $1 = &temp;
-}
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   An array replaces the c pointer or reference parameter. 
-// The output value is returned in this array passed in. 
-
-/*
-OUTPUT typemaps
----------------
-
-The following typemaps can be applied to turn a pointer or reference into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  This works by a 
-Java array being passed as a parameter where a c pointer or reference is required. 
-As with any Java function, the array is passed by reference so that 
-any modifications to the array will be picked up in the calling function.
-Note that the array passed in MUST have at least one element, but as the 
-c function does not require any input, the value can be set to anything.
-
-        bool               *OUTPUT, bool               &OUTPUT
-        signed char        *OUTPUT, signed char        &OUTPUT
-        unsigned char      *OUTPUT, unsigned char      &OUTPUT
-        short              *OUTPUT, short              &OUTPUT
-        unsigned short     *OUTPUT, unsigned short     &OUTPUT
-        int                *OUTPUT, int                &OUTPUT
-        unsigned int       *OUTPUT, unsigned int       &OUTPUT
-        long               *OUTPUT, long               &OUTPUT
-        unsigned long      *OUTPUT, unsigned long      &OUTPUT
-        long long          *OUTPUT, long long          &OUTPUT
-        unsigned long long *OUTPUT, unsigned long long &OUTPUT
-        float              *OUTPUT, float              &OUTPUT
-        double             *OUTPUT, double             &OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters):
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Java output of the function would be the function return value and the 
-value in the single element array. In Java you would use it like this:
-
-    double[] ptr = {0.0};
-    double fraction = modulename.modf(5.0,ptr);
-
-There are no char *OUTPUT typemaps, however you can apply the signed char * typemaps instead:
-        %include <typemaps.i>
-        %apply signed char *OUTPUT {char *output};
-        void f(char *output);
-*/
-
-/* Java BigInteger[] */
-%typecheck(SWIG_TYPECHECK_INT128_ARRAY) SWIGBIGINTEGERARRAY ""
-
-%define OUTPUT_TYPEMAP(TYPE, JNITYPE, JTYPE, JAVATYPE, JNIDESC, TYPECHECKTYPE)
-%typemap(jni) TYPE *OUTPUT, TYPE &OUTPUT %{JNITYPE##Array%}
-%typemap(jtype) TYPE *OUTPUT, TYPE &OUTPUT "JTYPE[]"
-%typemap(jstype) TYPE *OUTPUT, TYPE &OUTPUT "JTYPE[]"
-%typemap(javain) TYPE *OUTPUT, TYPE &OUTPUT "$javainput"
-%typemap(javadirectorin) TYPE *OUTPUT, TYPE &OUTPUT "$jniinput"
-%typemap(javadirectorout) TYPE *OUTPUT, TYPE &OUTPUT "$javacall"
-
-%typemap(in) TYPE *OUTPUT($*1_ltype temp), TYPE &OUTPUT($*1_ltype temp)
-{
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-    return $null;
-  }
-  if (JCALL1(GetArrayLength, jenv, $input) == 0) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-    return $null;
-  }
-  temp = ($*1_ltype)0;
-  $1 = &temp; 
-}
-
-%typemap(freearg) TYPE *OUTPUT, TYPE &OUTPUT ""
-
-%typemap(argout) TYPE *OUTPUT, TYPE &OUTPUT
-{
-  JNITYPE jvalue = (JNITYPE)temp$argnum;
-  JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &jvalue);
-}
-
-%typemap(directorin,descriptor=JNIDESC) TYPE &OUTPUT, TYPE *OUTPUT %{
-  $input = JCALL1(New##JAVATYPE##Array, jenv, 1);
-  Swig::LocalRefGuard $1_refguard(jenv, $input); %}
-
-%typemap(directorargout, noblock=1) TYPE &OUTPUT
-{
-  JNITYPE $1_jvalue;
-  JCALL4(Get##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue);
-  $result = $1_jvalue;
-}
-
-%typemap(directorargout, noblock=1) TYPE *OUTPUT
-{
-  JNITYPE $1_jvalue;
-  JCALL4(Get##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue);
-  *$result = $1_jvalue;
-}
-
-%typemap(typecheck) TYPE *OUTPUT = TYPECHECKTYPE;
-%typemap(typecheck) TYPE &OUTPUT = TYPECHECKTYPE;
-%enddef
-
-OUTPUT_TYPEMAP(bool, jboolean, boolean, Boolean, "[Z", jbooleanArray);
-OUTPUT_TYPEMAP(signed char, jbyte, byte, Byte, "[B", jbyteArray);
-OUTPUT_TYPEMAP(unsigned char, jshort, short, Short, "[S", jshortArray);
-OUTPUT_TYPEMAP(short, jshort, short, Short, "[S", jshortArray);
-OUTPUT_TYPEMAP(unsigned short, jint, int, Int, "[I", jintArray);
-OUTPUT_TYPEMAP(int, jint, int, Int, "[I", jintArray);
-OUTPUT_TYPEMAP(unsigned int, jlong, long, Long, "[J", jlongArray);
-OUTPUT_TYPEMAP(long, jint, int, Int, "[I", jintArray);
-OUTPUT_TYPEMAP(unsigned long, jlong, long, Long, "[J", jlongArray);
-OUTPUT_TYPEMAP(long long, jlong, long, Long, "[J", jlongArray);
-OUTPUT_TYPEMAP(unsigned long long, jobject, java.math.BigInteger, Object, "[Ljava/math/BigInteger;", jobjectArray);
-OUTPUT_TYPEMAP(float, jfloat, float, Float, "[F", jfloatArray);
-OUTPUT_TYPEMAP(double, jdouble, double, Double, "[D", jdoubleArray);
-
-#undef OUTPUT_TYPEMAP
-
-%typemap(in) bool *OUTPUT($*1_ltype temp), bool &OUTPUT($*1_ltype temp)
-{
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-    return $null;
-  }
-  if (JCALL1(GetArrayLength, jenv, $input) == 0) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-    return $null;
-  }
-  temp = false;
-  $1 = &temp; 
-}
-
-/* Convert to BigInteger - byte array holds number in 2's complement big endian format */
-/* Use first element in BigInteger array for output */
-/* Overrides the typemap in the OUTPUT_TYPEMAP macro */
-%typemap(argout) unsigned long long *OUTPUT, unsigned long long &OUTPUT { 
-  jbyteArray ba = JCALL1(NewByteArray, jenv, 9);
-  jbyte* bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
-  jmethodID mid = JCALL3(GetMethodID, jenv, clazz, "<init>", "([B)V");
-  jobject bigint;
-  int i;
-
-  bae[0] = 0;
-  for(i=1; i<9; i++ ) {
-    bae[i] = (jbyte)(temp$argnum>>8*(8-i));
-  }
-
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-  bigint = JCALL3(NewObject, jenv, clazz, mid, ba);
-  JCALL1(DeleteLocalRef, jenv, ba);
-  JCALL3(SetObjectArrayElement, jenv, $input, 0, bigint);
-}
-
-/*
-INOUT typemaps
---------------
-
-Mappings for a parameter that is both an input and an output parameter
-
-The following typemaps can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" typemaps described earlier.  Output values are
-returned as an element in a Java array.
-
-        bool               *INOUT, bool               &INOUT
-        signed char        *INOUT, signed char        &INOUT
-        unsigned char      *INOUT, unsigned char      &INOUT
-        short              *INOUT, short              &INOUT
-        unsigned short     *INOUT, unsigned short     &INOUT
-        int                *INOUT, int                &INOUT
-        unsigned int       *INOUT, unsigned int       &INOUT
-        long               *INOUT, long               &INOUT
-        unsigned long      *INOUT, unsigned long      &INOUT
-        long long          *INOUT, long long          &INOUT
-        unsigned long long *INOUT, unsigned long long &INOUT
-        float              *INOUT, float              &INOUT
-        double             *INOUT, double             &INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-This works similarly to C in that the mapping directly modifies the
-input value - the input must be an array with a minimum of one element. 
-The element in the array is the input and the output is the element in 
-the array.
-
-       double x[] = {5.0};
-       neg(x);
-
-The implementation of the OUTPUT and INOUT typemaps is different to other 
-languages in that other languages will return the output value as part 
-of the function return value. This difference is due to Java being a typed language.
-
-There are no char *INOUT typemaps, however you can apply the signed char * typemaps instead:
-        %include <typemaps.i>
-        %apply signed char *INOUT {char *inout};
-        void f(char *inout);
-*/
-
-%define INOUT_TYPEMAP(TYPE, JNITYPE, JTYPE, JAVATYPE, JNIDESC, TYPECHECKTYPE)
-%typemap(jni) TYPE *INOUT, TYPE &INOUT %{JNITYPE##Array%}
-%typemap(jtype) TYPE *INOUT, TYPE &INOUT "JTYPE[]"
-%typemap(jstype) TYPE *INOUT, TYPE &INOUT "JTYPE[]"
-%typemap(javain) TYPE *INOUT, TYPE &INOUT "$javainput"
-%typemap(javadirectorin) TYPE *INOUT, TYPE &INOUT "$jniinput"
-%typemap(javadirectorout) TYPE *INOUT, TYPE &INOUT "$javacall"
-
-%typemap(in) TYPE *INOUT, TYPE &INOUT {
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-    return $null;
-  }
-  if (JCALL1(GetArrayLength, jenv, $input) == 0) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-    return $null;
-  }
-  $1 = ($1_ltype) JCALL2(Get##JAVATYPE##ArrayElements, jenv, $input, 0); 
-}
-
-%typemap(freearg) TYPE *INOUT, TYPE &INOUT ""
-
-%typemap(argout) TYPE *INOUT, TYPE &INOUT
-{ JCALL3(Release##JAVATYPE##ArrayElements, jenv, $input, (JNITYPE *)$1, 0); }
-
-%typemap(directorin,descriptor=JNIDESC) TYPE &INOUT %{
-  $input = JCALL1(New##JAVATYPE##Array, jenv, 1);
-  JNITYPE $1_jvalue = (JNITYPE)$1;
-  JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue);
-  Swig::LocalRefGuard $1_refguard(jenv, $input); %}
-
-%typemap(directorin,descriptor=JNIDESC) TYPE *INOUT %{
-  $input = JCALL1(New##JAVATYPE##Array, jenv, 1);
-  JNITYPE $1_jvalue = (JNITYPE)*$1;
-  JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue);
-  Swig::LocalRefGuard $1_refguard(jenv, $input); %}
-
-%typemap(directorargout, noblock=1) TYPE &INOUT
-{
-  JCALL4(Get##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue);
-  $result = $1_jvalue;
-}
-
-%typemap(directorargout, noblock=1) TYPE *INOUT
-{
-  JCALL4(Get##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue);
-  *$result = $1_jvalue;
-}
-
-%typemap(typecheck) TYPE *INOUT = TYPECHECKTYPE;
-%typemap(typecheck) TYPE &INOUT = TYPECHECKTYPE;
-%enddef
-
-INOUT_TYPEMAP(bool, jboolean, boolean, Boolean, "[Z", jbooleanArray);
-INOUT_TYPEMAP(signed char, jbyte, byte, Byte, "[B", jbyteArray);
-INOUT_TYPEMAP(unsigned char, jshort, short, Short, "[S", jshortArray);
-INOUT_TYPEMAP(short, jshort, short, Short, "[S", jshortArray);
-INOUT_TYPEMAP(unsigned short, jint, int, Int, "[I", jintArray);
-INOUT_TYPEMAP(int, jint, int, Int, "[I", jintArray);
-INOUT_TYPEMAP(unsigned int, jlong, long, Long, "[J", jlongArray);
-INOUT_TYPEMAP(long, jint, int, Int, "[I", jintArray);
-INOUT_TYPEMAP(unsigned long, jlong, long, Long, "[J", jlongArray);
-INOUT_TYPEMAP(long long, jlong, long, Long, "[J", jlongArray);
-INOUT_TYPEMAP(unsigned long long, jobject, java.math.BigInteger, Object, "[java/math/BigInteger;", jobjectArray);
-INOUT_TYPEMAP(float, jfloat, float, Float, "[F", jfloatArray);
-INOUT_TYPEMAP(double, jdouble, double, Double, "[D", jdoubleArray);
-
-#undef INOUT_TYPEMAP
-
-/* Override typemaps in the INOUT_TYPEMAP macro for booleans to fix casts
-   as a jboolean isn't always the same size as a bool */
-%typemap(in) bool *INOUT (bool btemp, jboolean *jbtemp), bool &INOUT (bool btemp, jboolean *jbtemp) {
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-    return $null;
-  }
-  if (JCALL1(GetArrayLength, jenv, $input) == 0) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-    return $null;
-  }
-  jbtemp = JCALL2(GetBooleanArrayElements, jenv, $input, 0);
-  btemp = (*jbtemp) ? true : false;
-  $1 = &btemp;
-}
-
-%typemap(argout) bool *INOUT, bool &INOUT {
-  *jbtemp$argnum = btemp$argnum ? (jboolean)1 : (jboolean)0;
-  JCALL3(ReleaseBooleanArrayElements, jenv, $input , (jboolean *)jbtemp$argnum, 0);
-}
-
-/* Override the typemap in the INOUT_TYPEMAP macro for unsigned long long */
-%typemap(in) unsigned long long *INOUT ($*1_ltype temp), unsigned long long &INOUT ($*1_ltype temp) { 
-  jobject bigint;
-  jclass clazz;
-  jmethodID mid;
-  jbyteArray ba;
-  jbyte* bae;
-  jsize sz;
-  int i;
-
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-    return $null;
-  }
-  if (JCALL1(GetArrayLength, jenv, $input) == 0) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-    return $null;
-  }
-  bigint = JCALL2(GetObjectArrayElement, jenv, $input, 0);
-  if (!bigint) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array element null");
-    return $null;
-  }
-  clazz = JCALL1(GetObjectClass, jenv, bigint);
-  mid = JCALL3(GetMethodID, jenv, clazz, "toByteArray", "()[B");
-  ba = (jbyteArray)JCALL2(CallObjectMethod, jenv, bigint, mid);
-  bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
-  sz = JCALL1(GetArrayLength, jenv, ba);
-  temp = 0;
-  if (sz > 0) {
-    temp = ($*1_ltype)(signed char)bae[0];
-    for(i=1; i<sz; i++) {
-      temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
-    }
-  }
-  JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
-  $1 = &temp;
-}
-
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long &OUTPUT;
diff --git a/dependencies2013/win32/swig/Lib/java/various.i b/dependencies2013/win32/swig/Lib/java/various.i
deleted file mode 100644
index 76fb2b12..00000000
--- a/dependencies2013/win32/swig/Lib/java/various.i
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -----------------------------------------------------------------------------
- * various.i
- *
- * SWIG Typemap library for Java.
- * Various useful typemaps.
- * ----------------------------------------------------------------------------- */
-
-/* 
- * char **STRING_ARRAY typemaps. 
- * These typemaps are for C String arrays which are NULL terminated.
- *   char *values[] = { "one", "two", "three", NULL }; // note NULL
- * char ** is mapped to a Java String[].
- *
- * Example usage wrapping:
- *   %apply char **STRING_ARRAY { char **input };
- *   char ** foo(char **input);
- *  
- * Java usage:
- *   String numbers[] = { "one", "two", "three" };
- *   String[] ret = modulename.foo( numbers };
- */
-%typemap(jni) char **STRING_ARRAY "jobjectArray"
-%typemap(jtype) char **STRING_ARRAY "String[]"
-%typemap(jstype) char **STRING_ARRAY "String[]"
-%typemap(in) char **STRING_ARRAY (jint size) {
-  int i = 0;
-  if ($input) {
-    size = JCALL1(GetArrayLength, jenv, $input);
-#ifdef __cplusplus
-    $1 = new char*[size+1];
-#else
-    $1 = (char **)malloc((size+1) * sizeof(char *));
-#endif
-    for (i = 0; i<size; i++) {
-      jstring j_string = (jstring)JCALL2(GetObjectArrayElement, jenv, $input, i);
-      const char *c_string = JCALL2(GetStringUTFChars, jenv, j_string, 0);
-#ifdef __cplusplus
-      $1[i] = new char [strlen(c_string)+1];
-#else
-      $1[i] = (char *)malloc((strlen(c_string)+1) * sizeof(const char *));
-#endif
-      strcpy($1[i], c_string);
-      JCALL2(ReleaseStringUTFChars, jenv, j_string, c_string);
-      JCALL1(DeleteLocalRef, jenv, j_string);
-    }
-    $1[i] = 0;
-  } else {
-    $1 = 0;
-    size = 0;
-  }
-}
-
-%typemap(freearg) char **STRING_ARRAY {
-  int i;
-  for (i=0; i<size$argnum; i++)
-#ifdef __cplusplus
-    delete[] $1[i];
-  delete[] $1;
-#else
-  free($1[i]);
-  free($1);
-#endif
-}
-
-%typemap(out) char **STRING_ARRAY {
-  if ($1) {
-    int i;
-    jsize len=0;
-    jstring temp_string;
-    const jclass clazz = JCALL1(FindClass, jenv, "java/lang/String");
-
-    while ($1[len]) len++;
-    $result = JCALL3(NewObjectArray, jenv, len, clazz, NULL);
-    /* exception checking omitted */
-
-    for (i=0; i<len; i++) {
-      temp_string = JCALL1(NewStringUTF, jenv, *$1++);
-      JCALL3(SetObjectArrayElement, jenv, $result, i, temp_string);
-      JCALL1(DeleteLocalRef, jenv, temp_string);
-    }
-  }
-}
-
-%typemap(javain) char **STRING_ARRAY "$javainput"
-%typemap(javaout) char **STRING_ARRAY {
-    return $jnicall;
-  }
-
-/* 
- * char **STRING_OUT typemaps. 
- * These are typemaps for returning strings when using a C char ** parameter type.
- * The returned string appears in the 1st element of the passed in Java String array.
- *
- * Example usage wrapping:
- *   %apply char **STRING_OUT { char **string_out };
- *   void foo(char **string_out);
- *  
- * Java usage:
- *   String stringOutArray[] = { "" };
- *   modulename.foo(stringOutArray);
- *   System.out.println( stringOutArray[0] );
- */
-%typemap(jni) char **STRING_OUT "jobjectArray"
-%typemap(jtype) char **STRING_OUT "String[]"
-%typemap(jstype) char **STRING_OUT "String[]"
-%typemap(javain) char **STRING_OUT "$javainput"
-
-%typemap(in) char **STRING_OUT($*1_ltype temp) {
-  if (!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-    return $null;
-  }
-  if (JCALL1(GetArrayLength, jenv, $input) == 0) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-    return $null;
-  }
-  $1 = &temp; 
-  *$1 = 0;
-}
-
-%typemap(argout) char **STRING_OUT {
-  jstring jnewstring = NULL;
-  if ($1) {
-     jnewstring = JCALL1(NewStringUTF, jenv, *$1);
-  }
-  JCALL3(SetObjectArrayElement, jenv, $input, 0, jnewstring); 
-}
-
-/* 
- * char *BYTE typemaps. 
- * These are input typemaps for mapping a Java byte[] array to a C char array.
- * Note that as a Java array is used and thus passeed by reference, the C routine 
- * can return data to Java via the parameter.
- *
- * Example usage wrapping:
- *   void foo(char *array);
- *  
- * Java usage:
- *   byte b[] = new byte[20];
- *   modulename.foo(b);
- */
-%typemap(jni) char *BYTE "jbyteArray"
-%typemap(jtype) char *BYTE "byte[]"
-%typemap(jstype) char *BYTE "byte[]"
-%typemap(in) char *BYTE {
-  $1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0); 
-}
-
-%typemap(argout) char *BYTE {
-  JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0); 
-}
-
-%typemap(javain) char *BYTE "$javainput"
-
-/* Prevent default freearg typemap from being used */
-%typemap(freearg) char *BYTE ""
-
-/* 
- * unsigned char *NIOBUFFER typemaps. 
- * This is for mapping Java nio buffers to C char arrays.
- * It is useful for performance critical code as it reduces the memory copy an marshaling overhead.
- * Note: The Java buffer has to be allocated with allocateDirect.
- *
- * Example usage wrapping:
- *   %apply unsigned char *NIOBUFFER { unsigned char *buf };
- *   void foo(unsigned char *buf);
- *  
- * Java usage:
- *   java.nio.ByteBuffer b = ByteBuffer.allocateDirect(20); 
- *   modulename.foo(b);
- */
-%typemap(jni) unsigned char *NIOBUFFER "jobject"  
-%typemap(jtype) unsigned char *NIOBUFFER "java.nio.ByteBuffer"  
-%typemap(jstype) unsigned char *NIOBUFFER "java.nio.ByteBuffer"  
-%typemap(javain,
-  pre="  assert $javainput.isDirect() : \"Buffer must be allocated direct.\";") unsigned char *NIOBUFFER "$javainput"
-%typemap(javaout) unsigned char *NIOBUFFER {  
-  return $jnicall;  
-}  
-%typemap(in) unsigned char *NIOBUFFER {  
-  $1 = (unsigned char *) JCALL1(GetDirectBufferAddress, jenv, $input); 
-  if ($1 == NULL) {  
-    SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unable to get address of a java.nio.ByteBuffer direct byte buffer. Buffer must be a direct buffer and not a non-direct buffer.");  
-  }  
-}  
-%typemap(memberin) unsigned char *NIOBUFFER {  
-  if ($input) {  
-    $1 = $input;  
-  } else {  
-    $1 = 0;  
-  }  
-}  
-%typemap(freearg) unsigned char *NIOBUFFER ""  
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/arrays_javascript.i b/dependencies2013/win32/swig/Lib/javascript/jsc/arrays_javascript.i
deleted file mode 100644
index b9199d86..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/arrays_javascript.i
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -----------------------------------------------------------------------------
- * arrays_javascript.i
- *
- * These typemaps give more natural support for arrays. The typemaps are not efficient
- * as there is a lot of copying of the array values whenever the array is passed to C/C++
- * from JavaScript and vice versa. The JavaScript array is expected to be the same size as the C array.
- * An exception is thrown if they are not.
- *
- * Example usage:
- * Wrapping:
- *
- *   %include <arrays_javascript.i>
- *   %inline %{
- *       extern int FiddleSticks[3];
- *   %}
- *
- * Use from JavaScript like this:
- *
- *   var fs = [10, 11, 12];
- *   example.FiddleSticks = fs;
- *   fs = example.FiddleSticks;
- * ----------------------------------------------------------------------------- */
-
-%fragment("SWIG_JSCGetIntProperty",    "header", fragment=SWIG_AsVal_frag(int)) {}
-%fragment("SWIG_JSCGetNumberProperty", "header", fragment=SWIG_AsVal_frag(double)) {}
-
-%typemap(in, fragment="SWIG_JSCGetIntProperty") int[], int[ANY]
-    (int length = 0, JSObjectRef array, JSValueRef jsvalue, int i = 0, int res = 0, $*1_ltype temp) {
-  if (JSValueIsObject(context, $input))
-  {
-    // Convert into Array
-    array = JSValueToObject(context, $input, NULL);
-
-    length = $1_dim0;
-
-    $1  = ($*1_ltype *)malloc(sizeof($*1_ltype) * length);
-
-    // Get each element from array
-    for (i = 0; i < length; i++)
-    {
-      jsvalue = JSObjectGetPropertyAtIndex(context, array, i, NULL);
-
-      // Get primitive value from JSObject
-      res = SWIG_AsVal(int)(jsvalue, &temp);
-      if (!SWIG_IsOK(res))
-      {
-        SWIG_exception_fail(SWIG_ERROR, "Failed to convert $input to double");
-      }
-      arg$argnum[i] = temp;
-    }
-
-  }
-  else
-  {
-    SWIG_exception_fail(SWIG_ERROR, "$input is not JSObjectRef");
-  }
-}
-
-%typemap(freearg) int[], int[ANY] {
-    free($1);
-}
-
-%typemap(out, fragment=SWIG_From_frag(int)) int[], int[ANY] (int length = 0, int i = 0)
-{
-  length = $1_dim0;
-  JSValueRef values[length];
-
-  for (i = 0; i < length; i++)
-  {
-    values[i] = SWIG_From(int)($1[i]);
-  }
-
-  $result = JSObjectMakeArray(context, length, values, NULL);
-}
-
-%typemap(in, fragment="SWIG_JSCGetNumberProperty") double[], double[ANY]
-    (int length = 0, JSObjectRef array, JSValueRef jsvalue, int i = 0, int res = 0, $*1_ltype temp) {
-  if (JSValueIsObject(context, $input))
-  {
-    // Convert into Array
-    array = JSValueToObject(context, $input, NULL);
-
-    length = $1_dim0;
-
-    $1  = ($*1_ltype *)malloc(sizeof($*1_ltype) * length);
-
-    // Get each element from array
-    for (i = 0; i < length; i++)
-    {
-      jsvalue = JSObjectGetPropertyAtIndex(context, array, i, NULL);
-
-      // Get primitive value from JSObject
-      res = SWIG_AsVal(double)(jsvalue, &temp);
-      if (!SWIG_IsOK(res))
-      {
-        SWIG_exception_fail(SWIG_ERROR, "Failed to convert $input to double");
-      }
-      arg$argnum[i] = temp;
-    }
-
-  }
-  else
-  {
-    SWIG_exception_fail(SWIG_ERROR, "$input is not JSObjectRef");
-  }
-}
-
-%typemap(freearg) double[], double[ANY] {
-    free($1);
-}
-
-%typemap(out, fragment=SWIG_From_frag(double)) double[], double[ANY] (int length = 0, int i = 0)
-{
-  length = $1_dim0;
-  JSValueRef values[length];
-
-  for (i = 0; i < length; i++)
-  {
-    values[i] = SWIG_From(double)($1[i]);
-  }
-
-  $result = JSObjectMakeArray(context, length, values, NULL);
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/ccomplex.i b/dependencies2013/win32/swig/Lib/javascript/jsc/ccomplex.i
deleted file mode 100644
index 50f0f95f..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/ccomplex.i
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ccomplex.i
- *
- * C complex typemaps
- * ISO C99:  7.3 Complex arithmetic <complex.h>
- * ----------------------------------------------------------------------------- */
-
-
-%include <javascriptcomplex.swg>
-
-%{
-#include <complex.h>
-%}
-
-
-/* C complex constructor */
-#define CCplxConst(r, i) ((r) + I*(i))
-
-%swig_cplxflt_convn(float complex, CCplxConst, creal, cimag);
-%swig_cplxdbl_convn(double complex, CCplxConst, creal, cimag);
-%swig_cplxdbl_convn(complex, CCplxConst, creal, cimag);
-
-/* declaring the typemaps */
-%typemaps_primitive(SWIG_TYPECHECK_CPLXFLT, float complex);
-%typemaps_primitive(SWIG_TYPECHECK_CPLXDBL, double complex);
-%typemaps_primitive(SWIG_TYPECHECK_CPLXDBL, complex);
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/cdata.i b/dependencies2013/win32/swig/Lib/javascript/jsc/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/complex.i b/dependencies2013/win32/swig/Lib/javascript/jsc/complex.i
deleted file mode 100644
index 4c3b3c5e..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/complex.i
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __cplusplus
-%include <std_complex.i>
-#else
-%include <ccomplex.i>
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/exception.i b/dependencies2013/win32/swig/Lib/javascript/jsc/exception.i
deleted file mode 100644
index 0246cfde..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/exception.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/exception.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascript.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascript.swg
deleted file mode 100644
index 3a83b649..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascript.swg
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -----------------------------------------------------------------------------
- * javascript.swg
- *
- * Javascript typemaps
- * ----------------------------------------------------------------------------- */
-
-%include <typemaps/swigmacros.swg>
-
-%include <javascripttypemaps.swg>
-
-%include <javascriptruntime.swg>
-
-%include <javascripthelpers.swg>
-
-%include <javascriptkw.swg>
-
-%include <javascriptcode.swg>
-
-%include <javascriptinit.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptcode.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptcode.swg
deleted file mode 100644
index 4b21c98b..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptcode.swg
+++ /dev/null
@@ -1,429 +0,0 @@
-/* -----------------------------------------------------------------------------
- * js_ctor:  template for wrapping a ctor.
- *   - $jswrapper:        wrapper of called ctor
- *   - $jslocals:         locals part of wrapper
- *   - $jscode:           code part of wrapper
- *   - $jsargcount:       number of arguments
- *   - $jsmangledtype:    mangled type of class
- * ----------------------------------------------------------------------------- */
-%fragment ("js_ctor", "templates")
-%{
-static JSObjectRef $jswrapper(JSContextRef context, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-    $jslocals
-    if(argc != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
-
-    $jscode
-    return SWIG_JSC_NewPointerObj(context, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
-    goto fail;
-    fail:
-    return NULL;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_veto_ctor:  a vetoing ctor for abstract classes
- *   - $jswrapper:        name of wrapper
- *   - $jsname:           class name
- * ----------------------------------------------------------------------------- */
-%fragment ("js_veto_ctor", "templates")
-%{
-static JSObjectRef $jswrapper(JSContextRef context, JSObjectRef ctorObject,
-    size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-    SWIG_exception(SWIG_ERROR, "Class $jsname can not be instantiated");
-fail:
-    return 0;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_ctor_dispatcher:  dispatcher for overloaded constructors
- *   - $jswrapper:        name of wrapper
- *   - $jsname:           class name
- *   - $jsdispatchcases:  part containing code for dispatching
- * ----------------------------------------------------------------------------- */
-%fragment ("js_ctor_dispatcher", "templates")
-%{
-static JSObjectRef $jswrapper(JSContextRef context, JSObjectRef ctorObject,
-    size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-    JSObjectRef thisObject = NULL;
-
-    // switch all cases by means of series of if-returns.
-    $jsdispatchcases
-
-    // default:
-    SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for construction of $jsname");
-
-    fail:
-    return thisObject;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_overloaded_ctor:  template for wrapping a ctor.
- *   - $jswrapper:        wrapper of called ctor
- *   - $jslocals:         locals part of wrapper
- *   - $jscode:           code part of wrapper
- *   - $jsargcount:       number of arguments
- *   - $jsmangledtype:    mangled type of class
- * ----------------------------------------------------------------------------- */
-%fragment ("js_overloaded_ctor", "templates")
-%{
-static JSObjectRef $jswrapper(JSContextRef context, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-    $jslocals
-    $jscode
-    return SWIG_JSC_NewPointerObj(context, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
-
-    goto fail;
-    fail:
-    return NULL;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_ctor_dispatch_case:  template for a dispatch case for calling an overloaded ctor.
- *   - $jsargcount:       number of arguments of called ctor
- *   - $jswrapper:        wrapper of called ctor
- *
- *  Note: a try-catch-like mechanism is used to switch cases
- * ----------------------------------------------------------------------------- */
-%fragment ("js_ctor_dispatch_case", "templates")
-%{
-  if(argc == $jsargcount) {
-    thisObject = $jswrapper(context, NULL, argc, argv, exception);
-    if(thisObject != NULL) { *exception=0; return thisObject; } /* reset exception and return */
-  }
-%}
-
-
-/* -----------------------------------------------------------------------------
- * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
- *   - $jstype:         class type
- * ----------------------------------------------------------------------------- */
-%fragment ("js_dtor", "templates")
-%{
-static void $jswrapper(JSObjectRef thisObject)
-{
-  SwigPrivData* t = (SwigPrivData*) JSObjectGetPrivate(thisObject);
-  if(t) {
-    if (t->swigCMemOwn) {
-      free (($jstype)t->swigCObject);
-    }
-    JSObjectSetPrivate(thisObject, NULL);
-    free(t);
-  }
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
- *   - $jstype:         class type
- *   - ${destructor_action}: The custom destructor action to invoke.
- * ----------------------------------------------------------------------------- */
-%fragment ("js_dtoroverride", "templates")
-%{
-static void $jswrapper(JSObjectRef thisObject)
-{
-  SwigPrivData* t = (SwigPrivData*) JSObjectGetPrivate(thisObject);
-  if(t) {
-    if (t->swigCMemOwn) {
-      $jstype arg1 = ($jstype)t->swigCObject;
-      ${destructor_action}
-    }
-    /* remove the private data to make sure that it isn't accessed elsewhere */
-    JSObjectSetPrivate(thisObject, NULL);
-    free(t);
-  }
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_getter:  template for getter function wrappers
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_getter", "templates")
-%{
-static JSValueRef $jswrapper(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
-{
-    $jslocals
-    JSValueRef jsresult;
-
-    $jscode
-    return jsresult;
-
-    goto fail;
-    fail:
-    return JSValueMakeUndefined(context);
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_setter:  template for setter function wrappers
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_setter", "templates")
-%{
-static bool $jswrapper(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    $jslocals
-    $jscode
-
-    return true;
-
-    goto fail;
-    fail:
-    return false;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_function:  template for function wrappers
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_function", "templates")
-%{
-static JSValueRef $jswrapper(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-  $jslocals
-  JSValueRef jsresult;
-
-  if(argc != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
-
-  $jscode
-  return jsresult;
-
-  goto fail;
-  fail:
-  return JSValueMakeUndefined(context);
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_function_dispatcher:  template for a function dispatcher for overloaded functions
- *   - $jswrapper:  wrapper function name
- *   - $jsname:     name of the wrapped function
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_function_dispatcher", "templates")
-%{
-static JSValueRef $jswrapper(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-  $jslocals
-  JSValueRef jsresult;
-  int res;
-  $jscode
-
-  SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for function $jsname.");
-  return jsresult;
-
-  goto fail;
-  fail:
-  return JSValueMakeUndefined(context);
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_overloaded_function:  template for a overloaded function
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_overloaded_function", "templates")
-%{
-static int $jswrapper(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception, JSValueRef* p_result)
-{
-  $jslocals
-  JSValueRef jsresult;
-
-  if(argc != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
-
-  $jscode
-  *p_result = jsresult;
-  return SWIG_OK;
-
-  goto fail;
-  fail:
-  return SWIG_TypeError;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_function_dispatch_case:  template for a case used in the function dispatcher
- *   - $jswrapper:  wrapper function name
- *   - $jsargcount: number of arguments of overloaded function
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_function_dispatch_case", "templates")
-%{
-  if(argc == $jsargcount) {
-     res = $jswrapper(context, function, thisObject, argc, argv, exception, &jsresult);
-     if(res == SWIG_OK) { *exception = 0; return jsresult; }
-  }
-%}
-
-/* -----------------------------------------------------------------------------
- * jsc_variable_declaration:  template for a variable table entry
- *   - $jsname:       name of the variable
- *   - $jsgetter:     wrapper of getter function
- *   - $jssetter:     wrapper of setter function
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_variable_declaration", "templates")
-%{
-  {"$jsname", $jsgetter, $jssetter, kJSPropertyAttributeNone},
-%}
-
-
-/* -----------------------------------------------------------------------------
- * jsc_function_declaration:  template for a function table entry
- *   - $jsname:       name of the variable
- *   - $jswrapper:    wrapper function
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_function_declaration", "templates")
-%{
-  {"$jsname", $jswrapper, kJSPropertyAttributeNone},
-%}
-
-/* -----------------------------------------------------------------------------
- * jsc_classtemplate_declaration:  template for a namespace declaration
- *   - $jsmangledname:      mangled class name
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_class_declaration", "templates")
-%{
-static JSClassDefinition $jsmangledname_classDefinition;
-
-static JSClassDefinition $jsmangledname_objectDefinition;
-
-static JSClassRef $jsmangledname_classRef;
-%}
-
-/* -----------------------------------------------------------------------------
- * jsc_class_tables:  template for a namespace declaration
- *   - $jsmangledname:            mangled class name
- *   - $jsstaticclassvariables:   list of static variable entries
- *   - $jsstaticclassfunctions:   list of static function entries
- *   - $jsclassvariables:         list of member variable entries
- *   - $jsclassfunctions:         list of member function entries
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_class_tables", "templates")
-%{
-static JSStaticValue $jsmangledname_staticValues[] = {
-  $jsstaticclassvariables
-  { 0, 0, 0, 0 }
-};
-
-static JSStaticFunction $jsmangledname_staticFunctions[] = {
-  $jsstaticclassfunctions
-  { 0, 0, 0 }
-};
-
-static JSStaticValue $jsmangledname_values[] = {
-  $jsclassvariables
-  { 0, 0, 0, 0 }
-};
-
-static JSStaticFunction $jsmangledname_functions[] = {
-  $jsclassfunctions
-  { 0, 0, 0 }
-};
-%}
-
-/* -----------------------------------------------------------------------------
- * jsc_define_class_template:  template for defining a class template
- *   - $jsmangledname:            mangled class name
- *   - $jsmangledtype:            mangled class type
- *   - $jsctor:                   wrapper of ctor
- *   - $jsbaseclass:              mangled name of base class
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_class_definition", "templates")
-%{
-  $jsmangledname_classDefinition.staticFunctions = $jsmangledname_staticFunctions;
-  $jsmangledname_classDefinition.staticValues = $jsmangledname_staticValues;
-  $jsmangledname_classDefinition.callAsConstructor = $jsctor;
-  $jsmangledname_objectDefinition.finalize = $jsdtor;
-  $jsmangledname_objectDefinition.staticValues = $jsmangledname_values;
-  $jsmangledname_objectDefinition.staticFunctions = $jsmangledname_functions;
-  $jsclass_inheritance
-  $jsmangledname_classRef = JSClassCreate(&$jsmangledname_objectDefinition);
-  SWIGTYPE_$jsmangledtype->clientdata = $jsmangledname_classRef;
-%}
-
-%fragment ("jsc_class_inherit", templates)
-%{
-    if (SWIGTYPE_p$jsbaseclassmangled != NULL) {
-      $jsmangledname_objectDefinition.parentClass = (JSClassRef) SWIGTYPE_p$jsbaseclassmangled->clientdata;
-    }
-%}
-
-%fragment ("jsc_class_noinherit", templates)
-%{
-    $jsmangledname_objectDefinition.parentClass = _SwigObject_classRef;
-%}
-
-
-/* -----------------------------------------------------------------------------
- * jsc_register_class:  template for registration of a class
- *   - $jsname:                   class name
- *   - $jsmangledname:            mangled class name
- *   - $jsnspace:                 mangled name of namespace
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_class_registration", "templates")
-%{
-  JS_registerClass(context, $jsnspace_object, "$jsname", &$jsmangledname_classDefinition);
-%}
-
-
-/* -----------------------------------------------------------------------------
- * jsc_nspace_declaration:  template for a namespace declaration
- *   - $jsnspace:           mangled name of the namespace
- *   - $jsglobalvariables:  list of variable entries
- *   - $jsglobalfunctions:  list if fuction entries
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_nspace_declaration", "templates")
-%{
-static JSStaticValue $jsnspace_values[] = {
-  $jsglobalvariables
-  { 0, 0, 0, 0 }
-};
-
-static JSStaticFunction $jsnspace_functions[] = {
-  $jsglobalfunctions
-  { 0, 0, 0 }
-};
-
-static JSClassDefinition $jsnspace_classDefinition;
-static JSObjectRef $jsmangledname_object;
-%}
-
-/* -----------------------------------------------------------------------------
- * jsc_nspace_definition:  template for definition of a namespace object
- *   - $jsmangledname:            mangled name of namespace
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_nspace_definition", "templates")
-%{
-  $jsmangledname_classDefinition.staticFunctions = $jsmangledname_functions;
-  $jsmangledname_classDefinition.staticValues = $jsmangledname_values;
-  $jsmangledname_object = JSObjectMake(context, JSClassCreate(&$jsmangledname_classDefinition), NULL);
-%}
-
-/* -----------------------------------------------------------------------------
- * jsc_nspace_registration:  template for registration of a namespace object
- *   - $jsname:                   name of namespace
- *   - $jsmangledname:            mangled name of namespace
- *   - $jsparent:                 mangled name of parent namespace
- * ----------------------------------------------------------------------------- */
-%fragment ("jsc_nspace_registration", "templates")
-%{
-  JS_registerNamespace(context, $jsmangledname_object, $jsparent_object, "$jsname");
-%}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptcomplex.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptcomplex.swg
deleted file mode 100644
index 7be120b3..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptcomplex.swg
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-  Defines the As/From converters for double/float complex, you need to
-  provide complex Type, the Name you want to use in the converters,
-  the complex Constructor method, and the Real and Imag complex
-  accessor methods.
-
-  See the std_complex.i and ccomplex.i for concrete examples.
-*/
-
-/* the common from converter */
-%define %swig_fromcplx_conv(Type, Real, Imag)
-%fragment(SWIG_From_frag(Type),"header",
-          fragment=SWIG_From_frag(double))
-{
-SWIGINTERNINLINE JSObjectRef
-SWIG_From_dec(Type)(%ifcplusplus(const Type&, Type) c)
-{
-  JSValueRef vals[2];
-  vals[0] =  SWIG_From(double)(Real(c));
-  vals[1] =  SWIG_From(double)(Imag(c));
-  return JSObjectMakeArray(context, 2, vals, NULL);
-}
-}
-%enddef
-
-/* the double case */
-%define %swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-	  fragment=SWIG_AsVal_frag(double))
-{
-SWIGINTERN int
-SWIG_AsVal_dec(Type) (JSValueRef o, Type* val)
-{
-  if (JSValueIsObject(context, o)) {
-    JSObjectRef array;
-    JSValueRef exception, js_re, js_im;
-    double re, im;
-    int res;
-    
-    exception = 0;
-    res = 0;
-
-    array = JSValueToObject(context, o, &exception);
-    if(exception != 0)
-      return SWIG_TypeError;
-    
-    js_re = JSObjectGetPropertyAtIndex(context, array, 0, &exception);
-    if(exception != 0)
-      return SWIG_TypeError;
-
-    js_im = JSObjectGetPropertyAtIndex(context, array, 1, &exception);
-    if(exception != 0)
-      return SWIG_TypeError;
-
-    res = SWIG_AsVal(double)(js_re, &re);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    res = SWIG_AsVal(double)(js_im, &im);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    if (val) *val = Constructor(re, im);
-    return SWIG_OK;
-  } else {
-    double d;
-    int res = SWIG_AddCast(SWIG_AsVal(double)(o, &d));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(d, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-/* the float case */
-%define %swig_cplxflt_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-          fragment=SWIG_AsVal_frag(float)) {
-SWIGINTERN int
-SWIG_AsVal_dec(Type)(JSValueRef o, Type *val)
-{
-  if (JSValueIsObject(context, o)) {
-    JSObjectRef array;
-    JSValueRef exception, js_re, js_im;
-    double re, im;
-    int res;
-    
-    exception = 0;
-    res = 0;
-
-    array = JSValueToObject(context, o, &exception);
-    if(exception != 0)
-      return SWIG_TypeError;
-    
-    js_re = JSObjectGetPropertyAtIndex(context, array, 0, &exception);
-    if(exception != 0)
-      return SWIG_TypeError;
-
-    js_im = JSObjectGetPropertyAtIndex(context, array, 1, &exception);
-    if(exception != 0)
-      return SWIG_TypeError;
-
-    res = SWIG_AsVal(double)(js_re, &re);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    res = SWIG_AsVal(double)(js_im, &im);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-
-    if ((-FLT_MAX <= re && re <= FLT_MAX) && (-FLT_MAX <= im && im <= FLT_MAX)) {
-      if (val) *val = Constructor(%numeric_cast(re, float),
-                                  %numeric_cast(im, float));
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }    
-  } else {
-    float re;
-    int res = SWIG_AddCast(SWIG_AsVal(float)(o, &re));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(re, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-#define %swig_cplxflt_convn(Type, Constructor, Real, Imag) \
-%swig_cplxflt_conv(Type, Constructor, Real, Imag)
-
-
-#define %swig_cplxdbl_convn(Type, Constructor, Real, Imag) \
-%swig_cplxdbl_conv(Type, Constructor, Real, Imag)
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptfragments.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptfragments.swg
deleted file mode 100644
index 4778bf03..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptfragments.swg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-  Create a file with this name, 'javascriptfragments.swg', in your working
-  directory and add all the %fragments you want to take precedence
-  over the default ones defined by swig.
-
-  For example, if you add:
-  
-  %fragment(SWIG_AsVal_frag(int),"header") {
-   SWIGINTERNINLINE int
-   SWIG_AsVal(int)(PyObject *obj, int *val)
-   { 
-     <your code here>;
-   }
-  }
-  
-  this will replace the code used to retrieve an integer value for all
-  the typemaps that need it, including:
-  
-    int, std::vector<int>, std::list<std::pair<int,int> >, etc.
-
-    
-*/
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascripthelpers.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascripthelpers.swg
deleted file mode 100644
index 45765433..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascripthelpers.swg
+++ /dev/null
@@ -1,69 +0,0 @@
-%insert(wrapper) %{
- 
-SWIGINTERN bool JS_registerClass(JSGlobalContextRef context, JSObjectRef parentObject,
-                             const char* className,
-                             JSClassDefinition* definition) {
-
-    JSStringRef js_className = JSStringCreateWithUTF8CString(className);
-    JSObjectRef classObject = JSObjectMake(context, JSClassCreate(definition), NULL);
-    JSObjectSetProperty(context, parentObject,
-                        js_className, classObject,
-                        kJSPropertyAttributeNone, NULL);
-    JSStringRelease(js_className);
-    
-    return true;
-}
-
-SWIGINTERN bool JS_registerNamespace(JSGlobalContextRef context, 
-                           JSObjectRef namespaceObj, JSObjectRef parentNamespace,
-                           const char* name)
-{
-    JSStringRef js_name = JSStringCreateWithUTF8CString(name);
-    JSObjectSetProperty(context, parentNamespace,
-                        js_name, namespaceObj,
-                        kJSPropertyAttributeNone, NULL);
-    JSStringRelease(js_name);
-    
-    return true;
-}
-
-
-SWIGINTERN bool JS_registerFunction(JSGlobalContextRef context, JSObjectRef object, 
-                        const char* functionName, JSObjectCallAsFunctionCallback callback)
-{
-    JSStringRef js_functionName = JSStringCreateWithUTF8CString(functionName);
-    JSObjectSetProperty(context, object, js_functionName,
-                        JSObjectMakeFunctionWithCallback(context, js_functionName, callback), 
-                        kJSPropertyAttributeNone, NULL);
-    JSStringRelease(js_functionName);
-    return true;
-}
-
-SWIGINTERN bool JS_veto_set_variable(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    char buffer[256];
-    char msg[512];
-    int res;
-    
-    JSStringGetUTF8CString(propertyName, buffer, 256);
-    res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
-    
-    if(res<0) {
-      SWIG_exception(SWIG_ERROR, "Tried to write read-only variable.");
-    } else {
-      SWIG_exception(SWIG_ERROR, msg);
-    }
-fail:    
-    return false;
-}
-
-SWIGINTERN JSValueRef JS_CharPtrToJSValue(JSContextRef context, char* cstr) {
-  JSValueRef val;
-  
-  JSStringRef jsstring = JSStringCreateWithUTF8CString((char*) cstr);
-  val = JSValueMakeString(context, jsstring);
-  JSStringRelease(jsstring);
-
-  return val;
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptinit.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptinit.swg
deleted file mode 100644
index a32ba336..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptinit.swg
+++ /dev/null
@@ -1,67 +0,0 @@
-%insert(init) %{
-SWIGRUNTIME void
-SWIG_JSC_SetModule(swig_module_info *swig_module) {}
-
-SWIGRUNTIME swig_module_info *
-SWIG_JSC_GetModule(void) {
-  return 0;
-}
-
-#define SWIG_GetModule(clientdata)                SWIG_JSC_GetModule()
-#define SWIG_SetModule(clientdata, pointer)       SWIG_JSC_SetModule(pointer)
-%}
-
-%insert(init) "swiginit.swg"
-
-%fragment ("js_initializer_define", "templates") %{
-#define SWIGJSC_INIT $jsname_initialize
-%}
-
-// Open the initializer function
-%insert(init)
-%{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool SWIGJSC_INIT (JSGlobalContextRef context, JSObjectRef *exports) {
-    SWIG_InitializeModule(0);
-%}
-
-/* -----------------------------------------------------------------------------
- * js_initializer:  template for the module initializer function
- *   - $jsname:                   module name
- *   - $jscreatenamespaces:       part with code for creating namespace objects
- *   - $jscreateclasses:          part with code for creating classes
- *   - $jsregisternamespaces:     part with code for registration of namespaces
- * ----------------------------------------------------------------------------- */
-%fragment ("js_initializer", "templates") %{
-    /* Initialize the base swig type object */
-    _SwigObject_objectDefinition.staticFunctions = _SwigObject_functions;
-    _SwigObject_objectDefinition.staticValues = _SwigObject_values;
-    _SwigObject_classRef = JSClassCreate(&_SwigObject_objectDefinition);
-
-    /* Initialize the PackedData class */
-    _SwigPackedData_objectDefinition.staticFunctions = _SwigPackedData_functions;
-    _SwigPackedData_objectDefinition.staticValues = _SwigPackedData_values;
-    _SwigPackedData_objectDefinition.finalize = _wrap_SwigPackedData_delete;
-    _SwigPackedData_classRef = JSClassCreate(&_SwigPackedData_objectDefinition);
-
-    /* Create objects for namespaces */
-    $jscreatenamespaces
-
-    /* Register classes */
-    $jsregisterclasses
-
-    /* Register namespaces */
-    $jsregisternamespaces
-
-    *exports = exports_object;
-
-    return true;
-}
-#ifdef __cplusplus
-}
-#endif
-%}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptkw.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptkw.swg
deleted file mode 100644
index c3c11839..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptkw.swg
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef JAVASCRIPT_JAVASCRIPTKW_SWG_
-#define JAVASCRIPT_JAVASCRIPTKW_SWG_
-
-/* Warnings for Java keywords */
-#define JAVASCRIPTKW(x) %keywordwarn("'" `x` "' is a javascript keyword, renaming to '_"`x`"'",rename="_%s")  `x`
-
-/* Taken from https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference/Reserved_Words */
-
-JAVASCRIPTKW(break);
-JAVASCRIPTKW(case);
-JAVASCRIPTKW(catch);
-JAVASCRIPTKW(continue);
-JAVASCRIPTKW(default);
-JAVASCRIPTKW(delete);
-JAVASCRIPTKW(do);
-JAVASCRIPTKW(else);
-JAVASCRIPTKW(finally);
-JAVASCRIPTKW(for);
-JAVASCRIPTKW(function);
-JAVASCRIPTKW(if);
-JAVASCRIPTKW(in);
-JAVASCRIPTKW(instanceof);
-JAVASCRIPTKW(new);
-JAVASCRIPTKW(return);
-JAVASCRIPTKW(switch);
-JAVASCRIPTKW(this);
-JAVASCRIPTKW(throw);
-JAVASCRIPTKW(try);
-JAVASCRIPTKW(typeof);
-JAVASCRIPTKW(var);
-JAVASCRIPTKW(void);
-JAVASCRIPTKW(while);
-JAVASCRIPTKW(with);
-
-/* others bad names if any*/
-// for example %namewarn("321:clone() is a javascript bad method name") *::clone();
-
-#undef JAVASCRIPTKW
-
-#endif //JAVASCRIPT_JAVASCRIPTKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptprimtypes.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptprimtypes.swg
deleted file mode 100644
index 20d575d9..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptprimtypes.swg
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-/* boolean */
-
-%fragment(SWIG_From_frag(bool),"header") {
-SWIGINTERNINLINE
-JSValueRef SWIG_From_dec(bool)(bool value)
-{
-  return JSValueMakeBoolean(context, value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header",
-          fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN
-int SWIG_AsVal_dec(bool)(JSValueRef obj, bool *val)
-{
-  if(!JSValueIsBoolean(context, obj)) {
-    return SWIG_ERROR;
-  }
-  if (val) *val = JSValueToBoolean(context, obj);
-  return SWIG_OK;
-}
-}
-
-/* int */
-
-%fragment(SWIG_From_frag(int),"header") {
-SWIGINTERNINLINE JSValueRef
-  SWIG_From_dec(int)(int value)
-{
-  return JSValueMakeNumber(context, value);
-}
-}
-
-/* long */
-
-%fragment(SWIG_From_frag(long),"header") {
-SWIGINTERNINLINE JSValueRef
-SWIG_From_dec(long)(long value)
-{
-  return JSValueMakeNumber(context, value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(long),"header",
-          fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN int
-SWIG_AsVal_dec(long)(JSValueRef obj, long* val)
-{
-  if (!JSValueIsNumber(context, obj)) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = (long) JSValueToNumber(context, obj, NULL);
-
-  return SWIG_OK;
-}
-}
-
-/* unsigned long */
-
-%fragment(SWIG_From_frag(unsigned long),"header",
-          fragment=SWIG_From_frag(long)) {
-SWIGINTERNINLINE JSValueRef
-SWIG_From_dec(unsigned long)(unsigned long value)
-{
-  return (value > LONG_MAX) ?
-    JSValueMakeNumber(context, value) : JSValueMakeNumber(context, %numeric_cast(value,long));
-}
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header",
-          fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long)(JSValueRef obj, unsigned long *val)
-{
-  long longVal;
-  if(!JSValueIsNumber(context, obj)) {
-    return SWIG_TypeError;
-  }
-
-  longVal = (long) JSValueToNumber(context, obj, NULL);
-
-  if(longVal < 0) {
-      return SWIG_OverflowError;
-  }
-
-  if(val) *val = longVal;
-
-  return SWIG_OK;
-}
-}
-
-/* long long */
-// Note: these are copied from 'long' and probably need fixing
-
-%fragment(SWIG_From_frag(long long),"header",
-    fragment=SWIG_From_frag(long),
-    fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE JSValueRef
-SWIG_From_dec(long long)(long long value)
-{
-  return JSValueMakeNumber(context, value);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-    fragment=SWIG_AsVal_frag(long),
-    fragment="SWIG_CanCastAsInteger",
-    fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(long long)(JSValueRef obj, long long* val)
-{
-  if (!JSValueIsNumber(context, obj)) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = (long long) JSValueToNumber(context, obj, NULL);
-
-  return SWIG_OK;
-}
-%#endif
-}
-
-/* unsigned long long */
-// Note: these are copied from 'unsigned long' and probably need fixing
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment=SWIG_From_frag(long long),
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN JSValueRef
-SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-  return (value > LONG_MAX) ?
-    JSValueMakeNumber(context, value) : JSValueMakeNumber(context, %numeric_cast(value,long));
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-    fragment=SWIG_AsVal_frag(unsigned long),
-    fragment="SWIG_CanCastAsInteger",
-   fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long long)(JSValueRef obj, unsigned long long *val)
-{
-  long long longVal;
-  if(!JSValueIsNumber(context, obj)) {
-    return SWIG_TypeError;
-  }
-
-  longVal = (unsigned long long) JSValueToNumber(context, obj, NULL);
-
-  if(longVal < 0) {
-      return SWIG_OverflowError;
-  }
-
-  if(val) *val = longVal;
-
-  return SWIG_OK;
-}
-%#endif
-}
-
-/* double */
-
-%fragment(SWIG_From_frag(double),"header") {
-SWIGINTERN JSValueRef
-SWIG_From_dec(double) (double val)
-{
-  return JSValueMakeNumber(context, val);
-}
-}
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(double)(JSValueRef obj, double *val)
-{
-  if(!JSValueIsNumber(context, obj)) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = JSValueToNumber(context, obj, NULL);
-
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptrun.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptrun.swg
deleted file mode 100644
index 30ee032e..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptrun.swg
+++ /dev/null
@@ -1,334 +0,0 @@
-/* ----------------------------------------------------------------------------
- *  Errors and exceptions
- *
- * ---------------------------------------------------------------------------*/
-
-#define SWIG_Error(code, msg)     SWIG_JSC_exception(context, exception, code, msg)
-#define SWIG_exception(code, msg) do { SWIG_JSC_exception(context, exception, code, msg); SWIG_fail; } while (0)
-#define SWIG_fail                 goto fail
-
-SWIGRUNTIME void SWIG_Javascript_Raise(JSContextRef context, JSValueRef *exception, const char* type) {
-  JSStringRef message = JSStringCreateWithUTF8CString(type);
-  JSValueRef error_arguments[1]; 
-  JSObjectRef exception_object;
-  JSValueRef exception_value;
-  exception_value = JSValueMakeString(context, message);
-  /* Converting the result to an object will let JavascriptCore add 
-     "sourceURL" (file) and "line" (number) and "message" to the exception,
-     instead of just returning a raw string. This is extremely important for debugging your errors.
-     Using JSObjectMakeError is better than JSValueToObject because the latter only populates
-     "sourceURL" and "line", but not "message" or any others I don't know about.
-   */
-  error_arguments[0] = exception_value;
-  exception_object = JSObjectMakeError(context, 1, error_arguments, NULL);
-
-  /* Return the exception_object */
-  *exception = exception_object;
-
-  JSStringRelease(message);
-}
-
-SWIGRUNTIME void SWIG_JSC_exception(JSContextRef context, JSValueRef *exception, int code, const char* msg) {
-  SWIG_Javascript_Raise(context, exception, msg);
-}
-
-/* ----------------------------------------------------------------------------
- *  The parent class of all Proxies
- *
- * ---------------------------------------------------------------------------*/
-
-typedef struct {
-  bool swigCMemOwn;
-  void *swigCObject;
-  swig_type_info *info;
-} SwigPrivData;
-
-SWIGRUNTIME JSValueRef _wrap_SwigObject_disown(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-  JSValueRef jsresult;
-
-  JSObjectRef obj = JSValueToObject(context, thisObject, NULL);
-  SwigPrivData *cdata = (SwigPrivData *) JSObjectGetPrivate(obj);
-
-  cdata->swigCMemOwn = false;
-
-  jsresult = JSValueMakeUndefined(context);
-  return jsresult;
-}
-
-SWIGRUNTIME JSValueRef _wrap_SwigObject_getCPtr(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-  JSValueRef jsresult;
-  long result;
-
-  JSObjectRef obj = JSValueToObject(context, thisObject, NULL);
-  SwigPrivData *cdata = (SwigPrivData*) JSObjectGetPrivate(obj);
-
-  result = (long) cdata->swigCObject;
-  jsresult = JSValueMakeNumber(context, result);
-
-  return jsresult;
-}
-
-SWIGRUNTIME JSValueRef _wrap_SwigObject_equals(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exception)
-{
-  JSValueRef jsresult;
-  bool result;
-
-  JSObjectRef obj = JSValueToObject(context, thisObject, NULL);
-  SwigPrivData *cdata = (SwigPrivData*) JSObjectGetPrivate(obj);
-
-  JSObjectRef obj2 = JSValueToObject(context, argv[0], NULL);
-  SwigPrivData *cdata2 = (SwigPrivData*) JSObjectGetPrivate(obj2);
-
-  result = (cdata->swigCObject == cdata2->swigCObject);
-  jsresult = JSValueMakeBoolean(context, result);
-
-  return jsresult;
-}
-
-SWIGRUNTIME JSStaticValue _SwigObject_values[] = {
-  {
-    0, 0, 0, 0
-  }
-};
-
-SWIGRUNTIME JSStaticFunction _SwigObject_functions[] = {
-  {
-    "disown",_wrap_SwigObject_disown, kJSPropertyAttributeNone
-  },
-  {
-    "equals",_wrap_SwigObject_equals, kJSPropertyAttributeNone
-  },
-  {
-    "getCPtr",_wrap_SwigObject_getCPtr, kJSPropertyAttributeNone
-  },
-  {
-    0, 0, 0
-  }
-};
-
-SWIGRUNTIME JSClassDefinition _SwigObject_objectDefinition;
-
-SWIGRUNTIME JSClassRef _SwigObject_classRef;
-
-
-SWIGRUNTIME int SWIG_JSC_ConvertInstancePtr(JSContextRef context, JSObjectRef objRef, void** ptr, swig_type_info *info, int flags) {
-  SwigPrivData *cdata;
-
-  cdata = (SwigPrivData *) JSObjectGetPrivate(objRef);
-  if(cdata == NULL) {
-    return SWIG_ERROR;
-  }
-  if(cdata->info != info) {
-    bool type_valid = false;
-    swig_cast_info *t = info->cast;
-    while(t != NULL) {
-      if(t->type == cdata->info) {
-        type_valid = true;
-        break;
-      }
-      t = t->next;
-    }
-    if(!type_valid) {
-      return SWIG_TypeError;
-    }
-  }
-
-  *ptr = cdata->swigCObject;
-
-  if(flags & SWIG_POINTER_DISOWN) {
-    cdata->swigCMemOwn = false;
-  }
-
-  return SWIG_OK;
-}
-
-SWIGRUNTIME int SWIG_JSC_ConvertPtr(JSContextRef context, JSValueRef valRef, void** ptr, swig_type_info *info, int flags) {
-  JSObjectRef objRef;
-
-  /* special case: JavaScript null => C NULL pointer */
-  if(JSValueIsNull(context, valRef)) {
-    *ptr=0;
-    return SWIG_OK;
-  }
-
-  if(!JSValueIsObject(context, valRef)) {
-    return SWIG_TypeError;
-  }
-
-  objRef = JSValueToObject(context, valRef, NULL);
-  if(objRef == NULL) {
-    return SWIG_ERROR;
-  }
-
-  return SWIG_JSC_ConvertInstancePtr(context, objRef, ptr, info, flags);
-}
-
-SWIGRUNTIME JSObjectRef SWIG_JSC_NewPointerObj(JSContextRef context, void *ptr, swig_type_info *info, int flags) {
-  JSClassRef classRef;
-  JSObjectRef result;
-  SwigPrivData *cdata;
-
-  if (ptr == NULL) {
-    // HACK: it is not possible to use JSValueToObject (causing seg-fault)
-    // This static cast turned out to be a workaround
-    // In future, we should change the interface of this method
-    // to return JSValueRef instead of JSObjectRef.
-    return (JSObjectRef) JSValueMakeNull(context);
-  }
-
-  if(info->clientdata == NULL) {
-    classRef = _SwigObject_classRef;
-  } else {
-    classRef = (JSClassRef) info->clientdata;
-  }
-
-  result = JSObjectMake(context, classRef, NULL);
-
-  cdata = (SwigPrivData*) malloc(sizeof(SwigPrivData));
-  cdata->swigCObject = ptr;
-  cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
-  cdata->info = info;
-
-  JSObjectSetPrivate(result, cdata);
-
-  return result;
-}
-
-#define SWIG_ConvertPtr(obj, ptr, info, flags)    SWIG_JSC_ConvertPtr(context, obj, ptr, info, flags)
-#define SWIG_NewPointerObj(ptr, info, flags)      SWIG_JSC_NewPointerObj(context, ptr, info, flags)
-
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_JSC_ConvertInstancePtr(context, obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(thisvalue, type, flags)     SWIG_JSC_NewPointerObj(context, thisvalue, type, flags)
-
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_JSC_ConvertPtr(context, obj, pptr, type, 0)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_JSC_NewPointerObj(context, ptr, type, 0)
-
-/* ----------------------------------------------------------------------------
- *  A class for packed data
- *
- * ---------------------------------------------------------------------------*/
-
-typedef struct {
-  void *data;
-  size_t size;
-  swig_type_info *type;
-} SwigPackedData;
-
-SWIGRUNTIME JSStaticValue _SwigPackedData_values[] = {
-  {
-    0, 0, 0, 0
-  }
-};
-SWIGRUNTIME JSStaticFunction _SwigPackedData_functions[] = {
-  {
-    0, 0, 0
-  }
-};
-SWIGRUNTIME JSClassDefinition _SwigPackedData_objectDefinition;
-SWIGRUNTIME JSClassRef _SwigPackedData_classRef;
-
-SWIGRUNTIMEINLINE
-int SwigJSCPacked_Check(JSContextRef context, JSValueRef valRef) {
-  return JSValueIsObjectOfClass(context, valRef, _SwigPackedData_classRef);
-}
-
-SWIGRUNTIME
-swig_type_info* SwigJSCPacked_UnpackData(JSContextRef context, JSValueRef valRef, void *ptr, size_t size) {
-  if (SwigJSCPacked_Check(context, valRef)) {
-    JSObjectRef objRef = JSValueToObject(context, valRef, NULL);
-    SwigPackedData *sobj = (SwigPackedData *) JSObjectGetPrivate(objRef);
-    if (sobj->size != size) return 0;
-    memcpy(ptr, sobj->data, size);
-    return sobj->type;
-  } else {
-    return 0;
-  }
-}
-
-SWIGRUNTIME
-int SWIG_JSC_ConvertPacked(JSContextRef context, JSValueRef valRef, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = SwigJSCPacked_UnpackData(context, valRef, ptr, sz);
-  if (!to) return SWIG_ERROR;
-  if (ty) {
-    if (to != ty) {
-      /* check type cast? */
-      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      if (!tc) return SWIG_ERROR;
-    }
-  }
-  return SWIG_OK;
-}
-
-SWIGRUNTIME
-JSValueRef SWIG_JSC_NewPackedObj(JSContextRef context, void *data, size_t size, swig_type_info *type) {
-
-  JSClassRef classRef = _SwigObject_classRef;
-  JSObjectRef result = JSObjectMake(context, classRef, NULL);
-
-  SwigPackedData* cdata = (SwigPackedData*) malloc(sizeof(SwigPackedData));
-  cdata->data = data;
-  cdata->size = size;
-  cdata->type = type;
-
-  JSObjectSetPrivate(result, cdata);
-
-  return result;
-}
-
-/*  SwigPackedData wrappers  */
-SWIGRUNTIME
-void _wrap_SwigPackedData_delete(JSObjectRef obj)
-{
-  SwigPackedData* cdata = (SwigPackedData*) JSObjectGetPrivate(obj);
-  if (cdata) {
-    free(cdata->data);
-  }
-}
-
-/* for C++ member pointers, ie, member methods */
-
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_JSC_ConvertPacked(context, obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_JSC_NewPackedObj(context, ptr, sz, type)
-
-
-/* ---------------------------------------------------------------------------
- * Support for IN/OUTPUT typemaps (see Lib/typemaps/inoutlist.swg)
- *
- * ---------------------------------------------------------------------------*/
-SWIGRUNTIME
-unsigned int SWIGJSC_ArrayLength(JSContextRef context, JSObjectRef arr) {
-  static JSStringRef LENGTH = 0;
-  JSValueRef exception = NULL;
-  JSValueRef js_length;
-  double length;
-
-  if (LENGTH == 0) {
-    LENGTH = JSStringCreateWithUTF8CString("length");
-  }
-
-  js_length = JSObjectGetProperty(context, arr, LENGTH, &exception);
-  if (exception == 0 && JSValueIsNumber(context, js_length)) {
-    length = JSValueToNumber(context, js_length, 0);
-    return (unsigned int) length;
-  } else {
-    return 0;
-  }
-}
-
-SWIGRUNTIME
-JSValueRef SWIGJSC_AppendOutput(JSContextRef context, JSValueRef value, JSValueRef obj) {
-  JSObjectRef arr;
-  unsigned int length;
-
-  if (JSValueIsUndefined(context, value)) {
-    arr = JSObjectMakeArray(context, 0, 0, 0);
-  } else {
-    arr = JSValueToObject(context, value, 0);
-  }
-
-  length = SWIGJSC_ArrayLength(context, arr);
-  JSObjectSetPropertyAtIndex(context, arr, length, obj, 0);
-  return arr;
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptruntime.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptruntime.swg
deleted file mode 100644
index 8f839089..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptruntime.swg
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -----------------------------------------------------------------------------
- * javascriptruntime.swg
- *
- * Javascript support code
- * ----------------------------------------------------------------------------- */
-
-%insert(runtime) %{
-#include <JavaScriptCore/JavaScript.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-%}
-
-%insert(runtime) "swigrun.swg";         /* SWIG API */
-%insert(runtime) "swigerrors.swg";      /* SWIG errors */
-
-%insert(runtime) "javascriptrun.swg";      /* SWIG errors */
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptstrings.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptstrings.swg
deleted file mode 100644
index 55c8e4b9..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascriptstrings.swg
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ------------------------------------------------------------
- *  utility methods for char strings
- * ------------------------------------------------------------ */
-%fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERN int
-SWIG_JSC_AsCharPtrAndSize(JSContextRef context, JSValueRef valRef, char** cptr, size_t* psize, int *alloc)
-{
-  if(JSValueIsString(context, valRef)) {
-    JSStringRef js_str = JSValueToStringCopy(context, valRef, NULL);
-    size_t len = JSStringGetMaximumUTF8CStringSize(js_str);
-    char* cstr = (char*) %new_array(len, char);
-    /* JSStringGetUTF8CString returns the length including 0-terminator */
-    len = JSStringGetUTF8CString(js_str, cstr, len);
-
-    if(alloc) *alloc = SWIG_NEWOBJ;
-    if(psize) *psize = len;
-    if(cptr) *cptr = cstr;
-
-    return SWIG_OK;
-  } else {
-    if(JSValueIsObject(context, valRef)) {
-      JSObjectRef obj = JSValueToObject(context, valRef, NULL);
-      // try if the object is a wrapped char[]
-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      if (pchar_descriptor) {
-        void* vptr = 0;
-        if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-          if (cptr) *cptr = (char *) vptr;
-          if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-          if (alloc) *alloc = SWIG_OLDOBJ;
-          return SWIG_OK;
-        }
-      }
-      return SWIG_TypeError;
-    } else {
-      return SWIG_TypeError;
-    }
-  }
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERNINLINE JSValueRef
-SWIG_JSC_FromCharPtrAndSize(JSContextRef context, const char* carray, size_t size)
-{
-  if (carray) {
-    if (size > INT_MAX) {
-      // TODO: handle extra long strings
-      //swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      //return pchar_descriptor ?
-      //  SWIG_InternalNewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void();
-      return JSValueMakeUndefined(context);
-    } else {
-      JSStringRef jsstring;
-      JSValueRef result;
-      if(size < 2) {
-        char c[2];
-        int i;
-        for(i=0;i<size;++i) {
-          c[i] = carray[i];
-        }
-        c[size] = 0;
-        jsstring = JSStringCreateWithUTF8CString(c);
-      } else {
-        jsstring = JSStringCreateWithUTF8CString(carray);
-      }
-      result = JSValueMakeString(context, jsstring);
-      JSStringRelease(jsstring);
-      return result;
-    }
-  } else {
-    return JSValueMakeUndefined(context);
-  }
-}
-}
-
-%define %_typemap2_string(StringCode, CharCode,
-			 Char, CharName,
-			 SWIG_AsCharPtrAndSize,
-			 SWIG_FromCharPtrAndSize,
-			 SWIG_CharPtrLen,
-       SWIG_CharBufLen,
-			 SWIG_NewCopyCharArray,
-			 SWIG_DeleteCharArray,
-			 FragLimits, CHAR_MIN, CHAR_MAX)
-
-%fragment("SWIG_From"#CharName"Ptr","header",fragment=#SWIG_FromCharPtrAndSize) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_JSC_From##CharName##Ptr(JSContextRef context, const Char *cptr)
-{
-  return SWIG_JSC_FromCharPtrAndSize(context, cptr, (cptr ? SWIG_CharPtrLen(cptr) : 0));
-}
-}
-
-%fragment("SWIG_From"#CharName"Array","header",fragment=#SWIG_FromCharPtrAndSize) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_JSC_From##CharName##Array(JSContextRef context, const Char *cptr, size_t size)
-{
-  return SWIG_JSC_FromCharPtrAndSize(context, cptr, size);
-}
-}
-
-%fragment("SWIG_As" #CharName "Ptr","header",fragment=#SWIG_AsCharPtrAndSize) {
-%define_as(SWIG_As##CharName##Ptr(obj, val, alloc), SWIG_JSC_AsCharPtrAndSize(context, obj, val, NULL, alloc))
-}
-
-%fragment("SWIG_As" #CharName "Array","header",fragment=#SWIG_AsCharPtrAndSize) {
-SWIGINTERN int
-SWIG_JSC_As##CharName##Array(JSContextRef context, SWIG_Object obj, Char *val, size_t size)
-{
-  Char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ;
-  int res = SWIG_JSC_AsCharPtrAndSize(context, obj, &cptr, &csize, &alloc);
-  if (SWIG_IsOK(res)) {
-    if ((csize == size + 1) && cptr && !(cptr[csize-1])) --csize;
-    if (csize <= size) {
-      if (val) {
-        if (csize) memcpy(val, cptr, csize*sizeof(Char));
-        if (csize < size) memset(val + csize, 0, (size - csize)*sizeof(Char));
-      }
-      if (alloc == SWIG_NEWOBJ) {
-        SWIG_DeleteCharArray(cptr);
-        res = SWIG_DelNewMask(res);
-      }
-      return res;
-    }
-    if (alloc == SWIG_NEWOBJ) SWIG_DeleteCharArray(cptr);
-  }
-  return SWIG_TypeError;
-}
-
-#define SWIG_As##CharName##Array(obj, val, size) SWIG_JSC_As##CharName##Array(context, obj, val, size)
-}
-
-/* Char */
-
-%fragment(SWIG_From_frag(Char),"header",fragment=#SWIG_FromCharPtrAndSize) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_From_dec(Char)(Char c)
-{
-  return SWIG_JSC_FromCharPtrAndSize(context, &c,1);
-}
-}
-
-%fragment(SWIG_AsVal_frag(Char),"header",
-          fragment="SWIG_As"#CharName"Array",
-          fragment=FragLimits,
-          fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(Char)(SWIG_Object obj, Char *val)
-{
-  int res = SWIG_As##CharName##Array(obj, val, 1);
-  if (!SWIG_IsOK(res)) {
-    long v;
-    res = SWIG_AddCast(SWIG_AsVal(long)(obj, &v));
-    if (SWIG_IsOK(res)) {
-      if ((CHAR_MIN <= v) && (v <= CHAR_MAX)) {
-        if (val) *val = %numeric_cast(v, Char);
-      } else {
-        res = SWIG_OverflowError;
-      }
-    }
-  }
-  return res;
-}
-}
-
-%_typemap_string(StringCode,
-                 Char,
-                 SWIG_AsCharPtrAndSize,
-                 SWIG_FromCharPtrAndSize,
-                 SWIG_CharPtrLen,
-                 SWIG_CharBufLen,
-                 SWIG_As##CharName##Ptr,
-                 SWIG_From##CharName##Ptr,
-                 SWIG_As##CharName##Array,
-                 SWIG_NewCopyCharArray,
-                 SWIG_DeleteCharArray)
-
-%enddef
-
-%insert(runtime) %{
-#define SWIG_AsCharPtrAndSize(val, cptr, psize, alloc)  SWIG_JSC_AsCharPtrAndSize(context, val, cptr, psize, alloc)
-#define SWIG_FromCharPtrAndSize(cptr, size)  SWIG_JSC_FromCharPtrAndSize(context, cptr, size)
-#define SWIG_FromCharPtr(cptr) SWIG_JSC_FromCharPtr(context, cptr)
-%}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/javascripttypemaps.swg b/dependencies2013/win32/swig/Lib/javascript/jsc/javascripttypemaps.swg
deleted file mode 100644
index e8fbbeca..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/javascripttypemaps.swg
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ------------------------------------------------------------
- *  Typemap specializations for Javascript
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Fragment section
- * ------------------------------------------------------------ */
-
-/* These macros are necessary to provide an extra parameter
-   to SWIG_AsVal_dec functions (JSContextRef context).
-   They must be defined before including `typemaps/fragments.swg`
-*/
-#define SWIG_FROM_DECL_ARGS SWIG_JSC_FROM_DECL_ARGS
-#define SWIG_FROM_CALL_ARGS SWIG_JSC_FROM_CALL_ARGS
-#define SWIG_AS_DECL_ARGS SWIG_JSC_AS_DECL_ARGS
-#define SWIG_AS_CALL_ARGS SWIG_JSC_AS_CALL_ARGS
-
-/* Include fundamental fragemt definitions */
-%include <typemaps/fragments.swg>
-
-/* Look for user fragments file. */
-%include <javascriptfragments.swg>
-
-/* Javascript fragments for fundamental types */
-%include <javascriptprimtypes.swg>
-
-/* Javascript fragments for char* strings */
-%include <javascriptstrings.swg>
-
-/* ------------------------------------------------------------
- *  Unified typemap section
- * ------------------------------------------------------------ */
-
-#define SWIG_Object                     JSValueRef
-#define VOID_Object                     JSValueMakeUndefined(context)
-
-/* append output */
-#define SWIG_AppendOutput(result, obj) SWIGJSC_AppendOutput(context, result, obj)
-
-/* set constant */
-#define SWIG_SetConstant(name, obj)
-
-/* raise */
-#define SWIG_Raise(obj, type, desc)  SWIG_Javascript_Raise(context, exception, type)
-
-%insert("runtime") %{
-#define SWIG_JSC_FROM_DECL_ARGS(arg1)              (JSContextRef context, arg1)
-#define SWIG_JSC_FROM_CALL_ARGS(arg1)              (context, arg1)
-#define SWIG_JSC_AS_DECL_ARGS(arg1, arg2)          (JSContextRef context, arg1, arg2)
-#define SWIG_JSC_AS_CALL_ARGS(arg1, arg2)          (context, arg1, arg2)
-%}
-
-/* Include the unified typemap library */
-%include <typemaps/swigtypemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_common.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_common.i
deleted file mode 100644
index cee11e8c..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_common.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_complex.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_complex.i
deleted file mode 100644
index 088a4fe7..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_complex.i
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  STD C++ complex typemaps
- */
-
-%include <javascriptcomplex.swg>
-
-%{
-#include <complex> 
-%}
-
-/* defining the complex as/from converters */
-
-%swig_cplxdbl_convn(std::complex<double>, std::complex<double>, std::real, std::imag)
-%swig_cplxflt_convn(std::complex<float>,  std::complex<float>,  std::real, std::imag)
-
-/* defining the typemaps */
-
-%typemaps_primitive(%checkcode(CPLXDBL), std::complex<double>);
-%typemaps_primitive(%checkcode(CPLXFLT), std::complex<float>);
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_deque.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_except.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_map.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_map.i
deleted file mode 100644
index e7812f38..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_map.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_pair.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_pair.i
deleted file mode 100644
index fe45ee67..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_string.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_string.i
deleted file mode 100644
index dc1378ae..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_string.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/std_vector.i b/dependencies2013/win32/swig/Lib/javascript/jsc/std_vector.i
deleted file mode 100644
index 971b426a..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/std_vector.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-    
-    template<class T> class vector {
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            const_reference get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-    // bool specialization
-    template<> class vector<bool> {
-      public:
-        typedef size_t size_type;
-        typedef bool value_type;
-        typedef bool const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            bool get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-}
-
-%define specialize_std_vector(T)
-#warning "specialize_std_vector - specialization for type T no longer needed"
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/stl.i b/dependencies2013/win32/swig/Lib/javascript/jsc/stl.i
deleted file mode 100644
index 04f86014..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/stl.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/jsc/typemaps.i b/dependencies2013/win32/swig/Lib/javascript/jsc/typemaps.i
deleted file mode 100644
index d3d8afb1..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/jsc/typemaps.i
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer handling
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers.
- * ----------------------------------------------------------------------------- */
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/*
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-   long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/*
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Python tuple.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Python output of the function would be a tuple containing both
-output values.
-
-*/
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Python tuple.
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in Python).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a Python variable you might do this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-%include <typemaps/typemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/arrays_javascript.i b/dependencies2013/win32/swig/Lib/javascript/v8/arrays_javascript.i
deleted file mode 100644
index 22b50be8..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/arrays_javascript.i
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -----------------------------------------------------------------------------
- * arrays_javascript.i
- *
- * These typemaps give more natural support for arrays. The typemaps are not efficient
- * as there is a lot of copying of the array values whenever the array is passed to C/C++
- * from JavaScript and vice versa. The JavaScript array is expected to be the same size as the C array.
- * An exception is thrown if they are not.
- *
- * Example usage:
- * Wrapping:
- *
- *   %include <arrays_javascript.i>
- *   %inline %{
- *       extern int FiddleSticks[3];
- *   %}
- *
- * Use from JavaScript like this:
- *
- *   var fs = [10, 11, 12];
- *   example.FiddleSticks = fs;
- *   fs = example.FiddleSticks;
- * ----------------------------------------------------------------------------- */
-
-%fragment("SWIG_JSCGetIntProperty",    "header", fragment=SWIG_AsVal_frag(int)) {}
-%fragment("SWIG_JSCGetNumberProperty", "header", fragment=SWIG_AsVal_frag(double)) {}
-
-%typemap(in, fragment="SWIG_JSCGetIntProperty") int[], int[ANY]
-    (int length = 0, v8::Local<v8::Array> array, v8::Local<v8::Value> jsvalue, int i = 0, int res = 0, $*1_ltype temp) {
-  if ($input->IsArray())
-  {
-    // Convert into Array
-    array = v8::Local<v8::Array>::Cast($input);
-
-    length = $1_dim0;
-
-    $1  = ($*1_ltype *)malloc(sizeof($*1_ltype) * length);
-
-    // Get each element from array
-    for (i = 0; i < length; i++)
-    {
-      jsvalue = array->Get(i);
-
-      // Get primitive value from JSObject
-      res = SWIG_AsVal(int)(jsvalue, &temp);
-      if (!SWIG_IsOK(res))
-      {
-        SWIG_exception_fail(SWIG_ERROR, "Failed to convert $input to double");
-      }
-      arg$argnum[i] = temp;
-    }
-
-  }
-  else
-  {
-    SWIG_exception_fail(SWIG_ERROR, "$input is not JSObjectRef");
-  }
-}
-
-%typemap(freearg) int[], int[ANY] {
-    free($1);
-}
-
-%typemap(out, fragment=SWIG_From_frag(int)) int[], int[ANY] (int length = 0, int i = 0)
-{
-  length = $1_dim0;
-  v8::Local<v8::Array> array = v8::Array::New(length);
-
-  for (i = 0; i < length; i++)
-  {
-    array->Set(i, SWIG_From(int)($1[i]));
-  }
-
-
-  $result = array;
-}
-
-%typemap(in, fragment="SWIG_JSCGetNumberProperty") double[], double[ANY]
-    (int length = 0, v8::Local<v8::Array> array, v8::Local<v8::Value> jsvalue, int i = 0, int res = 0, $*1_ltype temp) {
-  if ($input->IsArray())
-  {
-    // Convert into Array
-    array = v8::Local<v8::Array>::Cast($input);
-
-    length = $1_dim0;
-
-    $1  = ($*1_ltype *)malloc(sizeof($*1_ltype) * length);
-
-    // Get each element from array
-    for (i = 0; i < length; i++)
-    {
-      jsvalue = array->Get(i);
-
-      // Get primitive value from JSObject
-      res = SWIG_AsVal(double)(jsvalue, &temp);
-      if (!SWIG_IsOK(res))
-      {
-        SWIG_exception_fail(SWIG_ERROR, "Failed to convert $input to double");
-      }
-      arg$argnum[i] = temp;
-    }
-
-  }
-  else
-  {
-    SWIG_exception_fail(SWIG_ERROR, "$input is not JSObjectRef");
-  }
-}
-
-%typemap(freearg) double[], double[ANY] {
-    free($1);
-}
-
-%typemap(out, fragment=SWIG_From_frag(double)) double[], double[ANY] (int length = 0, int i = 0)
-{
-  length = $1_dim0;
-  v8::Local<v8::Array> array = v8::Array::New(length);
-
-  for (i = 0; i < length; i++)
-  {
-    array->Set(i, SWIG_From(double)($1[i]));
-  }
-
-
-  $result = array;
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/ccomplex.i b/dependencies2013/win32/swig/Lib/javascript/v8/ccomplex.i
deleted file mode 100644
index 8eda920b..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/ccomplex.i
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ccomplex.i
- *
- * C complex typemaps
- * ISO C99:  7.3 Complex arithmetic <complex.h>
- * ----------------------------------------------------------------------------- */
-
-
-%include <javscriptcomplex.swg>
-
-%{
-#include <complex.h>
-%}
-
-
-/* C complex constructor */
-#define CCplxConst(r, i) ((r) + I*(i))
-
-%swig_cplxflt_convn(float complex, CCplxConst, creal, cimag);
-%swig_cplxdbl_convn(double complex, CCplxConst, creal, cimag);
-%swig_cplxdbl_convn(complex, CCplxConst, creal, cimag);
-
-/* declaring the typemaps */
-%typemaps_primitive(SWIG_TYPECHECK_CPLXFLT, float complex);
-%typemaps_primitive(SWIG_TYPECHECK_CPLXDBL, double complex);
-%typemaps_primitive(SWIG_TYPECHECK_CPLXDBL, complex);
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/cdata.i b/dependencies2013/win32/swig/Lib/javascript/v8/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/complex.i b/dependencies2013/win32/swig/Lib/javascript/v8/complex.i
deleted file mode 100644
index 4c3b3c5e..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/complex.i
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __cplusplus
-%include <std_complex.i>
-#else
-%include <ccomplex.i>
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/exception.i b/dependencies2013/win32/swig/Lib/javascript/v8/exception.i
deleted file mode 100644
index 0246cfde..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/exception.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/exception.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascript.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascript.swg
deleted file mode 100644
index 3a83b649..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascript.swg
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -----------------------------------------------------------------------------
- * javascript.swg
- *
- * Javascript typemaps
- * ----------------------------------------------------------------------------- */
-
-%include <typemaps/swigmacros.swg>
-
-%include <javascripttypemaps.swg>
-
-%include <javascriptruntime.swg>
-
-%include <javascripthelpers.swg>
-
-%include <javascriptkw.swg>
-
-%include <javascriptcode.swg>
-
-%include <javascriptinit.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptcode.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptcode.swg
deleted file mode 100644
index fb7d55c2..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptcode.swg
+++ /dev/null
@@ -1,494 +0,0 @@
-/* -----------------------------------------------------------------------------
- * js_ctor:  template for wrapping a ctor.
- *   - $jswrapper:        wrapper of called ctor
- *   - $jslocals:         locals part of wrapper
- *   - $jscode:           code part of wrapper
- *   - $jsargcount:       number of arguments
- *   - $jsmangledtype:    mangled type of class
- * ----------------------------------------------------------------------------- */
-
-%fragment("js_ctor", "templates") %{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Object> self = args.Holder();
-  $jslocals
-  if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
-  $jscode
-
-  SWIGV8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
-  SWIGV8_RETURN(self);
-
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_veto_ctor:  a vetoing ctor for abstract classes
- *   - $jswrapper:        name of wrapper
- *   - $jsname:           class name
- * ----------------------------------------------------------------------------- */
-%fragment ("js_veto_ctor", "templates")
-%{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  SWIG_exception(SWIG_ERROR, "Class $jsname can not be instantiated");
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_ctor_dispatcher:  dispatcher for overloaded constructors
- *   - $jswrapper:        name of wrapper
- *   - $jsname:           class name
- *   - $jsdispatchcases:  part containing code for dispatching
- * ----------------------------------------------------------------------------- */
-%fragment ("js_ctor_dispatcher", "templates")
-%{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  OverloadErrorHandler errorHandler;
-  v8::Handle<v8::Value> self;
-
-  // switch all cases by means of series of if-returns.
-  $jsdispatchcases
-
-  // default:
-  SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for construction of $jsmangledname");
-
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_overloaded_ctor:  template for wrapping a ctor.
- *   - $jswrapper:        wrapper of called ctor
- *   - $jslocals:         locals part of wrapper
- *   - $jscode:           code part of wrapper
- *   - $jsargcount:       number of arguments
- *   - $jsmangledtype:    mangled type of class
- * ----------------------------------------------------------------------------- */
-%fragment("js_overloaded_ctor", "templates") %{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args, V8ErrorHandler &SWIGV8_ErrorHandler) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Object> self = args.Holder();
-  $jslocals
-  if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
-  $jscode
-
-  SWIGV8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
-  SWIGV8_RETURN(self);
-
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_ctor_dispatch_case:  template for a dispatch case for calling an overloaded ctor.
- *   - $jsargcount:       number of arguments of called ctor
- *   - $jswrapper:        wrapper of called ctor
- *
- *  Note: a try-catch-like mechanism is used to switch cases
- * ----------------------------------------------------------------------------- */
-%fragment ("js_ctor_dispatch_case", "templates")
-%{
-  if(args.Length() == $jsargcount) {
-    errorHandler.err.Clear();
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-    self = $jswrapper(args, errorHandler);
-    if(errorHandler.err.IsEmpty()) {
-      SWIGV8_ESCAPE(self);
-    }
-#else
-    $jswrapper(args, errorHandler);
-    if(errorHandler.err.IsEmpty()) {
-      return;
-    }
-#endif
-  }
-%}
-
-/* -----------------------------------------------------------------------------
- * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
- *   - $jstype:         class type
- * ----------------------------------------------------------------------------- */
-%fragment ("js_dtor", "templates")
-%{
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-static void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
-  SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, void *parameter) {
-  SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SWIGV8_Proxy *proxy) {
-#else
-static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-  v8::Local<v8::Object> object = data.GetValue();
-  SWIGV8_Proxy *proxy = data.GetParameter();
-#endif
-
-  if(proxy->swigCMemOwn && proxy->swigCObject) {
-#ifdef SWIGRUNTIME_DEBUG
-    printf("Deleting wrapped instance: %s\n", proxy->info->name);
-#endif
-    $jsfree proxy->swigCObject;
-  }
-  delete proxy;
-
-  object.Clear();
-  
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  object.Dispose();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  object.Dispose(isolate);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-  object->Dispose(isolate);
-#else
-  object->Dispose();
-#endif
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_dtoroverride:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
- *   - $jstype:         class type
- *   - ${destructor_action}: The custom destructor action to invoke.
- * ----------------------------------------------------------------------------- */
-%fragment ("js_dtoroverride", "templates")
-%{
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-static void $jswrapper(v8::Persistent<v8::Value> object, void *parameter) {
-  SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, void *parameter) {
-  SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) {
-#else
-static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-  v8::Local<v8::Object> object = data.GetValue();
-  SWIGV8_Proxy *proxy = data.GetParameter();
-#endif
-
-  if(proxy->swigCMemOwn && proxy->swigCObject) {
-    $jstype arg1 = ($jstype)proxy->swigCObject;
-    ${destructor_action}
-  }
-  delete proxy;
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  object.Dispose();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  object.Dispose(isolate);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-  object->Dispose(isolate);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-  object->Dispose();
-#else
-  object.Clear();
-#endif
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_getter:  template for getter function wrappers
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment("js_getter", "templates")
-%{
-static SwigV8ReturnValue $jswrapper(v8::Local<v8::String> property, const SwigV8PropertyCallbackInfo &info) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Value> jsresult;
-  $jslocals
-  $jscode
-  SWIGV8_RETURN_INFO(jsresult, info);
-
-  goto fail;
-fail:
-  SWIGV8_RETURN_INFO(SWIGV8_UNDEFINED(), info);
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_setter:  template for setter function wrappers
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment("js_setter", "templates")
-%{
-static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value,
-  const SwigV8PropertyCallbackInfoVoid &info) {
-  SWIGV8_HANDLESCOPE();
-  
-  $jslocals
-  $jscode
-  goto fail;
-fail:
-  return;
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_function:  template for function wrappers
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment("js_function", "templates")
-%{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Value> jsresult;
-  $jslocals
-  if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
-
-  $jscode
-  SWIGV8_RETURN(jsresult);
-
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_function_dispatcher:  template for a function dispatcher for overloaded functions
- *   - $jswrapper:  wrapper function name
- *   - $jsname:     name of the wrapped function
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment("js_function_dispatcher", "templates")
-%{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Value> jsresult;
-  OverloadErrorHandler errorHandler;
-  $jscode
-
-  SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for function $jsname.");
-
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_overloaded_function:  template for a overloaded function
- *   - $jswrapper:  wrapper function name
- *   - $jslocals:   locals part of wrapper
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_overloaded_function", "templates")
-%{
-static SwigV8ReturnValue $jswrapper(const SwigV8Arguments &args, V8ErrorHandler &SWIGV8_ErrorHandler)
-{
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Value> jsresult;
-  $jslocals
-  $jscode
-  SWIGV8_RETURN(jsresult);
-
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-%}
-
-/* -----------------------------------------------------------------------------
- * js_function_dispatch_case:  template for a case used in the function dispatcher
- *   - $jswrapper:  wrapper function name
- *   - $jsargcount: number of arguments of overloaded function
- *   - $jscode:     code part of wrapper
- * ----------------------------------------------------------------------------- */
-%fragment ("js_function_dispatch_case", "templates")
-%{
-
-  if(args.Length() == $jsargcount) {
-    errorHandler.err.Clear();
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-    jsresult = $jswrapper(args, errorHandler);
-    if(errorHandler.err.IsEmpty()) {
-      SWIGV8_ESCAPE(jsresult);
-    }
-#else
-    $jswrapper(args, errorHandler);
-    if(errorHandler.err.IsEmpty()) {
-      return;
-    }
-#endif
-  }
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_declare_class_template:  template for a class template declaration.
- *   - $jsmangledname:  mangled class name
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_declare_class_template", "templates")
-%{
-  SWIGV8_ClientData $jsmangledname_clientData;
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_define_class_template:  template for a class template definition.
- *   - $jsmangledname:  mangled class name
- *   - $jsmangledtype:  mangled class type
- *   - $jsdtor:         the dtor wrapper
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_define_class_template", "templates")
-%{
-  /* Name: $jsmangledname, Type: $jsmangledtype, Dtor: $jsdtor */
-  v8::Handle<v8::FunctionTemplate> $jsmangledname_class = SWIGV8_CreateClassTemplate("$jsmangledname");
-  SWIGV8_SET_CLASS_TEMPL($jsmangledname_clientData.class_templ, $jsmangledname_class);
-  $jsmangledname_clientData.dtor = $jsdtor;
-  if (SWIGTYPE_$jsmangledtype->clientdata == 0) {
-    SWIGTYPE_$jsmangledtype->clientdata = &$jsmangledname_clientData;
-  }
-%}
-
-
-/* -----------------------------------------------------------------------------
- * jsv8_inherit:  template for an class inherit statement.
- *   - $jsmangledname:  mangled class name
- *   - $jsbaseclass:    mangled name of the base class
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_inherit", "templates")
-%{
-  if (SWIGTYPE_p$jsbaseclass->clientdata && !(static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ.IsEmpty()))
-  {
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-    $jsmangledname_class->Inherit(static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ);
-#else
-    $jsmangledname_class->Inherit(
-      v8::Local<v8::FunctionTemplate>::New(
-        v8::Isolate::GetCurrent(),
-        static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ)
-     );
-#endif
-
-#ifdef SWIGRUNTIME_DEBUG
-    printf("Inheritance successful $jsmangledname $jsbaseclass\n");
-#endif
-  } else {
-#ifdef SWIGRUNTIME_DEBUG
-    printf("Unable to inherit baseclass, it didn't exist $jsmangledname $jsbaseclass\n");
-#endif
-  }
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_create_class_instance:  template for creating an class object.
- *   - $jsname:         class name
- *   - $jsmangledname:  mangled class name
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_create_class_instance", "templates")
-%{
-  /* Class: $jsname ($jsmangledname) */
-  v8::Handle<v8::FunctionTemplate> $jsmangledname_class_0 = SWIGV8_CreateClassTemplate("$jsname");
-  $jsmangledname_class_0->SetCallHandler($jsctor);
-  $jsmangledname_class_0->Inherit($jsmangledname_class);
-  $jsmangledname_class_0->SetHiddenPrototype(true);
-  v8::Handle<v8::Object> $jsmangledname_obj = $jsmangledname_class_0->GetFunction();
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_register_class:  template for a statement that registers a class in a parent namespace.
- *   - $jsname:         class name
- *   - $jsmangledname:  mangled class name
- *   - $jsparent:       mangled name of parent namespace
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_register_class", "templates")
-%{
-  $jsparent_obj->Set(SWIGV8_SYMBOL_NEW("$jsname"), $jsmangledname_obj);
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_create_namespace:  template for a statement that creates a namespace object.
- *   - $jsmangledname:  mangled namespace name
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_create_namespace", "templates")
-%{
-  v8::Handle<v8::Object> $jsmangledname_obj = SWIGV8_OBJECT_NEW();
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_register_namespace:  template for a statement that registers a namespace in a parent namespace.
- *   - $jsname:         name of namespace
- *   - $jsmangledname:  mangled name of namespace
- *   - $jsparent:       mangled name of parent namespace
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_register_namespace", "templates")
-%{
-  $jsparent_obj->Set(SWIGV8_SYMBOL_NEW("$jsname"), $jsmangledname_obj);
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_register_member_function:  template for a statement that registers a member function.
- *   - $jsmangledname:  mangled class name
- *   - $jsname:         name of the function
- *   - $jswrapper:      wrapper of the member function
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_register_member_function", "templates")
-%{
-  SWIGV8_AddMemberFunction($jsmangledname_class, "$jsname", $jswrapper);
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_register_member_variable:  template for a statement that registers a member variable.
- *   - $jsmangledname:  mangled class name
- *   - $jsname:         name of the function
- *   - $jsgetter:       wrapper of the getter function
- *   - $jssetter:       wrapper of the setter function
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_register_member_variable", "templates")
-%{
-  SWIGV8_AddMemberVariable($jsmangledname_class, "$jsname", $jsgetter, $jssetter);
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_register_static_function:  template for a statement that registers a static class function.
- *   - $jsname:         function name
- *   - $jswrapper:      wrapper of the function
- *   - $jsparent:       mangled name of parent namespace
- *
- * Note: this template is also used for global functions.
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_register_static_function", "templates")
-%{
-  SWIGV8_AddStaticFunction($jsparent_obj, "$jsname", $jswrapper);
-%}
-
-/* -----------------------------------------------------------------------------
- * jsv8_register_static_variable:  template for a statement that registers a static variable.
- *   - $jsname:         variable name
- *   - $jsparent:       mangled name of parent namespace
- *   - $jsgetter:       wrapper of the getter function
- *   - $jssetter:       wrapper of the setter function
- *
- * Note: this template is also used for global variables.
- * ----------------------------------------------------------------------------- */
-%fragment("jsv8_register_static_variable", "templates")
-%{
-  SWIGV8_AddStaticVariable($jsparent_obj, "$jsname", $jsgetter, $jssetter);
-%}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptcomplex.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptcomplex.swg
deleted file mode 100644
index 1c0107be..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptcomplex.swg
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-  Defines the As/From converters for double/float complex, you need to
-  provide complex Type, the Name you want to use in the converters,
-  the complex Constructor method, and the Real and Imag complex
-  accessor methods.
-
-  See the std_complex.i and ccomplex.i for concrete examples.
-*/
-
-/* the common from converter */
-%define %swig_fromcplx_conv(Type, Real, Imag)
-%fragment(SWIG_From_frag(Type),"header",
-          fragment=SWIG_From_frag(double))
-{
-SWIGINTERNINLINE v8::Handle<v8::Value>
-SWIG_From_dec(Type)(%ifcplusplus(const Type&, Type) c)
-{
-  SWIGV8_HANDLESCOPE_ESC();
-
-  v8::Local<v8::Array> vals = SWIGV8_ARRAY_NEW(2);
-
-  vals->Set(0, SWIG_From(double)(Real(c)));
-  vals->Set(1, SWIG_From(double)(Imag(c)));
-  SWIGV8_ESCAPE(vals);
-}
-}
-%enddef
-
-/* the double case */
-%define %swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-	  fragment=SWIG_AsVal_frag(double))
-{
-SWIGINTERN int
-SWIG_AsVal_dec(Type) (v8::Handle<v8::Value> o, Type* val)
-{
-  SWIGV8_HANDLESCOPE();
-  
-  if (o->IsArray()) {
-    v8::Handle<v8::Array> array = v8::Handle<v8::Array>::Cast(o);
-    
-    if(array->Length() != 2) SWIG_Error(SWIG_TypeError, "Illegal argument for complex: must be array[2].");
-    double re, im;
-    int res;
-
-    res = SWIG_AsVal(double)(array->Get(0), &re);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    res = SWIG_AsVal(double)(array->Get(1), &im);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    if (val) *val = Constructor(re, im);
-    return SWIG_OK;
-  } else if(o->IsNumber()){
-    double d;
-    int res = SWIG_AddCast(SWIG_AsVal(double)(o, &d));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(d, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-/* the float case */
-%define %swig_cplxflt_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-          fragment=SWIG_AsVal_frag(float)) {
-SWIGINTERN int
-SWIG_AsVal_dec(Type) (v8::Handle<v8::Value> o, Type* val)
-{
-  SWIGV8_HANDLESCOPE();
-
-  if (o->IsArray()) {
-    v8::Handle<v8::Array> array = v8::Handle<v8::Array>::Cast(o);
-    
-    if(array->Length() != 2) SWIG_Error(SWIG_TypeError, "Illegal argument for complex: must be array[2].");
-    double re, im;
-    int res;
-
-    res = SWIG_AsVal(double)(array->Get(0), &re);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    res = SWIG_AsVal(double)(array->Get(1), &im);
-    if(!SWIG_IsOK(res)) {
-      return SWIG_TypeError;
-    }
-    
-    if ((-FLT_MAX <= re && re <= FLT_MAX) && (-FLT_MAX <= im && im <= FLT_MAX)) {
-      if (val) *val = Constructor(%numeric_cast(re, float),
-                                  %numeric_cast(im, float));
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }    
-  } else if(o->IsNumber()){
-    float re;
-    int res = SWIG_AddCast(SWIG_AsVal(float)(o, &re));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(re, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-#define %swig_cplxflt_convn(Type, Constructor, Real, Imag) \
-%swig_cplxflt_conv(Type, Constructor, Real, Imag)
-
-
-#define %swig_cplxdbl_convn(Type, Constructor, Real, Imag) \
-%swig_cplxdbl_conv(Type, Constructor, Real, Imag)
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptfragments.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptfragments.swg
deleted file mode 100644
index 4778bf03..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptfragments.swg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-  Create a file with this name, 'javascriptfragments.swg', in your working
-  directory and add all the %fragments you want to take precedence
-  over the default ones defined by swig.
-
-  For example, if you add:
-  
-  %fragment(SWIG_AsVal_frag(int),"header") {
-   SWIGINTERNINLINE int
-   SWIG_AsVal(int)(PyObject *obj, int *val)
-   { 
-     <your code here>;
-   }
-  }
-  
-  this will replace the code used to retrieve an integer value for all
-  the typemaps that need it, including:
-  
-    int, std::vector<int>, std::list<std::pair<int,int> >, etc.
-
-    
-*/
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascripthelpers.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascripthelpers.swg
deleted file mode 100644
index 091467df..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascripthelpers.swg
+++ /dev/null
@@ -1,89 +0,0 @@
-%insert(runtime) %{
-
-// Note: since 3.19 there are new CallBack types, since 03.21.9 the old ones have been removed
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-typedef v8::InvocationCallback  SwigV8FunctionCallback;
-typedef v8::AccessorGetter      SwigV8AccessorGetterCallback;
-typedef v8::AccessorSetter      SwigV8AccessorSetterCallback;
-typedef v8::AccessorInfo        SwigV8PropertyCallbackInfoVoid;
-#else
-typedef v8::FunctionCallback            SwigV8FunctionCallback;
-typedef v8::AccessorGetterCallback      SwigV8AccessorGetterCallback;
-typedef v8::AccessorSetterCallback      SwigV8AccessorSetterCallback;
-typedef v8::PropertyCallbackInfo<void>  SwigV8PropertyCallbackInfoVoid;
-#endif
-
-/**
- * Creates a class template for a class with specified initialization function.
- */
-SWIGRUNTIME v8::Handle<v8::FunctionTemplate> SWIGV8_CreateClassTemplate(const char* symbol) {
-    SWIGV8_HANDLESCOPE_ESC();
-    
-    v8::Local<v8::FunctionTemplate> class_templ = SWIGV8_FUNCTEMPLATE_NEW_VOID();
-    class_templ->SetClassName(SWIGV8_SYMBOL_NEW(symbol));
-
-    v8::Handle<v8::ObjectTemplate> inst_templ = class_templ->InstanceTemplate();
-    inst_templ->SetInternalFieldCount(1);
-
-    v8::Handle<v8::ObjectTemplate> equals_templ = class_templ->PrototypeTemplate();
-    equals_templ->Set(SWIGV8_SYMBOL_NEW("equals"), SWIGV8_FUNCTEMPLATE_NEW(_SWIGV8_wrap_equals));
-
-    v8::Handle<v8::ObjectTemplate> cptr_templ = class_templ->PrototypeTemplate();
-    cptr_templ->Set(SWIGV8_SYMBOL_NEW("getCPtr"), SWIGV8_FUNCTEMPLATE_NEW(_wrap_getCPtr));
-
-    SWIGV8_ESCAPE(class_templ);
-}
-
-/**
- * Registers a class method with given name for a given class template.
- */
-SWIGRUNTIME void SWIGV8_AddMemberFunction(v8::Handle<v8::FunctionTemplate> class_templ, const char* symbol,
-  SwigV8FunctionCallback _func) {
-    v8::Handle<v8::ObjectTemplate> proto_templ = class_templ->PrototypeTemplate();
-    proto_templ->Set(SWIGV8_SYMBOL_NEW(symbol), SWIGV8_FUNCTEMPLATE_NEW(_func));
-}
-
-/**
- * Registers a class property with given name for a given class template.
- */
-SWIGRUNTIME void SWIGV8_AddMemberVariable(v8::Handle<v8::FunctionTemplate> class_templ, const char* symbol,
-  SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) {
-  v8::Handle<v8::ObjectTemplate> proto_templ = class_templ->InstanceTemplate();
-  proto_templ->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter);
-}
-
-/**
- * Registers a class method with given name for a given object.
- */
-SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle<v8::Object> obj, const char* symbol,
-  const SwigV8FunctionCallback& _func) {
-  obj->Set(SWIGV8_SYMBOL_NEW(symbol), SWIGV8_FUNCTEMPLATE_NEW(_func)->GetFunction());
-}
-
-/**
- * Registers a class method with given name for a given object.
- */
-SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle<v8::Object> obj, const char* symbol,
-  SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) {
-  obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter);
-}
-
-SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value,
-  const SwigV8PropertyCallbackInfoVoid& info)
-{
-    char buffer[256];
-    char msg[512];
-    int res;
-
-    property->WriteUtf8(buffer, 256);
-    res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
-
-    if(res<0) {
-      SWIG_exception(SWIG_ERROR, "Tried to write read-only variable.");
-    } else {
-      SWIG_exception(SWIG_ERROR, msg);
-    }
-fail: ;
-}
-
-%} // v8_helper_functions
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptinit.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptinit.swg
deleted file mode 100644
index 34befa7c..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptinit.swg
+++ /dev/null
@@ -1,115 +0,0 @@
-%insert(init) %{
-
-#include <assert.h>
-
-SWIGRUNTIME void
-SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
-  v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
-  v8::Local<v8::External> mod = SWIGV8_EXTERNAL_NEW(swig_module);
-  assert(!mod.IsEmpty());
-  global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod);
-}
-
-SWIGRUNTIME swig_module_info *
-SWIG_V8_GetModule(void *) {
-  v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
-  v8::Local<v8::Value> moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"));
-
-  if (moduleinfo.IsEmpty())
-  {
-    // It's not yet loaded
-    return 0;
-  }
-
-  v8::Local<v8::External> moduleinfo_extern = v8::Local<v8::External>::Cast(moduleinfo);
-
-  if (moduleinfo_extern.IsEmpty())
-  {
-    // Something's not right
-    return 0;
-  }
-
-  void *ptr = moduleinfo_extern->Value();
-  assert(ptr);
-  swig_module_info *retptr = static_cast<swig_module_info *>(ptr);
-  assert(retptr);
-  return retptr;
-}
-
-#define SWIG_GetModule(clientdata)                SWIG_V8_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer)       SWIG_V8_SetModule(clientdata, pointer)
-
-%}
-
-%insert(init) "swiginit.swg"
-
-// Open the initializer function definition here
-
-%fragment ("js_initializer_define", "templates") %{
-#define SWIGV8_INIT $jsname_initialize
-%}
-
-%insert(init) %{
-// Note: 'extern "C"'' disables name mangling which makes it easier to load the symbol manually
-// TODO: is it ok to do that?
-extern "C"
-#if (NODE_MODULE_VERSION < 0x000C)
-void SWIGV8_INIT (v8::Handle<v8::Object> exports)
-#else
-void SWIGV8_INIT (v8::Handle<v8::Object> exports, v8::Handle<v8::Object> /*module*/)
-#endif
-{
-  SWIG_InitializeModule(static_cast<void *>(&exports));
-
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Object> exports_obj = exports;
-%}
-
-
-/* -----------------------------------------------------------------------------
- * js_initializer:  template for the module initializer function
- *   - $jsname:                   module name
- *   - $jsv8nspaces:              part with code creating namespace objects
- *   - $jsv8classtemplates:       part with code creating class templates
- *   - $jsv8wrappers:             part with code that registers wrapper functions
- *   - $jsv8inheritance:          part with inherit statements
- *   - $jsv8classinstances:       part with code creating class objects
- *   - $jsv8staticwrappers:       part with code adding static functions to class objects
- *   - $jsv8registerclasses:      part with code that registers class objects in namespaces
- *   - $jsv8registernspaces:      part with code that registers namespaces in parent namespaces
- * ----------------------------------------------------------------------------- */
-%fragment("js_initializer", "templates")
-%{
-  // a class template for creating proxies of undefined types
-  SWIGV8_SET_CLASS_TEMPL(SWIGV8_SWIGTYPE_Proxy_class_templ, SWIGV8_CreateClassTemplate("SwigProxy"));
-
-  /* create objects for namespaces */
-  $jsv8nspaces
-
-  /* create class templates */
-  $jsv8classtemplates
-
-  /* register wrapper functions */
-  $jsv8wrappers
-
-  /* setup inheritances */
-  $jsv8inheritance
-
-  /* class instances */
-  $jsv8classinstances
-
-  /* add static class functions and variables */
-  $jsv8staticwrappers
-
-  /* register classes */
-  $jsv8registerclasses
-
-  /* create and register namespace objects */
-  $jsv8registernspaces
-}
-
-#if defined(BUILDING_NODE_EXTENSION)
-NODE_MODULE($jsname, $jsname_initialize)
-#endif
-%}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptkw.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptkw.swg
deleted file mode 100644
index c3c11839..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptkw.swg
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef JAVASCRIPT_JAVASCRIPTKW_SWG_
-#define JAVASCRIPT_JAVASCRIPTKW_SWG_
-
-/* Warnings for Java keywords */
-#define JAVASCRIPTKW(x) %keywordwarn("'" `x` "' is a javascript keyword, renaming to '_"`x`"'",rename="_%s")  `x`
-
-/* Taken from https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference/Reserved_Words */
-
-JAVASCRIPTKW(break);
-JAVASCRIPTKW(case);
-JAVASCRIPTKW(catch);
-JAVASCRIPTKW(continue);
-JAVASCRIPTKW(default);
-JAVASCRIPTKW(delete);
-JAVASCRIPTKW(do);
-JAVASCRIPTKW(else);
-JAVASCRIPTKW(finally);
-JAVASCRIPTKW(for);
-JAVASCRIPTKW(function);
-JAVASCRIPTKW(if);
-JAVASCRIPTKW(in);
-JAVASCRIPTKW(instanceof);
-JAVASCRIPTKW(new);
-JAVASCRIPTKW(return);
-JAVASCRIPTKW(switch);
-JAVASCRIPTKW(this);
-JAVASCRIPTKW(throw);
-JAVASCRIPTKW(try);
-JAVASCRIPTKW(typeof);
-JAVASCRIPTKW(var);
-JAVASCRIPTKW(void);
-JAVASCRIPTKW(while);
-JAVASCRIPTKW(with);
-
-/* others bad names if any*/
-// for example %namewarn("321:clone() is a javascript bad method name") *::clone();
-
-#undef JAVASCRIPTKW
-
-#endif //JAVASCRIPT_JAVASCRIPTKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptprimtypes.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptprimtypes.swg
deleted file mode 100644
index c0055c48..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptprimtypes.swg
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-/* boolean */
-
-%fragment(SWIG_From_frag(bool),"header") {
-SWIGINTERNINLINE
-v8::Handle<v8::Value>
-SWIG_From_dec(bool)(bool value)
-{
-  return SWIGV8_BOOLEAN_NEW(value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header",
-          fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN
-int SWIG_AsVal_dec(bool)(v8::Handle<v8::Value> obj, bool *val)
-{
-  if(!obj->IsBoolean()) {
-    return SWIG_ERROR;
-  }
-
-  if (val) *val = obj->BooleanValue();
-  return SWIG_OK;
-}
-}
-
-/* int */
-
-%fragment(SWIG_From_frag(int),"header") {
-SWIGINTERNINLINE
-v8::Handle<v8::Value> SWIG_From_dec(int)(int value)
-{
-  return SWIGV8_INT32_NEW(value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(int),"header") {
-SWIGINTERN
-int SWIG_AsVal_dec(int)(v8::Handle<v8::Value> valRef, int* val)
-{
-  if (!valRef->IsNumber()) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = valRef->IntegerValue();
-
-  return SWIG_OK;
-}
-}
-
-/* long */
-
-%fragment(SWIG_From_frag(long),"header") {
-SWIGINTERNINLINE
-v8::Handle<v8::Value> SWIG_From_dec(long)(long value)
-{
-  return SWIGV8_NUMBER_NEW(value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(long),"header",
-          fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN
-int SWIG_AsVal_dec(long)(v8::Handle<v8::Value> obj, long* val)
-{
-  if (!obj->IsNumber()) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = (long) obj->IntegerValue();
-
-  return SWIG_OK;
-}
-}
-
-/* unsigned long */
-
-%fragment(SWIG_From_frag(unsigned long),"header",
-          fragment=SWIG_From_frag(long)) {
-SWIGINTERNINLINE
-v8::Handle<v8::Value> SWIG_From_dec(unsigned long)(unsigned long value)
-{
-  return (value > LONG_MAX) ?
-    SWIGV8_INTEGER_NEW_UNS(value) : SWIGV8_INTEGER_NEW(%numeric_cast(value,long));
-}
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header",
-          fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN
-int SWIG_AsVal_dec(unsigned long)(v8::Handle<v8::Value> obj, unsigned long *val)
-{
-  if(!obj->IsNumber()) {
-    return SWIG_TypeError;
-  }
-
-  long longVal = (long) obj->NumberValue();
-
-  if(longVal < 0) {
-      return SWIG_OverflowError;
-  }
-
-  if(val) *val = longVal;
-
-  return SWIG_OK;
-}
-}
-
-/* long long */
-// Note: these are copied from 'long' and probably need fixing
-
-%fragment(SWIG_From_frag(long long),"header",
-    fragment=SWIG_From_frag(long),
-    fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE
-v8::Handle<v8::Value> SWIG_From_dec(long long)(long long value)
-{
-  return SWIGV8_NUMBER_NEW(value);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-    fragment=SWIG_AsVal_frag(long),
-    fragment="SWIG_CanCastAsInteger",
-    fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN
-int SWIG_AsVal_dec(long long)(v8::Handle<v8::Value> obj, long long* val)
-{
-  if (!obj->IsNumber()) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = (long long) obj->IntegerValue();
-
-  return SWIG_OK;
-}
-%#endif
-}
-
-/* unsigned long long */
-// Note: these are copied from 'unsigned long' and probably need fixing
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-    fragment=SWIG_From_frag(long long),
-    fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE
-v8::Handle<v8::Value> SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-  return (value > LONG_MAX) ?
-    SWIGV8_INTEGER_NEW_UNS(value) : SWIGV8_INTEGER_NEW(%numeric_cast(value,long));
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-    fragment=SWIG_AsVal_frag(unsigned long),
-    fragment="SWIG_CanCastAsInteger",
-    fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN
-int SWIG_AsVal_dec(unsigned long long)(v8::Handle<v8::Value> obj, unsigned long long *val)
-{
-  if(!obj->IsNumber()) {
-    return SWIG_TypeError;
-  }
-
-  long long longVal = (long long) obj->NumberValue();
-
-  if(longVal < 0) {
-      return SWIG_OverflowError;
-  }
-
-  if(val) *val = longVal;
-
-  return SWIG_OK;
-}
-%#endif
-}
-
-/* double */
-
-%fragment(SWIG_From_frag(double),"header") {
-SWIGINTERN
-v8::Handle<v8::Value> SWIG_From_dec(double) (double val)
-{
-  return SWIGV8_NUMBER_NEW(val);
-}
-}
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-SWIGINTERN
-int SWIG_AsVal_dec(double)(v8::Handle<v8::Value> obj, double *val)
-{
-  if(!obj->IsNumber()) {
-    return SWIG_TypeError;
-  }
-  if(val) *val = obj->NumberValue();
-
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptrun.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptrun.swg
deleted file mode 100644
index 5ac52a51..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptrun.swg
+++ /dev/null
@@ -1,621 +0,0 @@
-/* ---------------------------------------------------------------------------
- * These typedefs and defines are used to deal with v8 API changes
- *
- * ---------------------------------------------------------------------------*/
-
-// First v8 version that uses "SetWeak" and not "MakeWeak"
-
-#define SWIGV8_SETWEAK_VERSION 0x032224
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031803)
-#define SWIGV8_STRING_NEW2(cstr, len) v8::String::New(cstr, len)
-#else
-#define SWIGV8_STRING_NEW2(cstr, len) v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), cstr, v8::String::kNormalString, len)
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-typedef v8::Handle<v8::Value> SwigV8ReturnValue;
-typedef v8::Arguments SwigV8Arguments;
-typedef v8::AccessorInfo SwigV8PropertyCallbackInfo;
-#define SWIGV8_RETURN(val) return scope.Close(val)
-#define SWIGV8_RETURN_INFO(val, info) return scope.Close(val)
-#else
-typedef void SwigV8ReturnValue;
-typedef v8::FunctionCallbackInfo<v8::Value> SwigV8Arguments;
-typedef v8::PropertyCallbackInfo<v8::Value> SwigV8PropertyCallbackInfo;
-#define SWIGV8_RETURN(val) args.GetReturnValue().Set(val); return
-#define SWIGV8_RETURN_INFO(val, info) info.GetReturnValue().Set(val); return
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032117)
-#define SWIGV8_HANDLESCOPE() v8::HandleScope scope
-#define SWIGV8_HANDLESCOPE_ESC() v8::HandleScope scope
-#define SWIGV8_ESCAPE(val) return scope.Close(val)
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032224)
-#define SWIGV8_HANDLESCOPE() v8::HandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_HANDLESCOPE_ESC() v8::HandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_ESCAPE(val) return scope.Close(val)
-#else
-#define SWIGV8_HANDLESCOPE() v8::HandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_HANDLESCOPE_ESC() v8::EscapableHandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_ESCAPE(val) return scope.Escape(val)
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032224)
-#define SWIGV8_ADJUST_MEMORY(size) v8::V8::AdjustAmountOfExternalAllocatedMemory(size)
-#define SWIGV8_CURRENT_CONTEXT() v8::Context::GetCurrent()
-#define SWIGV8_THROW_EXCEPTION(err) v8::ThrowException(err)
-#define SWIGV8_STRING_NEW(str) v8::String::New(str)
-#define SWIGV8_SYMBOL_NEW(sym) v8::String::NewSymbol(sym)
-#else
-#define SWIGV8_ADJUST_MEMORY(size) v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(size)
-#define SWIGV8_CURRENT_CONTEXT() v8::Isolate::GetCurrent()->GetCurrentContext()
-#define SWIGV8_THROW_EXCEPTION(err) v8::Isolate::GetCurrent()->ThrowException(err)
-#define SWIGV8_STRING_NEW(str) v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), str)
-#define SWIGV8_SYMBOL_NEW(sym) v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), sym)
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032318)
-#define SWIGV8_ARRAY_NEW() v8::Array::New()
-#define SWIGV8_BOOLEAN_NEW(bool) v8::Boolean::New(bool)
-#define SWIGV8_EXTERNAL_NEW(val) v8::External::New(val)
-#define SWIGV8_FUNCTEMPLATE_NEW(func) v8::FunctionTemplate::New(func)
-#define SWIGV8_FUNCTEMPLATE_NEW_VOID() v8::FunctionTemplate::New()
-#define SWIGV8_INT32_NEW(num) v8::Int32::New(num)
-#define SWIGV8_INTEGER_NEW(num) v8::Integer::New(num)
-#define SWIGV8_INTEGER_NEW_UNS(num) v8::Integer::NewFromUnsigned(num)
-#define SWIGV8_NUMBER_NEW(num) v8::Number::New(num)
-#define SWIGV8_OBJECT_NEW() v8::Object::New()
-#define SWIGV8_UNDEFINED() v8::Undefined()
-#define SWIGV8_NULL() v8::Null()
-#else
-#define SWIGV8_ARRAY_NEW() v8::Array::New(v8::Isolate::GetCurrent())
-#define SWIGV8_BOOLEAN_NEW(bool) v8::Boolean::New(v8::Isolate::GetCurrent(), bool)
-#define SWIGV8_EXTERNAL_NEW(val) v8::External::New(v8::Isolate::GetCurrent(), val)
-#define SWIGV8_FUNCTEMPLATE_NEW(func) v8::FunctionTemplate::New(v8::Isolate::GetCurrent(), func)
-#define SWIGV8_FUNCTEMPLATE_NEW_VOID() v8::FunctionTemplate::New(v8::Isolate::GetCurrent())
-#define SWIGV8_INT32_NEW(num) v8::Int32::New(v8::Isolate::GetCurrent(), num)
-#define SWIGV8_INTEGER_NEW(num) v8::Integer::New(v8::Isolate::GetCurrent(), num)
-#define SWIGV8_INTEGER_NEW_UNS(num) v8::Integer::NewFromUnsigned(v8::Isolate::GetCurrent(), num)
-#define SWIGV8_NUMBER_NEW(num) v8::Number::New(v8::Isolate::GetCurrent(), num)
-#define SWIGV8_OBJECT_NEW() v8::Object::New(v8::Isolate::GetCurrent())
-#define SWIGV8_UNDEFINED() v8::Undefined(v8::Isolate::GetCurrent())
-#define SWIGV8_NULL() v8::Null(v8::Isolate::GetCurrent())
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-#define SWIGV8_SET_CLASS_TEMPL(class_templ, class) class_templ = v8::Persistent<v8::FunctionTemplate>::New(class);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-#define SWIGV8_SET_CLASS_TEMPL(class_templ, class) class_templ = v8::Persistent<v8::FunctionTemplate>::New(v8::Isolate::GetCurrent(), class);
-#else
-#define SWIGV8_SET_CLASS_TEMPL(class_templ, class) class_templ.Reset(v8::Isolate::GetCurrent(), class);
-#endif
-
-/* ---------------------------------------------------------------------------
- * Error handling
- *
- * ---------------------------------------------------------------------------*/
-
-#define SWIG_Error(code, msg)     SWIGV8_ErrorHandler.error(code, msg)
-#define SWIG_exception(code, msg) do { SWIGV8_ErrorHandler.error(code, msg); SWIG_fail; } while (0)
-#define SWIG_fail                 goto fail
-#define SWIGV8_OVERLOAD false
-
-SWIGINTERN void SWIG_V8_Raise(const char *msg) {
-  SWIGV8_THROW_EXCEPTION(v8::Exception::Error(SWIGV8_STRING_NEW(msg)));
-}
-
-/*
-  Note: There are two contexts for handling errors.
-  A static V8ErrorHandler is used in not overloaded methods.
-  For overloaded methods the throwing type checking mechanism is used
-  during dispatching. As V8 exceptions can not be resetted properly
-  the trick is to use a dynamic ErrorHandler with same local name as the global
-  one.
-
-  - See defintion of SWIG_Error above.
-  - See code templates 'JS_function_dispatcher', 'JS_functionwrapper_overload',
-    and 'JS_function_dispatch_case' in javascriptcode.swg
-
-*/
-class V8ErrorHandler {
-public:
-  virtual ~V8ErrorHandler() {}
-  virtual void error(int code, const char *msg) {
-    SWIG_V8_Raise(msg);
-  }
-};
-// this is used in usually
-SWIGRUNTIME V8ErrorHandler SWIGV8_ErrorHandler;
-
-// instances of this are used in overloaded functions
-class OverloadErrorHandler: public V8ErrorHandler {
-public:
-  virtual void error(int code, const char *msg) {
-    err = v8::Exception::Error(SWIGV8_STRING_NEW(msg));
-    if(code != SWIG_TypeError) {
-        SWIGV8_THROW_EXCEPTION(err);
-    }
-  }
-  v8::Handle<v8::Value> err;
-};
-
-/* ---------------------------------------------------------------------------
- * Basic Proxy object
- *
- * ---------------------------------------------------------------------------*/
-
-// Note: to trigger the v8 gc more often one can tell v8 about the memory consumption
-// TODO: we could add a v8 specific parameter to control this value
-#define SWIGV8_AVG_OBJ_SIZE 1000
-
-class SWIGV8_Proxy {
-public:
-  SWIGV8_Proxy(): swigCMemOwn(false), swigCObject(0), info(0) {
-    SWIGV8_ADJUST_MEMORY(SWIGV8_AVG_OBJ_SIZE);
-  };
-
-  ~SWIGV8_Proxy() {
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-    handle.ClearWeak();
-    handle.Dispose();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-    handle.ClearWeak(v8::Isolate::GetCurrent());
-    handle.Dispose(v8::Isolate::GetCurrent());
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-    handle.ClearWeak();
-    handle.Dispose();
-#else    
-    handle.ClearWeak();
-    handle.Reset();
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-    handle.Clear();
-#endif
-
-    SWIGV8_ADJUST_MEMORY(-SWIGV8_AVG_OBJ_SIZE);
-  }
-
-  bool swigCMemOwn;
-  void *swigCObject;
-  swig_type_info *info;
-  v8::Persistent<v8::Object> handle;
-};
-
-class SWIGV8_ClientData {
-public:
-  v8::Persistent<v8::FunctionTemplate> class_templ;
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  void (*dtor) (v8::Persistent< v8::Value> object, void *parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-  void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
-#else
-  void (*dtor) (const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data);
-#endif
-};
-
-SWIGRUNTIME v8::Persistent<v8::FunctionTemplate> SWIGV8_SWIGTYPE_Proxy_class_templ;
-
-SWIGRUNTIME int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void **ptr, swig_type_info *info, int flags) {
-  SWIGV8_HANDLESCOPE();
-
-  if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
-  v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
-  SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef));
-#else
-  SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(objRef->GetAlignedPointerFromInternalField(0));
-#endif
-
-  if(cdata == NULL) {
-    return SWIG_ERROR;
-  }
-  if(cdata->info != info) {
-    swig_cast_info *tc = SWIG_TypeCheckStruct(cdata->info, info);
-    if (!tc && cdata->info->name) {
-      tc = SWIG_TypeCheck(cdata->info->name, info);
-    }
-    bool type_valid = tc != 0;
-    if(!type_valid) {
-      return SWIG_TypeError;
-    }
-  }
-  *ptr = cdata->swigCObject;
-  if(flags & SWIG_POINTER_DISOWN) {
-    cdata->swigCMemOwn = false;
-  }
-  return SWIG_OK;
-}
-
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter) {
-  SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Value > object, void *parameter) {
-  SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
-#else
-SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-  SWIGV8_Proxy *proxy = data.GetParameter();
-#endif
-
-  delete proxy;
-}
-
-SWIGRUNTIME int SWIG_V8_GetInstancePtr(v8::Handle<v8::Value> valRef, void **ptr) {
-  if(!valRef->IsObject()) {
-    return SWIG_TypeError;
-  }
-  v8::Handle<v8::Object> objRef = valRef->ToObject();
-
-  if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
-  v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
-  SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef));
-#else
-  SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(objRef->GetAlignedPointerFromInternalField(0));
-#endif
-
-  if(cdata == NULL) {
-    return SWIG_ERROR;
-  }
-
-  *ptr = cdata->swigCObject;
-
-  return SWIG_OK;
-}
-
-SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, swig_type_info *info, int flags) {
-  SWIGV8_Proxy *cdata = new SWIGV8_Proxy();
-  cdata->swigCObject = ptr;
-  cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
-  cdata->info = info;
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
-  obj->SetPointerInInternalField(0, cdata);
-#else
-  obj->SetAlignedPointerInInternalField(0, cdata);
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  cdata->handle = v8::Persistent<v8::Object>::New(obj);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  cdata->handle = v8::Persistent<v8::Object>::New(v8::Isolate::GetCurrent(), obj);
-#else
-  cdata->handle.Reset(v8::Isolate::GetCurrent(), obj);
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  // clientdata must be set for owned data as we need to register the dtor
-  if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-    cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
-  } else {
-    cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
-  }
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031918)
-  if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-    cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
-  } else {
-    cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, SWIGV8_Proxy_DefaultDtor);
-  }
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-  if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-    cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
-  } else {
-    cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
-  }
-#else
-  if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-    cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
-  } else {
-    cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor);
-  }
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  cdata->handle.MarkIndependent();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-  cdata->handle.MarkIndependent(v8::Isolate::GetCurrent());
-#else
-  cdata->handle.MarkIndependent();
-#endif
-
-}
-
-SWIGRUNTIME int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void **ptr, swig_type_info *info, int flags) {
-  SWIGV8_HANDLESCOPE();
-  
-  /* special case: JavaScript null => C NULL pointer */
-  if(valRef->IsNull()) {
-    *ptr=0;
-    return SWIG_OK;
-  }
-  if(!valRef->IsObject()) {
-    return SWIG_TypeError;
-  }
-  v8::Handle<v8::Object> objRef = valRef->ToObject();
-  return SWIG_V8_ConvertInstancePtr(objRef, ptr, info, flags);
-}
-
-SWIGRUNTIME v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) {
-  SWIGV8_HANDLESCOPE_ESC();
-  
-  v8::Handle<v8::FunctionTemplate> class_templ;
-
-  if (ptr == NULL) {
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-    SWIGV8_ESCAPE(SWIGV8_NULL());
-#else    
-    v8::Local<v8::Primitive> result = SWIGV8_NULL();
-    SWIGV8_ESCAPE(result);
-#endif
-  }
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-  if(info->clientdata != 0) {
-    class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ;
-  } else {
-    class_templ = SWIGV8_SWIGTYPE_Proxy_class_templ;
-  }
-#else
-  v8::Isolate *isolate = v8::Isolate::GetCurrent();
-
-  if(info->clientdata != 0) {
-    class_templ = v8::Local<v8::FunctionTemplate>::New(isolate, ((SWIGV8_ClientData*) info->clientdata)->class_templ);
-  } else {
-    class_templ = v8::Local<v8::FunctionTemplate>::New(isolate, SWIGV8_SWIGTYPE_Proxy_class_templ);
-  }
-#endif
-
-//  v8::Handle<v8::Object> result = class_templ->InstanceTemplate()->NewInstance();
-  v8::Local<v8::Object> result = class_templ->InstanceTemplate()->NewInstance();
-  SWIGV8_SetPrivateData(result, ptr, info, flags);
-
-  SWIGV8_ESCAPE(result);
-}
-
-#define SWIG_ConvertPtr(obj, ptr, info, flags)    SWIG_V8_ConvertPtr(obj, ptr, info, flags)
-#define SWIG_NewPointerObj(ptr, info, flags)      SWIG_V8_NewPointerObj(ptr, info, flags)
-
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_V8_ConvertInstancePtr(obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(thisvalue, type, flags)     SWIG_V8_NewPointerObj(thisvalue, type, flags)
-
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_V8_ConvertPtr(obj, pptr, type, 0)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_V8_NewPointerObj(ptr, type, 0)
-
-#define SWIG_GetInstancePtr(obj, ptr)    SWIG_V8_GetInstancePtr(obj, ptr)
-
-SWIGRUNTIME SwigV8ReturnValue _SWIGV8_wrap_equals(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Value> jsresult;
-  void *arg1 = (void *) 0 ;
-  void *arg2 = (void *) 0 ;
-  bool result;
-  int res1;
-  int res2;
-
-  if(args.Length() != 1) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for equals.");
-
-  res1 = SWIG_GetInstancePtr(args.Holder(), &arg1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ERROR, "Could not get pointer from 'this' object for equals.");
-  }
-  res2 = SWIG_GetInstancePtr(args[0], &arg2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "equals" "', argument " "1"" of type '" "void *""'");
-  }
-
-  result = (bool)(arg1 == arg2);
-  jsresult =  SWIGV8_BOOLEAN_NEW(result);
-
-  SWIGV8_RETURN(jsresult);
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-
-SWIGRUNTIME SwigV8ReturnValue _wrap_getCPtr(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Value> jsresult;
-  void *arg1 = (void *) 0 ;
-  long result;
-  int res1;
-
-  res1 = SWIG_GetInstancePtr(args.Holder(), &arg1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getCPtr" "', argument " "1"" of type '" "void *""'");
-  }
-
-  result = (long)arg1;
-  jsresult = SWIGV8_NUMBER_NEW(result);
-
-  SWIGV8_RETURN(jsresult);
-  goto fail;
-fail:
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-
-/* ---------------------------------------------------------------------------
- * PackedData object
- *
- * ---------------------------------------------------------------------------*/
-
-class SwigV8PackedData {
-public:
-  SwigV8PackedData(void *data, size_t size, swig_type_info *type): data(data), size(size), type(type) {};
-
-  ~SwigV8PackedData() {
-  };
-
-  void *data;
-  size_t size;
-  swig_type_info *type;
-
-  v8::Persistent<v8::Object> handle;
-};
-
-SWIGRUNTIMEINLINE
-int SwigV8Packed_Check(v8::Handle<v8::Value> valRef) {
-  SWIGV8_HANDLESCOPE();
-  
-  v8::Handle<v8::Object> objRef = valRef->ToObject();
-  if(objRef->InternalFieldCount() < 1) return false;
-  v8::Handle<v8::Value> flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"));
-  return (flag->IsBoolean() && flag->BooleanValue());
-}
-
-SWIGRUNTIME
-swig_type_info *SwigV8Packed_UnpackData(v8::Handle<v8::Value> valRef, void *ptr, size_t size) {
-  if (SwigV8Packed_Check(valRef)) {
-    SWIGV8_HANDLESCOPE();
-    
-    SwigV8PackedData *sobj;
-
-    v8::Handle<v8::Object> objRef = valRef->ToObject();
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
-    v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
-    sobj = static_cast<SwigV8PackedData*>(v8::External::Unwrap(cdataRef));
-#else
-    sobj = static_cast<SwigV8PackedData*>(objRef->GetAlignedPointerFromInternalField(0));
-#endif
-    if (sobj == NULL || sobj->size != size) return 0;
-    memcpy(ptr, sobj->data, size);
-    return sobj->type;
-  } else {
-    return 0;
-  }
-}
-
-SWIGRUNTIME
-int SWIGV8_ConvertPacked(v8::Handle<v8::Value> valRef, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = SwigV8Packed_UnpackData(valRef, ptr, sz);
-  if (!to) return SWIG_ERROR;
-  if (ty) {
-    if (to != ty) {
-      /* check type cast? */
-      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      if (!tc) return SWIG_ERROR;
-    }
-  }
-  return SWIG_OK;
-}
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Persistent< v8::Value > object, void *parameter) {
-  SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Value> object, void *parameter) {
-  SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
-#else
-SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
-  v8::Local<v8::Object> object = data.GetValue();
-  SwigV8PackedData *cdata = data.GetParameter();
-#endif
-
-  delete cdata;
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  object.Clear();
-  object.Dispose();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  object.Clear();
-  object.Dispose(isolate);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-  object->Dispose(isolate);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-  object->Dispose();
-#else
-  object.Clear();
-#endif
-}
-
-SWIGRUNTIME
-v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_info *type) {
-  SWIGV8_HANDLESCOPE_ESC();
-
-  SwigV8PackedData *cdata = new SwigV8PackedData(data, size, type);
-//  v8::Handle<v8::Object> obj = SWIGV8_OBJECT_NEW();
-  v8::Local<v8::Object> obj = SWIGV8_OBJECT_NEW();
-
-  obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true));
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
-  obj->SetPointerInInternalField(0, cdata);
-#else
-  obj->SetAlignedPointerInInternalField(0, cdata);
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  cdata->handle = v8::Persistent<v8::Object>::New(obj);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  cdata->handle = v8::Persistent<v8::Object>::New(v8::Isolate::GetCurrent(), obj);
-#else
-  cdata->handle.Reset(v8::Isolate::GetCurrent(), obj);
-#endif
-
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031918)
-  cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete);
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-  cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete);
-#else
-  cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete);
-//  v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete);
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-  cdata->handle.MarkIndependent();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-  cdata->handle.MarkIndependent(v8::Isolate::GetCurrent());
-#else
-  cdata->handle.MarkIndependent();
-#endif
-
-  SWIGV8_ESCAPE(obj);
-}
-
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIGV8_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIGV8_NewPackedObj(ptr, sz, type)
-
-
-/* ---------------------------------------------------------------------------
- * Support for IN/OUTPUT typemaps (see Lib/typemaps/inoutlist.swg)
- *
- * ---------------------------------------------------------------------------*/
-
-SWIGRUNTIME
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-v8::Handle<v8::Value> SWIGV8_AppendOutput(v8::Handle<v8::Value> result, v8::Handle<v8::Value> obj) {
-#else
-v8::Handle<v8::Value> SWIGV8_AppendOutput(v8::Local<v8::Value> result, v8::Handle<v8::Value> obj) {
-#endif
-  SWIGV8_HANDLESCOPE_ESC();
-  
-  if (result->IsUndefined()) {
-    result = SWIGV8_ARRAY_NEW();
-  }
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-  v8::Handle<v8::Array> arr = v8::Handle<v8::Array>::Cast(result);
-#else  
-  v8::Local<v8::Array> arr = v8::Local<v8::Array>::Cast(result);
-#endif
-  arr->Set(arr->Length(), obj);
-
-  SWIGV8_ESCAPE(arr);
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptruntime.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptruntime.swg
deleted file mode 100644
index 0e405932..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptruntime.swg
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -----------------------------------------------------------------------------
- * javascriptruntime.swg
- *
- * ----------------------------------------------------------------------------- */
-
-// V8 Version Macro
-// ----------------
-//
-// v8 added version macros V8_MAJOR_VERSION, V8_MINOR_VERSION, V8_BUILD_NUMBER
-// and V8_PATCH_LEVEL in version 4.3.0.  SWIG generated code uses these if
-// they are defined - to support earlier versions you can specify the V8 version
-// in use via the command line when you run SWIG:
-//
-//   swig -c++ -javascript -v8 -DV8_VERSION=0x032530 example.i
-//
-// Or code in the interface file using SWIG_V8_VERSION:
-//
-//   %begin %{#define SWIG_V8_VERSION 0x031110%}
-//
-// This is specified as a hex constant, but the constant is read as pairs of
-// decimal digits, so for V8 3.25.30 use constant 0x032530.  This scheme can't
-// represent components > 99, but this constant is only useful for V8 < 4.3.0,
-// and no V8 versions from that era had a component > 99.
-
-%define %swig_v8_define_version(version)
-%insert("runtime") %{
-#ifndef SWIG_V8_VERSION
-#define SWIG_V8_VERSION version
-#endif
-%}
-%enddef
-
-#ifdef V8_VERSION
-%swig_v8_define_version(V8_VERSION)
-#else
-// HACK: defining a default version
-%swig_v8_define_version(0x031110)
-#endif
-
-
-// Node support
-// ------------
-
-#ifdef BUILDING_NODE_EXTENSION
-%insert("runtime") %{
-#include <node.h>
-%}
-#endif
-
-
-// V8 runtime
-// ----------
-
-%insert(runtime) %{
-#include <v8.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-%}
-
-%insert(runtime) "swigrun.swg";         /* SWIG API */
-%insert(runtime) "swigerrors.swg";      /* SWIG errors */
-
-%insert(runtime) "javascriptrun.swg"
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptstrings.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascriptstrings.swg
deleted file mode 100644
index 65ba20e5..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascriptstrings.swg
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/* ------------------------------------------------------------
- *  utility methods for char strings 
- * ------------------------------------------------------------ */
-%fragment("SWIG_AsCharPtrAndSize", "header", fragment="SWIG_pchar_descriptor") {
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(v8::Handle<v8::Value> valRef, char** cptr, size_t* psize, int *alloc)
-{
-  if(valRef->IsString()) {
-    v8::Handle<v8::String> js_str = valRef->ToString();
-
-    size_t len = js_str->Utf8Length() + 1;
-    char* cstr = new char[len];
-    js_str->WriteUtf8(cstr, len);
-    
-    if(alloc) *alloc = SWIG_NEWOBJ;
-    if(psize) *psize = len;
-    if(cptr) *cptr = cstr;
-    
-    return SWIG_OK;
-  } else {
-    if(valRef->IsObject()) {
-      v8::Handle<v8::Object> obj = valRef->ToObject();
-      // try if the object is a wrapped char[]
-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      if (pchar_descriptor) {
-        void* vptr = 0;
-        if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-          if (cptr) *cptr = (char *) vptr;
-          if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-          if (alloc) *alloc = SWIG_OLDOBJ;
-          return SWIG_OK;
-        }
-      }
-      return SWIG_TypeError;
-    } else {
-      return SWIG_TypeError;
-    }
-  }
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERNINLINE v8::Handle<v8::Value>
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  if (carray) {
-    if (size > INT_MAX) {
-      // TODO: handle extra long strings
-      return SWIGV8_UNDEFINED();
-    } else {
-      v8::Handle<v8::String> js_str = SWIGV8_STRING_NEW2(carray, size);
-      return js_str;
-    }
-  } else {
-    return SWIGV8_UNDEFINED();
-  }
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/javascripttypemaps.swg b/dependencies2013/win32/swig/Lib/javascript/v8/javascripttypemaps.swg
deleted file mode 100644
index 4601698e..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/javascripttypemaps.swg
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ------------------------------------------------------------
- *  Typemap specializations for Javascript
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Fragment section
- * ------------------------------------------------------------ */
-
-/* Include fundamental fragemt definitions */
-%include <typemaps/fragments.swg>
-
-/* Look for user fragments file. */
-%include <javascriptfragments.swg>
-
-/* Javascript fragments for fundamental types */
-%include <javascriptprimtypes.swg>
-
-/* Javascript fragments for char* strings */
-%include <javascriptstrings.swg>
-
-
-/* ------------------------------------------------------------
- *  Unified typemap section
- * ------------------------------------------------------------ */
-
-/* Javascript types */
-
-#define SWIG_Object                     v8::Handle<v8::Value>
-#define VOID_Object                     SWIGV8_UNDEFINED()
-
-/* Overload of the output/constant/exception/dirout handling */
-
-/* append output */
-#define SWIG_AppendOutput(result, obj) SWIGV8_AppendOutput(result, obj)
-
-/* set constant */
-#define SWIG_SetConstant(name, obj)
-
-/* raise */
-#define SWIG_Raise(obj, type, desc)  SWIG_V8_Raise(type)
-
-/* Include the unified typemap library */
-%include <typemaps/swigtypemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_common.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_common.i
deleted file mode 100644
index cee11e8c..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_common.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_complex.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_complex.i
deleted file mode 100644
index 088a4fe7..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_complex.i
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  STD C++ complex typemaps
- */
-
-%include <javascriptcomplex.swg>
-
-%{
-#include <complex> 
-%}
-
-/* defining the complex as/from converters */
-
-%swig_cplxdbl_convn(std::complex<double>, std::complex<double>, std::real, std::imag)
-%swig_cplxflt_convn(std::complex<float>,  std::complex<float>,  std::real, std::imag)
-
-/* defining the typemaps */
-
-%typemaps_primitive(%checkcode(CPLXDBL), std::complex<double>);
-%typemaps_primitive(%checkcode(CPLXFLT), std::complex<float>);
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_deque.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_except.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_map.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_map.i
deleted file mode 100644
index e7812f38..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_map.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_pair.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_pair.i
deleted file mode 100644
index 8d605722..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_pair.i
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_string.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_string.i
deleted file mode 100644
index dc1378ae..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_string.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/std_vector.i b/dependencies2013/win32/swig/Lib/javascript/v8/std_vector.i
deleted file mode 100644
index 971b426a..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/std_vector.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-    
-    template<class T> class vector {
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            const_reference get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-    // bool specialization
-    template<> class vector<bool> {
-      public:
-        typedef size_t size_type;
-        typedef bool value_type;
-        typedef bool const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            bool get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-}
-
-%define specialize_std_vector(T)
-#warning "specialize_std_vector - specialization for type T no longer needed"
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/stl.i b/dependencies2013/win32/swig/Lib/javascript/v8/stl.i
deleted file mode 100644
index 04f86014..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/stl.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/javascript/v8/typemaps.i b/dependencies2013/win32/swig/Lib/javascript/v8/typemaps.i
deleted file mode 100644
index d3d8afb1..00000000
--- a/dependencies2013/win32/swig/Lib/javascript/v8/typemaps.i
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer handling
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers.
- * ----------------------------------------------------------------------------- */
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/*
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-   long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/*
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Python tuple.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Python output of the function would be a tuple containing both
-output values.
-
-*/
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Python tuple.
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in Python).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a Python variable you might do this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-%include <typemaps/typemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/linkruntime.c b/dependencies2013/win32/swig/Lib/linkruntime.c
deleted file mode 100644
index ddc78120..00000000
--- a/dependencies2013/win32/swig/Lib/linkruntime.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-static void *ptr = 0;
-SWIGEXPORT void *
-SWIG_ReturnGlobalTypeList(void *t) {
- if (!ptr && !t) ptr = t;
- return ptr;
-}
diff --git a/dependencies2013/win32/swig/Lib/lua/_std_common.i b/dependencies2013/win32/swig/Lib/lua/_std_common.i
deleted file mode 100644
index 567e68b7..00000000
--- a/dependencies2013/win32/swig/Lib/lua/_std_common.i
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -----------------------------------------------------------------------------
- * _std_common.i
- *
- * std::helpers for LUA
- * ----------------------------------------------------------------------------- */
-
-%include <std_except.i> // the general exceptions
-
-/*
-The basic idea here, is instead of trying to feed SWIG all the
-horribly templated STL code, to give it a neatened version.
-
-These %defines cover some of the more common methods
-so the class declarations become just a set of %defines
-
-*/
-
-/* #define for basic container features
-note: I allow front(), back() & pop_back() to throw exceptions
-upon empty containers, rather than coredump
-(as we haven't defined the methods, we can use %extend to add with
-new features)
-
-*/
-%define %STD_CONTAINER_METHODS(CLASS,T)
-public:
-	CLASS();
-	CLASS(const CLASS&);
-	unsigned int size() const;
-	unsigned int max_size() const;
-	bool empty() const;
-	void clear();
-	%extend {	// the extra stuff which must be checked
-		T front()const throw (std::out_of_range){ // only read front & back
-			if (self->empty())
-				throw std::out_of_range("in "#CLASS"::front()");
-			return self->front();
-		}
-		T back()const throw (std::out_of_range){ // not write to them
-			if (self->empty())
-				throw std::out_of_range("in "#CLASS"::back()");
-			return self->back();
-		}
-	}
-%enddef
-
-/* push/pop for front/back
-also note: front & back are read only methods, not used for writing
-*/
-%define %STD_FRONT_ACCESS_METHODS(CLASS,T)
-public:
-	void push_front(const T& val);
-	%extend {	// must check this
-		void pop_front() throw (std::out_of_range){
-			if (self->empty())
-				throw std::out_of_range("in "#CLASS"::pop_front()");
-			self->pop_back();
-		}
-	}
-%enddef
-
-%define %STD_BACK_ACCESS_METHODS(CLASS,T)
-public:
-	void push_back(const T& val);
-	%extend {	// must check this
-		void pop_back() throw (std::out_of_range){
-			if (self->empty())
-				throw std::out_of_range("in "#CLASS"::pop_back()");
-			self->pop_back();
-		}
-	}
-%enddef
-
-/*
-Random access methods
-*/
-%define %STD_RANDOM_ACCESS_METHODS(CLASS,T)
-	%extend // this is a extra bit of SWIG code
-	{
-		// [] is replaced by __getitem__ & __setitem__
-		// simply throws a string, which causes a lua error
-		T __getitem__(unsigned int idx) throw (std::out_of_range){
-			if (idx>=self->size())
-				throw std::out_of_range("in "#CLASS"::__getitem__()");
-			return (*self)[idx];
-		}
-		void __setitem__(unsigned int idx,const T& val) throw (std::out_of_range){
-			if (idx>=self->size())
-				throw std::out_of_range("in "#CLASS"::__setitem__()");
-			(*self)[idx]=val;
-		}
-	};
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/lua/carrays.i b/dependencies2013/win32/swig/Lib/lua/carrays.i
deleted file mode 100644
index 1bc45d81..00000000
--- a/dependencies2013/win32/swig/Lib/lua/carrays.i
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Small change to the standard carrays.i
-renaming the field to __getitem & __setitem
-for operator[] access
-*/
-%rename(__getitem) *::getitem; // the v=X[i] (get operator)
-%rename(__setitem) *::setitem; // the X[i]=v (set operator)
-
-%include <../carrays.i>
diff --git a/dependencies2013/win32/swig/Lib/lua/factory.i b/dependencies2013/win32/swig/Lib/lua/factory.i
deleted file mode 100644
index 7e605c5d..00000000
--- a/dependencies2013/win32/swig/Lib/lua/factory.i
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-	A modification of factory.swg from the generic UTL library.
-*/
-
-%include <typemaps/swigmacros.swg>
-
-%define %_factory_dispatch(Type) 
-if (!dcast) {
-  Type *dobj = dynamic_cast<Type *>($1);
-  if (dobj) {
-    dcast = 1;
-    SWIG_NewPointerObj(L, dobj, $descriptor(Type *), $owner); SWIG_arg++;
-  }   
-}%enddef
-
-%define %factory(Method,Types...)
-%typemap(out) Method {
-  int dcast = 0;
-  %formacro(%_factory_dispatch, Types)
-  if (!dcast) {
-    SWIG_NewPointerObj(L, $1, $descriptor, $owner); SWIG_arg++;
-  }
-}%enddef
diff --git a/dependencies2013/win32/swig/Lib/lua/lua.swg b/dependencies2013/win32/swig/Lib/lua/lua.swg
deleted file mode 100644
index 9c21d081..00000000
--- a/dependencies2013/win32/swig/Lib/lua/lua.swg
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -----------------------------------------------------------------------------
- * lua.swg
- *
- * SWIG Configuration File for Lua.
- * This file is parsed by SWIG before reading any other interface file.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- *                          includes
- * ----------------------------------------------------------------------------- */
-
-%include <luatypemaps.swg>         /* The typemaps */
-%include <luaruntime.swg>          /* The runtime stuff */
-%include <luakw.swg>               /* Warnings for Lua keywords */
-
-//%include <typemaps/swigmacros.swg>
-/* -----------------------------------------------------------------------------
- *                          constants typemaps
- * ----------------------------------------------------------------------------- */
-// this basically adds to a table of constants
-%typemap(consttab) int, unsigned int, short, unsigned short, long, unsigned long, unsigned char, signed char, bool, enum SWIGTYPE
-       {SWIG_LUA_CONSTTAB_INT("$symname", $value)}
-
-%typemap(consttab) float, double
-       {SWIG_LUA_CONSTTAB_FLOAT("$symname", $value)}
-
-%typemap(consttab) long long, unsigned long long, signed long long
-       {SWIG_LUA_CONSTTAB_FLOAT("$symname", $value)}
-
-%typemap(consttab) const long long&, const unsigned long long&, const signed long long&
-       {SWIG_LUA_CONSTTAB_FLOAT("$symname", *$value)}
-
-%typemap(consttab) char *, const char *, char [], const char []
-       {SWIG_LUA_CONSTTAB_STRING("$symname", $value)}
-
-// note: char is treated as a seperate special type
-// signed char & unsigned char are numbers
-%typemap(consttab) char
-       {SWIG_LUA_CONSTTAB_CHAR("$symname", $value)}
-
-%typemap(consttab) long long, unsigned long long
-       {SWIG_LUA_CONSTTAB_STRING("$symname", "$value")}
-
-%typemap(consttab) SWIGTYPE *, SWIGTYPE *const, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE []
-       { SWIG_LUA_CONSTTAB_POINTER("$symname",$value, $1_descriptor) }
-
-%typemap(consttab) SWIGTYPE
-       { SWIG_LUA_CONSTTAB_POINTER("$symname",&$value, $&1_descriptor) }
-
-// member function pointers
-%typemap(consttab) SWIGTYPE (CLASS::*)
-       { SWIG_LUA_CONSTTAB_BINARY("$symname", sizeof($type),&$value, $1_descriptor) }
-
-
-/* -----------------------------------------------------------------------------
- *                          Overloaded operator support
- * ----------------------------------------------------------------------------- */
-// lua calls the + operator '__add'
-// python likes to call it '__add__'
-// Assuming most SWIGers will probably use the __add__ if they extend their classes
-// we have two sets of renames
-// one to rename the operator+() to __add()
-//	(this lets SWIG rename the operator overloads)
-// another is to rename __add__() to __add()
-//	(this means that people who wrote SWIG code to do that add will also work)
-
-#ifdef __cplusplus
-// this is extra renaming for lua
-// not all operators are supported, so only those that are, are listed
-%rename(__add)			*::operator+;
-%rename(__sub)			*::operator-;
-%rename(__mul)			*::operator*;
-%rename(__div)			*::operator/;
-%rename(__unm)      *::operator-();
-%rename(__unm)      *::operator-() const;
-
-%rename(__eq)			*::operator==;	
-%ignore *::operator!=;      // note: Lua does not have a notequal operator
-						// it just uses 'not (a==b)'
-%rename(__lt)			*::operator<;
-%ignore *::operator>;   	// ditto less than vs greater than
-%rename(__le)			*::operator<=;	
-%ignore *::operator>=;  // ditto less than vs greater than
-%ignore *::operator!;  // does not support not
-
-%rename(__call)			*::operator();	// the fn call operator
-
-// lua does not support overloading of:
-// 	logical/bitwise operators
-// 	assign operator
-// 	+=,-=,*=, etc
-// therefore ignoring them for now
-// it also doesn't support non class operators
-// eg friends or XX operator+(XX,XX)
-// also ignoring
-// note: some of these might be better to rename, but not doing that for now
-%ignore *::operator&&;	%ignore operator&&;
-%ignore *::operator||;	%ignore operator||;
-%ignore *::operator+=;
-%ignore *::operator-=;
-%ignore *::operator*=;
-%ignore *::operator/=;
-%ignore *::operator%=;
-%ignore *::operator++;	%ignore *::operator--;
-
-%ignore *::operator=;	// note: this might be better to rename to assign() or similar
-
-%ignore operator+;
-%ignore operator-;
-%ignore operator*;
-%ignore operator/;
-%ignore operator%;
-%ignore operator[];
-%ignore operator>;	%ignore operator>=;	
-%ignore operator<;	%ignore operator<=;
-%ignore operator==;	%ignore operator!=;
-
-
-// renaming the python operators to be compatible with lua
-// this means that if a developer has written a fn __add__()
-// it will be used for the lua +
-%rename(__add)			*::__add__;
-%rename(__sub)			*::__sub__;
-%rename(__mul)			*::__mul__;
-%rename(__div)			*::__div__;
-%rename(__unm)			*::__neg__;		// lua calls unary minus,'unm' not 'neg'
-%rename(__tostring)		*::__str__;		// both map to __tostring
-%rename(__tostring)		*::__repr__;	// both map to __tostring
-
-
-%rename(__pow)			*::__pow__;		// lua power '^' operator
-%rename(__concat)		*::__concat__;  // lua concat '..' operator
-%rename(__eq)			*::__eq__;
-%rename(__lt)			*::__lt__;
-%rename(__le)			*::__le__;
-%rename(__call)			*::__call__;	// the fn call operator()
-
-// the [] operator has two parts, the get & the set
-%rename(__getitem)			*::__getitem__;	// the v=X[i] (get operator)
-%rename(__setitem)			*::__setitem__;	// the X[i]=v (set operator)
-
-
-#endif
-
-
-/* ------------------------------------------------------------
- *                              Exceptions
- * ------------------------------------------------------------ */
-/* Confession: I don't really like C++ exceptions
-The python/lua ones are great, but C++ ones I don't like
-(mainly because I cannot get the stack trace out of it)
-Therefore I have not bothered to try doing much in this
-
-Therefore currently its just enough to get a few test cases running ok
-
-note: if you wish to throw anything related to std::exception
-use %include <std_except.i> instead
-*/
-
-// number as number+error
-%typemap(throws) int,unsigned int,signed int,
-				long,unsigned long,signed long,
-				short,unsigned short,signed short,
-				float,double,
-				long long,unsigned long long,
-				unsigned char, signed char,
-                int&,unsigned int&,signed int&,
-				long&,unsigned long&,signed long&,
-				short&,unsigned short&,signed short&,
-				float&,double&,
-				long long&,unsigned long long&,
-				unsigned char&, signed char&
-%{lua_pushnumber(L,(lua_Number)$1);SWIG_fail; %}
-
-%typemap(throws) bool,bool& 
-%{lua_pushboolean(L,(int)($1==true));SWIG_fail; %}
-
-// enum as number+error
-%typemap(throws) enum SWIGTYPE
-%{lua_pushnumber(L,(lua_Number)(int)$1);SWIG_fail; %}
-
-// strings are just sent as errors
-%typemap(throws) char *, const char *
-%{lua_pushstring(L,$1);SWIG_fail;%}
-
-// char is changed to a string
-%typemap(throws) char
-%{lua_pushlstring(L,&$1,1);SWIG_fail;%}
-
-/*
-Throwing object is a serious problem:
-Assuming some code throws a 'FooBar'
-There are a few options:
-- return a pointer to it: but its unclear how long this will last for.
-- return a copy of it: but not all objects are copyable
-	(see exception_partial_info in the test suite for a case where you cannot do this)
-- convert to a string & throw that
-	it's not so useful, but it works (this is more lua like).
-The third option (though not nice) is used
-For a more useful solution: see std_except for more details
-*/
-
-// basic typemap for structs, classes, pointers & references
-// convert to string and error
-%typemap(throws) SWIGTYPE
-%{(void)$1; /* ignore it */
-lua_pushfstring(L,"object exception:%s",SWIG_TypePrettyName($1_descriptor));
-SWIG_fail;%}
-
-// code to make a copy of the object and return this
-// if you have a function which throws a FooBar & you want SWIG to return a copy of the object as its error
-// then use one of the below
-//	%apply SWIGTYPE EXCEPTION_BY_VAL {FooBar};
-//	%apply SWIGTYPE& EXCEPTION_BY_VAL {FooBar&}; // note: need & twice
-%typemap(throws) SWIGTYPE EXCEPTION_BY_VAL
-%{SWIG_NewPointerObj(L,(void *)new $1_ltype(($1_ltype &) $1),$&1_descriptor,1);
-SWIG_fail;%}
-
-// similar for object reference
-// note: swig typemaps seem a little confused around here, therefore we use $basetype
-%typemap(throws) SWIGTYPE& EXCEPTION_BY_VAL
-%{SWIG_NewPointerObj(L,(void *)new $basetype($1),$1_descriptor,1);
-SWIG_fail;%}
-
-
-// note: no support for object pointers
-// its not clear how long the pointer is valid for, therefore not supporting it
-
-/* -----------------------------------------------------------------------------
- *                          extras
- * ----------------------------------------------------------------------------- */
-// this %define is to allow insertion of lua source code into the wrapper file
-#define %luacode  %insert("luacode")
-
-
-/* ------------------------------ end lua.swg  ------------------------------ */
diff --git a/dependencies2013/win32/swig/Lib/lua/lua_fnptr.i b/dependencies2013/win32/swig/Lib/lua/lua_fnptr.i
deleted file mode 100644
index 481cfafa..00000000
--- a/dependencies2013/win32/swig/Lib/lua/lua_fnptr.i
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -----------------------------------------------------------------------------
- * lua_fnptr.i
- *
- * SWIG Library file containing the main typemap code to support Lua modules.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- *                          Basic function pointer support
- * ----------------------------------------------------------------------------- */
-/*
-The structure: SWIGLUA_FN provides a simple (local only) wrapping for a function.
-
-For example if you wanted to have a C/C++ function take a lua function as a parameter.
-You could declare it as:
-  int my_func(int a, int b, SWIGLUA_FN fn);
-note: it should be passed by value, not byref or as a pointer.
-
-The SWIGLUA_FN holds a pointer to the lua_State, and the stack index where the function is held.
-The macro SWIGLUA_FN_GET() will put a copy of the lua function at the top of the stack.
-After that its fairly simple to write the rest of the code (assuming know how to use lua),
-just push the parameters, call the function and return the result.
-
-  int my_func(int a, int b, SWIGLUA_FN fn)
-  {
-    SWIGLUA_FN_GET(fn);
-    lua_pushnumber(fn.L,a);
-    lua_pushnumber(fn.L,b);
-    lua_call(fn.L,2,1);    // 2 in, 1 out
-    return luaL_checknumber(fn.L,-1);
-  }
-
-SWIG will automatically performs the wrapping of the arguments in and out.
-
-However: if you wish to store the function between calls, look to the SWIGLUA_REF below.
-
-*/
-// this is for the C code only, we don't want SWIG to wrapper it for us.
-%{
-typedef struct{
-  lua_State* L; /* the state */
-  int idx;      /* the index on the stack */
-}SWIGLUA_FN;
-
-#define SWIGLUA_FN_GET(fn) {lua_pushvalue(fn.L,fn.idx);}
-%}
-
-// the actual typemap
-%typemap(in,checkfn="lua_isfunction") SWIGLUA_FN
-%{  $1.L=L; $1.idx=$input; %}
-
-/* -----------------------------------------------------------------------------
- *                          Storing lua object support
- * ----------------------------------------------------------------------------- */
-/*
-The structure: SWIGLUA_REF provides a mechanism to store object (usually functions)
-between calls to the interpreter.
-
-For example if you wanted to have a C/C++ function take a lua function as a parameter.
-Then call it later, You could declare it as:
-  SWIGLUA_REF myref;
-  void set_func(SWIGLUA_REF ref);
-  SWIGLUA_REF get_func();
-  void call_func(int val);
-note: it should be passed by value, not byref or as a pointer.
-
-The SWIGLUA_REF holds a pointer to the lua_State, and an integer reference to the object.
-Because it holds a permanent ref to an object, the SWIGLUA_REF must be handled with a bit more care.
-It should be initialised to {0,0}. The function swiglua_ref_set() should be used to set it.
-swiglua_ref_clear() should be used to clear it when not in use, and swiglua_ref_get() to get the
-data back.
-
-Note: the typemap does not check that the object is in fact a function,
-if you need that you must add it yourself.
-
-
-  int my_func(int a, int b, SWIGLUA_FN fn)
-  {
-    SWIGLUA_FN_GET(fn);
-    lua_pushnumber(fn.L,a);
-    lua_pushnumber(fn.L,b);
-    lua_call(fn.L,2,1);    // 2 in, 1 out
-    return luaL_checknumber(fn.L,-1);
-  }
-
-SWIG will automatically performs the wrapping of the arguments in and out.
-
-However: if you wish to store the function between calls, look to the SWIGLUA_REF below.
-
-*/
-
-%{
-typedef struct{
-  lua_State* L; /* the state */
-  int ref;      /* a ref in the lua global index */
-}SWIGLUA_REF;
-
-
-void swiglua_ref_clear(SWIGLUA_REF* pref){
- 	if (pref->L!=0 && pref->ref!=LUA_NOREF && pref->ref!=LUA_REFNIL){
-		luaL_unref(pref->L,LUA_REGISTRYINDEX,pref->ref);
-	}
-	pref->L=0; pref->ref=0;
-}
-
-void swiglua_ref_set(SWIGLUA_REF* pref,lua_State* L,int idx){
-	pref->L=L;
-	lua_pushvalue(L,idx);                 /* copy obj to top */
-	pref->ref=luaL_ref(L,LUA_REGISTRYINDEX); /* remove obj from top & put into registry */
-}
-
-void swiglua_ref_get(SWIGLUA_REF* pref){
-	if (pref->L!=0)
-		lua_rawgeti(pref->L,LUA_REGISTRYINDEX,pref->ref);
-}
-
-%}
-
-%typemap(in) SWIGLUA_REF
-%{  swiglua_ref_set(&$1,L,$input); %}
-
-%typemap(out) SWIGLUA_REF
-%{  if ($1.L!=0)  {swiglua_ref_get(&$1);} else {lua_pushnil(L);}
-  SWIG_arg++; %}
-
diff --git a/dependencies2013/win32/swig/Lib/lua/luakw.swg b/dependencies2013/win32/swig/Lib/lua/luakw.swg
deleted file mode 100644
index fc2f92bf..00000000
--- a/dependencies2013/win32/swig/Lib/lua/luakw.swg
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-  Warnings for Lua keywords, built-in names and bad names.
-*/
-
-#define LUAKW(x) %keywordwarn("'" `x` "' is a Lua keyword, renaming to 'c_" `x` "'", rename="c_%s")  `x`
-#define LUABN(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "'" `x` "' conflicts with a basic function in Lua"), %$not %$ismember)  `x`
-
-/*
-  Warnings for Lua keywords 
-  http://www.lua.org/manual/5.2/manual.html#3.1
-*/
-
-LUAKW(and);
-LUAKW(break);
-LUAKW(do);
-LUAKW(else);
-LUAKW(elseif);
-LUAKW(end);
-LUAKW(false);
-LUAKW(for);
-LUAKW(function);
-LUAKW(goto);
-LUAKW(if);
-LUAKW(in);
-LUAKW(local);
-LUAKW(nil);
-LUAKW(not);
-LUAKW(or);
-LUAKW(repeat);
-LUAKW(return);
-LUAKW(then);
-LUAKW(true);
-LUAKW(until);
-LUAKW(while);
-
-/*
-  Basic functions
-  http://www.lua.org/manual/5.2/manual.html#6.1
-*/ 
-
-LUABN(assert);
-LUABN(collectgarbage);
-LUABN(dofile);
-LUABN(error);
-LUABN(_G); // Not actually a function
-LUABN(getmetatable);
-LUABN(ipairs);
-LUABN(load);
-LUABN(loadfile);
-LUABN(next);
-LUABN(pairs);
-LUABN(pcall);
-LUABN(print);
-LUABN(rawequal);
-LUABN(rawget);
-LUABN(rawlen);
-LUABN(rawset);
-LUABN(select);
-LUABN(setmetatable);
-LUABN(tonumber);
-LUABN(tostring);
-LUABN(type);
-LUABN(_VERSION); // Not actually a function
-LUABN(xpcall);
-
-#undef LUABN
-#undef LUAKW
diff --git a/dependencies2013/win32/swig/Lib/lua/luarun.swg b/dependencies2013/win32/swig/Lib/lua/luarun.swg
deleted file mode 100644
index 660dbbf8..00000000
--- a/dependencies2013/win32/swig/Lib/lua/luarun.swg
+++ /dev/null
@@ -1,1934 +0,0 @@
-/* -----------------------------------------------------------------------------
- * luarun.swg
- *
- * This file contains the runtime support for Lua modules
- * and includes code for managing global variables and pointer
- * type checking.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "lua.h"
-#include "lauxlib.h"
-#include <stdlib.h>  /* for malloc */
-#include <assert.h>  /* for a few sanity tests */
-
-/* -----------------------------------------------------------------------------
- * Lua flavors
- * ----------------------------------------------------------------------------- */
-
-#define SWIG_LUA_FLAVOR_LUA 1
-#define SWIG_LUA_FLAVOR_ELUA 2
-#define SWIG_LUA_FLAVOR_ELUAC 3
-
-#if !defined(SWIG_LUA_TARGET)
-# error SWIG_LUA_TARGET not defined
-#endif
-
-#if defined(SWIG_LUA_ELUA_EMULATE)
-
-struct swig_elua_entry;
-
-typedef struct swig_elua_key {
-  int type;
-  union {
-    const char* strkey;
-    lua_Number numkey;
-  } key;
-} swig_elua_key;
-
-typedef struct swig_elua_val {
-  int type;
-  union {
-    lua_Number number;
-    const struct swig_elua_entry *table;
-    const char *string;
-    lua_CFunction function;
-    struct {
-      char member;
-      long lvalue;
-      void *pvalue;
-      swig_type_info **ptype;
-    } userdata;
-  } value;
-} swig_elua_val;
-
-typedef struct swig_elua_entry {
-  swig_elua_key key;
-  swig_elua_val value;
-} swig_elua_entry;
-
-#define LSTRKEY(x) {LUA_TSTRING, {.strkey = x} }
-#define LNUMKEY(x) {LUA_TNUMBER, {.numkey = x} }
-#define LNILKEY {LUA_TNIL, {.strkey = 0} }
-
-#define LNUMVAL(x) {LUA_TNUMBER, {.number = x} }
-#define LFUNCVAL(x) {LUA_TFUNCTION, {.function = x} }
-#define LROVAL(x) {LUA_TTABLE, {.table = x} }
-#define LNILVAL {LUA_TNIL, {.string = 0} }
-#define LSTRVAL(x) {LUA_TSTRING, {.string = x} }
-
-#define LUA_REG_TYPE swig_elua_entry
-
-#define SWIG_LUA_ELUA_EMUL_METATABLE_KEY "__metatable"
-
-#define lua_pushrotable(L,p)\
-  lua_newtable(L);\
-  assert(p);\
-  SWIG_Lua_elua_emulate_register(L,(swig_elua_entry*)(p));
-
-#define SWIG_LUA_CONSTTAB_POINTER(B,C,D)\
-  LSTRKEY(B), {LUA_TUSERDATA, { .userdata={0,0,(void*)(C),&D} } }
-
-#define SWIG_LUA_CONSTTAB_BINARY(B,S,C,D)\
-  LSTRKEY(B), {LUA_TUSERDATA, { .userdata={1,S,(void*)(C),&D} } }
-#endif
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-#  define SWIG_LUA_CONSTTAB_INT(B, C) LSTRKEY(B), LNUMVAL(C)
-#  define SWIG_LUA_CONSTTAB_FLOAT(B, C) LSTRKEY(B), LNUMVAL(C)
-#  define SWIG_LUA_CONSTTAB_STRING(B, C) LSTRKEY(B), LSTRVAL(C)
-#  define SWIG_LUA_CONSTTAB_CHAR(B, C) LSTRKEY(B), LNUMVAL(C)
-    /* Those two types of constants are not supported in elua */
-
-#ifndef SWIG_LUA_CONSTTAB_POINTER
-#warning eLua does not support pointers as constants. By default, nil will be used as value
-#define SWIG_LUA_CONSTTAB_POINTER(B,C,D) LSTRKEY(B), LNILVAL
-#endif
-
-#ifndef SWIG_LUA_CONSTTAB_BINARY
-#warning eLua does not support pointers to member as constants. By default, nil will be used as value
-#define SWIG_LUA_CONSTTAB_BINARY(B, S, C, D) LSTRKEY(B), LNILVAL
-#endif
-#else /* SWIG_LUA_FLAVOR_LUA */
-#  define SWIG_LUA_CONSTTAB_INT(B, C) SWIG_LUA_INT, (char *)B, (long)C, 0, 0, 0
-#  define SWIG_LUA_CONSTTAB_FLOAT(B, C) SWIG_LUA_FLOAT, (char *)B, 0, (double)C, 0, 0
-#  define SWIG_LUA_CONSTTAB_STRING(B, C) SWIG_LUA_STRING, (char *)B, 0, 0, (void *)C, 0
-#  define SWIG_LUA_CONSTTAB_CHAR(B, C) SWIG_LUA_CHAR, (char *)B, (long)C, 0, 0, 0
-#  define SWIG_LUA_CONSTTAB_POINTER(B,C,D)\
-       SWIG_LUA_POINTER, (char *)B, 0, 0, (void *)C, &D
-#  define SWIG_LUA_CONSTTAB_BINARY(B, S, C, D)\
-       SWIG_LUA_BINARY,  (char *)B, S, 0, (void *)C, &D
-#endif
-
-#ifndef SWIG_LUA_ELUA_EMULATE
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-#  define LRO_STRVAL(v) {{.p = (char *) v}, LUA_TSTRING}
-#  define LSTRVAL LRO_STRVAL
-#endif
-#endif /* SWIG_LUA_ELUA_EMULATE*/
-
-#ifndef SWIG_LUA_ELUA_EMULATE
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-
-#ifndef MIN_OPT_LEVEL
-#define MIN_OPT_LEVEL 2
-#endif
-
-#include "lrodefs.h"
-#include "lrotable.h"
-#endif
-#endif /* SWIG_LUA_ELUA_EMULATE*/
-/* -----------------------------------------------------------------------------
- * compatibility defines
- * ----------------------------------------------------------------------------- */
-
-/* History of Lua C API length functions:  In Lua 5.0 (and before?)
-   there was "lua_strlen".  In Lua 5.1, this was renamed "lua_objlen",
-   but a compatibility define of "lua_strlen" was added.  In Lua 5.2,
-   this function was again renamed, to "lua_rawlen" (to emphasize that
-   it doesn't call the "__len" metamethod), and the compatibility
-   define of lua_strlen was removed.  All SWIG uses have been updated
-   to "lua_rawlen", and we add our own defines of that here for older
-   versions of Lua.  */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501
-# define lua_rawlen lua_strlen
-#elif LUA_VERSION_NUM == 501
-# define lua_rawlen lua_objlen
-#endif
-
-
-/* lua_pushglobaltable is the recommended "future-proof" way to get
-   the global table for Lua 5.2 and later.  Here we define
-   lua_pushglobaltable ourselves for Lua versions before 5.2.  */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
-# define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX)
-#endif
-
-/* lua_absindex was introduced in Lua 5.2 */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
-# define lua_absindex(L,i) ((i)>0 || (i) <= LUA_REGISTRYINDEX ? (i) : lua_gettop(L) + (i) + 1)
-#endif
-
-/* lua_rawsetp was introduced in Lua 5.2 */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
-#define lua_rawsetp(L,index,ptr)\
-  lua_pushlightuserdata(L,(void*)(ptr));\
-  lua_insert(L,-2);\
-  lua_rawset(L,index);
-
-#define lua_rawgetp(L,index,ptr)\
-  lua_pushlightuserdata(L,(void*)(ptr));\
-  lua_rawget(L,index);
-
-#endif
-
-/* --------------------------------------------------------------------------
- * Helper functions for error handling
- * -------------------------------------------------------------------------- */
-
-/* Push the string STR on the Lua stack, like lua_pushstring, but
-   prefixed with the the location of the innermost Lua call-point
-   (as formated by luaL_where).  */
-SWIGRUNTIME void
-SWIG_Lua_pusherrstring (lua_State *L, const char *str)
-{
-  luaL_where (L, 1);
-  lua_pushstring (L, str);
-  lua_concat (L, 2);
-}
-
-/* Push a formatted string generated from FMT and following args on
-   the Lua stack, like lua_pushfstring, but prefixed with the the
-   location of the innermost Lua call-point (as formated by luaL_where).  */
-SWIGRUNTIME void
-SWIG_Lua_pushferrstring (lua_State *L, const char *fmt, ...)
-{
-  va_list argp;
-  va_start(argp, fmt);
-  luaL_where(L, 1);
-  lua_pushvfstring(L, fmt, argp);
-  va_end(argp);
-  lua_concat(L, 2);
-}
-
-
-/* -----------------------------------------------------------------------------
- * global swig types
- * ----------------------------------------------------------------------------- */
-/* Constant table */
-#define SWIG_LUA_INT     1
-#define SWIG_LUA_FLOAT   2
-#define SWIG_LUA_STRING  3
-#define SWIG_LUA_POINTER 4
-#define SWIG_LUA_BINARY  5
-#define SWIG_LUA_CHAR    6
-
-/* Structure for variable linking table */
-typedef struct {
-  const char *name;
-  lua_CFunction get;
-  lua_CFunction set;
-} swig_lua_var_info;
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-typedef const LUA_REG_TYPE swig_lua_method;
-typedef const LUA_REG_TYPE swig_lua_const_info;
-#else /* Normal lua */
-typedef luaL_Reg swig_lua_method;
-
-/* Constant information structure */
-typedef struct {
-    int type;
-    char *name;
-    long lvalue;
-    double dvalue;
-    void   *pvalue;
-    swig_type_info **ptype;
-} swig_lua_const_info;
-
-#endif
-
-typedef struct {
-  const char     *name;
-  lua_CFunction   getmethod;
-  lua_CFunction   setmethod;
-} swig_lua_attribute;
-
-
-struct swig_lua_class;
-/* Can be used to create namespaces. Currently used to wrap class static methods/variables/constants */
-typedef struct swig_lua_namespace {
-  const char            *name;
-  swig_lua_method       *ns_methods;
-  swig_lua_attribute    *ns_attributes;
-  swig_lua_const_info   *ns_constants;
-  struct swig_lua_class        **ns_classes;
-  struct swig_lua_namespace    **ns_namespaces;
-} swig_lua_namespace;
-
-typedef struct swig_lua_class {
-  const char    *name; /* Name that this class has in Lua */
-  const char    *fqname; /* Fully qualified name - Scope + class name */
-  swig_type_info   **type;
-  lua_CFunction  constructor;
-  void    (*destructor)(void *);
-  swig_lua_method   *methods;
-  swig_lua_attribute     *attributes;
-  swig_lua_namespace    *cls_static;
-  swig_lua_method   *metatable; /* 0 for -eluac */
-  struct swig_lua_class **bases;
-  const char **base_names;
-} swig_lua_class;
-
-/* this is the struct for wrapping all pointers in SwigLua
-*/
-typedef struct {
-  swig_type_info   *type;
-  int     own;  /* 1 if owned & must be destroyed */
-  void        *ptr;
-} swig_lua_userdata;
-
-/* this is the struct for wrapping arbitrary packed binary data
-(currently it is only used for member function pointers)
-the data ordering is similar to swig_lua_userdata, but it is currently not possible
-to tell the two structures apart within SWIG, other than by looking at the type
-*/
-typedef struct {
-  swig_type_info   *type;
-  int     own;  /* 1 if owned & must be destroyed */
-  char data[1];       /* arbitary amount of data */    
-} swig_lua_rawdata;
-
-/* Common SWIG API */
-#define SWIG_NewPointerObj(L, ptr, type, owner)       SWIG_Lua_NewPointerObj(L, (void *)ptr, type, owner)
-#define SWIG_ConvertPtr(L,idx, ptr, type, flags)    SWIG_Lua_ConvertPtr(L,idx,ptr,type,flags)
-#define SWIG_MustGetPtr(L,idx, type,flags, argnum,fnname)  SWIG_Lua_MustGetPtr(L,idx, type,flags, argnum,fnname)
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(L, idx, ptr, sz, ty)       SWIG_Lua_ConvertPacked(L, idx, ptr, sz, ty)
-#define SWIG_NewMemberObj(L, ptr, sz, type)      SWIG_Lua_NewPackedObj(L, ptr, sz, type)
-
-/* Runtime API */
-#define SWIG_GetModule(clientdata) SWIG_Lua_GetModule((lua_State*)(clientdata))
-#define SWIG_SetModule(clientdata, pointer) SWIG_Lua_SetModule((lua_State*) (clientdata), pointer)
-#define SWIG_MODULE_CLIENTDATA_TYPE lua_State*
-
-/* Contract support */
-#define SWIG_contract_assert(expr, msg)  \
-  if (!(expr)) { SWIG_Lua_pusherrstring(L, (char *) msg); goto fail; } else
-
-
-/* helper #defines */
-#define SWIG_fail {goto fail;}
-#define SWIG_fail_arg(func_name,argnum,type) \
-  {SWIG_Lua_pushferrstring(L,"Error in %s (arg %d), expected '%s' got '%s'",\
-  func_name,argnum,type,SWIG_Lua_typename(L,argnum));\
-  goto fail;}
-#define SWIG_fail_ptr(func_name,argnum,type) \
-  SWIG_fail_arg(func_name,argnum,(type && type->str)?type->str:"void*")
-#define SWIG_check_num_args(func_name,a,b) \
-  if (lua_gettop(L)<a || lua_gettop(L)>b) \
-  {SWIG_Lua_pushferrstring(L,"Error in %s expected %d..%d args, got %d",func_name,a,b,lua_gettop(L));\
-  goto fail;}
-
-
-#define SWIG_Lua_get_table(L,n) \
-  (lua_pushstring(L, n), lua_rawget(L,-2))
-
-#define SWIG_Lua_add_function(L,n,f) \
-  (lua_pushstring(L, n), \
-      lua_pushcfunction(L, f), \
-      lua_rawset(L,-3))
-
-#define SWIG_Lua_add_boolean(L,n,b) \
-  (lua_pushstring(L, n), \
-      lua_pushboolean(L, b), \
-      lua_rawset(L,-3))
-
-/* special helper for allowing 'nil' for usertypes */
-#define SWIG_isptrtype(L,I) (lua_isuserdata(L,I) || lua_isnil(L,I))
-
-#ifdef __cplusplus
-/* Special helper for member function pointers 
-it gets the address, casts it, then dereferences it */
-/*#define SWIG_mem_fn_as_voidptr(a)  (*((char**)&(a))) */
-#endif
-
-/* storing/access of swig_module_info */
-SWIGRUNTIME swig_module_info *
-SWIG_Lua_GetModule(lua_State *L) {
-  swig_module_info *ret = 0;
-  lua_pushstring(L,"swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
-  lua_rawget(L,LUA_REGISTRYINDEX);
-  if (lua_islightuserdata(L,-1))
-    ret=(swig_module_info*)lua_touserdata(L,-1);
-  lua_pop(L,1);  /* tidy */
-  return ret;
-}
-
-SWIGRUNTIME void
-SWIG_Lua_SetModule(lua_State *L, swig_module_info *module) {
-  /* add this all into the Lua registry: */
-  lua_pushstring(L,"swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
-  lua_pushlightuserdata(L,(void*)module);
-  lua_rawset(L,LUA_REGISTRYINDEX);
-}
-
-/* -----------------------------------------------------------------------------
- * global variable support code: modules
- * ----------------------------------------------------------------------------- */
-
-/* this function is called when trying to set an immutable.
-default action is to print an error.
-This can removed with a compile flag SWIGLUA_IGNORE_SET_IMMUTABLE */
-SWIGINTERN int SWIG_Lua_set_immutable(lua_State *L)
-{
-/*  there should be 1 param passed in: the new value */
-#ifndef SWIGLUA_IGNORE_SET_IMMUTABLE
-  lua_pop(L,1);  /* remove it */
-  luaL_error(L,"This variable is immutable");
-#endif
-    return 0;   /* should not return anything */
-}
-
-#ifdef SWIG_LUA_ELUA_EMULATE
-
-SWIGRUNTIME void SWIG_Lua_NewPointerObj(lua_State *L,void *ptr,swig_type_info *type, int own);
-SWIGRUNTIME void SWIG_Lua_NewPackedObj(lua_State *L,void *ptr,size_t size,swig_type_info *type);
-static int swig_lua_elua_emulate_unique_key;
-
-/* This function emulates eLua rotables behaviour. It loads a rotable definition into the usual lua table. */
-SWIGINTERN void SWIG_Lua_elua_emulate_register(lua_State *L, const swig_elua_entry *table)
-{
-  int i, table_parsed, parsed_tables_array, target_table;
-  assert(lua_istable(L,-1));
-  target_table = lua_gettop(L);
-  /* Get the registry where we put all parsed tables to avoid loops */
-  lua_rawgetp(L, LUA_REGISTRYINDEX, &swig_lua_elua_emulate_unique_key);
-  if(lua_isnil(L,-1)) {
-    lua_pop(L,1);
-    lua_newtable(L);
-    lua_pushvalue(L,-1);
-    lua_rawsetp(L,LUA_REGISTRYINDEX,(void*)(&swig_lua_elua_emulate_unique_key));
-  }
-  parsed_tables_array = lua_gettop(L);
-  lua_pushvalue(L,target_table);
-  lua_rawsetp(L, parsed_tables_array, table);
-  table_parsed = 0;
-  const int SWIGUNUSED pairs_start = lua_gettop(L);
-  for(i = 0;table[i].key.type != LUA_TNIL || table[i].value.type != LUA_TNIL;i++)
-  {
-    const swig_elua_entry *entry = table + i;
-    int is_metatable = 0;
-    switch(entry->key.type) {
-      case LUA_TSTRING:
-        lua_pushstring(L,entry->key.key.strkey);
-        if(strcmp(entry->key.key.strkey, SWIG_LUA_ELUA_EMUL_METATABLE_KEY) == 0)
-          is_metatable = 1;
-        break;
-      case  LUA_TNUMBER:
-        lua_pushnumber(L,entry->key.key.numkey);
-        break;
-      case LUA_TNIL:
-        lua_pushnil(L);
-        break;
-      default:
-        assert(0);
-    }
-    switch(entry->value.type) {
-      case LUA_TSTRING:
-        lua_pushstring(L,entry->value.value.string);
-        break;
-      case  LUA_TNUMBER:
-        lua_pushnumber(L,entry->value.value.number);
-        break;
-      case LUA_TFUNCTION:
-        lua_pushcfunction(L,entry->value.value.function);
-        break;
-      case LUA_TTABLE:
-        lua_rawgetp(L,parsed_tables_array, entry->value.value.table);
-        table_parsed = !lua_isnil(L,-1);
-        if(!table_parsed) {
-          lua_pop(L,1); /*remove nil */
-          lua_newtable(L);
-          SWIG_Lua_elua_emulate_register(L,entry->value.value.table);
-        } 
-        if(is_metatable) {
-          assert(lua_istable(L,-1));
-          lua_pushvalue(L,-1);
-          lua_setmetatable(L,target_table);
-        }
-
-        break;
-      case LUA_TUSERDATA:
-        if(entry->value.value.userdata.member) 
-          SWIG_NewMemberObj(L,entry->value.value.userdata.pvalue,
-              entry->value.value.userdata.lvalue,
-              *(entry->value.value.userdata.ptype));
-        else 
-          SWIG_NewPointerObj(L,entry->value.value.userdata.pvalue,
-              *(entry->value.value.userdata.ptype),0);
-        break;
-      case LUA_TNIL:
-        lua_pushnil(L);
-        break;
-      default:
-        assert(0);
-    }
-    assert(lua_gettop(L) == pairs_start + 2);
-    lua_rawset(L,target_table);
-  }
-  lua_pop(L,1); /* Removing parsed tables storage */
-  assert(lua_gettop(L) == target_table);
-}
-
-SWIGINTERN void SWIG_Lua_elua_emulate_register_clear(lua_State *L)
-{
-  lua_pushnil(L);
-  lua_rawsetp(L, LUA_REGISTRYINDEX, &swig_lua_elua_emulate_unique_key);
-}
-
-SWIGINTERN void SWIG_Lua_get_class_registry(lua_State *L);
-
-SWIGINTERN int SWIG_Lua_emulate_elua_getmetatable(lua_State *L)
-{
-  SWIG_check_num_args("getmetatable(SWIG eLua emulation)", 1, 1);
-  SWIG_Lua_get_class_registry(L);
-  lua_getfield(L,-1,"lua_getmetatable");
-  lua_remove(L,-2); /* remove the registry*/
-  assert(!lua_isnil(L,-1));
-  lua_pushvalue(L,1);
-  assert(lua_gettop(L) == 3); /* object | function | object again */
-  lua_call(L,1,1);
-  if(!lua_isnil(L,-1)) /*There is an ordinary metatable */
-    return 1;
-  /*if it is a table, then emulate elua behaviour - check for __metatable attribute of a table*/
-  assert(lua_gettop(L) == 2);
-  if(lua_istable(L,-2)) {
-    lua_pop(L,1); /*remove the nil*/
-    lua_getfield(L,-1, SWIG_LUA_ELUA_EMUL_METATABLE_KEY);
-  }
-  assert(lua_gettop(L) == 2);
-  return 1;
-  
-fail:
-  lua_error(L);
-  return 0;
-}
-
-SWIGINTERN void SWIG_Lua_emulate_elua_swap_getmetatable(lua_State *L)
-{
-  SWIG_Lua_get_class_registry(L);
-  lua_pushglobaltable(L);
-  lua_pushstring(L,"lua_getmetatable");
-  lua_getfield(L,-2,"getmetatable");
-  assert(!lua_isnil(L,-1));
-  lua_rawset(L,-4);
-  lua_pushstring(L, "getmetatable");
-  lua_pushcfunction(L, SWIG_Lua_emulate_elua_getmetatable);
-  lua_rawset(L,-3);
-  lua_pop(L,2);
-      
-}
-/* END OF REMOVE */
-
-#endif
-/* -----------------------------------------------------------------------------
- * global variable support code: namespaces and modules (which are the same thing)
- * ----------------------------------------------------------------------------- */
-
-SWIGINTERN int SWIG_Lua_namespace_get(lua_State *L)
-{
-/*  there should be 2 params passed in
-  (1) table (not the meta table)
-  (2) string name of the attribute
-*/
-  assert(lua_istable(L,-2));  /* just in case */
-  lua_getmetatable(L,-2);
-  assert(lua_istable(L,-1));
-  SWIG_Lua_get_table(L,".get"); /* find the .get table */
-  assert(lua_istable(L,-1));
-  /* look for the key in the .get table */
-  lua_pushvalue(L,2);  /* key */
-  lua_rawget(L,-2);
-  lua_remove(L,-2); /* stack tidy, remove .get table */
-  if (lua_iscfunction(L,-1))
-  {  /* found it so call the fn & return its value */
-    lua_call(L,0,1);  /* 1 value in (userdata),1 out (result) */
-    lua_remove(L,-2); /* stack tidy, remove metatable */
-    return 1;
-  }
-  lua_pop(L,1);  /* remove whatever was there */
-  /* ok, so try the .fn table */
-  SWIG_Lua_get_table(L,".fn"); /* find the .get table */
-  assert(lua_istable(L,-1));  /* just in case */
-  lua_pushvalue(L,2);  /* key */
-  lua_rawget(L,-2);  /* look for the fn */
-  lua_remove(L,-2); /* stack tidy, remove .fn table */
-  if (lua_isfunction(L,-1)) /* note: whether it's a C function or lua function */
-  {  /* found it so return the fn & let lua call it */
-    lua_remove(L,-2); /* stack tidy, remove metatable */
-    return 1;
-  }
-  lua_pop(L,1);  /* remove whatever was there */
-  return 0;
-}
-
-SWIGINTERN int SWIG_Lua_namespace_set(lua_State *L)
-{
-/*  there should be 3 params passed in
-  (1) table (not the meta table)
-  (2) string name of the attribute
-  (3) any for the new value
-*/
-
-  assert(lua_istable(L,1));
-  lua_getmetatable(L,1);    /* get the meta table */
-  assert(lua_istable(L,-1));
-
-  SWIG_Lua_get_table(L,".set"); /* find the .set table */
-  if (lua_istable(L,-1))
-  {
-    /* look for the key in the .set table */
-    lua_pushvalue(L,2);  /* key */
-    lua_rawget(L,-2);
-    if (lua_iscfunction(L,-1))
-    {  /* found it so call the fn & return its value */
-      lua_pushvalue(L,3);  /* value */
-      lua_call(L,1,0);
-      return 0;
-    }
-    lua_pop(L,1);  /* remove the value */
-  }
-  lua_pop(L,1);  /* remove the value .set table */
-  lua_pop(L,1); /* remote metatable */
-  lua_rawset(L,-3);
-  return 0;
-}
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA) /* In elua this is useless */
-SWIGINTERN void SWIG_Lua_InstallConstants(lua_State *L, swig_lua_const_info constants[]); /* forward declaration */
-SWIGINTERN void  SWIG_Lua_add_variable(lua_State *L,const char *name,lua_CFunction getFn,lua_CFunction setFn); /* forward declaration */
-SWIGINTERN void  SWIG_Lua_class_register(lua_State *L,swig_lua_class *clss);
-
-/* helper function - register namespace methods and attributes into namespace */
-SWIGINTERN int SWIG_Lua_add_namespace_details(lua_State *L, swig_lua_namespace *ns)
-{
-  int i;
-  /* There must be namespace table (not metatable) at the top of the stack */
-  assert(lua_istable(L,-1));
-  SWIG_Lua_InstallConstants(L, ns->ns_constants);
-
-  /* add methods to the namespace/module table */
-  for(i=0;ns->ns_methods[i].name;i++){
-    SWIG_Lua_add_function(L,ns->ns_methods[i].name,ns->ns_methods[i].func);
-  }
-  lua_getmetatable(L,-1);
-
-  /* add fns */
-  for(i=0;ns->ns_attributes[i].name;i++){
-    SWIG_Lua_add_variable(L,ns->ns_attributes[i].name,ns->ns_attributes[i].getmethod,ns->ns_attributes[i].setmethod);
-  }
-
-  /* clear stack - remove metatble */
-  lua_pop(L,1);
-  return 0;
-}
-
-/* Register all classes in the namespace */
-SWIGINTERN void SWIG_Lua_add_namespace_classes(lua_State *L, swig_lua_namespace *ns)
-{
-  swig_lua_class **classes;
-
-  /* There must be a module/namespace table at the top of the stack */
-  assert(lua_istable(L,-1));
-
-  classes = ns->ns_classes;
-
-  if( classes != 0 ) {
-    while(*classes != 0) {
-      SWIG_Lua_class_register(L, *classes);
-      classes++;
-    }
-  }
-}
-
-/* Helper function. Creates namespace table and adds it to module table
-   if 'reg' is true, then will register namespace table to parent one (must be on top of the stack
-   when function is called).
-   Function always returns newly registered table on top of the stack.
-*/
-SWIGINTERN void SWIG_Lua_namespace_register(lua_State *L, swig_lua_namespace *ns, int reg)
-{
-  swig_lua_namespace **sub_namespace;
-  /* 1 argument - table on the top of the stack */
-  const int SWIGUNUSED begin = lua_gettop(L);
-  assert(lua_istable(L,-1)); /* just in case. This is supposed to be module table or parent namespace table */
-  lua_checkstack(L,5);
-  lua_newtable(L); /* namespace itself */
-  lua_newtable(L); /* metatable for namespace */
-
-  /* add a table called ".get" */
-  lua_pushstring(L,".get");
-  lua_newtable(L);
-  lua_rawset(L,-3);
-  /* add a table called ".set" */
-  lua_pushstring(L,".set");
-  lua_newtable(L);
-  lua_rawset(L,-3);
-  /* add a table called ".fn" */
-  lua_pushstring(L,".fn");
-  lua_newtable(L);
-  lua_rawset(L,-3);
-
-  /* add accessor fns for using the .get,.set&.fn */
-  SWIG_Lua_add_function(L,"__index",SWIG_Lua_namespace_get);
-  SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_namespace_set);
-
-  lua_setmetatable(L,-2); /* set metatable */
-
-  /* Register all functions, variables etc */
-  SWIG_Lua_add_namespace_details(L,ns);
-  /* Register classes */
-  SWIG_Lua_add_namespace_classes(L,ns);
-
-  sub_namespace = ns->ns_namespaces;
-  if( sub_namespace != 0) {
-    while(*sub_namespace != 0) {
-      SWIG_Lua_namespace_register(L, *sub_namespace, 1);
-      lua_pop(L,1); /* removing sub-namespace table */
-      sub_namespace++;
-    }
-  }
-
-  if (reg) {
-    lua_pushstring(L,ns->name);
-    lua_pushvalue(L,-2);
-    lua_rawset(L,-4); /* add namespace to module table */
-  }
-  assert(lua_gettop(L) == begin+1);
-}
-#endif /* SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA */
-
-/* -----------------------------------------------------------------------------
- * global variable support code: classes
- * ----------------------------------------------------------------------------- */
-
-SWIGINTERN void  SWIG_Lua_get_class_metatable(lua_State *L,const char *cname);
-
-typedef int (*swig_lua_base_iterator_func)(lua_State*,swig_type_info*, int, int *ret);
-
-SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info * SWIGUNUSED swig_type,
-  int first_arg, swig_lua_base_iterator_func func, int  *const ret)
-{
-    /* first_arg - position of the object in stack. Everything that is above are arguments
-     * and is passed to every evocation of the func */
-    int last_arg = lua_gettop(L);/* position of last argument */
-    int original_metatable = last_arg + 1;
-    size_t bases_count;
-    int result = SWIG_ERROR;
-    int bases_table;
-    (void)swig_type;
-    lua_getmetatable(L,first_arg);
-
-    /* initialise base search */
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA)
-    SWIG_Lua_get_table(L,".bases");
-    assert(lua_istable(L,-1));
-    bases_count = lua_rawlen(L,-1);
-    bases_table = lua_gettop(L);
-#else
-    /* In elua .bases table doesn't exist. Use table from swig_lua_class */
-    (void)bases_table;
-    assert(swig_type!=0);
-    swig_module_info *module=SWIG_GetModule(L);
-    swig_lua_class **bases= ((swig_lua_class*)(swig_type->clientdata))->bases;
-    const char **base_names= ((swig_lua_class*)(swig_type->clientdata))->base_names;
-    bases_count = 0;
-    for(;base_names[bases_count];
-      bases_count++);/* get length of bases */
-#endif
-
-    if(ret)
-      *ret = 0;
-    if(bases_count>0)
-    {
-      int to_remove;
-      size_t i;
-      int j;
-      int subcall_last_arg;
-      int subcall_first_arg = lua_gettop(L) + 1;/* Here a copy of first_arg and arguments begin */
-      int valid = 1;
-      swig_type_info *base_swig_type = 0;
-      for(j=first_arg;j<=last_arg;j++)
-        lua_pushvalue(L,j);
-      subcall_last_arg = lua_gettop(L);
-
-      /* Trick: temporarily replacing original metatable with metatable for base class and call getter */
-      for(i=0;i<bases_count;i++) {
-        /* Iteration through class bases */
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA)
-        lua_rawgeti(L,bases_table,i+1);
-        base_swig_type = 0;
-        if(lua_isnil(L,-1)) {
-          valid = 0;
-          lua_pop(L,1);
-        } else {
-          valid = 1;
-        }
-#else /* In elua .bases table doesn't exist. Use table from swig_lua_class */
-        swig_lua_class *base_class = bases[i];
-        if(!base_class) {
-          valid = 0;
-        } else {
-          valid = 1;
-          SWIG_Lua_get_class_metatable(L,base_class->fqname);
-          base_swig_type = SWIG_TypeQueryModule(module,module,base_names[i]);
-          assert(base_swig_type != 0);
-        }
-#endif
-
-        if(!valid)
-          continue;
-        assert(lua_isuserdata(L, subcall_first_arg));
-        assert(lua_istable(L,-1));
-        lua_setmetatable(L,subcall_first_arg); /* Set new metatable */
-        assert(lua_gettop(L) == subcall_last_arg);
-        result = func(L, base_swig_type,subcall_first_arg, ret); /* Forward call */
-        if(result != SWIG_ERROR) {
-          break;
-        }
-      }
-      /* Restore original metatable */
-      lua_pushvalue(L,original_metatable);
-      lua_setmetatable(L,first_arg);
-      /* Clear - remove everything between last_arg and subcall_last_arg including */
-      to_remove = subcall_last_arg - last_arg;
-      for(j=0;j<to_remove;j++)
-        lua_remove(L,last_arg+1);
-    } else {
-      /* Remove everything after last_arg */
-      lua_pop(L, lua_gettop(L) - last_arg);
-    }
-    if(ret) assert(lua_gettop(L) == last_arg + *ret);
-    return result;
-}
-
-/* The class.get method helper, performs the lookup of class attributes.
- * It returns an error code. Number of function return values is passed inside 'ret'.
- * first_arg is not used in this function because function always has 2 arguments.
- */
-SWIGINTERN int  SWIG_Lua_class_do_get_item(lua_State *L, swig_type_info *type, int SWIGUNUSED first_arg, int *ret)
-{
-/*  there should be 2 params passed in
-  (1) userdata (not the meta table)
-  (2) string name of the attribute
-*/
-  int bases_search_result;
-  int substack_start = lua_gettop(L)-2;
-  assert(first_arg == substack_start+1);
-  lua_checkstack(L,5);
-  assert(lua_isuserdata(L,-2));  /* just in case */
-  lua_getmetatable(L,-2);    /* get the meta table */
-  assert(lua_istable(L,-1));  /* just in case */
-  /* NEW: looks for the __getitem() fn
-  this is a user provided get fn */
-  SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */
-  if (lua_iscfunction(L,-1))  /* if its there */
-  {  /* found it so call the fn & return its value */
-    lua_pushvalue(L,substack_start+1);  /* the userdata */
-    lua_pushvalue(L,substack_start+2);  /* the parameter */
-    lua_call(L,2,1);  /* 2 value in (userdata),1 out (result) */
-    lua_remove(L,-2); /* stack tidy, remove metatable */
-    if(ret) *ret = 1;
-    return SWIG_OK;
-  }
-  lua_pop(L,1);
-  /* Remove the metatable */
-  lua_pop(L,1);
-  /* Search in base classes */
-  bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get_item,ret);
-  return bases_search_result;  /* sorry not known */
-}
-
-
-/* The class.get method helper, performs the lookup of class attributes.
- * It returns an error code. Number of function return values is passed inside 'ret'.
- * first_arg is not used in this function because function always has 2 arguments.
- */
-SWIGINTERN int  SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int SWIGUNUSED first_arg, int *ret)
-{
-/*  there should be 2 params passed in
-  (1) userdata (not the meta table)
-  (2) string name of the attribute
-*/
-  int bases_search_result;
-  int substack_start = lua_gettop(L)-2;
-  assert(first_arg == substack_start+1);
-  lua_checkstack(L,5);
-  assert(lua_isuserdata(L,-2));  /* just in case */
-  lua_getmetatable(L,-2);    /* get the meta table */
-  assert(lua_istable(L,-1));  /* just in case */
-  SWIG_Lua_get_table(L,".get"); /* find the .get table */
-  assert(lua_istable(L,-1));  /* just in case */
-  /* look for the key in the .get table */
-  lua_pushvalue(L,substack_start+2);  /* key */
-  lua_rawget(L,-2);
-  lua_remove(L,-2); /* stack tidy, remove .get table */
-  if (lua_iscfunction(L,-1))
-  {  /* found it so call the fn & return its value */
-    lua_pushvalue(L,substack_start+1);  /* the userdata */
-    lua_call(L,1,1);  /* 1 value in (userdata),1 out (result) */
-    lua_remove(L,-2); /* stack tidy, remove metatable */
-    if(ret)
-      *ret = 1;
-    return SWIG_OK;
-  }
-  lua_pop(L,1);  /* remove whatever was there */
-  /* ok, so try the .fn table */
-  SWIG_Lua_get_table(L,".fn"); /* find the .fn table */
-  assert(lua_istable(L,-1));  /* just in case */
-  lua_pushvalue(L,substack_start+2);  /* key */
-  lua_rawget(L,-2);  /* look for the fn */
-  lua_remove(L,-2); /* stack tidy, remove .fn table */
-  if (lua_isfunction(L,-1)) /* note: if its a C function or lua function */
-  {  /* found it so return the fn & let lua call it */
-    lua_remove(L,-2); /* stack tidy, remove metatable */
-    if(ret)
-      *ret = 1;
-    return SWIG_OK;
-  }
-  lua_pop(L,1);  /* remove whatever was there */
-  /* Remove the metatable */
-  lua_pop(L,1);
-  /* Search in base classes */
-  bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get,ret);
-  return bases_search_result;  /* sorry not known */
-}
-
-/* the class.get method, performs the lookup of class attributes
- */
-SWIGINTERN int  SWIG_Lua_class_get(lua_State *L)
-{
-/*  there should be 2 params passed in
-  (1) userdata (not the meta table)
-  (2) string name of the attribute
-*/
-  int result;
-  swig_lua_userdata *usr;
-  swig_type_info *type;
-  int ret = 0;
-  assert(lua_isuserdata(L,1));
-  usr=(swig_lua_userdata*)lua_touserdata(L,1);  /* get data */
-  type = usr->type;
-  result = SWIG_Lua_class_do_get(L,type,1,&ret);
-  if(result == SWIG_OK)
-    return ret;
-
-  result = SWIG_Lua_class_do_get_item(L,type,1,&ret);
-  if(result == SWIG_OK)
-    return ret;
-
-  return 0;
-}
-
-/* helper for the class.set method, performs the lookup of class attributes
- * It returns error code. Number of function return values is passed inside 'ret'
- */
-SWIGINTERN int  SWIG_Lua_class_do_set(lua_State *L, swig_type_info *type, int first_arg, int *ret)
-{
-/*  there should be 3 params passed in
-  (1) table (not the meta table)
-  (2) string name of the attribute
-  (3) any for the new value
-  */
-
-  int bases_search_result;
-  int substack_start = lua_gettop(L) - 3;
-  lua_checkstack(L,5);
-  assert(lua_isuserdata(L,substack_start+1));  /* just in case */
-  lua_getmetatable(L,substack_start+1);    /* get the meta table */
-  assert(lua_istable(L,-1));  /* just in case */
-  if(ret)
-    *ret = 0; /* it is setter - number of return values is always 0 */
-
-  SWIG_Lua_get_table(L,".set"); /* find the .set table */
-  if (lua_istable(L,-1))
-  {
-    /* look for the key in the .set table */
-    lua_pushvalue(L,substack_start+2);  /* key */
-    lua_rawget(L,-2);
-    lua_remove(L,-2); /* tidy stack, remove .set table */
-    if (lua_iscfunction(L,-1))
-    {  /* found it so call the fn & return its value */
-      lua_pushvalue(L,substack_start+1);  /* userdata */
-      lua_pushvalue(L,substack_start+3);  /* value */
-      lua_call(L,2,0);
-      lua_remove(L,substack_start+4); /*remove metatable*/
-      return SWIG_OK;
-    }
-    lua_pop(L,1);  /* remove the value */
-  } else {
-    lua_pop(L,1);  /* remove the answer for .set table request*/
-  }
-  /* NEW: looks for the __setitem() fn
-  this is a user provided set fn */
-  SWIG_Lua_get_table(L,"__setitem"); /* find the fn */
-  if (lua_iscfunction(L,-1))  /* if its there */
-  {  /* found it so call the fn & return its value */
-    lua_pushvalue(L,substack_start+1);  /* the userdata */
-    lua_pushvalue(L,substack_start+2);  /* the parameter */
-    lua_pushvalue(L,substack_start+3);  /* the value */
-    lua_call(L,3,0);  /* 3 values in ,0 out */
-    lua_remove(L,-2); /* stack tidy, remove metatable */
-    return SWIG_OK;
-  }
-  lua_pop(L,1); /* remove value */
-
-  lua_pop(L,1); /* remove metatable */
-  /* Search among bases */
-  bases_search_result = SWIG_Lua_iterate_bases(L,type,first_arg,SWIG_Lua_class_do_set,ret);
-  if(ret)
-    assert(*ret == 0);
-  assert(lua_gettop(L) == substack_start + 3);
-  return bases_search_result;
-}
-
-/* This is the actual method exported to Lua. It calls SWIG_Lua_class_do_set and correctly
- * handles return values.
- */
-SWIGINTERN int  SWIG_Lua_class_set(lua_State *L)
-{
-/*  There should be 3 params passed in
-  (1) table (not the meta table)
-  (2) string name of the attribute
-  (3) any for the new value
-  */
-  int ret = 0;
-  int result;
-  swig_lua_userdata *usr;
-  swig_type_info *type;
-  assert(lua_isuserdata(L,1));
-  usr=(swig_lua_userdata*)lua_touserdata(L,1);  /* get data */
-  type = usr->type;
-  result = SWIG_Lua_class_do_set(L,type,1,&ret);
-  if(result != SWIG_OK) {
-   SWIG_Lua_pushferrstring(L,"Assignment not possible. No setter/member with this name. For custom assignments implement __setitem method.");
-   lua_error(L);
-  } else {
-    assert(ret==0);
-  }
-  return 0;
-}
-
-/* the class.destruct method called by the interpreter */
-SWIGINTERN int  SWIG_Lua_class_destruct(lua_State *L)
-{
-/*  there should be 1 params passed in
-  (1) userdata (not the meta table) */
-  swig_lua_userdata *usr;
-  swig_lua_class *clss;
-  assert(lua_isuserdata(L,-1));  /* just in case */
-  usr=(swig_lua_userdata*)lua_touserdata(L,-1);  /* get it */
-  /* if must be destroyed & has a destructor */
-  if (usr->own) /* if must be destroyed */
-  {
-    clss=(swig_lua_class*)usr->type->clientdata;  /* get the class */
-    if (clss && clss->destructor)  /* there is a destroy fn */
-    {
-      clss->destructor(usr->ptr);  /* bye bye */
-    }
-  }
-  return 0;
-}
-
-/* the class.__tostring method called by the interpreter and print */
-SWIGINTERN int  SWIG_Lua_class_tostring(lua_State *L)
-{
-/*  there should be 1 param passed in
-  (1) userdata (not the metatable) */
-  const char *className;
-  void* userData;
-  assert(lua_isuserdata(L,1));  /* just in case */
-  userData = lua_touserdata(L,1); /* get the userdata address for later */
-  lua_getmetatable(L,1);    /* get the meta table */
-  assert(lua_istable(L,-1));  /* just in case */
-
-  lua_getfield(L, -1, ".type");
-  className = lua_tostring(L, -1);
-
-  lua_pushfstring(L, "<%s userdata: %p>", className, userData);
-  return 1;
-}
-
-/* to manually disown some userdata */
-SWIGINTERN int  SWIG_Lua_class_disown(lua_State *L)
-{
-/*  there should be 1 params passed in
-  (1) userdata (not the meta table) */
-  swig_lua_userdata *usr;
-  assert(lua_isuserdata(L,-1));  /* just in case */
-  usr=(swig_lua_userdata*)lua_touserdata(L,-1);  /* get it */
-  
-  usr->own = 0; /* clear our ownership */
-  return 0;
-}
-
-/* lua callable function to compare userdata's value
-the issue is that two userdata may point to the same thing
-but to lua, they are different objects */
-SWIGRUNTIME int SWIG_Lua_class_equal(lua_State *L)
-{
-  int result;
-  swig_lua_userdata *usr1,*usr2;
-  if (!lua_isuserdata(L,1) || !lua_isuserdata(L,2))  /* just in case */
-    return 0;  /* nil reply */
-  usr1=(swig_lua_userdata*)lua_touserdata(L,1);  /* get data */
-  usr2=(swig_lua_userdata*)lua_touserdata(L,2);  /* get data */
-  /*result=(usr1->ptr==usr2->ptr && usr1->type==usr2->type); only works if type is the same*/
-  result=(usr1->ptr==usr2->ptr);
-   lua_pushboolean(L,result);
-  return 1;
-}
-
-/* populate table at the top of the stack with metamethods that ought to be inherited */
-SWIGINTERN void SWIG_Lua_populate_inheritable_metamethods(lua_State *L)
-{
-  SWIG_Lua_add_boolean(L, "__add", 1);
-  SWIG_Lua_add_boolean(L, "__sub", 1);
-  SWIG_Lua_add_boolean(L, "__mul", 1);
-  SWIG_Lua_add_boolean(L, "__div", 1);
-  SWIG_Lua_add_boolean(L, "__mod", 1);
-  SWIG_Lua_add_boolean(L, "__pow", 1);
-  SWIG_Lua_add_boolean(L, "__unm", 1);
-  SWIG_Lua_add_boolean(L, "__len", 1 );
-  SWIG_Lua_add_boolean(L, "__concat", 1 );
-  SWIG_Lua_add_boolean(L, "__eq", 1);
-  SWIG_Lua_add_boolean(L, "__lt", 1);
-  SWIG_Lua_add_boolean(L, "__le", 1);
-  SWIG_Lua_add_boolean(L, "__call", 1);
-  SWIG_Lua_add_boolean(L, "__tostring", 1);
-  SWIG_Lua_add_boolean(L, "__gc", 0);
-}
-
-/* creates the swig registry */
-SWIGINTERN void SWIG_Lua_create_class_registry(lua_State *L)
-{
-  /* create main SWIG registry table */
-  lua_pushstring(L,"SWIG");
-  lua_newtable(L);
-  /* populate it with some predefined data */
-
-  /* .library table. Placeholder */
-  lua_pushstring(L,".library");
-  lua_newtable(L);
-  {
-    /* list of metamethods that class inherits from its bases */
-    lua_pushstring(L,"inheritable_metamethods");
-    lua_newtable(L);
-    /* populate with list of metamethods */
-    SWIG_Lua_populate_inheritable_metamethods(L);
-    lua_rawset(L,-3);
-  }
-  lua_rawset(L,-3);
-
-  lua_rawset(L,LUA_REGISTRYINDEX);
-}
-
-/* gets the swig registry (or creates it) */
-SWIGINTERN void  SWIG_Lua_get_class_registry(lua_State *L)
-{
-  /* add this all into the swig registry: */
-  lua_pushstring(L,"SWIG");
-  lua_rawget(L,LUA_REGISTRYINDEX);  /* get the registry */
-  if (!lua_istable(L,-1))  /* not there */
-  {  /* must be first time, so add it */
-    lua_pop(L,1);  /* remove the result */
-    SWIG_Lua_create_class_registry(L);
-    /* then get it */
-    lua_pushstring(L,"SWIG");
-    lua_rawget(L,LUA_REGISTRYINDEX);
-  }
-}
-
-SWIGINTERN void SWIG_Lua_get_inheritable_metamethods(lua_State *L)
-{
-  SWIG_Lua_get_class_registry(L);
-  lua_pushstring(L, ".library");
-  lua_rawget(L,-2);
-  assert( !lua_isnil(L,-1) );
-  lua_pushstring(L, "inheritable_metamethods");
-  lua_rawget(L,-2);
-
-  /* Remove class registry and library table */
-  lua_remove(L,-2);
-  lua_remove(L,-2);
-}
-
-/* Helper function to get the classes metatable from the register */
-SWIGINTERN void  SWIG_Lua_get_class_metatable(lua_State *L,const char *cname)
-{
-  SWIG_Lua_get_class_registry(L);  /* get the registry */
-  lua_pushstring(L,cname);  /* get the name */
-  lua_rawget(L,-2);    /* get it */
-  lua_remove(L,-2);    /* tidy up (remove registry) */
-}
-
-/* Set up the base classes pointers.
-Each class structure has a list of pointers to the base class structures.
-This function fills them.
-It cannot be done at compile time, as this will not work with hireachies
-spread over more than one swig file. 
-Therefore it must be done at runtime, querying the SWIG type system.
-*/
-SWIGINTERN void SWIG_Lua_init_base_class(lua_State *L,swig_lua_class *clss)
-{
-  int i=0;
-  swig_module_info *module=SWIG_GetModule(L);
-  for(i=0;clss->base_names[i];i++)
-  {
-    if (clss->bases[i]==0) /* not found yet */
-    {
-      /* lookup and cache the base class */
-      swig_type_info *info = SWIG_TypeQueryModule(module,module,clss->base_names[i]);
-      if (info) clss->bases[i] = (swig_lua_class *) info->clientdata;
-    }
-  }
-}
-
-#if defined(SWIG_LUA_SQUASH_BASES) && (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA)
-/* Merges two tables  */
-SWIGINTERN void SWIG_Lua_merge_tables_by_index(lua_State *L, int target, int source)
-{
-  /* iterating */
-  lua_pushnil(L);
-  while (lua_next(L,source) != 0) {
-    /* -1 - value, -2 - index */
-    /* have to copy to assign */
-    lua_pushvalue(L,-2); /* copy of index */
-    lua_pushvalue(L,-2); /* copy of value */
-    lua_rawset(L, target);
-    lua_pop(L,1);
-    /* only key is left */
-  }
-}
-
-/* Merges two tables with given name. original - index of target metatable, base - index of source metatable */
-SWIGINTERN void SWIG_Lua_merge_tables(lua_State *L, const char* name, int original, int base)
-{
-  /* push original[name], then base[name] */
-  lua_pushstring(L,name);
-  lua_rawget(L,original);
-  int original_table = lua_gettop(L);
-  lua_pushstring(L,name);
-  lua_rawget(L,base);
-  int base_table = lua_gettop(L);
-  SWIG_Lua_merge_tables_by_index(L, original_table, base_table);
-  /* clearing stack */
-  lua_pop(L,2);
-}
-
-/* Function takes all symbols from base and adds it to derived class. It's just a helper. */
-SWIGINTERN void SWIG_Lua_class_squash_base(lua_State *L, swig_lua_class *base_cls)
-{
-  /* There is one parameter - original, i.e. 'derived' class metatable */
-  assert(lua_istable(L,-1));
-  int original = lua_gettop(L);
-  SWIG_Lua_get_class_metatable(L,base_cls->fqname);
-  int base = lua_gettop(L);
-  SWIG_Lua_merge_tables(L, ".fn", original, base );
-  SWIG_Lua_merge_tables(L, ".set", original, base );
-  SWIG_Lua_merge_tables(L, ".get", original, base );
-  lua_pop(L,1);
-}
-
-/* Function squashes all symbols from 'clss' bases into itself */
-SWIGINTERN void  SWIG_Lua_class_squash_bases(lua_State *L, swig_lua_class *clss)
-{
-  int i;
-  SWIG_Lua_get_class_metatable(L,clss->fqname);
-  for(i=0;clss->base_names[i];i++)
-  {
-    if (clss->bases[i]==0) /* Somehow it's not found. Skip it */
-      continue;
-    /* Thing is: all bases are already registered. Thus they have already executed
-     * this function. So we just need to squash them into us, because their bases
-     * are already squashed into them. No need for recursion here!
-     */
-    SWIG_Lua_class_squash_base(L, clss->bases[i]);
-  }
-  lua_pop(L,1); /*tidy stack*/
-}
-#endif
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA) /* In elua this is useless */
-/* helper add a variable to a registered class */
-SWIGINTERN void  SWIG_Lua_add_variable(lua_State *L,const char *name,lua_CFunction getFn,lua_CFunction setFn)
-{
-  assert(lua_istable(L,-1));  /* just in case */
-  SWIG_Lua_get_table(L,".get"); /* find the .get table */
-  assert(lua_istable(L,-1));  /* just in case */
-  SWIG_Lua_add_function(L,name,getFn);
-  lua_pop(L,1);       /* tidy stack (remove table) */
-  if (setFn)
-  {
-    SWIG_Lua_get_table(L,".set"); /* find the .set table */
-    assert(lua_istable(L,-1));  /* just in case */
-    SWIG_Lua_add_function(L,name,setFn);
-    lua_pop(L,1);       /* tidy stack (remove table) */
-  }
-}
-
-/* helper to recursively add class static details (static attributes, operations and constants) */
-SWIGINTERN void SWIG_Lua_add_class_static_details(lua_State *L, swig_lua_class *clss)
-{
-  int i = 0;
-  /* The class namespace table must be on the top of the stack */
-  assert(lua_istable(L,-1));
-  /* call all the base classes first: we can then override these later: */
-  for(i=0;clss->bases[i];i++)
-  {
-    SWIG_Lua_add_class_static_details(L,clss->bases[i]);
-  }
-
-  SWIG_Lua_add_namespace_details(L, clss->cls_static);
-}
-
-SWIGINTERN void SWIG_Lua_add_class_user_metamethods(lua_State *L, swig_lua_class *clss); /* forward declaration */
-
-/* helper to recursively add class details (attributes & operations) */
-SWIGINTERN void  SWIG_Lua_add_class_instance_details(lua_State *L, swig_lua_class *clss)
-{
-  int i;
-  size_t bases_count = 0;
-  /* Add bases to .bases table */
-  SWIG_Lua_get_table(L,".bases");
-  assert(lua_istable(L,-1));  /* just in case */
-  for(i=0;clss->bases[i];i++)
-  {
-    SWIG_Lua_get_class_metatable(L,clss->bases[i]->fqname);
-    /* Base class must be already registered */
-    assert(lua_istable(L,-1));
-    lua_rawseti(L,-2,i+1); /* In lua indexing starts from 1 */
-    bases_count++;
-  }
-  assert(lua_rawlen(L,-1) == bases_count);
-  lua_pop(L,1); /* remove .bases table */
-  /* add attributes */
-  for(i=0;clss->attributes[i].name;i++){
-    SWIG_Lua_add_variable(L,clss->attributes[i].name,clss->attributes[i].getmethod,clss->attributes[i].setmethod);
-  }
-  /* add methods to the metatable */
-  SWIG_Lua_get_table(L,".fn"); /* find the .fn table */
-  assert(lua_istable(L,-1));  /* just in case */
-  for(i=0;clss->methods[i].name;i++){
-    SWIG_Lua_add_function(L,clss->methods[i].name,clss->methods[i].func);
-  }
-  lua_pop(L,1);       /* tidy stack (remove table) */
-  /* add operator overloads
-    This adds methods from metatable array to metatable. Can mess up garbage
-    collectind if someone defines __gc method
-    */
-  if(clss->metatable) {
-    for(i=0;clss->metatable[i].name;i++) {
-      SWIG_Lua_add_function(L,clss->metatable[i].name,clss->metatable[i].func);
-    }
-  }
-
-#if !defined(SWIG_LUA_SQUASH_BASES)
-  /* Adding metamethods that are defined in base classes. If bases were squashed
-   * then it is obviously unnecessary
-   */
-  SWIG_Lua_add_class_user_metamethods(L, clss);
-#endif
-}
-
-/* Helpers to add user defined class metamedhods - __add, __sub etc. The helpers are needed
-   for the following issue: Lua runtime checks for metamethod existence with rawget function
-   ignoring our SWIG-provided __index and __newindex functions. Thus our inheritance-aware method
-   search algorithm doesn't work in such case. (Not to say that Lua runtime queries metamethod directly
-   in metatable and not in object).
-   Current solution is this: if somewhere in hierarchy metamethod __x is defined, then all descendants
-   are automatically given a special proxy __x that calls the real __x method.
-   Obvious idea - to copy __x instead of creating __x-proxy is wrong because if someone changes __x in runtime,
-   those changes must be reflected in all descendants.
-*/
-
-SWIGRUNTIME int SWIG_Lua_resolve_metamethod(lua_State *L); /*forward declaration*/
-
-/* The real function that resolves a metamethod.
- * Function searches given class and all it's bases(recursively) for first instance of something that is
- * not equal to SWIG_Lua_resolve_metatmethod. (Almost always this 'something' is actual metamethod implementation
- * and it is a SWIG-generated C function.). It returns value on the top of the L and there is no garbage below the
- * answer.
- * Returns 1 if found, 0 otherwise.
- * clss is class which metatable we will search for method
- * metamethod_name_idx is index in L where metamethod name (as string) lies
- * skip_check allows to skip searching metamethod in givel clss and immideatelly go to searching in bases. skip_check
- * is not caried to subsequent recursive calls - false is always passed. It is set to true only at first call from
- * SWIG_Lua_resolve_metamethod
- * */
-SWIGINTERN int SWIG_Lua_do_resolve_metamethod(lua_State *L, const swig_lua_class *clss, int metamethod_name_idx,
-    int skip_check)
-{
-  /* This function is called recursively */
-  int result = 0;
-  int i = 0;
-
-  if (!skip_check) {
-    SWIG_Lua_get_class_metatable(L, clss->fqname);
-    lua_pushvalue(L, metamethod_name_idx);
-    lua_rawget(L,-2);
-    /* If this is cfunction and it is equal to SWIG_Lua_resolve_metamethod then
-     * this isn't the function we are looking for :)
-     * lua_tocfunction will return NULL if not cfunction
-     */
-    if (!lua_isnil(L,-1) && lua_tocfunction(L,-1) != SWIG_Lua_resolve_metamethod ) {
-      lua_remove(L,-2); /* removing class metatable */
-      return 1;
-    }
-    lua_pop(L,2); /* remove class metatable and query result */
-  }
-
-  /* Forwarding calls to bases */
-  for(i=0;clss->bases[i];i++)
-  {
-    result = SWIG_Lua_do_resolve_metamethod(L, clss->bases[i], metamethod_name_idx, 0);
-    if (result)
-      break;
-  }
-
-  return result;
-}
-
-/* The proxy function for metamethod. All parameters are passed as cclosure. Searches for actual method
- * and calls it */
-SWIGRUNTIME int SWIG_Lua_resolve_metamethod(lua_State *L)
-{
-  int numargs;
-  int metamethod_name_idx;
-  const swig_lua_class* clss;
-  int result;
-
-  lua_checkstack(L,5);
-  numargs = lua_gettop(L); /* number of arguments to pass to actual metamethod */
-  
-  /* Get upvalues from closure */
-  lua_pushvalue(L, lua_upvalueindex(1)); /*Get function name*/
-  metamethod_name_idx = lua_gettop(L);
-  
-  lua_pushvalue(L, lua_upvalueindex(2));
-  clss = (const swig_lua_class*)(lua_touserdata(L,-1));
-  lua_pop(L,1); /* remove lightuserdata with clss from stack */
-
-  /* Actual work */
-  result = SWIG_Lua_do_resolve_metamethod(L, clss, metamethod_name_idx, 1);
-  if (!result) {
-   SWIG_Lua_pushferrstring(L,"The metamethod proxy is set, but it failed to find actual metamethod. Memory corruption is most likely explanation.");
-   lua_error(L);
-   return 0;
-  }
-
-  lua_remove(L,-2); /* remove metamethod key */
-  lua_insert(L,1); /* move function to correct position */
-  lua_call(L, numargs, LUA_MULTRET);
-  return lua_gettop(L); /* return all results */
-}
-
-
-/* If given metamethod must be present in given class, then creates appropriate proxy
- * Returns 1 if successfully added, 0 if not added because no base class has it, -1
- * if method is defined in the class metatable itself
- */
-SWIGINTERN int SWIG_Lua_add_class_user_metamethod(lua_State *L, swig_lua_class *clss, const int metatable_index)
-{
-  int key_index;
-  int success = 0;
-  int i = 0;
-
-  /* metamethod name - on the top of the stack */
-  assert(lua_isstring(L,-1));
-  
-  key_index = lua_gettop(L);
-
-  /* Check whether method is already defined in metatable */
-  lua_pushvalue(L,key_index); /* copy of the key */
-  lua_gettable(L,metatable_index);
-  if( !lua_isnil(L,-1) ) {
-    lua_pop(L,1);
-    return -1;
-  }
-  lua_pop(L,1); 
-
-  /* Iterating over immediate bases */
-  for(i=0;clss->bases[i];i++)
-  {
-    const swig_lua_class *base = clss->bases[i];
-    SWIG_Lua_get_class_metatable(L, base->fqname);
-    lua_pushvalue(L, key_index);
-    lua_rawget(L, -2);
-    if( !lua_isnil(L,-1) ) {
-      lua_pushvalue(L, key_index); 
-
-      /* Add proxy function */
-      lua_pushvalue(L, key_index); /* first closure value is function name */
-      lua_pushlightuserdata(L, clss); /* second closure value is swig_lua_class structure */
-      lua_pushcclosure(L, SWIG_Lua_resolve_metamethod, 2);
-      
-      lua_rawset(L, metatable_index);
-      success = 1;
-    }
-    lua_pop(L,1); /* remove function or nil */
-    lua_pop(L,1); /* remove base class metatable */
-
-    if( success )
-      break;
-  }
-
-  return success; 
-}
-
-SWIGINTERN void SWIG_Lua_add_class_user_metamethods(lua_State *L, swig_lua_class *clss)
-{
-  int metatable_index;
-  int metamethods_info_index;
-  int tostring_undefined;
-  int eq_undefined = 0;
-
-  SWIG_Lua_get_class_metatable(L, clss->fqname);
-  metatable_index = lua_gettop(L);
-  SWIG_Lua_get_inheritable_metamethods(L);
-  assert(lua_istable(L,-1));
-  metamethods_info_index = lua_gettop(L);
-  lua_pushnil(L); /* first key */
-  while(lua_next(L, metamethods_info_index) != 0 ) {
-    /* key at index -2, value at index -1 */
-    const int is_inheritable = lua_toboolean(L,-2);
-    lua_pop(L,1); /* remove value - we don't need it anymore */
-
-    if(is_inheritable) { /* if metamethod is inheritable */
-      SWIG_Lua_add_class_user_metamethod(L,clss,metatable_index);
-    }
-  }
-
-  lua_pop(L,1); /* remove inheritable metatmethods table */
-
-  /* Special handling for __tostring method */
-  lua_pushstring(L, "__tostring");
-  lua_pushvalue(L,-1);
-  lua_rawget(L,metatable_index);
-  tostring_undefined = lua_isnil(L,-1);
-  lua_pop(L,1);
-  if( tostring_undefined ) {
-    lua_pushcfunction(L, SWIG_Lua_class_tostring);
-    lua_rawset(L, metatable_index);
-  } else {
-    lua_pop(L,1); /* remove copy of the key */
-  }
-
-  /* Special handling for __eq method */
-  lua_pushstring(L, "__eq");
-  lua_pushvalue(L,-1);
-  lua_rawget(L,metatable_index);
-  eq_undefined = lua_isnil(L,-1);
-  lua_pop(L,1);
-  if( eq_undefined ) {
-    lua_pushcfunction(L, SWIG_Lua_class_equal);
-    lua_rawset(L, metatable_index);
-  } else {
-    lua_pop(L,1); /* remove copy of the key */
-  }
-  /* Warning: __index and __newindex are SWIG-defined. For user-defined operator[]
-   * a __getitem/__setitem method should be defined
-   */
-  lua_pop(L,1); /* pop class metatable */
-}
-
-/* Register class static methods,attributes etc as well as constructor proxy */
-SWIGINTERN void SWIG_Lua_class_register_static(lua_State *L, swig_lua_class *clss)
-{
-  const int SWIGUNUSED begin = lua_gettop(L);
-  lua_checkstack(L,5); /* just in case */
-  assert(lua_istable(L,-1));  /* just in case */
-  assert(strcmp(clss->name, clss->cls_static->name) == 0); /* in class those 2 must be equal */
-
-  SWIG_Lua_namespace_register(L,clss->cls_static, 1);
-
-  assert(lua_istable(L,-1)); /* just in case */
-
-  /*  add its constructor to module with the name of the class
-  so you can do MyClass(...) as well as new_MyClass(...)
-  BUT only if a constructor is defined
-  (this overcomes the problem of pure virtual classes without constructors)*/
-  if (clss->constructor)
-  {
-    lua_getmetatable(L,-1);
-    assert(lua_istable(L,-1)); /* just in case */
-    SWIG_Lua_add_function(L,"__call", clss->constructor);
-    lua_pop(L,1);
-  }
-
-  assert(lua_istable(L,-1)); /* just in case */
-  SWIG_Lua_add_class_static_details(L, clss);
-
-  /* clear stack */
-  lua_pop(L,1);
-  assert( lua_gettop(L) == begin );
-}
-
-/* Performs the instance (non-static) class registration process. Metatable for class is created
- * and added to the class registry.
- */
-SWIGINTERN void  SWIG_Lua_class_register_instance(lua_State *L,swig_lua_class *clss)
-{
-  const int SWIGUNUSED begin = lua_gettop(L);
-  int i;
-  /* if name already there (class is already registered) then do nothing */
-  SWIG_Lua_get_class_registry(L);  /* get the registry */
-  lua_pushstring(L,clss->fqname);  /* get the name */
-  lua_rawget(L,-2);
-  if(!lua_isnil(L,-1)) {
-    lua_pop(L,2);
-    assert(lua_gettop(L)==begin);
-    return;
-  }
-  lua_pop(L,2); /* tidy stack */
-  /* Recursively initialize all bases */
-  for(i=0;clss->bases[i];i++)
-  {
-    SWIG_Lua_class_register_instance(L,clss->bases[i]);
-  }
-  /* Again, get registry and push name */
-  SWIG_Lua_get_class_registry(L);  /* get the registry */
-  lua_pushstring(L,clss->fqname);  /* get the name */
-  lua_newtable(L);    /* create the metatable */
-#if defined(SWIG_LUA_SQUASH_BASES) && (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA)
-  /* If squashing is requested, then merges all bases metatable into this one.
-   * It would get us all special methods: __getitem, __add etc.
-   * This would set .fn, .type, and other .xxx incorrectly, but we will overwrite it right away
-   */
-  {
-    int new_metatable_index = lua_absindex(L,-1);
-    for(i=0;clss->bases[i];i++)
-    {
-      int base_metatable;
-      SWIG_Lua_get_class_metatable(L,clss->bases[i]->fqname);
-      base_metatable = lua_absindex(L,-1);
-      SWIG_Lua_merge_tables_by_index(L,new_metatable_index, base_metatable);
-      lua_pop(L,1);
-    }
-  }
-  /* And now we will overwrite all incorrectly set data */
-#endif
-  /* add string of class name called ".type" */
-  lua_pushstring(L,".type");
-  lua_pushstring(L,clss->fqname);
-  lua_rawset(L,-3);
-  /* add a table called bases */
-  lua_pushstring(L,".bases");
-  lua_newtable(L);
-  lua_rawset(L,-3);
-  /* add a table called ".get" */
-  lua_pushstring(L,".get");
-  lua_newtable(L);
-  lua_rawset(L,-3);
-  /* add a table called ".set" */
-  lua_pushstring(L,".set");
-  lua_newtable(L);
-  lua_rawset(L,-3);
-  /* add a table called ".fn" */
-  lua_pushstring(L,".fn");
-  lua_newtable(L);
-  /* add manual disown method */
-  SWIG_Lua_add_function(L,"__disown",SWIG_Lua_class_disown);
-  lua_rawset(L,-3);
-  /* add accessor fns for using the .get,.set&.fn */
-  SWIG_Lua_add_function(L,"__index",SWIG_Lua_class_get);
-  SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_class_set);
-  SWIG_Lua_add_function(L,"__gc",SWIG_Lua_class_destruct);
-  /* add it */
-  lua_rawset(L,-3);  /* metatable into registry */
-  lua_pop(L,1);      /* tidy stack (remove registry) */
-  assert(lua_gettop(L) == begin);
-
-#if defined(SWIG_LUA_SQUASH_BASES) && (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA)
-  /* Now merge all symbols from .fn, .set, .get etc from bases to our tables */
-  SWIG_Lua_class_squash_bases(L,clss);
-#endif
-  SWIG_Lua_get_class_metatable(L,clss->fqname);
-  SWIG_Lua_add_class_instance_details(L,clss);  /* recursive adding of details (atts & ops) */
-  lua_pop(L,1);      /* tidy stack (remove class metatable) */
-  assert( lua_gettop(L) == begin );
-}
-
-SWIGINTERN void  SWIG_Lua_class_register(lua_State *L,swig_lua_class *clss)
-{
-  int SWIGUNUSED begin;
-  assert(lua_istable(L,-1)); /* This is a table (module or namespace) where classes will be added */
-  SWIG_Lua_class_register_instance(L,clss);
-  SWIG_Lua_class_register_static(L,clss);
-
-  /* Add links from static part to instance part and vice versa */
-  /* [SWIG registry]                                   [Module]
-   *    "MyClass" ----> [MyClass metatable] <=====     "MyClass" -+> [static part]
-   *                     ".get" ----> ...        |                |     getmetatable()----|
-   *                     ".set" ----> ...        |                |                       |
-   *                     ".static" --------------)----------------/           [static part metatable]
-   *                                             |                                ".get" --> ...
-   *                                             |                                ".set" --> ....
-   *                                             |=============================== ".instance"
-   */
-  begin = lua_gettop(L);
-  lua_pushstring(L,clss->cls_static->name);
-  lua_rawget(L,-2); /* get class static table */
-  assert(lua_istable(L,-1));
-  lua_getmetatable(L,-1);
-  assert(lua_istable(L,-1)); /* get class static metatable */
-  lua_pushstring(L,".instance"); /* prepare key */
-
-  SWIG_Lua_get_class_metatable(L,clss->fqname); /* get class metatable */
-  assert(lua_istable(L,-1));
-  lua_pushstring(L,".static"); /* prepare key */
-  lua_pushvalue(L, -4); /* push static class TABLE */
-  assert(lua_istable(L,-1));
-  lua_rawset(L,-3); /* assign static class table(!NOT metatable) as ".static" member of class metatable */
-  lua_rawset(L,-3); /* assign class metatable as ".instance" member of class static METATABLE */
-  lua_pop(L,2);
-  assert(lua_gettop(L) == begin);
-}
-#endif /* SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA */
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-SWIGINTERN void SWIG_Lua_elua_class_register_instance(lua_State *L, swig_lua_class *clss)
-{
-  const int SWIGUNUSED begin = lua_gettop(L);
-  int i;
-  /* if name already there (class is already registered) then do nothing */
-  SWIG_Lua_get_class_registry(L);  /* get the registry */
-  lua_pushstring(L,clss->fqname);  /* get the name */
-  lua_rawget(L,-2);
-  if(!lua_isnil(L,-1)) {
-    lua_pop(L,2);
-    assert(lua_gettop(L)==begin);
-    return;
-  }
-  lua_pop(L,2); /* tidy stack */
-  /* Recursively initialize all bases */
-  for(i=0;clss->bases[i];i++)
-  {
-    SWIG_Lua_elua_class_register_instance(L,clss->bases[i]);
-  }
-  /* Again, get registry and push name */
-  SWIG_Lua_get_class_registry(L);  /* get the registry */
-  lua_pushstring(L,clss->fqname);  /* get the name */
-  assert(clss->metatable);
-  lua_pushrotable(L, (void*)(clss->metatable));    /* create the metatable */
-  lua_rawset(L,-3);
-  lua_pop(L,1);
-  assert(lua_gettop(L) == begin);
-}
-#endif /* elua && eluac */
-
-/* -----------------------------------------------------------------------------
- * Class/structure conversion fns
- * ----------------------------------------------------------------------------- */
-
-/* helper to add metatable to new lua object */
-SWIGINTERN void SWIG_Lua_AddMetatable(lua_State *L,swig_type_info *type)
-{
-  if (type->clientdata)  /* there is clientdata: so add the metatable */
-  {
-    SWIG_Lua_get_class_metatable(L,((swig_lua_class*)(type->clientdata))->fqname);
-    if (lua_istable(L,-1))
-    {
-      lua_setmetatable(L,-2);
-    }
-    else
-    {
-      lua_pop(L,1);
-    }
-  }
-}
-
-/* pushes a new object into the lua stack */
-SWIGRUNTIME void SWIG_Lua_NewPointerObj(lua_State *L,void *ptr,swig_type_info *type, int own)
-{
-  swig_lua_userdata *usr;
-  if (!ptr){
-    lua_pushnil(L);
-    return;
-  }
-  usr=(swig_lua_userdata*)lua_newuserdata(L,sizeof(swig_lua_userdata));  /* get data */
-  usr->ptr=ptr;  /* set the ptr */
-  usr->type=type;
-  usr->own=own;
-#if (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC)
-  SWIG_Lua_AddMetatable(L,type); /* add metatable */
-#endif
-}
-
-/* takes a object from the lua stack & converts it into an object of the correct type
- (if possible) */
-SWIGRUNTIME int  SWIG_Lua_ConvertPtr(lua_State *L,int index,void **ptr,swig_type_info *type,int flags)
-{
-  swig_lua_userdata *usr;
-  swig_cast_info *cast;
-  if (lua_isnil(L,index)){*ptr=0; return SWIG_OK;}    /* special case: lua nil => NULL pointer */
-  usr=(swig_lua_userdata*)lua_touserdata(L,index);  /* get data */
-  if (usr)
-  {
-    if (flags & SWIG_POINTER_DISOWN) /* must disown the object */
-    {
-        usr->own=0;
-    }
-    if (!type)            /* special cast void*, no casting fn */
-    {
-      *ptr=usr->ptr;
-      return SWIG_OK; /* ok */
-    }
-    cast=SWIG_TypeCheckStruct(usr->type,type); /* performs normal type checking */
-    if (cast)
-    {
-      int newmemory = 0;
-      *ptr=SWIG_TypeCast(cast,usr->ptr,&newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
-      return SWIG_OK;  /* ok */
-    }
-  }
-  return SWIG_ERROR;  /* error */
-}
-
-SWIGRUNTIME void* SWIG_Lua_MustGetPtr(lua_State *L,int index,swig_type_info *type,int flags,
-       int argnum,const char *func_name){
-  void *result;
-  if (!SWIG_IsOK(SWIG_ConvertPtr(L,index,&result,type,flags))){
-    luaL_error (L,"Error in %s, expected a %s at argument number %d\n",
-		func_name,(type && type->str)?type->str:"void*",argnum);
-  }
-  return result;
-}
-
-/* pushes a packed userdata. user for member fn pointers only */
-SWIGRUNTIME void SWIG_Lua_NewPackedObj(lua_State *L,void *ptr,size_t size,swig_type_info *type)
-{
-  swig_lua_rawdata *raw;
-  assert(ptr); /* not acceptable to pass in a NULL value */
-  raw=(swig_lua_rawdata*)lua_newuserdata(L,sizeof(swig_lua_rawdata)-1+size);  /* alloc data */
-  raw->type=type;
-  raw->own=0;
-  memcpy(raw->data,ptr,size); /* copy the data */
-  SWIG_Lua_AddMetatable(L,type); /* add metatable */
-}
-    
-/* converts a packed userdata. user for member fn pointers only */
-SWIGRUNTIME int  SWIG_Lua_ConvertPacked(lua_State *L,int index,void *ptr,size_t size,swig_type_info *type)
-{
-  swig_lua_rawdata *raw;
-  raw=(swig_lua_rawdata*)lua_touserdata(L,index);  /* get data */
-  if (!raw) return SWIG_ERROR;  /* error */
-  if (type==0 || type==raw->type) /* void* or identical type */
-  {
-    memcpy(ptr,raw->data,size); /* copy it */
-    return SWIG_OK; /* ok */
-  }
-  return SWIG_ERROR;  /* error */
-}
-
-/* a function to get the typestring of a piece of data */
-SWIGRUNTIME const char *SWIG_Lua_typename(lua_State *L, int tp)
-{
-  swig_lua_userdata *usr;
-  if (lua_isuserdata(L,tp))
-  {
-    usr=(swig_lua_userdata*)lua_touserdata(L,tp);  /* get data */
-    if (usr && usr->type && usr->type->str)
-      return usr->type->str;
-    return "userdata (unknown type)";
-  }
-  return lua_typename(L,lua_type(L,tp));
-}
-
-/* lua callable function to get the userdata's type */
-SWIGRUNTIME int SWIG_Lua_type(lua_State *L)
-{
-  lua_pushstring(L,SWIG_Lua_typename(L,1));
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * global variable support code: class/struct typemap functions
- * ----------------------------------------------------------------------------- */
-
-#if ((SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUA) && (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC))
-/* Install Constants */
-SWIGINTERN void
-SWIG_Lua_InstallConstants(lua_State *L, swig_lua_const_info constants[]) {
-  int i;
-  for (i = 0; constants[i].type; i++) {
-    switch(constants[i].type) {
-    case SWIG_LUA_INT:
-      lua_pushstring(L,constants[i].name);
-      lua_pushinteger(L,(lua_Number)constants[i].lvalue);
-      lua_rawset(L,-3);
-      break;
-    case SWIG_LUA_FLOAT:
-      lua_pushstring(L,constants[i].name);
-      lua_pushnumber(L,(lua_Number)constants[i].dvalue);
-      lua_rawset(L,-3);
-      break;
-    case SWIG_LUA_CHAR:
-      lua_pushstring(L,constants[i].name);
-      {
-        char c = constants[i].lvalue;
-        lua_pushlstring(L,&c,1);
-      }
-      lua_rawset(L,-3);
-      break;
-    case SWIG_LUA_STRING:
-      lua_pushstring(L,constants[i].name);
-      lua_pushstring(L,(char *) constants[i].pvalue);
-      lua_rawset(L,-3);
-      break;
-    case SWIG_LUA_POINTER:
-      lua_pushstring(L,constants[i].name);
-      SWIG_NewPointerObj(L,constants[i].pvalue, *(constants[i]).ptype,0);
-      lua_rawset(L,-3);
-      break;
-    case SWIG_LUA_BINARY:
-      lua_pushstring(L,constants[i].name);
-      SWIG_NewMemberObj(L,constants[i].pvalue,constants[i].lvalue,*(constants[i]).ptype);
-      lua_rawset(L,-3);
-      break;
-    default:
-      break;
-    }
-  }
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- * executing lua code from within the wrapper
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_DOSTRING_FAIL /* Allows redefining of error function */
-#define SWIG_DOSTRING_FAIL(S) fprintf(stderr,"%s\n",S)
-#endif
-/* Executes a C string in Lua which is a really simple way of calling lua from C
-Unfortunately lua keeps changing its APIs, so we need a conditional compile
-In lua 5.0.X it's lua_dostring()
-In lua 5.1.X it's luaL_dostring()
-*/
-SWIGINTERN int 
-SWIG_Lua_dostring(lua_State *L, const char *str) {
-  int ok,top;
-  if (str==0 || str[0]==0) return 0; /* nothing to do */
-  top=lua_gettop(L); /* save stack */
-#if (defined(LUA_VERSION_NUM) && (LUA_VERSION_NUM>=501))
-  ok=luaL_dostring(L,str);	/* looks like this is lua 5.1.X or later, good */
-#else
-  ok=lua_dostring(L,str);	/* might be lua 5.0.x, using lua_dostring */
-#endif
-  if (ok!=0) {
-    SWIG_DOSTRING_FAIL(lua_tostring(L,-1));
-  }
-  lua_settop(L,top); /* restore the stack */
-  return ok;
-}    
-
-#ifdef __cplusplus
-}
-#endif
-
-/* ------------------------------ end luarun.swg  ------------------------------ */
diff --git a/dependencies2013/win32/swig/Lib/lua/luaruntime.swg b/dependencies2013/win32/swig/Lib/lua/luaruntime.swg
deleted file mode 100644
index 8df46e8c..00000000
--- a/dependencies2013/win32/swig/Lib/lua/luaruntime.swg
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -----------------------------------------------------------------------------
- * luaruntime.swg
- *
- * all the runtime code for .
- * ----------------------------------------------------------------------------- */
-
-%runtime "swigrun.swg";         /* Common C API type-checking code */
-%runtime "luarun.swg";          /* Lua runtime stuff */
-
-%insert(initbeforefunc) "swiginit.swg"
-
-%insert(initbeforefunc) %{
-
-/* Forward declaration of where the user's %init{} gets inserted */
-void SWIG_init_user(lua_State* L );
-    
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* this is the initialization function
-  added at the very end of the code
-  the function is always called SWIG_init, but an earlier #define will rename it
-*/
-#if ((SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC))
-LUALIB_API int SWIG_init(lua_State* L)
-#else
-SWIGEXPORT int SWIG_init(lua_State* L) /* default Lua action */
-#endif
-{
-#if (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC) /* valid for both Lua and eLua */
-  int i;
-  int globalRegister = 0;
-  /* start with global table */
-  lua_pushglobaltable (L);
-  /* SWIG's internal initialisation */
-  SWIG_InitializeModule((void*)L);
-  SWIG_PropagateClientData();
-#endif
-
-#if ((SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUA) && (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC)) || defined(SWIG_LUA_ELUA_EMULATE)
-  /* add a global fn */
-  SWIG_Lua_add_function(L,"swig_type",SWIG_Lua_type);
-  SWIG_Lua_add_function(L,"swig_equals",SWIG_Lua_class_equal);
-#endif
-
-#if (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC)
-  /* set up base class pointers (the hierarchy) */
-  for (i = 0; swig_types[i]; i++){
-    if (swig_types[i]->clientdata){
-      SWIG_Lua_init_base_class(L,(swig_lua_class*)(swig_types[i]->clientdata));
-    }
-  }
-#ifdef SWIG_LUA_MODULE_GLOBAL
-  globalRegister = 1;
-#endif
-
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_LUA)
-  SWIG_Lua_namespace_register(L,&swig_SwigModule, globalRegister);
-#endif
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-  for (i = 0; swig_types[i]; i++){
-    if (swig_types[i]->clientdata){
-      SWIG_Lua_elua_class_register_instance(L,(swig_lua_class*)(swig_types[i]->clientdata));
-    }
-  }
-#endif
-
-#if defined(SWIG_LUA_ELUA_EMULATE)
-  lua_newtable(L);
-  SWIG_Lua_elua_emulate_register(L,swig_SwigModule.ns_methods);
-  SWIG_Lua_elua_emulate_register_clear(L);
-  if(globalRegister) {
-    lua_pushstring(L,swig_SwigModule.name);
-    lua_pushvalue(L,-2);
-    lua_rawset(L,-4);
-  }
-#endif
-
-#endif
-
-#if (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC)
-  /* invoke user-specific initialization */
-  SWIG_init_user(L);
-  /* end module */
-  /* Note: We do not clean up the stack here (Lua will do this for us). At this
-     point, we have the globals table and out module table on the stack. Returning
-     one value makes the module table the result of the require command. */
-  return 1;
-#else
-  return 0;
-#endif
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-%}
-
-/* Note: the initialization function is closed after all code is generated */
-
diff --git a/dependencies2013/win32/swig/Lib/lua/luatypemaps.swg b/dependencies2013/win32/swig/Lib/lua/luatypemaps.swg
deleted file mode 100644
index 5d98e610..00000000
--- a/dependencies2013/win32/swig/Lib/lua/luatypemaps.swg
+++ /dev/null
@@ -1,412 +0,0 @@
-/* -----------------------------------------------------------------------------
- * luatypemaps.swg
- *
- * basic typemaps for Lua.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- *                          standard typemaps
- * ----------------------------------------------------------------------------- */
-/* NEW LANGUAGE NOTE:
-   the 'checkfn' param is something that I added for typemap(in)
-   it is an optional fn call to check the type of the lua object
-   the fn call must be of the form
-     int checkfn(lua_State *L, int index);
-   and return 1/0 depending upon if this is the correct type
-   For the typemap(out), an additional SWIG_arg parameter must be incremented
-   to reflect the number of values returned (normally SWIG_arg++; will do)
-*/
-// numbers
-%typemap(in,checkfn="lua_isnumber") int, short, long,
-             signed char, float, double
-%{$1 = ($type)lua_tonumber(L, $input);%}
- 
-// additional check for unsigned numbers, to not permit negative input
-%typemap(in,checkfn="lua_isnumber") unsigned int,
-             unsigned short, unsigned long, unsigned char
-%{SWIG_contract_assert((lua_tonumber(L,$input)>=0),"number must not be negative")
-$1 = ($type)lua_tonumber(L, $input);%}
-
-%typemap(out) int,short,long,
-             unsigned int,unsigned short,unsigned long,
-             signed char,unsigned char,
-             float,double
-%{  lua_pushnumber(L, (lua_Number) $1); SWIG_arg++;%}
-
-// we must also provide typemaps for primitives by const reference:
-// given a function:
-//	int intbyref(const int& i);
-// SWIG assumes that this code will need a pointer to int to be passed in
-// (this might be ok for objects by const ref, but not for numeric primitives)
-// therefore we add a set of typemaps to fix this (for both in & out)
-%typemap(in,checkfn="lua_isnumber") const int&($basetype temp)
-%{ temp=($basetype)lua_tonumber(L,$input); $1=&temp;%}
-
-%typemap(in,checkfn="lua_isnumber") const unsigned int&($basetype temp)
-%{SWIG_contract_assert((lua_tonumber(L,$input)>=0),"number must not be negative")
-temp=($basetype)lua_tonumber(L,$input); $1=&temp;%}
-
-%typemap(out) const int&, const unsigned int&
-%{  lua_pushnumber(L, (lua_Number) *$1); SWIG_arg++;%}
-
-// for the other numbers we can just use an apply statement to cover them
-%apply const int & {const short&,const long&,const signed char&,
-             const float&,const double&};
-
-%apply const unsigned int & {const unsigned short&,const unsigned long&,
-             const unsigned char&};
-
-/* enums have to be handled slightly differently
-	VC++ .net will not allow a cast from lua_Number(double) to enum directly.
-*/
-%typemap(in,checkfn="lua_isnumber") enum SWIGTYPE
-%{$1 = ($type)(int)lua_tonumber(L, $input);%}
-
-%typemap(out) enum SWIGTYPE
-%{  lua_pushnumber(L, (lua_Number)(int)($1)); SWIG_arg++;%}
-
-// and const refs
-%typemap(in,checkfn="lua_isnumber") const enum SWIGTYPE &($basetype temp)
-%{ temp=($basetype)(int)lua_tonumber(L,$input); $1=&temp;%}
-%typemap(in,checkfn="lua_isnumber") const enum SWIGTYPE &&($basetype temp)
-%{ temp=($basetype)(int)lua_tonumber(L,$input); $1=&temp;%}
-%typemap(out) const enum SWIGTYPE &
-%{  lua_pushnumber(L, (lua_Number) *$1); SWIG_arg++;%}
-%typemap(out) const enum SWIGTYPE &&
-%{  lua_pushnumber(L, (lua_Number) *$1); SWIG_arg++;%}
-
-
-// boolean (which is a special type in lua)
-// note: lua_toboolean() returns 1 or 0
-// note: 1 & 0 are not booleans in lua, only true & false
-%typemap(in,checkfn="lua_isboolean") bool
-%{$1 = (lua_toboolean(L, $input)!=0);%}
-
-%typemap(out) bool
-%{  lua_pushboolean(L,(int)($1!=0)); SWIG_arg++;%}
-
-// for const bool&, SWIG treats this as a const bool* so we must dereference it
-%typemap(in,checkfn="lua_isboolean") const bool& (bool temp)
-%{temp=(lua_toboolean(L, $input)!=0);
-  $1=&temp;%}
-
-%typemap(out) const bool&
-%{  lua_pushboolean(L,(int)((*$1)!=0)); SWIG_arg++;%}
-
-// strings (char * and char[])
-%fragment("SWIG_lua_isnilstring", "header") {
-SWIGINTERN int SWIG_lua_isnilstring(lua_State *L, int idx) {
-  int ret = lua_isstring(L, idx);
-  if (!ret)
-   ret = lua_isnil(L, idx);
-  return ret;
-}
-}
-
-%typemap(in,checkfn="SWIG_lua_isnilstring",fragment="SWIG_lua_isnilstring") const char *, char *
-%{$1 = ($ltype)lua_tostring(L, $input);%}
-
-%typemap(in,checkfn="SWIG_lua_isnilstring",fragment="SWIG_lua_isnilstring") const char[ANY], char[ANY]
-%{$1 = ($ltype)lua_tostring(L, $input);%}
-
-%typemap(out) const char *, char *
-%{  lua_pushstring(L,(const char *)$1); SWIG_arg++;%}
-
-%typemap(out) const char[ANY], char[ANY]
-%{  lua_pushstring(L,(const char *)$1); SWIG_arg++;%}
-
-// char's
-// currently treating chars as small strings, not as numbers
-// (however signed & unsigned char's are numbers...)
-%typemap(in,checkfn="SWIG_lua_isnilstring",fragment="SWIG_lua_isnilstring") char
-%{$1 = (lua_tostring(L, $input))[0];%}
-
-%typemap(out) char
-%{  lua_pushlstring(L, &$1, 1); SWIG_arg++;%}
-
-// by const ref
-%typemap(in,checkfn="SWIG_lua_isnilstring",fragment="SWIG_lua_isnilstring") const char& (char temp)
-%{temp = (lua_tostring(L, $input))[0]; $1=&temp;%}
-
-%typemap(out) const char&
-%{  lua_pushlstring(L, $1, 1); SWIG_arg++;%}
-
-// pointers and references
-// under SWIG rules, it is ok, to have a pass in a lua nil,
-// it should be converted to a SWIG NULL.
-// This will only be allowed for pointers & arrays, not refs or by value
-// the checkfn lua_isuserdata will only work for userdata
-// the checkfn SWIG_isptrtype will work for both userdata and nil
-%typemap(in,checkfn="SWIG_isptrtype") SWIGTYPE*,SWIGTYPE[]
-%{
-  if (!SWIG_IsOK(SWIG_ConvertPtr(L,$input,(void**)&$1,$descriptor,$disown))){
-    SWIG_fail_ptr("$symname",$argnum,$descriptor);
-  }
-%}
-
-%typemap(in,checkfn="lua_isuserdata") SWIGTYPE&
-%{
-  if (!SWIG_IsOK(SWIG_ConvertPtr(L,$input,(void**)&$1,$descriptor,$disown))){
-    SWIG_fail_ptr("$symname",$argnum,$descriptor);
-  }
-%}
-
-%typemap(in,checkfn="lua_isuserdata") SWIGTYPE&&
-%{
-  if (!SWIG_IsOK(SWIG_ConvertPtr(L,$input,(void**)&$1,$descriptor,$disown))){
-    SWIG_fail_ptr("$symname",$argnum,$descriptor);
-  }
-%}
-
-// out is simple
-%typemap(out) SWIGTYPE*,SWIGTYPE&
-%{SWIG_NewPointerObj(L,$1,$descriptor,$owner); SWIG_arg++; %}
-%typemap(out) SWIGTYPE*,SWIGTYPE&&
-%{SWIG_NewPointerObj(L,$1,$descriptor,$owner); SWIG_arg++; %}
-
-// dynamic casts
-// this uses the SWIG_TypeDynamicCast() which relies on RTTI to find out what the pointer really is
-// the we return it as the correct type
-%typemap(out) SWIGTYPE *DYNAMIC,
-              SWIGTYPE &DYNAMIC
-{
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1);
-  SWIG_NewPointerObj(L,(void*)$1,ty,$owner); SWIG_arg++; 
-}
-
-
-// passing objects by value
-// SWIG_ConvertPtr wants an object pointer (the $&ltype argp)
-// then dereferences it to get the object
-%typemap(in,checkfn="lua_isuserdata") SWIGTYPE ($&ltype argp)
-%{
-   if (!SWIG_IsOK(SWIG_ConvertPtr(L,$input,(void**)&argp,$&descriptor,0))){
-     SWIG_fail_ptr("$symname",$argnum,$&descriptor);
-   }
-   $1 = *argp;
-%}
-
-// Also needed for object ptrs by const ref
-// eg A* const& ref_pointer(A* const& a);
-// found in mixed_types.i
-%typemap(in,checkfn="lua_isuserdata") SWIGTYPE *const&($*ltype temp)
-%{temp=($*ltype)SWIG_MustGetPtr(L,$input,$*descriptor,0,$argnum,"$symname");
-$1=($1_ltype)&temp;%}
-
-%typemap(out) SWIGTYPE *const&
-%{SWIG_NewPointerObj(L,*$1,$*descriptor,$owner); SWIG_arg++; %}
-
-
-// DISOWN-ing typemaps
-// if you have an object pointer which must be disowned, use this typemap
-// eg. for void destroy_foo(Foo* toDie);
-// use %apply SWIGTYPE* DISOWN {Foo* toDie};
-// you could just use %delobject, but this is more flexible
-%typemap(in,checkfn="SWIG_isptrtype") SWIGTYPE* DISOWN,SWIGTYPE DISOWN[]
-%{  if (!SWIG_IsOK(SWIG_ConvertPtr(L,$input,(void**)&$1,$descriptor,SWIG_POINTER_DISOWN))){
-    SWIG_fail_ptr("$symname",$argnum,$descriptor);
-  }
-%}
-
-
-// Primitive types--return by value
-// must make a new object, copy the data & return the new object
-// Note: the brackets are {...} and not %{..%}, because we want them to be included in the wrapper
-// this is because typemap(out) does not support local variables, like in typemap(in) does
-// and we need the $&1_ltype resultptr; to be declared
-#ifdef __cplusplus
-%typemap(out) SWIGTYPE
-{
-  $&1_ltype resultptr = new $1_ltype((const $1_ltype &) $1);
-  SWIG_NewPointerObj(L,(void *) resultptr,$&1_descriptor,1); SWIG_arg++;
-}
-#else
-%typemap(out) SWIGTYPE
-{
-  $&1_ltype resultptr;
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  SWIG_NewPointerObj(L,(void *) resultptr,$&1_descriptor,1); SWIG_arg++;
-}
-#endif
-
-// member function pointer
-// a member fn ptr is not 4 bytes like a normal pointer, but 8 bytes (at least on mingw)
-// so the standard wrapping cannot be done
-// nor can you cast a member function pointer to a void* (obviously)
-// therefore a special wrapping functions SWIG_ConvertMember() & SWIG_NewMemberObj() were written
-#ifdef __cplusplus
-%typemap(in,checkfn="lua_isuserdata") SWIGTYPE (CLASS::*)
-%{
-  if (!SWIG_IsOK(SWIG_ConvertMember(L,$input,(void*)(&$1),sizeof($type),$descriptor)))
-    SWIG_fail_ptr("$symname",$argnum,$descriptor);
-%}
-
-%typemap(out) SWIGTYPE (CLASS::*)
-%{ 
-  SWIG_NewMemberObj(L,(void*)(&$1),sizeof($type),$descriptor); SWIG_arg++; 
-%}
-#endif
-
-
-// void (must be empty without the SWIG_arg++)
-%typemap(out) void "";
-
-/* void* is a special case
-A function void fn(void*) should take any kind of pointer as a parameter (just like C/C++ does)
-but if its an output, then it should be wrapped like any other SWIG object (using default typemap)
-*/
-%typemap(in,checkfn="SWIG_isptrtype") void*
-%{$1=($1_ltype)SWIG_MustGetPtr(L,$input,0,0,$argnum,"$symname");%}
-
-/* long long is another special case:
-as lua only supports one numeric type (lua_Number), we will just
-cast it to that & accept the loss of precision.
-An alternative solution would be a long long struct or class
-with the relevant operators.
-*/
-%apply long {long long, signed long long, unsigned long long};
-%apply const long& {const long long&, const signed long long&, const unsigned long long&};
-
-/* It is possible to also pass a lua_State* into a function, so
-void fn(int a, float b, lua_State* s) is wrappable as
-> fn(1,4.3) -- note: the state is implicitly passed in
-*/
-%typemap(in, numinputs=0) lua_State* 
-%{$1 = L;%}
-
-
-
-/* -----------------------------------------------------------------------------
- *                          typecheck rules
- * ----------------------------------------------------------------------------- */
-/* These are needed for the overloaded functions
-These define the detection routines which will spot what
-parameters match which function
-*/
-
-// unfortunately lua only considers one type of number
-// so all numbers (int,float,double) match
-// you could add an advanced fn to get type & check if its integral
-%typecheck(SWIG_TYPECHECK_INTEGER)
-	 int, short, long,
- 	 unsigned int, unsigned short, unsigned long,
-	 signed char, unsigned char,
-	 long long, unsigned long long, signed long long,
-	 const int &, const short &, const long &,
- 	 const unsigned int &, const unsigned short &, const unsigned long &,
-	 const signed char&, const unsigned char&,
-	 const long long &, const unsigned long long &,
-	 enum SWIGTYPE,	const enum SWIGTYPE&, const enum SWIGTYPE &&,
-	 float, double, const float &, const double&
-{
-  $1 = lua_isnumber(L,$input);
-}
-
-%typecheck(SWIG_TYPECHECK_BOOL)
-    bool, const bool &
-{
-  $1 = lua_isboolean(L,$input);
-}
-
-// special check for a char (string of length 1)
-%typecheck(SWIG_TYPECHECK_CHAR,fragment="SWIG_lua_isnilstring") char, const char& {
-  $1 = SWIG_lua_isnilstring(L,$input) && (lua_rawlen(L,$input)==1);
-}
-
-%typecheck(SWIG_TYPECHECK_STRING,fragment="SWIG_lua_isnilstring") char *, char[] {
-  $1 = SWIG_lua_isnilstring(L,$input);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE [] {
-  void *ptr;
-  if (SWIG_isptrtype(L,$input)==0 || SWIG_ConvertPtr(L,$input, (void **) &ptr, $1_descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE & {
-  void *ptr;
-  if (lua_isuserdata(L,$input)==0 || SWIG_ConvertPtr(L,$input, (void **) &ptr, $1_descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE && {
-  void *ptr;
-  if (lua_isuserdata(L,$input)==0 || SWIG_ConvertPtr(L,$input, (void **) &ptr, $1_descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE {
-  void *ptr;
-  if (lua_isuserdata(L,$input)==0 || SWIG_ConvertPtr(L,$input, (void **) &ptr, $&1_descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void * {
-  void *ptr;
-  if (SWIG_isptrtype(L,$input)==0 || SWIG_ConvertPtr(L,$input, (void **) &ptr, 0, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-// Also needed for object pointers by const ref
-// eg const A* ref_pointer(A* const& a);
-// found in mixed_types.i
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *const&
-{
-  void *ptr;
-  if (lua_isuserdata(L,$input)==0 || SWIG_ConvertPtr(L,$input, (void **) &ptr, $*descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- *                          Others
- * ----------------------------------------------------------------------------- */
-
-// Array reference typemaps
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-// size_t (which is just a unsigned long)
-%apply unsigned long { size_t };
-%apply const unsigned long & { const size_t & };
-
-
-/* -----------------------------------------------------------------------------
- *                          Specials
- * ----------------------------------------------------------------------------- */
-// swig::LANGUAGE_OBJ was added to allow containers of native objects
-// however its rather difficult to do this in lua, as you cannot hold pointers
-// to native objects (they are held in the interpreter)
-// therefore for now: just ignoring this feature
-#ifdef __cplusplus
-%ignore swig::LANGUAGE_OBJ;
-
-//%inline %{
-%{
-namespace swig {
-typedef struct{} LANGUAGE_OBJ;
-}
-%}
-
-#endif // __cplusplus
diff --git a/dependencies2013/win32/swig/Lib/lua/std_common.i b/dependencies2013/win32/swig/Lib/lua/std_common.i
deleted file mode 100644
index cee11e8c..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_common.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <std_except.i>
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
diff --git a/dependencies2013/win32/swig/Lib/lua/std_deque.i b/dependencies2013/win32/swig/Lib/lua/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/lua/std_except.i b/dependencies2013/win32/swig/Lib/lua/std_except.i
deleted file mode 100644
index 34ab6a1a..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_except.i
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -----------------------------------------------------------------------------
- * Typemaps used by the STL wrappers that throw exceptions.
- * These typemaps are used when methods are declared with an STL exception
- * specification, such as:
- *   size_t at() const throw (std::out_of_range);
- *
- * std_except.i
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-%include <exception.i>
-
-namespace std 
-{
-  %ignore exception; // not sure if I should ignore this...
-  class exception 
-  {
-  public:
-    exception() throw() { }
-    virtual ~exception() throw();
-    virtual const char* what() const throw();
-  }; 
-}
-
-// normally objects which are thrown are returned to the interpreter as errors
-// (which potentially may have problems if they are not copied)
-// therefore all classes based upon std::exception are converted to their strings & returned as errors
-%typemap(throws) std::bad_cast          "SWIG_exception(SWIG_TypeError, $1.what());"
-%typemap(throws) std::bad_exception     "SWIG_exception(SWIG_RuntimeError, $1.what());"
-%typemap(throws) std::domain_error      "SWIG_exception(SWIG_ValueError, $1.what());"
-%typemap(throws) std::exception         "SWIG_exception(SWIG_SystemError, $1.what());"
-%typemap(throws) std::invalid_argument  "SWIG_exception(SWIG_ValueError, $1.what());"
-%typemap(throws) std::length_error      "SWIG_exception(SWIG_IndexError, $1.what());"
-%typemap(throws) std::logic_error       "SWIG_exception(SWIG_RuntimeError, $1.what());"
-%typemap(throws) std::out_of_range      "SWIG_exception(SWIG_IndexError, $1.what());"
-%typemap(throws) std::overflow_error    "SWIG_exception(SWIG_OverflowError, $1.what());"
-%typemap(throws) std::range_error       "SWIG_exception(SWIG_IndexError, $1.what());"
-%typemap(throws) std::runtime_error     "SWIG_exception(SWIG_RuntimeError, $1.what());"
-%typemap(throws) std::underflow_error   "SWIG_exception(SWIG_RuntimeError, $1.what());"
diff --git a/dependencies2013/win32/swig/Lib/lua/std_map.i b/dependencies2013/win32/swig/Lib/lua/std_map.i
deleted file mode 100644
index 84b0c74f..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_map.i
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-}
diff --git a/dependencies2013/win32/swig/Lib/lua/std_pair.i b/dependencies2013/win32/swig/Lib/lua/std_pair.i
deleted file mode 100644
index 06728533..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_pair.i
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * std::pair typemaps for LUA
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <utility>
-%}
-/*
-A really cut down version of the pair class.
-
-this is not useful on its own - it needs a %template definition with it
-
-eg.
-namespace std {
-    %template(IntPair) pair<int, int>;
-    %template(make_IntPair) make_pair<int, int>;
-}
-
-
-*/
-
-
-
-namespace std {
-  template <class T, class U > struct pair {
-    typedef T first_type;
-    typedef U second_type;
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    T first;
-    U second;
-  };
-
-  template <class T, class U >
-  pair<T,U> make_pair(const T&,const U&);
-
-}
diff --git a/dependencies2013/win32/swig/Lib/lua/std_string.i b/dependencies2013/win32/swig/Lib/lua/std_string.i
deleted file mode 100644
index e9f326b5..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_string.i
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * std::string typemaps for LUA
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-/*
-Only std::string and const std::string& are typemapped
-they are converted to the Lua strings automatically
-
-std::string& and std::string* are not
-they must be explicitly managed (see below)
-
-eg.
-
-std::string test_value(std::string x) {
-   return x;
-}
-
-can be used as
-
-s="hello world"
-s2=test_value(s)
-assert(s==s2)
-*/
-
-namespace std {
-
-%naturalvar string;
-
-/*
-Bug report #1526022:
-Lua strings and std::string can contain embedded zero bytes
-Therefore a standard out typemap should not be:
-  lua_pushstring(L,$1.c_str());
-but
-  lua_pushlstring(L,$1.data(),$1.size());
-
-Similarly for getting the string
-  $1 = (char*)lua_tostring(L, $input);
-becomes
-  $1.assign(lua_tostring(L,$input),lua_rawlen(L,$input));
-  
-Not using: lua_tolstring() as this is only found in Lua 5.1 & not 5.0.2
-*/
-
-%typemap(in,checkfn="lua_isstring") string
-%{$1.assign(lua_tostring(L,$input),lua_rawlen(L,$input));%}
-
-%typemap(out) string
-%{ lua_pushlstring(L,$1.data(),$1.size()); SWIG_arg++;%}
-
-%typemap(in,checkfn="lua_isstring") const string& ($*1_ltype temp)
-%{temp.assign(lua_tostring(L,$input),lua_rawlen(L,$input)); $1=&temp;%}
-
-%typemap(out) const string&
-%{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_arg++;%}
-
-// for throwing of any kind of string, string ref's and string pointers
-// we convert all to lua strings
-%typemap(throws) string, string&, const string&
-%{ lua_pushlstring(L,$1.data(),$1.size()); SWIG_fail;%}
-
-%typemap(throws) string*, const string*
-%{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_fail;%}
-
-%typecheck(SWIG_TYPECHECK_STRING) string, const string& {
-  $1 = lua_isstring(L,$input);
-}
-
-/*
-std::string& can be wrapped, but you must inform SWIG if it is in or out
-
-eg:
-void fn(std::string& str);
-Is this an in/out/inout value?
-
-Therefore you need the usual
-%apply (std::string& INOUT) {std::string& str};
-or
-%apply std::string& INOUT {std::string& str};
-typemaps to tell SWIG what to do.
-*/
-
-%typemap(in) string &INPUT=const string &;
-%typemap(in, numinputs=0) string &OUTPUT ($*1_ltype temp)
-%{ $1 = &temp; %}
-%typemap(argout) string &OUTPUT
-%{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_arg++;%}
-%typemap(in) string &INOUT =const string &;
-%typemap(argout) string &INOUT = string &OUTPUT;
-
-/*
-A really cut down version of the string class
-
-This provides basic mapping of lua strings <-> std::string
-and little else
-(the std::string has a lot of unneeded functions anyway)
-
-note: no fn's taking the const string&
-as this is overloaded by the const char* version
-*/
-
-  class string {
-    public:
-      string();
-      string(const char*);
-      //string(const string&);
-      unsigned int size() const;
-      unsigned int length() const;
-      bool empty() const;
-      // no support for operator[]
-      const char* c_str()const;
-      const char* data()const;
-      // assign does not return a copy of this object
-      // (no point in a scripting language)
-      void assign(const char*);
-      //void assign(const string&);
-      // no support for all the other features
-      // it's probably better to do it in lua
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/lua/std_vector.i b/dependencies2013/win32/swig/Lib/lua/std_vector.i
deleted file mode 100644
index a4ea978d..00000000
--- a/dependencies2013/win32/swig/Lib/lua/std_vector.i
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * std::vector typemaps for LUA
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <vector>
-%}
-%include <std_except.i> // the general exceptions
-/*
-A really cut down version of the vector class.
-
-Note: this does not match the true std::vector class
-but instead is an approximate, so that SWIG knows how to wrapper it.
-(Eg, all access is by value, not ref, as SWIG turns refs to pointers)
-
-And no support for iterators & insert/erase
-
-It would be useful to have a vector<->Lua table conversion routine
-
-*/
-namespace std {
-
-	template<class T>
-    class vector {
-      public:
-        vector();
-        vector(unsigned int);
-        vector(const vector&);
-        vector(unsigned int,T);
-        unsigned int size() const;
-        unsigned int max_size() const;
-        bool empty() const;
-        void clear();
-        void push_back(T val);
-        void pop_back();
-        T front()const; // only read front & back
-        T back()const;  // not write to them
-        // operator [] given later:
-
-		%extend // this is a extra bit of SWIG code
-		{
-			// [] is replaced by __getitem__ & __setitem__
-			// simply throws a string, which causes a lua error
-			T __getitem__(unsigned int idx) throw (std::out_of_range)
-			{
-				if (idx>=self->size())
-					throw std::out_of_range("in vector::__getitem__()");
-				return (*self)[idx];
-			}
-			void __setitem__(unsigned int idx,T val) throw (std::out_of_range)
-			{
-				if (idx>=self->size())
-					throw std::out_of_range("in vector::__setitem__()");
-				(*self)[idx]=val;
-			}
-		};
-    };
-
-}
-
-/*
-Vector<->LuaTable fns
-These look a bit like the array<->LuaTable fns
-but are templated, not %defined
-(you must have template support for STL)
-
-*/
-/*
-%{
-// reads a table into a vector of numbers
-// lua numbers will be cast into the type required (rounding may occur)
-// return 0 if non numbers found in the table
-// returns new'ed ptr if ok
-template<class T>
-std::vector<T>* SWIG_read_number_vector(lua_State* L,int index)
-{
-	int i=0;
-	std::vector<T>* vec=new std::vector<T>();
-	while(1)
-	{
-		lua_rawgeti(L,index,i+1);
-		if (!lua_isnil(L,-1))
-		{
-			lua_pop(L,1);
-			break;	// finished
-		}
-		if (!lua_isnumber(L,-1))
-		{
-			lua_pop(L,1);
-			delete vec;
-			return 0;	// error
-		}
-		vec->push_back((T)lua_tonumber(L,-1));
-		lua_pop(L,1);
-		++i;
-	}
-	return vec;	// ok
-}
-// writes a vector of numbers out as a lua table
-template<class T>
-int SWIG_write_number_vector(lua_State* L,std::vector<T> *vec)
-{
-	lua_newtable(L);
-	for(int i=0;i<vec->size();++i)
-	{
-		lua_pushnumber(L,(double)((*vec)[i]));
-		lua_rawseti(L,-2,i+1);// -1 is the number, -2 is the table
-	}
-}
-%}
-
-// then the typemaps
-
-%define SWIG_TYPEMAP_NUM_VECTOR(T)
-
-// in
-%typemap(in) std::vector<T> *INPUT
-%{	$1 = SWIG_read_number_vector<T>(L,$input);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) std::vector<T> *INPUT
-%{	delete $1;%}
-
-// out
-%typemap(argout) std::vector<T> *OUTPUT
-%{	SWIG_write_number_vector(L,$1); SWIG_arg++; %}
-
-%enddef
-*/
diff --git a/dependencies2013/win32/swig/Lib/lua/stl.i b/dependencies2013/win32/swig/Lib/lua/stl.i
deleted file mode 100644
index 04f86014..00000000
--- a/dependencies2013/win32/swig/Lib/lua/stl.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/lua/typemaps.i b/dependencies2013/win32/swig/Lib/lua/typemaps.i
deleted file mode 100644
index c662cd31..00000000
--- a/dependencies2013/win32/swig/Lib/lua/typemaps.i
+++ /dev/null
@@ -1,564 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.swg
- *
- * SWIG Library file containing the main typemap code to support Lua modules.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- *                          Basic inout typemaps
- * ----------------------------------------------------------------------------- */
-/*
-These provide the basic ability for passing in & out of standard numeric data types
-(int,long,float,double, etc)
-
-The basic code looks like this:
-
-%typemap(in,checkfn="lua_isnumber") int *INPUT(int temp), int &INPUT(int temp)
-%{ temp = (int)lua_tonumber(L,$input);
-   $1 = &temp; %}
-
-%typemap(in, numinputs=0) int *OUTPUT (int temp)
-%{ $1 = &temp; %}
-
-%typemap(argout) int *OUTPUT
-%{  lua_pushnumber(L, (double) *$1); SWIG_arg++;%}
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(argout) int *INOUT = int *OUTPUT;
-
-However the code below is a mixture of #defines & such, so nowhere as easy to read
-
-To make you code work correctly its not just a matter of %including this file
-You also have to give SWIG the hints on which to use where
-
-eg
-extern int add_pointer(int* a1,int* a2); // a1 & a2 are pointer values to be added
-extern void swap(int* s1, int* s2);	// does the swap
-
-You will need to either change the argument names
-extern int add_pointer(int* INPUT,int* INPUT);
-
-or provide a %apply statement
-
-%apply int* INOUT{ int *s1, int *s2 };
-	// if SWIG sees int* s1, int* s2, assume they are inout params
-*/
-
-
-%define SWIG_NUMBER_TYPEMAP(TYPE)
-%typemap(in,checkfn="lua_isnumber")	TYPE *INPUT($*ltype temp), TYPE &INPUT($*ltype temp)
-%{ temp = ($*ltype)lua_tonumber(L,$input);
-   $1 = &temp; %}
-%typemap(in, numinputs=0) TYPE *OUTPUT ($*ltype temp)
-%{ $1 = &temp; %}
-%typemap(argout) TYPE *OUTPUT
-%{  lua_pushnumber(L, (lua_Number) *$1); SWIG_arg++;%}
-%typemap(in) TYPE *INOUT = TYPE *INPUT;
-%typemap(argout) TYPE *INOUT = TYPE *OUTPUT;
-%typemap(in) TYPE &OUTPUT = TYPE *OUTPUT;
-%typemap(argout) TYPE &OUTPUT = TYPE *OUTPUT;
-%typemap(in) TYPE &INOUT = TYPE *INPUT;
-%typemap(argout) TYPE &INOUT = TYPE *OUTPUT;
-// const version (the $*ltype is the basic number without ptr or const's)
-%typemap(in,checkfn="lua_isnumber")	const TYPE *INPUT($*ltype temp)
-%{ temp = ($*ltype)lua_tonumber(L,$input);
-   $1 = &temp; %}
-%enddef
-
-// now the code
-SWIG_NUMBER_TYPEMAP(unsigned char); SWIG_NUMBER_TYPEMAP(signed char);
-
-SWIG_NUMBER_TYPEMAP(short); SWIG_NUMBER_TYPEMAP(unsigned short); SWIG_NUMBER_TYPEMAP(signed short);
-SWIG_NUMBER_TYPEMAP(int); SWIG_NUMBER_TYPEMAP(unsigned int); SWIG_NUMBER_TYPEMAP(signed int);
-SWIG_NUMBER_TYPEMAP(long); SWIG_NUMBER_TYPEMAP(unsigned long); SWIG_NUMBER_TYPEMAP(signed long);
-SWIG_NUMBER_TYPEMAP(float);
-SWIG_NUMBER_TYPEMAP(double);
-SWIG_NUMBER_TYPEMAP(enum SWIGTYPE);
-// also for long longs's
-SWIG_NUMBER_TYPEMAP(long long); SWIG_NUMBER_TYPEMAP(unsigned long long); SWIG_NUMBER_TYPEMAP(signed long long);
-
-// note we dont do char, as a char* is probably a string not a ptr to a single char
-
-// similar for booleans
-%typemap(in,checkfn="lua_isboolean") bool *INPUT(bool temp), bool &INPUT(bool temp)
-%{ temp = (lua_toboolean(L,$input)!=0);
-   $1 = &temp; %}
-
-%typemap(in, numinputs=0) bool *OUTPUT (bool temp),bool &OUTPUT (bool temp)
-%{ $1 = &temp; %}
-
-%typemap(argout) bool *OUTPUT,bool &OUTPUT
-%{  lua_pushboolean(L, (int)((*$1)!=0)); SWIG_arg++;%}
-
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(in) bool &INOUT = bool &INPUT;
-%typemap(argout) bool &INOUT = bool &OUTPUT;
-
-/* -----------------------------------------------------------------------------
- *                          Basic Array typemaps
- * ----------------------------------------------------------------------------- */
-/*
-I have no idea why this kind of code does not exist in SWIG as standard,
-but here is it.
-This code will convert to/from 1D numeric arrays.
-In order to reduce code bloat, there are a few macros
-and quite a few functions defined
-(unfortunately this makes it a lot less clear)
-
-assuming we have functions
-void process_array(int arr[3]);	// nice fixed size array
-void process_var_array(float arr[],int len);	// variable sized array
-void process_var_array_inout(double* arr,int len);	// variable sized array
-			// data passed in & out
-void process_enum_inout_array_var(enum Days *arrinout, int len);	// using enums
-void return_array_5(int arrout[5]);	// out array only
-
-in order to wrap them correctly requires a typemap
-
-// inform SWIG of the correct typemap
-// For fixed length, you must specify it as <type> INPUT[ANY]
-%apply (int INPUT[ANY]) {(int arr[3])};
-// variable length arrays are just the same
-%apply (float INPUT[],int) {(float arr[],int len)};
-// it is also ok, to map the TYPE* instead of a TYPE[]
-%apply (double *INOUT,int) {(double arr*,int len)};
-// for the enum's you must use enum SWIGTYPE
-%apply (enum SWIGTYPE *INOUT,int) {(enum Days *arrinout, int len)};
-// fixed length out if also fine
-%apply (int OUTPUT[ANY]) {(int arrout[5])};
-
-Generally, you could use %typemap(...)=...
-but the %apply is neater & easier
-
-a few things of note:
-* all Lua tables are indexed from 1, all C/C++ arrays are indexed from 0
-	therefore t={6,5,3} -- t[1]==6, t[2]==5, t[3]==3
-	when passed to process_array(int arr[3]) becomes
-	arr[0]==6, arr[1]==5, arr[2]==3
-* for OUTPUT arrays, no array need be passed in, the fn will return a Lua table
-	so for the above mentioned return_array_5() would look like
-	arr=return_array_5() -- no parameters passed in
-* for INOUT arrays, a table must be passed in, and a new table will be returned
-	(this is consistent with the way that numbers are processed)
-	if you want just use
-	arr={...}
-	arr=process_var_array_inout(arr)	-- arr is replaced by the new version
-
-The following are not yet supported:
-* variable length output only array (inout works ok)
-* multidimensional arrays
-* arrays of objects/structs
-* arrays of pointers
-
-*/
-
-/*
-The internals of the array management stuff
-helper fns/macros
-SWIG_ALLOC_ARRAY(TYPE,LEN)	// returns a typed array TYPE[LEN]
-SWIG_FREE_ARRAY(PTR)		// delete the ptr (if not zero)
-
-// counts the specified table & gets the size
-// integer version
-int SWIG_itable_size(lua_State* L, int index);
-// other version
-int SWIG_table_size(lua_State* L, int index);
-
-SWIG_DECLARE_TYPEMAP_ARR_FN(NAME,TYPE)
-// this fn declares up 4 functions for helping to read/write tables
-// these can then be called by the macros ...
-// all assume the table is an integer indexes from 1
-// but the C array is a indexed from 0
-	// created a fixed size array, reads the specified table
-	// and then fills the array with numbers
-	// returns ptr to the array if ok, or 0 for error
-	// (also pushes a error message to the stack)
-TYPE* SWIG_get_NAME_num_array_fixed(lua_State* L, int index, int size);
-	// as per SWIG_get_NAME_num_array_fixed()
-	// but reads the entire table & creates an array of the correct size
-	// (if the table is empty, it returns an error rather than a zero length array)
-TYPE* SWIG_get_NAME_num_array_var(lua_State* L, int index, int* size);
-	// writes a table to Lua with all the specified numbers
-void SWIG_write_NAME_num_array(lua_State* L,TYPE *array,int size);
-	// read the specified table, and fills the array with numbers
-	// returns 1 of ok (only fails if it doesnt find numbers)
-	// helper fn (called by SWIG_get_NAME_num_array_*() fns)
-int SWIG_read_NAME_num_array(lua_State* L,int index,TYPE *array,int size);
-
-*/
-
-/* Reported that you don't need to check for NULL for delete & free
-There probably is some compiler that its not true for, so the code is left here just in case.
-#ifdef __cplusplus	
-#define SWIG_ALLOC_ARRAY(TYPE,LEN) 	new TYPE[LEN]
-#define SWIG_FREE_ARRAY(PTR)		if(PTR){delete[] PTR;}
-#else
-#define SWIG_ALLOC_ARRAY(TYPE,LEN) 	(TYPE *)malloc(LEN*sizeof(TYPE))
-#define SWIG_FREE_ARRAY(PTR)		if(PTR){free(PTR);}
-#endif
-*/
-%{
-#ifdef __cplusplus	/* generic alloc/dealloc fns*/
-#define SWIG_ALLOC_ARRAY(TYPE,LEN) 	new TYPE[LEN]
-#define SWIG_FREE_ARRAY(PTR)		delete[] PTR
-#else
-#define SWIG_ALLOC_ARRAY(TYPE,LEN) 	(TYPE *)malloc(LEN*sizeof(TYPE))
-#define SWIG_FREE_ARRAY(PTR)		free(PTR)
-#endif
-/* counting the size of arrays:*/
-SWIGINTERN int SWIG_itable_size(lua_State* L, int index)
-{
-	int n=0;
-	while(1){
-		lua_rawgeti(L,index,n+1);
-		if (lua_isnil(L,-1))break;
-		++n;
-		lua_pop(L,1);
-	}
-	lua_pop(L,1);
-	return n;
-}
-
-SWIGINTERN int SWIG_table_size(lua_State* L, int index)
-{
-	int n=0;
-	lua_pushnil(L);  /* first key*/
-	while (lua_next(L, index) != 0) {
-		++n;
-		lua_pop(L, 1);  /* removes `value'; keeps `key' for next iteration*/
-	}
-	return n;
-}
-
-/* super macro to declare array typemap helper fns */
-#define SWIG_DECLARE_TYPEMAP_ARR_FN(NAME,TYPE)\
-	SWIGINTERN int SWIG_read_##NAME##_num_array(lua_State* L,int index,TYPE *array,int size){\
-		int i;\
-		for (i = 0; i < size; i++) {\
-			lua_rawgeti(L,index,i+1);\
-			if (lua_isnumber(L,-1)){\
-				array[i] = (TYPE)lua_tonumber(L,-1);\
-			} else {\
-				lua_pop(L,1);\
-				return 0;\
-			}\
-			lua_pop(L,1);\
-		}\
-		return 1;\
-	}\
-	SWIGINTERN TYPE* SWIG_get_##NAME##_num_array_fixed(lua_State* L, int index, int size){\
-		TYPE *array;\
-		if (!lua_istable(L,index) || SWIG_itable_size(L,index) != size) {\
-			SWIG_Lua_pushferrstring(L,"expected a table of size %d",size);\
-			return 0;\
-		}\
-		array=SWIG_ALLOC_ARRAY(TYPE,size);\
-		if (!SWIG_read_##NAME##_num_array(L,index,array,size)){\
-			SWIG_Lua_pusherrstring(L,"table must contain numbers");\
-			SWIG_FREE_ARRAY(array);\
-			return 0;\
-		}\
-		return array;\
-	}\
-	SWIGINTERN TYPE* SWIG_get_##NAME##_num_array_var(lua_State* L, int index, int* size)\
-	{\
-		TYPE *array;\
-		if (!lua_istable(L,index)) {\
-			SWIG_Lua_pusherrstring(L,"expected a table");\
-			return 0;\
-		}\
-		*size=SWIG_itable_size(L,index);\
-		if (*size<1){\
-			SWIG_Lua_pusherrstring(L,"table appears to be empty");\
-			return 0;\
-		}\
-		array=SWIG_ALLOC_ARRAY(TYPE,*size);\
-		if (!SWIG_read_##NAME##_num_array(L,index,array,*size)){\
-			SWIG_Lua_pusherrstring(L,"table must contain numbers");\
-			SWIG_FREE_ARRAY(array);\
-			return 0;\
-		}\
-		return array;\
-	}\
-	SWIGINTERN void SWIG_write_##NAME##_num_array(lua_State* L,TYPE *array,int size){\
-		int i;\
-		lua_newtable(L);\
-		for (i = 0; i < size; i++){\
-			lua_pushnumber(L,(lua_Number)array[i]);\
-			lua_rawseti(L,-2,i+1);/* -1 is the number, -2 is the table*/ \
-		}\
-	}
-%}
-
-/*
-This is one giant macro to define the typemaps & the helpers
-for array handling
-*/
-%define SWIG_TYPEMAP_NUM_ARR(NAME,TYPE)
-%{SWIG_DECLARE_TYPEMAP_ARR_FN(NAME,TYPE)%}
-
-// fixed size array's
-%typemap(in) TYPE INPUT[ANY]
-%{	$1 = SWIG_get_##NAME##_num_array_fixed(L,$input,$1_dim0);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) TYPE INPUT[ANY]
-%{	SWIG_FREE_ARRAY($1);%}
-
-// variable size array's
-%typemap(in) (TYPE *INPUT,int)
-%{	$1 = SWIG_get_##NAME##_num_array_var(L,$input,&$2);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) (TYPE *INPUT,int)
-%{	SWIG_FREE_ARRAY($1);%}
-
-// out fixed arrays
-%typemap(in,numinputs=0) TYPE OUTPUT[ANY]
-%{  $1 = SWIG_ALLOC_ARRAY(TYPE,$1_dim0); %}
-
-%typemap(argout) TYPE OUTPUT[ANY]
-%{	SWIG_write_##NAME##_num_array(L,$1,$1_dim0); SWIG_arg++; %}
-
-%typemap(freearg) TYPE OUTPUT[ANY]
-%{	SWIG_FREE_ARRAY($1); %}
-
-// inout fixed arrays
-%typemap(in) TYPE INOUT[ANY]=TYPE INPUT[ANY];
-%typemap(argout) TYPE INOUT[ANY]=TYPE OUTPUT[ANY];
-%typemap(freearg) TYPE INOUT[ANY]=TYPE INPUT[ANY];
-// inout variable arrays
-%typemap(in) (TYPE *INOUT,int)=(TYPE *INPUT,int);
-%typemap(argout) (TYPE *INOUT,int)
-%{	SWIG_write_##NAME##_num_array(L,$1,$2); SWIG_arg++; %}
-%typemap(freearg) (TYPE *INOUT,int)=(TYPE *INPUT,int);
-
-// TODO out variable arrays (is there a standard form for such things?)
-
-// referencing so that (int *INPUT,int) and (int INPUT[],int) are the same
-%typemap(in) (TYPE INPUT[],int)=(TYPE *INPUT,int);
-%typemap(freearg) (TYPE INPUT[],int)=(TYPE *INPUT,int);
-
-%enddef
-
-// the following line of code
-// declares the C helper fns for the array typemaps
-// as well as defining typemaps for
-// fixed len arrays in & out, & variable length arrays in
-
-SWIG_TYPEMAP_NUM_ARR(schar,signed char);
-SWIG_TYPEMAP_NUM_ARR(uchar,unsigned char);
-SWIG_TYPEMAP_NUM_ARR(int,int);
-SWIG_TYPEMAP_NUM_ARR(uint,unsigned int);
-SWIG_TYPEMAP_NUM_ARR(short,short);
-SWIG_TYPEMAP_NUM_ARR(ushort,unsigned short);
-SWIG_TYPEMAP_NUM_ARR(long,long);
-SWIG_TYPEMAP_NUM_ARR(ulong,unsigned long);
-SWIG_TYPEMAP_NUM_ARR(float,float);
-SWIG_TYPEMAP_NUM_ARR(double,double);
-
-// again enums are a problem so they need their own type
-// we use the int conversion routine & recast it
-%typemap(in) enum SWIGTYPE INPUT[ANY]
-%{	$1 = ($ltype)SWIG_get_int_num_array_fixed(L,$input,$1_dim0);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) enum SWIGTYPE INPUT[ANY]
-%{	SWIG_FREE_ARRAY($1);%}
-
-// variable size arrays
-%typemap(in) (enum SWIGTYPE *INPUT,int)
-%{	$1 = ($ltype)SWIG_get_int_num_array_var(L,$input,&$2);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) (enum SWIGTYPE *INPUT,int)
-%{	SWIG_FREE_ARRAY($1);%}
-
-// out fixed arrays
-%typemap(in,numinputs=0) enum SWIGTYPE OUTPUT[ANY]
-%{  $1 = SWIG_ALLOC_ARRAY(enum SWIGTYPE,$1_dim0); %}
-
-%typemap(argout) enum SWIGTYPE OUTPUT[ANY]
-%{	SWIG_write_int_num_array(L,(int*)$1,$1_dim0); SWIG_arg++; %}
-
-%typemap(freearg) enum SWIGTYPE OUTPUT[ANY]
-%{	SWIG_FREE_ARRAY($1); %}
-
-// inout fixed arrays
-%typemap(in) enum SWIGTYPE INOUT[ANY]=enum SWIGTYPE INPUT[ANY];
-%typemap(argout) enum SWIGTYPE INOUT[ANY]=enum SWIGTYPE OUTPUT[ANY];
-%typemap(freearg) enum SWIGTYPE INOUT[ANY]=enum SWIGTYPE INPUT[ANY];
-// inout variable arrays
-%typemap(in) (enum SWIGTYPE *INOUT,int)=(enum SWIGTYPE *INPUT,int);
-%typemap(argout) (enum SWIGTYPE *INOUT,int)
-%{	SWIG_write_int_num_array(L,(int*)$1,$2); SWIG_arg++; %}
-%typemap(freearg) (enum SWIGTYPE *INOUT,int)=(enum SWIGTYPE *INPUT,int);
-
-
-/* Surprisingly pointer arrays are easier:
-this is because all ptr arrays become void**
-so only a few fns are needed & a few casts
-
-The function defined are
-	// created a fixed size array, reads the specified table
-	// and then fills the array with pointers (checking the type)
-	// returns ptr to the array if ok, or 0 for error
-	// (also pushes a error message to the stack)
-void** SWIG_get_ptr_array_fixed(lua_State* L, int index, int size,swig_type_info *type);
-	// as per SWIG_get_ptr_array_fixed()
-	// but reads the entire table & creates an array of the correct size
-	// (if the table is empty, it returns an error rather than a zero length array)
-void** SWIG_get_ptr_array_var(lua_State* L, int index, int* size,swig_type_info *type);
-	// writes a table to Lua with all the specified pointers
-	// all pointers have the ownership value 'own' (normally 0)
-void SWIG_write_ptr_array(lua_State* L,void **array,int size,int own);
-	// read the specified table, and fills the array with ptrs
-	// returns 1 of ok (only fails if it doesn't find correct type of ptrs)
-	// helper fn (called by SWIG_get_ptr_array_*() fns)
-int SWIG_read_ptr_array(lua_State* L,int index,void **array,int size,swig_type_info *type);
-
-The key thing to remember is that it is assumed that there is no
-modification of pointers ownership in the arrays
-
-eg A fn:
-void pointers_in(TYPE* arr[],int len);
-will make copies of the pointer into a temp array and then pass it into the fn
-Lua does not remember that this fn held the pointers, so it is not safe to keep
-these pointers until later
-
-eg A fn:
-void pointers_out(TYPE* arr[3]);
-will return a table containing three pointers
-however these pointers are NOT owned by Lua, merely borrowed
-so if the C/C++ frees then Lua is not aware
-
-*/
-
-%{
-SWIGINTERN int SWIG_read_ptr_array(lua_State* L,int index,void **array,int size,swig_type_info *type){
-	int i;
-	for (i = 0; i < size; i++) {
-		lua_rawgeti(L,index,i+1);
-		if (!lua_isuserdata(L,-1) || SWIG_ConvertPtr(L,-1,&array[i],type,0)==-1){
-			lua_pop(L,1);
-			return 0;
-		}
-		lua_pop(L,1);
-	}
-	return 1;
-}
-SWIGINTERN void** SWIG_get_ptr_array_fixed(lua_State* L, int index, int size,swig_type_info *type){
-	void **array;
-	if (!lua_istable(L,index) || SWIG_itable_size(L,index) != size) {
-		SWIG_Lua_pushferrstring(L,"expected a table of size %d",size);
-		return 0;
-	}
-	array=SWIG_ALLOC_ARRAY(void*,size);
-	if (!SWIG_read_ptr_array(L,index,array,size,type)){
-		SWIG_Lua_pushferrstring(L,"table must contain pointers of type %s",type->name);
-		SWIG_FREE_ARRAY(array);
-		return 0;
-	}
-	return array;
-}
-SWIGINTERN void** SWIG_get_ptr_array_var(lua_State* L, int index, int* size,swig_type_info *type){
-	void **array;
-	if (!lua_istable(L,index)) {
-		SWIG_Lua_pusherrstring(L,"expected a table");
-		return 0;
-	}
-	*size=SWIG_itable_size(L,index);
-	if (*size<1){
-		SWIG_Lua_pusherrstring(L,"table appears to be empty");
-		return 0;
-	}
-	array=SWIG_ALLOC_ARRAY(void*,*size);
-	if (!SWIG_read_ptr_array(L,index,array,*size,type)){
-		SWIG_Lua_pushferrstring(L,"table must contain pointers of type %s",type->name);
-		SWIG_FREE_ARRAY(array);
-		return 0;
-	}
-	return array;
-}
-SWIGINTERN void SWIG_write_ptr_array(lua_State* L,void **array,int size,swig_type_info *type,int own){
-	int i;
-	lua_newtable(L);
-	for (i = 0; i < size; i++){
-		SWIG_NewPointerObj(L,array[i],type,own);
-		lua_rawseti(L,-2,i+1);/* -1 is the number, -2 is the table*/
-	}
-}
-%}
-
-// fixed size array's
-%typemap(in) SWIGTYPE* INPUT[ANY]
-%{	$1 = ($ltype)SWIG_get_ptr_array_fixed(L,$input,$1_dim0,$*1_descriptor);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) SWIGTYPE* INPUT[ANY]
-%{	SWIG_FREE_ARRAY($1);%}
-
-// variable size array's
-%typemap(in) (SWIGTYPE **INPUT,int)
-%{	$1 = ($ltype)SWIG_get_ptr_array_var(L,$input,&$2,$*1_descriptor);
-	if (!$1) SWIG_fail;%}
-
-%typemap(freearg) (SWIGTYPE **INPUT,int)
-%{	SWIG_FREE_ARRAY($1);%}
-
-// out fixed arrays
-%typemap(in,numinputs=0) SWIGTYPE* OUTPUT[ANY]
-%{  $1 = SWIG_ALLOC_ARRAY($*1_type,$1_dim0); %}
-
-%typemap(argout) SWIGTYPE* OUTPUT[ANY]
-%{	SWIG_write_ptr_array(L,(void**)$1,$1_dim0,$*1_descriptor,0); SWIG_arg++; %}
-
-%typemap(freearg) SWIGTYPE* OUTPUT[ANY]
-%{	SWIG_FREE_ARRAY($1); %}
-
-// inout fixed arrays
-%typemap(in) SWIGTYPE* INOUT[ANY]=SWIGTYPE* INPUT[ANY];
-%typemap(argout) SWIGTYPE* INOUT[ANY]=SWIGTYPE* OUTPUT[ANY];
-%typemap(freearg) SWIGTYPE* INOUT[ANY]=SWIGTYPE* INPUT[ANY];
-// inout variable arrays
-%typemap(in) (SWIGTYPE** INOUT,int)=(SWIGTYPE** INPUT,int);
-%typemap(argout) (SWIGTYPE** INOUT,int)
-%{	SWIG_write_ptr_array(L,(void**)$1,$2,$*1_descriptor,0); SWIG_arg++; %}
-%typemap(freearg) (SWIGTYPE**INOUT,int)=(SWIGTYPE**INPUT,int);
-
-/* -----------------------------------------------------------------------------
- *                          Pointer-Pointer typemaps
- * ----------------------------------------------------------------------------- */
-/*
-This code is to deal with the issue for pointer-pointer's
-In particular for factory methods.
-
-for example take the following code segment:
-
-struct iMath;    // some structure
-int Create_Math(iMath** pptr); // its factory (assume it mallocs)
-
-to use it you might have the following C code:
-
-iMath* ptr;
-int ok;
-ok=Create_Math(&ptr);
-// do things with ptr
-//...
-free(ptr);
-
-With the following SWIG code
-%apply SWIGTYPE** OUTPUT{iMath **pptr };
-
-You can get natural wrapping in Lua as follows:
-ok,ptr=Create_Math() -- ptr is a iMath* which is returned with the int
-ptr=nil -- the iMath* will be GC'ed as normal
-*/
-
-%typemap(in,numinputs=0) SWIGTYPE** OUTPUT ($*ltype temp)
-%{ temp = ($*ltype)0;
-   $1 = &temp; %}
-%typemap(argout) SWIGTYPE** OUTPUT
-%{SWIG_NewPointerObj(L,*$1,$*descriptor,1); SWIG_arg++; %}
-
diff --git a/dependencies2013/win32/swig/Lib/lua/wchar.i b/dependencies2013/win32/swig/Lib/lua/wchar.i
deleted file mode 100644
index 9f3be6fc..00000000
--- a/dependencies2013/win32/swig/Lib/lua/wchar.i
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -----------------------------------------------------------------------------
- * wchar.i
- *
- * Typemaps for the wchar_t type
- * These are mapped to a Lua string and are passed around by value.
- * ----------------------------------------------------------------------------- */
-
-// note: only support for pointer right now, not fixed length strings
-// TODO: determine how long a const wchar_t* is so we can write wstr2str() 
-// & do the output typemap
-
-%{
-#include <stdlib.h>
-	
-wchar_t* str2wstr(const char *str, int len)
-{
-  wchar_t* p;
-  if (str==0 || len<1)  return 0;
-  p=(wchar_t *)malloc((len+1)*sizeof(wchar_t));
-  if (p==0)	return 0;
-  if (mbstowcs(p, str, len)==(size_t)-1)
-  {
-    free(p);
-    return 0;
-  }
-  p[len]=0;
-  return p;
-}
-%}
-
-%typemap(in, checkfn="SWIG_lua_isnilstring", fragment="SWIG_lua_isnilstring") wchar_t *
-%{
-$1 = str2wstr(lua_tostring( L, $input ),lua_rawlen( L, $input ));
-if ($1==0) {SWIG_Lua_pushferrstring(L,"Error in converting to wchar (arg %d)",$input);goto fail;}
-%}
-
-%typemap(freearg) wchar_t *
-%{
-free($1);
-%}
-
-%typemap(typecheck) wchar_t * = char *;
diff --git a/dependencies2013/win32/swig/Lib/math.i b/dependencies2013/win32/swig/Lib/math.i
deleted file mode 100644
index a37c92d1..00000000
--- a/dependencies2013/win32/swig/Lib/math.i
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -----------------------------------------------------------------------------
- * math.i
- *
- * SWIG library file for floating point operations.
- * ----------------------------------------------------------------------------- */
-
-%module math
-%{
-#include <math.h>
-%}
-
-extern double	cos(double x);
-/* Cosine of x */
-
-extern double	sin(double x);
-/* Sine of x */
-
-extern double	tan(double x);
-/* Tangent of x */
-
-extern double	acos(double x);
-/* Inverse cosine in range [-PI/2,PI/2], x in [-1,1]. */
-
-extern double	asin(double x);
-/* Inverse sine in range [0,PI], x in [-1,1]. */
-
-extern double	atan(double x);
-/* Inverse tangent in range [-PI/2,PI/2]. */
-
-extern double	atan2(double y, double x);
-/* Inverse tangent of y/x in range [-PI,PI]. */
-
-extern double	cosh(double x);
-/* Hyperbolic cosine of x */
-
-extern double	sinh(double x);
-/* Hyperbolic sine of x */
-
-extern double	tanh(double x);
-/* Hyperbolic tangent of x */
-
-extern double	exp(double x);
-/* Natural exponential function e^x */
-
-extern double	log(double x);
-/* Natural logarithm ln(x), x > 0 */
-
-extern double	log10(double x);
-/* Base 10 logarithm, x > 0 */
-
-extern double	pow(double x, double y);
-/* Power function x^y. */
-
-extern double	sqrt(double x);
-/* Square root. x >= 0 */
-
-extern double	fabs(double x);
-/* Absolute value of x */
-
-extern double	ceil(double x);
-/* Smallest integer not less than x, as a double */
-
-extern double	floor(double x);
-/* Largest integer not greater than x, as a double */
-
-extern double	fmod(double x, double y);
-/* Floating-point remainder of x/y, with the same sign as x. */
-
-#define M_E		2.7182818284590452354
-#define M_LOG2E		1.4426950408889634074
-#define M_LOG10E	0.43429448190325182765
-#define M_LN2		0.69314718055994530942
-#define M_LN10		2.30258509299404568402
-#define M_PI		3.14159265358979323846
-#define M_PI_2		1.57079632679489661923
-#define M_PI_4		0.78539816339744830962
-#define M_1_PI		0.31830988618379067154
-#define M_2_PI		0.63661977236758134308
-#define M_2_SQRTPI	1.12837916709551257390
-#define M_SQRT2		1.41421356237309504880
-#define M_SQRT1_2	0.70710678118654752440
-
diff --git a/dependencies2013/win32/swig/Lib/modula3/modula3.swg b/dependencies2013/win32/swig/Lib/modula3/modula3.swg
deleted file mode 100644
index 262f8ead..00000000
--- a/dependencies2013/win32/swig/Lib/modula3/modula3.swg
+++ /dev/null
@@ -1,785 +0,0 @@
-/* -----------------------------------------------------------------------------
- * modula3.swg
- *
- * Modula3 typemaps
- * ----------------------------------------------------------------------------- */
-
-%include <modula3head.swg>
-
-/* The ctype, m3rawtype and m3wraptype typemaps work together and so there should be one of each. 
- * The ctype typemap contains the C type used in the signature of C wrappers for C++ functions. 
- * The m3rawtype typemap contains the M3 type used in the raw interface.
- * The m3rawintype typemap contains the M3 type used as function argument.
- * The m3rawrettype typemap contains the M3 type used as return value.
- * The m3wraptype typemap contains the M3 type used in the M3 type wrapper classes and module class. */
-
-/* Primitive types */
-%typemap(ctype) bool,               const bool &               "bool"
-%typemap(ctype) char,               const char &               "char"
-%typemap(ctype) signed char,        const signed char &        "signed char"
-%typemap(ctype) unsigned char,      const unsigned char &      "unsigned short"
-%typemap(ctype) short,              const short &              "short"
-%typemap(ctype) unsigned short,     const unsigned short &     "unsigned short"
-%typemap(ctype) int,                const int &                "int"
-%typemap(ctype) unsigned int,       const unsigned int &       "unsigned int"
-%typemap(ctype) long,               const long &               "long"
-%typemap(ctype) unsigned long,      const unsigned long &      "unsigned long"
-%typemap(ctype) long long,          const long long &          "long long"
-%typemap(ctype) unsigned long long, const unsigned long long & "unsigned long long"
-%typemap(ctype) float,              const float &              "float"
-%typemap(ctype) double,             const double &             "double"
-%typemap(ctype) char *                                         "char *"
-%typemap(ctype) void                                           "void"
-
-%typemap(m3rawtype) bool,               const bool &               "BOOLEAN"
-%typemap(m3rawtype) char,               const char &               "C.char"
-%typemap(m3rawtype) signed char,        const signed char &        "C.signed_char"
-%typemap(m3rawtype) unsigned char,      const unsigned char &      "C.unsigned_char"
-%typemap(m3rawtype) short,              const short &              "C.short"
-%typemap(m3rawtype) unsigned short,     const unsigned short &     "C.unsigned_short"
-%typemap(m3rawtype) int,                const int &                "C.int"
-%typemap(m3rawtype) unsigned int,       const unsigned int &       "C.unsigned_int"
-%typemap(m3rawtype) long,               const long &               "C.long"
-%typemap(m3rawtype) unsigned long,      const unsigned long &      "C.unsigned_long"
-%typemap(m3rawtype) long long,          const long long &          "C.long_long"
-%typemap(m3rawtype) unsigned long long, const unsigned long long & "C.unsigned_long_long"
-%typemap(m3rawtype) float,              const float &              "C.float"
-%typemap(m3rawtype) double,             const double &             "C.double"
-%typemap(m3rawtype) long double,        const long double &        "C.long_double"
-%typemap(m3rawtype) char *                                         "C.char_star"
-%typemap(m3rawtype) void                                           ""
-%typemap(m3rawtype) FILE                                           "Cstdio.FILE";
-%typemap(m3rawtype) FILE *                                         "Cstdio.FILE_star";
-
-
-%typemap(m3rawintype) bool *,               bool &,               bool               "BOOLEAN"
-%typemap(m3rawintype) char *,               char &,               char               "C.char"
-%typemap(m3rawintype) signed char *,        signed char &,        signed char        "C.signed_char"
-%typemap(m3rawintype) unsigned char *,      unsigned char &,      unsigned char      "C.unsigned_char"
-%typemap(m3rawintype) short *,              short &,              short              "C.short"
-%typemap(m3rawintype) unsigned short *,     unsigned short &,     unsigned short     "C.unsigned_short"
-%typemap(m3rawintype) int *,                int &,                int                "C.int"
-%typemap(m3rawintype) unsigned int *,       unsigned int &,       unsigned int       "C.unsigned_int"
-%typemap(m3rawintype) long *,               long &,               long               "C.long"
-%typemap(m3rawintype) unsigned long *,      unsigned long &,      unsigned long      "C.unsigned_long"
-%typemap(m3rawintype) long long *,          long long &,          long long          "C.long_long"
-%typemap(m3rawintype) unsigned long long *, unsigned long long &, unsigned long long "C.unsigned_long_long"
-%typemap(m3rawintype) float *,              float &,              float              "C.float"
-%typemap(m3rawintype) double *,             double &,             double             "C.double"
-%typemap(m3rawintype) long double *,        long double &,        long double        "C.long_double"
-%typemap(m3rawintype) char *                                                         "C.char_star"
-%typemap(m3rawintype) void                                                           ""
-%typemap(m3rawintype) void *                                                         "ADDRESS"
-%typemap(m3rawintype) FILE                                                           "Cstdio.FILE";
-%typemap(m3rawintype) FILE *                                                         "Cstdio.FILE_star";
-
-%typemap(m3rawinmode) char *, void *, FILE *  ""
-
-
-%typemap(m3rawrettype) bool,               const bool &               "BOOLEAN"
-%typemap(m3rawrettype) char,               const char &               "C.char"
-%typemap(m3rawrettype) signed char,        const signed char &        "C.signed_char"
-%typemap(m3rawrettype) unsigned char,      const unsigned char &      "C.unsigned_char"
-%typemap(m3rawrettype) short,              const short &              "C.short"
-%typemap(m3rawrettype) unsigned short,     const unsigned short &     "C.unsigned_short"
-%typemap(m3rawrettype) int,                const int &                "C.int"
-%typemap(m3rawrettype) unsigned int,       const unsigned int &       "C.unsigned_int"
-%typemap(m3rawrettype) long,               const long &               "C.long"
-%typemap(m3rawrettype) unsigned long,      const unsigned long &      "C.unsigned_long"
-%typemap(m3rawrettype) long long,          const long long &          "C.long_long"
-%typemap(m3rawrettype) unsigned long long, const unsigned long long & "C.unsigned_long_long"
-%typemap(m3rawrettype) float,              const float &              "C.float"
-%typemap(m3rawrettype) double,             const double &             "C.double"
-%typemap(m3rawrettype) long double,        const long double &        "C.long_double"
-%typemap(m3rawrettype) char *                                         "C.char_star"
-%typemap(m3rawrettype) void                                           ""
-%typemap(m3rawrettype) void *                                         "ADDRESS"
-%typemap(m3rawrettype) FILE                                           "Cstdio.FILE";
-%typemap(m3rawrettype) FILE *                                         "Cstdio.FILE_star";
-
-
-%typemap("m3rawtype:import")
-  char,               const char &,
-  signed char,        const signed char &,
-  unsigned char,      const unsigned char &,
-  short,              const short &,
-  unsigned short,     const unsigned short &,
-  int,                const int &,
-  unsigned int,       const unsigned int &,
-  long,               const long &,
-  unsigned long,      const unsigned long &,
-  long long,          const long long &,
-  unsigned long long, const unsigned long long &,
-  float,              const float &,
-  double,             const double &,
-  long double,        const long double &,
-  char *
-    "Ctypes AS C"
-
-%typemap("m3rawintype:import")
-  char,               const char &,
-  signed char,        const signed char &,
-  unsigned char,      const unsigned char &,
-  short,              const short &,
-  unsigned short,     const unsigned short &,
-  int,                const int &,
-  unsigned int,       const unsigned int &,
-  long,               const long &,
-  unsigned long,      const unsigned long &,
-  long long,          const long long &,
-  unsigned long long, const unsigned long long &,
-  float,              const float &,
-  double,             const double &,
-  long double,        const long double &,
-  char *
-    "Ctypes AS C"
-
-%typemap("m3rawrettype:import")
-  char,               const char &,
-  signed char,        const signed char &,
-  unsigned char,      const unsigned char &,
-  short,              const short &,
-  unsigned short,     const unsigned short &,
-  int,                const int &,
-  unsigned int,       const unsigned int &,
-  long,               const long &,
-  unsigned long,      const unsigned long &,
-  long long,          const long long &,
-  unsigned long long, const unsigned long long &,
-  float,              const float &,
-  double,             const double &,
-  long double,        const long double &,
-  char *
-    "Ctypes AS C"
-
-%typemap("m3rawtype:import")
-  FILE,   FILE *
-    "Cstdio";
-
-%typemap("m3rawintype:import")
-  FILE,   FILE *
-    "Cstdio";
-
-%typemap("m3rawrettype:import")
-  FILE,   FILE *
-    "Cstdio";
-
-%typemap(m3wraptype) bool,               const bool &               "BOOLEAN"
-%typemap(m3wraptype) char,               const char &               "CHAR"
-%typemap(m3wraptype) signed char,        const signed char &        "CHAR"
-%typemap(m3wraptype) unsigned char,      const unsigned char &      "CHAR"
-%typemap(m3wraptype) short,              const short &              "Integer16.T"
-%typemap(m3wraptype) unsigned short,     const unsigned short &     "Cardinal16.T"
-%typemap(m3wraptype) int,                const int &                "INTEGER"
-%typemap(m3wraptype) unsigned int,       const unsigned int &       "CARDINAL"
-%typemap(m3wraptype) long,               const long &               "Integer32.T"
-%typemap(m3wraptype) unsigned long,      const unsigned long &      "Cardinal32.T"
-%typemap(m3wraptype) long long,          const long long &          "Integer64.T"
-%typemap(m3wraptype) unsigned long long, const unsigned long long & "Cardinal64.T"
-%typemap(m3wraptype) float,              const float &              "REAL"
-%typemap(m3wraptype) double,             const double &             "LONGREAL"
-%typemap(m3wraptype) long double,        const long double &        "EXTENDED"
-%typemap(m3wraptype) char *                                         "TEXT"
-%typemap(m3wraptype) void                                           ""
-%typemap(m3wraptype) FILE                                           "Cstdio.FILE";
-%typemap(m3wraptype) FILE *                                         "Cstdio.FILE_star";
-
-%typemap(m3wrapintype) bool,               const bool *,               const bool &               "BOOLEAN"
-%typemap(m3wrapintype) char,               const char *,               const char &               "CHAR"
-%typemap(m3wrapintype) signed char,        const signed char *,        const signed char &        "CHAR"
-%typemap(m3wrapintype) unsigned char,      const unsigned char *,      const unsigned char &      "CHAR"
-%typemap(m3wrapintype) short,              const short *,              const short &              "INTEGER"
-%typemap(m3wrapintype) unsigned short,     const unsigned short *,     const unsigned short &     "CARDINAL"
-%typemap(m3wrapintype) int,                const int *,                const int &                "INTEGER"
-%typemap(m3wrapintype) unsigned int,       const unsigned int *,       const unsigned int &       "CARDINAL"
-%typemap(m3wrapintype) long,               const long *,               const long &               "INTEGER"
-%typemap(m3wrapintype) unsigned long,      const unsigned long *,      const unsigned long &      "CARDINAL"
-%typemap(m3wrapintype) long long,          const long long *,          const long long &          "INTEGER"
-%typemap(m3wrapintype) unsigned long long, const unsigned long long *, const unsigned long long & "CARDINAL"
-%typemap(m3wrapintype) float,              const float *,              const float &              "REAL"
-%typemap(m3wrapintype) double,             const double *,             const double &             "LONGREAL"
-%typemap(m3wrapintype) long double,        const long double *,        const long double &        "EXTENDED"
-%typemap(m3wrapintype) const char *, const char []   "TEXT"
-%typemap(m3wrapintype,numinputs=0) void              ""
-%typemap(m3wrapintype) FILE            "Cstdio.FILE";
-%typemap(m3wrapintype) FILE *          "Cstdio.FILE_star";
-
-
-%typemap(m3wrapouttype) bool,               bool *,               bool &                  "BOOLEAN"
-%typemap(m3wrapouttype) char,               char *,               char &                  "CHAR"
-%typemap(m3wrapouttype) signed char,        signed char *,        signed char &           "CHAR"
-%typemap(m3wrapouttype) unsigned char,      unsigned char *,      unsigned char &         "CHAR"
-%typemap(m3wrapouttype) short,              short *,              short &                 "INTEGER"
-%typemap(m3wrapouttype) unsigned short,     unsigned short *,     unsigned short &        "CARDINAL"
-%typemap(m3wrapouttype) int,                int *,                int &                   "INTEGER"
-%typemap(m3wrapouttype) unsigned int,       unsigned int *,       unsigned int &          "CARDINAL"
-%typemap(m3wrapouttype) long,               long *,               long &                  "INTEGER"
-%typemap(m3wrapouttype) unsigned long,      unsigned long *,      unsigned long &         "CARDINAL"
-%typemap(m3wrapouttype) long long,          long long *,          long long &             "INTEGER"
-%typemap(m3wrapouttype) unsigned long long, unsigned long long *, unsigned long long &    "CARDINAL"
-%typemap(m3wrapouttype) float,              float *,              float &                 "REAL"
-%typemap(m3wrapouttype) double,             double *,             double &                "LONGREAL"
-%typemap(m3wrapouttype) long double,        long double *,        long double &           "EXTENDED"
-%typemap(m3wrapouttype) char *, char []    "TEXT"
-%typemap(m3wrapouttype,numinputs=0) void   ""
-
-%typemap(m3wraprettype) bool,               const bool &               "BOOLEAN"
-%typemap(m3wraprettype) char,               const char &               "CHAR"
-%typemap(m3wraprettype) signed char,        const signed char &        "CHAR"
-%typemap(m3wraprettype) unsigned char,      const unsigned char &      "CHAR"
-%typemap(m3wraprettype) short,              const short &              "INTEGER"
-%typemap(m3wraprettype) unsigned short,     const unsigned short &     "CARDINAL"
-%typemap(m3wraprettype) int,                const int &                "INTEGER"
-%typemap(m3wraprettype) unsigned int,       const unsigned int &       "CARDINAL"
-%typemap(m3wraprettype) long,               const long &               "INTEGER"
-%typemap(m3wraprettype) unsigned long,      const unsigned long &      "CARDINAL"
-%typemap(m3wraprettype) long long,          const long long &          "INTEGER"
-%typemap(m3wraprettype) unsigned long long, const unsigned long long & "CARDINAL"
-%typemap(m3wraprettype) float,              const float &              "REAL"
-%typemap(m3wraprettype) double,             const double &             "LONGREAL"
-%typemap(m3wraprettype) long double,        const long double &        "EXTENDED"
-%typemap(m3wraprettype) char *                                         "TEXT"
-%typemap(m3wraprettype) void                                           ""
-%typemap(m3wraprettype) FILE            "Cstdio.FILE";
-%typemap(m3wraprettype) FILE *          "Cstdio.FILE_star";
-
-
-%typemap(ctype)          char[ANY]               "char *"
-%typemap(m3rawtype)      char[ANY]               "C.char_star"
-%typemap(m3rawintype)    char[ANY]               "C.char_star"
-%typemap(m3rawrettype)   char[ANY]               "C.char_star"
-%typemap(m3wraptype)     char[ANY]               "TEXT"
-%typemap(m3wrapintype)   char[ANY]               "TEXT"
-%typemap(m3wrapouttype)  char[ANY]               "TEXT"
-%typemap(m3wraprettype)  char[ANY]               "TEXT"
-
-%typemap(m3wrapinmode)  const char * %{%}
-%typemap(m3wrapargvar)  const char * %{$1 : C.char_star;%}
-%typemap(m3wrapinconv)  const char * %{$1 := M3toC.SharedTtoS($1_name);%}
-%typemap(m3wrapfreearg) const char * %{M3toC.FreeSharedS($1_name,$1);%}
-%typemap(m3wrapargraw)  const char * %{$1%}
-%typemap("m3wrapargvar:import")  const char * "Ctypes AS C"
-%typemap("m3wrapinconv:import")  const char * "M3toC"
-%typemap("m3wrapfreearg:import") const char * "M3toC"
-
-%typemap(m3wrapretvar)  char * %{result : C.char_star;%}
-%typemap(m3wrapretraw)  char * %{result%}
-%typemap(m3wrapretconv) char * %{M3toC.CopyStoT(result)%}
-%typemap("m3wrapretvar:import")  char * "Ctypes AS C"
-%typemap("m3wrapretconv:import") char * "M3toC"
-
-%typemap(m3wrapinmode)  FILE * %{%}
-
-
-%typemap("m3wraptype:import")
-  FILE,   FILE *
-    "Cstdio";
-
-%typemap("m3wrapintype:import")
-  FILE,   FILE *
-    "Cstdio";
-
-%typemap("m3wraprettype:import")
-  FILE,   FILE *
-    "Cstdio";
-
-
-/* Composed types */
-%typemap(ctype)                SWIGTYPE "$1_type"
-%typemap(m3rawtype)            SWIGTYPE "$1_basetype"
-%typemap(m3rawrettype)         SWIGTYPE "UNTRACED REF $1_basetype"
-%typemap(m3wraptype)           SWIGTYPE "$1_basetype"
-%typemap(m3wrapintype)         SWIGTYPE "$1_basetype"
-%typemap(m3wrapouttype)        SWIGTYPE "$1_basetype"
-%typemap(m3wraprettype)        SWIGTYPE "$1_basetype"
-
-%typemap(ctype)                SWIGTYPE [] "$1_type"
-%typemap(m3rawtype)      const SWIGTYPE [] "UNTRACED REF ARRAY INTEGER OF $1_basetype"
-%typemap(m3rawtype)            SWIGTYPE [] "UNTRACED REF ARRAY INTEGER OF $1_basetype"
-%typemap(m3rawintype)    const SWIGTYPE [] "(*ARRAY OF*) $1_basetype"
-%typemap(m3rawinmode)    const SWIGTYPE [] "READONLY"
-%typemap(m3rawintype)          SWIGTYPE [] "(*ARRAY OF*) $1_basetype"
-%typemap(m3rawinmode)          SWIGTYPE [] "VAR"
-%typemap(m3rawrettype)   const SWIGTYPE [] "UNTRACED REF ARRAY INTEGER OF $1_basetype"
-%typemap(m3rawrettype)         SWIGTYPE [] "UNTRACED REF ARRAY INTEGER OF $1_basetype"
-%typemap(m3wraptype)           SWIGTYPE [] "$1_basetype"
-%typemap(m3wrapintype)   const SWIGTYPE [] "ARRAY OF $1_basetype"
-%typemap(m3wrapinmode)   const SWIGTYPE [] "READONLY"
-%typemap(m3wrapintype)         SWIGTYPE [] "ARRAY OF $1_basetype"
-%typemap(m3wrapinmode)         SWIGTYPE [] "VAR"
-%typemap(m3wrapouttype)        SWIGTYPE [] "ARRAY OF $1_basetype"
-%typemap(m3wraprettype)        SWIGTYPE [] "REF ARRAY OF $1_basetype"
-
-%typemap(ctype)                SWIGTYPE * "$1_type"
-%typemap(m3rawtype)      const SWIGTYPE * "UNTRACED REF $1_basetype"
-%typemap(m3rawtype)            SWIGTYPE * "UNTRACED REF $1_basetype"
-%typemap(m3rawintype)    const SWIGTYPE * "$1_basetype"
-%typemap(m3rawinmode)    const SWIGTYPE * "READONLY"
-%typemap(m3rawintype)          SWIGTYPE * "$1_basetype"
-%typemap(m3rawinmode)          SWIGTYPE * "VAR"
-%typemap(m3rawrettype)   const SWIGTYPE * "UNTRACED REF $1_basetype"
-%typemap(m3rawrettype)         SWIGTYPE * "UNTRACED REF $1_basetype"
-%typemap(m3wraptype)           SWIGTYPE * "$1_basetype"
-%typemap(m3wrapintype)   const SWIGTYPE * "$1_basetype"
-%typemap(m3wrapinmode)   const SWIGTYPE * "READONLY"
-%typemap(m3wrapintype)         SWIGTYPE * "$1_basetype"
-%typemap(m3wrapinmode)         SWIGTYPE * "VAR"
-%typemap(m3wrapouttype)        SWIGTYPE * "$1_basetype"
-%typemap(m3wraprettype)        SWIGTYPE * "UNTRACED REF $1_basetype"
-
-%typemap(ctype)                SWIGTYPE & "$1_type"
-%typemap(m3rawtype)      const SWIGTYPE & "UNTRACED REF $1_basetype"
-%typemap(m3rawtype)            SWIGTYPE & "UNTRACED REF $1_basetype"
-%typemap(m3rawintype)    const SWIGTYPE & "$1_basetype"
-%typemap(m3rawinmode)    const SWIGTYPE & "READONLY"
-%typemap(m3rawintype)          SWIGTYPE & "$1_basetype"
-%typemap(m3rawinmode)          SWIGTYPE & "VAR"
-%typemap(m3rawrettype)   const SWIGTYPE & "UNTRACED REF $1_basetype"
-%typemap(m3rawrettype)         SWIGTYPE & "UNTRACED REF $1_basetype"
-%typemap(m3wraptype)           SWIGTYPE & "$1_basetype"
-%typemap(m3wrapintype)   const SWIGTYPE & "$1_basetype"
-%typemap(m3wrapinmode)   const SWIGTYPE & "READONLY"
-%typemap(m3wrapintype)         SWIGTYPE & "$1_basetype"
-%typemap(m3wrapinmode)         SWIGTYPE & "VAR"
-%typemap(m3wrapouttype)        SWIGTYPE & "$1_basetype"
-%typemap(m3wraprettype)        SWIGTYPE & "UNTRACED REF $1_basetype"
-
-%typemap(ctype)                SWIGTYPE && "$1_type"
-%typemap(m3rawtype)      const SWIGTYPE && "UNTRACED REF $1_basetype"
-%typemap(m3rawtype)            SWIGTYPE && "UNTRACED REF $1_basetype"
-%typemap(m3rawintype)    const SWIGTYPE && "$1_basetype"
-%typemap(m3rawinmode)    const SWIGTYPE && "READONLY"
-%typemap(m3rawintype)          SWIGTYPE && "$1_basetype"
-%typemap(m3rawinmode)          SWIGTYPE && "VAR"
-%typemap(m3rawrettype)   const SWIGTYPE && "UNTRACED REF $1_basetype"
-%typemap(m3rawrettype)         SWIGTYPE && "UNTRACED REF $1_basetype"
-%typemap(m3wraptype)           SWIGTYPE && "$1_basetype"
-%typemap(m3wrapintype)   const SWIGTYPE && "$1_basetype"
-%typemap(m3wrapinmode)   const SWIGTYPE && "READONLY"
-%typemap(m3wrapintype)         SWIGTYPE && "$1_basetype"
-%typemap(m3wrapinmode)         SWIGTYPE && "VAR"
-%typemap(m3wrapouttype)        SWIGTYPE && "$1_basetype"
-%typemap(m3wraprettype)        SWIGTYPE && "UNTRACED REF $1_basetype"
-
-%typemap(ctype)           enum SWIGTYPE "$1_type"
-%typemap(m3rawtype)       enum SWIGTYPE "C.int"
-%typemap(m3rawintype)     enum SWIGTYPE "C.int (* $1_type *)"
-%typemap(m3rawrettype)    enum SWIGTYPE "C.int"
-%typemap(m3wraptype)      enum SWIGTYPE "$*1_type"
-%typemap(m3wrapintype)    enum SWIGTYPE "$1_type"
-%typemap(m3wrapouttype)   enum SWIGTYPE "$1_type"
-%typemap(m3wraprettype)   enum SWIGTYPE "$*1_type"
-
-/* pointer to a class member */
-%typemap(ctype)      SWIGTYPE (CLASS::*) "$1_type"
-%typemap(m3rawtype)  SWIGTYPE (CLASS::*) "REFANY"
-%typemap(m3wraptype) SWIGTYPE (CLASS::*) "$1_basetype"
-
-/* The following are the in, out, freearg, argout typemaps.
-   These are the PInvoke code generating typemaps for converting from C# to C and visa versa. */
-
-/* primitive types */
-%typemap(in) bool
-%{ $1 = $input ? true : false; %}
-
-%typemap(in) char, 
-             signed char, 
-             unsigned char, 
-             short, 
-             unsigned short, 
-             int, 
-             unsigned int, 
-             long, 
-             unsigned long, 
-             long long, 
-             unsigned long long, 
-             float, 
-             double, 
-             enum SWIGTYPE
-%{ $1 = ($1_ltype)$input; %}
-
-%typemap(out) bool               %{ $result = $1; %}
-%typemap(out) char               %{ $result = $1; %}
-%typemap(out) signed char        %{ $result = $1; %}
-%typemap(out) unsigned char      %{ $result = $1; %}
-%typemap(out) short              %{ $result = $1; %}
-%typemap(out) unsigned short     %{ $result = $1; %}
-%typemap(out) int                %{ $result = $1; %}
-%typemap(out) unsigned int       %{ $result = $1; %}
-%typemap(out) long               %{ $result = $1; %}
-%typemap(out) unsigned long      %{ $result = $1; %}
-%typemap(out) long long          %{ $result = $1; %}
-%typemap(out) unsigned long long %{ $result = $1; %}
-%typemap(out) float              %{ $result = $1; %}
-%typemap(out) double             %{ $result = $1; %}
-%typemap(out) enum SWIGTYPE      %{ $result = $1; %}
-
-/* char * - treat as String */
-%typemap(in) char * {
-  $1 = $input;
-}
-//%typemap(freearg) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
-//%typemap(out) char * { if($1) $result = JCALL1(NewStringUTF, jenv, $1); }
-
-%typemap(out) void ""
-
-/* primitive types by const reference */
-%typemap(in) const bool & (bool temp)
-%{ temp = $input ? true : false; 
-   $1 = &temp; %}
-
-%typemap(in) const char & (char temp), 
-             const signed char & (signed char temp), 
-             const unsigned char & (unsigned char temp), 
-             const short & (short temp), 
-             const unsigned short & (unsigned short temp), 
-             const int & (int temp), 
-             const unsigned int & (unsigned int temp), 
-             const long & (long temp), 
-             const unsigned long & (unsigned long temp), 
-             const long long & ($*1_ltype temp), 
-             const unsigned long long & ($*1_ltype temp), 
-             const float & (float temp), 
-             const double & (double temp)
-%{ temp = ($*1_ltype)$input; 
-$1 = &temp; %}
-
-%typemap(out) const bool &               %{ $result = *$1; %}
-%typemap(out) const char &               %{ $result = *$1; %}
-%typemap(out) const signed char &        %{ $result = *$1; %}
-%typemap(out) const unsigned char &      %{ $result = *$1; %}
-%typemap(out) const short &              %{ $result = *$1; %}
-%typemap(out) const unsigned short &     %{ $result = *$1; %}
-%typemap(out) const int &                %{ $result = *$1; %}
-%typemap(out) const unsigned int &       %{ $result = *$1; %}
-%typemap(out) const long &               %{ $result = *$1; %}
-%typemap(out) const unsigned long &      %{ $result = *$1; %}
-%typemap(out) const long long &          %{ $result = *$1; %}
-%typemap(out) const unsigned long long & %{ $result = *$1; %}
-%typemap(out) const float &              %{ $result = *$1; %}
-%typemap(out) const double &             %{ $result = *$1; %}
-
-/* Default handling. Object passed by value. Convert to a pointer */
-%typemap(in) SWIGTYPE ($&1_type argp)
-%{ argp = *($&1_ltype*)&$input; 
-   if (!argp) {
-//     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type");
-     RETURN $null;
-   }
-   $1 = *argp; %}
-%typemap(out) SWIGTYPE 
-#ifdef __cplusplus
-%{*($&1_ltype*)&$result = new $1_ltype((const $1_ltype &)$1); %}
-#else
-{
-  $&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype));
-  memmove($1ptr, &$1, sizeof($1_type));
-  *($&1_ltype*)&$result = $1ptr;
-}
-#endif
-
-/* Generic pointers and references */
-%typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %}
-%typemap(in) SWIGTYPE & %{ $1 = *($&1_ltype)&$input;
-  if(!$1) {
-    //SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    RETURN $null;
-  } %}
-%typemap(in) SWIGTYPE && %{ $1 = *($&1_ltype)&$input;
-  if(!$1) {
-    //SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
-    RETURN $null;
-  } %}
-%typemap(out) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE (CLASS::*) %{ *($&1_ltype)&$result = $1; %} 
-
-
-/* Default array handling */
-%typemap(in) SWIGTYPE [] %{ $1 = *($&1_ltype)&$input; %}
-%typemap(out) SWIGTYPE [] %{ *($&1_ltype)&$result = $1; %} 
-
-/* char[ANY] - treat as String */
-%typemap(in) char[ANY] { 
-    $1 = $input;
-}
-
-%typemap(argout) char[ANY] ""
-%typemap(freearg) char[ANY] ""//{ if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
-%typemap(out) char[ANY] { if($1) $result = $1; }
-
-
-/* Typecheck typemaps - The purpose of these is merely to issue a warning for overloaded C++ functions 
- * that cannot be overloaded in C# as more than one C++ type maps to a single C# type */
-
-%typecheck(SWIG_TYPECHECK_BOOL) /* Java boolean */
-    bool,
-    const bool &
-    ""
-
-%typecheck(SWIG_TYPECHECK_CHAR) /* Java char */
-    char, 
-    const char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT8) /* Java byte */
-    signed char,
-    const signed char &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT16) /* Java short */
-    unsigned char, 
-    short, 
-    const unsigned char &, 
-    const short &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT32) /* Java int */
-    unsigned short, 
-    int, 
-    long, 
-    const unsigned short &, 
-    const int &, 
-    const long &,
-    enum SWIGTYPE
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT64) /* Java long */
-    unsigned int, 
-    unsigned long, 
-    long long, 
-    const unsigned int &, 
-    const unsigned long &, 
-    const long long &
-    ""
-
-%typecheck(SWIG_TYPECHECK_INT128) /* Java BigInteger */
-    unsigned long long
-    ""
-
-%typecheck(SWIG_TYPECHECK_FLOAT) /* Java float */
-    float,
-    const float &
-    ""
-
-%typecheck(SWIG_TYPECHECK_DOUBLE) /* Java double */
-    double,
-    const double &
-    ""
-
-%typecheck(SWIG_TYPECHECK_STRING) /* Java String */
-    char *,
-    char[ANY]
-    ""
-
-%typecheck(SWIG_TYPECHECK_POINTER) /* Default */
-    SWIGTYPE, 
-    SWIGTYPE *, 
-    SWIGTYPE &, 
-    SWIGTYPE &&, 
-    SWIGTYPE [],
-    SWIGTYPE (CLASS::*)
-    ""
-
-/* Exception handling */
-
-%typemap(throws) int, 
-                 long, 
-                 short, 
-                 unsigned int, 
-                 unsigned long, 
-                 unsigned short {
-  char error_msg[256];
-  sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
-  SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, error_msg);
-  RETURN $null;
-}
-
-%typemap(throws) SWIGTYPE {
-  (void)$1;
-  SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
-  RETURN $null;
-}
-
-%typemap(throws) char * {
-  SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1);
-  RETURN $null;
-}
-
-
-/* Typemaps for code generation in proxy classes and C# type wrapper classes */
-
-/* The in typemap is used for converting function parameter types from the type 
- * used in the proxy, module or type wrapper class to the type used in the PInvoke class. */
-%typemap(m3in)     bool,               const bool &,
-                 char,               const char &,
-                 signed char,        const signed char &,
-                 unsigned char,      const unsigned char &,
-                 short,              const short &,
-                 unsigned short,     const unsigned short &,
-                 int,                const int &,
-                 unsigned int,       const unsigned int &,
-                 long,               const long &,
-                 unsigned long,      const unsigned long &,
-                 long long,          const long long &,
-                 unsigned long long, const unsigned long long &,
-                 float,              const float &,
-                 double,             const double &,
-                 char *,
-                 char[ANY],
-                 enum SWIGTYPE 
-    "$input"
-%typemap(m3in) SWIGTYPE "$&*1_type.getCPtr($input)"
-%typemap(m3in) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "$1_basetype.getCPtr($input)"
-
-/* The m3out typemap is used for converting function return types from the return type
- * used in the PInvoke class to the type returned by the proxy, module or type wrapper class. */
-%typemap(m3out)   bool,               const bool &,
-                  char,               const char &,
-                  signed char,        const signed char &,
-                  unsigned char,      const unsigned char &,
-                  short,              const short &,
-                  unsigned short,     const unsigned short &,
-                  int,                const int &,
-                  unsigned int,       const unsigned int &,
-                  long,               const long &,
-                  unsigned long,      const unsigned long &,
-                  long long,          const long long &,
-                  unsigned long long, const unsigned long long &,
-                  float,              const float &,
-                  double,             const double &,
-                  char *,
-                  char[ANY],
-                  enum SWIGTYPE
-%{$imcall%}
-
-%typemap(m3out) void %{$imcall%}
-
-%typemap(m3out) SWIGTYPE %{
-    RETURN NEW(REF $1_basetype, $imcall);
-%}
-%typemap(m3out) SWIGTYPE & %{
-    RETURN NEW($1_basetype, $imcall, $owner);
-%}
-%typemap(m3out) SWIGTYPE && %{
-    RETURN NEW($1_basetype, $imcall, $owner);
-%}
-%typemap(m3out) SWIGTYPE *, SWIGTYPE [], SWIGTYPE (CLASS::*) %{
-    cPtr := $imcall;
-    RETURN (cPtr = IntPtr.Zero) ? null : NEW($1_basetype, cPtr, $owner);
-%}
-
-/* Properties */
-%typemap(m3varin) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) %{
-PROCEDURE Set$var (value: $vartype) =
-  BEGIN
-    $imcall;
-  END Set$var;
-%}
-
-%typemap(m3varout) bool,               const bool &,
-                   char,               const char &,
-                   signed char,        const signed char &,
-                   unsigned char,      const unsigned char &,
-                   short,              const short &,
-                   unsigned short,     const unsigned short &,
-                   int,                const int &,
-                   unsigned int,       const unsigned int &,
-                   long,               const long &,
-                   unsigned long,      const unsigned long &,
-                   long long,          const long long &,
-                   unsigned long long, const unsigned long long &,
-                   float,              const float &,
-                   double,             const double &,
-                   char *,
-                   char[ANY],
-                   enum SWIGTYPE %{
-PROCEDURE Get$var (): $vartype =
-  BEGIN
-    RETURN $imcall;
-  END Get$var;
-%}
-
-%typemap(m3varout) void %{
-    get {
-      $imcall;
-    } %}
-%typemap(m3varout) SWIGTYPE %{
-    get {
-      RETURN new $&*1_mangle($imcall, true);
-    } %}
-%typemap(m3varout) SWIGTYPE & %{
-    get {
-      RETURN new $1_basetype($imcall, $owner);
-    } %}
-%typemap(m3varout) SWIGTYPE && %{
-    get {
-      RETURN new $1_basetype($imcall, $owner);
-    } %}
-%typemap(m3varout) SWIGTYPE *, SWIGTYPE [], SWIGTYPE (CLASS::*) %{
-    get {
-      IntPtr cPtr = $imcall;
-      RETURN (cPtr == IntPtr.Zero) ? null : new $1_basetype(cPtr, $owner);
-    } %}
-
-/* Typemaps used for the generation of proxy and type wrapper class code */
-%typemap(m3base)                      SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(m3classmodifiers)            SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "public"
-%typemap(m3code)                      SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(m3imports)                   SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "using System;"
-%typemap(m3interfaces)                SWIGTYPE "IDisposable"
-%typemap(m3interfaces_derived)                  SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
-%typemap(m3ptrconstructormodifiers) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) "internal"
-
-%typemap(m3finalize) SWIGTYPE %{
-  ~$1_basetype() {
-    Dispose();
-  }
-%}
-
-%typemap(m3destruct, methodname="Dispose") SWIGTYPE {
-    if(swigCPtr != IntPtr.Zero && swigCMemOwn) {
-      $imcall;
-      swigCMemOwn = false;
-    }
-    swigCPtr = IntPtr.Zero;
-    GC.SuppressFinalize(this);
-  }
-
-%typemap(m3destruct_derived, methodname="Dispose") SWIGTYPE {
-    if(swigCPtr != IntPtr.Zero && swigCMemOwn) {
-      $imcall;
-      swigCMemOwn = false;
-    }
-    swigCPtr = IntPtr.Zero;
-    GC.SuppressFinalize(this);
-    base.Dispose();
-  }
-
-%typemap(m3getcptr) SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [], SWIGTYPE (CLASS::*) %{
-  internal static IntPtr getCPtr($1_basetype obj) {
-    RETURN (obj == null) ? IntPtr.Zero : obj.swigCPtr;
-  }
-%}
-
-/* M3 specific directives */
-#define %m3multiretval        %feature("modula3:multiretval")
-#define %constnumeric(num)    %feature("constnumeric","num")
-
-%pragma(modula3) moduleimports=%{
-IMPORT BlaBla;
-%}
-
-%pragma(modula3) imclassimports=%{
-FROM BlaBla IMPORT Bla;
-%}
-
-/* Some ANSI C typemaps */
-
-%apply unsigned long { size_t };
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
diff --git a/dependencies2013/win32/swig/Lib/modula3/modula3head.swg b/dependencies2013/win32/swig/Lib/modula3/modula3head.swg
deleted file mode 100644
index af96a78d..00000000
--- a/dependencies2013/win32/swig/Lib/modula3/modula3head.swg
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -----------------------------------------------------------------------------
- * modula3head.swg
- *
- * Modula3 support code
- * ----------------------------------------------------------------------------- */
-
-%insert(runtime) %{
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-%}
-
-#if 0
-%insert(runtime) %{
-/* Support for throwing Modula3 exceptions */
-typedef enum {
-  SWIG_JavaOutOfMemoryError = 1, 
-  SWIG_JavaIOException, 
-  SWIG_JavaRuntimeException, 
-  SWIG_JavaIndexOutOfBoundsException,
-  SWIG_JavaArithmeticException,
-  SWIG_JavaIllegalArgumentException,
-  SWIG_JavaNullPointerException,
-  SWIG_JavaUnknownError
-} SWIG_JavaExceptionCodes;
-
-typedef struct {
-  SWIG_JavaExceptionCodes code;
-  const char *java_exception;
-} SWIG_JavaExceptions_t;
-
-#if defined(SWIG_NOINCLUDE)
-void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg);
-#else
-%}
-%insert(runtime) {
-void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
-  jclass excep;
-  static const SWIG_JavaExceptions_t java_exceptions[] = {
-    { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
-    { SWIG_JavaIOException, "java/io/IOException" },
-    { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
-    { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
-    { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
-    { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
-    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
-    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" } };
-  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
-
-  while (except_ptr->code != code && except_ptr->code)
-    except_ptr++;
-
-  JCALL0(ExceptionClear, jenv);
-  excep = JCALL1(FindClass, jenv, except_ptr->java_exception);
-  if (excep)
-    JCALL2(ThrowNew, jenv, excep, msg);
-}
-}
-%insert(runtime) %{
-#endif
-%}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/modula3/typemaps.i b/dependencies2013/win32/swig/Lib/modula3/typemaps.i
deleted file mode 100644
index 1d76ab5e..00000000
--- a/dependencies2013/win32/swig/Lib/modula3/typemaps.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer and reference handling typemap library
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers and C++ references.
- * ----------------------------------------------------------------------------- */
-
-/* These typemaps will eventually probably maybe make their way into named typemaps
- * OUTPUT * and OUTPUT & as they currently break functions that return a pointer or 
- * reference. */
-
-%typemap(ctype) bool *,               bool &               "bool *"
-%typemap(ctype)                       char &               "char *"
-%typemap(ctype) signed char *,        signed char &        "signed char *"
-%typemap(ctype) unsigned char *,      unsigned char &      "unsigned short *"
-%typemap(ctype) short *,              short &              "short *"
-%typemap(ctype) unsigned short *,     unsigned short &     "unsigned short *"
-%typemap(ctype) int *,                int &                "int *"
-%typemap(ctype) unsigned int *,       unsigned int &       "unsigned int *"
-%typemap(ctype) long *,               long &               "long *"
-%typemap(ctype) unsigned long *,      unsigned long &      "unsigned long *"
-%typemap(ctype) long long *,          long long &          "long long *"
-%typemap(ctype) unsigned long long *, unsigned long long & "unsigned long long *"
-%typemap(ctype) float *,              float &              "float *"
-%typemap(ctype) double *,             double &             "double *"
-
-%typemap(imtype) bool *,               bool &               "ref bool"
-%typemap(imtype)                       char &               "ref char"
-%typemap(imtype) signed char *,        signed char &        "ref sbyte"
-%typemap(imtype) unsigned char *,      unsigned char &      "ref byte"
-%typemap(imtype) short *,              short &              "ref short"
-%typemap(imtype) unsigned short *,     unsigned short &     "ref ushort"
-%typemap(imtype) int *,                int &                "ref int"
-%typemap(imtype) unsigned int *,       unsigned int &       "ref uint"
-%typemap(imtype) long *,               long &               "ref int"
-%typemap(imtype) unsigned long *,      unsigned long &      "ref uint"
-%typemap(imtype) long long *,          long long &          "ref long"
-%typemap(imtype) unsigned long long *, unsigned long long & "ref ulong"
-%typemap(imtype) float *,              float &              "ref float"
-%typemap(imtype) double *,             double &             "ref double"
-
-%typemap(cstype) bool *,               bool &               "ref bool"
-%typemap(cstype)                       char &               "ref char"
-%typemap(cstype) signed char *,        signed char &        "ref sbyte"
-%typemap(cstype) unsigned char *,      unsigned char &      "ref byte"
-%typemap(cstype) short *,              short &              "ref short"
-%typemap(cstype) unsigned short *,     unsigned short &     "ref ushort"
-%typemap(cstype) int *,                int &                "ref int"
-%typemap(cstype) unsigned int *,       unsigned int &       "ref uint"
-%typemap(cstype) long *,               long &               "ref int"
-%typemap(cstype) unsigned long *,      unsigned long &      "ref uint"
-%typemap(cstype) long long *,          long long &          "ref long"
-%typemap(cstype) unsigned long long *, unsigned long long & "ref ulong"
-%typemap(cstype) float *,              float &              "ref float"
-%typemap(cstype) double *,             double &             "ref double"
-
-%typemap(csin)   bool *,               bool &,
-                                       char &,
-                 signed char *,        signed char &,
-                 unsigned char *,      unsigned char &,
-                 short *,              short &,
-                 unsigned short *,     unsigned short &,
-                 int *,                int &,
-                 unsigned int *,       unsigned int &,
-                 long *,               long &,
-                 unsigned long *,      unsigned long &,
-                 long long *,          long long &,
-                 unsigned long long *, unsigned long long &,
-                 float *,              float &,
-                 double *,             double &
-    "ref $csinput"
-
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/mzrun.swg b/dependencies2013/win32/swig/Lib/mzscheme/mzrun.swg
deleted file mode 100644
index 06447d78..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/mzrun.swg
+++ /dev/null
@@ -1,499 +0,0 @@
-/* -----------------------------------------------------------------------------
- * mzrun.swg
- * ----------------------------------------------------------------------------- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <escheme.h>
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Common SWIG API */
-  
-#define SWIG_ConvertPtr(s, result, type, flags) \
-  SWIG_MzScheme_ConvertPtr(s, result, type, flags)
-#define SWIG_NewPointerObj(ptr, type, owner) \
-  SWIG_MzScheme_NewPointerObj((void *)ptr, type, owner)
-#define SWIG_MustGetPtr(s, type, argnum, flags) \
-  SWIG_MzScheme_MustGetPtr(s, type, argnum, flags, FUNC_NAME, argc, argv)
-
-#define SWIG_contract_assert(expr,msg) \
- if (!(expr)) { \
-    char *m=(char *) scheme_malloc(strlen(msg)+1000); \
-    sprintf(m,"SWIG contract, assertion failed: function=%s, message=%s", \
-            (char *) FUNC_NAME,(char *) msg); \
-    scheme_signal_error(m); \
- }
-
-/* Runtime API */
-#define SWIG_GetModule(clientdata) SWIG_MzScheme_GetModule((Scheme_Env *)(clientdata))
-#define SWIG_SetModule(clientdata, pointer) SWIG_MzScheme_SetModule((Scheme_Env *) (clientdata), pointer)
-#define SWIG_MODULE_CLIENTDATA_TYPE Scheme_Env *
-
-/* MzScheme-specific SWIG API */
-  
-#define SWIG_malloc(size) SWIG_MzScheme_Malloc(size, FUNC_NAME)
-#define SWIG_free(mem) free(mem)
-#define SWIG_NewStructFromPtr(ptr,type) \
-        _swig_convert_struct_##type##(ptr)
-
-#define MAXVALUES 6
-#define swig_make_boolean(b) (b ? scheme_true : scheme_false)
-
-static long
-SWIG_convert_integer(Scheme_Object *o,
-		     long lower_bound, long upper_bound, 
-		     const char *func_name, int argnum, int argc,
-		     Scheme_Object **argv)
-{
-  long value;
-  int status = scheme_get_int_val(o, &value);
-  if (!status)
-    scheme_wrong_type(func_name, "integer", argnum, argc, argv);
-  if (value < lower_bound || value > upper_bound)
-    scheme_wrong_type(func_name, "integer", argnum, argc, argv);
-  return value;
-}
-
-static int
-SWIG_is_integer(Scheme_Object *o)
-{
-  long value;
-  return scheme_get_int_val(o, &value);
-}
-
-static unsigned long
-SWIG_convert_unsigned_integer(Scheme_Object *o,
-			      unsigned long lower_bound, unsigned long upper_bound, 
-			      const char *func_name, int argnum, int argc,
-			      Scheme_Object **argv)
-{
-  unsigned long value;
-  int status = scheme_get_unsigned_int_val(o, &value);
-  if (!status)
-    scheme_wrong_type(func_name, "integer", argnum, argc, argv);
-  if (value < lower_bound || value > upper_bound)
-    scheme_wrong_type(func_name, "integer", argnum, argc, argv);
-  return value;
-}
-
-static int
-SWIG_is_unsigned_integer(Scheme_Object *o)
-{
-  unsigned long value;
-  return scheme_get_unsigned_int_val(o, &value);
-}
-  
-/* ----------------------------------------------------------------------- 
- * mzscheme 30X support code
- * ----------------------------------------------------------------------- */
-
-#ifndef SCHEME_STR_VAL
-#define MZSCHEME30X 1
-#endif
-
-#ifdef MZSCHEME30X 
-/* 
- * This is MZSCHEME 299.100 or higher (30x).  From version 299.100 of
- * mzscheme upwards, strings are in unicode. These functions convert
- * to and from utf8 encodings of these strings.  NB! strlen(s) will be
- * the size in bytes of the string, not the actual length.
- */
-#define SCHEME_STR_VAL(obj)  	       SCHEME_BYTE_STR_VAL(scheme_char_string_to_byte_string(obj))
-#define SCHEME_STRLEN_VAL(obj)         SCHEME_BYTE_STRLEN_VAL(scheme_char_string_to_byte_string(obj))
-#define SCHEME_STRINGP(obj)            SCHEME_CHAR_STRINGP(obj)
-#define scheme_make_string(s)          scheme_make_utf8_string(s)
-#define scheme_make_sized_string(s,l)  scheme_make_sized_utf8_string(s,l)
-#define scheme_make_sized_offset_string(s,d,l) \
-                   scheme_make_sized_offset_utf8_string(s,d,l)
-#define SCHEME_MAKE_STRING(s) scheme_make_utf8_string(s)
-#else
-#define SCHEME_MAKE_STRING(s) scheme_make_string_without_copying(s)
-#endif
-/* ----------------------------------------------------------------------- 
- * End of mzscheme 30X support code 
- * ----------------------------------------------------------------------- */
-  
-struct swig_mz_proxy {
-  Scheme_Type mztype;
-  swig_type_info *type;
-  void *object;
-};
-
-static Scheme_Type swig_type;
-
-static void 
-mz_free_swig(void *p, void *data) {
-  struct swig_mz_proxy *proxy = (struct swig_mz_proxy *) p;
-  if (SCHEME_NULLP((Scheme_Object*)p) || SCHEME_TYPE((Scheme_Object*)p) != swig_type)
-    return;
-  if (proxy->type) {
-    if (proxy->type->clientdata) {
-      ((Scheme_Prim *)proxy->type->clientdata)(1, (Scheme_Object **)&proxy);
-    }
-  }
-}
-
-static Scheme_Object *
-SWIG_MzScheme_NewPointerObj(void *ptr, swig_type_info *type, int owner) {
-  struct swig_mz_proxy *new_proxy;
-  new_proxy = (struct swig_mz_proxy *) scheme_malloc(sizeof(struct swig_mz_proxy));
-  new_proxy->mztype = swig_type;
-  new_proxy->type = type;
-  new_proxy->object = ptr;
-  if (owner) {
-    scheme_add_finalizer(new_proxy, mz_free_swig, NULL);
-  }
-  return (Scheme_Object *) new_proxy;
-}
-
-static int
-SWIG_MzScheme_ConvertPtr(Scheme_Object *s, void **result, swig_type_info *type, int flags) {
-  swig_cast_info *cast;
-
-  if (SCHEME_NULLP(s)) {
-    *result = NULL;
-    return 0;
-  } else if (SCHEME_TYPE(s) == swig_type) {
-    struct swig_mz_proxy *proxy = (struct swig_mz_proxy *) s;
-    if (type) {
-      cast = SWIG_TypeCheckStruct(proxy->type, type);
-      if (cast) {
-        int newmemory = 0;
-        *result = SWIG_TypeCast(cast, proxy->object, &newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-        return 0;
-      } else {
-        return 1;
-      }
-    } else {
-      *result = proxy->object;
-      return 0;
-    }
-  }
-  return 1;
-}
-
-static SWIGINLINE void *
-SWIG_MzScheme_MustGetPtr(Scheme_Object *s, swig_type_info *type, 
-                         int argnum, int flags, const char *func_name,
-                         int argc, Scheme_Object **argv) {
-  void *result;
-  if (SWIG_MzScheme_ConvertPtr(s, &result, type, flags)) {
-    scheme_wrong_type(func_name, type->str ? type->str : "void *", argnum - 1, argc, argv);
-  }
-  return result;
-}
-
-static SWIGINLINE void *
-SWIG_MzScheme_Malloc(size_t size, const char *func_name) {
-  void *p = malloc(size);
-  if (p == NULL) {
-    scheme_signal_error("swig-memory-error");
-  } else return p;
-}
-
-static Scheme_Object *
-SWIG_MzScheme_PackageValues(int num, Scheme_Object **values) {
-    /* ignore first value if void */
-    if (num > 0 && SCHEME_VOIDP(values[0]))
-	num--, values++;
-    if (num == 0) return scheme_void;
-    else if (num == 1) return values[0];
-    else return scheme_values(num, values);
-}
-
-#ifndef scheme_make_inspector
-#define scheme_make_inspector(x,y) \
-        _scheme_apply(scheme_builtin_value("make-inspector"), x, y)
-#endif
-
-/* Function to create a new struct. */
-static Scheme_Object *
-SWIG_MzScheme_new_scheme_struct (Scheme_Env* env, const char* basename, 
-				 int num_fields, char** field_names)
-{
-    Scheme_Object *new_type;
-    int count_out, i;
-    Scheme_Object **struct_names;
-    Scheme_Object **vals;
-    Scheme_Object **a = (Scheme_Object**) \
-        scheme_malloc(num_fields*sizeof(Scheme_Object*));
-    
-    for (i=0; i<num_fields; ++i) {
-        a[i] = (Scheme_Object*) scheme_intern_symbol(field_names[i]);
-    }
-
-    new_type = scheme_make_struct_type(scheme_intern_symbol(basename),
-                                       NULL /*super_type*/,
-                                       scheme_make_inspector(0, NULL),
-                                       num_fields,
-                                       0 /* auto_fields */,
-                                       NULL /* auto_val */,
-                                       NULL /* properties */
-#ifdef MZSCHEME30X
-				       ,NULL /* Guard */
-#endif
-				       );
-    struct_names = scheme_make_struct_names(scheme_intern_symbol(basename),
-                                            scheme_build_list(num_fields,a),
-                                            0 /*flags*/, &count_out);
-    vals = scheme_make_struct_values(new_type, struct_names, count_out, 0);
-
-    for (i = 0; i < count_out; i++)
-        scheme_add_global_symbol(struct_names[i], vals[i],env);
-
-    return new_type;
-}
-
-#if defined(_WIN32) || defined(__WIN32__)
-#define __OS_WIN32
-#endif
-
-#ifdef __OS_WIN32
-#include <windows.h>
-#else
-#include <dlfcn.h>
-#endif
-
-  static char **mz_dlopen_libraries=NULL;
-  static void **mz_libraries=NULL;
-  static char **mz_dynload_libpaths=NULL;
-
-  static void mz_set_dlopen_libraries(const char *_libs)
-  {
-    int   i,k,n;
-    int   mz_dynload_debug=(1==0);
-    char *extra_paths[1000];
-    char *EP;
-    
-    {
-      char *dbg=getenv("MZ_DYNLOAD_DEBUG");
-      if (dbg!=NULL) {
-	mz_dynload_debug=atoi(dbg);
-      }
-    }
-
-    {
-      char *ep=getenv("MZ_DYNLOAD_LIBPATH");
-      int   i,k,j;
-      k=0;
-      if (ep!=NULL) {
-	EP=strdup(ep);
-	for(i=0,j=0;EP[i]!='\0';i++) {
-	  if (EP[i]==':') {
-	    EP[i]='\0';
-	    extra_paths[k++]=&EP[j];
-	    j=i+1;
-	  }
-	}
-	if (j!=i) {
-	  extra_paths[k++]=&EP[j];
-	}
-      }
-      else {
-	EP=strdup("");
-      }
-      extra_paths[k]=NULL;
-      k+=1;
-
-      if (mz_dynload_debug) {
-	fprintf(stderr,"SWIG:mzscheme:MZ_DYNLOAD_LIBPATH=%s\n",(ep==NULL) ? "(null)" : ep);
-	fprintf(stderr,"SWIG:mzscheme:extra_paths[%d]\n",k-1);
-	for(i=0;i<k-1;i++) {
-	  fprintf(stderr,"SWIG:mzscheme:extra_paths[%d]=%s\n",i,extra_paths[i]);
-	}
-      }
-
-      mz_dynload_libpaths=(char **) malloc(sizeof(char *)*k);
-      for(i=0;i<k;i++) {
-	if (extra_paths[i]!=NULL) {
-	  mz_dynload_libpaths[i]=strdup(extra_paths[i]);
-	}
-	else {
-	  mz_dynload_libpaths[i]=NULL;
-	}
-      }
-
-      if (mz_dynload_debug) {
-	int i;
-	for(i=0;extra_paths[i]!=NULL;i++) {
-	  fprintf(stderr,"SWIG:mzscheme:%s\n",extra_paths[i]);
-	}
-      }
-    }
-
-    {
-#ifdef MZ_DYNLOAD_LIBS
-      char *libs=(char *) malloc((strlen(MZ_DYNLOAD_LIBS)+1)*sizeof(char));
-      strcpy(libs,MZ_DYNLOAD_LIBS);
-#else
-      char *libs=(char *) malloc((strlen(_libs)+1)*sizeof(char));
-      strcpy(libs,_libs);
-#endif
-      
-      for(i=0,n=strlen(libs),k=0;i<n;i++) {
-	if (libs[i]==',') { k+=1; }
-      }
-      k+=1;
-      mz_dlopen_libraries=(char **) malloc(sizeof(char *)*(k+1));
-      mz_dlopen_libraries[0]=libs;
-      for(i=0,k=1,n=strlen(libs);i<n;i++) {
-	if (libs[i]==',') {
-	  libs[i]='\0';
-	  mz_dlopen_libraries[k++]=&libs[i+1];
-	  i+=1;
-	}
-      }
-      
-      if (mz_dynload_debug) {
-	fprintf(stderr,"k=%d\n",k);
-      }
-      mz_dlopen_libraries[k]=NULL;
-      
-      free(EP);
-    }
-  }
-
-  static void *mz_load_function(char *function)
-  {
-    int mz_dynload_debug=(1==0);
-    
-    {
-      char *dbg=getenv("MZ_DYNLOAD_DEBUG");
-      if (dbg!=NULL) {
-	mz_dynload_debug=atoi(dbg);
-      }
-    }
-
-    if (mz_dlopen_libraries==NULL) {
-      return NULL;
-    }
-    else {
-      if (mz_libraries==NULL) {
-        int i,n;
-        for(n=0;mz_dlopen_libraries[n]!=NULL;n++);
-	if (mz_dynload_debug) {
-	  fprintf(stderr,"SWIG:mzscheme:n=%d\n",n);
-	}
-        mz_libraries=(void **) malloc(sizeof(void*)*n);
-        for(i=0;i<n;i++) { 
-	  if (mz_dynload_debug) {
-	   fprintf(stderr,"SWIG:mzscheme:loading %s\n",mz_dlopen_libraries[i]);
-	  }
-#ifdef __OS_WIN32
-	  mz_libraries[i]=(void *) LoadLibrary(mz_dlopen_libraries[i]); 
-#else
-	  mz_libraries[i]=(void *) dlopen(mz_dlopen_libraries[i],RTLD_LAZY); 
-#endif
-	  if (mz_libraries[i]==NULL) {
-	    int k;
-	    char *libp;
-	    for(k=0;mz_dynload_libpaths[k]!=NULL && mz_libraries[i]==NULL;k++) {
-	      int L=strlen(mz_dynload_libpaths[k])+strlen("\\")+strlen(mz_dlopen_libraries[i])+1;
-	      libp=(char *) malloc(L*sizeof(char));
-#ifdef __OS_WIN32
-	      sprintf(libp,"%s\\%s",mz_dynload_libpaths[k],mz_dlopen_libraries[i]);
-	      mz_libraries[i]=(void *) LoadLibrary(libp); 
-#else
-	      sprintf(libp,"%s/%s",mz_dynload_libpaths[k],mz_dlopen_libraries[i]);
-	      mz_libraries[i]=(void *) dlopen(libp,RTLD_LAZY); 
-#endif
-	      if (mz_dynload_debug) {
-		fprintf(stderr,"SWIG:mzscheme:trying %s --> %p\n",libp,mz_libraries[i]);
-	      }
-	      free(libp);
-	    }
-	  }
-        }
-      }
-      {
-        int i;
-        void *func=NULL;
-
-        for(i=0;mz_dlopen_libraries[i]!=NULL && func==NULL;i++) {
-          if (mz_libraries[i]!=NULL) {
-#ifdef __OS_WIN32
-            func=GetProcAddress(mz_libraries[i],function);
-#else
-            func=dlsym(mz_libraries[i],function);
-#endif
-          }
-	  if (mz_dynload_debug) {
-	    fprintf(stderr,
-		    "SWIG:mzscheme:library:%s;dlopen=%p,function=%s,func=%p\n",
-		    mz_dlopen_libraries[i],mz_libraries[i],function,func
-		    );
-	  }
-        }
-
-        return func;
-      }
-    }
-  }
-
-/* The interpreter will store a pointer to this structure in a global
-   variable called swig-runtime-data-type-pointer.  The instance of this
-   struct is only used if no other module has yet been loaded */
-struct swig_mzscheme_runtime_data {
-  swig_module_info *module_head;
-  Scheme_Type type;
-};
-static struct swig_mzscheme_runtime_data swig_mzscheme_runtime_data;
-
-
-static swig_module_info *
-SWIG_MzScheme_GetModule(Scheme_Env *env) {
-  Scheme_Object *pointer, *symbol;
-  struct swig_mzscheme_runtime_data *data;
-
-  /* first check if pointer already created */
-  symbol = scheme_intern_symbol("swig-runtime-data-type-pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
-  pointer = scheme_lookup_global(symbol, env);
-  if (pointer && SCHEME_CPTRP(pointer)) {
-      data = (struct swig_mzscheme_runtime_data *) SCHEME_CPTR_VAL(pointer);
-      swig_type = data->type;
-      return data->module_head;
-  } else {
-      return NULL;
-  }
-}
-
-static void
-SWIG_MzScheme_SetModule(Scheme_Env *env, swig_module_info *module) {
-  Scheme_Object *pointer, *symbol;
-  struct swig_mzscheme_runtime_data *data;
-
-  /* first check if pointer already created */
-  symbol = scheme_intern_symbol("swig-runtime-data-type-pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
-  pointer = scheme_lookup_global(symbol, env);
-  if (pointer && SCHEME_CPTRP(pointer)) {
-    data = (struct swig_mzscheme_runtime_data *) SCHEME_CPTR_VAL(pointer);
-    swig_type = data->type;
-    data->module_head = module;
-  } else {
-    /* create a new type for wrapped pointer values */
-    swig_type = scheme_make_type((char *)"swig");
-    swig_mzscheme_runtime_data.module_head = module;
-    swig_mzscheme_runtime_data.type = swig_type;
-    
-    /* create a new pointer */
-#ifndef MZSCHEME30X
-    pointer = scheme_make_cptr((void *) &swig_mzscheme_runtime_data, "swig_mzscheme_runtime_data");
-#else
-    pointer = scheme_make_cptr((void *) &swig_mzscheme_runtime_data,
-			       scheme_make_byte_string("swig_mzscheme_runtime_data"));
-#endif
-    scheme_add_global_symbol(symbol, pointer, env);
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/mzscheme.swg b/dependencies2013/win32/swig/Lib/mzscheme/mzscheme.swg
deleted file mode 100644
index 9ae24284..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/mzscheme.swg
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -----------------------------------------------------------------------------
- * mzscheme.swg
- *
- * SWIG Configuration File for MzScheme.
- * This file is parsed by SWIG before reading any other interface file.
- * ----------------------------------------------------------------------------- */
-
-/* Include headers */
-%runtime "swigrun.swg"     // Common C API type-checking code
-%runtime "mzrun.swg"
-
-%define SWIG_APPEND_VALUE(value)
-   values[lenv++] = value
-%enddef
-
-/* Definitions */
-#define SWIG_malloc(size) swig_malloc(size, FUNC_NAME)
-#define SWIG_free(mem) free(mem)
-
-#define SWIG_convert_short(o)					\
-  SWIG_convert_integer(o, - (1 << (8 * sizeof(short) - 1)),	\
-		       (1 << (8 * sizeof(short) - 1)) - 1,	\
-		       FUNC_NAME, $argnum-1, argc, argv)
-#define SWIG_convert_int(o)					\
-  SWIG_convert_integer(o, INT_MIN, INT_MAX,			\
-		       FUNC_NAME, $argnum-1, argc, argv)
-#define SWIG_convert_long(o)					\
-  SWIG_convert_integer(o, LONG_MIN, LONG_MAX,			\
-		       FUNC_NAME, $argnum-1, argc, argv)
-#define SWIG_convert_unsigned_short(o)				\
-  SWIG_convert_unsigned_integer(o, 0,				\
-		       (1 << (8 * sizeof(short))) - 1,		\
-		       FUNC_NAME, $argnum-1, argc, argv)
-#define SWIG_convert_unsigned_int(o)				\
-  SWIG_convert_unsigned_integer(o, 0, UINT_MAX,			\
-		       FUNC_NAME, $argnum-1, argc, argv)
-#define SWIG_convert_unsigned_long(o)				\
-  SWIG_convert_unsigned_integer(o, 0, ULONG_MAX,		\
-		       FUNC_NAME, $argnum-1, argc, argv)
-
-/* Guile compatibility kludges */
-#define SCM_VALIDATE_VECTOR(argnum, value) (void)0
-#define SCM_VALIDATE_LIST(argnum, value) (void)0
-
-/* Read in standard typemaps. */
-%include <typemaps.i>
-
-%insert(init) "swiginit.swg"
-
-%init %{
-Scheme_Object *scheme_reload(Scheme_Env *env) {
-  Scheme_Env *menv = SWIG_MZSCHEME_CREATE_MENV(env);
-
-  SWIG_InitializeModule((void *) env);
-%}
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/std_common.i b/dependencies2013/win32/swig/Lib/mzscheme/std_common.i
deleted file mode 100644
index a83e2731..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/std_common.i
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%apply size_t { std::size_t };
-
-%{
-#include <string>
-
-SWIGINTERNINLINE
-std::string swig_scm_to_string(Scheme_Object *x) {
-    return std::string(SCHEME_STR_VAL(x));
-}
-
-SWIGINTERNINLINE
-Scheme_Object *swig_make_string(const std::string &s) {
-    return scheme_make_string(s.c_str());
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/std_deque.i b/dependencies2013/win32/swig/Lib/mzscheme/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/std_map.i b/dependencies2013/win32/swig/Lib/mzscheme/std_map.i
deleted file mode 100644
index 849f8baf..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/std_map.i
+++ /dev/null
@@ -1,1352 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-//
-// The aim of all that follows would be to integrate std::map with
-// MzScheme as much as possible, namely, to allow the user to pass and
-// be returned Scheme association lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-//
-//   -- f(std::map<T>), f(const std::map<T>&), f(const std::map<T>*):
-//      the parameter being read-only, either a Scheme alist or a
-//      previously wrapped std::map<T> can be passed.
-//   -- f(std::map<T>&), f(std::map<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::map
-//      can be passed.
-//   -- std::map<T> f():
-//      the map is returned by copy; therefore, a Scheme alist
-//      is returned which is most easily used in other Scheme functions
-//   -- std::map<T>& f(), std::map<T>* f(), const std::map<T>& f(),
-//      const std::map<T>* f():
-//      the map is returned by reference; therefore, a wrapped std::map
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        %typemap(in) map<K,T> (std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                $1 = std::map<K,T >();
-            } else if (SCHEME_PAIRP($input)) {
-                $1 = std::map<K,T >();
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    K* k;
-                    T* x;
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) == -1) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    (($1_type &)$1)[*k] = *x;
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp,
-                                      std::map<K,T>* m),
-                     const map<K,T>* (std::map<K,T> temp,
-                                      std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-            } else if (SCHEME_PAIRP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    K* k;
-                    T* x;
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) == -1) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    temp[*k] = *x;
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            Scheme_Object* alist = scheme_null;
-            for (std::map<K,T >::reverse_iterator i=$1.rbegin(); 
-                                                  i!=$1.rend(); ++i) {
-                K* key = new K(i->first);
-                T* val = new T(i->second);
-                Scheme_Object* k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                Scheme_Object* x = SWIG_NewPointerObj(val,$descriptor(T *), 1);
-                Scheme_Object* entry = scheme_make_pair(k,x);
-                alist = scheme_make_pair(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            /* native sequence? */
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                /* check the first element only */
-                K* k;
-                T* x;
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (SWIG_ConvertPtr(key,(void**) &k,
-                                    $descriptor(K *), 0) == -1) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) != -1) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped map? */
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            /* native sequence? */
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                /* check the first element only */
-                K* k;
-                T* x;
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (SWIG_ConvertPtr(key,(void**) &k,
-                                    $descriptor(K *), 0) == -1) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) != -1) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped map? */
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T& __getitem__(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            Scheme_Object* keys() {
-                Scheme_Object* result = scheme_null;
-                for (std::map<K,T >::reverse_iterator i=self->rbegin(); 
-                                                      i!=self->rend(); ++i) {
-                    K* key = new K(i->first);
-                    Scheme_Object* k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                    result = scheme_make_pair(k,result);
-                }
-                return result;
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-
-    template<class T> class map<K,T> {
-        %typemap(in) map<K,T> (std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                $1 = std::map<K,T >();
-            } else if (SCHEME_PAIRP($input)) {
-                $1 = std::map<K,T >();
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    T* x;
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    if (!CHECK(key))
-                        SWIG_exception(SWIG_TypeError,
-                                       "map<" #K "," #T "> expected");
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) == -1) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    (($1_type &)$1)[CONVERT_FROM(key)] = *x;
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp,
-                                      std::map<K,T>* m),
-                     const map<K,T>* (std::map<K,T> temp,
-                                      std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-            } else if (SCHEME_PAIRP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    T* x;
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    if (!CHECK(key))
-                        SWIG_exception(SWIG_TypeError,
-                                       "map<" #K "," #T "> expected");
-                    if (SWIG_ConvertPtr(val,(void**) &x,
-                                    $descriptor(T *), 0) == -1) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0);
-                    }
-                    temp[CONVERT_FROM(key)] = *x;
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            Scheme_Object* alist = scheme_null;
-            for (std::map<K,T >::reverse_iterator i=$1.rbegin(); 
-                                                  i!=$1.rend(); ++i) {
-                T* val = new T(i->second);
-                Scheme_Object* k = CONVERT_TO(i->first);
-                Scheme_Object* x = SWIG_NewPointerObj(val,$descriptor(T *), 1);
-                Scheme_Object* entry = scheme_make_pair(k,x);
-                alist = scheme_make_pair(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            // native sequence?
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                // check the first element only
-                T* x;
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (!CHECK(key)) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) != -1) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            // native sequence?
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                // check the first element only
-                T* x;
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (!CHECK(key)) {
-                        $1 = 0;
-                    } else {
-                        if (SWIG_ConvertPtr(val,(void**) &x,
-                                        $descriptor(T *), 0) != -1) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (SWIG_ConvertPtr(val,(void**) &x,
-                                            $descriptor(T *), 0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T& __getitem__(K key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(K key, const T& x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(K key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(K key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            Scheme_Object* keys() {
-                Scheme_Object* result = scheme_null;
-                for (std::map<K,T >::reverse_iterator i=self->rbegin(); 
-                                                      i!=self->rend(); ++i) {
-                    Scheme_Object* k = CONVERT_TO(i->first);
-                    result = scheme_make_pair(k,result);
-                }
-                return result;
-            }
-        }
-    };
-    %enddef
-
-    %define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<class K> class map<K,T> {
-        %typemap(in) map<K,T> (std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                $1 = std::map<K,T >();
-            } else if (SCHEME_PAIRP($input)) {
-                $1 = std::map<K,T >();
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    K* k;
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (!CHECK(val)) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        if (!CHECK(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    (($1_type &)$1)[*k] = CONVERT_FROM(val);
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp,
-                                      std::map<K,T>* m),
-                     const map<K,T>* (std::map<K,T> temp,
-                                      std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-            } else if (SCHEME_PAIRP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    K* k;
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0);
-                    if (!CHECK(val)) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        if (!CHECK(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    temp[*k] = CONVERT_FROM(val);
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            Scheme_Object* alist = scheme_null;
-            for (std::map<K,T >::reverse_iterator i=$1.rbegin(); 
-                                                  i!=$1.rend(); ++i) {
-                K* key = new K(i->first);
-                Scheme_Object* k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                Scheme_Object* x = CONVERT_TO(i->second);
-                Scheme_Object* entry = scheme_make_pair(k,x);
-                alist = scheme_make_pair(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            // native sequence?
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                // check the first element only
-                K* k;
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (SWIG_ConvertPtr(val,(void **) &k,
-                                    $descriptor(K *), 0) == -1) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK(val)) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (CHECK(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            // native sequence?
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                // check the first element only
-                K* k;
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (SWIG_ConvertPtr(val,(void **) &k,
-                                    $descriptor(K *), 0) == -1) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK(val)) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (CHECK(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T __getitem__(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(const K& key, T x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            Scheme_Object* keys() {
-                Scheme_Object* result = scheme_null;
-                for (std::map<K,T >::reverse_iterator i=self->rbegin(); 
-                                                      i!=self->rend(); ++i) {
-                    K* key = new K(i->first);
-                    Scheme_Object* k = SWIG_NewPointerObj(key,$descriptor(K *), 1);
-                    result = scheme_make_pair(k,result);
-                }
-                return result;
-            }
-        }
-    };
-    %enddef
-
-    %define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO,
-                                       T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-    template<> class map<K,T> {
-        %typemap(in) map<K,T> (std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                $1 = std::map<K,T >();
-            } else if (SCHEME_PAIRP($input)) {
-                $1 = std::map<K,T >();
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    if (!CHECK_K(key))
-                        SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    if (!CHECK_T(val)) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        if (!CHECK_T(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    (($1_type &)$1)[CONVERT_K_FROM(key)] = 
-                                               CONVERT_T_FROM(val);
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const map<K,T>& (std::map<K,T> temp,
-                                      std::map<K,T>* m),
-                     const map<K,T>* (std::map<K,T> temp,
-                                      std::map<K,T>* m) {
-            if (SCHEME_NULLP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-            } else if (SCHEME_PAIRP($input)) {
-                temp = std::map<K,T >();
-                $1 = &temp;
-                Scheme_Object* alist = $input;
-                while (!SCHEME_NULLP(alist)) {
-                    Scheme_Object *entry, *key, *val;
-                    entry = scheme_car(alist);
-                    if (!SCHEME_PAIRP(entry))
-                        SWIG_exception(SWIG_TypeError,"alist expected");
-                    key = scheme_car(entry);
-                    val = scheme_cdr(entry);
-                    if (!CHECK_K(key))
-                        SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    if (!CHECK_T(val)) {
-                        if (!SCHEME_PAIRP(val))
-                            SWIG_exception(SWIG_TypeError,"alist expected");
-                        val = scheme_car(val);
-                        if (!CHECK_T(val))
-                            SWIG_exception(SWIG_TypeError,
-                                           "map<" #K "," #T "> expected");
-                    }
-                    temp[CONVERT_K_FROM(key)] = CONVERT_T_FROM(val);
-                    alist = scheme_cdr(alist);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) map<K,T> {
-            Scheme_Object* alist = scheme_null;
-            for (std::map<K,T >::reverse_iterator i=$1.rbegin(); 
-                                                  i!=$1.rend(); ++i) {
-                Scheme_Object* k = CONVERT_K_TO(i->first);
-                Scheme_Object* x = CONVERT_T_TO(i->second);
-                Scheme_Object* entry = scheme_make_pair(k,x);
-                alist = scheme_make_pair(entry,alist);
-            }
-            $result = alist;
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) map<K,T> {
-            // native sequence?
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                // check the first element only
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (!CHECK_K(key)) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK_T(val)) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (CHECK_T(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_MAP) const map<K,T>&,
-                                       const map<K,T>* {
-            // native sequence?
-            if (SCHEME_NULLP($input)) {
-                /* an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                // check the first element only
-                Scheme_Object* head = scheme_car($input);
-                if (SCHEME_PAIRP(head)) {
-                    Scheme_Object* key = scheme_car(head);
-                    Scheme_Object* val = scheme_cdr(head);
-                    if (!CHECK_K(key)) {
-                        $1 = 0;
-                    } else {
-                        if (CHECK_T(val)) {
-                            $1 = 1;
-                        } else if (SCHEME_PAIRP(val)) {
-                            val = scheme_car(val);
-                            if (CHECK_T(val))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        } else {
-                            $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                // wrapped map?
-                std::map<K,T >* m;
-                if (SWIG_ConvertPtr($input,(void **) &m,
-                                $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %rename("length") size;
-        %rename("null?") empty;
-        %rename("clear!") clear;
-        %rename("ref") __getitem__;
-        %rename("set!") __setitem__;
-        %rename("delete!") __delitem__;
-        %rename("has-key?") has_key;
-      public:
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            T __getitem__(K key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void __setitem__(K key, T x) {
-                (*self)[key] = x;
-            }
-            void __delitem__(K key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(K key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            Scheme_Object* keys() {
-                Scheme_Object* result = scheme_null;
-                for (std::map<K,T >::reverse_iterator i=self->rbegin(); 
-                                                      i!=self->rend(); ++i) {
-                    Scheme_Object* k = CONVERT_K_TO(i->first);
-                    result = scheme_make_pair(k,result);
-                }
-                return result;
-            }
-        }
-    };
-    %enddef
-
-
-    specialize_std_map_on_key(bool,SCHEME_BOOLP,
-                              SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_key(int,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_key(short,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_key(long,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_key(unsigned int,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_key(unsigned short,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_key(unsigned long,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_key(double,SCHEME_REALP,
-                              scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_key(float,SCHEME_REALP,
-                              scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_key(std::string,SCHEME_STRINGP,
-                              swig_scm_to_string,swig_make_string);
-
-    specialize_std_map_on_value(bool,SCHEME_BOOLP,
-                                SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_value(int,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_value(short,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_value(long,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_value(unsigned int,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_value(unsigned short,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_value(unsigned long,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_value(double,SCHEME_REALP,
-                                scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_value(float,SCHEME_REALP,
-                                scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_value(std::string,SCHEME_STRINGP,
-                                swig_scm_to_string,swig_make_string);
-
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_map_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-}
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/std_pair.i b/dependencies2013/win32/swig/Lib/mzscheme/std_pair.i
deleted file mode 100644
index d5a65470..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/std_pair.i
+++ /dev/null
@@ -1,870 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-
-// ------------------------------------------------------------------------
-// std::pair
-//
-// See std_vector.i for the rationale of typemap application
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class T, class U> struct pair {
-        %typemap(in) pair<T,U> (std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                U* y;
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                $1 = std::make_pair(*x,*y);
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const pair<T,U>& (std::pair<T,U> temp,
-                                       std::pair<T,U>* m),
-                     const pair<T,U>* (std::pair<T,U> temp,
-                                       std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                U* y;
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                temp = std::make_pair(*x,*y);
-                $1 = &temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) pair<T,U> {
-            T* x = new T($1.first);
-            U* y = new U($1.second);
-            Scheme_Object* first = SWIG_NewPointerObj(x,$descriptor(T *), 1);
-            Scheme_Object* second = SWIG_NewPointerObj(y,$descriptor(U *), 1);
-            $result = scheme_make_pair(first,second);
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                U* y;
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) != -1 &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) != -1) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                U* y;
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) != -1 &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) != -1) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-
-    // specializations for built-ins
-
-    %define specialize_std_pair_on_first(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<class U> struct pair<T,U> {
-        %typemap(in) pair<T,U> (std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                U* y;
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                if (!CHECK(first))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                $1 = std::make_pair(CONVERT_FROM(first),*y);
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const pair<T,U>& (std::pair<T,U> temp,
-                                       std::pair<T,U>* m),
-                     const pair<T,U>* (std::pair<T,U> temp,
-                                       std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                U* y;
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                if (!CHECK(first))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0);
-                temp = std::make_pair(CONVERT_FROM(first),*y);
-                $1 = &temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) pair<T,U> {
-            U* y = new U($1.second);
-            Scheme_Object* second = SWIG_NewPointerObj(y,$descriptor(U *), 1);
-            $result = scheme_make_pair(CONVERT_TO($1.first),second);
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                U* y;
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (CHECK(first) &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) != -1) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                U* y;
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (CHECK(first) &&
-                    SWIG_ConvertPtr(second,(void**) &y,
-                                    $descriptor(U *), 0) != -1) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-    %enddef
-
-    %define specialize_std_pair_on_second(U,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<class T> struct pair<T,U> {
-        %typemap(in) pair<T,U> (std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                if (!CHECK(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                $1 = std::make_pair(*x,CONVERT_FROM(second));
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const pair<T,U>& (std::pair<T,U> temp,
-                                       std::pair<T,U>* m),
-                     const pair<T,U>* (std::pair<T,U> temp,
-                                       std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                if (!CHECK(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                temp = std::make_pair(*x,CONVERT_FROM(second));
-                $1 = &temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) pair<T,U> {
-            T* x = new T($1.first);
-            Scheme_Object* first = SWIG_NewPointerObj(x,$descriptor(T *), 1);
-            $result = scheme_make_pair(first,CONVERT_TO($1.second));
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) != -1 &&
-                    CHECK(second)) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                T* x;
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (SWIG_ConvertPtr(first,(void**) &x,
-                                    $descriptor(T *), 0) != -1 &&
-                    CHECK(second)) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-    %enddef
-
-    %define specialize_std_pair_on_both(T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO,
-                                        U,CHECK_U,CONVERT_U_FROM,CONVERT_U_TO)
-    template<> struct pair<T,U> {
-        %typemap(in) pair<T,U> (std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                Scheme_Object *first, *second;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                if (!CHECK_T(first) || !CHECK_U(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                $1 = make_pair(CONVERT_T_FROM(first),
-                               CONVERT_U_FROM(second));
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const pair<T,U>& (std::pair<T,U> temp,
-                                       std::pair<T,U>* m),
-                     const pair<T,U>* (std::pair<T,U> temp,
-                                       std::pair<T,U>* m) {
-            if (SCHEME_PAIRP($input)) {
-                Scheme_Object *first, *second;
-            T *x;
-                first = scheme_car($input);
-                second = scheme_cdr($input);
-                x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0);
-                if (!CHECK_T(first) || !CHECK_U(second))
-                    SWIG_exception(SWIG_TypeError,
-                                   "pair<" #T "," #U "> expected");
-                temp = make_pair(CONVERT_T_FROM(first),
-                               CONVERT_U_FROM(second));
-                $1 = &temp;
-            } else {
-                $1 = ($1_ltype)
-                    SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) pair<T,U> {
-            $result = scheme_make_pair(CONVERT_T_TO($1.first),
-                                       CONVERT_U_TO($1.second));
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) pair<T,U> {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (CHECK_T(first) && CHECK_U(second)) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_PAIR) const pair<T,U>&,
-                                        const pair<T,U>* {
-            /* native pair? */
-            if (SCHEME_PAIRP($input)) {
-                Scheme_Object* first = scheme_car($input);
-                Scheme_Object* second = scheme_cdr($input);
-                if (CHECK_T(first) && CHECK_U(second)) {
-                        $1 = 1;
-                } else {
-                    $1 = 0;
-                }
-            } else {
-                /* wrapped pair? */
-                std::pair<T,U >* p;
-                if (SWIG_ConvertPtr($input,(void **) &p,
-                                    $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        pair();
-        pair(T first, U second);
-        pair(const pair& p);
-
-        template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-        T first;
-        U second;
-    };
-    %enddef
-
-
-    specialize_std_pair_on_first(bool,SCHEME_BOOLP,
-                              SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_first(int,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_first(short,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_first(long,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_first(unsigned int,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_first(unsigned short,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_first(unsigned long,SCHEME_INTP,
-                              SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_first(double,SCHEME_REALP,
-                              scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_first(float,SCHEME_REALP,
-                              scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_first(std::string,SCHEME_STRINGP,
-                              swig_scm_to_string,swig_make_string);
-
-    specialize_std_pair_on_second(bool,SCHEME_BOOLP,
-                                SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_second(int,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_second(short,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_second(long,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_second(unsigned int,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_second(unsigned short,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_second(unsigned long,SCHEME_INTP,
-                                SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_second(double,SCHEME_REALP,
-                                scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_second(float,SCHEME_REALP,
-                                scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_second(std::string,SCHEME_STRINGP,
-                                swig_scm_to_string,swig_make_string);
-
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               bool,SCHEME_BOOLP,
-                               SCHEME_TRUEP,swig_make_boolean);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               unsigned int,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               unsigned short,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               unsigned long,SCHEME_INTP,
-                               SCHEME_INT_VAL,scheme_make_integer_value);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               double,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               float,SCHEME_REALP,
-                               scheme_real_to_double,scheme_make_double);
-    specialize_std_pair_on_both(std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string,
-                               std::string,SCHEME_STRINGP,
-                               swig_scm_to_string,swig_make_string);
-}
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/std_string.i b/dependencies2013/win32/swig/Lib/mzscheme/std_string.i
deleted file mode 100644
index b19e8567..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/std_string.i
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string types
- * ----------------------------------------------------------------------------- */
-
-// ------------------------------------------------------------------------
-// std::string is typemapped by value
-// This can prevent exporting methods which return a string
-// in order for the user to modify it.
-// However, I think I'll wait until someone asks for it...
-// ------------------------------------------------------------------------
-
-%include <exception.i>
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-    %naturalvar string;
-
-    class string;
-
-    /* Overloading check */
-
-    %typemap(typecheck) string = char *;
-    %typemap(typecheck) const string & = char *;
-
-    %typemap(in) string {
-        if (SCHEME_STRINGP($input))
-            $1.assign(SCHEME_STR_VAL($input));
-        else
-            SWIG_exception(SWIG_TypeError, "string expected");
-    }
-
-    %typemap(in) const string & ($*1_ltype temp) {
-        if (SCHEME_STRINGP($input)) {
-            temp.assign(SCHEME_STR_VAL($input));
-            $1 = &temp;
-        } else {
-            SWIG_exception(SWIG_TypeError, "string expected");
-        }
-    }
-
-    %typemap(out) string {
-        $result = scheme_make_string($1.c_str());
-    }
-
-    %typemap(out) const string & {
-        $result = scheme_make_string($1->c_str());
-    }
-
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/std_vector.i b/dependencies2013/win32/swig/Lib/mzscheme/std_vector.i
deleted file mode 100644
index 22e1fa96..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/std_vector.i
+++ /dev/null
@@ -1,433 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * SWIG typemaps for std::vector
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// MzScheme as much as possible, namely, to allow the user to pass and 
-// be returned MzScheme vectors or lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector<T>), f(const std::vector<T>&), f(const std::vector<T>*):
-//      the parameter being read-only, either a MzScheme sequence or a
-//      previously wrapped std::vector<T> can be passed.
-//   -- f(std::vector<T>&), f(std::vector<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector<T> f():
-//      the vector is returned by copy; therefore, a MzScheme vector of T:s 
-//      is returned which is most easily used in other MzScheme functions
-//   -- std::vector<T>& f(), std::vector<T>* f(), const std::vector<T>& f(),
-//      const std::vector<T>* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <vector>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-    
-    template<class T> class vector {
-        %typemap(in) vector<T> {
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                $1 = std::vector<T >(size);
-                Scheme_Object** items = SCHEME_VEC_ELS($input);
-                for (unsigned int i=0; i<size; i++) {
-                    (($1_type &)$1)[i] =
-                        *((T*) SWIG_MustGetPtr(items[i],
-                                               $descriptor(T *),
-                                               $argnum, 0));
-                }
-            } else if (SCHEME_NULLP($input)) {
-                $1 = std::vector<T >();
-            } else if (SCHEME_PAIRP($input)) {
-                Scheme_Object *head, *tail;
-                $1 = std::vector<T >();
-                tail = $input;
-                while (!SCHEME_NULLP(tail)) {
-                    head = scheme_car(tail);
-                    tail = scheme_cdr(tail);
-                    $1.push_back(*((T*)SWIG_MustGetPtr(head,
-                                                       $descriptor(T *),
-                                                       $argnum, 0)));
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp),
-                     const vector<T>* (std::vector<T> temp) {
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                temp = std::vector<T >(size);
-                $1 = &temp;
-                Scheme_Object** items = SCHEME_VEC_ELS($input);
-                for (unsigned int i=0; i<size; i++) {
-                    temp[i] = *((T*) SWIG_MustGetPtr(items[i],
-                                                     $descriptor(T *),
-                                                     $argnum, 0));
-                }
-            } else if (SCHEME_NULLP($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-            } else if (SCHEME_PAIRP($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-                Scheme_Object *head, *tail;
-                tail = $input;
-                while (!SCHEME_NULLP(tail)) {
-                    head = scheme_car(tail);
-                    tail = scheme_cdr(tail);
-                    temp.push_back(*((T*) SWIG_MustGetPtr(head,
-                                                          $descriptor(T *),
-                                                          $argnum, 0)));
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0);
-            }
-        }
-        %typemap(out) vector<T> {
-            $result = scheme_make_vector($1.size(),scheme_undefined);
-            Scheme_Object** els = SCHEME_VEC_ELS($result);
-            for (unsigned int i=0; i<$1.size(); i++) {
-                T* x = new T((($1_type &)$1)[i]);
-                els[i] = SWIG_NewPointerObj(x,$descriptor(T *), 1);
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            /* native sequence? */
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    Scheme_Object** items = SCHEME_VEC_ELS($input);
-                    if (SWIG_ConvertPtr(items[0],(void**) &x,
-                                    $descriptor(T *), 0) != -1)
-                        $1 = 1;
-                    else
-                        $1 = 0;
-                }
-            } else if (SCHEME_NULLP($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                /* check the first element only */
-                T* x;
-                Scheme_Object *head = scheme_car($input);
-                if (SWIG_ConvertPtr(head,(void**) &x,
-                                $descriptor(T *), 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $&1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            /* native sequence? */
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    Scheme_Object** items = SCHEME_VEC_ELS($input);
-                    if (SWIG_ConvertPtr(items[0],(void**) &x,
-                                    $descriptor(T *), 0) != -1)
-                        $1 = 1;
-                    else
-                        $1 = 0;
-                }
-            } else if (SCHEME_NULLP($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                /* check the first element only */
-                T* x;
-                Scheme_Object *head = scheme_car($input);
-                if (SWIG_ConvertPtr(head,(void**) &x,
-                                $descriptor(T *), 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $1_descriptor, 0) != -1)
-                    $1 = 1;
-                else
-                    $1 = 0;
-            }
-        }
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T>&);
-        %rename(length) size;
-        unsigned int size() const;
-        %rename("empty?") empty;
-        bool empty() const;
-        %rename("clear!") clear;
-        void clear();
-        %rename("set!") set;
-        %rename("pop!") pop;
-        %rename("push!") push_back;
-        void push_back(const T& x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T& ref(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const T& x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_vector(T,CHECK,CONVERT_FROM,CONVERT_TO)
-    template<> class vector<T> {
-        %typemap(in) vector<T> {
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                $1 = std::vector<T >(size);
-                Scheme_Object** items = SCHEME_VEC_ELS($input);
-                for (unsigned int i=0; i<size; i++) {
-                    Scheme_Object* o = items[i];
-                    if (CHECK(o))
-                        (($1_type &)$1)[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scheme_wrong_type(FUNC_NAME, "vector<" #T ">", 
-                                          $argnum - 1, argc, argv);
-                }
-            } else if (SCHEME_NULLP($input)) {
-                $1 = std::vector<T >();
-            } else if (SCHEME_PAIRP($input)) {
-                Scheme_Object *head, *tail;
-                $1 = std::vector<T >();
-                tail = $input;
-                while (!SCHEME_NULLP(tail)) {
-                    head = scheme_car(tail);
-                    tail = scheme_cdr(tail);
-                    if (CHECK(head))
-                        $1.push_back((T)(CONVERT_FROM(head)));
-                    else
-                        scheme_wrong_type(FUNC_NAME, "vector<" #T ">", 
-                                          $argnum - 1, argc, argv);
-                }
-            } else {
-                $1 = *(($&1_type)
-                       SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0));
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp),
-                     const vector<T>* (std::vector<T> temp) {
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                temp = std::vector<T >(size);
-                $1 = &temp;
-                Scheme_Object** items = SCHEME_VEC_ELS($input);
-                for (unsigned int i=0; i<size; i++) {
-                    Scheme_Object* o = items[i];
-                    if (CHECK(o))
-                        temp[i] = (T)(CONVERT_FROM(o));
-                    else
-                        scheme_wrong_type(FUNC_NAME, "vector<" #T ">", 
-                                          $argnum - 1, argc, argv);
-                }
-            } else if (SCHEME_NULLP($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-            } else if (SCHEME_PAIRP($input)) {
-                temp = std::vector<T >();
-                $1 = &temp;
-                Scheme_Object *head, *tail;
-                tail = $input;
-                while (!SCHEME_NULLP(tail)) {
-                    head = scheme_car(tail);
-                    tail = scheme_cdr(tail);
-                    if (CHECK(head))
-                        temp.push_back((T)(CONVERT_FROM(head)));
-                    else
-                        scheme_wrong_type(FUNC_NAME, "vector<" #T ">", 
-                                          $argnum - 1, argc, argv);
-                }
-            } else {
-                $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum - 1, 0);
-            }
-        }
-        %typemap(out) vector<T> {
-            $result = scheme_make_vector($1.size(),scheme_undefined);
-            Scheme_Object** els = SCHEME_VEC_ELS($result);
-            for (unsigned int i=0; i<$1.size(); i++)
-                els[i] = CONVERT_TO((($1_type &)$1)[i]);
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            /* native sequence? */
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    Scheme_Object** items = SCHEME_VEC_ELS($input);
-                    $1 = CHECK(items[0]) ? 1 : 0;
-                }
-            } else if (SCHEME_NULLP($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                /* check the first element only */
-                T* x;
-                Scheme_Object *head = scheme_car($input);
-                $1 = CHECK(head) ? 1 : 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                $1 = (SWIG_ConvertPtr($input,(void **) &v, 
-                                  $&1_descriptor, 0) != -1) ? 1 : 0;
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            /* native sequence? */
-            if (SCHEME_VECTORP($input)) {
-                unsigned int size = SCHEME_VEC_SIZE($input);
-                if (size == 0) {
-                    /* an empty sequence can be of any type */
-                    $1 = 1;
-                } else {
-                    /* check the first element only */
-                    T* x;
-                    Scheme_Object** items = SCHEME_VEC_ELS($input);
-                    $1 = CHECK(items[0]) ? 1 : 0;
-                }
-            } else if (SCHEME_NULLP($input)) {
-                /* again, an empty sequence can be of any type */
-                $1 = 1;
-            } else if (SCHEME_PAIRP($input)) {
-                /* check the first element only */
-                T* x;
-                Scheme_Object *head = scheme_car($input);
-                $1 = CHECK(head) ? 1 : 0;
-            } else {
-                /* wrapped vector? */
-                std::vector<T >* v;
-                $1 = (SWIG_ConvertPtr($input,(void **) &v, 
-                                  $1_descriptor, 0) != -1) ? 1 : 0;
-            }
-        }
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T>&);
-        %rename(length) size;
-        unsigned int size() const;
-        %rename("empty?") empty;
-        bool empty() const;
-        %rename("clear!") clear;
-        void clear();
-        %rename("set!") set;
-        %rename("pop!") pop;
-        %rename("push!") push_back;
-        void push_back(T x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T ref(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, T x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-    %enddef
-
-    specialize_std_vector(bool,SCHEME_BOOLP,SCHEME_TRUEP,\
-                          swig_make_boolean);
-    specialize_std_vector(char,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(int,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(short,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(long,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(unsigned char,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(unsigned int,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(unsigned short,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(unsigned long,SCHEME_INTP,SCHEME_INT_VAL,\
-                          scheme_make_integer_value);
-    specialize_std_vector(float,SCHEME_REALP,scheme_real_to_double,\
-                          scheme_make_double);
-    specialize_std_vector(double,SCHEME_REALP,scheme_real_to_double,\
-                          scheme_make_double);
-    specialize_std_vector(std::string,SCHEME_STRINGP,swig_scm_to_string,\
-                          swig_make_string);
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/stl.i b/dependencies2013/win32/swig/Lib/mzscheme/stl.i
deleted file mode 100644
index b19eae58..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/stl.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/mzscheme/typemaps.i b/dependencies2013/win32/swig/Lib/mzscheme/typemaps.i
deleted file mode 100644
index 9346349b..00000000
--- a/dependencies2013/win32/swig/Lib/mzscheme/typemaps.i
+++ /dev/null
@@ -1,367 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- * ----------------------------------------------------------------------------- */
-
-/* The MzScheme module handles all types uniformly via typemaps. Here
-   are the definitions.  */
-
-/* Pointers */
-
-%typemap(in) SWIGTYPE * {
-  $1 = ($ltype) SWIG_MustGetPtr($input, $descriptor, $argnum, 0);
-}
-
-%typemap(in) void * {
-  $1 = SWIG_MustGetPtr($input, NULL, $argnum, 0);
-}
-
-%typemap(varin) SWIGTYPE * {
-  $1 = ($ltype) SWIG_MustGetPtr($input, $descriptor, 1, 0);
-}
-
-%typemap(varin) SWIGTYPE & {
-  $1 = *(($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0));
-}
-
-%typemap(varin) SWIGTYPE && {
-  $1 = *(($1_ltype)SWIG_MustGetPtr($input, $descriptor, 1, 0));
-}
-
-%typemap(varin) SWIGTYPE [ANY] {
-  void *temp;
-  int ii;
-  $1_basetype *b = 0;
-  temp = SWIG_MustGetPtr($input, $1_descriptor, 1, 0);
-  b = ($1_basetype *) $1;
-  for (ii = 0; ii < $1_size; ii++) b[ii] = *(($1_basetype *) temp + ii);
-}
-  
-
-%typemap(varin) void * {
-  $1 = SWIG_MustGetPtr($input, NULL, 1, 0);
-}
-
-%typemap(out) SWIGTYPE * {
-  $result = SWIG_NewPointerObj ($1, $descriptor, $owner);
-}
-
-%typemap(out) SWIGTYPE *DYNAMIC {
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor,(void **) &$1);
-  $result = SWIG_NewPointerObj ($1, ty, $owner);
-}
-    
-%typemap(varout) SWIGTYPE *, SWIGTYPE [] {
-  $result = SWIG_NewPointerObj ($1, $descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE & {
-  $result = SWIG_NewPointerObj((void *) &$1, $1_descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE && {
-  $result = SWIG_NewPointerObj((void *) &$1, $1_descriptor, 0);
-}
-
-/* C++ References */
-
-#ifdef __cplusplus
-
-%typemap(in) SWIGTYPE &, SWIGTYPE && { 
-  $1 = ($ltype) SWIG_MustGetPtr($input, $descriptor, $argnum, 0);
-  if ($1 == NULL) scheme_signal_error("swig-type-error (null reference)");
-}
-
-%typemap(out) SWIGTYPE &, SWIGTYPE && {
-  $result = SWIG_NewPointerObj ($1, $descriptor, $owner);
-}
-
-%typemap(out) SWIGTYPE &DYNAMIC {
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor,(void **) &$1);
-  $result = SWIG_NewPointerObj ($1, ty, $owner);
-}
-
-#endif
-
-/* Arrays */
-
-%typemap(in) SWIGTYPE[] {
-  $1 = ($ltype) SWIG_MustGetPtr($input, $descriptor, $argnum, 0);
-}
-
-%typemap(out) SWIGTYPE[] {
-  $result = SWIG_NewPointerObj ($1, $descriptor, $owner);
-}
-
-/* Enums */
-%typemap(in) enum SWIGTYPE {
-  if (!SWIG_is_integer($input)) 
-      scheme_wrong_type(FUNC_NAME, "integer", $argnum - 1, argc, argv);
-  $1 = ($1_type) SWIG_convert_int($input);
-}
-
-%typemap(varin) enum SWIGTYPE {
-  if (!SWIG_is_integer($input)) 
-      scheme_wrong_type(FUNC_NAME, "integer", 0, argc, argv);
-  $1 = ($1_type) SWIG_convert_int($input);
-}
-
-%typemap(out) enum SWIGTYPE "$result = scheme_make_integer_value($1);";
-%typemap(varout) enum SWIGTYPE "$result = scheme_make_integer_value($1);";
-
-
-/* Pass-by-value */
-
-%typemap(in) SWIGTYPE($&1_ltype argp) {
-  argp = ($&1_ltype) SWIG_MustGetPtr($input, $&1_descriptor, $argnum, 0);
-  $1 = *argp;
-}
-
-%typemap(varin) SWIGTYPE {
-  $&1_ltype argp;
-  argp = ($&1_ltype) SWIG_MustGetPtr($input, $&1_descriptor, 1, 0);
-  $1 = *argp;
-}
-
-
-%typemap(out) SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  resultptr = new $1_ltype(($1_ltype &) $1);
-  $result =  SWIG_NewPointerObj (resultptr, $&1_descriptor, 1);
-} 
-#else
-{
-  $&1_ltype resultptr;
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  $result = SWIG_NewPointerObj(resultptr, $&1_descriptor, 1);
-}
-#endif
-
-%typemap(varout) SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  resultptr = new $1_ltype(($1_ltype &) $1);
-  $result =  SWIG_NewPointerObj (resultptr, $&1_descriptor, 0);
-} 
-#else
-{
-  $&1_ltype resultptr;
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  $result = SWIG_NewPointerObj(resultptr, $&1_descriptor, 0);
-}
-#endif
-
-/* The SIMPLE_MAP macro below defines the whole set of typemaps needed
-   for simple types. */
-
-%define SIMPLE_MAP(C_NAME, MZ_PREDICATE, MZ_TO_C, C_TO_MZ, MZ_NAME)
-%typemap(in) C_NAME {
-    if (!MZ_PREDICATE($input))
-	scheme_wrong_type(FUNC_NAME, #MZ_NAME, $argnum - 1, argc, argv);
-    $1 = MZ_TO_C($input);
-}
-%typemap(varin) C_NAME {
-    if (!MZ_PREDICATE($input))
-	scheme_wrong_type(FUNC_NAME, #MZ_NAME, 0, argc, argv);
-    $1 = MZ_TO_C($input);
-}
-%typemap(out) C_NAME {
-    $result = C_TO_MZ($1);
-}
-%typemap(varout) C_NAME {
-    $result = C_TO_MZ($1);
-}
-%typemap(in) C_NAME *INPUT (C_NAME temp) {
-    temp = (C_NAME) MZ_TO_C($input);
-    $1 = &temp;
-}
-%typemap(in,numinputs=0) C_NAME *OUTPUT (C_NAME temp) {
-    $1 = &temp;
-}
-%typemap(argout) C_NAME *OUTPUT {
-    Scheme_Object *s;
-    s = C_TO_MZ(*$1);
-    SWIG_APPEND_VALUE(s);
-}
-%typemap(in) C_NAME *BOTH = C_NAME *INPUT;
-%typemap(argout) C_NAME *BOTH = C_NAME *OUTPUT;
-%typemap(in) C_NAME *INOUT = C_NAME *INPUT;
-%typemap(argout) C_NAME *INOUT = C_NAME *OUTPUT;
-%enddef
-
-SIMPLE_MAP(bool, SCHEME_BOOLP, SCHEME_TRUEP,
-	   swig_make_boolean, boolean);
-SIMPLE_MAP(char, SCHEME_CHARP, SCHEME_CHAR_VAL,
-	   scheme_make_character, character);
-SIMPLE_MAP(unsigned char, SCHEME_CHARP, SCHEME_CHAR_VAL,
-	   scheme_make_character, character);
-SIMPLE_MAP(int, SWIG_is_integer, SWIG_convert_int,
-	   scheme_make_integer_value, integer);
-SIMPLE_MAP(short, SWIG_is_integer, SWIG_convert_short,
-	   scheme_make_integer_value, integer);
-SIMPLE_MAP(long, SWIG_is_integer, SWIG_convert_long,
-	   scheme_make_integer_value, integer);
-SIMPLE_MAP(ptrdiff_t, SWIG_is_integer, SWIG_convert_long,
-	   scheme_make_integer_value, integer);
-SIMPLE_MAP(unsigned int, SWIG_is_unsigned_integer, SWIG_convert_unsigned_int,
-	   scheme_make_integer_value_from_unsigned, integer);
-SIMPLE_MAP(unsigned short, SWIG_is_unsigned_integer, SWIG_convert_unsigned_short,
-	   scheme_make_integer_value_from_unsigned, integer);
-SIMPLE_MAP(unsigned long, SWIG_is_unsigned_integer, SWIG_convert_unsigned_long,
-	   scheme_make_integer_value_from_unsigned, integer);
-SIMPLE_MAP(size_t, SWIG_is_unsigned_integer, SWIG_convert_unsigned_long,
-	   scheme_make_integer_value_from_unsigned, integer);
-SIMPLE_MAP(float, SCHEME_REALP, scheme_real_to_double,
-	   scheme_make_double, real);
-SIMPLE_MAP(double, SCHEME_REALP, scheme_real_to_double,
-	   scheme_make_double, real);
-
-SIMPLE_MAP(char *, SCHEME_STRINGP, SCHEME_STR_VAL, 
-	   SCHEME_MAKE_STRING, string);
-SIMPLE_MAP(const char *, SCHEME_STRINGP, SCHEME_STR_VAL, 
-	   SCHEME_MAKE_STRING, string);
-
-/* For MzScheme 30x:  Use these typemaps if you are not going to use
-   UTF8 encodings in your C code. 
- SIMPLE_MAP(char *,SCHEME_BYTE_STRINGP, SCHEME_BYTE_STR_VAL,
- 	   scheme_make_byte_string_without_copying,bytestring);
- SIMPLE_MAP(const char *,SCHEME_BYTE_STRINGP, SCHEME_BYTE_STR_VAL,
- 	   scheme_make_byte_string_without_copying,bytestring);
-*/
-
-/* Const primitive references.  Passed by value */
-
-%define REF_MAP(C_NAME, MZ_PREDICATE, MZ_TO_C, C_TO_MZ, MZ_NAME)
-  %typemap(in) const C_NAME & (C_NAME temp) {
-     if (!MZ_PREDICATE($input))
-        scheme_wrong_type(FUNC_NAME, #MZ_NAME, $argnum - 1, argc, argv);
-     temp = MZ_TO_C($input);
-     $1 = &temp;
-  }
-  %typemap(out) const C_NAME & {
-    $result = C_TO_MZ(*$1);
-  }
-%enddef
-
-REF_MAP(bool, SCHEME_BOOLP, SCHEME_TRUEP,
-	   swig_make_boolean, boolean);
-REF_MAP(char, SCHEME_CHARP, SCHEME_CHAR_VAL,
-	   scheme_make_character, character);
-REF_MAP(unsigned char, SCHEME_CHARP, SCHEME_CHAR_VAL,
-	   scheme_make_character, character);
-REF_MAP(int, SWIG_is_integer, SWIG_convert_int,
-	   scheme_make_integer_value, integer);
-REF_MAP(short, SWIG_is_integer, SWIG_convert_short,
-	   scheme_make_integer_value, integer);
-REF_MAP(long, SWIG_is_integer, SWIG_convert_long,
-	   scheme_make_integer_value, integer);
-REF_MAP(unsigned int, SWIG_is_unsigned_integer, SWIG_convert_unsigned_int,
-	   scheme_make_integer_value_from_unsigned, integer);
-REF_MAP(unsigned short, SWIG_is_unsigned_integer, SWIG_convert_unsigned_short,
-	   scheme_make_integer_value_from_unsigned, integer);
-REF_MAP(unsigned long, SWIG_is_unsigned_integer, SWIG_convert_unsigned_long,
-	   scheme_make_integer_value_from_unsigned, integer);
-REF_MAP(float, SCHEME_REALP, scheme_real_to_double,
-	   scheme_make_double, real);
-REF_MAP(double, SCHEME_REALP, scheme_real_to_double,
-	   scheme_make_double, real);
-
-/* Void */
-
-%typemap(out) void "$result = scheme_void;";
-
-/* Pass through Scheme_Object * */
-
-%typemap (in) Scheme_Object * "$1=$input;";
-%typemap (out) Scheme_Object * "$result=$1;";
-%typecheck(SWIG_TYPECHECK_POINTER) Scheme_Object * "$1=1;";
-
-
-/* ------------------------------------------------------------
- * String & length
- * ------------------------------------------------------------ */
-
-//%typemap(in) (char *STRING, int LENGTH) {
-//    int temp;
-//    $1 = ($1_ltype) SWIG_Guile_scm2newstr($input, &temp);
-//    $2 = ($2_ltype) temp;
-//}
-
-
-/* ------------------------------------------------------------
- * Typechecking rules
- * ------------------------------------------------------------ */
-
-%typecheck(SWIG_TYPECHECK_INTEGER)
-	 int, short, long,
- 	 unsigned int, unsigned short, unsigned long,
-	 signed char, unsigned char,
-	 long long, unsigned long long,
-	 const int &, const short &, const long &,
- 	 const unsigned int &, const unsigned short &, const unsigned long &,
-	 const long long &, const unsigned long long &,
-	 enum SWIGTYPE
-{
-  $1 = (SWIG_is_integer($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_BOOL) bool, bool &, const bool &
-{
-  $1 = (SCHEME_BOOLP($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_DOUBLE)
-	float, double,
-	const float &, const double &
-{
-  $1 = (SCHEME_REALP($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_STRING) char {
-  $1 = (SCHEME_STRINGP($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_STRING) char * {
-  $1 = (SCHEME_STRINGP($input)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  void *ptr;
-  if (SWIG_ConvertPtr($input, (void **) &ptr, $1_descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE {
-  void *ptr;
-  if (SWIG_ConvertPtr($input, (void **) &ptr, $&1_descriptor, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void * {
-  void *ptr;
-  if (SWIG_ConvertPtr($input, (void **) &ptr, 0, 0)) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/carray.i b/dependencies2013/win32/swig/Lib/ocaml/carray.i
deleted file mode 100644
index bbf1ddd5..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/carray.i
+++ /dev/null
@@ -1,136 +0,0 @@
-%insert(mli) %{
-type _value = c_obj
-%}
-
-%insert(ml) %{
-type _value = c_obj
-%}
-
-%define %array_tmap_out(type,what,out_f)
-%typemap(type) what [ANY] {
-    int i;
-    /* $*1_type */
-    $result = caml_array_new($1_dim0);
-    for( i = 0; i < $1_dim0; i++ ) {
-	caml_array_set($result,i,out_f($1[i]));
-    }
-}
-%enddef
-
-%define %array_tmap_in(type,what,in_f)
-%typemap(type) what [ANY] {
-    int i;
-    /* $*1_type */
-    $1 = ($*1_type *)malloc( $1_size );
-    for( i = 0; i < $1_dim0 && i < caml_array_len($input); i++ ) {
-	$1[i] = in_f(caml_array_nth($input,i));
-    }
-}
-
-%typemap(free) what [ANY] {
-    free( (void *)$1 );
-}
-%enddef
-
-%define %make_simple_array_typemap(type,out_f,in_f)
-%array_tmap_out(out,type,out_f);
-%array_tmap_out(varout,type,out_f);
-%array_tmap_out(directorin,type,out_f);
-
-%array_tmap_in(in,type,in_f);
-%array_tmap_in(varin,type,in_f);
-%array_tmap_in(directorout,type,in_f);
-%enddef
-
-%make_simple_array_typemap(bool,caml_val_bool,caml_long_val);
-%make_simple_array_typemap(short,caml_val_short,caml_long_val);
-%make_simple_array_typemap(unsigned short,caml_val_ushort,caml_long_val);
-%make_simple_array_typemap(int,caml_val_int,caml_long_val);
-%make_simple_array_typemap(unsigned int,caml_val_uint,caml_long_val);
-%make_simple_array_typemap(long,caml_val_long,caml_long_val);
-%make_simple_array_typemap(unsigned long,caml_val_ulong,caml_long_val);
-%make_simple_array_typemap(size_t,caml_val_int,caml_long_val);
-%make_simple_array_typemap(float,caml_val_float,caml_double_val);
-%make_simple_array_typemap(double,caml_val_double,caml_double_val);
-
-#ifdef __cplusplus
-%typemap(in) SWIGTYPE [] {
-    int i;
-
-    /* $*1_type */
-    $1 = new $*1_type [$1_dim0];
-    for( i = 0; i < $1_dim0 && i < caml_array_len($input); i++ ) {
-	$1[i] = *(($*1_ltype *) 
-		caml_ptr_val(caml_array_nth($input,i),
-			     $*1_descriptor)) ;
-    }
-}
-#else
-%typemap(in) SWIGTYPE [] {
-    int i;
-
-    /* $*1_type */
-    $1 = ($*1_type *)malloc( $1_size );
-    for( i = 0; i < $1_dim0 && i < caml_array_len($input); i++ ) {
-	$1[i] = *(($*1_ltype)
-		caml_ptr_val(caml_array_nth($input),
-			     $*1_descriptor));
-    }
-}
-#endif
-
-%typemap(out) SWIGTYPE [] {
-    int i;
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    $result = caml_array_new($1_dim0);
-
-    for( i = 0; i < $1_dim0; i++ ) {
-	if( fromval ) {
-	    caml_array_set 
-		($result,
-		 i,
-		 callback(*fromval,caml_val_ptr((void *)&$1[i],$*1_descriptor)));
-	} else {
-	    caml_array_set
-		($result,
-		 i,
-		 caml_val_ptr ((void *)&$1[i],$&1_descriptor));
-	}
-    }
-}
-
-%typemap(in) enum SWIGTYPE [] {
-    int i;
-
-    /* $*1_type */
-    $1 = ($*1_type *)malloc( $1_size );
-    for( i = 0; i < $1_dim0 && i < caml_array_len($input); i++ ) {
-	$1[i] = ($type)
-		caml_long_val_full(caml_array_nth($input),
-			           "$type_marker");
-    }
-}
-
-%typemap(out) enum SWIGTYPE [] {
-    int i;
-    $result = caml_array_new($1_dim0);
-
-    for( i = 0; i < $1_dim0; i++ ) {
-	    caml_array_set 
-		($result,
-		 i,
-		 callback2(*caml_named_value(SWIG_MODULE "_int_to_enum"),
-			   *caml_named_value("$type_marker"),
-			   Val_int($1[i])));
-    }
-}
-
-#ifdef __cplusplus
-%typemap(freearg) SWIGTYPE [ANY] {
-    delete [] $1;
-}
-#else
-%typemap(freearg) SWIGTYPE [ANY] {
-    free( (void *)$1 );
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ocaml/class.swg b/dependencies2013/win32/swig/Lib/ocaml/class.swg
deleted file mode 100644
index 0ee304ca..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/class.swg
+++ /dev/null
@@ -1,66 +0,0 @@
-(*Stream:class_ctors*)
-let create_$classname_from_ptr raw_ptr =
-  C_obj 
-begin
-  let h = Hashtbl.create 20 in
-    List.iter (fun (nm,fn) -> Hashtbl.replace h nm fn) 
-	[ "nop", (fun args -> C_void) ;
-	  $classbody 
-	 "&", (fun args -> raw_ptr) ;
-       ":parents",
-       (fun args ->
-          C_list
-	  (let out = ref [] in 
-	    Hashtbl.iter (fun x y -> out := (x,y) :: !out) h ;
-          (List.map	
-	     (fun (x,y) ->
-		C_string (String.sub x 2 ((String.length x) - 2)))
-	     (List.filter
-		(fun (x,y) ->
-		   ((String.length x) > 2)
-		   && x.[0] == ':' && x.[1] == ':') !out)))) ;
-       ":classof", (fun args -> C_string "$realname") ;
-       ":methods", (fun args -> 
-	  C_list (let out = ref [] in 
-	    Hashtbl.iter (fun x y -> out := (C_string x) :: !out) h ; !out))
-	] ; 
-	let rec invoke_inner raw_ptr mth arg = 
-	begin
-	  try
-	    let application = Hashtbl.find h mth in
-	      application
-		(match arg with 
-		     C_list l -> (C_list (raw_ptr :: l)) 
-		   | C_void -> (C_list [ raw_ptr ])
-		   | v -> (C_list [ raw_ptr ; v ]))
-	  with Not_found -> 
-		(* Try parent classes *)
-		begin
-		  let parent_classes = [
-		    $baselist
-		  ] in
-		  let rec try_parent plist raw_ptr =
-		    match plist with
-			p :: tl -> 
-			  begin
-			    try
-			      (invoke (p raw_ptr)) mth arg
-			    with (BadMethodName (p,m,s)) -> 
-			      try_parent tl raw_ptr
-			  end
-		      | [] ->
-			  raise (BadMethodName (raw_ptr,mth,"$realname"))
-		  in try_parent parent_classes raw_ptr
-		end
-	end in
-	  (fun mth arg -> invoke_inner raw_ptr mth arg)
-end
-
-let _ = Callback.register 
-          "create_$normalized_from_ptr"
-          create_$classname_from_ptr
-
-
-(*Stream:mli*)
-val create_$classname_from_ptr : c_obj -> c_obj
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/cstring.i b/dependencies2013/win32/swig/Lib/ocaml/cstring.i
deleted file mode 100644
index 0d6aa4b6..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/cstring.i
+++ /dev/null
@@ -1,268 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cstring.i
- *
- * This file provides typemaps and macros for dealing with various forms
- * of C character string handling.   The primary use of this module
- * is in returning character data that has been allocated or changed in
- * some way.
- * ----------------------------------------------------------------------------- */
-
-/* %cstring_input_binary(TYPEMAP, SIZE)
- * 
- * Macro makes a function accept binary string data along with
- * a size.
- */
-
-%define %cstring_input_binary(TYPEMAP, SIZE)
-%apply (char *STRING, int LENGTH) { (TYPEMAP, SIZE) };
-%enddef
-
-/*
- * %cstring_bounded_output(TYPEMAP, MAX)
- *
- * This macro is used to return a NULL-terminated output string of
- * some maximum length.  For example:
- *
- *     %cstring_bounded_output(char *outx, 512);
- *     void foo(char *outx) {
- *         sprintf(outx,"blah blah\n");
- *     }
- *
- */
-
-%define %cstring_bounded_output(TYPEMAP,MAX)
-%typemap(ignore) TYPEMAP(char temp[MAX+1]) {
-    $1 = ($1_ltype) temp;
-}
-%typemap(argout) TYPEMAP {
-    $1[MAX] = 0;
-    $result = caml_list_append($result,caml_val_string(str));
-}
-%enddef
-
-/*
- * %cstring_chunk_output(TYPEMAP, SIZE)
- *
- * This macro is used to return a chunk of binary string data.
- * Embedded NULLs are okay.  For example:
- *
- *     %cstring_chunk_output(char *outx, 512);
- *     void foo(char *outx) {
- *         memmove(outx, somedata, 512);
- *     }
- *
- */
-
-%define %cstring_chunk_output(TYPEMAP,SIZE)
-%typemap(ignore) TYPEMAP(char temp[SIZE]) {
-    $1 = ($1_ltype) temp;
-}
-%typemap(argout) TYPEMAP {
-    $result = caml_list_append($result,caml_val_string_len($1,SIZE));
-}
-%enddef
-
-/*
- * %cstring_bounded_mutable(TYPEMAP, SIZE)
- *
- * This macro is used to wrap a string that's going to mutate.
- *
- *     %cstring_bounded_mutable(char *in, 512);
- *     void foo(in *x) {
- *         while (*x) {
- *            *x = toupper(*x);
- *            x++;
- *         }
- *     }
- *
- */
-
-
-%define %cstring_bounded_mutable(TYPEMAP,MAX)
-%typemap(in) TYPEMAP(char temp[MAX+1]) {
-    char *t = (char *)caml_ptr_val($input);
-    strncpy(temp,t,MAX);
-    $1 = ($1_ltype) temp;
-}
-%typemap(argout) TYPEMAP {
-    $result = caml_list_append($result,caml_val_string_len($1,MAX));
-}
-%enddef
-
-/*
- * %cstring_mutable(TYPEMAP [, expansion])
- *
- * This macro is used to wrap a string that will mutate in place.
- * It may change size up to a user-defined expansion. 
- *
- *     %cstring_mutable(char *in);
- *     void foo(in *x) {
- *         while (*x) {
- *            *x = toupper(*x);
- *            x++;
- *         }
- *     }
- *
- */
-
-%define %cstring_mutable(TYPEMAP,...)
-%typemap(in) TYPEMAP {
-   char *t = String_val($input);
-   int   n = string_length($input);
-   $1 = ($1_ltype) t;
-#if #__VA_ARGS__ == ""
-#ifdef __cplusplus
-   $1 = ($1_ltype) new char[n+1];
-#else
-   $1 = ($1_ltype) malloc(n+1);
-#endif
-#else
-#ifdef __cplusplus
-   $1 = ($1_ltype) new char[n+1+__VA_ARGS__];
-#else
-   $1 = ($1_ltype) malloc(n+1+__VA_ARGS__);
-#endif
-#endif
-   memmove($1,t,n);
-   $1[n] = 0;
-}
-
-%typemap(argout) TYPEMAP {
-    $result = caml_list_append($result,caml_val_string($1));
-#ifdef __cplusplus
-   delete[] $1;
-#else
-   free($1);
-#endif
-}
-%enddef
-
-/*
- * %cstring_output_maxsize(TYPEMAP, SIZE)
- *
- * This macro returns data in a string of some user-defined size.
- *
- *     %cstring_output_maxsize(char *outx, int max) {
- *     void foo(char *outx, int max) {
- *         sprintf(outx,"blah blah\n");
- *     }
- */
-
-%define %cstring_output_maxsize(TYPEMAP, SIZE)
-%typemap(in) (TYPEMAP, SIZE) {
-   $2 = caml_val_long($input);
-#ifdef __cplusplus
-   $1 = ($1_ltype) new char[$2+1];
-#else
-   $1 = ($1_ltype) malloc($2+1);
-#endif
-}
-%typemap(argout) (TYPEMAP,SIZE) {
-    $result = caml_list_append($result,caml_val_string($1));
-#ifdef __cplusplus
-   delete [] $1;
-#else
-   free($1);
-#endif
-}
-%enddef
-
-/*
- * %cstring_output_withsize(TYPEMAP, SIZE)
- *
- * This macro is used to return character data along with a size
- * parameter.
- *
- *     %cstring_output_maxsize(char *outx, int *max) {
- *     void foo(char *outx, int *max) {
- *         sprintf(outx,"blah blah\n");
- *         *max = strlen(outx);  
- *     }
- */
-
-%define %cstring_output_withsize(TYPEMAP, SIZE)
-%typemap(in) (TYPEMAP, SIZE) {
-   int n = caml_val_long($input);
-#ifdef __cplusplus
-   $1 = ($1_ltype) new char[n+1];
-   $2 = ($2_ltype) new $*1_ltype;
-#else
-   $1 = ($1_ltype) malloc(n+1);
-   $2 = ($2_ltype) malloc(sizeof($*1_ltype));
-#endif
-   *$2 = n;
-}
-%typemap(argout) (TYPEMAP,SIZE) {
-    $result = caml_list_append($result,caml_val_string_len($1,$2));
-#ifdef __cplusplus
-   delete [] $1;
-   delete $2;
-#else
-   free($1);
-   free($2);
-#endif
-}
-%enddef
-
-/*
- * %cstring_output_allocate(TYPEMAP, RELEASE)
- *
- * This macro is used to return character data that was
- * allocated with new or malloc.
- *
- *     %cstring_output_allocated(char **outx, free($1));
- *     void foo(char **outx) {
- *         *outx = (char *) malloc(512);
- *         sprintf(outx,"blah blah\n");
- *     }
- */
-
-%define %cstring_output_allocate(TYPEMAP, RELEASE)
-%typemap(ignore) TYPEMAP($*1_ltype temp = 0) {
-   $1 = &temp;
-}
-
-%typemap(argout) TYPEMAP {
-    if (*$1) {
-	$result = caml_list_append($result,caml_val_string($1));
-	RELEASE;
-    } else {
-	$result = caml_list_append($result,caml_val_ptr($1));
-    }
-}
-%enddef
-
-/*
- * %cstring_output_allocate_size(TYPEMAP, SIZE, RELEASE)
- *
- * This macro is used to return character data that was
- * allocated with new or malloc.
- *
- *     %cstring_output_allocated(char **outx, int *sz, free($1));
- *     void foo(char **outx, int *sz) {
- *         *outx = (char *) malloc(512);
- *         sprintf(outx,"blah blah\n");
- *         *sz = strlen(outx);
- *     }
- */
-
-%define %cstring_output_allocate_size(TYPEMAP, SIZE, RELEASE)
-%typemap(ignore) (TYPEMAP, SIZE) ($*1_ltype temp = 0, $*2_ltype tempn) {
-   $1 = &temp;
-   $2 = &tempn;
-}
-
-%typemap(argout)(TYPEMAP,SIZE) {
-    if (*$1) {
-	$result = caml_list_append($result,caml_val_string_len($1,$2));
-	RELEASE;
-    } else 
-	$result = caml_list_append($result,caml_val_ptr($1));
-}
-%enddef
-
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/director.swg b/dependencies2013/win32/swig/Lib/ocaml/director.swg
deleted file mode 100644
index 158cbfee..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/director.swg
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that Ocaml proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#include <string>
-#include <exception>
-
-# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
-
-namespace Swig {
-  /* base class for director exceptions */
-  class DirectorException : public std::exception {
-    protected:
-      std::string swig_msg;
-
-    public:
-      DirectorException(const char *msg="") : swig_msg(msg) {
-      }
-
-      virtual ~DirectorException() throw() {
-      }
-
-      const char *what() const throw() {
-        return swig_msg.c_str();
-      }
-  };
-
-  /* type mismatch in the return value from a Ocaml method call */
-  class DirectorTypeMismatchException : public DirectorException {
-    public:
-      DirectorTypeMismatchException(const char *msg="") : DirectorException(msg) {
-      }
-  };
-
-  /* any Ocaml exception that occurs during a director method call */
-  class DirectorMethodException : public DirectorException {};
-
-  /* attempt to call a pure virtual method via a director method */
-  class DirectorPureVirtualException : public DirectorException {
-    public:
-      DirectorPureVirtualException(const char *msg="") : DirectorException(msg) {
-      }
-
-      static void raise(const char *msg) {
-        throw DirectorPureVirtualException(msg);
-      }
-  };
-
-  /* simple thread abstraction for pthreads on win32 */
-#ifdef __THREAD__
-#define __PTHREAD__
-#if defined(_WIN32) || defined(__WIN32__)
-#define pthread_mutex_lock EnterCriticalSection
-#define pthread_mutex_unlock LeaveCriticalSection
-#define pthread_mutex_t CRITICAL_SECTION
-#define MUTEX_INIT(var) CRITICAL_SECTION var
-#else
-#include <pthread.h>
-#define MUTEX_INIT(var) pthread_mutex_t var = PTHREAD_MUTEX_INITIALIZER
-#endif
-#endif
-
-  /* director base class */
-  class Director {
-    private:
-      /* pointer to the wrapped ocaml object */
-      CAML_VALUE swig_self;
-      /* flag indicating whether the object is owned by ocaml or c++ */
-      mutable bool swig_disown_flag;
-
-    public:
-      /* wrap a ocaml object. */
-      Director(CAML_VALUE self) : swig_self(self), swig_disown_flag(false) {
-        register_global_root(&swig_self);
-      }
-
-      /* discard our reference at destruction */
-      virtual ~Director() {
-        remove_global_root(&swig_self);
-        swig_disown();
-        // Disown is safe here because we're just divorcing a reference that points to us.
-      }
-
-      /* return a pointer to the wrapped ocaml object */
-      CAML_VALUE swig_get_self() const {
-	  return swig_self;
-      }
-
-      /* acquire ownership of the wrapped ocaml object (the sense of "disown" is from ocaml) */
-      void swig_disown() const {
-        if (!swig_disown_flag) {
-          swig_disown_flag=true;
-          callback(*caml_named_value("caml_obj_disown"),swig_self);
-        }
-      }
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/extra-install.list b/dependencies2013/win32/swig/Lib/ocaml/extra-install.list
deleted file mode 100644
index a63c7fc2..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/extra-install.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# see top-level Makefile.in
-# libswigocaml is not needed anymore.
-swigp4.ml
-swig.mli
-swig.ml
diff --git a/dependencies2013/win32/swig/Lib/ocaml/libswigocaml.h b/dependencies2013/win32/swig/Lib/ocaml/libswigocaml.h
deleted file mode 100644
index e752540f..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/libswigocaml.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Ocaml runtime support */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    typedef int oc_bool;
-    extern void *nullptr;
-    
-    extern oc_bool isnull( void *v );
-    
-    extern void *get_char_ptr( char *str );
-    extern void *make_ptr_array( int size );
-    extern void *get_ptr( void *arrayptr, int elt );
-    extern void set_ptr( void *arrayptr, int elt, void *elt_v );
-    extern void *offset_ptr( void *ptr, int n );
-
-#ifdef __cplusplus
-};
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ocaml/ocaml.i b/dependencies2013/win32/swig/Lib/ocaml/ocaml.i
deleted file mode 100644
index e099f7c1..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/ocaml.i
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ocaml.i
- *
- * SWIG Configuration File for Ocaml
- * ----------------------------------------------------------------------------- */
-
-%runtime %{
-#define SWIGSTATIC static
-%}
-
-/* Insert common stuff */
-%insert(runtime) "swigrun.swg"
-
-/* Include headers */
-%insert(runtime) "ocamldec.swg"
-
-/* Type registration */
-%insert(init) "swiginit.swg"
-%insert(init) "typeregister.swg"
-
-%insert(mlitail) %{
-  val swig_val : c_enum_type -> c_obj -> Swig.c_obj
-%}
-
-%insert(mltail) %{
-  let rec swig_val t v = 
-    match v with
-        C_enum e -> enum_to_int t v
-      | C_list l -> Swig.C_list (List.map (swig_val t) l)
-      | C_array a -> Swig.C_array (Array.map (swig_val t) a)
-      | _ -> Obj.magic v
-%}
-
-/*#ifndef SWIG_NOINCLUDE*/
-%insert(runtime) "ocaml.swg"
-/*#endif*/
-
-%insert(classtemplate) "class.swg"
-
-/* Definitions */
-#define SWIG_malloc(size) swig_malloc(size, FUNC_NAME)
-#define SWIG_free(mem) free(mem)
-
-/* Read in standard typemaps. */
-%include <swig.swg>
-%include <typemaps.i>
-%include <typecheck.i>
-%include <exception.i>
-%include <preamble.swg>
-
-/* ocaml keywords */
-/* There's no need to use this, because of my rewriting machinery.  C++
- * words never collide with ocaml keywords */
-
-/* still we include the file, but the warning says that the offending
-   name will be properly renamed. Just to let the user to know about
-   it. */
-%include <ocamlkw.swg>
diff --git a/dependencies2013/win32/swig/Lib/ocaml/ocaml.swg b/dependencies2013/win32/swig/Lib/ocaml/ocaml.swg
deleted file mode 100644
index a00252b2..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/ocaml.swg
+++ /dev/null
@@ -1,602 +0,0 @@
-/* -*-c-*- */
-
-/* SWIG pointer structure */
-
-#include <string.h>
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define C_bool 0
-#define C_char 1
-#define C_uchar 2
-#define C_short 3
-#define C_ushort 4
-#define C_int 5
-#define C_uint 6
-#define C_int32 7
-#define C_int64 8
-#define C_float 9
-#define C_double 10
-#define C_ptr 11
-#define C_array 12
-#define C_list 13
-#define C_obj 14
-#define C_string 15
-#define C_enum 16
-#define C_director_core 17
-
-
-/* Cast a pointer if possible; returns 1 if successful */
-    
-    SWIGSTATIC int
-    SWIG_Cast (void *source, swig_type_info *source_type,
-	       void **ptr, swig_type_info *dest_type)
-    {
-	if( !source ) { // Special case for NULL.  This is a popular question
-	    // for other modules on the list, so I want an easy way out...
-	    *ptr = 0;
-	    return 0;
-	}
-
-#ifdef TYPE_CAST_VERBOSE
-	fprintf( stderr, "Trying to cast %s to %s\n", 
-		 source_type ? source_type->str : "<none>",
-		 dest_type ? dest_type->str : "<none>" );
-#endif
-	if (dest_type != source_type) {
-	    /* We have a type mismatch.  Will have to look through our type
-	       mapping table to figure out whether or not we can accept this
-	       datatype. 
-	       --
-	       Ignore typechecks for void *.  Allow any conversion. */
-	    if( !dest_type || !source_type || 
-		!strcmp(dest_type->name,"_p_void") ||
-		!strcmp(source_type->name,"_p_void") ) {
-		*ptr = source;
-		return 0;
-	    } else {
-		swig_cast_info *tc = 
-		    SWIG_TypeCheckStruct(source_type, dest_type );
-#ifdef TYPE_CAST_VERBOSE
-		fprintf( stderr, "Typecheck -> %s\n",
-			 tc ? tc->str : "<none>" );
-#endif
-		if( tc ) {
-		    int newmemory = 0;
-		    *ptr = SWIG_TypeCast(tc, source, &newmemory);
-		    assert(!newmemory); /* newmemory handling not yet implemented */
-		    return 0;
-		} else
-		    return -1;
-	    }
-	} else {
-	    *ptr = source;
-	    return 0;
-	}
-    }
-
-/* Return 0 if successful. */
-    SWIGSTATIC int
-    SWIG_GetPtr(void *inptr, void **outptr, 
-		swig_type_info *intype, swig_type_info *outtype) {
-	if (intype) {
-	    return SWIG_Cast(inptr, intype,
-			     outptr, outtype) == -1;
-	} else {
-	    *outptr = inptr;
-	    return 0;
-	}
-    }
-
-    SWIGSTATIC void caml_print_list( CAML_VALUE v );
-
-    SWIGSTATIC void caml_print_val( CAML_VALUE v ) {
-	switch( SWIG_Tag_val(v) ) {
-	case C_bool:
-	    if( Bool_val(SWIG_Field(v,0)) ) fprintf( stderr, "true " );
-	    else fprintf( stderr, "false " );
-	    break;
-	case C_char:
-	case C_uchar:
-	    fprintf( stderr, "'%c' (\\%03d) ", 
-		     (Int_val(SWIG_Field(v,0)) >= ' ' &&
-		      Int_val(SWIG_Field(v,0)) < 127) ? Int_val(SWIG_Field(v,0)) : '.',
-		     Int_val(SWIG_Field(v,0)) );
-	    break;
-	case C_short:
-	case C_ushort:
-	case C_int:
-	    fprintf( stderr, "%d ", (int)caml_long_val(v) );
-	    break;
-
-	case C_uint:
-	case C_int32:
-	    fprintf( stderr, "%ud ", (unsigned int)caml_long_val(v) );
-	    break;
-	case C_int64:
-	    fprintf( stderr, "%ld ", caml_long_val(v) );
-	    break;
-	case C_float:
-	case C_double:
-	    fprintf( stderr, "%f ", caml_double_val(v) );
-	    break;
-
-	case C_ptr:
-	{
-	    void *vout = 0;
-	    swig_type_info *ty = (swig_type_info *)(long)SWIG_Int64_val(SWIG_Field(v,1));
-	    caml_ptr_val_internal(v,&vout,0);
-	    fprintf( stderr, "PTR(%p,%s) ", 
-		     vout,
-		     ty ? ty->name : "(null)" );
-	}
-	break;
-	case C_array:
-	{
-	    unsigned int i;
-	    for( i = 0; i < Wosize_val( SWIG_Field(v,0) ); i++ ) 
-		caml_print_val( SWIG_Field(SWIG_Field(v,0),i) );
-	}
-	break;
-	case C_list:
-	    caml_print_list( SWIG_Field(v,0) );
-	    break;
-	case C_obj:
-	    fprintf( stderr, "OBJ(%p) ", (void *)SWIG_Field(v,0) );
-	    break;
-	case C_string:
-	{
-	    void *cout;
-	    caml_ptr_val_internal(v,&cout,0);
-	    fprintf( stderr, "'%s' ", (char *)cout );
-	} 
-	break;
-	}
-    }
-
-    SWIGSTATIC void caml_print_list( CAML_VALUE v ) {
-	CAMLparam1(v);
-	while( v && Is_block(v) ) {
-	    fprintf( stderr, "[ " );
-	    caml_print_val( SWIG_Field(v,0) );
-	    fprintf( stderr, "]\n" );
-	    v = SWIG_Field(v,1);
-	}
-	CAMLreturn0;
-    }
-
-    SWIGSTATIC CAML_VALUE caml_list_nth( CAML_VALUE lst, int n ) {
-	CAMLparam1(lst);
-	int i = 0;
-	while( i < n && lst && Is_block(lst) ) {
-	    i++; lst = SWIG_Field(lst,1);
-	}
-	if( lst == Val_unit ) CAMLreturn(Val_unit);
-	else CAMLreturn(SWIG_Field(lst,0));
-    }
-    
-    SWIGSTATIC CAML_VALUE caml_list_append( CAML_VALUE lst, CAML_VALUE elt ) {
-	CAMLparam2(lst,elt);
-	SWIG_CAMLlocal3(v,vt,lh);
-	lh = Val_unit;
-	v = Val_unit;
-
-	/* Appending C_void should have no effect */
-	if( !Is_block(elt) ) return lst;
-
-	while( lst && Is_block(lst) ) {
-	    if( v && v != Val_unit ) {
-		vt = alloc_tuple(2);
-		SWIG_Store_field(v,1,vt);
-		v = vt;
-	    } else {
-		v = lh = alloc_tuple(2);
-	    }
-	    SWIG_Store_field(v,0,SWIG_Field(lst,0));
-	    lst = SWIG_Field(lst,1);
-	}
-
-	if( v && Is_block(v) ) {
-	    vt = alloc_tuple(2);
-	    SWIG_Store_field(v,1,vt);
-	    v = vt;
-	} else {
-	    v = lh = alloc_tuple(2);
-	}
-	SWIG_Store_field(v,0,elt);
-	SWIG_Store_field(v,1,Val_unit);
-
-	CAMLreturn(lh);
-    }
-
-    SWIGSTATIC int caml_list_length( CAML_VALUE lst ) {
-	CAMLparam1(lst);
-	int i = 0;
-	while( lst && Is_block(lst) ) { i++; lst = SWIG_Field(lst,1); }
-	CAMLreturn(i);
-    }
-
-    SWIGSTATIC void caml_array_set( CAML_VALUE arr, int n, CAML_VALUE item ) {
-	CAMLparam2(arr,item);
-	SWIG_Store_field(SWIG_Field(arr,0),n,item);
-	CAMLreturn0;
-    }
-
-    SWIGSTATIC value caml_array_nth( CAML_VALUE arr, int n ) {
-	CAMLparam1(arr);
-	if( SWIG_Tag_val(arr) == C_array )
-	    CAMLreturn(SWIG_Field(SWIG_Field(arr,0),n));
-	else if( SWIG_Tag_val(arr) == C_list )
-	    CAMLreturn(caml_list_nth(arr,0));
-	else
-	    failwith("Need array or list");
-    }
-
-    SWIGSTATIC int caml_array_len( CAML_VALUE arr ) {
-	CAMLparam1(arr);
-	if( SWIG_Tag_val(arr) == C_array )
-	    CAMLreturn(Wosize_val(SWIG_Field(arr,0)));
-	else if( SWIG_Tag_val(arr) == C_list )
-	    CAMLreturn(caml_list_length(arr));
-	else
-	    failwith("Need array or list");
-    }
-
-    SWIGSTATIC CAML_VALUE caml_swig_alloc(int x,int y) {
-	return caml_alloc(x,y);
-    }
-
-    SWIGSTATIC value caml_array_new( int n ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(vv);
-	vv = caml_swig_alloc(1,C_array);
-	SWIG_Store_field(vv,0,alloc_tuple(n));
-	CAMLreturn(vv);
-    }
-    
-    SWIGSTATIC CAML_VALUE caml_val_bool( int b ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(bv);
-	bv = caml_swig_alloc(1,C_bool);
-	SWIG_Store_field(bv,0,Val_bool(b));
-	CAMLreturn(bv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_char( char c ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(cv);
-	cv = caml_swig_alloc(1,C_char);
-	SWIG_Store_field(cv,0,Val_int(c));
-	CAMLreturn(cv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_uchar( unsigned char uc ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(ucv);
-	ucv = caml_swig_alloc(1,C_uchar);
-	SWIG_Store_field(ucv,0,Val_int(uc));
-	CAMLreturn(ucv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_short( short s ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(sv);
-	sv = caml_swig_alloc(1,C_short);
-	SWIG_Store_field(sv,0,Val_int(s));
-	CAMLreturn(sv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_ushort( unsigned short us ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(usv);
-	usv = caml_swig_alloc(1,C_ushort);
-	SWIG_Store_field(usv,0,Val_int(us));
-	CAMLreturn(usv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_int( int i ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(iv);
-	iv = caml_swig_alloc(1,C_int);
-	SWIG_Store_field(iv,0,Val_int(i));
-	CAMLreturn(iv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_uint( unsigned int ui ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(uiv);
-	uiv = caml_swig_alloc(1,C_int);
-	SWIG_Store_field(uiv,0,Val_int(ui));
-	CAMLreturn(uiv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_long( long l ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(lv);
-	lv = caml_swig_alloc(1,C_int64);
-	SWIG_Store_field(lv,0,copy_int64(l));
-	CAMLreturn(lv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_ulong( unsigned long ul ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(ulv);
-	ulv = caml_swig_alloc(1,C_int64);
-	SWIG_Store_field(ulv,0,copy_int64(ul));
-	CAMLreturn(ulv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_float( float f ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(fv);
-	fv = caml_swig_alloc(1,C_float);
-	SWIG_Store_field(fv,0,copy_double((double)f));
-	CAMLreturn(fv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_double( double d ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(fv);
-	fv = caml_swig_alloc(1,C_double);
-	SWIG_Store_field(fv,0,copy_double(d));
-	CAMLreturn(fv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_ptr( void *p, swig_type_info *info ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(vv);
-	vv = caml_swig_alloc(2,C_ptr);
-	SWIG_Store_field(vv,0,copy_int64((long)p));
-	SWIG_Store_field(vv,1,copy_int64((long)info));
-	CAMLreturn(vv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_string( const char *p ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(vv);
-	if( !p ) CAMLreturn(caml_val_ptr( (void *)p, 0 ));
-	vv = caml_swig_alloc(1,C_string);
-	SWIG_Store_field(vv,0,copy_string(p));
-	CAMLreturn(vv);
-    }
-
-    SWIGSTATIC CAML_VALUE caml_val_string_len( const char *p, int len ) {
-	CAMLparam0();
-	SWIG_CAMLlocal1(vv);
-	if( !p || len < 0 ) CAMLreturn(caml_val_ptr( (void *)p, 0 ));
-	vv = caml_swig_alloc(1,C_string);
-	SWIG_Store_field(vv,0,alloc_string(len));
-	memcpy(String_val(SWIG_Field(vv,0)),p,len);
-	CAMLreturn(vv);
-    }
-
-    #define caml_val_obj(v, name) caml_val_obj_helper(v, SWIG_TypeQuery((name)), name)
-    SWIGSTATIC CAML_VALUE caml_val_obj_helper( void *v, swig_type_info *type, char *name) {
-	CAMLparam0();
-	CAMLreturn(callback2(*caml_named_value("caml_create_object_fn"),
-			     caml_val_ptr(v,type),
-			     copy_string(name)));
-    }
-
-    SWIGSTATIC long caml_long_val_full( CAML_VALUE v, char *name ) {
-	CAMLparam1(v);
-	if( !Is_block(v) ) return 0;
-
-	switch( SWIG_Tag_val(v) ) {
-	case C_bool:
-	case C_char:
-	case C_uchar:
-	case C_short:
-	case C_ushort:
-	case C_int:
-	    CAMLreturn(Int_val(SWIG_Field(v,0)));
-	case C_uint:
-	case C_int32:
-	    CAMLreturn(Int32_val(SWIG_Field(v,0)));
-	case C_int64:
-	    CAMLreturn((long)SWIG_Int64_val(SWIG_Field(v,0)));
-	case C_float:
-	case C_double:
-	    CAMLreturn((long)Double_val(SWIG_Field(v,0)));
-	case C_string:
-	    CAMLreturn((long)String_val(SWIG_Field(v,0)));
-	case C_ptr:
-	    CAMLreturn((long)SWIG_Int64_val(SWIG_Field(SWIG_Field(v,0),0)));
-	case C_enum: {
-	    SWIG_CAMLlocal1(ret);
-	    CAML_VALUE *enum_to_int = caml_named_value(SWIG_MODULE "_enum_to_int");
-	    if( !name ) failwith( "Not an enum conversion" );
-	    ret = callback2(*enum_to_int,*caml_named_value(name),v);
-	    CAMLreturn(caml_long_val(ret));
-	}
-	default:
-	    failwith("No conversion to int");
-	}
-    }
-
-    SWIGSTATIC long caml_long_val( CAML_VALUE v ) {
-	return caml_long_val_full(v,0);
-    }
-
-    SWIGSTATIC double caml_double_val( CAML_VALUE v ) {
-	CAMLparam1(v);
-	if( !Is_block(v) ) return 0.0;
-	switch( SWIG_Tag_val(v) ) {
-	case C_bool:
-	case C_char:
-	case C_uchar:
-	case C_short:
-	case C_ushort:
-	case C_int:
-	    CAMLreturn_type(Int_val(SWIG_Field(v,0)));
-	case C_uint:
-	case C_int32:
-	    CAMLreturn_type(Int32_val(SWIG_Field(v,0)));
-	case C_int64:
-	    CAMLreturn_type(SWIG_Int64_val(SWIG_Field(v,0)));
-	case C_float:
-	case C_double:
-	    CAMLreturn_type(Double_val(SWIG_Field(v,0)));
-	default:
-	    fprintf( stderr, "Unknown block tag %d\n", SWIG_Tag_val(v) );
-	    failwith("No conversion to double");
-	}
-    }
-
-    SWIGSTATIC int caml_ptr_val_internal( CAML_VALUE v, void **out, 
-					  swig_type_info *descriptor ) {
-	CAMLparam1(v);
-	void *outptr = NULL;
-        swig_type_info *outdescr = NULL;
-
-	if( v == Val_unit ) {
-	    *out = 0;
-	    CAMLreturn(0);
-	}
-	if( !Is_block(v) ) return -1;
-	switch( SWIG_Tag_val(v) ) {
-	case C_int:
-	    if( !caml_long_val( v ) ) {
-		*out = 0;
-		CAMLreturn(0);
-	    } else {
-		*out = 0;
-		CAMLreturn(1);
-	    }
-	    break;
-	case C_obj:
-	    CAMLreturn
-		(caml_ptr_val_internal
-		 (callback(*caml_named_value("caml_obj_ptr"),v),
-		  out,descriptor));
-	case C_string:
-	    outptr = (void *)String_val(SWIG_Field(v,0));
-	    break;
-	case C_ptr:
-	    outptr = (void *)(long)SWIG_Int64_val(SWIG_Field(v,0));
-            outdescr = (swig_type_info *)(long)SWIG_Int64_val(SWIG_Field(v,1));
-	    break;
-	default:
-	    *out = 0;
-	    CAMLreturn(1);
-	    break;
-	}
-	
-	CAMLreturn(SWIG_GetPtr(outptr,out,outdescr,descriptor));
-    }
-
-    SWIGSTATIC void *caml_ptr_val( CAML_VALUE v, swig_type_info *descriptor ) {
-        CAMLparam0();
-#ifdef TYPE_CAST_VERBOSE
-	caml_print_val( v );
-#endif
-	void *out = NULL;
-	if( !caml_ptr_val_internal( v, &out, descriptor ) )
-	    CAMLreturn_type(out);
-	else
-	    failwith( "No appropriate conversion found." );
-    }
-
-    SWIGSTATIC char *caml_string_val( CAML_VALUE v ) {
-	return (char *)caml_ptr_val( v, 0 );
-    }
-
-    SWIGSTATIC int caml_string_len( CAML_VALUE v ) {
-	switch( SWIG_Tag_val(v) ) {
-	case C_string:
-	    return string_length(SWIG_Field(v,0));
-	default:
-	    return strlen((char *)caml_ptr_val(v,0));
-	}
-    }
-
-    SWIGSTATIC int caml_bool_check( CAML_VALUE v ) {
-	CAMLparam1(v);
-	
-	if( !Is_block(v) ) return 0;
-	
-	switch( SWIG_Tag_val(v) ) {
-	case C_bool:
-	case C_ptr:
-	case C_string:
-	    CAMLreturn(1);
-	default:
-	    CAMLreturn(0);
-	}
-    }
-
-    SWIGSTATIC int caml_int_check( CAML_VALUE v ) {
-	CAMLparam1(v);
-	
-	if( !Is_block(v) ) return 0;
-	
-	switch( SWIG_Tag_val(v) ) {
-	case C_char:
-	case C_uchar:
-	case C_short:
-	case C_ushort:
-	case C_int:
-	case C_uint:
-	case C_int32:
-	case C_int64:
-	    CAMLreturn(1);
-
-	default:
-	    CAMLreturn(0);
-	}
-    }
-
-    SWIGSTATIC int caml_float_check( CAML_VALUE v ) {
-	CAMLparam1(v);
-	if( !Is_block(v) ) return 0;
-
-	switch( SWIG_Tag_val(v) ) {
-	case C_float:
-	case C_double:
-	    CAMLreturn(1);
-
-	default:
-	    CAMLreturn(0);
-	}	
-    }
-
-    SWIGSTATIC int caml_ptr_check( CAML_VALUE v ) {
-	CAMLparam1(v);
-	if( !Is_block(v) ) return 0;
-
-	switch( SWIG_Tag_val(v) ) {
-	case C_string:
-	case C_ptr:
-	case C_int64:
-	    CAMLreturn(1);
-
-	default:
-	    CAMLreturn(0);
-	}	
-    }
-
-    static swig_module_info *SWIG_Ocaml_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
-      CAML_VALUE pointer;
-
-      pointer = callback(*caml_named_value("swig_find_type_info"), caml_val_int(0));
-      if (Is_block(pointer) && SWIG_Tag_val(pointer) == C_ptr) {
-        return (swig_module_info *)(void *)(long)SWIG_Int64_val(SWIG_Field(pointer,0));
-      }
-      return 0;
-    }
-
-    static void SWIG_Ocaml_SetModule(swig_module_info *pointer) {
-      CAML_VALUE mod_pointer;
-
-      mod_pointer = caml_val_ptr(pointer, NULL);
-      callback(*caml_named_value("swig_set_type_info"), mod_pointer);
-    }
-
-#ifdef __cplusplus
-}
-#endif
-#undef value
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/ocamldec.swg b/dependencies2013/win32/swig/Lib/ocaml/ocamldec.swg
deleted file mode 100644
index 96e1cd2c..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/ocamldec.swg
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ocamldec.swg
- *
- * Ocaml runtime code -- declarations
- * ----------------------------------------------------------------------------- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-#define SWIGEXT extern "C"
-SWIGEXT {
-#else
-#define SWIGEXT 
-#endif
-#define value caml_value_t
-#define CAML_VALUE caml_value_t
-#include <caml/alloc.h>
-#include <caml/custom.h>
-#include <caml/mlvalues.h>
-#include <caml/memory.h>
-#include <caml/callback.h>
-#include <caml/fail.h>
-#include <caml/misc.h>
-
-#define caml_array_set swig_caml_array_set
-
-// Adapted from memory.h and mlvalues.h
-
-#define SWIG_CAMLlocal1(x) \
-  caml_value_t x = 0; \
-  CAMLxparam1 (x)
-
-#define SWIG_CAMLlocal2(x, y) \
-  caml_value_t x = 0, y = 0; \
-  CAMLxparam2 (x, y)
-
-#define SWIG_CAMLlocal3(x, y, z) \
-  caml_value_t x = 0, y = 0, z = 0; \
-  CAMLxparam3 (x, y, z)
-
-#define SWIG_CAMLlocal4(x, y, z, t) \
-  caml_value_t x = 0, y = 0, z = 0, t = 0; \
-  CAMLxparam4 (x, y, z, t)
-
-#define SWIG_CAMLlocal5(x, y, z, t, u) \
-  caml_value_t x = 0, y = 0, z = 0, t = 0, u = 0; \
-  CAMLxparam5 (x, y, z, t, u)
-
-#define SWIG_CAMLlocalN(x, size) \
-  caml_value_t x [(size)] = { 0, /* 0, 0, ... */ }; \
-  CAMLxparamN (x, (size))
-
-#define SWIG_Field(x, i) (((caml_value_t *)(x)) [i])           /* Also an l-value. */
-#define SWIG_Store_field(block, offset, val) do{ \
-  mlsize_t caml__temp_offset = (offset); \
-  caml_value_t caml__temp_val = (val); \
-  modify (&SWIG_Field ((block), caml__temp_offset), caml__temp_val); \
-}while(0)
-
-#define SWIG_Data_custom_val(v) ((void *) &SWIG_Field((v), 1))
-#ifdef ARCH_BIG_ENDIAN
-#define SWIG_Tag_val(val) (((unsigned char *) (val)) [-1])
-                                                 /* Also an l-value. */
-#define SWIG_Tag_hp(hp) (((unsigned char *) (hp)) [sizeof(caml_value_t)-1])
-                                                 /* Also an l-value. */
-#else
-#define SWIG_Tag_val(val) (((unsigned char *) (val)) [-sizeof(caml_value_t)])
-                                                 /* Also an l-value. */
-#define SWIG_Tag_hp(hp) (((unsigned char *) (hp)) [0])
-                                                 /* Also an l-value. */
-#endif
-
-#ifdef CAMLreturn0
-#undef CAMLreturn0
-#endif
-#define CAMLreturn0 do{ \
-  caml_local_roots = caml__frame; \
-  return; \
-}while (0)
-
-#ifdef CAMLreturn
-#undef CAMLreturn
-#endif
-#define CAMLreturn(result) do{ \
-  caml_value_t caml__temp_result = (result); \
-  caml_local_roots = caml__frame; \
-  return (caml__temp_result); \
-}while(0)
-
-#define CAMLreturn_type(result) do{ \
-  caml_local_roots = caml__frame; \
-  return result; \
-}while(0)
-
-#ifdef CAMLnoreturn
-#undef CAMLnoreturn
-#endif
-#define CAMLnoreturn ((void) caml__frame)
-
-
-#ifndef ARCH_ALIGN_INT64
-#define SWIG_Int64_val(v) (*((int64 *) SWIG_Data_custom_val(v)))
-#else
-CAMLextern int64 Int64_val(caml_value_t v);
-#define SWIG_Int64_val(v) Int64_val(v)
-#endif
-
-#define SWIG_NewPointerObj(p,type,flags) caml_val_ptr(p,type)
-#define SWIG_GetModule(clientdata) SWIG_Ocaml_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer) SWIG_Ocaml_SetModule(pointer)
-
-#define SWIG_contract_assert(expr, msg) if(!(expr)) {failwith(msg);} else
-
-    SWIGSTATIC int
-    SWIG_GetPtr(void *source, void **result, swig_type_info *type, swig_type_info *result_type);
-    
-    SWIGSTATIC void *
-    SWIG_MustGetPtr (CAML_VALUE v,  swig_type_info *type);
-    
-    SWIGSTATIC CAML_VALUE _wrap_delete_void( CAML_VALUE );
-    
-    SWIGSTATIC int enum_to_int( char *name, CAML_VALUE v );
-    SWIGSTATIC CAML_VALUE int_to_enum( char *name, int v );
-
-    SWIGSTATIC CAML_VALUE caml_list_nth( CAML_VALUE lst, int n );
-    SWIGSTATIC CAML_VALUE caml_list_append( CAML_VALUE lst, CAML_VALUE elt );
-    SWIGSTATIC int caml_list_length( CAML_VALUE lst );
-    SWIGSTATIC CAML_VALUE caml_array_new( int n );
-    SWIGSTATIC void caml_array_set( CAML_VALUE arr, int n, CAML_VALUE item );
-    SWIGSTATIC CAML_VALUE caml_array_nth( CAML_VALUE arr, int n );
-    SWIGSTATIC int caml_array_len( CAML_VALUE arr );
-
-    SWIGSTATIC CAML_VALUE caml_val_char( char c );
-    SWIGSTATIC CAML_VALUE caml_val_uchar( unsigned char c );
-
-    SWIGSTATIC CAML_VALUE caml_val_short( short s );
-    SWIGSTATIC CAML_VALUE caml_val_ushort( unsigned short s );
-    
-    SWIGSTATIC CAML_VALUE caml_val_int( int x );
-    SWIGSTATIC CAML_VALUE caml_val_uint( unsigned int x );
-
-    SWIGSTATIC CAML_VALUE caml_val_long( long x );
-    SWIGSTATIC CAML_VALUE caml_val_ulong( unsigned long x );
-
-    SWIGSTATIC CAML_VALUE caml_val_float( float f );
-    SWIGSTATIC CAML_VALUE caml_val_double( double d );
-
-    SWIGSTATIC CAML_VALUE caml_val_ptr( void *p, swig_type_info *descriptor );
-
-    SWIGSTATIC CAML_VALUE caml_val_string( const char *str );
-    SWIGSTATIC CAML_VALUE caml_val_string_len( const char *str, int len );
-
-    SWIGSTATIC long caml_long_val( CAML_VALUE v );
-    SWIGSTATIC double caml_double_val( CAML_VALUE v );
-
-    SWIGSTATIC int caml_ptr_val_internal( CAML_VALUE v, void **out,
-				      swig_type_info *descriptor );
-    SWIGSTATIC void *caml_ptr_val( CAML_VALUE v, swig_type_info *descriptor );
-
-    SWIGSTATIC char *caml_string_val( CAML_VALUE v );
-    SWIGSTATIC int caml_string_len( CAML_VALUE v );
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ocaml/ocamlkw.swg b/dependencies2013/win32/swig/Lib/ocaml/ocamlkw.swg
deleted file mode 100644
index 92d82221..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/ocamlkw.swg
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef OCAML_OCAMLKW_SWG_
-#define OCAML_OCAMLKW_SWG_
-
-/* Warnings for Ocaml keywords */
-#define OCAMLKW(x) %namewarn("314: '" #x "' is an ocaml keyword and it will be appropriately renamed")  #x
-
-/*
-  from
-  http://caml.inria.fr/ocaml/htmlman/manual044.html
-*/
-
-
-OCAMLKW(and);
-OCAMLKW(as);
-OCAMLKW(assert);
-OCAMLKW(begin);
-OCAMLKW(class);
-OCAMLKW(constraint);
-OCAMLKW(do);
-OCAMLKW(done);
-OCAMLKW(downto);
-OCAMLKW(else);
-OCAMLKW(end);
-OCAMLKW(exception);
-OCAMLKW(external);
-OCAMLKW(false);
-OCAMLKW(for);
-OCAMLKW(fun);
-OCAMLKW(function);
-OCAMLKW(functor);
-OCAMLKW(if);
-OCAMLKW(in);
-OCAMLKW(include);
-OCAMLKW(inherit);
-OCAMLKW(initializer);
-OCAMLKW(lazy);
-OCAMLKW(let);
-OCAMLKW(match);
-OCAMLKW(method);
-OCAMLKW(module);
-OCAMLKW(mutable);
-OCAMLKW(new);
-OCAMLKW(object);
-OCAMLKW(of);
-OCAMLKW(open);
-OCAMLKW(or);
-OCAMLKW(private);
-OCAMLKW(rec);
-OCAMLKW(sig);
-OCAMLKW(struct);
-OCAMLKW(then);
-OCAMLKW(to);
-OCAMLKW(true);
-OCAMLKW(try);
-OCAMLKW(type);
-OCAMLKW(val);
-OCAMLKW(virtual);
-OCAMLKW(when);
-OCAMLKW(while);
-OCAMLKW(with);
-
-#undef OCAMLKW
-
-#endif //OCAML_OCAMLKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/ocaml/preamble.swg b/dependencies2013/win32/swig/Lib/ocaml/preamble.swg
deleted file mode 100644
index 39374ce4..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/preamble.swg
+++ /dev/null
@@ -1,17 +0,0 @@
-%insert(mli) %{
-exception BadArgs of string
-exception BadMethodName of c_obj * string * string
-exception NotObject of c_obj
-exception NotEnumType of c_obj
-exception LabelNotFromThisEnum of c_obj
-exception InvalidDirectorCall of c_obj
-%}
-
-%insert(ml) %{
-exception BadArgs of string
-exception BadMethodName of c_obj * string * string
-exception NotObject of c_obj
-exception NotEnumType of c_obj
-exception LabelNotFromThisEnum of c_obj
-exception InvalidDirectorCall of c_obj
-%}
\ No newline at end of file
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_common.i b/dependencies2013/win32/swig/Lib/ocaml/std_common.i
deleted file mode 100644
index 6523af0b..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_common.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%apply size_t { std::size_t };
-
-%{
-#include <string>
-SWIGINTERNINLINE
-CAML_VALUE SwigString_FromString(const std::string &s) {
-  return caml_val_string((char *)s.c_str());
-}
-
-SWIGINTERNINLINE
-std::string SwigString_AsString(CAML_VALUE o) {
-  return std::string((char *)caml_ptr_val(o,0));
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_complex.i b/dependencies2013/win32/swig/Lib/ocaml/std_complex.i
deleted file mode 100644
index 5192261a..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_complex.i
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*- 
-#ifndef SWIG_STD_COMPLEX_I_
-#define SWIG_STD_COMPLEX_I_
-
-#ifdef SWIG
-
-%{
-#include <complex>
-%} 
-
-namespace std 
-{
-  template <class T> class complex;  
-  
-  %define specialize_std_complex(T)
-  
-  %typemap(in) complex<T> {
-    if (PyComplex_Check($input)) {
-      $1 = std::complex<T>(PyComplex_RealAsDouble($input),
-			   PyComplex_ImagAsDouble($input));
-    } else if (PyFloat_Check($input)) {
-      $1 = std::complex<T>(PyFloat_AsDouble($input), 0);
-    } else if (PyInt_Check($input)) {
-      $1 = std::complex<T>(PyInt_AsLong($input), 0);
-    }
-    else {
-      PyErr_SetString(PyExc_TypeError,"Expected a complex");
-      SWIG_fail;
-    }
-  }  
-  
-  %typemap(in) const complex<T>& (std::complex<T> temp) {
-    if (PyComplex_Check($input)) {
-      temp = std::complex<T>(PyComplex_RealAsDouble($input),
-			     PyComplex_ImagAsDouble($input));
-      $1 = &temp;
-    } else if (PyFloat_Check($input)) {
-      temp = std::complex<T>(PyFloat_AsDouble($input), 0);
-      $1 = &temp;
-    } else if (PyInt_Check($input)) {
-      temp = std::complex<T>(PyInt_AsLong($input), 0);
-      $1 = &temp;
-    } else {	
-      PyErr_SetString(PyExc_TypeError,"Expected a complex");
-      SWIG_fail;
-    }
-  }
-  
-  %typemap(out) complex<T> {
-    $result = PyComplex_FromDoubles($1.real(), $1.imag());
-  }
-  
-  %typemap(out) const complex<T> & {
-    $result = PyComplex_FromDoubles($1->real(), $1->imag());
-  }
-
-  %enddef  
-     
-  specialize_std_complex(double);
-  specialize_std_complex(float);
-}
-  
-#endif // SWIG
-
-#endif //SWIG_STD_COMPLEX_I_
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_deque.i b/dependencies2013/win32/swig/Lib/ocaml/std_deque.i
deleted file mode 100644
index 5b38962b..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_deque.i
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_deque.i
- *
- * Default std_deque wrapper
- * ----------------------------------------------------------------------------- */
-
-%module std_deque
-
-%rename(__getitem__) std::deque::getitem;
-%rename(__setitem__) std::deque::setitem;
-%rename(__delitem__) std::deque::delitem;
-%rename(__getslice__) std::deque::getslice;
-%rename(__setslice__) std::deque::setslice;
-%rename(__delslice__) std::deque::delslice;
-
-%extend std::deque {
-   int __len__() {
-       return (int) self->size();
-   }
-   int __nonzero__() {
-       return ! self->empty();
-   }
-   void append(const T &x) {
-       self->push_back(x);
-   }
-};
-
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_list.i b/dependencies2013/win32/swig/Lib/ocaml/std_list.i
deleted file mode 100644
index 06181cca..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_list.i
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_list.i
- *
- * SWIG typemaps for std::list types
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%module std_list
-%{
-#include <list>
-#include <stdexcept>
-%}
-
-
-namespace std{
-    template<class T> class list
-    {
-    public:
-	     
-	typedef T &reference;
-	typedef const T& const_reference;
-	typedef T &iterator;
-	typedef const T& const_iterator; 
-	    
-	list();
-	list(unsigned int size, const T& value = T());
-	list(const list<T> &);
-
-	~list();
-	void assign(unsigned int n, const T& value);
-	void swap(list<T> &x);
-
-	const_reference front();
-	const_reference back();
-	const_iterator begin();
-	const_iterator end();
-	     
-	void resize(unsigned int n, T c = T());
-	bool empty() const;
-
-	void push_front(const T& x);
-	void push_back(const T& x);
-
-
-	void pop_front();
-	void pop_back();
-	void clear();
-	unsigned int size() const;
-	unsigned int max_size() const;
-	void resize(unsigned int n, const T& value);
-		
-	void remove(const T& value);
-	void unique();
-	void reverse();
-	void sort();
-             
-	     
-		
-	%extend 
-	    {
-		const_reference __getitem__(int i) throw (std::out_of_range) 
-		    {
-			std::list<T>::iterator first = self->begin(); 
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (i>=0 && i<size)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    return *first;
-			}
-			else throw std::out_of_range("list index out of range");
-		    }
-		void __setitem__(int i, const T& x) throw (std::out_of_range)
-		    {
-			std::list<T>::iterator first = self->begin(); 
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (i>=0 && i<size)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    *first = x;
-			}
-			else throw std::out_of_range("list index out of range");
-		    }
-		void __delitem__(int i) throw (std::out_of_range)
-		    {
-			std::list<T>::iterator first = self->begin(); 
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (i>=0 && i<size)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    self->erase(first);
-			}
-			else throw std::out_of_range("list index out of range");
-		    }	     
-		std::list<T> __getslice__(int i,int j) 
-		    {
-			std::list<T>::iterator first = self->begin();
-			std::list<T>::iterator end = self->end();
-
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (j<0) j += size;
-			if (i<0) i = 0;
-			if (j>size) j = size;
-			if (i>=j) i=j;
-			if (i>=0 && i<size && j>=0)
-			{
-			    for (int k=0;k<i;k++)
-			    {
-				first++;
-			    }
-			    for (int m=0;m<j;m++)
-			    {
-				end++;
-			    }
-			    std::list<T> tmp(j-i);
-			    if (j>i) std::copy(first,end,tmp.begin());
-			    return tmp;
-			}
-			else throw std::out_of_range("list index out of range");
-		    }
-		void __delslice__(int i,int j) 
-		    {
-			std::list<T>::iterator first = self->begin();
-			std::list<T>::iterator end = self->end();
-
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (j<0) j += size;
-			if (i<0) i = 0;
-			if (j>size) j = size;
-	
-			for (int k=0;k<i;k++)
-			{
-			    first++;
-			}
-			for (int m=0;m<=j;m++)
-			{
-			    end++;
-			}		   
-			self->erase(first,end);		
-		    }
-		void __setslice__(int i,int j, const std::list<T>& v) 
-		    {
-			std::list<T>::iterator first = self->begin();
-			std::list<T>::iterator end = self->end();
-
-			int size = int(self->size());
-			if (i<0) i += size;
-			if (j<0) j += size;
-			if (i<0) i = 0;
-			if (j>size) j = size;
-		
-			for (int k=0;k<i;k++)
-			{
-			    first++;
-			}
-			for (int m=0;m<=j;m++)
-			{
-			    end++;
-			}
-			if (int(v.size()) == j-i) 
-			{
-			    std::copy(v.begin(),v.end(),first);
-			}
-			else {
-			    self->erase(first,end);
-			    if (i+1 <= int(self->size())) 
-			    {
-				first = self->begin();
-				for (int k=0;k<i;k++)
-				{
-				    first++;
-				}
-				self->insert(first,v.begin(),v.end());
-			    }
-			    else self->insert(self->end(),v.begin(),v.end());
-			}
-			   	
-		    }
-		unsigned int __len__() 
-		    {
-			return self->size();
-		    }	
-		bool __nonzero__()
-		    {
-			return !(self->empty());
-		    }
-		void append(const T& x)
-		    {
-			self->push_back(x);
-		    }
-		void pop()
-		    {
-			self->pop_back();
-		    }
-	      
-	    };   
-	  
-    };
-}
-
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_map.i b/dependencies2013/win32/swig/Lib/ocaml/std_map.i
deleted file mode 100644
index 5656b7fa..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_map.i
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_pair.i b/dependencies2013/win32/swig/Lib/ocaml/std_pair.i
deleted file mode 100644
index fe45ee67..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_string.i b/dependencies2013/win32/swig/Lib/ocaml/std_string.i
deleted file mode 100644
index bd5be0da..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_string.i
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string
- * ----------------------------------------------------------------------------- */
-
-// ------------------------------------------------------------------------
-// std::string is typemapped by value
-// This can prevent exporting methods which return a string
-// in order for the user to modify it.
-// However, I think I'll wait until someone asks for it...
-// ------------------------------------------------------------------------
-
-%{
-#include <string>
-#include <vector>
-%}
-  
-%include <exception.i>
-%include <std_vector.i>
-
-namespace std {
-
-%naturalvar string;
-%naturalvar wstring;
-  
-class string;
-class wstring;
-  
-/* Overloading check */
-%typemap(in) string {
-  /* %typemap(in) string */
-  if (caml_ptr_check($input))
-    $1.assign((char *)caml_ptr_val($input,0), caml_string_len($input));
-  else
-    SWIG_exception(SWIG_TypeError, "string expected");
-}
-
-%typemap(in) const string & ($*1_ltype temp) {
-  /* %typemap(in) const string & */
-  if (caml_ptr_check($input)) {
-    temp.assign((char *)caml_ptr_val($input,0), caml_string_len($input));
-    $1 = &temp;
-  } else {
-    SWIG_exception(SWIG_TypeError, "string expected");
-  }
-}
-
-%typemap(in) string & ($*1_ltype temp) {
-  /* %typemap(in) string & */
-  if (caml_ptr_check($input)) {
-    temp.assign((char *)caml_ptr_val($input,0), caml_string_len($input));
-    $1 = &temp;
-  } else {
-    SWIG_exception(SWIG_TypeError, "string expected");
-  }
-}
-
-%typemap(in) string * ($*1_ltype *temp) {
-  /* %typemap(in) string * */
-  if (caml_ptr_check($input)) {
-    temp = new $*1_ltype((char *)caml_ptr_val($input,0), caml_string_len($input));
-    $1 = temp;
-  } else {
-    SWIG_exception(SWIG_TypeError, "string expected");
-  }
-}
-
-%typemap(free) string * ($*1_ltype *temp) {
-  delete temp;
-}
-
-%typemap(argout) string & {
-  /* %typemap(argout) string & */
-  swig_result =	caml_list_append(swig_result,caml_val_string_len((*$1).c_str(), (*$1).size()));
-}
-
-%typemap(directorout) string {
-  /* %typemap(directorout) string */
-	$result.assign((char *)caml_ptr_val($input,0), caml_string_len($input));
-}
-
-%typemap(out) string {
-  /* %typemap(out) string */
-  $result = caml_val_string_len($1.c_str(),$1.size());
-}
-
-%typemap(out) string * {
-  /* %typemap(out) string * */
-	$result = caml_val_string_len((*$1).c_str(),(*$1).size());
-}
-}
-
-#ifdef ENABLE_CHARPTR_ARRAY
-char **c_charptr_array( const std::vector <std::string > &str_v );
-
-%{
-  SWIGEXT char **c_charptr_array( const std::vector <std::string > &str_v ) {
-    char **out = new char *[str_v.size() + 1];
-    out[str_v.size()] = 0;
-    for( int i = 0; i < str_v.size(); i++ ) {
-      out[i] = (char *)str_v[i].c_str();
-    }
-    return out;
-  }
-%}
-#endif
-
-#ifdef ENABLE_STRING_VECTOR
-%template (StringVector) std::vector<std::string >;
-
-%insert(ml) %{
-  (* Some STL convenience items *)
-
-  let string_array_to_vector sa = 
-    let nv = _new_StringVector C_void in
-      array_to_vector nv (fun x -> C_string x) sa ; nv
-	
-  let c_string_array ar = 
-    _c_charptr_array (string_array_to_vector ar)
-%}
-
-%insert(mli) %{
-  val c_string_array: string array -> c_obj
-%}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ocaml/std_vector.i b/dependencies2013/win32/swig/Lib/ocaml/std_vector.i
deleted file mode 100644
index 53d10744..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/std_vector.i
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * SWIG typemaps for std::vector types
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// Python as much as possible, namely, to allow the user to pass and 
-// be returned Python tuples or lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector<T>), f(const std::vector<T>&), f(const std::vector<T>*):
-//      the parameter being read-only, either a Python sequence or a
-//      previously wrapped std::vector<T> can be passed.
-//   -- f(std::vector<T>&), f(std::vector<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector<T> f():
-//      the vector is returned by copy; therefore, a Python sequence of T:s 
-//      is returned which is most easily used in other Python functions
-//   -- std::vector<T>& f(), std::vector<T>* f(), const std::vector<T>& f(),
-//      const std::vector<T>* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <vector>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-    template <class T> class vector {
-    public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T>&);
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        void push_back(const T& x);
-	T operator [] ( int f );
-	vector <T> &operator = ( vector <T> &other );
-	%extend {
-	    void set( int i, const T &x ) {
-		self->resize(i+1);
-		(*self)[i] = x;
-	    }
-	};
-	%extend {
-	    T *to_array() {
-		T *array = new T[self->size() + 1];
-		for( int i = 0; i < self->size(); i++ ) 
-		    array[i] = (*self)[i];
-		return array;
-	    }
-	};
-    };
-};
-
-%insert(ml) %{
-  
-  let array_to_vector v argcons array = 
-    for i = 0 to (Array.length array) - 1 do
-	(invoke v) "set" (C_list [ C_int i ; (argcons array.(i)) ])
-    done ;
-    v
-    
-  let vector_to_array v argcons array =
-    for i = 0; to (get_int ((invoke v) "size" C_void)) - 1 do
-	array.(i) <- argcons ((invoke v) "[]" (C_int i))
-    done ; 
-    v
-      
-%}
-
-%insert(mli) %{
-    val array_to_vector : c_obj -> ('a -> c_obj) -> 'a array -> c_obj
-    val vector_to_array : c_obj -> (c_obj -> 'a) -> 'a array -> c_obj
-%}
diff --git a/dependencies2013/win32/swig/Lib/ocaml/stl.i b/dependencies2013/win32/swig/Lib/ocaml/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/swig.ml b/dependencies2013/win32/swig/Lib/ocaml/swig.ml
deleted file mode 100644
index 5dc2de7b..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/swig.ml
+++ /dev/null
@@ -1,159 +0,0 @@
-(* -*- tuareg -*- *)
-open Int32
-open Int64
-
-type enum = [ `Int of int ]
-
-type 'a c_obj_t = 
-    C_void
-  | C_bool of bool
-  | C_char of char
-  | C_uchar of char
-  | C_short of int
-  | C_ushort of int
-  | C_int of int
-  | C_uint of int32
-  | C_int32 of int32
-  | C_int64 of int64
-  | C_float of float
-  | C_double of float
-  | C_ptr of int64 * int64
-  | C_array of 'a c_obj_t array
-  | C_list of 'a c_obj_t list
-  | C_obj of (string -> 'a c_obj_t -> 'a c_obj_t)
-  | C_string of string
-  | C_enum of 'a
-  | C_director_core of 'a c_obj_t * 'a c_obj_t option ref
-
-type c_obj = enum c_obj_t
-
-exception BadArgs of string
-exception BadMethodName of string * string
-exception NotObject of c_obj
-exception NotEnumType of c_obj
-exception LabelNotFromThisEnum of c_obj
-exception InvalidDirectorCall of c_obj
-exception NoSuchClass of string
-let rec invoke obj = 
-  match obj with 
-      C_obj o -> o 
-    | C_director_core (o,r) -> invoke o
-    | _ -> raise (NotObject (Obj.magic obj))
-let _ = Callback.register "swig_runmethod" invoke
-
-let fnhelper arg =
-  match arg with C_list l -> l | C_void -> [] | _ -> [ arg ]
-
-let rec get_int x = 
-  match x with
-      C_bool b -> if b then 1 else 0
-    | C_char c
-    | C_uchar c -> (int_of_char c)
-    | C_short s
-    | C_ushort s
-    | C_int s -> s
-    | C_uint u
-    | C_int32 u -> (Int32.to_int u)
-    | C_int64 u -> (Int64.to_int u)
-    | C_float f -> (int_of_float f)
-    | C_double d -> (int_of_float d)
-    | C_ptr (p,q) -> (Int64.to_int p)
-    | C_obj o -> (try (get_int (o "int" C_void))
-		  with _ -> (get_int (o "&" C_void)))
-    | _ -> raise (Failure "Can't convert to int")
-
-let rec get_float x = 
-  match x with
-      C_char c
-    | C_uchar c -> (float_of_int (int_of_char c))
-    | C_short s -> (float_of_int s)
-    | C_ushort s -> (float_of_int s)
-    | C_int s -> (float_of_int s)
-    | C_uint u
-    | C_int32 u -> (float_of_int (Int32.to_int u))
-    | C_int64 u -> (float_of_int (Int64.to_int u))
-    | C_float f -> f
-    | C_double d -> d
-    | C_obj o -> (try (get_float (o "float" C_void))
-		  with _ -> (get_float (o "double" C_void)))
-    | _ -> raise (Failure "Can't convert to float")
-
-let rec get_char x =
-  (char_of_int (get_int x))
-
-let rec get_string x = 
-  match x with 
-      C_string str -> str
-    | _ -> raise (Failure "Can't convert to string")
-
-let rec get_bool x = 
-  match x with
-      C_bool b -> b
-    | _ -> 
-	(try if get_int x != 0 then true else false
-	 with _ -> raise (Failure "Can't convert to bool"))
-
-let disown_object obj = 
-  match obj with
-      C_director_core (o,r) -> r := None
-    | _ -> raise (Failure "Not a director core object")
-let _ = Callback.register "caml_obj_disown" disown_object
-let addr_of obj = 
-  match obj with
-      C_obj _ -> (invoke obj) "&" C_void
-    | C_director_core (self,r) -> (invoke self) "&" C_void
-    | C_ptr _ -> obj
-    | _ -> raise (Failure "Not a pointer.")
-let _ = Callback.register "caml_obj_ptr" addr_of
-
-let make_float f = C_float f
-let make_double f = C_double f
-let make_string s = C_string s
-let make_bool b = C_bool b
-let make_char c = C_char c
-let make_char_i c = C_char (char_of_int c)
-let make_uchar c = C_uchar c
-let make_uchar_i c = C_uchar (char_of_int c)
-let make_short i = C_short i
-let make_ushort i = C_ushort i
-let make_int i = C_int i
-let make_uint i = C_uint (Int32.of_int i)
-let make_int32 i = C_int32 (Int32.of_int i)
-let make_int64 i = C_int64 (Int64.of_int i)
-
-let new_derived_object cfun x_class args =
-  begin
-    let get_object ob =
-      match !ob with
-          None ->
-    raise (NotObject C_void)
-        | Some o -> o in
-    let ob_ref = ref None in
-    let class_fun class_f ob_r =
-      (fun meth args -> class_f (get_object ob_r) meth args) in
-    let new_class = class_fun x_class ob_ref in
-    let dircore = C_director_core (C_obj new_class,ob_ref) in
-    let obj =
-    cfun (match args with
-            C_list argl -> (C_list ((dircore :: argl)))
-	  | C_void -> (C_list [ dircore ])
-          | a -> (C_list [ dircore ; a ])) in
-    ob_ref := Some obj ;
-      obj
-  end
-  
-let swig_current_type_info = ref C_void
-let find_type_info obj = !swig_current_type_info 
-let _ = Callback.register "swig_find_type_info" find_type_info
-let set_type_info obj =
-  match obj with
-    C_ptr _ -> swig_current_type_info := obj ;
-               obj
-    | _ -> raise (Failure "Internal error: passed non pointer to set_type_info")
-let _ = Callback.register "swig_set_type_info" set_type_info
-
-let class_master_list = Hashtbl.create 20
-let register_class_byname nm co = 
-  Hashtbl.replace class_master_list nm (Obj.magic co)
-let create_class nm arg = 
-  try (Obj.magic (Hashtbl.find class_master_list nm)) arg with _ -> raise (NoSuchClass nm)
diff --git a/dependencies2013/win32/swig/Lib/ocaml/swig.mli b/dependencies2013/win32/swig/Lib/ocaml/swig.mli
deleted file mode 100644
index 3207b9e7..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/swig.mli
+++ /dev/null
@@ -1,61 +0,0 @@
-(* -*- tuareg -*- *)
-
-type enum = [ `Int of int ]
-
-type 'a c_obj_t = 
-    C_void
-  | C_bool of bool
-  | C_char of char
-  | C_uchar of char
-  | C_short of int
-  | C_ushort of int
-  | C_int of int
-  | C_uint of int32
-  | C_int32 of int32
-  | C_int64 of int64
-  | C_float of float
-  | C_double of float
-  | C_ptr of int64 * int64
-  | C_array of 'a c_obj_t array
-  | C_list of 'a c_obj_t list
-  | C_obj of (string -> 'a c_obj_t -> 'a c_obj_t)
-  | C_string of string
-  | C_enum of 'a
-  | C_director_core of 'a c_obj_t * 'a c_obj_t option ref
-
-type c_obj = enum c_obj_t
-
-exception InvalidDirectorCall of c_obj
-exception NoSuchClass of string
-
-val invoke : ('a c_obj_t) -> (string -> 'a c_obj_t -> 'a c_obj_t)
-val fnhelper : 'a c_obj_t -> 'a c_obj_t list
-
-val get_int : 'a c_obj_t -> int
-val get_float : 'a c_obj_t -> float
-val get_string : 'a c_obj_t -> string
-val get_char : 'a c_obj_t -> char
-val get_bool : 'a c_obj_t -> bool
-
-val make_float : float -> 'a c_obj_t
-val make_double : float -> 'a c_obj_t
-val make_string : string -> 'a c_obj_t
-val make_bool : bool -> 'a c_obj_t
-val make_char : char -> 'a c_obj_t
-val make_char_i : int -> 'a c_obj_t
-val make_uchar : char -> 'a c_obj_t
-val make_uchar_i : int -> 'a c_obj_t
-val make_short : int -> 'a c_obj_t
-val make_ushort : int -> 'a c_obj_t
-val make_int : int -> 'a c_obj_t
-val make_uint : int -> 'a c_obj_t
-val make_int32 : int -> 'a c_obj_t
-val make_int64 : int -> 'a c_obj_t
-
-val new_derived_object: 
-  ('a c_obj_t -> 'a c_obj_t) ->
-  ('a c_obj_t -> string -> 'a c_obj_t -> 'a c_obj_t) ->
-  'a c_obj_t -> 'a c_obj_t
-  
-val register_class_byname : string -> ('a c_obj_t -> 'a c_obj_t) -> unit
-val create_class : string -> 'a c_obj_t -> 'a c_obj_t
diff --git a/dependencies2013/win32/swig/Lib/ocaml/swigp4.ml b/dependencies2013/win32/swig/Lib/ocaml/swigp4.ml
deleted file mode 100644
index 2f6074a9..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/swigp4.ml
+++ /dev/null
@@ -1,135 +0,0 @@
-open Camlp4
-  
-module Id : Sig.Id = 
-struct 
-  let name = "swigp4" 
-  let version = "0.1" 
-end 
-  
-module Make (Syntax : Sig.Camlp4Syntax) = 
-struct 
-  open Sig 
-  include Syntax 
-
-  let _loc = Loc.ghost
-  let lap x y = x :: y
-  let c_ify e loc = 	  
-    match e with
-        <:expr< $int:_$ >> -> <:expr< (C_int $e$) >>
-      | <:expr< $str:_$ >> -> <:expr< (C_string $e$) >>
-      | <:expr< $chr:_$ >> -> <:expr< (C_char $e$) >>
-      | <:expr< $flo:_$ >> -> <:expr< (C_double $e$) >>
-      | <:expr< True    >> -> <:expr< (C_bool $e$) >>
-      | <:expr< False   >> -> <:expr< (C_bool $e$) >>
-      | _ -> <:expr< $e$ >>
-        let mk_list args loc f =
-          let rec mk_list_inner args loc f =
-            match args with
-	              [] -> <:expr< [] >>
-              | x :: xs ->
-	              (let loc = Ast.loc_of_expr x in
-	               <:expr< [ ($f x _loc$) ] @ ($mk_list_inner xs loc f$) >>) in
-          match args with
-	            [] -> <:expr< (Obj.magic C_void) >>
-            | [ a ] -> <:expr< (Obj.magic $f a _loc$) >>
-            | _ -> <:expr< (Obj.magic (C_list ($mk_list_inner args loc f$))) >> ;;
-  
-  EXTEND Gram
-    GLOBAL: expr;
-
-    expr: LEVEL "top"
-    [ [ e1 = expr ; "'" ; "[" ; e2 = expr ; "]" ->
-	  <:expr< (invoke $e1$) "[]" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "->" ; l = LIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke $e1$) $str:l$ ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "->" ; u = UIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke $e1$) $str:u$ ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "->" ; s = expr LEVEL "simple" ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke $e1$) $s$ ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "'" ; "." ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke $e1$) "()" ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "'" ; "->" ; l = LIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke ((invoke $e1$) "->" C_void)) $str:l$ ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "'" ; "->" ; u = UIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke ((invoke $e1$) "->" C_void)) $str:u$ ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "'" ; "->" ; s = expr LEVEL "simple" ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
-	    <:expr< (invoke ((invoke $e1$) "->" C_void)) $s$ ($mk_list args _loc c_ify$) >>
-      | e1 = expr ; "'" ; "++" ->
-	    <:expr< (invoke $e1$) "++" C_void >>
-      | e1 = expr ; "'" ; "--" ->
-	    <:expr< (invoke $e1$) "--" C_void >>
-      | e1 = expr ; "'" ; "-" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "-" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "+" ; e2 = expr -> <:expr< (invoke $e1$) "+" (C_list [ $c_ify e2 _loc$ ])  >> 
-      | e1 = expr ; "'" ; "*" ; e2 = expr -> <:expr< (invoke $e1$) "*" (C_list [ $c_ify e2 _loc$ ])  >> 
-      | "'" ; "&" ; e1 = expr -> 
-	    <:expr< (invoke $e1$) "&" C_void >> 
-      | "'" ; "!" ; e1 = expr ->
-	    <:expr< (invoke $e1$) "!" C_void >>
-      | "'" ; "~" ; e1 = expr ->
-	    <:expr< (invoke $e1$) "~" C_void >>
-      | e1 = expr ; "'" ; "/" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "/" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "%" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "%" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "lsl" ; e2 = expr ->
-	    <:expr< (invoke $e1$) ("<" ^ "<") (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "lsr" ; e2 = expr ->
-	    <:expr< (invoke $e1$) (">" ^ ">") (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "<" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "<" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "<=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "<=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; ">" ; e2 = expr ->
-	    <:expr< (invoke $e1$) ">" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; ">=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) ">=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "==" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "==" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "!=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "!=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "&" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "&" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "^" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "^" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "|" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "|" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "&&" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "&&" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "||" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "||" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "+=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "+=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "-=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "-=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "*=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "*=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "/=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "/=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "%=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "%=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "lsl" ; "=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) ("<" ^ "<=") (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "lsr" ; "=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) (">" ^ ">=") (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "&=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "&=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | e1 = expr ; "'" ; "^=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "^=" (C_list [ $c_ify e2 _loc$ ]) >> 
-      | e1 = expr ; "'" ; "|=" ; e2 = expr ->
-	    <:expr< (invoke $e1$) "|=" (C_list [ $c_ify e2 _loc$ ]) >>
-      | "'" ; e = expr -> c_ify e _loc
-      | c = expr ; "as" ; id = LIDENT -> <:expr< $lid:"get_" ^ id$ $c$ >>
-      | c = expr ; "to" ; id = LIDENT -> <:expr< $uid:"C_" ^ id$ $c$ >>
-      | "`" ; "`" ; l = LIDENT -> <:expr< C_enum `$lid:l$ >>
-      | "`" ; "`" ; u = UIDENT -> <:expr< C_enum `$uid:u$ >>
-      | f = expr ; "'" ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" -> 
-	    <:expr< $f$ ($mk_list args _loc c_ify$) >>
-      ] ] ;
-    END ;;
-  
-end 
-  
-module M = Register.OCamlSyntaxExtension(Id)(Make)
diff --git a/dependencies2013/win32/swig/Lib/ocaml/typecheck.i b/dependencies2013/win32/swig/Lib/ocaml/typecheck.i
deleted file mode 100644
index a13e1552..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/typecheck.i
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typecheck.i
- *
- * Typechecking rules
- * ----------------------------------------------------------------------------- */
-
-%typecheck(SWIG_TYPECHECK_INTEGER) char, signed char, const char &, const signed char & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_char: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER) unsigned char, const unsigned char & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_uchar: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER) short, signed short, const short &, const signed short &, wchar_t {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_short: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER) unsigned short, const unsigned short & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_ushort: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-// XXX arty 
-// Will move enum SWIGTYPE later when I figure out what to do with it...
-
-%typecheck(SWIG_TYPECHECK_INTEGER) int, signed int, const int &, const signed int &, enum SWIGTYPE {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_int: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER) unsigned int, const unsigned int & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_uint: $1 = 1; break;
-      case C_int32: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER) long, signed long, unsigned long, long long, signed long long, unsigned long long, const long &, const signed long &, const unsigned long &, const long long &, const signed long long &, const unsigned long long & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_int64: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_INTEGER) bool, oc_bool, BOOL, const bool &, const oc_bool &, const BOOL & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_bool: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_DOUBLE) float, const float & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_float: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }  
-}
-
-%typecheck(SWIG_TYPECHECK_DOUBLE) double, const double & {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_double: $1 = 1; break;
-      default: $1 = 0; break;
-      }
-  }  
-}
-
-%typecheck(SWIG_TYPECHECK_STRING) char * {
-  if( !Is_block($input) ) $1 = 0;
-  else {
-      switch( SWIG_Tag_val($input) ) {
-      case C_string: $1 = 1; break;
-      case C_ptr: {
-	swig_type_info *typeinfo = 
-	    (swig_type_info *)(long)SWIG_Int64_val(SWIG_Field($input,1));
-	$1 = SWIG_TypeCheck("char *",typeinfo) ||
-	     SWIG_TypeCheck("signed char *",typeinfo) ||
-	     SWIG_TypeCheck("unsigned char *",typeinfo) ||
-	     SWIG_TypeCheck("const char *",typeinfo) ||
-	     SWIG_TypeCheck("const signed char *",typeinfo) ||
-	     SWIG_TypeCheck("const unsigned char *",typeinfo) ||
-	     SWIG_TypeCheck("std::string",typeinfo);
-      } break;
-      default: $1 = 0; break;
-      }
-  }    
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  void *ptr;
-  $1 = !caml_ptr_val_internal($input, &ptr,$descriptor);
-}
-
-#if 0
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE {
-  void *ptr;
-  $1 = !caml_ptr_val_internal($input, &ptr, $&1_descriptor);
-}
-
-#endif
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void * {
-  void *ptr;
-  $1 = !caml_ptr_val_internal($input, &ptr, 0);
-}
-
-/* ------------------------------------------------------------
- * Exception handling
- * ------------------------------------------------------------ */
-
-%typemap(throws) int, 
-                  long, 
-                  short, 
-                  unsigned int, 
-                  unsigned long, 
-                  unsigned short {
-  SWIG_exception($1,"Thrown exception from C++ (int)");
-}
-
-%typemap(throws) SWIGTYPE CLASS {
-  $&1_ltype temp = new $1_ltype($1);
-  SWIG_exception((int)temp,"Thrown exception from C++ (object)");
-}
-
-%typemap(throws) SWIGTYPE {
-  (void)$1;
-  SWIG_exception(0,"Thrown exception from C++ (unknown)");
-}
-
-%typemap(throws) char * {
-  SWIG_exception(0,$1);
-}
diff --git a/dependencies2013/win32/swig/Lib/ocaml/typemaps.i b/dependencies2013/win32/swig/Lib/ocaml/typemaps.i
deleted file mode 100644
index 7602ad62..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/typemaps.i
+++ /dev/null
@@ -1,371 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * The Ocaml module handles all types uniformly via typemaps. Here
- * are the definitions.
- * ----------------------------------------------------------------------------- */
-
-/* Pointers */
-
-%typemap(in) void ""
-
-%typemap(out) void "$result = Val_int(0);"
-
-%typemap(in) void * {
-    $1 = caml_ptr_val($input,$descriptor);
-}
-
-%typemap(varin) void * {
-    $1 = ($ltype)caml_ptr_val($input,$descriptor);
-}
-
-%typemap(out) void * {
-    $result = caml_val_ptr($1,$descriptor);
-}
-
-%typemap(varout) void * {
-    $result = caml_val_ptr($1,$descriptor);
-}
-
-#ifdef __cplusplus
-
-%typemap(in) SWIGTYPE & {
-    /* %typemap(in) SWIGTYPE & */
-    $1 = ($ltype) caml_ptr_val($input,$1_descriptor);
-}
-
-%typemap(in) SWIGTYPE && {
-    /* %typemap(in) SWIGTYPE && */
-    $1 = ($ltype) caml_ptr_val($input,$1_descriptor);
-}
-
-%typemap(varin) SWIGTYPE & {
-    /* %typemap(varin) SWIGTYPE & */
-    $1 = *(($ltype) caml_ptr_val($input,$1_descriptor));
-}
-
-%typemap(varin) SWIGTYPE && {
-    /* %typemap(varin) SWIGTYPE && */
-    $1 = *(($ltype) caml_ptr_val($input,$1_descriptor));
-}
-
-%typemap(out) SWIGTYPE & {
-    /* %typemap(out) SWIGTYPE & */
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	$result = callback(*fromval,caml_val_ptr((void *) &$1,$1_descriptor));
-    } else {
-	$result = caml_val_ptr ((void *) &$1,$1_descriptor);
-    }
-}
-
-%typemap(out) SWIGTYPE && {
-    /* %typemap(out) SWIGTYPE && */
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	$result = callback(*fromval,caml_val_ptr((void *) &$1,$1_descriptor));
-    } else {
-	$result = caml_val_ptr ((void *) &$1,$1_descriptor);
-    }
-}
-
-#if 0
-%typemap(argout) SWIGTYPE & {
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	swig_result =
-	    caml_list_append(swig_result,
-			     callback(*fromval,caml_val_ptr((void *) $1,
-							    $1_descriptor)));
-    } else {
-	swig_result =
-	    caml_list_append(swig_result,
-			     caml_val_ptr ((void *) $1,$1_descriptor));
-    }
-}
-%typemap(argout) SWIGTYPE && {
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	swig_result =
-	    caml_list_append(swig_result,
-			     callback(*fromval,caml_val_ptr((void *) $1,
-							    $1_descriptor)));
-    } else {
-	swig_result =
-	    caml_list_append(swig_result,
-			     caml_val_ptr ((void *) $1,$1_descriptor));
-    }
-}
-#endif
-
-%typemap(argout) const SWIGTYPE & { }
-%typemap(argout) const SWIGTYPE && { }
-
-%typemap(in) SWIGTYPE {
-    $1 = *(($&1_ltype) caml_ptr_val($input,$&1_descriptor)) ;
-}
-
-%typemap(out) SWIGTYPE {
-    /* %typemap(out) SWIGTYPE */
-    $&1_ltype temp = new $ltype((const $1_ltype &) $1);
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	$result = callback(*fromval,caml_val_ptr((void *)temp,$&1_descriptor));
-    } else {
-	$result = caml_val_ptr ((void *)temp,$&1_descriptor);
-    }
-}
-
-%typemap(in) char *& (char *temp) {
-  /* %typemap(in) char *& */
-  temp = (char*)caml_val_ptr($1,$descriptor);
-  $1 = &temp;
-}
-
-%typemap(argout) char *& {
-  /* %typemap(argout) char *& */
-  swig_result =	caml_list_append(swig_result,caml_val_string_len(*$1, strlen(*$1)));
-}
-
-#else
-
-%typemap(in) SWIGTYPE {
-    $1 = *(($&1_ltype) caml_ptr_val($input,$&1_descriptor)) ;
-}
-
-%typemap(out) SWIGTYPE {
-    /* %typemap(out) SWIGTYPE */
-    void *temp = calloc(1,sizeof($ltype));
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    memmove( temp, &$1, sizeof( $1_type ) );
-    if( fromval ) {
-	$result = callback(*fromval,caml_val_ptr((void *)temp,$&1_descriptor));
-    } else {
-	$result = caml_val_ptr ((void *)temp,$&1_descriptor);
-    }
-}
-
-%apply SWIGTYPE { const SWIGTYPE & };
-%apply SWIGTYPE { const SWIGTYPE && };
-
-#endif
-
-/* The SIMPLE_MAP macro below defines the whole set of typemaps needed
-   for simple types. */
-
-%define SIMPLE_MAP(C_NAME, C_TO_MZ, MZ_TO_C)
-/* In */
-%typemap(in) C_NAME {
-    $1 = MZ_TO_C($input);
-}
-%typemap(varin) C_NAME {
-    $1 = MZ_TO_C($input);
-}
-%typemap(in) C_NAME & ($*1_ltype temp) {
-    temp = ($*1_ltype) MZ_TO_C($input);
-    $1 = &temp;
-}
-%typemap(varin) C_NAME & {
-    $1 = MZ_TO_C($input);
-}
-%typemap(directorout) C_NAME {
-    $1 = MZ_TO_C($input);
-}
-%typemap(in) C_NAME *INPUT ($*1_ltype temp) {
-    temp = ($*1_ltype) MZ_TO_C($input);
-    $1 = &temp;
-}
-%typemap(in,numinputs=0) C_NAME *OUTPUT ($*1_ltype temp) {
-    $1 = &temp;
-}
-/* Out */
-%typemap(out) C_NAME {
-    $result = C_TO_MZ($1);
-}
-%typemap(varout) C_NAME {
-    $result = C_TO_MZ($1);
-}
-%typemap(varout) C_NAME & {
-    /* %typemap(varout) C_NAME & (generic) */
-    $result = C_TO_MZ($1);
-}
-%typemap(argout) C_NAME *OUTPUT {
-    swig_result = caml_list_append(swig_result,C_TO_MZ((long)*$1));
-}
-%typemap(out) C_NAME & {
-    /* %typemap(out) C_NAME & (generic) */
-    $result = C_TO_MZ(*$1);
-}
-%typemap(argout) C_NAME & {
-    swig_result = caml_list_append(swig_result,C_TO_MZ((long)*$1));
-}
-%typemap(directorin) C_NAME {
-    args = caml_list_append(args,C_TO_MZ($1));
-}
-%enddef
-
-SIMPLE_MAP(bool, caml_val_bool, caml_long_val);
-SIMPLE_MAP(oc_bool, caml_val_bool, caml_long_val);
-SIMPLE_MAP(char, caml_val_char, caml_long_val);
-SIMPLE_MAP(signed char, caml_val_char, caml_long_val);
-SIMPLE_MAP(unsigned char, caml_val_uchar, caml_long_val);
-SIMPLE_MAP(int, caml_val_int, caml_long_val);
-SIMPLE_MAP(short, caml_val_short, caml_long_val);
-SIMPLE_MAP(wchar_t, caml_val_short, caml_long_val);
-SIMPLE_MAP(long, caml_val_long, caml_long_val);
-SIMPLE_MAP(ptrdiff_t, caml_val_int, caml_long_val);
-SIMPLE_MAP(unsigned int, caml_val_uint, caml_long_val);
-SIMPLE_MAP(unsigned short, caml_val_ushort, caml_long_val);
-SIMPLE_MAP(unsigned long, caml_val_ulong, caml_long_val);
-SIMPLE_MAP(size_t, caml_val_int, caml_long_val);
-SIMPLE_MAP(float, caml_val_float, caml_double_val);
-SIMPLE_MAP(double, caml_val_double, caml_double_val);
-SIMPLE_MAP(long long,caml_val_ulong,caml_long_val);
-SIMPLE_MAP(unsigned long long,caml_val_ulong,caml_long_val);
-
-/* Void */
-
-%typemap(out) void "$result = Val_unit;";
-
-/* Pass through value */
-
-%typemap (in) value,caml::value,CAML_VALUE "$1=$input;";
-%typemap (out) value,caml::value,CAML_VALUE "$result=$1;";
-
-/* Arrays */
-
-%typemap(in) ArrayCarrier * {
-    $1 = ($ltype)caml_ptr_val($input,$1_descriptor);
-}
-
-%typemap(out) ArrayCarrier * {
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	$result = callback(*fromval,caml_val_ptr((void *)$1,$1_descriptor));
-    } else {
-	$result = caml_val_ptr ((void *)$1,$1_descriptor);
-    }
-}
-
-#if 0
-%include <carray.i>
-#endif
-
-/* Handle char arrays as strings */
-
-%define %char_ptr_in(how)
-%typemap(how)  char *, signed char *, unsigned char * {
-    /* %typemap(how) char * ... */
-    $1 = ($ltype)caml_string_val($input);
-}
-/* Again work around the empty array bound bug */
-%typemap(how) char [ANY], signed char [ANY], unsigned char [ANY] {
-    /* %typemap(how) char [ANY] ... */
-    char *temp = caml_string_val($input);
-    strcpy((char *)$1,temp); 
-    /* strncpy would be better but we might not have an array size */
-}
-%enddef
-
-%char_ptr_in(in);
-%char_ptr_in(varin);
-%char_ptr_in(directorout);
-
-%define %char_ptr_out(how) 
-%typemap(how) 
-    char *, signed char *, unsigned char *, 
-    const char *, const signed char *, const unsigned char * {
-    $result = caml_val_string((char *)$1);
-}
-/* I'd like to use the length here but can't because it might be empty */
-%typemap(how)
-    char [ANY], signed char [ANY], unsigned char [ANY],
-    const char [ANY], const signed char [ANY], const unsigned char [ANY] {
-    $result = caml_val_string((char *)$1);
-}
-%enddef
-
-%char_ptr_out(out);
-%char_ptr_out(varout);
-%char_ptr_out(directorin);
-
-%define %swigtype_ptr_in(how)
-%typemap(how) SWIGTYPE * {
-    /* %typemap(how) SWIGTYPE * */
-    $1 = ($ltype)caml_ptr_val($input,$1_descriptor);
-}
-%typemap(how) SWIGTYPE (CLASS::*) {
-    /* %typemap(how) SWIGTYPE (CLASS::*) */
-    void *v = caml_ptr_val($input,$1_descriptor);
-    memcpy(& $1, &v, sizeof(v));
-}
-%enddef
-
-%define %swigtype_ptr_out(how)
-%typemap(out) SWIGTYPE * {
-    /* %typemap(how) SWIGTYPE *, SWIGTYPE (CLASS::*) */
-    CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
-    if( fromval ) {
-	$result = callback(*fromval,caml_val_ptr((void *)$1,$1_descriptor));
-    } else {
-	$result = caml_val_ptr ((void *)$1,$1_descriptor);
-    }
-}
-%typemap(how) SWIGTYPE (CLASS::*) {
-    /* %typemap(how) SWIGTYPE *, SWIGTYPE (CLASS::*) */
-    void *v;
-    memcpy(&v,& $1, sizeof(void *));
-    $result = caml_val_ptr (v,$1_descriptor);
-}
-%enddef
-
-%swigtype_ptr_in(in);
-%swigtype_ptr_in(varin);
-%swigtype_ptr_in(directorout);
-%swigtype_ptr_out(out);
-%swigtype_ptr_out(varout);
-%swigtype_ptr_out(directorin);
-
-%define %swigtype_array_fail(how,msg)
-%typemap(how) SWIGTYPE [] {
-    failwith(msg);
-}
-%enddef
-
-%swigtype_array_fail(in,"Array arguments for arbitrary types need a typemap");
-%swigtype_array_fail(varin,"Assignment to global arrays for arbitrary types need a typemap");
-%swigtype_array_fail(out,"Array arguments for arbitrary types need a typemap");
-%swigtype_array_fail(varout,"Array variables need a typemap");
-%swigtype_array_fail(directorin,"Array results with arbitrary types need a typemap");
-%swigtype_array_fail(directorout,"Array arguments with arbitrary types need a typemap");
-
-/* C++ References */
-
-/* Enums */
-%define %swig_enum_in(how)
-%typemap(how) enum SWIGTYPE {
-    $1 = ($type)caml_long_val_full($input,"$type_marker");
-}
-%enddef
-
-%define %swig_enum_out(how)
-%typemap(how) enum SWIGTYPE {
-    $result = callback2(*caml_named_value(SWIG_MODULE "_int_to_enum"),*caml_named_value("$type_marker"),Val_int((int)$1));
-}
-%enddef
-
-%swig_enum_in(in)
-%swig_enum_in(varin)
-%swig_enum_in(directorout)
-%swig_enum_out(out)
-%swig_enum_out(varout)
-%swig_enum_out(directorin)
-
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
diff --git a/dependencies2013/win32/swig/Lib/ocaml/typeregister.swg b/dependencies2013/win32/swig/Lib/ocaml/typeregister.swg
deleted file mode 100644
index c3ba904a..00000000
--- a/dependencies2013/win32/swig/Lib/ocaml/typeregister.swg
+++ /dev/null
@@ -1,2 +0,0 @@
-SWIGEXT void SWIG_init() {
-  SWIG_InitializeModule(0);
diff --git a/dependencies2013/win32/swig/Lib/octave/attribute.i b/dependencies2013/win32/swig/Lib/octave/attribute.i
deleted file mode 100644
index 779716cd..00000000
--- a/dependencies2013/win32/swig/Lib/octave/attribute.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/attribute.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/octave/boost_shared_ptr.i
deleted file mode 100644
index e9186205..00000000
--- a/dependencies2013/win32/swig/Lib/octave/boost_shared_ptr.i
+++ /dev/null
@@ -1,311 +0,0 @@
-%include <shared_ptr.i>
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE 
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-// plain value
-%typemap(in) CONST TYPE (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) {
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(out) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(varout) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer
-// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) CONST TYPE * (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE * {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0;
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain reference
-%typemap(in) CONST TYPE & (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE & {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = *%const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = *%const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer by reference
-// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) TYPE *CONST& (void  *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    temp = %const_cast(tempshared.get(), $*1_ltype);
-  } else {
-    temp = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $*1_ltype);
-  }
-  $1 = &temp;
-}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) TYPE *CONST& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) TYPE *CONST& %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) $1 = *(%reinterpret_cast(argp, $&ltype));
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  int newmem = 0;
-  void *argp = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = argp ? *(%reinterpret_cast(argp, $&ltype)) : SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE >();
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// shared_ptr by reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 && *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-  if ($owner) delete $1;
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) tempshared = *%reinterpret_cast(argp, $*ltype);
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype);
-  temp = &tempshared;
-  $1 = &temp;
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 && **$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varout typemap not implemented"
-%}
-
-// Typecheck typemaps
-// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting 
-// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) 
-                      TYPE CONST,
-                      TYPE CONST &,
-                      TYPE CONST *,
-                      TYPE *CONST&,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), 0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/octave/carrays.i b/dependencies2013/win32/swig/Lib/octave/carrays.i
deleted file mode 100644
index 014de37f..00000000
--- a/dependencies2013/win32/swig/Lib/octave/carrays.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%define %array_class(TYPE,NAME)
-  %array_class_wrap(TYPE,NAME,__paren__,__paren_asgn__)
-%enddef
-
-%include <typemaps/carrays.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/cdata.i b/dependencies2013/win32/swig/Lib/octave/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/octave/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/cmalloc.i b/dependencies2013/win32/swig/Lib/octave/cmalloc.i
deleted file mode 100644
index 248f06b9..00000000
--- a/dependencies2013/win32/swig/Lib/octave/cmalloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cmalloc.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/director.swg b/dependencies2013/win32/swig/Lib/octave/director.swg
deleted file mode 100644
index e80877ef..00000000
--- a/dependencies2013/win32/swig/Lib/octave/director.swg
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that Octave proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
-
-#include <exception>
-
-namespace Swig {
-
-  class Director {
-    octave_swig_type *self;
-    bool swig_disowned;
-
-    Director(const Director &x);
-    Director &operator=(const Director &rhs);
-  public:
-
-    Director(void *vptr):self(0), swig_disowned(false) {
-      set_rtdir(vptr, this);
-    }
-
-    ~Director() {
-      swig_director_destroyed(self, this);
-      if (swig_disowned)
-	self->decref();
-    }
-
-    void swig_set_self(octave_swig_type *new_self) {
-      assert(!swig_disowned);
-      self = new_self;
-    }
-
-    octave_swig_type *swig_get_self() const {
-      return self;
-    }
-
-    void swig_disown() {
-      if (swig_disowned)
-	return;
-      swig_disowned = true;
-      self->incref();
-    }
-  };
-
-  struct DirectorTypeMismatchException {
-    static void raise(const char *msg) {
-      // ... todo
-      throw(DirectorTypeMismatchException());
-    }
-
-    static void raise(const octave_value &ov, const char *msg) {
-      // ... todo
-      raise(msg);
-    }
-  };
-
-  struct DirectorPureVirtualException {
-    static void raise(const char *msg) {
-      // ... todo
-      throw(DirectorPureVirtualException());
-    }
-
-    static void raise(const octave_value &ov, const char *msg) {
-      // ... todo
-      raise(msg);
-    }
-  };
-
-  SWIGINTERN rtdir_map *get_rtdir_map() {
-    static swig_module_info *module = 0;
-    if (!module)
-      module = SWIG_GetModule(0);
-    if (!module)
-      return 0;
-    if (!module->clientdata)
-      module->clientdata = new rtdir_map;
-    return (rtdir_map *) module->clientdata;
-  }
-
-  SWIGINTERNINLINE void set_rtdir(void *vptr, Director *d) {
-    rtdir_map *rm = get_rtdir_map();
-    if (rm)
-      (*rm)[vptr] = d;
-  }
-
-  SWIGINTERNINLINE void erase_rtdir(void *vptr) {
-    rtdir_map *rm = get_rtdir_map();
-    if (rm)
-      (*rm).erase(vptr);
-  }
-
-  SWIGINTERNINLINE Director *get_rtdir(void *vptr) {
-    rtdir_map *rm = get_rtdir_map();
-    if (!rm)
-      return 0;
-    rtdir_map::const_iterator pos = rm->find(vptr);
-    Director *rtdir = (pos != rm->end())? pos->second : 0;
-    return rtdir;
-  }
-
-  SWIGRUNTIME void swig_director_destroyed(octave_swig_type *self, Director *d) {
-    self->director_destroyed(d);
-  }
-
-  SWIGRUNTIME octave_swig_type *swig_director_get_self(Director *d) {
-    return d->swig_get_self();
-  }
-
-  SWIGRUNTIME void swig_director_set_self(Director *d, octave_swig_type *self) {
-    d->swig_set_self(self);
-  }
-
-}
-
-SWIGRUNTIME void swig_acquire_ownership(void *vptr) {
-  //  assert(0);
-  // ... todo
-}
-
-SWIGRUNTIME void swig_acquire_ownership_array(void *vptr) {
-  //  assert(0);
-  // ... todo
-}
-
-SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own) {
-  //  assert(0);
-  // ... todo
-}
diff --git a/dependencies2013/win32/swig/Lib/octave/exception.i b/dependencies2013/win32/swig/Lib/octave/exception.i
deleted file mode 100644
index 2f0f489a..00000000
--- a/dependencies2013/win32/swig/Lib/octave/exception.i
+++ /dev/null
@@ -1,14 +0,0 @@
-%include <typemaps/exception.swg>
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), %block(%error(code, msg); SWIG_fail; ))
-}
-
-%define SWIG_RETHROW_OCTAVE_EXCEPTIONS
-  /* rethrow any exceptions thrown by Octave */
-%#if SWIG_OCTAVE_PREREQ(4,2,0)
-  catch (octave::execution_exception& _e) { throw; }
-  catch (octave::exit_exception& _e) { throw; }
-  catch (octave::interrupt_exception& _e) { throw; }
-%#endif
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/octave/factory.i b/dependencies2013/win32/swig/Lib/octave/factory.i
deleted file mode 100644
index 46a0a873..00000000
--- a/dependencies2013/win32/swig/Lib/octave/factory.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/factory.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/implicit.i b/dependencies2013/win32/swig/Lib/octave/implicit.i
deleted file mode 100644
index 152c2b05..00000000
--- a/dependencies2013/win32/swig/Lib/octave/implicit.i
+++ /dev/null
@@ -1,7 +0,0 @@
-%include <std_common.i>
-%include <typemaps/implicit.swg>
-
-#warning "This file provides the %implicit directive, which is an old and fragile"
-#warning "way to implement the C++ implicit conversion mechanism."
-#warning "Try using the more robust '%implicitconv Type;' directive instead."
-
diff --git a/dependencies2013/win32/swig/Lib/octave/octave.swg b/dependencies2013/win32/swig/Lib/octave/octave.swg
deleted file mode 100644
index 872054d8..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octave.swg
+++ /dev/null
@@ -1,8 +0,0 @@
-%include <typemaps/swigmacros.swg>
-%include <typemaps/fragments.swg>
-%include <octruntime.swg>
-%include <octuserdir.swg>
-%include <octtypemaps.swg>
-%include <octopers.swg>
-
-%define %docstring %feature("docstring") %enddef
diff --git a/dependencies2013/win32/swig/Lib/octave/octcomplex.swg b/dependencies2013/win32/swig/Lib/octave/octcomplex.swg
deleted file mode 100644
index a3e9ebf7..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octcomplex.swg
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-  Defines the As/From conversors for double/float complex, you need to
-  provide complex Type, the Name you want to use in the conversors,
-  the complex Constructor method, and the Real and Imag complex
-  accesor methods.
-
-  See the std_complex.i and ccomplex.i for concrete examples.
-*/
-
-/* the common from conversor */
-%define %swig_fromcplx_conv(Type, OctConstructor, Real, Imag)
-     %fragment(SWIG_From_frag(Type),"header")
-{
-  SWIGINTERNINLINE octave_value
-    SWIG_From(Type)(const Type& c)
-    {
-      return octave_value(OctConstructor(Real(c), Imag(c)));
-    }
-}
-%enddef
-
-// the double case
-%define %swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-     %fragment(SWIG_AsVal_frag(Type),"header",
-	       fragment=SWIG_AsVal_frag(double))
-{
-  SWIGINTERN int
-    SWIG_AsVal(Type) (const octave_value& ov, Type* val)
-    {
-      if (ov.is_complex_scalar()) {
-	if (val) {
-	  Complex c(ov.complex_value());
-	  *val=Constructor(c.real(),c.imag());
-	}
-	return SWIG_OK;
-      } else {
-	double d;    
-	int res = SWIG_AddCast(SWIG_AsVal(double)(ov, &d));
-	if (SWIG_IsOK(res)) {
-	  if (val)
-	    *val = Constructor(d, 0.0);
-	  return res;
-	}
-      }
-      return SWIG_TypeError;
-    }
-}
-%swig_fromcplx_conv(Type, Complex, Real, Imag);
-%enddef
-
-// the float case
-%define %swig_cplxflt_conv(Type, Constructor, Real, Imag)
-     %fragment(SWIG_AsVal_frag(Type),"header",
-	       fragment=SWIG_AsVal_frag(float)) {
-  SWIGINTERN int
-    SWIG_AsVal(Type) (const octave_value& ov, Type* val)
-    {
-      if (ov.is_complex_scalar()) {
-	if (val) {
-	  Complex c(ov.complex_value());
-	  double re = c.real();
-	  double im = c.imag();
-	  if ((-FLT_MAX <= re && re <= FLT_MAX) && (-FLT_MAX <= im && im <= FLT_MAX)) {
-	    if (val)
-	      *val = Constructor(%numeric_cast(re, float),
-				 %numeric_cast(im, float));
-	    return SWIG_OK;
-	  } else
-	    return SWIG_OverflowError;
-	}
-      } else {
-	float d;    
-	int res = SWIG_AddCast(SWIG_AsVal(float)(ov, &d));
-	if (SWIG_IsOK(res)) {
-	  if (val)
-	    *val = Constructor(d, 0.0);
-	  return res;
-	}
-      }
-      return SWIG_TypeError;
-    }
-}
-
-%swig_fromcplx_conv(Type, FloatComplex, Real, Imag);
-%enddef
-
-#define %swig_cplxflt_convn(Type, Constructor, Real, Imag) \
-%swig_cplxflt_conv(Type, Constructor, Real, Imag)
-
-
-#define %swig_cplxdbl_convn(Type, Constructor, Real, Imag) \
-%swig_cplxdbl_conv(Type, Constructor, Real, Imag)
diff --git a/dependencies2013/win32/swig/Lib/octave/octcontainer.swg b/dependencies2013/win32/swig/Lib/octave/octcontainer.swg
deleted file mode 100644
index 771edbde..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octcontainer.swg
+++ /dev/null
@@ -1,623 +0,0 @@
-/* -----------------------------------------------------------------------------
- * octcontainer.swg
- *
- * Octave cell <-> C++ container wrapper
- *
- * This wrapper, and its iterator, allows a general use (and reuse) of
- * the mapping between C++ and Octave, thanks to the C++ templates.
- *
- * Of course, it needs the C++ compiler to support templates, but
- * since we will use this wrapper with the STL containers, that should
- * be the case.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <climits>
-#include <iostream>
-%}
-
-
-#if !defined(SWIG_NO_EXPORT_ITERATOR_METHODS)
-# if !defined(SWIG_EXPORT_ITERATOR_METHODS)
-#  define SWIG_EXPORT_ITERATOR_METHODS SWIG_EXPORT_ITERATOR_METHODS
-# endif
-#endif
-
-%include <octiterators.swg>
-
-// The Octave C++ Wrap
-
-%fragment("<stdexcept>");
-
-%include <std_except.i>
-
-%fragment(SWIG_Traits_frag(octave_value),"header",fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits<octave_value > {
-    typedef value_category category;
-    static const char* type_name() { return  "octave_value"; }
-  };
-  
-  template <>  struct traits_from<octave_value> {
-    typedef octave_value value_type;
-    static octave_value from(const value_type& val) {
-      return val;
-    }
-  };
-  
-  template <> 
-  struct traits_check<octave_value, value_category> {
-    static bool check(const octave_value&) {
-      return true;
-    }
-  };
-  
-  template <>  struct traits_asval<octave_value > {   
-    typedef octave_value value_type;
-    static int asval(const octave_value& obj, value_type *val) {
-      if (val) *val = obj;
-      return SWIG_OK;
-    }
-  };
-}
-}
-
-%fragment("OctSequence_Base","header",fragment="<stddef.h>")
-{
-%#include <functional>
-
-namespace std {
-  template <>
-  struct less <octave_value>
-  {
-    bool
-    operator()(const octave_value& v, const octave_value& w) const
-    { 
-      octave_value res = do_binary_op(octave_value::op_le,v,w);
-      return res.is_true();
-    }
-  };
-}
-
-namespace swig {
-  inline size_t
-  check_index(ptrdiff_t i, size_t size, bool insert = false) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size)
-	return (size_t) (i + size);
-    } else if ( (size_t) i < size ) {
-      return (size_t) i;
-    } else if (insert && ((size_t) i == size)) {
-      return size;
-    }
-    
-    throw std::out_of_range("index out of range");
-  }
-
-  inline size_t
-  slice_index(ptrdiff_t i, size_t size) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size) {
-	return (size_t) (i + size);
-      } else {
-	throw std::out_of_range("index out of range");
-      }
-    } else {
-      return ( (size_t) i < size ) ? ((size_t) i) : size;
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::iterator
-  getpos(Sequence* self, Difference i)  {
-    typename Sequence::iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::const_iterator
-  cgetpos(const Sequence* self, Difference i)  {
-    typename Sequence::const_iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence, class Difference>
-  inline Sequence*
-  getslice(const Sequence* self, Difference i, Difference j) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-
-    if (jj > ii) {
-      typename Sequence::const_iterator vb = self->begin();
-      typename Sequence::const_iterator ve = self->begin();
-      std::advance(vb,ii);
-      std::advance(ve,jj);
-      return new Sequence(vb, ve);
-    } else {
-      return new Sequence();
-    }
-  }
-
-  template <class Sequence, class Difference, class InputSeq>
-  inline void
-  setslice(Sequence* self, Difference i, Difference j, const InputSeq& v) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, true);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-    if (jj < ii) jj = ii;
-    size_t ssize = jj - ii;
-    if (ssize <= v.size()) {
-      typename Sequence::iterator sb = self->begin();
-      typename InputSeq::const_iterator vmid = v.begin();
-      std::advance(sb,ii);
-      std::advance(vmid, jj - ii);
-      self->insert(std::copy(v.begin(), vmid, sb), vmid, v.end());
-    } else {
-      typename Sequence::iterator sb = self->begin();
-      typename Sequence::iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      self->erase(sb,se);
-      self->insert(sb, v.begin(), v.end());
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline void
-  delslice(Sequence* self, Difference i, Difference j) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, true);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-    if (jj > ii) {
-      typename Sequence::iterator sb = self->begin();
-      typename Sequence::iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      self->erase(sb,se);
-    }
-  }
-}
-}
-
-%fragment("OctSequence_Cont","header",
-	  fragment="StdTraits",
-	  fragment="OctSequence_Base",
-	  fragment="OctSwigIterator_T")
-{
-namespace swig
-{
-  template <class T>
-    struct OctSequence_Ref // * octave can't support these, because of how assignment works
-  {
-    OctSequence_Ref(const octave_value& seq, int index)
-      : _seq(seq), _index(index)
-    {
-    }
-    
-    operator T () const
-    {
-      //      swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, _index);
-      octave_value item; // * todo
-      try {
-	return swig::as<T>(item, true);
-      } catch (std::exception& e) {
-	char msg[1024];
-	sprintf(msg, "in sequence element %d ", _index);
-	if (!Octave_Error_Occurred()) {
-	  %type_error(swig::type_name<T>());
-	}
-	SWIG_Octave_AddErrorMsg(msg);
-	SWIG_Octave_AddErrorMsg(e.what());
-	throw;
-      }
-    }
-
-    OctSequence_Ref& operator=(const T& v)
-    {
-      //      OctSequence_SetItem(_seq, _index, swig::from<T>(v));
-      // * todo
-      return *this;
-    }
-
-  private:
-    octave_value _seq;
-    int _index;
-  };
-
-  template <class T>
-  struct OctSequence_ArrowProxy
-  {
-    OctSequence_ArrowProxy(const T& x): m_value(x) {}
-    const T* operator->() const { return &m_value; }
-    operator const T*() const { return &m_value; }
-    T m_value;
-  };
-
-  template <class T, class Reference >
-  struct OctSequence_InputIterator
-  {
-    typedef OctSequence_InputIterator<T, Reference > self;
-
-    typedef std::random_access_iterator_tag iterator_category;
-    typedef Reference reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef int difference_type;
-
-    OctSequence_InputIterator()
-    {
-    }
-
-    OctSequence_InputIterator(const octave_value& seq, int index)
-      : _seq(seq), _index(index)
-    {
-    }
-
-    reference operator*() const
-    {
-      return reference(_seq, _index);
-    }
-
-    OctSequence_ArrowProxy<T>
-    operator->() const {
-      return OctSequence_ArrowProxy<T>(operator*());
-    }
-
-    bool operator==(const self& ri) const
-    {
-      return (_index == ri._index);
-    }
-
-    bool operator!=(const self& ri) const
-    {
-      return !(operator==(ri));
-    }
-
-    self& operator ++ ()
-    {
-      ++_index;
-      return *this;
-    }
-
-    self& operator -- ()
-    {
-      --_index;
-      return *this;
-    }
-
-    self& operator += (difference_type n)
-    {
-      _index += n;
-      return *this;
-    }
-
-    self operator +(difference_type n) const
-    {
-      return self(_seq, _index + n);
-    }
-
-    self& operator -= (difference_type n)
-    {
-      _index -= n;
-      return *this;
-    }
-
-    self operator -(difference_type n) const
-    {
-      return self(_seq, _index - n);
-    }
-
-    difference_type operator - (const self& ri) const
-    {
-      return _index - ri._index;
-    }
-
-    bool operator < (const self& ri) const
-    {
-      return _index < ri._index;
-    }
-
-    reference
-    operator[](difference_type n) const
-    {
-      return reference(_seq, _index + n);
-    }
-
-  private:
-    octave_value _seq;
-    difference_type _index;
-  };
-
-  template <class T>
-  struct OctSequence_Cont
-  {
-    typedef OctSequence_Ref<T> reference;
-    typedef const OctSequence_Ref<T> const_reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef int difference_type;
-    typedef int size_type;
-    typedef const pointer const_pointer;
-    typedef OctSequence_InputIterator<T, reference> iterator;
-    typedef OctSequence_InputIterator<T, const_reference> const_iterator;
-
-    OctSequence_Cont(const octave_value& seq) : _seq(seq)
-    {
-      // * assert that we have map type etc.
-      /*
-      if (!OctSequence_Check(seq)) {
-	throw std::invalid_argument("a sequence is expected");
-      }
-      _seq = seq;
-      Py_INCREF(_seq);
-      */
-    }
-
-    ~OctSequence_Cont()
-    {
-    }
-
-    size_type size() const
-    {
-      //      return static_cast<size_type>(OctSequence_Size(_seq));
-      return 0; // * todo
-    }
-
-    bool empty() const
-    {
-      return size() == 0;
-    }
-
-    iterator begin()
-    {
-      return iterator(_seq, 0);
-    }
-
-    const_iterator begin() const
-    {
-      return const_iterator(_seq, 0);
-    }
-
-    iterator end()
-    {
-      return iterator(_seq, size());
-    }
-
-    const_iterator end() const
-    {
-      return const_iterator(_seq, size());
-    }
-
-    reference operator[](difference_type n)
-    {
-      return reference(_seq, n);
-    }
-
-    const_reference operator[](difference_type n)  const
-    {
-      return const_reference(_seq, n);
-    }
-
-    bool check(bool set_err = true) const
-    {
-      int s = size();
-      for (int i = 0; i < s; ++i) {
-	//	swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, i);
-	octave_value item; // * todo
-	if (!swig::check<value_type>(item)) {
-	  if (set_err) {
-	    char msg[1024];
-	    sprintf(msg, "in sequence element %d", i);
-	    SWIG_Error(SWIG_RuntimeError, msg);
-	  }
-	  return false;
-	}
-      }
-      return true;
-    }
-
-  private:
-    octave_value _seq;
-  };
-
-}
-}
-
-%define %swig_sequence_iterator(Sequence...)
-#if defined(SWIG_EXPORT_ITERATOR_METHODS)
-  class iterator;
-  class reverse_iterator;
-  class const_iterator;
-  class const_reverse_iterator;
-
-  %typemap(out,noblock=1,fragment="OctSequence_Cont")
-    iterator, reverse_iterator, const_iterator, const_reverse_iterator {
-    $result = SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &)),
-				 swig::OctSwigIterator::descriptor(),SWIG_POINTER_OWN);
-  }
-  %typemap(out,fragment="OctSequence_Cont")
-    std::pair<iterator, iterator>, std::pair<const_iterator, const_iterator> {
-    octave_value_list tmpc;
-    tmpc.append(SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first),
-				   swig::OctSwigIterator::descriptor(),SWIG_POINTER_OWN));
-    tmpc.append(SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).second),
-				   swig::OctSwigIterator::descriptor(),SWIG_POINTER_OWN));
-    $result = Cell(tmpc);
-  }
-
-  %fragment("SwigPyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="OctSequence_Cont") {}
-
-  %typemap(out,fragment="OctPairBoolOutputIterator")
-    std::pair<iterator, bool>, std::pair<const_iterator, bool> {
-    octave_value_list tmpc;
-    tmpc.append(SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first),
-				   swig::OctSwigIterator::descriptor(),SWIG_POINTER_OWN));
-    tmpc.append(SWIG_From(bool)(%static_cast($1,const $type &).second));
-    $result = Cell(tmpc);
-  }
-
-  %typemap(in,noblock=1,fragment="OctSequence_Cont")
-    iterator(swig::OctSwigIterator *iter = 0, int res),
-    reverse_iterator(swig::OctSwigIterator *iter = 0, int res),
-    const_iterator(swig::OctSwigIterator *iter = 0, int res),
-    const_reverse_iterator(swig::OctSwigIterator *iter = 0, int res) {
-    res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::OctSwigIterator::descriptor(), 0);
-    if (!SWIG_IsOK(res) || !iter) {
-      %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-    } else {
-      swig::OctSwigIterator_T<$type > *iter_t = dynamic_cast<swig::OctSwigIterator_T<$type > *>(iter);
-      if (iter_t) {
-	$1 = iter_t->get_current();
-      } else {
-	%argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-      }
-    }
-  }
-
-  %typecheck(%checkcode(ITERATOR),noblock=1,fragment="OctSequence_Cont")
-    iterator, reverse_iterator, const_iterator, const_reverse_iterator {
-    swig::OctSwigIterator *iter = 0;
-    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::OctSwigIterator::descriptor(), 0);
-    $1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::OctSwigIterator_T<$type > *>(iter) != 0));
-  }
-
-  %fragment("OctSequence_Cont");
-#endif //SWIG_EXPORT_ITERATOR_METHODS
-%enddef
-
-// The octave container methods
-
-%define %swig_container_methods(Container...)
-%enddef
-
-%define %swig_sequence_methods_common(Sequence...)
-  %swig_sequence_iterator(%arg(Sequence))
-  %swig_container_methods(%arg(Sequence))
-  
-  %fragment("OctSequence_Base");
-
-  %extend {
-    value_type pop() throw (std::out_of_range) {
-      if (self->size() == 0)
-	throw std::out_of_range("pop from empty container");
-      Sequence::value_type x = self->back();
-      self->pop_back();
-      return x;
-    }
-
-    value_type __paren__(difference_type i) throw (std::out_of_range) {
-      return *(swig::cgetpos(self, i));
-    }
-
-    void __paren_asgn__(difference_type i, value_type x) throw (std::out_of_range) {
-      *(swig::getpos(self,i)) = x;
-    }
-
-    void append(value_type x) {
-      self->push_back(x);
-    }
-  }
-
-%enddef
-
-%define %swig_sequence_methods(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-%enddef
-
-%define %swig_sequence_methods_val(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-%enddef
-
-//
-// Common fragments
-//
-
-%fragment("StdSequenceTraits","header",
-	  fragment="StdTraits",
-	  fragment="OctSequence_Cont")
-{
-namespace swig {
-  template <class OctSeq, class Seq>
-  inline void
-  assign(const OctSeq& octseq, Seq* seq) {
-%#ifdef SWIG_STD_NOASSIGN_STL
-    typedef typename OctSeq::value_type value_type;
-    typename OctSeq::const_iterator it = octseq.begin();
-    for (;it != octseq.end(); ++it) {
-      seq->insert(seq->end(),(value_type)(*it));
-    }
-%#else
-    seq->assign(octseq.begin(), octseq.end());
-%#endif
-  }
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_asptr_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-
-    static int asptr(const octave_value& obj, sequence **seq) {
-      if (!obj.is_defined() || Swig::swig_value_deref(obj)) {
-	sequence *p;
-	swig_type_info *descriptor = swig::type_info<sequence>();
-	if (descriptor && SWIG_IsOK(SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
-      } else if (obj.is_cell()) {
-	try {
-	  OctSequence_Cont<value_type> octseq(obj);
-	  if (seq) {
-	    sequence *pseq = new sequence();
-	    assign(octseq, pseq);
-	    *seq = pseq;
-	    return SWIG_NEWOBJ;
-	  } else {
-	    return octseq.check() ? SWIG_OK : SWIG_ERROR;
-	  }
-	} catch (std::exception& e) {
-	  if (seq&&!error_state)
-	    error("swig type error: %s",e.what());
-	  return SWIG_ERROR;
-	}
-      }
-      return SWIG_ERROR;
-    }
-  };
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_from_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-    typedef typename Seq::size_type size_type;
-    typedef typename sequence::const_iterator const_iterator;
-
-    static octave_value from(const sequence& seq) {
-#ifdef SWIG_OCTAVE_EXTRA_NATIVE_CONTAINERS
-      swig_type_info *desc = swig::type_info<sequence>();
-      if (desc && desc->clientdata) {
-	return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
-      }
-#endif
-      size_type size = seq.size();
-      if (size <= (size_type)INT_MAX) {
-	Cell c(size,1);
-	int i = 0;
-	for (const_iterator it = seq.begin();
-	     it != seq.end(); ++it, ++i) {
-	  c(i) = swig::from<value_type>(*it);
-	}
-	return c;
-      } else {
-	error("swig overflow error: sequence size not valid in octave");
-	return octave_value();
-      }
-      return octave_value();
-    }
-  };
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/octave/octfragments.swg b/dependencies2013/win32/swig/Lib/octave/octfragments.swg
deleted file mode 100644
index 8b137891..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octfragments.swg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dependencies2013/win32/swig/Lib/octave/octiterators.swg b/dependencies2013/win32/swig/Lib/octave/octiterators.swg
deleted file mode 100644
index 79a20f83..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octiterators.swg
+++ /dev/null
@@ -1,357 +0,0 @@
-/* -----------------------------------------------------------------------------
- * octiterators.swg
- *
- * Users can derive form the OctSwigIterator to implemet their
- * own iterators. As an example (real one since we use it for STL/STD
- * containers), the template OctSwigIterator_T does the
- * implementation for generic C++ iterators.
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%fragment("OctSwigIterator","header",fragment="<stddef.h>") {  
-namespace swig {
-  struct stop_iteration {
-  };
-
-  struct OctSwigIterator {
-  private:
-    octave_value _seq;
-
-  protected:
-    OctSwigIterator(octave_value seq) : _seq(seq)
-    {
-    }
-      
-  public:
-    virtual ~OctSwigIterator() {}
-
-    virtual octave_value value() const = 0;
-
-    virtual OctSwigIterator *incr(size_t n = 1) = 0;
-
-    virtual OctSwigIterator *decr(size_t n = 1)
-    {
-      throw stop_iteration();
-    }
-
-    virtual ptrdiff_t distance(const OctSwigIterator &x) const
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-
-    virtual bool equal (const OctSwigIterator &x) const
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-    
-    virtual OctSwigIterator *copy() const = 0;
-
-    octave_value next()
-    {
-      octave_value obj = value();
-      incr();
-      return obj;
-    }
-
-    octave_value previous()
-    {
-      decr();
-      return value();
-    }
-
-    OctSwigIterator *advance(ptrdiff_t n)
-    {
-      return  (n > 0) ?  incr(n) : decr(-n);
-    }
-      
-    bool operator == (const OctSwigIterator& x)  const
-    {
-      return equal(x);
-    }
-      
-    bool operator != (const OctSwigIterator& x) const
-    {
-      return ! operator==(x);
-    }
-
-    OctSwigIterator* operator ++ () {
-      incr();
-      return this;
-    }
-
-    OctSwigIterator* operator -- () {
-      decr();
-      return this;
-    }
-      
-    OctSwigIterator* operator + (ptrdiff_t n) const
-    {
-      return copy()->advance(n);
-    }
-
-    OctSwigIterator* operator - (ptrdiff_t n) const
-    {
-      return copy()->advance(-n);
-    }
-      
-    ptrdiff_t operator - (const OctSwigIterator& x) const
-    {
-      return x.distance(*this);
-    }
-      
-    static swig_type_info* descriptor() {
-      static int init = 0;
-      static swig_type_info* desc = 0;
-      if (!init) {
-	desc = SWIG_TypeQuery("swig::OctSwigIterator *");
-	init = 1;
-      }	
-      return desc;
-    }    
-  };
-}
-}
-
-%fragment("OctSwigIterator_T","header",fragment="<stddef.h>",fragment="OctSwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
-namespace swig {
-  template<typename OutIterator>
-  class OctSwigIterator_T :  public OctSwigIterator
-  {
-  public:
-    typedef OutIterator out_iterator;
-    typedef typename std::iterator_traits<out_iterator>::value_type value_type;    
-    typedef OctSwigIterator_T<out_iterator> self_type;
-
-    OctSwigIterator_T(out_iterator curr, octave_value seq)
-      : OctSwigIterator(seq), current(curr)
-    {
-    }
-
-    const out_iterator& get_current() const
-    {
-      return current;
-    }
-
-    
-    bool equal (const OctSwigIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return (current == iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-    
-    ptrdiff_t distance(const OctSwigIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return std::distance(current, iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }    
-    
-  protected:
-    out_iterator current;
-  };
-  
-  template <class ValueType>
-  struct from_oper 
-  {
-    typedef const ValueType& argument_type;
-    typedef octave_value result_type;
-    result_type operator()(argument_type v) const
-    {
-      return swig::from(v);
-    }
-  };
-
-  template<typename OutIterator, 
-	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class OctSwigIteratorOpen_T :  public OctSwigIterator_T<OutIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutIterator out_iterator;
-    typedef ValueType value_type;
-    typedef OctSwigIterator_T<out_iterator>  base;
-    typedef OctSwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
-    
-    OctSwigIteratorOpen_T(out_iterator curr, octave_value seq)
-      : OctSwigIterator_T<OutIterator>(curr, seq)
-    {
-    }
-    
-    octave_value value() const {
-      return from(static_cast<const value_type&>(*(base::current)));
-    }
-    
-    OctSwigIterator *copy() const
-    {
-      return new self_type(*this);
-    }
-
-    OctSwigIterator *incr(size_t n = 1)
-    {
-      while (n--) {
-	++base::current;
-      }
-      return this;
-    }
-
-    OctSwigIterator *decr(size_t n = 1)
-    {
-      while (n--) {
-	--base::current;
-      }
-      return this;
-    }
-  };
-
-  template<typename OutIterator, 
-	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class OctSwigIteratorClosed_T :  public OctSwigIterator_T<OutIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutIterator out_iterator;
-    typedef ValueType value_type;
-    typedef OctSwigIterator_T<out_iterator>  base;    
-    typedef OctSwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
-    
-    OctSwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, octave_value seq)
-      : OctSwigIterator_T<OutIterator>(curr, seq), begin(first), end(last)
-    {
-    }
-    
-    octave_value value() const {
-      if (base::current == end) {
-	throw stop_iteration();
-      } else {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-    }
-    
-    OctSwigIterator *copy() const
-    {
-      return new self_type(*this);
-    }
-
-    OctSwigIterator *incr(size_t n = 1)
-    {
-      while (n--) {
-	if (base::current == end) {
-	  throw stop_iteration();
-	} else {
-	  ++base::current;
-	}
-      }
-      return this;
-    }
-
-    OctSwigIterator *decr(size_t n = 1)
-    {
-      while (n--) {
-	if (base::current == begin) {
-	  throw stop_iteration();
-	} else {
-	  --base::current;
-	}
-      }
-      return this;
-    }
-
-  private:
-    out_iterator begin;
-    out_iterator end;
-  };
-
-  template<typename OutIter>
-  inline OctSwigIterator*
-  make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, octave_value seq = octave_value())
-  {
-    return new OctSwigIteratorClosed_T<OutIter>(current, begin, end, seq);
-  }
-
-  template<typename OutIter>
-  inline OctSwigIterator*
-  make_output_iterator(const OutIter& current, octave_value seq = octave_value())
-  {
-    return new OctSwigIteratorOpen_T<OutIter>(current, seq);
-  }
-}
-}
-
-
-%fragment("OctSwigIterator");
-namespace swig 
-{
-// Throw a StopIteration exception
-  %ignore stop_iteration;
-  struct stop_iteration {};
-  
-  %typemap(throws) stop_iteration {
-    error("stop_iteration exception");
-    SWIG_fail;
-  }
-
-// Mark methods that return new objects
-  %newobject OctSwigIterator::copy;
-  %newobject OctSwigIterator::operator + (ptrdiff_t n) const;
-  %newobject OctSwigIterator::operator - (ptrdiff_t n) const;
-
-  %nodirector OctSwigIterator;
-
-  %catches(swig::stop_iteration) OctSwigIterator::value() const;
-  %catches(swig::stop_iteration) OctSwigIterator::incr(size_t n = 1);
-  %catches(swig::stop_iteration) OctSwigIterator::decr(size_t n = 1);
-  %catches(std::invalid_argument) OctSwigIterator::distance(const OctSwigIterator &x) const;
-  %catches(std::invalid_argument) OctSwigIterator::equal (const OctSwigIterator &x) const;
-  %catches(swig::stop_iteration) OctSwigIterator::next();
-  %catches(swig::stop_iteration) OctSwigIterator::previous();
-  %catches(swig::stop_iteration) OctSwigIterator::advance(ptrdiff_t n);
-  %catches(swig::stop_iteration) OctSwigIterator::operator += (ptrdiff_t n);
-  %catches(swig::stop_iteration) OctSwigIterator::operator -= (ptrdiff_t n);
-  %catches(swig::stop_iteration) OctSwigIterator::operator + (ptrdiff_t n) const;
-  %catches(swig::stop_iteration) OctSwigIterator::operator - (ptrdiff_t n) const;
-
-
-  struct OctSwigIterator
-  {
-  protected:
-    OctSwigIterator(octave_value seq);
-
-  public:
-    virtual ~OctSwigIterator();
-
-    virtual octave_value value() const = 0;
-
-    virtual OctSwigIterator *incr(size_t n = 1) = 0;
-    
-    virtual OctSwigIterator *decr(size_t n = 1);
-
-    virtual ptrdiff_t distance(const OctSwigIterator &x) const;
-
-    virtual bool equal (const OctSwigIterator &x) const;
-    
-    virtual OctSwigIterator *copy() const = 0;
-
-    octave_value next();
-    octave_value previous();
-    OctSwigIterator *advance(ptrdiff_t n);
-
-    bool operator == (const OctSwigIterator& x)  const;
-    bool operator != (const OctSwigIterator& x) const;
-    OctSwigIterator* operator ++ ();
-    OctSwigIterator* operator -- ();
-    OctSwigIterator* operator + (ptrdiff_t n) const;
-    OctSwigIterator* operator - (ptrdiff_t n) const;
-    ptrdiff_t operator - (const OctSwigIterator& x) const;
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/octave/octopers.swg b/dependencies2013/win32/swig/Lib/octave/octopers.swg
deleted file mode 100644
index 665b7033..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octopers.swg
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ------------------------------------------------------------
- * Overloaded operator support
- * ------------------------------------------------------------ */
-
-#ifdef __cplusplus
-
-// operators supported in Octave, and the methods they are routed to
-
-// __brace__      a{args}
-// __brace_asgn__ a{args} = rhs
-// __paren__      a(args)
-// __paren_asgn__ a(args) = rhs
-// __str__        generates string rep
-
-// __not__        !a
-// __uplus__      +a
-// __uminus__     -a
-// __transpose__  a.'
-// __hermitian__  a'
-// __incr__       a++
-// __decr__       a--
-// __add__        a + b
-// __sub__        a - b
-// __mul__        a * b
-// __div__        a / b
-// __pow__        a ^ b
-// __ldiv__       a \ b
-// __lt__         a < b
-// __le__         a <= b
-// __eq__         a == b
-// __ge__         a >= b
-// __gt__         a > b
-// __ne__         a != b
-// __el_mul__     a .* b
-// __el_div__     a ./ b
-// __el_pow__     a .^ b
-// __el_ldiv__    a .\ b
-// __el_and__     a & b
-// __el_or__      a | b
-
-// operators supported in C++, and the methods that route to them
-
-%rename(__add__)       *::operator+;
-%rename(__add__)       *::operator+();
-%rename(__add__)       *::operator+() const;
-%rename(__sub__)       *::operator-;
-%rename(__uminus__)    *::operator-();
-%rename(__uminus__)    *::operator-() const;
-%rename(__mul__)       *::operator*;
-%rename(__div__)       *::operator/;
-%rename(__mod__)       *::operator%;
-%rename(__el_and__)    *::operator&&;
-%rename(__el_or__)     *::operator||;
-%rename(__xor__)       *::operator^;
-%rename(__invert__)    *::operator~;
-%rename(__lt__)        *::operator<;
-%rename(__le__)        *::operator<=;
-%rename(__gt__)        *::operator>;
-%rename(__ge__)        *::operator>=;
-%rename(__eq__)        *::operator==;
-%rename(__ne__)        *::operator!=;
-%rename(__not__)       *::operator!;
-%rename(__incr__)      *::operator++;
-%rename(__decr__)      *::operator--;
-%rename(__paren__)     *::operator();
-%rename(__brace__)     *::operator[];
-
-// Ignored inplace operators
-%ignoreoperator(PLUSEQ)     operator+=;
-%ignoreoperator(MINUSEQ)    operator-=;
-%ignoreoperator(MULEQ)      operator*=;
-%ignoreoperator(DIVEQ)      operator/=;
-%ignoreoperator(MODEQ)      operator%=;
-%ignoreoperator(LSHIFTEQ)   operator<<=;
-%ignoreoperator(RSHIFTEQ)   operator>>=;
-%ignoreoperator(ANDEQ)      operator&=;
-%ignoreoperator(OREQ)       operator|=;
-%ignoreoperator(XOREQ)      operator^=;
-
-// Ignored operators
-%ignoreoperator(EQ)         operator=;
-%ignoreoperator(ARROWSTAR)  operator->*;
-%ignoreoperator(LSHIFT)     operator<<;
-%ignoreoperator(RSHIFT)     operator>>;
-
-#endif /* __cplusplus */
diff --git a/dependencies2013/win32/swig/Lib/octave/octprimtypes.swg b/dependencies2013/win32/swig/Lib/octave/octprimtypes.swg
deleted file mode 100644
index 663d1fe1..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octprimtypes.swg
+++ /dev/null
@@ -1,244 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-
-// boolean
-
-%fragment(SWIG_From_frag(bool),"header") {
-SWIGINTERNINLINE octave_value
-  SWIG_From_dec(bool)(bool value)
-{
-  return octave_value(value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header",
-	  fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(const octave_value& ov, bool *val)
-{
-  if (!ov.is_bool_type())
-    return SWIG_ERROR;
-  if (val)
-    *val = ov.bool_value();
-  return SWIG_OK;
-}
-}
-
-// long
-
-%fragment(SWIG_From_frag(long),"header") {
-  SWIGINTERNINLINE octave_value SWIG_From_dec(long)  (long value)
-    {    
-      return octave_value(value);
-    }
-}
-
-
-%fragment(SWIG_AsVal_frag(long),"header") {
-  SWIGINTERN int SWIG_AsVal_dec(long)(const octave_value& ov, long* val)
-    {
-      if (!ov.is_scalar_type())
-	return SWIG_TypeError;
-      if (ov.is_complex_scalar())
-	return SWIG_TypeError;
-      if (ov.is_double_type()||ov.is_single_type()) {
-	double v=ov.double_value();
-	if (v!=floor(v))
-	  return SWIG_TypeError;
-      }
-      if (val)
-	*val = ov.long_value();
-      return SWIG_OK;
-    }
-}
-
-// unsigned long
-
-%fragment(SWIG_From_frag(unsigned long),"header") {
-  SWIGINTERNINLINE octave_value SWIG_From_dec(unsigned long)  (unsigned long value)
-    {    
-      return octave_value(value);
-    }
-}
-
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header") {
-  SWIGINTERN int SWIG_AsVal_dec(unsigned long)(const octave_value& ov, unsigned long* val)
-    {
-      if (!ov.is_scalar_type())
-	return SWIG_TypeError;
-      if (ov.is_complex_scalar())
-	return SWIG_TypeError;
-      if (ov.is_double_type()||ov.is_single_type()) {
-	double v=ov.double_value();
-	if (v<0)
-	  return SWIG_OverflowError;  
-	if (v!=floor(v))
-	  return SWIG_TypeError;
-      }
-      if (ov.is_int8_type()||ov.is_int16_type()||
-	  ov.is_int32_type()) {
-	long v=ov.long_value();
-	if (v<0)
-	  return SWIG_OverflowError;  
-      }
-      if (ov.is_int64_type()) {
-	long long v=ov.int64_scalar_value().value();
-	if (v<0)
-	  return SWIG_OverflowError;  
-      }
-      if (val)
-	*val = ov.ulong_value();
-      return SWIG_OK;
-    }
-}
-
-// long long
-
-%fragment(SWIG_From_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  SWIGINTERNINLINE octave_value SWIG_From_dec(long long)  (long long value)
-    {    
-      return octave_int64(value);
-    }
-%#endif
-}
-
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  SWIGINTERN int SWIG_AsVal_dec(long long)(const octave_value& ov, long long* val)
-    {
-      if (!ov.is_scalar_type())
-	return SWIG_TypeError;
-      if (ov.is_complex_scalar())
-	return SWIG_TypeError;
-      if (ov.is_double_type()||ov.is_single_type()) {
-	double v=ov.double_value();
-	if (v!=floor(v))
-	  return SWIG_TypeError;
-      }
-      if (val) {
-	if (ov.is_int64_type())
-	  *val = ov.int64_scalar_value().value();
-	else if (ov.is_uint64_type())
-	  *val = ov.uint64_scalar_value().value();
-	else
-	  *val = ov.long_value();
-      }
-      return SWIG_OK;
-    }
-%#endif
-}
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  SWIGINTERNINLINE octave_value SWIG_From_dec(unsigned long long)  (unsigned long long value)
-    {    
-      return octave_uint64(value);
-    }
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  SWIGINTERN int SWIG_AsVal_dec(unsigned long long)(const octave_value& ov, unsigned long long* val)
-    {
-      if (!ov.is_scalar_type())
-	return SWIG_TypeError;
-      if (ov.is_complex_scalar())
-	return SWIG_TypeError;
-      if (ov.is_double_type()||ov.is_single_type()) {
-	double v=ov.double_value();
-	if (v<0)
-	  return SWIG_OverflowError;  
-	if (v!=floor(v))
-	  return SWIG_TypeError;
-      }
-      if (ov.is_int8_type()||ov.is_int16_type()||
-	  ov.is_int32_type()) {
-	long v=ov.long_value();
-	if (v<0)
-	  return SWIG_OverflowError;  
-      }
-      if (ov.is_int64_type()) {
-	long long v=ov.int64_scalar_value().value();
-	if (v<0)
-	  return SWIG_OverflowError;  
-      }
-      if (val) {
-	if (ov.is_int64_type())
-	  *val = ov.int64_scalar_value().value();
-	else if (ov.is_uint64_type())
-	  *val = ov.uint64_scalar_value().value();
-	else
-	  *val = ov.long_value();
-      }
-      return SWIG_OK;
-    }
-%#endif
-}
-
-// double
-
-%fragment(SWIG_From_frag(double),"header") {
-  SWIGINTERNINLINE octave_value SWIG_From_dec(double)  (double value)
-    {    
-      return octave_value(value);
-    }
-}
-
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-  SWIGINTERN int SWIG_AsVal_dec(double)(const octave_value& ov, double* val)
-    {
-      if (!ov.is_scalar_type())
-	return SWIG_TypeError;
-      if (ov.is_complex_scalar())
-	return SWIG_TypeError;
-      if (val)
-	*val = ov.double_value();
-      return SWIG_OK;
-    }
-}
-
-// const char* (strings)
-
-%fragment("SWIG_AsCharPtrAndSize","header") {
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(octave_value ov, char** cptr, size_t* psize, int *alloc)
-{
-  if (ov.is_cell() && ov.rows() == 1 && ov.columns() == 1)
-    ov = ov.cell_value()(0);
-  if (!ov.is_string())
-    return SWIG_TypeError;
-  
-  std::string str=ov.string_value();
-  size_t len=str.size();
-  char* cstr=(char*)str.c_str();
-  if (alloc) {
-    *cptr = %new_copy_array(cstr, len + 1, char);
-    *alloc = SWIG_NEWOBJ;
-  } else if (cptr)
-    *cptr = cstr;
-  if (psize)
-    *psize = len + 1;
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERNINLINE octave_value
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  return std::string(carray,carray+size);
-}
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/octave/octrun.swg b/dependencies2013/win32/swig/Lib/octave/octrun.swg
deleted file mode 100644
index 57a888fb..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octrun.swg
+++ /dev/null
@@ -1,1426 +0,0 @@
-#if !SWIG_OCTAVE_PREREQ(3,2,0)
-#define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, FS ## cname, args, nargout, doc)
-#else
-#define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, G ## cname, args, nargout, doc)
-#endif
-
-SWIGRUNTIME bool SWIG_check_num_args(const char *func_name, int num_args, int max_args, int min_args, int varargs) {
-  if (num_args > max_args && !varargs)
-    error("function %s takes at most %i arguments", func_name, max_args);
-  else if (num_args < min_args)
-    error("function %s requires at least %i arguments", func_name, min_args);
-  else
-    return true;
-  return false;
-}
-
-SWIGRUNTIME octave_value_list *SWIG_Octave_AppendOutput(octave_value_list *ovl, const octave_value &ov) {
-  ovl->append(ov);
-  return ovl;
-}
-
-SWIGRUNTIME octave_value SWIG_ErrorType(int code) {
-  switch (code) {
-  case SWIG_MemoryError:
-    return "SWIG_MemoryError";
-  case SWIG_IOError:
-    return "SWIG_IOError";
-  case SWIG_RuntimeError:
-    return "SWIG_RuntimeError";
-  case SWIG_IndexError:
-    return "SWIG_IndexError";
-  case SWIG_TypeError:
-    return "SWIG_TypeError";
-  case SWIG_DivisionByZero:
-    return "SWIG_DivisionByZero";
-  case SWIG_OverflowError:
-    return "SWIG_OverflowError";
-  case SWIG_SyntaxError:
-    return "SWIG_SyntaxError";
-  case SWIG_ValueError:
-    return "SWIG_ValueError";
-  case SWIG_SystemError:
-    return "SWIG_SystemError";
-  case SWIG_AttributeError:
-    return "SWIG_AttributeError";
-  }
-  return "SWIG unknown error";
-}
-
-SWIGRUNTIME octave_value SWIG_Error(int code, const char *msg) {
-  octave_value type(SWIG_ErrorType(code));
-  std::string r = msg;
-  r += " (" + type.string_value() + ")";
-  error(r.c_str());
-  return octave_value(r);
-}
-
-#define SWIG_fail                                       goto fail
-
-#define SWIG_Octave_ConvertPtr(obj, pptr, type, flags)  SWIG_Octave_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Octave_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Octave_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Octave_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Octave_NewPointerObj(ptr, type, flags)
-#define swig_owntype                                    int
-
-#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Octave_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Octave_NewPackedObj(ptr, sz, type)
-
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_ConvertPtr(obj, pptr, type, 0)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_NewPointerObj(ptr, type, 0)
-
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Octave_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Octave_NewPackedObj(ptr, sz, type)
-
-#define SWIG_GetModule(clientdata) SWIG_Octave_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer) SWIG_Octave_SetModule(clientdata,pointer);
-#define SWIG_MODULE_CLIENTDATA_TYPE void*
-
-#define Octave_Error_Occurred() 0
-#define SWIG_Octave_AddErrorMsg(msg) {;}
-
-SWIGRUNTIME swig_module_info *SWIG_Octave_GetModule(void *clientdata);
-SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *pointer);
-
-// For backward compatibility only
-#define SWIG_POINTER_EXCEPTION  0
-#define SWIG_arg_fail(arg)      0
-
-// Runtime API implementation
-
-#include <map>
-#include <vector>
-#include <string>
-
-typedef octave_value_list(*octave_func) (const octave_value_list &, int);
-class octave_swig_type;
-
-namespace Swig {
-
-#ifdef SWIG_DIRECTORS
-
-  class Director;
-
-  typedef std::map < void *, Director * > rtdir_map;
-  SWIGINTERN rtdir_map* get_rtdir_map();
-  SWIGINTERNINLINE void set_rtdir(void *vptr, Director *d);
-  SWIGINTERNINLINE void erase_rtdir(void *vptr);
-  SWIGINTERNINLINE Director *get_rtdir(void *vptr);
-
-  SWIGRUNTIME void swig_director_destroyed(octave_swig_type *self, Director *d);
-  SWIGRUNTIME octave_swig_type *swig_director_get_self(Director *d);
-  SWIGRUNTIME void swig_director_set_self(Director *d, octave_swig_type *self);
-
-#endif
-
-  SWIGRUNTIME octave_base_value *swig_value_ref(octave_swig_type *ost);
-  SWIGRUNTIME octave_swig_type *swig_value_deref(octave_value ov);
-  SWIGRUNTIME octave_swig_type *swig_value_deref(const octave_base_value &ov);
-}
-
-#ifdef SWIG_DIRECTORS
-SWIGRUNTIME void swig_acquire_ownership(void *vptr);
-SWIGRUNTIME void swig_acquire_ownership_array(void *vptr);
-SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
-#endif
-
-  struct swig_octave_member {
-    const char *name;
-    octave_func method;
-    octave_func get_method;
-    octave_func set_method;
-    int flags;			// 1 static, 2 global
-    const char *doc;
-    bool is_static() const {
-      return flags &1;
-    } bool is_global() const {
-      return flags &2;
-    }
-  };
-
-  struct swig_octave_class {
-    const char *name;
-    swig_type_info **type;
-    int director;
-    octave_func constructor;
-    const char *constructor_doc;
-    octave_func destructor;
-    const swig_octave_member *members;
-    const char **base_names;
-    const swig_type_info **base;
-  };
-
-  // octave_swig_type plays the role of both the shadow class and the class 
-  // representation within Octave, since there is no support for classes.
-  //
-  // These should really be decoupled, with the class support added to Octave
-  // and the shadow class given by an m-file script. That would dramatically 
-  // reduce the runtime complexity, and be more in line w/ other modules.
-
-  class octave_swig_type:public octave_base_value {
-    struct cpp_ptr {
-      void *ptr;
-      bool destroyed;
-      cpp_ptr(void *_ptr):ptr(_ptr), destroyed(false) {
-      }};
-    typedef std::pair < const swig_type_info *, cpp_ptr > type_ptr_pair;
-
-    mutable swig_module_info *module;
-
-    const swig_type_info *construct_type;	// type of special type object
-    std::vector < type_ptr_pair > types;	// our c++ base classes
-    int own;			// whether we call c++ destructors when we die
-
-    typedef std::pair < const swig_octave_member *, octave_value > member_value_pair;
-    typedef std::map < std::string, member_value_pair > member_map;
-    member_map members;
-    bool always_static;
-
-    const swig_octave_member *find_member(const swig_type_info *type, const std::string &name) {
-      if (!type->clientdata)
-	return 0;
-      swig_octave_class *c = (swig_octave_class *) type->clientdata;
-      const swig_octave_member *m;
-      for (m = c->members; m->name; ++m)
-	if (m->name == name)
-	  return m;
-      for (int j = 0; c->base_names[j]; ++j) {
-	if (!c->base[j]) {
-	  if (!module)
-	    module = SWIG_GetModule(0);
-	  assert(module);
-	  c->base[j] = SWIG_MangledTypeQueryModule(module, module, c->base_names[j]);
-	}
-	if (!c->base[j])
-	  return 0;
-	if ((m = find_member(c->base[j], name)))
-	  return m;
-      }
-      return 0;
-    }
-
-    member_value_pair *find_member(const std::string &name, bool insert_if_not_found) {
-      member_map::iterator it = members.find(name);
-      if (it != members.end())
-	return &it->second;
-      const swig_octave_member *m;
-      for (unsigned int j = 0; j < types.size(); ++j)
-	if ((m = find_member(types[j].first, name)))
-	  return &members.insert(std::make_pair(name, std::make_pair(m, octave_value()))).first->second;
-      if (!insert_if_not_found)
-	return 0;
-      return &members[name];
-    }
-
-    const swig_type_info *find_base(const std::string &name, const swig_type_info *base) {
-      if (!base) {
-	for (unsigned int j = 0; j < types.size(); ++j) {
-	  assert(types[j].first->clientdata);
-	  swig_octave_class *cj = (swig_octave_class *) types[j].first->clientdata;
-	  if (cj->name == name)
-	    return types[j].first;
-	}
-	return 0;
-      }
-      assert(base->clientdata);
-      swig_octave_class *c = (swig_octave_class *) base->clientdata;
-      for (int j = 0; c->base_names[j]; ++j) {
-	if (!c->base[j]) {
-	  if (!module)
-	    module = SWIG_GetModule(0);
-	  assert(module);
-	  c->base[j] = SWIG_MangledTypeQueryModule(module, module, c->base_names[j]);
-	}
-	if (!c->base[j])
-	  return 0;
-	assert(c->base[j]->clientdata);
-	swig_octave_class *cj = (swig_octave_class *) c->base[j]->clientdata;
-	if (cj->name == name)
-	  return c->base[j];
-      }
-      return 0;
-    }
-
-    void load_members(const swig_octave_class* c,member_map& out) const {
-      for (const swig_octave_member *m = c->members; m->name; ++m) {
-	if (out.find(m->name) == out.end())
-	  out.insert(std::make_pair(m->name, std::make_pair(m, octave_value())));
-      }
-      for (int j = 0; c->base_names[j]; ++j) {
-	if (!c->base[j]) {
-	  if (!module)
-	    module = SWIG_GetModule(0);
-	  assert(module);
-	  c->base[j] = SWIG_MangledTypeQueryModule(module, module, c->base_names[j]);
-	}
-	if (!c->base[j])
-	  continue;
-	assert(c->base[j]->clientdata);
-	const swig_octave_class *cj =
-	  (const swig_octave_class *) c->base[j]->clientdata;
-	load_members(cj,out);
-      }
-    }
-
-    void load_members(member_map& out) const {
-      out=members;
-      for (unsigned int j = 0; j < types.size(); ++j)
-	if (types[j].first->clientdata)
-	  load_members((const swig_octave_class *) types[j].first->clientdata, out);
-    }
-
-    octave_value_list member_invoke(member_value_pair *m, const octave_value_list &args, int nargout) {
-      if (m->second.is_defined())
-	return m->second.subsref("(", std::list < octave_value_list > (1, args), nargout);
-      else if (m->first && m->first->method)
-	return m->first->method(args, nargout);
-      error("member not defined or not invocable");
-      return octave_value_list();
-    }
-
-    bool dispatch_unary_op(const std::string &symbol, octave_value &ret) const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member(symbol, false);
-      if (!m || m->first->is_static() || m->first->is_global())
-	return false;
-      octave_value_list args;
-      args.append(nc_this->as_value());
-      octave_value_list argout(nc_this->member_invoke(m, args, 1));
-      if (argout.length() < 1)
-	return false;
-      ret = argout(0);
-      return true;
-    }
-
-    bool dispatch_binary_op(const std::string &symbol, const octave_base_value &rhs, octave_value &ret) const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member(symbol, false);
-      if (!m || m->first->is_static() || m->first->is_global())
-	return false;
-      octave_value_list args;
-      args.append(nc_this->as_value());
-      args.append(make_value_hack(rhs));
-      octave_value_list argout(nc_this->member_invoke(m, args, 1));
-      if (argout.length() < 1)
-	return false;
-      ret = argout(0);
-      return true;
-    }
-
-    bool dispatch_index_op(const std::string &symbol, const octave_value_list &rhs, octave_value_list &ret) const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member(symbol, false);
-      if (!m || m->first->is_static() || m->first->is_global())
-	return false;
-      octave_value_list args;
-      args.append(nc_this->as_value());
-      args.append(rhs);
-      octave_value_list argout(nc_this->member_invoke(m, args, 1));
-      if (argout.length() >= 1)
-	ret = argout(0);
-      return true;
-    }
-
-    octave_value_list member_deref(member_value_pair *m, const octave_value_list &args) {
-      if (m->second.is_defined())
-	return m->second;
-      else if (m->first) {
-	if (m->first->get_method)
-	  return m->first->get_method(args, 1);
-	else if (m->first->method)
-	  return octave_value(new octave_builtin(m->first->method));
-      }
-      error("undefined member");
-      return octave_value_list();
-    }
-
-    static octave_value make_value_hack(const octave_base_value &x) {
-      ((octave_swig_type &) x).count++;
-      return octave_value((octave_base_value *) &x);
-    }
-
-    octave_swig_type(const octave_swig_type &x);
-    octave_swig_type &operator=(const octave_swig_type &rhs);
-  public:
-
-    octave_swig_type(void *_ptr = 0, const swig_type_info *_type = 0, int _own = 0,
-		     bool _always_static = false)
-      :	module(0), construct_type(_ptr ? 0 : _type), own(_own), 
-      always_static(_always_static) {
-      if (_type || _ptr)
-	types.push_back(std::make_pair(_type, _ptr));
-#ifdef SWIG_DIRECTORS
-      if (_ptr) {
-	Swig::Director *d = Swig::get_rtdir(_ptr);
-	if (d)
-	  Swig::swig_director_set_self(d, this);
-      }
-#endif
-    }
-
-    ~octave_swig_type() {
-      if (own) {
-	++count;
-	for (unsigned int j = 0; j < types.size(); ++j) {
-	  if (!types[j].first || !types[j].first->clientdata)
-	    continue;
-	  swig_octave_class *c = (swig_octave_class *) types[j].first->clientdata;
-	  if (c->destructor && !types[j].second.destroyed && types[j].second.ptr) {
-	    c->destructor(as_value(), 0);
-	  }
-	}
-      }
-#ifdef SWIG_DIRECTORS
-      for (unsigned int j = 0; j < types.size(); ++j)
-	Swig::erase_rtdir(types[j].second.ptr);
-#endif
-    }
-
-    dim_vector dims(void) const {
-      octave_value out;
-      if (!dispatch_unary_op("__dims__", out))
-        return dim_vector(1,1);
-
-      // Return value should be cell or matrix of integers
-      if (out.is_cell()) {
-        const Cell & c=out.cell_value();
-        int ndim = c.rows();
-        if (ndim==1 && c.columns()!=1) ndim = c.columns();
-
-        dim_vector d;
-        d.resize(ndim < 2 ? 2 : ndim);
-        d(0) = d(1) = 1;
-
-        // Fill in dim_vector 
-        for (int k=0;k<ndim;k++) {
-          const octave_value& obj = c(k);
-          d.elem(k) = obj.int_value();
-          
-          // __dims__ should return a cell filled with integers
-          if (error_state) return dim_vector(1,1);
-        }
-        return d;
-      } else if (out.is_matrix_type() || out.is_numeric_type() ) {
-        if (out.rows()==1 || out.columns()==1) {
-           Array<int> a = out.int_vector_value();
-           if (error_state) return dim_vector(1,1);
-           dim_vector d;
-           d.resize(a.numel() < 2 ? 2 : a.numel());
-           d(0) = d(1) = 1;
-           for (int k=0;k<a.numel();k++) {
-              d.elem(k) = a(k);
-           }
-           return d;
-        } else {
-          return dim_vector(1,1);
-        }
-      } else {
-        return dim_vector(1,1);
-      }
-    }
-
-    octave_value as_value() {
-      ++count;
-      return Swig::swig_value_ref(this);
-    }
-
-    void incref() {
-      ++count;
-    }
-
-    void decref() {
-      if (!--count)
-	delete this;
-    }
-
-    long swig_this() const {
-      if (!types.size())
-	return (long) this;
-      return (long) types[0].second.ptr;
-    }
-    const char* help_text() const {
-      if (!types.size())
-	return 0;
-      if (!types[0].first->clientdata)
-	return 0;
-      swig_octave_class *c = (swig_octave_class *) types[0].first->clientdata;
-      return c->constructor_doc;
-    }
-
-    std::string swig_type_name() const {
-      // * need some way to manually name subclasses.
-      // * eg optional first arg to subclass(), or named_subclass()
-      std::string ret;
-      for (unsigned int j = 0; j < types.size(); ++j) {
-	if (j)
-	  ret += "_";
-	if (types[j].first->clientdata) {
-	  swig_octave_class *c = (swig_octave_class *) types[j].first->clientdata;
-	  ret += c->name;
-	} else
-	  ret += types[j].first->name;
-      }
-      return ret;
-    }
-
-    void merge(octave_swig_type &rhs) {
-      rhs.own = 0;
-      for (unsigned int j = 0; j < rhs.types.size(); ++j) {
-	assert(!rhs.types[j].second.destroyed);
-#ifdef SWIG_DIRECTORS
-	Swig::Director *d = Swig::get_rtdir(rhs.types[j].second.ptr);
-	if (d)
-	  Swig::swig_director_set_self(d, this);
-#endif
-      }
-      types.insert(types.end(), rhs.types.begin(), rhs.types.end());
-      members.insert(rhs.members.begin(), rhs.members.end());
-      rhs.types.clear();
-      rhs.members.clear();
-    }
-
-    typedef member_map::const_iterator swig_member_const_iterator;
-    swig_member_const_iterator swig_members_begin() { return members.begin(); }
-    swig_member_const_iterator swig_members_end() { return members.end(); }
-
-    int cast(void **vptr, swig_type_info *type, int *_own, int flags) {
-      int res = SWIG_ERROR;
-      if (_own)
-	*_own = own;
-      if (flags &SWIG_POINTER_DISOWN)
-	own = 0;
-      if (!type && types.size()) {
-	if(vptr)
-          *vptr = types[0].second.ptr;
-        return SWIG_OK;
-      }
-      for (unsigned int j = 0; j < types.size(); ++j)
-	if (type == types[j].first) {
-	  if(vptr)
-            *vptr = types[j].second.ptr;
-          return SWIG_OK;
-        }
-      for (unsigned int j = 0; j < types.size(); ++j) {
-	swig_cast_info *tc = SWIG_TypeCheck(types[j].first->name, type);
-	if (!tc)
-	  continue;
-        if(vptr) {
-	  int newmemory = 0;
-	  *vptr = SWIG_TypeCast(tc, types[j].second.ptr, &newmemory);
-	    if (newmemory == SWIG_CAST_NEW_MEMORY) {
-              assert(_own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
-              if (_own)
-                *_own = *_own | SWIG_CAST_NEW_MEMORY;
-            }
-        }
-        res = SWIG_OK;
-        break;
-      }
-      return res;
-    }
-
-    bool is_owned() const {
-      return own;
-    }
-
-#ifdef SWIG_DIRECTORS
-    void director_destroyed(Swig::Director *d) {
-      bool found = false;
-      for (unsigned int j = 0; j < types.size(); ++j) {
-	Swig::Director *dj = Swig::get_rtdir(types[j].second.ptr);
-	if (dj == d) {
-	  types[j].second.destroyed = true;
-	  found = true;
-	}
-      }
-      assert(found);
-    }
-#endif
-
-    void assign(const std::string &name, const octave_value &ov) {
-      members[name] = std::make_pair((const swig_octave_member *) 0, ov);
-    }
-
-    void assign(const std::string &name, const swig_octave_member *m) {
-      members[name] = std::make_pair(m, octave_value());
-    }
-
-    octave_base_value *clone() const {
-      // pass-by-value is probably not desired, and is harder;
-      // requires calling copy constructors of contained types etc.
-      assert(0);
-      *(int *) 0 = 0;
-      return 0;
-    }
-
-    octave_base_value *empty_clone() const {
-      return new octave_swig_type();
-    }
-
-    bool is_defined() const {
-      return true;
-    }
-
-    virtual bool is_map() const {
-      return true;
-    }
-
-    virtual octave_value subsref(const std::string &ops, const std::list < octave_value_list > &idx) {
-      octave_value_list ovl = subsref(ops, idx, 1);
-      return ovl.length()? ovl(0) : octave_value();
-    }
-
-    virtual octave_value_list subsref(const std::string &ops, const std::list < octave_value_list > &idx, int nargout) {
-      assert(ops.size() > 0);
-      assert(ops.size() == idx.size());
-
-      std::list < octave_value_list >::const_iterator idx_it = idx.begin();
-      int skip = 0;
-      octave_value_list sub_ovl;
-
-      // constructor invocation
-      if (ops[skip] == '(' && construct_type) {
-	assert(construct_type->clientdata);
-	swig_octave_class *c = (swig_octave_class *) construct_type->clientdata;
-	if (!c->constructor) {
-	  error("cannot create instance");
-	  return octave_value_list();
-	}
-	octave_value_list args;
-	if (c->director)
-	  args.append(Swig::swig_value_ref(new octave_swig_type(this, 0, 0)));
-	args.append(*idx_it++);
-	++skip;
-	sub_ovl = c->constructor(args, nargout);
-      }
-      // member dereference or invocation
-      else if (ops[skip] == '.') {
-	std::string subname;
-	const swig_type_info *base = 0;	// eg, a.base.base_cpp_mem
-	for (;;) {
-	  octave_value_list subname_ovl(*idx_it++);
-	  ++skip;
-	  assert(subname_ovl.length() == 1 && subname_ovl(0).is_string());
-	  subname = subname_ovl(0).string_value();
-
-	  const swig_type_info *next_base = find_base(subname, base);
-	  if (!next_base || skip >= (int) ops.size() || ops[skip] != '.')
-	    break;
-	  base = next_base;
-	}
-
-	member_value_pair tmp, *m = &tmp;
-	if (!base || !(m->first = find_member(base, subname)))
-	  m = find_member(subname, false);
-	if (!m) {
-	  error("member not found");
-	  return octave_value_list();
-	}
-
-	octave_value_list args;
-	if (!always_static &&
-	    (!m->first || (!m->first->is_static() && !m->first->is_global())))
-	  args.append(as_value());
-	if (skip < (int) ops.size() && ops[skip] == '(' && 
-	    ((m->first && m->first->method) || m->second.is_function() || 
-	     m->second.is_function_handle())) {
-	  args.append(*idx_it++);
-	  ++skip;
-	  sub_ovl = member_invoke(m, args, nargout);
-	} else {
-	  sub_ovl = member_deref(m, args);
-	}
-      }
-      // index operator
-      else {
-	if (ops[skip] == '(' || ops[skip] == '{') {
-	  const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__";
-	  octave_value_list args;
-	  args.append(*idx_it++);
-	  ++skip;
-	  if (!dispatch_index_op(op_name, args, sub_ovl)) {
-	    error("error evaluating index operator");
-	    return octave_value_list();
-	  }
-	} else {
-	  error("unsupported subsref");
-	  return octave_value_list();
-	}
-      }
-
-      if (skip >= (int) ops.size())
-	return sub_ovl;
-      if (sub_ovl.length() < 1) {
-	error("bad subs ref");
-	return octave_value_list();
-      }
-      return sub_ovl(0).next_subsref(nargout, ops, idx, skip);
-    }
-
-    octave_value subsasgn(const std::string &ops, const std::list < octave_value_list > &idx, const octave_value &rhs) {
-      assert(ops.size() > 0);
-      assert(ops.size() == idx.size());
-
-      std::list < octave_value_list >::const_iterator idx_it = idx.begin();
-      int skip = 0;
-
-      if (ops.size() > 1) {
-	std::list < octave_value_list >::const_iterator last = idx.end();
-	--last;
-	std::list < octave_value_list > next_idx(idx.begin(), last);
-	octave_value next_ov = subsref(ops.substr(0, ops.size() - 1), next_idx);
-	next_ov.subsasgn(ops.substr(ops.size() - 1), std::list < octave_value_list > (1, *last), rhs);
-      }
-
-      else if (ops[skip] == '(' || ops[skip] == '{') {
-	const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__";
-	member_value_pair *m = find_member(op_name, false);
-	if (m) {
-	  octave_value_list args;
-	  args.append(as_value());
-	  args.append(*idx_it);
-	  args.append(rhs);
-	  member_invoke(m, args, 1);
-	} else
-	  error("%s member not found", op_name);
-      }
-
-      else if (ops[skip] == '.') {
-	octave_value_list subname_ovl(*idx_it++);
-	++skip;
-	assert(subname_ovl.length() == 1 &&subname_ovl(0).is_string());
-	std::string subname = subname_ovl(0).string_value();
-
-	member_value_pair *m = find_member(subname, true);
-	if (!m->first || !m->first->set_method) {
-	  m->first = 0;
-	  m->second = rhs;
-	} else if (m->first->set_method) {
-	  octave_value_list args;
-	  if (!m->first->is_static() && !m->first->is_global())
-	    args.append(as_value());
-	  args.append(rhs);
-	  m->first->set_method(args, 1);
-	} else
-	  error("member not assignable");
-      } else
-	error("unsupported subsasgn");
-
-      return as_value();
-    }
-
-    virtual bool is_object() const {
-      return true;
-    }
-
-    virtual bool is_string() const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      return !!nc_this->find_member("__str__", false);
-    }
-
-    virtual std::string string_value(bool force = false) const {
-      octave_value ret;
-      if (!dispatch_unary_op("__str__", ret)) {
-        error("__str__ method not defined");
-        return std::string();
-      }
-      if (!ret.is_string()) {
-	error("__str__ method did not return a string");
-	return std::string();
-      }
-      return ret.string_value();
-    }
-
-    virtual double scalar_value(bool frc_str_conv = false) const {
-      octave_value ret;
-      if (!dispatch_unary_op("__float__", ret)) {
-        error("__float__ method not defined");
-      }
-      return ret.scalar_value();
-    }
-
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-    virtual octave_value as_double(void) const {
-      octave_value ret;
-      if (!dispatch_unary_op("__float__", ret)) {
-        error("__float__ method not defined");
-      }
-      return ret.as_double();
-    }
-
-    virtual octave_value as_single(void) const {
-      octave_value ret;
-      if (!dispatch_unary_op("__float__", ret)) {
-        error("__float__ method not defined");
-      }
-      return ret.as_single();
-    }
-#endif
-
-#if SWIG_OCTAVE_PREREQ(3,8,0)
-    virtual octave_value map(octave_base_value::unary_mapper_t umap) const {
-      const std::string opname = std::string("__") + octave_base_value::get_umap_name(umap) + std::string("__");
-      octave_value ret;
-      if (!dispatch_unary_op(opname, ret)) {
-        error((opname + std::string(" method not found")).c_str());
-        return octave_value();
-      }
-      return ret;
-    }
-#endif
-
-#if SWIG_OCTAVE_PREREQ(3,3,52)
-    virtual octave_map map_value() const {
-      return octave_map();
-    }
-#else
-    virtual Octave_map map_value() const {
-      return Octave_map();
-    }
-#endif
-
-    virtual string_vector map_keys() const {
-      member_map tmp;
-      load_members(tmp);
-
-      string_vector keys(tmp.size());
-      int k = 0;
-      for (member_map::iterator it = tmp.begin(); it != tmp.end(); ++it)
-	keys(k++) = it->first;
-
-      return keys;
-    }
-
-    virtual bool save_ascii (std::ostream& os) {
-      return true;
-    }
-
-    virtual bool load_ascii (std::istream& is) {
-      return true;
-    }
-
-    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
-      return true;
-    }
-
-    virtual bool load_binary (std::istream& is, bool swap, 
-			      oct_mach_info::float_format fmt) {
-      return true;
-    }
-
-#if defined (HAVE_HDF5)
-# if SWIG_OCTAVE_PREREQ(4,0,0)
-    virtual bool
-      save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) {
-      return true;
-    }
-
-    virtual bool
-      load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) {
-      return true;
-    }
-# else
-    virtual bool
-      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
-      return true;
-    }
-
-    virtual bool
-      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
-      return true;
-    }
-# endif
-#endif
-
-    virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const {
-      return string_value();
-    }
-
-    virtual octave_value convert_to_str_internal(bool pad, bool force, char type) const {
-      return string_value();
-    }
-
-    static bool dispatch_global_op(const std::string &symbol, const octave_value_list &args, octave_value &ret) {
-      // we assume that SWIG_op_prefix-prefixed functions are installed in global namespace
-      // (rather than any module namespace).
-
-      octave_function *fcn = is_valid_function(symbol, std::string(), false);
-      if (!fcn)
-	return false;
-      ret = fcn->do_multi_index_op(1, args)(0);
-      return true;
-    }
-
-    static octave_value dispatch_unary_op(const octave_base_value &x, const char *op_name) {
-      octave_swig_type *ost = Swig::swig_value_deref(x);
-      assert(ost);
-
-      octave_value ret;
-      if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret))
-	return ret;
-      std::string symbol = SWIG_op_prefix + ost->swig_type_name() + "_" + op_name;
-      octave_value_list args;
-      args.append(make_value_hack(x));
-      if (dispatch_global_op(symbol, args, ret))
-	return ret;
-
-      error("could not dispatch unary operator");
-      return octave_value();
-    }
-
-    static octave_value dispatch_binary_op(const octave_base_value &lhs, const octave_base_value &rhs, const char *op_name) {
-      octave_swig_type *lhs_ost = Swig::swig_value_deref(lhs);
-      octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs);
-
-      octave_value ret;
-      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret))
-	return ret;
-      if (rhs_ost) {
-        if (strlen(op_name) == 2  && (op_name[1] == 't' || op_name[1] == 'e')) {
-          if (op_name[0] == 'l' && rhs_ost->dispatch_binary_op(std::string("__g") + op_name[1] + std::string("__"), lhs, ret))
-            return ret;
-          if (op_name[0] == 'g' && rhs_ost->dispatch_binary_op(std::string("__l") + op_name[1] + std::string("__"), lhs, ret))
-            return ret;
-        }
-        if (rhs_ost->dispatch_binary_op(std::string("__r") + op_name + std::string("__"), lhs, ret))
-          return ret;
-      }
-
-      std::string symbol;
-      octave_value_list args;
-      args.append(make_value_hack(lhs));
-      args.append(make_value_hack(rhs));
-
-      symbol = SWIG_op_prefix;
-      symbol += lhs_ost ? lhs_ost->swig_type_name() : lhs.type_name();
-      symbol += "_";
-      symbol += op_name;
-      symbol += "_";
-      symbol += rhs_ost ? rhs_ost->swig_type_name() : rhs.type_name();
-      if (dispatch_global_op(symbol, args, ret))
-	return ret;
-
-      symbol = SWIG_op_prefix;
-      symbol += lhs_ost ? lhs_ost->swig_type_name() : lhs.type_name();
-      symbol += "_";
-      symbol += op_name;
-      symbol += "_";
-      symbol += "any";
-      if (dispatch_global_op(symbol, args, ret))
-	return ret;
-
-      symbol = SWIG_op_prefix;
-      symbol += "any";
-      symbol += "_";
-      symbol += op_name;
-      symbol += "_";
-      symbol += rhs_ost ? rhs_ost->swig_type_name() : rhs.type_name();
-      if (dispatch_global_op(symbol, args, ret))
-	return ret;
-
-      error("could not dispatch binary operator");
-      return octave_value();
-    }
-
-#if SWIG_OCTAVE_PREREQ(4,0,0)
-    void print(std::ostream &os, bool pr_as_read_syntax = false)
-#else
-    void print(std::ostream &os, bool pr_as_read_syntax = false) const
-#endif
-    {
-      if (is_string()) {
-	os << string_value();
-	return;
-      }
-
-      member_map tmp;
-      load_members(tmp);
-
-      indent(os);
-      os << "{"; newline(os);
-      increment_indent_level();
-      for (unsigned int j = 0; j < types.size(); ++j) {
-        indent(os);
-	if (types[j].first->clientdata) {
-	  const swig_octave_class *c = (const swig_octave_class *) types[j].first->clientdata;
-	  os << c->name << ", ptr = " << types[j].second.ptr; newline(os);
-	} else {
-	  os << types[j].first->name << ", ptr = " << types[j].second.ptr; newline(os);
-	}
-      }
-      for (member_map::const_iterator it = tmp.begin(); it != tmp.end(); ++it) {
-        indent(os);
-	if (it->second.first) {
-	  const char *objtype = it->second.first->method ? "method" : "variable";
-	  const char *modifier = (it->second.first->flags &1) ? "static " : (it->second.first->flags &2) ? "global " : "";
-	  os << it->second.first->name << " (" << modifier << objtype << ")"; newline(os);
-	  assert(it->second.first->name == it->first);
-	} else {
-	  os << it->first; newline(os);
-	}
-      }
-      decrement_indent_level();
-      indent(os);
-      os << "}"; newline(os);
-    }
-  };
-
-  // Octave tries hard to preserve pass-by-value semantics. Eg, assignments
-  // will call clone() via make_unique() if there is more than one outstanding 
-  // reference to the lhs, and forces the clone's reference count to 1 
-  // (so you can't just increment your own count and return this).
-  //
-  // One way to fix this (without modifying Octave) is to add a level of
-  // indirection such that clone copies ref-counted pointer and we keep 
-  // pass-by-ref semantics (which are more natural/expected for C++ bindings).
-  //
-  // Supporting both pass-by-{ref,value} and toggling via %feature/option 
-  // might be nice.
-
-  class octave_swig_ref:public octave_base_value {
-    octave_swig_type *ptr;
-  public:
-    octave_swig_ref(octave_swig_type *_ptr = 0)
-      :ptr(_ptr) { }
-
-    ~octave_swig_ref()
-      { if (ptr) ptr->decref(); }
-
-    octave_swig_type *get_ptr() const
-      { return ptr; }
-
-    octave_base_value *clone() const
-      { if (ptr) ptr->incref(); return new octave_swig_ref(ptr); }
-
-    octave_base_value *empty_clone() const
-      { return new octave_swig_ref(0); }
-
-    dim_vector dims(void) const 
-      { return ptr->dims(); }
-
-    bool is_defined() const
-      { return ptr->is_defined(); }
-
-    virtual bool is_map() const 
-      { return ptr->is_map(); }
-
-    virtual octave_value subsref(const std::string &ops, const std::list < octave_value_list > &idx) 
-      { return ptr->subsref(ops, idx); }
-
-    virtual octave_value_list subsref(const std::string &ops, const std::list < octave_value_list > &idx, int nargout)
-      { return ptr->subsref(ops, idx, nargout); }
-
-    octave_value subsasgn(const std::string &ops, const std::list < octave_value_list > &idx, const octave_value &rhs)
-      { return ptr->subsasgn(ops, idx, rhs); }
-
-    virtual bool is_object() const 
-      { return ptr->is_object(); }
-
-    virtual bool is_string() const 
-      { return ptr->is_string(); }
-
-    virtual std::string string_value(bool force = false) const 
-      { return ptr->string_value(force); }
-
-    virtual double scalar_value(bool frc_str_conv = false) const
-      { return ptr->scalar_value(frc_str_conv); }
-
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-    virtual octave_value as_double(void) const
-      { return ptr->as_double(); }
-
-    virtual octave_value as_single(void) const
-      { return ptr->as_single(); }
-#endif
-
-#if SWIG_OCTAVE_PREREQ(3,8,0)
-    virtual octave_value map(octave_base_value::unary_mapper_t umap) const
-      { return ptr->map(umap); }
-#endif
-
-#if SWIG_OCTAVE_PREREQ(3,3,52)
-    virtual octave_map map_value() const
-      { return ptr->map_value(); }
-#else
-    virtual Octave_map map_value() const
-      { return ptr->map_value(); }
-#endif
-
-    virtual string_vector map_keys() const
-      { return ptr->map_keys(); }
-
-    virtual bool save_ascii (std::ostream& os)
-      { return ptr->save_ascii(os); }
-
-    virtual bool load_ascii (std::istream& is)
-      { return ptr->load_ascii(is); }
-
-    virtual bool save_binary (std::ostream& os, bool& save_as_floats)
-      { return ptr->save_binary(os, save_as_floats); }
-
-    virtual bool load_binary (std::istream& is, bool swap, 
-			      oct_mach_info::float_format fmt)
-      { return ptr->load_binary(is, swap, fmt); }
-
-#if defined (HAVE_HDF5)
-# if SWIG_OCTAVE_PREREQ(4,0,0)
-    virtual bool
-      save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
-      { return ptr->save_hdf5(loc_id, name, save_as_floats); }
-
-    virtual bool
-      load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug)
-      { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
-# else
-    virtual bool
-      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
-      { return ptr->save_hdf5(loc_id, name, save_as_floats); }
-
-    virtual bool
-      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug)
-      { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
-# endif
-#endif
-
-    virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const
-      { return ptr->convert_to_str(pad, force, type); }
-
-    virtual octave_value convert_to_str_internal(bool pad, bool force, char type) const
-      { return ptr->convert_to_str_internal(pad, force, type); }
-
-#if SWIG_OCTAVE_PREREQ(4,0,0)
-    void print(std::ostream &os, bool pr_as_read_syntax = false)
-#else
-    void print(std::ostream &os, bool pr_as_read_syntax = false) const
-#endif
-      { return ptr->print(os, pr_as_read_syntax); }
-
-    virtual type_conv_info numeric_conversion_function(void) const {
-      return octave_base_value::type_conv_info (default_numeric_conversion_function,
-                                                octave_scalar::static_type_id ());
-    }
-
-  private:
-    static octave_base_value *default_numeric_conversion_function (const octave_base_value& a) {
-      const octave_swig_ref& v = dynamic_cast<const octave_swig_ref&>(a);
-      return new octave_scalar(v.scalar_value());
-    }
-
-#if !SWIG_OCTAVE_PREREQ(4,0,0)
-    DECLARE_OCTAVE_ALLOCATOR;
-#endif
-    DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
-  };
-#if !SWIG_OCTAVE_PREREQ(4,0,0)
-  DEFINE_OCTAVE_ALLOCATOR(octave_swig_ref);
-#endif
-  DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_ref, "swig_ref", "swig_ref");
-
-  class octave_swig_packed:public octave_base_value {
-    swig_type_info *type;
-    std::vector < char > buf;
-  public:
-
-    octave_swig_packed(swig_type_info *_type = 0, const void *_buf = 0, size_t _buf_len = 0)
-      :	type(_type), buf((const char*)_buf, (const char*)_buf + _buf_len) {
-    }
-
-    bool copy(swig_type_info *outtype, void *ptr, size_t sz) const {
-      if (outtype && outtype != type)
-	return false;
-      assert(sz <= buf.size());
-      std::copy(buf.begin(), buf.begin()+sz, (char*)ptr);
-      return true;
-    }
-
-    octave_base_value *clone() const {
-      return new octave_swig_packed(*this);
-    }
-
-    octave_base_value *empty_clone() const {
-      return new octave_swig_packed();
-    }
-
-    bool is_defined() const {
-      return true;
-    }
-
-#if SWIG_OCTAVE_PREREQ(4,0,0)
-    void print(std::ostream &os, bool pr_as_read_syntax = false)
-#else
-    void print(std::ostream &os, bool pr_as_read_syntax = false) const
-#endif
-    {
-      indent(os);
-      os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size(); newline(os);
-    }
-
-
-    virtual bool save_ascii (std::ostream& os) {
-      return true;
-    }
-
-    virtual bool load_ascii (std::istream& is) {
-      return true;
-    }
-
-    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
-      return true;
-    }
-
-    virtual bool load_binary (std::istream& is, bool swap, 
-			      oct_mach_info::float_format fmt) {
-      return true;
-    }
-
-#if defined (HAVE_HDF5)
-# if SWIG_OCTAVE_PREREQ(4,0,0)
-    virtual bool
-      save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) {
-      return true;
-    }
-
-    virtual bool
-      load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) {
-      return true;
-    }
-# else
-    virtual bool
-      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
-      return true;
-    }
-
-    virtual bool
-      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
-      return true;
-    }
-# endif
-#endif
-
-  private:
-#if !SWIG_OCTAVE_PREREQ(4,0,0)
-    DECLARE_OCTAVE_ALLOCATOR;
-#endif
-    DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
-  };
-#if !SWIG_OCTAVE_PREREQ(4,0,0)
-  DEFINE_OCTAVE_ALLOCATOR(octave_swig_packed);
-#endif
-  DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_packed, "swig_packed", "swig_packed");
-
-  SWIGRUNTIME octave_value_list octave_set_immutable(const octave_value_list &args, int nargout) {
-    error("attempt to set immutable member variable");
-    return octave_value_list();
-  }
-
-  struct octave_value_ref {
-    const octave_value_list &ovl;
-    int j;
-
-    octave_value_ref(const octave_value_list &_ovl, int _j)
-      :ovl(_ovl), j(_j) { }
-
-    operator  octave_value() const {
-      return ovl(j);
-    }
-
-    octave_value operator*() const {
-      return ovl(j);
-    }
-  };
-
-
-namespace Swig {
-
-  SWIGRUNTIME octave_base_value *swig_value_ref(octave_swig_type *ost) {
-    return new octave_swig_ref(ost);
-  }
-
-  SWIGRUNTIME octave_swig_type *swig_value_deref(octave_value ov) {
-    if (ov.is_cell() && ov.rows() == 1 && ov.columns() == 1)
-      ov = ov.cell_value()(0);
-    return swig_value_deref(*ov.internal_rep());
-  }
-
-  SWIGRUNTIME octave_swig_type *swig_value_deref(const octave_base_value &ov) {
-    if (ov.type_id() != octave_swig_ref::static_type_id())
-      return 0;
-    const octave_swig_ref *osr = static_cast < const octave_swig_ref *>(&ov);
-    return osr->get_ptr();
-  }
-
-}
-
-
-#define swig_unary_op(name) \
-SWIGRUNTIME octave_value swig_unary_op_##name(const octave_base_value &x) { \
-  return octave_swig_type::dispatch_unary_op(x,#name); \
-}
-#define swig_binary_op(name) \
-SWIGRUNTIME octave_value swig_binary_op_##name(const octave_base_value&lhs,const octave_base_value &rhs) { \
-  return octave_swig_type::dispatch_binary_op(lhs,rhs,#name); \
-}
-#define swigreg_unary_op(name) \
-if (!octave_value_typeinfo::lookup_unary_op(octave_value::op_##name,tid)) \
-octave_value_typeinfo::register_unary_op(octave_value::op_##name,tid,swig_unary_op_##name);
-#define swigreg_binary_op(name) \
-if (!octave_value_typeinfo::lookup_binary_op(octave_value::op_##name,tid1,tid2)) \
-octave_value_typeinfo::register_binary_op(octave_value::op_##name,tid1,tid2,swig_binary_op_##name);
-
-  swig_unary_op(not);
-  swig_unary_op(uplus);
-  swig_unary_op(uminus);
-  swig_unary_op(transpose);
-  swig_unary_op(hermitian);
-  swig_unary_op(incr);
-  swig_unary_op(decr);
-
-  swig_binary_op(add);
-  swig_binary_op(sub);
-  swig_binary_op(mul);
-  swig_binary_op(div);
-  swig_binary_op(pow);
-  swig_binary_op(ldiv);
-#if !SWIG_OCTAVE_PREREQ(4,2,0)
-  swig_binary_op(lshift);
-  swig_binary_op(rshift);
-#endif
-  swig_binary_op(lt);
-  swig_binary_op(le);
-  swig_binary_op(eq);
-  swig_binary_op(ge);
-  swig_binary_op(gt);
-  swig_binary_op(ne);
-  swig_binary_op(el_mul);
-  swig_binary_op(el_div);
-  swig_binary_op(el_pow);
-  swig_binary_op(el_ldiv);
-  swig_binary_op(el_and);
-  swig_binary_op(el_or);
-
-  SWIGRUNTIME void SWIG_InstallUnaryOps(int tid) {
-    swigreg_unary_op(not);
-    swigreg_unary_op(uplus);
-    swigreg_unary_op(uminus);
-    swigreg_unary_op(transpose);
-    swigreg_unary_op(hermitian);
-    swigreg_unary_op(incr);
-    swigreg_unary_op(decr);
-  }
-  SWIGRUNTIME void SWIG_InstallBinaryOps(int tid1, int tid2) {
-    swigreg_binary_op(add);
-    swigreg_binary_op(sub);
-    swigreg_binary_op(mul);
-    swigreg_binary_op(div);
-    swigreg_binary_op(pow);
-    swigreg_binary_op(ldiv);
-#if !SWIG_OCTAVE_PREREQ(4,2,0)
-    swigreg_binary_op(lshift);
-    swigreg_binary_op(rshift);
-#endif
-    swigreg_binary_op(lt);
-    swigreg_binary_op(le);
-    swigreg_binary_op(eq);
-    swigreg_binary_op(ge);
-    swigreg_binary_op(gt);
-    swigreg_binary_op(ne);
-    swigreg_binary_op(el_mul);
-    swigreg_binary_op(el_div);
-    swigreg_binary_op(el_pow);
-    swigreg_binary_op(el_ldiv);
-    swigreg_binary_op(el_and);
-    swigreg_binary_op(el_or);
-  }
-  SWIGRUNTIME void SWIG_InstallOps(int tid) {
-    // here we assume that tid are conseq integers increasing from zero, and 
-    // that our tid is the last one. might be better to have explicit string 
-    // list of types we should bind to, and use lookup_type to resolve their tid.
-
-    SWIG_InstallUnaryOps(tid);
-    SWIG_InstallBinaryOps(tid, tid);
-    for (int j = 0; j < tid; ++j) {
-      SWIG_InstallBinaryOps(j, tid);
-      SWIG_InstallBinaryOps(tid, j);
-    }
-  }
-
-SWIGRUNTIME octave_value SWIG_Octave_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
-  int own = (flags &SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-
-#ifdef SWIG_DIRECTORS
-  Swig::Director *d = Swig::get_rtdir(ptr);
-  if (d && Swig::swig_director_get_self(d))
-    return Swig::swig_director_get_self(d)->as_value();
-#endif
-  return Swig::swig_value_ref(new octave_swig_type(ptr, type, own));
-}
-
-SWIGRUNTIME int SWIG_Octave_ConvertPtrAndOwn(octave_value ov, void **ptr, swig_type_info *type, int flags, int *own) {
-  if (ov.is_cell() && ov.rows() == 1 && ov.columns() == 1)
-    ov = ov.cell_value()(0);
-  if (!ov.is_defined() ||
-      (ov.is_matrix_type() && ov.rows() == 0 && ov.columns() == 0) ) {
-    if (ptr)
-      *ptr = 0;
-    return SWIG_OK;
-  }
-  if (ov.type_id() != octave_swig_ref::static_type_id())
-    return SWIG_ERROR;
-  octave_swig_ref *osr = static_cast < octave_swig_ref *>(ov.internal_rep());
-  octave_swig_type *ost = osr->get_ptr();
-  return ost->cast(ptr, type, own, flags);
-}
-
-SWIGRUNTIME octave_value SWIG_Octave_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return new octave_swig_packed(type, (char *) ptr, sz);
-}
-
-SWIGRUNTIME int SWIG_Octave_ConvertPacked(const octave_value &ov, void *ptr, size_t sz, swig_type_info *type) {
-  if (!ov.is_defined())
-    return SWIG_ERROR;
-  if (ov.type_id() != octave_swig_packed::static_type_id())
-    return SWIG_ERROR;
-  octave_swig_packed *ost = static_cast < octave_swig_packed *>(ov.internal_rep());
-  return ost->copy(type, (char *) ptr, sz) ? SWIG_OK : SWIG_ERROR;
-}
-
-SWIGRUNTIMEINLINE void SWIG_Octave_SetConstant(octave_swig_type *module_ns, const std::string &name, const octave_value &ov) {
-  module_ns->assign(name, ov);
-}
-
-SWIGRUNTIMEINLINE octave_value SWIG_Octave_GetGlobalValue(std::string name) {
-  return get_global_value(name, true);
-}
-
-SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value& value) {
-  set_global_value(name, value);
-}
-
-SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) {
-#if !SWIG_OCTAVE_PREREQ(3,2,0)
-  link_to_global_variable(curr_sym_tab->lookup(name, true));
-#else
-#if !SWIG_OCTAVE_PREREQ(3,8,0)
-  symbol_table::varref(name);
-#endif
-  symbol_table::mark_global(name);
-#endif
-}
-
-SWIGRUNTIME swig_module_info *SWIG_Octave_GetModule(void *clientdata) {
-  octave_value ov = SWIG_Octave_GetGlobalValue("__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION);
-  if (!ov.is_defined() ||
-      ov.type_id() != octave_swig_packed::static_type_id())
-    return 0;
-  const octave_swig_packed* osp = 
-    static_cast < const octave_swig_packed *> (ov.internal_rep());
-  swig_module_info *pointer = 0;
-  osp->copy(0, &pointer, sizeof(swig_module_info *));
-  return pointer;
-}
-
-SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *pointer) {
-  octave_value ov = new octave_swig_packed(0, &pointer, sizeof(swig_module_info *));
-  SWIG_Octave_SetGlobalValue("__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION, ov);
-}
diff --git a/dependencies2013/win32/swig/Lib/octave/octruntime.swg b/dependencies2013/win32/swig/Lib/octave/octruntime.swg
deleted file mode 100644
index f5e68712..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octruntime.swg
+++ /dev/null
@@ -1,452 +0,0 @@
-%insert(runtime) %{
-
-#include <cstdlib>
-#include <iostream>
-
-#include <octave/oct.h>
-#include <octave/version.h>
-
-// Macro for enabling features which require Octave version >= major.minor.patch
-// - Use (OCTAVE_PATCH_VERSION + 0) to handle both '<digit>' (released) and '<digit>+' (in development) patch numbers
-#define SWIG_OCTAVE_PREREQ(major, minor, patch) \
-  ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + (OCTAVE_PATCH_VERSION + 0) >= ((major)<<16) + ((minor)<<8) + (patch) )
-
-// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1
-#if !defined(OCTAVE_MAJOR_VERSION)
-
-# if !defined(OCTAVE_API_VERSION_NUMBER)
-
-// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet
-// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER
-#  include <octave/ov.h>
-#  if defined(octave_ov_h)
-#   define OCTAVE_MAJOR_VERSION 3
-#   define OCTAVE_MINOR_VERSION 8
-#   define OCTAVE_PATCH_VERSION 0
-#  else
-
-// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed
-#   define ComplexLU __ignore
-#   include <octave/CmplxLU.h>
-#   undef ComplexLU
-#   if defined(octave_Complex_LU_h)
-
-// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37
-#    define OCTAVE_MAJOR_VERSION 3
-#    define OCTAVE_MINOR_VERSION 1
-#    define OCTAVE_PATCH_VERSION 99
-
-#   else
-
-// OCTAVE_API_VERSION_NUMBER == 37
-#    define OCTAVE_MAJOR_VERSION 3
-#    define OCTAVE_MINOR_VERSION 2
-#    define OCTAVE_PATCH_VERSION 0
-
-#   endif // defined(octave_Complex_LU_h)
-
-#  endif // defined(octave_ov_h)
-
-// Correlation between Octave API and version numbers extracted from Octave's
-// ChangeLogs; version is the *earliest* released Octave with that API number
-# elif OCTAVE_API_VERSION_NUMBER >= 48
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 6
-#  define OCTAVE_PATCH_VERSION 0
-
-# elif OCTAVE_API_VERSION_NUMBER >= 45
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 4
-#  define OCTAVE_PATCH_VERSION 1
-
-# elif OCTAVE_API_VERSION_NUMBER >= 42
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 3
-#  define OCTAVE_PATCH_VERSION 54
-
-# elif OCTAVE_API_VERSION_NUMBER >= 41
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 3
-#  define OCTAVE_PATCH_VERSION 53
-
-# elif OCTAVE_API_VERSION_NUMBER >= 40
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 3
-#  define OCTAVE_PATCH_VERSION 52
-
-# elif OCTAVE_API_VERSION_NUMBER >= 39
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 3
-#  define OCTAVE_PATCH_VERSION 51
-
-# else // OCTAVE_API_VERSION_NUMBER == 38
-#  define OCTAVE_MAJOR_VERSION 3
-#  define OCTAVE_MINOR_VERSION 3
-#  define OCTAVE_PATCH_VERSION 50
-
-# endif // !defined(OCTAVE_API_VERSION_NUMBER)
-
-#endif // !defined(OCTAVE_MAJOR_VERSION)
-
-#include <octave/Cell.h>
-#include <octave/dynamic-ld.h>
-#include <octave/oct-env.h>
-#include <octave/oct-map.h>
-#include <octave/ov-scalar.h>
-#include <octave/ov-fcn-handle.h>
-#include <octave/parse.h>
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-#include <octave/interpreter.h>
-#else
-#include <octave/toplev.h>
-#endif
-#include <octave/unwind-prot.h>
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-#include <octave/call-stack.h>
-#endif
-
-%}
-
-%insert(runtime) "swigrun.swg";
-%insert(runtime) "swigerrors.swg";
-%insert(runtime) "octrun.swg";
-
-%insert(initbeforefunc) "swiginit.swg"
-
-%insert(initbeforefunc) %{
-
-static bool SWIG_init_user(octave_swig_type* module_ns);
-
-SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) {
-  bool retn = false;
-  {
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-    octave::unwind_protect frame;
-    frame.protect_var(discard_error_messages);          discard_error_messages = true;
-    frame.protect_var(discard_warning_messages);        discard_warning_messages = true;
-#elif SWIG_OCTAVE_PREREQ(3,3,50)
-    unwind_protect frame;
-    frame.protect_var(error_state);                     error_state = 0;
-    frame.protect_var(warning_state);                   warning_state = 0;
-    frame.protect_var(discard_error_messages);          discard_error_messages = true;
-    frame.protect_var(discard_warning_messages);        discard_warning_messages = true;
-#else
-    unwind_protect::begin_frame("SWIG_Octave_LoadModule");
-    unwind_protect_int(error_state);                    error_state = 0;
-    unwind_protect_int(warning_state);                  warning_state = 0;
-    unwind_protect_bool(discard_error_messages);        discard_error_messages = true;
-    unwind_protect_bool(discard_warning_messages);      discard_warning_messages = true;
-#endif
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-    try {
-      feval(name, octave_value_list(), 0);
-      retn = true;
-    } catch (octave::execution_exception&) { }
-#else
-    feval(name, octave_value_list(), 0);
-    retn = (error_state == 0);
-#endif
-#if !SWIG_OCTAVE_PREREQ(3,3,50)
-    unwind_protect::run_frame("SWIG_Octave_LoadModule");
-#endif
-  }
-  if (!retn) {
-    error(SWIG_name_d ": could not load module `%s'", name.c_str());
-  }
-  return retn;
-}
-
-SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) {
-  bool retn = false;
-  {
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-    octave::unwind_protect frame;
-    frame.protect_var(discard_error_messages);          discard_error_messages = true;
-    frame.protect_var(discard_warning_messages);        discard_warning_messages = true;
-#elif SWIG_OCTAVE_PREREQ(3,3,50)
-    unwind_protect frame;
-    frame.protect_var(error_state);                     error_state = 0;
-    frame.protect_var(warning_state);                   warning_state = 0;
-    frame.protect_var(discard_error_messages);          discard_error_messages = true;
-    frame.protect_var(discard_warning_messages);        discard_warning_messages = true;
-#else
-    unwind_protect::begin_frame("SWIG_Octave_LoadModule");
-    unwind_protect_int(error_state);                    error_state = 0;
-    unwind_protect_int(warning_state);                  warning_state = 0;
-    unwind_protect_bool(discard_error_messages);        discard_error_messages = true;
-    unwind_protect_bool(discard_warning_messages);      discard_warning_messages = true;
-#endif
-    octave_value_list args;
-    args.append(name);
-    args.append(octloadfcn->fcn_file_name());
-#if SWIG_OCTAVE_PREREQ(4,2,0)
-    try {
-      feval("autoload", args, 0);
-      retn = true;
-    } catch (octave::execution_exception&) { }
-#else
-    feval("autoload", args, 0);
-    retn = (error_state == 0);
-#endif
-#if !SWIG_OCTAVE_PREREQ(3,3,50)
-    unwind_protect::run_frame("SWIG_Octave_InstallFunction");
-#endif
-  }
-  if (!retn) {
-    error(SWIG_name_d ": could not load function `%s'", name.c_str());
-  }
-  return retn;
-}
-
-static const char *const subclass_usage = "-*- texinfo -*- \n\
-@deftypefn {Loadable Function} {} subclass()\n\
-@deftypefnx{Loadable Function} {} subclass(@var{swigclass}, @var{name}, @var{fcn}, @dots{})\n\
-Subclass a C++ class from within Octave, and provide implementations of its virtual methods.\n\
-\n\
-See the SWIG manual for usage examples.\n\
-@end deftypefn";
-
-DEFUN_DLD( subclass, args, nargout, subclass_usage ) {
-  octave_swig_type *top = new octave_swig_type;
-  for (int j = 0; j < args.length(); ++j) {
-    if (args(j).type_id() == octave_swig_ref::static_type_id()) {
-      octave_swig_ref *osr = static_cast < octave_swig_ref *>(args(j).internal_rep());
-      octave_swig_type *ost = osr->get_ptr();
-      if (!ost->is_owned()) {
-        error("subclass: cannot subclass object not constructed on octave side");
-        return octave_value_list();
-      }
-      top->merge(*ost);
-    } else if (args(j).is_function_handle()) {
-      top->assign(args(j).fcn_handle_value()->fcn_name(), args(j));
-    } else if (args(j).is_string()) {
-      if (j + 1 >= args.length()) {
-        error("subclass: member assignments must be of string,value form");
-        return octave_value_list();
-      }
-      top->assign(args(j).string_value(), args(j + 1));
-      ++j;
-    } else {
-      error("subclass: invalid arguments to subclass()");
-      return octave_value_list();
-    }
-  }
-  return octave_value(Swig::swig_value_ref(top));
-}
-
-static const char *const swig_type_usage = "-*- texinfo -*- \n\
-@deftypefn {Loadable Function} {} swig_type(@var{swigref})\n\
-Return the underlying C/C++ type name of a SWIG-wrapped object.\n\
-@end deftypefn";
-
-DEFUN_DLD( swig_type, args, nargout, swig_type_usage ) {
-  if (args.length() != 1) {
-    error("swig_type: must be called with only a single object");
-    return octave_value_list();
-  }
-  octave_swig_type *ost = Swig::swig_value_deref(args(0));
-  if (!ost) {
-    error("swig_type: object is not a swig_ref");
-    return octave_value_list();
-  }
-  return octave_value(ost->swig_type_name());
-}
-
-static const char *const swig_typequery_usage = "-*- texinfo -*- \n\
-@deftypefn {Loadable Function} {} swig_typequery(@var{string})\n\
-Return @var{string} if it is a recognised SWIG-wrapped C/C++ type name;\n\
-otherwise return `<unknown>'.\n\
-@end deftypefn";
-
-DEFUN_DLD( swig_typequery, args, nargout, swig_typequery_usage ) {
-  if (args.length() != 1 || !args(0).is_string()) {
-    error("swig_typequery: must be called with single string argument");
-    return octave_value_list();
-  }
-  swig_module_info *module = SWIG_GetModule(0);
-  swig_type_info *type = SWIG_TypeQueryModule(module, module, args(0).string_value().c_str());
-  if (!type)
-    return octave_value("<unknown>");
-  return octave_value(type->name);
-}
-
-static const char *const swig_this_usage = "-*- texinfo -*- \n\
-@deftypefn {Loadable Function} {} swig_this(@var{swigref})\n\
-Return the underlying C/C++ pointer of a SWIG-wrapped object.\n\
-@end deftypefn";
-
-DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) {
-  if (args.length() != 1) {
-    error("swig_this: must be called with only a single object");
-    return octave_value_list();
-  }
-  if (args(0).is_matrix_type() && args(0).rows() == 0 && args(0).columns() == 0)
-    return octave_value(octave_uint64(0));
-  octave_swig_type *ost = Swig::swig_value_deref(args(0));
-  if (!ost) {
-    error("swig_this: object is not a swig_ref");
-    return octave_value_list();
-  }
-  return octave_value(octave_uint64((unsigned long long) ost->swig_this()));
-}
-
-static const char *const swig_octave_prereq_usage = "-*- texinfo -*- \n\
-@deftypefn {Loadable Function} {} swig_octave_prereq(@var{major}, @var{minor}, @var{patch})\n\
-Return true if the version of Octave is at least @var{major}.@var{minor}.@var{patch}.\n\
-@end deftypefn";
-
-DEFUN_DLD( swig_octave_prereq, args, nargout, swig_octave_prereq_usage ) {
-  if (args.length() != 3) {
-    error("swig_octave_prereq: must be called with 3 arguments");
-    return octave_value_list();
-  }
-  const int major = args(0).int_value();
-  const int minor = args(1).int_value();
-  const int patch = args(2).int_value();
-  const bool prereq = SWIG_OCTAVE_PREREQ(major, minor, patch);
-  return octave_value(prereq);
-}
-
-static const char *const SWIG_name_usage = "-*- texinfo -*- \n\
-@deftypefn {Loadable Module} {} " SWIG_name_d "\n\
-Loads the SWIG-generated module `" SWIG_name_d "'.\n\
-@end deftypefn";
-
-DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
-
-  static octave_swig_type* module_ns = 0;
-
-  // workaround to prevent octave seg-faulting on exit: set Octave exit function
-  // octave_exit to _Exit, which exits immediately without trying to cleanup memory.
-  // definitely affected version 3.2.*, not sure about 3.3.*, seems to be fixed in
-  // version 3.4.*, but reappeared in 4.2.*, so turn on for all versions after 3.2.*.
-  // can be turned off with macro definition.
-#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK
-#if SWIG_OCTAVE_PREREQ(3,2,0)
-  octave_exit = ::_Exit;
-#endif
-#endif
-
-  // check for no input and output args
-  if (args.length() != 0 || nargout != 0) {
-    print_usage();
-    return octave_value_list();
-  }
-
-  // create module on first function call
-  if (!module_ns) {
-
-    // workaround bug in octave where installing global variable of custom type and then
-    // exiting without explicitly clearing the variable causes octave to segfault.
-#if SWIG_OCTAVE_PREREQ(3,2,0)
-    octave_value_list eval_args;
-    eval_args.append("base");
-    eval_args.append("function __swig_atexit__; "
-                     "  if mislocked() "
-                     "    clear -all; "
-                     "  else "
-                     "    mlock(); "
-                     "  endif; "
-                     "endfunction; "
-                     "__swig_atexit__; "
-                     "atexit(\"__swig_atexit__\", false); "
-                     "atexit(\"__swig_atexit__\")");
-    feval("evalin", eval_args, 0);
-#endif
-
-    octave_swig_ref::register_type();
-    octave_swig_packed::register_type();
-    SWIG_InitializeModule(0);
-    SWIG_PropagateClientData();
-
-    octave_function *me = octave_call_stack::current();
-
-    if (!SWIG_Octave_InstallFunction(me, "subclass")) {
-      return octave_value_list();
-    }
-    if (!SWIG_Octave_InstallFunction(me, "swig_type")) {
-      return octave_value_list();
-    }
-    if (!SWIG_Octave_InstallFunction(me, "swig_typequery")) {
-      return octave_value_list();
-    }
-    if (!SWIG_Octave_InstallFunction(me, "swig_this")) {
-      return octave_value_list();
-    }
-    if (!SWIG_Octave_InstallFunction(me, "swig_octave_prereq")) {
-      return octave_value_list();
-    }
-
-    octave_swig_type* cvar_ns=0;
-    if (std::string(SWIG_global_name) != ".") {
-      cvar_ns=new octave_swig_type;
-      for (int j=0;swig_globals[j].name;++j)
-        if (swig_globals[j].get_method)
-          cvar_ns->assign(swig_globals[j].name,&swig_globals[j]);
-    }
-
-    module_ns=new octave_swig_type(0, 0, 0, true);
-    if (std::string(SWIG_global_name) != ".") {
-      module_ns->assign(SWIG_global_name,Swig::swig_value_ref(cvar_ns));
-    }
-    else {
-      for (int j=0;swig_globals[j].name;++j)
-        if (swig_globals[j].get_method)
-          module_ns->assign(swig_globals[j].name,&swig_globals[j]);
-    }
-    for (int j=0;swig_globals[j].name;++j)
-      if (swig_globals[j].method)
-        module_ns->assign(swig_globals[j].name,&swig_globals[j]);
-
-    // * need better solution here; swig_type -> octave_class mapping is
-    // * really n-to-1, in some cases such as template partial spec, etc.
-    // * see failing tests.
-    for (int j=0;swig_types[j];++j)
-      if (swig_types[j]->clientdata) {
-        swig_octave_class* c=(swig_octave_class*)swig_types[j]->clientdata;
-        module_ns->assign(c->name,
-                        Swig::swig_value_ref
-                        (new octave_swig_type(0,swig_types[j])));
-      }
-
-    if (!SWIG_init_user(module_ns)) {
-      delete module_ns;
-      module_ns=0;
-      return octave_value_list();
-    }
-
-    SWIG_InstallOps(octave_swig_ref::static_type_id());
-
-    octave_swig_type::swig_member_const_iterator mb;
-    for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) {
-      if (mb->second.first && mb->second.first->method) {
-        if (!SWIG_Octave_InstallFunction(me, mb->first)) {
-          return octave_value_list();
-        }
-      }
-    }
-
-#if !SWIG_OCTAVE_PREREQ(3,2,0)
-    mlock(me->name());
-#else
-    mlock();
-#endif
-
-  }
-
-  octave_swig_type::swig_member_const_iterator mb;
-  for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) {
-    if (mb->second.second.is_defined()) {
-      SWIG_Octave_SetGlobalValue(mb->first, mb->second.second);
-      SWIG_Octave_LinkGlobalValue(mb->first);
-    }
-  }
-
-  SWIG_Octave_SetGlobalValue(SWIG_name_d, module_ns->as_value());
-  SWIG_Octave_LinkGlobalValue(SWIG_name_d);
-
-  return octave_value_list();
-
-}
-
-%}
diff --git a/dependencies2013/win32/swig/Lib/octave/octstdcommon.swg b/dependencies2013/win32/swig/Lib/octave/octstdcommon.swg
deleted file mode 100644
index 799d369a..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octstdcommon.swg
+++ /dev/null
@@ -1,227 +0,0 @@
-%fragment("StdTraits","header",fragment="StdTraitsCommon")
-{
-namespace swig {  
-// Traits that provides the from method
-  template <class Type> struct traits_from_ptr {
-    static octave_value from(Type *val, int owner = 0) {
-      return SWIG_NewPointerObj(val, type_info<Type>(), owner);
-    }
-  };
-
-  template <class Type> struct traits_from {
-    static octave_value from(const Type& val) {
-      return traits_from_ptr<Type>::from(new Type(val), 1);
-    }
-  };
-
-  template <class Type> struct traits_from<Type *> {
-    static octave_value from(Type* val) {
-      return traits_from_ptr<Type>::from(val, 0);
-    }
-  };
-
-  template <class Type> struct traits_from<const Type *> {
-    static octave_value from(const Type* val) {
-      return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0);
-    }
-  };
-
-
-  template <class Type>
-  inline octave_value from(const Type& val) {
-    return traits_from<Type>::from(val);
-  }
-
-  template <class Type>
-  inline octave_value from_ptr(Type* val, int owner) {
-    return traits_from_ptr<Type>::from(val, owner);
-  }
-
-    // Traits that provides the asval/as/check method
-  template <class Type>
-  struct traits_asptr {   
-    static int asptr(const octave_value& obj, Type **val) {
-      Type *p;
-      swig_type_info *descriptor = type_info<Type>();
-      int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-      if (SWIG_IsOK(res)) {
-	if (val) *val = p;
-      }
-      return res;
-    }
-  }; 
-
-  template <class Type>
-  inline int asptr(const octave_value& obj, Type **vptr) {
-    return traits_asptr<Type>::asptr(obj, vptr);
-  }
-
-  template <class Type> 
-  struct traits_asval {
-    static int asval(const octave_value& obj, Type *val) {
-      if (val) {
-	Type *p = 0;
-	int res = traits_asptr<Type>::asptr(obj, &p);
-	if (!SWIG_IsOK(res)) return res;	
-	if (p) {
-	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
-	  *(const_cast<noconst_type*>(val)) = *p;
-	  if (SWIG_IsNewObj(res)){
-	    %delete(p);
-	    res = SWIG_DelNewMask(res);
-	  }
-	  return res;
-	} else {
-	  return SWIG_ERROR;
-	}
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-
-  template <class Type> struct traits_asval<Type*> {
-    static int asval(const octave_value& obj, Type **val) {
-      if (val) {
-        typedef typename noconst_traits<Type>::noconst_type noconst_type;
-        noconst_type *p = 0;
-        int res = traits_asptr<noconst_type>::asptr(obj,  &p);
-        if (SWIG_IsOK(res)) {
-          *(const_cast<noconst_type**>(val)) = p;
-	}
-	return res;
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-  
-  template <class Type>
-  inline int asval(const octave_value& obj, Type *val) {
-    return traits_asval<Type>::asval(obj, val);
-  }
-
-  template <class Type> 
-  struct traits_as<Type, value_category> {
-    static Type as(const octave_value& obj, bool throw_error) {
-      Type v;
-      int res = asval(obj, &v);
-      if (!obj.is_defined() || !SWIG_IsOK(res)) {
-	if (!Octave_Error_Occurred()) {
-	  %type_error(swig::type_name<Type>());
-	}
-	if (throw_error) throw std::invalid_argument("bad type");
-      }
-      return v;
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type, pointer_category> {
-    static Type as(const octave_value& obj, bool throw_error) {
-      Type *v = 0;      
-      int res = traits_asptr<Type>::asptr(obj, &v);
-      if (SWIG_IsOK(res) && v) {
-	if (SWIG_IsNewObj(res)) {
-	  Type r(*v);
-	  %delete(v);
-	  return r;
-	} else {
-	  return *v;
-	}
-      } else {
-	// Uninitialized return value, no Type() constructor required.
-	static Type *v_def = (Type*) malloc(sizeof(Type));
-	if (!Octave_Error_Occurred()) {
-	  %type_error(swig::type_name<Type>());
-	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
-      }
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type*, pointer_category> {
-    static Type* as(const octave_value& obj, bool throw_error) {
-      Type *v = 0;      
-      int res = traits_asptr<Type>::asptr(obj, &v);
-      if (SWIG_IsOK(res)) {
-	return v;
-      } else {
-	if (!Octave_Error_Occurred()) {
-	  %type_error(swig::type_name<Type>());
-	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	return 0;
-      }
-    }
-  };
-    
-  template <class Type>
-  inline Type as(const octave_value& obj, bool te = false) {
-    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
-  }
-
-  template <class Type> 
-  struct traits_check<Type, value_category> {
-    static bool check(const octave_value& obj) {
-      int res = asval(obj, (Type *)(0));
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type> 
-  struct traits_check<Type, pointer_category> {
-    static bool check(const octave_value& obj) {
-      int res = asptr(obj, (Type **)(0));
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type>
-  inline bool check(const octave_value& obj) {
-    return traits_check<Type, typename traits<Type>::category>::check(obj);
-  }
-}
-}
-
-%define %specialize_std_container(Type,Check,As,From)
-%{
-namespace swig {
-  template <>  struct traits_asval<Type > {   
-    typedef Type value_type;
-    static int asval(const octave_value& obj, value_type *val) {
-      if (Check(obj)) {
-	if (val) *val = As(obj);
-	return SWIG_OK;
-      }
-      return SWIG_ERROR;
-    }
-  };
-  template <>  struct traits_from<Type > {
-    typedef Type value_type;
-    static octave_value from(const value_type& val) {
-      return From(val);
-    }
-  };
-
-  template <> 
-  struct traits_check<Type, value_category> {
-    static int check(const octave_value& obj) {
-      int res = Check(obj);
-      return obj && res ? res : 0;
-    }
-  };
-}
-%}
-%enddef
-
-
-#define specialize_std_vector(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_list(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_deque(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_set(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_multiset(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-
diff --git a/dependencies2013/win32/swig/Lib/octave/octtypemaps.swg b/dependencies2013/win32/swig/Lib/octave/octtypemaps.swg
deleted file mode 100644
index 4acf8e07..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octtypemaps.swg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// Include fundamental fragment definitions
-%include <typemaps/fragments.swg>
-
-// Look for user fragments file.
-%include <octfragments.swg>
-
-// Octave fragments for primitive types
-%include <octprimtypes.swg>
-
-// Octave fragments for char* strings
-//%include <octstrings.swg>
-
-
-#ifndef SWIG_DIRECTOR_TYPEMAPS
-#define SWIG_DIRECTOR_TYPEMAPS
-#endif
-
-// Octave types
-#define SWIG_Object                      octave_value
-#define VOID_Object                      octave_value()
-
-/*
-// Octave allows implicit conversion
-#define %implicitconv_flag              $implicitconv 
-*/
-
-// append output
-#define SWIG_AppendOutput(result, obj)  SWIG_Octave_AppendOutput(result, obj)
-
-// set constant
-#define SWIG_SetConstant(name, obj)     SWIG_Octave_SetConstant(module_ns,name,obj) 
-
-// raise
-#define SWIG_Octave_Raise(OBJ, TYPE, DESC) error("C++ side threw an exception of type " TYPE)
-#define SWIG_Raise(obj, type, desc)     SWIG_Octave_Raise(obj, type, desc)
-
-// Include the unified typemap library
-%include <typemaps/swigtypemaps.swg>
-
-%typecheck(SWIG_TYPECHECK_SWIGOBJECT) SWIG_Object "$1 = (*$input).is_defined();";
-%typecheck(SWIG_TYPECHECK_SWIGOBJECT) octave_value_list "$1 = true;";
-
-%typemap(in) (octave_value_list varargs,...) {
-  for (int j=$argnum-1;j<args.length();++j)
-    $1.append(args(j));
-}
-%typecheck(2000) (octave_value_list varargs,...) {
-  $1=1;
-}
-
-%typemap(in) (const octave_value_list& varargs,...) (octave_value_list tmp) {
-  for (int j=$argnum-1;j<args.length();++j)
-    tmp.append(args(j));
-  $1=&tmp;
-}
-%typecheck(2000) (const octave_value_list& varargs,...) {
-  $1=1;
-}
-
-%typemap(out) octave_value_list {
-  _outp->append($1);
-}
-%typemap(out,noblock=1) octave_map, Octave_map {
-  $result=$1;
-}
-%typemap(out,noblock=1) NDArray {
-  $result=$1;
-}
-%typemap(out,noblock=1) Cell {
-  $result=$1;
-}
-
-/*
-// Smart Pointers
-%typemap(out,noblock=1) const SWIGTYPE & SMARTPOINTER  {
-  $result = SWIG_NewPointerObj(%new_copy(*$1, $*ltype), $descriptor, SWIG_POINTER_OWN | %newpointer_flags);
-}
-
-%typemap(ret) const SWIGTYPE & SMARTPOINTER, SWIGTYPE SMARTPOINTER {
-  octave_swig_type* lobj=Swig::swig_value_deref($result);
-  if (lobj) {
-    std::list<octave_value_list> idx;
-    idx.push_back(octave_value("__deref__"));
-    idx.push_back(octave_value_list());
-    octave_value_list ovl(lobj->subsref(".(",idx));
-    octave_swig_type* robj=ovl.length()>=1?Swig::swig_value_deref(ovl(0)):0;
-    if (robj && !error_state)
-      lobj->append(robj);
-  }
-}
-*/
diff --git a/dependencies2013/win32/swig/Lib/octave/octuserdir.swg b/dependencies2013/win32/swig/Lib/octave/octuserdir.swg
deleted file mode 100644
index ebb11b3a..00000000
--- a/dependencies2013/win32/swig/Lib/octave/octuserdir.swg
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -------------------------------------------------------------------------
- *  Special user directives
- * ------------------------------------------------------------------------- */
-
-/* ------------------------------------------------------------------------- */
-/*
-  Implicit Conversion using the C++ constructor mechanism
-*/
-
-#define %implicitconv      %feature("implicitconv") 
-#define %noimplicitconv    %feature("implicitconv", "0")
-#define %clearimplicitconv %feature("implicitconv", "")
-
-
-/* ------------------------------------------------------------------------- */
-/* 
-   %extend_smart_pointer extend the smart pointer support.
-
-   For example, if you have a smart pointer as:
-	    
-     template <class Type> class RCPtr {
-     public:
-       ...
-       RCPtr(Type *p);
-   	Type * operator->() const;
-   	...
-     };
-     
-   you use the %extend_smart_pointer directive as:
-   
-     %extend_smart_pointer(RCPtr<A>);
-     %template(RCPtr_A)  RCPtr<A>;
-   
-   then, if you have something like:
-
-     RCPtr<A> make_ptr();
-     int foo(A *);
-
-   you can do the following:
-
-     a = make_ptr();
-     b = foo(a);
-
-   ie, swig will accept a RCPtr<A> object where a 'A *' is
-   expected.
-
-   Also, when using vectors
-   
-     %extend_smart_pointer(RCPtr<A>);
-     %template(RCPtr_A) RCPtr<A>;
-     %template(vector_A) std::vector<RCPtr<A> >;
-   	
-   you can type
-
-     a = A();
-     v = vector_A(2)
-     v[0] = a
-
-   ie, an 'A *' object is accepted, via implicit conversion, 
-   where a RCPtr<A> object is expected. Additionally
-
-     x = v[0]
-
-   returns (and sets 'x' as) a copy of v[0], making reference
-   counting possible and consistent.
-*/
-
-%define %extend_smart_pointer(Type...)
-%implicitconv Type;
-%apply const SWIGTYPE& SMARTPOINTER { const Type& };
-%apply SWIGTYPE SMARTPOINTER { Type };
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/octave/std_alloc.i b/dependencies2013/win32/swig/Lib/octave/std_alloc.i
deleted file mode 100644
index 35dc051b..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_alloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_alloc.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_basic_string.i b/dependencies2013/win32/swig/Lib/octave/std_basic_string.i
deleted file mode 100644
index 19712e8d..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_basic_string.i
+++ /dev/null
@@ -1,89 +0,0 @@
-#if !defined(SWIG_STD_STRING) 
-#define SWIG_STD_BASIC_STRING
-#define SWIG_STD_MODERN_STL
-
-%include <octcontainer.swg>
-
-#define %swig_basic_string(Type...)  %swig_sequence_methods_val(Type)
-
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header",
-	  fragment="SWIG_AsCharPtrAndSize") {
-SWIGINTERN int
-SWIG_AsPtr(std::basic_string<char>)(octave_value obj, std::string **val)
-{
-  if (obj.is_string()) {
-    if (val)
-      *val = new std::string(obj.string_value());
-    return SWIG_NEWOBJ;
-  }
-  if (val)
-    error("a string is expected");
-  return 0;
-}
-}
-
-%fragment(SWIG_From_frag(std::basic_string<char>),"header",
-	  fragment="SWIG_FromCharPtrAndSize") {
-SWIGINTERNINLINE octave_value
-  SWIG_From(std::basic_string<char>)(const std::string& s)
-  {
-    return SWIG_FromCharPtrAndSize(s.data(), s.size());
-  }
-}
-
-%ignore std::basic_string::operator +=;
-
-%include <std/std_basic_string.i>
-%typemaps_asptrfromn(%checkcode(STRING), std::basic_string<char>);
-
-#endif
-
-
-#if !defined(SWIG_STD_WSTRING)
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header",
-	  fragment="SWIG_AsWCharPtrAndSize") {
-SWIGINTERN int
-  SWIG_AsPtr(std::basic_string<wchar_t>)(PyObject* obj, std::wstring **val)
-  {
-    static swig_type_info* string_info = 
-      SWIG_TypeQuery("std::basic_string<wchar_t> *");
-    std::wstring *vptr;    
-    if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
-      if (val) *val = vptr;
-      return SWIG_OLDOBJ;
-    } else {
-      PyErr_Clear();
-      wchar_t *buf = 0 ; size_t size = 0; int alloc = 0;
-      if (SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) {
-	if (buf) {
-	  if (val) *val = new std::wstring(buf, size - 1);
-	  if (alloc == SWIG_NEWOBJ) %delete_array(buf);
-	  return SWIG_NEWOBJ;
-	}
-      } else {
-	PyErr_Clear();
-      }  
-      if (val) {
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	PyErr_SetString(PyExc_TypeError,"a wstring is expected");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-      }
-      return 0;
-    }
-  }
-}
-
-%fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
-	  fragment="SWIG_FromWCharPtrAndSize") {
-SWIGINTERNINLINE PyObject*
-  SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s)
-  {
-    return SWIG_FromWCharPtrAndSize(s.data(), s.size());
-  }
-}
-
-%typemaps_asptrfromn(%checkcode(UNISTRING), std::basic_string<wchar_t>);
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/octave/std_carray.i b/dependencies2013/win32/swig/Lib/octave/std_carray.i
deleted file mode 100644
index e69de29b..00000000
diff --git a/dependencies2013/win32/swig/Lib/octave/std_char_traits.i b/dependencies2013/win32/swig/Lib/octave/std_char_traits.i
deleted file mode 100644
index bf4e6c47..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_char_traits.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_char_traits.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_common.i b/dependencies2013/win32/swig/Lib/octave/std_common.i
deleted file mode 100644
index c8f17ba7..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_common.i
+++ /dev/null
@@ -1,72 +0,0 @@
-%include <std/std_except.i>
-%include <octstdcommon.swg>
-
-
-// Generate the traits for a 'primitive' type, such as 'double',
-// for which the SWIG_AsVal and SWIG_From methods are already defined.
-
-%define %traits_ptypen(Type...)
-  %fragment(SWIG_Traits_frag(Type),"header",
-	    fragment=SWIG_AsVal_frag(Type),
-	    fragment=SWIG_From_frag(Type),
-	    fragment="StdTraits") {
-namespace swig {
-  template <> struct traits< Type > {
-    typedef value_category category;
-    static const char* type_name() { return  #Type; }
-  };
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(octave_value obj, value_type *val) {
-      return SWIG_AsVal(Type)(obj, val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static octave_value from(const value_type& val) {
-      return SWIG_From(Type)(val);
-    }
-  };
-}
-}
-%enddef
-
-/* Traits for enums. This is bit of a sneaky trick needed because a generic template specialization of enums
-   is not possible (unless using template meta-programming which SWIG doesn't support because of the explicit
-   instantiations required using %template). The STL containers define the 'front' method and the typemap
-   below is used whenever the front method is wrapped returning an enum. This typemap simply picks up the
-   standard enum typemap, but additionally drags in a fragment containing the traits_asval and traits_from
-   required in the generated code for enums. */
-
-%define %traits_enum(Type...)
-  %fragment("SWIG_Traits_enum_"{Type},"header",
-	    fragment=SWIG_AsVal_frag(int),
-	    fragment=SWIG_From_frag(int),
-	    fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(octave_value obj, value_type *val) {
-      return SWIG_AsVal(int)(obj, (int *)val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static octave_value from(const value_type& val) {
-      return SWIG_From(int)((int)val);
-    }
-  };
-}
-}
-%typemap(out, fragment="SWIG_Traits_enum_"{Type}) const enum SWIGTYPE& front %{$typemap(out, const enum SWIGTYPE&)%}
-%enddef
-
-
-%include <std/std_common.i>
-
-//
-// Generates the traits for all the known primitive
-// C++ types (int, double, ...)
-//
-%apply_cpptypes(%traits_ptypen);
-
diff --git a/dependencies2013/win32/swig/Lib/octave/std_complex.i b/dependencies2013/win32/swig/Lib/octave/std_complex.i
deleted file mode 100644
index 771728b9..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_complex.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  STD C++ complex typemaps
- */
-
-%include <octcomplex.swg>
-
-%{
-#include <complex> 
-%}
-
-/* defining the complex as/from converters */
-
-%swig_cplxdbl_convn(std::complex<double>, std::complex<double>, std::real, std::imag)
-%swig_cplxflt_convn(std::complex<float>,  std::complex<float>,  std::real, std::imag)
-
-/* defining the typemaps */
-
-%typemaps_primitive(%checkcode(CPLXDBL), std::complex<double>);
-%typemaps_primitive(%checkcode(CPLXFLT), std::complex<float>);
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/octave/std_container.i b/dependencies2013/win32/swig/Lib/octave/std_container.i
deleted file mode 100644
index cab76452..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_container.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <octcontainer.swg>
-%include <std/std_container.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_deque.i b/dependencies2013/win32/swig/Lib/octave/std_deque.i
deleted file mode 100644
index 6866a610..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_deque.i
+++ /dev/null
@@ -1,25 +0,0 @@
-// Deques
-
-%fragment("StdDequeTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::deque<T> >  {
-      static int asptr(octave_value obj, std::deque<T>  **vec) {
-	return traits_asptr_stdseq<std::deque<T> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::deque<T> > {
-      static octave_value from(const std::deque<T> & vec) {
-	return traits_from_stdseq<std::deque<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_deque_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_deque_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_except.i b/dependencies2013/win32/swig/Lib/octave/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_list.i b/dependencies2013/win32/swig/Lib/octave/std_list.i
deleted file mode 100644
index 1421efae..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_list.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// Lists
-
-%fragment("StdListTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T >
-    struct traits_asptr<std::list<T> >  {
-      static int asptr(const octave_value& obj, std::list<T> **lis) {
-	return traits_asptr_stdseq<std::list<T> >::asptr(obj, lis);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::list<T> > {
-      static octave_value *from(const std::list<T> & vec) {
-	return traits_from_stdseq<std::list<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_list_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_list_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_list.i>
-
diff --git a/dependencies2013/win32/swig/Lib/octave/std_map.i b/dependencies2013/win32/swig/Lib/octave/std_map.i
deleted file mode 100644
index fd15661c..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_map.i
+++ /dev/null
@@ -1,157 +0,0 @@
-// Maps
-
-%include <octcontainer.swg>
-
-%fragment("StdMapCommonTraits","header",fragment="StdSequenceTraits")
-{
-  namespace swig {
-    template <class ValueType>
-    struct from_key_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef octave_value result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.first);
-      }
-    };
-
-    template <class ValueType>
-    struct from_value_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef octave_value result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.second);
-      }
-    };
-
-    template<class OutIterator, class FromOper, class ValueType = typename OutIterator::value_type>
-    struct OctMapIterator_T : OctSwigIteratorClosed_T<OutIterator, ValueType, FromOper>
-    {
-      OctMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, octave_value seq)
-	: OctSwigIteratorClosed_T<OutIterator,ValueType,FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-
-    template<class OutIterator,
-	     class FromOper = from_key_oper<typename OutIterator::value_type> >
-    struct OctMapKeyIterator_T : OctMapIterator_T<OutIterator, FromOper>
-    {
-      OctMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, octave_value seq)
-	: OctMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-    template<typename OutIter>
-    inline OctSwigIterator*
-    make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, octave_value seq = octave_value())
-    {
-      return new OctMapKeyIterator_T<OutIter>(current, begin, end, seq);
-    }
-
-    template<class OutIterator,
-	     class FromOper = from_value_oper<typename OutIterator::value_type> >
-    struct OctMapValueIterator_T : OctMapIterator_T<OutIterator, FromOper>
-    {
-      OctMapValueIterator_T(OutIterator curr, OutIterator first, OutIterator last, octave_value seq)
-	: OctMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-    
-
-    template<typename OutIter>
-    inline OctSwigIterator*
-    make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, octave_value seq = 0)
-    {
-      return new OctMapValueIterator_T<OutIter>(current, begin, end, seq);
-    }
-  }
-}
-
-%fragment("StdMapTraits","header",fragment="StdMapCommonTraits")
-{
-  namespace swig {
-    template <class OctSeq, class K, class T >
-    inline void
-    assign(const OctSeq& octseq, std::map<K,T > *map) {
-      typedef typename std::map<K,T>::value_type value_type;
-      typename OctSeq::const_iterator it = octseq.begin();
-      for (;it != octseq.end(); ++it) {
-	map->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T>
-    struct traits_asptr<std::map<K,T> >  {
-      typedef std::map<K,T> map_type;
-      static int asptr(octave_value obj, map_type **val) {
-	/*
-	int res = SWIG_ERROR;
-	if (PyDict_Check(obj)) {
-	  SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
-	  res = traits_asptr_stdseq<std::map<K,T>, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  map_type *p;
-	  swig_type_info *descriptor = swig::type_info<map_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-	*/
-	return SWIG_ERROR;
-      }      
-    };
-      
-    template <class K, class T >
-    struct traits_from<std::map<K,T> >  {
-      typedef std::map<K,T> map_type;
-      typedef typename map_type::const_iterator const_iterator;
-      typedef typename map_type::size_type size_type;
-            
-      static octave_value from(const map_type& map) {
-	/*
-	swig_type_info *desc = swig::type_info<map_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_NewPointerObj(new map_type(map), desc, SWIG_POINTER_OWN);
-	} else {
-	  size_type size = map.size();
-	  int pysize = (size <= (size_type) INT_MAX) ? (int) size : -1;
-	  if (pysize < 0) {
-	    SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	    PyErr_SetString(PyExc_OverflowError,
-			    "map size not valid in python");
-	    SWIG_PYTHON_THREAD_END_BLOCK;
-	    return NULL;
-	  }
-	  PyObject *obj = PyDict_New();
-	  for (const_iterator i= map.begin(); i!= map.end(); ++i) {
-	    swig::SwigVar_PyObject key = swig::from(i->first);
-	    swig::SwigVar_PyObject val = swig::from(i->second);
-	    PyDict_SetItem(obj, key, val);
-	  }
-	  return obj;
-	}
-	*/
-	return octave_value();
-      }
-    };
-  }
-}
-
-%define %swig_map_common(Map...)
-  %swig_sequence_iterator(Map);
-  %swig_container_methods(Map);
-%enddef
-
-%define %swig_map_methods(Map...)
-     %swig_map_common(Map)
-%enddef
-
-
-%include <std/std_map.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_pair.i b/dependencies2013/win32/swig/Lib/octave/std_pair.i
deleted file mode 100644
index 2f3d4dfa..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_pair.i
+++ /dev/null
@@ -1,135 +0,0 @@
-// Pairs
-
-%include <octstdcommon.swg>
-
-//#define SWIG_STD_PAIR_ASVAL
-
-%fragment("StdPairTraits","header",fragment="StdTraits") {
-  namespace swig {
-#ifdef SWIG_STD_PAIR_ASVAL
-    template <class T, class U >
-    struct traits_asval<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(const octave_value& first, octave_value second,
-			  std::pair<T,U> *val)
-      {
-	if (val) {
-	  T *pfirst = &(val->first);
-	  int res1 = swig::asval(first, pfirst);
-	  if (!SWIG_IsOK(res1))
-	    return res1;
-	  U *psecond = &(val->second);
-	  int res2 = swig::asval(second, psecond);
-	  if (!SWIG_IsOK(res2))
-	    return res2;
-	  return res1 > res2 ? res1 : res2;
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval(first, pfirst);
-	  if (!SWIG_IsOK(res1))
-	    return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2))
-	    return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-      }
-
-      static int asval(const octave_value& obj, std::pair<T,U> *val) {
-	if (obj.is_cell()) {
-	  Cell c=obj.cell_value();
-	  if (c.numel()<2) {
-	    error("pair from Cell array requires at least two elements");
-	    return SWIG_ERROR;
-	  }
-	  return get_pair(c(0),c(1),val);
-	} else {
-	  value_type *p;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)
-	    *val = *p;
-	  return res;
-	}
-	return SWIG_ERROR;
-      }
-    };
-
-#else
-    template <class T, class U >
-    struct traits_asptr<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(const octave_value& first, octave_value second,
-			  std::pair<T,U> **val) 
-      {
-	if (val) {
-	  value_type *vp = %new_instance(std::pair<T,U>);
-	  T *pfirst = &(vp->first);
-	  int res1 = swig::asval(first, pfirst);
-	  if (!SWIG_IsOK(res1)) {
-	    %delete(vp);
-	    return res1;
-	  }
-	  U *psecond = &(vp->second);
-	  int res2 = swig::asval(second, psecond);
-	  if (!SWIG_IsOK(res2)) {
-	    %delete(vp);
-	    return res2;
-	  }
-	  *val = vp;
-	  return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval(first, pfirst);
-	  if (!SWIG_IsOK(res1))
-	    return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval(second, psecond);
-	  if (!SWIG_IsOK(res2))
-	    return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-	return SWIG_ERROR;
-      }
-
-      static int asptr(const octave_value& obj, std::pair<T,U> **val) {
-	if (obj.is_cell()) {
-	  Cell c=obj.cell_value();
-	  if (c.numel()<2) {
-	    error("pair from Cell array requires at least two elements");
-	    return SWIG_ERROR;
-	  }
-	  return get_pair(c(0),c(1),val);
-	} else {
-	  value_type *p;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)
-	    *val = p;
-	  return res;
-	}
-	return SWIG_ERROR;
-      }
-    };
-
-#endif
-    template <class T, class U >
-    struct traits_from<std::pair<T,U> >   {
-      static octave_value from(const std::pair<T,U>& val) {
-	Cell c(1,2);
-	c(0)=swig::from(val.first);
-	c(1)=swig::from(val.second);
-	return c;
-      }
-    };
-  }
-}
-
-%define %swig_pair_methods(pair...)
-%enddef
-
-%include <std/std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/octave/std_shared_ptr.i b/dependencies2013/win32/swig/Lib/octave/std_shared_ptr.i
deleted file mode 100644
index df873679..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_shared_ptr.i
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SWIG_SHARED_PTR_NAMESPACE std
-%include <boost_shared_ptr.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_string.i b/dependencies2013/win32/swig/Lib/octave/std_string.i
deleted file mode 100644
index dc1378ae..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_string.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/std_vector.i b/dependencies2013/win32/swig/Lib/octave/std_vector.i
deleted file mode 100644
index 2862b5e7..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_vector.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// Vectors
-
-%fragment("StdVectorTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::vector<T> >  {
-      static int asptr(const octave_value& obj, std::vector<T> **vec) {
-	return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec);
-      }
-    };
-    
-    template <class T>
-    struct traits_from<std::vector<T> > {
-      static octave_value from(const std::vector<T>& vec) {
-	return traits_from_stdseq<std::vector<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_vector_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_vector_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_vector.i>
-
diff --git a/dependencies2013/win32/swig/Lib/octave/std_wstring.i b/dependencies2013/win32/swig/Lib/octave/std_wstring.i
deleted file mode 100644
index dc1378ae..00000000
--- a/dependencies2013/win32/swig/Lib/octave/std_wstring.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/octave/stl.i b/dependencies2013/win32/swig/Lib/octave/stl.i
deleted file mode 100644
index b29f7d84..00000000
--- a/dependencies2013/win32/swig/Lib/octave/stl.i
+++ /dev/null
@@ -1,6 +0,0 @@
-/* initial STL definition. extended as needed in each language */
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
diff --git a/dependencies2013/win32/swig/Lib/octave/typemaps.i b/dependencies2013/win32/swig/Lib/octave/typemaps.i
deleted file mode 100644
index 1f9b9c43..00000000
--- a/dependencies2013/win32/swig/Lib/octave/typemaps.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/typemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/Makefile.pl b/dependencies2013/win32/swig/Lib/perl5/Makefile.pl
deleted file mode 100644
index cffdc8e7..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/Makefile.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-# File : Makefile.pl
-# MakeMaker file for a SWIG module.  Use this file if you are
-# producing a module for general use or distribution.
-#
-# 1.  Modify the file as appropriate. Replace $module with the
-#     real name of your module and wrapper file.
-# 2.  Run perl as 'perl Makefile.pl'
-# 3.  Type 'make' to build your module
-# 4.  Type 'make install' to install your module.
-#
-# See "Programming Perl", 2nd. Ed, for more gory details than
-# you ever wanted to know.
-
-use ExtUtils::MakeMaker;
-WriteMakefile(
-     'NAME' => '$module',            # Name of your module
-     'LIBS' => [''],                 # Custom libraries (if any)
-     'OBJECT' => '$module_wrap.o'    # Object files
-);
diff --git a/dependencies2013/win32/swig/Lib/perl5/attribute.i b/dependencies2013/win32/swig/Lib/perl5/attribute.i
deleted file mode 100644
index 779716cd..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/attribute.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/attribute.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/carrays.i b/dependencies2013/win32/swig/Lib/perl5/carrays.i
deleted file mode 100644
index 8be67abc..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/carrays.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <typemaps/carrays.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/cdata.i b/dependencies2013/win32/swig/Lib/perl5/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/cmalloc.i b/dependencies2013/win32/swig/Lib/perl5/cmalloc.i
deleted file mode 100644
index 248f06b9..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/cmalloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cmalloc.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/cni.i b/dependencies2013/win32/swig/Lib/perl5/cni.i
deleted file mode 100644
index c4d4eafa..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/cni.i
+++ /dev/null
@@ -1,12 +0,0 @@
-%warnfilter(SWIGWARN_PARSE_KEYWORD) java::lang::ref;
-
-%{
-#undef STATIC
-%}
-%include <gcj/cni.i>
-%{
-#undef TRUE
-#define TRUE 1
-%}
-
-%include <jstring.i>
diff --git a/dependencies2013/win32/swig/Lib/perl5/cpointer.i b/dependencies2013/win32/swig/Lib/perl5/cpointer.i
deleted file mode 100644
index d824792f..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/cpointer.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cpointer.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/cstring.i b/dependencies2013/win32/swig/Lib/perl5/cstring.i
deleted file mode 100644
index ede9c596..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/cstring.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cstring.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/director.swg b/dependencies2013/win32/swig/Lib/perl5/director.swg
deleted file mode 100644
index f0a6614f..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/director.swg
+++ /dev/null
@@ -1,317 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that Perl proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_DIRECTOR_PERL_HEADER_
-#define SWIG_DIRECTOR_PERL_HEADER_
-
-#include <string>
-#include <iostream>
-#include <exception>
-#include <vector>
-#include <map>
-
-
-/*
-  Use -DSWIG_DIRECTOR_NORTTI if you prefer to avoid the use of the
-  native C++ RTTI and dynamic_cast<>. But be aware that directors
-  could stop working when using this option.
-*/
-#ifdef SWIG_DIRECTOR_NORTTI
-/*
-   When we don't use the native C++ RTTI, we implement a minimal one
-   only for Directors.
-*/
-# ifndef SWIG_DIRECTOR_RTDIR
-# define SWIG_DIRECTOR_RTDIR
-
-namespace Swig {
-  class Director;
-  SWIGINTERN std::map<void *, Director *>& get_rtdir_map() {
-    static std::map<void *, Director *> rtdir_map;
-    return rtdir_map;
-  }
-
-  SWIGINTERNINLINE void set_rtdir(void *vptr, Director *rtdir) {
-    get_rtdir_map()[vptr] = rtdir;
-  }
-
-  SWIGINTERNINLINE Director *get_rtdir(void *vptr) {
-    std::map<void *, Director *>::const_iterator pos = get_rtdir_map().find(vptr);
-    Director *rtdir = (pos != get_rtdir_map().end()) ? pos->second : 0;
-    return rtdir;
-  }
-}
-# endif /* SWIG_DIRECTOR_RTDIR */
-
-# define SWIG_DIRECTOR_CAST(ARG) Swig::get_rtdir(static_cast<void *>(ARG))
-# define SWIG_DIRECTOR_RGTR(ARG1, ARG2) Swig::set_rtdir(static_cast<void *>(ARG1), ARG2)
-
-#else
-
-# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
-# define SWIG_DIRECTOR_RGTR(ARG1, ARG2)
-
-#endif /* SWIG_DIRECTOR_NORTTI */
-
-extern "C" {
-  struct swig_type_info;
-}
-
-namespace Swig {
-
-  /* memory handler */
-  struct GCItem {
-    virtual ~GCItem() {}
-
-    virtual int get_own() const {
-      return 0;
-    }
-  };
-
-  struct GCItem_var {
-    GCItem_var(GCItem *item = 0) : _item(item) {
-    }
-
-    GCItem_var& operator=(GCItem *item) {
-      GCItem *tmp = _item;
-      _item = item;
-      delete tmp;
-      return *this;
-    }
-
-    ~GCItem_var() {
-      delete _item;
-    }
-
-    GCItem *operator->() const {
-      return _item;
-    }
-
-  private:
-    GCItem *_item;
-  };
-
-  struct GCItem_Object : GCItem {
-    GCItem_Object(int own) : _own(own) {
-    }
-
-    virtual ~GCItem_Object() {
-    }
-
-    int get_own() const {
-      return _own;
-    }
-
-  private:
-    int _own;
-  };
-
-  template <typename Type>
-  struct GCItem_T : GCItem {
-    GCItem_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCItem_T() {
-      delete _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-
-  template <typename Type>
-  struct GCArray_T : GCItem {
-    GCArray_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCArray_T() {
-      delete[] _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-
-  /* base class for director exceptions */
-  class DirectorException : public std::exception {
-  public:
-    virtual SV *getNative() const = 0;
-  };
-
-  /* exceptions emitted by Perl */
-  class DirectorMethodException : public DirectorException {
-  protected:
-    SV *err;
-  public:
-    DirectorMethodException(SV *sv = sv_mortalcopy(ERRSV)) : err(sv) {
-      SvREFCNT_inc(err);
-    }
-
-    const char *what() const throw() {
-      return SvPV_nolen(err);
-    }
-
-    SV *getNative() const {
-      return sv_2mortal(newSVsv(err));
-    }
-
-    static void raise(SV *sv) {
-      throw DirectorMethodException(sv);
-    }
-  };
-
-  /* exceptions emitted by wrap code */
-  class DirectorWrapException : public DirectorException {
-  protected:
-    std::string msg;
-    DirectorWrapException(const char *str) : msg(str) {
-    }
-
-  public:
-    virtual ~DirectorWrapException() throw() {
-    }
-
-    const char *what() const throw() {
-      return msg.c_str();
-    }
-
-    virtual SV *getNative() const {
-      return sv_2mortal(newSVpvn(msg.data(), msg.size()));
-    }
-  };
-
-  class DirectorTypeMismatchException : public DirectorWrapException {
-  public:
-    DirectorTypeMismatchException(const char *str) : DirectorWrapException(str) {
-    }
-
-    static void raise(const char *type, const char *msg) {
-      std::string err = std::string(type);
-      err += ": ";
-      err += msg;
-      throw DirectorTypeMismatchException(err.c_str());
-    }
-  };
-
-  class DirectorPureVirtualException : public DirectorWrapException {
-  public:
-    DirectorPureVirtualException(const char *name)
-      : DirectorWrapException("SWIG director pure virtual method called: ") {
-      msg += name;
-    }
-
-    static void raise(const char *name) {
-      throw DirectorPureVirtualException(name);
-    }
-  };
-
-  /* director base class */
-  class Director {
-  private:
-    /* pointer to the wrapped perl object */
-    SV *swig_self;
-    /* class of wrapped perl object */
-    std::string swig_class;
-    /* flag indicating whether the object is owned by perl or c++ */
-    mutable bool swig_disown_flag;
-
-    /* decrement the reference count of the wrapped perl object */
-    void swig_decref() const {
-      if (swig_disown_flag) {
-        SvREFCNT_dec(swig_self);
-      }
-    }
-
-  public:
-    /* wrap a Perl object. */
-    Director(SV *pkg) : swig_disown_flag(false) {
-      STRLEN len;
-      char *str = SvPV(pkg, len);
-      swig_class = std::string(str, len);
-      swig_self = newRV_inc((SV *)newHV());
-    }
-
-    /* discard our reference at destruction */
-    virtual ~Director() {
-      swig_decref();
-    }
-
-    /* return a pointer to the wrapped Perl object */
-    SV *swig_get_self() const {
-      return swig_self;
-    }
-
-    const char *swig_get_class() const {
-      return swig_class.c_str();
-    }
-
-    /* acquire ownership of the wrapped Perl object (the sense of "disown" is from perl) */
-    void swig_disown() const {
-      if (!swig_disown_flag) {
-        swig_disown_flag=true;
-        swig_incref();
-      }
-    }
-
-    /* increase the reference count of the wrapped Perl object */
-    void swig_incref() const {
-      if (swig_disown_flag) {
-        SvREFCNT_inc(swig_self);
-      }
-    }
-
-    /* methods to implement pseudo protected director members */
-    virtual bool swig_get_inner(const char * /* swig_protected_method_name */) const {
-      return true;
-    }
-
-    virtual void swig_set_inner(const char * /* swig_protected_method_name */, bool /* swig_val */) const {
-    }
-
-  /* ownership management */
-  private:
-    typedef std::map<void *, GCItem_var> swig_ownership_map;
-    mutable swig_ownership_map swig_owner;
-
-  public:
-    template <typename Type>
-    void swig_acquire_ownership_array(Type *vptr) const {
-      if (vptr) {
-        swig_owner[vptr] = new GCArray_T<Type>(vptr);
-      }
-    }
-
-    template <typename Type>
-    void swig_acquire_ownership(Type *vptr) const {
-      if (vptr) {
-        swig_owner[vptr] = new GCItem_T<Type>(vptr);
-      }
-    }
-
-    void swig_acquire_ownership_obj(void *vptr, int own) const {
-      if (vptr && own) {
-        swig_owner[vptr] = new GCItem_Object(own);
-      }
-    }
-
-    int swig_release_ownership(void *vptr) const {
-      int own = 0;
-      if (vptr) {
-        swig_ownership_map::iterator iter = swig_owner.find(vptr);
-        if (iter != swig_owner.end()) {
-          own = iter->second->get_own();
-          swig_owner.erase(iter);
-        }
-      }
-      return own;
-    }
-  };
-
-}
-
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/exception.i b/dependencies2013/win32/swig/Lib/perl5/exception.i
deleted file mode 100644
index b786f25e..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/exception.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <typemaps/exception.swg>
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), %block(%error(code, msg); SWIG_fail; ))
-}
diff --git a/dependencies2013/win32/swig/Lib/perl5/extra-install.list b/dependencies2013/win32/swig/Lib/perl5/extra-install.list
deleted file mode 100644
index db93830a..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/extra-install.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# see top-level Makefile.in
-Makefile.pl noembed.h
diff --git a/dependencies2013/win32/swig/Lib/perl5/factory.i b/dependencies2013/win32/swig/Lib/perl5/factory.i
deleted file mode 100644
index 46a0a873..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/factory.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/factory.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/jstring.i b/dependencies2013/win32/swig/Lib/perl5/jstring.i
deleted file mode 100644
index 1c179b75..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/jstring.i
+++ /dev/null
@@ -1,48 +0,0 @@
-%include <typemaps/valtypes.swg>
-
-%fragment(SWIG_AsVal_frag(jstring),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(jstring)(SV *obj, jstring *val)
-{
-  if (SvPOK(obj)) {
-    if (val) {
-      STRLEN len = 0;
-      char *cstr = SvPV(obj, len); 
-      *val = JvNewStringLatin1(cstr, len);
-    }
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_From_frag(jstring),"header") {
-SWIGINTERNINLINE SV *
-SWIG_From_dec(jstring)(jstring val)
-{
-  SV *obj = sv_newmortal();
-  if (!val) {
-    sv_setsv(obj, &PL_sv_undef);
-  } else {
-    jsize len = JvGetStringUTFLength(val);
-    if (!len) {
-      sv_setsv(obj, &PL_sv_undef);
-    } else {
-      char *tmp = %new_array(len, char);
-      JvGetStringUTFRegion(val, 0, len, tmp);
-      sv_setpvn(obj, tmp, len);
-      SvUTF8_on(obj);
-      %delete_array(tmp);
-    }
-  }
-  return obj;
-}
-}
-
-%typemaps_asvalfrom(%checkcode(STRING),
-		    %arg(SWIG_AsVal(jstring)), 
-		    %arg(SWIG_From(jstring)), 
-		    %arg(SWIG_AsVal_frag(jstring)), 
-		    %arg(SWIG_From_frag(jstring)), 
-		    java::lang::String *);
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/noembed.h b/dependencies2013/win32/swig/Lib/perl5/noembed.h
deleted file mode 100644
index 4e30f111..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/noembed.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Workaround perl5 global namespace pollution. Note that undefining library
- * functions like fopen will not solve the problem on all platforms as fopen
- * might be a macro on Windows but not necessarily on other operating systems. */
-#ifdef do_open
-  #undef do_open
-#endif
-#ifdef do_close
-  #undef do_close
-#endif
-#ifdef do_exec
-  #undef do_exec
-#endif
-#ifdef scalar
-  #undef scalar
-#endif
-#ifdef list
-  #undef list
-#endif
-#ifdef apply
-  #undef apply
-#endif
-#ifdef convert
-  #undef convert
-#endif
-#ifdef Error
-  #undef Error
-#endif
-#ifdef form
-  #undef form
-#endif
-#ifdef vform
-  #undef vform
-#endif
-#ifdef LABEL
-  #undef LABEL
-#endif
-#ifdef METHOD
-  #undef METHOD
-#endif
-#ifdef Move
-  #undef Move
-#endif
-#ifdef yylex
-  #undef yylex
-#endif
-#ifdef yyparse
-  #undef yyparse
-#endif
-#ifdef yyerror
-  #undef yyerror
-#endif
-#ifdef invert
-  #undef invert
-#endif
-#ifdef ref
-  #undef ref
-#endif
-#ifdef read
-  #undef read
-#endif
-#ifdef write
-  #undef write
-#endif
-#ifdef eof
-  #undef eof
-#endif
-#ifdef close
-  #undef close
-#endif
-#ifdef rewind
-  #undef rewind
-#endif
-#ifdef free
-  #undef free
-#endif
-#ifdef malloc
-  #undef malloc
-#endif
-#ifdef calloc
-  #undef calloc
-#endif
-#ifdef Stat
-  #undef Stat
-#endif
-#ifdef check
-  #undef check
-#endif
-#ifdef seekdir
-  #undef seekdir
-#endif
-#ifdef open
-  #undef open
-#endif
-#ifdef readdir
-  #undef readdir
-#endif
-#ifdef bind
-  #undef bind
-#endif
-#ifdef access
-  #undef access
-#endif
-#ifdef stat
-  #undef stat
-#endif
-#ifdef seed
-  #undef seed
-#endif
-
-#ifdef bool
-  /* Leave if macro is from C99 stdbool.h */
-  #ifndef __bool_true_false_are_defined
-    #undef bool
-  #endif
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perl5.swg b/dependencies2013/win32/swig/Lib/perl5/perl5.swg
deleted file mode 100644
index 693c2b94..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perl5.swg
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ------------------------------------------------------------
- * perl.swg
- *
- * Perl configuration module.
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Inner macros 
- * ------------------------------------------------------------ */
-%include <perlmacros.swg>
-
-/* ------------------------------------------------------------
- *  The runtime part
- * ------------------------------------------------------------ */
-%include <perlruntime.swg>
-
-/* ------------------------------------------------------------
- *  Special user directives
- * ------------------------------------------------------------ */
-%include <perluserdir.swg>
-
-/* ------------------------------------------------------------
- *  Typemap specializations
- * ------------------------------------------------------------ */
-%include <perltypemaps.swg>
-
-/* ------------------------------------------------------------
- *  Overloaded operator support
- * ------------------------------------------------------------ */
-%include <perlopers.swg>
-
-/* ------------------------------------------------------------
- * Warnings for Perl keywords 
- * ------------------------------------------------------------ */
-%include <perlkw.swg>
-
-/* ------------------------------------------------------------
- * The Perl initialization function 
- * ------------------------------------------------------------ */
-%include <perlinit.swg>
-
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlerrors.swg b/dependencies2013/win32/swig/Lib/perl5/perlerrors.swg
deleted file mode 100644
index 57296c67..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlerrors.swg
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * error manipulation
- * ----------------------------------------------------------------------------- */
-
-SWIGINTERN const char*
-SWIG_Perl_ErrorType(int code) {
-  switch(code) {
-  case SWIG_MemoryError:
-    return "MemoryError";
-  case SWIG_IOError:
-    return "IOError";
-  case SWIG_RuntimeError:
-    return "RuntimeError";
-  case SWIG_IndexError:
-    return "IndexError";
-  case SWIG_TypeError:
-    return "TypeError";
-  case SWIG_DivisionByZero:
-    return "ZeroDivisionError";
-  case SWIG_OverflowError:
-    return "OverflowError";
-  case SWIG_SyntaxError:
-    return "SyntaxError";
-  case SWIG_ValueError:
-    return "ValueError";
-  case SWIG_SystemError:
-    return "SystemError";
-  case SWIG_AttributeError:
-    return "AttributeError";
-  default:
-    return "RuntimeError";
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlfragments.swg b/dependencies2013/win32/swig/Lib/perl5/perlfragments.swg
deleted file mode 100644
index 45d25d1f..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlfragments.swg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-  Create a file with this name, 'perlfragments.swg', in your working
-  directory and add all the %fragments you want to take precedence
-  over the ones defined by default by swig.
-
-  For example, if you add:
-  
-  %fragment(SWIG_AsVal_frag(int),"header") {
-   SWIGINTERNINLINE int
-   SWIG_AsVal(int)(PyObject *obj, int *val)
-   { 
-     <your code here>;
-   }
-  }
-  
-  this will replace the code used to retrieve an integer value for all
-  the typemaps that need it, including:
-  
-    int, std::vector<int>, std::list<std::pair<int,int> >, etc.
-
-    
-*/
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlhead.swg b/dependencies2013/win32/swig/Lib/perl5/perlhead.swg
deleted file mode 100644
index 5437af5a..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlhead.swg
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifdef __cplusplus
-/* Needed on some windows machines---since MS plays funny games with the header files under C++ */
-#include <math.h>
-#include <stdlib.h>
-extern "C" {
-#endif
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-
-/* Add in functionality missing in older versions of Perl. Much of this is based on Devel-PPPort on cpan. */
-
-/* Add PERL_REVISION, PERL_VERSION, PERL_SUBVERSION if missing */
-#ifndef PERL_REVISION
-#  if !defined(__PATCHLEVEL_H_INCLUDED__) && !(defined(PATCHLEVEL) && defined(SUBVERSION))
-#    define PERL_PATCHLEVEL_H_IMPLICIT
-#    include <patchlevel.h>
-#  endif
-#  if !(defined(PERL_VERSION) || (defined(SUBVERSION) && defined(PATCHLEVEL)))
-#    include <could_not_find_Perl_patchlevel.h>
-#  endif
-#  ifndef PERL_REVISION
-#    define PERL_REVISION       (5)
-#    define PERL_VERSION        PATCHLEVEL
-#    define PERL_SUBVERSION     SUBVERSION
-#  endif
-#endif
-
-#if defined(WIN32) && defined(PERL_OBJECT) && !defined(PerlIO_exportFILE)
-#define PerlIO_exportFILE(fh,fl) (FILE*)(fh)
-#endif
-
-#ifndef SvIOK_UV
-# define SvIOK_UV(sv)       (SvIOK(sv) && (SvUVX(sv) == SvIVX(sv)))
-#endif
-
-#ifndef SvUOK
-# define SvUOK(sv)           SvIOK_UV(sv)
-#endif
-
-#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5)))
-#  define PL_sv_undef               sv_undef
-#  define PL_na	                    na
-#  define PL_errgv                  errgv
-#  define PL_sv_no                  sv_no
-#  define PL_sv_yes                 sv_yes
-#  define PL_markstack_ptr          markstack_ptr
-#endif
-
-#ifndef IVSIZE
-#  ifdef LONGSIZE
-#    define IVSIZE LONGSIZE
-#  else
-#    define IVSIZE 4 /* A bold guess, but the best we can make. */
-#  endif
-#endif
-
-#ifndef INT2PTR
-#  if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE)
-#    define PTRV                  UV
-#    define INT2PTR(any,d)        (any)(d)
-#  else
-#    if PTRSIZE == LONGSIZE
-#      define PTRV                unsigned long
-#    else
-#      define PTRV                unsigned
-#    endif
-#    define INT2PTR(any,d)        (any)(PTRV)(d)
-#  endif
-
-#  define NUM2PTR(any,d)  (any)(PTRV)(d)
-#  define PTR2IV(p)       INT2PTR(IV,p)
-#  define PTR2UV(p)       INT2PTR(UV,p)
-#  define PTR2NV(p)       NUM2PTR(NV,p)
-
-#  if PTRSIZE == LONGSIZE
-#    define PTR2ul(p)     (unsigned long)(p)
-#  else
-#    define PTR2ul(p)     INT2PTR(unsigned long,p)
-#  endif
-#endif /* !INT2PTR */
-
-#ifndef SvPV_nolen
-# define SvPV_nolen(x) SvPV(x,PL_na)
-#endif
-
-#ifndef get_sv
-#  define get_sv perl_get_sv
-#endif
-
-#ifndef ERRSV
-#  define ERRSV get_sv("@",FALSE)
-#endif
-
-#ifndef pTHX_
-#define pTHX_
-#endif   
-
-#include <string.h>
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlinit.swg b/dependencies2013/win32/swig/Lib/perl5/perlinit.swg
deleted file mode 100644
index b49040d2..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlinit.swg
+++ /dev/null
@@ -1,82 +0,0 @@
-
-/* Export the SWIG initialization function */
-%header %{
-#ifdef __cplusplus
-extern "C"
-#endif
-#ifndef PERL_OBJECT
-#ifndef MULTIPLICITY
-SWIGEXPORT void SWIG_init (CV* cv);
-#else
-SWIGEXPORT void SWIG_init (pTHXo_ CV* cv);
-#endif
-#else
-SWIGEXPORT void SWIG_init (CV *cv, CPerlObj *);
-#endif
-%}
-
-/* Module initialization function */
-
-%insert(init) "swiginit.swg"
-
-%init %{
-
-#if defined(__cplusplus) && ! defined(XSPROTO)
-extern "C"
-#endif
-
-XS(SWIG_init) {
-    dXSARGS;
-    int i;
-    (void)items;
-
-    SWIG_InitializeModule(0);
-
-    /* Install commands */
-    for (i = 0; swig_commands[i].name; i++) {
-      /* Casts only needed for Perl < 5.10. */
-#ifdef __cplusplus
-      newXS(const_cast<char*>(swig_commands[i].name), swig_commands[i].wrapper, const_cast<char*>(__FILE__));
-#else
-      newXS((char*)swig_commands[i].name, swig_commands[i].wrapper, (char*)__FILE__);
-#endif
-    }
-
-    /* Install variables */
-    for (i = 0; swig_variables[i].name; i++) {
-      SV *sv;
-      sv = get_sv(swig_variables[i].name, TRUE | 0x2 | GV_ADDMULTI);
-      if (swig_variables[i].type) {
-	SWIG_MakePtr(sv,(void *)1, *swig_variables[i].type,0);
-      } else {
-	sv_setiv(sv,(IV) 0);
-      }
-      swig_create_magic(sv, swig_variables[i].name, swig_variables[i].set, swig_variables[i].get); 
-    }
-
-    /* Install constant */
-    for (i = 0; swig_constants[i].type; i++) {
-      SV *sv;
-      sv = get_sv(swig_constants[i].name, TRUE | 0x2 | GV_ADDMULTI);
-      switch(swig_constants[i].type) {
-      case SWIG_INT:
-	sv_setiv(sv, (IV) swig_constants[i].lvalue);
-	break;
-      case SWIG_FLOAT:
-	sv_setnv(sv, (double) swig_constants[i].dvalue);
-	break;
-      case SWIG_STRING:
-	sv_setpv(sv, (const char *) swig_constants[i].pvalue);
-	break;
-      case SWIG_POINTER:
-	SWIG_MakePtr(sv, swig_constants[i].pvalue, *(swig_constants[i].ptype),0);
-	break;
-      case SWIG_BINARY:
-	SWIG_MakePackedObj(sv, swig_constants[i].pvalue, swig_constants[i].lvalue, *(swig_constants[i].ptype));
-	break;
-      default:
-	break;
-      }
-      SvREADONLY_on(sv);
-    }
-%}
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlkw.swg b/dependencies2013/win32/swig/Lib/perl5/perlkw.swg
deleted file mode 100644
index 00648e0b..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlkw.swg
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Warnings for Perl keywords */
-#define PERLKW(x) %keywordwarn("'" `x` "' is a perl keyword")  `x`
-#define PERLBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in perl")  "::" `x`
-
-
-/*
-
-  From  http://www.rocketaware.com/perl/perlfunc/
-
-*/
-
-/* Functions for SCALARs or strings*/
-PERLBN(chomp);
-PERLBN(chop);
-PERLBN(chr);
-PERLBN(crypt);
-PERLBN(hex);
-PERLBN(index);
-PERLBN(lc);
-PERLBN(lcfirst);
-PERLBN(length);
-PERLBN(oct);
-PERLBN(ord);
-PERLBN(pack);
-PERLBN(reverse);
-PERLBN(rindex);
-PERLBN(sprintf);
-PERLBN(substr);
-PERLBN(uc);
-PERLBN(ucfirst);
-
-/* Regular expressions and pattern matching */
-PERLBN(m);
-PERLBN(pos);
-PERLBN(quotemeta);
-PERLBN(split);
-PERLBN(study);
-
-/* Numeric functions */
-PERLBN(abs);
-PERLBN(atan2);
-PERLBN(cos);
-PERLBN(exp);
-PERLBN(hex);
-PERLBN(int);
-PERLBN(log);
-PERLBN(oct);
-PERLBN(rand);
-PERLBN(sin);
-PERLBN(sqrt);
-PERLBN(srand);
-
-
-/* Functions for real @ARRAYs*/
-PERLBN(pop);
-PERLBN(push);
-PERLBN(shift);
-PERLBN(splice);
-PERLBN(unshift);
-
-/* Functions for list data*/ 
-PERLBN(grep);
-PERLBN(join);
-PERLBN(map);
-PERLBN(qw);
-PERLBN(reverse);
-PERLBN(sort);
-PERLBN(unpack);
-
-
-/* Functions for real %HASHes*/
-PERLBN(delete);
-PERLBN(each);
-PERLBN(exists);
-PERLBN(keys);
-PERLBN(values);
-
-
-/* Input and output functions*/
-
-PERLBN(binmode);
-PERLBN(close);
-PERLBN(closedir);
-PERLBN(dbmclose);
-PERLBN(dbmopen);
-PERLBN(die);
-PERLBN(eof);
-PERLBN(fileno);
-PERLBN(flock);
-PERLBN(format);
-PERLBN(getc);
-PERLBN(print);
-PERLBN(printf);
-PERLBN(read);
-PERLBN(readdir);
-PERLBN(rewinddir);
-PERLBN(seek);
-PERLBN(seekdir);
-PERLBN(select);
-PERLBN(syscall);
-PERLBN(sysread);
-PERLBN(sysseek);
-PERLBN(syswrite);
-PERLBN(tell);
-PERLBN(telldir);
-PERLBN(truncate);
-PERLBN(warn);
-PERLBN(write);
-
-
-/* Functions for fixed length data or records*/
-PERLBN(pack);
-PERLBN(read);
-PERLBN(syscall);
-PERLBN(sysread);
-PERLBN(syswrite);
-PERLBN(unpack);
-PERLBN(vec);
-
-
-/* Functions for filehandles, files, or directories */
-PERLBN(chdir);
-PERLBN(chmod);
-PERLBN(chown);
-PERLBN(chroot);
-PERLBN(fcntl);
-PERLBN(glob);
-PERLBN(ioctl);
-PERLBN(link);
-PERLBN(lstat);
-PERLBN(mkdir);
-PERLBN(open);
-PERLBN(opendir);
-PERLBN(readlink);
-PERLBN(rename);
-PERLBN(rmdir);
-PERLBN(stat);
-PERLBN(symlink);
-PERLBN(umask);
-PERLBN(unlink);
-PERLBN(utime);
-
-
-/* Keywords related to the control flow of your perl program */
-PERLKW(caller);
-PERLKW(continue);
-PERLKW(die);
-PERLKW(do);
-PERLKW(dump);
-PERLKW(eval);
-PERLKW(exit);
-PERLKW(goto);
-PERLKW(last);
-PERLKW(next);
-PERLKW(redo);
-PERLKW(return);
-PERLKW(sub);
-PERLKW(wantarray);
-
-
-/* Keywords related to scoping */
-PERLKW(caller);
-PERLKW(import);
-PERLKW(local);
-PERLKW(my);
-PERLKW(package);
-PERLKW(use);
-
-
-/* Miscellaneous functions */
-PERLBN("defined");
-PERLBN(dump);
-PERLBN(eval);
-PERLBN(formline);
-PERLBN(local);
-PERLBN(my);
-PERLBN(reset);
-PERLBN(scalar);
-PERLBN(undef);
-PERLBN(wantarray);
-
-
-/* Functions for processes and process groups */
-PERLBN(alarm);
-PERLBN(exec);
-PERLBN(fork);
-PERLBN(getpgrp);
-PERLBN(getppid);
-PERLBN(getpriority);
-PERLBN(kill);
-PERLBN(pipe);
-PERLBN(setpgrp);
-PERLBN(setpriority);
-PERLBN(sleep);
-PERLBN(system);
-PERLBN(times);
-PERLBN(wait);
-PERLBN(waitpid);
-
-
-/* Keywords related to perl modules */
-PERLKW(do);
-PERLKW(import);
-PERLKW(no);
-PERLKW(package);
-PERLKW(require);
-PERLKW(use);
-
-
-/* Keywords related to classes and object-orientedness */
-PERLKW(bless);
-PERLKW(dbmclose);
-PERLKW(dbmopen);
-PERLKW(package);
-PERLKW(ref);
-PERLKW(tie);
-PERLKW(tied);
-PERLKW(untie);
-PERLKW(use);
-
-/* Functions new in perl5 */
-PERLBN(abs);
-PERLBN(bless);
-PERLBN(chomp);
-PERLBN(chr);
-PERLBN(exists);
-PERLBN(formline);
-PERLBN(glob);
-PERLBN(import);
-PERLBN(lc);
-PERLBN(lcfirst);
-PERLBN(map);
-PERLBN(my);
-PERLBN(no);
-PERLBN(prototype);
-PERLBN(qx);
-PERLBN(qw);
-PERLBN(readline);
-PERLBN(readpipe);
-PERLBN(ref);
-PERLBN(sub);
-PERLBN(sysopen);
-PERLBN(tie);
-PERLBN(tied);
-PERLBN(uc);
-PERLBN(ucfirst);
-PERLBN(untie);
-PERLBN(use);
-
-#undef PERLKW
-#undef PERLBN
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlmacros.swg b/dependencies2013/win32/swig/Lib/perl5/perlmacros.swg
deleted file mode 100644
index 4917f6ef..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlmacros.swg
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <typemaps/swigmacros.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlmain.i b/dependencies2013/win32/swig/Lib/perl5/perlmain.i
deleted file mode 100644
index 18ecb7eb..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlmain.i
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -----------------------------------------------------------------------------
- * perlmain.i
- *
- * Code to statically rebuild perl5.
- * ----------------------------------------------------------------------------- */
-
-#ifdef AUTODOC
-%subsection "perlmain.i"
-%text %{
-This module provides support for building a new version of the
-Perl executable.  This will be necessary on systems that do
-not support shared libraries and may be necessary with C++
-extensions.  
-
-This module may only build a stripped down version of the
-Perl executable.   Thus, it may be necessary (or desirable)
-to hand-edit this file for your particular application.  To
-do this, simply copy this file from swig_lib/perl5/perlmain.i
-to your working directory and make the appropriate modifications.
-
-This library file works with Perl 5.003.  It may work with earlier
-versions, but it hasn't been tested.  As far as I know, this
-library is C++ safe.
-%}
-#endif
-
-%{
-
-static void xs_init _((pTHX));
-static PerlInterpreter *my_perl;
-
-int perl_eval(char *string) {
-  char *argv[2];
-  argv[0] = string;
-  argv[1] = (char *) 0;
-  return perl_call_argv("eval",0,argv);
-}
-
-int
-main(int argc, char **argv, char **env)
-{
-    int exitstatus;
-
-    my_perl = perl_alloc();
-    if (!my_perl)
-       exit(1);
-    perl_construct( my_perl );
-
-    exitstatus = perl_parse( my_perl, xs_init, argc, argv, (char **) NULL );
-    if (exitstatus)
-	exit( exitstatus );
-
-    /* Initialize all of the module variables */
-
-    exitstatus = perl_run( my_perl );
-
-    perl_destruct( my_perl );
-    perl_free( my_perl );
-
-    exit( exitstatus );
-}
-
-/* Register any extra external extensions */
-
-/* Do not delete this line--writemain depends on it */
-/* EXTERN_C void boot_DynaLoader _((CV* cv)); */
-
-static void
-xs_init(pTHX)
-{
-/*  dXSUB_SYS; */
-    char *file = __FILE__;
-    {
-      /*        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file); */
-	newXS(SWIG_name, SWIG_init, file);
-#ifdef SWIGMODINIT
-	SWIGMODINIT
-#endif
-    }
-}
-
-%}
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlopers.swg b/dependencies2013/win32/swig/Lib/perl5/perlopers.swg
deleted file mode 100644
index e7d13b67..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlopers.swg
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ------------------------------------------------------------
- * Overloaded operator support
- * ------------------------------------------------------------ */
-
-#ifdef __cplusplus
-
-// These are auto-supported by the Perl-module
-%rename(__plusplus__) *::operator++;
-%rename(__minmin__)   *::operator--;
-%rename(__add__)      *::operator+;
-%rename(__sub__)      *::operator-;
-%rename(__neg__)      *::operator-();
-%rename(__neg__)      *::operator-() const;
-%rename(__mul__)      *::operator*;
-%rename(__div__)      *::operator/;
-%rename(__eq__)       *::operator==;
-%rename(__ne__)       *::operator!=;
-%rename(__mod__)      *::operator%;
-%rename(__gt__)       *::operator>;
-%rename(__lt__)       *::operator<;
-%rename(__not__)      *::operator!;
-%rename(__le__)       *::operator<=;
-%rename(__ge__)       *::operator>=;
-%rename(__and__)      *::operator&;
-%rename(__or__)       *::operator|;
-%rename(__iadd__)     *::operator+=;  
-%rename(__isub__)     *::operator-=;  
-
-// These are renamed, but no test exists in operator_overload_runme.pl
-%ignoreoperator(EQ)         operator=;
-
-// These are renamed, but no 'use overload...' is added
-%rename(__lshift__)   *::operator<<;
-%rename(__rshift__)   *::operator>>;
-%rename(__xor__)      *::operator^;
-%rename(__invert__)   *::operator~;
-%rename(__call__)     *::operator();
-
-/* Ignored operators */
-%ignoreoperator(LAND)       operator&&;
-%ignoreoperator(LOR)        operator||;
-%ignoreoperator(MULEQ)      operator*=;  
-%ignoreoperator(DIVEQ)      operator/=;  
-%ignoreoperator(MODEQ)      operator%=;  
-%ignoreoperator(LSHIFTEQ)   operator<<=; 
-%ignoreoperator(RSHIFTEQ)   operator>>=; 
-%ignoreoperator(ANDEQ)      operator&=;  
-%ignoreoperator(OREQ)       operator|=;  
-%ignoreoperator(XOREQ)      operator^=;  
-%ignoreoperator(ARROWSTAR)  operator->*;
-%ignoreoperator(INDEX)      operator[];
-
-
-#endif /* __cplusplus */
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlprimtypes.swg b/dependencies2013/win32/swig/Lib/perl5/perlprimtypes.swg
deleted file mode 100644
index 4cb67567..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlprimtypes.swg
+++ /dev/null
@@ -1,364 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-/* bool */
-
-%fragment(SWIG_From_frag(bool),"header") {
-SWIGINTERNINLINE SV *
-SWIG_From_dec(bool)(bool value)
-{
-  return boolSV(value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(SV *obj, bool* val)
-{
-  if (obj == &PL_sv_yes) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == &PL_sv_no) { 
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    if (val) *val = SvTRUE(obj) ? true : false;
-    return SWIG_AddCast(SWIG_OK);    
-  }
-}
-}
-
-
-/* long */
-
-%fragment(SWIG_From_frag(long),"header") {
-SWIGINTERNINLINE SV *
-SWIG_From_dec(long)(long value)
-{
-  SV *sv;
-  if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX))
-    sv = newSViv(value);
-  else
-    sv = newSVpvf("%ld", value);
-  return sv_2mortal(sv);
-}
-}
-
-%fragment(SWIG_AsVal_frag(long),"header",
-	  fragment="<limits.h>",
-	  fragment="<stdlib.h>",
-	  fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN int
-SWIG_AsVal_dec(long)(SV *obj, long* val)
-{
-  if (SvUOK(obj)) {
-    UV v = SvUV(obj);
-    if (UVSIZE < sizeof(*val) || v <= LONG_MAX) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-    return SWIG_OverflowError;
-  } else if (SvIOK(obj)) {
-    IV v = SvIV(obj);
-    if (IVSIZE <= sizeof(*val) || (v >= LONG_MIN && v <= LONG_MAX)) {
-      if(val) *val = v;
-      return SWIG_OK;
-    }
-    return SWIG_OverflowError;
-  } else {
-    int dispatch = 0;
-    const char *nptr = SvPV_nolen(obj);
-    if (nptr) {
-      char *endptr;
-      long v;
-      errno = 0;
-      v = strtol(nptr, &endptr,0);
-      if (errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
-	}
-      }
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal(double)(obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) {
-	if (val) *val = (long)(d);
-	return res;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* unsigned long */
-
-%fragment(SWIG_From_frag(unsigned long),"header") {
-SWIGINTERNINLINE SV *
-SWIG_From_dec(unsigned long)(unsigned long value)
-{
-  SV *sv;
-  if (UVSIZE >= sizeof(value) || value <= UV_MAX)
-    sv = newSVuv(value);
-  else
-    sv = newSVpvf("%lu", value);
-  return sv_2mortal(sv);
-}
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header",
-	  fragment="<limits.h>",
-	  fragment="<stdlib.h>",
-	  fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long)(SV *obj, unsigned long *val) 
-{
-  if (SvUOK(obj)) {
-    UV v = SvUV(obj);
-    if (UVSIZE <= sizeof(*val) || v <= ULONG_MAX) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-    return SWIG_OverflowError;
-  } else if (SvIOK(obj)) {
-    IV v = SvIV(obj);
-    if (v >= 0 && (IVSIZE <= sizeof(*val) || v <= ULONG_MAX)) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-    return SWIG_OverflowError;
-  } else {
-    int dispatch = 0;
-    const char *nptr = SvPV_nolen(obj);
-    if (nptr) {
-      char *endptr;
-      unsigned long v;
-      errno = 0;
-      v = strtoul(nptr, &endptr,0);
-      if (errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
-	}
-      }
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal(double)(obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) {
-	if (val) *val = (unsigned long)(d);
-	return res;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* long long */
-
-%fragment(SWIG_From_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdio.h>") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE SV *
-SWIG_From_dec(long long)(long long value)
-{
-  SV *sv;
-  if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX))
-    sv = newSViv((IV)(value));
-  else {
-    //sv = newSVpvf("%lld", value); doesn't work in non 64bit Perl
-    char temp[256];
-    sprintf(temp, "%lld", value);
-    sv = newSVpv(temp, 0);
-  }
-  return sv_2mortal(sv);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdlib.h>",
-	  fragment="SWIG_CanCastAsInteger") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(long long)(SV *obj, long long *val)
-{
-  if (SvUOK(obj)) {
-    UV v = SvUV(obj);
-    /* pretty sure this could allow v == LLONG MAX */
-    if (UVSIZE < sizeof(*val) || v < LLONG_MAX) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-    return SWIG_OverflowError;
-  } else if (SvIOK(obj)) {
-    IV v = SvIV(obj);
-    if (IVSIZE <= sizeof(*val) || (v >= LLONG_MIN && v <= LLONG_MAX)) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-    return SWIG_OverflowError;
-  } else {
-    int dispatch = 0;
-    const char *nptr = SvPV_nolen(obj);
-    if (nptr) {
-      char *endptr;
-      long long v;
-      errno = 0;
-      v = strtoll(nptr, &endptr,0);
-      if (errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
-	}
-      }
-    }
-    if (!dispatch) {
-      const double mant_max = 1LL << DBL_MANT_DIG;
-      const double mant_min = -mant_max;
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal(double)(obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) {
-	if (val) *val = (long long)(d);
-	return res;
-      }
-    }
-  }
-  return SWIG_TypeError; 
-}
-%#endif
-}
-
-/* unsigned long long */
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdio.h>") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE SV *
-SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-  SV *sv;
-  if (UVSIZE >= sizeof(value) || value <= UV_MAX)
-    sv = newSVuv((UV)(value));
-  else {
-    //sv = newSVpvf("%llu", value); doesn't work in non 64bit Perl
-    char temp[256];
-    sprintf(temp, "%llu", value);
-    sv = newSVpv(temp, 0);
-  }
-  return sv_2mortal(sv);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdlib.h>",
-	  fragment="SWIG_CanCastAsInteger") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long long)(SV *obj, unsigned long long *val)
-{
-  if (SvUOK(obj)) {
-    /* pretty sure this should be conditional on
-     * (UVSIZE <= sizeof(*val) || v <= ULLONG_MAX) */
-    if (val) *val = SvUV(obj);
-    return SWIG_OK;
-  } else  if (SvIOK(obj)) {
-    IV v = SvIV(obj);
-    if (v >= 0 && (IVSIZE <= sizeof(*val) || v <= ULLONG_MAX)) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }
-  } else {
-    int dispatch = 0;
-    const char *nptr = SvPV_nolen(obj);
-    if (nptr) {
-      char *endptr;
-      unsigned long long v;
-      errno = 0;
-      v = strtoull(nptr, &endptr,0);
-      if (errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
-	}
-      }
-    }
-    if (!dispatch) {
-      const double mant_max = 1LL << DBL_MANT_DIG;
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal(double)(obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) {
-	if (val) *val = (unsigned long long)(d);
-	return res;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-%#endif
-}
-
-/* double */
-
-%fragment(SWIG_From_frag(double),"header") {
-SWIGINTERNINLINE SV *
-SWIG_From_dec(double)(double value)
-{
-  return sv_2mortal(newSVnv(value));
-}
-}
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(double)(SV *obj, double *val)
-{
-  if (SvNIOK(obj)) {
-    if (val) *val = SvNV(obj);
-    return SWIG_OK;
-  } else if (SvIOK(obj)) {
-    if (val) *val = (double) SvIV(obj);
-    return SWIG_AddCast(SWIG_OK);
-  } else {
-    const char *nptr = SvPV_nolen(obj);
-    if (nptr) {
-      char *endptr;
-      double v;
-      errno = 0;
-      v = strtod(nptr, &endptr);
-      if (errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_Str2NumCast(SWIG_OK);
-	}
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlrun.swg b/dependencies2013/win32/swig/Lib/perl5/perlrun.swg
deleted file mode 100644
index d1865de0..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlrun.swg
+++ /dev/null
@@ -1,511 +0,0 @@
-/* -----------------------------------------------------------------------------
- * perlrun.swg
- *
- * This file contains the runtime support for Perl modules
- * and includes code for managing global variables and pointer
- * type checking.
- * ----------------------------------------------------------------------------- */
-
-#ifdef PERL_OBJECT
-#define SWIG_PERL_OBJECT_DECL CPerlObj *SWIGUNUSEDPARM(pPerl),
-#define SWIG_PERL_OBJECT_CALL pPerl,
-#else
-#define SWIG_PERL_OBJECT_DECL
-#define SWIG_PERL_OBJECT_CALL
-#endif
-
-/* Common SWIG API */
-
-/* for raw pointers */
-#define SWIG_ConvertPtr(obj, pp, type, flags)           SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags)
-#define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own)
-#define SWIG_NewPointerObj(p, type, flags)              SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags)
-#define swig_owntype                                    int
-
-/* for raw packed data */
-#define SWIG_ConvertPacked(obj, p, s, type)             SWIG_Perl_ConvertPacked(SWIG_PERL_OBJECT_CALL obj, p, s, type)
-#define SWIG_NewPackedObj(p, s, type)	                SWIG_Perl_NewPackedObj(SWIG_PERL_OBJECT_CALL p, s, type)
-
-/* for class or struct pointers */
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
-
-/* for C or C++ function pointers */
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_ConvertPtr(obj, pptr, type, 0)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_NewPointerObj(ptr, type, 0)
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_NewPackedObj(ptr, sz, type)
-
-
-/* Runtime API */
-
-#define SWIG_GetModule(clientdata)                      SWIG_Perl_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer)             SWIG_Perl_SetModule(pointer)
-
-
-/* Error manipulation */
-
-#define SWIG_ErrorType(code)                            SWIG_Perl_ErrorType(code)               
-#define SWIG_Error(code, msg)            		sv_setpvf(get_sv("@", GV_ADD), "%s %s", SWIG_ErrorType(code), msg)
-#define SWIG_fail                        		goto fail						    
-
-/* Perl-specific SWIG API */
-
-#define SWIG_MakePtr(sv, ptr, type, flags)              SWIG_Perl_MakePtr(SWIG_PERL_OBJECT_CALL sv, ptr, type, flags)
-#define SWIG_MakePackedObj(sv, p, s, type)	        SWIG_Perl_MakePackedObj(SWIG_PERL_OBJECT_CALL sv, p, s, type)
-#define SWIG_SetError(str)                              SWIG_Error(SWIG_RuntimeError, str)
-
-
-#define SWIG_PERL_DECL_ARGS_1(arg1)                     (SWIG_PERL_OBJECT_DECL arg1)
-#define SWIG_PERL_CALL_ARGS_1(arg1)                     (SWIG_PERL_OBJECT_CALL arg1)
-#define SWIG_PERL_DECL_ARGS_2(arg1, arg2)               (SWIG_PERL_OBJECT_DECL arg1, arg2)
-#define SWIG_PERL_CALL_ARGS_2(arg1, arg2)               (SWIG_PERL_OBJECT_CALL arg1, arg2)
-
-/* -----------------------------------------------------------------------------
- * pointers/data manipulation
- * ----------------------------------------------------------------------------- */
-
-/* For backward compatibility only */
-#define SWIG_POINTER_EXCEPTION  0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SWIG_OWNER   SWIG_POINTER_OWN
-#define SWIG_SHADOW  SWIG_OWNER << 1
-
-#define SWIG_MAYBE_PERL_OBJECT SWIG_PERL_OBJECT_DECL
-
-/* SWIG Perl macros */
-
-/* Macro to declare an XS function */
-#ifndef XSPROTO
-#   define XSPROTO(name) void name(pTHX_ CV* cv)
-#endif
-
-/* Macro to call an XS function */
-#ifdef PERL_OBJECT 
-#  define SWIG_CALLXS(_name) _name(cv,pPerl) 
-#else 
-#  ifndef MULTIPLICITY 
-#    define SWIG_CALLXS(_name) _name(cv) 
-#  else 
-#    define SWIG_CALLXS(_name) _name(PERL_GET_THX, cv) 
-#  endif 
-#endif 
-
-#ifdef PERL_OBJECT
-#define MAGIC_PPERL  CPerlObj *pPerl = (CPerlObj *) this;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
-#ifdef __cplusplus
-}
-#endif
-
-#define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
-#define SWIGCLASS_STATIC
-
-#else /* PERL_OBJECT */
-
-#define MAGIC_PPERL
-#define SWIGCLASS_STATIC static SWIGUNUSED
-
-#ifndef MULTIPLICITY
-#define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (*SwigMagicFunc)(SV *, MAGIC *);
-#ifdef __cplusplus
-}
-#endif
-
-#else /* MULTIPLICITY */
-
-#define SWIG_MAGIC(a,b) (struct interpreter *interp, SV *a, MAGIC *b)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MULTIPLICITY */
-#endif /* PERL_OBJECT */
-
-#  ifdef PERL_OBJECT
-#    define SWIG_croak_null() SWIG_Perl_croak_null(pPerl)
-static void SWIGUNUSED SWIG_Perl_croak_null(CPerlObj *pPerl)
-#  else
-static void SWIGUNUSED SWIG_croak_null()
-#  endif
-{
-  SV *err = get_sv("@", GV_ADD);
-#  if (PERL_VERSION < 6)
-  croak("%_", err);
-#  else
-  if (sv_isobject(err))
-    croak(0);
-  else
-    croak("%s", SvPV_nolen(err));
-#  endif
-}
-
-
-/* 
-   Define how strict is the cast between strings and integers/doubles
-   when overloading between these types occurs.
-   
-   The default is making it as strict as possible by using SWIG_AddCast
-   when needed.
-   
-   You can use -DSWIG_PERL_NO_STRICT_STR2NUM at compilation time to
-   disable the SWIG_AddCast, making the casting between string and
-   numbers less strict.
-
-   In the end, we try to solve the overloading between strings and
-   numerical types in the more natural way, but if you can avoid it,
-   well, avoid it using %rename, for example.
-*/
-#ifndef SWIG_PERL_NO_STRICT_STR2NUM
-# ifndef SWIG_PERL_STRICT_STR2NUM
-#  define SWIG_PERL_STRICT_STR2NUM
-# endif
-#endif
-#ifdef SWIG_PERL_STRICT_STR2NUM
-/* string takes precedence */
-#define SWIG_Str2NumCast(x) SWIG_AddCast(x)  
-#else
-/* number takes precedence */
-#define SWIG_Str2NumCast(x) x
-#endif
-
-
-
-#include <stdlib.h>
-
-SWIGRUNTIME const char *
-SWIG_Perl_TypeProxyName(const swig_type_info *type) {
-  if (!type) return NULL;
-  if (type->clientdata != NULL) {
-    return (const char*) type->clientdata;
-  } 
-  else {
-    return type->name;
-  }
-}
-
-/* Identical to SWIG_TypeCheck, except for strcmp comparison */
-SWIGRUNTIME swig_cast_info *
-SWIG_TypeProxyCheck(const char *c, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (strcmp(SWIG_Perl_TypeProxyName(iter->type), c) == 0) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
-}
-
-/* Function for getting a pointer value */
-
-SWIGRUNTIME int
-SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_info *_t, int flags, int *own) {
-  swig_cast_info *tc;
-  void *voidptr = (void *)0;
-  SV *tsv = 0;
-
-  if (own)
-    *own = 0;
-
-  /* If magical, apply more magic */
-  if (SvGMAGICAL(sv))
-    mg_get(sv);
-
-  /* Check to see if this is an object */
-  if (sv_isobject(sv)) {
-    IV tmp = 0;
-    tsv = (SV*) SvRV(sv);
-    if ((SvTYPE(tsv) == SVt_PVHV)) {
-      MAGIC *mg;
-      if (SvMAGICAL(tsv)) {
-        mg = mg_find(tsv,'P');
-        if (mg) {
-          sv = mg->mg_obj;
-          if (sv_isobject(sv)) {
-	    tsv = (SV*)SvRV(sv);
-            tmp = SvIV(tsv);
-          }
-        }
-      } else {
-        return SWIG_ERROR;
-      }
-    } else {
-      tmp = SvIV(tsv);
-    }
-    voidptr = INT2PTR(void *,tmp);
-  } else if (! SvOK(sv)) {            /* Check for undef */
-    *(ptr) = (void *) 0;
-    return SWIG_OK;
-  } else if (SvTYPE(sv) == SVt_RV) {  /* Check for NULL pointer */
-    if (!SvROK(sv)) {
-      /* In Perl 5.12 and later, SVt_RV == SVt_IV, so sv could be a valid integer value.  */
-      if (SvIOK(sv)) {
-        return SWIG_ERROR;
-      } else {
-        /* NULL pointer (reference to undef). */
-        *(ptr) = (void *) 0;
-        return SWIG_OK;
-      }
-    } else {
-      return SWIG_ERROR;
-    }
-  } else {                            /* Don't know what it is */
-    return SWIG_ERROR;
-  }
-  if (_t) {
-    /* Now see if the types match */
-    char *_c = HvNAME(SvSTASH(SvRV(sv)));
-    tc = SWIG_TypeProxyCheck(_c,_t);
-#ifdef SWIG_DIRECTORS
-    if (!tc && !sv_derived_from(sv,SWIG_Perl_TypeProxyName(_t))) {
-#else
-    if (!tc) {
-#endif
-      return SWIG_ERROR;
-    }
-    {
-      int newmemory = 0;
-      *ptr = SWIG_TypeCast(tc,voidptr,&newmemory);
-      if (newmemory == SWIG_CAST_NEW_MEMORY) {
-        assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
-        if (own)
-          *own = *own | SWIG_CAST_NEW_MEMORY;
-      }
-    }
-  } else {
-    *ptr = voidptr;
-  }
-
-  /* 
-   *  DISOWN implementation: we need a perl guru to check this one.
-   */
-  if (tsv && (flags & SWIG_POINTER_DISOWN)) {
-    /* 
-     *  almost copy paste code from below SWIG_POINTER_OWN setting
-     */
-    SV *obj = sv;
-    HV *stash = SvSTASH(SvRV(obj));
-    GV *gv = *(GV**)hv_fetch(stash, "OWNER", 5, TRUE);
-    if (isGV(gv)) {
-      HV *hv = GvHVn(gv);
-      /*
-       * To set ownership (see below), a newSViv(1) entry is added. 
-       * Hence, to remove ownership, we delete the entry.
-       */
-      if (hv_exists_ent(hv, obj, 0)) {
-	hv_delete_ent(hv, obj, 0, 0);
-      }
-    }
-  }
-  return SWIG_OK;
-}
-
-SWIGRUNTIME int
-SWIG_Perl_ConvertPtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_info *_t, int flags) {
-  return SWIG_Perl_ConvertPtrAndOwn(sv, ptr, _t, flags, 0);
-}
-
-SWIGRUNTIME void
-SWIG_Perl_MakePtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void *ptr, swig_type_info *t, int flags) {
-  if (ptr && (flags & (SWIG_SHADOW | SWIG_POINTER_OWN))) {
-    SV *self;
-    SV *obj=newSV(0);
-    HV *hash=newHV();
-    HV *stash;
-    sv_setref_pv(obj, SWIG_Perl_TypeProxyName(t), ptr);
-    stash=SvSTASH(SvRV(obj));
-    if (flags & SWIG_POINTER_OWN) {
-      HV *hv;
-      GV *gv = *(GV**)hv_fetch(stash, "OWNER", 5, TRUE);
-      if (!isGV(gv))
-        gv_init(gv, stash, "OWNER", 5, FALSE);
-      hv=GvHVn(gv);
-      hv_store_ent(hv, obj, newSViv(1), 0);
-    }
-    sv_magic((SV *)hash, (SV *)obj, 'P', Nullch, 0);
-    SvREFCNT_dec(obj);
-    self=newRV_noinc((SV *)hash);
-    sv_setsv(sv, self);
-    SvREFCNT_dec((SV *)self);
-    sv_bless(sv, stash);
-  }
-  else {
-    sv_setref_pv(sv, SWIG_Perl_TypeProxyName(t), ptr);
-  }
-}
-
-SWIGRUNTIMEINLINE SV *
-SWIG_Perl_NewPointerObj(SWIG_MAYBE_PERL_OBJECT void *ptr, swig_type_info *t, int flags) {
-  SV *result = sv_newmortal();
-  SWIG_MakePtr(result, ptr, t, flags);
-  return result;
-}
-
-SWIGRUNTIME void
-SWIG_Perl_MakePackedObj(SWIG_MAYBE_PERL_OBJECT SV *sv, void *ptr, int sz, swig_type_info *type) {
-  char result[1024];
-  char *r = result;
-  if ((2*sz + 1 + strlen(SWIG_Perl_TypeProxyName(type))) > 1000) return;
-  *(r++) = '_';
-  r = SWIG_PackData(r,ptr,sz);
-  strcpy(r,SWIG_Perl_TypeProxyName(type));
-  sv_setpv(sv, result);
-}
-
-SWIGRUNTIME SV *
-SWIG_Perl_NewPackedObj(SWIG_MAYBE_PERL_OBJECT void *ptr, int sz, swig_type_info *type) {
-  SV *result = sv_newmortal();
-  SWIG_Perl_MakePackedObj(result, ptr, sz, type);
-  return result;
-}
-
-/* Convert a packed value value */
-SWIGRUNTIME int
-SWIG_Perl_ConvertPacked(SWIG_MAYBE_PERL_OBJECT SV *obj, void *ptr, int sz, swig_type_info *ty) {
-  swig_cast_info *tc;
-  const char  *c = 0;
-
-  if ((!obj) || (!SvOK(obj))) return SWIG_ERROR;
-  c = SvPV_nolen(obj);
-  /* Pointer values must start with leading underscore */
-  if (*c != '_') return SWIG_ERROR;
-  c++;
-  c = SWIG_UnpackData(c,ptr,sz);
-  if (ty) {
-    tc = SWIG_TypeCheck(c,ty);
-    if (!tc) return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-
-
-/* Macros for low-level exception handling */
-#define SWIG_croak(x)    { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; }
-
-
-typedef XSPROTO(SwigPerlWrapper);
-typedef SwigPerlWrapper *SwigPerlWrapperPtr;
-
-/* Structure for command table */
-typedef struct {
-  const char         *name;
-  SwigPerlWrapperPtr  wrapper;
-} swig_command_info;
-
-/* Information for constant table */
-
-#define SWIG_INT     1
-#define SWIG_FLOAT   2
-#define SWIG_STRING  3
-#define SWIG_POINTER 4
-#define SWIG_BINARY  5
-
-/* Constant information structure */
-typedef struct swig_constant_info {
-    int              type;
-    const char      *name;
-    long             lvalue;
-    double           dvalue;
-    void            *pvalue;
-    swig_type_info **ptype;
-} swig_constant_info;
-
-
-/* Structure for variable table */
-typedef struct {
-  const char   *name;
-  SwigMagicFunc   set;
-  SwigMagicFunc   get;
-  swig_type_info  **type;
-} swig_variable_info;
-
-/* Magic variable code */
-#ifndef PERL_OBJECT
-# ifdef __cplusplus
-#  define swig_create_magic(s,a,b,c) _swig_create_magic(s,const_cast<char*>(a),b,c)
-# else
-#  define swig_create_magic(s,a,b,c) _swig_create_magic(s,(char*)(a),b,c)
-# endif
-# ifndef MULTIPLICITY
-SWIGRUNTIME void _swig_create_magic(SV *sv, char *name, int (*set)(SV *, MAGIC *), int (*get)(SV *,MAGIC *)) 
-# else
-SWIGRUNTIME void _swig_create_magic(SV *sv, char *name, int (*set)(struct interpreter*, SV *, MAGIC *), int (*get)(struct interpreter*, SV *,MAGIC *)) 
-# endif
-#else
-#  define swig_create_magic(s,a,b,c) _swig_create_magic(pPerl,s,a,b,c)
-SWIGRUNTIME void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, int (CPerlObj::*set)(SV *, MAGIC *), int (CPerlObj::*get)(SV *, MAGIC *)) 
-#endif
-{
-  MAGIC *mg;
-  sv_magic(sv,sv,'U',name,strlen(name));
-  mg = mg_find(sv,'U');
-  mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
-  mg->mg_virtual->svt_get = (SwigMagicFunc) get;
-  mg->mg_virtual->svt_set = (SwigMagicFunc) set;
-  mg->mg_virtual->svt_len = 0;
-  mg->mg_virtual->svt_clear = 0;
-  mg->mg_virtual->svt_free = 0;
-}
-
-
-SWIGRUNTIME swig_module_info *
-SWIG_Perl_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
-  static void *type_pointer = (void *)0;
-  SV *pointer;
-
-  /* first check if pointer already created */
-  if (!type_pointer) {
-    pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, FALSE | GV_ADDMULTI);
-    if (pointer && SvOK(pointer)) {
-      type_pointer = INT2PTR(swig_type_info **, SvIV(pointer));
-    }
-  }
-
-  return (swig_module_info *) type_pointer;
-}
-
-SWIGRUNTIME void
-SWIG_Perl_SetModule(swig_module_info *module) {
-  SV *pointer;
-
-  /* create a new pointer */
-  pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TRUE | GV_ADDMULTI);
-  sv_setiv(pointer, PTR2IV(module));
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlruntime.swg b/dependencies2013/win32/swig/Lib/perl5/perlruntime.swg
deleted file mode 100644
index f948023d..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlruntime.swg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-%runtime "swigrun.swg"        // Common C API type-checking code
-%runtime "swigerrors.swg"     // SWIG errors
-%runtime "perlhead.swg"       // Perl includes and fixes
-%runtime "perlerrors.swg"     // Perl errors 
-%runtime "perlrun.swg"        // Perl runtime functions
-%runtime "noembed.h"          // undefine Perl5 macros
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perlstrings.swg b/dependencies2013/win32/swig/Lib/perl5/perlstrings.swg
deleted file mode 100644
index 242a9c96..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perlstrings.swg
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ------------------------------------------------------------
- *  utility methods for char strings 
- * ------------------------------------------------------------ */
-
-%fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc)
-{
-  if (SvMAGICAL(obj)) {
-     SV *tmp = sv_newmortal();
-     SvSetSV(tmp, obj);
-     obj = tmp;
-  }
-  if (SvPOK(obj)) {
-    STRLEN len = 0;
-    char *cstr = SvPV(obj, len); 
-    size_t size = len + 1;
-    if (cptr)  {
-      if (alloc) {
-	if (*alloc == SWIG_NEWOBJ) {
-	  *cptr = %new_copy_array(cstr, size, char);
-	} else {
-	  *cptr = cstr;
-	  *alloc = SWIG_OLDOBJ;
-	}
-      }
-    }
-    if (psize) *psize = size;
-    return SWIG_OK;
-  } else {
-    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-    if (pchar_descriptor) {
-      char* vptr = 0; 
-      if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = vptr;
-	if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0;
-	if (alloc) *alloc = SWIG_OLDOBJ;
-	return SWIG_OK;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize","header") {
-SWIGINTERNINLINE SV *
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  SV *obj = sv_newmortal();
-  if (carray) {
-    sv_setpvn(obj, carray, size);
-  } else {
-    sv_setsv(obj, &PL_sv_undef);
-  }
-  return obj;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perltypemaps.swg b/dependencies2013/win32/swig/Lib/perl5/perltypemaps.swg
deleted file mode 100644
index ffec5eaf..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perltypemaps.swg
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ------------------------------------------------------------
- *  Typemap specializations for Perl
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Fragment section
- * ------------------------------------------------------------ */
-
-/*
-  in Perl we need to pass the CPerlObj value, sometimes, so, we define
-  the decl/call macros as needed.
-*/
-
-#define SWIG_AS_DECL_ARGS SWIG_PERL_DECL_ARGS_2
-#define SWIG_AS_CALL_ARGS SWIG_PERL_CALL_ARGS_2
-
-#define SWIG_FROM_DECL_ARGS  SWIG_PERL_DECL_ARGS_1
-#define SWIG_FROM_CALL_ARGS  SWIG_PERL_CALL_ARGS_1
-
-
-/* Include fundamental fragment definitions */
-%include <typemaps/fragments.swg>
-
-/* Look for user fragments file. */
-%include <perlfragments.swg>
-
-/* Perl fragments for primitive types */
-%include <perlprimtypes.swg>
-
-/* Perl fragments for char* strings */
-%include <perlstrings.swg>
-
-
-/* ------------------------------------------------------------
- *  Unified typemap section
- * ------------------------------------------------------------ */
-
-/* director support in Perl is experimental */
-#ifndef SWIG_DIRECTOR_TYPEMAPS
-#define SWIG_DIRECTOR_TYPEMAPS
-#endif
-
-
-/* Perl types */
-#define SWIG_Object                      SV *
-#define VOID_Object                      sv_newmortal()
-
-/* Perl $shadow flag */
-#define %newpointer_flags                $shadow
-#define %newinstance_flags               $shadow
-
-
-/* Complete overload of the output/constant/exception macros */
-
-/* output */
-%define %set_output(obj) $result = obj; argvi++ %enddef
-
-/* append output */
-%define %append_output(obj) if (argvi >= items) EXTEND(sp,1); %set_output(obj) %enddef
-
-/* variable output */
-%define %set_varoutput(obj) sv_setsv($result,obj)  %enddef
-
-/* constant */
-%define %set_constant(name, obj) %begin_block
-  SV *sv = get_sv((char*) SWIG_prefix name, TRUE | 0x2 | GV_ADDMULTI);
-  sv_setsv(sv, obj);
-  SvREADONLY_on(sv);
-%end_block %enddef
-
-/* raise exception */
-%define %raise(obj, type, desc) sv_setsv(get_sv("@", GV_ADD), obj); SWIG_fail %enddef
-
-/* Include the unified typemap library */
-%include <typemaps/swigtypemaps.swg>
-
-/*  ------------------------------------------------------------
- *  Perl extra typemaps / typemap overrides
- * ------------------------------------------------------------ */
-
-%typemap(varout,type="$1_descriptor") SWIGTYPE *, SWIGTYPE []  
-    "sv_setiv(SvRV($result),PTR2IV($1));"; 
-
-%typemap(varout,type="$1_descriptor") SWIGTYPE &
-    "sv_setiv(SvRV($result),PTR2IV(&$1));"; 
-
-%typemap(varout,type="$1_descriptor") SWIGTYPE &&
-    "sv_setiv(SvRV($result),PTR2IV(&$1));"; 
-
-%typemap(varout,type="$&1_descriptor") SWIGTYPE
-    "sv_setiv(SvRV($result), PTR2IV(&$1));";
-
-%typemap(varout,type="$1_descriptor") SWIGTYPE (CLASS::*) {
-  SWIG_MakePackedObj($result, (void *) &$1, sizeof($1_type), $1_descriptor);
-}
-
-%typemap(varout) SWIGTYPE *const = SWIGTYPE *;
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/perluserdir.swg b/dependencies2013/win32/swig/Lib/perl5/perluserdir.swg
deleted file mode 100644
index 718440e8..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/perluserdir.swg
+++ /dev/null
@@ -1,2 +0,0 @@
-#define %perlcode  %insert("perl")
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/reference.i b/dependencies2013/win32/swig/Lib/perl5/reference.i
deleted file mode 100644
index b424c533..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/reference.i
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -----------------------------------------------------------------------------
- * reference.i
- *
- * Accept Perl references as pointers
- * ----------------------------------------------------------------------------- */
-
-/*
-The following methods make Perl references work like simple C
-pointers.  References can only be used for simple input/output
-values, not C arrays however.  It should also be noted that 
-REFERENCES are specific to Perl and not supported in other
-scripting languages at this time.
-
-         int            *REFERENCE
-         short          *REFERENCE
-         long           *REFERENCE
-         unsigned int   *REFERENCE
-         unsigned short *REFERENCE
-         unsigned long  *REFERENCE
-         unsigned char  *REFERENCE
-         float          *REFERENCE
-         double         *REFERENCE
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include reference.i
-        void neg(double *REFERENCE);
-
-or you can use the %apply directive :
-
-        %include reference.i
-        %apply double *REFERENCE { double *x };
-        void neg(double *x);
-
-Unlike the INOUT mapping described in typemaps.i, this approach directly
-modifies the value of a Perl reference.  Thus, you could use it
-as follows :
-
-       $x = 3;
-       neg(\$x);
-       print "$x\n";         # Should print out -3.
-
-*/
-
-%typemap(in) double *REFERENCE (double dvalue), double &REFERENCE(double dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if ((!SvNOK(tempsv)) && (!SvIOK(tempsv))) {
-	printf("Received %d\n", SvTYPE(tempsv));
-	SWIG_croak("Expected a double reference.");
-  }
-  dvalue = SvNV(tempsv);
-  $1 = &dvalue;
-}
-
-%typemap(in) float *REFERENCE (float dvalue), float &REFERENCE(float dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if ((!SvNOK(tempsv)) && (!SvIOK(tempsv))) {
-    SWIG_croak("expected a double reference");
-  }
-  dvalue = (float) SvNV(tempsv);
-  $1 = &dvalue;
-}
-
-%typemap(in) int *REFERENCE (int dvalue), int &REFERENCE (int dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = SvIV(tempsv);
-  $1 = &dvalue;
-}
-
-%typemap(in) short *REFERENCE (short dvalue), short &REFERENCE(short dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (short) SvIV(tempsv);
-  $1 = &dvalue;
-}
-%typemap(in) long *REFERENCE (long dvalue), long &REFERENCE(long dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (long) SvIV(tempsv);
-  $1 = &dvalue;
-}
-%typemap(in) unsigned int *REFERENCE (unsigned int dvalue), unsigned int &REFERENCE(unsigned int dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (unsigned int) SvUV(tempsv);
-  $1 = &dvalue;
-}
-%typemap(in) unsigned short *REFERENCE (unsigned short dvalue), unsigned short &REFERENCE(unsigned short dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (unsigned short) SvUV(tempsv);
-  $1 = &dvalue;
-}
-%typemap(in) unsigned long *REFERENCE (unsigned long dvalue), unsigned long &REFERENCE(unsigned long dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (unsigned long) SvUV(tempsv);
-  $1 = &dvalue;
-}
-
-%typemap(in) unsigned char *REFERENCE (unsigned char dvalue), unsigned char &REFERENCE(unsigned char dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (unsigned char) SvUV(tempsv);
-  $1 = &dvalue;
-}
-
-%typemap(in) signed char *REFERENCE (signed char dvalue), signed char &REFERENCE(signed char dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = (signed char) SvIV(tempsv);
-  $1 = &dvalue;
-}
-
-%typemap(in) bool *REFERENCE (bool dvalue), bool &REFERENCE(bool dvalue)
-{
-  SV *tempsv;
-  if (!SvROK($input)) {
-    SWIG_croak("expected a reference");
-  }
-  tempsv = SvRV($input);
-  if (!SvIOK(tempsv)) {
-    SWIG_croak("expected an integer reference");
-  }
-  dvalue = SvIV(tempsv) ? true : false;
-  $1 = &dvalue;
-}
-
-%typemap(typecheck) int *REFERENCE, int &REFERENCE,
-                    short *REFERENCE, short &REFERENCE,
-                    long *REFERENCE, long  &REFERENCE,
-                    signed char *REFERENCE, signed char &REFERENCE,
-                    bool *REFERENCE, bool &REFERENCE
-{
-  $1 = SvROK($input) && SvIOK(SvRV($input));
-}
-%typemap(typecheck) double *REFERENCE, double &REFERENCE,
-                    float *REFERENCE, float &REFERENCE
-{
-  $1 = SvROK($input);
-  if($1) {
-    SV *tmpsv = SvRV($input);
-    $1 = SvNOK(tmpsv) || SvIOK(tmpsv);
-  }
-}
-%typemap(typecheck) unsigned int   *REFERENCE, unsigned int &REFERENCE,
-                    unsigned short *REFERENCE, unsigned short &REFERENCE,
-                    unsigned long  *REFERENCE, unsigned long &REFERENCE,
-                    unsigned char  *REFERENCE, unsigned char &REFERENCE
-{
-  $1 = SvROK($input);
-  if($1) {
-    SV *tmpsv = SvRV($input);
-    $1 = SvUOK(tmpsv) || SvIOK(tmpsv);
-  }
-}
-
-%typemap(argout) double *REFERENCE, double &REFERENCE,
-                 float  *REFERENCE, float &REFERENCE
-{
-  SV *tempsv;
-  tempsv = SvRV($arg);
-  if (!$1) SWIG_croak("expected a reference");
-  sv_setnv(tempsv, (double) *$1);
-}
-
-%typemap(argout)       int            *REFERENCE, int &REFERENCE,
-                       short          *REFERENCE, short &REFERENCE,
-                       long           *REFERENCE, long  &REFERENCE,
-                       signed char    *REFERENCE, signed char &REFERENCE,
-                       bool           *REFERENCE, bool &REFERENCE
-{
-  SV *tempsv;
-  tempsv = SvRV($input);
-  if (!$1) SWIG_croak("expected a reference");
-  sv_setiv(tempsv, (IV) *$1);
-}
-
-%typemap(argout)       unsigned int   *REFERENCE, unsigned int &REFERENCE,
-                       unsigned short *REFERENCE, unsigned short &REFERENCE,
-                       unsigned long  *REFERENCE, unsigned long &REFERENCE,
-                       unsigned char  *REFERENCE, unsigned char &REFERENCE
-{
-  SV *tempsv;
-  tempsv = SvRV($input);
-  if (!$1) SWIG_croak("expected a reference");
-  sv_setuv(tempsv, (UV) *$1);
-}
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_common.i b/dependencies2013/win32/swig/Lib/perl5/std_common.i
deleted file mode 100644
index 7c1ff232..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_common.i
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%apply size_t { std::size_t };
-
-%fragment("<string>");
-%{
-SWIGINTERN
-double SwigSvToNumber(SV* sv) {
-    return SvIOK(sv) ? double(SvIVX(sv)) : SvNVX(sv);
-}
-SWIGINTERN
-std::string SwigSvToString(SV* sv) {
-    STRLEN len;
-    char *ptr = SvPV(sv, len);
-    return std::string(ptr, len);
-}
-SWIGINTERN
-void SwigSvFromString(SV* sv, const std::string& s) {
-    sv_setpvn(sv,s.data(),s.size());
-}
-%}
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_deque.i b/dependencies2013/win32/swig/Lib/perl5/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_except.i b/dependencies2013/win32/swig/Lib/perl5/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_list.i b/dependencies2013/win32/swig/Lib/perl5/std_list.i
deleted file mode 100644
index cd5a6112..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_list.i
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_list.i
- *
- * SWIG typemaps for std::list types
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// containers
-
-
-// ------------------------------------------------------------------------
-// std::list
-// 
-// The aim of all that follows would be to integrate std::list with 
-// Perl as much as possible, namely, to allow the user to pass and 
-// be returned Perl arrays.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::list<T>), f(const std::list<T>&), f(const std::list<T>*):
-//      the parameter being read-only, either a Perl sequence or a
-//      previously wrapped std::list<T> can be passed.
-//   -- f(std::list<T>&), f(std::list<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::list
-//      can be passed.
-//   -- std::list<T> f():
-//      the list is returned by copy; therefore, a Perl sequence of T:s 
-//      is returned which is most easily used in other Perl functions
-//   -- std::list<T>& f(), std::list<T>* f(), const std::list<T>& f(),
-//      const std::list<T>* f():
-//      the list is returned by reference; therefore, a wrapped std::list
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <list>
-%}
-%fragment("<algorithm>");
-%fragment("<stdexcept>");
-
-// exported class
-
-namespace std {
-    
-    template<class T> class list {
-        %typemap(in) list<T> (std::list<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $&1_descriptor,1) != -1) {
-                $1 = *v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                T* obj;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                        $descriptor(T *),0) != -1) {
-                        $1.push_back(*obj);
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(in) const list<T>& (std::list<T> temp,
-                                       std::list<T>* v),
-                     const list<T>* (std::list<T> temp,
-                                       std::list<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $1_descriptor,1) != -1) {
-                $1 = v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                T* obj;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                        $descriptor(T *),0) != -1) {
-                        temp.push_back(*obj);
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-                $1 = &temp;
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(out) list<T> {
-	    std::list< T >::const_iterator i;
-            unsigned int j;
-            int len = $1.size();
-            SV **svs = new SV*[len];
-            for (i=$1.begin(), j=0; i!=$1.end(); i++, j++) {
-                T* ptr = new T(*i);
-                svs[j] = sv_newmortal();
-                SWIG_MakePtr(svs[j], (void*) ptr, 
-                             $descriptor(T *), $shadow|$owner);
-            }
-            AV *myav = av_make(len, svs);
-            delete[] svs;
-            $result = newRV_noinc((SV*) myav);
-            sv_2mortal($result);
-            argvi++;
-        }
-        %typecheck(SWIG_TYPECHECK_LIST) list<T> {
-            {
-                /* wrapped list? */
-                std::list< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $1_&descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        SV **tv;
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            T* obj;
-                            tv = av_fetch(av, 0, 0);
-                            if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                                $descriptor(T *),0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_LIST) const list<T>&,
-                                          const list<T>* {
-            {
-                /* wrapped list? */
-                std::list< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $1_descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        SV **tv;
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            T* obj;
-                            tv = av_fetch(av, 0, 0);
-                            if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                                $descriptor(T *),0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-
-        list();
-        list(const list<T> &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(const T& x);
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_list(T,CHECK_T,TO_T,FROM_T)
-    template<> class list<T> {
-        %typemap(in) list<T> (std::list<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $&1_descriptor,1) != -1){
-                $1 = *v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (CHECK_T(*tv)) {
-                        $1.push_back(TO_T(*tv));
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(in) const list<T>& (std::list<T> temp,
-                                       std::list<T>* v),
-                     const list<T>* (std::list<T> temp,
-                                       std::list<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $1_descriptor,1) != -1) {
-                $1 = v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                T* obj;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (CHECK_T(*tv)) {
-                        temp.push_back(TO_T(*tv));
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-                $1 = &temp;
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(out) list<T> {
-	    std::list< T >::const_iterator i;
-            unsigned int j;
-            int len = $1.size();
-            SV **svs = new SV*[len];
-            for (i=$1.begin(), j=0; i!=$1.end(); i++, j++) {
-                svs[j] = sv_newmortal();
-                FROM_T(svs[j], *i);
-            }
-            AV *myav = av_make(len, svs);
-            delete[] svs;
-            $result = newRV_noinc((SV*) myav);
-            sv_2mortal($result);
-            argvi++;
-        }
-        %typecheck(SWIG_TYPECHECK_LIST) list<T> {
-            {
-                /* wrapped list? */
-                std::list< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $1_&descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        SV **tv;
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            tv = av_fetch(av, 0, 0);
-                            if (CHECK_T(*tv))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_LIST) const list<T>&,
-                                          const list<T>* {
-            {
-                /* wrapped list? */
-                std::list< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $1_descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        SV **tv;
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            tv = av_fetch(av, 0, 0);
-                            if (CHECK_T(*tv))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-
-        list();
-        list(const list<T> &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(T x);
-    };
-    %enddef
-
-    specialize_std_list(bool,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(char,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(int,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(short,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(long,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(unsigned char,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(unsigned int,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(unsigned short,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(unsigned long,SvIOK,SvIVX,sv_setiv);
-    specialize_std_list(float,SvNIOK,SwigSvToNumber,sv_setnv);
-    specialize_std_list(double,SvNIOK,SwigSvToNumber,sv_setnv);
-    specialize_std_list(std::string,SvPOK,SvPVX,SwigSvFromString);
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_map.i b/dependencies2013/win32/swig/Lib/perl5/std_map.i
deleted file mode 100644
index af49ed38..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_map.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-%}
-%fragment("<algorithm>");
-%fragment("<stdexcept>");
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map< K, T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map< K, T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_pair.i b/dependencies2013/win32/swig/Lib/perl5/std_pair.i
deleted file mode 100644
index 0712ad76..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T t, U u);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_string.i b/dependencies2013/win32/swig/Lib/perl5/std_string.i
deleted file mode 100644
index 6f34f184..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_string.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <perlstrings.swg>
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/perl5/std_vector.i b/dependencies2013/win32/swig/Lib/perl5/std_vector.i
deleted file mode 100644
index ec844946..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/std_vector.i
+++ /dev/null
@@ -1,577 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- *
- * SWIG typemaps for std::vector types
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// Perl as much as possible, namely, to allow the user to pass and 
-// be returned Perl arrays.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector<T>), f(const std::vector<T>&), f(const std::vector<T>*):
-//      the parameter being read-only, either a Perl sequence or a
-//      previously wrapped std::vector<T> can be passed.
-//   -- f(std::vector<T>&), f(std::vector<T>*):
-//      the parameter must be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector<T> f():
-//      the vector is returned by copy; therefore, a Perl sequence of T:s 
-//      is returned which is most easily used in other Perl functions
-//   -- std::vector<T>& f(), std::vector<T>* f(), const std::vector<T>& f(),
-//      const std::vector<T>* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-// ------------------------------------------------------------------------
-
-%{
-#include <vector>
-%}
-%fragment("<algorithm>");
-%fragment("<stdexcept>");
-
-// exported class
-
-namespace std {
-    
-    template<class T> class vector {
-        %typemap(in) vector<T> (std::vector<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $&1_descriptor,1) != -1) {
-                $1 = *v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                T* obj;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                        $descriptor(T *),0) != -1) {
-                        $1.push_back(*obj);
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp,
-                                       std::vector<T>* v),
-                     const vector<T>* (std::vector<T> temp,
-                                       std::vector<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $1_descriptor,1) != -1) {
-                $1 = v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                T* obj;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                        $descriptor(T *),0) != -1) {
-                        temp.push_back(*obj);
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-                $1 = &temp;
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(out) vector<T> {
-            size_t len = $1.size();
-            SV **svs = new SV*[len];
-            for (size_t i=0; i<len; i++) {
-                T* ptr = new T($1[i]);
-                svs[i] = sv_newmortal();
-                SWIG_MakePtr(svs[i], (void*) ptr, 
-                             $descriptor(T *), $shadow|$owner);
-            }
-            AV *myav = av_make(len, svs);
-            delete[] svs;
-            $result = newRV_noinc((SV*) myav);
-            sv_2mortal($result);
-            argvi++;
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $&1_descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            T* obj;
-                            SV **tv = av_fetch(av, 0, 0);
-                            if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                                $descriptor(T *),0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $1_descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            T* obj;
-                            SV **tv = av_fetch(av, 0, 0);
-                            if (SWIG_ConvertPtr(*tv, (void **)&obj, 
-                                                $descriptor(T *),0) != -1)
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector<T> &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(const T& x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T& get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const T& x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-    // specializations for pointers
-    template<class T> class vector<T*> {
-        %typemap(in) vector<T*> (std::vector<T*>* v) {
-	    int res = SWIG_ConvertPtr($input,(void **) &v, $&1_descriptor,0);
-            if (SWIG_IsOK(res)){
-                $1 = *v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                I32 len = av_len(av) + 1;
-                for (int i=0; i<len; i++) {
-		    void *v;
-		    SV **tv = av_fetch(av, i, 0);
-		    int res = SWIG_ConvertPtr(*tv, &v, $descriptor(T *),0);
-                    if (SWIG_IsOK(res)) {
-                        $1.push_back(%static_cast(v, T *));
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(in) const vector<T *>& (std::vector<T *> temp,std::vector<T *>* v),
-                     const vector<T *>* (std::vector<T *> temp,std::vector<T *>* v) {
-	    int res = SWIG_ConvertPtr($input,(void **) &v, $1_descriptor,0);
-            if (SWIG_IsOK(res)) {
-                $1 = v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                I32 len = av_len(av) + 1;
-                for (int i=0; i<len; i++) {
-		    void *v;
-		    SV **tv = av_fetch(av, i, 0);
-		    int res = SWIG_ConvertPtr(*tv, &v, $descriptor(T *),0);
-                    if (SWIG_IsOK(res)) {
-                        temp.push_back(%static_cast(v, T *));
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-                $1 = &temp;
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(out) vector<T *> {
-            size_t len = $1.size();
-            SV **svs = new SV*[len];
-            for (size_t i=0; i<len; i++) {
-                T *x = (($1_type &)$1)[i];
-                svs[i] = sv_newmortal();
-		sv_setsv(svs[i], SWIG_NewPointerObj(x, $descriptor(T *), 0));
-            }
-            AV *myav = av_make(len, svs);
-            delete[] svs;
-            $result = newRV_noinc((SV*) myav);
-            sv_2mortal($result);
-            argvi++;
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T *> {
-            {
-                /* wrapped vector? */
-                std::vector< T *>* v;
-		int res = SWIG_ConvertPtr($input,(void **) &v, $&1_descriptor,0);
-                if (SWIG_IsOK(res)) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-			    void *v;
-			    SV **tv = av_fetch(av, 0, 0);
-			    int res = SWIG_ConvertPtr(*tv, &v, $descriptor(T *),0);
-                            if (SWIG_IsOK(res))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T *>&,const vector<T *>* {
-            {
-                /* wrapped vector? */
-                std::vector< T *> *v;
-		int res = SWIG_ConvertPtr($input,%as_voidptrptr(&v), $1_descriptor,0);
-                if (SWIG_IsOK(res)) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-			    void *v;
-			    SV **tv = av_fetch(av, 0, 0);
-			    int res = SWIG_ConvertPtr(*tv, &v, $descriptor(T *),0);
-                            if (SWIG_IsOK(res))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector(unsigned int size = 0);
-        vector(unsigned int size, T *value);
-        vector(const vector<T *> &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(T *x);
-        %extend {
-            T *pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T *x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T *get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, T *x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_vector(T,CHECK_T,TO_T,FROM_T)
-    template<> class vector<T> {
-        %typemap(in) vector<T> (std::vector<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $&1_descriptor,1) != -1){
-                $1 = *v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (CHECK_T(*tv)) {
-                        $1.push_back((T)TO_T(*tv));
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(in) const vector<T>& (std::vector<T> temp,
-                                       std::vector<T>* v),
-                     const vector<T>* (std::vector<T> temp,
-                                       std::vector<T>* v) {
-            if (SWIG_ConvertPtr($input,(void **) &v, 
-                                $1_descriptor,1) != -1) {
-                $1 = v;
-            } else if (SvROK($input)) {
-                AV *av = (AV *)SvRV($input);
-                if (SvTYPE(av) != SVt_PVAV)
-                    SWIG_croak("Type error in argument $argnum of $symname. "
-                               "Expected an array of " #T);
-                SV **tv;
-                I32 len = av_len(av) + 1;
-                for (int i=0; i<len; i++) {
-                    tv = av_fetch(av, i, 0);
-                    if (CHECK_T(*tv)) {
-                        temp.push_back((T)TO_T(*tv));
-                    } else {
-                        SWIG_croak("Type error in argument $argnum of "
-                                   "$symname. "
-                                   "Expected an array of " #T);
-                    }
-                }
-                $1 = &temp;
-            } else {
-                SWIG_croak("Type error in argument $argnum of $symname. "
-                           "Expected an array of " #T);
-            }
-        }
-        %typemap(out) vector<T> {
-            size_t len = $1.size();
-            SV **svs = new SV*[len];
-            for (size_t i=0; i<len; i++) {
-                svs[i] = sv_newmortal();
-                FROM_T(svs[i], $1[i]);
-            }
-            AV *myav = av_make(len, svs);
-            delete[] svs;
-            $result = newRV_noinc((SV*) myav);
-            sv_2mortal($result);
-            argvi++;
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector<T> {
-            {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $&1_descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            SV **tv = av_fetch(av, 0, 0);
-                            if (CHECK_T(*tv))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector<T>&,
-                                          const vector<T>* {
-            {
-                /* wrapped vector? */
-                std::vector< T >* v;
-                if (SWIG_ConvertPtr($input,(void **) &v, 
-                                    $1_descriptor,0) != -1) {
-                    $1 = 1;
-                } else if (SvROK($input)) {
-                    /* native sequence? */
-                    AV *av = (AV *)SvRV($input);
-                    if (SvTYPE(av) == SVt_PVAV) {
-                        I32 len = av_len(av) + 1;
-                        if (len == 0) {
-                            /* an empty sequence can be of any type */
-                            $1 = 1;
-                        } else {
-                            /* check the first element only */
-                            SV **tv = av_fetch(av, 0, 0);
-                            if (CHECK_T(*tv))
-                                $1 = 1;
-                            else
-                                $1 = 0;
-                        }
-                    }
-                } else {
-                    $1 = 0;
-                }
-            }
-        }
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector(unsigned int size = 0);
-        vector(unsigned int size, T value);
-        vector(const vector<T> &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(T x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, T x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-    %enddef
-
-    specialize_std_vector(bool,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(char,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(int,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(short,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(long,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(unsigned char,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(unsigned int,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(unsigned short,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(unsigned long,SvIOK,SvIVX,sv_setiv);
-    specialize_std_vector(float,SvNIOK,SwigSvToNumber,sv_setnv);
-    specialize_std_vector(double,SvNIOK,SwigSvToNumber,sv_setnv);
-    specialize_std_vector(std::string,SvPOK,SwigSvToString,SwigSvFromString);
-}
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/stl.i b/dependencies2013/win32/swig/Lib/perl5/stl.i
deleted file mode 100644
index b19eae58..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/stl.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/perl5/typemaps.i b/dependencies2013/win32/swig/Lib/perl5/typemaps.i
deleted file mode 100644
index 7d96f2ac..00000000
--- a/dependencies2013/win32/swig/Lib/perl5/typemaps.i
+++ /dev/null
@@ -1,371 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * The SWIG typemap library provides a language independent mechanism for
- * supporting output arguments, input values, and other C function
- * calling mechanisms.  The primary use of the library is to provide a
- * better interface to certain C function--especially those involving
- * pointers.
- * ----------------------------------------------------------------------------- */
-
-#if !defined(SWIG_USE_OLD_TYPEMAPS)
-%include <typemaps/typemaps.swg>
-#else
-
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-
-/*
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-         long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include typemaps.i
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-%define INPUT_TYPEMAP(type, converter) 
-%typemap(in) type *INPUT(type temp), type &INPUT(type temp) {
-  temp = (type) converter($input);
-  $1 = &temp;
-}
-%typemap(typecheck) type *INPUT = type;
-%typemap(typecheck) type &INPUT = type;
-%enddef
-
-INPUT_TYPEMAP(float, SvNV);
-INPUT_TYPEMAP(double, SvNV);
-INPUT_TYPEMAP(int, SvIV);
-INPUT_TYPEMAP(long, SvIV);
-INPUT_TYPEMAP(short, SvIV);
-INPUT_TYPEMAP(signed char, SvIV);
-INPUT_TYPEMAP(unsigned int, SvUV);
-INPUT_TYPEMAP(unsigned long, SvUV);
-INPUT_TYPEMAP(unsigned short, SvUV);
-INPUT_TYPEMAP(unsigned char, SvUV);
-
-%typemap(in) bool *INPUT(bool temp), bool &INPUT(bool temp) {
-  temp = SvIV($input) ? true : false;
-  $1 = &temp;
-}
-%typemap(typecheck) bool *INPUT = bool;
-%typemap(typecheck) bool &INPUT = bool;
-
-%typemap(in) long long *INPUT($*1_ltype temp), long long &INPUT($*1_ltype temp) {
-  temp = strtoll(SvPV_nolen($input), 0, 0);
-  $1 = &temp;
-}
-%typemap(typecheck) long long *INPUT = long long;
-%typemap(typecheck) long long &INPUT = long long;
-
-%typemap(in) unsigned long long *INPUT($*1_ltype temp), unsigned long long &INPUT($*1_ltype temp) {
-  temp = strtoull(SvPV_nolen($input), 0, 0);
-  $1 = &temp;
-}
-%typemap(typecheck) unsigned long long *INPUT = unsigned long long;
-%typemap(typecheck) unsigned long long &INPUT = unsigned long long;
-
-
-#undef INPUT_TYPEMAP
-                 
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/*
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, functions will return a Perl array.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include typemaps.i
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Perl output of the function would be an array containing both
-output values. 
-
-*/
-
-// Force the argument to be ignored.
-
-%typemap(in,numinputs=0) int            *OUTPUT(int temp),  int &OUTPUT(int temp),
-                 short          *OUTPUT(short temp), short &OUTPUT(short temp),
-                 long           *OUTPUT(long temp), long &OUTPUT(long temp),
-                 unsigned int   *OUTPUT(unsigned int temp), unsigned int &OUTPUT(unsigned int temp),
-                 unsigned short *OUTPUT(unsigned short temp), unsigned short &OUTPUT(unsigned short temp),
-                 unsigned long  *OUTPUT(unsigned long temp), unsigned long &OUTPUT(unsigned long temp),
-                 unsigned char  *OUTPUT(unsigned char temp), unsigned char &OUTPUT(unsigned char temp),
-                 signed char    *OUTPUT(signed char temp), signed char &OUTPUT(signed char temp),
-                 bool           *OUTPUT(bool temp), bool &OUTPUT(bool temp),
-                 float          *OUTPUT(float temp), float &OUTPUT(float temp),
-                 double         *OUTPUT(double temp), double &OUTPUT(double temp),
-                 long long      *OUTPUT($*1_ltype temp), long long &OUTPUT($*1_ltype temp),
-                 unsigned long long *OUTPUT($*1_ltype temp), unsigned long long &OUTPUT($*1_ltype temp) 
-"$1 = &temp;";
-
-%typemap(argout)  int            *OUTPUT, int &OUTPUT,
-                  short          *OUTPUT, short &OUTPUT,
-                  long           *OUTPUT, long &OUTPUT,
-                  signed char    *OUTPUT, signed char &OUTPUT,
-                  bool           *OUTPUT, bool &OUTPUT
-{
-  if (argvi >= items) {
-    EXTEND(sp,1);
-  }
-  $result = sv_newmortal();
-  sv_setiv($result,(IV) *($1));
-  argvi++;
-}
-
-%typemap(argout)  unsigned int   *OUTPUT, unsigned int &OUTPUT,
-                  unsigned short *OUTPUT, unsigned short &OUTPUT,
-                  unsigned long  *OUTPUT, unsigned long &OUTPUT,
-                  unsigned char  *OUTPUT, unsigned char &OUTPUT
-{
-  if (argvi >= items) {
-    EXTEND(sp,1);
-  }
-  $result = sv_newmortal();
-  sv_setuv($result,(UV) *($1));
-  argvi++;
-}
-
-
-
-%typemap(argout) float    *OUTPUT, float &OUTPUT,
-                 double   *OUTPUT, double &OUTPUT
-{
-  if (argvi >= items) {
-    EXTEND(sp,1);
-  }
-  $result = sv_newmortal();
-  sv_setnv($result,(double) *($1));
-  argvi++;
-}
-
-%typemap(argout) long long *OUTPUT, long long &OUTPUT {
-    char temp[256];
-    if (argvi >= items) {
-	EXTEND(sp,1);
-    }
-    sprintf(temp,"%lld", (long long)*($1));
-    $result = sv_newmortal();
-    sv_setpv($result,temp);
-    argvi++;
-}
-
-%typemap(argout) unsigned long long *OUTPUT, unsigned long long &OUTPUT {
-    char temp[256];
-    if (argvi >= items) {
-	EXTEND(sp,1);
-    }
-    sprintf(temp,"%llu", (unsigned long long)*($1));
-    $result = sv_newmortal();
-    sv_setpv($result,temp);
-    argvi++;
-}
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Perl array.
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include typemaps.i
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value.
-Rather, the modified input value shows up as the return value of the
-function.  Thus, to apply this function to a Perl variable you might
-do this :
-
-       $x = neg($x);
-
-*/
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(in) short *INOUT = short *INPUT;
-%typemap(in) long *INOUT = long *INPUT;
-%typemap(in) unsigned *INOUT = unsigned *INPUT;
-%typemap(in) unsigned short *INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long *INOUT = unsigned long *INPUT;
-%typemap(in) unsigned char *INOUT = unsigned char *INPUT;
-%typemap(in) signed char *INOUT = signed char *INPUT;
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(in) float *INOUT = float *INPUT;
-%typemap(in) double *INOUT = double *INPUT;
-%typemap(in) long long *INOUT = long long *INPUT;
-%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT;
-
-%typemap(in) int &INOUT = int &INPUT;
-%typemap(in) short &INOUT = short &INPUT;
-%typemap(in) long &INOUT = long &INPUT;
-%typemap(in) unsigned &INOUT = unsigned &INPUT;
-%typemap(in) unsigned short &INOUT = unsigned short &INPUT;
-%typemap(in) unsigned long &INOUT = unsigned long &INPUT;
-%typemap(in) unsigned char &INOUT = unsigned char &INPUT;
-%typemap(in) signed char &INOUT = signed char &INPUT;
-%typemap(in) bool &INOUT = bool &INPUT;
-%typemap(in) float &INOUT = float &INPUT;
-%typemap(in) double &INOUT = double &INPUT;
-%typemap(in) long long &INOUT = long long &INPUT;
-%typemap(in) unsigned long long &INOUT = unsigned long long &INPUT;
-
-
-%typemap(argout) int *INOUT = int *OUTPUT;
-%typemap(argout) short *INOUT = short *OUTPUT;
-%typemap(argout) long *INOUT = long *OUTPUT;
-%typemap(argout) unsigned *INOUT = unsigned *OUTPUT;
-%typemap(argout) unsigned short *INOUT = unsigned short *OUTPUT;
-%typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
-%typemap(argout) signed char *INOUT = signed char *OUTPUT;
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(argout) float *INOUT = float *OUTPUT;
-%typemap(argout) double *INOUT = double *OUTPUT;
-%typemap(argout) long long *INOUT = long long *OUTPUT;
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-
-
-%typemap(argout) int &INOUT = int &OUTPUT;
-%typemap(argout) short &INOUT = short &OUTPUT;
-%typemap(argout) long &INOUT = long &OUTPUT;
-%typemap(argout) unsigned &INOUT = unsigned &OUTPUT;
-%typemap(argout) unsigned short &INOUT = unsigned short &OUTPUT;
-%typemap(argout) unsigned long &INOUT = unsigned long &OUTPUT;
-%typemap(argout) unsigned char &INOUT = unsigned char &OUTPUT;
-%typemap(argout) signed char &INOUT = signed char &OUTPUT;
-%typemap(argout) bool &INOUT = bool &OUTPUT;
-%typemap(argout) float &INOUT = float &OUTPUT;
-%typemap(argout) double &INOUT = double &OUTPUT;
-%typemap(argout) long long &INOUT = long long &OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long &OUTPUT;
-
-
-/* Overloading information */
-
-%typemap(typecheck) double *INOUT = double;
-%typemap(typecheck) bool *INOUT = bool;
-%typemap(typecheck) signed char *INOUT = signed char;
-%typemap(typecheck) unsigned char *INOUT = unsigned char;
-%typemap(typecheck) unsigned long *INOUT = unsigned long;
-%typemap(typecheck) unsigned short *INOUT = unsigned short;
-%typemap(typecheck) unsigned int *INOUT = unsigned int;
-%typemap(typecheck) long *INOUT = long;
-%typemap(typecheck) short *INOUT = short;
-%typemap(typecheck) int *INOUT = int;
-%typemap(typecheck) float *INOUT = float;
-%typemap(typecheck) long long *INOUT = long long;
-%typemap(typecheck) unsigned long long *INOUT = unsigned long long;
-
-%typemap(typecheck) double &INOUT = double;
-%typemap(typecheck) bool &INOUT = bool;
-%typemap(typecheck) signed char &INOUT = signed char;
-%typemap(typecheck) unsigned char &INOUT = unsigned char;
-%typemap(typecheck) unsigned long &INOUT = unsigned long;
-%typemap(typecheck) unsigned short &INOUT = unsigned short;
-%typemap(typecheck) unsigned int &INOUT = unsigned int;
-%typemap(typecheck) long &INOUT = long;
-%typemap(typecheck) short &INOUT = short;
-%typemap(typecheck) int &INOUT = int;
-%typemap(typecheck) float &INOUT = float;
-%typemap(typecheck) long long &INOUT = long long;
-%typemap(typecheck) unsigned long long &INOUT = unsigned long long;
-
-#endif
-
-// --------------------------------------------------------------------
-// Special types
-// --------------------------------------------------------------------
-
-
-%include <reference.i>
diff --git a/dependencies2013/win32/swig/Lib/php/const.i b/dependencies2013/win32/swig/Lib/php/const.i
deleted file mode 100644
index d62f162c..00000000
--- a/dependencies2013/win32/swig/Lib/php/const.i
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -----------------------------------------------------------------------------
- * const.i
- *
- * Typemaps for constants
- * ----------------------------------------------------------------------------- */
-
-%typemap(consttab) int,
-                   unsigned int,
-                   short,
-                   unsigned short,
-                   long,
-                   unsigned long,
-                   unsigned char,
-                   signed char,
-                   enum SWIGTYPE
-  "SWIG_LONG_CONSTANT($symname, ($1_type)$value);";
-
-%typemap(consttab) bool
-  "SWIG_BOOL_CONSTANT($symname, ($1_type)$value);";
-
-%typemap(consttab) float,
-                   double
-  "SWIG_DOUBLE_CONSTANT($symname, $value);";
-
-%typemap(consttab) char
-  "SWIG_CHAR_CONSTANT($symname, $value);";
-
-%typemap(consttab) char *,
-                   const char *,
-                   char [],
-                   const char []
-  "SWIG_STRING_CONSTANT($symname, $value);";
-
-%typemap(consttab) SWIGTYPE *,
-                   SWIGTYPE &,
-                   SWIGTYPE &&,
-                   SWIGTYPE [] {
-  zend_constant c;
-  SWIG_SetPointerZval(&c.value, (void*)$value, $1_descriptor, 0);
-  zval_copy_ctor(&c.value);
-  c.name = zend_string_init("$symname", sizeof("$symname") - 1, 0);
-  c.flags = CONST_CS;
-  c.module_number = module_number;
-  zend_register_constant(&c);
-}
-
-/* Handled as a global variable. */
-%typemap(consttab) SWIGTYPE (CLASS::*) "";
diff --git a/dependencies2013/win32/swig/Lib/php/director.swg b/dependencies2013/win32/swig/Lib/php/director.swg
deleted file mode 100644
index ea0eba8a..00000000
--- a/dependencies2013/win32/swig/Lib/php/director.swg
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that PHP proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_DIRECTOR_PHP_HEADER_
-#define SWIG_DIRECTOR_PHP_HEADER_
-
-#include <string>
-#include <exception>
-#include <map>
-
-namespace Swig {
-
-  /* memory handler */
-  struct GCItem {
-    virtual ~GCItem() {
-    }
-
-    virtual int get_own() const {
-      return 0;
-    }
-  };
-
-  struct GCItem_var {
-    GCItem_var(GCItem *item = 0) : _item(item) {
-    }
-
-    GCItem_var& operator=(GCItem *item) {
-      GCItem *tmp = _item;
-      _item = item;
-      delete tmp;
-      return *this;
-    }
-
-    ~GCItem_var() {
-      delete _item;
-    }
-
-    GCItem * operator->() const {
-      return _item;
-    }
-
-    private:
-    GCItem *_item;
-  };
-
-  struct GCItem_Object : GCItem {
-    GCItem_Object(int own) : _own(own) {
-    }
-
-    virtual ~GCItem_Object() {
-    }
-
-    int get_own() const {
-      return _own;
-    }
-
-    private:
-    int _own;
-  };
-
-  template <typename Type>
-  struct GCItem_T : GCItem {
-    GCItem_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCItem_T() {
-      delete _ptr;
-    }
-
-    private:
-    Type *_ptr;
-  };
-
-  class Director {
-    protected:
-      // "mutable" so we can get a non-const pointer to it in const methods.
-      mutable zval swig_self;
-      typedef std::map<void *, GCItem_var> swig_ownership_map;
-      mutable swig_ownership_map swig_owner;
-    public:
-      Director(zval *self) {
-        ZVAL_COPY_VALUE(&swig_self, self);
-      }
-
-      static bool swig_is_overridden_method(const char *cname, const char *lc_fname) {
-        bool result = false;
-        zend_string * cname_str = zend_string_init(cname, strlen(cname), 0);
-        zend_class_entry *ce = zend_lookup_class(cname_str);
-        if (ce) {
-          zval * mptr = zend_hash_str_find(&ce->function_table, lc_fname, strlen(lc_fname));
-          if (mptr) {
-            // common.scope points to zend_class_entry for the declaring class,
-            // and there's only one of those per class, so we can just use a
-            // pointer compare here.
-            result = Z_FUNC_P(mptr)->common.scope != ce;
-          }
-        }
-        zend_string_release(cname_str);
-        return result;
-      }
-
-      template <typename Type>
-      void swig_acquire_ownership(Type *vptr) const {
-        if (vptr) {
-          swig_owner[vptr] = new GCItem_T<Type>(vptr);
-        }
-      }
-  };
-
-  /* base class for director exceptions */
-  class DirectorException : public std::exception {
-  protected:
-    std::string swig_msg;
-  public:
-    DirectorException(int code, const char *hdr, const char *msg) : swig_msg(hdr) {
-      if (msg && msg[0]) {
-        swig_msg += " ";
-        swig_msg += msg;
-      }
-      SWIG_ErrorCode() = code;
-      SWIG_ErrorMsg() = swig_msg.c_str();
-    }
-
-    virtual ~DirectorException() throw() {
-    }
-
-    const char *what() const throw() {
-      return swig_msg.c_str();
-    }
-
-    static void raise(int code, const char *hdr, const char *msg) {
-      throw DirectorException(code, hdr, msg);
-    }
-  };
-
-  /* attempt to call a pure virtual method via a director method */
-  class DirectorPureVirtualException : public DirectorException {
-  public:
-    DirectorPureVirtualException(const char *msg)
-      : DirectorException(E_ERROR, "SWIG director pure virtual method called", msg) {
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorPureVirtualException(msg);
-    }
-  };
-
-  /* any php exception that occurs during a director method call */
-  class DirectorMethodException : public DirectorException
-  {
-  public:
-    DirectorMethodException()
-      : DirectorException(E_ERROR, "SWIG director method error", NULL) {
-    }
-
-    DirectorMethodException(const char *msg)
-      : DirectorException(E_ERROR, "SWIG director method error", msg) {
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorMethodException(msg);
-    }
-  };
-}
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/php/factory.i b/dependencies2013/win32/swig/Lib/php/factory.i
deleted file mode 100644
index c4e082dd..00000000
--- a/dependencies2013/win32/swig/Lib/php/factory.i
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-  Implement a more natural wrap for factory methods, for example, if
-  you have:
-
-  ----  geometry.h --------
-       struct Geometry {                          
-         enum GeomType{			     
-           POINT,				     
-           CIRCLE				     
-         };					     
-         					     
-         virtual ~Geometry() {}    		     
-         virtual int draw() = 0;
-	 
-	 //
-	 // Factory method for all the Geometry objects
-	 //
-         static Geometry *create(GeomType i);     
-       };					     
-       					     
-       struct Point : Geometry  {		     
-         int draw() { return 1; }		     
-         double width() { return 1.0; }    	     
-       };					     
-       					     
-       struct Circle : Geometry  {		     
-         int draw() { return 2; }		     
-         double radius() { return 1.5; }          
-       }; 					     
-       
-       //
-       // Factory method for all the Geometry objects
-       //
-       Geometry *Geometry::create(GeomType type) {
-         switch (type) {			     
-         case POINT: return new Point();	     
-         case CIRCLE: return new Circle(); 	     
-         default: return 0;			     
-         }					     
-       }					    
-  ----  geometry.h --------
-
-
-  You can use the %factory with the Geometry::create method as follows:
-
-    %newobject Geometry::create;
-    %factory(Geometry *Geometry::create, Point, Circle);
-    %include "geometry.h"
-
-  and Geometry::create will return a 'Point' or 'Circle' instance
-  instead of the plain 'Geometry' type. For example, in python:
-
-    circle = Geometry.create(Geometry.CIRCLE)
-    r = circle.radius()
-
-  where circle is a Circle proxy instance.
-
-  NOTES: remember to fully qualify all the type names and don't
-  use %factory inside a namespace declaration, ie, instead of
-  
-     namespace Foo {
-       %factory(Geometry *Geometry::create, Point, Circle);
-     }
-
-  use
-
-     %factory(Foo::Geometry *Foo::Geometry::create, Foo::Point,  Foo::Circle);   
-
-     
-*/
-
-/* for loop for macro with one argument */
-%define %_formacro_1(macro, arg1,...)macro(arg1)
-#if #__VA_ARGS__ != "__fordone__"
-%_formacro_1(macro, __VA_ARGS__)
-#endif
-%enddef
-
-/* for loop for macro with one argument */
-%define %formacro_1(macro,...)%_formacro_1(macro,__VA_ARGS__,__fordone__)%enddef
-%define %formacro(macro,...)%_formacro_1(macro,__VA_ARGS__,__fordone__)%enddef
-
-/* for loop for macro with two arguments */
-%define %_formacro_2(macro, arg1, arg2, ...)macro(arg1, arg2)
-#if #__VA_ARGS__ != "__fordone__"
-%_formacro_2(macro, __VA_ARGS__)
-#endif
-%enddef
-
-/* for loop for macro with two arguments */
-%define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef
-
-%define %_factory_dispatch(Type) 
-if (!dcast) {
-  Type *dobj = dynamic_cast<Type *>($1);
-  if (dobj) {
-    dcast = 1;
-    SWIG_SetPointerZval(return_value, SWIG_as_voidptr(dobj),$descriptor(Type *), $owner);
-  }   
-}%enddef
-
-%define %factory(Method,Types...)
-%typemap(out) Method {
-  int dcast = 0;
-  %formacro(%_factory_dispatch, Types)
-  if (!dcast) {
-    SWIG_SetPointerZval(return_value, SWIG_as_voidptr($1),$descriptor, $owner);
-  }
-}%enddef
diff --git a/dependencies2013/win32/swig/Lib/php/globalvar.i b/dependencies2013/win32/swig/Lib/php/globalvar.i
deleted file mode 100644
index a5fd779a..00000000
--- a/dependencies2013/win32/swig/Lib/php/globalvar.i
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -----------------------------------------------------------------------------
- * globalvar.i
- *
- * Global variables - add the variable to PHP
- * ----------------------------------------------------------------------------- */
-
-%typemap(varinit) char *
-{
-  zval z_var;
-  if ($1) {
-    ZVAL_STRING(&z_var, $1);
-  } else {
-    ZVAL_STR(&z_var, ZSTR_EMPTY_ALLOC());
-  }
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) char []
-{
-  zval z_var;
-  ZVAL_STRING(&z_var, $1);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) int,
-	          unsigned int,
-                  unsigned short,
-                  short,
-                  unsigned short,
-                  long,
-                  unsigned long,
-                  signed char,
-                  unsigned char,
-                  enum SWIGTYPE
-{
-  zval z_var;
-  ZVAL_LONG(&z_var, (long)$1);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) bool
-{
-  zval z_var;
-  ZVAL_BOOL(&z_var, ($1)?1:0);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) float, double
-{
-  zval z_var;
-  ZVAL_DOUBLE(&z_var, (double)$1);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) char
-{
-  zval z_var;
-  char c = $1;
-  ZVAL_STRINGL(&z_var, &c, 1);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) SWIGTYPE *, SWIGTYPE []
-{
-  zval z_var;
-  SWIG_SetPointerZval(&z_var, (void*)$1, $1_descriptor, 0);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&
-{
-  zval z_var;
-  SWIG_SetPointerZval(&z_var, (void*)&$1, $&1_descriptor, 0);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit) char [ANY]
-{
-  zval z_var;
-  /* varinit char [ANY] */
-  ZVAL_STRINGL(&z_var, $1, $1_dim0);
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &z_var);
-}
-
-%typemap(varinit, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  zval resource;
-  void * p = emalloc(sizeof($1));
-  memcpy(p, &$1, sizeof($1));
-  ZVAL_RES(&resource, zend_register_resource(p, swig_member_ptr));
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &resource);
-}
-
-%typemap(varin) int, unsigned int, short, unsigned short, long, unsigned long, signed char, unsigned char,  enum SWIGTYPE
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  $1 = zval_get_long(z_var);
-}
-
-%typemap(varin) bool
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  convert_to_boolean(z_var);
-  $1 = (Z_TYPE_P(z_var) == IS_TRUE);
-}
-
-%typemap(varin) double,float
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  $1 = zval_get_double(z_var);
-}
-
-%typemap(varin) char
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  convert_to_string(z_var);
-  if ($1 != Z_STRVAL_P(z_var)[0]) {
-    $1 = Z_STRVAL_P(z_var)[0];
-  }
-}
-
-%typemap(varin) char *
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  char *s1;
-  convert_to_string(z_var);
-  s1 = Z_STRVAL_P(z_var);
-  if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
-    if (s1)
-      $1 = estrdup(s1);
-    else
-      $1 = NULL;
-  }
-}
-
-
-%typemap(varin) SWIGTYPE []
-{
-  if($1) {
-    zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-    SWIG_SetPointerZval(z_var, (void*)$1, $1_descriptor, $owner);
-  }
-}
-
-%typemap(varin) char [ANY]
-{
- zval **z_var;
- char *s1;
-
- zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1, (void**)&z_var);
- s1 = Z_STRVAL_P(z_var);
- if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
-   if (s1)
-     strncpy($1, s1, $1_dim0);
- }
-}
-
-%typemap(varin) SWIGTYPE
-{
-  zval *z_var;
-  $&1_ltype _temp;
-
-  z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  if (SWIG_ConvertPtr(z_var, (void**)&_temp, $&1_descriptor, 0) < 0) {
-    SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor");
-  }
-
-  $1 = *($&1_ltype)_temp;
-
-}
-
-%typemap(varin) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&
-{
-  zval *z_var;
-  $1_ltype _temp;
-
-  z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  if (SWIG_ConvertPtr(z_var, (void **)&_temp, $1_descriptor, 0) < 0) {
-    SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor");
-  }
-
-  $1 = ($1_ltype)_temp;
-}
-
-%typemap(varin, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  void * p = (void*)zend_fetch_resource_ex(z_var, SWIG_MEMBER_PTR, swig_member_ptr);
-  memcpy(&$1, p, sizeof($1));
-}
-
-%typemap(varout) int,
-                 unsigned int,
-                 unsigned short,
-                 short,
-                 long,
-                 unsigned long,
-                 signed char,
-                 unsigned char,
-                 enum SWIGTYPE
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  if ($1 != ($1_ltype)Z_LVAL_P(z_var)) {
-    z_var->value.lval = (long)$1;
-  }
-}
-
-//SAMFIX need to cast zval->type, what if zend-hash_find fails? etc?
-%typemap(varout) bool
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  if ($1 != ($1_ltype)Z_LVAL_P(z_var)) {
-    z_var->value.lval = (long)$1;
-  }
-}
-
-%typemap(varout) double, float
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  if ($1 != ($1_ltype)Z_DVAL_P(z_var)) {
-    z_var->value.dval = (double)$1;
-  }
-}
-
-%typemap(varout) char
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  char c = $1;
-  if ($1 != Z_STRVAL_P(z_val)[0]) {
-    ZVAL_STRING(z_var, &c);
-  }
-}
-
-%typemap(varout) char *
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  const char *s1 = Z_STRVAL_P(z_var);
-  if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
-    if (s1)
-      efree(s1);
-    if ($1) {
-      (z_var)->value.str.val = estrdup($1);
-      (z_var)->value.str.len = strlen($1) + 1;
-    } else {
-      (z_var)->value.str.val = 0;
-      (z_var)->value.str.len = 0;
-    }
- }
-}
-
-%typemap(varout) SWIGTYPE
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  SWIG_SetPointerZval(z_var, (void*)&$1, $&1_descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE []
-{
-  if($1) {
-    zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-    SWIG_SetPointerZval(z_var, (void*)$1, $1_descriptor, 0);
-  }
-}
-
-%typemap(varout) char [ANY]
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  const char *s1 = Z_STRVAL_P(z_var);
-deliberate error cos this code looks bogus to me
-  if ((s1 == NULL) || strcmp(s1, $1)) {
-    if ($1) {
-      (z_var)->value.str.val = estrdup($1);
-      (z_var)->value.str.len = strlen($1) + 1;
-    } else {
-      (z_var)->value.str.val = 0;
-      (z_var)->value.str.len = 0;
-    }
-  }
-}
-
-%typemap(varout) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&
-{
-  zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
-  SWIG_SetPointerZval(z_var, (void*)$1, $1_descriptor, 0);
-}
-
-%typemap(varout, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  zval resource;
-  void * p = emalloc(sizeof($1));
-  memcpy(p, &$1, sizeof($1));
-  ZVAL_RES(&resource, zend_register_resource(p, swig_member_ptr));
-  zend_hash_str_add(&EG(symbol_table), "$1", sizeof("$1") - 1, &resource);
-}
diff --git a/dependencies2013/win32/swig/Lib/php/php.swg b/dependencies2013/win32/swig/Lib/php/php.swg
deleted file mode 100644
index c9b9a521..00000000
--- a/dependencies2013/win32/swig/Lib/php/php.swg
+++ /dev/null
@@ -1,531 +0,0 @@
-/* -----------------------------------------------------------------------------
- * php.swg
- *
- * PHP configuration file
- * ----------------------------------------------------------------------------- */
-
-%runtime "swigrun.swg"  // Common C API type-checking code
-%runtime "phprun.swg"	// PHP runtime functions
-
-%include <phpinit.swg> // PHP initialization routine.
-
-%include <globalvar.i>	// Global variables.
-%include <const.i>
-
-// use %init %{ "/*code goes here*/ " %}
-// or  %minit %{ "/* code goes here*/ " %} to
-// insert code in the PHP_MINIT_FUNCTION
-#define %minit %insert("init")
-
-// use %rinit %{ "/* code goes here*/ " %} to
-// insert code in the PHP_RINIT_FUNCTION
-#define %rinit %insert("rinit")
-
-// use %shutdown %{ " /*code goes here*/ " %} to
-// insert code in the PHP_MSHUTDOWN_FUNCTION
-#define %shutdown  %insert("shutdown")
-#define %mshutdown  %insert("shutdown")
-
-// use %rshutdown %{ " /*code goes here*/" %} to
-// insert code in the PHP_RSHUTDOWN_FUNCTION
-#define %rshutdown  %insert("rshutdown")
-
-/* Typemaps for input parameters by value */
-
-%include <utils.i>
-
-%pass_by_val(bool,CONVERT_BOOL_IN);
-
-%pass_by_val(size_t, CONVERT_INT_IN);
-
-%pass_by_val(enum SWIGTYPE, CONVERT_INT_IN);
-
-%pass_by_val(signed int, CONVERT_INT_IN);
-%pass_by_val(int,CONVERT_INT_IN);
-%pass_by_val(unsigned int,CONVERT_INT_IN);
-
-%pass_by_val(signed short, CONVERT_INT_IN);
-%pass_by_val(short,CONVERT_INT_IN);
-%pass_by_val(unsigned short, CONVERT_INT_IN);
-
-%pass_by_val(signed long, CONVERT_INT_IN);
-%pass_by_val(long, CONVERT_INT_IN);
-%pass_by_val(unsigned long, CONVERT_INT_IN);
-
-%pass_by_val(signed long long, CONVERT_LONG_LONG_IN);
-%pass_by_val(long long, CONVERT_LONG_LONG_IN);
-%pass_by_val(unsigned long long, CONVERT_UNSIGNED_LONG_LONG_IN);
-
-%pass_by_val(signed char, CONVERT_INT_IN);
-%pass_by_val(char, CONVERT_CHAR_IN);
-%pass_by_val(unsigned char, CONVERT_INT_IN);
-
-%pass_by_val(float, CONVERT_FLOAT_IN);
-
-%pass_by_val(double, CONVERT_FLOAT_IN);
-
-%pass_by_val(char *, CONVERT_STRING_IN);
-%typemap(in) char *& = const char *&;
-%typemap(directorout) char *& = const char *&;
-
-// char array can be in/out, though the passed string may not be big enough...
-// so we have to size it
-%typemap(in) char[ANY]
-%{
-   convert_to_string(&$input);
-   $1 = ($1_ltype) Z_STRVAL($input);
-%}
-
-%typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) %{
-   convert_to_string(&$input);
-   $1 = ($1_ltype) Z_STRVAL($input);
-   $2 = ($2_ltype) Z_STRLEN($input);
-%}
-
-/* Object passed by value. Convert to a pointer */
-%typemap(in) SWIGTYPE ($&1_ltype tmp)
-%{
-	if (SWIG_ConvertPtr(&$input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL) {
-          SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-	}
-	$1 = *tmp;
-%}
-
-%typemap(directorout) SWIGTYPE ($&1_ltype tmp)
-%{
-	/* If exit was via exception, PHP NULL is returned so skip the conversion. */
-	if (!EG(exception)) {
-	  if (SWIG_ConvertPtr($input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL)
-	    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-	  $result = *tmp;
-	}
-%}
-
-%typemap(in) SWIGTYPE *,
-	     SWIGTYPE []
-%{
-	if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0) {
-            SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-	}
-%}
-
-%typemap(in) SWIGTYPE &
-%{
-	if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) {
-	    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-	}
-%}
-
-%typemap(in) SWIGTYPE &&
-%{
-	if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) {
-	    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-	}
-%}
-
-%typemap(in) SWIGTYPE *const& ($*ltype temp)
-%{
-	if (SWIG_ConvertPtr(&$input, (void **) &temp, $*1_descriptor, 0) < 0) {
-            SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $*1_descriptor");
-	}
-	$1 = ($1_ltype)&temp;
-%}
-
-%typemap(in) SWIGTYPE *DISOWN
-%{
-  if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, SWIG_POINTER_DISOWN ) < 0) {
-    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-  }
-%}
-
-%typemap(argout) SWIGTYPE *,
-                 SWIGTYPE [],
-                 SWIGTYPE &,
-                 SWIGTYPE &&;
-
-%typemap(in) void *
-%{
-	if (SWIG_ConvertPtr(&$input, (void **) &$1, 0, 0) < 0) {
-	  /* Allow NULL from php for void* */
-	  if (Z_ISNULL($input)) $1=0;
-	  else
-            SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-	}
-%}
-
-/* Special case when void* is passed by reference so it can be made to point
-   to opaque api structs */
-%typemap(in) void ** ($*1_ltype ptr, int force),
-             void *& ($*1_ltype ptr, int force)
-{
-  /* If they pass NULL by reference, make it into a void*
-     This bit should go in arginit if arginit support init-ing scripting args */
-  if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0) {
-    /* So... we didn't get a ref or ptr, but we'll accept NULL by reference */
-    if (!(Z_ISREF($input) && Z_ISNULL_P(Z_REFVAL($input)))) {
-      /* wasn't a pre/ref/thing, OR anything like an int thing */
-      SWIG_PHP_Error(E_ERROR, "Type error in argument $arg of $symname.");
-    }
-  }
-  force=0;
-  if (arg1==NULL) {
-#ifdef __cplusplus
-    ptr=new $*1_ltype();
-#else
-    ptr=($*1_ltype) calloc(1,sizeof($*1_ltype));
-#endif
-    $1=&ptr;
-    /* have to passback arg$arg too */
-    force=1;
-  }
-}
-%typemap(argout) void **,
-                 void *&
-%{
-  if (force$argnum) {
-    SWIG_SetPointerZval(&$input, (void*) ptr$argnum, $*1_descriptor, 1);
-  }
-%}
-
-/* Typemap for output values */
-
-%typemap(out) int,
-              unsigned int,
-              short,
-              unsigned short,
-              long,
-              unsigned long,
-              signed char,
-              unsigned char,
-              bool,
-              size_t
-%{
-  RETVAL_LONG($1);
-%}
-
-%typemap(out) enum SWIGTYPE
-%{
-  RETVAL_LONG((long)$1);
-%}
-
-%typemap(out) long long
-%{
-  if ((long long)LONG_MIN <= $1 && $1 <= (long long)LONG_MAX) {
-    RETVAL_LONG((long)($1));
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)$1);
-    RETVAL_STRING(temp);
-  }
-%}
-%typemap(out) unsigned long long
-%{
-  if ($1 <= (unsigned long long)LONG_MAX) {
-    RETVAL_LONG((long)($1));
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)$1);
-    RETVAL_STRING(temp);
-  }
-%}
-
-%typemap(out) const int &,
-              const unsigned int &,
-              const short &,
-              const unsigned short &,
-              const long &,
-              const unsigned long &,
-              const signed char &,
-              const unsigned char &,
-              const bool &,
-              const size_t &
-%{
-  RETVAL_LONG(*$1);
-%}
-
-%typemap(out) const enum SWIGTYPE &
-%{
-  RETVAL_LONG((long)*$1);
-%}
-
-%typemap(out) const enum SWIGTYPE &&
-%{
-  RETVAL_LONG((long)*$1);
-%}
-
-%typemap(out) const long long &
-%{
-  if ((long long)LONG_MIN <= *$1 && *$1 <= (long long)LONG_MAX) {
-    RETVAL_LONG((long)(*$1));
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)(*$1));
-    RETVAL_STRING(temp);
-  }
-%}
-%typemap(out) const unsigned long long &
-%{
-  if (*$1 <= (unsigned long long)LONG_MAX) {
-    RETVAL_LONG((long)(*$1));
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)(*$1));
-    RETVAL_STRING(temp);
-  }
-%}
-
-%typemap(directorin) int,
-              unsigned int,
-              short,
-              unsigned short,
-              long,
-              unsigned long,
-              signed char,
-              unsigned char,
-              size_t,
-              enum SWIGTYPE
-%{
-  ZVAL_LONG($input,$1);
-%}
-
-%typemap(directorin) enum SWIGTYPE
-%{
-  ZVAL_LONG($input, (long)$1_name);
-%}
-
-%typemap(directorin) char *, char []
-%{
-    if(!$1) {
-      ZVAL_NULL($input);
-    } else {
-      ZVAL_STRING($input, (const char*)$1);
-    }
-%}
-
-%typemap(out) bool
-%{
-  RETVAL_BOOL(($1) ? 1 : 0);
-%}
-
-%typemap(out) const bool &
-%{
-  RETVAL_BOOL((*$1) ? 1 : 0);
-%}
-
-%typemap(directorin) bool
-%{
-  ZVAL_BOOL($input, ($1) ? 1 : 0);
-%}
-
-%typemap(out) float,
-              double
-%{
-  RETVAL_DOUBLE($1);
-%}
-
-%typemap(out) const float &,
-              const double &
-%{
-  RETVAL_DOUBLE(*$1);
-%}
-
-%typemap(directorin) float,
-                     double
-%{
-  ZVAL_DOUBLE($input, $1);
-%}
-
-%typemap(out) char
-%{
-  RETVAL_STRINGL(&$1, 1);
-%}
-
-%typemap(out) const char &
-%{
-  RETVAL_STRINGL(&*$1, 1);
-%}
-
-%typemap(out) char *,
-              char []
-%{
-  if (!$1) {
-    RETVAL_NULL();
-  } else {
-    RETVAL_STRING((const char *)$1);
-  }
-%}
-
-%typemap(out) char *&
-%{
-  if (!*$1) {
-    RETVAL_NULL();
-  } else {
-    RETVAL_STRING((const char *)*$1);
-  }
-%}
-
-%typemap(out) SWIGTYPE *,
-              SWIGTYPE [],
-              SWIGTYPE &,
-              SWIGTYPE &&
-%{
-  SWIG_SetPointerZval(return_value, (void *)$1, $1_descriptor, $owner);
-%}
-
-%typemap(out) SWIGTYPE *const&
-%{
-  SWIG_SetPointerZval(return_value, (void *)*$1, $*1_descriptor, $owner);
-%}
-
-%typemap(directorin) SWIGTYPE *,
-                     SWIGTYPE [],
-                     SWIGTYPE &,
-                     SWIGTYPE &&
-%{
-  SWIG_SetPointerZval($input, (void *)&$1, $1_descriptor, ($owner)|2);
-%}
-
-%typemap(out, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  void * p = emalloc(sizeof($1));
-  memcpy(p, &$1, sizeof($1));
-  RETVAL_RES(zend_register_resource(p, swig_member_ptr));
-}
-
-%typemap(in, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  void * p = (void*)zend_fetch_resource_ex(&$input, SWIG_MEMBER_PTR, swig_member_ptr);
-  memcpy(&$1, p, sizeof($1));
-}
-
-%typemap(out) SWIGTYPE *DYNAMIC,
-              SWIGTYPE &DYNAMIC
-{
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1);
-  SWIG_SetPointerZval(return_value, (void *)$1, ty, $owner);
-}
-
-%typemap(out) SWIGTYPE
-#ifdef __cplusplus
-{
-  $&1_ltype resultobj = new $1_ltype((const $1_ltype &) $1);
-  SWIG_SetPointerZval(return_value, (void *)resultobj, $&1_descriptor, 1);
-}
-#else
-{
-  $&1_ltype resultobj = ($&1_ltype) emalloc(sizeof($1_type));
-  memcpy(resultobj, &$1, sizeof($1_type));
-  SWIG_SetPointerZval(return_value, (void *)resultobj, $&1_descriptor, 1);
-}
-#endif
-
-%typemap(directorin) SWIGTYPE
-%{
-  SWIG_SetPointerZval($input, SWIG_as_voidptr(new $1_ltype((const $1_ltype &)$1)), $&1_descriptor, 1|2);
-%}
-
-%typemap(out) void "";
-
-%typemap(out) char [ANY]
-{
-  int len = 0;
-  while (len < $1_dim0 && $1[len]) ++len;
-  RETVAL_STRINGL($1, len);
-}
-
-// This typecheck does hard checking for proper argument type.  If you want
-// an argument to be converted from a different PHP type, you must convert
-// it yourself before passing it (e.g. (string)4.7 or (int)"6").
-%define %php_typecheck(_type,_prec,is)
-%typemap(typecheck,precedence=_prec) _type, const _type &
- " $1 = (Z_TYPE($input) == is);"
-%enddef
-
-// Like %php_typecheck but allows either of two values.
-%define %php_typecheck2(_type,_prec,is1,is2)
-%typemap(typecheck,precedence=_prec) _type, const _type &
- " $1 = (Z_TYPE($input) == is1 || Z_TYPE($input) == is2);"
-%enddef
-
-%php_typecheck(int,SWIG_TYPECHECK_INTEGER,IS_LONG)
-%php_typecheck(unsigned int,SWIG_TYPECHECK_UINT32,IS_LONG)
-%php_typecheck(short,SWIG_TYPECHECK_INT16,IS_LONG)
-%php_typecheck(unsigned short,SWIG_TYPECHECK_UINT16,IS_LONG)
-%php_typecheck(long,SWIG_TYPECHECK_INT32,IS_LONG)
-%php_typecheck(unsigned long,SWIG_TYPECHECK_UINT32,IS_LONG)
-%php_typecheck(long long,SWIG_TYPECHECK_INT64,IS_LONG)
-%php_typecheck(unsigned long long,SWIG_TYPECHECK_UINT64,IS_LONG)
-%php_typecheck(signed char,SWIG_TYPECHECK_INT8,IS_LONG)
-%php_typecheck(unsigned char,SWIG_TYPECHECK_UINT8,IS_LONG)
-%php_typecheck(size_t,SWIG_TYPECHECK_SIZE,IS_LONG)
-%php_typecheck(enum SWIGTYPE,SWIG_TYPECHECK_INTEGER,IS_LONG)
-%php_typecheck2(bool,SWIG_TYPECHECK_BOOL,IS_TRUE,IS_FALSE)
-%php_typecheck(float,SWIG_TYPECHECK_FLOAT,IS_DOUBLE)
-%php_typecheck(double,SWIG_TYPECHECK_DOUBLE,IS_DOUBLE)
-%php_typecheck(char,SWIG_TYPECHECK_CHAR,IS_STRING)
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) char *, char *&, char []
- " $1 = (Z_TYPE($input) == IS_STRING); "
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void **)&tmp, $&1_descriptor, 0) >= 0);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER)
-             SWIGTYPE *,
-             SWIGTYPE [],
-             SWIGTYPE &,
-             SWIGTYPE &&,
-             SWIGTYPE *const&
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, $1_descriptor, 0) >= 0);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *const&
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, $*1_descriptor, 0) >= 0);
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void *
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, 0, 0) >= 0);
-}
-
-/* Exception handling */
-
-%typemap(throws) int,
-                 long,
-                 short,
-                 unsigned int,
-                 unsigned long,
-                 unsigned short %{
-  zend_throw_exception(NULL, "C++ $1_type exception thrown", $1);
-  return;
-%}
-
-%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE *, SWIGTYPE [], SWIGTYPE [ANY] %{
-  (void)$1;
-  zend_throw_exception(NULL, "C++ $1_type exception thrown", 0);
-  return;
-%}
-
-%typemap(throws) char * %{
-  zend_throw_exception(NULL, $1, 0);
-  return;
-%}
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-
-/* php keywords */
-%include <phpkw.swg>
diff --git a/dependencies2013/win32/swig/Lib/php/phpinit.swg b/dependencies2013/win32/swig/Lib/php/phpinit.swg
deleted file mode 100644
index 1f252d1a..00000000
--- a/dependencies2013/win32/swig/Lib/php/phpinit.swg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/* ------------------------------------------------------------
- * The start of the PHP initialization function 
- * ------------------------------------------------------------ */
-
-%insert(init) "swiginit.swg"
-
-%init %{
-SWIG_php_minit {
-    SWIG_InitializeModule(0);
-%}
-
-%fragment("swig_php_init_member_ptr2", "header") %{
-#define SWIG_MEMBER_PTR "CLASS::*"
-
-static void swig_member_ptr_dtor(zend_resource *res) {
-  efree(res->ptr);
-}
-
-static int swig_member_ptr = 0;
-%}
-
-%fragment("swig_php_init_member_ptr", "init", fragment="swig_php_init_member_ptr2") %{
-    swig_member_ptr = zend_register_list_destructors_ex(swig_member_ptr_dtor, NULL, SWIG_MEMBER_PTR, module_number);
-%}
diff --git a/dependencies2013/win32/swig/Lib/php/phpkw.swg b/dependencies2013/win32/swig/Lib/php/phpkw.swg
deleted file mode 100644
index db451f95..00000000
--- a/dependencies2013/win32/swig/Lib/php/phpkw.swg
+++ /dev/null
@@ -1,881 +0,0 @@
-/* -----------------------------------------------------------------------------
- * phpkw.swg
- * ----------------------------------------------------------------------------- */
-
-/* Keyword (case insensitive) */
-#define PHPKW(x) %keywordwarn("'" `x` "' is a PHP keyword, renaming to 'c_" `x` "'",sourcefmt="%(lower)s",rename="c_%s") `x`
-
-/* Class (case insensitive) */
-#define PHPCN(x) %keywordwarn("'" `x` "' is a PHP reserved class name, renaming to 'c_" `x` "'",%$isclass,sourcefmt="%(lower)s",rename="c_%s") `x`
-
-/* Constant (case insensitive) */
-#define PHPBN1a(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "enum conflicts with a built-in constant '"`x`"' in PHP"),%$isenumitem,sourcefmt="%(lower)s") `x`
-#define PHPBN1b(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "constant conflicts with a built-in constant '"`x`"' in PHP"),%$isconstant,sourcefmt="%(lower)s") `x`
-%define PHPBN1(X)
- PHPBN1a(X); PHPBN1b(X)
-%enddef
-
-/* Constant (case sensitive) */
-#define PHPBN2a(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "enum conflicts with a built-in constant '"`x`"' in PHP"),%$isenumitem) `x`
-#define PHPBN2b(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "constant conflicts with a built-in constant '"`x`"' in PHP"),%$isconstant) `x`
-%define PHPBN2(X)
- PHPBN2a(X); PHPBN2b(X)
-%enddef
-
-#define PHPFN(x) %keywordwarn("'" `x` "' is a PHP built-in function, renaming to 'c_" `x` "'",sourcefmt="%(lower)s",%$isfunction,%$not %$ismember,rename="c_%s") `x`
-
-/* From: http://php.net/manual/en/reserved.keywords.php
- * "You cannot use any of the following words as constants, class names,
- * function or method names. Using them as variable names is generally OK, but
- * could lead to confusion."
- */
-/* Check is case insensitive - these *MUST* be listed in lower case here */
-PHPKW(__halt_compiler);
-PHPKW(abstract);
-PHPKW(and);
-PHPKW(array);
-PHPKW(as);
-PHPKW(break);
-PHPKW(callable); // As of PHP 5.4
-PHPKW(case);
-PHPKW(catch);
-PHPKW(class);
-PHPKW(clone);
-PHPKW(const);
-PHPKW(continue);
-PHPKW(declare);
-PHPKW(default);
-PHPKW(die); // "Language construct"
-PHPKW(do);
-PHPKW(echo); // "Language construct"
-PHPKW(else);
-PHPKW(elseif);
-PHPKW(empty); // "Language construct"
-PHPKW(enddeclare);
-PHPKW(endfor);
-PHPKW(endforeach);
-PHPKW(endif);
-PHPKW(endswitch);
-PHPKW(endwhile);
-PHPKW(eval); // "Language construct"
-PHPKW(exit); // "Language construct"
-PHPKW(extends);
-PHPKW(final);
-PHPKW(finally); // As of PHP 5.5
-PHPKW(for);
-PHPKW(foreach);
-PHPKW(function);
-PHPKW(global);
-PHPKW(goto); // As of PHP 5.3
-PHPKW(if);
-PHPKW(implements);
-PHPKW(include); // "Language construct"
-PHPKW(include_once); // "Language construct"
-PHPKW(instanceof);
-PHPKW(insteadof); // As of PHP 5.4
-PHPKW(interface);
-PHPKW(isset); // "Language construct"
-PHPKW(list); // "Language construct"
-PHPKW(namespace); // As of PHP 5.3
-PHPKW(new);
-PHPKW(or);
-PHPKW(print); // "Language construct"
-PHPKW(private);
-PHPKW(protected);
-PHPKW(public);
-PHPKW(require); // "Language construct"
-PHPKW(require_once); // "Language construct"
-PHPKW(return); // "Language construct"
-PHPKW(static);
-PHPKW(switch);
-PHPKW(throw);
-PHPKW(trait); // As of PHP 5.4
-PHPKW(try);
-PHPKW(unset); // "Language construct"
-PHPKW(use);
-PHPKW(var);
-PHPKW(while);
-PHPKW(xor);
-PHPKW(yield); // As of PHP 5.5
-
-// Compile-time "magic" constants
-// From: http://php.net/manual/en/reserved.keywords.php
-// also at: http://php.net/manual/en/language.constants.predefined.php
-/* These *MUST* be listed in lower case here */
-PHPKW(__class__);
-PHPKW(__dir__); // As of PHP 5.3
-PHPKW(__file__);
-PHPKW(__function__);
-PHPKW(__line__);
-PHPKW(__method__);
-PHPKW(__namespace__); // As of PHP 5.3
-PHPKW(__trait__); // As of PHP 5.4
-
-/* We classify these as built-in names since they conflict, but PHP still runs */
-
-/* Predefined case-insensitive constants */
-/* These *MUST* be listed in lower case here */
-PHPBN1(null);
-PHPBN1(true);
-PHPBN1(false);
-
-/* "Core Predefined Constants" from http://php.net/manual/en/reserved.constants.php */
-/* These are case sensitive */
-PHPBN2(PHP_VERSION);
-PHPBN2(PHP_MAJOR_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_MINOR_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_RELEASE_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_VERSION_ID); // As of PHP 5.2.7
-PHPBN2(PHP_EXTRA_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_ZTS); // As of PHP 5.2.7
-PHPBN2(PHP_DEBUG); // As of PHP 5.2.7
-PHPBN2(PHP_MAXPATHLEN); // As of PHP 5.3.0
-PHPBN2(PHP_OS);
-PHPBN2(PHP_SAPI);
-PHPBN2(PHP_EOL); // As of PHP 5.0.2
-PHPBN2(PHP_INT_MAX); // As of PHP 5.0.5
-PHPBN2(PHP_INT_SIZE); // As of PHP 5.0.5
-PHPBN2(DEFAULT_INCLUDE_PATH);
-PHPBN2(PEAR_INSTALL_DIR);
-PHPBN2(PEAR_EXTENSION_DIR);
-PHPBN2(PHP_EXTENSION_DIR);
-PHPBN2(PHP_PREFIX);
-PHPBN2(PHP_BINDIR);
-PHPBN2(PHP_BINARY); // As of PHP 5.4
-PHPBN2(PHP_MANDIR); // As of PHP 5.3.7
-PHPBN2(PHP_LIBDIR);
-PHPBN2(PHP_DATADIR);
-PHPBN2(PHP_SYSCONFDIR);
-PHPBN2(PHP_LOCALSTATEDIR);
-PHPBN2(PHP_CONFIG_FILE_PATH);
-PHPBN2(PHP_CONFIG_FILE_SCAN_DIR);
-PHPBN2(PHP_SHLIB_SUFFIX);
-PHPBN2(E_ERROR);
-PHPBN2(E_WARNING);
-PHPBN2(E_PARSE);
-PHPBN2(E_NOTICE);
-PHPBN2(E_CORE_ERROR);
-PHPBN2(E_CORE_WARNING);
-PHPBN2(E_COMPILE_ERROR);
-PHPBN2(E_COMPILE_WARNING);
-PHPBN2(E_USER_ERROR);
-PHPBN2(E_USER_WARNING);
-PHPBN2(E_USER_NOTICE);
-PHPBN2(E_DEPRECATED); // As of PHP 5.3.0
-PHPBN2(E_USER_DEPRECATED); // As of PHP 5.3.0
-PHPBN2(E_ALL);
-PHPBN2(E_STRICT);
-PHPBN2(__COMPILER_HALT_OFFSET__); // As of PHP 5.1.0
-// TRUE, FALSE, NULL are listed on the same page, but are actually
-// case-insensitive, whereas all the other constants listed there seem to be
-// case-sensitive, so we handle TRUE, FALSE, NULL in PHPBN1.
-PHPBN2(PHP_OUTPUT_HANDLER_START);
-PHPBN2(PHP_OUTPUT_HANDLER_CONT);
-PHPBN2(PHP_OUTPUT_HANDLER_END);
-/* These don't actually seem to be set (tested on Linux, I guess they're
- * Windows only?) */
-PHPBN2(PHP_WINDOWS_NT_DOMAIN_CONTROLLER); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_NT_SERVER); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_NT_WORKSTATION); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_BUILD); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_MAJOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_MINOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_PLATFORM); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_PRODUCTTYPE); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_SP_MAJOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_SP_MINOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_SUITEMASK); // As of PHP 5.3
-/* "Standard Predefined Constants" from http://php.net/manual/en/reserved.constants.php */
-PHPBN2(EXTR_OVERWRITE);
-PHPBN2(EXTR_SKIP);
-PHPBN2(EXTR_PREFIX_SAME);
-PHPBN2(EXTR_PREFIX_ALL);
-PHPBN2(EXTR_PREFIX_INVALID);
-PHPBN2(EXTR_PREFIX_IF_EXISTS);
-PHPBN2(EXTR_IF_EXISTS);
-PHPBN2(SORT_ASC);
-PHPBN2(SORT_DESC);
-PHPBN2(SORT_REGULAR);
-PHPBN2(SORT_NUMERIC);
-PHPBN2(SORT_STRING);
-PHPBN2(CASE_LOWER);
-PHPBN2(CASE_UPPER);
-PHPBN2(COUNT_NORMAL);
-PHPBN2(COUNT_RECURSIVE);
-PHPBN2(ASSERT_ACTIVE);
-PHPBN2(ASSERT_CALLBACK);
-PHPBN2(ASSERT_BAIL);
-PHPBN2(ASSERT_WARNING);
-PHPBN2(ASSERT_QUIET_EVAL);
-PHPBN2(CONNECTION_ABORTED);
-PHPBN2(CONNECTION_NORMAL);
-PHPBN2(CONNECTION_TIMEOUT);
-PHPBN2(INI_USER);
-PHPBN2(INI_PERDIR);
-PHPBN2(INI_SYSTEM);
-PHPBN2(INI_ALL);
-PHPBN2(INI_SCANNER_NORMAL); // As of PHP 5.3
-PHPBN2(INI_SCANNER_RAW); // As of PHP 5.3
-PHPBN2(M_E);
-PHPBN2(M_LOG2E);
-PHPBN2(M_LOG10E);
-PHPBN2(M_LN2);
-PHPBN2(M_LN10);
-PHPBN2(M_PI);
-PHPBN2(M_PI_2);
-PHPBN2(M_PI_4);
-PHPBN2(M_1_PI);
-PHPBN2(M_2_PI);
-PHPBN2(M_2_SQRTPI);
-PHPBN2(M_SQRT2);
-PHPBN2(M_SQRT1_2);
-PHPBN2(M_EULER); // As of PHP 5.2
-PHPBN2(M_LNPI); // As of PHP 5.2
-PHPBN2(M_SQRT3); // As of PHP 5.2
-PHPBN2(M_SQRTPI); // As of PHP 5.2
-PHPBN2(CRYPT_SALT_LENGTH);
-PHPBN2(CRYPT_STD_DES);
-PHPBN2(CRYPT_EXT_DES);
-PHPBN2(CRYPT_MD5);
-PHPBN2(CRYPT_BLOWFISH);
-PHPBN2(DIRECTORY_SEPARATOR);
-PHPBN2(SEEK_SET);
-PHPBN2(SEEK_CUR);
-PHPBN2(SEEK_END);
-PHPBN2(LOCK_SH);
-PHPBN2(LOCK_EX);
-PHPBN2(LOCK_UN);
-PHPBN2(LOCK_NB);
-PHPBN2(HTML_SPECIALCHARS);
-PHPBN2(HTML_ENTITIES);
-PHPBN2(ENT_COMPAT);
-PHPBN2(ENT_QUOTES);
-PHPBN2(ENT_NOQUOTES);
-PHPBN2(INFO_GENERAL);
-PHPBN2(INFO_CREDITS);
-PHPBN2(INFO_CONFIGURATION);
-PHPBN2(INFO_MODULES);
-PHPBN2(INFO_ENVIRONMENT);
-PHPBN2(INFO_VARIABLES);
-PHPBN2(INFO_LICENSE);
-PHPBN2(INFO_ALL);
-PHPBN2(CREDITS_GROUP);
-PHPBN2(CREDITS_GENERAL);
-PHPBN2(CREDITS_SAPI);
-PHPBN2(CREDITS_MODULES);
-PHPBN2(CREDITS_DOCS);
-PHPBN2(CREDITS_FULLPAGE);
-PHPBN2(CREDITS_QA);
-PHPBN2(CREDITS_ALL);
-PHPBN2(STR_PAD_LEFT);
-PHPBN2(STR_PAD_RIGHT);
-PHPBN2(STR_PAD_BOTH);
-PHPBN2(PATHINFO_DIRNAME);
-PHPBN2(PATHINFO_BASENAME);
-PHPBN2(PATHINFO_EXTENSION);
-PHPBN2(PATHINFO_FILENAME); // As of PHP 5.2
-PHPBN2(PATH_SEPARATOR);
-PHPBN2(CHAR_MAX);
-PHPBN2(LC_CTYPE);
-PHPBN2(LC_NUMERIC);
-PHPBN2(LC_TIME);
-PHPBN2(LC_COLLATE);
-PHPBN2(LC_MONETARY);
-PHPBN2(LC_ALL);
-PHPBN2(LC_MESSAGES);
-PHPBN2(ABDAY_1);
-PHPBN2(ABDAY_2);
-PHPBN2(ABDAY_3);
-PHPBN2(ABDAY_4);
-PHPBN2(ABDAY_5);
-PHPBN2(ABDAY_6);
-PHPBN2(ABDAY_7);
-PHPBN2(DAY_1);
-PHPBN2(DAY_2);
-PHPBN2(DAY_3);
-PHPBN2(DAY_4);
-PHPBN2(DAY_5);
-PHPBN2(DAY_6);
-PHPBN2(DAY_7);
-PHPBN2(ABMON_1);
-PHPBN2(ABMON_2);
-PHPBN2(ABMON_3);
-PHPBN2(ABMON_4);
-PHPBN2(ABMON_5);
-PHPBN2(ABMON_6);
-PHPBN2(ABMON_7);
-PHPBN2(ABMON_8);
-PHPBN2(ABMON_9);
-PHPBN2(ABMON_10);
-PHPBN2(ABMON_11);
-PHPBN2(ABMON_12);
-PHPBN2(MON_1);
-PHPBN2(MON_2);
-PHPBN2(MON_3);
-PHPBN2(MON_4);
-PHPBN2(MON_5);
-PHPBN2(MON_6);
-PHPBN2(MON_7);
-PHPBN2(MON_8);
-PHPBN2(MON_9);
-PHPBN2(MON_10);
-PHPBN2(MON_11);
-PHPBN2(MON_12);
-PHPBN2(AM_STR);
-PHPBN2(PM_STR);
-PHPBN2(D_T_FMT);
-PHPBN2(D_FMT);
-PHPBN2(T_FMT);
-PHPBN2(T_FMT_AMPM);
-PHPBN2(ERA);
-PHPBN2(ERA_YEAR);
-PHPBN2(ERA_D_T_FMT);
-PHPBN2(ERA_D_FMT);
-PHPBN2(ERA_T_FMT);
-PHPBN2(ALT_DIGITS);
-PHPBN2(INT_CURR_SYMBOL);
-PHPBN2(CURRENCY_SYMBOL);
-PHPBN2(CRNCYSTR);
-PHPBN2(MON_DECIMAL_POINT);
-PHPBN2(MON_THOUSANDS_SEP);
-PHPBN2(MON_GROUPING);
-PHPBN2(POSITIVE_SIGN);
-PHPBN2(NEGATIVE_SIGN);
-PHPBN2(INT_FRAC_DIGITS);
-PHPBN2(FRAC_DIGITS);
-PHPBN2(P_CS_PRECEDES);
-PHPBN2(P_SEP_BY_SPACE);
-PHPBN2(N_CS_PRECEDES);
-PHPBN2(N_SEP_BY_SPACE);
-PHPBN2(P_SIGN_POSN);
-PHPBN2(N_SIGN_POSN);
-PHPBN2(DECIMAL_POINT);
-PHPBN2(RADIXCHAR);
-PHPBN2(THOUSANDS_SEP);
-PHPBN2(THOUSEP);
-PHPBN2(GROUPING);
-PHPBN2(YESEXPR);
-PHPBN2(NOEXPR);
-PHPBN2(YESSTR);
-PHPBN2(NOSTR);
-PHPBN2(CODESET);
-PHPBN2(LOG_EMERG);
-PHPBN2(LOG_ALERT);
-PHPBN2(LOG_CRIT);
-PHPBN2(LOG_ERR);
-PHPBN2(LOG_WARNING);
-PHPBN2(LOG_NOTICE);
-PHPBN2(LOG_INFO);
-PHPBN2(LOG_DEBUG);
-PHPBN2(LOG_KERN);
-PHPBN2(LOG_USER);
-PHPBN2(LOG_MAIL);
-PHPBN2(LOG_DAEMON);
-PHPBN2(LOG_AUTH);
-PHPBN2(LOG_SYSLOG);
-PHPBN2(LOG_LPR);
-PHPBN2(LOG_NEWS);
-PHPBN2(LOG_UUCP);
-PHPBN2(LOG_CRON);
-PHPBN2(LOG_AUTHPRIV);
-PHPBN2(LOG_LOCAL0);
-PHPBN2(LOG_LOCAL1);
-PHPBN2(LOG_LOCAL2);
-PHPBN2(LOG_LOCAL3);
-PHPBN2(LOG_LOCAL4);
-PHPBN2(LOG_LOCAL5);
-PHPBN2(LOG_LOCAL6);
-PHPBN2(LOG_LOCAL7);
-PHPBN2(LOG_PID);
-PHPBN2(LOG_CONS);
-PHPBN2(LOG_ODELAY);
-PHPBN2(LOG_NDELAY);
-PHPBN2(LOG_NOWAIT);
-PHPBN2(LOG_PERROR);
-
-/* Added in PHP 5.2 */
-PHPBN2(PREG_BACKTRACK_LIMIT_ERROR);
-PHPBN2(PREG_BAD_UTF8_ERROR);
-PHPBN2(PREG_INTERNAL_ERROR);
-PHPBN2(PREG_NO_ERROR);
-PHPBN2(PREG_RECURSION_LIMIT_ERROR);
-PHPBN2(UPLOAD_ERR_EXTENSION);
-PHPBN2(STREAM_SHUT_RD);
-PHPBN2(STREAM_SHUT_WR);
-PHPBN2(STREAM_SHUT_RDWR);
-PHPBN2(CURLE_FILESIZE_EXCEEDED);
-PHPBN2(CURLE_FTP_SSL_FAILED);
-PHPBN2(CURLE_LDAP_INVALID_URL);
-PHPBN2(CURLFTPAUTH_DEFAULT);
-PHPBN2(CURLFTPAUTH_SSL);
-PHPBN2(CURLFTPAUTH_TLS);
-PHPBN2(CURLFTPSSL_ALL);
-PHPBN2(CURLFTPSSL_CONTROL);
-PHPBN2(CURLFTPSSL_NONE);
-PHPBN2(CURLFTPSSL_TRY);
-PHPBN2(CURLOPT_FTP_SSL);
-PHPBN2(CURLOPT_FTPSSLAUTH);
-PHPBN2(CURLOPT_TCP_NODELAY); // Added in PHP 5.2.1
-PHPBN2(CURLOPT_TIMEOUT_MS); // Added in PHP 5.2.3
-PHPBN2(CURLOPT_CONNECTTIMEOUT_MS); // Added in PHP 5.2.3
-PHPBN2(GMP_VERSION); // Added in PHP 5.2.2
-PHPBN2(SWFTEXTFIELD_USEFONT);
-PHPBN2(SWFTEXTFIELD_AUTOSIZE);
-PHPBN2(SWF_SOUND_NOT_COMPRESSED);
-PHPBN2(SWF_SOUND_ADPCM_COMPRESSED);
-PHPBN2(SWF_SOUND_MP3_COMPRESSED);
-PHPBN2(SWF_SOUND_NOT_COMPRESSED_LE);
-PHPBN2(SWF_SOUND_NELLY_COMPRESSED);
-PHPBN2(SWF_SOUND_5KHZ);
-PHPBN2(SWF_SOUND_11KHZ);
-PHPBN2(SWF_SOUND_22KHZ);
-PHPBN2(SWF_SOUND_44KHZ);
-PHPBN2(SWF_SOUND_8BITS);
-PHPBN2(SWF_SOUND_16BITS);
-PHPBN2(SWF_SOUND_MONO);
-PHPBN2(SWF_SOUND_STEREO);
-PHPBN2(OPENSSL_VERSION_NUMBER);
-PHPBN2(SNMP_OID_OUTPUT_FULL);
-PHPBN2(SNMP_OID_OUTPUT_NUMERIC);
-PHPBN2(MSG_EAGAIN);
-PHPBN2(MSG_ENOMSG);
-
-/* Added in PHP 5.3 */
-PHPBN2(CURLOPT_PROGRESSFUNCTION);
-PHPBN2(IMG_FILTER_PIXELATE);
-PHPBN2(JSON_ERROR_CTRL_CHAR);
-PHPBN2(JSON_ERROR_DEPTH);
-PHPBN2(JSON_ERROR_NONE);
-PHPBN2(JSON_ERROR_STATE_MISMATCH);
-PHPBN2(JSON_ERROR_SYNTAX);
-PHPBN2(JSON_FORCE_OBJECT);
-PHPBN2(JSON_HEX_TAG);
-PHPBN2(JSON_HEX_AMP);
-PHPBN2(JSON_HEX_APOS);
-PHPBN2(JSON_HEX_QUOT);
-PHPBN2(LDAP_OPT_NETWORK_TIMEOUT);
-PHPBN2(LIBXML_LOADED_VERSION);
-PHPBN2(PREG_BAD_UTF8_OFFSET_ERROR);
-PHPBN2(BUS_ADRALN);
-PHPBN2(BUS_ADRERR);
-PHPBN2(BUS_OBJERR);
-PHPBN2(CLD_CONTIUNED);
-PHPBN2(CLD_DUMPED);
-PHPBN2(CLD_EXITED);
-PHPBN2(CLD_KILLED);
-PHPBN2(CLD_STOPPED);
-PHPBN2(CLD_TRAPPED);
-PHPBN2(FPE_FLTDIV);
-PHPBN2(FPE_FLTINV);
-PHPBN2(FPE_FLTOVF);
-PHPBN2(FPE_FLTRES);
-PHPBN2(FPE_FLTSUB);
-PHPBN2(FPE_FLTUND);
-PHPBN2(FPE_INTDIV);
-PHPBN2(FPE_INTOVF);
-PHPBN2(ILL_BADSTK);
-PHPBN2(ILL_COPROC);
-PHPBN2(ILL_ILLADR);
-PHPBN2(ILL_ILLOPC);
-PHPBN2(ILL_ILLOPN);
-PHPBN2(ILL_ILLTRP);
-PHPBN2(ILL_PRVOPC);
-PHPBN2(ILL_PRVREG);
-PHPBN2(POLL_ERR);
-PHPBN2(POLL_HUP);
-PHPBN2(POLL_IN);
-PHPBN2(POLL_MSG);
-PHPBN2(POLL_OUT);
-PHPBN2(POLL_PRI);
-PHPBN2(SEGV_ACCERR);
-PHPBN2(SEGV_MAPERR);
-PHPBN2(SI_ASYNCIO);
-PHPBN2(SI_KERNEL);
-PHPBN2(SI_MESGQ);
-PHPBN2(SI_NOINFO);
-PHPBN2(SI_QUEUE);
-PHPBN2(SI_SIGIO);
-PHPBN2(SI_TIMER);
-PHPBN2(SI_TKILL);
-PHPBN2(SI_USER);
-PHPBN2(SIG_BLOCK);
-PHPBN2(SIG_SETMASK);
-PHPBN2(SIG_UNBLOCK);
-PHPBN2(TRAP_BRKPT);
-PHPBN2(TRAP_TRACE);
-
-/* Added in PHP 5.4 */
-PHPBN2(ENT_DISALLOWED);
-PHPBN2(ENT_HTML401);
-PHPBN2(ENT_HTML5);
-PHPBN2(ENT_SUBSTITUTE);
-PHPBN2(ENT_XML1);
-PHPBN2(ENT_XHTML);
-PHPBN2(IPPROTO_IP);
-PHPBN2(IPPROTO_IPV6);
-PHPBN2(IPV6_MULTICAST_HOPS);
-PHPBN2(IPV6_MULTICAST_IF);
-PHPBN2(IPV6_MULTICAST_LOOP);
-PHPBN2(IP_MULTICAST_IF);
-PHPBN2(IP_MULTICAST_LOOP);
-PHPBN2(IP_MULTICAST_TTL);
-PHPBN2(MCAST_JOIN_GROUP);
-PHPBN2(MCAST_LEAVE_GROUP);
-PHPBN2(MCAST_BLOCK_SOURCE);
-PHPBN2(MCAST_UNBLOCK_SOURCE);
-PHPBN2(MCAST_JOIN_SOURCE_GROUP);
-PHPBN2(MCAST_LEAVE_SOURCE_GROUP);
-PHPBN2(CURLOPT_MAX_RECV_SPEED_LARGE);
-PHPBN2(CURLOPT_MAX_SEND_SPEED_LARGE);
-PHPBN2(LIBXML_HTML_NODEFDTD);
-PHPBN2(LIBXML_HTML_NOIMPLIED);
-PHPBN2(LIBXML_PEDANTIC);
-PHPBN2(OPENSSL_CIPHER_AES_128_CBC);
-PHPBN2(OPENSSL_CIPHER_AES_192_CBC);
-PHPBN2(OPENSSL_CIPHER_AES_256_CBC);
-PHPBN2(OPENSSL_RAW_DATA);
-PHPBN2(OPENSSL_ZERO_PADDING);
-PHPBN2(PHP_OUTPUT_HANDLER_CLEAN);
-PHPBN2(PHP_OUTPUT_HANDLER_CLEANABLE);
-PHPBN2(PHP_OUTPUT_HANDLER_DISABLED);
-PHPBN2(PHP_OUTPUT_HANDLER_FINAL);
-PHPBN2(PHP_OUTPUT_HANDLER_FLUSH);
-PHPBN2(PHP_OUTPUT_HANDLER_FLUSHABLE);
-PHPBN2(PHP_OUTPUT_HANDLER_REMOVABLE);
-PHPBN2(PHP_OUTPUT_HANDLER_STARTED);
-PHPBN2(PHP_OUTPUT_HANDLER_STDFLAGS);
-PHPBN2(PHP_OUTPUT_HANDLER_WRITE);
-PHPBN2(PHP_SESSION_ACTIVE);
-PHPBN2(PHP_SESSION_DISABLED);
-PHPBN2(PHP_SESSION_NONE);
-PHPBN2(STREAM_META_ACCESS);
-PHPBN2(STREAM_META_GROUP);
-PHPBN2(STREAM_META_GROUP_NAME);
-PHPBN2(STREAM_META_OWNER);
-PHPBN2(STREAM_META_OWNER_NAME);
-PHPBN2(STREAM_META_TOUCH);
-PHPBN2(ZLIB_ENCODING_DEFLATE);
-PHPBN2(ZLIB_ENCODING_GZIP);
-PHPBN2(ZLIB_ENCODING_RAW);
-PHPBN2(U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR);
-PHPBN2(IDNA_CHECK_BIDI);
-PHPBN2(IDNA_CHECK_CONTEXTJ);
-PHPBN2(IDNA_NONTRANSITIONAL_TO_ASCII);
-PHPBN2(IDNA_NONTRANSITIONAL_TO_UNICODE);
-PHPBN2(INTL_IDNA_VARIANT_2003);
-PHPBN2(INTL_IDNA_VARIANT_UTS46);
-PHPBN2(IDNA_ERROR_EMPTY_LABEL);
-PHPBN2(IDNA_ERROR_LABEL_TOO_LONG);
-PHPBN2(IDNA_ERROR_DOMAIN_NAME_TOO_LONG);
-PHPBN2(IDNA_ERROR_LEADING_HYPHEN);
-PHPBN2(IDNA_ERROR_TRAILING_HYPHEN);
-PHPBN2(IDNA_ERROR_HYPHEN_3_4);
-PHPBN2(IDNA_ERROR_LEADING_COMBINING_MARK);
-PHPBN2(IDNA_ERROR_DISALLOWED);
-PHPBN2(IDNA_ERROR_PUNYCODE);
-PHPBN2(IDNA_ERROR_LABEL_HAS_DOT);
-PHPBN2(IDNA_ERROR_INVALID_ACE_LABEL);
-PHPBN2(IDNA_ERROR_BIDI);
-PHPBN2(IDNA_ERROR_CONTEXTJ);
-PHPBN2(JSON_PRETTY_PRINT);
-PHPBN2(JSON_UNESCAPED_SLASHES);
-PHPBN2(JSON_NUMERIC_CHECK);
-PHPBN2(JSON_UNESCAPED_UNICODE);
-PHPBN2(JSON_BIGINT_AS_STRING);
-
-/* Added in PHP 5.5 */
-PHPBN2(IMG_AFFINE_TRANSLATE);
-PHPBN2(IMG_AFFINE_SCALE);
-PHPBN2(IMG_AFFINE_ROTATE);
-PHPBN2(IMG_AFFINE_SHEAR_HORIZONTAL);
-PHPBN2(IMG_AFFINE_SHEAR_VERTICAL);
-PHPBN2(IMG_CROP_DEFAULT);
-PHPBN2(IMG_CROP_TRANSPARENT);
-PHPBN2(IMG_CROP_BLACK);
-PHPBN2(IMG_CROP_WHITE);
-PHPBN2(IMG_CROP_SIDES);
-PHPBN2(IMG_FLIP_BOTH);
-PHPBN2(IMG_FLIP_HORIZONTAL);
-PHPBN2(IMG_FLIP_VERTICAL);
-PHPBN2(IMG_BELL);
-PHPBN2(IMG_BESSEL);
-PHPBN2(IMG_BICUBIC);
-PHPBN2(IMG_BICUBIC_FIXED);
-PHPBN2(IMG_BLACKMAN);
-PHPBN2(IMG_BOX);
-PHPBN2(IMG_BSPLINE);
-PHPBN2(IMG_CATMULLROM);
-PHPBN2(IMG_GAUSSIAN);
-PHPBN2(IMG_GENERALIZED_CUBIC);
-PHPBN2(IMG_HERMITE);
-PHPBN2(IMG_HAMMING);
-PHPBN2(IMG_HANNING);
-PHPBN2(IMG_MITCHELL);
-PHPBN2(IMG_POWER);
-PHPBN2(IMG_QUADRATIC);
-PHPBN2(IMG_SINC);
-PHPBN2(IMG_NEAREST_NEIGHBOUR);
-PHPBN2(IMG_WEIGHTED4);
-PHPBN2(IMG_TRIANGLE);
-PHPBN2(JSON_ERROR_RECURSION);
-PHPBN2(JSON_ERROR_INF_OR_NAN);
-PHPBN2(JSON_ERROR_UNSUPPORTED_TYPE);
-PHPBN2(MYSQLI_SERVER_PUBLIC_KEY);
-
-/* Added in PHP 5.6 */
-PHPBN2(LDAP_ESCAPE_DN);
-PHPBN2(LDAP_ESCAPE_FILTER);
-PHPBN2(OPENSSL_DEFAULT_STREAM_CIPHERS);
-PHPBN2(STREAM_CRYPTO_METHOD_ANY_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_ANY_SERVER);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_0_SERVER);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_1_SERVER);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_2_SERVER);
-PHPBN2(PGSQL_CONNECT_ASYNC);
-PHPBN2(PGSQL_CONNECTION_AUTH_OK);
-PHPBN2(PGSQL_CONNECTION_AWAITING_RESPONSE);
-PHPBN2(PGSQL_CONNECTION_MADE);
-PHPBN2(PGSQL_CONNECTION_SETENV);
-PHPBN2(PGSQL_CONNECTION_SSL_STARTUP);
-PHPBN2(PGSQL_CONNECTION_STARTED);
-PHPBN2(PGSQL_DML_ESCAPE);
-PHPBN2(PGSQL_POLLING_ACTIVE);
-PHPBN2(PGSQL_POLLING_FAILED);
-PHPBN2(PGSQL_POLLING_OK);
-PHPBN2(PGSQL_POLLING_READING);
-PHPBN2(PGSQL_POLLING_WRITING);
-
-/* Class names reserved by PHP (case insensitive) */
-PHPCN(directory);
-PHPCN(stdclass);
-PHPCN(__php_incomplete_class);
-/* Added in PHP5. */
-PHPCN(exception);
-PHPCN(errorexception); // As of PHP 5.1
-PHPCN(php_user_filter);
-PHPCN(closure); // As of PHP 5.3
-PHPCN(generator); // As of PHP 5.5
-PHPCN(self);
-PHPCN(static);
-PHPCN(parent);
-/* http://php.net/manual/en/migration70.incompatible.php#migration70.incompatible.other.classes */
-PHPCN(bool); // As of PHP 7.0
-PHPCN(int); // As of PHP 7.0
-PHPCN(float); // As of PHP 7.0
-PHPCN(string); // As of PHP 7.0
-PHPCN(NULL); // As of PHP 7.0
-PHPCN(TRUE); // As of PHP 7.0
-PHPCN(FALSE); // As of PHP 7.0
-PHPCN(resource); // As of PHP 7.0 (currently works but reserved)
-PHPCN(object); // As of PHP 7.0 (currently works but reserved)
-PHPCN(mixed); // As of PHP 7.0 (currently works but reserved)
-PHPCN(numeric); // As of PHP 7.0 (currently works but reserved)
-/* http://php.net/manual/en/migration71.incompatible.php#migration71.incompatible.invalid-class-names */
-PHPCN(iterable); // As of PHP 7.1
-PHPCN(void); // As of PHP 7.1
-/* From extensions (which of these are actually predefined depends which
- * extensions are loaded by default). */
-PHPCN(xmlwriter);
-PHPCN(libxmlerror);
-PHPCN(simplexmlelement);
-PHPCN(soapclient);
-PHPCN(soapvar);
-PHPCN(soapserver);
-PHPCN(soapfault);
-PHPCN(soapparam);
-PHPCN(soapheader);
-PHPCN(recursiveiteratoriterator);
-PHPCN(filteriterator);
-PHPCN(recursivefilteriterator);
-PHPCN(parentiterator);
-PHPCN(limititerator);
-PHPCN(cachingiterator);
-PHPCN(recursivecachingiterator);
-PHPCN(iteratoriterator);
-PHPCN(norewinditerator);
-PHPCN(appenditerator);
-PHPCN(infiniteiterator);
-PHPCN(emptyiterator);
-PHPCN(arrayobject);
-PHPCN(arrayiterator);
-PHPCN(recursivearrayiterator);
-PHPCN(splfileinfo);
-PHPCN(directoryiterator);
-PHPCN(recursivedirectoryiterator);
-PHPCN(splfileobject);
-PHPCN(spltempfileobject);
-PHPCN(simplexmliterator);
-PHPCN(logicexception);
-PHPCN(badfunctioncallexception);
-PHPCN(badmethodcallexception);
-PHPCN(domainexception);
-PHPCN(invalidargumentexception);
-PHPCN(lengthexception);
-PHPCN(outofrangeexception);
-PHPCN(runtimeexception);
-PHPCN(outofboundsexception);
-PHPCN(overflowexception);
-PHPCN(rangeexception);
-PHPCN(underflowexception);
-PHPCN(unexpectedvalueexception);
-PHPCN(splobjectstorage);
-PHPCN(reflectionexception);
-PHPCN(reflection);
-PHPCN(reflectionfunction);
-PHPCN(reflectionparameter);
-PHPCN(reflectionmethod);
-PHPCN(reflectionclass);
-PHPCN(reflectionobject);
-PHPCN(reflectionproperty);
-PHPCN(reflectionextension);
-PHPCN(domexception);
-PHPCN(domstringlist);
-PHPCN(domnamelist);
-PHPCN(domimplementationlist);
-PHPCN(domimplementationsource);
-PHPCN(domimplementation);
-PHPCN(domnode);
-PHPCN(domnamespacenode);
-PHPCN(domdocumentfragment);
-PHPCN(domdocument);
-PHPCN(domnodelist);
-PHPCN(domnamednodemap);
-PHPCN(domcharacterdata);
-PHPCN(domattr);
-PHPCN(domelement);
-PHPCN(domtext);
-PHPCN(domcomment);
-PHPCN(domtypeinfo);
-PHPCN(domuserdatahandler);
-PHPCN(domdomerror);
-PHPCN(domerrorhandler);
-PHPCN(domlocator);
-PHPCN(domconfiguration);
-PHPCN(domcdatasection);
-PHPCN(domdocumenttype);
-PHPCN(domnotation);
-PHPCN(domentity);
-PHPCN(domentityreference);
-PHPCN(domprocessinginstruction);
-PHPCN(domstringextend);
-PHPCN(domxpath);
-PHPCN(xmlreader);
-PHPCN(sqlitedatabase);
-PHPCN(sqliteresult);
-PHPCN(sqliteunbuffered);
-PHPCN(sqliteexception);
-PHPCN(datetime);
-
-/* Built-in PHP functions (incomplete). */
-/* Includes Array Functions - http://php.net/manual/en/ref.array.php */
-/* Check is case insensitive - these *MUST* be listed in lower case here */
-PHPFN(acos);
-PHPFN(array_change_key_case);
-PHPFN(array_chunk);
-PHPFN(array_column);
-PHPFN(array_combine);
-PHPFN(array_count_values);
-PHPFN(array_diff);
-PHPFN(array_diff_assoc);
-PHPFN(array_diff_key);
-PHPFN(array_diff_uassoc);
-PHPFN(array_diff_ukey);
-PHPFN(array_fill);
-PHPFN(array_fill_keys);
-PHPFN(array_filter);
-PHPFN(array_flip);
-PHPFN(array_intersect);
-PHPFN(array_intersect_assoc);
-PHPFN(array_intersect_key);
-PHPFN(array_intersect_uassoc);
-PHPFN(array_intersect_ukey);
-PHPFN(array_key_exists);
-PHPFN(array_keys);
-PHPFN(array_map);
-PHPFN(array_merge);
-PHPFN(array_merge_recursive);
-PHPFN(array_multisort);
-PHPFN(array_pad);
-PHPFN(array_pop);
-PHPFN(array_product);
-PHPFN(array_push);
-PHPFN(array_rand);
-PHPFN(array_reduce);
-PHPFN(array_replace);
-PHPFN(array_replace_recursive);
-PHPFN(array_reverse);
-PHPFN(array_search);
-PHPFN(array_shift);
-PHPFN(array_slice);
-PHPFN(array_splice);
-PHPFN(array_sum);
-PHPFN(array_udiff);
-PHPFN(array_udiff_assoc);
-PHPFN(array_udiff_uassoc);
-PHPFN(array_uintersect);
-PHPFN(array_uintersect_assoc);
-PHPFN(array_uintersect_uassoc);
-PHPFN(array_unique);
-PHPFN(array_unshift);
-PHPFN(array_values);
-PHPFN(array_walk);
-PHPFN(array_walk_recursive);
-PHPFN(arsort);
-PHPFN(asin);
-PHPFN(asort);
-PHPFN(atan);
-PHPFN(atan2);
-PHPFN(ceil);
-PHPFN(compact);
-PHPFN(cos);
-PHPFN(cosh);
-PHPFN(count);
-PHPFN(current);
-PHPFN(each);
-PHPFN(end);
-PHPFN(exp);
-PHPFN(extract);
-PHPFN(floor);
-PHPFN(fmod);
-PHPFN(in_array);
-PHPFN(key);
-PHPFN(key_exists);
-PHPFN(krsort);
-PHPFN(ksort);
-PHPFN(log);
-PHPFN(log10);
-PHPFN(max);
-PHPFN(min);
-PHPFN(natcasesort);
-PHPFN(natsort);
-PHPFN(next);
-PHPFN(pos);
-PHPFN(pow);
-PHPFN(prev);
-PHPFN(range);
-PHPFN(reset);
-PHPFN(rsort);
-PHPFN(shuffle);
-PHPFN(sin);
-PHPFN(sinh);
-PHPFN(sizeof);
-PHPFN(sort);
-PHPFN(sqrt);
-PHPFN(tan);
-PHPFN(tanh);
-PHPFN(uasort);
-PHPFN(uksort);
-PHPFN(usort);
-
-#undef PHPKW
-#undef PHPBN1a
-#undef PHPBN1b
-#undef PHPBN1
-#undef PHPBN2a
-#undef PHPBN2b
-#undef PHPBN2
-#undef PHPCN
-#undef PHPFN
diff --git a/dependencies2013/win32/swig/Lib/php/phppointers.i b/dependencies2013/win32/swig/Lib/php/phppointers.i
deleted file mode 100644
index d79697b5..00000000
--- a/dependencies2013/win32/swig/Lib/php/phppointers.i
+++ /dev/null
@@ -1,46 +0,0 @@
-%define %pass_by_ref( TYPE, CONVERT_IN, CONVERT_OUT )
-%typemap(in, byref=1) TYPE *REF ($*1_ltype tmp),
-             TYPE &REF ($*1_ltype tmp)
-%{
-  /* First Check for SWIG wrapped type */
-  if (Z_ISNULL($input)) {
-      $1 = 0;
-  } else if (Z_ISREF($input)) {
-      /* Not swig wrapped type, so we check if it's a PHP reference type */
-      CONVERT_IN(tmp, $*1_ltype, $input);
-      $1 = &tmp;
-  } else {
-      SWIG_PHP_Error(E_ERROR, SWIG_PHP_Arg_Error_Msg($argnum, Expected a reference));
-  }
-%}
-%typemap(argout) TYPE *REF,
-                 TYPE &REF
-%{
-  if (Z_ISREF($input)) {
-    CONVERT_OUT(Z_REFVAL($input), tmp$argnum);
-  }
-%}
-%enddef
-
-%pass_by_ref( size_t, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed int, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( int, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( unsigned int, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed short, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( short, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( unsigned short, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed long, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( long, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( unsigned long, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed char, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( char, CONVERT_CHAR_IN, ZVAL_STRING );
-%pass_by_ref( unsigned char, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( float, CONVERT_FLOAT_IN, ZVAL_DOUBLE );
-%pass_by_ref( double, CONVERT_FLOAT_IN, ZVAL_DOUBLE );
-
-%pass_by_ref( char *, CONVERT_CHAR_IN, ZVAL_STRING );
diff --git a/dependencies2013/win32/swig/Lib/php/phprun.swg b/dependencies2013/win32/swig/Lib/php/phprun.swg
deleted file mode 100644
index 5c62d192..00000000
--- a/dependencies2013/win32/swig/Lib/php/phprun.swg
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -----------------------------------------------------------------------------
- * phprun.swg
- *
- * PHP runtime library
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_exceptions.h"
-#include "php.h"
-
-#if PHP_MAJOR_VERSION != 7
-# error These bindings need PHP7 - to generate PHP5 bindings use: swig -php5
-#endif
-
-#include "ext/standard/php_string.h"
-#include <stdlib.h> /* for abort(), used in generated code. */
-
-/* This indirection is to work around const correctness issues in older PHP.
- * FIXME: Remove for PHP7?  Or might user code be using it? */
-#define SWIG_ZEND_NAMED_FE(ZN, N, A) ZEND_NAMED_FE(ZN, N, A)
-
-#define SWIG_BOOL_CONSTANT(N, V) REGISTER_BOOL_CONSTANT(#N, V, CONST_CS | CONST_PERSISTENT)
-#define SWIG_LONG_CONSTANT(N, V) REGISTER_LONG_CONSTANT(#N, V, CONST_CS | CONST_PERSISTENT)
-#define SWIG_DOUBLE_CONSTANT(N, V) REGISTER_DOUBLE_CONSTANT(#N, V, CONST_CS | CONST_PERSISTENT)
-#define SWIG_STRING_CONSTANT(N, V) REGISTER_STRING_CONSTANT(#N, (char*)V, CONST_CS | CONST_PERSISTENT)
-#define SWIG_CHAR_CONSTANT(N, V) do {\
-    char swig_char = (V);\
-    REGISTER_STRINGL_CONSTANT(#N, &swig_char, 1, CONST_CS | CONST_PERSISTENT);\
-} while (0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#define SWIG_fail goto fail
-
-static const char *default_error_msg = "Unknown error occurred";
-static int default_error_code = E_ERROR;
-
-#define SWIG_PHP_Arg_Error_Msg(argnum,extramsg) "Error in argument " #argnum " "#extramsg
-
-#define SWIG_PHP_Error(code,msg) do { SWIG_ErrorCode() = code; SWIG_ErrorMsg() = msg; SWIG_fail; } while (0)
-
-#define SWIG_contract_assert(expr,msg) \
-  if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else
-
-/* Standard SWIG API */
-#define SWIG_GetModule(clientdata) SWIG_Php_GetModule()
-#define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer)
-
-/* used to wrap returned objects in so we know whether they are newobject
-   and need freeing, or not */
-typedef struct {
-  void * ptr;
-  int newobject;
-} swig_object_wrapper;
-
-#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a))
-
-static void
-SWIG_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject) {
-  /*
-   * First test for Null pointers.  Return those as PHP native NULL
-   */
-  if (!ptr ) {
-    ZVAL_NULL(z);
-    return;
-  }
-  if (type->clientdata) {
-    swig_object_wrapper *value;
-    if (! (*(int *)(type->clientdata)))
-      zend_error(E_ERROR, "Type: %s failed to register with zend",type->name);
-    value=(swig_object_wrapper *)emalloc(sizeof(swig_object_wrapper));
-    value->ptr=ptr;
-    value->newobject=(newobject & 1);
-    if ((newobject & 2) == 0) {
-      /* Just register the pointer as a resource. */
-      ZVAL_RES(z, zend_register_resource(value, *(int *)(type->clientdata)));
-    } else {
-      /*
-       * Wrap the resource in an object, the resource will be accessible
-       * via the "_cPtr" member. This is currently only used by
-       * directorin typemaps.
-       */
-      zval resource;
-      zend_class_entry *ce = NULL;
-      const char *type_name = type->name+3; /* +3 so: _p_Foo -> Foo */
-      size_t type_name_len;
-      const char * p;
-      HashTable * ht;
-
-      /* Namespace__Foo -> Foo */
-      /* FIXME: ugly and goes wrong for classes with __ in their names. */
-      while ((p = strstr(type_name, "__")) != NULL) {
-        type_name = p + 2;
-      }
-      type_name_len = strlen(type_name);
-
-      ZVAL_RES(&resource, zend_register_resource(value, *(int *)(type->clientdata)));
-      if (SWIG_PREFIX_LEN > 0) {
-        zend_string * classname = zend_string_alloc(SWIG_PREFIX_LEN + type_name_len, 0);
-        memcpy(classname->val, SWIG_PREFIX, SWIG_PREFIX_LEN);
-        memcpy(classname->val + SWIG_PREFIX_LEN, type_name, type_name_len);
-        ce = zend_lookup_class(classname);
-        zend_string_release(classname);
-      } else {
-        zend_string * classname = zend_string_init(type_name, type_name_len, 0);
-        ce = zend_lookup_class(classname);
-        zend_string_release(classname);
-      }
-      if (ce == NULL) {
-        /* class does not exist */
-        ce = zend_standard_class_def;
-      }
-
-      ALLOC_HASHTABLE(ht);
-      zend_hash_init(ht, 1, NULL, NULL, 0);
-      zend_hash_str_update(ht, "_cPtr", sizeof("_cPtr") - 1, &resource);
-      object_and_properties_init(z, ce, ht);
-    }
-    return;
-  }
-  zend_error(E_ERROR, "Type: %s not registered with zend",type->name);
-}
-
-/* This pointer conversion routine takes the native pointer p (along with
-   its type name) and converts it by calling appropriate casting functions
-   according to ty.  The resultant pointer is returned, or NULL is returned
-   if the pointer can't be cast.
-
-   Sadly PHP has no API to find a type name from a type id, only from an
-   instance of a resource of the type id, so we have to pass type_name as well.
-
-   The two functions which might call this are:
-   SWIG_ConvertResourcePtr which gets the type name from the resource
-   and the registered zend destructors for which we have one per type each
-   with the type name hard wired in. */
-static void *
-SWIG_ConvertResourceData(void * p, const char *type_name, swig_type_info *ty) {
-  swig_cast_info *tc;
-  void *result = 0;
-
-  if (!ty) {
-    /* They don't care about the target type, so just pass on the pointer! */
-    return p;
-  }
-
-  if (! type_name) {  
-    /* can't convert p to ptr type ty if we don't know what type p is */
-    return NULL;
-  }
-
-  /* convert and cast p from type_name to ptr as ty. */
-  tc = SWIG_TypeCheck(type_name, ty);
-  if (tc) {
-    int newmemory = 0;
-    result = SWIG_TypeCast(tc, p, &newmemory);
-    assert(!newmemory); /* newmemory handling not yet implemented */
-  }
-  return result;
-}
-
-/* This function returns a pointer of type ty by extracting the pointer
-   and type info from the resource in z.  z must be a resource.
-   If it fails, NULL is returned.
-   It uses SWIG_ConvertResourceData to do the real work. */
-static void *
-SWIG_ConvertResourcePtr(zval *z, swig_type_info *ty, int flags) {
-  swig_object_wrapper *value;
-  void *p;
-  const char *type_name;
-
-  if (Z_RES_TYPE_P(z) == -1) return NULL;
-  value = (swig_object_wrapper *) Z_RES_VAL_P(z);
-  if (flags & SWIG_POINTER_DISOWN) {
-    value->newobject = 0;
-  }
-  p = value->ptr;
-
-  type_name=zend_rsrc_list_get_rsrc_type(Z_RES_P(z));
-
-  return SWIG_ConvertResourceData(p, type_name, ty);
-}
-
-/* We allow passing of a RESOURCE pointing to the object or an OBJECT whose
-   _cPtr is a resource pointing to the object */
-static int
-SWIG_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags) {
-  if (z == NULL) {
-    *ptr = 0;
-    return 0;
-  }
-
-  switch (Z_TYPE_P(z)) {
-    case IS_OBJECT: {
-      HashTable * ht = Z_OBJ_HT_P(z)->get_properties(z);
-      if (ht) {
-        zval * _cPtr = zend_hash_str_find(ht, "_cPtr", sizeof("_cPtr") - 1);
-        if (_cPtr) {
-          if (Z_TYPE_P(_cPtr) == IS_INDIRECT) {
-            _cPtr = Z_INDIRECT_P(_cPtr);
-          }
-          if (Z_TYPE_P(_cPtr) == IS_RESOURCE) {
-            *ptr = SWIG_ConvertResourcePtr(_cPtr, ty, flags);
-            return (*ptr == NULL ? -1 : 0);
-          }
-        }
-      }
-      break;
-    }
-    case IS_RESOURCE:
-      *ptr = SWIG_ConvertResourcePtr(z, ty, flags);
-      return (*ptr == NULL ? -1 : 0);
-    case IS_NULL:
-      *ptr = 0;
-      return 0;
-  }
-
-  return -1;
-}
-
-static char const_name[] = "swig_runtime_data_type_pointer";
-static swig_module_info *SWIG_Php_GetModule() {
-  zval *pointer = zend_get_constant_str(const_name, sizeof(const_name) - 1);
-  if (pointer) {
-    if (Z_TYPE_P(pointer) == IS_LONG) {
-      return (swig_module_info *) pointer->value.lval;
-    }
-  } 
-  return NULL;
-}
-
-static void SWIG_Php_SetModule(swig_module_info *pointer) {
-  REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, CONST_PERSISTENT | CONST_CS);
-}
diff --git a/dependencies2013/win32/swig/Lib/php/std_common.i b/dependencies2013/win32/swig/Lib/php/std_common.i
deleted file mode 100644
index 092bf012..00000000
--- a/dependencies2013/win32/swig/Lib/php/std_common.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%apply size_t { std::size_t };
-
diff --git a/dependencies2013/win32/swig/Lib/php/std_deque.i b/dependencies2013/win32/swig/Lib/php/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/php/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/php/std_map.i b/dependencies2013/win32/swig/Lib/php/std_map.i
deleted file mode 100644
index 6d5e3db1..00000000
--- a/dependencies2013/win32/swig/Lib/php/std_map.i
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            bool is_empty() const {
-                return self->empty();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/php/std_pair.i b/dependencies2013/win32/swig/Lib/php/std_pair.i
deleted file mode 100644
index fe45ee67..00000000
--- a/dependencies2013/win32/swig/Lib/php/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/php/std_string.i b/dependencies2013/win32/swig/Lib/php/std_string.i
deleted file mode 100644
index b55751f0..00000000
--- a/dependencies2013/win32/swig/Lib/php/std_string.i
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string types
- * ----------------------------------------------------------------------------- */
-
-// ------------------------------------------------------------------------
-// std::string is typemapped by value
-// This can prevent exporting methods which return a string
-// in order for the user to modify it.
-// However, I think I'll wait until someone asks for it...
-// ------------------------------------------------------------------------
-
-%include <exception.i>
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-    %naturalvar string;
-
-    class string;
-
-    %typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) string, const string& %{
-        $1 = (Z_TYPE($input) == IS_STRING) ? 1 : 0;
-    %}
-
-    %typemap(in) string %{
-        convert_to_string(&$input);
-        $1.assign(Z_STRVAL($input), Z_STRLEN($input));
-    %}
-
-    %typemap(directorout) string %{
-      if (!EG(exception)) {
-        convert_to_string($input);
-        $result.assign(Z_STRVAL_P($input), Z_STRLEN_P($input));
-      }
-    %}
-
-    %typemap(out) string %{
-        ZVAL_STRINGL($result, $1.data(), $1.size());
-    %}
-
-    %typemap(directorin) string, const string& %{
-        ZVAL_STRINGL($input, $1.data(), $1.size());
-    %}
-
-    %typemap(out) const string & %{
-        ZVAL_STRINGL($result, $1->data(), $1->size());
-    %}
-
-    %typemap(throws) string, const string& %{
-        zend_throw_exception(NULL, $1.c_str(), 0);
-        return;
-    %}
-
-    %typemap(in) const string & ($*1_ltype temp) %{
-        convert_to_string(&$input);
-        temp.assign(Z_STRVAL($input), Z_STRLEN($input));
-        $1 = &temp;
-    %}
-
-    /* These next two handle a function which takes a non-const reference to
-     * a std::string and modifies the string. */
-    %typemap(in,byref=1) string & ($*1_ltype temp) %{
-        {
-          zval * p = Z_ISREF($input) ? Z_REFVAL($input) : &$input;
-          convert_to_string(p);
-          temp.assign(Z_STRVAL_P(p), Z_STRLEN_P(p));
-          $1 = &temp;
-        }
-    %}
-
-    %typemap(directorout) string & ($*1_ltype *temp) %{
-      if (!EG(exception)) {
-        convert_to_string($input);
-        temp = new $*1_ltype(Z_STRVAL_P($input), Z_STRLEN_P($input));
-        swig_acquire_ownership(temp);
-        $result = temp;
-      }
-    %}
-
-    %typemap(argout) string & %{
-      if (Z_ISREF($input)) {
-        ZVAL_STRINGL(Z_REFVAL($input), $1->data(), $1->size());
-      }
-    %}
-
-    /* SWIG will apply the non-const typemap above to const string& without
-     * this more specific typemap. */
-    %typemap(argout) const string & "";
-}
diff --git a/dependencies2013/win32/swig/Lib/php/std_vector.i b/dependencies2013/win32/swig/Lib/php/std_vector.i
deleted file mode 100644
index 9cc1486e..00000000
--- a/dependencies2013/win32/swig/Lib/php/std_vector.i
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-
-  template<class T> class vector {
-  public:
-    typedef size_t size_type;
-    typedef T value_type;
-    typedef const value_type& const_reference;
-    vector();
-    vector(size_type n);
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n);
-    void clear();
-    %rename(push) push_back;
-    void push_back(const value_type& x);
-    %extend {
-      bool is_empty() const {
-        return $self->empty();
-      }
-      T pop() throw (std::out_of_range) {
-        if (self->size() == 0)
-          throw std::out_of_range("pop from empty vector");
-        T x = self->back();
-        self->pop_back();
-        return x;
-      }
-      const_reference get(int i) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          return (*self)[i];
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-      void set(int i, const value_type& val) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          (*self)[i] = val;
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-    }
-  };
-
-  // bool specialization
-  template<> class vector<bool> {
-  public:
-    typedef size_t size_type;
-    typedef bool value_type;
-    typedef bool const_reference;
-    vector();
-    vector(size_type n);
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n);
-    void clear();
-    %rename(push) push_back;
-    void push_back(const value_type& x);
-    %extend {
-      bool is_empty() const {
-        return $self->empty();
-      }
-      bool pop() throw (std::out_of_range) {
-        if (self->size() == 0)
-          throw std::out_of_range("pop from empty vector");
-        bool x = self->back();
-        self->pop_back();
-        return x;
-      }
-      bool get(int i) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          return (*self)[i];
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-      void set(int i, const value_type& val) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          (*self)[i] = val;
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-    }
-  };
-}
-
-%define specialize_std_vector(T)
-#warning "specialize_std_vector - specialization for type T no longer needed"
-%enddef
-
-
diff --git a/dependencies2013/win32/swig/Lib/php/stl.i b/dependencies2013/win32/swig/Lib/php/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/php/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/php/typemaps.i b/dependencies2013/win32/swig/Lib/php/typemaps.i
deleted file mode 100644
index c248a588..00000000
--- a/dependencies2013/win32/swig/Lib/php/typemaps.i
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i.
- *
- * SWIG Typemap library for PHP.
- *
- * This library provides standard typemaps for modifying SWIG's behavior.
- * With enough entries in this file, I hope that very few people actually
- * ever need to write a typemap.
- *
- * Define macros to define the following typemaps:
- *
- * TYPE *INPUT.   Argument is passed in as native variable by value.
- * TYPE *OUTPUT.  Argument is returned as an array from the function call.
- * TYPE *INOUT.   Argument is passed in by value, and out as part of returned list
- * TYPE *REFERENCE.  Argument is passed in as native variable with value
- *                   semantics.  Variable value is changed with result.
- *                   Use like this:
- *                   int foo(int *REFERENCE);
- *
- *                   $a = 0;
- *                   $rc = foo($a);
- *
- *                   Even though $a looks like it's passed by value,
- *                   its value can be changed by foo().
- * ----------------------------------------------------------------------------- */
-
-%define BOOL_TYPEMAP(TYPE)
-%typemap(in) TYPE *INPUT(TYPE temp), TYPE &INPUT(TYPE temp)
-%{
-  convert_to_boolean(&$input);
-  temp = (Z_TYPE($input) == IS_TRUE);
-  $1 = &temp;
-%}
-%typemap(argout) TYPE *INPUT, TYPE &INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp), TYPE &OUTPUT(TYPE temp) "$1 = &temp;";
-%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT, TYPE &OUTPUT
-{
-  zval o;
-  ZVAL_BOOL(&o, temp$argnum);
-  t_output_helper($result, &o);
-}
-%typemap(in) TYPE *REFERENCE (TYPE lvalue), TYPE &REFERENCE (TYPE lvalue)
-%{
-  convert_to_boolean($input);
-  lvalue = (Z_TYPE_P($input) == IS_TRUE);
-  $1 = &lvalue;
-%}
-%typemap(argout) TYPE *REFERENCE, TYPE &REFERENCE
-%{
-  ZVAL_BOOL(&$arg, lvalue$argnum ? true : false);
-%}
-%enddef
-
-%define DOUBLE_TYPEMAP(TYPE)
-%typemap(in) TYPE *INPUT(TYPE temp), TYPE &INPUT(TYPE temp)
-%{
-  temp = (TYPE) zval_get_double(&$input);
-  $1 = &temp;
-%}
-%typemap(argout) TYPE *INPUT, TYPE &INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp), TYPE &OUTPUT(TYPE temp) "$1 = &temp;";
-%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT, TYPE &OUTPUT
-{
-  zval o;
-  ZVAL_DOUBLE(&o, temp$argnum);
-  t_output_helper($result, &o);
-}
-%typemap(in) TYPE *REFERENCE (TYPE dvalue), TYPE &REFERENCE (TYPE dvalue)
-%{
-  dvalue = (TYPE) zval_get_double(&$input);
-  $1 = &dvalue;
-%}
-%typemap(argout) TYPE *REFERENCE, TYPE &REFERENCE
-%{
-  ZVAL_DOUBLE(&$arg, (double)(lvalue$argnum));
-%}
-%enddef
-
-%define INT_TYPEMAP(TYPE)
-%typemap(in) TYPE *INPUT(TYPE temp), TYPE &INPUT(TYPE temp)
-%{
-  temp = (TYPE) zval_get_long(&$input);
-  $1 = &temp;
-%}
-%typemap(argout) TYPE *INPUT, TYPE &INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp), TYPE &OUTPUT(TYPE temp) "$1 = &temp;";
-%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT, TYPE &OUTPUT
-{
-  zval o;
-  ZVAL_LONG(&o, temp$argnum);
-  t_output_helper($result, &o);
-}
-%typemap(in) TYPE *REFERENCE (TYPE lvalue), TYPE &REFERENCE (TYPE lvalue)
-%{
-  lvalue = (TYPE) zval_get_long(&$input);
-  $1 = &lvalue;
-%}
-%typemap(argout) TYPE *REFERENCE, TYPE &REFERENCE
-%{
-  ZVAL_LONG(&$arg, (long)(lvalue$argnum));
-%}
-%enddef
-
-BOOL_TYPEMAP(bool);
-
-DOUBLE_TYPEMAP(float);
-DOUBLE_TYPEMAP(double);
-
-INT_TYPEMAP(int);
-INT_TYPEMAP(short);
-INT_TYPEMAP(long);
-INT_TYPEMAP(unsigned int);
-INT_TYPEMAP(unsigned short);
-INT_TYPEMAP(unsigned long);
-INT_TYPEMAP(unsigned char);
-INT_TYPEMAP(signed char);
-
-INT_TYPEMAP(long long);
-%typemap(argout,fragment="t_output_helper") long long *OUTPUT
-{
-  zval o;
-  if ((long long)LONG_MIN <= temp$argnum && temp$argnum <= (long long)LONG_MAX) {
-    ZVAL_LONG(&o, (long)temp$argnum);
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)temp$argnum);
-    ZVAL_STRING(&o, temp);
-  }
-  t_output_helper($result, &o);
-}
-%typemap(in) TYPE *REFERENCE (long long lvalue)
-%{
-  CONVERT_LONG_LONG_IN(lvalue, long long, $input)
-  $1 = &lvalue;
-%}
-%typemap(argout) long long *REFERENCE
-%{
-  if ((long long)LONG_MIN <= lvalue$argnum && lvalue$argnum <= (long long)LONG_MAX) {
-    ZVAL_LONG(&$arg, (long)temp$argnum);
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)lvalue$argnum);
-    ZVAL_STRING(&$arg, temp);
-  }
-%}
-%typemap(argout) long long &OUTPUT
-%{
-  if ((long long)LONG_MIN <= *arg$argnum && *arg$argnum <= (long long)LONG_MAX) {
-    ZVAL_LONG($result, (long)(*arg$argnum));
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)(*arg$argnum));
-    ZVAL_STRING($result, temp);
-  }
-%}
-INT_TYPEMAP(unsigned long long);
-%typemap(argout,fragment="t_output_helper") unsigned long long *OUTPUT
-{
-  zval o;
-  if (temp$argnum <= (unsigned long long)LONG_MAX) {
-    ZVAL_LONG(&o, temp$argnum);
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)temp$argnum);
-    ZVAL_STRING(&o, temp);
-  }
-  t_output_helper($result, &o);
-}
-%typemap(in) TYPE *REFERENCE (unsigned long long lvalue)
-%{
-  CONVERT_UNSIGNED_LONG_LONG_IN(lvalue, unsigned long long, $input)
-  $1 = &lvalue;
-%}
-%typemap(argout) unsigned long long *REFERENCE
-%{
-  if (lvalue$argnum <= (unsigned long long)LONG_MAX) {
-    ZVAL_LONG($arg, (long)(lvalue$argnum));
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)lvalue$argnum);
-    ZVAL_STRING((*$arg), temp);
-  }
-%}
-%typemap(argout) unsigned long long &OUTPUT
-%{
-  if (*arg$argnum <= (unsigned long long)LONG_MAX) {
-    ZVAL_LONG($result, (long)(*arg$argnum));
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)(*arg$argnum));
-    ZVAL_STRING($result, temp);
-  }
-%}
-
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(in) float *INOUT = float *INPUT;
-%typemap(in) double *INOUT = double *INPUT;
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(in) short *INOUT = short *INPUT;
-%typemap(in) long *INOUT = long *INPUT;
-%typemap(in) long long *INOUT = long long *INPUT;
-%typemap(in) unsigned *INOUT = unsigned *INPUT;
-%typemap(in) unsigned short *INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long *INOUT = unsigned long *INPUT;
-%typemap(in) unsigned char *INOUT = unsigned char *INPUT;
-%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT;
-%typemap(in) signed char *INOUT = signed char *INPUT;
-
-%typemap(in) bool &INOUT = bool *INPUT;
-%typemap(in) float &INOUT = float *INPUT;
-%typemap(in) double &INOUT = double *INPUT;
-
-%typemap(in) int &INOUT = int *INPUT;
-%typemap(in) short &INOUT = short *INPUT;
-%typemap(in) long &INOUT = long *INPUT;
-%typemap(in) long long &INOUT = long long *INPUT;
-%typemap(in) long long &INPUT = long long *INPUT;
-%typemap(in) unsigned &INOUT = unsigned *INPUT;
-%typemap(in) unsigned short &INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long &INOUT = unsigned long *INPUT;
-%typemap(in) unsigned char &INOUT = unsigned char *INPUT;
-%typemap(in) unsigned long long &INOUT = unsigned long long *INPUT;
-%typemap(in) unsigned long long &INPUT = unsigned long long *INPUT;
-%typemap(in) signed char &INOUT = signed char *INPUT;
-
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(argout) float *INOUT = float *OUTPUT;
-%typemap(argout) double *INOUT= double *OUTPUT;
-
-%typemap(argout) int *INOUT = int *OUTPUT;
-%typemap(argout) short *INOUT = short *OUTPUT;
-%typemap(argout) long *INOUT= long *OUTPUT;
-%typemap(argout) long long *INOUT= long long *OUTPUT;
-%typemap(argout) unsigned short *INOUT= unsigned short *OUTPUT;
-%typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-%typemap(argout) signed char *INOUT = signed char *OUTPUT;
-
-%typemap(argout) bool &INOUT = bool *OUTPUT;
-%typemap(argout) float &INOUT = float *OUTPUT;
-%typemap(argout) double &INOUT= double *OUTPUT;
-
-%typemap(argout) int &INOUT = int *OUTPUT;
-%typemap(argout) short &INOUT = short *OUTPUT;
-%typemap(argout) long &INOUT= long *OUTPUT;
-%typemap(argout) long long &INOUT= long long *OUTPUT;
-%typemap(argout) unsigned short &INOUT= unsigned short *OUTPUT;
-%typemap(argout) unsigned long &INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned char &INOUT = unsigned char *OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long *OUTPUT;
-%typemap(argout) signed char &INOUT = signed char *OUTPUT;
-
-%typemap(in) char INPUT[ANY] ( char temp[$1_dim0] )
-%{
-  convert_to_string(&$input);
-  strncpy(temp, Z_STRVAL($input), $1_dim0);
-  $1 = temp;
-%}
-%typemap(in,numinputs=0) char OUTPUT[ANY] ( char temp[$1_dim0] )
-  "$1 = temp;";
-%typemap(argout,fragment="t_output_helper") char OUTPUT[ANY]
-{
-  zval o;
-  ZVAL_STRINGL(&o, temp$argnum, $1_dim0);
-  t_output_helper($result, &o);
-}
-
-%typemap(in,numinputs=0) void **OUTPUT (int force),
-                         void *&OUTPUT (int force)
-%{
-  /* If they pass NULL by reference, make it into a void*
-     This bit should go in arginit if arginit support init-ing scripting args */
-  if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0) {
-    /* So... we didn't get a ref or ptr, but we'll accept NULL by reference */
-    if (!(Z_ISREF($input) && Z_ISNULL_P(Z_REFVAL($input)))) {
-      /* wasn't a pre/ref/thing, OR anything like an int thing */
-      SWIG_PHP_Error(E_ERROR, "Type error in argument $arg of $symname.");
-    }
-  }
-  force=0;
-  if (arg1==NULL) {
-#ifdef __cplusplus
-    ptr=new $*1_ltype();
-#else
-    ptr=($*1_ltype) calloc(1,sizeof($*1_ltype));
-#endif
-    $1=&ptr;
-    /* have to passback arg$arg too */
-    force=1;
-  }
-%}
-
-%typemap(argout) void **OUTPUT,
-                 void *&OUTPUT
-%{
-  if (force$argnum) {  /* pass back arg$argnum through params ($arg) if we can */
-    if (!Z_ISREF($arg)) {
-      SWIG_PHP_Error(E_WARNING, "Parameter $argnum of $symname wasn't passed by reference");
-    } else {
-      SWIG_SetPointerZval(*$arg, (void *) ptr$argnum, $*1_descriptor, 1);
-    }
-  }
-%}
diff --git a/dependencies2013/win32/swig/Lib/php/utils.i b/dependencies2013/win32/swig/Lib/php/utils.i
deleted file mode 100644
index 8581646a..00000000
--- a/dependencies2013/win32/swig/Lib/php/utils.i
+++ /dev/null
@@ -1,116 +0,0 @@
-
-%define CONVERT_BOOL_IN(lvar,t,invar)
-  lvar = (t) zval_is_true(&invar);
-%enddef
-
-%define CONVERT_INT_IN(lvar,t,invar)
-  lvar = (t) zval_get_long(&invar);
-%enddef
-
-%define CONVERT_LONG_LONG_IN(lvar,t,invar)
-  switch (Z_TYPE(invar)) {
-      case IS_DOUBLE:
-          lvar = (t) Z_DVAL(invar);
-          break;
-      case IS_STRING: {
-          char * endptr;
-          errno = 0;
-          lvar = (t) strtoll(Z_STRVAL(invar), &endptr, 10);
-          if (*endptr && !errno) break;
-          /* FALL THRU */
-      }
-      default:
-          lvar = (t) zval_get_long(&invar);
-  }
-%enddef
-
-%define CONVERT_UNSIGNED_LONG_LONG_IN(lvar,t,invar)
-  switch (Z_TYPE(invar)) {
-      case IS_DOUBLE:
-          lvar = (t) Z_DVAL(invar);
-          break;
-      case IS_STRING: {
-          char * endptr;
-          errno = 0;
-          lvar = (t) strtoull(Z_STRVAL(invar), &endptr, 10);
-          if (*endptr && !errno) break;
-          /* FALL THRU */
-      }
-      default:
-          lvar = (t) zval_get_long(&invar);
-  }
-%enddef
-
-%define CONVERT_INT_OUT(lvar,invar)
-  lvar = (t) zval_get_long(&invar);
-%enddef
-
-%define CONVERT_FLOAT_IN(lvar,t,invar)
-  lvar = (t) zval_get_double(&invar);
-%enddef
-
-%define CONVERT_CHAR_IN(lvar,t,invar)
-  convert_to_string(&invar);
-  lvar = (t) Z_STRVAL(invar)[0];
-%enddef
-
-%define CONVERT_STRING_IN(lvar,t,invar)
-  if (Z_ISNULL(invar)) {
-    lvar = (t) 0;
-  } else {
-    convert_to_string(&invar);
-    lvar = (t) Z_STRVAL(invar);
-  }
-%enddef
-
-%define %pass_by_val( TYPE, CONVERT_IN )
-%typemap(in) TYPE
-%{
-  CONVERT_IN($1,$1_ltype,$input);
-%}
-%typemap(in) const TYPE & ($*1_ltype temp)
-%{
-  CONVERT_IN(temp,$*1_ltype,$input);
-  $1 = &temp;
-%}
-%typemap(directorout) TYPE
-%{
-  if (!EG(exception)) {
-    CONVERT_IN($result, $1_ltype, *$input);
-  } else {
-    typedef $1_ltype swig_result_typedef;
-    $result = swig_result_typedef();
-  }
-%}
-%typemap(directorout) const TYPE & ($*1_ltype temp)
-%{
-  if (!EG(exception)) {
-    CONVERT_IN(temp, $*1_ltype, *$input);
-  } else {
-    typedef $*1_ltype swig_result_typedef;
-    temp = swig_result_typedef();
-  }
-  $result = &temp;
-%}
-%enddef
-
-%fragment("t_output_helper","header") %{
-static void
-t_output_helper(zval *target, zval *o) {
-  zval tmp;
-  if (Z_TYPE_P(target) == IS_ARRAY) {
-    /* it's already an array, just append */
-    add_next_index_zval(target, o);
-    return;
-  }
-  if (Z_TYPE_P(target) == IS_NULL) {
-    /* NULL isn't refcounted */
-    ZVAL_COPY_VALUE(target, o);
-    return;
-  }
-  ZVAL_DUP(&tmp, target);
-  array_init(target);
-  add_next_index_zval(target, &tmp);
-  add_next_index_zval(target, o);
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/php5/const.i b/dependencies2013/win32/swig/Lib/php5/const.i
deleted file mode 100644
index 061ba99a..00000000
--- a/dependencies2013/win32/swig/Lib/php5/const.i
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -----------------------------------------------------------------------------
- * const.i
- *
- * Typemaps for constants
- * ----------------------------------------------------------------------------- */
-
-%typemap(consttab) int,
-                   unsigned int,
-                   short,
-                   unsigned short,
-                   long,
-                   unsigned long,
-                   unsigned char,
-                   signed char,
-                   bool,
-                   enum SWIGTYPE
-  "SWIG_LONG_CONSTANT($symname, ($1_type)$value);";
-
-%typemap(consttab) float,
-                   double
-  "SWIG_DOUBLE_CONSTANT($symname, $value);";
-
-%typemap(consttab) char
-  "SWIG_CHAR_CONSTANT($symname, $value);";
-
-%typemap(consttab) char *,
-                   const char *,
-                   char [],
-                   const char []
-  "SWIG_STRING_CONSTANT($symname, $value);";
-
-%typemap(consttab) SWIGTYPE *,
-                   SWIGTYPE &,
-                   SWIGTYPE &&,
-                   SWIGTYPE [] {
-  zval *z_var;
-  zend_constant c;
-  size_t len = sizeof("$symname") - 1;
-  MAKE_STD_ZVAL(z_var);
-  SWIG_SetPointerZval(z_var, (void*)$value, $1_descriptor, 0);
-  c.value = *z_var;
-  zval_copy_ctor(&c.value);
-  c.name = zend_strndup("$symname", len);
-  c.name_len = len+1;
-  c.flags = CONST_CS | CONST_PERSISTENT;
-  c.module_number = module_number;
-  zend_register_constant( &c TSRMLS_CC );
-}
-
-/* Handled as a global variable. */
-%typemap(consttab) SWIGTYPE (CLASS::*) "";
diff --git a/dependencies2013/win32/swig/Lib/php5/director.swg b/dependencies2013/win32/swig/Lib/php5/director.swg
deleted file mode 100644
index 638a1697..00000000
--- a/dependencies2013/win32/swig/Lib/php5/director.swg
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that PHP proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_DIRECTOR_PHP_HEADER_
-#define SWIG_DIRECTOR_PHP_HEADER_
-
-#include <string>
-#include <exception>
-#include <map>
-
-namespace Swig {
-
-  /* memory handler */
-  struct GCItem {
-    virtual ~GCItem() {
-    }
-
-    virtual int get_own() const {
-      return 0;
-    }
-  };
-
-  struct GCItem_var {
-    GCItem_var(GCItem *item = 0) : _item(item) {
-    }
-
-    GCItem_var& operator=(GCItem *item) {
-      GCItem *tmp = _item;
-      _item = item;
-      delete tmp;
-      return *this;
-    }
-
-    ~GCItem_var() {
-      delete _item;
-    }
-
-    GCItem * operator->() const {
-      return _item;
-    }
-
-    private:
-    GCItem *_item;
-  };
-
-  struct GCItem_Object : GCItem {
-    GCItem_Object(int own) : _own(own) {
-    }
-
-    virtual ~GCItem_Object() {
-    }
-
-    int get_own() const {
-      return _own;
-    }
-
-    private:
-    int _own;
-  };
-
-  template <typename Type>
-  struct GCItem_T : GCItem {
-    GCItem_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCItem_T() {
-      delete _ptr;
-    }
-
-    private:
-    Type *_ptr;
-  };
-
-  class Director {
-    protected:
-      zval *swig_self;
-      typedef std::map<void *, GCItem_var> swig_ownership_map;
-      mutable swig_ownership_map swig_owner;
-#ifdef ZTS
-      // Store the ZTS context so it's available when C++ calls back to PHP.
-      void *** swig_zts_ctx;
-#endif
-    public:
-      Director(zval *self TSRMLS_DC) : swig_self(self) {
-        TSRMLS_SET_CTX(swig_zts_ctx);
-      }
-
-      static bool swig_is_overridden_method(char *cname, char *lc_fname TSRMLS_DC) {
-        zend_class_entry **ce;
-        zend_function *mptr;
-
-        if (zend_lookup_class(cname, strlen(cname), &ce TSRMLS_CC) != SUCCESS) {
-          return false;
-        }
-        if (zend_hash_find(&(*ce)->function_table, lc_fname, strlen(lc_fname) + 1, (void **) &mptr) != SUCCESS) {
-          return false;
-        }
-        // common.scope points to the declaring class
-        return strcmp(mptr->common.scope->name, cname);
-      }
-
-      template <typename Type>
-      void swig_acquire_ownership(Type *vptr) const {
-        if (vptr) {
-          swig_owner[vptr] = new GCItem_T<Type>(vptr);
-        }
-      }
-  };
-
-  /* base class for director exceptions */
-  class DirectorException : public std::exception {
-  protected:
-    std::string swig_msg;
-  public:
-    DirectorException(int code, const char *hdr, const char *msg TSRMLS_DC) : swig_msg(hdr) {
-      if (msg[0]) {
-        swig_msg += " ";
-        swig_msg += msg;
-      }
-      SWIG_ErrorCode() = code;
-      SWIG_ErrorMsg() = swig_msg.c_str();
-    }
-
-    virtual ~DirectorException() throw() {
-    }
-
-    const char *what() const throw() {
-      return swig_msg.c_str();
-    }
-
-    static void raise(int code, const char *hdr, const char *msg TSRMLS_DC) {
-      throw DirectorException(code, hdr, msg TSRMLS_CC);
-    }
-  };
-
-  /* attempt to call a pure virtual method via a director method */
-  class DirectorPureVirtualException : public DirectorException {
-  public:
-    DirectorPureVirtualException(const char *msg TSRMLS_DC)
-      : DirectorException(E_ERROR, "SWIG director pure virtual method called", msg TSRMLS_CC) {
-    }
-
-    static void raise(const char *msg TSRMLS_DC) {
-      throw DirectorPureVirtualException(msg TSRMLS_CC);
-    }
-  };
-
-  /* any php exception that occurs during a director method call */
-  class DirectorMethodException : public DirectorException
-  {
-  public:
-    DirectorMethodException(const char *msg TSRMLS_DC)
-      : DirectorException(E_ERROR, "SWIG director method error", msg TSRMLS_CC) {
-    }
-
-    static void raise(const char *msg TSRMLS_DC) {
-      throw DirectorMethodException(msg TSRMLS_CC);
-    }
-  };
-}
-
-// DirectorMethodException() is documented to be callable with no parameters
-// so use a macro to insert TSRMLS_CC so any ZTS context gets passed.
-#define DirectorMethodException() DirectorMethodException("" TSRMLS_CC)
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/php5/factory.i b/dependencies2013/win32/swig/Lib/php5/factory.i
deleted file mode 100644
index c4e082dd..00000000
--- a/dependencies2013/win32/swig/Lib/php5/factory.i
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-  Implement a more natural wrap for factory methods, for example, if
-  you have:
-
-  ----  geometry.h --------
-       struct Geometry {                          
-         enum GeomType{			     
-           POINT,				     
-           CIRCLE				     
-         };					     
-         					     
-         virtual ~Geometry() {}    		     
-         virtual int draw() = 0;
-	 
-	 //
-	 // Factory method for all the Geometry objects
-	 //
-         static Geometry *create(GeomType i);     
-       };					     
-       					     
-       struct Point : Geometry  {		     
-         int draw() { return 1; }		     
-         double width() { return 1.0; }    	     
-       };					     
-       					     
-       struct Circle : Geometry  {		     
-         int draw() { return 2; }		     
-         double radius() { return 1.5; }          
-       }; 					     
-       
-       //
-       // Factory method for all the Geometry objects
-       //
-       Geometry *Geometry::create(GeomType type) {
-         switch (type) {			     
-         case POINT: return new Point();	     
-         case CIRCLE: return new Circle(); 	     
-         default: return 0;			     
-         }					     
-       }					    
-  ----  geometry.h --------
-
-
-  You can use the %factory with the Geometry::create method as follows:
-
-    %newobject Geometry::create;
-    %factory(Geometry *Geometry::create, Point, Circle);
-    %include "geometry.h"
-
-  and Geometry::create will return a 'Point' or 'Circle' instance
-  instead of the plain 'Geometry' type. For example, in python:
-
-    circle = Geometry.create(Geometry.CIRCLE)
-    r = circle.radius()
-
-  where circle is a Circle proxy instance.
-
-  NOTES: remember to fully qualify all the type names and don't
-  use %factory inside a namespace declaration, ie, instead of
-  
-     namespace Foo {
-       %factory(Geometry *Geometry::create, Point, Circle);
-     }
-
-  use
-
-     %factory(Foo::Geometry *Foo::Geometry::create, Foo::Point,  Foo::Circle);   
-
-     
-*/
-
-/* for loop for macro with one argument */
-%define %_formacro_1(macro, arg1,...)macro(arg1)
-#if #__VA_ARGS__ != "__fordone__"
-%_formacro_1(macro, __VA_ARGS__)
-#endif
-%enddef
-
-/* for loop for macro with one argument */
-%define %formacro_1(macro,...)%_formacro_1(macro,__VA_ARGS__,__fordone__)%enddef
-%define %formacro(macro,...)%_formacro_1(macro,__VA_ARGS__,__fordone__)%enddef
-
-/* for loop for macro with two arguments */
-%define %_formacro_2(macro, arg1, arg2, ...)macro(arg1, arg2)
-#if #__VA_ARGS__ != "__fordone__"
-%_formacro_2(macro, __VA_ARGS__)
-#endif
-%enddef
-
-/* for loop for macro with two arguments */
-%define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef
-
-%define %_factory_dispatch(Type) 
-if (!dcast) {
-  Type *dobj = dynamic_cast<Type *>($1);
-  if (dobj) {
-    dcast = 1;
-    SWIG_SetPointerZval(return_value, SWIG_as_voidptr(dobj),$descriptor(Type *), $owner);
-  }   
-}%enddef
-
-%define %factory(Method,Types...)
-%typemap(out) Method {
-  int dcast = 0;
-  %formacro(%_factory_dispatch, Types)
-  if (!dcast) {
-    SWIG_SetPointerZval(return_value, SWIG_as_voidptr($1),$descriptor, $owner);
-  }
-}%enddef
diff --git a/dependencies2013/win32/swig/Lib/php5/globalvar.i b/dependencies2013/win32/swig/Lib/php5/globalvar.i
deleted file mode 100644
index a3e99f51..00000000
--- a/dependencies2013/win32/swig/Lib/php5/globalvar.i
+++ /dev/null
@@ -1,361 +0,0 @@
-/* -----------------------------------------------------------------------------
- * globalvar.i
- *
- * Global variables - add the variable to PHP
- * ----------------------------------------------------------------------------- */
-
-%typemap(varinit) char *
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  z_var->type = IS_STRING;
-  if($1) {
-      z_var->value.str.val = estrdup($1);
-      z_var->value.str.len = strlen($1);
-  } else {
-      z_var->value.str.val = 0;
-      z_var->value.str.len = 0;
-  }
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL);
-}
-
-%typemap(varinit) char []
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  z_var->type = IS_STRING;
-  z_var->value.str.val = estrdup($1);
-  z_var->value.str.len = strlen($1);
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL);
-}
-
-%typemap(varinit) int,
-	          unsigned int,
-                  unsigned short,
-                  short,
-                  unsigned short,
-                  long,
-                  unsigned long,
-                  signed char,
-                  unsigned char,
-                  enum SWIGTYPE
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  z_var->type = IS_LONG;
-  z_var->value.lval = (long)$1;
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL);
-}
-
-%typemap(varinit) bool
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  z_var->type = IS_BOOL;
-  z_var->value.lval = ($1)?1:0;
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL);
-}
-
-%typemap(varinit) float, double
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  z_var->type = IS_DOUBLE;
-  z_var->value.dval = $1;
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var,
-  sizeof(zval *), NULL);
-}
-
-%typemap(varinit) char
-{
-  zval *z_var;
-  char c[2];
-  MAKE_STD_ZVAL(z_var);
-  c[0] = $1;
-  c[1] = 0;
-  z_var->type = IS_STRING;
-  z_var->value.str.val = estrndup(c, 1);
-  z_var->value.str.len = 1;
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var,
-  sizeof(zval *), NULL);
-}
-
-%typemap(varinit) SWIGTYPE *, SWIGTYPE []
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  SWIG_SetPointerZval(z_var, (void*)$1, $1_descriptor, 0);
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var,
-  sizeof(zval *), NULL);
-}
-
-%typemap(varinit) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&
-{
-  zval *z_var;
-
-  MAKE_STD_ZVAL(z_var);
-  SWIG_SetPointerZval(z_var, (void*)&$1, $&1_descriptor, 0);
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void*)&z_var,
-  sizeof(zval *), NULL);
-}
-
-%typemap(varinit) char [ANY]
-{
-  zval *z_var;
-  MAKE_STD_ZVAL(z_var);
-  z_var->type = IS_STRING;
-  ZVAL_STRINGL(z_var,(char*)$1, $1_dim0, 1);
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void*)&z_var, sizeof(zval *), NULL);
-}
-
-%typemap(varinit, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  void * p = emalloc(sizeof($1));
-  memcpy(p, &$1, sizeof($1));
-  zval * resource;
-  MAKE_STD_ZVAL(resource);
-  ZEND_REGISTER_RESOURCE(resource, p, swig_member_ptr);
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void*)&resource, sizeof(zval *), NULL);
-}
-
-%typemap(varin) int, unsigned int, short, unsigned short, long, unsigned long, signed char, unsigned char,  enum SWIGTYPE
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  convert_to_long_ex(z_var);
-  if ($1 != ($1_ltype)((*z_var)->value.lval)) {
-    $1 = Z_LVAL_PP(z_var);
-  }
-}
-
-%typemap(varin) bool
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  convert_to_boolean_ex(z_var);
-  if ($1 != ($1_ltype)((*z_var)->value.lval)) {
-    $1 = Z_LVAL_PP(z_var);
-  }
-}
-
-%typemap(varin) double,float
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  convert_to_double_ex(z_var);
-  if ($1 != ($1_ltype)((*z_var)->value.dval)) {
-    $1 = Z_DVAL_PP(z_var);
-  }
-}
-
-%typemap(varin) char
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  convert_to_string_ex(z_var);
-  if ($1 != *((*z_var)->value.str.val)) {
-    $1 = *((*z_var)->value.str.val);
-  }
-}
-
-%typemap(varin) char *
-{
-  zval **z_var;
-  char *s1;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  convert_to_string_ex(z_var);
-  s1 = Z_STRVAL_PP(z_var);
-  if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
-    if (s1)
-      $1 = estrdup(s1);
-    else
-      $1 = NULL;
-  }
-}
-
-
-%typemap(varin) SWIGTYPE []
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if($1) {
-    SWIG_SetPointerZval(*z_var, (void*)$1, $1_descriptor, $owner);
-  }
-}
-
-%typemap(varin) char [ANY]
-{
- zval **z_var;
- char *s1;
-
- zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
- s1 = Z_STRVAL_PP(z_var);
- if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
-   if (s1)
-     strncpy($1, s1, $1_dim0);
- }
-}
-
-%typemap(varin) SWIGTYPE
-{
-  zval **z_var;
-  $&1_ltype _temp;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if (SWIG_ConvertPtr(*z_var, (void**)&_temp, $&1_descriptor, 0) < 0) {
-    SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor");
-  }
-
-  $1 = *($&1_ltype)_temp;
-
-}
-
-%typemap(varin) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&
-{
-  zval **z_var;
-  $1_ltype _temp;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if (SWIG_ConvertPtr(*z_var, (void **)&_temp, $1_descriptor, 0) < 0) {
-    SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor");
-  }
-
-  $1 = ($1_ltype)_temp;
-}
-
-%typemap(varin, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  void * p = (void*)zend_fetch_resource(*z_var TSRMLS_CC, -1, SWIG_MEMBER_PTR, NULL, 1, swig_member_ptr);
-  memcpy(&$1, p, sizeof($1));
-}
-
-%typemap(varout) int,
-                 unsigned int,
-                 unsigned short,
-                 short,
-                 long,
-                 unsigned long,
-                 signed char,
-                 unsigned char,
-                 enum SWIGTYPE
-{
-  zval **z_var;
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if($1 != ($1_ltype)((*z_var)->value.lval)) {
-    (*z_var)->value.lval = (long)$1;
-  }
-}
-
-//SAMFIX need to cast zval->type, what if zend-hash_find fails? etc?
-%typemap(varout) bool
-{
-  zval **z_var;
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if($1 != ($1_ltype)((*z_var)->value.lval)) {
-    (*z_var)->value.lval = (long)$1;
-  }
-}
-
-%typemap(varout) double, float
-{
-  zval **z_var;
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if($1 != ($1_ltype)((*z_var)->value.dval)) {
-    (*z_var)->value.dval = (double)$1;
-  }
-}
-
-%typemap(varout) char
-{
-  zval **z_var;
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if($1 != *((*z_var)->value.str.val)) {
-    char c[2];
-    efree((*z_var)->value.str.val);
-    c[0] = $1;
-    c[1] = 0;
-    (*z_var)->value.str.val = estrdup(c);
-  }
-}
-
-%typemap(varout) char *
-{
-  zval **z_var;
-  char *s1;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  s1 = Z_STRVAL_PP(z_var);
-  if((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
-    if(s1)
-      efree(s1);
-    if($1) {
-      (*z_var)->value.str.val = estrdup($1);
-      (*z_var)->value.str.len = strlen($1) + 1;
-    } else {
-      (*z_var)->value.str.val = 0;
-      (*z_var)->value.str.len = 0;
-    }
- }
-}
-
-%typemap(varout) SWIGTYPE
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  SWIG_SetPointerZval(*z_var, (void*)&$1, $&1_descriptor, 0);
-}
-
-%typemap(varout) SWIGTYPE []
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  if($1)
-    SWIG_SetPointerZval(*z_var, (void*)$1, $1_descriptor, 0);
-}
-
-%typemap(varout) char [ANY]
-{
-  zval **z_var;
-  char *s1;
-deliberate error cos this code looks bogus to me
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  s1 = Z_STRVAL_PP(z_var);
-  if((s1 == NULL) || strcmp(s1, $1)) {
-    if($1) {
-      (*z_var)->value.str.val = estrdup($1);
-      (*z_var)->value.str.len = strlen($1) + 1;
-    } else {
-      (*z_var)->value.str.val = 0;
-      (*z_var)->value.str.len = 0;
-    }
-  }
-}
-
-%typemap(varout) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&
-{
-  zval **z_var;
-
-  zend_hash_find(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void**)&z_var);
-  SWIG_SetPointerZval(*z_var, (void*)$1, $1_descriptor, 0);
-}
-
-%typemap(varout, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  void * p = emalloc(sizeof($1));
-  memcpy(p, &$1, sizeof($1));
-  zval * resource;
-  MAKE_STD_ZVAL(resource);
-  ZEND_REGISTER_RESOURCE(resource, p, swig_member_ptr);
-  zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void*)&resource, sizeof(zval *), NULL);
-}
diff --git a/dependencies2013/win32/swig/Lib/php5/php.swg b/dependencies2013/win32/swig/Lib/php5/php.swg
deleted file mode 100644
index 535c7d34..00000000
--- a/dependencies2013/win32/swig/Lib/php5/php.swg
+++ /dev/null
@@ -1,529 +0,0 @@
-/* -----------------------------------------------------------------------------
- * php.swg
- *
- * PHP configuration file
- * ----------------------------------------------------------------------------- */
-
-%runtime "swigrun.swg"  // Common C API type-checking code
-%runtime "phprun.swg"	// PHP runtime functions
-
-%include <phpinit.swg> // PHP initialization routine.
-
-%include <globalvar.i>	// Global variables.
-%include <const.i>
-
-// use %init %{ "/*code goes here*/ " %}
-// or  %minit %{ "/* code goes here*/ " %} to
-// insert code in the PHP_MINIT_FUNCTION
-#define %minit %insert("init")
-
-// use %rinit %{ "/* code goes here*/ " %} to
-// insert code in the PHP_RINIT_FUNCTION
-#define %rinit %insert("rinit")
-
-// use %shutdown %{ " /*code goes here*/ " %} to
-// insert code in the PHP_MSHUTDOWN_FUNCTION
-#define %shutdown  %insert("shutdown")
-#define %mshutdown  %insert("shutdown")
-
-// use %rshutdown %{ " /*code goes here*/" %} to
-// insert code in the PHP_RSHUTDOWN_FUNCTION
-#define %rshutdown  %insert("rshutdown")
-
-/* Typemaps for input parameters by value */
-
-%include <utils.i>
-
-%pass_by_val(bool,CONVERT_BOOL_IN);
-
-%pass_by_val(size_t, CONVERT_INT_IN);
-
-%pass_by_val(enum SWIGTYPE, CONVERT_INT_IN);
-
-%pass_by_val(signed int, CONVERT_INT_IN);
-%pass_by_val(int,CONVERT_INT_IN);
-%pass_by_val(unsigned int,CONVERT_INT_IN);
-
-%pass_by_val(signed short, CONVERT_INT_IN);
-%pass_by_val(short,CONVERT_INT_IN);
-%pass_by_val(unsigned short, CONVERT_INT_IN);
-
-%pass_by_val(signed long, CONVERT_INT_IN);
-%pass_by_val(long, CONVERT_INT_IN);
-%pass_by_val(unsigned long, CONVERT_INT_IN);
-
-%pass_by_val(signed long long, CONVERT_LONG_LONG_IN);
-%pass_by_val(long long, CONVERT_LONG_LONG_IN);
-%pass_by_val(unsigned long long, CONVERT_UNSIGNED_LONG_LONG_IN);
-
-%pass_by_val(signed char, CONVERT_INT_IN);
-%pass_by_val(char, CONVERT_CHAR_IN);
-%pass_by_val(unsigned char, CONVERT_INT_IN);
-
-%pass_by_val(float, CONVERT_FLOAT_IN);
-
-%pass_by_val(double, CONVERT_FLOAT_IN);
-
-%pass_by_val(char *, CONVERT_STRING_IN);
-%typemap(in) char *& = const char *&;
-%typemap(directorout) char *& = const char *&;
-
-// char array can be in/out, though the passed string may not be big enough...
-// so we have to size it
-%typemap(in) char[ANY]
-{
-   convert_to_string_ex($input);
-   $1 = ($1_ltype) Z_STRVAL_PP($input);
-}
-
-%typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) {
-   convert_to_string_ex($input);
-   $1 = ($1_ltype) Z_STRVAL_PP($input);
-   $2 = ($2_ltype) Z_STRLEN_PP($input);
-}
-
-/* Object passed by value. Convert to a pointer */
-%typemap(in) SWIGTYPE ($&1_ltype tmp)
-{
-	if(SWIG_ConvertPtr(*$input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL) {
-          SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-	}
-	$1 = *tmp;
-}
-
-%typemap(directorout) SWIGTYPE ($&1_ltype tmp)
-{
-	/* If exit was via exception, PHP NULL is returned so skip the conversion. */
-	if (!EG(exception)) {
-	  if(SWIG_ConvertPtr($input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL)
-	    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-	  $result = *tmp;
-	}
-}
-
-%typemap(in) SWIGTYPE *,
-	     SWIGTYPE []
-{
-	if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0) {
-            SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-	}
-}
-
-%typemap(in) SWIGTYPE &
-{
-	if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) {
-	    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-	}
-}
-
-%typemap(in) SWIGTYPE &&
-{
-	if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) {
-	    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
-	}
-}
-
-%typemap(in) SWIGTYPE *const& ($*ltype temp)
-{
-	if(SWIG_ConvertPtr(*$input, (void **) &temp, $*1_descriptor, 0) < 0) {
-            SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $*1_descriptor");
-	}
-	$1 = ($1_ltype)&temp;
-}
-
-%typemap(in) SWIGTYPE *DISOWN
-{
-  if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, SWIG_POINTER_DISOWN ) < 0) {
-    SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-  }
-}
-
-%typemap(argout) SWIGTYPE *,
-                 SWIGTYPE [],
-                 SWIGTYPE &,
-                 SWIGTYPE &&;
-
-%typemap(in) void *
-{
-	if(SWIG_ConvertPtr(*$input, (void **) &$1, 0, 0) < 0) {
-	  /* Allow NULL from php for void* */
-	  if ((*$input)->type==IS_NULL) $1=0;
-	  else
-            SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-	}
-}
-
-/* Special case when void* is passed by reference so it can be made to point
-   to opaque api structs */
-%typemap(in) void ** ($*1_ltype ptr, int force),
-             void *& ($*1_ltype ptr, int force)
-{
-  /* If they pass NULL by reference, make it into a void*
-     This bit should go in arginit if arginit support init-ing scripting args */
-  if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0) {
-    /* So... we didn't get a ref or ptr, but we'll accept NULL by reference */
-    if (!((*$input)->type==IS_NULL && PZVAL_IS_REF(*$input))) {
-      /* wasn't a pre/ref/thing, OR anything like an int thing */
-      SWIG_PHP_Error(E_ERROR, "Type error in argument $arg of $symname.");
-    }
-  }
-  force=0;
-  if (arg1==NULL) {
-#ifdef __cplusplus
-    ptr=new $*1_ltype();
-#else
-    ptr=($*1_ltype) calloc(1,sizeof($*1_ltype));
-#endif
-    $1=&ptr;
-    /* have to passback arg$arg too */
-    force=1;
-  }
-}
-%typemap(argout) void **,
-                 void *&
-{
-  if (force$argnum) {
-    SWIG_SetPointerZval( *$input, (void*) ptr$argnum, $*1_descriptor, 1);
-  }
-}
-
-/* Typemap for output values */
-
-%typemap(out) int,
-              unsigned int,
-              short,
-              unsigned short,
-              long,
-              unsigned long,
-              signed char,
-              unsigned char,
-              bool,
-              size_t
-{
-	ZVAL_LONG(return_value,$1);
-}
-
-%typemap(out) enum SWIGTYPE
-{
-	ZVAL_LONG(return_value, (long)$1);
-}
-
-%typemap(out) long long
-%{
-  if ((long long)LONG_MIN <= $1 && $1 <= (long long)LONG_MAX) {
-    return_value->value.lval = (long)($1);
-    return_value->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)$1);
-    ZVAL_STRING(return_value, temp, 1);
-  }
-%}
-%typemap(out) unsigned long long
-%{
-  if ($1 <= (unsigned long long)LONG_MAX) {
-    return_value->value.lval = (long)($1);
-    return_value->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)$1);
-    ZVAL_STRING(return_value, temp, 1);
-  }
-%}
-
-%typemap(out) const int &,
-              const unsigned int &,
-              const short &,
-              const unsigned short &,
-              const long &,
-              const unsigned long &,
-              const signed char &,
-              const unsigned char &,
-              const bool &,
-              const size_t &
-{
-	ZVAL_LONG(return_value,*$1);
-}
-
-%typemap(out) const enum SWIGTYPE &
-{
-	ZVAL_LONG(return_value, (long)*$1);
-}
-
-%typemap(out) const enum SWIGTYPE &&
-{
-	ZVAL_LONG(return_value, (long)*$1);
-}
-
-%typemap(out) const long long &
-%{
-  if ((long long)LONG_MIN <= *$1 && *$1 <= (long long)LONG_MAX) {
-    return_value->value.lval = (long)(*$1);
-    return_value->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)(*$1));
-    ZVAL_STRING(return_value, temp, 1);
-  }
-%}
-%typemap(out) const unsigned long long &
-%{
-  if (*$1 <= (unsigned long long)LONG_MAX) {
-    return_value->value.lval = (long)(*$1);
-    return_value->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)(*$1));
-    ZVAL_STRING(return_value, temp, 1);
-  }
-%}
-
-%typemap(directorin) int,
-              unsigned int,
-              short,
-              unsigned short,
-              long,
-              unsigned long,
-              signed char,
-              unsigned char,
-              size_t,
-              enum SWIGTYPE
-{
-  ZVAL_LONG($input,$1);
-}
-
-%typemap(directorin) enum SWIGTYPE
-{
-  ZVAL_LONG($input, (long)$1_name);
-}
-
-%typemap(directorin) char *, char []
-{
-    if(!$1) {
-      ZVAL_NULL($input);
-    } else {
-      ZVAL_STRING($input, (char *)$1, 1);
-    }
-}
-
-%typemap(out) bool
-{
-	ZVAL_BOOL(return_value,($1)?1:0);
-}
-
-%typemap(out) const bool &
-{
-	ZVAL_BOOL(return_value,(*$1)?1:0);
-}
-
-%typemap(directorin) bool
-{
-	ZVAL_BOOL($input,($1)?1:0);
-}
-
-%typemap(out) float,
-              double
-{
-	ZVAL_DOUBLE(return_value,$1);
-}
-
-%typemap(out) const float &,
-              const double &
-{
-	ZVAL_DOUBLE(return_value,*$1);
-}
-
-%typemap(directorin) float,
-                     double
-{
-	ZVAL_DOUBLE($input,$1);
-}
-
-%typemap(out) char
-{
-	ZVAL_STRINGL(return_value,&$1, 1, 1);
-}
-
-%typemap(out) const char &
-{
-	ZVAL_STRINGL(return_value,&*$1, 1, 1);
-}
-
-%typemap(out) char *,
-              char []
-{
-	if(!$1) {
-	  ZVAL_NULL(return_value);
-	} else {
-	  ZVAL_STRING(return_value, (char *)$1, 1);
-	}
-}
-
-%typemap(out) char *&
-{
-	if(!*$1) {
-	  ZVAL_NULL(return_value);
-	} else {
-	  ZVAL_STRING(return_value, (char *)*$1, 1);
-	}
-}
-
-%typemap(out) SWIGTYPE *,
-              SWIGTYPE [],
-              SWIGTYPE &,
-              SWIGTYPE &&
-%{
-  SWIG_SetPointerZval(return_value, (void *)$1, $1_descriptor, $owner);
-%}
-
-%typemap(out) SWIGTYPE *const&
-%{
-  SWIG_SetPointerZval(return_value, (void *)*$1, $*1_descriptor, $owner);
-%}
-
-%typemap(directorin) SWIGTYPE *,
-                     SWIGTYPE [],
-                     SWIGTYPE &,
-                     SWIGTYPE &&
-%{
-  SWIG_SetPointerZval($input, (void *)&$1, $1_descriptor, ($owner)|2);
-%}
-
-%typemap(out, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  void * p = emalloc(sizeof($1));
-  memcpy(p, &$1, sizeof($1));
-  ZEND_REGISTER_RESOURCE(return_value, p, swig_member_ptr);
-}
-
-%typemap(in, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
-{
-  void * p = (void*)zend_fetch_resource($input TSRMLS_CC, -1, SWIG_MEMBER_PTR, NULL, 1, swig_member_ptr);
-  memcpy(&$1, p, sizeof($1));
-}
-
-%typemap(out) SWIGTYPE *DYNAMIC,
-              SWIGTYPE &DYNAMIC
-{
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1);
-  SWIG_SetPointerZval(return_value, (void *)$1, ty, $owner);
-}
-
-%typemap(out) SWIGTYPE
-#ifdef __cplusplus
-{
-  $&1_ltype resultobj = new $1_ltype((const $1_ltype &) $1);
-  SWIG_SetPointerZval(return_value, (void *)resultobj, $&1_descriptor, 1);
-}
-#else
-{
-  $&1_ltype resultobj = ($&1_ltype) emalloc(sizeof($1_type));
-  memcpy(resultobj, &$1, sizeof($1_type));
-  SWIG_SetPointerZval(return_value, (void *)resultobj, $&1_descriptor, 1);
-}
-#endif
-
-%typemap(directorin) SWIGTYPE
-{
-  SWIG_SetPointerZval($input, SWIG_as_voidptr(new $1_ltype((const $1_ltype &)$1)), $&1_descriptor, 1|2);
-}
-
-%typemap(out) void "";
-
-%typemap(out) char [ANY]
-{
-  int len = 0;
-  while (len < $1_dim0 && $1[len]) ++len;
-  RETVAL_STRINGL($1, len, 1);
-}
-
-// This typecheck does hard checking for proper argument type.  If you want
-// an argument to be converted from a different PHP type, you must convert
-// it yourself before passing it (e.g. (string)4.7 or (int)"6").
-%define %php_typecheck(_type,_prec,is)
-%typemap(typecheck,precedence=_prec) _type, const _type &
- " $1 = (Z_TYPE_PP($input) == is); "
-%enddef
-
-%php_typecheck(int,SWIG_TYPECHECK_INTEGER,IS_LONG)
-%php_typecheck(unsigned int,SWIG_TYPECHECK_UINT32,IS_LONG)
-%php_typecheck(short,SWIG_TYPECHECK_INT16,IS_LONG)
-%php_typecheck(unsigned short,SWIG_TYPECHECK_UINT16,IS_LONG)
-%php_typecheck(long,SWIG_TYPECHECK_INT32,IS_LONG)
-%php_typecheck(unsigned long,SWIG_TYPECHECK_UINT32,IS_LONG)
-%php_typecheck(long long,SWIG_TYPECHECK_INT64,IS_LONG)
-%php_typecheck(unsigned long long,SWIG_TYPECHECK_UINT64,IS_LONG)
-%php_typecheck(signed char,SWIG_TYPECHECK_INT8,IS_LONG)
-%php_typecheck(unsigned char,SWIG_TYPECHECK_UINT8,IS_LONG)
-%php_typecheck(size_t,SWIG_TYPECHECK_SIZE,IS_LONG)
-%php_typecheck(enum SWIGTYPE,SWIG_TYPECHECK_INTEGER,IS_LONG)
-%php_typecheck(bool,SWIG_TYPECHECK_BOOL,IS_BOOL)
-%php_typecheck(float,SWIG_TYPECHECK_FLOAT,IS_DOUBLE)
-%php_typecheck(double,SWIG_TYPECHECK_DOUBLE,IS_DOUBLE)
-%php_typecheck(char,SWIG_TYPECHECK_CHAR,IS_STRING)
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) char *, char *&, char []
- " $1 = (Z_TYPE_PP($input) == IS_STRING); "
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(*$input, (void **)&tmp, $&1_descriptor, 0) >= 0);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER)
-             SWIGTYPE *,
-             SWIGTYPE [],
-             SWIGTYPE &,
-             SWIGTYPE &&,
-             SWIGTYPE *const&
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, $1_descriptor, 0) >= 0);
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *const&
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, $*1_descriptor, 0) >= 0);
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void *
-{
-  void *tmp;
-  _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, 0, 0) >= 0);
-}
-
-/* Exception handling */
-
-%typemap(throws) int,
-                 long,
-                 short,
-                 unsigned int,
-                 unsigned long,
-                 unsigned short {
-  zend_throw_exception(NULL, const_cast<char*>("C++ $1_type exception thrown"), $1 TSRMLS_CC);
-  return;
-}
-
-%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE *, SWIGTYPE [], SWIGTYPE [ANY] %{
-  (void)$1;
-  zend_throw_exception(NULL, const_cast<char*>("C++ $1_type exception thrown"), 0 TSRMLS_CC);
-  return;
-%}
-
-%typemap(throws) char * %{
-  zend_throw_exception(NULL, const_cast<char*>($1), 0 TSRMLS_CC);
-  return;
-%}
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-
-/* php keywords */
-%include <phpkw.swg>
diff --git a/dependencies2013/win32/swig/Lib/php5/phpinit.swg b/dependencies2013/win32/swig/Lib/php5/phpinit.swg
deleted file mode 100644
index d8a61b02..00000000
--- a/dependencies2013/win32/swig/Lib/php5/phpinit.swg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/* ------------------------------------------------------------
- * The start of the PHP initialization function 
- * ------------------------------------------------------------ */
-
-%insert(init) "swiginit.swg"
-
-%init %{
-SWIG_php_minit {
-    SWIG_InitializeModule(0);
-%}
-
-%fragment("swig_php_init_member_ptr2", "header") {
-#define SWIG_MEMBER_PTR ((char*)"CLASS::*")
-
-static void swig_member_ptr_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
-  efree(rsrc->ptr);
-}
-
-static int swig_member_ptr = 0;
-}
-
-%fragment("swig_php_init_member_ptr", "init", fragment="swig_php_init_member_ptr2") {
-    swig_member_ptr = zend_register_list_destructors_ex(swig_member_ptr_dtor, NULL, SWIG_MEMBER_PTR, module_number);
-}
diff --git a/dependencies2013/win32/swig/Lib/php5/phpkw.swg b/dependencies2013/win32/swig/Lib/php5/phpkw.swg
deleted file mode 100644
index 36e535f5..00000000
--- a/dependencies2013/win32/swig/Lib/php5/phpkw.swg
+++ /dev/null
@@ -1,866 +0,0 @@
-/* -----------------------------------------------------------------------------
- * phpkw.swg
- * ----------------------------------------------------------------------------- */
-
-/* Keyword (case insensitive) */
-#define PHPKW(x) %keywordwarn("'" `x` "' is a PHP keyword, renaming to 'c_" `x` "'",sourcefmt="%(lower)s",rename="c_%s") `x`
-
-/* Class (case insensitive) */
-#define PHPCN(x) %keywordwarn("'" `x` "' is a PHP reserved class name, renaming to 'c_" `x` "'",%$isclass,sourcefmt="%(lower)s",rename="c_%s") `x`
-
-/* Constant (case insensitive) */
-#define PHPBN1a(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "enum conflicts with a built-in constant '"`x`"' in PHP"),%$isenumitem,sourcefmt="%(lower)s") `x`
-#define PHPBN1b(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "constant conflicts with a built-in constant '"`x`"' in PHP"),%$isconstant,sourcefmt="%(lower)s") `x`
-%define PHPBN1(X)
- PHPBN1a(X); PHPBN1b(X)
-%enddef
-
-/* Constant (case sensitive) */
-#define PHPBN2a(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "enum conflicts with a built-in constant '"`x`"' in PHP"),%$isenumitem) `x`
-#define PHPBN2b(x) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, "constant conflicts with a built-in constant '"`x`"' in PHP"),%$isconstant) `x`
-%define PHPBN2(X)
- PHPBN2a(X); PHPBN2b(X)
-%enddef
-
-#define PHPFN(x) %keywordwarn("'" `x` "' is a PHP built-in function, renaming to 'c_" `x` "'",sourcefmt="%(lower)s",%$isfunction,%$not %$ismember,rename="c_%s") `x`
-
-/* From: http://php.net/manual/en/reserved.keywords.php
- * "You cannot use any of the following words as constants, class names,
- * function or method names. Using them as variable names is generally OK, but
- * could lead to confusion."
- */
-/* Check is case insensitive - these *MUST* be listed in lower case here */
-PHPKW(__halt_compiler);
-PHPKW(abstract);
-PHPKW(and);
-PHPKW(array);
-PHPKW(as);
-PHPKW(break);
-PHPKW(callable); // As of PHP 5.4
-PHPKW(case);
-PHPKW(catch);
-PHPKW(class);
-PHPKW(clone);
-PHPKW(const);
-PHPKW(continue);
-PHPKW(declare);
-PHPKW(default);
-PHPKW(die); // "Language construct"
-PHPKW(do);
-PHPKW(echo); // "Language construct"
-PHPKW(else);
-PHPKW(elseif);
-PHPKW(empty); // "Language construct"
-PHPKW(enddeclare);
-PHPKW(endfor);
-PHPKW(endforeach);
-PHPKW(endif);
-PHPKW(endswitch);
-PHPKW(endwhile);
-PHPKW(eval); // "Language construct"
-PHPKW(exit); // "Language construct"
-PHPKW(extends);
-PHPKW(final);
-PHPKW(finally); // As of PHP 5.5
-PHPKW(for);
-PHPKW(foreach);
-PHPKW(function);
-PHPKW(global);
-PHPKW(goto); // As of PHP 5.3
-PHPKW(if);
-PHPKW(implements);
-PHPKW(include); // "Language construct"
-PHPKW(include_once); // "Language construct"
-PHPKW(instanceof);
-PHPKW(insteadof); // As of PHP 5.4
-PHPKW(interface);
-PHPKW(isset); // "Language construct"
-PHPKW(list); // "Language construct"
-PHPKW(namespace); // As of PHP 5.3
-PHPKW(new);
-PHPKW(or);
-PHPKW(print); // "Language construct"
-PHPKW(private);
-PHPKW(protected);
-PHPKW(public);
-PHPKW(require); // "Language construct"
-PHPKW(require_once); // "Language construct"
-PHPKW(return); // "Language construct"
-PHPKW(static);
-PHPKW(switch);
-PHPKW(throw);
-PHPKW(trait); // As of PHP 5.4
-PHPKW(try);
-PHPKW(unset); // "Language construct"
-PHPKW(use);
-PHPKW(var);
-PHPKW(while);
-PHPKW(xor);
-PHPKW(yield); // As of PHP 5.5
-
-// Compile-time "magic" constants
-// From: http://php.net/manual/en/reserved.keywords.php
-// also at: http://php.net/manual/en/language.constants.predefined.php
-/* These *MUST* be listed in lower case here */
-PHPKW(__class__);
-PHPKW(__dir__); // As of PHP 5.3
-PHPKW(__file__);
-PHPKW(__function__);
-PHPKW(__line__);
-PHPKW(__method__);
-PHPKW(__namespace__); // As of PHP 5.3
-PHPKW(__trait__); // As of PHP 5.4
-
-/* We classify these as built-in names since they conflict, but PHP still runs */
-
-/* Predefined case-insensitive constants */
-/* These *MUST* be listed in lower case here */
-PHPBN1(null);
-PHPBN1(true);
-PHPBN1(false);
-
-/* "Core Predefined Constants" from http://php.net/manual/en/reserved.constants.php */
-/* These are case sensitive */
-PHPBN2(PHP_VERSION);
-PHPBN2(PHP_MAJOR_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_MINOR_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_RELEASE_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_VERSION_ID); // As of PHP 5.2.7
-PHPBN2(PHP_EXTRA_VERSION); // As of PHP 5.2.7
-PHPBN2(PHP_ZTS); // As of PHP 5.2.7
-PHPBN2(PHP_DEBUG); // As of PHP 5.2.7
-PHPBN2(PHP_MAXPATHLEN); // As of PHP 5.3.0
-PHPBN2(PHP_OS);
-PHPBN2(PHP_SAPI);
-PHPBN2(PHP_EOL); // As of PHP 5.0.2
-PHPBN2(PHP_INT_MAX); // As of PHP 5.0.5
-PHPBN2(PHP_INT_SIZE); // As of PHP 5.0.5
-PHPBN2(DEFAULT_INCLUDE_PATH);
-PHPBN2(PEAR_INSTALL_DIR);
-PHPBN2(PEAR_EXTENSION_DIR);
-PHPBN2(PHP_EXTENSION_DIR);
-PHPBN2(PHP_PREFIX);
-PHPBN2(PHP_BINDIR);
-PHPBN2(PHP_BINARY); // As of PHP 5.4
-PHPBN2(PHP_MANDIR); // As of PHP 5.3.7
-PHPBN2(PHP_LIBDIR);
-PHPBN2(PHP_DATADIR);
-PHPBN2(PHP_SYSCONFDIR);
-PHPBN2(PHP_LOCALSTATEDIR);
-PHPBN2(PHP_CONFIG_FILE_PATH);
-PHPBN2(PHP_CONFIG_FILE_SCAN_DIR);
-PHPBN2(PHP_SHLIB_SUFFIX);
-PHPBN2(E_ERROR);
-PHPBN2(E_WARNING);
-PHPBN2(E_PARSE);
-PHPBN2(E_NOTICE);
-PHPBN2(E_CORE_ERROR);
-PHPBN2(E_CORE_WARNING);
-PHPBN2(E_COMPILE_ERROR);
-PHPBN2(E_COMPILE_WARNING);
-PHPBN2(E_USER_ERROR);
-PHPBN2(E_USER_WARNING);
-PHPBN2(E_USER_NOTICE);
-PHPBN2(E_DEPRECATED); // As of PHP 5.3.0
-PHPBN2(E_USER_DEPRECATED); // As of PHP 5.3.0
-PHPBN2(E_ALL);
-PHPBN2(E_STRICT);
-PHPBN2(__COMPILER_HALT_OFFSET__); // As of PHP 5.1.0
-// TRUE, FALSE, NULL are listed on the same page, but are actually
-// case-insensitive, whereas all the other constants listed there seem to be
-// case-sensitive, so we handle TRUE, FALSE, NULL in PHPBN1.
-PHPBN2(PHP_OUTPUT_HANDLER_START);
-PHPBN2(PHP_OUTPUT_HANDLER_CONT);
-PHPBN2(PHP_OUTPUT_HANDLER_END);
-/* These don't actually seem to be set (tested on Linux, I guess they're
- * Windows only?) */
-PHPBN2(PHP_WINDOWS_NT_DOMAIN_CONTROLLER); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_NT_SERVER); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_NT_WORKSTATION); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_BUILD); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_MAJOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_MINOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_PLATFORM); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_PRODUCTTYPE); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_SP_MAJOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_SP_MINOR); // As of PHP 5.3
-PHPBN2(PHP_WINDOWS_VERSION_SUITEMASK); // As of PHP 5.3
-/* "Standard Predefined Constants" from http://php.net/manual/en/reserved.constants.php */
-PHPBN2(EXTR_OVERWRITE);
-PHPBN2(EXTR_SKIP);
-PHPBN2(EXTR_PREFIX_SAME);
-PHPBN2(EXTR_PREFIX_ALL);
-PHPBN2(EXTR_PREFIX_INVALID);
-PHPBN2(EXTR_PREFIX_IF_EXISTS);
-PHPBN2(EXTR_IF_EXISTS);
-PHPBN2(SORT_ASC);
-PHPBN2(SORT_DESC);
-PHPBN2(SORT_REGULAR);
-PHPBN2(SORT_NUMERIC);
-PHPBN2(SORT_STRING);
-PHPBN2(CASE_LOWER);
-PHPBN2(CASE_UPPER);
-PHPBN2(COUNT_NORMAL);
-PHPBN2(COUNT_RECURSIVE);
-PHPBN2(ASSERT_ACTIVE);
-PHPBN2(ASSERT_CALLBACK);
-PHPBN2(ASSERT_BAIL);
-PHPBN2(ASSERT_WARNING);
-PHPBN2(ASSERT_QUIET_EVAL);
-PHPBN2(CONNECTION_ABORTED);
-PHPBN2(CONNECTION_NORMAL);
-PHPBN2(CONNECTION_TIMEOUT);
-PHPBN2(INI_USER);
-PHPBN2(INI_PERDIR);
-PHPBN2(INI_SYSTEM);
-PHPBN2(INI_ALL);
-PHPBN2(INI_SCANNER_NORMAL); // As of PHP 5.3
-PHPBN2(INI_SCANNER_RAW); // As of PHP 5.3
-PHPBN2(M_E);
-PHPBN2(M_LOG2E);
-PHPBN2(M_LOG10E);
-PHPBN2(M_LN2);
-PHPBN2(M_LN10);
-PHPBN2(M_PI);
-PHPBN2(M_PI_2);
-PHPBN2(M_PI_4);
-PHPBN2(M_1_PI);
-PHPBN2(M_2_PI);
-PHPBN2(M_2_SQRTPI);
-PHPBN2(M_SQRT2);
-PHPBN2(M_SQRT1_2);
-PHPBN2(M_EULER); // As of PHP 5.2
-PHPBN2(M_LNPI); // As of PHP 5.2
-PHPBN2(M_SQRT3); // As of PHP 5.2
-PHPBN2(M_SQRTPI); // As of PHP 5.2
-PHPBN2(CRYPT_SALT_LENGTH);
-PHPBN2(CRYPT_STD_DES);
-PHPBN2(CRYPT_EXT_DES);
-PHPBN2(CRYPT_MD5);
-PHPBN2(CRYPT_BLOWFISH);
-PHPBN2(DIRECTORY_SEPARATOR);
-PHPBN2(SEEK_SET);
-PHPBN2(SEEK_CUR);
-PHPBN2(SEEK_END);
-PHPBN2(LOCK_SH);
-PHPBN2(LOCK_EX);
-PHPBN2(LOCK_UN);
-PHPBN2(LOCK_NB);
-PHPBN2(HTML_SPECIALCHARS);
-PHPBN2(HTML_ENTITIES);
-PHPBN2(ENT_COMPAT);
-PHPBN2(ENT_QUOTES);
-PHPBN2(ENT_NOQUOTES);
-PHPBN2(INFO_GENERAL);
-PHPBN2(INFO_CREDITS);
-PHPBN2(INFO_CONFIGURATION);
-PHPBN2(INFO_MODULES);
-PHPBN2(INFO_ENVIRONMENT);
-PHPBN2(INFO_VARIABLES);
-PHPBN2(INFO_LICENSE);
-PHPBN2(INFO_ALL);
-PHPBN2(CREDITS_GROUP);
-PHPBN2(CREDITS_GENERAL);
-PHPBN2(CREDITS_SAPI);
-PHPBN2(CREDITS_MODULES);
-PHPBN2(CREDITS_DOCS);
-PHPBN2(CREDITS_FULLPAGE);
-PHPBN2(CREDITS_QA);
-PHPBN2(CREDITS_ALL);
-PHPBN2(STR_PAD_LEFT);
-PHPBN2(STR_PAD_RIGHT);
-PHPBN2(STR_PAD_BOTH);
-PHPBN2(PATHINFO_DIRNAME);
-PHPBN2(PATHINFO_BASENAME);
-PHPBN2(PATHINFO_EXTENSION);
-PHPBN2(PATHINFO_FILENAME); // As of PHP 5.2
-PHPBN2(PATH_SEPARATOR);
-PHPBN2(CHAR_MAX);
-PHPBN2(LC_CTYPE);
-PHPBN2(LC_NUMERIC);
-PHPBN2(LC_TIME);
-PHPBN2(LC_COLLATE);
-PHPBN2(LC_MONETARY);
-PHPBN2(LC_ALL);
-PHPBN2(LC_MESSAGES);
-PHPBN2(ABDAY_1);
-PHPBN2(ABDAY_2);
-PHPBN2(ABDAY_3);
-PHPBN2(ABDAY_4);
-PHPBN2(ABDAY_5);
-PHPBN2(ABDAY_6);
-PHPBN2(ABDAY_7);
-PHPBN2(DAY_1);
-PHPBN2(DAY_2);
-PHPBN2(DAY_3);
-PHPBN2(DAY_4);
-PHPBN2(DAY_5);
-PHPBN2(DAY_6);
-PHPBN2(DAY_7);
-PHPBN2(ABMON_1);
-PHPBN2(ABMON_2);
-PHPBN2(ABMON_3);
-PHPBN2(ABMON_4);
-PHPBN2(ABMON_5);
-PHPBN2(ABMON_6);
-PHPBN2(ABMON_7);
-PHPBN2(ABMON_8);
-PHPBN2(ABMON_9);
-PHPBN2(ABMON_10);
-PHPBN2(ABMON_11);
-PHPBN2(ABMON_12);
-PHPBN2(MON_1);
-PHPBN2(MON_2);
-PHPBN2(MON_3);
-PHPBN2(MON_4);
-PHPBN2(MON_5);
-PHPBN2(MON_6);
-PHPBN2(MON_7);
-PHPBN2(MON_8);
-PHPBN2(MON_9);
-PHPBN2(MON_10);
-PHPBN2(MON_11);
-PHPBN2(MON_12);
-PHPBN2(AM_STR);
-PHPBN2(PM_STR);
-PHPBN2(D_T_FMT);
-PHPBN2(D_FMT);
-PHPBN2(T_FMT);
-PHPBN2(T_FMT_AMPM);
-PHPBN2(ERA);
-PHPBN2(ERA_YEAR);
-PHPBN2(ERA_D_T_FMT);
-PHPBN2(ERA_D_FMT);
-PHPBN2(ERA_T_FMT);
-PHPBN2(ALT_DIGITS);
-PHPBN2(INT_CURR_SYMBOL);
-PHPBN2(CURRENCY_SYMBOL);
-PHPBN2(CRNCYSTR);
-PHPBN2(MON_DECIMAL_POINT);
-PHPBN2(MON_THOUSANDS_SEP);
-PHPBN2(MON_GROUPING);
-PHPBN2(POSITIVE_SIGN);
-PHPBN2(NEGATIVE_SIGN);
-PHPBN2(INT_FRAC_DIGITS);
-PHPBN2(FRAC_DIGITS);
-PHPBN2(P_CS_PRECEDES);
-PHPBN2(P_SEP_BY_SPACE);
-PHPBN2(N_CS_PRECEDES);
-PHPBN2(N_SEP_BY_SPACE);
-PHPBN2(P_SIGN_POSN);
-PHPBN2(N_SIGN_POSN);
-PHPBN2(DECIMAL_POINT);
-PHPBN2(RADIXCHAR);
-PHPBN2(THOUSANDS_SEP);
-PHPBN2(THOUSEP);
-PHPBN2(GROUPING);
-PHPBN2(YESEXPR);
-PHPBN2(NOEXPR);
-PHPBN2(YESSTR);
-PHPBN2(NOSTR);
-PHPBN2(CODESET);
-PHPBN2(LOG_EMERG);
-PHPBN2(LOG_ALERT);
-PHPBN2(LOG_CRIT);
-PHPBN2(LOG_ERR);
-PHPBN2(LOG_WARNING);
-PHPBN2(LOG_NOTICE);
-PHPBN2(LOG_INFO);
-PHPBN2(LOG_DEBUG);
-PHPBN2(LOG_KERN);
-PHPBN2(LOG_USER);
-PHPBN2(LOG_MAIL);
-PHPBN2(LOG_DAEMON);
-PHPBN2(LOG_AUTH);
-PHPBN2(LOG_SYSLOG);
-PHPBN2(LOG_LPR);
-PHPBN2(LOG_NEWS);
-PHPBN2(LOG_UUCP);
-PHPBN2(LOG_CRON);
-PHPBN2(LOG_AUTHPRIV);
-PHPBN2(LOG_LOCAL0);
-PHPBN2(LOG_LOCAL1);
-PHPBN2(LOG_LOCAL2);
-PHPBN2(LOG_LOCAL3);
-PHPBN2(LOG_LOCAL4);
-PHPBN2(LOG_LOCAL5);
-PHPBN2(LOG_LOCAL6);
-PHPBN2(LOG_LOCAL7);
-PHPBN2(LOG_PID);
-PHPBN2(LOG_CONS);
-PHPBN2(LOG_ODELAY);
-PHPBN2(LOG_NDELAY);
-PHPBN2(LOG_NOWAIT);
-PHPBN2(LOG_PERROR);
-
-/* Added in PHP 5.2 */
-PHPBN2(PREG_BACKTRACK_LIMIT_ERROR);
-PHPBN2(PREG_BAD_UTF8_ERROR);
-PHPBN2(PREG_INTERNAL_ERROR);
-PHPBN2(PREG_NO_ERROR);
-PHPBN2(PREG_RECURSION_LIMIT_ERROR);
-PHPBN2(UPLOAD_ERR_EXTENSION);
-PHPBN2(STREAM_SHUT_RD);
-PHPBN2(STREAM_SHUT_WR);
-PHPBN2(STREAM_SHUT_RDWR);
-PHPBN2(CURLE_FILESIZE_EXCEEDED);
-PHPBN2(CURLE_FTP_SSL_FAILED);
-PHPBN2(CURLE_LDAP_INVALID_URL);
-PHPBN2(CURLFTPAUTH_DEFAULT);
-PHPBN2(CURLFTPAUTH_SSL);
-PHPBN2(CURLFTPAUTH_TLS);
-PHPBN2(CURLFTPSSL_ALL);
-PHPBN2(CURLFTPSSL_CONTROL);
-PHPBN2(CURLFTPSSL_NONE);
-PHPBN2(CURLFTPSSL_TRY);
-PHPBN2(CURLOPT_FTP_SSL);
-PHPBN2(CURLOPT_FTPSSLAUTH);
-PHPBN2(CURLOPT_TCP_NODELAY); // Added in PHP 5.2.1
-PHPBN2(CURLOPT_TIMEOUT_MS); // Added in PHP 5.2.3
-PHPBN2(CURLOPT_CONNECTTIMEOUT_MS); // Added in PHP 5.2.3
-PHPBN2(GMP_VERSION); // Added in PHP 5.2.2
-PHPBN2(SWFTEXTFIELD_USEFONT);
-PHPBN2(SWFTEXTFIELD_AUTOSIZE);
-PHPBN2(SWF_SOUND_NOT_COMPRESSED);
-PHPBN2(SWF_SOUND_ADPCM_COMPRESSED);
-PHPBN2(SWF_SOUND_MP3_COMPRESSED);
-PHPBN2(SWF_SOUND_NOT_COMPRESSED_LE);
-PHPBN2(SWF_SOUND_NELLY_COMPRESSED);
-PHPBN2(SWF_SOUND_5KHZ);
-PHPBN2(SWF_SOUND_11KHZ);
-PHPBN2(SWF_SOUND_22KHZ);
-PHPBN2(SWF_SOUND_44KHZ);
-PHPBN2(SWF_SOUND_8BITS);
-PHPBN2(SWF_SOUND_16BITS);
-PHPBN2(SWF_SOUND_MONO);
-PHPBN2(SWF_SOUND_STEREO);
-PHPBN2(OPENSSL_VERSION_NUMBER);
-PHPBN2(SNMP_OID_OUTPUT_FULL);
-PHPBN2(SNMP_OID_OUTPUT_NUMERIC);
-PHPBN2(MSG_EAGAIN);
-PHPBN2(MSG_ENOMSG);
-
-/* Added in PHP 5.3 */
-PHPBN2(CURLOPT_PROGRESSFUNCTION);
-PHPBN2(IMG_FILTER_PIXELATE);
-PHPBN2(JSON_ERROR_CTRL_CHAR);
-PHPBN2(JSON_ERROR_DEPTH);
-PHPBN2(JSON_ERROR_NONE);
-PHPBN2(JSON_ERROR_STATE_MISMATCH);
-PHPBN2(JSON_ERROR_SYNTAX);
-PHPBN2(JSON_FORCE_OBJECT);
-PHPBN2(JSON_HEX_TAG);
-PHPBN2(JSON_HEX_AMP);
-PHPBN2(JSON_HEX_APOS);
-PHPBN2(JSON_HEX_QUOT);
-PHPBN2(LDAP_OPT_NETWORK_TIMEOUT);
-PHPBN2(LIBXML_LOADED_VERSION);
-PHPBN2(PREG_BAD_UTF8_OFFSET_ERROR);
-PHPBN2(BUS_ADRALN);
-PHPBN2(BUS_ADRERR);
-PHPBN2(BUS_OBJERR);
-PHPBN2(CLD_CONTIUNED);
-PHPBN2(CLD_DUMPED);
-PHPBN2(CLD_EXITED);
-PHPBN2(CLD_KILLED);
-PHPBN2(CLD_STOPPED);
-PHPBN2(CLD_TRAPPED);
-PHPBN2(FPE_FLTDIV);
-PHPBN2(FPE_FLTINV);
-PHPBN2(FPE_FLTOVF);
-PHPBN2(FPE_FLTRES);
-PHPBN2(FPE_FLTSUB);
-PHPBN2(FPE_FLTUND);
-PHPBN2(FPE_INTDIV);
-PHPBN2(FPE_INTOVF);
-PHPBN2(ILL_BADSTK);
-PHPBN2(ILL_COPROC);
-PHPBN2(ILL_ILLADR);
-PHPBN2(ILL_ILLOPC);
-PHPBN2(ILL_ILLOPN);
-PHPBN2(ILL_ILLTRP);
-PHPBN2(ILL_PRVOPC);
-PHPBN2(ILL_PRVREG);
-PHPBN2(POLL_ERR);
-PHPBN2(POLL_HUP);
-PHPBN2(POLL_IN);
-PHPBN2(POLL_MSG);
-PHPBN2(POLL_OUT);
-PHPBN2(POLL_PRI);
-PHPBN2(SEGV_ACCERR);
-PHPBN2(SEGV_MAPERR);
-PHPBN2(SI_ASYNCIO);
-PHPBN2(SI_KERNEL);
-PHPBN2(SI_MESGQ);
-PHPBN2(SI_NOINFO);
-PHPBN2(SI_QUEUE);
-PHPBN2(SI_SIGIO);
-PHPBN2(SI_TIMER);
-PHPBN2(SI_TKILL);
-PHPBN2(SI_USER);
-PHPBN2(SIG_BLOCK);
-PHPBN2(SIG_SETMASK);
-PHPBN2(SIG_UNBLOCK);
-PHPBN2(TRAP_BRKPT);
-PHPBN2(TRAP_TRACE);
-
-/* Added in PHP 5.4 */
-PHPBN2(ENT_DISALLOWED);
-PHPBN2(ENT_HTML401);
-PHPBN2(ENT_HTML5);
-PHPBN2(ENT_SUBSTITUTE);
-PHPBN2(ENT_XML1);
-PHPBN2(ENT_XHTML);
-PHPBN2(IPPROTO_IP);
-PHPBN2(IPPROTO_IPV6);
-PHPBN2(IPV6_MULTICAST_HOPS);
-PHPBN2(IPV6_MULTICAST_IF);
-PHPBN2(IPV6_MULTICAST_LOOP);
-PHPBN2(IP_MULTICAST_IF);
-PHPBN2(IP_MULTICAST_LOOP);
-PHPBN2(IP_MULTICAST_TTL);
-PHPBN2(MCAST_JOIN_GROUP);
-PHPBN2(MCAST_LEAVE_GROUP);
-PHPBN2(MCAST_BLOCK_SOURCE);
-PHPBN2(MCAST_UNBLOCK_SOURCE);
-PHPBN2(MCAST_JOIN_SOURCE_GROUP);
-PHPBN2(MCAST_LEAVE_SOURCE_GROUP);
-PHPBN2(CURLOPT_MAX_RECV_SPEED_LARGE);
-PHPBN2(CURLOPT_MAX_SEND_SPEED_LARGE);
-PHPBN2(LIBXML_HTML_NODEFDTD);
-PHPBN2(LIBXML_HTML_NOIMPLIED);
-PHPBN2(LIBXML_PEDANTIC);
-PHPBN2(OPENSSL_CIPHER_AES_128_CBC);
-PHPBN2(OPENSSL_CIPHER_AES_192_CBC);
-PHPBN2(OPENSSL_CIPHER_AES_256_CBC);
-PHPBN2(OPENSSL_RAW_DATA);
-PHPBN2(OPENSSL_ZERO_PADDING);
-PHPBN2(PHP_OUTPUT_HANDLER_CLEAN);
-PHPBN2(PHP_OUTPUT_HANDLER_CLEANABLE);
-PHPBN2(PHP_OUTPUT_HANDLER_DISABLED);
-PHPBN2(PHP_OUTPUT_HANDLER_FINAL);
-PHPBN2(PHP_OUTPUT_HANDLER_FLUSH);
-PHPBN2(PHP_OUTPUT_HANDLER_FLUSHABLE);
-PHPBN2(PHP_OUTPUT_HANDLER_REMOVABLE);
-PHPBN2(PHP_OUTPUT_HANDLER_STARTED);
-PHPBN2(PHP_OUTPUT_HANDLER_STDFLAGS);
-PHPBN2(PHP_OUTPUT_HANDLER_WRITE);
-PHPBN2(PHP_SESSION_ACTIVE);
-PHPBN2(PHP_SESSION_DISABLED);
-PHPBN2(PHP_SESSION_NONE);
-PHPBN2(STREAM_META_ACCESS);
-PHPBN2(STREAM_META_GROUP);
-PHPBN2(STREAM_META_GROUP_NAME);
-PHPBN2(STREAM_META_OWNER);
-PHPBN2(STREAM_META_OWNER_NAME);
-PHPBN2(STREAM_META_TOUCH);
-PHPBN2(ZLIB_ENCODING_DEFLATE);
-PHPBN2(ZLIB_ENCODING_GZIP);
-PHPBN2(ZLIB_ENCODING_RAW);
-PHPBN2(U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR);
-PHPBN2(IDNA_CHECK_BIDI);
-PHPBN2(IDNA_CHECK_CONTEXTJ);
-PHPBN2(IDNA_NONTRANSITIONAL_TO_ASCII);
-PHPBN2(IDNA_NONTRANSITIONAL_TO_UNICODE);
-PHPBN2(INTL_IDNA_VARIANT_2003);
-PHPBN2(INTL_IDNA_VARIANT_UTS46);
-PHPBN2(IDNA_ERROR_EMPTY_LABEL);
-PHPBN2(IDNA_ERROR_LABEL_TOO_LONG);
-PHPBN2(IDNA_ERROR_DOMAIN_NAME_TOO_LONG);
-PHPBN2(IDNA_ERROR_LEADING_HYPHEN);
-PHPBN2(IDNA_ERROR_TRAILING_HYPHEN);
-PHPBN2(IDNA_ERROR_HYPHEN_3_4);
-PHPBN2(IDNA_ERROR_LEADING_COMBINING_MARK);
-PHPBN2(IDNA_ERROR_DISALLOWED);
-PHPBN2(IDNA_ERROR_PUNYCODE);
-PHPBN2(IDNA_ERROR_LABEL_HAS_DOT);
-PHPBN2(IDNA_ERROR_INVALID_ACE_LABEL);
-PHPBN2(IDNA_ERROR_BIDI);
-PHPBN2(IDNA_ERROR_CONTEXTJ);
-PHPBN2(JSON_PRETTY_PRINT);
-PHPBN2(JSON_UNESCAPED_SLASHES);
-PHPBN2(JSON_NUMERIC_CHECK);
-PHPBN2(JSON_UNESCAPED_UNICODE);
-PHPBN2(JSON_BIGINT_AS_STRING);
-
-/* Added in PHP 5.5 */
-PHPBN2(IMG_AFFINE_TRANSLATE);
-PHPBN2(IMG_AFFINE_SCALE);
-PHPBN2(IMG_AFFINE_ROTATE);
-PHPBN2(IMG_AFFINE_SHEAR_HORIZONTAL);
-PHPBN2(IMG_AFFINE_SHEAR_VERTICAL);
-PHPBN2(IMG_CROP_DEFAULT);
-PHPBN2(IMG_CROP_TRANSPARENT);
-PHPBN2(IMG_CROP_BLACK);
-PHPBN2(IMG_CROP_WHITE);
-PHPBN2(IMG_CROP_SIDES);
-PHPBN2(IMG_FLIP_BOTH);
-PHPBN2(IMG_FLIP_HORIZONTAL);
-PHPBN2(IMG_FLIP_VERTICAL);
-PHPBN2(IMG_BELL);
-PHPBN2(IMG_BESSEL);
-PHPBN2(IMG_BICUBIC);
-PHPBN2(IMG_BICUBIC_FIXED);
-PHPBN2(IMG_BLACKMAN);
-PHPBN2(IMG_BOX);
-PHPBN2(IMG_BSPLINE);
-PHPBN2(IMG_CATMULLROM);
-PHPBN2(IMG_GAUSSIAN);
-PHPBN2(IMG_GENERALIZED_CUBIC);
-PHPBN2(IMG_HERMITE);
-PHPBN2(IMG_HAMMING);
-PHPBN2(IMG_HANNING);
-PHPBN2(IMG_MITCHELL);
-PHPBN2(IMG_POWER);
-PHPBN2(IMG_QUADRATIC);
-PHPBN2(IMG_SINC);
-PHPBN2(IMG_NEAREST_NEIGHBOUR);
-PHPBN2(IMG_WEIGHTED4);
-PHPBN2(IMG_TRIANGLE);
-PHPBN2(JSON_ERROR_RECURSION);
-PHPBN2(JSON_ERROR_INF_OR_NAN);
-PHPBN2(JSON_ERROR_UNSUPPORTED_TYPE);
-PHPBN2(MYSQLI_SERVER_PUBLIC_KEY);
-
-/* Added in PHP 5.6 */
-PHPBN2(LDAP_ESCAPE_DN);
-PHPBN2(LDAP_ESCAPE_FILTER);
-PHPBN2(OPENSSL_DEFAULT_STREAM_CIPHERS);
-PHPBN2(STREAM_CRYPTO_METHOD_ANY_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_ANY_SERVER);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_0_SERVER);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_1_SERVER);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
-PHPBN2(STREAM_CRYPTO_METHOD_TLSv1_2_SERVER);
-PHPBN2(PGSQL_CONNECT_ASYNC);
-PHPBN2(PGSQL_CONNECTION_AUTH_OK);
-PHPBN2(PGSQL_CONNECTION_AWAITING_RESPONSE);
-PHPBN2(PGSQL_CONNECTION_MADE);
-PHPBN2(PGSQL_CONNECTION_SETENV);
-PHPBN2(PGSQL_CONNECTION_SSL_STARTUP);
-PHPBN2(PGSQL_CONNECTION_STARTED);
-PHPBN2(PGSQL_DML_ESCAPE);
-PHPBN2(PGSQL_POLLING_ACTIVE);
-PHPBN2(PGSQL_POLLING_FAILED);
-PHPBN2(PGSQL_POLLING_OK);
-PHPBN2(PGSQL_POLLING_READING);
-PHPBN2(PGSQL_POLLING_WRITING);
-
-/* Class names reserved by PHP (case insensitive) */
-PHPCN(directory);
-PHPCN(stdclass);
-PHPCN(__php_incomplete_class);
-/* Added in PHP5. */
-PHPCN(exception);
-PHPCN(errorexception); // As of PHP 5.1
-PHPCN(php_user_filter);
-PHPCN(closure); // As of PHP 5.3
-PHPCN(generator); // As of PHP 5.5
-PHPCN(self);
-PHPCN(static);
-PHPCN(parent);
-/* From extensions (which of these are actually predefined depends which
- * extensions are loaded by default). */
-PHPCN(xmlwriter);
-PHPCN(libxmlerror);
-PHPCN(simplexmlelement);
-PHPCN(soapclient);
-PHPCN(soapvar);
-PHPCN(soapserver);
-PHPCN(soapfault);
-PHPCN(soapparam);
-PHPCN(soapheader);
-PHPCN(recursiveiteratoriterator);
-PHPCN(filteriterator);
-PHPCN(recursivefilteriterator);
-PHPCN(parentiterator);
-PHPCN(limititerator);
-PHPCN(cachingiterator);
-PHPCN(recursivecachingiterator);
-PHPCN(iteratoriterator);
-PHPCN(norewinditerator);
-PHPCN(appenditerator);
-PHPCN(infiniteiterator);
-PHPCN(emptyiterator);
-PHPCN(arrayobject);
-PHPCN(arrayiterator);
-PHPCN(recursivearrayiterator);
-PHPCN(splfileinfo);
-PHPCN(directoryiterator);
-PHPCN(recursivedirectoryiterator);
-PHPCN(splfileobject);
-PHPCN(spltempfileobject);
-PHPCN(simplexmliterator);
-PHPCN(logicexception);
-PHPCN(badfunctioncallexception);
-PHPCN(badmethodcallexception);
-PHPCN(domainexception);
-PHPCN(invalidargumentexception);
-PHPCN(lengthexception);
-PHPCN(outofrangeexception);
-PHPCN(runtimeexception);
-PHPCN(outofboundsexception);
-PHPCN(overflowexception);
-PHPCN(rangeexception);
-PHPCN(underflowexception);
-PHPCN(unexpectedvalueexception);
-PHPCN(splobjectstorage);
-PHPCN(reflectionexception);
-PHPCN(reflection);
-PHPCN(reflectionfunction);
-PHPCN(reflectionparameter);
-PHPCN(reflectionmethod);
-PHPCN(reflectionclass);
-PHPCN(reflectionobject);
-PHPCN(reflectionproperty);
-PHPCN(reflectionextension);
-PHPCN(domexception);
-PHPCN(domstringlist);
-PHPCN(domnamelist);
-PHPCN(domimplementationlist);
-PHPCN(domimplementationsource);
-PHPCN(domimplementation);
-PHPCN(domnode);
-PHPCN(domnamespacenode);
-PHPCN(domdocumentfragment);
-PHPCN(domdocument);
-PHPCN(domnodelist);
-PHPCN(domnamednodemap);
-PHPCN(domcharacterdata);
-PHPCN(domattr);
-PHPCN(domelement);
-PHPCN(domtext);
-PHPCN(domcomment);
-PHPCN(domtypeinfo);
-PHPCN(domuserdatahandler);
-PHPCN(domdomerror);
-PHPCN(domerrorhandler);
-PHPCN(domlocator);
-PHPCN(domconfiguration);
-PHPCN(domcdatasection);
-PHPCN(domdocumenttype);
-PHPCN(domnotation);
-PHPCN(domentity);
-PHPCN(domentityreference);
-PHPCN(domprocessinginstruction);
-PHPCN(domstringextend);
-PHPCN(domxpath);
-PHPCN(xmlreader);
-PHPCN(sqlitedatabase);
-PHPCN(sqliteresult);
-PHPCN(sqliteunbuffered);
-PHPCN(sqliteexception);
-PHPCN(datetime);
-
-/* Built-in PHP functions (incomplete). */
-/* Includes Array Functions - http://php.net/manual/en/ref.array.php */
-/* Check is case insensitive - these *MUST* be listed in lower case here */
-PHPFN(acos);
-PHPFN(array_change_key_case);
-PHPFN(array_chunk);
-PHPFN(array_column);
-PHPFN(array_combine);
-PHPFN(array_count_values);
-PHPFN(array_diff);
-PHPFN(array_diff_assoc);
-PHPFN(array_diff_key);
-PHPFN(array_diff_uassoc);
-PHPFN(array_diff_ukey);
-PHPFN(array_fill);
-PHPFN(array_fill_keys);
-PHPFN(array_filter);
-PHPFN(array_flip);
-PHPFN(array_intersect);
-PHPFN(array_intersect_assoc);
-PHPFN(array_intersect_key);
-PHPFN(array_intersect_uassoc);
-PHPFN(array_intersect_ukey);
-PHPFN(array_key_exists);
-PHPFN(array_keys);
-PHPFN(array_map);
-PHPFN(array_merge);
-PHPFN(array_merge_recursive);
-PHPFN(array_multisort);
-PHPFN(array_pad);
-PHPFN(array_pop);
-PHPFN(array_product);
-PHPFN(array_push);
-PHPFN(array_rand);
-PHPFN(array_reduce);
-PHPFN(array_replace);
-PHPFN(array_replace_recursive);
-PHPFN(array_reverse);
-PHPFN(array_search);
-PHPFN(array_shift);
-PHPFN(array_slice);
-PHPFN(array_splice);
-PHPFN(array_sum);
-PHPFN(array_udiff);
-PHPFN(array_udiff_assoc);
-PHPFN(array_udiff_uassoc);
-PHPFN(array_uintersect);
-PHPFN(array_uintersect_assoc);
-PHPFN(array_uintersect_uassoc);
-PHPFN(array_unique);
-PHPFN(array_unshift);
-PHPFN(array_values);
-PHPFN(array_walk);
-PHPFN(array_walk_recursive);
-PHPFN(arsort);
-PHPFN(asin);
-PHPFN(asort);
-PHPFN(atan);
-PHPFN(atan2);
-PHPFN(ceil);
-PHPFN(compact);
-PHPFN(cos);
-PHPFN(cosh);
-PHPFN(count);
-PHPFN(current);
-PHPFN(each);
-PHPFN(end);
-PHPFN(exp);
-PHPFN(extract);
-PHPFN(floor);
-PHPFN(fmod);
-PHPFN(in_array);
-PHPFN(key);
-PHPFN(key_exists);
-PHPFN(krsort);
-PHPFN(ksort);
-PHPFN(log);
-PHPFN(log10);
-PHPFN(max);
-PHPFN(min);
-PHPFN(natcasesort);
-PHPFN(natsort);
-PHPFN(next);
-PHPFN(pos);
-PHPFN(pow);
-PHPFN(prev);
-PHPFN(range);
-PHPFN(reset);
-PHPFN(rsort);
-PHPFN(shuffle);
-PHPFN(sin);
-PHPFN(sinh);
-PHPFN(sizeof);
-PHPFN(sort);
-PHPFN(sqrt);
-PHPFN(tan);
-PHPFN(tanh);
-PHPFN(uasort);
-PHPFN(uksort);
-PHPFN(usort);
-
-#undef PHPKW
-#undef PHPBN1a
-#undef PHPBN1b
-#undef PHPBN1
-#undef PHPBN2a
-#undef PHPBN2b
-#undef PHPBN2
-#undef PHPCN
-#undef PHPFN
diff --git a/dependencies2013/win32/swig/Lib/php5/phppointers.i b/dependencies2013/win32/swig/Lib/php5/phppointers.i
deleted file mode 100644
index e50ada7a..00000000
--- a/dependencies2013/win32/swig/Lib/php5/phppointers.i
+++ /dev/null
@@ -1,42 +0,0 @@
-%define %pass_by_ref( TYPE, CONVERT_IN, CONVERT_OUT )
-%typemap(in, byref=1) TYPE *REF ($*1_ltype tmp),
-             TYPE &REF ($*1_ltype tmp)
-%{
-  /* First Check for SWIG wrapped type */
-  if ( ZVAL_IS_NULL( *$input ) ) {
-      $1 = 0;
-  } else if ( PZVAL_IS_REF( *$input ) ) {
-      /* Not swig wrapped type, so we check if it's a PHP reference type */
-      CONVERT_IN( tmp, $*1_ltype, $input );
-      $1 = &tmp;
-  } else {
-      SWIG_PHP_Error( E_ERROR, SWIG_PHP_Arg_Error_Msg($argnum, Expected a reference) );
-  }
-%}
-%typemap(argout) TYPE *REF,
-                 TYPE &REF
-  "CONVERT_OUT(*$input, tmp$argnum );";
-%enddef
-
-%pass_by_ref( size_t, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed int, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( int, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( unsigned int, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed short, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( short, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( unsigned short, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed long, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( long, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( unsigned long, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( signed char, CONVERT_INT_IN, ZVAL_LONG );
-%pass_by_ref( char, CONVERT_CHAR_IN, ZVAL_STRING );
-%pass_by_ref( unsigned char, CONVERT_INT_IN, ZVAL_LONG );
-
-%pass_by_ref( float, CONVERT_FLOAT_IN, ZVAL_DOUBLE );
-%pass_by_ref( double, CONVERT_FLOAT_IN, ZVAL_DOUBLE );
-
-%pass_by_ref( char *, CONVERT_CHAR_IN, ZVAL_STRING );
diff --git a/dependencies2013/win32/swig/Lib/php5/phprun.swg b/dependencies2013/win32/swig/Lib/php5/phprun.swg
deleted file mode 100644
index a18e1fcb..00000000
--- a/dependencies2013/win32/swig/Lib/php5/phprun.swg
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -----------------------------------------------------------------------------
- * phprun.swg
- *
- * PHP runtime library
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_exceptions.h"
-#include "php.h"
-
-#if PHP_MAJOR_VERSION != 5
-# error These bindings need PHP5 - to generate PHP7 bindings use: swig -php7
-#endif
-
-#include "ext/standard/php_string.h"
-#include <stdlib.h> /* for abort(), used in generated code. */
-
-#ifdef ZEND_RAW_FENTRY
-/* ZEND_RAW_FENTRY was added somewhere between 5.2.0 and 5.2.3 */
-# define SWIG_ZEND_NAMED_FE(ZN, N, A) ZEND_RAW_FENTRY((char*)#ZN, N, A, 0)
-#else
-/* This causes warnings from GCC >= 4.2 (assigning a string literal to char*).
- * But this seems to be unavoidable without directly assuming knowledge of
- * the structure, which changed between PHP4 and PHP5. */
-# define SWIG_ZEND_NAMED_FE(ZN, N, A) ZEND_NAMED_FE(ZN, N, A)
-#endif
-
-#ifndef ZEND_FE_END
-# define ZEND_FE_END { NULL, NULL, NULL }
-#endif
-
-#ifndef Z_SET_ISREF_P
-/* For PHP < 5.3 */
-# define Z_SET_ISREF_P(z) (z)->is_ref = 1
-#endif
-#ifndef Z_SET_REFCOUNT_P
-/* For PHP < 5.3 */
-# define Z_SET_REFCOUNT_P(z, rc) (z)->refcount = (rc)
-#endif
-
-#define SWIG_LONG_CONSTANT(N, V) zend_register_long_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
-#define SWIG_DOUBLE_CONSTANT(N, V) zend_register_double_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
-#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), (char*)(V), strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
-#define SWIG_CHAR_CONSTANT(N, V) do {\
-    static char swig_char = (V);\
-    zend_register_stringl_constant((char*)#N, sizeof(#N), &swig_char, 1, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);\
-} while (0)
-
-/* These TSRMLS_ stuff should already be defined now, but with older php under
-   redhat are not... */
-#ifndef TSRMLS_D
-#define TSRMLS_D
-#endif
-#ifndef TSRMLS_DC
-#define TSRMLS_DC
-#endif
-#ifndef TSRMLS_C
-#define TSRMLS_C
-#endif
-#ifndef TSRMLS_CC
-#define TSRMLS_CC
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/* But in fact SWIG_ConvertPtr is the native interface for getting typed
-   pointer values out of zvals.  We need the TSRMLS_ macros for when we
-   make PHP type calls later as we handle php resources */
-#define SWIG_ConvertPtr(obj,pp,type,flags) SWIG_ZTS_ConvertPtr(obj,pp,type,flags TSRMLS_CC)
-
-
-#define SWIG_fail goto fail
-
-static const char *default_error_msg = "Unknown error occurred";
-static int default_error_code = E_ERROR;
-
-#define SWIG_PHP_Arg_Error_Msg(argnum,extramsg) "Error in argument " #argnum " "#extramsg
-
-#define SWIG_PHP_Error(code,msg) do { SWIG_ErrorCode() = code; SWIG_ErrorMsg() = msg; SWIG_fail; } while (0)
-
-#define SWIG_contract_assert(expr,msg) \
-  if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else
-
-/* Standard SWIG API */
-#define SWIG_GetModule(clientdata) SWIG_Php_GetModule()
-#define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer)
-
-/* used to wrap returned objects in so we know whether they are newobject
-   and need freeing, or not */
-typedef struct {
-  void * ptr;
-  int newobject;
-} swig_object_wrapper;
-
-#define SWIG_SetPointerZval(a,b,c,d) SWIG_ZTS_SetPointerZval(a,b,c,d TSRMLS_CC)
-#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a))
-
-static void
-SWIG_ZTS_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject TSRMLS_DC) {
-  /*
-   * First test for Null pointers.  Return those as PHP native NULL
-   */
-  if (!ptr ) {
-    ZVAL_NULL(z);
-    return;
-  }
-  if (type->clientdata) {
-    swig_object_wrapper *value;
-    if (! (*(int *)(type->clientdata)))
-      zend_error(E_ERROR, "Type: %s failed to register with zend",type->name);
-    value=(swig_object_wrapper *)emalloc(sizeof(swig_object_wrapper));
-    value->ptr=ptr;
-    value->newobject=(newobject & 1);
-    if ((newobject & 2) == 0) {
-      /* Just register the pointer as a resource. */
-      ZEND_REGISTER_RESOURCE(z, value, *(int *)(type->clientdata));
-    } else {
-      /*
-       * Wrap the resource in an object, the resource will be accessible
-       * via the "_cPtr" member. This is currently only used by
-       * directorin typemaps.
-       */
-      zval *resource;
-      zend_class_entry **ce = NULL;
-      const char *type_name = type->name+3; /* +3 so: _p_Foo -> Foo */
-      size_t type_name_len;
-      int result;
-      const char * p;
-
-      /* Namespace__Foo -> Foo */
-      /* FIXME: ugly and goes wrong for classes with __ in their names. */
-      while ((p = strstr(type_name, "__")) != NULL) {
-        type_name = p + 2;
-      }
-      type_name_len = strlen(type_name);
-
-      MAKE_STD_ZVAL(resource);
-      ZEND_REGISTER_RESOURCE(resource, value, *(int *)(type->clientdata));
-      if (SWIG_PREFIX_LEN > 0) {
-        char * classname = (char*)emalloc(SWIG_PREFIX_LEN + type_name_len + 1);
-        strcpy(classname, SWIG_PREFIX);
-        strcpy(classname + SWIG_PREFIX_LEN, type_name);
-        result = zend_lookup_class(classname, SWIG_PREFIX_LEN + type_name_len, &ce TSRMLS_CC);
-        efree(classname);
-      } else {
-        result = zend_lookup_class((char *)type_name, type_name_len, &ce TSRMLS_CC);
-      }
-      if (result != SUCCESS) {
-        /* class does not exist */
-        object_init(z);
-      } else {
-        object_init_ex(z, *ce);
-      }
-      Z_SET_REFCOUNT_P(z, 1);
-      Z_SET_ISREF_P(z);
-      zend_hash_update(HASH_OF(z), (char*)"_cPtr", sizeof("_cPtr"), (void*)&resource, sizeof(zval*), NULL);
-    }
-    return;
-  }
-  zend_error(E_ERROR, "Type: %s not registered with zend",type->name);
-}
-
-/* This pointer conversion routine takes the native pointer p (along with
-   its type name) and converts it by calling appropriate casting functions
-   according to ty.  The resultant pointer is returned, or NULL is returned
-   if the pointer can't be cast.
-
-   Sadly PHP has no API to find a type name from a type id, only from an
-   instance of a resource of the type id, so we have to pass type_name as well.
-
-   The two functions which might call this are:
-   SWIG_ZTS_ConvertResourcePtr which gets the type name from the resource
-   and the registered zend destructors for which we have one per type each
-   with the type name hard wired in. */
-static void *
-SWIG_ZTS_ConvertResourceData(void * p, const char *type_name, swig_type_info *ty TSRMLS_DC) {
-  swig_cast_info *tc;
-  void *result = 0;
-
-  if (!ty) {
-    /* They don't care about the target type, so just pass on the pointer! */
-    return p;
-  }
-
-  if (! type_name) {  
-    /* can't convert p to ptr type ty if we don't know what type p is */
-    return NULL;
-  }
-
-  /* convert and cast p from type_name to ptr as ty. */
-  tc = SWIG_TypeCheck(type_name, ty);
-  if (tc) {
-    int newmemory = 0;
-    result = SWIG_TypeCast(tc, p, &newmemory);
-    assert(!newmemory); /* newmemory handling not yet implemented */
-  }
-  return result;
-}
-
-/* This function returns a pointer of type ty by extracting the pointer
-   and type info from the resource in z.  z must be a resource.
-   If it fails, NULL is returned.
-   It uses SWIG_ZTS_ConvertResourceData to do the real work. */
-static void *
-SWIG_ZTS_ConvertResourcePtr(zval *z, swig_type_info *ty, int flags TSRMLS_DC) {
-  swig_object_wrapper *value;
-  void *p;
-  int type;
-  const char *type_name;
-
-  value = (swig_object_wrapper *) zend_list_find(z->value.lval, &type);
-  if (type==-1) return NULL;
-  if (flags & SWIG_POINTER_DISOWN) {
-    value->newobject = 0;
-  }
-  p = value->ptr;
-
-  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
-
-  return SWIG_ZTS_ConvertResourceData(p, type_name, ty TSRMLS_CC);
-}
-
-/* We allow passing of a RESOURCE pointing to the object or an OBJECT whose
-   _cPtr is a resource pointing to the object */
-static int
-SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) {
-  if (z == NULL) {
-    *ptr = 0;
-    return 0;
-  }
-
-  switch (z->type) {
-    case IS_OBJECT: {
-      zval ** _cPtr;
-      if (zend_hash_find(HASH_OF(z),(char*)"_cPtr",sizeof("_cPtr"),(void**)&_cPtr)==SUCCESS) {
-	if ((*_cPtr)->type==IS_RESOURCE) {
-	  *ptr = SWIG_ZTS_ConvertResourcePtr(*_cPtr, ty, flags TSRMLS_CC);
-	  return (*ptr == NULL ? -1 : 0);
-	}
-      }
-      break;
-    }
-    case IS_RESOURCE:
-      *ptr = SWIG_ZTS_ConvertResourcePtr(z, ty, flags TSRMLS_CC);
-      return (*ptr == NULL ? -1 : 0);
-    case IS_NULL:
-      *ptr = 0;
-      return 0;
-  }
-
-  return -1;
-}
-
-static char const_name[] = "swig_runtime_data_type_pointer";
-static swig_module_info *SWIG_Php_GetModule() {
-  zval *pointer;
-  swig_module_info *ret = 0;
-  TSRMLS_FETCH();
-
-  MAKE_STD_ZVAL(pointer);
-
-  if (zend_get_constant(const_name, sizeof(const_name) - 1, pointer TSRMLS_CC)) {
-    if (pointer->type == IS_LONG) {
-      ret = (swig_module_info *) pointer->value.lval;
-    }
-  } 
-  FREE_ZVAL(pointer);
-  return ret; 
-}
-
-static void SWIG_Php_SetModule(swig_module_info *pointer) {
-  TSRMLS_FETCH();
-  REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, CONST_PERSISTENT | CONST_CS);
-}
diff --git a/dependencies2013/win32/swig/Lib/php5/std_common.i b/dependencies2013/win32/swig/Lib/php5/std_common.i
deleted file mode 100644
index 092bf012..00000000
--- a/dependencies2013/win32/swig/Lib/php5/std_common.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%apply size_t { std::size_t };
-
diff --git a/dependencies2013/win32/swig/Lib/php5/std_deque.i b/dependencies2013/win32/swig/Lib/php5/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/php5/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/php5/std_map.i b/dependencies2013/win32/swig/Lib/php5/std_map.i
deleted file mode 100644
index 6d5e3db1..00000000
--- a/dependencies2013/win32/swig/Lib/php5/std_map.i
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_map.i
- *
- * SWIG typemaps for std::map
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-            bool is_empty() const {
-                return self->empty();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/php5/std_pair.i b/dependencies2013/win32/swig/Lib/php5/std_pair.i
deleted file mode 100644
index fe45ee67..00000000
--- a/dependencies2013/win32/swig/Lib/php5/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * SWIG typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/php5/std_string.i b/dependencies2013/win32/swig/Lib/php5/std_string.i
deleted file mode 100644
index aaa5dc9c..00000000
--- a/dependencies2013/win32/swig/Lib/php5/std_string.i
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string types
- * ----------------------------------------------------------------------------- */
-
-// ------------------------------------------------------------------------
-// std::string is typemapped by value
-// This can prevent exporting methods which return a string
-// in order for the user to modify it.
-// However, I think I'll wait until someone asks for it...
-// ------------------------------------------------------------------------
-
-%include <exception.i>
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-    %naturalvar string;
-
-    class string;
-
-    %typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) string, const string& %{
-        $1 = ( Z_TYPE_PP($input) == IS_STRING ) ? 1 : 0;
-    %}
-
-    %typemap(in) string %{
-        convert_to_string_ex($input);
-        $1.assign(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
-    %}
-
-    %typemap(directorout) string %{
-        convert_to_string_ex(&$input);
-        $result.assign(Z_STRVAL_P($input), Z_STRLEN_P($input));
-    %}
-
-    %typemap(out) string %{
-        ZVAL_STRINGL($result, const_cast<char*>($1.data()), $1.size(), 1);
-    %}
-
-    %typemap(directorin) string, const string& %{
-        ZVAL_STRINGL($input, const_cast<char*>($1.data()), $1.size(), 1);
-    %}
-
-    %typemap(out) const string & %{
-        ZVAL_STRINGL($result, const_cast<char*>($1->data()), $1->size(), 1);
-    %}
-
-    %typemap(throws) string, const string& %{
-        zend_throw_exception(NULL, const_cast<char*>($1.c_str()), 0 TSRMLS_CC);
-        return;
-    %}
-
-    /* These next two handle a function which takes a non-const reference to
-     * a std::string and modifies the string. */
-    %typemap(in) string & ($*1_ltype temp) %{
-        convert_to_string_ex($input);
-        temp.assign(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
-        $1 = &temp;
-    %}
-
-    %typemap(directorout) string & ($*1_ltype *temp) %{
-        convert_to_string_ex(&$input);
-        temp = new $*1_ltype(Z_STRVAL_P($input), Z_STRLEN_P($input));
-        swig_acquire_ownership(temp);
-        $result = temp;
-    %}
-
-    %typemap(argout) string & %{
-	ZVAL_STRINGL(*($input), const_cast<char*>($1->data()), $1->size(), 1);
-    %}
-
-    /* SWIG will apply the non-const typemap above to const string& without
-     * this more specific typemap. */
-    %typemap(argout) const string & "";
-}
diff --git a/dependencies2013/win32/swig/Lib/php5/std_vector.i b/dependencies2013/win32/swig/Lib/php5/std_vector.i
deleted file mode 100644
index 9cc1486e..00000000
--- a/dependencies2013/win32/swig/Lib/php5/std_vector.i
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%{
-#include <vector>
-#include <stdexcept>
-%}
-
-namespace std {
-
-  template<class T> class vector {
-  public:
-    typedef size_t size_type;
-    typedef T value_type;
-    typedef const value_type& const_reference;
-    vector();
-    vector(size_type n);
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n);
-    void clear();
-    %rename(push) push_back;
-    void push_back(const value_type& x);
-    %extend {
-      bool is_empty() const {
-        return $self->empty();
-      }
-      T pop() throw (std::out_of_range) {
-        if (self->size() == 0)
-          throw std::out_of_range("pop from empty vector");
-        T x = self->back();
-        self->pop_back();
-        return x;
-      }
-      const_reference get(int i) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          return (*self)[i];
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-      void set(int i, const value_type& val) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          (*self)[i] = val;
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-    }
-  };
-
-  // bool specialization
-  template<> class vector<bool> {
-  public:
-    typedef size_t size_type;
-    typedef bool value_type;
-    typedef bool const_reference;
-    vector();
-    vector(size_type n);
-    size_type size() const;
-    size_type capacity() const;
-    void reserve(size_type n);
-    void clear();
-    %rename(push) push_back;
-    void push_back(const value_type& x);
-    %extend {
-      bool is_empty() const {
-        return $self->empty();
-      }
-      bool pop() throw (std::out_of_range) {
-        if (self->size() == 0)
-          throw std::out_of_range("pop from empty vector");
-        bool x = self->back();
-        self->pop_back();
-        return x;
-      }
-      bool get(int i) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          return (*self)[i];
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-      void set(int i, const value_type& val) throw (std::out_of_range) {
-        int size = int(self->size());
-        if (i>=0 && i<size)
-          (*self)[i] = val;
-        else
-          throw std::out_of_range("vector index out of range");
-      }
-    }
-  };
-}
-
-%define specialize_std_vector(T)
-#warning "specialize_std_vector - specialization for type T no longer needed"
-%enddef
-
-
diff --git a/dependencies2013/win32/swig/Lib/php5/stl.i b/dependencies2013/win32/swig/Lib/php5/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/php5/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/php5/typemaps.i b/dependencies2013/win32/swig/Lib/php5/typemaps.i
deleted file mode 100644
index faae0a6a..00000000
--- a/dependencies2013/win32/swig/Lib/php5/typemaps.i
+++ /dev/null
@@ -1,322 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i.
- *
- * SWIG Typemap library for PHP.
- *
- * This library provides standard typemaps for modifying SWIG's behavior.
- * With enough entries in this file, I hope that very few people actually
- * ever need to write a typemap.
- *
- * Define macros to define the following typemaps:
- *
- * TYPE *INPUT.   Argument is passed in as native variable by value.
- * TYPE *OUTPUT.  Argument is returned as an array from the function call.
- * TYPE *INOUT.   Argument is passed in by value, and out as part of returned list
- * TYPE *REFERENCE.  Argument is passed in as native variable with value
- *                   semantics.  Variable value is changed with result.
- *                   Use like this:
- *                   int foo(int *REFERENCE);
- *
- *                   $a = 0;
- *                   $rc = foo($a);
- *
- *                   Even though $a looks like it's passed by value,
- *                   its value can be changed by foo().
- * ----------------------------------------------------------------------------- */
-
-%define BOOL_TYPEMAP(TYPE)
-%typemap(in) TYPE *INPUT(TYPE temp), TYPE &INPUT(TYPE temp)
-%{
-  convert_to_boolean_ex($input);
-  temp = Z_LVAL_PP($input) ? true : false;
-  $1 = &temp;
-%}
-%typemap(argout) TYPE *INPUT, TYPE &INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp), TYPE &OUTPUT(TYPE temp) "$1 = &temp;";
-%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT, TYPE &OUTPUT
-{
-  zval *o;
-  MAKE_STD_ZVAL(o);
-  ZVAL_BOOL(o,temp$argnum);
-  t_output_helper( &$result, o TSRMLS_CC );
-}
-%typemap(in) TYPE *REFERENCE (TYPE lvalue), TYPE &REFERENCE (TYPE lvalue)
-%{
-  convert_to_boolean_ex($input);
-  lvalue = (*$input)->value.lval ? true : false;
-  $1 = &lvalue;
-%}
-%typemap(argout) TYPE *REFERENCE, TYPE &REFERENCE
-%{
-  (*$arg)->value.lval = lvalue$argnum ? true : false;
-  (*$arg)->type = IS_BOOL;
-%}
-%enddef
-
-%define DOUBLE_TYPEMAP(TYPE)
-%typemap(in) TYPE *INPUT(TYPE temp), TYPE &INPUT(TYPE temp)
-%{
-  convert_to_double_ex($input);
-  temp = (TYPE) Z_DVAL_PP($input);
-  $1 = &temp;
-%}
-%typemap(argout) TYPE *INPUT, TYPE &INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp), TYPE &OUTPUT(TYPE temp) "$1 = &temp;";
-%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT, TYPE &OUTPUT
-{
-  zval *o;
-  MAKE_STD_ZVAL(o);
-  ZVAL_DOUBLE(o,temp$argnum);
-  t_output_helper( &$result, o TSRMLS_CC );
-}
-%typemap(in) TYPE *REFERENCE (TYPE dvalue), TYPE &REFERENCE (TYPE dvalue)
-%{
-  convert_to_double_ex($input);
-  dvalue = (TYPE) (*$input)->value.dval;
-  $1 = &dvalue;
-%}
-%typemap(argout) TYPE *REFERENCE, TYPE &REFERENCE
-%{
-  $1->value.dval = (double)(lvalue$argnum);
-  $1->type = IS_DOUBLE;
-%}
-%enddef
-
-%define INT_TYPEMAP(TYPE)
-%typemap(in) TYPE *INPUT(TYPE temp), TYPE &INPUT(TYPE temp)
-%{
-  convert_to_long_ex($input);
-  temp = (TYPE) Z_LVAL_PP($input);
-  $1 = &temp;
-%}
-%typemap(argout) TYPE *INPUT, TYPE &INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp), TYPE &OUTPUT(TYPE temp) "$1 = &temp;";
-%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT, TYPE &OUTPUT
-{
-  zval *o;
-  MAKE_STD_ZVAL(o);
-  ZVAL_LONG(o,temp$argnum);
-  t_output_helper( &$result, o TSRMLS_CC );
-}
-%typemap(in) TYPE *REFERENCE (TYPE lvalue), TYPE &REFERENCE (TYPE lvalue)
-%{
-  convert_to_long_ex($input);
-  lvalue = (TYPE) (*$input)->value.lval;
-  $1 = &lvalue;
-%}
-%typemap(argout) TYPE *REFERENCE, TYPE &REFERENCE
-%{
-  (*$arg)->value.lval = (long)(lvalue$argnum);
-  (*$arg)->type = IS_LONG;
-%}
-%enddef
-
-BOOL_TYPEMAP(bool);
-
-DOUBLE_TYPEMAP(float);
-DOUBLE_TYPEMAP(double);
-
-INT_TYPEMAP(int);
-INT_TYPEMAP(short);
-INT_TYPEMAP(long);
-INT_TYPEMAP(unsigned int);
-INT_TYPEMAP(unsigned short);
-INT_TYPEMAP(unsigned long);
-INT_TYPEMAP(unsigned char);
-INT_TYPEMAP(signed char);
-
-INT_TYPEMAP(long long);
-%typemap(argout,fragment="t_output_helper") long long *OUTPUT
-{
-  zval *o;
-  MAKE_STD_ZVAL(o);
-  if ((long long)LONG_MIN <= temp$argnum && temp$argnum <= (long long)LONG_MAX) {
-    ZVAL_LONG(o, temp$argnum);
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)temp$argnum);
-    ZVAL_STRING(o, temp, 1);
-  }
-  t_output_helper( &$result, o TSRMLS_CC );
-}
-%typemap(in) TYPE *REFERENCE (long long lvalue)
-%{
-  CONVERT_LONG_LONG_IN(lvalue, long long, $input)
-  $1 = &lvalue;
-%}
-%typemap(argout) long long *REFERENCE
-%{
-  if ((long long)LONG_MIN <= lvalue$argnum && lvalue$argnum <= (long long)LONG_MAX) {
-    (*$arg)->value.lval = (long)(lvalue$argnum);
-    (*$arg)->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)lvalue$argnum);
-    ZVAL_STRING((*$arg), temp, 1);
-  }
-%}
-%typemap(argout) long long &OUTPUT
-%{
-  if ((long long)LONG_MIN <= *arg$argnum && *arg$argnum <= (long long)LONG_MAX) {
-    ($result)->value.lval = (long)(*arg$argnum);
-    ($result)->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%lld", (long long)(*arg$argnum));
-    ZVAL_STRING($result, temp, 1);
-  }
-%}
-INT_TYPEMAP(unsigned long long);
-%typemap(argout,fragment="t_output_helper") unsigned long long *OUTPUT
-{
-  zval *o;
-  MAKE_STD_ZVAL(o);
-  if (temp$argnum <= (unsigned long long)LONG_MAX) {
-    ZVAL_LONG(o, temp$argnum);
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)temp$argnum);
-    ZVAL_STRING(o, temp, 1);
-  }
-  t_output_helper( &$result, o TSRMLS_CC );
-}
-%typemap(in) TYPE *REFERENCE (unsigned long long lvalue)
-%{
-  CONVERT_UNSIGNED_LONG_LONG_IN(lvalue, unsigned long long, $input)
-  $1 = &lvalue;
-%}
-%typemap(argout) unsigned long long *REFERENCE
-%{
-  if (lvalue$argnum <= (unsigned long long)LONG_MAX) {
-    (*$arg)->value.lval = (long)(lvalue$argnum);
-    (*$arg)->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)lvalue$argnum);
-    ZVAL_STRING((*$arg), temp, 1);
-  }
-%}
-%typemap(argout) unsigned long long &OUTPUT
-%{
-  if (*arg$argnum <= (unsigned long long)LONG_MAX) {
-    ($result)->value.lval = (long)(*arg$argnum);
-    ($result)->type = IS_LONG;
-  } else {
-    char temp[256];
-    sprintf(temp, "%llu", (unsigned long long)(*arg$argnum));
-    ZVAL_STRING($result, temp, 1);
-  }
-%}
-
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(in) float *INOUT = float *INPUT;
-%typemap(in) double *INOUT = double *INPUT;
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(in) short *INOUT = short *INPUT;
-%typemap(in) long *INOUT = long *INPUT;
-%typemap(in) long long *INOUT = long long *INPUT;
-%typemap(in) unsigned *INOUT = unsigned *INPUT;
-%typemap(in) unsigned short *INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long *INOUT = unsigned long *INPUT;
-%typemap(in) unsigned char *INOUT = unsigned char *INPUT;
-%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT;
-%typemap(in) signed char *INOUT = signed char *INPUT;
-
-%typemap(in) bool &INOUT = bool *INPUT;
-%typemap(in) float &INOUT = float *INPUT;
-%typemap(in) double &INOUT = double *INPUT;
-
-%typemap(in) int &INOUT = int *INPUT;
-%typemap(in) short &INOUT = short *INPUT;
-%typemap(in) long &INOUT = long *INPUT;
-%typemap(in) long long &INOUT = long long *INPUT;
-%typemap(in) long long &INPUT = long long *INPUT;
-%typemap(in) unsigned &INOUT = unsigned *INPUT;
-%typemap(in) unsigned short &INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long &INOUT = unsigned long *INPUT;
-%typemap(in) unsigned char &INOUT = unsigned char *INPUT;
-%typemap(in) unsigned long long &INOUT = unsigned long long *INPUT;
-%typemap(in) unsigned long long &INPUT = unsigned long long *INPUT;
-%typemap(in) signed char &INOUT = signed char *INPUT;
-
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(argout) float *INOUT = float *OUTPUT;
-%typemap(argout) double *INOUT= double *OUTPUT;
-
-%typemap(argout) int *INOUT = int *OUTPUT;
-%typemap(argout) short *INOUT = short *OUTPUT;
-%typemap(argout) long *INOUT= long *OUTPUT;
-%typemap(argout) long long *INOUT= long long *OUTPUT;
-%typemap(argout) unsigned short *INOUT= unsigned short *OUTPUT;
-%typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-%typemap(argout) signed char *INOUT = signed char *OUTPUT;
-
-%typemap(argout) bool &INOUT = bool *OUTPUT;
-%typemap(argout) float &INOUT = float *OUTPUT;
-%typemap(argout) double &INOUT= double *OUTPUT;
-
-%typemap(argout) int &INOUT = int *OUTPUT;
-%typemap(argout) short &INOUT = short *OUTPUT;
-%typemap(argout) long &INOUT= long *OUTPUT;
-%typemap(argout) long long &INOUT= long long *OUTPUT;
-%typemap(argout) unsigned short &INOUT= unsigned short *OUTPUT;
-%typemap(argout) unsigned long &INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned char &INOUT = unsigned char *OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long *OUTPUT;
-%typemap(argout) signed char &INOUT = signed char *OUTPUT;
-
-%typemap(in) char INPUT[ANY] ( char temp[$1_dim0] )
-%{
-  convert_to_string_ex($input);
-  strncpy(temp,Z_STRVAL_PP($input),$1_dim0);
-  $1 = temp;
-%}
-%typemap(in,numinputs=0) char OUTPUT[ANY] ( char temp[$1_dim0] )
-  "$1 = temp;";
-%typemap(argout,fragment="t_output_helper") char OUTPUT[ANY]
-{
-  zval *o;
-  MAKE_STD_ZVAL(o);
-  ZVAL_STRINGL(o,temp$argnum,$1_dim0);
-  t_output_helper( &$result, o TSRMLS_CC );
-}
-
-%typemap(in,numinputs=0) void **OUTPUT (int force),
-                         void *&OUTPUT (int force)
-%{
-  /* If they pass NULL by reference, make it into a void*
-     This bit should go in arginit if arginit support init-ing scripting args */
-  if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0) {
-    /* So... we didn't get a ref or ptr, but we'll accept NULL by reference */
-    if (!((*$input)->type==IS_NULL && PZVAL_IS_REF(*$input))) {
-      /* wasn't a pre/ref/thing, OR anything like an int thing */
-      SWIG_PHP_Error(E_ERROR, "Type error in argument $arg of $symname.");
-    }
-  }
-  force=0;
-  if (arg1==NULL) {
-#ifdef __cplusplus
-    ptr=new $*1_ltype();
-#else
-    ptr=($*1_ltype) calloc(1,sizeof($*1_ltype));
-#endif
-    $1=&ptr;
-    /* have to passback arg$arg too */
-    force=1;
-  }
-%}
-
-%typemap(argout) void **OUTPUT,
-                 void *&OUTPUT
-%{
-  if (force$argnum) {  /* pass back arg$argnum through params ($arg) if we can */
-    if (!PZVAL_IS_REF(*$arg)) {
-      SWIG_PHP_Error(E_WARNING, "Parameter $argnum of $symname wasn't passed by reference");
-    } else {
-      SWIG_SetPointerZval(*$arg, (void *) ptr$argnum, $*1_descriptor, 1);
-    }
-  }
-%}
diff --git a/dependencies2013/win32/swig/Lib/php5/utils.i b/dependencies2013/win32/swig/Lib/php5/utils.i
deleted file mode 100644
index 408a3b36..00000000
--- a/dependencies2013/win32/swig/Lib/php5/utils.i
+++ /dev/null
@@ -1,114 +0,0 @@
-
-%define CONVERT_BOOL_IN(lvar,t,invar)
-  convert_to_boolean_ex(invar);
-  lvar = (t) Z_LVAL_PP(invar);
-%enddef
-
-%define CONVERT_INT_IN(lvar,t,invar)
-  convert_to_long_ex(invar);
-  lvar = (t) Z_LVAL_PP(invar);
-%enddef
-
-%define CONVERT_LONG_LONG_IN(lvar,t,invar)
-  switch ((*(invar))->type) {
-      case IS_DOUBLE:
-          lvar = (t) (*(invar))->value.dval;
-          break;
-      case IS_STRING: {
-          char * endptr;
-          errno = 0;
-          lvar = (t) strtoll((*(invar))->value.str.val, &endptr, 10);
-          if (*endptr && !errno) break;
-          /* FALL THRU */
-      }
-      default:
-          convert_to_long_ex(invar);
-          lvar = (t) (*(invar))->value.lval;
-  }
-%enddef
-
-%define CONVERT_UNSIGNED_LONG_LONG_IN(lvar,t,invar)
-  switch ((*(invar))->type) {
-      case IS_DOUBLE:
-          lvar = (t) (*(invar))->value.dval;
-          break;
-      case IS_STRING: {
-          char * endptr;
-          errno = 0;
-          lvar = (t) strtoull((*(invar))->value.str.val, &endptr, 10);
-          if (*endptr && !errno) break;
-          /* FALL THRU */
-      }
-      default:
-          convert_to_long_ex(invar);
-          lvar = (t) (*(invar))->value.lval;
-  }
-%enddef
-
-%define CONVERT_INT_OUT(lvar,invar)
-  lvar = (t) Z_LVAL_PP(invar);
-%enddef
-
-%define CONVERT_FLOAT_IN(lvar,t,invar)
-  convert_to_double_ex(invar);
-  lvar = (t) Z_DVAL_PP(invar);
-%enddef
-
-%define CONVERT_CHAR_IN(lvar,t,invar)
-  convert_to_string_ex(invar);
-  lvar = (t) *Z_STRVAL_PP(invar);
-%enddef
-
-%define CONVERT_STRING_IN(lvar,t,invar)
-  if ((*invar)->type==IS_NULL) {
-    lvar = (t) 0;
-  } else {
-    convert_to_string_ex(invar);
-    lvar = (t) Z_STRVAL_PP(invar);
-  }
-%enddef
-
-%define %pass_by_val( TYPE, CONVERT_IN )
-%typemap(in) TYPE
-%{
-  CONVERT_IN($1,$1_ltype,$input);
-%}
-%typemap(in) const TYPE & ($*1_ltype temp)
-%{
-  CONVERT_IN(temp,$*1_ltype,$input);
-  $1 = &temp;
-%}
-%typemap(directorout) TYPE
-%{
-  CONVERT_IN($result,$1_ltype,&$input);
-%}
-%typemap(directorout) const TYPE & ($*1_ltype temp)
-%{
-  CONVERT_IN(temp,$*1_ltype,&$input);
-  $result = &temp;
-%}
-%enddef
-
-%fragment("t_output_helper","header") %{
-static void
-t_output_helper(zval **target, zval *o TSRMLS_DC) {
-  zval *tmp;
-  if ( (*target)->type == IS_ARRAY ) {
-    /* it's already an array, just append */
-    add_next_index_zval( *target, o );
-    return;
-  }
-  if ( (*target)->type == IS_NULL ) {
-    REPLACE_ZVAL_VALUE(target,o,1);
-    FREE_ZVAL(o);
-    return;
-  }
-  ALLOC_INIT_ZVAL(tmp);
-  *tmp = **target;
-  zval_copy_ctor(tmp);
-  array_init(*target);
-  add_next_index_zval( *target, tmp);
-  add_next_index_zval( *target, o);
-
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/pike/pike.swg b/dependencies2013/win32/swig/Lib/pike/pike.swg
deleted file mode 100644
index 95cc2083..00000000
--- a/dependencies2013/win32/swig/Lib/pike/pike.swg
+++ /dev/null
@@ -1,324 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pike.swg
- *
- * Pike configuration module.
- * ----------------------------------------------------------------------------- */
-
-%insert(runtime) "swigrun.swg";            // Common C API type-checking code
-%insert(runtime) "pikerun.swg";         // Pike run-time code
-
-%insert(runtime) %{
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <pike/global.h>
-#include <pike/module.h>
-#include <pike/interpret.h>
-#ifdef __cplusplus
-}
-#endif
-%}
-
-/* -----------------------------------------------------------------------------
- *                          standard typemaps
- * ----------------------------------------------------------------------------- */
-
-/* --- Input arguments --- */
-
-/* Primitive datatypes. */
-
-%typemap(in, pikedesc="tInt")
-    int, unsigned int, short, unsigned short,
-    long, unsigned long, char, signed char, unsigned char,
-    bool, enum SWIGTYPE, long long, unsigned long long
-{
-    if ($input.type != T_INT)
-        Pike_error("Bad argument: Expected an integer.\n");
-    $1 = ($1_ltype) $input.u.integer;
-}
-
-%typemap(in, pikedesc="tFloat") float, double {
-    if ($input.type != T_FLOAT)
-        Pike_error("Bad argument: Expected a float.\n");
-    $1 = ($1_ltype) $input.u.float_number;
-}
-
-%typemap(in, pikedesc="tStr") char *, char [ANY] {
-    if ($input.type != T_STRING)
-        Pike_error("Bad argument: Expected a string.\n");
-    $1 = ($1_ltype) STR0($input.u.string);
-}
-
-/* Pointers, references and arrays */
-
-%typemap(in) SWIGTYPE *,
-             SWIGTYPE &,
-             SWIGTYPE &&,
-             SWIGTYPE []
-	"SWIG_ConvertPtr($input.u.object, (void **) &$1, $1_descriptor, 1);"
-	
-/* Void pointer.  Accepts any kind of pointer */
-%typemap(in) void * "/* FIXME */";
-
-/* Object passed by value. Convert to a pointer */
-%typemap(in) SWIGTYPE ($&1_ltype argp) "/* FIXME */";
-
-/* Pointer to a class member */
-%typemap(in) SWIGTYPE (CLASS::*) "/* FIXME */";
-
-/* Const primitive references.  Passed by value */
-
-%typemap(in, pikedesc="tInt") const int & (int temp),
-	     const short & (short temp),
-             const long  & (long temp),
-             const unsigned int & (unsigned int temp),
-             const unsigned short & (unsigned short temp),
-             const unsigned long & (unsigned long temp),
-	     const char & (char temp),
-             const signed char & (signed char temp),
-             const unsigned char & (unsigned char temp),
-             const bool & (bool temp),
-	     const long long & ($*1_ltype temp),
-	     const unsigned long long & ($*1_ltype temp),
-             const enum SWIGTYPE & ($*1_ltype temp),
-             const enum SWIGTYPE && ($*1_ltype temp)
-{
-  if ($input.type != T_INT)
-    Pike_error("Bad argument: Expected an integer.\n");
-    temp = ($*1_ltype) $input.u.integer;
-    $1 = &temp;
-}
-
-%typemap(in, pikedesc="tFloat") const float & (float temp),
-	     const double & (double temp)
-{
-  if ($input.type != T_FLOAT)
-    Pike_error("Bad argument: Expected a float.\n");
-    temp = ($*1_ltype) $input.u.float_number;
-    $1 = &temp;
-}
-
-/* -----------------------------------------------------------------------------
- * Output Typemaps
- * ----------------------------------------------------------------------------- */
-%typemap(out, pikedesc="tInt")
-    int, unsigned int,
-    short, unsigned short,
-    long, unsigned long,
-    char, signed char, unsigned char, 
-    bool, enum SWIGTYPE
-	"push_int($1);";
-
-%typemap(out, pikedesc="tInt") long long	"push_int64($1);";
-%typemap(out, pikedesc="tInt") unsigned long long	"push_int64($1);";
-%typemap(out, pikedesc="tFloat") float, double	"push_float($1);";
-%typemap(out, pikedesc="tStr") char *		"push_text($1);";
-
-/* Pointers, references, and arrays */
-%typemap(out, pikedesc="tObj") SWIGTYPE*, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] "push_object(SWIG_NewPointerObj((void *) $1, $1_descriptor, $owner));";
-
-/* Void return value; don't push anything */
-%typemap(out, pikedesc="tVoid") void		"";
-
-/* Dynamic casts */
-
-%typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC "/* FIXME */";
-
-/* Member pointer */
-%typemap(out) SWIGTYPE (CLASS::*) "/* FIXME */";
-
-/* Special typemap for character array return values */
-%typemap(out, pikedesc="tStr") char [ANY], const char [ANY] "push_text($1);";
-
-/* Primitive types--return by value */
-%typemap(out, pikedesc="tObj") SWIGTYPE 
-#ifdef __cplusplus
-{
-  $&1_ltype resultptr;
-  resultptr = new $1_ltype((const $1_ltype &) $1);
-  push_object(SWIG_NewPointerObj((void *) resultptr, $&1_descriptor, 1));
-}
-#else
-{
-  $&1_ltype resultptr;
-  resultptr = ($&1_ltype) malloc(sizeof($1_type));
-  memmove(resultptr, &$1, sizeof($1_type));
-  push_object(SWIG_NewPointerObj((void *) resultptr, $&1_descriptor, 1));
-}
-#endif
-
-/* References to primitive types.  Return by value */
-
-%typemap(out, pikedesc="tInt") const int &, const unsigned int &,
-              const short &, const unsigned short &,
-              const long &, const unsigned long &,
-              const char &, const signed char &, const unsigned char &,
-              const bool &,
-	      const long long &, const unsigned long long &,
-              const enum SWIGTYPE & ($*1_ltype temp),
-              const enum SWIGTYPE && ($*1_ltype temp)
-      "push_int(*($1));";
-
-%typemap(out, pikedesc="tFloat") const float &, const double &  "push_float(*($1));";
-
-/************************ Constant Typemaps *****************************/
-
-%typemap(constant)
-    int, unsigned int,
-    short, unsigned short,
-    long, unsigned long,
-    signed char, unsigned char, 
-    bool, enum SWIGTYPE,
-    long long, unsigned long long
-    	"add_integer_constant(\"$symname\", $1, 0);";
-
-%typemap(constant) char
-	"add_integer_constant(\"$symname\", '$1', 0);";
-
-%typemap(constant) long long, unsigned long long
-	"add_integer_constant(\"$symname\", $1, 0);";
-
-%typemap(constant) float, double
-	"add_float_constant(\"$symname\", $1, 0);";
-
-%typemap(constant) char *
-	"add_string_constant(\"$symname\", \"$1\", 0);";
-
-/* ------------------------------------------------------------
- * String & length
- * ------------------------------------------------------------ */
-
-%typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) {
-    if ($input.type != T_STRING)
-        Pike_error("Bad argument: Expected a string.\n");
-    $1 = ($1_ltype) STR0($input.u.string);
-    $2 = ($2_ltype) $input.u.string->length;
-}
-
-/* ------------------------------------------------------------
- * ANSI C typemaps
- * ------------------------------------------------------------ */
-
-%typemap(in, pikedesc="tInt") size_t {
-    if ($input.type != T_INT)
-        Pike_error("Bad argument: Expected an integer.\n");
-    $1 = ($1_ltype) $input.u.integer;
-}
-
-%typemap(out)      size_t = long;
-
-/* ------------------------------------------------------------
- * Typechecking rules
- * ------------------------------------------------------------ */
-
-%typecheck(SWIG_TYPECHECK_INTEGER)
-	 int, short, long,
- 	 unsigned int, unsigned short, unsigned long,
-	 signed char, unsigned char,
-	 long long, unsigned long long,
-	 const int &, const short &, const long &,
- 	 const unsigned int &, const unsigned short &, const unsigned long &,
-	 const long long &, const unsigned long long &,
-	 enum SWIGTYPE, enum SWIGTYPE &, SWIGTYPE &&,
-         bool, const bool & 
-{
-  $1 = ($input.type == T_INT) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_DOUBLE)
-	float, double,
-	const float &, const double &
-{
-  $1 = (($input.type == T_FLOAT) || ($input.type == T_INT)) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_CHAR) char {
-  $1 = ($input.type == T_INT) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_STRING) char * {
-  $1 = ($input.type == T_STRING) ? 1 : 0;
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  void *ptr;
-  if (SWIG_ConvertPtr($input.u.object, (void **) &ptr, $1_descriptor, 0) == -1) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE {
-  void *ptr;
-  if (SWIG_ConvertPtr($input.u.object, (void **) &ptr, $&1_descriptor, 0) == -1) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR) void * {
-  void *ptr;
-  if (SWIG_ConvertPtr($input.u.object, (void **) &ptr, 0, 0) == -1) {
-    $1 = 0;
-  } else {
-    $1 = 1;
-  }
-}
-
-/* Array reference typemaps */
-%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
-%apply SWIGTYPE && { SWIGTYPE ((&&)[ANY]) }
-
-/* const pointers */
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* ------------------------------------------------------------
- * Overloaded operator support
- * ------------------------------------------------------------ */
-
-#ifdef __cplusplus
-%rename("`+")      *::operator+;
-%rename("`-")      *::operator-;
-%rename("`*")      *::operator*;
-%rename("`/")      *::operator/;
-%rename("`%")      *::operator%;
-%rename("`<<")     *::operator<<;
-%rename("`>>")     *::operator>>;
-%rename("`&")      *::operator&;
-%rename("`|")      *::operator|;
-%rename("`^")      *::operator^;
-%rename("`~")      *::operator~;
-%rename("`<")      *::operator<;
-%rename("`>")      *::operator>;
-%rename("`==")     *::operator==;
-
-/* Special cases */
-%rename("`()")     *::operator();
-
-#endif
-
-/* ------------------------------------------------------------
- * The start of the Pike initialization function
- * ------------------------------------------------------------ */
-
-%init "swiginit.swg"
-
-%init %{
-#ifdef __cplusplus
-extern "C"
-#endif
-PIKE_MODULE_EXIT {}
-
-#ifdef __cplusplus
-extern "C"
-#endif
-PIKE_MODULE_INIT
-{
-    struct program *pr;
-    SWIG_InitializeModule(0);
-%}
-
-/* pike keywords */
-%include <pikekw.swg>
diff --git a/dependencies2013/win32/swig/Lib/pike/pikekw.swg b/dependencies2013/win32/swig/Lib/pike/pikekw.swg
deleted file mode 100644
index 844b1f18..00000000
--- a/dependencies2013/win32/swig/Lib/pike/pikekw.swg
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef PIKE_PIKEKW_SWG_
-#define PIKE_PIKEKW_SWG_
-
-/* Warnings for Pike keywords */
-#define PIKEKW(x) %namewarn("314: '" #x "' is a pike keyword")  #x
-
-/*
-   from
-   http://www.http://docs.linux.cz/pike/tutorial_C.html
-
-*/
-
-
-PIKEKW(array);
-PIKEKW(break);
-PIKEKW(case);
-PIKEKW(catch);
-PIKEKW(continue);
-PIKEKW(default);
-PIKEKW(do);
-PIKEKW(else);
-PIKEKW(float);
-PIKEKW(for);
-PIKEKW(foreach);
-PIKEKW(function);
-PIKEKW(gauge);
-PIKEKW(if);
-PIKEKW(inherit);
-PIKEKW(inline);
-PIKEKW(int);
-PIKEKW(lambda);
-PIKEKW(mapping);
-PIKEKW(mixed);
-PIKEKW(multiset);
-PIKEKW(nomask);
-PIKEKW(object);
-PIKEKW(predef);
-PIKEKW(private);
-PIKEKW(program);
-PIKEKW(protected);
-PIKEKW(public);
-PIKEKW(return);
-PIKEKW(sscanf);
-PIKEKW(static);
-PIKEKW(string);
-PIKEKW(switch);
-PIKEKW(typeof);
-PIKEKW(varargs);
-PIKEKW(void);
-PIKEKW(while);
-
-
-#undef PIKEKW
-
-#endif //PIKE_PIKEKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/pike/pikerun.swg b/dependencies2013/win32/swig/Lib/pike/pikerun.swg
deleted file mode 100644
index 6ec1143c..00000000
--- a/dependencies2013/win32/swig/Lib/pike/pikerun.swg
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pikerun.swg
- *
- * This file contains the runtime support for Pike modules
- * and includes code for managing global variables and pointer
- * type checking.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "pike/object.h"
-#include "pike/program.h"
-#ifdef __cplusplus
-}
-#endif
-#include <assert.h>
-
-/* Stores information about a wrapped object */
-typedef struct swig_object_wrapper {
-    void *self;
-    swig_type_info *type;
-} swig_object_wrapper;
-
-#ifdef THIS
-#undef THIS
-#endif
-#define THIS (((swig_object_wrapper *) Pike_fp->current_storage)->self)
-
-#define SWIG_ConvertPtr SWIG_Pike_ConvertPtr
-#define SWIG_NewPointerObj SWIG_Pike_NewPointerObj
-#define SWIG_GetModule(clientdata) SWIG_Pike_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer) SWIG_Pike_SetModule(pointer)
-
-/* These need to be filled in before type sharing between modules will work */
-static swig_module_info *SWIG_Pike_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
-  return 0;
-}
-
-static void SWIG_Pike_SetModule(swig_module_info *pointer) {
-
-}
-
-/* Convert a pointer value */
-static int
-SWIG_Pike_ConvertPtr(struct object *obj, void **ptr, swig_type_info *ty, int flags) {
-    struct program *pr;
-    swig_cast_info *tc;
-    swig_object_wrapper *obj_wrapper;
-    
-    if (ty) {
-        pr = (struct program *) ty->clientdata;
-        obj_wrapper = (swig_object_wrapper *) get_storage(obj, pr);
-        if (obj_wrapper && obj_wrapper->type) {
-            tc = SWIG_TypeCheckStruct(obj_wrapper->type, ty);
-            if (tc) {
-                int newmemory = 0;
-                *ptr = SWIG_TypeCast(tc, obj_wrapper->self, &newmemory);
-                assert(!newmemory); /* newmemory handling not yet implemented */
-                return 0;
-            }
-        }
-    }
-    return -1;
-}
-
-/* Create a new pointer object */
-static struct object *
-SWIG_Pike_NewPointerObj(void *ptr, swig_type_info *type, int own) {
-    return 0;
-}
diff --git a/dependencies2013/win32/swig/Lib/pike/std_string.i b/dependencies2013/win32/swig/Lib/pike/std_string.i
deleted file mode 100644
index b32b3c11..00000000
--- a/dependencies2013/win32/swig/Lib/pike/std_string.i
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_string.i
- *
- * SWIG typemaps for std::string
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <string>
-%}
-
-namespace std {
-
-    %naturalvar string;
-
-    class string;
-
-    /* Overloading check */
-
-    %typemap(typecheck) string = char *;
-    %typemap(typecheck) const string & = char *;
-
-    %typemap(in, pikedesc="tStr") string {
-      if ($input.type != T_STRING)
-        Pike_error("Bad argument: Expected a string.\n");
-      $1.assign(STR0($input.u.string));
-    }
-
-    %typemap(in, pikedesc="tStr") const string & ($*1_ltype temp) {
-      if ($input.type != T_STRING)
-        Pike_error("Bad argument: Expected a string.\n");
-      temp.assign(STR0($input.u.string));
-      $1 = &temp;
-    }
-
-    %typemap(out, pikedesc="tStr") string "push_text($1.c_str());";
-
-    %typemap(out, pikedesc="tStr") const string & "push_text($1->c_str());";
-    
-    %typemap(directorin) string, const string &, string & "$1.c_str()";
-
-    %typemap(directorin) string *, const string * "$1->c_str()";
-    
-    %typemap(directorout) string {
-      if ($input.type == T_STRING)
-        $result.assign(STR0($input.u.string));
-      else
-        throw Swig::DirectorTypeMismatchException("string expected");
-    }
-    
-    %typemap(directorout) const string & ($*1_ltype temp) {
-      if ($input.type == T_STRING) {
-        temp.assign(STR0($input.u.string));
-        $result = &temp;
-      } else {
-        throw Swig::DirectorTypeMismatchException("string expected");
-      }
-    }
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/pointer.i b/dependencies2013/win32/swig/Lib/pointer.i
deleted file mode 100644
index ea8e535a..00000000
--- a/dependencies2013/win32/swig/Lib/pointer.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pointer.i
- * ----------------------------------------------------------------------------- */
-
-
-%echo "pointer.i is deprecated.  Use cpointer.i instead."
-%echo "See http://www.swig.org/Doc3.0/Library.html"
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/README b/dependencies2013/win32/swig/Lib/python/README
deleted file mode 100644
index fa8ef61e..00000000
--- a/dependencies2013/win32/swig/Lib/python/README
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -----------------------------------------------------------------------------
- *
- *  User interfaces: include these ones as needed
- *
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- *  Special types and user helpers 
- * ----------------------------------------------------------------------------- */
-
-argcargv.i		Handler for (int argc, char **argv)
-attribute.i		Convert a pair of set/get methods into a "native" python attribute
-ccomplex.i		C99 complex type
-complex.i		C99 or C++ complex type
-cstring.i		Various forms of C character string handling
-cwstring.i		Various forms of C wchar_t string handling
-embed.i			embedding the Python interpreter in something else
-file.i			FILE C type
-implicit.i		Allow the use of implicit C++ constructors
-wchar.i			wchar_t C type
-
-/* -----------------------------------------------------------------------------
- *  C++ STD + STL
- * ----------------------------------------------------------------------------- */
-
-std_alloc.i		allocator 
-std_basic_string.i	basic string
-std_char_traits.i	char traits
-std_complex.i		complex
-std_deque.i		deque	
-std_except.i		exceptions
-std_ios.i		ios
-std_iostream.i		istream/ostream
-std_list.i		list
-std_map.i		map
-std_multimap.i		multimap
-std_multiset.i		multiset
-std_pair.i		pair
-std_set.i		set
-std_sstream.i		string stream
-std_streambuf.i		streambuf
-std_string.i		string
-std_vector.i		vector
-std_wios.i		wios
-std_wiostream.i		wistream/wostream
-std_wsstream.i		wstring stream
-std_wstreambuf.i	wstreambuf
-std_wstring.i		wstring
-
-
-
-/* -----------------------------------------------------------------------------
-/* 
- *  Implementation files: don't look at them unless you are really drunk
- *
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- *  Basic files
- * ----------------------------------------------------------------------------- */
-
-python.swg		Main language file, it just includes what is needed.
-pyuserdir.swg		User visible directives (%pythonnondynamic, etc)
-pymacros.swg		Internal macros used for typemaps
-pyfragments.swg		Allow the user to overload the default fragments
-pyopers.swg		Python operations (+=, *=, etc)
-pythonkw.swg		Python keywords and special names
-pyinit.swg		Python Init method
-
-/* -----------------------------------------------------------------------------
- *  The runtime part
- * ----------------------------------------------------------------------------- */
-
-pyruntime.swg		Main runtime file definition
-pyapi.swg		SWIG/Python API declarations
-pyrun.swg		Python run-time code 
-
-/* -----------------------------------------------------------------------------
- *  Internal typemap specializations
- * ----------------------------------------------------------------------------- */
-
-pyswigtype.swg		SWIGTYPE
-pystrings.swg		Char strings (char *)
-pywstrings.swg		Wchar Strings (wchar_t *)
-pyprimtypes.swg		Primitive types (shot,int,double,etc)
-pycomplex.swg		PyComplex and helper for C/C++ complex types
-pydocs.swg		Typemaps documentation
-
-/* -----------------------------------------------------------------------------
- *  C++ STD + STL
- * ----------------------------------------------------------------------------- */
-
-pycontainer.swg		python container iterators
-std_common.i		general common code for the STD/STL implementation
-std_container.i		general common code for the STD/STL containers
-
-
-/*-----------------------------------------------------------------------------
- *  Backward compatibility and deprecated
- * ----------------------------------------------------------------------------- */
-
-std_vectora.i		vector + allocator (allocators are now supported in STD/STL)
-typemaps.i		old in/out typemaps (doesn't need to be included)
-defarg.swg		for processing default arguments with shadow classes
diff --git a/dependencies2013/win32/swig/Lib/python/argcargv.i b/dependencies2013/win32/swig/Lib/python/argcargv.i
deleted file mode 100644
index 717fe733..00000000
--- a/dependencies2013/win32/swig/Lib/python/argcargv.i
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ------------------------------------------------------------
- * --- Argc & Argv ---
- * ------------------------------------------------------------ */
-
-%fragment("SWIG_AsArgcArgv","header",fragment="SWIG_AsCharPtrAndSize") {
-SWIGINTERN int
-SWIG_AsArgcArgv(PyObject *input,
-		swig_type_info *ppchar_info,
-		size_t *argc, char ***argv, int *owner)
-{  
-  void *vptr;
-  int res = SWIG_ConvertPtr(input, &vptr, ppchar_info, 0);
-  if (!SWIG_IsOK(res)) {
-    int list = 0;
-    PyErr_Clear();
-    list = PyList_Check(input);
-    if (list || PyTuple_Check(input)) {
-      size_t i = 0;
-      size_t size = list ? PyList_Size(input) : PyTuple_Size(input);
-      if (argc) *argc = size;
-      if (argv) {
-	*argv = %new_array(size + 1, char*);
-	for (; i < size; ++i) {
-	  PyObject *obj = list ? PyList_GetItem(input,i) : PyTuple_GetItem(input,i);
-	  char *cptr = 0; size_t sz = 0; int alloc = 0;
-	  res = SWIG_AsCharPtrAndSize(obj, &cptr, &sz, &alloc);
-	  if (SWIG_IsOK(res)) {
-	    if (cptr && sz) {
-	      (*argv)[i] = (alloc == SWIG_NEWOBJ) ? cptr : %new_copy_array(cptr, sz, char);
-	    } else {
-	      (*argv)[i] = 0;
-	    }
-	  } else {
-	    return SWIG_TypeError;
-	  }
-	}
-	(*argv)[i] = 0;
-	if (owner) *owner = 1;
-      } else {
-	for (; i < size; ++i) {
-	  PyObject *obj = list ? PyList_GetItem(input,i) : PyTuple_GetItem(input,i);
-	  res = SWIG_AsCharPtrAndSize(obj, 0, 0, 0);
-	  if (!SWIG_IsOK(res)) return SWIG_TypeError;
-	}
-	if (owner) *owner = 0;
-      }
-      return SWIG_OK;
-    } else {
-      return SWIG_TypeError;
-    }
-  } else {
-    /* seems dangerous, but the user asked for it... */
-    size_t i = 0;
-    if (argv) { while (*argv[i] != 0) ++i;}    
-    if (argc) *argc = i;
-    if (owner) *owner = 0;
-    return SWIG_OK;
-  }
-}
-}
-
-/*
-  This typemap works with either a char **, a python list or a python
-  tuple
- */
-
-%typemap(in,noblock=0,fragment="SWIG_AsArgcArgv") (int ARGC, char **ARGV) (int res,char **argv = 0, size_t argc = 0, int owner= 0) {
-  res = SWIG_AsArgcArgv($input, $descriptor(char**), &argc, &argv, &owner);
-  if (!SWIG_IsOK(res)) { 
-    $1 = 0; $2 = 0;
-    %argument_fail(SWIG_TypeError, "int ARGC, char **ARGV", $symname, $argnum);
-  } else {  
-    $1 = %static_cast(argc,$1_ltype);
-    $2 = %static_cast(argv, $2_ltype);
-  }
-}
-
-%typemap(typecheck, precedence=SWIG_TYPECHECK_STRING_ARRAY) (int ARGC, char **ARGV) {
-  int res = SWIG_AsArgcArgv($input, $descriptor(char**), 0, 0, 0);
-  $1 = SWIG_IsOK(res);
-}
-
-%typemap(freearg,noblock=1) (int ARGC, char **ARGV)  {
-  if (owner$argnum) {
-    size_t i = argc$argnum;
-    while (i) {
-      %delete_array(argv$argnum[--i]);
-    }
-    %delete_array(argv$argnum);
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Lib/python/attribute.i b/dependencies2013/win32/swig/Lib/python/attribute.i
deleted file mode 100644
index 779716cd..00000000
--- a/dependencies2013/win32/swig/Lib/python/attribute.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/attribute.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/python/boost_shared_ptr.i
deleted file mode 100644
index 40a1ae1e..00000000
--- a/dependencies2013/win32/swig/Lib/python/boost_shared_ptr.i
+++ /dev/null
@@ -1,324 +0,0 @@
-%include <shared_ptr.i>
-
-// Set SHARED_PTR_DISOWN to $disown if required, for example
-// #define SHARED_PTR_DISOWN $disown
-#if !defined(SHARED_PTR_DISOWN)
-#define SHARED_PTR_DISOWN 0
-#endif
-
-%fragment("SWIG_null_deleter_python", "header", fragment="SWIG_null_deleter") {
-%#define SWIG_NO_NULL_DELETER_SWIG_BUILTIN_INIT
-}
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE 
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-// plain value
-%typemap(in) CONST TYPE (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) {
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(out) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(varout) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) CONST TYPE * (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-
-%typemap(out, fragment="SWIG_null_deleter_python") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE * {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0;
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter_python") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain reference
-%typemap(in) CONST TYPE & (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter_python") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE & {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = *%const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = *%const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter_python") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer by reference
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) TYPE *CONST& (void  *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    temp = %const_cast(tempshared.get(), $*1_ltype);
-  } else {
-    temp = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $*1_ltype);
-  }
-  $1 = &temp;
-}
-%typemap(out, fragment="SWIG_null_deleter_python") TYPE *CONST& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) TYPE *CONST& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) TYPE *CONST& %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) $1 = *(%reinterpret_cast(argp, $&ltype));
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  int newmem = 0;
-  void *argp = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = argp ? *(%reinterpret_cast(argp, $&ltype)) : SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE >();
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// shared_ptr by reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 && *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-  if ($owner) delete $1;
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) tempshared = *%reinterpret_cast(argp, $*ltype);
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype);
-  temp = &tempshared;
-  $1 = &temp;
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 && **$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varout typemap not implemented"
-%}
-
-// Typecheck typemaps
-// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting 
-// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) 
-                      TYPE CONST,
-                      TYPE CONST &,
-                      TYPE CONST *,
-                      TYPE *CONST&,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), 0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/python/builtin.swg b/dependencies2013/win32/swig/Lib/python/builtin.swg
deleted file mode 100644
index 4fd19471..00000000
--- a/dependencies2013/win32/swig/Lib/python/builtin.swg
+++ /dev/null
@@ -1,727 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SWIGINTERN Py_hash_t
-SwigPyObject_hash(PyObject *obj) {
-  SwigPyObject *sobj = (SwigPyObject *)obj;
-  void *ptr = sobj->ptr;
-  return (Py_hash_t)ptr;
-}
-
-SWIGINTERN Py_hash_t
-SWIG_PyNumber_AsPyHash(PyObject *obj) {
-  Py_hash_t result = -1;
-#if PY_VERSION_HEX < 0x03020000
-#if PY_VERSION_HEX < 0x03000000
-  if (PyInt_Check(obj))
-    result = PyInt_AsLong(obj);
-  else
-#endif
-  if (PyLong_Check(obj))
-    result = PyLong_AsLong(obj);
-#else
-  if (PyNumber_Check(obj))
-    result = PyNumber_AsSsize_t(obj, NULL);
-#endif
-  else
-    PyErr_Format(PyExc_TypeError, "Wrong type for hash function");
-  return PyErr_Occurred() ? -1 : result;
-}
-
-SWIGINTERN int
-SwigPyBuiltin_BadInit(PyObject *self, PyObject *SWIGUNUSEDPARM(args), PyObject *SWIGUNUSEDPARM(kwds)) {
-  PyErr_Format(PyExc_TypeError, "Cannot create new instances of type '%.300s'", self->ob_type->tp_name);
-  return -1;
-}
-
-SWIGINTERN void
-SwigPyBuiltin_BadDealloc(PyObject *obj) {
-  SwigPyObject *sobj = (SwigPyObject *)obj;
-  if (sobj->own) {
-    PyErr_Format(PyExc_TypeError, "Swig detected a memory leak in type '%.300s': no callable destructor found.", obj->ob_type->tp_name);
-  }
-}
-
-typedef struct {
-  PyCFunction get;
-  PyCFunction set;
-} SwigPyGetSet;
-
-SWIGINTERN PyObject *
-SwigPyBuiltin_GetterClosure (PyObject *obj, void *closure) {
-  SwigPyGetSet *getset;
-  PyObject *tuple, *result;
-  if (!closure)
-    return SWIG_Py_Void();
-  getset = (SwigPyGetSet *)closure;
-  if (!getset->get)
-    return SWIG_Py_Void();
-  tuple = PyTuple_New(0);
-  assert(tuple);
-  result = (*getset->get)(obj, tuple);
-  Py_DECREF(tuple);
-  return result;
-}
-
-SWIGINTERN PyObject *
-SwigPyBuiltin_FunpackGetterClosure (PyObject *obj, void *closure) {
-  SwigPyGetSet *getset;
-  PyObject *result;
-  if (!closure)
-    return SWIG_Py_Void();
-  getset = (SwigPyGetSet *)closure;
-  if (!getset->get)
-    return SWIG_Py_Void();
-  result = (*getset->get)(obj, NULL);
-  return result;
-}
-
-SWIGINTERN int
-SwigPyBuiltin_SetterClosure (PyObject *obj, PyObject *val, void *closure) {
-  SwigPyGetSet *getset;
-  PyObject *tuple, *result;
-  if (!closure) {
-    PyErr_Format(PyExc_TypeError, "Missing getset closure");
-    return -1;
-  }
-  getset = (SwigPyGetSet *)closure;
-  if (!getset->set) {
-    PyErr_Format(PyExc_TypeError, "Illegal member variable assignment in type '%.300s'", obj->ob_type->tp_name);
-    return -1;
-  }
-  tuple = PyTuple_New(1);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, val);
-  Py_XINCREF(val);
-  result = (*getset->set)(obj, tuple);
-  Py_DECREF(tuple);
-  Py_XDECREF(result);
-  return result ? 0 : -1;
-}
-
-SWIGINTERN int
-SwigPyBuiltin_FunpackSetterClosure (PyObject *obj, PyObject *val, void *closure) {
-  SwigPyGetSet *getset;
-  PyObject *result;
-  if (!closure) {
-    PyErr_Format(PyExc_TypeError, "Missing getset closure");
-    return -1;
-  }
-  getset = (SwigPyGetSet *)closure;
-  if (!getset->set) {
-    PyErr_Format(PyExc_TypeError, "Illegal member variable assignment in type '%.300s'", obj->ob_type->tp_name);
-    return -1;
-  }
-  result = (*getset->set)(obj, val);
-  Py_XDECREF(result);
-  return result ? 0 : -1;
-}
-
-SWIGINTERN void
-SwigPyStaticVar_dealloc(PyDescrObject *descr) {
-  _PyObject_GC_UNTRACK(descr);
-  Py_XDECREF(PyDescr_TYPE(descr));
-  Py_XDECREF(PyDescr_NAME(descr));
-  PyObject_GC_Del(descr);
-}
-
-SWIGINTERN PyObject *
-SwigPyStaticVar_repr(PyGetSetDescrObject *descr) {
-#if PY_VERSION_HEX >= 0x03000000
-
-  return PyUnicode_FromFormat("<class attribute '%S' of type '%s'>", PyDescr_NAME(descr), PyDescr_TYPE(descr)->tp_name);
-#else
-  return PyString_FromFormat("<class attribute '%s' of type '%s'>", PyString_AsString(PyDescr_NAME(descr)), PyDescr_TYPE(descr)->tp_name);
-#endif
-}
-
-SWIGINTERN int
-SwigPyStaticVar_traverse(PyObject *self, visitproc visit, void *arg) {
-  PyDescrObject *descr;
-  descr = (PyDescrObject *)self;
-  Py_VISIT((PyObject*) PyDescr_TYPE(descr));
-  return 0;
-}
-
-SWIGINTERN PyObject *
-SwigPyStaticVar_get(PyGetSetDescrObject *descr, PyObject *obj, PyObject *SWIGUNUSEDPARM(type)) {
-  if (descr->d_getset->get != NULL)
-    return descr->d_getset->get(obj, descr->d_getset->closure);
-#if PY_VERSION_HEX >= 0x03000000
-  PyErr_Format(PyExc_AttributeError, "attribute '%.300S' of '%.100s' objects is not readable", PyDescr_NAME(descr), PyDescr_TYPE(descr)->tp_name);
-#else
-  PyErr_Format(PyExc_AttributeError, "attribute '%.300s' of '%.100s' objects is not readable", PyString_AsString(PyDescr_NAME(descr)), PyDescr_TYPE(descr)->tp_name);
-#endif
-  return NULL;
-}
-
-SWIGINTERN int
-SwigPyStaticVar_set(PyGetSetDescrObject *descr, PyObject *obj, PyObject *value) {
-  if (descr->d_getset->set != NULL)
-    return descr->d_getset->set(obj, value, descr->d_getset->closure);
-#if PY_VERSION_HEX >= 0x03000000
-  PyErr_Format(PyExc_AttributeError, "attribute '%.300S' of '%.100s' objects is not writable", PyDescr_NAME(descr), PyDescr_TYPE(descr)->tp_name);
-#else
-  PyErr_Format(PyExc_AttributeError, "attribute '%.300s' of '%.100s' objects is not writable", PyString_AsString(PyDescr_NAME(descr)), PyDescr_TYPE(descr)->tp_name);
-#endif
-  return -1;
-}
-
-SWIGINTERN int
-SwigPyObjectType_setattro(PyObject *typeobject, PyObject *name, PyObject *value) {
-  PyObject *attribute;
-  PyTypeObject *type;
-  descrsetfunc local_set;
-
-  assert(PyType_Check(typeobject));
-  type = (PyTypeObject *)typeobject;
-  attribute = _PyType_Lookup(type, name);
-  if (attribute != NULL) {
-    /* Implement descriptor functionality, if any */
-    local_set = attribute->ob_type->tp_descr_set;
-    if (local_set != NULL)
-      return local_set(attribute, (PyObject *)type, value);
-#if PY_VERSION_HEX >= 0x03000000
-    PyErr_Format(PyExc_AttributeError, "cannot modify read-only attribute '%.50s.%.400S'", type->tp_name, name);
-#else 
-    PyErr_Format(PyExc_AttributeError, "cannot modify read-only attribute '%.50s.%.400s'", type->tp_name, PyString_AS_STRING(name));
-#endif
-  } else {
-#if PY_VERSION_HEX >= 0x03000000
-    PyErr_Format(PyExc_AttributeError, "type '%.50s' has no attribute '%.400S'", type->tp_name, name);
-#else
-    PyErr_Format(PyExc_AttributeError, "type '%.50s' has no attribute '%.400s'", type->tp_name, PyString_AS_STRING(name));
-#endif
-  }
-
-  return -1;
-}
-
-SWIGINTERN PyTypeObject*
-SwigPyStaticVar_Type(void) {
-  static PyTypeObject staticvar_type;
-  static int type_init = 0;
-  if (!type_init) {
-    const PyTypeObject tmp = {
-#if PY_VERSION_HEX >= 0x03000000
-      PyVarObject_HEAD_INIT(&PyType_Type, 0)
-#else
-      PyObject_HEAD_INIT(&PyType_Type)
-      0,                                        /* ob_size */
-#endif
-      "swig_static_var_getset_descriptor",      /* tp_name */
-      sizeof(PyGetSetDescrObject),              /* tp_basicsize */
-      0,                                        /* tp_itemsize */
-      (destructor)SwigPyStaticVar_dealloc,      /* tp_dealloc */
-      0,                                        /* tp_print */
-      0,                                        /* tp_getattr */
-      0,                                        /* tp_setattr */
-      0,                                        /* tp_compare */
-      (reprfunc)SwigPyStaticVar_repr,           /* tp_repr */
-      0,                                        /* tp_as_number */
-      0,                                        /* tp_as_sequence */
-      0,                                        /* tp_as_mapping */
-      0,                                        /* tp_hash */
-      0,                                        /* tp_call */
-      0,                                        /* tp_str */
-      PyObject_GenericGetAttr,                  /* tp_getattro */
-      0,                                        /* tp_setattro */
-      0,                                        /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC|Py_TPFLAGS_HAVE_CLASS, /* tp_flags */
-      0,                                        /* tp_doc */
-      SwigPyStaticVar_traverse,                 /* tp_traverse */
-      0,                                        /* tp_clear */
-      0,                                        /* tp_richcompare */
-      0,                                        /* tp_weaklistoffset */
-      0,                                        /* tp_iter */
-      0,                                        /* tp_iternext */
-      0,                                        /* tp_methods */
-      0,                                        /* tp_members */
-      0,                                        /* tp_getset */
-      0,                                        /* tp_base */
-      0,                                        /* tp_dict */
-      (descrgetfunc)SwigPyStaticVar_get,        /* tp_descr_get */
-      (descrsetfunc)SwigPyStaticVar_set,        /* tp_descr_set */
-      0,                                        /* tp_dictoffset */
-      0,                                        /* tp_init */
-      0,                                        /* tp_alloc */
-      0,                                        /* tp_new */
-      0,                                        /* tp_free */
-      0,                                        /* tp_is_gc */
-      0,                                        /* tp_bases */
-      0,                                        /* tp_mro */
-      0,                                        /* tp_cache */
-      0,                                        /* tp_subclasses */
-      0,                                        /* tp_weaklist */
-#if PY_VERSION_HEX >= 0x02030000
-      0,                                        /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                        /* tp_version_tag */
-#endif
-#if PY_VERSION_HEX >= 0x03040000
-      0,                                        /* tp_finalize */
-#endif
-#ifdef COUNT_ALLOCS
-      0,                                        /* tp_allocs */
-      0,                                        /* tp_frees */
-      0,                                        /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
-      0,                                        /* tp_prev */
-#endif
-      0                                         /* tp_next */
-#endif
-    };
-    staticvar_type = tmp;
-    type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    staticvar_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&staticvar_type) < 0)
-      return NULL;
-#endif
-  }
-  return &staticvar_type;
-}
-
-SWIGINTERN PyTypeObject*
-SwigPyObjectType(void) {
-  static char swigpyobjecttype_doc[] = "Metaclass for SWIG wrapped types";
-  static PyTypeObject swigpyobjecttype_type;
-  static int type_init = 0;
-  if (!type_init) {
-    const PyTypeObject tmp = {
-#if PY_VERSION_HEX >= 0x03000000
-      PyVarObject_HEAD_INIT(&PyType_Type, 0)
-#else
-      PyObject_HEAD_INIT(&PyType_Type)
-      0,                                        /* ob_size */
-#endif
-      "SwigPyObjectType",                       /* tp_name */
-      PyType_Type.tp_basicsize,                 /* tp_basicsize */
-      0,                                        /* tp_itemsize */
-      0,                                        /* tp_dealloc */
-      0,                                        /* tp_print */
-      0,                                        /* tp_getattr */
-      0,                                        /* tp_setattr */
-      0,                                        /* tp_compare */
-      0,                                        /* tp_repr */
-      0,                                        /* tp_as_number */
-      0,                                        /* tp_as_sequence */
-      0,                                        /* tp_as_mapping */
-      0,                                        /* tp_hash */
-      0,                                        /* tp_call */
-      0,                                        /* tp_str */
-      0,                                        /* tp_getattro */
-      SwigPyObjectType_setattro,                /* tp_setattro */
-      0,                                        /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_CLASS, /* tp_flags */
-      swigpyobjecttype_doc,                     /* tp_doc */
-      0,                                        /* tp_traverse */
-      0,                                        /* tp_clear */
-      0,                                        /* tp_richcompare */
-      0,                                        /* tp_weaklistoffset */
-      0,                                        /* tp_iter */
-      0,                                        /* tp_iternext */
-      0,                                        /* tp_methods */
-      0,                                        /* tp_members */
-      0,                                        /* tp_getset */
-      0,                                        /* tp_base */
-      0,                                        /* tp_dict */
-      0,                                        /* tp_descr_get */
-      0,                                        /* tp_descr_set */
-      0,                                        /* tp_dictoffset */
-      0,                                        /* tp_init */
-      0,                                        /* tp_alloc */
-      0,                                        /* tp_new */
-      0,                                        /* tp_free */
-      0,                                        /* tp_is_gc */
-      0,                                        /* tp_bases */
-      0,                                        /* tp_mro */
-      0,                                        /* tp_cache */
-      0,                                        /* tp_subclasses */
-      0,                                        /* tp_weaklist */
-#if PY_VERSION_HEX >= 0x02030000
-      0,                                        /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                        /* tp_version_tag */
-#endif
-#if PY_VERSION_HEX >= 0x03040000
-      0,                                        /* tp_finalize */
-#endif
-#ifdef COUNT_ALLOCS
-      0,                                        /* tp_allocs */
-      0,                                        /* tp_frees */
-      0,                                        /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
-      0,                                        /* tp_prev */
-#endif
-      0                                         /* tp_next */
-#endif
-    };
-    swigpyobjecttype_type = tmp;
-    type_init = 1;
-    swigpyobjecttype_type.tp_base = &PyType_Type;
-#if PY_VERSION_HEX < 0x02020000
-    swigpyobjecttype_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&swigpyobjecttype_type) < 0)
-      return NULL;
-#endif
-  }
-  return &swigpyobjecttype_type;
-}
-
-SWIGINTERN PyGetSetDescrObject *
-SwigPyStaticVar_new_getset(PyTypeObject *type, PyGetSetDef *getset) {
-
-  PyGetSetDescrObject *descr;
-  descr = (PyGetSetDescrObject *)PyType_GenericAlloc(SwigPyStaticVar_Type(), 0);
-  assert(descr);
-  Py_XINCREF(type);
-  PyDescr_TYPE(descr) = type;
-  PyDescr_NAME(descr) = PyString_InternFromString(getset->name);
-  descr->d_getset = getset;
-  if (PyDescr_NAME(descr) == NULL) {
-    Py_DECREF(descr);
-    descr = NULL;
-  }
-  return descr;
-}
-
-SWIGINTERN void
-SwigPyBuiltin_InitBases (PyTypeObject *type, PyTypeObject **bases) {
-  int base_count = 0;
-  PyTypeObject **b;
-  PyObject *tuple;
-  int i;
-
-  if (!bases[0]) {
-    bases[0] = SwigPyObject_type();
-    bases[1] = NULL;
-  }
-  type->tp_base = bases[0];
-  Py_INCREF((PyObject *)bases[0]);
-  for (b = bases; *b != NULL; ++b)
-    ++base_count;
-  tuple = PyTuple_New(base_count);
-  for (i = 0; i < base_count; ++i) {
-    PyTuple_SET_ITEM(tuple, i, (PyObject *)bases[i]);
-    Py_INCREF((PyObject *)bases[i]);
-  }
-  type->tp_bases = tuple;
-}
-
-SWIGINTERN PyObject *
-SwigPyBuiltin_ThisClosure (PyObject *self, void *SWIGUNUSEDPARM(closure)) {
-  PyObject *result;
-  result = (PyObject *)SWIG_Python_GetSwigThis(self);
-  Py_XINCREF(result);
-  return result;
-}
-
-SWIGINTERN void
-SwigPyBuiltin_SetMetaType (PyTypeObject *type, PyTypeObject *metatype)
-{
-#if PY_VERSION_HEX >= 0x03000000
-    type->ob_base.ob_base.ob_type = metatype;
-#else
-    type->ob_type = metatype;
-#endif
-}
-
-
-/* Start of callback function macros for use in PyTypeObject */
-
-typedef PyObject *(*SwigPyWrapperFunction)(PyObject *, PyObject *);
-
-#define SWIGPY_UNARYFUNC_CLOSURE(wrapper)		\
-SWIGINTERN PyObject *					\
-wrapper##_unaryfunc_closure(PyObject *a) {		\
-  return SwigPyBuiltin_unaryfunc_closure(wrapper, a);	\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_unaryfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  return wrapper(a, NULL);
-}
-
-#define SWIGPY_DESTRUCTOR_CLOSURE(wrapper)			\
-SWIGINTERN void							\
-wrapper##_destructor_closure(PyObject *a) {			\
-    SwigPyBuiltin_destructor_closure(wrapper, #wrapper, a);	\
-}
-SWIGINTERN void
-SwigPyBuiltin_destructor_closure(SwigPyWrapperFunction wrapper, const char *wrappername, PyObject *a) {
-  SwigPyObject *sobj;
-  sobj = (SwigPyObject *)a;
-  Py_XDECREF(sobj->dict);
-  if (sobj->own) {
-    PyObject *o;
-    PyObject *val = 0, *type = 0, *tb = 0;
-    PyErr_Fetch(&val, &type, &tb);
-    o = wrapper(a, NULL);
-    if (!o) {
-      PyObject *deallocname = PyString_FromString(wrappername);
-      PyErr_WriteUnraisable(deallocname);
-      Py_DECREF(deallocname);
-    }
-    PyErr_Restore(val, type, tb);
-    Py_XDECREF(o);
-  }
-  if (PyType_IS_GC(a->ob_type)) {
-    PyObject_GC_Del(a);
-  } else {
-    PyObject_Del(a);
-  }
-}
-
-#define SWIGPY_INQUIRY_CLOSURE(wrapper)			\
-SWIGINTERN int						\
-wrapper##_inquiry_closure(PyObject *a) {		\
-  return SwigPyBuiltin_inquiry_closure(wrapper, a);	\
-}
-SWIGINTERN int
-SwigPyBuiltin_inquiry_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  PyObject *pyresult;
-  int result;
-  pyresult = wrapper(a, NULL);
-  result = pyresult && PyObject_IsTrue(pyresult) ? 1 : 0;
-  Py_XDECREF(pyresult);
-  return result;
-}
-
-#define SWIGPY_GETITERFUNC_CLOSURE(wrapper)		\
-SWIGINTERN PyObject *					\
-wrapper##_getiterfunc_closure(PyObject *a) {		\
-  return SwigPyBuiltin_getiterfunc_closure(wrapper, a);	\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_getiterfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  return wrapper(a, NULL);
-}
-
-#define SWIGPY_BINARYFUNC_CLOSURE(wrapper)			\
-SWIGINTERN PyObject *						\
-wrapper##_binaryfunc_closure(PyObject *a, PyObject *b) {	\
-  return SwigPyBuiltin_binaryfunc_closure(wrapper, a, b);	\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_binaryfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a, PyObject *b) {
-  PyObject *tuple, *result;
-  tuple = PyTuple_New(1);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, b);
-  Py_XINCREF(b);
-  result = wrapper(a, tuple);
-  Py_DECREF(tuple);
-  return result;
-}
-
-typedef ternaryfunc ternarycallfunc;
-
-#define SWIGPY_TERNARYFUNC_CLOSURE(wrapper)				\
-SWIGINTERN PyObject *							\
-wrapper##_ternaryfunc_closure(PyObject *a, PyObject *b, PyObject *c) {	\
-  return SwigPyBuiltin_ternaryfunc_closure(wrapper, a, b, c);		\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_ternaryfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a, PyObject *b, PyObject *c) {
-  PyObject *tuple, *result;
-  tuple = PyTuple_New(2);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, b);
-  PyTuple_SET_ITEM(tuple, 1, c);
-  Py_XINCREF(b);
-  Py_XINCREF(c);
-  result = wrapper(a, tuple);
-  Py_DECREF(tuple);
-  return result;
-}
-
-#define SWIGPY_TERNARYCALLFUNC_CLOSURE(wrapper)					\
-SWIGINTERN PyObject *								\
-wrapper##_ternarycallfunc_closure(PyObject *a, PyObject *b, PyObject *c) {	\
-  return SwigPyBuiltin_ternarycallfunc_closure(wrapper, a, b, c);		\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_ternarycallfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a, PyObject *b, PyObject *c) {
-  (void) c;
-  return wrapper(a, b);
-}
-
-#define SWIGPY_LENFUNC_CLOSURE(wrapper)			\
-SWIGINTERN Py_ssize_t					\
-wrapper##_lenfunc_closure(PyObject *a) {		\
-  return SwigPyBuiltin_lenfunc_closure(wrapper, a);	\
-}
-SWIGINTERN Py_ssize_t
-SwigPyBuiltin_lenfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  PyObject *resultobj;
-  Py_ssize_t result;
-  resultobj = wrapper(a, NULL);
-  result = PyNumber_AsSsize_t(resultobj, NULL);
-  Py_DECREF(resultobj);
-  return result;
-}
-
-#define SWIGPY_SSIZESSIZEARGFUNC_CLOSURE(wrapper)				\
-SWIGINTERN PyObject *								\
-wrapper##_ssizessizeargfunc_closure(PyObject *a, Py_ssize_t b, Py_ssize_t c) {	\
-  return SwigPyBuiltin_ssizessizeargfunc_closure(wrapper, a, b, c);		\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_ssizessizeargfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a, Py_ssize_t b, Py_ssize_t c) {
-  PyObject *tuple, *result;
-  tuple = PyTuple_New(2);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, _PyLong_FromSsize_t(b));
-  PyTuple_SET_ITEM(tuple, 1, _PyLong_FromSsize_t(c));
-  result = wrapper(a, tuple);
-  Py_DECREF(tuple);
-  return result;
-}
-
-#define SWIGPY_SSIZESSIZEOBJARGPROC_CLOSURE(wrapper)						\
-SWIGINTERN int											\
-wrapper##_ssizessizeobjargproc_closure(PyObject *a, Py_ssize_t b, Py_ssize_t c, PyObject *d) {	\
-  return SwigPyBuiltin_ssizessizeobjargproc_closure(wrapper, a, b, c, d);			\
-}
-SWIGINTERN int
-SwigPyBuiltin_ssizessizeobjargproc_closure(SwigPyWrapperFunction wrapper, PyObject *a, Py_ssize_t b, Py_ssize_t c, PyObject *d) {
-  PyObject *tuple, *resultobj;
-  int result;
-  tuple = PyTuple_New(d ? 3 : 2);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, _PyLong_FromSsize_t(b));
-  PyTuple_SET_ITEM(tuple, 1, _PyLong_FromSsize_t(c));
-  if (d) {
-    PyTuple_SET_ITEM(tuple, 2, d);
-    Py_INCREF(d);
-  }
-  resultobj = wrapper(a, tuple);
-  result = resultobj ? 0 : -1;
-  Py_DECREF(tuple);
-  Py_XDECREF(resultobj);
-  return result;
-}
-
-#define SWIGPY_SSIZEARGFUNC_CLOSURE(wrapper)				\
-SWIGINTERN PyObject *							\
-wrapper##_ssizeargfunc_closure(PyObject *a, Py_ssize_t b) {		\
-  return SwigPyBuiltin_funpack_ssizeargfunc_closure(wrapper, a, b);	\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_funpack_ssizeargfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a, Py_ssize_t b) {
-  PyObject *tuple, *result;
-  tuple = PyTuple_New(1);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, _PyLong_FromSsize_t(b));
-  result = wrapper(a, tuple);
-  Py_DECREF(tuple);
-  return result;
-}
-
-#define SWIGPY_FUNPACK_SSIZEARGFUNC_CLOSURE(wrapper)			\
-SWIGINTERN PyObject *							\
-wrapper##_ssizeargfunc_closure(PyObject *a, Py_ssize_t b) {		\
-  return SwigPyBuiltin_ssizeargfunc_closure(wrapper, a, b);		\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_ssizeargfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a, Py_ssize_t b) {
-  PyObject *arg, *result;
-  arg = _PyLong_FromSsize_t(b);
-  result = wrapper(a, arg);
-  Py_DECREF(arg);
-  return result;
-}
-
-#define SWIGPY_SSIZEOBJARGPROC_CLOSURE(wrapper)					\
-SWIGINTERN int									\
-wrapper##_ssizeobjargproc_closure(PyObject *a, Py_ssize_t b, PyObject *c) {	\
-  return SwigPyBuiltin_ssizeobjargproc_closure(wrapper, a, b, c);		\
-}
-SWIGINTERN int
-SwigPyBuiltin_ssizeobjargproc_closure(SwigPyWrapperFunction wrapper, PyObject *a, Py_ssize_t b, PyObject *c) {
-  PyObject *tuple, *resultobj;
-  int result;
-  tuple = PyTuple_New(2);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, _PyLong_FromSsize_t(b));
-  PyTuple_SET_ITEM(tuple, 1, c);
-  Py_XINCREF(c);
-  resultobj = wrapper(a, tuple);
-  result = resultobj ? 0 : -1;
-  Py_XDECREF(resultobj);
-  Py_DECREF(tuple);
-  return result;
-}
-
-#define SWIGPY_OBJOBJARGPROC_CLOSURE(wrapper)					\
-SWIGINTERN int									\
-wrapper##_objobjargproc_closure(PyObject *a, PyObject *b, PyObject *c) {	\
-  return SwigPyBuiltin_objobjargproc_closure(wrapper, a, b, c);			\
-}
-SWIGINTERN int
-SwigPyBuiltin_objobjargproc_closure(SwigPyWrapperFunction wrapper, PyObject *a, PyObject *b, PyObject *c) {
-  PyObject *tuple, *resultobj;
-  int result;
-  tuple = PyTuple_New(c ? 2 : 1);
-  assert(tuple);
-  PyTuple_SET_ITEM(tuple, 0, b);
-  Py_XINCREF(b);
-  if (c) {
-    PyTuple_SET_ITEM(tuple, 1, c);
-    Py_XINCREF(c);
-  }
-  resultobj = wrapper(a, tuple);
-  result = resultobj ? 0 : -1;
-  Py_XDECREF(resultobj);
-  Py_DECREF(tuple);
-  return result;
-}
-
-#define SWIGPY_REPRFUNC_CLOSURE(wrapper)		\
-SWIGINTERN PyObject *					\
-wrapper##_reprfunc_closure(PyObject *a) {		\
-  return SwigPyBuiltin_reprfunc_closure(wrapper, a);	\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_reprfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  return wrapper(a, NULL);
-}
-
-#define SWIGPY_HASHFUNC_CLOSURE(wrapper)		\
-SWIGINTERN Py_hash_t					\
-wrapper##_hashfunc_closure(PyObject *a) {		\
-  return SwigPyBuiltin_hashfunc_closure(wrapper, a);	\
-}
-SWIGINTERN Py_hash_t
-SwigPyBuiltin_hashfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  PyObject *pyresult;
-  Py_hash_t result;
-  pyresult = wrapper(a, NULL);
-  if (!pyresult)
-    return -1;
-  result = SWIG_PyNumber_AsPyHash(pyresult);
-  Py_DECREF(pyresult);
-  return result;
-}
-
-#define SWIGPY_ITERNEXTFUNC_CLOSURE(wrapper)		\
-SWIGINTERN PyObject *					\
-wrapper##_iternextfunc_closure(PyObject *a) {		\
-  return SwigPyBuiltin_iternextfunc_closure(wrapper, a);\
-}
-SWIGINTERN PyObject *
-SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
-  return wrapper(a, NULL);
-}
-
-/* End of callback function macros for use in PyTypeObject */
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/python/carrays.i b/dependencies2013/win32/swig/Lib/python/carrays.i
deleted file mode 100644
index 74b2be9c..00000000
--- a/dependencies2013/win32/swig/Lib/python/carrays.i
+++ /dev/null
@@ -1,13 +0,0 @@
-%define %array_class(TYPE,NAME)
-#if defined(SWIGPYTHON_BUILTIN)
-  %feature("python:slot", "sq_item", functype="ssizeargfunc") NAME::__getitem__;
-  %feature("python:slot", "sq_ass_item", functype="ssizeobjargproc") NAME::__setitem__;
-#endif
-%array_class_wrap(TYPE,NAME,__getitem__,__setitem__)
-%enddef
-
-%include <typemaps/carrays.swg>
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/ccomplex.i b/dependencies2013/win32/swig/Lib/python/ccomplex.i
deleted file mode 100644
index 28872b98..00000000
--- a/dependencies2013/win32/swig/Lib/python/ccomplex.i
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ccomplex.i
- *
- * C complex typemaps
- * ISO C99:  7.3 Complex arithmetic <complex.h>
- * ----------------------------------------------------------------------------- */
-
-
-%include <pycomplex.swg>
-
-%{
-#include <complex.h>
-%}
-
-
-/* C complex constructor */
-#define CCplxConst(r, i) ((r) + I*(i))
-
-%swig_cplxflt_convn(float complex, CCplxConst, creal, cimag);
-%swig_cplxdbl_convn(double complex, CCplxConst, creal, cimag);
-%swig_cplxdbl_convn(complex, CCplxConst, creal, cimag);
-
-/* declaring the typemaps */
-%typemaps_primitive(SWIG_TYPECHECK_CPLXFLT, float complex);
-%typemaps_primitive(SWIG_TYPECHECK_CPLXDBL, double complex);
-%typemaps_primitive(SWIG_TYPECHECK_CPLXDBL, complex);
diff --git a/dependencies2013/win32/swig/Lib/python/cdata.i b/dependencies2013/win32/swig/Lib/python/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/python/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/cmalloc.i b/dependencies2013/win32/swig/Lib/python/cmalloc.i
deleted file mode 100644
index 248f06b9..00000000
--- a/dependencies2013/win32/swig/Lib/python/cmalloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cmalloc.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/cni.i b/dependencies2013/win32/swig/Lib/python/cni.i
deleted file mode 100644
index 10a1403a..00000000
--- a/dependencies2013/win32/swig/Lib/python/cni.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <gcj/cni.i>
-%include <jstring.i>
diff --git a/dependencies2013/win32/swig/Lib/python/complex.i b/dependencies2013/win32/swig/Lib/python/complex.i
deleted file mode 100644
index 4c3b3c5e..00000000
--- a/dependencies2013/win32/swig/Lib/python/complex.i
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __cplusplus
-%include <std_complex.i>
-#else
-%include <ccomplex.i>
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/python/cpointer.i b/dependencies2013/win32/swig/Lib/python/cpointer.i
deleted file mode 100644
index d824792f..00000000
--- a/dependencies2013/win32/swig/Lib/python/cpointer.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cpointer.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/cstring.i b/dependencies2013/win32/swig/Lib/python/cstring.i
deleted file mode 100644
index ede9c596..00000000
--- a/dependencies2013/win32/swig/Lib/python/cstring.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cstring.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/cwstring.i b/dependencies2013/win32/swig/Lib/python/cwstring.i
deleted file mode 100644
index 2824d9c7..00000000
--- a/dependencies2013/win32/swig/Lib/python/cwstring.i
+++ /dev/null
@@ -1,3 +0,0 @@
-%include <pywstrings.swg>
-%include <typemaps/cwstring.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/python/defarg.swg b/dependencies2013/win32/swig/Lib/python/defarg.swg
deleted file mode 100644
index 10c99161..00000000
--- a/dependencies2013/win32/swig/Lib/python/defarg.swg
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This file defines an internal function for processing default arguments
-   with proxy classes.
-
-   There seems to be no straightforward way to write proxy functions
-   involving default arguments. For example :
-
-             def foo(arg1,arg2,*args):
-                     proxyc.foo(arg1,arg2,args)
-
-   This fails because args is now a tuple and SWIG doesn't know what to
-   do with it.
-
-   This file allows a different approach :
-
-            def foo(arg1,arg2,*args):
-                    proxyc.__call_defarg(proxyc.foo,(arg1,arg2,)+args)
-
-   Basically, we form a new tuple from the object, call this special
-   __call_defarg method and it passes control to the real wrapper function.
-   An ugly hack, but it works.
-*/
-
-SWIGINTERN PyObject *swig_call_defargs(PyObject *self, PyObject *args) {
-  PyObject *func;
-  PyObject *parms;
-  
-  if (!PyArg_ParseTuple(args,"OO",&func,&parms))
-    return NULL;
-  
-  if (!PyCallable_Check(func)) {
-    SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-    PyErr_SetString(PyExc_TypeError, "__call_defarg : Need a callable object!");
-    SWIG_PYTHON_THREAD_END_BLOCK;
-    return NULL;
-  }
-  return PyEval_CallObject(func,parms);
-}
diff --git a/dependencies2013/win32/swig/Lib/python/director.swg b/dependencies2013/win32/swig/Lib/python/director.swg
deleted file mode 100644
index 4bdc94dc..00000000
--- a/dependencies2013/win32/swig/Lib/python/director.swg
+++ /dev/null
@@ -1,429 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that Python proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_DIRECTOR_PYTHON_HEADER_
-#define SWIG_DIRECTOR_PYTHON_HEADER_
-
-#include <string>
-#include <iostream>
-#include <exception>
-#include <vector>
-#include <map>
-
-
-/*
-  Use -DSWIG_PYTHON_DIRECTOR_NO_VTABLE if you don't want to generate a 'virtual
-  table', and avoid multiple GetAttr calls to retrieve the python
-  methods.
-*/
-
-#ifndef SWIG_PYTHON_DIRECTOR_NO_VTABLE
-#ifndef SWIG_PYTHON_DIRECTOR_VTABLE
-#define SWIG_PYTHON_DIRECTOR_VTABLE
-#endif
-#endif
-
-
-
-/*
-  Use -DSWIG_DIRECTOR_NO_UEH if you prefer to avoid the use of the
-  Undefined Exception Handler provided by swig.
-*/
-#ifndef SWIG_DIRECTOR_NO_UEH
-#ifndef SWIG_DIRECTOR_UEH
-#define SWIG_DIRECTOR_UEH
-#endif
-#endif
-
-
-/*
-  Use -DSWIG_DIRECTOR_NORTTI if you prefer to avoid the use of the
-  native C++ RTTI and dynamic_cast<>. But be aware that directors
-  could stop working when using this option.
-*/
-#ifdef SWIG_DIRECTOR_NORTTI
-/*
-   When we don't use the native C++ RTTI, we implement a minimal one
-   only for Directors.
-*/
-# ifndef SWIG_DIRECTOR_RTDIR
-# define SWIG_DIRECTOR_RTDIR
-
-namespace Swig {
-  class Director;
-  SWIGINTERN std::map<void *, Director *>& get_rtdir_map() {
-    static std::map<void *, Director *> rtdir_map;
-    return rtdir_map;
-  }
-
-  SWIGINTERNINLINE void set_rtdir(void *vptr, Director *rtdir) {
-    get_rtdir_map()[vptr] = rtdir;
-  }
-
-  SWIGINTERNINLINE Director *get_rtdir(void *vptr) {
-    std::map<void *, Director *>::const_iterator pos = get_rtdir_map().find(vptr);
-    Director *rtdir = (pos != get_rtdir_map().end()) ? pos->second : 0;
-    return rtdir;
-  }
-}
-# endif /* SWIG_DIRECTOR_RTDIR */
-
-# define SWIG_DIRECTOR_CAST(ARG) Swig::get_rtdir(static_cast<void *>(ARG))
-# define SWIG_DIRECTOR_RGTR(ARG1, ARG2) Swig::set_rtdir(static_cast<void *>(ARG1), ARG2)
-
-#else
-
-# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
-# define SWIG_DIRECTOR_RGTR(ARG1, ARG2)
-
-#endif /* SWIG_DIRECTOR_NORTTI */
-
-extern "C" {
-  struct swig_type_info;
-}
-
-namespace Swig {
-
-  /* memory handler */
-  struct GCItem {
-    virtual ~GCItem() {}
-
-    virtual int get_own() const {
-      return 0;
-    }
-  };
-
-  struct GCItem_var {
-    GCItem_var(GCItem *item = 0) : _item(item) {
-    }
-
-    GCItem_var& operator=(GCItem *item) {
-      GCItem *tmp = _item;
-      _item = item;
-      delete tmp;
-      return *this;
-    }
-
-    ~GCItem_var() {
-      delete _item;
-    }
-
-    GCItem * operator->() const {
-      return _item;
-    }
-
-  private:
-    GCItem *_item;
-  };
-
-  struct GCItem_Object : GCItem {
-    GCItem_Object(int own) : _own(own) {
-    }
-
-    virtual ~GCItem_Object() {
-    }
-
-    int get_own() const {
-      return _own;
-    }
-
-  private:
-    int _own;
-  };
-
-  template <typename Type>
-  struct GCItem_T : GCItem {
-    GCItem_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCItem_T() {
-      delete _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-
-  template <typename Type>
-  struct GCArray_T : GCItem {
-    GCArray_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCArray_T() {
-      delete[] _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-
-  /* base class for director exceptions */
-  class DirectorException : public std::exception {
-  protected:
-    std::string swig_msg;
-  public:
-    DirectorException(PyObject *error, const char *hdr ="", const char *msg ="") : swig_msg(hdr) {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      if (msg[0]) {
-        swig_msg += " ";
-        swig_msg += msg;
-      }
-      if (!PyErr_Occurred()) {
-        PyErr_SetString(error, what());
-      }
-      SWIG_PYTHON_THREAD_END_BLOCK;
-    }
-
-    virtual ~DirectorException() throw() {
-    }
-
-    /* Deprecated, use what() instead */
-    const char *getMessage() const {
-      return what();
-    }
-
-    const char *what() const throw() {
-      return swig_msg.c_str();
-    }
-
-    static void raise(PyObject *error, const char *msg) {
-      throw DirectorException(error, msg);
-    }
-
-    static void raise(const char *msg) {
-      raise(PyExc_RuntimeError, msg);
-    }
-  };
-
-  /* unknown exception handler  */
-  class UnknownExceptionHandler {
-#ifdef SWIG_DIRECTOR_UEH
-    static void handler() {
-      try {
-        throw;
-      } catch (DirectorException& e) {
-        std::cerr << "SWIG Director exception caught:" << std::endl
-                  << e.what() << std::endl;
-      } catch (std::exception& e) {
-        std::cerr << "std::exception caught: "<< e.what() << std::endl;
-      } catch (...) {
-        std::cerr << "Unknown exception caught." << std::endl;
-      }
-
-      std::cerr << std::endl
-                << "Python interpreter traceback:" << std::endl;
-      PyErr_Print();
-      std::cerr << std::endl;
-
-      std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
-                << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
-                << std::endl
-                << "Exception is being re-thrown, program will likely abort/terminate." << std::endl;
-      throw;
-    }
-
-  public:
-
-    std::unexpected_handler old;
-    UnknownExceptionHandler(std::unexpected_handler nh = handler) {
-      old = std::set_unexpected(nh);
-    }
-
-    ~UnknownExceptionHandler() {
-      std::set_unexpected(old);
-    }
-#endif
-  };
-
-  /* type mismatch in the return value from a python method call */
-  class DirectorTypeMismatchException : public DirectorException {
-  public:
-    DirectorTypeMismatchException(PyObject *error, const char *msg="")
-      : DirectorException(error, "SWIG director type mismatch", msg) {
-    }
-
-    DirectorTypeMismatchException(const char *msg="")
-      : DirectorException(PyExc_TypeError, "SWIG director type mismatch", msg) {
-    }
-
-    static void raise(PyObject *error, const char *msg) {
-      throw DirectorTypeMismatchException(error, msg);
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorTypeMismatchException(msg);
-    }
-  };
-
-  /* any python exception that occurs during a director method call */
-  class DirectorMethodException : public DirectorException {
-  public:
-    DirectorMethodException(const char *msg = "")
-      : DirectorException(PyExc_RuntimeError, "SWIG director method error.", msg) {
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorMethodException(msg);
-    }
-  };
-
-  /* attempt to call a pure virtual method via a director method */
-  class DirectorPureVirtualException : public DirectorException {
-  public:
-    DirectorPureVirtualException(const char *msg = "")
-      : DirectorException(PyExc_RuntimeError, "SWIG director pure virtual method called", msg) {
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorPureVirtualException(msg);
-    }
-  };
-
-
-#if defined(SWIG_PYTHON_THREADS)
-/*  __THREAD__ is the old macro to activate some thread support */
-# if !defined(__THREAD__)
-#   define __THREAD__ 1
-# endif
-#endif
-
-#ifdef __THREAD__
-# include "pythread.h"
-  class Guard {
-    PyThread_type_lock &mutex_;
-
-  public:
-    Guard(PyThread_type_lock & mutex) : mutex_(mutex) {
-      PyThread_acquire_lock(mutex_, WAIT_LOCK);
-    }
-
-    ~Guard() {
-      PyThread_release_lock(mutex_);
-    }
-  };
-# define SWIG_GUARD(mutex) Guard _guard(mutex)
-#else
-# define SWIG_GUARD(mutex)
-#endif
-
-  /* director base class */
-  class Director {
-  private:
-    /* pointer to the wrapped python object */
-    PyObject *swig_self;
-    /* flag indicating whether the object is owned by python or c++ */
-    mutable bool swig_disown_flag;
-
-    /* decrement the reference count of the wrapped python object */
-    void swig_decref() const {
-      if (swig_disown_flag) {
-        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-        Py_DECREF(swig_self);
-        SWIG_PYTHON_THREAD_END_BLOCK;
-      }
-    }
-
-  public:
-    /* wrap a python object. */
-    Director(PyObject *self) : swig_self(self), swig_disown_flag(false) {
-    }
-
-    /* discard our reference at destruction */
-    virtual ~Director() {
-      swig_decref();
-    }
-
-    /* return a pointer to the wrapped python object */
-    PyObject *swig_get_self() const {
-      return swig_self;
-    }
-
-    /* acquire ownership of the wrapped python object (the sense of "disown" is from python) */
-    void swig_disown() const {
-      if (!swig_disown_flag) {
-        swig_disown_flag=true;
-        swig_incref();
-      }
-    }
-
-    /* increase the reference count of the wrapped python object */
-    void swig_incref() const {
-      if (swig_disown_flag) {
-        Py_INCREF(swig_self);
-      }
-    }
-
-    /* methods to implement pseudo protected director members */
-    virtual bool swig_get_inner(const char * /* swig_protected_method_name */) const {
-      return true;
-    }
-
-    virtual void swig_set_inner(const char * /* swig_protected_method_name */, bool /* swig_val */) const {
-    }
-
-  /* ownership management */
-  private:
-    typedef std::map<void *, GCItem_var> swig_ownership_map;
-    mutable swig_ownership_map swig_owner;
-#ifdef __THREAD__
-    static PyThread_type_lock swig_mutex_own;
-#endif
-
-  public:
-    template <typename Type>
-    void swig_acquire_ownership_array(Type *vptr) const {
-      if (vptr) {
-        SWIG_GUARD(swig_mutex_own);
-        swig_owner[vptr] = new GCArray_T<Type>(vptr);
-      }
-    }
-
-    template <typename Type>
-    void swig_acquire_ownership(Type *vptr) const {
-      if (vptr) {
-        SWIG_GUARD(swig_mutex_own);
-        swig_owner[vptr] = new GCItem_T<Type>(vptr);
-      }
-    }
-
-    void swig_acquire_ownership_obj(void *vptr, int own) const {
-      if (vptr && own) {
-        SWIG_GUARD(swig_mutex_own);
-        swig_owner[vptr] = new GCItem_Object(own);
-      }
-    }
-
-    int swig_release_ownership(void *vptr) const {
-      int own = 0;
-      if (vptr) {
-        SWIG_GUARD(swig_mutex_own);
-        swig_ownership_map::iterator iter = swig_owner.find(vptr);
-        if (iter != swig_owner.end()) {
-          own = iter->second->get_own();
-          swig_owner.erase(iter);
-        }
-      }
-      return own;
-    }
-
-    template <typename Type>
-    static PyObject *swig_pyobj_disown(PyObject *pyobj, PyObject *SWIGUNUSEDPARM(args)) {
-      SwigPyObject *sobj = (SwigPyObject *)pyobj;
-      sobj->own = 0;
-      Director *d = SWIG_DIRECTOR_CAST(reinterpret_cast<Type *>(sobj->ptr));
-      if (d)
-        d->swig_disown();
-      return PyWeakref_NewProxy(pyobj, NULL);
-    }
-  };
-
-#ifdef __THREAD__
-  PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
-#endif
-}
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/embed.i b/dependencies2013/win32/swig/Lib/python/embed.i
deleted file mode 100644
index efd04878..00000000
--- a/dependencies2013/win32/swig/Lib/python/embed.i
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// embed.i
-// SWIG file embedding the Python interpreter in something else.
-// This file is deprecated and no longer actively maintained, but it still
-// seems to work with Python 2.7.  Status with Python 3 is unknown.
-//
-// This file makes it possible to extend Python and all of its
-// built-in functions without having to hack its setup script.
-//
-
-
-#ifdef AUTODOC
-%subsection "embed.i"
-%text %{
-This module provides support for building a new version of the
-Python executable.  This will be necessary on systems that do
-not support shared libraries and may be necessary with C++
-extensions.  This file contains everything you need to build
-a new version of Python from include files and libraries normally
-installed with the Python language.
-
-This module will automatically grab all of the Python modules
-present in your current Python executable (including any special
-purpose modules you have enabled such as Tkinter).   Thus, you
-may need to provide additional link libraries when compiling.
-
-As far as I know, this module is C++ safe.
-%}
-#endif
-
-%wrapper %{
-
-#include <Python.h>
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void SWIG_init();  /* Forward reference */
-
-#define _PyImport_Inittab swig_inittab
-
-/* Grab Python's inittab[] structure */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <config.c>
-
-#undef _PyImport_Inittab
-
-/* Now define our own version of it.
-   Hopefully someone does not have more than 1000 built-in modules */
-
-struct _inittab SWIG_Import_Inittab[1000];
-
-static int  swig_num_modules = 0;
-
-/* Function for adding modules to Python */
-
-static void swig_add_module(char *name, void (*initfunc)()) {
-	SWIG_Import_Inittab[swig_num_modules].name = name;
-	SWIG_Import_Inittab[swig_num_modules].initfunc = initfunc;
-	swig_num_modules++;
-	SWIG_Import_Inittab[swig_num_modules].name = (char *) 0;
-	SWIG_Import_Inittab[swig_num_modules].initfunc = 0;
-}
-
-/* Function to add all of Python's built-in modules to our interpreter */
-
-static void swig_add_builtin() {
-	int i = 0;
-	while (swig_inittab[i].name) {
-		swig_add_module(swig_inittab[i].name, swig_inittab[i].initfunc);
-		i++;
-	}
-#ifdef SWIGMODINIT
-	SWIGMODINIT
-#endif
-	/* Add SWIG builtin function */
-	swig_add_module(SWIG_name, SWIG_init);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int Py_Main(int, char **);
-
-#ifdef __cplusplus
-}
-#endif
-
-extern struct _inittab *PyImport_Inittab;
-
-int
-main(int argc, char **argv) {
-	swig_add_builtin();
-	PyImport_Inittab = SWIG_Import_Inittab;
-	return Py_Main(argc,argv);
-}
-
-%}
diff --git a/dependencies2013/win32/swig/Lib/python/exception.i b/dependencies2013/win32/swig/Lib/python/exception.i
deleted file mode 100644
index bb0b15c9..00000000
--- a/dependencies2013/win32/swig/Lib/python/exception.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%include <typemaps/exception.swg>
-
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), %block(%error(code, msg); SWIG_fail; ))
-}
diff --git a/dependencies2013/win32/swig/Lib/python/factory.i b/dependencies2013/win32/swig/Lib/python/factory.i
deleted file mode 100644
index 46a0a873..00000000
--- a/dependencies2013/win32/swig/Lib/python/factory.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/factory.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/file.i b/dependencies2013/win32/swig/Lib/python/file.i
deleted file mode 100644
index 359c34d2..00000000
--- a/dependencies2013/win32/swig/Lib/python/file.i
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -----------------------------------------------------------------------------
- * file.i
- *
- * Typemaps for FILE*
- * ----------------------------------------------------------------------------- */
-
-%types(FILE *);
-
-/* defining basic methods */
-%fragment("SWIG_AsValFilePtr","header") {
-SWIGINTERN int
-SWIG_AsValFilePtr(PyObject *obj, FILE **val) {
-  static swig_type_info* desc = 0;
-  void *vptr = 0;
-  if (!desc) desc = SWIG_TypeQuery("FILE *");
-  if ((SWIG_ConvertPtr(obj, &vptr, desc, 0)) == SWIG_OK) {
-    if (val) *val = (FILE *)vptr;
-    return SWIG_OK;
-  }
-%#if PY_VERSION_HEX < 0x03000000
-  if (PyFile_Check(obj)) {
-    if (val) *val =  PyFile_AsFile(obj);
-    return SWIG_OK;
-  }
-%#endif
-  return SWIG_TypeError;
-}
-}
-
-
-%fragment("SWIG_AsFilePtr","header",fragment="SWIG_AsValFilePtr") {
-SWIGINTERNINLINE FILE*
-SWIG_AsFilePtr(PyObject *obj) {
-  FILE *val = 0;
-  SWIG_AsValFilePtr(obj, &val);
-  return val;
-}
-}
-
-/* defining the typemaps */
-%typemaps_asval(%checkcode(POINTER), SWIG_AsValFilePtr, "SWIG_AsValFilePtr", FILE*);
diff --git a/dependencies2013/win32/swig/Lib/python/implicit.i b/dependencies2013/win32/swig/Lib/python/implicit.i
deleted file mode 100644
index 152c2b05..00000000
--- a/dependencies2013/win32/swig/Lib/python/implicit.i
+++ /dev/null
@@ -1,7 +0,0 @@
-%include <std_common.i>
-%include <typemaps/implicit.swg>
-
-#warning "This file provides the %implicit directive, which is an old and fragile"
-#warning "way to implement the C++ implicit conversion mechanism."
-#warning "Try using the more robust '%implicitconv Type;' directive instead."
-
diff --git a/dependencies2013/win32/swig/Lib/python/jstring.i b/dependencies2013/win32/swig/Lib/python/jstring.i
deleted file mode 100644
index bda95237..00000000
--- a/dependencies2013/win32/swig/Lib/python/jstring.i
+++ /dev/null
@@ -1,72 +0,0 @@
-%include <typemaps/valtypes.swg>
-
-%fragment(SWIG_AsVal_frag(jstring),"header") {
-SWIGINTERN int
-SWIG_AsVal(jstring)(PyObject *obj, jstring *val)
-{
-  if (obj == Py_None) {
-    if (val) *val = 0;
-    return SWIG_OK;
-  }
-  
-  PyObject *tmp = 0;
-  int isunicode = PyUnicode_Check(obj);
-  if (!isunicode && PyString_Check(obj)) {
-    if (val) {
-      obj = tmp = PyUnicode_FromObject(obj);
-    }
-    isunicode = 1;
-  }
-  if (isunicode) {
-    if (val) {
-      if (sizeof(Py_UNICODE) == sizeof(jchar)) {
-	*val = JvNewString((const jchar *) PyUnicode_AS_UNICODE(obj),PyUnicode_GET_SIZE(obj));
-	return SWIG_NEWOBJ;
-      } else {
-	int len = PyUnicode_GET_SIZE(obj);
-	Py_UNICODE *pchars = PyUnicode_AS_UNICODE(obj);
-	*val = JvAllocString (len);
-	jchar *jchars = JvGetStringChars (*val);	
-	for (int i = 0; i < len; ++i) {
-	  jchars[i] = pchars[i];
-	}
-	return SWIG_NEWOBJ;
-      }
-    }
-    Py_XDECREF(tmp);
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment(SWIG_From_frag(jstring),"header") {
-SWIGINTERNINLINE PyObject *
-SWIG_From(jstring)(jstring val)
-{
-  if (!val) {
-    return SWIG_Py_Void();
-  } 
-  if (sizeof(Py_UNICODE) == sizeof(jchar)) {    
-    return PyUnicode_FromUnicode((const Py_UNICODE *) JvGetStringChars(val),
-				 JvGetStringUTFLength(val));
-  } else {
-    int len = JvGetStringUTFLength(val);
-    Py_UNICODE pchars[len];
-    jchar *jchars = JvGetStringChars(val);
-    
-    for (int i = 0; i < len; i++) {      
-      pchars[i] = jchars[i];
-    }
-    return PyUnicode_FromUnicode((const Py_UNICODE *) pchars, len);
-  }
-}
-}
-
-%typemaps_asvalfrom(%checkcode(STRING),
-		    %arg(SWIG_AsVal(jstring)), 
-		    %arg(SWIG_From(jstring)), 
-		    %arg(SWIG_AsVal_frag(jstring)), 
-		    %arg(SWIG_From_frag(jstring)), 
-		    java::lang::String *);
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyabc.i b/dependencies2013/win32/swig/Lib/python/pyabc.i
deleted file mode 100644
index 12ce6598..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyabc.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%define %pythonabc(Type, Abc)
-  %feature("python:abc", #Abc) Type;
-%enddef
-%pythoncode %{import collections%}
-%pythonabc(std::vector, collections.MutableSequence);
-%pythonabc(std::list, collections.MutableSequence);
-%pythonabc(std::map, collections.MutableMapping);
-%pythonabc(std::multimap, collections.MutableMapping);
-%pythonabc(std::set, collections.MutableSet);
-%pythonabc(std::multiset, collections.MutableSet);
diff --git a/dependencies2013/win32/swig/Lib/python/pyapi.swg b/dependencies2013/win32/swig/Lib/python/pyapi.swg
deleted file mode 100644
index 2da05f9e..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyapi.swg
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -----------------------------------------------------------------------------
- * Python API portion that goes into the runtime
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* -----------------------------------------------------------------------------
- * Constant declarations
- * ----------------------------------------------------------------------------- */
-
-/* Constant Types */
-#define SWIG_PY_POINTER 4
-#define SWIG_PY_BINARY  5
-
-/* Constant information structure */
-typedef struct swig_const_info {
-  int type;
-  char *name;
-  long lvalue;
-  double dvalue;
-  void   *pvalue;
-  swig_type_info **ptype;
-} swig_const_info;
-
-
-/* -----------------------------------------------------------------------------
- * Wrapper of PyInstanceMethod_New() used in Python 3
- * It is exported to the generated module, used for -fastproxy
- * ----------------------------------------------------------------------------- */
-#if PY_VERSION_HEX >= 0x03000000
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
-{
-  return PyInstanceMethod_New(func);
-}
-#else
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
-{
-  return NULL;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/python/pybackward.swg b/dependencies2013/win32/swig/Lib/python/pybackward.swg
deleted file mode 100644
index 8305fc78..00000000
--- a/dependencies2013/win32/swig/Lib/python/pybackward.swg
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 
-   adding backward compatibility macros
-*/
-
-#define SWIG_arg(x...)     %arg(x)
-#define SWIG_Mangle(x...)  %mangle(x)
-
-#define SWIG_As_frag(Type...)      %fragment_name(As, Type)
-#define SWIG_As_name(Type...)      %symbol_name(As, Type) 
-#define SWIG_As(Type...)     	   SWIG_As_name(Type) SWIG_AS_CALL_ARGS 
-
-#define SWIG_Check_frag(Type...)   %fragment_name(Check, Type)
-#define SWIG_Check_name(Type...)   %symbol_name(Check, Type) 
-#define SWIG_Check(Type...)        SWIG_Check_name(Type) SWIG_AS_CALL_ARGS 
-
-%define %ascheck_methods(Code, Type...)
-%fragment(SWIG_As_frag(Type),"header", fragment=SWIG_AsVal_frag(Type)) {
-SWIGINTERNINLINE Type
-SWIG_As(Type)(PyObject* obj)
-{
-  Type v;
-  int res = SWIG_AsVal(Type)(obj, &v);
-  if (!SWIG_IsOK(res)) {
-    /*
-      this is needed to make valgrind/purify happier. 
-     */
-    memset((void*)&v, 0, sizeof(Type));
-    SWIG_Error(res, "");
-  }
-  return v;
-}
-}
-
-%fragment(SWIG_Check_frag(Type),"header",fragment=SWIG_AsVal_frag(Type)) {
-SWIGINTERNINLINE int
-SWIG_Check(Type)(PyObject* obj)
-{
-  int res = SWIG_AsVal(Type)(obj, (Type*)0);
-  return SWIG_IsOK(res);
-}
-}
-%enddef
-
-%apply_checkctypes(%ascheck_methods)
-
diff --git a/dependencies2013/win32/swig/Lib/python/pybuffer.i b/dependencies2013/win32/swig/Lib/python/pybuffer.i
deleted file mode 100644
index 121cd709..00000000
--- a/dependencies2013/win32/swig/Lib/python/pybuffer.i
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Implementing buffer protocol typemaps */
-
-/* %pybuffer_mutable_binary(TYPEMAP, SIZE)
- *
- * Macro for functions accept mutable buffer pointer with a size.
- * This can be used for both input and output. For example:
- * 
- *      %pybuffer_mutable_binary(char *buff, int size);
- *      void foo(char *buff, int size) {
- *        for(int i=0; i<size; ++i)
- *          buff[i]++;  
- *      }
- */
-
-%define %pybuffer_mutable_binary(TYPEMAP, SIZE)
-%typemap(in) (TYPEMAP, SIZE)
-  (int res, Py_ssize_t size = 0, void *buf = 0) {
-  res = PyObject_AsWriteBuffer($input, &buf, &size);
-  if (res<0) {
-    PyErr_Clear();
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  $1 = ($1_ltype) buf;
-  $2 = ($2_ltype) (size/sizeof($*1_type));
-}
-%enddef
-
-/* %pybuffer_mutable_string(TYPEMAP, SIZE)
- *
- * Macro for functions accept mutable zero terminated string pointer.
- * This can be used for both input and output. For example:
- * 
- *      %pybuffer_mutable_string(char *str);
- *      void foo(char *str) {
- *        while(*str) {
- *          *str = toupper(*str);
- *          str++;
- *      }
- */
-
-%define %pybuffer_mutable_string(TYPEMAP)
-%typemap(in) (TYPEMAP)
-  (int res, Py_ssize_t size = 0, void *buf = 0) {
-  res = PyObject_AsWriteBuffer($input, &buf, &size);
-  if (res<0) {
-    PyErr_Clear();
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  $1 = ($1_ltype) buf;
-}
-%enddef
-
-/* pybuffer_binary(TYPEMAP, SIZE)
- *
- * Macro for functions accept read only buffer pointer with a size.
- * This must be used for input. For example:
- * 
- *      %pybuffer_binary(char *buff, int size);
- *      int foo(char *buff, int size) {
- *        int count = 0;
- *        for(int i=0; i<size; ++i)
- *          if (0==buff[i]) count++;
- *        return count;
- *      }
- */
-
-%define %pybuffer_binary(TYPEMAP, SIZE)
-%typemap(in) (TYPEMAP, SIZE)
-  (int res, Py_ssize_t size = 0, const void *buf = 0) {
-  res = PyObject_AsReadBuffer($input, &buf, &size);
-  if (res<0) {
-    PyErr_Clear();
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  $1 = ($1_ltype) buf;
-  $2 = ($2_ltype) (size / sizeof($*1_type));
-}
-%enddef
-
-/* %pybuffer_string(TYPEMAP, SIZE)
- *
- * Macro for functions accept read only zero terminated string pointer.
- * This can be used for input. For example:
- * 
- *      %pybuffer_string(char *str);
- *      int foo(char *str) {
- *        int count = 0;
- *        while(*str) {
- *          if (isalnum(*str))
- *            count++;
- *          str++;
- *      }
- */
-
-%define %pybuffer_string(TYPEMAP)
-%typemap(in) (TYPEMAP)
-  (int res, Py_ssize_t size = 0, const void *buf = 0) {
-  res = PyObject_AsReadBuffer($input, &buf, &size);
-  if (res<0) {
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  $1 = ($1_ltype) buf;
-}
-%enddef
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyclasses.swg b/dependencies2013/win32/swig/Lib/python/pyclasses.swg
deleted file mode 100644
index 9d6299ff..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyclasses.swg
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifdef __cplusplus
-
-/*
-  SwigPtr_PyObject is used as a replacement of PyObject *, where
-  the INCREF/DECREF are applied as needed.
-
-  You can use SwigPtr_PyObject in a container, such as
-  
-     std::vector<SwigPtr_PyObject>;
-
-  or as a member variable:
-  
-     struct A {
-       SwigPtr_PyObject obj;
-       A(PyObject *o) : _obj(o) {
-       }
-     };
-
-   or as a input/output value 
-
-     SwigPtr_PyObject func(SwigPtr_PyObject obj) {     
-       SwigPtr_PyObject out = PyString_FromFormat("hello %s", PyObject_AsString(obj));
-       Py_DECREF(out);
-       return out;
-     }
-
-   just remember to pair the object creation with the proper DECREF,
-   the same as with plain PyObject *ptr, since SwigPtr_PyObject always add
-   one reference at construction.
-
-   SwigPtr_PyObject is 'visible' at the wrapped side, so you can do:
-
-
-      %template(pyvector) std::vector<swig::SwigPtr_PyObject>;
-
-   and all the proper typemaps will be used.
-   
-*/
-
-namespace swig {
-  %ignore SwigPtr_PyObject;
-  struct SwigPtr_PyObject {};
-  %apply PyObject * {SwigPtr_PyObject};
-  %apply PyObject * const& {SwigPtr_PyObject const&};
-
-  %typemap(typecheck,precedence=SWIG_TYPECHECK_SWIGOBJECT,noblock=1) SwigPtr_PyObject const& "$1 = ($input != 0);";
-
-
-  /* For output */
-  %typemap(out,noblock=1)  SwigPtr_PyObject {
-    $result = (PyObject *)$1;
-    Py_INCREF($result);
-  }
-  
-  %typemap(out,noblock=1)  SwigPtr_PyObject const & {
-    $result = (PyObject *)*$1;
-    Py_INCREF($result);
-  }
-  
-}
-
-%{
-namespace swig {
-  class SwigPtr_PyObject {
-  protected:
-    PyObject *_obj;
-
-  public:
-    SwigPtr_PyObject() :_obj(0)
-    {
-    }
-
-    SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj)
-    {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      Py_XINCREF(_obj);      
-      SWIG_PYTHON_THREAD_END_BLOCK;
-    }
-    
-    SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj)
-    {
-      if (initial_ref) {
-        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-        Py_XINCREF(_obj);
-        SWIG_PYTHON_THREAD_END_BLOCK;
-      }
-    }
-    
-    SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) 
-    {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      Py_XINCREF(item._obj);
-      Py_XDECREF(_obj);
-      _obj = item._obj;
-      SWIG_PYTHON_THREAD_END_BLOCK;
-      return *this;      
-    }
-    
-    ~SwigPtr_PyObject() 
-    {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      Py_XDECREF(_obj);
-      SWIG_PYTHON_THREAD_END_BLOCK;
-    }
-    
-    operator PyObject *() const
-    {
-      return _obj;
-    }
-
-    PyObject *operator->() const
-    {
-      return _obj;
-    }
-  };
-}
-%}
-
-/*
-  SwigVar_PyObject is used to manage 'in the scope' PyObject * variables,
-  as in
-
-  int func () {
-    SwigVar_PyObject obj = PyString_FromString("hello");
-  }
-
-  ie, 'obj' is created and destructed in the same scope from
-  a python object that carries at least one reference value.
-  
-  SwigVar_PyObject just take care of applying the proper Py_DECREF.
-
-  Hence, this class is purely internal and not visible at the wrapped side.
- */
-namespace swig {
-  %ignore SwigVar_PyObject;
-  struct SwigVar_PyObject {};
-  %apply PyObject * {SwigVar_PyObject};
-  %apply PyObject * const& {SwigVar_PyObject const&};
-}
-
-%{
-namespace swig {
-  struct SwigVar_PyObject : SwigPtr_PyObject {
-    SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { }
-    
-    SwigVar_PyObject & operator = (PyObject* obj)
-    {
-      Py_XDECREF(_obj);
-      _obj = obj;
-      return *this;      
-    }
-  };
-}
-%}
-
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/pycomplex.swg b/dependencies2013/win32/swig/Lib/python/pycomplex.swg
deleted file mode 100644
index 087c50f9..00000000
--- a/dependencies2013/win32/swig/Lib/python/pycomplex.swg
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-  Defines the As/From converters for double/float complex, you need to
-  provide complex Type, the Name you want to use in the converters,
-  the complex Constructor method, and the Real and Imag complex
-  accessor methods.
-
-  See the std_complex.i and ccomplex.i for concrete examples.
-*/
-
-/* the common from converter */
-%define %swig_fromcplx_conv(Type, Real, Imag)
-%fragment(SWIG_From_frag(Type),"header")
-{
-SWIGINTERNINLINE PyObject*
-SWIG_From(Type)(%ifcplusplus(const Type&, Type) c)
-{
-  return PyComplex_FromDoubles(Real(c), Imag(c));
-}
-}
-%enddef
-
-/* the double case */
-%define %swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-	  fragment=SWIG_AsVal_frag(double))
-{
-SWIGINTERN int
-SWIG_AsVal(Type) (PyObject *o, Type* val)
-{
-  if (PyComplex_Check(o)) {
-    if (val) *val = Constructor(PyComplex_RealAsDouble(o), PyComplex_ImagAsDouble(o));
-    return SWIG_OK;
-  } else {
-    double d;    
-    int res = SWIG_AddCast(SWIG_AsVal(double)(o, &d));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(d, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-/* the float case */
-%define %swig_cplxflt_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-          fragment=SWIG_AsVal_frag(float)) {
-SWIGINTERN int
-SWIG_AsVal(Type)(PyObject *o, Type *val)
-{
-  if (PyComplex_Check(o)) {
-    double re = PyComplex_RealAsDouble(o);
-    double im = PyComplex_ImagAsDouble(o);
-    if ((-FLT_MAX <= re && re <= FLT_MAX) && (-FLT_MAX <= im && im <= FLT_MAX)) {
-      if (val) *val = Constructor(%numeric_cast(re, float),
-				  %numeric_cast(im, float));
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }    
-  } else {
-    float re;
-    int res = SWIG_AddCast(SWIG_AsVal(float)(o, &re));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(re, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-#define %swig_cplxflt_convn(Type, Constructor, Real, Imag) \
-%swig_cplxflt_conv(Type, Constructor, Real, Imag)
-
-
-#define %swig_cplxdbl_convn(Type, Constructor, Real, Imag) \
-%swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/pycontainer.swg b/dependencies2013/win32/swig/Lib/python/pycontainer.swg
deleted file mode 100644
index d40b0baa..00000000
--- a/dependencies2013/win32/swig/Lib/python/pycontainer.swg
+++ /dev/null
@@ -1,1033 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pycontainer.swg
- *
- * Python sequence <-> C++ container wrapper
- *
- * This wrapper, and its iterator, allows a general use (and reuse) of
- * the mapping between C++ and Python, thanks to the C++ templates.
- *
- * Of course, it needs the C++ compiler to support templates, but
- * since we will use this wrapper with the STL containers, that should
- * be the case.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <iostream>
-
-#if PY_VERSION_HEX >= 0x03020000
-# define SWIGPY_SLICE_ARG(obj) ((PyObject*) (obj))
-#else
-# define SWIGPY_SLICE_ARG(obj) ((PySliceObject*) (obj))
-#endif
-%}
-
-
-#if !defined(SWIG_NO_EXPORT_ITERATOR_METHODS)
-# if !defined(SWIG_EXPORT_ITERATOR_METHODS)
-#  define SWIG_EXPORT_ITERATOR_METHODS SWIG_EXPORT_ITERATOR_METHODS
-# endif
-#endif
-
-%include <pyiterators.swg>
-
-/**** The PySequence C++ Wrap ***/
-
-%fragment("<stdexcept>");
-
-%include <std_except.i>
-
-%fragment(SWIG_Traits_frag(swig::SwigPtr_PyObject),"header",fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits<SwigPtr_PyObject > {
-    typedef value_category category;
-    static const char* type_name() { return  "SwigPtr_PyObject"; }
-  };
-  
-  template <>  struct traits_from<SwigPtr_PyObject> {
-    typedef SwigPtr_PyObject value_type;
-    static PyObject *from(const value_type& val) {
-      PyObject *obj = static_cast<PyObject *>(val);
-      Py_XINCREF(obj);
-      return obj;
-    }
-  };
-  
-  template <> 
-  struct traits_check<SwigPtr_PyObject, value_category> {
-    static bool check(SwigPtr_PyObject) {
-      return true;
-    }
-  };
-  
-  template <>  struct traits_asval<SwigPtr_PyObject > {   
-    typedef SwigPtr_PyObject value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      if (val) *val = obj;
-      return SWIG_OK;
-    }
-  };
-}
-}
-
-%fragment(SWIG_Traits_frag(swig::SwigVar_PyObject),"header",fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits<SwigVar_PyObject > {
-    typedef value_category category;
-    static const char* type_name() { return  "SwigVar_PyObject"; }
-  };
-  
-  template <>  struct traits_from<SwigVar_PyObject> {
-    typedef SwigVar_PyObject value_type;
-    static PyObject *from(const value_type& val) {
-      PyObject *obj = static_cast<PyObject *>(val);
-      Py_XINCREF(obj);
-      return obj;
-    }
-  };
-  
-  template <> 
-  struct traits_check<SwigVar_PyObject, value_category> {
-    static bool check(SwigVar_PyObject) {
-      return true;
-    }
-  };
-  
-  template <>  struct traits_asval<SwigVar_PyObject > {   
-    typedef SwigVar_PyObject value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      if (val) *val = obj;
-      return SWIG_OK;
-    }
-  };
-} 
-}
-
-%fragment("SwigPySequence_Base","header",fragment="<stddef.h>")
-{
-%#include <functional>
-
-namespace std {
-  template <>
-  struct less <PyObject *>
-  {
-    bool
-    operator()(PyObject * v, PyObject *w) const
-    { 
-      bool res;
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      res = PyObject_RichCompareBool(v, w, Py_LT) ? true : false;
-      /* This may fall into a case of inconsistent
-               eg. ObjA > ObjX > ObjB
-               but ObjA < ObjB
-      */
-      if( PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_TypeError) )
-      {
-        /* Objects can't be compared, this mostly occurred in Python 3.0 */
-        /* Compare their ptr directly for a workaround */
-        res = (v < w);
-        PyErr_Clear();
-      }
-      SWIG_PYTHON_THREAD_END_BLOCK;
-      return res;
-    }
-  };
-
-  template <>
-  struct less <swig::SwigPtr_PyObject>
-  {
-    bool
-    operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
-    {
-      return std::less<PyObject *>()(v, w);
-    }
-  };
-
-  template <>
-  struct less <swig::SwigVar_PyObject>
-  {
-    bool
-    operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
-    {
-      return std::less<PyObject *>()(v, w);
-    }
-  };
-
-}
-
-namespace swig {
-  template <> struct traits<PyObject *> {
-    typedef value_category category;
-    static const char* type_name() { return "PyObject *"; }
-  };  
-
-  template <>  struct traits_asval<PyObject * > {   
-    typedef PyObject * value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      if (val) *val = obj;
-      return SWIG_OK;
-    }
-  };
-
-  template <> 
-  struct traits_check<PyObject *, value_category> {
-    static bool check(PyObject *) {
-      return true;
-    }
-  };
-
-  template <>  struct traits_from<PyObject *> {
-    typedef PyObject * value_type;
-    static PyObject *from(const value_type& val) {
-      Py_XINCREF(val);
-      return val;
-    }
-  };
-  
-}
-
-namespace swig {
-  template <class Difference>
-  inline size_t
-  check_index(Difference i, size_t size, bool insert = false) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size)
-	return (size_t) (i + size);
-    } else if ( (size_t) i < size ) {
-      return (size_t) i;
-    } else if (insert && ((size_t) i == size)) {
-      return size;
-    }
-    throw std::out_of_range("index out of range");
-  }
-
-  template <class Difference>
-  void
-  slice_adjust(Difference i, Difference j, Py_ssize_t step, size_t size, Difference &ii, Difference &jj, bool insert = false) {
-    if (step == 0) {
-      throw std::invalid_argument("slice step cannot be zero");
-    } else if (step > 0) {
-      // Required range: 0 <= i < size, 0 <= j < size, i <= j
-      if (i < 0) {
-        ii = 0;
-      } else if (i < (Difference)size) {
-        ii = i;
-      } else if (insert && (i >= (Difference)size)) {
-        ii = (Difference)size;
-      }
-      if (j < 0) {
-        jj = 0;
-      } else {
-        jj = (j < (Difference)size) ? j : (Difference)size;
-      }
-      if (jj < ii)
-        jj = ii;
-    } else {
-      // Required range: -1 <= i < size-1, -1 <= j < size-1, i >= j
-      if (i < -1) {
-        ii = -1;
-      } else if (i < (Difference) size) {
-        ii = i;
-      } else if (i >= (Difference)(size-1)) {
-        ii = (Difference)(size-1);
-      }
-      if (j < -1) {
-        jj = -1;
-      } else {
-        jj = (j < (Difference)size ) ? j : (Difference)(size-1);
-      }
-      if (ii < jj)
-        ii = jj;
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::iterator
-  getpos(Sequence* self, Difference i)  {
-    typename Sequence::iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::const_iterator
-  cgetpos(const Sequence* self, Difference i)  {
-    typename Sequence::const_iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence>
-  inline void
-  erase(Sequence* seq, const typename Sequence::iterator& position) {
-    seq->erase(position);
-  }
-
-  template <class Sequence>
-  struct traits_reserve {
-    static void reserve(Sequence & /*seq*/, typename Sequence::size_type /*n*/) {
-      // This should be specialized for types that support reserve
-    }
-  };
-
-  template <class Sequence, class Difference>
-  inline Sequence*
-  getslice(const Sequence* self, Difference i, Difference j, Py_ssize_t step) {
-    typename Sequence::size_type size = self->size();
-    Difference ii = 0;
-    Difference jj = 0;
-    swig::slice_adjust(i, j, step, size, ii, jj);
-
-    if (step > 0) {
-      typename Sequence::const_iterator sb = self->begin();
-      typename Sequence::const_iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      if (step == 1) {
-        return new Sequence(sb, se);
-      } else {
-        Sequence *sequence = new Sequence();
-        swig::traits_reserve<Sequence>::reserve(*sequence, (jj - ii + step - 1) / step);
-        typename Sequence::const_iterator it = sb;
-        while (it!=se) {
-          sequence->push_back(*it);
-          for (Py_ssize_t c=0; c<step && it!=se; ++c)
-            it++;
-        }
-        return sequence;
-      } 
-    } else {
-      Sequence *sequence = new Sequence();
-      swig::traits_reserve<Sequence>::reserve(*sequence, (ii - jj - step - 1) / -step);
-      typename Sequence::const_reverse_iterator sb = self->rbegin();
-      typename Sequence::const_reverse_iterator se = self->rbegin();
-      std::advance(sb,size-ii-1);
-      std::advance(se,size-jj-1);
-      typename Sequence::const_reverse_iterator it = sb;
-      while (it!=se) {
-        sequence->push_back(*it);
-        for (Py_ssize_t c=0; c<-step && it!=se; ++c)
-          it++;
-      }
-      return sequence;
-    }
-  }
-
-  template <class Sequence, class Difference, class InputSeq>
-  inline void
-  setslice(Sequence* self, Difference i, Difference j, Py_ssize_t step, const InputSeq& is = InputSeq()) {
-    typename Sequence::size_type size = self->size();
-    Difference ii = 0;
-    Difference jj = 0;
-    swig::slice_adjust(i, j, step, size, ii, jj, true);
-    if (step > 0) {
-      if (step == 1) {
-        size_t ssize = jj - ii;
-        if (ssize <= is.size()) {
-          // expanding/staying the same size
-          swig::traits_reserve<Sequence>::reserve(*self, self->size() - ssize + is.size());
-          typename Sequence::iterator sb = self->begin();
-          typename InputSeq::const_iterator isit = is.begin();
-          std::advance(sb,ii);
-          std::advance(isit, jj - ii);
-          self->insert(std::copy(is.begin(), isit, sb), isit, is.end());
-        } else {
-          // shrinking
-          typename Sequence::iterator sb = self->begin();
-          typename Sequence::iterator se = self->begin();
-          std::advance(sb,ii);
-          std::advance(se,jj);
-          self->erase(sb,se);
-          sb = self->begin();
-          std::advance(sb,ii);
-          self->insert(sb, is.begin(), is.end());
-        }
-      } else {
-        size_t replacecount = (jj - ii + step - 1) / step;
-        if (is.size() != replacecount) {
-          char msg[1024];
-          sprintf(msg, "attempt to assign sequence of size %lu to extended slice of size %lu", (unsigned long)is.size(), (unsigned long)replacecount);
-          throw std::invalid_argument(msg);
-        }
-        typename Sequence::const_iterator isit = is.begin();
-        typename Sequence::iterator it = self->begin();
-        std::advance(it,ii);
-        for (size_t rc=0; rc<replacecount; ++rc) {
-          *it++ = *isit++;
-          for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
-            it++;
-        }
-      }
-    } else {
-      size_t replacecount = (ii - jj - step - 1) / -step;
-      if (is.size() != replacecount) {
-        char msg[1024];
-        sprintf(msg, "attempt to assign sequence of size %lu to extended slice of size %lu", (unsigned long)is.size(), (unsigned long)replacecount);
-        throw std::invalid_argument(msg);
-      }
-      typename Sequence::const_iterator isit = is.begin();
-      typename Sequence::reverse_iterator it = self->rbegin();
-      std::advance(it,size-ii-1);
-      for (size_t rc=0; rc<replacecount; ++rc) {
-        *it++ = *isit++;
-        for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
-          it++;
-      }
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline void
-  delslice(Sequence* self, Difference i, Difference j, Py_ssize_t step) {
-    typename Sequence::size_type size = self->size();
-    Difference ii = 0;
-    Difference jj = 0;
-    swig::slice_adjust(i, j, step, size, ii, jj, true);
-    if (step > 0) {
-      typename Sequence::iterator sb = self->begin();
-      std::advance(sb,ii);
-      if (step == 1) {
-        typename Sequence::iterator se = self->begin();
-        std::advance(se,jj);
-        self->erase(sb,se);
-      } else {
-        typename Sequence::iterator it = sb;
-        size_t delcount = (jj - ii + step - 1) / step;
-        while (delcount) {
-          it = self->erase(it);
-          for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
-            it++;
-          delcount--;
-        }
-      }
-    } else {
-      typename Sequence::reverse_iterator sb = self->rbegin();
-      std::advance(sb,size-ii-1);
-      typename Sequence::reverse_iterator it = sb;
-      size_t delcount = (ii - jj - step - 1) / -step;
-      while (delcount) {
-        it = typename Sequence::reverse_iterator(self->erase((++it).base()));
-        for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
-          it++;
-        delcount--;
-      }
-    }
-  }
-}
-}
-
-%fragment("SwigPySequence_Cont","header",
-	  fragment="StdTraits",
-	  fragment="SwigPySequence_Base",
-	  fragment="SwigPyIterator_T")
-{
-namespace swig
-{
-  template <class T>
-  struct SwigPySequence_Ref
-  {
-    SwigPySequence_Ref(PyObject* seq, Py_ssize_t index)
-      : _seq(seq), _index(index)
-    {
-    }
-    
-    operator T () const
-    {
-      swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index);
-      try {
-	return swig::as<T>(item, true);
-      } catch (std::exception& e) {
-	char msg[1024];
-	sprintf(msg, "in sequence element %d ", (int)_index);
-	if (!PyErr_Occurred()) {
-	  ::%type_error(swig::type_name<T>());
-	}
-	SWIG_Python_AddErrorMsg(msg);
-	SWIG_Python_AddErrorMsg(e.what());
-	throw;
-      }
-    }
-
-    SwigPySequence_Ref& operator=(const T& v)
-    {
-      PySequence_SetItem(_seq, _index, swig::from<T>(v));
-      return *this;
-    }
-
-  private:
-    PyObject* _seq;
-    Py_ssize_t _index;
-  };
-
-  template <class T>
-  struct SwigPySequence_ArrowProxy
-  {
-    SwigPySequence_ArrowProxy(const T& x): m_value(x) {}
-    const T* operator->() const { return &m_value; }
-    operator const T*() const { return &m_value; }
-    T m_value;
-  };
-
-  template <class T, class Reference >
-  struct SwigPySequence_InputIterator
-  {
-    typedef SwigPySequence_InputIterator<T, Reference > self;
-
-    typedef std::random_access_iterator_tag iterator_category;
-    typedef Reference reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef Py_ssize_t difference_type;
-
-    SwigPySequence_InputIterator()
-    {
-    }
-
-    SwigPySequence_InputIterator(PyObject* seq, Py_ssize_t index)
-      : _seq(seq), _index(index)
-    {
-    }
-
-    reference operator*() const
-    {
-      return reference(_seq, _index);
-    }
-
-    SwigPySequence_ArrowProxy<T>
-    operator->() const {
-      return SwigPySequence_ArrowProxy<T>(operator*());
-    }
-
-    bool operator==(const self& ri) const
-    {
-      return (_index == ri._index) && (_seq == ri._seq);
-    }
-
-    bool operator!=(const self& ri) const
-    {
-      return !(operator==(ri));
-    }
-
-    self& operator ++ ()
-    {
-      ++_index;
-      return *this;
-    }
-
-    self& operator -- ()
-    {
-      --_index;
-      return *this;
-    }
-
-    self& operator += (difference_type n)
-    {
-      _index += n;
-      return *this;
-    }
-
-    self operator +(difference_type n) const
-    {
-      return self(_seq, _index + n);
-    }
-
-    self& operator -= (difference_type n)
-    {
-      _index -= n;
-      return *this;
-    }
-
-    self operator -(difference_type n) const
-    {
-      return self(_seq, _index - n);
-    }
-
-    difference_type operator - (const self& ri) const
-    {
-      return _index - ri._index;
-    }
-
-    bool operator < (const self& ri) const
-    {
-      return _index < ri._index;
-    }
-
-    reference
-    operator[](difference_type n) const
-    {
-      return reference(_seq, _index + n);
-    }
-
-  private:
-    PyObject* _seq;
-    difference_type _index;
-  };
-
-  // STL container wrapper around a Python sequence
-  template <class T>
-  struct SwigPySequence_Cont
-  {
-    typedef SwigPySequence_Ref<T> reference;
-    typedef const SwigPySequence_Ref<T> const_reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef Py_ssize_t difference_type;
-    typedef size_t size_type;
-    typedef const pointer const_pointer;
-    typedef SwigPySequence_InputIterator<T, reference> iterator;
-    typedef SwigPySequence_InputIterator<T, const_reference> const_iterator;
-
-    SwigPySequence_Cont(PyObject* seq) : _seq(0)
-    {
-      if (!PySequence_Check(seq)) {
-	throw std::invalid_argument("a sequence is expected");
-      }
-      _seq = seq;
-      Py_INCREF(_seq);
-    }
-
-    ~SwigPySequence_Cont()
-    {
-      Py_XDECREF(_seq);
-    }
-
-    size_type size() const
-    {
-      return static_cast<size_type>(PySequence_Size(_seq));
-    }
-
-    bool empty() const
-    {
-      return size() == 0;
-    }
-
-    iterator begin()
-    {
-      return iterator(_seq, 0);
-    }
-
-    const_iterator begin() const
-    {
-      return const_iterator(_seq, 0);
-    }
-
-    iterator end()
-    {
-      return iterator(_seq, size());
-    }
-
-    const_iterator end() const
-    {
-      return const_iterator(_seq, size());
-    }
-
-    reference operator[](difference_type n)
-    {
-      return reference(_seq, n);
-    }
-
-    const_reference operator[](difference_type n)  const
-    {
-      return const_reference(_seq, n);
-    }
-
-    bool check(bool set_err = true) const
-    {
-      Py_ssize_t s = size();
-      for (Py_ssize_t i = 0; i < s; ++i) {
-	swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i);
-	if (!swig::check<value_type>(item)) {
-	  if (set_err) {
-	    char msg[1024];
-	    sprintf(msg, "in sequence element %d", (int)i);
-	    SWIG_Error(SWIG_RuntimeError, msg);
-	  }
-	  return false;
-	}
-      }
-      return true;
-    }
-
-  private:
-    PyObject* _seq;
-  };
-
-}
-}
-
-%define %swig_sequence_iterator(Sequence...)
-#if defined(SWIG_EXPORT_ITERATOR_METHODS)
-  class iterator;
-  class reverse_iterator;
-  class const_iterator;
-  class const_reverse_iterator;
-
-  %typemap(out,noblock=1,fragment="SwigPySequence_Cont")
-    iterator, reverse_iterator, const_iterator, const_reverse_iterator {
-    $result = SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &)),
-				 swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
-  }
-  %typemap(out,noblock=1,fragment="SwigPySequence_Cont")
-    std::pair<iterator, iterator>, std::pair<const_iterator, const_iterator> {
-    $result = PyTuple_New(2);
-    PyTuple_SetItem($result,0,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first),
-						 swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN));
-    PyTuple_SetItem($result,1,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).second),
-						 swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN));    
-  }
-
-  %fragment("SwigPyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="SwigPySequence_Cont") {}
-
-  %typemap(out,noblock=1,fragment="SwigPyPairBoolOutputIterator")
-    std::pair<iterator, bool>, std::pair<const_iterator, bool> {
-    $result = PyTuple_New(2);
-    PyTuple_SetItem($result,0,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first),
-					       swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN));    
-    PyTuple_SetItem($result,1,SWIG_From(bool)(%static_cast($1,const $type &).second));
-  }
-
-  %typemap(in,noblock=1,fragment="SwigPySequence_Cont")
-    iterator(swig::SwigPyIterator *iter = 0, int res),
-    reverse_iterator(swig::SwigPyIterator *iter = 0, int res),
-    const_iterator(swig::SwigPyIterator *iter = 0, int res),
-    const_reverse_iterator(swig::SwigPyIterator *iter = 0, int res) {
-    res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
-    if (!SWIG_IsOK(res) || !iter) {
-      %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-    } else {
-      swig::SwigPyIterator_T<$type > *iter_t = dynamic_cast<swig::SwigPyIterator_T<$type > *>(iter);
-      if (iter_t) {
-	$1 = iter_t->get_current();
-      } else {
-	%argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-      }
-    }
-  }
-
-  %typecheck(%checkcode(ITERATOR),noblock=1,fragment="SwigPySequence_Cont")
-    iterator, reverse_iterator, const_iterator, const_reverse_iterator {
-    swig::SwigPyIterator *iter = 0;
-    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
-    $1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<$type > *>(iter) != 0));
-  }
-
-  %fragment("SwigPySequence_Cont");
-
-  %newobject iterator(PyObject **PYTHON_SELF);
-  %extend  {
-    swig::SwigPyIterator* iterator(PyObject **PYTHON_SELF) {
-      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-
-#if defined(SWIGPYTHON_BUILTIN)
-  %feature("python:slot", "tp_iter", functype="getiterfunc") iterator;
-#else
-  %pythoncode %{def __iter__(self):
-    return self.iterator()%}
-#endif
-  }
-
-#endif //SWIG_EXPORT_ITERATOR_METHODS
-%enddef
-
-
-/**** The python container methods  ****/
-
-%define %swig_container_methods(Container...)
-
-/* deprecated in Python 2 */
-#if 1
-  %newobject __getslice__;
-#endif
-  %newobject __getitem__(PySliceObject *slice);
-
-#if defined(SWIGPYTHON_BUILTIN)
-  %feature("python:slot", "nb_nonzero", functype="inquiry") __nonzero__;
-  %feature("python:slot", "sq_length", functype="lenfunc") __len__;
-#endif // SWIGPYTHON_BUILTIN
-
-  %extend {
-    bool __nonzero__() const {
-      return !(self->empty());
-    }
-
-    /* Alias for Python 3 compatibility */
-    bool __bool__() const {
-      return !(self->empty());
-    }
-
-    size_type __len__() const {
-      return self->size();
-    }
-  }
-%enddef
-
-
-
-%define %swig_sequence_methods_common(Sequence...)
-  %swig_sequence_iterator(%arg(Sequence))
-  %swig_container_methods(%arg(Sequence))
-
-  %fragment("SwigPySequence_Base");
-
-#if defined(SWIGPYTHON_BUILTIN)
-  //%feature("python:slot", "sq_item", functype="ssizeargfunc") __getitem__;
-  //%feature("python:slot", "sq_slice", functype="ssizessizeargfunc") __getslice__;
-  //%feature("python:slot", "sq_ass_item", functype="ssizeobjargproc") __setitem__;
-  //%feature("python:slot", "sq_ass_slice", functype="ssizessizeobjargproc") __setslice__;
-  %feature("python:slot", "mp_subscript", functype="binaryfunc") __getitem__;
-  %feature("python:slot", "mp_ass_subscript", functype="objobjargproc") __setitem__;
-#endif // SWIGPYTHON_BUILTIN
-
-  %extend {
-    /* typemap for slice object support */
-    %typemap(in) PySliceObject* {
-      if (!PySlice_Check($input)) {
-        %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-      }
-      $1 = (PySliceObject *) $input;
-    }
-    %typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) PySliceObject* {
-      $1 = PySlice_Check($input);
-    }
-
-/* deprecated in Python 2 */
-#if 1
-    Sequence* __getslice__(difference_type i, difference_type j) throw (std::out_of_range, std::invalid_argument) {
-      return swig::getslice(self, i, j, 1);
-    }
-
-    void __setslice__(difference_type i, difference_type j) throw (std::out_of_range, std::invalid_argument) {
-      swig::setslice(self, i, j, 1, Sequence());
-    }
-
-    void __setslice__(difference_type i, difference_type j, const Sequence& v) throw (std::out_of_range, std::invalid_argument) {
-      swig::setslice(self, i, j, 1, v);
-    }
-
-    void __delslice__(difference_type i, difference_type j) throw (std::out_of_range, std::invalid_argument) {
-      swig::delslice(self, i, j, 1);
-    }
-#endif
-
-    void __delitem__(difference_type i) throw (std::out_of_range, std::invalid_argument) {
-      swig::erase(self, swig::getpos(self, i));
-    }
-
-    /* Overloaded methods for Python 3 compatibility 
-     * (Also useful in Python 2.x)
-     */
-    Sequence* __getitem__(PySliceObject *slice) throw (std::out_of_range, std::invalid_argument) {
-      Py_ssize_t i, j, step;
-      if( !PySlice_Check(slice) ) {
-        SWIG_Error(SWIG_TypeError, "Slice object expected.");
-        return NULL;
-      }
-      PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step);
-      Sequence::difference_type id = i;
-      Sequence::difference_type jd = j;
-      return swig::getslice(self, id, jd, step);
-    }
-
-    void __setitem__(PySliceObject *slice, const Sequence& v) throw (std::out_of_range, std::invalid_argument) {
-      Py_ssize_t i, j, step;
-      if( !PySlice_Check(slice) ) {
-        SWIG_Error(SWIG_TypeError, "Slice object expected.");
-        return;
-      }
-      PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step);
-      Sequence::difference_type id = i;
-      Sequence::difference_type jd = j;
-      swig::setslice(self, id, jd, step, v);
-    }
-
-    void __setitem__(PySliceObject *slice) throw (std::out_of_range, std::invalid_argument) {
-      Py_ssize_t i, j, step;
-      if( !PySlice_Check(slice) ) {
-        SWIG_Error(SWIG_TypeError, "Slice object expected.");
-        return;
-      }
-      PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step);
-      Sequence::difference_type id = i;
-      Sequence::difference_type jd = j;
-      swig::delslice(self, id, jd, step);
-    }
-
-    void __delitem__(PySliceObject *slice) throw (std::out_of_range, std::invalid_argument) {
-      Py_ssize_t i, j, step;
-      if( !PySlice_Check(slice) ) {
-        SWIG_Error(SWIG_TypeError, "Slice object expected.");
-        return;
-      }
-      PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step);
-      Sequence::difference_type id = i;
-      Sequence::difference_type jd = j;
-      swig::delslice(self, id, jd, step);
-    }
-
-  }
-%enddef
-
-%define %swig_sequence_methods_non_resizable(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-  %extend {
-    const value_type& __getitem__(difference_type i) const throw (std::out_of_range) {
-      return *(swig::cgetpos(self, i));
-    }
-
-    void __setitem__(difference_type i, const value_type& x) throw (std::out_of_range) {
-      *(swig::getpos(self,i)) = x;
-    }
-
-#if defined(SWIGPYTHON_BUILTIN)
-    // This will be called through the mp_ass_subscript slot to delete an entry.
-    void __setitem__(difference_type i) throw (std::out_of_range, std::invalid_argument) {
-      swig::erase(self, swig::getpos(self, i));
-    }
-#endif
-
-  }
-%enddef
-
-%define %swig_sequence_methods(Sequence...)
-  %swig_sequence_methods_non_resizable(%arg(Sequence))
-  %extend {
-    value_type pop() throw (std::out_of_range) {
-      if (self->size() == 0)
-	throw std::out_of_range("pop from empty container");
-      Sequence::value_type x = self->back();
-      self->pop_back();
-      return x;
-    }
-
-    void append(const value_type& x) {
-      self->push_back(x);
-    }
-  }
-%enddef
-
-%define %swig_sequence_methods_non_resizable_val(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-  %extend {
-    value_type __getitem__(difference_type i) throw (std::out_of_range) {
-      return *(swig::cgetpos(self, i));
-    }
-
-    void __setitem__(difference_type i, value_type x) throw (std::out_of_range) {
-      *(swig::getpos(self,i)) = x;
-    }
-
-#if defined(SWIGPYTHON_BUILTIN)
-    // This will be called through the mp_ass_subscript slot to delete an entry.
-    void __setitem__(difference_type i) throw (std::out_of_range, std::invalid_argument) {
-      swig::erase(self, swig::getpos(self, i));
-    }
-#endif
-  }
-%enddef
-
-%define %swig_sequence_methods_val(Sequence...)
-  %swig_sequence_methods_non_resizable_val(%arg(Sequence))
-  %extend {
-    value_type pop() throw (std::out_of_range) {
-      if (self->size() == 0)
-	throw std::out_of_range("pop from empty container");
-      Sequence::value_type x = self->back();
-      self->pop_back();
-      return x;
-    }
-
-    void append(value_type x) {
-      self->push_back(x);
-    }
-  }
-%enddef
-
-
-
-//
-// Common fragments
-//
-
-%fragment("StdSequenceTraits","header",
-	  fragment="StdTraits",
-	  fragment="SwigPySequence_Cont")
-{
-namespace swig {
-  template <class SwigPySeq, class Seq>
-  inline void
-  assign(const SwigPySeq& swigpyseq, Seq* seq) {
-    // seq->assign(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
-    typedef typename SwigPySeq::value_type value_type;
-    typename SwigPySeq::const_iterator it = swigpyseq.begin();
-    for (;it != swigpyseq.end(); ++it) {
-      seq->insert(seq->end(),(value_type)(*it));
-    }
-  }
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_asptr_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-
-    static int asptr(PyObject *obj, sequence **seq) {
-      if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
-	sequence *p;
-	swig_type_info *descriptor = swig::type_info<sequence>();
-	if (descriptor && SWIG_IsOK(::SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
-      } else if (PySequence_Check(obj)) {
-	try {
-	  SwigPySequence_Cont<value_type> swigpyseq(obj);
-	  if (seq) {
-	    sequence *pseq = new sequence();
-	    assign(swigpyseq, pseq);
-	    *seq = pseq;
-	    return SWIG_NEWOBJ;
-	  } else {
-	    return swigpyseq.check() ? SWIG_OK : SWIG_ERROR;
-	  }
-	} catch (std::exception& e) {
-	  if (seq) {
-	    if (!PyErr_Occurred()) {
-	      PyErr_SetString(PyExc_TypeError, e.what());
-	    }
-	  }
-	  return SWIG_ERROR;
-	}
-      }
-      return SWIG_ERROR;
-    }
-  };
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_from_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-    typedef typename Seq::size_type size_type;
-    typedef typename sequence::const_iterator const_iterator;
-
-    static PyObject *from(const sequence& seq) {
-%#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS
-      swig_type_info *desc = swig::type_info<sequence>();
-      if (desc && desc->clientdata) {
-	return SWIG_InternalNewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
-      }
-%#endif
-      size_type size = seq.size();
-      if (size <= (size_type)INT_MAX) {
-	PyObject *obj = PyTuple_New((Py_ssize_t)size);
-	Py_ssize_t i = 0;
-	for (const_iterator it = seq.begin(); it != seq.end(); ++it, ++i) {
-	  PyTuple_SetItem(obj,i,swig::from<value_type>(*it));
-	}
-	return obj;
-      } else {
-	PyErr_SetString(PyExc_OverflowError,"sequence size not valid in python");
-	return NULL;
-      }
-    }
-  };
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/python/pydocs.swg b/dependencies2013/win32/swig/Lib/python/pydocs.swg
deleted file mode 100644
index 969af92a..00000000
--- a/dependencies2013/win32/swig/Lib/python/pydocs.swg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// Documentation for use with the autodoc feature.
-
-#ifdef SWIG_DOC_DOXYGEN_STYLE
-%typemap(doc) SWIGTYPE "@param $1_name $1_type";
-%typemap(doc) SWIGTYPE * "@param $1_name $1_type";
-%typemap(doc) const SWIGTYPE & "@param $1_name $1_type";
-%typemap(doc) const SWIGTYPE && "@param $1_name $1_type";
-%typemap(doc) enum SWIGTYPE "@param $1_name enum $1_type";
-
-%typemap(doc) SWIGTYPE *INOUT, SWIGTYPE &INOUT "@param $1_name $1_type (input/output)";
-%typemap(doc) SWIGTYPE *INPUT, SWIGTYPE &INPUT "@param $1_name $1_type (input)";
-%typemap(doc) SWIGTYPE *OUTPUT, SWIGTYPE &OUTPUT "@param $1_name $1_type (output)";
-#else
-%typemap(doc) SWIGTYPE "$1_name: $1_type";
-%typemap(doc) SWIGTYPE * "$1_name: $1_type";
-%typemap(doc) const SWIGTYPE & "$1_name: $1_type";
-%typemap(doc) const SWIGTYPE && "$1_name: $1_type";
-%typemap(doc) enum SWIGTYPE "$1_name: enum $1_type";
-
-%typemap(doc) SWIGTYPE *INOUT, SWIGTYPE &INOUT "$1_name: $1_type (input/output)";
-%typemap(doc) SWIGTYPE *INPUT, SWIGTYPE &INPUT "$1_name: $1_type (input)";
-%typemap(doc) SWIGTYPE *OUTPUT, SWIGTYPE &OUTPUT "$1_name: $1_type (output)";
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/pyerrors.swg b/dependencies2013/win32/swig/Lib/python/pyerrors.swg
deleted file mode 100644
index fe731355..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyerrors.swg
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -----------------------------------------------------------------------------
- * error manipulation
- * ----------------------------------------------------------------------------- */
-
-SWIGRUNTIME PyObject*
-SWIG_Python_ErrorType(int code) {
-  PyObject* type = 0;
-  switch(code) {
-  case SWIG_MemoryError:
-    type = PyExc_MemoryError;
-    break;
-  case SWIG_IOError:
-    type = PyExc_IOError;
-    break;
-  case SWIG_RuntimeError:
-    type = PyExc_RuntimeError;
-    break;
-  case SWIG_IndexError:
-    type = PyExc_IndexError;
-    break;
-  case SWIG_TypeError:
-    type = PyExc_TypeError;
-    break;
-  case SWIG_DivisionByZero:
-    type = PyExc_ZeroDivisionError;
-    break;
-  case SWIG_OverflowError:
-    type = PyExc_OverflowError;
-    break;
-  case SWIG_SyntaxError:
-    type = PyExc_SyntaxError;
-    break;
-  case SWIG_ValueError:
-    type = PyExc_ValueError;
-    break;
-  case SWIG_SystemError:
-    type = PyExc_SystemError;
-    break;
-  case SWIG_AttributeError:
-    type = PyExc_AttributeError;
-    break;
-  default:
-    type = PyExc_RuntimeError;
-  }
-  return type;
-}
-
-
-SWIGRUNTIME void
-SWIG_Python_AddErrorMsg(const char* mesg)
-{
-  PyObject *type = 0;
-  PyObject *value = 0;
-  PyObject *traceback = 0;
-
-  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
-  if (value) {
-    char *tmp;
-    PyObject *old_str = PyObject_Str(value);
-    PyErr_Clear();
-    Py_XINCREF(type);
-
-    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
-    SWIG_Python_str_DelForPy3(tmp);
-    Py_DECREF(old_str);
-    Py_DECREF(value);
-  } else {
-    PyErr_SetString(PyExc_RuntimeError, mesg);
-  }
-}
diff --git a/dependencies2013/win32/swig/Lib/python/pyfragments.swg b/dependencies2013/win32/swig/Lib/python/pyfragments.swg
deleted file mode 100644
index 535a45bd..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyfragments.swg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-  Create a file with this name, 'pyfragments.swg', in your working
-  directory and add all the %fragments you want to take precedence
-  over the default ones defined by swig.
-
-  For example, if you add:
-  
-  %fragment(SWIG_AsVal_frag(int),"header") {
-   SWIGINTERNINLINE int
-   SWIG_AsVal(int)(PyObject *obj, int *val)
-   { 
-     <your code here>;
-   }
-  }
-  
-  this will replace the code used to retrieve an integer value for all
-  the typemaps that need it, including:
-  
-    int, std::vector<int>, std::list<std::pair<int,int> >, etc.
-
-    
-*/
diff --git a/dependencies2013/win32/swig/Lib/python/pyhead.swg b/dependencies2013/win32/swig/Lib/python/pyhead.swg
deleted file mode 100644
index 55eb95a6..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyhead.swg
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Compatibility macros for Python 3 */
-#if PY_VERSION_HEX >= 0x03000000
-
-#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type)
-#define PyInt_Check(x) PyLong_Check(x)
-#define PyInt_AsLong(x) PyLong_AsLong(x)
-#define PyInt_FromLong(x) PyLong_FromLong(x)
-#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
-#define PyString_Check(name) PyBytes_Check(name)
-#define PyString_FromString(x) PyUnicode_FromString(x)
-#define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
-#define PyString_AsString(str) PyBytes_AsString(str)
-#define PyString_Size(str) PyBytes_Size(str)	
-#define PyString_InternFromString(key) PyUnicode_InternFromString(key)
-#define Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_BASETYPE
-#define PyString_AS_STRING(x) PyUnicode_AS_STRING(x)
-#define _PyLong_FromSsize_t(x) PyLong_FromSsize_t(x)
-
-#endif
-
-#ifndef Py_TYPE
-#  define Py_TYPE(op) ((op)->ob_type)
-#endif
-
-/* SWIG APIs for compatibility of both Python 2 & 3 */
-
-#if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_Python_str_FromFormat PyUnicode_FromFormat
-#else
-#  define SWIG_Python_str_FromFormat PyString_FromFormat
-#endif
-
-
-/* Warning: This function will allocate a new string in Python 3,
- * so please call SWIG_Python_str_DelForPy3(x) to free the space.
- */
-SWIGINTERN char*
-SWIG_Python_str_AsChar(PyObject *str)
-{
-#if PY_VERSION_HEX >= 0x03000000
-  char *cstr;
-  char *newstr;
-  Py_ssize_t len;
-  str = PyUnicode_AsUTF8String(str);
-  PyBytes_AsStringAndSize(str, &cstr, &len);
-  newstr = (char *) malloc(len+1);
-  memcpy(newstr, cstr, len+1);
-  Py_XDECREF(str);
-  return newstr;
-#else
-  return PyString_AsString(str);
-#endif
-}
-
-#if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
-#else
-#  define SWIG_Python_str_DelForPy3(x) 
-#endif
-
-
-SWIGINTERN PyObject*
-SWIG_Python_str_FromChar(const char *c)
-{
-#if PY_VERSION_HEX >= 0x03000000
-  return PyUnicode_FromString(c); 
-#else
-  return PyString_FromString(c);
-#endif
-}
-
-/* Add PyOS_snprintf for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-#  define PyOS_snprintf _snprintf
-# else
-#  define PyOS_snprintf snprintf
-# endif
-#endif
-
-/* A crude PyString_FromFormat implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-
-#ifndef SWIG_PYBUFFER_SIZE
-# define SWIG_PYBUFFER_SIZE 1024
-#endif
-
-static PyObject *
-PyString_FromFormat(const char *fmt, ...) {
-  va_list ap;
-  char buf[SWIG_PYBUFFER_SIZE * 2];
-  int res;
-  va_start(ap, fmt);
-  res = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
-}
-#endif
-
-#ifndef PyObject_DEL
-# define PyObject_DEL PyObject_Del
-#endif
-
-/* A crude PyExc_StopIteration exception for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# ifndef PyExc_StopIteration
-#  define PyExc_StopIteration PyExc_RuntimeError
-# endif
-# ifndef PyObject_GenericGetAttr
-#  define PyObject_GenericGetAttr 0
-# endif
-#endif
-
-/* Py_NotImplemented is defined in 2.1 and up. */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef Py_NotImplemented
-#  define Py_NotImplemented PyExc_RuntimeError
-# endif
-#endif
-
-/* A crude PyString_AsStringAndSize implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef PyString_AsStringAndSize
-#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
-# endif
-#endif
-
-/* PySequence_Size for old Pythons */
-#if PY_VERSION_HEX < 0x02000000
-# ifndef PySequence_Size
-#  define PySequence_Size PySequence_Length
-# endif
-#endif
-
-/* PyBool_FromLong for old Pythons */
-#if PY_VERSION_HEX < 0x02030000
-static
-PyObject *PyBool_FromLong(long ok)
-{
-  PyObject *result = ok ? Py_True : Py_False;
-  Py_INCREF(result);
-  return result;
-}
-#endif
-
-/* Py_ssize_t for old Pythons */
-/* This code is as recommended by: */
-/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-# define PY_SSIZE_T_MAX INT_MAX
-# define PY_SSIZE_T_MIN INT_MIN
-typedef inquiry lenfunc;
-typedef intargfunc ssizeargfunc;
-typedef intintargfunc ssizessizeargfunc;
-typedef intobjargproc ssizeobjargproc;
-typedef intintobjargproc ssizessizeobjargproc;
-typedef getreadbufferproc readbufferproc;
-typedef getwritebufferproc writebufferproc;
-typedef getsegcountproc segcountproc;
-typedef getcharbufferproc charbufferproc;
-static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
-{
-  long result = 0;
-  PyObject *i = PyNumber_Int(x);
-  if (i) {
-    result = PyInt_AsLong(i);
-    Py_DECREF(i);
-  }
-  return result;
-}
-#endif
-
-#if PY_VERSION_HEX < 0x02050000
-#define PyInt_FromSize_t(x) PyInt_FromLong((long)x)
-#endif
-
-#if PY_VERSION_HEX < 0x02040000
-#define Py_VISIT(op)				\
-  do { 						\
-    if (op) {					\
-      int vret = visit((op), arg);		\
-      if (vret)					\
-        return vret;				\
-    }						\
-  } while (0)
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef struct {
-  PyTypeObject type;
-  PyNumberMethods as_number;
-  PyMappingMethods as_mapping;
-  PySequenceMethods as_sequence;
-  PyBufferProcs as_buffer;
-  PyObject *name, *slots;
-} PyHeapTypeObject;
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef destructor freefunc;
-#endif
-
-#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
-     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
-     (PY_MAJOR_VERSION > 3))
-# define SWIGPY_USE_CAPSULE
-# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
-#endif
-
-#if PY_VERSION_HEX < 0x03020000
-#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
-#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
-#define Py_hash_t long
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/pyinit.swg b/dependencies2013/win32/swig/Lib/python/pyinit.swg
deleted file mode 100644
index 2cc58284..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyinit.swg
+++ /dev/null
@@ -1,457 +0,0 @@
-/* ------------------------------------------------------------
- * The start of the Python initialization function 
- * ------------------------------------------------------------ */
-
-%insert(init) "swiginit.swg"
-
-#if defined(SWIGPYTHON_BUILTIN)
-%fragment("<stddef.h>"); // For offsetof
-#endif
-
-%init %{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Python-specific SWIG API */
-#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
-#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
-#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
- 
-/* -----------------------------------------------------------------------------
- * global variable support code.
- * ----------------------------------------------------------------------------- */
- 
-typedef struct swig_globalvar {   
-  char       *name;                  /* Name of global variable */
-  PyObject *(*get_attr)(void);       /* Return the current value */
-  int       (*set_attr)(PyObject *); /* Set the value */
-  struct swig_globalvar *next;
-} swig_globalvar;
-
-typedef struct swig_varlinkobject {
-  PyObject_HEAD
-  swig_globalvar *vars;
-} swig_varlinkobject;
-
-SWIGINTERN PyObject *
-swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
-#if PY_VERSION_HEX >= 0x03000000
-  return PyUnicode_InternFromString("<Swig global variables>");
-#else
-  return PyString_FromString("<Swig global variables>");
-#endif
-}
-
-SWIGINTERN PyObject *
-swig_varlink_str(swig_varlinkobject *v) {
-#if PY_VERSION_HEX >= 0x03000000
-  PyObject *str = PyUnicode_InternFromString("(");
-  PyObject *tail;
-  PyObject *joined;
-  swig_globalvar *var;
-  for (var = v->vars; var; var=var->next) {
-    tail = PyUnicode_FromString(var->name);
-    joined = PyUnicode_Concat(str, tail);
-    Py_DecRef(str);
-    Py_DecRef(tail);
-    str = joined;
-    if (var->next) {
-        tail = PyUnicode_InternFromString(", ");
-        joined = PyUnicode_Concat(str, tail);
-        Py_DecRef(str);
-        Py_DecRef(tail);
-        str = joined;
-    }
-  }
-  tail = PyUnicode_InternFromString(")");
-  joined = PyUnicode_Concat(str, tail);
-  Py_DecRef(str);
-  Py_DecRef(tail);
-  str = joined;
-#else
-  PyObject *str = PyString_FromString("(");
-  swig_globalvar *var;
-  for (var = v->vars; var; var=var->next) {
-    PyString_ConcatAndDel(&str,PyString_FromString(var->name));
-    if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
-  }
-  PyString_ConcatAndDel(&str,PyString_FromString(")"));
-#endif
-  return str;
-}
-
-SWIGINTERN int
-swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
-  char *tmp;
-  PyObject *str = swig_varlink_str(v);
-  fprintf(fp,"Swig global variables ");
-  fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
-  SWIG_Python_str_DelForPy3(tmp);
-  Py_DECREF(str);
-  return 0;
-}
-
-SWIGINTERN void
-swig_varlink_dealloc(swig_varlinkobject *v) {
-  swig_globalvar *var = v->vars;
-  while (var) {
-    swig_globalvar *n = var->next;
-    free(var->name);
-    free(var);
-    var = n;
-  }
-}
-
-SWIGINTERN PyObject *
-swig_varlink_getattr(swig_varlinkobject *v, char *n) {
-  PyObject *res = NULL;
-  swig_globalvar *var = v->vars;
-  while (var) {
-    if (strcmp(var->name,n) == 0) {
-      res = (*var->get_attr)();
-      break;
-    }
-    var = var->next;
-  }
-  if (res == NULL && !PyErr_Occurred()) {
-    PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
-  }
-  return res;
-}
-
-SWIGINTERN int
-swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
-  int res = 1;
-  swig_globalvar *var = v->vars;
-  while (var) {
-    if (strcmp(var->name,n) == 0) {
-      res = (*var->set_attr)(p);
-      break;
-    }
-    var = var->next;
-  }
-  if (res == 1 && !PyErr_Occurred()) {
-    PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
-  }
-  return res;
-}
-
-SWIGINTERN PyTypeObject*
-swig_varlink_type(void) {
-  static char varlink__doc__[] = "Swig var link object";
-  static PyTypeObject varlink_type;
-  static int type_init = 0;
-  if (!type_init) {
-    const PyTypeObject tmp = {
-#if PY_VERSION_HEX >= 0x03000000
-      PyVarObject_HEAD_INIT(NULL, 0)
-#else
-      PyObject_HEAD_INIT(NULL)
-      0,                                  /* ob_size */
-#endif
-      (char *)"swigvarlink",              /* tp_name */
-      sizeof(swig_varlinkobject),         /* tp_basicsize */
-      0,                                  /* tp_itemsize */
-      (destructor) swig_varlink_dealloc,  /* tp_dealloc */
-      (printfunc) swig_varlink_print,     /* tp_print */
-      (getattrfunc) swig_varlink_getattr, /* tp_getattr */
-      (setattrfunc) swig_varlink_setattr, /* tp_setattr */
-      0,                                  /* tp_compare */
-      (reprfunc) swig_varlink_repr,       /* tp_repr */
-      0,                                  /* tp_as_number */
-      0,                                  /* tp_as_sequence */
-      0,                                  /* tp_as_mapping */
-      0,                                  /* tp_hash */
-      0,                                  /* tp_call */
-      (reprfunc) swig_varlink_str,        /* tp_str */
-      0,                                  /* tp_getattro */
-      0,                                  /* tp_setattro */
-      0,                                  /* tp_as_buffer */
-      0,                                  /* tp_flags */
-      varlink__doc__,                     /* tp_doc */
-      0,                                  /* tp_traverse */
-      0,                                  /* tp_clear */
-      0,                                  /* tp_richcompare */
-      0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
-      0,                                  /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                  /* tp_version_tag */
-#endif
-#if PY_VERSION_HEX >= 0x03040000
-      0,                                  /* tp_finalize */
-#endif
-#ifdef COUNT_ALLOCS
-      0,                                  /* tp_allocs */
-      0,                                  /* tp_frees */
-      0,                                  /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
-      0,                                  /* tp_prev */
-#endif
-      0                                   /* tp_next */
-#endif
-    };
-    varlink_type = tmp;
-    type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    varlink_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&varlink_type) < 0)
-      return NULL;
-#endif
-  }
-  return &varlink_type;
-}
-
-/* Create a variable linking object for use later */
-SWIGINTERN PyObject *
-SWIG_Python_newvarlink(void) {
-  swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
-  if (result) {
-    result->vars = 0;
-  }
-  return ((PyObject*) result);
-}
-
-SWIGINTERN void 
-SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
-  swig_varlinkobject *v = (swig_varlinkobject *) p;
-  swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
-  if (gv) {
-    size_t size = strlen(name)+1;
-    gv->name = (char *)malloc(size);
-    if (gv->name) {
-      strncpy(gv->name,name,size);
-      gv->get_attr = get_attr;
-      gv->set_attr = set_attr;
-      gv->next = v->vars;
-    }
-  }
-  v->vars = gv;
-}
-
-SWIGINTERN PyObject *
-SWIG_globals(void) {
-  static PyObject *_SWIG_globals = 0; 
-  if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
-  return _SWIG_globals;
-}
-
-/* -----------------------------------------------------------------------------
- * constants/methods manipulation
- * ----------------------------------------------------------------------------- */
-
-/* Install Constants */
-SWIGINTERN void
-SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
-  PyObject *obj = 0;
-  size_t i;
-  for (i = 0; constants[i].type; ++i) {
-    switch(constants[i].type) {
-    case SWIG_PY_POINTER:
-      obj = SWIG_InternalNewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
-      break;
-    case SWIG_PY_BINARY:
-      obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
-      break;
-    default:
-      obj = 0;
-      break;
-    }
-    if (obj) {
-      PyDict_SetItemString(d, constants[i].name, obj);
-      Py_DECREF(obj);
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------*/
-/* Fix SwigMethods to carry the callback ptrs when needed */
-/* -----------------------------------------------------------------------------*/
-
-SWIGINTERN void
-SWIG_Python_FixMethods(PyMethodDef *methods,
-		       swig_const_info *const_table,
-		       swig_type_info **types,
-		       swig_type_info **types_initial) {
-  size_t i;
-  for (i = 0; methods[i].ml_name; ++i) {
-    const char *c = methods[i].ml_doc;
-    if (!c) continue;
-    c = strstr(c, "swig_ptr: ");
-    if (c) {
-      int j;
-      swig_const_info *ci = 0;
-      const char *name = c + 10;
-      for (j = 0; const_table[j].type; ++j) {
-	if (strncmp(const_table[j].name, name, 
-		    strlen(const_table[j].name)) == 0) {
-	  ci = &(const_table[j]);
-	  break;
-	}
-      }
-      if (ci) {
-	void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
-	if (ptr) {
-	  size_t shift = (ci->ptype) - types;
-	  swig_type_info *ty = types_initial[shift];
-	  size_t ldoc = (c - methods[i].ml_doc);
-	  size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
-	  char *ndoc = (char*)malloc(ldoc + lptr + 10);
-	  if (ndoc) {
-	    char *buff = ndoc;
-	    strncpy(buff, methods[i].ml_doc, ldoc);
-	    buff += ldoc;
-	    strncpy(buff, "swig_ptr: ", 10);
-	    buff += 10;
-	    SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
-	    methods[i].ml_doc = ndoc;
-	  }
-	}
-      }
-    }
-  }
-} 
-
-#ifdef __cplusplus
-}
-#endif
-
-/* -----------------------------------------------------------------------------*
- *  Partial Init method
- * -----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-SWIGEXPORT 
-#if PY_VERSION_HEX >= 0x03000000
-  PyObject*
-#else
-  void
-#endif
-SWIG_init(void) {
-  PyObject *m, *d, *md;
-#if PY_VERSION_HEX >= 0x03000000
-  static struct PyModuleDef SWIG_module = {
-# if PY_VERSION_HEX >= 0x03020000
-    PyModuleDef_HEAD_INIT,
-# else
-    {
-      PyObject_HEAD_INIT(NULL)
-      NULL, /* m_init */
-      0,    /* m_index */
-      NULL, /* m_copy */
-    },
-# endif
-    (char *) SWIG_name,
-    NULL,
-    -1,
-    SwigMethods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-  };
-#endif
-
-#if defined(SWIGPYTHON_BUILTIN)
-  static SwigPyClientData SwigPyObject_clientdata = {0, 0, 0, 0, 0, 0, 0};
-  static PyGetSetDef this_getset_def = {
-    (char *)"this", &SwigPyBuiltin_ThisClosure, NULL, NULL, NULL
-  };
-  static SwigPyGetSet thisown_getset_closure = {
-    (PyCFunction) SwigPyObject_own,
-    (PyCFunction) SwigPyObject_own
-  };
-  static PyGetSetDef thisown_getset_def = {
-    (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
-  };
-  PyTypeObject *builtin_pytype;
-  int builtin_base_count;
-  swig_type_info *builtin_basetype;
-  PyObject *tuple;
-  PyGetSetDescrObject *static_getset;
-  PyTypeObject *metatype;
-  PyTypeObject *swigpyobject;
-  SwigPyClientData *cd;
-  PyObject *public_interface, *public_symbol;
-  PyObject *this_descr;
-  PyObject *thisown_descr;
-  PyObject *self = 0;
-  int i;
-
-  (void)builtin_pytype;
-  (void)builtin_base_count;
-  (void)builtin_basetype;
-  (void)tuple;
-  (void)static_getset;
-  (void)self;
-
-  /* Metaclass is used to implement static member variables */
-  metatype = SwigPyObjectType();
-  assert(metatype);
-#endif
-
-  /* Fix SwigMethods to carry the callback ptrs when needed */
-  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
-
-#if PY_VERSION_HEX >= 0x03000000
-  m = PyModule_Create(&SWIG_module);
-#else
-  m = Py_InitModule((char *) SWIG_name, SwigMethods);
-#endif
-
-  md = d = PyModule_GetDict(m);
-  (void)md;
-
-  SWIG_InitializeModule(0);
-
-#ifdef SWIGPYTHON_BUILTIN
-  swigpyobject = SwigPyObject_TypeOnce();
-
-  SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject");
-  assert(SwigPyObject_stype);
-  cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
-  if (!cd) {
-    SwigPyObject_stype->clientdata = &SwigPyObject_clientdata;
-    SwigPyObject_clientdata.pytype = swigpyobject;
-  } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) {
-    PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules.");
-# if PY_VERSION_HEX >= 0x03000000
-    return NULL;
-# else
-    return;
-# endif
-  }
-
-  /* All objects have a 'this' attribute */
-  this_descr = PyDescr_NewGetSet(SwigPyObject_type(), &this_getset_def);
-  (void)this_descr;
-
-  /* All objects have a 'thisown' attribute */
-  thisown_descr = PyDescr_NewGetSet(SwigPyObject_type(), &thisown_getset_def);
-  (void)thisown_descr;
-
-  public_interface = PyList_New(0);
-  public_symbol = 0;
-  (void)public_symbol;
-
-  PyDict_SetItemString(md, "__all__", public_interface);
-  Py_DECREF(public_interface);
-  for (i = 0; SwigMethods[i].ml_name != NULL; ++i)
-    SwigPyBuiltin_AddPublicSymbol(public_interface, SwigMethods[i].ml_name);
-  for (i = 0; swig_const_table[i].name != 0; ++i)
-    SwigPyBuiltin_AddPublicSymbol(public_interface, swig_const_table[i].name);
-#endif
-
-  SWIG_InstallConstants(d,swig_const_table);
-%}
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyiterators.swg b/dependencies2013/win32/swig/Lib/python/pyiterators.swg
deleted file mode 100644
index 8fbb3122..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyiterators.swg
+++ /dev/null
@@ -1,405 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pyiterators.swg
- *
- * Implement a python 'output' iterator for Python 2.2 or higher.
- *
- * Users can derive form the SwigPyIterator to implement their
- * own iterators. As an example (real one since we use it for STL/STD
- * containers), the template SwigPyIterator_T does the
- * implementation for generic C++ iterators.
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%fragment("SwigPyIterator","header",fragment="<stddef.h>") {
-namespace swig {
-  struct stop_iteration {
-  };
-
-  struct SwigPyIterator {
-  private:
-    SwigPtr_PyObject _seq;
-
-  protected:
-    SwigPyIterator(PyObject *seq) : _seq(seq)
-    {
-    }
-      
-  public:
-    virtual ~SwigPyIterator() {}
-
-    // Access iterator method, required by Python
-    virtual PyObject *value() const = 0;
-
-    // Forward iterator method, required by Python
-    virtual SwigPyIterator *incr(size_t n = 1) = 0;
-    
-    // Backward iterator method, very common in C++, but not required in Python
-    virtual SwigPyIterator *decr(size_t /*n*/ = 1)
-    {
-      throw stop_iteration();
-    }
-
-    // Random access iterator methods, but not required in Python
-    virtual ptrdiff_t distance(const SwigPyIterator &/*x*/) const
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-
-    virtual bool equal (const SwigPyIterator &/*x*/) const
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-    
-    // C++ common/needed methods
-    virtual SwigPyIterator *copy() const = 0;
-
-    PyObject *next()     
-    {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
-      PyObject *obj = value();
-      incr();       
-      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
-      return obj;     
-    }
-
-    /* Make an alias for Python 3.x */
-    PyObject *__next__()
-    {
-      return next();
-    }
-
-    PyObject *previous()
-    {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
-      decr();
-      PyObject *obj = value();
-      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads       
-      return obj;
-    }
-
-    SwigPyIterator *advance(ptrdiff_t n)
-    {
-      return  (n > 0) ?  incr(n) : decr(-n);
-    }
-      
-    bool operator == (const SwigPyIterator& x)  const
-    {
-      return equal(x);
-    }
-      
-    bool operator != (const SwigPyIterator& x) const
-    {
-      return ! operator==(x);
-    }
-      
-    SwigPyIterator& operator += (ptrdiff_t n)
-    {
-      return *advance(n);
-    }
-
-    SwigPyIterator& operator -= (ptrdiff_t n)
-    {
-      return *advance(-n);
-    }
-      
-    SwigPyIterator* operator + (ptrdiff_t n) const
-    {
-      return copy()->advance(n);
-    }
-
-    SwigPyIterator* operator - (ptrdiff_t n) const
-    {
-      return copy()->advance(-n);
-    }
-      
-    ptrdiff_t operator - (const SwigPyIterator& x) const
-    {
-      return x.distance(*this);
-    }
-      
-    static swig_type_info* descriptor() {
-      static int init = 0;
-      static swig_type_info* desc = 0;
-      if (!init) {
-	desc = SWIG_TypeQuery("swig::SwigPyIterator *");
-	init = 1;
-      }	
-      return desc;
-    }    
-  };
-
-%#if defined(SWIGPYTHON_BUILTIN)
-  inline PyObject* make_output_iterator_builtin (PyObject *pyself)
-  {
-    Py_INCREF(pyself);
-    return pyself;
-  }
-%#endif
-}
-}
-
-%fragment("SwigPyIterator_T","header",fragment="<stddef.h>",fragment="SwigPyIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
-namespace swig {
-  template<typename OutIterator>
-  class SwigPyIterator_T :  public SwigPyIterator
-  {
-  public:
-    typedef OutIterator out_iterator;
-    typedef typename std::iterator_traits<out_iterator>::value_type value_type;    
-    typedef SwigPyIterator_T<out_iterator> self_type;
-
-    SwigPyIterator_T(out_iterator curr, PyObject *seq)
-      : SwigPyIterator(seq), current(curr)
-    {
-    }
-
-    const out_iterator& get_current() const
-    {
-      return current;
-    }
-
-    
-    bool equal (const SwigPyIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return (current == iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-    
-    ptrdiff_t distance(const SwigPyIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return std::distance(current, iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }    
-    
-  protected:
-    out_iterator current;
-  };
-  
-  template <class ValueType>
-  struct from_oper 
-  {
-    typedef const ValueType& argument_type;
-    typedef PyObject *result_type;
-    result_type operator()(argument_type v) const
-    {
-      return swig::from(v);
-    }
-  };
-
-  template<typename OutIterator, 
-	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class SwigPyIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutIterator out_iterator;
-    typedef ValueType value_type;
-    typedef SwigPyIterator_T<out_iterator>  base;
-    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
-    
-    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
-      : SwigPyIterator_T<OutIterator>(curr, seq)
-    {
-    }
-    
-    PyObject *value() const {
-      return from(static_cast<const value_type&>(*(base::current)));
-    }
-    
-    SwigPyIterator *copy() const
-    {
-      return new self_type(*this);
-    }
-
-    SwigPyIterator *incr(size_t n = 1)
-    {
-      while (n--) {
-	++base::current;
-      }
-      return this;
-    }
-
-    SwigPyIterator *decr(size_t n = 1)
-    {
-      while (n--) {
-	--base::current;
-      }
-      return this;
-    }
-  };
-
-  template<typename OutIterator, 
-	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class SwigPyIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutIterator out_iterator;
-    typedef ValueType value_type;
-    typedef SwigPyIterator_T<out_iterator>  base;    
-    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
-    
-    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
-      : SwigPyIterator_T<OutIterator>(curr, seq), begin(first), end(last)
-    {
-    }
-    
-    PyObject *value() const {
-      if (base::current == end) {
-	throw stop_iteration();
-      } else {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-    }
-    
-    SwigPyIterator *copy() const
-    {
-      return new self_type(*this);
-    }
-
-    SwigPyIterator *incr(size_t n = 1)
-    {
-      while (n--) {
-	if (base::current == end) {
-	  throw stop_iteration();
-	} else {
-	  ++base::current;
-	}
-      }
-      return this;
-    }
-
-    SwigPyIterator *decr(size_t n = 1)
-    {
-      while (n--) {
-	if (base::current == begin) {
-	  throw stop_iteration();
-	} else {
-	  --base::current;
-	}
-      }
-      return this;
-    }
-
-  private:
-    out_iterator begin;
-    out_iterator end;
-  };
-
-  template<typename OutIter>
-  inline SwigPyIterator*
-  make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
-  {
-    return new SwigPyIteratorClosed_T<OutIter>(current, begin, end, seq);
-  }
-
-  template<typename OutIter>
-  inline SwigPyIterator*
-  make_output_iterator(const OutIter& current, PyObject *seq = 0)
-  {
-    return new SwigPyIteratorOpen_T<OutIter>(current, seq);
-  }
-
-}
-}
-
-
-%fragment("SwigPyIterator");
-namespace swig 
-{
-  /*
-    Throw a StopIteration exception
-  */
-  %ignore stop_iteration;
-  struct stop_iteration {};
-  
-  %typemap(throws) stop_iteration {
-    (void)$1;
-    SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
-    SWIG_fail;
-  }
-
-  /* 
-     Mark methods that return new objects
-  */
-  %newobject SwigPyIterator::copy;
-  %newobject SwigPyIterator::operator + (ptrdiff_t n) const;
-  %newobject SwigPyIterator::operator - (ptrdiff_t n) const;
-
-  %nodirector SwigPyIterator;
-
-#if defined(SWIGPYTHON_BUILTIN)
-  %feature("python:tp_iter") SwigPyIterator "&swig::make_output_iterator_builtin";
-  %feature("python:slot", "tp_iternext", functype="iternextfunc") SwigPyIterator::__next__;
-#else
-  %extend SwigPyIterator {
-  %pythoncode %{def __iter__(self):
-    return self%}
-  }
-#endif
-
-  %catches(swig::stop_iteration) SwigPyIterator::value() const;
-  %catches(swig::stop_iteration) SwigPyIterator::incr(size_t n = 1);
-  %catches(swig::stop_iteration) SwigPyIterator::decr(size_t n = 1);
-  %catches(std::invalid_argument) SwigPyIterator::distance(const SwigPyIterator &x) const;
-  %catches(std::invalid_argument) SwigPyIterator::equal (const SwigPyIterator &x) const;
-  %catches(swig::stop_iteration) SwigPyIterator::__next__();
-  %catches(swig::stop_iteration) SwigPyIterator::next();
-  %catches(swig::stop_iteration) SwigPyIterator::previous();
-  %catches(swig::stop_iteration) SwigPyIterator::advance(ptrdiff_t n);
-  %catches(swig::stop_iteration) SwigPyIterator::operator += (ptrdiff_t n);
-  %catches(swig::stop_iteration) SwigPyIterator::operator -= (ptrdiff_t n);
-  %catches(swig::stop_iteration) SwigPyIterator::operator + (ptrdiff_t n) const;
-  %catches(swig::stop_iteration) SwigPyIterator::operator - (ptrdiff_t n) const;
-
-  struct SwigPyIterator
-  {
-  protected:
-    SwigPyIterator(PyObject *seq);
-
-  public:
-    virtual ~SwigPyIterator();
-
-    // Access iterator method, required by Python
-    virtual PyObject *value() const = 0;
-
-    // Forward iterator method, required by Python
-    virtual SwigPyIterator *incr(size_t n = 1) = 0;
-    
-    // Backward iterator method, very common in C++, but not required in Python
-    virtual SwigPyIterator *decr(size_t n = 1);
-
-    // Random access iterator methods, but not required in Python
-    virtual ptrdiff_t distance(const SwigPyIterator &x) const;
-
-    virtual bool equal (const SwigPyIterator &x) const;
-    
-    // C++ common/needed methods
-    virtual SwigPyIterator *copy() const = 0;
-
-    PyObject *next();
-    PyObject *__next__();
-    PyObject *previous();
-    SwigPyIterator *advance(ptrdiff_t n);
-
-    bool operator == (const SwigPyIterator& x)  const;
-    bool operator != (const SwigPyIterator& x) const;
-    SwigPyIterator& operator += (ptrdiff_t n);
-    SwigPyIterator& operator -= (ptrdiff_t n);
-    SwigPyIterator* operator + (ptrdiff_t n) const;
-    SwigPyIterator* operator - (ptrdiff_t n) const;
-    ptrdiff_t operator - (const SwigPyIterator& x) const;
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/python/pymacros.swg b/dependencies2013/win32/swig/Lib/python/pymacros.swg
deleted file mode 100644
index ab7bace5..00000000
--- a/dependencies2013/win32/swig/Lib/python/pymacros.swg
+++ /dev/null
@@ -1,4 +0,0 @@
-%include <typemaps/swigmacros.swg>
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyname_compat.i b/dependencies2013/win32/swig/Lib/python/pyname_compat.i
deleted file mode 100644
index 96af343c..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyname_compat.i
+++ /dev/null
@@ -1,86 +0,0 @@
-/* 
-* From SWIG 1.3.37 we deprecated all SWIG symbols that start with Py,
-* since they are inappropriate and discouraged in Python documentation
-* (from http://www.python.org/doc/2.5.2/api/includes.html):
-*
-* "All user visible names defined by Python.h (except those defined by the included
-* standard headers) have one of the prefixes "Py" or "_Py". Names beginning with
-* "_Py" are for internal use by the Python implementation and should not be used
-* by extension writers. Structure member names do not have a reserved prefix.
-*
-* Important: user code should never define names that begin with "Py" or "_Py".
-* This confuses the reader, and jeopardizes the portability of the user code to
-* future Python versions, which may define additional names beginning with one
-* of these prefixes."
-*
-* This file defined macros to provide backward compatibility for these deprecated
-* symbols. In the case you have these symbols in your interface file, you can simply
-* include this file at beginning of it.
-*
-* However, this file may be removed in future release of SWIG, so using this file to
-* keep these inappropriate names in your SWIG interface file is also not recommended.
-* Instead, we provide a simple tool for converting your interface files to
-* the new naming convention. You can get the tool from the SWIG distribution:
-* Tools/pyname_patch.py
-*/
-
-%fragment("PySequence_Base", "header", fragment="SwigPySequence_Base") {}
-%fragment("PySequence_Cont", "header", fragment="SwigPySequence_Cont") {}
-%fragment("PySwigIterator_T", "header", fragment="SwigPyIterator_T") {}
-%fragment("PyPairBoolOutputIterator", "header", fragment="SwigPyPairBoolOutputIterator") {}
-%fragment("PySwigIterator", "header", fragment="SwigPyIterator") {}
-%fragment("PySwigIterator_T", "header", fragment="SwigPyIterator_T") {}
-
-%inline %{
-#define PyMapIterator_T SwigPyMapIterator_T
-#define PyMapKeyIterator_T SwigPyMapKeyIterator_T
-#define PyMapValueIterator_T SwigPyMapValueITerator_T
-#define PyObject_ptr SwigPtr_PyObject
-#define PyObject_var SwigVar_PyObject
-#define PyOper SwigPyOper
-#define PySeq SwigPySeq
-#define PySequence_ArrowProxy SwigPySequence_ArrowProxy
-#define PySequence_Cont SwigPySequence_Cont
-#define PySequence_InputIterator SwigPySequence_InputIterator
-#define PySequence_Ref SwigPySequence_Ref
-#define PySwigClientData SwigPyClientData
-#define PySwigClientData_Del SwigPyClientData_Del
-#define PySwigClientData_New SwigPyClientData_New
-#define PySwigIterator SwigPyIterator
-#define PySwigIteratorClosed_T SwigPyIteratorClosed_T
-#define PySwigIteratorOpen_T SwigPyIteratorOpen_T
-#define PySwigIterator_T SwigPyIterator_T
-#define PySwigObject SwigPyObject
-#define PySwigObject_Check SwigPyObject_Check
-#define PySwigObject_GetDesc SwigPyObject_GetDesc
-#define PySwigObject_New SwigPyObject_New
-#define PySwigObject_acquire SwigPyObject_acquire
-#define PySwigObject_append SwigPyObject_append
-#define PySwigObject_as_number SwigPyObject_as_number
-#define PySwigObject_compare SwigPyObject_compare
-#define PySwigObject_dealloc SwigPyObject_dealloc
-#define PySwigObject_disown SwigPyObject_disown
-#define PySwigObject_format SwigPyObject_format
-#define PySwigObject_getattr SwigPyObject_getattr
-#define PySwigObject_hex SwigPyObject_hex
-#define PySwigObject_long SwigPyObject_long
-#define PySwigObject_next SwigPyObject_next
-#define PySwigObject_oct SwigPyObject_oct
-#define PySwigObject_own SwigPyObject_own
-#define PySwigObject_repr SwigPyObject_repr
-#define PySwigObject_richcompare SwigPyObject_richcompare
-#define PySwigObject_type SwigPyObject_type
-#define PySwigPacked SwigPyPacked
-#define PySwigPacked_Check SwigPyPacked_Check
-#define PySwigPacked_New SwigPyPacked_New
-#define PySwigPacked_UnpackData SwigPyPacked_UnpackData
-#define PySwigPacked_compare SwigPyPacked_compare
-#define PySwigPacked_dealloc SwigPyPacked_dealloc
-#define PySwigPacked_print SwigPyPacked_print
-#define PySwigPacked_repr SwigPyPacked_repr
-#define PySwigPacked_str SwigPyPacked_str
-#define PySwigPacked_type SwigPyPacked_type
-#define pyseq swigpyseq
-#define pyswigobject_type swigpyobject_type
-#define pyswigpacked_type swigpypacked_type
-%}
diff --git a/dependencies2013/win32/swig/Lib/python/pyopers.swg b/dependencies2013/win32/swig/Lib/python/pyopers.swg
deleted file mode 100644
index fd2fcc58..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyopers.swg
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ------------------------------------------------------------
- * Overloaded operator support
-
- The directives in this file apply whether or not you use the
- -builtin option to SWIG, but operator overloads are particularly
- attractive when using -builtin, because they are much faster
- than named methods.
-
- If you're using the -builtin option to SWIG, and you want to define
- python operator overloads beyond the defaults defined in this file,
- here's what you need to know:
-
- There are two ways to define a python slot function: dispatch to a
- statically defined function; or dispatch to a method defined on the
- operand.
-
- To dispatch to a statically defined function, use %feature("python:<slot>"),
- where <slot> is the name of a field in a PyTypeObject, PyNumberMethods,
- PyMappingMethods, PySequenceMethods, or PyBufferProcs.  For example:
-
-   %feature("python:tp_hash") MyClass "myHashFunc";
-
-   class MyClass {
-     public:
-       ...
-   };
-
-   %{
-     // Note: Py_hash_t was introduced in Python 3.2
-     static Py_hash_t myHashFunc(PyObject *pyobj) {
-       MyClass *cobj;
-       // Convert pyobj to cobj
-       return (cobj->field1 * (cobj->field2 << 7));
-     }
-   %}
-
- NOTE: It is the responsibility of the programmer (that's you) to ensure
- that a statically defined slot function has the correct signature.
-
- If, instead, you want to dispatch to an instance method, you can
- use %feature("python:slot").  For example:
-
-   %feature("python:slot", "tp_hash", functype="hashfunc") MyClass::myHashFunc;
-
-   class MyClass {
-     public:
-       Py_hash_t myHashFunc () const;
-       ...
-   };
-
- NOTE: Some python slots use a method signature which does not
- match the signature of SWIG-wrapped methods.  For those slots,
- SWIG will automatically generate a "closure" function to re-marshall
- the arguments before dispatching to the wrapped method.  Setting
- the "functype" attribute of the feature enables SWIG to generate
- a correct closure function.
-
- --------------------------------------------------------------
-
- The tp_richcompare slot is a special case: SWIG automatically generates
- a rich compare function for all wrapped types.  If a type defines C++
- operator overloads for comparison (operator==, operator<, etc.), they
- will be called from the generated rich compare function.  If you
- want to explicitly choose a method to handle a certain comparison
- operation, you may use a different feature, %feature("python:compare")
- like this:
-
-   %feature("python:compare", "Py_LT") MyClass::lessThan;
-
-   class MyClass {
-     public:
-       bool lessThan(const MyClass& other) const;
-       ...
-   };
-   
- ... where "Py_LT" is one of the rich comparison opcodes defined in the
- python header file object.h.
-
- If there's no method defined to handle a particular comparison operation,
- the default behavior is to compare pointer values of the wrapped
- C++ objects.
-
- --------------------------------------------------------------
-
-
- For more information about python slots, including their names and
- signatures, you may refer to the python documentation :
-
-   http://docs.python.org/c-api/typeobj.html
-
- * ------------------------------------------------------------ */
-
-
-#ifdef __cplusplus
-
-#if defined(SWIGPYTHON_BUILTIN)
-#define %pybinoperator(pyname,oper,functp,slt) %rename(pyname) oper; %pythonmaybecall oper; %feature("python:slot", #slt, functype=#functp) oper; %feature("python:slot", #slt, functype=#functp) pyname;
-#define %pycompare(pyname,oper,comptype) %rename(pyname) oper; %pythonmaybecall oper; %feature("python:compare", #comptype) oper; %feature("python:compare", #comptype) pyname;
-#else
-#define %pybinoperator(pyname,oper,functp,slt) %rename(pyname) oper; %pythonmaybecall oper
-#define %pycompare(pyname,oper,comptype) %pybinoperator(pyname,oper,,comptype)
-#endif
-
-%pybinoperator(__add__,      *::operator+,		binaryfunc, nb_add);
-%pybinoperator(__pos__,      *::operator+(),		unaryfunc, nb_positive);
-%pybinoperator(__pos__,      *::operator+() const,	unaryfunc, nb_positive);
-%pybinoperator(__sub__,      *::operator-,		binaryfunc, nb_subtract);
-%pybinoperator(__neg__,      *::operator-(),		unaryfunc, nb_negative);
-%pybinoperator(__neg__,      *::operator-() const,	unaryfunc, nb_negative);
-%pybinoperator(__mul__,      *::operator*,		binaryfunc, nb_multiply);
-%pybinoperator(__mod__,      *::operator%,		binaryfunc, nb_remainder);
-%pybinoperator(__lshift__,   *::operator<<,		binaryfunc, nb_lshift);
-%pybinoperator(__rshift__,   *::operator>>,		binaryfunc, nb_rshift);
-%pybinoperator(__and__,      *::operator&,		binaryfunc, nb_and);
-%pybinoperator(__or__,       *::operator|,		binaryfunc, nb_or);
-%pybinoperator(__xor__,      *::operator^,		binaryfunc, nb_xor);
-%pycompare(__lt__,           *::operator<,		Py_LT);
-%pycompare(__le__,           *::operator<=,		Py_LE);
-%pycompare(__gt__,           *::operator>,		Py_GT);
-%pycompare(__ge__,           *::operator>=,		Py_GE);
-%pycompare(__eq__,           *::operator==,		Py_EQ);
-%pycompare(__ne__,           *::operator!=,		Py_NE);
-
-/* Special cases */
-%rename(__invert__)     *::operator~;
-%feature("python:slot", "nb_invert", functype="unaryfunc") *::operator~;
-%rename(__call__)       *::operator();
-%feature("python:slot", "tp_call", functype="ternarycallfunc") *::operator();
-
-#if defined(SWIGPYTHON_BUILTIN)
-%pybinoperator(__nonzero__,   *::operator bool,		inquiry, nb_nonzero);
-%pybinoperator(__truediv__,   *::operator/    ,		binaryfunc, nb_divide);
-#else
-%feature("shadow")      *::operator bool %{
-def __nonzero__(self):
-    return $action(self)
-__bool__ = __nonzero__
-%};
-%rename(__nonzero__)    *::operator bool;
-%feature("shadow")      *::operator/ %{
-def __truediv__(self, *args):
-    return $action(self, *args)
-__div__ = __truediv__
-%};
-%rename(__truediv__)    *::operator/;
-%pythonmaybecall        *::operator/;
-#endif
-
-/* Ignored operators */
-%ignoreoperator(LNOT)       operator!;
-%ignoreoperator(LAND)       operator&&;
-%ignoreoperator(LOR)        operator||;
-%ignoreoperator(EQ)         *::operator=;
-%ignoreoperator(PLUSPLUS)   *::operator++;
-%ignoreoperator(MINUSMINUS) *::operator--;
-%ignoreoperator(ARROWSTAR)  *::operator->*;
-%ignoreoperator(INDEX)      *::operator[];
-
-/*
-  Inplace operator declarations.
-
-  They translate the inplace C++ operators (+=, -=, ...)  into the
-  corresponding python equivalents(__iadd__,__isub__), etc,
-  disabling the ownership of the input 'this' pointer, and assigning
-  it to the returning object:  
-
-     %feature("del") *::Operator; // disables ownership by generating SWIG_POINTER_DISOWN
-     %feature("new") *::Operator; // claims ownership by generating SWIG_POINTER_OWN
-  
-  This makes the most common case safe, ie:
-
-     A&  A::operator+=(int i) { ...; return *this; }
-    ^^^^                                    ^^^^^^
-
-  will work fine, even when the resulting python object shares the
-  'this' pointer with the input one. The input object is usually
-  deleted after the operation, including the shared 'this' pointer,
-  producing 'strange' seg faults, as reported by Lucriz
-  (lucriz@sitilandia.it).
-
-  If you have an interface that already takes care of that, ie, you
-  already are using inplace operators and you are not getting
-  seg. faults, with the new scheme you could end with 'free' elements
-  that never get deleted (maybe, not sure, it depends). But if that is
-  the case, you could recover the old behaviour using
-
-     %feature("del","0") A::operator+=;
-     %feature("new","0") A::operator+=;
-
-  which recovers the old behaviour for the class 'A', or if you are
-  100% sure your entire system works fine in the old way, use:
-
-    %feature("del","") *::operator+=;
-    %feature("new","") *::operator+=;
-
-  The default behaviour assumes that the 'this' pointer's memory is
-  already owned by the SWIG object; it relinquishes ownership then
-  takes it back. This may not be the case though as the SWIG object
-  might be owned by memory managed elsewhere, eg after calling a
-  function that returns a C++ reference. In such case you will need
-  to use the features above to recover the old behaviour too.
-*/
-
-#if defined(SWIGPYTHON_BUILTIN)
-#define %pyinplaceoper(SwigPyOper, Oper, functp, slt) %delobject Oper; %newobject Oper; %feature("python:slot", #slt, functype=#functp) Oper; %rename(SwigPyOper) Oper
-#else
-#define %pyinplaceoper(SwigPyOper, Oper, functp, slt) %delobject Oper; %newobject Oper; %rename(SwigPyOper) Oper
-#endif
-
-%pyinplaceoper(__iadd__   , *::operator +=,	binaryfunc, nb_inplace_add);
-%pyinplaceoper(__isub__   , *::operator -=,	binaryfunc, nb_inplace_subtract);
-%pyinplaceoper(__imul__   , *::operator *=,	binaryfunc, nb_inplace_multiply);
-%pyinplaceoper(__imod__   , *::operator %=,	binaryfunc, nb_inplace_remainder);
-%pyinplaceoper(__iand__   , *::operator &=,	binaryfunc, nb_inplace_and);
-%pyinplaceoper(__ior__    , *::operator |=,	binaryfunc, nb_inplace_or);
-%pyinplaceoper(__ixor__   , *::operator ^=,	binaryfunc, nb_inplace_xor);
-%pyinplaceoper(__ilshift__, *::operator <<=,	binaryfunc, nb_inplace_lshift);
-%pyinplaceoper(__irshift__, *::operator >>=,	binaryfunc, nb_inplace_rshift);
-
-/* Special cases */
-#if defined(SWIGPYTHON_BUILTIN)
-%pyinplaceoper(__itruediv__   , *::operator /=,	binaryfunc, nb_inplace_divide);
-#else
-%delobject *::operator /=;
-%newobject *::operator /=;
-%feature("shadow")      *::operator /= %{
-def __itruediv__(self, *args):
-    return $action(self, *args)
-__idiv__ = __itruediv__
-%};
-%rename(__itruediv__)    *::operator /=;
-#endif
-
-/* Finally, in python we need to mark the binary operations to fail as
- 'maybecall' methods */
-
-#define %pybinopermaybecall(oper) %pythonmaybecall __ ## oper ## __;  %pythonmaybecall __r ## oper ## __
-
-%pybinopermaybecall(add);
-%pybinopermaybecall(pos);
-%pybinopermaybecall(pos);
-%pybinopermaybecall(sub);
-%pybinopermaybecall(neg);
-%pybinopermaybecall(neg);
-%pybinopermaybecall(mul);
-%pybinopermaybecall(div);
-%pybinopermaybecall(truediv);
-%pybinopermaybecall(mod);
-%pybinopermaybecall(lshift);
-%pybinopermaybecall(rshift);
-%pybinopermaybecall(and);
-%pybinopermaybecall(or);
-%pybinopermaybecall(xor);
-%pybinopermaybecall(lt);
-%pybinopermaybecall(le);
-%pybinopermaybecall(gt);
-%pybinopermaybecall(ge);
-%pybinopermaybecall(eq);
-%pybinopermaybecall(ne);
-
-#endif
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyprimtypes.swg b/dependencies2013/win32/swig/Lib/python/pyprimtypes.swg
deleted file mode 100644
index 6a01af17..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyprimtypes.swg
+++ /dev/null
@@ -1,353 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-/* boolean */
-
-%fragment(SWIG_From_frag(bool),"header") {
-SWIGINTERNINLINE PyObject*
-  SWIG_From_dec(bool)(bool value)
-{
-  return PyBool_FromLong(value ? 1 : 0);
-}
-}
-
-#ifdef SWIG_PYTHON_LEGACY_BOOL
-// Default prior to SWIG 3.0.0
-%fragment(SWIG_AsVal_frag(bool),"header",
-	  fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(PyObject *obj, bool *val)
-{
-  int r = PyObject_IsTrue(obj);
-  if (r == -1)
-    return SWIG_ERROR;
-  if (val) *val = r ? true : false;
-  return SWIG_OK;
-}
-}
-#else
-%fragment(SWIG_AsVal_frag(bool),"header",
-	  fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(PyObject *obj, bool *val)
-{
-  int r;
-  if (!PyBool_Check(obj))
-    return SWIG_ERROR;
-  r = PyObject_IsTrue(obj);
-  if (r == -1)
-    return SWIG_ERROR;
-  if (val) *val = r ? true : false;
-  return SWIG_OK;
-}
-}
-#endif
-
-/* int */
-
-%fragment(SWIG_From_frag(int),"header") {
-SWIGINTERNINLINE PyObject*
-  SWIG_From_dec(int)(int value)
-{
-  return PyInt_FromLong((long) value);
-}
-}
-
-/* unsigned int */
-
-%fragment(SWIG_From_frag(unsigned int),"header") {
-SWIGINTERNINLINE PyObject*
-  SWIG_From_dec(unsigned int)(unsigned int value)
-{
-  return PyInt_FromSize_t((size_t) value);
-}
-}
-
-/* long */
-
-%fragment(SWIG_From_frag(long),"header") {
-  %define_as(SWIG_From_dec(long),           PyInt_FromLong)
-}
-
-%fragment(SWIG_AsVal_frag(long),"header",
-	  fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN int
-SWIG_AsVal_dec(long)(PyObject *obj, long* val)
-{
-%#if PY_VERSION_HEX < 0x03000000
-  if (PyInt_Check(obj)) {
-    if (val) *val = PyInt_AsLong(obj);
-    return SWIG_OK;
-  } else
-%#endif
-  if (PyLong_Check(obj)) {
-    long v = PyLong_AsLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-      return SWIG_OverflowError;
-    }
-  }
-%#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    long v = PyInt_AsLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal(double)(obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) {
-	if (val) *val = (long)(d);
-	return res;
-      }
-    }
-  }
-%#endif
-  return SWIG_TypeError;
-}
-}
-
-/* unsigned long */
-
-%fragment(SWIG_From_frag(unsigned long),"header",
-	  fragment=SWIG_From_frag(long)) {
-SWIGINTERNINLINE PyObject* 
-SWIG_From_dec(unsigned long)(unsigned long value)
-{
-  return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLong(value) : PyInt_FromLong(%numeric_cast(value,long));
-}
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header",
-	  fragment="SWIG_CanCastAsInteger") {
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long)(PyObject *obj, unsigned long *val) 
-{
-%#if PY_VERSION_HEX < 0x03000000
-  if (PyInt_Check(obj)) {
-    long v = PyInt_AsLong(obj);
-    if (v >= 0) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }
-  } else
-%#endif
-  if (PyLong_Check(obj)) {
-    unsigned long v = PyLong_AsUnsignedLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-      return SWIG_OverflowError;
-    }
-  }
-%#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    unsigned long v = PyLong_AsUnsignedLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal(double)(obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) {
-	if (val) *val = (unsigned long)(d);
-	return res;
-      }
-    }
-  }
-%#endif
-  return SWIG_TypeError;
-}
-}
-
-/* long long */
-
-%fragment(SWIG_From_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE PyObject* 
-SWIG_From_dec(long long)(long long value)
-{
-  return ((value < LONG_MIN) || (value > LONG_MAX)) ?
-    PyLong_FromLongLong(value) : PyInt_FromLong(%numeric_cast(value,long));
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-	  fragment=SWIG_AsVal_frag(long),
-	  fragment="SWIG_CanCastAsInteger",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(long long)(PyObject *obj, long long *val)
-{
-  int res = SWIG_TypeError;
-  if (PyLong_Check(obj)) {
-    long long v = PyLong_AsLongLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-      res = SWIG_OverflowError;
-    }
-  } else {
-    long v;
-    res = SWIG_AsVal(long)(obj,&v);
-    if (SWIG_IsOK(res)) {
-      if (val) *val = v;
-      return res;
-    }
-  }
-%#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    const double mant_max = 1LL << DBL_MANT_DIG;
-    const double mant_min = -mant_max;
-    double d;
-    res = SWIG_AsVal(double)(obj,&d);
-    if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, mant_min, mant_max))
-      return SWIG_OverflowError;
-    if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) {
-      if (val) *val = (long long)(d);
-      return SWIG_AddCast(res);
-    }
-    res = SWIG_TypeError;
-  }
-%#endif
-  return res;
-}
-%#endif
-}
-
-/* unsigned long long */
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE PyObject* 
-SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-  return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLongLong(value) : PyInt_FromLong(%numeric_cast(value,long));
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-	  fragment=SWIG_AsVal_frag(unsigned long),
-	  fragment="SWIG_CanCastAsInteger",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long long)(PyObject *obj, unsigned long long *val)
-{
-  int res = SWIG_TypeError;
-  if (PyLong_Check(obj)) {
-    unsigned long long v = PyLong_AsUnsignedLongLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-      res = SWIG_OverflowError;
-    }
-  } else {
-    unsigned long v;
-    res = SWIG_AsVal(unsigned long)(obj,&v);
-    if (SWIG_IsOK(res)) {
-      if (val) *val = v;
-      return res;
-    }
-  }
-%#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    const double mant_max = 1LL << DBL_MANT_DIG;
-    double d;
-    res = SWIG_AsVal(double)(obj,&d);
-    if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, 0, mant_max))
-      return SWIG_OverflowError;
-    if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) {
-      if (val) *val = (unsigned long long)(d);
-      return SWIG_AddCast(res);
-    }
-    res = SWIG_TypeError;
-  }
-%#endif
-  return res;
-}
-%#endif
-}
-
-/* double */
-
-%fragment(SWIG_From_frag(double),"header") {
-  %define_as(SWIG_From_dec(double),          PyFloat_FromDouble)
-}
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(double)(PyObject *obj, double *val)
-{
-  int res = SWIG_TypeError;
-  if (PyFloat_Check(obj)) {
-    if (val) *val = PyFloat_AsDouble(obj);
-    return SWIG_OK;
-%#if PY_VERSION_HEX < 0x03000000
-  } else if (PyInt_Check(obj)) {
-    if (val) *val = (double) PyInt_AsLong(obj);
-    return SWIG_OK;
-%#endif
-  } else if (PyLong_Check(obj)) {
-    double v = PyLong_AsDouble(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-    }
-  }
-%#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    double d = PyFloat_AsDouble(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = d;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      long v = PyLong_AsLong(obj);
-      if (!PyErr_Occurred()) {
-	if (val) *val = v;
-	return SWIG_AddCast(SWIG_AddCast(SWIG_OK));
-      } else {
-	PyErr_Clear();
-      }
-    }
-  }
-%#endif
-  return res;
-}
-}
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyrun.swg b/dependencies2013/win32/swig/Lib/python/pyrun.swg
deleted file mode 100644
index ab1237f6..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyrun.swg
+++ /dev/null
@@ -1,1827 +0,0 @@
-/* -----------------------------------------------------------------------------
- * pyrun.swg
- *
- * This file contains the runtime support for Python modules
- * and includes code for managing global variables and pointer
- * type checking.
- *
- * ----------------------------------------------------------------------------- */
-
-/* Common SWIG API */
-
-/* for raw pointers */
-#define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-
-#ifdef SWIGPYTHON_BUILTIN
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(self, ptr, type, flags)
-#else
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
-#endif
-
-#define SWIG_InternalNewPointerObj(ptr, type, flags)	SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
-
-#define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
-#define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
-#define swig_owntype                                    int
-
-/* for raw packed data */
-#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
-
-/* for class or struct pointers */
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
-
-/* for C or C++ function pointers */
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(NULL, ptr, type, 0)
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
-
-
-/* Runtime API */
-
-#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
-#define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
-
-#define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
-#define SWIG_SetErrorMsg                        	SWIG_Python_SetErrorMsg				   
-#define SWIG_ErrorType(code)                    	SWIG_Python_ErrorType(code)                        
-#define SWIG_Error(code, msg)            		SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) 
-#define SWIG_fail                        		goto fail					   
-
-
-/* Runtime API implementation */
-
-/* Error manipulation */
-
-SWIGINTERN void 
-SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
-  SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
-  PyErr_SetObject(errtype, obj);
-  Py_DECREF(obj);
-  SWIG_PYTHON_THREAD_END_BLOCK;
-}
-
-SWIGINTERN void 
-SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
-  SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-  PyErr_SetString(errtype, msg);
-  SWIG_PYTHON_THREAD_END_BLOCK;
-}
-
-#define SWIG_Python_Raise(obj, type, desc)  SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj)
-
-/* Set a constant value */
-
-#if defined(SWIGPYTHON_BUILTIN)
-
-SWIGINTERN void
-SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
-  PyObject *s = PyString_InternFromString(key);
-  PyList_Append(seq, s);
-  Py_DECREF(s);
-}
-
-SWIGINTERN void
-SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
-  PyDict_SetItemString(d, name, obj);
-#endif
-  Py_DECREF(obj);
-  if (public_interface)
-    SwigPyBuiltin_AddPublicSymbol(public_interface, name);
-}
-
-#else
-
-SWIGINTERN void
-SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
-  PyDict_SetItemString(d, name, obj);
-#endif
-  Py_DECREF(obj);                            
-}
-
-#endif
-
-/* Append a value to the result obj */
-
-SWIGINTERN PyObject*
-SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
-#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyList_Check(result)) {
-      PyObject *o2 = result;
-      result = PyList_New(1);
-      PyList_SetItem(result, 0, o2);
-    }
-    PyList_Append(result,obj);
-    Py_DECREF(obj);
-  }
-  return result;
-#else
-  PyObject*   o2;
-  PyObject*   o3;
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyTuple_Check(result)) {
-      o2 = result;
-      result = PyTuple_New(1);
-      PyTuple_SET_ITEM(result, 0, o2);
-    }
-    o3 = PyTuple_New(1);
-    PyTuple_SET_ITEM(o3, 0, obj);
-    o2 = result;
-    result = PySequence_Concat(o2, o3);
-    Py_DECREF(o2);
-    Py_DECREF(o3);
-  }
-  return result;
-#endif
-}
-
-/* Unpack the argument tuple */
-
-SWIGINTERN Py_ssize_t
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
-{
-  if (!args) {
-    if (!min && !max) {
-      return 1;
-    } else {
-      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), (int)min);
-      return 0;
-    }
-  }  
-  if (!PyTuple_Check(args)) {
-    if (min <= 1 && max >= 1) {
-      Py_ssize_t i;
-      objs[0] = args;
-      for (i = 1; i < max; ++i) {
-	objs[i] = 0;
-      }
-      return 2;
-    }
-    PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
-    return 0;
-  } else {
-    Py_ssize_t l = PyTuple_GET_SIZE(args);
-    if (l < min) {
-      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), (int)min, (int)l);
-      return 0;
-    } else if (l > max) {
-      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), (int)max, (int)l);
-      return 0;
-    } else {
-      Py_ssize_t i;
-      for (i = 0; i < l; ++i) {
-	objs[i] = PyTuple_GET_ITEM(args, i);
-      }
-      for (; l < max; ++l) {
-	objs[l] = 0;
-      }
-      return i + 1;
-    }    
-  }
-}
-
-/* A functor is a function object with one single object argument */
-#if PY_VERSION_HEX >= 0x02020000
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
-#else
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
-#endif
-
-/*
-  Helper for static pointer initialization for both C and C++ code, for example
-  static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...);
-*/
-#ifdef __cplusplus
-#define SWIG_STATIC_POINTER(var)  var
-#else
-#define SWIG_STATIC_POINTER(var)  var = 0; if (!var) var
-#endif
-
-/* -----------------------------------------------------------------------------
- * Pointer declarations
- * ----------------------------------------------------------------------------- */
-
-/* Flags for new pointer objects */
-#define SWIG_POINTER_NOSHADOW       (SWIG_POINTER_OWN      << 1)
-#define SWIG_POINTER_NEW            (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN)
-
-#define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
-
-#define SWIG_BUILTIN_TP_INIT	    (SWIG_POINTER_OWN << 2)
-#define SWIG_BUILTIN_INIT	    (SWIG_BUILTIN_TP_INIT | SWIG_POINTER_OWN)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*  How to access Py_None */
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  ifndef SWIG_PYTHON_NO_BUILD_NONE
-#    ifndef SWIG_PYTHON_BUILD_NONE
-#      define SWIG_PYTHON_BUILD_NONE
-#    endif
-#  endif
-#endif
-
-#ifdef SWIG_PYTHON_BUILD_NONE
-#  ifdef Py_None
-#   undef Py_None
-#   define Py_None SWIG_Py_None()
-#  endif
-SWIGRUNTIMEINLINE PyObject * 
-_SWIG_Py_None(void)
-{
-  PyObject *none = Py_BuildValue((char*)"");
-  Py_DECREF(none);
-  return none;
-}
-SWIGRUNTIME PyObject * 
-SWIG_Py_None(void)
-{
-  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
-  return none;
-}
-#endif
-
-/* The python void return value */
-
-SWIGRUNTIMEINLINE PyObject * 
-SWIG_Py_Void(void)
-{
-  PyObject *none = Py_None;
-  Py_INCREF(none);
-  return none;
-}
-
-/* SwigPyClientData */
-
-typedef struct {
-  PyObject *klass;
-  PyObject *newraw;
-  PyObject *newargs;
-  PyObject *destroy;
-  int delargs;
-  int implicitconv;
-  PyTypeObject *pytype;
-} SwigPyClientData;
-
-SWIGRUNTIMEINLINE int 
-SWIG_Python_CheckImplicit(swig_type_info *ty)
-{
-  SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
-  return data ? data->implicitconv : 0;
-}
-
-SWIGRUNTIMEINLINE PyObject *
-SWIG_Python_ExceptionType(swig_type_info *desc) {
-  SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0;
-  PyObject *klass = data ? data->klass : 0;
-  return (klass ? klass : PyExc_RuntimeError);
-}
-
-
-SWIGRUNTIME SwigPyClientData * 
-SwigPyClientData_New(PyObject* obj)
-{
-  if (!obj) {
-    return 0;
-  } else {
-    SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData));
-    /* the klass element */
-    data->klass = obj;
-    Py_INCREF(data->klass);
-    /* the newraw method and newargs arguments used to create a new raw instance */
-    if (PyClass_Check(obj)) {
-      data->newraw = 0;
-      data->newargs = obj;
-      Py_INCREF(obj);
-    } else {
-#if (PY_VERSION_HEX < 0x02020000)
-      data->newraw = 0;
-#else
-      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
-#endif
-      if (data->newraw) {
-	Py_INCREF(data->newraw);
-	data->newargs = PyTuple_New(1);
-	PyTuple_SetItem(data->newargs, 0, obj);
-      } else {
-	data->newargs = obj;
-      }
-      Py_INCREF(data->newargs);
-    }
-    /* the destroy method, aka as the C++ delete method */
-    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      data->destroy = 0;
-    }
-    if (data->destroy) {
-      int flags;
-      Py_INCREF(data->destroy);
-      flags = PyCFunction_GET_FLAGS(data->destroy);
-#ifdef METH_O
-      data->delargs = !(flags & (METH_O));
-#else
-      data->delargs = 0;
-#endif
-    } else {
-      data->delargs = 0;
-    }
-    data->implicitconv = 0;
-    data->pytype = 0;
-    return data;
-  }
-}
-
-SWIGRUNTIME void 
-SwigPyClientData_Del(SwigPyClientData *data) {
-  Py_XDECREF(data->newraw);
-  Py_XDECREF(data->newargs);
-  Py_XDECREF(data->destroy);
-}
-
-/* =============== SwigPyObject =====================*/
-
-typedef struct {
-  PyObject_HEAD
-  void *ptr;
-  swig_type_info *ty;
-  int own;
-  PyObject *next;
-#ifdef SWIGPYTHON_BUILTIN
-  PyObject *dict;
-#endif
-} SwigPyObject;
-
-
-#ifdef SWIGPYTHON_BUILTIN
-
-SWIGRUNTIME PyObject *
-SwigPyObject_get___dict__(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
-{
-  SwigPyObject *sobj = (SwigPyObject *)v;
-
-  if (!sobj->dict)
-    sobj->dict = PyDict_New();
-
-  Py_INCREF(sobj->dict);
-  return sobj->dict;
-}
-
-#endif
-
-SWIGRUNTIME PyObject *
-SwigPyObject_long(SwigPyObject *v)
-{
-  return PyLong_FromVoidPtr(v->ptr);
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_format(const char* fmt, SwigPyObject *v)
-{
-  PyObject *res = NULL;
-  PyObject *args = PyTuple_New(1);
-  if (args) {
-    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
-      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
-      if (ofmt) {
-#if PY_VERSION_HEX >= 0x03000000
-	res = PyUnicode_Format(ofmt,args);
-#else
-	res = PyString_Format(ofmt,args);
-#endif
-	Py_DECREF(ofmt);
-      }
-      Py_DECREF(args);
-    }
-  }
-  return res;
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_oct(SwigPyObject *v)
-{
-  return SwigPyObject_format("%o",v);
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_hex(SwigPyObject *v)
-{
-  return SwigPyObject_format("%x",v);
-}
-
-SWIGRUNTIME PyObject *
-#ifdef METH_NOARGS
-SwigPyObject_repr(SwigPyObject *v)
-#else
-SwigPyObject_repr(SwigPyObject *v, PyObject *args)
-#endif
-{
-  const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
-  if (v->next) {
-# ifdef METH_NOARGS
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-# else
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-# endif
-# if PY_VERSION_HEX >= 0x03000000
-    PyObject *joined = PyUnicode_Concat(repr, nrep);
-    Py_DecRef(repr);
-    Py_DecRef(nrep);
-    repr = joined;
-# else
-    PyString_ConcatAndDel(&repr,nrep);
-# endif
-  }
-  return repr;  
-}
-
-SWIGRUNTIME int
-SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
-{
-  void *i = v->ptr;
-  void *j = w->ptr;
-  return (i < j) ? -1 : ((i > j) ? 1 : 0);
-}
-
-/* Added for Python 3.x, would it also be useful for Python 2.x? */
-SWIGRUNTIME PyObject*
-SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
-{
-  PyObject* res;
-  if( op != Py_EQ && op != Py_NE ) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0);
-  return res;  
-}
-
-
-SWIGRUNTIME PyTypeObject* SwigPyObject_TypeOnce(void);
-
-#ifdef SWIGPYTHON_BUILTIN
-static swig_type_info *SwigPyObject_stype = 0;
-SWIGRUNTIME PyTypeObject*
-SwigPyObject_type(void) {
-    SwigPyClientData *cd;
-    assert(SwigPyObject_stype);
-    cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
-    assert(cd);
-    assert(cd->pytype);
-    return cd->pytype;
-}
-#else
-SWIGRUNTIME PyTypeObject*
-SwigPyObject_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyObject_TypeOnce();
-  return type;
-}
-#endif
-
-SWIGRUNTIMEINLINE int
-SwigPyObject_Check(PyObject *op) {
-#ifdef SWIGPYTHON_BUILTIN
-  PyTypeObject *target_tp = SwigPyObject_type();
-  if (PyType_IsSubtype(op->ob_type, target_tp))
-    return 1;
-  return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0);
-#else
-  return (Py_TYPE(op) == SwigPyObject_type())
-    || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
-#endif
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
-
-SWIGRUNTIME void
-SwigPyObject_dealloc(PyObject *v)
-{
-  SwigPyObject *sobj = (SwigPyObject *) v;
-  PyObject *next = sobj->next;
-  if (sobj->own == SWIG_POINTER_OWN) {
-    swig_type_info *ty = sobj->ty;
-    SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
-    PyObject *destroy = data ? data->destroy : 0;
-    if (destroy) {
-      /* destroy is always a VARARGS method */
-      PyObject *res;
-
-      /* PyObject_CallFunction() has the potential to silently drop
-         the active active exception.  In cases of unnamed temporary
-         variable or where we just finished iterating over a generator
-         StopIteration will be active right now, and this needs to
-         remain true upon return from SwigPyObject_dealloc.  So save
-         and restore. */
-      
-      PyObject *val = NULL, *type = NULL, *tb = NULL;
-      PyErr_Fetch(&val, &type, &tb);
-
-      if (data->delargs) {
-        /* we need to create a temporary object to carry the destroy operation */
-        PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
-        res = SWIG_Python_CallFunctor(destroy, tmp);
-        Py_DECREF(tmp);
-      } else {
-        PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
-        PyObject *mself = PyCFunction_GET_SELF(destroy);
-        res = ((*meth)(mself, v));
-      }
-      if (!res)
-        PyErr_WriteUnraisable(destroy);
-
-      PyErr_Restore(val, type, tb);
-
-      Py_XDECREF(res);
-    } 
-#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-    else {
-      const char *name = SWIG_TypePrettyName(ty);
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
-    }
-#endif
-  } 
-  Py_XDECREF(next);
-  PyObject_DEL(v);
-}
-
-SWIGRUNTIME PyObject* 
-SwigPyObject_append(PyObject* v, PyObject* next)
-{
-  SwigPyObject *sobj = (SwigPyObject *) v;
-#ifndef METH_O
-  PyObject *tmp = 0;
-  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
-  next = tmp;
-#endif
-  if (!SwigPyObject_Check(next)) {
-    PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject");
-    return NULL;
-  }
-  sobj->next = next;
-  Py_INCREF(next);
-  return SWIG_Py_Void();
-}
-
-SWIGRUNTIME PyObject* 
-#ifdef METH_NOARGS
-SwigPyObject_next(PyObject* v)
-#else
-SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
-{
-  SwigPyObject *sobj = (SwigPyObject *) v;
-  if (sobj->next) {    
-    Py_INCREF(sobj->next);
-    return sobj->next;
-  } else {
-    return SWIG_Py_Void();
-  }
-}
-
-SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_disown(PyObject *v)
-#else
-SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
-{
-  SwigPyObject *sobj = (SwigPyObject *)v;
-  sobj->own = 0;
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_acquire(PyObject *v)
-#else
-SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
-{
-  SwigPyObject *sobj = (SwigPyObject *)v;
-  sobj->own = SWIG_POINTER_OWN;
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject*
-SwigPyObject_own(PyObject *v, PyObject *args)
-{
-  PyObject *val = 0;
-#if (PY_VERSION_HEX < 0x02020000)
-  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#elif (PY_VERSION_HEX < 0x02050000)
-  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
-#else
-  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
-#endif
-    {
-      return NULL;
-    } 
-  else
-    {
-      SwigPyObject *sobj = (SwigPyObject *)v;
-      PyObject *obj = PyBool_FromLong(sobj->own);
-      if (val) {
-#ifdef METH_NOARGS
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v);
-	} else {
-	  SwigPyObject_disown(v);
-	}
-#else
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v,args);
-	} else {
-	  SwigPyObject_disown(v,args);
-	}
-#endif
-      } 
-      return obj;
-    }
-}
-
-#ifdef METH_O
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#else
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#endif
-
-#if PY_VERSION_HEX < 0x02020000
-SWIGINTERN PyObject *
-SwigPyObject_getattr(SwigPyObject *sobj,char *name)
-{
-  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
-}
-#endif
-
-SWIGRUNTIME PyTypeObject*
-SwigPyObject_TypeOnce(void) {
-  static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
-
-  static PyNumberMethods SwigPyObject_as_number = {
-    (binaryfunc)0, /*nb_add*/
-    (binaryfunc)0, /*nb_subtract*/
-    (binaryfunc)0, /*nb_multiply*/
-    /* nb_divide removed in Python 3 */
-#if PY_VERSION_HEX < 0x03000000
-    (binaryfunc)0, /*nb_divide*/
-#endif
-    (binaryfunc)0, /*nb_remainder*/
-    (binaryfunc)0, /*nb_divmod*/
-    (ternaryfunc)0,/*nb_power*/
-    (unaryfunc)0,  /*nb_negative*/
-    (unaryfunc)0,  /*nb_positive*/
-    (unaryfunc)0,  /*nb_absolute*/
-    (inquiry)0,    /*nb_nonzero*/
-    0,		   /*nb_invert*/
-    0,		   /*nb_lshift*/
-    0,		   /*nb_rshift*/
-    0,		   /*nb_and*/
-    0,		   /*nb_xor*/
-    0,		   /*nb_or*/
-#if PY_VERSION_HEX < 0x03000000
-    0,   /*nb_coerce*/
-#endif
-    (unaryfunc)SwigPyObject_long, /*nb_int*/
-#if PY_VERSION_HEX < 0x03000000
-    (unaryfunc)SwigPyObject_long, /*nb_long*/
-#else
-    0, /*nb_reserved*/
-#endif
-    (unaryfunc)0,                 /*nb_float*/
-#if PY_VERSION_HEX < 0x03000000
-    (unaryfunc)SwigPyObject_oct,  /*nb_oct*/
-    (unaryfunc)SwigPyObject_hex,  /*nb_hex*/
-#endif
-#if PY_VERSION_HEX >= 0x03050000 /* 3.5 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */
-#elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
-#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
-    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
-#endif
-  };
-
-  static PyTypeObject swigpyobject_type;
-  static int type_init = 0;
-  if (!type_init) {
-    const PyTypeObject tmp = {
-#if PY_VERSION_HEX >= 0x03000000
-      PyVarObject_HEAD_INIT(NULL, 0)
-#else
-      PyObject_HEAD_INIT(NULL)
-      0,                                    /* ob_size */
-#endif
-      (char *)"SwigPyObject",               /* tp_name */
-      sizeof(SwigPyObject),                 /* tp_basicsize */
-      0,                                    /* tp_itemsize */
-      (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      0,                                    /* tp_print */
-#if PY_VERSION_HEX < 0x02020000
-      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
-#else
-      (getattrfunc)0,                       /* tp_getattr */
-#endif
-      (setattrfunc)0,                       /* tp_setattr */
-#if PY_VERSION_HEX >= 0x03000000
-      0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
-#else
-      (cmpfunc)SwigPyObject_compare,        /* tp_compare */
-#endif
-      (reprfunc)SwigPyObject_repr,          /* tp_repr */
-      &SwigPyObject_as_number,              /* tp_as_number */
-      0,                                    /* tp_as_sequence */
-      0,                                    /* tp_as_mapping */
-      (hashfunc)0,                          /* tp_hash */
-      (ternaryfunc)0,                       /* tp_call */
-      0,                                    /* tp_str */
-      PyObject_GenericGetAttr,              /* tp_getattro */
-      0,                                    /* tp_setattro */
-      0,                                    /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
-      swigobject_doc,                       /* tp_doc */
-      0,                                    /* tp_traverse */
-      0,                                    /* tp_clear */
-      (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
-      0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-      0,                                    /* tp_iter */
-      0,                                    /* tp_iternext */
-      swigobject_methods,                   /* tp_methods */
-      0,                                    /* tp_members */
-      0,                                    /* tp_getset */
-      0,                                    /* tp_base */
-      0,                                    /* tp_dict */
-      0,                                    /* tp_descr_get */
-      0,                                    /* tp_descr_set */
-      0,                                    /* tp_dictoffset */
-      0,                                    /* tp_init */
-      0,                                    /* tp_alloc */
-      0,                                    /* tp_new */
-      0,                                    /* tp_free */
-      0,                                    /* tp_is_gc */
-      0,                                    /* tp_bases */
-      0,                                    /* tp_mro */
-      0,                                    /* tp_cache */
-      0,                                    /* tp_subclasses */
-      0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
-      0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                    /* tp_version_tag */
-#endif
-#if PY_VERSION_HEX >= 0x03040000
-      0,                                    /* tp_finalize */
-#endif
-#ifdef COUNT_ALLOCS
-      0,                                    /* tp_allocs */
-      0,                                    /* tp_frees */
-      0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
-      0,                                    /* tp_prev */
-#endif
-      0                                     /* tp_next */
-#endif
-    };
-    swigpyobject_type = tmp;
-    type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpyobject_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&swigpyobject_type) < 0)
-      return NULL;
-#endif
-  }
-  return &swigpyobject_type;
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
-{
-  SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type());
-  if (sobj) {
-    sobj->ptr  = ptr;
-    sobj->ty   = ty;
-    sobj->own  = own;
-    sobj->next = 0;
-  }
-  return (PyObject *)sobj;
-}
-
-/* -----------------------------------------------------------------------------
- * Implements a simple Swig Packed type, and use it instead of string
- * ----------------------------------------------------------------------------- */
-
-typedef struct {
-  PyObject_HEAD
-  void *pack;
-  swig_type_info *ty;
-  size_t size;
-} SwigPyPacked;
-
-SWIGRUNTIME int
-SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char result[SWIG_BUFFER_SIZE];
-  fputs("<Swig Packed ", fp); 
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    fputs("at ", fp); 
-    fputs(result, fp); 
-  }
-  fputs(v->ty->name,fp); 
-  fputs(">", fp);
-  return 0; 
-}
-  
-SWIGRUNTIME PyObject *
-SwigPyPacked_repr(SwigPyPacked *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    return SWIG_Python_str_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
-  } else {
-    return SWIG_Python_str_FromFormat("<Swig Packed %s>", v->ty->name);
-  }  
-}
-
-SWIGRUNTIME PyObject *
-SwigPyPacked_str(SwigPyPacked *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
-    return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name);
-  } else {
-    return SWIG_Python_str_FromChar(v->ty->name);
-  }  
-}
-
-SWIGRUNTIME int
-SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
-{
-  size_t i = v->size;
-  size_t j = w->size;
-  int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
-  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
-}
-
-SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
-
-SWIGRUNTIME PyTypeObject*
-SwigPyPacked_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyPacked_TypeOnce();
-  return type;
-}
-
-SWIGRUNTIMEINLINE int
-SwigPyPacked_Check(PyObject *op) {
-  return ((op)->ob_type == SwigPyPacked_TypeOnce()) 
-    || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
-}
-
-SWIGRUNTIME void
-SwigPyPacked_dealloc(PyObject *v)
-{
-  if (SwigPyPacked_Check(v)) {
-    SwigPyPacked *sobj = (SwigPyPacked *) v;
-    free(sobj->pack);
-  }
-  PyObject_DEL(v);
-}
-
-SWIGRUNTIME PyTypeObject*
-SwigPyPacked_TypeOnce(void) {
-  static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
-  static PyTypeObject swigpypacked_type;
-  static int type_init = 0;
-  if (!type_init) {
-    const PyTypeObject tmp = {
-#if PY_VERSION_HEX>=0x03000000
-      PyVarObject_HEAD_INIT(NULL, 0)
-#else
-      PyObject_HEAD_INIT(NULL)
-      0,                                    /* ob_size */
-#endif
-      (char *)"SwigPyPacked",               /* tp_name */
-      sizeof(SwigPyPacked),                 /* tp_basicsize */
-      0,                                    /* tp_itemsize */
-      (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyPacked_print,        /* tp_print */
-      (getattrfunc)0,                       /* tp_getattr */
-      (setattrfunc)0,                       /* tp_setattr */
-#if PY_VERSION_HEX>=0x03000000
-      0, /* tp_reserved in 3.0.1 */
-#else
-      (cmpfunc)SwigPyPacked_compare,        /* tp_compare */
-#endif
-      (reprfunc)SwigPyPacked_repr,          /* tp_repr */
-      0,                                    /* tp_as_number */
-      0,                                    /* tp_as_sequence */
-      0,                                    /* tp_as_mapping */
-      (hashfunc)0,                          /* tp_hash */
-      (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyPacked_str,           /* tp_str */
-      PyObject_GenericGetAttr,              /* tp_getattro */
-      0,                                    /* tp_setattro */
-      0,                                    /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
-      swigpacked_doc,                       /* tp_doc */
-      0,                                    /* tp_traverse */
-      0,                                    /* tp_clear */
-      0,                                    /* tp_richcompare */
-      0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-      0,                                    /* tp_iter */
-      0,                                    /* tp_iternext */
-      0,                                    /* tp_methods */
-      0,                                    /* tp_members */
-      0,                                    /* tp_getset */
-      0,                                    /* tp_base */
-      0,                                    /* tp_dict */
-      0,                                    /* tp_descr_get */
-      0,                                    /* tp_descr_set */
-      0,                                    /* tp_dictoffset */
-      0,                                    /* tp_init */
-      0,                                    /* tp_alloc */
-      0,                                    /* tp_new */
-      0,                                    /* tp_free */
-      0,                                    /* tp_is_gc */
-      0,                                    /* tp_bases */
-      0,                                    /* tp_mro */
-      0,                                    /* tp_cache */
-      0,                                    /* tp_subclasses */
-      0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
-      0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                    /* tp_version_tag */
-#endif
-#if PY_VERSION_HEX >= 0x03040000
-      0,                                    /* tp_finalize */
-#endif
-#ifdef COUNT_ALLOCS
-      0,                                    /* tp_allocs */
-      0,                                    /* tp_frees */
-      0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
-      0,                                    /* tp_prev */
-#endif
-      0                                     /* tp_next */
-#endif
-    };
-    swigpypacked_type = tmp;
-    type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpypacked_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&swigpypacked_type) < 0)
-      return NULL;
-#endif
-  }
-  return &swigpypacked_type;
-}
-
-SWIGRUNTIME PyObject *
-SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty)
-{
-  SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type());
-  if (sobj) {
-    void *pack = malloc(size);
-    if (pack) {
-      memcpy(pack, ptr, size);
-      sobj->pack = pack;
-      sobj->ty   = ty;
-      sobj->size = size;
-    } else {
-      PyObject_DEL((PyObject *) sobj);
-      sobj = 0;
-    }
-  }
-  return (PyObject *) sobj;
-}
-
-SWIGRUNTIME swig_type_info *
-SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
-{
-  if (SwigPyPacked_Check(obj)) {
-    SwigPyPacked *sobj = (SwigPyPacked *)obj;
-    if (sobj->size != size) return 0;
-    memcpy(ptr, sobj->pack, size);
-    return sobj->ty;
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * pointers/data manipulation
- * ----------------------------------------------------------------------------- */
-
-SWIGRUNTIMEINLINE PyObject *
-_SWIG_This(void)
-{
-    return SWIG_Python_str_FromChar("this");
-}
-
-static PyObject *swig_this = NULL;
-
-SWIGRUNTIME PyObject *
-SWIG_This(void)
-{
-  if (swig_this == NULL)
-    swig_this = _SWIG_This();
-  return swig_this;
-}
-
-/* #define SWIG_PYTHON_SLOW_GETSET_THIS */
-
-/* TODO: I don't know how to implement the fast getset in Python 3 right now */
-#if PY_VERSION_HEX>=0x03000000
-#define SWIG_PYTHON_SLOW_GETSET_THIS 
-#endif
-
-SWIGRUNTIME SwigPyObject *
-SWIG_Python_GetSwigThis(PyObject *pyobj) 
-{
-  PyObject *obj;
-
-  if (SwigPyObject_Check(pyobj))
-    return (SwigPyObject *) pyobj;
-
-#ifdef SWIGPYTHON_BUILTIN
-  (void)obj;
-# ifdef PyWeakref_CheckProxy
-  if (PyWeakref_CheckProxy(pyobj)) {
-    pyobj = PyWeakref_GET_OBJECT(pyobj);
-    if (pyobj && SwigPyObject_Check(pyobj))
-      return (SwigPyObject*) pyobj;
-  }
-# endif
-  return NULL;
-#else
-
-  obj = 0;
-
-#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
-  if (PyInstance_Check(pyobj)) {
-    obj = _PyInstance_Lookup(pyobj, SWIG_This());      
-  } else {
-    PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
-    if (dictptr != NULL) {
-      PyObject *dict = *dictptr;
-      obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
-    } else {
-#ifdef PyWeakref_CheckProxy
-      if (PyWeakref_CheckProxy(pyobj)) {
-	PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
-	return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
-      }
-#endif
-      obj = PyObject_GetAttr(pyobj,SWIG_This());
-      if (obj) {
-	Py_DECREF(obj);
-      } else {
-	if (PyErr_Occurred()) PyErr_Clear();
-	return 0;
-      }
-    }
-  }
-#else
-  obj = PyObject_GetAttr(pyobj,SWIG_This());
-  if (obj) {
-    Py_DECREF(obj);
-  } else {
-    if (PyErr_Occurred()) PyErr_Clear();
-    return 0;
-  }
-#endif
-  if (obj && !SwigPyObject_Check(obj)) {
-    /* a PyObject is called 'this', try to get the 'real this'
-       SwigPyObject from it */ 
-    return SWIG_Python_GetSwigThis(obj);
-  }
-  return (SwigPyObject *)obj;
-#endif
-}
-
-/* Acquire a pointer value */
-
-SWIGRUNTIME int
-SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own == SWIG_POINTER_OWN) {
-    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
-    if (sobj) {
-      int oldown = sobj->own;
-      sobj->own = own;
-      return oldown;
-    }
-  }
-  return 0;
-}
-
-/* Convert a pointer value */
-
-SWIGRUNTIME int
-SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
-  int res;
-  SwigPyObject *sobj;
-  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
-
-  if (!obj)
-    return SWIG_ERROR;
-  if (obj == Py_None && !implicit_conv) {
-    if (ptr)
-      *ptr = 0;
-    return SWIG_OK;
-  }
-
-  res = SWIG_ERROR;
-
-  sobj = SWIG_Python_GetSwigThis(obj);
-  if (own)
-    *own = 0;
-  while (sobj) {
-    void *vptr = sobj->ptr;
-    if (ty) {
-      swig_type_info *to = sobj->ty;
-      if (to == ty) {
-        /* no type cast needed */
-        if (ptr) *ptr = vptr;
-        break;
-      } else {
-        swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-        if (!tc) {
-          sobj = (SwigPyObject *)sobj->next;
-        } else {
-          if (ptr) {
-            int newmemory = 0;
-            *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-            if (newmemory == SWIG_CAST_NEW_MEMORY) {
-              assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
-              if (own)
-                *own = *own | SWIG_CAST_NEW_MEMORY;
-            }
-          }
-          break;
-        }
-      }
-    } else {
-      if (ptr) *ptr = vptr;
-      break;
-    }
-  }
-  if (sobj) {
-    if (own)
-      *own = *own | sobj->own;
-    if (flags & SWIG_POINTER_DISOWN) {
-      sobj->own = 0;
-    }
-    res = SWIG_OK;
-  } else {
-    if (implicit_conv) {
-      SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
-      if (data && !data->implicitconv) {
-        PyObject *klass = data->klass;
-        if (klass) {
-          PyObject *impconv;
-          data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
-          impconv = SWIG_Python_CallFunctor(klass, obj);
-          data->implicitconv = 0;
-          if (PyErr_Occurred()) {
-            PyErr_Clear();
-            impconv = 0;
-          }
-          if (impconv) {
-            SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
-            if (iobj) {
-              void *vptr;
-              res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
-              if (SWIG_IsOK(res)) {
-                if (ptr) {
-                  *ptr = vptr;
-                  /* transfer the ownership to 'ptr' */
-                  iobj->own = 0;
-                  res = SWIG_AddCast(res);
-                  res = SWIG_AddNewMask(res);
-                } else {
-                  res = SWIG_AddCast(res);		    
-                }
-              }
-            }
-            Py_DECREF(impconv);
-          }
-        }
-      }
-    }
-    if (!SWIG_IsOK(res) && obj == Py_None) {
-      if (ptr)
-        *ptr = 0;
-      if (PyErr_Occurred())
-        PyErr_Clear();
-      res = SWIG_OK;
-    }
-  }
-  return res;
-}
-
-/* Convert a function ptr value */
-
-SWIGRUNTIME int
-SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
-  if (!PyCFunction_Check(obj)) {
-    return SWIG_ConvertPtr(obj, ptr, ty, 0);
-  } else {
-    void *vptr = 0;
-    
-    /* here we get the method pointer for callbacks */
-    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-    const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
-    if (desc)
-      desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-    if (!desc) 
-      return SWIG_ERROR;
-    if (ty) {
-      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
-    } else {
-      *ptr = vptr;
-    }
-    return SWIG_OK;
-  }
-}
-
-/* Convert a packed value value */
-
-SWIGRUNTIME int
-SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz);
-  if (!to) return SWIG_ERROR;
-  if (ty) {
-    if (to != ty) {
-      /* check type cast? */
-      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      if (!tc) return SWIG_ERROR;
-    }
-  }
-  return SWIG_OK;
-}  
-
-/* -----------------------------------------------------------------------------
- * Create a new pointer object
- * ----------------------------------------------------------------------------- */
-
-/*
-  Create a new instance object, without calling __init__, and set the
-  'this' attribute.
-*/
-
-SWIGRUNTIME PyObject* 
-SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
-{
-#if (PY_VERSION_HEX >= 0x02020000)
-  PyObject *inst = 0;
-  PyObject *newraw = data->newraw;
-  if (newraw) {
-    inst = PyObject_Call(newraw, data->newargs, NULL);
-    if (inst) {
-#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
-      PyObject **dictptr = _PyObject_GetDictPtr(inst);
-      if (dictptr != NULL) {
-	PyObject *dict = *dictptr;
-	if (dict == NULL) {
-	  dict = PyDict_New();
-	  *dictptr = dict;
-	  PyDict_SetItem(dict, SWIG_This(), swig_this);
-	}
-      }
-#else
-      PyObject *key = SWIG_This();
-      PyObject_SetAttr(inst, key, swig_this);
-#endif
-    }
-  } else {
-#if PY_VERSION_HEX >= 0x03000000
-    inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    if (inst) {
-      PyObject_SetAttr(inst, SWIG_This(), swig_this);
-      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
-    }
-#else
-    PyObject *dict = PyDict_New();
-    if (dict) {
-      PyDict_SetItem(dict, SWIG_This(), swig_this);
-      inst = PyInstance_NewRaw(data->newargs, dict);
-      Py_DECREF(dict);
-    }
-#endif
-  }
-  return inst;
-#else
-#if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst = 0;
-  PyObject *dict = PyDict_New();
-  if (dict) {
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
-  }
-  return (PyObject *) inst;
-#else
-  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
-  if (inst == NULL) {
-    return NULL;
-  }
-  inst->in_class = (PyClassObject *)data->newargs;
-  Py_INCREF(inst->in_class);
-  inst->in_dict = PyDict_New();
-  if (inst->in_dict == NULL) {
-    Py_DECREF(inst);
-    return NULL;
-  }
-#ifdef Py_TPFLAGS_HAVE_WEAKREFS
-  inst->in_weakreflist = NULL;
-#endif
-#ifdef Py_TPFLAGS_GC
-  PyObject_GC_Init(inst);
-#endif
-  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
-  return (PyObject *) inst;
-#endif
-#endif
-}
-
-SWIGRUNTIME void
-SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
-{
- PyObject *dict;
-#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
- PyObject **dictptr = _PyObject_GetDictPtr(inst);
- if (dictptr != NULL) {
-   dict = *dictptr;
-   if (dict == NULL) {
-     dict = PyDict_New();
-     *dictptr = dict;
-   }
-   PyDict_SetItem(dict, SWIG_This(), swig_this);
-   return;
- }
-#endif
- dict = PyObject_GetAttrString(inst, (char*)"__dict__");
- PyDict_SetItem(dict, SWIG_This(), swig_this);
- Py_DECREF(dict);
-} 
-
-
-SWIGINTERN PyObject *
-SWIG_Python_InitShadowInstance(PyObject *args) {
-  PyObject *obj[2];
-  if (!SWIG_Python_UnpackTuple(args, "swiginit", 2, 2, obj)) {
-    return NULL;
-  } else {
-    SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
-    if (sthis) {
-      SwigPyObject_append((PyObject*) sthis, obj[1]);
-    } else {
-      SWIG_Python_SetSwigThis(obj[0], obj[1]);
-    }
-    return SWIG_Py_Void();
-  }
-}
-
-/* Create a new pointer object */
-
-SWIGRUNTIME PyObject *
-SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int flags) {
-  SwigPyClientData *clientdata;
-  PyObject * robj;
-  int own;
-
-  if (!ptr)
-    return SWIG_Py_Void();
-
-  clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
-  own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-  if (clientdata && clientdata->pytype) {
-    SwigPyObject *newobj;
-    if (flags & SWIG_BUILTIN_TP_INIT) {
-      newobj = (SwigPyObject*) self;
-      if (newobj->ptr) {
-        PyObject *next_self = clientdata->pytype->tp_alloc(clientdata->pytype, 0);
-        while (newobj->next)
-	  newobj = (SwigPyObject *) newobj->next;
-        newobj->next = next_self;
-        newobj = (SwigPyObject *)next_self;
-#ifdef SWIGPYTHON_BUILTIN
-        newobj->dict = 0;
-#endif
-      }
-    } else {
-      newobj = PyObject_New(SwigPyObject, clientdata->pytype);
-#ifdef SWIGPYTHON_BUILTIN
-      newobj->dict = 0;
-#endif
-    }
-    if (newobj) {
-      newobj->ptr = ptr;
-      newobj->ty = type;
-      newobj->own = own;
-      newobj->next = 0;
-      return (PyObject*) newobj;
-    }
-    return SWIG_Py_Void();
-  }
-
-  assert(!(flags & SWIG_BUILTIN_TP_INIT));
-
-  robj = SwigPyObject_New(ptr, type, own);
-  if (robj && clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
-    PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
-    Py_DECREF(robj);
-    robj = inst;
-  }
-  return robj;
-}
-
-/* Create a new packed object */
-
-SWIGRUNTIMEINLINE PyObject *
-SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
-}
-
-/* -----------------------------------------------------------------------------*
- *  Get type list 
- * -----------------------------------------------------------------------------*/
-
-#ifdef SWIG_LINK_RUNTIME
-void *SWIG_ReturnGlobalTypeList(void *);
-#endif
-
-SWIGRUNTIME swig_module_info *
-SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
-  static void *type_pointer = (void *)0;
-  /* first check if module already created */
-  if (!type_pointer) {
-#ifdef SWIG_LINK_RUNTIME
-    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
-#else
-# ifdef SWIGPY_USE_CAPSULE
-    type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
-# else
-    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-# endif
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      type_pointer = (void *)0;
-    }
-#endif
-  }
-  return (swig_module_info *) type_pointer;
-}
-
-#if PY_MAJOR_VERSION < 2
-/* PyModule_AddObject function was introduced in Python 2.0.  The following function
-   is copied out of Python/modsupport.c in python version 2.3.4 */
-SWIGINTERN int
-PyModule_AddObject(PyObject *m, char *name, PyObject *o)
-{
-  PyObject *dict;
-  if (!PyModule_Check(m)) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg");
-    return SWIG_ERROR;
-  }
-  if (!o) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value");
-    return SWIG_ERROR;
-  }
-  
-  dict = PyModule_GetDict(m);
-  if (dict == NULL) {
-    /* Internal error -- modules must have a dict! */
-    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
-		 PyModule_GetName(m));
-    return SWIG_ERROR;
-  }
-  if (PyDict_SetItemString(dict, name, o))
-    return SWIG_ERROR;
-  Py_DECREF(o);
-  return SWIG_OK;
-}
-#endif
-
-SWIGRUNTIME void
-#ifdef SWIGPY_USE_CAPSULE
-SWIG_Python_DestroyModule(PyObject *obj)
-#else
-SWIG_Python_DestroyModule(void *vptr)
-#endif
-{
-#ifdef SWIGPY_USE_CAPSULE
-  swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
-#else
-  swig_module_info *swig_module = (swig_module_info *) vptr;
-#endif
-  swig_type_info **types = swig_module->types;
-  size_t i;
-  for (i =0; i < swig_module->size; ++i) {
-    swig_type_info *ty = types[i];
-    if (ty->owndata) {
-      SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
-      if (data) SwigPyClientData_Del(data);
-    }
-  }
-  Py_DECREF(SWIG_This());
-  swig_this = NULL;
-}
-
-SWIGRUNTIME void
-SWIG_Python_SetModule(swig_module_info *swig_module) {
-#if PY_VERSION_HEX >= 0x03000000
- /* Add a dummy module object into sys.modules */
-  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
-#else
-  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
-#endif
-#ifdef SWIGPY_USE_CAPSULE
-  PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-#else
-  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-#endif
-}
-
-/* The python cached type query */
-SWIGRUNTIME PyObject *
-SWIG_Python_TypeCache(void) {
-  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
-  return cache;
-}
-
-SWIGRUNTIME swig_type_info *
-SWIG_Python_TypeQuery(const char *type)
-{
-  PyObject *cache = SWIG_Python_TypeCache();
-  PyObject *key = SWIG_Python_str_FromChar(type); 
-  PyObject *obj = PyDict_GetItem(cache, key);
-  swig_type_info *descriptor;
-  if (obj) {
-#ifdef SWIGPY_USE_CAPSULE
-    descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
-#else
-    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-#endif
-  } else {
-    swig_module_info *swig_module = SWIG_GetModule(0);
-    descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
-    if (descriptor) {
-#ifdef SWIGPY_USE_CAPSULE
-      obj = PyCapsule_New((void*) descriptor, NULL, NULL);
-#else
-      obj = PyCObject_FromVoidPtr(descriptor, NULL);
-#endif
-      PyDict_SetItem(cache, key, obj);
-      Py_DECREF(obj);
-    }
-  }
-  Py_DECREF(key);
-  return descriptor;
-}
-
-/* 
-   For backward compatibility only
-*/
-#define SWIG_POINTER_EXCEPTION  0
-#define SWIG_arg_fail(arg)      SWIG_Python_ArgFail(arg)
-#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
-
-SWIGRUNTIME int
-SWIG_Python_AddErrMesg(const char* mesg, int infront)
-{  
-  if (PyErr_Occurred()) {
-    PyObject *type = 0;
-    PyObject *value = 0;
-    PyObject *traceback = 0;
-    PyErr_Fetch(&type, &value, &traceback);
-    if (value) {
-      char *tmp;
-      PyObject *old_str = PyObject_Str(value);
-      Py_XINCREF(type);
-      PyErr_Clear();
-      if (infront) {
-	PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
-      } else {
-	PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
-      }
-      SWIG_Python_str_DelForPy3(tmp);
-      Py_DECREF(old_str);
-    }
-    return 1;
-  } else {
-    return 0;
-  }
-}
-  
-SWIGRUNTIME int
-SWIG_Python_ArgFail(int argnum)
-{
-  if (PyErr_Occurred()) {
-    /* add information about failing argument */
-    char mesg[256];
-    PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum);
-    return SWIG_Python_AddErrMesg(mesg, 1);
-  } else {
-    return 0;
-  }
-}
-
-SWIGRUNTIMEINLINE const char *
-SwigPyObject_GetDesc(PyObject *self)
-{
-  SwigPyObject *v = (SwigPyObject *)self;
-  swig_type_info *ty = v ? v->ty : 0;
-  return ty ? ty->str : "";
-}
-
-SWIGRUNTIME void
-SWIG_Python_TypeError(const char *type, PyObject *obj)
-{
-  if (type) {
-#if defined(SWIG_COBJECT_TYPES)
-    if (obj && SwigPyObject_Check(obj)) {
-      const char *otype = (const char *) SwigPyObject_GetDesc(obj);
-      if (otype) {
-	PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received",
-		     type, otype);
-	return;
-      }
-    } else 
-#endif      
-    {
-      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
-      if (otype) {
-	PyObject *str = PyObject_Str(obj);
-	const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0;
-	if (cstr) {
-	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
-		       type, otype, cstr);
-          SWIG_Python_str_DelForPy3(cstr);
-	} else {
-	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
-		       type, otype);
-	}
-	Py_XDECREF(str);
-	return;
-      }
-    }   
-    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
-  } else {
-    PyErr_Format(PyExc_TypeError, "unexpected type is received");
-  }
-}
-
-
-/* Convert a pointer value, signal an exception on a type mismatch */
-SWIGRUNTIME void *
-SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(argnum), int flags) {
-  void *result;
-  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
-    PyErr_Clear();
-#if SWIG_POINTER_EXCEPTION
-    if (flags) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
-      SWIG_Python_ArgFail(argnum);
-    }
-#endif
-  }
-  return result;
-}
-
-#ifdef SWIGPYTHON_BUILTIN
-SWIGRUNTIME int
-SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
-  PyTypeObject *tp = obj->ob_type;
-  PyObject *descr;
-  PyObject *encoded_name;
-  descrsetfunc f;
-  int res = -1;
-
-# ifdef Py_USING_UNICODE
-  if (PyString_Check(name)) {
-    name = PyUnicode_Decode(PyString_AsString(name), PyString_Size(name), NULL, NULL);
-    if (!name)
-      return -1;
-  } else if (!PyUnicode_Check(name))
-# else
-  if (!PyString_Check(name))
-# endif
-  {
-    PyErr_Format(PyExc_TypeError, "attribute name must be string, not '%.200s'", name->ob_type->tp_name);
-    return -1;
-  } else {
-    Py_INCREF(name);
-  }
-
-  if (!tp->tp_dict) {
-    if (PyType_Ready(tp) < 0)
-      goto done;
-  }
-
-  descr = _PyType_Lookup(tp, name);
-  f = NULL;
-  if (descr != NULL)
-    f = descr->ob_type->tp_descr_set;
-  if (!f) {
-    if (PyString_Check(name)) {
-      encoded_name = name;
-      Py_INCREF(name);
-    } else {
-      encoded_name = PyUnicode_AsUTF8String(name);
-    }
-    PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
-    Py_DECREF(encoded_name);
-  } else {
-    res = f(descr, obj, value);
-  }
-  
-  done:
-  Py_DECREF(name);
-  return res;
-}
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/pyruntime.swg b/dependencies2013/win32/swig/Lib/python/pyruntime.swg
deleted file mode 100644
index fad97be9..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyruntime.swg
+++ /dev/null
@@ -1,22 +0,0 @@
-%insert(runtime) %{
-#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
-/* Use debug wrappers with the Python release dll */
-# undef _DEBUG
-# include <Python.h>
-# define _DEBUG
-#else
-# include <Python.h>
-#endif
-%}
-
-%insert(runtime) "swigrun.swg";         /* SWIG API */
-%insert(runtime) "swigerrors.swg";      /* SWIG errors */   
-%insert(runtime) "pyhead.swg";          /* Python includes and fixes */
-%insert(runtime) "pyerrors.swg";        /* Python errors */
-%insert(runtime) "pythreads.swg";       /* Python thread code */
-%insert(runtime) "pyapi.swg";           /* Python API */
-%insert(runtime) "pyrun.swg";           /* Python run-time code */
-
-#if defined(SWIGPYTHON_BUILTIN)
-%insert(runtime) "builtin.swg";		/* Specialization for classes with single inheritance */
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/pystdcommon.swg b/dependencies2013/win32/swig/Lib/python/pystdcommon.swg
deleted file mode 100644
index 8372426a..00000000
--- a/dependencies2013/win32/swig/Lib/python/pystdcommon.swg
+++ /dev/null
@@ -1,261 +0,0 @@
-%fragment("StdTraits","header",fragment="StdTraitsCommon")
-{
-namespace swig {  
-  /*
-    Traits that provides the from method
-  */
-  template <class Type> struct traits_from_ptr {
-    static PyObject *from(Type *val, int owner = 0) {
-      return SWIG_InternalNewPointerObj(val, type_info<Type>(), owner);
-    }
-  };
-
-  template <class Type> struct traits_from {
-    static PyObject *from(const Type& val) {
-      return traits_from_ptr<Type>::from(new Type(val), 1);
-    }
-  };
-
-  template <class Type> struct traits_from<Type *> {
-    static PyObject *from(Type* val) {
-      return traits_from_ptr<Type>::from(val, 0);
-    }
-  };
-
-  template <class Type> struct traits_from<const Type *> {
-    static PyObject *from(const Type* val) {
-      return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0);
-    }
-  };
-
-
-  template <class Type>
-  inline PyObject *from(const Type& val) {
-    return traits_from<Type>::from(val);
-  }
-
-  template <class Type>
-  inline PyObject *from_ptr(Type* val, int owner) {
-    return traits_from_ptr<Type>::from(val, owner);
-  }
-
-  /*
-    Traits that provides the asval/as/check method
-  */
-  template <class Type>
-  struct traits_asptr {   
-    static int asptr(PyObject *obj, Type **val) {
-      Type *p;
-      swig_type_info *descriptor = type_info<Type>();
-      int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-      if (SWIG_IsOK(res)) {
-	if (val) *val = p;
-      }
-      return res;
-    }
-  }; 
-
-  template <class Type>
-  inline int asptr(PyObject *obj, Type **vptr) {
-    return traits_asptr<Type>::asptr(obj, vptr);
-  }
-
-  template <class Type> 
-  struct traits_asval {
-    static int asval(PyObject *obj, Type *val) {
-      if (val) {
-	Type *p = 0;
-	int res = traits_asptr<Type>::asptr(obj, &p);
-	if (!SWIG_IsOK(res)) return res;	
-	if (p) {
-	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
-	  *(const_cast<noconst_type*>(val)) = *p;
-	  if (SWIG_IsNewObj(res)){
-	    %delete(p);
-	    res = SWIG_DelNewMask(res);
-	  }
-	  return res;
-	} else {
-	  return SWIG_ERROR;
-	}
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-
-  template <class Type> struct traits_asval<Type*> {
-    static int asval(PyObject *obj, Type **val) {
-      if (val) {
-        typedef typename noconst_traits<Type>::noconst_type noconst_type;
-        noconst_type *p = 0;
-        int res = traits_asptr<noconst_type>::asptr(obj,  &p);
-        if (SWIG_IsOK(res)) {
-          *(const_cast<noconst_type**>(val)) = p;
-	}
-	return res;
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-  
-  template <class Type>
-  inline int asval(PyObject *obj, Type *val) {
-    return traits_asval<Type>::asval(obj, val);
-  }
-
-  template <class Type> 
-  struct traits_as<Type, value_category> {
-    static Type as(PyObject *obj, bool throw_error) {
-      Type v;
-      int res = asval(obj, &v);
-      if (!obj || !SWIG_IsOK(res)) {
-	if (!PyErr_Occurred()) {
-	  ::%type_error(swig::type_name<Type>());
-	}
-	if (throw_error) throw std::invalid_argument("bad type");
-      }
-      return v;
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type, pointer_category> {
-    static Type as(PyObject *obj, bool throw_error) {
-      Type *v = 0;      
-      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
-      if (SWIG_IsOK(res) && v) {
-	if (SWIG_IsNewObj(res)) {
-	  Type r(*v);
-	  %delete(v);
-	  return r;
-	} else {
-	  return *v;
-	}
-      } else {
-	// Uninitialized return value, no Type() constructor required.
-	static Type *v_def = (Type*) malloc(sizeof(Type));
-	if (!PyErr_Occurred()) {
-	  %type_error(swig::type_name<Type>());
-	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
-      }
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type*, pointer_category> {
-    static Type* as(PyObject *obj, bool throw_error) {
-      Type *v = 0;      
-      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
-      if (SWIG_IsOK(res)) {
-	return v;
-      } else {
-	if (!PyErr_Occurred()) {
-	  %type_error(swig::type_name<Type>());
-	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	return 0;
-      }
-    }
-  };
-    
-  template <class Type>
-  inline Type as(PyObject *obj, bool te = false) {
-    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
-  }
-
-  template <class Type> 
-  struct traits_check<Type, value_category> {
-    static bool check(PyObject *obj) {
-      int res = obj ? asval(obj, (Type *)(0)) : SWIG_ERROR;
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type> 
-  struct traits_check<Type, pointer_category> {
-    static bool check(PyObject *obj) {
-      int res = obj ? asptr(obj, (Type **)(0)) : SWIG_ERROR;
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type>
-  inline bool check(PyObject *obj) {
-    return traits_check<Type, typename traits<Type>::category>::check(obj);
-  }
-}
-}
-
-//
-// Backward compatibility
-//
-
-#ifdef SWIG_PYTHON_BACKWARD_COMP
-%fragment("<string>");
-%{
-PyObject* SwigInt_FromBool(bool b) {
-    return PyInt_FromLong(b ? 1L : 0L);
-}
-double SwigNumber_Check(PyObject* o) {
-    return PyFloat_Check(o) || PyInt_Check(o) || PyLong_Check(o);
-}
-double SwigNumber_AsDouble(PyObject* o) {
-    return PyFloat_Check(o) ? PyFloat_AsDouble(o)
-        : (PyInt_Check(o) ?   double(PyInt_AsLong(o))
-                            : double(PyLong_AsLong(o)));
-}
-PyObject* SwigString_FromString(const std::string& s) {
-    return PyString_FromStringAndSize(s.data(),s.size());
-}
-std::string SwigString_AsString(PyObject* o) {
-    return std::string(PyString_AsString(o));
-}
-%}
-
-#endif
-
-
-%define %specialize_std_container(Type,Check,As,From)
-%{
-namespace swig {
-  template <>  struct traits_asval<Type > {   
-    typedef Type value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      if (Check(obj)) {
-	if (val) *val = As(obj);
-	return SWIG_OK;
-      }
-      return SWIG_ERROR;
-    }
-  };
-  template <>  struct traits_from<Type > {
-    typedef Type value_type;
-    static PyObject *from(const value_type& val) {
-      return From(val);
-    }
-  };
-
-  template <> 
-  struct traits_check<Type, value_category> {
-    static int check(PyObject *obj) {
-      int res = Check(obj);
-      return obj && res ? res : 0;
-    }
-  };
-}
-%}
-%enddef
-
-
-#define specialize_std_vector(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_list(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_deque(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_set(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_multiset(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_unordered_set(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_unordered_multiset(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
diff --git a/dependencies2013/win32/swig/Lib/python/pystrings.swg b/dependencies2013/win32/swig/Lib/python/pystrings.swg
deleted file mode 100644
index fd37855e..00000000
--- a/dependencies2013/win32/swig/Lib/python/pystrings.swg
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ------------------------------------------------------------
- *  utility methods for char strings 
- * ------------------------------------------------------------ */
-%fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
-{
-%#if PY_VERSION_HEX>=0x03000000
-%#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-  if (PyBytes_Check(obj))
-%#else
-  if (PyUnicode_Check(obj))
-%#endif
-%#else  
-  if (PyString_Check(obj))
-%#endif
-  {
-    char *cstr; Py_ssize_t len;
-%#if PY_VERSION_HEX>=0x03000000
-%#if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-    if (!alloc && cptr) {
-        /* We can't allow converting without allocation, since the internal
-           representation of string in Python 3 is UCS-2/UCS-4 but we require
-           a UTF-8 representation.
-           TODO(bhy) More detailed explanation */
-        return SWIG_RuntimeError;
-    }
-    obj = PyUnicode_AsUTF8String(obj);
-    if(alloc) *alloc = SWIG_NEWOBJ;
-%#endif
-    PyBytes_AsStringAndSize(obj, &cstr, &len);
-%#else
-    PyString_AsStringAndSize(obj, &cstr, &len);
-%#endif
-    if (cptr) {
-      if (alloc) {
-	/* 
-	   In python the user should not be able to modify the inner
-	   string representation. To warranty that, if you define
-	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-	   buffer is always returned.
-
-	   The default behavior is just to return the pointer value,
-	   so, be careful.
-	*/ 
-%#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-	if (*alloc != SWIG_OLDOBJ) 
-%#else
-	if (*alloc == SWIG_NEWOBJ) 
-%#endif
-	{
-	  *cptr = %new_copy_array(cstr, len + 1, char);
-	  *alloc = SWIG_NEWOBJ;
-	} else {
-	  *cptr = cstr;
-	  *alloc = SWIG_OLDOBJ;
-	}
-      } else {
-%#if PY_VERSION_HEX>=0x03000000
-%#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-	*cptr = PyBytes_AsString(obj);
-%#else
-	assert(0); /* Should never reach here with Unicode strings in Python 3 */
-%#endif
-%#else
-	*cptr = SWIG_Python_str_AsChar(obj);
-%#endif
-      }
-    }
-    if (psize) *psize = len + 1;
-%#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-    Py_XDECREF(obj);
-%#endif
-    return SWIG_OK;
-  } else {
-%#if defined(SWIG_PYTHON_2_UNICODE)
-%#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-%#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once"
-%#endif
-%#if PY_VERSION_HEX<0x03000000
-    if (PyUnicode_Check(obj)) {
-      char *cstr; Py_ssize_t len;
-      if (!alloc && cptr) {
-        return SWIG_RuntimeError;
-      }
-      obj = PyUnicode_AsUTF8String(obj);
-      if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
-        if (cptr) {
-          if (alloc) *alloc = SWIG_NEWOBJ;
-          *cptr = %new_copy_array(cstr, len + 1, char);
-        }
-        if (psize) *psize = len + 1;
-
-        Py_XDECREF(obj);
-        return SWIG_OK;
-      } else {
-        Py_XDECREF(obj);
-      }
-    }
-%#endif
-%#endif
-
-    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-    if (pchar_descriptor) {
-      void* vptr = 0;
-      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = (char *) vptr;
-	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-	if (alloc) *alloc = SWIG_OLDOBJ;
-	return SWIG_OK;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERNINLINE PyObject *
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  if (carray) {
-    if (size > INT_MAX) {
-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      return pchar_descriptor ? 
-	SWIG_InternalNewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void();
-    } else {
-%#if PY_VERSION_HEX >= 0x03000000
-%#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-      return PyBytes_FromStringAndSize(carray, %numeric_cast(size, Py_ssize_t));
-%#else
-%#if PY_VERSION_HEX >= 0x03010000
-      return PyUnicode_DecodeUTF8(carray, %numeric_cast(size, Py_ssize_t), "surrogateescape");
-%#else
-      return PyUnicode_FromStringAndSize(carray, %numeric_cast(size, Py_ssize_t));
-%#endif
-%#endif
-%#else
-      return PyString_FromStringAndSize(carray, %numeric_cast(size, Py_ssize_t));
-%#endif
-    }
-  } else {
-    return SWIG_Py_Void();
-  }
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/python/python.swg b/dependencies2013/win32/swig/Lib/python/python.swg
deleted file mode 100644
index 769d9e10..00000000
--- a/dependencies2013/win32/swig/Lib/python/python.swg
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ------------------------------------------------------------
- * python.swg
- *
- * Python configuration module.
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Inner macros
- * ------------------------------------------------------------ */
-%include <pymacros.swg>
-
-
-/* ------------------------------------------------------------
- *  The runtime part
- * ------------------------------------------------------------ */
-%include <pyruntime.swg>
-
-/* ------------------------------------------------------------
- *  Special user directives
- * ------------------------------------------------------------ */
-%include <pyuserdir.swg>
-
-/* ------------------------------------------------------------
- *  Typemap specializations
- * ------------------------------------------------------------ */
-%include <pytypemaps.swg>
-
-/* ------------------------------------------------------------
- *  Overloaded operator support
- * ------------------------------------------------------------ */
-%include <pyopers.swg>
-
-/* ------------------------------------------------------------
- * Warnings for Python keywords 
- * ------------------------------------------------------------ */
-%include <pythonkw.swg>
-
-/* ------------------------------------------------------------
- * The Python autodoc support
- * ------------------------------------------------------------ */
-%include <pydocs.swg>
-
-/* ------------------------------------------------------------
- * The Python classes, for C++
- * ------------------------------------------------------------ */
-%include <pyclasses.swg>
-
-/* ------------------------------------------------------------
- * The Python initialization function 
- * ------------------------------------------------------------ */
-%include <pyinit.swg>
-
-
-/* ------------------------------------------------------------
- * For backward compatibility
- * ------------------------------------------------------------ */
-%include <pybackward.swg>
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/pythonkw.swg b/dependencies2013/win32/swig/Lib/python/pythonkw.swg
deleted file mode 100644
index 1a4329d2..00000000
--- a/dependencies2013/win32/swig/Lib/python/pythonkw.swg
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-  Warnings for Python keywords, built-in names and bad names.
-*/
-
-#define PYTHONKW(x) %keywordwarn("'" `x` "' is a python keyword, renaming to '_" `x` "'", rename="_%s")  `x`
-#define PYTHONBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in python")  `x`
-
-
-/*
-  Warnings for Python keywords 
-  https://docs.python.org/2/reference/lexical_analysis.html#keywords
-*/
-
-PYTHONKW(and);
-PYTHONKW(as);
-PYTHONKW(assert);
-PYTHONKW(break);
-PYTHONKW(class);
-PYTHONKW(continue);
-PYTHONKW(def);
-PYTHONKW(del);
-PYTHONKW(elif);
-PYTHONKW(else);
-PYTHONKW(except);
-PYTHONKW(exec);
-PYTHONKW(finally);
-PYTHONKW(for);
-PYTHONKW(from);
-PYTHONKW(global);
-PYTHONKW(if);
-PYTHONKW(import);
-PYTHONKW(in);
-PYTHONKW(is);
-PYTHONKW(lambda);
-PYTHONKW(not);
-PYTHONKW(or);
-PYTHONKW(pass);
-PYTHONKW(print);
-PYTHONKW(raise);
-PYTHONKW(return);
-PYTHONKW(try);
-PYTHONKW(while);
-PYTHONKW(with);
-PYTHONKW(yield);
-
-/*
-  built-in functions
-  https://docs.python.org/2/library/functions.html
- */ 
-
-PYTHONBN(abs);
-PYTHONBN(apply);
-PYTHONBN(bool);
-PYTHONBN(buffer);
-PYTHONBN(callable);
-PYTHONBN(chr);
-PYTHONBN(classmethod);
-PYTHONBN(cmp);
-PYTHONBN(coerce);
-PYTHONBN(compile);
-PYTHONBN(complex);
-PYTHONBN(delattr);
-PYTHONBN(dict);
-PYTHONBN(dir);
-PYTHONBN(divmod);
-PYTHONBN(enumerate);
-PYTHONBN(eval);
-PYTHONBN(execfile);
-PYTHONBN(file);
-PYTHONBN(filter);
-PYTHONBN(float);
-PYTHONBN(frozenset);
-PYTHONBN(getattr);
-PYTHONBN(globals);
-PYTHONBN(hasattr);
-PYTHONBN(hash);
-PYTHONBN(hex);
-PYTHONBN(id);
-PYTHONBN(input);
-PYTHONBN(int);
-PYTHONBN(intern);
-PYTHONBN(isinstance);
-PYTHONBN(issubclass);
-PYTHONBN(iter);
-PYTHONBN(len);
-PYTHONBN(list);
-PYTHONBN(locals);
-PYTHONBN(long);
-PYTHONBN(map);
-PYTHONBN(max);
-PYTHONBN(min);
-PYTHONBN(object);
-PYTHONBN(oct);
-PYTHONBN(open);
-PYTHONBN(ord);
-PYTHONBN(pow);
-PYTHONBN(property);
-PYTHONBN(range);
-PYTHONBN(raw_input);
-PYTHONBN(reduce);
-PYTHONBN(reload);
-PYTHONBN(repr);
-PYTHONBN(reversed);
-PYTHONBN(round);
-PYTHONBN(set);
-PYTHONBN(setattr);
-PYTHONBN(slice);
-PYTHONBN(sorted);
-PYTHONBN(staticmethod);
-PYTHONBN(str);
-PYTHONBN(sum);
-PYTHONBN(super);
-PYTHONBN(tuple);
-PYTHONBN(type);
-PYTHONBN(unichr);
-PYTHONBN(unicode);
-PYTHONBN(vars);
-PYTHONBN(xrange);
-PYTHONBN(zip);
-
-
-/* 
-   built-in names
-   boolean type and None
-*/
-PYTHONBN(True);
-PYTHONBN(False);
-
-PYTHONKW(None);
-
-
-/* 
-   'self' is also a bad Name
-*/
-PYTHONKW(self);
-
-#undef PYTHONBN
-#undef PYTHONKW
diff --git a/dependencies2013/win32/swig/Lib/python/pythreads.swg b/dependencies2013/win32/swig/Lib/python/pythreads.swg
deleted file mode 100644
index a7552f1f..00000000
--- a/dependencies2013/win32/swig/Lib/python/pythreads.swg
+++ /dev/null
@@ -1,66 +0,0 @@
-#if defined(SWIG_PYTHON_NO_THREADS)
-#  if defined(SWIG_PYTHON_THREADS)
-#    undef SWIG_PYTHON_THREADS
-#  endif
-#endif
-#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
-#  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
-#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
-#      define SWIG_PYTHON_USE_GIL
-#    endif
-#  endif
-#  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
-#    ifndef SWIG_PYTHON_INITIALIZE_THREADS
-#     define SWIG_PYTHON_INITIALIZE_THREADS  PyEval_InitThreads() 
-#    endif
-#    ifdef __cplusplus /* C++ code */
-       class SWIG_Python_Thread_Block {
-         bool status;
-         PyGILState_STATE state;
-       public:
-         void end() { if (status) { PyGILState_Release(state); status = false;} }
-         SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {}
-         ~SWIG_Python_Thread_Block() { end(); }
-       };
-       class SWIG_Python_Thread_Allow {
-         bool status;
-         PyThreadState *save;
-       public:
-         void end() { if (status) { PyEval_RestoreThread(save); status = false; }}
-         SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {}
-         ~SWIG_Python_Thread_Allow() { end(); }
-       };
-#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   SWIG_Python_Thread_Block _swig_thread_block
-#      define SWIG_PYTHON_THREAD_END_BLOCK     _swig_thread_block.end()
-#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   SWIG_Python_Thread_Allow _swig_thread_allow
-#      define SWIG_PYTHON_THREAD_END_ALLOW     _swig_thread_allow.end()
-#    else /* C code */
-#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   PyGILState_STATE _swig_thread_block = PyGILState_Ensure()
-#      define SWIG_PYTHON_THREAD_END_BLOCK     PyGILState_Release(_swig_thread_block)
-#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   PyThreadState *_swig_thread_allow = PyEval_SaveThread()
-#      define SWIG_PYTHON_THREAD_END_ALLOW     PyEval_RestoreThread(_swig_thread_allow)
-#    endif
-#  else /* Old thread way, not implemented, user must provide it */
-#    if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
-#      define SWIG_PYTHON_INITIALIZE_THREADS
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK)
-#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_END_BLOCK)
-#      define SWIG_PYTHON_THREAD_END_BLOCK
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW)
-#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_END_ALLOW)
-#      define SWIG_PYTHON_THREAD_END_ALLOW
-#    endif
-#  endif
-#else /* No thread support */
-#  define SWIG_PYTHON_INITIALIZE_THREADS
-#  define SWIG_PYTHON_THREAD_BEGIN_BLOCK
-#  define SWIG_PYTHON_THREAD_END_BLOCK
-#  define SWIG_PYTHON_THREAD_BEGIN_ALLOW
-#  define SWIG_PYTHON_THREAD_END_ALLOW
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/pytuplehlp.swg b/dependencies2013/win32/swig/Lib/python/pytuplehlp.swg
deleted file mode 100644
index 32e15803..00000000
--- a/dependencies2013/win32/swig/Lib/python/pytuplehlp.swg
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-  Helper function to return output types, now we need to use a list
-  instead of a tuple since all the other types
-  (std::pair,std::vector,std::list,etc) return tuples.
-*/
-
-#warning "Deprecated file: Don't use t_output_helper anymore,"
-#warning "use SWIG_Python_AppendOutput  or %append_output instead."
diff --git a/dependencies2013/win32/swig/Lib/python/pytypemaps.swg b/dependencies2013/win32/swig/Lib/python/pytypemaps.swg
deleted file mode 100644
index 48b0bcdc..00000000
--- a/dependencies2013/win32/swig/Lib/python/pytypemaps.swg
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ------------------------------------------------------------
- *  Typemap specializations for Python
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Fragment section
- * ------------------------------------------------------------ */
-#ifdef SWIG_PYTHON_LEGACY_BOOL
-// Default prior to SWIG 3.0.0
-#undef SWIG_TYPECHECK_BOOL
-%define SWIG_TYPECHECK_BOOL             10000 %enddef
-#endif
-
-/* Include fundamental fragment definitions */
-%include <typemaps/fragments.swg>
-
-/* Look for user fragments file. */
-%include <pyfragments.swg>
-
-/* Python fragments for fundamental types */
-%include <pyprimtypes.swg>
-
-/* Python fragments for char* strings */
-%include <pystrings.swg>
-
-/* Backward compatibility output helper */
-%fragment("t_output_helper","header") %{
-#define t_output_helper SWIG_Python_AppendOutput
-%}
-
-
-/* ------------------------------------------------------------
- *  Unified typemap section
- * ------------------------------------------------------------ */
-
-/* directors are supported in Python */
-#ifndef SWIG_DIRECTOR_TYPEMAPS
-#define SWIG_DIRECTOR_TYPEMAPS
-#endif
-
-
-/* Python types */
-#define SWIG_Object                     PyObject *
-#define VOID_Object                     SWIG_Py_Void()
-
-/* Python allows implicit conversion */
-#define %implicitconv_flag              $implicitconv 
-
-
-/* Overload of the output/constant/exception/dirout handling */
-
-/* append output */
-#define SWIG_AppendOutput(result, obj)  SWIG_Python_AppendOutput(result, obj)
-
-/* set constant */
-#if defined(SWIGPYTHON_BUILTIN)
-#define SWIG_SetConstant(name, obj) SWIG_Python_SetConstant(d, d == md ? public_interface : NULL, name,obj) 
-#else
-#define SWIG_SetConstant(name, obj) SWIG_Python_SetConstant(d, name,obj) 
-#endif
-
-/* raise */
-#define SWIG_Raise(obj, type, desc)     SWIG_Python_Raise(obj, type, desc)
-
-/* Include the unified typemap library */
-%include <typemaps/swigtypemaps.swg>
-
-
-/*  ------------------------------------------------------------
- *  Python extra typemaps / typemap overrides
- * ------------------------------------------------------------ */
-
-/* Get the address of the 'python self' object */
-
-%typemap(in,numinputs=0,noblock=1) PyObject **PYTHON_SELF {
-  $1 = &$self;
-}
-
-
-/* Consttab, needed for callbacks, it should be removed later */
-
-%typemap(consttab) SWIGTYPE ((*)(ANY))
-{ SWIG_PY_POINTER, (char*)"$symname", 0, 0, (void *)($value), &$descriptor }
-%typemap(consttab) SWIGTYPE ((* const)(ANY)) = SWIGTYPE ((*)(ANY));
-
-%typemap(constcode) SWIGTYPE ((*)(ANY)) "";
-%typemap(constcode) SWIGTYPE ((* const)(ANY)) = SWIGTYPE ((*)(ANY));
-
-
-/* Smart Pointers */
-%typemap(out,noblock=1) const SWIGTYPE & SMARTPOINTER  {
-  $result = SWIG_NewPointerObj(%new_copy(*$1, $*ltype), $descriptor, SWIG_POINTER_OWN | %newpointer_flags);
-}
-
-%typemap(ret,noblock=1) const SWIGTYPE & SMARTPOINTER, SWIGTYPE SMARTPOINTER {
-  if ($result) {
-    PyObject *robj = PyObject_CallMethod($result, (char *)"__deref__", NULL);
-    if (robj && !PyErr_Occurred()) {
-      SwigPyObject_append((PyObject *) SWIG_Python_GetSwigThis($result), 
-			  (PyObject *) SWIG_Python_GetSwigThis(robj));
-      Py_DECREF(robj);
-    }
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Lib/python/pyuserdir.swg b/dependencies2013/win32/swig/Lib/python/pyuserdir.swg
deleted file mode 100644
index 00aec07d..00000000
--- a/dependencies2013/win32/swig/Lib/python/pyuserdir.swg
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -------------------------------------------------------------------------
- *  Special user directives
- * ------------------------------------------------------------------------- */
-
-/* ------------------------------------------------------------------------- */
-
-/* shadow code */
-#define %shadow      %insert("shadow")
-#define %pythoncode  %insert("python")
-#define %pythonbegin %insert("pythonbegin")
-
-
-/* ------------------------------------------------------------------------- */
-/* 
-Use the "nondynamic" feature to make a wrapped class behave as a "nondynamic"
-one, ie, a python class that doesn't dynamically add new attributes.
-
-For example, for the class
-
-%pythonnondynamic A;
-struct A
-{
-  int a;
-  int b;
-};
-
-you will get:
-
- aa = A()
- aa.a = 1  # Ok
- aa.b = 1  # Ok
- aa.c = 3  # error
-
-Since nondynamic is a feature, if you use it like
-
- %pythonnondynamic;
-
-it will make all the wrapped classes nondynamic ones.
-
-The implementation is based on this recipe:
-
-   http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252158
-
-and works for modern (-modern) and plain python. We do not use __slots__, 
-so, it works with old python versions.
-
-*/
-
-#define %pythonnondynamic      %feature("python:nondynamic", "1")
-#define %nopythonnondynamic    %feature("python:nondynamic", "0")
-#define %clearpythonnondynamic %feature("python:nondynamic", "")
-#define %pythondynamic         %nopythonnondynamic
-
-
-/* ------------------------------------------------------------------------- */
-/*
-
-Use %pythonmaybecall to flag a method like __add__ or __radd__.  These
-don't produce an error when called, they just return NotImplemented.
-
-These methods "may be called" if needed.
-
-*/
-
-#define %pythonmaybecall      %feature("python:maybecall", "1") 
-#define %nopythonmaybecall    %feature("python:maybecall", "0")
-#define %clearpythonmaybecall %feature("python:maybecall", "")
-
-/* ------------------------------------------------------------------------- */
-/*
-  The %pythoncallback feature produce a more natural callback wrapper
-  than the %callback mechanism, ie, it uses the original name for
-  the callback and callable objects. 
-
-  Just use it as
-
-    %pythoncallback(1) foo;
-    int foo(int a);
-
-    %pythoncallback(1) A::foo;
-    struct A {
-     static int foo(int a);
-    };
-
-    int bar(int, int (*pf)(int));
-
-  then, you can use it as:
-
-   a = foo(1)
-   b = bar(2, foo)
-
-   c = A.foo(3)
-   d = bar(4, A.foo)
-
-
-   If you use it with a member method
-   %pythoncallback(1) A::foom;
-   struct A {
-      int foom(int a);
-   };
-
-   then you can use it as
-
-     r = a.foom(3)             # eval the method
-     mptr = A.foom_cb_ptr      # returns the callback pointer
-
-   where the '_cb_ptr' suffix is added for the callback pointer.
-
-*/
-
-#define %pythoncallback      %feature("python:callback")
-#define %nopythoncallback    %feature("python:callback","0")
-#define %clearpythoncallback %feature("python:callback","")
-
-/* ------------------------------------------------------------------------- */
-/*
-  Support for the old %callback directive name
-*/
-#ifdef %callback
-#undef %callback
-#endif
-
-#ifdef %nocallback
-#undef %nocallback
-#endif
-
-#ifdef %clearcallback
-#undef %clearcallback
-#endif
-
-#define %callback(x)     %feature("python:callback",`x`)
-#define %nocallback      %nopythoncallback
-#define %clearcallback   %clearpythoncallback
-
-/* ------------------------------------------------------------------------- */
-/*
-  Thread support - Advance control
-  
-*/
-
-#define %nothread           %feature("nothread")
-#define %thread             %feature("nothread","0")
-#define %clearnothread      %feature("nothread","")
-
-#define %nothreadblock      %feature("nothreadblock")
-#define %threadblock        %feature("nothreadblock","0")
-#define %clearnothreadblock %feature("nothreadblock","")
-
-#define %nothreadallow      %feature("nothreadallow")
-#define %threadallow        %feature("nothreadallow","0")
-#define %clearnothreadallow %feature("nothreadallow","")
-
-
-/* ------------------------------------------------------------------------- */
-/*
-  Implicit Conversion using the C++ constructor mechanism
-*/
-
-#define %implicitconv      %feature("implicitconv") 
-#define %noimplicitconv    %feature("implicitconv", "0")
-#define %clearimplicitconv %feature("implicitconv", "")
-
-
-/* ------------------------------------------------------------------------- */
-/*
-  Enable keywords paramaters
-*/
-
-#define %kwargs      %feature("kwargs") 
-#define %nokwargs    %feature("kwargs", "0")
-#define %clearkwargs %feature("kwargs", "")
-
-/* ------------------------------------------------------------------------- */
-/*
-  Add python code to the proxy/shadow code 
-  
-   %pythonprepend   - Add code before the C++ function is called
-   %pythonappend    - Add code after the C++ function is called
-*/
-
-#define %pythonprepend       %feature("pythonprepend") 
-#define %clearpythonprepend  %feature("pythonprepend","")
-
-#define %pythonappend         %feature("pythonappend") 
-#define %clearpythonappend    %feature("pythonappend","")
-
-
-/* ------------------------------------------------------------------------- */
-/* 
-   %extend_smart_pointer extend the smart pointer support.
-
-   For example, if you have a smart pointer as:
-	    
-     template <class Type> class RCPtr {
-     public:
-       ...
-       RCPtr(Type *p);
-   	Type * operator->() const;
-   	...
-     };
-     
-   you use the %extend_smart_pointer directive as:
-   
-     %extend_smart_pointer(RCPtr<A>);
-     %template(RCPtr_A)  RCPtr<A>;
-   
-   then, if you have something like:
-
-     RCPtr<A> make_ptr();
-     int foo(A *);
-
-   you can do the following:
-
-     a = make_ptr();
-     b = foo(a);
-
-   ie, swig will accept a RCPtr<A> object where a 'A *' is
-   expected.
-
-   Also, when using vectors
-   
-     %extend_smart_pointer(RCPtr<A>);
-     %template(RCPtr_A) RCPtr<A>;
-     %template(vector_A) std::vector<RCPtr<A> >;
-   	
-   you can type
-
-     a = A();
-     v = vector_A(2)
-     v[0] = a
-
-   ie, an 'A *' object is accepted, via implicit conversion, 
-   where a RCPtr<A> object is expected. Additionally
-
-     x = v[0]
-
-   returns (and sets 'x' as) a copy of v[0], making reference
-   counting possible and consistent.
-*/
-
-%define %extend_smart_pointer(Type...)
-%implicitconv Type;
-%apply const SWIGTYPE& SMARTPOINTER { const Type& };
-%apply SWIGTYPE SMARTPOINTER { Type };
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/python/pywstrings.swg b/dependencies2013/win32/swig/Lib/python/pywstrings.swg
deleted file mode 100644
index e6461876..00000000
--- a/dependencies2013/win32/swig/Lib/python/pywstrings.swg
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ------------------------------------------------------------
- *  utility methods for wchar_t strings 
- * ------------------------------------------------------------ */
-
-%{
-#if PY_VERSION_HEX >= 0x03020000
-# define SWIGPY_UNICODE_ARG(obj) ((PyObject*) (obj))
-#else
-# define SWIGPY_UNICODE_ARG(obj) ((PyUnicodeObject*) (obj))
-#endif
-%}
-
-%fragment("SWIG_AsWCharPtrAndSize","header",fragment="<wchar.h>",fragment="SWIG_pwchar_descriptor") {
-SWIGINTERN int
-SWIG_AsWCharPtrAndSize(PyObject *obj, wchar_t **cptr, size_t *psize, int *alloc)
-{
-  PyObject *tmp = 0;
-  int isunicode = PyUnicode_Check(obj);
-%#if PY_VERSION_HEX < 0x03000000 && !defined(SWIG_PYTHON_STRICT_UNICODE_WCHAR)
-  if (!isunicode && PyString_Check(obj)) {
-    obj = tmp = PyUnicode_FromObject(obj);
-    isunicode = 1;
-  }
-%#endif
-  if (isunicode) {
-    Py_ssize_t len = PyUnicode_GetSize(obj);
-    if (cptr) {
-      *cptr = %new_array(len + 1, wchar_t);
-      PyUnicode_AsWideChar(SWIGPY_UNICODE_ARG(obj), *cptr, len);
-      (*cptr)[len] = 0;
-    }
-    if (psize) *psize = (size_t) len + 1;
-    if (alloc) *alloc = cptr ? SWIG_NEWOBJ : 0;
-    Py_XDECREF(tmp);
-    return SWIG_OK;
-  } else {
-    swig_type_info* pwchar_descriptor = SWIG_pwchar_descriptor();
-    if (pwchar_descriptor) {
-      void * vptr = 0;
-      if (SWIG_ConvertPtr(obj, &vptr, pwchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = (wchar_t *)vptr;
-	if (psize) *psize = vptr ? (wcslen((wchar_t *)vptr) + 1) : 0;
-	return SWIG_OK;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_FromWCharPtrAndSize","header",fragment="<wchar.h>",fragment="SWIG_pwchar_descriptor") {
-SWIGINTERNINLINE PyObject *
-SWIG_FromWCharPtrAndSize(const wchar_t * carray, size_t size)
-{
-  if (carray) {
-    if (size > INT_MAX) {
-      swig_type_info* pwchar_descriptor = SWIG_pwchar_descriptor();
-      return pwchar_descriptor ? 
-	SWIG_InternalNewPointerObj(%const_cast(carray,wchar_t *), pwchar_descriptor, 0) : SWIG_Py_Void();
-    } else {
-      return PyUnicode_FromWideChar(carray, %numeric_cast(size, Py_ssize_t));
-    }
-  } else {
-    return SWIG_Py_Void();
-  }
-}
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_alloc.i b/dependencies2013/win32/swig/Lib/python/std_alloc.i
deleted file mode 100644
index 35dc051b..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_alloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_alloc.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_array.i b/dependencies2013/win32/swig/Lib/python/std_array.i
deleted file mode 100644
index a3de3125..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_array.i
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-  std::array
-*/
-
-%fragment("StdArrayTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T, size_t N>
-    struct traits_asptr<std::array<T, N> >  {
-      static int asptr(PyObject *obj, std::array<T, N> **vec) {
-	return traits_asptr_stdseq<std::array<T, N> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T, size_t N>
-    struct traits_from<std::array<T, N> > {
-      static PyObject *from(const std::array<T, N>& vec) {
-	return traits_from_stdseq<std::array<T, N> >::from(vec);
-      }
-    };
-
-    template <class SwigPySeq, class T, size_t N>
-    inline void
-    assign(const SwigPySeq& swigpyseq, std::array<T, N>* seq) {
-      if (swigpyseq.size() < seq->size())
-        throw std::invalid_argument("std::array cannot be expanded in size");
-      else if (swigpyseq.size() > seq->size())
-        throw std::invalid_argument("std::array cannot be reduced in size");
-      std::copy(swigpyseq.begin(), swigpyseq.end(), seq->begin());
-    }
-
-    template <class T, size_t N>
-    inline void
-    erase(std::array<T, N>* SWIGUNUSEDPARM(seq), const typename std::array<T, N>::iterator& SWIGUNUSEDPARM(position)) {
-      throw std::invalid_argument("std::array object does not support item deletion");
-    }
-
-    // Only limited slicing is supported as std::array is fixed in size
-    template <class T, size_t N, class Difference>
-    inline std::array<T, N>*
-    getslice(const std::array<T, N>* self, Difference i, Difference j, Py_ssize_t step) {
-      typedef std::array<T, N> Sequence;
-      typename Sequence::size_type size = self->size();
-      Difference ii = 0;
-      Difference jj = 0;
-      swig::slice_adjust(i, j, step, size, ii, jj);
-
-      if (step == 1 && ii == 0 && static_cast<typename Sequence::size_type>(jj) == size) {
-        Sequence *sequence = new Sequence();
-        std::copy(self->begin(), self->end(), sequence->begin());
-        return sequence;
-      } else if (step == -1 && static_cast<typename Sequence::size_type>(ii) == (size - 1) && jj == -1) {
-        Sequence *sequence = new Sequence();
-        std::copy(self->rbegin(), self->rend(), sequence->begin());
-        return sequence;
-      } else {
-        throw std::invalid_argument("std::array object only supports getting a slice that is the size of the array");
-      }
-    }
-
-    template <class T, size_t N, class Difference, class InputSeq>
-    inline void
-    setslice(std::array<T, N>* self, Difference i, Difference j, Py_ssize_t step, const InputSeq& is = InputSeq()) {
-      typedef std::array<T, N> Sequence;
-      typename Sequence::size_type size = self->size();
-      Difference ii = 0;
-      Difference jj = 0;
-      swig::slice_adjust(i, j, step, size, ii, jj, true);
-
-      if (step == 1 && ii == 0 && static_cast<typename Sequence::size_type>(jj) == size) {
-        std::copy(is.begin(), is.end(), self->begin());
-      } else if (step == -1 && static_cast<typename Sequence::size_type>(ii) == (size - 1) && jj == -1) {
-        std::copy(is.rbegin(), is.rend(), self->begin());
-      } else {
-        throw std::invalid_argument("std::array object only supports setting a slice that is the size of the array");
-      }
-    }
-
-    template <class T, size_t N, class Difference>
-    inline void
-    delslice(std::array<T, N>* SWIGUNUSEDPARM(self), Difference SWIGUNUSEDPARM(i), Difference SWIGUNUSEDPARM(j), Py_ssize_t SWIGUNUSEDPARM(step)) {
-      throw std::invalid_argument("std::array object does not support item deletion");
-    }
-  }
-%}
-
-#define %swig_array_methods(Type...) %swig_sequence_methods_non_resizable(Type)
-#define %swig_array_methods_val(Type...) %swig_sequence_methods_non_resizable_val(Type);
-
-%include <std/std_array.i>
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_auto_ptr.i b/dependencies2013/win32/swig/Lib/python/std_auto_ptr.i
deleted file mode 100644
index e310e00c..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_auto_ptr.i
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-    The typemaps here allow to handle functions returning std::auto_ptr<>,
-    which is the most common use of this type. If you have functions taking it
-    as parameter, these typemaps can't be used for them and you need to do
-    something else (e.g. use shared_ptr<> which SWIG supports fully).
- */
-
-%define %auto_ptr(TYPE)
-%typemap (out) std::auto_ptr<TYPE > %{
-   %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
-%}
-%template() std::auto_ptr<TYPE >;
-%enddef
-
-namespace std {
-   template <class T> class auto_ptr {};
-} 
diff --git a/dependencies2013/win32/swig/Lib/python/std_basic_string.i b/dependencies2013/win32/swig/Lib/python/std_basic_string.i
deleted file mode 100644
index 7d3366db..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_basic_string.i
+++ /dev/null
@@ -1,103 +0,0 @@
-#if !defined(SWIG_STD_STRING) 
-#define SWIG_STD_BASIC_STRING
-
-%include <pycontainer.swg>
-
-#define %swig_basic_string(Type...)  %swig_sequence_methods_val(Type)
-
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header",
-	  fragment="SWIG_AsCharPtrAndSize") {
-SWIGINTERN int
-SWIG_AsPtr(std::basic_string<char>)(PyObject* obj, std::string **val)
-{
-  static swig_type_info* string_info = 
-    SWIG_TypeQuery("std::basic_string<char> *");
-  std::string *vptr;    
-  if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
-    if (val) *val = vptr;
-    return SWIG_OLDOBJ;
-  } else {
-    PyErr_Clear();
-    char* buf = 0 ; size_t size = 0; int alloc = 0;
-    if (SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) {
-      if (buf) {
-	if (val) *val = new std::string(buf, size - 1);
-	if (alloc == SWIG_NEWOBJ) %delete_array(buf);
-	return SWIG_NEWOBJ;
-      }
-    } else {
-      PyErr_Clear();
-    }  
-    if (val) {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      PyErr_SetString(PyExc_TypeError,"a string is expected");
-      SWIG_PYTHON_THREAD_END_BLOCK;
-    }
-    return 0;
-  }
-}  
-}
-
-%fragment(SWIG_From_frag(std::basic_string<char>),"header",
-	  fragment="SWIG_FromCharPtrAndSize") {
-SWIGINTERNINLINE PyObject*
-  SWIG_From(std::basic_string<char>)(const std::string& s)
-  {
-    return SWIG_FromCharPtrAndSize(s.data(), s.size());
-  }
-}
-
-%include <std/std_basic_string.i>
-%typemaps_asptrfromn(%checkcode(STRING), std::basic_string<char>);
-
-#endif
-
-
-#if !defined(SWIG_STD_WSTRING)
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header",
-	  fragment="SWIG_AsWCharPtrAndSize") {
-SWIGINTERN int
-  SWIG_AsPtr(std::basic_string<wchar_t>)(PyObject* obj, std::wstring **val)
-  {
-    static swig_type_info* string_info = 
-      SWIG_TypeQuery("std::basic_string<wchar_t> *");
-    std::wstring *vptr;    
-    if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
-      if (val) *val = vptr;
-      return SWIG_OLDOBJ;
-    } else {
-      PyErr_Clear();
-      wchar_t *buf = 0 ; size_t size = 0; int alloc = 0;
-      if (SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) {
-	if (buf) {
-	  if (val) *val = new std::wstring(buf, size - 1);
-	  if (alloc == SWIG_NEWOBJ) %delete_array(buf);
-	  return SWIG_NEWOBJ;
-	}
-      } else {
-	PyErr_Clear();
-      }  
-      if (val) {
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	PyErr_SetString(PyExc_TypeError,"a wstring is expected");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-      }
-      return 0;
-    }
-  }
-}
-
-%fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
-	  fragment="SWIG_FromWCharPtrAndSize") {
-SWIGINTERNINLINE PyObject*
-  SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s)
-  {
-    return SWIG_FromWCharPtrAndSize(s.data(), s.size());
-  }
-}
-
-%typemaps_asptrfromn(%checkcode(UNISTRING), std::basic_string<wchar_t>);
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/python/std_carray.i b/dependencies2013/win32/swig/Lib/python/std_carray.i
deleted file mode 100644
index 680d6711..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_carray.i
+++ /dev/null
@@ -1,54 +0,0 @@
-%include <pycontainer.swg>
-
-
-%fragment("StdCarrayTraits","header",fragment="StdSequenceTraits")
-{
-namespace swig {
-  template <class T, size_t S>
-  struct traits_asptr<std::carray<T, S> >  {
-    static int asptr(PyObject *obj, std::carray<T, S> **array) {
-      return traits_asptr_stdseq<std::carray<T, S> >::asptr(obj, array);
-    }
-  };
-}
-}
-
-%warnfilter(SWIGWARN_IGNORE_OPERATOR_INDEX) std::carray::operator[];
-
-%extend std::carray {
-  %fragment(SWIG_Traits_frag(std::carray<_Type, _Size >), "header",
-	    fragment="SwigPyIterator_T",
-	    fragment=SWIG_Traits_frag(_Type),
-	    fragment="StdCarrayTraits") {
-    namespace swig {
-      template <>  struct traits<std::carray<_Type, _Size > > {
-	typedef pointer_category category;
-	static const char* type_name() {
-	  return "std::carray<" #_Type "," #_Size " >";
-	}
-      };
-    }
-  }
-  
-  %typemaps_asptr(SWIG_TYPECHECK_VECTOR, swig::asptr,
-		  SWIG_Traits_frag(std::carray<_Type, _Size >),
-		  std::carray<_Type, _Size >);
-
-  %typemap(out,noblock=1) iterator, const_iterator {
-    $result = SWIG_NewPointerObj(swig::make_output_iterator((const $type &)$1),
-				 swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
-  }
-  
-  inline size_t __len__() const { return self->size(); }
-  
-  inline const _Type& __getitem__(size_t i) const { return (*self)[i]; }
-  
-  inline void __setitem__(size_t i, const _Type& v) { (*self)[i] = v; }
-
-  
-  swig::SwigPyIterator* __iter__(PyObject **PYTHON_SELF) {
-    return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-  }
-}
-
-%include <std/std_carray.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/std_char_traits.i b/dependencies2013/win32/swig/Lib/python/std_char_traits.i
deleted file mode 100644
index bf4e6c47..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_char_traits.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_char_traits.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_common.i b/dependencies2013/win32/swig/Lib/python/std_common.i
deleted file mode 100644
index 60576623..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_common.i
+++ /dev/null
@@ -1,74 +0,0 @@
-%include <std/std_except.i>
-%include <pystdcommon.swg>
-
-
-/*
-  Generate the traits for a 'primitive' type, such as 'double',
-  for which the SWIG_AsVal and SWIG_From methods are already defined.
-*/
-
-%define %traits_ptypen(Type...)
-  %fragment(SWIG_Traits_frag(Type),"header",
-	    fragment=SWIG_AsVal_frag(Type),
-	    fragment=SWIG_From_frag(Type),
-	    fragment="StdTraits") {
-namespace swig {
-  template <> struct traits< Type > {
-    typedef value_category category;
-    static const char* type_name() { return  #Type; }
-  };
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      return SWIG_AsVal(Type)(obj, val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static PyObject *from(const value_type& val) {
-      return SWIG_From(Type)(val);
-    }
-  };
-}
-}
-%enddef
-
-/* Traits for enums. This is bit of a sneaky trick needed because a generic template specialization of enums
-   is not possible (unless using template meta-programming which SWIG doesn't support because of the explicit
-   instantiations required using %template). The STL containers define the 'front' method and the typemap
-   below is used whenever the front method is wrapped returning an enum. This typemap simply picks up the
-   standard enum typemap, but additionally drags in a fragment containing the traits_asval and traits_from
-   required in the generated code for enums. */
-
-%define %traits_enum(Type...)
-  %fragment("SWIG_Traits_enum_"{Type},"header",
-	    fragment=SWIG_AsVal_frag(int),
-	    fragment=SWIG_From_frag(int),
-	    fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      return SWIG_AsVal(int)(obj, (int *)val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static PyObject *from(const value_type& val) {
-      return SWIG_From(int)((int)val);
-    }
-  };
-}
-}
-%typemap(out, fragment="SWIG_Traits_enum_"{Type}) const enum SWIGTYPE& front %{$typemap(out, const enum SWIGTYPE&)%}
-%enddef
-
-
-%include <std/std_common.i>
-
-//
-// Generates the traits for all the known primitive
-// C++ types (int, double, ...)
-//
-%apply_cpptypes(%traits_ptypen);
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_complex.i b/dependencies2013/win32/swig/Lib/python/std_complex.i
deleted file mode 100644
index 4e8fed30..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_complex.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  STD C++ complex typemaps
- */
-
-%include <pycomplex.swg>
-
-%{
-#include <complex> 
-%}
-
-/* defining the complex as/from converters */
-
-%swig_cplxdbl_convn(std::complex<double>, std::complex<double>, std::real, std::imag)
-%swig_cplxflt_convn(std::complex<float>,  std::complex<float>,  std::real, std::imag)
-
-/* defining the typemaps */
-
-%typemaps_primitive(%checkcode(CPLXDBL), std::complex<double>);
-%typemaps_primitive(%checkcode(CPLXFLT), std::complex<float>);
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_container.i b/dependencies2013/win32/swig/Lib/python/std_container.i
deleted file mode 100644
index d24c1570..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_container.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <pycontainer.swg>
-%include <std/std_container.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_deque.i b/dependencies2013/win32/swig/Lib/python/std_deque.i
deleted file mode 100644
index b1937563..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_deque.i
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  Deques
-*/
-
-%fragment("StdDequeTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::deque<T> >  {
-      static int asptr(PyObject *obj, std::deque<T>  **vec) {
-	return traits_asptr_stdseq<std::deque<T> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::deque<T> > {
-      static PyObject *from(const std::deque<T> & vec) {
-	return traits_from_stdseq<std::deque<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_deque_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_deque_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_except.i b/dependencies2013/win32/swig/Lib/python/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/std_ios.i b/dependencies2013/win32/swig/Lib/python/std_ios.i
deleted file mode 100644
index aa6f0994..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_ios.i
+++ /dev/null
@@ -1,3 +0,0 @@
-%rename(ios_base_in) std::ios_base::in;
-
-%include <std/std_ios.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_iostream.i b/dependencies2013/win32/swig/Lib/python/std_iostream.i
deleted file mode 100644
index 43d6b0c2..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_iostream.i
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace std
-{
-%callback(1) endl;
-%callback(1) ends;
-%callback(1) flush;
-}
-
-%include <std/std_iostream.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_list.i b/dependencies2013/win32/swig/Lib/python/std_list.i
deleted file mode 100644
index baf66d91..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_list.i
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Lists
-*/
-
-%fragment("StdListTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T >
-    struct traits_asptr<std::list<T> >  {
-      static int asptr(PyObject *obj, std::list<T> **lis) {
-	return traits_asptr_stdseq<std::list<T> >::asptr(obj, lis);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::list<T> > {
-      static PyObject *from(const std::list<T> & vec) {
-	return traits_from_stdseq<std::list<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_list_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_list_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_list.i>
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_map.i b/dependencies2013/win32/swig/Lib/python/std_map.i
deleted file mode 100644
index f61f79c4..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_map.i
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-  Maps
-*/
-
-%fragment("StdMapCommonTraits","header",fragment="StdSequenceTraits")
-{
-  namespace swig {
-    template <class ValueType>
-    struct from_key_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef  PyObject *result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.first);
-      }
-    };
-
-    template <class ValueType>
-    struct from_value_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef  PyObject *result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.second);
-      }
-    };
-
-    template<class OutIterator, class FromOper, class ValueType = typename OutIterator::value_type>
-    struct SwigPyMapIterator_T : SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper>
-    {
-      SwigPyMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
-	: SwigPyIteratorClosed_T<OutIterator,ValueType,FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-
-    template<class OutIterator,
-	     class FromOper = from_key_oper<typename OutIterator::value_type> >
-    struct SwigPyMapKeyIterator_T : SwigPyMapIterator_T<OutIterator, FromOper>
-    {
-      SwigPyMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
-	: SwigPyMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-    template<typename OutIter>
-    inline SwigPyIterator*
-    make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0)
-    {
-      return new SwigPyMapKeyIterator_T<OutIter>(current, begin, end, seq);
-    }
-
-    template<class OutIterator,
-	     class FromOper = from_value_oper<typename OutIterator::value_type> >
-    struct SwigPyMapValueITerator_T : SwigPyMapIterator_T<OutIterator, FromOper>
-    {
-      SwigPyMapValueITerator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
-	: SwigPyMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-    
-
-    template<typename OutIter>
-    inline SwigPyIterator*
-    make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0)
-    {
-      return new SwigPyMapValueITerator_T<OutIter>(current, begin, end, seq);
-    }
-  }
-}
-
-%fragment("StdMapTraits","header",fragment="StdMapCommonTraits")
-{
-  namespace swig {
-    template <class SwigPySeq, class K, class T, class Compare, class Alloc >
-    inline void
-    assign(const SwigPySeq& swigpyseq, std::map<K,T,Compare,Alloc > *map) {
-      typedef typename std::map<K,T,Compare,Alloc >::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	map->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T, class Compare, class Alloc>
-    struct traits_asptr<std::map<K,T,Compare,Alloc > >  {
-      typedef std::map<K,T,Compare,Alloc > map_type;
-      static int asptr(PyObject *obj, map_type **val) {
-	int res = SWIG_ERROR;
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	if (PyDict_Check(obj)) {
-	  SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
-%#if PY_VERSION_HEX >= 0x03000000
-          /* In Python 3.x the ".items()" method returns a dict_items object */
-          items = PySequence_Fast(items, ".items() didn't return a sequence!");
-%#endif
-	  res = traits_asptr_stdseq<map_type, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  map_type *p;
-	  swig_type_info *descriptor = swig::type_info<map_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return res;
-      }      
-    };
-      
-    template <class K, class T, class Compare, class Alloc >
-    struct traits_from<std::map<K,T,Compare,Alloc > >  {
-      typedef std::map<K,T,Compare,Alloc > map_type;
-      typedef typename map_type::const_iterator const_iterator;
-      typedef typename map_type::size_type size_type;
-
-      static PyObject *asdict(const map_type& map) {
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	size_type size = map.size();
-	Py_ssize_t pysize = (size <= (size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-	if (pysize < 0) {
-	  PyErr_SetString(PyExc_OverflowError, "map size not valid in python");
-	  SWIG_PYTHON_THREAD_END_BLOCK;
-	  return NULL;
-	}
-	PyObject *obj = PyDict_New();
-	for (const_iterator i= map.begin(); i!= map.end(); ++i) {
-	  swig::SwigVar_PyObject key = swig::from(i->first);
-	  swig::SwigVar_PyObject val = swig::from(i->second);
-	  PyDict_SetItem(obj, key, val);
-	}
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return obj;
-      }
-                
-      static PyObject *from(const map_type& map) {
-	swig_type_info *desc = swig::type_info<map_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_InternalNewPointerObj(new map_type(map), desc, SWIG_POINTER_OWN);
-	} else {
-	  return asdict(map);
-	}
-      }
-    };
-  }
-}
-
-%define %swig_map_common(Map...)
-  %swig_sequence_iterator(Map);
-  %swig_container_methods(Map)
-
-#if defined(SWIGPYTHON_BUILTIN)
-  %feature("python:slot", "mp_length", functype="lenfunc") __len__;
-  %feature("python:slot", "mp_subscript", functype="binaryfunc") __getitem__;
-  %feature("python:slot", "tp_iter", functype="getiterfunc") key_iterator;
-
-  %extend {
-    %newobject iterkeys(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* iterkeys(PyObject **PYTHON_SELF) {
-      return swig::make_output_key_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-      
-    %newobject itervalues(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* itervalues(PyObject **PYTHON_SELF) {
-      return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-
-    %newobject iteritems(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* iteritems(PyObject **PYTHON_SELF) {
-      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-  }
-
-#else
-  %extend {
-    %pythoncode %{def __iter__(self):
-    return self.key_iterator()%}
-    %pythoncode %{def iterkeys(self):
-    return self.key_iterator()%}
-    %pythoncode %{def itervalues(self):
-    return self.value_iterator()%}
-    %pythoncode %{def iteritems(self):
-    return self.iterator()%}
-  }
-#endif
-
-  %extend {
-    mapped_type const & __getitem__(const key_type& key) throw (std::out_of_range) {
-      Map::const_iterator i = self->find(key);
-      if (i != self->end())
-	return i->second;
-      else
-	throw std::out_of_range("key not found");
-    }
-
-    void __delitem__(const key_type& key) throw (std::out_of_range) {
-      Map::iterator i = self->find(key);
-      if (i != self->end())
-	self->erase(i);
-      else
-	throw std::out_of_range("key not found");
-    }
-    
-    bool has_key(const key_type& key) const {
-      Map::const_iterator i = self->find(key);
-      return i != self->end();
-    }
-    
-    PyObject* keys() {
-      Map::size_type size = self->size();
-      Py_ssize_t pysize = (size <= (Map::size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      if (pysize < 0) {
-	PyErr_SetString(PyExc_OverflowError, "map size not valid in python");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return NULL;
-      }
-      PyObject* keyList = PyList_New(pysize);
-      Map::const_iterator i = self->begin();
-      for (Py_ssize_t j = 0; j < pysize; ++i, ++j) {
-	PyList_SET_ITEM(keyList, j, swig::from(i->first));
-      }
-      SWIG_PYTHON_THREAD_END_BLOCK;
-      return keyList;
-    }
-    
-    PyObject* values() {
-      Map::size_type size = self->size();
-      Py_ssize_t pysize = (size <= (Map::size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      if (pysize < 0) {
-	PyErr_SetString(PyExc_OverflowError, "map size not valid in python");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return NULL;
-      }
-      PyObject* valList = PyList_New(pysize);
-      Map::const_iterator i = self->begin();
-      for (Py_ssize_t j = 0; j < pysize; ++i, ++j) {
-	PyList_SET_ITEM(valList, j, swig::from(i->second));
-      }
-      SWIG_PYTHON_THREAD_END_BLOCK;
-      return valList;
-    }
-    
-    PyObject* items() {
-      Map::size_type size = self->size();
-      Py_ssize_t pysize = (size <= (Map::size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      if (pysize < 0) {
-	PyErr_SetString(PyExc_OverflowError, "map size not valid in python");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return NULL;
-      }    
-      PyObject* itemList = PyList_New(pysize);
-      Map::const_iterator i = self->begin();
-      for (Py_ssize_t j = 0; j < pysize; ++i, ++j) {
-	PyList_SET_ITEM(itemList, j, swig::from(*i));
-      }
-      SWIG_PYTHON_THREAD_END_BLOCK;
-      return itemList;
-    }
-    
-    // Python 2.2 methods
-    bool __contains__(const key_type& key) {
-      return self->find(key) != self->end();
-    }
-
-    %newobject key_iterator(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* key_iterator(PyObject **PYTHON_SELF) {
-      return swig::make_output_key_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-
-    %newobject value_iterator(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* value_iterator(PyObject **PYTHON_SELF) {
-      return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-  }
-
-%enddef
-
-%define %swig_map_methods(Map...)
-  %swig_map_common(Map)
-
-#if defined(SWIGPYTHON_BUILTIN)
-  %feature("python:slot", "mp_ass_subscript", functype="objobjargproc") __setitem__;
-#endif
-
-  %extend {
-    // This will be called through the mp_ass_subscript slot to delete an entry.
-    void __setitem__(const key_type& key) {
-      self->erase(key);
-    }
-
-    void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
-      (*self)[key] = x;
-    }
-
-    PyObject* asdict() {
-      return swig::traits_from< Map >::asdict(*self);
-    }
-  }
-
-
-%enddef
-
-
-%include <std/std_map.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_multimap.i b/dependencies2013/win32/swig/Lib/python/std_multimap.i
deleted file mode 100644
index 3209fb0f..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_multimap.i
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-  Multimaps
-*/
-%include <std_map.i>
-
-%fragment("StdMultimapTraits","header",fragment="StdMapCommonTraits")
-{
-  namespace swig {
-    template <class SwigPySeq, class K, class T >
-    inline void 
-    assign(const SwigPySeq& swigpyseq, std::multimap<K,T > *multimap) {
-      typedef typename std::multimap<K,T>::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	multimap->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T>
-    struct traits_asptr<std::multimap<K,T> >  {
-      typedef std::multimap<K,T> multimap_type;
-      static int asptr(PyObject *obj, std::multimap<K,T> **val) {
-	int res = SWIG_ERROR;
-	if (PyDict_Check(obj)) {
-	  SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
-	  return traits_asptr_stdseq<std::multimap<K,T>, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  multimap_type *p;
-	  swig_type_info *descriptor = swig::type_info<multimap_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-      
-    template <class K, class T >
-    struct traits_from<std::multimap<K,T> >  {
-      typedef std::multimap<K,T> multimap_type;
-      typedef typename multimap_type::const_iterator const_iterator;
-      typedef typename multimap_type::size_type size_type;
-            
-      static PyObject *from(const multimap_type& multimap) {
-	swig_type_info *desc = swig::type_info<multimap_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_InternalNewPointerObj(new multimap_type(multimap), desc, SWIG_POINTER_OWN);
-	} else {
-	  size_type size = multimap.size();
-	  Py_ssize_t pysize = (size <= (size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-	  if (pysize < 0) {
-	    SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	    PyErr_SetString(PyExc_OverflowError, "multimap size not valid in python");
-	    SWIG_PYTHON_THREAD_END_BLOCK;
-	    return NULL;
-	  }
-	  PyObject *obj = PyDict_New();
-	  for (const_iterator i= multimap.begin(); i!= multimap.end(); ++i) {
-	    swig::SwigVar_PyObject key = swig::from(i->first);
-	    swig::SwigVar_PyObject val = swig::from(i->second);
-	    PyDict_SetItem(obj, key, val);
-	  }
-	  return obj;
-	}
-      }
-    };
-  }
-}
-
-%define %swig_multimap_methods(Type...) 
-  %swig_map_common(Type);
-  %extend {
-    void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
-      self->insert(Type::value_type(key,x));
-    }
-  }
-%enddef
-
-%include <std/std_multimap.i>
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_multiset.i b/dependencies2013/win32/swig/Lib/python/std_multiset.i
deleted file mode 100644
index ac430334..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_multiset.i
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-  Multisets
-*/
-
-%include <std_set.i>
-
-%fragment("StdMultisetTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class SwigPySeq, class T> 
-    inline void
-    assign(const SwigPySeq& swigpyseq, std::multiset<T>* seq) {
-      // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
-      typedef typename SwigPySeq::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	seq->insert(seq->end(),(value_type)(*it));
-      }
-    }
-
-    template <class T>
-    struct traits_asptr<std::multiset<T> >  {
-      static int asptr(PyObject *obj, std::multiset<T> **m) {
-	return traits_asptr_stdseq<std::multiset<T> >::asptr(obj, m);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::multiset<T> > {
-      static PyObject *from(const std::multiset<T>& vec) {
-	return traits_from_stdseq<std::multiset<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_multiset_methods(Set...) %swig_set_methods(Set)
-
-
-
-%include <std/std_multiset.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_pair.i b/dependencies2013/win32/swig/Lib/python/std_pair.i
deleted file mode 100644
index 172572bf..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_pair.i
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-  Pairs
-*/
-%include <pystdcommon.swg>
-
-//#define SWIG_STD_PAIR_ASVAL
-
-%fragment("StdPairTraits","header",fragment="StdTraits") {
-  namespace swig {
-#ifdef SWIG_STD_PAIR_ASVAL
-    template <class T, class U >
-    struct traits_asval<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(PyObject* first, PyObject* second,
-			  std::pair<T,U> *val)
-      {
-	if (val) {
-	  T *pfirst = &(val->first);
-	  int res1 = swig::asval((PyObject*)first, pfirst);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = &(val->second);
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval((PyObject*)first, 0);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-      }
-
-      static int asval(PyObject *obj, std::pair<T,U> *val) {
-	int res = SWIG_ERROR;
-	if (PyTuple_Check(obj)) {
-	  if (PyTuple_GET_SIZE(obj) == 2) {
-	    res = get_pair(PyTuple_GET_ITEM(obj,0),PyTuple_GET_ITEM(obj,1), val);
-	  }
-	} else if (PySequence_Check(obj)) {
-	  if (PySequence_Size(obj) == 2) {
-	    swig::SwigVar_PyObject first = PySequence_GetItem(obj,0);
-	    swig::SwigVar_PyObject second = PySequence_GetItem(obj,1);
-	    res = get_pair(first, second, val);
-	  }
-	} else {
-	  value_type *p;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = *p;
-	}
-	return res;
-      }
-    };
-
-#else
-    template <class T, class U >
-    struct traits_asptr<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(PyObject* first, PyObject* second,
-			  std::pair<T,U> **val) 
-      {
-	if (val) {
-	  value_type *vp = %new_instance(std::pair<T,U>);
-	  T *pfirst = &(vp->first);
-	  int res1 = swig::asval((PyObject*)first, pfirst);
-	  if (!SWIG_IsOK(res1)) {
-	    %delete(vp);
-	    return res1;
-	  }
-	  U *psecond = &(vp->second);
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2)) {
-	    %delete(vp);
-	    return res2;
-	  }
-	  *val = vp;
-	  return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval((PyObject*)first, pfirst);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-      }
-
-      static int asptr(PyObject *obj, std::pair<T,U> **val) {
-	int res = SWIG_ERROR;
-	if (PyTuple_Check(obj)) {
-	  if (PyTuple_GET_SIZE(obj) == 2) {
-	    res = get_pair(PyTuple_GET_ITEM(obj,0),PyTuple_GET_ITEM(obj,1), val);
-	  }
-	} else if (PySequence_Check(obj)) {
-	  if (PySequence_Size(obj) == 2) {
-	    swig::SwigVar_PyObject first = PySequence_GetItem(obj,0);
-	    swig::SwigVar_PyObject second = PySequence_GetItem(obj,1);
-	    res = get_pair(first, second, val);
-	  }
-	} else {
-	  value_type *p;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-
-#endif
-    template <class T, class U >
-    struct traits_from<std::pair<T,U> >   {
-      static PyObject *from(const std::pair<T,U>& val) {
-	PyObject* obj = PyTuple_New(2);
-	PyTuple_SetItem(obj,0,swig::from(val.first));
-	PyTuple_SetItem(obj,1,swig::from(val.second));
-	return obj;
-      }
-    };
-  }
-
-#if defined(SWIGPYTHON_BUILTIN)
-SWIGINTERN Py_ssize_t
-SwigPython_std_pair_len (PyObject *a)
-{
-    return 2;
-}
-
-SWIGINTERN PyObject*
-SwigPython_std_pair_repr (PyObject *o)
-{
-    PyObject *tuple = PyTuple_New(2);
-    assert(tuple);
-    PyTuple_SET_ITEM(tuple, 0, PyObject_GetAttrString(o, (char*) "first"));
-    PyTuple_SET_ITEM(tuple, 1, PyObject_GetAttrString(o, (char*) "second"));
-    PyObject *result = PyObject_Repr(tuple);
-    Py_DECREF(tuple);
-    return result;
-}
-
-SWIGINTERN PyObject*
-SwigPython_std_pair_getitem (PyObject *a, Py_ssize_t b)
-{
-    PyObject *result = PyObject_GetAttrString(a, b % 2 ? (char*) "second" : (char*) "first");
-    return result;
-}
-
-SWIGINTERN int
-SwigPython_std_pair_setitem (PyObject *a, Py_ssize_t b, PyObject *c)
-{
-    int result = PyObject_SetAttrString(a, b % 2 ? (char*) "second" : (char*) "first", c);
-    return result;
-}
-#endif
-
-}
-
-%feature("python:sq_length") std::pair "SwigPython_std_pair_len";
-%feature("python:sq_length") std::pair<T*,U> "SwigPython_std_pair_len";
-%feature("python:sq_length") std::pair<T,U*> "SwigPython_std_pair_len";
-%feature("python:sq_length") std::pair<T*,U*> "SwigPython_std_pair_len";
-
-%feature("python:tp_repr") std::pair "SwigPython_std_pair_repr";
-%feature("python:tp_repr") std::pair<T*,U> "SwigPython_std_pair_repr";
-%feature("python:tp_repr") std::pair<T,U*> "SwigPython_std_pair_repr";
-%feature("python:tp_repr") std::pair<T*,U*> "SwigPython_std_pair_repr";
-
-%feature("python:sq_item") std::pair "SwigPython_std_pair_getitem";
-%feature("python:sq_item") std::pair<T*,U> "SwigPython_std_pair_getitem";
-%feature("python:sq_item") std::pair<T,U*> "SwigPython_std_pair_getitem";
-%feature("python:sq_item") std::pair<T*,U*> "SwigPython_std_pair_getitem";
-
-%feature("python:sq_ass_item") std::pair "SwigPython_std_pair_setitem";
-%feature("python:sq_ass_item") std::pair<T*,U> "SwigPython_std_pair_setitem";
-%feature("python:sq_ass_item") std::pair<T,U*> "SwigPython_std_pair_setitem";
-%feature("python:sq_ass_item") std::pair<T*,U*> "SwigPython_std_pair_setitem";
-
-%define %swig_pair_methods(pair...)
-#if !defined(SWIGPYTHON_BUILTIN)
-%extend {      
-%pythoncode %{def __len__(self):
-    return 2
-def __repr__(self):
-    return str((self.first, self.second))
-def __getitem__(self, index): 
-    if not (index % 2):
-        return self.first
-    else:
-        return self.second
-def __setitem__(self, index, val):
-    if not (index % 2):
-        self.first = val
-    else:
-        self.second = val%}
-}
-#endif
-%enddef
-
-%include <std/std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_set.i b/dependencies2013/win32/swig/Lib/python/std_set.i
deleted file mode 100644
index 53f97e47..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_set.i
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-  Sets
-*/
-
-%fragment("StdSetTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class SwigPySeq, class T> 
-    inline void 
-    assign(const SwigPySeq& swigpyseq, std::set<T>* seq) {
-      // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
-      typedef typename SwigPySeq::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	seq->insert(seq->end(),(value_type)(*it));
-      }
-    }
-
-    template <class T>
-    struct traits_asptr<std::set<T> >  {
-      static int asptr(PyObject *obj, std::set<T> **s) {
-	return traits_asptr_stdseq<std::set<T> >::asptr(obj, s);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::set<T> > {
-      static PyObject *from(const std::set<T>& vec) {
-	return traits_from_stdseq<std::set<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-%define %swig_set_methods(set...)
-  %swig_sequence_iterator(set);
-  %swig_container_methods(set);
-
-  %extend  {
-     void append(value_type x) {
-       self->insert(x);
-     }
-  
-     bool __contains__(value_type x) {
-       return self->find(x) != self->end();
-     }
-
-     value_type __getitem__(difference_type i) const throw (std::out_of_range) {
-       return *(swig::cgetpos(self, i));
-     }
-
-     void add(value_type x) {
-       self->insert(x);
-     }
-
-     void discard(value_type x) {
-       self->erase(x);
-     }
-
-  };
-%enddef
-
-%include <std/std_set.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_shared_ptr.i b/dependencies2013/win32/swig/Lib/python/std_shared_ptr.i
deleted file mode 100644
index df873679..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_shared_ptr.i
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SWIG_SHARED_PTR_NAMESPACE std
-%include <boost_shared_ptr.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_sstream.i b/dependencies2013/win32/swig/Lib/python/std_sstream.i
deleted file mode 100644
index 6647df8c..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_sstream.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_sstream.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_streambuf.i b/dependencies2013/win32/swig/Lib/python/std_streambuf.i
deleted file mode 100644
index 44b9bb4d..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_streambuf.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_streambuf.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_string.i b/dependencies2013/win32/swig/Lib/python/std_string.i
deleted file mode 100644
index dc1378ae..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_string.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/std_unordered_map.i b/dependencies2013/win32/swig/Lib/python/std_unordered_map.i
deleted file mode 100644
index 894840c6..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_unordered_map.i
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-  Unordered Maps
-*/
-
-%fragment("StdMapTraits","header",fragment="StdSequenceTraits")
-{
-  namespace swig {
-    template <class SwigPySeq, class K, class T >
-    inline void
-    assign(const SwigPySeq& swigpyseq, std::unordered_map<K,T > *unordered_map) {
-      typedef typename std::unordered_map<K,T>::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	unordered_map->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T>
-    struct traits_reserve<std::unordered_map<K,T> > {
-      static void reserve(std::unordered_map<K,T> &seq, typename std::unordered_map<K,T>::size_type n) {
-        seq.reserve(n);
-      }
-    };
-
-    template <class K, class T>
-    struct traits_asptr<std::unordered_map<K,T> >  {
-      typedef std::unordered_map<K,T> unordered_map_type;
-      static int asptr(PyObject *obj, unordered_map_type **val) {
-	int res = SWIG_ERROR;
-	if (PyDict_Check(obj)) {
-	  SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
-%#if PY_VERSION_HEX >= 0x03000000
-          /* In Python 3.x the ".items()" method return a dict_items object */
-          items = PySequence_Fast(items, ".items() havn't returned a sequence!");
-%#endif
-	  res = traits_asptr_stdseq<std::unordered_map<K,T>, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  unordered_map_type *p;
-	  swig_type_info *descriptor = swig::type_info<unordered_map_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }      
-    };
-      
-    template <class K, class T >
-    struct traits_from<std::unordered_map<K,T> >  {
-      typedef std::unordered_map<K,T> unordered_map_type;
-      typedef typename unordered_map_type::const_iterator const_iterator;
-      typedef typename unordered_map_type::size_type size_type;
-            
-      static PyObject *from(const unordered_map_type& unordered_map) {
-	swig_type_info *desc = swig::type_info<unordered_map_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_NewPointerObj(new unordered_map_type(unordered_map), desc, SWIG_POINTER_OWN);
-	} else {
-	  size_type size = unordered_map.size();
-	  Py_ssize_t pysize = (size <= (size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-	  if (pysize < 0) {
-	    SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	    PyErr_SetString(PyExc_OverflowError, "unordered_map size not valid in python");
-	    SWIG_PYTHON_THREAD_END_BLOCK;
-	    return NULL;
-	  }
-	  PyObject *obj = PyDict_New();
-	  for (const_iterator i= unordered_map.begin(); i!= unordered_map.end(); ++i) {
-	    swig::SwigVar_PyObject key = swig::from(i->first);
-	    swig::SwigVar_PyObject val = swig::from(i->second);
-	    PyDict_SetItem(obj, key, val);
-	  }
-	  return obj;
-	}
-      }
-    };
-
-    template <class ValueType>
-    struct from_key_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef  PyObject *result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.first);
-      }
-    };
-
-    template <class ValueType>
-    struct from_value_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef  PyObject *result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.second);
-      }
-    };
-
-    template<class OutIterator, class FromOper, class ValueType = typename OutIterator::value_type>
-    struct SwigPyMapIterator_T : SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper>
-    {
-      SwigPyMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
-	: SwigPyIteratorClosed_T<OutIterator,ValueType,FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-
-    template<class OutIterator,
-	     class FromOper = from_key_oper<typename OutIterator::value_type> >
-    struct SwigPyMapKeyIterator_T : SwigPyMapIterator_T<OutIterator, FromOper>
-    {
-      SwigPyMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
-	: SwigPyMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-    template<typename OutIter>
-    inline SwigPyIterator*
-    make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0)
-    {
-      return new SwigPyMapKeyIterator_T<OutIter>(current, begin, end, seq);
-    }
-
-    template<class OutIterator,
-	     class FromOper = from_value_oper<typename OutIterator::value_type> >
-    struct SwigPyMapValueITerator_T : SwigPyMapIterator_T<OutIterator, FromOper>
-    {
-      SwigPyMapValueITerator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
-	: SwigPyMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-    
-
-    template<typename OutIter>
-    inline SwigPyIterator*
-    make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0)
-    {
-      return new SwigPyMapValueITerator_T<OutIter>(current, begin, end, seq);
-    }
-  }
-}
-
-%define %swig_unordered_map_common(Map...)
-  %swig_sequence_iterator(Map);
-  %swig_container_methods(Map)
-
-  %extend {
-    mapped_type __getitem__(const key_type& key) const throw (std::out_of_range) {
-      Map::const_iterator i = self->find(key);
-      if (i != self->end())
-	return i->second;
-      else
-	throw std::out_of_range("key not found");
-    }
-    
-    void __delitem__(const key_type& key) throw (std::out_of_range) {
-      Map::iterator i = self->find(key);
-      if (i != self->end())
-	self->erase(i);
-      else
-	throw std::out_of_range("key not found");
-    }
-    
-    bool has_key(const key_type& key) const {
-      Map::const_iterator i = self->find(key);
-      return i != self->end();
-    }
-    
-    PyObject* keys() {
-      Map::size_type size = self->size();
-      Py_ssize_t pysize = (size <= (Map::size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-      if (pysize < 0) {
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	PyErr_SetString(PyExc_OverflowError, "unordered_map size not valid in python");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return NULL;
-      }
-      PyObject* keyList = PyList_New(pysize);
-      Map::const_iterator i = self->begin();
-      for (Py_ssize_t j = 0; j < pysize; ++i, ++j) {
-	PyList_SET_ITEM(keyList, j, swig::from(i->first));
-      }
-      return keyList;
-    }
-    
-    PyObject* values() {
-      Map::size_type size = self->size();
-      Py_ssize_t pysize = (size <= (Map::size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-      if (pysize < 0) {
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	PyErr_SetString(PyExc_OverflowError, "unordered_map size not valid in python");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return NULL;
-      }
-      PyObject* valList = PyList_New(pysize);
-      Map::const_iterator i = self->begin();
-      for (Py_ssize_t j = 0; j < pysize; ++i, ++j) {
-	PyList_SET_ITEM(valList, j, swig::from(i->second));
-      }
-      return valList;
-    }
-    
-    PyObject* items() {
-      Map::size_type size = self->size();
-      Py_ssize_t pysize = (size <= (Map::size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-      if (pysize < 0) {
-	SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	PyErr_SetString(PyExc_OverflowError, "unordered_map size not valid in python");
-	SWIG_PYTHON_THREAD_END_BLOCK;
-	return NULL;
-      }    
-      PyObject* itemList = PyList_New(pysize);
-      Map::const_iterator i = self->begin();
-      for (Py_ssize_t j = 0; j < pysize; ++i, ++j) {
-	PyList_SET_ITEM(itemList, j, swig::from(*i));
-      }
-      return itemList;
-    }
-    
-    // Python 2.2 methods
-    bool __contains__(const key_type& key) {
-      return self->find(key) != self->end();
-    }
-
-    %newobject key_iterator(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* key_iterator(PyObject **PYTHON_SELF) {
-      return swig::make_output_key_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-
-    %newobject value_iterator(PyObject **PYTHON_SELF);
-    swig::SwigPyIterator* value_iterator(PyObject **PYTHON_SELF) {
-      return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
-    }
-
-    %pythoncode %{def __iter__(self):
-    return self.key_iterator()%}
-    %pythoncode %{def iterkeys(self):
-    return self.key_iterator()%}
-    %pythoncode %{def itervalues(self):
-    return self.value_iterator()%}
-    %pythoncode %{def iteritems(self):
-    return self.iterator()%}
-  }
-%enddef
-
-%define %swig_unordered_map_methods(Map...)
-  %swig_unordered_map_common(Map)
-  %extend {
-    void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
-      (*self)[key] = x;
-    }
-  }
-%enddef
-
-
-%include <std/std_unordered_map.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_unordered_multimap.i b/dependencies2013/win32/swig/Lib/python/std_unordered_multimap.i
deleted file mode 100644
index 2410aa52..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_unordered_multimap.i
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-  Unordered Multimaps
-*/
-%include <std_unordered_map.i>
-
-%fragment("StdUnorderedMultimapTraits","header",fragment="StdSequenceTraits")
-{
-  namespace swig {
-    template <class SwigPySeq, class K, class T >
-    inline void 
-    assign(const SwigPySeq& swigpyseq, std::unordered_multimap<K,T > *unordered_multimap) {
-      typedef typename std::unordered_multimap<K,T>::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	unordered_multimap->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T>
-    struct traits_reserve<std::unordered_multimap<K,T> >  {
-      static void reserve(std::unordered_multimap<K,T> &seq, typename std::unordered_multimap<K,T>::size_type n) {
-        seq.reserve(n);
-      }
-    };
-
-    template <class K, class T>
-    struct traits_asptr<std::unordered_multimap<K,T> >  {
-      typedef std::unordered_multimap<K,T> unordered_multimap_type;
-      static int asptr(PyObject *obj, std::unordered_multimap<K,T> **val) {
-	int res = SWIG_ERROR;
-	if (PyDict_Check(obj)) {
-	  SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
-	  return traits_asptr_stdseq<std::unordered_multimap<K,T>, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  unordered_multimap_type *p;
-	  swig_type_info *descriptor = swig::type_info<unordered_multimap_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-      
-    template <class K, class T >
-    struct traits_from<std::unordered_multimap<K,T> >  {
-      typedef std::unordered_multimap<K,T> unordered_multimap_type;
-      typedef typename unordered_multimap_type::const_iterator const_iterator;
-      typedef typename unordered_multimap_type::size_type size_type;
-            
-      static PyObject *from(const unordered_multimap_type& unordered_multimap) {
-	swig_type_info *desc = swig::type_info<unordered_multimap_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_NewPointerObj(new unordered_multimap_type(unordered_multimap), desc, SWIG_POINTER_OWN);
-	} else {
-	  size_type size = unordered_multimap.size();
-	  Py_ssize_t pysize = (size <= (size_type) INT_MAX) ? (Py_ssize_t) size : -1;
-	  if (pysize < 0) {
-	    SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-	    PyErr_SetString(PyExc_OverflowError, "unordered_multimap size not valid in python");
-	    SWIG_PYTHON_THREAD_END_BLOCK;
-	    return NULL;
-	  }
-	  PyObject *obj = PyDict_New();
-	  for (const_iterator i= unordered_multimap.begin(); i!= unordered_multimap.end(); ++i) {
-	    swig::SwigVar_PyObject key = swig::from(i->first);
-	    swig::SwigVar_PyObject val = swig::from(i->second);
-	    PyDict_SetItem(obj, key, val);
-	  }
-	  return obj;
-	}
-      }
-    };
-  }
-}
-
-%define %swig_unordered_multimap_methods(Type...) 
-  %swig_map_common(Type);
-  %extend {
-    void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
-      self->insert(Type::value_type(key,x));
-    }
-  }
-%enddef
-
-%include <std/std_unordered_multimap.i>
-
diff --git a/dependencies2013/win32/swig/Lib/python/std_unordered_multiset.i b/dependencies2013/win32/swig/Lib/python/std_unordered_multiset.i
deleted file mode 100644
index 0d9f3d9c..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_unordered_multiset.i
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  Unordered Multisets
-*/
-
-%include <std_unordered_set.i>
-
-%fragment("StdUnorderedMultisetTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class SwigPySeq, class T> 
-    inline void
-    assign(const SwigPySeq& swigpyseq, std::unordered_multiset<T>* seq) {
-      // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
-      typedef typename SwigPySeq::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	seq->insert(seq->end(),(value_type)(*it));
-      }
-    }
-
-    template <class T>
-    struct traits_reserve<std::unordered_multiset<T> >  {
-      static void reserve(std::unordered_multiset<T> &seq, typename std::unordered_multiset<T>::size_type n) {
-        seq.reserve(n);
-      }
-    };
-
-    template <class T>
-    struct traits_asptr<std::unordered_multiset<T> >  {
-      static int asptr(PyObject *obj, std::unordered_multiset<T> **m) {
-	return traits_asptr_stdseq<std::unordered_multiset<T> >::asptr(obj, m);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::unordered_multiset<T> > {
-      static PyObject *from(const std::unordered_multiset<T>& vec) {
-	return traits_from_stdseq<std::unordered_multiset<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_unordered_multiset_methods(Set...) %swig_set_methods(Set)
-
-
-
-%include <std/std_unordered_multiset.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_unordered_set.i b/dependencies2013/win32/swig/Lib/python/std_unordered_set.i
deleted file mode 100644
index 855a28da..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_unordered_set.i
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Unordered Sets
-*/
-
-%fragment("StdUnorderedSetTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class SwigPySeq, class T> 
-    inline void 
-    assign(const SwigPySeq& swigpyseq, std::unordered_set<T>* seq) {
-      // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
-      typedef typename SwigPySeq::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	seq->insert(seq->end(),(value_type)(*it));
-      }
-    }
-
-    template <class T>
-    struct traits_reserve<std::unordered_set<T> >  {
-      static void reserve(std::unordered_set<T> &seq, typename std::unordered_set<T>::size_type n) {
-        seq.reserve(n);
-      }
-    };
-
-    template <class T>
-    struct traits_asptr<std::unordered_set<T> >  {
-      static int asptr(PyObject *obj, std::unordered_set<T> **s) {
-	return traits_asptr_stdseq<std::unordered_set<T> >::asptr(obj, s);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::unordered_set<T> > {
-      static PyObject *from(const std::unordered_set<T>& vec) {
-	return traits_from_stdseq<std::unordered_set<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-%define %swig_unordered_set_methods(unordered_set...)
-  %swig_sequence_iterator(unordered_set);
-  %swig_container_methods(unordered_set);
-
-  %extend  {
-     void append(value_type x) {
-       self->insert(x);
-     }
-  
-     bool __contains__(value_type x) {
-       return self->find(x) != self->end();
-     }
-
-     value_type __getitem__(difference_type i) const throw (std::out_of_range) {
-       return *(swig::cgetpos(self, i));
-     }
-
-  };
-%enddef
-
-%include <std/std_unordered_set.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_vector.i b/dependencies2013/win32/swig/Lib/python/std_vector.i
deleted file mode 100644
index 2ac41a54..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_vector.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Vectors
-*/
-
-%fragment("StdVectorTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_reserve<std::vector<T> > {
-      static void reserve(std::vector<T> &seq, typename std::vector<T>::size_type n) {
-        seq.reserve(n);
-      }
-    };
-
-    template <class T>
-    struct traits_asptr<std::vector<T> >  {
-      static int asptr(PyObject *obj, std::vector<T> **vec) {
-	return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec);
-      }
-    };
-    
-    template <class T>
-    struct traits_from<std::vector<T> > {
-      static PyObject *from(const std::vector<T>& vec) {
-	return traits_from_stdseq<std::vector<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_vector_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_vector_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_vector.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_vectora.i b/dependencies2013/win32/swig/Lib/python/std_vectora.i
deleted file mode 100644
index 3f084bd7..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_vectora.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Vectors + allocators
-*/
-
-%fragment("StdVectorATraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T, class A>
-      struct traits_asptr<std::vector<T,A> >  {
-      typedef std::vector<T,A> vector_type;
-      typedef T value_type;
-      static int asptr(PyObject *obj, vector_type **vec) {
-	return traits_asptr_stdseq<vector_type>::asptr(obj, vec);
-      }
-    };
-
-    template <class T, class A>
-    struct traits_from<std::vector<T,A> > {
-      typedef std::vector<T,A> vector_type;
-      static PyObject *from(const vector_type& vec) {
-	return traits_from_stdseq<vector_type>::from(vec);
-      }
-    };
-  }
-%}
-
-
-#define %swig_vector_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_vector_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_vectora.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_wios.i b/dependencies2013/win32/swig/Lib/python/std_wios.i
deleted file mode 100644
index 930a57dd..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_wios.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_wios.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_wiostream.i b/dependencies2013/win32/swig/Lib/python/std_wiostream.i
deleted file mode 100644
index d3a5ee78..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_wiostream.i
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace std
-{
-%callback(1) wendl;
-%callback(1) wends;
-%callback(1) wflush;
-}
-
-%include <std_basic_string.i>
-%include <std_wstring.i>
-%include <std/std_wiostream.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_wsstream.i b/dependencies2013/win32/swig/Lib/python/std_wsstream.i
deleted file mode 100644
index 8843f56d..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_wsstream.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_wsstream.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_wstreambuf.i b/dependencies2013/win32/swig/Lib/python/std_wstreambuf.i
deleted file mode 100644
index c0f09201..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_wstreambuf.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_wstreambuf.i>
diff --git a/dependencies2013/win32/swig/Lib/python/std_wstring.i b/dependencies2013/win32/swig/Lib/python/std_wstring.i
deleted file mode 100644
index ef862813..00000000
--- a/dependencies2013/win32/swig/Lib/python/std_wstring.i
+++ /dev/null
@@ -1,3 +0,0 @@
-%include <pywstrings.swg>
-%include <typemaps/std_wstring.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/python/stl.i b/dependencies2013/win32/swig/Lib/python/stl.i
deleted file mode 100644
index a3566db5..00000000
--- a/dependencies2013/win32/swig/Lib/python/stl.i
+++ /dev/null
@@ -1,7 +0,0 @@
-/* initial STL definition. extended as needed in each language */
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/python/typemaps.i b/dependencies2013/win32/swig/Lib/python/typemaps.i
deleted file mode 100644
index 5d438eca..00000000
--- a/dependencies2013/win32/swig/Lib/python/typemaps.i
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer handling
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers.
- * ----------------------------------------------------------------------------- */
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/* 
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-	 long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/* 
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Python tuple.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Python output of the function would be a tuple containing both
-output values. 
-
-*/
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Python tuple.  
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in Python).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a Python variable you might do this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-%include <typemaps/typemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/python/wchar.i b/dependencies2013/win32/swig/Lib/python/wchar.i
deleted file mode 100644
index 308139a3..00000000
--- a/dependencies2013/win32/swig/Lib/python/wchar.i
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef __cplusplus
-
-%{
-#include <cwchar>
-%}
-
-#else
-
-%{
-#include <wchar.h>
-%}
-
-#endif
-
-%types(wchar_t *);
-%include <pywstrings.swg>
-
-/*
-  Enable swig wchar support.
-*/
-#define SWIG_WCHAR
diff --git a/dependencies2013/win32/swig/Lib/r/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/r/boost_shared_ptr.i
deleted file mode 100644
index 8ef8d2ef..00000000
--- a/dependencies2013/win32/swig/Lib/r/boost_shared_ptr.i
+++ /dev/null
@@ -1,309 +0,0 @@
-%include <shared_ptr.i>
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE 
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-// plain value
-%typemap(in) CONST TYPE (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) {
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(out) CONST TYPE {
-  %set_output(SWIG_NewPointerObj(new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(varout) CONST TYPE {
-  %set_varoutput(SWIG_NewPointerObj(new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer
-// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) CONST TYPE * (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE * {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0;
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain reference
-%typemap(in) CONST TYPE & (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE & {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = *%const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = *%const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer by reference
-// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) TYPE *CONST& (void  *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    temp = %const_cast(tempshared.get(), $*1_ltype);
-  } else {
-    temp = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $*1_ltype);
-  }
-  $1 = &temp;
-}
-%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) TYPE *CONST& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) TYPE *CONST& %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) $1 = *(%reinterpret_cast(argp, $&ltype));
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  int newmem = 0;
-  void *argp = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = argp ? *(%reinterpret_cast(argp, $&ltype)) : SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE >();
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// shared_ptr by reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 && *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-  if ($owner) delete $1;
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) tempshared = *%reinterpret_cast(argp, $*ltype);
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype);
-  temp = &tempshared;
-  $1 = &temp;
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 && **$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varout typemap not implemented"
-%}
-
-// Typecheck typemaps
-// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting 
-// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) 
-                      TYPE CONST,
-                      TYPE CONST &,
-                      TYPE CONST *,
-                      TYPE *CONST&,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), 0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/r/cdata.i b/dependencies2013/win32/swig/Lib/r/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/r/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/r/exception.i b/dependencies2013/win32/swig/Lib/r/exception.i
deleted file mode 100644
index 39cb0959..00000000
--- a/dependencies2013/win32/swig/Lib/r/exception.i
+++ /dev/null
@@ -1,8 +0,0 @@
-%include <typemaps/exception.swg>
-
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), 
-%block(switch (code) {case SWIG_IndexError: return Rf_ScalarLogical(NA_LOGICAL); default: %error(code, msg); SWIG_fail;} ))
-}
-
diff --git a/dependencies2013/win32/swig/Lib/r/r.swg b/dependencies2013/win32/swig/Lib/r/r.swg
deleted file mode 100644
index cf1cfc8f..00000000
--- a/dependencies2013/win32/swig/Lib/r/r.swg
+++ /dev/null
@@ -1,272 +0,0 @@
-/* */
-
-
-%insert("header") "swiglabels.swg"
-
-%insert("header") "swigerrors.swg"
-%insert("init") "swiginit.swg"
-%insert("runtime") "swigrun.swg"
-%insert("runtime") "rrun.swg"
-
-%init %{
-SWIGEXPORT void SWIG_init(void) {
-%}
-
-%include <rkw.swg>
-
-#define %Rruntime %insert("s")
-
-#define SWIG_Object SEXP
-#define VOID_Object R_NilValue
-
-#define %append_output(obj) SET_VECTOR_ELT($result, $n, obj)
-
-%define %set_constant(name, obj) %begin_block
-   SEXP _obj = obj;
-   assign(name, _obj);
-%end_block %enddef
-
-%define %raise(obj,type,desc) 
-return R_NilValue;
-%enddef
-
-%insert("sinit") "srun.swg"
-
-%insert("sinitroutine") %{
-SWIG_init();
-SWIG_InitializeModule(0);
-%}
-
-%include <typemaps/swigmacros.swg>
-%typemap(in) (double *x, int len) %{
-   $1 = REAL(x);
-   $2 = Rf_length(x);
-%}
-
-/* XXX
-   Need to worry about inheritance, e.g. if B extends A 
-   and we are looking for an A[], then B elements are okay.
-*/
-%typemap(scheck) SWIGTYPE[ANY]  
-  %{ 
-#      assert(length($input) > $1_dim0)
-      assert(all(sapply($input, class) == "$R_class"));
-  %}
-
-%typemap(out) void "";
-
-%typemap(in) int *, int[ANY],
-	     signed int *, signed int[ANY],
-	     unsigned int *, unsigned int[ANY],
-             short *, short[ANY],
-             signed short *, signed short[ANY],
-             unsigned short *, unsigned short[ANY],
-             long *, long[ANY],
-             signed long *, signed long[ANY],
-             unsigned long *, unsigned long[ANY],
-             long long *, long long[ANY],
-             signed long long *, signed long long[ANY],
-             unsigned long long *, unsigned long long[ANY]
-             
-{
-{ int _rswigi;
-  int _rswiglen = LENGTH($input);
-  $1 = %static_cast(calloc(sizeof($1_basetype), _rswiglen), $1_ltype);
-  for (_rswigi=0; _rswigi< _rswiglen; _rswigi++) {
-     $1[_rswigi] = INTEGER($input)[_rswigi];
-  }
-}
-} 
-
-%typemap(in) float *, float[ANY],
-             double *, double[ANY]
-             
-{
-{  int _rswigi;
-  int _rswiglen = LENGTH($input);
-  $1 = %static_cast(calloc(sizeof($1_basetype), _rswiglen), $1_ltype);
-  for (_rswigi=0; _rswigi<_rswiglen; _rswigi++) {
-     $1[_rswigi] = REAL($input)[_rswigi];
-  }
-}
-}
-
-%typemap(freearg,noblock=1) int *, int[ANY], 
-	     signed int *, signed int[ANY],
-	     unsigned int *, unsigned int[ANY],
-             short *, short[ANY],
-             signed short *, signed short[ANY],
-             unsigned short *, unsigned short[ANY],
-             long *, long[ANY],
-             signed long *, signed long[ANY],
-             unsigned long *, unsigned long[ANY],
-             long long *, long long[ANY],
-             signed long long *, signed long long[ANY],
-             unsigned long long *, unsigned long long[ANY],
-             float *, float[ANY],
-             double *, double[ANY]
-%{             
-  free($1);
-%}
-
-%typemap(freearg, noblock=1) int *OUTPUT,
-signed int *OUTPUT,
-unsigned int *OUTPUT,
-short *OUTPUT,
-signed short *OUTPUT,
-unsigned short *OUTPUT,
-long *OUTPUT,
-signed long *OUTPUT,
-unsigned long *OUTPUT,
-long long *OUTPUT,
-signed long long *OUTPUT,
-unsigned long long *OUTPUT,
-float *OUTPUT,
-double *OUTPUT,
-char *OUTPUT,
-signed char *OUTPUT,
-unsigned char *OUTPUT
-{}
-
-
-
-/* Should we recycle to make the length correct.
-   And warn if length() > the dimension. 
-*/
-%typemap(scheck) SWIGTYPE [ANY] %{
-#  assert(length($input) >= $1_dim0)
-%}
-
-/* Handling vector case to avoid warnings,
-   although we just use the first one. */
-%typemap(scheck) unsigned int %{
-  assert(length($input) == 1 && $input >= 0, "All values must be non-negative");
-%}
-
-
-%typemap(scheck) int, long %{
-  if(length($input) > 1) {
-     warning("using only the first element of $input");
-  };
-%}
-
-%include <typemaps/fragments.swg>
-%include <rfragments.swg>
-%include <ropers.swg>
-%include <typemaps/swigtypemaps.swg>
-%include <rtype.swg>
-
-%typemap(in,noblock=1) enum SWIGTYPE[ANY] {
-   $1 = %reinterpret_cast(INTEGER($input), $1_ltype);
-}
-
-%typemap(in,noblock=1,fragment="SWIG_strdup") char * {
-   $1 = %reinterpret_cast(SWIG_strdup(CHAR(STRING_ELT($input, 0))), $1_ltype);
-}
-
-%typemap(freearg,noblock=1) char * {
-   free($1);
-}
-
-%typemap(in,noblock=1,fragment="SWIG_strdup") char *[ANY]  {
-   $1 = %reinterpret_cast(SWIG_strdup(CHAR(STRING_ELT($input, 0))), $1_ltype);
-}
-
-%typemap(freearg,noblock=1) char *[ANY]  {
-   free($1);
-}
-
-%typemap(in,noblock=1,fragment="SWIG_strdup") char[ANY] {
-    $1 = SWIG_strdup(CHAR(STRING_ELT($input, 0)));
-}
-
-%typemap(freearg,noblock=1) char[ANY] {
-    free($1);
-}
-
-%typemap(in,noblock=1,fragment="SWIG_strdup") char[] {
-    $1 = SWIG_strdup(CHAR(STRING_ELT($input, 0)));
-}
-
-%typemap(freearg,noblock=1) char[] {
-    free($1);
-}
-
-
-%typemap(memberin) char[] %{
-if ($input) strcpy($1, $input);
-else
-strcpy($1, "");
-%}
-
-%typemap(globalin) char[] %{
-if ($input) strcpy($1, $input);
-else
-strcpy($1, "");
-%}
-
-%typemap(out,noblock=1) char * 
- {  $result = $1 ? Rf_mkString(%reinterpret_cast($1,char *)) : R_NilValue; }
-
-%typemap(in,noblock=1) char {
-$1 = %static_cast(CHAR(STRING_ELT($input, 0))[0],$1_ltype);
-}
-
-%typemap(out) char 
- { 
-    char tmp[2] = "x";
-    tmp[0] = $1;    
-    $result = Rf_mkString(tmp); 
- }
-
-
-%typemap(in,noblock=1) int, long
-{
-  $1 = %static_cast(INTEGER($input)[0], $1_ltype);
-}
-
-%typemap(out,noblock=1) int, long
-  "$result = Rf_ScalarInteger($1);";
-
-
-%typemap(in,noblock=1) bool 
-  "$1 = LOGICAL($input)[0] ? true : false;";
-
-
-%typemap(out,noblock=1) bool 
-  "$result = Rf_ScalarLogical($1);";
-
-%typemap(in,noblock=1) 
-             float, 
-             double
-{
-  $1 = %static_cast(REAL($input)[0], $1_ltype); 
-}
-
-/* Why is this here ? */
-/* %typemap(out,noblock=1) unsigned int *
-  "$result = ScalarReal(*($1));"; */
-
-%Rruntime %{
-setMethod('[', "ExternalReference",
-function(x,i,j, ..., drop=TRUE) 
-if (!is.null(x$"__getitem__")) 
-sapply(i, function(n) x$"__getitem__"(i=as.integer(n-1))))
-
-setMethod('[<-' , "ExternalReference",
-function(x,i,j, ..., value) 
-if (!is.null(x$"__setitem__")) {
-sapply(1:length(i), function(n) 
-x$"__setitem__"(i=as.integer(i[n]-1), x=value[n]))
-x
-})
-
-setAs('ExternalReference', 'character',
-function(from) {if (!is.null(from$"__str__")) from$"__str__"()})
-
-suppressMessages(suppressWarnings(setMethod('print', 'ExternalReference',
-function(x) {print(as(x, "character"))})))
-%}
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/r/rcontainer.swg b/dependencies2013/win32/swig/Lib/r/rcontainer.swg
deleted file mode 100644
index 54b31b39..00000000
--- a/dependencies2013/win32/swig/Lib/r/rcontainer.swg
+++ /dev/null
@@ -1,198 +0,0 @@
-
-//
-// Common fragments
-//
-
-
-/**** The python container methods  ****/
-
-
-
-%fragment("StdSequenceTraits","header",fragment="<stddef.h>")
-{
-%#include <functional>
-namespace swig {
-  inline size_t
-  check_index(ptrdiff_t i, size_t size, bool insert = false) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size)
-	return (size_t) (i + size);
-    } else if ( (size_t) i < size ) {
-      return (size_t) i;
-    } else if (insert && ((size_t) i == size)) {
-      return size;
-    }
-    
-    throw std::out_of_range("index out of range");
-  }
-
-  inline size_t
-  slice_index(ptrdiff_t i, size_t size) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size) {
-	return (size_t) (i + size);
-      } else {
-	throw std::out_of_range("index out of range");
-      }
-    } else {
-      return ( (size_t) i < size ) ? ((size_t) i) : size;
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::iterator
-  getpos(Sequence* self, Difference i)  {
-    typename Sequence::iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::const_iterator
-  cgetpos(const Sequence* self, Difference i)  {
-    typename Sequence::const_iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence, class Difference>
-  inline Sequence*
-  getslice(const Sequence* self, Difference i, Difference j) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-
-    if (jj > ii) {
-      typename Sequence::const_iterator vb = self->begin();
-      typename Sequence::const_iterator ve = self->begin();
-      std::advance(vb,ii);
-      std::advance(ve,jj);
-      return new Sequence(vb, ve);
-    } else {
-      return new Sequence();
-    }
-  }
-
-  template <class Sequence, class Difference, class InputSeq>
-  inline void
-  setslice(Sequence* self, Difference i, Difference j, const InputSeq& v) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, true);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-    if (jj < ii) jj = ii;
-    size_t ssize = jj - ii;
-    if (ssize <= v.size()) {
-      typename Sequence::iterator sb = self->begin();
-      typename InputSeq::const_iterator vmid = v.begin();
-      std::advance(sb,ii);
-      std::advance(vmid, jj - ii);
-      self->insert(std::copy(v.begin(), vmid, sb), vmid, v.end());
-    } else {
-      typename Sequence::iterator sb = self->begin();
-      typename Sequence::iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      self->erase(sb,se);
-      self->insert(sb, v.begin(), v.end());
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline void
-  delslice(Sequence* self, Difference i, Difference j) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, true);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-    if (jj > ii) {
-      typename Sequence::iterator sb = self->begin();
-      typename Sequence::iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      self->erase(sb,se);
-    }
-  }
-}
-}
-
-%define %swig_container_methods(Container...)
-
-  %newobject __getslice__;
-
-  %extend {
-    bool __nonzero__() const {
-      return !(self->empty());
-    }
-
-    size_type __len__() const {
-      return self->size();
-    }
-  }
-%enddef
-
-%define %swig_sequence_methods_common(Sequence...)
-//  %swig_sequence_iterator(%arg(Sequence))
-  %swig_container_methods(%arg(Sequence))
-
-  %fragment("StdSequenceTraits");
-
-  %extend {
-    value_type pop() throw (std::out_of_range) {
-      if (self->size() == 0)
-	throw std::out_of_range("pop from empty container");
-      Sequence::value_type x = self->back();
-      self->pop_back();
-      return x;
-    }
-
-    Sequence* __getslice__(difference_type i, difference_type j) throw (std::out_of_range) {
-      return swig::getslice(self, i, j);
-    }
-
-    void __setslice__(difference_type i, difference_type j, const Sequence& v) 
-      throw (std::out_of_range, std::invalid_argument) {
-      swig::setslice(self, i, j, v);
-    }
-
-    void __delslice__(difference_type i, difference_type j) throw (std::out_of_range) {
-      swig::delslice(self, i, j);
-    }
-
-    void __delitem__(difference_type i) throw (std::out_of_range) {
-      self->erase(swig::getpos(self,i));
-    }
-  }
-%enddef
-
-%define %swig_sequence_methods(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-  %extend {
-    const value_type& __getitem__(difference_type i) const throw (std::out_of_range) {
-      return *(swig::cgetpos(self, i));
-    }
-
-    void __setitem__(difference_type i, const value_type& x) throw (std::out_of_range) {
-      *(swig::getpos(self,i)) = x;
-    }
-
-    void append(const value_type& x) {
-      self->push_back(x);
-    }
- }
-%enddef
-
-%define %swig_sequence_methods_val(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-  %extend {
-    value_type __getitem__(difference_type i) throw (std::out_of_range) {
-      return *(swig::cgetpos(self, i));
-    }
-
-    void __setitem__(difference_type i, value_type x) throw (std::out_of_range) {
-      *(swig::getpos(self,i)) = x;
-    }
-
-    void append(value_type x) {
-      self->push_back(x);
-    }
- }
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/r/rfragments.swg b/dependencies2013/win32/swig/Lib/r/rfragments.swg
deleted file mode 100644
index b89212b0..00000000
--- a/dependencies2013/win32/swig/Lib/r/rfragments.swg
+++ /dev/null
@@ -1,195 +0,0 @@
-#define SWIG_Error(code, msg) Rf_warning(msg); return Rf_ScalarLogical(NA_LOGICAL)
-
-#define SWIG_fail return Rf_ScalarLogical(NA_LOGICAL)
-
-/* for raw pointers */
-#define SWIG_ConvertPtr(oc, ptr, ty, flags)             SWIG_R_ConvertPtr(oc, ptr, ty, flags)
-#define SWIG_ConvertFunctionPtr(oc, ptr, ty)            SWIG_R_ConvertPtr(oc, ptr, ty, 0)
-#define SWIG_NewPointerObj(ptr, ty, flags)              SWIG_R_NewPointerObj(ptr, ty, flags)
-#define SWIG_NewFunctionPtrObj(ptr, ty)                 SWIG_R_NewPointerObj(ptr, ty, 0)
-
-/* for raw packed data */
-#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_R_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewPackedObj(ptr, sz, ty)                  SWIG_R_NewPackedObj(ptr, sz, ty)
-
-/* for class or struct pointers */
-#define SWIG_ConvertInstance(obj, pptr, ty, flags)      SWIG_ConvertPtr(obj, pptr, ty, flags)
-#define SWIG_NewInstanceObj(ptr, ty, flags)             SWIG_NewPointerObj(ptr, ty, flags)
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_R_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, ty)                  SWIG_R_NewPackedObj(ptr, sz, ty)
-
-
-/* Runtime API */
-
-#define SWIG_GetModule(clientdata)                      SWIG_R_GetModule()
-#define SWIG_SetModule(clientdata, pointer)             SWIG_R_SetModule(pointer)
-
-%fragment(SWIG_From_frag(long),"header") {
-SWIGINTERNINLINE SEXP
-SWIG_From_dec(long)(long value)
-{
-	return Rf_ScalarInteger((int)value);
-}
-}
-
-%fragment(SWIG_AsVal_frag(long),"header") {
-SWIGINTERNINLINE  int
-SWIG_AsVal_dec(long)(SEXP obj, long *val)
-{
-   if (val) *val = Rf_asInteger(obj);
-   return SWIG_OK;
-}
-}
-
-
-%fragment(SWIG_From_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE SEXP
-SWIG_From_dec(long long)(long long value)
-{
-	return Rf_ScalarInteger((int)value);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE  int
-SWIG_AsVal_dec(long long)(SEXP obj, long long *val)
-{
-   if (val) *val = Rf_asInteger(obj);
-   return SWIG_OK;
-}
-%#endif
-}
-
-%fragment(SWIG_From_frag(unsigned long),"header") {
-SWIGINTERNINLINE SEXP
-SWIG_From_dec(unsigned long)(unsigned long value)
-{
-	return Rf_ScalarInteger((int)value);
-}
-}
-
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header") {
-SWIGINTERNINLINE  int
-SWIG_AsVal_dec(unsigned long)(SEXP obj, unsigned long *val)
-{
-   if (val) *val = Rf_asInteger(obj);
-   return SWIG_OK;
-}
-}
-
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE SEXP
-SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-	return Rf_ScalarInteger((int)value);
-}
-%#endif
-}
-
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE  int
-SWIG_AsVal_dec(unsigned long long)(SEXP obj, unsigned long long *val)
-{
-   if (val) *val = Rf_asInteger(obj);
-   return SWIG_OK;
-}
-%#endif
-}
-
-%fragment(SWIG_From_frag(double),"header") {
-SWIGINTERNINLINE SEXP
-SWIG_From_dec(double)(double value)
-{
-	return Rf_ScalarReal(value);
-}
-}
-
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-SWIGINTERNINLINE  int
-SWIG_AsVal_dec(double)(SEXP obj, double *val)
-{
-   if (val) *val = Rf_asReal(obj);
-   return SWIG_OK;
-}
-}
-
-%fragment("SWIG_AsCharPtrAndSize", "header") 
-{
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(SEXP obj, char** cptr, size_t* psize, int *alloc)
-{
-  if (cptr && Rf_isString(obj)) {
-    char *cstr = %const_cast(CHAR(STRING_ELT(obj, 0)), char *);
-    int len = strlen(cstr);
-
-    if (alloc) {
-      if (*alloc == SWIG_NEWOBJ) {
-        *cptr = %new_copy_array(cstr, len + 1, char);
-        *alloc = SWIG_NEWOBJ;
-      } else {
-        *cptr = cstr;
-      }
-    } else {
-      *cptr = %reinterpret_cast(malloc(len + 1), char *);
-      *cptr = strcpy(*cptr, cstr);
-    }
-    if (psize) *psize = len + 1;
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_strdup","header") 
-{
-SWIGINTERN char *
-SWIG_strdup(const char *str)
-{
-  char *newstr = %reinterpret_cast(malloc(strlen(str) + 1), char *);
-  return strcpy(newstr, str);
-}
-}
-
-//# This is modified from the R header files
-
-%fragment("SWIG_FromCharPtrAndSize","header") 
-{
-SWIGINTERN SEXP
-SWIG_FromCharPtrAndSize(const char* carray, size_t size) 
-{
-  SEXP t, c;
-  if (!carray) return R_NilValue;
-/* See R internals document 1.10.  
-   MkCharLen was introduced in 2.7.0.  Use that instead of hand
-   creating vector.
-
-   Starting in 2.8.0 creating strings via vectors was deprecated in
-   order to allow for use of CHARSXP caches. */
-
-  Rf_protect(t = Rf_allocVector(STRSXP, 1));
-%#if R_VERSION >=  R_Version(2,7,0)
-  c = Rf_mkCharLen(carray, size);
-%#else
-  c = Rf_allocVector(CHARSXP, size);
-  strncpy((char *)CHAR(c), carray, size);
-%#endif
-  SET_STRING_ELT(t, 0, c);
-  Rf_unprotect(1);
-  return t;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/r/rkw.swg b/dependencies2013/win32/swig/Lib/r/rkw.swg
deleted file mode 100644
index 074d7dfd..00000000
--- a/dependencies2013/win32/swig/Lib/r/rkw.swg
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Warnings for R keywords, built-in names and bad names.
-*/
-
-#define RKW(x) %keywordwarn("'" `x` "' is a R keyword, renaming to '_" `x`"'", rename="_%s")  `x`
-#define RSWIGKW(x) %keywordwarn("'" `x` "' is a SWIG R reserved parameter name, renaming to '_" `x`"'", rename="_%s")  `x`
-
-/*
-  Warnings for R reserved words taken from
-  http://cran.r-project.org/doc/manuals/R-lang.html#Reserved-words
-*/
-
-RKW(if);
-RKW(else);
-RKW(repeat);
-RKW(while);
-RKW(function);
-RKW(for);
-RKW(in);
-RKW(next);
-RKW(break);
-RKW(TRUE);
-RKW(FALSE);
-RKW(NULL);
-RKW(Inf);
-RKW(NaN);
-RKW(NA);
-RKW(NA_integer_);
-RKW(NA_real_);
-RKW(NA_complex_);
-RKW(NA_character_);
-
-RSWIGKW(self);
-
-#undef RKW
-#undef RSWIGKW
diff --git a/dependencies2013/win32/swig/Lib/r/ropers.swg b/dependencies2013/win32/swig/Lib/r/ropers.swg
deleted file mode 100644
index acb99798..00000000
--- a/dependencies2013/win32/swig/Lib/r/ropers.swg
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifdef __cplusplus
-
-%rename(Equal) operator =;
-%rename(PlusEqual) operator +=;
-%rename(MinusEqual) operator -=;
-%rename(MultiplyEqual) operator *=;
-%rename(DivideEqual) operator /=;
-%rename(PercentEqual) operator %=;
-%rename(Plus) operator +;
-%rename(Minus) operator -;
-%rename(Multiply) operator *;
-%rename(Divide) operator /;
-%rename(Percent) operator %;
-%rename(Not) operator !;
-%rename(IndexIntoConst) operator[](unsigned idx) const;
-%rename(IndexInto) operator[](unsigned idx);
-%rename(Functor) operator ();
-%rename(EqualEqual) operator ==;
-%rename(NotEqual) operator !=;
-%rename(LessThan) operator <;
-%rename(LessThanEqual) operator <=;
-%rename(GreaterThan) operator >;
-%rename(GreaterThanEqual) operator >=;
-%rename(And) operator &&;
-%rename(Or) operator ||;
-%rename(PlusPlusPrefix) operator++();
-%rename(PlusPlusPostfix) operator++(int);
-%rename(MinusMinusPrefix) operator--();
-%rename(MinusMinusPostfix) operator--(int);
-
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/r/rrun.swg b/dependencies2013/win32/swig/Lib/r/rrun.swg
deleted file mode 100644
index 81f6461d..00000000
--- a/dependencies2013/win32/swig/Lib/r/rrun.swg
+++ /dev/null
@@ -1,377 +0,0 @@
-
-/* Remove global namespace pollution */
-#if !defined(SWIG_NO_R_NO_REMAP)
-# define R_NO_REMAP
-#endif
-#if !defined(SWIG_NO_STRICT_R_HEADERS)
-# define STRICT_R_HEADERS
-#endif
-
-#include <Rdefines.h>
-#include <Rversion.h>
-
-#ifdef __cplusplus
-#include <exception>
-extern "C" {
-#endif
-
-/* for raw pointer */
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_R_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_R_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_R_NewPointerObj(ptr, type, flags)
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#if R_VERSION >= R_Version(2,6,0)
-#define VMAXTYPE void *
-#else
-#define VMAXTYPE char *
-#endif
-
-/*
-  This is mainly a way to avoid having lots of local variables that may 
-  conflict with those in the routine.
-
-   Change name to R_SWIG_Callb....
-*/
-typedef struct RCallbackFunctionData {
-
-  SEXP fun;
-  SEXP userData;
-
-
-  SEXP expr;
-  SEXP retValue;
-  int errorOccurred;
-
-  SEXP el;  /* Temporary pointer used in the construction of the expression to call the R function. */
-
-  struct RCallbackFunctionData *previous;   /* Stack */
-
-} RCallbackFunctionData;
-
-static RCallbackFunctionData  *callbackFunctionDataStack;
-
-
-SWIGRUNTIME SEXP
-R_SWIG_debug_getCallbackFunctionData()
-{
-  int n, i;
-  SEXP ans;
-  RCallbackFunctionData  *p = callbackFunctionDataStack;
-
-  n = 0;
-  while(p) { 
-    n++;
-    p = p->previous;
-  }
-
-  Rf_protect(ans = Rf_allocVector(VECSXP, n));
-  for(p = callbackFunctionDataStack, i = 0; i < n; p = p->previous, i++) 
-      SET_VECTOR_ELT(ans, i, p->fun);
-
-  Rf_unprotect(1);
-
-  return(ans);
-}
-
-
-
-SWIGRUNTIME RCallbackFunctionData *
-R_SWIG_pushCallbackFunctionData(SEXP fun, SEXP userData)
-{
-   RCallbackFunctionData *el;
-   el = (RCallbackFunctionData *) calloc(1, sizeof(RCallbackFunctionData));
-   el->fun = fun;
-   el->userData = userData;
-   el->previous = callbackFunctionDataStack;
-
-   callbackFunctionDataStack = el;
-
-   return(el);
-}
-
-
-SWIGRUNTIME SEXP
-R_SWIG_R_pushCallbackFunctionData(SEXP fun, SEXP userData)
-{
-    R_SWIG_pushCallbackFunctionData(fun, userData);
-    return R_NilValue;
-}
-
-SWIGRUNTIME RCallbackFunctionData *
-R_SWIG_getCallbackFunctionData()
-{
-  if(!callbackFunctionDataStack) {
-    Rf_error("Supposedly impossible error occurred in the SWIG callback mechanism."
-            "  No callback function data set.");
-  }
-  
-  return callbackFunctionDataStack;
-}
-
-SWIGRUNTIME void
-R_SWIG_popCallbackFunctionData(int doFree)
-{
-  RCallbackFunctionData  *el = NULL;
-  if(!callbackFunctionDataStack)
-    return ; /* Error !!! */
-
-  el = callbackFunctionDataStack ;
-  callbackFunctionDataStack = callbackFunctionDataStack->previous;
-
-  if(doFree)
-     free(el);
-}
-
-
-/*
-  Interface to S function
-      is(obj, type)
-  which is to be used to determine if an 
-  external pointer inherits from the right class.
-
-  Ideally, we would like to be able to do this without an explicit call to the is() function.
-  When the S4 class system uses its own SEXP types, then we will hopefully be able to do this
-  in the C code.
-
-  Should we make the expression static and preserve it to avoid the overhead of 
-  allocating each time.
-*/
-SWIGRUNTIME int
-R_SWIG_checkInherits(SEXP obj, SEXP tag, const char *type)
-{
-  SEXP e, val;
-  int check_err = 0;
-
-  Rf_protect(e = Rf_allocVector(LANGSXP, 3));
-  SETCAR(e, Rf_install("extends"));
-
-  SETCAR(CDR(e), Rf_mkString(CHAR(PRINTNAME(tag))));
-  SETCAR(CDR(CDR(e)), Rf_mkString(type));
-
-  val = R_tryEval(e, R_GlobalEnv, &check_err);
-  Rf_unprotect(1);
-  if(check_err) 
-    return(0);
-
-
-  return(LOGICAL(val)[0]);
-}
-
-
-SWIGRUNTIME void *
-R_SWIG_resolveExternalRef(SEXP arg, const char * const type, const char * const argName, Rboolean nullOk)
-{
-  void *ptr;
-  SEXP orig = arg;
-
-  if(TYPEOF(arg) != EXTPTRSXP) 
-    arg = GET_SLOT(arg, Rf_mkString("ref"));
-
-  
-  if(TYPEOF(arg) != EXTPTRSXP) {
-    Rf_error("argument %s must be an external pointer (from an ExternalReference)", argName);
-  }
-
-
-  ptr = R_ExternalPtrAddr(arg);
-
-  if(ptr == NULL && nullOk == (Rboolean) FALSE) {
-    Rf_error("the external pointer (of type %s) for argument %s has value NULL", argName, type);
-  }
-
-  if(type[0] && R_ExternalPtrTag(arg) != Rf_install(type) && strcmp(type, "voidRef")
-      && !R_SWIG_checkInherits(orig,  R_ExternalPtrTag(arg), type)) {
-    Rf_error("the external pointer for argument %s has tag %s, not the expected value %s",
-             argName, CHAR(PRINTNAME(R_ExternalPtrTag(arg))), type);
-  }
-
-
-  return(ptr);
-}
-
-SWIGRUNTIME void
-R_SWIG_ReferenceFinalizer(SEXP el)
-{
-  void *ptr = R_SWIG_resolveExternalRef(el, "", "<finalizer>",  (Rboolean) 1);
-  fprintf(stderr, "In R_SWIG_ReferenceFinalizer for %p\n", ptr);
-  Rf_PrintValue(el);
-
-  if(ptr) {
-     if(TYPEOF(el) != EXTPTRSXP)
-        el = GET_SLOT(el, Rf_mkString("ref"));
-
-     if(TYPEOF(el) == EXTPTRSXP)
-        R_ClearExternalPtr(el);
-
-     free(ptr);
-  }
-
-  return;
-}
-
-typedef enum {R_SWIG_EXTERNAL, R_SWIG_OWNER } R_SWIG_Owner;
-
-SWIGRUNTIME SEXP
-SWIG_MakePtr(void *ptr, const char *typeName, R_SWIG_Owner owner)
-{
-  SEXP external, r_obj;
-
-  Rf_protect(external = R_MakeExternalPtr(ptr, Rf_install(typeName), R_NilValue));
-  Rf_protect(r_obj = NEW_OBJECT(MAKE_CLASS((char *) typeName)));
-
-  if(owner)
-    R_RegisterCFinalizer(external, R_SWIG_ReferenceFinalizer);
-
-  r_obj = SET_SLOT(r_obj, Rf_mkString((char *) "ref"), external);
-  SET_S4_OBJECT(r_obj);
-  Rf_unprotect(2);
-
-  return(r_obj);
-}
-
-
-SWIGRUNTIME SEXP
-R_SWIG_create_SWIG_R_Array(const char *typeName, SEXP ref, int len)
-{
-   SEXP arr;
-
-/*XXX remove the char * cast when we can. MAKE_CLASS should be declared appropriately. */
-   Rf_protect(arr = NEW_OBJECT(MAKE_CLASS((char *) typeName)));
-   Rf_protect(arr = R_do_slot_assign(arr, Rf_mkString("ref"), ref));
-   Rf_protect(arr = R_do_slot_assign(arr, Rf_mkString("dims"), Rf_ScalarInteger(len)));
-
-   Rf_unprotect(3); 			   
-   SET_S4_OBJECT(arr);	
-   return arr;
-}
-
-#define ADD_OUTPUT_ARG(result, pos, value, name)  r_ans = AddOutputArgToReturn(pos, value, name, OutputValues);
-
-SWIGRUNTIME SEXP
-AddOutputArgToReturn(int pos, SEXP value, const char *name, SEXP output)
-{
-  SET_VECTOR_ELT(output, pos, value);
-
-  return(output);
-}
-
-/* Create a new pointer object */
-SWIGRUNTIMEINLINE SEXP
-SWIG_R_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
-  SEXP rptr = R_MakeExternalPtr(ptr, 
-  R_MakeExternalPtr(type, R_NilValue, R_NilValue), R_NilValue); 
-  SET_S4_OBJECT(rptr);
-  return rptr;
-}
-
-
-/* Convert a pointer value */
-SWIGRUNTIMEINLINE int
-SWIG_R_ConvertPtr(SEXP obj, void **ptr, swig_type_info *ty, int flags) {
-  void *vptr;
-  if (!obj) return SWIG_ERROR;
-  if (obj == R_NilValue) {
-    if (ptr) *ptr = NULL;
-    return SWIG_OK;
-  }
-
-  vptr = R_ExternalPtrAddr(obj);
-  if (ty) {
-    swig_type_info *to = (swig_type_info*) 
-      R_ExternalPtrAddr(R_ExternalPtrTag(obj));
-    if (to == ty) {
-      if (ptr) *ptr = vptr;
-    } else {
-      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      int newmemory = 0;
-      if (ptr) *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
-    }
-  } else {
-      if (ptr) *ptr = vptr;
- }
-  return SWIG_OK;
-}
-
-SWIGRUNTIME swig_module_info *
-SWIG_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
-  static void *type_pointer = (void *)0;
-  return (swig_module_info *) type_pointer;
-}
-
-SWIGRUNTIME void
-SWIG_SetModule(void *v, swig_module_info *swig_module) {
-}
-
-typedef struct {
-  void *pack;
-  swig_type_info *ty;
-  size_t size;
-} RSwigPacked;
-
-/* Create a new packed object */
-
-SWIGRUNTIMEINLINE SEXP RSwigPacked_New(void *ptr, size_t sz,
-		  swig_type_info *ty) {
-  SEXP rptr;
-  RSwigPacked *sobj = 
-  (RSwigPacked*) malloc(sizeof(RSwigPacked));
-  if (sobj) {
-    void *pack = malloc(sz);
-    if (pack) {
-      memcpy(pack, ptr, sz);
-      sobj->pack = pack;
-      sobj->ty   = ty;
-      sobj->size = sz;
-    } else {
-      sobj = 0;
-    }
-  }
-  rptr = R_MakeExternalPtr(sobj, R_NilValue, R_NilValue); 
-  return rptr;
-}
-
-SWIGRUNTIME swig_type_info *
-RSwigPacked_UnpackData(SEXP obj, void *ptr, size_t size)
-{
-    RSwigPacked *sobj = 
-        (RSwigPacked *)R_ExternalPtrAddr(obj);
-    if (sobj->size != size) return 0;
-    memcpy(ptr, sobj->pack, size);
-    return sobj->ty;
-}
-
-SWIGRUNTIMEINLINE SEXP
-SWIG_R_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return ptr ? RSwigPacked_New((void *) ptr, sz, type) : R_NilValue;
-}
-
-/* Convert a packed value value */
-
-SWIGRUNTIME int
-SWIG_R_ConvertPacked(SEXP obj, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = RSwigPacked_UnpackData(obj, ptr, sz);
-  if (!to) return SWIG_ERROR;
-  if (ty) {
-    if (to != ty) {
-      /* check type cast? */
-      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      if (!tc) return SWIG_ERROR;
-    }
-  }
-  return SWIG_OK;
-}  
-
-#ifdef __cplusplus
-#define SWIG_exception_noreturn(code, msg) do { throw std::runtime_error(msg); } while(0)
-#else
-#define SWIG_exception_noreturn(code, msg) do { return result; } while(0)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/r/rstdcommon.swg b/dependencies2013/win32/swig/Lib/r/rstdcommon.swg
deleted file mode 100644
index e6c873a0..00000000
--- a/dependencies2013/win32/swig/Lib/r/rstdcommon.swg
+++ /dev/null
@@ -1,211 +0,0 @@
-%fragment("StdTraits","header",fragment="StdTraitsCommon")
-{
-namespace swig {  
-  /*
-    Traits that provides the from method
-  */
-
-  template <class Type> struct traits_from_ptr {
-    static SWIG_Object from(Type *val, int owner = 0) {
-      return SWIG_NewPointerObj(val, type_info<Type>(), owner);
-    }
-  };
-
-  template <class Type> struct traits_from {
-    static SWIG_Object from(const Type& val) {
-      return traits_from_ptr<Type>::from(new Type(val), 1);
-    }
-  };
-
-  template <class Type> struct traits_from<Type *> {
-    static SWIG_Object from(Type* val) {
-      return traits_from_ptr<Type>::from(val, 0);
-    }
-  };
-
-  template <class Type>
-  inline SWIG_Object from(const Type& val) {
-    return traits_from<Type>::from(val);
-  }
-
-  template <class Type>
-  inline SWIG_Object from_ptr(Type* val, int owner) {
-    return traits_from_ptr<Type>::from(val, owner);
-  }
-
-  /*
-    Traits that provides the asval/as/check method
-  */
-  template <class Type>
-  struct traits_asptr {   
-    static int asptr(SWIG_Object obj, Type **val) {
-      Type *p;
-      swig_type_info *descriptor = type_info<Type>();
-      int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-      if (SWIG_IsOK(res)) {
-	if (val) *val = p;
-      }
-      return res;
-    }
-  }; 
-
-  template <class Type>
-  inline int asptr(SWIG_Object obj, Type **vptr) {
-    return traits_asptr<Type>::asptr(obj, vptr);
-  }
-
-  template <class Type> 
-  struct traits_asval {
-    static int asval(SWIG_Object obj, Type *val) {
-      if (val) {
-	Type *p = 0;
-	int res = traits_asptr<Type>::asptr(obj, &p);
-	if (!SWIG_IsOK(res)) return res;	
-	if (p) {
-	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
-	  *(const_cast<noconst_type*>(val)) = *p;
-	  if (SWIG_IsNewObj(res)){
-	    %delete(p);
-	    res = SWIG_DelNewMask(res);
-	  }
-	  return res;
-	} else {
-	  return SWIG_ERROR;
-	}
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-
-  template <class Type> struct traits_asval<Type*> {
-    static int asval(SWIG_Object obj, Type **val) {
-      if (val) {
-        typedef typename noconst_traits<Type>::noconst_type noconst_type;
-        noconst_type *p = 0;
-        int res = traits_asptr<noconst_type>::asptr(obj,  &p);
-        if (SWIG_IsOK(res)) {
-          *(const_cast<noconst_type**>(val)) = p;
-	}
-	return res;
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-  
-  template <class Type>
-  inline int asval(SWIG_Object obj, Type *val) {
-    return traits_asval<Type>::asval(obj, val);
-  }
-
-  template <class Type> 
-  struct traits_as<Type, value_category> {
-    static Type as(SWIG_Object obj, bool throw_error) {
-      Type v;
-      int res = asval(obj, &v);
-      if (!obj || !SWIG_IsOK(res)) {
-	if (throw_error)
-          throw std::invalid_argument("bad type");
-      }
-      return v;
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type, pointer_category> {
-    static Type as(SWIG_Object obj, bool throw_error) {
-      Type *v = 0;      
-      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
-      if (SWIG_IsOK(res) && v) {
-	if (SWIG_IsNewObj(res)) {
-	  Type r(*v);
-	  %delete(v);
-	  return r;
-	} else {
-	  return *v;
-	}
-      } else {
-	// Uninitialized return value, no Type() constructor required.
-	static Type *v_def = (Type*) malloc(sizeof(Type));
-	if (throw_error)
-          throw std::invalid_argument("bad type");
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
-      }
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type*, pointer_category> {
-    static Type* as(SWIG_Object obj, bool throw_error) {
-      Type *v = 0;      
-      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
-      if (SWIG_IsOK(res)) {
-	return v;
-      } else {
-	if (throw_error)
-          throw std::invalid_argument("bad type");
-	return 0;
-      }
-    }
-  };
-    
-  template <class Type>
-  inline Type as(SWIG_Object obj, bool te = false) {
-    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
-  }
-
-  template <class Type> 
-  struct traits_check<Type, value_category> {
-    static bool check(SWIG_Object obj) {
-      int res = obj ? asval(obj, (Type *)(0)) : SWIG_ERROR;
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type> 
-  struct traits_check<Type, pointer_category> {
-    static bool check(SWIG_Object obj) {
-      int res = obj ? asptr(obj, (Type **)(0)) : SWIG_ERROR;
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type>
-  inline bool check(SWIG_Object obj) {
-    return traits_check<Type, typename traits<Type>::category>::check(obj);
-  }
-}
-}
-
-%define %specialize_std_container(Type,Check,As,From)
-%{
-namespace swig {
-  template <>  struct traits_asval<Type > {   
-    typedef Type value_type;
-    static int asval(SWIG_Object obj, value_type *val) {
-      if (Check(obj)) {
-	if (val) *val = As(obj);
-	return SWIG_OK;
-      }
-      return SWIG_ERROR;
-    }
-  };
-  template <>  struct traits_from<Type > {
-    typedef Type value_type;
-    static SWIG_Object from(const value_type& val) {
-      return From(val);
-    }
-  };
-
-  template <> 
-  struct traits_check<Type, value_category> {
-    static int check(SWIG_Object obj) {
-      int res = Check(obj);
-      return obj && res ? res : 0;
-    }
-  };
-}
-%}
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/r/rtype.swg b/dependencies2013/win32/swig/Lib/r/rtype.swg
deleted file mode 100644
index 22639f2d..00000000
--- a/dependencies2013/win32/swig/Lib/r/rtype.swg
+++ /dev/null
@@ -1,317 +0,0 @@
-
-/* These map the primitive C types to the appropriate R type
-   for use in class representations. 
- */
-
-%typemap("rtype") int, int *, int &      "integer";
-%typemap("rtype") long, long *, long &      "integer";
-%typemap("rtype") float, float*, float & "numeric";
-%typemap("rtype") double, double*, double & "numeric";
-%typemap("rtype") char *, char ** "character";
-%typemap("rtype") char            "character";
-%typemap("rtype") string, string *, string & "character";
-%typemap("rtype") std::string, std::string *, std::string & "character";
-%typemap("rtype") bool, bool *    "logical";
-%typemap("rtype") enum SWIGTYPE   "character";
-%typemap("rtype") enum SWIGTYPE *   "character";
-%typemap("rtype") enum SWIGTYPE *const   "character";
-%typemap("rtype") enum SWIGTYPE &  "character";
-%typemap("rtype") enum SWIGTYPE &&  "character";
-%typemap("rtype") SWIGTYPE * "$R_class";
-%typemap("rtype") SWIGTYPE *const "$R_class";
-%typemap("rtype") SWIGTYPE & "$R_class";
-%typemap("rtype") SWIGTYPE && "$R_class";
-%typemap("rtype") SWIGTYPE "$&R_class";
-
-%typemap("rtypecheck") int, int &, long, long &
-  %{ (is.integer($arg) || is.numeric($arg)) && length($arg) == 1 %}
-%typemap("rtypecheck") int *, long *
-  %{ is.integer($arg) || is.numeric($arg) %}
-
-
-%typemap("rtypecheck") float, double
-  %{ is.numeric($arg) && length($arg) == 1 %}
-%typemap("rtypecheck") float *, double *
-  %{ is.numeric($arg) %}
-
-%typemap("rtypecheck") bool, bool &
-  %{ is.logical($arg) && length($arg) == 1 %}
-%typemap("rtypecheck") bool *
-  %{ is.logical($arg) %}
-
-/*
-  Set up type checks to insure overloading precedence.
-  We would like non pointer items to shadow pointer items, so that 
-  they get called if length = 1
-*/
-
-%typecheck(SWIG_TYPECHECK_BOOL) bool {}
-%typecheck(SWIG_TYPECHECK_UINT32) unsigned int {}
-%typecheck(SWIG_TYPECHECK_INTEGER) int {}
-%typecheck(SWIG_TYPECHECK_FLOAT) float {}
-%typecheck(SWIG_TYPECHECK_DOUBLE) double {}
-
-%typecheck(SWIG_TYPECHECK_BOOL_PTR) bool * {}
-%typecheck(SWIG_TYPECHECK_INT32_PTR) int * {}
-%typecheck(SWIG_TYPECHECK_FLOAT_PTR) float * {}
-%typecheck(SWIG_TYPECHECK_DOUBLE_PTR) double * {}
-%typecheck(SWIG_TYPECHECK_CHAR_PTR) char * {}
-
-%typecheck(SWIG_TYPECHECK_INT32_ARRAY) int[ANY] {}
-%typecheck(SWIG_TYPECHECK_FLOAT_ARRAY) float[ANY] {}
-%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY) double [ANY] {}
-
-/* Have to be careful that as(x, "numeric") is different from as.numeric(x).  
-   The latter makes a REALSXP, whereas the former leaves an INTSXP as an
-   INTSXP.
-*/
-
-/* Force coercion of integer, since by default R sets all constants to
-   numeric, which means that you can't directly call a function with an 
-   integer using an R numercal literal */
-
-%typemap(scoercein) int, int *, int &
-  %{  $input = as.integer($input);     %}
-%typemap(scoercein) long, long *, long &
-  %{  $input = as.integer($input);     %}
-%typemap(scoercein) float, float*, float &,
-  double, double *, double &
-  %{ %}
-%typemap(scoercein) char, char *, char &
-  %{  $input = as($input, "character");     %}
-%typemap(scoercein) string, string *, string &
-  %{  $input = as($input, "character");     %}
-%typemap(scoercein) std::string, std::string *, std::string &
-  %{  $input = as($input, "character");     %}
-%typemap(scoercein) enum SWIGTYPE 
-  %{  $input = enumToInteger($input, "$R_class"); %}
-%typemap(scoercein) enum SWIGTYPE &
-  %{  $input = enumToInteger($input, "$R_class"); %}
-%typemap(scoercein) enum SWIGTYPE &&
-  %{  $input = enumToInteger($input, "$R_class"); %}
-%typemap(scoercein) enum SWIGTYPE *
-  %{  $input = enumToInteger($input, "$R_class"); %}
-%typemap(scoercein) enum SWIGTYPE *const
-  %{  $input = enumToInteger($input, "$R_class"); %}
-
-%typemap(scoercein) SWIGTYPE, SWIGTYPE *, SWIGTYPE *const, SWIGTYPE &, SWIGTYPE &&
- %{ if (inherits($input, "ExternalReference")) $input = slot($input,"ref") %}
-
-/*
-%typemap(scoercein) SWIGTYPE *, SWIGTYPE *const
-  %{ $input = coerceIfNotSubclass($input, "$R_class") %}
-
-%typemap(scoercein) SWIGTYPE & 
-  %{ $input = coerceIfNotSubclass($input, "$R_class") %}
-
-%typemap(scoercein) SWIGTYPE && 
-  %{ $input = coerceIfNotSubclass($input, "$R_class") %}
-
-%typemap(scoercein) SWIGTYPE  
-  %{ $input = coerceIfNotSubclass($input, "$&R_class") %}
-*/
-
-%typemap(scoercein) SWIGTYPE[ANY]  
- %{
-    if(is.list($input))
-      assert(all(sapply($input, class) == "$R_class"));
- %}
-
-
-/* **************************************************************** */
-
-%typemap(scoercein) bool, bool *, bool & 
-		    "$input = as.logical($input);";
-%typemap(scoercein) int, 
-                    int *, 
-		    int &,
-		    long,
-		    long *,
-		    long &
-  "$input = as.integer($input);";
-
-%typemap(scoercein) char *, string, std::string,
-string &, std::string &
-%{  $input = as($input, "character"); %}
-
-%typemap(scoerceout) enum SWIGTYPE 
-  %{  $result = enumFromInteger($result, "$R_class"); %}
-
-%typemap(scoerceout) enum SWIGTYPE &
-  %{  $result = enumFromInteger($result, "$R_class"); %}
-
-%typemap(scoerceout) enum SWIGTYPE &&
-  %{  $result = enumFromInteger($result, "$R_class"); %}
-
-%typemap(scoerceout) enum SWIGTYPE *
-  %{  $result = enumToInteger($result, "$R_class"); %}
-
-%typemap(scoerceout) enum SWIGTYPE *const
-  %{  $result = enumToInteger($result, "$R_class"); %}
-
-%typemap(scoerceout) SEXP %{ %}
-
-%typemap(scoerceout) SWIGTYPE
-  %{ $result <- new("$&R_class", ref=$result); %}
- 
-%typemap(scoerceout) SWIGTYPE &
-  %{ $result <- new("$R_class", ref=$result) ; %}
- 
-%typemap(scoerceout) SWIGTYPE &&
-  %{ $result <- new("$R_class", ref=$result) ; %}
- 
-%typemap(scoerceout) SWIGTYPE *
-  %{ $result <- new("$R_class", ref=$result) ; %}
- 
-%typemap(scoerceout) SWIGTYPE *const
-  %{ $result <- new("$R_class", ref=$result) ; %}
-
-
-/* Override the SWIGTYPE * above. */
-%typemap(scoerceout) char,
-		     char *,
-		     char &,
-                     float,
-		     double,
-		     float*,
-		     double*,
-		     float &,
-		     double &,
-                     int,
-		     int &,
-		     long,
-		     long &,
-                     bool,
-		     bool &,
-		     string,
-		     std::string,
-		     string &,
-		     std::string &, 
-		     void,
-		     signed int,
-		     signed int &,		     
-		     unsigned int,
-		     unsigned int &,		     
-		     short,
-		     short &,		     
-		     unsigned short,
-		     unsigned short &,		     
-		     long long,
-		     signed long long,
-		     signed long long &,		     
-		     unsigned long long,
-		     unsigned long long &,		     
-		     signed long,
-		     signed long &,		     
-		     unsigned long,
-		     unsigned long &,
-		     signed char,
-		     signed char &,
-		     unsigned char,
-		     unsigned char &
- %{    %}
-
-%apply int {size_t,
-std::size_t,
-ptrdiff_t,
-std::ptrdiff_t,
-signed int,
-unsigned int,
-short,
-unsigned short,
-signed char,
-unsigned char}
-
-%apply int* {size_t[],
-std::size_t[],
-ptrdiff_t[],
-std::ptrdiff_t[],
-signed int[],
-unsigned int[],
-short[],
-unsigned short[],
-signed char[],
-unsigned char[]}
-
-%apply int* {size_t[ANY],
-std::size_t[ANY],
-ptrdiff_t[ANY],
-std::ptrdiff_t[ANY],
-signed int[ANY],
-unsigned int[ANY],
-short[ANY],
-unsigned short[ANY],
-signed char[ANY],
-unsigned char[ANY]}
-
-%apply int* {size_t*,
-std::size_t*,
-ptrdiff_t*,
-std::ptrdiff_t*,
-signed int*,
-unsigned int*,
-short*,
-unsigned short*,
-signed char*,
-unsigned char*}
-
-%apply long {
-       long long,
-       signed long long,
-       unsigned long long,
-       signed long,
-       unsigned long}
-
-%apply long* {
-       long long*,
-       signed long long*,
-       unsigned long long*,
-       signed long*,
-       unsigned long*,
-       long long[],
-       signed long long[],
-       unsigned long long[],
-       signed long[],
-       unsigned long[],
-       long long[ANY],
-       signed long long[ANY],
-       unsigned long long[ANY],
-       signed long[ANY],
-       unsigned long[ANY]}
-
-%apply float* {
-       float[],
-       float[ANY]
-}
-%apply double * {
-       double[],
-       double[ANY]
-}
-
-%apply bool* {
-       bool[],
-       bool[ANY]
-}
-
-#if 0
- Just examining the values for a SWIGTYPE.
-
-%typemap(scoerceout) SWIGTYPE  %{
-
-  name = $1_name
-  type = $1_type
-  ltype = $1_ltype
-
-  mangle = $1_mangle
-  descriptor = $1_descriptor
-
-  pointer type = $*1_type
-  pointer ltype = $*1_ltype
-
-  pointer descriptor = $*1_descriptor
-  basetype = $*_basetype
-
-%}
-#endif
-
-
diff --git a/dependencies2013/win32/swig/Lib/r/srun.swg b/dependencies2013/win32/swig/Lib/r/srun.swg
deleted file mode 100644
index 2045ab94..00000000
--- a/dependencies2013/win32/swig/Lib/r/srun.swg
+++ /dev/null
@@ -1,150 +0,0 @@
-#                         srun.swg                            #
-#
-# This is the basic code that is needed at run time within R to
-# provide and define the relevant classes.  It is included
-# automatically in the generated code by copying the contents of
-# srun.swg into the newly created binding code.
-
-
-# This could be provided as a separate run-time library but this
-# approach allows the code to to be included directly into the
-# generated bindings and so removes the need to have and install an
-# additional library.  We may however end up with multiple copies of
-# this and some confusion at run-time as to which class to use. This
-# is an issue when we use NAMESPACES as we may need to export certain
-# classes.
-
-######################################################################
-
-if(length(getClassDef("RSWIGStruct")) == 0) 
-  setClass("RSWIGStruct", representation("VIRTUAL"))
-
-
-
-if(length(getClassDef("ExternalReference")) == 0) 
-# Should be virtual but this means it loses its slots currently
-#representation("VIRTUAL")
-  setClass("ExternalReference", representation( ref = "externalptr"))
-
-
-
-if(length(getClassDef("NativeRoutinePointer")) == 0) 
-  setClass("NativeRoutinePointer", 
-              representation(parameterTypes = "character",
-                             returnType = "character",
-                             "VIRTUAL"), 
-              contains = "ExternalReference")
-
-if(length(getClassDef("CRoutinePointer")) == 0) 
-  setClass("CRoutinePointer", contains = "NativeRoutinePointer")
-
-
-if(length(getClassDef("EnumerationValue")) == 0) 
-  setClass("EnumerationValue", contains = "integer")
-
-
-if(!isGeneric("copyToR")) 
- setGeneric("copyToR",
-            function(value, obj = new(gsub("Ref$", "", class(value)))) 
-               standardGeneric("copyToR"
-           ))
-
-setGeneric("delete", function(obj) standardGeneric("delete"))
-
-
-SWIG_createNewRef = 
-function(className, ..., append = TRUE)
-{
-  f = get(paste("new", className, sep = "_"), mode = "function")
-
-  f(...)
-}
-
-if(!isGeneric("copyToC")) 
- setGeneric("copyToC", 
-             function(value, obj = SWIG_createNewRef(class(value)))
-              standardGeneric("copyToC"
-            ))
-
-
-# 
-defineEnumeration =
-function(name, .values, where = topenv(parent.frame()), suffix = "Value")
-{
-   # Mirror the class definitions via the E analogous to .__C__
-  defName = paste(".__E__", name, sep = "")
-  assign(defName,  .values,  envir = where)
-
-  if(nchar(suffix))
-    name = paste(name, suffix, sep = "")
-
-  setClass(name, contains = "EnumerationValue", where = where)
-}
-
-enumToInteger <- function(name,type)
-{
-   if (is.character(name)) {
-   ans <- as.integer(get(paste(".__E__", type, sep = ""))[name])
-   if (is.na(ans)) {warning("enum not found ", name, " ", type)}
-   ans
-   } 
-}
-
-enumFromInteger =
-function(i,type)
-{
-  itemlist <- get(paste(".__E__", type, sep=""))
-  names(itemlist)[match(i, itemlist)]
-}
-
-coerceIfNotSubclass =
-function(obj, type) 
-{
-    if(!is(obj, type)) {as(obj, type)} else obj
-}
-
-
-setClass("SWIGArray", representation(dims = "integer"), contains = "ExternalReference")
-
-setMethod("length", "SWIGArray", function(x) x@dims[1])
-
-
-defineEnumeration("SCopyReferences",
-                   .values = c( "FALSE" = 0, "TRUE" = 1, "DEEP" = 2))
-
-assert = 
-function(condition, message = "")
-{
-  if(!condition)
-    stop(message)
-
-  TRUE
-}
-
-
-if(FALSE) {
-print.SWIGFunction =
-function(x, ...)
- {
- }
-}
-
-
-#######################################################################
-
-R_SWIG_getCallbackFunctionStack =
-function()
-{
-    # No PACKAGE argument as we don't know what the DLL is.
-  .Call("R_SWIG_debug_getCallbackFunctionData")
-}
-
-R_SWIG_addCallbackFunctionStack =
-function(fun, userData = NULL)
-{
-    # No PACKAGE argument as we don't know what the DLL is.
-  .Call("R_SWIG_R_pushCallbackFunctionData", fun, userData)
-}
-
-
-#######################################################################
diff --git a/dependencies2013/win32/swig/Lib/r/std_alloc.i b/dependencies2013/win32/swig/Lib/r/std_alloc.i
deleted file mode 100644
index 87fa8d4a..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_alloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_alloc.i>
\ No newline at end of file
diff --git a/dependencies2013/win32/swig/Lib/r/std_common.i b/dependencies2013/win32/swig/Lib/r/std_common.i
deleted file mode 100644
index cda26231..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_common.i
+++ /dev/null
@@ -1,73 +0,0 @@
-%include <rstdcommon.swg>
-
-
-/*
-  Generate the traits for a 'primitive' type, such as 'double',
-  for which the SWIG_AsVal and SWIG_From methods are already defined.
-*/
-
-%define %traits_ptypen(Type...)
-  %fragment(SWIG_Traits_frag(Type),"header",
-	    fragment=SWIG_AsVal_frag(Type),
-	    fragment=SWIG_From_frag(Type),
-	    fragment="StdTraits") {
-namespace swig {
-  template <> struct traits< Type > {
-    typedef value_category category;
-    static const char* type_name() { return  #Type; }
-  };
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(SEXP obj, value_type *val) {
-      return SWIG_AsVal(Type)(obj, val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static SEXP from(const value_type& val) {
-      return SWIG_From(Type)(val);
-    }
-  };
-}
-}
-%enddef
-
-/* Traits for enums. This is bit of a sneaky trick needed because a generic template specialization of enums
-   is not possible (unless using template meta-programming which SWIG doesn't support because of the explicit
-   instantiations required using %template). The STL containers define the 'front' method and the typemap
-   below is used whenever the front method is wrapped returning an enum. This typemap simply picks up the
-   standard enum typemap, but additionally drags in a fragment containing the traits_asval and traits_from
-   required in the generated code for enums. */
-
-%define %traits_enum(Type...)
-  %fragment("SWIG_Traits_enum_"{Type},"header",
-	    fragment=SWIG_AsVal_frag(int),
-	    fragment=SWIG_From_frag(int),
-	    fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(SEXP obj, value_type *val) {
-      return SWIG_AsVal(int)(obj, (int *)val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static SEXP from(const value_type& val) {
-      return SWIG_From(int)((int)val);
-    }
-  };
-}
-}
-%typemap(out, fragment="SWIG_Traits_enum_"{Type}) const enum SWIGTYPE& front %{$typemap(out, const enum SWIGTYPE&)%}
-%enddef
-
-
-%include <std/std_common.i>
-
-//
-// Generates the traits for all the known primitive
-// C++ types (int, double, ...)
-//
-%apply_cpptypes(%traits_ptypen);
-
diff --git a/dependencies2013/win32/swig/Lib/r/std_container.i b/dependencies2013/win32/swig/Lib/r/std_container.i
deleted file mode 100644
index 076c1c6a..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_container.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <rcontainer.swg>
-%include <std/std_container.i>
diff --git a/dependencies2013/win32/swig/Lib/r/std_deque.i b/dependencies2013/win32/swig/Lib/r/std_deque.i
deleted file mode 100644
index 0c757ab0..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include<std/std_deque.i>
\ No newline at end of file
diff --git a/dependencies2013/win32/swig/Lib/r/std_except.i b/dependencies2013/win32/swig/Lib/r/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/r/std_list.i b/dependencies2013/win32/swig/Lib/r/std_list.i
deleted file mode 100644
index d67ec021..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_list.i
+++ /dev/null
@@ -1,5 +0,0 @@
-#define %swig_list_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_list_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_list.i>
-
diff --git a/dependencies2013/win32/swig/Lib/r/std_map.i b/dependencies2013/win32/swig/Lib/r/std_map.i
deleted file mode 100644
index 56057514..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_map.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%fragment("StdMapTraits","header")
-%{
-%}
-
-%include <std/std_map.i>
diff --git a/dependencies2013/win32/swig/Lib/r/std_pair.i b/dependencies2013/win32/swig/Lib/r/std_pair.i
deleted file mode 100644
index e9803449..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_pair.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%fragment("StdPairTraits","header")
-%{
-%}
-
-%include<std/std_pair.i>
diff --git a/dependencies2013/win32/swig/Lib/r/std_string.i b/dependencies2013/win32/swig/Lib/r/std_string.i
deleted file mode 100644
index dc1378ae..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_string.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/r/std_vector.i b/dependencies2013/win32/swig/Lib/r/std_vector.i
deleted file mode 100644
index 4ec51dc9..00000000
--- a/dependencies2013/win32/swig/Lib/r/std_vector.i
+++ /dev/null
@@ -1,1073 +0,0 @@
-// R specific swig components
-/*
-  Vectors
-*/
-
-%fragment("StdVectorTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    // vectors of doubles
-    template <>
-      struct traits_from_ptr<std::vector<double> > {
-      static SEXP from (std::vector<double > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(REALSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            NUMERIC_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-    // vectors of floats
-    template <>
-      struct traits_from_ptr<std::vector<float> > {
-      static SEXP from (std::vector<float > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(REALSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            NUMERIC_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-    // vectors of unsigned 8bit int
-    template <>
-      struct traits_from_ptr<std::vector<unsigned char> > {
-      static SEXP from (std::vector<unsigned char > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-    // vectors of 8bit int
-    template <>
-      struct traits_from_ptr<std::vector<signed char> > {
-      static SEXP from (std::vector<signed char > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-    // vectors of unsigned 16bit int
-    template <>
-      struct traits_from_ptr<std::vector<unsigned short int> > {
-      static SEXP from (std::vector<unsigned short int > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-    // vectors of 16bit int
-    template <>
-      struct traits_from_ptr<std::vector<short int> > {
-      static SEXP from (std::vector<short int > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-   // vectors of 32 bit unsigned int
-    template <>
-      struct traits_from_ptr<std::vector<unsigned int> > {
-      static SEXP from (std::vector<unsigned int> *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-    // vectors of 32bit int
-    template <>
-      struct traits_from_ptr<std::vector<int> > {
-      static SEXP from (std::vector<int > *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-   // vectors of 64 bit unsigned int
-#if defined(SWIGWORDSIZE64)
-    template <>
-      struct traits_from_ptr<std::vector<unsigned long int> > {
-      static SEXP from (std::vector<unsigned long int> *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-     // vectors of 64 bit int
-    template <>
-      struct traits_from_ptr<std::vector<long int> > {
-      static SEXP from (std::vector<long int> *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-#else
-    template <>
-      struct traits_from_ptr<std::vector<unsigned long long int> > {
-      static SEXP from (std::vector<unsigned long long int> *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-     // vectors of 64 bit int
-    template <>
-      struct traits_from_ptr<std::vector<long long int> > {
-      static SEXP from (std::vector<long long int> *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-#endif
-    // vectors of bool
-    template <>
-      struct traits_from_ptr<std::vector<bool> > {
-      static SEXP from (std::vector<bool> *val, int owner = 0) {
-        SEXP result;
-        PROTECT(result = Rf_allocVector(LGLSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            LOGICAL_POINTER(result)[pos] = ((*val)[pos]);
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-    
-    // vectors of strings
-    template <>
-      struct traits_from_ptr<std::vector<std::basic_string<char> > > {
-      static SEXP from (std::vector<std::basic_string<char> > *val, int owner = 0) {
-        SEXP result;
-         PROTECT(result = Rf_allocVector(STRSXP, val->size()));
-         for (unsigned pos = 0; pos < val->size(); pos++)
-           {
-             CHARACTER_POINTER(result)[pos] = Rf_mkChar(((*val)[pos]).c_str());
-           }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-    // catch all that does everything with vectors
-    template <typename T>
-      struct traits_from_ptr< std::vector< T > > {
-      static SEXP from (std::vector< T > *val, int owner = 0) {
-        return SWIG_R_NewPointerObj(val, type_info< std::vector< T >  >(), owner);
-      }
-    };
-    /////////////////////////////////////////////////
-    template <>
-  struct traits_asptr < std::vector<double> > {
-    static int asptr(SEXP obj, std::vector<double> **val) {
-      std::vector<double> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<double>(sexpsz);
-      double *S = NUMERIC_POINTER(obj);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<double>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-    template <>
-  struct traits_asptr < std::vector<float> > {
-    static int asptr(SEXP obj, std::vector<float> **val) {
-      std::vector<float> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<float>(sexpsz);
-      double *S = NUMERIC_POINTER(obj);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<double>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-    // 8 bit integer types
-    template <>
-  struct traits_asptr < std::vector<unsigned char> > {
-    static int asptr(SEXP obj, std::vector<unsigned char> **val) {
-      std::vector<unsigned char> *p;
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<unsigned char>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<unsigned char>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    template <>
-  struct traits_asptr < std::vector<signed char> > {
-    static int asptr(SEXP obj, std::vector<signed char> **val) {
-      std::vector<signed char> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<signed char>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<signed char>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-   // 16 bit integer types
-    template <>
-  struct traits_asptr < std::vector<unsigned short int> > {
-    static int asptr(SEXP obj, std::vector<unsigned short int> **val) {
-      std::vector<unsigned short int> *p;
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<unsigned short int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<unsigned short int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    template <>
-  struct traits_asptr < std::vector<short int> > {
-    static int asptr(SEXP obj, std::vector<short int> **val) {
-      std::vector<short int> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<short int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<short int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-    // 32 bit integer types
-    template <>
-  struct traits_asptr < std::vector<unsigned int> > {
-    static int asptr(SEXP obj, std::vector<unsigned int> **val) {
-      std::vector<unsigned int> *p;
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<unsigned int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<unsigned int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    template <>
-  struct traits_asptr < std::vector<int> > {
-    static int asptr(SEXP obj, std::vector<int> **val) {
-      std::vector<int> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-#if defined(SWIGWORDSIZE64)
-    // 64 bit integer types
-    template <>
-  struct traits_asptr < std::vector<unsigned long int> > {
-    static int asptr(SEXP obj, std::vector<unsigned long int> **val) {
-      std::vector<unsigned long int> *p;
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<unsigned long int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<unsigned long int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    template <>
-  struct traits_asptr < std::vector<long int> > {
-    static int asptr(SEXP obj, std::vector<long int> **val) {
-      std::vector<long int> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<long int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<long int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-#else
-    // 64 bit integer types
-    template <>
-  struct traits_asptr < std::vector<unsigned long long int> > {
-    static int asptr(SEXP obj, std::vector<unsigned long long int> **val) {
-      std::vector<unsigned long long int> *p;
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector<unsigned long long int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<unsigned long long int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    template <>
-  struct traits_asptr < std::vector<long long int> > {
-    static int asptr(SEXP obj, std::vector<long long int> **val) {
-      std::vector<long long int> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<long long int>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
-      int *S = INTEGER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<long long int>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-#endif
-
-    template <>
-  struct traits_asptr < std::vector<bool> > {
-    static int asptr(SEXP obj, std::vector<bool> **val) {
-      std::vector<bool> *p;
-      // not sure how to check the size of the SEXP obj is correct
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<bool>(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, LGLSXP));
-      int *S = LOGICAL_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-          (*p)[pos] = static_cast<bool>(S[pos]);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    template <>
-      struct traits_asptr < std::vector<std::basic_string<char> > > {
-      static int asptr(SEXP obj, std::vector<std::basic_string<char> > **val) {
-	std::vector<std::basic_string<char> > *p;
-      // R character vectors are STRSXP containing CHARSXP
-      // access a CHARSXP using STRING_ELT
-      int sexpsz = Rf_length(obj);
-      p = new std::vector<std::basic_string<char> >(sexpsz);
-      SEXP coerced;
-      PROTECT(coerced = Rf_coerceVector(obj, STRSXP));
-      //SEXP *S = CHARACTER_POINTER(coerced);
-      for (unsigned pos = 0; pos < p->size(); pos++)
-        {
-	  const char * thecstring = CHAR(STRING_ELT(coerced, pos));
-          (*p)[pos] = std::basic_string<char>(thecstring);
-        }
-      int res = SWIG_OK;
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      UNPROTECT(1);
-      return res;
-    }
-  };
-
-    // catchall for R to vector conversion
-  template <typename T>
-  struct traits_asptr < std::vector<T> > {
-    static int asptr(SEXP obj, std::vector<T> **val) {
-      std::vector<T> *p;
-      int res = SWIG_R_ConvertPtr(obj, (void**)&p, type_info< std::vector<T> >(), 0);
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  // now for vectors of vectors. These will be represented as lists of vectors on the
-  // catch all that does everything with vectors
-  template <>
-    struct traits_from_ptr<std::vector<std::vector<unsigned int> > > {
-      static SEXP from (std::vector< std::vector<unsigned int> > *val, int owner = 0) {
-        SEXP result;
-        // allocate the R list
-        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            // allocate the R vector
-            SET_VECTOR_ELT(result, pos, Rf_allocVector(INTSXP, val->at(pos).size()));
-            // Fill the R vector
-            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
-              {
-                INTEGER_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast<int>(val->at(pos).at(vpos));
-              }
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-
-  template <>
-    struct traits_from_ptr<std::vector<std::vector<int> > > {
-      static SEXP from (std::vector< std::vector<int > > *val, int owner = 0) {
-        SEXP result;
-        // allocate the R list
-        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            // allocate the R vector
-            SET_VECTOR_ELT(result, pos, Rf_allocVector(INTSXP, val->at(pos).size()));
-            // Fill the R vector
-            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
-              {
-                INTEGER_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast<int>(val->at(pos).at(vpos));
-              }
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-  template <>
-    struct traits_from_ptr<std::vector<std::vector<float> > > {
-      static SEXP from (std::vector< std::vector<float > > *val, int owner = 0) {
-        SEXP result;
-        // allocate the R list
-        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            // allocate the R vector
-            SET_VECTOR_ELT(result, pos, Rf_allocVector(REALSXP, val->at(pos).size()));
-            // Fill the R vector
-            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
-              {
-                NUMERIC_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast<double>(val->at(pos).at(vpos));
-              }
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-  template <>
-    struct traits_from_ptr<std::vector<std::vector<double> > > {
-      static SEXP from (std::vector< std::vector<double > > *val, int owner = 0) {
-        SEXP result;
-        // allocate the R list
-        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            // allocate the R vector
-            SET_VECTOR_ELT(result, pos, Rf_allocVector(REALSXP, val->at(pos).size()));
-            // Fill the R vector
-            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
-              {
-                NUMERIC_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast<double>(val->at(pos).at(vpos));
-              }
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-  template <>
-    struct traits_from_ptr<std::vector<std::vector<bool> > > {
-      static SEXP from (std::vector< std::vector<bool> > *val, int owner = 0) {
-        SEXP result;
-        // allocate the R list
-        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
-        for (unsigned pos = 0; pos < val->size(); pos++)
-          {
-            // allocate the R vector
-            SET_VECTOR_ELT(result, pos, Rf_allocVector(LGLSXP, val->at(pos).size()));
-            // Fill the R vector
-            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
-              {
-                LOGICAL_POINTER(VECTOR_ELT(result, pos))[vpos] = (val->at(pos).at(vpos));
-              }
-          }
-        UNPROTECT(1);
-        return(result);
-      }
-    };
-
-  template <typename T>
-    struct traits_from_ptr< std::vector < std::vector< T > > > {
-    static SEXP from (std::vector < std::vector< T > > *val, int owner = 0) {
-      return SWIG_R_NewPointerObj(val, type_info< std::vector < std::vector< T > > >(), owner);
-    }
-  };
-
-  /////////////////////////////////////////////////////////////////
-
-  // R side
-  template <>
-    struct traits_asptr < std::vector< std::vector<unsigned int> > > {
-    static int asptr(SEXP obj, std::vector< std::vector<unsigned int> > **val) {
-      std::vector <std::vector<unsigned int> > *p;
-      // this is the length of the list
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector< std::vector<unsigned int> > (sexpsz);
-
-      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
-        {
-          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
-          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
-            {
-              (*p)[listpos].push_back(static_cast<int>(INTEGER_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
-            }
-        }
-
-      int res = SWIG_OK;
-
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  template <>
-    struct traits_asptr < std::vector< std::vector< int> > > {
-    static int asptr(SEXP obj, std::vector< std::vector< int> > **val) {
-      std::vector <std::vector< int> > *p;
-      // this is the length of the list
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector< std::vector< int> > (sexpsz);
-
-      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
-        {
-          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
-          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
-            {
-              (*p)[listpos].push_back(static_cast<int>(INTEGER_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
-            }
-        }
-
-      int res = SWIG_OK;
-
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  template <>
-    struct traits_asptr < std::vector< std::vector< float> > > {
-    static int asptr(SEXP obj, std::vector< std::vector< float> > **val) {
-      std::vector <std::vector< float> > *p;
-      // this is the length of the list
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector< std::vector< float> > (sexpsz);
-
-      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
-        {
-          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
-          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
-            {
-              (*p)[listpos].push_back(static_cast<float>(NUMERIC_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
-            }
-        }
-
-      int res = SWIG_OK;
-
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  template <>
-    struct traits_asptr < std::vector< std::vector< double> > > {
-    static int asptr(SEXP obj, std::vector< std::vector< double> > **val) {
-      std::vector <std::vector< double> > *p;
-      // this is the length of the list
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector< std::vector< double> > (sexpsz);
-
-      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
-        {
-          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
-          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
-            {
-              (*p)[listpos].push_back(static_cast<double>(NUMERIC_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
-            }
-        }
-
-      int res = SWIG_OK;
-
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  template <>
-    struct traits_asptr < std::vector< std::vector< bool > > > {
-    static int asptr(SEXP obj, std::vector< std::vector< bool> > **val) {
-      std::vector <std::vector< bool > > *p;
-      // this is the length of the list
-      unsigned int sexpsz = Rf_length(obj);
-      p = new std::vector< std::vector< bool > > (sexpsz);
-
-      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
-        {
-          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
-          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
-            {
-              (*p)[listpos].push_back(static_cast<bool>(LOGICAL_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
-            }
-        }
-
-      int res = SWIG_OK;
-
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  //  catchall
-  template <typename T>
-    struct traits_asptr < std::vector< std::vector<T> > > {
-    static int asptr(SEXP obj, std::vector< std::vector<T> > **val) {
-      std::vector< std::vector<T> > *p;
-      Rprintf("vector of vectors - unsupported content\n");
-      int res = SWIG_R_ConvertPtr(obj, (void**)&p, type_info< std::vector< std::vector<T> > > (), 0);
-      if (SWIG_IsOK(res)) {
-        if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  }
-%}
-
-#define %swig_vector_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_vector_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%define %traits_type_name(Type...)
-%fragment(SWIG_Traits_frag(Type), "header",
-          fragment="StdTraits",fragment="StdVectorTraits") {
-  namespace swig {
-    template <>  struct traits< Type > {
-      typedef pointer_category category;
-      static const char* type_name() {
-        return #Type;
-      }
-    };
-  }
- }
-%enddef
-
-%include <std/std_vector.i>
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<double>)
-%traits_type_name(std::vector<double>)
-%typemap("rtypecheck") std::vector<double>, std::vector<double> *, std::vector<double> &
-    %{ is.numeric($arg) %}
-%typemap("rtype") std::vector<double> "numeric"
-%typemap("scoercein") std::vector<double>, std::vector<double> *, std::vector<double> & "$input = as.numeric($input);";
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<float>)
-%traits_type_name(std::vector<float>)
-
-// reuse these for float
-%typemap("rtype") std::vector<float>, std::vector<float> *, std::vector<float> & = std::vector<double>;
-%typemap("rtypecheck") std::vector<float>, std::vector<float> *, std::vector<float> & = std::vector<double>;
-%typemap("scoercein") std::vector<float>, std::vector<float> *, std::vector<float> & = std::vector<double>;
-
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<bool>);
-%traits_type_name(std::vector<bool>);
-%typemap("rtypecheck") std::vector<bool>, std::vector<bool> *, std::vector<bool> &
-   %{ is.logical($arg) %}
-%typemap("rtype") std::vector<bool> "logical"
-%typemap("scoercein") std::vector<bool> , std::vector<bool> & "$input = as.logical($input);";
-
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<int>);
-%traits_type_name(std::vector<int>);
-%typemap("rtypecheck") std::vector<int>, std::vector<int>  *, std::vector<int>  &
-   %{ is.integer($arg) || is.numeric($arg) %}
-
-%typemap("rtype") std::vector<int> "integer"
-%typemap("scoercein") std::vector<int> , std::vector<int> *, std::vector<int> & "$input = as.integer($input);";
-
-// strings
-%typemap("rtype") std::vector< std::basic_string<char> >,  
-std::vector< std::basic_string<char> > *,
-   std::vector< std::basic_string<char> > & "character"
-
-%typemap("rtypecheck") std::vector< std::basic_string<char> >,  
-std::vector< std::basic_string<char> > *,
-   std::vector< std::basic_string<char> > &
-   %{ is.character($arg) %}
-
-%typemap("scoercein") std::vector< std::basic_string<char> >,  
-std::vector< std::basic_string<char> > *,
-   std::vector< std::basic_string<char> > & "$input = as.character($input);";
-
-%typemap("scoerceout") std::vector< std::basic_string<char> >,  
-std::vector< std::basic_string<char> > *,
-   std::vector< std::basic_string<char> > & 
-%{    %}
-
-%apply std::vector< std::basic_string<char> > { std::vector< std::string> };
-
-// all the related integer vectors
-// signed
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<signed char>);
-%traits_type_name(std::vector<signed char>);
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<signed short>);
-%traits_type_name(std::vector<signed short>);
-
-#if defined(SWIGWORDSIZE64)
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<long int>);
-%traits_type_name(std::vector<long int>);
-#else
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<long long int>);
-%traits_type_name(std::vector<long long int>);
-#endif
-
-// unsigned
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<unsigned char>);
-%traits_type_name(std::vector<unsigned char>);
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<unsigned short>);
-%traits_type_name(std::vector<unsigned short>);
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<unsigned int>);
-%traits_type_name(std::vector<unsigned int>);
-
-#if defined(SWIGWORDSIZE64)
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<unsigned long int>);
-%traits_type_name(std::vector<unsigned long int>);
-#else
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<unsigned long long int>);
-%traits_type_name(std::vector<unsigned long long int>);
-#endif
-
-// These R side typemaps are common for integer types
-// but we can't use %apply as it will copy the C side ones too
-// Also note that we don't seem to be able to use types like
-// int_least8_t here.
-%typemap("rtype") std::vector<signed char>, std::vector<signed char> *, std::vector<signed char> & = std::vector<int>;
-%typemap("rtype") std::vector<signed short>, std::vector<signed short> *, std::vector<signed short> & = std::vector<int>;
-%typemap("rtype") std::vector<unsigned char>, std::vector<unsigned char> *, std::vector<unsigned char> & = std::vector<int>;
-%typemap("rtype") std::vector<unsigned int>, std::vector<unsigned int> *, std::vector<unsigned int> & = std::vector<int>;
-
-#if defined(SWIGWORDSIZE64)
-%typemap("rtype") std::vector<long int>, std::vector<long int> *, std::vector<long int> & = std::vector<int>;
-%typemap("rtype") std::vector<unsigned long int>, std::vector<unsigned long int> *, std::vector<unsigned long int> & = std::vector<int>;
-#else
-%typemap("rtype") std::vector<long long int>, std::vector<long long int> *, std::vector<long long int> & = std::vector<int>;
-%typemap("rtype") std::vector<unsigned long long int>, std::vector<unsigned long long int> *, std::vector<unsigned long long int> & = std::vector<int>;
-#endif
-
-
-%typemap("scoercein") std::vector<signed char>, std::vector<signed char> *, std::vector<signed char> & = std::vector<int>;
-%typemap("scoercein") std::vector<signed short>, std::vector<signed short> *, std::vector<signed short> & = std::vector<int>;
-%typemap("scoercein") std::vector<unsigned char>, std::vector<unsigned char> *, std::vector<unsigned char> & = std::vector<int>;
-%typemap("scoercein") std::vector<unsigned int>, std::vector<unsigned int> *, std::vector<unsigned int> & = std::vector<int>;
-
-#if defined(SWIGWORDSIZE64)
-%typemap("scoercein") std::vector<long int>, std::vector<long int> *, std::vector<long int> & = std::vector<int>;
-%typemap("scoercein") std::vector<unsigned long int>, std::vector<unsigned long int> *, std::vector<unsigned long int> & = std::vector<int>;
-#else
-%typemap("scoercein") std::vector<long long int>, std::vector<long long int> *, std::vector<long long int> & = std::vector<int>;
-%typemap("scoercein") std::vector<unsigned long long int>, std::vector<unsigned long long int> *, std::vector<unsigned long long int> & = std::vector<int>;
-#endif
-
-%typemap("rtypecheck") std::vector<signed char>, std::vector<signed char> *, std::vector<signed char> & = std::vector<int>;
-%typemap("rtypecheck") std::vector<signed short>, std::vector<signed short> *, std::vector<signed short> & = std::vector<int>;
-%typemap("rtypecheck") std::vector<unsigned char>, std::vector<unsigned char> *, std::vector<unsigned char> & = std::vector<int>;
-%typemap("rtypecheck") std::vector<unsigned int>, std::vector<unsigned int> *, std::vector<unsigned int> & = std::vector<int>;
-
-#if defined(SWIGWORDSIZE64)
-%typemap("rtypecheck") std::vector<long int>, std::vector<long int> *, std::vector<long int> &  = std::vector<int>;
-%typemap("rtypecheck") std::vector<unsigned long int>, std::vector<unsigned long int> *, std::vector<unsigned long int> & = std::vector<int>;
-#else
-%typemap("rtypecheck") std::vector<long long int>, std::vector<long long int> *, std::vector<long long int> & = std::vector<int>;
-%typemap("rtypecheck") std::vector<unsigned long long int>, std::vector<unsigned long long int> *, std::vector<unsigned long long int> & = std::vector<int>;
-#endif
-
-///////////////////////////////////////////////////////////////
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<std::vector<int> >);
-%traits_type_name(std::vector< std::vector<int> >);
-%typemap("rtypecheck") std::vector<std::vector<int> >, std::vector<std::vector<int> > *, std::vector<std::vector<int> > &
-   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
-%typemap("rtype") std::vector<std::vector<int> >, std::vector<std::vector<int> > *, std::vector<std::vector<int> > & "list"
-%typemap("scoercein") std::vector< std::vector<int> >, std::vector<std::vector<int> > *, std::vector<std::vector<int> > & "$input = lapply($input, as.integer);";
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<std::vector<unsigned int> >);
-%traits_type_name(std::vector< std::vector<unsigned int> >);
-%typemap("rtypecheck") std::vector<std::vector<unsigned int> >, std::vector<std::vector<unsigned int> > *, std::vector<std::vector<unsigned int> > &
-   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
-%typemap("rtype") std::vector<std::vector<unsigned int> >, std::vector<std::vector<unsigned int> > *, std::vector<std::vector<unsigned int> > & "list"
-%typemap("scoercein") std::vector< std::vector<unsigned int> >, std::vector<std::vector<int> > *, std::vector<std::vector<unsigned int> > & "$input = lapply($input, as.integer);";
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<std::vector<float> >);
-%traits_type_name(std::vector< std::vector<float> >);
-%typemap("rtypecheck") std::vector<std::vector<float> >, std::vector<std::vector<float> > *, std::vector<std::vector<float> > &
-   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
-%typemap("rtype") std::vector<std::vector<float> >, std::vector<std::vector<float> > *, std::vector<std::vector<float> > "list"
-%typemap("scoercein") std::vector< std::vector<float> >, std::vector<std::vector<float> > *, std::vector<std::vector<float> > & "$input = lapply($input, as.numeric);";
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<std::vector<double> >);
-%traits_type_name(std::vector< std::vector<double> >);
-%typemap("rtypecheck") std::vector<std::vector<double> >, std::vector<std::vector<double> > *, std::vector<std::vector<double> > &
-   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
-%typemap("rtype") std::vector<std::vector<double> >, std::vector<std::vector<double> > *, std::vector<std::vector<double> > & "list"
-%typemap("scoercein") std::vector< std::vector<double> >, std::vector<std::vector<double> > *, std::vector<std::vector<double> > &
- "$input = lapply($input, as.numeric);";
-
-%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<std::vector<bool> >);
-%traits_type_name(std::vector< std::vector<bool> >);
-%typemap("rtypecheck") std::vector<std::vector<bool> >, std::vector<std::vector<bool> > *, std::vector<std::vector<bool> > &
-   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
-%typemap("rtype") std::vector<std::vector<bool> >, std::vector<std::vector<bool> > *, std::vector<std::vector<bool> > & "list"
-%typemap("scoercein") std::vector< std::vector<bool> >, std::vector<std::vector<bool> > *, std::vector<std::vector<bool> > & "$input = lapply($input, as.logical);";
-
-// we don't want these to be given R classes as they
-// have already been turned into R vectors.
-%typemap(scoerceout) std::vector<double>,
-   std::vector<double>*,
-   std::vector<double>&,
-   std::vector<float> ,
-   std::vector<float>*,
-   std::vector<float> ,
-   std::vector<signed char>,
-   std::vector<signed char>*,
-   std::vector<signed char>&,
-   std::vector<signed short>,
-   std::vector<signed short>*,
-   std::vector<signed short>&,
-   std::vector<int>,
-   std::vector<int>*,
-   std::vector<int>&,
-   std::vector<unsigned char>,
-   std::vector<unsigned char>*,
-   std::vector<unsigned char>&,
-   std::vector<unsigned short>,
-   std::vector<unsigned short>*,
-   std::vector<unsigned short>&,
-   std::vector<unsigned int>,
-   std::vector<unsigned int>*,
-   std::vector<unsigned int>&,
-   std::vector<bool>,
-   std::vector<bool>*,
-   std::vector<bool>&,
- // vectors of vectors
-   std::vector< std::vector<unsigned int> >,
-   std::vector< std::vector<unsigned int> >*,
-   std::vector< std::vector<unsigned int> >&,
-   std::vector< std::vector<int> >,
-   std::vector< std::vector<int> >*,
-   std::vector< std::vector<int> >&,
-   std::vector< std::vector<float> >,
-   std::vector< std::vector<float> >*,
-   std::vector< std::vector<float> >&,
-   std::vector< std::vector<double> >,
-   std::vector< std::vector<double> >*,
-   std::vector< std::vector<double> >&,
-   std::vector< std::vector<bool> >,
-   std::vector< std::vector<bool> >*,
-   std::vector< std::vector<bool> >&
- %{    %}
-
-#if defined(SWIGWORDSIZE64)
-%typemap(scoerceout) std::vector<long int>,
-   std::vector<long int>*,
-   std::vector<long int>&,
-   std::vector<unsigned long int>,
-   std::vector<unsigned long int>*,
-   std::vector<unsigned long int>&
- %{    %}
-#else
-
-%typemap(scoerceout) std::vector<long long int>,
-   std::vector<long long int>*,
-   std::vector<long long int>&,
-   std::vector<unsigned long long int>,
-   std::vector<unsigned long long int>*,
-   std::vector<unsigned long long int>&
- %{    %}
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/r/stl.i b/dependencies2013/win32/swig/Lib/r/stl.i
deleted file mode 100644
index 37e2ccbf..00000000
--- a/dependencies2013/win32/swig/Lib/r/stl.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* initial STL definition. extended as needed in each language */
-%include std_common.i
-%include std_vector.i
-%include std_pair.i
-%include std_string.i
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/r/typemaps.i b/dependencies2013/win32/swig/Lib/r/typemaps.i
deleted file mode 100644
index 1f9b9c43..00000000
--- a/dependencies2013/win32/swig/Lib/r/typemaps.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/typemaps.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/Makefile.swig b/dependencies2013/win32/swig/Lib/ruby/Makefile.swig
deleted file mode 100644
index 648b3213..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/Makefile.swig
+++ /dev/null
@@ -1,42 +0,0 @@
-# File : Makefile.swig
-# Makefile for a SWIG module.  Use this file if you are
-# producing a Ruby extension for general use or distribution.
-#
-# 1.  Prepare extconf.rb.
-# 2.  Modify this file as appropriate.
-# 3.  Type 'make -f Makefile.swig' to generate wrapper code and Makefile.
-# 4.  Type 'make' to build your extension.
-# 5.  Type 'make install' to install your extension.
-#
-
-MODULE    = yourmodule
-FEATURE   = $(MODULE)
-INTERFACE = $(MODULE).i
-RUBY      = ruby
-SWIG      = swig
-
-# for C extension
-SWIGOPT   = -ruby
-WRAPPER   = $(MODULE)_wrap.c
-
-## for C++ extension
-#SWIGOPT   = -ruby -c++
-#WRAPPER   = $(MODULE)_wrap.cc
-
-
-swigall: $(WRAPPER) Makefile
-
-$(WRAPPER): $(INTERFACE)
-	$(SWIG) $(SWIGOPT) -o $@ $(INTERFACE)
-
-Makefile: extconf.rb
-	$(RUBY) extconf.rb
-	@if [ -f Makefile ] ; then\
-		echo "include Makefile.swig" >> Makefile;\
-	fi
-
-swigclean:
-	@if [ -f Makefile ] ; then\
-		make -f Makefile clean;\
-	fi
-	rm -f Makefile $(WRAPPER)
diff --git a/dependencies2013/win32/swig/Lib/ruby/argcargv.i b/dependencies2013/win32/swig/Lib/ruby/argcargv.i
deleted file mode 100644
index fc0bc406..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/argcargv.i
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ------------------------------------------------------------
- * --- Argc & Argv ---
- * ------------------------------------------------------------ */
- 
-/* ------------------------------------------------------------
-
-   Use it as follow:
-
-     %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
-
-     %inline %{
-
-     int mainApp(size_t argc, const char **argv) 
-     {
-       return argc;
-     }
-
-   then in the ruby side:
-
-     args = ["asdf", "asdf2"]
-     mainApp(args);
-
- * ------------------------------------------------------------ */
-
-%typemap(in) (int ARGC, char **ARGV) {
-  if (rb_obj_is_kind_of($input,rb_cArray)) {
-    int i;
-    int size = RARRAY_LEN($input);
-    $1 = ($1_ltype) size;
-    $2 = (char **) malloc((size+1)*sizeof(char *));
-    VALUE *ptr = RARRAY_PTR($input);
-    for (i=0; i < size; i++, ptr++) {
-      $2[i]= StringValuePtr(*ptr);
-    }    
-    $2[i]=NULL;
-  } else {
-    $1 = 0; $2 = 0;
-    %argument_fail(SWIG_TypeError, "int ARGC, char **ARGV", $symname, $argnum);
-  }
-}
-
-%typemap(typecheck, precedence=SWIG_TYPECHECK_STRING_ARRAY) (int ARGC, char **ARGV) {
-  $1 = rb_obj_is_kind_of($input,rb_cArray);
-}
-
-%typemap(freearg) (int ARGC, char **ARGV) {
-  free((char *) $2);
-}
diff --git a/dependencies2013/win32/swig/Lib/ruby/attribute.i b/dependencies2013/win32/swig/Lib/ruby/attribute.i
deleted file mode 100644
index 779716cd..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/attribute.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/attribute.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/ruby/boost_shared_ptr.i
deleted file mode 100644
index 938074d8..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/boost_shared_ptr.i
+++ /dev/null
@@ -1,323 +0,0 @@
-%include <shared_ptr.i>
-
-// Set SHARED_PTR_DISOWN to $disown if required, for example
-// #define SHARED_PTR_DISOWN $disown
-#if !defined(SHARED_PTR_DISOWN)
-#define SHARED_PTR_DISOWN 0
-#endif
-
-%fragment("SWIG_null_deleter_python", "header", fragment="SWIG_null_deleter") {
-%#define SWIG_NO_NULL_DELETER_SWIG_BUILTIN_INIT
-}
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE
-  %{(void)arg1;
-    delete reinterpret_cast< SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > * >(self);%}
-
-// Typemap customisations...
-
-// plain value
-%typemap(in) CONST TYPE (void *argp, int res = 0) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (!argp) {
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(out) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE {
-  void *argp = 0;
-  swig_ruby_owntype newmem = {0, 0};
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(varout) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) CONST TYPE * (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-
-%typemap(out, fragment="SWIG_null_deleter_python") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE * {
-  void *argp = 0;
-  swig_ruby_owntype newmem = {0, 0};
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0;
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter_python") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain reference
-%typemap(in) CONST TYPE & (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter_python") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE & {
-  void *argp = 0;
-  swig_ruby_owntype newmem = {0, 0};
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = *%const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = *%const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter_python") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer by reference
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) TYPE *CONST& (void  *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    temp = %const_cast(tempshared.get(), $*1_ltype);
-  } else {
-    temp = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $*1_ltype);
-  }
-  $1 = &temp;
-}
-%typemap(out, fragment="SWIG_null_deleter_python") TYPE *CONST& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) TYPE *CONST& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) TYPE *CONST& %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (argp) $1 = *(%reinterpret_cast(argp, $&ltype));
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  swig_ruby_owntype newmem = {0, 0};
-  void *argp = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = argp ? *(%reinterpret_cast(argp, $&ltype)) : SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE >();
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// shared_ptr by reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 && *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-  if ($owner) delete $1;
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
-  swig_ruby_owntype newmem = {0, 0};
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum);
-  }
-  if (argp) tempshared = *%reinterpret_cast(argp, $*ltype);
-  if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype);
-  temp = &tempshared;
-  $1 = &temp;
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 && **$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varout typemap not implemented"
-%}
-
-// Typecheck typemaps
-// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting
-// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1)
-                      TYPE CONST,
-                      TYPE CONST &,
-                      TYPE CONST *,
-                      TYPE *CONST&,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), 0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/ruby/carrays.i b/dependencies2013/win32/swig/Lib/ruby/carrays.i
deleted file mode 100644
index 8f74cd9b..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/carrays.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%define %array_class(TYPE,NAME)
-  %array_class_wrap(TYPE,NAME,__getitem__,__setitem__)
-%enddef
-
-%include <typemaps/carrays.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/cdata.i b/dependencies2013/win32/swig/Lib/ruby/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/cmalloc.i b/dependencies2013/win32/swig/Lib/ruby/cmalloc.i
deleted file mode 100644
index 248f06b9..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/cmalloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cmalloc.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/cni.i b/dependencies2013/win32/swig/Lib/ruby/cni.i
deleted file mode 100644
index 10a1403a..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/cni.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <gcj/cni.i>
-%include <jstring.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/cpointer.i b/dependencies2013/win32/swig/Lib/ruby/cpointer.i
deleted file mode 100644
index d824792f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/cpointer.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cpointer.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/cstring.i b/dependencies2013/win32/swig/Lib/ruby/cstring.i
deleted file mode 100644
index ede9c596..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/cstring.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cstring.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/director.swg b/dependencies2013/win32/swig/Lib/ruby/director.swg
deleted file mode 100644
index c6c53a34..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/director.swg
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -----------------------------------------------------------------------------
- * director.swg
- *
- * This file contains support for director classes so that Ruby proxy
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-/*
-  Use -DSWIG_DIRECTOR_NOUEH if you prefer to avoid the use of the
-  Undefined Exception Handler provided by swig.
-*/
-#ifndef SWIG_DIRECTOR_NOUEH
-#ifndef SWIG_DIRECTOR_UEH
-#define SWIG_DIRECTOR_UEH
-#endif
-#endif
-
-#include <string>
-#include <iostream>
-#include <exception>
-#include <map>
-
-# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
-
-namespace Swig {
-
-  /* memory handler */
-  struct GCItem {
-    virtual ~GCItem() {
-    }
-
-    virtual swig_ruby_owntype get_own() const {
-      swig_ruby_owntype own = {0, 0};
-      return own;
-    }
-  };
-
-  struct GCItem_var {
-    GCItem_var(GCItem *item = 0) : _item(item) {
-    }
-
-    GCItem_var& operator=(GCItem *item) {
-      GCItem *tmp = _item;
-      _item = item;
-      delete tmp;
-      return *this;
-    }
-
-    ~GCItem_var() {
-      delete _item;
-    }
-
-    GCItem *operator->() const {
-      return _item;
-    }
-
-  private:
-    GCItem *_item;
-  };
-
-
-  template <typename Type>
-  struct GCItem_T : GCItem {
-    GCItem_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCItem_T() {
-      delete _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-
-  struct GCItem_Object : GCItem {
-    GCItem_Object(swig_ruby_owntype own) : _own(own) {
-    }
-
-    virtual ~GCItem_Object() {
-    }
-
-    swig_ruby_owntype get_own() const {
-      return _own;
-    }
-
-  private:
-    swig_ruby_owntype _own;
-  };
-
-  template <typename Type>
-  struct GCArray_T : GCItem {
-    GCArray_T(Type *ptr) : _ptr(ptr) {
-    }
-
-    virtual ~GCArray_T() {
-      delete[] _ptr;
-    }
-
-  private:
-    Type *_ptr;
-  };
-
-
-  /* body args */
-  struct body_args {
-    VALUE recv;
-    ID id;
-    int argc;
-    VALUE *argv;
-  };
-
-  /* Base class for director exceptions */
-  class DirectorException : public std::exception {
-  protected:
-    VALUE swig_error;
-    std::string swig_msg;
-  protected:
-    DirectorException(VALUE error) : swig_error(error) {
-    }
-
-    DirectorException(VALUE error, const char *hdr, const char *msg ="") : swig_error(error), swig_msg(hdr) {
-      if (msg[0]) {
-	swig_msg += " ";
-	swig_msg += msg;
-      }
-      if (swig_msg.size()) {
-	VALUE str = rb_str_new(swig_msg.data(), swig_msg.size());
-	swig_error = rb_exc_new3(error, str);
-      } else {
-	swig_error = error;
-      }
-    }
-
-  public:
-    virtual ~DirectorException() throw() {
-    }
-
-    VALUE getType() const {
-      return CLASS_OF(swig_error);
-    }
-
-    VALUE getError() const {
-      return swig_error;
-    }
-
-    /* Deprecated, use what() instead */
-    const std::string& getMessage() const {
-      return swig_msg;
-    }
-
-    const char *what() const throw() {
-      return swig_msg.c_str();
-    }
-  };
-
-  /* unknown exception handler  */
-  class UnknownExceptionHandler {
-#ifdef SWIG_DIRECTOR_UEH
-    static void handler() {
-      try {
-	throw;
-      } catch (DirectorException& e) {
-	std::cerr << "SWIG Director exception caught:" << std::endl
-		  << e.what() << std::endl;
-      } catch (std::exception& e) {
-	std::cerr << "std::exception caught: "<< e.what() << std::endl;
-      } catch (...) {
-	std::cerr << "Unknown exception caught." << std::endl;
-      }
-      std::cerr << std::endl
-		<< "Ruby interpreter traceback:" << std::endl;
-      std::cerr << std::endl;
-      std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
-		<< "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
-		<< std::endl
-		<< "Exception is being re-thrown, program will like abort/terminate." << std::endl;
-      throw;
-    }
-
-  public:
-    std::unexpected_handler old;
-    UnknownExceptionHandler(std::unexpected_handler nh = handler) {
-      old = std::set_unexpected(nh);
-    }
-
-    ~UnknownExceptionHandler() {
-      std::set_unexpected(old);
-    }
-#endif
-  };
-
-
-  /* Type mismatch in the return value from a Ruby method call */
-  class DirectorTypeMismatchException : public DirectorException {
-  public:
-    DirectorTypeMismatchException(VALUE error, const char *msg="")
-      : DirectorException(error, "SWIG director type mismatch", msg) {
-    }
-
-    DirectorTypeMismatchException(const char *msg="")
-      : DirectorException(rb_eTypeError, "SWIG director type mismatch", msg) {
-    }
-
-    static void raise(VALUE error, const char *msg) {
-      throw DirectorTypeMismatchException(error, msg);
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorTypeMismatchException(msg);
-    }
-  };
-
-  /* Any Ruby exception that occurs during a director method call */
-  class DirectorMethodException : public DirectorException {
-  public:
-    DirectorMethodException(VALUE error)
-      : DirectorException(error) {
-    }
-
-    DirectorMethodException(const char *msg = "")
-      : DirectorException(rb_eRuntimeError, "SWIG director method error.", msg) {
-    }
-
-    static void raise(VALUE error) {
-      throw DirectorMethodException(error);
-    }
-  };
-
-  /* Attempted to call a pure virtual method via a director method */
-  class DirectorPureVirtualException : public DirectorException
-  {
-  public:
-    DirectorPureVirtualException(const char *msg = "")
-      : DirectorException(rb_eRuntimeError, "SWIG director pure virtual method called", msg) {
-    }
-
-    static void raise(const char *msg) {
-      throw DirectorPureVirtualException(msg);
-    }
-  };
-
-  /* Simple thread abstraction for pthreads on win32 */
-#ifdef __THREAD__
-# define __PTHREAD__
-# if defined(_WIN32) || defined(__WIN32__)
-#  define pthread_mutex_lock EnterCriticalSection
-#  define pthread_mutex_unlock LeaveCriticalSection
-#  define pthread_mutex_t CRITICAL_SECTION
-#  define SWIG_MUTEX_INIT(var) var
-# else
-#  include <pthread.h>
-#  define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER
-# endif
-#endif
-
-#ifdef  __PTHREAD__
-  struct Guard {
-    pthread_mutex_t *_mutex;
-
-    Guard(pthread_mutex_t &mutex) : _mutex(&mutex) {
-      pthread_mutex_lock(_mutex);
-    }
-
-    ~Guard() {
-      pthread_mutex_unlock(_mutex);
-    }
-  };
-# define SWIG_GUARD(mutex) Guard _guard(mutex)
-#else
-# define SWIG_GUARD(mutex)
-#endif
-
-  /* director base class */
-  class Director {
-  private:
-    /* pointer to the wrapped Ruby object */
-    VALUE swig_self;
-    /* flag indicating whether the object is owned by Ruby or c++ */
-    mutable bool swig_disown_flag;
-
-  public:
-    /* wrap a Ruby object. */
-    Director(VALUE self) : swig_self(self), swig_disown_flag(false) {
-    }
-
-    /* discard our reference at destruction */
-    virtual ~Director() {
-    }
-
-    /* return a pointer to the wrapped Ruby object */
-    VALUE swig_get_self() const {
-      return swig_self;
-    }
-
-    /* acquire ownership of the wrapped Ruby object (the sense of "disown" is from Ruby) */
-    void swig_disown() const {
-      if (!swig_disown_flag) {
-        swig_disown_flag = true;
-      }
-    }
-
-  /* ownership management */
-  private:
-    typedef std::map<void *, GCItem_var> swig_ownership_map;
-    mutable swig_ownership_map swig_owner;
-#ifdef __PTHREAD__
-    static pthread_mutex_t swig_mutex_own;
-#endif
-
-  public:
-    template <typename Type>
-    void swig_acquire_ownership_array(Type *vptr) const {
-      if (vptr) {
-	SWIG_GUARD(swig_mutex_own);
-	swig_owner[vptr] = new GCArray_T<Type>(vptr);
-      }
-    }
-
-    template <typename Type>
-    void swig_acquire_ownership(Type *vptr)  const {
-      if (vptr) {	
-	SWIG_GUARD(swig_mutex_own);
-	swig_owner[vptr] = new GCItem_T<Type>(vptr);
-      }
-    }
-
-    void swig_acquire_ownership_obj(void *vptr, swig_ruby_owntype own) const {
-      if (vptr && own.datafree) {
-	SWIG_GUARD(swig_mutex_own);
-	swig_owner[vptr] = new GCItem_Object(own);
-      }
-    }
-
-    swig_ruby_owntype swig_release_ownership(void *vptr) const {
-      swig_ruby_owntype own = {0, 0};
-      if (vptr) {
-	SWIG_GUARD(swig_mutex_own);
-	swig_ownership_map::iterator iter = swig_owner.find(vptr);
-	if (iter != swig_owner.end()) {
-	  own.datafree = iter->second->get_own().datafree;
-	  swig_owner.erase(iter);
-	}
-      }
-      return own;
-    }
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/embed.i b/dependencies2013/win32/swig/Lib/ruby/embed.i
deleted file mode 100644
index 9226ef45..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/embed.i
+++ /dev/null
@@ -1,16 +0,0 @@
-%wrapper %{
-
-#include <ruby.h>
-
-int
-main(argc, argv)
-    int argc;
-    char **argv;
-{
-    ruby_init();
-    ruby_options(argc, argv);
-    ruby_run();
-    return 0;
-}
-
-%}
diff --git a/dependencies2013/win32/swig/Lib/ruby/exception.i b/dependencies2013/win32/swig/Lib/ruby/exception.i
deleted file mode 100644
index 1e80d96d..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/exception.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%include <typemaps/exception.swg>
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), %block(%error(code, msg);))
-}
diff --git a/dependencies2013/win32/swig/Lib/ruby/extconf.rb b/dependencies2013/win32/swig/Lib/ruby/extconf.rb
deleted file mode 100644
index 3bac8ccc..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/extconf.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'mkmf'
-
-dir_config('yourlib')
-
-if have_header('yourlib.h') and have_library('yourlib', 'yourlib_init')
-  # If you use swig -c option, you may have to link libswigrb.
-  # have_library('swigrb')
-  create_makefile('yourlib')
-end
diff --git a/dependencies2013/win32/swig/Lib/ruby/extra-install.list b/dependencies2013/win32/swig/Lib/ruby/extra-install.list
deleted file mode 100644
index 4610fa8f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/extra-install.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# see top-level Makefile.in
-Makefile.swig
-extconf.rb
diff --git a/dependencies2013/win32/swig/Lib/ruby/factory.i b/dependencies2013/win32/swig/Lib/ruby/factory.i
deleted file mode 100644
index 46a0a873..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/factory.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/factory.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/file.i b/dependencies2013/win32/swig/Lib/ruby/file.i
deleted file mode 100644
index f9aaa275..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/file.i
+++ /dev/null
@@ -1,39 +0,0 @@
-// FILE *
-%{
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Ruby 1.9 changed the file name of this header */
-#ifdef HAVE_RUBY_IO_H
-#include "ruby/io.h"
-#else
-#include "rubyio.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-%}
-
-%typemap(in) FILE *READ {
-    OpenFile *of;
-    GetOpenFile($input, of);
-    rb_io_check_readable(of);
-    $1 = GetReadFile(of);
-    rb_read_check($1);
-}
-
-%typemap(in) FILE *READ_NOCHECK {
-    OpenFile *of;
-    GetOpenFile($input, of);
-    rb_io_check_readable(of);
-    $1 = GetReadFile(of);
-}
-
-%typemap(in) FILE *WRITE {
-    OpenFile *of;
-    GetOpenFile($input, of);
-    rb_io_check_writable(of);
-    $1 = GetWriteFile(of);
-}
diff --git a/dependencies2013/win32/swig/Lib/ruby/jstring.i b/dependencies2013/win32/swig/Lib/ruby/jstring.i
deleted file mode 100644
index 17efa978..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/jstring.i
+++ /dev/null
@@ -1,44 +0,0 @@
-%include <typemaps/valtypes.swg>
-
-%fragment(SWIG_AsVal_frag(jstring),"header") {
-SWIGINTERN int
-SWIG_AsVal(jstring)(VALUE obj, jstring *val)
-{
-  if (NIL_P(obj)){
-    if (val) *val = 0;
-    return SWIG_OK;
-  } 
-  if (TYPE(obj) == T_STRING) {
-    if (val) {
-      char *cstr = rb_string_value_ptr(&(obj));
-      jsize len = RSTRING_LEN(obj);
-      *val = JvNewStringLatin1(cstr, len);
-    }
-    return SWIG_NEWOBJ;
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment(SWIG_From_frag(jstring),"header") {
-SWIGINTERNINLINE VALUE
-SWIG_From(jstring)(jstring val)
-{
-  if (!val) {
-    return Qnil;
-  } else {
-    jint len = JvGetStringUTFLength(val);
-    char buf[len];
-    JvGetStringUTFRegion(val, 0, len, buf);
-    return rb_str_new(buf,len);
-  }
-}
-}
-
-%typemaps_asvalfrom(%checkcode(STRING),
-		    %arg(SWIG_AsVal(jstring)), 
-		    %arg(SWIG_From(jstring)), 
-		    %arg(SWIG_AsVal_frag(jstring)), 
-		    %arg(SWIG_From_frag(jstring)), 
-		    java::lang::String *);
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/progargcargv.i b/dependencies2013/win32/swig/Lib/ruby/progargcargv.i
deleted file mode 100644
index a2843c34..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/progargcargv.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-int PROG_ARGC
-char **PROG_ARGV
-
-    Some C function receive argc and argv from C main function.
-    This typemap provides ignore typemap which pass Ruby ARGV contents
-    as argc and argv to C function.
-*/
-
-
-
-// argc and argv
-%typemap(in,numinputs=0) int PROG_ARGC {
-    $1 = RARRAY_LEN(rb_argv) + 1;
-}
-
-%typemap(in,numinputs=0) char **PROG_ARGV {
-    int i, n;
-    VALUE ary = rb_eval_string("[$0] + ARGV");
-    n = RARRAY_LEN(ary);
-    $1 = (char **)malloc(n + 1);
-    for (i = 0; i < n; i++) {
-	VALUE v = rb_obj_as_string(RARRAY_PTR(ary)[i]);
-	$1[i] = (char *)malloc(RSTRING_LEN(v) + 1);
-	strcpy($1[i], RSTRING_PTR(v));
-    }
-}
-
-%typemap(freearg) char **PROG_ARGV {
-    int i, n = RARRAY_LEN(rb_argv) + 1;
-    for (i = 0; i < n; i++) free($1[i]);
-    free($1);
-}
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/ruby.swg b/dependencies2013/win32/swig/Lib/ruby/ruby.swg
deleted file mode 100644
index efa8ec2f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/ruby.swg
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ------------------------------------------------------------
- * ruby.swg
- *
- * Ruby configuration module.
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- * The Ruby auto rename rules 
- * ------------------------------------------------------------ */
-#if defined(SWIG_RUBY_AUTORENAME)
-/* Class names are CamelCase */
-%rename("%(camelcase)s", %$isclass) ""; 
-
-/* Constants created by %constant or #define are UPPER_CASE */
-%rename("%(uppercase)s", %$isconstant) "";
-
-/* SWIG only considers static class members with inline intializers
-	 to be constants.  For examples of what is and isn't considered
-	 a constant by SWIG see naming.i in the Ruby test suite. */
-%rename("%(uppercase)s", %$ismember, %$isvariable,%$isimmutable,%$isstatic,%$hasvalue,%$hasconsttype) ""; 
-
-/* Enums are mapped to constants but all we do is make sure the
-   first letter is uppercase */
-%rename("%(firstuppercase)s", %$isenumitem) "";
-
-/* Method names should be lower_case_with_underscores */
-%rename("%(undercase)s", %$isfunction, %$not %$ismemberget, %$not %$ismemberset) "";
-#endif
-
-/* ------------------------------------------------------------
- *  Inner macros 
- * ------------------------------------------------------------ */
-%include <rubymacros.swg>
-
-
-/* ------------------------------------------------------------
- *  The runtime part
- * ------------------------------------------------------------ */
-%include <rubyruntime.swg>
-
-/* ------------------------------------------------------------
- *  Special user directives
- * ------------------------------------------------------------ */
-%include <rubyuserdir.swg>
-
-/* ------------------------------------------------------------
- *  Typemap specializations
- * ------------------------------------------------------------ */
-%include <rubytypemaps.swg>
-
-/* ------------------------------------------------------------
- *  Overloaded operator support
- * ------------------------------------------------------------ */
-%include <rubyopers.swg>
-
-/* ------------------------------------------------------------
- * Warnings for Ruby keywords 
- * ------------------------------------------------------------ */
-%include <rubykw.swg>
-
-/* ------------------------------------------------------------
- * Documentation for common Ruby methods 
- * ------------------------------------------------------------ */
-%include <rubyautodoc.swg>
-
-/* ------------------------------------------------------------
- * The Ruby initialization function 
- * ------------------------------------------------------------ */
-%include <rubyinit.swg>
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyapi.swg b/dependencies2013/win32/swig/Lib/ruby/rubyapi.swg
deleted file mode 100644
index e0077572..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyapi.swg
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -----------------------------------------------------------------------------
- * Ruby API portion that goes into the runtime
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SWIGINTERN VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
-  if (NIL_P(target)) {
-    target = o;
-  } else {
-    if (TYPE(target) != T_ARRAY) {
-      VALUE o2 = target;
-      target = rb_ary_new();
-      rb_ary_push(target, o2);
-    }
-    rb_ary_push(target, o);
-  }
-  return target;
-}
-
-/* For ruby1.8.4 and earlier. */
-#ifndef RUBY_INIT_STACK
-   RUBY_EXTERN void Init_stack(VALUE* addr);
-#  define RUBY_INIT_STACK \
-   VALUE variable_in_this_stack_frame; \
-   Init_stack(&variable_in_this_stack_frame);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyautodoc.swg b/dependencies2013/win32/swig/Lib/ruby/rubyautodoc.swg
deleted file mode 100644
index 1e6b0d9d..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyautodoc.swg
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubyautodoc.swg
- *
- * This file implements autodoc typemaps for some common ruby methods.
- * ----------------------------------------------------------------------------- */
-
-%define AUTODOC(func, str)
-  %feature("autodoc", str) func;
-%enddef
-
-
-AUTODOC(to_i, "Convert $class to an Integer");
-AUTODOC(to_f, "Convert $class to a Float");
-AUTODOC(coerce, "Coerce class to a number");
-AUTODOC(to_a, "Convert $class to an Array");
-AUTODOC(to_s, "Convert class to a String representation");
-AUTODOC(inspect, "Inspect class and its contents");
-
-AUTODOC(at, "Return element at a certain index");
-AUTODOC(__getitem__, "Element accessor/slicing");
-AUTODOC(__setitem__, "Element setter/slicing");
-AUTODOC(slice, "Return a slice (portion of) the $class");
-
-AUTODOC(push, "Add an element at the end of the $class");
-AUTODOC(pop, "Remove and return element at the end of the $class");
-AUTODOC(shift, "Remove and return element at the beginning of the $class");
-AUTODOC(unshift, "Add one or more elements at the beginning of the $class");
-AUTODOC(first, "Return the first element in $class");
-AUTODOC(last, "Return the last element in $class");
-
-
-//
-// Common Object methods
-//
-AUTODOC(hash, "Hashing function for class");
-AUTODOC(dup, "Create a duplicate of the class and unfreeze it if needed");
-AUTODOC(clone, "Create a duplicate of the class");
-
-//
-// Container methods
-//
-AUTODOC(empty, "Check if $class is empty");
-AUTODOC(size, "Size or Length of the $class");
-AUTODOC(insert, "Insert one or more new elements in the $class");
-
-//
-// Iterator methods (block)
-//
-AUTODOC(each, "Iterate thru each element in the $class.  A block must be provided");
-AUTODOC(find, "Find an element in the class");
-AUTODOC(each_key, "Iterate thru each key element in the $class.  A block must be provided");
-AUTODOC(each_value, "Iterate thru each key element in the $class.  A block must be provided");
-AUTODOC(reject, "Iterate thru each element in the $class and reject those that fail a condition returning a new $class.  A block must be provided");
-AUTODOC(reject_bang, "Iterate thru each element in the $class and reject those that fail a condition.  A block must be provided.  $class is modified in place");
-AUTODOC(select, "Iterate thru each element in the $class and select those that match a condition.  A block must be provided");
-AUTODOC(delete_at, "Delete an element at a certain index");
-AUTODOC(__delete__, "Delete a matching element");
-
-
-//
-// Hash methods
-//
-AUTODOC(keys, "Return an Array of key elements");
-AUTODOC(values, "Return an Array of value elements");
-AUTODOC(values_at, "Return an Array of value elements matching the conditions");
-
-
-//
-// Operators
-//
-#ifdef __cplusplus
-AUTODOC(operator==, "Equality comparison operator");
-AUTODOC(operator<=, "Lower or equal comparison operator");
-AUTODOC(operator>=, "Higher or equal comparison operator");
-AUTODOC(operator<, "Lower than comparison operator");
-AUTODOC(operator>, "Higher than comparison operator");
-AUTODOC(operator<<, "Left shifting or appending operator");
-AUTODOC(operator>>, "Right shifting operator or extracting operator");
-AUTODOC(operator+, "Add operator");
-AUTODOC(operator-, "Substraction operator");
-AUTODOC(operator+(), "Positive operator");
-AUTODOC(operator-(), "Negation operator");
-AUTODOC(operator&, "AND operator");
-AUTODOC(operator|, "OR operator");
-AUTODOC(operator^, "XOR operator");
-AUTODOC(operator~, "Invert operator");
-#endif
-AUTODOC(__eq__, "Equality comparison operator");
-AUTODOC(__le__, "Lower or equal comparison operator");
-AUTODOC(__ge__, "Higher or equal comparison operator");
-AUTODOC(__lt__, "Lower than comparison operator");
-AUTODOC(__gt__, "Higher than comparison operator");
-AUTODOC(__lshift__, "Left shifting or appending operator");
-AUTODOC(__rshift__, "Right shifting operator or extracting operator");
-AUTODOC(__add___, "Add operator");
-AUTODOC(__sub__, "Substraction operator");
-AUTODOC(__pos__, "Positive operator");
-AUTODOC(__neg__, "Negation operator");
-AUTODOC(__and__, "AND operator");
-AUTODOC(__or__, "OR operator");
-AUTODOC(__xor__, "XOR operator");
-AUTODOC(__negate__, "Invert operator");
-AUTODOC(__pow__, "Exponential operator");
-AUTODOC(__divmod__, "Modulo of division");
-AUTODOC(__cmp__, "Comparison operator.  Returns < 0 for less than, 0 for equal or > 1 for higher than.");
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyclasses.swg b/dependencies2013/win32/swig/Lib/ruby/rubyclasses.swg
deleted file mode 100644
index f7b51bdc..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyclasses.swg
+++ /dev/null
@@ -1,404 +0,0 @@
-#ifdef __cplusplus
-
-/*
-  GC_VALUE is used as a replacement of Ruby's VALUE.
-  GC_VALUE automatically handles registering and unregistering
-  of the underlying Ruby object with the GC.
-
-  It can be used if you want to create STL containers of VALUEs, such as:
-  
-     std::vector< GC_VALUE >;
-
-  or as a member variable:
-  
-     struct A {
-       GC_VALUE _obj;
-       A(VALUE o) : _obj(o) {
-       }
-     };
-
-   or as a input/output value (not much use for this, as VALUE works just as
-   well here, thou):
-
-     GC_VALUE func(GC_VALUE obj) { 
-       GC_VALUE out = rb_obj_classname(obj);
-       return out;
-     }
-
-
-   GC_VALUE is 'visible' at the wrapped side, so you can do:
-
-      %template(RubyVector) std::vector<swig::GC_VALUE>;
-
-   and all the proper typemaps will be used.
-   
-*/
-
-%fragment("GC_VALUE_definition","header") {
-namespace swig {
-  class SwigGCReferences {
-    VALUE _hash;
-
-    SwigGCReferences() : _hash(Qnil) {
-    }
-    ~SwigGCReferences() {
-      if (_hash != Qnil)
-        rb_gc_unregister_address(&_hash);
-    }
-    static void EndProcHandler(VALUE) {
-      // Ruby interpreter ending - _hash can no longer be accessed.
-      SwigGCReferences &s_references = instance();
-      s_references._hash = Qnil;
-    }
-  public:
-    static SwigGCReferences& instance() {
-      // Hash of all GC_VALUE's currently in use
-      static SwigGCReferences s_references;
-
-      return s_references;
-    }
-    static void initialize() {
-      SwigGCReferences &s_references = instance();
-      if (s_references._hash == Qnil) {
-        rb_set_end_proc(&EndProcHandler, Qnil);
-        s_references._hash = rb_hash_new();
-        rb_gc_register_address(&s_references._hash);
-      }
-    }
-    void GC_register(VALUE& obj) {
-      if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj))
-        return;
-      if (_hash != Qnil) {
-        VALUE val = rb_hash_aref(_hash, obj);
-        unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 0;
-        ++n;
-        rb_hash_aset(_hash, obj, INT2NUM(n));
-      }
-    }
-    void GC_unregister(const VALUE& obj) {
-      if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj))
-        return;
-      // this test should not be needed but I've noticed some very erratic
-      // behavior of none being unregistered in some very rare situations.
-      if (BUILTIN_TYPE(obj) == T_NONE)
-        return;
-      if (_hash != Qnil) {
-        VALUE val = rb_hash_aref(_hash, obj);
-        unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 1;
-        --n;
-        if (n)
-          rb_hash_aset(_hash, obj, INT2NUM(n));
-        else
-          rb_hash_delete(_hash, obj);
-      }
-    }
-  };
-
-  class GC_VALUE {
-  protected:
-    VALUE  _obj;
-
-    static ID hash_id;
-    static ID   lt_id;
-    static ID   gt_id;
-    static ID   eq_id;
-    static ID   le_id;
-    static ID   ge_id;
-
-    static ID  pos_id;
-    static ID  neg_id;
-    static ID  inv_id;
-
-    static ID  add_id;
-    static ID  sub_id;
-    static ID  mul_id;
-    static ID  div_id;
-    static ID  mod_id;
-
-    static ID  and_id;
-    static ID   or_id;
-    static ID  xor_id;
-
-    static ID  lshift_id;
-    static ID  rshift_id;
-
-    struct OpArgs
-    {
-      VALUE src;
-      ID    id;
-      int   nargs;
-      VALUE target;
-    };
-
-
-  public:
-    GC_VALUE() : _obj(Qnil)
-    {
-    }
-
-    GC_VALUE(const GC_VALUE& item) : _obj(item._obj)
-    {
-      SwigGCReferences::instance().GC_register(_obj);
-    }
-    
-    GC_VALUE(VALUE obj) :_obj(obj)
-    {
-      SwigGCReferences::instance().GC_register(_obj);
-    }
-    
-    ~GC_VALUE() 
-    {
-      SwigGCReferences::instance().GC_unregister(_obj);
-    }
-    
-    GC_VALUE & operator=(const GC_VALUE& item) 
-    {
-      SwigGCReferences::instance().GC_unregister(_obj);
-      _obj = item._obj;
-      SwigGCReferences::instance().GC_register(_obj);
-      return *this;
-    }
-
-    operator VALUE() const
-    {
-      return _obj;
-    }
-
-    VALUE inspect() const
-    {
-      return rb_inspect(_obj);
-    }
-
-    VALUE to_s() const
-    {
-      return rb_inspect(_obj);
-    }
-
-    static VALUE swig_rescue_swallow(VALUE)
-    {
-      /*
-      VALUE errstr = rb_obj_as_string(rb_errinfo());
-      printf("Swallowing error: '%s'\n", RSTRING_PTR(StringValue(errstr)));
-      */
-      return Qnil; /* Swallow Ruby exception */
-    }
-
-    static VALUE swig_rescue_funcall(VALUE p)
-    {
-      OpArgs* args = (OpArgs*) p;
-      return rb_funcall(args->src, args->id, args->nargs, args->target);
-    }
-
-    bool relational_equal_op(const GC_VALUE& other, const ID& op_id, bool (*op_func)(const VALUE& a, const VALUE& b)) const
-    {
-      if (FIXNUM_P(_obj) && FIXNUM_P(other._obj)) {
-        return op_func(_obj, other._obj);
-      }
-      bool res = false;
-      VALUE ret = Qnil;
-      SWIG_RUBY_THREAD_BEGIN_BLOCK;
-      if (rb_respond_to(_obj, op_id)) {
-        OpArgs  args;
-        args.src    = _obj;
-        args.id     = op_id;
-        args.nargs  = 1;
-        args.target = VALUE(other);
-        ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args),
-                       (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil);
-      }
-      if (ret == Qnil) {
-        VALUE a = rb_funcall(         _obj, hash_id, 0 );
-        VALUE b = rb_funcall( VALUE(other), hash_id, 0 );
-        res = op_func(a, b);
-      } else {
-        res = RTEST(ret);
-      }
-      SWIG_RUBY_THREAD_END_BLOCK;
-      return res;
-    }
-
-    static bool operator_eq(const VALUE& a, const VALUE& b) { return a == b; }
-    static bool operator_lt(const VALUE& a, const VALUE& b) { return a < b; }
-    static bool operator_le(const VALUE& a, const VALUE& b) { return a <= b; }
-    static bool operator_gt(const VALUE& a, const VALUE& b) { return a > b; }
-    static bool operator_ge(const VALUE& a, const VALUE& b) { return a >= b; }
-
-    bool operator==(const GC_VALUE& other) const { return relational_equal_op(other, eq_id, operator_eq); }
-    bool operator<(const GC_VALUE& other) const { return relational_equal_op(other, lt_id, operator_lt); }
-    bool operator<=(const GC_VALUE& other) const { return relational_equal_op(other, le_id, operator_le); }
-    bool operator>(const GC_VALUE& other) const { return relational_equal_op(other, gt_id, operator_gt); }
-    bool operator>=(const GC_VALUE& other) const { return relational_equal_op(other, ge_id, operator_ge); }
-
-    bool operator!=(const GC_VALUE& other) const
-    {
-      return !(this->operator==(other));
-    }
-
-    GC_VALUE unary_op(const ID& op_id) const
-    {
-      VALUE ret = Qnil;
-      SWIG_RUBY_THREAD_BEGIN_BLOCK;
-      OpArgs  args;
-      args.src    = _obj;
-      args.id     = op_id;
-      args.nargs  = 0;
-      args.target = Qnil;
-      ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args),
-                     (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil);
-      SWIG_RUBY_THREAD_END_BLOCK;
-      return ret;
-    }
-
-    GC_VALUE operator+() const { return unary_op(pos_id); }
-    GC_VALUE operator-() const { return unary_op(neg_id); }
-    GC_VALUE operator~() const { return unary_op(inv_id); }
-
-    GC_VALUE binary_op(const GC_VALUE& other, const ID& op_id) const
-    {
-      VALUE ret = Qnil;
-      SWIG_RUBY_THREAD_BEGIN_BLOCK;
-      OpArgs  args;
-      args.src    = _obj;
-      args.id     = op_id;
-      args.nargs  = 1;
-      args.target = VALUE(other);
-      ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args),
-                     (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil);
-      SWIG_RUBY_THREAD_END_BLOCK;
-      return GC_VALUE(ret);
-    }
-
-    GC_VALUE operator+(const GC_VALUE& other) const { return binary_op(other, add_id); }
-    GC_VALUE operator-(const GC_VALUE& other) const { return binary_op(other, sub_id); }
-    GC_VALUE operator*(const GC_VALUE& other) const { return binary_op(other, mul_id); }
-    GC_VALUE operator/(const GC_VALUE& other) const { return binary_op(other, div_id); }
-    GC_VALUE operator%(const GC_VALUE& other) const { return binary_op(other, mod_id); }
-    GC_VALUE operator&(const GC_VALUE& other) const { return binary_op(other, and_id); }
-    GC_VALUE operator^(const GC_VALUE& other) const { return binary_op(other, xor_id); }
-    GC_VALUE operator|(const GC_VALUE& other) const { return binary_op(other, or_id); }
-    GC_VALUE operator<<(const GC_VALUE& other) const { return binary_op(other, lshift_id); }
-    GC_VALUE operator>>(const GC_VALUE& other) const { return binary_op(other, rshift_id); }
-  };
-
-  ID  GC_VALUE::hash_id = rb_intern("hash");
-  ID  GC_VALUE::lt_id = rb_intern("<");
-  ID  GC_VALUE::gt_id = rb_intern(">");
-  ID  GC_VALUE::eq_id = rb_intern("==");
-  ID  GC_VALUE::le_id = rb_intern("<=");
-  ID  GC_VALUE::ge_id = rb_intern(">=");
-
-  ID  GC_VALUE::pos_id = rb_intern("+@");
-  ID  GC_VALUE::neg_id = rb_intern("-@");
-  ID  GC_VALUE::inv_id = rb_intern("~");
-
-  ID  GC_VALUE::add_id = rb_intern("+");
-  ID  GC_VALUE::sub_id = rb_intern("-");
-  ID  GC_VALUE::mul_id = rb_intern("*");
-  ID  GC_VALUE::div_id = rb_intern("/");
-  ID  GC_VALUE::mod_id = rb_intern("%");
-
-  ID  GC_VALUE::and_id = rb_intern("&");
-  ID  GC_VALUE::or_id  = rb_intern("|");
-  ID  GC_VALUE::xor_id = rb_intern("^");
-
-  ID  GC_VALUE::lshift_id = rb_intern("<<");
-  ID  GC_VALUE::rshift_id = rb_intern(">>");
-
-  typedef GC_VALUE LANGUAGE_OBJ;
-
-} // namespace swig
-
-} // %fragment(GC_VALUE_definition)
-
-
-
-namespace swig {
-
-  %apply VALUE   {GC_VALUE};
-
-  // Make sure this is the last typecheck done
-  %typecheck(999999,fragment="GC_VALUE_definition",noblock=1) GC_VALUE, GC_VALUE&, 
-    const GC_VALUE& { $1 = 1; };
-
-  /* For input */
-  %typemap(in,fragment="GC_VALUE_definition",noblock=1) GC_VALUE* (GC_VALUE r), GC_VALUE& (GC_VALUE r)  {
-     r = $input; $1 = &r;
-   }
-
-  /* For output */
-  %typemap(out,fragment="GC_VALUE_definition",noblock=1)  GC_VALUE {
-    $result = (VALUE)$1;
-  }
-  
-  %typemap(out,fragment="GC_VALUE_definition",noblock=1)  GC_VALUE*, GC_VALUE const & {
-    $result = (VALUE)*$1;
-  }
-
-  %nodirector GC_VALUE;
-
-  // We ignore the constructor so that user can never create a GC_VALUE 
-  // manually
-  %ignore GC_VALUE::GC_VALUE;
-
-  struct GC_VALUE {
-    VALUE inspect() const;
-    VALUE to_s() const;
-    GC_VALUE();
-  protected:
-    GC_VALUE(const GC_VALUE&);
-    ~GC_VALUE();
-  };
-
-  %exception GC_VALUE {};
-
-
-  %ignore LANGUAGE_OBJ;
-  typedef GC_VALUE LANGUAGE_OBJ;
-}
-
-
-%init {
-  swig::SwigGCReferences::initialize();
-}
-
-
-
-//
-// Fragment that contains traits to properly deal with GC_VALUE.
-// These functions may be invoked as a need of the from(), asval(),
-// asptr() and as() template functors, usually used in %typemaps.
-//
-%fragment(SWIG_Traits_frag(swig::GC_VALUE),"header",fragment="StdTraits",fragment="GC_VALUE_definition") {
-namespace swig {
-  template <>  struct traits<GC_VALUE > {
-    typedef value_category category;
-    static const char* type_name() { return "GC_VALUE"; }
-  };
-  
-  template <>  struct traits_from<GC_VALUE> {
-    typedef GC_VALUE value_type;
-    static VALUE from(const value_type& val) {
-      return static_cast<VALUE>(val);
-    }
-  };
-  
-  template <> 
-  struct traits_check<GC_VALUE, value_category> {
-    static bool check(GC_VALUE) {
-      return true;
-    }
-  };
-  
-  template <>  struct traits_asval<GC_VALUE > {   
-    typedef GC_VALUE value_type;
-    static int asval(VALUE obj, value_type *val) {
-      if (val) *val = obj;
-      return SWIG_OK;
-    }
-  };
-} // swig
-} // %fragment(traits for swig::GC_VALUE)
-
-
-#endif  // __cplusplus
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubycomplex.swg b/dependencies2013/win32/swig/Lib/ruby/rubycomplex.swg
deleted file mode 100644
index 4e249c71..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubycomplex.swg
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-  Defines the As/From conversors for double/float complex, you need to
-  provide complex Type, the Name you want to use in the converters,
-  the complex Constructor method, and the Real and Imag complex
-  accessor methods.
-
-  See the std_complex.i and ccomplex.i for concrete examples.
-*/
-
-%fragment("rb_complex_new","header")
-{
-%#if !defined(T_COMPLEX)
-/* Ruby versions prior to 1.9 did not have native complex numbers.  They were an extension in the STD library.  */
-SWIGINTERN VALUE rb_complex_new(VALUE x, VALUE y) {
-  static ID new_id = rb_intern("new");
-  static VALUE cComplex = rb_const_get(rb_cObject, rb_intern("Complex"));
-  return rb_funcall(cComplex, new_id, 2, x, y);
-}
-%#endif
-}
-
-%fragment("SWIG_Complex_Numbers","header")
-{
-%#if !defined(T_COMPLEX)
-SWIGINTERN int SWIG_Is_Complex( VALUE obj ) {
-  static ID real_id = rb_intern("real");
-  static ID imag_id = rb_intern("imag");
-  return ( (rb_respond_to( obj, real_id ) ) &&
-           (rb_respond_to( obj, imag_id ) ) );
-}
-%#else
-SWIGINTERN int SWIG_Is_Complex( VALUE obj ) {
-  return TYPE(obj) == T_COMPLEX;
-}
-%#endif
-
-SWIGINTERN VALUE SWIG_Complex_Real(VALUE obj) {
-  static ID real_id = rb_intern("real");
-  return rb_funcall(obj, real_id, 0);
-}
-
-SWIGINTERN VALUE SWIG_Complex_Imaginary(VALUE obj) {
-  static ID imag_id = rb_intern("imag");
-  return rb_funcall(obj, imag_id, 0);
-}
-}
-
-%init {
-%#if !defined(T_COMPLEX)
-  rb_require("complex");
-%#endif
-}
-
-/* the common from converter */
-%define %swig_fromcplx_conv(Type, Real, Imag)
-%fragment(SWIG_From_frag(Type),"header",fragment="rb_complex_new")
-{
-SWIGINTERNINLINE VALUE
-SWIG_From(Type)(%ifcplusplus(const Type&, Type) c)
-{
-  VALUE re = rb_float_new(Real(c));
-  VALUE im = rb_float_new(Imag(c));
-  return rb_complex_new(re, im);
-}
-}
-%enddef
-
-/* the double case */
-%define %swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-	  fragment=SWIG_AsVal_frag(double),
-          fragment="SWIG_Complex_Numbers")
-{
-SWIGINTERN int
-SWIG_AsVal(Type) (VALUE o, Type* val)
-{
-  if ( SWIG_Is_Complex( o ) ) {
-    if (val) {
-      VALUE real = SWIG_Complex_Real(o);
-      VALUE imag = SWIG_Complex_Imaginary(o);
-      double re = 0;
-      SWIG_AsVal_double( real, &re );
-      double im = 0;
-      SWIG_AsVal_double( imag, &im );
-      *val = Constructor(re, im);
-    }
-    return SWIG_OK;
-  } else {
-    double d;    
-    int res = SWIG_AddCast(SWIG_AsVal(double)(o, &d));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(d, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-/* the float case */
-%define %swig_cplxflt_conv(Type, Constructor, Real, Imag)
-%fragment(SWIG_AsVal_frag(Type),"header",
-          fragment=SWIG_AsVal_frag(float),
-          fragment=SWIG_AsVal_frag(double),
-          fragment="SWIG_Complex_Numbers") {
-SWIGINTERN int
-SWIG_AsVal(Type)(VALUE o, Type *val)
-{
-  if ( SWIG_Is_Complex( o ) ) {
-    VALUE real = SWIG_Complex_Real(o);
-    VALUE imag = SWIG_Complex_Imaginary(o);
-    double re = 0;
-    SWIG_AsVal_double( real, &re );
-    double im = 0;
-    SWIG_AsVal_double( imag, &im );
-    if ((-FLT_MAX <= re && re <= FLT_MAX) && 
-	(-FLT_MAX <= im && im <= FLT_MAX)) {
-      if (val) *val = Constructor(%numeric_cast(re, float),
-				  %numeric_cast(im, float));
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }
-  } else {
-    float re;
-    int res = SWIG_AddCast(SWIG_AsVal(float)(o, &re));
-    if (SWIG_IsOK(res)) {
-      if (val) *val = Constructor(re, 0.0);
-      return res;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-%swig_fromcplx_conv(Type, Real, Imag);
-%enddef
-
-#define %swig_cplxflt_convn(Type, Constructor, Real, Imag) \
-%swig_cplxflt_conv(Type, Constructor, Real, Imag)
-
-
-#define %swig_cplxdbl_convn(Type, Constructor, Real, Imag) \
-%swig_cplxdbl_conv(Type, Constructor, Real, Imag)
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubycontainer.swg b/dependencies2013/win32/swig/Lib/ruby/rubycontainer.swg
deleted file mode 100644
index 4f1c6f55..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubycontainer.swg
+++ /dev/null
@@ -1,1121 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubycontainer.swg
- *
- * Ruby sequence <-> C++ container wrapper
- *
- * This wrapper, and its iterator, allows a general use (and reuse) of
- * the mapping between C++ and Ruby, thanks to the C++ templates.
- *
- * Of course, it needs the C++ compiler to support templates, but
- * since we will use this wrapper with the STL containers, that should
- * be the case.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <iostream>
-%}
-
-
-#if !defined(SWIG_NO_EXPORT_ITERATOR_METHODS)
-# if !defined(SWIG_EXPORT_ITERATOR_METHODS)
-#  define SWIG_EXPORT_ITERATOR_METHODS SWIG_EXPORT_ITERATOR_METHODS
-# endif
-#endif
-
-%include <rubyiterators.swg>
-
-/**** The RubySequence C++ Wrap ***/
-
-%fragment("<stdexcept>");
-
-%include <std_except.i>
-
-
-%fragment("RubySequence_Base","header")
-{
-%#include <functional>
-
-
-namespace swig {
-  template < class T >
-  struct yield
-  {
-    bool
-    operator()( const T& v ) const
-    { 
-      return RTEST( rb_yield( swig::from< T >(v) ) );
-    }
-  };
-
-
-  inline size_t
-  check_index(ptrdiff_t i, size_t size, bool insert = false) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size)
-	return (size_t) (i + size);
-    } else if ( (size_t) i < size ) {
-      return (size_t) i;
-    } else if (insert && ((size_t) i == size)) {
-      return size;
-    }
-    
-    throw std::out_of_range("index out of range");
-  }
-
-  inline size_t
-  slice_index(ptrdiff_t i, size_t size) {
-    if ( i < 0 ) {
-      if ((size_t) (-i) <= size) {
-	return (size_t) (i + size);
-      } else {
-	throw std::out_of_range("index out of range");
-      }
-    } else {
-      return ( (size_t) i < size ) ? ((size_t) i) : size;
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::iterator
-  getpos(Sequence* self, Difference i)  {
-    typename Sequence::iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence, class Difference>
-  inline typename Sequence::const_iterator
-  cgetpos(const Sequence* self, Difference i)  {
-    typename Sequence::const_iterator pos = self->begin();
-    std::advance(pos, check_index(i,self->size()));
-    return pos;
-  }
-
-  template <class Sequence>
-  inline void
-  resize(Sequence *seq, typename Sequence::size_type n, typename Sequence::value_type x) {
-    seq->resize(n, x);
-  }
-
-  template <class Sequence, class Difference>
-  inline Sequence*
-  getslice(const Sequence* self, Difference i, Difference j) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, (i == size && j == size));
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-
-    if (jj > ii) {
-      typename Sequence::const_iterator vb = self->begin();
-      typename Sequence::const_iterator ve = self->begin();
-      std::advance(vb,ii);
-      std::advance(ve,jj);
-      return new Sequence(vb, ve);
-    } else {
-      return new Sequence();
-    }
-  }
-
-  template <class Sequence, class Difference, class InputSeq>
-  inline void
-  setslice(Sequence* self, Difference i, Difference j, const InputSeq& v) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, true);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-    if (jj < ii) jj = ii;
-    size_t ssize = jj - ii;
-    if (ssize <= v.size()) {
-      typename Sequence::iterator sb = self->begin();
-      typename InputSeq::const_iterator vmid = v.begin();
-      std::advance(sb,ii);
-      std::advance(vmid, jj - ii);
-      self->insert(std::copy(v.begin(), vmid, sb), vmid, v.end());
-    } else {
-      typename Sequence::iterator sb = self->begin();
-      typename Sequence::iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      self->erase(sb,se);
-      self->insert(sb, v.begin(), v.end());
-    }
-  }
-
-  template <class Sequence, class Difference>
-  inline void
-  delslice(Sequence* self, Difference i, Difference j) {
-    typename Sequence::size_type size = self->size();
-    typename Sequence::size_type ii = swig::check_index(i, size, true);
-    typename Sequence::size_type jj = swig::slice_index(j, size);
-    if (jj > ii) {
-      typename Sequence::iterator sb = self->begin();
-      typename Sequence::iterator se = self->begin();
-      std::advance(sb,ii);
-      std::advance(se,jj);
-      self->erase(sb,se);
-    }
-  }
-}
-}
-
-%fragment("RubySequence_Cont","header",
-	  fragment="<stddef.h>",
-	  fragment="StdTraits",
-	  fragment="RubySequence_Base",
-	  fragment="ConstIterator_T")
-{
-namespace swig
-{
-
-  /**
-   * This class is a proxy class for references, used to return and set values
-   * of an element of a Ruby Array of stuff.
-   * It can be used by RubySequence_InputIterator to make it work with STL
-   * algorithms.
-   */
-  template <class T>
-  struct RubySequence_Ref
-  {
-    RubySequence_Ref(VALUE  seq, int index)
-      : _seq(seq), _index(index)
-    {
-    }
-    
-    operator T () const
-    {
-      VALUE item = rb_ary_entry(_seq, _index );
-      try {
-	return swig::as<T>(item, true);
-      } catch (std::exception& e) {
-	char msg[1024];
-	sprintf(msg, "in sequence element %d ", _index);
-	VALUE lastErr = rb_gv_get("$!");
-	if ( lastErr == Qnil ) {
-	  %type_error(swig::type_name<T>());
-	}
-	VALUE str = rb_str_new2(msg);
-	str = rb_str_cat2( str, e.what() );
-	SWIG_Ruby_ExceptionType( NULL, str );
-	throw;
-      }
-    }
-
-    RubySequence_Ref& operator=(const T& v)
-    {
-      rb_ary_set(_seq, _index, swig::from< T >(v));
-      return *this;
-    }
-
-  private:
-    VALUE  _seq;
-    int _index;
-  };
-
-
-  /**
-   * This class is a proxy to return a pointer to a class, usually
-   * RubySequence_Ref. 
-   * It can be used by RubySequence_InputIterator to make it work with STL
-   * algorithms.
-   */
-  template <class T>
-  struct RubySequence_ArrowProxy
-  {
-    RubySequence_ArrowProxy(const T& x): m_value(x) {}
-    const T* operator->() const { return &m_value; }
-    operator const T*() const { return &m_value; }
-    T m_value;
-  };
-
-
-  /**
-   * Input Iterator.  This adapator class is a random access iterator that 
-   * allows you to use STL algorithms with a Ruby class (a Ruby Array by default).
-   */
-  template <class T, class Reference = RubySequence_Ref< T > >
-  struct RubySequence_InputIterator
-  {
-    typedef RubySequence_InputIterator<T, Reference > self;
-
-    typedef std::random_access_iterator_tag iterator_category;
-    typedef Reference reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef ptrdiff_t difference_type;
-
-    RubySequence_InputIterator()
-    {
-    }
-
-    RubySequence_InputIterator(VALUE  seq, int index)
-      : _seq(seq), _index(index)
-    {
-    }
-
-    reference operator*() const
-    {
-      return reference(_seq, _index);
-    }
-
-    RubySequence_ArrowProxy<T>
-    operator->() const {
-      return RubySequence_ArrowProxy<T>(operator*());
-    }
-
-    bool operator==(const self& ri) const
-    {
-      return (_index == ri._index) && (_seq == ri._seq);
-    }
-
-    bool operator!=(const self& ri) const
-    {
-      return !(operator==(ri));
-    }
-
-    self& operator ++ ()
-    {
-      ++_index;
-      return *this;
-    }
-
-    self& operator -- ()
-    {
-      --_index;
-      return *this;
-    }
-
-    self& operator += (difference_type n)
-    {
-      _index += n;
-      return *this;
-    }
-
-    self operator +(difference_type n) const
-    {
-      return self(_seq, _index + n);
-    }
-
-    self& operator -= (difference_type n)
-    {
-      _index -= n;
-      return *this;
-    }
-
-    self operator -(difference_type n) const
-    {
-      return self(_seq, _index - n);
-    }
-
-    difference_type operator - (const self& ri) const
-    {
-      return _index - ri._index;
-    }
-
-    bool operator < (const self& ri) const
-    {
-      return _index < ri._index;
-    }
-
-    reference
-    operator[](difference_type n) const
-    {
-      return reference(_seq, _index + n);
-    }
-
-  private:
-    VALUE  _seq;
-    difference_type _index;
-  };
-
-
-  /**
-   * This adaptor class allows you to use a Ruby Array as if it was an STL
-   * container, giving it begin(), end(), and iterators.
-   */
-  template <class T>
-  struct RubySequence_Cont
-  {
-    typedef RubySequence_Ref<T> reference;
-    typedef const RubySequence_Ref<T> const_reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef int difference_type;
-    typedef int size_type;
-    typedef const pointer const_pointer;
-    typedef RubySequence_InputIterator<T, reference> iterator;
-    typedef RubySequence_InputIterator<T, const_reference> const_iterator;
-
-    RubySequence_Cont(VALUE  seq) : _seq(0)
-    {
-      if (!rb_obj_is_kind_of(seq, rb_cArray)) {
-	throw std::invalid_argument("an Array is expected");
-      }
-      _seq = seq;
-    }
-
-    ~RubySequence_Cont()
-    {
-    }
-
-    size_type size() const
-    {
-      return RARRAY_LEN(_seq);
-    }
-
-    bool empty() const
-    {
-      return size() == 0;
-    }
-
-    iterator begin()
-    {
-      return iterator(_seq, 0);
-    }
-
-    const_iterator begin() const
-    {
-      return const_iterator(_seq, 0);
-    }
-
-    iterator end()
-    {
-      return iterator(_seq, size());
-    }
-
-    const_iterator end() const
-    {
-      return const_iterator(_seq, size());
-    }
-
-    reference operator[](difference_type n)
-    {
-      return reference(_seq, n);
-    }
-
-    const_reference operator[](difference_type n)  const
-    {
-      return const_reference(_seq, n);
-    }
-
-    bool check(bool set_err = false) const
-    {
-      int s = (int) size();
-      for (int i = 0; i < s; ++i) {
-	VALUE item = rb_ary_entry(_seq, i );
-	if (!swig::check<value_type>(item)) {
-	  if (set_err) {
-	    char msg[1024];
-	    sprintf(msg, "in sequence element %d", i);
-	    SWIG_Error(SWIG_RuntimeError, msg);
-	  }
-	  return false;
-	}
-      }
-      return true;
-    }
-
-  private:
-    VALUE  _seq;
-  };
-
-}
-}
-
-/** 
- * Macros used to typemap an STL iterator -> SWIGIterator conversion.
- */
-%define %swig_sequence_iterator(Sequence...)
-#if defined(SWIG_EXPORT_ITERATOR_METHODS)
-
-  %typemap(out,noblock=1,fragment="RubySequence_Cont")
-    const_iterator, const_reverse_iterator {
-    $result = SWIG_NewPointerObj(swig::make_const_iterator(%static_cast($1,const $type &),
-							   self),
-				 swig::ConstIterator::descriptor(),SWIG_POINTER_OWN);
-  }
-
-  %typemap(out,noblock=1,fragment="RubySequence_Cont")
-    iterator, reverse_iterator {
-    $result = SWIG_NewPointerObj(swig::make_nonconst_iterator(%static_cast($1,const $type &),
-							      self),
-				 swig::Iterator::descriptor(),SWIG_POINTER_OWN);
-  }
-
-  %typemap(out,noblock=1,fragment="RubySequence_Cont")
-    std::pair<const_iterator, const_iterator> {
-    $result = rb_ary_new2(2);
-    rb_ary_push($result, SWIG_NewPointerObj(swig::make_const_iterator(%static_cast($1,const $type &).first),
-					    swig::ConstIterator::descriptor(),SWIG_POINTER_OWN));
-    rb_ary_push($result, SWIG_NewPointerObj(swig::make_const_iterator(%static_cast($1,const $type &).second),
-					    swig::ConstIterator::descriptor(),SWIG_POINTER_OWN));
-  }
-
-  // std::map/multimap/set allow returning std::pair< iterator, iterator > from
-  // equal_range, but we cannot still modify the key, so the iterator is
-  // const.
-  %typemap(out,noblock=1,fragment="RubySequence_Cont")
-    std::pair<iterator, iterator> {
-    $result = rb_ary_new2(2);
-    rb_ary_push($result, SWIG_NewPointerObj(swig::make_const_iterator(%static_cast($1,const $type &).first),
-					    swig::ConstIterator::descriptor(),SWIG_POINTER_OWN));
-    rb_ary_push($result, SWIG_NewPointerObj(swig::make_const_iterator(%static_cast($1,const $type &).second),
-					    swig::ConstIterator::descriptor(),SWIG_POINTER_OWN));
-  }
-
-
-  %typemap(in,noblock=1,fragment="RubySequence_Cont")
-    const_iterator(swig::ConstIterator *iter = 0, int res),
-    const_reverse_iterator(swig::ConstIterator *iter = 0, int res) {
-    res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::ConstIterator::descriptor(), 0);
-    if (!SWIG_IsOK(res) || !iter) {
-      %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-    } else {
-      swig::ConstIterator_T<$type > *iter_t = dynamic_cast<swig::ConstIterator_T<$type > *>(iter);
-      if (iter_t) {
-	$1 = iter_t->get_current();
-      } else {
-	%argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-      }
-    }
-  }
-
-  %typemap(in,noblock=1,fragment="RubySequence_Cont")
-    iterator(swig::Iterator *iter = 0, int res),
-    reverse_iterator(swig::Iterator *iter = 0, int res) {
-    res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::Iterator::descriptor(), 0);
-    if (!SWIG_IsOK(res) || !iter) {
-      %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-    } else {
-      swig::Iterator_T<$type > *iter_t = dynamic_cast<swig::Iterator_T<$type > *>(iter);
-      if (iter_t) {
-	$1 = iter_t->get_current();
-      } else {
-	%argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-      }
-    }
-  }
-
-  %typecheck(%checkcode(ITERATOR),noblock=1,fragment="RubySequence_Cont")
-    const_iterator, const_reverse_iterator {
-    swig::ConstIterator *iter = 0;
-    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::ConstIterator::descriptor(), 0);
-    $1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::ConstIterator_T<$type > *>(iter) != 0));
-  }
-
-  %typecheck(%checkcode(ITERATOR),noblock=1,fragment="RubySequence_Cont")
-    iterator, reverse_iterator {
-    swig::ConstIterator *iter = 0;
-    int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::Iterator::descriptor(), 0);
-    $1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::Iterator_T<$type > *>(iter) != 0));
-  }
-
-  %fragment("RubySequence_Cont");
-
-//   %newobject iterator;
-//   %newobject const_iterator;
-//   %extend  {
-//     swig::Iterator* iterator(VALUE* RUBY_SELF) {
-//       return swig::make_nonconst_iterator($self->begin(), $self->begin(), 
-// 				             $self->end(), *RUBY_SELF);
-//     }
-
-//     swig::ConstIterator* const_iterator(VALUE* RUBY_SELF) {
-//       return swig::make_const_iterator($self->begin(), $self->begin(), 
-// 					$self->end(), *RUBY_SELF);
-//     }
-//   }
-#endif //SWIG_EXPORT_ITERATOR_METHODS
-%enddef
-
-
-/**** The Ruby container methods  ****/
-
-
-
-%define %swig_container_methods(Container...)
-
-  %extend {
-
-  %newobject dup;
-  Container* dup()
-    {
-      return new Container(*$self);
-    }
-
-  }
-
-%enddef
-
-
-/**
- * Macro used to define common Ruby printing methods for STL container
- */
-%define %swig_sequence_printing_methods(Sequence...)
-
-  %extend {
-
-  VALUE inspect()
-    {
-      Sequence::const_iterator i = $self->begin();
-      Sequence::const_iterator e = $self->end();
-      const char *type_name = swig::type_name< Sequence >();
-      VALUE str = rb_str_new2(type_name);
-      str = rb_str_cat2( str, " [" );
-      bool comma = false;
-      VALUE tmp;
-      for ( ; i != e; ++i, comma = true )
-	{
-	  if (comma) str = rb_str_cat2( str, "," );
-	  tmp = swig::from< Sequence::value_type >( *i );
-	  tmp = rb_inspect( tmp );
-	  str = rb_str_buf_append( str, tmp );
-	}
-      str = rb_str_cat2( str, "]" );
-      return str;
-    }
-
-  VALUE to_a()
-    {
-      Sequence::const_iterator i = $self->begin();
-      Sequence::const_iterator e = $self->end();
-      VALUE ary = rb_ary_new2( std::distance( i, e ) );
-      VALUE tmp;
-      for ( ; i != e; ++i )
-	{
-	  tmp = swig::from< Sequence::value_type >( *i );
-	  rb_ary_push( ary, tmp );
-	}
-      return ary;
-    }
-
-  VALUE to_s()
-    {
-      Sequence::iterator i = $self->begin();
-      Sequence::iterator e = $self->end();
-      VALUE str = rb_str_new2( "" );
-      VALUE tmp;
-      for ( ; i != e; ++i )
-	{
-	  tmp = swig::from< Sequence::value_type >( *i );
-	  tmp = rb_obj_as_string( tmp );
-	  str = rb_str_buf_append( str, tmp );
-	}
-      return str;
-    }
-}
-%enddef
-
-
-/**
- * Macro used to add common methods to all STL sequence-type containers 
- */
-%define %swig_sequence_methods_non_resizable_common(Sequence...)
-  %swig_container_methods(%arg(Sequence))
-  %swig_sequence_iterator(%arg(Sequence))
-  %swig_sequence_printing_methods(%arg(Sequence))
-
-  %fragment("RubySequence_Base");
-
-  %extend {
-
-  VALUE slice( difference_type i, difference_type length ) throw (std::invalid_argument) {
-      if ( length < 0 )
-        return Qnil;
-      std::size_t len = $self->size();
-      if ( i < 0 ) {
-        if ( i + static_cast<Sequence::difference_type>(len) < 0 )
-          return Qnil;
-        else
-          i = len + i;
-      }
-      Sequence::difference_type j = length + i;
-      if ( j > static_cast<Sequence::difference_type>(len) )
-        j = len;
-
-      VALUE r = Qnil;
-      try {
-	r = swig::from< const Sequence* >( swig::getslice(self, i, j) );
-      }
-      catch( std::out_of_range ) {
-      }
-      return r;
-    }
-
-
-    Sequence* each()
-      {
-	if ( !rb_block_given_p() )
-	  rb_raise( rb_eArgError, "no block given");
-
-	VALUE r;
-	Sequence::const_iterator i = self->begin();
-	Sequence::const_iterator e = self->end();
-	for ( ; i != e; ++i )
-	  {
-	    r = swig::from< Sequence::value_type >(*i);
-	    rb_yield(r);
-	  }
-	
-	return self;
-      }
-
-    VALUE __delete2__(const value_type& i) {
-      VALUE r = Qnil;
-      return r;
-    }
-
-  }
-%enddef
-
-%define %swig_sequence_methods_resizable_common(Sequence...)
-  %extend {
-
-    %newobject select;
-    Sequence* select() {
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      Sequence* r = new Sequence();
-      Sequence::const_iterator i = $self->begin();
-      Sequence::const_iterator e = $self->end();
-      for ( ; i != e; ++i )
-	{
-	  VALUE v = swig::from< Sequence::value_type >(*i);
-	  if ( RTEST( rb_yield(v) ) )
-	    $self->insert( r->end(), *i);
-	}
-	
-      return r;
-    }
-
-    VALUE delete_at(difference_type i) {
-      VALUE r = Qnil;
-      try {
-	Sequence::iterator at = swig::getpos(self, i);
-	r = swig::from< Sequence::value_type >( *(at) );
-	$self->erase(at); 
-      }
-      catch (std::out_of_range)
-	{
-	}
-      return r;
-    }
-  }
-%enddef
-
-%define %swig_sequence_methods_common(Sequence...)
-  %swig_sequence_methods_non_resizable_common(%arg(Sequence))
-  %swig_sequence_methods_resizable_common(%arg(Sequence))
-%enddef
-
-/**
- * Macro used to add functions for back insertion of values in
- * STL sequence containers
- */
-%define %swig_sequence_back_inserters( Sequence... )
-  %extend {
-
-    VALUE pop() {
-      if ($self->empty()) return Qnil;
-      Sequence::value_type x = self->back();
-      $self->pop_back();
-      return swig::from< Sequence::value_type >( x );
-    }
-
-    %alias push "<<";
-    const value_type push( const value_type& e ) {
-      $self->push_back( e );
-      return e;
-    }
-
-    %newobject reject;
-    Sequence* reject() {
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      Sequence* r = new Sequence();
-      std::remove_copy_if( $self->begin(), $self->end(),              
-			   std::back_inserter(*r),
-			   swig::yield< Sequence::value_type >() );
-      return r;
-    }
-
-  }
-%enddef
-
-%define %swig_sequence_methods_extra(Sequence...)
-  %extend {
-    %alias reject_bang "delete_if";
-    Sequence* reject_bang() {
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      $self->erase( std::remove_if( $self->begin(), $self->end(),
-            swig::yield< Sequence::value_type >() ), $self->end() );
-      return $self;
-    }
-  }
-%enddef
-
-%define %swig_sequence_methods_non_resizable_accessors(Sequence...)
-  %extend {
-
-    VALUE at(difference_type i) const {
-      VALUE r = Qnil;
-      try {
-	r = swig::from< Sequence::value_type >( *(swig::cgetpos(self, i)) );
-      }
-      catch( std::out_of_range ) {
-      }
-      return r;
-    }
-
-    VALUE __getitem__(difference_type i, difference_type length) const throw (std::invalid_argument) {
-      if ( length < 0 )
-        return Qnil;
-      std::size_t len = $self->size();
-      if ( i < 0 ) {
-        if ( i + static_cast<Sequence::difference_type>(len) < 0 )
-          return Qnil;
-        else
-          i = len + i;
-      }
-      Sequence::difference_type j = length + i;
-      if ( j > static_cast<Sequence::difference_type>(len) )
-        j = len;
-
-      VALUE r = Qnil;
-      try {
-	r = swig::from< const Sequence* >( swig::getslice(self, i, j) );
-      }
-      catch( std::out_of_range ) {
-      }
-      return r;
-    }
-
-    VALUE __getitem__(difference_type i) const {
-      VALUE r = Qnil;
-      try {
-	r = swig::from< Sequence::value_type >( *(swig::cgetpos(self, i)) );
-      }
-      catch( std::out_of_range ) {
-      }
-      return r;
-    }
-
-    VALUE __getitem__(VALUE i) const throw (std::invalid_argument) {
-      if ( rb_obj_is_kind_of( i, rb_cRange ) == Qfalse ) {
-        rb_raise( rb_eTypeError, "not a valid index or range" );
-      }
-
-      static ID id_end   = rb_intern("end");
-      static ID id_start = rb_intern("begin");
-      static ID id_noend = rb_intern("exclude_end?");
-
-      VALUE start = rb_funcall( i, id_start, 0 );
-      VALUE end   = rb_funcall( i, id_end, 0 );
-      bool  noend = ( rb_funcall( i, id_noend, 0 ) == Qtrue );
-
-      int len = $self->size();
-
-      int s = NUM2INT( start );
-      if ( s < 0 ) {
-        s = len + s;
-        if ( s < 0 )
-          return Qnil;
-      } else if ( s > len )
-        return Qnil;
-
-      int e = NUM2INT( end );
-      if ( e < 0 ) e = len + e;
-      if ( noend ) e -= 1;
-      if ( e < 0 ) e = -1;
-      if ( e >= len ) e = len - 1;
-      if ( s == len ) e = len - 1;
-
-      return swig::from< Sequence* >( swig::getslice(self, s, e+1) );
-    }
-
-    VALUE __setitem__(difference_type i, const value_type& x) throw (std::invalid_argument, std::out_of_range)
-      {
-	if ( i >= static_cast<Sequence::difference_type>( $self->size()) )
-          swig::resize( $self, i+1, x );
-        else
-          *(swig::getpos($self, i)) = x;
-
-	return swig::from< Sequence::value_type >( x );
-      }
-
-    VALUE __setitem__(difference_type i, difference_type length, const Sequence& v) throw (std::invalid_argument) {
-
-      if ( length < 0 )
-        return Qnil;
-      std::size_t len = $self->size();
-      if ( i < 0 ) {
-        if ( i + static_cast<Sequence::difference_type>(len) < 0 )
-          return Qnil;
-        else
-          i = len + i;
-      }
-      Sequence::difference_type j = length + i;
-      if ( j > static_cast<Sequence::difference_type>(len) ) {
-        swig::resize( $self, j, *(v.begin()) );
-      }
-
-      VALUE r = Qnil;
-      swig::setslice($self, i, j, v);
-      r = swig::from< const Sequence* >( &v );
-      return r;
-    }
- }
-%enddef
-
-/**
- * Macro used to add functions for non resizable sequences
- */
-%define %swig_sequence_methods_non_resizable(Sequence...)
-  %swig_sequence_methods_non_resizable_common(%arg(Sequence))
-  %swig_sequence_methods_non_resizable_accessors(%arg(Sequence))
-%enddef
-
-
-/**
- * Macro used to add functions for sequences
- */
-%define %swig_sequence_methods(Sequence...)
-  %swig_sequence_methods_non_resizable_common(%arg(Sequence))
-  %swig_sequence_methods_resizable_common(%arg(Sequence))
-  %swig_sequence_methods_non_resizable_accessors(%arg(Sequence))
-  %swig_sequence_methods_extra(%arg(Sequence));
-  %swig_sequence_back_inserters(%arg(Sequence));
-%enddef
-
-%define %swig_sequence_methods_non_resizable_val(Sequence...)
-  %swig_sequence_methods_non_resizable(%arg(Sequence))
-%enddef
-
-%define %swig_sequence_methods_val(Sequence...)
-  %swig_sequence_methods(%arg(Sequence))
-%enddef
-
-
-/**
- * Macro used to add functions for front insertion of
- * elements in STL sequence containers that support it.
- */
-%define %swig_sequence_front_inserters( Sequence... )
-%extend {
-
-  VALUE shift()
-    {
-      if ($self->empty()) return Qnil;
-      Sequence::value_type x = self->front();
-      $self->erase( $self->begin() );
-      return swig::from< Sequence::value_type >( x );
-    }
-
-  %typemap(in) (int argc, VALUE* argv) {
-    $1 = argc - 1;
-    $2 = argv + 1;
-  }
-
-  Sequence* insert( difference_type pos, int argc, VALUE* argv, ... )
-    {
-      std::size_t len = $self->size();
-      std::size_t   i = swig::check_index( pos, len, true );
-      Sequence::iterator start;
-
-      VALUE elem = argv[0];
-      int idx = 0;
-      try {
-	Sequence::value_type val = swig::as<Sequence::value_type>( elem, true );
-	if ( i >= len ) {
-	  $self->resize(i-1, val);
-	  return $self;
-	}
-	start = $self->begin();
-	std::advance( start, i );
-	$self->insert( start++, val );
-
-	for ( ++idx; idx < argc; ++idx )
-	  {
-	    elem = argv[idx];
-	    val = swig::as<Sequence::value_type>( elem );
-	    $self->insert( start++, val );
-	  }
-
-      } 
-      catch( std::invalid_argument )
-	{
-	  rb_raise( rb_eArgError, "%s",
-		    Ruby_Format_TypeError( "", 
-					   swig::type_name<Sequence::value_type>(),
-					   __FUNCTION__, idx+2, elem ));
-	}
-
-
-      return $self;
-    }
-
-  %typemap(in) (int argc, VALUE* argv) {
-    $1 = argc;
-    $2 = argv;
-  }
-
-  Sequence* unshift( int argc, VALUE* argv, ... )
-    {
-      for ( int idx = argc-1; idx >= 0; --idx )
-	{
-	  Sequence::iterator start = $self->begin();
-	  VALUE elem = argv[idx];
-	  try {
-	    Sequence::value_type val = swig::as<Sequence::value_type>( elem, true );
-	    $self->insert( start, val );
-	  }
-	  catch( std::invalid_argument )
-	    {
-	      rb_raise( rb_eArgError, "%s",
-			Ruby_Format_TypeError( "", 
-					       swig::type_name<Sequence::value_type>(),
-					       __FUNCTION__, idx+2, elem ));
-	    }
-	}
-
-      return $self;
-    }
-}
-%enddef
-
-
-//
-// Common fragments
-//
-
-%fragment("StdSequenceTraits","header",
-	  fragment="StdTraits",
-	  fragment="RubySequence_Cont",
-	  fragment="GC_VALUE_definition")
-{
-namespace swig {
-  template <class RubySeq, class Seq>
-  inline void
-  assign(const RubySeq& rubyseq, Seq* seq) {
-    // seq->assign(rubyseq.begin(), rubyseq.end()); // not used as not always implemented
-    typedef typename RubySeq::value_type value_type;
-    typename RubySeq::const_iterator it = rubyseq.begin();
-    for (;it != rubyseq.end(); ++it) {
-      seq->insert(seq->end(),(value_type)(*it));
-    }
-  }
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_asptr_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-
-    static int asptr(VALUE obj, sequence **seq) {
-      if (rb_obj_is_kind_of(obj, rb_cArray) == Qtrue) {
-	try {
-	  RubySequence_Cont<value_type> rubyseq(obj);
-	  if (seq) {
-	    sequence *pseq = new sequence();
-	    assign(rubyseq, pseq);
-	    *seq = pseq;
-	    return SWIG_NEWOBJ;
-	  } else {
-	    return rubyseq.check() ? SWIG_OK : SWIG_ERROR;
-	  }
-	} catch (std::exception& e) {
-	  if (seq) {
-	    VALUE lastErr = rb_gv_get("$!");
-	    if (lastErr == Qnil) {
-	      rb_raise(rb_eTypeError, "%s", e.what());
-	    }
-	  }
-	  return SWIG_ERROR;
-	}
-      } else {
-	sequence *p;
-	swig_type_info *descriptor = swig::type_info<sequence>();
-	if (descriptor && SWIG_IsOK(SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
-      }
-      return SWIG_ERROR;
-    }
-  };
-
-  // Partial specialization for GC_VALUE's.  No need to typecheck each
-  // element.
-  template< class Seq >
-  struct traits_asptr_stdseq< Seq, swig::GC_VALUE > {
-    typedef Seq sequence;
-    typedef swig::GC_VALUE value_type;
-
-    static int asptr(VALUE obj, sequence **seq) {
-      if (rb_obj_is_kind_of(obj, rb_cArray) == Qtrue) {
-	try {
-	  if (seq) {
-	    RubySequence_Cont<value_type> rubyseq(obj);
-	    sequence *pseq = new sequence();
-	    assign(rubyseq, pseq);
-	    *seq = pseq;
-	    return SWIG_NEWOBJ;
-	  } else {
-	    return true;
-	  }
-	} catch (std::exception& e) {
-	  if (seq) {
-	    VALUE lastErr = rb_gv_get("$!");
-	    if (lastErr == Qnil) {
-	      rb_raise(rb_eTypeError, "%s", e.what());
-	    }
-	  }
-	  return SWIG_ERROR;
-	}
-      } else {
-	sequence *p;
-	swig_type_info *descriptor = swig::type_info<sequence>();
-	if (descriptor && SWIG_IsOK(SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
-      }
-      return SWIG_ERROR;
-    }
-  };
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_from_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-    typedef typename Seq::size_type size_type;
-    typedef typename sequence::const_iterator const_iterator;
-
-    static VALUE from(const sequence& seq) {
-#ifdef SWIG_RUBY_EXTRA_NATIVE_CONTAINERS
-      swig_type_info *desc = swig::type_info<sequence>();
-      if (desc && desc->clientdata) {
-	return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
-      }
-#endif
-      size_type size = seq.size();
-      if (size <= (size_type)INT_MAX) {
-	VALUE obj = rb_ary_new2((int)size);
-	int i = 0;
-	for (const_iterator it = seq.begin();
-	     it != seq.end(); ++it, ++i) {
-	  rb_ary_push(obj, swig::from< value_type >(*it));
-	}
-	rb_obj_freeze(obj);  // treat as immutable result
-	return obj;
-      } else {
-	rb_raise(rb_eRangeError,"sequence size not valid in ruby");
-	return Qnil;
-      }
-    }
-  };
-}
-}
-
-
-%include <rubycontainer_extended.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubycontainer_extended.swg b/dependencies2013/win32/swig/Lib/ruby/rubycontainer_extended.swg
deleted file mode 100644
index 7514ba2c..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubycontainer_extended.swg
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubycontainer_extended.swg
- *
- * This file contains additional functions that make containers
- * behave closer to ruby primitive types.
- * However, some of these functions place some restrictions on
- * the underlying object inside of the container and the iterator
- * (that it has to have an == comparison function, that it has to have 
- * an = assignment operator, etc).
- * ----------------------------------------------------------------------------- */
-
-/** 
- * Macro used to add extend functions that require operator== in object.
- * 
- * @param Container    STL container
- * @param Type         class inside container
- *
- */
-%define %swig_container_with_equal_operator( Container, Type )
-
-  VALUE __delete__( const Type& val ) {
-    VALUE r = Qnil;
-    Container<Type >::iterator e = $self->end();
-    Container<Type >::iterator i = std::remove( $self->begin(), e, val );
-    // remove dangling elements now
-    $self->erase( i, e );
-    
-    if ( i != e )
-      r = swig::from< Type >( val );
-    else if ( rb_block_given_p() )
-      r = rb_yield(Qnil);
-    return r;
-  }
-
-%enddef  // end of  %swig_container_with_equal_operator
-
-
-
-
-/** 
- * Macro used to add extend functions that require the assignment 
- * operator (ie. = ) of contained class
- * 
- * @param Container    STL container
- * @param Type         class inside container
- * 
- */
-
-%define %swig_container_with_assignment( Container, Type )
-
-
-  //
-  // map!  -- the equivalent of std::transform
-  //
-  Container< Type >* map_bang() {
-
-    if ( !rb_block_given_p() )
-      rb_raise( rb_eArgError, "No block given" );
-
-    VALUE r = Qnil;
-    Container< Type >::iterator i = $self->begin();
-    Container< Type >::iterator e = $self->end();
-
-    try {
-      for ( ; i != e; ++i )
-	{
-	  r = swig::from< Type >( *i );
-	  r = rb_yield( r );
-	  *i = swig::as< Type >( r );
-	}
-    }
-    catch ( const std::invalid_argument& )
-      {
-	rb_raise(rb_eTypeError,
-		 "Yield block did not return a valid element for " "Container");
-      }
-    
-    return $self;
-  }
-
-
-%enddef  // end of  %swig_container_with_assignment
-
-
-
-
-
-/** 
- * Macro used to add all extended functions to a container
- * 
- * @param Container    STL container
- * @param Type         class inside container
- * 
- */
-%define %swig_container_extend( Container, Type )
-
-%extend Container< Type > {
-
-  %swig_container_with_assignment( %arg(Container), Type );
-  %swig_container_with_equal_operator( %arg(Container), Type );
-
-}
-
-%enddef
-
-
-/** 
- * Private macro used to add all extended functions to C/C++
- * primitive types
- * 
- * @param Container an STL container, like std::vector (with no class template)
- *
- */
-%define %__swig_container_extend_primtypes( Container )
-
-%swig_container_extend( %arg( Container ), bool );
-%swig_container_extend( %arg( Container ), char );
-%swig_container_extend( %arg( Container ), short );
-%swig_container_extend( %arg( Container ), int );
-%swig_container_extend( %arg( Container ), unsigned short );
-%swig_container_extend( %arg( Container ), unsigned int );
-%swig_container_extend( %arg( Container ), float );
-%swig_container_extend( %arg( Container ), double );
-%swig_container_extend( %arg( Container ), std::complex );
-%swig_container_extend( %arg( Container ), std::string );
-%swig_container_extend( %arg( Container ), swig::GC_VALUE );
-
-%enddef
-
-
-%__swig_container_extend_primtypes( std::vector );
-%__swig_container_extend_primtypes( std::deque );
-%__swig_container_extend_primtypes( std::list );
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubydef.swg b/dependencies2013/win32/swig/Lib/ruby/rubydef.swg
deleted file mode 100644
index 956aaee0..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubydef.swg
+++ /dev/null
@@ -1 +0,0 @@
-/* empty file added for backward comp. */
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyerrors.swg b/dependencies2013/win32/swig/Lib/ruby/rubyerrors.swg
deleted file mode 100644
index 434544bc..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyerrors.swg
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -----------------------------------------------------------------------------
- * error manipulation
- * ----------------------------------------------------------------------------- */
-
-
-/* Define some additional error types */
-#define SWIG_ObjectPreviouslyDeletedError  -100
-
-
-/* Define custom exceptions for errors that do not map to existing Ruby
-   exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
-
-SWIGINTERN VALUE 
-getNullReferenceError(void) {
-  static int init = 0;
-  static VALUE rb_eNullReferenceError ;
-  if (!init) {
-    init = 1;
-    rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
-  }
-  return rb_eNullReferenceError;
-} 
-
-SWIGINTERN VALUE 
-getObjectPreviouslyDeletedError(void) {
-  static int init = 0;
-  static VALUE rb_eObjectPreviouslyDeleted ;
-  if (!init) {
-    init = 1;
-    rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
-  }
-  return rb_eObjectPreviouslyDeleted;
-} 
-
-
-SWIGINTERN VALUE
-SWIG_Ruby_ErrorType(int SWIG_code) {
-  VALUE type;
-  switch (SWIG_code) {
-  case SWIG_MemoryError:
-    type = rb_eNoMemError;
-    break;
-  case SWIG_IOError:
-    type = rb_eIOError;
-    break;
-  case SWIG_RuntimeError:
-    type = rb_eRuntimeError;
-    break;
-  case SWIG_IndexError:
-    type = rb_eIndexError;
-    break;
-  case SWIG_TypeError:
-    type = rb_eTypeError;
-    break;
-  case SWIG_DivisionByZero:
-    type = rb_eZeroDivError;
-    break;
-  case SWIG_OverflowError:
-    type = rb_eRangeError;
-    break;
-  case SWIG_SyntaxError:
-    type = rb_eSyntaxError;
-    break;
-  case SWIG_ValueError:
-    type = rb_eArgError;
-    break;
-  case SWIG_SystemError:
-    type = rb_eFatal;
-    break;
-  case SWIG_AttributeError:
-    type = rb_eRuntimeError;
-    break;
-  case SWIG_NullReferenceError:
-    type = getNullReferenceError();
-    break;
-  case SWIG_ObjectPreviouslyDeletedError:
-    type = getObjectPreviouslyDeletedError();
-    break;
-  case SWIG_UnknownError:
-    type = rb_eRuntimeError;
-    break;
-  default:
-    type = rb_eRuntimeError;
-  }
-  return type;
-}
-
-
-/* This function is called when a user inputs a wrong argument to
-   a method.
- */
-SWIGINTERN 
-const char* Ruby_Format_TypeError( const char* msg,
-				   const char* type, 
-				   const char* name, 
-				   const int argn,
-				   VALUE input )
-{
-  char buf[128];
-  VALUE str;
-  VALUE asStr;
-  if ( msg && *msg )
-    {
-      str = rb_str_new2(msg);
-    }
-  else
-    {
-      str = rb_str_new(NULL, 0);
-    }
-
-  str = rb_str_cat2( str, "Expected argument " );
-  sprintf( buf, "%d of type ", argn-1 );
-  str = rb_str_cat2( str, buf );
-  str = rb_str_cat2( str, type );
-  str = rb_str_cat2( str, ", but got " );
-  str = rb_str_cat2( str, rb_obj_classname(input) );
-  str = rb_str_cat2( str, " " );
-  asStr = rb_inspect(input);
-  if ( RSTRING_LEN(asStr) > 30 )
-    {
-      str = rb_str_cat( str, StringValuePtr(asStr), 30 );
-      str = rb_str_cat2( str, "..." );
-    }
-  else
-    {
-      str = rb_str_append( str, asStr );
-    }
-
-  if ( name )
-    {
-      str = rb_str_cat2( str, "\n\tin SWIG method '" );
-      str = rb_str_cat2( str, name );
-      str = rb_str_cat2( str, "'" );
-    }
-
-  return StringValuePtr( str );
-}
-
-/* This function is called when an overloaded method fails */
-SWIGINTERN 
-void Ruby_Format_OverloadedError(
-				 const int argc,
-				 const int maxargs,
-				 const char* method, 
-				 const char* prototypes 
-				 )
-{
-  const char* msg = "Wrong # of arguments";
-  if ( argc <= maxargs ) msg = "Wrong arguments";
-  rb_raise(rb_eArgError,"%s for overloaded method '%s'.\n"  
-	   "Possible C/C++ prototypes are:\n%s",
-	   msg, method, prototypes);
-}
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyfragments.swg b/dependencies2013/win32/swig/Lib/ruby/rubyfragments.swg
deleted file mode 100644
index 3c3b6581..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyfragments.swg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-  Create a file with this name, 'rubyfragments.swg', in your working
-  directory and add all the %fragments you want to take precedence
-  over the ones defined by default by swig.
-
-  For example, if you add:
-  
-  %fragment(SWIG_AsVal_frag(int),"header") {
-   SWIGINTERNINLINE int
-   SWIG_AsVal(int)(VALUE obj, int *val)
-   { 
-     <your code here>;
-   }
-  }
-  
-  this will replace the code used to retrieve an integer value for all
-  the typemaps that need it, including:
-  
-    int, std::vector<int>, std::list<std::pair<int,int> >, etc.
-
-    
-*/
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyhead.swg b/dependencies2013/win32/swig/Lib/ruby/rubyhead.swg
deleted file mode 100644
index 9960087c..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyhead.swg
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <ruby.h>
-
-/* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
- * breaks using rb_intern as an lvalue, as SWIG does.  We work around this
- * issue for now by disabling this.
- * https://sourceforge.net/tracker/?func=detail&aid=2859614&group_id=1645&atid=101645
- */
-#ifdef rb_intern
-# undef rb_intern
-#endif
-
-/* Remove global macros defined in Ruby's win32.h */
-#ifdef write
-# undef write
-#endif
-#ifdef read
-# undef read
-#endif
-#ifdef bind
-# undef bind
-#endif
-#ifdef close
-# undef close
-#endif
-#ifdef connect
-# undef connect
-#endif
-
-
-/* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
-#ifndef NUM2LL
-#define NUM2LL(x) NUM2LONG((x))
-#endif
-#ifndef LL2NUM
-#define LL2NUM(x) INT2NUM((long) (x))
-#endif
-#ifndef ULL2NUM
-#define ULL2NUM(x) UINT2NUM((unsigned long) (x))
-#endif
-
-/* Ruby 1.7 doesn't (yet) define NUM2ULL() */
-#ifndef NUM2ULL
-#ifdef HAVE_LONG_LONG
-#define NUM2ULL(x) rb_num2ull((x))
-#else
-#define NUM2ULL(x) NUM2ULONG(x)
-#endif
-#endif
-
-/* RSTRING_LEN, etc are new in Ruby 1.9, but ->ptr and ->len no longer work */
-/* Define these for older versions so we can just write code the new way */
-#ifndef RSTRING_LEN
-# define RSTRING_LEN(x) RSTRING(x)->len
-#endif
-#ifndef RSTRING_PTR
-# define RSTRING_PTR(x) RSTRING(x)->ptr
-#endif
-#ifndef RSTRING_END
-# define RSTRING_END(x) (RSTRING_PTR(x) + RSTRING_LEN(x))
-#endif
-#ifndef RARRAY_LEN
-# define RARRAY_LEN(x) RARRAY(x)->len
-#endif
-#ifndef RARRAY_PTR
-# define RARRAY_PTR(x) RARRAY(x)->ptr
-#endif
-#ifndef RFLOAT_VALUE
-# define RFLOAT_VALUE(x) RFLOAT(x)->value
-#endif
-#ifndef DOUBLE2NUM
-# define DOUBLE2NUM(x) rb_float_new(x)
-#endif
-#ifndef RHASH_TBL
-# define RHASH_TBL(x) (RHASH(x)->tbl)
-#endif
-#ifndef RHASH_ITER_LEV
-# define RHASH_ITER_LEV(x) (RHASH(x)->iter_lev)
-#endif
-#ifndef RHASH_IFNONE
-# define RHASH_IFNONE(x) (RHASH(x)->ifnone)
-#endif
-#ifndef RHASH_SIZE
-# define RHASH_SIZE(x) (RHASH(x)->tbl->num_entries)
-#endif
-#ifndef RHASH_EMPTY_P
-# define RHASH_EMPTY_P(x) (RHASH_SIZE(x) == 0)
-#endif
-#ifndef RSTRUCT_LEN
-# define RSTRUCT_LEN(x) RSTRUCT(x)->len
-#endif
-#ifndef RSTRUCT_PTR
-# define RSTRUCT_PTR(x) RSTRUCT(x)->ptr
-#endif
-
-
-
-/*
- * Need to be very careful about how these macros are defined, especially
- * when compiling C++ code or C code with an ANSI C compiler.
- *
- * VALUEFUNC(f) is a macro used to typecast a C function that implements
- * a Ruby method so that it can be passed as an argument to API functions
- * like rb_define_method() and rb_define_singleton_method().
- *
- * VOIDFUNC(f) is a macro used to typecast a C function that implements
- * either the "mark" or "free" stuff for a Ruby Data object, so that it
- * can be passed as an argument to API functions like Data_Wrap_Struct()
- * and Data_Make_Struct().
- */
- 
-#ifdef __cplusplus
-#  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
-#    define PROTECTFUNC(f) ((VALUE (*)()) f)
-#    define VALUEFUNC(f) ((VALUE (*)()) f)
-#    define VOIDFUNC(f)  ((void (*)()) f)
-#  else
-#    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
-#      define PROTECTFUNC(f) ((VALUE (*)()) f)
-#      define VALUEFUNC(f) ((VALUE (*)()) f)
-#      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7+ */
-#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
-#      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
-#      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    endif
-#  endif
-#else
-#  define VALUEFUNC(f) (f)
-#  define VOIDFUNC(f) (f)
-#endif
-
-/* Don't use for expressions have side effect */
-#ifndef RB_STRING_VALUE
-#define RB_STRING_VALUE(s) (TYPE(s) == T_STRING ? (s) : (*(volatile VALUE *)&(s) = rb_str_to_str(s)))
-#endif
-#ifndef StringValue
-#define StringValue(s) RB_STRING_VALUE(s)
-#endif
-#ifndef StringValuePtr
-#define StringValuePtr(s) RSTRING_PTR(RB_STRING_VALUE(s))
-#endif
-#ifndef StringValueLen
-#define StringValueLen(s) RSTRING_LEN(RB_STRING_VALUE(s))
-#endif
-#ifndef SafeStringValue
-#define SafeStringValue(v) do {\
-    StringValue(v);\
-    rb_check_safe_str(v);\
-} while (0)
-#endif
-
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-#define rb_define_alloc_func(klass, func) rb_define_singleton_method((klass), "new", VALUEFUNC((func)), -1)
-#define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new")
-#endif
-
-static VALUE _mSWIG = Qnil;
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyinit.swg b/dependencies2013/win32/swig/Lib/ruby/rubyinit.swg
deleted file mode 100644
index fc6e039b..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyinit.swg
+++ /dev/null
@@ -1 +0,0 @@
-%insert(initbeforefunc) "swiginit.swg"
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyiterators.swg b/dependencies2013/win32/swig/Lib/ruby/rubyiterators.swg
deleted file mode 100644
index 88f1e7c8..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyiterators.swg
+++ /dev/null
@@ -1,932 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubyiterators.swg
- *
- * Implement a C++ 'output' iterator for Ruby.
- *
- * Users can derive form the Iterator to implemet their
- * own iterators. As an example (real one since we use it for STL/STD
- * containers), the template Iterator_T does the
- * implementation for generic C++ iterators.
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-
-%fragment("ConstIterator","header",fragment="<stddef.h>",fragment="GC_VALUE_definition") {
-namespace swig {
-  struct stop_iteration {
-  };
-
-  /** 
-   * Abstract base class used to represent all iterators of STL containers.
-   */
-  struct ConstIterator {
-  public:
-    typedef ConstIterator self_type;
-
-  protected:
-    GC_VALUE _seq;
-
-  protected:
-    ConstIterator(VALUE seq) : _seq(seq)
-    {
-    }
-
-    // Random access iterator methods, but not required in Ruby
-    virtual ptrdiff_t distance(const ConstIterator &x) const
-    {
-      throw std::invalid_argument("distance not supported");
-    }
-
-    virtual bool equal (const ConstIterator &x) const
-    {
-      throw std::invalid_argument("equal not supported");
-    }
-
-    virtual self_type* advance(ptrdiff_t n)
-    {
-      throw std::invalid_argument("advance not supported");
-    }
-      
-  public:
-    virtual ~ConstIterator() {}
-
-    // Access iterator method, required by Ruby
-    virtual VALUE value() const {
-      throw std::invalid_argument("value not supported");
-      return Qnil;
-    };
-
-    virtual VALUE setValue( const VALUE& v ) {
-      throw std::invalid_argument("value= not supported");
-      return Qnil;
-    }
-
-    virtual self_type* next( size_t n = 1 )
-    {
-      return this->advance( n );
-    }
-
-    virtual self_type* previous( size_t n = 1 )
-    {
-      ptrdiff_t nn = n;
-      return this->advance( -nn );
-    }
-
-    virtual VALUE to_s() const {
-      throw std::invalid_argument("to_s not supported");
-      return Qnil;
-    }
-
-    virtual VALUE inspect() const {
-      throw std::invalid_argument("inspect not supported");
-      return Qnil;
-    }
-    
-    virtual ConstIterator *dup() const
-    {
-      throw std::invalid_argument("dup not supported");
-      return NULL;
-    }
-
-    //
-    // C++ common/needed methods.  We emulate a bidirectional
-    // operator, to be compatible with all the STL.
-    // The iterator traits will then tell the STL what type of
-    // iterator we really are.
-    //
-    ConstIterator() : _seq( Qnil )
-    {
-    }
-
-    ConstIterator( const self_type& b ) : _seq( b._seq )
-    {
-    }
-
-    self_type& operator=( const self_type& b )
-    {
-      _seq = b._seq;
-      return *this;
-    }
-
-    bool operator == (const ConstIterator& x)  const
-    {
-      return equal(x);
-    }
-      
-    bool operator != (const ConstIterator& x) const
-    {
-      return ! operator==(x);
-    }
-      
-    // Pre-decrement operator
-    self_type& operator--()
-    {
-      return *previous();
-    }
-
-    // Pre-increment operator
-    self_type& operator++()
-    {
-      return *next();
-    }
-
-    // Post-decrement operator
-    self_type operator--(int)
-    {
-      self_type r = *this;
-      previous();
-      return r;
-    }
-
-    // Post-increment operator
-    self_type operator++(int)
-    {
-      self_type r = *this;
-      next();
-      return r;
-    }
-
-    ConstIterator& operator += (ptrdiff_t n)
-    {
-      return *advance(n);
-    }
-
-    ConstIterator& operator -= (ptrdiff_t n)
-    {
-      return *advance(-n);
-    }
-
-    ConstIterator* operator + (ptrdiff_t n) const
-    {
-      return dup()->advance(n);
-    }
-
-    ConstIterator* operator - (ptrdiff_t n) const
-    {
-      return dup()->advance(-n);
-    }
-      
-    ptrdiff_t operator - (const ConstIterator& x) const
-    {
-      return x.distance(*this);
-    }
-      
-    static swig_type_info* descriptor() {
-      static int init = 0;
-      static swig_type_info* desc = 0;
-      if (!init) {
-	desc = SWIG_TypeQuery("swig::ConstIterator *");
-	init = 1;
-      }	
-      return desc;
-    }
-  };
-
-
-  /**
-   * Abstract base class used to represent all non-const iterators of STL containers.
-   * 
-   */
-  struct Iterator : public ConstIterator {
-  public:
-    typedef Iterator self_type;
-
-  protected:
-    Iterator(VALUE seq) : ConstIterator(seq)
-    {
-    }
-
-    virtual self_type* advance(ptrdiff_t n)
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-
-  public:
-    static swig_type_info* descriptor() {
-      static int init = 0;
-      static swig_type_info* desc = 0;
-      if (!init) {
-	desc = SWIG_TypeQuery("swig::Iterator *");
-	init = 1;
-      }	
-      return desc;
-    }
-    
-    virtual Iterator *dup() const
-    {
-      throw std::invalid_argument("dup not supported");
-      return NULL;
-    }
-      
-    virtual self_type* next( size_t n = 1 )
-    {
-      return this->advance( n );
-    }
-
-    virtual self_type* previous( size_t n = 1 )
-    {
-      ptrdiff_t nn = n;
-      return this->advance( -nn );
-    }
-
-    bool operator == (const ConstIterator& x)  const
-    {
-      return equal(x);
-    }
-      
-    bool operator != (const Iterator& x) const
-    {
-      return ! operator==(x);
-    }
-      
-    Iterator& operator += (ptrdiff_t n)
-    {
-      return *advance(n);
-    }
-
-    Iterator& operator -= (ptrdiff_t n)
-    {
-      return *advance(-n);
-    }
-      
-    Iterator* operator + (ptrdiff_t n) const
-    {
-      return dup()->advance(n);
-    }
-
-    Iterator* operator - (ptrdiff_t n) const
-    {
-      return dup()->advance(-n);
-    }
-      
-    ptrdiff_t operator - (const Iterator& x) const
-    {
-      return x.distance(*this);
-    }
-  };
-
-}
-}
-
-
-%fragment("ConstIterator_T","header",fragment="<stddef.h>",fragment="ConstIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
-namespace swig {
-
-  /** 
-   * Templated base classes for all custom const_iterators.
-   *
-   */
-  template<typename OutConstIterator>
-  class ConstIterator_T :  public ConstIterator
-  {
-  public:
-    typedef OutConstIterator const_iter;
-    typedef typename std::iterator_traits<const_iter>::value_type value_type;    
-    typedef ConstIterator_T<const_iter> self_type;
-
-  protected:
-
-    
-    virtual bool equal (const ConstIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return (current == iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-    
-    virtual ptrdiff_t distance(const ConstIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return std::distance(current, iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-
-    virtual ConstIterator* advance(ptrdiff_t n)
-    {
-      std::advance( current, n );
-      return this;
-    }
-
-  public:
-    ConstIterator_T() : ConstIterator(Qnil)
-    {
-    }
-
-    ConstIterator_T(const_iter curr, VALUE seq = Qnil)
-      : ConstIterator(seq), current(curr)
-    {
-    }
-
-    const const_iter& get_current() const
-    {
-      return current;
-    }
-
-    const value_type& operator*() const
-    {
-      return *current;
-    }
-
-    virtual VALUE inspect() const
-    {
-      VALUE ret = rb_str_new2("#<");
-      ret = rb_str_cat2( ret, rb_obj_classname(_seq) );
-      ret = rb_str_cat2( ret, "::const_iterator " );
-      VALUE cur = value();
-      ret = rb_str_concat( ret, rb_inspect(cur) );
-      ret = rb_str_cat2( ret, ">" );
-      return ret;
-    }
-
-    virtual VALUE to_s()    const
-    {
-      VALUE ret = rb_str_new2( rb_obj_classname(_seq) );
-      ret = rb_str_cat2( ret, "::const_iterator " );
-      VALUE cur = value();
-      ret = rb_str_concat( ret, rb_obj_as_string(cur) );
-      return ret;
-    }
-
-  protected:
-    const_iter current;
-  };
-
-
-  /** 
-   * Templated base classes for all custom non-const iterators.
-   *
-   */
-  template<typename InOutIterator>
-  class Iterator_T :  public Iterator
-  {
-  public:
-    typedef InOutIterator nonconst_iter;
-
-    // Make this class iterator STL compatible, by using iterator_traits
-    typedef typename std::iterator_traits<nonconst_iter >::iterator_category iterator_category;
-    typedef typename std::iterator_traits<nonconst_iter >::value_type        value_type;
-    typedef typename std::iterator_traits<nonconst_iter >::difference_type   difference_type;
-    typedef typename std::iterator_traits<nonconst_iter >::pointer           pointer;
-    typedef typename std::iterator_traits<nonconst_iter >::reference         reference;
-
-    typedef Iterator                         base;
-    typedef Iterator_T< nonconst_iter > self_type;
-
-  protected:
-
-    virtual bool equal (const ConstIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return (current == iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-    
-    virtual ptrdiff_t distance(const ConstIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return std::distance(current, iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-
-    virtual Iterator* advance(ptrdiff_t n)
-    {
-      std::advance( current, n );
-      return this;
-    }
-
-  public:
-
-    Iterator_T(nonconst_iter curr, VALUE seq = Qnil)
-      : Iterator(seq), current(curr)
-    {
-    }
-
-    const nonconst_iter& get_current() const
-    {
-      return current;
-    }
-
-    self_type& operator=( const self_type& b )
-    {
-      base::operator=( b );
-      return *this;
-    }
-    
-    self_type& operator=( const value_type& b )
-    {
-      *current = b;
-      return *this;
-    }
-
-    const value_type& operator*() const
-    {
-      return *current;
-    }
-
-    value_type& operator*()
-    {
-      return *current;
-    }
-    
-    virtual VALUE inspect() const
-    {
-      VALUE ret = rb_str_new2("#<");
-      ret = rb_str_cat2( ret, rb_obj_classname(_seq) );
-      ret = rb_str_cat2( ret, "::iterator " );
-      VALUE cur = value();
-      ret = rb_str_concat( ret, rb_inspect(cur) );
-      ret = rb_str_cat2( ret, ">" );
-      return ret;
-    }
-
-    virtual VALUE to_s()    const
-    {
-      VALUE ret = rb_str_new2( rb_obj_classname(_seq) );
-      ret = rb_str_cat2( ret, "::iterator " );
-      VALUE cur = value();
-      ret = rb_str_concat( ret, rb_obj_as_string(cur) );
-      return ret;
-    }
-
-  protected:
-    nonconst_iter current;
-  };
-
-
-  /**
-   * Auxiliary functor to store the value of a ruby object inside
-   * a reference of a compatible C++ type.  ie: Ruby -> C++
-   * 
-   */
-  template <class ValueType>
-  struct asval_oper 
-  {
-    typedef ValueType    value_type;
-    typedef bool        result_type;
-    bool operator()(VALUE obj, value_type& v) const
-    {
-      return ( swig::asval< value_type >(obj, &v) == SWIG_OK );
-    }
-  };
-
-  /**
-   * Auxiliary functor to return a ruby object from a C++ type. 
-   * ie: C++ -> Ruby
-   * 
-   */
-  template <class ValueType>
-  struct from_oper 
-  {
-    typedef const ValueType& argument_type;
-    typedef VALUE result_type;
-    result_type operator()(argument_type v) const
-    {
-      return swig::from(v);
-    }
-  };
-
-
-  /** 
-   * ConstIterator class for a const_iterator with no end() boundaries.
-   *
-   */
-  template<typename OutConstIterator, 
-	   typename ValueType = typename std::iterator_traits<OutConstIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class ConstIteratorOpen_T :  public ConstIterator_T<OutConstIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutConstIterator const_iter;
-    typedef ValueType value_type;
-    typedef ConstIterator_T<const_iter>  base;
-    typedef ConstIteratorOpen_T<OutConstIterator, ValueType, FromOper> self_type;
-    
-    ConstIteratorOpen_T(const_iter curr, VALUE seq = Qnil)
-      : ConstIterator_T<OutConstIterator>(curr, seq)
-    {
-    }
-    
-    virtual VALUE value() const {
-      return from(static_cast<const value_type&>(*(base::current)));
-    }
-    
-    ConstIterator *dup() const
-    {
-      return new self_type(*this);
-    }
-  };
-
-  /** 
-   * Iterator class for an iterator with no end() boundaries.
-   *
-   */
-  template<typename InOutIterator, 
-	   typename ValueType = typename std::iterator_traits<InOutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType>,
-	   typename AsvalOper = asval_oper<ValueType> >
-  class IteratorOpen_T :  public Iterator_T<InOutIterator>
-  {
-  public:
-    FromOper  from;
-    AsvalOper asval;
-    typedef InOutIterator nonconst_iter;
-    typedef ValueType value_type;
-    typedef Iterator_T<nonconst_iter>  base;
-    typedef IteratorOpen_T<InOutIterator, ValueType, FromOper, AsvalOper> self_type;
-
-  public:
-    IteratorOpen_T(nonconst_iter curr, VALUE seq = Qnil)
-      : Iterator_T<InOutIterator>(curr, seq)
-    {
-    }
-    
-    virtual VALUE value() const {
-      return from(static_cast<const value_type&>(*(base::current)));
-    }
-
-    virtual VALUE setValue( const VALUE& v )
-    {
-      value_type& dst = *base::current;
-      if ( asval(v, dst) ) return v;
-      return Qnil;
-    }
-    
-    Iterator *dup() const
-    {
-      return new self_type(*this);
-    }
-  };
-
-  /** 
-   * ConstIterator class for a const_iterator where begin() and end() boundaries are known.
-   *
-   */
-  template<typename OutConstIterator, 
-	   typename ValueType = typename std::iterator_traits<OutConstIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class ConstIteratorClosed_T :  public ConstIterator_T<OutConstIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutConstIterator const_iter;
-    typedef ValueType value_type;
-    typedef ConstIterator_T<const_iter>  base;    
-    typedef ConstIteratorClosed_T<OutConstIterator, ValueType, FromOper> self_type;
-    
-  protected:
-    virtual ConstIterator* advance(ptrdiff_t n)
-    {
-      std::advance( base::current, n );
-      if ( base::current == end )
-	throw stop_iteration();
-      return this;
-    }
-
-  public:
-    ConstIteratorClosed_T(const_iter curr, const_iter first, 
-			  const_iter last, VALUE seq = Qnil)
-      : ConstIterator_T<OutConstIterator>(curr, seq), begin(first), end(last)
-    {
-    }
-    
-    virtual VALUE value() const {
-      if (base::current == end) {
-	throw stop_iteration();
-      } else {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-    }
-    
-    ConstIterator *dup() const
-    {
-      return new self_type(*this);
-    }
-
-
-  private:
-    const_iter begin;
-    const_iter end;
-  };
-
-  /** 
-   * Iterator class for a iterator where begin() and end() boundaries are known.
-   *
-   */
-  template<typename InOutIterator, 
-	   typename ValueType = typename std::iterator_traits<InOutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType>,
-	   typename AsvalOper = asval_oper<ValueType> >
-  class IteratorClosed_T :  public Iterator_T<InOutIterator>
-  {
-  public:
-    FromOper   from;
-    AsvalOper asval;
-    typedef InOutIterator nonconst_iter;
-    typedef ValueType value_type;
-    typedef Iterator_T<nonconst_iter>  base;
-    typedef IteratorClosed_T<InOutIterator, ValueType, FromOper, AsvalOper> self_type;
-    
-  protected:
-    virtual Iterator* advance(ptrdiff_t n)
-    {
-      std::advance( base::current, n );
-      if ( base::current == end )
-	throw stop_iteration();
-      return this;
-    }
-
-  public:
-    IteratorClosed_T(nonconst_iter curr, nonconst_iter first, 
-		     nonconst_iter last, VALUE seq = Qnil)
-      : Iterator_T<InOutIterator>(curr, seq), begin(first), end(last)
-    {
-    }
-    
-    virtual VALUE value() const {
-      if (base::current == end) {
-	throw stop_iteration();
-      } else {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-    }
-    
-    // Iterator setter method, required by Ruby
-    virtual VALUE setValue( const VALUE& v )
-    {
-      if (base::current == end)
-	throw stop_iteration();
-
-      value_type& dst = *base::current;
-      if ( asval( v, dst ) ) return v;
-      return Qnil;
-    }
-    
-    Iterator *dup() const
-    {
-      return new self_type(*this);
-    }
-
-  private:
-    nonconst_iter begin;
-    nonconst_iter end;
-  };
-
-  /* Partial specialization for bools which don't allow de-referencing */
-  template< typename InOutIterator, typename FromOper, typename AsvalOper >
-  class IteratorOpen_T< InOutIterator, bool, FromOper, AsvalOper > : 
-    public Iterator_T<InOutIterator>
-  {
-  public:
-    FromOper   from;
-    AsvalOper asval;
-    typedef InOutIterator nonconst_iter;
-    typedef bool value_type;
-    typedef Iterator_T<nonconst_iter>  base;
-    typedef IteratorOpen_T<InOutIterator, bool, FromOper, AsvalOper> self_type;
-
-    IteratorOpen_T(nonconst_iter curr, VALUE seq = Qnil)
-      : Iterator_T<InOutIterator>(curr, seq)
-    {
-    }
-
-    virtual VALUE value() const {
-      return from(static_cast<const value_type&>(*(base::current)));
-    }
-    
-    virtual VALUE setValue( const VALUE& v )
-    {
-      bool tmp = *base::current;
-      if ( asval( v, tmp ) )
-	{
-	  *base::current = tmp;
-	  return v;
-	}
-      return Qnil;
-    }    
-    
-    Iterator *dup() const
-    {
-      return new self_type(*this);
-    }
-    
-  };
-
-  /* Partial specialization for bools which don't allow de-referencing */
-  template< typename InOutIterator, typename FromOper, typename AsvalOper >
-  class IteratorClosed_T< InOutIterator, bool, FromOper, AsvalOper > : 
-    public Iterator_T<InOutIterator>
-  {
-  public:
-    FromOper   from;
-    AsvalOper asval;
-    typedef InOutIterator nonconst_iter;
-    typedef bool value_type;
-    typedef Iterator_T<nonconst_iter>  base;
-    typedef IteratorClosed_T<InOutIterator, bool, FromOper, AsvalOper> self_type;
-    
-  protected:
-    virtual Iterator* advance(ptrdiff_t n)
-    {
-      std::advance( base::current, n );
-      if ( base::current == end )
-	throw stop_iteration();
-      return this;
-    }
-
-  public:
-    IteratorClosed_T(nonconst_iter curr, nonconst_iter first, 
-		     nonconst_iter last, VALUE seq = Qnil)
-      : Iterator_T<InOutIterator>(curr, seq), begin(first), end(last)
-    {
-    }
-
-    virtual VALUE value() const {
-      if (base::current == end) {
-	throw stop_iteration();
-      } else {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-    }
-
-    virtual VALUE setValue( const VALUE& v )
-    {
-      if (base::current == end)
-	throw stop_iteration();
-
-      bool tmp = *base::current;
-      if ( asval( v, tmp ) )
-	{
-	  *base::current = tmp;
-	  return v;
-	}
-      return Qnil;
-    }
-    
-    Iterator *dup() const
-    {
-      return new self_type(*this);
-    }
-
-  private:
-    nonconst_iter begin;
-    nonconst_iter end;
-  };
-
-
-  /** 
-   * Helper function used to wrap a bounded const_iterator.  This is to be used in
-   * a %typemap(out), for example.
-   *
-   */
-  template<typename InOutIter>
-  inline Iterator*
-  make_nonconst_iterator(const InOutIter& current, const InOutIter& begin,
-			 const InOutIter& end, VALUE seq = Qnil)
-  {
-    return new IteratorClosed_T<InOutIter>(current, begin, end, seq);
-  }
-
-  /** 
-   * Helper function used to wrap an unbounded const_iterator.  This is to be used in
-   * a %typemap(out), for example.
-   *
-   */
-  template<typename InOutIter>
-  inline Iterator*
-  make_nonconst_iterator(const InOutIter& current, VALUE seq = Qnil)
-  {
-    return new IteratorOpen_T<InOutIter>(current, seq);
-  }
-
-  /** 
-   * Helper function used to wrap a bounded const_iterator.  This is to be used in
-   * a %typemap(out), for example.
-   *
-   */
-  template<typename OutIter>
-  inline ConstIterator*
-  make_const_iterator(const OutIter& current, const OutIter& begin,
-                       const OutIter& end, VALUE seq = Qnil)
-  {
-    return new ConstIteratorClosed_T<OutIter>(current, begin, end, seq);
-  }
-
-  /** 
-   * Helper function used to wrap an unbounded const_iterator.  This is to be used in
-   * a %typemap(out), for example.
-   *
-   */
-  template<typename OutIter>
-  inline ConstIterator*
-  make_const_iterator(const OutIter& current, VALUE seq = Qnil)
-  {
-    return new ConstIteratorOpen_T<OutIter>(current, seq);
-  }
-}
-}
-
-
-%fragment("ConstIterator");
-
-
-//
-// This part is just so SWIG is aware of the base abstract iterator class.
-//
-namespace swig 
-{
-  /*
-    Throw a StopIteration exception
-  */
-  %ignore stop_iteration;
-  struct stop_iteration {};
-  
-  %typemap(throws) stop_iteration {
-    (void)$1;
-    SWIG_Ruby_ExceptionType(NULL, Qnil);
-    SWIG_fail;
-  }
-
-  /* 
-     Mark methods that return new objects
-  */
-  %newobject ConstIterator::dup;
-  %newobject ConstIterator::operator + (ptrdiff_t n) const;
-  %newobject ConstIterator::operator - (ptrdiff_t n) const;
-
-  %nodirector ConstIterator;
-
-  %catches(swig::stop_iteration)  ConstIterator::value() const;
-  %catches(swig::stop_iteration)  ConstIterator::incr(size_t n = 1);
-  %catches(swig::stop_iteration)  ConstIterator::decr(size_t n = 1);
-  %catches(std::invalid_argument) ConstIterator::distance(const ConstIterator &x) const;
-  %catches(std::invalid_argument) ConstIterator::equal (const ConstIterator &x) const;
-  %catches(swig::stop_iteration)  ConstIterator::next();
-  %catches(swig::stop_iteration)  ConstIterator::previous();
-  %catches(swig::stop_iteration)  ConstIterator::advance(ptrdiff_t n);
-  %catches(swig::stop_iteration)  ConstIterator::operator += (ptrdiff_t n);
-  %catches(swig::stop_iteration)  ConstIterator::operator -= (ptrdiff_t n);
-  %catches(swig::stop_iteration)  ConstIterator::operator + (ptrdiff_t n) const;
-  %catches(swig::stop_iteration)  ConstIterator::operator - (ptrdiff_t n) const;
-
-
-  struct ConstIterator
-  {
-  protected:
-    ConstIterator(VALUE seq);
-
-  public:
-    virtual ~ConstIterator();
-
-    // Access iterator method, required by Ruby
-    virtual VALUE value() const;
-    
-    // C++ common/needed methods
-    virtual ConstIterator *dup() const;
-
-    virtual VALUE inspect()    const;
-    virtual VALUE to_s()    const;
-
-    virtual ConstIterator* next(size_t n = 1);
-    virtual ConstIterator* previous(size_t n = 1);
-
-    bool operator == (const ConstIterator& x)  const;
-    ConstIterator* operator + (ptrdiff_t n) const;
-    ConstIterator* operator - (ptrdiff_t n) const;
-    ptrdiff_t operator - (const ConstIterator& x) const;
-  };
-
-  struct Iterator : public ConstIterator
-  {
-    %rename("value=") setValue( const VALUE& v );
-    virtual VALUE setValue( const VALUE& v );
-
-    virtual Iterator *dup() const;
-
-    virtual Iterator* next(size_t n = 1);
-    virtual Iterator* previous(size_t n = 1);
-
-    virtual VALUE inspect()    const;
-    virtual VALUE to_s()    const;
-
-    bool operator == (const Iterator& x)  const;
-    Iterator* operator + (ptrdiff_t n) const;
-    Iterator* operator - (ptrdiff_t n) const;
-    ptrdiff_t operator - (const Iterator& x) const;
-  };
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubykw.swg b/dependencies2013/win32/swig/Lib/ruby/rubykw.swg
deleted file mode 100644
index 194687b9..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubykw.swg
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef RUBY_RUBYKW_SWG_
-#define RUBY_RUBYKW_SWG_
-
-/* Warnings for Ruby keywords */
-#define RUBYKW(x) %keywordwarn("'" `x` "' is a ruby keyword, renaming to 'C_" `x` "'",rename="C_%s",fullname=1)  `x`
-
-/*
-
-   from http://www.rubycentral.com/book/language.html
-
-*/
-
-RUBYKW(BEGIN);
-RUBYKW(END);
-RUBYKW(alias);
-RUBYKW(and);
-RUBYKW(begin);
-RUBYKW(break);
-RUBYKW(case);
-RUBYKW(class);
-RUBYKW(def);
-RUBYKW("defined");
-RUBYKW(do);
-RUBYKW(else);
-RUBYKW(elsif);
-RUBYKW(end);
-RUBYKW(ensure);
-RUBYKW(false);
-RUBYKW(fatal);
-RUBYKW(for);
-RUBYKW(if);
-RUBYKW(in);
-RUBYKW(module);
-RUBYKW(next);
-RUBYKW(nil);
-RUBYKW(not);
-RUBYKW(or);
-RUBYKW(redo);
-RUBYKW(rescue);
-RUBYKW(retry);
-RUBYKW(return);
-RUBYKW(self);
-RUBYKW(super);
-RUBYKW(then);
-RUBYKW(true);
-RUBYKW(undef);
-RUBYKW(unless);
-RUBYKW(until);
-RUBYKW(when);
-RUBYKW(while);
-RUBYKW(yield);
-
-// RUBYKW(FalseClass);
-// RUBYKW(TrueClass);
-// RUBYKW(Numeric);
-// RUBYKW(Integer);
-// RUBYKW(Fixnum);
-// RUBYKW(Float);
-// RUBYKW(Range);
-// RUBYKW(Array);
-// RUBYKW(String);
-// RUBYKW(IO);
-// RUBYKW(File);
-// RUBYKW(FileUtils);
-// RUBYKW(Find);
-// RUBYKW(Struct);
-// RUBYKW(OpenStruct);
-// RUBYKW(Regexp);
-
-#undef RUBYKW
-
-#endif //RUBY_RUBYKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubymacros.swg b/dependencies2013/win32/swig/Lib/ruby/rubymacros.swg
deleted file mode 100644
index de2a52ba..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubymacros.swg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-// Redefine these macros so argument index for ruby is done properly,
-// ignoring self and we get some more info about the input.
-#define %argfail_fmt(_type,_name,_argn) Ruby_Format_TypeError( "", _type, #_name, _argn, $input )
-
-#define %argnullref_fmt(_type,_name,_argn) Ruby_Format_TypeError(%nullref_fmt(), _type, #_name, _argn, $input)
-
-%{
-#define SWIG_RUBY_THREAD_BEGIN_BLOCK
-#define SWIG_RUBY_THREAD_END_BLOCK
-%}
-
-%include <typemaps/swigmacros.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyopers.swg b/dependencies2013/win32/swig/Lib/ruby/rubyopers.swg
deleted file mode 100644
index d1ac8bf0..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyopers.swg
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ------------------------------------------------------------
- * Overloaded operator support
- * ------------------------------------------------------------ */
-
-#ifdef __cplusplus
-
-%rename(__add__)      *::operator+;
-%rename(__pos__)      *::operator+();
-%rename(__pos__)      *::operator+() const;
-%rename(__sub__)      *::operator-;
-%rename(__neg__)      *::operator-();
-%rename(__neg__)      *::operator-() const;
-%rename(__mul__)      *::operator*;
-%rename(__div__)      *::operator/;
-%rename(__mod__)      *::operator%;
-%rename(__lshift__)   *::operator<<;
-%rename(__rshift__)   *::operator>>;
-%rename(__and__)      *::operator&;
-%rename(__or__)       *::operator|;
-%rename(__xor__)      *::operator^;
-%rename(__invert__)   *::operator~;
-%rename(__lt__)       *::operator<;
-%rename(__le__)       *::operator<=;
-%rename(__gt__)       *::operator>;
-%rename(__ge__)       *::operator>=;
-%rename(__eq__)       *::operator==;
-
-/* Special cases */
-%rename(__call__)     *::operator();
-
-/* Ignored inplace operators */
-%ignoreoperator(NOTEQUAL)   operator!=;  
-%ignoreoperator(PLUSEQ)     operator+=;  
-%ignoreoperator(MINUSEQ)    operator-=;  
-%ignoreoperator(MULEQ)      operator*=;  
-%ignoreoperator(DIVEQ)      operator/=;  
-%ignoreoperator(MODEQ)      operator%=;  
-%ignoreoperator(LSHIFTEQ)   operator<<=; 
-%ignoreoperator(RSHIFTEQ)   operator>>=; 
-%ignoreoperator(ANDEQ)      operator&=;  
-%ignoreoperator(OREQ)       operator|=;  
-%ignoreoperator(XOREQ)      operator^=;  
-
-/* Ignored operators */
-%ignoreoperator(LNOT)       operator!;
-%ignoreoperator(LAND)       operator&&;
-%ignoreoperator(LOR)        operator||;
-%ignoreoperator(EQ)         operator=;
-%ignoreoperator(PLUSPLUS)   operator++;
-%ignoreoperator(MINUSMINUS) operator--;
-%ignoreoperator(ARROWSTAR)  operator->*;
-%ignoreoperator(INDEX)      operator[];
-
-
-#endif /* __cplusplus */
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyprimtypes.swg b/dependencies2013/win32/swig/Lib/ruby/rubyprimtypes.swg
deleted file mode 100644
index 3a848191..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyprimtypes.swg
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubyprimtypes.swg
- * ----------------------------------------------------------------------------- */
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-/* auxiliary ruby fail method */
-
-%fragment("SWIG_ruby_failed","header")
-{
-SWIGINTERN VALUE
-SWIG_ruby_failed(void)
-{
-  return Qnil;
-} 
-}
-
-%define %ruby_aux_method(Type, Method, Action)
-SWIGINTERN VALUE SWIG_AUX_##Method##(VALUE *args)
-{
-  VALUE obj = args[0];
-  VALUE type = TYPE(obj);
-  Type *res = (Type *)(args[1]);
-  *res = Action;
-  return obj;
-}
-%enddef
-
-
-/* boolean */
-
-%fragment(SWIG_From_frag(bool),"header") {
-SWIGINTERNINLINE VALUE
-SWIG_From_dec(bool)(bool value)
-{
-  return value ? Qtrue : Qfalse;
-}
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header",
-	  fragment=SWIG_AsVal_frag(int)) {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(VALUE obj, bool *val)
-{
-  if (obj == Qtrue) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == Qfalse) {
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    int res = 0;
-    if (SWIG_AsVal(int)(obj, &res) == SWIG_OK) {    
-      if (val) *val = res ? true : false;
-      return SWIG_OK;
-    }
-  }  
-  return SWIG_TypeError;
-}
-}
-
-/* long */
-
-%fragment(SWIG_From_frag(long),"header",
-	  fragment="<limits.h>") {
-  %define_as(SWIG_From_dec(long),           LONG2NUM)
-}
-
-%fragment(SWIG_AsVal_frag(long),"header",fragment="SWIG_ruby_failed") {
-%ruby_aux_method(long, NUM2LONG, type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj))
-
-SWIGINTERN int
-SWIG_AsVal_dec(long)(VALUE obj, long* val)
-{
-  VALUE type = TYPE(obj);
-  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* unsigned long */
-
-%fragment(SWIG_From_frag(unsigned long),"header",
-	  fragment=SWIG_From_frag(long)) {
-SWIGINTERNINLINE VALUE
-SWIG_From_dec(unsigned long)(unsigned long value)
-{
-  return ULONG2NUM(value); 
-}
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header",fragment="SWIG_ruby_failed") {
-%ruby_aux_method(unsigned long, NUM2ULONG, type == T_FIXNUM ? NUM2ULONG(obj) : rb_big2ulong(obj))
-
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long)(VALUE obj, unsigned long *val) 
-{
-  VALUE type = TYPE(obj);
-  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    unsigned long v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* long long */
-
-%fragment(SWIG_From_frag(long long),"header",
-	  fragment=SWIG_From_frag(long),
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE VALUE 
-SWIG_From_dec(long long)(long long value)
-{
-  return LL2NUM(value);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-	  fragment="SWIG_ruby_failed",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-%ruby_aux_method(long long, NUM2LL, type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj))
-
-SWIGINTERN int
-SWIG_AsVal_dec(long long)(VALUE obj, long long *val)
-{
-  VALUE type = TYPE(obj);
-  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long long v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-%#endif
-}
-
-/* unsigned long long */
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE VALUE 
-SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-  return ULL2NUM(value);
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-	  fragment="SWIG_ruby_failed",
-	  fragment="SWIG_LongLongAvailable") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-%ruby_aux_method(long long, NUM2ULL,  type == T_FIXNUM ? NUM2ULL(obj) : rb_big2ull(obj))
-
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
-{ 
-  VALUE type = TYPE(obj);
-  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    unsigned long long v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-%#endif
-}
-
-/* double */
-
-%fragment(SWIG_From_frag(double),"header") {
-  %define_as(SWIG_From_dec(double),  rb_float_new)
-}
-
-%fragment(SWIG_AsVal_frag(double),"header",fragment="SWIG_ruby_failed") {
-%ruby_aux_method(double, NUM2DBL, NUM2DBL(obj); (void)type)
-
-SWIGINTERN int
-SWIG_AsVal_dec(double)(VALUE obj, double *val)
-{
-  VALUE type = TYPE(obj);
-  if ((type == T_FLOAT) || (type == T_FIXNUM) || (type == T_BIGNUM)) {
-    double v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2DBL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyrun.swg b/dependencies2013/win32/swig/Lib/ruby/rubyrun.swg
deleted file mode 100644
index 249494ab..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyrun.swg
+++ /dev/null
@@ -1,455 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubyrun.swg
- *
- * This file contains the runtime support for Ruby modules
- * and includes code for managing global variables and pointer
- * type checking.
- * ----------------------------------------------------------------------------- */
-
-/* For backward compatibility only */
-#define SWIG_POINTER_EXCEPTION  0
-
-/* for raw pointers */
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
-#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Ruby_NewPointerObj(ptr, type, flags)
-#define SWIG_AcquirePtr(ptr, own)                       SWIG_Ruby_AcquirePtr(ptr, own)
-#define swig_owntype                                    swig_ruby_owntype
-
-/* for raw packed data */
-#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags)
-#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Ruby_NewPackedObj(ptr, sz, type)
-
-/* for class or struct pointers */
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
-
-/* for C or C++ function pointers */
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_ConvertPtr(obj, pptr, type, 0)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_NewPointerObj(ptr, type, 0)
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Ruby_NewPackedObj(ptr, sz, type)
-
-
-/* Runtime API */
-
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
-#define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
-
-
-/* Error manipulation */
-
-#define SWIG_ErrorType(code)                            SWIG_Ruby_ErrorType(code)               
-#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), "%s", msg)
-#define SWIG_fail                        		goto fail				 
-
-
-/* Ruby-specific SWIG API */
-
-#define SWIG_InitRuntime()                              SWIG_Ruby_InitRuntime()              
-#define SWIG_define_class(ty)                        	SWIG_Ruby_define_class(ty)
-#define SWIG_NewClassInstance(value, ty)             	SWIG_Ruby_NewClassInstance(value, ty)
-#define SWIG_MangleStr(value)                        	SWIG_Ruby_MangleStr(value)		  
-#define SWIG_CheckConvert(value, ty)                 	SWIG_Ruby_CheckConvert(value, ty)	  
-
-#include "assert.h"
-
-/* -----------------------------------------------------------------------------
- * pointers/data manipulation
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-  VALUE klass;
-  VALUE mImpl;
-  void  (*mark)(void *);
-  void  (*destroy)(void *);
-  int trackObjects;
-} swig_class;
-
-
-/* Global pointer used to keep some internal SWIG stuff */
-static VALUE _cSWIG_Pointer = Qnil;
-static VALUE swig_runtime_data_type_pointer = Qnil;
-
-/* Global IDs used to keep some internal SWIG stuff */
-static ID swig_arity_id = 0;
-static ID swig_call_id  = 0;
-
-/*
-  If your swig extension is to be run within an embedded ruby and has
-  director callbacks, you should set -DRUBY_EMBEDDED during compilation.  
-  This will reset ruby's stack frame on each entry point from the main 
-  program the first time a virtual director function is invoked (in a 
-  non-recursive way).
-  If this is not done, you run the risk of Ruby trashing the stack.
-*/
-
-#ifdef RUBY_EMBEDDED
-
-#  define SWIG_INIT_STACK                            \
-      if ( !swig_virtual_calls ) { RUBY_INIT_STACK } \
-      ++swig_virtual_calls;
-#  define SWIG_RELEASE_STACK --swig_virtual_calls;
-#  define Ruby_DirectorTypeMismatchException(x) \
-          rb_raise( rb_eTypeError, "%s", x ); return c_result;
-
-      static unsigned int swig_virtual_calls = 0;
-
-#else  /* normal non-embedded extension */
-
-#  define SWIG_INIT_STACK
-#  define SWIG_RELEASE_STACK
-#  define Ruby_DirectorTypeMismatchException(x) \
-          throw Swig::DirectorTypeMismatchException( x );
-
-#endif  /* RUBY_EMBEDDED */
-
-
-SWIGRUNTIME VALUE 
-getExceptionClass(void) {
-  static int init = 0;
-  static VALUE rubyExceptionClass ;
-  if (!init) {
-    init = 1;
-    rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception"));
-  }
-  return rubyExceptionClass;
-} 
-
-/* This code checks to see if the Ruby object being raised as part
-   of an exception inherits from the Ruby class Exception.  If so,
-   the object is simply returned.  If not, then a new Ruby exception
-   object is created and that will be returned to Ruby.*/
-SWIGRUNTIME VALUE
-SWIG_Ruby_ExceptionType(swig_type_info *desc, VALUE obj) {
-  VALUE exceptionClass = getExceptionClass();
-  if (rb_obj_is_kind_of(obj, exceptionClass)) {
-    return obj;
-  }  else {
-    return rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(obj));
-  }
-}
-
-/* Initialize Ruby runtime support */
-SWIGRUNTIME void
-SWIG_Ruby_InitRuntime(void)
-{
-  if (_mSWIG == Qnil) {
-    _mSWIG = rb_define_module("SWIG");
-    swig_call_id  = rb_intern("call");
-    swig_arity_id = rb_intern("arity");
-  }
-}
-
-/* Define Ruby class for C type */
-SWIGRUNTIME void
-SWIG_Ruby_define_class(swig_type_info *type)
-{
-  char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
-  sprintf(klass_name, "TYPE%s", type->name);
-  if (NIL_P(_cSWIG_Pointer)) {
-    _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
-    rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
-  }
-  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
-  free((void *) klass_name);
-}
-
-/* Create a new pointer object */
-SWIGRUNTIME VALUE
-SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
-{
-  int own =  flags & SWIG_POINTER_OWN; 
-  int track;
-  char *klass_name;
-  swig_class *sklass;
-  VALUE klass;
-  VALUE obj;
-  
-  if (!ptr)
-    return Qnil;
-  
-  if (type->clientdata) {
-    sklass = (swig_class *) type->clientdata;
-		
-    /* Are we tracking this class and have we already returned this Ruby object? */
-    track = sklass->trackObjects;
-    if (track) {
-      obj = SWIG_RubyInstanceFor(ptr);
-      
-      /* Check the object's type and make sure it has the correct type.
-        It might not in cases where methods do things like 
-        downcast methods. */
-      if (obj != Qnil) {
-        VALUE value = rb_iv_get(obj, "@__swigtype__");
-        const char* type_name = RSTRING_PTR(value);
-				
-        if (strcmp(type->name, type_name) == 0) {
-          return obj;
-        }
-      }
-    }
-
-    /* Create a new Ruby object */
-    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), 
-			   ( own ? VOIDFUNC(sklass->destroy) : 
-			     (track ? VOIDFUNC(SWIG_RubyRemoveTracking) : 0 )
-			     ), ptr);
-
-    /* If tracking is on for this class then track this object. */
-    if (track) {
-      SWIG_RubyAddTracking(ptr, obj);
-    }
-  } else {
-    klass_name = (char *) malloc(4 + strlen(type->name) + 1);
-    sprintf(klass_name, "TYPE%s", type->name);
-    klass = rb_const_get(_mSWIG, rb_intern(klass_name));
-    free((void *) klass_name);
-    obj = Data_Wrap_Struct(klass, 0, 0, ptr);
-  }
-  rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
-  
-  return obj;
-}
-
-/* Create a new class instance (always owned) */
-SWIGRUNTIME VALUE
-SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type)
-{
-  VALUE obj;
-  swig_class *sklass = (swig_class *) type->clientdata;
-  obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0);
-  rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
-  return obj;
-}
-
-/* Get type mangle from class name */
-SWIGRUNTIMEINLINE char *
-SWIG_Ruby_MangleStr(VALUE obj)
-{
-  VALUE stype = rb_iv_get(obj, "@__swigtype__");
-  return StringValuePtr(stype);
-}
-
-/* Acquire a pointer value */
-typedef struct {
-  void (*datafree)(void *);
-  int own;
-} swig_ruby_owntype;
-
-SWIGRUNTIME swig_ruby_owntype
-SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
-  swig_ruby_owntype oldown = {0, 0};
-  if (obj) {
-    oldown.datafree = RDATA(obj)->dfree;
-    RDATA(obj)->dfree = own.datafree;
-  }
-  return oldown;
-}
-
-/* Convert a pointer value */
-SWIGRUNTIME int
-SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, swig_ruby_owntype *own)
-{
-  char *c;
-  swig_cast_info *tc;
-  void *vptr = 0;
-
-  /* Grab the pointer */
-  if (NIL_P(obj)) {
-    if (ptr)
-      *ptr = 0;
-    return SWIG_OK;
-  } else {
-    if (TYPE(obj) != T_DATA) {
-      return SWIG_ERROR;
-    }
-    Data_Get_Struct(obj, void, vptr);
-  }
-  
-  if (own) {
-    own->datafree = RDATA(obj)->dfree;
-    own->own = 0;
-  }
-    
-  /* Check to see if the input object is giving up ownership
-     of the underlying C struct or C++ object.  If so then we
-     need to reset the destructor since the Ruby object no 
-     longer owns the underlying C++ object.*/ 
-  if (flags & SWIG_POINTER_DISOWN) {
-    /* Is tracking on for this class? */
-    int track = 0;
-    if (ty && ty->clientdata) {
-      swig_class *sklass = (swig_class *) ty->clientdata;
-      track = sklass->trackObjects;
-    }
-		
-    if (track) {
-      /* We are tracking objects for this class.  Thus we change the destructor
-       * to SWIG_RubyRemoveTracking.  This allows us to
-       * remove the mapping from the C++ to Ruby object
-       * when the Ruby object is garbage collected.  If we don't
-       * do this, then it is possible we will return a reference 
-       * to a Ruby object that no longer exists thereby crashing Ruby. */
-      RDATA(obj)->dfree = SWIG_RubyRemoveTracking;
-    } else {    
-      RDATA(obj)->dfree = 0;
-    }
-  }
-
-  /* Do type-checking if type info was provided */
-  if (ty) {
-    if (ty->clientdata) {
-      if (rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) {
-        if (vptr == 0) {
-          /* The object has already been deleted */
-          return SWIG_ObjectPreviouslyDeletedError;
-        }
-      }
-    }
-    if ((c = SWIG_MangleStr(obj)) == NULL) {
-      return SWIG_ERROR;
-    }
-    tc = SWIG_TypeCheck(c, ty);
-    if (!tc) {
-      return SWIG_ERROR;
-    } else {
-      if (ptr) {
-        if (tc->type == ty) {
-          *ptr = vptr;
-        } else {
-          int newmemory = 0;
-          *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
-          if (newmemory == SWIG_CAST_NEW_MEMORY) {
-            assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
-            if (own)
-              own->own = own->own | SWIG_CAST_NEW_MEMORY;
-          }
-        }
-      }
-    }
-  } else {
-    if (ptr)
-      *ptr = vptr;
-  }
-  
-  return SWIG_OK;
-}
-
-/* Check convert */
-SWIGRUNTIMEINLINE int
-SWIG_Ruby_CheckConvert(VALUE obj, swig_type_info *ty)
-{
-  char *c = SWIG_MangleStr(obj);
-  if (!c) return 0;
-  return SWIG_TypeCheck(c,ty) != 0;
-}
-
-SWIGRUNTIME VALUE
-SWIG_Ruby_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
-  char result[1024];
-  char *r = result;
-  if ((2*sz + 1 + strlen(type->name)) > 1000) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r, ptr, sz);
-  strcpy(r, type->name);
-  return rb_str_new2(result);
-}
-
-/* Convert a packed value value */
-SWIGRUNTIME int
-SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
-  swig_cast_info *tc;
-  const char  *c;
-
-  if (TYPE(obj) != T_STRING) goto type_error;
-  c = StringValuePtr(obj);
-  /* Pointer values must start with leading underscore */
-  if (*c != '_') goto type_error;
-  c++;
-  c = SWIG_UnpackData(c, ptr, sz);
-  if (ty) {
-    tc = SWIG_TypeCheck(c, ty);
-    if (!tc) goto type_error;
-  }
-  return SWIG_OK;
-
- type_error:
-  return SWIG_ERROR;
-}
-
-SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
-{
-  VALUE pointer;
-  swig_module_info *ret = 0;
-  VALUE verbose = rb_gv_get("VERBOSE");
-
- /* temporarily disable warnings, since the pointer check causes warnings with 'ruby -w' */
-  rb_gv_set("VERBOSE", Qfalse);
-  
-  /* first check if pointer already created */
-  pointer = rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
-  if (pointer != Qnil) {
-    Data_Get_Struct(pointer, swig_module_info, ret);
-  }
-
-  /* reinstate warnings */
-  rb_gv_set("VERBOSE", verbose);
-  return ret;
-}
-
-SWIGRUNTIME void 
-SWIG_Ruby_SetModule(swig_module_info *pointer)
-{
-  /* register a new class */
-  VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);
-  /* create and store the structure pointer to a global variable */
-  swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer);
-  rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
-}
-
-/* This function can be used to check whether a proc or method or similarly
-   callable function has been passed.  Usually used in a %typecheck, like:
-
-   %typecheck(c_callback_t, precedence=SWIG_TYPECHECK_POINTER) {
-        $result = SWIG_Ruby_isCallable( $input );
-   }
- */
-SWIGINTERN
-int SWIG_Ruby_isCallable( VALUE proc )
-{
-  if ( rb_respond_to( proc, swig_call_id ) )
-    return 1;
-  return 0;
-}
-
-/* This function can be used to check the arity (number of arguments)
-   a proc or method can take.  Usually used in a %typecheck.
-   Valid arities will be that equal to minimal or those < 0
-   which indicate a variable number of parameters at the end.
- */
-SWIGINTERN
-int SWIG_Ruby_arity( VALUE proc, int minimal )
-{
-  if ( rb_respond_to( proc, swig_arity_id ) )
-    {
-      VALUE num = rb_funcall( proc, swig_arity_id, 0 );
-      int arity = NUM2INT(num);
-      if ( arity < 0 && (arity+1) < -minimal ) return 1;
-      if ( arity == minimal ) return 1;
-      return 1;
-    }
-  return 0;
-}
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyruntime.swg b/dependencies2013/win32/swig/Lib/ruby/rubyruntime.swg
deleted file mode 100644
index 41215614..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyruntime.swg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-%runtime "swiglabels.swg"    /* Common C API type-checking code */
-%runtime "swigrun.swg"       /* Common C API type-checking code */
-%runtime "swigerrors.swg"    /* SWIG errors */   
-%runtime "rubyhead.swg"      /* Ruby includes and fixes */   
-%runtime "rubyerrors.swg"    /* Ruby errors */   
-%runtime "rubytracking.swg"  /* API for tracking C++ classes to Ruby objects */
-%runtime "rubyapi.swg"
-%runtime "rubyrun.swg"
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubystdautodoc.swg b/dependencies2013/win32/swig/Lib/ruby/rubystdautodoc.swg
deleted file mode 100644
index e14f6590..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubystdautodoc.swg
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubystdautodoc.swg
- * 
- * This file contains autodocs for standard STL functions.
- * ----------------------------------------------------------------------------- */
-
-//
-// For STL autodocumentation
-//
-AUTODOC(c_str, "Convert class to a String representation");
-AUTODOC(begin, "Return an iterator to the beginning of the $class");
-AUTODOC(end, "Return an iterator to past the end of the $class");
-AUTODOC(rbegin, "Return a reverse iterator to the beginning (the end) of the $class");
-AUTODOC(rend, "Return a reverse iterator to past the end (past the beginning) of the $class");
-AUTODOC(length, "Size or Length of the $class");
-AUTODOC(replace, "Replace all or a portion of the $class");
-AUTODOC(resize, "Resize the size of the $class");
-AUTODOC(capacity, "Reserved capacity of the $class");
-AUTODOC(reserve, "Reserve memory in the $class for a number of elements");
-AUTODOC(erase, "Delete a portion of the $class");
-AUTODOC(max_size, "Maximum size of elements allowed in the $class");
-AUTODOC(iterator, "Return an iterator to the $class");
-AUTODOC(empty, "Check if the $class is empty or not");
-AUTODOC(rfind, "Find an element in reverse usually starting from the end of the $class");
-AUTODOC(assign, "Assign a new $class or portion of it");
-AUTODOC(front, "Return the first element in $class");
-AUTODOC(back, "Return the last element in $class");
-AUTODOC(second, "Return the second element in $class");
-AUTODOC(push_front, "Add an element at the beginning of the $class");
-AUTODOC(push_back, "Add an element at the end of the $class");
-AUTODOC(pop_front, "Remove and return element at the beginning of the $class");
-AUTODOC(pop_back, "Remove and return an element at the end of the $class");
-AUTODOC(clear, "Clear $class contents");
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubystdcommon.swg b/dependencies2013/win32/swig/Lib/ruby/rubystdcommon.swg
deleted file mode 100644
index f72745b5..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubystdcommon.swg
+++ /dev/null
@@ -1,203 +0,0 @@
-
-/* ------------------------------------------------------------
- * The Ruby classes, for C++
- * ------------------------------------------------------------ */
-%include <rubyclasses.swg>
-
-%fragment("StdTraits","header",fragment="StdTraitsCommon")
-{
-
-namespace swig {  
-  /*
-    Traits that provides the from method
-  */
-  template <class Type> struct traits_from_ptr {
-    static VALUE from(Type *val, int owner = 0) {
-      return SWIG_NewPointerObj(val, type_info<Type>(), owner);
-    }
-  };
-
-  template <class Type> struct traits_from {
-    static VALUE from(const Type& val) {
-      return traits_from_ptr<Type>::from(new Type(val), 1);
-    }
-  };
-
-  template <class Type> struct traits_from<Type *> {
-    static VALUE from(Type* val) {
-      return traits_from_ptr<Type>::from(val, 0);
-    }
-  };
-
-  template <class Type> struct traits_from<const Type *> {
-    static VALUE from(const Type* val) {
-      return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0);
-    }
-  };
-
-
-  template <class Type>
-  inline VALUE from(const Type& val) {
-    return traits_from<Type>::from(val);
-  }
-
-  template <class Type>
-  inline VALUE from_ptr(Type* val, int owner) {
-    return traits_from_ptr<Type>::from(val, owner);
-  }
-
-  /*
-    Traits that provides the asval/as/check method
-  */
-  template <class Type>
-  struct traits_asptr {   
-    static int asptr(VALUE obj, Type **val) {
-      Type *p;
-      swig_type_info *descriptor = type_info<Type>();
-      int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-      if (SWIG_IsOK(res)) {
-	if (val) *val = p;
-      }
-      return res;
-    }
-  }; 
-
-  template <class Type>
-  inline int asptr(VALUE obj, Type **vptr) {
-    return traits_asptr<Type>::asptr(obj, vptr);
-  }
-
-  template <class Type> 
-  struct traits_asval {
-    static int asval(VALUE obj, Type *val) {
-      if (val) {
-	Type *p = 0;
-	int res = traits_asptr<Type>::asptr(obj, &p);
-	if (!SWIG_IsOK(res)) return res;	
-	if (p) {
-	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
-	  *(const_cast<noconst_type*>(val)) = *p;
-	  if (SWIG_IsNewObj(res)){
-	    %delete(p);
-	    res = SWIG_DelNewMask(res);
-	  }
-	  return res;
-	} else {
-	  return SWIG_ERROR;
-	}
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-
-  template <class Type> struct traits_asval<Type*> {
-    static int asval(VALUE obj, Type **val) {
-      if (val) {
-        typedef typename noconst_traits<Type>::noconst_type noconst_type;
-        noconst_type *p = 0;
-        int res = traits_asptr<noconst_type>::asptr(obj,  &p);
-        if (SWIG_IsOK(res)) {
-          *(const_cast<noconst_type**>(val)) = p;
-	}
-	return res;
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-  
-  template <class Type>
-  inline int asval(VALUE obj, Type *val) {
-    return traits_asval<Type>::asval(obj, val);
-  }
-
-  template <class Type> 
-  struct traits_as<Type, value_category> {
-    static Type as(VALUE obj, bool throw_error) {
-      Type v;
-      int res = asval(obj, &v);
-      if (!obj || !SWIG_IsOK(res)) {
-	if (throw_error) throw std::invalid_argument("bad type");
-	VALUE lastErr = rb_gv_get("$!");
-	if (lastErr == Qnil) {
-	  %type_error(swig::type_name<Type>());
-	}
-      }
-      return v;
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type, pointer_category> {
-    static Type as(VALUE obj, bool throw_error) {
-      Type *v = 0;      
-      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
-      if (SWIG_IsOK(res) && v) {
-	if (SWIG_IsNewObj(res)) {
-	  Type r(*v);
-	  %delete(v);
-	  return r;
-	} else {
-	  return *v;
-	}
-      } else {
-	// Uninitialized return value, no Type() constructor required.
-	if (throw_error) throw std::invalid_argument("bad type");
-	VALUE lastErr = rb_gv_get("$!");
-	if (lastErr == Qnil) {
-	  %type_error(swig::type_name<Type>());
-	}
-	static Type *v_def = (Type*) malloc(sizeof(Type));
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
-      }
-    }
-  };
-
-  template <class Type> 
-  struct traits_as<Type*, pointer_category> {
-    static Type* as(VALUE obj, bool throw_error) {
-      Type *v = 0;      
-      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
-      if (SWIG_IsOK(res)) {
-	return v;
-      } else {
-	if (throw_error) throw std::invalid_argument("bad type");
-	VALUE lastErr = rb_gv_get("$!");
-	if (lastErr == Qnil) {
-	  %type_error(swig::type_name<Type>());
-	}
-	return 0;
-      }
-    }
-  };
-
-  template <class Type>
-  inline Type as(VALUE obj, bool te = false) {
-    return traits_as< Type, typename traits< Type >::category >::as(obj, te);
-  }
-
-  template <class Type> 
-  struct traits_check<Type, value_category> {
-    static bool check(VALUE obj) {
-      int res = obj ? asval(obj, (Type *)(0)) : SWIG_ERROR;
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type> 
-  struct traits_check<Type, pointer_category> {
-    static bool check(VALUE obj) {
-      int res = obj ? asptr(obj, (Type **)(0)) : SWIG_ERROR;
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type>
-  inline bool check(VALUE obj) {
-    return traits_check<Type, typename traits<Type>::category>::check(obj);
-  }
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubystdfunctors.swg b/dependencies2013/win32/swig/Lib/ruby/rubystdfunctors.swg
deleted file mode 100644
index 5150333c..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubystdfunctors.swg
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * @file   rubystdfunctors.swg
- * @date   Sun May  6 00:44:33 2007
- * 
- * @brief  This file provides unary and binary functors for STL
- *         containers, that will invoke a Ruby proc or method to do
- *         their operation.
- *
- *         You can use them in a swig file like:
- *
- *         %include <std_set.i>
- *         %include <std_functors.i>
- *
- *         %template< IntSet > std::set< int, swig::BinaryPredicate<> >;
- *
- *
- *         which will then allow calling them from Ruby either like:
- *  
- *            # order of set is defined by C++ default
- *            a = IntSet.new
- *
- *            # sort order defined by Ruby proc
- *            b = IntSet.new( proc { |a,b| a > b } )
- * 
- */
-
-%include rubyclasses.swg
-
-
-namespace swig {
-
-  %apply GC_VALUE { UnaryPredicate, BinaryPredicate, UnaryFunction,
-		      BinaryFunction };
-
-  %typecheck(SWIG_TYPECHECK_POINTER,noblock=1) 
-    UnaryPredicate, UnaryPredicate&, UnaryFunction, UnaryFunction&
-  {
-    $1 = SWIG_Ruby_isCallable($input) && SWIG_Ruby_arity($input, 1);
-  }
-
-  %typecheck(SWIG_TYPECHECK_POINTER,noblock=1) 
-    BinaryPredicate, BinaryPredicate&, BinaryFunction, BinaryFunction& {
-    $1 = SWIG_Ruby_isCallable($input) && SWIG_Ruby_arity($input, 2);
-  }
-
-  %typemap(in,noblock=1)  BinaryFunction&, BinaryFunction {
-    $1 = new swig::BinaryFunction< >($input);
-  }
-  %typemap(in,noblock=1) UnaryFunction&, UnaryFunction {
-    $1 = new swig::UnaryFunction< >($input);
-  }
-
-  %typemap(in,noblock=1) BinaryPredicate&, BinaryPredicate {
-    $1 = new swig::BinaryPredicate<>($input);
-  }
-
-  %typemap(in,noblock=1) UnaryPredicate&, UnaryPredicate {
-    $1 = new swig::UnaryPredicate< >($input);
-  }
-
-
-  %ignore BinaryFunction;
-  template< class _T = GC_VALUE >
-  struct BinaryFunction {
-  };
-
-  %ignore UnaryFunction;
-  template< class _T = GC_VALUE >
-  struct UnaryFunction {
-  };
-
-  %ignore BinaryPredicate;
-  template< class _T = GC_VALUE >
-  struct BinaryPredicate {
-  };
-
-  %ignore UnaryPredicate;
-  template< class _T = GC_VALUE >
-  struct UnaryPredicate {
-
-  };
-
-}
-
-
-%fragment("StdFunctors","header",fragment="StdTraits",fragment="GC_VALUE_definition")
-{
-namespace swig {
-
-  static ID call_id = rb_intern("call");
-
-  template <class _T = GC_VALUE, class _DefaultFunc = std::less<GC_VALUE> >
-  struct BinaryPredicate : GC_VALUE
-  {
-    BinaryPredicate(VALUE obj = Qnil) : GC_VALUE(obj) { }
-    bool operator()(_T a, _T b) const
-    {
-      if (_obj != Qnil) {
-        SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	VALUE arg1 = swig::from(a);
-	VALUE arg2 = swig::from(b);
-	VALUE res = rb_funcall( _obj, swig::call_id, 2, arg1, arg2);
-        SWIG_RUBY_THREAD_END_BLOCK;
-        return RTEST(res);
-      } else {
-        return _DefaultFunc()(a, b);
-      }
-    }
-  };
-
-  template <class _T = GC_VALUE, class _DefaultFunc = std::less< _T > >
-  struct BinaryFunction : GC_VALUE
-  {
-    BinaryFunction(VALUE obj = Qnil) : GC_VALUE(obj) { }
-    _T operator()(_T a, _T b) const
-    {
-      if (_obj != Qnil) {
-        SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	VALUE arg1 = swig::from(a);
-	VALUE arg2 = swig::from(b);
-	VALUE res = rb_funcall( _obj, swig::call_id, 2, arg1, arg2);
-        SWIG_RUBY_THREAD_END_BLOCK;
-        return swig::as<_T >(res);
-      } else {
-        return _DefaultFunc()(a, b);
-      }
-    }
-  };
-
-  template< class _T = GC_VALUE >
-  struct UnaryPredicate : GC_VALUE
-  {
-    UnaryPredicate(VALUE obj = Qnil) : GC_VALUE(obj) { }
-    bool operator()(_T a) const
-    {
-      SWIG_RUBY_THREAD_BEGIN_BLOCK;
-      VALUE arg1 = swig::from<_T >(a);
-      VALUE res = rb_funcall( _obj, swig::call_id, 1, arg1);
-      SWIG_RUBY_THREAD_END_BLOCK;
-      return RTEST(res);
-    }
-  };
-
-  template< class _T = GC_VALUE >
-  struct UnaryFunction : GC_VALUE
-  {
-    UnaryFunction(VALUE obj = Qnil) : GC_VALUE(obj) { }
-    _T operator()(_T a) const
-    {
-      SWIG_RUBY_THREAD_BEGIN_BLOCK;
-      VALUE arg1 = swig::from(a);
-      VALUE res = rb_funcall( _obj, swig::call_id, 1, VALUE(arg1));
-      SWIG_RUBY_THREAD_END_BLOCK;
-      return swig::as< _T >(res);
-    }
-  };
-
-} // namespace swig
-
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubystrings.swg b/dependencies2013/win32/swig/Lib/ruby/rubystrings.swg
deleted file mode 100644
index 3adf0008..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubystrings.swg
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ------------------------------------------------------------
- *  utility methods for char strings 
- * ------------------------------------------------------------ */
-
-%fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
-{
-  if (TYPE(obj) == T_STRING) {
-    char *cstr = StringValuePtr(obj); 
-    size_t size = RSTRING_LEN(obj) + 1;
-    if (cptr)  {
-      if (alloc) {
-	if (*alloc == SWIG_NEWOBJ) {
-	  *cptr = %new_copy_array(cstr, size, char);
-	} else {
-	  *cptr = cstr;
-	  *alloc = SWIG_OLDOBJ;
-	}
-      }
-    }
-    if (psize) *psize = size;
-    return SWIG_OK;
-  } else {
-    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-    if (pchar_descriptor) {
-      void* vptr = 0;
-      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = (char *)vptr;
-	if (psize) *psize = vptr ? (strlen((char*)vptr) + 1) : 0;
-	if (alloc) *alloc = SWIG_OLDOBJ;
-	return SWIG_OK;
-      }
-    }
-  }  
-  return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
-SWIGINTERNINLINE VALUE 
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  if (carray) {
-    if (size > LONG_MAX) {
-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      return pchar_descriptor ? 
-	SWIG_NewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : Qnil;
-    } else {
-      return rb_str_new(carray, %numeric_cast(size,long));
-    }
-  } else {
-    return Qnil;
-  }
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubytracking.swg b/dependencies2013/win32/swig/Lib/ruby/rubytracking.swg
deleted file mode 100644
index 8f9f01be..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubytracking.swg
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubytracking.swg
- *
- * This file contains support for tracking mappings from 
- * Ruby objects to C++ objects.  This functionality is needed
- * to implement mark functions for Ruby's mark and sweep
- * garbage collector.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(ST_DATA_T_DEFINED)
-/* Needs to be explicitly included for Ruby 1.8 and earlier */
-#include <st.h>
-#endif
-
-/* Ruby 1.8 actually assumes the first case. */
-#if SIZEOF_VOIDP == SIZEOF_LONG
-#  define SWIG2NUM(v) LONG2NUM((unsigned long)v)
-#  define NUM2SWIG(x) (unsigned long)NUM2LONG(x)
-#elif SIZEOF_VOIDP == SIZEOF_LONG_LONG
-#  define SWIG2NUM(v) LL2NUM((unsigned long long)v)
-#  define NUM2SWIG(x) (unsigned long long)NUM2LL(x)
-#else
-#  error sizeof(void*) is not the same as long or long long
-#endif
-
-/* Global hash table to store Trackings from C/C++
-   structs to Ruby Objects. 
-*/
-static st_table* swig_ruby_trackings = NULL;
-
-static VALUE swig_ruby_trackings_count(ANYARGS) {
-  return SWIG2NUM(swig_ruby_trackings->num_entries);
-}
-
-
-/* Setup a hash table to store Trackings */
-SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
-  /* Create a hash table to store Trackings from C++
-     objects to Ruby objects. */
-
-  /* Try to see if some other .so has already created a 
-     tracking hash table, which we keep hidden in an instance var
-     in the SWIG module.
-     This is done to allow multiple DSOs to share the same
-     tracking table.
-  */
-  VALUE trackings_value = Qnil;
-  /* change the variable name so that we can mix modules
-     compiled with older SWIG's - this used to be called "@__trackings__" */
-  ID trackings_id = rb_intern( "@__safetrackings__" );
-  VALUE verbose = rb_gv_get("VERBOSE");
-  rb_gv_set("VERBOSE", Qfalse);
-  trackings_value = rb_ivar_get( _mSWIG, trackings_id );
-  rb_gv_set("VERBOSE", verbose);
-
-  /* The trick here is that we have to store the hash table
-  pointer in a Ruby variable. We do not want Ruby's GC to
-  treat this pointer as a Ruby object, so we convert it to
-  a Ruby numeric value. */
-  if (trackings_value == Qnil) {
-    /* No, it hasn't.  Create one ourselves */
-    swig_ruby_trackings = st_init_numtable();
-    rb_ivar_set( _mSWIG, trackings_id, SWIG2NUM(swig_ruby_trackings) );
-  } else {
-    swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value);
-  }
-
-  rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", swig_ruby_trackings_count, NULL);
-}
-
-/* Add a Tracking from a C/C++ struct to a Ruby object */
-SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
-  /* Store the mapping to the global hash table. */
-  st_insert(swig_ruby_trackings, (st_data_t)ptr, object);
-}
-
-/* Get the Ruby object that owns the specified C/C++ struct */
-SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-  /* Now lookup the value stored in the global hash table */
-  VALUE value;
-
-  if (st_lookup(swig_ruby_trackings, (st_data_t)ptr, &value)) {
-    return value;
-  } else {
-    return Qnil;
-  }
-}
-
-/* Remove a Tracking from a C/C++ struct to a Ruby object.  It
-   is very important to remove objects once they are destroyed
-   since the same memory address may be reused later to create
-   a new object. */
-SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
-  /* Delete the object from the hash table */
-  st_delete(swig_ruby_trackings, (st_data_t *)&ptr, NULL);
-}
-
-/* This is a helper method that unlinks a Ruby object from its
-   underlying C++ object.  This is needed if the lifetime of the
-   Ruby object is longer than the C++ object */
-SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
-  VALUE object = SWIG_RubyInstanceFor(ptr);
-
-  if (object != Qnil) {
-    if (TYPE(object) != T_DATA)
-      abort();
-    DATA_PTR(object) = 0;
-  }
-}
-
-/* This is a helper method that iterates over all the trackings
-   passing the C++ object pointer and its related Ruby object
-   to the passed callback function. */
-
-/* Proxy method to abstract the internal trackings datatype */
-static int swig_ruby_internal_iterate_callback(void* ptr, VALUE obj, void(*meth)(void* ptr, VALUE obj)) {
-  (*meth)(ptr, obj);
-  return ST_CONTINUE;
-}
-
-SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) {
-  st_foreach(swig_ruby_trackings, (int (*)(ANYARGS))&swig_ruby_internal_iterate_callback, (st_data_t)meth);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubytypemaps.swg b/dependencies2013/win32/swig/Lib/ruby/rubytypemaps.swg
deleted file mode 100644
index 3837df07..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubytypemaps.swg
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ------------------------------------------------------------
- *  Typemap specializations for Ruby
- * ------------------------------------------------------------ */
-/* ------------------------------------------------------------
- *  Fragment section
- * ------------------------------------------------------------ */
-/* bool is dangerous in Ruby, change precedence */
-#undef SWIG_TYPECHECK_BOOL
-%define SWIG_TYPECHECK_BOOL             10000 %enddef
-
-/* Include fundamental fragment definitions */
-%include <typemaps/fragments.swg>
-
-/* Look for user fragments file. */
-%include <rubyfragments.swg>
-
-/* Ruby fragments for primitive types */
-%include <rubyprimtypes.swg>
-
-/* Ruby fragments for char* strings */
-%include <rubystrings.swg>
-
-/* Backward compatibility output helper */
-%fragment("output_helper","header") %{
-#define output_helper SWIG_Ruby_AppendOutput
-%}
-
-/* ------------------------------------------------------------
- *  Unified typemap section
- * ------------------------------------------------------------ */
-
-/* Directors are supported in Ruby */
-#ifndef SWIG_DIRECTOR_TYPEMAPS
-#define SWIG_DIRECTOR_TYPEMAPS
-#endif
-
-
-/* Ruby types */
-#define SWIG_Object                      VALUE
-#define VOID_Object                      Qnil
-
-/* Overload of the output/constant/exception handling */
-
-/* append output */
-#define SWIG_AppendOutput(result,obj)    SWIG_Ruby_AppendOutput(result, obj)
-
-/* set constant */
-#define SWIG_SetConstant(name, obj)      rb_define_const($module, name, obj)
-
-/* raise */
-#define SWIG_Raise(obj, type, desc)      rb_exc_raise(SWIG_Ruby_ExceptionType(desc, obj)) 
-
-/* Get the address of the 'Ruby self' object */
-
-%typemap(in,numinputs=0,noblock=1) VALUE* RUBY_SELF {
-  $1 = &self;
-}
-
-/* Include the unified typemap library */
-%include <typemaps/swigtypemaps.swg>
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubyuserdir.swg b/dependencies2013/win32/swig/Lib/ruby/rubyuserdir.swg
deleted file mode 100644
index 638433c2..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubyuserdir.swg
+++ /dev/null
@@ -1,20 +0,0 @@
-#define %alias %feature("alias")
-#define %freefunc %feature("freefunc")
-#define %markfunc %feature("markfunc")
-#define %mixin %feature("mixin")
-#define %predicate %feature("predicate", "1")
-#define %bang %feature("bang", "1")
-#define %trackobjects %feature("trackobjects")
-#define %nooutput %feature("outputs","0")
-#define %initstack %feature("initstack", "1")
-#define %ignorestack %feature("initstack", "0")
-
-/* ------------------------------------------------------------------------- */
-/*
-  Enable keywords paramaters
-*/
-
-#define %kwargs      %feature("kwargs") 
-#define %nokwargs    %feature("kwargs", "0")
-#define %clearkwargs %feature("kwargs", "")
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/rubywstrings.swg b/dependencies2013/win32/swig/Lib/ruby/rubywstrings.swg
deleted file mode 100644
index b6dd937a..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/rubywstrings.swg
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -----------------------------------------------------------------------------
- * rubywstrings.swg
- *
- * Currently, Ruby does not support Unicode or WChar properly, so these
- * are still treated as char arrays for now.
- * There are other libraries available that add support to this in
- * ruby including WString, FXString, etc.
- * ----------------------------------------------------------------------------- */
-
-/* ------------------------------------------------------------
- *  utility methods for wchar_t strings 
- * ------------------------------------------------------------ */
-
-%fragment("SWIG_AsWCharPtrAndSize","header",fragment="<wchar.h>",fragment="SWIG_pwchar_descriptor",fragment="SWIG_AsCharPtrAndSize") {
-SWIGINTERN int
-SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
-{
-  return SWIG_AsCharPtrAndSize( obj, (char**)cptr, psize, alloc);
-//   VALUE tmp = 0;
-//   bool ok = false;
-//   if ( TYPE(obj) == T_STRING ) {
-//     if (cptr) {
-//       obj = tmp = SWIG_Unicode_FromObject(obj);
-//       ok = true;
-//     }
-//   }
-//   if (ok) {
-//     Py_ssize_t len = PyUnicode_GetSize(obj);
-//     rb_notimplement();
-//     if (cptr) {
-//       *cptr = %new_array(len + 1, wchar_t);
-//       SWIG_Unicode_AsWideChar((PyUnicodeObject *)obj, *cptr, len);
-//       (*cptr)[len] = 0;
-//     }
-//     if (psize) *psize = (size_t) len + 1;
-//     if (alloc) *alloc = cptr ? SWIG_NEWOBJ : 0;
-//     return SWIG_OK;
-//   } else {
-//     swig_type_info* pwchar_descriptor = SWIG_pwchar_descriptor();
-//     if (pwchar_descriptor) {
-//       void * vptr = 0;
-//       if (SWIG_ConvertPtr(obj, &vptr, pwchar_descriptor, 0) == SWIG_OK) {
-// 	if (cptr) *cptr = (wchar_t *)vptr;
-// 	if (psize) *psize = vptr ? (wcslen((wchar_t *)vptr) + 1) : 0;
-// 	return SWIG_OK;
-//       }
-//     }
-//   }
-//   return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_FromWCharPtrAndSize","header",fragment="<wchar.h>",fragment="SWIG_pwchar_descriptor",fragment="SWIG_FromCharPtrAndSize") {
-SWIGINTERNINLINE VALUE 
-SWIG_FromWCharPtrAndSize(const wchar_t * carray, size_t size)
-{
-  return SWIG_FromCharPtrAndSize( (const char*)carray, size);
-//   if (carray) {
-//     if (size > INT_MAX) {
-//       swig_type_info* pwchar_descriptor = SWIG_pwchar_descriptor();
-//       return pwchar_descriptor ? 
-// 	SWIG_NewPointerObj(%const_cast(carray,wchar_t *), pwchar_descriptor, 0) : Qnil;
-//     } else {
-//       return SWIG_Unicode_FromWideChar(carray, %numeric_cast(size,int));
-//     }
-//   } else {
-//     return Qnil;
-//   }
-}
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_alloc.i b/dependencies2013/win32/swig/Lib/ruby/std_alloc.i
deleted file mode 100644
index 35dc051b..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_alloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_alloc.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_array.i b/dependencies2013/win32/swig/Lib/ruby/std_array.i
deleted file mode 100644
index a4d3ef54..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_array.i
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-  std::array
-*/
-
-%fragment("StdArrayTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T, size_t N>
-    struct traits_asptr<std::array<T, N> >  {
-      static int asptr(VALUE obj, std::array<T, N> **vec) {
-	return traits_asptr_stdseq<std::array<T, N> >::asptr(obj, vec);
-      }
-    };
-    
-    template <class T, size_t N>
-    struct traits_from<std::array<T, N> > {
-      static VALUE from(const std::array<T, N>& vec) {
-	return traits_from_stdseq<std::array<T, N> >::from(vec);
-      }
-    };
-
-    template <class RubySeq, class T, size_t N>
-    inline void
-    assign(const RubySeq& rubyseq, std::array<T, N>* seq) {
-      if (rubyseq.size() < seq->size())
-        throw std::invalid_argument("std::array cannot be expanded in size");
-      else if (rubyseq.size() > seq->size())
-        throw std::invalid_argument("std::array cannot be reduced in size");
-      std::copy(rubyseq.begin(), rubyseq.end(), seq->begin());
-    }
-
-    template <class T, size_t N>
-    inline void
-    resize(std::array<T, N> *seq, typename std::array<T, N>::size_type n, typename std::array<T, N>::value_type x) {
-      throw std::invalid_argument("std::array is a fixed size container and does not support resizing");
-    }
-
-    // Only limited slicing is supported as std::array is fixed in size
-    template <class T, size_t N, class Difference>
-    inline std::array<T, N>*
-    getslice(const std::array<T, N>* self, Difference i, Difference j) {
-      typedef std::array<T, N> Sequence;
-      typename Sequence::size_type size = self->size();
-      typename Sequence::size_type ii = swig::check_index(i, size, (i == size && j == size));
-      typename Sequence::size_type jj = swig::slice_index(j, size);
-
-      if (ii == 0 && jj == size) {
-        Sequence *sequence = new Sequence();
-        std::copy(self->begin(), self->end(), sequence->begin());
-        return sequence;
-      } else {
-        throw std::invalid_argument("std::array object only supports getting a slice that is the size of the array");
-      }
-    }
-
-    template <class T, size_t N, class Difference, class InputSeq>
-    inline void
-    setslice(std::array<T, N>* self, Difference i, Difference j, const InputSeq& v) {
-      typedef std::array<T, N> Sequence;
-      typename Sequence::size_type size = self->size();
-      typename Sequence::size_type ii = swig::check_index(i, size, true);
-      typename Sequence::size_type jj = swig::slice_index(j, size);
-
-      if (ii == 0 && jj == size) {
-        std::copy(v.begin(), v.end(), self->begin());
-      } else {
-        throw std::invalid_argument("std::array object only supports setting a slice that is the size of the array");
-      }
-    }
-
-    template <class T, size_t N, class Difference>
-    inline void
-    delslice(std::array<T, N>* self, Difference i, Difference j) {
-      throw std::invalid_argument("std::array object does not support item deletion");
-    }
-  }
-%}
-
-
-%define %swig_array_methods(Type...)
-  %swig_sequence_methods_non_resizable(Type)
-%enddef
-
-%define %swig_array_methods_val(Type...)
-  %swig_sequence_methods_non_resizable_val(Type);
-%enddef
-
-
-%mixin std::array "Enumerable";
-%ignore std::array::push_back;
-%ignore std::array::pop_back;
-
-
-%rename("delete")     std::array::__delete__;
-%rename("reject!")    std::array::reject_bang;
-%rename("map!")       std::array::map_bang;
-%rename("empty?")     std::array::empty;
-%rename("include?" )  std::array::__contains__ const;
-%rename("has_key?" )  std::array::has_key const;
-
-%include <std/std_array.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_basic_string.i b/dependencies2013/win32/swig/Lib/ruby/std_basic_string.i
deleted file mode 100644
index 1351177f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_basic_string.i
+++ /dev/null
@@ -1,97 +0,0 @@
-#if !defined(SWIG_STD_STRING) 
-#define SWIG_STD_BASIC_STRING
-
-%include <rubycontainer.swg>
-
-#define %swig_basic_string(Type...)  %swig_sequence_methods_val(Type)
-
-
-%traits_swigtype(std::basic_string<char>);
-%fragment(SWIG_Traits_frag(std::basic_string<char>));
-
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header",
-	  fragment="SWIG_AsCharPtrAndSize") {
-SWIGINTERN int
-SWIG_AsPtr(std::basic_string<char>)(VALUE obj, std::string **val)
-{
-  static swig_type_info* string_info = 
-    SWIG_TypeQuery("std::basic_string<char> *");
-  std::string *vptr;    
-  if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
-    if (val) *val = vptr;
-    return SWIG_OLDOBJ;
-  } else {
-    char* buf = 0 ; size_t size = 0; int alloc = 0;
-    if (SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) {
-      if (buf) {
-	if (val) *val = new std::string(buf, size - 1);
-	if (alloc == SWIG_NEWOBJ) %delete_array(buf);
-	return SWIG_NEWOBJ;
-      }
-    }
-    if (val) {
-      rb_raise( rb_eTypeError, "a string is expected");
-    }
-    return 0;
-  }
-}  
-}
-
-%fragment(SWIG_From_frag(std::basic_string<char>),"header",
-	  fragment="SWIG_FromCharPtrAndSize") {
-SWIGINTERNINLINE VALUE
-  SWIG_From(std::basic_string<char>)(const std::string& s)
-  {
-    return SWIG_FromCharPtrAndSize(s.data(), s.size());
-  }
-}
-
-%include <std/std_basic_string.i>
-%typemaps_asptrfromn(%checkcode(STRING), std::basic_string<char>);
-
-#endif
-
-
-#if !defined(SWIG_STD_WSTRING)
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header",
-	  fragment="SWIG_AsWCharPtrAndSize") {
-SWIGINTERN int
-  SWIG_AsPtr(std::basic_string<wchar_t>)(VALUE obj, std::wstring **val)
-  {
-    static swig_type_info* string_info = 
-      SWIG_TypeQuery("std::basic_string<wchar_t> *");
-    std::wstring *vptr;    
-    if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
-      if (val) *val = vptr;
-      return SWIG_OLDOBJ;
-    } else {
-      wchar_t *buf = 0 ; size_t size = 0; int alloc = 0;
-      if (SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) {
-	if (buf) {
-	  if (val) *val = new std::wstring(buf, size - 1);
-	  if (alloc == SWIG_NEWOBJ) %delete_array(buf);
-	  return SWIG_NEWOBJ;
-	}
-      }
-      if (val) {
-	rb_raise( rb_eTypeError, "a string is expected");
-      }
-      return 0;
-    }
-  }
-}
-
-%fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
-	  fragment="SWIG_FromWCharPtrAndSize") {
-SWIGINTERNINLINE VALUE
-  SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s)
-  {
-    return SWIG_FromWCharPtrAndSize(s.data(), s.size());
-  }
-}
-
-%typemaps_asptrfromn(%checkcode(UNISTRING), std::basic_string<wchar_t>);
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_char_traits.i b/dependencies2013/win32/swig/Lib/ruby/std_char_traits.i
deleted file mode 100644
index bf4e6c47..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_char_traits.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_char_traits.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_common.i b/dependencies2013/win32/swig/Lib/ruby/std_common.i
deleted file mode 100644
index 0cf9ce10..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_common.i
+++ /dev/null
@@ -1,74 +0,0 @@
-%include <std/std_except.i>
-%include <rubystdcommon.swg>
-%include <rubystdautodoc.swg>
-
-
-/*
-  Generate the traits for a 'primitive' type, such as 'double',
-  for which the SWIG_AsVal and SWIG_From methods are already defined.
-*/
-
-%define %traits_ptypen(Type...)
-  %fragment(SWIG_Traits_frag(Type),"header",
-	    fragment=SWIG_AsVal_frag(Type),
-	    fragment=SWIG_From_frag(Type),
-	    fragment="StdTraits") {
-namespace swig {
-  template <> struct traits< Type > {
-    typedef value_category category;
-    static const char* type_name() { return  #Type; }
-  };
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(VALUE obj, value_type *val) {
-      return SWIG_AsVal(Type)(obj, val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static VALUE from(const value_type& val) {
-      return SWIG_From(Type)(val);
-    }
-  };
-}
-}
-%enddef
-
-/* Traits for enums. This is bit of a sneaky trick needed because a generic template specialization of enums
-   is not possible (unless using template meta-programming which SWIG doesn't support because of the explicit
-   instantiations required using %template). The STL containers define the 'front' method and the typemap
-   below is used whenever the front method is wrapped returning an enum. This typemap simply picks up the
-   standard enum typemap, but additionally drags in a fragment containing the traits_asval and traits_from
-   required in the generated code for enums. */
-
-%define %traits_enum(Type...)
-  %fragment("SWIG_Traits_enum_"{Type},"header",
-	    fragment=SWIG_AsVal_frag(int),
-	    fragment=SWIG_From_frag(int),
-	    fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(VALUE obj, value_type *val) {
-      return SWIG_AsVal(int)(obj, (int *)val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static VALUE from(const value_type& val) {
-      return SWIG_From(int)((int)val);
-    }
-  };
-}
-}
-%typemap(out, fragment="SWIG_Traits_enum_"{Type}) const enum SWIGTYPE& front %{$typemap(out, const enum SWIGTYPE&)%}
-%enddef
-
-
-%include <std/std_common.i>
-
-//
-// Generates the traits for all the known primitive
-// C++ types (int, double, ...)
-//
-%apply_cpptypes(%traits_ptypen);
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_complex.i b/dependencies2013/win32/swig/Lib/ruby/std_complex.i
deleted file mode 100644
index dacbea2b..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_complex.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  STD C++ complex typemaps
- */
-
-%include <rubycomplex.swg>
-
-%{
-#include <complex> 
-%}
-
-/* defining the complex as/from converters */
-
-%swig_cplxdbl_convn(std::complex<double>, std::complex<double>, std::real, std::imag)
-%swig_cplxflt_convn(std::complex<float>,  std::complex<float>,  std::real, std::imag)
-
-/* defining the typemaps */
-
-%typemaps_primitive(%checkcode(CPLXDBL), std::complex<double>);
-%typemaps_primitive(%checkcode(CPLXFLT), std::complex<float>);
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_container.i b/dependencies2013/win32/swig/Lib/ruby/std_container.i
deleted file mode 100644
index 85379505..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_container.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <rubycontainer.swg>
-%include <std/std_container.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_deque.i b/dependencies2013/win32/swig/Lib/ruby/std_deque.i
deleted file mode 100644
index 38048aff..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_deque.i
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Deques
-*/
-
-%fragment("StdDequeTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::deque<T> >  {
-      static int asptr(VALUE obj, std::deque<T>  **vec) {
-	return traits_asptr_stdseq<std::deque<T> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::deque<T> > {
-      static VALUE from(const std::deque<T> & vec) {
-	return traits_from_stdseq<std::deque<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-%ignore std::deque::push_back;
-%ignore std::deque::pop_back;
-
-#define %swig_deque_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_deque_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_except.i b/dependencies2013/win32/swig/Lib/ruby/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_functors.i b/dependencies2013/win32/swig/Lib/ruby/std_functors.i
deleted file mode 100644
index 54ee97b5..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_functors.i
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file   std_functors.i
- * @date   Sun May  6 00:44:33 2007
- * 
- * @brief  This file provides unary and binary functors for STL
- *         containers, that will invoke a Ruby proc or method to do
- *         their operation.
- *
- *         You can use them in a swig file like:
- *
- *         %include <std_set.i>
- *         %include <std_functors.i>
- *
- *         %template< IntSet > std::set< int, swig::BinaryPredicate<int> >;
- *
- *
- *         which will then allow calling them from Ruby either like:
- *  
- *            # order of set is defined by C++ default
- *            a = IntSet.new
- *
- *            # sort order defined by Ruby proc
- *            b = IntSet.new( proc { |a,b| a > b } )
- * 
- */
-
-%include <rubystdfunctors.swg>
-
-%fragment("StdFunctors");
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_ios.i b/dependencies2013/win32/swig/Lib/ruby/std_ios.i
deleted file mode 100644
index 7aafae28..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_ios.i
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#pragma SWIG nowarn=801
-
-%rename(ios_base_in) std::ios_base::in;
-
-AUTODOC(cerr, "Standard C++ error stream");
-AUTODOC(cout, "Standard C++ output stream");
-AUTODOC(cin,  "Standard C++ input stream");
-AUTODOC(clog, "Standard C++ logging stream");
-AUTODOC(endl,  "Add an end line to stream");
-AUTODOC(ends,  "Ends stream");
-AUTODOC(flush, "Flush stream");
-
-%include <std/std_ios.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_iostream.i b/dependencies2013/win32/swig/Lib/ruby/std_iostream.i
deleted file mode 100644
index ee36bec4..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_iostream.i
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace std
-{
-%callback("%s") endl;
-%callback("%s") ends;
-%callback("%s") flush;
-}
-
-%warnfilter(365) operator+=;
-%warnfilter(802) std::basic_iostream;  // turn off multiple inheritance warning
-
-%include <std/std_iostream.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_list.i b/dependencies2013/win32/swig/Lib/ruby/std_list.i
deleted file mode 100644
index 8d4284bb..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_list.i
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-  Lists
-*/
-
-%fragment("StdListTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T >
-    struct traits_asptr<std::list<T> >  {
-      static int asptr(VALUE obj, std::list<T> **lis) {
-	return traits_asptr_stdseq<std::list<T> >::asptr(obj, lis);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::list<T> > {
-      static VALUE from(const std::list<T> & vec) {
-	return traits_from_stdseq<std::list<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-%ignore std::list::push_back;
-%ignore std::list::pop_back;
-
-#define %swig_list_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_list_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-
-%rename("delete")     std::list::__delete__;
-%rename("reject!")    std::list::reject_bang;
-%rename("map!")       std::list::map_bang;
-%rename("empty?")     std::list::empty;
-%rename("include?" )  std::list::__contains__ const;
-%rename("has_key?" )  std::list::has_key const;
-
-%alias  std::list::push          "<<";
-
-%include <std/std_list.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_map.i b/dependencies2013/win32/swig/Lib/ruby/std_map.i
deleted file mode 100644
index 7077fa10..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_map.i
+++ /dev/null
@@ -1,424 +0,0 @@
-//
-//   Maps
-//
-%fragment("StdMapCommonTraits","header",fragment="StdSequenceTraits")
-{
-  namespace swig {
-    template <class ValueType>
-    struct from_key_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef  VALUE result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.first);
-      }
-    };
-
-    template <class ValueType>
-    struct from_value_oper 
-    {
-      typedef const ValueType& argument_type;
-      typedef  VALUE result_type;
-      result_type operator()(argument_type v) const
-      {
-	return swig::from(v.second);
-      }
-    };
-
-    template<class OutIterator, class FromOper, 
-	     class ValueType = typename OutIterator::value_type>
-    struct MapIterator_T : ConstIteratorClosed_T<OutIterator, ValueType, FromOper>
-    {
-      MapIterator_T(OutIterator curr, OutIterator first, OutIterator last, VALUE seq)
-	: ConstIteratorClosed_T<OutIterator,ValueType,FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-
-    template<class OutIterator,
-	     class FromOper = from_key_oper<typename OutIterator::value_type> >
-    struct MapKeyIterator_T : MapIterator_T<OutIterator, FromOper>
-    {
-      MapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, VALUE seq)
-	: MapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-
-    template<typename OutIter>
-    inline ConstIterator*
-    make_output_key_iterator(const OutIter& current, const OutIter& begin, 
-			     const OutIter& end, VALUE seq = 0)
-    {
-      return new MapKeyIterator_T<OutIter>(current, begin, end, seq);
-    }
-
-    template<class OutIterator,
-	     class FromOper = from_value_oper<typename OutIterator::value_type> >
-    struct MapValueIterator_T : MapIterator_T<OutIterator, FromOper>
-    {
-      MapValueIterator_T(OutIterator curr, OutIterator first, OutIterator last, VALUE seq)
-	: MapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
-      {
-      }
-    };
-    
-
-    template<typename OutIter>
-    inline ConstIterator*
-    make_output_value_iterator(const OutIter& current, const OutIter& begin, 
-			       const OutIter& end, VALUE seq = 0)
-    {
-      return new MapValueIterator_T<OutIter>(current, begin, end, seq);
-    }
-  }
-}
-
-%fragment("StdMapTraits","header",fragment="StdMapCommonTraits")
-{
-  namespace swig {
-    template <class RubySeq, class K, class T >
-    inline void
-    assign(const RubySeq& rubyseq, std::map<K,T > *map) {
-      typedef typename std::map<K,T>::value_type value_type;
-      typename RubySeq::const_iterator it = rubyseq.begin();
-      for (;it != rubyseq.end(); ++it) {
-	map->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T>
-    struct traits_asptr<std::map<K,T> >  {
-      typedef std::map<K,T> map_type;
-      static int asptr(VALUE obj, map_type **val) {
-	int res = SWIG_ERROR;
-	if ( TYPE(obj) == T_HASH ) {
-	  static ID id_to_a = rb_intern("to_a");
-	  VALUE items = rb_funcall(obj, id_to_a, 0);
-	  res = traits_asptr_stdseq<std::map<K,T>, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  map_type *p;
-	  swig_type_info *descriptor = swig::type_info<map_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-      
-    template <class K, class T >
-    struct traits_from<std::map<K,T> >  {
-      typedef std::map<K,T> map_type;
-      typedef typename map_type::const_iterator const_iterator;
-      typedef typename map_type::size_type size_type;
-            
-      static VALUE from(const map_type& map) {
-	swig_type_info *desc = swig::type_info<map_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_NewPointerObj(new map_type(map), desc, SWIG_POINTER_OWN);
-	} else {
-	  size_type size = map.size();
-	  int rubysize = (size <= (size_type) INT_MAX) ? (int) size : -1;
-	  if (rubysize < 0) {
-	    SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	    rb_raise( rb_eRuntimeError, "map size not valid in Ruby");
-	    SWIG_RUBY_THREAD_END_BLOCK;
-	    return Qnil;
-	  }
-	  VALUE obj = rb_hash_new();
-	  for (const_iterator i= map.begin(); i!= map.end(); ++i) {
-	    VALUE key = swig::from(i->first);
-	    VALUE val = swig::from(i->second);
-	    rb_hash_aset(obj, key, val);
-	  }
-	  return obj;
-	}
-      }
-    };
-  }
-}
-
-%define %swig_map_common(Map...)
-  %swig_container_methods(%arg(Map));
-  // %swig_sequence_iterator(%arg(Map));
-
-  %extend {
-    
-    VALUE __delete__(const key_type& key) {
-      Map::iterator i = self->find(key);
-      if (i != self->end()) {
-	self->erase(i);
-	return swig::from( key );
-      }
-      else {
-	return Qnil;
-      }
-    }
-    
-    bool has_key(const key_type& key) const {
-      Map::const_iterator i = self->find(key);
-      return i != self->end();
-    }
-    
-    VALUE keys() {
-      Map::size_type size = self->size();
-      int rubysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1;
-      if (rubysize < 0) {
-	SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	rb_raise(rb_eRuntimeError, "map size not valid in Ruby");
-	SWIG_RUBY_THREAD_END_BLOCK;
-	return Qnil;
-      }
-      VALUE ary = rb_ary_new2(rubysize);
-      Map::const_iterator i = self->begin();
-      Map::const_iterator e = self->end();
-      for ( ; i != e; ++i ) {
-	rb_ary_push( ary, swig::from(i->first) );
-      }
-      return ary;
-    }
-
-    Map* each()
-      {
-	if ( !rb_block_given_p() )
-	  rb_raise( rb_eArgError, "no block given");
-
-	VALUE k, v;
-	Map::iterator i = self->begin();
-	Map::iterator e = self->end();
-	for ( ; i != e; ++i )
-	  {
-	    const Map::key_type&    key = i->first;
-	    const Map::mapped_type& val = i->second;
-
-	    k = swig::from<Map::key_type>(key);
-	    v = swig::from<Map::mapped_type>(val);
-	    rb_yield_values(2, k, v);
-	  }
-	
-	return self;
-      }
-
-    %newobject select;
-    Map* select() {
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      Map* r = new Map;
-      Map::iterator i = $self->begin();
-      Map::iterator e = $self->end();
-      for ( ; i != e; ++i )
-	{
-	  VALUE k = swig::from<Map::key_type>(i->first);
-	  VALUE v = swig::from<Map::mapped_type>(i->second);
-	  if ( RTEST( rb_yield_values(2, k, v) ) )
-	    $self->insert(r->end(), *i);
-	}
-	
-      return r;
-    }
-
-  %typemap(in) (int argc, VALUE* argv) {
-    $1 = argc;
-    $2 = argv;
-  }
-
-  VALUE values_at(int argc, VALUE* argv, ...) {
-    
-    VALUE r = rb_ary_new();
-    ID   id = rb_intern("[]");
-    swig_type_info* type = swig::type_info< Map >();
-    VALUE me = SWIG_NewPointerObj( $self, type, 0 );
-    for ( int i = 0; i < argc; ++i )
-      {
-	VALUE key = argv[i];
-	VALUE tmp = rb_funcall( me, id, 1, key );
-	rb_ary_push( r, tmp );
-      }
-    
-    return r;
-  }
-
-
-    Map* each_key()
-      {
-	if ( !rb_block_given_p() )
-	  rb_raise( rb_eArgError, "no block given");
-
-	VALUE r;
-	Map::iterator i = self->begin();
-	Map::iterator e = self->end();
-	for ( ; i != e; ++i )
-	  {
-	    r = swig::from( i->first );
-	    rb_yield(r);
-	  }
-	
-	return self;
-      }
-    
-    VALUE values() {
-      Map::size_type size = self->size();
-      int rubysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1;
-      if (rubysize < 0) {
-	SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	rb_raise(rb_eRuntimeError, "map size not valid in Ruby");
-	SWIG_RUBY_THREAD_END_BLOCK;
-	return Qnil;
-      }
-      VALUE ary = rb_ary_new2(rubysize);
-      Map::const_iterator i = self->begin();
-      Map::const_iterator e = self->end();
-      for ( ; i != e; ++i ) {
-	rb_ary_push( ary, swig::from(i->second) );
-      }
-      return ary;
-    }
-    
-    Map* each_value()
-      {
-	if ( !rb_block_given_p() )
-	  rb_raise( rb_eArgError, "no block given");
-
-	VALUE r;
-	Map::iterator i = self->begin();
-	Map::iterator e = self->end();
-	for ( ; i != e; ++i )
-	  {
-	    r = swig::from( i->second );
-	    rb_yield(r);
-	  }
-	
-	return self;
-      }
-
-    VALUE entries() {
-      Map::size_type size = self->size();
-      int rubysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1;
-      if (rubysize < 0) {
-	SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	rb_raise(rb_eRuntimeError, "map size not valid in Ruby");
-	SWIG_RUBY_THREAD_END_BLOCK;
-	return Qnil;
-      }
-      VALUE ary = rb_ary_new2(rubysize);
-      Map::const_iterator i = self->begin();
-      Map::const_iterator e = self->end();
-      for ( ; i != e; ++i ) {
-	rb_ary_push( ary, swig::from<std::pair<Map::key_type, 
-		     Map::mapped_type> >(*i) );
-      }
-      return ary;
-    }
-    
-    bool __contains__(const key_type& key) {
-      return self->find(key) != self->end();
-    }
-
-    %newobject key_iterator(VALUE *RUBY_SELF);
-    swig::ConstIterator* key_iterator(VALUE *RUBY_SELF) {
-      return swig::make_output_key_iterator($self->begin(), $self->begin(), 
-					    $self->end(), *RUBY_SELF);
-    }
-
-    %newobject value_iterator(VALUE *RUBY_SELF);
-    swig::ConstIterator* value_iterator(VALUE *RUBY_SELF) {
-      return swig::make_output_value_iterator($self->begin(), $self->begin(), 
-					      $self->end(), *RUBY_SELF);
-    }
-
-  }
-%enddef
-
-%define %swig_map_methods(Map...)
-  %swig_map_common(Map)
-  %extend {
-    VALUE __getitem__(const key_type& key) const {
-      Map::const_iterator i = self->find(key);
-      if ( i != self->end() )
-	return swig::from<Map::mapped_type>( i->second );
-      else
-	return Qnil;
-    }
-
-    void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
-      (*self)[key] = x;
-    }
-
-  VALUE inspect()
-    {
-      Map::const_iterator i = $self->begin();
-      Map::const_iterator e = $self->end();
-      const char *type_name = swig::type_name< Map >();
-      VALUE str = rb_str_new2( type_name );
-      str = rb_str_cat2( str, " {" );
-      bool comma = false;
-      VALUE tmp;
-      for ( ; i != e; ++i, comma = true )
-	{
-	  if (comma) str = rb_str_cat2( str, "," );
-	  tmp = swig::from< Map::key_type >( i->first );
-	  tmp = rb_inspect( tmp );
-	  str = rb_str_buf_append( str, tmp );
-	  str = rb_str_cat2( str, "=>" );
-	  tmp = swig::from< Map::mapped_type >( i->second );
-	  tmp = rb_inspect( tmp );
-	  str = rb_str_buf_append( str, tmp );
-	}
-      str = rb_str_cat2( str, "}" );
-      return str;
-    }
-
-  VALUE to_a()
-    {
-      Map::const_iterator i = $self->begin();
-      Map::const_iterator e = $self->end();
-      VALUE ary = rb_ary_new2( std::distance( i, e ) );
-      VALUE tmp;
-      for ( ; i != e; ++i )
-	{
-	  // @todo: improve -- this should just be swig::from(*i)
-	  tmp = swig::from< std::pair<Map::key_type, 
-	    Map::mapped_type> >( *i );
-	  rb_ary_push( ary, tmp );
-	}
-      return ary;
-    }
-
-  VALUE to_s()
-    {
-      Map::iterator i = $self->begin();
-      Map::iterator e = $self->end();
-      VALUE str = rb_str_new2( "" );
-      VALUE tmp;
-      for ( ; i != e; ++i )
-	{
-	  // @todo: improve -- this should just be swig::from(*i)
-	  tmp = swig::from< std::pair<Map::key_type, 
-	    Map::mapped_type> >( *i );
-	  tmp = rb_obj_as_string( tmp );
-	  str = rb_str_buf_append( str, tmp );
-	}
-      return str;
-    }
-
-  }
-%enddef
-
-
-%mixin std::map "Enumerable";
-
-
-%rename("delete")     std::map::__delete__;
-%rename("reject!")    std::map::reject_bang;
-%rename("map!")       std::map::map_bang;
-%rename("empty?")     std::map::empty;
-%rename("include?" )  std::map::__contains__ const;
-%rename("has_key?" )  std::map::has_key const;
-
-%alias  std::map::push          "<<";
-
-
-%include <std/std_map.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_multimap.i b/dependencies2013/win32/swig/Lib/ruby/std_multimap.i
deleted file mode 100644
index 3e06ee12..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_multimap.i
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-  Multimaps
-*/
-%include <std_map.i>
-
-%fragment("StdMultimapTraits","header",fragment="StdMapCommonTraits")
-{
-  namespace swig {
-    template <class RubySeq, class K, class T >
-    inline void 
-    assign(const RubySeq& rubyseq, std::multimap<K,T > *multimap) {
-      typedef typename std::multimap<K,T>::value_type value_type;
-      typename RubySeq::const_iterator it = rubyseq.begin();
-      for (;it != rubyseq.end(); ++it) {
-	multimap->insert(value_type(it->first, it->second));
-      }
-    }
-
-    template <class K, class T>
-    struct traits_asptr<std::multimap<K,T> >  {
-      typedef std::multimap<K,T> multimap_type;
-      static int asptr(VALUE obj, std::multimap<K,T> **val) {
-	int res = SWIG_ERROR;
-	if ( TYPE(obj) == T_HASH ) {
-	  static ID id_to_a = rb_intern("to_a");
-	  VALUE items = rb_funcall(obj, id_to_a, 0);
-	  return traits_asptr_stdseq<std::multimap<K,T>, std::pair<K, T> >::asptr(items, val);
-	} else {
-	  multimap_type *p;
-	  res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<multimap_type>(),0);
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-      
-    template <class K, class T >
-    struct traits_from<std::multimap<K,T> >  {
-      typedef std::multimap<K,T> multimap_type;
-      typedef typename multimap_type::const_iterator const_iterator;
-      typedef typename multimap_type::size_type size_type;
-            
-      static VALUE from(const multimap_type& multimap) {
-	swig_type_info *desc = swig::type_info<multimap_type>();
-	if (desc && desc->clientdata) {
-	  return SWIG_NewPointerObj(new multimap_type(multimap), desc, SWIG_POINTER_OWN);
-	} else {
-	  size_type size = multimap.size();
-	  int rubysize = (size <= (size_type) INT_MAX) ? (int) size : -1;
-	  if (rubysize < 0) {
-	    SWIG_RUBY_THREAD_BEGIN_BLOCK;
-	    rb_raise(rb_eRuntimeError,
-		     "multimap size not valid in Ruby");
-	    SWIG_RUBY_THREAD_END_BLOCK;
-	    return Qnil;
-	  }
-	  VALUE obj = rb_hash_new();
-	  for (const_iterator i= multimap.begin(); i!= multimap.end(); ++i) {
-	    VALUE key = swig::from(i->first);
-	    VALUE val = swig::from(i->second);
-
-	    VALUE oldval = rb_hash_aref( obj, key );
-	    if ( oldval == Qnil )
-	      rb_hash_aset(obj, key, val);
-	    else {
-	      // Multiple values for this key, create array if needed
-	      // and add a new element to it.
-	      VALUE ary;
-	      if ( TYPE(oldval) == T_ARRAY )
-		ary = oldval;
-	      else
-		{
-		  ary = rb_ary_new2(2);
-		  rb_ary_push( ary, oldval );
-		  rb_hash_aset( obj, key, ary );
-		}
-	      rb_ary_push( ary, val );
-	    }
-	    
-	  }
-	  return obj;
-	}
-      }
-    };
-  }
-}
-
-%define %swig_multimap_methods(MultiMap...) 
-  %swig_map_common(%arg(MultiMap));
-
-  %extend {
-    VALUE __getitem__(const key_type& key) const {
-      MultiMap::const_iterator i = self->find(key);
-      if ( i != self->end() )
-	{
-	  MultiMap::const_iterator e = $self->upper_bound(key);
-	  VALUE ary = rb_ary_new();
-	  for ( ; i != e; ++i )
-	    {
-	      rb_ary_push( ary, swig::from<MultiMap::mapped_type>( i->second ) );
-	    }
-	  if ( RARRAY_LEN(ary) == 1 )
-	    return RARRAY_PTR(ary)[0];
-	  return ary;
-	}
-      else
-	return Qnil;
-    }
-
-    void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
-      self->insert(MultiMap::value_type(key,x));
-    }
-
-  VALUE inspect()
-    {
-      MultiMap::iterator i = $self->begin();
-      MultiMap::iterator e = $self->end();
-      const char *type_name = swig::type_name< MultiMap >();
-      VALUE str = rb_str_new2( type_name );
-      str = rb_str_cat2( str, " {" );
-      VALUE tmp;
-      while ( i != e )
-	{
-	  const MultiMap::key_type& key    = i->first;
-	  const MultiMap::key_type& oldkey = key;
-	  tmp = swig::from( key );
-	  str = rb_str_buf_append( str, rb_inspect(tmp) );
-	  str = rb_str_cat2( str, "=>" );
-
-	  VALUE vals = rb_ary_new();
-	  for ( ; i != e && key == oldkey; ++i )
-	    {
-	      const MultiMap::mapped_type& val = i->second;
-	      tmp = swig::from( val );
-	      rb_ary_push( vals, tmp );
-	    }
-
-	  if ( RARRAY_LEN(vals) == 1 )
-	    {
-	      str = rb_str_buf_append( str, rb_inspect(tmp) );
-	    }
-	  else
-	    {
-	      str = rb_str_buf_append( str, rb_inspect(vals) );
-	    }
-	}
-      str = rb_str_cat2( str, "}" );
-      return str;
-    }
-
-  VALUE to_a()
-    {
-      MultiMap::const_iterator i = $self->begin();
-      MultiMap::const_iterator e = $self->end();
-      VALUE ary = rb_ary_new2( std::distance( i, e ) );
-      VALUE tmp;
-      while ( i != e )
-	{
-	  const MultiMap::key_type& key    = i->first;
-	  const MultiMap::key_type& oldkey = key;
-	  tmp = swig::from( key );
-	  rb_ary_push( ary, tmp );
-
-	  VALUE vals = rb_ary_new();
-	  for ( ; i != e && key == oldkey; ++i )
-	    {
-	      const MultiMap::mapped_type& val = i->second;
-	      tmp = swig::from( val );
-	      rb_ary_push( vals, tmp );
-	    }
-
-	  if ( RARRAY_LEN(vals) == 1 )
-	    {
-	      rb_ary_push( ary, tmp );
-	    }
-	  else
-	    {
-	      rb_ary_push( ary, vals );
-	    }
-	}
-      return ary;
-    }
-
-  VALUE to_s()
-    {
-      MultiMap::iterator i = $self->begin();
-      MultiMap::iterator e = $self->end();
-      VALUE str = rb_str_new2( "" );
-      VALUE tmp;
-      while ( i != e )
-	{
-	  const MultiMap::key_type& key    = i->first;
-	  const MultiMap::key_type& oldkey = key;
-	  tmp = swig::from( key );
-	  tmp = rb_obj_as_string( tmp );
-	  str = rb_str_buf_append( str, tmp );
-
-	  VALUE vals = rb_ary_new();
-	  for ( ; i != e && key == oldkey; ++i )
-	    {
-	      const MultiMap::mapped_type& val = i->second;
-	      tmp = swig::from( val );
-	      rb_ary_push( vals, tmp );
-	    }
-
-	  tmp = rb_obj_as_string( vals );
-	  str = rb_str_buf_append( str, tmp );
-	}
-      return str;
-    }
-  }
-%enddef
-
-
-%mixin std::multimap "Enumerable";
-
-%rename("delete")     std::multimap::__delete__;
-%rename("reject!")    std::multimap::reject_bang;
-%rename("map!")       std::multimap::map_bang;
-%rename("empty?")     std::multimap::empty;
-%rename("include?" )  std::multimap::__contains__ const;
-%rename("has_key?" )  std::multimap::has_key const;
-
-%alias  std::multimap::push          "<<";
-
-%include <std/std_multimap.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_multiset.i b/dependencies2013/win32/swig/Lib/ruby/std_multiset.i
deleted file mode 100644
index 87a7b292..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_multiset.i
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Multisets
-*/
-
-%include <std_set.i>
-
-%fragment("StdMultisetTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class RubySeq, class T> 
-    inline void
-    assign(const RubySeq& rubyseq, std::multiset<T>* seq) {
-      // seq->insert(rubyseq.begin(), rubyseq.end()); // not used as not always implemented
-      typedef typename RubySeq::value_type value_type;
-      typename RubySeq::const_iterator it = rubyseq.begin();
-      for (;it != rubyseq.end(); ++it) {
-	seq->insert(seq->end(),(value_type)(*it));
-      }
-    }
-
-    template <class T>
-    struct traits_asptr<std::multiset<T> >  {
-      static int asptr(VALUE obj, std::multiset<T> **m) {
-	return traits_asptr_stdseq<std::multiset<T> >::asptr(obj, m);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::multiset<T> > {
-      static VALUE from(const std::multiset<T>& vec) {
-	return traits_from_stdseq<std::multiset<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-#define %swig_multiset_methods(Set...) %swig_set_methods(Set)
-
-
-
-%rename("delete")     std::multiset::__delete__;
-%rename("reject!")    std::multiset::reject_bang;
-%rename("map!")       std::multiset::map_bang;
-%rename("empty?")     std::multiset::empty;
-%rename("include?" )  std::multiset::__contains__ const;
-%rename("has_key?" )  std::multiset::has_key const;
-
-%alias  std::multiset::push          "<<";
-
-%include <std/std_multiset.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_pair.i b/dependencies2013/win32/swig/Lib/ruby/std_pair.i
deleted file mode 100644
index 38a4ffb9..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_pair.i
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-  Pairs
-*/
-%include <rubystdcommon.swg>
-
-//#define SWIG_STD_PAIR_ASVAL
-
-%fragment("StdPairTraits","header",fragment="StdTraits") {
-  namespace swig {
-
-    template <class T, class U >
-    struct traits_asval<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(VALUE first, VALUE second,
-			  std::pair<T,U> *val)
-      {
-	if (val) {
-	  T *pfirst = &(val->first);
-	  int res1 = swig::asval((VALUE)first, pfirst);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = &(val->second);
-	  int res2 = swig::asval((VALUE)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval((VALUE)first, pfirst);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval((VALUE)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-      }
-
-      static int asval(VALUE obj, std::pair<T,U> *val) {
-	int res = SWIG_ERROR;
-	if ( TYPE(obj) == T_ARRAY ) {
-	  if (RARRAY_LEN(obj) == 2) {
-	    VALUE first = rb_ary_entry(obj,0);
-	    VALUE second = rb_ary_entry(obj,1);
-	    res = get_pair(first, second, val);
-	  }
-	} else {
-	  value_type *p;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = *p;
-	}
-	return res;
-      }
-    };
-
-    template <class T, class U >
-    struct traits_asptr<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(VALUE first, VALUE second,
-			  std::pair<T,U> **val) 
-      {
-	if (val) {
-	  value_type *vp = %new_instance(std::pair<T,U>);
-	  T *pfirst = &(vp->first);
-	  int res1 = swig::asval((VALUE)first, pfirst);
-	  if (!SWIG_IsOK(res1)) {
-	    %delete(vp);
-	    return res1;
-	  }
-	  U *psecond = &(vp->second);
-	  int res2 = swig::asval((VALUE)second, psecond);
-	  if (!SWIG_IsOK(res2)) {
-	    %delete(vp);
-	    return res2;
-	  }
-	  *val = vp;
-	  return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval((VALUE)first, pfirst);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval((VALUE)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-      }
-
-      static int asptr(VALUE obj, std::pair<T,U> **val) {
-	int res = SWIG_ERROR;
-	if ( TYPE(obj) == T_ARRAY ) {
-	  if ( RARRAY_LEN(obj) == 2) {
-	    VALUE first = rb_ary_entry(obj,0);
-	    VALUE second = rb_ary_entry(obj,1);
-	    res = get_pair(first, second, val);
-	  }
-	} else {
-	  value_type *p;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-
-
-
-    template <class T, class U >
-    struct traits_from<std::pair<T,U> >   {
-      static VALUE _wrap_pair_second( VALUE self )
-      {
-	std::pair< typename swig::noconst_traits<T >::noconst_type,U>* p = NULL;
-	swig::asptr( self, &p );
-	return swig::from( p->second );
-      }
-
-      static VALUE _wrap_pair_second_eq( VALUE self, VALUE arg )
-      {
-	std::pair< typename swig::noconst_traits<T >::noconst_type,U>* p = NULL;
-	swig::asptr( self, &p );
-	return swig::from( p->second );
-      }
-
-      static VALUE from(const std::pair<T,U>& val) {
-	VALUE obj = rb_ary_new2(2);
-	rb_ary_push(obj, swig::from<typename swig::noconst_traits<T >::noconst_type>(val.first));
-	rb_ary_push(obj, swig::from(val.second));
-	rb_define_singleton_method(obj, "second",
-				   VALUEFUNC(_wrap_pair_second), 0 );
-	rb_define_singleton_method(obj, "second=",
-				   VALUEFUNC(_wrap_pair_second_eq), 1 );
-	rb_obj_freeze(obj); // treat as immutable tuple
-	return obj;
-      }
-    };
-
-  }
-}
-
-// Missing typemap
-%typemap(in) std::pair* (int res) {
-  res = swig::asptr( $input, &$1 );
-  if (!SWIG_IsOK(res))
-    %argument_fail(res, "$1_type", $symname, $argnum); 
-}
-
-
-%define %swig_pair_methods(pair...)
-
-%extend { 
-  VALUE inspect() const
-    {
-      VALUE tmp;
-      const char *type_name = swig::type_name< pair >();
-      VALUE str = rb_str_new2( type_name );
-      str = rb_str_cat2( str, " (" );
-      tmp = swig::from( $self->first );
-      tmp = rb_obj_as_string( tmp );
-      str = rb_str_buf_append( str, tmp );
-      str = rb_str_cat2( str, "," );
-      tmp = swig::from( $self->second );
-      tmp = rb_obj_as_string( tmp );
-      str = rb_str_buf_append( str, tmp );
-      str = rb_str_cat2( str, ")" );
-      return str;
-    }
-
-  VALUE to_s() const
-    {
-      VALUE tmp;
-      VALUE str = rb_str_new2( "(" );
-      tmp = swig::from( $self->first );
-      tmp = rb_obj_as_string( tmp );
-      str = rb_str_buf_append( str, tmp );
-      str = rb_str_cat2( str, "," );
-      tmp = swig::from( $self->second );
-      tmp = rb_obj_as_string( tmp );
-      str = rb_str_buf_append( str, tmp );
-      str = rb_str_cat2( str, ")" );
-      return str;
-    }
-
-  VALUE __getitem__( int index )
-    { 
-      if (( index % 2 ) == 0 )
-	return swig::from( $self->first );
-      else
-	return swig::from( $self->second );
-    }
-
-  VALUE __setitem__( int index, VALUE obj )
-    { 
-      int res;
-      if (( index % 2 ) == 0 )
-	{
-	  res = swig::asval( obj, &($self->first) );
-	}
-      else
-	{
-	  res = swig::asval(obj, &($self->second) );
-	}
-      if (!SWIG_IsOK(res))
-	rb_raise( rb_eArgError, "invalid item for " #pair );
-      return obj;
-    }
-
-  } // extend
-
-%enddef
-
-%include <std/std_pair.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_queue.i b/dependencies2013/win32/swig/Lib/ruby/std_queue.i
deleted file mode 100644
index a1293677..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_queue.i
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Queues
-*/
-
-%fragment("StdQueueTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::queue<T> >  {
-      static int asptr(VALUE obj, std::queue<T>  **vec) {
-	return traits_asptr_stdseq<std::queue<T> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::queue<T> > {
-      static VALUE from(const std::queue<T> & vec) {
-	return traits_from_stdseq<std::queue<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-%rename("delete")     std::queue::__delete__;
-%rename("reject!")    std::queue::reject_bang;
-%rename("map!")       std::queue::map_bang;
-%rename("empty?")     std::queue::empty;
-%rename("include?" )  std::queue::__contains__ const;
-%rename("has_key?" )  std::queue::has_key const;
-
-%alias  std::queue::push          "<<";
-
-%include <std/std_queue.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_set.i b/dependencies2013/win32/swig/Lib/ruby/std_set.i
deleted file mode 100644
index e38702ef..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_set.i
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-  Sets
-*/
-
-%fragment("StdSetTraits","header",fragment="<stddef.h>",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class RubySeq, class T> 
-    inline void 
-    assign(const RubySeq& rubyseq, std::set<T>* seq) {
-      // seq->insert(rubyseq.begin(), rubyseq.end()); // not used as not always implemented
-      typedef typename RubySeq::value_type value_type;
-      typename RubySeq::const_iterator it = rubyseq.begin();
-      for (;it != rubyseq.end(); ++it) {
-	seq->insert(seq->end(),(value_type)(*it));
-      }
-    }
-
-    template <class T>
-    struct traits_asptr<std::set<T> >  {
-      static int asptr(VALUE obj, std::set<T> **s) {  
-	return traits_asptr_stdseq<std::set<T> >::asptr(obj, s);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::set<T> > {
-      static VALUE from(const std::set<T>& vec) {
-	return traits_from_stdseq<std::set<T> >::from(vec);
-      }
-    };
-
-
-    /** 
-     * Set Iterator class for an iterator with no end() boundaries.
-     *
-     */
-    template<typename InOutIterator, 
-	     typename ValueType = typename std::iterator_traits<InOutIterator>::value_type,
-	     typename FromOper = from_oper<ValueType>,
-	     typename AsvalOper = asval_oper<ValueType> >
-      class SetIteratorOpen_T :  public Iterator_T<InOutIterator>
-    {
-    public:
-      FromOper  from;
-      AsvalOper asval;
-      typedef InOutIterator nonconst_iter;
-      typedef ValueType value_type;
-      typedef Iterator_T<nonconst_iter>  base;
-      typedef SetIteratorOpen_T<InOutIterator, ValueType, FromOper, AsvalOper> self_type;
-
-    public:
-      SetIteratorOpen_T(nonconst_iter curr, VALUE seq = Qnil)
-	: Iterator_T<InOutIterator>(curr, seq)
-      {
-      }
-    
-      virtual VALUE value() const {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-
-      // no setValue allowed
-    
-      Iterator *dup() const
-      {
-	return new self_type(*this);
-      }
-    };
-
-
-    /** 
-     * Set Iterator class for a iterator where begin() and end() boundaries
-       are known.
-     *
-     */
-    template<typename InOutIterator, 
-	     typename ValueType = typename std::iterator_traits<InOutIterator>::value_type,
-	     typename FromOper = from_oper<ValueType>,
-	     typename AsvalOper = asval_oper<ValueType> >
-    class SetIteratorClosed_T :  public Iterator_T<InOutIterator>
-    {
-    public:
-      FromOper   from;
-      AsvalOper asval;
-      typedef InOutIterator nonconst_iter;
-      typedef ValueType value_type;
-      typedef Iterator_T<nonconst_iter>  base;
-      typedef SetIteratorClosed_T<InOutIterator, ValueType, FromOper, AsvalOper> self_type;
-    
-    protected:
-      virtual Iterator* advance(ptrdiff_t n)
-      {
-	std::advance( base::current, n );
-	if ( base::current == end )
-	  throw stop_iteration();
-	return this;
-      }
-
-    public:
-      SetIteratorClosed_T(nonconst_iter curr, nonconst_iter first, 
-		       nonconst_iter last, VALUE seq = Qnil)
-	: Iterator_T<InOutIterator>(curr, seq), begin(first), end(last)
-      {
-      }
-    
-      virtual VALUE value() const {
-	if (base::current == end) {
-	  throw stop_iteration();
-	} else {
-	  return from(static_cast<const value_type&>(*(base::current)));
-	}
-      }
-
-      // no setValue allowed
-    
-    
-      Iterator *dup() const
-      {
-	return new self_type(*this);
-      }
-
-    private:
-      nonconst_iter begin;
-      nonconst_iter end;
-    };
-
-    // Template specialization to construct a closed iterator for sets
-    // this turns a nonconst iterator into a const one for ruby to avoid
-    // allowing the user to change the value
-    template< typename InOutIter >
-    inline Iterator*
-    make_set_nonconst_iterator(const InOutIter& current, 
-			       const InOutIter& begin,
-			       const InOutIter& end, 
-			       VALUE seq = Qnil)
-    {
-      return new SetIteratorClosed_T< InOutIter >(current, 
-						  begin, end, seq);
-    }
-
-    // Template specialization to construct an open iterator for sets
-    // this turns a nonconst iterator into a const one for ruby to avoid
-    // allowing the user to change the value
-    template< typename InOutIter >
-    inline Iterator*
-    make_set_nonconst_iterator(const InOutIter& current, 
-			       VALUE seq = Qnil)
-    {
-      return new SetIteratorOpen_T< InOutIter >(current, seq);
-    }
-
-  }
-%}
-
-%define %swig_sequence_methods_extra_set(Sequence...)
-  %extend {
-    %alias reject_bang "delete_if";
-    Sequence* reject_bang() {
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      for ( Sequence::iterator i = $self->begin(); i != $self->end(); ) {
-        VALUE r = swig::from< Sequence::value_type >(*i);
-        Sequence::iterator current = i++;
-        if ( RTEST( rb_yield(r) ) )
-          $self->erase(current);
-      }
-
-      return self;
-    }
-  }
-%enddef
-
-%define %swig_set_methods(set...)
-
-  %swig_sequence_methods_common(%arg(set));
-  %swig_sequence_methods_extra_set(%arg(set));
-
-  %fragment("RubyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="RubySequence_Cont") {}
-
-// Redefine std::set iterator/reverse_iterator typemap
-%typemap(out,noblock=1) iterator, reverse_iterator {
-  $result = SWIG_NewPointerObj(swig::make_set_nonconst_iterator(%static_cast($1,const $type &),
-								self),
-			          swig::Iterator::descriptor(),SWIG_POINTER_OWN);
- }
-
-// Redefine std::set std::pair<iterator, bool> typemap
-  %typemap(out,noblock=1,fragment="RubyPairBoolOutputIterator")
-  std::pair<iterator, bool> {
-    $result = rb_ary_new2(2);
-    rb_ary_push($result, SWIG_NewPointerObj(swig::make_set_nonconst_iterator(%static_cast($1,$type &).first),
-                                            swig::Iterator::descriptor(),SWIG_POINTER_OWN));
-    rb_ary_push($result, SWIG_From(bool)(%static_cast($1,const $type &).second));
-   }
-
-  %extend  {
-    %alias push "<<";
-    value_type push(const value_type& x) {
-      self->insert(x);
-      return x;
-    }
-  
-    bool __contains__(const value_type& x) {
-      return self->find(x) != self->end();
-    }
-
-    value_type __getitem__(difference_type i) const throw (std::out_of_range) {
-      return *(swig::cgetpos(self, i));
-    }
-
-  };
-%enddef
-
-
-%mixin std::set "Enumerable";
-
-
-
-%rename("delete")     std::set::__delete__;
-%rename("reject!")    std::set::reject_bang;
-%rename("map!")       std::set::map_bang;
-%rename("empty?")     std::set::empty;
-%rename("include?" )  std::set::__contains__ const;
-%rename("has_key?" )  std::set::has_key const;
-
-%alias  std::set::push          "<<";
-
-
-%include <std/std_set.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_shared_ptr.i b/dependencies2013/win32/swig/Lib/ruby/std_shared_ptr.i
deleted file mode 100644
index df873679..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_shared_ptr.i
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SWIG_SHARED_PTR_NAMESPACE std
-%include <boost_shared_ptr.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_sstream.i b/dependencies2013/win32/swig/Lib/ruby/std_sstream.i
deleted file mode 100644
index 537a3ae5..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_sstream.i
+++ /dev/null
@@ -1,2 +0,0 @@
-
-%include <std/std_sstream.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_stack.i b/dependencies2013/win32/swig/Lib/ruby/std_stack.i
deleted file mode 100644
index 600c81c9..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_stack.i
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-  Stacks
-*/
-
-%fragment("StdStackTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::stack<T> >  {
-      static int asptr(VALUE obj, std::stack<T>  **vec) {
-	return traits_asptr_stdseq<std::stack<T> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::stack<T> > {
-      static VALUE from(const std::stack<T> & vec) {
-	return traits_from_stdseq<std::stack<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-
-%rename("delete")     std::stack::__delete__;
-%rename("reject!")    std::stack::reject_bang;
-%rename("map!")       std::stack::map_bang;
-%rename("empty?")     std::stack::empty;
-%rename("include?" )  std::stack::__contains__ const;
-%rename("has_key?" )  std::stack::has_key const;
-
-%alias  std::stack::push          "<<";
-
-
-%include <std/std_stack.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_streambuf.i b/dependencies2013/win32/swig/Lib/ruby/std_streambuf.i
deleted file mode 100644
index 44b9bb4d..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_streambuf.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_streambuf.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_string.i b/dependencies2013/win32/swig/Lib/ruby/std_string.i
deleted file mode 100644
index cac4324f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_string.i
+++ /dev/null
@@ -1,9 +0,0 @@
-
-%warnfilter(801) std::string;  // wrong class name
-%warnfilter(378) std::basic_string::operator!=;
-
-
-AUTODOC(substr, "Return a portion of the String");
-
-%include <typemaps/std_string.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_vector.i b/dependencies2013/win32/swig/Lib/ruby/std_vector.i
deleted file mode 100644
index 67fdcd1f..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_vector.i
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Vectors
-*/
-
-%fragment("StdVectorTraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::vector<T> >  {
-      static int asptr(VALUE obj, std::vector<T> **vec) {
-	return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec);
-      }
-    };
-    
-    template <class T>
-    struct traits_from<std::vector<T> > {
-      static VALUE from(const std::vector<T>& vec) {
-	return traits_from_stdseq<std::vector<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-
-
-%define %swig_vector_methods(Type...) 
-  %swig_sequence_methods(Type)
-  %swig_sequence_front_inserters(Type);
-%enddef
-
-%define %swig_vector_methods_val(Type...) 
-  %swig_sequence_methods_val(Type);
-  %swig_sequence_front_inserters(Type);
-%enddef
-
-
-%mixin std::vector "Enumerable";
-%ignore std::vector::push_back;
-%ignore std::vector::pop_back;
-
-
-%rename("delete")     std::vector::__delete__;
-%rename("reject!")    std::vector::reject_bang;
-%rename("map!")       std::vector::map_bang;
-%rename("empty?")     std::vector::empty;
-%rename("include?" )  std::vector::__contains__ const;
-%rename("has_key?" )  std::vector::has_key const;
-
-%alias  std::vector::push          "<<";
-
-%include <std/std_vector.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_vectora.i b/dependencies2013/win32/swig/Lib/ruby/std_vectora.i
deleted file mode 100644
index 1708361e..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_vectora.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Vectors + allocators
-*/
-
-%fragment("StdVectorATraits","header",fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T, class A>
-      struct traits_asptr<std::vector<T,A> >  {
-      typedef std::vector<T,A> vector_type;
-      typedef T value_type;
-      static int asptr(VALUE obj, vector_type **vec) {
-	return traits_asptr_stdseq<vector_type>::asptr(obj, vec);
-      }
-    };
-
-    template <class T, class A>
-    struct traits_from<std::vector<T,A> > {
-      typedef std::vector<T,A> vector_type;
-      static VALUE from(const vector_type& vec) {
-	return traits_from_stdseq<vector_type>::from(vec);
-      }
-    };
-  }
-%}
-
-
-#define %swig_vector_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_vector_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%mixin std::vector "Enumerable";
-%ignore std::vector::push_back;
-%ignore std::vector::pop_back;
-%alias  std::vector::push "<<";
-
-%include <std/std_vectora.i>
diff --git a/dependencies2013/win32/swig/Lib/ruby/std_wstring.i b/dependencies2013/win32/swig/Lib/ruby/std_wstring.i
deleted file mode 100644
index 5ca77c0c..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/std_wstring.i
+++ /dev/null
@@ -1,3 +0,0 @@
-%include <rubywstrings.swg>
-%include <typemaps/std_wstring.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/stl.i b/dependencies2013/win32/swig/Lib/ruby/stl.i
deleted file mode 100644
index 9d2e91ee..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/stl.i
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- *
- * Initial STL definition. extended as needed in each language
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/ruby/timeval.i b/dependencies2013/win32/swig/Lib/ruby/timeval.i
deleted file mode 100644
index e7bc2d32..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/timeval.i
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-  struct timeval *
-  time_t
-
-  Ruby has builtin class Time.  INPUT/OUTPUT typemap for timeval and
-  time_t is provided.
-
-*/
-%{
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-struct timeval rb_time_timeval(VALUE);
-#endif
-#ifdef __cplusplus
-}
-#endif
-%}
-
-%typemap(in) struct timeval *INPUT (struct timeval temp)
-{
-    if (NIL_P($input))
-	$1 = NULL;
-    else {
-	temp = rb_time_timeval($input);
-	$1 = &temp;
-    }
-}
-
-%typemap(in,numinputs=0) struct timeval *OUTPUT(struct timeval temp)
-{
-    $1 = &temp;
-}
-
-%typemap(argout) struct timeval *OUTPUT
-{
-    $result = rb_time_new($1->tv_sec, $1->tv_usec);
-}
-
-%typemap(out) struct timeval *
-{
-    $result = rb_time_new($1->tv_sec, $1->tv_usec);
-}
-
-%typemap(out) struct timespec *
-{
-    $result = rb_time_new($1->tv_sec, $1->tv_nsec / 1000);
-}
-
-// time_t
-%typemap(in) time_t
-{
-    if (NIL_P($input))
-	$1 = (time_t)-1;
-    else
-	$1 = NUM2LONG(rb_funcall($input, rb_intern("tv_sec"), 0));
-}
-
-%typemap(typecheck) time_t
-{
-  $1 = (NIL_P($input) || TYPE(rb_funcall($input, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("tv_sec")))) == T_TRUE);
-}
-
-%typemap(out) time_t
-{
-    $result = rb_time_new($1, 0);
-}
diff --git a/dependencies2013/win32/swig/Lib/ruby/typemaps.i b/dependencies2013/win32/swig/Lib/ruby/typemaps.i
deleted file mode 100644
index c4db8216..00000000
--- a/dependencies2013/win32/swig/Lib/ruby/typemaps.i
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * Pointer handling
- *
- * These mappings provide support for input/output arguments and
- * common uses for C/C++ pointers.  INOUT mappings allow for C/C++
- * pointer variables in addition to input/output arguments.
- * ----------------------------------------------------------------------------- */
-
-#if !defined(SWIG_USE_OLD_TYPEMAPS)
-%include <typemaps/typemaps.swg>
-#else
-
-/*
-The SWIG typemap library provides a language independent mechanism for
-supporting output arguments, input values, and other C function
-calling mechanisms.  The primary use of the library is to provide a
-better interface to certain C function--especially those involving
-pointers.
-*/
-
-// ------------------------------------------------------------------------
-// Pointer handling
-//
-// These mappings provide support for input/output arguments and common
-// uses for C/C++ pointers.
-// ------------------------------------------------------------------------
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/*
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int                *INPUT
-         short              *INPUT
-         long               *INPUT
-	 long long          *INPUT
-         unsigned int       *INPUT
-         unsigned short     *INPUT
-         unsigned long      *INPUT
-	 unsigned long long *INPUT
-         unsigned char      *INPUT
-	 bool               *INPUT
-         float              *INPUT
-         double             *INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include typemaps.i
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-%define INPUT_TYPEMAP(type, converter)
-%typemap(in) type *INPUT($*1_ltype temp), type &INPUT($*1_ltype temp)
-{
-    temp = ($*1_ltype) converter($input);
-    $1 = &temp;
-}
-%typemap(typecheck) type *INPUT = type;
-%typemap(typecheck) type &INPUT = type;
-%enddef
-
-INPUT_TYPEMAP(float, NUM2DBL);
-INPUT_TYPEMAP(double, NUM2DBL);
-INPUT_TYPEMAP(int, NUM2INT);
-INPUT_TYPEMAP(short, NUM2SHRT);
-INPUT_TYPEMAP(long, NUM2LONG);
-INPUT_TYPEMAP(long long, NUM2LL);
-INPUT_TYPEMAP(unsigned int, NUM2UINT);
-INPUT_TYPEMAP(unsigned short, NUM2USHRT);
-INPUT_TYPEMAP(unsigned long, NUM2ULONG);
-INPUT_TYPEMAP(unsigned long long, NUM2ULL);
-INPUT_TYPEMAP(unsigned char, NUM2UINT);
-INPUT_TYPEMAP(signed char, NUM2INT);
-INPUT_TYPEMAP(bool, RTEST);
-
-#undef INPUT_TYPEMAP
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a array element.
-
-/*
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Ruby Array.
-
-         int                *OUTPUT
-         short              *OUTPUT
-         long               *OUTPUT
-	 long long          *OUTPUT
-         unsigned int       *OUTPUT
-         unsigned short     *OUTPUT
-         unsigned long      *OUTPUT
-	 unsigned long long *OUTPUT
-         unsigned char      *OUTPUT
-	 bool               *OUTPUT
-         float              *OUTPUT
-         double             *OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include typemaps.i
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Ruby output of the function would be a Array containing both
-output values. 
-*/
-
-%define OUTPUT_TYPEMAP(type, converter, convtype)
-%typemap(in,numinputs=0) type *OUTPUT($*1_ltype temp), type &OUTPUT($*1_ltype temp) "$1 = &temp;";
-%typemap(argout, fragment="output_helper") type *OUTPUT, type &OUTPUT {
-   VALUE o = converter(convtype (*$1));
-   $result = output_helper($result, o);
-}
-%enddef
-
-OUTPUT_TYPEMAP(int, INT2NUM, (int));
-OUTPUT_TYPEMAP(short, INT2NUM, (int));
-OUTPUT_TYPEMAP(long, INT2NUM, (long));
-OUTPUT_TYPEMAP(long long, LL2NUM, (long long));
-OUTPUT_TYPEMAP(unsigned int, UINT2NUM, (unsigned int));
-OUTPUT_TYPEMAP(unsigned short, UINT2NUM, (unsigned int));
-OUTPUT_TYPEMAP(unsigned long, UINT2NUM, (unsigned long));
-OUTPUT_TYPEMAP(unsigned long long, ULL2NUM, (unsigned long long));
-OUTPUT_TYPEMAP(unsigned char, UINT2NUM, (unsigned int));
-OUTPUT_TYPEMAP(signed char, INT2NUM, (int));
-OUTPUT_TYPEMAP(float, rb_float_new, (double));
-OUTPUT_TYPEMAP(double, rb_float_new, (double));
-
-#undef OUTPUT_TYPEMAP
-
-%typemap(in,numinputs=0) bool *OUTPUT(bool temp), bool &OUTPUT(bool temp) "$1 = &temp;";
-%typemap(argout, fragment="output_helper") bool *OUTPUT, bool &OUTPUT {
-    VALUE o = (*$1) ? Qtrue : Qfalse;
-    $result = output_helper($result, o);
-}
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Ruby array.
-
-         int                *INOUT
-         short              *INOUT
-         long               *INOUT
-	 long long          *INOUT
-         unsigned int       *INOUT
-         unsigned short     *INOUT
-         unsigned long      *INOUT
-	 unsigned long long *INOUT
-         unsigned char      *INOUT
-	 bool               *INOUT
-         float              *INOUT
-         double             *INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include typemaps.i
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in Ruby).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a Ruby variable you might do this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(in) short *INOUT = short *INPUT;
-%typemap(in) long *INOUT = long *INPUT;
-%typemap(in) long long *INOUT = long long *INPUT;
-%typemap(in) unsigned *INOUT = unsigned *INPUT;
-%typemap(in) unsigned short *INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long *INOUT = unsigned long *INPUT;
-%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT;
-%typemap(in) unsigned char *INOUT = unsigned char *INPUT;
-%typemap(in) signed char *INOUT = signed char *INPUT;
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(in) float *INOUT = float *INPUT;
-%typemap(in) double *INOUT = double *INPUT;
-
-%typemap(in) int &INOUT = int &INPUT;
-%typemap(in) short &INOUT = short &INPUT;
-%typemap(in) long &INOUT = long &INPUT;
-%typemap(in) long long &INOUT = long long &INPUT;
-%typemap(in) unsigned &INOUT = unsigned &INPUT;
-%typemap(in) unsigned short &INOUT = unsigned short &INPUT;
-%typemap(in) unsigned long &INOUT = unsigned long &INPUT;
-%typemap(in) unsigned long long &INOUT = unsigned long long &INPUT;
-%typemap(in) unsigned char &INOUT = unsigned char &INPUT;
-%typemap(in) signed char &INOUT = signed char &INPUT;
-%typemap(in) bool &INOUT = bool &INPUT;
-%typemap(in) float &INOUT = float &INPUT;
-%typemap(in) double &INOUT = double &INPUT;
-
-%typemap(argout) int *INOUT = int *OUTPUT;
-%typemap(argout) short *INOUT = short *OUTPUT;
-%typemap(argout) long *INOUT = long *OUTPUT;
-%typemap(argout) long long *INOUT = long long *OUTPUT;
-%typemap(argout) unsigned *INOUT = unsigned *OUTPUT;
-%typemap(argout) unsigned short *INOUT = unsigned short *OUTPUT;
-%typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
-%typemap(argout) signed char *INOUT = signed char *OUTPUT;
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(argout) float *INOUT = float *OUTPUT;
-%typemap(argout) double *INOUT = double *OUTPUT;
-
-%typemap(argout) int &INOUT = int &OUTPUT;
-%typemap(argout) short &INOUT = short &OUTPUT;
-%typemap(argout) long &INOUT = long &OUTPUT;
-%typemap(argout) long long &INOUT = long long &OUTPUT;
-%typemap(argout) unsigned &INOUT = unsigned &OUTPUT;
-%typemap(argout) unsigned short &INOUT = unsigned short &OUTPUT;
-%typemap(argout) unsigned long &INOUT = unsigned long &OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long &OUTPUT;
-%typemap(argout) unsigned char &INOUT = unsigned char &OUTPUT;
-%typemap(argout) signed char &INOUT = signed char &OUTPUT;
-%typemap(argout) bool &INOUT = bool &OUTPUT;
-%typemap(argout) float &INOUT = float &OUTPUT;
-%typemap(argout) double &INOUT = double &OUTPUT;
-
-/* Overloading information */
-
-%typemap(typecheck) double *INOUT = double;
-%typemap(typecheck) signed char *INOUT = signed char;
-%typemap(typecheck) unsigned char *INOUT = unsigned char;
-%typemap(typecheck) unsigned long *INOUT = unsigned long;
-%typemap(typecheck) unsigned long long *INOUT = unsigned long long;
-%typemap(typecheck) unsigned short *INOUT = unsigned short;
-%typemap(typecheck) unsigned int *INOUT = unsigned int;
-%typemap(typecheck) long *INOUT = long;
-%typemap(typecheck) long long *INOUT = long long;
-%typemap(typecheck) short *INOUT = short;
-%typemap(typecheck) int *INOUT = int;
-%typemap(typecheck) float *INOUT = float;
-
-%typemap(typecheck) double &INOUT = double;
-%typemap(typecheck) signed char &INOUT = signed char;
-%typemap(typecheck) unsigned char &INOUT = unsigned char;
-%typemap(typecheck) unsigned long &INOUT = unsigned long;
-%typemap(typecheck) unsigned long long &INOUT = unsigned long long;
-%typemap(typecheck) unsigned short &INOUT = unsigned short;
-%typemap(typecheck) unsigned int &INOUT = unsigned int;
-%typemap(typecheck) long &INOUT = long;
-%typemap(typecheck) long long &INOUT = long long;
-%typemap(typecheck) short &INOUT = short;
-%typemap(typecheck) int &INOUT = int;
-%typemap(typecheck) float &INOUT = float;
-
-#endif
-
-// --------------------------------------------------------------------
-// Special types
-// --------------------------------------------------------------------
-%include <progargcargv.i>
-%include <file.i>
-%include <timeval.i>
diff --git a/dependencies2013/win32/swig/Lib/runtime.swg b/dependencies2013/win32/swig/Lib/runtime.swg
deleted file mode 100644
index 1528a522..00000000
--- a/dependencies2013/win32/swig/Lib/runtime.swg
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -----------------------------------------------------------------------------*
-   Standard SWIG API for use inside user code.
- 
-   Don't include this file directly, run the command
-   swig -python -external-runtime
-   Also, read the Modules chapter of the SWIG Manual.
- 
- * -----------------------------------------------------------------------------*/
-
-#ifdef SWIG_MODULE_CLIENTDATA_TYPE
-
-SWIGRUNTIMEINLINE swig_type_info *
-SWIG_TypeQuery(SWIG_MODULE_CLIENTDATA_TYPE clientdata, const char *name) {
-  swig_module_info *module = SWIG_GetModule(clientdata);
-  return SWIG_TypeQueryModule(module, module, name);
-}
-
-SWIGRUNTIMEINLINE swig_type_info *
-SWIG_MangledTypeQuery(SWIG_MODULE_CLIENTDATA_TYPE clientdata, const char *name) {
-  swig_module_info *module = SWIG_GetModule(clientdata);
-  return SWIG_MangledTypeQueryModule(module, module, name);
-}
-
-#else
-
-SWIGRUNTIMEINLINE swig_type_info *
-SWIG_TypeQuery(const char *name) {
-  swig_module_info *module = SWIG_GetModule(NULL);
-  return SWIG_TypeQueryModule(module, module, name);
-}
-
-SWIGRUNTIMEINLINE swig_type_info *
-SWIG_MangledTypeQuery(const char *name) {
-  swig_module_info *module = SWIG_GetModule(NULL);
-  return SWIG_MangledTypeQueryModule(module, module, name);
-}
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/scilab/boost_shared_ptr.i b/dependencies2013/win32/swig/Lib/scilab/boost_shared_ptr.i
deleted file mode 100644
index b90422a6..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/boost_shared_ptr.i
+++ /dev/null
@@ -1,320 +0,0 @@
-%include <shared_ptr.i>
-
-// Set SHARED_PTR_DISOWN to $disown if required, for example
-// #define SHARED_PTR_DISOWN $disown
-#if !defined(SHARED_PTR_DISOWN)
-#define SHARED_PTR_DISOWN 0
-#endif
-
-// Language specific macro implementing all the customisations for handling the smart pointer
-%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
-
-// %naturalvar is as documented for member variables
-%naturalvar TYPE;
-%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-// destructor wrapper customisation
-%feature("unref") TYPE 
-//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter<SWIG_null_deleter>(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n"
-                               "(void)arg1; delete smartarg1;"
-
-// Typemap customisations...
-
-// plain value
-%typemap(in) CONST TYPE (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) {
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(out) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get());
-    if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-  }
-}
-%typemap(varout) CONST TYPE {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1));
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) CONST TYPE * (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-
-%typemap(out, fragment="SWIG_null_deleter_python") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE * {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0;
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter_python") CONST TYPE * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain reference
-%typemap(in) CONST TYPE & (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = %const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(out, fragment="SWIG_null_deleter_python") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) CONST TYPE & {
-  void *argp = 0;
-  int newmem = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared;
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    $1 = *%const_cast(tempshared.get(), $1_ltype);
-  } else {
-    $1 = *%const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype);
-  }
-}
-%typemap(varout, fragment="SWIG_null_deleter_python") CONST TYPE & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// plain pointer by reference
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) TYPE *CONST& (void  *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *);
-    temp = %const_cast(tempshared.get(), $*1_ltype);
-  } else {
-    temp = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $*1_ltype);
-  }
-  $1 = &temp;
-}
-%typemap(out, fragment="SWIG_null_deleter_python") TYPE *CONST& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner);
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) TYPE *CONST& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) TYPE *CONST& %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by value
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) $1 = *(%reinterpret_cast(argp, $&ltype));
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  int newmem = 0;
-  void *argp = 0;
-  int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = argp ? *(%reinterpret_cast(argp, $&ltype)) : SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE >();
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
-}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0;
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-// shared_ptr by reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (newmem & SWIG_CAST_NEW_MEMORY) {
-    if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
-    delete %reinterpret_cast(argp, $ltype);
-    $1 = &tempshared;
-  } else {
-    $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
-  }
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 && *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-  if ($owner) delete $1;
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
-#error "varout typemap not implemented"
-%}
-
-// shared_ptr by pointer reference
-%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
-  int newmem = 0;
-  res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (argp) tempshared = *%reinterpret_cast(argp, $*ltype);
-  if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype);
-  temp = &tempshared;
-  $1 = &temp;
-}
-%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 && **$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0;
-  %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
-}
-
-%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varin typemap not implemented"
-%}
-%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{
-#error "varout typemap not implemented"
-%}
-
-// Typecheck typemaps
-// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting 
-// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) 
-                      TYPE CONST,
-                      TYPE CONST &,
-                      TYPE CONST *,
-                      TYPE *CONST&,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
-                      SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), 0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
-%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
-#error "typemaps for $1_type not available"
-%}
-
-
-%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
-
-
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/carrays.i b/dependencies2013/win32/swig/Lib/scilab/carrays.i
deleted file mode 100644
index 014de37f..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/carrays.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%define %array_class(TYPE,NAME)
-  %array_class_wrap(TYPE,NAME,__paren__,__paren_asgn__)
-%enddef
-
-%include <typemaps/carrays.swg>
diff --git a/dependencies2013/win32/swig/Lib/scilab/cmalloc.i b/dependencies2013/win32/swig/Lib/scilab/cmalloc.i
deleted file mode 100644
index 248f06b9..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/cmalloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cmalloc.swg>
diff --git a/dependencies2013/win32/swig/Lib/scilab/cpointer.i b/dependencies2013/win32/swig/Lib/scilab/cpointer.i
deleted file mode 100644
index d824792f..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/cpointer.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cpointer.swg>
diff --git a/dependencies2013/win32/swig/Lib/scilab/exception.i b/dependencies2013/win32/swig/Lib/scilab/exception.i
deleted file mode 100644
index 17f4175c..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/exception.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%include <typemaps/exception.swg>
-
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), SWIG_Scilab_Error(code, msg);)
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/matrix.i b/dependencies2013/win32/swig/Lib/scilab/matrix.i
deleted file mode 100644
index 0936d936..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/matrix.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Matrix typemaps
- *
- */
-
-%include <scimatrixdouble.swg>
-%include <scimatrixint.swg>
-%include <scimatrixchar.swg>
-%include <scimatrixbool.swg>
-
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciarray.swg b/dependencies2013/win32/swig/Lib/scilab/sciarray.swg
deleted file mode 100644
index c00e3837..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciarray.swg
+++ /dev/null
@@ -1,115 +0,0 @@
-/* --------------------------------------------------------------------------
- *
- *  Arrays typemaps
- *
- * --------------------------------------------------------------------------*/
-
-%{
-#include <stdio.h>
-%}
-
-%define %scilab_asarray_withallocatecopy(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPDATATYPE)
-%typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE {
-  size_t i = 0;
-  int iRows = 0;
-  int iCols = 0;
-  TEMPDATATYPE *pTempData = NULL;
-  if (FRAGMENTNAME(pvApiCtx, $input, &iRows, &iCols, &pTempData, fname)) {
-    return SWIG_ERROR;
-  }
-  $1 = ($1_ltype)MALLOC(sizeof($*1_ltype) * iRows * iCols);
-  for (i = 0; i < iRows * iCols; i++) {
-    $1[i] = ($*1_ltype) pTempData[i];
-  }
-}
-%enddef
-
-%define %scilab_asarrayandsize_withcopy(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPDATATYPE)
-%typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE {
-  int iRows = 0;
-  int iCols = 0;
-  TEMPDATATYPE *pTempData = NULL;
-  if (FRAGMENTNAME(pvApiCtx, $input, &iRows, &iCols, &pTempData, fname)) {
-    return SWIG_ERROR;
-  }
-  if (iRows*iCols <= $1_dim0) {
-    size_t i;
-    for (i = 0; i < $1_dim0; i++) {
-      $1[i] = ($*1_ltype) pTempData[i];
-    }
-  }
-  else {
-    char errmsg[100];
-    sprintf(errmsg, "Size of input data (%d) is too big (maximum is %d)",
-      iRows*iCols, $1_dim0);
-    SWIG_exception_fail(SWIG_OverflowError, errmsg);
-  }
-}
-%enddef
-
-%define %scilab_fromarrayandsize(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  %set_output(FRAGMENTNAME(pvApiCtx, $result, 1, $1_dim0, $1));
-}
-%enddef
-
-%define %scilab_array_typemaps(CTYPE, ASARRAY_FRAGMENT, FROMARRAY_FRAGMENT, TEMPDATATYPE)
-  %scilab_asarrayandsize_withcopy(varin, ASARRAY_FRAGMENT, CTYPE[ANY], TEMPDATATYPE);
-  %scilab_asarray_withallocatecopy(in, ASARRAY_FRAGMENT, CTYPE[ANY], TEMPDATATYPE);
-  %scilab_fromarrayandsize(varout, FROMARRAY_FRAGMENT, CTYPE[ANY]);
-  %scilab_fromarrayandsize(out, FROMARRAY_FRAGMENT, CTYPE[ANY]);
-
-  %apply SWIGTYPE[] { CTYPE[] };
-  %scilab_asarray_withallocatecopy(in, ASARRAY_FRAGMENT, CTYPE[], TEMPDATATYPE);
-%enddef
-
-
-// Double
-%scilab_array_typemaps(double, SWIG_SciDouble_AsDoubleArrayAndSize,
-  SWIG_SciDouble_FromDoubleArrayAndSize, double);
-
-// Signed char
-
-%scilab_array_typemaps(signed char, SWIG_SciDoubleOrInt8_AsSignedCharArrayAndSize,
-  SWIG_SciDouble_FromSignedCharArrayAndSize, signed char);
-
-// Unsigned char
-%scilab_array_typemaps(unsigned char, SWIG_SciDoubleOrUint8_AsUnsignedCharArrayAndSize,
-  SWIG_SciDouble_FromUnsignedCharArrayAndSize, unsigned char);
-
-// Short
-%scilab_array_typemaps(short, SWIG_SciDoubleOrInt16_AsShortArrayAndSize,
-  SWIG_SciDouble_FromShortArrayAndSize, short);
-
-// Unsigned short
-%scilab_array_typemaps(unsigned short, SWIG_SciDoubleOrUint16_AsUnsignedShortArrayAndSize,
-  SWIG_SciDouble_FromUnsignedShortArrayAndSize, unsigned short);
-
-// Int
-%scilab_array_typemaps(int, SWIG_SciDoubleOrInt32_AsIntArrayAndSize,
-  SWIG_SciDouble_FromIntArrayAndSize, int);
-
-// Unsigned int
-%scilab_array_typemaps(unsigned int, SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize,
-  SWIG_SciDouble_FromUnsignedIntArrayAndSize, unsigned int);
-
-// Long
-%scilab_array_typemaps(long, SWIG_SciDoubleOrInt32_AsIntArrayAndSize,
-  SWIG_SciDouble_FromLongArrayAndSize, int);
-
-// Unsigned long
-%scilab_array_typemaps(unsigned long, SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize,
-  SWIG_SciDouble_FromUnsignedLongArrayAndSize, unsigned int);
-
-// Float
-%scilab_array_typemaps(float, SWIG_SciDouble_AsFloatArrayAndSize,
-  SWIG_SciDouble_FromFloatArrayAndSize, float);
-
-// Bool
-%scilab_array_typemaps(bool, SWIG_SciBoolean_AsIntArrayAndSize,
-  SWIG_SciBoolean_FromBoolArrayAndSize, int);
-
-// Char *
-%scilab_array_typemaps(char *, SWIG_SciString_AsCharPtrArrayAndSize,
-  SWIG_SciString_FromCharPtrArrayAndSize, char *);
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scibool.swg b/dependencies2013/win32/swig/Lib/scilab/scibool.swg
deleted file mode 100644
index 9aed88ec..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scibool.swg
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * C-type: bool
- * Scilab type: boolean scalar
- */
-%fragment(SWIG_AsVal_frag(bool), "header") {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(SwigSciObject iVar, bool *pbValue) {
-  SciErr sciErr;
-  int iRet = 0;
-  int *piAddrVar = NULL;
-  int iTempValue = 0;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (!isBooleanType(pvApiCtx, piAddrVar)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A boolean expected.\n"), SWIG_Scilab_GetFuncName(), iVar);
-    return SWIG_ERROR;
-  }
-
-  if (!isScalar(pvApiCtx, piAddrVar)) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A boolean expected.\n"), SWIG_Scilab_GetFuncName(), iVar);
-    return SWIG_ERROR;
-  }
-
-  iRet = getScalarBoolean(pvApiCtx, piAddrVar, &iTempValue);
-  if (iRet) {
-    return SWIG_ERROR;
-  }
-
-  *pbValue = iTempValue;
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(bool), "header") {
-SWIGINTERN int
-SWIG_From_dec(bool)(bool bValue) {
-  if (createScalarBoolean(pvApiCtx, SWIG_NbInputArgument(pvApiCtx)
-    + SWIG_Scilab_GetOutputPosition(), bValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: bool[]
- * Scilab type: boolean matrix
- */
-%fragment("SWIG_SciBoolean_AsBoolArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciBoolean_AsBoolArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, bool **pbValue, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  int *piValue = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isBooleanType(pvApiCtx, piAddrVar)) {
-    int i;
-    sciErr = getMatrixOfBoolean(pvApiCtx, piAddrVar, iRows, iCols, &piValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    *pbValue = (bool*) malloc((*iRows) * (*iCols) * sizeof(bool));
-    for (i = 0; i < (*iRows) * (*iCols); i++)
-      (*pbValue)[i] = piValue[i] != 0;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A boolean matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciBoolean_FromBoolArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciBoolean_FromBoolArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, bool *pbValue) {
-  SciErr sciErr;
-  int *piValue = NULL;
-  int i;
-
-  piValue = (int*) malloc(iRows * iCols * sizeof(int));
-  for (i = 0; i < iRows * iCols; i++)
-    piValue[i] = pbValue[i];
-
-  sciErr = createMatrixOfBoolean(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, piValue);
-  if(sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(piValue);
-    return SWIG_ERROR;
-  }
-
-  free(piValue);
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: int[]
- * Scilab type: boolean matrix
- */
-%fragment("SWIG_SciBoolean_AsIntArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciBoolean_AsIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, int **piValue, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isBooleanType(pvApiCtx, piAddrVar)) {
-    sciErr = getMatrixOfBoolean(pvApiCtx, piAddrVar, iRows, iCols, piValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A boolean matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciBoolean_FromIntArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciBoolean_FromIntArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, int *piValue) {
-  SciErr sciErr;
-
-  sciErr = createMatrixOfBoolean(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, piValue);
-  if(sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scichar.swg b/dependencies2013/win32/swig/Lib/scilab/scichar.swg
deleted file mode 100644
index 5edbf5b7..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scichar.swg
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * C-type: char or char*
- * Scilab type: string
- */
-
-/*
- * CHAR
- */
-
-%fragment(SWIG_AsVal_frag(char), "header", fragment="SWIG_SciString_AsChar") {
-#define SWIG_AsVal_char(scilabValue, valuePointer) SWIG_SciString_AsChar(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciString_AsChar", "header") {
-SWIGINTERN int
-SWIG_SciString_AsChar(void *pvApiCtx, int iVar, char *pcValue, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  char *pstValue = NULL;
-  int iRet;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isStringType(pvApiCtx, piAddrVar) == 0)
-  {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A single string expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-  }
-
-  iRet = getAllocatedSingleString(pvApiCtx, piAddrVar, &pstValue);
-  if (iRet) {
-    return SWIG_ERROR;
-  }
-
-  if (pcValue != NULL) {
-    *pcValue = pstValue[0];
-  }
-
-  freeAllocatedSingleString(pstValue);
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(char), "header", fragment="SWIG_SciString_FromChar") {
-#define SWIG_From_char(value) SWIG_SciString_FromChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
-}
-%fragment("SWIG_SciString_FromChar", "header") {
-SWIGINTERN int
-SWIG_SciString_FromChar(void *pvApiCtx, int iVarOut, char chValue) {
-  char *pchValue = (char*)malloc(sizeof(char) * 2);
-  pchValue[0] = chValue;
-  pchValue[1] = '\0';
-
-  if (createSingleString(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, pchValue))
-    return SWIG_ERROR;
-
-  free(pchValue);
-  return SWIG_OK;
-}
-}
-
-/*
- * CHAR *
-*/
-
-%fragment("SWIG_AsCharArray", "header", fragment = "SWIG_SciString_AsCharPtr") {
-#define SWIG_AsCharArray(scilabValue, charPtrPointer, charPtrLength) SWIG_SciString_AsCharPtr(pvApiCtx, scilabValue, charPtrPointer, charPtrLength, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciString_AsCharPtr", "header") {
-SWIGINTERN int
-SWIG_SciString_AsCharPtr(void *pvApiCtx, int iVar, char *pcValue, int iLength, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  char* pcTmpValue = NULL;
-  int iRet;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  iRet = getAllocatedSingleString(pvApiCtx, piAddrVar, &pcTmpValue);
-  if (iRet) {
-    return SWIG_ERROR;
-  }
-
-  if (pcValue != NULL) {
-    strncpy(pcValue, pcTmpValue, iLength);
-  }
-
-  freeAllocatedSingleString(pcTmpValue);
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_AsCharPtrAndSize", "header", fragment = "SWIG_SciString_AsCharPtrAndSize") {
-#define SWIG_AsCharPtrAndSize(scilabValue, charPtrPointer, charPtrLength, allocMemory) SWIG_SciString_AsCharPtrAndSize(pvApiCtx, scilabValue, charPtrPointer, charPtrLength, allocMemory, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciString_AsCharPtrAndSize", "header") {
-SWIGINTERN int
-SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t *piLength, int *alloc, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  char *pstString = NULL;
-  int iRows = 0;
-  int iCols = 0;
-  int iLen = 0;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isScalar(pvApiCtx, piAddrVar) == 0 || isStringType(pvApiCtx, piAddrVar) == 0)
-  {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A single string expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-  }
-
-  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &iLen, NULL);
-  if (sciErr.iErr)
-  {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-  }
-
-  pstString = %new_array(iLen + 1, char);
-
-  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &iLen, &pstString);
-  if (sciErr.iErr)
-  {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-  }
-
-  // TODO: return SWIG_ERROR if pcValue NULL (now returning SWIG_ERROR fails some typechecks)
-  if (pcValue) {
-    *pcValue = pstString;
-  }
-
-  if (alloc != NULL) {
-    *alloc = SWIG_NEWOBJ;
-  }
-
-  if (piLength != NULL) {
-    *piLength = strlen(pstString);
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_FromCharPtr", "header", fragment = "SWIG_SciString_FromCharPtr") {
-#define SWIG_FromCharPtr(charPtr) SWIG_SciString_FromCharPtr(pvApiCtx, SWIG_Scilab_GetOutputPosition(), charPtr)
-}
-%fragment("SWIG_SciString_FromCharPtr", "header") {
-SWIGINTERN int
-SWIG_SciString_FromCharPtr(void *pvApiCtx, int iVarOut, const char *pchValue) {
-  if (pchValue) {
-    SciErr sciErr;
-    const char* pstStrings[1];
-    pstStrings[0] = pchValue;
-
-    sciErr = createMatrixOfString(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, 1, 1, pstStrings);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    int iRet = createEmptyMatrix(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut);
-    if (iRet) {
-      return SWIG_ERROR;
-    }
-  }
-
-  return SWIG_OK;
-}
-}
-
-/*
- * CHAR * ARRAY
- */
-
-%fragment("SWIG_SciString_AsCharPtrArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciString_AsCharPtrArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, char ***charPtrArray, char *fname) {
-  SciErr sciErr;
-  int i = 0;
-  int *piAddrVar = NULL;
-  int* piLength = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, iRows, iCols, NULL, NULL);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  piLength = (int*) malloc((*iRows) * (*iCols) * sizeof(int));
-
-  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, iRows, iCols, piLength, NULL);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  *charPtrArray = (char**) malloc((*iRows) * (*iCols) * sizeof(char*));
-  for(i = 0 ; i < (*iRows) * (*iCols); i++) {
-    (*charPtrArray)[i] = (char*) malloc(sizeof(char) * (piLength[i] + 1));
-  }
-
-  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, iRows, iCols, piLength, *charPtrArray);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  free(piLength);
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciString_FromCharPtrArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciString_FromCharPtrArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, char **charPtrArray) {
-  SciErr sciErr;
-
-  sciErr = createMatrixOfString(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, (const char* const*) charPtrArray);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_FromCharPtrAndSize", "header", fragment = "SWIG_SciString_FromCharPtr") {
-#define SWIG_FromCharPtrAndSize(charPtr, charPtrLength) SWIG_SciString_FromCharPtr(pvApiCtx, SWIG_Scilab_GetOutputPosition(), charPtr)
-}
-
-
-/*
- * Char* Scilab variable
- */
-
-%fragment(SWIG_CreateScilabVariable_frag(char), "wrapper") {
-SWIGINTERN int
-SWIG_CreateScilabVariable_dec(char)(void *pvApiCtx, const char* psVariableName, const char cVariableValue) {
-  SciErr sciErr;
-  char sValue[2];
-  const char* psStrings[1];
-
-  sValue[0] = cVariableValue;
-  sValue[1] = '\0';
-  psStrings[0] = sValue;
-
-  sciErr = createNamedMatrixOfString(pvApiCtx, psVariableName, 1, 1, psStrings);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_CreateScilabVariable_frag(charptr), "wrapper") {
-SWIGINTERN int
-SWIG_CreateScilabVariable_dec(charptr)(void *pvApiCtx, const char* psVariableName, const char* psVariableValue) {
-  SciErr sciErr;
-  const char* psStrings[1];
-  psStrings[0] = psVariableValue;
-
-  sciErr = createNamedMatrixOfString(pvApiCtx, psVariableName, 1, 1, psStrings);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scicontainer.swg b/dependencies2013/win32/swig/Lib/scilab/scicontainer.swg
deleted file mode 100644
index 2cc44b8e..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scicontainer.swg
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -----------------------------------------------------------------------------
- * scicontainer.swg
- *
- * Scilab list <-> C++ container wrapper
- *
- * This wrapper, and its iterator, allows a general use (and reuse) of
- * the mapping between C++ and Scilab, thanks to the C++ templates.
- *
- * Of course, it needs the C++ compiler to support templates, but
- * since we will use this wrapper with the STL containers, that should
- * be the case.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <iostream>
-%}
-
-#if !defined(SWIG_NO_EXPORT_ITERATOR_METHODS)
-# if !defined(SWIG_EXPORT_ITERATOR_METHODS)
-#  define SWIG_EXPORT_ITERATOR_METHODS SWIG_EXPORT_ITERATOR_METHODS
-# endif
-#endif
-
-
-// #define (SWIG_SCILAB_EXTRA_NATIVE_CONTAINERS)
-// if defined: sequences in return are converted from/to Scilab lists or matrices
-// if not defined: sequences are passed from/to Scilab as pointers
-
-%{
-#define SWIG_STD_NOASSIGN_STL
-%}
-
-%include <sciiterators.swg>
-%include <scisequence.swg>
-
-%{
-#include <stdexcept>
-%}
-
-%include <exception.i>
-%include <std_except.i>
-
-%fragment("SciSequence_Cont", "header",
-	  fragment="StdTraits",
-	  fragment="SwigSciIterator_T")
-{
-namespace swig
-{
-  template <class T>
-  struct SciSequence_Ref
-  {
-    SciSequence_Ref(const SwigSciObject& seq, int index)
-      : _seq(seq), _index(index)
-    {
-      if (traits_as_sequence<T>::get(_seq, &piSeqAddr) != SWIG_OK)
-      {
-        throw std::invalid_argument("Cannot get sequence data.");
-      }
-    }
-
-    operator T () const
-    {
-      return traits_asval_sequenceitem<T>::asval(_seq, piSeqAddr, _index);
-    }
-
-    SciSequence_Ref& operator=(const T& v)
-    {
-      // TODO
-      return *this;
-    }
-
-    private:
-      SwigSciObject _seq;
-      int _index;
-      void *piSeqAddr;
-  };
-
-
-  template <class T>
-  struct SciSequence_ArrowProxy
-  {
-    SciSequence_ArrowProxy(const T& x): m_value(x) {}
-    const T* operator->() const { return &m_value; }
-    operator const T*() const { return &m_value; }
-    T m_value;
-  };
-
-  template <class T, class Reference >
-  struct SwigSciSequence_InputIterator
-  {
-    typedef SwigSciSequence_InputIterator<T, Reference > self;
-
-    typedef std::random_access_iterator_tag iterator_category;
-    typedef Reference reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef int difference_type;
-
-    SwigSciSequence_InputIterator()
-    {
-    }
-
-    SwigSciSequence_InputIterator(const SwigSciObject& seq, int index)
-      : _seq(seq), _index(index)
-    {
-    }
-
-    reference operator*() const
-    {
-      return reference(_seq, _index);
-    }
-
-    SciSequence_ArrowProxy<T>
-    operator->() const {
-      return SciSequence_ArrowProxy<T>(operator*());
-    }
-
-    bool operator==(const self& ri) const
-    {
-      return (_index == ri._index);
-    }
-
-    bool operator!=(const self& ri) const
-    {
-      return !(operator==(ri));
-    }
-
-    self& operator ++ ()
-    {
-      ++_index;
-      return *this;
-    }
-
-    self& operator -- ()
-    {
-      --_index;
-      return *this;
-    }
-
-    self& operator += (difference_type n)
-    {
-      _index += n;
-      return *this;
-    }
-
-    self operator +(difference_type n) const
-    {
-      return self(_seq, _index + n);
-    }
-
-    self& operator -= (difference_type n)
-    {
-      _index -= n;
-      return *this;
-    }
-
-    self operator -(difference_type n) const
-    {
-      return self(_seq, _index - n);
-    }
-
-    difference_type operator - (const self& ri) const
-    {
-      return _index - ri._index;
-    }
-
-    bool operator < (const self& ri) const
-    {
-      return _index < ri._index;
-    }
-
-    reference
-    operator[](difference_type n) const
-    {
-      return reference(_seq, _index + n);
-    }
-
-  private:
-    SwigSciObject _seq;
-    difference_type _index;
-  };
-
-  template <class T>
-  struct SciSequence_Cont
-  {
-    typedef SciSequence_Ref<T> reference;
-    typedef const SciSequence_Ref<T> const_reference;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef int difference_type;
-    typedef int size_type;
-    typedef const pointer const_pointer;
-    typedef SwigSciSequence_InputIterator<T, reference> iterator;
-    typedef SwigSciSequence_InputIterator<T, const_reference> const_iterator;
-
-    SciSequence_Cont(const SwigSciObject& seq) : _seq(seq)
-    {
-    }
-
-    ~SciSequence_Cont()
-    {
-    }
-
-    size_type size() const
-    {
-      int iSeqSize;
-      if (traits_as_sequence<value_type>::size(_seq, &iSeqSize) == SWIG_OK)
-      {
-        return iSeqSize;
-      }
-      else
-      {
-        return SWIG_ERROR;
-      }
-    }
-
-    bool empty() const
-    {
-      return size() == 0;
-    }
-
-    iterator begin()
-    {
-      return iterator(_seq, 0);
-    }
-
-    const_iterator begin() const
-    {
-      return const_iterator(_seq, 0);
-    }
-
-    iterator end()
-    {
-      return iterator(_seq, size());
-    }
-
-    const_iterator end() const
-    {
-      return const_iterator(_seq, size());
-    }
-
-    reference operator[](difference_type n)
-    {
-      return reference(_seq, n);
-    }
-
-    const_reference operator[](difference_type n)  const
-    {
-      return const_reference(_seq, n);
-    }
-
-  private:
-    SwigSciObject _seq;
-  };
-}
-}
-
-%define %swig_sequence_iterator(Sequence...)
-#if defined(SWIG_EXPORT_ITERATOR_METHODS)
-  class iterator;
-  class reverse_iterator;
-  class const_iterator;
-  class const_reverse_iterator;
-
-  %typemap(out,noblock=1,fragment="SciSequence_Cont")
-    iterator, reverse_iterator, const_iterator, const_reverse_iterator {
-    %set_output(SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &)),
-           swig::SciSwigIterator::descriptor(),SWIG_POINTER_OWN));
-  }
-  %typemap(out,fragment="SciSequence_Cont")
-    std::pair<iterator, iterator>, std::pair<const_iterator, const_iterator> {
-    // TODO: return a Scilab list from the pair (see code for Octave)
-  }
-
-  %fragment("SciSwigPairBoolOutputIterator", "header",
-    fragment=SWIG_From_frag(bool), fragment="SciSequence_Cont") {}
-
-  %typemap(out,fragment="SciSwigPairBoolOutputIterator")
-    std::pair<iterator, bool>, std::pair<const_iterator, bool> {
-    // TODO: return a Scilab list from the pair (see code for Octave)
-  }
-
-  %typemap(in,noblock=1,fragment="SciSequence_Cont")
-    iterator(swig::SciSwigIterator *iter = 0, int res),
-    reverse_iterator(swig::SciSwigIterator *iter = 0, int res),
-    const_iterator(swig::SciSwigIterator *iter = 0, int res),
-    const_reverse_iterator(swig::SciSwigIterator *iter = 0, int res) {
-    res = SWIG_ConvertPtr((SwigSciObject)$input, %as_voidptrptr(&iter), swig::SciSwigIterator::descriptor(), 0);
-    if (!SWIG_IsOK(res) || !iter) {
-      %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-    } else {
-      swig::SwigSciIterator_T<$type > *iter_t = dynamic_cast<swig::SwigSciIterator_T<$type > *>(iter);
-      if (iter_t) {
-	$1 = iter_t->get_current();
-      } else {
-	%argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
-      }
-    }
-  }
-
-  %typecheck(%checkcode(ITERATOR),noblock=1,fragment="SciSequence_Cont")
-    iterator, reverse_iterator, const_iterator, const_reverse_iterator {
-    swig::SciSwigIterator *iter = 0;
-    int res = SWIG_ConvertPtr((SwigSciObject)$input, %as_voidptrptr(&iter), swig::SciSwigIterator::descriptor(), 0);
-    $1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigSciIterator_T<$type > *>(iter) != 0));
-  }
-
-  %fragment("SciSequence_Cont");
-#endif //SWIG_EXPORT_ITERATOR_METHODS
-%enddef
-
-// The Scilab container methods
-
-%define %swig_container_methods(Container...)
-%enddef
-
-%define %swig_sequence_methods_common(Sequence...)
-  %swig_sequence_iterator(%arg(Sequence))
-  %swig_container_methods(%arg(Sequence))
-
-%enddef
-
-%define %swig_sequence_methods(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-%enddef
-
-%define %swig_sequence_methods_val(Sequence...)
-  %swig_sequence_methods_common(%arg(Sequence))
-%enddef
-
-//
-// Common fragments
-//
-
-%fragment("StdSequenceTraits","header",
-	  fragment="StdTraits",
-	  fragment="SciSequence_Cont",
-    fragment=SWIG_Traits_SequenceItem_frag(ptr))
-{
-namespace swig {
-  template <class SciSeq, class Seq>
-  inline void
-  assign(const SciSeq& sciSeq, Seq* seq) {
-%#ifdef SWIG_STD_NOASSIGN_STL
-    typedef typename SciSeq::value_type value_type;
-    typename SciSeq::const_iterator it = sciSeq.begin();
-    for (;it != sciSeq.end(); ++it) {
-      seq->insert(seq->end(),(value_type)(*it));
-    }
-%#else
-    seq->assign(sciSeq.begin(), sciSeq.end());
-%#endif
-  }
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_asptr_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-
-    static int asptr(const SwigSciObject& obj, sequence **seq)
-    {
-      swig_type_info *typeInfo = swig::type_info<sequence>();
-      if (typeInfo)
-      {
-          sequence *p;
-          if (SWIG_ConvertPtr(obj, (void**)&p, typeInfo, 0) == SWIG_OK)
-          {
-            if (seq)
-              *seq = p;
-            return SWIG_OLDOBJ;
-          }
-      }
-
-      if (traits_as_sequence<value_type>::check(obj) == SWIG_OK)
-      {
-        try
-        {
-          SciSequence_Cont<value_type> sciSeq(obj);
-          if (seq)
-          {
-            *seq = new sequence();
-            assign(sciSeq, *seq);
-            return SWIG_NEWOBJ;
-          }
-          else
-          {
-            return SWIG_ERROR;
-          }
-        }
-        catch (std::exception& e)
-        {
-          SWIG_exception(SWIG_RuntimeError, e.what());
-          return SWIG_ERROR;
-        }
-      }
-      else 
-      {
-        return SWIG_ERROR;
-      }
-    }
-  };
-
-  template <class Seq, class T = typename Seq::value_type >
-  struct traits_from_stdseq {
-    typedef Seq sequence;
-    typedef T value_type;
-    typedef typename Seq::size_type size_type;
-    typedef typename sequence::const_iterator const_iterator;
-
-    static SwigSciObject from(const sequence& seq)
-    {
-      %#ifdef SWIG_SCILAB_EXTRA_NATIVE_CONTAINERS
-      swig_type_info *typeInfo = swig::type_info<sequence>();
-      if (typeInfo)
-      {
-        return SWIG_NewPointerObj(new sequence(seq), typeInfo, SWIG_POINTER_OWN);
-      }
-      %#endif
-
-      try
-      {
-        void *data;
-        size_type size = seq.size();
-        if (traits_from_sequence<value_type>::create(size, &data) == SWIG_OK) {
-          const_iterator it;
-          int index = 0;
-          for (it = seq.begin(); it != seq.end(); ++it)
-          {
-            traits_from_sequenceitem<value_type>::from(data, index, *it);
-            index++;
-          }
-          return traits_from_sequence<value_type>::set(size, data);
-        }
-        return SWIG_OK;
-      }
-      catch (std::exception& e)
-      {
-        SWIG_exception(SWIG_RuntimeError, e.what());
-        return SWIG_ERROR;
-      }
-    }
-  };
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scidouble.swg b/dependencies2013/win32/swig/Lib/scilab/scidouble.swg
deleted file mode 100644
index 1b826330..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scidouble.swg
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * DOUBLE SCALAR
- */
-%fragment(SWIG_AsVal_frag(double), "header", fragment="SWIG_SciDouble_AsDouble") {
-%#define SWIG_AsVal_double(scilabValue, valuePointer) SWIG_SciDouble_AsDouble(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_AsDouble", "header") {
-SWIGINTERN int
-SWIG_SciDouble_AsDouble(void *pvApiCtx, SwigSciObject iVar, double *pdblValue, char *fname) {
-  SciErr sciErr;
-  int iRet = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (!isDoubleType(pvApiCtx, piAddrVar) || isVarComplex(pvApiCtx, piAddrVar)) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A real expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  if (!isScalar(pvApiCtx, piAddrVar)) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A real expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  iRet = getScalarDouble(pvApiCtx, piAddrVar, pdblValue);
-  if (iRet) {
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(double), "header", fragment="SWIG_SciDouble_FromDouble") { 
-%#define SWIG_From_double(scilabValue) SWIG_SciDouble_FromDouble(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_FromDouble", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromDouble(void *pvApiCtx, int iVarOut, double dblValue, char *fname) {
-  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, dblValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * DOUBLE ARRAY
- */
-
-%fragment("SWIG_SciDouble_AsDoubleArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_AsDoubleArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, double **pdValue, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isDoubleType(pvApiCtx, piAddrVar) && !isVarComplex(pvApiCtx, piAddrVar)) {
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, pdValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A real matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_FromDoubleArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromDoubleArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, double *pdblValue) {
-  SciErr sciErr;
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdblValue);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_CreateScilabVariable_frag(double), "wrapper") {
-SWIGINTERN int
-SWIG_CreateScilabVariable_dec(double)(void *pvApiCtx, const char* psVariableName, const double dVariableValue) {
-  SciErr sciErr;
-  sciErr = createNamedMatrixOfDouble(pvApiCtx, psVariableName, 1, 1, &dVariableValue);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scienum.swg b/dependencies2013/win32/swig/Lib/scilab/scienum.swg
deleted file mode 100644
index 54ec1f85..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scienum.swg
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * C-type: enum
- * Scilab type: double or int32
- */
-
-%fragment(SWIG_AsVal_frag(Enum), "header", fragment="SWIG_Int_AsEnum") {
-%#define SWIG_AsVal_Enum(scilabValue, valuePointer) SWIG_Int_AsEnum(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_Int_AsEnum", "header", fragment="SWIG_SciDoubleOrInt32_AsInt") {
-SWIGINTERN int
-SWIG_Int_AsEnum(void *pvApiCtx, int iVar, int *enumValue, char *fname) {
-  int iValue = 0;
-  if (SWIG_SciDoubleOrInt32_AsInt(pvApiCtx, iVar, &iValue, fname) != SWIG_OK)
-    return SWIG_ERROR;
-  *enumValue = iValue;
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(Enum), "header", fragment="SWIG_Int_FromEnum") {
-%#define SWIG_From_Enum(scilabValue) SWIG_Int_FromEnum(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_Int_FromEnum", "header", fragment="SWIG_SciDouble_FromInt") {
-SWIGINTERN int
-SWIG_Int_FromEnum(void *pvApiCtx, int iVarOut, int enumValue, char *fname) {
-  if (SWIG_SciDouble_FromInt(pvApiCtx, iVarOut, enumValue, fname) != SWIG_OK)
-    return SWIG_ERROR;
-  SWIG_Scilab_SetOutput(pvApiCtx, iVarOut);
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciexception.swg b/dependencies2013/win32/swig/Lib/scilab/sciexception.swg
deleted file mode 100644
index a5eb4c00..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciexception.swg
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Exception typemaps (throws)
- */
-
-%include <exception.i>
-
-%typemap(throws, noblock=1) int, unsigned int, signed int,
-                            int&,unsigned int&, signed int&,
-                            long, unsigned long, signed long,
-                            short, unsigned short,signed short,
-                            long long, unsigned long long,
-                            unsigned char, signed char,
-                            long&, unsigned long&, signed long&,
-                            short&, unsigned short&, signed short&,
-                            long long&, unsigned long long&,
-                            unsigned char&, signed char&,
-                            size_t, size_t&,
-                            ptrdiff_t, ptrdiff_t& {
-  char obj[20];
-  sprintf(obj, "%d", (int)$1);
-  SWIG_Scilab_Raise_Ex(obj, "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) enum SWIGTYPE {
-  char obj[20];
-  sprintf(obj, "%d", (int)$1);
-  SWIG_Scilab_Raise_Ex(obj, "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) float, double,
-                            float&, double& {
-  char obj[20];
-  sprintf(obj, "%5.3f", (double)$1);
-  SWIG_Scilab_Raise_Ex(obj, "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) bool, bool& {
-  SWIG_Scilab_Raise_Ex($1 ? "true" : "false", "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) char*, char[ANY] {
-  SWIG_Scilab_Raise_Ex($1, "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) char, char& {
-  char obj[1];
-  sprintf(obj, "%c", (char)$1);
-  SWIG_Scilab_Raise_Ex(obj, "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) SWIGTYPE,
-                            SWIGTYPE*,
-                            SWIGTYPE [ANY],
-                            SWIGTYPE & {
-  SWIG_Scilab_Raise_Ex((char*)NULL, "$type", $descriptor);
-}
-
-%typemap(throws, noblock=1) (...) {
-  SWIG_exception(SWIG_RuntimeError, "unknown exception");
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scifloat.swg b/dependencies2013/win32/swig/Lib/scilab/scifloat.swg
deleted file mode 100644
index f0af17c0..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scifloat.swg
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * FLOAT SCALAR
- */
-
-%fragment(SWIG_AsVal_frag(float), "header", fragment=SWIG_AsVal_frag(double)) {
-SWIGINTERN int
-SWIG_AsVal_dec(float)(SwigSciObject iVar, float *pfValue) {
-  double dblValue = 0.0;
-  if(SWIG_AsVal_dec(double)(iVar, &dblValue) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-  if (pfValue)
-    *pfValue = (float) dblValue;
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(float), "header") {
-SWIGINTERN int
-SWIG_From_dec(float)(float flValue) {
-  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx)
-    + SWIG_Scilab_GetOutputPosition(), (double)flValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_AsFloatArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_AsFloatArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, float **pfValue, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  double *pdValue = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isDoubleType(pvApiCtx, piAddrVar) && !isVarComplex(pvApiCtx, piAddrVar)) {
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    *pfValue = (float *) malloc((*iRows) * (*iCols) * sizeof(float));
-    for (i=0; i < (*iRows) * (*iCols); i++)
-      (*pfValue)[i] = (float) pdValue[i];
-
-    return SWIG_OK;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A real matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment("SWIG_SciDouble_FromFloatArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromFloatArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, float *pfValue) {
-  SciErr sciErr;
-  double *pdValue;
-  int i;
-
-  pdValue = (double *) malloc(iRows * iCols * sizeof(double));
-  for (i = 0; i < iRows * iCols; i++)
-    pdValue[i] = pfValue[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValue);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  free(pdValue);
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciint.swg b/dependencies2013/win32/swig/Lib/scilab/sciint.swg
deleted file mode 100644
index 2d699356..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciint.swg
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * C-type: int
- * Scilab type: double or int32
- */
-
-%fragment(SWIG_AsVal_frag(int), "header", fragment="SWIG_SciDoubleOrInt32_AsInt", fragment="<limits.h>") {
-%#define SWIG_AsVal_int(scilabValue, valuePointer) SWIG_SciDoubleOrInt32_AsInt(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDoubleOrInt32_AsInt", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt32_AsInt(void *pvApiCtx, SwigSciObject iVar, int *piValue, char *fname)
-{
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    if (piValue) {
-      int iPrec = 0;
-      int *piData = NULL;
-
-      sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iPrec != SCI_INT32) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-        return SWIG_TypeError;
-      }
-      sciErr = getMatrixOfInteger32(pvApiCtx, piAddrVar, &iRows, &iCols, &piData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-        return SWIG_TypeError;
-      }
-      *piValue = *piData;
-    }
-  }
-  else if (iType == sci_matrix) {
-    if (piValue) {
-      double *pdData = NULL;
-      double dValue = 0.0f;
-      sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-        return SWIG_TypeError;
-      }
-      dValue = *pdData;
-      if (dValue != floor(dValue)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 32-bit signed integer.\n"), fname, iVar);
-        return SWIG_ValueError;
-      }
-      if ((dValue < INT_MIN) || (dValue > INT_MAX)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 32-bit signed integer.\n"), fname, iVar);
-        return SWIG_OverflowError;
-      }
-      *piValue = (int) dValue;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-    return SWIG_TypeError;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(int), "header", fragment="SWIG_SciDouble_FromInt") {
-%#define SWIG_From_int(scilabValue) SWIG_SciDouble_FromInt(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_FromInt", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromInt(void *pvApiCtx, int iVarOut, int iValue, char *fname){
-  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx)
-    + iVarOut, (double) iValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: int[]
- * Scilab type: double or int32 matrix
- */
-%fragment("SWIG_SciDoubleOrInt32_AsIntArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt32_AsIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, int **piValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_matrix) {
-    double *pdData = NULL;
-    int size = 0;
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    size = (*iRows) * (*iCols);
-    *piValue = (int*) malloc(size * sizeof(int*));
-    for (i = 0; i < size; i++)
-      (*piValue)[i] = (int) pdData[i];
-  }
-  else if (iType == sci_ints) {
-    int iPrec = 0;
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iPrec != SCI_INT32) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double matrix expected.\n"), fname, iVar);
-      return SWIG_ERROR;
-    }
-    sciErr = getMatrixOfInteger32(pvApiCtx, piAddrVar, iRows, iCols, piValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_FromIntArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromIntArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const int *piData) {
-  SciErr sciErr;
-  double *pdValues = NULL;
-  int i;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++)
-    pdValues[i] = piData[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_CreateScilabVariable_frag(int), "wrapper") {
-SWIGINTERN int
-SWIG_CreateScilabVariable_dec(int)(void *pvApiCtx, const char* psVariableName, const int iVariableValue) {
-  SciErr sciErr;
-  sciErr = createNamedMatrixOfInteger32(pvApiCtx, psVariableName, 1, 1, &iVariableValue);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciiterators.swg b/dependencies2013/win32/swig/Lib/scilab/sciiterators.swg
deleted file mode 100644
index 1c7ce439..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciiterators.swg
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -----------------------------------------------------------------------------
- * sciiterators.swg
- *
- * Users can derive form the SciSwigIterator to implemet their
- * own iterators. As an example (real one since we use it for STL/STD
- * containers), the template SwigSciIterator_T does the
- * implementation for generic C++ iterators.
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-%fragment("SciSwigIterator","header",fragment="<stddef.h>") {
-namespace swig {
-  struct stop_iteration {
-  };
-
-  struct SciSwigIterator {
-  private:
-    SwigSciObject _seq;
-
-  protected:
-    SciSwigIterator(SwigSciObject seq) : _seq(seq)
-    {
-    }
-
-  public:
-    virtual ~SciSwigIterator() {}
-
-    virtual SwigSciObject value() const = 0;
-
-    virtual SciSwigIterator *incr(size_t n = 1) = 0;
-
-    virtual SciSwigIterator *decr(size_t n = 1)
-    {
-      throw stop_iteration();
-    }
-
-    virtual ptrdiff_t distance(const SciSwigIterator &x) const
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-
-    virtual bool equal (const SciSwigIterator &x) const
-    {
-      throw std::invalid_argument("operation not supported");
-    }
-
-    virtual SciSwigIterator *copy() const = 0;
-
-    SwigSciObject next()
-    {
-      SwigSciObject obj = value();
-      incr();
-      return obj;
-    }
-
-    SwigSciObject previous()
-    {
-      decr();
-      return value();
-    }
-
-    SciSwigIterator *advance(ptrdiff_t n)
-    {
-      return  (n > 0) ?  incr(n) : decr(-n);
-    }
-
-    bool operator == (const SciSwigIterator& x)  const
-    {
-      return equal(x);
-    }
-
-    bool operator != (const SciSwigIterator& x) const
-    {
-      return ! operator==(x);
-    }
-
-    SciSwigIterator* operator ++ () {
-      incr();
-      return this;
-    }
-
-    SciSwigIterator* operator -- () {
-      decr();
-      return this;
-    }
-
-    SciSwigIterator* operator + (ptrdiff_t n) const
-    {
-      return copy()->advance(n);
-    }
-
-    SciSwigIterator* operator - (ptrdiff_t n) const
-    {
-      return copy()->advance(-n);
-    }
-
-    ptrdiff_t operator - (const SciSwigIterator& x) const
-    {
-      return x.distance(*this);
-    }
-
-    static swig_type_info* descriptor() {
-      static int init = 0;
-      static swig_type_info* desc = 0;
-      if (!init) {
-	desc = SWIG_TypeQuery("swig::SciSwigIterator *");
-	init = 1;
-      }
-      return desc;
-    }
-  };
-}
-}
-
-%fragment("SwigSciIterator_T","header",fragment="<stddef.h>",fragment="SciSwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
-namespace swig {
-  template<typename OutIterator>
-  class SwigSciIterator_T :  public SciSwigIterator
-  {
-  public:
-    typedef OutIterator out_iterator;
-    typedef typename std::iterator_traits<out_iterator>::value_type value_type;
-    typedef SwigSciIterator_T<out_iterator> self_type;
-
-    SwigSciIterator_T(out_iterator curr, SwigSciObject seq)
-      : SciSwigIterator(seq), current(curr)
-    {
-    }
-
-    const out_iterator& get_current() const
-    {
-      return current;
-    }
-
-
-    bool equal (const SciSwigIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return (current == iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-
-    ptrdiff_t distance(const SciSwigIterator &iter) const
-    {
-      const self_type *iters = dynamic_cast<const self_type *>(&iter);
-      if (iters) {
-	return std::distance(current, iters->get_current());
-      } else {
-	throw std::invalid_argument("bad iterator type");
-      }
-    }
-
-  protected:
-    out_iterator current;
-  };
-
-  template <class ValueType>
-  struct from_oper
-  {
-    typedef const ValueType& argument_type;
-    typedef SwigSciObject result_type;
-    result_type operator()(argument_type v) const
-    {
-      return swig::from(v);
-    }
-  };
-
-  template<typename OutIterator,
-	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class SciSwigIteratorOpen_T :  public SwigSciIterator_T<OutIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutIterator out_iterator;
-    typedef ValueType value_type;
-    typedef SwigSciIterator_T<out_iterator>  base;
-    typedef SciSwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
-
-    SciSwigIteratorOpen_T(out_iterator curr, SwigSciObject seq)
-      : SwigSciIterator_T<OutIterator>(curr, seq)
-    {
-    }
-
-    SwigSciObject value() const {
-      return from(static_cast<const value_type&>(*(base::current)));
-    }
-
-    SciSwigIterator *copy() const
-    {
-      return new self_type(*this);
-    }
-
-    SciSwigIterator *incr(size_t n = 1)
-    {
-      while (n--) {
-	++base::current;
-      }
-      return this;
-    }
-
-    SciSwigIterator *decr(size_t n = 1)
-    {
-      while (n--) {
-	--base::current;
-      }
-      return this;
-    }
-  };
-
-  template<typename OutIterator,
-	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
-	   typename FromOper = from_oper<ValueType> >
-  class SciSwigIteratorClosed_T :  public SwigSciIterator_T<OutIterator>
-  {
-  public:
-    FromOper from;
-    typedef OutIterator out_iterator;
-    typedef ValueType value_type;
-    typedef SwigSciIterator_T<out_iterator>  base;
-    typedef SciSwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
-
-    SciSwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, SwigSciObject seq)
-      : SwigSciIterator_T<OutIterator>(curr, seq), begin(first), end(last)
-    {
-    }
-
-    SwigSciObject value() const {
-      if (base::current == end) {
-	throw stop_iteration();
-      } else {
-	return from(static_cast<const value_type&>(*(base::current)));
-      }
-    }
-
-    SciSwigIterator *copy() const
-    {
-      return new self_type(*this);
-    }
-
-    SciSwigIterator *incr(size_t n = 1)
-    {
-      while (n--) {
-	if (base::current == end) {
-	  throw stop_iteration();
-	} else {
-	  ++base::current;
-	}
-      }
-      return this;
-    }
-
-    SciSwigIterator *decr(size_t n = 1)
-    {
-      while (n--) {
-	if (base::current == begin) {
-	  throw stop_iteration();
-	} else {
-	  --base::current;
-	}
-      }
-      return this;
-    }
-
-  private:
-    out_iterator begin;
-    out_iterator end;
-  };
-
-  template<typename OutIter>
-  inline SciSwigIterator*
-  make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, SwigSciObject seq = SwigSciObject())
-  {
-    return new SciSwigIteratorClosed_T<OutIter>(current, begin, end, seq);
-  }
-
-  template<typename OutIter>
-  inline SciSwigIterator*
-  make_output_iterator(const OutIter& current, SwigSciObject seq = SwigSciObject())
-  {
-    return new SciSwigIteratorOpen_T<OutIter>(current, seq);
-  }
-}
-}
-
-
-%fragment("SciSwigIterator");
-namespace swig
-{
-// Throw a StopIteration exception
-  %ignore stop_iteration;
-  struct stop_iteration {};
-
-  %typemap(throws, noblock=1) stop_iteration
-  {
-    SWIG_Scilab_Raise(0, "stop_iteration", NULL);
-    return SWIG_ERROR;
-  }
-
-// Mark methods that return new objects
-  %newobject SciSwigIterator::copy;
-  %newobject SciSwigIterator::operator + (ptrdiff_t n) const;
-  %newobject SciSwigIterator::operator - (ptrdiff_t n) const;
-
-  %nodirector SciSwigIterator;
-
-  %catches(swig::stop_iteration) SciSwigIterator::value() const;
-  %catches(swig::stop_iteration) SciSwigIterator::incr(size_t n = 1);
-  %catches(swig::stop_iteration) SciSwigIterator::decr(size_t n = 1);
-  %catches(std::invalid_argument) SciSwigIterator::distance(const SciSwigIterator &x) const;
-  %catches(std::invalid_argument) SciSwigIterator::equal (const SciSwigIterator &x) const;
-  %catches(swig::stop_iteration) SciSwigIterator::next();
-  %catches(swig::stop_iteration) SciSwigIterator::previous();
-  %catches(swig::stop_iteration) SciSwigIterator::advance(ptrdiff_t n);
-  %catches(swig::stop_iteration) SciSwigIterator::operator += (ptrdiff_t n);
-  %catches(swig::stop_iteration) SciSwigIterator::operator -= (ptrdiff_t n);
-  %catches(swig::stop_iteration) SciSwigIterator::operator + (ptrdiff_t n) const;
-  %catches(swig::stop_iteration) SciSwigIterator::operator - (ptrdiff_t n) const;
-
-  %ignore SciSwigIterator::operator==;
-  %ignore SciSwigIterator::operator!=;
-  %ignore SciSwigIterator::operator++;
-  %ignore SciSwigIterator::operator--;
-  %ignore SciSwigIterator::operator+;
-  %ignore SciSwigIterator::operator-;
-
-  struct SciSwigIterator
-  {
-  protected:
-    SciSwigIterator(SwigSciObject seq);
-
-  public:
-    virtual ~SciSwigIterator();
-
-    virtual SwigSciObject value() const = 0;
-
-    virtual SciSwigIterator *incr(size_t n = 1) = 0;
-
-    virtual SciSwigIterator *decr(size_t n = 1);
-
-    virtual ptrdiff_t distance(const SciSwigIterator &x) const;
-
-    virtual bool equal (const SciSwigIterator &x) const;
-
-    virtual SciSwigIterator *copy() const = 0;
-
-    SwigSciObject next();
-    SwigSciObject previous();
-    SciSwigIterator *advance(ptrdiff_t n);
-
-    bool operator == (const SciSwigIterator& x)  const;
-    bool operator != (const SciSwigIterator& x) const;
-    SciSwigIterator* operator ++ ();
-    SciSwigIterator* operator -- ();
-    SciSwigIterator* operator + (ptrdiff_t n) const;
-    SciSwigIterator* operator - (ptrdiff_t n) const;
-    ptrdiff_t operator - (const SciSwigIterator& x) const;
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scilab.swg b/dependencies2013/win32/swig/Lib/scilab/scilab.swg
deleted file mode 100644
index 3b5f6e81..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scilab.swg
+++ /dev/null
@@ -1,6 +0,0 @@
-%include <typemaps/swigmacros.swg>
-%include <typemaps/fragments.swg>
-%include <scimacros.swg>
-%include <sciruntime.swg>
-%include <scitypemaps.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scilist.swg b/dependencies2013/win32/swig/Lib/scilab/scilist.swg
deleted file mode 100644
index 513f40b6..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scilist.swg
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Scilab list related functions
- *
- */
-
-%fragment("SWIG_ScilabList", "header")
-{
-SWIGINTERN int
-SWIG_GetScilabList(SwigSciObject obj, int **piListAddr)
-{
-  SciErr sciErr;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, piListAddr);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-
-SWIGINTERN int
-SWIG_GetScilabListSize(SwigSciObject obj, int *piListSize)
-{
-  SciErr sciErr;
-  int *piListAddr;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piListAddr);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getListItemNumber(pvApiCtx, piListAddr, piListSize);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-
-SWIGINTERN int
-SWIG_GetScilabListAndSize(SwigSciObject obj, int **piListAddr, int *piListSize)
-{
-  SciErr sciErr;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, piListAddr);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getListItemNumber(pvApiCtx, *piListAddr, piListSize);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-
-SWIGINTERN int
-SWIG_CheckScilabList(SwigSciObject obj)
-{
-  SciErr sciErr;
-  int *piListAddr;
-  int iType;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piListAddr);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piListAddr, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if ((iType != sci_list) && (iType != sci_tlist) && (iType != sci_mlist)) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A list is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scilong.swg b/dependencies2013/win32/swig/Lib/scilab/scilong.swg
deleted file mode 100644
index 4e55be53..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scilong.swg
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * C-type: long
- * Scilab type: double or int32
- */
-
-%fragment(SWIG_AsVal_frag(long), "header", fragment="SWIG_SciDoubleOrInt32_AsLong", fragment="<limits.h>") {
-%#define SWIG_AsVal_long(scilabValue, valuePointer) SWIG_SciDoubleOrInt32_AsLong(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName());
-}
-%fragment("SWIG_SciDoubleOrInt32_AsLong", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt32_AsLong(void *pvApiCtx, SwigSciObject iVar, long *plValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    int iPrec = 0;
-    int *piData = NULL;
-
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iPrec != SCI_INT32) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    sciErr = getMatrixOfInteger32(pvApiCtx, piAddrVar, &iRows, &iCols, &piData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iRows * iCols != 1) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    *plValue = (long) *piData;
-  }
-  else if (iType == sci_matrix) {
-    double *pdData = NULL;
-    double dValue = 0.0f;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iRows * iCols != 1) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    dValue = *pdData;
-    if (dValue != floor(dValue)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 32-bit signed integer.\n"), fname, iVar);
-      return SWIG_ValueError;
-    }
-    if ((dValue < LONG_MIN) || (dValue > LONG_MAX)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 32-bit signed integer.\n"), fname, iVar);
-      return SWIG_OverflowError;
-    }
-    *plValue = (long) dValue;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double expected.\n"), fname, iVar);
-    return SWIG_TypeError;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(long), "header", fragment="SWIG_SciDouble_FromLong") {
-%#define SWIG_From_long(scilabValue) SWIG_SciDouble_FromLong(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_FromLong", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromLong(void *pvApiCtx, int iVarOut, long lValue, char *fname) {
-  if (createScalarDouble(pvApiCtx,
-    SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) lValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-
-%fragment("SWIG_SciDouble_FromLongArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromLongArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const long *plData) {
-  SciErr sciErr;
-  int i;
-  double *pdValues = NULL;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++) {
-    pdValues[i] = plData[i];
-  }
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-  free(pdValues);
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scilonglong.swg b/dependencies2013/win32/swig/Lib/scilab/scilonglong.swg
deleted file mode 100644
index 02d9b2fa..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scilonglong.swg
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * C-type: long long
- * Scilab 5 type: NONE
- * Scilab 6 type: int64
- */
-%fragment(SWIG_AsVal_frag(long long), "header", fragment="SWIG_SciInt64_ToLongLong") {
-%#define SWIG_AsVal_long_SS_long(scilabValue, valuePointer) SWIG_SciInt64_ToLongLong(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciInt64_ToLongLong", "header") {
-SWIGINTERN int
-SWIG_SciInt64_ToLongLong(void *pvApiCtx, int iVar, long long *pllValue, char *fname) {
-  Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Scilab 5.X does not manage '%s' data type.\n"), "SWIG_SciInt64_ToLongLong", "int64");
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_From_frag(long long), "header", fragment="SWIG_SciInt64_FromLongLong") {
-#define SWIG_From_long_SS_long(value) SWIG_SciInt64_FromLongLong(pvApiCtx, $result, value)
-}
-%fragment("SWIG_SciInt64_FromLongLong", "header") {
-SWIGINTERN int
-SWIG_SciInt64_FromLongLong(void *pvApiCtx, int iVarOut, long long llValue) {
-  Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Scilab 5.X does not manage '%s' data type.\n"), "SWIG_SciInt64_ToLongLong", "int64");
-  return SWIG_ERROR;
-}
-}
-
-/*
- * C-type: unsigned long long
- * Scilab 5 type: NONE
- * Scilab 6 type: uint64
- */
-%fragment(SWIG_AsVal_frag(unsigned long long), "header", fragment="SWIG_SciUint64_ToUnsignedLongLong") {
-#define SWIG_AsVal_unsigned_SS_long_SS_long(scilabValue, valuePointer) SWIG_SciUint64_ToUnsignedLongLong(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciUint64_ToUnsignedLongLong", "header") {
-SWIGINTERN int
-SWIG_SciUint64_ToUnsignedLongLong(void *pvApiCtx, int iVar, unsigned long long *pullValue, char *fname) {
-  Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Scilab 5.X does not manage '%s' data type.\n"), "SWIG_SciUint64_ToLongLong", "uint64");
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_From_frag(unsigned long long), "header", fragment="SWIG_SciUint64_FromUnsignedLongLong") {
-#define SWIG_From_unsigned_SS_long_SS_long(value) SWIG_SciUint64_FromUnsignedLongLong(pvApiCtx, $result, value)
-}
-%fragment("SWIG_SciUint64_FromUnsignedLongLong", "header") {
-SWIGINTERN int
-SWIG_SciUint64_FromUnsignedLongLong(void *pvApiCtx, int iVarOut, unsigned long long llValue) {
-  Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Scilab 5.X does not manage '%s' data type.\n"), "SWIG_SciUint64_ToLongLong", "uint64");
-  return SWIG_ERROR;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scimacros.swg b/dependencies2013/win32/swig/Lib/scilab/scimacros.swg
deleted file mode 100644
index 669ca893..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scimacros.swg
+++ /dev/null
@@ -1,5 +0,0 @@
- #define %scilabconst(flag) %feature("scilab:const","flag")
-
-// Create Scilab variable
-#define SWIG_CreateScilabVariable_frag(Type...) %fragment_name(CreateScilabVariable, Type)
-#define SWIG_CreateScilabVariable_dec(Type...) %symbol_name(CreateScilabVariable, Type)
diff --git a/dependencies2013/win32/swig/Lib/scilab/scimatrixbool.swg b/dependencies2013/win32/swig/Lib/scilab/scimatrixbool.swg
deleted file mode 100644
index a43886b4..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scimatrixbool.swg
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * C-type: bool array
- * Scilab type: bool matrix
- */
-
-%include <scibool.swg>
-
-// in (bool *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-
-%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-{
-  if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// in (int IN_ROWCOUNT, int IN_COLCOUNT, bool *IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, bool *IN)
-{
-  if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// in (bool *IN, int IN_SIZE)
-
-%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *IN, int IN_SIZE) (int rowCount, int colCount)
-{
-  if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) {
-    $2 = rowCount * colCount;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// in (int IN_SIZE, bool *IN)
-
-%typemap(in, noblock=1) (int IN_SIZE, bool *IN) (int rowCount, int colCount)
-{
-  if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) {
-    $1 = rowCount * colCount;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// out (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-
-%typemap(in, noblock=1, numinputs=0) (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-}
-
-%typemap(arginit, noblock=1) (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  $1 = (bool**) malloc(sizeof(bool*));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (int*) malloc(sizeof(int));
-}
-
-%typemap(freearg, noblock=1) (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  free(*$1);
-  free($1);
-  free($2);
-  free($3);
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (bool**) malloc(sizeof(bool*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
-{
-  if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
-{
-  free($1);
-  free($2);
-  free(*$3);
-  free($3);
-}
-
-
-// out (bool **OUT, int *OUT_SIZE)
-
-%typemap(in, noblock=1, numinputs=0) (bool **OUT, int *OUT_SIZE)
-{
-}
-
-%typemap(arginit, noblock=1) (bool **OUT, int *OUT_SIZE)
-{
-  $1 = (bool**) malloc(sizeof(bool*));
-  $2 = (int*) malloc(sizeof(int));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **OUT, int *OUT_SIZE)
-{
-  if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (bool **OUT, int *OUT_SIZE)
-{
-  free(*$1);
-  free($1);
-  free($2);
-}
-
-
-// out (int *OUT_SIZE, bool **OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, bool **OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_SIZE, bool **OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (bool**) malloc(sizeof(bool*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *OUT_SIZE, bool **OUT)
-{
-  if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_SIZE, bool **OUT)
-{
-  free($1);
-  free(*$2);
-  free($2);
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scimatrixchar.swg b/dependencies2013/win32/swig/Lib/scilab/scimatrixchar.swg
deleted file mode 100644
index 37f68339..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scimatrixchar.swg
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * C-type: char*
- * Scilab type: string matrix
- */
-
-%include <scichar.swg>
-
-// in (char **IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-
-%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-{
-  if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// in (int IN_ROWCOUNT, int IN_COLCOUNT, char **IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, char **IN)
-{
-  if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// in (char **IN, int IN_SIZE)
-
-%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **IN, int IN_SIZE) (int rowCount, int colCount)
-{
-  if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) {
-    $2 = rowCount * colCount;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// in (int IN_SIZE, char **IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int IN_SIZE, char **IN) (int rowCount, int colCount)
-{
-  if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) {
-    $1 = rowCount * colCount;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// out (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-
-%typemap(in, noblock=1, numinputs=0) (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-}
-
-%typemap(arginit, noblock=1) (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  $1 = (char***) malloc(sizeof(char**));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (int*) malloc(sizeof(int));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  {
-    int i;
-    for (i = 0; i < (*$2) * (*$3); i++)
-      free((*$1)[i]);
-  }
-  free(*$1);
-  free($1);
-  free($2);
-  free($3);
-}
-
-// out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
-{
-  $1 = (char***) malloc(sizeof(char**));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (int**) malloc(sizeof(int*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
-{
-  if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
-{
-  free($1);
-  free($2);
-  {
-    int i;
-    for (i = 0; i < (*$1) * (*$2); i++)
-      free((*$3)[i]);
-  }
-  free(*$3);
-  free($3);
-}
-
-
-// out (char ***OUT, int *OUT_SIZE)
-
-%typemap(in, noblock=1, numinputs=0) (char ***OUT, int *OUT_SIZE)
-{
-}
-
-%typemap(arginit, noblock=1) (char ***OUT, int *OUT_SIZE)
-{
-  $1 = (char***) malloc(sizeof(char**));
-  $2 = (int*) malloc(sizeof(int));
-}
-
-%typemap(freearg, noblock=1) (char ***OUT, int *OUT_SIZE)
-{
-  {
-    int i;
-    for (i = 0; i < *$2; i++)
-      free((*$1)[i]);
-  }
-  free(*$1);
-  free($1);
-  free($2);
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***OUT, int *OUT_SIZE)
-{
-  if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// in (int IN_SIZE, char **IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int IN_SIZE, char **IN)
-{
-  if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$1, &$2, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// out (int *OUT_SIZE, char ***OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, char ***OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_SIZE, char ***OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (char***) malloc(sizeof(char**));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *OUT_SIZE, char ***OUT)
-{
-  if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_SIZE, char ***OUT)
-{
-  free($1);
-  {
-    int i;
-    for (i = 0; i < *$1; i++)
-      free((*$2)[i]);
-  }
-  free(*$2);
-  free($2);
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scimatrixdouble.swg b/dependencies2013/win32/swig/Lib/scilab/scimatrixdouble.swg
deleted file mode 100644
index 9444a807..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scimatrixdouble.swg
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * C-type: double array
- * Scilab type: double matrix
- */
-
-%include <scidouble.swg>
-
-// in (double *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-{
-  if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// in (int IN_ROWCOUNT, int IN_COLCOUNT, double *IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, double *IN)
-{
-  if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-// in (double *IN, int IN_SIZE)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *IN, int IN_SIZE) (int rowCount, int colCount)
-{
-  if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) {
-	$2 = rowCount * colCount;
-  }
-  else {
-	return SWIG_ERROR;
-  }
-}
-
-// in (int IN_SIZE, double *IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int IN_SIZE, double *IN) (int rowCount, int colCount)
-{
-  if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) {
-    $1 = rowCount * colCount;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// out (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-
-%typemap(in, noblock=1, numinputs=0) (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-}
-
-%typemap(arginit, noblock=1) (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  $1 = (double**) malloc(sizeof(double*));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (int*) malloc(sizeof(int));
-}
-
-%typemap(freearg, noblock=1) (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  free(*$1);
-  free($1);
-  free($2);
-  free($3);
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-// out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (double**) malloc(sizeof(double*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *IN_ROWCOUNT, int *IN_COLCOUNT, double **OUT)
-{
-  if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
-{
-  free($1);
-  free($2);
-  free(*$3);
-  free($3);
-}
-
-
-// out (double **OUT, int *OUT_SIZE)
-
-%typemap(in, noblock=1, numinputs=0) (double **OUT, int *OUT_SIZE)
-{
-}
-
-%typemap(arginit, noblock=1) (double **OUT, int *OUT_SIZE)
-{
-  $1 = (double**) malloc(sizeof(double*));
-  $2 = (int*) malloc(sizeof(int));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **OUT, int *OUT_SIZE)
-{
-  if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (double **OUT, int *OUT_SIZE)
-{
-  free(*$1);
-  free($1);
-  free($2);
-}
-
-
-// out (int *OUT_SIZE, double **OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, double **OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_SIZE, double **OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (double**) malloc(sizeof(double*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *OUT_SIZE, double **OUT)
-{
-  if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_SIZE, double **OUT)
-{
-  free($1);
-  free(*$2);
-  free($2);
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scimatrixint.swg b/dependencies2013/win32/swig/Lib/scilab/scimatrixint.swg
deleted file mode 100644
index e304d4f6..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scimatrixint.swg
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * C-type: int array
- * Scilab type: 32-bit integer matrix
- */
-
-%include <sciint.swg>
-
-// in (int *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
-{
-  if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-
-// in (int IN_ROWCOUNT, int IN_COLCOUNT, int *IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, int *IN)
-{
-  if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-
-// in (int *IN, int IN_SIZE)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *IN, int IN_SIZE) (int rowCount, int colCount)
-{
-  if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) {
-    $2 = rowCount * colCount;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-
-// in (int IN_SIZE, int *IN)
-
-%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int IN_SIZE, int *IN) (int rowCount, int colCount)
-{
-  if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) {
-	$1 = rowCount * colCount;
-  }
-  else {
-	return SWIG_ERROR;
-  }
-}
-
-// out (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-
-%typemap(in, noblock=1, numinputs=0) (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-}
-
-%typemap(arginit, noblock=1) (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  $1 = (int**) malloc(sizeof(int*));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (int*) malloc(sizeof(int));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
-{
-  free(*$1);
-  free($1);
-  free($2);
-  free($3);
-}
-
-
-// out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (int*) malloc(sizeof(int));
-  $3 = (int**) malloc(sizeof(int*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
-{
-  if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
-{
-  free($1);
-  free($2);
-  free(*$3);
-  free($3);
-}
-
-
-// out (int **OUT, int *OUT_SIZE)
-
-%typemap(in, noblock=1, numinputs=0) (int **OUT, int *OUT_SIZE)
-{
-}
-
-%typemap(arginit) (int **OUT, int *OUT_SIZE)
-{
-  $1 = (int**) malloc(sizeof(int*));
-  $2 = (int*) malloc(sizeof(int));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **OUT, int *OUT_SIZE)
-{
-  if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int **OUT, int *OUT_SIZE)
-{
-  free(*$1);
-  free($1);
-  free($2);
-}
-
-
-// out (int *OUT_SIZE, int **OUT)
-
-%typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, int **OUT)
-{
-}
-
-%typemap(arginit, noblock=1) (int *OUT_SIZE, int **OUT)
-{
-  $1 = (int*) malloc(sizeof(int));
-  $2 = (int**) malloc(sizeof(int*));
-}
-
-%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *OUT_SIZE, int **OUT)
-{
-  if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) {
-    SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition());
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-%typemap(freearg, noblock=1) (int *IN_SIZE, int **OUT)
-{
-  free($1);
-  free(*$2);
-  free($2);
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scimisctypes.swg b/dependencies2013/win32/swig/Lib/scilab/scimisctypes.swg
deleted file mode 100644
index fe75e156..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scimisctypes.swg
+++ /dev/null
@@ -1,69 +0,0 @@
-// Other primitive such as size_t and ptrdiff_t
-
-/*
- * C-type: size_t
- * Scilab type: double or int32
- */
-
-%fragment(SWIG_AsVal_frag(size_t), "header", fragment="SWIG_Int_AsSize") {
-%#define SWIG_AsVal_size_t(scilabValue, valuePointer) SWIG_Int_AsSize(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_Int_AsSize", "header", fragment=SWIG_AsVal_frag(int))
-{
-SWIGINTERN int
-SWIG_Int_AsSize(void *pvApiCtx, SwigSciObject iVar, size_t *piValue, char *fname) {
-  int iValue = 0;
-  if (SWIG_AsVal_dec(int)(iVar, &iValue) != SWIG_OK)
-    return SWIG_ERROR;
-
-  if (piValue)
-    *piValue = (size_t) iValue;
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(size_t), "header", fragment="SWIG_Int_FromSize") {
-%#define SWIG_From_size_t(scilabValue) SWIG_Int_FromSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_Int_FromSize", "header", fragment=SWIG_From_frag(int))
-{
-SWIGINTERN int
-SWIG_Int_FromSize(void *pvApiCtx, int iVarOut, size_t iValue, char *fname) {
-  return SWIG_From_dec(int)((int)iValue);
-}
-}
-
-/*
- * C-type: ptrdiff_t
- * Scilab type: double or int32
- */
-
-%fragment(SWIG_AsVal_frag(ptrdiff_t), "header", fragment="SWIG_Int_AsPtrDiff") {
-%#define SWIG_AsVal_ptrdiff_t(scilabValue, valuePointer) SWIG_Int_AsPtrDiff(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_Int_AsPtrDiff", "header", fragment=SWIG_AsVal_frag(int))
-{
-SWIGINTERN int
-SWIG_Int_AsPtrDiff(void *pvApiCtx, SwigSciObject iVar, ptrdiff_t *piValue, char *fname) {
-  int iValue = 0;
-  if (SWIG_AsVal_dec(int)(iVar, &iValue) != SWIG_OK)
-    return SWIG_ERROR;
-
-  if (piValue)
-    *piValue = (ptrdiff_t) iValue;
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(ptrdiff_t), "header", fragment="SWIG_Int_FromPtrDiff") {
-%#define SWIG_From_ptrdiff_t(scilabValue) SWIG_Int_FromPtrDiff(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_Int_FromPtrDiff", "header", fragment=SWIG_From_frag(int)) {
-SWIGINTERN int
-SWIG_Int_FromPtrDiff(void *pvApiCtx, int iVarOut, ptrdiff_t iValue, char *fname) {
-  return SWIG_From_dec(int)((int)iValue);
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scipointer.swg b/dependencies2013/win32/swig/Lib/scilab/scipointer.swg
deleted file mode 100644
index 94ca4ef3..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scipointer.swg
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * POINTER
- */
-%fragment("SWIG_ConvertPtr", "header") {
-#define SWIG_ConvertPtr(scilabValue, voidPointer, pointerDescriptor, flags) SwigScilabPtrToObject(pvApiCtx, scilabValue, voidPointer, pointerDescriptor, flags, SWIG_Scilab_GetFuncName())
-}
-
-%fragment("SWIG_NewPointerObj", "header") {
-#define SWIG_NewPointerObj(pointer, pointerDescriptor, flags) SwigScilabPtrFromObject(pvApiCtx, SWIG_Scilab_GetOutputPosition(), pointer, pointerDescriptor, flags, NULL)
-}
-
-/*
- * FUNCTION POINTER
- */
-%fragment("SWIG_ConvertFunctionPtr", "header") {
-#define SWIG_ConvertFunctionPtr(scilabValue, voidPointer, pointerDescriptor) SwigScilabPtrToObject(pvApiCtx, scilabValue, voidPointer, pointerDescriptor, 0, SWIG_Scilab_GetFuncName())
-}
-
-%fragment("SWIG_NewFunctionPtrObj", "header") {
-#define SWIG_NewFunctionPtrObj(pointer, pointerDescriptor) SwigScilabPtrFromObject(pvApiCtx, SWIG_Scilab_GetOutputPosition(), pointer, pointerDescriptor, 0, NULL)
-}
-// No fragment used here, the functions "SwigScilabPtrToObject" and "SwigScilabPtrFromObject" are defined in sciruntime.swg
-
-/*
- * C++ member pointers, ie, member methods
- */
-%fragment("SWIG_NewMemberObj", "header") {
-#define SWIG_NewMemberObj(ptr, sz, tp) SWIG_Scilab_NewMemberObj(pvApiCtx, $result, ptr, sz, tp)
-}
-%fragment("SWIG_ConvertMember", "header") {
-#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIG_Scilab_ConvertPacked(pvApiCtx, obj, ptr, sz, ty, SWIG_Scilab_GetFuncName())
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciprimtypes.swg b/dependencies2013/win32/swig/Lib/scilab/sciprimtypes.swg
deleted file mode 100644
index b5e30d93..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciprimtypes.swg
+++ /dev/null
@@ -1,23 +0,0 @@
-%include <scidouble.swg>
-%include <scifloat.swg>
-
-%include <scilonglong.swg>
-
-%include <sciint.swg>
-%include <sciunsignedint.swg>
-
-%include <scilong.swg>
-%include <sciunsignedlong.swg>
-
-%include <scishort.swg>
-%include <sciunsignedshort.swg>
-
-%include <scichar.swg>
-%include <scisignedchar.swg>
-%include <sciunsignedchar.swg>
-
-%include <scimisctypes.swg>
-
-%include <scipointer.swg>
-%include <scibool.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scirun.swg b/dependencies2013/win32/swig/Lib/scilab/scirun.swg
deleted file mode 100644
index 29f8096e..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scirun.swg
+++ /dev/null
@@ -1,481 +0,0 @@
-/* -----------------------------------------------------------------------------
- * Scilab support runtime
- * -----------------------------------------------------------------------------*/
-
-/* Scilab version macro */
-
-#include "version.h"
-#define SWIG_SCILAB_VERSION (SCI_VERSION_MAJOR * 100) + (SCI_VERSION_MINOR * 10) + SCI_VERSION_MAINTENANCE
-
-/* Scilab standard headers */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "api_scilab.h"
-#if SWIG_SCILAB_VERSION < 540
-#define __USE_DEPRECATED_STACK_FUNCTIONS__
-#include "stack-c.h"
-#endif
-#if SWIG_SCILAB_VERSION < 600
-#include "MALLOC.h"
-#endif
-#include "Scierror.h"
-#include "localization.h"
-#include "freeArrayOfString.h"
-#include <sci_gateway.h>
-#include <mex.h>
-#ifdef __cplusplus
-}
-#endif
-
-/* Gateway signature */
-
-#if SWIG_SCILAB_VERSION >= 600
-#define SWIG_GatewayParameters char* fname, void *pvApiCtx
-#define SWIG_GatewayArguments fname, pvApiCtx
-#else
-#define SWIG_GatewayParameters char* fname, unsigned long fname_len
-#define SWIG_GatewayArguments fname, fname_len
-#endif
-
-/* Function name management functions */
-
-#include <stdlib.h>
-static char *SwigFuncName = NULL;
-static char *SWIG_Scilab_GetFuncName(void) {
-  return SwigFuncName;
-}
-static void SWIG_Scilab_SetFuncName(char *funcName) {
-  if (SwigFuncName != NULL) {
-    free(SwigFuncName);
-  }
-  SwigFuncName = strdup(funcName);
-}
-
-/* Api context management functions */
-
-#if SWIG_SCILAB_VERSION >= 600
-static void *pvApiCtx = NULL;
-static void SWIG_Scilab_SetApiContext(void *apiCtx) {
-  pvApiCtx = apiCtx;
-}
-#else
-#define SWIG_Scilab_SetApiContext(apiCtx)
-#endif
-
-/* Argument management functions */
-
-#if SWIG_SCILAB_VERSION >= 540
-#define SWIG_CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument)
-#define SWIG_CheckInputArgumentAtLeast(pvApiCtx, minInputArgument) CheckInputArgumentAtLeast(pvApiCtx, minInputArgument)
-#define SWIG_CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument)
-#define SWIG_NbInputArgument(pvApiCtx) nbInputArgument(pvApiCtx)
-#define SWIG_AssignOutputArgument(pvApiCtx, outputArgumentPos, argumentPos) AssignOutputVariable(pvApiCtx, outputArgumentPos) = argumentPos
-#else
-#define SWIG_CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) CheckRhs(minInputArgument, maxInputArgument)
-#define SWIG_CheckInputArgumentAtLeast(pvApiCtx, minInputArgument) CheckRhs(minInputArgument, 256)
-#define SWIG_CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) CheckLhs(minOutputArgument, maxOutputArgument)
-#define SWIG_NbInputArgument(pvApiCtx) Rhs
-#define SWIG_AssignOutputArgument(pvApiCtx, outputArgumentPos, argumentPos) LhsVar(outputArgumentPos) = argumentPos
-#endif
-
-typedef int SwigSciObject;
-
-static int SwigOutputPosition = -1;
-static int SWIG_Scilab_GetOutputPosition(void) {
-  return SwigOutputPosition;
-}
-static void SWIG_Scilab_SetOutputPosition(int outputPosition) {
-  SwigOutputPosition = outputPosition;
-}
-
-SWIGRUNTIME int
-SWIG_Scilab_SetOutput(void *pvApiCtx, SwigSciObject output) {
-  int outputPosition = SWIG_Scilab_GetOutputPosition();
-  if (outputPosition < 0)
-      return SWIG_ERROR;
-  SWIG_AssignOutputArgument(pvApiCtx, outputPosition,
-    SWIG_NbInputArgument(pvApiCtx) + outputPosition);
-  return SWIG_OK;
-}
-
-/* Error functions */
-
-#define SCILAB_API_ARGUMENT_ERROR 999
-
-SWIGINTERN const char*
-SWIG_Scilab_ErrorType(int code) {
-  switch(code) {
-  case SWIG_MemoryError:
-    return "MemoryError";
-  case SWIG_IOError:
-    return "IOError";
-  case SWIG_RuntimeError:
-    return "RuntimeError";
-  case SWIG_IndexError:
-    return "IndexError";
-  case SWIG_TypeError:
-    return "TypeError";
-  case SWIG_DivisionByZero:
-    return "ZeroDivisionError";
-  case SWIG_OverflowError:
-    return "OverflowError";
-  case SWIG_SyntaxError:
-    return "SyntaxError";
-  case SWIG_ValueError:
-    return "ValueError";
-  case SWIG_SystemError:
-    return "SystemError";
-  case SWIG_AttributeError:
-    return "AttributeError";
-  default:
-    return "RuntimeError";
-  }
-}
-#define SWIG_ErrorType(code) SWIG_Scilab_ErrorType(code)
-
-#ifndef SWIG_SCILAB_ERROR
-#define SWIG_SCILAB_ERROR 20000
-#endif
-
-SWIGINTERN void
-SWIG_Scilab_Error(int code, const char *msg) {
-  Scierror(SWIG_SCILAB_ERROR - code, _("SWIG/Scilab: %s: %s\n"), SWIG_Scilab_ErrorType(code), msg);
-}
-
-#define SWIG_Error(code, msg) SWIG_Scilab_Error(code, msg)
-
-#define SWIG_fail return SWIG_ERROR;
-
-SWIGRUNTIME void
-SWIG_Scilab_Raise_Ex(const char *obj, const char *type, swig_type_info *descriptor) {
-  if (type) {
-    if (obj)
-      Scierror(SWIG_SCILAB_ERROR, "SWIG/Scilab: Exception (%s) occured: %s\n", type, obj);
-    else
-      Scierror(SWIG_SCILAB_ERROR, "SWIG/Scilab: Exception (%s) occured.\n", type);
-  }
-}
-
-SWIGRUNTIME void
-SWIG_Scilab_Raise(const int obj, const char *type, swig_type_info *descriptor) {
-  Scierror(SWIG_SCILAB_ERROR, "SWIG/Scilab: Exception (%s) occured.\n", type);
-}
-
-/* Module initialization */
-
-static int swig_module_initialized = 0;
-
-SWIGRUNTIME int
-SWIG_Module_Initialized() {
-  return swig_module_initialized;
-}
-
-/* Pointer conversion functions */
-
-SWIGRUNTIME swig_type_info *
-SWIG_Scilab_TypeQuery(const char *name);
-
-SWIGINTERN int
-SwigScilabCheckPtr(void *pvApiCtx, int iVar, swig_type_info *descriptor, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  int iType = 0;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_mlist) {
-    int iItemCount = 0;
-    void *pvTypeinfo = NULL;
-
-    sciErr = getListItemNumber(pvApiCtx, piAddrVar, &iItemCount);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iItemCount < 3) {
-      return SWIG_ERROR;
-    }
-
-    sciErr = getPointerInList(pvApiCtx, piAddrVar, 2, &pvTypeinfo);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    if (descriptor) {
-      swig_cast_info *cast = SWIG_TypeCheck(SWIG_TypeName((swig_type_info*)pvTypeinfo), descriptor);
-      return (cast != NULL);
-    }
-    else {
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    return (iType == sci_pointer);
-  }
-}
-
-SWIGINTERN int
-SwigScilabPtrToObject(void *pvApiCtx, int iVar, void **pvObj, swig_type_info *descriptor, int flags, char *fname) {
-  SciErr sciErr;
-  int *piAddrVar = NULL;
-  int iType = 0;
-  void *pvPtr = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_mlist) {
-    int iItemCount = 0;
-    void *pvTypeinfo = NULL;
-
-    sciErr = getListItemNumber(pvApiCtx, piAddrVar, &iItemCount);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iItemCount < 3) {
-      return SWIG_ERROR;
-    }
-
-    sciErr = getPointerInList(pvApiCtx, piAddrVar, 2, &pvTypeinfo);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    sciErr = getPointerInList(pvApiCtx, piAddrVar, 3, &pvPtr);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    if (pvPtr) {
-      if (descriptor) {
-        swig_cast_info *cast = SWIG_TypeCheck(SWIG_TypeName((swig_type_info *)pvTypeinfo), descriptor);
-        if (cast) {
-          int newmemory = 0;
-          pvPtr = SWIG_TypeCast(cast, pvPtr, &newmemory);
-          // TODO newmemory
-        }
-        else {
-          return SWIG_ERROR;
-        }
-      }
-    }
-  }
-  else if (iType == sci_pointer) {
-    sciErr = getPointer(pvApiCtx, piAddrVar, &pvPtr);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    return SWIG_ERROR;
-  }
-
-  if (pvObj) {
-    *pvObj = pvPtr;
-    return SWIG_OK;
-  }
-  else {
-    return SWIG_ERROR;
-  }
-}
-
-SWIGRUNTIMEINLINE int
-SwigScilabPtrFromObject(void *pvApiCtx, int iVarOut, void *pvObj, swig_type_info *descriptor, int flags, const char *pstTypeName) {
-  SciErr sciErr;
-
-  if (descriptor) {
-    int *piMListAddr = NULL;
-
-    sciErr = createMList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, 3, &piMListAddr);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    if (pstTypeName == NULL) {
-      pstTypeName = SWIG_TypeName(descriptor);
-    }
-
-    sciErr = createMatrixOfStringInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piMListAddr, 1, 1, 1, &pstTypeName);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    sciErr = createPointerInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piMListAddr, 2, descriptor);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    sciErr = createPointerInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piMListAddr, 3, pvObj);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    sciErr = createPointer(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, pvObj);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-
-  return SWIG_OK;
-}
-
-/* Pointer argument conversions */
-
-
-SWIGRUNTIME int
-SWIG_Scilab_ConvertPacked(void *pvApiCtx, int iVar, void *ptr, int sz, swig_type_info *ty, char *fname) {
-  swig_cast_info *tc;
-  int *piAddrVar = NULL;
-  char *pstString = NULL;
-  char *pstStringPtr = NULL;
-  SciErr sciErr;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (getAllocatedSingleString(pvApiCtx, piAddrVar, &pstString)) {
-    return SWIG_ERROR;
-  }
-
-  /* Pointer values must start with leading underscore */
-  if (*pstString != '_') {
-    freeAllocatedSingleString(pstString);
-    return SWIG_ERROR;
-  }
-
-  pstStringPtr = pstString;
-  pstStringPtr++;
-  pstStringPtr = (char*)SWIG_UnpackData(pstStringPtr, ptr, sz);
-
-  if (ty) {
-    if (!pstStringPtr) {
-      freeAllocatedSingleString(pstString);
-      return SWIG_ERROR;
-    }
-    tc = SWIG_TypeCheck(pstStringPtr, ty);
-    if (!tc) {
-      freeAllocatedSingleString(pstString);
-      return SWIG_ERROR;
-    }
-  }
-
-  freeAllocatedSingleString(pstString);
-  return SWIG_OK;
-}
-
-SWIGRUNTIME int
-SWIG_Scilab_NewMemberObj(void *pvApiCtx, int iVarOut, void *ptr, int sz, swig_type_info *type) {
-  char result[1024];
-  char *r = result;
-
-  if ((2*sz + 1 + strlen(type->name)) > 1000) {
-    return SWIG_ERROR;
-  }
-  *(r++) = '_';
-  r = SWIG_PackData(r, ptr, sz);
-  strcpy(r, type->name);
-
-  if (createSingleString(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, &result[0]))
-    return SWIG_ERROR;
-
-  return SWIG_OK;
-}
-
-
-
-
-/*
- *  Pointer utility functions
- */
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C"
-#endif
-int SWIG_this(SWIG_GatewayParameters) {
-  void *ptrValue = NULL;
-  if (SwigScilabPtrToObject(pvApiCtx, 1, &ptrValue, NULL, 0, fname) == SWIG_OK) {
-    SWIG_Scilab_SetOutputPosition(1);
-    return SWIG_Scilab_SetOutput(pvApiCtx,
-      createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + 1,
-        (double)(uintptr_t)ptrValue));
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The value is not a pointer.\n"), fname, 1);
-    return SWIG_ERROR;
-  }
-}
-
-#ifdef __cplusplus
-extern "C"
-#endif
-int SWIG_ptr(SWIG_GatewayParameters) {
-  void *ptrValue = NULL;
-  double dValue = 0;
-  if (SwigScilabPtrToObject(pvApiCtx, 1, &ptrValue, NULL, 0, fname) == SWIG_OK) {
-    SWIG_Scilab_SetOutputPosition(1);
-    return SWIG_Scilab_SetOutput(pvApiCtx,
-      SwigScilabPtrFromObject(pvApiCtx, 1, ptrValue, NULL, 0, NULL));
-  }
-  else {
-    int *piAddr;
-    SciErr sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
-    if(sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (getScalarDouble(pvApiCtx, piAddr, &dValue) == 0) {
-      if (dValue != (uintptr_t)dValue) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a pointer.\n"), fname, 1);
-        return SWIG_ValueError;
-      }
-      if ((dValue < 0) || (dValue > ULONG_MAX)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a pointer.\n"), fname, 1);
-        return SWIG_OverflowError;
-      }
-      SWIG_Scilab_SetOutputPosition(1);
-      return SWIG_Scilab_SetOutput(pvApiCtx,
-        SwigScilabPtrFromObject(pvApiCtx, 1, (void *) (uintptr_t)dValue, NULL, 0, NULL));
-    }
-    else {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A pointer or a double expected.\n"), "SWIG_ptr", 1);
-      return SWIG_TypeError;
-    }
-  }
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciruntime.swg b/dependencies2013/win32/swig/Lib/scilab/sciruntime.swg
deleted file mode 100644
index 9abedfe3..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciruntime.swg
+++ /dev/null
@@ -1,45 +0,0 @@
-%insert(runtime) "swigrun.swg";
-%insert(runtime) "swigerrors.swg";
-
-%insert(runtime) "scirun.swg";
-
-%insert(init) %{
-/* Module management functions */
-
-#define SWIG_GetModule(clientdata) SWIG_Scilab_GetModule()
-#define SWIG_SetModule(clientdata, pointer) SWIG_Scilab_SetModule(pointer)
-
-SWIGRUNTIME swig_module_info*
-SWIG_Scilab_GetModule(void) {
-  return NULL;
-}
-
-SWIGRUNTIME void
-SWIG_Scilab_SetModule(swig_module_info *swig_module) {
-}
-%}
-
-%insert(init) "swiginit.swg"
-
-%insert(init) %{
-SWIGRUNTIME swig_type_info *
-SWIG_Scilab_TypeQuery(const char *name) {
-  if (SWIG_Module_Initialized()) {
-    return SWIG_TypeQuery(name);
-  }
-  else {
-    SWIG_Error(SWIG_RuntimeError, "the module is not initialized");
-    return NULL;
-  }
-}
-%}
-
-%insert(init) %{
-#ifdef __cplusplus
-extern "C"
-#endif
-int <module>_Init(SWIG_GatewayParameters) {
-  SWIG_InitializeModule(NULL);
-  SWIG_CreateScilabVariables(pvApiCtx);
-  swig_module_initialized = 1;
-%}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequence.swg b/dependencies2013/win32/swig/Lib/scilab/scisequence.swg
deleted file mode 100644
index 5fe0fdbe..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequence.swg
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *
- * Scilab sequence conversions
- *
- */
-
-#define SWIG_Traits_Sequence_frag(Type) %fragment_name(AsVal_Traits_Sequence, Type)
-
-#define SWIG_AsCheck_Sequence_frag(Type...) %fragment_name(AsCheck_Sequence, Type)
-#define SWIG_AsCheck_Sequence_dec(Type...) %symbol_name(AsCheck_Sequence, Type)
-#define SWIG_AsGet_Sequence_frag(Type...) %fragment_name(AsGet_Sequence, Type)
-#define SWIG_AsGet_Sequence_dec(Type...) %symbol_name(AsGet_Sequence, Type)
-#define SWIG_AsSize_Sequence_frag(Type...) %fragment_name(AsSize_Sequence, Type)
-#define SWIG_AsSize_Sequence_dec(Type...) %symbol_name(AsSize_Sequence, Type)
-#define SWIG_FromCreate_Sequence_frag(Type...) %fragment_name(FromCreate_Sequence, Type)
-#define SWIG_FromCreate_Sequence_dec(Type...) %symbol_name(FromCreate_Sequence, Type)
-#define SWIG_FromSet_Sequence_frag(Type...) %fragment_name(FromSet_Sequence, Type)
-#define SWIG_FromSet_Sequence_dec(Type...) %symbol_name(FromSet_Sequence, Type)
-
-#define SWIG_Traits_SequenceItem_frag(Type) %fragment_name(AsVal_Traits_SequenceItem, Type)
-#define SWIG_AsVal_SequenceItem_frag(Type...) %fragment_name(AsVal_SequenceItem, Type)
-#define SWIG_AsVal_SequenceItem_dec(Type...) %symbol_name(AsVal_SequenceItem, Type)
-#define SWIG_From_SequenceItem_frag(Type...) %fragment_name(From_SequenceItem, Type)
-#define SWIG_From_SequenceItem_dec(Type...) %symbol_name(From_SequenceItem, Type)
-
-%include <scisequencepointer.swg>
-%include <scisequenceint.swg>
-%include <scisequencedouble.swg>
-%include <scisequencefloat.swg>
-%include <scisequencestring.swg>
-%include <scisequencebool.swg>
-
-//
-// Sequence conversion
-//
-
-%fragment(SWIG_Traits_Sequence_frag(ptr), "header",
-  fragment=SWIG_AsCheck_Sequence_frag(ptr),
-  fragment=SWIG_AsGet_Sequence_frag(ptr),
-  fragment=SWIG_AsSize_Sequence_frag(ptr),
-  fragment=SWIG_FromCreate_Sequence_frag(ptr),
-  fragment=SWIG_FromSet_Sequence_frag(ptr),
-  fragment="StdTraits",
-  fragment="<stdint.h>") {
-
-namespace swig {
-  // Error returned for sequence containers of default item type
-  template <typename T> struct traits_as_sequence {
-    static int check(SwigSciObject obj) {
-      throw std::invalid_argument("The container data type is not supported."); 
-    }
-    static int get(SwigSciObject obj, void **sequence) {
-      throw std::invalid_argument("The container data type is not supported."); 
-    }
-    static int size(SwigSciObject obj, int *size) {
-      throw std::invalid_argument("The container data type is not supported."); 
-    }
-  };
-  template <typename T> struct traits_from_sequence {
-    static int create(int size, void **sequence) {
-      throw std::invalid_argument("The container data type is not supported."); 
-    }
-    static SwigSciObject set(int size, void *sequence) {
-      throw std::invalid_argument("The container data type is not supported.");       
-    }
-  };
-
-  // Support sequence containers of pointers
-  template <typename T> struct traits_as_sequence<T*> {
-    static int check(SwigSciObject obj) {
-      return SWIG_AsCheck_Sequence_dec(ptr)(obj);
-    }
-    static int get(SwigSciObject obj, void **sequence) {
-      return SWIG_AsGet_Sequence_dec(ptr)(obj, (int **)sequence);
-    }
-    static int size(SwigSciObject obj, int *size) {
-      return SWIG_AsSize_Sequence_dec(ptr)(obj, size);
-    }
-  };
-  template <typename T> struct traits_from_sequence<T*> {
-    static int create(int size, void **sequence) {
-      return SWIG_FromCreate_Sequence_dec(ptr)(size, (uintptr_t **)sequence);
-    }
-    static SwigSciObject set(int size, void *sequence) {
-      return SWIG_FromSet_Sequence_dec(ptr)(size, (uintptr_t *)sequence);
-    }
-  };
-}
-}
-
-%define %traits_sequence(CppType, ScilabType)
-  %fragment(SWIG_Traits_Sequence_frag(CppType), "header",
-    fragment=SWIG_Traits_Sequence_frag(ptr),
-    fragment=SWIG_AsCheck_Sequence_frag(CppType),
-    fragment=SWIG_AsGet_Sequence_frag(CppType),
-    fragment=SWIG_AsSize_Sequence_frag(CppType),
-    fragment=SWIG_FromCreate_Sequence_frag(CppType),
-    fragment=SWIG_FromSet_Sequence_frag(CppType)) {
-
-namespace swig {
-  template <> struct traits_as_sequence<CppType > {
-    static int check(SwigSciObject obj) {
-      return SWIG_AsCheck_Sequence_dec(CppType)(obj);
-    }
-    static int get(SwigSciObject obj, void **sequence) {
-      return SWIG_AsGet_Sequence_dec(CppType)(obj, (ScilabType **)sequence);
-    }
-    static int size(SwigSciObject obj, int *size) {
-      return SWIG_AsSize_Sequence_dec(CppType)(obj, size);
-    }
-  };
-  template <> struct traits_from_sequence<CppType > {
-    static int create(int size, void **sequence) {
-      return SWIG_FromCreate_Sequence_dec(CppType)(size, (ScilabType **)sequence);
-    }
-    static SwigSciObject set(int size, void *sequence) {
-      return SWIG_FromSet_Sequence_dec(CppType)(size, (ScilabType *)sequence);
-    }
-  };
-}
-}
-%enddef
-
-
-//
-// Sequence item conversion
-//
-
-%fragment(SWIG_Traits_SequenceItem_frag(ptr), "header",
-  fragment=SWIG_AsVal_SequenceItem_frag(ptr),
-  fragment=SWIG_From_SequenceItem_frag(ptr),
-  fragment="StdTraits",
-  fragment="<stdint.h>") {
-
-namespace swig {
-  // Error returned for sequence containers of default item type
-  template <typename T> struct traits_asval_sequenceitem {
-    static T asval(SwigSciObject obj, void *pSequence, int iItemIndex) {
-      throw std::invalid_argument("The container data type is not supported."); 
-    }
-  };
-  template <typename T> struct traits_from_sequenceitem {
-    static int from(void *pSequence, int iItemIndex, T itemValue) {
-      throw std::invalid_argument("The container data type is not supported."); 
-    }
-  };
-
-  // Support sequence containers of pointers
-  template <typename T> struct traits_asval_sequenceitem<T*> {
-    static T* asval(SwigSciObject obj, void *pSequence, int iItemIndex) {
-      return static_cast<T*>(SWIG_AsVal_SequenceItem_dec(ptr)(obj, (int *)pSequence, iItemIndex));
-    }
-  };
-  template <typename T> struct traits_from_sequenceitem<T*> {
-    static int from(void *pSequence, int iItemIndex, T *itemValue) {
-      return SWIG_From_SequenceItem_dec(ptr)((uintptr_t *)pSequence, iItemIndex, (uintptr_t) itemValue);
-     }
-   };
-}
-}
-
-%define %traits_sequenceitem(CppType, ScilabType)
-  %fragment(SWIG_Traits_SequenceItem_frag(CppType), "header",
-    fragment=SWIG_Traits_SequenceItem_frag(ptr),
-    fragment=SWIG_AsVal_SequenceItem_frag(CppType),
-    fragment=SWIG_From_SequenceItem_frag(CppType)) {
-
-namespace swig {
-  template <> struct traits_asval_sequenceitem<CppType > {
-    static CppType asval(SwigSciObject obj, void *pSequence, int iItemIndex) {
-      return SWIG_AsVal_SequenceItem_dec(CppType)(obj, (ScilabType *)pSequence, iItemIndex);
-    }
-  };
-  template <> struct traits_from_sequenceitem<CppType > {
-    static int from(void *pSequence, int iItemIndex, CppType itemValue) {
-      return SWIG_From_SequenceItem_dec(CppType)((ScilabType *)pSequence, iItemIndex, itemValue);
-    }
-  };
-}
-}
-%enddef
-
-%define %add_traits_sequence(CppType, ScilabType)
-  %traits_sequence(CppType, ScilabType);
-  %fragment(SWIG_Traits_Sequence_frag(CppType));
-  %traits_sequenceitem(CppType, ScilabType);
-  %fragment(SWIG_Traits_SequenceItem_frag(CppType));
-%enddef
-
-%add_traits_sequence(int, int);
-%add_traits_sequence(double, double);
-%add_traits_sequence(float, float);
-%add_traits_sequence(std::string, char*);
-%add_traits_sequence(bool, int);
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequencebool.swg b/dependencies2013/win32/swig/Lib/scilab/scisequencebool.swg
deleted file mode 100644
index b7d07844..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequencebool.swg
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *
- * Scilab matrix of bool <-> C++ bool container
- *
- */
-
-%include <scibool.swg>
-
-%fragment(SWIG_AsCheck_Sequence_frag(bool), "header") {
-
-SWIGINTERN int
-SWIG_AsCheck_Sequence_dec(bool)(SwigSciObject obj) {
-  SciErr sciErr;
-  int *piAddrVar;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isBooleanType(pvApiCtx, piAddrVar)) {
-    return SWIG_OK;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A boolean is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_AsGet_Sequence_frag(bool), "header",
-  fragment="SWIG_SciBoolean_AsIntArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsGet_Sequence_dec(bool)(SwigSciObject obj, int **pSequence) {
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  return (SWIG_SciBoolean_AsIntArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, pSequence, SWIG_Scilab_GetFuncName()));
-}
-}
-
-%fragment(SWIG_AsSize_Sequence_frag(bool), "header",
-  fragment="SWIG_SciBoolean_AsIntArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsSize_Sequence_dec(bool)(SwigSciObject obj, int *piSize) {
-  int *piMatrix;
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  if (SWIG_SciBoolean_AsIntArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, &piMatrix, SWIG_Scilab_GetFuncName()) == SWIG_OK) {
-    if ((iMatrixRowCount > 1) && (iMatrixColCount > 1)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: An integer vector is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-      return SWIG_ERROR;
-    }
-    *piSize = iMatrixRowCount * iMatrixColCount;
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromCreate_Sequence_frag(bool), "header") {
-
-SWIGINTERN int
-SWIG_FromCreate_Sequence_dec(bool)(int size, int **pSequence) {
-  *pSequence = new int[size];
-  return *pSequence != NULL ? SWIG_OK : SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromSet_Sequence_frag(bool), "header",
-  fragment="SWIG_SciBoolean_FromIntArrayAndSize") {
-
-SWIGINTERN SwigSciObject
-SWIG_FromSet_Sequence_dec(bool)(int size, int *pSequence) {
-  SwigSciObject obj = SWIG_SciBoolean_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, size, pSequence);
-  delete (int *)pSequence;
-  return obj;
-}
-}
-
-%fragment(SWIG_AsVal_SequenceItem_frag(bool), "header") {
-
-SWIGINTERN bool
-SWIG_AsVal_SequenceItem_dec(bool)(SwigSciObject obj, int *pSequence, int iItemIndex) {
-  return (bool) pSequence[iItemIndex];
-}
-}
-
-%fragment(SWIG_From_SequenceItem_frag(bool), "header") {
-
-SWIGINTERN int
-SWIG_From_SequenceItem_dec(bool)(int *pSequence, int iItemIndex, bool itemValue) {
-  pSequence[iItemIndex] = itemValue;
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequencedouble.swg b/dependencies2013/win32/swig/Lib/scilab/scisequencedouble.swg
deleted file mode 100644
index 29cc52d6..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequencedouble.swg
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *
- * Scilab matrix of double <-> C++ double container
- *
- */
-
-%include <scidouble.swg>
-
-%fragment(SWIG_AsCheck_Sequence_frag(double), "header") {
-
-SWIGINTERN int
-SWIG_AsCheck_Sequence_dec(double)(SwigSciObject obj) {
-  SciErr sciErr;
-  int *piAddrVar;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isDoubleType(pvApiCtx, piAddrVar)) {
-    return SWIG_OK;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A double is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_AsGet_Sequence_frag(double), "header",
-  fragment="SWIG_SciDouble_AsDoubleArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsGet_Sequence_dec(double)(SwigSciObject obj, double **pSequence) {
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  return (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, pSequence, SWIG_Scilab_GetFuncName()));
-}
-}
-
-%fragment(SWIG_AsSize_Sequence_frag(double), "header",
-  fragment="SWIG_SciDouble_AsDoubleArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsSize_Sequence_dec(double)(SwigSciObject obj, int *piSize) {
-  double *pdblMatrix;
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, &pdblMatrix, SWIG_Scilab_GetFuncName()) == SWIG_OK) {
-    if ((iMatrixRowCount > 1) && (iMatrixColCount > 1)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A double vector is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-      return SWIG_ERROR;
-    }
-    *piSize = iMatrixRowCount * iMatrixColCount;
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromCreate_Sequence_frag(double), "header") {
-
-SWIGINTERN int
-SWIG_FromCreate_Sequence_dec(double)(int size, double **pSequence) {
-  *pSequence = new double[size];
-  return *pSequence != NULL ? SWIG_OK : SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromSet_Sequence_frag(double), "header",
-  fragment="SWIG_SciDouble_FromDoubleArrayAndSize") {
-
-SWIGINTERN SwigSciObject
-SWIG_FromSet_Sequence_dec(double)(int size, double *pSequence) {
-  SwigSciObject obj = SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, size, pSequence);
-  delete (double *)pSequence;
-  return obj;
-}
-}
-
-%fragment(SWIG_AsVal_SequenceItem_frag(double), "header") {
-
-SWIGINTERN double
-SWIG_AsVal_SequenceItem_dec(double)(SwigSciObject obj, double *pSequence, int iItemIndex) {
-  return pSequence[iItemIndex];
-}
-}
-
-%fragment(SWIG_From_SequenceItem_frag(double), "header") {
-
-SWIGINTERN int
-SWIG_From_SequenceItem_dec(double)(double *pSequence, int iItemIndex, double itemValue) {
-  pSequence[iItemIndex] = itemValue;
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequencefloat.swg b/dependencies2013/win32/swig/Lib/scilab/scisequencefloat.swg
deleted file mode 100644
index 41d37e55..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequencefloat.swg
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *
- * Scilab matrix of float <-> C++ float container
- *
- */
-
-%include <scifloat.swg>
-
-%fragment(SWIG_AsCheck_Sequence_frag(float), "header") {
-
-SWIGINTERN int
-SWIG_AsCheck_Sequence_dec(float)(SwigSciObject obj) {
-  SciErr sciErr;
-  int *piAddrVar;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isDoubleType(pvApiCtx, piAddrVar)) {
-    return SWIG_OK;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A double is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_AsGet_Sequence_frag(float), "header",
-  fragment="SWIG_SciDouble_AsFloatArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsGet_Sequence_dec(float)(SwigSciObject obj, float **pSequence) {
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  return (SWIG_SciDouble_AsFloatArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, pSequence, SWIG_Scilab_GetFuncName()));
-}
-}
-
-%fragment(SWIG_AsSize_Sequence_frag(float), "header",
-  fragment="SWIG_SciDouble_AsFloatArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsSize_Sequence_dec(float)(SwigSciObject obj, int *piSize) {
-  float *pdblMatrix;
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  if (SWIG_SciDouble_AsFloatArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, &pdblMatrix, SWIG_Scilab_GetFuncName()) == SWIG_OK) {
-    if ((iMatrixRowCount > 1) && (iMatrixColCount > 1)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A float vector is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-      return SWIG_ERROR;
-    }
-    *piSize = iMatrixRowCount * iMatrixColCount;
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromCreate_Sequence_frag(float), "header") {
-
-SWIGINTERN int
-SWIG_FromCreate_Sequence_dec(float)(int size, float **pSequence) {
-  *pSequence = new float[size];
-  return *pSequence != NULL ? SWIG_OK : SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromSet_Sequence_frag(float), "header",
-  fragment="SWIG_SciDouble_FromFloatArrayAndSize") {
-
-SWIGINTERN SwigSciObject
-SWIG_FromSet_Sequence_dec(float)(int size, float *pSequence) {
-  SwigSciObject obj = SWIG_SciDouble_FromFloatArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, size, pSequence);
-  delete (float *)pSequence;
-  return obj;
-}
-}
-
-%fragment(SWIG_AsVal_SequenceItem_frag(float), "header") {
-
-SWIGINTERN float
-SWIG_AsVal_SequenceItem_dec(float)(SwigSciObject obj, float *pSequence, int iItemIndex) {
-  return pSequence[iItemIndex];
-}
-}
-
-%fragment(SWIG_From_SequenceItem_frag(float), "header") {
-SWIGINTERN int
-SWIG_From_SequenceItem_dec(float)(float *pSequence, int iItemIndex, float itemValue) {
-  pSequence[iItemIndex] = itemValue;
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequenceint.swg b/dependencies2013/win32/swig/Lib/scilab/scisequenceint.swg
deleted file mode 100644
index 3a9f7bf6..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequenceint.swg
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *
- * Scilab matrix of int <-> C++ int container
- *
- */
-
-%include <sciint.swg>
-
-%fragment(SWIG_AsCheck_Sequence_frag(int), "header") {
-
-SWIGINTERN int
-SWIG_AsCheck_Sequence_dec(int)(SwigSciObject obj) {
-  SciErr sciErr;
-  int *piAddrVar;
-  int iType = 0;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if ((iType == sci_matrix) || (iType == sci_ints)) {
-    return SWIG_OK;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: An integer is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_AsGet_Sequence_frag(int), "header",
-  fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") {
-SWIGINTERN int
-SWIG_AsGet_Sequence_dec(int)(SwigSciObject obj, int **pSequence) {
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  return (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, pSequence, SWIG_Scilab_GetFuncName()));
-}
-}
-
-%fragment(SWIG_AsSize_Sequence_frag(int), "header",
-  fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsSize_Sequence_dec(int)(SwigSciObject obj, int *piSize) {
-  int *piMatrix;
-  int iMatrixRowCount;
-  int iMatrixColCount;
-  if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, obj, &iMatrixRowCount, &iMatrixColCount, &piMatrix, SWIG_Scilab_GetFuncName()) == SWIG_OK) {
-    if ((iMatrixRowCount > 1) && (iMatrixColCount > 1)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: An integer vector is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-      return SWIG_ERROR;
-    }
-    *piSize = iMatrixRowCount * iMatrixColCount;
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromCreate_Sequence_frag(int), "header") {
-
-SWIGINTERN int
-SWIG_FromCreate_Sequence_dec(int)(int size, int **pSequence) {
-  *pSequence = new int[size];
-  return *pSequence != NULL ? SWIG_OK : SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromSet_Sequence_frag(int), "header",
-  fragment="SWIG_SciDouble_FromIntArrayAndSize") {
-
-SWIGINTERN SwigSciObject
-SWIG_FromSet_Sequence_dec(int)(int size, int *pSequence) {
-  SwigSciObject obj = SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, size, pSequence);
-  delete (int *)pSequence;
-  return obj;
-}
-}
-
-%fragment(SWIG_AsVal_SequenceItem_frag(int), "header") {
-
-SWIGINTERN int
-SWIG_AsVal_SequenceItem_dec(int)(SwigSciObject obj, int *pSequence, int iItemIndex) {
-  return pSequence[iItemIndex];
-}
-}
-
-%fragment(SWIG_From_SequenceItem_frag(int), "header") {
-
-SWIGINTERN int
-SWIG_From_SequenceItem_dec(int)(int *pSequence, int iItemIndex, int itemValue) {
-  pSequence[iItemIndex] = itemValue;
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequencepointer.swg b/dependencies2013/win32/swig/Lib/scilab/scisequencepointer.swg
deleted file mode 100644
index b3618e94..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequencepointer.swg
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *
- * Scilab list of pointer <-> C++ pointer container
- *
- */
-
-%include <scilist.swg>
-
-%fragment("<stdint.h>", "header") {
-%#include <stdint.h>
-}
-
-%fragment(SWIG_AsCheck_Sequence_frag(ptr), "header",
-  fragment="SWIG_ScilabList") {
-
-SWIGINTERN int
-SWIG_AsCheck_Sequence_dec(ptr)(SwigSciObject obj) {
-  return SWIG_CheckScilabList(obj);
-}
-}
-
-%fragment(SWIG_AsGet_Sequence_frag(ptr), "header",
-  fragment="SWIG_ScilabList") {
-
-SWIGINTERN int
-SWIG_AsGet_Sequence_dec(ptr)(SwigSciObject obj, int **piSequence) {
-  return SWIG_GetScilabList(obj, piSequence);
-}
-}
-
-%fragment(SWIG_AsSize_Sequence_frag(ptr), "header",
-  fragment="SWIG_ScilabList") {
-
-SWIGINTERN int
-SWIG_AsSize_Sequence_dec(ptr)(SwigSciObject obj, int *piSize) {
-  return SWIG_GetScilabListSize(obj, piSize);
-}
-}
-
-%fragment(SWIG_FromCreate_Sequence_frag(ptr), "header",
-  fragment="<stdint.h>") {
-
-SWIGINTERN int
-SWIG_FromCreate_Sequence_dec(ptr)(int size, uintptr_t **pSequence) {
-  *pSequence = new uintptr_t[size];
-  return *pSequence != NULL ? SWIG_OK : SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromSet_Sequence_frag(ptr), "header",
-  fragment="<stdint.h>") {
-
-SWIGINTERN SwigSciObject
-SWIG_FromSet_Sequence_dec(ptr)(int size, uintptr_t *pSequence) {
-  SciErr sciErr;
-  int *piListAddr;
-
-  int iVarOut = SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition();
-
-  sciErr = createList(pvApiCtx, iVarOut, size, &piListAddr);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  for (int i=0; i<size; i++) {
-    sciErr = createPointerInList(pvApiCtx, iVarOut, piListAddr, i + 1, (void *)pSequence[i]);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  delete (int*)pSequence;
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_AsVal_SequenceItem_frag(ptr), "header") {
-
-SWIGINTERN void*
-SWIG_AsVal_SequenceItem_dec(ptr)(SwigSciObject obj, int *piSequence, int itemIndex)
-{
-  SciErr sciErr;
-  int *piItemAddr;
-  int iType;
-  void* pItemValue = NULL;
-
-  sciErr = getListItemAddress(pvApiCtx, piSequence, itemIndex + 1, &piItemAddr);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return NULL;
-  }
-
-  sciErr = getVarType(pvApiCtx, piItemAddr, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return NULL;
-  }
-
-  if (iType != sci_pointer) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A pointer is expected at list item #%d.\n"), SWIG_Scilab_GetFuncName(), obj, itemIndex + 1);
-    return NULL;
-  }
-
-  sciErr = getPointerInList(pvApiCtx, piSequence, itemIndex + 1, &pItemValue);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return NULL;
-  }
-
-  return pItemValue;
-}
-}
-
-%fragment(SWIG_From_SequenceItem_frag(ptr), "header",
-  fragment="<stdint.h>") {
-
-SWIGINTERN int
-SWIG_From_SequenceItem_dec(ptr)(uintptr_t *pSequence, int iItemIndex, uintptr_t itemValue) {
-  pSequence[iItemIndex] = itemValue;
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisequencestring.swg b/dependencies2013/win32/swig/Lib/scilab/scisequencestring.swg
deleted file mode 100644
index d3c05e4f..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisequencestring.swg
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Scilab matrix of string <-> C++ std::string container
- *
- */
-
-%include <scichar.swg>
-
-%fragment(SWIG_AsCheck_Sequence_frag(std::string), "header") {
-
-SWIGINTERN int
-SWIG_AsCheck_Sequence_dec(std::string)(SwigSciObject obj) {
-  SciErr sciErr;
-  int *piAddrVar;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (isStringType(pvApiCtx, piAddrVar)) {
-    return SWIG_OK;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A string is expected.\n"), SWIG_Scilab_GetFuncName(), obj);
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_AsGet_Sequence_frag(std::string), "header",
-  fragment="SWIG_SciString_AsCharPtrArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsGet_Sequence_dec(std::string)(SwigSciObject obj, char ***pSequence) {
-  int iRows = 0;
-  int iCols = 0;
-  return (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, obj, &iRows, &iCols, pSequence, SWIG_Scilab_GetFuncName()));
-}
-}
-
-%fragment(SWIG_AsSize_Sequence_frag(std::string), "header",
-  fragment="SWIG_SciString_AsCharPtrArrayAndSize") {
-
-SWIGINTERN int
-SWIG_AsSize_Sequence_dec(std::string)(SwigSciObject obj, int *piSize) {
-  char **pstMatrix;
-  int iCols = 0;
-  int iRows = 0;
-  if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, obj, &iRows, &iCols, &pstMatrix, SWIG_Scilab_GetFuncName()) == SWIG_OK) {
-    *piSize = iRows * iCols;
-    return SWIG_OK;
-  }
-  return SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromCreate_Sequence_frag(std::string), "header") {
-
-SWIGINTERN int
-SWIG_FromCreate_Sequence_dec(std::string)(int size, char ***pSequence) {
-  *pSequence = new char*[size];
-  return *pSequence != NULL ? SWIG_OK : SWIG_ERROR;
-}
-}
-
-%fragment(SWIG_FromSet_Sequence_frag(std::string), "header",
-  fragment="SWIG_SciString_FromCharPtrArrayAndSize") {
-
-SWIGINTERN SwigSciObject
-SWIG_FromSet_Sequence_dec(std::string)(int size, char **pSequence) {
-  SwigSciObject obj = SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, size, pSequence);
-  delete (char **)pSequence;
-  return obj;
-}
-}
-
-%fragment(SWIG_AsVal_SequenceItem_frag(std::string), "header") {
-
-SWIGINTERN std::string
-SWIG_AsVal_SequenceItem_dec(std::string)(SwigSciObject obj, char **pSequence, int iItemIndex) {
-  return std::string(pSequence[iItemIndex]);
-}
-}
-
-%fragment(SWIG_From_SequenceItem_frag(std::string), "header") {
-
-SWIGINTERN int
-SWIG_From_SequenceItem_dec(std::string)(char **pSequence, int iItemIndex, std::string itemValue) {
-  char *pChar = new char((int) itemValue.size() + 1);
-  strcpy(pChar, itemValue.c_str());
-  pSequence[iItemIndex] = pChar;
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scishort.swg b/dependencies2013/win32/swig/Lib/scilab/scishort.swg
deleted file mode 100644
index 3d2f0f97..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scishort.swg
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * C-type: short
- * Scilab type: double or int16
- */
-
-%fragment(SWIG_AsVal_frag(short), "header", fragment="SWIG_SciDoubleOrInt16_AsShort", fragment="<limits.h>") {
-#define SWIG_AsVal_short(scilabValue, valuePointer) SWIG_SciDoubleOrInt16_AsShort(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDoubleOrInt16_AsShort", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt16_AsShort(void *pvApiCtx, int iVar, short *psValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    int iPrec = 0;
-    short *psData = NULL;
-
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iPrec != SCI_INT16) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    sciErr = getMatrixOfInteger16(pvApiCtx, piAddrVar, &iRows, &iCols, &psData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iRows * iCols != 1) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 16-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    *psValue = *psData;
-  }
-  else if (iType == sci_matrix) {
-    double *pdData = NULL;
-    double dValue = 0.0f;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iRows * iCols != 1) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 16-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    dValue = *pdData;
-    if (dValue != floor(dValue)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 16-bit signed integer.\n"), fname, iVar);
-      return SWIG_ValueError;
-    }
-    if ((dValue < SHRT_MIN) || (dValue > SHRT_MAX)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 16-bit signed integer.\n"), fname, iVar);
-      return SWIG_OverflowError;
-    }
-    *psValue = (short) dValue;
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit signed integer or a double expected.\n"), fname, iVar);
-    return SWIG_TypeError;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(short), "header", fragment="SWIG_SciDouble_FromShort") {
-#define SWIG_From_short(scilabValue) SWIG_SciDouble_FromShort(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_FromShort", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromShort(void *pvApiCtx, int iVarOut, short sValue, char *fname) {
-  if (createScalarDouble(pvApiCtx,
-    SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) sValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: short[]
- * Scilab type: double or int16 matrix
- */
-%fragment("SWIG_SciDoubleOrInt16_AsShortArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt16_AsShortArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, short **psValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_matrix) {
-    double *pdData = NULL;
-    int size = 0;
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    size = (*iRows) * (*iCols);
-    *psValue = (short*) malloc(size * sizeof(int*));
-    for (i = 0; i < size; i++)
-      (*psValue)[i] = (short) pdData[i];
-  }
-  else if (iType == sci_ints) {
-    int iPrec = 0;
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iPrec != SCI_INT16) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit signed integer or a double matrix expected.\n"), fname, iVar);
-      return SWIG_ERROR;
-    }
-
-    sciErr = getMatrixOfInteger16(pvApiCtx, piAddrVar, iRows, iCols, psValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit signed integer or a double matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-%fragment("SWIG_SciDouble_FromShortArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromShortArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, short *psValue) {
-  SciErr sciErr;
-  int i;
-  double *pdValues = NULL;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++)
-    pdValues[i] = psValue[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scisignedchar.swg b/dependencies2013/win32/swig/Lib/scilab/scisignedchar.swg
deleted file mode 100644
index c2350b0c..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scisignedchar.swg
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * C-type: signed char
- * Scilab type: double or int8
- */
-%fragment(SWIG_AsVal_frag(signed char), "header", fragment="SWIG_SciDoubleOrInt8_AsSignedChar", fragment="<limits.h>") {
-#define SWIG_AsVal_signed_SS_char(scilabValue, valuePointer) SWIG_SciDoubleOrInt8_AsSignedChar(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDoubleOrInt8_AsSignedChar", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt8_AsSignedChar(void *pvApiCtx, int iVar, signed char *pscValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    char *pcData = NULL;
-
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iPrec != SCI_INT8) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    sciErr = getMatrixOfInteger8(pvApiCtx, piAddrVar, &iRows, &iCols, &pcData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iRows * iCols != 1) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 8-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    *pscValue = *pcData;
-  }
-  else if (iType == sci_matrix) {
-    double *pdData = NULL;
-    double dValue = 0.0f;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iRows * iCols != 1) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 8-bit signed integer or a double expected.\n"), fname, iVar);
-      return SWIG_TypeError;
-    }
-    dValue = *pdData;
-    if (dValue != floor(dValue)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 8-bit signed integer.\n"), fname, iVar);
-      return SWIG_ValueError;
-    }
-    if ((dValue < SCHAR_MIN) || (dValue > SCHAR_MAX)) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 8-bit signed integer.\n"), fname, iVar);
-      return SWIG_OverflowError;
-    }
-    *pscValue = (signed char) dValue;
-  }
-  else {
-     Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit signed integer or a double expected.\n"), fname, iVar);
-    return SWIG_TypeError;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(signed char), "header", fragment="SWIG_SciDouble_FromSignedChar") {
-#define SWIG_From_signed_SS_char(scilabValue) SWIG_SciDouble_FromSignedChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue)
-}
-%fragment("SWIG_SciDouble_FromSignedChar", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromSignedChar(void *pvApiCtx, int iVarOut, signed char scValue) {
-  if (createScalarDouble(pvApiCtx,
-    SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) scValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: signed char[]
- * Scilab type: double or int8 matrix
- */
-%fragment("SWIG_SciDoubleOrInt8_AsSignedCharArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrInt8_AsSignedCharArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, signed char **pscValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_matrix) {
-    double *pdData = NULL;
-    int size = 0;
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    size = (*iRows) * (*iCols);
-    *pscValue = (signed char*) malloc(size * sizeof(int*));
-    for (i = 0; i < size; i++)
-      (*pscValue)[i] = (signed char) pdData[i];
-  }
-  else if (iType == sci_ints) {
-    int iPrec = 0;
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-    if (iPrec != SCI_INT8) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit signed integer or a double matrix expected.\n"), fname, iVar);
-      return SWIG_ERROR;
-    }
-
-    sciErr = getMatrixOfInteger8(pvApiCtx, piAddrVar, iRows, iCols, (char **)pscValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit signed integer or a double matrix expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_FromSignedCharArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromSignedCharArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const signed char *pscValue) {
-  SciErr sciErr;
-  int i;
-  double *pdValues = NULL;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++)
-    pdValues[i] = pscValue[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/scistdcommon.swg b/dependencies2013/win32/swig/Lib/scilab/scistdcommon.swg
deleted file mode 100644
index 63f3ca16..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scistdcommon.swg
+++ /dev/null
@@ -1,227 +0,0 @@
-%fragment("StdTraits","header",fragment="StdTraitsCommon")
-{
-namespace swig {
-// Traits that provides the from method
-  template <class Type> struct traits_from_ptr {
-    static SwigSciObject from(Type *val, int owner = 0) {
-        return SWIG_OK; //SWIG_NewPointerObj(val, type_info<Type>(), owner);
-    }
-  };
-
-  template <class Type> struct traits_from {
-    static SwigSciObject from(const Type& val) {
-      return traits_from_ptr<Type>::from(new Type(val), 1);
-    }
-  };
-
-  template <class Type> struct traits_from<Type *> {
-    static SwigSciObject from(Type* val) {
-      return traits_from_ptr<Type>::from(val, 0);
-    }
-  };
-
-  template <class Type> struct traits_from<const Type *> {
-    static SwigSciObject from(const Type* val) {
-      return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0);
-    }
-  };
-
-
-  template <class Type>
-  inline SwigSciObject from(const Type& val) {
-    return traits_from<Type>::from(val);
-  }
-
-  template <class Type>
-  inline SwigSciObject from_ptr(Type* val, int owner) {
-    return traits_from_ptr<Type>::from(val, owner);
-  }
-
-    // Traits that provides the asval/as/check method
-  template <class Type>
-  struct traits_asptr {
-    static int asptr(const SwigSciObject& obj, Type **val) {
-      Type *p;
-      swig_type_info *descriptor = type_info<Type>();
-      int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-      if (SWIG_IsOK(res)) {
-	if (val) *val = p;
-      }
-      return res;
-    }
-  };
-
-  template <class Type>
-  inline int asptr(const SwigSciObject& obj, Type **vptr) {
-    return traits_asptr<Type>::asptr(obj, vptr);
-  }
-
-  template <class Type>
-  struct traits_asval {
-    static int asval(const SwigSciObject& obj, Type *val) {
-      if (val) {
-	Type *p = 0;
-	int res = traits_asptr<Type>::asptr(obj, &p);
-	if (!SWIG_IsOK(res))
-    return res;
-	if (p) {
-	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
-	  *(const_cast<noconst_type*>(val)) = *p;
-	  if (SWIG_IsNewObj(res)){
-	    %delete(p);
-	    res = SWIG_DelNewMask(res);
-	  }
-	  return res;
-	} else {
-	  return SWIG_ERROR;
-	}
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-
-  template <class Type> struct traits_asval<Type*> {
-    static int asval(const SwigSciObject& obj, Type **val) {
-      if (val) {
-        typedef typename noconst_traits<Type>::noconst_type noconst_type;
-        noconst_type *p = 0;
-        int res = traits_asptr<noconst_type>::asptr(obj,  &p);
-        if (SWIG_IsOK(res)) {
-          *(const_cast<noconst_type**>(val)) = p;
-	}
-	return res;
-      } else {
-	return traits_asptr<Type>::asptr(obj, (Type **)(0));
-      }
-    }
-  };
-
-  template <class Type>
-  inline int asval(const SwigSciObject& obj, Type *val) {
-    return traits_asval<Type>::asval(obj, val);
-  }
-
-  template <class Type>
-  struct traits_as<Type, value_category> {
-    static Type as(const SwigSciObject& obj, bool throw_error) {
-      Type v;
-      int res = asval(obj, &v);
-      if (SWIG_IsOK(res)) {
-        return v;
-      } else {
-	      %type_error(swig::type_name<Type>());
-	      if (throw_error)
-          throw std::invalid_argument("bad type");
-        return res;
-      }
-    }
-  };
-
-  template <class Type>
-  struct traits_as<Type, pointer_category> {
-    static Type as(const SwigSciObject& obj, bool throw_error) {
-      Type *v = 0;
-      int res = traits_asptr<Type>::asptr(obj, &v);
-      if (SWIG_IsOK(res) && v) {
-	if (SWIG_IsNewObj(res)) {
-	  Type r(*v);
-	  %delete(v);
-	  return r;
-	} else {
-	  return *v;
-	}
-      } else {
-	// Uninitialized return value, no Type() constructor required.
-	static Type *v_def = (Type*) malloc(sizeof(Type));
-  %type_error(swig::type_name<Type>());
-	if (throw_error)
-    throw std::invalid_argument("bad type");
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
-      }
-    }
-  };
-
-  template <class Type>
-  struct traits_as<Type*, pointer_category> {
-    static Type* as(const SwigSciObject& obj, bool throw_error) {
-      Type *v = 0;
-      int res = traits_asptr<Type>::asptr(obj, &v);
-      if (SWIG_IsOK(res)) {
-	return v;
-      } else {
-  %type_error(swig::type_name<Type>());
-	if (throw_error)
-    throw std::invalid_argument("bad type");
-	return SWIG_OK;
-      }
-    }
-  };
-
-  template <class Type>
-  inline Type as(const SwigSciObject& obj, bool te = false) {
-    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
-  }
-
-  template <class Type>
-  struct traits_check<Type, value_category> {
-    static bool check(const SwigSciObject& obj) {
-      int res = asval(obj, (Type *)(0));
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type>
-  struct traits_check<Type, pointer_category> {
-    static bool check(const SwigSciObject& obj) {
-      int res = asptr(obj, (Type **)(0));
-      return SWIG_IsOK(res) ? true : false;
-    }
-  };
-
-  template <class Type>
-  inline bool check(const SwigSciObject& obj) {
-    return traits_check<Type, typename traits<Type>::category>::check(obj);
-  }
-}
-}
-
-%define %specialize_std_container(Type,Check,As,From)
-%{
-namespace swig {
-  template <>  struct traits_asval<Type > {
-    typedef Type value_type;
-    static int asval(const SwigSciObject& obj, value_type *val) {
-      if (Check(obj)) {
-	if (val) *val = As(obj);
-	return SWIG_OK;
-      }
-      return SWIG_ERROR;
-    }
-  };
-  template <>  struct traits_from<Type > {
-    typedef Type value_type;
-    static SwigSciObject from(const value_type& val) {
-      return From(val);
-    }
-  };
-
-  template <>
-  struct traits_check<Type, value_category> {
-    static int check(const SwigSciObject& obj) {
-      int res = Check(obj);
-      return obj && res ? res : 0;
-    }
-  };
-}
-%}
-%enddef
-
-
-#define specialize_std_vector(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_list(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_deque(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_set(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-#define specialize_std_multiset(Type,Check,As,From) %specialize_std_container(%arg(Type),Check,As,From)
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/scitypemaps.swg b/dependencies2013/win32/swig/Lib/scilab/scitypemaps.swg
deleted file mode 100644
index 4cf0da3f..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/scitypemaps.swg
+++ /dev/null
@@ -1,259 +0,0 @@
-// Scilab fragments for primitive types
-%include <sciprimtypes.swg>
-
-%include <scienum.swg>
-
-// Scilab object type
-#define SWIG_Object int
-
-#define %append_output(obj)         if (!SWIG_IsOK(SWIG_Scilab_SetOutput(pvApiCtx, obj))) return SWIG_ERROR
-#define %set_constant(name, obj)    if (!SWIG_IsOK(SWIG_Scilab_SetOutput(pvApiCtx, obj))) return SWIG_ERROR // Name is managed by the the function name
-#define %raise(obj, type, desc)     SWIG_Scilab_Raise(obj, type, desc)
-#define %set_output(obj)            if (!SWIG_IsOK(SWIG_Scilab_SetOutput(pvApiCtx, obj))) return SWIG_ERROR
-#define %set_varoutput(obj)         if (!SWIG_IsOK(SWIG_Scilab_SetOutput(pvApiCtx, obj))) return SWIG_ERROR
-#define %set_argoutput(obj)         if (!SWIG_IsOK(SWIG_Scilab_SetOutput(pvApiCtx, obj))) return SWIG_ERROR
-
-// Include the unified typemap library
-%include <typemaps/swigtypemaps.swg>
-
-/* ---------------------------------------------------------------------------*/
-/* Generic typmemaps                                                          */
-/*                                                                            */
-/* This typemap is used when Scilab does not store this type directly         */
-/* For example, a 'float' is stored in Scilab as a 'double'                   */
-/* So we read a 'double' in Scilab and cast it to a 'float'                   */
-/* ---------------------------------------------------------------------------*/
-
-%define %scilab_in_typemap_withcast(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPTYPE, TEMPINIT)
-%typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE {
-  TEMPTYPE tempValue = TEMPINIT;
-  if(FRAGMENTNAME(pvApiCtx, $input, &tempValue, SWIG_Scilab_GetFuncName()) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-  $1 = (CTYPE) tempValue;
-}
-%enddef
-%define %scilab_inptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  if (FRAGMENTNAME(pvApiCtx, $input, %as_voidptrptr(&$1), SWIG_Scilab_GetFuncName()) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-%enddef
-
-%define %scilab_out_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  if (FRAGMENTNAME(pvApiCtx, $result, $1) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-%enddef
-
-%define %scilab_outptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  if (FRAGMENTNAME(pvApiCtx, $result, %as_voidptr($1)) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-%enddef
-
-%define %scilab_varout_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  if (FRAGMENTNAME(pvApiCtx, $result, $value) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-%enddef
-
-%define %scilab_varoutptr_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  if (FRAGMENTNAME(pvApiCtx, $result, %as_voidptr($value)) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-%enddef
-
-%define %scilab_in_typemap(TYPEMAPTYPE, FRAGMENTNAME, CTYPE)
-%typemap(TYPEMAPTYPE, noblock=1, fragment="FRAGMENTNAME") CTYPE {
-  if (FRAGMENTNAME(pvApiCtx, $input, &$1, SWIG_Scilab_GetFuncName()) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-%enddef
-
-
-/* ---------------------------------------------------------------------------*/
-/* Array typmemaps                                                            */
-/* ---------------------------------------------------------------------------*/
-
-%include <sciarray.swg>
-
-
-/* ---------------------------------------------------------------------------*/
-/* Enum typemaps                                                              */
-/* ---------------------------------------------------------------------------*/
-
-%typemap(in, noblock=1, fragment=SWIG_AsVal_frag(Enum)) enum SWIGTYPE (int val) {
-  if (SWIG_AsVal_dec(Enum)($input, &val) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-  $1 = %reinterpret_cast(val, $ltype);
-}
-
-%typemap(out, fragment=SWIG_From_frag(Enum)) enum SWIGTYPE {
-  if (SWIG_From_dec(Enum)($1) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-}
-
-/* ---------------------------------------------------------------------------*/
-/* Typecheck typemaps                                                         */
-/* ---------------------------------------------------------------------------*/
-
-%define %scilab_typecheck_generic(PRECEDENCE, TYPE_CHECK_FUNCTION, TYPE)
-%typecheck(PRECEDENCE) TYPE {
-  int *piAddrVar = NULL;
-  SciErr sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-  $1 = TYPE_CHECK_FUNCTION(pvApiCtx, piAddrVar);
-}
-%enddef
-
-%fragment("SWIG_Check_SciDoubleOrInt", "header") {
-SWIGINTERN int
-SWIG_Check_SciDoubleOrInt(void *pvApiCtx, SwigSciObject iVar, int iIntegerType) {
-  int *piAddrVar = NULL;
-  int ret = 0;
-  SciErr sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return 0;
-  }
-  ret = isIntegerType(pvApiCtx, piAddrVar);
-  if (ret == 1) {
-    int iPrec = 0;
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return 0;
-    }
-    ret = (iPrec == iIntegerType) ? 1 : 0;
-  }
-  else {
-    ret = isDoubleType(pvApiCtx, piAddrVar);
-  }
-  return ret;
-}
-}
-
-/* Scilab equivalent for C integers can be sci_intXX or sci_matrix */
-%define %scilab_typecheck_integer(PRECEDENCE, INTTYPE, TYPE)
-%typecheck(PRECEDENCE, fragment="SWIG_Check_SciDoubleOrInt") TYPE {
-  $1 = SWIG_Check_SciDoubleOrInt(pvApiCtx, $input, INTTYPE);
-}
-%enddef
-
-%define %scilab_typecheck_pointer(PRECEDENCE, TYPE)
-%typecheck(PRECEDENCE) TYPE {
-  $1 = SwigScilabCheckPtr(pvApiCtx, $input, $descriptor, SWIG_Scilab_GetFuncName());
-}
-%enddef
-
-
-// Double (and Float) have priority over before Integer type.
-
-// Primitive types
-%scilab_typecheck_pointer(SWIG_TYPECHECK_VOIDPTR, SWIGTYPE *)
-%scilab_typecheck_pointer(SWIG_TYPECHECK_POINTER, SWIGTYPE *)
-%scilab_typecheck_generic(SWIG_TYPECHECK_BOOL, isBooleanType,    bool)
-%scilab_typecheck_generic(16, isDoubleType,                      double)
-%scilab_typecheck_generic(17, isDoubleType,                      float)
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT8, SCI_INT8,         signed char)
-%scilab_typecheck_integer(SWIG_TYPECHECK_UINT8, SCI_UINT8,       unsigned char)
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT16, SCI_INT16,       short)
-%scilab_typecheck_integer(SWIG_TYPECHECK_UINT16, SCI_UINT16,     unsigned short)
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT32, SCI_INT32,       int)
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT32, SCI_INT32,       long)
-%scilab_typecheck_integer(SWIG_TYPECHECK_UINT32, SCI_UINT32,     unsigned int)
-%scilab_typecheck_integer(SWIG_TYPECHECK_UINT32, SCI_UINT32,     unsigned long)
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT32, SCI_INT32,       enum SWIGTYPE)
-%scilab_typecheck_generic(SWIG_TYPECHECK_CHAR, isStringType,     char)
-
-// Arrays
-%scilab_typecheck_generic(SWIG_TYPECHECK_BOOL_ARRAY, isBooleanType,  bool)
-%scilab_typecheck_generic(1016, isDoubleType,                        double [ANY])
-%scilab_typecheck_generic(1017, isDoubleType,                        float [ANY])
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT8_ARRAY, SCI_INT8,       signed char [ANY])
-%scilab_typecheck_integer(1026, SCI_UINT8,                           unsigned char [ANY])
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT16_ARRAY, SCI_INT16,     short [ANY])
-%scilab_typecheck_integer(1036, SCI_UINT16,                          unsigned short [ANY])
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT32_ARRAY, SCI_INT32,     int [ANY])
-%scilab_typecheck_integer(SWIG_TYPECHECK_INT32_ARRAY, SCI_INT32,     long [ANY])
-%scilab_typecheck_integer(1046, SCI_UINT32,                          unsigned int [ANY])
-%scilab_typecheck_integer(1046, SCI_UINT32,                          unsigned long [ANY])
-%scilab_typecheck_generic(SWIG_TYPECHECK_CHAR_ARRAY, isStringType,   char [ANY])
-%scilab_typecheck_generic(SWIG_TYPECHECK_STRING_ARRAY, isStringType, char *[ANY])
-%scilab_typecheck_generic(SWIG_TYPECHECK_STRING_ARRAY, isStringType, char **)
-
-
-/* ---------------------------------------------------------------------------*/
-/* %scilabconstcode() feature typemaps                                        */
-/* ---------------------------------------------------------------------------*/
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(double)) double
-%{
-  if (SWIG_CreateScilabVariable_double(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(int)) int
-%{
-  if (SWIG_CreateScilabVariable_int(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(uint)) unsigned int
-%{
-  if (SWIG_CreateScilabVariable_uint(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(int)) long
-%{
-  if (SWIG_CreateScilabVariable_int(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(uint)) unsigned long
-%{
-  if (SWIG_CreateScilabVariable_uint(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(char)) char
-%{
-  if (SWIG_CreateScilabVariable_char(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(charptr)) char *
-%{
-  if (SWIG_CreateScilabVariable_charptr(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-%typemap(scilabconstcode, fragment=SWIG_CreateScilabVariable_frag(double)) enum SWIGTYPE
-%{
-  if (SWIG_CreateScilabVariable_double(pvApiCtx, "$result", $value) != SWIG_OK)
-    return SWIG_ERROR;
-%}
-
-
-/* ---------------------------------------------------------------------------*/
-/* Exception typmemaps                                                        */
-/* ---------------------------------------------------------------------------*/
-
-%include <sciexception.swg>
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciunsignedchar.swg b/dependencies2013/win32/swig/Lib/scilab/sciunsignedchar.swg
deleted file mode 100644
index f7338958..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciunsignedchar.swg
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * C-type: unsigned char
- * Scilab type: double or uint8
- */
-%fragment(SWIG_AsVal_frag(unsigned char), "header", fragment="SWIG_SciDoubleOrUint8_AsUnsignedChar", fragment="<limits.h>") {
-#define SWIG_AsVal_unsigned_SS_char(scilabValue, valuePointer) SWIG_SciDoubleOrUint8_AsUnsignedChar(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDoubleOrUint8_AsUnsignedChar", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrUint8_AsUnsignedChar(void *pvApiCtx, int iVar, unsigned char *pucValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-  unsigned char *pucData = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    if (pucValue) {
-      sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iPrec != SCI_UINT8) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_ERROR;
-      }
-
-      sciErr = getMatrixOfUnsignedInteger8(pvApiCtx, piAddrVar, &iRows, &iCols, &pucData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 8-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_ERROR;
-      }
-      *pucValue = *pucData;
-    }
-  }
-  else if (iType == sci_matrix) {
-    if (pucValue) {
-      double *pdData = NULL;
-      double dValue = 0.0f;
-      sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 8-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_TypeError;
-      }
-      dValue = *pdData;
-      if (dValue != floor(dValue)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 8-bit unsigned integer.\n"), fname, iVar);
-        return SWIG_ValueError;
-      }
-      if ((dValue < 0) || (dValue > UCHAR_MAX)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 8-bit unsigned integer.\n"), fname, iVar);
-        return SWIG_OverflowError;
-      }
-      *pucValue = (unsigned char) dValue;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit unsigned integer or a double expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(unsigned char), "header", fragment="SWIG_SciDouble_FromUnsignedChar") {
-#define SWIG_From_unsigned_SS_char(value) SWIG_SciDouble_FromUnsignedChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
-}
-%fragment("SWIG_SciDouble_FromUnsignedChar", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedChar(void *pvApiCtx, int iVarOut, unsigned char ucValue) {
-  if (createScalarDouble(pvApiCtx,
-    SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) ucValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: unsigned char[]
-  * Scilab type: double or uint8 matrix
- */
-%fragment("SWIG_SciDoubleOrUint8_AsUnsignedCharArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrUint8_AsUnsignedCharArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned char **pucValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_matrix) {
-    double *pdData = NULL;
-    int size = 0;
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    size = (*iRows) * (*iCols);
-    *pucValue = (unsigned char*) malloc(size * sizeof(int*));
-    for (i = 0; i < size; i++)
-      (*pucValue)[i] = (unsigned char) pdData[i];
-  }
-  else if (iType == sci_ints) {
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    if (iPrec != SCI_UINT8) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit unsigned integer or a double vector expected.\n"), fname, iVar);
-      return SWIG_ERROR;
-    }
-
-    sciErr = getMatrixOfUnsignedInteger8(pvApiCtx, piAddrVar, iRows, iCols, pucValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 8-bit unsigned integer or a double vector expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_FromUnsignedCharArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedCharArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const unsigned char *pucValues) {
-  SciErr sciErr;
-  double *pdValues = NULL;
-  int i;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++)
-    pdValues[i] = pucValues[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciunsignedint.swg b/dependencies2013/win32/swig/Lib/scilab/sciunsignedint.swg
deleted file mode 100644
index 021b0ea9..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciunsignedint.swg
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * C-type: unsigned int
- * Scilab type: double or uint32
- */
-%fragment(SWIG_AsVal_frag(unsigned int), "header", fragment="SWIG_SciDoubleOrUint32_AsUnsignedInt", fragment="<limits.h>") {
-%#define SWIG_AsVal_unsigned_SS_int(scilabValue, valuePointer) SWIG_SciDoubleOrUint32_AsUnsignedInt(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDoubleOrUint32_AsUnsignedInt", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrUint32_AsUnsignedInt(void *pvApiCtx, int iVar, unsigned int *puiValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-  unsigned int *puiData = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    if (puiValue) {
-      sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iPrec != SCI_UINT32) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_ERROR;
-      }
-
-      sciErr = getMatrixOfUnsignedInteger32(pvApiCtx, piAddrVar, &iRows, &iCols, &puiData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 32-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_ERROR;
-      }
-      *puiValue = *puiData;
-    }
-  }
-  else if (iType == sci_matrix) {
-    if (puiValue) {
-      double *pdData = NULL;
-      double dValue = 0.0f;
-      sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 32-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_TypeError;
-      }
-      dValue = *pdData;
-      if (dValue != floor(dValue)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 32-bit unsigned integer.\n"), fname, iVar);
-        return SWIG_ValueError;
-      }
-      if ((dValue < 0) || (dValue > UINT_MAX)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 32-bit unsigned integer.\n"), fname, iVar);
-        return SWIG_OverflowError;
-      }
-      *puiValue = (unsigned int) dValue;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit unsigned integer or a double expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(unsigned int), "header", fragment="SWIG_SciDouble_FromUnsignedInt") {
-%#define SWIG_From_unsigned_SS_int(scilabValue) SWIG_SciDouble_FromUnsignedInt(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_FromUnsignedInt", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedInt(void *pvApiCtx, int iVarOut, unsigned int uiValue, char *fname) {
-  if (createScalarDouble(pvApiCtx,
-    SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) uiValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: unsigned int[]
- * Scilab type: uint32 vector
- */
-%fragment("SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned int **puiValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_matrix) {
-    double *pdData = NULL;
-    int size = 0;
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    size = (*iRows) * (*iCols);
-    *puiValue = (unsigned int*) malloc(size * sizeof(int*));
-    for (i = 0; i < size; i++)
-      (*puiValue)[i] = (unsigned int) pdData[i];
-  }
-  else if (iType == sci_ints) {
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    if (iPrec != SCI_UINT32) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit unsigned integer or a double vector expected.\n"), fname, iVar);
-      return SWIG_ERROR;
-    }
-
-    sciErr = getMatrixOfUnsignedInteger32(pvApiCtx, piAddrVar, iRows, iCols, puiValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit unsigned integer or a double vector expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_FromUnsignedIntArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedIntArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, unsigned int *puiValues) {
-  SciErr sciErr;
-  double *pdValues = NULL;
-  int i;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++)
-    pdValues[i] = puiValues[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_CreateScilabVariable_frag(uint), "wrapper") {
-SWIGINTERN int
-SWIG_CreateScilabVariable_dec(uint)(void *pvApiCtx, const char* psVariableName, const unsigned int uiVariableValue) {
-  SciErr sciErr;
-  sciErr = createNamedMatrixOfUnsignedInteger32(pvApiCtx, psVariableName, 1, 1, &uiVariableValue);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-  return SWIG_OK;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciunsignedlong.swg b/dependencies2013/win32/swig/Lib/scilab/sciunsignedlong.swg
deleted file mode 100644
index 0e9b906c..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciunsignedlong.swg
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * C-type: unsigned long
- * Scilab type: see unsigned int
- */
-
-%fragment(SWIG_AsVal_frag(unsigned long), "header", fragment="SWIG_UnsignedInt_AsUnsignedLong") {
-#define SWIG_AsVal_unsigned_SS_long(scilabValue, valuePointer) SWIG_UnsignedInt_AsUnsignedLong(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_UnsignedInt_AsUnsignedLong", "header", fragment=SWIG_AsVal_frag(unsigned int)) {
-SWIGINTERN int
-SWIG_UnsignedInt_AsUnsignedLong(void *pvApiCtx, SwigSciObject iVar, unsigned long *pulValue, char *fname) {
-  unsigned int uiValue = 0;
-  if(SWIG_AsVal_unsigned_SS_int(iVar, &uiValue) != SWIG_OK) {
-    return SWIG_ERROR;
-  }
-  *pulValue = (unsigned long) uiValue;
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(unsigned long), "header", fragment="SWIG_UnsignedInt_FromUnsignedLong") {
-#define SWIG_From_unsigned_SS_long(scilabValue) SWIG_UnsignedInt_FromUnsignedLong(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_UnsignedInt_FromUnsignedLong", "header", fragment=SWIG_From_frag(unsigned int)) {
-SWIGINTERN int
-SWIG_UnsignedInt_FromUnsignedLong(void *pvApiCtx, int iVarOut, unsigned long ulValue, char *fname) {
-  return SWIG_From_unsigned_SS_int((unsigned int)ulValue);
-}
-}
-
-%fragment("SWIG_SciDouble_FromUnsignedLongArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedLongArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const unsigned long *pulValues) {
-  SciErr sciErr;
-  double *pdValues = NULL;
-  int i;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++) {
-    pdValues[i] = pulValues[i];
-  }
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/sciunsignedshort.swg b/dependencies2013/win32/swig/Lib/scilab/sciunsignedshort.swg
deleted file mode 100644
index 110fba43..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/sciunsignedshort.swg
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * C-type: unsigned short
- * Scilab type: double or uint16
- */
-%fragment(SWIG_AsVal_frag(unsigned short), "header", fragment="SWIG_SciDoubleOrUint16_AsUnsignedShort", fragment="<limits.h>") {
-%#define SWIG_AsVal_unsigned_SS_short(scilabValue, valuePointer) SWIG_SciDoubleOrUint16_AsUnsignedShort(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDoubleOrUint16_AsUnsignedShort", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrUint16_AsUnsignedShort(void *pvApiCtx, int iVar, unsigned short *pusValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-  unsigned short *pusData = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_ints) {
-    if (pusValue) {
-      sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iPrec != SCI_UINT16) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_ERROR;
-      }
-
-      sciErr = getMatrixOfUnsignedInteger16(pvApiCtx, piAddrVar, &iRows, &iCols, &pusData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 16-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_ERROR;
-      }
-      *pusValue = *pusData;
-    }
-  }
-  else if (iType == sci_matrix) {
-    if (pusValue) {
-      double *pdData = NULL;
-      double dValue = 0.0f;
-      sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, &iRows, &iCols, &pdData);
-      if (sciErr.iErr) {
-        printError(&sciErr, 0);
-        return SWIG_ERROR;
-      }
-      if (iRows * iCols != 1) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A 16-bit unsigned integer or a double expected.\n"), fname, iVar);
-        return SWIG_TypeError;
-      }
-      dValue = *pdData;
-      if (dValue != floor(dValue)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Incorrect value for input argument #%d: The double value cannot be converted to a 16-bit unsigned integer.\n"), fname, iVar);
-        return SWIG_ValueError;
-      }
-      if ((dValue < 0) || (dValue > USHRT_MAX)) {
-        Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Overflow error for input argument #%d: The double value cannot be converted to a 16-bit unsigned integer.\n"), fname, iVar);
-        return SWIG_OverflowError;
-      }
-      *pusValue = (unsigned short) dValue;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit unsigned integer or a double expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment(SWIG_From_frag(unsigned short), "header", fragment="SWIG_SciDouble_FromUnsignedShort") {
-%#define SWIG_From_unsigned_SS_short(scilabValue) SWIG_SciDouble_FromUnsignedShort(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
-}
-%fragment("SWIG_SciDouble_FromUnsignedShort", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedShort(void *pvApiCtx, int iVarOut, unsigned short usValue, char *fname) {
-  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) usValue))
-    return SWIG_ERROR;
-  return SWIG_OK;
-}
-}
-
-/*
- * C-type: unsigned short[]
- * Scilab type: uint16 vector
- */
-%fragment("SWIG_SciDoubleOrUint16_AsUnsignedShortArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDoubleOrUint16_AsUnsignedShortArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned short **pusValue, char *fname) {
-  SciErr sciErr;
-  int iType = 0;
-  int iPrec = 0;
-  int *piAddrVar = NULL;
-
-  sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  if (iType == sci_matrix) {
-    double *pdData = NULL;
-    int size = 0;
-    int i;
-
-    sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    size = (*iRows) * (*iCols);
-    *pusValue = (unsigned short*) malloc(size * sizeof(int*));
-    for (i = 0; i < size; i++)
-      (*pusValue)[i] = (unsigned short) pdData[i];
-  }
-  else if (iType == sci_ints) {
-    sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-
-    if (iPrec != SCI_UINT16) {
-      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit unsigned integer or a double vector expected.\n"), fname, iVar);
-      return SWIG_ERROR;
-    }
-
-    sciErr = getMatrixOfUnsignedInteger16(pvApiCtx, piAddrVar, iRows, iCols, pusValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
-  }
-  else {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 16-bit unsigned integer or a double vector expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-
-  return SWIG_OK;
-}
-}
-
-%fragment("SWIG_SciDouble_FromUnsignedShortArrayAndSize", "header") {
-SWIGINTERN int
-SWIG_SciDouble_FromUnsignedShortArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, unsigned short *pusValues) {
-  SciErr sciErr;
-  double *pdValues = NULL;
-  int i;
-
-  pdValues = (double*) malloc(iRows * iCols * sizeof(double));
-  for (i=0; i<iRows * iCols; i++)
-    pdValues[i] = pusValues[i];
-
-  sciErr = createMatrixOfDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, iRows, iCols, pdValues);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    free(pdValues);
-    return SWIG_ERROR;
-  }
-
-  free(pdValues);
-  return SWIG_OK;
-}
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_alloc.i b/dependencies2013/win32/swig/Lib/scilab/std_alloc.i
deleted file mode 100644
index 6ea03aad..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_alloc.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <std/std_alloc.i>
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_basic_string.i b/dependencies2013/win32/swig/Lib/scilab/std_basic_string.i
deleted file mode 100644
index 43b660db..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_basic_string.i
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * C++: basic_string<char>
- * Scilab: string
- */
-
-#define %swig_basic_string(Type...)  %swig_sequence_methods_val(Type)
-
-%fragment(SWIG_AsPtr_frag(std::basic_string<char>), "header", fragment="SWIG_SciString_AsCharPtrAndLength") {
-SWIGINTERN int
-SWIG_AsPtr_dec(std::basic_string<char>)(int _iVar, std::basic_string<char> **_pstValue) {
-  char* buf = 0;
-  size_t len = 0;
-  int alloc = SWIG_OLDOBJ;
-
-  if (SWIG_IsOK((SWIG_SciString_AsCharPtrAndSize(pvApiCtx, _iVar, &buf, &len, &alloc, SWIG_Scilab_GetFuncName())))) {
-    if (buf) {
-      if (_pstValue) {
-        *_pstValue = new std::string(buf, len - 1);
-      }
-      if (alloc == SWIG_NEWOBJ) {
-        delete[] buf;
-      }
-      return SWIG_NEWOBJ;
-    }
-    else {
-      if (_pstValue) {
-        *_pstValue = NULL;
-      }
-      return SWIG_OLDOBJ;
-    }
-  } else {
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_From_frag(std::basic_string<char>), "header", fragment="SWIG_SciString_FromCharPtr") {
-SWIGINTERN int
-SWIG_From_dec(std::basic_string<char>)(std::basic_string<char> _pstValue) {
-    return SWIG_SciString_FromCharPtr(pvApiCtx, SWIG_Scilab_GetOutputPosition(), _pstValue.c_str());
-}
-}
-
-%include <std/std_basic_string.i>
-
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_char_traits.i b/dependencies2013/win32/swig/Lib/scilab/std_char_traits.i
deleted file mode 100644
index bf4e6c47..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_char_traits.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/std_char_traits.i>
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_common.i b/dependencies2013/win32/swig/Lib/scilab/std_common.i
deleted file mode 100644
index 97cfa7b0..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_common.i
+++ /dev/null
@@ -1,72 +0,0 @@
-%include <std/std_except.i>
-%include <scistdcommon.swg>
-
-
-// Generate the traits for a 'primitive' type, such as 'double',
-// for which the SWIG_AsVal and SWIG_From methods are already defined.
-
-%define %traits_ptypen(Type...)
-  %fragment(SWIG_Traits_frag(Type),"header",
-	    fragment=SWIG_AsVal_frag(Type),
-	    fragment=SWIG_From_frag(Type),
-	    fragment="StdTraits") {
-namespace swig {
-  template <> struct traits< Type > {
-    typedef value_category category;
-    static const char* type_name() { return  #Type; }
-  };
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(SwigSciObject obj, value_type *val) {
-      return SWIG_AsVal(Type)(obj, val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static SwigSciObject from(const value_type& val) {
-      return SWIG_From(Type)(val);
-    }
-  };
-}
-}
-%enddef
-
-/* Traits for enums. This is bit of a sneaky trick needed because a generic template specialization of enums
-   is not possible (unless using template meta-programming which SWIG doesn't support because of the explicit
-   instantiations required using %template). The STL containers define the 'front' method and the typemap
-   below is used whenever the front method is wrapped returning an enum. This typemap simply picks up the
-   standard enum typemap, but additionally drags in a fragment containing the traits_asval and traits_from
-   required in the generated code for enums. */
-
-%define %traits_enum(Type...)
-  %fragment("SWIG_Traits_enum_"{Type},"header",
-	    fragment=SWIG_AsVal_frag(int),
-	    fragment=SWIG_From_frag(int),
-	    fragment="StdTraits") {
-namespace swig {
-  template <>  struct traits_asval< Type > {
-    typedef Type value_type;
-    static int asval(SwigSciObject obj, value_type *val) {
-      return SWIG_AsVal(int)(obj, (int *)val);
-    }
-  };
-  template <>  struct traits_from< Type > {
-    typedef Type value_type;
-    static SwigSciObject from(const value_type& val) {
-      return SWIG_From(int)((int)val);
-    }
-  };
-}
-}
-%typemap(out, fragment="SWIG_Traits_enum_"{Type}) const enum SWIGTYPE& front %{$typemap(out, const enum SWIGTYPE&)%}
-%enddef
-
-
-%include <std/std_common.i>
-
-//
-// Generates the traits for all the known primitive
-// C++ types (int, double, ...)
-//
-%apply_cpptypes(%traits_ptypen);
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_container.i b/dependencies2013/win32/swig/Lib/scilab/std_container.i
deleted file mode 100644
index a1e037b8..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_container.i
+++ /dev/null
@@ -1,3 +0,0 @@
-%include <scicontainer.swg>
-%include <std/std_container.i>
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_deque.i b/dependencies2013/win32/swig/Lib/scilab/std_deque.i
deleted file mode 100644
index d2ca597a..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_deque.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * C++ type : STL deque
- * Scilab type : matrix (for primitive types) or list (for pointer types)
- *
-*/
-
-%fragment("StdDequeTraits", "header", fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::deque<T> >  {
-      static int asptr(const SwigSciObject &obj, std::deque<T> **deq) {
-        return traits_asptr_stdseq<std::deque<T> >::asptr(obj, deq);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::deque<T> > {
-      static SwigSciObject from(const std::deque<T>& deq) {
-	      return traits_from_stdseq<std::deque<T> >::from(deq);
-      }
-    };
-  }
-%}
-
-
-#define %swig_deque_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_deque_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_except.i b/dependencies2013/win32/swig/Lib/scilab/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_list.i b/dependencies2013/win32/swig/Lib/scilab/std_list.i
deleted file mode 100644
index 75d002d4..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_list.i
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * C++ type : STL list
- * Scilab type : matrix (for primitive types) or list (for pointer types)
- *
-*/
-
-%fragment("StdListTraits", "header", fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T >
-    struct traits_asptr<std::list<T> >  {
-      static int asptr(SwigSciObject obj, std::list<T> **lis) {
-	      return traits_asptr_stdseq<std::list<T> >::asptr(obj, lis);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::list<T> > {
-      static SwigSciObject from(const std::list<T> &lis) {
-	      return traits_from_stdseq<std::list<T> >::from(lis);
-      }
-    };
-  }
-%}
-
-#define %swig_list_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_list_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_list.i>
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_map.i b/dependencies2013/win32/swig/Lib/scilab/std_map.i
deleted file mode 100644
index 250d2d84..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_map.i
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// SWIG typemaps for std::map
-//
-// Common implementation
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-%}
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_multiset.i b/dependencies2013/win32/swig/Lib/scilab/std_multiset.i
deleted file mode 100644
index 67e17926..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_multiset.i
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * C++ type : STL multiset
- * Scilab type : matrix (for primitive types) or list (for pointer types)
- *
-*/
-
-%fragment("StdMultisetTraits", "header", fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::multiset<T> >  {
-      static int asptr(const SwigSciObject &obj, std::multiset<T> **multiset) {
-        return traits_asptr_stdseq<std::multiset<T> >::asptr(obj, multiset);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::multiset<T> > {
-      static SwigSciObject from(const std::multiset<T>& multiset) {
-        return traits_from_stdseq<std::multiset<T> >::from(multiset);
-      }
-    };
-  }
-%}
-
-#define %swig_multiset_methods(Set...) %swig_sequence_methods(Type)
-#define %swig_multiset_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_multiset.i>
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_pair.i b/dependencies2013/win32/swig/Lib/scilab/std_pair.i
deleted file mode 100644
index 1448d652..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * Typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_set.i b/dependencies2013/win32/swig/Lib/scilab/std_set.i
deleted file mode 100644
index 9070e2d6..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_set.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * C++ type : STL set
- * Scilab type : matrix (for primitive types) or list (for pointer types)
- *
-*/
-
-%fragment("StdSetTraits", "header", fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::set<T> >  {
-      static int asptr(const SwigSciObject &obj, std::set<T> **set) {
-        return traits_asptr_stdseq<std::set<T> >::asptr(obj, set);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::set<T> > {
-      static SwigSciObject from(const std::set<T>& set) {
-        return traits_from_stdseq<std::set<T> >::from(set);
-      }
-    };
-  }
-%}
-
-
-#define %swig_set_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_set_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_set.i>
-
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_string.i b/dependencies2013/win32/swig/Lib/scilab/std_string.i
deleted file mode 100644
index 71ac6d2f..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_string.i
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * POINTER
- */
-%fragment(SWIG_AsPtr_frag(std::string), "header", fragment="SWIG_SciString_AsCharPtrAndSize") {
-SWIGINTERN int
-SWIG_AsPtr_dec(std::string)(int iVar, std::string **pstValue) {
-  char* buf = 0;
-  size_t size = 0;
-  int alloc = SWIG_OLDOBJ;
-
-  if (SWIG_IsOK((SWIG_SciString_AsCharPtrAndSize(pvApiCtx, iVar, &buf, &size, &alloc, SWIG_Scilab_GetFuncName())))) {
-    if (buf) {
-      if (pstValue) {
-        *pstValue = new std::string(buf, size);
-      }
-      if (alloc == SWIG_NEWOBJ) {
-        delete[] buf;
-      }
-      return SWIG_NEWOBJ;
-    } else {
-      if (pstValue) {
-        *pstValue = NULL;
-      }
-      return SWIG_OLDOBJ;
-    }
-  } else {
-    return SWIG_ERROR;
-  }
-}
-}
-
-%fragment(SWIG_From_frag(std::string), "header", fragment="SWIG_SciString_FromCharPtr") {
-SWIGINTERN int
-SWIG_From_dec(std::string)(std::string pstValue) {
-    return SWIG_SciString_FromCharPtr(pvApiCtx, SWIG_Scilab_GetOutputPosition(), pstValue.c_str());
-}
-}
-
-%include <typemaps/std_string.swg>
diff --git a/dependencies2013/win32/swig/Lib/scilab/std_vector.i b/dependencies2013/win32/swig/Lib/scilab/std_vector.i
deleted file mode 100644
index 6eaeeca5..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/std_vector.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * C++ type : STL vector
- * Scilab type : matrix (for primitive types) or list (for pointer types)
- *
-*/
-
-%fragment("StdVectorTraits", "header", fragment="StdSequenceTraits")
-%{
-  namespace swig {
-    template <class T>
-    struct traits_asptr<std::vector<T> >  {
-      static int asptr(const SwigSciObject &obj, std::vector<T> **vec) {
-        return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec);
-      }
-    };
-
-    template <class T>
-    struct traits_from<std::vector<T> > {
-      static SwigSciObject from(const std::vector<T>& vec) {
-	      return traits_from_stdseq<std::vector<T> >::from(vec);
-      }
-    };
-  }
-%}
-
-
-#define %swig_vector_methods(Type...) %swig_sequence_methods(Type)
-#define %swig_vector_methods_val(Type...) %swig_sequence_methods_val(Type);
-
-%include <std/std_vector.i>
diff --git a/dependencies2013/win32/swig/Lib/scilab/stl.i b/dependencies2013/win32/swig/Lib/scilab/stl.i
deleted file mode 100644
index b29f7d84..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/stl.i
+++ /dev/null
@@ -1,6 +0,0 @@
-/* initial STL definition. extended as needed in each language */
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
diff --git a/dependencies2013/win32/swig/Lib/scilab/typemaps.i b/dependencies2013/win32/swig/Lib/scilab/typemaps.i
deleted file mode 100644
index 9d713874..00000000
--- a/dependencies2013/win32/swig/Lib/scilab/typemaps.i
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * ----------------------------------------------------------------------------- */
-
-// INPUT typemaps
-%define %scilab_input_typemap(Type)
-%typemap(in, noblock=1, fragment=SWIG_AsVal_frag(Type)) Type *INPUT(Type temp)(int ecode), Type &INPUT(Type temp)(int ecode) {
-  ecode = SWIG_AsVal_dec(Type)($input, &temp);
-  if (!SWIG_IsOK(ecode)) {
-    %argument_fail(ecode, "$type", $symname, $argnum);
-  }
-  $1 = &temp;
-}
-
-%typemap(freearg, noblock=1) Type *INPUT, Type &INPUT {
-}
-
-%typemap(typecheck) Type *INPUT, Type &INPUT {
-}
-%enddef
-
-// OUTPUT typemaps
-%define %scilab_output_typemap(Type)
-%typemap(argout, noblock=1, fragment=SWIG_From_frag(Type)) Type *OUTPUT, Type &OUTPUT {
-  %set_output(SWIG_From_dec(Type)(*$1));
-}
-%enddef
-
-// INOUT typemaps
-%define %scilab_inout_typemap(Type)
- %typemap(in) Type *INOUT = Type *INPUT;
- %typemap(in) Type &INOUT = Type &INPUT;
- %typemap(argout) Type *INOUT = Type *OUTPUT;
- %typemap(argout) Type &INOUT = Type &OUTPUT;
-%enddef
-
-
-%define %scilab_inout_typemaps(Type)
-  %scilab_input_typemap(%arg(Type))
-  %scilab_output_typemap(%arg(Type))
-  %scilab_inout_typemap(%arg(Type))
-%enddef
-
-%scilab_inout_typemaps(double);
-%scilab_inout_typemaps(signed char);
-%scilab_inout_typemaps(unsigned char);
-%scilab_inout_typemaps(short);
-%scilab_inout_typemaps(unsigned short);
-%scilab_inout_typemaps(int);
-%scilab_inout_typemaps(unsigned int);
-%scilab_inout_typemaps(long);
-%scilab_inout_typemaps(unsigned long);
-%scilab_inout_typemaps(bool);
-%scilab_inout_typemaps(float);
-
-//%apply_ctypes(%scilab_inout_typemaps);
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/shared_ptr.i b/dependencies2013/win32/swig/Lib/shared_ptr.i
deleted file mode 100644
index 2975b062..00000000
--- a/dependencies2013/win32/swig/Lib/shared_ptr.i
+++ /dev/null
@@ -1,71 +0,0 @@
-// This is a helper file for shared_ptr and should not be included directly.
-
-// The main implementation detail in using this smart pointer of a type is to customise the code generated
-// to use a pointer to the smart pointer of the type, rather than the usual pointer to the underlying type.
-// So for some type T, shared_ptr<T> * is used rather than T *.
-
-// Another key part of the implementation is the smartptr feature:
-//   %feature("smartptr") T { shared_ptr<T> }
-// This feature marks the class T as having a smartptr to it (the shared_ptr<T> type). This is then used to
-// support smart pointers and inheritance. Say class D derives from base B, then shared_ptr<D> is marked
-// with a fake inheritance from shared_ptr<B> in the type system if the "smartptr" feature is used on both
-// B and D. This is to emulate the conversion of shared_ptr<D> to shared_ptr<B> in the target language.
-
-// shared_ptr namespaces could be boost or std or std::tr1
-// For example for std::tr1, use:
-// #define SWIG_SHARED_PTR_NAMESPACE std
-// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1
-
-#if !defined(SWIG_SHARED_PTR_NAMESPACE)
-# define SWIG_SHARED_PTR_NAMESPACE boost
-#endif
-
-#if defined(SWIG_SHARED_PTR_SUBNAMESPACE)
-# define SWIG_SHARED_PTR_QNAMESPACE SWIG_SHARED_PTR_NAMESPACE::SWIG_SHARED_PTR_SUBNAMESPACE
-#else
-# define SWIG_SHARED_PTR_QNAMESPACE SWIG_SHARED_PTR_NAMESPACE
-#endif
-
-namespace SWIG_SHARED_PTR_NAMESPACE {
-#if defined(SWIG_SHARED_PTR_SUBNAMESPACE)
-  namespace SWIG_SHARED_PTR_SUBNAMESPACE {
-#endif
-    template <class T> class shared_ptr {
-    };
-#if defined(SWIG_SHARED_PTR_SUBNAMESPACE)
-  }
-#endif
-}
-
-%fragment("SWIG_null_deleter", "header") {
-struct SWIG_null_deleter {
-  void operator() (void const *) const {
-  }
-};
-%#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter()
-%#define SWIG_NO_NULL_DELETER_1
-%#define SWIG_NO_NULL_DELETER_SWIG_POINTER_NEW
-%#define SWIG_NO_NULL_DELETER_SWIG_POINTER_OWN
-}
-
-
-// Workaround empty first macro argument bug
-#define SWIGEMPTYHACK
-// Main user macro for defining shared_ptr typemaps for both const and non-const pointer types
-%define %shared_ptr(TYPE...)
-%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > }
-SWIG_SHARED_PTR_TYPEMAPS(SWIGEMPTYHACK, TYPE)
-SWIG_SHARED_PTR_TYPEMAPS(const, TYPE)
-%enddef
-
-// Legacy macros
-%define SWIG_SHARED_PTR(PROXYCLASS, TYPE...)
-#warning "SWIG_SHARED_PTR(PROXYCLASS, TYPE) is deprecated. Please use %shared_ptr(TYPE) instead."
-%shared_ptr(TYPE)
-%enddef
-
-%define SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...)
-#warning "SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %shared_ptr(TYPE) instead."
-%shared_ptr(TYPE)
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/std/README b/dependencies2013/win32/swig/Lib/std/README
deleted file mode 100644
index 5cd759dd..00000000
--- a/dependencies2013/win32/swig/Lib/std/README
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -----------------------------------------------------------------------------
- *  C++ STD + STL 
- * ----------------------------------------------------------------------------- */
-
-std_common.i		general common code 
-std_container.i		general container code 
-std_basic_string.i	basic string
-std_char_traits.i	char traits
-std_complex.i		complex
-std_deque.i		deque	
-std_except.i		exceptions
-std_ios.i		ios
-std_iostream.i		istream/ostream
-std_list.i		list
-std_map.i		map
-std_multimap.i		multimap
-std_multiset.i		multiset
-std_pair.i		pair
-std_set.i		set
-std_streambuf.i		streambuf
-std_vector.i		vector
-std_vectora.i		vector + allocator
diff --git a/dependencies2013/win32/swig/Lib/std/_std_deque.i b/dependencies2013/win32/swig/Lib/std/_std_deque.i
deleted file mode 100644
index af9db27f..00000000
--- a/dependencies2013/win32/swig/Lib/std/_std_deque.i
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -----------------------------------------------------------------------------
- * _std_deque.i
- *
- * This file contains a generic definition of std::deque along with
- * some helper functions.  Specific language modules should include
- * this file to generate wrappers. 
- * ----------------------------------------------------------------------------- */
-
-%include <std_except.i>
-
-%{
-#include <deque>
-#include <stdexcept>
-%}
-
-
-/* This macro defines all of the standard methods for a deque.  This
-   is defined as a macro to simplify the task of specialization.  For
-   example,
-
-         template<> class deque<int> {
-         public:
-             %std_deque_methods(int);
-         };
-*/
-
-%define %std_deque_methods_noempty(T...)
-       typedef size_t size_type;
-       typedef ptrdiff_t difference_type;
-       typedef T value_type;
-       typedef value_type* pointer;
-       typedef const value_type* const_pointer;
-       typedef value_type& reference;
-       typedef const value_type& const_reference;
-
-       deque();
-       deque(unsigned int size, const T& value=T());
-       deque(const deque< T > &);
-      ~deque();
-
-       void assign(unsigned int n, const T& value);
-       void swap(deque< T > &x);
-       unsigned int size() const;
-       unsigned int max_size() const;
-       void resize(unsigned int n, T c = T());
-       const_reference front();
-       const_reference back();
-       void push_front(const T& x);
-       void push_back(const T& x);
-       void pop_front();
-       void pop_back();
-       void clear();
-
-       /* Some useful extensions */
-       %extend {
-           const_reference getitem(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i += size;
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("deque index out of range");
-           }
-           void setitem(int i, const T& x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i+= size;
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("deque index out of range");
-           }
-           void delitem(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i+= size;
-                if (i>=0 && i<size) {
-                    self->erase(self->begin()+i);
-                } else {
-                    throw std::out_of_range("deque index out of range");
-                }
-           }
-           std::deque< T > getslice(int i, int j) {
-                int size = int(self->size());
-                if (i<0) i = size+i;
-                if (j<0) j = size+j;
-                if (i<0) i = 0;
-                if (j>size) j = size;
-                std::deque< T > tmp(j-i);
-                std::copy(self->begin()+i,self->begin()+j,tmp.begin());
-                return tmp;
-            }
-            void setslice(int i, int j, const std::deque< T >& v) {
-                int size = int(self->size());
-                if (i<0) i = size+i;
-                if (j<0) j = size+j;
-                if (i<0) i = 0;
-                if (j>size) j = size;
-                if (int(v.size()) == j-i) {
-                    std::copy(v.begin(),v.end(),self->begin()+i);
-                } else {
-                    self->erase(self->begin()+i,self->begin()+j);
-                    if (i+1 <= size)
-                        self->insert(self->begin()+i+1,v.begin(),v.end());
-                    else
-                        self->insert(self->end(),v.begin(),v.end());
-                }
-            }
-            void delslice(int i, int j) {
-                int size = int(self->size());
-                if (i<0) i = size+i;
-                if (j<0) j = size+j;
-                if (i<0) i = 0;
-                if (j>size) j = size;
-                self->erase(self->begin()+i,self->begin()+j);
-            }
-       };
-%enddef
-
-#ifdef SWIGPHP
-%define %std_deque_methods(T...)
-    %extend {
-        bool is_empty() const {
-            return self->empty();
-        }
-    };
-    %std_deque_methods_noempty(T)
-%enddef
-#else
-%define %std_deque_methods(T...)
-    bool empty() const;
-    %std_deque_methods_noempty(T)
-%enddef
-#endif
-
-namespace std {
-    template<class T> class deque {
-    public:
-       %std_deque_methods(T);
-    };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_alloc.i b/dependencies2013/win32/swig/Lib/std/std_alloc.i
deleted file mode 100644
index 44dc8dc3..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_alloc.i
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace std
-{
-  /**
-   *  @brief  The "standard" allocator, as per [20.4].
-   *
-   *  The private _Alloc is "SGI" style.  (See comments at the top
-   *  of stl_alloc.h.)
-   *
-   *  The underlying allocator behaves as follows.
-   *    - __default_alloc_template is used via two typedefs
-   *    - "__single_client_alloc" typedef does no locking for threads
-   *    - "__alloc" typedef is threadsafe via the locks
-   *    - __new_alloc is used for memory requests
-   *
-   *  (See @link Allocators allocators info @endlink for more.)
-   */
-  template<typename _Tp>
-    class allocator
-    {
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind;
-
-      allocator() throw();
-      
-      allocator(const allocator&) throw();
-      template<typename _Tp1>
-        allocator(const allocator<_Tp1>&) throw();
-      ~allocator() throw();
-      
-
-      pointer
-      address(reference __x) const;
-      
-
-      const_pointer
-      address(const_reference __x) const;
-      
-
-      // NB: __n is permitted to be 0.  The C++ standard says nothing
-      // about what the return value is when __n == 0.
-      _Tp*
-      allocate(size_type __n, const void* = 0);
-
-      // __p is not permitted to be a null pointer.
-      void
-      deallocate(pointer __p, size_type __n);
-
-      size_type
-      max_size() const throw();
-
-      void construct(pointer __p, const _Tp& __val);
-      void destroy(pointer __p);
-    };
-
-  template<>
-    class allocator<void>
-    {
-    public:
-      typedef size_t      size_type;
-      typedef ptrdiff_t   difference_type;
-      typedef void*       pointer;
-      typedef const void* const_pointer;
-      typedef void        value_type;
-
-      template<typename _Tp1>
-        struct rebind;
-    };
-} // namespace std
diff --git a/dependencies2013/win32/swig/Lib/std/std_array.i b/dependencies2013/win32/swig/Lib/std/std_array.i
deleted file mode 100644
index aadc3b80..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_array.i
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// std::array
-//
-
-%include <std_container.i>
-
-%define %std_array_methods(array...)
-  %std_sequence_methods_non_resizable(array)
-  void fill(const value_type& u);
-%enddef
-
-
-%define %std_array_methods_val(array...)
-  %std_sequence_methods_non_resizable_val(array)
-  void fill(const value_type& u);
-%enddef
-
-// ------------------------------------------------------------------------
-// std::array
-// 
-// The aim of all that follows would be to integrate std::array with 
-// as much as possible, namely, to allow the user to pass and 
-// be returned tuples or lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::array<T, N>), f(const std::array<T, N>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::array<T, N> can be passed.
-//   -- f(std::array<T, N>&), f(std::array<T, N>*):
-//      the parameter may be modified; therefore, only a wrapped std::array
-//      can be passed.
-//   -- std::array<T, N> f(), const std::array<T, N>& f():
-//      the array is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::array<T, N>& f(), std::array<T, N>* f():
-//      the array is returned by reference; therefore, a wrapped std::array
-//      is returned
-//   -- const std::array<T, N>* f(), f(const std::array<T, N>*):
-//      for consistency, they expect and return a plain array pointer.
-// ------------------------------------------------------------------------
-
-
-// exported classes
-
-namespace std {
-
-  template<class _Tp, size_t _Nm >
-  class array {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef _Tp& reference;
-    typedef const _Tp& const_reference;
-
-    %traits_swigtype(_Tp);
-    %traits_enum(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::array< _Tp, _Nm >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdArrayTraits") {
-      namespace swig {
-	template <>  struct traits<std::array< _Tp, _Nm > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::array<" #_Tp "," #_Nm " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_STDARRAY, std::array< _Tp, _Nm >);
-
-#ifdef %swig_array_methods
-    // Add swig/language extra methods
-    %swig_array_methods(std::array< _Tp, _Nm >);
-#endif
-
-    %std_array_methods(array);
-  };
-}
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_basic_string.i b/dependencies2013/win32/swig/Lib/std/std_basic_string.i
deleted file mode 100644
index fb7afc1e..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_basic_string.i
+++ /dev/null
@@ -1,267 +0,0 @@
-%include <exception.i>
-%include <std_container.i>
-%include <std_alloc.i>
-%include <std_char_traits.i>
-
-%fragment("<string>");
-
-namespace std
-{
-  %naturalvar basic_string;
-}
-
-
-namespace std {
-
-  template <class _CharT, class _Traits = char_traits<_CharT>, typename _Alloc = allocator<_CharT> > 
-  class basic_string
-  {
-#if !defined(SWIG_STD_MODERN_STL) || defined(SWIG_STD_NOMODERN_STL)
-    %ignore push_back;
-    %ignore clear;
-    %ignore compare;
-    %ignore append;
-#endif
-
-  public:
-    typedef size_t size_type;    
-    typedef ptrdiff_t difference_type;
-    typedef _CharT value_type;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Alloc allocator_type;
-    
-    static const size_type npos;
-
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  class iterator;
-  class reverse_iterator;
-  class const_iterator;
-  class const_reverse_iterator;
-#endif
-
-
-    %traits_swigtype(_CharT);
-    %fragment(SWIG_Traits_frag(_CharT));
-    
-
-    basic_string(const _CharT* __s, size_type __n);
-
-    // Capacity:
-
-    size_type length() const;
-
-    size_type max_size() const;
-
-    size_type capacity() const;
-
-    void reserve(size_type __res_arg = 0);
-
-
-    // Modifiers:
-
-    basic_string& 
-    append(const basic_string& __str);
-
-    basic_string& 
-    append(const basic_string& __str, size_type __pos, size_type __n);
-
-    basic_string& 
-    append(const _CharT* __s, size_type __n);
-    
-    basic_string& 
-    append(size_type __n, _CharT __c);
-
-    basic_string& 
-    assign(const basic_string& __str);
-
-    basic_string& 
-    assign(const basic_string& __str, size_type __pos, size_type __n);
-    
-    basic_string& 
-    assign(const _CharT* __s, size_type __n);
-
-    basic_string& 
-    insert(size_type __pos1, const basic_string& __str);    
-
-    basic_string& 
-    insert(size_type __pos1, const basic_string& __str,
-	   size_type __pos2, size_type __n);
-
-    basic_string& 
-    insert(size_type __pos, const _CharT* __s, size_type __n);
-
-    basic_string& 
-    insert(size_type __pos, size_type __n, _CharT __c);
-
-    basic_string& 
-    erase(size_type __pos = 0, size_type __n = npos);
-
-    basic_string& 
-    replace(size_type __pos, size_type __n, const basic_string& __str);
-
-    basic_string& 
-    replace(size_type __pos1, size_type __n1, const basic_string& __str,
-	    size_type __pos2, size_type __n2);
-
-    basic_string& 
-    replace(size_type __pos, size_type __n1, const _CharT* __s,
-	    size_type __n2);
-
-    basic_string& 
-    replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c);
-
-
-    size_type 
-    copy(_CharT* __s, size_type __n, size_type __pos = 0) const;    
-
-    // String operations:
-    const _CharT* c_str() const;
-
-    size_type 
-    find(const _CharT* __s, size_type __pos, size_type __n) const;
-    
-    size_type 
-    find(const basic_string& __str, size_type __pos = 0) const;
-
-    size_type 
-    find(_CharT __c, size_type __pos = 0) const;
-
-    size_type 
-    rfind(const basic_string& __str, size_type __pos = npos) const;
-
-    size_type 
-    rfind(const _CharT* __s, size_type __pos, size_type __n) const;
-
-    size_type 
-    rfind(_CharT __c, size_type __pos = npos) const;
-
-    size_type 
-    find_first_of(const basic_string& __str, size_type __pos = 0) const;
-
-    size_type 
-    find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-    size_type 
-    find_first_of(_CharT __c, size_type __pos = 0) const;
-
-    size_type 
-    find_last_of(const basic_string& __str, size_type __pos = npos) const;
-    
-    size_type 
-    find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-    size_type 
-    find_last_of(_CharT __c, size_type __pos = npos) const;
-    
-    size_type 
-    find_first_not_of(const basic_string& __str, size_type __pos = 0) const;
-
-    size_type 
-    find_first_not_of(const _CharT* __s, size_type __pos, 
-		      size_type __n) const;
-
-    size_type 
-    find_first_not_of(_CharT __c, size_type __pos = 0) const;
-
-    size_type 
-    find_last_not_of(const basic_string& __str, size_type __pos = npos) const;
-
-    size_type 
-    find_last_not_of(const _CharT* __s, size_type __pos, 
-		     size_type __n) const;
-    
-    size_type 
-    find_last_not_of(_CharT __c, size_type __pos = npos) const;
-
-    basic_string 
-    substr(size_type __pos = 0, size_type __n = npos) const;
-
-    int 
-    compare(const basic_string& __str) const;
-
-    int 
-    compare(size_type __pos, size_type __n, const basic_string& __str) const;
-
-    int 
-    compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	    size_type __pos2, size_type __n2) const;
-
-
-    %ignore pop_back();
-    %ignore front() const;
-    %ignore back() const;
-    %ignore basic_string(size_type n);
-    %std_sequence_methods_val(basic_string);    
-
-
-    %ignore pop();
-
-
-#ifdef %swig_basic_string
-    // Add swig/language extra methods
-    %swig_basic_string(std::basic_string< _CharT, _Traits, _Alloc >);
-#endif
-
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-
-    
-    class iterator;
-    class reverse_iterator;
-    class const_iterator;
-    class const_reverse_iterator;
-
-
-    void 
-    insert(iterator __p, size_type __n, _CharT __c);
-
-    basic_string& 
-    replace(iterator __i1, iterator __i2, const basic_string& __str);
-
-    basic_string& 
-    replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n);
-
-    basic_string& 
-    replace(iterator __i1, iterator __i2, size_type __n, _CharT __c);
-
-
-    basic_string& 
-    replace(iterator __i1, iterator __i2, const _CharT* __k1, const _CharT* __k2);
-
-    basic_string& 
-    replace(iterator __i1, iterator __i2, const_iterator __k1, const_iterator __k2);
-#endif
-
-    basic_string& operator +=(const basic_string& v);
-
-    %newobject __add__;   
-    %newobject __radd__;
-    %extend {
-
-      std::basic_string< _CharT,_Traits,_Alloc >* __add__(const basic_string& v) {
-	std::basic_string< _CharT,_Traits,_Alloc >* res = new std::basic_string< _CharT,_Traits,_Alloc >(*self);
-	*res += v;      
-	return res;
-      }
-      
-      std::basic_string< _CharT,_Traits,_Alloc >* __radd__(const basic_string& v) {
-	std::basic_string< _CharT,_Traits,_Alloc >* res = new std::basic_string< _CharT,_Traits,_Alloc >(v);
-	*res += *self;      
-	return res;
-      }
-      
-      std::basic_string< _CharT,_Traits,_Alloc > __str__() {
-	return *self;
-      }
-
-      std::basic_ostream<_CharT, std::char_traits<_CharT> >&
-	__rlshift__(std::basic_ostream<_CharT, std::char_traits<_CharT> >& out) {
-	out << *self;
-	return out;
-      }
-    }
-
-  };
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_carray.swg b/dependencies2013/win32/swig/Lib/std/std_carray.swg
deleted file mode 100644
index ebb20ce6..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_carray.swg
+++ /dev/null
@@ -1,64 +0,0 @@
-%{
-#include <algorithm>
-%}
-
-//
-// std::carray - is really an extension to the 'std' namespace.
-// 
-// A simple fix C array wrapper, more or less as presented in
-//
-//   "The C++ Standarf Library", by Nicolai M. Josuttis
-//
-// which is also derived from the example in
-//
-//   "The C++ Programming Language", by Bjarne Stroustup.
-//
-
-%inline %{
-namespace std {    
-  template <class _Type, size_t _Size>
-  class carray 
-  {
-  public:
-    typedef _Type value_type;    
-    typedef size_t size_type;
-    
-    typedef _Type * iterator;
-    typedef const _Type * const_iterator;
-    
-    carray() { }
-    
-    carray(const carray& c) {
-      std::copy(c.v, c.v + size(), v);
-    }
-    
-    template <class _Iterator>
-    carray(_Iterator first, _Iterator last) {
-      assign(first, last);
-    }
-
-    iterator begin() { return v; }
-    iterator end() { return v + _Size; }
-
-    const_iterator begin() const { return v; }
-    const_iterator end() const { return v + _Size; }
-    
-    _Type& operator[](size_t i) { return v[i]; }
-    const _Type& operator[](size_t i) const { return v[i]; }
-
-    static size_t size() { return _Size; }    
-
-    template <class _Iterator>
-    void assign(_Iterator first, _Iterator last)  {
-      if (std::distance(first,last) == size()) {
-	std::copy(first, last, v);
-      } else {
-	throw std::length_error("bad range length");
-      }
-    }
-      
-  private:
-    _Type v[_Size];
-  };
-}
-%}
diff --git a/dependencies2013/win32/swig/Lib/std/std_char_traits.i b/dependencies2013/win32/swig/Lib/std/std_char_traits.i
deleted file mode 100644
index b9b4def3..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_char_traits.i
+++ /dev/null
@@ -1,140 +0,0 @@
-%include <std_common.i>
-#if defined(SWIG_WCHAR)
-%include <wchar.i>
-#endif
-
-namespace std 
-{
-  
-  /// 21.1.2 Basis for explicit _Traits specialization 
-  /// NB: That for any given actual character type this definition is
-  /// probably wrong.
-  template<class _CharT>
-  struct char_traits
-  {
-  };
-
-
-  /// 21.1.4  char_traits specializations
-  template<>
-  struct char_traits<char> {
-    typedef char 		char_type;
-    typedef int 	        int_type;
-    typedef streampos 	pos_type;
-    typedef streamoff 	off_type;
-    typedef mbstate_t 	state_type;
-
-    static void 
-    assign(char_type& __c1, const char_type& __c2);
-    
-    static bool 
-    eq(const char_type& __c1, const char_type& __c2);
-
-    static bool 
-    lt(const char_type& __c1, const char_type& __c2);
-
-    static int 
-    compare(const char_type* __s1, const char_type* __s2, size_t __n);
-
-    static size_t
-    length(const char_type* __s);
-
-    static const char_type* 
-    find(const char_type* __s, size_t __n, const char_type& __a);
-
-    static char_type* 
-    move(char_type* __s1, const char_type* __s2, size_t __n);
-
-    static char_type* 
-    copy(char_type* __s1, const char_type* __s2, size_t __n);
-
-    static char_type* 
-    assign(char_type* __s, size_t __n, char_type __a);
-
-    static char_type 
-    to_char_type(const int_type& __c);
-
-    // To keep both the byte 0xff and the eof symbol 0xffffffff
-    // from ending up as 0xffffffff.
-    static int_type 
-    to_int_type(const char_type& __c);
-
-    static bool 
-    eq_int_type(const int_type& __c1, const int_type& __c2);
-
-    static int_type 
-    eof() ;
-
-    static int_type 
-    not_eof(const int_type& __c);
-  };
-
-
-#if defined(SWIG_WCHAR)
-  template<>
-  struct char_traits<wchar_t>
-  {
-    typedef wchar_t 		char_type;
-    typedef wint_t 		int_type;
-    typedef streamoff 	off_type;
-    typedef wstreampos 	pos_type;
-    typedef mbstate_t 	state_type;
-      
-    static void 
-    assign(char_type& __c1, const char_type& __c2);
-
-    static bool 
-    eq(const char_type& __c1, const char_type& __c2);
-
-    static bool 
-    lt(const char_type& __c1, const char_type& __c2);
-
-    static int 
-    compare(const char_type* __s1, const char_type* __s2, size_t __n);
-
-    static size_t
-    length(const char_type* __s);
-
-    static const char_type* 
-    find(const char_type* __s, size_t __n, const char_type& __a);
-
-    static char_type* 
-    move(char_type* __s1, const char_type* __s2, int_type __n);
-
-    static char_type* 
-    copy(char_type* __s1, const char_type* __s2, size_t __n);
-
-    static char_type* 
-    assign(char_type* __s, size_t __n, char_type __a);
-
-    static char_type 
-    to_char_type(const int_type& __c) ;
-
-    static int_type 
-    to_int_type(const char_type& __c) ;
-
-    static bool 
-    eq_int_type(const int_type& __c1, const int_type& __c2);
-
-    static int_type 
-    eof() ;
-
-    static int_type 
-    not_eof(const int_type& __c);
-  };
-#endif
-}
-
-namespace std {
-#ifndef SWIG_STL_WRAP_TRAITS
-%template() char_traits<char>;
-#if defined(SWIG_WCHAR)
-%template() char_traits<wchar_t>;
-#endif
-#else
-%template(char_traits_c) char_traits<char>;
-#if defined(SWIG_WCHAR)
-%template(char_traits_w) char_traits<wchar_t>;
-#endif
-#endif
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_common.i b/dependencies2013/win32/swig/Lib/std/std_common.i
deleted file mode 100644
index 05bc4325..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_common.i
+++ /dev/null
@@ -1,250 +0,0 @@
-%include <std/std_except.i>
-
-//
-// Use the following macro with modern STL implementations
-//
-//#define SWIG_STD_MODERN_STL
-//
-// Use this to deactive the previous definition, when using gcc-2.95
-// or similar old compilers.
-//
-//#define SWIG_STD_NOMODERN_STL
-
-// Here, we identify compilers we know have problems with STL.
-%{
-#if defined(__GNUC__)
-#  if __GNUC__ == 2 && __GNUC_MINOR <= 96
-#     define SWIG_STD_NOMODERN_STL
-#  endif
-#endif
-%}
-
-//
-// Common code for supporting the C++ std namespace
-//
-
-%fragment("<string>");
-%fragment("<stdexcept>");
-%fragment("<stddef.h>");
-
-
-%fragment("StdIteratorTraits","header",fragment="<stddef.h>") %{
-#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
-#  if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
-#    define SWIG_STD_NOITERATOR_TRAITS_STL
-#  endif
-#endif
-
-#if !defined(SWIG_STD_NOITERATOR_TRAITS_STL)
-#include <iterator>
-#else
-namespace std {
-  template <class Iterator>
-  struct iterator_traits {
-    typedef ptrdiff_t difference_type;
-    typedef typename Iterator::value_type value_type;
-  };
-
-  template <class Iterator, class Category,class T, class Reference, class Pointer, class Distance>
-  struct iterator_traits<__reverse_bi_iterator<Iterator,Category,T,Reference,Pointer,Distance> > {
-    typedef Distance difference_type;
-    typedef T value_type;
-  };
-
-  template <class T>
-  struct iterator_traits<T*> {
-    typedef T value_type;
-    typedef ptrdiff_t difference_type;
-  };
-
-  template<typename _InputIterator>
-  inline typename iterator_traits<_InputIterator>::difference_type
-  distance(_InputIterator __first, _InputIterator __last)
-  {
-    typename iterator_traits<_InputIterator>::difference_type __n = 0;
-    while (__first != __last) {
-      ++__first; ++__n;
-    }
-    return __n;
-  }
-}
-#endif
-%}
-
-%fragment("StdTraitsCommon","header",fragment="<string>") %{
-namespace swig {
-  template <class Type>
-  struct noconst_traits {
-    typedef Type noconst_type;
-  };
-
-  template <class Type>
-  struct noconst_traits<const Type> {
-    typedef Type noconst_type;
-  };
-
-  /*
-    type categories
-  */
-  struct pointer_category { };
-  struct value_category { };
-
-  /*
-    General traits that provides type_name and type_info
-  */
-  template <class Type> struct traits { };
-
-  template <class Type>
-  inline const char* type_name() {
-    return traits<typename noconst_traits<Type >::noconst_type >::type_name();
-  }
-
-  template <class Type> struct traits_info {
-    static swig_type_info *type_query(std::string name) {
-      name += " *";
-      return SWIG_TypeQuery(name.c_str());
-    }
-    static swig_type_info *type_info() {
-      static swig_type_info *info = type_query(type_name<Type>());
-      return info;
-    }
-  };
-
-  /*
-    Partial specialization for pointers (traits_info)
-  */
-  template <class Type> struct traits_info<Type *> {
-    static swig_type_info *type_query(std::string name) {
-      name += " *";
-      return SWIG_TypeQuery(name.c_str());
-    }
-    static swig_type_info *type_info() {
-      static swig_type_info *info = type_query(type_name<Type>());
-      return info;
-    }
-  };
-
-  template <class Type>
-  inline swig_type_info *type_info() {
-    return traits_info<Type>::type_info();
-  }
-
-  /*
-    Partial specialization for pointers (traits)
-  */
-  template <class Type> struct traits <Type *> {
-    typedef pointer_category category;
-    static std::string make_ptr_name(const char* name) {
-      std::string ptrname = name;
-      ptrname += " *";
-      return ptrname;
-    }
-    static const char* type_name() {
-      static std::string name = make_ptr_name(swig::type_name<Type>());
-      return name.c_str();
-    }
-  };
-
-  template <class Type, class Category>
-  struct traits_as { };
-
-  template <class Type, class Category>
-  struct traits_check { };
-
-}
-%}
-
-/*
-  Generate the traits for a swigtype
-*/
-
-%define %traits_swigtype(Type...)
-%fragment(SWIG_Traits_frag(Type),"header",fragment="StdTraits") {
-  namespace swig {
-    template <>  struct traits< Type > {
-      typedef pointer_category category;
-      static const char* type_name() { return  #Type; }
-    };
-  }
-}
-%enddef
-
-
-
-/*
-  Generate the typemaps for a class that has 'value' traits
-*/
-
-%define %typemap_traits(Code,Type...)
-  %typemaps_asvalfrom(%arg(Code),
-		     %arg(swig::asval< Type >),
-		     %arg(swig::from),
-		     %arg(SWIG_Traits_frag(Type)),
-		     %arg(SWIG_Traits_frag(Type)),
-		     Type);
-%enddef
-
-/*
-  Generate the typemaps for a class that behaves more like a 'pointer' or
-  plain wrapped Swigtype.
-*/
-
-%define %typemap_traits_ptr(Code,Type...)
-  %typemaps_asptrfrom(%arg(Code),
-		     %arg(swig::asptr),
-		     %arg(swig::from),
-		     %arg(SWIG_Traits_frag(Type)),
-		     %arg(SWIG_Traits_frag(Type)),
-		     Type);
-%enddef
-
-
-/*
-  Equality methods
-*/
-%define %std_equal_methods(Type...)
-%extend Type {
-  bool operator == (const Type& v) {
-    return *self == v;
-  }
-
-  bool operator != (const Type& v) {
-    return *self != v;
-  }
-}
-
-%enddef
-
-/*
-  Order methods
-*/
-
-%define %std_order_methods(Type...)
-%extend Type {
-  bool operator > (const Type& v) {
-    return *self > v;
-  }
-
-  bool operator < (const Type& v) {
-    return *self < v;
-  }
-
-  bool operator >= (const Type& v) {
-    return *self >= v;
-  }
-
-  bool operator <= (const Type& v) {
-    return *self <= v;
-  }
-}
-%enddef
-
-/*
-  Comparison methods
-*/
-
-%define %std_comp_methods(Type...)
-%std_equal_methods(Type )
-%std_order_methods(Type )
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_container.i b/dependencies2013/win32/swig/Lib/std/std_container.i
deleted file mode 100644
index 000163f1..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_container.i
+++ /dev/null
@@ -1,169 +0,0 @@
-%include <std_common.i>
-%include <exception.i>
-%include <std_alloc.i>
-
-%{
-#include <algorithm>
-%}
-
-// Common non-resizable container methods
-
-%define %std_container_methods_non_resizable(container...)
-
-  container();
-  container(const container&);
-
-  bool empty() const;
-  size_type size() const;
-  void swap(container& v);
-
-%enddef
-
-%define %std_container_methods_forward_iterators(container...)
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-  class iterator;
-  class const_iterator;
-  iterator begin();
-  iterator end();
-  #endif
-
-%enddef
-
-%define %std_container_methods_reverse_iterators(container...)
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-  class reverse_iterator;
-  class const_reverse_iterator;
-  reverse_iterator rbegin();
-  reverse_iterator rend();
-  #endif
-
-%enddef
-
-// Common container methods
-
-%define %std_container_methods(container...)
-
-  %std_container_methods_non_resizable(%arg(container))
-  %std_container_methods_forward_iterators(%arg(container))
-  %std_container_methods_reverse_iterators(%arg(container))
-
-  void clear();
-  allocator_type get_allocator() const;
-
-%enddef
-
-%define %std_container_methods_without_reverse_iterators(container...)
-
-  %std_container_methods_non_resizable(%arg(container))
-  %std_container_methods_forward_iterators(%arg(container))
-
-  void clear();
-  allocator_type get_allocator() const;
-
-%enddef
-
-// Common sequence
-
-%define %std_sequence_methods_common(sequence)
-
-  %std_container_methods(%arg(sequence));
-
-  sequence(size_type size);
-  void pop_back();
-
-  void resize(size_type new_size);
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  iterator erase(iterator pos) { return $self->erase(pos); }
-  iterator erase(iterator first, iterator last) { return $self->erase(first, last); }
-}
-  #endif
-
-%enddef
-
-%define %std_sequence_methods_non_resizable(sequence)
-
-  %std_container_methods_non_resizable(%arg(sequence))
-  %std_container_methods_forward_iterators(%arg(container))
-  %std_container_methods_reverse_iterators(%arg(container))
-
-  const value_type& front() const;
-  const value_type& back() const;
-
-%enddef
-
-%define %std_sequence_methods(sequence)
-
-  %std_sequence_methods_common(%arg(sequence));
-
-  sequence(size_type size, const value_type& value);
-  void push_back(const value_type& x);
-
-  const value_type& front() const;
-  const value_type& back() const;
-
-  void assign(size_type n, const value_type& x);
-  void resize(size_type new_size, const value_type& x);
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  iterator insert(iterator pos, const value_type& x) { return $self->insert(pos, x); }
-  void insert(iterator pos, size_type n, const value_type& x) { $self->insert(pos, n, x); }
-}
-  #endif
-
-%enddef
-
-%define %std_sequence_methods_non_resizable_val(sequence...)
-
-  %std_container_methods_non_resizable(%arg(sequence))
-  %std_container_methods_forward_iterators(%arg(container))
-  %std_container_methods_reverse_iterators(%arg(container))
-
-  value_type front() const;
-  value_type back() const;
-
-#endif
-
-%enddef
-
-%define %std_sequence_methods_val(sequence...)
-
-  %std_sequence_methods_common(%arg(sequence));
-
-  sequence(size_type size, value_type value);
-  void push_back(value_type x);
-
-  value_type front() const;
-  value_type back() const;
-
-  void assign(size_type n, value_type x);
-  void resize(size_type new_size, value_type x);
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  iterator insert(iterator pos, value_type x) { return $self->insert(pos, x); }
-  void insert(iterator pos, size_type n, value_type x) { $self->insert(pos, n, x); }
-}
-  #endif
-
-%enddef
-
-
-//
-// Ignore member methods for Type with no default constructor
-//
-%define %std_nodefconst_type(Type...)
-%feature("ignore") std::vector< Type >::vector(size_type size);
-%feature("ignore") std::vector< Type >::resize(size_type size);
-%feature("ignore") std::deque< Type >::deque(size_type size);
-%feature("ignore") std::deque< Type >::resize(size_type size);
-%feature("ignore") std::list< Type >::list(size_type size);
-%feature("ignore") std::list< Type >::resize(size_type size);
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/std/std_deque.i b/dependencies2013/win32/swig/Lib/std/std_deque.i
deleted file mode 100644
index aa5536bf..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_deque.i
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// std::deque
-
-%include <std_container.i>
-
-// Deque
-
-%define %std_deque_methods(deque...)  
-  %std_sequence_methods(deque)
-
-  void pop_front();
-  void push_front(const value_type& x);
-%enddef
-
-%define %std_deque_methods_val(deque...)
-  %std_sequence_methods_val(deque)
-
-  void pop_front();
-  void push_front(value_type x);
-%enddef
-
-// ------------------------------------------------------------------------
-// std::deque
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::deque<T>), f(const std::deque<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::deque<T> can be passed.
-//   -- f(std::deque<T>&), f(std::deque<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::deque
-//      can be passed.
-//   -- std::deque<T> f(), const std::deque<T>& f():
-//      the deque is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::deque<T>& f(), std::deque<T>* f():
-//      the deque is returned by reference; therefore, a wrapped std::deque
-//      is returned
-//   -- const std::deque<T>* f(), f(const std::deque<T>*):
-//      for consistency, they expect and return a plain deque pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <deque>
-%}
-
-// exported classes
-
-namespace std {
-
-  template<class _Tp, class _Alloc = allocator< _Tp > >
-  class deque {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::deque< _Tp, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdDequeTraits") {
-      namespace swig {
-	template <>  struct traits<std::deque< _Tp, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::deque<" #_Tp " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_DEQUE, std::deque< _Tp, _Alloc >);
-  
-#ifdef %swig_deque_methods
-    // Add swig/language extra methods
-    %swig_deque_methods(std::deque< _Tp, _Alloc >);
-#endif
-
-    %std_deque_methods(deque);
-  };
-
-  template<class _Tp, class _Alloc > 
-  class deque< _Tp*, _Alloc > {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp* value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::deque< _Tp*, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdDequeTraits") {
-      namespace swig {
-	template <>  struct traits<std::deque< _Tp*, _Alloc > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::deque<" #_Tp " * >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_DEQUE, std::deque< _Tp*, _Alloc >);
-
-#ifdef %swig_deque_methods_val
-    // Add swig/language extra methods
-    %swig_deque_methods_val(std::deque< _Tp*, _Alloc >);
-#endif
-
-    %std_deque_methods_val(deque);
-  };
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_except.i b/dependencies2013/win32/swig/Lib/std/std_except.i
deleted file mode 100644
index 728b9c8b..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_except.i
+++ /dev/null
@@ -1,73 +0,0 @@
-#if defined(SWIGJAVA) || defined(SWIGCSHARP)
-#error "do not use this version of std_except.i"
-#endif
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-#if defined(SWIG_STD_EXCEPTIONS_AS_CLASSES)
-
-namespace std {
-  struct exception 
-  {
-    virtual ~exception() throw();
-    virtual const char* what() const throw();
-  };
-
-  struct bad_cast : exception 
-  {
-  };
-
-  struct bad_exception : exception 
-  {
-  };
-
-  struct logic_error : exception 
-  {
-    logic_error(const string& msg);
-  };
-
-  struct domain_error : logic_error 
-  {
-    domain_error(const string& msg);
-  };
-
-  struct invalid_argument : logic_error 
-  {
-    invalid_argument(const string& msg);
-  };
-
-  struct length_error : logic_error 
-  {
-    length_error(const string& msg);
-  };
-
-  struct out_of_range : logic_error 
-  {
-    out_of_range(const string& msg);
-  };
-
-  struct runtime_error : exception 
-  {
-    runtime_error(const string& msg);
-  };
-
-  struct range_error : runtime_error 
-  {
-    range_error(const string& msg);
-  };
-
-  struct overflow_error : runtime_error 
-  {
-    overflow_error(const string& msg);
-  };
-
-  struct underflow_error : runtime_error 
-  {
-    underflow_error(const string& msg);
-  };
-}
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/std/std_ios.i b/dependencies2013/win32/swig/Lib/std/std_ios.i
deleted file mode 100644
index db83c7ab..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_ios.i
+++ /dev/null
@@ -1,262 +0,0 @@
-%include <std_char_traits.i>
-%include <std_basic_string.i>
-%include <std_except.i>
-%{
-#ifndef SWIG_STD_NOMODERN_STL
-# include <ios>
-#else
-# include <streambuf.h>
-#endif
-%}
-
-namespace std {
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_streambuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_istream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_ostream;
-
-  // 27.4.2  Class ios_base
-  typedef size_t streamsize;
-
-  class locale;
-  
-  
-  class ios_base
-  {
-  public:
-    
-#ifdef SWIG_NESTED_CLASSES
-    // 27.4.2.1.1  Class ios_base::failure
-    class failure : public exception
-    {
-    public:
-      explicit failure(const string& __str) throw();
-    };
-#endif
-
-    // 27.4.2.1.2  Type ios_base::fmtflags
-    typedef int fmtflags;
-    // 27.4.2.1.2  Type fmtflags
-    static const fmtflags boolalpha ;
-    static const fmtflags dec ;
-    static const fmtflags fixed ;
-    static const fmtflags hex ;
-    static const fmtflags internal ;
-    static const fmtflags left ;
-    static const fmtflags oct ;
-    static const fmtflags right ;
-    static const fmtflags scientific ;
-    static const fmtflags showbase ;
-    static const fmtflags showpoint ;
-    static const fmtflags showpos ;
-    static const fmtflags skipws ;
-    static const fmtflags unitbuf ;
-    static const fmtflags uppercase ;
-    static const fmtflags adjustfield ;
-    static const fmtflags basefield ;
-    static const fmtflags floatfield ;
-
-    // 27.4.2.1.3  Type ios_base::iostate
-    typedef int iostate;
-    static const iostate badbit ;
-    static const iostate eofbit ;
-    static const iostate failbit ;
-    static const iostate goodbit ;
-
-    // 27.4.2.1.4  Type openmode
-    typedef int openmode;
-    static const openmode app ;
-    static const openmode ate ;
-    static const openmode binary ;
-    static const openmode in ;
-    static const openmode out ;
-    static const openmode trunc ;
-
-    // 27.4.2.1.5  Type seekdir
-    typedef int seekdir;
-    static const seekdir beg ;
-    static const seekdir cur ;
-    static const seekdir end ;
-
-
-    // Callbacks;
-    enum event
-      {
-	erase_event,
-	imbue_event,
-	copyfmt_event
-      };
-
-    typedef void (*event_callback) (event, ios_base&, int);
-
-    void 
-    register_callback(event_callback __fn, int __index);
-
-    // Fmtflags state:
-    inline fmtflags 
-    flags() const ;
-
-    inline fmtflags 
-    flags(fmtflags __fmtfl);
-
-    inline fmtflags 
-    setf(fmtflags __fmtfl);
-
-    inline fmtflags 
-    setf(fmtflags __fmtfl, fmtflags __mask);
-
-    inline void 
-    unsetf(fmtflags __mask) ;
-
-    inline streamsize 
-    precision() const ;
-
-    inline streamsize 
-    precision(streamsize __prec);
-
-    inline streamsize 
-    width() const ;
-
-    inline streamsize 
-    width(streamsize __wide);
-
-    static bool 
-    sync_with_stdio(bool __sync = true);
-
-    // Locales:
-    locale 
-    imbue(const locale& __loc);
-
-    inline locale 
-    getloc() const { return _M_ios_locale; }
-
-    // Storage:
-    static int 
-    xalloc() throw();
-
-    inline long& 
-    iword(int __ix);
-
-    inline void*& 
-    pword(int __ix);
-
-    // Destructor
-    ~ios_base();
-
-  protected:
-    ios_base();
-
-  //50.  Copy constructor and assignment operator of ios_base
-  private:
-    ios_base(const ios_base&);
-
-    ios_base& 
-    operator=(const ios_base&);
-  };
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_ios : public ios_base
-  {
-  public:
-    // Types:
-    typedef _CharT 				char_type;
-    typedef typename _Traits::int_type 	int_type;
-    typedef typename _Traits::pos_type 	pos_type;
-    typedef typename _Traits::off_type 	off_type;
-    typedef _Traits 				traits_type;
-      
-  public:
-
-    iostate 
-    rdstate() const;
-
-    void 
-    clear(iostate __state = goodbit);
-
-    void 
-    setstate(iostate __state);
-
-    bool 
-    good() const;
-
-    bool 
-    eof() const;
-
-    bool 
-    fail() const;
-
-    bool 
-    bad() const;
-
-    iostate 
-    exceptions() const;
-
-    void 
-    exceptions(iostate __except);
-
-    // Constructor/destructor:
-    explicit 
-    basic_ios(basic_streambuf<_CharT, _Traits>* __sb) : ios_base();
-
-    virtual 
-    ~basic_ios() ;
-      
-    // Members:
-    basic_ostream<_CharT, _Traits>*
-    tie() const;
-
-    basic_ostream<_CharT, _Traits>*
-    tie(basic_ostream<_CharT, _Traits>* __tiestr);
-
-    basic_streambuf<_CharT, _Traits>*
-    rdbuf() const;
-
-    basic_streambuf<_CharT, _Traits>* 
-    rdbuf(basic_streambuf<_CharT, _Traits>* __sb);
-
-    basic_ios&
-    copyfmt(const basic_ios& __rhs);
-
-    char_type 
-    fill() const;
-
-    char_type 
-    fill(char_type __ch);
-
-    // Locales:
-    locale 
-    imbue(const locale& __loc);
-
-    char 
-    narrow(char_type __c, char __dfault) const;
-
-    char_type 
-    widen(char __c) const;
-     
-  protected:
-    // 27.4.5.1  basic_ios constructors
-    basic_ios();
-  private:
-    basic_ios(const basic_ios&);
-
-    basic_ios&
-    operator=(const basic_ios&);
-  };
-  
-}
-
-namespace std {
-  typedef basic_ios<char> ios;
-  %template(ios) basic_ios<char>;
-#if defined(SWIG_WCHAR)
- typedef basic_ios<wchar_t> wios;
-  %template(wios) basic_ios<wchar_t>;
-#endif
-}
-
-  
diff --git a/dependencies2013/win32/swig/Lib/std/std_iostream.i b/dependencies2013/win32/swig/Lib/std/std_iostream.i
deleted file mode 100644
index 7a33afe3..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_iostream.i
+++ /dev/null
@@ -1,339 +0,0 @@
-/* 
-   For wchar support, you need to include the wchar.i file
-   before this file, ie:
-   
-   %include <wchar.i>
-   %include <std_iostream.i>
-
-   or equivalently, just include
-
-   %include <std_wiostream.i>
-*/
-
-%include <std_ios.i>
-%include <std_basic_string.i>
-%include <std_string.i>
-#if defined(SWIG_WCHAR)
-%include <std_wstring.i>
-#endif
-
-%{
-#include <iostream>
-%}
-
-
-namespace std
-{
-  // 27.6.2.1 Template class basic_ostream
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_ostream : virtual public basic_ios<_CharT, _Traits>
-  {
-  public:
-    // Types (inherited from basic_ios (27.4.4)):
-    typedef _CharT                     		char_type;
-    typedef typename _Traits::int_type 		int_type;
-    typedef typename _Traits::pos_type 		pos_type;
-    typedef typename _Traits::off_type 		off_type;
-    typedef _Traits                    		traits_type;
-      
-    // 27.6.2.2 Constructor/destructor:
-    explicit 
-    basic_ostream(basic_streambuf<_CharT, _Traits>* __sb);
-
-    virtual 
-    ~basic_ostream();
-    
-    // 27.6.2.5 Formatted output:
-    // 27.6.2.5.3  basic_ostream::operator<<
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& (*__pf)(basic_ostream<_CharT, _Traits>&));
-
-      
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ios<_CharT, _Traits>& (*__pf)(basic_ios<_CharT, _Traits>&));
-
-
-    basic_ostream<_CharT, _Traits>&
-    operator<<(ios_base& (*__pf) (ios_base&));
-    
-    // 27.6.2.5.2 Arithmetic Inserters
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(long __n);
-    
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(unsigned long __n);
-    
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(bool __n);
-    
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(short __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(unsigned short __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(int __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(unsigned int __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(long long __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(unsigned long long __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(double __f);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(float __f);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(long double __f);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(const void* __p);
-
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_streambuf<_CharT, _Traits>* __sb);
-
-    %extend {
-      std::basic_ostream<_CharT, _Traits >& 
-	operator<<(const std::basic_string<_CharT,_Traits, std::allocator<_CharT> >& s)
-	{
-	  *self << s;
-	  return *self;
-	}
-    }
-
-    // Unformatted output:
-    basic_ostream<_CharT, _Traits>& 
-    put(char_type __c);
-
-    basic_ostream<_CharT, _Traits>& 
-    write(const char_type* __s, streamsize __n);
-
-    basic_ostream<_CharT, _Traits>& 
-    flush();
-
-    // Seeks:
-    pos_type 
-    tellp();
-
-    basic_ostream<_CharT, _Traits>& 
-    seekp(pos_type);
-
-    basic_ostream<_CharT, _Traits>& 
-    seekp(off_type, ios_base::seekdir);
-
-  };
-
-  // 27.6.1.1 Template class basic_istream
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_istream : virtual public basic_ios<_CharT, _Traits>
-  {
-  public:
-    // Types (inherited from basic_ios (27.4.4)):
-    typedef _CharT                     		char_type;
-    typedef typename _Traits::int_type 		int_type;
-    typedef typename _Traits::pos_type 		pos_type;
-    typedef typename _Traits::off_type 		off_type;
-    typedef _Traits                    		traits_type;
-
-
-  public:
-    // 27.6.1.1.1 Constructor/destructor:
-    explicit 
-    basic_istream(basic_streambuf<_CharT, _Traits>* __sb);
-
-    virtual 
-    ~basic_istream();
-
-    // 27.6.1.2.3 basic_istream::operator>>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& (*__pf)(basic_istream<_CharT, _Traits>&));
-    
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_ios<_CharT, _Traits>& (*__pf)(basic_ios<_CharT, _Traits>&));
-    
-    basic_istream<_CharT, _Traits>&
-    operator>>(ios_base& (*__pf)(ios_base&));
-      
-    // 27.6.1.2.2 Arithmetic Extractors
-    basic_istream<_CharT, _Traits>& 
-    operator>>(bool& __n);
-      
-    basic_istream<_CharT, _Traits>& 
-    operator>>(short& __n);
-      
-    basic_istream<_CharT, _Traits>& 
-    operator>>(unsigned short& __n);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(int& __n);
-      
-    basic_istream<_CharT, _Traits>& 
-    operator>>(unsigned int& __n);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(long& __n);
-      
-    basic_istream<_CharT, _Traits>& 
-    operator>>(unsigned long& __n);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(long long& __n);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(unsigned long long& __n);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(float& __f);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(double& __f);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(long double& __f);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(void*& __p);
-
-    basic_istream<_CharT, _Traits>& 
-    operator>>(basic_streambuf<_CharT, _Traits>* __sb);
-      
-    // 27.6.1.3 Unformatted input:
-    inline streamsize 
-    gcount(void) const;
-      
-    int_type 
-    get(void);
-
-    basic_istream<_CharT, _Traits>& 
-    get(char_type& __c);
-
-    basic_istream<_CharT, _Traits>& 
-    get(char_type* __s, streamsize __n, char_type __delim);
-
-    inline basic_istream<_CharT, _Traits>& 
-    get(char_type* __s, streamsize __n);
-
-    basic_istream<_CharT, _Traits>&
-    get(basic_streambuf<_CharT, _Traits>& __sb, char_type __delim);
-
-    inline basic_istream<_CharT, _Traits>&
-    get(basic_streambuf<_CharT, _Traits>& __sb);
-
-    basic_istream<_CharT, _Traits>& 
-    getline(char_type* __s, streamsize __n, char_type __delim);
-
-    inline basic_istream<_CharT, _Traits>& 
-    getline(char_type* __s, streamsize __n);
-
-    basic_istream<_CharT, _Traits>& 
-    ignore(streamsize __n = 1, int_type __delim = _Traits::eof());
-      
-    int_type 
-    peek(void);
-      
-    basic_istream<_CharT, _Traits>& 
-    read(char_type* __s, streamsize __n);
-
-    streamsize 
-    readsome(char_type* __s, streamsize __n);
-      
-    basic_istream<_CharT, _Traits>& 
-    putback(char_type __c);
-
-    basic_istream<_CharT, _Traits>& 
-    unget(void);
-
-    int 
-    sync(void);
-
-    pos_type 
-    tellg(void);
-
-    basic_istream<_CharT, _Traits>& 
-    seekg(pos_type);
-
-    basic_istream<_CharT, _Traits>& 
-    seekg(off_type, ios_base::seekdir);
-  };  
-
-  // 27.6.1.5 Template class basic_iostream
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_iostream
-    : public basic_istream<_CharT, _Traits>, 
-      public basic_ostream<_CharT, _Traits>
-  {
-  public:
-    typedef _CharT                     		char_type;
-    typedef typename _Traits::int_type 		int_type;
-    typedef typename _Traits::pos_type 		pos_type;
-    typedef typename _Traits::off_type 		off_type;
-    typedef _Traits                    		traits_type;
-
-    explicit 
-    basic_iostream(basic_streambuf<_CharT, _Traits>* __sb);
-
-    virtual 
-    ~basic_iostream();    
-  };
-
-  typedef basic_ostream<char> ostream ;
-  typedef basic_istream<char> istream;
-  typedef basic_iostream<char> iostream;
-
-  extern istream cin;
-  extern ostream cout;
-  extern ostream cerr;
-  extern ostream clog;
-
-#if defined(SWIG_WCHAR)
-  typedef basic_ostream<wchar_t>  wostream;
-  typedef basic_istream<wchar_t>  wistream;
-  typedef basic_iostream<wchar_t> wiostream;
-
-  extern wistream wcin;
-  extern wostream wcout;
-  extern wostream wcerr;
-  extern wostream wclog;
-#endif
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  std::basic_ostream<_CharT, _Traits>& 
-  endl(std::basic_ostream<_CharT, _Traits>&);
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  std::basic_ostream<_CharT, _Traits>& 
-  ends(std::basic_ostream<_CharT, _Traits>&);
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  std::basic_ostream<_CharT, _Traits>& 
-  flush(std::basic_ostream<_CharT, _Traits>&);
-}
-
-namespace std {
-  %template(ostream) basic_ostream<char>;
-  %template(istream) basic_istream<char>;
-  %template(iostream) basic_iostream<char>;
-
-  %template(endl) endl<char, std::char_traits<char> >;
-  %template(ends) ends<char, std::char_traits<char> >;
-  %template(flush) flush<char, std::char_traits<char> >;
-
-#if defined(SWIG_WCHAR)
-  %template(wostream) basic_ostream<wchar_t>;
-  %template(wistream) basic_istream<wchar_t>;
-  %template(wiostream) basic_iostream<wchar_t>;  
-
-  %template(wendl) endl<wchar_t, std::char_traits<wchar_t> >;
-  %template(wends) ends<wchar_t, std::char_traits<wchar_t> >;
-  %template(wflush) flush<wchar_t, std::char_traits<wchar_t> >;  
-#endif
-}
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_list.i b/dependencies2013/win32/swig/Lib/std/std_list.i
deleted file mode 100644
index ebbafa22..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_list.i
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// std::list
-//
-
-%include <std_container.i>
-
-// List
-
-%define %std_list_methods(list...)
-  %std_sequence_methods(list)
-  
-  void pop_front();
-  void push_front(const value_type& x);
-  		
-  void reverse();
-  
-%enddef
-
-
-%define %std_list_methods_val(list...)
-  %std_sequence_methods_val(list)
-  
-  void pop_front();
-  void push_front(value_type x);
-  		
-  void remove(value_type x);
-  void unique();
-  void reverse();
-  void sort();
-  
-  void merge(list& x);
-%enddef
-
-// ------------------------------------------------------------------------
-// std::list
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::list<T>), f(const std::list<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::list<T> can be passed.
-//   -- f(std::list<T>&), f(std::list<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::list
-//      can be passed.
-//   -- std::list<T> f(), const std::list<T>& f():
-//      the list is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::list<T>& f(), std::list<T>* f():
-//      the list is returned by reference; therefore, a wrapped std::list
-//      is returned
-//   -- const std::list<T>* f(), f(const std::list<T>*):
-//      for consistency, they expect and return a plain list pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <list>
-%}
-
-// exported classes
-
-namespace std {
-
-  template<class _Tp, class _Alloc = allocator< _Tp > >
-  class list {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::list< _Tp, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdListTraits") {
-      namespace swig {
-	template <>  struct traits<std::list< _Tp, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::list<" #_Tp ", " #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_LIST, std::list< _Tp, _Alloc >);
-
-#ifdef %swig_list_methods
-    // Add swig/language extra methods
-    %swig_list_methods(std::list< _Tp, _Alloc >);
-#endif
-  
-    %std_list_methods(list);
-  };
-
-  template<class _Tp, class _Alloc >
-  class list< _Tp*, _Alloc> {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp* value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::list< _Tp*, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdListTraits") {
-      namespace swig {
-	template <>  struct traits<std::list< _Tp*, _Alloc > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::list<" #_Tp " *," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_LIST, std::list< _Tp*, _Alloc >);
-
-#ifdef %swig_list_methods_val
-    // Add swig/language extra methods
-    %swig_list_methods_val(std::list< _Tp*, _Alloc >);
-#endif
-
-    %std_list_methods_val(list);
-  };
-
-}
-
-%define %std_extequal_list(...)
-%extend std::list< __VA_ARGS__ > {
-  void remove(const value_type& x) { self->remove(x); }  
-  void merge(std::list< __VA_ARGS__ >& x){ self->merge(x); }
-  void unique() { self->unique(); }  
-  void sort() { self->sort(); }  
-}
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_map.i b/dependencies2013/win32/swig/Lib/std/std_map.i
deleted file mode 100644
index 8043f924..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_map.i
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// std::map
-//
-
-%include <std_pair.i>
-%include <std_container.i>
-
-%define %std_map_methods_common(map...)
-  %std_container_methods(map);
-
-  size_type erase(const key_type& x);
-  size_type count(const key_type& x) const;
-
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  void erase(iterator position) { $self->erase(position); }
-  void erase(iterator first, iterator last) { $self->erase(first, last); }
-}
-
-  iterator find(const key_type& x);
-  iterator lower_bound(const key_type& x);
-  iterator upper_bound(const key_type& x);
-#endif
-%enddef
-
-%define %std_map_methods(map...)
-  %std_map_methods_common(map);
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-//  iterator insert(const value_type& x);
-  #endif
-%enddef
-
-
-// ------------------------------------------------------------------------
-// std::map
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::map<T>), f(const std::map<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::map<T> can be passed.
-//   -- f(std::map<T>&), f(std::map<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::map
-//      can be passed.
-//   -- std::map<T> f(), const std::map<T>& f():
-//      the map is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::map<T>& f(), std::map<T>* f():
-//      the map is returned by reference; therefore, a wrapped std::map
-//      is returned
-//   -- const std::map<T>* f(), f(const std::map<T>*):
-//      for consistency, they expect and return a plain map pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-%}
-%fragment("<algorithm>");
-%fragment("<stdexcept>");
-
-// exported class
-
-namespace std {
-
-  template<class _Key, class _Tp, class _Compare = std::less<_Key >,
-	   class _Alloc = allocator<std::pair< const _Key, _Tp > > >
-  class map {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key key_type;
-    typedef _Tp mapped_type;
-    typedef std::pair< const _Key, _Tp > value_type;
-
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-    %traits_swigtype(_Tp);	    
-
-    %fragment(SWIG_Traits_frag(std::pair< _Key, _Tp >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< _Key, _Tp > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #_Key "," #_Tp " >";
-	  }
-	};
-      }
-    }
-
-    %fragment(SWIG_Traits_frag(std::map< _Key, _Tp, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(std::pair< _Key, _Tp >),
-	      fragment="StdMapTraits") {
-      namespace swig {
-	template <>  struct traits<std::map< _Key, _Tp, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::map<" #_Key "," #_Tp "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_MAP, std::map< _Key, _Tp, _Compare, _Alloc >);
-
-    map( const _Compare& );
-
-#ifdef %swig_map_methods
-    // Add swig/language extra methods
-    %swig_map_methods(std::map< _Key, _Tp, _Compare, _Alloc >);
-#endif
-  
-    %std_map_methods(map);
-  };
-
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_multimap.i b/dependencies2013/win32/swig/Lib/std/std_multimap.i
deleted file mode 100644
index 7aa94990..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_multimap.i
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// std::multimap
-//
-
-%include <std_map.i>
-
-
-%define %std_multimap_methods(mmap...)
-  %std_map_methods_common(mmap);
-
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  std::pair<iterator,iterator> equal_range(const key_type& x);
-  std::pair<const_iterator,const_iterator> equal_range(const key_type& x) const;
-#endif
-%enddef
-
-// ------------------------------------------------------------------------
-// std::multimap
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::multimap<T>), f(const std::multimap<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::multimap<T> can be passed.
-//   -- f(std::multimap<T>&), f(std::multimap<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::multimap
-//      can be passed.
-//   -- std::multimap<T> f(), const std::multimap<T>& f():
-//      the map is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::multimap<T>& f(), std::multimap<T>* f():
-//      the map is returned by reference; therefore, a wrapped std::multimap
-//      is returned
-//   -- const std::multimap<T>* f(), f(const std::multimap<T>*):
-//      for consistency, they expect and return a plain map pointer.
-// ------------------------------------------------------------------------
-
-
-// exported class
-
-
-namespace std {
-  template<class _Key, class _Tp, class _Compare = std::less< _Key >,
-	   class _Alloc = allocator<std::pair< const _Key, _Tp > > >
-  class multimap {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key key_type;
-    typedef _Tp mapped_type;
-    typedef std::pair< const _Key, _Tp > value_type;
-
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-    %traits_swigtype(_Tp);	    
-
-    %fragment(SWIG_Traits_frag(std::pair< _Key, _Tp >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< _Key, _Tp > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #_Key "," #_Tp " >";
-	  }
-	};
-      }
-    }
-
-    %fragment(SWIG_Traits_frag(std::multimap< _Key, _Tp, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(std::pair< _Key, _Tp >),
-	      fragment="StdMultimapTraits") {
-      namespace swig {
-	template <>  struct traits<std::multimap< _Key, _Tp, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::multimap<" #_Key "," #_Tp "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_MULTIMAP, std::multimap< _Key, _Tp, _Compare, _Alloc >);
-  
-    multimap( const _Compare& );
-
-#ifdef %swig_multimap_methods
-    // Add swig/language extra methods
-    %swig_multimap_methods(std::multimap< _Key, _Tp, _Compare, _Alloc >);
-#endif
-
-    %std_multimap_methods(multimap);
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_multiset.i b/dependencies2013/win32/swig/Lib/std/std_multiset.i
deleted file mode 100644
index 1aa7ccce..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_multiset.i
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// std::multiset
-//
-
-%include <std_set.i>
-
-// Multiset
-
-%define %std_multiset_methods(multiset...)
-  %std_set_methods_common(multiset);
-%enddef
-
-
-// ------------------------------------------------------------------------
-// std::multiset
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::multiset<T>), f(const std::multiset<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::multiset<T> can be passed.
-//   -- f(std::multiset<T>&), f(std::multiset<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::multiset
-//      can be passed.
-//   -- std::multiset<T> f(), const std::multiset<T>& f():
-//      the set is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::multiset<T>& f(), std::multiset<T>* f():
-//      the set is returned by reference; therefore, a wrapped std::multiset
-//      is returned
-//   -- const std::multiset<T>* f(), f(const std::multiset<T>*):
-//      for consistency, they expect and return a plain set pointer.
-// ------------------------------------------------------------------------
-
-
-// exported classes
-
-namespace std {
-
-  //multiset
-
-  template <class _Key, class _Compare = std::less< _Key >,
-	    class _Alloc = allocator< _Key > >
-  class multiset {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key value_type;
-    typedef _Key key_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-
-    %fragment(SWIG_Traits_frag(std::multiset< _Key, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment="StdMultisetTraits") {
-      namespace swig {
-	template <>  struct traits<std::multiset< _Key, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::multiset<" #_Key "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_MULTISET, std::multiset< _Key, _Compare, _Alloc >);
-
-    multiset( const _Compare& );
-
-#ifdef %swig_multiset_methods
-    // Add swig/language extra methods
-    %swig_multiset_methods(std::multiset< _Key, _Compare, _Alloc >);
-#endif
-  
-    %std_multiset_methods(multiset);
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_pair.i b/dependencies2013/win32/swig/Lib/std/std_pair.i
deleted file mode 100644
index 001cd673..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_pair.i
+++ /dev/null
@@ -1,163 +0,0 @@
-%include <std_common.i>
-
-%{
-#include <utility>
-%}
-
-
-namespace std {
-  template <class T, class U > struct pair {      
-    typedef T first_type;
-    typedef U second_type;
-    
-    %traits_swigtype(T);
-    %traits_swigtype(U);
-
-    %fragment(SWIG_Traits_frag(std::pair< T, U >), "header",
-	      fragment=SWIG_Traits_frag(T),
-	      fragment=SWIG_Traits_frag(U),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< T, U > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #T "," #U " >";
-	  }
-	};
-      }
-    }
-
-#ifndef SWIG_STD_PAIR_ASVAL
-    %typemap_traits_ptr(SWIG_TYPECHECK_PAIR, std::pair< T, U >);
-#else
-    %typemap_traits(SWIG_TYPECHECK_PAIR, std::pair< T, U >);
-#endif
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair< U1, U2 > &p);
-
-    T first;
-    U second;
-
-#ifdef %swig_pair_methods
-    // Add swig/language extra methods
-    %swig_pair_methods(std::pair< T, U >)
-#endif
-  };
-
-  // ***
-  // The following specializations should disappear or get
-  // simplified when a 'const SWIGTYPE*&' can be defined
-  // ***
-  template <class T, class U > struct pair< T, U* > {
-    typedef T first_type;
-    typedef U* second_type;
-    
-    %traits_swigtype(T);
-    %traits_swigtype(U);
-      
-    %fragment(SWIG_Traits_frag(std::pair< T, U* >), "header",
-	      fragment=SWIG_Traits_frag(T),
-	      fragment=SWIG_Traits_frag(U),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< T, U* > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #T "," #U " * >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_PAIR, std::pair< T, U* >);
-
-    pair();
-    pair(T __a, U* __b);
-    pair(const pair& __p);
-
-    T first;
-    U* second;
-
-#ifdef %swig_pair_methods
-    // Add swig/language extra methods
-    %swig_pair_methods(std::pair< T, U* >)
-#endif
-  };
-
-  template <class T, class U > struct pair< T*, U > {
-    typedef T* first_type;
-    typedef U second_type;
-    
-    %traits_swigtype(T);
-    %traits_swigtype(U);
-      
-    %fragment(SWIG_Traits_frag(std::pair< T*, U >), "header",
-	      fragment=SWIG_Traits_frag(T),
-	      fragment=SWIG_Traits_frag(U),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< T*, U > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #T " *," #U " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_PAIR, std::pair< T*, U >);
-
-    pair();
-    pair(T* __a, U __b);
-    pair(const pair& __p);
-
-    T* first;
-    U second;
-
-#ifdef %swig_pair_methods
-    // Add swig/language extra methods
-    %swig_pair_methods(std::pair< T*, U >)
-#endif
-  };
-
-  template <class T, class U > struct pair< T*, U* > {
-    typedef T* first_type;
-    typedef U* second_type;
-
-    %traits_swigtype(T);
-    %traits_swigtype(U);
-      
-    %fragment(SWIG_Traits_frag(std::pair< T*, U* >), "header",
-	      fragment=SWIG_Traits_frag(T),
-	      fragment=SWIG_Traits_frag(U),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< T*, U* > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #T " *," #U " * >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits(SWIG_TYPECHECK_PAIR, std::pair< T*, U* >);
-
-    pair();
-    pair(T* __a, U* __b);
-    pair(const pair& __p);
-
-    T* first;
-    U* second;
- 
-#ifdef %swig_pair_methods
-    // Add swig/language extra methods
-    %swig_pair_methods(std::pair< T*, U* >)
-#endif
-  };
-
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_queue.i b/dependencies2013/win32/swig/Lib/std/std_queue.i
deleted file mode 100644
index b2c8d8d3..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_queue.i
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * @file   std_queue.i
- * @date   Sun May  6 01:48:07 2007
- * 
- * @brief  A wrapping of std::queue for Ruby.
- * 
- * 
- */
-
-%include <std_container.i>
-
-// Queue
-
-%define %std_queue_methods(queue...)
-  queue();
-  queue( const _Sequence& );
-
-  bool empty() const;
-  size_type size() const;
-  const value_type& front() const;
-  const value_type& back() const;
-  void pop();
-  void push( const value_type& );
-%enddef
-
-%define %std_queue_methods_val(queue...) 
-  %std_queue_methods(queue)
-%enddef
-
-// ------------------------------------------------------------------------
-// std::queue
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::queue<T>), f(const std::queue<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::queue<T> can be passed.
-//   -- f(std::queue<T>&), f(std::queue<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::queue
-//      can be passed.
-//   -- std::queue<T> f(), const std::queue<T>& f():
-//      the queue is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::queue<T>& f(), std::queue<T>* f():
-//      the queue is returned by reference; therefore, a wrapped std::queue
-//      is returned
-//   -- const std::queue<T>* f(), f(const std::queue<T>*):
-//      for consistency, they expect and return a plain queue pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <queue>
-%}
-
-// exported classes
-
-namespace std {
-
-  template<class _Tp, class _Sequence = std::deque< _Tp > >
-  class queue {
-  public:
-    typedef size_t size_type;
-    typedef _Tp value_type;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Sequence container_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::queue< _Tp, _Sequence >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdQueueTraits") {
-      namespace swig {
-	template <>  struct traits<std::queue< _Tp, _Sequence > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::queue<" #_Tp "," #_Sequence " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_QUEUE, std::queue< _Tp, _Sequence >);
-  
-#ifdef %swig_queue_methods
-    // Add swig/language extra methods
-    %swig_queue_methods(std::queue< _Tp, _Sequence >);
-#endif
-
-    %std_queue_methods(queue);
-  };
-
-  template<class _Tp, class _Sequence > 
-  class queue< _Tp*, _Sequence > {
-  public:
-    typedef size_t size_type;
-    typedef _Tp value_type;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Sequence container_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::queue< _Tp*, _Sequence >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdQueueTraits") {
-      namespace swig {
-	template <>  struct traits<std::queue< _Tp*, _Sequence > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::queue<" #_Tp "," #_Sequence " * >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_QUEUE, std::queue< _Tp*, _Sequence >);
-
-#ifdef %swig_queue_methods_val
-    // Add swig/language extra methods
-    %swig_queue_methods_val(std::queue< _Tp*, _Sequence >);
-#endif
-
-    %std_queue_methods_val(queue);
-  };
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_set.i b/dependencies2013/win32/swig/Lib/std/std_set.i
deleted file mode 100644
index 107a23c7..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_set.i
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// std::set
-//
-
-%include <std_container.i>
-%include <std_pair.i>
-
-// Set
-%define %std_set_methods_common(set...)
-  set();
-  set( const set& );
-
-  bool empty() const;
-  size_type size() const;
-  void clear();
-
-  void swap(set& v);
-
-
-  size_type erase(const key_type& x);
-  size_type count(const key_type& x) const;
-  
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  class iterator;
-  class reverse_iterator;
-
-  iterator begin();
-  iterator end();
-  reverse_iterator rbegin();
-  reverse_iterator rend();
-
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  void erase(iterator pos) { $self->erase(pos); }
-  void erase(iterator first, iterator last) { $self->erase(first, last); }
-}
-
-  iterator find(const key_type& x);
-  iterator lower_bound(const key_type& x);
-  iterator upper_bound(const key_type& x);
-  std::pair<iterator,iterator> equal_range(const key_type& x);
-#endif
-%enddef
-
-%define %std_set_methods(set...)
-  %std_set_methods_common(set);
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  std::pair<iterator,bool> insert(const value_type& __x);
-#endif
-%enddef
-
-// ------------------------------------------------------------------------
-// std::set
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::set<T>), f(const std::set<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::set<T> can be passed.
-//   -- f(std::set<T>&), f(std::set<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::set
-//      can be passed.
-//   -- std::set<T> f(), const std::set<T>& f():
-//      the set is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::set<T>& f(), std::set<T>* f():
-//      the set is returned by reference; therefore, a wrapped std::set
-//      is returned
-//   -- const std::set<T>* f(), f(const std::set<T>*):
-//      for consistency, they expect and return a plain set pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <set>
-%}
-
-// exported classes
-
-namespace std {
-
-  template <class _Key, class _Compare = std::less< _Key >,
-	    class _Alloc = allocator< _Key > >
-  class set {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key value_type;
-    typedef _Key key_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-
-    %fragment(SWIG_Traits_frag(std::set< _Key, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment="StdSetTraits") {
-      namespace swig {
-	template <>  struct traits<std::set< _Key, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::set<" #_Key "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_SET, std::set< _Key, _Compare, _Alloc >);
-
-    set( const _Compare& );
-
-#ifdef %swig_set_methods
-    // Add swig/language extra methods
-    %swig_set_methods(std::set< _Key, _Compare, _Alloc >);
-#endif
-  
-    %std_set_methods(set);
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_sstream.i b/dependencies2013/win32/swig/Lib/std/std_sstream.i
deleted file mode 100644
index 12bccef2..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_sstream.i
+++ /dev/null
@@ -1,195 +0,0 @@
-/* 
-   For wchar support, you need to include the wchar.i file
-   before this file, ie:
-   
-   %include <wchar.i>
-   %include <std_sstream.i>
-
-   or equivalently, just include
-
-   %include <std_wsstream.i>
-*/
-
-%include <std_alloc.i>
-%include <std_basic_string.i>
-%include <std_string.i>
-%include <std_ios.i>
-#if defined(SWIG_WCHAR)
-%include <std_wstring.i>
-#endif
-%include <std_streambuf.i>
-%include <std_iostream.i>
-
-%{
-#include <sstream>
-%}
-
-
-namespace std
-{
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_stringbuf : public basic_streambuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-// 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-    public:
-      // Constructors:
-      explicit
-      basic_stringbuf(ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      explicit
-      basic_stringbuf(const basic_string<_CharT, _Traits, _Alloc>& __str,
-		      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // Get and set:
-      basic_string<_CharT, _Traits, _Alloc>
-      str() const;
-
-      void
-      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
-
-    };
-
-
-  // 27.7.2  Template class basic_istringstream
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-  class basic_istringstream : public basic_istream<_CharT, _Traits>
-  {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-// 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-
-    public:
-      // Constructors:
-      explicit
-      basic_istringstream(ios_base::openmode __mode = ios_base::in);
-
-      explicit
-      basic_istringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
-			  ios_base::openmode __mode = ios_base::in);
-
-      ~basic_istringstream();
-
-      // Members:
-      basic_stringbuf<_CharT, _Traits, _Alloc>*
-      rdbuf() const;
-
-      basic_string<_CharT, _Traits, _Alloc>
-      str() const;
-
-      void
-      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
-    };
-
-
-  // 27.7.3  Template class basic_ostringstream
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-  class basic_ostringstream : public basic_ostream<_CharT, _Traits>
-  {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-// 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-
-    public:
-     // Constructors/destructor:
-      explicit
-      basic_ostringstream(ios_base::openmode __mode = ios_base::out);
-
-      explicit
-      basic_ostringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
-			  ios_base::openmode __mode = ios_base::out);
-
-      ~basic_ostringstream();
-
-      // Members:
-      basic_stringbuf<_CharT, _Traits, _Alloc>*
-      rdbuf() const;
-
-      basic_string<_CharT, _Traits, _Alloc>
-      str() const;
-
-#if 0
-      void
-      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
-#endif
-    };
-
-
-  // 27.7.4  Template class basic_stringstream
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-  class basic_stringstream : public basic_iostream<_CharT, _Traits>
-  {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-// 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-    public:
-      // Constructors/destructors
-      explicit
-      basic_stringstream(ios_base::openmode __m = ios_base::out | ios_base::in);
-
-      explicit
-      basic_stringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
-			 ios_base::openmode __m = ios_base::out | ios_base::in);
-
-      ~basic_stringstream();
-
-      // Members:
-      basic_stringbuf<_CharT, _Traits, _Alloc>*
-      rdbuf() const;
-
-      basic_string<_CharT, _Traits, _Alloc>
-      str() const;
-
-      void
-      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
-    };
-
-
-} // namespace std
-
-
-namespace std {
-  %template(istringstream) basic_istringstream<char>;
-  %template(ostringstream) basic_ostringstream<char>;
-  %template(stringstream)  basic_stringstream<char>;
-
-
-#if defined(SWIG_WCHAR)
-  %template(wistringstream) basic_istringstream<wchar_t>;
-  %template(wostringstream) basic_ostringstream<wchar_t>;
-  %template(wstringstream)  basic_stringstream<wchar_t>;
-#endif
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_stack.i b/dependencies2013/win32/swig/Lib/std/std_stack.i
deleted file mode 100644
index 5b624b57..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_stack.i
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * @file   std_stack.i
- * @date   Sun May  6 01:48:07 2007
- * 
- * @brief  A wrapping of std::stack for Ruby.
- * 
- * 
- */
-
-%include <std_container.i>
-
-// Stack
-
-%define %std_stack_methods(stack...)
-  stack();
-  stack( const _Sequence& );
-
-  bool empty() const;
-  size_type size() const;
-  const value_type& top() const;
-  void pop();
-  void push( const value_type& );
-%enddef
-
-%define %std_stack_methods_val(stack...) 
-  %std_stack_methods(stack)
-%enddef
-
-// ------------------------------------------------------------------------
-// std::stack
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::stack<T>), f(const std::stack<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::stack<T> can be passed.
-//   -- f(std::stack<T>&), f(std::stack<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::stack
-//      can be passed.
-//   -- std::stack<T> f(), const std::stack<T>& f():
-//      the stack is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::stack<T>& f(), std::stack<T>* f():
-//      the stack is returned by reference; therefore, a wrapped std::stack
-//      is returned
-//   -- const std::stack<T>* f(), f(const std::stack<T>*):
-//      for consistency, they expect and return a plain stack pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <stack>
-%}
-
-// exported classes
-
-namespace std {
-
-  template<class _Tp, class _Sequence = std::deque< _Tp > >
-  class stack {
-  public:
-    typedef size_t size_type;
-    typedef _Tp value_type;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Sequence container_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::stack< _Tp, _Sequence >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdStackTraits") {
-      namespace swig {
-	template <>  struct traits<std::stack< _Tp, _Sequence > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::stack<" #_Tp "," #_Sequence " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_STACK, std::stack< _Tp, _Sequence >);
-  
-#ifdef %swig_stack_methods
-    // Add swig/language extra methods
-    %swig_stack_methods(std::stack< _Tp, _Sequence >);
-#endif
-
-    %std_stack_methods(stack);
-  };
-
-  template<class _Tp, class _Sequence > 
-  class stack< _Tp*, _Sequence > {
-  public:
-    typedef size_t size_type;
-    typedef _Sequence::value_type value_type;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Sequence container_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::stack< _Tp*, _Sequence >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdStackTraits") {
-      namespace swig {
-	template <>  struct traits<std::stack< _Tp*, _Sequence > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::stack<" #_Tp "," #_Sequence " * >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_STACK, std::stack< _Tp*, _Sequence >);
-
-#ifdef %swig_stack_methods_val
-    // Add swig/language extra methods
-    %swig_stack_methods_val(std::stack< _Tp*, _Sequence >);
-#endif
-
-    %std_stack_methods_val(stack);
-  };
-
-}
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_streambuf.i b/dependencies2013/win32/swig/Lib/std/std_streambuf.i
deleted file mode 100644
index 7efb19c6..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_streambuf.i
+++ /dev/null
@@ -1,94 +0,0 @@
-%include <std_ios.i>
-%{
-#ifndef SWIG_STD_NOMODERN_STL
-#include <streambuf>
-#else
-#include <streambuf.h>
-#endif
-%}
-
-namespace std {
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-  class basic_streambuf 
-  {
-  public:
-    // Types:
-    typedef _CharT 					char_type;
-    typedef _Traits 					traits_type;
-    typedef typename traits_type::int_type 		int_type;
-    typedef typename traits_type::pos_type 		pos_type;
-    typedef typename traits_type::off_type 		off_type;
-
-  public:
-    virtual 
-    ~basic_streambuf();
-
-    // Locales:
-    locale 
-    pubimbue(const locale &__loc);
-
-    locale   
-    getloc() const; 
-
-    // Buffer and positioning:
-    basic_streambuf<_CharT, _Traits>* 
-    pubsetbuf(char_type* __s, streamsize __n);
-
-    pos_type 
-    pubseekoff(off_type __off, ios_base::seekdir __way, 
-	       ios_base::openmode __mode = std::ios_base::in | std::ios_base::out);
-
-    pos_type 
-    pubseekpos(pos_type __sp,
-	       ios_base::openmode __mode = std::ios_base::in | std::ios_base::out);
-
-    int 
-    pubsync() ;
-
-    // Get and put areas:
-    // Get area:
-    streamsize 
-    in_avail();
-
-    int_type 
-    snextc();
-
-    int_type 
-    sbumpc();
-
-    int_type 
-    sgetc();
-
-    streamsize 
-    sgetn(char_type* __s, streamsize __n);
-
-    // Putback:
-    int_type 
-    sputbackc(char_type __c);
-
-    int_type 
-    sungetc();
-
-    // Put area:
-    int_type 
-    sputc(char_type __c);
-
-    streamsize 
-    sputn(const char_type* __s, streamsize __n);
-
-  protected:
-    basic_streambuf();
-
-  private:
-    basic_streambuf(const basic_streambuf&);
-
-  }; 
-}
-
-namespace std {
-  %template(streambuf) basic_streambuf<char>;
-#if defined(SWIG_WCHAR)
-  %template(wstreambuf) basic_streambuf<wchar_t>;
-#endif
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_string.i b/dependencies2013/win32/swig/Lib/std/std_string.i
deleted file mode 100644
index 35fcdd16..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_string.i
+++ /dev/null
@@ -1,13 +0,0 @@
-%include <std/std_basic_string.i>
-
-/* plain strings */
-
-namespace std
-{
-  %std_comp_methods(basic_string<char>);
-  %naturalvar string;
-  typedef basic_string<char> string;
-}
-
-
-%template(string) std::basic_string<char>;
diff --git a/dependencies2013/win32/swig/Lib/std/std_unordered_map.i b/dependencies2013/win32/swig/Lib/std/std_unordered_map.i
deleted file mode 100644
index 1cb71482..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_unordered_map.i
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// std::unordered_map
-// Work in progress - the code is not compilable yet:
-// operator--() and constructor(compare function) not available for unordered_
-// types
-//
-
-%include <std_pair.i>
-%include <std_container.i>
-
-%define %std_unordered_map_methods_common(unordered_map...)
-  %std_container_methods(unordered_map);
-
-  size_type erase(const key_type& x);
-  size_type count(const key_type& x) const;
-
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  void erase(iterator position) { $self->erase(position); }
-  void erase(iterator first, iterator last) { $self->erase(first, last); }
-}
-
-  iterator find(const key_type& x);
-  iterator lower_bound(const key_type& x);
-  iterator upper_bound(const key_type& x);
-#endif
-%enddef
-
-%define %std_unordered_map_methods(unordered_map...)
-  %std_unordered_map_methods_common(unordered_map);
-
-  #ifdef SWIG_EXPORT_ITERATOR_METHODS
-//  iterator insert(const value_type& x);
-  #endif
-%enddef
-
-
-// ------------------------------------------------------------------------
-// std::unordered_map
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::unordered_map<T>), f(const std::unordered_map<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::unordered_map<T> can be passed.
-//   -- f(std::unordered_map<T>&), f(std::unordered_map<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::unordered_map
-//      can be passed.
-//   -- std::unordered_map<T> f(), const std::unordered_map<T>& f():
-//      the unordered_map is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::unordered_map<T>& f(), std::unordered_map<T>* f():
-//      the unordered_map is returned by reference; therefore, a wrapped std::unordered_map
-//      is returned
-//   -- const std::unordered_map<T>* f(), f(const std::unordered_map<T>*):
-//      for consistency, they expect and return a plain unordered_map pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <unordered_map>
-%}
-%fragment("<algorithm>");
-%fragment("<stdexcept>");
-
-// exported class
-
-namespace std {
-
-  template<class _Key, class _Tp, class _Compare = std::less< _Key >,
-	   class _Alloc = allocator<std::pair< const _Key, _Tp > > >
-  class unordered_map {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key key_type;
-    typedef _Tp mapped_type;
-    typedef std::pair< const _Key, _Tp > value_type;
-
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-    %traits_swigtype(_Tp);	    
-
-    %fragment(SWIG_Traits_frag(std::pair< _Key, _Tp >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdPairTraits") {
-      namespace swig {
-	template <>  struct traits<std::pair< _Key, _Tp > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" #_Key "," #_Tp " >";
-	  }
-	};
-      }
-    }
-
-    %fragment(SWIG_Traits_frag(std::unordered_map< _Key, _Tp, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(std::pair< _Key, _Tp >),
-	      fragment="StdMapTraits") {
-      namespace swig {
-	template <>  struct traits<std::unordered_map< _Key, _Tp, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::unordered_map<" #_Key "," #_Tp "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_MAP, std::unordered_map< _Key, _Tp, _Compare, _Alloc >);
-
-    unordered_map( const _Compare& );
-
-#ifdef %swig_unordered_map_methods
-    // Add swig/language extra methods
-    %swig_unordered_map_methods(std::unordered_map< _Key, _Tp, _Compare, _Alloc >);
-#endif
-  
-    %std_unordered_map_methods(unordered_map);
-  };
-
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_unordered_multimap.i b/dependencies2013/win32/swig/Lib/std/std_unordered_multimap.i
deleted file mode 100644
index 46b56d88..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_unordered_multimap.i
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// std::unordered_multimap
-// Work in progress - the code is not compilable yet:
-// operator--() and constructor(compare function) not available for unordered_
-// types
-//
-
-%include <std_unordered_map.i>
-
-
-%define %std_unordered_multimap_methods(mmap...)
-  %std_map_methods_common(mmap);
-
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  std::pair<iterator,iterator> equal_range(const key_type& x);
-  std::pair<const_iterator,const_iterator> equal_range(const key_type& x) const;
-#endif
-%enddef
-
-// ------------------------------------------------------------------------
-// std::unordered_multimap
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::unordered_multimap<T>), f(const std::unordered_multimap<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::unordered_multimap<T> can be passed.
-//   -- f(std::unordered_multimap<T>&), f(std::unordered_multimap<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::unordered_multimap
-//      can be passed.
-//   -- std::unordered_multimap<T> f(), const std::unordered_multimap<T>& f():
-//      the map is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::unordered_multimap<T>& f(), std::unordered_multimap<T>* f():
-//      the map is returned by reference; therefore, a wrapped std::unordered_multimap
-//      is returned
-//   -- const std::unordered_multimap<T>* f(), f(const std::unordered_multimap<T>*):
-//      for consistency, they expect and return a plain map pointer.
-// ------------------------------------------------------------------------
-
-
-// exported class
-
-
-namespace std {
-  template<class _Key, class _Tp, class _Compare = std::less< _Key >,
-	   class _Alloc = allocator<std::pair< const _Key, _Tp > > >
-  class unordered_multimap {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key key_type;
-    typedef _Tp mapped_type;
-    typedef std::pair< const _Key, _Tp > value_type;
-
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-    %traits_swigtype(_Tp);	    
-
-    %fragment(SWIG_Traits_frag(std::unordered_multimap< _Key, _Tp, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(std::pair< _Key, _Tp >),
-	      fragment="StdMultimapTraits") {
-      namespace swig {
-	template <>  struct traits<std::unordered_multimap< _Key, _Tp, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::unordered_multimap<" #_Key "," #_Tp "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_MULTIMAP, std::unordered_multimap< _Key, _Tp, _Compare, _Alloc >);
-  
-    unordered_multimap( const _Compare& );
-
-#ifdef %swig_unordered_multimap_methods
-    // Add swig/language extra methods
-    %swig_unordered_multimap_methods(std::unordered_multimap< _Key, _Tp, _Compare, _Alloc >);
-#endif
-
-    %std_unordered_multimap_methods(unordered_multimap);
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_unordered_multiset.i b/dependencies2013/win32/swig/Lib/std/std_unordered_multiset.i
deleted file mode 100644
index 725ca2fe..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_unordered_multiset.i
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// std::unordered_multiset
-// Work in progress - the code is not compilable yet:
-// operator--() and constructor(compare function) not available for unordered_
-// types
-//
-
-%include <std_unordered_set.i>
-
-// Unordered Multiset
-
-%define %std_unordered_multiset_methods(unordered_multiset...)
-  %std_unordered_set_methods_common(unordered_multiset);
-%enddef
-
-
-// ------------------------------------------------------------------------
-// std::unordered_multiset
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::unordered_multiset<T>), f(const std::unordered_multiset<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::unordered_multiset<T> can be passed.
-//   -- f(std::unordered_multiset<T>&), f(std::unordered_multiset<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::unordered_multiset
-//      can be passed.
-//   -- std::unordered_multiset<T> f(), const std::unordered_multiset<T>& f():
-//      the set is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::unordered_multiset<T>& f(), std::unordered_multiset<T>* f():
-//      the set is returned by reference; therefore, a wrapped std::unordered_multiset
-//      is returned
-//   -- const std::unordered_multiset<T>* f(), f(const std::unordered_multiset<T>*):
-//      for consistency, they expect and return a plain set pointer.
-// ------------------------------------------------------------------------
-
-
-// exported classes
-
-namespace std {
-
-  //unordered_multiset
-
-  template <class _Key, class _Compare = std::less< _Key >,
-	    class _Alloc = allocator< _Key > >
-  class unordered_multiset {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Key value_type;
-    typedef _Key key_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-
-    %fragment(SWIG_Traits_frag(std::unordered_multiset< _Key, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment="StdMultisetTraits") {
-      namespace swig {
-	template <>  struct traits<std::unordered_multiset< _Key, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::unordered_multiset<" #_Key "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_MULTISET, std::unordered_multiset< _Key, _Compare, _Alloc >);
-
-    unordered_multiset( const _Compare& );
-
-#ifdef %swig_unordered_multiset_methods
-    // Add swig/language extra methods
-    %swig_unordered_multiset_methods(std::unordered_multiset< _Key, _Compare, _Alloc >);
-#endif
-  
-    %std_unordered_multiset_methods(unordered_multiset);
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_unordered_set.i b/dependencies2013/win32/swig/Lib/std/std_unordered_set.i
deleted file mode 100644
index 98e79204..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_unordered_set.i
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// std::unordered_set
-// Work in progress - the code is not compilable yet:
-// operator--() and constructor(compare function) not available for unordered_
-// types
-//
-
-%include <std_container.i>
-%include <std_pair.i>
-
-// Unordered Set
-%define %std_unordered_set_methods_common(unordered_set...)
-  unordered_set();
-  unordered_set( const unordered_set& );
-
-  bool empty() const;
-  size_type size() const;
-  void clear();
-
-  void swap(unordered_set& v);
-
-
-  size_type erase(const key_type& x);
-  size_type count(const key_type& x) const;
-  
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  class iterator;
-
-  iterator begin();
-  iterator end();
-
-%extend {
-  // %extend wrapper used for differing definitions of these methods introduced in C++11
-  void erase(iterator pos) { $self->erase(pos); }
-  void erase(iterator first, iterator last) { $self->erase(first, last); }
-}
-
-  iterator find(const key_type& x);
-  std::pair<iterator,iterator> equal_range(const key_type& x);
-#endif
-%enddef
-
-%define %std_unordered_set_methods(unordered_set...)
-  %std_unordered_set_methods_common(unordered_set);
-#ifdef SWIG_EXPORT_ITERATOR_METHODS
-  std::pair<iterator,bool> insert(const value_type& __x);
-#endif
-%enddef
-
-// ------------------------------------------------------------------------
-// std::unordered_set
-// 
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::unordered_set<T>), f(const std::unordered_set<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::unordered_set<T> can be passed.
-//   -- f(std::unordered_set<T>&), f(std::unordered_set<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::unordered_set
-//      can be passed.
-//   -- std::unordered_set<T> f(), const std::unordered_set<T>& f():
-//      the unordered_set is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::unordered_set<T>& f(), std::unordered_set<T>* f():
-//      the unordered_set is returned by reference; therefore, a wrapped std::unordered_set
-//      is returned
-//   -- const std::unordered_set<T>* f(), f(const std::unordered_set<T>*):
-//      for consistency, they expect and return a plain unordered_set pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <unordered_set>
-%}
-
-// exported classes
-
-namespace std {
-
-  template <class _Key, class _Hash = std::hash< _Key >,
-            class _Compare = std::equal_to< _Key >,
-	    class _Alloc = allocator< _Key > >
-  class unordered_set {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Hash hasher;
-    typedef _Key value_type;
-    typedef _Key key_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Key);
-
-    %fragment(SWIG_Traits_frag(std::unordered_set< _Key, _Hash, _Compare, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Key),
-	      fragment="StdUnorderedSetTraits") {
-      namespace swig {
-	template <>  struct traits<std::unordered_set< _Key, _Hash, _Compare, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::unordered_set<" #_Key "," #_Hash "," #_Compare "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_SET, std::unordered_set< _Key, _Hash, _Compare, _Alloc >);
-
-    unordered_set( const _Compare& );
-
-#ifdef %swig_unordered_set_methods
-    // Add swig/language extra methods
-    %swig_unordered_set_methods(std::unordered_set< _Key, _Hash, _Compare, _Alloc >);
-#endif
-  
-    %std_unordered_set_methods(unordered_set);
-  };
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_vector.i b/dependencies2013/win32/swig/Lib/std/std_vector.i
deleted file mode 100644
index fae759a3..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_vector.i
+++ /dev/null
@@ -1,225 +0,0 @@
-//
-// std::vector
-//
-
-%include <std_container.i>
-
-// Vector
-
-%define %std_vector_methods(vector...)
-  %std_sequence_methods(vector)
-  
-  void reserve(size_type n);
-  size_type capacity() const;
-%enddef
-
-
-%define %std_vector_methods_val(vector...)
-  %std_sequence_methods_val(vector)
-  
-  void reserve(size_type n);
-  size_type capacity() const;
-%enddef
-
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// as much as possible, namely, to allow the user to pass and 
-// be returned tuples or lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector<T>), f(const std::vector<T>&):
-//      the parameter being read-only, either a sequence or a
-//      previously wrapped std::vector<T> can be passed.
-//   -- f(std::vector<T>&), f(std::vector<T>*):
-//      the parameter may be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector<T> f(), const std::vector<T>& f():
-//      the vector is returned by copy; therefore, a sequence of T:s 
-//      is returned which is most easily used in other functions
-//   -- std::vector<T>& f(), std::vector<T>* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-//   -- const std::vector<T>* f(), f(const std::vector<T>*):
-//      for consistency, they expect and return a plain vector pointer.
-// ------------------------------------------------------------------------
-
-%{
-#include <vector>
-%}    
-
-// exported classes
-
-
-namespace std {
-
-  template<class _Tp, class _Alloc = allocator< _Tp > >
-  class vector {
-  public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef _Tp& reference;
-    typedef const _Tp& const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-    %traits_enum(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::vector< _Tp, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdVectorTraits") {
-      namespace swig {
-	template <>  struct traits<std::vector< _Tp, _Alloc > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::vector<" #_Tp "," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp, _Alloc >);
-
-#ifdef %swig_vector_methods
-    // Add swig/language extra methods
-    %swig_vector_methods(std::vector< _Tp, _Alloc >);
-#endif
-  
-    %std_vector_methods(vector);
-  };
-
-  // ***
-  // This specialization should disappear or get simplified when
-  // a 'const SWIGTYPE*&' can be defined
-  // ***
-  template<class _Tp, class _Alloc >
-  class vector< _Tp*, _Alloc > {
-  public:
-    typedef size_t size_type;    
-    typedef ptrdiff_t difference_type;
-    typedef _Tp* value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::vector< _Tp*, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdVectorTraits") {
-      namespace swig {
-	template <>  struct traits<std::vector< _Tp*, _Alloc > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::vector<" #_Tp " *," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp*, _Alloc >);
-
-#ifdef %swig_vector_methods_val
-    // Add swig/language extra methods
-    %swig_vector_methods_val(std::vector< _Tp*, _Alloc >);
-#endif
-
-    %std_vector_methods_val(vector);
-  };
-
-  // ***
-  // const pointer specialization
-  // ***
-  template<class _Tp, class _Alloc >
-  class vector< _Tp const *, _Alloc > {
-  public:
-    typedef size_t size_type;    
-    typedef ptrdiff_t difference_type;
-    typedef _Tp const * value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(_Tp);
-
-    %fragment(SWIG_Traits_frag(std::vector< _Tp const*, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(_Tp),
-	      fragment="StdVectorTraits") {
-      namespace swig {
-	template <>  struct traits<std::vector< _Tp const*, _Alloc > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::vector<" #_Tp " const*," #_Alloc " >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp const*, _Alloc >);
-
-#ifdef %swig_vector_methods_val
-    // Add swig/language extra methods
-    %swig_vector_methods_val(std::vector< _Tp const*, _Alloc >);
-#endif
-
-    %std_vector_methods_val(vector);
-  };
-
-  // ***
-  // bool specialization
-  // ***
-
-  template<class _Alloc > 
-  class vector<bool,_Alloc > {
-  public:
-    typedef size_t size_type;    
-    typedef ptrdiff_t difference_type;
-    typedef bool value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type reference;
-    typedef value_type const_reference;
-    typedef _Alloc allocator_type;
-
-    %traits_swigtype(bool);
-
-    %fragment(SWIG_Traits_frag(std::vector<bool, _Alloc >), "header",
-	      fragment=SWIG_Traits_frag(bool),
-	      fragment="StdVectorTraits") {
-      namespace swig {
-	template <>  struct traits<std::vector<bool, _Alloc > > {
-	  typedef value_category category;
-	  static const char* type_name() {
-	    return "std::vector<bool, _Alloc >";
-	  }
-	};
-      }
-    }
-
-    %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<bool, _Alloc >);
-
-
-#ifdef %swig_vector_methods_val
-    // Add swig/language extra methods
-    %swig_vector_methods_val(std::vector<bool, _Alloc >);
-#endif
-
-    %std_vector_methods_val(vector);
-
-#if defined(SWIG_STD_MODERN_STL) && !defined(SWIG_STD_NOMODERN_STL) 
-    void flip();
-#endif
-
-  };
-
-}
diff --git a/dependencies2013/win32/swig/Lib/std/std_vectora.i b/dependencies2013/win32/swig/Lib/std/std_vectora.i
deleted file mode 100644
index 0e83dc9b..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_vectora.i
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// We keep this file only for backward compatibility, since std_vector.i
-// now uses the std::allocator parameter.
-//
-
-%include <std_vector.i>
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_wios.i b/dependencies2013/win32/swig/Lib/std/std_wios.i
deleted file mode 100644
index e9c5dd4d..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_wios.i
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  Provide 'std_ios.i' with wchar support.
-*/
-
-%include <wchar.i>
-%include <std_ios.i>
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_wiostream.i b/dependencies2013/win32/swig/Lib/std/std_wiostream.i
deleted file mode 100644
index b9bef903..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_wiostream.i
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  Provide 'std_iostream.i' with wchar support.
-*/
-
-%include <wchar.i>
-%include <std_iostream.i>
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_wsstream.i b/dependencies2013/win32/swig/Lib/std/std_wsstream.i
deleted file mode 100644
index 4c663fc4..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_wsstream.i
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  Provide 'std_sstream.i' with wchar support.
-*/
-
-%include <wchar.i>
-%include <std_sstream.i>
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_wstreambuf.i b/dependencies2013/win32/swig/Lib/std/std_wstreambuf.i
deleted file mode 100644
index 86ac6af6..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_wstreambuf.i
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  Provide 'std_streambuf.i' with wchar support.
-*/
-
-%include <wchar.i>
-%include <std_streambuf.i>
-
diff --git a/dependencies2013/win32/swig/Lib/std/std_wstring.i b/dependencies2013/win32/swig/Lib/std/std_wstring.i
deleted file mode 100644
index e54d2120..00000000
--- a/dependencies2013/win32/swig/Lib/std/std_wstring.i
+++ /dev/null
@@ -1,14 +0,0 @@
-%include <wchar.i>
-%include <std/std_basic_string.i>
-
-/* wide strings */
-
-namespace std
-{
-  %std_comp_methods(basic_string<wchar_t>);
-  %naturalvar wstring;
-  typedef basic_string<wchar_t> wstring;
-}
-
-%template(wstring) std::basic_string<wchar_t>;
-
diff --git a/dependencies2013/win32/swig/Lib/std_except.i b/dependencies2013/win32/swig/Lib/std_except.i
deleted file mode 100644
index 50b5a88a..00000000
--- a/dependencies2013/win32/swig/Lib/std_except.i
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_except.i
- *
- * SWIG library file with typemaps to handle and throw STD exceptions in a
- * language and STL independent way, i.e., the target language doesn't
- * require to support STL but only the 'exception.i' mechanism.
- *
- * These typemaps are used when methods are declared with an STD
- * exception specification, such as
- *
- *   size_t at() const throw (std::out_of_range);
- *
- * The typemaps here are based on the language independent
- * 'exception.i' library. If that is working in your target language,
- * this file will work.
- * 
- * If the target language doesn't implement a robust 'exception.i'
- * mechanism, or you prefer other ways to map the STD exceptions, write
- * a new std_except.i file in the target library directory.
- * ----------------------------------------------------------------------------- */
-
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGGUILE) || defined(SWIGUTL) || defined(SWIGD)
-#error "This version of std_except.i should not be used"
-#endif
-
-%{
-#include <typeinfo>
-#include <stdexcept>
-%}
-
-%include <exception.i>
-
-
-%define %std_exception_map(Exception, Code)
-  %typemap(throws,noblock=1) Exception {
-    SWIG_exception(Code, $1.what());
-  }
-  %ignore Exception;
-  struct Exception {
-  };
-%enddef
-
-namespace std {
-  %std_exception_map(bad_cast,           SWIG_TypeError);
-  %std_exception_map(bad_exception,      SWIG_SystemError);
-  %std_exception_map(domain_error,       SWIG_ValueError);
-  %std_exception_map(exception,          SWIG_SystemError);
-  %std_exception_map(invalid_argument,   SWIG_ValueError);
-  %std_exception_map(length_error,       SWIG_IndexError);
-  %std_exception_map(logic_error,        SWIG_RuntimeError);
-  %std_exception_map(out_of_range,       SWIG_IndexError);
-  %std_exception_map(overflow_error,     SWIG_OverflowError);
-  %std_exception_map(range_error,        SWIG_OverflowError);
-  %std_exception_map(runtime_error,      SWIG_RuntimeError);
-  %std_exception_map(underflow_error,    SWIG_OverflowError);
-}
-
diff --git a/dependencies2013/win32/swig/Lib/stdint.i b/dependencies2013/win32/swig/Lib/stdint.i
deleted file mode 100644
index 14fe6195..00000000
--- a/dependencies2013/win32/swig/Lib/stdint.i
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stdint.i
- *
- * SWIG library file for ISO C99 types: 7.18 Integer types <stdint.h>
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <stdint.h>		// Use the C99 official header
-%}
-
-%include <swigarch.i>
-
-/* Exact integral types.  */
-
-/* Signed.  */
-
-typedef signed char		int8_t;
-typedef short int		int16_t;
-typedef int			int32_t;
-#if defined(SWIGWORDSIZE64)
-typedef long int		int64_t;
-#else
-typedef long long int		int64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint8_t;
-typedef unsigned short int	uint16_t;
-typedef unsigned int		uint32_t;
-#if defined(SWIGWORDSIZE64)
-typedef unsigned long int	uint64_t;
-#else
-typedef unsigned long long int	uint64_t;
-#endif
-
-
-/* Small types.  */
-
-/* Signed.  */
-typedef signed char		int_least8_t;
-typedef short int		int_least16_t;
-typedef int			int_least32_t;
-#if defined(SWIGWORDSIZE64)
-typedef long int		int_least64_t;
-#else
-typedef long long int		int_least64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint_least8_t;
-typedef unsigned short int	uint_least16_t;
-typedef unsigned int		uint_least32_t;
-#if defined(SWIGWORDSIZE64)
-typedef unsigned long int	uint_least64_t;
-#else
-typedef unsigned long long int	uint_least64_t;
-#endif
-
-
-/* Fast types.  */
-
-/* Signed.  */
-typedef signed char		int_fast8_t;
-#if defined(SWIGWORDSIZE64)
-typedef long int		int_fast16_t;
-typedef long int		int_fast32_t;
-typedef long int		int_fast64_t;
-#else
-typedef int			int_fast16_t;
-typedef int			int_fast32_t;
-typedef long long int		int_fast64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint_fast8_t;
-#if defined(SWIGWORDSIZE64)
-typedef unsigned long int	uint_fast16_t;
-typedef unsigned long int	uint_fast32_t;
-typedef unsigned long int	uint_fast64_t;
-#else
-typedef unsigned int		uint_fast16_t;
-typedef unsigned int		uint_fast32_t;
-typedef unsigned long long int	uint_fast64_t;
-#endif
-
-
-/* Types for `void *' pointers.  */
-#if defined(SWIGWORDSIZE64)
-typedef long int		intptr_t;
-typedef unsigned long int	uintptr_t;
-#else
-typedef int			intptr_t;
-typedef unsigned int		uintptr_t;
-#endif
-
-
-/* Largest integral types.  */
-#if defined(SWIGWORDSIZE64)
-typedef long int		intmax_t;
-typedef unsigned long int	uintmax_t;
-#else
-typedef long long int		intmax_t;
-typedef unsigned long long int	uintmax_t;
-#endif
-
-
diff --git a/dependencies2013/win32/swig/Lib/stl.i b/dependencies2013/win32/swig/Lib/stl.i
deleted file mode 100644
index 0b236afd..00000000
--- a/dependencies2013/win32/swig/Lib/stl.i
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-#warning "stl.i not implemented for this target"
-#define SWIG_STL_UNIMPL
-
diff --git a/dependencies2013/win32/swig/Lib/swig.swg b/dependencies2013/win32/swig/Lib/swig.swg
deleted file mode 100644
index 6f48f0d2..00000000
--- a/dependencies2013/win32/swig/Lib/swig.swg
+++ /dev/null
@@ -1,699 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swig.swg
- *
- * Common macro definitions for various SWIG directives.  This file is always 
- * included at the top of each input file.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * User Directives 
- * ----------------------------------------------------------------------------- */
-
-/* Deprecated SWIG-1.1 directives */
-
-#define %disabledoc     %warn "104:%disabledoc is deprecated"
-#define %enabledoc      %warn "105:%enabledoc is deprecated"
-#define %doconly        %warn "106:%doconly is deprecated"
-#define %style          %warn "107:%style is deprecated" /##/
-#define %localstyle     %warn "108:%localstyle is deprecated" /##/
-#define %title          %warn "109:%title is deprecated" /##/
-#define %section        %warn "110:%section is deprecated" /##/
-#define %subsection     %warn "111:%subsection is deprecated" /##/
-#define %subsubsection  %warn "112:%subsubsection is deprecated" /##/
-#define %new            %warn "117:%new is deprecated. Use %newobject"
-#define %text           %insert("null")
-
-/* Code insertion directives such as %wrapper %{ ... %} */
-
-#define %begin       %insert("begin")
-#define %runtime     %insert("runtime")
-#define %header      %insert("header")
-#define %wrapper     %insert("wrapper")
-#define %init        %insert("init")
-
-/* Class extension */
-
-#define %addmethods  %warn "113:%addmethods is now %extend" %extend
-
-/* %ignore directive */
-
-#define %ignore         %rename($ignore)
-#define %ignorewarn(x)  %rename("$ignore:" x)
-
-/* Access control directives */
-
-#define %readonly    %warn "114:%readonly is deprecated. Use %immutable; " %feature("immutable");
-#define %readwrite   %warn "115:%readwrite is deprecated. Use %mutable; " %feature("immutable","");
-
-#define %immutable       %feature("immutable")
-#define %noimmutable     %feature("immutable","0")
-#define %clearimmutable  %feature("immutable","")
-#define %mutable         %clearimmutable
-
-/* Generation of default constructors/destructors (old form, don't use) */
-#define %nodefault       %feature("nodefault","1")
-#define %default         %feature("nodefault","0")
-#define %clearnodefault  %feature("nodefault","")
-#define %makedefault     %clearnodefault
-
-/* Disable the generation of implicit default constructor */
-#define %nodefaultctor       %feature("nodefaultctor","1")
-#define %defaultctor         %feature("nodefaultctor","0")
-#define %clearnodefaultctor  %feature("nodefaultctor","")
-
-/* Disable the generation of implicit default destructor (dangerous) */
-#define %nodefaultdtor       %feature("nodefaultdtor","1")
-#define %defaultdtor         %feature("nodefaultdtor","0")
-#define %clearnodefaultdtor  %feature("nodefaultdtor","")
-
-/* Enable the generation of copy constructor */
-#define %copyctor       %feature("copyctor","1")
-#define %nocopyctor     %feature("copyctor","0")
-#define %clearcopyctor  %feature("copyctor","")
-
-/* Force the old nodefault behavior, ie disable both constructor and destructor */
-#define %oldnodefault       %feature("oldnodefault","1")
-#define %nooldnodefault     %feature("oldnodefault","0")
-#define %clearoldnodefault  %feature("oldnodefault","")
-
-/* the %exception directive */
-#if defined(SWIGCSHARP) || defined(SWIGD)
-#define %exception      %feature("except", canthrow=1)
-#else
-#define %exception      %feature("except")
-#endif
-#define %noexception    %feature("except","0")
-#define %clearexception %feature("except","")
-
-/* the %allowexception directive allows the %exception feature to
-   be applied to set/get variable methods */
-#define %allowexception      %feature("allowexcept")
-#define %noallowexception    %feature("allowexcept","0")
-#define %clearallowexception %feature("allowexcept","")
-
-/* the %exceptionvar directive, as %exception but it is only applied
-   to set/get variable methods. You don't need to use the
-   %allowexception directive when using %exceptionvar.
-*/
-#if defined(SWIGCSHARP) || defined(SWIGD)
-#define %exceptionvar      %feature("exceptvar", canthrow=1)
-#else
-#define %exceptionvar      %feature("exceptvar")
-#endif
-#define %noexceptionvar    %feature("exceptvar","0")
-#define %clearexceptionvar %feature("exceptvar","")
-
-/* the %catches directive */
-#define %catches(tlist...)    %feature("catches","("`tlist`")")
-#define %clearcatches         %feature("catches","")
-
-/* the %exceptionclass directive */
-#define %exceptionclass      %feature("exceptionclass")
-#define %noexceptionclass    %feature("exceptionclass","0")
-#define %clearexceptionclass %feature("exceptionclass","")
-
-/* the %newobject directive */
-#define %newobject        %feature("new")
-#define %nonewobject      %feature("new","0")
-#define %clearnewobject   %feature("new","")
-
-/* the %delobject directive */
-#define %delobject        %feature("del")
-#define %nodelobject      %feature("del","0")
-#define %cleardelobject   %feature("del","")
-
-/* the %refobject/%unrefobject directives */
-#define %refobject         %feature("ref")
-#define %norefobject       %feature("ref","0")
-#define %clearrefobject    %feature("ref","")
-
-#define %unrefobject       %feature("unref")
-#define %nounrefobject     %feature("unref","0")
-#define %clearunrefobject  %feature("unref","")
-
-/* Directives for callback functions (experimental) */
-#define %callback(x)    %feature("callback",`x`)
-#define %nocallback     %feature("callback","0")
-#define %clearcallback  %feature("callback","")
-
-/* the %nestedworkaround directive (deprecated) */
-#define %nestedworkaround       %feature("nestedworkaround")
-#define %nonestedworkaround     %feature("nestedworkaround","0")
-#define %clearnestedworkaround  %feature("nestedworkaround","")
-
-/* the %flatnested directive */
-#define %flatnested       %feature("flatnested")
-#define %noflatnested     %feature("flatnested","0")
-#define %clearflatnested  %feature("flatnested","")
-
-/* the %fastdispatch directive */
-#define %fastdispatch        %feature("fastdispatch")
-#define %nofastdispatch      %feature("fastdispatch","0")
-#define %clearfastdispatch   %feature("fastdispatch","")
-
-/* directors directives */
-#define %director      %feature("director")
-#define %nodirector    %feature("director","0")
-#define %cleardirector %feature("director","")
-
-/* naturalvar directives */
-#define %naturalvar      %feature("naturalvar")
-#define %nonaturalvar    %feature("naturalvar","0")
-#define %clearnaturalvar %feature("naturalvar","")
-
-/* nspace directives */
-#define %nspace      %feature("nspace")
-#define %nonspace    %feature("nspace","0")
-#define %clearnspace %feature("nspace","")
-
-/* valuewrapper directives */
-#define %valuewrapper        %feature("valuewrapper")
-#define %clearvaluewrapper   %feature("valuewrapper","")
-#define %novaluewrapper      %feature("novaluewrapper")
-#define %clearnovaluewrapper %feature("novaluewrapper","")
-
-/* Contract support - Experimental and undocumented */
-#define %contract      %feature("contract")
-#define %nocontract    %feature("contract","0")
-#define %clearcontract %feature("contract","")
-
-/* Macro for setting a dynamic cast function */
-%define DYNAMIC_CAST(mangle,func)
-%init %{
-   mangle->dcast = (swig_dycast_func) func;
-%}
-%enddef
-
-/* aggregation support */
-/*
-  This macro performs constant aggregation.  Basically the idea of
-  constant aggregation is that you can group a collection of constants
-  together.  For example, suppose you have some code like this:
-
-       #define UP  1
-       #define DOWN 2
-       #define LEFT 3
-       #define RIGHT 4
-
-  Now, suppose you had a function like this:
-
-       int move(int direction)
-
-  In this case, you might want to restrict the direction argument to
-  one of the supplied constant names. To do this, you could write some
-  typemap code by hand.  Alternatively, you can use the
-  %aggregate_check macro defined here to create a simple check
-  function for you.  Here is an example:
-
-    %aggregate_check(int, check_direction, UP, DOWN, LEFT, RIGHT);
-
-  Now, using a typemap
-
-    %typemap(check) int direction {
-      if (!check_direction($1)) SWIG_exception(SWIG_ValueError,"Bad direction.");
-    }
-
-  or a contract (better)
-
-    %contract move(int x) {
-    require:
-        check_direction(x);
-    }
-
-*/
-   
-%define %aggregate_check(TYPE, NAME, FIRST, ...)
-%wrapper %{
-static int NAME(TYPE x) {
-    static  TYPE values[] = { FIRST, ##__VA_ARGS__ };
-    static  int size = sizeof(values);
-    int     i,j;
-    for (i = 0, j = 0; i < size; i+=sizeof(TYPE),j++) {
-        if (x == values[j]) return 1; 
-    }
-    return 0;
-}
-%}
-%enddef
-
-
-/* -----------------------------------------------------------------------------
- * %rename predicates
- * ----------------------------------------------------------------------------- */
-/* 
-   Predicates to be used with %rename, for example:
-
-   - to rename all the functions:
-
-     %rename("%(utitle)s", %$isfunction) "";
-
-   - to rename only the member methods:
-
-     %rename("m_%(utitle)s", %$isfunction, %$ismember) "";
-
-   - to rename only the global functions:
-
-      %rename("m_%(utitle)s", %$isfunction, %$not %$ismember) "";
-
-     or
-
-      %rename("g_%(utitle)s", %$isfunction, %$isglobal) "";
-
-   - to ignore the enumitems in a given class:
-
-     %rename("$ignore", %$isenumitem, %$classname="MyClass") "";
-
-   we use the prefix '%$' to avoid clashes with other swig
-   macros/directives.
-
-*/
-
-%define %$not            "not" %enddef 
-%define %$isenum         "match"="enum"  %enddef
-%define %$isenumitem     "match"="enumitem"  %enddef
-%define %$isaccess       "match"="access"   %enddef
-%define %$isclass        "match"="class","notmatch$template$templatetype"="class"   %enddef
-%define %$isextend       "match"="extend"  %enddef
-%define %$isconstructor  "match"="constructor"  %enddef
-%define %$isdestructor   "match"="destructor"  %enddef
-%define %$isnamespace    "match"="namespace"  %enddef
-%define %$istemplate     "match"="template"  %enddef
-%define %$isconstant     "match"="constant"  %enddef  /* %constant definition */
-
-%define %$isunion        "match$kind"="union"  %enddef
-%define %$isfunction     "match$kind"="function"  %enddef
-%define %$isvariable     "match$kind"="variable"  %enddef
-%define %$isimmutable    "match$feature:immutable"="1"  %enddef
-%define %$hasconsttype   "match$hasconsttype"="1"  %enddef
-%define %$hasvalue       "match$hasvalue"="1"  %enddef
-%define %$isextension    "match$isextension"="1"  %enddef
-
-%define %$isstatic       "match$storage"="static"  %enddef
-%define %$isfriend       "match$storage"="friend"  %enddef
-%define %$istypedef      "match$storage"="typedef"  %enddef
-%define %$isvirtual      "match$storage"="virtual"  %enddef
-%define %$isexplicit     "match$storage"="explicit"  %enddef
-%define %$isextern       "match$storage"="extern"  %enddef
-
-%define %$ismember       "match$ismember"="1"  %enddef
-%define %$isglobal       %$not %$ismember  %enddef
-%define %$isextendmember "match$isextendmember"="1"  %enddef
-%define %$innamespace    "match$parentNode$nodeType"="namespace"  %enddef
-
-%define %$ispublic       "match$access"="public"  %enddef
-%define %$isprotected    "match$access"="protected"  %enddef
-%define %$isprivate      "match$access"="private"  %enddef
-
-%define %$ismemberget    "match$memberget"="1"  %enddef
-%define %$ismemberset    "match$memberset"="1"  %enddef
-
-%define %$classname      %$ismember,"match$parentNode$name"  %enddef
-%define %$isnested       "match$nested"="1"  %enddef
-/* -----------------------------------------------------------------------------
- * Include all the warnings labels and macros 
- * ----------------------------------------------------------------------------- */
-
-%include <swigwarnings.swg>
-
-/* -----------------------------------------------------------------------------
- * Overloading support
- * ----------------------------------------------------------------------------- */
-
-/*
- * Function/method overloading support.   This is done through typemaps,
- * but also involves a precedence level.
- */
-
-/* Macro for overload resolution */
-
-%define %typecheck(_x...) %typemap(typecheck, precedence=_x) %enddef
-
-/* Macros for precedence levels */
-
-%define SWIG_TYPECHECK_POINTER       0     %enddef
-%define SWIG_TYPECHECK_ITERATOR      5     %enddef
-%define SWIG_TYPECHECK_VOIDPTR       10    %enddef
-%define SWIG_TYPECHECK_BOOL          15    %enddef
-%define SWIG_TYPECHECK_UINT8         20    %enddef
-%define SWIG_TYPECHECK_INT8          25    %enddef
-%define SWIG_TYPECHECK_UINT16        30    %enddef
-%define SWIG_TYPECHECK_INT16         35    %enddef
-%define SWIG_TYPECHECK_UINT32        40    %enddef
-%define SWIG_TYPECHECK_INT32         45    %enddef
-%define SWIG_TYPECHECK_SIZE          47    %enddef
-%define SWIG_TYPECHECK_PTRDIFF       48    %enddef
-%define SWIG_TYPECHECK_UINT64        50    %enddef
-%define SWIG_TYPECHECK_INT64         55    %enddef
-%define SWIG_TYPECHECK_UINT128       60    %enddef
-%define SWIG_TYPECHECK_INT128        65    %enddef
-%define SWIG_TYPECHECK_INTEGER       70    %enddef
-%define SWIG_TYPECHECK_FLOAT         80    %enddef
-%define SWIG_TYPECHECK_DOUBLE        90    %enddef
-%define SWIG_TYPECHECK_CPLXFLT       95    %enddef
-%define SWIG_TYPECHECK_CPLXDBL      100    %enddef
-%define SWIG_TYPECHECK_COMPLEX      105    %enddef
-%define SWIG_TYPECHECK_UNICHAR      110    %enddef
-%define SWIG_TYPECHECK_STDUNISTRING 115    %enddef
-%define SWIG_TYPECHECK_UNISTRING    120    %enddef
-%define SWIG_TYPECHECK_CHAR         130    %enddef
-%define SWIG_TYPECHECK_STDSTRING    135    %enddef
-%define SWIG_TYPECHECK_STRING       140    %enddef
-%define SWIG_TYPECHECK_PAIR         150    %enddef
-%define SWIG_TYPECHECK_STDARRAY     155    %enddef
-%define SWIG_TYPECHECK_VECTOR       160    %enddef
-%define SWIG_TYPECHECK_DEQUE        170    %enddef
-%define SWIG_TYPECHECK_LIST         180    %enddef
-%define SWIG_TYPECHECK_SET          190    %enddef
-%define SWIG_TYPECHECK_MULTISET     200    %enddef
-%define SWIG_TYPECHECK_MAP          210    %enddef
-%define SWIG_TYPECHECK_MULTIMAP     220    %enddef
-%define SWIG_TYPECHECK_STACK        230    %enddef
-%define SWIG_TYPECHECK_QUEUE        240    %enddef
-
-%define SWIG_TYPECHECK_BOOL_ARRAY        1015    %enddef
-%define SWIG_TYPECHECK_INT8_ARRAY        1025    %enddef
-%define SWIG_TYPECHECK_INT16_ARRAY       1035    %enddef
-%define SWIG_TYPECHECK_INT32_ARRAY       1045    %enddef
-%define SWIG_TYPECHECK_INT64_ARRAY       1055    %enddef
-%define SWIG_TYPECHECK_INT128_ARRAY      1065    %enddef
-%define SWIG_TYPECHECK_FLOAT_ARRAY       1080    %enddef
-%define SWIG_TYPECHECK_DOUBLE_ARRAY      1090    %enddef
-%define SWIG_TYPECHECK_CHAR_ARRAY        1130    %enddef
-%define SWIG_TYPECHECK_STRING_ARRAY      1140    %enddef
-%define SWIG_TYPECHECK_OBJECT_ARRAY      1150    %enddef
-
-%define SWIG_TYPECHECK_BOOL_PTR          2015    %enddef
-%define SWIG_TYPECHECK_UINT8_PTR         2020    %enddef
-%define SWIG_TYPECHECK_INT8_PTR          2025    %enddef
-%define SWIG_TYPECHECK_UINT16_PTR        2030    %enddef
-%define SWIG_TYPECHECK_INT16_PTR         2035    %enddef
-%define SWIG_TYPECHECK_UINT32_PTR        2040    %enddef
-%define SWIG_TYPECHECK_INT32_PTR         2045    %enddef
-%define SWIG_TYPECHECK_UINT64_PTR        2050    %enddef
-%define SWIG_TYPECHECK_INT64_PTR         2055    %enddef
-%define SWIG_TYPECHECK_FLOAT_PTR         2080    %enddef
-%define SWIG_TYPECHECK_DOUBLE_PTR        2090    %enddef
-%define SWIG_TYPECHECK_CHAR_PTR          2130    %enddef
-
-%define SWIG_TYPECHECK_SWIGOBJECT        5000    %enddef
-
-
-/* -----------------------------------------------------------------------------
- * Default handling of certain overloaded operators 
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-%ignoreoperator(NEW)     operator new;
-%ignoreoperator(DELETE)  operator delete;
-%ignoreoperator(NEWARR)  operator new[];
-%ignoreoperator(DELARR)  operator delete[];
-
-/* add C++ operator aliases */
-%rename("operator &&") operator and;    // `and'    `&&'
-%rename("operator ||") operator or;     // `or'     `||'
-%rename("operator !")  operator not;    // `not'     `!'
-%rename("operator &=") operator and_eq; // `and_eq'  `&='
-%rename("operator &")  operator bitand; // `bitand'  `&'
-%rename("operator |")  operator bitor;  // `bitor'   `|'
-%rename("operator ~")  operator compl;  // `compl'   `~'
-%rename("operator !=") operator not_eq; // `not_eq'  `!='
-%rename("operator |=") operator or_eq;  // `or_eq'   `|='
-%rename("operator ^")  operator xor;    // `xor'     `^'
-%rename("operator ^=") operator xor_eq; // `xor_eq'  `^='
-
-/* Smart pointer handling */
-
-%rename(__deref__) *::operator->;
-%rename(__ref__)   *::operator*();
-%rename(__ref__)   *::operator*() const;
-
-/* Define std namespace */
-namespace std {
-  /* Warn about std::initializer_list usage. The constructor/method where used should probably be ignored. See docs. */
-  template<typename T> class initializer_list {};
-  %typemap(in, warning=SWIGWARN_TYPEMAP_INITIALIZER_LIST_MSG) initializer_list<T> ""
-  %typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) initializer_list<T> ""
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- * Default char * and C array typemaps
- * ----------------------------------------------------------------------------- */
-
-/* Set up the typemap for handling new return strings */
-
-#ifdef __cplusplus
-%typemap(newfree) char * "delete [] $1;";
-#else
-%typemap(newfree) char * "free($1);";
-#endif
-
-/* Default typemap for handling char * members */
-
-#ifdef __cplusplus
-%typemap(memberin) char * {
-  delete [] $1;
-  if ($input) {
-     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-%typemap(memberin,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const char * {
-  if ($input) {
-     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-%typemap(globalin) char * {
-  delete [] $1;
-  if ($input) {
-     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-%typemap(globalin,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const char * {
-  if ($input) {
-     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-#else
-%typemap(memberin) char * {
-  free($1);
-  if ($input) {
-     $1 = ($1_type) malloc(strlen((const char *)$input)+1);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-%typemap(memberin,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const char * {
-  if ($input) {
-     $1 = ($1_type) malloc(strlen((const char *)$input)+1);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-%typemap(globalin) char * {
-  free($1);
-  if ($input) {
-     $1 = ($1_type) malloc(strlen((const char *)$input)+1);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-%typemap(globalin,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const char * {
-  if ($input) {
-     $1 = ($1_type) malloc(strlen((const char *)$input)+1);
-     strcpy((char *)$1, (const char *)$input);
-  } else {
-     $1 = 0;
-  }
-}
-
-#endif
-
-/* Character array handling */
-
-%typemap(memberin) char [ANY] {
-  if($input) {
-    strncpy((char*)$1, (const char *)$input, $1_dim0-1);
-    $1[$1_dim0-1] = 0;
-  } else {
-    $1[0] = 0;
-  }
-}
-
-%typemap(globalin) char [ANY] {
-  if($input) {
-    strncpy((char*)$1, (const char *)$input, $1_dim0-1);
-    $1[$1_dim0-1] = 0;
-  } else {
-    $1[0] = 0;
-  }
-}
-
-%typemap(memberin) char [] {
-  if ($input) strcpy((char *)$1, (const char *)$input);
-  else $1[0] = 0;
-}
-
-%typemap(globalin) char [] {
-  if ($input) strcpy((char *)$1, (const char *)$input);
-  else $1[0] = 0;
-}
-
-/* memberin/globalin typemap for arrays. */
-
-%typemap(memberin) SWIGTYPE [ANY] {
-  size_t ii;
-  $1_basetype *b = ($1_basetype *) $1;
-  for (ii = 0; ii < (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);
-}
-
-%typemap(globalin) SWIGTYPE [ANY] {
-  size_t ii;
-  $1_basetype *b = ($1_basetype *) $1;
-  for (ii = 0; ii < (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);
-}
-
-/* memberin/globalin typemap for double arrays. */
-
-%typemap(memberin) SWIGTYPE [ANY][ANY] {
-  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);
-  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);
-  size_t ii = 0;
-  for (; ii < $1_dim0; ++ii) {
-    $basetype *ip = inp[ii];
-    $basetype *dp = dest[ii];
-    size_t jj = 0;
-    for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj];
-  }
-}
-
-%typemap(globalin) SWIGTYPE [ANY][ANY] {
-  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);
-  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);
-  size_t ii = 0;
-  for (; ii < $1_dim0; ++ii) {
-    $basetype *ip = inp[ii];
-    $basetype *dp = dest[ii];
-    size_t jj = 0;
-    for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj];
-  }
-}
-
-/* -----------------------------------------------------------------------------
- *  Runtime code
- * ----------------------------------------------------------------------------- */
-
-/*  The SwigValueWrapper class  */
-
-/*  
- * This template wrapper is used to handle C++ objects that are passed or 
- * returned by value.   This is necessary to handle objects that define
- * no default-constructor (making it difficult for SWIG to properly declare
- * local variables).
- *
- * The wrapper is used as follows.  First consider a function like this:
- *
- *      Vector cross_product(Vector a, Vector b)
- *
- * Now, if Vector is defined as a C++ class with no default constructor, 
- * code is generated as follows:
- *
- *     Vector *wrap_cross_product(Vector *inarg1, Vector *inarg2) {
- *          SwigValueWrapper<Vector>  arg1;
- *          SwigValueWrapper<Vector>  arg2;
- *          SwigValueWrapper<Vector> result;
- *
- *          arg1 = *inarg1;
- *          arg2 = *inarg2;
- *          ...            
- *          result = cross_product(arg1,arg2);
- *          ...
- *          return new Vector(result);
- *    }
- *         
- * In the wrappers, the template SwigValueWrapper simply provides a thin
- * layer around a Vector *.  However, it does this in a way that allows
- * the object to be bound after the variable declaration (which is not possible
- * with the bare object when it lacks a default constructor).  
- *
- * An observant reader will notice that the code after the variable declarations
- * is *identical* to the code used for classes that do define default constructors.
- * Thus, this neat trick allows us to fix this special case without having to
- * make massive changes to typemaps and other parts of the SWIG code generator.
- *
- * Note: this code is not included when SWIG runs in C-mode, when classes
- * define default constructors, or when pointers and references are used.
- * SWIG tries to avoid doing this except in very special circumstances.
- *
- * Note: This solution suffers from making a large number of copies
- * of the underlying object.  However, this is needed in the interest of
- * safety and in order to cover all of the possible ways in which a value
- * might be assigned.  For example:
- *
- *       arg1 = *inarg1;       // Assignment from a pointer
- *       arg1 = Vector(1,2,3); // Assignment from a value  
- *
- * The class offers a strong guarantee of exception safety.
- * With regards to the implementation, the private SwigMovePointer nested class is 
- * a simple smart pointer with move semantics, much like std::auto_ptr.
- *
- * This wrapping technique was suggested by William Fulton and is henceforth
- * known as the "Fulton Transform" :-).
- */
-
-#ifdef __cplusplus
-%insert("runtime") %{
-#ifdef __cplusplus
-/* SwigValueWrapper is described in swig.swg */
-template<typename T> class SwigValueWrapper {
-  struct SwigMovePointer {
-    T *ptr;
-    SwigMovePointer(T *p) : ptr(p) { }
-    ~SwigMovePointer() { delete ptr; }
-    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-  } pointer;
-  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
-public:
-  SwigValueWrapper() : pointer(0) { }
-  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
-  operator T&() const { return *pointer.ptr; }
-  T *operator&() { return pointer.ptr; }
-};%}
-
-/*
- * SwigValueInit() is a generic initialisation solution as the following approach:
- * 
- *       T c_result = T();
- * 
- * doesn't compile for all types for example:
- * 
- *       unsigned int c_result = unsigned int();
- */
-%insert("runtime") %{
-template <typename T> T SwigValueInit() {
-  return T();
-}
-#endif
-%}
-#endif
-
-/*  The swiglabels  */
-
-%insert("runtime") "swiglabels.swg"
-
-
diff --git a/dependencies2013/win32/swig/Lib/swigarch.i b/dependencies2013/win32/swig/Lib/swigarch.i
deleted file mode 100644
index bf4ee8ef..00000000
--- a/dependencies2013/win32/swig/Lib/swigarch.i
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swigarch.i
- *
- * SWIG library file for 32bit/64bit code specialization and checking.
- *
- * Use only in extreme cases, when no arch. independent code can be
- * generated
- * 
- * To activate architecture specific code, use
- *
- *     swig -DSWIGWORDSIZE32
- *
- * or
- *
- *     swig -DSWIGWORDSIZE64
- *
- * Note that extra checking code will be added to the wrapped code,
- * which will prevent the compilation in a different architecture.
- *
- * If you don't specify the SWIGWORDSIZE (the default case), swig will
- * generate architecture independent and/or 32bits code, with no extra
- * checking code added.
- * ----------------------------------------------------------------------------- */
-
-#if !defined(SWIGWORDSIZE32) &&  !defined(SWIGWORDSIZE64)
-# if (__WORDSIZE == 32)
-#  define SWIGWORDSIZE32
-# endif
-#endif
-  
-#if !defined(SWIGWORDSIZE64) &&  !defined(SWIGWORDSIZE32) 
-# if defined(__x86_64) || defined(__x86_64__) || (__WORDSIZE == 64)
-#  define SWIGWORDSIZE64
-# endif
-#endif
-
-
-#ifdef SWIGWORDSIZE32
-%{
-#define SWIGWORDSIZE32
-#ifndef LONG_MAX
-#include <limits.h>
-#endif
-#if (__WORDSIZE == 64) || (LONG_MAX != INT_MAX)
-# error "SWIG wrapped code invalid in 64 bit architecture, regenerate code using -DSWIGWORDSIZE64"
-#endif
-%}
-#endif
-
-#ifdef SWIGWORDSIZE64
-%{
-#define SWIGWORDSIZE64
-#ifndef LONG_MAX
-#include <limits.h>
-#endif
-#if (__WORDSIZE == 32) || (LONG_MAX == INT_MAX)
-# error "SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32"
-#endif
-%}
-#endif
-  
-
diff --git a/dependencies2013/win32/swig/Lib/swigerrors.swg b/dependencies2013/win32/swig/Lib/swigerrors.swg
deleted file mode 100644
index 1a6d2036..00000000
--- a/dependencies2013/win32/swig/Lib/swigerrors.swg
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1
-#define  SWIG_IOError        	   -2
-#define  SWIG_RuntimeError   	   -3
-#define  SWIG_IndexError     	   -4
-#define  SWIG_TypeError      	   -5
-#define  SWIG_DivisionByZero 	   -6
-#define  SWIG_OverflowError  	   -7
-#define  SWIG_SyntaxError    	   -8
-#define  SWIG_ValueError     	   -9
-#define  SWIG_SystemError    	   -10
-#define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12
-#define  SWIG_NullReferenceError   -13
-
-
diff --git a/dependencies2013/win32/swig/Lib/swiginit.swg b/dependencies2013/win32/swig/Lib/swiginit.swg
deleted file mode 100644
index cb72c36e..00000000
--- a/dependencies2013/win32/swig/Lib/swiginit.swg
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -----------------------------------------------------------------------------
- * Type initialization:
- * This problem is tough by the requirement that no dynamic
- * memory is used. Also, since swig_type_info structures store pointers to
- * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization.
- * The idea is that swig generates all the structures that are needed.
- * The runtime then collects these partially filled structures.
- * The SWIG_InitializeModule function takes these initial arrays out of
- * swig_module, and does all the lookup, filling in the swig_module.types
- * array with the correct data and linking the correct swig_cast_info
- * structures together.
- *
- * The generated swig_type_info structures are assigned statically to an initial
- * array. We just loop through that array, and handle each type individually.
- * First we lookup if this type has been already loaded, and if so, use the
- * loaded structure instead of the generated one. Then we have to fill in the
- * cast linked list. The cast data is initially stored in something like a
- * two-dimensional array. Each row corresponds to a type (there are the same
- * number of rows as there are in the swig_type_initial array). Each entry in
- * a column is one of the swig_cast_info structures for that type.
- * The cast_initial array is actually an array of arrays, because each row has
- * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it
- * adding the casts to the list. The one last trick we need to do is making
- * sure the type pointer in the swig_cast_info struct is correct.
- *
- * First off, we lookup the cast->type name to see if it is already loaded.
- * There are three cases to handle:
- *  1) If the cast->type has already been loaded AND the type we are adding
- *     casting info to has not been loaded (it is in this module), THEN we
- *     replace the cast->type pointer with the type pointer that has already
- *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the
- *     cast->type) are loaded, THEN the cast info has already been loaded by
- *     the previous module so we just ignore it.
- *  3) Finally, if cast->type has not already been loaded, then we add that
- *     swig_cast_info to the linked list (because the cast->type) pointer will
- *     be correct.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* c-mode */
-#endif
-#endif
-
-#if 0
-#define SWIGRUNTIME_DEBUG
-#endif
-
-
-SWIGRUNTIME void
-SWIG_InitializeModule(void *clientdata) {
-  size_t i;
-  swig_module_info *module_head, *iter;
-  int init;
-
-  /* check to see if the circular list has been setup, if not, set it up */
-  if (swig_module.next==0) {
-    /* Initialize the swig_module */
-    swig_module.type_initial = swig_type_initial;
-    swig_module.cast_initial = swig_cast_initial;
-    swig_module.next = &swig_module;
-    init = 1;
-  } else {
-    init = 0;
-  }
-
-  /* Try and load any already created modules */
-  module_head = SWIG_GetModule(clientdata);
-  if (!module_head) {
-    /* This is the first module loaded for this interpreter */
-    /* so set the swig module into the interpreter */
-    SWIG_SetModule(clientdata, &swig_module);
-  } else {
-    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    iter=module_head;
-    do {
-      if (iter==&swig_module) {
-        /* Our module is already in the list, so there's nothing more to do. */
-        return;
-      }
-      iter=iter->next;
-    } while (iter!= module_head);
-
-    /* otherwise we must add our module into the list */
-    swig_module.next = module_head->next;
-    module_head->next = &swig_module;
-  }
-
-  /* When multiple interpreters are used, a module could have already been initialized in
-     a different interpreter, but not yet have a pointer in this interpreter.
-     In this case, we do not want to continue adding types... everything should be
-     set up already */
-  if (init == 0) return;
-
-  /* Now work on filling in swig_module.types */
-#ifdef SWIGRUNTIME_DEBUG
-  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
-#endif
-  for (i = 0; i < swig_module.size; ++i) {
-    swig_type_info *type = 0;
-    swig_type_info *ret;
-    swig_cast_info *cast;
-
-#ifdef SWIGRUNTIME_DEBUG
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
-#endif
-
-    /* if there is another module already loaded */
-    if (swig_module.next != &swig_module) {
-      type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name);
-    }
-    if (type) {
-      /* Overwrite clientdata field */
-#ifdef SWIGRUNTIME_DEBUG
-      printf("SWIG_InitializeModule: found type %s\n", type->name);
-#endif
-      if (swig_module.type_initial[i]->clientdata) {
-	type->clientdata = swig_module.type_initial[i]->clientdata;
-#ifdef SWIGRUNTIME_DEBUG
-      printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
-#endif
-      }
-    } else {
-      type = swig_module.type_initial[i];
-    }
-
-    /* Insert casting types */
-    cast = swig_module.cast_initial[i];
-    while (cast->type) {
-
-      /* Don't need to add information already in the list */
-      ret = 0;
-#ifdef SWIGRUNTIME_DEBUG
-      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
-#endif
-      if (swig_module.next != &swig_module) {
-        ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
-#ifdef SWIGRUNTIME_DEBUG
-	if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
-#endif
-      }
-      if (ret) {
-	if (type == swig_module.type_initial[i]) {
-#ifdef SWIGRUNTIME_DEBUG
-	  printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
-#endif
-	  cast->type = ret;
-	  ret = 0;
-	} else {
-	  /* Check for casting already in the list */
-	  swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
-#ifdef SWIGRUNTIME_DEBUG
-	  if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
-#endif
-	  if (!ocast) ret = 0;
-	}
-      }
-
-      if (!ret) {
-#ifdef SWIGRUNTIME_DEBUG
-	printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
-#endif
-        if (type->cast) {
-          type->cast->prev = cast;
-          cast->next = type->cast;
-        }
-        type->cast = cast;
-      }
-      cast++;
-    }
-    /* Set entry in modules->types array equal to the type */
-    swig_module.types[i] = type;
-  }
-  swig_module.types[i] = 0;
-
-#ifdef SWIGRUNTIME_DEBUG
-  printf("**** SWIG_InitializeModule: Cast List ******\n");
-  for (i = 0; i < swig_module.size; ++i) {
-    int j = 0;
-    swig_cast_info *cast = swig_module.cast_initial[i];
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
-    while (cast->type) {
-      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
-      cast++;
-      ++j;
-    }
-  printf("---- Total casts: %d\n",j);
-  }
-  printf("**** SWIG_InitializeModule: Cast List ******\n");
-#endif
-}
-
-/* This function will propagate the clientdata field of type to
-* any new swig_type_info structures that have been added into the list
-* of equivalent types.  It is like calling
-* SWIG_TypeClientData(type, clientdata) a second time.
-*/
-SWIGRUNTIME void
-SWIG_PropagateClientData(void) {
-  size_t i;
-  swig_cast_info *equiv;
-  static int init_run = 0;
-
-  if (init_run) return;
-  init_run = 1;
-
-  for (i = 0; i < swig_module.size; i++) {
-    if (swig_module.types[i]->clientdata) {
-      equiv = swig_module.types[i]->cast;
-      while (equiv) {
-        if (!equiv->converter) {
-          if (equiv->type && !equiv->type->clientdata)
-            SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata);
-        }
-        equiv = equiv->next;
-      }
-    }
-  }
-}
-
-#ifdef __cplusplus
-#if 0
-{ /* c-mode */
-#endif
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/swiglabels.swg b/dependencies2013/win32/swig/Lib/swiglabels.swg
deleted file mode 100644
index b3855665..00000000
--- a/dependencies2013/win32/swig/Lib/swiglabels.swg
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -----------------------------------------------------------------------------
- *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
-
-/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
-#endif
-
-/* inline attribute */
-#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
-# else
-#   define SWIGINLINE
-# endif
-#endif
-
-/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__))
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__))
-# else
-#   define SWIGUNUSED
-# endif
-#endif
-
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif
-#endif
-
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
-# endif
-#endif
-
-/* internal SWIG method */
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
-#endif
-
-/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
-
-/* exporting methods */
-#if defined(__GNUC__)
-#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#    ifndef GCC_HASCLASSVISIBILITY
-#      define GCC_HASCLASSVISIBILITY
-#    endif
-#  endif
-#endif
-
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
-# else
-#   define SWIGSTDCALL
-# endif
-#endif
-
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
-#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
-# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
-#endif
-
-/* Intel's compiler complains if a variable which was never initialised is
- * cast to void, which is a common idiom which we use to indicate that we
- * are aware a variable isn't used.  So we just silence that warning.
- * See: https://github.com/swig/swig/issues/192 for more discussion.
- */
-#ifdef __INTEL_COMPILER
-# pragma warning disable 592
-#endif
diff --git a/dependencies2013/win32/swig/Lib/swigrun.i b/dependencies2013/win32/swig/Lib/swigrun.i
deleted file mode 100644
index 6026a915..00000000
--- a/dependencies2013/win32/swig/Lib/swigrun.i
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swigrun.i
- *
- * Empty module (for now).  Placeholder for runtime libs
- * ----------------------------------------------------------------------------- */
-
-%module swigrun
-
diff --git a/dependencies2013/win32/swig/Lib/swigrun.swg b/dependencies2013/win32/swig/Lib/swigrun.swg
deleted file mode 100644
index 1ef67618..00000000
--- a/dependencies2013/win32/swig/Lib/swigrun.swg
+++ /dev/null
@@ -1,572 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swigrun.swg
- *
- * This file contains generic C API SWIG runtime support for pointer
- * type checking.
- * ----------------------------------------------------------------------------- */
-
-/* This should only be incremented when either the layout of swig_type_info changes,
-   or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "4"
-
-/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
-#ifdef SWIG_TYPE_TABLE
-# define SWIG_QUOTE_STRING(x) #x
-# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
-# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
-#else
-# define SWIG_TYPE_TABLE_NAME
-#endif
-
-/*
-  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the SWIG runtime code.
-  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-
-  But only do this if strictly necessary, ie, if you have problems
-  with your compiler or suchlike.
-*/
-
-#ifndef SWIGRUNTIME
-# define SWIGRUNTIME SWIGINTERN
-#endif
-
-#ifndef SWIGRUNTIMEINLINE
-# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
-#endif
-
-/*  Generic buffer size */
-#ifndef SWIG_BUFFER_SIZE
-# define SWIG_BUFFER_SIZE 1024
-#endif
-
-/* Flags for pointer conversions */
-#define SWIG_POINTER_DISOWN        0x1
-#define SWIG_CAST_NEW_MEMORY       0x2
-
-/* Flags for new pointer objects */
-#define SWIG_POINTER_OWN           0x1
-
-
-/*
-   Flags/methods for returning states.
-
-   The SWIG conversion methods, as ConvertPtr, return an integer
-   that tells if the conversion was successful or not. And if not,
-   an error code can be returned (see swigerrors.swg for the codes).
-
-   Use the following macros/flags to set or process the returning
-   states.
-
-   In old versions of SWIG, code such as the following was usually written:
-
-     if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
-       // success code
-     } else {
-       //fail code
-     }
-
-   Now you can be more explicit:
-
-    int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
-    if (SWIG_IsOK(res)) {
-      // success code
-    } else {
-      // fail code
-    }
-
-   which is the same really, but now you can also do
-
-    Type *ptr;
-    int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
-    if (SWIG_IsOK(res)) {
-      // success code
-      if (SWIG_IsNewObj(res) {
-        ...
-	delete *ptr;
-      } else {
-        ...
-      }
-    } else {
-      // fail code
-    }
-
-   I.e., now SWIG_ConvertPtr can return new objects and you can
-   identify the case and take care of the deallocation. Of course that
-   also requires SWIG_ConvertPtr to return new result values, such as
-
-      int SWIG_ConvertPtr(obj, ptr,...) {
-        if (<obj is ok>) {
-          if (<need new object>) {
-            *ptr = <ptr to new allocated object>;
-            return SWIG_NEWOBJ;
-          } else {
-            *ptr = <ptr to old object>;
-            return SWIG_OLDOBJ;
-          }
-        } else {
-          return SWIG_BADOBJ;
-        }
-      }
-
-   Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
-   more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   SWIG errors code.
-
-   Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-   allows to return the 'cast rank', for example, if you have this
-
-       int food(double)
-       int fooi(int);
-
-   and you call
-
-      food(1)   // cast rank '1'  (1 -> 1.0)
-      fooi(1)   // cast rank '0'
-
-   just use the SWIG_AddCast()/SWIG_CheckState()
-*/
-
-#define SWIG_OK                    (0)
-#define SWIG_ERROR                 (-1)
-#define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
-
-/* The CastRankLimit says how many bits are used for the cast rank */
-#define SWIG_CASTRANKLIMIT         (1 << 8)
-/* The NewMask denotes the object was created (using new/malloc) */
-#define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
-/* The TmpMask is for in/out typemaps that use temporal objects */
-#define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
-/* Simple returning values */
-#define SWIG_BADOBJ                (SWIG_ERROR)
-#define SWIG_OLDOBJ                (SWIG_OK)
-#define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
-#define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
-/* Check, add and del mask methods */
-#define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
-#define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
-#define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
-#define SWIG_AddTmpMask(r)         (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
-#define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
-#define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
-
-/* Cast-Rank Mode */
-#if defined(SWIG_CASTRANK_MODE)
-#  ifndef SWIG_TypeRank
-#    define SWIG_TypeRank             unsigned long
-#  endif
-#  ifndef SWIG_MAXCASTRANK            /* Default cast allowed */
-#    define SWIG_MAXCASTRANK          (2)
-#  endif
-#  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
-#  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) {
-  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
-}
-SWIGINTERNINLINE int SWIG_CheckState(int r) {
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
-}
-#else /* no cast-rank mode */
-#  define SWIG_AddCast(r) (r)
-#  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
-#endif
-
-
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void *(*swig_converter_func)(void *, int *);
-typedef struct swig_type_info *(*swig_dycast_func)(void **);
-
-/* Structure to store information on one type */
-typedef struct swig_type_info {
-  const char             *name;			/* mangled name of this type */
-  const char             *str;			/* human readable name of this type */
-  swig_dycast_func        dcast;		/* dynamic cast function down a hierarchy */
-  struct swig_cast_info  *cast;			/* linked list of types that can cast into this type */
-  void                   *clientdata;		/* language specific type data */
-  int                    owndata;		/* flag if the structure owns the clientdata */
-} swig_type_info;
-
-/* Structure to store a type and conversion function used for casting */
-typedef struct swig_cast_info {
-  swig_type_info         *type;			/* pointer to type that is equivalent to this type */
-  swig_converter_func     converter;		/* function to cast the void pointers */
-  struct swig_cast_info  *next;			/* pointer to next cast in linked list */
-  struct swig_cast_info  *prev;			/* pointer to the previous cast */
-} swig_cast_info;
-
-/* Structure used to store module information
- * Each module generates one structure like this, and the runtime collects
- * all of these structures and stores them in a circularly linked list.*/
-typedef struct swig_module_info {
-  swig_type_info         **types;		/* Array of pointers to swig_type_info structures that are in this module */
-  size_t                 size;		        /* Number of types in this module */
-  struct swig_module_info *next;		/* Pointer to next element in circularly linked list */
-  swig_type_info         **type_initial;	/* Array of initially generated type structures */
-  swig_cast_info         **cast_initial;	/* Array of initially generated casting structures */
-  void                    *clientdata;		/* Language specific module data */
-} swig_module_info;
-
-/*
-  Compare two type names skipping the space characters, therefore
-  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
-
-  Return 0 when the two name types are equivalent, as in
-  strncmp, but skipping ' '.
-*/
-SWIGRUNTIME int
-SWIG_TypeNameComp(const char *f1, const char *l1,
-		  const char *f2, const char *l2) {
-  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
-    while ((*f1 == ' ') && (f1 != l1)) ++f1;
-    while ((*f2 == ' ') && (f2 != l2)) ++f2;
-    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
-  }
-  return (int)((l1 - f1) - (l2 - f2));
-}
-
-/*
-  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
-*/
-SWIGRUNTIME int
-SWIG_TypeCmp(const char *nb, const char *tb) {
-  int equiv = 1;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (equiv != 0 && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
-    if (*ne) ++ne;
-  }
-  return equiv;
-}
-
-/*
-  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
-*/
-SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
-}
-
-/*
-  Check the typename
-*/
-SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (strcmp(iter->type->name, c) == 0) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
-}
-
-/*
-  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
-*/
-SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (iter->type == from) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
-}
-
-/*
-  Cast a pointer up an inheritance hierarchy
-*/
-SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
-}
-
-/*
-   Dynamic pointer casting. Down an inheritance hierarchy
-*/
-SWIGRUNTIME swig_type_info *
-SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
-  swig_type_info *lastty = ty;
-  if (!ty || !ty->dcast) return ty;
-  while (ty && (ty->dcast)) {
-    ty = (*ty->dcast)(ptr);
-    if (ty) lastty = ty;
-  }
-  return lastty;
-}
-
-/*
-  Return the name associated with this type
-*/
-SWIGRUNTIMEINLINE const char *
-SWIG_TypeName(const swig_type_info *ty) {
-  return ty->name;
-}
-
-/*
-  Return the pretty name associated with this type,
-  that is an unmangled type name in a form presentable to the user.
-*/
-SWIGRUNTIME const char *
-SWIG_TypePrettyName(const swig_type_info *type) {
-  /* The "str" field contains the equivalent pretty names of the
-     type, separated by vertical-bar characters.  We choose
-     to print the last name, as it is often (?) the most
-     specific. */
-  if (!type) return NULL;
-  if (type->str != NULL) {
-    const char *last_name = type->str;
-    const char *s;
-    for (s = type->str; *s; s++)
-      if (*s == '|') last_name = s+1;
-    return last_name;
-  }
-  else
-    return type->name;
-}
-
-/*
-   Set the clientdata field for a type
-*/
-SWIGRUNTIME void
-SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
-  swig_cast_info *cast = ti->cast;
-  /* if (ti->clientdata == clientdata) return; */
-  ti->clientdata = clientdata;
-
-  while (cast) {
-    if (!cast->converter) {
-      swig_type_info *tc = cast->type;
-      if (!tc->clientdata) {
-	SWIG_TypeClientData(tc, clientdata);
-      }
-    }
-    cast = cast->next;
-  }
-}
-SWIGRUNTIME void
-SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
-  SWIG_TypeClientData(ti, clientdata);
-  ti->owndata = 1;
-}
-
-/*
-  Search for a swig_type_info structure only by mangled name
-  Search is a O(log #types)
-
-  We start searching at module start, and finish searching when start == end.
-  Note: if start == end at the beginning of the function, we go all the way around
-  the circular list.
-*/
-SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start,
-                            swig_module_info *end,
-		            const char *name) {
-  swig_module_info *iter = start;
-  do {
-    if (iter->size) {
-      size_t l = 0;
-      size_t r = iter->size - 1;
-      do {
-	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	size_t i = (l + r) >> 1;
-	const char *iname = iter->types[i]->name;
-	if (iname) {
-	  int compare = strcmp(name, iname);
-	  if (compare == 0) {
-	    return iter->types[i];
-	  } else if (compare < 0) {
-	    if (i) {
-	      r = i - 1;
-	    } else {
-	      break;
-	    }
-	  } else if (compare > 0) {
-	    l = i + 1;
-	  }
-	} else {
-	  break; /* should never happen */
-	}
-      } while (l <= r);
-    }
-    iter = iter->next;
-  } while (iter != end);
-  return 0;
-}
-
-/*
-  Search for a swig_type_info structure for either a mangled name or a human readable name.
-  It first searches the mangled names of the types, which is a O(log #types)
-  If a type is not found it then searches the human readable names, which is O(#types).
-
-  We start searching at module start, and finish searching when start == end.
-  Note: if start == end at the beginning of the function, we go all the way around
-  the circular list.
-*/
-SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start,
-                     swig_module_info *end,
-		     const char *name) {
-  /* STEP 1: Search the name field using binary search */
-  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
-  if (ret) {
-    return ret;
-  } else {
-    /* STEP 2: If the type hasn't been found, do a complete search
-       of the str field (the human readable name) */
-    swig_module_info *iter = start;
-    do {
-      size_t i = 0;
-      for (; i < iter->size; ++i) {
-	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
-	  return iter->types[i];
-      }
-      iter = iter->next;
-    } while (iter != end);
-  }
-
-  /* neither found a match */
-  return 0;
-}
-
-/*
-   Pack binary data into a string
-*/
-SWIGRUNTIME char *
-SWIG_PackData(char *c, void *ptr, size_t sz) {
-  static const char hex[17] = "0123456789abcdef";
-  const unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu =  u + sz;
-  for (; u != eu; ++u) {
-    unsigned char uu = *u;
-    *(c++) = hex[(uu & 0xf0) >> 4];
-    *(c++) = hex[uu & 0xf];
-  }
-  return c;
-}
-
-/*
-   Unpack binary data from a string
-*/
-SWIGRUNTIME const char *
-SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu = u + sz;
-  for (; u != eu; ++u) {
-    char d = *(c++);
-    unsigned char uu;
-    if ((d >= '0') && (d <= '9'))
-      uu = (unsigned char)((d - '0') << 4);
-    else if ((d >= 'a') && (d <= 'f'))
-      uu = (unsigned char)((d - ('a'-10)) << 4);
-    else
-      return (char *) 0;
-    d = *(c++);
-    if ((d >= '0') && (d <= '9'))
-      uu |= (unsigned char)(d - '0');
-    else if ((d >= 'a') && (d <= 'f'))
-      uu |= (unsigned char)(d - ('a'-10));
-    else
-      return (char *) 0;
-    *u = uu;
-  }
-  return c;
-}
-
-/*
-   Pack 'void *' into a string buffer.
-*/
-SWIGRUNTIME char *
-SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
-  char *r = buff;
-  if ((2*sizeof(void *) + 2) > bsz) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r,&ptr,sizeof(void *));
-  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
-  strcpy(r,name);
-  return buff;
-}
-
-SWIGRUNTIME const char *
-SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
-  if (*c != '_') {
-    if (strcmp(c,"NULL") == 0) {
-      *ptr = (void *) 0;
-      return name;
-    } else {
-      return 0;
-    }
-  }
-  return SWIG_UnpackData(++c,ptr,sizeof(void *));
-}
-
-SWIGRUNTIME char *
-SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
-  char *r = buff;
-  size_t lname = (name ? strlen(name) : 0);
-  if ((2*sz + 2 + lname) > bsz) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r,ptr,sz);
-  if (lname) {
-    strncpy(r,name,lname+1);
-  } else {
-    *r = 0;
-  }
-  return buff;
-}
-
-SWIGRUNTIME const char *
-SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
-  if (*c != '_') {
-    if (strcmp(c,"NULL") == 0) {
-      memset(ptr,0,sz);
-      return name;
-    } else {
-      return 0;
-    }
-  }
-  return SWIG_UnpackData(++c,ptr,sz);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/swigwarn.swg b/dependencies2013/win32/swig/Lib/swigwarn.swg
deleted file mode 100644
index 1262ce01..00000000
--- a/dependencies2013/win32/swig/Lib/swigwarn.swg
+++ /dev/null
@@ -1,289 +0,0 @@
-/* SWIG warning codes */
-
-
-%define SWIGWARN_NONE                     0 %enddef
-
-/* -- Deprecated features -- */
-
-%define SWIGWARN_DEPRECATED_EXTERN        101 %enddef
-%define SWIGWARN_DEPRECATED_VAL           102 %enddef
-%define SWIGWARN_DEPRECATED_OUT           103 %enddef
-%define SWIGWARN_DEPRECATED_DISABLEDOC    104 %enddef
-%define SWIGWARN_DEPRECATED_ENABLEDOC     105 %enddef
-%define SWIGWARN_DEPRECATED_DOCONLY       106 %enddef
-%define SWIGWARN_DEPRECATED_STYLE         107 %enddef
-%define SWIGWARN_DEPRECATED_LOCALSTYLE    108 %enddef
-%define SWIGWARN_DEPRECATED_TITLE         109 %enddef
-%define SWIGWARN_DEPRECATED_SECTION       110 %enddef
-%define SWIGWARN_DEPRECATED_SUBSECTION    111 %enddef
-%define SWIGWARN_DEPRECATED_SUBSUBSECTION 112 %enddef
-%define SWIGWARN_DEPRECATED_ADDMETHODS    113 %enddef
-%define SWIGWARN_DEPRECATED_READONLY      114 %enddef
-%define SWIGWARN_DEPRECATED_READWRITE     115 %enddef
-%define SWIGWARN_DEPRECATED_EXCEPT        116 %enddef
-%define SWIGWARN_DEPRECATED_NEW           117 %enddef
-%define SWIGWARN_DEPRECATED_EXCEPT_TM     118 %enddef
-%define SWIGWARN_DEPRECATED_IGNORE_TM     119 %enddef
-%define SWIGWARN_DEPRECATED_OPTC          120 %enddef
-%define SWIGWARN_DEPRECATED_NAME          121 %enddef
-%define SWIGWARN_DEPRECATED_NOEXTERN      122 %enddef
-%define SWIGWARN_DEPRECATED_NODEFAULT     123 %enddef
-%define SWIGWARN_DEPRECATED_TYPEMAP_LANG  124 %enddef
-%define SWIGWARN_DEPRECATED_INPUT_FILE    125 %enddef
-%define SWIGWARN_DEPRECATED_NESTED_WORKAROUND 126 %enddef
-
-/* -- Preprocessor -- */
-
-%define SWIGWARN_PP_MISSING_FILE          201 %enddef
-%define SWIGWARN_PP_EVALUATION            202 %enddef
-%define SWIGWARN_PP_INCLUDEALL_IMPORTALL  203 %enddef
-%define SWIGWARN_PP_CPP_WARNING           204 %enddef
-%define SWIGWARN_PP_CPP_ERROR             205 %enddef
-%define SWIGWARN_PP_UNEXPECTED_TOKENS     206 %enddef
-
-/* -- C/C++ Parser -- */
-
-%define SWIGWARN_PARSE_CLASS_KEYWORD      301 %enddef
-%define SWIGWARN_PARSE_REDEFINED          302 %enddef
-%define SWIGWARN_PARSE_EXTEND_UNDEF       303 %enddef
-%define SWIGWARN_PARSE_UNSUPPORTED_VALUE  304 %enddef
-%define SWIGWARN_PARSE_BAD_VALUE          305 %enddef
-%define SWIGWARN_PARSE_PRIVATE            306 %enddef
-%define SWIGWARN_PARSE_BAD_DEFAULT        307 %enddef
-%define SWIGWARN_PARSE_NAMESPACE_ALIAS    308 %enddef
-%define SWIGWARN_PARSE_PRIVATE_INHERIT    309 %enddef
-%define SWIGWARN_PARSE_TEMPLATE_REPEAT    310 %enddef
-%define SWIGWARN_PARSE_TEMPLATE_PARTIAL   311 %enddef
-%define SWIGWARN_PARSE_UNNAMED_NESTED_CLASS 312 %enddef
-%define SWIGWARN_PARSE_UNDEFINED_EXTERN   313 %enddef
-%define SWIGWARN_PARSE_KEYWORD            314 %enddef
-%define SWIGWARN_PARSE_USING_UNDEF        315 %enddef
-%define SWIGWARN_PARSE_MODULE_REPEAT      316 %enddef
-%define SWIGWARN_PARSE_TEMPLATE_SP_UNDEF  317 %enddef
-%define SWIGWARN_PARSE_TEMPLATE_AMBIG     318 %enddef
-%define SWIGWARN_PARSE_NO_ACCESS          319 %enddef
-%define SWIGWARN_PARSE_EXPLICIT_TEMPLATE  320 %enddef
-%define SWIGWARN_PARSE_BUILTIN_NAME       321 %enddef
-%define SWIGWARN_PARSE_REDUNDANT          322 %enddef
-%define SWIGWARN_PARSE_REC_INHERITANCE    323 %enddef
-%define SWIGWARN_PARSE_NESTED_TEMPLATE    324 %enddef
-%define SWIGWARN_PARSE_NAMED_NESTED_CLASS 325 %enddef
-%define SWIGWARN_PARSE_EXTEND_NAME        326 %enddef
-
-%define SWIGWARN_CPP11_LAMBDA             340 %enddef
-%define SWIGWARN_CPP11_ALIAS_DECLARATION  341 %enddef  /* redundant now */
-%define SWIGWARN_CPP11_ALIAS_TEMPLATE     342 %enddef  /* redundant now */
-%define SWIGWARN_CPP11_VARIADIC_TEMPLATE  343 %enddef
-
-%define SWIGWARN_IGNORE_OPERATOR_NEW        350 %enddef	/* new */
-%define SWIGWARN_IGNORE_OPERATOR_DELETE     351 %enddef	/* delete */
-%define SWIGWARN_IGNORE_OPERATOR_PLUS       352 %enddef	/* + */
-%define SWIGWARN_IGNORE_OPERATOR_MINUS      353 %enddef	/* - */
-%define SWIGWARN_IGNORE_OPERATOR_MUL        354 %enddef	/* * */
-%define SWIGWARN_IGNORE_OPERATOR_DIV        355 %enddef	/* / */
-%define SWIGWARN_IGNORE_OPERATOR_MOD        356 %enddef	/* % */
-%define SWIGWARN_IGNORE_OPERATOR_XOR        357 %enddef	/* ^ */
-%define SWIGWARN_IGNORE_OPERATOR_AND        358 %enddef	/* & */
-%define SWIGWARN_IGNORE_OPERATOR_OR         359 %enddef	/* | */
-%define SWIGWARN_IGNORE_OPERATOR_NOT        360 %enddef	/* ~ */
-%define SWIGWARN_IGNORE_OPERATOR_LNOT       361 %enddef	/* ! */
-%define SWIGWARN_IGNORE_OPERATOR_EQ         362 %enddef	/* = */
-%define SWIGWARN_IGNORE_OPERATOR_LT         363 %enddef	/* < */
-%define SWIGWARN_IGNORE_OPERATOR_GT         364 %enddef	/* > */
-%define SWIGWARN_IGNORE_OPERATOR_PLUSEQ     365 %enddef	/* += */
-%define SWIGWARN_IGNORE_OPERATOR_MINUSEQ    366 %enddef	/* -= */
-%define SWIGWARN_IGNORE_OPERATOR_MULEQ      367 %enddef	/* *= */
-%define SWIGWARN_IGNORE_OPERATOR_DIVEQ      368 %enddef	/* /= */
-%define SWIGWARN_IGNORE_OPERATOR_MODEQ      369 %enddef	/* %= */
-%define SWIGWARN_IGNORE_OPERATOR_XOREQ      370 %enddef	/* ^= */
-%define SWIGWARN_IGNORE_OPERATOR_ANDEQ      371 %enddef	/* &= */
-%define SWIGWARN_IGNORE_OPERATOR_OREQ       372 %enddef	/* |= */
-%define SWIGWARN_IGNORE_OPERATOR_LSHIFT     373 %enddef	/* << */
-%define SWIGWARN_IGNORE_OPERATOR_RSHIFT     374 %enddef	/* >> */
-%define SWIGWARN_IGNORE_OPERATOR_LSHIFTEQ   375 %enddef	/* <<= */
-%define SWIGWARN_IGNORE_OPERATOR_RSHIFTEQ   376 %enddef	/* >>= */
-%define SWIGWARN_IGNORE_OPERATOR_EQUALTO    377 %enddef	/* == */
-%define SWIGWARN_IGNORE_OPERATOR_NOTEQUAL   378 %enddef	/* != */
-%define SWIGWARN_IGNORE_OPERATOR_LTEQUAL    379 %enddef	/* <= */
-%define SWIGWARN_IGNORE_OPERATOR_GTEQUAL    380 %enddef	/* >= */
-%define SWIGWARN_IGNORE_OPERATOR_LAND       381 %enddef	/* && */
-%define SWIGWARN_IGNORE_OPERATOR_LOR        382 %enddef	/* || */
-%define SWIGWARN_IGNORE_OPERATOR_PLUSPLUS   383 %enddef	/* ++ */
-%define SWIGWARN_IGNORE_OPERATOR_MINUSMINUS 384 %enddef	/* -- */
-%define SWIGWARN_IGNORE_OPERATOR_COMMA      385 %enddef	/* , */
-%define SWIGWARN_IGNORE_OPERATOR_ARROWSTAR  386 %enddef	/* ->* */
-%define SWIGWARN_IGNORE_OPERATOR_ARROW      387 %enddef	/* -> */
-%define SWIGWARN_IGNORE_OPERATOR_CALL       388 %enddef	/* () */
-%define SWIGWARN_IGNORE_OPERATOR_INDEX      389 %enddef	/* [] */
-%define SWIGWARN_IGNORE_OPERATOR_UPLUS      390 %enddef	/* + */
-%define SWIGWARN_IGNORE_OPERATOR_UMINUS     391 %enddef	/* - */
-%define SWIGWARN_IGNORE_OPERATOR_UMUL       392 %enddef	/* * */
-%define SWIGWARN_IGNORE_OPERATOR_UAND       393 %enddef	/* & */
-%define SWIGWARN_IGNORE_OPERATOR_NEWARR     394 %enddef	/* new [] */
-%define SWIGWARN_IGNORE_OPERATOR_DELARR     395 %enddef	/* delete [] */
-%define SWIGWARN_IGNORE_OPERATOR_REF        396 %enddef	/* operator *() */
-
-/* 394-399 are reserved */
-
-/* -- Type system and typemaps -- */
-
-%define SWIGWARN_TYPE_UNDEFINED_CLASS     401 %enddef
-%define SWIGWARN_TYPE_INCOMPLETE          402 %enddef
-%define SWIGWARN_TYPE_ABSTRACT            403 %enddef
-%define SWIGWARN_TYPE_REDEFINED           404 %enddef
-
-%define SWIGWARN_TYPEMAP_SOURCETARGET     450 %enddef
-%define SWIGWARN_TYPEMAP_CHARLEAK         451 %enddef
-%define SWIGWARN_TYPEMAP_SWIGTYPE         452 %enddef
-%define SWIGWARN_TYPEMAP_APPLY_UNDEF      453 %enddef
-%define SWIGWARN_TYPEMAP_SWIGTYPELEAK     454 %enddef
-
-%define SWIGWARN_TYPEMAP_IN_UNDEF         460 %enddef
-%define SWIGWARN_TYPEMAP_OUT_UNDEF        461 %enddef
-%define SWIGWARN_TYPEMAP_VARIN_UNDEF      462 %enddef
-%define SWIGWARN_TYPEMAP_VAROUT_UNDEF     463 %enddef
-%define SWIGWARN_TYPEMAP_CONST_UNDEF      464 %enddef
-%define SWIGWARN_TYPEMAP_UNDEF            465 %enddef
-%define SWIGWARN_TYPEMAP_VAR_UNDEF        466 %enddef
-%define SWIGWARN_TYPEMAP_TYPECHECK        467 %enddef
-%define SWIGWARN_TYPEMAP_THROW            468 %enddef
-%define SWIGWARN_TYPEMAP_DIRECTORIN_UNDEF  469 %enddef
-%define SWIGWARN_TYPEMAP_THREAD_UNSAFE     470 %enddef	/* mostly used in directorout typemaps */
-%define SWIGWARN_TYPEMAP_DIRECTOROUT_UNDEF 471 %enddef
-%define SWIGWARN_TYPEMAP_TYPECHECK_UNDEF   472 %enddef
-%define SWIGWARN_TYPEMAP_DIRECTOROUT_PTR   473 %enddef
-%define SWIGWARN_TYPEMAP_OUT_OPTIMAL_IGNORED  474 %enddef
-%define SWIGWARN_TYPEMAP_OUT_OPTIMAL_MULTIPLE 475 %enddef
-%define SWIGWARN_TYPEMAP_INITIALIZER_LIST  476 %enddef
-%define SWIGWARN_TYPEMAP_DIRECTORTHROWS_UNDEF 477 %enddef
-
-/* -- Fragments -- */
-%define SWIGWARN_FRAGMENT_NOT_FOUND       490 %enddef
-
-/* -- General code generation -- */
-
-%define SWIGWARN_LANG_OVERLOAD_DECL       501 %enddef
-%define SWIGWARN_LANG_OVERLOAD_CONSTRUCT  502 %enddef
-%define SWIGWARN_LANG_IDENTIFIER          503 %enddef
-%define SWIGWARN_LANG_RETURN_TYPE         504 %enddef
-%define SWIGWARN_LANG_VARARGS             505 %enddef
-%define SWIGWARN_LANG_VARARGS_KEYWORD     506 %enddef
-%define SWIGWARN_LANG_NATIVE_UNIMPL       507 %enddef
-%define SWIGWARN_LANG_DEREF_SHADOW        508 %enddef
-%define SWIGWARN_LANG_OVERLOAD_SHADOW     509 %enddef
-%define SWIGWARN_LANG_FRIEND_IGNORE       510 %enddef
-%define SWIGWARN_LANG_OVERLOAD_KEYWORD    511 %enddef
-%define SWIGWARN_LANG_OVERLOAD_CONST      512 %enddef
-%define SWIGWARN_LANG_CLASS_UNNAMED       513 %enddef
-%define SWIGWARN_LANG_DIRECTOR_VDESTRUCT  514 %enddef
-%define SWIGWARN_LANG_DISCARD_CONST       515 %enddef
-%define SWIGWARN_LANG_OVERLOAD_IGNORED    516 %enddef
-%define SWIGWARN_LANG_DIRECTOR_ABSTRACT   517 %enddef
-%define SWIGWARN_LANG_PORTABILITY_FILENAME 518 %enddef
-%define SWIGWARN_LANG_TEMPLATE_METHOD_IGNORE 519 %enddef
-%define SWIGWARN_LANG_SMARTPTR_MISSING    520 %enddef
-%define SWIGWARN_LANG_ILLEGAL_DESTRUCTOR  521 %enddef
-%define SWIGWARN_LANG_EXTEND_CONSTRUCTOR  522 %enddef
-%define SWIGWARN_LANG_EXTEND_DESTRUCTOR   523 %enddef
-
-/* -- Reserved (600-799) -- */
-
-/* -- Language module specific warnings (700 - 899) -- */
-
-
-%define SWIGWARN_D_TYPEMAP_CTYPE_UNDEF            700 %enddef
-%define SWIGWARN_D_TYPEMAP_IMTYPE_UNDEF           701 %enddef
-%define SWIGWARN_D_TYPEMAP_DTYPE_UNDEF            702 %enddef
-%define SWIGWARN_D_MULTIPLE_INHERITANCE           703 %enddef
-%define SWIGWARN_D_TYPEMAP_CLASSMOD_UNDEF         704 %enddef
-%define SWIGWARN_D_TYPEMAP_DBODY_UNDEF            705 %enddef
-%define SWIGWARN_D_TYPEMAP_DOUT_UNDEF             706 %enddef
-%define SWIGWARN_D_TYPEMAP_DIN_UNDEF              707 %enddef
-%define SWIGWARN_D_TYPEMAP_DDIRECTORIN_UNDEF      708 %enddef
-%define SWIGWARN_D_TYPEMAP_DCONSTRUCTOR_UNDEF     709 %enddef
-%define SWIGWARN_D_EXCODE_MISSING                 710 %enddef
-%define SWIGWARN_D_CANTHROW_MISSING               711 %enddef
-%define SWIGWARN_D_NO_DIRECTORCONNECT_ATTR        712 %enddef
-%define SWIGWARN_D_NAME_COLLISION                 713 %enddef
-
-/* please leave 700-719 free for D */
-
-%define SWIGWARN_SCILAB_TRUNCATED_NAME            720 %enddef
-
-/* please leave 720-739 free for Scilab */
-
-%define SWIGWARN_PYTHON_INDENT_MISMATCH           740 %enddef
-
-/* please leave 740-759 free for Python */
-
-%define SWIGWARN_RUBY_WRONG_NAME                  801 %enddef
-%define SWIGWARN_RUBY_MULTIPLE_INHERITANCE        802 %enddef
-
-/* please leave 800-809 free for Ruby */
-
-%define SWIGWARN_JAVA_TYPEMAP_JNI_UNDEF           810 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JTYPE_UNDEF         811 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JSTYPE_UNDEF        812 %enddef
-%define SWIGWARN_JAVA_MULTIPLE_INHERITANCE        813 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_GETCPTR_UNDEF       814 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_CLASSMOD_UNDEF      815 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JAVABODY_UNDEF      816 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JAVAOUT_UNDEF       817 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JAVAIN_UNDEF        818 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF    819 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JAVADIRECTOROUT_UNDEF   820 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_INTERFACECODE_UNDEF 821 %enddef
-%define SWIGWARN_JAVA_COVARIANT_RET               822 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF 823 %enddef
-%define SWIGWARN_JAVA_TYPEMAP_DIRECTORIN_NODESC   824 %enddef
-%define SWIGWARN_JAVA_NO_DIRECTORCONNECT_ATTR     825 %enddef
-%define SWIGWARN_JAVA_NSPACE_WITHOUT_PACKAGE      826 %enddef
-
-/* please leave 810-829 free for Java */
-
-%define SWIGWARN_CSHARP_TYPEMAP_CTYPE_UNDEF       830 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSTYPE_UNDEF      831 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF     832 %enddef
-%define SWIGWARN_CSHARP_MULTIPLE_INHERITANCE      833 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_GETCPTR_UNDEF     834 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CLASSMOD_UNDEF    835 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSBODY_UNDEF      836 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSOUT_UNDEF       837 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSIN_UNDEF        838 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSDIRECTORIN_UNDEF    839 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSDIRECTOROUT_UNDEF   840 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_INTERFACECODE_UNDEF   841 %enddef
-%define SWIGWARN_CSHARP_COVARIANT_RET             842 %enddef
-%define SWIGWARN_CSHARP_TYPEMAP_CSCONSTRUCT_UNDEF 843 %enddef
-%define SWIGWARN_CSHARP_EXCODE                    844 %enddef
-%define SWIGWARN_CSHARP_CANTHROW                  845 %enddef
-%define SWIGWARN_CSHARP_NO_DIRECTORCONNECT_ATTR   846 %enddef
-
-/* please leave 830-849 free for C# */
-
-%define SWIGWARN_MODULA3_TYPEMAP_TYPE_UNDEF        850 %enddef
-%define SWIGWARN_MODULA3_TYPEMAP_GETCPTR_UNDEF     851 %enddef
-%define SWIGWARN_MODULA3_TYPEMAP_CLASSMOD_UNDEF    852 %enddef
-%define SWIGWARN_MODULA3_TYPEMAP_PTRCONSTMOD_UNDEF 853 %enddef
-%define SWIGWARN_MODULA3_TYPEMAP_MULTIPLE_RETURN   854 %enddef
-%define SWIGWARN_MODULA3_MULTIPLE_INHERITANCE      855 %enddef
-%define SWIGWARN_MODULA3_TYPECONSTRUCTOR_UNKNOWN   856 %enddef
-%define SWIGWARN_MODULA3_UNKNOWN_PRAGMA            857 %enddef
-%define SWIGWARN_MODULA3_BAD_ENUMERATION           858 %enddef
-%define SWIGWARN_MODULA3_DOUBLE_ID                 859 %enddef
-%define SWIGWARN_MODULA3_BAD_IMPORT                860 %enddef
-
-/* please leave 850-869 free for Modula 3 */
-
-%define SWIGWARN_PHP_MULTIPLE_INHERITANCE         870 %enddef
-%define SWIGWARN_PHP_UNKNOWN_PRAGMA               871 %enddef
-%define SWIGWARN_PHP_PUBLIC_BASE                  872 %enddef
-
-/* please leave 870-889 free for PHP */
-
-%define SWIGWARN_GO_NAME_CONFLICT                 890 %enddef
-
-/* please leave 890-899 free for Go */
-
-/* -- User defined warnings (900 - 999) -- */
-
diff --git a/dependencies2013/win32/swig/Lib/swigwarnings.swg b/dependencies2013/win32/swig/Lib/swigwarnings.swg
deleted file mode 100644
index 34c98fbd..00000000
--- a/dependencies2013/win32/swig/Lib/swigwarnings.swg
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-  Include the internal swig macro codes. These macros correspond to
-  the one found in Source/Include/swigwarn.h plus the 'SWIG' prefix.
-  
-  For example, in the include file 'swigwarn.h' you will find
-
-    #define WARN_TYPEMAP_CHARLEAK ...
-
-  and in the 'swigwarn.swg' interface, you will see
-
-    %define SWIGWARN_TYPEMAP_CHARLEAK ...
-
-  This code can be used in warning filters as follows:
-
-    %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK);
-
-  Warnings messages used in typemaps. Message names will be the same
-  as those in Lib/swigwarn.swg but with the suffix _MSG.
-   
-  For example, for the code SWIGWARN_TYPEMAP_CHARLEAK, once you use
-
-    %typemapmsg(CHARLEAK,<msg>);
-
-  you use the message in your typemap as
-
-    %typemap(varin,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) char * 
-
-  while you suppress the warning using
-
-    %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK);
-
-  as described above.
-*/
-
-/* -----------------------------------------------------------------------------
- * SWIG warning codes
- * ----------------------------------------------------------------------------- */
-
-%include <swigwarn.swg>
-
-/* -----------------------------------------------------------------------------
- * Auxiliary macros
- * ----------------------------------------------------------------------------- */
-
-/* Macro to define warning messages */
-#define %_warningmsg(Val, Msg...) `Val`":"Msg 
-#define %warningmsg(Val, Msg...) %_warningmsg(Val, Msg)
-
-/* -----------------------------------------------------------------------------
- *  Typemap related warning messages
- * ----------------------------------------------------------------------------- */
-
-%define SWIGWARN_TYPEMAP_CHARLEAK_MSG         "451:Setting a const char * variable may leak memory." %enddef
-%define SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG     "454:Setting a pointer/reference variable may leak memory." %enddef
-%define SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG    "470:Thread/reentrant unsafe wrapping, consider returning by value instead." %enddef
-%define SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG  "473:Returning a pointer or reference in a director method is not recommended." %enddef
-%define SWIGWARN_TYPEMAP_INITIALIZER_LIST_MSG "476:Initialization using std::initializer_list." %enddef
-
-/* -----------------------------------------------------------------------------
- * Operator related warning messages 
- * ----------------------------------------------------------------------------- */
-
-%define SWIGWARN_IGNORE_OPERATOR_NEW_MSG        "350:operator new ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_DELETE_MSG     "351:operator delete ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_PLUS_MSG       "352:operator+ ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MINUS_MSG      "353:operator- ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MUL_MSG        "354:operator* ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_DIV_MSG        "355:operator/ ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MOD_MSG        "356:operator% ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_XOR_MSG        "357:operator^ ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_AND_MSG        "358:operator& ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_OR_MSG         "359:operator| ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_NOT_MSG        "360:operator~ ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LNOT_MSG       "361:operator! ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_EQ_MSG         "362:operator= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LT_MSG         "363:operator< ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_GT_MSG         "364:operator> ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_PLUSEQ_MSG     "365:operator+= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MINUSEQ_MSG    "366:operator-= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MULEQ_MSG      "367:operator*= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_DIVEQ_MSG      "368:operator/= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MODEQ_MSG      "369:operator%= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_XOREQ_MSG      "370:operator^= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_ANDEQ_MSG      "371:operator&= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_OREQ_MSG       "372:operator|= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LSHIFT_MSG     "373:operator<< ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_RSHIFT_MSG     "374:operator>> ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LSHIFTEQ_MSG   "375:operator<<= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_RSHIFTEQ_MSG   "376:operator>>= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_EQUALTO_MSG    "377:operator== ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_NOTEQUAL_MSG   "378:operator!= ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LTEQUAL_MSG    "379:operator<= ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_GTEQUAL_MSG    "380:operator>= ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LAND_MSG       "381:operator&& ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_LOR_MSG        "382:operator|| ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_PLUSPLUS_MSG   "383:operator++ ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_MINUSMINUS_MSG "384:operator-- ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_COMMA_MSG      "385:operator-- ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_ARROWSTAR_MSG  "386:operator->* ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_ARROW_MSG      "387:operator-> ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_CALL_MSG       "388:operator() ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_INDEX_MSG      "389:operator[] ignored (consider using %%extend)"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_UPLUS_MSG      "390:operator+ ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_UMINUS_MSG     "391:operator- ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_UMUL_MSG       "392:operator* ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_UAND_MSG       "393:operator& ignored" %enddef
-%define SWIGWARN_IGNORE_OPERATOR_NEWARR_MSG     "394:operator new[] ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_DELARR_MSG     "395:operator delete[] ignored"  %enddef
-%define SWIGWARN_IGNORE_OPERATOR_REF_MSG        "396:operator*() ignored" %enddef
-
-#define %ignoreoperator(Oper) %ignorewarn(SWIGWARN_IGNORE_OPERATOR_##Oper##_MSG)
-
-/* -----------------------------------------------------------------------------
- * Macros for keyword and built-in names 
- * ----------------------------------------------------------------------------- */
-
-#define %keywordwarn(msg...) %namewarn(%warningmsg(SWIGWARN_PARSE_KEYWORD, msg)) 
-#define %builtinwarn(msg...) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, msg), %$isfunction)
-
-
-/* -----------------------------------------------------------------------------
- * Warning filter feature
- * ----------------------------------------------------------------------------- */
-
-#define %_warnfilter(filter...) %feature("warnfilter",`filter`)
-#define %warnfilter(filter...) %_warnfilter(filter)
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/attribute.i b/dependencies2013/win32/swig/Lib/tcl/attribute.i
deleted file mode 100644
index 779716cd..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/attribute.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/attribute.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/carrays.i b/dependencies2013/win32/swig/Lib/tcl/carrays.i
deleted file mode 100644
index 0236672d..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/carrays.i
+++ /dev/null
@@ -1,4 +0,0 @@
-%include <typemaps/carrays.swg>
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/cdata.i b/dependencies2013/win32/swig/Lib/tcl/cdata.i
deleted file mode 100644
index 36796599..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/cdata.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cdata.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/cmalloc.i b/dependencies2013/win32/swig/Lib/tcl/cmalloc.i
deleted file mode 100644
index 248f06b9..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/cmalloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cmalloc.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/cni.i b/dependencies2013/win32/swig/Lib/tcl/cni.i
deleted file mode 100644
index 10a1403a..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/cni.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <gcj/cni.i>
-%include <jstring.i>
diff --git a/dependencies2013/win32/swig/Lib/tcl/cpointer.i b/dependencies2013/win32/swig/Lib/tcl/cpointer.i
deleted file mode 100644
index d824792f..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/cpointer.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cpointer.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/cstring.i b/dependencies2013/win32/swig/Lib/tcl/cstring.i
deleted file mode 100644
index ede9c596..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/cstring.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/cstring.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/cwstring.i b/dependencies2013/win32/swig/Lib/tcl/cwstring.i
deleted file mode 100644
index b17ca763..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/cwstring.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <tclwstrings.swg>
-%include <typemaps/cwstring.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/exception.i b/dependencies2013/win32/swig/Lib/tcl/exception.i
deleted file mode 100644
index 4d22797c..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/exception.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%include <typemaps/exception.swg>
-
-
-%insert("runtime") {
-  %define_as(SWIG_exception(code, msg), %block(%error(code, msg); return TCL_ERROR;))
-}
diff --git a/dependencies2013/win32/swig/Lib/tcl/factory.i b/dependencies2013/win32/swig/Lib/tcl/factory.i
deleted file mode 100644
index 46a0a873..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/factory.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/factory.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/jstring.i b/dependencies2013/win32/swig/Lib/tcl/jstring.i
deleted file mode 100644
index 7fb7b89f..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/jstring.i
+++ /dev/null
@@ -1,42 +0,0 @@
-%include <typemaps/valtypes.swg>
-
-%fragment(SWIG_AsVal_frag(jstring),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(jstring)(Tcl_Obj * obj, jstring *val)
-{
-  int len = 0;
-  const char *cstr = Tcl_GetStringFromObj(obj, &len);
-  if (!cstr || (strcmp(cstr,"NULL") == 0)) {
-    if (val) *val = 0;
-    return SWIG_OK;
-  } else {
-    int len = 0;
-    const Tcl_UniChar *ucstr = Tcl_GetUnicodeFromObj(obj,&len);
-    if (val) {
-      *val = JvNewString((const jchar*)ucstr, len);
-    }
-  }
-  
-  return SWIG_NEWOBJ;
-}
-}
-
-%fragment(SWIG_From_frag(jstring),"header") {
-SWIGINTERNINLINE Tcl_Obj *
-SWIG_From_dec(jstring)(jstring val)
-{
-  if (!val) {
-    return Tcl_NewStringObj("NULL",-1);
-  } else {
-    return Tcl_NewUnicodeObj((Tcl_UniChar *)JvGetStringChars(val),JvGetStringUTFLength(val));
-  }
-}
-}
-
-%typemaps_asvalfrom(%checkcode(STRING),
-		    %arg(SWIG_AsVal(jstring)), 
-		    %arg(SWIG_From(jstring)), 
-		    %arg(SWIG_AsVal_frag(jstring)), 
-		    %arg(SWIG_From_frag(jstring)), 
-		    java::lang::String *);
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/mactkinit.c b/dependencies2013/win32/swig/Lib/tcl/mactkinit.c
deleted file mode 100644
index 78391d44..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/mactkinit.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -----------------------------------------------------------------------------
- * mactkinit.c
- *
- * This is a support file needed to build a new version of Wish.
- * Normally, this capability is found in TkAppInit.c, but this creates
- * tons of namespace problems for many applications.
- * ----------------------------------------------------------------------------- */
-   
-#include <Gestalt.h>
-#include <ToolUtils.h>
-#include <Fonts.h>
-#include <Dialogs.h>
-#include <SegLoad.h>
-#include <Traps.h>
-
-#include "tk.h"
-#include "tkInt.h"
-#include "tkMacInt.h"
-
-typedef int (*TclMacConvertEventPtr) _ANSI_ARGS_((EventRecord *eventPtr));
-Tcl_Interp *gStdoutInterp = NULL;
-
-void 	TclMacSetEventProc _ANSI_ARGS_((TclMacConvertEventPtr procPtr));
-int 	TkMacConvertEvent _ANSI_ARGS_((EventRecord *eventPtr));
-
-/*
- * Prototypes for functions the ANSI library needs to link against.
- */
-short			InstallConsole _ANSI_ARGS_((short fd));
-void			RemoveConsole _ANSI_ARGS_((void));
-long			WriteCharsToConsole _ANSI_ARGS_((char *buff, long n));
-long			ReadCharsFromConsole _ANSI_ARGS_((char *buff, long n));
-char *			__ttyname _ANSI_ARGS_((long fildes));
-short			SIOUXHandleOneEvent _ANSI_ARGS_((EventRecord *event));
-
-/*
- * Forward declarations for procedures defined later in this file:
- */
-
-/*
- *----------------------------------------------------------------------
- *
- * MacintoshInit --
- *
- *	This procedure calls Mac specific initilization calls.  Most of
- *	these calls must be made as soon as possible in the startup
- *	process.
- *
- * Results:
- *	Returns TCL_OK if everything went fine.  If it didn't the 
- *	application should probably fail.
- *
- * Side effects:
- *	Inits the application.
- *
- *----------------------------------------------------------------------
- */
-
-int
-MacintoshInit()
-{
-    int i;
-    long result, mask = 0x0700; 		/* mask = system 7.x */
-
-    /*
-     * Tk needs us to set the qd pointer it uses.  This is needed
-     * so Tk doesn't have to assume the availablity of the qd global
-     * variable.  Which in turn allows Tk to be used in code resources.
-     */
-    tcl_macQdPtr = &qd;
-
-    InitGraf(&tcl_macQdPtr->thePort);
-    InitFonts();
-    InitWindows();
-    InitMenus();
-    InitDialogs((long) NULL);		
-    InitCursor();
-
-    /*
-     * Make sure we are running on system 7 or higher
-     */
-     
-    if ((NGetTrapAddress(_Gestalt, ToolTrap) == 
-    	    NGetTrapAddress(_Unimplemented, ToolTrap))
-    	    || (((Gestalt(gestaltSystemVersion, &result) != noErr)
-	    || (mask != (result & mask))))) {
-	panic("Tcl/Tk requires System 7 or higher.");
-    }
-
-    /*
-     * Make sure we have color quick draw 
-     * (this means we can't run on 68000 macs)
-     */
-     
-    if (((Gestalt(gestaltQuickdrawVersion, &result) != noErr)
-	    || (result < gestalt32BitQD13))) {
-	panic("Tk requires Color QuickDraw.");
-    }
-
-    
-    FlushEvents(everyEvent, 0);
-    SetEventMask(everyEvent);
-
-    /*
-     * Set up stack & heap sizes
-     */
-    /* TODO: stack size
-       size = StackSpace();
-       SetAppLimit(GetAppLimit() - 8192);
-     */
-    MaxApplZone();
-    for (i = 0; i < 4; i++) {
-	(void) MoreMasters();
-    }
-
-    TclMacSetEventProc(TkMacConvertEvent);
-    TkConsoleCreate();
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetupMainInterp --
- *
- *	This procedure calls initalization routines require a Tcl 
- *	interp as an argument.  This call effectively makes the passed
- *	iterpreter the "main" interpreter for the application.
- *
- * Results:
- *	Returns TCL_OK if everything went fine.  If it didn't the 
- *	application should probably fail.
- *
- * Side effects:
- *	More initilization.
- *
- *----------------------------------------------------------------------
- */
-
-int
-SetupMainInterp(
-    Tcl_Interp *interp)
-{
-    /*
-     * Initialize the console only if we are running as an interactive
-     * application.
-     */
-
-    TkMacInitAppleEvents(interp);
-    TkMacInitMenus(interp);
-
-    if (strcmp(Tcl_GetVar(interp, "tcl_interactive", TCL_GLOBAL_ONLY), "1")
-	    == 0) {
-	if (TkConsoleInit(interp) == TCL_ERROR) {
-	    goto error;
-	}
-    }
-
-    /*
-     * Attach the global interpreter to tk's expected global console
-     */
-
-    gStdoutInterp = interp;
-
-    return TCL_OK;
-
-error:
-    panic(interp->result);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InstallConsole, RemoveConsole, etc. --
- *
- *	The following functions provide the UI for the console package.
- *	Users wishing to replace SIOUX with their own console package 
- *	need only provide the four functions below in a library.
- *
- * Results:
- *	See SIOUX documentation for details.
- *
- * Side effects:
- *	See SIOUX documentation for details.
- *
- *----------------------------------------------------------------------
- */
-
-short 
-InstallConsole(short fd)
-{
-#pragma unused (fd)
-
-	return 0;
-}
-
-void 
-RemoveConsole(void)
-{
-}
-
-long 
-WriteCharsToConsole(char *buffer, long n)
-{
-    TkConsolePrint(gStdoutInterp, TCL_STDOUT, buffer, n);
-    return n;
-}
-
-long 
-ReadCharsFromConsole(char *buffer, long n)
-{
-    return 0;
-}
-
-extern char *
-__ttyname(long fildes)
-{
-    static char *devicename = "null device";
-
-    if (fildes >= 0 && fildes <= 2) {
-	return (devicename);
-    }
-    
-    return (0L);
-}
-
-short
-SIOUXHandleOneEvent(EventRecord *event)
-{
-    return 0;
-}
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_common.i b/dependencies2013/win32/swig/Lib/tcl/std_common.i
deleted file mode 100644
index 0718facb..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_common.i
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_common.i
- *
- * SWIG typemaps for STL - common utilities
- * ----------------------------------------------------------------------------- */
-
-%include <std/std_except.i>
-
-%types(std::size_t);
-%apply size_t { std::size_t };
-%apply const unsigned long& { const std::size_t& };
-
-%types(std::ptrdiff_t);
-%apply long { std::ptrdiff_t };
-%apply const long& { const std::ptrdiff_t& };
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_deque.i b/dependencies2013/win32/swig/Lib/tcl/std_deque.i
deleted file mode 100644
index cb98f6c2..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_deque.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <std/_std_deque.i>
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_except.i b/dependencies2013/win32/swig/Lib/tcl/std_except.i
deleted file mode 100644
index af98428f..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_except.i
+++ /dev/null
@@ -1 +0,0 @@
-%include <typemaps/std_except.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_map.i b/dependencies2013/win32/swig/Lib/tcl/std_map.i
deleted file mode 100644
index ade2b0ad..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_map.i
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// SWIG typemaps for std::map
-//
-// Common implementation
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::map
-// ------------------------------------------------------------------------
-
-%{
-#include <map>
-%}
-%fragment("<algorithm>");
-%fragment("<stdexcept>");
-
-// exported class
-
-namespace std {
-
-    template<class K, class T> class map {
-        // add typemaps here
-      public:
-        typedef size_t size_type;
-        typedef ptrdiff_t difference_type;
-        typedef K key_type;
-        typedef T mapped_type;
-        map();
-        map(const map<K,T> &);
-        
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %extend {
-            const T& get(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    return i->second;
-                else
-                    throw std::out_of_range("key not found");
-            }
-            void set(const K& key, const T& x) {
-                (*self)[key] = x;
-            }
-            void del(const K& key) throw (std::out_of_range) {
-                std::map<K,T >::iterator i = self->find(key);
-                if (i != self->end())
-                    self->erase(i);
-                else
-                    throw std::out_of_range("key not found");
-            }
-            bool has_key(const K& key) {
-                std::map<K,T >::iterator i = self->find(key);
-                return i != self->end();
-            }
-        }
-    };
-
-// Legacy macros (deprecated)
-%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
-#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
-%enddef
-
-%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
-#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
-%enddef
-
-}
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_pair.i b/dependencies2013/win32/swig/Lib/tcl/std_pair.i
deleted file mode 100644
index 1448d652..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_pair.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_pair.i
- *
- * Typemaps for std::pair
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-%include <exception.i>
-
-// ------------------------------------------------------------------------
-// std::pair
-// ------------------------------------------------------------------------
-
-%{
-#include <utility>
-%}
-
-namespace std {
-
-  template<class T, class U> struct pair {
-
-    pair();
-    pair(T first, U second);
-    pair(const pair& p);
-
-    template <class U1, class U2> pair(const pair<U1, U2> &p);
-
-    T first;
-    U second;
-  };
-
-  // add specializations here
-
-}
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_string.i b/dependencies2013/win32/swig/Lib/tcl/std_string.i
deleted file mode 100644
index 5b31b28c..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_string.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <typemaps/std_string.swg>
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_vector.i b/dependencies2013/win32/swig/Lib/tcl/std_vector.i
deleted file mode 100644
index 3fc0fd61..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_vector.i
+++ /dev/null
@@ -1,419 +0,0 @@
-/* -----------------------------------------------------------------------------
- * std_vector.i
- * ----------------------------------------------------------------------------- */
-
-%include <std_common.i>
-
-// ------------------------------------------------------------------------
-// std::vector
-// 
-// The aim of all that follows would be to integrate std::vector with 
-// Tcl as much as possible, namely, to allow the user to pass and 
-// be returned Tcl lists.
-// const declarations are used to guess the intent of the function being
-// exported; therefore, the following rationale is applied:
-// 
-//   -- f(std::vector< T >), f(const std::vector< T >&), f(const std::vector< T >*):
-//      the parameter being read-only, either a Tcl list or a
-//      previously wrapped std::vector< T > can be passed.
-//   -- f(std::vector< T >&), f(std::vector< T >*):
-//      the parameter must be modified; therefore, only a wrapped std::vector
-//      can be passed.
-//   -- std::vector< T > f():
-//      the vector is returned by copy; therefore, a Tcl list of T:s 
-//      is returned which is most easily used in other Tcl functions procs
-//   -- std::vector< T >& f(), std::vector< T >* f(), const std::vector< T >& f(),
-//      const std::vector< T >* f():
-//      the vector is returned by reference; therefore, a wrapped std::vector
-//      is returned
-// ------------------------------------------------------------------------
-
-%fragment("<string>");
-%fragment("<stdexcept>");
-%fragment("<algorithm>");
-%{
-#include <vector>
-
-Tcl_Obj* SwigString_FromString(const std::string &s) {
-    return Tcl_NewStringObj(s.data(), (int)s.length());
-}
-
-int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *o, bool *val) {
-  int v;
-  int res = Tcl_GetBooleanFromObj(interp, o, &v);
-  if (res == TCL_OK) {
-    *val = v ? true : false;
-  }
-  return res;  
-}
- 
-int SwigString_AsString(Tcl_Interp *interp, Tcl_Obj *o, std::string *val) {
-    int len;
-    const char* temp = Tcl_GetStringFromObj(o, &len);
-    if (temp == NULL)
-        return TCL_ERROR;
-    val->assign(temp, len);
-    return TCL_OK;
-}
-
-// behaviour of this is such as the real Tcl_GetIntFromObj
-template <typename Type>
-int SwigInt_As(Tcl_Interp *interp, Tcl_Obj *o, Type *val) {
-    int temp_val, return_val;
-    return_val = Tcl_GetIntFromObj(interp, o, &temp_val);
-    *val = (Type) temp_val;
-    return return_val;
-}
-
-// behaviour of this is such as the real Tcl_GetDoubleFromObj
-template <typename Type>
-int SwigDouble_As(Tcl_Interp *interp, Tcl_Obj *o, Type *val) {
-    int return_val;
-    double temp_val;
-    return_val = Tcl_GetDoubleFromObj(interp, o, &temp_val);
-    *val = (Type) temp_val;
-    return return_val;
-}
-
-%}
-
-// exported class
-
-namespace std {
-    
-    template<class T> class vector {
-        %typemap(in) vector< T > (std::vector< T > *v) {
-            Tcl_Obj **listobjv;
-            int       nitems;
-            int       i;
-            T*        temp;
-
-            if (SWIG_ConvertPtr($input, (void **) &v, \
-                                $&1_descriptor, 0) == 0){
-                $1 = *v;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, \
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    return TCL_ERROR;
-                $1 = std::vector< T >();
-                for (i = 0; i < nitems; i++) {
-                    if ((SWIG_ConvertPtr(listobjv[i],(void **) &temp,
-                                         $descriptor(T *),0)) != 0) {
-                        char message[] = 
-                            "list of " #T " expected";
-                        Tcl_SetResult(interp, message, TCL_VOLATILE);
-                        return TCL_ERROR;
-                    }
-                    $1.push_back(*temp);
-                } 
-            }
-        }
-
-        %typemap(in) const vector< T >* (std::vector< T > *v, std::vector< T > w),
-                     const vector< T >& (std::vector< T > *v, std::vector< T > w) {
-            Tcl_Obj **listobjv;
-            int       nitems;
-            int       i;
-            T*        temp;
-
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $&1_descriptor, 0) == 0) {
-                $1 = v;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    return TCL_ERROR;
-                w = std::vector< T >();
-                for (i = 0; i < nitems; i++) {
-                    if ((SWIG_ConvertPtr(listobjv[i],(void **) &temp,
-                                         $descriptor(T *),0)) != 0) {
-                        char message[] = 
-                            "list of " #T " expected";
-                        Tcl_SetResult(interp, message, TCL_VOLATILE);
-                        return TCL_ERROR;
-                    }
-                    w.push_back(*temp);
-                } 
-                $1 = &w;
-            }
-        }
-
-        %typemap(out) vector< T > {
-            for (unsigned int i=0; i<$1.size(); i++) {
-                T* ptr = new T((($1_type &)$1)[i]);
-                Tcl_ListObjAppendElement(interp, $result, \
-                                         SWIG_NewInstanceObj(ptr, 
-                                                             $descriptor(T *), 
-                                                             0));
-            }
-        }
-
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector< T > {
-            Tcl_Obj **listobjv;
-            int       nitems;
-            T*        temp;
-            std::vector< T > *v;
-            
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $&1_descriptor, 0) == 0) {
-                /* wrapped vector */
-                $1 = 1;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    $1 = 0;
-                else
-                    if (nitems == 0)
-                        $1 = 1;
-                //check the first value to see if it is of correct type
-                    else if ((SWIG_ConvertPtr(listobjv[0],
-                                              (void **) &temp, 
-                                              $descriptor(T *),0)) != 0)
-                        $1 = 0;
-                    else
-                        $1 = 1;
-            }
-        }
-        
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector< T >&,
-                                          const vector< T >* {
-            Tcl_Obj **listobjv;
-            int       nitems;
-            T*         temp;
-            std::vector< T > *v;
-
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $1_descriptor, 0) == 0){
-                /* wrapped vector */
-                $1 = 1;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    $1 = 0;
-                else
-                    if (nitems == 0)
-                        $1 = 1;
-                //check the first value to see if it is of correct type
-                    else if ((SWIG_ConvertPtr(listobjv[0],
-                                              (void **) &temp,
-                                              $descriptor(T *),0)) != 0)
-                        $1 = 0;
-                    else
-                        $1 = 1;
-            }
-        }
-      
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector< T > &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(const T& x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T& get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i += size;
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const T& x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i+= size;
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
-
-    // specializations for built-ins
-
-    %define specialize_std_vector(T, CONVERT_FROM, CONVERT_TO)
-    template<> class vector< T > {
-
-        %typemap(in) vector< T > (std::vector< T > *v){
-            Tcl_Obj **listobjv;
-            int       nitems;
-            int       i;
-            T         temp;
-
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $&1_descriptor, 0) == 0) {
-                $1 = *v;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    return TCL_ERROR;					      
-                $1 = std::vector< T >();
-                for (i = 0; i < nitems; i++) {
-                    if (CONVERT_FROM(interp, listobjv[i], &temp) == TCL_ERROR)
-                        return TCL_ERROR;
-                    $1.push_back(temp);
-                } 
-            }
-        }
-      
-        %typemap(in) const vector< T >& (std::vector< T > *v,std::vector< T > w),
-                     const vector< T >* (std::vector< T > *v,std::vector< T > w) {
-            Tcl_Obj **listobjv;
-            int       nitems;
-            int       i;
-            T         temp;
-
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $1_descriptor, 0) == 0) {
-                $1 = v;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    return TCL_ERROR;
-                w = std::vector< T >();
-                for (i = 0; i < nitems; i++) {
-                    if (CONVERT_FROM(interp, listobjv[i], &temp) == TCL_ERROR)
-                        return TCL_ERROR;
-                    w.push_back(temp);
-                } 
-                $1 = &w;
-            }
-        }
-
-        %typemap(out) vector< T > {
-            for (unsigned int i=0; i<$1.size(); i++) {
-                Tcl_ListObjAppendElement(interp, $result, \
-                                         CONVERT_TO((($1_type &)$1)[i]));
-            }
-        }
-       
-        %typecheck(SWIG_TYPECHECK_VECTOR) vector< T > {
-            Tcl_Obj **listobjv;
-            int       nitems;
-            T         temp;
-            std::vector< T > *v;
-
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $&1_descriptor, 0) == 0){
-                /* wrapped vector */
-                $1 = 1;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    $1 = 0;
-                else
-                    if (nitems == 0)
-                        $1 = 1;
-                //check the first value to see if it is of correct type
-                if (CONVERT_FROM(interp, listobjv[0], &temp) == TCL_ERROR)
-                    $1 = 0;
-                else
-                    $1 = 1;
-            }
-        }      
-
-        %typecheck(SWIG_TYPECHECK_VECTOR) const vector< T >&,
-	                                      const vector< T >*{
-            Tcl_Obj **listobjv;
-            int       nitems;
-            T         temp;
-            std::vector< T > *v;
-
-            if(SWIG_ConvertPtr($input, (void **) &v, \
-                               $1_descriptor, 0) == 0){
-                /* wrapped vector */
-                $1 = 1;
-            } else {
-                // It isn't a vector< T > so it should be a list of T's
-                if(Tcl_ListObjGetElements(interp, $input, 
-                                          &nitems, &listobjv) == TCL_ERROR)
-                    $1 = 0;
-                else
-                    if (nitems == 0)
-                        $1 = 1;
-                //check the first value to see if it is of correct type
-                if (CONVERT_FROM(interp, listobjv[0], &temp) == TCL_ERROR)
-                    $1 = 0;
-                else
-                    $1 = 1;
-            }
-        }
-        
-      public:
-        vector(unsigned int size = 0);
-        vector(unsigned int size, const T& value);
-        vector(const vector< T > &);
-
-        unsigned int size() const;
-        bool empty() const;
-        void clear();
-        %rename(push) push_back;
-        void push_back(T x);
-        %extend {
-            T pop() throw (std::out_of_range) {
-                if (self->size() == 0)
-                    throw std::out_of_range("pop from empty vector");
-                T x = self->back();
-                self->pop_back();
-                return x;
-            }
-            T get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i += size;
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, T x) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i<0) i+= size;
-                if (i>=0 && i<size)
-                    (*self)[i] = x;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-    %enddef
-
-    specialize_std_vector(bool, Tcl_GetBoolFromObj, Tcl_NewBooleanObj);
-    specialize_std_vector(char, SwigInt_As<char>,Tcl_NewIntObj);
-    specialize_std_vector(int, Tcl_GetIntFromObj,Tcl_NewIntObj);
-    specialize_std_vector(short, SwigInt_As<short>, Tcl_NewIntObj);
-    specialize_std_vector(long, SwigInt_As<long>, Tcl_NewIntObj);
-    specialize_std_vector(unsigned char, 
-                          SwigInt_As<unsigned char>, Tcl_NewIntObj);
-    specialize_std_vector(unsigned int, 
-                          SwigInt_As<unsigned int>, Tcl_NewIntObj);
-    specialize_std_vector(unsigned short, 
-                          SwigInt_As<unsigned short>, Tcl_NewIntObj);
-    specialize_std_vector(unsigned long, 
-                          SwigInt_As<unsigned long>, Tcl_NewIntObj);
-    specialize_std_vector(double, Tcl_GetDoubleFromObj, Tcl_NewDoubleObj);
-    specialize_std_vector(float, SwigDouble_As<float>, Tcl_NewDoubleObj);
-    specialize_std_vector(std::string, 
-                          SwigString_AsString, SwigString_FromString);
-
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/std_wstring.i b/dependencies2013/win32/swig/Lib/tcl/std_wstring.i
deleted file mode 100644
index f1326149..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/std_wstring.i
+++ /dev/null
@@ -1,2 +0,0 @@
-%include <tclwstrings.swg>
-%include <typemaps/std_wstring.swg>
diff --git a/dependencies2013/win32/swig/Lib/tcl/stl.i b/dependencies2013/win32/swig/Lib/tcl/stl.i
deleted file mode 100644
index 40c7584e..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/stl.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * stl.i
- * ----------------------------------------------------------------------------- */
-
-/* initial STL definition. extended as needed in each language */
-%include <std_common.i>
-%include <std_string.i>
-%include <std_vector.i>
-%include <std_map.i>
-%include <std_pair.i>
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tcl8.swg b/dependencies2013/win32/swig/Lib/tcl/tcl8.swg
deleted file mode 100644
index 5da1bc07..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tcl8.swg
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tcl8.swg
- *
- * Tcl configuration module.
- * ----------------------------------------------------------------------------- */
-
-/* ------------------------------------------------------------
- *  Inner macros 
- * ------------------------------------------------------------ */
-%include <tclmacros.swg>
-
-/* ------------------------------------------------------------
- *  The runtime part
- * ------------------------------------------------------------ */
-%include <tclruntime.swg>
-
-/* ------------------------------------------------------------
- *  Special user directives
- * ------------------------------------------------------------ */
-%include <tcluserdir.swg>
-
-/* ------------------------------------------------------------
- *  Typemap specializations
- * ------------------------------------------------------------ */
-%include <tcltypemaps.swg>
-
-/* ------------------------------------------------------------
- *  Overloaded operator support
- * ------------------------------------------------------------ */
-%include <tclopers.swg>
-
-/* ------------------------------------------------------------
- * Warnings for Tcl keywords 
- * ------------------------------------------------------------ */
-%include <tclkw.swg>
-
-/* ------------------------------------------------------------
- * The Tcl initialization function 
- * ------------------------------------------------------------ */
-%include <tclinit.swg>
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclapi.swg b/dependencies2013/win32/swig/Lib/tcl/tclapi.swg
deleted file mode 100644
index 33dc324d..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclapi.swg
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -----------------------------------------------------------------------------
- * SWIG API. Portion that goes into the runtime
- * ----------------------------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* -----------------------------------------------------------------------------
- * Constant declarations
- * ----------------------------------------------------------------------------- */
-
-/* Constant Types */
-#define SWIG_TCL_POINTER 4
-#define SWIG_TCL_BINARY  5
-
-/* Constant information structure */
-typedef struct swig_const_info {
-    int type;
-    char *name;
-    long lvalue;
-    double dvalue;
-    void   *pvalue;
-    swig_type_info **ptype;
-} swig_const_info;
-
-typedef int   (*swig_wrapper)(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST []);
-typedef int   (*swig_wrapper_func)(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST []);
-typedef char *(*swig_variable_func)(ClientData, Tcl_Interp *, char *, char *, int);
-typedef void  (*swig_delete_func)(ClientData);
-
-typedef struct swig_method {
-  const char     *name;
-  swig_wrapper   method;
-} swig_method;
-
-typedef struct swig_attribute {
-  const char     *name;
-  swig_wrapper   getmethod;
-  swig_wrapper   setmethod;
-} swig_attribute;
-
-typedef struct swig_class {
-  const char         *name;
-  swig_type_info   **type;
-  swig_wrapper       constructor;
-  void              (*destructor)(void *);
-  swig_method        *methods;
-  swig_attribute     *attributes;
-  struct swig_class **bases;
-  const char              **base_names;
-  swig_module_info   *module;
-  Tcl_HashTable       hashtable;
-} swig_class;
-
-typedef struct swig_instance {
-  Tcl_Obj       *thisptr;
-  void          *thisvalue;
-  swig_class   *classptr;
-  int            destroy;
-  Tcl_Command    cmdtok;
-} swig_instance;
-
-/* Structure for command table */
-typedef struct {
-  const char *name;
-  int       (*wrapper)(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST []);
-  ClientData  clientdata;
-} swig_command_info;
-
-/* Structure for variable linking table */
-typedef struct {
-  const char *name;
-  void *addr;
-  char * (*get)(ClientData, Tcl_Interp *, char *, char *, int);
-  char * (*set)(ClientData, Tcl_Interp *, char *, char *, int);
-} swig_var_info;
-
-
-/* -----------------------------------------------------------------------------*
- *  Install a constant object 
- * -----------------------------------------------------------------------------*/
-
-static Tcl_HashTable   swigconstTable;
-static int             swigconstTableinit = 0;
-
-SWIGINTERN void
-SWIG_Tcl_SetConstantObj(Tcl_Interp *interp, const char* name, Tcl_Obj *obj) {
-  int newobj;
-  Tcl_ObjSetVar2(interp,Tcl_NewStringObj(name,-1), NULL, obj, TCL_GLOBAL_ONLY);
-  Tcl_SetHashValue(Tcl_CreateHashEntry(&swigconstTable, name, &newobj), (ClientData) obj);
-}
-
-SWIGINTERN Tcl_Obj *
-SWIG_Tcl_GetConstantObj(const char *key) {
-  Tcl_HashEntry *entryPtr;
-  if (!swigconstTableinit) return 0;
-  entryPtr = Tcl_FindHashEntry(&swigconstTable, key);
-  if (entryPtr) {
-    return (Tcl_Obj *) Tcl_GetHashValue(entryPtr);
-  }
-  return 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclerrors.swg b/dependencies2013/win32/swig/Lib/tcl/tclerrors.swg
deleted file mode 100644
index 889d3ad5..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclerrors.swg
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -----------------------------------------------------------------------------
- * error manipulation
- * ----------------------------------------------------------------------------- */
-
-SWIGINTERN const char*
-SWIG_Tcl_ErrorType(int code) {
-  const char* type = 0;
-  switch(code) {
-  case SWIG_MemoryError:
-    type = "MemoryError";
-    break;
-  case SWIG_IOError:
-    type = "IOError";
-    break;
-  case SWIG_RuntimeError:
-    type = "RuntimeError";
-    break;
-  case SWIG_IndexError:
-    type = "IndexError";
-    break;
-  case SWIG_TypeError:
-    type = "TypeError";
-    break;
-  case SWIG_DivisionByZero:
-    type = "ZeroDivisionError";
-    break;
-  case SWIG_OverflowError:
-    type = "OverflowError";
-    break;
-  case SWIG_SyntaxError:
-    type = "SyntaxError";
-    break;
-  case SWIG_ValueError:
-    type = "ValueError";
-    break;
-  case SWIG_SystemError:
-    type = "SystemError";
-    break;
-  case SWIG_AttributeError:
-    type = "AttributeError";
-    break;
-  default:
-    type = "RuntimeError";
-  }
-  return type;
-}
-
-
-SWIGINTERN void
-SWIG_Tcl_SetErrorObj(Tcl_Interp *interp, const char *ctype, Tcl_Obj *obj)
-{
-  Tcl_ResetResult(interp);
-  Tcl_SetObjResult(interp, obj);
-  Tcl_SetErrorCode(interp, "SWIG", ctype, NULL);
-}
-
-SWIGINTERN void
-SWIG_Tcl_SetErrorMsg(Tcl_Interp *interp, const char *ctype, const char *mesg)
-{
-  Tcl_ResetResult(interp);
-  Tcl_SetErrorCode(interp, "SWIG", ctype, NULL);
-  Tcl_AppendResult(interp, ctype, " ", mesg, NULL);
-  /*
-  Tcl_AddErrorInfo(interp, ctype);
-  Tcl_AddErrorInfo(interp, " ");
-  Tcl_AddErrorInfo(interp, mesg);
-  */
-}
-
-SWIGINTERNINLINE void
-SWIG_Tcl_AddErrorMsg(Tcl_Interp *interp, const char* mesg)
-{
-  Tcl_AddErrorInfo(interp, mesg);
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclfragments.swg b/dependencies2013/win32/swig/Lib/tcl/tclfragments.swg
deleted file mode 100644
index ba6398c7..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclfragments.swg
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-
-  Create a file with this name, 'tclfragments.swg', in your working
-  directory and add all the %fragments you want to take precedence
-  over the ones defined by default by swig.
-
-  For example, if you add:
-  
-  %fragment(SWIG_AsVal_frag(int),"header") {
-   SWIGINTERNINLINE int
-   SWIG_AsVal_dec(int)(TclObject *obj, int *val)
-   { 
-     <your code here>;
-   }
-  }
-  
-  this will replace the code used to retrieve an integer value for all
-  the typemaps that need it, including:
-  
-    int, std::vector<int>, std::list<std::pair<int,int> >, etc.
-
-*/
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclinit.swg b/dependencies2013/win32/swig/Lib/tcl/tclinit.swg
deleted file mode 100644
index 3140bdcd..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclinit.swg
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ------------------------------------------------------------
- * The start of the Tcl initialization function 
- * ------------------------------------------------------------ */
-
-%insert(init) "swiginit.swg"
-
-/* This initialization code exports the module initialization function */
-
-%header %{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef MAC_TCL
-#pragma export on
-#endif
-SWIGEXPORT int SWIG_init(Tcl_Interp *);
-#ifdef MAC_TCL
-#pragma export off
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-/* Compatibility version for TCL stubs */
-#ifndef SWIG_TCL_STUBS_VERSION
-#define SWIG_TCL_STUBS_VERSION "8.1"
-#endif
-
-%}
-
-%init %{
-#ifdef __cplusplus
-extern "C" {   
-#endif
-
-/* -----------------------------------------------------------------------------
- * constants/methods manipulation
- * ----------------------------------------------------------------------------- */
-
-/* Install Constants */
-
-SWIGINTERN void
-SWIG_Tcl_InstallConstants(Tcl_Interp *interp, swig_const_info constants[]) {
-  size_t i;
-  Tcl_Obj *obj;
-
-  if (!swigconstTableinit) {
-    Tcl_InitHashTable(&swigconstTable, TCL_STRING_KEYS);
-    swigconstTableinit = 1;
-  }
-  for (i = 0; constants[i].type; i++) {
-    switch(constants[i].type) {
-    case SWIG_TCL_POINTER:
-      obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
-      break;
-    case SWIG_TCL_BINARY:
-      obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
-      break;
-    default:
-      obj = 0;
-      break;
-    }
-    if (obj) {
-      SWIG_Tcl_SetConstantObj(interp, constants[i].name, obj);
-    }
-  }
-}
-
-/* Create fast method lookup tables */
-
-SWIGINTERN void
-SWIG_Tcl_InstallMethodLookupTables(void) {
-  size_t i;
-
-  for (i = 0; i < swig_module.size; ++i) {
-    swig_type_info *type = swig_module.type_initial[i];
-    if (type->clientdata) {
-      swig_class* klass = (swig_class*) type->clientdata;
-      swig_method* meth;
-      Tcl_InitHashTable(&(klass->hashtable), TCL_STRING_KEYS);
-      for (meth = klass->methods; meth && meth->name; ++meth) {
-        int newEntry;
-        Tcl_HashEntry* hashentry = Tcl_CreateHashEntry(&(klass->hashtable), meth->name, &newEntry);
-        Tcl_SetHashValue(hashentry, (ClientData)meth->method);
-      }
-    }
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-/* -----------------------------------------------------------------------------*
- *  Partial Init method
- * -----------------------------------------------------------------------------*/
-
-SWIGEXPORT int SWIG_init(Tcl_Interp *interp) {
-  size_t i;
-  if (interp == 0) return TCL_ERROR;
-#ifdef USE_TCL_STUBS
-  /* (char*) cast is required to avoid compiler warning/error for Tcl < 8.4. */
-  if (Tcl_InitStubs(interp, (char*)SWIG_TCL_STUBS_VERSION, 0) == NULL) {
-    return TCL_ERROR;
-  }
-#endif  
-#ifdef USE_TK_STUBS
-  /* (char*) cast is required to avoid compiler warning/error. */
-  if (Tk_InitStubs(interp, (char*)SWIG_TCL_STUBS_VERSION, 0) == NULL) {
-    return TCL_ERROR;
-  }
-#endif
-
-  Tcl_PkgProvide(interp, (char*)SWIG_name, (char*)SWIG_version);
-  
-#ifdef SWIG_namespace
-  Tcl_Eval(interp, "namespace eval " SWIG_namespace " { }");
-#endif
-  
-  SWIG_InitializeModule((void *) interp);
-  SWIG_PropagateClientData();
-  
-  for (i = 0; swig_commands[i].name; i++) {
-    Tcl_CreateObjCommand(interp, (char *) swig_commands[i].name, (swig_wrapper_func) swig_commands[i].wrapper,
-			 swig_commands[i].clientdata, NULL);
-  }
-  for (i = 0; swig_variables[i].name; i++) {
-    Tcl_SetVar(interp, (char *) swig_variables[i].name, (char *) "", TCL_GLOBAL_ONLY);
-    Tcl_TraceVar(interp, (char *) swig_variables[i].name, TCL_TRACE_READS | TCL_GLOBAL_ONLY, 
-		 (Tcl_VarTraceProc *) swig_variables[i].get, (ClientData) swig_variables[i].addr);
-    Tcl_TraceVar(interp, (char *) swig_variables[i].name, TCL_TRACE_WRITES | TCL_GLOBAL_ONLY, 
-		 (Tcl_VarTraceProc *) swig_variables[i].set, (ClientData) swig_variables[i].addr);
-  }
-
-  SWIG_Tcl_InstallConstants(interp, swig_constants);
-  SWIG_Tcl_InstallMethodLookupTables();
-
-%}
-
-/* Note: the initialization function is closed after all code is generated */
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclinterp.i b/dependencies2013/win32/swig/Lib/tcl/tclinterp.i
deleted file mode 100644
index 3b45b6d4..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclinterp.i
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tclinterp.i
- *
- * Tcl_Interp *interp
- *
- * Passes the current Tcl_Interp value directly to a C function.
- * This can be used to work with existing wrapper functions or
- * if you just need the interp value for some reason.  When used,
- * the 'interp' parameter becomes hidden in the Tcl interface--that
- * is, you don't specify it explicitly. SWIG fills in its value
- * automatically.
- * ----------------------------------------------------------------------------- */
-
-%typemap(in,numinputs=0) Tcl_Interp *interp {
-  $1 = interp;
-}
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclkw.swg b/dependencies2013/win32/swig/Lib/tcl/tclkw.swg
deleted file mode 100644
index e96e885d..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclkw.swg
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef TCL_TCLKW_SWG_
-#define TCL_TCLKW_SWG_
-
-// Some special reserved words in classes
-
-%keywordwarn("cget is a tcl reserved method name") *::cget;
-%keywordwarn("configure is a tcl reserved method name") *::configure;
-
-
-#endif //_TCL_TCLKW_SWG_
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclmacros.swg b/dependencies2013/win32/swig/Lib/tcl/tclmacros.swg
deleted file mode 100644
index ab7bace5..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclmacros.swg
+++ /dev/null
@@ -1,4 +0,0 @@
-%include <typemaps/swigmacros.swg>
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclopers.swg b/dependencies2013/win32/swig/Lib/tcl/tclopers.swg
deleted file mode 100644
index f113ccd1..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclopers.swg
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tclopers.swg
- *
- * C++ overloaded operators.
- *
- * These declarations define how SWIG is going to rename C++
- * overloaded operators in Tcl.  Since Tcl allows identifiers
- * to be essentially any valid string, we'll just use the
- * normal operator names.
- * ----------------------------------------------------------------------------- */
-
-
-#ifdef __cplusplus
-%rename("+")         *::operator+;
-//%rename("u+")        *::operator+();     // Unary +
-//%rename("u+")        *::operator+() const;     // Unary +
-%rename("-")         *::operator-;
-//%rename("u-")        *::operator-();     // Unary -
-//%rename("u-")        *::operator-() const;     // Unary -
-%rename("*")         *::operator*;
-%rename("/")         *::operator/;
-%rename("<<")        *::operator<<;
-%rename(">>")        *::operator>>;
-%rename("&")         *::operator&;
-%rename("|")         *::operator|;
-%rename("^")         *::operator^;
-%rename("%")         *::operator%;
-%rename("=")         *::operator=;
-
-/* Ignored operators */
-%ignoreoperator(NOTEQUAL) operator!=;
-%ignoreoperator(PLUSEQ)   operator+=;
-%ignoreoperator(MINUSEQ)  operator-=;
-%ignoreoperator(MULEQ)    operator*=;
-%ignoreoperator(DIVEQ)    operator/=;
-%ignoreoperator(MODEQ)    operator%=;
-%ignoreoperator(LSHIFTEQ) operator<<=;
-%ignoreoperator(RSHIFTEQ) operator>>=;
-%ignoreoperator(ANDEQ)    operator&=;
-%ignoreoperator(OREQ)     operator|=;
-%ignoreoperator(XOREQ)    operator^=;
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclprimtypes.swg b/dependencies2013/win32/swig/Lib/tcl/tclprimtypes.swg
deleted file mode 100644
index 3b6d04f5..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclprimtypes.swg
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive Types
- * ------------------------------------------------------------ */
-
-/* boolean */
-
-%fragment(SWIG_From_frag(bool),"header") {
-  %define_as(SWIG_From_dec(bool),           Tcl_NewBooleanObj)
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(Tcl_Obj *obj, bool *val)
-{
-  int v;
-  if (Tcl_GetBooleanFromObj(0, obj, &v) == TCL_OK) {
-    if (val) *val = v ? true : false;
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* long */
-
-%fragment(SWIG_From_frag(long),"header",
-	  fragment="<limits.h>") {
-SWIGINTERNINLINE Tcl_Obj* 
-SWIG_From_dec(long)(long value)
-{
-  if (((long) INT_MIN <= value) && (value <= (long) INT_MAX)) {
-    return Tcl_NewIntObj(%numeric_cast(value,int));
-  } else {
-    return Tcl_NewLongObj(value);
-  }
-}
-}
-
-%fragment(SWIG_AsVal_frag(long),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(long)(Tcl_Obj *obj, long* val)
-{
-  long v;
-  if (Tcl_GetLongFromObj(0,obj, &v) == TCL_OK) {
-    if (val) *val = (long) v;
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* unsigned long */
-
-%fragment(SWIG_From_frag(unsigned long),"header",
-	  fragment=SWIG_From_frag(long),
-	  fragment="<stdio.h>") {
-SWIGINTERNINLINE Tcl_Obj* 
-SWIG_From_dec(unsigned long)(unsigned long value)
-{
-  if (value < (unsigned long) LONG_MAX) {
-    return SWIG_From(long)(%numeric_cast(value, long));
-  } else {
-    char temp[256]; 
-    sprintf(temp, "%lu", value);
-    return Tcl_NewStringObj(temp,-1);
-  }
-}
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long),"header",
-	  fragment="<limits.h>") {
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long)(Tcl_Obj *obj, unsigned long *val) {
-  long v;
-  if (Tcl_GetLongFromObj(0,obj, &v) == TCL_OK) {
-    if (v >= 0) {
-      if (val) *val = (unsigned long) v;
-      return SWIG_OK;
-    }
-    /* If v is negative, then this could be a negative number, or an
-       unsigned value which doesn't fit in a signed long, so try to
-       get it as a string so we can distinguish these cases. */
-  }
-  {
-    int len = 0;
-    const char *nptr = Tcl_GetStringFromObj(obj, &len);
-    if (nptr && len > 0) {
-      char *endptr;
-      unsigned long v;
-      if (*nptr == '-') return SWIG_OverflowError;
-      errno = 0;
-      v = strtoul(nptr, &endptr,0);
-      if (nptr[0] == '\0' || *endptr != '\0')
-	return SWIG_TypeError;
-      if (v == ULONG_MAX && errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_OK;
-	}
-      }
-    }
-  }
-  
-  return SWIG_TypeError;
-}
-}
-
-/* long long */
-
-%fragment(SWIG_From_frag(long long),"header",
-	  fragment=SWIG_From_frag(long),
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdio.h>") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE Tcl_Obj* 
-SWIG_From_dec(long long)(long long value)
-{
-  if (((long long) LONG_MIN <= value) && (value <= (long long) LONG_MAX)) {
-    return SWIG_From(long)(%numeric_cast(value,long));
-  } else {    
-    char temp[256]; 
-    sprintf(temp, "%lld", value);
-    return Tcl_NewStringObj(temp,-1);
-  }
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(long long),"header",
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdlib.h>") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(long long)(Tcl_Obj *obj, long long *val)
-{
-  long v;
-  if (Tcl_GetLongFromObj(0,obj, &v) == TCL_OK) {
-    if (val) *val = v;
-    return SWIG_OK;
-  } else {
-    int len = 0;
-    const char *nptr = Tcl_GetStringFromObj(obj, &len);
-    if (nptr && len > 0) {
-      char *endptr;
-      long long v;
-      errno = 0;
-      v = strtoll(nptr, &endptr,0);
-      if (nptr[0] == '\0' || *endptr != '\0')
-	return SWIG_TypeError;
-      if ((v == LLONG_MAX || v == LLONG_MIN) && errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_OK;
-	}
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-%#endif
-}
-
-/* unsigned long long */
-
-%fragment(SWIG_From_frag(unsigned long long),"header",
-	  fragment=SWIG_From_frag(long long),
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdio.h>") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERNINLINE Tcl_Obj* 
-SWIG_From_dec(unsigned long long)(unsigned long long value)
-{
-  if (value < (unsigned long long) LONG_MAX) {
-    return SWIG_From(long long)(%numeric_cast(value, long long));
-  } else {
-    char temp[256]; 
-    sprintf(temp, "%llu", value);
-    return Tcl_NewStringObj(temp,-1);
-  }
-}
-%#endif
-}
-
-%fragment(SWIG_AsVal_frag(unsigned long long),"header",
-	  fragment=SWIG_AsVal_frag(unsigned long),
-	  fragment="SWIG_LongLongAvailable",
-	  fragment="<stdlib.h>") {
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-SWIGINTERN int
-SWIG_AsVal_dec(unsigned long long)(Tcl_Obj *obj, unsigned long long *val)
-{
-  long v;
-  if (Tcl_GetLongFromObj(0,obj, &v) == TCL_OK) {
-    if (val) *val = (unsigned long) v;
-    return SWIG_OK;
-  } else {
-    int len = 0;
-    const char *nptr = Tcl_GetStringFromObj(obj, &len);
-    if (nptr && len > 0) {
-      char *endptr;
-      unsigned long long v;
-      if (*nptr == '-') return SWIG_OverflowError;
-      errno = 0;
-      v = strtoull(nptr, &endptr,0);
-      if (nptr[0] == '\0' || *endptr != '\0')
-	return SWIG_TypeError;
-      if (v == ULLONG_MAX && errno == ERANGE) {
-	errno = 0;
-	return SWIG_OverflowError;
-      } else {
-	if (*endptr == '\0') {
-	  if (val) *val = v;
-	  return SWIG_OK;
-	}
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-%#endif
-}
-
-/* double */
-
-%fragment(SWIG_From_frag(double),"header") {
-  %define_as(SWIG_From(double),         Tcl_NewDoubleObj)
-}
-
-%fragment(SWIG_AsVal_frag(double),"header") {
-SWIGINTERN int
-SWIG_AsVal_dec(double)(Tcl_Obj *obj, double *val)
-{
-  double v;
-  if (Tcl_GetDoubleFromObj(0, obj, &v) == TCL_OK) {
-    if (val) *val = v;
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclresult.i b/dependencies2013/win32/swig/Lib/tcl/tclresult.i
deleted file mode 100644
index c63b3ee1..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclresult.i
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tclresult.i
- * ----------------------------------------------------------------------------- */
-
-/*
-int Tcl_Result
-
-      Makes the integer return code of a function the return value 
-      of a SWIG generated wrapper function.  For example :
-
-            int foo() {
-                  ... do stuff ...
-                  return TCL_OK;
-            }      
-
-      could be wrapped as follows :
-
-            %include typemaps.i
-            %apply int Tcl_Result { int foo };
-            int foo();
-*/
-
-// If return code is a Tcl_Result, simply pass it on
-
-%typemap(out) int Tcl_Result {
-  return $1;
-}
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclrun.swg b/dependencies2013/win32/swig/Lib/tcl/tclrun.swg
deleted file mode 100644
index f671ba24..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclrun.swg
+++ /dev/null
@@ -1,690 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tclrun.swg
- *
- * This file contains the runtime support for Tcl modules and includes
- * code for managing global variables and pointer type checking.
- * ----------------------------------------------------------------------------- */
-
-/* Common SWIG API */
-
-/* for raw pointers */
-#define SWIG_ConvertPtr(oc, ptr, ty, flags)             SWIG_Tcl_ConvertPtr(interp, oc, ptr, ty, flags)
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Tcl_NewPointerObj(ptr, type, flags)
-
-/* for raw packed data */
-#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Tcl_ConvertPacked(interp, obj, ptr, sz, ty)
-#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Tcl_NewPackedObj(ptr, sz, type)
-
-/* for class or struct pointers */
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_Tcl_ConvertPtr(interp, obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(thisvalue, type, flags)     SWIG_Tcl_NewInstanceObj(interp, thisvalue, type, flags)
-
-/* for C or C++ function pointers */
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Tcl_ConvertPtr(interp, obj, pptr, type, 0)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Tcl_NewPointerObj(ptr, type, 0)
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Tcl_ConvertPacked(interp,obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Tcl_NewPackedObj(ptr, sz, type)
-
-
-/* Runtime API */
-
-#define SWIG_GetModule(clientdata)                      SWIG_Tcl_GetModule((Tcl_Interp *) (clientdata))	     
-#define SWIG_SetModule(clientdata, pointer)          	SWIG_Tcl_SetModule((Tcl_Interp *) (clientdata), pointer)
-
-
-/* Error manipulation */
-
-#define SWIG_ErrorType(code)                            SWIG_Tcl_ErrorType(code)                                      
-#define SWIG_Error(code, msg)            		SWIG_Tcl_SetErrorMsg(interp, SWIG_Tcl_ErrorType(code), msg)
-#define SWIG_fail                        		goto fail						    
-
-
-/* Tcl-specific SWIG API */
-
-#define SWIG_Acquire(ptr)                               SWIG_Tcl_Acquire(ptr)                                     
-#define SWIG_MethodCommand                           	SWIG_Tcl_MethodCommand				       
-#define SWIG_Disown(ptr)                             	SWIG_Tcl_Disown(ptr)				       
-#define SWIG_ConvertPtrFromString(c, ptr, ty, flags) 	SWIG_Tcl_ConvertPtrFromString(interp, c, ptr, ty, flags)  
-#define SWIG_MakePtr(c, ptr, ty, flags)              	SWIG_Tcl_MakePtr(c, ptr, ty, flags)		       
-#define SWIG_PointerTypeFromString(c)                	SWIG_Tcl_PointerTypeFromString(c)			       
-#define SWIG_GetArgs                                 	SWIG_Tcl_GetArgs					       
-#define SWIG_GetConstantObj(key)                     	SWIG_Tcl_GetConstantObj(key)			       
-#define SWIG_ObjectConstructor                       	SWIG_Tcl_ObjectConstructor				       
-#define SWIG_Thisown(ptr)                            	SWIG_Tcl_Thisown(ptr)				       
-#define SWIG_ObjectDelete                            	SWIG_Tcl_ObjectDelete				       
-
-
-#define SWIG_TCL_DECL_ARGS_2(arg1, arg2)                (Tcl_Interp *interp SWIGUNUSED, arg1, arg2)
-#define SWIG_TCL_CALL_ARGS_2(arg1, arg2)                (interp, arg1, arg2)
-/* -----------------------------------------------------------------------------
- * pointers/data manipulation
- * ----------------------------------------------------------------------------- */
-
-/* For backward compatibility only */
-#define SWIG_POINTER_EXCEPTION  0
-#define SWIG_GetConstant        SWIG_GetConstantObj
-#define SWIG_Tcl_GetConstant    SWIG_Tcl_GetConstantObj
-
-#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5
-#define SWIG_TCL_HASHTABLE_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#else
-#define SWIG_TCL_HASHTABLE_INIT {0}
-#endif
-
-#include "assert.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Object support */
-
-SWIGRUNTIME Tcl_HashTable*
-SWIG_Tcl_ObjectTable(void) {
-  static Tcl_HashTable  swigobjectTable;
-  static int            swigobjectTableinit = 0;
-  if (!swigobjectTableinit) {
-    Tcl_InitHashTable(&swigobjectTable, TCL_ONE_WORD_KEYS);
-    swigobjectTableinit = 1;
-  }
-  return &swigobjectTable;
-}
-
-/* Acquire ownership of a pointer */
-SWIGRUNTIME void
-SWIG_Tcl_Acquire(void *ptr) {
-  int newobj;
-  Tcl_CreateHashEntry(SWIG_Tcl_ObjectTable(), (char *) ptr, &newobj);
-}
-
-SWIGRUNTIME int
-SWIG_Tcl_Thisown(void *ptr) {
-  if (Tcl_FindHashEntry(SWIG_Tcl_ObjectTable(), (char *) ptr)) {
-    return 1;
-  }
-  return 0;
-}
-
-/* Disown a pointer.  Returns 1 if we owned it to begin with */
-SWIGRUNTIME int
-SWIG_Tcl_Disown(void *ptr) {
-  Tcl_HashEntry *entryPtr = Tcl_FindHashEntry(SWIG_Tcl_ObjectTable(), (char *) ptr);
-  if (entryPtr) {
-    Tcl_DeleteHashEntry(entryPtr);
-    return 1;
-  }
-  return 0;
-}
-
-/* Convert a pointer value */
-SWIGRUNTIME int
-SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, const char *c, void **ptr, swig_type_info *ty, int flags) {
-  swig_cast_info *tc;
-  /* Pointer values must start with leading underscore */
-  while (*c != '_') {
-    *ptr = (void *) 0;
-    if (strcmp(c,"NULL") == 0) return SWIG_OK;
-
-    /* Empty string: not a pointer */
-    if (*c == 0) return SWIG_ERROR; 
-
-    /* Hmmm. It could be an object name. */
-
-    /* Check if this is a command at all. Prevents <c> cget -this         */
-    /* from being called when c is not a command, firing the unknown proc */
-    if (Tcl_VarEval(interp,"info commands ", c, (char *) NULL) == TCL_OK) {
-      Tcl_Obj *result = Tcl_GetObjResult(interp);
-      if (*(Tcl_GetStringFromObj(result, NULL)) == 0) {
-        /* It's not a command, so it can't be a pointer */
-        Tcl_ResetResult(interp);
-        return SWIG_ERROR;
-      }
-    } else {
-      /* This will only fail if the argument is multiple words. */
-      /* Multiple words are also not commands.                  */
-      Tcl_ResetResult(interp);
-      return SWIG_ERROR;
-    }
-
-    /* Check if this is really a SWIG pointer */
-    if (Tcl_VarEval(interp,c," cget -this", (char *) NULL) != TCL_OK) {
-      Tcl_ResetResult(interp);
-      return SWIG_ERROR;
-    }
-
-    c = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), NULL);
-  }
-
-  c++;
-  c = SWIG_UnpackData(c,ptr,sizeof(void *));
-  if (ty) {
-    tc = c ? SWIG_TypeCheck(c,ty) : 0;
-    if (!tc) {
-      return SWIG_ERROR;
-    }
-    if (flags & SWIG_POINTER_DISOWN) {
-      SWIG_Disown((void *) *ptr);
-    }
-    {
-      int newmemory = 0;
-      *ptr = SWIG_TypeCast(tc,(void *) *ptr,&newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
-    }
-  }
-  return SWIG_OK;
-}
-
-/* Convert a pointer value */
-SWIGRUNTIMEINLINE int
-SWIG_Tcl_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, swig_type_info *ty, int flags) {
-  return SWIG_Tcl_ConvertPtrFromString(interp, Tcl_GetStringFromObj(oc,NULL), ptr, ty, flags);
-}
-
-/* Convert a pointer value */
-SWIGRUNTIME char *
-SWIG_Tcl_PointerTypeFromString(char *c) {
-  char d;
-  /* Pointer values must start with leading underscore. NULL has no type */
-  if (*c != '_') {
-    return 0;
-  }
-  c++;
-  /* Extract hex value from pointer */
-  while ((d = *c)) {
-    if (!(((d >= '0') && (d <= '9')) || ((d >= 'a') && (d <= 'f')))) break;
-    c++;
-  }
-  return c;
-}
-
-/* Convert a packed value value */
-SWIGRUNTIME int
-SWIG_Tcl_ConvertPacked(Tcl_Interp *SWIGUNUSEDPARM(interp) , Tcl_Obj *obj, void *ptr, int sz, swig_type_info *ty) {
-  swig_cast_info *tc;
-  const char  *c;
-
-  if (!obj) goto type_error;
-  c = Tcl_GetStringFromObj(obj,NULL);
-  /* Pointer values must start with leading underscore */
-  if (*c != '_') goto type_error;
-  c++;
-  c = SWIG_UnpackData(c,ptr,sz);
-  if (ty) {
-    tc = SWIG_TypeCheck(c,ty);
-    if (!tc) goto type_error;
-  }
-  return SWIG_OK;
-
- type_error:
-
-  return SWIG_ERROR;
-}
-
-
-/* Take a pointer and convert it to a string */
-SWIGRUNTIME void
-SWIG_Tcl_MakePtr(char *c, void *ptr, swig_type_info *ty, int SWIGUNUSEDPARM(flags)) {
-  if (ptr) {
-    *(c++) = '_';
-    c = SWIG_PackData(c,&ptr,sizeof(void *));
-    strcpy(c,ty->name);
-  } else {
-    strcpy(c,"NULL");
-  }
-}
-
-/* Create a new pointer object */
-SWIGRUNTIMEINLINE Tcl_Obj *
-SWIG_Tcl_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
-  Tcl_Obj *robj;
-  char result[SWIG_BUFFER_SIZE];
-  SWIG_MakePtr(result,ptr,type,flags);
-  robj = Tcl_NewStringObj(result,-1);
-  return robj;
-}
-
-SWIGRUNTIME Tcl_Obj *
-SWIG_Tcl_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
-  char result[1024];
-  char *r = result;
-  if ((2*sz + 1 + strlen(type->name)) > 1000) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r,ptr,sz);
-  strcpy(r,type->name);
-  return Tcl_NewStringObj(result,-1);
-}
-
-/* -----------------------------------------------------------------------------*
- *  Get type list 
- * -----------------------------------------------------------------------------*/
-
-SWIGRUNTIME swig_module_info * 
-SWIG_Tcl_GetModule(Tcl_Interp *interp) {
-  const char *data;
-  swig_module_info *ret = 0;
-  
-  /* first check if pointer already created */
-  data = Tcl_GetVar(interp, (char *)"swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TCL_GLOBAL_ONLY);
-  if (data) {
-    SWIG_UnpackData(data, &ret, sizeof(swig_type_info **));
-  }
-
-  return ret;
-}
-
-SWIGRUNTIME void
-SWIG_Tcl_SetModule(Tcl_Interp *interp, swig_module_info *module) {
-  char buf[SWIG_BUFFER_SIZE];
-  char *data;
-
-  /* create a new pointer */
-  data = SWIG_PackData(buf, &module, sizeof(swig_type_info **));
-  *data = 0;
-  Tcl_SetVar(interp, (char *)"swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, buf, TCL_GLOBAL_ONLY);
-}
-
-/* -----------------------------------------------------------------------------*
- *  Object auxiliaries
- * -----------------------------------------------------------------------------*/
-
-
-SWIGRUNTIME void
-SWIG_Tcl_ObjectDelete(ClientData clientData) {
-  swig_instance *si = (swig_instance *) clientData;
-  if (!si) return;
-  if (si->destroy && SWIG_Disown(si->thisvalue)) {
-    if (si->classptr->destructor) {
-      (si->classptr->destructor)(si->thisvalue);
-    }
-  }
-  Tcl_DecrRefCount(si->thisptr);
-  free(si);
-}
-
-/* Function to invoke object methods given an instance */
-SWIGRUNTIME int
-SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST _objv[]) {
-  char *method,   *attrname;
-  swig_instance   *inst = (swig_instance *) clientData;
-  swig_method     *meth;
-  swig_attribute  *attr;
-  Tcl_Obj         *oldarg;
-  Tcl_Obj         **objv;
-  int              rcode;
-  swig_class      *cls;
-  swig_class      *cls_stack[64];
-  int              cls_stack_bi[64];
-  int              cls_stack_top = 0;
-  int              numconf = 2;
-  int              bi;
-
-  objv = (Tcl_Obj **) _objv;
-  if (objc < 2) {
-    Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
-    return TCL_ERROR;
-  }
-  method = Tcl_GetStringFromObj(objv[1],NULL);
-  if (strcmp(method,"-acquire") == 0) {
-    inst->destroy = 1;
-    SWIG_Acquire(inst->thisvalue);
-    return TCL_OK;
-  }
-  if (strcmp(method,"-disown") == 0) {
-    if (inst->destroy) {
-      SWIG_Disown(inst->thisvalue);
-    }
-    inst->destroy = 0;
-    return TCL_OK;
-  }
-  if (strcmp(method,"-delete") == 0) {
-    Tcl_DeleteCommandFromToken(interp,inst->cmdtok);
-    return TCL_OK;
-  }
-  cls_stack[cls_stack_top] = inst->classptr;
-  cls_stack_bi[cls_stack_top] = -1;
-  while (1) {
-    Tcl_HashEntry* hashentry;
-    bi = cls_stack_bi[cls_stack_top];
-    cls = cls_stack[cls_stack_top];
-    if (bi != -1) {
-      if (!cls->bases[bi] && cls->base_names[bi]) {
-        /* lookup and cache the base class */
-	swig_type_info *info = SWIG_TypeQueryModule(cls->module, cls->module, cls->base_names[bi]);
-	if (info) cls->bases[bi] = (swig_class *) info->clientdata;
-      }
-      cls = cls->bases[bi];
-      if (cls) {
-        cls_stack_bi[cls_stack_top]++;
-        cls_stack_top++;
-        cls_stack[cls_stack_top] = cls;
-        cls_stack_bi[cls_stack_top] = -1;
-        continue;
-      }
-    }
-    if (!cls) {
-      cls_stack_top--;
-      if (cls_stack_top < 0) break;
-      else continue;
-    }
-    cls_stack_bi[cls_stack_top]++;
-
-    hashentry = Tcl_FindHashEntry(&(cls->hashtable), method);
-    if (hashentry) {
-        ClientData cd = Tcl_GetHashValue(hashentry);
-        swig_wrapper method_wrapper = (swig_wrapper)cd;
-        oldarg = objv[1];
-        objv[1] = inst->thisptr;
-        Tcl_IncrRefCount(inst->thisptr);
-        rcode = (method_wrapper)(clientData,interp,objc,objv);
-        objv[1] = oldarg;
-        Tcl_DecrRefCount(inst->thisptr);
-        return rcode;
-    }
-    /* Check class methods for a match */
-    if (strcmp(method,"cget") == 0) {
-      if (objc < 3) {
-        Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
-        return TCL_ERROR;
-      }
-      attrname = Tcl_GetStringFromObj(objv[2],NULL);
-      attr = cls->attributes;
-      while (attr && attr->name) {
-        if ((strcmp(attr->name, attrname) == 0) && (attr->getmethod)) {
-          oldarg = objv[1];
-          objv[1] = inst->thisptr;
-          Tcl_IncrRefCount(inst->thisptr);
-          rcode = (*attr->getmethod)(clientData,interp,2, objv);
-          objv[1] = oldarg;
-          Tcl_DecrRefCount(inst->thisptr);
-          return rcode;
-        }
-        attr++;
-      }
-      if (strcmp(attrname, "-this") == 0) {
-        Tcl_SetObjResult(interp, Tcl_DuplicateObj(inst->thisptr));
-        return TCL_OK;
-      }
-      if (strcmp(attrname, "-thisown") == 0) {
-        if (SWIG_Thisown(inst->thisvalue)) {
-          Tcl_SetResult(interp,(char*)"1",TCL_STATIC);
-        } else {
-          Tcl_SetResult(interp,(char*)"0",TCL_STATIC);
-        }
-        return TCL_OK;
-      }
-    } else if (strcmp(method, "configure") == 0) {
-      int i;
-      if (objc < 4) {
-        Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
-        return TCL_ERROR;
-      }
-      i = 2;
-      while (i < objc) {
-        attrname = Tcl_GetStringFromObj(objv[i],NULL);
-        attr = cls->attributes;
-        while (attr && attr->name) {
-          if ((strcmp(attr->name, attrname) == 0) && (attr->setmethod)) {
-            oldarg = objv[i];
-            objv[i] = inst->thisptr;
-            Tcl_IncrRefCount(inst->thisptr);
-            rcode = (*attr->setmethod)(clientData,interp,3, &objv[i-1]);
-            objv[i] = oldarg;
-            Tcl_DecrRefCount(inst->thisptr);
-            if (rcode != TCL_OK) return rcode;
-            numconf += 2;
-          }
-          attr++;
-        }
-        i+=2;
-      }
-    }
-  }
-  if (strcmp(method,"configure") == 0) {
-    if (numconf >= objc) {
-      return TCL_OK;
-    } else {
-      Tcl_SetResult(interp,(char *) "Invalid attribute name.", TCL_STATIC);
-      return TCL_ERROR;
-    }
-  }
-  if (strcmp(method,"cget") == 0) {
-    Tcl_SetResult(interp,(char *) "Invalid attribute name.", TCL_STATIC);
-    return TCL_ERROR;
-  }
-  Tcl_SetResult(interp, (char *) "Invalid method. Must be one of: configure cget -acquire -disown -delete", TCL_STATIC);
-  cls = inst->classptr;
-  bi = 0;
-  while (cls) {
-    meth = cls->methods;
-    while (meth && meth->name) {
-      char *cr = (char *) Tcl_GetStringResult(interp);
-      size_t meth_len = strlen(meth->name);
-      char* where = strchr(cr,':');
-      while(where) {
-        where = strstr(where, meth->name);
-        if(where) {
-          if(where[-1] == ' ' && (where[meth_len] == ' ' || where[meth_len]==0)) {
-            break;
-          } else {
-            where++;
-          }
-        }
-      }
-
-      if (!where)
-        Tcl_AppendElement(interp, (char *) meth->name);
-      meth++;
-    }
-    cls = inst->classptr->bases[bi++];
-  }
-  return TCL_ERROR;
-}
-
-/* This function takes the current result and turns it into an object command */
-SWIGRUNTIME Tcl_Obj *
-SWIG_Tcl_NewInstanceObj(Tcl_Interp *interp, void *thisvalue, swig_type_info *type, int flags) {
-  Tcl_Obj *robj = SWIG_NewPointerObj(thisvalue, type,0);
-  /* Check to see if this pointer belongs to a class or not */
-  if (thisvalue && (type->clientdata) && (interp)) {
-    Tcl_CmdInfo    ci;
-    char          *name;
-    name = Tcl_GetStringFromObj(robj,NULL);
-    if (!Tcl_GetCommandInfo(interp,name, &ci) || (flags)) {
-      swig_instance *newinst = (swig_instance *) malloc(sizeof(swig_instance));
-      newinst->thisptr = Tcl_DuplicateObj(robj);
-      Tcl_IncrRefCount(newinst->thisptr);
-      newinst->thisvalue = thisvalue;
-      newinst->classptr = (swig_class *) type->clientdata;
-      newinst->destroy = flags;
-      newinst->cmdtok = Tcl_CreateObjCommand(interp, Tcl_GetStringFromObj(robj,NULL), (swig_wrapper_func) SWIG_MethodCommand, (ClientData) newinst, (swig_delete_func) SWIG_ObjectDelete);
-      if (flags) {
-        SWIG_Acquire(thisvalue);
-      }
-    }
-  }
-  return robj;
-}
-
-/* Function to create objects */
-SWIGRUNTIME int
-SWIG_Tcl_ObjectConstructor(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-  Tcl_Obj          *newObj = 0;
-  void             *thisvalue = 0;
-  swig_instance   *newinst = 0;
-  swig_class      *classptr = (swig_class *) clientData;
-  swig_wrapper     cons = 0;
-  char             *name = 0;
-  int               firstarg = 0;
-  int               thisarg = 0;
-  int               destroy = 1;
-
-  if (!classptr) {
-    Tcl_SetResult(interp, (char *) "swig: internal runtime error. No class object defined.", TCL_STATIC);
-    return TCL_ERROR;
-  }
-  cons = classptr->constructor;
-  if (objc > 1) {
-    char *s = Tcl_GetStringFromObj(objv[1],NULL);
-    if (strcmp(s,"-this") == 0) {
-      thisarg = 2;
-      cons = 0;
-    } else if (strcmp(s,"-args") == 0) {
-      firstarg = 1;
-    } else if (objc == 2) {
-      firstarg = 1;
-      name = s;
-    } else if (objc >= 3) {
-      char *s1;
-      name = s;
-      s1 = Tcl_GetStringFromObj(objv[2],NULL);
-      if (strcmp(s1,"-this") == 0) {
-	thisarg = 3;
-	cons = 0;
-      } else {
-	firstarg = 1;
-      }
-    }
-  }
-  if (cons) {
-    int result;
-    result = (*cons)(0, interp, objc-firstarg, &objv[firstarg]);
-    if (result != TCL_OK) {
-      return result;
-    }
-    newObj = Tcl_DuplicateObj(Tcl_GetObjResult(interp));
-    if (!name) name = Tcl_GetStringFromObj(newObj,NULL);
-  } else if (thisarg > 0) {
-    if (thisarg < objc) {
-      destroy = 0;
-      newObj = Tcl_DuplicateObj(objv[thisarg]);
-      if (!name) name = Tcl_GetStringFromObj(newObj,NULL);
-    } else {
-      Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
-      return TCL_ERROR;
-    }
-  } else {
-    Tcl_SetResult(interp, (char *) "No constructor available.", TCL_STATIC);
-    return TCL_ERROR;
-  }
-  if (SWIG_Tcl_ConvertPtr(interp,newObj, (void **) &thisvalue, *(classptr->type), 0) != SWIG_OK) {
-    Tcl_DecrRefCount(newObj);
-    return TCL_ERROR;
-  }
-  newinst = (swig_instance *) malloc(sizeof(swig_instance));
-  newinst->thisptr = newObj;
-  Tcl_IncrRefCount(newObj);
-  newinst->thisvalue = thisvalue;
-  newinst->classptr = classptr;
-  newinst->destroy = destroy;
-  if (destroy) {
-    SWIG_Acquire(thisvalue);
-  }
-  newinst->cmdtok = Tcl_CreateObjCommand(interp,name, (swig_wrapper) SWIG_MethodCommand, (ClientData) newinst, (swig_delete_func) SWIG_ObjectDelete);
-  return TCL_OK;
-}
-
-/* -----------------------------------------------------------------------------*
- *   Get arguments 
- * -----------------------------------------------------------------------------*/
-SWIGRUNTIME int
-SWIG_Tcl_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fmt, ...) {
-  int        argno = 0, opt = 0;
-  long       tempi;
-  double     tempd;
-  const char *c;
-  va_list    ap;
-  void      *vptr;
-  Tcl_Obj   *obj = 0;
-  swig_type_info *ty;
-
-  va_start(ap,fmt);
-  for (c = fmt; (*c && (*c != ':') && (*c != ';')); c++,argno++) {
-    if (*c == '|') {
-      opt = 1;
-      c++;
-    }
-    if (argno >= (objc-1)) {
-      if (!opt) {
-        Tcl_SetResult(interp, (char *) "Wrong number of arguments ", TCL_STATIC);
-        goto argerror;
-      } else {
-        va_end(ap);
-        return TCL_OK;
-      }
-    }
-
-    vptr = va_arg(ap,void *);
-    if (vptr) {
-      if (isupper(*c)) {
-        obj = SWIG_Tcl_GetConstantObj(Tcl_GetStringFromObj(objv[argno+1],0));
-        if (!obj) obj = objv[argno+1];
-      } else {
-        obj = objv[argno+1];
-      }
-      switch(*c) {
-      case 'i': case 'I':
-      case 'l': case 'L':
-      case 'h': case 'H':
-      case 'b': case 'B':
-        if (Tcl_GetLongFromObj(interp,obj,&tempi) != TCL_OK) goto argerror;
-        if ((*c == 'i') || (*c == 'I')) *((int *)vptr) = (int)tempi;
-        else if ((*c == 'l') || (*c == 'L')) *((long *)vptr) = (long)tempi;
-        else if ((*c == 'h') || (*c == 'H')) *((short*)vptr) = (short)tempi;
-        else if ((*c == 'b') || (*c == 'B')) *((unsigned char *)vptr) = (unsigned char)tempi;
-        break;
-      case 'f': case 'F':
-      case 'd': case 'D':
-        if (Tcl_GetDoubleFromObj(interp,obj,&tempd) != TCL_OK) goto argerror;
-        if ((*c == 'f') || (*c == 'F')) *((float *) vptr) = (float)tempd;
-        else if ((*c == 'd') || (*c == 'D')) *((double*) vptr) = tempd;
-        break;
-      case 's': case 'S':
-        if (*(c+1) == '#') {
-          int *vlptr = (int *) va_arg(ap, void *);
-          *((char **) vptr) = Tcl_GetStringFromObj(obj, vlptr);
-          c++;
-        } else {
-          *((char **)vptr) = Tcl_GetStringFromObj(obj,NULL);
-        }
-        break;
-      case 'c': case 'C':
-        *((char *)vptr) = *(Tcl_GetStringFromObj(obj,NULL));
-        break;
-      case 'p': case 'P':
-        ty = (swig_type_info *) va_arg(ap, void *);
-        if (SWIG_Tcl_ConvertPtr(interp, obj, (void **) vptr, ty, 0) != SWIG_OK) goto argerror;
-        break;
-      case 'o': case 'O':
-        *((Tcl_Obj **)vptr) = objv[argno+1];
-        break;
-      default:
-        break;
-      }
-    }
-  }
-
-  if ((*c != ';') && ((objc-1) > argno)) {
-    Tcl_SetResult(interp, (char *) "Wrong # args.", TCL_STATIC);
-    goto argerror;
-  }
-  va_end(ap);
-  return TCL_OK;
-
- argerror:
-  {
-    char temp[32];
-    sprintf(temp,"%d", argno+1);
-    c = strchr(fmt,':');
-    if (!c) c = strchr(fmt,';');
-    if (!c) c = (char *)"";
-    Tcl_AppendResult(interp,c," argument ", temp, NULL);
-    va_end(ap);
-    return TCL_ERROR;
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclruntime.swg b/dependencies2013/win32/swig/Lib/tcl/tclruntime.swg
deleted file mode 100644
index bb4edd74..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclruntime.swg
+++ /dev/null
@@ -1,15 +0,0 @@
-/* tcl.h has to appear first */
-%insert(runtime) %{
-#include <stdio.h>
-#include <tcl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-%}
-
-%insert(runtime) "swigrun.swg";         /* Common C API type-checking code */
-%insert(runtime) "swigerrors.swg"       /* SWIG errors */   
-%insert(runtime) "tclerrors.swg";       /* Tcl Errors */
-%insert(runtime) "tclapi.swg";          /* Tcl API */
-%insert(runtime) "tclrun.swg";          /* Tcl run-time code */
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclsh.i b/dependencies2013/win32/swig/Lib/tcl/tclsh.i
deleted file mode 100644
index 160ba8d8..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclsh.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tclsh.i
- *
- * SWIG File for building new tclsh program
- * ----------------------------------------------------------------------------- */
-
-#ifdef AUTODOC
-%subsection "tclsh.i"
-%text %{
-This module provides the Tcl_AppInit() function needed to build a 
-new version of the tclsh executable.   This file should not be used
-when using dynamic loading.   To make an interface file work with
-both static and dynamic loading, put something like this in your
-interface file :
-
-     #ifdef STATIC
-     %include <tclsh.i>
-     #endif
-%}
-#endif
-
-%{
-
-/* A TCL_AppInit() function that lets you build a new copy
- * of tclsh.
- *
- * The macro SWIG_init contains the name of the initialization
- * function in the wrapper file.
- */
-
-#ifndef SWIG_RcFileName
-char *SWIG_RcFileName = "~/.myapprc";
-#endif
-
-
-#ifdef MAC_TCL
-extern int		MacintoshInit _ANSI_ARGS_((void));
-#endif
-
-int Tcl_AppInit(Tcl_Interp *interp){
-
-  if (Tcl_Init(interp) == TCL_ERROR) 
-    return TCL_ERROR;
-
-  /* Now initialize our functions */
-
-  if (SWIG_init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-#if TCL_MAJOR_VERSION > 7 || TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 5
-   Tcl_SetVar(interp, (char *) "tcl_rcFileName",SWIG_RcFileName,TCL_GLOBAL_ONLY);
-#else
-   tcl_RcFileName = SWIG_RcFileName;
-#endif
-#ifdef SWIG_RcRsrcName
-  Tcl_SetVar(interp, (char *) "tcl_rcRsrcName",SWIG_RcRsrcName,TCL_GLOBAL);
-#endif
-  
-  return TCL_OK;
-}
-
-#if TCL_MAJOR_VERSION > 7 || TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 4
-int main(int argc, char **argv) {
-#ifdef MAC_TCL
-    char *newArgv[2];
-    
-    if (MacintoshInit()  != TCL_OK) {
-	Tcl_Exit(1);
-    }
-
-    argc = 1;
-    newArgv[0] = "tclsh";
-    newArgv[1] = NULL;
-    argv = newArgv;
-#endif
-
-  Tcl_Main(argc, argv, Tcl_AppInit);
-  return(0);
-
-}
-#else
-extern int main();
-#endif
-
-%}
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclstrings.swg b/dependencies2013/win32/swig/Lib/tcl/tclstrings.swg
deleted file mode 100644
index 540d6270..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclstrings.swg
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ------------------------------------------------------------
- *  utility methods for char strings 
- * ------------------------------------------------------------ */
-
-%fragment("SWIG_AsCharPtrAndSize","header") {
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(Tcl_Obj *obj, char** cptr, size_t* psize, int *alloc)
-{ 
-  int len = 0;
-  char *cstr = Tcl_GetStringFromObj(obj, &len);
-  if (cstr) {
-    if (cptr)  *cptr = cstr;
-    if (psize) *psize = len + 1;
-    if (alloc) *alloc = SWIG_OLDOBJ;
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
-
-%fragment("SWIG_FromCharPtrAndSize","header",
-	  fragment="<limits.h>") {
-SWIGINTERNINLINE Tcl_Obj *
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  return (size < INT_MAX) ? Tcl_NewStringObj(carray, %numeric_cast(size,int)) : NULL;
-}
-}
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tcltypemaps.swg b/dependencies2013/win32/swig/Lib/tcl/tcltypemaps.swg
deleted file mode 100644
index ad31bcfc..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tcltypemaps.swg
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ------------------------------------------------------------
- *  Typemap specializations for Tcl
- * ------------------------------------------------------------ */
-
-/* ------------------------------------------------------------
- *  Fragment section
- * ------------------------------------------------------------ */
-
-/*
-  In Tcl we need to pass the interp value, so we define the decl/call
-  macros as needed.
-*/
-
-#define SWIG_AS_DECL_ARGS SWIG_TCL_DECL_ARGS_2
-#define SWIG_AS_CALL_ARGS SWIG_TCL_CALL_ARGS_2
-
-
-/* Include fundamental fragment definitions */
-%include <typemaps/fragments.swg>
-
-/* Look for user fragments file. */
-%include <tclfragments.swg>
-
-/* Tcl fragments for primitive types */
-%include <tclprimtypes.swg>
-
-/* Tcl fragments for char* strings */
-%include <tclstrings.swg>
-
-
-/* ------------------------------------------------------------
- *  Unified typemap section
- * ------------------------------------------------------------ */
-
-/* No director support in Tcl */
-#ifdef SWIG_DIRECTOR_TYPEMAPS
-#undef SWIG_DIRECTOR_TYPEMAPS
-#endif
-
-
-/* Tcl types */
-#define SWIG_Object                      Tcl_Obj *
-
-/* Overload of the output/constant/exception handling */
-
-/* output */
-#define %set_output(obj)                 Tcl_SetObjResult(interp,obj)
-
-/* append output */
-#define %append_output(obj)              Tcl_ListObjAppendElement(interp,Tcl_GetObjResult(interp),obj)
-
-/* set constant */
-#define SWIG_SetConstant(name, obj)      SWIG_Tcl_SetConstantObj(interp, name, obj)
-
-/* raise */
-#define SWIG_Raise(obj,type,desc)        SWIG_Tcl_SetErrorObj(interp,type,obj)
-
-
-/* Include the unified typemap library */
-%include <typemaps/swigtypemaps.swg>
-
-
-/* ------------------------------------------------------------
- *  Tcl extra typemaps / typemap overrides
- * ------------------------------------------------------------ */
-
-#if 1
-// Old 1.3.25 typemaps needed to avoid premature object deletion
-%typemap(out,noblock=1) SWIGTYPE *INSTANCE, SWIGTYPE &INSTANCE, SWIGTYPE &&INSTANCE, SWIGTYPE INSTANCE[] {
-  Tcl_SetObjResult(interp, SWIG_NewInstanceObj( %as_voidptr($1), $1_descriptor,0));
-}
-
-%typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC {
-  swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor,%as_voidptrptr(&$1));
-  Tcl_SetObjResult(interp,SWIG_NewInstanceObj(%as_voidptr($1), ty,0));
-}
-
-#endif
-
-%typemap(throws,noblock=1) SWIGTYPE CLASS {
-  SWIG_set_result(SWIG_NewInstanceObj(%as_voidptr(SWIG_new_copy($1, $1_ltype)), $&1_descriptor, 1));
-  SWIG_fail;
-}
-
-%typemap(out)    SWIGTYPE    =  SWIGTYPE INSTANCE;
-%typemap(out)    SWIGTYPE *  =  SWIGTYPE *INSTANCE;
-%typemap(out)    SWIGTYPE *const  =  SWIGTYPE *;
-%typemap(out)    SWIGTYPE &  =  SWIGTYPE &INSTANCE;
-%typemap(out)    SWIGTYPE && =  SWIGTYPE &&INSTANCE;
-%typemap(out)    SWIGTYPE [] =  SWIGTYPE INSTANCE[];
-%typemap(varout) SWIGTYPE    =  SWIGTYPE INSTANCE;
diff --git a/dependencies2013/win32/swig/Lib/tcl/tcluserdir.swg b/dependencies2013/win32/swig/Lib/tcl/tcluserdir.swg
deleted file mode 100644
index d5b41fb9..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tcluserdir.swg
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -----------------------------------------------------------------------------
- *  Special user directives
- * ----------------------------------------------------------------------------- */
-
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/tclwstrings.swg b/dependencies2013/win32/swig/Lib/tcl/tclwstrings.swg
deleted file mode 100644
index b3b682e3..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/tclwstrings.swg
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -----------------------------------------------------------------------------
- * tclwstrings.wg
- *
- * Utility methods for wchar strings 
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <wchar.h>
-%}
-
-%fragment("SWIG_AsWCharPtrAndSize","header") {
-SWIGINTERN int
-SWIG_AsWCharPtrAndSize(Tcl_Obj *obj, wchar_t** cptr, size_t* psize, int *alloc)
-{ 
-  int len = 0;
-  Tcl_UniChar *ustr = Tcl_GetUnicodeFromObj(obj, &len);
-  if (ustr) {
-    if (cptr)  {
-      Tcl_Encoding encoding = NULL;
-      char *src = (char *) ustr;
-      int srcLen = (len)*sizeof(Tcl_UniChar);
-      int dstLen = sizeof(wchar_t)*(len + 1);
-      char *dst = %new_array(dstLen, char);
-      int flags = 0;
-      Tcl_EncodingState *statePtr = 0;
-      int srcRead = 0;
-      int dstWrote = 0;
-      int dstChars = 0;
-      Tcl_UtfToExternal(0, encoding, src, srcLen, flags, statePtr, dst,
-			dstLen, &srcRead, &dstWrote, &dstChars);
-      
-      if (alloc) *alloc = SWIG_NEWOBJ;
-    }
-    if (psize) *psize = len + 1;
-    return SWIG_OK;
-  }
-  return SWIG_TypeError;
-}
-}
-
-%fragment("SWIG_FromWCharPtrAndSize","header") {
-SWIGINTERNINLINE Tcl_Obj *
-SWIG_FromWCharPtrAndSize(const wchar_t* carray, size_t size)
-{
-  Tcl_Obj *res = NULL;
-  if (size < INT_MAX) {
-    Tcl_Encoding encoding = NULL;
-    char *src = (char *) carray;
-    int srcLen = (int)(size*sizeof(wchar_t));
-    int dstLen = (int)(size*sizeof(Tcl_UniChar));
-    char *dst = %new_array(dstLen, char);
-    int flags = 0;
-    Tcl_EncodingState *statePtr = 0;
-    int srcRead = 0;
-    int dstWrote = 0;
-    int dstChars = 0;
-    
-    Tcl_ExternalToUtf(0, encoding, src, srcLen, flags, statePtr, dst,
-		      dstLen, &srcRead, &dstWrote, &dstChars);
-    
-    res = Tcl_NewUnicodeObj((Tcl_UniChar*)dst, (int)size);
-    %delete_array(dst);
-  }
-  return res;
-}
-}
-
diff --git a/dependencies2013/win32/swig/Lib/tcl/typemaps.i b/dependencies2013/win32/swig/Lib/tcl/typemaps.i
deleted file mode 100644
index 04a5c78f..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/typemaps.i
+++ /dev/null
@@ -1,464 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.i
- *
- * SWIG typemap library for Tcl8.  This file contains various sorts
- * of typemaps for modifying SWIG's code generation.
- * ----------------------------------------------------------------------------- */
-
-#if !defined(SWIG_USE_OLD_TYPEMAPS)
-%include <typemaps/typemaps.swg>
-#else
-
-/*
-The SWIG typemap library provides a language independent mechanism for
-supporting output arguments, input values, and other C function
-calling mechanisms.  The primary use of the library is to provide a
-better interface to certain C function--especially those involving
-pointers.
-*/
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/*
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-         long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include typemaps.i
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-%typemap(in) double *INPUT(double temp), double &INPUT(double temp)
-{
-  if (Tcl_GetDoubleFromObj(interp,$input,&temp) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  $1 = &temp;
-}
-
-%typemap(in) float *INPUT(double dvalue, float  temp), float &INPUT(double dvalue, float temp) 
-{
-  if (Tcl_GetDoubleFromObj(interp,$input,&dvalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (float) dvalue;
-  $1 = &temp;
-}
-
-%typemap(in) int  *INPUT(int temp), int &INPUT(int temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&temp) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  $1 = &temp;
-}
-
-%typemap(in) short *INPUT(int ivalue, short temp), short &INPUT(int ivalue, short temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (short) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) long *INPUT(int ivalue, long temp), long &INPUT(int ivalue, long temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (long) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) unsigned int  *INPUT(int ivalue, unsigned int temp), 
-             unsigned int  &INPUT(int ivalue, unsigned int temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (unsigned int) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) unsigned short *INPUT(int ivalue, unsigned short temp),
-             unsigned short &INPUT(int ivalue, unsigned short temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (unsigned short) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) unsigned long *INPUT(int ivalue, unsigned long temp),
-             unsigned long &INPUT(int ivalue, unsigned long temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (unsigned long) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) unsigned char *INPUT(int ivalue, unsigned char temp),
-             unsigned char &INPUT(int ivalue, unsigned char temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (unsigned char) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) signed char *INPUT(int ivalue, signed char temp),
-             signed char &INPUT(int ivalue, signed char temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = (signed char) ivalue;
-  $1 = &temp;
-}
-
-%typemap(in) bool *INPUT(int ivalue, bool temp),
-             bool &INPUT(int ivalue, bool temp)
-{
-  if (Tcl_GetIntFromObj(interp,$input,&ivalue) == TCL_ERROR) {
-    SWIG_fail;
-  }
-  temp = ivalue ? true : false;
-  $1 = &temp;
-}
-
-%typemap(in) long long *INPUT($*1_ltype temp), 
-             long long &INPUT($*1_ltype temp)
-{
-  temp = ($*1_ltype) strtoll(Tcl_GetStringFromObj($input,NULL),0,0);
-  $1 = &temp;
-}
-
-%typemap(in) unsigned long long *INPUT($*1_ltype temp), 
-             unsigned long long &INPUT($*1_ltype temp)
-{
-  temp = ($*1_ltype) strtoull(Tcl_GetStringFromObj($input,NULL),0,0);
-  $1 = &temp;
-}
-  
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/*
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Tcl list.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include typemaps.i
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Tcl output of the function would be a list containing both
-output values. 
-
-*/
-
-%typemap(in,numinputs=0)     int            *OUTPUT(int temp),
-                     short          *OUTPUT(short temp),
-                     long           *OUTPUT(long temp),
-                     unsigned int   *OUTPUT(unsigned int temp),
-                     unsigned short *OUTPUT(unsigned short temp),
-                     unsigned long  *OUTPUT(unsigned long temp),
-                     unsigned char  *OUTPUT(unsigned char temp),
-	             signed char    *OUTPUT(signed char temp),
-                     bool           *OUTPUT(bool temp),
-                     float          *OUTPUT(float temp),
-                     double         *OUTPUT(double temp),
-                     long long      *OUTPUT($*1_ltype temp),
-                     unsigned long long *OUTPUT($*1_ltype temp),
-	             int            &OUTPUT(int temp),
-                     short          &OUTPUT(short temp),
-                     long           &OUTPUT(long temp),
-                     unsigned int   &OUTPUT(unsigned int temp),
-                     unsigned short &OUTPUT(unsigned short temp),
-                     unsigned long  &OUTPUT(unsigned long temp),
-                     signed char    &OUTPUT(signed char temp),
-                     bool           &OUTPUT(bool temp),
-                     unsigned char  &OUTPUT(unsigned char temp),
-                     float          &OUTPUT(float temp),
-                     double         &OUTPUT(double temp),
-                     long long      &OUTPUT($*1_ltype temp),
-                     unsigned long long &OUTPUT($*1_ltype temp)
-"$1 = &temp;";
-
-%typemap(argout)     int     *OUTPUT, int &OUTPUT,
-                     short   *OUTPUT, short &OUTPUT,
-                     long    *OUTPUT, long &OUTPUT,
-                     unsigned int   *OUTPUT, unsigned int &OUTPUT,
-                     unsigned short *OUTPUT, unsigned short &OUTPUT,
-                     unsigned long  *OUTPUT, unsigned long &OUTPUT,
-                     unsigned char  *OUTPUT, unsigned char &OUTPUT,
-                     signed char    *OUTPUT, signed char  &OUTPUT,
-                     bool           *OUTPUT, bool &OUTPUT
-{
-  Tcl_Obj *o;
-  o = Tcl_NewIntObj((int) *($1));
-  Tcl_ListObjAppendElement(interp,Tcl_GetObjResult(interp),o);
-}
-
-%typemap(argout) float    *OUTPUT, float &OUTPUT,
-                 double   *OUTPUT, double &OUTPUT
-{
-  Tcl_Obj *o;
-  o = Tcl_NewDoubleObj((double) *($1));
-  Tcl_ListObjAppendElement(interp,Tcl_GetObjResult(interp),o);
-}
-
-%typemap(argout) long long *OUTPUT, long long &OUTPUT
-{
-  char temp[256];
-  Tcl_Obj *o;
-  sprintf(temp,"%lld",(long long)*($1));
-  o = Tcl_NewStringObj(temp,-1);
-  Tcl_ListObjAppendElement(interp,Tcl_GetObjResult(interp),o);
-}
-
-%typemap(argout) unsigned long long *OUTPUT, unsigned long long &OUTPUT
-{
-  char temp[256];
-  Tcl_Obj *o;
-  sprintf(temp,"%llu",(unsigned long long)*($1));
-  o = Tcl_NewStringObj(temp,-1);
-  Tcl_ListObjAppendElement(interp,Tcl_GetObjResult(interp),o);
-}
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Tcl list.
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include typemaps.i
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include typemaps.i
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in Tcl).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a Tcl variable you might do this :
-
-       set x [neg $x]
-
-*/
-
-
-%typemap(in) int *INOUT = int *INPUT;
-%typemap(in) short *INOUT = short *INPUT;
-%typemap(in) long *INOUT = long *INPUT;
-%typemap(in) unsigned int *INOUT = unsigned int *INPUT;
-%typemap(in) unsigned short *INOUT = unsigned short *INPUT;
-%typemap(in) unsigned long *INOUT = unsigned long *INPUT;
-%typemap(in) unsigned char *INOUT = unsigned char *INPUT;
-%typemap(in) signed char *INOUT = signed char *INPUT;
-%typemap(in) bool *INOUT = bool *INPUT;
-%typemap(in) float *INOUT = float *INPUT;
-%typemap(in) double *INOUT = double *INPUT;
-%typemap(in) long long *INOUT = long long *INPUT;
-%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT;
-
-%typemap(in) int &INOUT = int &INPUT;
-%typemap(in) short &INOUT = short &INPUT;
-%typemap(in) long &INOUT = long &INPUT;
-%typemap(in) unsigned int &INOUT = unsigned int &INPUT;
-%typemap(in) unsigned short &INOUT = unsigned short &INPUT;
-%typemap(in) unsigned long &INOUT = unsigned long &INPUT;
-%typemap(in) unsigned char &INOUT = unsigned char &INPUT;
-%typemap(in) signed char &INOUT = signed char &INPUT;
-%typemap(in) bool &INOUT = bool &INPUT;
-%typemap(in) float &INOUT = float &INPUT;
-%typemap(in) double &INOUT = double &INPUT;
-%typemap(in) long long &INOUT = long long &INPUT;
-%typemap(in) unsigned long long &INOUT = unsigned long long &INPUT;
-
-%typemap(argout) int *INOUT = int *OUTPUT;
-%typemap(argout) short *INOUT = short *OUTPUT;
-%typemap(argout) long *INOUT = long *OUTPUT;
-%typemap(argout) unsigned int *INOUT = unsigned int *OUTPUT;
-%typemap(argout) unsigned short *INOUT = unsigned short *OUTPUT;
-%typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT;
-%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
-%typemap(argout) signed char *INOUT = signed char *OUTPUT;
-%typemap(argout) bool *INOUT = bool *OUTPUT;
-%typemap(argout) float *INOUT = float *OUTPUT;
-%typemap(argout) double *INOUT = double *OUTPUT;
-%typemap(argout) long long *INOUT = long long *OUTPUT;
-%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT;
-
-%typemap(argout) int &INOUT = int &OUTPUT;
-%typemap(argout) short &INOUT = short &OUTPUT;
-%typemap(argout) long &INOUT = long &OUTPUT;
-%typemap(argout) unsigned int &INOUT = unsigned int &OUTPUT;
-%typemap(argout) unsigned short &INOUT = unsigned short &OUTPUT;
-%typemap(argout) unsigned long &INOUT = unsigned long &OUTPUT;
-%typemap(argout) unsigned char &INOUT = unsigned char &OUTPUT;
-%typemap(argout) signed char &INOUT = signed char &OUTPUT;
-%typemap(argout) bool &INOUT = bool &OUTPUT;
-%typemap(argout) float &INOUT = float &OUTPUT;
-%typemap(argout) double &INOUT = double &OUTPUT;
-%typemap(argout) long long &INOUT = long long &OUTPUT;
-%typemap(argout) unsigned long long &INOUT = unsigned long long &OUTPUT;
-
-
-/* Overloading information */
-
-%typemap(typecheck) double *INPUT = double;
-%typemap(typecheck) bool *INPUT = bool;
-%typemap(typecheck) signed char *INPUT = signed char;
-%typemap(typecheck) unsigned char *INPUT = unsigned char;
-%typemap(typecheck) unsigned long *INPUT = unsigned long;
-%typemap(typecheck) unsigned short *INPUT = unsigned short;
-%typemap(typecheck) unsigned int *INPUT = unsigned int;
-%typemap(typecheck) long *INPUT = long;
-%typemap(typecheck) short *INPUT = short;
-%typemap(typecheck) int *INPUT = int;
-%typemap(typecheck) float *INPUT = float;
-%typemap(typecheck) long long *INPUT = long long;
-%typemap(typecheck) unsigned long long *INPUT = unsigned long long;
-
-%typemap(typecheck) double &INPUT = double;
-%typemap(typecheck) bool &INPUT = bool;
-%typemap(typecheck) signed char &INPUT = signed char;
-%typemap(typecheck) unsigned char &INPUT = unsigned char;
-%typemap(typecheck) unsigned long &INPUT = unsigned long;
-%typemap(typecheck) unsigned short &INPUT = unsigned short;
-%typemap(typecheck) unsigned int &INPUT = unsigned int;
-%typemap(typecheck) long &INPUT = long;
-%typemap(typecheck) short &INPUT = short;
-%typemap(typecheck) int &INPUT = int;
-%typemap(typecheck) float &INPUT = float;
-%typemap(typecheck) long long &INPUT = long long;
-%typemap(typecheck) unsigned long long &INPUT = unsigned long long;
-
-%typemap(typecheck) double *INOUT = double;
-%typemap(typecheck) bool *INOUT = bool;
-%typemap(typecheck) signed char *INOUT = signed char;
-%typemap(typecheck) unsigned char *INOUT = unsigned char;
-%typemap(typecheck) unsigned long *INOUT = unsigned long;
-%typemap(typecheck) unsigned short *INOUT = unsigned short;
-%typemap(typecheck) unsigned int *INOUT = unsigned int;
-%typemap(typecheck) long *INOUT = long;
-%typemap(typecheck) short *INOUT = short;
-%typemap(typecheck) int *INOUT = int;
-%typemap(typecheck) float *INOUT = float;
-%typemap(typecheck) long long *INOUT = long long;
-%typemap(typecheck) unsigned long long *INOUT = unsigned long long;
-
-%typemap(typecheck) double &INOUT = double;
-%typemap(typecheck) bool &INOUT = bool;
-%typemap(typecheck) signed char &INOUT = signed char;
-%typemap(typecheck) unsigned char &INOUT = unsigned char;
-%typemap(typecheck) unsigned long &INOUT = unsigned long;
-%typemap(typecheck) unsigned short &INOUT = unsigned short;
-%typemap(typecheck) unsigned int &INOUT = unsigned int;
-%typemap(typecheck) long &INOUT = long;
-%typemap(typecheck) short &INOUT = short;
-%typemap(typecheck) int &INOUT = int;
-%typemap(typecheck) float &INOUT = float;
-%typemap(typecheck) long long &INOUT = long long;
-%typemap(typecheck) unsigned long long &INOUT = unsigned long long;
-
-#endif
-
-// --------------------------------------------------------------------
-// Special types
-// --------------------------------------------------------------------
-
-%include <tclinterp.i>
-%include <tclresult.i>
diff --git a/dependencies2013/win32/swig/Lib/tcl/wish.i b/dependencies2013/win32/swig/Lib/tcl/wish.i
deleted file mode 100644
index 260032a8..00000000
--- a/dependencies2013/win32/swig/Lib/tcl/wish.i
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -----------------------------------------------------------------------------
- * wish.i
- *
- * SWIG File for making wish
- * ----------------------------------------------------------------------------- */
-
-#ifdef AUTODOC
-%subsection "wish.i"
-%text %{
-This module provides the Tk_AppInit() function needed to build a 
-new version of the wish executable.   Like tclsh.i, this file should
-not be used with dynamic loading.  To make an interface file work with
-both static and dynamic loading, put something like this in your
-interface file :
-
-     #ifdef STATIC
-     %include <wish.i>
-     #endif
-
-A startup file may be specified by defining the symbol SWIG_RcFileName
-as follows (this should be included in a code-block) :
-
-     #define SWIG_RcFileName    "~/.mywishrc"
-%}
-#endif
-
-%{
-
-
-/* Initialization code for wish */
-
-#include <tk.h>
-
-#ifndef SWIG_RcFileName
-char *SWIG_RcFileName = "~/.wishrc";
-#endif
-
-#ifdef MAC_TCL
-extern int	MacintoshInit _ANSI_ARGS_((void));
-extern int	SetupMainInterp _ANSI_ARGS_((Tcl_Interp *interp));
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in interp->result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int Tcl_AppInit(Tcl_Interp *interp)
-{
-#ifndef MAC_TCL
-    Tk_Window main;
-    main = Tk_MainWindow(interp);
-#endif
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-    if (Tk_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     */
-
-    if (SWIG_init(interp) == TCL_ERROR) {
-      return TCL_ERROR;
-    }
-    
-#ifdef MAC_TCL
-    SetupMainInterp(interp);
-#endif
-        
-    /*
-     * Specify a user-specific startup file to invoke if the application
-     * is run interactively.  Typically the startup file is "~/.apprc"
-     * where "app" is the name of the application.  If this line is deleted
-     * then no user-specific startup file will be run under any conditions.
-     */
-
-#if TCL_MAJOR_VERSION >= 8 || TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 5
-   Tcl_SetVar(interp, (char *) "tcl_rcFileName",SWIG_RcFileName,TCL_GLOBAL_ONLY);
-#else
-   tcl_RcFileName = SWIG_RcFileName;
-#endif
-
-/* For Macintosh might also want this */
-
-#ifdef MAC_TCL
-#ifdef SWIG_RcRsrcName
-    Tcl_SetVar(interp, (char *) "tcl_rcRsrcName",SWIG_RcRsrcName,TCL_GLOBAL_ONLY);
-#endif
-#endif
-    return TCL_OK;
-}
-
-#if TK_MAJOR_VERSION >= 4
-int main(int argc, char **argv) {
-
-#ifdef MAC_TCL
-  char *newArgv[2];
-  if (MacintoshInit() != TCL_OK) {
-      Tcl_Exit(1);
-  }
-  argc = 1;
-  newArgv[0] = "Wish";
-  newArgv[1] = NULL;
-  argv = newArgv;
-#endif
-  Tk_Main(argc, argv, Tcl_AppInit);
-  return(0);
-}
-#else
-extern int main();
-#endif
-
-%}
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/README b/dependencies2013/win32/swig/Lib/typemaps/README
deleted file mode 100644
index 65134578..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/README
+++ /dev/null
@@ -1,54 +0,0 @@
-Still in development, but if you are interested into looking around,
-start with
-
-
-     swigtypemaps.swg
-
-which is the head file. Also read the docs for %fragments in 
-
-     fragments.swg 
-
-and follow the definitions in one of the supported languages:
-
-     python, perl, ruby, tcl
-
-
-
-
-/* -----------------------------------------------------------------------------
- *  Internal typemap specializations
- * ----------------------------------------------------------------------------- */
-
-
-carrays.swg		Implement the carrays.i library
-cdata.swg		Implement the cdata.i library
-cmalloc.swg		Implement the cmalloc.i library
-cpointer.swg		Implement the cpointer.i library
-cstring.swg		Implement the cstring.i library typemaps for char *
-cwstring.swg		Implement the cstring.i library typemaps for wchar_t *
-exception.swg		Implement the exception.i library
-implicit.swg		Allow the use of implicit C++ constructors
-
-string.swg		Typemaps for char * string
-wstring.swg		Typemaps for wchar_t * string
-std_string.swg		Typemaps for std::string
-std_wstring.swg		Typemaps for std::wstring
-swigtype.swg		Typemaps for the SWIGTYPE type
-void.swg		Typemaps for the 'void' type
-enumint.swg		Typemaps for enums treated as 'int' 
-swigobject.swg		Typemaps for the SWIG_Object as in PyObject, Tcl_Obj, etc.
-misctypes.swg		Typemaps for miscellaneos types (size_t, ptrdiff_t, etc)
-ptrtypes.swg		Typemaps for types with a 'ptr' behavior
-valtypes.swg		Typemaps for 'by value' types
-inoutlist.swg		IN/OUTPUT/INOUT typemaps, where the OUTPUT values are returned in a list
-primtypes.swg		Common macros to manage primitive types (short,int,double,etc)
-
-cstrings.swg		Common macros to implemented the cstring/cwstring libraries
-std_strings.swg		Common macros to implemented the std::string/std::wstring typemaps
-strings.swg		Common macros and typemaps for string and wstring (char *, wchar_t *)
-
-swigmacros.swg		Basic macros 
-fragments.swg		Macros for fragment manipulations
-
-
-typemaps.swg		The old typemaps.i library, not needed anymore
diff --git a/dependencies2013/win32/swig/Lib/typemaps/attribute.swg b/dependencies2013/win32/swig/Lib/typemaps/attribute.swg
deleted file mode 100644
index 98811399..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/attribute.swg
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -----------------------------------------------------------------------------
- * attribute.swg
- *
- * Attribute implementation
- * ----------------------------------------------------------------------------- */
-
-/*
-  The following macros convert a pair of set/get methods
-  into a "native" attribute.
-
-  Use %attribute when you have a pair of get/set methods to a primitive type
-  like in:
-
-      %attribute(A, int, a, get_a, set_a);
-
-      struct A
-      {
-        int get_a() const;
-        void set_a(int aa);
-      };
-
-  If you don't provide a 'set' method, a 'read-only' attribute
-  is generated, ie, like in:
-
-      %attribute(A, int, c, get_c);
-
-  Use %attributeref when you have const/non-const reference access methods
-  for primitive types or class/structs, like in:
-
-      %attributeref(A, int, b);
-
-      struct A
-      {
-        const int& b() const;
-        int& b();
-      };
-
-      %attributeref(B, int, c);
-
-      struct B
-      {
-        int& c();
-      };
-
-  You can also use
-
-      %attributeref(Class, AttributeType, AttributeName, AccessorMethod)
-
-  if the internal C++ reference methods have a different name from the
-  attribute you want, so
-
-      %attributeref(B, int, d, c);
-
-  is the same as the last example, but instead of the attribute 'c' being
-  called 'c', it is called 'd'.
-
-  Now you can use the attributes like so:
-
-      x = A()
-      x.a = 3        # calls A::set_a
-      print x.a      # calls A::get_a
-
-      x.b = 3        # calls A::b()
-      print x.b      # calls A::b() const
-
-  Use %attribute2 instead of %attribute to indicate that reference-pointer
-  translation is required. You use %attribute2 instead of %attribute in
-  cases like this:
- 
-  %attribute2(MyClass, MyFoo, Foo, GetFoo, SetFoo);
-  %inline %{
-    struct MyFoo { 
-      int x;
-    };
-    class MyClass {
-      MyFoo foo;
-    public:
-      MyFoo& GetFoo() { return foo; }
-      void SetFoo(const MyFoo& other) { foo = other; }
-    };
-  %}
-
-  Here, the data type of the property is a wrapped type (MyFoo) and on the
-  C++ side it is passed by reference. The problem is that the SWIG wrapper will
-  pass around a pointer (MyFoo *) which is not compatible with the reference
-  type of the accessors (MyFoo &). Therefore, if you use %attribute, you'll get
-  an error from your C/C++ compiler. %attribute2 translates between a pointer
-  and a reference to eliminate the error. In case you're confused, let's make it
-  simple: just use %attribute at first, but if the C/C++ compiler gives an error
-  while compiling the wrapper, try %attribute2 instead.
-
-  NOTE: remember that if the type contains commas, such as 'std::pair<int,int>',
-  you need to use the macro like:
-
-  %attributeref(A, %arg(std::pair<int,int>), pval);
-
-  where %arg() 'normalizes' the type to be understood as a single
-  argument, otherwise the macro will get confused by the comma.
-
-  The %attributeval is the same as %attribute, but should be used when the type
-  is a class/struct (ie a non-primitive type) and when the get and set methods 
-  return/pass by value. The following is very similar to the above example, but 
-  note that the access is by value rather than reference.
-
-    %attributeval(MyClassVal, MyFoo, ReadWriteFoo, GetFoo, SetFoo);
-    %attributeval(MyClassVal, MyFoo, ReadOnlyFoo, GetFoo);
-    %inline %{
-      class MyClassVal {
-	MyFoo foo;
-      public:
-	MyFoo GetFoo() { return foo; }
-	void SetFoo(MyFoo other) { foo = other; }
-      };
-    %} 
-
-  The %attributestring is the same as %attributeval, but should be used for string
-  class types, which are unusual as they are a class on the C++ side, but normally an
-  immutable/primitive type in the target language. Example usage for std::string:
-
-    %include <std_string.i>
-    %attributestring(MyStringyClass, std::string, ReadWriteString, GetString, SetString);
-    %attributestring(MyStringyClass, std::string, ReadOnlyString, GetString);
-    %inline %{
-      class MyStringyClass {
-	std::string str;
-      public:
-	MyStringyClass(const std::string &val) : str(val) {}
-	std::string GetString() { return str; }
-	void SetString(std::string other) { str = other; }
-      };
-    %} 
-
-  The %attributestring also works for class types that have %naturalvar turned
-  on and so is also useful for shared_ptr which has %naturalvar turned on in %shared_ptr.
-
-*/
-
-//
-// Define SWIG_ATTRIBUTE_TEMPLATE if you want to use templates instead of macros for the C++ get and set wrapper methods
-// Does not always generate compilable code, use at your peril!
-//
-//#define SWIG_ATTRIBUTE_TEMPLATE
-
-%define %attribute_custom(Class, AttributeType, AttributeName, GetMethod, SetMethod, GetMethodCall, SetMethodCall)
-  %ignore Class::GetMethod();
-  %ignore Class::GetMethod() const;
-  #if #SetMethod != #AttributeName
-    %ignore Class::SetMethod;
-  #endif
-  %extend Class {
-    AttributeType AttributeName;
-  }
-#if defined(__cplusplus) && defined(SWIG_ATTRIBUTE_TEMPLATE)
-  %{
-    template < class C > inline AttributeType %mangle(Class) ##_## AttributeName ## _get(const C* self_) {
-      return GetMethodCall;
-    }
-    template < class C > inline AttributeType %mangle(Class) ##_## AttributeName ## _get(C* self_) {
-      return GetMethodCall;
-    }
-    template < class C > inline void %mangle(Class) ##_## AttributeName ## _set(C* self_, AttributeType val_) {
-      SetMethodCall;
-    }
-  %}
-#else
-  %{
-    #define %mangle(Class) ##_## AttributeName ## _get(self_) GetMethodCall
-    #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) SetMethodCall
-  %}
-#endif
-%enddef
-
-%define %attribute_readonly(Class, AttributeType, AttributeName, GetMethod, GetMethodCall)
-  %ignore Class::GetMethod();
-  %ignore Class::GetMethod() const;
-  %immutable Class::AttributeName;
-  %extend Class {
-    AttributeType AttributeName;
-  }
-#if defined(__cplusplus) && defined(SWIG_ATTRIBUTE_TEMPLATE)
-  %{
-    template < class C > inline AttributeType %mangle(Class) ##_## AttributeName ## _get(const C* self_) {
-      return GetMethodCall;
-    }
-    template < class C > inline AttributeType %mangle(Class) ##_## AttributeName ## _get(C* self_) {
-      return GetMethodCall;
-    }
-  %}
-#else
-  %{
-    #define %mangle(Class) ##_## AttributeName ## _get(self_) GetMethodCall
-  %}
-#endif
-%enddef
-
-
-// User macros
-
-%define %attribute(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
-  #if #SetMethod != ""
-    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, SetMethod, self_->GetMethod(), self_->SetMethod(val_))
-  #else
-    %attribute_readonly(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, self_->GetMethod())
-  #endif
-%enddef
-
-%define %attribute2(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
-  #if #SetMethod != ""
-    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, SetMethod, &self_->GetMethod(), self_->SetMethod(*val_))
-  #else
-    %attribute_readonly(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, &self_->GetMethod())
-  #endif
-%enddef
-
-%define %attributeref(Class, AttributeType, AttributeName, AccessorMethod...)
-  #if #AccessorMethod != ""
-    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
-  #else
-    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AttributeName, AttributeName, self_->AttributeName(), self_->AttributeName() = val_)
-  #endif
-%enddef
-
-%define %attribute2ref(Class, AttributeType, AttributeName, AccessorMethod...)
-  #if #AccessorMethod != ""
-    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
-  #else
-    %attribute_custom(%arg(Class), %arg(AttributeType), AccessorName, AccessorName, AccessorName, &self_->AccessorName(), self_->AccessorName() = *val_)
-  #endif
-%enddef
-
-// deprecated (same as %attributeref, but there is an argument order inconsistency)
-%define %attribute_ref(Class, AttributeType, AccessorMethod, AttributeName...)
-  #if #AttributeName != ""
-    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
-  #else
-    %attribute_custom(%arg(Class), %arg(AttributeType), AccessorMethod, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
-  #endif
-%enddef
-
-
-%define %attributeval(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
-  %{
-    #define %mangle(Class) ##_## AttributeName ## _get(self_) new AttributeType(self_->GetMethod())
-  %}
-  #if #SetMethod != ""
-    %{
-      #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) self_->SetMethod(*val_)
-    %}
-    #if #SetMethod != #AttributeName
-      %ignore Class::SetMethod;
-    #endif
-  #else
-    %immutable Class::AttributeName;
-  #endif
-  %ignore Class::GetMethod();
-  %ignore Class::GetMethod() const;
-  %newobject Class::AttributeName;
-  %extend Class {
-    AttributeType AttributeName;
-  }
-%enddef
-
-
-%define %attributestring(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
-  %{
-    #define %mangle(Class) ##_## AttributeName ## _get(self_) *new AttributeType(self_->GetMethod())
-  %}
-  #if #SetMethod != ""
-    %{
-      #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) self_->SetMethod(val_)
-    %}
-    #if #SetMethod != #AttributeName
-      %ignore Class::SetMethod;
-    #endif
-  #else
-    %immutable Class::AttributeName;
-  #endif
-  %ignore Class::GetMethod();
-  %ignore Class::GetMethod() const;
-  %newobject Class::AttributeName;
-  %typemap(newfree) const AttributeType &AttributeName "delete $1;"
-  %extend Class {
-    AttributeType AttributeName;
-  }
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/carrays.swg b/dependencies2013/win32/swig/Lib/typemaps/carrays.swg
deleted file mode 100644
index 462d60bc..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/carrays.swg
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -----------------------------------------------------------------------------
- * carrays.swg
- *
- * This library file contains macros that can be used to manipulate simple
- * pointers as arrays.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * %array_functions(TYPE,NAME)
- *
- * Generates functions for creating and accessing elements of a C array
- * (as pointers).  Creates the following functions:
- *
- *        TYPE *new_NAME(int nelements)
- *        void delete_NAME(TYPE *);
- *        TYPE NAME_getitem(TYPE *, int index);
- *        void NAME_setitem(TYPE *, int index, TYPE value);
- * 
- * ----------------------------------------------------------------------------- */
-
-%define %array_functions(TYPE,NAME) 
-%{
-  static TYPE *new_##NAME(size_t nelements) { 
-    return %new_array(nelements, TYPE);
-  }
-
-  static void delete_##NAME(TYPE *ary) {
-    %delete_array(ary);
-  }
-
-  static TYPE NAME##_getitem(TYPE *ary, size_t index) {
-    return ary[index];
-  }
-  static void NAME##_setitem(TYPE *ary, size_t index, TYPE value) {
-    ary[index] = value;
-  }
-%}
-
-TYPE *new_##NAME(size_t nelements);
-void delete_##NAME(TYPE *ary);
-TYPE NAME##_getitem(TYPE *ary, size_t index);
-void NAME##_setitem(TYPE *ary, size_t index, TYPE value);
-
-%enddef
-
-
-/* -----------------------------------------------------------------------------
- * %array_class(TYPE,NAME)
- *
- * Generates a class wrapper around a C array.  The class has the following
- * interface:
- *
- *          struct NAME {
- *              NAME(int nelements);
- *             ~NAME();
- *              TYPE getitem(int index);
- *              void setitem(int index, TYPE value);
- *              TYPE * cast();
- *              static NAME *frompointer(TYPE *t);
- *         }
- *
- * Use
- *
- *    %array_class_wrap(TYPE,NAME,GET,SET) 
- *
- * if you want  different names for the get/set methods.
- * ----------------------------------------------------------------------------- */
-
-%define %array_class_wrap(TYPE,NAME,getitem,setitem)
-%{
-typedef TYPE NAME;
-%}
-
-
-typedef struct {
-} NAME;
-
-%extend NAME {
-
-  NAME(size_t nelements) {
-    return %new_array(nelements, TYPE);
-  }
-
-  ~NAME() {
-    %delete_array(self);
-  }
-  
-  TYPE getitem(size_t index) {
-    return self[index];
-  }
-
-  void setitem(size_t index, TYPE value) {
-    self[index] = value;
-  }
-
-  TYPE * cast() {
-    return self;
-  }
-
-  static NAME *frompointer(TYPE *t) {
-    return %static_cast(t, NAME *);
-  }
-};
-
-%types(NAME = TYPE);
-
-%enddef
-
-
-#ifndef %array_class
-%define %array_class(TYPE,NAME)
-  %array_class_wrap(TYPE,NAME,getitem,setitem)
-%enddef
-#endif
diff --git a/dependencies2013/win32/swig/Lib/typemaps/cdata.swg b/dependencies2013/win32/swig/Lib/typemaps/cdata.swg
deleted file mode 100644
index 8597b7b0..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/cdata.swg
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cdata.swg
- *
- * This library file contains macros for manipulating raw C data as strings.
- * ----------------------------------------------------------------------------- */
-
-%{
-typedef struct SWIGCDATA {
-    char *data;
-    size_t   len;
-} SWIGCDATA;
-%}
-
-/* -----------------------------------------------------------------------------
- * Typemaps for returning binary data
- * ----------------------------------------------------------------------------- */
-
-%typemap(out,noblock=1,fragment="SWIG_FromCharPtrAndSize") SWIGCDATA {
-  %set_output(SWIG_FromCharPtrAndSize($1.data,$1.len));
-}
-%typemap(in) (const void *indata, size_t inlen) = (char *STRING, size_t SIZE);
-
-
-/* -----------------------------------------------------------------------------
- * %cdata(TYPE [, NAME]) 
- *
- * Convert raw C data to a binary string.
- * ----------------------------------------------------------------------------- */
-
-%define %cdata(TYPE,NAME...)
-
-%insert("header") {
-#ifdef __cplusplus
-extern "C"  {    
-#endif
-#if #NAME == ""
-static SWIGCDATA cdata_##TYPE(TYPE *ptr, size_t nelements)
-#else
-static SWIGCDATA cdata_##NAME(TYPE *ptr, size_t nelements)
-#endif
-{
-  SWIGCDATA d;
-  d.data = (char *) ptr;
-#if #TYPE != "void"
-  d.len  = nelements*sizeof(TYPE);
-#else
-  d.len  = nelements;
-#endif
-   return d;
-}
-#ifdef __cplusplus
-}
-#endif 
-}
-
-#ifdef __cplusplus
-extern "C"
-#endif
-#if #NAME == ""
-SWIGCDATA cdata_##TYPE(TYPE *ptr, size_t nelements = 1);
-#else
-SWIGCDATA cdata_##NAME(TYPE *ptr, size_t nelements = 1);
-#endif
-%enddef
-
-%rename(cdata) ::cdata_void(void *ptr, size_t nelements = 1);
-
-%cdata(void);
-
-/* Memory move function. Due to multi-argument typemaps this appears to be wrapped as
-void memmove(void *data, const char *s); */
-void memmove(void *data, const void *indata, size_t inlen);
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/cmalloc.swg b/dependencies2013/win32/swig/Lib/typemaps/cmalloc.swg
deleted file mode 100644
index 45a6ab99..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/cmalloc.swg
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cmalloc.swg
- *
- * This library file contains macros that can be used to create objects using
- * the C malloc function.
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <stdlib.h>
-%}
-
-/* %malloc(TYPE [, NAME = TYPE])
-   %calloc(TYPE [, NAME = TYPE])
-   %realloc(TYPE [, NAME = TYPE])
-   %free(TYPE [, NAME = TYPE])
-   %allocators(TYPE [,NAME = TYPE])
-
-   Creates functions for allocating/reallocating memory.
-
-   TYPE *malloc_NAME(size_t nbytes = sizeof(TYPE);
-   TYPE *calloc_NAME(size_t nobj=1, size_t size=sizeof(TYPE));
-   TYPE *realloc_NAME(TYPE *ptr, size_t nbytes);
-   void free_NAME(TYPE *ptr);
-
-*/
-
-%define %malloc(TYPE,NAME...)
-#if #NAME != ""
-%rename(malloc_##NAME) ::malloc(size_t nbytes);
-#else
-%rename(malloc_##TYPE) ::malloc(size_t nbytes);
-#endif
-
-#if #TYPE != "void"
-%typemap(default) size_t nbytes "$1 = (size_t) sizeof(TYPE);"
-#endif
-TYPE *malloc(size_t nbytes);
-%typemap(default) size_t nbytes;
-%enddef
-
-%define %calloc(TYPE,NAME...)
-#if #NAME != ""
-%rename(calloc_##NAME) ::calloc(size_t nobj, size_t sz);
-#else
-%rename(calloc_##TYPE) ::calloc(size_t nobj, size_t sz);
-#endif
-#if #TYPE != "void"
-%typemap(default) size_t sz "$1 = (size_t) sizeof(TYPE);"
-#else
-%typemap(default) size_t sz "$1 = 1;"
-#endif
-%typemap(default) size_t nobj "$1 = 1;"
-TYPE *calloc(size_t nobj, size_t sz);
-%typemap(default) size_t sz;
-%typemap(default) size_t nobj;
-%enddef
-
-%define %realloc(TYPE,NAME...)
-%insert("header") {
-#if #NAME != ""
-TYPE *realloc_##NAME(TYPE *ptr, size_t nitems)
-#else
-TYPE *realloc_##TYPE(TYPE *ptr, size_t nitems)
-#endif
-{
-#if #TYPE != "void"
-return (TYPE *) realloc(ptr, nitems*sizeof(TYPE));
-#else
-return (TYPE *) realloc(ptr, nitems);
-#endif
-}
-}
-#if #NAME != ""
-TYPE *realloc_##NAME(TYPE *ptr, size_t nitems);
-#else
-TYPE *realloc_##TYPE(TYPE *ptr, size_t nitems);
-#endif
-%enddef
-
-%define %free(TYPE,NAME...)
-#if #NAME != ""
-%rename(free_##NAME) ::free(TYPE *ptr);
-#else
-%rename(free_##TYPE) ::free(TYPE *ptr);
-#endif
-void free(TYPE *ptr);
-%enddef
-
-%define %sizeof(TYPE,NAME...)
-#if #NAME != ""
-%constant size_t sizeof_##NAME = sizeof(TYPE);
-#else
-%constant size_t sizeof_##TYPE = sizeof(TYPE);
-#endif
-%enddef
-
-%define %allocators(TYPE,NAME...)
-%malloc(TYPE,NAME)
-%calloc(TYPE,NAME)
-%realloc(TYPE,NAME)
-%free(TYPE,NAME)
-#if #TYPE != "void"
-%sizeof(TYPE,NAME)
-#endif
-%enddef
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/cpointer.swg b/dependencies2013/win32/swig/Lib/typemaps/cpointer.swg
deleted file mode 100644
index 94bbbd6b..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/cpointer.swg
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cpointer.swg
- *
- * This library file contains macros that can be used to manipulate simple
- * pointer objects.
- *
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * %pointer_class(type,name)
- *
- * Places a simple proxy around a simple type like 'int', 'float', or whatever.
- * The proxy provides this interface:
- *
- *       class type {
- *       public:
- *           type();
- *          ~type();
- *           type value();
- *           void assign(type value);
- *       };
- *         
- * Example:
- *
- *    %pointer_class(int, intp);
- *
- *    int add(int *x, int *y) { return *x + *y; }
- *
- * In python (with proxies)
- *
- *    >>> a = intp()
- *    >>> a.assign(10)
- *    >>> a.value()
- *    10
- *    >>> b = intp()
- *    >>> b.assign(20)
- *    >>> print add(a,b)
- *    30
- *
- * As a general rule, this macro should not be used on class/structures that
- * are already defined in the interface.
- * ----------------------------------------------------------------------------- */
-
-
-%define %pointer_class(TYPE, NAME)
-%{
-typedef TYPE NAME;
-%}
-
-typedef struct {
-} NAME;
-
-%extend NAME {
-  NAME() {
-    return %new_instance(TYPE);
-  }
-  ~NAME() {
-    if ($self) %delete($self);
-  }
-}
-
-%extend NAME {
-
-  void assign(TYPE value) {
-    *$self = value;
-  }
-  TYPE value() {
-    return *$self;
-  }
-  TYPE * cast() {
-    return $self;
-  }
-  static NAME * frompointer(TYPE *t) {
-    return (NAME *) t;
-  }
-}
-
-%types(NAME = TYPE);
-
-%enddef
-
-/* ----------------------------------------------------------------------------- 
- * %pointer_functions(type,name)
- *
- * Create functions for allocating/deallocating pointers.   This can be used
- * if you don't want to create a proxy class or if the pointer is complex.
- *
- *    %pointer_functions(int, intp)
- *
- *    int add(int *x, int *y) { return *x + *y; }
- *
- * In python (with proxies)
- *
- *    >>> a = copy_intp(10)
- *    >>> intp_value(a)
- *    10
- *    >>> b = new_intp()
- *    >>> intp_assign(b,20)
- *    >>> print add(a,b)
- *    30
- *    >>> delete_intp(a)
- *    >>> delete_intp(b)
- * 
- * ----------------------------------------------------------------------------- */
-
-%define %pointer_functions(TYPE,NAME)
-%{
-  static TYPE *new_##NAME() { 
-    return %new_instance(TYPE);
-  }
-  
-  static TYPE *copy_##NAME(TYPE value) { 
-    return %new_copy(value, TYPE);
-  }
-
-  static void delete_##NAME(TYPE *obj) { 
-    if (obj) %delete(obj);
-  }
-
-  static void NAME ##_assign(TYPE *obj, TYPE value) {
-    *obj = value;
-  }
-
-  static TYPE NAME ##_value(TYPE *obj) {
-    return *obj;
-  }
-%}
-
-TYPE *new_##NAME();
-TYPE *copy_##NAME(TYPE value);
-void  delete_##NAME(TYPE *obj);
-void  NAME##_assign(TYPE *obj, TYPE value);
-TYPE  NAME##_value(TYPE *obj);
-
-%enddef
-
-/* -----------------------------------------------------------------------------
- * %pointer_cast(type1,type2,name)
- *
- * Generates a pointer casting function.
- * ----------------------------------------------------------------------------- */
-
-%define %pointer_cast(TYPE1,TYPE2,NAME)
-%inline %{
-TYPE2 NAME(TYPE1 x) {
-   return %static_cast(x, TYPE2);
-}
-%}
-%enddef
-
-
-
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/cstring.swg b/dependencies2013/win32/swig/Lib/typemaps/cstring.swg
deleted file mode 100644
index e774c431..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/cstring.swg
+++ /dev/null
@@ -1,9 +0,0 @@
-%include <typemaps/cstrings.swg>
-
-%typemaps_cstring(%cstring,
-		 char,
-		 SWIG_AsCharPtr,
-		 SWIG_AsCharPtrAndSize,
-		 SWIG_FromCharPtr,
-		 SWIG_FromCharPtrAndSize);
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/cstrings.swg b/dependencies2013/win32/swig/Lib/typemaps/cstrings.swg
deleted file mode 100644
index 0aca6110..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/cstrings.swg
+++ /dev/null
@@ -1,288 +0,0 @@
-/* -----------------------------------------------------------------------------
- * cstrings.swg
- *
- * This file provides typemaps and macros for dealing with various forms
- * of C character string handling.   The primary use of this module
- * is in returning character data that has been allocated or changed in
- * some way.
- * ----------------------------------------------------------------------------- */
-
-%define %typemaps_cstring(Name, Char,
-			  SWIG_AsCharPtr,
-			  SWIG_AsCharPtrAndSize,
-			  SWIG_FromCharPtr,
-			  SWIG_FromCharPtrAndSize)
-
-
-/* %cstring_input_binary(TYPEMAP, SIZE)
- * 
- * Macro makes a function accept binary string data along with
- * a size.  For example:
- *
- *     %cstring_input_binary(Char *buff, int size);
- *     void foo(Char *buff, int size) {
- *     }
- *
- */
-
-%define Name ## _input_binary(TYPEMAP, SIZE)                   
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize) (TYPEMAP, SIZE) 
-  (int res, Char *buf = 0, size_t size = 0, int alloc = 0)  {
-  res = SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  $1 = ($1_ltype) buf;					       
-  $2 = ($2_ltype) size - 1;				       
-}
-%typemap(freearg,noblock=1,match="in") (TYPEMAP, SIZE) {
-  if (alloc$argnum == SWIG_NEWOBJ) %delete_array(buf$argnum);
-}
-%enddef								
-
-
-
-/*
- * %cstring_bounded_output(TYPEMAP, MAX)
- *
- * This macro is used to return a NULL-terminated output string of
- * some maximum length.  For example:
- *
- *     %cstring_bounded_output(Char *outx, 512);
- *     void foo(Char *outx) {
- *         sprintf(outx,"blah blah\n");
- *     }
- *
- */
-
-%define Name ## _bounded_output(TYPEMAP,MAX)        
-%typemap(in,noblock=1,numinputs=0) TYPEMAP (Char temp[MAX+1])  {
-  $1 = ($1_ltype) temp;
-}
-%typemap(freearg,match="in") TYPEMAP "";
-%typemap(argout,noblock=1,fragment= #SWIG_FromCharPtr ) TYPEMAP {
-  $1[MAX] = 0;  
-  %append_output(SWIG_FromCharPtr($1));
-}
-%enddef
-
-
-
-/*
- * %cstring_chunk_output(TYPEMAP, SIZE)
- *
- * This macro is used to return a chunk of binary string data.
- * Embedded NULLs are okay.  For example:
- *
- *     %cstring_chunk_output(Char *outx, 512);
- *     void foo(Char *outx) {
- *         memmove(outx, somedata, 512);
- *     }
- *
- */
-
-%define Name ## _chunk_output(TYPEMAP,SIZE)           
-%typemap(in,noblock=1,numinputs=0) TYPEMAP(Char temp[SIZE]) {
-  $1 = ($1_ltype) temp;
-}
-%typemap(freearg,match="in") TYPEMAP "";
-%typemap(argout,noblock=1,fragment= #SWIG_FromCharPtrAndSize) TYPEMAP {
-  %append_output(SWIG_FromCharPtrAndSize($1,SIZE));
-}
-%enddef
-
-
-
-/*
- * %cstring_bounded_mutable(TYPEMAP, SIZE)
- *
- * This macro is used to wrap a string that's going to mutate.
- *
- *     %cstring_bounded_mutable(Char *in, 512);
- *     void foo(in *x) {
- *         while (*x) {
- *            *x = toupper(*x);
- *            x++;
- *         }
- *     }
- *
- */
-
-
-%define Name ## _bounded_mutable(TYPEMAP,MAX)                              
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize) TYPEMAP 
-  (int res,Char temp[MAX+1], Char *t = 0, size_t n = 0, int alloc = 0) {  
-  res = SWIG_AsCharPtrAndSize($input, &t, &n, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "TYPEMAP", $symname, $argnum);
-  }
-  if ( n > (size_t) MAX ) n = (size_t) MAX;
-  memcpy(temp, t, sizeof(Char)*n);
-  if (alloc == SWIG_NEWOBJ) %delete_array(t);
-  temp[n - 1] = 0;                                                             
-  $1 = ($1_ltype) temp;                                                    
-}
-%typemap(freearg,match="in") TYPEMAP "";
-%typemap(argout,noblock=1,fragment=#SWIG_FromCharPtr) TYPEMAP {
-  $1[MAX] = 0;
-  %append_output(SWIG_FromCharPtr($1));
-}
-%enddef
-
-
-/*
- * %cstring_mutable(TYPEMAP [, expansion])
- *
- * This macro is used to wrap a string that will mutate in place.
- * It may change size up to a user-defined expansion. 
- *
- *     %cstring_mutable(Char *in);
- *     void foo(in *x) {
- *         while (*x) {
- *            *x = toupper(*x);
- *            x++;
- *         }
- *     }
- *
- */
-
-%define Name ## _mutable(TYPEMAP,EXP...)                  
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize) TYPEMAP (int res, Char *t = 0, size_t n = 0, int alloc = 0, size_t expansion = 0) {
-#if #EXP != ""
-  expansion += EXP;
-#endif
-  res = SWIG_AsCharPtrAndSize($input, &t, &n, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "TYPEMAP", $symname, $argnum);
-  }
-  $1 = %new_array(n+expansion, $*1_ltype);          
-  memcpy($1,t,sizeof(Char)*n);
-  if (alloc == SWIG_NEWOBJ) %delete_array(t);
-  $1[n-1] = 0;
-}
-%typemap(freearg,match="in") TYPEMAP "";
-%typemap(argout,noblock=1,fragment=#SWIG_FromCharPtr) TYPEMAP { 
-  %append_output(SWIG_FromCharPtr($1));
-  %delete_array($1);                                  
-}
-%enddef
-
-
-/*
- * %cstring_output_maxsize(TYPEMAP, SIZE)
- *
- * This macro returns data in a string of some user-defined size.
- *
- *     %cstring_output_maxsize(Char *outx, int max) {
- *     void foo(Char *outx, int max) {
- *         sprintf(outx,"blah blah\n");
- *     }
- */
-
-%define Name ## _output_maxsize(TYPEMAP, SIZE)                       
-%typemap(in,noblock=1,fragment=SWIG_AsVal_frag(size_t)) (TYPEMAP, SIZE) (int res, size_t size, Char *buff = 0) {   
-  res = SWIG_AsVal(size_t)($input, &size);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  buff= %new_array(size+1, Char);
-  $2 = %numeric_cast(size, $2_ltype);
-  $1 = %static_cast(buff, $1_ltype);
-}
-%typemap(freearg,noblock=1,match="in") (TYPEMAP,SIZE) {
-  if (buff$argnum) %delete_array(buff$argnum);
-} 
-%typemap(argout,noblock=1,fragment=#SWIG_FromCharPtr) (TYPEMAP,SIZE) { 
-  %append_output(SWIG_FromCharPtr($1));
-}
-%enddef
-
-/*
- * %cstring_output_withsize(TYPEMAP, SIZE)
- *
- * This macro is used to return Character data along with a size
- * parameter.
- *
- *     %cstring_output_withsize(Char *outx, int *max) {
- *     void foo(Char *outx, int *max) {
- *         sprintf(outx,"blah blah\n");
- *         *max = strlen(outx);  
- *     }
- */
-
-%define Name ## _output_withsize(TYPEMAP, SIZE)                        
-%typemap(in,noblock=1,fragment=SWIG_AsVal_frag(size_t)) (TYPEMAP, SIZE) (int res, size_t n, Char *buff = 0, $*2_ltype size) {    
-  res = SWIG_AsVal(size_t)($input, &n);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
-  }
-  buff= %new_array(n+1, Char);
-  $1 = %static_cast(buff, $1_ltype);
-  size = %numeric_cast(n,$*2_ltype);
-  $2 = &size;
-}								       
-%typemap(freearg,noblock=1,match="in")(TYPEMAP,SIZE) {
-  if (buff$argnum) %delete_array(buff$argnum);
-} 
-%typemap(argout,noblock=1,fragment=#SWIG_FromCharPtrAndSize) (TYPEMAP,SIZE) { 
-  %append_output(SWIG_FromCharPtrAndSize($1,*$2));
-}
-%enddef
-
-
-/*
- * %cstring_output_allocate(TYPEMAP, RELEASE)
- *
- * This macro is used to return Character data that was
- * allocated with new or malloc.
- *
- *     %cstring_output_allocate(Char **outx, free($1));
- *     void foo(Char **outx) {
- *         *outx = (Char *) malloc(512);
- *         sprintf(outx,"blah blah\n");
- *     }
- */
- 
-%define Name ## _output_allocate(TYPEMAP, RELEASE)           
-%typemap(in,noblock=1,numinputs=0) TYPEMAP($*1_ltype temp = 0) {
-  $1 = &temp;
-}
-%typemap(freearg,match="in") TYPEMAP "";
-%typemap(argout,noblock=1,fragment=#SWIG_FromCharPtr) TYPEMAP { 
-  if (*$1) {
-    %append_output(SWIG_FromCharPtr(*$1));
-    RELEASE;					  	     
-  }					  	     
-}							     
-%enddef
-
-
-/*
- * %cstring_output_allocate_size(TYPEMAP, SIZE, RELEASE)
- *
- * This macro is used to return Character data that was
- * allocated with new or malloc.
- *
- *     %cstring_output_allocate_size(Char **outx, int *sz, free($1));
- *     void foo(Char **outx, int *sz) {
- *         *outx = (Char *) malloc(512);
- *         sprintf(outx,"blah blah\n");
- *         *sz = strlen(outx);
- *     }
- */
-
-%define Name ## _output_allocate_size(TYPEMAP, SIZE, RELEASE)
-%typemap(in,noblock=1,numinputs=0) (TYPEMAP, SIZE) ($*1_ltype temp = 0, $*2_ltype tempn) {
-  $1 = &temp; $2 = &tempn;
-}
-%typemap(freearg,match="in") (TYPEMAP,SIZE) "";
-%typemap(argout,noblock=1,fragment=#SWIG_FromCharPtrAndSize)(TYPEMAP,SIZE) {   
-  if (*$1) {
-    %append_output(SWIG_FromCharPtrAndSize(*$1,*$2));
-    RELEASE;
-  }
-}
-%enddef
-
-%enddef
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/cwstring.swg b/dependencies2013/win32/swig/Lib/typemaps/cwstring.swg
deleted file mode 100644
index 933f9a3a..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/cwstring.swg
+++ /dev/null
@@ -1,10 +0,0 @@
-%include <typemaps/cstrings.swg>
-%include <typemaps/wstring.swg>
-
-%typemaps_cstring(%cwstring,
-		 wchar_t,
-		 SWIG_AsWCharPtr,
-		 SWIG_AsWCharPtrAndSize,
-		 SWIG_FromWCharPtr,
-		 SWIG_FromWCharPtrAndSize);
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/enumint.swg b/dependencies2013/win32/swig/Lib/typemaps/enumint.swg
deleted file mode 100644
index d048bb6b..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/enumint.swg
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ------------------------------------------------------------
- *  Enums mapped as integer values
- * ------------------------------------------------------------ */
-
-%apply int { enum SWIGTYPE };
-%apply const int& { const enum SWIGTYPE & };
-%apply const int& { const enum SWIGTYPE && };
-
-%typemap(in,fragment=SWIG_AsVal_frag(int),noblock=1) const enum SWIGTYPE & (int val, int ecode, $basetype temp) {  
-  ecode = SWIG_AsVal(int)($input, &val);
-  if (!SWIG_IsOK(ecode)) {
-    %argument_fail(ecode, "$type", $symname, $argnum);
-  } else {
-    temp = %static_cast(val,$basetype);
-    $1 = &temp;
-  }
-}
-
-%typemap(in,fragment=SWIG_AsVal_frag(int),noblock=1) const enum SWIGTYPE && (int val, int ecode, $basetype temp) {  
-  ecode = SWIG_AsVal(int)($input, &val);
-  if (!SWIG_IsOK(ecode)) {
-    %argument_fail(ecode, "$type", $symname, $argnum);
-  } else {
-    temp = %static_cast(val,$basetype);
-    $1 = &temp;
-  }
-}
-
-%typemap(varin,fragment=SWIG_AsVal_frag(int),noblock=1) enum SWIGTYPE {
-  if (sizeof(int) != sizeof($1)) {
-    %variable_fail(SWIG_AttributeError,"$type", "arch, read-only $name");
-  }  else {
-    int ecode = SWIG_AsVal(int)($input, %reinterpret_cast(&$1,int*));
-    if (!SWIG_IsOK(ecode)) {
-      %variable_fail(ecode, "$type", "$name");
-    }
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/exception.swg b/dependencies2013/win32/swig/Lib/typemaps/exception.swg
deleted file mode 100644
index b60a3299..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/exception.swg
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -----------------------------------------------------------------------------
- * exceptions.swg
- *
- * This SWIG library file provides language independent exception handling
- * ----------------------------------------------------------------------------- */
-
-%include <typemaps/swigmacros.swg>
-
-
-/* macros for error manipulation */
-#define %nullref_fmt()                     "invalid null reference "		   
-#define %varfail_fmt(_type,_name)          "in variable '"`_name`"' of type '"`_type`"'"
-#ifndef %argfail_fmt
-#define %argfail_fmt(_type,_name,_argn)    "in method '" `_name` "', argument " `_argn`" of type '" `_type`"'"
-#endif
-#define %outfail_fmt(_type)                "in output value of type '"_type"'"
-#ifndef	%argnullref_fmt
-#define %argnullref_fmt(_type,_name,_argn) %nullref_fmt() %argfail_fmt(_type, _name, _argn)
-#endif  
-#define %varnullref_fmt(_type,_name)       %nullref_fmt() %varfail_fmt(_type, _name)  		   
-#define %outnullref_fmt(_type)             %nullref_fmt() %outfail_fmt(_type)         
-
-/* setting an error */
-#define %error(code,msg...)               SWIG_Error(code, msg)
-#define %type_error(msg...)               SWIG_Error(SWIG_TypeError,  msg)
-
-
-
-%insert("runtime") {
-
-%define_as(SWIG_exception_fail(code, msg), %block(%error(code, msg); SWIG_fail))
-
-%define_as(SWIG_contract_assert(expr, msg), if (!(expr)) { %error(SWIG_RuntimeError, msg); SWIG_fail; } else)
-
-}
-
-#ifdef __cplusplus
-/*
-  You can use the SWIG_CATCH_STDEXCEPT macro with the %exception
-  directive as follows:
-
-  %exception {
-    try {
-      $action
-    }
-    catch (my_except& e) {
-      ...
-    }
-    SWIG_CATCH_STDEXCEPT // catch std::exception
-    catch (...) {
-     SWIG_exception_fail(SWIG_UnknownError, "Unknown exception");
-    }
-  }
-*/
-
-%fragment("<stdexcept>");
-
-%define SWIG_CATCH_STDEXCEPT
-  /* catching std::exception  */
-  catch (std::invalid_argument& e) {
-    SWIG_exception_fail(SWIG_ValueError, e.what() );
-  } catch (std::domain_error& e) {
-    SWIG_exception_fail(SWIG_ValueError, e.what() );
-  } catch (std::overflow_error& e) {
-    SWIG_exception_fail(SWIG_OverflowError, e.what() );
-  } catch (std::out_of_range& e) {
-    SWIG_exception_fail(SWIG_IndexError, e.what() );
-  } catch (std::length_error& e) {
-    SWIG_exception_fail(SWIG_IndexError, e.what() );
-  } catch (std::runtime_error& e) {
-    SWIG_exception_fail(SWIG_RuntimeError, e.what() );
-  } catch (std::exception& e) {
-    SWIG_exception_fail(SWIG_SystemError, e.what() );
-  }
-%enddef
-%define SWIG_CATCH_UNKNOWN
-  catch (std::exception& e) {
-    SWIG_exception_fail(SWIG_SystemError, e.what() );
-  }
-  catch (...) {
-    SWIG_exception_fail(SWIG_UnknownError, "unknown exception");
-  }
-%enddef
-
-
-#endif /* __cplusplus */
diff --git a/dependencies2013/win32/swig/Lib/typemaps/factory.swg b/dependencies2013/win32/swig/Lib/typemaps/factory.swg
deleted file mode 100644
index bccceb1d..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/factory.swg
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-  Implement a more natural wrap for factory methods, for example, if
-  you have:
-
-  ----  geometry.h --------
-       struct Geometry {                          
-         enum GeomType{			     
-           POINT,				     
-           CIRCLE				     
-         };					     
-         					     
-         virtual ~Geometry() {}    		     
-         virtual int draw() = 0;
-	 
-	 //
-	 // Factory method for all the Geometry objects
-	 //
-         static Geometry *create(GeomType i);     
-       };					     
-       					     
-       struct Point : Geometry  {		     
-         int draw() { return 1; }		     
-         double width() { return 1.0; }    	     
-       };					     
-       					     
-       struct Circle : Geometry  {		     
-         int draw() { return 2; }		     
-         double radius() { return 1.5; }          
-       }; 					     
-       
-       //
-       // Factory method for all the Geometry objects
-       //
-       Geometry *Geometry::create(GeomType type) {
-         switch (type) {			     
-         case POINT: return new Point();	     
-         case CIRCLE: return new Circle(); 	     
-         default: return 0;			     
-         }					     
-       }					    
-  ----  geometry.h --------
-
-
-  You can use the %factory with the Geometry::create method as follows:
-
-    %newobject Geometry::create;
-    %factory(Geometry *Geometry::create, Point, Circle);
-    %include "geometry.h"
-
-  and Geometry::create will return a 'Point' or 'Circle' instance
-  instead of the plain 'Geometry' type. For example, in python:
-
-    circle = Geometry.create(Geometry.CIRCLE)
-    r = circle.radius()
-
-  where circle is a Circle proxy instance.
-
-  NOTES: remember to fully qualify all the type names and don't
-  use %factory inside a namespace declaration, ie, instead of
-  
-     namespace Foo {
-       %factory(Geometry *Geometry::create, Point, Circle);
-     }
-
-  use
-
-     %factory(Foo::Geometry *Foo::Geometry::create, Foo::Point,  Foo::Circle);   
-
-     
-*/
-
-%define %_factory_dispatch(Type) 
-if (!dcast) {
-  Type *dobj = dynamic_cast<Type *>($1);
-  if (dobj) {
-    dcast = 1;
-    %set_output(SWIG_NewPointerObj(%as_voidptr(dobj),$descriptor(Type *), $owner | %newpointer_flags));
-  }   
-}%enddef
-
-%define %factory(Method,Types...)
-%typemap(out) Method {
-  int dcast = 0;
-  %formacro(%_factory_dispatch, Types)
-  if (!dcast) {
-    %set_output(SWIG_NewPointerObj(%as_voidptr($1),$descriptor, $owner | %newpointer_flags));
-  }
-}%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/fragments.swg b/dependencies2013/win32/swig/Lib/typemaps/fragments.swg
deleted file mode 100644
index 3f33ca98..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/fragments.swg
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
-  Fragments
-  =========
-  See the "Typemap fragments" section in the documentation for understanding
-  fragments. Below is some info on how fragments and automatic type
-  specialization is used.
-
-  Macros that make the automatic generation of typemaps easier are provided.
-
-  Consider the following code:
-
-      %fragment(SWIG_From_frag(bool), "header") {     
-      static PyObject*		      
-      SWIG_From_dec(bool)(bool value)	       
-      {					       
-        PyObject *obj = value ? Py_True : Py_False;  
-        Py_INCREF(obj);			       
-        return obj;				       
-      }					       
-      }					       
-      					 
-      %typemap(out, fragment=SWIG_From_frag(bool)) bool {
-        $result = SWIG_From(bool)($1));
-      }
-
-  Here the macros
-
-      SWIG_From_frag  => fragment 
-      SWIG_From_dec   => declaration 
-      SWIG_From       => call 
-      
-  allow you to define/include a fragment, and declare and call the
-  'from-bool' method as needed. In the simpler case, these macros 
-  just return something like
-
-      SWIG_From_frag(bool)  => "SWIG_From_bool"
-      SWIG_From_dec(bool)   =>  SWIG_From_bool
-      SWIG_From(bool)       =>  SWIG_From_bool
-
-  But they are specialized for the different languages requirements,
-  such as perl or tcl that requires passing the interpreter pointer,
-  and also they can manage C++ ugly types, for example:
-  
-      SWIG_From_frag(std::complex<double>)  => "SWIG_From_std_complex_Sl_double_Sg_"
-      SWIG_From_dec(std::complex<double>)   =>  SWIG_From_std_complex_Sl_double_Sg_
-      SWIG_From(std::complex<double>)       =>  SWIG_From_std_complex_Sl_double_Sg_
-
-
-  Hence, to declare methods to use with typemaps, always use the
-  SWIG_From* macros. In the same way, the SWIG_AsVal* and SWIG_AsPtr*
-  set of macros are provided.
-    
-*/
-
-
-/* -----------------------------------------------------------------------------
- * Define the basic macros to 'normalize' the type fragments
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_AS_DECL_ARGS
-#define SWIG_AS_DECL_ARGS
-#endif
-
-#ifndef SWIG_FROM_DECL_ARGS
-#define SWIG_FROM_DECL_ARGS
-#endif
-
-#ifndef SWIG_AS_CALL_ARGS
-#define SWIG_AS_CALL_ARGS
-#endif
-
-#ifndef SWIG_FROM_CALL_ARGS
-#define SWIG_FROM_CALL_ARGS
-#endif
-
-#define %fragment_name(Name, Type...)     %string_name(Name) "_" {Type}
-
-#define SWIG_Traits_frag(Type...) %fragment_name(Traits, Type) 
-#define SWIG_AsPtr_frag(Type...)  %fragment_name(AsPtr, Type)	 
-#define SWIG_AsVal_frag(Type...)  %fragment_name(AsVal, Type)	 
-#define SWIG_From_frag(Type...)   %fragment_name(From, Type)	 
-
-#define SWIG_AsVal_name(Type...)  %symbol_name(AsVal, Type) 
-#define SWIG_AsPtr_name(Type...)  %symbol_name(AsPtr, Type) 
-#define SWIG_From_name(Type...)   %symbol_name(From, Type)  
-
-#define SWIG_AsVal_dec(Type...)   SWIG_AsVal_name(Type) SWIG_AS_DECL_ARGS
-#define SWIG_AsPtr_dec(Type...)   SWIG_AsPtr_name(Type) SWIG_AS_DECL_ARGS
-#define SWIG_From_dec(Type...)    SWIG_From_name(Type)  SWIG_FROM_DECL_ARGS 
-
-#define SWIG_AsVal(Type...)       SWIG_AsVal_name(Type) SWIG_AS_CALL_ARGS 
-#define SWIG_AsPtr(Type...)  	  SWIG_AsPtr_name(Type) SWIG_AS_CALL_ARGS 	 
-#define SWIG_From(Type...)   	  SWIG_From_name(Type)  SWIG_FROM_CALL_ARGS 
-
-/* ------------------------------------------------------------
- * common fragments 
- * ------------------------------------------------------------ */
-
-/* Default compiler options for gcc allow long_long but not LLONG_MAX. 
- * Define SWIG_NO_LLONG_MAX if this added limits support is not wanted. */
-%fragment("<limits.h>","header") %{
-#include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-#   define LLONG_MAX __LONG_LONG_MAX__
-#   define LLONG_MIN (-LLONG_MAX - 1LL)
-#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
-#endif
-%}
-
-%fragment("<math.h>","header") %{
-#include <math.h>
-%}
-
-%fragment("<wchar.h>","header") %{
-#include <wchar.h>
-#include <limits.h>
-#ifndef WCHAR_MIN
-#  define WCHAR_MIN 0
-#endif
-#ifndef WCHAR_MAX
-#  define WCHAR_MAX 65535
-#endif
-%}
-
-%fragment("<float.h>","header") %{
-#include <float.h>
-%}
-
-%fragment("<stdio.h>","header") %{
-#include <stdio.h>
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-# ifndef snprintf
-#  define snprintf _snprintf
-# endif
-#endif
-%}
-
-%fragment("<stdlib.h>","header") %{
-#include <stdlib.h>
-#ifdef _MSC_VER
-# ifndef strtoull
-#  define strtoull _strtoui64
-# endif
-# ifndef strtoll
-#  define strtoll _strtoi64
-# endif
-#endif
-%}
-
-%fragment("<stddef.h>", "header") %{
-#include <stddef.h>
-%}
-
-%fragment("<string>", "header") %{
-#include <string>
-%}
-
-%fragment("<stdexcept>", "header") %{
-#include <stdexcept>
-%}
-
-%fragment("<algorithm>", "header") %{
-#include <algorithm>
-%}
-
-%fragment("SWIG_isfinite","header",fragment="<math.h>,<float.h>") %{
-/* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */
-#ifndef SWIG_isfinite
-/* isfinite() is a macro for C99 */
-# if defined(isfinite)
-#  define SWIG_isfinite(X) (isfinite(X))
-# elif defined __cplusplus && __cplusplus >= 201103L
-/* Use a template so that this works whether isfinite() is std::isfinite() or
- * in the global namespace.  The reality seems to vary between compiler
- * versions.
- *
- * Make sure namespace std exists to avoid compiler warnings.
- *
- * extern "C++" is required as this fragment can end up inside an extern "C" { } block
- */
-namespace std { }
-extern "C++" template<typename T>
-inline int SWIG_isfinite_func(T x) {
-  using namespace std;
-  return isfinite(x);
-}
-#  define SWIG_isfinite(X) (SWIG_isfinite_func(X))
-# elif defined(_MSC_VER)
-#  define SWIG_isfinite(X) (_finite(X))
-# elif defined(__sun) && defined(__SVR4)
-#  include <ieeefp.h>
-#  define SWIG_isfinite(X) (finite(X))
-# endif
-#endif
-%}
-
-%fragment("SWIG_Float_Overflow_Check","header",fragment="<float.h>,SWIG_isfinite") %{
-/* Accept infinite as a valid float value unless we are unable to check if a value is finite */
-#ifdef SWIG_isfinite
-# define SWIG_Float_Overflow_Check(X) ((X < -FLT_MAX || X > FLT_MAX) && SWIG_isfinite(X))
-#else
-# define SWIG_Float_Overflow_Check(X) ((X < -FLT_MAX || X > FLT_MAX))
-#endif
-%}
-
-/* -----------------------------------------------------------------------------
- * special macros for fragments
- * ----------------------------------------------------------------------------- */
-
-/* Macros to derive numeric types */
-
-%define %numeric_type_from(Type, Base)
-%fragment(SWIG_From_frag(Type),"header",
-	  fragment=SWIG_From_frag(Base)) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_From_dec(Type)(Type value)
-{    
-  return SWIG_From(Base)(value);
-}
-}
-%enddef
-
-%define %numeric_type_asval(Type, Base, Frag, OverflowCond)
-%fragment(SWIG_AsVal_frag(Type),"header",
-	  fragment=Frag,
-	  fragment=SWIG_AsVal_frag(Base)) {
-SWIGINTERN int
-SWIG_AsVal_dec(Type)(SWIG_Object obj, Type *val)
-{
-  Base v;
-  int res = SWIG_AsVal(Base)(obj, &v);
-  if (SWIG_IsOK(res)) {
-    if (OverflowCond) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = %numeric_cast(v, Type);
-    }
-  }  
-  return res;
-}
-}
-%enddef
-
-#define %numeric_signed_type_asval(Type, Base, Frag, Min, Max) \
-%numeric_type_asval(Type, Base, Frag, (v < Min || v > Max))
-
-#define %numeric_unsigned_type_asval(Type, Base, Frag, Max) \
-%numeric_type_asval(Type, Base, Frag, (v > Max))
-
-
-/* Macro for 'signed long' derived types */
-
-%define %numeric_slong(Type, Frag, Min, Max)
-%numeric_type_from(Type, long)
-%numeric_signed_type_asval(Type, long, Frag , Min, Max)
-%enddef
-
-/* Macro for 'unsigned long' derived types */
-
-%define %numeric_ulong(Type, Frag, Max)
-%numeric_type_from(Type, unsigned long)
-%numeric_unsigned_type_asval(Type, unsigned long, Frag, Max)
-%enddef
-
-
-/* Macro for floating point derived types (original macro) */
-
-%define %numeric_double(Type, Frag, Min, Max)
-%numeric_type_from(Type, double)
-%numeric_signed_type_asval(Type, double, Frag , Min, Max)
-%enddef
-
-/* Macro for floating point derived types */
-
-%define %numeric_float(Type, Frag, OverflowCond)
-%numeric_type_from(Type, double)
-%numeric_type_asval(Type, double, Frag, OverflowCond)
-%enddef
-
-
-/* Macros for missing fragments */
-
-%define %ensure_fragment(Fragment)
-%fragment(`Fragment`,"header") {
-%#error "SWIG language implementation must provide the Fragment fragment"
-}
-%enddef
-
-%define %ensure_type_fragments(Type)
-%fragment(SWIG_From_frag(Type),"header") {
-%#error "SWIG language implementation must provide a SWIG_From_frag(Type) fragment"
-}
-%fragment(SWIG_AsVal_frag(Type),"header") {
-%#error "SWIG language implementation must provide a SWIG_AsVal_frag(Type) fragment"
-}
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/implicit.swg b/dependencies2013/win32/swig/Lib/typemaps/implicit.swg
deleted file mode 100644
index 2fc3108e..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/implicit.swg
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-  The %implicit macro allows a SwigType (Class) to be accepted
-  as an input parameter and use its implicit constructors when needed.
-
-  For example:
-
-
-  %implicit(A, int, double, B);
-
-  %inline 
-  {
-    struct B { };  
-    struct A
-    {
-      int ii;
-      A(int i) { ii = 1; }
-      A(double d) { ii = 2; }
-      A(const B& b) { ii = 3; }
-    };
-  
-    int get(A a) { return a.ii; }
-  }
-
-  Here, you can call 'get' as 
-
-    get(1)    ==> get(A(1))
-    get(2.0)  ==> get(A(2.0))
-    get(B())  ==> get(A(B()))
-
-   and swig will construct an 'A' temporal variable using the
-   corresponding implicit constructor.
-
-
-  The plain implicit macro takes care of simple type list. If it doesn't
-  work because you are passing template types with commas, then use
-  the %implicit_{1,2,3} versions and/or the %arg macro.
-
-*/
-
-%define %implicit_type(Type...)
-%traits_swigtype(Type);
-%enddef
-
-%define %implicit_frag(Type...) ,fragment=SWIG_Traits_frag(Type) %enddef
-
-%define %implicit_code(Type...)
-{
-  Type _v;
-  int res = swig::asval<Type >(obj, &_v);  
-  if (SWIG_IsOK(res)) {
-    if (val) *val = new value_type(static_cast<const Type& >(_v));
-    return SWIG_AddNewMask(res);
-  }
-}
-%enddef
-
-/* implicit */
-
-%define %implicit(Type, ...)
-
-%formacro_1(%implicit_type,__VA_ARGS__);
-
-%fragment(SWIG_Traits_frag(Type),"header",
-	  fragment="StdTraits"
-          %formacro_1(%implicit_frag,__VA_ARGS__)) %{
-namespace swig {
-  template <>  struct traits<Type > {   
-    typedef pointer_category category;
-    static const char* type_name() { return "Type"; }
-  };
-   
-  template <> struct traits_asptr< Type > {
-  typedef Type value_type;
-  static int asptr(SWIG_Object obj, value_type **val) { 
-    Type *vptr;
-    static swig_type_info* descriptor = SWIG_TypeQuery("Type *");
-    int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&vptr, descriptor, 0) : SWIG_ERROR;
-    if (SWIG_IsOK(res)) {
-      if (val) *val = vptr;
-      return res;
-    } else {
-      %formacro_1(%implicit_code,__VA_ARGS__)
-    }
-    return SWIG_TypeError;
-  }
- };
-}
-%}
-
-%typemap_traits_ptr(%checkcode(POINTER),Type);
-%enddef
-
-/* implicit_1 */
-
-
-%define %implicit_1(Type, Imp1)
-%traits_swigtype(Imp1);
-
-%fragment(SWIG_Traits_frag(Type),"header",
-	  fragment="StdTraits",
-	  fragment=SWIG_Traits_frag(Imp1)) %{
-namespace swig {
-  template <>  struct traits< Type > {   
-    typedef pointer_category category;
-    static const char* type_name() { return "Type"; }
-  };
-   
-  template <> struct traits_asptr< Type > {   
-  typedef Type value_type;
-  static int asptr(SWIG_Object obj, value_type **val) { 
-    Type *vptr;
-    static swig_type_info* descriptor = SWIG_TypeQuery("Type *");
-    int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&vptr, descriptor, 0) : SWIG_ERROR;
-    if (SWIG_IsOK(res)) {
-      if (val) *val = vptr;
-      return res;
-    } else {
-      %implicit_code(Imp1);
-    }
-    return SWIG_TypeError;
-  }
- };
-}
-%}
-
-%typemap_traits_ptr(%checkcode(POINTER),Type);
-
-%enddef
-
-/* implicit_2 */
-
-%define %implicit_2(Type, Imp1, Imp2)
-%traits_swigtype(Imp1);
-%traits_swigtype(Imp2);
-
-%fragment(SWIG_Traits_frag(Type),"header",
-	  fragment="StdTraits",
-	  fragment=SWIG_Traits_frag(Imp1),
-	  fragment=SWIG_Traits_frag(Imp2)) %{
-namespace swig {
-  template <>  struct traits< Type > {   
-    typedef pointer_category category;
-    static const char* type_name() { return "Type"; }
-  };
-
-  template <> struct traits_asptr< Type > {   
-  typedef Type value_type;
-  static int asptr(SWIG_Object obj, value_type **val) { 
-    Type *vptr;
-    static swig_type_info* descriptor = SWIG_TypeQuery("Type *");
-    int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&vptr, descriptor, 0) : SWIG_ERROR;
-    if (SWIG_IsOK(res)) {
-      if (val) *val = vptr;
-      return SWIG_OLDOBJ;
-    } else {
-      %implicit_code(Imp1);
-      %implicit_code(Imp2);
-    }
-    return SWIG_TypeError;
-  }
- };
-}
-%}
-
-%typemap_traits_ptr(%checkcode(POINTER),Type);
-%enddef
-
-
-/* implicit_3 */
-
-%define %implicit_3(Type, Imp1, Imp2, Imp3)
-%traits_swigtype(Imp1);
-%traits_swigtype(Imp2);
-%traits_swigtype(Imp3);
-
-%fragment(SWIG_Traits_frag(Type),"header",
-	  fragment="StdTraits",
-	  fragment=SWIG_Traits_frag(Imp1),
-	  fragment=SWIG_Traits_frag(Imp2),
-	  fragment=SWIG_Traits_frag(Imp3)) %{
-namespace swig {
-  template <>  struct traits< Type > {   
-    typedef pointer_category category;
-    static const char* type_name() { return "Type"; }
-  };
-
-  template <> struct traits_asptr< Type > {   
-    typedef Type value_type;
-    static int asptr(SWIG_Object obj, value_type **val) { 
-    Type *vptr;
-    static swig_type_info* descriptor = SWIG_TypeQuery("Type *");
-    int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&vptr, descriptor, 0) : SWIG_ERROR;
-    if (SWIG_IsOK(res)) {
-      if (val) *val = vptr;
-      return res;
-    } else {
-      %implicit_code(Imp1);
-      %implicit_code(Imp2);
-      %implicit_code(Imp3);
-    }
-    return SWIG_TypeError;
-  }
- };
-}
-%}
-
-%typemap_traits_ptr(%checkcode(POINTER),Type);
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/inoutlist.swg b/dependencies2013/win32/swig/Lib/typemaps/inoutlist.swg
deleted file mode 100644
index 23fda85f..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/inoutlist.swg
+++ /dev/null
@@ -1,296 +0,0 @@
-/*  ------------------------------------------------------------
- *
- * Define the IN/OUTPUT typemaps assuming the output parameters are
- * returned in a list, i.e., they are not directly modified.
- *
- * The user should provide the %append_output(result, obj) method,
- * via a macro, which append a particular object to the result.
- *
- *
- * In Tcl, for example, the file is used as:
- *
- *   #define %append_output(obj) Tcl_ListObjAppendElement(interp,Tcl_GetObjResult(interp),obj);
- *   %include <typemaps/inoutlist.swg>
- *
- * while in Python it is used as:
- *
- *   #define %append_output(obj) $result = SWIG_Python_AppendResult($result, obj)
- *   %include <typemaps/inoutlist.swg>
- *
- * where the method SWIG_Python_AppendResult is defined inside the
- * %append_output fragment.
- *
- * If you forget to define %append_output, this file will generate
- * an error.
- *
- * ------------------------------------------------------------ */
-
-
-//
-// Uncomment the following definition if you don't want the in/out
-// typemaps by default, ie, you prefer to use typemaps.i.
-//
-//#define SWIG_INOUT_NODEF
-
-//
-// Use the following definition to enable the INPUT parameters to
-// accept both 'by value' and 'pointer' objects.
-//
-#define SWIG_INPUT_ACCEPT_PTRS
-
-// ------------------------------------------------------------------------
-// Pointer handling
-//
-// These mappings provide support for input/output arguments and common
-// uses for C/C++ pointers.
-// ------------------------------------------------------------------------
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/* 
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-#if defined(SWIG_INPUT_ACCEPT_PTRS)
-#define %check_input_ptr(input,arg,desc,disown) (SWIG_IsOK((res = SWIG_ConvertPtr(input,%as_voidptrptr(arg),desc,disown))))
-#else
-#define %check_input_ptr(input,arg,desc,disown) (SWIG_IsOK((res = SWIG_ERROR)))
-#endif
-
-%define %_value_input_typemap(code, asval_meth, asval_frag, Type)
-  %typemap(in,noblock=1,fragment=asval_frag) Type *INPUT ($*ltype temp, int res = 0) {
-    if (!%check_input_ptr($input,&$1,$descriptor,$disown)) {
-      Type val; 
-      int ecode = asval_meth($input, &val);
-      if (!SWIG_IsOK(ecode)) { 
-	%argument_fail(ecode, "$*ltype",$symname, $argnum);
-      }
-      temp = %static_cast(val, $*ltype);
-      $1 = &temp;
-      res = SWIG_AddTmpMask(ecode);
-    }
-  }
-  %typemap(in,noblock=1,fragment=asval_frag) Type &INPUT($*ltype temp, int res = 0) {
-    if (!%check_input_ptr($input,&$1,$descriptor,$disown)) {
-      Type val;
-      int ecode = asval_meth($input, &val);
-      if (!SWIG_IsOK(ecode)) { 
-	%argument_fail(ecode, "$*ltype",$symname, $argnum);
-      }
-      temp = %static_cast(val, $*ltype);
-      $1 = &temp;
-      res = SWIG_AddTmpMask(ecode);
-    }
-  }
-  %typemap(freearg,noblock=1,match="in") Type *INPUT, Type &INPUT {
-    if (SWIG_IsNewObj(res$argnum)) %delete($1);
-  }
-  %typemap(typecheck,noblock=1,precedence=code,fragment=asval_frag) Type *INPUT, Type &INPUT {
-    void *ptr = 0;
-    int res = asval_meth($input, 0);
-    $1 = SWIG_CheckState(res);
-    if (!$1) {
-      $1 = %check_input_ptr($input,&ptr,$1_descriptor,0);
-    }
-  }
-%enddef
-
-%define %_ptr_input_typemap(code,asptr_meth,asptr_frag,Type)
-  %typemap(in,noblock=1,fragment=asptr_frag) Type *INPUT(int res = 0) {  
-    res = asptr_meth($input, &$1);
-    if (!SWIG_IsOK(res)) {
-      %argument_fail(res,"$type",$symname, $argnum);
-    }
-    res = SWIG_AddTmpMask(res);
-  }
-  %typemap(in,noblock=1,fragment=asptr_frag) Type &INPUT(int res = 0) {  
-    res = asptr_meth($input, &$1);
-    if (!SWIG_IsOK(res)) { 
-      %argument_fail(res,"$type",$symname, $argnum);
-    }     
-    if (!$1) { 
-      %argument_nullref("$type",$symname, $argnum);
-    }
-    res = SWIG_AddTmpMask(res);
-  }
-  %typemap(freearg,noblock=1,match="in") Type *INPUT, Type &INPUT {
-    if (SWIG_IsNewObj(res$argnum)) %delete($1);
-  }
-  %typemap(typecheck,noblock=1,precedence=code,fragment=asptr_frag) Type *INPUT, Type &INPUT {
-    int res = asptr_meth($input, (Type**)0);
-    $1 = SWIG_CheckState(res);
-  }
-%enddef
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/* 
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a list.
-
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters):
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The output of the function would be a list containing both output
-values.
-
-*/
-
-%define %_value_output_typemap(from_meth, from_frag, Type)
- %typemap(in,numinputs=0,noblock=1) 
-   Type *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ), 
-   Type &OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ) {
-   $1 = &temp;
- }
- %typemap(argout,noblock=1,fragment=from_frag) Type *OUTPUT, Type &OUTPUT {
-   if (SWIG_IsTmpObj(res$argnum)) {
-     %append_output(from_meth((*$1)));
-   } else {
-     int new_flags = SWIG_IsNewObj(res$argnum) ? (SWIG_POINTER_OWN | %newpointer_flags) : %newpointer_flags;
-     %append_output(SWIG_NewPointerObj((void*)($1), $1_descriptor, new_flags));
-   }
- }
-%enddef
-
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a list.  
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value.
-Rather, the modified input value shows up as the return value of the
-function.  Thus, to apply this function to a variable you might do
-this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-%define %_value_inout_typemap(Type)
- %typemap(in) Type *INOUT = Type *INPUT;
- %typemap(in) Type &INOUT = Type &INPUT;
- %typemap(typecheck) Type *INOUT = Type *INPUT;
- %typemap(typecheck) Type &INOUT = Type &INPUT;
- %typemap(argout) Type *INOUT = Type *OUTPUT;
- %typemap(argout) Type &INOUT = Type &OUTPUT;
-%enddef
-
-
-%define %_ptr_inout_typemap(Type)
- %_value_inout_typemap(%arg(Type))
- %typemap(typecheck) Type *INOUT = Type *INPUT;
- %typemap(typecheck) Type &INOUT = Type &INPUT;
- %typemap(freearg) Type *INOUT = Type *INPUT;
- %typemap(freearg) Type &INOUT = Type &INPUT;
-%enddef
-
-#ifndef SWIG_INOUT_NODEF
-
-%define %value_input_typemap(code,asval_meth, asval_frag, Type...)
-  %_value_input_typemap(%arg(code),%arg(asval_meth),%arg(asval_frag),%arg(Type))
-%enddef
-
-%define %ptr_input_typemap(code,asval_meth,asval_frag,Type...)		
-  %_ptr_input_typemap(%arg(code),%arg(asval_meth),%arg(asval_frag),%arg(Type))
-%enddef
-
-%define %value_output_typemap(from_meth,from_frag,Type...)		
-  %_value_output_typemap(%arg(from_meth),%arg(from_frag),%arg(Type))
-%enddef
-
-#define %value_inout_typemap(Type...) %_value_inout_typemap(%arg(Type))
-#define %ptr_inout_typemap(Type...) %_ptr_inout_typemap(%arg(Type))
-
-#else /* You need to include typemaps.i */
-
-
-#define %value_output_typemap(Type...)
-#define %value_input_typemap(Type...)
-#define %value_inout_typemap(Type...)
-#define %ptr_input_typemap(Type...)
-#define %ptr_inout_typemap(Type...)
-
-#endif /* SWIG_INOUT_DEFAULT */
-
-/*----------------------------------------------------------------------
-  Front ends.
-  
-  use the following macros to define your own IN/OUTPUT/INOUT typemaps
-  
-  ------------------------------------------------------------------------*/
-%define %typemaps_inout(Code, AsValMeth, FromMeth, AsValFrag, FromFrag, Type...)
-  %_value_input_typemap(%arg(Code), %arg(AsValMeth), 
-			    %arg(AsValFrag), %arg(Type));
-  %_value_output_typemap(%arg(FromMeth), %arg(FromFrag), %arg(Type));
-  %_value_inout_typemap(%arg(Type));
-%enddef
-
-%define %typemaps_inoutn(Code,Type...)
-  %typemaps_inout(%arg(Code),
-		 %arg(SWIG_AsVal(Type)), 
-		 %arg(SWIG_From(Type)), 
-		 %arg(SWIG_AsVal_frag(Type)), 
-		 %arg(SWIG_From_frag(Type)), 
-		 %arg(Type));
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/misctypes.swg b/dependencies2013/win32/swig/Lib/typemaps/misctypes.swg
deleted file mode 100644
index 09c81d74..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/misctypes.swg
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/* ------------------------------------------------------------
- * --- ANSI/Posix C/C++ types ---
- * ------------------------------------------------------------ */
-
-
-#ifdef __cplusplus
-
-%apply size_t { std::size_t };
-%apply const size_t& { const std::size_t& };
-
-%apply ptrdiff_t { std::ptrdiff_t };
-%apply const ptrdiff_t& { const std::ptrdiff_t& };
-
-#ifndef SWIG_INOUT_NODEF
-%apply size_t& { std::size_t& };
-%apply ptrdiff_t& { std::ptrdiff_t& };
-#endif
-
-#endif
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/primtypes.swg b/dependencies2013/win32/swig/Lib/typemaps/primtypes.swg
deleted file mode 100644
index dd80eb77..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/primtypes.swg
+++ /dev/null
@@ -1,367 +0,0 @@
-/* ------------------------------------------------------------
- * Primitive type fragments and macros 
- * ------------------------------------------------------------ */
-
-/*
-  This file provide fragments and macros for the C/C++ primitive types. 
-
-  The file defines default fragments for the following types:
-
-    bool
-    signed char
-    unsigned char
-    signed wchar_t     // in C++
-    unsigned wchar_t   // in C++
-    short
-    unsigned short
-    int
-    unsigned int
-    float
-    size_t
-    ptrdiff_t
-
-  which can always be redefined in the swig target language if needed.
-  
-  The fragments for the following types, however, always need to be
-  defined in the target language:
-
-    long
-    unsigned long
-    long long
-    unsigned long long
-    double
- 
-  If they are not provided, an #error directive will appear in the
-  wrapped code.
-
-  --------------------------------------------------------------------
-  
-  This file provides the macro
-
-    %typemaps_primitive(CheckCode, Type)
-
-  which generates the typemaps for a primitive type with a given
-  checkcode. It is assumed that the primitive type is 'normalized' and
-  the corresponding SWIG_AsVal(Type) and SWIG_From(Type) methods are
-  provided via fragments.
-  
-   
-  The following auxiliary macros (explained with bash pseudo code) are
-  also defined:
-
-    %apply_ctypes(Macro)
-      for i in C Type
-      do
-        Macro($i)
-      done
-
-    %apply_cpptypes(Macro)
-      for i in C++ Type
-      do
-        Macro($i)
-      done
-
-    %apply_ctypes_2(Macro2)
-       for i in C Type
-       do
-         for j in C Type
-         do
-            Macro_2($i, $j)
-         done
-       done
-
-    %apply_cpptypes_2(Macro2)
-       for i in C++ Type
-       do
-         for j in C++ Type
-         do
-            Macro_2($i, $j)
-         done
-       done
-
-    %apply_checkctypes(Macro2)
-       for i in Check Type
-       do
-         Macro2(%checkcode($i), $i)
-       done
-
-*/
-
-
-/* ------------------------------------------------------------
- * Primitive type fragments 
- * ------------------------------------------------------------ */
-/* boolean */
-
-%fragment(SWIG_From_frag(bool),"header",fragment=SWIG_From_frag(long)) {
-SWIGINTERN SWIG_Object
-SWIG_From_dec(bool)(bool value)
-{    
-  return SWIG_From(long)(value ? 1 : 0);
-}
-}
-
-%fragment(SWIG_AsVal_frag(bool),"header",fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(bool)(SWIG_Object obj, bool *val)
-{
-  long v;
-  int res = SWIG_AsVal(long)(obj, val ? &v : 0);
-  if (SWIG_IsOK(res)) {    
-    if (val) *val = v ? true : false;
-    return res;
-  }  
-  return SWIG_TypeError;
-}
-}
-
-/* signed/unsigned char */
-
-%numeric_slong(signed char,     "<limits.h>", SCHAR_MIN, SCHAR_MAX)
-%numeric_ulong(unsigned char,   "<limits.h>", UCHAR_MAX)
-
-/* short/unsigned short */
-
-%numeric_slong(short,           "<limits.h>", SHRT_MIN, SHRT_MAX)
-%numeric_ulong(unsigned short,  "<limits.h>", USHRT_MAX)
-
-/* int/unsigned int */
-
-%numeric_slong(int,             "<limits.h>", INT_MIN, INT_MAX)
-%numeric_ulong(unsigned int,    "<limits.h>", UINT_MAX)
-
-/* signed/unsigned wchar_t */
-
-#ifdef __cplusplus
-%numeric_slong(signed wchar_t,   "<wchar.h>", WCHAR_MIN, WCHAR_MAX)
-%numeric_ulong(unsigned wchar_t, "<wchar.h>", UWCHAR_MAX)
-#endif
-
-/* float */
-
-%numeric_float(float,           "SWIG_Float_Overflow_Check", SWIG_Float_Overflow_Check(v))
-
-/* long/unsigned long */
-
-%ensure_type_fragments(long)
-%ensure_type_fragments(unsigned long)
-
-/* long long/unsigned long long */
-
-%fragment("SWIG_LongLongAvailable","header", fragment="<limits.h>") %{
-#if defined(LLONG_MAX) && !defined(SWIG_LONG_LONG_AVAILABLE)
-#  define SWIG_LONG_LONG_AVAILABLE
-#endif
-%}
-
-%ensure_type_fragments(long long)
-%ensure_type_fragments(unsigned long long)
-
-/* double */
-
-%ensure_type_fragments(double)
-
-/* size_t */
-
-%fragment(SWIG_From_frag(size_t),"header",fragment=SWIG_From_frag(unsigned long),fragment=SWIG_From_frag(unsigned long long)) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_From_dec(size_t)(size_t value)
-{    
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  if (sizeof(size_t) <= sizeof(unsigned long)) {
-%#endif
-    return SWIG_From(unsigned long)(%numeric_cast(value, unsigned long));
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  } else {
-    /* assume sizeof(size_t) <= sizeof(unsigned long long) */
-    return SWIG_From(unsigned long long)(%numeric_cast(value, unsigned long long));
-  }
-%#endif
-}
-}
-
-%fragment(SWIG_AsVal_frag(size_t),"header",fragment=SWIG_AsVal_frag(unsigned long),fragment=SWIG_AsVal_frag(unsigned long long)) {
-SWIGINTERNINLINE int
-SWIG_AsVal_dec(size_t)(SWIG_Object obj, size_t *val)
-{
-  int res = SWIG_TypeError;
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  if (sizeof(size_t) <= sizeof(unsigned long)) {
-%#endif
-    unsigned long v;
-    res = SWIG_AsVal(unsigned long)(obj, val ? &v : 0);
-    if (SWIG_IsOK(res) && val) *val = %numeric_cast(v, size_t);
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  } else if (sizeof(size_t) <= sizeof(unsigned long long)) {
-    unsigned long long v;
-    res = SWIG_AsVal(unsigned long long)(obj, val ? &v : 0);
-    if (SWIG_IsOK(res) && val) *val = %numeric_cast(v, size_t);
-  }
-%#endif
-  return res;
-}
-}
-
-/* ptrdiff_t */
-
-%fragment(SWIG_From_frag(ptrdiff_t),"header",fragment=SWIG_From_frag(long),fragment=SWIG_From_frag(long long)) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_From_dec(ptrdiff_t)(ptrdiff_t value)
-{    
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  if (sizeof(ptrdiff_t) <= sizeof(long)) {
-%#endif
-    return SWIG_From(long)(%numeric_cast(value, long));
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  } else {
-    /* assume sizeof(ptrdiff_t) <= sizeof(long long) */
-    return SWIG_From(long long)(%numeric_cast(value, long long));
-  }
-%#endif
-}
-}
-
-%fragment(SWIG_AsVal_frag(ptrdiff_t),"header",fragment=SWIG_AsVal_frag(long),fragment=SWIG_AsVal_frag(long long)) {
-SWIGINTERNINLINE int
-SWIG_AsVal_dec(ptrdiff_t)(SWIG_Object obj, ptrdiff_t *val)
-{
-  int res = SWIG_TypeError;
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  if (sizeof(ptrdiff_t) <= sizeof(long)) {
-%#endif
-    long v;
-    res = SWIG_AsVal(long)(obj, val ? &v : 0);
-    if (SWIG_IsOK(res) && val) *val = %numeric_cast(v, ptrdiff_t);
-%#ifdef SWIG_LONG_LONG_AVAILABLE
-  } else if (sizeof(ptrdiff_t) <= sizeof(long long)) {
-    long long v;
-    res = SWIG_AsVal(long long)(obj, val ? &v : 0);
-    if (SWIG_IsOK(res) && val) *val = %numeric_cast(v, ptrdiff_t);
-  }
-%#endif
-  return res;
-}
-}
-
-
-%fragment("SWIG_CanCastAsInteger","header",
-	  fragment=SWIG_AsVal_frag(double),
-	  fragment="<float.h>",
-	  fragment="<math.h>") {
-SWIGINTERNINLINE int
-SWIG_CanCastAsInteger(double *d, double min, double max) {
-  double x = *d;
-  if ((min <= x && x <= max)) {
-   double fx = floor(x);
-   double cx = ceil(x);
-   double rd =  ((x - fx) < 0.5) ? fx : cx; /* simple rint */
-   if ((errno == EDOM) || (errno == ERANGE)) {
-     errno = 0;
-   } else {
-     double summ, reps, diff;
-     if (rd < x) {
-       diff = x - rd;
-     } else if (rd > x) {
-       diff = rd - x;
-     } else {
-       return 1;
-     }
-     summ = rd + x;
-     reps = diff/summ;
-     if (reps < 8*DBL_EPSILON) {
-       *d = rd;
-       return 1;
-     }
-   }
-  }
-  return 0;
-}
-}
-
-/* ------------------------------------------------------------
- * Generate the typemaps for primitive type 
- * ------------------------------------------------------------ */
-
-#define %typemaps_primitive(Code, Type) %typemaps_asvalfromn(%arg(Code), Type)
-
-/* ------------------------------------------------------------
- * Primitive Type Macros
- * ------------------------------------------------------------ */
-
-/* useful macros to derive typemap declarations from primitive types */
-
-%define _apply_macro(macro, arg2, arg1...)
-#if #arg1 != ""
-macro(%arg(arg1),arg2);
-#else
-macro(arg2);
-#endif
-%enddef
-
-/* Apply macro to the C-types */
-%define %apply_ctypes(Macro, Arg2...)
-_apply_macro(Macro, bool               , Arg2);
-_apply_macro(Macro, signed char        , Arg2);
-_apply_macro(Macro, unsigned char      , Arg2);
-_apply_macro(Macro, short              , Arg2);
-_apply_macro(Macro, unsigned short     , Arg2);
-_apply_macro(Macro, int                , Arg2);
-_apply_macro(Macro, unsigned int       , Arg2);
-_apply_macro(Macro, long               , Arg2);
-_apply_macro(Macro, unsigned long      , Arg2);
-_apply_macro(Macro, long long          , Arg2);
-_apply_macro(Macro, unsigned long long , Arg2);
-_apply_macro(Macro, float              , Arg2);
-_apply_macro(Macro, double             , Arg2);
-_apply_macro(Macro, char               , Arg2);
-_apply_macro(Macro, wchar_t            , Arg2);
-_apply_macro(Macro, size_t             , Arg2);
-_apply_macro(Macro, ptrdiff_t          , Arg2);
-%enddef
-
-/* apply the Macro2(Type1, Type2) to all  C types  */
-#define %apply_ctypes_2(Macro2) %apply_ctypes(%apply_ctypes, Macro2)
-
-
-/* apply the Macro(Type) to all  C++ types  */
-%define %apply_cpptypes(Macro, Arg2...)
-%apply_ctypes(Macro, Arg2)
-_apply_macro(Macro, std::size_t, Arg2);
-_apply_macro(Macro, std::ptrdiff_t, Arg2);
-_apply_macro(Macro, std::string, Arg2);
-_apply_macro(Macro, std::wstring, Arg2);
-_apply_macro(Macro, std::complex<float>, Arg2);
-_apply_macro(Macro, std::complex<double>, Arg2);
-%enddef
-
-/* apply the Macro2(Type1, Type2) to all  C++ types  */
-#define %apply_cpptypes_2(Macro2) %apply_cpptypes(%apply_cpptypes, Macro2)
-
-/* apply the Macro2(CheckCode,Type) to all  Checked Types */
-%define %apply_checkctypes(Macro2)
-Macro2(%checkcode(BOOL),    bool);
-Macro2(%checkcode(INT8),    signed char);
-Macro2(%checkcode(UINT8),   unsigned char);
-Macro2(%checkcode(INT16),   short);
-Macro2(%checkcode(UINT16),  unsigned short);
-Macro2(%checkcode(INT32),   int);
-Macro2(%checkcode(UINT32),  unsigned int);
-Macro2(%checkcode(INT64),   long);
-Macro2(%checkcode(UINT64),  unsigned long);
-Macro2(%checkcode(INT128),  long long);
-Macro2(%checkcode(UINT128), unsigned long long);
-Macro2(%checkcode(FLOAT),   float);
-Macro2(%checkcode(DOUBLE),  double);
-Macro2(%checkcode(CHAR),    char);
-Macro2(%checkcode(UNICHAR), wchar_t);
-Macro2(%checkcode(SIZE),    size_t);
-Macro2(%checkcode(PTRDIFF), ptrdiff_t);
-%enddef
-
-
-/* ------------------------------------------------------------
- * Generate the typemaps for all the primitive types with checkcode
- * ------------------------------------------------------------ */
-
-%apply_checkctypes(%typemaps_primitive);
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/ptrtypes.swg b/dependencies2013/win32/swig/Lib/typemaps/ptrtypes.swg
deleted file mode 100644
index e8439e6d..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/ptrtypes.swg
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -----------------------------------------------------------------------------
- * ptrtypes.swg
- *
- * Value typemaps (Type, const Type&) for "Ptr" types, such as swig
- * wrapped classes, that define the AsPtr/From methods
- *
- * To apply them, just use one of the following macros:
- *
- *    %typemaps_asptr(CheckCode, AsPtrMeth, AsPtrFrag, Type)
- *    %typemaps_asptrfrom(CheckCode, AsPtrMeth, FromMeth, AsPtrFrag, FromFrag, Type)
- *
- * or the simpler and normalize form:
- *
- *    %typemaps_asptrfromn(CheckCode, Type)
- *
- * Also, you can use the individual typemap definitions:
- *
- *    %ptr_in_typemap(asptr_meth,frag,Type)
- *    %ptr_varin_typemap(asptr_meth,frag,Type)
- *    %ptr_typecheck_typemap(check,asptr_meth,frag,Type)
- *    %ptr_directorout_typemap(asptr_meth,frag,Type)
- * ----------------------------------------------------------------------------- */
-
-%include <typemaps/valtypes.swg>
-
-/* in */
-
-%define %ptr_in_typemap(asptr_meth,frag,Type...)
-  %typemap(in,fragment=frag) Type {
-    Type *ptr = (Type *)0;
-    int res = asptr_meth($input, &ptr);
-    if (!SWIG_IsOK(res) || !ptr) { 
-      %argument_fail((ptr ? res : SWIG_TypeError), "$type", $symname, $argnum); 
-    }
-    $1 = *ptr;
-    if (SWIG_IsNewObj(res)) %delete(ptr);
-  }
-  %typemap(freearg) Type "";
-  %typemap(in,fragment=frag) const Type & (int res = SWIG_OLDOBJ) {
-    Type *ptr = (Type *)0;
-    res = asptr_meth($input, &ptr);
-    if (!SWIG_IsOK(res)) { %argument_fail(res,"$type",$symname, $argnum); }
-    if (!ptr) { %argument_nullref("$type",$symname, $argnum); }
-    $1 = ptr;
-  }
-  %typemap(freearg,noblock=1) const Type &  {
-    if (SWIG_IsNewObj(res$argnum)) %delete($1);
-  }
-%enddef
-
-/* varin */
-
-%define %ptr_varin_typemap(asptr_meth,frag,Type...)
-  %typemap(varin,fragment=frag) Type {
-    Type *ptr = (Type *)0;
-    int res = asptr_meth($input, &ptr);
-    if (!SWIG_IsOK(res) || !ptr) { 
-      %variable_fail((ptr ? res : SWIG_TypeError), "$type", "$name"); 
-    }
-    $1 = *ptr;
-    if (SWIG_IsNewObj(res)) %delete(ptr);
-  }
-%enddef
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-/* directorout */
-
-%define %ptr_directorout_typemap(asptr_meth,frag,Type...)
-  %typemap(directorargout,noblock=1,fragment=frag) Type *DIRECTOROUT ($*ltype temp, int swig_ores) {
-    Type *swig_optr = 0;
-    swig_ores = $result ? asptr_meth($result, &swig_optr) : 0;
-    if (!SWIG_IsOK(swig_ores) || !swig_optr) { 
-      %dirout_fail((swig_optr ? swig_ores : SWIG_TypeError),"$type");
-    }
-    temp = *swig_optr;
-    $1 = &temp;
-    if (SWIG_IsNewObj(swig_ores)) %delete(swig_optr);
-  }
-
-  %typemap(directorout,noblock=1,fragment=frag) Type {
-    Type *swig_optr = 0;
-    int swig_ores = asptr_meth($input, &swig_optr);
-    if (!SWIG_IsOK(swig_ores) || !swig_optr) { 
-      %dirout_fail((swig_optr ? swig_ores : SWIG_TypeError),"$type");
-    }
-    $result = *swig_optr;
-    if (SWIG_IsNewObj(swig_ores)) %delete(swig_optr);
-  }
-
-  %typemap(directorout,noblock=1,fragment=frag,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) Type* {
-    Type *swig_optr = 0;
-    int swig_ores = asptr_meth($input, &swig_optr);
-    if (!SWIG_IsOK(swig_ores)) { 
-      %dirout_fail(swig_ores,"$type");
-    }    
-    $result = swig_optr;
-    if (SWIG_IsNewObj(swig_ores)) {
-      swig_acquire_ownership(swig_optr);
-    }
-  }
-  %typemap(directorfree,noblock=1) Type*
-  {
-    if (director)  {
-      director->swig_release_ownership(%as_voidptr($input));
-    }
-  }
-
-  %typemap(directorout,noblock=1,fragment=frag,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) Type& {
-    Type *swig_optr = 0;
-    int swig_ores = asptr_meth($input, &swig_optr);
-    if (!SWIG_IsOK(swig_ores)) { 
-      %dirout_fail(swig_ores,"$type");
-    } else {
-      if (!swig_optr) { 
-	%dirout_nullref("$type");
-      } 
-    }    
-    $result = swig_optr;
-    if (SWIG_IsNewObj(swig_ores)) {
-      swig_acquire_ownership(swig_optr);
-    }
-  }
-  %typemap(directorfree,noblock=1) Type&
-  {
-    if (director) {
-      director->swig_release_ownership(%as_voidptr($input));
-    }
-  }
-
-
-  %typemap(directorout,fragment=frag) Type &DIRECTOROUT = Type
-
-%enddef
-
-#else
-
-#define %ptr_directorout_typemap(asptr_meth,frag,Type...) 
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
-/* typecheck */
-
-%define %ptr_typecheck_typemap(check,asptr_meth,frag,Type...)
-%typemap(typecheck,noblock=1,precedence=check,fragment=frag) Type * {
-  int res = asptr_meth($input, (Type**)(0));
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,noblock=1,precedence=check,fragment=frag) Type, const Type& {  
-  int res = asptr_meth($input, (Type**)(0));
-  $1 = SWIG_CheckState(res);
-}
-%enddef
-
-
-/*---------------------------------------------------------------------
- * typemap definition for types with asptr method
- *---------------------------------------------------------------------*/
-
-%define %typemaps_asptr(CheckCode, AsPtrMeth, AsPtrFrag, Type...)
-  %fragment(SWIG_AsVal_frag(Type),"header",fragment=SWIG_AsPtr_frag(Type)) {
-    SWIGINTERNINLINE int
-    SWIG_AsVal(Type)(SWIG_Object obj, Type *val)
-    {
-      Type *v = (Type *)0;
-      int res = SWIG_AsPtr(Type)(obj, &v);
-      if (!SWIG_IsOK(res)) return res;
-      if (v) {
-	if (val) *val = *v;
-	if (SWIG_IsNewObj(res)) {
-	  %delete(v);
-	  res = SWIG_DelNewMask(res);
-	}
-	return res;
-      }
-      return SWIG_ERROR;
-    }
-  }
-  %ptr_in_typemap(%arg(AsPtrMeth), %arg(AsPtrFrag), Type);
-  %ptr_varin_typemap(%arg(AsPtrMeth), %arg(AsPtrFrag), Type);
-  %ptr_directorout_typemap(%arg(AsPtrMeth), %arg(AsPtrFrag), Type);
-  %ptr_typecheck_typemap(%arg(CheckCode), %arg(AsPtrMeth),%arg(AsPtrFrag), Type);
-  %ptr_input_typemap(%arg(CheckCode),%arg(AsPtrMeth),%arg(AsPtrFrag),Type);
-%enddef
-
-/*---------------------------------------------------------------------
- * typemap definition for types with asptr/from methods
- *---------------------------------------------------------------------*/
-
-%define %typemaps_asptrfrom(CheckCode, AsPtrMeth, FromMeth, AsPtrFrag, FromFrag, Type...)
-  %typemaps_asptr(%arg(CheckCode), %arg(AsPtrMeth), %arg(AsPtrFrag), Type)
-  %typemaps_from(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_output_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-  %ptr_inout_typemap(Type);
-%enddef
-
-/*---------------------------------------------------------------------
- * typemap definition for types  with for 'normalized' asptr/from methods
- *---------------------------------------------------------------------*/
-
-%define %typemaps_asptrfromn(CheckCode, Type...)
-%typemaps_asptrfrom(%arg(CheckCode),
-		   %arg(SWIG_AsPtr(Type)), 
-		   %arg(SWIG_From(Type)), 
-		   %arg(SWIG_AsPtr_frag(Type)), 
-		   %arg(SWIG_From_frag(Type)), 
-		   Type);
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/std_except.swg b/dependencies2013/win32/swig/Lib/typemaps/std_except.swg
deleted file mode 100644
index 75d06649..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/std_except.swg
+++ /dev/null
@@ -1,37 +0,0 @@
-%include <typemaps/exception.swg>
-
-/* 
-   Mark all of std exception classes as "exception classes" via
-   the "exceptionclass" feature.
-   
-   If needed, you can disable it by using %noexceptionclass.
-*/
-
-%define %std_exception_map(Exception, Code)
-  %exceptionclass  Exception; 
-#if !defined(SWIG_STD_EXCEPTIONS_AS_CLASSES)
-  %typemap(throws,noblock=1) Exception {
-    SWIG_exception_fail(Code, $1.what());
-  }
-  %ignore Exception;
-  struct Exception {
-  };
-#endif
-%enddef
-
-namespace std {
-  %std_exception_map(bad_cast,           SWIG_TypeError);
-  %std_exception_map(bad_exception,      SWIG_SystemError);
-  %std_exception_map(domain_error,       SWIG_ValueError);
-  %std_exception_map(exception,          SWIG_SystemError);
-  %std_exception_map(invalid_argument,   SWIG_ValueError);
-  %std_exception_map(length_error,       SWIG_IndexError);
-  %std_exception_map(logic_error,        SWIG_RuntimeError);
-  %std_exception_map(out_of_range,       SWIG_IndexError);
-  %std_exception_map(overflow_error,     SWIG_OverflowError);
-  %std_exception_map(range_error,        SWIG_OverflowError);
-  %std_exception_map(runtime_error,      SWIG_RuntimeError);
-  %std_exception_map(underflow_error,    SWIG_OverflowError);
-}
-
-%include <std/std_except.i>
diff --git a/dependencies2013/win32/swig/Lib/typemaps/std_string.swg b/dependencies2013/win32/swig/Lib/typemaps/std_string.swg
deleted file mode 100644
index 5b57beab..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/std_string.swg
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// String
-//
-
-
-#ifndef SWIG_STD_BASIC_STRING
-#define SWIG_STD_STRING
-
-%include <typemaps/std_strings.swg>
-
-%fragment("<string>");
-
-namespace std
-{
-  %naturalvar string;
-  class string;
-}
-
-%typemaps_std_string(std::string, char, SWIG_AsCharPtrAndSize, SWIG_FromCharPtrAndSize, %checkcode(STDSTRING));
-
-#else
-
-%include <std/std_string.i>
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/typemaps/std_strings.swg b/dependencies2013/win32/swig/Lib/typemaps/std_strings.swg
deleted file mode 100644
index e9c23ba9..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/std_strings.swg
+++ /dev/null
@@ -1,78 +0,0 @@
-
-/* defining the String asptr/from methods */
-
-%define %std_string_asptr(String, Char, SWIG_AsCharPtrAndSize, Frag)
-%fragment(SWIG_AsPtr_frag(String),"header",fragment=Frag) {
-SWIGINTERN int
-SWIG_AsPtr_dec(String)(SWIG_Object obj, String **val) 
-{
-  Char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ;
-  if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) {
-    if (buf) {
-      if (val) *val = new String(buf, size - 1);
-      if (alloc == SWIG_NEWOBJ) %delete_array(buf);
-      return SWIG_NEWOBJ;
-    } else {
-      if (val) *val = 0;
-      return SWIG_OLDOBJ;
-    }
-  } else {
-    static int init = 0;
-    static swig_type_info* descriptor = 0;
-    if (!init) {
-      descriptor = SWIG_TypeQuery(#String " *");
-      init = 1;
-    }
-    if (descriptor) {
-      String *vptr;
-      int res = SWIG_ConvertPtr(obj, (void**)&vptr, descriptor, 0);
-      if (SWIG_IsOK(res) && val) *val = vptr;
-      return res;
-    }
-  }
-  return SWIG_ERROR;
-}
-}
-%enddef
-
-%define %std_string_from(String, SWIG_FromCharPtrAndSize, Frag)
-%fragment(SWIG_From_frag(String),"header",fragment=Frag) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_From_dec(String)(const String& s)
-{
-  return SWIG_FromCharPtrAndSize(s.data(), s.size());
-}
-}
-%enddef
-
-%define %std_string_asval(String)
-%fragment(SWIG_AsVal_frag(String),"header", fragment=SWIG_AsPtr_frag(String)) {
-SWIGINTERN int
-SWIG_AsVal_dec(String)(SWIG_Object obj, String *val)
-{
-  String* v = (String *) 0;
-  int res = SWIG_AsPtr(String)(obj, &v);
-  if (!SWIG_IsOK(res)) return res;
-  if (v) {
-    if (val) *val = *v;
-    if (SWIG_IsNewObj(res)) {
-      %delete(v);
-      res = SWIG_DelNewMask(res);
-    }
-    return res;
-  }
-  return SWIG_ERROR;
-}
-}
-%enddef
-
-
-%define %typemaps_std_string(String, Char, AsPtrMethod, FromMethod, CheckCode)
-
-%std_string_asptr(String, Char, AsPtrMethod, #AsPtrMethod)
-%std_string_asval(String)
-%std_string_from(String, FromMethod, #FromMethod)
-
-%typemaps_asptrfromn(%arg(CheckCode), String);
-
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/std_wstring.swg b/dependencies2013/win32/swig/Lib/typemaps/std_wstring.swg
deleted file mode 100644
index 4a2830bb..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/std_wstring.swg
+++ /dev/null
@@ -1,26 +0,0 @@
-%include <typemaps/wstring.swg>
-
-#ifndef SWIG_STD_BASIC_STRING
-#define SWIG_STD_WSTRING
-
-%include <typemaps/std_strings.swg>
-
-%{
-#include <cwchar>
-%}
-%fragment("<string>");
-
-namespace std
-{
-  %naturalvar wstring;
-  class wstring;
-}
-
-%typemaps_std_string(std::wstring, wchar_t, SWIG_AsWCharPtrAndSize, SWIG_FromWCharPtrAndSize, %checkcode(STDUNISTRING));
-
-
-#else
-
-%include <std/std_wstring.i>
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/typemaps/string.swg b/dependencies2013/win32/swig/Lib/typemaps/string.swg
deleted file mode 100644
index 4b707236..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/string.swg
+++ /dev/null
@@ -1,35 +0,0 @@
-%ensure_fragment(SWIG_AsCharPtrAndSize)
-%ensure_fragment(SWIG_FromCharPtrAndSize)
-
-%types(char *);
-
-%fragment("SWIG_pchar_descriptor","header") {
-SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor(void)
-{
-  static int init = 0;
-  static swig_type_info* info = 0;
-  if (!init) {
-    info = SWIG_TypeQuery("_p_char");
-    init = 1;
-  }
-  return info;
-}
-}
-
-%fragment("SWIG_strnlen","header",fragment="SWIG_FromCharPtrAndSize") {
-SWIGINTERN size_t
-SWIG_strnlen(const char* s, size_t maxlen)
-{
-  const char *p;
-  for (p = s; maxlen-- && *p; p++)
-    ;
-  return p - s;
-}
-}
-
-%include <typemaps/strings.swg>
-%typemaps_string(%checkcode(STRING), %checkcode(CHAR),
-		 char, Char, SWIG_AsCharPtrAndSize, SWIG_FromCharPtrAndSize,
-		 strlen, SWIG_strnlen,
-		"<limits.h>", CHAR_MIN, CHAR_MAX)
diff --git a/dependencies2013/win32/swig/Lib/typemaps/strings.swg b/dependencies2013/win32/swig/Lib/typemaps/strings.swg
deleted file mode 100644
index 87e97dd7..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/strings.swg
+++ /dev/null
@@ -1,651 +0,0 @@
-//
-// Use the macro SWIG_PRESERVE_CARRAY_SIZE if you prefer to preserve
-// the size of char arrays, ie
-//  ------------------------------------------
-//       C Side             =>   Language Side
-//  ------------------------------------------
-//   char name[5] = "hola"  =>   'hola\0'
-//
-// the default behaviour is 
-//
-//   char name[5] = "hola"  =>   'hola'
-//
-//
-//#define SWIG_PRESERVE_CARRAY_SIZE
-
-/* ------------------------------------------------------------
- *  String typemaps for type Char (char or wchar_t)
- * ------------------------------------------------------------ */
-
-%define %_typemap_string(StringCode, 
-			 Char,
-			 SWIG_AsCharPtrAndSize,
-			 SWIG_FromCharPtrAndSize,
-			 SWIG_CharPtrLen,
-			 SWIG_CharBufLen,
-			 SWIG_AsCharPtr,
-			 SWIG_FromCharPtr,
-			 SWIG_AsCharArray,
-                         SWIG_NewCopyCharArray,
-                         SWIG_DeleteCharArray)
-
-/* in */
-
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtr) 
-  Char * (int res, Char *buf = 0, int alloc = 0),
-  const Char * (int res, Char *buf = 0, int alloc = 0) {
-  res = SWIG_AsCharPtr($input, &buf, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum);
-  }
-  $1 = %reinterpret_cast(buf, $1_ltype);
-}
-%typemap(freearg,noblock=1,match="in") Char *, const Char * {
-  if (alloc$argnum == SWIG_NEWOBJ) SWIG_DeleteCharArray(buf$argnum);
-}
-
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtr) Char const*& (int res, Char *buf = 0, int alloc = 0) {
-  res = SWIG_AsCharPtr($input, &buf, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum);
-  }
-  $1 = &buf;
-}    
-%typemap(freearg, noblock=1,match="in") Char const*& {
-  if (alloc$argnum == SWIG_NEWOBJ) SWIG_DeleteCharArray(buf$argnum);
-}
-
-/* out */
-
-%typemap(out,noblock=1,fragment=#SWIG_FromCharPtr) Char *, const Char * {
-  %set_output(SWIG_FromCharPtr((const Char *)$1));
-}
-
-
-%typemap(out,noblock=1,fragment=#SWIG_FromCharPtr) Char const*& {
-  %set_output(SWIG_FromCharPtr(*$1));
-}
-
-%typemap(newfree,noblock=1) Char * {
-  SWIG_DeleteCharArray($1);
-}
-
-/* varin */
-
-%typemap(varin,fragment=#SWIG_AsCharPtrAndSize) Char * {
-  Char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
-  int res = SWIG_AsCharPtrAndSize($input, &cptr, &csize, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res,"$type","$name");
-  }
-  if ($1) SWIG_DeleteCharArray($1);
-  if (alloc == SWIG_NEWOBJ) {
-    $1 = cptr;
-  } else {
-    $1 = csize ? ($1_type)SWIG_NewCopyCharArray(cptr, csize, Char) : 0;
-  }
-}
-
-%typemap(varin,fragment=#SWIG_AsCharPtrAndSize,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const Char * {
-  Char *cptr = 0; size_t csize = 0; int alloc = SWIG_NEWOBJ;
-  int res = SWIG_AsCharPtrAndSize($input, &cptr, &csize, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (alloc == SWIG_NEWOBJ) {
-    $1 = cptr;
-  } else {
-    $1 = csize ? ($1_type)SWIG_NewCopyCharArray(cptr, csize, Char) : 0;
-  }
-}
-
-/* varout */
-
-%typemap(varout,noblock=1,fragment=#SWIG_FromCharPtr) Char *, const Char * {
-  %set_varoutput(SWIG_FromCharPtr($1));
-}
-
-/* memberin */
-
-%typemap(memberin,noblock=1) Char * {
-  if ($1) SWIG_DeleteCharArray($1);
-  if ($input) {
-    size_t size = SWIG_CharPtrLen(%reinterpret_cast($input, const Char *)) + 1;
-    $1 = ($1_type)SWIG_NewCopyCharArray(%reinterpret_cast($input, const Char *), size, Char);
-  } else {
-    $1 = 0;
-  }
-}
-
-%typemap(memberin,noblock=1,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const Char * {
-  if ($input) {
-    size_t size = SWIG_CharPtrLen(%reinterpret_cast(%reinterpret_cast($input, const Char *), const Char *)) + 1;
-    $1 = ($1_type)SWIG_NewCopyCharArray($input, size, Char);
-  } else {
-    $1 = 0;
-  }
-}
-
-/* globalin */
-
-%typemap(globalin,noblock=1) Char * {
-  if ($1) SWIG_DeleteCharArray($1);
-  if ($input) {
-    size_t size = SWIG_CharPtrLen(%reinterpret_cast(%reinterpret_cast($input, const Char *), const Char *)) + 1;
-    $1 = ($1_type)SWIG_NewCopyCharArray($input, size, Char);
-  } else {
-    $1 = 0;
-  }
-}
-
-%typemap(globalin,noblock=1,warning=SWIGWARN_TYPEMAP_CHARLEAK_MSG) const Char * {
-  if ($input) {
-    size_t size = SWIG_CharPtrLen($input) + 1;
-    $1 = ($1_type)SWIG_NewCopyCharArray($input, size, Char);
-  } else {
-    $1 = 0;
-  }
-}
-
-/* constant */
-
-%typemap(constcode,noblock=1,fragment=#SWIG_FromCharPtr)
-  Char *, Char const*, Char * const, Char const* const {
-  %set_constant("$symname", SWIG_FromCharPtr($value));
-}
-
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-
-%typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtr)
-  Char *, Char const*, Char *const, Char const *const, 
-  Char const *&, Char *const &, Char const *const & {
-  $input = SWIG_FromCharPtr((const Char *)$1);
-}
-
-
-/* directorout */
-
-%typemap(directorout,noblock=1,fragment=#SWIG_AsCharPtr,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) Char * (int res, Char *buf = 0, int alloc = SWIG_NEWOBJ) {
-  res = SWIG_AsCharPtr($input, &buf, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %dirout_fail(res, "$type");
-  }
-  if (alloc == SWIG_NEWOBJ) {
-    swig_acquire_ownership_array(buf);
-  }
-  $result = %reinterpret_cast(buf, $1_ltype);
-}
-%typemap(directorfree,noblock=1) Char *
-{
-  if (director) {
-    director->swig_release_ownership(%as_voidptr($input));
-  }
-}
-
-
-%typemap(directorout,noblock=1,fragment=#SWIG_AsCharPtr,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) Char *const& (int res, Char *buf = 0, int alloc = SWIG_NEWOBJ), Char const*const& (int res, Char *buf = 0, int alloc = SWIG_NEWOBJ) { 
-  res = SWIG_AsCharPtr($input, &buf, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %dirout_fail(res, "$type");
-  }
-  static $*1_ltype tmp = buf;
-  $result = &tmp;
-  if (alloc == SWIG_NEWOBJ) {
-    swig_acquire_ownership_array(buf);
-  }
-}
-%typemap(directorfree,noblock=1)
-  Char * const&, Char const* const& {
-  if (director) {
-    director->swig_release_ownership(%as_voidptr(*$input));
-  }
-}
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
-/* typecheck */
-
-%typemap(typecheck,noblock=1,precedence=StringCode,
-	 fragment=#SWIG_AsCharPtr) Char *, const Char *, Char const*& {
-  int res = SWIG_AsCharPtr($input, 0, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-/* throws */
-
-%typemap(throws,noblock=1,fragment=#SWIG_FromCharPtr) Char * {
-  %raise(SWIG_FromCharPtr($1), "$type", 0);
-}
-
-
-/* ------------------------------------------------------------
- *  Unknown size const Character array Char[ANY] handling
- * ------------------------------------------------------------ */
-
-%apply Char * { Char [] };
-%apply const Char * { const Char [] };
-
-%typemap(varin,noblock=1,warning="462:Unable to set variable of type Char []") Char []
-{
-  %variable_fail(SWIG_AttributeError, "$type", "read-only $name");
-}
-
-
-/* ------------------------------------------------------------
- *  Fixed size Character array Char[ANY] handling
- * ------------------------------------------------------------ */
-
-/*  memberin and globalin typemaps  */
-
-%typemap(memberin,noblock=1) Char [ANY]
-{
-  if ($input) memcpy($1,$input,$1_dim0*sizeof(Char));
-  else memset($1,0,$1_dim0*sizeof(Char));
-}
-
-%typemap(globalin,noblock=1) Char [ANY]
-{
-  if ($input) memcpy($1,$input,$1_dim0*sizeof(Char));
-  else memset($1,0,$1_dim0*sizeof(Char));
-}
-
-/* in */
-
-%typemap(in,noblock=1,fragment=#SWIG_AsCharArray)
-  Char [ANY] (Char temp[$1_dim0], int res), 
-  const Char [ANY](Char temp[$1_dim0], int res)
-{  
-  res = SWIG_AsCharArray($input, temp, $1_dim0);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum);
-  }
-  $1 = %reinterpret_cast(temp, $1_ltype);
-}
-%typemap(freearg) Char [ANY], const Char [ANY] "";
-
-%typemap(in,noblock=1,fragment=#SWIG_AsCharArray) const Char (&)[ANY] (Char temp[$1_dim0], int res)
-{  
-  res = SWIG_AsCharArray($input, temp, $1_dim0);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum);
-  }
-  $1 = &temp;
-}
-%typemap(freearg) const Char (&)[ANY] "";
-
-%typemap(out,fragment=#SWIG_FromCharPtrAndSize,fragment=#SWIG_CharBufLen)
-  Char [ANY], const Char[ANY] 
-{
-%#ifndef SWIG_PRESERVE_CARRAY_SIZE
-  size_t size = SWIG_CharBufLen($1, $1_dim0);
-%#else
-  size_t size = $1_dim0;
-%#endif
-   %set_output(SWIG_FromCharPtrAndSize($1, size));
-}
-
-/* varin */
-
-%typemap(varin,fragment=#SWIG_AsCharArray) Char [ANY]
-{
-  int res = SWIG_AsCharArray($input, $1, $1_dim0);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-}
-
-/* varout */
-
-%typemap(varout,fragment=#SWIG_CharBufLen)
-  Char [ANY], const Char [ANY] {
-%#ifndef SWIG_PRESERVE_CARRAY_SIZE
-  size_t size = SWIG_CharBufLen($1, $1_dim0);
-%#else
-  size_t size = $1_dim0;
-%#endif
-  %set_varoutput(SWIG_FromCharPtrAndSize($1, size));
-}
-
-/* constant */
-
-%typemap(constcode,fragment=#SWIG_CharBufLen)
-  Char [ANY], const Char [ANY]
-{
-%#ifndef SWIG_PRESERVE_CARRAY_SIZE
-  size_t size = SWIG_CharBufLen($1, $1_dim0);
-%#else
-  size_t size = $value_dim0;
-%#endif
-  %set_constant("$symname", SWIG_FromCharPtrAndSize($value,size));
-}
-
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-%typemap(directorin,fragment=#SWIG_CharBufLen)
-  Char [ANY], const Char [ANY] 
-{
-%#ifndef SWIG_PRESERVE_CARRAY_SIZE
-  size_t size = SWIG_CharBufLen($1, $1_dim0);
-%#else
-  size_t size = $1_dim0;
-%#endif
-  $input = SWIG_FromCharPtrAndSize($1, size);
-}
-
-/* directorout */
-
-%typemap(directorout,noblock=1,fragment=#SWIG_AsCharArray)
-  Char [ANY] (Char temp[$result_dim0]),
-  const Char [ANY] (Char temp[$result_dim0], int res)
-{ 
-  res = SWIG_AsCharArray($input, temp, $result_dim0);
-  if (!SWIG_IsOK(res)) {
-    %dirout_fail(res, "$type");
-  }
-  $result = temp;
-}
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
-/* typecheck */
-
-%typemap(typecheck,noblock=1,precedence=StringCode,
-	 fragment=#SWIG_AsCharArray)  
-  Char [ANY], const Char[ANY] {
-  int res = SWIG_AsCharArray($input, (Char *)0, $1_dim0);
-  $1 = SWIG_CheckState(res);
-}
-
-
-/* throws */
-
-%typemap(throws,fragment=#SWIG_CharBufLen)
-  Char [ANY], const Char[ANY]
-{
-%#ifndef SWIG_PRESERVE_CARRAY_SIZE
-  size_t size = SWIG_CharBufLen($1, $1_dim0);
-%#else
-  size_t size = $1_dim0;
-%#endif
-  %raise(SWIG_FromCharPtrAndSize($1, size), "$type", 0); 
-}
-
-/* -------------------------------------------------------------------
- * --- Really fix size Char arrays, including '\0'chars at the end ---
- * ------------------------------------------------------------------- */
-
-%typemap(varout,noblock=1,fragment=#SWIG_FromCharPtrAndSize)
-  Char FIXSIZE[ANY], const Char FIXSIZE[ANY]
-{
-  %set_varoutput(SWIG_FromCharPtrAndSize($1, $1_dim0));
-}
-
-%typemap(out,noblock=1,fragment=#SWIG_FromCharPtrAndSize)
-  Char FIXSIZE[ANY], const Char FIXSIZE[ANY]
-{
-  %set_output(SWIG_FromCharPtrAndSize($1, $1_dim0));
-}
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-%typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtrAndSize)
-  Char FIXSIZE[ANY], const Char FIXSIZE[ANY]
-{
-  $input = SWIG_FromCharPtrAndSize($1, $1_dim0);
-}
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
-%typemap(throws,noblock=1,fragment=#SWIG_FromCharPtrAndSize)
-  Char FIXSIZE[ANY], const Char FIXSIZE[ANY] {
-  %raise(SWIG_FromCharPtrAndSize($1, $1_dim0), "$type", 0); 
-}
-
-/* ------------------------------------------------------------
- * --- String & length ---
- * ------------------------------------------------------------ */
-
-/* Here len doesn't include the '0' terminator */
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize) 
-  (Char *STRING, size_t LENGTH) (int res, Char *buf = 0, size_t size = 0, int alloc = 0),
-  (const Char *STRING, size_t LENGTH) (int res, Char *buf = 0, size_t size = 0, int alloc = 0)
-{
-  res = SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc);
-  if (!SWIG_IsOK(res)) { 
-    %argument_fail(res,"$type",$symname, $argnum);
-  }  
-  $1 = %reinterpret_cast(buf, $1_ltype);
-  $2 = %numeric_cast(size - 1, $2_ltype);
-}
-%typemap(freearg,noblock=1,match="in") (Char *STRING, size_t LENGTH) {
-  if (alloc$argnum == SWIG_NEWOBJ) SWIG_DeleteCharArray(buf$argnum);
-}
-/* old 'int' form */
-%typemap(in) (Char *STRING, int LENGTH) = (Char *STRING, size_t LENGTH);
-%typemap(freearg) (Char *STRING, int LENGTH) = (Char *STRING, size_t LENGTH);
-
-
-/* Here size includes the '0' terminator */
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize)
-  (Char *STRING, size_t SIZE) (int res, Char *buf = 0, size_t size = 0, int alloc = 0),
-  (const Char *STRING, size_t SIZE) (int res, Char *buf = 0, size_t size = 0, int alloc = 0)
-{
-  res = SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum);
-  }
-  $1 = %reinterpret_cast(buf, $1_ltype);
-  $2 = %numeric_cast(size, $2_ltype);
-}
-%typemap(freearg,noblock=1,match="in") (Char *STRING, size_t SIZE) {
-  if (alloc$argnum == SWIG_NEWOBJ) SWIG_DeleteCharArray(buf$argnum);
-}
-/* old 'int' form */
-%typemap(in) (Char *STRING, int SIZE) = (Char *STRING, size_t SIZE);
-%typemap(freearg) (Char *STRING, int SIZE) = (Char *STRING, size_t SIZE);
-
-
-/* reverse order versions */
-
-/* Here len doesn't include the '0' terminator */
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize) 
-  (size_t LENGTH, Char *STRING) (int res, Char *buf = 0, size_t size = 0, int alloc = 0),
-  (size_t LENGTH, const Char *STRING) (int res, Char *buf = 0, size_t size = 0, int alloc = 0)
-{
-  res = SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc);
-  if (!SWIG_IsOK(res)) { 
-    %argument_fail(res,"$type",$symname, $argnum);
-  }  
-  $2 = %reinterpret_cast(buf, $2_ltype) ;
-  $1 = %numeric_cast(size - 1, $1_ltype) ;
-}
-%typemap(freearg, noblock=1, match="in") (size_t LENGTH, Char *STRING) {
-  if (alloc$argnum == SWIG_NEWOBJ) SWIG_DeleteCharArray(buf$argnum);
-}
-/* old 'int' form */
-%typemap(in) (int LENGTH, Char *STRING) = (size_t LENGTH, Char *STRING);
-%typemap(freearg) (int LENGTH, Char *STRING) = (size_t LENGTH, Char *STRING);
-
-/* Here size includes the '0' terminator */
-%typemap(in,noblock=1,fragment=#SWIG_AsCharPtrAndSize)
-  (size_t SIZE, Char *STRING) (int res, Char *buf = 0, size_t size = 0, int alloc = 0),
-  (size_t SIZE, const Char *STRING) (int res, Char *buf = 0, size_t size = 0, int alloc = 0)
-{
-  res = SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type",$symname, $argnum);
-  }
-  $2 = %reinterpret_cast(buf, $2_ltype) ;
-  $1 = %numeric_cast(size, $1_ltype) ;
-}
-%typemap(freearg, noblock=1, match="in") (size_t SIZE, Char *STRING) {
-  if (alloc$argnum == SWIG_NEWOBJ) SWIG_DeleteCharArray(buf$argnum);
-}
-/* old 'int' form */
-%typemap(in) (int SIZE, Char *STRING) = (size_t SIZE, Char *STRING);
-%typemap(freearg) (int SIZE, Char *STRING) = (size_t SIZE, Char *STRING);
-
-
-%enddef
-
-
-/* ------------------------------------------------------------
- * --- String fragment methods ---
- * ------------------------------------------------------------ */
-
-#ifndef %_typemap2_string
-%define %_typemap2_string(StringCode, CharCode,
-			 Char, CharName,
-			 SWIG_AsCharPtrAndSize,
-			 SWIG_FromCharPtrAndSize,
-			 SWIG_CharPtrLen,
-			 SWIG_CharBufLen,
-			 SWIG_NewCopyCharArray,
-			 SWIG_DeleteCharArray,
-			 FragLimits, CHAR_MIN, CHAR_MAX)
-  
-%fragment("SWIG_From"#CharName"Ptr","header",fragment=#SWIG_FromCharPtrAndSize) {
-SWIGINTERNINLINE SWIG_Object 
-SWIG_From##CharName##Ptr(const Char *cptr)
-{ 
-  return SWIG_FromCharPtrAndSize(cptr, (cptr ? SWIG_CharPtrLen(cptr) : 0));
-}
-}
-
-%fragment("SWIG_From"#CharName"Array","header",fragment=#SWIG_FromCharPtrAndSize) {
-SWIGINTERNINLINE SWIG_Object 
-SWIG_From##CharName##Array(const Char *cptr, size_t size)
-{ 
-  return SWIG_FromCharPtrAndSize(cptr, size);
-}
-}
-
-%fragment("SWIG_As" #CharName "Ptr","header",fragment=#SWIG_AsCharPtrAndSize) {
-%define_as(SWIG_As##CharName##Ptr(obj, val, alloc), SWIG_AsCharPtrAndSize(obj, val, NULL, alloc))
-}
-
-%fragment("SWIG_As" #CharName "Array","header",fragment=#SWIG_AsCharPtrAndSize) {
-SWIGINTERN int
-SWIG_As##CharName##Array(SWIG_Object obj, Char *val, size_t size)
-{ 
-  Char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ;
-  int res = SWIG_AsCharPtrAndSize(obj, &cptr, &csize, &alloc);
-  if (SWIG_IsOK(res)) {
-    /* special case of single char conversion when we don't need space for NUL */
-    if (size == 1 && csize == 2 && cptr && !cptr[1]) --csize;
-    if (csize <= size) {
-      if (val) {
-	if (csize) memcpy(val, cptr, csize*sizeof(Char));
-	if (csize < size) memset(val + csize, 0, (size - csize)*sizeof(Char));
-      }
-      if (alloc == SWIG_NEWOBJ) {
-	SWIG_DeleteCharArray(cptr);
-	res = SWIG_DelNewMask(res);
-      }      
-      return res;
-    }
-    if (alloc == SWIG_NEWOBJ) SWIG_DeleteCharArray(cptr);
-  }
-  return SWIG_TypeError;
-}
-}
-
-/* Char */
-
-%fragment(SWIG_From_frag(Char),"header",fragment=#SWIG_FromCharPtrAndSize) {
-SWIGINTERNINLINE SWIG_Object
-SWIG_From_dec(Char)(Char c) 
-{ 
-  return SWIG_FromCharPtrAndSize(&c,1);
-}
-}
-
-%fragment(SWIG_AsVal_frag(Char),"header",
-	  fragment="SWIG_As"#CharName"Array",
-	  fragment=FragLimits,
-	  fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(Char)(SWIG_Object obj, Char *val)
-{    
-  int res = SWIG_As##CharName##Array(obj, val, 1);
-  if (!SWIG_IsOK(res)) {
-    long v;
-    res = SWIG_AddCast(SWIG_AsVal(long)(obj, &v));
-    if (SWIG_IsOK(res)) {
-      if ((CHAR_MIN <= v) && (v <= CHAR_MAX)) {
-	if (val) *val = %numeric_cast(v, Char);
-      } else {
-	res = SWIG_OverflowError;
-      }
-    }
-  }
-  return res;
-}
-}
-
-%_typemap_string(StringCode, 
-		 Char,
-		 SWIG_AsCharPtrAndSize,
-		 SWIG_FromCharPtrAndSize,
-		 SWIG_CharPtrLen,
-		 SWIG_CharBufLen,
-		 SWIG_As##CharName##Ptr,
-		 SWIG_From##CharName##Ptr,
-		 SWIG_As##CharName##Array,
-		 SWIG_NewCopyCharArray,
-		 SWIG_DeleteCharArray)
-
-%enddef
-#endif
-
-/* ------------------------------------------------------------
- *  String typemaps and fragments, with default allocators
- * ------------------------------------------------------------ */
-
-%define %typemaps_string(StringCode, CharCode,
-			 Char, CharName,
-			 SWIG_AsCharPtrAndSize,
-			 SWIG_FromCharPtrAndSize,
-			 SWIG_CharPtrLen,
-			 SWIG_CharBufLen,
-			 FragLimits, CHAR_MIN, CHAR_MAX)
-%_typemap2_string(StringCode, CharCode,
-		  Char, CharName,
-		  SWIG_AsCharPtrAndSize,
-		  SWIG_FromCharPtrAndSize,
-		  SWIG_CharPtrLen,
-		  SWIG_CharBufLen,
-		  %new_copy_array,
-		  %delete_array,
-		  FragLimits, CHAR_MIN, CHAR_MAX)
-%enddef
-
-/* ------------------------------------------------------------
- *  String typemaps and fragments, with custom allocators
- * ------------------------------------------------------------ */
-
-%define %typemaps_string_alloc(StringCode, CharCode,
-			       Char, CharName,
-			       SWIG_AsCharPtrAndSize,
-			       SWIG_FromCharPtrAndSize,
-			       SWIG_CharPtrLen,
-			       SWIG_CharBufLen,
-			       SWIG_NewCopyCharArray,
-			       SWIG_DeleteCharArray,
-			       FragLimits, CHAR_MIN, CHAR_MAX)
-%_typemap2_string(StringCode, CharCode,
-		  Char, CharName,
-		  SWIG_AsCharPtrAndSize,
-		  SWIG_FromCharPtrAndSize,
-		  SWIG_CharPtrLen,
-		  SWIG_CharBufLen,
-		  SWIG_NewCopyCharArray,
-		  SWIG_DeleteCharArray,
-		  FragLimits, CHAR_MIN, CHAR_MAX)
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/swigmacros.swg b/dependencies2013/win32/swig/Lib/typemaps/swigmacros.swg
deleted file mode 100644
index 3a63a256..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/swigmacros.swg
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -----------------------------------------------------------------------------
- * SWIG API. Portion only visible from SWIG
- * ----------------------------------------------------------------------------- */
-/*
-  This file implements the internal macros of the 'SWIG API', which
-  are useful to implement all the SWIG target languages.
-
-  Basic preprocessor macros:
-  --------------------------
-
-    %arg(Arg)               Safe argument wrap
-    %str(Arg)               Stringify the argument
-    %begin_block            Begin an execution block
-    %end_block              End an execution block
-    %block(Block)           Execute Block as an execution block
-    %define_as(Def, Val)    Define 'Def' as 'Val', expanding Def and Val first
-    %ifcplusplus(V1, V2)    if C++ Mode; then V1; else V2; fi
-
-
-  Casting Operations:
-  -------------------
-
-  SWIG provides the following casting macros, which implement the
-  corresponding C++ casting operations:
-
-    %const_cast(a, Type)         const_cast<Type >(a)
-    %static_cast(a, Type)      	 static_cast<Type >(a)
-    %reinterpret_cast(a, Type) 	 reinterpret_cast<Type >(a)
-    %numeric_cast(a, Type)     	 static_cast<Type >(a)
-    %as_voidptr(a)            	 const_cast<void *>(static_cast<const void *>(a))
-    %as_voidptrptr(a)        	 reinterpret_cast<void **>(a)
-
-  or their C unsafe versions. In C++ we use the safe version unless
-  SWIG_NO_CPLUSPLUS_CAST is defined (usually via the -nocppcast swig flag).
-
-
-  Memory allocation:
-  ------------------
-
-  These allocation/freeing macros are safe to use in C or C++ and
-  dispatch the proper new/delete/delete[] or free/malloc calls as
-  needed.
-
-    %new_instance(Type)             Allocate a new instance of given Type
-    %new_copy(value,Type)           Allocate and initialize a new instance with 'value'
-    %new_array(size,Type)           Allocate a new array with given size and Type and zero initialize
-    %new_copy_array(cptr,size,Type) Allocate and initialize a new array from 'cptr'
-    %delete(cptr)                   Delete an instance
-    %delete_array(cptr)             Delete an array
-
-
-  Auxiliary loop macros:
-  ----------------------
-
-    %formacro(Macro, Args...) or %formacro_1(Macro, Args...)
-       for i in Args
-       do
-          Macro($i)
-       done
-
-    %formacro_2(Macro2, Args...)
-       for i,j in Args
-       do
-          Macro2($i, $j)
-       done
-
-
-  Flags and conditional macros:
-  -----------------------------
-
-     %mark_flag(flag)
-       flag := True
-
-     %evalif(flag,expr)
-       if flag; then
-         expr
-       fi
-
-     %evalif_2(flag1 flag2,expr)
-       if flag1 and flag2; then
-         expr
-       fi
-
-
-*/
-/* -----------------------------------------------------------------------------
- * Basic preprocessor macros
- * ----------------------------------------------------------------------------- */
-
-#define %arg(Arg...)        Arg
-#define %str(Arg)           `Arg`
-#ifndef %begin_block
-#  define %begin_block      do {
-#endif
-#ifndef %end_block
-#  define %end_block        } while(0)
-#endif
-#define %block(Block...)    %begin_block Block; %end_block
-
-/* define a new macro */
-%define %define_as(Def, Val...)%#define Def Val %enddef
-
-/* include C++ or else value */
-%define %ifcplusplus(cppval, nocppval)
-#ifdef __cplusplus
-cppval
-#else
-nocppval
-#endif
-%enddef
-
-/* insert the SWIGVERSION in the interface and the wrapper code */
-#if SWIG_VERSION
-%insert("header") {
-%define_as(SWIGVERSION,  SWIG_VERSION)
-%#define SWIG_VERSION SWIGVERSION
-}
-#endif
-
-
-
-/* -----------------------------------------------------------------------------
- * Casting operators
- * ----------------------------------------------------------------------------- */
-
-#if defined(SWIG_NO_CPLUSPLUS_CAST)
-/* Disable 'modern' cplusplus casting operators */
-# if defined(SWIG_CPLUSPLUS_CAST)
-#   undef SWIG_CPLUSPLUS_CAST
-# endif
-#endif
-
-#if defined(__cplusplus) && defined(SWIG_CPLUSPLUS_CAST)
-# define %const_cast(a,Type...)       const_cast< Type >(a)
-# define %static_cast(a,Type...)      static_cast< Type >(a)
-# define %reinterpret_cast(a,Type...) reinterpret_cast< Type >(a)
-# define %numeric_cast(a,Type...)     static_cast< Type >(a)
-#else /* C case */
-# define %const_cast(a,Type...)       (Type)(a)
-# define %static_cast(a,Type...)      (Type)(a)
-# define %reinterpret_cast(a,Type...) (Type)(a)
-# define %numeric_cast(a,Type...)     (Type)(a)
-#endif /* __cplusplus */
-
-
-#define %as_voidptr(a)               SWIG_as_voidptr(a)
-#define %as_voidptrptr(a)            SWIG_as_voidptrptr(a)
-
-%insert("header") {
-%define_as(SWIG_as_voidptr(a),    %const_cast(%static_cast(a,const void *), void *))
-%define_as(SWIG_as_voidptrptr(a), ((void)%as_voidptr(*a),%reinterpret_cast(a, void**)))
-}
-
-
-/* -----------------------------------------------------------------------------
- * Allocating/freeing elements
- * ----------------------------------------------------------------------------- */
-
-#if defined(__cplusplus)
-# define %new_instance(Type...)             (new Type())
-# define %new_copy(val,Type...)             (new Type(%static_cast(val, const Type&)))
-# define %new_array(size,Type...)           (new Type[size]())
-# define %new_copy_array(ptr,size,Type...)  %reinterpret_cast(memcpy(new Type[size], ptr, sizeof(Type)*(size)), Type*)
-# define %delete(cptr)                      delete cptr
-# define %delete_array(cptr)                delete[] cptr
-#else /* C case */
-# define %new_instance(Type...)             (Type *)calloc(1,sizeof(Type))
-# define %new_copy(val,Type...)             (Type *)memcpy(%new_instance(Type),&val,sizeof(Type))
-# define %new_array(size,Type...)           (Type *)calloc(size, sizeof(Type))
-# define %new_copy_array(ptr,size,Type...)  (Type *)memcpy(malloc((size)*sizeof(Type)), ptr, sizeof(Type)*(size))
-# define %delete(cptr)                      free((char*)cptr)
-# define %delete_array(cptr)                free((char*)cptr)
-#endif /* __cplusplus */
-
-/* -----------------------------------------------------------------------------
- * SWIG names and mangling
- * ----------------------------------------------------------------------------- */
-
-#define %mangle(Type...)                  #@Type
-#define %descriptor(Type...)               SWIGTYPE_ ## #@Type
-#define %string_name(Name)                "SWIG_" %str(Name)
-#define %symbol_name(Name, Type...)       SWIG_ ## Name ## _ #@Type
-#define %checkcode(Code)           	  SWIG_TYPECHECK_ ## Code
-
-
-/* -----------------------------------------------------------------------------
- * Auxiliary loop macros
- * ----------------------------------------------------------------------------- */
-
-
-/* for loop for macro with one argument */
-%define %_formacro_1(macro, arg1,...)macro(arg1)
-#if #__VA_ARGS__ != "__fordone__"
-%_formacro_1(macro, __VA_ARGS__)
-#endif
-%enddef
-
-/* for loop for macro with one argument */
-%define %formacro_1(macro,...)%_formacro_1(macro,__VA_ARGS__,__fordone__)%enddef
-%define %formacro(macro,...)%_formacro_1(macro,__VA_ARGS__,__fordone__)%enddef
-
-/* for loop for macro with two arguments */
-%define %_formacro_2(macro, arg1, arg2, ...)macro(arg1, arg2)
-#if #__VA_ARGS__ != "__fordone__"
-%_formacro_2(macro, __VA_ARGS__)
-#endif
-%enddef
-
-/* for loop for macro with two arguments */
-%define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef
-
-/* -----------------------------------------------------------------------------
- * SWIG flags
- * ----------------------------------------------------------------------------- */
-
-/*
-  mark a flag, ie, define a macro name but ignore it in
-  the interface.
-
-  the flag can be later used with %evalif
-*/
-
-%define %mark_flag(x) %define x 1 %enddef %enddef
-
-
-/*
-  %evalif and %evalif_2 are use to evaluate or process
-  an expression if the given predicate is 'true' (1).
-*/
-%define %_evalif(_x,_expr)
-#if _x == 1
-_expr
-#endif
-%enddef
-
-%define %_evalif_2(_x,_y,_expr)
-#if _x == 1 && _y == 1
-_expr
-#endif
-%enddef
-
-%define %evalif(_x,_expr...) %_evalif(%arg(_x),%arg(_expr)) %enddef
-
-%define %evalif_2(_x,_y,_expr...) %_evalif_2(%arg(_x),%arg(_y),%arg(_expr)) %enddef
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/swigobject.swg b/dependencies2013/win32/swig/Lib/typemaps/swigobject.swg
deleted file mode 100644
index b1e6dc9d..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/swigobject.swg
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ------------------------------------------------------------
- * Language Object *  - Just pass straight through unmodified
- * ------------------------------------------------------------ */
-
-%typemap(in)   SWIG_Object "$1 = $input;";
-
-%typemap(in,noblock=1)   SWIG_Object const & ($*ltype temp)
-{
-  temp = %static_cast($input, $*ltype);
-  $1 = &temp;
-}
-
-%typemap(out,noblock=1) SWIG_Object {
-  %set_output($1);
-}
-
-%typemap(out,noblock=1)  SWIG_Object const & {
-  %set_output(*$1);
-}
-
-%typecheck(SWIG_TYPECHECK_SWIGOBJECT) SWIG_Object "$1 = ($input != 0);";
-
-%typemap(throws,noblock=1) SWIG_Object {
-  %raise($1, "$type", 0);
-}
-
-%typemap(constcode,noblock=1) SWIG_Object {
-  %set_constant("$symname", $value);
-}
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-%typemap(directorin) SWIG_Object "$input = $1;";
-%typemap(directorout) SWIG_Object "$result = $input;";
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/swigtype.swg b/dependencies2013/win32/swig/Lib/typemaps/swigtype.swg
deleted file mode 100644
index d3633eb4..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/swigtype.swg
+++ /dev/null
@@ -1,699 +0,0 @@
-/* -----------------------------------------------------------------------------
- * --- Input arguments --- 
- * ----------------------------------------------------------------------------- */
-/* Pointers and arrays */
-%typemap(in, noblock=1) SWIGTYPE *(void  *argp = 0, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags);
-  if (!SWIG_IsOK(res)) { 
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-%typemap(freearg) SWIGTYPE * "";
-
-%typemap(in, noblock=1) SWIGTYPE [] (void *argp = 0, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags);
-  if (!SWIG_IsOK(res)) { 
-    %argument_fail(res, "$type", $symname, $argnum); 
-  } 
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-%typemap(freearg) SWIGTYPE [] "";
-
-
-%typemap(in, noblock=1) SWIGTYPE *const&  (void *argp = 0, int res = 0, $*1_ltype temp) {
-  res = SWIG_ConvertPtr($input, &argp, $*descriptor, $disown | %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$*ltype", $symname, $argnum); 
-  }
-  temp = %reinterpret_cast(argp, $*ltype);
-  $1 = %reinterpret_cast(&temp, $1_ltype);
-}
-%typemap(freearg) SWIGTYPE *const& "";
-
-
-/* Reference */
-%typemap(in, noblock=1) SWIGTYPE & (void *argp = 0, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-%typemap(freearg) SWIGTYPE & "";
-
-#if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(in,noblock=1,implicitconv=1) const SWIGTYPE & (void *argp = 0, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags | %implicitconv_flag);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-%typemap(freearg,noblock=1,match="in",implicitconv=1) const SWIGTYPE &
-{
-  if (SWIG_IsNewObj(res$argnum)) %delete($1);
-}
-#else
-%typemap(in,noblock=1) const SWIGTYPE & (void *argp, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-#endif
-
-/* Rvalue reference */
-%typemap(in, noblock=1) SWIGTYPE && (void *argp = 0, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-%typemap(freearg) SWIGTYPE && "";
-
-#if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(in,noblock=1,implicitconv=1) const SWIGTYPE && (void *argp = 0, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags | %implicitconv_flag);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-%typemap(freearg,noblock=1,match="in",implicitconv=1) const SWIGTYPE &&
-{
-  if (SWIG_IsNewObj(res$argnum)) %delete($1);
-}
-#else
-%typemap(in,noblock=1) const SWIGTYPE && (void *argp, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-  if (!argp) { %argument_nullref("$type", $symname, $argnum); }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-#endif
-
-/* By value */
-#if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(in,implicitconv=1) SWIGTYPE (void *argp, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }  
-  if (!argp) { 
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $&ltype temp = %reinterpret_cast(argp, $&ltype);
-    $1 = *temp;
-    if (SWIG_IsNewObj(res)) %delete(temp);
-  }
-}
-#else
-%typemap(in) SWIGTYPE (void *argp, int res = 0) {
-  res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }  
-  if (!argp) { 
-    %argument_nullref("$type", $symname, $argnum);
-  } else {
-    $1 = *(%reinterpret_cast(argp, $&ltype));
-  }
-}
-#endif
-
-
-/* -----------------------------------------------------------------------------
- * --- Output arguments --- 
- * ----------------------------------------------------------------------------- */
-
-/* Pointers, references */
-%typemap(out,noblock=1) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE[] {
-  %set_output(SWIG_NewPointerObj(%as_voidptr($1), $descriptor, $owner | %newpointer_flags));
-}
-
-%typemap(out, noblock=1) SWIGTYPE *const& {
-  %set_output(SWIG_NewPointerObj(%as_voidptr(*$1), $*descriptor, $owner | %newpointer_flags));
-}
-
-/* Return by value */
-%typemap(out, noblock=1) SWIGTYPE {
-  %set_output(SWIG_NewPointerObj(%new_copy($1, $ltype), $&descriptor, SWIG_POINTER_OWN | %newpointer_flags));
-}
-
-/* -----------------------------------------------------------------------------
- * --- Variable input --- 
- * ----------------------------------------------------------------------------- */
-
-/* memberin/globalin/varin, for fix arrays. */
-
-%typemap(memberin) SWIGTYPE [ANY] {
-  if ($input) {
-    size_t ii = 0;
-    for (; ii < (size_t)$1_dim0; ++ii) *($1_basetype *)&$1[ii] = *(($1_basetype *)$input + ii);
-  } else {
-    %variable_nullref("$type","$name");
-  }
-}
-
-%typemap(globalin) SWIGTYPE [ANY] {
-  if ($input) {
-    size_t ii = 0;
-    for (; ii < (size_t)$1_dim0; ++ii) *($1_basetype *)&$1[ii] = *(($1_basetype *)$input + ii);
-  } else {
-    %variable_nullref("$type","$name");
-  }
-}
-
-%typemap(varin) SWIGTYPE [ANY] {
-  $basetype *inp = 0;
-  int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  } else if (inp) {
-    size_t ii = 0;
-    for (; ii < (size_t)$1_dim0; ++ii) *($1_basetype *)&$1[ii] = *(($1_basetype *)inp + ii);
-  } else {
-    %variable_nullref("$type", "$name");
-  }
-}
-
-
-/* memberin/globalin/varin, for fix double arrays. */
-
-%typemap(memberin) SWIGTYPE [ANY][ANY] {
-  if ($input) {
-    size_t ii = 0;
-    for (; ii < (size_t)$1_dim0; ++ii) {
-      if ($input[ii]) {
-	size_t jj = 0;
-	for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj];
-      } else {
-	%variable_nullref("$type","$name");
-      }
-    }
-  } else {
-    %variable_nullref("$type","$name");
-  }
-}
-
-%typemap(globalin) SWIGTYPE [ANY][ANY] {
-  if ($input) {
-    size_t ii = 0;
-    for (; ii < (size_t)$1_dim0; ++ii) {
-      if ($input[ii]) {
-	size_t jj = 0;
-	for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj];
-      } else {
-	%variable_nullref("$type","$name");
-      }
-    }
-  } else {
-    %variable_nullref("$type","$name");
-  }
-}
-
-%typemap(varin) SWIGTYPE [ANY][ANY] {
-  $basetype (*inp)[$1_dim1] = 0;
-  int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  } else if (inp) {
-    size_t ii = 0;
-    for (; ii < (size_t)$1_dim0; ++ii) {
-      if (inp[ii]) {
-	size_t jj = 0;
-	for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = inp[ii][jj];
-      } else {
-	%variable_nullref("$type", "$name");
-      }
-    }
-  } else {
-    %variable_nullref("$type", "$name");
-  }
-}
-
-/* Pointers, references, and variable size arrays */
-
-%typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE * {
-  void *argp = 0;
-  int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);  
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = %reinterpret_cast(argp, $ltype);
-}
-
-%typemap(varin,noblock=1,warning="462:Unable to set dimensionless array variable") SWIGTYPE []
-{
-  %variable_fail(SWIG_AttributeError, "$type", "read-only $name");
-}
-
-%typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE & {
-  void *argp = 0;
-  int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  $1 = *(%reinterpret_cast(argp, $ltype));
-}
-
-%typemap(varin,warning=SWIGWARN_TYPEMAP_SWIGTYPELEAK_MSG) SWIGTYPE && {
-  void *argp = 0;
-  int res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  }
-  $1 = *(%reinterpret_cast(argp, $ltype));
-}
-
-#if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(varin,implicitconv=1) SWIGTYPE {
-  void *argp = 0;
-  int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $&type temp;
-    temp  = %reinterpret_cast(argp, $&type);
-    $1 = *temp;
-    if (SWIG_IsNewObj(res)) %delete(temp);
-  }
-}
-#else
-%typemap(varin) SWIGTYPE {
-  void *argp = 0;
-  int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  if (!argp) {
-    %variable_nullref("$type", "$name");
-  } else {
-    $1 = *(%reinterpret_cast(argp, $&type));
-  }
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- * --- Variable output --- 
- * ----------------------------------------------------------------------------- */
-
-/* Pointers and arrays */
-%typemap(varout, noblock=1) SWIGTYPE * {
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr($1), $descriptor, %newpointer_flags));
-}
-
-%typemap(varout, noblock=1) SWIGTYPE [] {
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr($1), $descriptor, %newpointer_flags));
-}
-
-/* References */
-%typemap(varout, noblock=1) SWIGTYPE & {
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(&$1), $descriptor, %newpointer_flags));
-}
-
-%typemap(varout, noblock=1) SWIGTYPE && {
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(&$1), $descriptor, %newpointer_flags));
-}
-
-/* Value */
-%typemap(varout, noblock=1) SWIGTYPE {
-  %set_varoutput(SWIG_NewPointerObj(%as_voidptr(&$1), $&descriptor, %newpointer_flags));
-}
-
-/* ------------------------------------------------------------
- * --- Typechecking rules ---
- * ------------------------------------------------------------ */
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) SWIGTYPE * {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) SWIGTYPE *const& {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $*descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) SWIGTYPE & {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) SWIGTYPE && {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-#if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1,implicitconv=1) const SWIGTYPE & {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor, %implicitconv_flag);
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1,implicitconv=1) const SWIGTYPE && {
-  int res = SWIG_ConvertPtr($input, 0, $descriptor, %implicitconv_flag);
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1,implicitconv=1) SWIGTYPE {
-  int res = SWIG_ConvertPtr($input, 0, $&descriptor, %implicitconv_flag);
-  $1 = SWIG_CheckState(res);
-}
-#else
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) const SWIGTYPE & {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) const SWIGTYPE && {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) SWIGTYPE {
-  void *vptr = 0;
-  int res = SWIG_ConvertPtr($input, &vptr, $&descriptor, 0);
-  $1 = SWIG_CheckState(res);
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- * --- Director typemaps --- *  
- * ----------------------------------------------------------------------------- */
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-
-%typemap(directorin,noblock=1) SWIGTYPE *, SWIGTYPE *const& {
-  $input = SWIG_NewPointerObj(%as_voidptr($1), $descriptor, %newpointer_flags);
-}
-
-%typemap(directorin,noblock=1) SWIGTYPE {
-  $input = SWIG_NewPointerObj(%as_voidptr(new $1_ltype((const $1_ltype &)$1)), $&descriptor, SWIG_POINTER_OWN | %newpointer_flags);
-}
-
-%typemap(directorin,noblock=1) SWIGTYPE & {
-  $input = SWIG_NewPointerObj(%as_voidptr(&$1), $descriptor, %newpointer_flags);
-}
-
-%typemap(directorin,noblock=1) SWIGTYPE && {
-  $input = SWIG_NewPointerObj(%as_voidptr(&$1_name), $descriptor, %newpointer_flags);
-}
-
-/* directorout */
-#if defined(__cplusplus) && defined(%implicitconv_flag)
-%typemap(directorout,noblock=1,implicitconv=1) SWIGTYPE (void * swig_argp, int swig_res = 0) {
-  swig_res = SWIG_ConvertPtr($input,&swig_argp,$&descriptor, %convertptr_flags | %implicitconv_flag);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-  $result = *(%reinterpret_cast(swig_argp, $&ltype));
-  if (SWIG_IsNewObj(swig_res)) %delete(%reinterpret_cast(swig_argp, $&ltype));
-}
-#else
-%typemap(directorout,noblock=1) SWIGTYPE (void * swig_argp, int swig_res = 0) {
-  swig_res = SWIG_ConvertPtr($input,&swig_argp,$&descriptor, %convertptr_flags);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-  $result = *(%reinterpret_cast(swig_argp, $&ltype));
-}
-#endif
-
-%typemap(directorout,noblock=1,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) 
-  SWIGTYPE *(void *swig_argp, int swig_res, swig_owntype own) {
-  swig_res = SWIG_ConvertPtrAndOwn($input, &swig_argp, $descriptor, %convertptr_flags | SWIG_POINTER_DISOWN, &own);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-  $result = %reinterpret_cast(swig_argp, $ltype);
-  swig_acquire_ownership_obj(%as_voidptr($result), own /* & TODO: SWIG_POINTER_OWN */);
-}
-%typemap(directorfree,noblock=1,match="directorout") SWIGTYPE * {
-  if (director) {
-    SWIG_AcquirePtr($result, director->swig_release_ownership(%as_voidptr($input)));
-  }
-}
-
-%typemap(directorout,noblock=1,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) 
-  SWIGTYPE &(void *swig_argp, int swig_res, swig_owntype own) {
-  swig_res = SWIG_ConvertPtrAndOwn($input, &swig_argp, $descriptor, %convertptr_flags | SWIG_POINTER_DISOWN, &own);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-  if (!swig_argp) { %dirout_nullref("$type"); }
-  $result = %reinterpret_cast(swig_argp, $ltype);
-  swig_acquire_ownership_obj(%as_voidptr($result), own /* & TODO: SWIG_POINTER_OWN */);
-}
-%typemap(directorfree,noblock=1,match="directorout") SWIGTYPE & {
-  if (director) {
-    SWIG_AcquirePtr($result, director->swig_release_ownership(%as_voidptr($input)));
-  }
-}
-
-%typemap(directorout,noblock=1,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) 
-  SWIGTYPE &&(void *swig_argp, int swig_res, swig_owntype own) {
-  swig_res = SWIG_ConvertPtrAndOwn($input, &swig_argp, $descriptor, %convertptr_flags | SWIG_POINTER_DISOWN, &own);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-  if (!swig_argp) { %dirout_nullref("$type"); }
-  $result = %reinterpret_cast(swig_argp, $ltype);
-  swig_acquire_ownership_obj(%as_voidptr($result), own /* & TODO: SWIG_POINTER_OWN */);
-}
-%typemap(directorfree,noblock=1,match="directorout") SWIGTYPE && {
-  if (director) {
-    SWIG_AcquirePtr($result, director->swig_release_ownership(%as_voidptr($input)));
-  }
-}
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
-
-/* ------------------------------------------------------------
- * --- Constants ---
- * ------------------------------------------------------------ */
-
-%typemap(constcode,noblock=1) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] {
-  %set_constant("$symname", SWIG_NewPointerObj(%as_voidptr($value),$descriptor,%newpointer_flags));
-}
-
-%typemap(constcode,noblock=1) SWIGTYPE {
-  %set_constant("$symname", SWIG_NewPointerObj(%as_voidptr(&$value),$&descriptor,%newpointer_flags));
-}
-
-/* ------------------------------------------------------------
- * --- Exception handling ---
- * ------------------------------------------------------------ */
-
-%typemap(throws,noblock=1) SWIGTYPE {
-  %raise(SWIG_NewPointerObj(%new_copy($1, $ltype),$&descriptor,SWIG_POINTER_OWN), "$type", $&descriptor);
-}
-
-%typemap(throws,noblock=1) SWIGTYPE * {
-  %raise(SWIG_NewPointerObj(%as_voidptr($1),$descriptor,0), "$type", $descriptor);
-}
-
-%typemap(throws,noblock=1) SWIGTYPE [ANY] {
-  %raise(SWIG_NewPointerObj(%as_voidptr($1),$descriptor,0), "$type", $descriptor);
-}
-
-%typemap(throws,noblock=1) SWIGTYPE & {
-  %raise(SWIG_NewPointerObj(%as_voidptr(&$1),$descriptor,0), "$type", $descriptor);
-}
-
-%typemap(throws,noblock=1) SWIGTYPE && {
-  %raise(SWIG_NewPointerObj(%as_voidptr(&$1),$descriptor,0), "$type", $descriptor);
-}
-
-%typemap(throws,noblock=1) (...) {
-  SWIG_exception_fail(SWIG_RuntimeError,"unknown exception");
-}
-
-/* ------------------------------------------------------------
- * --- CLASS::* typemaps --- 
- * ------------------------------------------------------------ */
-
-%typemap(in) SWIGTYPE (CLASS::*) {  
-  int res = SWIG_ConvertMember($input, %as_voidptr(&$1), sizeof($type),$descriptor);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum); 
-  }
-}
-
-%typemap(out,noblock=1) SWIGTYPE (CLASS::*) {
-  %set_output(SWIG_NewMemberObj(%as_voidptr(&$1), sizeof($type), $descriptor));
-}
-
-%typemap(varin) SWIGTYPE (CLASS::*) {
-  int res = SWIG_ConvertMember($input,%as_voidptr(&$1), sizeof($type), $descriptor);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name"); 
-  }
-}
-
-%typemap(varout,noblock=1) SWIGTYPE (CLASS::*) {
-  %set_varoutput(SWIG_NewMemberObj(%as_voidptr(&$1), sizeof($type), $descriptor));
-}
-
-%typemap(constcode,noblock=1) SWIGTYPE (CLASS::*) {
-  %set_constant("$symname", SWIG_NewMemberObj(%as_voidptr(&$value), sizeof($type), $descriptor));
-}
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-
-%typemap(directorin,noblock=1) SWIGTYPE (CLASS::*) {
-  $input = SWIG_NewMemberObj(%as_voidptr(&$1), sizeof($type), $descriptor);
-}
-
-/* directorout */
-
-%typemap(directorout) SWIGTYPE (CLASS::*) {
-  int swig_res = SWIG_ConvertMember($input,%as_voidptr(&$result), sizeof($type), $descriptor);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-}
-#endif
-
-/* ------------------------------------------------------------
- * --- function ptr typemaps --- 
- * ------------------------------------------------------------ */
-
-/*
-  ISO C++ doesn't allow direct casting of a function ptr to a object
-  ptr. So, maybe the ptr sizes are not the same, and we need to take
-  some providences.
- */
-%typemap(in) SWIGTYPE ((*)(ANY)) {
-  int res = SWIG_ConvertFunctionPtr($input, (void**)(&$1), $descriptor);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type",$symname, $argnum); 
-  }
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER,noblock=1) SWIGTYPE ((*)(ANY)) {
-  void *ptr = 0;
-  int res = SWIG_ConvertFunctionPtr($input, &ptr, $descriptor);
-  $1 = SWIG_CheckState(res);
-}
-
-
-%typemap(out, noblock=1) SWIGTYPE ((*)(ANY)) {
-  %set_output(SWIG_NewFunctionPtrObj((void *)($1), $descriptor));
-}
-
-%typemap(varin) SWIGTYPE ((*)(ANY)) {
-  int res = SWIG_ConvertFunctionPtr($input, (void**)(&$1), $descriptor);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name"); 
-  }
-}
-
-%typemap(varout,noblock=1) SWIGTYPE ((*)(ANY)) {  
-  %set_varoutput(SWIG_NewFunctionPtrObj((void *)($1), $descriptor));
-}
-
-%typemap(constcode, noblock=1) SWIGTYPE ((*)(ANY)){
-  %set_constant("$symname", SWIG_NewFunctionPtrObj((void *)$value, $descriptor));
-}
-%typemap(constcode) SWIGTYPE ((* const)(ANY)) = SWIGTYPE ((*)(ANY));
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-
-%typemap(directorin,noblock=1) SWIGTYPE ((*)(ANY)) {
-  $input = SWIG_NewFunctionPtrObj((void*)($1), $descriptor);
-}
-
-/* directorout */
-
-%typemap(directorout) SWIGTYPE ((*)(ANY)) {
-  int swig_res = SWIG_ConvertFunctionPtr($input,(void**)(&$result),$descriptor);
-  if (!SWIG_IsOK(swig_res)) {
-    %dirout_fail(swig_res,"$type");
-  }
-}
-#endif
-
-%apply SWIGTYPE * { SWIGTYPE *const }
-
-/* ------------------------------------------------------------
- * --- Special typemaps ---
- * ------------------------------------------------------------ */
-
-/* DISOWN typemap */
-
-%typemap(in, noblock=1) SWIGTYPE *DISOWN (int res = 0) {
-  res = SWIG_ConvertPtr($input, %as_voidptrptr(&$1), $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %argument_fail(res,"$type", $symname, $argnum);
-  }
-}
-
-%typemap(varin) SWIGTYPE *DISOWN {
-  void *temp = 0;
-  int res = SWIG_ConvertPtr($input, &temp, $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = ($ltype) temp;
-}
-
-/* DYNAMIC typemap */
-
-%typemap(out,noblock=1) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC {
-  %set_output(SWIG_NewPointerObj(%as_voidptr($1), SWIG_TypeDynamicCast($descriptor, %as_voidptrptr(&$1)), $owner | %newpointer_flags));
-}
-
-/* INSTANCE typemap */
-
-%typemap(out,noblock=1) SWIGTYPE INSTANCE {
-  %set_output(SWIG_NewInstanceObj(%new_copy($1, $1_ltype), $&1_descriptor, SWIG_POINTER_OWN | %newinstance_flags));
-}
-
-%typemap(out,noblock=1) SWIGTYPE *INSTANCE, SWIGTYPE &INSTANCE, SWIGTYPE INSTANCE[] {
-  %set_output(SWIG_NewInstanceObj(%as_voidptr($1), $1_descriptor, $owner | %newinstance_flags));
-}
-
-%typemap(varout,noblock=1) SWIGTYPE *INSTANCE, SWIGTYPE INSTANCE[] {
-  %set_varoutput(SWIG_NewInstanceObj(%as_voidptr($1), $1_descriptor, %newinstance_flags));
-}
-
-%typemap(varout,noblock=1) SWIGTYPE &INSTANCE {
-  %set_varoutput(SWIG_NewInstanceObj(%as_voidptr($1), $1_descriptor, %newinstance_flags));
-}
-
-%typemap(varout,noblock=1) SWIGTYPE INSTANCE {
-  %set_varoutput(SWIG_NewInstanceObj(%as_voidptr(&$1), $&1_descriptor, %newinstance_flags));
-}
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/swigtypemaps.swg b/dependencies2013/win32/swig/Lib/typemaps/swigtypemaps.swg
deleted file mode 100644
index 4e5bb2b0..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/swigtypemaps.swg
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -----------------------------------------------------------------------------
- * swigtypemaps.swg
- *
- * Unified Typemap Library frontend
- * ----------------------------------------------------------------------------- */
-
-/*
-  This file provides the frontend to the Unified Typemap Library.
-
-  When using this library in a SWIG target language, you need to
-  define a minimum set of fragments, specialize a couple of macros,
-  and then include this file.
-
-  Typically you will create a 'mytypemaps.swg' file in each target
-  language, where you will have the following sections:
-
-    === mytypemaps.swg ===
-
-    //  Fragment section 
-    %include <typemaps/fragments.swg>
-    <include target language fragments>
-
-    // Unified typemap section 
-    <specialized the typemap library macros>
-    %include <typemaps/swigtypemaps.swg>
-
-    // Local typemap section 
-    <add/replace extra target language typemaps>
-
-    === mytypemaps.swg ===
-
-  While we add more docs, please take a look at the following cases
-  to see how you specialized the unified typemap library for a new
-  target language:
-
-      Lib/python/pytypemaps.swg
-      Lib/tcl/tcltypemaps.swg
-      Lib/ruby/rubytypemaps.swg
-      Lib/perl5/perltypemaps.swg
-    
-*/
-
-#define SWIGUTL SWIGUTL
-
-/* -----------------------------------------------------------------------------
- *   Language specialization section. 
- *
- *   Tune these macros for each language as needed.
- * ----------------------------------------------------------------------------- */
-
-/*
-  The SWIG target language object must be provided.
-  For example in python you define:
-
-    #define SWIG_Object PyObject *
-*/
-
-#if !defined(SWIG_Object) 
-#error "SWIG_Object must be defined as the SWIG target language object"
-#endif
-
-/*==== flags for new/convert methods ====*/
-
-
-#ifndef %convertptr_flags
-%define %convertptr_flags  0 %enddef
-#endif
-
-#ifndef %newpointer_flags
-%define %newpointer_flags  0 %enddef
-#endif
-
-#ifndef %newinstance_flags
-%define %newinstance_flags 0 %enddef
-#endif
-
-/*==== set output ====*/
-
-#ifndef %set_output
-/* simple set output operation */
-#define %set_output(obj)                  $result = obj
-#endif
-
-/*==== set variable output  ====*/
-
-#ifndef %set_varoutput
-/* simple set varoutput operation */
-#define %set_varoutput(obj)               $result = obj
-#endif
-
-/*==== append output ====*/
-
-#ifndef %append_output
-#if defined(SWIG_AppendOutput)
-/* simple append operation */
-#define %append_output(obj)               $result = SWIG_AppendOutput($result,obj) 
-#else
-#error "Language must define SWIG_AppendOutput or %append_output"
-#endif
-#endif
-
-/*==== set constant ====*/
-
-#ifndef %set_constant
-#if defined(SWIG_SetConstant)
-/* simple set constant operation */
-#define %set_constant(name,value)         SWIG_SetConstant(name,value)
-#else
-#error "Language must define SWIG_SetConstant or %set_constant"
-#endif
-#endif
-
-/*==== raise an exception ====*/
-
-#ifndef %raise
-#if defined(SWIG_Raise)
-/* simple raise operation */
-#define %raise(obj, type, desc)           SWIG_Raise(obj, type, desc); SWIG_fail
-#else
-#error "Language must define SWIG_Raise or %raise"
-#endif
-#endif
-
-/*==== director output exception ====*/
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-#ifndef SWIG_DirOutFail
-#define SWIG_DirOutFail(code, msg)        Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(code), msg)
-#endif
-#endif
-
-
-/* -----------------------------------------------------------------------------
- *  Language independent definitions
- * ----------------------------------------------------------------------------- */
-
-#define %error_block(Block...)                 %block(Block)
-#define %default_code(code)                    SWIG_ArgError(code)  
-#define %argument_fail(code, type, name, argn) SWIG_exception_fail(%default_code(code), %argfail_fmt(type, name, argn))
-#define %argument_nullref(type, name, argn)    SWIG_exception_fail(SWIG_ValueError, %argnullref_fmt(type, name, argn))
-#define %variable_fail(code, type, name)       SWIG_exception_fail(%default_code(code), %varfail_fmt(type, name))
-#define %variable_nullref(type, name)          SWIG_exception_fail(SWIG_ValueError, %varnullref_fmt(type, name))
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-#define %dirout_fail(code, type)          SWIG_DirOutFail(%default_code(code), %outfail_fmt(type))
-#define %dirout_nullref(type)             SWIG_DirOutFail(SWIG_ValueError, %outnullref_fmt(type))
-#endif
-
-/* -----------------------------------------------------------------------------
- *  All the typemaps
- * ----------------------------------------------------------------------------- */
-
-
-%include <typemaps/fragments.swg>
-%include <typemaps/exception.swg>
-%include <typemaps/swigtype.swg>
-%include <typemaps/void.swg>
-%include <typemaps/swigobject.swg>
-%include <typemaps/valtypes.swg>
-%include <typemaps/ptrtypes.swg>
-%include <typemaps/inoutlist.swg>
-%include <typemaps/primtypes.swg>
-%include <typemaps/string.swg>
-%include <typemaps/misctypes.swg>
-%include <typemaps/enumint.swg>
-
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/typemaps.swg b/dependencies2013/win32/swig/Lib/typemaps/typemaps.swg
deleted file mode 100644
index 4629e8df..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/typemaps.swg
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -----------------------------------------------------------------------------
- * typemaps.swg
- *
- * Tcl Pointer handling
- *
- * These mappings provide support for input/output arguments and common
- * uses for C/C++ pointers.
- * ----------------------------------------------------------------------------- */
-
-// INPUT typemaps.
-// These remap a C pointer to be an "INPUT" value which is passed by value
-// instead of reference.
-
-/* 
-The following methods can be applied to turn a pointer into a simple
-"input" value.  That is, instead of passing a pointer to an object,
-you would use a real value instead.
-
-         int            *INPUT
-         short          *INPUT
-         long           *INPUT
-	 long long      *INPUT
-         unsigned int   *INPUT
-         unsigned short *INPUT
-         unsigned long  *INPUT
-         unsigned long long *INPUT
-         unsigned char  *INPUT
-         bool           *INPUT
-         float          *INPUT
-         double         *INPUT
-         
-To use these, suppose you had a C function like this :
-
-        double fadd(double *a, double *b) {
-               return *a+*b;
-        }
-
-You could wrap it with SWIG as follows :
-        
-        %include <typemaps.i>
-        double fadd(double *INPUT, double *INPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INPUT { double *a, double *b };
-        double fadd(double *a, double *b);
-
-*/
-
-// OUTPUT typemaps.   These typemaps are used for parameters that
-// are output only.   The output value is appended to the result as
-// a list element.
-
-/* 
-The following methods can be applied to turn a pointer into an "output"
-value.  When calling a function, no input value would be given for
-a parameter, but an output value would be returned.  In the case of
-multiple output values, they are returned in the form of a Tcl tuple.
-
-         int            *OUTPUT
-         short          *OUTPUT
-         long           *OUTPUT
-         long long      *OUTPUT
-         unsigned int   *OUTPUT
-         unsigned short *OUTPUT
-         unsigned long  *OUTPUT
-         unsigned long long *OUTPUT
-         unsigned char  *OUTPUT
-         bool           *OUTPUT
-         float          *OUTPUT
-         double         *OUTPUT
-         
-For example, suppose you were trying to wrap the modf() function in the
-C math library which splits x into integral and fractional parts (and
-returns the integer part in one of its parameters).K:
-
-        double modf(double x, double *ip);
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        double modf(double x, double *OUTPUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *OUTPUT { double *ip };
-        double modf(double x, double *ip);
-
-The Tcl output of the function would be a tuple containing both
-output values. 
-
-*/
-
-// INOUT
-// Mappings for an argument that is both an input and output
-// parameter
-
-/*
-The following methods can be applied to make a function parameter both
-an input and output value.  This combines the behavior of both the
-"INPUT" and "OUTPUT" methods described earlier.  Output values are
-returned in the form of a Tcl tuple.  
-
-         int            *INOUT
-         short          *INOUT
-         long           *INOUT
-         long long      *INOUT
-         unsigned int   *INOUT
-         unsigned short *INOUT
-         unsigned long  *INOUT
-         unsigned long long *INOUT
-         unsigned char  *INOUT
-         bool           *INOUT
-         float          *INOUT
-         double         *INOUT
-         
-For example, suppose you were trying to wrap the following function :
-
-        void neg(double *x) {
-             *x = -(*x);
-        }
-
-You could wrap it with SWIG as follows :
-
-        %include <typemaps.i>
-        void neg(double *INOUT);
-
-or you can use the %apply directive :
-
-        %include <typemaps.i>
-        %apply double *INOUT { double *x };
-        void neg(double *x);
-
-Unlike C, this mapping does not directly modify the input value (since
-this makes no sense in Tcl).  Rather, the modified input value shows
-up as the return value of the function.  Thus, to apply this function
-to a Tcl variable you might do this :
-
-       x = neg(x)
-
-Note : previous versions of SWIG used the symbol 'BOTH' to mark
-input/output arguments.   This is still supported, but will be slowly
-phased out in future releases.
-
-*/
-
-
-#if defined(SWIG_INOUT_NODEF)
-
-%apply_checkctypes(%typemaps_inoutn)
-
-%apply size_t& { std::size_t& };
-%apply ptrdiff_t& { std::ptrdiff_t& };
-
-#endif
diff --git a/dependencies2013/win32/swig/Lib/typemaps/valtypes.swg b/dependencies2013/win32/swig/Lib/typemaps/valtypes.swg
deleted file mode 100644
index 11eac598..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/valtypes.swg
+++ /dev/null
@@ -1,215 +0,0 @@
-/*---------------------------------------------------------------------
- * Value typemaps (Type, const Type&) for value types, such as
- * fundamental types (int, double), that define the AsVal/From
- * methods.
- *
- * To apply them, just use one of the following macros:
- *
- *   %typemaps_from(FromMeth, FromFrag, Type)
- *   %typemaps_asval(CheckCode, AsValMeth, AsValFrag, Type)
- *   %typemaps_asvalfrom(CheckCode, AsValMeth, FromMeth, AsValFrag, FromFrag, Type)
- *
- * or the simpler and normalize form:
- *
- *   %typemaps_asvalfromn(CheckCode, Type)
- *
- * Also, you can use the individual typemap definitions:
- *
- *    %value_in_typemap(asval_meth,frag,Type)
- *    %value_varin_typemap(asval_meth,frag,Type)
- *    %value_typecheck_typemap(checkcode,asval_meth,frag,Type)
- *    %value_directorout_typemap(asval_meth,frag,Type)
- *
- *    %value_out_typemap(from_meth,frag,Type)
- *    %value_varout_typemap(from_meth,frag,Type)
- *    %value_constcode_typemap(from_meth,frag,Type)
- *    %value_directorin_typemap(from_meth,frag,Type)
- *    %value_throws_typemap(from_meth,frag,Type)
- *
- *---------------------------------------------------------------------*/
-
-/* in */
-
-%define %value_in_typemap(asval_meth,frag,Type...)
-  %typemap(in,noblock=1,fragment=frag) Type (Type val, int ecode = 0) {
-    ecode = asval_meth($input, &val);
-    if (!SWIG_IsOK(ecode)) {
-      %argument_fail(ecode, "$ltype", $symname, $argnum);
-    } 
-    $1 = %static_cast(val,$ltype);
-  }
-  %typemap(freearg) Type "";
-  %typemap(in,noblock=1,fragment=frag) const Type & ($*ltype temp, Type val, int ecode = 0) {  
-    ecode = asval_meth($input, &val);
-    if (!SWIG_IsOK(ecode)) {
-      %argument_fail(ecode, "$*ltype", $symname, $argnum);
-    } 
-    temp = %static_cast(val, $*ltype);
-    $1 = &temp;
-  }
-  %typemap(freearg) const Type& "";
-%enddef
-
-/* out */
-
-%define %value_out_typemap(from_meth,frag,Type...)
-  %typemap(out,noblock=1,fragment=frag) Type, const Type {
-    %set_output(from_meth(%static_cast($1,Type))); 
-  }
-  %typemap(out,noblock=1,fragment=frag) const Type& {
-    %set_output(from_meth(%static_cast(*$1,Type))); 
-  }
-%enddef
-
-/* varin */
-
-%define %value_varin_typemap(asval_meth,frag,Type...)
-  %typemap(varin,fragment=frag) Type {
-    Type val;
-    int res = asval_meth($input, &val);
-    if (!SWIG_IsOK(res)) {
-      %variable_fail(res, "$type", "$name");
-    }
-    $1 = %static_cast(val,$ltype);
-  }
-%enddef
-
-/* varout */
-
-%define %value_varout_typemap(from_meth,frag,Type...)
-  %typemap(varout,noblock=1,fragment=frag) Type, const Type&  {
-    %set_varoutput(from_meth(%static_cast($1,Type)));
-  }
-%enddef
-
-/* constant installation code */
-
-%define %value_constcode_typemap(from_meth,frag,Type...)
-  %typemap(constcode,noblock=1,fragment=frag) Type {
-    %set_constant("$symname", from_meth(%static_cast($value,Type)));
-  }
-%enddef
-
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-
-%define %value_directorin_typemap(from_meth,frag,Type...)
-  %typemap(directorin,noblock=1,fragment=frag) Type *DIRECTORIN {
-    $input = from_meth(%static_cast(*$1,Type)); 
-  }
-  %typemap(directorin,noblock=1,fragment=frag) Type, const Type& {
-    $input = from_meth(%static_cast($1,Type)); 
-  }
-%enddef
-
-/* directorout */
-
-%define %value_directorout_typemap(asval_meth,frag,Type...)
-  %typemap(directorargout,noblock=1,fragment=frag) Type *DIRECTOROUT(Type swig_val, int swig_res) {
-    swig_res = asval_meth($result, &swig_val);
-    if (!SWIG_IsOK(swig_res)) {
-      %dirout_fail(swig_res, "$type");
-    } 
-    *$1 = swig_val;
-  }
-  %typemap(directorout,noblock=1,fragment=frag) Type {
-    Type swig_val;
-    int swig_res = asval_meth($input, &swig_val);
-    if (!SWIG_IsOK(swig_res)) {
-      %dirout_fail(swig_res, "$type");
-    }
-    $result = %static_cast(swig_val,$type);
-  }
-  %typemap(directorout,noblock=1,fragment=frag,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) const Type& {  
-    Type swig_val;
-    int swig_res = asval_meth($input, &swig_val);
-    if (!SWIG_IsOK(swig_res)) {
-      %dirout_fail(swig_res, "$type");
-    } 
-    $basetype *temp = new $basetype(($basetype)swig_val);
-    swig_acquire_ownership(temp);
-    $result = temp;
-  }
-  %typemap(directorfree,noblock=1) const Type & {
-    if (director) {
-      director->swig_release_ownership(%as_voidptr($input));
-    }
-  }
-  %typemap(directorout,fragment=frag) Type &DIRECTOROUT = Type
-%enddef
-
-#else
-
-#define %value_directorin_typemap(from_meth,frag,Type...)
-#define %value_directorout_typemap(asval_meth,frag,Type...)
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
-
-/* throws */
-
-%define %value_throws_typemap(from_meth,frag,Type...)
-  %typemap(throws,noblock=1,fragment=frag) Type {
-    %raise(from_meth(%static_cast($1,Type)), "$type", 0);
-  }
-%enddef
-
-/* typecheck */
-
-%define %value_typecheck_typemap(check,asval_meth,frag,Type...)
-  %typemap(typecheck,precedence=check,fragment=frag) Type, const Type& {
-    int res = asval_meth($input, NULL);
-    $1 = SWIG_CheckState(res);
-  }
-%enddef
-
-/*---------------------------------------------------------------------
- * typemap definition for types with AsVal methods
- *---------------------------------------------------------------------*/
-%define %typemaps_asval(CheckCode, AsValMeth, AsValFrag, Type...)
-  %value_in_typemap(%arg(AsValMeth), %arg(AsValFrag), Type);
-  %value_varin_typemap(%arg(AsValMeth), %arg(AsValFrag), Type);
-  %value_directorout_typemap(%arg(AsValMeth), %arg(AsValFrag), Type);
-  %value_typecheck_typemap(%arg(CheckCode), %arg(AsValMeth), %arg(AsValFrag), Type);
-  %value_input_typemap(%arg(CheckCode), %arg(AsValMeth), %arg(AsValFrag), Type);
-%enddef
-
-
-/*---------------------------------------------------------------------
- * typemap definition for types with from method
- *---------------------------------------------------------------------*/
-%define %typemaps_from(FromMeth, FromFrag, Type...)
-  %value_out_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_varout_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_constcode_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_directorin_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_throws_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_output_typemap(%arg(FromMeth), %arg(FromFrag), Type);
-%enddef
-
-
-/*---------------------------------------------------------------------
- * typemap definition for types with alval/from method
- *---------------------------------------------------------------------*/
-
-%define %typemaps_asvalfrom(CheckCode, AsValMeth, FromMeth,
-			   AsValFrag, FromFrag, Type...)
-  %typemaps_asval(%arg(CheckCode), %arg(AsValMeth), %arg(AsValFrag), Type);
-  %typemaps_from(%arg(FromMeth), %arg(FromFrag), Type);
-  %value_inout_typemap(Type);
-%enddef
-
-
-/*---------------------------------------------------------------------
- * typemap definition for types  with for 'normalized' asval/from methods
- *---------------------------------------------------------------------*/
-%define %typemaps_asvalfromn(CheckCode, Type...)
-  %typemaps_asvalfrom(%arg(CheckCode),
-		     SWIG_AsVal(Type), 
-		     SWIG_From(Type), 
-		     %arg(SWIG_AsVal_frag(Type)),
-		     %arg(SWIG_From_frag(Type)), 
-		     Type);
-%enddef
diff --git a/dependencies2013/win32/swig/Lib/typemaps/void.swg b/dependencies2013/win32/swig/Lib/typemaps/void.swg
deleted file mode 100644
index bbd68ed8..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/void.swg
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ------------------------------------------------------------
- * Void * -  Accepts any kind of pointer
- * ------------------------------------------------------------ */
-
-/* in */
-
-%typemap(in,noblock=1) void * (int res) {
-  res = SWIG_ConvertPtr($input,%as_voidptrptr(&$1), 0, $disown);
-  if (!SWIG_IsOK(res)) { 
-    %argument_fail(res, "$type", $symname, $argnum); 
-  }
-}
-%typemap(freearg) void * "";
-
-%typemap(in,noblock=1) void * const& ($*ltype temp = 0, int res) {
-  res = SWIG_ConvertPtr($input, %as_voidptrptr(&temp), 0, $disown);
-  if (!SWIG_IsOK(res)) { 
-    %argument_fail(res, "Stype", $symname, $argnum); 
-  }
-  $1 =  &temp;
-}
-%typemap(freearg) void * const& "";
-
-
-/* out */
-
-#if defined(VOID_Object)
-%typemap(out,noblock=1) void { $result = VOID_Object; }
-#else
-%typemap(out,noblock=1) void {}
-#endif
-
-/* varin */
-
-%typemap(varin) void * {
-  void *temp = 0;
-  int res = SWIG_ConvertPtr($input, &temp, 0, SWIG_POINTER_DISOWN);
-  if (!SWIG_IsOK(res)) {
-    %variable_fail(res, "$type", "$name");
-  }
-  $1 = ($1_ltype) temp;
-}
-
-/* typecheck */
-
-%typecheck(SWIG_TYPECHECK_VOIDPTR, noblock=1) void *
-{
-  void *ptr = 0;
-  int res = SWIG_ConvertPtr($input, &ptr, 0, 0);
-  $1 = SWIG_CheckState(res);
-}
-
-#if defined(SWIG_DIRECTOR_TYPEMAPS)
-
-/* directorin */
-
-%typemap(directorin,noblock=1) void *, void const*, void *const, void const *const, 
-  void const *&, void *const &, void const *const & {
-  $input = SWIG_NewPointerObj(%as_voidptr($1), $descriptor, %newpointer_flags);
-}
-
-/* directorout */
-
-%typemap(directorout,noblock=1) void * (void *argp, int res) {
-  res = SWIG_ConvertPtr($input, &argp, 0, 0);
-  if (!SWIG_IsOK(res)) {
-    %dirout_fail(res,"$type");
-  }
-  $result = %reinterpret_cast(argp, $ltype);
-}
-
-%typemap(directorout,noblock=1,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) void * const& (void *argp, int res) {
-  res = SWIG_ConvertPtr($input, &argp, 0, $disown);
-  if (!SWIG_IsOK(res)) { 
-    %dirout_fail(res,"$type");
-  }
-  static $*ltype temp = %reinterpret_cast(argp, $*ltype);
-  $result =  &temp;
-}
-
-
-
-#endif /* SWIG_DIRECTOR_TYPEMAPS */
-
diff --git a/dependencies2013/win32/swig/Lib/typemaps/wstring.swg b/dependencies2013/win32/swig/Lib/typemaps/wstring.swg
deleted file mode 100644
index cd409d1c..00000000
--- a/dependencies2013/win32/swig/Lib/typemaps/wstring.swg
+++ /dev/null
@@ -1,37 +0,0 @@
-%ensure_fragment(SWIG_AsWCharPtrAndSize)
-%ensure_fragment(SWIG_FromWCharPtrAndSize)
-
-
-%types(wchar_t *);
-
-%fragment("SWIG_pwchar_descriptor","header") {
-SWIGINTERN swig_type_info*
-SWIG_pwchar_descriptor()
-{
-  static int init = 0;
-  static swig_type_info* info = 0;
-  if (!init) {
-    info = SWIG_TypeQuery("_p_wchar_t");
-    init = 1;
-  }
-  return info;
-}
-}
-
-%fragment("SWIG_wcsnlen","header",fragment="SWIG_FromWCharPtrAndSize") {
-SWIGINTERN size_t
-SWIG_wcsnlen(const wchar_t* s, size_t maxlen)
-{
-  const wchar_t *p;
-  for (p = s; maxlen-- && *p; p++)
-    ;
-  return p - s;
-}
-}
-
-%include <typemaps/strings.swg>
-%typemaps_string(%checkcode(UNISTRING), %checkcode(UNICHAR),
-		 wchar_t, WChar, SWIG_AsWCharPtrAndSize, SWIG_FromWCharPtrAndSize,
-		 wcslen, SWIG_wcsnlen,
-		"<wchar.h>", WCHAR_MIN, WCHAR_MAX)
-
diff --git a/dependencies2013/win32/swig/Lib/uffi/uffi.swg b/dependencies2013/win32/swig/Lib/uffi/uffi.swg
deleted file mode 100644
index 41b08599..00000000
--- a/dependencies2013/win32/swig/Lib/uffi/uffi.swg
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Define a C preprocessor symbol that can be used in interface files
-   to distinguish between the SWIG language modules. */ 
-
-#define SWIG_UFFI
-
-/* Typespecs for basic types. */
-
-%typemap(ffitype) char ":char";
-%typemap(ffitype) unsigned char ":unsigned-char";
-%typemap(ffitype) signed char ":char";
-%typemap(ffitype) short ":short";
-%typemap(ffitype) signed short ":short";
-%typemap(ffitype) unsigned short ":unsigned-short";
-%typemap(ffitype) int ":int";
-%typemap(ffitype) signed int ":int";
-%typemap(ffitype) unsigned int ":unsigned-int";
-%typemap(ffitype) long ":long";
-%typemap(ffitype) signed long ":long";
-%typemap(ffitype) unsigned long ":unsigned-long";
-%typemap(ffitype) float ":float";
-%typemap(ffitype) double ":double";
-%typemap(ffitype) char * ":cstring";
-%typemap(ffitype) void * ":pointer-void";
-%typemap(ffitype) void ":void";
-
-// FIXME: This is guesswork
-typedef long size_t;
-
-%wrapper %{
-(eval-when (compile eval)
-
-;;; You can define your own identifier converter if you want.
-;;; Use the -identifier-converter command line argument to
-;;; specify its name. 
-  
-(defun identifier-convert-null (id &key type)
-  (declare (ignore type))
-  (read-from-string id))
-
-(defun identifier-convert-lispify (cname &key type)
-  (assert (stringp cname))
-  (if (eq type :constant)
-      (setf cname (format nil "*~A*" cname)))
-  (setf cname (replace-regexp cname "_" "-"))
-  (let ((lastcase :other)
-        newcase char res)
-    (dotimes (n (length cname))
-      (setf char (schar cname n))
-      (if* (alpha-char-p char)
-         then
-              (setf newcase (if (upper-case-p char) :upper :lower))
-
-              (when (or (and (eq lastcase :upper) (eq newcase :lower))
-                        (and (eq lastcase :lower) (eq newcase :upper)))
-                ;; case change... add a dash                                    
-                (push #\- res)
-                (setf newcase :other))
-
-              (push (char-downcase char) res)
-
-              (setf lastcase newcase)
-
-         else
-              (push char res)
-              (setf lastcase :other)))
-    (read-from-string (coerce (nreverse res) 'string))))
-
-(defun identifier-convert-low-level (cname &key type)
-  (assert (stringp cname))
-  (if (eq type :constant)
-    (setf cname (format nil "+~A+" cname)))
-  (setf cname (substitute #\- #\_ cname))
-  (if (eq type :operator)
-    (setf cname (format nil "%~A" cname)))
-  (if (eq type :constant-function)
-    nil)
-  (read-from-string cname))
-
-
-
-(defmacro swig-defconstant (string value &key (export T))
-  (let ((symbol (funcall *swig-identifier-converter* string :type :constant)))
-    `(eval-when (compile load eval)
-       (uffi:def-constant ,symbol ,value ,export))))
-
-(defmacro swig-defun (name &rest rest)
-  (let ((symbol (funcall *swig-identifier-converter* name :type :operator)))
-    `(eval-when (compile load eval)
-      (uffi:def-function (,name ,symbol) ,@rest)
-      (export (quote ,symbol)))))
-
-(defmacro swig-def-struct (name &rest fields)
-  "Declare a struct object"
-  (let ((symbol (funcall *swig-identifier-converter* name :type :type)))
-    `(eval-when (compile load eval)
-       (uffi:def-struct ,symbol ,@fields)
-       (export (quote ,symbol)))))
- 
-
-) ;; eval-when
-%}
diff --git a/dependencies2013/win32/swig/Lib/wchar.i b/dependencies2013/win32/swig/Lib/wchar.i
deleted file mode 100644
index 14de3463..00000000
--- a/dependencies2013/win32/swig/Lib/wchar.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -----------------------------------------------------------------------------
- * wchar.i
- * ----------------------------------------------------------------------------- */
-
-/*
-  wchar_t not supported, unless otherwise specified in the target language.
-*/
-
-#if defined(SWIG_WCHAR)
-#undef SWIG_WCHAR
-#endif
diff --git a/dependencies2013/win32/swig/Lib/windows.i b/dependencies2013/win32/swig/Lib/windows.i
deleted file mode 100644
index 2c093dac..00000000
--- a/dependencies2013/win32/swig/Lib/windows.i
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -----------------------------------------------------------------------------
- * windows.i
- *
- * SWIG library file to support types found in windows.h as well as Microsoft
- * integral type extensions. The types are set for 32 bit Windows.
- * ----------------------------------------------------------------------------- */
-
-// Support for non ISO (Windows) integral types
-%apply unsigned char { unsigned __int8 };
-%apply const unsigned char& { const unsigned __int8& };
-
-%apply signed char { __int8 };
-%apply const signed char& { const __int8& };
-
-%apply unsigned short { unsigned __int16 };
-%apply const unsigned short& { const unsigned __int16& };
-
-%apply short { __int16 };
-%apply const short& { const __int16& };
-
-%apply unsigned int { unsigned __int32 };
-%apply const unsigned int& { const unsigned __int32& };
-
-%apply int { __int32 };
-%apply const int& { const __int32& };
-
-%apply unsigned long long { unsigned __int64 };
-%apply const unsigned long long& { const unsigned __int64& };
-
-%apply long long { __int64 };
-%apply const long long& { const __int64& };
-
-
-// Workaround Microsoft calling conventions
-#define __cdecl
-#define __fastcall
-#define __far
-#define __forceinline
-#define __fortran
-#define __inline
-#define __pascal
-#define __stdcall
-#define __syscall
-#define _cdecl
-#define _fastcall
-#define _inline
-#define _pascal
-#define _stdcall
-#define WINAPI
-#define __declspec(WINDOWS_EXTENDED_ATTRIBUTE)
-
-#define __w64
-
-// Types from windef.h
-typedef unsigned long ULONG;
-typedef ULONG *PULONG;
-typedef unsigned short USHORT;
-typedef USHORT *PUSHORT;
-typedef unsigned char UCHAR;
-typedef UCHAR *PUCHAR;
-typedef char *PSZ;
-typedef unsigned long DWORD;
-typedef int BOOL;
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef float FLOAT;
-typedef FLOAT *PFLOAT;
-typedef BOOL *PBOOL;
-typedef BOOL *LPBOOL;
-typedef BYTE *PBYTE;
-typedef BYTE *LPBYTE;
-typedef int *PINT;
-typedef int *LPINT;
-typedef WORD *PWORD;
-typedef WORD *LPWORD;
-typedef long *LPLONG;
-typedef DWORD *PDWORD;
-typedef DWORD *LPDWORD;
-typedef void *LPVOID;
-typedef const void *LPCVOID;
-typedef int INT;
-typedef unsigned int UINT;
-typedef unsigned int *PUINT;
-
-// Types from basetsd.h
-typedef signed char INT8, *PINT8;
-typedef signed short INT16, *PINT16;
-typedef signed int INT32, *PINT32;
-typedef signed __int64 INT64, *PINT64;
-typedef unsigned char UINT8, *PUINT8;
-typedef unsigned short UINT16, *PUINT16;
-typedef unsigned int UINT32, *PUINT32;
-typedef unsigned __int64 UINT64, *PUINT64;
-typedef signed int LONG32, *PLONG32;
-typedef unsigned int ULONG32, *PULONG32;
-typedef unsigned int DWORD32, *PDWORD32;
-typedef __w64 int INT_PTR, *PINT_PTR;
-typedef __w64 unsigned int UINT_PTR, *PUINT_PTR;
-typedef __w64 long LONG_PTR, *PLONG_PTR;
-typedef __w64 unsigned long ULONG_PTR, *PULONG_PTR;
-typedef unsigned short UHALF_PTR, *PUHALF_PTR;
-typedef short HALF_PTR, *PHALF_PTR;
-typedef __w64 long SHANDLE_PTR;
-typedef __w64 unsigned long HANDLE_PTR;
-typedef ULONG_PTR SIZE_T, *PSIZE_T;
-typedef LONG_PTR SSIZE_T, *PSSIZE_T;
-typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
-typedef __int64 LONG64, *PLONG64;
-typedef unsigned __int64 ULONG64, *PULONG64;
-typedef unsigned __int64 DWORD64, *PDWORD64;
-
-// Types from winnt.h
-typedef void *PVOID;
-typedef void *PVOID64;
-typedef char CHAR;
-typedef short SHORT;
-typedef long LONG;
-typedef CHAR *PCHAR;
-typedef CHAR *LPCH, *PCH;
-typedef const CHAR *LPCCH, *PCCH;
-typedef CHAR *NPSTR;
-typedef CHAR *LPSTR, *PSTR;
-typedef const CHAR *LPCSTR, *PCSTR;
-typedef char TCHAR, *PTCHAR;
-typedef unsigned char TBYTE , *PTBYTE ;
-typedef LPSTR LPTCH, PTCH;
-typedef LPSTR PTSTR, LPTSTR, PUTSTR, LPUTSTR;
-typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
-typedef SHORT *PSHORT;
-typedef LONG *PLONG;
-typedef void *HANDLE;
-typedef HANDLE *PHANDLE;
-typedef BYTE FCHAR;
-typedef WORD FSHORT;
-typedef DWORD FLONG;
-typedef LONG HRESULT;
-typedef char CCHAR;
-typedef DWORD LCID;
-typedef PDWORD PLCID;
-typedef WORD LANGID;
-typedef __int64 LONGLONG;
-typedef unsigned __int64 ULONGLONG;
-typedef LONGLONG *PLONGLONG;
-typedef ULONGLONG *PULONGLONG;
-typedef ULONGLONG DWORDLONG;
-typedef DWORDLONG *PDWORDLONG;
-typedef BYTE BOOLEAN;
-typedef BOOLEAN *PBOOLEAN;
-
diff --git a/dependencies2013/win32/swig/Lib/xml/typemaps.i b/dependencies2013/win32/swig/Lib/xml/typemaps.i
deleted file mode 100644
index 29736135..00000000
--- a/dependencies2013/win32/swig/Lib/xml/typemaps.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// --------------------------------------------------------------------
-// Empty file for %include to work
-// --------------------------------------------------------------------
diff --git a/dependencies2013/win32/swig/Lib/xml/xml.swg b/dependencies2013/win32/swig/Lib/xml/xml.swg
deleted file mode 100644
index c7bdbad0..00000000
--- a/dependencies2013/win32/swig/Lib/xml/xml.swg
+++ /dev/null
@@ -1 +0,0 @@
-/* nothing special */
\ No newline at end of file
diff --git a/dependencies2013/win32/swig/README b/dependencies2013/win32/swig/README
deleted file mode 100644
index c4c6b9c5..00000000
--- a/dependencies2013/win32/swig/README
+++ /dev/null
@@ -1,143 +0,0 @@
-SWIG (Simplified Wrapper and Interface Generator)
-
-Version: 3.0.12 (27 Jan 2017)
-
-Tagline: SWIG is a compiler that integrates C and C++ with languages
-         including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
-         Octave, R, Scheme (Guile, MzScheme/Racket, CHICKEN), Scilab,
-         Ocaml, Modula-3, Common Lisp (CLISP, Allegro CL, CFFI, UFFI)
-         and Pike. SWIG can also export its parse tree into XML and
-         Lisp s-expressions.
-
-SWIG reads annotated C/C++ header files and creates wrapper code (glue
-code) in order to make the corresponding C/C++ libraries available to
-the listed languages, or to extend C/C++ programs with a scripting
-language.
-
-Up-to-date SWIG related information can be found at
-
-        http://www.swig.org
-
-A SWIG FAQ and other hints can be found on the SWIG Wiki:
-
-        https://github.com/swig/swig/wiki
-
-License
-=======
-Please see the LICENSE file for details of the SWIG license. For
-further insight into the license including the license of SWIG's
-output code, please visit
-
-        http://www.swig.org/legal.html
-
-Release Notes
-=============
-Please see the CHANGES.current file for a detailed list of bug fixes and
-new features for the current release. The CHANGES file contains bug fixes
-and new features for older versions. A summary of changes in each release
-can be found in the RELEASENOTES file.
-
-Documentation
-=============
-The Doc/Manual directory contains the most recent set of updated
-documentation for this release. The documentation is available in
-three different formats, each of which contains identical content.
-These format are, pdf (Doc/Manual/SWIGDocumentation.pdf), single
-page html (Doc/Manual/SWIGDocumentation.html) or multiple page html
-(other files in Doc/Manual). Please select your chosen format and
-copy/install to wherever takes your fancy.
-
-There is some technical developer documentation available in the
-Doc/Devel subdirectory.  This is not necessarily up-to-date, but it
-has some information on SWIG internals.
-
-Documentation is also online at http://www.swig.org/doc.html.
-
-Backwards Compatibility
-=======================
-The developers strive their best to preserve backwards compatibility
-between releases, but this is not always possible as the overriding
-aim is to provide the best wrapping experience. Where backwards
-compatibility is known to be broken, it is clearly marked as an
-incompatibility in the CHANGES and CHANGES.current files.
-
-See the documentation for details of the SWIG_VERSION preprocessor
-symbol if you have backward compatibility issues and need to use more
-than one version of SWIG.
-
-Installation
-============
-Please read the Doc/Manual/Preface.html#Preface_installation for
-full installation instructions for Windows, Unix and Mac OS X
-using the release tarball/zip file. The INSTALL file has generic
-build and installation instructions for Unix users.
-Users wishing to build and install code from Github should
-visit http://swig.org/svn.html to obtain the more detailed
-instructions required for building code obtained from Github - extra
-steps are required compared to building from the release tarball.
-
-Testing
-=======
-The typical 'make -k check' can be performed on Unix operating systems.
-Please read Doc/Manual/Preface.html#Preface_testing for details.
-
-Examples
-========
-The Examples directory contains a variety of examples of using SWIG
-and it has some browsable documentation.  Simply point your browser to
-the file "Example/index.html".
-
-The Examples directory also includes Visual C++ project 6 (.dsp) files for
-building some of the examples on Windows. Later versions of Visual Studio
-will convert these old style project files into a current solution file.
-
-Known Issues
-============
-There are minor known bugs, details of which are in the bug tracker, see
-http://www.swig.org/bugs.html.
-
-Troubleshooting
-===============
-In order to operate correctly, SWIG relies upon a set of library
-files.  If after building SWIG, you get error messages like this,
-
-    $ swig foo.i
-    :1. Unable to find 'swig.swg'
-    :3. Unable to find 'tcl8.swg'
-
-it means that SWIG has either been incorrectly configured or
-installed.  To fix this:
-
-    1.  Make sure you remembered to do a 'make install' and that
-        the installation actually worked.  Make sure you have
-        write permission on the install directory.
-
-    2.  If that doesn't work, type 'swig -swiglib' to find out
-        where SWIG thinks its library is located.
-
-    3.  If the location is not where you expect, perhaps
-        you supplied a bad option to configure.  Use
-        ./configure --prefix=pathname to set the SWIG install
-        location.   Also, make sure you don't include a shell
-        escape character such as ~ when you specify the path.
-
-    4.  The SWIG library can be changed by setting the SWIG_LIB
-        environment variable.  However, you really shouldn't
-        have to do this.
-
-If you are having other troubles, you might look at the SWIG Wiki at
-https://github.com/swig/swig/wiki.
-
-Participate!
-============
-Please report any errors and submit patches (if possible)!  We only
-have access to a limited variety of hardware (Linux, Solaris, OS-X,
-and Windows). All contributions help.
-
-If you would like to join the SWIG development team or contribute a
-language module to the distribution, please contact the swig-devel
-mailing list, details at http://www.swig.org/mail.html.
-
-
- -- The SWIG Maintainers
-
diff --git a/dependencies2013/win32/swig/RELEASENOTES b/dependencies2013/win32/swig/RELEASENOTES
deleted file mode 100644
index 5f6560c3..00000000
--- a/dependencies2013/win32/swig/RELEASENOTES
+++ /dev/null
@@ -1,419 +0,0 @@
-This file contains a brief overview of the changes made in each release.
-A detailed description of changes are available in the CHANGES.current
-and CHANGES files.
-
-Release Notes
-=============
-Detailed release notes are available with the release and are also
-published on the SWIG web site at http://swig.org/release.html.
-
-SWIG-3.0.12 summary:
-- Add support for Octave-4.2.
-- Enhance %extend to support template functions.
-- Language specific enhancements and fixes for C#, D, Guile, Java, PHP7.
-
-SWIG-3.0.11 summary:
-- PHP 7 support added.
-- C++11 alias templates and type aliasing support added.
-- Minor fixes and enhancements for C# Go Guile Java Javascript Octave
-  PHP Python R Ruby Scilab XML.
-
-SWIG-3.0.10 summary:
-- Regression fixes for smart pointers and importing Python modules.
-
-SWIG-3.0.9 summary:
-- Add support for Python's implicit namespace packages.
-- Fixes to support Go 1.6.
-- C++11 std::array support added for Java.
-- Improved C++ multiple inheritance support for Java/C# wrappers.
-- Various other minor fixes and improvements for C#, D, Go, Java,
-  Javascript, Lua, Python, R, Ruby, Scilab.
-
-SWIG-3.0.8 summary:
-- pdf documentation enhancements.
-- Various Python 3.5 issues fixed.
-- std::array support added for Ruby and Python.
-- shared_ptr support added for Ruby.
-- Minor improvements for CFFI, Go, Java, Perl, Python, Ruby.
-
-SWIG-3.0.7 summary:
-- Add support for Octave-4.0.0.
-- Remove potential Android security exploit in generated Java classes.
-- Minor new features and bug fixes.
-
-SWIG-3.0.6 summary:
-- Stability and regression fixes.
-- Fixed parsing of C++ corner cases.
-- Language improvements and bug fixes for C#, Go, Java, Lua, Python, R.
-
-SWIG-3.0.5 summary:
-- Added support for Scilab.
-- Important Python regression fix when wrapping C++ default arguments.
-- Minor improvements for C#, Go, Octave, PHP and Python.
-
-SWIG-3.0.4 summary:
-- Python regression fix when wrapping C++ default arguments.
-- Improved error messages.
-
-SWIG-3.0.3 summary:
-- Add support for C++11 strongly typed enumerations.
-- Numerous bug fixes and minor enhancements for C#, D, Go, Java,
-  Javascript, PHP, Perl and Python wrappers.
-
-SWIG-3.0.2 summary:
-- Bug fix during install and a couple of other minor changes.
-
-SWIG-3.0.1 summary:
-- Javascript module added. This supports JavascriptCore (Safari/Webkit),
-  v8 (Chromium) and node.js currently.
-- A few notable regressions introduced in 3.0.0 have been fixed - in 
-  Lua, nested classes and parsing of operator <<.
-- The usual round of bug fixes and minor improvements for:
-  C#, GCJ, Go, Java, Lua, PHP and Python.
-
-SWIG-3.0.0 summary:
-- This is a major new release focusing primarily on C++ improvements.
-- C++11 support added. Please see documentation for details of supported
-  features: http://www.swig.org/Doc3.0/CPlusPlus11.html
-- Nested class support added. This has been taken full advantage of in
-  Java and C#. Other languages can use the nested classes, but require
-  further work for a more natural integration into the target language.
-  We urge folk knowledgeable in the other target languages to step
-  forward and help with this effort.
-- Lua: improved metatables and support for %nspace.
-- Go 1.3 support added.
-- Python import improvements including relative imports.
-- Python 3.3 support completed.
-- Perl director support added.
-- C# .NET 2 support is now the minimum. Generated using statements are
-  replaced by fully qualified names.
-- Bug fixes and improvements to the following languages:
-  C#, Go, Guile, Java, Lua, Perl, PHP, Python, Octave, R, Ruby, Tcl
-- Various other bug fixes and improvements affecting all languages.
-- Note that this release contains some backwards incompatible changes
-  in some languages.
-- Full detailed release notes are in the changes file.
-
-SWIG-2.0.12 summary:
-- This is a maintenance release backporting some fixes from the pending
-  3.0.0 release.
-- Octave 3.8 support added.
-- C++11 support for new versions of erase/insert in the STL containers.
-- Compilation fixes on some systems for the generated Lua, PHP, Python
-  and R wrappers.
-
-SWIG-2.0.11 summary:
-- Minor bug fixes and enhancements mostly in Python, but also
-  C#, Lua, Ocaml, Octave, Perl, PHP, Python, R, Ruby, Tcl.
-
-SWIG-2.0.10 summary:
-- Ruby 1.9 support is now complete.
-- Add support for Guile 2.0 and Guile 1.6 support (GH interface) has
-  been dropped.
-- Various small language neutral improvements and fixes.
-- Various bug fixes and minor improvements specific to C#, CFFI, D,
-  Java, Octave, PHP, Python,
-- Minor bug fix in ccache-swig.
-- Development has moved to Github with Travis continuous integration
-  testing - patches using https://github.com/swig/swig are welcome.
-
-SWIG-2.0.9 summary:
-- Improved typemap matching.
-- Ruby 1.9 support is much improved.
-- Various bug fixes and minor improvements in C#, CFFI, Go, Java,
-  Modula3, Octave, Perl, Python, R, Ruby, Tcl and in ccache-swig.
-
-SWIG-2.0.8 summary:
-- Fix a couple of regressions introduced in 2.0.5 and 2.0.7.
-- Improved using declarations and using directives support.
-- Minor fixes/enhancements for C#, Java, Octave, Perl and Python.
-
-SWIG-2.0.7 summary:
-- Important regression fixes since 2.0.5 for typemaps in general and
-  in Python.
-- Fixes and enhancements for Go, Java, Octave and PHP.
-
-SWIG-2.0.6 summary:
-- Regression fix for Python STL wrappers on some systems.
-
-SWIG-2.0.5 summary:
-- Official Android support added including documentation and examples.
-- Improvements involving templates:
-  1) Various fixes with templates and typedef types.
-  2) Some template lookup problems fixed.
-  3) Templated type fixes to use correct typemaps.
-- Autodoc documentation generation improvements.
-- Python STL container wrappers improvements including addition of
-  stepped slicing.
-- Approximately 70 fixes and minor enhancements for the following
-  target languages: AllegroCL, C#, D, Go, Java, Lua, Ocaml, Octave,
-  Perl, PHP, Python, R, Ruby, Tcl, Xml.
-
-SWIG-2.0.4 summary:
-- This is mainly a Python oriented release including support for Python
-  built-in types for superior performance with the new -builtin option.
-  The -builtin option is especially suitable for performance-critical
-  libraries and applications that call wrapped methods repeatedly.
-  See the python-specific chapter of the SWIG manual for more info.
-- Python 3.2 support has also been added and various Python bugs have
-  been fixed.
-- Octave 3.4 support has also been added.
-- There are also the usual minor generic improvements, as well as bug
-  fixes and enhancements for D, Guile, Lua, Octave, Perl and Tcl. 
-
-SWIG-2.0.3 summary:
-- A bug fix release including a couple of fixes for regressions in the
-  2.0 series.
-
-SWIG-2.0.2 summary:
-- Support for the D language has been added.
-- Various bug fixes and minor enhancements.
-- Bug fixes particular to the Clisp, C#, Go, MzScheme, Ocaml, PHP, R,
-  Ruby target languages.
-
-SWIG-2.0.1 summary:
-- Support for the Go language has been added.
-- New regular expression (regex) encoder for renaming symbols based on
-  the Perl Compatible Regular Expressions (PCRE) library.
-- Numerous fixes in reporting file and line numbers in error and warning
-  messages.
-- Various bug fixes and improvements in the C#, Lua, Perl, PHP, Ruby
-  and Python language modules.
-
-SWIG-2.0.0 summary:
-- License changes, see LICENSE file and http://www.swig.org/legal.html.
-- Much better nested class/struct support.
-- Much improved template partial specialization and explicit
-  specialization handling.
-- Namespace support improved with the 'nspace' feature where namespaces
-  can be automatically translated into Java packages or C# namespaces.
-- Improved typemap and symbol table debugging.
-- Numerous subtle typemap matching rule changes when using the default
-  (SWIGTYPE) type. These now work much like C++ class template partial
-  specialization matching.
-- Other small enhancements for typemaps. Typemap fragments are also now
-  official and documented.
-- Warning and error display refinements.
-- Wrapping of shared_ptr is improved and documented now.
-- Numerous C++ unary scope operator (::) fixes.
-- Better support for boolean expressions.
-- Various bug fixes and improvements in the Allegrocl, C#, Java, Lua,
-  Octave, PHP, Python, R, Ruby and XML modules.
-
-SWIG-1.3.40 summary:
-- SWIG now supports directors for PHP.
-- PHP support improved in general.
-- Octave 3.2 support added.
-- Various bug fixes/enhancements for Allegrocl, C#, Java, Octave, Perl,
-  Python, Ruby and Tcl.
-- Other generic fixes and minor new features.
-
-SWIG-1.3.39 summary:
-- Some new small feature enhancements.
-- Improved C# std::vector wrappers.
-- Bug fixes: mainly Python, but also Perl, MzScheme, CFFI, Allegrocl 
-  and Ruby
-
-SWIG-1.3.38 summary:
-- Output directory regression fix and other minor bug fixes
-
-SWIG-1.3.37 summary:
-- Python 3 support added
-- SWIG now ships with a version of ccache that can be used with SWIG.
-  This enables the files generated by SWIG to be cached so that repeated
-  use of SWIG on unchanged input files speeds up builds quite considerably.
-- PHP 4 support removed and PHP support improved in general
-- Improved C# array support
-- Numerous Allegro CL improvements
-- Bug fixes/enhancements for Python, PHP, Java, C#, Chicken, Allegro CL,
-  CFFI, Ruby, Tcl, Perl, R, Lua.
-- Other minor generic bug fixes and enhancements
-
-SWIG-1.3.36 summary:
-- Enhancement to directors to wrap all protected members
-- Optimisation feature for objects returned by value
-- A few bugs fixes in the PHP, Java, Ruby, R, C#, Python, Lua and 
-  Perl modules
-- Other minor generic bug fixes
-
-SWIG-1.3.35 summary:
-- Octave language module added
-- Bug fixes in Python, Lua, Java, C#, Perl modules
-- A few other generic bugs and runtime assertions fixed
-
-SWIG-1.3.34 summary:
-- shared_ptr support for Python
-- Support for latest R - version 2.6
-- Various minor improvements/bug fixes for R, Lua, Python, Java, C#
-- A few other generic bug fixes, mainly for templates and using statements
-
-SWIG-1.3.33 summary:
-- Fix regression for Perl where C++ wrappers would not compile
-- Fix regression parsing macros
-
-SWIG-1.3.32 summary:
-- shared_ptr support for Java and C#
-- Enhanced STL support for Ruby
-- Windows support for R
-- Fixed long-standing memory leak in PHP Module
-- Numerous fixes and minor enhancements for Allegrocl, C#, cffi, Chicken, Guile,
-  Java, Lua, Ocaml, Perl, PHP, Python, Ruby, Tcl.
-- Improved warning support
-
-SWIG-1.3.31 summary:
-- Python modern classes regression fix
-
-SWIG-1.3.30 summary:
-- Python-2.5 support
-- New language module: R
-- Director support added for C#
-- Numerous director fixes and improvements
-- Improved mingw/msys support
-- Better constants support in Guile and chicken modules
-- Support for generating PHP5 class wrappers
-- Important Java premature garbage collection fix
-- Minor improvements/fixes in cffi, php, allegrocl, perl, chicken, lua, ruby,
-  ocaml, python, java, c# and guile language modules
-- Many many other bug fixes
-
-SWIG-1.3.29 summary:
-- Numerous important bug fixes
-- Few minor new features
-- Some performance improvements in generated code for Python
-
-SWIG-1.3.28 summary:
-- More powerful renaming (%rename) capability.
-- More user friendly warning handling.
-- Add finer control for default constructors and destructors. We discourage
-  the use of the 'nodefault' option, which disables both constructors and
-  destructors, leading to possible memory leaks. Use instead 'nodefaultctor'
-  and/or 'nodefaultdtor'.
-- Automatic copy constructor wrapper generation via the 'copyctor' option/feature.
-- Better handling of Windows extensions and types.
-- Better runtime error reporting.
-- Add the %catches directive to catch and dispatch exceptions.
-- Add the %naturalvar directive for more 'natural' variable wrapping.
-- Better default handling of std::string variables using the %naturalvar directive.
-- Add the %allowexcept and %exceptionvar directives to handle exceptions when
-  accessing a variable.
-- Add the %delobject directive to mark methods that act like destructors.
-- Add the -fastdispatch option to enable smaller and faster overload dispatch
-  mechanism.
-- Template support for %rename, %feature and %typemap improved.
-- Add/doc more debug options, such as -dump_module, -debug_typemaps, etc.
-- Unified typemap library (UTL) potentially providing core typemaps for all
-  scripting languages based on the recently evolving Python typemaps.
-- New language module: Common Lisp with CFFI.
-- Python, Ruby, Perl and Tcl use the new UTL, many old reported and hidden 
-  errors with typemaps are now fixed.
-- Initial Java support for languages using the UTL via GCJ, you can now use 
-  Java libraries in your favorite script language using gcj + swig.
-- Tcl support for std::wstring.
-- PHP4 module update, many error fixes and actively maintained again.
-- Allegrocl support for C++, also enhanced C support.
-- Ruby support for bang methods.
-- Ruby support for user classes as native exceptions.
-- Perl improved dispatching in overloaded functions via the new cast and rank
-  mechanism.
-- Perl improved backward compatibility, 5.004 and later tested and working.
-- Python improved backward compatibility, 1.5.2 and later tested and working.
-- Python can use the same cast/rank mechanism via the -castmode option.
-- Python implicit conversion mechanism similar to C++, via the %implicitconv
-  directive (replaces and improves the implicit.i library). 
-- Python threading support added.
-- Python STL support improved, iterators are supported and STL containers can
-  use now the native PyObject type.
-- Python many performance options and improvements, try the -O option to test
-  all of them. Python runtime benchmarks show up to 20 times better performance
-  compared to 1.3.27 and older versions.
-- Python support for 'multi-inheritance' on the python side.
-- Python simplified proxy classes, now swig doesn't need to generate the
-  additional 'ClassPtr' classes.
-- Python extended support for smart pointers.
-- Python better support for static member variables.
-- Python backward compatibility improved, many projects that used to work
-  only with  swig-1.3.21 to swig-1.3.24 are working again with swig-1.3.28
-- Python test-suite is now 'valgrinded' before release, and swig also
-  reports memory leaks due to missing destructors.
-- Minor bug fixes and improvements to the Lua, Ruby, Java, C#, Python, Guile,
-  Chicken, Tcl and Perl modules.
-
-SWIG-1.3.27 summary:
-- Fix bug in anonymous typedef structures which was leading to strange behaviour
-
-SWIG-1.3.26 summary:
-- New language modules: Lua, CLISP and Common Lisp with UFFI.
-- Big overhaul to the PHP module.
-- Change to the way 'extern' is handled.
-- Minor bug fixes specific to  C#, Java, Modula3, Ocaml, Allegro CL,
-  XML, Lisp s-expressions, Tcl, Ruby and Python modules.
-- Other minor improvements and bug fixes.
-
-SWIG-1.3.25 summary:
-- Improved runtime type system.  Speed of module loading improved in
-  modules with lots of types.  SWIG_RUNTIME_VERSION has been increased
-  from 1 to 2, but the API is exactly the same; only internal changes
-  were made.
-- The languages that use the runtime type system now support external
-  access to the runtime type system.
-- Various improvements with typemaps and template handling.
-- Fewer warnings in generated code.
-- Improved colour documentation.
-- Many C# module improvements (exception handling, prevention of early
-  garbage collection, C# attributes support added, more flexible type
-  marshalling/asymmetric types.)
-- Minor improvements and bug fixes specific to the C#, Java, TCL, Guile,
-  Chicken, MzScheme, Perl, Php, Python, Ruby and Ocaml modules).
-- Various other bug fixes and memory leak fixes.
-
-SWIG-1.3.24 summary:
-- Improved enum handling
-- More runtime library options
-- More bugs fixes for templates and template default arguments, directors
-  and other areas.
-- Better smart pointer support, including data members, static members
-  and %extend.
-
-SWIG-1.3.23 summary:
-- Improved support for callbacks
-- Python docstring support and better error handling
-- C++ default argument support for Java and C# added.
-- Improved c++ default argument support for the scripting languages plus
-  option to use original (compact) default arguments.
-- %feature and %ignore/%rename bug fixes and mods - they might need default
-  arguments specified to maintain compatible behaviour when using the new
-  default arguments wrapping.
-- Runtime library changes: Runtime code can now exist in more than one module
-  and so need not be compiled into just one module
-- Further improved support for templates and namespaces
-- Overloaded templated function support added
-- More powerful default typemaps (mixed default typemaps)
-- Some important %extend and director code bug fixes
-- Guile now defaults to using SCM API.  The old interface can be obtained by
-  the -gh option.
-- Various minor improvements and bug fixes for C#, Chicken, Guile, Java, 
-  MzScheme, Perl, Python and Ruby
-- Improved dependencies generation for constructing Makefiles.
-
-SWIG-1.3.22 summary:
-- Improved exception handling and translation of C errors or C++
-  exceptions into target language exceptions.
-- Improved enum support, mapping to built-in Java 1.5 enums and C#
-  enums or the typesafe enum pattern for these two languages.
-- Python - much better STL support and support for std::wstring,
-  wchar_t and FILE *.
-- Initial support for Modula3 and Allegro CL.
-- 64 bit TCL support.
-- Java and C#'s proxy classes are now nearly 100% generated from
-  typemaps and/or features for finer control on the generated code.
-- SWIG runtime library support deprecation.
-- Improved documentation. SWIG now additionally provides documentation
-  in the form of a single HTML page as well as a pdf document.
-- Enhanced C++ friend declaration support.
-- Better support for reference counted classes.
-- Various %fragment improvements.
-- RPM fixes.
-- Various minor improvements and bug fixes for C#, Chicken, Guile, Java, 
-  MzScheme, Perl, Php, Python, Ruby and XML.
-
-
diff --git a/dependencies2013/win32/swig/Source/CParse/cparse.h b/dependencies2013/win32/swig/Source/CParse/cparse.h
deleted file mode 100644
index 8079805e..00000000
--- a/dependencies2013/win32/swig/Source/CParse/cparse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * cparse.h
- *
- * SWIG parser module.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_CPARSE_H_
-#define SWIG_CPARSE_H_
-
-#include "swig.h"
-#include "swigwarn.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* cscanner.c */
-  extern String *cparse_file;
-  extern int cparse_line;
-  extern int cparse_cplusplus;
-  extern int cparse_cplusplusout;
-  extern int cparse_start_line;
-  extern String *cparse_unknown_directive;
-
-  extern void Swig_cparse_cplusplus(int);
-  extern void Swig_cparse_cplusplusout(int);
-  extern void scanner_file(File *);
-  extern void scanner_next_token(int);
-  extern void skip_balanced(int startchar, int endchar);
-  extern String *get_raw_text_balanced(int startchar, int endchar);
-  extern void skip_decl(void);
-  extern void scanner_check_typedef(void);
-  extern void scanner_ignore_typedef(void);
-  extern void scanner_last_id(int);
-  extern void scanner_clear_rename(void);
-  extern void scanner_set_location(String *file, int line);
-  extern void scanner_set_main_input_file(String *file);
-  extern String *scanner_get_main_input_file();
-  extern void Swig_cparse_follow_locators(int);
-  extern void start_inline(char *, int);
-  extern String *scanner_ccode;
-  extern int yylex(void);
-
-/* parser.y */
-  extern SwigType *Swig_cparse_type(String *);
-  extern Node *Swig_cparse(File *);
-  extern Hash *Swig_cparse_features(void);
-  extern void SWIG_cparse_set_compact_default_args(int defargs);
-  extern int SWIG_cparse_template_reduce(int treduce);
-
-/* util.c */
-  extern void Swig_cparse_replace_descriptor(String *s);
-  extern SwigType *Swig_cparse_smartptr(Node *n);
-  extern void cparse_normalize_void(Node *);
-  extern Parm *Swig_cparse_parm(String *s);
-  extern ParmList *Swig_cparse_parms(String *s, Node *file_line_node);
-  extern Node *new_node(const_String_or_char_ptr tag);
-
-/* templ.c */
-  extern int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *tscope);
-  extern Node *Swig_cparse_template_locate(String *name, ParmList *tparms, Symtab *tscope);
-  extern void Swig_cparse_debug_templates(int);
-
-#ifdef __cplusplus
-}
-#endif
-#define SWIG_WARN_NODE_BEGIN(Node) \
- { \
-  String *wrnfilter = Node ? Getattr(Node,"feature:warnfilter") : 0; \
-  if (wrnfilter) Swig_warnfilter(wrnfilter,1)
-#define SWIG_WARN_NODE_END(Node) \
-  if (wrnfilter) Swig_warnfilter(wrnfilter,0); \
- }
-
-#define COMPOUND_EXPR_VAL(dtype) \
-  ((dtype).type == T_CHAR || (dtype).type == T_WCHAR ? (dtype).rawval : (dtype).val)
-#endif
diff --git a/dependencies2013/win32/swig/Source/CParse/cscanner.c b/dependencies2013/win32/swig/Source/CParse/cscanner.c
deleted file mode 100644
index 637ac9d6..00000000
--- a/dependencies2013/win32/swig/Source/CParse/cscanner.c
+++ /dev/null
@@ -1,913 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * scanner.c
- *
- * SWIG tokenizer.  This file is a wrapper around the generic C scanner
- * found in Swig/scanner.c.   Extra logic is added both to accommodate the
- * bison-based grammar and certain peculiarities of C++ parsing (e.g.,
- * operator overloading, typedef resolution, etc.).  This code also splits
- * C identifiers up into keywords and SWIG directives.
- * ----------------------------------------------------------------------------- */
-
-#include "cparse.h"
-#include "parser.h"
-#include <string.h>
-#include <ctype.h>
-
-/* Scanner object */
-static Scanner *scan = 0;
-
-/* Global string containing C code. Used by the parser to grab code blocks */
-String *scanner_ccode = 0;
-
-/* The main file being parsed */
-static String *main_input_file = 0;
-
-/* Error reporting/location information */
-int     cparse_line = 1;
-String *cparse_file = 0;
-int     cparse_start_line = 0;
-
-/* C++ mode */
-int cparse_cplusplus = 0;
-
-/* Generate C++ compatible code when wrapping C code */
-int cparse_cplusplusout = 0;
-
-/* To allow better error reporting */
-String *cparse_unknown_directive = 0;
-
-/* Private vars */
-static int scan_init = 0;
-static int num_brace = 0;
-static int last_brace = 0;
-static int last_id = 0;
-static int rename_active = 0;
-
-/* -----------------------------------------------------------------------------
- * Swig_cparse_cplusplus()
- * ----------------------------------------------------------------------------- */
-
-void Swig_cparse_cplusplus(int v) {
-  cparse_cplusplus = v;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cparse_cplusplusout()
- * ----------------------------------------------------------------------------- */
-
-void Swig_cparse_cplusplusout(int v) {
-  cparse_cplusplusout = v;
-}
-
-/* ----------------------------------------------------------------------------
- * scanner_init()
- *
- * Initialize buffers
- * ------------------------------------------------------------------------- */
-
-void scanner_init() {
-  scan = NewScanner();
-  Scanner_idstart(scan,"%");
-  scan_init = 1;
-  scanner_ccode = NewStringEmpty();
-}
-
-/* ----------------------------------------------------------------------------
- * scanner_file(DOHFile *f)
- *
- * Start reading from new file
- * ------------------------------------------------------------------------- */
-void scanner_file(DOHFile * f) {
-  if (!scan_init) scanner_init();
-  Scanner_clear(scan);
-  Scanner_push(scan,f);
-}
-
-/* ----------------------------------------------------------------------------
- * start_inline(char *text, int line)
- *
- * Take a chunk of text and recursively feed it back into the scanner.  Used
- * by the %inline directive.
- * ------------------------------------------------------------------------- */
-
-void start_inline(char *text, int line) {
-  String *stext = NewString(text);
-
-  Seek(stext,0,SEEK_SET);
-  Setfile(stext,cparse_file);
-  Setline(stext,line);
-  Scanner_push(scan,stext);
-  Delete(stext);
-}
-
-/* -----------------------------------------------------------------------------
- * skip_balanced()
- *
- * Skips a piece of code enclosed in begin/end symbols such as '{...}' or
- * (...).  Ignores symbols inside comments or strings.
- * ----------------------------------------------------------------------------- */
-
-void skip_balanced(int startchar, int endchar) {
-  int start_line = Scanner_line(scan);
-  Clear(scanner_ccode);
-
-  if (Scanner_skip_balanced(scan,startchar,endchar) < 0) {
-    Swig_error(cparse_file, start_line, "Missing '%c'. Reached end of input.\n", endchar);
-    return;
-  }
-
-  cparse_line = Scanner_line(scan);
-  cparse_file = Scanner_file(scan);
-
-  Append(scanner_ccode, Scanner_text(scan));
-  if (endchar == '}')
-    num_brace--;
-  return;
-}
-
-/* -----------------------------------------------------------------------------
- * get_raw_text_balanced()
- *
- * Returns raw text between 2 braces
- * ----------------------------------------------------------------------------- */
-
-String *get_raw_text_balanced(int startchar, int endchar) {
-  return Scanner_get_raw_text_balanced(scan, startchar, endchar);
-}
-
-/* ----------------------------------------------------------------------------
- * void skip_decl(void)
- *
- * This tries to skip over an entire declaration.   For example
- *
- *  friend ostream& operator<<(ostream&, const char *s);
- *
- * or
- *  friend ostream& operator<<(ostream&, const char *s) { }
- *
- * ------------------------------------------------------------------------- */
-
-void skip_decl(void) {
-  int tok;
-  int done = 0;
-  int start_line = Scanner_line(scan);
-
-  while (!done) {
-    tok = Scanner_token(scan);
-    if (tok == 0) {
-      if (!Swig_error_count()) {
-	Swig_error(cparse_file, start_line, "Missing semicolon. Reached end of input.\n");
-      }
-      return;
-    }
-    if (tok == SWIG_TOKEN_LBRACE) {
-      if (Scanner_skip_balanced(scan,'{','}') < 0) {
-	Swig_error(cparse_file, start_line, "Missing '}'. Reached end of input.\n");
-      }
-      break;
-    }
-    if (tok == SWIG_TOKEN_SEMI) {
-      done = 1;
-    }
-  }
-  cparse_file = Scanner_file(scan);
-  cparse_line = Scanner_line(scan);
-}
-
-/* ----------------------------------------------------------------------------
- * int yylook()
- *
- * Lexical scanner.
- * ------------------------------------------------------------------------- */
-
-static int yylook(void) {
-
-  int tok = 0;
-
-  while (1) {
-    if ((tok = Scanner_token(scan)) == 0)
-      return 0;
-    if (tok == SWIG_TOKEN_ERROR)
-      return 0;
-    cparse_start_line = Scanner_start_line(scan);
-    cparse_line = Scanner_line(scan);
-    cparse_file = Scanner_file(scan);
-
-    switch(tok) {
-    case SWIG_TOKEN_ID:
-      return ID;
-    case SWIG_TOKEN_LPAREN: 
-      return LPAREN;
-    case SWIG_TOKEN_RPAREN: 
-      return RPAREN;
-    case SWIG_TOKEN_SEMI:
-      return SEMI;
-    case SWIG_TOKEN_COMMA:
-      return COMMA;
-    case SWIG_TOKEN_STAR:
-      return STAR;
-    case SWIG_TOKEN_RBRACE:
-      num_brace--;
-      if (num_brace < 0) {
-	Swig_error(cparse_file, cparse_line, "Syntax error. Extraneous '}'\n");
-	num_brace = 0;
-      } else {
-	return RBRACE;
-      }
-      break;
-    case SWIG_TOKEN_LBRACE:
-      last_brace = num_brace;
-      num_brace++;
-      return LBRACE;
-    case SWIG_TOKEN_EQUAL:
-      return EQUAL;
-    case SWIG_TOKEN_EQUALTO:
-      return EQUALTO;
-    case SWIG_TOKEN_PLUS:
-      return PLUS;
-    case SWIG_TOKEN_MINUS:
-      return MINUS;
-    case SWIG_TOKEN_SLASH:
-      return SLASH;
-    case SWIG_TOKEN_AND:
-      return AND;
-    case SWIG_TOKEN_LAND:
-      return LAND;
-    case SWIG_TOKEN_OR:
-      return OR;
-    case SWIG_TOKEN_LOR:
-      return LOR;
-    case SWIG_TOKEN_XOR:
-      return XOR;
-    case SWIG_TOKEN_NOT:
-      return NOT;
-    case SWIG_TOKEN_LNOT:
-      return LNOT;
-    case SWIG_TOKEN_NOTEQUAL:
-      return NOTEQUALTO;
-    case SWIG_TOKEN_LBRACKET:
-      return LBRACKET;
-    case SWIG_TOKEN_RBRACKET:
-      return RBRACKET;
-    case SWIG_TOKEN_QUESTION:
-      return QUESTIONMARK;
-    case SWIG_TOKEN_LESSTHAN:
-      return LESSTHAN;
-    case SWIG_TOKEN_LTEQUAL:
-      return LESSTHANOREQUALTO;
-    case SWIG_TOKEN_LSHIFT:
-      return LSHIFT;
-    case SWIG_TOKEN_GREATERTHAN:
-      return GREATERTHAN;
-    case SWIG_TOKEN_GTEQUAL:
-      return GREATERTHANOREQUALTO;
-    case SWIG_TOKEN_RSHIFT:
-      return RSHIFT;
-    case SWIG_TOKEN_ARROW:
-      return ARROW;
-    case SWIG_TOKEN_PERIOD:
-      return PERIOD;
-    case SWIG_TOKEN_MODULO:
-      return MODULO;
-    case SWIG_TOKEN_COLON:
-      return COLON;
-    case SWIG_TOKEN_DCOLONSTAR:
-      return DSTAR;
-      
-    case SWIG_TOKEN_DCOLON:
-      {
-	int nexttok = Scanner_token(scan);
-	if (nexttok == SWIG_TOKEN_STAR) {
-	  return DSTAR;
-	} else if (nexttok == SWIG_TOKEN_NOT) {
-	  return DCNOT;
-	} else {
-	  Scanner_pushtoken(scan,nexttok,Scanner_text(scan));
-	  if (!last_id) {
-	    scanner_next_token(DCOLON);
-	    return NONID;
-	  } else {
-	    return DCOLON;
-	  }
-	}
-      }
-      break;
-      
-      /* Look for multi-character sequences */
-      
-    case SWIG_TOKEN_RSTRING:
-      yylval.type = NewString(Scanner_text(scan));
-      return TYPE_RAW;
-      
-    case SWIG_TOKEN_STRING:
-      yylval.id = Swig_copy_string(Char(Scanner_text(scan)));
-      return STRING;
-
-    case SWIG_TOKEN_WSTRING:
-      yylval.id = Swig_copy_string(Char(Scanner_text(scan)));
-      return WSTRING;
-      
-    case SWIG_TOKEN_CHAR:
-      yylval.str = NewString(Scanner_text(scan));
-      if (Len(yylval.str) == 0) {
-	Swig_error(cparse_file, cparse_line, "Empty character constant\n");
-      }
-      return CHARCONST;
-
-    case SWIG_TOKEN_WCHAR:
-      yylval.str = NewString(Scanner_text(scan));
-      if (Len(yylval.str) == 0) {
-	Swig_error(cparse_file, cparse_line, "Empty character constant\n");
-      }
-      return WCHARCONST;
-
-      /* Numbers */
-      
-    case SWIG_TOKEN_INT:
-      return NUM_INT;
-      
-    case SWIG_TOKEN_UINT:
-      return NUM_UNSIGNED;
-      
-    case SWIG_TOKEN_LONG:
-      return NUM_LONG;
-      
-    case SWIG_TOKEN_ULONG:
-      return NUM_ULONG;
-      
-    case SWIG_TOKEN_LONGLONG:
-      return NUM_LONGLONG;
-      
-    case SWIG_TOKEN_ULONGLONG:
-      return NUM_ULONGLONG;
-      
-    case SWIG_TOKEN_DOUBLE:
-    case SWIG_TOKEN_FLOAT:
-      return NUM_FLOAT;
-      
-    case SWIG_TOKEN_BOOL:
-      return NUM_BOOL;
-      
-    case SWIG_TOKEN_POUND:
-      Scanner_skip_line(scan);
-      yylval.id = Swig_copy_string(Char(Scanner_text(scan)));
-      return POUND;
-      break;
-      
-    case SWIG_TOKEN_CODEBLOCK:
-      yylval.str = NewString(Scanner_text(scan));
-      return HBLOCK;
-      
-    case SWIG_TOKEN_COMMENT:
-      {
-	String *cmt = Scanner_text(scan);
-	char *loc = Char(cmt);
-	if ((strncmp(loc,"/*@SWIG",7) == 0) && (loc[Len(cmt)-3] == '@')) {
-	  Scanner_locator(scan, cmt);
-	}
-      }
-      break;
-    case SWIG_TOKEN_ENDLINE:
-      break;
-    case SWIG_TOKEN_BACKSLASH:
-      break;
-    default:
-      Swig_error(cparse_file, cparse_line, "Illegal token '%s'.\n", Scanner_text(scan));
-      return (ILLEGAL);
-    }
-  }
-}
-
-static int check_typedef = 0;
-
-void scanner_set_location(String *file, int line) {
-  Scanner_set_location(scan,file,line-1);
-}
-
-void scanner_check_typedef() {
-  check_typedef = 1;
-}
-
-void scanner_ignore_typedef() {
-  check_typedef = 0;
-}
-
-void scanner_last_id(int x) {
-  last_id = x;
-}
-
-void scanner_clear_rename() {
-  rename_active = 0;
-}
-
-/* Used to push a fictitious token into the scanner */
-static int next_token = 0;
-void scanner_next_token(int tok) {
-  next_token = tok;
-}
-
-void scanner_set_main_input_file(String *file) {
-  main_input_file = file;
-}
-
-String *scanner_get_main_input_file() {
-  return main_input_file;
-}
-
-/* ----------------------------------------------------------------------------
- * int yylex()
- *
- * Gets the lexene and returns tokens.
- * ------------------------------------------------------------------------- */
-
-int yylex(void) {
-
-  int l;
-  char *yytext;
-
-  if (!scan_init) {
-    scanner_init();
-  }
-
-  if (next_token) {
-    l = next_token;
-    next_token = 0;
-    return l;
-  }
-
-  l = yylook();
-
-  /*   Swig_diagnostic(cparse_file, cparse_line, ":::%d: '%s'\n", l, Scanner_text(scan)); */
-
-  if (l == NONID) {
-    last_id = 1;
-  } else {
-    last_id = 0;
-  }
-
-  /* We got some sort of non-white space object.  We set the start_line
-     variable unless it has already been set */
-
-  if (!cparse_start_line) {
-    cparse_start_line = cparse_line;
-  }
-
-  /* Copy the lexene */
-
-  switch (l) {
-
-  case NUM_INT:
-  case NUM_FLOAT:
-  case NUM_ULONG:
-  case NUM_LONG:
-  case NUM_UNSIGNED:
-  case NUM_LONGLONG:
-  case NUM_ULONGLONG:
-  case NUM_BOOL:
-    if (l == NUM_INT)
-      yylval.dtype.type = T_INT;
-    if (l == NUM_FLOAT)
-      yylval.dtype.type = T_DOUBLE;
-    if (l == NUM_ULONG)
-      yylval.dtype.type = T_ULONG;
-    if (l == NUM_LONG)
-      yylval.dtype.type = T_LONG;
-    if (l == NUM_UNSIGNED)
-      yylval.dtype.type = T_UINT;
-    if (l == NUM_LONGLONG)
-      yylval.dtype.type = T_LONGLONG;
-    if (l == NUM_ULONGLONG)
-      yylval.dtype.type = T_ULONGLONG;
-    if (l == NUM_BOOL)
-      yylval.dtype.type = T_BOOL;
-    yylval.dtype.val = NewString(Scanner_text(scan));
-    yylval.dtype.bitfield = 0;
-    yylval.dtype.throws = 0;
-    return (l);
-
-  case ID:
-    yytext = Char(Scanner_text(scan));
-    if (yytext[0] != '%') {
-      /* Look for keywords now */
-
-      if (strcmp(yytext, "int") == 0) {
-	yylval.type = NewSwigType(T_INT);
-	return (TYPE_INT);
-      }
-      if (strcmp(yytext, "double") == 0) {
-	yylval.type = NewSwigType(T_DOUBLE);
-	return (TYPE_DOUBLE);
-      }
-      if (strcmp(yytext, "void") == 0) {
-	yylval.type = NewSwigType(T_VOID);
-	return (TYPE_VOID);
-      }
-      if (strcmp(yytext, "char") == 0) {
-	yylval.type = NewSwigType(T_CHAR);
-	return (TYPE_CHAR);
-      }
-      if (strcmp(yytext, "wchar_t") == 0) {
-	yylval.type = NewSwigType(T_WCHAR);
-	return (TYPE_WCHAR);
-      }
-      if (strcmp(yytext, "short") == 0) {
-	yylval.type = NewSwigType(T_SHORT);
-	return (TYPE_SHORT);
-      }
-      if (strcmp(yytext, "long") == 0) {
-	yylval.type = NewSwigType(T_LONG);
-	return (TYPE_LONG);
-      }
-      if (strcmp(yytext, "float") == 0) {
-	yylval.type = NewSwigType(T_FLOAT);
-	return (TYPE_FLOAT);
-      }
-      if (strcmp(yytext, "signed") == 0) {
-	yylval.type = NewSwigType(T_INT);
-	return (TYPE_SIGNED);
-      }
-      if (strcmp(yytext, "unsigned") == 0) {
-	yylval.type = NewSwigType(T_UINT);
-	return (TYPE_UNSIGNED);
-      }
-      if (strcmp(yytext, "bool") == 0) {
-	yylval.type = NewSwigType(T_BOOL);
-	return (TYPE_BOOL);
-      }
-
-      /* Non ISO (Windows) C extensions */
-      if (strcmp(yytext, "__int8") == 0) {
-	yylval.type = NewString(yytext);
-	return (TYPE_NON_ISO_INT8);
-      }
-      if (strcmp(yytext, "__int16") == 0) {
-	yylval.type = NewString(yytext);
-	return (TYPE_NON_ISO_INT16);
-      }
-      if (strcmp(yytext, "__int32") == 0) {
-	yylval.type = NewString(yytext);
-	return (TYPE_NON_ISO_INT32);
-      }
-      if (strcmp(yytext, "__int64") == 0) {
-	yylval.type = NewString(yytext);
-	return (TYPE_NON_ISO_INT64);
-      }
-
-      /* C++ keywords */
-      if (cparse_cplusplus) {
-	if (strcmp(yytext, "and") == 0)
-	  return (LAND);
-	if (strcmp(yytext, "or") == 0)
-	  return (LOR);
-	if (strcmp(yytext, "not") == 0)
-	  return (LNOT);
-	if (strcmp(yytext, "class") == 0)
-	  return (CLASS);
-	if (strcmp(yytext, "private") == 0)
-	  return (PRIVATE);
-	if (strcmp(yytext, "public") == 0)
-	  return (PUBLIC);
-	if (strcmp(yytext, "protected") == 0)
-	  return (PROTECTED);
-	if (strcmp(yytext, "friend") == 0)
-	  return (FRIEND);
-	if (strcmp(yytext, "constexpr") == 0)
-	  return (CONSTEXPR);
-	if (strcmp(yytext, "thread_local") == 0)
-	  return (THREAD_LOCAL);
-	if (strcmp(yytext, "decltype") == 0)
-	  return (DECLTYPE);
-	if (strcmp(yytext, "virtual") == 0)
-	  return (VIRTUAL);
-	if (strcmp(yytext, "static_assert") == 0)
-	  return (STATIC_ASSERT);
-	if (strcmp(yytext, "operator") == 0) {
-	  int nexttok;
-	  String *s = NewString("operator ");
-
-	  /* If we have an operator, we have to collect the operator symbol and attach it to
-             the operator identifier.   To do this, we need to scan ahead by several tokens.
-             Cases include:
-
-             (1) If the next token is an operator as determined by Scanner_isoperator(),
-                 it means that the operator applies to one of the standard C++ mathematical,
-                 assignment, or logical operator symbols (e.g., '+','<=','==','&', etc.)
-                 In this case, we merely append the symbol text to the operator string above.
-
-             (2) If the next token is (, we look for ).  This is operator ().
-             (3) If the next token is [, we look for ].  This is operator [].
-	     (4) If the next token is an identifier.  The operator is possibly a conversion operator.
-                      (a) Must check for special case new[] and delete[]
-
-             Error handling is somewhat tricky here.  We'll try to back out gracefully if we can.
- 
-	  */
-
-	  do {
-	    nexttok = Scanner_token(scan);
-	  } while (nexttok == SWIG_TOKEN_ENDLINE || nexttok == SWIG_TOKEN_COMMENT);
-
-	  if (Scanner_isoperator(nexttok)) {
-	    /* One of the standard C/C++ symbolic operators */
-	    Append(s,Scanner_text(scan));
-	    yylval.str = s;
-	    return OPERATOR;
-	  } else if (nexttok == SWIG_TOKEN_LPAREN) {
-	    /* Function call operator.  The next token MUST be a RPAREN */
-	    nexttok = Scanner_token(scan);
-	    if (nexttok != SWIG_TOKEN_RPAREN) {
-	      Swig_error(Scanner_file(scan),Scanner_line(scan),"Syntax error. Bad operator name.\n");
-	    } else {
-	      Append(s,"()");
-	      yylval.str = s;
-	      return OPERATOR;
-	    }
-	  } else if (nexttok == SWIG_TOKEN_LBRACKET) {
-	    /* Array access operator.  The next token MUST be a RBRACKET */
-	    nexttok = Scanner_token(scan);
-	    if (nexttok != SWIG_TOKEN_RBRACKET) {
-	      Swig_error(Scanner_file(scan),Scanner_line(scan),"Syntax error. Bad operator name.\n");	      
-	    } else {
-	      Append(s,"[]");
-	      yylval.str = s;
-	      return OPERATOR;
-	    }
-	  } else if (nexttok == SWIG_TOKEN_STRING) {
-	    /* Operator "" or user-defined string literal ""_suffix */
-	    Append(s,"\"\"");
-	    yylval.str = s;
-	    return OPERATOR;
-	  } else if (nexttok == SWIG_TOKEN_ID) {
-	    /* We have an identifier.  This could be any number of things. It could be a named version of
-               an operator (e.g., 'and_eq') or it could be a conversion operator.   To deal with this, we're
-               going to read tokens until we encounter a ( or ;.  Some care is needed for formatting. */
-	    int needspace = 1;
-	    int termtoken = 0;
-	    const char *termvalue = 0;
-
-	    Append(s,Scanner_text(scan));
-	    while (1) {
-
-	      nexttok = Scanner_token(scan);
-	      if (nexttok <= 0) {
-		Swig_error(Scanner_file(scan),Scanner_line(scan),"Syntax error. Bad operator name.\n");	      
-	      }
-	      if (nexttok == SWIG_TOKEN_LPAREN) {
-		termtoken = SWIG_TOKEN_LPAREN;
-		termvalue = "(";
-		break;
-              } else if (nexttok == SWIG_TOKEN_CODEBLOCK) {
-                termtoken = SWIG_TOKEN_CODEBLOCK;
-                termvalue = Char(Scanner_text(scan));
-                break;
-              } else if (nexttok == SWIG_TOKEN_LBRACE) {
-                termtoken = SWIG_TOKEN_LBRACE;
-                termvalue = "{";
-                break;
-              } else if (nexttok == SWIG_TOKEN_SEMI) {
-		termtoken = SWIG_TOKEN_SEMI;
-		termvalue = ";";
-		break;
-              } else if (nexttok == SWIG_TOKEN_STRING) {
-		termtoken = SWIG_TOKEN_STRING;
-                termvalue = Swig_copy_string(Char(Scanner_text(scan)));
-		break;
-	      } else if (nexttok == SWIG_TOKEN_ID) {
-		if (needspace) {
-		  Append(s," ");
-		}
-		Append(s,Scanner_text(scan));
-	      } else if (nexttok == SWIG_TOKEN_ENDLINE) {
-	      } else if (nexttok == SWIG_TOKEN_COMMENT) {
-	      } else {
-		Append(s,Scanner_text(scan));
-		needspace = 0;
-	      }
-	    }
-	    yylval.str = s;
-	    if (!rename_active) {
-	      String *cs;
-	      char *t = Char(s) + 9;
-	      if (!((strcmp(t, "new") == 0)
-		    || (strcmp(t, "delete") == 0)
-		    || (strcmp(t, "new[]") == 0)
-		    || (strcmp(t, "delete[]") == 0)
-		    || (strcmp(t, "and") == 0)
-		    || (strcmp(t, "and_eq") == 0)
-		    || (strcmp(t, "bitand") == 0)
-		    || (strcmp(t, "bitor") == 0)
-		    || (strcmp(t, "compl") == 0)
-		    || (strcmp(t, "not") == 0)
-		    || (strcmp(t, "not_eq") == 0)
-		    || (strcmp(t, "or") == 0)
-		    || (strcmp(t, "or_eq") == 0)
-		    || (strcmp(t, "xor") == 0)
-		    || (strcmp(t, "xor_eq") == 0)
-		    )) {
-		/*              retract(strlen(t)); */
-
-		/* The operator is a conversion operator.   In order to deal with this, we need to feed the
-                   type information back into the parser.  For now this is a hack.  Needs to be cleaned up later. */
-		cs = NewString(t);
-		if (termtoken) Append(cs,termvalue);
-		Seek(cs,0,SEEK_SET);
-		Setline(cs,cparse_line);
-		Setfile(cs,cparse_file);
-		Scanner_push(scan,cs);
-		Delete(cs);
-		return CONVERSIONOPERATOR;
-	      }
-	    }
-	    if (termtoken)
-              Scanner_pushtoken(scan, termtoken, termvalue);
-	    return (OPERATOR);
-	  }
-	}
-	if (strcmp(yytext, "throw") == 0)
-	  return (THROW);
-	if (strcmp(yytext, "noexcept") == 0)
-	  return (NOEXCEPT);
-	if (strcmp(yytext, "try") == 0)
-	  return (yylex());
-	if (strcmp(yytext, "catch") == 0)
-	  return (CATCH);
-	if (strcmp(yytext, "inline") == 0)
-	  return (yylex());
-	if (strcmp(yytext, "mutable") == 0)
-	  return (yylex());
-	if (strcmp(yytext, "explicit") == 0)
-	  return (EXPLICIT);
-	if (strcmp(yytext, "auto") == 0)
-	  return (AUTO);
-	if (strcmp(yytext, "export") == 0)
-	  return (yylex());
-	if (strcmp(yytext, "typename") == 0)
-	  return (TYPENAME);
-	if (strcmp(yytext, "template") == 0) {
-	  yylval.intvalue = cparse_line;
-	  return (TEMPLATE);
-	}
-	if (strcmp(yytext, "delete") == 0)
-	  return (DELETE_KW);
-	if (strcmp(yytext, "default") == 0)
-	  return (DEFAULT);
-	if (strcmp(yytext, "using") == 0)
-	  return (USING);
-	if (strcmp(yytext, "namespace") == 0)
-	  return (NAMESPACE);
-	if (strcmp(yytext, "override") == 0)
-	  return (OVERRIDE);
-	if (strcmp(yytext, "final") == 0)
-	  return (FINAL);
-      } else {
-	if (strcmp(yytext, "class") == 0) {
-	  Swig_warning(WARN_PARSE_CLASS_KEYWORD, cparse_file, cparse_line, "class keyword used, but not in C++ mode.\n");
-	}
-	if (strcmp(yytext, "complex") == 0) {
-	  yylval.type = NewSwigType(T_COMPLEX);
-	  return (TYPE_COMPLEX);
-	}
-	if (strcmp(yytext, "restrict") == 0)
-	  return (yylex());
-      }
-
-      /* Misc keywords */
-
-      if (strcmp(yytext, "extern") == 0)
-	return (EXTERN);
-      if (strcmp(yytext, "const") == 0)
-	return (CONST_QUAL);
-      if (strcmp(yytext, "static") == 0)
-	return (STATIC);
-      if (strcmp(yytext, "struct") == 0)
-	return (STRUCT);
-      if (strcmp(yytext, "union") == 0)
-	return (UNION);
-      if (strcmp(yytext, "enum") == 0)
-	return (ENUM);
-      if (strcmp(yytext, "sizeof") == 0)
-	return (SIZEOF);
-
-      if (strcmp(yytext, "typedef") == 0) {
-	yylval.intvalue = 0;
-	return (TYPEDEF);
-      }
-
-      /* Ignored keywords */
-
-      if (strcmp(yytext, "volatile") == 0)
-	return (VOLATILE);
-      if (strcmp(yytext, "register") == 0)
-	return (REGISTER);
-      if (strcmp(yytext, "inline") == 0)
-	return (yylex());
-
-    } else {
-      Delete(cparse_unknown_directive);
-      cparse_unknown_directive = NULL;
-
-      /* SWIG directives */
-      if (strcmp(yytext, "%module") == 0)
-	return (MODULE);
-      if (strcmp(yytext, "%insert") == 0)
-	return (INSERT);
-      if (strcmp(yytext, "%name") == 0)
-	return (NAME);
-      if (strcmp(yytext, "%rename") == 0) {
-	rename_active = 1;
-	return (RENAME);
-      }
-      if (strcmp(yytext, "%namewarn") == 0) {
-	rename_active = 1;
-	return (NAMEWARN);
-      }
-      if (strcmp(yytext, "%includefile") == 0)
-	return (INCLUDE);
-      if (strcmp(yytext, "%beginfile") == 0)
-	return (BEGINFILE);
-      if (strcmp(yytext, "%endoffile") == 0)
-	return (ENDOFFILE);
-      if (strcmp(yytext, "%val") == 0) {
-	Swig_warning(WARN_DEPRECATED_VAL, cparse_file, cparse_line, "%%val directive deprecated (ignored).\n");
-	return (yylex());
-      }
-      if (strcmp(yytext, "%out") == 0) {
-	Swig_warning(WARN_DEPRECATED_OUT, cparse_file, cparse_line, "%%out directive deprecated (ignored).\n");
-	return (yylex());
-      }
-      if (strcmp(yytext, "%constant") == 0)
-	return (CONSTANT);
-      if (strcmp(yytext, "%typedef") == 0) {
-	yylval.intvalue = 1;
-	return (TYPEDEF);
-      }
-      if (strcmp(yytext, "%native") == 0)
-	return (NATIVE);
-      if (strcmp(yytext, "%pragma") == 0)
-	return (PRAGMA);
-      if (strcmp(yytext, "%extend") == 0)
-	return (EXTEND);
-      if (strcmp(yytext, "%fragment") == 0)
-	return (FRAGMENT);
-      if (strcmp(yytext, "%inline") == 0)
-	return (INLINE);
-      if (strcmp(yytext, "%typemap") == 0)
-	return (TYPEMAP);
-      if (strcmp(yytext, "%feature") == 0) {
-        /* The rename_active indicates we don't need the information of the 
-         * following function's return type. This applied for %rename, so do
-         * %feature. 
-         */
-        rename_active = 1;
-	return (FEATURE);
-      }
-      if (strcmp(yytext, "%except") == 0)
-	return (EXCEPT);
-      if (strcmp(yytext, "%importfile") == 0)
-	return (IMPORT);
-      if (strcmp(yytext, "%echo") == 0)
-	return (ECHO);
-      if (strcmp(yytext, "%apply") == 0)
-	return (APPLY);
-      if (strcmp(yytext, "%clear") == 0)
-	return (CLEAR);
-      if (strcmp(yytext, "%types") == 0)
-	return (TYPES);
-      if (strcmp(yytext, "%parms") == 0)
-	return (PARMS);
-      if (strcmp(yytext, "%varargs") == 0)
-	return (VARARGS);
-      if (strcmp(yytext, "%template") == 0) {
-	return (SWIGTEMPLATE);
-      }
-      if (strcmp(yytext, "%warn") == 0)
-	return (WARN);
-
-      /* Note down the apparently unknown directive for error reporting. */
-      cparse_unknown_directive = NewString(yytext);
-    }
-    /* Have an unknown identifier, as a last step, we'll do a typedef lookup on it. */
-
-    /* Need to fix this */
-    if (check_typedef) {
-      if (SwigType_istypedef(yytext)) {
-	yylval.type = NewString(yytext);
-	return (TYPE_TYPEDEF);
-      }
-    }
-    yylval.id = Swig_copy_string(yytext);
-    last_id = 1;
-    return (ID);
-  case POUND:
-    return yylex();
-  default:
-    return (l);
-  }
-}
diff --git a/dependencies2013/win32/swig/Source/CParse/parser.c b/dependencies2013/win32/swig/Source/CParse/parser.c
deleted file mode 100644
index 6127bcf4..00000000
--- a/dependencies2013/win32/swig/Source/CParse/parser.c
+++ /dev/null
@@ -1,12148 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 25 "parser.y" /* yacc.c:339  */
-
-#define yylex yylex
-
-#include "swig.h"
-#include "cparse.h"
-#include "preprocessor.h"
-#include <ctype.h>
-
-/* We do this for portability */
-#undef alloca
-#define alloca malloc
-
-/* -----------------------------------------------------------------------------
- *                               Externals
- * ----------------------------------------------------------------------------- */
-
-int  yyparse();
-
-/* NEW Variables */
-
-static Node    *top = 0;      /* Top of the generated parse tree */
-static int      unnamed = 0;  /* Unnamed datatype counter */
-static Hash    *classes = 0;        /* Hash table of classes */
-static Hash    *classes_typedefs = 0; /* Hash table of typedef classes: typedef struct X {...} Y; */
-static Symtab  *prev_symtab = 0;
-static Node    *current_class = 0;
-String  *ModuleName = 0;
-static Node    *module_node = 0;
-static String  *Classprefix = 0;  
-static String  *Namespaceprefix = 0;
-static int      inclass = 0;
-static Node    *currentOuterClass = 0; /* for nested classes */
-static const char *last_cpptype = 0;
-static int      inherit_list = 0;
-static Parm    *template_parameters = 0;
-static int      parsing_template_declaration = 0;
-static int      extendmode   = 0;
-static int      compact_default_args = 0;
-static int      template_reduce = 0;
-static int      cparse_externc = 0;
-int		ignore_nested_classes = 0;
-int		kwargs_supported = 0;
-/* -----------------------------------------------------------------------------
- *                            Assist Functions
- * ----------------------------------------------------------------------------- */
-
-
- 
-/* Called by the parser (yyparse) when an error is found.*/
-static void yyerror (const char *e) {
-  (void)e;
-}
-
-/* Copies a node.  Does not copy tree links or symbol table data (except for
-   sym:name) */
-
-static Node *copy_node(Node *n) {
-  Node *nn;
-  Iterator k;
-  nn = NewHash();
-  Setfile(nn,Getfile(n));
-  Setline(nn,Getline(n));
-  for (k = First(n); k.key; k = Next(k)) {
-    String *ci;
-    String *key = k.key;
-    char *ckey = Char(key);
-    if ((strcmp(ckey,"nextSibling") == 0) ||
-	(strcmp(ckey,"previousSibling") == 0) ||
-	(strcmp(ckey,"parentNode") == 0) ||
-	(strcmp(ckey,"lastChild") == 0)) {
-      continue;
-    }
-    if (Strncmp(key,"csym:",5) == 0) continue;
-    /* We do copy sym:name.  For templates */
-    if ((strcmp(ckey,"sym:name") == 0) || 
-	(strcmp(ckey,"sym:weak") == 0) ||
-	(strcmp(ckey,"sym:typename") == 0)) {
-      String *ci = Copy(k.item);
-      Setattr(nn,key, ci);
-      Delete(ci);
-      continue;
-    }
-    if (strcmp(ckey,"sym:symtab") == 0) {
-      Setattr(nn,"sym:needs_symtab", "1");
-    }
-    /* We don't copy any other symbol table attributes */
-    if (strncmp(ckey,"sym:",4) == 0) {
-      continue;
-    }
-    /* If children.  We copy them recursively using this function */
-    if (strcmp(ckey,"firstChild") == 0) {
-      /* Copy children */
-      Node *cn = k.item;
-      while (cn) {
-	Node *copy = copy_node(cn);
-	appendChild(nn,copy);
-	Delete(copy);
-	cn = nextSibling(cn);
-      }
-      continue;
-    }
-    /* We don't copy the symbol table.  But we drop an attribute 
-       requires_symtab so that functions know it needs to be built */
-
-    if (strcmp(ckey,"symtab") == 0) {
-      /* Node defined a symbol table. */
-      Setattr(nn,"requires_symtab","1");
-      continue;
-    }
-    /* Can't copy nodes */
-    if (strcmp(ckey,"node") == 0) {
-      continue;
-    }
-    if ((strcmp(ckey,"parms") == 0) || (strcmp(ckey,"pattern") == 0) || (strcmp(ckey,"throws") == 0)
-	|| (strcmp(ckey,"kwargs") == 0)) {
-      ParmList *pl = CopyParmList(k.item);
-      Setattr(nn,key,pl);
-      Delete(pl);
-      continue;
-    }
-    if (strcmp(ckey,"nested:outer") == 0) { /* don't copy outer classes links, they will be updated later */
-      Setattr(nn, key, k.item);
-      continue;
-    }
-    /* defaultargs will be patched back in later in update_defaultargs() */
-    if (strcmp(ckey,"defaultargs") == 0) {
-      Setattr(nn, "needs_defaultargs", "1");
-      continue;
-    }
-    /* Looks okay.  Just copy the data using Copy */
-    ci = Copy(k.item);
-    Setattr(nn, key, ci);
-    Delete(ci);
-  }
-  return nn;
-}
-
-/* -----------------------------------------------------------------------------
- *                              Variables
- * ----------------------------------------------------------------------------- */
-
-static char  *typemap_lang = 0;    /* Current language setting */
-
-static int cplus_mode  = 0;
-
-/* C++ modes */
-
-#define  CPLUS_PUBLIC    1
-#define  CPLUS_PRIVATE   2
-#define  CPLUS_PROTECTED 3
-
-/* include types */
-static int   import_mode = 0;
-
-void SWIG_typemap_lang(const char *tm_lang) {
-  typemap_lang = Swig_copy_string(tm_lang);
-}
-
-void SWIG_cparse_set_compact_default_args(int defargs) {
-  compact_default_args = defargs;
-}
-
-int SWIG_cparse_template_reduce(int treduce) {
-  template_reduce = treduce;
-  return treduce;  
-}
-
-/* -----------------------------------------------------------------------------
- *                           Assist functions
- * ----------------------------------------------------------------------------- */
-
-static int promote_type(int t) {
-  if (t <= T_UCHAR || t == T_CHAR) return T_INT;
-  return t;
-}
-
-/* Perform type-promotion for binary operators */
-static int promote(int t1, int t2) {
-  t1 = promote_type(t1);
-  t2 = promote_type(t2);
-  return t1 > t2 ? t1 : t2;
-}
-
-static String *yyrename = 0;
-
-/* Forward renaming operator */
-
-static String *resolve_create_node_scope(String *cname);
-
-
-Hash *Swig_cparse_features(void) {
-  static Hash   *features_hash = 0;
-  if (!features_hash) features_hash = NewHash();
-  return features_hash;
-}
-
-/* Fully qualify any template parameters */
-static String *feature_identifier_fix(String *s) {
-  String *tp = SwigType_istemplate_templateprefix(s);
-  if (tp) {
-    String *ts, *ta, *tq;
-    ts = SwigType_templatesuffix(s);
-    ta = SwigType_templateargs(s);
-    tq = Swig_symbol_type_qualify(ta,0);
-    Append(tp,tq);
-    Append(tp,ts);
-    Delete(ts);
-    Delete(ta);
-    Delete(tq);
-    return tp;
-  } else {
-    return NewString(s);
-  }
-}
-
-static void set_access_mode(Node *n) {
-  if (cplus_mode == CPLUS_PUBLIC)
-    Setattr(n, "access", "public");
-  else if (cplus_mode == CPLUS_PROTECTED)
-    Setattr(n, "access", "protected");
-  else
-    Setattr(n, "access", "private");
-}
-
-static void restore_access_mode(Node *n) {
-  String *mode = Getattr(n, "access");
-  if (Strcmp(mode, "private") == 0)
-    cplus_mode = CPLUS_PRIVATE;
-  else if (Strcmp(mode, "protected") == 0)
-    cplus_mode = CPLUS_PROTECTED;
-  else
-    cplus_mode = CPLUS_PUBLIC;
-}
-
-/* Generate the symbol table name for an object */
-/* This is a bit of a mess. Need to clean up */
-static String *add_oldname = 0;
-
-
-
-static String *make_name(Node *n, String *name,SwigType *decl) {
-  String *made_name = 0;
-  int destructor = name && (*(Char(name)) == '~');
-
-  if (yyrename) {
-    String *s = NewString(yyrename);
-    Delete(yyrename);
-    yyrename = 0;
-    if (destructor  && (*(Char(s)) != '~')) {
-      Insert(s,0,"~");
-    }
-    return s;
-  }
-
-  if (!name) return 0;
-
-  if (parsing_template_declaration)
-    SetFlag(n, "parsing_template_declaration");
-  made_name = Swig_name_make(n, Namespaceprefix, name, decl, add_oldname);
-  Delattr(n, "parsing_template_declaration");
-
-  return made_name;
-}
-
-/* Generate an unnamed identifier */
-static String *make_unnamed() {
-  unnamed++;
-  return NewStringf("$unnamed%d$",unnamed);
-}
-
-/* Return if the node is a friend declaration */
-static int is_friend(Node *n) {
-  return Cmp(Getattr(n,"storage"),"friend") == 0;
-}
-
-static int is_operator(String *name) {
-  return Strncmp(name,"operator ", 9) == 0;
-}
-
-
-/* Add declaration list to symbol table */
-static int  add_only_one = 0;
-
-static void add_symbols(Node *n) {
-  String *decl;
-  String *wrn = 0;
-
-  if (inclass && n) {
-    cparse_normalize_void(n);
-  }
-  while (n) {
-    String *symname = 0;
-    /* for friends, we need to pop the scope once */
-    String *old_prefix = 0;
-    Symtab *old_scope = 0;
-    int isfriend = inclass && is_friend(n);
-    int iscdecl = Cmp(nodeType(n),"cdecl") == 0;
-    int only_csymbol = 0;
-    
-    if (inclass) {
-      String *name = Getattr(n, "name");
-      if (isfriend) {
-	/* for friends, we need to add the scopename if needed */
-	String *prefix = name ? Swig_scopename_prefix(name) : 0;
-	old_prefix = Namespaceprefix;
-	old_scope = Swig_symbol_popscope();
-	Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	if (!prefix) {
-	  if (name && !is_operator(name) && Namespaceprefix) {
-	    String *nname = NewStringf("%s::%s", Namespaceprefix, name);
-	    Setattr(n,"name",nname);
-	    Delete(nname);
-	  }
-	} else {
-	  Symtab *st = Swig_symbol_getscope(prefix);
-	  String *ns = st ? Getattr(st,"name") : prefix;
-	  String *base  = Swig_scopename_last(name);
-	  String *nname = NewStringf("%s::%s", ns, base);
-	  Setattr(n,"name",nname);
-	  Delete(nname);
-	  Delete(base);
-	  Delete(prefix);
-	}
-	Namespaceprefix = 0;
-      } else {
-	/* for member functions, we need to remove the redundant
-	   class scope if provided, as in
-	   
-	   struct Foo {
-	   int Foo::method(int a);
-	   };
-	   
-	*/
-	String *prefix = name ? Swig_scopename_prefix(name) : 0;
-	if (prefix) {
-	  if (Classprefix && (Equal(prefix,Classprefix))) {
-	    String *base = Swig_scopename_last(name);
-	    Setattr(n,"name",base);
-	    Delete(base);
-	  }
-	  Delete(prefix);
-	}
-      }
-    }
-
-    if (!isfriend && (inclass || extendmode)) {
-      Setattr(n,"ismember","1");
-    }
-
-    if (extendmode) {
-      if (!Getattr(n, "template"))
-        SetFlag(n,"isextendmember");
-    }
-
-    if (!isfriend && inclass) {
-      if ((cplus_mode != CPLUS_PUBLIC)) {
-	only_csymbol = 1;
-	if (cplus_mode == CPLUS_PROTECTED) {
-	  Setattr(n,"access", "protected");
-	  only_csymbol = !Swig_need_protected(n);
-	} else {
-	  Setattr(n,"access", "private");
-	  /* private are needed only when they are pure virtuals - why? */
-	  if ((Cmp(Getattr(n,"storage"),"virtual") == 0) && (Cmp(Getattr(n,"value"),"0") == 0)) {
-	    only_csymbol = 0;
-	  }
-	  if (Cmp(nodeType(n),"destructor") == 0) {
-	    /* Needed for "unref" feature */
-	    only_csymbol = 0;
-	  }
-	}
-      } else {
-	  Setattr(n,"access", "public");
-      }
-    }
-    if (Getattr(n,"sym:name")) {
-      n = nextSibling(n);
-      continue;
-    }
-    decl = Getattr(n,"decl");
-    if (!SwigType_isfunction(decl)) {
-      String *name = Getattr(n,"name");
-      String *makename = Getattr(n,"parser:makename");
-      if (iscdecl) {	
-	String *storage = Getattr(n, "storage");
-	if (Cmp(storage,"typedef") == 0) {
-	  Setattr(n,"kind","typedef");
-	} else {
-	  SwigType *type = Getattr(n,"type");
-	  String *value = Getattr(n,"value");
-	  Setattr(n,"kind","variable");
-	  if (value && Len(value)) {
-	    Setattr(n,"hasvalue","1");
-	  }
-	  if (type) {
-	    SwigType *ty;
-	    SwigType *tmp = 0;
-	    if (decl) {
-	      ty = tmp = Copy(type);
-	      SwigType_push(ty,decl);
-	    } else {
-	      ty = type;
-	    }
-	    if (!SwigType_ismutable(ty) || (storage && Strstr(storage, "constexpr"))) {
-	      SetFlag(n,"hasconsttype");
-	      SetFlag(n,"feature:immutable");
-	    }
-	    if (tmp) Delete(tmp);
-	  }
-	  if (!type) {
-	    Printf(stderr,"notype name %s\n", name);
-	  }
-	}
-      }
-      Swig_features_get(Swig_cparse_features(), Namespaceprefix, name, 0, n);
-      if (makename) {
-	symname = make_name(n, makename,0);
-        Delattr(n,"parser:makename"); /* temporary information, don't leave it hanging around */
-      } else {
-        makename = name;
-	symname = make_name(n, makename,0);
-      }
-      
-      if (!symname) {
-	symname = Copy(Getattr(n,"unnamed"));
-      }
-      if (symname) {
-	if (parsing_template_declaration)
-	  SetFlag(n, "parsing_template_declaration");
-	wrn = Swig_name_warning(n, Namespaceprefix, symname,0);
-	Delattr(n, "parsing_template_declaration");
-      }
-    } else {
-      String *name = Getattr(n,"name");
-      SwigType *fdecl = Copy(decl);
-      SwigType *fun = SwigType_pop_function(fdecl);
-      if (iscdecl) {	
-	Setattr(n,"kind","function");
-      }
-      
-      Swig_features_get(Swig_cparse_features(),Namespaceprefix,name,fun,n);
-
-      symname = make_name(n, name,fun);
-      if (parsing_template_declaration)
-	SetFlag(n, "parsing_template_declaration");
-      wrn = Swig_name_warning(n, Namespaceprefix,symname,fun);
-      Delattr(n, "parsing_template_declaration");
-      
-      Delete(fdecl);
-      Delete(fun);
-      
-    }
-    if (!symname) {
-      n = nextSibling(n);
-      continue;
-    }
-    if (cparse_cplusplus) {
-      String *value = Getattr(n, "value");
-      if (value && Strcmp(value, "delete") == 0) {
-	/* C++11 deleted definition / deleted function */
-        SetFlag(n,"deleted");
-        SetFlag(n,"feature:ignore");
-      }
-    }
-    if (only_csymbol || GetFlag(n,"feature:ignore") || strncmp(Char(symname),"$ignore",7) == 0) {
-      /* Only add to C symbol table and continue */
-      Swig_symbol_add(0, n);
-      if (!only_csymbol && !GetFlag(n, "feature:ignore")) {
-	/* Print the warning attached to $ignore name, if any */
-        char *c = Char(symname) + 7;
-	if (strlen(c)) {
-	  SWIG_WARN_NODE_BEGIN(n);
-	  Swig_warning(0,Getfile(n), Getline(n), "%s\n",c+1);
-	  SWIG_WARN_NODE_END(n);
-	}
-	/* If the symbol was ignored via "rename" and is visible, set also feature:ignore*/
-	SetFlag(n, "feature:ignore");
-      }
-      if (!GetFlag(n, "feature:ignore") && Strcmp(symname,"$ignore") == 0) {
-	/* Add feature:ignore if the symbol was explicitely ignored, regardless of visibility */
-	SetFlag(n, "feature:ignore");
-      }
-    } else {
-      Node *c;
-      if ((wrn) && (Len(wrn))) {
-	String *metaname = symname;
-	if (!Getmeta(metaname,"already_warned")) {
-	  SWIG_WARN_NODE_BEGIN(n);
-	  Swig_warning(0,Getfile(n),Getline(n), "%s\n", wrn);
-	  SWIG_WARN_NODE_END(n);
-	  Setmeta(metaname,"already_warned","1");
-	}
-      }
-      c = Swig_symbol_add(symname,n);
-
-      if (c != n) {
-        /* symbol conflict attempting to add in the new symbol */
-        if (Getattr(n,"sym:weak")) {
-          Setattr(n,"sym:name",symname);
-        } else {
-          String *e = NewStringEmpty();
-          String *en = NewStringEmpty();
-          String *ec = NewStringEmpty();
-          int redefined = Swig_need_redefined_warn(n,c,inclass);
-          if (redefined) {
-            Printf(en,"Identifier '%s' redefined (ignored)",symname);
-            Printf(ec,"previous definition of '%s'",symname);
-          } else {
-            Printf(en,"Redundant redeclaration of '%s'",symname);
-            Printf(ec,"previous declaration of '%s'",symname);
-          }
-          if (Cmp(symname,Getattr(n,"name"))) {
-            Printf(en," (Renamed from '%s')", SwigType_namestr(Getattr(n,"name")));
-          }
-          Printf(en,",");
-          if (Cmp(symname,Getattr(c,"name"))) {
-            Printf(ec," (Renamed from '%s')", SwigType_namestr(Getattr(c,"name")));
-          }
-          Printf(ec,".");
-	  SWIG_WARN_NODE_BEGIN(n);
-          if (redefined) {
-            Swig_warning(WARN_PARSE_REDEFINED,Getfile(n),Getline(n),"%s\n",en);
-            Swig_warning(WARN_PARSE_REDEFINED,Getfile(c),Getline(c),"%s\n",ec);
-          } else if (!is_friend(n) && !is_friend(c)) {
-            Swig_warning(WARN_PARSE_REDUNDANT,Getfile(n),Getline(n),"%s\n",en);
-            Swig_warning(WARN_PARSE_REDUNDANT,Getfile(c),Getline(c),"%s\n",ec);
-          }
-	  SWIG_WARN_NODE_END(n);
-          Printf(e,"%s:%d:%s\n%s:%d:%s\n",Getfile(n),Getline(n),en,
-                 Getfile(c),Getline(c),ec);
-          Setattr(n,"error",e);
-	  Delete(e);
-          Delete(en);
-          Delete(ec);
-        }
-      }
-    }
-    /* restore the class scope if needed */
-    if (isfriend) {
-      Swig_symbol_setscope(old_scope);
-      if (old_prefix) {
-	Delete(Namespaceprefix);
-	Namespaceprefix = old_prefix;
-      }
-    }
-    Delete(symname);
-
-    if (add_only_one) return;
-    n = nextSibling(n);
-  }
-}
-
-
-/* add symbols a parse tree node copy */
-
-static void add_symbols_copy(Node *n) {
-  String *name;
-  int    emode = 0;
-  while (n) {
-    char *cnodeType = Char(nodeType(n));
-
-    if (strcmp(cnodeType,"access") == 0) {
-      String *kind = Getattr(n,"kind");
-      if (Strcmp(kind,"public") == 0) {
-	cplus_mode = CPLUS_PUBLIC;
-      } else if (Strcmp(kind,"private") == 0) {
-	cplus_mode = CPLUS_PRIVATE;
-      } else if (Strcmp(kind,"protected") == 0) {
-	cplus_mode = CPLUS_PROTECTED;
-      }
-      n = nextSibling(n);
-      continue;
-    }
-
-    add_oldname = Getattr(n,"sym:name");
-    if ((add_oldname) || (Getattr(n,"sym:needs_symtab"))) {
-      int old_inclass = -1;
-      Node *old_current_class = 0;
-      if (add_oldname) {
-	DohIncref(add_oldname);
-	/*  Disable this, it prevents %rename to work with templates */
-	/* If already renamed, we used that name  */
-	/*
-	if (Strcmp(add_oldname, Getattr(n,"name")) != 0) {
-	  Delete(yyrename);
-	  yyrename = Copy(add_oldname);
-	}
-	*/
-      }
-      Delattr(n,"sym:needs_symtab");
-      Delattr(n,"sym:name");
-
-      add_only_one = 1;
-      add_symbols(n);
-
-      if (Getattr(n,"partialargs")) {
-	Swig_symbol_cadd(Getattr(n,"partialargs"),n);
-      }
-      add_only_one = 0;
-      name = Getattr(n,"name");
-      if (Getattr(n,"requires_symtab")) {
-	Swig_symbol_newscope();
-	Swig_symbol_setscopename(name);
-	Delete(Namespaceprefix);
-	Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-      }
-      if (strcmp(cnodeType,"class") == 0) {
-	old_inclass = inclass;
-	inclass = 1;
-	old_current_class = current_class;
-	current_class = n;
-	if (Strcmp(Getattr(n,"kind"),"class") == 0) {
-	  cplus_mode = CPLUS_PRIVATE;
-	} else {
-	  cplus_mode = CPLUS_PUBLIC;
-	}
-      }
-      if (strcmp(cnodeType,"extend") == 0) {
-	emode = cplus_mode;
-	cplus_mode = CPLUS_PUBLIC;
-      }
-      add_symbols_copy(firstChild(n));
-      if (strcmp(cnodeType,"extend") == 0) {
-	cplus_mode = emode;
-      }
-      if (Getattr(n,"requires_symtab")) {
-	Setattr(n,"symtab", Swig_symbol_popscope());
-	Delattr(n,"requires_symtab");
-	Delete(Namespaceprefix);
-	Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-      }
-      if (add_oldname) {
-	Delete(add_oldname);
-	add_oldname = 0;
-      }
-      if (strcmp(cnodeType,"class") == 0) {
-	inclass = old_inclass;
-	current_class = old_current_class;
-      }
-    } else {
-      if (strcmp(cnodeType,"extend") == 0) {
-	emode = cplus_mode;
-	cplus_mode = CPLUS_PUBLIC;
-      }
-      add_symbols_copy(firstChild(n));
-      if (strcmp(cnodeType,"extend") == 0) {
-	cplus_mode = emode;
-      }
-    }
-    n = nextSibling(n);
-  }
-}
-
-/* Add in the "defaultargs" attribute for functions in instantiated templates.
- * n should be any instantiated template (class or start of linked list of functions). */
-static void update_defaultargs(Node *n) {
-  if (n) {
-    Node *firstdefaultargs = n;
-    update_defaultargs(firstChild(n));
-    n = nextSibling(n);
-    /* recursively loop through nodes of all types, but all we really need are the overloaded functions */
-    while (n) {
-      update_defaultargs(firstChild(n));
-      if (!Getattr(n, "defaultargs")) {
-	if (Getattr(n, "needs_defaultargs")) {
-	  Setattr(n, "defaultargs", firstdefaultargs);
-	  Delattr(n, "needs_defaultargs");
-	} else {
-	  firstdefaultargs = n;
-	}
-      } else {
-	/* Functions added in with %extend (for specialized template classes) will already have default args patched up */
-	assert(Getattr(n, "defaultargs") == firstdefaultargs);
-      }
-      n = nextSibling(n);
-    }
-  }
-}
-
-/* Check a set of declarations to see if any are pure-abstract */
-
-static List *pure_abstracts(Node *n) {
-  List *abstracts = 0;
-  while (n) {
-    if (Cmp(nodeType(n),"cdecl") == 0) {
-      String *decl = Getattr(n,"decl");
-      if (SwigType_isfunction(decl)) {
-	String *init = Getattr(n,"value");
-	if (Cmp(init,"0") == 0) {
-	  if (!abstracts) {
-	    abstracts = NewList();
-	  }
-	  Append(abstracts,n);
-	  SetFlag(n,"abstract");
-	}
-      }
-    } else if (Cmp(nodeType(n),"destructor") == 0) {
-      if (Cmp(Getattr(n,"value"),"0") == 0) {
-	if (!abstracts) {
-	  abstracts = NewList();
-	}
-	Append(abstracts,n);
-	SetFlag(n,"abstract");
-      }
-    }
-    n = nextSibling(n);
-  }
-  return abstracts;
-}
-
-/* Make a classname */
-
-static String *make_class_name(String *name) {
-  String *nname = 0;
-  String *prefix;
-  if (Namespaceprefix) {
-    nname= NewStringf("%s::%s", Namespaceprefix, name);
-  } else {
-    nname = NewString(name);
-  }
-  prefix = SwigType_istemplate_templateprefix(nname);
-  if (prefix) {
-    String *args, *qargs;
-    args   = SwigType_templateargs(nname);
-    qargs  = Swig_symbol_type_qualify(args,0);
-    Append(prefix,qargs);
-    Delete(nname);
-    Delete(args);
-    Delete(qargs);
-    nname = prefix;
-  }
-  return nname;
-}
-
-/* Use typedef name as class name */
-
-static void add_typedef_name(Node *n, Node *declnode, String *oldName, Symtab *cscope, String *scpname) {
-  String *class_rename = 0;
-  SwigType *decl = Getattr(declnode, "decl");
-  if (!decl || !Len(decl)) {
-    String *cname;
-    String *tdscopename;
-    String *class_scope = Swig_symbol_qualifiedscopename(cscope);
-    String *name = Getattr(declnode, "name");
-    cname = Copy(name);
-    Setattr(n, "tdname", cname);
-    tdscopename = class_scope ? NewStringf("%s::%s", class_scope, name) : Copy(name);
-    class_rename = Getattr(n, "class_rename");
-    if (class_rename && (Strcmp(class_rename, oldName) == 0))
-      Setattr(n, "class_rename", NewString(name));
-    if (!classes_typedefs) classes_typedefs = NewHash();
-    if (!Equal(scpname, tdscopename) && !Getattr(classes_typedefs, tdscopename)) {
-      Setattr(classes_typedefs, tdscopename, n);
-    }
-    Setattr(n, "decl", decl);
-    Delete(class_scope);
-    Delete(cname);
-    Delete(tdscopename);
-  }
-}
-
-/* If the class name is qualified.  We need to create or lookup namespace entries */
-
-static Symtab *set_scope_to_global() {
-  Symtab *symtab = Swig_symbol_global_scope();
-  Swig_symbol_setscope(symtab);
-  return symtab;
-}
- 
-/* Remove the block braces, { and }, if the 'noblock' attribute is set.
- * Node *kw can be either a Hash or Parmlist. */
-static String *remove_block(Node *kw, const String *inputcode) {
-  String *modified_code = 0;
-  while (kw) {
-   String *name = Getattr(kw,"name");
-   if (name && (Cmp(name,"noblock") == 0)) {
-     char *cstr = Char(inputcode);
-     int len = Len(inputcode);
-     if (len && cstr[0] == '{') {
-       --len; ++cstr; 
-       if (len && cstr[len - 1] == '}') { --len; }
-       /* we now remove the extra spaces */
-       while (len && isspace((int)cstr[0])) { --len; ++cstr; }
-       while (len && isspace((int)cstr[len - 1])) { --len; }
-       modified_code = NewStringWithSize(cstr, len);
-       break;
-     }
-   }
-   kw = nextSibling(kw);
-  }
-  return modified_code;
-}
-
-
-static Node *nscope = 0;
-static Node *nscope_inner = 0;
-
-/* Remove the scope prefix from cname and return the base name without the prefix.
- * The scopes required for the symbol name are resolved and/or created, if required.
- * For example AA::BB::CC as input returns CC and creates the namespace AA then inner 
- * namespace BB in the current scope. If cname is found to already exist as a weak symbol
- * (forward reference) then the scope might be changed to match, such as when a symbol match 
- * is made via a using reference. */
-static String *resolve_create_node_scope(String *cname) {
-  Symtab *gscope = 0;
-  Node *cname_node = 0;
-  int skip_lookup = 0;
-  nscope = 0;
-  nscope_inner = 0;  
-
-  if (Strncmp(cname,"::",2) == 0)
-    skip_lookup = 1;
-
-  cname_node = skip_lookup ? 0 : Swig_symbol_clookup_no_inherit(cname, 0);
-
-  if (cname_node) {
-    /* The symbol has been defined already or is in another scope.
-       If it is a weak symbol, it needs replacing and if it was brought into the current scope
-       via a using declaration, the scope needs adjusting appropriately for the new symbol.
-       Similarly for defined templates. */
-    Symtab *symtab = Getattr(cname_node, "sym:symtab");
-    Node *sym_weak = Getattr(cname_node, "sym:weak");
-    if ((symtab && sym_weak) || Equal(nodeType(cname_node), "template")) {
-      /* Check if the scope is the current scope */
-      String *current_scopename = Swig_symbol_qualifiedscopename(0);
-      String *found_scopename = Swig_symbol_qualifiedscopename(symtab);
-      int len;
-      if (!current_scopename)
-	current_scopename = NewString("");
-      if (!found_scopename)
-	found_scopename = NewString("");
-      len = Len(current_scopename);
-      if ((len > 0) && (Strncmp(current_scopename, found_scopename, len) == 0)) {
-	if (Len(found_scopename) > len + 2) {
-	  /* A matching weak symbol was found in non-global scope, some scope adjustment may be required */
-	  String *new_cname = NewString(Char(found_scopename) + len + 2); /* skip over "::" prefix */
-	  String *base = Swig_scopename_last(cname);
-	  Printf(new_cname, "::%s", base);
-	  cname = new_cname;
-	  Delete(base);
-	} else {
-	  /* A matching weak symbol was found in the same non-global local scope, no scope adjustment required */
-	  assert(len == Len(found_scopename));
-	}
-      } else {
-	String *base = Swig_scopename_last(cname);
-	if (Len(found_scopename) > 0) {
-	  /* A matching weak symbol was found in a different scope to the local scope - probably via a using declaration */
-	  cname = NewStringf("%s::%s", found_scopename, base);
-	} else {
-	  /* Either:
-	      1) A matching weak symbol was found in a different scope to the local scope - this is actually a
-	      symbol with the same name in a different scope which we don't want, so no adjustment required.
-	      2) A matching weak symbol was found in the global scope - no adjustment required.
-	  */
-	  cname = Copy(base);
-	}
-	Delete(base);
-      }
-      Delete(current_scopename);
-      Delete(found_scopename);
-    }
-  }
-
-  if (Swig_scopename_check(cname)) {
-    Node   *ns;
-    String *prefix = Swig_scopename_prefix(cname);
-    String *base = Swig_scopename_last(cname);
-    if (prefix && (Strncmp(prefix,"::",2) == 0)) {
-/* I don't think we can use :: global scope to declare classes and hence neither %template. - consider reporting error instead - wsfulton. */
-      /* Use the global scope */
-      String *nprefix = NewString(Char(prefix)+2);
-      Delete(prefix);
-      prefix= nprefix;
-      gscope = set_scope_to_global();
-    }
-    if (Len(prefix) == 0) {
-      /* Use the global scope, but we need to add a 'global' namespace.  */
-      if (!gscope) gscope = set_scope_to_global();
-      /* note that this namespace is not the "unnamed" one,
-	 and we don't use Setattr(nscope,"name", ""),
-	 because the unnamed namespace is private */
-      nscope = new_node("namespace");
-      Setattr(nscope,"symtab", gscope);;
-      nscope_inner = nscope;
-      return base;
-    }
-    /* Try to locate the scope */
-    ns = Swig_symbol_clookup(prefix,0);
-    if (!ns) {
-      Swig_error(cparse_file,cparse_line,"Undefined scope '%s'\n", prefix);
-    } else {
-      Symtab *nstab = Getattr(ns,"symtab");
-      if (!nstab) {
-	Swig_error(cparse_file,cparse_line, "'%s' is not defined as a valid scope.\n", prefix);
-	ns = 0;
-      } else {
-	/* Check if the node scope is the current scope */
-	String *tname = Swig_symbol_qualifiedscopename(0);
-	String *nname = Swig_symbol_qualifiedscopename(nstab);
-	if (tname && (Strcmp(tname,nname) == 0)) {
-	  ns = 0;
-	  cname = base;
-	}
-	Delete(tname);
-	Delete(nname);
-      }
-      if (ns) {
-	/* we will try to create a new node using the namespaces we
-	   can find in the scope name */
-	List *scopes;
-	String *sname;
-	Iterator si;
-	String *name = NewString(prefix);
-	scopes = NewList();
-	while (name) {
-	  String *base = Swig_scopename_last(name);
-	  String *tprefix = Swig_scopename_prefix(name);
-	  Insert(scopes,0,base);
-	  Delete(base);
-	  Delete(name);
-	  name = tprefix;
-	}
-	for (si = First(scopes); si.item; si = Next(si)) {
-	  Node *ns1,*ns2;
-	  sname = si.item;
-	  ns1 = Swig_symbol_clookup(sname,0);
-	  assert(ns1);
-	  if (Strcmp(nodeType(ns1),"namespace") == 0) {
-	    if (Getattr(ns1,"alias")) {
-	      ns1 = Getattr(ns1,"namespace");
-	    }
-	  } else {
-	    /* now this last part is a class */
-	    si = Next(si);
-	    /*  or a nested class tree, which is unrolled here */
-	    for (; si.item; si = Next(si)) {
-	      if (si.item) {
-		Printf(sname,"::%s",si.item);
-	      }
-	    }
-	    /* we get the 'inner' class */
-	    nscope_inner = Swig_symbol_clookup(sname,0);
-	    /* set the scope to the inner class */
-	    Swig_symbol_setscope(Getattr(nscope_inner,"symtab"));
-	    /* save the last namespace prefix */
-	    Delete(Namespaceprefix);
-	    Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	    /* and return the node name, including the inner class prefix */
-	    break;
-	  }
-	  /* here we just populate the namespace tree as usual */
-	  ns2 = new_node("namespace");
-	  Setattr(ns2,"name",sname);
-	  Setattr(ns2,"symtab", Getattr(ns1,"symtab"));
-	  add_symbols(ns2);
-	  Swig_symbol_setscope(Getattr(ns1,"symtab"));
-	  Delete(Namespaceprefix);
-	  Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	  if (nscope_inner) {
-	    if (Getattr(nscope_inner,"symtab") != Getattr(ns2,"symtab")) {
-	      appendChild(nscope_inner,ns2);
-	      Delete(ns2);
-	    }
-	  }
-	  nscope_inner = ns2;
-	  if (!nscope) nscope = ns2;
-	}
-	cname = base;
-	Delete(scopes);
-      }
-    }
-    Delete(prefix);
-  }
-
-  return cname;
-}
- 
-/* look for simple typedef name in typedef list */
-static String *try_to_find_a_name_for_unnamed_structure(const char *storage, Node *decls) {
-  String *name = 0;
-  Node *n = decls;
-  if (storage && (strcmp(storage, "typedef") == 0)) {
-    for (; n; n = nextSibling(n)) {
-      if (!Len(Getattr(n, "decl"))) {
-	name = Copy(Getattr(n, "name"));
-	break;
-      }
-    }
-  }
-  return name;
-}
-
-/* traverse copied tree segment, and update outer class links*/
-static void update_nested_classes(Node *n)
-{
-  Node *c = firstChild(n);
-  while (c) {
-    if (Getattr(c, "nested:outer"))
-      Setattr(c, "nested:outer", n);
-    update_nested_classes(c);
-    c = nextSibling(c);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * nested_forward_declaration()
- * 
- * Nested struct handling for C++ code if the nested classes are disabled.
- * Create the nested class/struct/union as a forward declaration.
- * ----------------------------------------------------------------------------- */
-
-static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) {
-  Node *nn = 0;
-
-  if (sname) {
-    /* Add forward declaration of the nested type */
-    Node *n = new_node("classforward");
-    Setattr(n, "kind", kind);
-    Setattr(n, "name", sname);
-    Setattr(n, "storage", storage);
-    Setattr(n, "sym:weak", "1");
-    add_symbols(n);
-    nn = n;
-  }
-
-  /* Add any variable instances. Also add in any further typedefs of the nested type.
-     Note that anonymous typedefs (eg typedef struct {...} a, b;) are treated as class forward declarations */
-  if (cpp_opt_declarators) {
-    int storage_typedef = (storage && (strcmp(storage, "typedef") == 0));
-    int variable_of_anonymous_type = !sname && !storage_typedef;
-    if (!variable_of_anonymous_type) {
-      int anonymous_typedef = !sname && (storage && (strcmp(storage, "typedef") == 0));
-      Node *n = cpp_opt_declarators;
-      SwigType *type = name;
-      while (n) {
-	Setattr(n, "type", type);
-	Setattr(n, "storage", storage);
-	if (anonymous_typedef) {
-	  Setattr(n, "nodeType", "classforward");
-	  Setattr(n, "sym:weak", "1");
-	}
-	n = nextSibling(n);
-      }
-      add_symbols(cpp_opt_declarators);
-
-      if (nn) {
-	set_nextSibling(nn, cpp_opt_declarators);
-      } else {
-	nn = cpp_opt_declarators;
-      }
-    }
-  }
-
-  if (!currentOuterClass || !GetFlag(currentOuterClass, "nested")) {
-    if (nn && Equal(nodeType(nn), "classforward")) {
-      Node *n = nn;
-      if (!GetFlag(n, "feature:ignore")) {
-	SWIG_WARN_NODE_BEGIN(n);
-	Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name);
-	SWIG_WARN_NODE_END(n);
-      }
-    } else {
-      Swig_warning(WARN_PARSE_UNNAMED_NESTED_CLASS, cparse_file, cparse_line, "Nested %s not currently supported (ignored).\n", kind);
-    }
-  }
-
-  return nn;
-}
-
-
-Node *Swig_cparse(File *f) {
-  scanner_file(f);
-  top = 0;
-  yyparse();
-  return top;
-}
-
-static void single_new_feature(const char *featurename, String *val, Hash *featureattribs, char *declaratorid, SwigType *type, ParmList *declaratorparms, String *qualifier) {
-  String *fname;
-  String *name;
-  String *fixname;
-  SwigType *t = Copy(type);
-
-  /* Printf(stdout, "single_new_feature: [%s] [%s] [%s] [%s] [%s] [%s]\n", featurename, val, declaratorid, t, ParmList_str_defaultargs(declaratorparms), qualifier); */
-
-  /* Warn about deprecated features */
-  if (strcmp(featurename, "nestedworkaround") == 0)
-    Swig_warning(WARN_DEPRECATED_NESTED_WORKAROUND, cparse_file, cparse_line, "The 'nestedworkaround' feature is deprecated.\n");
-
-  fname = NewStringf("feature:%s",featurename);
-  if (declaratorid) {
-    fixname = feature_identifier_fix(declaratorid);
-  } else {
-    fixname = NewStringEmpty();
-  }
-  if (Namespaceprefix) {
-    name = NewStringf("%s::%s",Namespaceprefix, fixname);
-  } else {
-    name = fixname;
-  }
-
-  if (declaratorparms) Setmeta(val,"parms",declaratorparms);
-  if (!Len(t)) t = 0;
-  if (t) {
-    if (qualifier) SwigType_push(t,qualifier);
-    if (SwigType_isfunction(t)) {
-      SwigType *decl = SwigType_pop_function(t);
-      if (SwigType_ispointer(t)) {
-	String *nname = NewStringf("*%s",name);
-	Swig_feature_set(Swig_cparse_features(), nname, decl, fname, val, featureattribs);
-	Delete(nname);
-      } else {
-	Swig_feature_set(Swig_cparse_features(), name, decl, fname, val, featureattribs);
-      }
-      Delete(decl);
-    } else if (SwigType_ispointer(t)) {
-      String *nname = NewStringf("*%s",name);
-      Swig_feature_set(Swig_cparse_features(),nname,0,fname,val, featureattribs);
-      Delete(nname);
-    }
-  } else {
-    /* Global feature, that is, feature not associated with any particular symbol */
-    Swig_feature_set(Swig_cparse_features(),name,0,fname,val, featureattribs);
-  }
-  Delete(fname);
-  Delete(name);
-}
-
-/* Add a new feature to the Hash. Additional features are added if the feature has a parameter list (declaratorparms)
- * and one or more of the parameters have a default argument. An extra feature is added for each defaulted parameter,
- * simulating the equivalent overloaded method. */
-static void new_feature(const char *featurename, String *val, Hash *featureattribs, char *declaratorid, SwigType *type, ParmList *declaratorparms, String *qualifier) {
-
-  ParmList *declparms = declaratorparms;
-
-  /* remove the { and } braces if the noblock attribute is set */
-  String *newval = remove_block(featureattribs, val);
-  val = newval ? newval : val;
-
-  /* Add the feature */
-  single_new_feature(featurename, val, featureattribs, declaratorid, type, declaratorparms, qualifier);
-
-  /* Add extra features if there are default parameters in the parameter list */
-  if (type) {
-    while (declparms) {
-      if (ParmList_has_defaultargs(declparms)) {
-
-        /* Create a parameter list for the new feature by copying all
-           but the last (defaulted) parameter */
-        ParmList* newparms = CopyParmListMax(declparms, ParmList_len(declparms)-1);
-
-        /* Create new declaration - with the last parameter removed */
-        SwigType *newtype = Copy(type);
-        Delete(SwigType_pop_function(newtype)); /* remove the old parameter list from newtype */
-        SwigType_add_function(newtype,newparms);
-
-        single_new_feature(featurename, Copy(val), featureattribs, declaratorid, newtype, newparms, qualifier);
-        declparms = newparms;
-      } else {
-        declparms = 0;
-      }
-    }
-  }
-}
-
-/* check if a function declaration is a plain C object */
-static int is_cfunction(Node *n) {
-  if (!cparse_cplusplus || cparse_externc)
-    return 1;
-  if (Swig_storage_isexternc(n)) {
-    return 1;
-  }
-  return 0;
-}
-
-/* If the Node is a function with parameters, check to see if any of the parameters
- * have default arguments. If so create a new function for each defaulted argument. 
- * The additional functions form a linked list of nodes with the head being the original Node n. */
-static void default_arguments(Node *n) {
-  Node *function = n;
-
-  if (function) {
-    ParmList *varargs = Getattr(function,"feature:varargs");
-    if (varargs) {
-      /* Handles the %varargs directive by looking for "feature:varargs" and 
-       * substituting ... with an alternative set of arguments.  */
-      Parm     *p = Getattr(function,"parms");
-      Parm     *pp = 0;
-      while (p) {
-	SwigType *t = Getattr(p,"type");
-	if (Strcmp(t,"v(...)") == 0) {
-	  if (pp) {
-	    ParmList *cv = Copy(varargs);
-	    set_nextSibling(pp,cv);
-	    Delete(cv);
-	  } else {
-	    ParmList *cv =  Copy(varargs);
-	    Setattr(function,"parms", cv);
-	    Delete(cv);
-	  }
-	  break;
-	}
-	pp = p;
-	p = nextSibling(p);
-      }
-    }
-
-    /* Do not add in functions if kwargs is being used or if user wants old default argument wrapping
-       (one wrapped method per function irrespective of number of default arguments) */
-    if (compact_default_args 
-	|| is_cfunction(function) 
-	|| GetFlag(function,"feature:compactdefaultargs") 
-	|| (GetFlag(function,"feature:kwargs") && kwargs_supported)) {
-      ParmList *p = Getattr(function,"parms");
-      if (p) 
-        Setattr(p,"compactdefargs", "1"); /* mark parameters for special handling */
-      function = 0; /* don't add in extra methods */
-    }
-  }
-
-  while (function) {
-    ParmList *parms = Getattr(function,"parms");
-    if (ParmList_has_defaultargs(parms)) {
-
-      /* Create a parameter list for the new function by copying all
-         but the last (defaulted) parameter */
-      ParmList* newparms = CopyParmListMax(parms,ParmList_len(parms)-1);
-
-      /* Create new function and add to symbol table */
-      {
-	SwigType *ntype = Copy(nodeType(function));
-	char *cntype = Char(ntype);
-        Node *new_function = new_node(ntype);
-        SwigType *decl = Copy(Getattr(function,"decl"));
-        int constqualifier = SwigType_isconst(decl);
-	String *ccode = Copy(Getattr(function,"code"));
-	String *cstorage = Copy(Getattr(function,"storage"));
-	String *cvalue = Copy(Getattr(function,"value"));
-	SwigType *ctype = Copy(Getattr(function,"type"));
-	String *cthrow = Copy(Getattr(function,"throw"));
-
-        Delete(SwigType_pop_function(decl)); /* remove the old parameter list from decl */
-        SwigType_add_function(decl,newparms);
-        if (constqualifier)
-          SwigType_add_qualifier(decl,"const");
-
-        Setattr(new_function,"name", Getattr(function,"name"));
-        Setattr(new_function,"code", ccode);
-        Setattr(new_function,"decl", decl);
-        Setattr(new_function,"parms", newparms);
-        Setattr(new_function,"storage", cstorage);
-        Setattr(new_function,"value", cvalue);
-        Setattr(new_function,"type", ctype);
-        Setattr(new_function,"throw", cthrow);
-
-	Delete(ccode);
-	Delete(cstorage);
-	Delete(cvalue);
-	Delete(ctype);
-	Delete(cthrow);
-	Delete(decl);
-
-        {
-          Node *throws = Getattr(function,"throws");
-	  ParmList *pl = CopyParmList(throws);
-          if (throws) Setattr(new_function,"throws",pl);
-	  Delete(pl);
-        }
-
-        /* copy specific attributes for global (or in a namespace) template functions - these are not templated class methods */
-        if (strcmp(cntype,"template") == 0) {
-          Node *templatetype = Getattr(function,"templatetype");
-          Node *symtypename = Getattr(function,"sym:typename");
-          Parm *templateparms = Getattr(function,"templateparms");
-          if (templatetype) {
-	    Node *tmp = Copy(templatetype);
-	    Setattr(new_function,"templatetype",tmp);
-	    Delete(tmp);
-	  }
-          if (symtypename) {
-	    Node *tmp = Copy(symtypename);
-	    Setattr(new_function,"sym:typename",tmp);
-	    Delete(tmp);
-	  }
-          if (templateparms) {
-	    Parm *tmp = CopyParmList(templateparms);
-	    Setattr(new_function,"templateparms",tmp);
-	    Delete(tmp);
-	  }
-        } else if (strcmp(cntype,"constructor") == 0) {
-          /* only copied for constructors as this is not a user defined feature - it is hard coded in the parser */
-          if (GetFlag(function,"feature:new")) SetFlag(new_function,"feature:new");
-        }
-
-        add_symbols(new_function);
-        /* mark added functions as ones with overloaded parameters and point to the parsed method */
-        Setattr(new_function,"defaultargs", n);
-
-        /* Point to the new function, extending the linked list */
-        set_nextSibling(function, new_function);
-	Delete(new_function);
-        function = new_function;
-	
-	Delete(ntype);
-      }
-    } else {
-      function = 0;
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * mark_nodes_as_extend()
- *
- * Used by the %extend to mark subtypes with "feature:extend".
- * template instances declared within %extend are skipped
- * ----------------------------------------------------------------------------- */
-
-static void mark_nodes_as_extend(Node *n) {
-  for (; n; n = nextSibling(n)) {
-    if (Getattr(n, "template") && Strcmp(nodeType(n), "class") == 0)
-      continue;
-    /* Fix me: extend is not a feature. Replace with isextendmember? */
-    Setattr(n, "feature:extend", "1");
-    mark_nodes_as_extend(firstChild(n));
-  }
-}
-
-
-#line 1397 "y.tab.c" /* yacc.c:339  */
-
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* In a future release of Bison, this section will be replaced
-   by #include "y.tab.h".  */
-#ifndef YY_YY_Y_TAB_H_INCLUDED
-# define YY_YY_Y_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    ID = 258,
-    HBLOCK = 259,
-    POUND = 260,
-    STRING = 261,
-    WSTRING = 262,
-    INCLUDE = 263,
-    IMPORT = 264,
-    INSERT = 265,
-    CHARCONST = 266,
-    WCHARCONST = 267,
-    NUM_INT = 268,
-    NUM_FLOAT = 269,
-    NUM_UNSIGNED = 270,
-    NUM_LONG = 271,
-    NUM_ULONG = 272,
-    NUM_LONGLONG = 273,
-    NUM_ULONGLONG = 274,
-    NUM_BOOL = 275,
-    TYPEDEF = 276,
-    TYPE_INT = 277,
-    TYPE_UNSIGNED = 278,
-    TYPE_SHORT = 279,
-    TYPE_LONG = 280,
-    TYPE_FLOAT = 281,
-    TYPE_DOUBLE = 282,
-    TYPE_CHAR = 283,
-    TYPE_WCHAR = 284,
-    TYPE_VOID = 285,
-    TYPE_SIGNED = 286,
-    TYPE_BOOL = 287,
-    TYPE_COMPLEX = 288,
-    TYPE_TYPEDEF = 289,
-    TYPE_RAW = 290,
-    TYPE_NON_ISO_INT8 = 291,
-    TYPE_NON_ISO_INT16 = 292,
-    TYPE_NON_ISO_INT32 = 293,
-    TYPE_NON_ISO_INT64 = 294,
-    LPAREN = 295,
-    RPAREN = 296,
-    COMMA = 297,
-    SEMI = 298,
-    EXTERN = 299,
-    INIT = 300,
-    LBRACE = 301,
-    RBRACE = 302,
-    PERIOD = 303,
-    CONST_QUAL = 304,
-    VOLATILE = 305,
-    REGISTER = 306,
-    STRUCT = 307,
-    UNION = 308,
-    EQUAL = 309,
-    SIZEOF = 310,
-    MODULE = 311,
-    LBRACKET = 312,
-    RBRACKET = 313,
-    BEGINFILE = 314,
-    ENDOFFILE = 315,
-    ILLEGAL = 316,
-    CONSTANT = 317,
-    NAME = 318,
-    RENAME = 319,
-    NAMEWARN = 320,
-    EXTEND = 321,
-    PRAGMA = 322,
-    FEATURE = 323,
-    VARARGS = 324,
-    ENUM = 325,
-    CLASS = 326,
-    TYPENAME = 327,
-    PRIVATE = 328,
-    PUBLIC = 329,
-    PROTECTED = 330,
-    COLON = 331,
-    STATIC = 332,
-    VIRTUAL = 333,
-    FRIEND = 334,
-    THROW = 335,
-    CATCH = 336,
-    EXPLICIT = 337,
-    STATIC_ASSERT = 338,
-    CONSTEXPR = 339,
-    THREAD_LOCAL = 340,
-    DECLTYPE = 341,
-    AUTO = 342,
-    NOEXCEPT = 343,
-    OVERRIDE = 344,
-    FINAL = 345,
-    USING = 346,
-    NAMESPACE = 347,
-    NATIVE = 348,
-    INLINE = 349,
-    TYPEMAP = 350,
-    EXCEPT = 351,
-    ECHO = 352,
-    APPLY = 353,
-    CLEAR = 354,
-    SWIGTEMPLATE = 355,
-    FRAGMENT = 356,
-    WARN = 357,
-    LESSTHAN = 358,
-    GREATERTHAN = 359,
-    DELETE_KW = 360,
-    DEFAULT = 361,
-    LESSTHANOREQUALTO = 362,
-    GREATERTHANOREQUALTO = 363,
-    EQUALTO = 364,
-    NOTEQUALTO = 365,
-    ARROW = 366,
-    QUESTIONMARK = 367,
-    TYPES = 368,
-    PARMS = 369,
-    NONID = 370,
-    DSTAR = 371,
-    DCNOT = 372,
-    TEMPLATE = 373,
-    OPERATOR = 374,
-    CONVERSIONOPERATOR = 375,
-    PARSETYPE = 376,
-    PARSEPARM = 377,
-    PARSEPARMS = 378,
-    CAST = 379,
-    LOR = 380,
-    LAND = 381,
-    OR = 382,
-    XOR = 383,
-    AND = 384,
-    LSHIFT = 385,
-    RSHIFT = 386,
-    PLUS = 387,
-    MINUS = 388,
-    STAR = 389,
-    SLASH = 390,
-    MODULO = 391,
-    UMINUS = 392,
-    NOT = 393,
-    LNOT = 394,
-    DCOLON = 395
-  };
-#endif
-/* Tokens.  */
-#define ID 258
-#define HBLOCK 259
-#define POUND 260
-#define STRING 261
-#define WSTRING 262
-#define INCLUDE 263
-#define IMPORT 264
-#define INSERT 265
-#define CHARCONST 266
-#define WCHARCONST 267
-#define NUM_INT 268
-#define NUM_FLOAT 269
-#define NUM_UNSIGNED 270
-#define NUM_LONG 271
-#define NUM_ULONG 272
-#define NUM_LONGLONG 273
-#define NUM_ULONGLONG 274
-#define NUM_BOOL 275
-#define TYPEDEF 276
-#define TYPE_INT 277
-#define TYPE_UNSIGNED 278
-#define TYPE_SHORT 279
-#define TYPE_LONG 280
-#define TYPE_FLOAT 281
-#define TYPE_DOUBLE 282
-#define TYPE_CHAR 283
-#define TYPE_WCHAR 284
-#define TYPE_VOID 285
-#define TYPE_SIGNED 286
-#define TYPE_BOOL 287
-#define TYPE_COMPLEX 288
-#define TYPE_TYPEDEF 289
-#define TYPE_RAW 290
-#define TYPE_NON_ISO_INT8 291
-#define TYPE_NON_ISO_INT16 292
-#define TYPE_NON_ISO_INT32 293
-#define TYPE_NON_ISO_INT64 294
-#define LPAREN 295
-#define RPAREN 296
-#define COMMA 297
-#define SEMI 298
-#define EXTERN 299
-#define INIT 300
-#define LBRACE 301
-#define RBRACE 302
-#define PERIOD 303
-#define CONST_QUAL 304
-#define VOLATILE 305
-#define REGISTER 306
-#define STRUCT 307
-#define UNION 308
-#define EQUAL 309
-#define SIZEOF 310
-#define MODULE 311
-#define LBRACKET 312
-#define RBRACKET 313
-#define BEGINFILE 314
-#define ENDOFFILE 315
-#define ILLEGAL 316
-#define CONSTANT 317
-#define NAME 318
-#define RENAME 319
-#define NAMEWARN 320
-#define EXTEND 321
-#define PRAGMA 322
-#define FEATURE 323
-#define VARARGS 324
-#define ENUM 325
-#define CLASS 326
-#define TYPENAME 327
-#define PRIVATE 328
-#define PUBLIC 329
-#define PROTECTED 330
-#define COLON 331
-#define STATIC 332
-#define VIRTUAL 333
-#define FRIEND 334
-#define THROW 335
-#define CATCH 336
-#define EXPLICIT 337
-#define STATIC_ASSERT 338
-#define CONSTEXPR 339
-#define THREAD_LOCAL 340
-#define DECLTYPE 341
-#define AUTO 342
-#define NOEXCEPT 343
-#define OVERRIDE 344
-#define FINAL 345
-#define USING 346
-#define NAMESPACE 347
-#define NATIVE 348
-#define INLINE 349
-#define TYPEMAP 350
-#define EXCEPT 351
-#define ECHO 352
-#define APPLY 353
-#define CLEAR 354
-#define SWIGTEMPLATE 355
-#define FRAGMENT 356
-#define WARN 357
-#define LESSTHAN 358
-#define GREATERTHAN 359
-#define DELETE_KW 360
-#define DEFAULT 361
-#define LESSTHANOREQUALTO 362
-#define GREATERTHANOREQUALTO 363
-#define EQUALTO 364
-#define NOTEQUALTO 365
-#define ARROW 366
-#define QUESTIONMARK 367
-#define TYPES 368
-#define PARMS 369
-#define NONID 370
-#define DSTAR 371
-#define DCNOT 372
-#define TEMPLATE 373
-#define OPERATOR 374
-#define CONVERSIONOPERATOR 375
-#define PARSETYPE 376
-#define PARSEPARM 377
-#define PARSEPARMS 378
-#define CAST 379
-#define LOR 380
-#define LAND 381
-#define OR 382
-#define XOR 383
-#define AND 384
-#define LSHIFT 385
-#define RSHIFT 386
-#define PLUS 387
-#define MINUS 388
-#define STAR 389
-#define SLASH 390
-#define MODULO 391
-#define UMINUS 392
-#define NOT 393
-#define LNOT 394
-#define DCOLON 395
-
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
-union YYSTYPE
-{
-#line 1356 "parser.y" /* yacc.c:355  */
-
-  const char  *id;
-  List  *bases;
-  struct Define {
-    String *val;
-    String *rawval;
-    int     type;
-    String *qualifier;
-    String *bitfield;
-    Parm   *throws;
-    String *throwf;
-    String *nexcept;
-  } dtype;
-  struct {
-    const char *type;
-    String *filename;
-    int   line;
-  } loc;
-  struct {
-    char      *id;
-    SwigType  *type;
-    String    *defarg;
-    ParmList  *parms;
-    short      have_parms;
-    ParmList  *throws;
-    String    *throwf;
-    String    *nexcept;
-  } decl;
-  Parm         *tparms;
-  struct {
-    String     *method;
-    Hash       *kwargs;
-  } tmap;
-  struct {
-    String     *type;
-    String     *us;
-  } ptype;
-  SwigType     *type;
-  String       *str;
-  Parm         *p;
-  ParmList     *pl;
-  int           intvalue;
-  Node         *node;
-
-#line 1762 "y.tab.c" /* yacc.c:355  */
-};
-
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_Y_TAB_H_INCLUDED  */
-
-/* Copy the second part of user declarations.  */
-
-#line 1779 "y.tab.c" /* yacc.c:358  */
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
-#ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
-#else
-# define YYUSE(E) /* empty */
-#endif
-
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
-
-# define YYCOPY_NEEDED 1
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (0)
-
-#endif
-
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (0)
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  60
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   5039
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  141
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  171
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  579
-/* YYNSTATES -- Number of states.  */
-#define YYNSTATES  1128
-
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   395
-
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140
-};
-
-#if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,  1521,  1521,  1533,  1537,  1540,  1543,  1546,  1549,  1554,
-    1559,  1564,  1565,  1566,  1567,  1568,  1578,  1594,  1604,  1605,
-    1606,  1607,  1608,  1609,  1610,  1611,  1612,  1613,  1614,  1615,
-    1616,  1617,  1618,  1619,  1620,  1621,  1622,  1623,  1624,  1631,
-    1631,  1713,  1723,  1734,  1755,  1777,  1788,  1797,  1816,  1822,
-    1828,  1833,  1840,  1847,  1851,  1864,  1873,  1888,  1901,  1901,
-    1957,  1958,  1965,  1984,  2015,  2019,  2029,  2034,  2052,  2095,
-    2101,  2114,  2120,  2146,  2152,  2159,  2160,  2163,  2164,  2171,
-    2217,  2263,  2274,  2277,  2304,  2310,  2316,  2322,  2330,  2336,
-    2342,  2348,  2356,  2357,  2358,  2361,  2366,  2376,  2412,  2413,
-    2448,  2465,  2473,  2486,  2511,  2517,  2521,  2524,  2535,  2540,
-    2553,  2565,  2863,  2873,  2880,  2881,  2885,  2885,  2910,  2916,
-    2926,  2944,  3012,  3070,  3074,  3097,  3101,  3112,  3119,  3126,
-    3133,  3142,  3143,  3144,  3148,  3149,  3150,  3161,  3166,  3171,
-    3178,  3184,  3189,  3192,  3192,  3205,  3208,  3211,  3220,  3223,
-    3230,  3252,  3281,  3379,  3431,  3432,  3433,  3434,  3435,  3436,
-    3441,  3441,  3689,  3689,  3836,  3837,  3849,  3867,  3867,  4128,
-    4134,  4140,  4143,  4146,  4149,  4152,  4155,  4158,  4163,  4199,
-    4203,  4206,  4209,  4214,  4218,  4223,  4233,  4264,  4264,  4293,
-    4293,  4315,  4342,  4359,  4364,  4359,  4372,  4373,  4374,  4374,
-    4390,  4391,  4408,  4409,  4410,  4411,  4412,  4413,  4414,  4415,
-    4416,  4417,  4418,  4419,  4420,  4421,  4422,  4423,  4424,  4433,
-    4461,  4488,  4519,  4534,  4551,  4569,  4588,  4607,  4614,  4621,
-    4628,  4636,  4644,  4647,  4651,  4654,  4655,  4656,  4657,  4658,
-    4659,  4660,  4661,  4664,  4671,  4678,  4687,  4696,  4705,  4717,
-    4720,  4723,  4724,  4728,  4730,  4738,  4750,  4751,  4752,  4753,
-    4754,  4755,  4756,  4757,  4758,  4759,  4760,  4761,  4762,  4763,
-    4764,  4765,  4766,  4767,  4768,  4769,  4776,  4787,  4791,  4794,
-    4798,  4802,  4812,  4820,  4828,  4841,  4845,  4848,  4852,  4856,
-    4884,  4892,  4904,  4919,  4929,  4938,  4949,  4953,  4957,  4964,
-    4981,  4998,  5006,  5014,  5023,  5032,  5036,  5045,  5056,  5067,
-    5079,  5089,  5103,  5111,  5120,  5129,  5133,  5142,  5153,  5164,
-    5176,  5186,  5196,  5207,  5220,  5227,  5235,  5251,  5259,  5270,
-    5281,  5292,  5311,  5319,  5336,  5344,  5351,  5358,  5369,  5380,
-    5391,  5411,  5432,  5438,  5444,  5451,  5458,  5467,  5476,  5479,
-    5488,  5497,  5504,  5511,  5518,  5528,  5539,  5550,  5561,  5568,
-    5575,  5578,  5595,  5605,  5612,  5618,  5623,  5629,  5633,  5639,
-    5640,  5641,  5647,  5653,  5657,  5658,  5662,  5669,  5672,  5673,
-    5677,  5678,  5680,  5683,  5686,  5691,  5702,  5727,  5730,  5784,
-    5788,  5792,  5796,  5800,  5804,  5808,  5812,  5816,  5820,  5824,
-    5828,  5832,  5836,  5842,  5842,  5856,  5861,  5864,  5870,  5883,
-    5897,  5898,  5901,  5902,  5906,  5912,  5915,  5919,  5924,  5932,
-    5944,  5959,  5960,  5979,  5980,  5984,  5989,  5994,  5995,  6000,
-    6013,  6028,  6035,  6052,  6059,  6066,  6073,  6081,  6089,  6093,
-    6097,  6103,  6104,  6105,  6106,  6107,  6108,  6109,  6110,  6113,
-    6117,  6121,  6125,  6129,  6133,  6137,  6141,  6145,  6149,  6153,
-    6157,  6161,  6165,  6179,  6183,  6187,  6193,  6197,  6201,  6205,
-    6209,  6225,  6230,  6233,  6238,  6243,  6243,  6244,  6247,  6264,
-    6273,  6273,  6291,  6291,  6309,  6310,  6311,  6314,  6318,  6322,
-    6326,  6332,  6335,  6339,  6345,  6349,  6353,  6359,  6362,  6367,
-    6368,  6371,  6374,  6377,  6380,  6385,  6390,  6395,  6400,  6405,
-    6412,  6418,  6422,  6426,  6434,  6442,  6450,  6459,  6468,  6475,
-    6484,  6485,  6488,  6489,  6490,  6491,  6494,  6506,  6512,  6521,
-    6522,  6523,  6526,  6527,  6528,  6531,  6532,  6535,  6540,  6544,
-    6547,  6550,  6553,  6556,  6561,  6565,  6568,  6575,  6581,  6584,
-    6589,  6592,  6598,  6603,  6607,  6610,  6613,  6616,  6621,  6625,
-    6628,  6631,  6637,  6640,  6643,  6651,  6654,  6657,  6661,  6666,
-    6679,  6683,  6688,  6694,  6698,  6703,  6707,  6714,  6717,  6722
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || 0
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "ID", "HBLOCK", "POUND", "STRING",
-  "WSTRING", "INCLUDE", "IMPORT", "INSERT", "CHARCONST", "WCHARCONST",
-  "NUM_INT", "NUM_FLOAT", "NUM_UNSIGNED", "NUM_LONG", "NUM_ULONG",
-  "NUM_LONGLONG", "NUM_ULONGLONG", "NUM_BOOL", "TYPEDEF", "TYPE_INT",
-  "TYPE_UNSIGNED", "TYPE_SHORT", "TYPE_LONG", "TYPE_FLOAT", "TYPE_DOUBLE",
-  "TYPE_CHAR", "TYPE_WCHAR", "TYPE_VOID", "TYPE_SIGNED", "TYPE_BOOL",
-  "TYPE_COMPLEX", "TYPE_TYPEDEF", "TYPE_RAW", "TYPE_NON_ISO_INT8",
-  "TYPE_NON_ISO_INT16", "TYPE_NON_ISO_INT32", "TYPE_NON_ISO_INT64",
-  "LPAREN", "RPAREN", "COMMA", "SEMI", "EXTERN", "INIT", "LBRACE",
-  "RBRACE", "PERIOD", "CONST_QUAL", "VOLATILE", "REGISTER", "STRUCT",
-  "UNION", "EQUAL", "SIZEOF", "MODULE", "LBRACKET", "RBRACKET",
-  "BEGINFILE", "ENDOFFILE", "ILLEGAL", "CONSTANT", "NAME", "RENAME",
-  "NAMEWARN", "EXTEND", "PRAGMA", "FEATURE", "VARARGS", "ENUM", "CLASS",
-  "TYPENAME", "PRIVATE", "PUBLIC", "PROTECTED", "COLON", "STATIC",
-  "VIRTUAL", "FRIEND", "THROW", "CATCH", "EXPLICIT", "STATIC_ASSERT",
-  "CONSTEXPR", "THREAD_LOCAL", "DECLTYPE", "AUTO", "NOEXCEPT", "OVERRIDE",
-  "FINAL", "USING", "NAMESPACE", "NATIVE", "INLINE", "TYPEMAP", "EXCEPT",
-  "ECHO", "APPLY", "CLEAR", "SWIGTEMPLATE", "FRAGMENT", "WARN", "LESSTHAN",
-  "GREATERTHAN", "DELETE_KW", "DEFAULT", "LESSTHANOREQUALTO",
-  "GREATERTHANOREQUALTO", "EQUALTO", "NOTEQUALTO", "ARROW", "QUESTIONMARK",
-  "TYPES", "PARMS", "NONID", "DSTAR", "DCNOT", "TEMPLATE", "OPERATOR",
-  "CONVERSIONOPERATOR", "PARSETYPE", "PARSEPARM", "PARSEPARMS", "CAST",
-  "LOR", "LAND", "OR", "XOR", "AND", "LSHIFT", "RSHIFT", "PLUS", "MINUS",
-  "STAR", "SLASH", "MODULO", "UMINUS", "NOT", "LNOT", "DCOLON", "$accept",
-  "program", "interface", "declaration", "swig_directive",
-  "extend_directive", "$@1", "apply_directive", "clear_directive",
-  "constant_directive", "echo_directive", "except_directive", "stringtype",
-  "fname", "fragment_directive", "include_directive", "$@2", "includetype",
-  "inline_directive", "insert_directive", "module_directive",
-  "name_directive", "native_directive", "pragma_directive", "pragma_arg",
-  "pragma_lang", "rename_directive", "rename_namewarn",
-  "feature_directive", "stringbracesemi", "featattr", "varargs_directive",
-  "varargs_parms", "typemap_directive", "typemap_type", "tm_list",
-  "tm_tail", "typemap_parm", "types_directive", "template_directive",
-  "warn_directive", "c_declaration", "$@3", "c_decl", "c_decl_tail",
-  "initializer", "cpp_alternate_rettype", "cpp_lambda_decl",
-  "lambda_introducer", "lambda_body", "lambda_tail", "$@4", "c_enum_key",
-  "c_enum_inherit", "c_enum_forward_decl", "c_enum_decl",
-  "c_constructor_decl", "cpp_declaration", "cpp_class_decl", "@5", "@6",
-  "cpp_opt_declarators", "cpp_forward_class_decl", "cpp_template_decl",
-  "$@7", "cpp_temp_possible", "template_parms", "templateparameters",
-  "templateparameter", "templateparameterstail", "cpp_using_decl",
-  "cpp_namespace_decl", "$@8", "$@9", "cpp_members", "$@10", "$@11",
-  "$@12", "cpp_member", "cpp_constructor_decl", "cpp_destructor_decl",
-  "cpp_conversion_operator", "cpp_catch_decl", "cpp_static_assert",
-  "cpp_protection_decl", "cpp_swig_directive", "cpp_end", "cpp_vend",
-  "anonymous_bitfield", "anon_bitfield_type", "extern_string",
-  "storage_class", "parms", "rawparms", "ptail", "parm", "valparms",
-  "rawvalparms", "valptail", "valparm", "def_args", "parameter_declarator",
-  "plain_declarator", "declarator", "notso_direct_declarator",
-  "direct_declarator", "abstract_declarator", "direct_abstract_declarator",
-  "pointer", "type_qualifier", "type_qualifier_raw", "type", "rawtype",
-  "type_right", "decltype", "primitive_type", "primitive_type_list",
-  "type_specifier", "definetype", "$@13", "default_delete",
-  "deleted_definition", "explicit_default", "ename",
-  "optional_constant_directive", "enumlist", "edecl", "etype", "expr",
-  "valexpr", "exprnum", "exprcompound", "ellipsis", "variadic", "inherit",
-  "raw_inherit", "$@14", "base_list", "base_specifier", "@15", "@16",
-  "access_specifier", "templcpptype", "cpptype", "classkey", "classkeyopt",
-  "opt_virtual", "virt_specifier_seq", "exception_specification",
-  "cpp_const", "ctor_end", "ctor_initializer", "mem_initializer_list",
-  "mem_initializer", "less_valparms_greater", "identifier", "idstring",
-  "idstringopt", "idcolon", "idcolontail", "idtemplate",
-  "idtemplatetemplate", "idcolonnt", "idcolontailnt", "string", "wstring",
-  "stringbrace", "options", "kwargs", "stringnum", "empty", YY_NULLPTR
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395
-};
-# endif
-
-#define YYPACT_NINF -1018
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-1018)))
-
-#define YYTABLE_NINF -580
-
-#define yytable_value_is_error(Yytable_value) \
-  0
-
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
-{
-     564,  4133,  4205,   188,    63,  3623, -1018, -1018, -1018, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018,   159, -1018, -1018, -1018,
-   -1018, -1018,   262,   257,   264,    32, -1018, -1018,   179,   250,
-     256,   292,   382,  4850,   728,   129,   728, -1018, -1018, -1018,
-    2504, -1018,   292,   256, -1018,    75, -1018,   396,   406,  4567,
-   -1018,   293, -1018, -1018, -1018,   416, -1018, -1018,    36,   446,
-    4277,   452, -1018, -1018,   446,   457,   461,   465,   530, -1018,
-   -1018,   478,   439,   361,    22,   137,   471,   488,   218,   492,
-     498,   551,  4638,  4638,   524,   535,   579,   567,   752, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018,   446,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018,  1559, -1018, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018,    31,  4709, -1018,
-     562, -1018, -1018,   571,   578,   292,    57,   401,  2151, -1018,
-   -1018, -1018,   728, -1018,  3295,   585,    85,  2285,  3089,    33,
-    1089,  1235,    69,   292, -1018, -1018,   245,   307,   245,   327,
-    1652,   525, -1018, -1018, -1018, -1018, -1018,   207,   305, -1018,
-   -1018, -1018,   604, -1018,   614, -1018, -1018,   409, -1018, -1018,
-     401,    48,   409,   409, -1018,   620,  1654, -1018,     8,   879,
-     316,   207,   207, -1018,   409,  4495, -1018, -1018,  4567, -1018,
-   -1018, -1018, -1018, -1018,   292,   298, -1018,   120,   621,   207,
-   -1018, -1018,   409,   207, -1018, -1018, -1018,   663,  4567,   626,
-     479,   653,   634,   409,   579,   663,  4567,  4567,   292,   579,
-    2124,  1870,  1873,   409,   532,   594, -1018, -1018,  1654,   292,
-    1672,   217, -1018,   675,   677,   660,   207, -1018, -1018,    75,
-     639, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018,
-   -1018, -1018,  3089,   427,  3089,  3089,  3089,  3089,  3089,  3089,
-    3089, -1018,   654, -1018,   695,   705,   374,  2904,    19, -1018,
-   -1018,   663,   753, -1018, -1018,  3408,  1382,  1382,   721,   729,
-    1161,   656,   734, -1018, -1018, -1018,   731,  3089, -1018, -1018,
-   -1018, -1018,  4281, -1018,  2904,   756,  3408,   769,   292,   370,
-     327, -1018,   773,   370,   327, -1018,   714, -1018, -1018,  4567,
-    2419, -1018,  4567,  2553,   801,  1336,  1838,   370,   327,   736,
-    1779, -1018, -1018,    75,   814,  4567, -1018, -1018, -1018, -1018,
-     829,   663,   292, -1018, -1018,    38,   832, -1018, -1018,   387,
-     245,   286, -1018,   840, -1018, -1018, -1018, -1018,   292, -1018,
-     850,   839,   641,   852,   858, -1018,   861,   865, -1018,  4780,
-   -1018,   292, -1018,   863,   868, -1018,   869,   870,  4638, -1018,
-   -1018, -1018, -1018, -1018,  4638, -1018, -1018, -1018,   871, -1018,
-   -1018,   744,   219,   872,   813, -1018,   883, -1018,    56, -1018,
-   -1018,    34,   156,   156,   156,   301,   810,   886,   153,   887,
-    1897,  2157,   815,  1779,   822,    49,   859,   357, -1018,  3480,
-    1081, -1018,   891, -1018,   359, -1018, -1018, -1018, -1018,   256,
-   -1018,   401,  2387,  4780,   892,  3172,  1887, -1018, -1018, -1018,
-   -1018, -1018, -1018,  2151, -1018, -1018, -1018,  3089,  3089,  3089,
-    3089,  3089,  3089,  3089,  3089,  3089,  3089,  3089,  3089,  3089,
-    3089,  3089,  3089,  3089, -1018,   379,   379,   405,   828,    27,
-   -1018,   559, -1018, -1018,   379,   379,   633,   830,   156,   156,
-    3089,  2904, -1018,  4567,  1814,    18,   899, -1018,  4567,  2687,
-     903, -1018,   912, -1018,  4642,   913, -1018,  4729,   907,   908,
-     370,   327,   914,   370,   327,  1718,   916,   922,  2291,   370,
-   -1018, -1018,   614,   235, -1018, -1018,   409,  1964, -1018,   917,
-     918, -1018,   926, -1018,   597,  1331,  2376,   932,  4567,  1654,
-     928, -1018,   479,  3725,   933, -1018,   713,  4638,   285,   935,
-     931,   634,   487,   936,   409,  4567,   124,   889,  4567, -1018,
-   -1018, -1018,   156,  1159,  1388,    23, -1018,  2239,  4920,   924,
-    4850,   355, -1018,   941,   810,   949,   145,   900,   905,   308,
-   -1018,   800, -1018,   245,   919, -1018, -1018,   950, -1018,   292,
-    3089,  2821,  2955,  3223,   121,   129,   944,   695,   934,   934,
-    1281,  1281,  2787,  3261,  3172,  1618,  2528,  1887,   503,   503,
-     678,   678, -1018, -1018, -1018,   830, -1018, -1018, -1018, -1018,
-     379,   652,   307,  4854,   959,   770,   830, -1018,  1388,  1388,
-     960, -1018,  4866,  1388, -1018, -1018, -1018, -1018,  1388,   954,
-     955,   962,   963,  2373,   370,   327,   964,   968,   969,   370,
-   -1018, -1018, -1018,   663,  3827, -1018,   965, -1018,   219,   966,
-   -1018, -1018, -1018, -1018, -1018,   663, -1018, -1018, -1018,   979,
-   -1018,   460,   663, -1018,   970,   182,   793,  1331, -1018,   460,
-   -1018,   977, -1018, -1018,  3929,    41,  4780,   442, -1018, -1018,
-    4567, -1018, -1018,   882, -1018,   161,   925, -1018,   984,   980,
-   -1018,   292,  1233,   883, -1018,   460,   260,  1388, -1018, -1018,
-   -1018,  1081, -1018, -1018, -1018, -1018,   214, -1018, -1018,   967,
-    1061,  4567,  3089, -1018, -1018, -1018, -1018,  1654, -1018, -1018,
-   -1018, -1018,   245, -1018, -1018,   988, -1018,   772, -1018,  2023,
-   -1018,   245,  2904,  3089,  3089,  3223,  3550,  3089,   992,   995,
-     996,   998, -1018,  3089, -1018, -1018, -1018, -1018,   838,   370,
-   -1018, -1018,   370,   370,  1388,  1388,   999,  1001,  1002,   370,
-    1388,  1003,  1005, -1018,   409,   409,  2023,  4567,   779, -1018,
-     124, -1018,  1964,  1427,   409,  1013, -1018,   460,  1000, -1018,
-   -1018,   663,  1654,   118, -1018,  4638, -1018,  1014,   362,   207,
-     368, -1018,  2151,   294, -1018,  1008,    36,  1006,   789, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018,  4348, -1018,  4031,
-    1028, -1018,   308,  4567, -1018,   389, -1018,   207,   424, -1018,
-    4567,   286,  1018,  1007, -1018,  1015,  2520,  1081, -1018,   919,
-   -1018, -1018, -1018,   292, -1018, -1018, -1018,  1029,  1009,  1010,
-    1012,   938,   207, -1018, -1018, -1018, -1018, -1018, -1018, -1018,
-   -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018, -1018,
-   -1018, -1018, -1018, -1018,  1027,  2023, -1018, -1018, -1018, -1018,
-   -1018, -1018, -1018, -1018,  4420,  1031,  2023, -1018,  2904,  2904,
-    2904,  3089,  3089, -1018,  4780,  3038, -1018,   370,   370,  1388,
-    1034,  1041,   370,  1388,  1388, -1018, -1018,  1032,  1049, -1018,
-   -1018,   663,  1054, -1018,   460,  1444,   124, -1018,  1056, -1018,
-    1059, -1018, -1018,   161, -1018, -1018,   161,  1017, -1018, -1018,
-    4780, -1018,  4567,  1654,  4780,  1736, -1018, -1018, -1018,  1072,
-   -1018, -1018, -1018,   967,  1063,   967,  1496,  1077,  1084,   286,
-     292,   520, -1018, -1018, -1018,   308, -1018,  1080,   919,  2023,
-   -1018, -1018, -1018, -1018,   207,  1094,  1512, -1018,  1060,  1067,
-    1068,  1071,  1076,   242,  1101,  2904,  2904,   129,   370,  1388,
-    1388,   370,   370, -1018,  1110, -1018,  1111, -1018,   460, -1018,
-   -1018, -1018, -1018, -1018,  1113,   479,  1055,    72,  3480,   460,
-    1115, -1018,  3089,   207, -1018,  1081,   550, -1018,  1120,  1124,
-    1119,   234, -1018, -1018, -1018,  1125, -1018, -1018, -1018,   292,
-   -1018,  2023,  1128,  4567, -1018, -1018,  1081,  3089, -1018,  1512,
-    1131,   370,   370, -1018, -1018,  1132, -1018,  1137, -1018,  4567,
-    1134,  1141,    13,  1142,    -3, -1018, -1018,  2904,   967,   308,
-   -1018, -1018, -1018,   292,  1143, -1018, -1018,  1144,  1080,  1135,
-    4567,  1148,   308,  2653, -1018, -1018, -1018, -1018,  1152,  4567,
-    4567,  4567,  1145,  1061,  4780,   389, -1018, -1018,  1150,  1154,
-   -1018, -1018, -1018,  1162,   460, -1018, -1018,   460,  1165,  1169,
-    1178,  4567, -1018,  1177, -1018,  1176, -1018,  2023,   460, -1018,
-     483, -1018,   519,   460,   460,   460,  1184,   389,  1180, -1018,
-   -1018, -1018, -1018,   286, -1018, -1018,   286, -1018, -1018, -1018,
-     460, -1018, -1018,  1183,  1188, -1018, -1018, -1018
-};
-
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
-static const yytype_uint16 yydefact[] =
-{
-     579,     0,     0,     0,     0,     0,    10,     4,   529,   389,
-     397,   390,   391,   394,   395,   392,   393,   379,   396,   378,
-     398,   381,   399,   400,   401,   402,     0,   369,   370,   371,
-     492,   493,   145,   487,   488,     0,   530,   531,     0,     0,
-     541,     0,     0,     0,   367,   579,   374,   384,   377,   386,
-     387,   491,     0,   548,   382,   539,     6,     0,     0,   579,
-       1,    15,    64,    60,    61,     0,   261,    14,   256,   579,
-       0,     0,    82,    83,   579,   579,     0,     0,   260,   262,
-     263,     0,   264,   265,   270,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     9,
-      11,    18,    19,    20,    21,    22,    23,    24,    25,   579,
-      26,    27,    28,    29,    30,    31,    32,     0,    33,    34,
-      35,    36,    37,    38,    12,   113,   118,   115,   114,    16,
-      13,   154,   155,   156,   157,   158,   159,   257,     0,   275,
-       0,   147,   146,     0,     0,     0,     0,     0,   579,   542,
-     380,     3,   373,   368,   579,     0,   403,     0,     0,   541,
-     352,   351,   366,     0,   298,   281,   579,   305,   579,   348,
-     342,   332,   295,   375,   388,   383,   549,     0,     0,   537,
-       5,     8,     0,   276,   579,   278,    17,     0,   563,   273,
-       0,   255,     0,     0,   570,     0,     0,   372,   548,     0,
-     579,     0,     0,    78,     0,   579,   268,   272,   579,   266,
-     269,   267,   274,   271,     0,     0,   189,   548,     0,     0,
-      62,    63,     0,     0,    51,    49,    46,    47,   579,     0,
-     579,     0,   579,   579,     0,   112,   579,   579,     0,     0,
-       0,     0,     0,     0,     0,   332,   259,   258,     0,   579,
-       0,   579,   283,     0,     0,     0,     0,   543,   550,   540,
-       0,   565,   429,   430,   441,   442,   443,   444,   445,   446,
-     447,   448,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   289,     0,   284,   579,   422,   372,     0,   421,   423,
-     427,   424,   428,   286,   376,   579,   352,   351,     0,     0,
-     342,   382,     0,   293,   408,   409,   291,     0,   405,   406,
-     407,   358,     0,   421,   294,     0,   579,     0,     0,   307,
-     350,   324,     0,   306,   349,   364,   365,   333,   296,   579,
-       0,   297,   579,     0,     0,   345,   344,   302,   343,   324,
-     353,   547,   546,   545,     0,     0,   277,   280,   533,   532,
-       0,   534,     0,   562,   116,   573,     0,    68,    45,     0,
-     579,   403,    70,     0,   495,   496,   494,   497,     0,   498,
-       0,    74,     0,     0,     0,    98,     0,     0,   185,     0,
-     579,     0,   187,     0,     0,   103,     0,     0,     0,   107,
-     299,   300,   301,    42,     0,   104,   106,   535,     0,   536,
-      54,     0,    53,     0,     0,   178,   579,   182,   491,   180,
-     169,     0,     0,     0,     0,   532,     0,     0,     0,     0,
-       0,     0,   324,     0,     0,   332,   579,   548,   411,   579,
-     579,   475,     0,   474,   383,   477,   489,   490,   385,     0,
-     538,     0,     0,     0,     0,   439,   438,   467,   466,   440,
-     468,   469,   528,     0,   285,   288,   470,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   564,   352,   351,   342,   382,     0,
-     332,     0,   362,   360,   345,   344,     0,   332,   353,     0,
-       0,   404,   359,   579,   342,   382,     0,   325,   579,     0,
-       0,   363,     0,   338,     0,     0,   356,     0,     0,     0,
-     304,   347,     0,   303,   346,   354,     0,     0,     0,   308,
-     544,     7,   579,     0,   170,   579,     0,     0,   569,     0,
-       0,    69,     0,    77,     0,     0,     0,     0,     0,     0,
-       0,   186,   579,     0,     0,   579,   579,     0,     0,   108,
-       0,   579,     0,     0,     0,     0,     0,   167,     0,   179,
-     184,    58,     0,     0,     0,     0,    79,     0,     0,     0,
-       0,     0,   149,     0,   382,     0,   506,   501,   502,     0,
-     127,   579,   507,   579,   579,   162,   166,     0,   551,     0,
-     431,     0,     0,   366,     0,   579,     0,   579,   464,   463,
-     461,   462,     0,   460,   459,   455,   456,   454,   457,   458,
-     449,   450,   451,   452,   453,     0,   353,   336,   335,   334,
-     354,     0,   315,     0,     0,     0,   324,   326,   353,     0,
-       0,   329,     0,     0,   340,   339,   361,   357,     0,     0,
-       0,     0,     0,     0,   309,   355,     0,     0,     0,   311,
-     279,    66,    67,    65,     0,   574,   575,   578,   577,   571,
-      44,    43,    39,    76,    73,    75,   568,    93,   567,     0,
-      88,   579,   566,    92,     0,   577,     0,     0,    99,   579,
-     227,     0,   190,   191,     0,   256,     0,     0,    50,    48,
-     579,    41,   105,     0,   556,   554,     0,    57,     0,     0,
-     110,     0,   579,   579,   579,   579,     0,     0,   133,   132,
-     134,   579,   136,   131,   135,   140,     0,   148,   150,   579,
-     579,   579,     0,   508,   504,   503,   126,     0,   123,   125,
-     121,   128,   579,   129,   499,   476,   478,   480,   500,     0,
-     160,   579,   432,     0,     0,   366,   365,     0,     0,     0,
-       0,     0,   287,     0,   337,   292,   341,   327,     0,   317,
-     331,   330,   316,   312,     0,     0,     0,     0,     0,   310,
-       0,     0,     0,   117,     0,     0,     0,   579,   510,   511,
-       0,   513,     0,     0,     0,     0,    90,   579,     0,   119,
-     188,   255,     0,   548,   101,     0,   100,     0,     0,     0,
-       0,   552,   579,     0,    52,     0,   256,     0,     0,   171,
-     172,   176,   175,   168,   173,   177,   174,     0,   183,     0,
-       0,    81,     0,   579,   141,     0,   412,   417,     0,   413,
-     579,   403,   511,   579,   153,     0,     0,   579,   130,   579,
-     485,   484,   486,     0,   482,   198,   218,     0,     0,     0,
-       0,   262,     0,   240,   241,   233,   242,   216,   196,   238,
-     234,   232,   235,   236,   237,   239,   217,   213,   214,   200,
-     208,   207,   211,   210,     0,     0,   201,   202,   206,   212,
-     203,   204,   205,   215,     0,   275,     0,   282,   435,   434,
-     433,     0,     0,   425,     0,   465,   328,   314,   313,     0,
-       0,     0,   318,     0,     0,   576,   572,     0,     0,   512,
-      84,   577,    95,    89,   579,     0,     0,    97,     0,    71,
-       0,   109,   557,   555,   561,   560,   559,     0,    55,    56,
-       0,   228,   579,     0,     0,     0,    59,    80,   122,     0,
-     143,   142,   139,   579,   418,   579,     0,     0,     0,     0,
-       0,     0,   521,   505,   509,     0,   479,   579,   579,     0,
-     193,   230,   229,   231,     0,     0,     0,   192,   379,   378,
-     381,     0,   377,   382,     0,   437,   436,   579,   319,     0,
-       0,   323,   322,    40,     0,    96,     0,    91,   579,    86,
-      72,   102,   553,   558,     0,   579,     0,     0,   579,   579,
-       0,   416,     0,   415,   151,   579,     0,   518,     0,   520,
-     522,     0,   514,   515,   124,     0,   472,   481,   473,     0,
-     199,     0,     0,   579,   164,   163,   579,     0,   209,     0,
-       0,   321,   320,    94,    85,     0,   111,     0,   167,   579,
-       0,     0,     0,     0,     0,   144,   419,   420,   579,     0,
-     516,   517,   519,     0,     0,   526,   527,     0,   579,     0,
-     579,     0,     0,     0,   161,   426,    87,   120,     0,   579,
-     579,   579,     0,   579,     0,     0,   414,   152,   523,     0,
-     471,   483,   194,     0,   579,   165,   249,   579,     0,     0,
-       0,   579,   219,     0,   137,     0,   524,     0,   579,   220,
-       0,   226,     0,   579,   579,   579,     0,     0,     0,   195,
-     221,   243,   245,     0,   246,   248,   403,   224,   223,   222,
-     579,   138,   525,     0,     0,   225,   244,   247
-};
-
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-   -1018, -1018,  -367, -1018, -1018, -1018, -1018,    44,    68,    -4,
-      77, -1018,   706, -1018,    82,    84, -1018, -1018, -1018,    97,
-   -1018,    99, -1018,   100, -1018, -1018,   105, -1018,   109,  -540,
-    -643,   110, -1018,   117, -1018,  -353,   683,   -71,   119,   146,
-     152,   174, -1018,   533,  -792,  -692, -1018, -1018, -1018,  -862,
-   -1017, -1018,  -134, -1018, -1018, -1018, -1018, -1018,    10, -1018,
-   -1018,   208,    24,    46, -1018, -1018,   304, -1018,   682,   542,
-     190, -1018, -1018, -1018,  -742, -1018, -1018, -1018, -1018,   545,
-   -1018,   553,   199,   554, -1018, -1018, -1018,  -474, -1018, -1018,
-   -1018,    45,   -56, -1018,   730,    16,   451, -1018,   661,   804,
-     -25,  -584,  -534,   -95,  1102,  -200,  -145,   745,    62,    35,
-   -1018,   -68,    54,   -11,   691,  -541,  1211, -1018,  -347, -1018,
-    -150, -1018, -1018, -1018,  -867, -1018,   263, -1018,   937,  -136,
-    -499, -1018, -1018,   210,   831, -1018, -1018, -1018,   430, -1018,
-   -1018, -1018,  -214,   -52, -1018, -1018,   313,   697,  -382,  -614,
-     206, -1018, -1018,   231,   -30,   123,  -116, -1018,   946,  -218,
-    -139,  1116, -1018,  -393,  1109, -1018,   602,   230,  -196,  -505,
-       0
-};
-
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     4,     5,    99,   100,   101,   776,   853,   854,   855,
-     856,   106,   400,   401,   857,   858,   704,   109,   110,   859,
-     112,   860,   114,   861,   664,   202,   862,   117,   863,   670,
-     537,   864,   374,   865,   384,   231,   395,   232,   866,   867,
-     868,   869,   525,   125,   730,   579,   711,   126,   716,   825,
-     942,  1000,    41,   571,   127,   128,   129,   130,   870,   886,
-     739,  1025,   871,   872,   702,   813,   404,   405,   406,   559,
-     873,   135,   545,   380,   874,  1021,  1097,   959,   875,   876,
-     877,   878,   879,   880,   881,   882,  1099,  1101,   883,   971,
-     137,   884,   298,   183,   346,   184,   282,   283,   454,   284,
-     580,   165,   389,   166,   319,   167,   168,   169,   244,    43,
-      44,   285,   197,    46,    47,    48,    49,    50,   306,   307,
-     348,   309,   310,   426,   827,   828,   943,  1046,   287,   313,
-     289,   290,  1016,  1017,   432,   433,   584,   735,   736,   843,
-     958,   844,    51,    52,   367,   368,   737,   582,   779,  1102,
-     834,   951,  1009,  1010,   176,    53,   355,   398,    54,   179,
-      55,   259,   696,   801,   291,   292,   673,   193,   356,   659,
-     185
-};
-
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_int16 yytable[] =
-{
-       6,   104,   196,   182,   249,   139,   308,   258,   681,   299,
-     149,   750,   288,   543,   530,   131,   700,    42,    57,   822,
-     164,   229,   243,   408,   230,   230,   385,   713,   657,   132,
-     938,   676,   152,   785,   907,   550,   315,   657,   341,   258,
-     353,   440,   188,   824,   417,   172,   238,   188,   583,   102,
-     138,   133,   246,  1071,   353,    45,    45,   780,  1094,   627,
-       8,  -290,   361,    60,   627,   788,   212,   329,   617,   194,
-     250,   350,   145,   103,   194,   203,  1001,   357,  1003,   153,
-     526,   173,   105,   363,   330,   391,   251,   107,   372,   108,
-    1121,   820,   527,   561,   354,   260,   479,   481,  -181,   213,
-     486,   360,   111,   569,   113,   115,   833,   170,  1074,   194,
-     116,   148,  1039,    45,   118,   119,   247,   397,    27,    28,
-      29,   189,   120,  -290,   121,   520,   189,   419,   666,   149,
-     188,   303,     8,   967,   628,   390,   148,   786,   352,   707,
-       8,   328,  1072,   331,   974,   955,    36,    37,   293,   375,
-     299,   122,   376,   424,   190,   430,     8,   123,   654,     8,
-    -181,   919,   747,  1014,   281,   423,   172,   667,   172,   154,
-     668,   299,   387,   916,   381,   256,   257,   155,   684,   124,
-     403,  1076,  1075,   156,   347,   722,   157,   294,   353,    58,
-     304,   305,   177,   198,   687,   134,   359,   326,  1040,   732,
-     369,  1041,   286,   162,   136,   158,   162,   140,    45,   217,
-       8,   308,   479,   481,   486,   178,   300,  1020,    36,    37,
-       8,   148,   220,   148,   325,   353,    36,    37,    59,   214,
-     392,  1107,   396,   399,   577,   578,  -534,   409,   669,   651,
-     910,   188,    36,    37,    38,    36,    37,   748,   159,   428,
-     749,   435,    38,   407,   823,   160,    40,  1077,   161,    45,
-     824,   164,    45,   162,   221,   555,   353,   163,    38,   985,
-    1085,    38,    40,   502,  1055,   159,   505,   912,   799,  1059,
-    1056,   652,    45,   657,   455,  1028,   172,   162,   621,   622,
-      45,    45,   170,   431,   163,     8,    36,    37,   928,   156,
-     986,   800,   414,   821,   200,   143,    36,    37,     8,   726,
-     349,   542,   144,  1049,   141,   349,   349,   288,  -254,   146,
-     230,   158,   349,   551,   370,   371,   230,   349,   688,   583,
-     655,   689,    38,   142,  1062,   529,    40,   819,   832,   239,
-     929,   378,   383,   972,   408,   349,   386,   329,   170,    45,
-     727,   728,   379,   147,   729,  1109,   349,   477,   698,   148,
-     172,   522,   621,   415,   330,     8,   349,   332,   364,   365,
-      45,     8,   427,   573,  1035,   595,   989,     8,   494,   439,
-       6,    36,    37,    45,   333,  1044,    45,   366,   501,   589,
-       8,   304,   305,  1030,    36,    37,   909,   391,   718,    45,
-    -410,   719,   586,  -410,   148,  -579,   560,    38,     8,   588,
-     498,    40,     8,   186,   154,   188,  -579,  -548,  -548,   295,
-     674,   414,   155,   256,   342,   151,   572,   499,   156,   940,
-     172,   157,   941,  -410,   435,   431,   157,   624,   210,   180,
-     671,  -548,   630,   211,   679,   295,   666,   390,   188,   181,
-     158,    36,    37,    30,    31,   583,   187,    36,    37,   833,
-     148,  1037,   157,    36,    37,   581,   945,   443,   705,   281,
-    1100,   946,    33,    34,     8,   444,    36,    37,  -579,   230,
-     564,   922,     8,    45,   948,   794,   192,   925,   668,    38,
-       8,   414,   199,   159,    36,    37,   795,   201,    36,    37,
-     160,   204,    38,   161,   594,   205,    40,   286,   162,    27,
-      28,    29,   163,   412,   304,   305,   413,   216,   208,   154,
-      38,   162,   347,   209,    40,     6,  1111,   155,   219,  1112,
-     992,   484,   222,   993,   485,     8,   157,  1113,   223,   104,
-     575,   224,   392,   139,   225,     6,   139,    45,   576,   577,
-     578,   396,    45,   131,   678,   226,   731,   188,   733,   717,
-      36,    37,  1114,  1012,   233,  1115,  1013,   132,    36,    37,
-     164,   699,   418,  1116,   407,   234,    36,    37,   905,   906,
-     334,   172,   787,   172,   738,   188,    38,   102,   138,   133,
-      40,   686,    45,  1050,    38,   172,  1051,   455,   159,   329,
-     618,   663,   693,   188,   170,   160,   694,   236,   161,    45,
-     252,   103,    45,   162,   206,   207,   330,   163,   792,   253,
-     105,    36,    37,   583,  1110,   107,   254,   108,   746,  1117,
-    1118,  1119,   837,   302,   797,   469,   470,   471,   472,   473,
-     111,   340,   113,   115,   583,   344,  1125,    38,   116,   349,
-     104,    40,   118,   119,   139,   325,   345,   170,   420,   349,
-     120,   421,   121,   358,   131,   835,   288,   382,   674,   353,
-     318,   781,   388,   329,   619,   695,   394,   349,   132,   781,
-     104,   308,   535,   536,   139,     1,     2,     3,   914,   122,
-     330,   832,   329,   754,   131,   123,   393,   918,   102,   138,
-     133,   438,   139,   560,     6,   781,   778,   838,   132,   330,
-     423,   172,   810,   965,   778,   826,   887,   124,   408,   829,
-     781,   908,   103,   436,   920,   437,   811,   230,   102,   138,
-     133,   105,   172,   134,    66,   152,   107,   453,   108,   885,
-     778,   172,   136,   441,    45,   456,   581,   817,   812,   935,
-     249,   111,   103,   113,   115,   778,   238,   685,   452,   116,
-     474,   105,   482,   118,   119,   251,   107,   939,   108,  1124,
-     483,   120,   488,   121,   947,    45,   885,    27,    28,    29,
-     746,   111,   489,   113,   115,   553,   554,   781,   490,   116,
-      78,    79,    80,   118,   119,    82,   493,    83,    84,  1008,
-     122,   120,   293,   121,    30,    31,   123,   325,   501,   793,
-     498,   757,   471,   472,   473,   104,   935,   496,   281,   139,
-     988,   500,   778,    33,    34,  1022,   977,   499,   124,   131,
-     122,    45,   251,   952,   783,   784,   123,   172,   424,   738,
-     430,    30,    31,   132,   134,   840,   841,   842,   162,   508,
-     391,  1005,   515,   136,   156,   237,   286,   521,   124,   575,
-      33,    34,   995,   102,   138,   133,   997,   576,   577,   578,
-     523,  1026,   581,   528,   134,   885,   158,    45,   498,   896,
-     575,   531,     8,   136,    45,   188,   885,   103,   576,   577,
-     578,   533,   932,   534,   538,   499,   105,   349,   349,   539,
-     390,   107,   540,   108,   546,   320,   324,   349,   541,   547,
-     548,   549,   552,   556,   781,   338,   111,   557,   113,   115,
-     362,   923,   924,   926,   116,   558,   562,   563,   118,   119,
-     566,   567,   409,   568,  1026,   570,   120,   585,   121,   826,
-     596,   826,  1043,   829,   616,   829,   620,   629,   407,   778,
-     944,   633,   164,   634,   636,   638,   639,  1018,   738,   885,
-     660,   661,   640,  1123,   646,   122,   308,  1061,    36,    37,
-     647,   123,   662,   677,   680,   690,   683,   172,   691,   697,
-     701,   715,   720,  1068,   304,   305,    45,   150,   781,   721,
-     724,   171,   751,   124,   725,   392,   740,   734,   175,   781,
-     756,   760,   764,   765,  1083,   172,  1093,   774,   775,   134,
-     766,   767,   770,  1088,  1089,  1090,   771,   772,   136,   777,
-     789,   885,   798,   778,   782,   803,   172,   804,   802,    70,
-     839,   215,   218,   891,   778,  1106,   892,   893,   894,   170,
-     581,   320,   324,   917,   826,   338,   931,   899,   829,   900,
-     901,   903,    45,   904,   915,   921,   953,   170,  1018,  1042,
-     414,   581,   930,   245,   467,   468,   469,   470,   471,   472,
-     473,   937,   949,   781,   966,   960,   964,    45,  -197,   983,
-     511,   514,   979,   950,   781,   961,   962,   781,   963,   980,
-     984,   255,     8,    45,   312,   314,   784,   885,   781,   990,
-     301,   830,   991,   781,   781,   781,   321,   321,   778,   327,
-      27,    28,    29,   999,    45,   831,   339,  1002,  1006,   778,
-     781,   994,   778,    45,    45,    45,   944,  1007,  1015,   316,
-      27,    28,    29,   778,  1023,   156,  -252,   317,   778,   778,
-     778,   575,   245,  -251,  -253,    45,   157,  1027,  1029,   576,
-     577,   578,  -250,  1033,  1034,   778,  1036,   158,  1045,  1038,
-     377,   575,     8,  1052,     8,   188,  1053,  1054,  1060,   576,
-     577,   578,  1065,  1057,  1069,  1066,   171,   191,    36,    37,
-    1067,  1070,  1082,  1073,   410,  1091,   416,   321,   321,  1084,
-     422,  1079,  1080,  1087,   425,   150,   245,   434,  1095,   359,
-     227,   154,  1096,  1098,    38,   235,  1103,   155,    40,   442,
-    1104,   445,   446,   447,   448,   449,   450,   451,   157,  1105,
-     320,   324,   338,   824,  1108,  1120,  1126,   318,  1122,   511,
-     514,  1127,   171,   656,   692,   809,   996,  1064,     8,   338,
-     703,   478,   480,   480,   491,   818,   487,   814,    36,    37,
-      36,    37,   650,   927,    66,   815,   816,   597,   752,   712,
-     645,   174,   495,   323,   497,   587,  1048,   504,  1081,   956,
-     507,  1019,   337,   723,    38,   316,    38,   806,   159,  1092,
-     159,   321,   321,   322,  1078,   241,   321,   484,   242,   796,
-     485,     0,   157,   162,   343,     0,   351,   163,   524,   163,
-       0,   351,   351,     0,     0,   416,     0,     0,   351,     0,
-      78,    79,    80,   351,   532,    82,   807,    83,    84,     0,
-       0,     0,     0,     0,    36,    37,     0,   544,     0,     0,
-       0,   351,     0,     0,     8,   666,     0,   188,     0,     8,
-       0,     0,   351,   402,   323,     0,   337,     0,   411,   351,
-      38,   808,   351,     0,    40,     0,     0,     0,   480,   480,
-     480,     0,     0,     0,   565,   645,   321,   321,     0,   321,
-       0,   359,     0,   318,   667,   574,   316,   668,     0,   155,
-       0,     0,     0,     0,   509,     8,     0,     0,   457,   458,
-       0,     8,     0,   157,   598,   599,   600,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,   610,   611,   612,   613,
-     614,   467,   468,   469,   470,   471,   472,   473,     0,     0,
-      36,    37,   154,   615,     0,    36,    37,   623,   418,     0,
-       8,     0,     0,     0,   480,   480,   632,   510,   513,   157,
-     626,     0,   519,     0,     0,   669,    38,     8,     0,     0,
-     159,    38,     0,     0,     0,    40,     0,   241,     0,     0,
-     242,   321,     0,     0,   321,   162,     0,   359,     0,   163,
-     913,    36,    37,     0,   318,   155,     0,    36,    37,     0,
-       0,   245,     0,     0,   359,   245,     0,   987,   171,     0,
-       0,     0,   155,     0,     0,     0,     0,    38,     0,     8,
-       0,   159,     0,    38,     0,     0,     0,    40,   480,   245,
-     321,     0,     0,   321,   714,     8,    36,    37,     0,     0,
-     163,     0,   510,   513,     0,   519,   318,   742,   604,   607,
-     612,     0,     0,    36,    37,   741,   359,     0,     0,  1004,
-       0,   171,    38,     0,   155,     0,   159,     0,     0,     0,
-       0,     0,   359,   241,     0,  1024,   242,     0,     0,    38,
-     155,   162,     8,   159,     0,   163,     0,     0,     0,     0,
-     241,     0,     0,   242,   321,   321,     0,     0,   162,   321,
-       0,     0,   163,     0,   321,    36,    37,     0,     0,   321,
-       0,     0,     0,     0,     0,     0,   625,     0,     0,   240,
-       0,    36,    37,     0,     0,     0,     0,   155,     0,     0,
-       0,    38,     0,     0,     0,   159,     0,   644,     0,     0,
-     649,     0,   241,   245,     0,   242,     0,    38,     0,     0,
-     162,   159,   653,     0,   163,   351,   658,     0,   241,     0,
-       0,   242,     0,   665,   672,   675,   162,   805,    36,    37,
-     163,     0,     0,   321,     0,     8,     0,     8,     0,   836,
-       0,     0,     0,   351,     0,   672,   625,     0,     0,   644,
-       0,     0,   706,   245,    38,     8,     0,     0,   159,     0,
-     888,   889,   449,     0,   890,   241,     0,     0,   242,     0,
-     895,     0,   316,   162,   359,     0,     0,   163,     0,     0,
-     334,     0,   155,     0,     0,     0,     0,     0,     0,   157,
-     321,   321,   429,     0,     0,     0,   321,     0,     0,     0,
-     155,     8,     0,     0,     0,   457,   458,   459,   460,   245,
-     758,   759,     0,     0,     0,   762,     0,     0,   245,     8,
-     763,    36,    37,    36,    37,   769,   465,   466,   467,   468,
-     469,   470,   471,   472,   473,     0,     0,     0,   316,     0,
-       0,    36,    37,     0,     0,     0,   641,    38,     0,    38,
-       0,    40,     0,   159,     0,   157,   998,     0,   335,     0,
-     241,   336,     8,   242,   155,     0,   672,    38,   162,   957,
-     318,   159,   163,     0,   791,     0,   672,     0,   241,     0,
-       0,   242,     0,     0,     0,     0,   162,    36,    37,   758,
-     163,     0,     0,     0,     0,     0,     0,     8,     0,   418,
-       0,     0,     0,     0,     0,    36,    37,   516,   975,   976,
-     973,     0,     0,    38,     0,     0,     0,    40,     0,     0,
-       0,     8,     0,     0,   642,   321,     0,   643,     0,   321,
-     321,    38,     0,     0,   316,   159,   318,     0,     0,     0,
-       0,   245,   241,     0,     0,   242,   897,   898,    36,    37,
-     162,   157,   902,     8,   163,     0,     8,     0,   316,   245,
-       0,   245,     0,   351,   351,     0,   512,     0,     0,   672,
-       0,   911,   245,   351,    38,   157,  1011,     0,    40,     0,
-       8,     0,     0,    36,    37,   517,     0,     0,   518,     0,
-     418,     0,   245,   418,     0,   791,     0,   318,   317,     0,
-       0,   322,     0,   171,     0,   321,   321,    36,    37,    38,
-       0,     0,     0,    40,     0,     0,     0,   418,     0,  1047,
-     484,   171,     0,   485,   574,   509,     0,     0,     0,     0,
-       0,     0,   318,    38,     0,     0,     0,    40,     0,    36,
-      37,     0,    36,    37,  1063,  1058,     0,     0,     0,     0,
-     188,     0,     0,     0,     0,   245,   318,   264,   265,   266,
-     267,   268,   269,   270,   271,    38,    36,    37,    38,    40,
-       0,     0,    40,     0,   457,   458,   459,   460,     0,  1011,
-       0,   978,     0,     0,     0,   981,   982,     0,   318,     0,
-       0,   318,    38,     0,     0,     0,    40,   467,   468,   469,
-     470,   471,   472,   473,   845,   672,  -579,    62,     0,     0,
-       0,    63,    64,    65,     0,   318,     0,     0,     0,     0,
-       0,     0,     0,     0,    66,  -579,  -579,  -579,  -579,  -579,
-    -579,  -579,  -579,  -579,  -579,  -579,  -579,     0,  -579,  -579,
-    -579,  -579,  -579,     0,     0,     0,   846,    68,     0,     0,
-    -579,     0,  -579,  -579,  -579,  -579,  -579,     0,     0,     0,
-       0,  1031,  1032,     0,     0,    70,    71,    72,    73,   847,
-      75,    76,    77,  -579,  -579,  -579,   848,   849,   850,     0,
-      78,   851,    80,     0,    81,    82,   807,    83,    84,  -579,
-    -579,     0,  -579,  -579,    85,     0,     0,     0,    89,     0,
-      91,    92,    93,    94,    95,    96,     0,     8,     0,     0,
-     188,     0,     0,     0,     0,     0,    97,     0,  -579,     0,
-       0,    98,  -579,  -579,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     8,     0,     0,   188,   261,     0,
-       8,   852,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,     0,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,     0,    21,    22,    23,    24,
-      25,   272,     0,     0,     0,     0,     0,   418,     0,    26,
-      27,    28,    29,    30,    31,   512,   273,     0,     0,     0,
-       0,     0,     0,    36,    37,     0,     0,     0,     0,     0,
-       0,    32,    33,    34,     0,     0,     0,     0,     0,   304,
-     305,     0,     0,     0,     0,     0,     0,    35,     0,    38,
-      36,    37,     8,    40,     0,     0,    36,    37,     0,     0,
-     412,     0,     0,   413,     0,     0,     0,     0,   162,     0,
-       0,     0,     0,     0,     0,     0,    38,     0,     0,    39,
-      40,     0,    38,     0,     0,     0,    40,   274,     0,   418,
-     275,     0,     0,   276,   277,   278,     0,   641,     8,   279,
-     280,   188,   261,     0,     8,   318,   262,   263,   264,   265,
-     266,   267,   268,   269,   270,   271,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
-      21,    22,    23,    24,    25,   272,     0,     0,    36,    37,
-       0,   418,     0,     0,    27,    28,    29,    30,    31,   648,
-     273,     0,     0,   311,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    38,    32,    33,    34,    40,     0,
-       0,     0,     0,     0,     0,   642,     0,     0,   643,     0,
-       0,    35,     0,     0,    36,    37,     8,   318,     0,     8,
-      36,    37,   188,     0,     0,     0,     0,     0,     0,   264,
-     265,   266,   267,   268,   269,   270,   271,     0,     0,     0,
-      38,     0,     0,     0,    40,     0,    38,     0,     0,     0,
-      40,   274,     0,   418,   275,     0,     0,   276,   277,   278,
-       0,   768,     8,   279,   280,   188,   261,     0,   590,   318,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-       0,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,     0,    21,    22,    23,    24,    25,   272,
-       0,     0,    36,    37,     0,    36,    37,     0,    27,    28,
-      29,    30,    31,     0,   273,     0,     0,   503,     0,     0,
-       0,   304,   305,     0,     0,     0,     0,     0,    38,    32,
-      33,    34,    40,     0,   457,   458,   459,   460,     0,   461,
-       0,     0,     0,     0,     0,    35,     0,     0,    36,    37,
-       0,   318,   462,   591,   464,   465,   592,   467,   468,   469,
-     470,   593,   472,   473,     0,     0,     9,    10,    11,    12,
-      13,    14,    15,    16,    38,    18,     0,    20,    40,     0,
-      22,    23,    24,    25,     0,   274,     0,     0,   275,     0,
-       0,   276,   277,   278,     0,     0,     8,   279,   280,   188,
-     261,   954,     0,     0,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,     0,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,     0,    21,    22,
-      23,    24,    25,   272,     0,     0,     0,     0,     0,     0,
-       0,     0,    27,    28,    29,    30,    31,     0,   273,     0,
-       0,   506,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    32,    33,    34,     0,   457,   458,   459,
-     460,     0,   461,     0,     0,   457,   458,   459,   460,    35,
-       0,     0,    36,    37,     0,   462,   463,   464,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   466,   467,   468,
-     469,   470,   471,   472,   473,     0,     0,     0,    38,     0,
-       0,     0,    40,     0,     0,     0,     0,     0,     0,   274,
-       0,     0,   275,     0,     0,   276,   277,   278,     0,     0,
-       8,   279,   280,   188,   261,     0,  1086,     0,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,     0,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,     0,    21,    22,    23,    24,    25,   272,     0,     0,
-       0,     0,     0,     0,     0,     0,    27,    28,    29,    30,
-      31,     0,   273,     0,     0,   631,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    32,    33,    34,
-     457,   458,   459,   460,     0,   461,     0,     0,     0,     0,
-       0,     0,     0,    35,     0,     0,    36,    37,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,   471,   472,   473,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    38,     0,     0,     0,    40,     0,     0,     0,
-       0,     0,     0,   274,     0,     0,   275,     0,     0,   276,
-     277,   278,     0,     0,     8,   279,   280,   188,   261,     0,
-       0,     0,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,     0,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,     0,    21,    22,    23,    24,
-      25,   272,   743,   753,     0,     0,     0,     0,     0,     0,
-      27,    28,    29,    30,    31,     0,   273,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    32,    33,    34,   457,   458,   459,   460,     0,   461,
-       0,     0,     0,     0,     0,     0,     0,    35,     0,     0,
-      36,    37,   462,   463,   464,   465,   466,   467,   468,   469,
-     470,   471,   472,   473,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    38,     0,     0,     0,
-      40,     0,     0,     0,     0,     0,     0,   274,     0,     0,
-     275,     0,     0,   276,   277,   278,     0,     0,     8,   279,
-     280,   188,   261,     0,     0,     0,   262,   263,   264,   265,
-     266,   267,   268,   269,   270,   271,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
-      21,    22,    23,    24,    25,   272,   744,     0,     0,     0,
-       0,     0,     0,     0,    27,    28,    29,    30,    31,     0,
-     273,   457,   458,   459,   460,     0,   461,     0,     0,     0,
-       0,     0,     0,     0,     0,    32,    33,    34,     0,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,    35,     0,     0,    36,    37,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      38,     0,     0,     0,    40,     0,     0,     0,     0,     0,
-       0,   274,     0,     0,   275,     0,     0,   276,   277,   278,
-       0,     0,     8,   279,   280,   188,   261,     0,     0,     0,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-       0,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,     0,    21,    22,    23,    24,    25,   272,
-       0,     0,     0,     0,     0,     0,     0,     0,    27,    28,
-      29,    30,    31,     0,   273,   457,   458,   459,   460,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    32,
-      33,    34,     0,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,   471,   472,   473,    35,     0,     0,    36,    37,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    38,     0,     0,     0,    40,     0,
-       0,     0,     0,     0,     0,   274,     0,     0,   275,     0,
-       0,   276,   277,   278,     0,     0,     8,   279,   280,   188,
-     261,     0,     0,     0,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,     0,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,     0,    21,    22,
-      23,    24,    25,   272,     0,     0,     0,     0,     0,     0,
-       0,     0,    27,    28,    29,    30,    31,     0,   273,   457,
-     458,   459,   460,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    32,    33,    34,     0,     0,     8,   464,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,    35,
-       0,     0,    36,    37,     0,     0,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
-      21,    22,    23,    24,    25,   295,     0,     0,    38,     0,
-       0,     0,    40,    26,    27,    28,    29,    30,    31,     0,
-       0,     0,   157,     0,     0,   276,   277,   745,     0,     0,
-       0,   279,   280,     0,     0,    32,    33,    34,   457,   458,
-     459,   460,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    35,     0,     0,    36,    37,     0,   463,   464,   465,
-     466,   467,   468,   469,   470,   471,   472,   473,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      38,     8,     0,    39,    40,     0,     0,     0,     0,     0,
-       0,   296,     0,     0,   297,     0,     0,     0,     0,   162,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,     0,    21,    22,    23,    24,    25,   295,     0,
-       0,     0,     0,     0,     0,     0,    26,    27,    28,    29,
-      30,    31,     0,     0,     0,   157,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    32,    33,
-      34,     0,     0,     8,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    35,     0,     0,    36,    37,     0,
-       0,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,     0,    21,    22,    23,    24,    25,
-       0,     0,     0,    38,     0,     0,    39,    40,    26,    27,
-      28,    29,    30,    31,   475,     0,     0,   476,     0,     0,
-       0,     0,   162,     0,     0,     0,     0,     0,     0,     0,
-      32,    33,    34,     8,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    35,     0,     0,    36,
-      37,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,     0,    21,    22,    23,    24,    25,
-       0,     0,     0,     0,     0,    38,     0,     0,    39,    40,
-       0,     0,    30,    31,     0,     0,   412,     0,     0,   413,
-       0,     0,     0,     0,   162,     0,     0,     0,     0,     0,
-      32,    33,    34,    -2,    61,     0,  -579,    62,     0,     0,
-       0,    63,    64,    65,     0,     0,    35,     0,     0,    36,
-      37,     0,     0,     0,    66,  -579,  -579,  -579,  -579,  -579,
-    -579,  -579,  -579,  -579,  -579,  -579,  -579,     0,  -579,  -579,
-    -579,  -579,  -579,     0,     0,    38,    67,    68,     0,    40,
-       0,     0,  -579,  -579,  -579,  -579,  -579,     0,     0,    69,
-       0,     0,     0,     0,   162,    70,    71,    72,    73,    74,
-      75,    76,    77,  -579,  -579,  -579,     0,     0,     0,     0,
-      78,    79,    80,     0,    81,    82,     0,    83,    84,  -579,
-    -579,     0,  -579,  -579,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    61,     0,  -579,    62,
-       0,     0,     0,    63,    64,    65,    97,     0,  -579,     0,
-       0,    98,  -579,     0,     0,     0,    66,  -579,  -579,  -579,
-    -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,     0,
-    -579,  -579,  -579,  -579,  -579,     0,     0,     0,    67,    68,
-       0,     0,   682,     0,  -579,  -579,  -579,  -579,  -579,     0,
-       0,    69,     0,     0,     0,     0,     0,    70,    71,    72,
-      73,    74,    75,    76,    77,  -579,  -579,  -579,     0,     0,
-       0,     0,    78,    79,    80,     0,    81,    82,     0,    83,
-      84,  -579,  -579,     0,  -579,  -579,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    61,     0,
-    -579,    62,     0,     0,     0,    63,    64,    65,    97,     0,
-    -579,     0,     0,    98,  -579,     0,     0,     0,    66,  -579,
-    -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,
-    -579,     0,  -579,  -579,  -579,  -579,  -579,     0,     0,     0,
-      67,    68,     0,     0,   773,     0,  -579,  -579,  -579,  -579,
-    -579,     0,     0,    69,     0,     0,     0,     0,     0,    70,
-      71,    72,    73,    74,    75,    76,    77,  -579,  -579,  -579,
-       0,     0,     0,     0,    78,    79,    80,     0,    81,    82,
-       0,    83,    84,  -579,  -579,     0,  -579,  -579,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      61,     0,  -579,    62,     0,     0,     0,    63,    64,    65,
-      97,     0,  -579,     0,     0,    98,  -579,     0,     0,     0,
-      66,  -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,  -579,
-    -579,  -579,  -579,     0,  -579,  -579,  -579,  -579,  -579,     0,
-       0,     0,    67,    68,     0,     0,   790,     0,  -579,  -579,
-    -579,  -579,  -579,     0,     0,    69,     0,     0,     0,     0,
-       0,    70,    71,    72,    73,    74,    75,    76,    77,  -579,
-    -579,  -579,     0,     0,     0,     0,    78,    79,    80,     0,
-      81,    82,     0,    83,    84,  -579,  -579,     0,  -579,  -579,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    61,     0,  -579,    62,     0,     0,     0,    63,
-      64,    65,    97,     0,  -579,     0,     0,    98,  -579,     0,
-       0,     0,    66,  -579,  -579,  -579,  -579,  -579,  -579,  -579,
-    -579,  -579,  -579,  -579,  -579,     0,  -579,  -579,  -579,  -579,
-    -579,     0,     0,     0,    67,    68,     0,     0,     0,     0,
-    -579,  -579,  -579,  -579,  -579,     0,     0,    69,     0,     0,
-       0,   936,     0,    70,    71,    72,    73,    74,    75,    76,
-      77,  -579,  -579,  -579,     0,     0,     0,     0,    78,    79,
-      80,     0,    81,    82,     0,    83,    84,  -579,  -579,     0,
-    -579,  -579,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,     7,     0,     8,     0,     0,     0,
-       0,     0,     0,     0,    97,     0,  -579,     0,     0,    98,
-    -579,     0,     0,     0,     0,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,     0,    21,    22,
-      23,    24,    25,     0,     0,     0,     0,     0,     0,     0,
-       0,    26,    27,    28,    29,    30,    31,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    32,    33,    34,    56,     0,     8,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    35,
-       0,     0,    36,    37,     0,     0,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
-      21,    22,    23,    24,    25,     0,     0,     0,    38,     0,
-       0,    39,    40,    26,    27,    28,    29,    30,    31,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    32,    33,    34,   195,     0,
-       8,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    35,     0,     0,    36,    37,     0,     0,     0,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,     0,    21,    22,    23,    24,    25,     0,     0,     0,
-      38,     0,     0,    39,    40,     0,    27,    28,    29,    30,
-      31,     0,     0,     0,     0,     0,     0,     0,     0,   492,
-       0,     0,     0,     0,     0,     0,     0,    32,    33,    34,
-       0,     8,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    35,     0,     0,    36,    37,     0,     0,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,     0,    21,    22,    23,    24,    25,   457,   458,
-     459,   460,    38,   461,     0,     0,    40,    27,    28,    29,
-      30,    31,     0,     0,     0,     0,   462,   463,   464,   465,
-     466,   467,   468,   469,   470,   471,   472,   473,    32,    33,
-      34,     0,     0,     8,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    35,   933,     0,    36,    37,     0,
-       0,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-     968,    18,   969,    20,     0,   970,    22,    23,    24,    25,
-       0,     0,     0,    38,     0,     0,     0,    40,   934,    27,
-      28,    29,    30,    31,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      32,    33,    34,     0,     0,     0,     0,     0,     8,     0,
-       0,     0,     0,     0,     0,     0,    35,   248,   373,    36,
-      37,     0,     0,     0,     0,     0,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
-      21,    22,    23,    24,    25,    38,     0,     0,     0,    40,
-     934,     0,     0,    26,    27,    28,    29,    30,    31,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    32,    33,    34,     0,     0,
-       8,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    35,     0,     0,    36,    37,     0,     0,     0,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,     0,    21,    22,    23,    24,    25,     0,     0,     0,
-      38,     0,     0,    39,    40,    26,    27,    28,    29,    30,
-      31,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    32,    33,    34,
-       0,     8,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    35,     0,     0,    36,    37,     0,     0,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,     0,    21,    22,    23,    24,    25,   228,     0,
-       0,     0,    38,     0,     0,    39,    40,    27,    28,    29,
-      30,    31,     0,     0,     0,     0,     0,     0,     0,     0,
-     635,     0,     0,     0,     0,     0,     0,     0,    32,    33,
-      34,     0,     8,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    35,     0,     0,    36,    37,     0,
-       0,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,     0,    21,    22,    23,    24,    25,   457,
-     458,   459,   460,    38,   461,     0,     0,    40,    27,    28,
-      29,    30,    31,     0,     0,     0,     0,   462,   463,   464,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,    32,
-      33,    34,     0,     8,     0,     0,     0,   637,     0,     0,
-       0,     0,     0,     0,     0,    35,   248,     0,    36,    37,
-       0,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,     0,    21,    22,    23,    24,    25,
-       0,     0,     0,     0,    38,     0,     0,     0,    40,    27,
-      28,    29,    30,    31,     0,     0,   457,   458,   459,   460,
-       0,   461,     0,     0,     0,     0,     0,     0,     0,     0,
-      32,    33,    34,     8,   462,   463,   464,   465,   466,   467,
-     468,   469,   470,   471,   472,   473,    35,     0,     0,    36,
-      37,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,     0,    21,    22,    23,    24,    25,
-       0,     0,     0,     0,     0,    38,     0,     0,     0,    40,
-       0,     0,    30,    31,     0,     0,     0,     0,     0,     0,
-       0,     0,   755,     0,     0,     0,     0,     0,     0,     0,
-      32,    33,    34,     8,   761,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    35,     0,     0,    36,
-      37,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-     708,    18,   709,    20,     0,   710,    22,    23,    24,    25,
-       0,   457,   458,   459,   460,    38,   461,     0,     0,    40,
-       0,     0,     0,   457,   458,   459,   460,     0,   461,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,     0,     0,     0,    35,     0,     0,    36,
-      37,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    38,     0,     0,     0,    40
-};
-
-static const yytype_int16 yycheck[] =
-{
-       0,     5,    70,    59,   138,     5,   156,   146,   542,   154,
-      40,   595,   148,   380,   361,     5,   556,     1,     2,   711,
-      45,    92,   117,   237,    92,    93,   222,   568,   527,     5,
-     822,   536,    43,   676,   776,   388,     3,   536,   177,   178,
-       6,   259,     6,    46,   240,    45,    98,     6,   430,     5,
-       5,     5,    21,    40,     6,     1,     2,   671,  1075,    41,
-       3,    42,    54,     0,    41,   679,    44,    40,    41,    69,
-     138,   187,    40,     5,    74,    75,   943,   193,   945,    44,
-      42,    46,     5,   199,    57,   230,   138,     5,   204,     5,
-    1107,   705,    54,    59,    46,   147,   296,   297,    42,    77,
-     300,   196,     5,    54,     5,     5,   720,    45,   111,   109,
-       5,   103,    40,    59,     5,     5,    85,   233,    49,    50,
-      51,    85,     5,   104,     5,   343,    85,   243,     4,   159,
-       6,    46,     3,   875,   116,   230,   103,   677,   190,   116,
-       3,   166,   129,   168,   886,   837,    89,    90,   148,   205,
-     295,     5,   208,   248,   118,   250,     3,     5,   525,     3,
-     104,    43,    41,   955,   148,   116,   166,    43,   168,    40,
-      46,   316,   228,   787,    54,   118,   119,    48,   545,     5,
-     236,  1048,  1044,    54,   184,    40,    57,   152,     6,     1,
-     105,   106,   117,    70,   547,     5,    40,   162,   126,   581,
-     200,   129,   148,   134,     5,    76,   134,    48,   154,    86,
-       3,   361,   412,   413,   414,   140,   154,   959,    89,    90,
-       3,   103,     4,   103,   162,     6,    89,    90,    40,    92,
-     230,  1093,   232,   233,    89,    90,    54,   237,   114,     4,
-     780,     6,    89,    90,   115,    89,    90,   126,   119,   249,
-     129,   251,   115,   237,    40,   126,   119,  1049,   129,   205,
-      46,   286,   208,   134,    46,    46,     6,   138,   115,   912,
-    1062,   115,   119,   329,    40,   119,   332,   782,   117,  1021,
-      46,    46,   228,   782,   284,    43,   286,   134,   488,   489,
-     236,   237,   230,    76,   138,     3,    89,    90,     4,    54,
-     914,   140,   240,    43,    74,    48,    89,    90,     3,     1,
-     187,   379,    48,  1005,    52,   192,   193,   453,    76,   140,
-     388,    76,   199,   394,   201,   202,   394,   204,    43,   711,
-     526,    46,   115,    71,  1026,   360,   119,   704,   720,   109,
-      46,    43,   219,   884,   558,   222,   223,    40,   286,   295,
-      42,    43,    54,   103,    46,  1097,   233,   295,   554,   103,
-     360,   345,   562,   240,    57,     3,   243,    40,    52,    53,
-     316,     3,   249,   429,   988,   443,   916,     3,   316,   256,
-     380,    89,    90,   329,    57,   999,   332,    71,   326,   441,
-       3,   105,   106,   977,    89,    90,   778,   542,    43,   345,
-      43,    46,    43,    46,   103,    46,   406,   115,     3,   439,
-      40,   119,     3,   120,    40,     6,    42,   116,   117,    40,
-     536,   359,    48,   118,   119,    43,   426,    57,    54,    40,
-     430,    57,    43,    76,   434,    76,    57,   493,    77,    43,
-     535,   140,   498,    82,   539,    40,     4,   542,     6,    43,
-      76,    89,    90,    52,    53,   837,    40,    89,    90,  1073,
-     103,   995,    57,    89,    90,   430,    42,    40,   563,   453,
-    1084,    47,    71,    72,     3,    48,    89,    90,   104,   547,
-     418,   119,     3,   429,   831,    43,    40,   119,    46,   115,
-       3,   429,    40,   119,    89,    90,    54,    40,    89,    90,
-     126,    40,   115,   129,   442,    40,   119,   453,   134,    49,
-      50,    51,   138,   126,   105,   106,   129,    46,    40,    40,
-     115,   134,   522,    84,   119,   525,    43,    48,    40,    46,
-     923,   126,    40,   926,   129,     3,    57,    54,    40,   543,
-      80,    43,   542,   543,    46,   545,   546,   493,    88,    89,
-      90,   551,   498,   543,   538,     4,   581,     6,   583,   570,
-      89,    90,    43,    43,    40,    46,    46,   543,    89,    90,
-     595,   555,    40,    54,   558,    40,    89,    90,   774,   775,
-      48,   581,   677,   583,   584,     6,   115,   543,   543,   543,
-     119,   546,   538,    43,   115,   595,    46,   597,   119,    40,
-      41,     4,   115,     6,   542,   126,   119,    40,   129,   555,
-      48,   543,   558,   134,    84,    85,    57,   138,   686,    48,
-     543,    89,    90,  1005,  1098,   543,    48,   543,   593,  1103,
-    1104,  1105,   727,    48,   690,   132,   133,   134,   135,   136,
-     543,   116,   543,   543,  1026,    41,  1120,   115,   543,   526,
-     654,   119,   543,   543,   654,   593,    42,   595,   126,   536,
-     543,   129,   543,    43,   654,   721,   802,    46,   784,     6,
-     138,   671,    46,    40,    41,   552,    42,   554,   654,   679,
-     684,   831,    41,    42,   684,   121,   122,   123,   783,   543,
-      57,  1073,    40,    41,   684,   543,    43,   792,   654,   654,
-     654,    41,   702,   703,   704,   705,   671,   732,   684,    57,
-     116,   711,   702,   852,   679,   719,   741,   543,   932,   719,
-     720,   777,   654,    48,   795,    48,   702,   795,   684,   684,
-     684,   654,   732,   543,    21,   746,   654,    42,   654,   739,
-     705,   741,   543,   104,   690,    40,   711,   702,   702,   817,
-     884,   654,   684,   654,   654,   720,   808,    44,   104,   654,
-       7,   684,    41,   654,   654,   817,   684,   823,   684,  1116,
-      41,   654,   116,   654,   830,   721,   776,    49,    50,    51,
-     745,   684,    48,   684,   684,    41,    42,   787,    57,   684,
-      77,    78,    79,   684,   684,    82,    40,    84,    85,   949,
-     654,   684,   802,   684,    52,    53,   654,   745,   746,   686,
-      40,    41,   134,   135,   136,   819,   884,    48,   802,   819,
-     915,    48,   787,    71,    72,   964,   894,    57,   654,   819,
-     684,   777,   884,   833,    41,    42,   684,   837,   933,   839,
-     935,    52,    53,   819,   654,    73,    74,    75,   134,    48,
-     995,   946,   116,   654,    54,   103,   802,    43,   684,    80,
-      71,    72,   930,   819,   819,   819,   934,    88,    89,    90,
-      41,   966,   837,    41,   684,   875,    76,   823,    40,    41,
-      80,    41,     3,   684,   830,     6,   886,   819,    88,    89,
-      90,    41,   103,    54,    42,    57,   819,   774,   775,    41,
-     995,   819,    41,   819,    41,   160,   161,   784,    43,    41,
-      41,    41,    41,    41,   914,   170,   819,   104,   819,   819,
-      41,   798,   799,   800,   819,    42,   116,    41,   819,   819,
-      43,   116,   932,   111,  1029,    76,   819,    46,   819,   943,
-      48,   945,   998,   943,   116,   945,   116,    48,   932,   914,
-     827,    48,   977,    41,    41,    48,    48,   957,   958,   959,
-      43,    43,    48,  1113,    48,   819,  1116,  1023,    89,    90,
-      48,   819,    46,    41,    46,    40,    43,   977,    47,    43,
-      91,    57,    41,  1039,   105,   106,   932,    41,   988,    40,
-      90,    45,    48,   819,    89,   995,    46,    78,    52,   999,
-      41,    41,    48,    48,  1060,  1005,  1074,    42,    42,   819,
-      48,    48,    48,  1069,  1070,  1071,    48,    48,   819,    40,
-      43,  1021,   140,   988,    54,    41,  1026,    47,   103,    62,
-      42,    85,    86,    41,   999,  1091,    41,    41,    40,   977,
-    1005,   296,   297,    43,  1048,   300,    40,    48,  1048,    48,
-      48,    48,   998,    48,    41,    41,    41,   995,  1058,   997,
-     998,  1026,    54,   117,   130,   131,   132,   133,   134,   135,
-     136,    43,    54,  1073,    47,    46,   138,  1023,    47,    47,
-     335,   336,    48,    76,  1084,    76,    76,  1087,    76,    48,
-      41,   145,     3,  1039,   157,   158,    42,  1097,  1098,    43,
-     154,    40,    43,  1103,  1104,  1105,   160,   161,  1073,   163,
-      49,    50,    51,    41,  1060,    54,   170,    54,    41,  1084,
-    1120,   104,  1087,  1069,  1070,  1071,  1003,    43,    48,    40,
-      49,    50,    51,  1098,    40,    54,    76,    48,  1103,  1104,
-    1105,    80,   196,    76,    76,  1091,    57,    76,    47,    88,
-      89,    90,    76,    43,    43,  1120,    43,    76,    43,   104,
-     214,    80,     3,    43,     3,     6,    42,    48,    40,    88,
-      89,    90,    41,    48,    40,    43,   230,    68,    89,    90,
-      43,    40,    47,    41,   238,    40,   240,   241,   242,    41,
-     244,    48,    48,    41,   248,   249,   250,   251,    48,    40,
-      91,    40,    48,    41,   115,    96,    41,    48,   119,   272,
-      41,   274,   275,   276,   277,   278,   279,   280,    57,    41,
-     475,   476,   477,    46,    48,    41,    43,   138,    48,   484,
-     485,    43,   286,   527,   551,   702,   932,  1029,     3,   494,
-     558,   295,   296,   297,   307,   703,   300,   702,    89,    90,
-      89,    90,   522,   802,    21,   702,   702,   453,   597,   568,
-     515,    50,   316,   161,   318,   434,  1003,   330,  1058,   839,
-     333,   958,   170,   576,   115,    40,   115,    44,   119,  1073,
-     119,   335,   336,    48,  1053,   126,   340,   126,   129,   687,
-     129,    -1,    57,   134,   178,    -1,   187,   138,   352,   138,
-      -1,   192,   193,    -1,    -1,   359,    -1,    -1,   199,    -1,
-      77,    78,    79,   204,   368,    82,    83,    84,    85,    -1,
-      -1,    -1,    -1,    -1,    89,    90,    -1,   381,    -1,    -1,
-      -1,   222,    -1,    -1,     3,     4,    -1,     6,    -1,     3,
-      -1,    -1,   233,   234,   242,    -1,   244,    -1,   239,   240,
-     115,   118,   243,    -1,   119,    -1,    -1,    -1,   412,   413,
-     414,    -1,    -1,    -1,   418,   620,   420,   421,    -1,   423,
-      -1,    40,    -1,   138,    43,   429,    40,    46,    -1,    48,
-      -1,    -1,    -1,    -1,    48,     3,    -1,    -1,   107,   108,
-      -1,     3,    -1,    57,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,   130,   131,   132,   133,   134,   135,   136,    -1,    -1,
-      89,    90,    40,   477,    -1,    89,    90,   490,    40,    -1,
-       3,    -1,    -1,    -1,   488,   489,   499,   335,   336,    57,
-     494,    -1,   340,    -1,    -1,   114,   115,     3,    -1,    -1,
-     119,   115,    -1,    -1,    -1,   119,    -1,   126,    -1,    -1,
-     129,   515,    -1,    -1,   518,   134,    -1,    40,    -1,   138,
-      43,    89,    90,    -1,   138,    48,    -1,    89,    90,    -1,
-      -1,   535,    -1,    -1,    40,   539,    -1,    43,   542,    -1,
-      -1,    -1,    48,    -1,    -1,    -1,    -1,   115,    -1,     3,
-      -1,   119,    -1,   115,    -1,    -1,    -1,   119,   562,   563,
-     564,    -1,    -1,   567,   568,     3,    89,    90,    -1,    -1,
-     138,    -1,   420,   421,    -1,   423,   138,   590,   591,   592,
-     593,    -1,    -1,    89,    90,   589,    40,    -1,    -1,    43,
-      -1,   595,   115,    -1,    48,    -1,   119,    -1,    -1,    -1,
-      -1,    -1,    40,   126,    -1,    43,   129,    -1,    -1,   115,
-      48,   134,     3,   119,    -1,   138,    -1,    -1,    -1,    -1,
-     126,    -1,    -1,   129,   628,   629,    -1,    -1,   134,   633,
-      -1,    -1,   138,    -1,   638,    89,    90,    -1,    -1,   643,
-      -1,    -1,    -1,    -1,    -1,    -1,   494,    -1,    -1,    40,
-      -1,    89,    90,    -1,    -1,    -1,    -1,    48,    -1,    -1,
-      -1,   115,    -1,    -1,    -1,   119,    -1,   515,    -1,    -1,
-     518,    -1,   126,   677,    -1,   129,    -1,   115,    -1,    -1,
-     134,   119,   523,    -1,   138,   526,   527,    -1,   126,    -1,
-      -1,   129,    -1,   534,   535,   536,   134,   701,    89,    90,
-     138,    -1,    -1,   707,    -1,     3,    -1,     3,    -1,   722,
-      -1,    -1,    -1,   554,    -1,   556,   564,    -1,    -1,   567,
-      -1,    -1,   563,   727,   115,     3,    -1,    -1,   119,    -1,
-     743,   744,   745,    -1,   747,   126,    -1,    -1,   129,    -1,
-     753,    -1,    40,   134,    40,    -1,    -1,   138,    -1,    -1,
-      48,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    57,
-     764,   765,    40,    -1,    -1,    -1,   770,    -1,    -1,    -1,
-      48,     3,    -1,    -1,    -1,   107,   108,   109,   110,   783,
-     628,   629,    -1,    -1,    -1,   633,    -1,    -1,   792,     3,
-     638,    89,    90,    89,    90,   643,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,    -1,    -1,    -1,    40,    -1,
-      -1,    89,    90,    -1,    -1,    -1,    48,   115,    -1,   115,
-      -1,   119,    -1,   119,    -1,    57,    40,    -1,   126,    -1,
-     126,   129,     3,   129,    48,    -1,   677,   115,   134,   843,
-     138,   119,   138,    -1,   685,    -1,   687,    -1,   126,    -1,
-      -1,   129,    -1,    -1,    -1,    -1,   134,    89,    90,   707,
-     138,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,    40,
-      -1,    -1,    -1,    -1,    -1,    89,    90,    48,   891,   892,
-     884,    -1,    -1,   115,    -1,    -1,    -1,   119,    -1,    -1,
-      -1,     3,    -1,    -1,   126,   899,    -1,   129,    -1,   903,
-     904,   115,    -1,    -1,    40,   119,   138,    -1,    -1,    -1,
-      -1,   915,   126,    -1,    -1,   129,   764,   765,    89,    90,
-     134,    57,   770,     3,   138,    -1,     3,    -1,    40,   933,
-      -1,   935,    -1,   774,   775,    -1,    48,    -1,    -1,   780,
-      -1,   782,   946,   784,   115,    57,   950,    -1,   119,    -1,
-       3,    -1,    -1,    89,    90,   126,    -1,    -1,   129,    -1,
-      40,    -1,   966,    40,    -1,   806,    -1,   138,    48,    -1,
-      -1,    48,    -1,   977,    -1,   979,   980,    89,    90,   115,
-      -1,    -1,    -1,   119,    -1,    -1,    -1,    40,    -1,  1002,
-     126,   995,    -1,   129,   998,    48,    -1,    -1,    -1,    -1,
-      -1,    -1,   138,   115,    -1,    -1,    -1,   119,    -1,    89,
-      90,    -1,    89,    90,  1027,  1019,    -1,    -1,    -1,    -1,
-       6,    -1,    -1,    -1,    -1,  1029,   138,    13,    14,    15,
-      16,    17,    18,    19,    20,   115,    89,    90,   115,   119,
-      -1,    -1,   119,    -1,   107,   108,   109,   110,    -1,  1053,
-      -1,   899,    -1,    -1,    -1,   903,   904,    -1,   138,    -1,
-      -1,   138,   115,    -1,    -1,    -1,   119,   130,   131,   132,
-     133,   134,   135,   136,     1,   916,     3,     4,    -1,    -1,
-      -1,     8,     9,    10,    -1,   138,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    -1,    35,    36,
-      37,    38,    39,    -1,    -1,    -1,    43,    44,    -1,    -1,
-      47,    -1,    49,    50,    51,    52,    53,    -1,    -1,    -1,
-      -1,   979,   980,    -1,    -1,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    -1,
-      77,    78,    79,    -1,    81,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    -1,    -1,    -1,    95,    -1,
-      97,    98,    99,   100,   101,   102,    -1,     3,    -1,    -1,
-       6,    -1,    -1,    -1,    -1,    -1,   113,    -1,   115,    -1,
-      -1,   118,   119,   120,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,    -1,    -1,     6,     7,    -1,
-       3,   138,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    -1,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    -1,    35,    36,    37,    38,
-      39,    40,    -1,    -1,    -1,    -1,    -1,    40,    -1,    48,
-      49,    50,    51,    52,    53,    48,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    89,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    70,    71,    72,    -1,    -1,    -1,    -1,    -1,   105,
-     106,    -1,    -1,    -1,    -1,    -1,    -1,    86,    -1,   115,
-      89,    90,     3,   119,    -1,    -1,    89,    90,    -1,    -1,
-     126,    -1,    -1,   129,    -1,    -1,    -1,    -1,   134,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   115,    -1,    -1,   118,
-     119,    -1,   115,    -1,    -1,    -1,   119,   126,    -1,    40,
-     129,    -1,    -1,   132,   133,   134,    -1,    48,     3,   138,
-     139,     6,     7,    -1,     3,   138,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    -1,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
-      35,    36,    37,    38,    39,    40,    -1,    -1,    89,    90,
-      -1,    40,    -1,    -1,    49,    50,    51,    52,    53,    48,
-      55,    -1,    -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   115,    70,    71,    72,   119,    -1,
-      -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,   129,    -1,
-      -1,    86,    -1,    -1,    89,    90,     3,   138,    -1,     3,
-      89,    90,     6,    -1,    -1,    -1,    -1,    -1,    -1,    13,
-      14,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
-     115,    -1,    -1,    -1,   119,    -1,   115,    -1,    -1,    -1,
-     119,   126,    -1,    40,   129,    -1,    -1,   132,   133,   134,
-      -1,    48,     3,   138,   139,     6,     7,    -1,    41,   138,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      -1,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    -1,    35,    36,    37,    38,    39,    40,
-      -1,    -1,    89,    90,    -1,    89,    90,    -1,    49,    50,
-      51,    52,    53,    -1,    55,    -1,    -1,    58,    -1,    -1,
-      -1,   105,   106,    -1,    -1,    -1,    -1,    -1,   115,    70,
-      71,    72,   119,    -1,   107,   108,   109,   110,    -1,   112,
-      -1,    -1,    -1,    -1,    -1,    86,    -1,    -1,    89,    90,
-      -1,   138,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,    -1,    -1,    22,    23,    24,    25,
-      26,    27,    28,    29,   115,    31,    -1,    33,   119,    -1,
-      36,    37,    38,    39,    -1,   126,    -1,    -1,   129,    -1,
-      -1,   132,   133,   134,    -1,    -1,     3,   138,   139,     6,
-       7,    41,    -1,    -1,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    -1,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    -1,    35,    36,
-      37,    38,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    49,    50,    51,    52,    53,    -1,    55,    -1,
-      -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    71,    72,    -1,   107,   108,   109,
-     110,    -1,   112,    -1,    -1,   107,   108,   109,   110,    86,
-      -1,    -1,    89,    90,    -1,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   129,   130,   131,
-     132,   133,   134,   135,   136,    -1,    -1,    -1,   115,    -1,
-      -1,    -1,   119,    -1,    -1,    -1,    -1,    -1,    -1,   126,
-      -1,    -1,   129,    -1,    -1,   132,   133,   134,    -1,    -1,
-       3,   138,   139,     6,     7,    -1,    43,    -1,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    -1,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    -1,    35,    36,    37,    38,    39,    40,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    49,    50,    51,    52,
-      53,    -1,    55,    -1,    -1,    58,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
-     107,   108,   109,   110,    -1,   112,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    86,    -1,    -1,    89,    90,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   115,    -1,    -1,    -1,   119,    -1,    -1,    -1,
-      -1,    -1,    -1,   126,    -1,    -1,   129,    -1,    -1,   132,
-     133,   134,    -1,    -1,     3,   138,   139,     6,     7,    -1,
-      -1,    -1,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    -1,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    -1,    35,    36,    37,    38,
-      39,    40,    41,    76,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    50,    51,    52,    53,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    70,    71,    72,   107,   108,   109,   110,    -1,   112,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    86,    -1,    -1,
-      89,    90,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   115,    -1,    -1,    -1,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,
-     129,    -1,    -1,   132,   133,   134,    -1,    -1,     3,   138,
-     139,     6,     7,    -1,    -1,    -1,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    -1,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
-      35,    36,    37,    38,    39,    40,    41,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
-      55,   107,   108,   109,   110,    -1,   112,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    70,    71,    72,    -1,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,    86,    -1,    -1,    89,    90,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     115,    -1,    -1,    -1,   119,    -1,    -1,    -1,    -1,    -1,
-      -1,   126,    -1,    -1,   129,    -1,    -1,   132,   133,   134,
-      -1,    -1,     3,   138,   139,     6,     7,    -1,    -1,    -1,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      -1,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    -1,    35,    36,    37,    38,    39,    40,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    49,    50,
-      51,    52,    53,    -1,    55,   107,   108,   109,   110,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,
-      71,    72,    -1,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,    86,    -1,    -1,    89,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   115,    -1,    -1,    -1,   119,    -1,
-      -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,   129,    -1,
-      -1,   132,   133,   134,    -1,    -1,     3,   138,   139,     6,
-       7,    -1,    -1,    -1,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    -1,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    -1,    35,    36,
-      37,    38,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    49,    50,    51,    52,    53,    -1,    55,   107,
-     108,   109,   110,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    71,    72,    -1,    -1,     3,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,    86,
-      -1,    -1,    89,    90,    -1,    -1,    -1,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
-      35,    36,    37,    38,    39,    40,    -1,    -1,   115,    -1,
-      -1,    -1,   119,    48,    49,    50,    51,    52,    53,    -1,
-      -1,    -1,    57,    -1,    -1,   132,   133,   134,    -1,    -1,
-      -1,   138,   139,    -1,    -1,    70,    71,    72,   107,   108,
-     109,   110,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    86,    -1,    -1,    89,    90,    -1,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     115,     3,    -1,   118,   119,    -1,    -1,    -1,    -1,    -1,
-      -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,   134,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    -1,    35,    36,    37,    38,    39,    40,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    48,    49,    50,    51,
-      52,    53,    -1,    -1,    -1,    57,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,
-      72,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    86,    -1,    -1,    89,    90,    -1,
-      -1,    -1,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    37,    38,    39,
-      -1,    -1,    -1,   115,    -1,    -1,   118,   119,    48,    49,
-      50,    51,    52,    53,   126,    -1,    -1,   129,    -1,    -1,
-      -1,    -1,   134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    86,    -1,    -1,    89,
-      90,    -1,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    37,    38,    39,
-      -1,    -1,    -1,    -1,    -1,   115,    -1,    -1,   118,   119,
-      -1,    -1,    52,    53,    -1,    -1,   126,    -1,    -1,   129,
-      -1,    -1,    -1,    -1,   134,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,     0,     1,    -1,     3,     4,    -1,    -1,
-      -1,     8,     9,    10,    -1,    -1,    86,    -1,    -1,    89,
-      90,    -1,    -1,    -1,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    -1,    35,    36,
-      37,    38,    39,    -1,    -1,   115,    43,    44,    -1,   119,
-      -1,    -1,    49,    50,    51,    52,    53,    -1,    -1,    56,
-      -1,    -1,    -1,    -1,   134,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    -1,    -1,    -1,    -1,
-      77,    78,    79,    -1,    81,    82,    -1,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,     1,    -1,     3,     4,
-      -1,    -1,    -1,     8,     9,    10,   113,    -1,   115,    -1,
-      -1,   118,   119,    -1,    -1,    -1,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
-      35,    36,    37,    38,    39,    -1,    -1,    -1,    43,    44,
-      -1,    -1,    47,    -1,    49,    50,    51,    52,    53,    -1,
-      -1,    56,    -1,    -1,    -1,    -1,    -1,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    -1,    -1,
-      -1,    -1,    77,    78,    79,    -1,    81,    82,    -1,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,     1,    -1,
-       3,     4,    -1,    -1,    -1,     8,     9,    10,   113,    -1,
-     115,    -1,    -1,   118,   119,    -1,    -1,    -1,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    -1,    35,    36,    37,    38,    39,    -1,    -1,    -1,
-      43,    44,    -1,    -1,    47,    -1,    49,    50,    51,    52,
-      53,    -1,    -1,    56,    -1,    -1,    -1,    -1,    -1,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      -1,    -1,    -1,    -1,    77,    78,    79,    -1,    81,    82,
-      -1,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-       1,    -1,     3,     4,    -1,    -1,    -1,     8,     9,    10,
-     113,    -1,   115,    -1,    -1,   118,   119,    -1,    -1,    -1,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    -1,    35,    36,    37,    38,    39,    -1,
-      -1,    -1,    43,    44,    -1,    -1,    47,    -1,    49,    50,
-      51,    52,    53,    -1,    -1,    56,    -1,    -1,    -1,    -1,
-      -1,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,
-      81,    82,    -1,    84,    85,    86,    87,    -1,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,     1,    -1,     3,     4,    -1,    -1,    -1,     8,
-       9,    10,   113,    -1,   115,    -1,    -1,   118,   119,    -1,
-      -1,    -1,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    -1,    35,    36,    37,    38,
-      39,    -1,    -1,    -1,    43,    44,    -1,    -1,    -1,    -1,
-      49,    50,    51,    52,    53,    -1,    -1,    56,    -1,    -1,
-      -1,    60,    -1,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    -1,    -1,    -1,    -1,    77,    78,
-      79,    -1,    81,    82,    -1,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,     1,    -1,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,    -1,   115,    -1,    -1,   118,
-     119,    -1,    -1,    -1,    -1,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    -1,    35,    36,
-      37,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    48,    49,    50,    51,    52,    53,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    71,    72,     1,    -1,     3,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    86,
-      -1,    -1,    89,    90,    -1,    -1,    -1,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
-      35,    36,    37,    38,    39,    -1,    -1,    -1,   115,    -1,
-      -1,   118,   119,    48,    49,    50,    51,    52,    53,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    70,    71,    72,     1,    -1,
-       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    86,    -1,    -1,    89,    90,    -1,    -1,    -1,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    -1,    35,    36,    37,    38,    39,    -1,    -1,    -1,
-     115,    -1,    -1,   118,   119,    -1,    49,    50,    51,    52,
-      53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
-      -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    86,    -1,    -1,    89,    90,    -1,    -1,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    -1,    35,    36,    37,    38,    39,   107,   108,
-     109,   110,   115,   112,    -1,    -1,   119,    49,    50,    51,
-      52,    53,    -1,    -1,    -1,    -1,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,    70,    71,
-      72,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    86,    87,    -1,    89,    90,    -1,
-      -1,    -1,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    37,    38,    39,
-      -1,    -1,    -1,   115,    -1,    -1,    -1,   119,   120,    49,
-      50,    51,    52,    53,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,    -1,    -1,    -1,    -1,    -1,     3,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    86,    87,    13,    89,
-      90,    -1,    -1,    -1,    -1,    -1,    -1,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
-      35,    36,    37,    38,    39,   115,    -1,    -1,    -1,   119,
-     120,    -1,    -1,    48,    49,    50,    51,    52,    53,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    70,    71,    72,    -1,    -1,
-       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    86,    -1,    -1,    89,    90,    -1,    -1,    -1,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    -1,    35,    36,    37,    38,    39,    -1,    -1,    -1,
-     115,    -1,    -1,   118,   119,    48,    49,    50,    51,    52,
-      53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
-      -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    86,    -1,    -1,    89,    90,    -1,    -1,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    -1,    35,    36,    37,    38,    39,    40,    -1,
-      -1,    -1,   115,    -1,    -1,   118,   119,    49,    50,    51,
-      52,    53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,
-      72,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    86,    -1,    -1,    89,    90,    -1,
-      -1,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    -1,    35,    36,    37,    38,    39,   107,
-     108,   109,   110,   115,   112,    -1,    -1,   119,    49,    50,
-      51,    52,    53,    -1,    -1,    -1,    -1,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,    70,
-      71,    72,    -1,     3,    -1,    -1,    -1,    58,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    86,    87,    -1,    89,    90,
-      -1,    -1,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    37,    38,    39,
-      -1,    -1,    -1,    -1,   115,    -1,    -1,    -1,   119,    49,
-      50,    51,    52,    53,    -1,    -1,   107,   108,   109,   110,
-      -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,     3,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,    86,    -1,    -1,    89,
-      90,    -1,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    37,    38,    39,
-      -1,    -1,    -1,    -1,    -1,   115,    -1,    -1,    -1,   119,
-      -1,    -1,    52,    53,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    71,    72,     3,    58,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    86,    -1,    -1,    89,
-      90,    -1,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    37,    38,    39,
-      -1,   107,   108,   109,   110,   115,   112,    -1,    -1,   119,
-      -1,    -1,    -1,   107,   108,   109,   110,    -1,   112,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   125,   126,   127,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,    -1,    -1,    -1,    86,    -1,    -1,    89,
-      90,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   115,    -1,    -1,    -1,   119
-};
-
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint16 yystos[] =
-{
-       0,   121,   122,   123,   142,   143,   311,     1,     3,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    35,    36,    37,    38,    39,    48,    49,    50,    51,
-      52,    53,    70,    71,    72,    86,    89,    90,   115,   118,
-     119,   193,   236,   250,   251,   253,   254,   255,   256,   257,
-     258,   283,   284,   296,   299,   301,     1,   236,     1,    40,
-       0,     1,     4,     8,     9,    10,    21,    43,    44,    56,
-      62,    63,    64,    65,    66,    67,    68,    69,    77,    78,
-      79,    81,    82,    84,    85,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   113,   118,   144,
-     145,   146,   148,   149,   150,   151,   152,   155,   156,   158,
-     159,   160,   161,   162,   163,   164,   167,   168,   169,   172,
-     174,   179,   180,   181,   182,   184,   188,   195,   196,   197,
-     198,   199,   203,   204,   211,   212,   223,   231,   232,   311,
-      48,    52,    71,    48,    48,    40,   140,   103,   103,   295,
-     299,    43,   254,   250,    40,    48,    54,    57,    76,   119,
-     126,   129,   134,   138,   241,   242,   244,   246,   247,   248,
-     249,   299,   311,   250,   257,   299,   295,   117,   140,   300,
-      43,    43,   233,   234,   236,   311,   120,    40,     6,    85,
-     118,   305,    40,   308,   311,     1,   252,   253,   296,    40,
-     308,    40,   166,   311,    40,    40,    84,    85,    40,    84,
-      77,    82,    44,    77,    92,   299,    46,   296,   299,    40,
-       4,    46,    40,    40,    43,    46,     4,   305,    40,   178,
-     252,   176,   178,    40,    40,   305,    40,   103,   284,   308,
-      40,   126,   129,   244,   249,   299,    21,    85,    87,   193,
-     252,   284,    48,    48,    48,   299,   118,   119,   301,   302,
-     284,     7,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    40,    55,   126,   129,   132,   133,   134,   138,
-     139,   236,   237,   238,   240,   252,   253,   269,   270,   271,
-     272,   305,   306,   311,   250,    40,   126,   129,   233,   247,
-     249,   299,    48,    46,   105,   106,   259,   260,   261,   262,
-     263,    58,   269,   270,   269,     3,    40,    48,   138,   245,
-     248,   299,    48,   245,   248,   249,   250,   299,   241,    40,
-      57,   241,    40,    57,    48,   126,   129,   245,   248,   299,
-     116,   301,   119,   302,    41,    42,   235,   311,   261,   296,
-     297,   305,   284,     6,    46,   297,   309,   297,    43,    40,
-     244,    54,    41,   297,    52,    53,    71,   285,   286,   311,
-     296,   296,   297,    13,   173,   233,   233,   299,    43,    54,
-     214,    54,    46,   296,   175,   309,   296,   233,    46,   243,
-     244,   247,   311,    43,    42,   177,   311,   297,   298,   311,
-     153,   154,   305,   233,   207,   208,   209,   236,   283,   311,
-     299,   305,   126,   129,   249,   296,   299,   309,    40,   297,
-     126,   129,   299,   116,   244,   299,   264,   296,   311,    40,
-     244,    76,   275,   276,   299,   311,    48,    48,    41,   296,
-     300,   104,   269,    40,    48,   269,   269,   269,   269,   269,
-     269,   269,   104,    42,   239,   311,    40,   107,   108,   109,
-     110,   112,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,     7,   126,   129,   249,   299,   246,
-     299,   246,    41,    41,   126,   129,   246,   299,   116,    48,
-      57,   269,    58,    40,   249,   299,    48,   299,    40,    57,
-      48,   249,   233,    58,   269,   233,    58,   269,    48,    48,
-     245,   248,    48,   245,   248,   116,    48,   126,   129,   245,
-     300,    43,   236,    41,   299,   183,    42,    54,    41,   241,
-     259,    41,   299,    41,    54,    41,    42,   171,    42,    41,
-      41,    43,   252,   143,   299,   213,    41,    41,    41,    41,
-     176,   178,    41,    41,    42,    46,    41,   104,    42,   210,
-     311,    59,   116,    41,   249,   299,    43,   116,   111,    54,
-      76,   194,   311,   233,   299,    80,    88,    89,    90,   186,
-     241,   250,   288,   289,   277,    46,    43,   275,   295,   284,
-      41,   126,   129,   134,   249,   252,    48,   240,   269,   269,
-     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
-     269,   269,   269,   269,   269,   299,   116,    41,    41,    41,
-     116,   246,   246,   269,   233,   245,   299,    41,   116,    48,
-     233,    58,   269,    48,    41,    58,    41,    58,    48,    48,
-      48,    48,   126,   129,   245,   248,    48,    48,    48,   245,
-     235,     4,    46,   305,   143,   309,   153,   271,   305,   310,
-      43,    43,    46,     4,   165,   305,     4,    43,    46,   114,
-     170,   244,   305,   307,   297,   305,   310,    41,   236,   244,
-      46,   243,    47,    43,   143,    44,   232,   176,    43,    46,
-      40,    47,   177,   115,   119,   296,   303,    43,   309,   236,
-     170,    91,   205,   209,   157,   244,   305,   116,    30,    32,
-      35,   187,   255,   256,   299,    57,   189,   254,    43,    46,
-      41,    40,    40,   288,    90,    89,     1,    42,    43,    46,
-     185,   241,   289,   241,    78,   278,   279,   287,   311,   201,
-      46,   299,   269,    41,    41,   134,   250,    41,   126,   129,
-     242,    48,   239,    76,    41,    58,    41,    41,   245,   245,
-      41,    58,   245,   245,    48,    48,    48,    48,    48,   245,
-      48,    48,    48,    47,    42,    42,   147,    40,   250,   289,
-     290,   311,    54,    41,    42,   171,   170,   244,   290,    43,
-      47,   305,   252,   296,    43,    54,   307,   233,   140,   117,
-     140,   304,   103,    41,    47,   299,    44,    83,   118,   184,
-     199,   203,   204,   206,   220,   222,   224,   232,   210,   143,
-     290,    43,   186,    40,    46,   190,   150,   265,   266,   311,
-      40,    54,   289,   290,   291,   233,   269,   244,   241,    42,
-      73,    74,    75,   280,   282,     1,    43,    66,    73,    74,
-      75,    78,   138,   148,   149,   150,   151,   155,   156,   160,
-     162,   164,   167,   169,   172,   174,   179,   180,   181,   182,
-     199,   203,   204,   211,   215,   219,   220,   221,   222,   223,
-     224,   225,   226,   229,   232,   311,   200,   241,   269,   269,
-     269,    41,    41,    41,    40,   269,    41,   245,   245,    48,
-      48,    48,   245,    48,    48,   309,   309,   215,   233,   289,
-     170,   305,   310,    43,   244,    41,   290,    43,   244,    43,
-     178,    41,   119,   296,   296,   119,   296,   237,     4,    46,
-      54,    40,   103,    87,   120,   252,    60,    43,   185,   233,
-      40,    43,   191,   267,   296,    42,    47,   233,   259,    54,
-      76,   292,   311,    41,    41,   186,   279,   299,   281,   218,
-      46,    76,    76,    76,   138,   301,    47,   215,    30,    32,
-      35,   230,   256,   299,   215,   269,   269,   252,   245,    48,
-      48,   245,   245,    47,    41,   171,   290,    43,   244,   170,
-      43,    43,   304,   304,   104,   252,   207,   252,    40,    41,
-     192,   265,    54,   265,    43,   244,    41,    43,   261,   293,
-     294,   299,    43,    46,   185,    48,   273,   274,   311,   287,
-     215,   216,   301,    40,    43,   202,   244,    76,    43,    47,
-     242,   245,   245,    43,    43,   290,    43,   243,   104,    40,
-     126,   129,   249,   233,   290,    43,   268,   269,   267,   186,
-      43,    46,    43,    42,    48,    40,    46,    48,   299,   215,
-      40,   233,   186,   269,   202,    41,    43,    43,   233,    40,
-      40,    40,   129,    41,   111,   190,   265,   185,   294,    48,
-      48,   274,    47,   233,    41,   185,    43,    41,   233,   233,
-     233,    40,   291,   252,   191,    48,    48,   217,    41,   227,
-     290,   228,   290,    41,    41,    41,   233,   190,    48,   215,
-     228,    43,    46,    54,    43,    46,    54,   228,   228,   228,
-      41,   191,    48,   261,   259,   228,    43,    43
-};
-
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
-{
-       0,   141,   142,   142,   142,   142,   142,   142,   142,   143,
-     143,   144,   144,   144,   144,   144,   144,   144,   145,   145,
-     145,   145,   145,   145,   145,   145,   145,   145,   145,   145,
-     145,   145,   145,   145,   145,   145,   145,   145,   145,   147,
-     146,   148,   149,   150,   150,   150,   151,   151,   152,   152,
-     152,   152,   153,   154,   154,   155,   155,   155,   157,   156,
-     158,   158,   159,   159,   160,   160,   160,   160,   161,   162,
-     162,   163,   163,   164,   164,   165,   165,   166,   166,   167,
-     167,   167,   168,   168,   169,   169,   169,   169,   169,   169,
-     169,   169,   170,   170,   170,   171,   171,   172,   173,   173,
-     174,   174,   174,   175,   176,   177,   177,   178,   178,   178,
-     179,   180,   181,   182,   182,   182,   183,   182,   182,   182,
-     182,   184,   184,   185,   185,   185,   185,   186,   186,   186,
-     186,   187,   187,   187,   187,   187,   187,   188,   188,   188,
-     189,   190,   191,   192,   191,   193,   193,   193,   194,   194,
-     195,   196,   196,   197,   198,   198,   198,   198,   198,   198,
-     200,   199,   201,   199,   202,   202,   203,   205,   204,   204,
-     204,   206,   206,   206,   206,   206,   206,   206,   207,   208,
-     208,   209,   209,   210,   210,   211,   211,   213,   212,   214,
-     212,   212,   215,   216,   217,   215,   215,   215,   218,   215,
-     219,   219,   219,   219,   219,   219,   219,   219,   219,   219,
-     219,   219,   219,   219,   219,   219,   219,   219,   219,   220,
-     221,   221,   222,   222,   222,   222,   222,   223,   224,   225,
-     225,   225,   226,   226,   226,   226,   226,   226,   226,   226,
-     226,   226,   226,   227,   227,   227,   228,   228,   228,   229,
-     230,   230,   230,   230,   230,   231,   232,   232,   232,   232,
-     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
-     232,   232,   232,   232,   232,   232,   233,   234,   234,   235,
-     235,   236,   236,   236,   237,   238,   238,   239,   239,   240,
-     240,   241,   241,   241,   241,   241,   242,   242,   242,   243,
-     243,   243,   244,   244,   244,   244,   244,   244,   244,   244,
-     244,   244,   244,   244,   244,   244,   244,   244,   244,   244,
-     244,   244,   244,   244,   245,   245,   245,   245,   245,   245,
-     245,   245,   246,   246,   246,   246,   246,   246,   246,   246,
-     246,   246,   247,   247,   247,   247,   247,   247,   247,   247,
-     247,   247,   247,   247,   247,   247,   248,   248,   248,   248,
-     248,   248,   248,   249,   249,   249,   249,   250,   250,   251,
-     251,   251,   252,   253,   253,   253,   253,   254,   254,   254,
-     254,   254,   254,   254,   254,   255,   256,   257,   257,   258,
-     258,   258,   258,   258,   258,   258,   258,   258,   258,   258,
-     258,   258,   258,   260,   259,   259,   261,   261,   262,   263,
-     264,   264,   265,   265,   266,   266,   266,   266,   267,   267,
-     268,   269,   269,   270,   270,   270,   270,   270,   270,   270,
-     270,   270,   270,   270,   270,   270,   270,   270,   270,   270,
-     270,   271,   271,   271,   271,   271,   271,   271,   271,   272,
-     272,   272,   272,   272,   272,   272,   272,   272,   272,   272,
-     272,   272,   272,   272,   272,   272,   272,   272,   272,   272,
-     272,   273,   274,   274,   275,   277,   276,   276,   278,   278,
-     280,   279,   281,   279,   282,   282,   282,   283,   283,   283,
-     283,   284,   284,   284,   285,   285,   285,   286,   286,   287,
-     287,   288,   288,   288,   288,   289,   289,   289,   289,   289,
-     290,   290,   290,   290,   291,   291,   291,   291,   291,   291,
-     292,   292,   293,   293,   293,   293,   294,   294,   295,   296,
-     296,   296,   297,   297,   297,   298,   298,   299,   299,   299,
-     299,   299,   299,   299,   300,   300,   300,   300,   301,   301,
-     302,   302,   303,   303,   303,   303,   303,   303,   304,   304,
-     304,   304,   305,   305,   306,   306,   307,   307,   307,   308,
-     308,   309,   309,   309,   309,   309,   309,   310,   310,   311
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     3,     2,     3,     2,     5,     3,     2,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       8,     5,     3,     5,     5,     3,     2,     2,     5,     2,
-       5,     2,     4,     1,     1,     7,     7,     5,     0,     7,
-       1,     1,     2,     2,     1,     5,     5,     5,     3,     4,
-       3,     7,     8,     5,     3,     1,     1,     3,     1,     4,
-       7,     6,     1,     1,     7,     9,     8,    10,     5,     7,
-       6,     8,     1,     1,     5,     4,     5,     7,     1,     3,
-       6,     6,     8,     1,     2,     3,     1,     2,     3,     6,
-       5,     9,     2,     1,     1,     1,     0,     6,     1,     6,
-      10,     5,     7,     1,     4,     1,     1,     1,     2,     2,
-       3,     1,     1,     1,     1,     1,     1,    11,    13,     7,
-       1,     1,     1,     0,     3,     1,     2,     2,     2,     1,
-       5,     8,    10,     6,     1,     1,     1,     1,     1,     1,
-       0,     9,     0,     8,     1,     3,     4,     0,     6,     3,
-       4,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       1,     1,     1,     3,     1,     3,     4,     0,     6,     0,
-       5,     5,     2,     0,     0,     7,     1,     1,     0,     3,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     6,
-       6,     7,     8,     8,     8,     9,     7,     5,     2,     2,
-       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     4,     2,     2,     4,     2,     5,
-       1,     1,     1,     1,     1,     2,     1,     1,     2,     2,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
-       1,     2,     2,     2,     2,     1,     1,     2,     1,     3,
-       1,     2,     7,     3,     1,     2,     1,     3,     1,     1,
-       1,     2,     5,     2,     2,     1,     2,     2,     1,     1,
-       1,     1,     2,     3,     3,     1,     2,     2,     3,     4,
-       5,     4,     5,     6,     6,     4,     5,     5,     6,     7,
-       8,     8,     7,     7,     1,     2,     3,     4,     5,     3,
-       4,     4,     1,     2,     4,     4,     4,     5,     3,     4,
-       4,     5,     1,     2,     2,     2,     3,     3,     1,     2,
-       2,     1,     1,     2,     3,     4,     3,     4,     2,     3,
-       3,     4,     3,     3,     2,     2,     1,     1,     2,     1,
-       1,     1,     1,     2,     1,     2,     3,     1,     1,     1,
-       2,     1,     1,     2,     1,     4,     1,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     5,     3,     3,     1,     1,     3,
-       1,     1,     1,     1,     1,     5,     8,     1,     1,     1,
-       1,     3,     4,     5,     5,     5,     6,     6,     2,     2,
-       2,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     5,     2,     2,     2,     2,
-       2,     3,     1,     1,     1,     0,     3,     1,     1,     3,
-       0,     4,     0,     6,     1,     1,     1,     1,     1,     4,
-       4,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     2,     4,     1,     1,     2,     4,
-       1,     1,     2,     1,     3,     3,     4,     4,     3,     4,
-       2,     1,     1,     3,     4,     6,     2,     2,     3,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     4,     1,
-       3,     1,     2,     3,     3,     2,     2,     2,     1,     2,
-       1,     3,     2,     4,     1,     3,     1,     3,     3,     2,
-       2,     2,     2,     1,     2,     1,     1,     1,     1,     3,
-       1,     3,     5,     1,     3,     3,     5,     1,     1,     0
-};
-
-
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
-
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (0)
-
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (0)
-
-
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
-
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-{
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  YYUSE (yytype);
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-{
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
-
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
-{
-  unsigned long int yylno = yyrline[yyrule];
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
-      YYFPRINTF (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-yystrlen (const char *yystr)
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
-{
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-{
-  YYUSE (yyvaluep);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-}
-
-
-
-
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-int
-yyparse (void)
-{
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex ();
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     '$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-#line 1521 "parser.y" /* yacc.c:1646  */
-    {
-                   if (!classes) classes = NewHash();
-		   Setattr((yyvsp[0].node),"classes",classes); 
-		   Setattr((yyvsp[0].node),"name",ModuleName);
-		   
-		   if ((!module_node) && ModuleName) {
-		     module_node = new_node("module");
-		     Setattr(module_node,"name",ModuleName);
-		   }
-		   Setattr((yyvsp[0].node),"module",module_node);
-	           top = (yyvsp[0].node);
-               }
-#line 4493 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 3:
-#line 1533 "parser.y" /* yacc.c:1646  */
-    {
-                 top = Copy(Getattr((yyvsp[-1].p),"type"));
-		 Delete((yyvsp[-1].p));
-               }
-#line 4502 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 4:
-#line 1537 "parser.y" /* yacc.c:1646  */
-    {
-                 top = 0;
-               }
-#line 4510 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 5:
-#line 1540 "parser.y" /* yacc.c:1646  */
-    {
-                 top = (yyvsp[-1].p);
-               }
-#line 4518 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 6:
-#line 1543 "parser.y" /* yacc.c:1646  */
-    {
-                 top = 0;
-               }
-#line 4526 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 7:
-#line 1546 "parser.y" /* yacc.c:1646  */
-    {
-                 top = (yyvsp[-2].pl);
-               }
-#line 4534 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 8:
-#line 1549 "parser.y" /* yacc.c:1646  */
-    {
-                 top = 0;
-               }
-#line 4542 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 9:
-#line 1554 "parser.y" /* yacc.c:1646  */
-    {  
-                   /* add declaration to end of linked list (the declaration isn't always a single declaration, sometimes it is a linked list itself) */
-                   appendChild((yyvsp[-1].node),(yyvsp[0].node));
-                   (yyval.node) = (yyvsp[-1].node);
-               }
-#line 4552 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 10:
-#line 1559 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = new_node("top");
-               }
-#line 4560 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 11:
-#line 1564 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4566 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 12:
-#line 1565 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4572 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 13:
-#line 1566 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4578 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 14:
-#line 1567 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 4584 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 15:
-#line 1568 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.node) = 0;
-		  if (cparse_unknown_directive) {
-		      Swig_error(cparse_file, cparse_line, "Unknown directive '%s'.\n", cparse_unknown_directive);
-		  } else {
-		      Swig_error(cparse_file, cparse_line, "Syntax error in input(1).\n");
-		  }
-		  exit(1);
-               }
-#line 4598 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 16:
-#line 1578 "parser.y" /* yacc.c:1646  */
-    { 
-                  if ((yyval.node)) {
-   		      add_symbols((yyval.node));
-                  }
-                  (yyval.node) = (yyvsp[0].node); 
-	       }
-#line 4609 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 17:
-#line 1594 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.node) = 0;
-                  skip_decl();
-               }
-#line 4618 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 18:
-#line 1604 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4624 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 19:
-#line 1605 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4630 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 20:
-#line 1606 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4636 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 21:
-#line 1607 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4642 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 22:
-#line 1608 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4648 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 23:
-#line 1609 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4654 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 24:
-#line 1610 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4660 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 25:
-#line 1611 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4666 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 26:
-#line 1612 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4672 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 27:
-#line 1613 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4678 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 28:
-#line 1614 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4684 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 29:
-#line 1615 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4690 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 30:
-#line 1616 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4696 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 31:
-#line 1617 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4702 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 32:
-#line 1618 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4708 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 33:
-#line 1619 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4714 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 34:
-#line 1620 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4720 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 35:
-#line 1621 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4726 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 36:
-#line 1622 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4732 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 37:
-#line 1623 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4738 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 38:
-#line 1624 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 4744 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 39:
-#line 1631 "parser.y" /* yacc.c:1646  */
-    {
-               Node *cls;
-	       String *clsname;
-	       extendmode = 1;
-	       cplus_mode = CPLUS_PUBLIC;
-	       if (!classes) classes = NewHash();
-	       if (!classes_typedefs) classes_typedefs = NewHash();
-	       clsname = make_class_name((yyvsp[-1].str));
-	       cls = Getattr(classes,clsname);
-	       if (!cls) {
-	         cls = Getattr(classes_typedefs, clsname);
-		 if (!cls) {
-		   /* No previous definition. Create a new scope */
-		   Node *am = Getattr(Swig_extend_hash(),clsname);
-		   if (!am) {
-		     Swig_symbol_newscope();
-		     Swig_symbol_setscopename((yyvsp[-1].str));
-		     prev_symtab = 0;
-		   } else {
-		     prev_symtab = Swig_symbol_setscope(Getattr(am,"symtab"));
-		   }
-		   current_class = 0;
-		 } else {
-		   /* Previous typedef class definition.  Use its symbol table.
-		      Deprecated, just the real name should be used. 
-		      Note that %extend before the class typedef never worked, only %extend after the class typdef. */
-		   prev_symtab = Swig_symbol_setscope(Getattr(cls, "symtab"));
-		   current_class = cls;
-		   SWIG_WARN_NODE_BEGIN(cls);
-		   Swig_warning(WARN_PARSE_EXTEND_NAME, cparse_file, cparse_line, "Deprecated %%extend name used - the %s name '%s' should be used instead of the typedef name '%s'.\n", Getattr(cls, "kind"), SwigType_namestr(Getattr(cls, "name")), (yyvsp[-1].str));
-		   SWIG_WARN_NODE_END(cls);
-		 }
-	       } else {
-		 /* Previous class definition.  Use its symbol table */
-		 prev_symtab = Swig_symbol_setscope(Getattr(cls,"symtab"));
-		 current_class = cls;
-	       }
-	       Classprefix = NewString((yyvsp[-1].str));
-	       Namespaceprefix= Swig_symbol_qualifiedscopename(0);
-	       Delete(clsname);
-	     }
-#line 4790 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 40:
-#line 1671 "parser.y" /* yacc.c:1646  */
-    {
-               String *clsname;
-	       extendmode = 0;
-               (yyval.node) = new_node("extend");
-	       Setattr((yyval.node),"symtab",Swig_symbol_popscope());
-	       if (prev_symtab) {
-		 Swig_symbol_setscope(prev_symtab);
-	       }
-	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-               clsname = make_class_name((yyvsp[-4].str));
-	       Setattr((yyval.node),"name",clsname);
-
-	       mark_nodes_as_extend((yyvsp[-1].node));
-	       if (current_class) {
-		 /* We add the extension to the previously defined class */
-		 appendChild((yyval.node), (yyvsp[-1].node));
-		 appendChild(current_class,(yyval.node));
-	       } else {
-		 /* We store the extensions in the extensions hash */
-		 Node *am = Getattr(Swig_extend_hash(),clsname);
-		 if (am) {
-		   /* Append the members to the previous extend methods */
-		   appendChild(am, (yyvsp[-1].node));
-		 } else {
-		   appendChild((yyval.node), (yyvsp[-1].node));
-		   Setattr(Swig_extend_hash(),clsname,(yyval.node));
-		 }
-	       }
-	       current_class = 0;
-	       Delete(Classprefix);
-	       Delete(clsname);
-	       Classprefix = 0;
-	       prev_symtab = 0;
-	       (yyval.node) = 0;
-
-	     }
-#line 4831 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 41:
-#line 1713 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.node) = new_node("apply");
-                    Setattr((yyval.node),"pattern",Getattr((yyvsp[-3].p),"pattern"));
-		    appendChild((yyval.node),(yyvsp[-1].p));
-               }
-#line 4841 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 42:
-#line 1723 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = new_node("clear");
-		 appendChild((yyval.node),(yyvsp[-1].p));
-               }
-#line 4850 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 43:
-#line 1734 "parser.y" /* yacc.c:1646  */
-    {
-		   if (((yyvsp[-1].dtype).type != T_ERROR) && ((yyvsp[-1].dtype).type != T_SYMBOL)) {
-		     SwigType *type = NewSwigType((yyvsp[-1].dtype).type);
-		     (yyval.node) = new_node("constant");
-		     Setattr((yyval.node),"name",(yyvsp[-3].id));
-		     Setattr((yyval.node),"type",type);
-		     Setattr((yyval.node),"value",(yyvsp[-1].dtype).val);
-		     if ((yyvsp[-1].dtype).rawval) Setattr((yyval.node),"rawval", (yyvsp[-1].dtype).rawval);
-		     Setattr((yyval.node),"storage","%constant");
-		     SetFlag((yyval.node),"feature:immutable");
-		     add_symbols((yyval.node));
-		     Delete(type);
-		   } else {
-		     if ((yyvsp[-1].dtype).type == T_ERROR) {
-		       Swig_warning(WARN_PARSE_UNSUPPORTED_VALUE,cparse_file,cparse_line,"Unsupported constant value (ignored)\n");
-		     }
-		     (yyval.node) = 0;
-		   }
-
-	       }
-#line 4875 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 44:
-#line 1755 "parser.y" /* yacc.c:1646  */
-    {
-		 if (((yyvsp[-1].dtype).type != T_ERROR) && ((yyvsp[-1].dtype).type != T_SYMBOL)) {
-		   SwigType_push((yyvsp[-3].type),(yyvsp[-2].decl).type);
-		   /* Sneaky callback function trick */
-		   if (SwigType_isfunction((yyvsp[-3].type))) {
-		     SwigType_add_pointer((yyvsp[-3].type));
-		   }
-		   (yyval.node) = new_node("constant");
-		   Setattr((yyval.node),"name",(yyvsp[-2].decl).id);
-		   Setattr((yyval.node),"type",(yyvsp[-3].type));
-		   Setattr((yyval.node),"value",(yyvsp[-1].dtype).val);
-		   if ((yyvsp[-1].dtype).rawval) Setattr((yyval.node),"rawval", (yyvsp[-1].dtype).rawval);
-		   Setattr((yyval.node),"storage","%constant");
-		   SetFlag((yyval.node),"feature:immutable");
-		   add_symbols((yyval.node));
-		 } else {
-		     if ((yyvsp[-1].dtype).type == T_ERROR) {
-		       Swig_warning(WARN_PARSE_UNSUPPORTED_VALUE,cparse_file,cparse_line,"Unsupported constant value\n");
-		     }
-		   (yyval.node) = 0;
-		 }
-               }
-#line 4902 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 45:
-#line 1777 "parser.y" /* yacc.c:1646  */
-    {
-		 Swig_warning(WARN_PARSE_BAD_VALUE,cparse_file,cparse_line,"Bad constant value (ignored).\n");
-		 (yyval.node) = 0;
-	       }
-#line 4911 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 46:
-#line 1788 "parser.y" /* yacc.c:1646  */
-    {
-		 char temp[64];
-		 Replace((yyvsp[0].str),"$file",cparse_file, DOH_REPLACE_ANY);
-		 sprintf(temp,"%d", cparse_line);
-		 Replace((yyvsp[0].str),"$line",temp,DOH_REPLACE_ANY);
-		 Printf(stderr,"%s\n", (yyvsp[0].str));
-		 Delete((yyvsp[0].str));
-                 (yyval.node) = 0;
-	       }
-#line 4925 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 47:
-#line 1797 "parser.y" /* yacc.c:1646  */
-    {
-		 char temp[64];
-		 String *s = (yyvsp[0].str);
-		 Replace(s,"$file",cparse_file, DOH_REPLACE_ANY);
-		 sprintf(temp,"%d", cparse_line);
-		 Replace(s,"$line",temp,DOH_REPLACE_ANY);
-		 Printf(stderr,"%s\n", s);
-		 Delete(s);
-                 (yyval.node) = 0;
-               }
-#line 4940 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 48:
-#line 1816 "parser.y" /* yacc.c:1646  */
-    {
-                    skip_balanced('{','}');
-		    (yyval.node) = 0;
-		    Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-	       }
-#line 4950 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 49:
-#line 1822 "parser.y" /* yacc.c:1646  */
-    {
-                    skip_balanced('{','}');
-		    (yyval.node) = 0;
-		    Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-               }
-#line 4960 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 50:
-#line 1828 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = 0;
-		 Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-               }
-#line 4969 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 51:
-#line 1833 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = 0;
-		 Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-	       }
-#line 4978 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 52:
-#line 1840 "parser.y" /* yacc.c:1646  */
-    {		 
-                 (yyval.node) = NewHash();
-                 Setattr((yyval.node),"value",(yyvsp[-3].str));
-		 Setattr((yyval.node),"type",Getattr((yyvsp[-1].p),"type"));
-               }
-#line 4988 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 53:
-#line 1847 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = NewHash();
-                 Setattr((yyval.node),"value",(yyvsp[0].str));
-              }
-#line 4997 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 54:
-#line 1851 "parser.y" /* yacc.c:1646  */
-    {
-                (yyval.node) = (yyvsp[0].node);
-              }
-#line 5005 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 55:
-#line 1864 "parser.y" /* yacc.c:1646  */
-    {
-                   Hash *p = (yyvsp[-2].node);
-		   (yyval.node) = new_node("fragment");
-		   Setattr((yyval.node),"value",Getattr((yyvsp[-4].node),"value"));
-		   Setattr((yyval.node),"type",Getattr((yyvsp[-4].node),"type"));
-		   Setattr((yyval.node),"section",Getattr(p,"name"));
-		   Setattr((yyval.node),"kwargs",nextSibling(p));
-		   Setattr((yyval.node),"code",(yyvsp[0].str));
-                 }
-#line 5019 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 56:
-#line 1873 "parser.y" /* yacc.c:1646  */
-    {
-		   Hash *p = (yyvsp[-2].node);
-		   String *code;
-                   skip_balanced('{','}');
-		   (yyval.node) = new_node("fragment");
-		   Setattr((yyval.node),"value",Getattr((yyvsp[-4].node),"value"));
-		   Setattr((yyval.node),"type",Getattr((yyvsp[-4].node),"type"));
-		   Setattr((yyval.node),"section",Getattr(p,"name"));
-		   Setattr((yyval.node),"kwargs",nextSibling(p));
-		   Delitem(scanner_ccode,0);
-		   Delitem(scanner_ccode,DOH_END);
-		   code = Copy(scanner_ccode);
-		   Setattr((yyval.node),"code",code);
-		   Delete(code);
-                 }
-#line 5039 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 57:
-#line 1888 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = new_node("fragment");
-		   Setattr((yyval.node),"value",Getattr((yyvsp[-2].node),"value"));
-		   Setattr((yyval.node),"type",Getattr((yyvsp[-2].node),"type"));
-		   Setattr((yyval.node),"emitonly","1");
-		 }
-#line 5050 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 58:
-#line 1901 "parser.y" /* yacc.c:1646  */
-    {
-                     (yyvsp[-3].loc).filename = Copy(cparse_file);
-		     (yyvsp[-3].loc).line = cparse_line;
-		     scanner_set_location((yyvsp[-1].str),1);
-                     if ((yyvsp[-2].node)) { 
-		       String *maininput = Getattr((yyvsp[-2].node), "maininput");
-		       if (maininput)
-		         scanner_set_main_input_file(NewString(maininput));
-		     }
-               }
-#line 5065 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 59:
-#line 1910 "parser.y" /* yacc.c:1646  */
-    {
-                     String *mname = 0;
-                     (yyval.node) = (yyvsp[-1].node);
-		     scanner_set_location((yyvsp[-6].loc).filename,(yyvsp[-6].loc).line+1);
-		     if (strcmp((yyvsp[-6].loc).type,"include") == 0) set_nodeType((yyval.node),"include");
-		     if (strcmp((yyvsp[-6].loc).type,"import") == 0) {
-		       mname = (yyvsp[-5].node) ? Getattr((yyvsp[-5].node),"module") : 0;
-		       set_nodeType((yyval.node),"import");
-		       if (import_mode) --import_mode;
-		     }
-		     
-		     Setattr((yyval.node),"name",(yyvsp[-4].str));
-		     /* Search for the module (if any) */
-		     {
-			 Node *n = firstChild((yyval.node));
-			 while (n) {
-			     if (Strcmp(nodeType(n),"module") == 0) {
-			         if (mname) {
-				   Setattr(n,"name", mname);
-				   mname = 0;
-				 }
-				 Setattr((yyval.node),"module",Getattr(n,"name"));
-				 break;
-			     }
-			     n = nextSibling(n);
-			 }
-			 if (mname) {
-			   /* There is no module node in the import
-			      node, ie, you imported a .h file
-			      directly.  We are forced then to create
-			      a new import node with a module node.
-			   */			      
-			   Node *nint = new_node("import");
-			   Node *mnode = new_node("module");
-			   Setattr(mnode,"name", mname);
-                           Setattr(mnode,"options",(yyvsp[-5].node));
-			   appendChild(nint,mnode);
-			   Delete(mnode);
-			   appendChild(nint,firstChild((yyval.node)));
-			   (yyval.node) = nint;
-			   Setattr((yyval.node),"module",mname);
-			 }
-		     }
-		     Setattr((yyval.node),"options",(yyvsp[-5].node));
-               }
-#line 5115 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 60:
-#line 1957 "parser.y" /* yacc.c:1646  */
-    { (yyval.loc).type = "include"; }
-#line 5121 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 61:
-#line 1958 "parser.y" /* yacc.c:1646  */
-    { (yyval.loc).type = "import"; ++import_mode;}
-#line 5127 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 62:
-#line 1965 "parser.y" /* yacc.c:1646  */
-    {
-                 String *cpps;
-		 if (Namespaceprefix) {
-		   Swig_error(cparse_file, cparse_start_line, "%%inline directive inside a namespace is disallowed.\n");
-		   (yyval.node) = 0;
-		 } else {
-		   (yyval.node) = new_node("insert");
-		   Setattr((yyval.node),"code",(yyvsp[0].str));
-		   /* Need to run through the preprocessor */
-		   Seek((yyvsp[0].str),0,SEEK_SET);
-		   Setline((yyvsp[0].str),cparse_start_line);
-		   Setfile((yyvsp[0].str),cparse_file);
-		   cpps = Preprocessor_parse((yyvsp[0].str));
-		   start_inline(Char(cpps), cparse_start_line);
-		   Delete((yyvsp[0].str));
-		   Delete(cpps);
-		 }
-		 
-	       }
-#line 5151 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 63:
-#line 1984 "parser.y" /* yacc.c:1646  */
-    {
-                 String *cpps;
-		 int start_line = cparse_line;
-		 skip_balanced('{','}');
-		 if (Namespaceprefix) {
-		   Swig_error(cparse_file, cparse_start_line, "%%inline directive inside a namespace is disallowed.\n");
-		   
-		   (yyval.node) = 0;
-		 } else {
-		   String *code;
-                   (yyval.node) = new_node("insert");
-		   Delitem(scanner_ccode,0);
-		   Delitem(scanner_ccode,DOH_END);
-		   code = Copy(scanner_ccode);
-		   Setattr((yyval.node),"code", code);
-		   Delete(code);		   
-		   cpps=Copy(scanner_ccode);
-		   start_inline(Char(cpps), start_line);
-		   Delete(cpps);
-		 }
-               }
-#line 5177 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 64:
-#line 2015 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = new_node("insert");
-		 Setattr((yyval.node),"code",(yyvsp[0].str));
-	       }
-#line 5186 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 65:
-#line 2019 "parser.y" /* yacc.c:1646  */
-    {
-		 String *code = NewStringEmpty();
-		 (yyval.node) = new_node("insert");
-		 Setattr((yyval.node),"section",(yyvsp[-2].id));
-		 Setattr((yyval.node),"code",code);
-		 if (Swig_insert_file((yyvsp[0].str),code) < 0) {
-		   Swig_error(cparse_file, cparse_line, "Couldn't find '%s'.\n", (yyvsp[0].str));
-		   (yyval.node) = 0;
-		 } 
-               }
-#line 5201 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 66:
-#line 2029 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = new_node("insert");
-		 Setattr((yyval.node),"section",(yyvsp[-2].id));
-		 Setattr((yyval.node),"code",(yyvsp[0].str));
-               }
-#line 5211 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 67:
-#line 2034 "parser.y" /* yacc.c:1646  */
-    {
-		 String *code;
-                 skip_balanced('{','}');
-		 (yyval.node) = new_node("insert");
-		 Setattr((yyval.node),"section",(yyvsp[-2].id));
-		 Delitem(scanner_ccode,0);
-		 Delitem(scanner_ccode,DOH_END);
-		 code = Copy(scanner_ccode);
-		 Setattr((yyval.node),"code", code);
-		 Delete(code);
-	       }
-#line 5227 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 68:
-#line 2052 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = new_node("module");
-		 if ((yyvsp[-1].node)) {
-		   Setattr((yyval.node),"options",(yyvsp[-1].node));
-		   if (Getattr((yyvsp[-1].node),"directors")) {
-		     Wrapper_director_mode_set(1);
-		     if (!cparse_cplusplus) {
-		       Swig_error(cparse_file, cparse_line, "Directors are not supported for C code and require the -c++ option\n");
-		     }
-		   } 
-		   if (Getattr((yyvsp[-1].node),"dirprot")) {
-		     Wrapper_director_protected_mode_set(1);
-		   } 
-		   if (Getattr((yyvsp[-1].node),"allprotected")) {
-		     Wrapper_all_protected_mode_set(1);
-		   } 
-		   if (Getattr((yyvsp[-1].node),"templatereduce")) {
-		     template_reduce = 1;
-		   }
-		   if (Getattr((yyvsp[-1].node),"notemplatereduce")) {
-		     template_reduce = 0;
-		   }
-		 }
-		 if (!ModuleName) ModuleName = NewString((yyvsp[0].id));
-		 if (!import_mode) {
-		   /* first module included, we apply global
-		      ModuleName, which can be modify by -module */
-		   String *mname = Copy(ModuleName);
-		   Setattr((yyval.node),"name",mname);
-		   Delete(mname);
-		 } else { 
-		   /* import mode, we just pass the idstring */
-		   Setattr((yyval.node),"name",(yyvsp[0].id));   
-		 }		 
-		 if (!module_node) module_node = (yyval.node);
-	       }
-#line 5268 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 69:
-#line 2095 "parser.y" /* yacc.c:1646  */
-    {
-                 Swig_warning(WARN_DEPRECATED_NAME,cparse_file,cparse_line, "%%name is deprecated.  Use %%rename instead.\n");
-		 Delete(yyrename);
-                 yyrename = NewString((yyvsp[-1].id));
-		 (yyval.node) = 0;
-               }
-#line 5279 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 70:
-#line 2101 "parser.y" /* yacc.c:1646  */
-    {
-		 Swig_warning(WARN_DEPRECATED_NAME,cparse_file,cparse_line, "%%name is deprecated.  Use %%rename instead.\n");
-		 (yyval.node) = 0;
-		 Swig_error(cparse_file,cparse_line,"Missing argument to %%name directive.\n");
-	       }
-#line 5289 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 71:
-#line 2114 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = new_node("native");
-		 Setattr((yyval.node),"name",(yyvsp[-4].id));
-		 Setattr((yyval.node),"wrap:name",(yyvsp[-1].id));
-	         add_symbols((yyval.node));
-	       }
-#line 5300 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 72:
-#line 2120 "parser.y" /* yacc.c:1646  */
-    {
-		 if (!SwigType_isfunction((yyvsp[-1].decl).type)) {
-		   Swig_error(cparse_file,cparse_line,"%%native declaration '%s' is not a function.\n", (yyvsp[-1].decl).id);
-		   (yyval.node) = 0;
-		 } else {
-		     Delete(SwigType_pop_function((yyvsp[-1].decl).type));
-		     /* Need check for function here */
-		     SwigType_push((yyvsp[-2].type),(yyvsp[-1].decl).type);
-		     (yyval.node) = new_node("native");
-	             Setattr((yyval.node),"name",(yyvsp[-5].id));
-		     Setattr((yyval.node),"wrap:name",(yyvsp[-1].decl).id);
-		     Setattr((yyval.node),"type",(yyvsp[-2].type));
-		     Setattr((yyval.node),"parms",(yyvsp[-1].decl).parms);
-		     Setattr((yyval.node),"decl",(yyvsp[-1].decl).type);
-		 }
-	         add_symbols((yyval.node));
-	       }
-#line 5322 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 73:
-#line 2146 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = new_node("pragma");
-		 Setattr((yyval.node),"lang",(yyvsp[-3].id));
-		 Setattr((yyval.node),"name",(yyvsp[-2].id));
-		 Setattr((yyval.node),"value",(yyvsp[0].str));
-	       }
-#line 5333 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 74:
-#line 2152 "parser.y" /* yacc.c:1646  */
-    {
-		(yyval.node) = new_node("pragma");
-		Setattr((yyval.node),"lang",(yyvsp[-1].id));
-		Setattr((yyval.node),"name",(yyvsp[0].id));
-	      }
-#line 5343 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 75:
-#line 2159 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 5349 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 76:
-#line 2160 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 5355 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 77:
-#line 2163 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (yyvsp[-1].id); }
-#line 5361 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 78:
-#line 2164 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (char *) "swig"; }
-#line 5367 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 79:
-#line 2171 "parser.y" /* yacc.c:1646  */
-    {
-                SwigType *t = (yyvsp[-2].decl).type;
-		Hash *kws = NewHash();
-		String *fixname;
-		fixname = feature_identifier_fix((yyvsp[-2].decl).id);
-		Setattr(kws,"name",(yyvsp[-1].id));
-		if (!Len(t)) t = 0;
-		/* Special declarator check */
-		if (t) {
-		  if (SwigType_isfunction(t)) {
-		    SwigType *decl = SwigType_pop_function(t);
-		    if (SwigType_ispointer(t)) {
-		      String *nname = NewStringf("*%s",fixname);
-		      if ((yyvsp[-3].intvalue)) {
-			Swig_name_rename_add(Namespaceprefix, nname,decl,kws,(yyvsp[-2].decl).parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,nname,decl,kws);
-		      }
-		      Delete(nname);
-		    } else {
-		      if ((yyvsp[-3].intvalue)) {
-			Swig_name_rename_add(Namespaceprefix,(fixname),decl,kws,(yyvsp[-2].decl).parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,(fixname),decl,kws);
-		      }
-		    }
-		    Delete(decl);
-		  } else if (SwigType_ispointer(t)) {
-		    String *nname = NewStringf("*%s",fixname);
-		    if ((yyvsp[-3].intvalue)) {
-		      Swig_name_rename_add(Namespaceprefix,(nname),0,kws,(yyvsp[-2].decl).parms);
-		    } else {
-		      Swig_name_namewarn_add(Namespaceprefix,(nname),0,kws);
-		    }
-		    Delete(nname);
-		  }
-		} else {
-		  if ((yyvsp[-3].intvalue)) {
-		    Swig_name_rename_add(Namespaceprefix,(fixname),0,kws,(yyvsp[-2].decl).parms);
-		  } else {
-		    Swig_name_namewarn_add(Namespaceprefix,(fixname),0,kws);
-		  }
-		}
-                (yyval.node) = 0;
-		scanner_clear_rename();
-              }
-#line 5418 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 80:
-#line 2217 "parser.y" /* yacc.c:1646  */
-    {
-		String *fixname;
-		Hash *kws = (yyvsp[-4].node);
-		SwigType *t = (yyvsp[-2].decl).type;
-		fixname = feature_identifier_fix((yyvsp[-2].decl).id);
-		if (!Len(t)) t = 0;
-		/* Special declarator check */
-		if (t) {
-		  if ((yyvsp[-1].dtype).qualifier) SwigType_push(t,(yyvsp[-1].dtype).qualifier);
-		  if (SwigType_isfunction(t)) {
-		    SwigType *decl = SwigType_pop_function(t);
-		    if (SwigType_ispointer(t)) {
-		      String *nname = NewStringf("*%s",fixname);
-		      if ((yyvsp[-6].intvalue)) {
-			Swig_name_rename_add(Namespaceprefix, nname,decl,kws,(yyvsp[-2].decl).parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,nname,decl,kws);
-		      }
-		      Delete(nname);
-		    } else {
-		      if ((yyvsp[-6].intvalue)) {
-			Swig_name_rename_add(Namespaceprefix,(fixname),decl,kws,(yyvsp[-2].decl).parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,(fixname),decl,kws);
-		      }
-		    }
-		    Delete(decl);
-		  } else if (SwigType_ispointer(t)) {
-		    String *nname = NewStringf("*%s",fixname);
-		    if ((yyvsp[-6].intvalue)) {
-		      Swig_name_rename_add(Namespaceprefix,(nname),0,kws,(yyvsp[-2].decl).parms);
-		    } else {
-		      Swig_name_namewarn_add(Namespaceprefix,(nname),0,kws);
-		    }
-		    Delete(nname);
-		  }
-		} else {
-		  if ((yyvsp[-6].intvalue)) {
-		    Swig_name_rename_add(Namespaceprefix,(fixname),0,kws,(yyvsp[-2].decl).parms);
-		  } else {
-		    Swig_name_namewarn_add(Namespaceprefix,(fixname),0,kws);
-		  }
-		}
-                (yyval.node) = 0;
-		scanner_clear_rename();
-              }
-#line 5469 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 81:
-#line 2263 "parser.y" /* yacc.c:1646  */
-    {
-		if ((yyvsp[-5].intvalue)) {
-		  Swig_name_rename_add(Namespaceprefix,(yyvsp[-1].str),0,(yyvsp[-3].node),0);
-		} else {
-		  Swig_name_namewarn_add(Namespaceprefix,(yyvsp[-1].str),0,(yyvsp[-3].node));
-		}
-		(yyval.node) = 0;
-		scanner_clear_rename();
-              }
-#line 5483 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 82:
-#line 2274 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.intvalue) = 1;
-                }
-#line 5491 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 83:
-#line 2277 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.intvalue) = 0;
-                }
-#line 5499 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 84:
-#line 2304 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = (yyvsp[0].str) ? NewString((yyvsp[0].str)) : NewString("1");
-                    new_feature((yyvsp[-4].id), val, 0, (yyvsp[-2].decl).id, (yyvsp[-2].decl).type, (yyvsp[-2].decl).parms, (yyvsp[-1].dtype).qualifier);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5510 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 85:
-#line 2310 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = Len((yyvsp[-4].str)) ? (yyvsp[-4].str) : 0;
-                    new_feature((yyvsp[-6].id), val, 0, (yyvsp[-2].decl).id, (yyvsp[-2].decl).type, (yyvsp[-2].decl).parms, (yyvsp[-1].dtype).qualifier);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5521 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 86:
-#line 2316 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = (yyvsp[0].str) ? NewString((yyvsp[0].str)) : NewString("1");
-                    new_feature((yyvsp[-5].id), val, (yyvsp[-4].node), (yyvsp[-2].decl).id, (yyvsp[-2].decl).type, (yyvsp[-2].decl).parms, (yyvsp[-1].dtype).qualifier);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5532 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 87:
-#line 2322 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = Len((yyvsp[-5].str)) ? (yyvsp[-5].str) : 0;
-                    new_feature((yyvsp[-7].id), val, (yyvsp[-4].node), (yyvsp[-2].decl).id, (yyvsp[-2].decl).type, (yyvsp[-2].decl).parms, (yyvsp[-1].dtype).qualifier);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5543 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 88:
-#line 2330 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = (yyvsp[0].str) ? NewString((yyvsp[0].str)) : NewString("1");
-                    new_feature((yyvsp[-2].id), val, 0, 0, 0, 0, 0);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5554 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 89:
-#line 2336 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = Len((yyvsp[-2].str)) ? (yyvsp[-2].str) : 0;
-                    new_feature((yyvsp[-4].id), val, 0, 0, 0, 0, 0);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5565 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 90:
-#line 2342 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = (yyvsp[0].str) ? NewString((yyvsp[0].str)) : NewString("1");
-                    new_feature((yyvsp[-3].id), val, (yyvsp[-2].node), 0, 0, 0, 0);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5576 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 91:
-#line 2348 "parser.y" /* yacc.c:1646  */
-    {
-                    String *val = Len((yyvsp[-3].str)) ? (yyvsp[-3].str) : 0;
-                    new_feature((yyvsp[-5].id), val, (yyvsp[-2].node), 0, 0, 0, 0);
-                    (yyval.node) = 0;
-                    scanner_clear_rename();
-                  }
-#line 5587 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 92:
-#line 2356 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 5593 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 93:
-#line 2357 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = 0; }
-#line 5599 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 94:
-#line 2358 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[-2].pl); }
-#line 5605 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 95:
-#line 2361 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = NewHash();
-		  Setattr((yyval.node),"name",(yyvsp[-2].id));
-		  Setattr((yyval.node),"value",(yyvsp[0].str));
-                }
-#line 5615 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 96:
-#line 2366 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = NewHash();
-		  Setattr((yyval.node),"name",(yyvsp[-3].id));
-		  Setattr((yyval.node),"value",(yyvsp[-1].str));
-                  set_nextSibling((yyval.node),(yyvsp[0].node));
-                }
-#line 5626 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 97:
-#line 2376 "parser.y" /* yacc.c:1646  */
-    {
-                 Parm *val;
-		 String *name;
-		 SwigType *t;
-		 if (Namespaceprefix) name = NewStringf("%s::%s", Namespaceprefix, (yyvsp[-2].decl).id);
-		 else name = NewString((yyvsp[-2].decl).id);
-		 val = (yyvsp[-4].pl);
-		 if ((yyvsp[-2].decl).parms) {
-		   Setmeta(val,"parms",(yyvsp[-2].decl).parms);
-		 }
-		 t = (yyvsp[-2].decl).type;
-		 if (!Len(t)) t = 0;
-		 if (t) {
-		   if ((yyvsp[-1].dtype).qualifier) SwigType_push(t,(yyvsp[-1].dtype).qualifier);
-		   if (SwigType_isfunction(t)) {
-		     SwigType *decl = SwigType_pop_function(t);
-		     if (SwigType_ispointer(t)) {
-		       String *nname = NewStringf("*%s",name);
-		       Swig_feature_set(Swig_cparse_features(), nname, decl, "feature:varargs", val, 0);
-		       Delete(nname);
-		     } else {
-		       Swig_feature_set(Swig_cparse_features(), name, decl, "feature:varargs", val, 0);
-		     }
-		     Delete(decl);
-		   } else if (SwigType_ispointer(t)) {
-		     String *nname = NewStringf("*%s",name);
-		     Swig_feature_set(Swig_cparse_features(),nname,0,"feature:varargs",val, 0);
-		     Delete(nname);
-		   }
-		 } else {
-		   Swig_feature_set(Swig_cparse_features(),name,0,"feature:varargs",val, 0);
-		 }
-		 Delete(name);
-		 (yyval.node) = 0;
-              }
-#line 5666 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 98:
-#line 2412 "parser.y" /* yacc.c:1646  */
-    { (yyval.pl) = (yyvsp[0].pl); }
-#line 5672 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 99:
-#line 2413 "parser.y" /* yacc.c:1646  */
-    { 
-		  int i;
-		  int n;
-		  Parm *p;
-		  n = atoi(Char((yyvsp[-2].dtype).val));
-		  if (n <= 0) {
-		    Swig_error(cparse_file, cparse_line,"Argument count in %%varargs must be positive.\n");
-		    (yyval.pl) = 0;
-		  } else {
-		    String *name = Getattr((yyvsp[0].p), "name");
-		    (yyval.pl) = Copy((yyvsp[0].p));
-		    if (name)
-		      Setattr((yyval.pl), "name", NewStringf("%s%d", name, n));
-		    for (i = 1; i < n; i++) {
-		      p = Copy((yyvsp[0].p));
-		      name = Getattr(p, "name");
-		      if (name)
-		        Setattr(p, "name", NewStringf("%s%d", name, n-i));
-		      set_nextSibling(p,(yyval.pl));
-		      Delete((yyval.pl));
-		      (yyval.pl) = p;
-		    }
-		  }
-                }
-#line 5701 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 100:
-#line 2448 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = 0;
-		   if ((yyvsp[-3].tmap).method) {
-		     String *code = 0;
-		     (yyval.node) = new_node("typemap");
-		     Setattr((yyval.node),"method",(yyvsp[-3].tmap).method);
-		     if ((yyvsp[-3].tmap).kwargs) {
-		       ParmList *kw = (yyvsp[-3].tmap).kwargs;
-                       code = remove_block(kw, (yyvsp[0].str));
-		       Setattr((yyval.node),"kwargs", (yyvsp[-3].tmap).kwargs);
-		     }
-		     code = code ? code : NewString((yyvsp[0].str));
-		     Setattr((yyval.node),"code", code);
-		     Delete(code);
-		     appendChild((yyval.node),(yyvsp[-1].p));
-		   }
-	       }
-#line 5723 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 101:
-#line 2465 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = 0;
-		 if ((yyvsp[-3].tmap).method) {
-		   (yyval.node) = new_node("typemap");
-		   Setattr((yyval.node),"method",(yyvsp[-3].tmap).method);
-		   appendChild((yyval.node),(yyvsp[-1].p));
-		 }
-	       }
-#line 5736 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 102:
-#line 2473 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = 0;
-		   if ((yyvsp[-5].tmap).method) {
-		     (yyval.node) = new_node("typemapcopy");
-		     Setattr((yyval.node),"method",(yyvsp[-5].tmap).method);
-		     Setattr((yyval.node),"pattern", Getattr((yyvsp[-1].p),"pattern"));
-		     appendChild((yyval.node),(yyvsp[-3].p));
-		   }
-	       }
-#line 5750 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 103:
-#line 2486 "parser.y" /* yacc.c:1646  */
-    {
-		 Hash *p;
-		 String *name;
-		 p = nextSibling((yyvsp[0].node));
-		 if (p && (!Getattr(p,"value"))) {
- 		   /* this is the deprecated two argument typemap form */
- 		   Swig_warning(WARN_DEPRECATED_TYPEMAP_LANG,cparse_file, cparse_line,
-				"Specifying the language name in %%typemap is deprecated - use #ifdef SWIG<LANG> instead.\n");
-		   /* two argument typemap form */
-		   name = Getattr((yyvsp[0].node),"name");
-		   if (!name || (Strcmp(name,typemap_lang))) {
-		     (yyval.tmap).method = 0;
-		     (yyval.tmap).kwargs = 0;
-		   } else {
-		     (yyval.tmap).method = Getattr(p,"name");
-		     (yyval.tmap).kwargs = nextSibling(p);
-		   }
-		 } else {
-		   /* one-argument typemap-form */
-		   (yyval.tmap).method = Getattr((yyvsp[0].node),"name");
-		   (yyval.tmap).kwargs = p;
-		 }
-                }
-#line 5778 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 104:
-#line 2511 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.p) = (yyvsp[-1].p);
-		 set_nextSibling((yyval.p),(yyvsp[0].p));
-		}
-#line 5787 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 105:
-#line 2517 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.p) = (yyvsp[-1].p);
-		 set_nextSibling((yyval.p),(yyvsp[0].p));
-                }
-#line 5796 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 106:
-#line 2521 "parser.y" /* yacc.c:1646  */
-    { (yyval.p) = 0;}
-#line 5802 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 107:
-#line 2524 "parser.y" /* yacc.c:1646  */
-    {
-                  Parm *parm;
-		  SwigType_push((yyvsp[-1].type),(yyvsp[0].decl).type);
-		  (yyval.p) = new_node("typemapitem");
-		  parm = NewParmWithoutFileLineInfo((yyvsp[-1].type),(yyvsp[0].decl).id);
-		  Setattr((yyval.p),"pattern",parm);
-		  Setattr((yyval.p),"parms", (yyvsp[0].decl).parms);
-		  Delete(parm);
-		  /*		  $$ = NewParmWithoutFileLineInfo($1,$2.id);
-				  Setattr($$,"parms",$2.parms); */
-                }
-#line 5818 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 108:
-#line 2535 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.p) = new_node("typemapitem");
-		  Setattr((yyval.p),"pattern",(yyvsp[-1].pl));
-		  /*		  Setattr($$,"multitype",$2); */
-               }
-#line 5828 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 109:
-#line 2540 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.p) = new_node("typemapitem");
-		 Setattr((yyval.p),"pattern", (yyvsp[-4].pl));
-		 /*                 Setattr($$,"multitype",$2); */
-		 Setattr((yyval.p),"parms",(yyvsp[-1].pl));
-               }
-#line 5839 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 110:
-#line 2553 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = new_node("types");
-		   Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-                   if ((yyvsp[0].str))
-		     Setattr((yyval.node),"convcode",NewString((yyvsp[0].str)));
-               }
-#line 5850 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 111:
-#line 2565 "parser.y" /* yacc.c:1646  */
-    {
-                  Parm *p, *tp;
-		  Node *n;
-		  Node *outer_class = currentOuterClass;
-		  Symtab *tscope = 0;
-		  int     specialized = 0;
-		  int     variadic = 0;
-
-		  (yyval.node) = 0;
-
-		  tscope = Swig_symbol_current();          /* Get the current scope */
-
-		  /* If the class name is qualified, we need to create or lookup namespace entries */
-		  if (!inclass) {
-		    (yyvsp[-4].str) = resolve_create_node_scope((yyvsp[-4].str));
-		  }
-		  if (nscope_inner && Strcmp(nodeType(nscope_inner), "class") == 0) {
-		    outer_class	= nscope_inner;
-		  }
-
-		  /*
-		    We use the new namespace entry 'nscope' only to
-		    emit the template node. The template parameters are
-		    resolved in the current 'tscope'.
-
-		    This is closer to the C++ (typedef) behavior.
-		  */
-		  n = Swig_cparse_template_locate((yyvsp[-4].str),(yyvsp[-2].p),tscope);
-
-		  /* Patch the argument types to respect namespaces */
-		  p = (yyvsp[-2].p);
-		  while (p) {
-		    SwigType *value = Getattr(p,"value");
-		    if (!value) {
-		      SwigType *ty = Getattr(p,"type");
-		      if (ty) {
-			SwigType *rty = 0;
-			int reduce = template_reduce;
-			if (reduce || !SwigType_ispointer(ty)) {
-			  rty = Swig_symbol_typedef_reduce(ty,tscope);
-			  if (!reduce) reduce = SwigType_ispointer(rty);
-			}
-			ty = reduce ? Swig_symbol_type_qualify(rty,tscope) : Swig_symbol_type_qualify(ty,tscope);
-			Setattr(p,"type",ty);
-			Delete(ty);
-			Delete(rty);
-		      }
-		    } else {
-		      value = Swig_symbol_type_qualify(value,tscope);
-		      Setattr(p,"value",value);
-		      Delete(value);
-		    }
-
-		    p = nextSibling(p);
-		  }
-
-		  /* Look for the template */
-		  {
-                    Node *nn = n;
-                    Node *linklistend = 0;
-                    Node *linkliststart = 0;
-                    while (nn) {
-                      Node *templnode = 0;
-                      if (Strcmp(nodeType(nn),"template") == 0) {
-                        int nnisclass = (Strcmp(Getattr(nn,"templatetype"),"class") == 0); /* if not a templated class it is a templated function */
-                        Parm *tparms = Getattr(nn,"templateparms");
-                        if (!tparms) {
-                          specialized = 1;
-                        } else if (Getattr(tparms,"variadic") && strncmp(Char(Getattr(tparms,"variadic")), "1", 1)==0) {
-                          variadic = 1;
-                        }
-                        if (nnisclass && !variadic && !specialized && (ParmList_len((yyvsp[-2].p)) > ParmList_len(tparms))) {
-                          Swig_error(cparse_file, cparse_line, "Too many template parameters. Maximum of %d.\n", ParmList_len(tparms));
-                        } else if (nnisclass && !specialized && ((ParmList_len((yyvsp[-2].p)) < (ParmList_numrequired(tparms) - (variadic?1:0))))) { /* Variadic parameter is optional */
-                          Swig_error(cparse_file, cparse_line, "Not enough template parameters specified. %d required.\n", (ParmList_numrequired(tparms)-(variadic?1:0)) );
-                        } else if (!nnisclass && ((ParmList_len((yyvsp[-2].p)) != ParmList_len(tparms)))) {
-                          /* must be an overloaded templated method - ignore it as it is overloaded with a different number of template parameters */
-                          nn = Getattr(nn,"sym:nextSibling"); /* repeat for overloaded templated functions */
-                          continue;
-                        } else {
-			  String *tname = Copy((yyvsp[-4].str));
-                          int def_supplied = 0;
-                          /* Expand the template */
-			  Node *templ = Swig_symbol_clookup((yyvsp[-4].str),0);
-			  Parm *targs = templ ? Getattr(templ,"templateparms") : 0;
-
-                          ParmList *temparms;
-                          if (specialized) temparms = CopyParmList((yyvsp[-2].p));
-                          else temparms = CopyParmList(tparms);
-
-                          /* Create typedef's and arguments */
-                          p = (yyvsp[-2].p);
-                          tp = temparms;
-                          if (!p && ParmList_len(p) != ParmList_len(temparms)) {
-                            /* we have no template parameters supplied in %template for a template that has default args*/
-                            p = tp;
-                            def_supplied = 1;
-                          }
-
-                          while (p) {
-                            String *value = Getattr(p,"value");
-                            if (def_supplied) {
-                              Setattr(p,"default","1");
-                            }
-                            if (value) {
-                              Setattr(tp,"value",value);
-                            } else {
-                              SwigType *ty = Getattr(p,"type");
-                              if (ty) {
-                                Setattr(tp,"type",ty);
-                              }
-                              Delattr(tp,"value");
-                            }
-			    /* fix default arg values */
-			    if (targs) {
-			      Parm *pi = temparms;
-			      Parm *ti = targs;
-			      String *tv = Getattr(tp,"value");
-			      if (!tv) tv = Getattr(tp,"type");
-			      while(pi != tp && ti && pi) {
-				String *name = Getattr(ti,"name");
-				String *value = Getattr(pi,"value");
-				if (!value) value = Getattr(pi,"type");
-				Replaceid(tv, name, value);
-				pi = nextSibling(pi);
-				ti = nextSibling(ti);
-			      }
-			    }
-                            p = nextSibling(p);
-                            tp = nextSibling(tp);
-                            if (!p && tp) {
-                              p = tp;
-                              def_supplied = 1;
-                            } else if (p && !tp) { /* Variadic template - tp < p */
-			      SWIG_WARN_NODE_BEGIN(nn);
-                              Swig_warning(WARN_CPP11_VARIADIC_TEMPLATE,cparse_file, cparse_line,"Only the first variadic template argument is currently supported.\n");
-			      SWIG_WARN_NODE_END(nn);
-                              break;
-                            }
-                          }
-
-                          templnode = copy_node(nn);
-			  update_nested_classes(templnode); /* update classes nested within template */
-                          /* We need to set the node name based on name used to instantiate */
-                          Setattr(templnode,"name",tname);
-			  Delete(tname);
-                          if (!specialized) {
-                            Delattr(templnode,"sym:typename");
-                          } else {
-                            Setattr(templnode,"sym:typename","1");
-                          }
-			  /* for now, nested %template is allowed only in the same scope as the template declaration */
-                          if ((yyvsp[-6].id) && !(nnisclass && ((outer_class && (outer_class != Getattr(nn, "nested:outer")))
-			    ||(extendmode && current_class && (current_class != Getattr(nn, "nested:outer")))))) {
-			    /*
-			       Comment this out for 1.3.28. We need to
-			       re-enable it later but first we need to
-			       move %ignore from using %rename to use
-			       %feature(ignore).
-
-			       String *symname = Swig_name_make(templnode,0,$3,0,0);
-			    */
-			    String *symname = NewString((yyvsp[-6].id));
-                            Swig_cparse_template_expand(templnode,symname,temparms,tscope);
-                            Setattr(templnode,"sym:name",symname);
-                          } else {
-                            static int cnt = 0;
-                            String *nname = NewStringf("__dummy_%d__", cnt++);
-                            Swig_cparse_template_expand(templnode,nname,temparms,tscope);
-                            Setattr(templnode,"sym:name",nname);
-			    Delete(nname);
-                            Setattr(templnode,"feature:onlychildren", "typemap,typemapitem,typemapcopy,typedef,types,fragment");
-			    if ((yyvsp[-6].id)) {
-			      Swig_warning(WARN_PARSE_NESTED_TEMPLATE, cparse_file, cparse_line, "Named nested template instantiations not supported. Processing as if no name was given to %%template().\n");
-			    }
-                          }
-                          Delattr(templnode,"templatetype");
-                          Setattr(templnode,"template",nn);
-                          Setfile(templnode,cparse_file);
-                          Setline(templnode,cparse_line);
-                          Delete(temparms);
-			  if (outer_class && nnisclass) {
-			    SetFlag(templnode, "nested");
-			    Setattr(templnode, "nested:outer", outer_class);
-			  }
-                          add_symbols_copy(templnode);
-
-                          if (Strcmp(nodeType(templnode),"class") == 0) {
-
-                            /* Identify pure abstract methods */
-                            Setattr(templnode,"abstracts", pure_abstracts(firstChild(templnode)));
-
-                            /* Set up inheritance in symbol table */
-                            {
-                              Symtab  *csyms;
-                              List *baselist = Getattr(templnode,"baselist");
-                              csyms = Swig_symbol_current();
-                              Swig_symbol_setscope(Getattr(templnode,"symtab"));
-                              if (baselist) {
-                                List *bases = Swig_make_inherit_list(Getattr(templnode,"name"),baselist, Namespaceprefix);
-                                if (bases) {
-                                  Iterator s;
-                                  for (s = First(bases); s.item; s = Next(s)) {
-                                    Symtab *st = Getattr(s.item,"symtab");
-                                    if (st) {
-				      Setfile(st,Getfile(s.item));
-				      Setline(st,Getline(s.item));
-                                      Swig_symbol_inherit(st);
-                                    }
-                                  }
-				  Delete(bases);
-                                }
-                              }
-                              Swig_symbol_setscope(csyms);
-                            }
-
-                            /* Merge in %extend methods for this class.
-			       This only merges methods within %extend for a template specialized class such as
-			         template<typename T> class K {}; %extend K<int> { ... }
-			       The copy_node() call above has already added in the generic %extend methods such as
-			         template<typename T> class K {}; %extend K { ... } */
-
-			    /* !!! This may be broken.  We may have to add the
-			       %extend methods at the beginning of the class */
-                            {
-                              String *stmp = 0;
-                              String *clsname;
-                              Node *am;
-                              if (Namespaceprefix) {
-                                clsname = stmp = NewStringf("%s::%s", Namespaceprefix, Getattr(templnode,"name"));
-                              } else {
-                                clsname = Getattr(templnode,"name");
-                              }
-                              am = Getattr(Swig_extend_hash(),clsname);
-                              if (am) {
-                                Symtab *st = Swig_symbol_current();
-                                Swig_symbol_setscope(Getattr(templnode,"symtab"));
-                                /*			    Printf(stdout,"%s: %s %p %p\n", Getattr(templnode,"name"), clsname, Swig_symbol_current(), Getattr(templnode,"symtab")); */
-                                Swig_extend_merge(templnode,am);
-                                Swig_symbol_setscope(st);
-				Swig_extend_append_previous(templnode,am);
-                                Delattr(Swig_extend_hash(),clsname);
-                              }
-			      if (stmp) Delete(stmp);
-                            }
-
-                            /* Add to classes hash */
-			    if (!classes)
-			      classes = NewHash();
-
-			    if (Namespaceprefix) {
-			      String *temp = NewStringf("%s::%s", Namespaceprefix, Getattr(templnode,"name"));
-			      Setattr(classes,temp,templnode);
-			      Delete(temp);
-			    } else {
-			      String *qs = Swig_symbol_qualifiedscopename(templnode);
-			      Setattr(classes, qs,templnode);
-			      Delete(qs);
-			    }
-                          }
-                        }
-
-                        /* all the overloaded templated functions are added into a linked list */
-                        if (!linkliststart)
-                          linkliststart = templnode;
-                        if (nscope_inner) {
-                          /* non-global namespace */
-                          if (templnode) {
-                            appendChild(nscope_inner,templnode);
-			    Delete(templnode);
-                            if (nscope) (yyval.node) = nscope;
-                          }
-                        } else {
-                          /* global namespace */
-                          if (!linklistend) {
-                            (yyval.node) = templnode;
-                          } else {
-                            set_nextSibling(linklistend,templnode);
-			    Delete(templnode);
-                          }
-                          linklistend = templnode;
-                        }
-                      }
-                      nn = Getattr(nn,"sym:nextSibling"); /* repeat for overloaded templated functions. If a templated class there will never be a sibling. */
-                    }
-                    update_defaultargs(linkliststart);
-		  }
-	          Swig_symbol_setscope(tscope);
-		  Delete(Namespaceprefix);
-		  Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-                }
-#line 6146 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 112:
-#line 2863 "parser.y" /* yacc.c:1646  */
-    {
-		  Swig_warning(0,cparse_file, cparse_line,"%s\n", (yyvsp[0].str));
-		  (yyval.node) = 0;
-               }
-#line 6155 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 113:
-#line 2873 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.node) = (yyvsp[0].node); 
-                    if ((yyval.node)) {
-   		      add_symbols((yyval.node));
-                      default_arguments((yyval.node));
-   	            }
-                }
-#line 6167 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 114:
-#line 2880 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 6173 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 115:
-#line 2881 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 6179 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 116:
-#line 2885 "parser.y" /* yacc.c:1646  */
-    {
-		  if (Strcmp((yyvsp[-1].str),"C") == 0) {
-		    cparse_externc = 1;
-		  }
-		}
-#line 6189 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 117:
-#line 2889 "parser.y" /* yacc.c:1646  */
-    {
-		  cparse_externc = 0;
-		  if (Strcmp((yyvsp[-4].str),"C") == 0) {
-		    Node *n = firstChild((yyvsp[-1].node));
-		    (yyval.node) = new_node("extern");
-		    Setattr((yyval.node),"name",(yyvsp[-4].str));
-		    appendChild((yyval.node),n);
-		    while (n) {
-		      SwigType *decl = Getattr(n,"decl");
-		      if (SwigType_isfunction(decl) && !Equal(Getattr(n, "storage"), "typedef")) {
-			Setattr(n,"storage","externc");
-		      }
-		      n = nextSibling(n);
-		    }
-		  } else {
-		     Swig_warning(WARN_PARSE_UNDEFINED_EXTERN,cparse_file, cparse_line,"Unrecognized extern type \"%s\".\n", (yyvsp[-4].str));
-		    (yyval.node) = new_node("extern");
-		    Setattr((yyval.node),"name",(yyvsp[-4].str));
-		    appendChild((yyval.node),firstChild((yyvsp[-1].node)));
-		  }
-                }
-#line 6215 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 118:
-#line 2910 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = (yyvsp[0].node);
-		  SWIG_WARN_NODE_BEGIN((yyval.node));
-		  Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line, "Lambda expressions and closures are not fully supported yet.\n");
-		  SWIG_WARN_NODE_END((yyval.node));
-		}
-#line 6226 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 119:
-#line 2916 "parser.y" /* yacc.c:1646  */
-    {
-		  /* Convert using statement to a typedef statement */
-		  (yyval.node) = new_node("cdecl");
-		  Setattr((yyval.node),"type",(yyvsp[-2].type));
-		  Setattr((yyval.node),"storage","typedef");
-		  Setattr((yyval.node),"name",(yyvsp[-4].str));
-		  Setattr((yyval.node),"decl",(yyvsp[-1].decl).type);
-		  SetFlag((yyval.node),"typealias");
-		  add_symbols((yyval.node));
-		}
-#line 6241 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 120:
-#line 2926 "parser.y" /* yacc.c:1646  */
-    {
-		  /* Convert alias template to a "template" typedef statement */
-		  (yyval.node) = new_node("template");
-		  Setattr((yyval.node),"type",(yyvsp[-2].type));
-		  Setattr((yyval.node),"storage","typedef");
-		  Setattr((yyval.node),"name",(yyvsp[-4].str));
-		  Setattr((yyval.node),"decl",(yyvsp[-1].decl).type);
-		  Setattr((yyval.node),"templateparms",(yyvsp[-7].tparms));
-		  Setattr((yyval.node),"templatetype","cdecl");
-		  SetFlag((yyval.node),"aliastemplate");
-		  add_symbols((yyval.node));
-		}
-#line 6258 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 121:
-#line 2944 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.node) = new_node("cdecl");
-	      if ((yyvsp[-1].dtype).qualifier) SwigType_push((yyvsp[-2].decl).type,(yyvsp[-1].dtype).qualifier);
-	      Setattr((yyval.node),"type",(yyvsp[-3].type));
-	      Setattr((yyval.node),"storage",(yyvsp[-4].id));
-	      Setattr((yyval.node),"name",(yyvsp[-2].decl).id);
-	      Setattr((yyval.node),"decl",(yyvsp[-2].decl).type);
-	      Setattr((yyval.node),"parms",(yyvsp[-2].decl).parms);
-	      Setattr((yyval.node),"value",(yyvsp[-1].dtype).val);
-	      Setattr((yyval.node),"throws",(yyvsp[-1].dtype).throws);
-	      Setattr((yyval.node),"throw",(yyvsp[-1].dtype).throwf);
-	      Setattr((yyval.node),"noexcept",(yyvsp[-1].dtype).nexcept);
-	      if ((yyvsp[-1].dtype).val && (yyvsp[-1].dtype).type) {
-		/* store initializer type as it might be different to the declared type */
-		SwigType *valuetype = NewSwigType((yyvsp[-1].dtype).type);
-		if (Len(valuetype) > 0)
-		  Setattr((yyval.node),"valuetype",valuetype);
-		else
-		  Delete(valuetype);
-	      }
-	      if (!(yyvsp[0].node)) {
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr((yyval.node),"code",code);
-		  Delete(code);
-		}
-	      } else {
-		Node *n = (yyvsp[0].node);
-		/* Inherit attributes */
-		while (n) {
-		  String *type = Copy((yyvsp[-3].type));
-		  Setattr(n,"type",type);
-		  Setattr(n,"storage",(yyvsp[-4].id));
-		  n = nextSibling(n);
-		  Delete(type);
-		}
-	      }
-	      if ((yyvsp[-1].dtype).bitfield) {
-		Setattr((yyval.node),"bitfield", (yyvsp[-1].dtype).bitfield);
-	      }
-
-	      /* Look for "::" declarations (ignored) */
-	      if (Strstr((yyvsp[-2].decl).id,"::")) {
-                /* This is a special case. If the scope name of the declaration exactly
-                   matches that of the declaration, then we will allow it. Otherwise, delete. */
-                String *p = Swig_scopename_prefix((yyvsp[-2].decl).id);
-		if (p) {
-		  if ((Namespaceprefix && Strcmp(p, Namespaceprefix) == 0) ||
-		      (Classprefix && Strcmp(p, Classprefix) == 0)) {
-		    String *lstr = Swig_scopename_last((yyvsp[-2].decl).id);
-		    Setattr((yyval.node),"name",lstr);
-		    Delete(lstr);
-		    set_nextSibling((yyval.node),(yyvsp[0].node));
-		  } else {
-		    Delete((yyval.node));
-		    (yyval.node) = (yyvsp[0].node);
-		  }
-		  Delete(p);
-		} else {
-		  Delete((yyval.node));
-		  (yyval.node) = (yyvsp[0].node);
-		}
-	      } else {
-		set_nextSibling((yyval.node),(yyvsp[0].node));
-	      }
-           }
-#line 6329 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 122:
-#line 3012 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.node) = new_node("cdecl");
-	      if ((yyvsp[-1].dtype).qualifier) SwigType_push((yyvsp[-4].decl).type,(yyvsp[-1].dtype).qualifier);
-	      Setattr((yyval.node),"type",(yyvsp[-2].node));
-	      Setattr((yyval.node),"storage",(yyvsp[-6].id));
-	      Setattr((yyval.node),"name",(yyvsp[-4].decl).id);
-	      Setattr((yyval.node),"decl",(yyvsp[-4].decl).type);
-	      Setattr((yyval.node),"parms",(yyvsp[-4].decl).parms);
-	      Setattr((yyval.node),"value",(yyvsp[-1].dtype).val);
-	      Setattr((yyval.node),"throws",(yyvsp[-1].dtype).throws);
-	      Setattr((yyval.node),"throw",(yyvsp[-1].dtype).throwf);
-	      Setattr((yyval.node),"noexcept",(yyvsp[-1].dtype).nexcept);
-	      if (!(yyvsp[0].node)) {
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr((yyval.node),"code",code);
-		  Delete(code);
-		}
-	      } else {
-		Node *n = (yyvsp[0].node);
-		while (n) {
-		  String *type = Copy((yyvsp[-2].node));
-		  Setattr(n,"type",type);
-		  Setattr(n,"storage",(yyvsp[-6].id));
-		  n = nextSibling(n);
-		  Delete(type);
-		}
-	      }
-	      if ((yyvsp[-1].dtype).bitfield) {
-		Setattr((yyval.node),"bitfield", (yyvsp[-1].dtype).bitfield);
-	      }
-
-	      if (Strstr((yyvsp[-4].decl).id,"::")) {
-                String *p = Swig_scopename_prefix((yyvsp[-4].decl).id);
-		if (p) {
-		  if ((Namespaceprefix && Strcmp(p, Namespaceprefix) == 0) ||
-		      (Classprefix && Strcmp(p, Classprefix) == 0)) {
-		    String *lstr = Swig_scopename_last((yyvsp[-4].decl).id);
-		    Setattr((yyval.node),"name",lstr);
-		    Delete(lstr);
-		    set_nextSibling((yyval.node),(yyvsp[0].node));
-		  } else {
-		    Delete((yyval.node));
-		    (yyval.node) = (yyvsp[0].node);
-		  }
-		  Delete(p);
-		} else {
-		  Delete((yyval.node));
-		  (yyval.node) = (yyvsp[0].node);
-		}
-	      } else {
-		set_nextSibling((yyval.node),(yyvsp[0].node));
-	      }
-           }
-#line 6388 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 123:
-#line 3070 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.node) = 0;
-                   Clear(scanner_ccode); 
-               }
-#line 6397 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 124:
-#line 3074 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = new_node("cdecl");
-		 if ((yyvsp[-1].dtype).qualifier) SwigType_push((yyvsp[-2].decl).type,(yyvsp[-1].dtype).qualifier);
-		 Setattr((yyval.node),"name",(yyvsp[-2].decl).id);
-		 Setattr((yyval.node),"decl",(yyvsp[-2].decl).type);
-		 Setattr((yyval.node),"parms",(yyvsp[-2].decl).parms);
-		 Setattr((yyval.node),"value",(yyvsp[-1].dtype).val);
-		 Setattr((yyval.node),"throws",(yyvsp[-1].dtype).throws);
-		 Setattr((yyval.node),"throw",(yyvsp[-1].dtype).throwf);
-		 Setattr((yyval.node),"noexcept",(yyvsp[-1].dtype).nexcept);
-		 if ((yyvsp[-1].dtype).bitfield) {
-		   Setattr((yyval.node),"bitfield", (yyvsp[-1].dtype).bitfield);
-		 }
-		 if (!(yyvsp[0].node)) {
-		   if (Len(scanner_ccode)) {
-		     String *code = Copy(scanner_ccode);
-		     Setattr((yyval.node),"code",code);
-		     Delete(code);
-		   }
-		 } else {
-		   set_nextSibling((yyval.node),(yyvsp[0].node));
-		 }
-	       }
-#line 6425 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 125:
-#line 3097 "parser.y" /* yacc.c:1646  */
-    { 
-                   skip_balanced('{','}');
-                   (yyval.node) = 0;
-               }
-#line 6434 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 126:
-#line 3101 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = 0;
-		   if (yychar == RPAREN) {
-		       Swig_error(cparse_file, cparse_line, "Unexpected ')'.\n");
-		   } else {
-		       Swig_error(cparse_file, cparse_line, "Syntax error - possibly a missing semicolon.\n");
-		   }
-		   exit(1);
-               }
-#line 6448 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 127:
-#line 3112 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.dtype) = (yyvsp[0].dtype); 
-                   (yyval.dtype).qualifier = 0;
-		   (yyval.dtype).throws = 0;
-		   (yyval.dtype).throwf = 0;
-		   (yyval.dtype).nexcept = 0;
-              }
-#line 6460 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 128:
-#line 3119 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.dtype) = (yyvsp[0].dtype); 
-		   (yyval.dtype).qualifier = (yyvsp[-1].str);
-		   (yyval.dtype).throws = 0;
-		   (yyval.dtype).throwf = 0;
-		   (yyval.dtype).nexcept = 0;
-	      }
-#line 6472 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 129:
-#line 3126 "parser.y" /* yacc.c:1646  */
-    { 
-		   (yyval.dtype) = (yyvsp[0].dtype); 
-                   (yyval.dtype).qualifier = 0;
-		   (yyval.dtype).throws = (yyvsp[-1].dtype).throws;
-		   (yyval.dtype).throwf = (yyvsp[-1].dtype).throwf;
-		   (yyval.dtype).nexcept = (yyvsp[-1].dtype).nexcept;
-              }
-#line 6484 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 130:
-#line 3133 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.dtype) = (yyvsp[0].dtype); 
-                   (yyval.dtype).qualifier = (yyvsp[-2].str);
-		   (yyval.dtype).throws = (yyvsp[-1].dtype).throws;
-		   (yyval.dtype).throwf = (yyvsp[-1].dtype).throwf;
-		   (yyval.dtype).nexcept = (yyvsp[-1].dtype).nexcept;
-              }
-#line 6496 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 131:
-#line 3142 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].type); }
-#line 6502 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 132:
-#line 3143 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].type); }
-#line 6508 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 133:
-#line 3144 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].type); }
-#line 6514 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 134:
-#line 3148 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].type); }
-#line 6520 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 135:
-#line 3149 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].str); }
-#line 6526 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 136:
-#line 3150 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].type); }
-#line 6532 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 137:
-#line 3161 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = new_node("lambda");
-		  Setattr((yyval.node),"name",(yyvsp[-8].str));
-		  add_symbols((yyval.node));
-	        }
-#line 6542 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 138:
-#line 3166 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = new_node("lambda");
-		  Setattr((yyval.node),"name",(yyvsp[-10].str));
-		  add_symbols((yyval.node));
-		}
-#line 6552 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 139:
-#line 3171 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = new_node("lambda");
-		  Setattr((yyval.node),"name",(yyvsp[-4].str));
-		  add_symbols((yyval.node));
-		}
-#line 6562 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 140:
-#line 3178 "parser.y" /* yacc.c:1646  */
-    {
-		  skip_balanced('[',']');
-		  (yyval.node) = 0;
-	        }
-#line 6571 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 141:
-#line 3184 "parser.y" /* yacc.c:1646  */
-    {
-		  skip_balanced('{','}');
-		  (yyval.node) = 0;
-		}
-#line 6580 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 142:
-#line 3189 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.pl) = 0;
-		}
-#line 6588 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 143:
-#line 3192 "parser.y" /* yacc.c:1646  */
-    {
-		  skip_balanced('(',')');
-		}
-#line 6596 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 144:
-#line 3194 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.pl) = 0;
-		}
-#line 6604 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 145:
-#line 3205 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = (char *)"enum";
-	      }
-#line 6612 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 146:
-#line 3208 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = (char *)"enum class";
-	      }
-#line 6620 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 147:
-#line 3211 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.node) = (char *)"enum struct";
-	      }
-#line 6628 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 148:
-#line 3220 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = (yyvsp[0].type);
-              }
-#line 6636 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 149:
-#line 3223 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 6642 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 150:
-#line 3230 "parser.y" /* yacc.c:1646  */
-    {
-		   SwigType *ty = 0;
-		   int scopedenum = (yyvsp[-2].id) && !Equal((yyvsp[-3].node), "enum");
-		   (yyval.node) = new_node("enumforward");
-		   ty = NewStringf("enum %s", (yyvsp[-2].id));
-		   Setattr((yyval.node),"enumkey",(yyvsp[-3].node));
-		   if (scopedenum)
-		     SetFlag((yyval.node), "scopedenum");
-		   Setattr((yyval.node),"name",(yyvsp[-2].id));
-		   Setattr((yyval.node),"inherit",(yyvsp[-1].node));
-		   Setattr((yyval.node),"type",ty);
-		   Setattr((yyval.node),"sym:weak", "1");
-		   add_symbols((yyval.node));
-	      }
-#line 6661 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 151:
-#line 3252 "parser.y" /* yacc.c:1646  */
-    {
-		  SwigType *ty = 0;
-		  int scopedenum = (yyvsp[-5].id) && !Equal((yyvsp[-6].node), "enum");
-                  (yyval.node) = new_node("enum");
-		  ty = NewStringf("enum %s", (yyvsp[-5].id));
-		  Setattr((yyval.node),"enumkey",(yyvsp[-6].node));
-		  if (scopedenum)
-		    SetFlag((yyval.node), "scopedenum");
-		  Setattr((yyval.node),"name",(yyvsp[-5].id));
-		  Setattr((yyval.node),"inherit",(yyvsp[-4].node));
-		  Setattr((yyval.node),"type",ty);
-		  appendChild((yyval.node),(yyvsp[-2].node));
-		  add_symbols((yyval.node));      /* Add to tag space */
-
-		  if (scopedenum) {
-		    Swig_symbol_newscope();
-		    Swig_symbol_setscopename((yyvsp[-5].id));
-		    Delete(Namespaceprefix);
-		    Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		  }
-
-		  add_symbols((yyvsp[-2].node));      /* Add enum values to appropriate enum or enum class scope */
-
-		  if (scopedenum) {
-		    Setattr((yyval.node),"symtab", Swig_symbol_popscope());
-		    Delete(Namespaceprefix);
-		    Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		  }
-               }
-#line 6695 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 152:
-#line 3281 "parser.y" /* yacc.c:1646  */
-    {
-		 Node *n;
-		 SwigType *ty = 0;
-		 String   *unnamed = 0;
-		 int       unnamedinstance = 0;
-		 int scopedenum = (yyvsp[-7].id) && !Equal((yyvsp[-8].node), "enum");
-
-		 (yyval.node) = new_node("enum");
-		 Setattr((yyval.node),"enumkey",(yyvsp[-8].node));
-		 if (scopedenum)
-		   SetFlag((yyval.node), "scopedenum");
-		 Setattr((yyval.node),"inherit",(yyvsp[-6].node));
-		 if ((yyvsp[-7].id)) {
-		   Setattr((yyval.node),"name",(yyvsp[-7].id));
-		   ty = NewStringf("enum %s", (yyvsp[-7].id));
-		 } else if ((yyvsp[-2].decl).id) {
-		   unnamed = make_unnamed();
-		   ty = NewStringf("enum %s", unnamed);
-		   Setattr((yyval.node),"unnamed",unnamed);
-                   /* name is not set for unnamed enum instances, e.g. enum { foo } Instance; */
-		   if ((yyvsp[-9].id) && Cmp((yyvsp[-9].id),"typedef") == 0) {
-		     Setattr((yyval.node),"name",(yyvsp[-2].decl).id);
-                   } else {
-                     unnamedinstance = 1;
-                   }
-		   Setattr((yyval.node),"storage",(yyvsp[-9].id));
-		 }
-		 if ((yyvsp[-2].decl).id && Cmp((yyvsp[-9].id),"typedef") == 0) {
-		   Setattr((yyval.node),"tdname",(yyvsp[-2].decl).id);
-                   Setattr((yyval.node),"allows_typedef","1");
-                 }
-		 appendChild((yyval.node),(yyvsp[-4].node));
-		 n = new_node("cdecl");
-		 Setattr(n,"type",ty);
-		 Setattr(n,"name",(yyvsp[-2].decl).id);
-		 Setattr(n,"storage",(yyvsp[-9].id));
-		 Setattr(n,"decl",(yyvsp[-2].decl).type);
-		 Setattr(n,"parms",(yyvsp[-2].decl).parms);
-		 Setattr(n,"unnamed",unnamed);
-
-                 if (unnamedinstance) {
-		   SwigType *cty = NewString("enum ");
-		   Setattr((yyval.node),"type",cty);
-		   SetFlag((yyval.node),"unnamedinstance");
-		   SetFlag(n,"unnamedinstance");
-		   Delete(cty);
-                 }
-		 if ((yyvsp[0].node)) {
-		   Node *p = (yyvsp[0].node);
-		   set_nextSibling(n,p);
-		   while (p) {
-		     SwigType *cty = Copy(ty);
-		     Setattr(p,"type",cty);
-		     Setattr(p,"unnamed",unnamed);
-		     Setattr(p,"storage",(yyvsp[-9].id));
-		     Delete(cty);
-		     p = nextSibling(p);
-		   }
-		 } else {
-		   if (Len(scanner_ccode)) {
-		     String *code = Copy(scanner_ccode);
-		     Setattr(n,"code",code);
-		     Delete(code);
-		   }
-		 }
-
-                 /* Ensure that typedef enum ABC {foo} XYZ; uses XYZ for sym:name, like structs.
-                  * Note that class_rename/yyrename are bit of a mess so used this simple approach to change the name. */
-                 if ((yyvsp[-2].decl).id && (yyvsp[-7].id) && Cmp((yyvsp[-9].id),"typedef") == 0) {
-		   String *name = NewString((yyvsp[-2].decl).id);
-                   Setattr((yyval.node), "parser:makename", name);
-		   Delete(name);
-                 }
-
-		 add_symbols((yyval.node));       /* Add enum to tag space */
-		 set_nextSibling((yyval.node),n);
-		 Delete(n);
-
-		 if (scopedenum) {
-		   Swig_symbol_newscope();
-		   Swig_symbol_setscopename((yyvsp[-7].id));
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		 }
-
-		 add_symbols((yyvsp[-4].node));      /* Add enum values to appropriate enum or enum class scope */
-
-		 if (scopedenum) {
-		   Setattr((yyval.node),"symtab", Swig_symbol_popscope());
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		 }
-
-	         add_symbols(n);
-		 Delete(unnamed);
-	       }
-#line 6796 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 153:
-#line 3379 "parser.y" /* yacc.c:1646  */
-    {
-                   /* This is a sick hack.  If the ctor_end has parameters,
-                      and the parms parameter only has 1 parameter, this
-                      could be a declaration of the form:
-
-                         type (id)(parms)
-
-			 Otherwise it's an error. */
-                    int err = 0;
-                    (yyval.node) = 0;
-
-		    if ((ParmList_len((yyvsp[-2].pl)) == 1) && (!Swig_scopename_check((yyvsp[-4].type)))) {
-		      SwigType *ty = Getattr((yyvsp[-2].pl),"type");
-		      String *name = Getattr((yyvsp[-2].pl),"name");
-		      err = 1;
-		      if (!name) {
-			(yyval.node) = new_node("cdecl");
-			Setattr((yyval.node),"type",(yyvsp[-4].type));
-			Setattr((yyval.node),"storage",(yyvsp[-5].id));
-			Setattr((yyval.node),"name",ty);
-
-			if ((yyvsp[0].decl).have_parms) {
-			  SwigType *decl = NewStringEmpty();
-			  SwigType_add_function(decl,(yyvsp[0].decl).parms);
-			  Setattr((yyval.node),"decl",decl);
-			  Setattr((yyval.node),"parms",(yyvsp[0].decl).parms);
-			  if (Len(scanner_ccode)) {
-			    String *code = Copy(scanner_ccode);
-			    Setattr((yyval.node),"code",code);
-			    Delete(code);
-			  }
-			}
-			if ((yyvsp[0].decl).defarg) {
-			  Setattr((yyval.node),"value",(yyvsp[0].decl).defarg);
-			}
-			Setattr((yyval.node),"throws",(yyvsp[0].decl).throws);
-			Setattr((yyval.node),"throw",(yyvsp[0].decl).throwf);
-			Setattr((yyval.node),"noexcept",(yyvsp[0].decl).nexcept);
-			err = 0;
-		      }
-		    }
-		    if (err) {
-		      Swig_error(cparse_file,cparse_line,"Syntax error in input(2).\n");
-		      exit(1);
-		    }
-                }
-#line 6847 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 154:
-#line 3431 "parser.y" /* yacc.c:1646  */
-    {  (yyval.node) = (yyvsp[0].node); }
-#line 6853 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 155:
-#line 3432 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 6859 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 156:
-#line 3433 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 6865 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 157:
-#line 3434 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 6871 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 158:
-#line 3435 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 6877 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 159:
-#line 3436 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 6883 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 160:
-#line 3441 "parser.y" /* yacc.c:1646  */
-    {
-                   String *prefix;
-                   List *bases = 0;
-		   Node *scope = 0;
-		   String *code;
-		   (yyval.node) = new_node("class");
-		   Setline((yyval.node),cparse_start_line);
-		   Setattr((yyval.node),"kind",(yyvsp[-3].id));
-		   if ((yyvsp[-1].bases)) {
-		     Setattr((yyval.node),"baselist", Getattr((yyvsp[-1].bases),"public"));
-		     Setattr((yyval.node),"protectedbaselist", Getattr((yyvsp[-1].bases),"protected"));
-		     Setattr((yyval.node),"privatebaselist", Getattr((yyvsp[-1].bases),"private"));
-		   }
-		   Setattr((yyval.node),"allows_typedef","1");
-
-		   /* preserve the current scope */
-		   Setattr((yyval.node),"prev_symtab",Swig_symbol_current());
-		  
-		   /* If the class name is qualified.  We need to create or lookup namespace/scope entries */
-		   scope = resolve_create_node_scope((yyvsp[-2].str));
-		   /* save nscope_inner to the class - it may be overwritten in nested classes*/
-		   Setattr((yyval.node), "nested:innerscope", nscope_inner);
-		   Setattr((yyval.node), "nested:nscope", nscope);
-		   Setfile(scope,cparse_file);
-		   Setline(scope,cparse_line);
-		   (yyvsp[-2].str) = scope;
-		   Setattr((yyval.node),"name",(yyvsp[-2].str));
-
-		   if (currentOuterClass) {
-		     SetFlag((yyval.node), "nested");
-		     Setattr((yyval.node), "nested:outer", currentOuterClass);
-		     set_access_mode((yyval.node));
-		   }
-		   Swig_features_get(Swig_cparse_features(), Namespaceprefix, Getattr((yyval.node), "name"), 0, (yyval.node));
-		   /* save yyrename to the class attribute, to be used later in add_symbols()*/
-		   Setattr((yyval.node), "class_rename", make_name((yyval.node), (yyvsp[-2].str), 0));
-		   Setattr((yyval.node), "Classprefix", (yyvsp[-2].str));
-		   Classprefix = NewString((yyvsp[-2].str));
-		   /* Deal with inheritance  */
-		   if ((yyvsp[-1].bases))
-		     bases = Swig_make_inherit_list((yyvsp[-2].str),Getattr((yyvsp[-1].bases),"public"),Namespaceprefix);
-		   prefix = SwigType_istemplate_templateprefix((yyvsp[-2].str));
-		   if (prefix) {
-		     String *fbase, *tbase;
-		     if (Namespaceprefix) {
-		       fbase = NewStringf("%s::%s", Namespaceprefix,(yyvsp[-2].str));
-		       tbase = NewStringf("%s::%s", Namespaceprefix, prefix);
-		     } else {
-		       fbase = Copy((yyvsp[-2].str));
-		       tbase = Copy(prefix);
-		     }
-		     Swig_name_inherit(tbase,fbase);
-		     Delete(fbase);
-		     Delete(tbase);
-		   }
-                   if (strcmp((yyvsp[-3].id),"class") == 0) {
-		     cplus_mode = CPLUS_PRIVATE;
-		   } else {
-		     cplus_mode = CPLUS_PUBLIC;
-		   }
-		   if (!cparse_cplusplus) {
-		     set_scope_to_global();
-		   }
-		   Swig_symbol_newscope();
-		   Swig_symbol_setscopename((yyvsp[-2].str));
-		   Swig_inherit_base_symbols(bases);
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   cparse_start_line = cparse_line;
-
-		   /* If there are active template parameters, we need to make sure they are
-                      placed in the class symbol table so we can catch shadows */
-
-		   if (template_parameters) {
-		     Parm *tp = template_parameters;
-		     while(tp) {
-		       String *tpname = Copy(Getattr(tp,"name"));
-		       Node *tn = new_node("templateparm");
-		       Setattr(tn,"name",tpname);
-		       Swig_symbol_cadd(tpname,tn);
-		       tp = nextSibling(tp);
-		       Delete(tpname);
-		     }
-		   }
-		   Delete(prefix);
-		   inclass = 1;
-		   currentOuterClass = (yyval.node);
-		   if (cparse_cplusplusout) {
-		     /* save the structure declaration to declare it in global scope for C++ to see */
-		     code = get_raw_text_balanced('{', '}');
-		     Setattr((yyval.node), "code", code);
-		     Delete(code);
-		   }
-               }
-#line 6982 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 161:
-#line 3534 "parser.y" /* yacc.c:1646  */
-    {
-		   Node *p;
-		   SwigType *ty;
-		   Symtab *cscope;
-		   Node *am = 0;
-		   String *scpname = 0;
-		   (void) (yyvsp[-3].node);
-		   (yyval.node) = currentOuterClass;
-		   currentOuterClass = Getattr((yyval.node), "nested:outer");
-		   nscope_inner = Getattr((yyval.node), "nested:innerscope");
-		   nscope = Getattr((yyval.node), "nested:nscope");
-		   Delattr((yyval.node), "nested:innerscope");
-		   Delattr((yyval.node), "nested:nscope");
-		   if (nscope_inner && Strcmp(nodeType(nscope_inner), "class") == 0) { /* actual parent class for this class */
-		     Node* forward_declaration = Swig_symbol_clookup_no_inherit(Getattr((yyval.node),"name"), Getattr(nscope_inner, "symtab"));
-		     if (forward_declaration) {
-		       Setattr((yyval.node), "access", Getattr(forward_declaration, "access"));
-		     }
-		     Setattr((yyval.node), "nested:outer", nscope_inner);
-		     SetFlag((yyval.node), "nested");
-                   }
-		   if (!currentOuterClass)
-		     inclass = 0;
-		   cscope = Getattr((yyval.node), "prev_symtab");
-		   Delattr((yyval.node), "prev_symtab");
-		   
-		   /* Check for pure-abstract class */
-		   Setattr((yyval.node),"abstracts", pure_abstracts((yyvsp[-2].node)));
-		   
-		   /* This bit of code merges in a previously defined %extend directive (if any) */
-		   {
-		     String *clsname = Swig_symbol_qualifiedscopename(0);
-		     am = Getattr(Swig_extend_hash(), clsname);
-		     if (am) {
-		       Swig_extend_merge((yyval.node), am);
-		       Delattr(Swig_extend_hash(), clsname);
-		     }
-		     Delete(clsname);
-		   }
-		   if (!classes) classes = NewHash();
-		   scpname = Swig_symbol_qualifiedscopename(0);
-		   Setattr(classes, scpname, (yyval.node));
-
-		   appendChild((yyval.node), (yyvsp[-2].node));
-		   
-		   if (am) 
-		     Swig_extend_append_previous((yyval.node), am);
-
-		   p = (yyvsp[0].node);
-		   if (p && !nscope_inner) {
-		     if (!cparse_cplusplus && currentOuterClass)
-		       appendChild(currentOuterClass, p);
-		     else
-		      appendSibling((yyval.node), p);
-		   }
-		   
-		   if (nscope_inner) {
-		     ty = NewString(scpname); /* if the class is declared out of scope, let the declarator use fully qualified type*/
-		   } else if (cparse_cplusplus && !cparse_externc) {
-		     ty = NewString((yyvsp[-6].str));
-		   } else {
-		     ty = NewStringf("%s %s", (yyvsp[-7].id), (yyvsp[-6].str));
-		   }
-		   while (p) {
-		     Setattr(p, "storage", (yyvsp[-8].id));
-		     Setattr(p, "type" ,ty);
-		     if (!cparse_cplusplus && currentOuterClass && (!Getattr(currentOuterClass, "name"))) {
-		       SetFlag(p, "hasconsttype");
-		       SetFlag(p, "feature:immutable");
-		     }
-		     p = nextSibling(p);
-		   }
-		   if ((yyvsp[0].node) && Cmp((yyvsp[-8].id),"typedef") == 0)
-		     add_typedef_name((yyval.node), (yyvsp[0].node), (yyvsp[-6].str), cscope, scpname);
-		   Delete(scpname);
-
-		   if (cplus_mode != CPLUS_PUBLIC) {
-		   /* we 'open' the class at the end, to allow %template
-		      to add new members */
-		     Node *pa = new_node("access");
-		     Setattr(pa, "kind", "public");
-		     cplus_mode = CPLUS_PUBLIC;
-		     appendChild((yyval.node), pa);
-		     Delete(pa);
-		   }
-		   if (currentOuterClass)
-		     restore_access_mode((yyval.node));
-		   Setattr((yyval.node), "symtab", Swig_symbol_popscope());
-		   Classprefix = Getattr((yyval.node), "Classprefix");
-		   Delattr((yyval.node), "Classprefix");
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   if (cplus_mode == CPLUS_PRIVATE) {
-		     (yyval.node) = 0; /* skip private nested classes */
-		   } else if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag((yyval.node), "feature:flatnested")) {
-		     (yyval.node) = nested_forward_declaration((yyvsp[-8].id), (yyvsp[-7].id), (yyvsp[-6].str), Copy((yyvsp[-6].str)), (yyvsp[0].node));
-		   } else if (nscope_inner) {
-		     /* this is tricky */
-		     /* we add the declaration in the original namespace */
-		     if (Strcmp(nodeType(nscope_inner), "class") == 0 && cparse_cplusplus && ignore_nested_classes && !GetFlag((yyval.node), "feature:flatnested"))
-		       (yyval.node) = nested_forward_declaration((yyvsp[-8].id), (yyvsp[-7].id), (yyvsp[-6].str), Copy((yyvsp[-6].str)), (yyvsp[0].node));
-		     appendChild(nscope_inner, (yyval.node));
-		     Swig_symbol_setscope(Getattr(nscope_inner, "symtab"));
-		     Delete(Namespaceprefix);
-		     Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		     yyrename = Copy(Getattr((yyval.node), "class_rename"));
-		     add_symbols((yyval.node));
-		     Delattr((yyval.node), "class_rename");
-		     /* but the variable definition in the current scope */
-		     Swig_symbol_setscope(cscope);
-		     Delete(Namespaceprefix);
-		     Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		     add_symbols((yyvsp[0].node));
-		     if (nscope) {
-		       (yyval.node) = nscope; /* here we return recreated namespace tower instead of the class itself */
-		       if ((yyvsp[0].node)) {
-			 appendSibling((yyval.node), (yyvsp[0].node));
-		       }
-		     } else if (!SwigType_istemplate(ty) && template_parameters == 0) { /* for tempalte we need the class itself */
-		       (yyval.node) = (yyvsp[0].node);
-		     }
-		   } else {
-		     Delete(yyrename);
-		     yyrename = 0;
-		     if (!cparse_cplusplus && currentOuterClass) { /* nested C structs go into global scope*/
-		       Node *outer = currentOuterClass;
-		       while (Getattr(outer, "nested:outer"))
-			 outer = Getattr(outer, "nested:outer");
-		       appendSibling(outer, (yyval.node));
-		       add_symbols((yyvsp[0].node));
-		       set_scope_to_global();
-		       Delete(Namespaceprefix);
-		       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		       yyrename = Copy(Getattr((yyval.node), "class_rename"));
-		       add_symbols((yyval.node));
-		       if (!cparse_cplusplusout)
-			 Delattr((yyval.node), "nested:outer");
-		       Delattr((yyval.node), "class_rename");
-		       (yyval.node) = 0;
-		     } else {
-		       yyrename = Copy(Getattr((yyval.node), "class_rename"));
-		       add_symbols((yyval.node));
-		       add_symbols((yyvsp[0].node));
-		       Delattr((yyval.node), "class_rename");
-		     }
-		   }
-		   Delete(ty);
-		   Swig_symbol_setscope(cscope);
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   Classprefix = currentOuterClass ? Getattr(currentOuterClass, "Classprefix") : 0;
-	       }
-#line 7139 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 162:
-#line 3689 "parser.y" /* yacc.c:1646  */
-    {
-	       String *unnamed;
-	       String *code;
-	       unnamed = make_unnamed();
-	       (yyval.node) = new_node("class");
-	       Setline((yyval.node),cparse_start_line);
-	       Setattr((yyval.node),"kind",(yyvsp[-2].id));
-	       if ((yyvsp[-1].bases)) {
-		 Setattr((yyval.node),"baselist", Getattr((yyvsp[-1].bases),"public"));
-		 Setattr((yyval.node),"protectedbaselist", Getattr((yyvsp[-1].bases),"protected"));
-		 Setattr((yyval.node),"privatebaselist", Getattr((yyvsp[-1].bases),"private"));
-	       }
-	       Setattr((yyval.node),"storage",(yyvsp[-3].id));
-	       Setattr((yyval.node),"unnamed",unnamed);
-	       Setattr((yyval.node),"allows_typedef","1");
-	       if (currentOuterClass) {
-		 SetFlag((yyval.node), "nested");
-		 Setattr((yyval.node), "nested:outer", currentOuterClass);
-		 set_access_mode((yyval.node));
-	       }
-	       Swig_features_get(Swig_cparse_features(), Namespaceprefix, 0, 0, (yyval.node));
-	       /* save yyrename to the class attribute, to be used later in add_symbols()*/
-	       Setattr((yyval.node), "class_rename", make_name((yyval.node),0,0));
-	       if (strcmp((yyvsp[-2].id),"class") == 0) {
-		 cplus_mode = CPLUS_PRIVATE;
-	       } else {
-		 cplus_mode = CPLUS_PUBLIC;
-	       }
-	       Swig_symbol_newscope();
-	       cparse_start_line = cparse_line;
-	       currentOuterClass = (yyval.node);
-	       inclass = 1;
-	       Classprefix = 0;
-	       Delete(Namespaceprefix);
-	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	       /* save the structure declaration to make a typedef for it later*/
-	       code = get_raw_text_balanced('{', '}');
-	       Setattr((yyval.node), "code", code);
-	       Delete(code);
-	     }
-#line 7184 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 163:
-#line 3728 "parser.y" /* yacc.c:1646  */
-    {
-	       String *unnamed;
-               List *bases = 0;
-	       String *name = 0;
-	       Node *n;
-	       Classprefix = 0;
-	       (void)(yyvsp[-3].node);
-	       (yyval.node) = currentOuterClass;
-	       currentOuterClass = Getattr((yyval.node), "nested:outer");
-	       if (!currentOuterClass)
-		 inclass = 0;
-	       else
-		 restore_access_mode((yyval.node));
-	       unnamed = Getattr((yyval.node),"unnamed");
-               /* Check for pure-abstract class */
-	       Setattr((yyval.node),"abstracts", pure_abstracts((yyvsp[-2].node)));
-	       n = (yyvsp[0].node);
-	       if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag((yyval.node), "feature:flatnested")) {
-		 String *name = n ? Copy(Getattr(n, "name")) : 0;
-		 (yyval.node) = nested_forward_declaration((yyvsp[-7].id), (yyvsp[-6].id), 0, name, n);
-		 Swig_symbol_popscope();
-	         Delete(Namespaceprefix);
-		 Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	       } else if (n) {
-	         appendSibling((yyval.node),n);
-		 /* If a proper typedef name was given, we'll use it to set the scope name */
-		 name = try_to_find_a_name_for_unnamed_structure((yyvsp[-7].id), n);
-		 if (name) {
-		   String *scpname = 0;
-		   SwigType *ty;
-		   Setattr((yyval.node),"tdname",name);
-		   Setattr((yyval.node),"name",name);
-		   Swig_symbol_setscopename(name);
-		   if ((yyvsp[-5].bases))
-		     bases = Swig_make_inherit_list(name,Getattr((yyvsp[-5].bases),"public"),Namespaceprefix);
-		   Swig_inherit_base_symbols(bases);
-
-		     /* If a proper name was given, we use that as the typedef, not unnamed */
-		   Clear(unnamed);
-		   Append(unnamed, name);
-		   if (cparse_cplusplus && !cparse_externc) {
-		     ty = NewString(name);
-		   } else {
-		     ty = NewStringf("%s %s", (yyvsp[-6].id),name);
-		   }
-		   while (n) {
-		     Setattr(n,"storage",(yyvsp[-7].id));
-		     Setattr(n, "type", ty);
-		     if (!cparse_cplusplus && currentOuterClass && (!Getattr(currentOuterClass, "name"))) {
-		       SetFlag(n,"hasconsttype");
-		       SetFlag(n,"feature:immutable");
-		     }
-		     n = nextSibling(n);
-		   }
-		   n = (yyvsp[0].node);
-
-		   /* Check for previous extensions */
-		   {
-		     String *clsname = Swig_symbol_qualifiedscopename(0);
-		     Node *am = Getattr(Swig_extend_hash(),clsname);
-		     if (am) {
-		       /* Merge the extension into the symbol table */
-		       Swig_extend_merge((yyval.node),am);
-		       Swig_extend_append_previous((yyval.node),am);
-		       Delattr(Swig_extend_hash(),clsname);
-		     }
-		     Delete(clsname);
-		   }
-		   if (!classes) classes = NewHash();
-		   scpname = Swig_symbol_qualifiedscopename(0);
-		   Setattr(classes,scpname,(yyval.node));
-		   Delete(scpname);
-		 } else { /* no suitable name was found for a struct */
-		   Setattr((yyval.node), "nested:unnamed", Getattr(n, "name")); /* save the name of the first declarator for later use in name generation*/
-		   while (n) { /* attach unnamed struct to the declarators, so that they would receive proper type later*/
-		     Setattr(n, "nested:unnamedtype", (yyval.node));
-		     Setattr(n, "storage", (yyvsp[-7].id));
-		     n = nextSibling(n);
-		   }
-		   n = (yyvsp[0].node);
-		   Swig_symbol_setscopename("<unnamed>");
-		 }
-		 appendChild((yyval.node),(yyvsp[-2].node));
-		 /* Pop the scope */
-		 Setattr((yyval.node),"symtab",Swig_symbol_popscope());
-		 if (name) {
-		   Delete(yyrename);
-		   yyrename = Copy(Getattr((yyval.node), "class_rename"));
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   add_symbols((yyval.node));
-		   add_symbols(n);
-		   Delattr((yyval.node), "class_rename");
-		 }else if (cparse_cplusplus)
-		   (yyval.node) = 0; /* ignore unnamed structs for C++ */
-	         Delete(unnamed);
-	       } else { /* unnamed struct w/o declarator*/
-		 Swig_symbol_popscope();
-	         Delete(Namespaceprefix);
-		 Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		 add_symbols((yyvsp[-2].node));
-		 Delete((yyval.node));
-		 (yyval.node) = (yyvsp[-2].node); /* pass member list to outer class/namespace (instead of self)*/
-	       }
-	       Classprefix = currentOuterClass ? Getattr(currentOuterClass, "Classprefix") : 0;
-              }
-#line 7295 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 164:
-#line 3836 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 7301 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 165:
-#line 3837 "parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.node) = new_node("cdecl");
-                        Setattr((yyval.node),"name",(yyvsp[-2].decl).id);
-                        Setattr((yyval.node),"decl",(yyvsp[-2].decl).type);
-                        Setattr((yyval.node),"parms",(yyvsp[-2].decl).parms);
-			set_nextSibling((yyval.node),(yyvsp[0].node));
-                    }
-#line 7313 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 166:
-#line 3849 "parser.y" /* yacc.c:1646  */
-    {
-              if ((yyvsp[-3].id) && (Strcmp((yyvsp[-3].id),"friend") == 0)) {
-		/* Ignore */
-                (yyval.node) = 0; 
-	      } else {
-		(yyval.node) = new_node("classforward");
-		Setattr((yyval.node),"kind",(yyvsp[-2].id));
-		Setattr((yyval.node),"name",(yyvsp[-1].str));
-		Setattr((yyval.node),"sym:weak", "1");
-		add_symbols((yyval.node));
-	      }
-             }
-#line 7330 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 167:
-#line 3867 "parser.y" /* yacc.c:1646  */
-    { 
-		    if (currentOuterClass)
-		      Setattr(currentOuterClass, "template_parameters", template_parameters);
-		    template_parameters = (yyvsp[-1].tparms); 
-		    parsing_template_declaration = 1;
-		  }
-#line 7341 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 168:
-#line 3872 "parser.y" /* yacc.c:1646  */
-    {
-			String *tname = 0;
-			int     error = 0;
-
-			/* check if we get a namespace node with a class declaration, and retrieve the class */
-			Symtab *cscope = Swig_symbol_current();
-			Symtab *sti = 0;
-			Node *ntop = (yyvsp[0].node);
-			Node *ni = ntop;
-			SwigType *ntype = ni ? nodeType(ni) : 0;
-			while (ni && Strcmp(ntype,"namespace") == 0) {
-			  sti = Getattr(ni,"symtab");
-			  ni = firstChild(ni);
-			  ntype = nodeType(ni);
-			}
-			if (sti) {
-			  Swig_symbol_setscope(sti);
-			  Delete(Namespaceprefix);
-			  Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-			  (yyvsp[0].node) = ni;
-			}
-
-			(yyval.node) = (yyvsp[0].node);
-			if ((yyval.node)) tname = Getattr((yyval.node),"name");
-			
-			/* Check if the class is a template specialization */
-			if (((yyval.node)) && (Strchr(tname,'<')) && (!is_operator(tname))) {
-			  /* If a specialization.  Check if defined. */
-			  Node *tempn = 0;
-			  {
-			    String *tbase = SwigType_templateprefix(tname);
-			    tempn = Swig_symbol_clookup_local(tbase,0);
-			    if (!tempn || (Strcmp(nodeType(tempn),"template") != 0)) {
-			      SWIG_WARN_NODE_BEGIN(tempn);
-			      Swig_warning(WARN_PARSE_TEMPLATE_SP_UNDEF, Getfile((yyval.node)),Getline((yyval.node)),"Specialization of non-template '%s'.\n", tbase);
-			      SWIG_WARN_NODE_END(tempn);
-			      tempn = 0;
-			      error = 1;
-			    }
-			    Delete(tbase);
-			  }
-			  Setattr((yyval.node),"specialization","1");
-			  Setattr((yyval.node),"templatetype",nodeType((yyval.node)));
-			  set_nodeType((yyval.node),"template");
-			  /* Template partial specialization */
-			  if (tempn && ((yyvsp[-3].tparms)) && ((yyvsp[0].node))) {
-			    List   *tlist;
-			    String *targs = SwigType_templateargs(tname);
-			    tlist = SwigType_parmlist(targs);
-			    /*			  Printf(stdout,"targs = '%s' %s\n", targs, tlist); */
-			    if (!Getattr((yyval.node),"sym:weak")) {
-			      Setattr((yyval.node),"sym:typename","1");
-			    }
-			    
-			    if (Len(tlist) != ParmList_len(Getattr(tempn,"templateparms"))) {
-			      Swig_error(Getfile((yyval.node)),Getline((yyval.node)),"Inconsistent argument count in template partial specialization. %d %d\n", Len(tlist), ParmList_len(Getattr(tempn,"templateparms")));
-			      
-			    } else {
-
-			    /* This code builds the argument list for the partial template
-			       specialization.  This is a little hairy, but the idea is as
-			       follows:
-
-			       $3 contains a list of arguments supplied for the template.
-			       For example template<class T>.
-
-			       tlist is a list of the specialization arguments--which may be
-			       different.  For example class<int,T>.
-
-			       tp is a copy of the arguments in the original template definition.
-       
-			       The patching algorithm walks through the list of supplied
-			       arguments ($3), finds the position in the specialization arguments
-			       (tlist), and then patches the name in the argument list of the
-			       original template.
-			    */
-
-			    {
-			      String *pn;
-			      Parm *p, *p1;
-			      int i, nargs;
-			      Parm *tp = CopyParmList(Getattr(tempn,"templateparms"));
-			      nargs = Len(tlist);
-			      p = (yyvsp[-3].tparms);
-			      while (p) {
-				for (i = 0; i < nargs; i++){
-				  pn = Getattr(p,"name");
-				  if (Strcmp(pn,SwigType_base(Getitem(tlist,i))) == 0) {
-				    int j;
-				    Parm *p1 = tp;
-				    for (j = 0; j < i; j++) {
-				      p1 = nextSibling(p1);
-				    }
-				    Setattr(p1,"name",pn);
-				    Setattr(p1,"partialarg","1");
-				  }
-				}
-				p = nextSibling(p);
-			      }
-			      p1 = tp;
-			      i = 0;
-			      while (p1) {
-				if (!Getattr(p1,"partialarg")) {
-				  Delattr(p1,"name");
-				  Setattr(p1,"type", Getitem(tlist,i));
-				} 
-				i++;
-				p1 = nextSibling(p1);
-			      }
-			      Setattr((yyval.node),"templateparms",tp);
-			      Delete(tp);
-			    }
-  #if 0
-			    /* Patch the parameter list */
-			    if (tempn) {
-			      Parm *p,*p1;
-			      ParmList *tp = CopyParmList(Getattr(tempn,"templateparms"));
-			      p = (yyvsp[-3].tparms);
-			      p1 = tp;
-			      while (p && p1) {
-				String *pn = Getattr(p,"name");
-				Printf(stdout,"pn = '%s'\n", pn);
-				if (pn) Setattr(p1,"name",pn);
-				else Delattr(p1,"name");
-				pn = Getattr(p,"type");
-				if (pn) Setattr(p1,"type",pn);
-				p = nextSibling(p);
-				p1 = nextSibling(p1);
-			      }
-			      Setattr((yyval.node),"templateparms",tp);
-			      Delete(tp);
-			    } else {
-			      Setattr((yyval.node),"templateparms",(yyvsp[-3].tparms));
-			    }
-  #endif
-			    Delattr((yyval.node),"specialization");
-			    Setattr((yyval.node),"partialspecialization","1");
-			    /* Create a specialized name for matching */
-			    {
-			      Parm *p = (yyvsp[-3].tparms);
-			      String *fname = NewString(Getattr((yyval.node),"name"));
-			      String *ffname = 0;
-			      ParmList *partialparms = 0;
-
-			      char   tmp[32];
-			      int    i, ilen;
-			      while (p) {
-				String *n = Getattr(p,"name");
-				if (!n) {
-				  p = nextSibling(p);
-				  continue;
-				}
-				ilen = Len(tlist);
-				for (i = 0; i < ilen; i++) {
-				  if (Strstr(Getitem(tlist,i),n)) {
-				    sprintf(tmp,"$%d",i+1);
-				    Replaceid(fname,n,tmp);
-				  }
-				}
-				p = nextSibling(p);
-			      }
-			      /* Patch argument names with typedef */
-			      {
-				Iterator tt;
-				Parm *parm_current = 0;
-				List *tparms = SwigType_parmlist(fname);
-				ffname = SwigType_templateprefix(fname);
-				Append(ffname,"<(");
-				for (tt = First(tparms); tt.item; ) {
-				  SwigType *rtt = Swig_symbol_typedef_reduce(tt.item,0);
-				  SwigType *ttr = Swig_symbol_type_qualify(rtt,0);
-
-				  Parm *newp = NewParmWithoutFileLineInfo(ttr, 0);
-				  if (partialparms)
-				    set_nextSibling(parm_current, newp);
-				  else
-				    partialparms = newp;
-				  parm_current = newp;
-
-				  Append(ffname,ttr);
-				  tt = Next(tt);
-				  if (tt.item) Putc(',',ffname);
-				  Delete(rtt);
-				  Delete(ttr);
-				}
-				Delete(tparms);
-				Append(ffname,")>");
-			      }
-			      {
-				Node *new_partial = NewHash();
-				String *partials = Getattr(tempn,"partials");
-				if (!partials) {
-				  partials = NewList();
-				  Setattr(tempn,"partials",partials);
-				  Delete(partials);
-				}
-				/*			      Printf(stdout,"partial: fname = '%s', '%s'\n", fname, Swig_symbol_typedef_reduce(fname,0)); */
-				Setattr(new_partial, "partialparms", partialparms);
-				Setattr(new_partial, "templcsymname", ffname);
-				Append(partials, new_partial);
-			      }
-			      Setattr((yyval.node),"partialargs",ffname);
-			      Swig_symbol_cadd(ffname,(yyval.node));
-			    }
-			    }
-			    Delete(tlist);
-			    Delete(targs);
-			  } else {
-			    /* An explicit template specialization */
-			    /* add default args from primary (unspecialized) template */
-			    String *ty = Swig_symbol_template_deftype(tname,0);
-			    String *fname = Swig_symbol_type_qualify(ty,0);
-			    Swig_symbol_cadd(fname,(yyval.node));
-			    Delete(ty);
-			    Delete(fname);
-			  }
-			}  else if ((yyval.node)) {
-			  Setattr((yyval.node),"templatetype",nodeType((yyvsp[0].node)));
-			  set_nodeType((yyval.node),"template");
-			  Setattr((yyval.node),"templateparms", (yyvsp[-3].tparms));
-			  if (!Getattr((yyval.node),"sym:weak")) {
-			    Setattr((yyval.node),"sym:typename","1");
-			  }
-			  add_symbols((yyval.node));
-			  default_arguments((yyval.node));
-			  /* We also place a fully parameterized version in the symbol table */
-			  {
-			    Parm *p;
-			    String *fname = NewStringf("%s<(", Getattr((yyval.node),"name"));
-			    p = (yyvsp[-3].tparms);
-			    while (p) {
-			      String *n = Getattr(p,"name");
-			      if (!n) n = Getattr(p,"type");
-			      Append(fname,n);
-			      p = nextSibling(p);
-			      if (p) Putc(',',fname);
-			    }
-			    Append(fname,")>");
-			    Swig_symbol_cadd(fname,(yyval.node));
-			  }
-			}
-			(yyval.node) = ntop;
-			Swig_symbol_setscope(cscope);
-			Delete(Namespaceprefix);
-			Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-			if (error || (nscope_inner && Strcmp(nodeType(nscope_inner), "class") == 0)) {
-			  (yyval.node) = 0;
-			}
-			if (currentOuterClass)
-			  template_parameters = Getattr(currentOuterClass, "template_parameters");
-			else
-			  template_parameters = 0;
-			parsing_template_declaration = 0;
-                }
-#line 7600 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 169:
-#line 4128 "parser.y" /* yacc.c:1646  */
-    {
-		  Swig_warning(WARN_PARSE_EXPLICIT_TEMPLATE, cparse_file, cparse_line, "Explicit template instantiation ignored.\n");
-                  (yyval.node) = 0; 
-		}
-#line 7609 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 170:
-#line 4134 "parser.y" /* yacc.c:1646  */
-    {
-		  Swig_warning(WARN_PARSE_EXPLICIT_TEMPLATE, cparse_file, cparse_line, "Explicit template instantiation ignored.\n");
-                  (yyval.node) = 0; 
-                }
-#line 7618 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 171:
-#line 4140 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = (yyvsp[0].node);
-                }
-#line 7626 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 172:
-#line 4143 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = (yyvsp[0].node);
-                }
-#line 7634 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 173:
-#line 4146 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = (yyvsp[0].node);
-                }
-#line 7642 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 174:
-#line 4149 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = (yyvsp[0].node);
-                }
-#line 7650 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 175:
-#line 4152 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.node) = 0;
-                }
-#line 7658 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 176:
-#line 4155 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.node) = (yyvsp[0].node);
-                }
-#line 7666 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 177:
-#line 4158 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.node) = (yyvsp[0].node);
-                }
-#line 7674 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 178:
-#line 4163 "parser.y" /* yacc.c:1646  */
-    {
-		   /* Rip out the parameter names */
-		  Parm *p = (yyvsp[0].pl);
-		  (yyval.tparms) = (yyvsp[0].pl);
-
-		  while (p) {
-		    String *name = Getattr(p,"name");
-		    if (!name) {
-		      /* Hmmm. Maybe it's a 'class T' parameter */
-		      char *type = Char(Getattr(p,"type"));
-		      /* Template template parameter */
-		      if (strncmp(type,"template<class> ",16) == 0) {
-			type += 16;
-		      }
-		      if ((strncmp(type,"class ",6) == 0) || (strncmp(type,"typename ", 9) == 0)) {
-			char *t = strchr(type,' ');
-			Setattr(p,"name", t+1);
-		      } else 
-                      /* Variadic template args */
-		      if ((strncmp(type,"class... ",9) == 0) || (strncmp(type,"typename... ", 12) == 0)) {
-			char *t = strchr(type,' ');
-			Setattr(p,"name", t+1);
-			Setattr(p,"variadic", "1");
-		      } else {
-			/*
-			 Swig_error(cparse_file, cparse_line, "Missing template parameter name\n");
-			 $$.rparms = 0;
-			 $$.parms = 0;
-			 break; */
-		      }
-		    }
-		    p = nextSibling(p);
-		  }
-                 }
-#line 7713 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 179:
-#line 4199 "parser.y" /* yacc.c:1646  */
-    {
-                      set_nextSibling((yyvsp[-1].p),(yyvsp[0].pl));
-                      (yyval.pl) = (yyvsp[-1].p);
-                   }
-#line 7722 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 180:
-#line 4203 "parser.y" /* yacc.c:1646  */
-    { (yyval.pl) = 0; }
-#line 7728 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 181:
-#line 4206 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.p) = NewParmWithoutFileLineInfo(NewString((yyvsp[0].id)), 0);
-                  }
-#line 7736 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 182:
-#line 4209 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.p) = (yyvsp[0].p);
-                  }
-#line 7744 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 183:
-#line 4214 "parser.y" /* yacc.c:1646  */
-    {
-                         set_nextSibling((yyvsp[-1].p),(yyvsp[0].pl));
-                         (yyval.pl) = (yyvsp[-1].p);
-                       }
-#line 7753 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 184:
-#line 4218 "parser.y" /* yacc.c:1646  */
-    { (yyval.pl) = 0; }
-#line 7759 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 185:
-#line 4223 "parser.y" /* yacc.c:1646  */
-    {
-                  String *uname = Swig_symbol_type_qualify((yyvsp[-1].str),0);
-		  String *name = Swig_scopename_last((yyvsp[-1].str));
-                  (yyval.node) = new_node("using");
-		  Setattr((yyval.node),"uname",uname);
-		  Setattr((yyval.node),"name", name);
-		  Delete(uname);
-		  Delete(name);
-		  add_symbols((yyval.node));
-             }
-#line 7774 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 186:
-#line 4233 "parser.y" /* yacc.c:1646  */
-    {
-	       Node *n = Swig_symbol_clookup((yyvsp[-1].str),0);
-	       if (!n) {
-		 Swig_error(cparse_file, cparse_line, "Nothing known about namespace '%s'\n", (yyvsp[-1].str));
-		 (yyval.node) = 0;
-	       } else {
-
-		 while (Strcmp(nodeType(n),"using") == 0) {
-		   n = Getattr(n,"node");
-		 }
-		 if (n) {
-		   if (Strcmp(nodeType(n),"namespace") == 0) {
-		     Symtab *current = Swig_symbol_current();
-		     Symtab *symtab = Getattr(n,"symtab");
-		     (yyval.node) = new_node("using");
-		     Setattr((yyval.node),"node",n);
-		     Setattr((yyval.node),"namespace", (yyvsp[-1].str));
-		     if (current != symtab) {
-		       Swig_symbol_inherit(symtab);
-		     }
-		   } else {
-		     Swig_error(cparse_file, cparse_line, "'%s' is not a namespace.\n", (yyvsp[-1].str));
-		     (yyval.node) = 0;
-		   }
-		 } else {
-		   (yyval.node) = 0;
-		 }
-	       }
-             }
-#line 7808 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 187:
-#line 4264 "parser.y" /* yacc.c:1646  */
-    { 
-                Hash *h;
-                (yyvsp[-2].node) = Swig_symbol_current();
-		h = Swig_symbol_clookup((yyvsp[-1].str),0);
-		if (h && ((yyvsp[-2].node) == Getattr(h,"sym:symtab")) && (Strcmp(nodeType(h),"namespace") == 0)) {
-		  if (Getattr(h,"alias")) {
-		    h = Getattr(h,"namespace");
-		    Swig_warning(WARN_PARSE_NAMESPACE_ALIAS, cparse_file, cparse_line, "Namespace alias '%s' not allowed here. Assuming '%s'\n",
-				 (yyvsp[-1].str), Getattr(h,"name"));
-		    (yyvsp[-1].str) = Getattr(h,"name");
-		  }
-		  Swig_symbol_setscope(Getattr(h,"symtab"));
-		} else {
-		  Swig_symbol_newscope();
-		  Swig_symbol_setscopename((yyvsp[-1].str));
-		}
-		Delete(Namespaceprefix);
-		Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-             }
-#line 7832 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 188:
-#line 4282 "parser.y" /* yacc.c:1646  */
-    {
-                Node *n = (yyvsp[-1].node);
-		set_nodeType(n,"namespace");
-		Setattr(n,"name",(yyvsp[-4].str));
-                Setattr(n,"symtab", Swig_symbol_popscope());
-		Swig_symbol_setscope((yyvsp[-5].node));
-		(yyval.node) = n;
-		Delete(Namespaceprefix);
-		Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		add_symbols((yyval.node));
-             }
-#line 7848 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 189:
-#line 4293 "parser.y" /* yacc.c:1646  */
-    {
-	       Hash *h;
-	       (yyvsp[-1].node) = Swig_symbol_current();
-	       h = Swig_symbol_clookup("    ",0);
-	       if (h && (Strcmp(nodeType(h),"namespace") == 0)) {
-		 Swig_symbol_setscope(Getattr(h,"symtab"));
-	       } else {
-		 Swig_symbol_newscope();
-		 /* we don't use "__unnamed__", but a long 'empty' name */
-		 Swig_symbol_setscopename("    ");
-	       }
-	       Namespaceprefix = 0;
-             }
-#line 7866 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 190:
-#line 4305 "parser.y" /* yacc.c:1646  */
-    {
-	       (yyval.node) = (yyvsp[-1].node);
-	       set_nodeType((yyval.node),"namespace");
-	       Setattr((yyval.node),"unnamed","1");
-	       Setattr((yyval.node),"symtab", Swig_symbol_popscope());
-	       Swig_symbol_setscope((yyvsp[-4].node));
-	       Delete(Namespaceprefix);
-	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	       add_symbols((yyval.node));
-             }
-#line 7881 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 191:
-#line 4315 "parser.y" /* yacc.c:1646  */
-    {
-	       /* Namespace alias */
-	       Node *n;
-	       (yyval.node) = new_node("namespace");
-	       Setattr((yyval.node),"name",(yyvsp[-3].id));
-	       Setattr((yyval.node),"alias",(yyvsp[-1].str));
-	       n = Swig_symbol_clookup((yyvsp[-1].str),0);
-	       if (!n) {
-		 Swig_error(cparse_file, cparse_line, "Unknown namespace '%s'\n", (yyvsp[-1].str));
-		 (yyval.node) = 0;
-	       } else {
-		 if (Strcmp(nodeType(n),"namespace") != 0) {
-		   Swig_error(cparse_file, cparse_line, "'%s' is not a namespace\n",(yyvsp[-1].str));
-		   (yyval.node) = 0;
-		 } else {
-		   while (Getattr(n,"alias")) {
-		     n = Getattr(n,"namespace");
-		   }
-		   Setattr((yyval.node),"namespace",n);
-		   add_symbols((yyval.node));
-		   /* Set up a scope alias */
-		   Swig_symbol_alias((yyvsp[-3].id),Getattr(n,"symtab"));
-		 }
-	       }
-             }
-#line 7911 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 192:
-#line 4342 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.node) = (yyvsp[-1].node);
-                   /* Insert cpp_member (including any siblings) to the front of the cpp_members linked list */
-		   if ((yyval.node)) {
-		     Node *p = (yyval.node);
-		     Node *pp =0;
-		     while (p) {
-		       pp = p;
-		       p = nextSibling(p);
-		     }
-		     set_nextSibling(pp,(yyvsp[0].node));
-		     if ((yyvsp[0].node))
-		       set_previousSibling((yyvsp[0].node), pp);
-		   } else {
-		     (yyval.node) = (yyvsp[0].node);
-		   }
-             }
-#line 7933 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 193:
-#line 4359 "parser.y" /* yacc.c:1646  */
-    { 
-	       extendmode = 1;
-	       if (cplus_mode != CPLUS_PUBLIC) {
-		 Swig_error(cparse_file,cparse_line,"%%extend can only be used in a public section\n");
-	       }
-             }
-#line 7944 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 194:
-#line 4364 "parser.y" /* yacc.c:1646  */
-    {
-	       extendmode = 0;
-	     }
-#line 7952 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 195:
-#line 4366 "parser.y" /* yacc.c:1646  */
-    {
-	       (yyval.node) = new_node("extend");
-	       mark_nodes_as_extend((yyvsp[-3].node));
-	       appendChild((yyval.node),(yyvsp[-3].node));
-	       set_nextSibling((yyval.node),(yyvsp[0].node));
-	     }
-#line 7963 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 196:
-#line 4372 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 7969 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 197:
-#line 4373 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0;}
-#line 7975 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 198:
-#line 4374 "parser.y" /* yacc.c:1646  */
-    {
-	       int start_line = cparse_line;
-	       skip_decl();
-	       Swig_error(cparse_file,start_line,"Syntax error in input(3).\n");
-	       exit(1);
-	       }
-#line 7986 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 199:
-#line 4379 "parser.y" /* yacc.c:1646  */
-    { 
-		 (yyval.node) = (yyvsp[0].node);
-   	     }
-#line 7994 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 200:
-#line 4390 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8000 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 201:
-#line 4391 "parser.y" /* yacc.c:1646  */
-    { 
-                 (yyval.node) = (yyvsp[0].node); 
-		 if (extendmode && current_class) {
-		   String *symname;
-		   symname= make_name((yyval.node),Getattr((yyval.node),"name"), Getattr((yyval.node),"decl"));
-		   if (Strcmp(symname,Getattr((yyval.node),"name")) == 0) {
-		     /* No renaming operation.  Set name to class name */
-		     Delete(yyrename);
-		     yyrename = NewString(Getattr(current_class,"sym:name"));
-		   } else {
-		     Delete(yyrename);
-		     yyrename = symname;
-		   }
-		 }
-		 add_symbols((yyval.node));
-                 default_arguments((yyval.node));
-             }
-#line 8022 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 202:
-#line 4408 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8028 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 203:
-#line 4409 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8034 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 204:
-#line 4410 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8040 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 205:
-#line 4411 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8046 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 206:
-#line 4412 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8052 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 207:
-#line 4413 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8058 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 208:
-#line 4414 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8064 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 209:
-#line 4415 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 8070 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 210:
-#line 4416 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8076 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 211:
-#line 4417 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8082 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 212:
-#line 4418 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 8088 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 213:
-#line 4419 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8094 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 214:
-#line 4420 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8100 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 215:
-#line 4421 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 8106 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 216:
-#line 4422 "parser.y" /* yacc.c:1646  */
-    {(yyval.node) = (yyvsp[0].node); }
-#line 8112 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 217:
-#line 4423 "parser.y" /* yacc.c:1646  */
-    {(yyval.node) = (yyvsp[0].node); }
-#line 8118 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 218:
-#line 4424 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 8124 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 219:
-#line 4433 "parser.y" /* yacc.c:1646  */
-    {
-              if (inclass || extendmode) {
-		SwigType *decl = NewStringEmpty();
-		(yyval.node) = new_node("constructor");
-		Setattr((yyval.node),"storage",(yyvsp[-5].id));
-		Setattr((yyval.node),"name",(yyvsp[-4].type));
-		Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-		SwigType_add_function(decl,(yyvsp[-2].pl));
-		Setattr((yyval.node),"decl",decl);
-		Setattr((yyval.node),"throws",(yyvsp[0].decl).throws);
-		Setattr((yyval.node),"throw",(yyvsp[0].decl).throwf);
-		Setattr((yyval.node),"noexcept",(yyvsp[0].decl).nexcept);
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr((yyval.node),"code",code);
-		  Delete(code);
-		}
-		SetFlag((yyval.node),"feature:new");
-		if ((yyvsp[0].decl).defarg)
-		  Setattr((yyval.node),"value",(yyvsp[0].decl).defarg);
-	      } else {
-		(yyval.node) = 0;
-              }
-              }
-#line 8153 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 220:
-#line 4461 "parser.y" /* yacc.c:1646  */
-    {
-               String *name = NewStringf("%s",(yyvsp[-4].str));
-	       if (*(Char(name)) != '~') Insert(name,0,"~");
-               (yyval.node) = new_node("destructor");
-	       Setattr((yyval.node),"name",name);
-	       Delete(name);
-	       if (Len(scanner_ccode)) {
-		 String *code = Copy(scanner_ccode);
-		 Setattr((yyval.node),"code",code);
-		 Delete(code);
-	       }
-	       {
-		 String *decl = NewStringEmpty();
-		 SwigType_add_function(decl,(yyvsp[-2].pl));
-		 Setattr((yyval.node),"decl",decl);
-		 Delete(decl);
-	       }
-	       Setattr((yyval.node),"throws",(yyvsp[0].dtype).throws);
-	       Setattr((yyval.node),"throw",(yyvsp[0].dtype).throwf);
-	       Setattr((yyval.node),"noexcept",(yyvsp[0].dtype).nexcept);
-	       if ((yyvsp[0].dtype).val)
-	         Setattr((yyval.node),"value",(yyvsp[0].dtype).val);
-	       add_symbols((yyval.node));
-	      }
-#line 8182 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 221:
-#line 4488 "parser.y" /* yacc.c:1646  */
-    {
-		String *name;
-		(yyval.node) = new_node("destructor");
-		Setattr((yyval.node),"storage","virtual");
-	        name = NewStringf("%s",(yyvsp[-4].str));
-		if (*(Char(name)) != '~') Insert(name,0,"~");
-		Setattr((yyval.node),"name",name);
-		Delete(name);
-		Setattr((yyval.node),"throws",(yyvsp[0].dtype).throws);
-		Setattr((yyval.node),"throw",(yyvsp[0].dtype).throwf);
-		Setattr((yyval.node),"noexcept",(yyvsp[0].dtype).nexcept);
-		if ((yyvsp[0].dtype).val)
-		  Setattr((yyval.node),"value",(yyvsp[0].dtype).val);
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr((yyval.node),"code",code);
-		  Delete(code);
-		}
-		{
-		  String *decl = NewStringEmpty();
-		  SwigType_add_function(decl,(yyvsp[-2].pl));
-		  Setattr((yyval.node),"decl",decl);
-		  Delete(decl);
-		}
-
-		add_symbols((yyval.node));
-	      }
-#line 8214 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 222:
-#line 4519 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = new_node("cdecl");
-                 Setattr((yyval.node),"type",(yyvsp[-5].type));
-		 Setattr((yyval.node),"name",(yyvsp[-6].str));
-		 Setattr((yyval.node),"storage",(yyvsp[-7].id));
-
-		 SwigType_add_function((yyvsp[-4].type),(yyvsp[-2].pl));
-		 if ((yyvsp[0].dtype).qualifier) {
-		   SwigType_push((yyvsp[-4].type),(yyvsp[0].dtype).qualifier);
-		 }
-		 Setattr((yyval.node),"decl",(yyvsp[-4].type));
-		 Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-		 Setattr((yyval.node),"conversion_operator","1");
-		 add_symbols((yyval.node));
-              }
-#line 8234 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 223:
-#line 4534 "parser.y" /* yacc.c:1646  */
-    {
-		 SwigType *decl;
-                 (yyval.node) = new_node("cdecl");
-                 Setattr((yyval.node),"type",(yyvsp[-5].type));
-		 Setattr((yyval.node),"name",(yyvsp[-6].str));
-		 Setattr((yyval.node),"storage",(yyvsp[-7].id));
-		 decl = NewStringEmpty();
-		 SwigType_add_reference(decl);
-		 SwigType_add_function(decl,(yyvsp[-2].pl));
-		 if ((yyvsp[0].dtype).qualifier) {
-		   SwigType_push(decl,(yyvsp[0].dtype).qualifier);
-		 }
-		 Setattr((yyval.node),"decl",decl);
-		 Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-		 Setattr((yyval.node),"conversion_operator","1");
-		 add_symbols((yyval.node));
-	       }
-#line 8256 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 224:
-#line 4551 "parser.y" /* yacc.c:1646  */
-    {
-		 SwigType *decl;
-                 (yyval.node) = new_node("cdecl");
-                 Setattr((yyval.node),"type",(yyvsp[-5].type));
-		 Setattr((yyval.node),"name",(yyvsp[-6].str));
-		 Setattr((yyval.node),"storage",(yyvsp[-7].id));
-		 decl = NewStringEmpty();
-		 SwigType_add_rvalue_reference(decl);
-		 SwigType_add_function(decl,(yyvsp[-2].pl));
-		 if ((yyvsp[0].dtype).qualifier) {
-		   SwigType_push(decl,(yyvsp[0].dtype).qualifier);
-		 }
-		 Setattr((yyval.node),"decl",decl);
-		 Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-		 Setattr((yyval.node),"conversion_operator","1");
-		 add_symbols((yyval.node));
-	       }
-#line 8278 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 225:
-#line 4569 "parser.y" /* yacc.c:1646  */
-    {
-		 SwigType *decl;
-                 (yyval.node) = new_node("cdecl");
-                 Setattr((yyval.node),"type",(yyvsp[-6].type));
-		 Setattr((yyval.node),"name",(yyvsp[-7].str));
-		 Setattr((yyval.node),"storage",(yyvsp[-8].id));
-		 decl = NewStringEmpty();
-		 SwigType_add_pointer(decl);
-		 SwigType_add_reference(decl);
-		 SwigType_add_function(decl,(yyvsp[-2].pl));
-		 if ((yyvsp[0].dtype).qualifier) {
-		   SwigType_push(decl,(yyvsp[0].dtype).qualifier);
-		 }
-		 Setattr((yyval.node),"decl",decl);
-		 Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-		 Setattr((yyval.node),"conversion_operator","1");
-		 add_symbols((yyval.node));
-	       }
-#line 8301 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 226:
-#line 4588 "parser.y" /* yacc.c:1646  */
-    {
-		String *t = NewStringEmpty();
-		(yyval.node) = new_node("cdecl");
-		Setattr((yyval.node),"type",(yyvsp[-4].type));
-		Setattr((yyval.node),"name",(yyvsp[-5].str));
-		 Setattr((yyval.node),"storage",(yyvsp[-6].id));
-		SwigType_add_function(t,(yyvsp[-2].pl));
-		if ((yyvsp[0].dtype).qualifier) {
-		  SwigType_push(t,(yyvsp[0].dtype).qualifier);
-		}
-		Setattr((yyval.node),"decl",t);
-		Setattr((yyval.node),"parms",(yyvsp[-2].pl));
-		Setattr((yyval.node),"conversion_operator","1");
-		add_symbols((yyval.node));
-              }
-#line 8321 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 227:
-#line 4607 "parser.y" /* yacc.c:1646  */
-    {
-                 skip_balanced('{','}');
-                 (yyval.node) = 0;
-               }
-#line 8330 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 228:
-#line 4614 "parser.y" /* yacc.c:1646  */
-    {
-                skip_balanced('(',')');
-                (yyval.node) = 0;
-              }
-#line 8339 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 229:
-#line 4621 "parser.y" /* yacc.c:1646  */
-    { 
-                (yyval.node) = new_node("access");
-		Setattr((yyval.node),"kind","public");
-                cplus_mode = CPLUS_PUBLIC;
-              }
-#line 8349 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 230:
-#line 4628 "parser.y" /* yacc.c:1646  */
-    { 
-                (yyval.node) = new_node("access");
-                Setattr((yyval.node),"kind","private");
-		cplus_mode = CPLUS_PRIVATE;
-	      }
-#line 8359 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 231:
-#line 4636 "parser.y" /* yacc.c:1646  */
-    { 
-		(yyval.node) = new_node("access");
-		Setattr((yyval.node),"kind","protected");
-		cplus_mode = CPLUS_PROTECTED;
-	      }
-#line 8369 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 232:
-#line 4644 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8375 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 233:
-#line 4647 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8381 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 234:
-#line 4651 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8387 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 235:
-#line 4654 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8393 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 236:
-#line 4655 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8399 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 237:
-#line 4656 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8405 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 238:
-#line 4657 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8411 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 239:
-#line 4658 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8417 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 240:
-#line 4659 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8423 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 241:
-#line 4660 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8429 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 242:
-#line 4661 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 8435 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 243:
-#line 4664 "parser.y" /* yacc.c:1646  */
-    {
-	            Clear(scanner_ccode);
-		    (yyval.dtype).val = 0;
-		    (yyval.dtype).throws = (yyvsp[-1].dtype).throws;
-		    (yyval.dtype).throwf = (yyvsp[-1].dtype).throwf;
-		    (yyval.dtype).nexcept = (yyvsp[-1].dtype).nexcept;
-               }
-#line 8447 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 244:
-#line 4671 "parser.y" /* yacc.c:1646  */
-    {
-	            Clear(scanner_ccode);
-		    (yyval.dtype).val = (yyvsp[-1].dtype).val;
-		    (yyval.dtype).throws = (yyvsp[-3].dtype).throws;
-		    (yyval.dtype).throwf = (yyvsp[-3].dtype).throwf;
-		    (yyval.dtype).nexcept = (yyvsp[-3].dtype).nexcept;
-               }
-#line 8459 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 245:
-#line 4678 "parser.y" /* yacc.c:1646  */
-    { 
-		    skip_balanced('{','}'); 
-		    (yyval.dtype).val = 0;
-		    (yyval.dtype).throws = (yyvsp[-1].dtype).throws;
-		    (yyval.dtype).throwf = (yyvsp[-1].dtype).throwf;
-		    (yyval.dtype).nexcept = (yyvsp[-1].dtype).nexcept;
-	       }
-#line 8471 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 246:
-#line 4687 "parser.y" /* yacc.c:1646  */
-    { 
-                     Clear(scanner_ccode);
-                     (yyval.dtype).val = 0;
-                     (yyval.dtype).qualifier = (yyvsp[-1].dtype).qualifier;
-                     (yyval.dtype).bitfield = 0;
-                     (yyval.dtype).throws = (yyvsp[-1].dtype).throws;
-                     (yyval.dtype).throwf = (yyvsp[-1].dtype).throwf;
-                     (yyval.dtype).nexcept = (yyvsp[-1].dtype).nexcept;
-                }
-#line 8485 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 247:
-#line 4696 "parser.y" /* yacc.c:1646  */
-    { 
-                     Clear(scanner_ccode);
-                     (yyval.dtype).val = (yyvsp[-1].dtype).val;
-                     (yyval.dtype).qualifier = (yyvsp[-3].dtype).qualifier;
-                     (yyval.dtype).bitfield = 0;
-                     (yyval.dtype).throws = (yyvsp[-3].dtype).throws; 
-                     (yyval.dtype).throwf = (yyvsp[-3].dtype).throwf; 
-                     (yyval.dtype).nexcept = (yyvsp[-3].dtype).nexcept; 
-               }
-#line 8499 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 248:
-#line 4705 "parser.y" /* yacc.c:1646  */
-    { 
-                     skip_balanced('{','}');
-                     (yyval.dtype).val = 0;
-                     (yyval.dtype).qualifier = (yyvsp[-1].dtype).qualifier;
-                     (yyval.dtype).bitfield = 0;
-                     (yyval.dtype).throws = (yyvsp[-1].dtype).throws; 
-                     (yyval.dtype).throwf = (yyvsp[-1].dtype).throwf; 
-                     (yyval.dtype).nexcept = (yyvsp[-1].dtype).nexcept; 
-               }
-#line 8513 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 249:
-#line 4717 "parser.y" /* yacc.c:1646  */
-    { }
-#line 8519 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 250:
-#line 4720 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type);
-                  /* Printf(stdout,"primitive = '%s'\n", $$);*/
-                }
-#line 8527 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 251:
-#line 4723 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 8533 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 252:
-#line 4724 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 8539 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 253:
-#line 4728 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 8545 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 254:
-#line 4730 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.type) = (yyvsp[0].str);
-               }
-#line 8553 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 255:
-#line 4738 "parser.y" /* yacc.c:1646  */
-    {
-                   if (Strcmp((yyvsp[0].str),"C") == 0) {
-		     (yyval.id) = "externc";
-                   } else if (Strcmp((yyvsp[0].str),"C++") == 0) {
-		     (yyval.id) = "extern";
-		   } else {
-		     Swig_warning(WARN_PARSE_UNDEFINED_EXTERN,cparse_file, cparse_line,"Unrecognized extern type \"%s\".\n", (yyvsp[0].str));
-		     (yyval.id) = 0;
-		   }
-               }
-#line 8568 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 256:
-#line 4750 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "extern"; }
-#line 8574 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 257:
-#line 4751 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (yyvsp[0].id); }
-#line 8580 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 258:
-#line 4752 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "thread_local"; }
-#line 8586 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 259:
-#line 4753 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "typedef"; }
-#line 8592 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 260:
-#line 4754 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "static"; }
-#line 8598 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 261:
-#line 4755 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "typedef"; }
-#line 8604 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 262:
-#line 4756 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "virtual"; }
-#line 8610 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 263:
-#line 4757 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "friend"; }
-#line 8616 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 264:
-#line 4758 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "explicit"; }
-#line 8622 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 265:
-#line 4759 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "constexpr"; }
-#line 8628 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 266:
-#line 4760 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "explicit constexpr"; }
-#line 8634 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 267:
-#line 4761 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "explicit constexpr"; }
-#line 8640 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 268:
-#line 4762 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "static constexpr"; }
-#line 8646 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 269:
-#line 4763 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "static constexpr"; }
-#line 8652 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 270:
-#line 4764 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "thread_local"; }
-#line 8658 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 271:
-#line 4765 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "static thread_local"; }
-#line 8664 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 272:
-#line 4766 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "static thread_local"; }
-#line 8670 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 273:
-#line 4767 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "extern thread_local"; }
-#line 8676 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 274:
-#line 4768 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "extern thread_local"; }
-#line 8682 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 275:
-#line 4769 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = 0; }
-#line 8688 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 276:
-#line 4776 "parser.y" /* yacc.c:1646  */
-    {
-                 Parm *p;
-		 (yyval.pl) = (yyvsp[0].pl);
-		 p = (yyvsp[0].pl);
-                 while (p) {
-		   Replace(Getattr(p,"type"),"typename ", "", DOH_REPLACE_ANY);
-		   p = nextSibling(p);
-                 }
-               }
-#line 8702 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 277:
-#line 4787 "parser.y" /* yacc.c:1646  */
-    {
-                  set_nextSibling((yyvsp[-1].p),(yyvsp[0].pl));
-                  (yyval.pl) = (yyvsp[-1].p);
-		}
-#line 8711 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 278:
-#line 4791 "parser.y" /* yacc.c:1646  */
-    { (yyval.pl) = 0; }
-#line 8717 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 279:
-#line 4794 "parser.y" /* yacc.c:1646  */
-    {
-                 set_nextSibling((yyvsp[-1].p),(yyvsp[0].pl));
-		 (yyval.pl) = (yyvsp[-1].p);
-                }
-#line 8726 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 280:
-#line 4798 "parser.y" /* yacc.c:1646  */
-    { (yyval.pl) = 0; }
-#line 8732 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 281:
-#line 4802 "parser.y" /* yacc.c:1646  */
-    {
-                   SwigType_push((yyvsp[-1].type),(yyvsp[0].decl).type);
-		   (yyval.p) = NewParmWithoutFileLineInfo((yyvsp[-1].type),(yyvsp[0].decl).id);
-		   Setfile((yyval.p),cparse_file);
-		   Setline((yyval.p),cparse_line);
-		   if ((yyvsp[0].decl).defarg) {
-		     Setattr((yyval.p),"value",(yyvsp[0].decl).defarg);
-		   }
-		}
-#line 8746 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 282:
-#line 4812 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.p) = NewParmWithoutFileLineInfo(NewStringf("template<class> %s %s", (yyvsp[-2].id),(yyvsp[-1].str)), 0);
-		  Setfile((yyval.p),cparse_file);
-		  Setline((yyval.p),cparse_line);
-                  if ((yyvsp[0].dtype).val) {
-                    Setattr((yyval.p),"value",(yyvsp[0].dtype).val);
-                  }
-                }
-#line 8759 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 283:
-#line 4820 "parser.y" /* yacc.c:1646  */
-    {
-		  SwigType *t = NewString("v(...)");
-		  (yyval.p) = NewParmWithoutFileLineInfo(t, 0);
-		  Setfile((yyval.p),cparse_file);
-		  Setline((yyval.p),cparse_line);
-		}
-#line 8770 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 284:
-#line 4828 "parser.y" /* yacc.c:1646  */
-    {
-                 Parm *p;
-		 (yyval.p) = (yyvsp[0].p);
-		 p = (yyvsp[0].p);
-                 while (p) {
-		   if (Getattr(p,"type")) {
-		     Replace(Getattr(p,"type"),"typename ", "", DOH_REPLACE_ANY);
-		   }
-		   p = nextSibling(p);
-                 }
-               }
-#line 8786 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 285:
-#line 4841 "parser.y" /* yacc.c:1646  */
-    {
-                  set_nextSibling((yyvsp[-1].p),(yyvsp[0].p));
-                  (yyval.p) = (yyvsp[-1].p);
-		}
-#line 8795 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 286:
-#line 4845 "parser.y" /* yacc.c:1646  */
-    { (yyval.p) = 0; }
-#line 8801 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 287:
-#line 4848 "parser.y" /* yacc.c:1646  */
-    {
-                 set_nextSibling((yyvsp[-1].p),(yyvsp[0].p));
-		 (yyval.p) = (yyvsp[-1].p);
-                }
-#line 8810 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 288:
-#line 4852 "parser.y" /* yacc.c:1646  */
-    { (yyval.p) = 0; }
-#line 8816 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 289:
-#line 4856 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.p) = (yyvsp[0].p);
-		  {
-		    /* We need to make a possible adjustment for integer parameters. */
-		    SwigType *type;
-		    Node     *n = 0;
-
-		    while (!n) {
-		      type = Getattr((yyvsp[0].p),"type");
-		      n = Swig_symbol_clookup(type,0);     /* See if we can find a node that matches the typename */
-		      if ((n) && (Strcmp(nodeType(n),"cdecl") == 0)) {
-			SwigType *decl = Getattr(n,"decl");
-			if (!SwigType_isfunction(decl)) {
-			  String *value = Getattr(n,"value");
-			  if (value) {
-			    String *v = Copy(value);
-			    Setattr((yyvsp[0].p),"type",v);
-			    Delete(v);
-			    n = 0;
-			  }
-			}
-		      } else {
-			break;
-		      }
-		    }
-		  }
-
-               }
-#line 8849 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 290:
-#line 4884 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.p) = NewParmWithoutFileLineInfo(0,0);
-                  Setfile((yyval.p),cparse_file);
-		  Setline((yyval.p),cparse_line);
-		  Setattr((yyval.p),"value",(yyvsp[0].dtype).val);
-               }
-#line 8860 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 291:
-#line 4892 "parser.y" /* yacc.c:1646  */
-    { 
-                  (yyval.dtype) = (yyvsp[0].dtype); 
-		  if ((yyvsp[0].dtype).type == T_ERROR) {
-		    Swig_warning(WARN_PARSE_BAD_DEFAULT,cparse_file, cparse_line, "Can't set default argument (ignored)\n");
-		    (yyval.dtype).val = 0;
-		    (yyval.dtype).rawval = 0;
-		    (yyval.dtype).bitfield = 0;
-		    (yyval.dtype).throws = 0;
-		    (yyval.dtype).throwf = 0;
-		    (yyval.dtype).nexcept = 0;
-		  }
-               }
-#line 8877 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 292:
-#line 4904 "parser.y" /* yacc.c:1646  */
-    { 
-		  (yyval.dtype) = (yyvsp[-3].dtype);
-		  if ((yyvsp[-3].dtype).type == T_ERROR) {
-		    Swig_warning(WARN_PARSE_BAD_DEFAULT,cparse_file, cparse_line, "Can't set default argument (ignored)\n");
-		    (yyval.dtype) = (yyvsp[-3].dtype);
-		    (yyval.dtype).val = 0;
-		    (yyval.dtype).rawval = 0;
-		    (yyval.dtype).bitfield = 0;
-		    (yyval.dtype).throws = 0;
-		    (yyval.dtype).throwf = 0;
-		    (yyval.dtype).nexcept = 0;
-		  } else {
-		    (yyval.dtype).val = NewStringf("%s[%s]",(yyvsp[-3].dtype).val,(yyvsp[-1].dtype).val); 
-		  }		  
-               }
-#line 8897 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 293:
-#line 4919 "parser.y" /* yacc.c:1646  */
-    {
-		 skip_balanced('{','}');
-		 (yyval.dtype).val = NewString(scanner_ccode);
-		 (yyval.dtype).rawval = 0;
-                 (yyval.dtype).type = T_INT;
-		 (yyval.dtype).bitfield = 0;
-		 (yyval.dtype).throws = 0;
-		 (yyval.dtype).throwf = 0;
-		 (yyval.dtype).nexcept = 0;
-	       }
-#line 8912 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 294:
-#line 4929 "parser.y" /* yacc.c:1646  */
-    { 
-		 (yyval.dtype).val = 0;
-		 (yyval.dtype).rawval = 0;
-		 (yyval.dtype).type = 0;
-		 (yyval.dtype).bitfield = (yyvsp[0].dtype).val;
-		 (yyval.dtype).throws = 0;
-		 (yyval.dtype).throwf = 0;
-		 (yyval.dtype).nexcept = 0;
-	       }
-#line 8926 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 295:
-#line 4938 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype).val = 0;
-                 (yyval.dtype).rawval = 0;
-                 (yyval.dtype).type = T_INT;
-		 (yyval.dtype).bitfield = 0;
-		 (yyval.dtype).throws = 0;
-		 (yyval.dtype).throwf = 0;
-		 (yyval.dtype).nexcept = 0;
-               }
-#line 8940 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 296:
-#line 4949 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.decl) = (yyvsp[-1].decl);
-		 (yyval.decl).defarg = (yyvsp[0].dtype).rawval ? (yyvsp[0].dtype).rawval : (yyvsp[0].dtype).val;
-            }
-#line 8949 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 297:
-#line 4953 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[-1].decl);
-	      (yyval.decl).defarg = (yyvsp[0].dtype).rawval ? (yyvsp[0].dtype).rawval : (yyvsp[0].dtype).val;
-            }
-#line 8958 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 298:
-#line 4957 "parser.y" /* yacc.c:1646  */
-    {
-   	      (yyval.decl).type = 0;
-              (yyval.decl).id = 0;
-	      (yyval.decl).defarg = (yyvsp[0].dtype).rawval ? (yyvsp[0].dtype).rawval : (yyvsp[0].dtype).val;
-            }
-#line 8968 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 299:
-#line 4964 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.decl) = (yyvsp[0].decl);
-		 if (SwigType_isfunction((yyvsp[0].decl).type)) {
-		   Delete(SwigType_pop_function((yyvsp[0].decl).type));
-		 } else if (SwigType_isarray((yyvsp[0].decl).type)) {
-		   SwigType *ta = SwigType_pop_arrays((yyvsp[0].decl).type);
-		   if (SwigType_isfunction((yyvsp[0].decl).type)) {
-		     Delete(SwigType_pop_function((yyvsp[0].decl).type));
-		   } else {
-		     (yyval.decl).parms = 0;
-		   }
-		   SwigType_push((yyvsp[0].decl).type,ta);
-		   Delete(ta);
-		 } else {
-		   (yyval.decl).parms = 0;
-		 }
-            }
-#line 8990 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 300:
-#line 4981 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      if (SwigType_isfunction((yyvsp[0].decl).type)) {
-		Delete(SwigType_pop_function((yyvsp[0].decl).type));
-	      } else if (SwigType_isarray((yyvsp[0].decl).type)) {
-		SwigType *ta = SwigType_pop_arrays((yyvsp[0].decl).type);
-		if (SwigType_isfunction((yyvsp[0].decl).type)) {
-		  Delete(SwigType_pop_function((yyvsp[0].decl).type));
-		} else {
-		  (yyval.decl).parms = 0;
-		}
-		SwigType_push((yyvsp[0].decl).type,ta);
-		Delete(ta);
-	      } else {
-		(yyval.decl).parms = 0;
-	      }
-            }
-#line 9012 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 301:
-#line 4998 "parser.y" /* yacc.c:1646  */
-    {
-   	      (yyval.decl).type = 0;
-              (yyval.decl).id = 0;
-	      (yyval.decl).parms = 0;
-	      }
-#line 9022 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 302:
-#line 5006 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      if ((yyval.decl).type) {
-		SwigType_push((yyvsp[-1].type),(yyval.decl).type);
-		Delete((yyval.decl).type);
-	      }
-	      (yyval.decl).type = (yyvsp[-1].type);
-           }
-#line 9035 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 303:
-#line 5014 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      SwigType_add_reference((yyvsp[-2].type));
-              if ((yyval.decl).type) {
-		SwigType_push((yyvsp[-2].type),(yyval.decl).type);
-		Delete((yyval.decl).type);
-	      }
-	      (yyval.decl).type = (yyvsp[-2].type);
-           }
-#line 9049 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 304:
-#line 5023 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      SwigType_add_rvalue_reference((yyvsp[-2].type));
-              if ((yyval.decl).type) {
-		SwigType_push((yyvsp[-2].type),(yyval.decl).type);
-		Delete((yyval.decl).type);
-	      }
-	      (yyval.decl).type = (yyvsp[-2].type);
-           }
-#line 9063 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 305:
-#line 5032 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      if (!(yyval.decl).type) (yyval.decl).type = NewStringEmpty();
-           }
-#line 9072 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 306:
-#line 5036 "parser.y" /* yacc.c:1646  */
-    {
-	     (yyval.decl) = (yyvsp[0].decl);
-	     (yyval.decl).type = NewStringEmpty();
-	     SwigType_add_reference((yyval.decl).type);
-	     if ((yyvsp[0].decl).type) {
-	       SwigType_push((yyval.decl).type,(yyvsp[0].decl).type);
-	       Delete((yyvsp[0].decl).type);
-	     }
-           }
-#line 9086 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 307:
-#line 5045 "parser.y" /* yacc.c:1646  */
-    {
-	     /* Introduced in C++11, move operator && */
-             /* Adds one S/R conflict */
-	     (yyval.decl) = (yyvsp[0].decl);
-	     (yyval.decl).type = NewStringEmpty();
-	     SwigType_add_rvalue_reference((yyval.decl).type);
-	     if ((yyvsp[0].decl).type) {
-	       SwigType_push((yyval.decl).type,(yyvsp[0].decl).type);
-	       Delete((yyvsp[0].decl).type);
-	     }
-           }
-#line 9102 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 308:
-#line 5056 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-2].str));
-	     if ((yyval.decl).type) {
-	       SwigType_push(t,(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = t;
-	     }
-#line 9118 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 309:
-#line 5067 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-2].str));
-	     SwigType_push((yyvsp[-3].type),t);
-	     if ((yyval.decl).type) {
-	       SwigType_push((yyvsp[-3].type),(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = (yyvsp[-3].type);
-	     Delete(t);
-	   }
-#line 9135 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 310:
-#line 5079 "parser.y" /* yacc.c:1646  */
-    { 
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer((yyvsp[-4].type),(yyvsp[-3].str));
-	     SwigType_add_reference((yyvsp[-4].type));
-	     if ((yyval.decl).type) {
-	       SwigType_push((yyvsp[-4].type),(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = (yyvsp[-4].type);
-	   }
-#line 9150 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 311:
-#line 5089 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-3].str));
-	     SwigType_add_reference(t);
-	     if ((yyval.decl).type) {
-	       SwigType_push(t,(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     } 
-	     (yyval.decl).type = t;
-	   }
-#line 9166 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 312:
-#line 5103 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      if ((yyval.decl).type) {
-		SwigType_push((yyvsp[-4].type),(yyval.decl).type);
-		Delete((yyval.decl).type);
-	      }
-	      (yyval.decl).type = (yyvsp[-4].type);
-           }
-#line 9179 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 313:
-#line 5111 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      SwigType_add_reference((yyvsp[-5].type));
-              if ((yyval.decl).type) {
-		SwigType_push((yyvsp[-5].type),(yyval.decl).type);
-		Delete((yyval.decl).type);
-	      }
-	      (yyval.decl).type = (yyvsp[-5].type);
-           }
-#line 9193 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 314:
-#line 5120 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      SwigType_add_rvalue_reference((yyvsp[-5].type));
-              if ((yyval.decl).type) {
-		SwigType_push((yyvsp[-5].type),(yyval.decl).type);
-		Delete((yyval.decl).type);
-	      }
-	      (yyval.decl).type = (yyvsp[-5].type);
-           }
-#line 9207 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 315:
-#line 5129 "parser.y" /* yacc.c:1646  */
-    {
-              (yyval.decl) = (yyvsp[0].decl);
-	      if (!(yyval.decl).type) (yyval.decl).type = NewStringEmpty();
-           }
-#line 9216 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 316:
-#line 5133 "parser.y" /* yacc.c:1646  */
-    {
-	     (yyval.decl) = (yyvsp[0].decl);
-	     (yyval.decl).type = NewStringEmpty();
-	     SwigType_add_reference((yyval.decl).type);
-	     if ((yyvsp[0].decl).type) {
-	       SwigType_push((yyval.decl).type,(yyvsp[0].decl).type);
-	       Delete((yyvsp[0].decl).type);
-	     }
-           }
-#line 9230 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 317:
-#line 5142 "parser.y" /* yacc.c:1646  */
-    {
-	     /* Introduced in C++11, move operator && */
-             /* Adds one S/R conflict */
-	     (yyval.decl) = (yyvsp[0].decl);
-	     (yyval.decl).type = NewStringEmpty();
-	     SwigType_add_rvalue_reference((yyval.decl).type);
-	     if ((yyvsp[0].decl).type) {
-	       SwigType_push((yyval.decl).type,(yyvsp[0].decl).type);
-	       Delete((yyvsp[0].decl).type);
-	     }
-           }
-#line 9246 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 318:
-#line 5153 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-5].str));
-	     if ((yyval.decl).type) {
-	       SwigType_push(t,(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = t;
-	     }
-#line 9262 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 319:
-#line 5164 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-5].str));
-	     SwigType_push((yyvsp[-6].type),t);
-	     if ((yyval.decl).type) {
-	       SwigType_push((yyvsp[-6].type),(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = (yyvsp[-6].type);
-	     Delete(t);
-	   }
-#line 9279 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 320:
-#line 5176 "parser.y" /* yacc.c:1646  */
-    { 
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer((yyvsp[-7].type),(yyvsp[-6].str));
-	     SwigType_add_reference((yyvsp[-7].type));
-	     if ((yyval.decl).type) {
-	       SwigType_push((yyvsp[-7].type),(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = (yyvsp[-7].type);
-	   }
-#line 9294 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 321:
-#line 5186 "parser.y" /* yacc.c:1646  */
-    { 
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer((yyvsp[-7].type),(yyvsp[-6].str));
-	     SwigType_add_rvalue_reference((yyvsp[-7].type));
-	     if ((yyval.decl).type) {
-	       SwigType_push((yyvsp[-7].type),(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     }
-	     (yyval.decl).type = (yyvsp[-7].type);
-	   }
-#line 9309 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 322:
-#line 5196 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-6].str));
-	     SwigType_add_reference(t);
-	     if ((yyval.decl).type) {
-	       SwigType_push(t,(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     } 
-	     (yyval.decl).type = t;
-	   }
-#line 9325 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 323:
-#line 5207 "parser.y" /* yacc.c:1646  */
-    { 
-	     SwigType *t = NewStringEmpty();
-	     (yyval.decl) = (yyvsp[0].decl);
-	     SwigType_add_memberpointer(t,(yyvsp[-6].str));
-	     SwigType_add_rvalue_reference(t);
-	     if ((yyval.decl).type) {
-	       SwigType_push(t,(yyval.decl).type);
-	       Delete((yyval.decl).type);
-	     } 
-	     (yyval.decl).type = t;
-	   }
-#line 9341 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 324:
-#line 5220 "parser.y" /* yacc.c:1646  */
-    {
-                /* Note: This is non-standard C.  Template declarator is allowed to follow an identifier */
-                 (yyval.decl).id = Char((yyvsp[0].str));
-		 (yyval.decl).type = 0;
-		 (yyval.decl).parms = 0;
-		 (yyval.decl).have_parms = 0;
-                  }
-#line 9353 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 325:
-#line 5227 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.decl).id = Char(NewStringf("~%s",(yyvsp[0].str)));
-                  (yyval.decl).type = 0;
-                  (yyval.decl).parms = 0;
-                  (yyval.decl).have_parms = 0;
-                  }
-#line 9364 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 326:
-#line 5235 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.decl).id = Char((yyvsp[-1].str));
-                  (yyval.decl).type = 0;
-                  (yyval.decl).parms = 0;
-                  (yyval.decl).have_parms = 0;
-                  }
-#line 9375 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 327:
-#line 5251 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[-1].decl);
-		    if ((yyval.decl).type) {
-		      SwigType_push((yyvsp[-2].type),(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = (yyvsp[-2].type);
-                  }
-#line 9388 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 328:
-#line 5259 "parser.y" /* yacc.c:1646  */
-    {
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-1].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_memberpointer(t,(yyvsp[-3].str));
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-		    }
-#line 9404 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 329:
-#line 5270 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-2].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,"");
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-                  }
-#line 9420 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 330:
-#line 5281 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-3].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,(yyvsp[-1].dtype).val);
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-                  }
-#line 9436 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 331:
-#line 5292 "parser.y" /* yacc.c:1646  */
-    {
-		    SwigType *t;
-                    (yyval.decl) = (yyvsp[-3].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_function(t,(yyvsp[-1].pl));
-		    if (!(yyval.decl).have_parms) {
-		      (yyval.decl).parms = (yyvsp[-1].pl);
-		      (yyval.decl).have_parms = 1;
-		    }
-		    if (!(yyval.decl).type) {
-		      (yyval.decl).type = t;
-		    } else {
-		      SwigType_push(t, (yyval.decl).type);
-		      Delete((yyval.decl).type);
-		      (yyval.decl).type = t;
-		    }
-		  }
-#line 9458 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 332:
-#line 5311 "parser.y" /* yacc.c:1646  */
-    {
-                /* Note: This is non-standard C.  Template declarator is allowed to follow an identifier */
-                 (yyval.decl).id = Char((yyvsp[0].str));
-		 (yyval.decl).type = 0;
-		 (yyval.decl).parms = 0;
-		 (yyval.decl).have_parms = 0;
-                  }
-#line 9470 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 333:
-#line 5319 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.decl).id = Char(NewStringf("~%s",(yyvsp[0].str)));
-                  (yyval.decl).type = 0;
-                  (yyval.decl).parms = 0;
-                  (yyval.decl).have_parms = 0;
-                  }
-#line 9481 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 334:
-#line 5336 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[-1].decl);
-		    if ((yyval.decl).type) {
-		      SwigType_push((yyvsp[-2].type),(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = (yyvsp[-2].type);
-                  }
-#line 9494 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 335:
-#line 5344 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl) = (yyvsp[-1].decl);
-		    if (!(yyval.decl).type) {
-		      (yyval.decl).type = NewStringEmpty();
-		    }
-		    SwigType_add_reference((yyval.decl).type);
-                  }
-#line 9506 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 336:
-#line 5351 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl) = (yyvsp[-1].decl);
-		    if (!(yyval.decl).type) {
-		      (yyval.decl).type = NewStringEmpty();
-		    }
-		    SwigType_add_rvalue_reference((yyval.decl).type);
-                  }
-#line 9518 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 337:
-#line 5358 "parser.y" /* yacc.c:1646  */
-    {
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-1].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_memberpointer(t,(yyvsp[-3].str));
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-		    }
-#line 9534 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 338:
-#line 5369 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-2].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,"");
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-                  }
-#line 9550 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 339:
-#line 5380 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-3].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,(yyvsp[-1].dtype).val);
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-                  }
-#line 9566 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 340:
-#line 5391 "parser.y" /* yacc.c:1646  */
-    {
-		    SwigType *t;
-                    (yyval.decl) = (yyvsp[-3].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_function(t,(yyvsp[-1].pl));
-		    if (!(yyval.decl).have_parms) {
-		      (yyval.decl).parms = (yyvsp[-1].pl);
-		      (yyval.decl).have_parms = 1;
-		    }
-		    if (!(yyval.decl).type) {
-		      (yyval.decl).type = t;
-		    } else {
-		      SwigType_push(t, (yyval.decl).type);
-		      Delete((yyval.decl).type);
-		      (yyval.decl).type = t;
-		    }
-                 }
-#line 9588 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 341:
-#line 5411 "parser.y" /* yacc.c:1646  */
-    {
-		    SwigType *t;
-                    Append((yyvsp[-4].str), " "); /* intervening space is mandatory */
-                    Append((yyvsp[-4].str), Char((yyvsp[-3].id)));
-		    (yyval.decl).id = Char((yyvsp[-4].str));
-		    t = NewStringEmpty();
-		    SwigType_add_function(t,(yyvsp[-1].pl));
-		    if (!(yyval.decl).have_parms) {
-		      (yyval.decl).parms = (yyvsp[-1].pl);
-		      (yyval.decl).have_parms = 1;
-		    }
-		    if (!(yyval.decl).type) {
-		      (yyval.decl).type = t;
-		    } else {
-		      SwigType_push(t, (yyval.decl).type);
-		      Delete((yyval.decl).type);
-		      (yyval.decl).type = t;
-		    }
-		  }
-#line 9612 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 342:
-#line 5432 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl).type = (yyvsp[0].type);
-                    (yyval.decl).id = 0;
-		    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-                  }
-#line 9623 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 343:
-#line 5438 "parser.y" /* yacc.c:1646  */
-    { 
-                     (yyval.decl) = (yyvsp[0].decl);
-                     SwigType_push((yyvsp[-1].type),(yyvsp[0].decl).type);
-		     (yyval.decl).type = (yyvsp[-1].type);
-		     Delete((yyvsp[0].decl).type);
-                  }
-#line 9634 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 344:
-#line 5444 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl).type = (yyvsp[-1].type);
-		    SwigType_add_reference((yyval.decl).type);
-		    (yyval.decl).id = 0;
-		    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-		  }
-#line 9646 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 345:
-#line 5451 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl).type = (yyvsp[-1].type);
-		    SwigType_add_rvalue_reference((yyval.decl).type);
-		    (yyval.decl).id = 0;
-		    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-		  }
-#line 9658 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 346:
-#line 5458 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[0].decl);
-		    SwigType_add_reference((yyvsp[-2].type));
-		    if ((yyval.decl).type) {
-		      SwigType_push((yyvsp[-2].type),(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = (yyvsp[-2].type);
-                  }
-#line 9672 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 347:
-#line 5467 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[0].decl);
-		    SwigType_add_rvalue_reference((yyvsp[-2].type));
-		    if ((yyval.decl).type) {
-		      SwigType_push((yyvsp[-2].type),(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = (yyvsp[-2].type);
-                  }
-#line 9686 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 348:
-#line 5476 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[0].decl);
-                  }
-#line 9694 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 349:
-#line 5479 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[0].decl);
-		    (yyval.decl).type = NewStringEmpty();
-		    SwigType_add_reference((yyval.decl).type);
-		    if ((yyvsp[0].decl).type) {
-		      SwigType_push((yyval.decl).type,(yyvsp[0].decl).type);
-		      Delete((yyvsp[0].decl).type);
-		    }
-                  }
-#line 9708 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 350:
-#line 5488 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.decl) = (yyvsp[0].decl);
-		    (yyval.decl).type = NewStringEmpty();
-		    SwigType_add_rvalue_reference((yyval.decl).type);
-		    if ((yyvsp[0].decl).type) {
-		      SwigType_push((yyval.decl).type,(yyvsp[0].decl).type);
-		      Delete((yyvsp[0].decl).type);
-		    }
-                  }
-#line 9722 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 351:
-#line 5497 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl).id = 0;
-                    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-                    (yyval.decl).type = NewStringEmpty();
-		    SwigType_add_reference((yyval.decl).type);
-                  }
-#line 9734 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 352:
-#line 5504 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl).id = 0;
-                    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-                    (yyval.decl).type = NewStringEmpty();
-		    SwigType_add_rvalue_reference((yyval.decl).type);
-                  }
-#line 9746 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 353:
-#line 5511 "parser.y" /* yacc.c:1646  */
-    { 
-		    (yyval.decl).type = NewStringEmpty();
-                    SwigType_add_memberpointer((yyval.decl).type,(yyvsp[-1].str));
-                    (yyval.decl).id = 0;
-                    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-      	          }
-#line 9758 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 354:
-#line 5518 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t = NewStringEmpty();
-                    (yyval.decl).type = (yyvsp[-2].type);
-		    (yyval.decl).id = 0;
-		    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-		    SwigType_add_memberpointer(t,(yyvsp[-1].str));
-		    SwigType_push((yyval.decl).type,t);
-		    Delete(t);
-                  }
-#line 9773 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 355:
-#line 5528 "parser.y" /* yacc.c:1646  */
-    { 
-		    (yyval.decl) = (yyvsp[0].decl);
-		    SwigType_add_memberpointer((yyvsp[-3].type),(yyvsp[-2].str));
-		    if ((yyval.decl).type) {
-		      SwigType_push((yyvsp[-3].type),(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = (yyvsp[-3].type);
-                  }
-#line 9787 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 356:
-#line 5539 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-2].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,"");
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-                  }
-#line 9803 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 357:
-#line 5550 "parser.y" /* yacc.c:1646  */
-    { 
-		    SwigType *t;
-		    (yyval.decl) = (yyvsp[-3].decl);
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,(yyvsp[-1].dtype).val);
-		    if ((yyval.decl).type) {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		    }
-		    (yyval.decl).type = t;
-                  }
-#line 9819 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 358:
-#line 5561 "parser.y" /* yacc.c:1646  */
-    { 
-		    (yyval.decl).type = NewStringEmpty();
-		    (yyval.decl).id = 0;
-		    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-		    SwigType_add_array((yyval.decl).type,"");
-                  }
-#line 9831 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 359:
-#line 5568 "parser.y" /* yacc.c:1646  */
-    { 
-		    (yyval.decl).type = NewStringEmpty();
-		    (yyval.decl).id = 0;
-		    (yyval.decl).parms = 0;
-		    (yyval.decl).have_parms = 0;
-		    SwigType_add_array((yyval.decl).type,(yyvsp[-1].dtype).val);
-		  }
-#line 9843 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 360:
-#line 5575 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl) = (yyvsp[-1].decl);
-		  }
-#line 9851 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 361:
-#line 5578 "parser.y" /* yacc.c:1646  */
-    {
-		    SwigType *t;
-                    (yyval.decl) = (yyvsp[-3].decl);
-		    t = NewStringEmpty();
-                    SwigType_add_function(t,(yyvsp[-1].pl));
-		    if (!(yyval.decl).type) {
-		      (yyval.decl).type = t;
-		    } else {
-		      SwigType_push(t,(yyval.decl).type);
-		      Delete((yyval.decl).type);
-		      (yyval.decl).type = t;
-		    }
-		    if (!(yyval.decl).have_parms) {
-		      (yyval.decl).parms = (yyvsp[-1].pl);
-		      (yyval.decl).have_parms = 1;
-		    }
-		  }
-#line 9873 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 362:
-#line 5595 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl).type = NewStringEmpty();
-                    SwigType_add_function((yyval.decl).type,(yyvsp[-1].pl));
-		    (yyval.decl).parms = (yyvsp[-1].pl);
-		    (yyval.decl).have_parms = 1;
-		    (yyval.decl).id = 0;
-                  }
-#line 9885 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 363:
-#line 5605 "parser.y" /* yacc.c:1646  */
-    { 
-             (yyval.type) = NewStringEmpty();
-             SwigType_add_pointer((yyval.type));
-	     SwigType_push((yyval.type),(yyvsp[-1].str));
-	     SwigType_push((yyval.type),(yyvsp[0].type));
-	     Delete((yyvsp[0].type));
-           }
-#line 9897 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 364:
-#line 5612 "parser.y" /* yacc.c:1646  */
-    {
-	     (yyval.type) = NewStringEmpty();
-	     SwigType_add_pointer((yyval.type));
-	     SwigType_push((yyval.type),(yyvsp[0].type));
-	     Delete((yyvsp[0].type));
-	   }
-#line 9908 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 365:
-#line 5618 "parser.y" /* yacc.c:1646  */
-    { 
-	     (yyval.type) = NewStringEmpty();
-	     SwigType_add_pointer((yyval.type));
-	     SwigType_push((yyval.type),(yyvsp[0].str));
-           }
-#line 9918 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 366:
-#line 5623 "parser.y" /* yacc.c:1646  */
-    {
-	     (yyval.type) = NewStringEmpty();
-	     SwigType_add_pointer((yyval.type));
-           }
-#line 9927 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 367:
-#line 5629 "parser.y" /* yacc.c:1646  */
-    {
-	          (yyval.str) = NewStringEmpty();
-	          if ((yyvsp[0].id)) SwigType_add_qualifier((yyval.str),(yyvsp[0].id));
-               }
-#line 9936 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 368:
-#line 5633 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.str) = (yyvsp[0].str);
-	          if ((yyvsp[-1].id)) SwigType_add_qualifier((yyval.str),(yyvsp[-1].id));
-               }
-#line 9945 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 369:
-#line 5639 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "const"; }
-#line 9951 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 370:
-#line 5640 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = "volatile"; }
-#line 9957 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 371:
-#line 5641 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = 0; }
-#line 9963 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 372:
-#line 5647 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.type) = (yyvsp[0].type);
-                   Replace((yyval.type),"typename ","", DOH_REPLACE_ANY);
-                }
-#line 9972 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 373:
-#line 5653 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.type) = (yyvsp[0].type);
-	           SwigType_push((yyval.type),(yyvsp[-1].str));
-               }
-#line 9981 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 374:
-#line 5657 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 9987 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 375:
-#line 5658 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.type) = (yyvsp[-1].type);
-	          SwigType_push((yyval.type),(yyvsp[0].str));
-	       }
-#line 9996 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 376:
-#line 5662 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.type) = (yyvsp[-1].type);
-	          SwigType_push((yyval.type),(yyvsp[0].str));
-	          SwigType_push((yyval.type),(yyvsp[-2].str));
-	       }
-#line 10006 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 377:
-#line 5669 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type);
-                  /* Printf(stdout,"primitive = '%s'\n", $$);*/
-               }
-#line 10014 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 378:
-#line 5672 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 10020 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 379:
-#line 5673 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 10026 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 380:
-#line 5677 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = NewStringf("enum %s", (yyvsp[0].str)); }
-#line 10032 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 381:
-#line 5678 "parser.y" /* yacc.c:1646  */
-    { (yyval.type) = (yyvsp[0].type); }
-#line 10038 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 382:
-#line 5680 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.type) = (yyvsp[0].str);
-               }
-#line 10046 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 383:
-#line 5683 "parser.y" /* yacc.c:1646  */
-    { 
-		 (yyval.type) = NewStringf("%s %s", (yyvsp[-1].id), (yyvsp[0].str));
-               }
-#line 10054 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 384:
-#line 5686 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.type) = (yyvsp[0].type);
-               }
-#line 10062 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 385:
-#line 5691 "parser.y" /* yacc.c:1646  */
-    {
-                 Node *n = Swig_symbol_clookup((yyvsp[-1].str),0);
-                 if (!n) {
-		   Swig_error(cparse_file, cparse_line, "Identifier %s not defined.\n", (yyvsp[-1].str));
-                   (yyval.type) = (yyvsp[-1].str);
-                 } else {
-                   (yyval.type) = Getattr(n, "type");
-                 }
-               }
-#line 10076 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 386:
-#line 5702 "parser.y" /* yacc.c:1646  */
-    {
-		 if (!(yyvsp[0].ptype).type) (yyvsp[0].ptype).type = NewString("int");
-		 if ((yyvsp[0].ptype).us) {
-		   (yyval.type) = NewStringf("%s %s", (yyvsp[0].ptype).us, (yyvsp[0].ptype).type);
-		   Delete((yyvsp[0].ptype).us);
-                   Delete((yyvsp[0].ptype).type);
-		 } else {
-                   (yyval.type) = (yyvsp[0].ptype).type;
-		 }
-		 if (Cmp((yyval.type),"signed int") == 0) {
-		   Delete((yyval.type));
-		   (yyval.type) = NewString("int");
-                 } else if (Cmp((yyval.type),"signed long") == 0) {
-		   Delete((yyval.type));
-                   (yyval.type) = NewString("long");
-                 } else if (Cmp((yyval.type),"signed short") == 0) {
-		   Delete((yyval.type));
-		   (yyval.type) = NewString("short");
-		 } else if (Cmp((yyval.type),"signed long long") == 0) {
-		   Delete((yyval.type));
-		   (yyval.type) = NewString("long long");
-		 }
-               }
-#line 10104 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 387:
-#line 5727 "parser.y" /* yacc.c:1646  */
-    { 
-                 (yyval.ptype) = (yyvsp[0].ptype);
-               }
-#line 10112 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 388:
-#line 5730 "parser.y" /* yacc.c:1646  */
-    {
-                    if ((yyvsp[-1].ptype).us && (yyvsp[0].ptype).us) {
-		      Swig_error(cparse_file, cparse_line, "Extra %s specifier.\n", (yyvsp[0].ptype).us);
-		    }
-                    (yyval.ptype) = (yyvsp[0].ptype);
-                    if ((yyvsp[-1].ptype).us) (yyval.ptype).us = (yyvsp[-1].ptype).us;
-		    if ((yyvsp[-1].ptype).type) {
-		      if (!(yyvsp[0].ptype).type) (yyval.ptype).type = (yyvsp[-1].ptype).type;
-		      else {
-			int err = 0;
-			if ((Cmp((yyvsp[-1].ptype).type,"long") == 0)) {
-			  if ((Cmp((yyvsp[0].ptype).type,"long") == 0) || (Strncmp((yyvsp[0].ptype).type,"double",6) == 0)) {
-			    (yyval.ptype).type = NewStringf("long %s", (yyvsp[0].ptype).type);
-			  } else if (Cmp((yyvsp[0].ptype).type,"int") == 0) {
-			    (yyval.ptype).type = (yyvsp[-1].ptype).type;
-			  } else {
-			    err = 1;
-			  }
-			} else if ((Cmp((yyvsp[-1].ptype).type,"short")) == 0) {
-			  if (Cmp((yyvsp[0].ptype).type,"int") == 0) {
-			    (yyval.ptype).type = (yyvsp[-1].ptype).type;
-			  } else {
-			    err = 1;
-			  }
-			} else if (Cmp((yyvsp[-1].ptype).type,"int") == 0) {
-			  (yyval.ptype).type = (yyvsp[0].ptype).type;
-			} else if (Cmp((yyvsp[-1].ptype).type,"double") == 0) {
-			  if (Cmp((yyvsp[0].ptype).type,"long") == 0) {
-			    (yyval.ptype).type = NewString("long double");
-			  } else if (Cmp((yyvsp[0].ptype).type,"complex") == 0) {
-			    (yyval.ptype).type = NewString("double complex");
-			  } else {
-			    err = 1;
-			  }
-			} else if (Cmp((yyvsp[-1].ptype).type,"float") == 0) {
-			  if (Cmp((yyvsp[0].ptype).type,"complex") == 0) {
-			    (yyval.ptype).type = NewString("float complex");
-			  } else {
-			    err = 1;
-			  }
-			} else if (Cmp((yyvsp[-1].ptype).type,"complex") == 0) {
-			  (yyval.ptype).type = NewStringf("%s complex", (yyvsp[0].ptype).type);
-			} else {
-			  err = 1;
-			}
-			if (err) {
-			  Swig_error(cparse_file, cparse_line, "Extra %s specifier.\n", (yyvsp[-1].ptype).type);
-			}
-		      }
-		    }
-               }
-#line 10168 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 389:
-#line 5784 "parser.y" /* yacc.c:1646  */
-    { 
-		    (yyval.ptype).type = NewString("int");
-                    (yyval.ptype).us = 0;
-               }
-#line 10177 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 390:
-#line 5788 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("short");
-                    (yyval.ptype).us = 0;
-                }
-#line 10186 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 391:
-#line 5792 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("long");
-                    (yyval.ptype).us = 0;
-                }
-#line 10195 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 392:
-#line 5796 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("char");
-                    (yyval.ptype).us = 0;
-                }
-#line 10204 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 393:
-#line 5800 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("wchar_t");
-                    (yyval.ptype).us = 0;
-                }
-#line 10213 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 394:
-#line 5804 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("float");
-                    (yyval.ptype).us = 0;
-                }
-#line 10222 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 395:
-#line 5808 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("double");
-                    (yyval.ptype).us = 0;
-                }
-#line 10231 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 396:
-#line 5812 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).us = NewString("signed");
-                    (yyval.ptype).type = 0;
-                }
-#line 10240 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 397:
-#line 5816 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).us = NewString("unsigned");
-                    (yyval.ptype).type = 0;
-                }
-#line 10249 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 398:
-#line 5820 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("complex");
-                    (yyval.ptype).us = 0;
-                }
-#line 10258 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 399:
-#line 5824 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("__int8");
-                    (yyval.ptype).us = 0;
-                }
-#line 10267 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 400:
-#line 5828 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("__int16");
-                    (yyval.ptype).us = 0;
-                }
-#line 10276 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 401:
-#line 5832 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("__int32");
-                    (yyval.ptype).us = 0;
-                }
-#line 10285 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 402:
-#line 5836 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.ptype).type = NewString("__int64");
-                    (yyval.ptype).us = 0;
-                }
-#line 10294 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 403:
-#line 5842 "parser.y" /* yacc.c:1646  */
-    { /* scanner_check_typedef(); */ }
-#line 10300 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 404:
-#line 5842 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.dtype) = (yyvsp[0].dtype);
-		   if ((yyval.dtype).type == T_STRING) {
-		     (yyval.dtype).rawval = NewStringf("\"%(escape)s\"",(yyval.dtype).val);
-		   } else if ((yyval.dtype).type != T_CHAR && (yyval.dtype).type != T_WSTRING && (yyval.dtype).type != T_WCHAR) {
-		     (yyval.dtype).rawval = NewStringf("%s", (yyval.dtype).val);
-		   }
-		   (yyval.dtype).qualifier = 0;
-		   (yyval.dtype).bitfield = 0;
-		   (yyval.dtype).throws = 0;
-		   (yyval.dtype).throwf = 0;
-		   (yyval.dtype).nexcept = 0;
-		   scanner_ignore_typedef();
-                }
-#line 10319 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 405:
-#line 5856 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype) = (yyvsp[0].dtype);
-		}
-#line 10327 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 406:
-#line 5861 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype) = (yyvsp[0].dtype);
-		}
-#line 10335 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 407:
-#line 5864 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype) = (yyvsp[0].dtype);
-		}
-#line 10343 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 408:
-#line 5870 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype).val = NewString("delete");
-		  (yyval.dtype).rawval = 0;
-		  (yyval.dtype).type = T_STRING;
-		  (yyval.dtype).qualifier = 0;
-		  (yyval.dtype).bitfield = 0;
-		  (yyval.dtype).throws = 0;
-		  (yyval.dtype).throwf = 0;
-		  (yyval.dtype).nexcept = 0;
-		}
-#line 10358 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 409:
-#line 5883 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype).val = NewString("default");
-		  (yyval.dtype).rawval = 0;
-		  (yyval.dtype).type = T_STRING;
-		  (yyval.dtype).qualifier = 0;
-		  (yyval.dtype).bitfield = 0;
-		  (yyval.dtype).throws = 0;
-		  (yyval.dtype).throwf = 0;
-		  (yyval.dtype).nexcept = 0;
-		}
-#line 10373 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 410:
-#line 5897 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (yyvsp[0].id); }
-#line 10379 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 411:
-#line 5898 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (char *) 0;}
-#line 10385 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 412:
-#line 5901 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 10391 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 413:
-#line 5902 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 10397 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 414:
-#line 5906 "parser.y" /* yacc.c:1646  */
-    {
-		 Node *leftSibling = Getattr((yyvsp[-4].node),"_last");
-		 set_nextSibling(leftSibling,(yyvsp[-1].node));
-		 Setattr((yyvsp[-4].node),"_last",(yyvsp[-1].node));
-		 (yyval.node) = (yyvsp[-4].node);
-	       }
-#line 10408 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 415:
-#line 5912 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = (yyvsp[-2].node);
-	       }
-#line 10416 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 416:
-#line 5915 "parser.y" /* yacc.c:1646  */
-    {
-		 Setattr((yyvsp[-1].node),"_last",(yyvsp[-1].node));
-		 (yyval.node) = (yyvsp[-1].node);
-	       }
-#line 10425 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 417:
-#line 5919 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = 0;
-	       }
-#line 10433 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 418:
-#line 5924 "parser.y" /* yacc.c:1646  */
-    {
-		   SwigType *type = NewSwigType(T_INT);
-		   (yyval.node) = new_node("enumitem");
-		   Setattr((yyval.node),"name",(yyvsp[0].id));
-		   Setattr((yyval.node),"type",type);
-		   SetFlag((yyval.node),"feature:immutable");
-		   Delete(type);
-		 }
-#line 10446 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 419:
-#line 5932 "parser.y" /* yacc.c:1646  */
-    {
-		   SwigType *type = NewSwigType((yyvsp[0].dtype).type == T_BOOL ? T_BOOL : ((yyvsp[0].dtype).type == T_CHAR ? T_CHAR : T_INT));
-		   (yyval.node) = new_node("enumitem");
-		   Setattr((yyval.node),"name",(yyvsp[-2].id));
-		   Setattr((yyval.node),"type",type);
-		   SetFlag((yyval.node),"feature:immutable");
-		   Setattr((yyval.node),"enumvalue", (yyvsp[0].dtype).val);
-		   Setattr((yyval.node),"value",(yyvsp[-2].id));
-		   Delete(type);
-                 }
-#line 10461 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 420:
-#line 5944 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.dtype) = (yyvsp[0].dtype);
-		   if (((yyval.dtype).type != T_INT) && ((yyval.dtype).type != T_UINT) &&
-		       ((yyval.dtype).type != T_LONG) && ((yyval.dtype).type != T_ULONG) &&
-		       ((yyval.dtype).type != T_LONGLONG) && ((yyval.dtype).type != T_ULONGLONG) &&
-		       ((yyval.dtype).type != T_SHORT) && ((yyval.dtype).type != T_USHORT) &&
-		       ((yyval.dtype).type != T_SCHAR) && ((yyval.dtype).type != T_UCHAR) &&
-		       ((yyval.dtype).type != T_CHAR) && ((yyval.dtype).type != T_BOOL)) {
-		     Swig_error(cparse_file,cparse_line,"Type error. Expecting an integral type\n");
-		   }
-                }
-#line 10477 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 421:
-#line 5959 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10483 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 422:
-#line 5960 "parser.y" /* yacc.c:1646  */
-    {
-		 Node *n;
-		 (yyval.dtype).val = (yyvsp[0].type);
-		 (yyval.dtype).type = T_INT;
-		 /* Check if value is in scope */
-		 n = Swig_symbol_clookup((yyvsp[0].type),0);
-		 if (n) {
-                   /* A band-aid for enum values used in expressions. */
-                   if (Strcmp(nodeType(n),"enumitem") == 0) {
-                     String *q = Swig_symbol_qualified(n);
-                     if (q) {
-                       (yyval.dtype).val = NewStringf("%s::%s", q, Getattr(n,"name"));
-                       Delete(q);
-                     }
-                   }
-		 }
-               }
-#line 10505 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 423:
-#line 5979 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10511 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 424:
-#line 5980 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.dtype).val = (yyvsp[0].str);
-                    (yyval.dtype).type = T_STRING;
-               }
-#line 10520 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 425:
-#line 5984 "parser.y" /* yacc.c:1646  */
-    {
-		  SwigType_push((yyvsp[-2].type),(yyvsp[-1].decl).type);
-		  (yyval.dtype).val = NewStringf("sizeof(%s)",SwigType_str((yyvsp[-2].type),0));
-		  (yyval.dtype).type = T_ULONG;
-               }
-#line 10530 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 426:
-#line 5989 "parser.y" /* yacc.c:1646  */
-    {
-		  SwigType_push((yyvsp[-2].type),(yyvsp[-1].decl).type);
-		  (yyval.dtype).val = NewStringf("sizeof...(%s)",SwigType_str((yyvsp[-2].type),0));
-		  (yyval.dtype).type = T_ULONG;
-               }
-#line 10540 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 427:
-#line 5994 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10546 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 428:
-#line 5995 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.dtype).val = (yyvsp[0].str);
-		    (yyval.dtype).rawval = NewStringf("L\"%s\"", (yyval.dtype).val);
-                    (yyval.dtype).type = T_WSTRING;
-	       }
-#line 10556 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 429:
-#line 6000 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype).val = NewString((yyvsp[0].str));
-		  if (Len((yyval.dtype).val)) {
-		    (yyval.dtype).rawval = NewStringf("'%(escape)s'", (yyval.dtype).val);
-		  } else {
-		    (yyval.dtype).rawval = NewString("'\\0'");
-		  }
-		  (yyval.dtype).type = T_CHAR;
-		  (yyval.dtype).bitfield = 0;
-		  (yyval.dtype).throws = 0;
-		  (yyval.dtype).throwf = 0;
-		  (yyval.dtype).nexcept = 0;
-	       }
-#line 10574 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 430:
-#line 6013 "parser.y" /* yacc.c:1646  */
-    {
-		  (yyval.dtype).val = NewString((yyvsp[0].str));
-		  if (Len((yyval.dtype).val)) {
-		    (yyval.dtype).rawval = NewStringf("L\'%s\'", (yyval.dtype).val);
-		  } else {
-		    (yyval.dtype).rawval = NewString("L'\\0'");
-		  }
-		  (yyval.dtype).type = T_WCHAR;
-		  (yyval.dtype).bitfield = 0;
-		  (yyval.dtype).throws = 0;
-		  (yyval.dtype).throwf = 0;
-		  (yyval.dtype).nexcept = 0;
-	       }
-#line 10592 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 431:
-#line 6028 "parser.y" /* yacc.c:1646  */
-    {
-   	            (yyval.dtype).val = NewStringf("(%s)",(yyvsp[-1].dtype).val);
-		    (yyval.dtype).type = (yyvsp[-1].dtype).type;
-   	       }
-#line 10601 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 432:
-#line 6035 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype) = (yyvsp[0].dtype);
-		 if ((yyvsp[0].dtype).type != T_STRING) {
-		   switch ((yyvsp[-2].dtype).type) {
-		     case T_FLOAT:
-		     case T_DOUBLE:
-		     case T_LONGDOUBLE:
-		     case T_FLTCPLX:
-		     case T_DBLCPLX:
-		       (yyval.dtype).val = NewStringf("(%s)%s", (yyvsp[-2].dtype).val, (yyvsp[0].dtype).val); /* SwigType_str and decimal points don't mix! */
-		       break;
-		     default:
-		       (yyval.dtype).val = NewStringf("(%s) %s", SwigType_str((yyvsp[-2].dtype).val,0), (yyvsp[0].dtype).val);
-		       break;
-		   }
-		 }
- 	       }
-#line 10623 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 433:
-#line 6052 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype) = (yyvsp[0].dtype);
-		 if ((yyvsp[0].dtype).type != T_STRING) {
-		   SwigType_push((yyvsp[-3].dtype).val,(yyvsp[-2].type));
-		   (yyval.dtype).val = NewStringf("(%s) %s", SwigType_str((yyvsp[-3].dtype).val,0), (yyvsp[0].dtype).val);
-		 }
- 	       }
-#line 10635 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 434:
-#line 6059 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype) = (yyvsp[0].dtype);
-		 if ((yyvsp[0].dtype).type != T_STRING) {
-		   SwigType_add_reference((yyvsp[-3].dtype).val);
-		   (yyval.dtype).val = NewStringf("(%s) %s", SwigType_str((yyvsp[-3].dtype).val,0), (yyvsp[0].dtype).val);
-		 }
- 	       }
-#line 10647 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 435:
-#line 6066 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype) = (yyvsp[0].dtype);
-		 if ((yyvsp[0].dtype).type != T_STRING) {
-		   SwigType_add_rvalue_reference((yyvsp[-3].dtype).val);
-		   (yyval.dtype).val = NewStringf("(%s) %s", SwigType_str((yyvsp[-3].dtype).val,0), (yyvsp[0].dtype).val);
-		 }
- 	       }
-#line 10659 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 436:
-#line 6073 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype) = (yyvsp[0].dtype);
-		 if ((yyvsp[0].dtype).type != T_STRING) {
-		   SwigType_push((yyvsp[-4].dtype).val,(yyvsp[-3].type));
-		   SwigType_add_reference((yyvsp[-4].dtype).val);
-		   (yyval.dtype).val = NewStringf("(%s) %s", SwigType_str((yyvsp[-4].dtype).val,0), (yyvsp[0].dtype).val);
-		 }
- 	       }
-#line 10672 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 437:
-#line 6081 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype) = (yyvsp[0].dtype);
-		 if ((yyvsp[0].dtype).type != T_STRING) {
-		   SwigType_push((yyvsp[-4].dtype).val,(yyvsp[-3].type));
-		   SwigType_add_rvalue_reference((yyvsp[-4].dtype).val);
-		   (yyval.dtype).val = NewStringf("(%s) %s", SwigType_str((yyvsp[-4].dtype).val,0), (yyvsp[0].dtype).val);
-		 }
- 	       }
-#line 10685 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 438:
-#line 6089 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype) = (yyvsp[0].dtype);
-                 (yyval.dtype).val = NewStringf("&%s",(yyvsp[0].dtype).val);
-	       }
-#line 10694 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 439:
-#line 6093 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype) = (yyvsp[0].dtype);
-                 (yyval.dtype).val = NewStringf("&&%s",(yyvsp[0].dtype).val);
-	       }
-#line 10703 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 440:
-#line 6097 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype) = (yyvsp[0].dtype);
-                 (yyval.dtype).val = NewStringf("*%s",(yyvsp[0].dtype).val);
-	       }
-#line 10712 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 441:
-#line 6103 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10718 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 442:
-#line 6104 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10724 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 443:
-#line 6105 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10730 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 444:
-#line 6106 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10736 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 445:
-#line 6107 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10742 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 446:
-#line 6108 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10748 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 447:
-#line 6109 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10754 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 448:
-#line 6110 "parser.y" /* yacc.c:1646  */
-    { (yyval.dtype) = (yyvsp[0].dtype); }
-#line 10760 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 449:
-#line 6113 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s+%s", COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10769 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 450:
-#line 6117 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s-%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10778 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 451:
-#line 6121 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s*%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10787 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 452:
-#line 6125 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s/%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10796 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 453:
-#line 6129 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s%%%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10805 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 454:
-#line 6133 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s&%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10814 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 455:
-#line 6137 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s|%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10823 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 456:
-#line 6141 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s^%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type,(yyvsp[0].dtype).type);
-	       }
-#line 10832 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 457:
-#line 6145 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s << %s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote_type((yyvsp[-2].dtype).type);
-	       }
-#line 10841 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 458:
-#line 6149 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s >> %s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = promote_type((yyvsp[-2].dtype).type);
-	       }
-#line 10850 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 459:
-#line 6153 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s&&%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-#line 10859 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 460:
-#line 6157 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s||%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-#line 10868 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 461:
-#line 6161 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s==%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-#line 10877 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 462:
-#line 6165 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s!=%s",COMPOUND_EXPR_VAL((yyvsp[-2].dtype)),COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-#line 10886 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 463:
-#line 6179 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s >= %s", COMPOUND_EXPR_VAL((yyvsp[-2].dtype)), COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-#line 10895 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 464:
-#line 6183 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s <= %s", COMPOUND_EXPR_VAL((yyvsp[-2].dtype)), COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-#line 10904 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 465:
-#line 6187 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("%s?%s:%s", COMPOUND_EXPR_VAL((yyvsp[-4].dtype)), COMPOUND_EXPR_VAL((yyvsp[-2].dtype)), COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 /* This may not be exactly right, but is probably good enough
-		  * for the purposes of parsing constant expressions. */
-		 (yyval.dtype).type = promote((yyvsp[-2].dtype).type, (yyvsp[0].dtype).type);
-	       }
-#line 10915 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 466:
-#line 6193 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("-%s",(yyvsp[0].dtype).val);
-		 (yyval.dtype).type = (yyvsp[0].dtype).type;
-	       }
-#line 10924 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 467:
-#line 6197 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype).val = NewStringf("+%s",(yyvsp[0].dtype).val);
-		 (yyval.dtype).type = (yyvsp[0].dtype).type;
-	       }
-#line 10933 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 468:
-#line 6201 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.dtype).val = NewStringf("~%s",(yyvsp[0].dtype).val);
-		 (yyval.dtype).type = (yyvsp[0].dtype).type;
-	       }
-#line 10942 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 469:
-#line 6205 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.dtype).val = NewStringf("!%s",COMPOUND_EXPR_VAL((yyvsp[0].dtype)));
-		 (yyval.dtype).type = T_INT;
-	       }
-#line 10951 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 470:
-#line 6209 "parser.y" /* yacc.c:1646  */
-    {
-		 String *qty;
-                 skip_balanced('(',')');
-		 qty = Swig_symbol_type_qualify((yyvsp[-1].type),0);
-		 if (SwigType_istemplate(qty)) {
-		   String *nstr = SwigType_namestr(qty);
-		   Delete(qty);
-		   qty = nstr;
-		 }
-		 (yyval.dtype).val = NewStringf("%s%s",qty,scanner_ccode);
-		 Clear(scanner_ccode);
-		 (yyval.dtype).type = T_INT;
-		 Delete(qty);
-               }
-#line 10970 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 471:
-#line 6225 "parser.y" /* yacc.c:1646  */
-    {
-	        (yyval.str) = NewString("...");
-	      }
-#line 10978 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 472:
-#line 6230 "parser.y" /* yacc.c:1646  */
-    {
-	        (yyval.str) = (yyvsp[0].str);
-	      }
-#line 10986 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 473:
-#line 6233 "parser.y" /* yacc.c:1646  */
-    {
-	        (yyval.str) = 0;
-	      }
-#line 10994 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 474:
-#line 6238 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.bases) = (yyvsp[0].bases);
-               }
-#line 11002 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 475:
-#line 6243 "parser.y" /* yacc.c:1646  */
-    { inherit_list = 1; }
-#line 11008 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 476:
-#line 6243 "parser.y" /* yacc.c:1646  */
-    { (yyval.bases) = (yyvsp[0].bases); inherit_list = 0; }
-#line 11014 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 477:
-#line 6244 "parser.y" /* yacc.c:1646  */
-    { (yyval.bases) = 0; }
-#line 11020 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 478:
-#line 6247 "parser.y" /* yacc.c:1646  */
-    {
-		   Hash *list = NewHash();
-		   Node *base = (yyvsp[0].node);
-		   Node *name = Getattr(base,"name");
-		   List *lpublic = NewList();
-		   List *lprotected = NewList();
-		   List *lprivate = NewList();
-		   Setattr(list,"public",lpublic);
-		   Setattr(list,"protected",lprotected);
-		   Setattr(list,"private",lprivate);
-		   Delete(lpublic);
-		   Delete(lprotected);
-		   Delete(lprivate);
-		   Append(Getattr(list,Getattr(base,"access")),name);
-	           (yyval.bases) = list;
-               }
-#line 11041 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 479:
-#line 6264 "parser.y" /* yacc.c:1646  */
-    {
-		   Hash *list = (yyvsp[-2].bases);
-		   Node *base = (yyvsp[0].node);
-		   Node *name = Getattr(base,"name");
-		   Append(Getattr(list,Getattr(base,"access")),name);
-                   (yyval.bases) = list;
-               }
-#line 11053 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 480:
-#line 6273 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.intvalue) = cparse_line;
-	       }
-#line 11061 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 481:
-#line 6275 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = NewHash();
-		 Setfile((yyval.node),cparse_file);
-		 Setline((yyval.node),(yyvsp[-2].intvalue));
-		 Setattr((yyval.node),"name",(yyvsp[-1].str));
-		 Setfile((yyvsp[-1].str),cparse_file);
-		 Setline((yyvsp[-1].str),(yyvsp[-2].intvalue));
-                 if (last_cpptype && (Strcmp(last_cpptype,"struct") != 0)) {
-		   Setattr((yyval.node),"access","private");
-		   Swig_warning(WARN_PARSE_NO_ACCESS, Getfile((yyval.node)), Getline((yyval.node)), "No access specifier given for base class '%s' (ignored).\n", SwigType_namestr((yyvsp[-1].str)));
-                 } else {
-		   Setattr((yyval.node),"access","public");
-		 }
-		 if ((yyvsp[0].str))
-		   SetFlag((yyval.node), "variadic");
-               }
-#line 11082 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 482:
-#line 6291 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.intvalue) = cparse_line;
-	       }
-#line 11090 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 483:
-#line 6293 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = NewHash();
-		 Setfile((yyval.node),cparse_file);
-		 Setline((yyval.node),(yyvsp[-3].intvalue));
-		 Setattr((yyval.node),"name",(yyvsp[-1].str));
-		 Setfile((yyvsp[-1].str),cparse_file);
-		 Setline((yyvsp[-1].str),(yyvsp[-3].intvalue));
-		 Setattr((yyval.node),"access",(yyvsp[-4].id));
-	         if (Strcmp((yyvsp[-4].id),"public") != 0) {
-		   Swig_warning(WARN_PARSE_PRIVATE_INHERIT, Getfile((yyval.node)), Getline((yyval.node)), "%s inheritance from base '%s' (ignored).\n", (yyvsp[-4].id), SwigType_namestr((yyvsp[-1].str)));
-		 }
-		 if ((yyvsp[0].str))
-		   SetFlag((yyval.node), "variadic");
-               }
-#line 11109 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 484:
-#line 6309 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (char*)"public"; }
-#line 11115 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 485:
-#line 6310 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (char*)"private"; }
-#line 11121 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 486:
-#line 6311 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (char*)"protected"; }
-#line 11127 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 487:
-#line 6314 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.id) = (char*)"class"; 
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11136 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 488:
-#line 6318 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.id) = (char *)"typename"; 
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11145 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 489:
-#line 6322 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.id) = (char *)"class..."; 
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11154 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 490:
-#line 6326 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.id) = (char *)"typename..."; 
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11163 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 491:
-#line 6332 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.id) = (yyvsp[0].id);
-               }
-#line 11171 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 492:
-#line 6335 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.id) = (char*)"struct"; 
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11180 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 493:
-#line 6339 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.id) = (char*)"union"; 
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11189 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 494:
-#line 6345 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.id) = (char*)"class";
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11198 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 495:
-#line 6349 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.id) = (char*)"struct";
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11207 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 496:
-#line 6353 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.id) = (char*)"union";
-		   if (!inherit_list) last_cpptype = (yyval.id);
-               }
-#line 11216 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 497:
-#line 6359 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.id) = (yyvsp[0].id);
-               }
-#line 11224 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 498:
-#line 6362 "parser.y" /* yacc.c:1646  */
-    {
-		   (yyval.id) = 0;
-               }
-#line 11232 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 501:
-#line 6371 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = 0;
-	       }
-#line 11240 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 502:
-#line 6374 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = 0;
-	       }
-#line 11248 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 503:
-#line 6377 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = 0;
-	       }
-#line 11256 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 504:
-#line 6380 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = 0;
-	       }
-#line 11264 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 505:
-#line 6385 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.dtype).throws = (yyvsp[-1].pl);
-                    (yyval.dtype).throwf = NewString("1");
-                    (yyval.dtype).nexcept = 0;
-	       }
-#line 11274 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 506:
-#line 6390 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.dtype).throws = 0;
-                    (yyval.dtype).throwf = 0;
-                    (yyval.dtype).nexcept = NewString("true");
-	       }
-#line 11284 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 507:
-#line 6395 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.dtype).throws = 0;
-                    (yyval.dtype).throwf = 0;
-                    (yyval.dtype).nexcept = 0;
-	       }
-#line 11294 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 508:
-#line 6400 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.dtype).throws = 0;
-                    (yyval.dtype).throwf = 0;
-                    (yyval.dtype).nexcept = NewString("true");
-	       }
-#line 11304 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 509:
-#line 6405 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.dtype).throws = 0;
-                    (yyval.dtype).throwf = 0;
-                    (yyval.dtype).nexcept = (yyvsp[-1].dtype).val;
-	       }
-#line 11314 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 510:
-#line 6412 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.dtype).throws = 0;
-                    (yyval.dtype).throwf = 0;
-                    (yyval.dtype).nexcept = 0;
-                    (yyval.dtype).qualifier = (yyvsp[0].str);
-               }
-#line 11325 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 511:
-#line 6418 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.dtype) = (yyvsp[0].dtype);
-                    (yyval.dtype).qualifier = 0;
-               }
-#line 11334 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 512:
-#line 6422 "parser.y" /* yacc.c:1646  */
-    {
-		    (yyval.dtype) = (yyvsp[0].dtype);
-                    (yyval.dtype).qualifier = (yyvsp[-1].str);
-               }
-#line 11343 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 513:
-#line 6426 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.dtype).throws = 0;
-                    (yyval.dtype).throwf = 0;
-                    (yyval.dtype).nexcept = 0;
-                    (yyval.dtype).qualifier = 0; 
-               }
-#line 11354 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 514:
-#line 6434 "parser.y" /* yacc.c:1646  */
-    { 
-                    Clear(scanner_ccode); 
-                    (yyval.decl).have_parms = 0; 
-                    (yyval.decl).defarg = 0; 
-		    (yyval.decl).throws = (yyvsp[-2].dtype).throws;
-		    (yyval.decl).throwf = (yyvsp[-2].dtype).throwf;
-		    (yyval.decl).nexcept = (yyvsp[-2].dtype).nexcept;
-               }
-#line 11367 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 515:
-#line 6442 "parser.y" /* yacc.c:1646  */
-    { 
-                    skip_balanced('{','}'); 
-                    (yyval.decl).have_parms = 0; 
-                    (yyval.decl).defarg = 0; 
-                    (yyval.decl).throws = (yyvsp[-2].dtype).throws;
-                    (yyval.decl).throwf = (yyvsp[-2].dtype).throwf;
-                    (yyval.decl).nexcept = (yyvsp[-2].dtype).nexcept;
-               }
-#line 11380 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 516:
-#line 6450 "parser.y" /* yacc.c:1646  */
-    { 
-                    Clear(scanner_ccode); 
-                    (yyval.decl).parms = (yyvsp[-2].pl); 
-                    (yyval.decl).have_parms = 1; 
-                    (yyval.decl).defarg = 0; 
-		    (yyval.decl).throws = 0;
-		    (yyval.decl).throwf = 0;
-		    (yyval.decl).nexcept = 0;
-               }
-#line 11394 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 517:
-#line 6459 "parser.y" /* yacc.c:1646  */
-    {
-                    skip_balanced('{','}'); 
-                    (yyval.decl).parms = (yyvsp[-2].pl); 
-                    (yyval.decl).have_parms = 1; 
-                    (yyval.decl).defarg = 0; 
-                    (yyval.decl).throws = 0;
-                    (yyval.decl).throwf = 0;
-                    (yyval.decl).nexcept = 0;
-               }
-#line 11408 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 518:
-#line 6468 "parser.y" /* yacc.c:1646  */
-    { 
-                    (yyval.decl).have_parms = 0; 
-                    (yyval.decl).defarg = (yyvsp[-1].dtype).val; 
-                    (yyval.decl).throws = 0;
-                    (yyval.decl).throwf = 0;
-                    (yyval.decl).nexcept = 0;
-               }
-#line 11420 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 519:
-#line 6475 "parser.y" /* yacc.c:1646  */
-    {
-                    (yyval.decl).have_parms = 0;
-                    (yyval.decl).defarg = (yyvsp[-1].dtype).val;
-                    (yyval.decl).throws = (yyvsp[-3].dtype).throws;
-                    (yyval.decl).throwf = (yyvsp[-3].dtype).throwf;
-                    (yyval.decl).nexcept = (yyvsp[-3].dtype).nexcept;
-               }
-#line 11432 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 526:
-#line 6494 "parser.y" /* yacc.c:1646  */
-    {
-		  skip_balanced('(',')');
-		  Clear(scanner_ccode);
-		}
-#line 11441 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 527:
-#line 6506 "parser.y" /* yacc.c:1646  */
-    {
-		  skip_balanced('{','}');
-		  Clear(scanner_ccode);
-		}
-#line 11450 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 528:
-#line 6512 "parser.y" /* yacc.c:1646  */
-    {
-                     String *s = NewStringEmpty();
-                     SwigType_add_template(s,(yyvsp[-1].p));
-                     (yyval.id) = Char(s);
-		     scanner_last_id(1);
-                }
-#line 11461 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 529:
-#line 6521 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (yyvsp[0].id); }
-#line 11467 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 530:
-#line 6522 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = Swig_copy_string("override"); }
-#line 11473 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 531:
-#line 6523 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = Swig_copy_string("final"); }
-#line 11479 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 532:
-#line 6526 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (yyvsp[0].id); }
-#line 11485 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 533:
-#line 6527 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = Char((yyvsp[0].dtype).val); }
-#line 11491 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 534:
-#line 6528 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = Char((yyvsp[0].str)); }
-#line 11497 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 535:
-#line 6531 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = (yyvsp[0].id); }
-#line 11503 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 536:
-#line 6532 "parser.y" /* yacc.c:1646  */
-    { (yyval.id) = 0; }
-#line 11509 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 537:
-#line 6535 "parser.y" /* yacc.c:1646  */
-    { 
-                  (yyval.str) = 0;
-		  if (!(yyval.str)) (yyval.str) = NewStringf("%s%s", (yyvsp[-1].str),(yyvsp[0].str));
-      	          Delete((yyvsp[0].str));
-               }
-#line 11519 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 538:
-#line 6540 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewStringf("::%s%s",(yyvsp[-1].str),(yyvsp[0].str));
-                 Delete((yyvsp[0].str));
-               }
-#line 11528 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 539:
-#line 6544 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewString((yyvsp[0].str));
-   	       }
-#line 11536 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 540:
-#line 6547 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewStringf("::%s",(yyvsp[0].str));
-               }
-#line 11544 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 541:
-#line 6550 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.str) = NewStringf("%s", (yyvsp[0].str));
-	       }
-#line 11552 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 542:
-#line 6553 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.str) = NewStringf("%s%s", (yyvsp[-1].str), (yyvsp[0].id));
-	       }
-#line 11560 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 543:
-#line 6556 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.str) = NewStringf("::%s",(yyvsp[0].str));
-               }
-#line 11568 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 544:
-#line 6561 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("::%s%s",(yyvsp[-1].str),(yyvsp[0].str));
-		   Delete((yyvsp[0].str));
-               }
-#line 11577 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 545:
-#line 6565 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("::%s",(yyvsp[0].str));
-               }
-#line 11585 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 546:
-#line 6568 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("::%s",(yyvsp[0].str));
-               }
-#line 11593 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 547:
-#line 6575 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewStringf("::~%s",(yyvsp[0].str));
-               }
-#line 11601 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 548:
-#line 6581 "parser.y" /* yacc.c:1646  */
-    {
-		(yyval.str) = NewStringf("%s", (yyvsp[0].id));
-	      }
-#line 11609 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 549:
-#line 6584 "parser.y" /* yacc.c:1646  */
-    {
-		(yyval.str) = NewStringf("%s%s", (yyvsp[-1].id), (yyvsp[0].id));
-	      }
-#line 11617 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 550:
-#line 6589 "parser.y" /* yacc.c:1646  */
-    {
-		(yyval.str) = (yyvsp[0].str);
-	      }
-#line 11625 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 551:
-#line 6592 "parser.y" /* yacc.c:1646  */
-    {
-		(yyval.str) = NewStringf("%s%s", (yyvsp[-1].id), (yyvsp[0].id));
-	      }
-#line 11633 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 552:
-#line 6598 "parser.y" /* yacc.c:1646  */
-    {
-                  (yyval.str) = 0;
-		  if (!(yyval.str)) (yyval.str) = NewStringf("%s%s", (yyvsp[-1].id),(yyvsp[0].str));
-      	          Delete((yyvsp[0].str));
-               }
-#line 11643 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 553:
-#line 6603 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewStringf("::%s%s",(yyvsp[-1].id),(yyvsp[0].str));
-                 Delete((yyvsp[0].str));
-               }
-#line 11652 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 554:
-#line 6607 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewString((yyvsp[0].id));
-   	       }
-#line 11660 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 555:
-#line 6610 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewStringf("::%s",(yyvsp[0].id));
-               }
-#line 11668 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 556:
-#line 6613 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.str) = NewString((yyvsp[0].str));
-	       }
-#line 11676 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 557:
-#line 6616 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.str) = NewStringf("::%s",(yyvsp[0].str));
-               }
-#line 11684 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 558:
-#line 6621 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("::%s%s",(yyvsp[-1].id),(yyvsp[0].str));
-		   Delete((yyvsp[0].str));
-               }
-#line 11693 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 559:
-#line 6625 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("::%s",(yyvsp[0].id));
-               }
-#line 11701 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 560:
-#line 6628 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("::%s",(yyvsp[0].str));
-               }
-#line 11709 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 561:
-#line 6631 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = NewStringf("::~%s",(yyvsp[0].id));
-               }
-#line 11717 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 562:
-#line 6637 "parser.y" /* yacc.c:1646  */
-    { 
-                   (yyval.str) = NewStringf("%s%s", (yyvsp[-1].str), (yyvsp[0].id));
-               }
-#line 11725 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 563:
-#line 6640 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = NewString((yyvsp[0].id));}
-#line 11731 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 564:
-#line 6643 "parser.y" /* yacc.c:1646  */
-    {
-                   (yyval.str) = NewStringf("%s%s", (yyvsp[-1].str), (yyvsp[0].id));
-               }
-#line 11739 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 565:
-#line 6651 "parser.y" /* yacc.c:1646  */
-    { (yyval.str) = NewString((yyvsp[0].id));}
-#line 11745 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 566:
-#line 6654 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = (yyvsp[0].str);
-               }
-#line 11753 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 567:
-#line 6657 "parser.y" /* yacc.c:1646  */
-    {
-                  skip_balanced('{','}');
-		  (yyval.str) = NewString(scanner_ccode);
-               }
-#line 11762 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 568:
-#line 6661 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = (yyvsp[0].str);
-              }
-#line 11770 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 569:
-#line 6666 "parser.y" /* yacc.c:1646  */
-    {
-                  Hash *n;
-                  (yyval.node) = NewHash();
-                  n = (yyvsp[-1].node);
-                  while(n) {
-                     String *name, *value;
-                     name = Getattr(n,"name");
-                     value = Getattr(n,"value");
-		     if (!value) value = (String *) "1";
-                     Setattr((yyval.node),name, value);
-		     n = nextSibling(n);
-		  }
-               }
-#line 11788 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 570:
-#line 6679 "parser.y" /* yacc.c:1646  */
-    { (yyval.node) = 0; }
-#line 11794 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 571:
-#line 6683 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = NewHash();
-		 Setattr((yyval.node),"name",(yyvsp[-2].id));
-		 Setattr((yyval.node),"value",(yyvsp[0].str));
-               }
-#line 11804 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 572:
-#line 6688 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.node) = NewHash();
-		 Setattr((yyval.node),"name",(yyvsp[-4].id));
-		 Setattr((yyval.node),"value",(yyvsp[-2].str));
-		 set_nextSibling((yyval.node),(yyvsp[0].node));
-               }
-#line 11815 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 573:
-#line 6694 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = NewHash();
-                 Setattr((yyval.node),"name",(yyvsp[0].id));
-	       }
-#line 11824 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 574:
-#line 6698 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = NewHash();
-                 Setattr((yyval.node),"name",(yyvsp[-2].id));
-                 set_nextSibling((yyval.node),(yyvsp[0].node));
-               }
-#line 11834 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 575:
-#line 6703 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = (yyvsp[0].node);
-		 Setattr((yyval.node),"name",(yyvsp[-2].id));
-               }
-#line 11843 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 576:
-#line 6707 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.node) = (yyvsp[-2].node);
-		 Setattr((yyval.node),"name",(yyvsp[-4].id));
-		 set_nextSibling((yyval.node),(yyvsp[0].node));
-               }
-#line 11853 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 577:
-#line 6714 "parser.y" /* yacc.c:1646  */
-    {
-		 (yyval.str) = (yyvsp[0].str);
-               }
-#line 11861 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 578:
-#line 6717 "parser.y" /* yacc.c:1646  */
-    {
-                 (yyval.str) = Char((yyvsp[0].dtype).val);
-               }
-#line 11869 "y.tab.c" /* yacc.c:1646  */
-    break;
-
-
-#line 11873 "y.tab.c" /* yacc.c:1646  */
-      default: break;
-    }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-  /* Now 'shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*--------------------------------------.
-| yyerrlab -- here on detecting error.  |
-`--------------------------------------*/
-yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval);
-          yychar = YYEMPTY;
-        }
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-
-
-      yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  return yyresult;
-}
-#line 6724 "parser.y" /* yacc.c:1906  */
-
-
-SwigType *Swig_cparse_type(String *s) {
-   String *ns;
-   ns = NewStringf("%s;",s);
-   Seek(ns,0,SEEK_SET);
-   scanner_file(ns);
-   top = 0;
-   scanner_next_token(PARSETYPE);
-   yyparse();
-   /*   Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
-   return top;
-}
-
-
-Parm *Swig_cparse_parm(String *s) {
-   String *ns;
-   ns = NewStringf("%s;",s);
-   Seek(ns,0,SEEK_SET);
-   scanner_file(ns);
-   top = 0;
-   scanner_next_token(PARSEPARM);
-   yyparse();
-   /*   Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
-   Delete(ns);
-   return top;
-}
-
-
-ParmList *Swig_cparse_parms(String *s, Node *file_line_node) {
-   String *ns;
-   char *cs = Char(s);
-   if (cs && cs[0] != '(') {
-     ns = NewStringf("(%s);",s);
-   } else {
-     ns = NewStringf("%s;",s);
-   }
-   Setfile(ns, Getfile(file_line_node));
-   Setline(ns, Getline(file_line_node));
-   Seek(ns,0,SEEK_SET);
-   scanner_file(ns);
-   top = 0;
-   scanner_next_token(PARSEPARMS);
-   yyparse();
-   /*   Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
-   return top;
-}
-
diff --git a/dependencies2013/win32/swig/Source/CParse/parser.h b/dependencies2013/win32/swig/Source/CParse/parser.h
deleted file mode 100644
index fd33c7d6..00000000
--- a/dependencies2013/win32/swig/Source/CParse/parser.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-#ifndef YY_YY_Y_TAB_H_INCLUDED
-# define YY_YY_Y_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    ID = 258,
-    HBLOCK = 259,
-    POUND = 260,
-    STRING = 261,
-    WSTRING = 262,
-    INCLUDE = 263,
-    IMPORT = 264,
-    INSERT = 265,
-    CHARCONST = 266,
-    WCHARCONST = 267,
-    NUM_INT = 268,
-    NUM_FLOAT = 269,
-    NUM_UNSIGNED = 270,
-    NUM_LONG = 271,
-    NUM_ULONG = 272,
-    NUM_LONGLONG = 273,
-    NUM_ULONGLONG = 274,
-    NUM_BOOL = 275,
-    TYPEDEF = 276,
-    TYPE_INT = 277,
-    TYPE_UNSIGNED = 278,
-    TYPE_SHORT = 279,
-    TYPE_LONG = 280,
-    TYPE_FLOAT = 281,
-    TYPE_DOUBLE = 282,
-    TYPE_CHAR = 283,
-    TYPE_WCHAR = 284,
-    TYPE_VOID = 285,
-    TYPE_SIGNED = 286,
-    TYPE_BOOL = 287,
-    TYPE_COMPLEX = 288,
-    TYPE_TYPEDEF = 289,
-    TYPE_RAW = 290,
-    TYPE_NON_ISO_INT8 = 291,
-    TYPE_NON_ISO_INT16 = 292,
-    TYPE_NON_ISO_INT32 = 293,
-    TYPE_NON_ISO_INT64 = 294,
-    LPAREN = 295,
-    RPAREN = 296,
-    COMMA = 297,
-    SEMI = 298,
-    EXTERN = 299,
-    INIT = 300,
-    LBRACE = 301,
-    RBRACE = 302,
-    PERIOD = 303,
-    CONST_QUAL = 304,
-    VOLATILE = 305,
-    REGISTER = 306,
-    STRUCT = 307,
-    UNION = 308,
-    EQUAL = 309,
-    SIZEOF = 310,
-    MODULE = 311,
-    LBRACKET = 312,
-    RBRACKET = 313,
-    BEGINFILE = 314,
-    ENDOFFILE = 315,
-    ILLEGAL = 316,
-    CONSTANT = 317,
-    NAME = 318,
-    RENAME = 319,
-    NAMEWARN = 320,
-    EXTEND = 321,
-    PRAGMA = 322,
-    FEATURE = 323,
-    VARARGS = 324,
-    ENUM = 325,
-    CLASS = 326,
-    TYPENAME = 327,
-    PRIVATE = 328,
-    PUBLIC = 329,
-    PROTECTED = 330,
-    COLON = 331,
-    STATIC = 332,
-    VIRTUAL = 333,
-    FRIEND = 334,
-    THROW = 335,
-    CATCH = 336,
-    EXPLICIT = 337,
-    STATIC_ASSERT = 338,
-    CONSTEXPR = 339,
-    THREAD_LOCAL = 340,
-    DECLTYPE = 341,
-    AUTO = 342,
-    NOEXCEPT = 343,
-    OVERRIDE = 344,
-    FINAL = 345,
-    USING = 346,
-    NAMESPACE = 347,
-    NATIVE = 348,
-    INLINE = 349,
-    TYPEMAP = 350,
-    EXCEPT = 351,
-    ECHO = 352,
-    APPLY = 353,
-    CLEAR = 354,
-    SWIGTEMPLATE = 355,
-    FRAGMENT = 356,
-    WARN = 357,
-    LESSTHAN = 358,
-    GREATERTHAN = 359,
-    DELETE_KW = 360,
-    DEFAULT = 361,
-    LESSTHANOREQUALTO = 362,
-    GREATERTHANOREQUALTO = 363,
-    EQUALTO = 364,
-    NOTEQUALTO = 365,
-    ARROW = 366,
-    QUESTIONMARK = 367,
-    TYPES = 368,
-    PARMS = 369,
-    NONID = 370,
-    DSTAR = 371,
-    DCNOT = 372,
-    TEMPLATE = 373,
-    OPERATOR = 374,
-    CONVERSIONOPERATOR = 375,
-    PARSETYPE = 376,
-    PARSEPARM = 377,
-    PARSEPARMS = 378,
-    CAST = 379,
-    LOR = 380,
-    LAND = 381,
-    OR = 382,
-    XOR = 383,
-    AND = 384,
-    LSHIFT = 385,
-    RSHIFT = 386,
-    PLUS = 387,
-    MINUS = 388,
-    STAR = 389,
-    SLASH = 390,
-    MODULO = 391,
-    UMINUS = 392,
-    NOT = 393,
-    LNOT = 394,
-    DCOLON = 395
-  };
-#endif
-/* Tokens.  */
-#define ID 258
-#define HBLOCK 259
-#define POUND 260
-#define STRING 261
-#define WSTRING 262
-#define INCLUDE 263
-#define IMPORT 264
-#define INSERT 265
-#define CHARCONST 266
-#define WCHARCONST 267
-#define NUM_INT 268
-#define NUM_FLOAT 269
-#define NUM_UNSIGNED 270
-#define NUM_LONG 271
-#define NUM_ULONG 272
-#define NUM_LONGLONG 273
-#define NUM_ULONGLONG 274
-#define NUM_BOOL 275
-#define TYPEDEF 276
-#define TYPE_INT 277
-#define TYPE_UNSIGNED 278
-#define TYPE_SHORT 279
-#define TYPE_LONG 280
-#define TYPE_FLOAT 281
-#define TYPE_DOUBLE 282
-#define TYPE_CHAR 283
-#define TYPE_WCHAR 284
-#define TYPE_VOID 285
-#define TYPE_SIGNED 286
-#define TYPE_BOOL 287
-#define TYPE_COMPLEX 288
-#define TYPE_TYPEDEF 289
-#define TYPE_RAW 290
-#define TYPE_NON_ISO_INT8 291
-#define TYPE_NON_ISO_INT16 292
-#define TYPE_NON_ISO_INT32 293
-#define TYPE_NON_ISO_INT64 294
-#define LPAREN 295
-#define RPAREN 296
-#define COMMA 297
-#define SEMI 298
-#define EXTERN 299
-#define INIT 300
-#define LBRACE 301
-#define RBRACE 302
-#define PERIOD 303
-#define CONST_QUAL 304
-#define VOLATILE 305
-#define REGISTER 306
-#define STRUCT 307
-#define UNION 308
-#define EQUAL 309
-#define SIZEOF 310
-#define MODULE 311
-#define LBRACKET 312
-#define RBRACKET 313
-#define BEGINFILE 314
-#define ENDOFFILE 315
-#define ILLEGAL 316
-#define CONSTANT 317
-#define NAME 318
-#define RENAME 319
-#define NAMEWARN 320
-#define EXTEND 321
-#define PRAGMA 322
-#define FEATURE 323
-#define VARARGS 324
-#define ENUM 325
-#define CLASS 326
-#define TYPENAME 327
-#define PRIVATE 328
-#define PUBLIC 329
-#define PROTECTED 330
-#define COLON 331
-#define STATIC 332
-#define VIRTUAL 333
-#define FRIEND 334
-#define THROW 335
-#define CATCH 336
-#define EXPLICIT 337
-#define STATIC_ASSERT 338
-#define CONSTEXPR 339
-#define THREAD_LOCAL 340
-#define DECLTYPE 341
-#define AUTO 342
-#define NOEXCEPT 343
-#define OVERRIDE 344
-#define FINAL 345
-#define USING 346
-#define NAMESPACE 347
-#define NATIVE 348
-#define INLINE 349
-#define TYPEMAP 350
-#define EXCEPT 351
-#define ECHO 352
-#define APPLY 353
-#define CLEAR 354
-#define SWIGTEMPLATE 355
-#define FRAGMENT 356
-#define WARN 357
-#define LESSTHAN 358
-#define GREATERTHAN 359
-#define DELETE_KW 360
-#define DEFAULT 361
-#define LESSTHANOREQUALTO 362
-#define GREATERTHANOREQUALTO 363
-#define EQUALTO 364
-#define NOTEQUALTO 365
-#define ARROW 366
-#define QUESTIONMARK 367
-#define TYPES 368
-#define PARMS 369
-#define NONID 370
-#define DSTAR 371
-#define DCNOT 372
-#define TEMPLATE 373
-#define OPERATOR 374
-#define CONVERSIONOPERATOR 375
-#define PARSETYPE 376
-#define PARSEPARM 377
-#define PARSEPARMS 378
-#define CAST 379
-#define LOR 380
-#define LAND 381
-#define OR 382
-#define XOR 383
-#define AND 384
-#define LSHIFT 385
-#define RSHIFT 386
-#define PLUS 387
-#define MINUS 388
-#define STAR 389
-#define SLASH 390
-#define MODULO 391
-#define UMINUS 392
-#define NOT 393
-#define LNOT 394
-#define DCOLON 395
-
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
-union YYSTYPE
-{
-#line 1356 "parser.y" /* yacc.c:1909  */
-
-  const char  *id;
-  List  *bases;
-  struct Define {
-    String *val;
-    String *rawval;
-    int     type;
-    String *qualifier;
-    String *bitfield;
-    Parm   *throws;
-    String *throwf;
-    String *nexcept;
-  } dtype;
-  struct {
-    const char *type;
-    String *filename;
-    int   line;
-  } loc;
-  struct {
-    char      *id;
-    SwigType  *type;
-    String    *defarg;
-    ParmList  *parms;
-    short      have_parms;
-    ParmList  *throws;
-    String    *throwf;
-    String    *nexcept;
-  } decl;
-  Parm         *tparms;
-  struct {
-    String     *method;
-    Hash       *kwargs;
-  } tmap;
-  struct {
-    String     *type;
-    String     *us;
-  } ptype;
-  SwigType     *type;
-  String       *str;
-  Parm         *p;
-  ParmList     *pl;
-  int           intvalue;
-  Node         *node;
-
-#line 379 "y.tab.h" /* yacc.c:1909  */
-};
-
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_Y_TAB_H_INCLUDED  */
diff --git a/dependencies2013/win32/swig/Source/CParse/parser.y b/dependencies2013/win32/swig/Source/CParse/parser.y
deleted file mode 100644
index 0536f4c3..00000000
--- a/dependencies2013/win32/swig/Source/CParse/parser.y
+++ /dev/null
@@ -1,6771 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * parser.y
- *
- * YACC parser for SWIG.   The grammar is a somewhat broken subset of C/C++.
- * This file is a bit of a mess and probably needs to be rewritten at
- * some point.  Beware.
- * ----------------------------------------------------------------------------- */
-
-/* There are 6 known shift-reduce conflicts in this file, fail compilation if any
-   more are introduced.
-
-   Please don't increase the number of the conflicts if at all possible. And if
-   you really have no choice but to do it, make sure you clearly document each
-   new conflict in this file.
- */
-%expect 6
-
-%{
-#define yylex yylex
-
-#include "swig.h"
-#include "cparse.h"
-#include "preprocessor.h"
-#include <ctype.h>
-
-/* We do this for portability */
-#undef alloca
-#define alloca malloc
-
-/* -----------------------------------------------------------------------------
- *                               Externals
- * ----------------------------------------------------------------------------- */
-
-int  yyparse();
-
-/* NEW Variables */
-
-static Node    *top = 0;      /* Top of the generated parse tree */
-static int      unnamed = 0;  /* Unnamed datatype counter */
-static Hash    *classes = 0;        /* Hash table of classes */
-static Hash    *classes_typedefs = 0; /* Hash table of typedef classes: typedef struct X {...} Y; */
-static Symtab  *prev_symtab = 0;
-static Node    *current_class = 0;
-String  *ModuleName = 0;
-static Node    *module_node = 0;
-static String  *Classprefix = 0;  
-static String  *Namespaceprefix = 0;
-static int      inclass = 0;
-static Node    *currentOuterClass = 0; /* for nested classes */
-static const char *last_cpptype = 0;
-static int      inherit_list = 0;
-static Parm    *template_parameters = 0;
-static int      parsing_template_declaration = 0;
-static int      extendmode   = 0;
-static int      compact_default_args = 0;
-static int      template_reduce = 0;
-static int      cparse_externc = 0;
-int		ignore_nested_classes = 0;
-int		kwargs_supported = 0;
-/* -----------------------------------------------------------------------------
- *                            Assist Functions
- * ----------------------------------------------------------------------------- */
-
-
- 
-/* Called by the parser (yyparse) when an error is found.*/
-static void yyerror (const char *e) {
-  (void)e;
-}
-
-/* Copies a node.  Does not copy tree links or symbol table data (except for
-   sym:name) */
-
-static Node *copy_node(Node *n) {
-  Node *nn;
-  Iterator k;
-  nn = NewHash();
-  Setfile(nn,Getfile(n));
-  Setline(nn,Getline(n));
-  for (k = First(n); k.key; k = Next(k)) {
-    String *ci;
-    String *key = k.key;
-    char *ckey = Char(key);
-    if ((strcmp(ckey,"nextSibling") == 0) ||
-	(strcmp(ckey,"previousSibling") == 0) ||
-	(strcmp(ckey,"parentNode") == 0) ||
-	(strcmp(ckey,"lastChild") == 0)) {
-      continue;
-    }
-    if (Strncmp(key,"csym:",5) == 0) continue;
-    /* We do copy sym:name.  For templates */
-    if ((strcmp(ckey,"sym:name") == 0) || 
-	(strcmp(ckey,"sym:weak") == 0) ||
-	(strcmp(ckey,"sym:typename") == 0)) {
-      String *ci = Copy(k.item);
-      Setattr(nn,key, ci);
-      Delete(ci);
-      continue;
-    }
-    if (strcmp(ckey,"sym:symtab") == 0) {
-      Setattr(nn,"sym:needs_symtab", "1");
-    }
-    /* We don't copy any other symbol table attributes */
-    if (strncmp(ckey,"sym:",4) == 0) {
-      continue;
-    }
-    /* If children.  We copy them recursively using this function */
-    if (strcmp(ckey,"firstChild") == 0) {
-      /* Copy children */
-      Node *cn = k.item;
-      while (cn) {
-	Node *copy = copy_node(cn);
-	appendChild(nn,copy);
-	Delete(copy);
-	cn = nextSibling(cn);
-      }
-      continue;
-    }
-    /* We don't copy the symbol table.  But we drop an attribute 
-       requires_symtab so that functions know it needs to be built */
-
-    if (strcmp(ckey,"symtab") == 0) {
-      /* Node defined a symbol table. */
-      Setattr(nn,"requires_symtab","1");
-      continue;
-    }
-    /* Can't copy nodes */
-    if (strcmp(ckey,"node") == 0) {
-      continue;
-    }
-    if ((strcmp(ckey,"parms") == 0) || (strcmp(ckey,"pattern") == 0) || (strcmp(ckey,"throws") == 0)
-	|| (strcmp(ckey,"kwargs") == 0)) {
-      ParmList *pl = CopyParmList(k.item);
-      Setattr(nn,key,pl);
-      Delete(pl);
-      continue;
-    }
-    if (strcmp(ckey,"nested:outer") == 0) { /* don't copy outer classes links, they will be updated later */
-      Setattr(nn, key, k.item);
-      continue;
-    }
-    /* defaultargs will be patched back in later in update_defaultargs() */
-    if (strcmp(ckey,"defaultargs") == 0) {
-      Setattr(nn, "needs_defaultargs", "1");
-      continue;
-    }
-    /* Looks okay.  Just copy the data using Copy */
-    ci = Copy(k.item);
-    Setattr(nn, key, ci);
-    Delete(ci);
-  }
-  return nn;
-}
-
-/* -----------------------------------------------------------------------------
- *                              Variables
- * ----------------------------------------------------------------------------- */
-
-static char  *typemap_lang = 0;    /* Current language setting */
-
-static int cplus_mode  = 0;
-
-/* C++ modes */
-
-#define  CPLUS_PUBLIC    1
-#define  CPLUS_PRIVATE   2
-#define  CPLUS_PROTECTED 3
-
-/* include types */
-static int   import_mode = 0;
-
-void SWIG_typemap_lang(const char *tm_lang) {
-  typemap_lang = Swig_copy_string(tm_lang);
-}
-
-void SWIG_cparse_set_compact_default_args(int defargs) {
-  compact_default_args = defargs;
-}
-
-int SWIG_cparse_template_reduce(int treduce) {
-  template_reduce = treduce;
-  return treduce;  
-}
-
-/* -----------------------------------------------------------------------------
- *                           Assist functions
- * ----------------------------------------------------------------------------- */
-
-static int promote_type(int t) {
-  if (t <= T_UCHAR || t == T_CHAR) return T_INT;
-  return t;
-}
-
-/* Perform type-promotion for binary operators */
-static int promote(int t1, int t2) {
-  t1 = promote_type(t1);
-  t2 = promote_type(t2);
-  return t1 > t2 ? t1 : t2;
-}
-
-static String *yyrename = 0;
-
-/* Forward renaming operator */
-
-static String *resolve_create_node_scope(String *cname);
-
-
-Hash *Swig_cparse_features(void) {
-  static Hash   *features_hash = 0;
-  if (!features_hash) features_hash = NewHash();
-  return features_hash;
-}
-
-/* Fully qualify any template parameters */
-static String *feature_identifier_fix(String *s) {
-  String *tp = SwigType_istemplate_templateprefix(s);
-  if (tp) {
-    String *ts, *ta, *tq;
-    ts = SwigType_templatesuffix(s);
-    ta = SwigType_templateargs(s);
-    tq = Swig_symbol_type_qualify(ta,0);
-    Append(tp,tq);
-    Append(tp,ts);
-    Delete(ts);
-    Delete(ta);
-    Delete(tq);
-    return tp;
-  } else {
-    return NewString(s);
-  }
-}
-
-static void set_access_mode(Node *n) {
-  if (cplus_mode == CPLUS_PUBLIC)
-    Setattr(n, "access", "public");
-  else if (cplus_mode == CPLUS_PROTECTED)
-    Setattr(n, "access", "protected");
-  else
-    Setattr(n, "access", "private");
-}
-
-static void restore_access_mode(Node *n) {
-  String *mode = Getattr(n, "access");
-  if (Strcmp(mode, "private") == 0)
-    cplus_mode = CPLUS_PRIVATE;
-  else if (Strcmp(mode, "protected") == 0)
-    cplus_mode = CPLUS_PROTECTED;
-  else
-    cplus_mode = CPLUS_PUBLIC;
-}
-
-/* Generate the symbol table name for an object */
-/* This is a bit of a mess. Need to clean up */
-static String *add_oldname = 0;
-
-
-
-static String *make_name(Node *n, String *name,SwigType *decl) {
-  String *made_name = 0;
-  int destructor = name && (*(Char(name)) == '~');
-
-  if (yyrename) {
-    String *s = NewString(yyrename);
-    Delete(yyrename);
-    yyrename = 0;
-    if (destructor  && (*(Char(s)) != '~')) {
-      Insert(s,0,"~");
-    }
-    return s;
-  }
-
-  if (!name) return 0;
-
-  if (parsing_template_declaration)
-    SetFlag(n, "parsing_template_declaration");
-  made_name = Swig_name_make(n, Namespaceprefix, name, decl, add_oldname);
-  Delattr(n, "parsing_template_declaration");
-
-  return made_name;
-}
-
-/* Generate an unnamed identifier */
-static String *make_unnamed() {
-  unnamed++;
-  return NewStringf("$unnamed%d$",unnamed);
-}
-
-/* Return if the node is a friend declaration */
-static int is_friend(Node *n) {
-  return Cmp(Getattr(n,"storage"),"friend") == 0;
-}
-
-static int is_operator(String *name) {
-  return Strncmp(name,"operator ", 9) == 0;
-}
-
-
-/* Add declaration list to symbol table */
-static int  add_only_one = 0;
-
-static void add_symbols(Node *n) {
-  String *decl;
-  String *wrn = 0;
-
-  if (inclass && n) {
-    cparse_normalize_void(n);
-  }
-  while (n) {
-    String *symname = 0;
-    /* for friends, we need to pop the scope once */
-    String *old_prefix = 0;
-    Symtab *old_scope = 0;
-    int isfriend = inclass && is_friend(n);
-    int iscdecl = Cmp(nodeType(n),"cdecl") == 0;
-    int only_csymbol = 0;
-    
-    if (inclass) {
-      String *name = Getattr(n, "name");
-      if (isfriend) {
-	/* for friends, we need to add the scopename if needed */
-	String *prefix = name ? Swig_scopename_prefix(name) : 0;
-	old_prefix = Namespaceprefix;
-	old_scope = Swig_symbol_popscope();
-	Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	if (!prefix) {
-	  if (name && !is_operator(name) && Namespaceprefix) {
-	    String *nname = NewStringf("%s::%s", Namespaceprefix, name);
-	    Setattr(n,"name",nname);
-	    Delete(nname);
-	  }
-	} else {
-	  Symtab *st = Swig_symbol_getscope(prefix);
-	  String *ns = st ? Getattr(st,"name") : prefix;
-	  String *base  = Swig_scopename_last(name);
-	  String *nname = NewStringf("%s::%s", ns, base);
-	  Setattr(n,"name",nname);
-	  Delete(nname);
-	  Delete(base);
-	  Delete(prefix);
-	}
-	Namespaceprefix = 0;
-      } else {
-	/* for member functions, we need to remove the redundant
-	   class scope if provided, as in
-	   
-	   struct Foo {
-	   int Foo::method(int a);
-	   };
-	   
-	*/
-	String *prefix = name ? Swig_scopename_prefix(name) : 0;
-	if (prefix) {
-	  if (Classprefix && (Equal(prefix,Classprefix))) {
-	    String *base = Swig_scopename_last(name);
-	    Setattr(n,"name",base);
-	    Delete(base);
-	  }
-	  Delete(prefix);
-	}
-      }
-    }
-
-    if (!isfriend && (inclass || extendmode)) {
-      Setattr(n,"ismember","1");
-    }
-
-    if (extendmode) {
-      if (!Getattr(n, "template"))
-        SetFlag(n,"isextendmember");
-    }
-
-    if (!isfriend && inclass) {
-      if ((cplus_mode != CPLUS_PUBLIC)) {
-	only_csymbol = 1;
-	if (cplus_mode == CPLUS_PROTECTED) {
-	  Setattr(n,"access", "protected");
-	  only_csymbol = !Swig_need_protected(n);
-	} else {
-	  Setattr(n,"access", "private");
-	  /* private are needed only when they are pure virtuals - why? */
-	  if ((Cmp(Getattr(n,"storage"),"virtual") == 0) && (Cmp(Getattr(n,"value"),"0") == 0)) {
-	    only_csymbol = 0;
-	  }
-	  if (Cmp(nodeType(n),"destructor") == 0) {
-	    /* Needed for "unref" feature */
-	    only_csymbol = 0;
-	  }
-	}
-      } else {
-	  Setattr(n,"access", "public");
-      }
-    }
-    if (Getattr(n,"sym:name")) {
-      n = nextSibling(n);
-      continue;
-    }
-    decl = Getattr(n,"decl");
-    if (!SwigType_isfunction(decl)) {
-      String *name = Getattr(n,"name");
-      String *makename = Getattr(n,"parser:makename");
-      if (iscdecl) {	
-	String *storage = Getattr(n, "storage");
-	if (Cmp(storage,"typedef") == 0) {
-	  Setattr(n,"kind","typedef");
-	} else {
-	  SwigType *type = Getattr(n,"type");
-	  String *value = Getattr(n,"value");
-	  Setattr(n,"kind","variable");
-	  if (value && Len(value)) {
-	    Setattr(n,"hasvalue","1");
-	  }
-	  if (type) {
-	    SwigType *ty;
-	    SwigType *tmp = 0;
-	    if (decl) {
-	      ty = tmp = Copy(type);
-	      SwigType_push(ty,decl);
-	    } else {
-	      ty = type;
-	    }
-	    if (!SwigType_ismutable(ty) || (storage && Strstr(storage, "constexpr"))) {
-	      SetFlag(n,"hasconsttype");
-	      SetFlag(n,"feature:immutable");
-	    }
-	    if (tmp) Delete(tmp);
-	  }
-	  if (!type) {
-	    Printf(stderr,"notype name %s\n", name);
-	  }
-	}
-      }
-      Swig_features_get(Swig_cparse_features(), Namespaceprefix, name, 0, n);
-      if (makename) {
-	symname = make_name(n, makename,0);
-        Delattr(n,"parser:makename"); /* temporary information, don't leave it hanging around */
-      } else {
-        makename = name;
-	symname = make_name(n, makename,0);
-      }
-      
-      if (!symname) {
-	symname = Copy(Getattr(n,"unnamed"));
-      }
-      if (symname) {
-	if (parsing_template_declaration)
-	  SetFlag(n, "parsing_template_declaration");
-	wrn = Swig_name_warning(n, Namespaceprefix, symname,0);
-	Delattr(n, "parsing_template_declaration");
-      }
-    } else {
-      String *name = Getattr(n,"name");
-      SwigType *fdecl = Copy(decl);
-      SwigType *fun = SwigType_pop_function(fdecl);
-      if (iscdecl) {	
-	Setattr(n,"kind","function");
-      }
-      
-      Swig_features_get(Swig_cparse_features(),Namespaceprefix,name,fun,n);
-
-      symname = make_name(n, name,fun);
-      if (parsing_template_declaration)
-	SetFlag(n, "parsing_template_declaration");
-      wrn = Swig_name_warning(n, Namespaceprefix,symname,fun);
-      Delattr(n, "parsing_template_declaration");
-      
-      Delete(fdecl);
-      Delete(fun);
-      
-    }
-    if (!symname) {
-      n = nextSibling(n);
-      continue;
-    }
-    if (cparse_cplusplus) {
-      String *value = Getattr(n, "value");
-      if (value && Strcmp(value, "delete") == 0) {
-	/* C++11 deleted definition / deleted function */
-        SetFlag(n,"deleted");
-        SetFlag(n,"feature:ignore");
-      }
-    }
-    if (only_csymbol || GetFlag(n,"feature:ignore") || strncmp(Char(symname),"$ignore",7) == 0) {
-      /* Only add to C symbol table and continue */
-      Swig_symbol_add(0, n);
-      if (!only_csymbol && !GetFlag(n, "feature:ignore")) {
-	/* Print the warning attached to $ignore name, if any */
-        char *c = Char(symname) + 7;
-	if (strlen(c)) {
-	  SWIG_WARN_NODE_BEGIN(n);
-	  Swig_warning(0,Getfile(n), Getline(n), "%s\n",c+1);
-	  SWIG_WARN_NODE_END(n);
-	}
-	/* If the symbol was ignored via "rename" and is visible, set also feature:ignore*/
-	SetFlag(n, "feature:ignore");
-      }
-      if (!GetFlag(n, "feature:ignore") && Strcmp(symname,"$ignore") == 0) {
-	/* Add feature:ignore if the symbol was explicitely ignored, regardless of visibility */
-	SetFlag(n, "feature:ignore");
-      }
-    } else {
-      Node *c;
-      if ((wrn) && (Len(wrn))) {
-	String *metaname = symname;
-	if (!Getmeta(metaname,"already_warned")) {
-	  SWIG_WARN_NODE_BEGIN(n);
-	  Swig_warning(0,Getfile(n),Getline(n), "%s\n", wrn);
-	  SWIG_WARN_NODE_END(n);
-	  Setmeta(metaname,"already_warned","1");
-	}
-      }
-      c = Swig_symbol_add(symname,n);
-
-      if (c != n) {
-        /* symbol conflict attempting to add in the new symbol */
-        if (Getattr(n,"sym:weak")) {
-          Setattr(n,"sym:name",symname);
-        } else {
-          String *e = NewStringEmpty();
-          String *en = NewStringEmpty();
-          String *ec = NewStringEmpty();
-          int redefined = Swig_need_redefined_warn(n,c,inclass);
-          if (redefined) {
-            Printf(en,"Identifier '%s' redefined (ignored)",symname);
-            Printf(ec,"previous definition of '%s'",symname);
-          } else {
-            Printf(en,"Redundant redeclaration of '%s'",symname);
-            Printf(ec,"previous declaration of '%s'",symname);
-          }
-          if (Cmp(symname,Getattr(n,"name"))) {
-            Printf(en," (Renamed from '%s')", SwigType_namestr(Getattr(n,"name")));
-          }
-          Printf(en,",");
-          if (Cmp(symname,Getattr(c,"name"))) {
-            Printf(ec," (Renamed from '%s')", SwigType_namestr(Getattr(c,"name")));
-          }
-          Printf(ec,".");
-	  SWIG_WARN_NODE_BEGIN(n);
-          if (redefined) {
-            Swig_warning(WARN_PARSE_REDEFINED,Getfile(n),Getline(n),"%s\n",en);
-            Swig_warning(WARN_PARSE_REDEFINED,Getfile(c),Getline(c),"%s\n",ec);
-          } else if (!is_friend(n) && !is_friend(c)) {
-            Swig_warning(WARN_PARSE_REDUNDANT,Getfile(n),Getline(n),"%s\n",en);
-            Swig_warning(WARN_PARSE_REDUNDANT,Getfile(c),Getline(c),"%s\n",ec);
-          }
-	  SWIG_WARN_NODE_END(n);
-          Printf(e,"%s:%d:%s\n%s:%d:%s\n",Getfile(n),Getline(n),en,
-                 Getfile(c),Getline(c),ec);
-          Setattr(n,"error",e);
-	  Delete(e);
-          Delete(en);
-          Delete(ec);
-        }
-      }
-    }
-    /* restore the class scope if needed */
-    if (isfriend) {
-      Swig_symbol_setscope(old_scope);
-      if (old_prefix) {
-	Delete(Namespaceprefix);
-	Namespaceprefix = old_prefix;
-      }
-    }
-    Delete(symname);
-
-    if (add_only_one) return;
-    n = nextSibling(n);
-  }
-}
-
-
-/* add symbols a parse tree node copy */
-
-static void add_symbols_copy(Node *n) {
-  String *name;
-  int    emode = 0;
-  while (n) {
-    char *cnodeType = Char(nodeType(n));
-
-    if (strcmp(cnodeType,"access") == 0) {
-      String *kind = Getattr(n,"kind");
-      if (Strcmp(kind,"public") == 0) {
-	cplus_mode = CPLUS_PUBLIC;
-      } else if (Strcmp(kind,"private") == 0) {
-	cplus_mode = CPLUS_PRIVATE;
-      } else if (Strcmp(kind,"protected") == 0) {
-	cplus_mode = CPLUS_PROTECTED;
-      }
-      n = nextSibling(n);
-      continue;
-    }
-
-    add_oldname = Getattr(n,"sym:name");
-    if ((add_oldname) || (Getattr(n,"sym:needs_symtab"))) {
-      int old_inclass = -1;
-      Node *old_current_class = 0;
-      if (add_oldname) {
-	DohIncref(add_oldname);
-	/*  Disable this, it prevents %rename to work with templates */
-	/* If already renamed, we used that name  */
-	/*
-	if (Strcmp(add_oldname, Getattr(n,"name")) != 0) {
-	  Delete(yyrename);
-	  yyrename = Copy(add_oldname);
-	}
-	*/
-      }
-      Delattr(n,"sym:needs_symtab");
-      Delattr(n,"sym:name");
-
-      add_only_one = 1;
-      add_symbols(n);
-
-      if (Getattr(n,"partialargs")) {
-	Swig_symbol_cadd(Getattr(n,"partialargs"),n);
-      }
-      add_only_one = 0;
-      name = Getattr(n,"name");
-      if (Getattr(n,"requires_symtab")) {
-	Swig_symbol_newscope();
-	Swig_symbol_setscopename(name);
-	Delete(Namespaceprefix);
-	Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-      }
-      if (strcmp(cnodeType,"class") == 0) {
-	old_inclass = inclass;
-	inclass = 1;
-	old_current_class = current_class;
-	current_class = n;
-	if (Strcmp(Getattr(n,"kind"),"class") == 0) {
-	  cplus_mode = CPLUS_PRIVATE;
-	} else {
-	  cplus_mode = CPLUS_PUBLIC;
-	}
-      }
-      if (strcmp(cnodeType,"extend") == 0) {
-	emode = cplus_mode;
-	cplus_mode = CPLUS_PUBLIC;
-      }
-      add_symbols_copy(firstChild(n));
-      if (strcmp(cnodeType,"extend") == 0) {
-	cplus_mode = emode;
-      }
-      if (Getattr(n,"requires_symtab")) {
-	Setattr(n,"symtab", Swig_symbol_popscope());
-	Delattr(n,"requires_symtab");
-	Delete(Namespaceprefix);
-	Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-      }
-      if (add_oldname) {
-	Delete(add_oldname);
-	add_oldname = 0;
-      }
-      if (strcmp(cnodeType,"class") == 0) {
-	inclass = old_inclass;
-	current_class = old_current_class;
-      }
-    } else {
-      if (strcmp(cnodeType,"extend") == 0) {
-	emode = cplus_mode;
-	cplus_mode = CPLUS_PUBLIC;
-      }
-      add_symbols_copy(firstChild(n));
-      if (strcmp(cnodeType,"extend") == 0) {
-	cplus_mode = emode;
-      }
-    }
-    n = nextSibling(n);
-  }
-}
-
-/* Add in the "defaultargs" attribute for functions in instantiated templates.
- * n should be any instantiated template (class or start of linked list of functions). */
-static void update_defaultargs(Node *n) {
-  if (n) {
-    Node *firstdefaultargs = n;
-    update_defaultargs(firstChild(n));
-    n = nextSibling(n);
-    /* recursively loop through nodes of all types, but all we really need are the overloaded functions */
-    while (n) {
-      update_defaultargs(firstChild(n));
-      if (!Getattr(n, "defaultargs")) {
-	if (Getattr(n, "needs_defaultargs")) {
-	  Setattr(n, "defaultargs", firstdefaultargs);
-	  Delattr(n, "needs_defaultargs");
-	} else {
-	  firstdefaultargs = n;
-	}
-      } else {
-	/* Functions added in with %extend (for specialized template classes) will already have default args patched up */
-	assert(Getattr(n, "defaultargs") == firstdefaultargs);
-      }
-      n = nextSibling(n);
-    }
-  }
-}
-
-/* Check a set of declarations to see if any are pure-abstract */
-
-static List *pure_abstracts(Node *n) {
-  List *abstracts = 0;
-  while (n) {
-    if (Cmp(nodeType(n),"cdecl") == 0) {
-      String *decl = Getattr(n,"decl");
-      if (SwigType_isfunction(decl)) {
-	String *init = Getattr(n,"value");
-	if (Cmp(init,"0") == 0) {
-	  if (!abstracts) {
-	    abstracts = NewList();
-	  }
-	  Append(abstracts,n);
-	  SetFlag(n,"abstract");
-	}
-      }
-    } else if (Cmp(nodeType(n),"destructor") == 0) {
-      if (Cmp(Getattr(n,"value"),"0") == 0) {
-	if (!abstracts) {
-	  abstracts = NewList();
-	}
-	Append(abstracts,n);
-	SetFlag(n,"abstract");
-      }
-    }
-    n = nextSibling(n);
-  }
-  return abstracts;
-}
-
-/* Make a classname */
-
-static String *make_class_name(String *name) {
-  String *nname = 0;
-  String *prefix;
-  if (Namespaceprefix) {
-    nname= NewStringf("%s::%s", Namespaceprefix, name);
-  } else {
-    nname = NewString(name);
-  }
-  prefix = SwigType_istemplate_templateprefix(nname);
-  if (prefix) {
-    String *args, *qargs;
-    args   = SwigType_templateargs(nname);
-    qargs  = Swig_symbol_type_qualify(args,0);
-    Append(prefix,qargs);
-    Delete(nname);
-    Delete(args);
-    Delete(qargs);
-    nname = prefix;
-  }
-  return nname;
-}
-
-/* Use typedef name as class name */
-
-static void add_typedef_name(Node *n, Node *declnode, String *oldName, Symtab *cscope, String *scpname) {
-  String *class_rename = 0;
-  SwigType *decl = Getattr(declnode, "decl");
-  if (!decl || !Len(decl)) {
-    String *cname;
-    String *tdscopename;
-    String *class_scope = Swig_symbol_qualifiedscopename(cscope);
-    String *name = Getattr(declnode, "name");
-    cname = Copy(name);
-    Setattr(n, "tdname", cname);
-    tdscopename = class_scope ? NewStringf("%s::%s", class_scope, name) : Copy(name);
-    class_rename = Getattr(n, "class_rename");
-    if (class_rename && (Strcmp(class_rename, oldName) == 0))
-      Setattr(n, "class_rename", NewString(name));
-    if (!classes_typedefs) classes_typedefs = NewHash();
-    if (!Equal(scpname, tdscopename) && !Getattr(classes_typedefs, tdscopename)) {
-      Setattr(classes_typedefs, tdscopename, n);
-    }
-    Setattr(n, "decl", decl);
-    Delete(class_scope);
-    Delete(cname);
-    Delete(tdscopename);
-  }
-}
-
-/* If the class name is qualified.  We need to create or lookup namespace entries */
-
-static Symtab *set_scope_to_global() {
-  Symtab *symtab = Swig_symbol_global_scope();
-  Swig_symbol_setscope(symtab);
-  return symtab;
-}
- 
-/* Remove the block braces, { and }, if the 'noblock' attribute is set.
- * Node *kw can be either a Hash or Parmlist. */
-static String *remove_block(Node *kw, const String *inputcode) {
-  String *modified_code = 0;
-  while (kw) {
-   String *name = Getattr(kw,"name");
-   if (name && (Cmp(name,"noblock") == 0)) {
-     char *cstr = Char(inputcode);
-     int len = Len(inputcode);
-     if (len && cstr[0] == '{') {
-       --len; ++cstr; 
-       if (len && cstr[len - 1] == '}') { --len; }
-       /* we now remove the extra spaces */
-       while (len && isspace((int)cstr[0])) { --len; ++cstr; }
-       while (len && isspace((int)cstr[len - 1])) { --len; }
-       modified_code = NewStringWithSize(cstr, len);
-       break;
-     }
-   }
-   kw = nextSibling(kw);
-  }
-  return modified_code;
-}
-
-
-static Node *nscope = 0;
-static Node *nscope_inner = 0;
-
-/* Remove the scope prefix from cname and return the base name without the prefix.
- * The scopes required for the symbol name are resolved and/or created, if required.
- * For example AA::BB::CC as input returns CC and creates the namespace AA then inner 
- * namespace BB in the current scope. If cname is found to already exist as a weak symbol
- * (forward reference) then the scope might be changed to match, such as when a symbol match 
- * is made via a using reference. */
-static String *resolve_create_node_scope(String *cname) {
-  Symtab *gscope = 0;
-  Node *cname_node = 0;
-  int skip_lookup = 0;
-  nscope = 0;
-  nscope_inner = 0;  
-
-  if (Strncmp(cname,"::",2) == 0)
-    skip_lookup = 1;
-
-  cname_node = skip_lookup ? 0 : Swig_symbol_clookup_no_inherit(cname, 0);
-
-  if (cname_node) {
-    /* The symbol has been defined already or is in another scope.
-       If it is a weak symbol, it needs replacing and if it was brought into the current scope
-       via a using declaration, the scope needs adjusting appropriately for the new symbol.
-       Similarly for defined templates. */
-    Symtab *symtab = Getattr(cname_node, "sym:symtab");
-    Node *sym_weak = Getattr(cname_node, "sym:weak");
-    if ((symtab && sym_weak) || Equal(nodeType(cname_node), "template")) {
-      /* Check if the scope is the current scope */
-      String *current_scopename = Swig_symbol_qualifiedscopename(0);
-      String *found_scopename = Swig_symbol_qualifiedscopename(symtab);
-      int len;
-      if (!current_scopename)
-	current_scopename = NewString("");
-      if (!found_scopename)
-	found_scopename = NewString("");
-      len = Len(current_scopename);
-      if ((len > 0) && (Strncmp(current_scopename, found_scopename, len) == 0)) {
-	if (Len(found_scopename) > len + 2) {
-	  /* A matching weak symbol was found in non-global scope, some scope adjustment may be required */
-	  String *new_cname = NewString(Char(found_scopename) + len + 2); /* skip over "::" prefix */
-	  String *base = Swig_scopename_last(cname);
-	  Printf(new_cname, "::%s", base);
-	  cname = new_cname;
-	  Delete(base);
-	} else {
-	  /* A matching weak symbol was found in the same non-global local scope, no scope adjustment required */
-	  assert(len == Len(found_scopename));
-	}
-      } else {
-	String *base = Swig_scopename_last(cname);
-	if (Len(found_scopename) > 0) {
-	  /* A matching weak symbol was found in a different scope to the local scope - probably via a using declaration */
-	  cname = NewStringf("%s::%s", found_scopename, base);
-	} else {
-	  /* Either:
-	      1) A matching weak symbol was found in a different scope to the local scope - this is actually a
-	      symbol with the same name in a different scope which we don't want, so no adjustment required.
-	      2) A matching weak symbol was found in the global scope - no adjustment required.
-	  */
-	  cname = Copy(base);
-	}
-	Delete(base);
-      }
-      Delete(current_scopename);
-      Delete(found_scopename);
-    }
-  }
-
-  if (Swig_scopename_check(cname)) {
-    Node   *ns;
-    String *prefix = Swig_scopename_prefix(cname);
-    String *base = Swig_scopename_last(cname);
-    if (prefix && (Strncmp(prefix,"::",2) == 0)) {
-/* I don't think we can use :: global scope to declare classes and hence neither %template. - consider reporting error instead - wsfulton. */
-      /* Use the global scope */
-      String *nprefix = NewString(Char(prefix)+2);
-      Delete(prefix);
-      prefix= nprefix;
-      gscope = set_scope_to_global();
-    }
-    if (Len(prefix) == 0) {
-      /* Use the global scope, but we need to add a 'global' namespace.  */
-      if (!gscope) gscope = set_scope_to_global();
-      /* note that this namespace is not the "unnamed" one,
-	 and we don't use Setattr(nscope,"name", ""),
-	 because the unnamed namespace is private */
-      nscope = new_node("namespace");
-      Setattr(nscope,"symtab", gscope);;
-      nscope_inner = nscope;
-      return base;
-    }
-    /* Try to locate the scope */
-    ns = Swig_symbol_clookup(prefix,0);
-    if (!ns) {
-      Swig_error(cparse_file,cparse_line,"Undefined scope '%s'\n", prefix);
-    } else {
-      Symtab *nstab = Getattr(ns,"symtab");
-      if (!nstab) {
-	Swig_error(cparse_file,cparse_line, "'%s' is not defined as a valid scope.\n", prefix);
-	ns = 0;
-      } else {
-	/* Check if the node scope is the current scope */
-	String *tname = Swig_symbol_qualifiedscopename(0);
-	String *nname = Swig_symbol_qualifiedscopename(nstab);
-	if (tname && (Strcmp(tname,nname) == 0)) {
-	  ns = 0;
-	  cname = base;
-	}
-	Delete(tname);
-	Delete(nname);
-      }
-      if (ns) {
-	/* we will try to create a new node using the namespaces we
-	   can find in the scope name */
-	List *scopes;
-	String *sname;
-	Iterator si;
-	String *name = NewString(prefix);
-	scopes = NewList();
-	while (name) {
-	  String *base = Swig_scopename_last(name);
-	  String *tprefix = Swig_scopename_prefix(name);
-	  Insert(scopes,0,base);
-	  Delete(base);
-	  Delete(name);
-	  name = tprefix;
-	}
-	for (si = First(scopes); si.item; si = Next(si)) {
-	  Node *ns1,*ns2;
-	  sname = si.item;
-	  ns1 = Swig_symbol_clookup(sname,0);
-	  assert(ns1);
-	  if (Strcmp(nodeType(ns1),"namespace") == 0) {
-	    if (Getattr(ns1,"alias")) {
-	      ns1 = Getattr(ns1,"namespace");
-	    }
-	  } else {
-	    /* now this last part is a class */
-	    si = Next(si);
-	    /*  or a nested class tree, which is unrolled here */
-	    for (; si.item; si = Next(si)) {
-	      if (si.item) {
-		Printf(sname,"::%s",si.item);
-	      }
-	    }
-	    /* we get the 'inner' class */
-	    nscope_inner = Swig_symbol_clookup(sname,0);
-	    /* set the scope to the inner class */
-	    Swig_symbol_setscope(Getattr(nscope_inner,"symtab"));
-	    /* save the last namespace prefix */
-	    Delete(Namespaceprefix);
-	    Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	    /* and return the node name, including the inner class prefix */
-	    break;
-	  }
-	  /* here we just populate the namespace tree as usual */
-	  ns2 = new_node("namespace");
-	  Setattr(ns2,"name",sname);
-	  Setattr(ns2,"symtab", Getattr(ns1,"symtab"));
-	  add_symbols(ns2);
-	  Swig_symbol_setscope(Getattr(ns1,"symtab"));
-	  Delete(Namespaceprefix);
-	  Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	  if (nscope_inner) {
-	    if (Getattr(nscope_inner,"symtab") != Getattr(ns2,"symtab")) {
-	      appendChild(nscope_inner,ns2);
-	      Delete(ns2);
-	    }
-	  }
-	  nscope_inner = ns2;
-	  if (!nscope) nscope = ns2;
-	}
-	cname = base;
-	Delete(scopes);
-      }
-    }
-    Delete(prefix);
-  }
-
-  return cname;
-}
- 
-/* look for simple typedef name in typedef list */
-static String *try_to_find_a_name_for_unnamed_structure(const char *storage, Node *decls) {
-  String *name = 0;
-  Node *n = decls;
-  if (storage && (strcmp(storage, "typedef") == 0)) {
-    for (; n; n = nextSibling(n)) {
-      if (!Len(Getattr(n, "decl"))) {
-	name = Copy(Getattr(n, "name"));
-	break;
-      }
-    }
-  }
-  return name;
-}
-
-/* traverse copied tree segment, and update outer class links*/
-static void update_nested_classes(Node *n)
-{
-  Node *c = firstChild(n);
-  while (c) {
-    if (Getattr(c, "nested:outer"))
-      Setattr(c, "nested:outer", n);
-    update_nested_classes(c);
-    c = nextSibling(c);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * nested_forward_declaration()
- * 
- * Nested struct handling for C++ code if the nested classes are disabled.
- * Create the nested class/struct/union as a forward declaration.
- * ----------------------------------------------------------------------------- */
-
-static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) {
-  Node *nn = 0;
-
-  if (sname) {
-    /* Add forward declaration of the nested type */
-    Node *n = new_node("classforward");
-    Setattr(n, "kind", kind);
-    Setattr(n, "name", sname);
-    Setattr(n, "storage", storage);
-    Setattr(n, "sym:weak", "1");
-    add_symbols(n);
-    nn = n;
-  }
-
-  /* Add any variable instances. Also add in any further typedefs of the nested type.
-     Note that anonymous typedefs (eg typedef struct {...} a, b;) are treated as class forward declarations */
-  if (cpp_opt_declarators) {
-    int storage_typedef = (storage && (strcmp(storage, "typedef") == 0));
-    int variable_of_anonymous_type = !sname && !storage_typedef;
-    if (!variable_of_anonymous_type) {
-      int anonymous_typedef = !sname && (storage && (strcmp(storage, "typedef") == 0));
-      Node *n = cpp_opt_declarators;
-      SwigType *type = name;
-      while (n) {
-	Setattr(n, "type", type);
-	Setattr(n, "storage", storage);
-	if (anonymous_typedef) {
-	  Setattr(n, "nodeType", "classforward");
-	  Setattr(n, "sym:weak", "1");
-	}
-	n = nextSibling(n);
-      }
-      add_symbols(cpp_opt_declarators);
-
-      if (nn) {
-	set_nextSibling(nn, cpp_opt_declarators);
-      } else {
-	nn = cpp_opt_declarators;
-      }
-    }
-  }
-
-  if (!currentOuterClass || !GetFlag(currentOuterClass, "nested")) {
-    if (nn && Equal(nodeType(nn), "classforward")) {
-      Node *n = nn;
-      if (!GetFlag(n, "feature:ignore")) {
-	SWIG_WARN_NODE_BEGIN(n);
-	Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name);
-	SWIG_WARN_NODE_END(n);
-      }
-    } else {
-      Swig_warning(WARN_PARSE_UNNAMED_NESTED_CLASS, cparse_file, cparse_line, "Nested %s not currently supported (ignored).\n", kind);
-    }
-  }
-
-  return nn;
-}
-
-
-Node *Swig_cparse(File *f) {
-  scanner_file(f);
-  top = 0;
-  yyparse();
-  return top;
-}
-
-static void single_new_feature(const char *featurename, String *val, Hash *featureattribs, char *declaratorid, SwigType *type, ParmList *declaratorparms, String *qualifier) {
-  String *fname;
-  String *name;
-  String *fixname;
-  SwigType *t = Copy(type);
-
-  /* Printf(stdout, "single_new_feature: [%s] [%s] [%s] [%s] [%s] [%s]\n", featurename, val, declaratorid, t, ParmList_str_defaultargs(declaratorparms), qualifier); */
-
-  /* Warn about deprecated features */
-  if (strcmp(featurename, "nestedworkaround") == 0)
-    Swig_warning(WARN_DEPRECATED_NESTED_WORKAROUND, cparse_file, cparse_line, "The 'nestedworkaround' feature is deprecated.\n");
-
-  fname = NewStringf("feature:%s",featurename);
-  if (declaratorid) {
-    fixname = feature_identifier_fix(declaratorid);
-  } else {
-    fixname = NewStringEmpty();
-  }
-  if (Namespaceprefix) {
-    name = NewStringf("%s::%s",Namespaceprefix, fixname);
-  } else {
-    name = fixname;
-  }
-
-  if (declaratorparms) Setmeta(val,"parms",declaratorparms);
-  if (!Len(t)) t = 0;
-  if (t) {
-    if (qualifier) SwigType_push(t,qualifier);
-    if (SwigType_isfunction(t)) {
-      SwigType *decl = SwigType_pop_function(t);
-      if (SwigType_ispointer(t)) {
-	String *nname = NewStringf("*%s",name);
-	Swig_feature_set(Swig_cparse_features(), nname, decl, fname, val, featureattribs);
-	Delete(nname);
-      } else {
-	Swig_feature_set(Swig_cparse_features(), name, decl, fname, val, featureattribs);
-      }
-      Delete(decl);
-    } else if (SwigType_ispointer(t)) {
-      String *nname = NewStringf("*%s",name);
-      Swig_feature_set(Swig_cparse_features(),nname,0,fname,val, featureattribs);
-      Delete(nname);
-    }
-  } else {
-    /* Global feature, that is, feature not associated with any particular symbol */
-    Swig_feature_set(Swig_cparse_features(),name,0,fname,val, featureattribs);
-  }
-  Delete(fname);
-  Delete(name);
-}
-
-/* Add a new feature to the Hash. Additional features are added if the feature has a parameter list (declaratorparms)
- * and one or more of the parameters have a default argument. An extra feature is added for each defaulted parameter,
- * simulating the equivalent overloaded method. */
-static void new_feature(const char *featurename, String *val, Hash *featureattribs, char *declaratorid, SwigType *type, ParmList *declaratorparms, String *qualifier) {
-
-  ParmList *declparms = declaratorparms;
-
-  /* remove the { and } braces if the noblock attribute is set */
-  String *newval = remove_block(featureattribs, val);
-  val = newval ? newval : val;
-
-  /* Add the feature */
-  single_new_feature(featurename, val, featureattribs, declaratorid, type, declaratorparms, qualifier);
-
-  /* Add extra features if there are default parameters in the parameter list */
-  if (type) {
-    while (declparms) {
-      if (ParmList_has_defaultargs(declparms)) {
-
-        /* Create a parameter list for the new feature by copying all
-           but the last (defaulted) parameter */
-        ParmList* newparms = CopyParmListMax(declparms, ParmList_len(declparms)-1);
-
-        /* Create new declaration - with the last parameter removed */
-        SwigType *newtype = Copy(type);
-        Delete(SwigType_pop_function(newtype)); /* remove the old parameter list from newtype */
-        SwigType_add_function(newtype,newparms);
-
-        single_new_feature(featurename, Copy(val), featureattribs, declaratorid, newtype, newparms, qualifier);
-        declparms = newparms;
-      } else {
-        declparms = 0;
-      }
-    }
-  }
-}
-
-/* check if a function declaration is a plain C object */
-static int is_cfunction(Node *n) {
-  if (!cparse_cplusplus || cparse_externc)
-    return 1;
-  if (Swig_storage_isexternc(n)) {
-    return 1;
-  }
-  return 0;
-}
-
-/* If the Node is a function with parameters, check to see if any of the parameters
- * have default arguments. If so create a new function for each defaulted argument. 
- * The additional functions form a linked list of nodes with the head being the original Node n. */
-static void default_arguments(Node *n) {
-  Node *function = n;
-
-  if (function) {
-    ParmList *varargs = Getattr(function,"feature:varargs");
-    if (varargs) {
-      /* Handles the %varargs directive by looking for "feature:varargs" and 
-       * substituting ... with an alternative set of arguments.  */
-      Parm     *p = Getattr(function,"parms");
-      Parm     *pp = 0;
-      while (p) {
-	SwigType *t = Getattr(p,"type");
-	if (Strcmp(t,"v(...)") == 0) {
-	  if (pp) {
-	    ParmList *cv = Copy(varargs);
-	    set_nextSibling(pp,cv);
-	    Delete(cv);
-	  } else {
-	    ParmList *cv =  Copy(varargs);
-	    Setattr(function,"parms", cv);
-	    Delete(cv);
-	  }
-	  break;
-	}
-	pp = p;
-	p = nextSibling(p);
-      }
-    }
-
-    /* Do not add in functions if kwargs is being used or if user wants old default argument wrapping
-       (one wrapped method per function irrespective of number of default arguments) */
-    if (compact_default_args 
-	|| is_cfunction(function) 
-	|| GetFlag(function,"feature:compactdefaultargs") 
-	|| (GetFlag(function,"feature:kwargs") && kwargs_supported)) {
-      ParmList *p = Getattr(function,"parms");
-      if (p) 
-        Setattr(p,"compactdefargs", "1"); /* mark parameters for special handling */
-      function = 0; /* don't add in extra methods */
-    }
-  }
-
-  while (function) {
-    ParmList *parms = Getattr(function,"parms");
-    if (ParmList_has_defaultargs(parms)) {
-
-      /* Create a parameter list for the new function by copying all
-         but the last (defaulted) parameter */
-      ParmList* newparms = CopyParmListMax(parms,ParmList_len(parms)-1);
-
-      /* Create new function and add to symbol table */
-      {
-	SwigType *ntype = Copy(nodeType(function));
-	char *cntype = Char(ntype);
-        Node *new_function = new_node(ntype);
-        SwigType *decl = Copy(Getattr(function,"decl"));
-        int constqualifier = SwigType_isconst(decl);
-	String *ccode = Copy(Getattr(function,"code"));
-	String *cstorage = Copy(Getattr(function,"storage"));
-	String *cvalue = Copy(Getattr(function,"value"));
-	SwigType *ctype = Copy(Getattr(function,"type"));
-	String *cthrow = Copy(Getattr(function,"throw"));
-
-        Delete(SwigType_pop_function(decl)); /* remove the old parameter list from decl */
-        SwigType_add_function(decl,newparms);
-        if (constqualifier)
-          SwigType_add_qualifier(decl,"const");
-
-        Setattr(new_function,"name", Getattr(function,"name"));
-        Setattr(new_function,"code", ccode);
-        Setattr(new_function,"decl", decl);
-        Setattr(new_function,"parms", newparms);
-        Setattr(new_function,"storage", cstorage);
-        Setattr(new_function,"value", cvalue);
-        Setattr(new_function,"type", ctype);
-        Setattr(new_function,"throw", cthrow);
-
-	Delete(ccode);
-	Delete(cstorage);
-	Delete(cvalue);
-	Delete(ctype);
-	Delete(cthrow);
-	Delete(decl);
-
-        {
-          Node *throws = Getattr(function,"throws");
-	  ParmList *pl = CopyParmList(throws);
-          if (throws) Setattr(new_function,"throws",pl);
-	  Delete(pl);
-        }
-
-        /* copy specific attributes for global (or in a namespace) template functions - these are not templated class methods */
-        if (strcmp(cntype,"template") == 0) {
-          Node *templatetype = Getattr(function,"templatetype");
-          Node *symtypename = Getattr(function,"sym:typename");
-          Parm *templateparms = Getattr(function,"templateparms");
-          if (templatetype) {
-	    Node *tmp = Copy(templatetype);
-	    Setattr(new_function,"templatetype",tmp);
-	    Delete(tmp);
-	  }
-          if (symtypename) {
-	    Node *tmp = Copy(symtypename);
-	    Setattr(new_function,"sym:typename",tmp);
-	    Delete(tmp);
-	  }
-          if (templateparms) {
-	    Parm *tmp = CopyParmList(templateparms);
-	    Setattr(new_function,"templateparms",tmp);
-	    Delete(tmp);
-	  }
-        } else if (strcmp(cntype,"constructor") == 0) {
-          /* only copied for constructors as this is not a user defined feature - it is hard coded in the parser */
-          if (GetFlag(function,"feature:new")) SetFlag(new_function,"feature:new");
-        }
-
-        add_symbols(new_function);
-        /* mark added functions as ones with overloaded parameters and point to the parsed method */
-        Setattr(new_function,"defaultargs", n);
-
-        /* Point to the new function, extending the linked list */
-        set_nextSibling(function, new_function);
-	Delete(new_function);
-        function = new_function;
-	
-	Delete(ntype);
-      }
-    } else {
-      function = 0;
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * mark_nodes_as_extend()
- *
- * Used by the %extend to mark subtypes with "feature:extend".
- * template instances declared within %extend are skipped
- * ----------------------------------------------------------------------------- */
-
-static void mark_nodes_as_extend(Node *n) {
-  for (; n; n = nextSibling(n)) {
-    if (Getattr(n, "template") && Strcmp(nodeType(n), "class") == 0)
-      continue;
-    /* Fix me: extend is not a feature. Replace with isextendmember? */
-    Setattr(n, "feature:extend", "1");
-    mark_nodes_as_extend(firstChild(n));
-  }
-}
-
-%}
-
-%union {
-  const char  *id;
-  List  *bases;
-  struct Define {
-    String *val;
-    String *rawval;
-    int     type;
-    String *qualifier;
-    String *bitfield;
-    Parm   *throws;
-    String *throwf;
-    String *nexcept;
-  } dtype;
-  struct {
-    const char *type;
-    String *filename;
-    int   line;
-  } loc;
-  struct {
-    char      *id;
-    SwigType  *type;
-    String    *defarg;
-    ParmList  *parms;
-    short      have_parms;
-    ParmList  *throws;
-    String    *throwf;
-    String    *nexcept;
-  } decl;
-  Parm         *tparms;
-  struct {
-    String     *method;
-    Hash       *kwargs;
-  } tmap;
-  struct {
-    String     *type;
-    String     *us;
-  } ptype;
-  SwigType     *type;
-  String       *str;
-  Parm         *p;
-  ParmList     *pl;
-  int           intvalue;
-  Node         *node;
-};
-
-%token <id> ID
-%token <str> HBLOCK
-%token <id> POUND 
-%token <id> STRING WSTRING
-%token <loc> INCLUDE IMPORT INSERT
-%token <str> CHARCONST WCHARCONST
-%token <dtype> NUM_INT NUM_FLOAT NUM_UNSIGNED NUM_LONG NUM_ULONG NUM_LONGLONG NUM_ULONGLONG NUM_BOOL
-%token <intvalue> TYPEDEF
-%token <type> TYPE_INT TYPE_UNSIGNED TYPE_SHORT TYPE_LONG TYPE_FLOAT TYPE_DOUBLE TYPE_CHAR TYPE_WCHAR TYPE_VOID TYPE_SIGNED TYPE_BOOL TYPE_COMPLEX TYPE_TYPEDEF TYPE_RAW TYPE_NON_ISO_INT8 TYPE_NON_ISO_INT16 TYPE_NON_ISO_INT32 TYPE_NON_ISO_INT64
-%token LPAREN RPAREN COMMA SEMI EXTERN INIT LBRACE RBRACE PERIOD
-%token CONST_QUAL VOLATILE REGISTER STRUCT UNION EQUAL SIZEOF MODULE LBRACKET RBRACKET
-%token BEGINFILE ENDOFFILE
-%token ILLEGAL CONSTANT
-%token NAME RENAME NAMEWARN EXTEND PRAGMA FEATURE VARARGS
-%token ENUM
-%token CLASS TYPENAME PRIVATE PUBLIC PROTECTED COLON STATIC VIRTUAL FRIEND THROW CATCH EXPLICIT
-%token STATIC_ASSERT CONSTEXPR THREAD_LOCAL DECLTYPE AUTO NOEXCEPT /* C++11 keywords */
-%token OVERRIDE FINAL /* C++11 identifiers with special meaning */
-%token USING
-%token <node> NAMESPACE
-%token NATIVE INLINE
-%token TYPEMAP EXCEPT ECHO APPLY CLEAR SWIGTEMPLATE FRAGMENT
-%token WARN 
-%token LESSTHAN GREATERTHAN DELETE_KW DEFAULT
-%token LESSTHANOREQUALTO GREATERTHANOREQUALTO EQUALTO NOTEQUALTO
-%token ARROW
-%token QUESTIONMARK
-%token TYPES PARMS
-%token NONID DSTAR DCNOT
-%token <intvalue> TEMPLATE
-%token <str> OPERATOR
-%token <str> CONVERSIONOPERATOR
-%token PARSETYPE PARSEPARM PARSEPARMS
-
-%left  CAST
-%left  QUESTIONMARK
-%left  LOR
-%left  LAND
-%left  OR
-%left  XOR
-%left  AND
-%left  EQUALTO NOTEQUALTO
-%left  GREATERTHAN LESSTHAN GREATERTHANOREQUALTO LESSTHANOREQUALTO
-%left  LSHIFT RSHIFT
-%left  PLUS MINUS
-%left  STAR SLASH MODULO
-%left  UMINUS NOT LNOT
-%left  DCOLON
-
-%type <node>     program interface declaration swig_directive ;
-
-/* SWIG directives */
-%type <node>     extend_directive apply_directive clear_directive constant_directive ;
-%type <node>     echo_directive except_directive fragment_directive include_directive inline_directive ;
-%type <node>     insert_directive module_directive name_directive native_directive ;
-%type <node>     pragma_directive rename_directive feature_directive varargs_directive typemap_directive ;
-%type <node>     types_directive template_directive warn_directive ;
-
-/* C declarations */
-%type <node>     c_declaration c_decl c_decl_tail c_enum_key c_enum_inherit c_enum_decl c_enum_forward_decl c_constructor_decl;
-%type <node>     enumlist edecl;
-
-/* C++ declarations */
-%type <node>     cpp_declaration cpp_class_decl cpp_forward_class_decl cpp_template_decl cpp_alternate_rettype;
-%type <node>     cpp_members cpp_member;
-%type <node>     cpp_constructor_decl cpp_destructor_decl cpp_protection_decl cpp_conversion_operator cpp_static_assert;
-%type <node>     cpp_swig_directive cpp_temp_possible cpp_opt_declarators ;
-%type <node>     cpp_using_decl cpp_namespace_decl cpp_catch_decl cpp_lambda_decl;
-%type <node>     kwargs options;
-
-/* Misc */
-%type <id>       identifier;
-%type <dtype>    initializer cpp_const exception_specification;
-%type <id>       storage_class extern_string;
-%type <pl>       parms  ptail rawparms varargs_parms ;
-%type <pl>       templateparameters templateparameterstail;
-%type <p>        parm valparm rawvalparms valparms valptail ;
-%type <p>        typemap_parm tm_list tm_tail ;
-%type <p>        templateparameter ;
-%type <id>       templcpptype cpptype classkey classkeyopt access_specifier;
-%type <node>     base_specifier;
-%type <str>      ellipsis variadic;
-%type <type>     type rawtype type_right anon_bitfield_type decltype ;
-%type <bases>    base_list inherit raw_inherit;
-%type <dtype>    definetype def_args etype default_delete deleted_definition explicit_default;
-%type <dtype>    expr exprnum exprcompound valexpr;
-%type <id>       ename ;
-%type <id>       less_valparms_greater;
-%type <str>      type_qualifier ;
-%type <id>       type_qualifier_raw;
-%type <id>       idstring idstringopt;
-%type <id>       pragma_lang;
-%type <str>      pragma_arg;
-%type <loc>      includetype;
-%type <type>     pointer primitive_type;
-%type <decl>     declarator direct_declarator notso_direct_declarator parameter_declarator plain_declarator;
-%type <decl>     abstract_declarator direct_abstract_declarator ctor_end;
-%type <tmap>     typemap_type;
-%type <str>      idcolon idcolontail idcolonnt idcolontailnt idtemplate idtemplatetemplate stringbrace stringbracesemi;
-%type <str>      string stringnum wstring;
-%type <tparms>   template_parms;
-%type <dtype>    cpp_end cpp_vend;
-%type <intvalue> rename_namewarn;
-%type <ptype>    type_specifier primitive_type_list ;
-%type <node>     fname stringtype;
-%type <node>     featattr;
-%type <node>     lambda_introducer lambda_body;
-%type <pl>       lambda_tail;
-%type <node>     optional_constant_directive;
-%type <str>      virt_specifier_seq;
-
-%%
-
-/* ======================================================================
- *                          High-level Interface file
- *
- * An interface is just a sequence of declarations which may be SWIG directives
- * or normal C declarations.
- * ====================================================================== */
-
-program        :  interface {
-                   if (!classes) classes = NewHash();
-		   Setattr($1,"classes",classes); 
-		   Setattr($1,"name",ModuleName);
-		   
-		   if ((!module_node) && ModuleName) {
-		     module_node = new_node("module");
-		     Setattr(module_node,"name",ModuleName);
-		   }
-		   Setattr($1,"module",module_node);
-	           top = $1;
-               }
-               | PARSETYPE parm SEMI {
-                 top = Copy(Getattr($2,"type"));
-		 Delete($2);
-               }
-               | PARSETYPE error {
-                 top = 0;
-               }
-               | PARSEPARM parm SEMI {
-                 top = $2;
-               }
-               | PARSEPARM error {
-                 top = 0;
-               }
-               | PARSEPARMS LPAREN parms RPAREN SEMI {
-                 top = $3;
-               }
-               | PARSEPARMS error SEMI {
-                 top = 0;
-               }
-               ;
-
-interface      : interface declaration {  
-                   /* add declaration to end of linked list (the declaration isn't always a single declaration, sometimes it is a linked list itself) */
-                   appendChild($1,$2);
-                   $$ = $1;
-               }
-               | empty {
-                   $$ = new_node("top");
-               }
-               ;
-
-declaration    : swig_directive { $$ = $1; }
-               | c_declaration { $$ = $1; } 
-               | cpp_declaration { $$ = $1; }
-               | SEMI { $$ = 0; }
-               | error {
-                  $$ = 0;
-		  if (cparse_unknown_directive) {
-		      Swig_error(cparse_file, cparse_line, "Unknown directive '%s'.\n", cparse_unknown_directive);
-		  } else {
-		      Swig_error(cparse_file, cparse_line, "Syntax error in input(1).\n");
-		  }
-		  exit(1);
-               }
-/* Out of class constructor/destructor declarations */
-               | c_constructor_decl { 
-                  if ($$) {
-   		      add_symbols($$);
-                  }
-                  $$ = $1; 
-	       }              
-
-/* Out of class conversion operator.  For example:
-     inline A::operator char *() const { ... }.
-
-   This is nearly impossible to parse normally.  We just let the
-   first part generate a syntax error and then resynchronize on the
-   CONVERSIONOPERATOR token---discarding the rest of the definition. Ugh.
-
- */
-
-               | error CONVERSIONOPERATOR {
-                  $$ = 0;
-                  skip_decl();
-               }
-               ;
-
-/* ======================================================================
- *                           SWIG DIRECTIVES 
- * ====================================================================== */
-  
-swig_directive : extend_directive { $$ = $1; }
-               | apply_directive { $$ = $1; }
- 	       | clear_directive { $$ = $1; }
-               | constant_directive { $$ = $1; }
-               | echo_directive { $$ = $1; }
-               | except_directive { $$ = $1; }
-               | fragment_directive { $$ = $1; }
-               | include_directive { $$ = $1; }
-               | inline_directive { $$ = $1; }
-               | insert_directive { $$ = $1; }
-               | module_directive { $$ = $1; }
-               | name_directive { $$ = $1; }
-               | native_directive { $$ = $1; }
-               | pragma_directive { $$ = $1; }
-               | rename_directive { $$ = $1; }
-               | feature_directive { $$ = $1; }
-               | varargs_directive { $$ = $1; }
-               | typemap_directive { $$ = $1; }
-               | types_directive  { $$ = $1; }
-               | template_directive { $$ = $1; }
-               | warn_directive { $$ = $1; }
-               ;
-
-/* ------------------------------------------------------------
-   %extend classname { ... } 
-   ------------------------------------------------------------ */
-
-extend_directive : EXTEND options classkeyopt idcolon LBRACE {
-               Node *cls;
-	       String *clsname;
-	       extendmode = 1;
-	       cplus_mode = CPLUS_PUBLIC;
-	       if (!classes) classes = NewHash();
-	       if (!classes_typedefs) classes_typedefs = NewHash();
-	       clsname = make_class_name($4);
-	       cls = Getattr(classes,clsname);
-	       if (!cls) {
-	         cls = Getattr(classes_typedefs, clsname);
-		 if (!cls) {
-		   /* No previous definition. Create a new scope */
-		   Node *am = Getattr(Swig_extend_hash(),clsname);
-		   if (!am) {
-		     Swig_symbol_newscope();
-		     Swig_symbol_setscopename($4);
-		     prev_symtab = 0;
-		   } else {
-		     prev_symtab = Swig_symbol_setscope(Getattr(am,"symtab"));
-		   }
-		   current_class = 0;
-		 } else {
-		   /* Previous typedef class definition.  Use its symbol table.
-		      Deprecated, just the real name should be used. 
-		      Note that %extend before the class typedef never worked, only %extend after the class typdef. */
-		   prev_symtab = Swig_symbol_setscope(Getattr(cls, "symtab"));
-		   current_class = cls;
-		   SWIG_WARN_NODE_BEGIN(cls);
-		   Swig_warning(WARN_PARSE_EXTEND_NAME, cparse_file, cparse_line, "Deprecated %%extend name used - the %s name '%s' should be used instead of the typedef name '%s'.\n", Getattr(cls, "kind"), SwigType_namestr(Getattr(cls, "name")), $4);
-		   SWIG_WARN_NODE_END(cls);
-		 }
-	       } else {
-		 /* Previous class definition.  Use its symbol table */
-		 prev_symtab = Swig_symbol_setscope(Getattr(cls,"symtab"));
-		 current_class = cls;
-	       }
-	       Classprefix = NewString($4);
-	       Namespaceprefix= Swig_symbol_qualifiedscopename(0);
-	       Delete(clsname);
-	     } cpp_members RBRACE {
-               String *clsname;
-	       extendmode = 0;
-               $$ = new_node("extend");
-	       Setattr($$,"symtab",Swig_symbol_popscope());
-	       if (prev_symtab) {
-		 Swig_symbol_setscope(prev_symtab);
-	       }
-	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-               clsname = make_class_name($4);
-	       Setattr($$,"name",clsname);
-
-	       mark_nodes_as_extend($7);
-	       if (current_class) {
-		 /* We add the extension to the previously defined class */
-		 appendChild($$, $7);
-		 appendChild(current_class,$$);
-	       } else {
-		 /* We store the extensions in the extensions hash */
-		 Node *am = Getattr(Swig_extend_hash(),clsname);
-		 if (am) {
-		   /* Append the members to the previous extend methods */
-		   appendChild(am, $7);
-		 } else {
-		   appendChild($$, $7);
-		   Setattr(Swig_extend_hash(),clsname,$$);
-		 }
-	       }
-	       current_class = 0;
-	       Delete(Classprefix);
-	       Delete(clsname);
-	       Classprefix = 0;
-	       prev_symtab = 0;
-	       $$ = 0;
-
-	     }
-             ;
-
-/* ------------------------------------------------------------
-   %apply
-   ------------------------------------------------------------ */
-
-apply_directive : APPLY typemap_parm LBRACE tm_list RBRACE {
-                    $$ = new_node("apply");
-                    Setattr($$,"pattern",Getattr($2,"pattern"));
-		    appendChild($$,$4);
-               };
-
-/* ------------------------------------------------------------
-   %clear
-   ------------------------------------------------------------ */
-
-clear_directive : CLEAR tm_list SEMI {
-		 $$ = new_node("clear");
-		 appendChild($$,$2);
-               }
-               ;
-
-/* ------------------------------------------------------------
-   %constant name = value;
-   %constant type name = value;
-   ------------------------------------------------------------ */
-
-constant_directive :  CONSTANT identifier EQUAL definetype SEMI {
-		   if (($4.type != T_ERROR) && ($4.type != T_SYMBOL)) {
-		     SwigType *type = NewSwigType($4.type);
-		     $$ = new_node("constant");
-		     Setattr($$,"name",$2);
-		     Setattr($$,"type",type);
-		     Setattr($$,"value",$4.val);
-		     if ($4.rawval) Setattr($$,"rawval", $4.rawval);
-		     Setattr($$,"storage","%constant");
-		     SetFlag($$,"feature:immutable");
-		     add_symbols($$);
-		     Delete(type);
-		   } else {
-		     if ($4.type == T_ERROR) {
-		       Swig_warning(WARN_PARSE_UNSUPPORTED_VALUE,cparse_file,cparse_line,"Unsupported constant value (ignored)\n");
-		     }
-		     $$ = 0;
-		   }
-
-	       }
-
-               | CONSTANT type declarator def_args SEMI {
-		 if (($4.type != T_ERROR) && ($4.type != T_SYMBOL)) {
-		   SwigType_push($2,$3.type);
-		   /* Sneaky callback function trick */
-		   if (SwigType_isfunction($2)) {
-		     SwigType_add_pointer($2);
-		   }
-		   $$ = new_node("constant");
-		   Setattr($$,"name",$3.id);
-		   Setattr($$,"type",$2);
-		   Setattr($$,"value",$4.val);
-		   if ($4.rawval) Setattr($$,"rawval", $4.rawval);
-		   Setattr($$,"storage","%constant");
-		   SetFlag($$,"feature:immutable");
-		   add_symbols($$);
-		 } else {
-		     if ($4.type == T_ERROR) {
-		       Swig_warning(WARN_PARSE_UNSUPPORTED_VALUE,cparse_file,cparse_line,"Unsupported constant value\n");
-		     }
-		   $$ = 0;
-		 }
-               }
-               | CONSTANT error SEMI {
-		 Swig_warning(WARN_PARSE_BAD_VALUE,cparse_file,cparse_line,"Bad constant value (ignored).\n");
-		 $$ = 0;
-	       }
-               ;
-
-/* ------------------------------------------------------------
-   %echo "text"
-   %echo %{ ... %}
-   ------------------------------------------------------------ */
-
-echo_directive : ECHO HBLOCK {
-		 char temp[64];
-		 Replace($2,"$file",cparse_file, DOH_REPLACE_ANY);
-		 sprintf(temp,"%d", cparse_line);
-		 Replace($2,"$line",temp,DOH_REPLACE_ANY);
-		 Printf(stderr,"%s\n", $2);
-		 Delete($2);
-                 $$ = 0;
-	       }
-               | ECHO string {
-		 char temp[64];
-		 String *s = $2;
-		 Replace(s,"$file",cparse_file, DOH_REPLACE_ANY);
-		 sprintf(temp,"%d", cparse_line);
-		 Replace(s,"$line",temp,DOH_REPLACE_ANY);
-		 Printf(stderr,"%s\n", s);
-		 Delete(s);
-                 $$ = 0;
-               }
-               ;
-
-/* ------------------------------------------------------------
-   %except(lang) { ... }
-   %except { ... }
-   %except(lang);   
-   %except;
-   ------------------------------------------------------------ */
-
-except_directive : EXCEPT LPAREN identifier RPAREN LBRACE {
-                    skip_balanced('{','}');
-		    $$ = 0;
-		    Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-	       }
-
-               | EXCEPT LBRACE {
-                    skip_balanced('{','}');
-		    $$ = 0;
-		    Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-               }
-
-               | EXCEPT LPAREN identifier RPAREN SEMI {
-		 $$ = 0;
-		 Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-               }
-
-               | EXCEPT SEMI {
-		 $$ = 0;
-		 Swig_warning(WARN_DEPRECATED_EXCEPT,cparse_file, cparse_line, "%%except is deprecated.  Use %%exception instead.\n");
-	       }
-               ;
-
-/* fragment keyword arguments */
-stringtype    : string LBRACE parm RBRACE {		 
-                 $$ = NewHash();
-                 Setattr($$,"value",$1);
-		 Setattr($$,"type",Getattr($3,"type"));
-               }
-               ;
-
-fname         : string {
-                 $$ = NewHash();
-                 Setattr($$,"value",$1);
-              }
-              | stringtype {
-                $$ = $1;
-              }
-              ;
-
-/* ------------------------------------------------------------
-   %fragment(name, section) %{ ... %}
-   %fragment("name" {type}, "section") %{ ... %}
-   %fragment("name", "section", fragment="fragment1", fragment="fragment2") %{ ... %}
-   Also as above but using { ... }
-   %fragment("name");
-   ------------------------------------------------------------ */
-
-fragment_directive: FRAGMENT LPAREN fname COMMA kwargs RPAREN HBLOCK {
-                   Hash *p = $5;
-		   $$ = new_node("fragment");
-		   Setattr($$,"value",Getattr($3,"value"));
-		   Setattr($$,"type",Getattr($3,"type"));
-		   Setattr($$,"section",Getattr(p,"name"));
-		   Setattr($$,"kwargs",nextSibling(p));
-		   Setattr($$,"code",$7);
-                 }
-                 | FRAGMENT LPAREN fname COMMA kwargs RPAREN LBRACE {
-		   Hash *p = $5;
-		   String *code;
-                   skip_balanced('{','}');
-		   $$ = new_node("fragment");
-		   Setattr($$,"value",Getattr($3,"value"));
-		   Setattr($$,"type",Getattr($3,"type"));
-		   Setattr($$,"section",Getattr(p,"name"));
-		   Setattr($$,"kwargs",nextSibling(p));
-		   Delitem(scanner_ccode,0);
-		   Delitem(scanner_ccode,DOH_END);
-		   code = Copy(scanner_ccode);
-		   Setattr($$,"code",code);
-		   Delete(code);
-                 }
-                 | FRAGMENT LPAREN fname RPAREN SEMI {
-		   $$ = new_node("fragment");
-		   Setattr($$,"value",Getattr($3,"value"));
-		   Setattr($$,"type",Getattr($3,"type"));
-		   Setattr($$,"emitonly","1");
-		 }
-                 ;
-
-/* ------------------------------------------------------------
-   %includefile(option1="xyz", ...) "filename" [ declarations ] 
-   %importfile(option1="xyz", ...) "filename" [ declarations ]
-   ------------------------------------------------------------ */
-
-include_directive: includetype options string BEGINFILE {
-                     $1.filename = Copy(cparse_file);
-		     $1.line = cparse_line;
-		     scanner_set_location($3,1);
-                     if ($2) { 
-		       String *maininput = Getattr($2, "maininput");
-		       if (maininput)
-		         scanner_set_main_input_file(NewString(maininput));
-		     }
-               } interface ENDOFFILE {
-                     String *mname = 0;
-                     $$ = $6;
-		     scanner_set_location($1.filename,$1.line+1);
-		     if (strcmp($1.type,"include") == 0) set_nodeType($$,"include");
-		     if (strcmp($1.type,"import") == 0) {
-		       mname = $2 ? Getattr($2,"module") : 0;
-		       set_nodeType($$,"import");
-		       if (import_mode) --import_mode;
-		     }
-		     
-		     Setattr($$,"name",$3);
-		     /* Search for the module (if any) */
-		     {
-			 Node *n = firstChild($$);
-			 while (n) {
-			     if (Strcmp(nodeType(n),"module") == 0) {
-			         if (mname) {
-				   Setattr(n,"name", mname);
-				   mname = 0;
-				 }
-				 Setattr($$,"module",Getattr(n,"name"));
-				 break;
-			     }
-			     n = nextSibling(n);
-			 }
-			 if (mname) {
-			   /* There is no module node in the import
-			      node, ie, you imported a .h file
-			      directly.  We are forced then to create
-			      a new import node with a module node.
-			   */			      
-			   Node *nint = new_node("import");
-			   Node *mnode = new_node("module");
-			   Setattr(mnode,"name", mname);
-                           Setattr(mnode,"options",$2);
-			   appendChild(nint,mnode);
-			   Delete(mnode);
-			   appendChild(nint,firstChild($$));
-			   $$ = nint;
-			   Setattr($$,"module",mname);
-			 }
-		     }
-		     Setattr($$,"options",$2);
-               }
-               ;
-
-includetype    : INCLUDE { $$.type = "include"; }
-               | IMPORT  { $$.type = "import"; ++import_mode;}
-               ;
-
-/* ------------------------------------------------------------
-   %inline %{ ... %}
-   ------------------------------------------------------------ */
-
-inline_directive : INLINE HBLOCK {
-                 String *cpps;
-		 if (Namespaceprefix) {
-		   Swig_error(cparse_file, cparse_start_line, "%%inline directive inside a namespace is disallowed.\n");
-		   $$ = 0;
-		 } else {
-		   $$ = new_node("insert");
-		   Setattr($$,"code",$2);
-		   /* Need to run through the preprocessor */
-		   Seek($2,0,SEEK_SET);
-		   Setline($2,cparse_start_line);
-		   Setfile($2,cparse_file);
-		   cpps = Preprocessor_parse($2);
-		   start_inline(Char(cpps), cparse_start_line);
-		   Delete($2);
-		   Delete(cpps);
-		 }
-		 
-	       }
-               | INLINE LBRACE {
-                 String *cpps;
-		 int start_line = cparse_line;
-		 skip_balanced('{','}');
-		 if (Namespaceprefix) {
-		   Swig_error(cparse_file, cparse_start_line, "%%inline directive inside a namespace is disallowed.\n");
-		   
-		   $$ = 0;
-		 } else {
-		   String *code;
-                   $$ = new_node("insert");
-		   Delitem(scanner_ccode,0);
-		   Delitem(scanner_ccode,DOH_END);
-		   code = Copy(scanner_ccode);
-		   Setattr($$,"code", code);
-		   Delete(code);		   
-		   cpps=Copy(scanner_ccode);
-		   start_inline(Char(cpps), start_line);
-		   Delete(cpps);
-		 }
-               }
-                ;
-
-/* ------------------------------------------------------------
-   %{ ... %}
-   %insert(section) "filename"
-   %insert("section") "filename"
-   %insert(section) %{ ... %}
-   %insert("section") %{ ... %}
-   ------------------------------------------------------------ */
-
-insert_directive : HBLOCK {
-                 $$ = new_node("insert");
-		 Setattr($$,"code",$1);
-	       }
-               | INSERT LPAREN idstring RPAREN string {
-		 String *code = NewStringEmpty();
-		 $$ = new_node("insert");
-		 Setattr($$,"section",$3);
-		 Setattr($$,"code",code);
-		 if (Swig_insert_file($5,code) < 0) {
-		   Swig_error(cparse_file, cparse_line, "Couldn't find '%s'.\n", $5);
-		   $$ = 0;
-		 } 
-               }
-               | INSERT LPAREN idstring RPAREN HBLOCK {
-		 $$ = new_node("insert");
-		 Setattr($$,"section",$3);
-		 Setattr($$,"code",$5);
-               }
-               | INSERT LPAREN idstring RPAREN LBRACE {
-		 String *code;
-                 skip_balanced('{','}');
-		 $$ = new_node("insert");
-		 Setattr($$,"section",$3);
-		 Delitem(scanner_ccode,0);
-		 Delitem(scanner_ccode,DOH_END);
-		 code = Copy(scanner_ccode);
-		 Setattr($$,"code", code);
-		 Delete(code);
-	       }
-               ;
-      
-/* ------------------------------------------------------------
-    %module modname
-    %module "modname"
-   ------------------------------------------------------------ */
-
-module_directive: MODULE options idstring {
-                 $$ = new_node("module");
-		 if ($2) {
-		   Setattr($$,"options",$2);
-		   if (Getattr($2,"directors")) {
-		     Wrapper_director_mode_set(1);
-		     if (!cparse_cplusplus) {
-		       Swig_error(cparse_file, cparse_line, "Directors are not supported for C code and require the -c++ option\n");
-		     }
-		   } 
-		   if (Getattr($2,"dirprot")) {
-		     Wrapper_director_protected_mode_set(1);
-		   } 
-		   if (Getattr($2,"allprotected")) {
-		     Wrapper_all_protected_mode_set(1);
-		   } 
-		   if (Getattr($2,"templatereduce")) {
-		     template_reduce = 1;
-		   }
-		   if (Getattr($2,"notemplatereduce")) {
-		     template_reduce = 0;
-		   }
-		 }
-		 if (!ModuleName) ModuleName = NewString($3);
-		 if (!import_mode) {
-		   /* first module included, we apply global
-		      ModuleName, which can be modify by -module */
-		   String *mname = Copy(ModuleName);
-		   Setattr($$,"name",mname);
-		   Delete(mname);
-		 } else { 
-		   /* import mode, we just pass the idstring */
-		   Setattr($$,"name",$3);   
-		 }		 
-		 if (!module_node) module_node = $$;
-	       }
-               ;
-
-/* ------------------------------------------------------------
-   %name(newname)    declaration
-   %name("newname")  declaration
-   ------------------------------------------------------------ */
-
-name_directive : NAME LPAREN idstring RPAREN {
-                 Swig_warning(WARN_DEPRECATED_NAME,cparse_file,cparse_line, "%%name is deprecated.  Use %%rename instead.\n");
-		 Delete(yyrename);
-                 yyrename = NewString($3);
-		 $$ = 0;
-               }
-               | NAME LPAREN RPAREN {
-		 Swig_warning(WARN_DEPRECATED_NAME,cparse_file,cparse_line, "%%name is deprecated.  Use %%rename instead.\n");
-		 $$ = 0;
-		 Swig_error(cparse_file,cparse_line,"Missing argument to %%name directive.\n");
-	       }
-               ;
-
-
-/* ------------------------------------------------------------
-   %native(scriptname) name;
-   %native(scriptname) type name (parms);
-   ------------------------------------------------------------ */
-
-native_directive : NATIVE LPAREN identifier RPAREN storage_class identifier SEMI {
-                 $$ = new_node("native");
-		 Setattr($$,"name",$3);
-		 Setattr($$,"wrap:name",$6);
-	         add_symbols($$);
-	       }
-               | NATIVE LPAREN identifier RPAREN storage_class type declarator SEMI {
-		 if (!SwigType_isfunction($7.type)) {
-		   Swig_error(cparse_file,cparse_line,"%%native declaration '%s' is not a function.\n", $7.id);
-		   $$ = 0;
-		 } else {
-		     Delete(SwigType_pop_function($7.type));
-		     /* Need check for function here */
-		     SwigType_push($6,$7.type);
-		     $$ = new_node("native");
-	             Setattr($$,"name",$3);
-		     Setattr($$,"wrap:name",$7.id);
-		     Setattr($$,"type",$6);
-		     Setattr($$,"parms",$7.parms);
-		     Setattr($$,"decl",$7.type);
-		 }
-	         add_symbols($$);
-	       }
-               ;
-
-/* ------------------------------------------------------------
-   %pragma(lang) name=value
-   %pragma(lang) name
-   %pragma name = value
-   %pragma name
-   ------------------------------------------------------------ */
-
-pragma_directive : PRAGMA pragma_lang identifier EQUAL pragma_arg {
-                 $$ = new_node("pragma");
-		 Setattr($$,"lang",$2);
-		 Setattr($$,"name",$3);
-		 Setattr($$,"value",$5);
-	       }
-              | PRAGMA pragma_lang identifier {
-		$$ = new_node("pragma");
-		Setattr($$,"lang",$2);
-		Setattr($$,"name",$3);
-	      }
-              ;
-
-pragma_arg    : string { $$ = $1; }
-              | HBLOCK { $$ = $1; }
-              ;
-
-pragma_lang   : LPAREN identifier RPAREN { $$ = $2; }
-              | empty { $$ = (char *) "swig"; }
-              ;
-
-/* ------------------------------------------------------------
-   %rename(newname) identifier;
-   ------------------------------------------------------------ */
-
-rename_directive : rename_namewarn declarator idstring SEMI {
-                SwigType *t = $2.type;
-		Hash *kws = NewHash();
-		String *fixname;
-		fixname = feature_identifier_fix($2.id);
-		Setattr(kws,"name",$3);
-		if (!Len(t)) t = 0;
-		/* Special declarator check */
-		if (t) {
-		  if (SwigType_isfunction(t)) {
-		    SwigType *decl = SwigType_pop_function(t);
-		    if (SwigType_ispointer(t)) {
-		      String *nname = NewStringf("*%s",fixname);
-		      if ($1) {
-			Swig_name_rename_add(Namespaceprefix, nname,decl,kws,$2.parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,nname,decl,kws);
-		      }
-		      Delete(nname);
-		    } else {
-		      if ($1) {
-			Swig_name_rename_add(Namespaceprefix,(fixname),decl,kws,$2.parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,(fixname),decl,kws);
-		      }
-		    }
-		    Delete(decl);
-		  } else if (SwigType_ispointer(t)) {
-		    String *nname = NewStringf("*%s",fixname);
-		    if ($1) {
-		      Swig_name_rename_add(Namespaceprefix,(nname),0,kws,$2.parms);
-		    } else {
-		      Swig_name_namewarn_add(Namespaceprefix,(nname),0,kws);
-		    }
-		    Delete(nname);
-		  }
-		} else {
-		  if ($1) {
-		    Swig_name_rename_add(Namespaceprefix,(fixname),0,kws,$2.parms);
-		  } else {
-		    Swig_name_namewarn_add(Namespaceprefix,(fixname),0,kws);
-		  }
-		}
-                $$ = 0;
-		scanner_clear_rename();
-              }
-              | rename_namewarn LPAREN kwargs RPAREN declarator cpp_const SEMI {
-		String *fixname;
-		Hash *kws = $3;
-		SwigType *t = $5.type;
-		fixname = feature_identifier_fix($5.id);
-		if (!Len(t)) t = 0;
-		/* Special declarator check */
-		if (t) {
-		  if ($6.qualifier) SwigType_push(t,$6.qualifier);
-		  if (SwigType_isfunction(t)) {
-		    SwigType *decl = SwigType_pop_function(t);
-		    if (SwigType_ispointer(t)) {
-		      String *nname = NewStringf("*%s",fixname);
-		      if ($1) {
-			Swig_name_rename_add(Namespaceprefix, nname,decl,kws,$5.parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,nname,decl,kws);
-		      }
-		      Delete(nname);
-		    } else {
-		      if ($1) {
-			Swig_name_rename_add(Namespaceprefix,(fixname),decl,kws,$5.parms);
-		      } else {
-			Swig_name_namewarn_add(Namespaceprefix,(fixname),decl,kws);
-		      }
-		    }
-		    Delete(decl);
-		  } else if (SwigType_ispointer(t)) {
-		    String *nname = NewStringf("*%s",fixname);
-		    if ($1) {
-		      Swig_name_rename_add(Namespaceprefix,(nname),0,kws,$5.parms);
-		    } else {
-		      Swig_name_namewarn_add(Namespaceprefix,(nname),0,kws);
-		    }
-		    Delete(nname);
-		  }
-		} else {
-		  if ($1) {
-		    Swig_name_rename_add(Namespaceprefix,(fixname),0,kws,$5.parms);
-		  } else {
-		    Swig_name_namewarn_add(Namespaceprefix,(fixname),0,kws);
-		  }
-		}
-                $$ = 0;
-		scanner_clear_rename();
-              }
-              | rename_namewarn LPAREN kwargs RPAREN string SEMI {
-		if ($1) {
-		  Swig_name_rename_add(Namespaceprefix,$5,0,$3,0);
-		} else {
-		  Swig_name_namewarn_add(Namespaceprefix,$5,0,$3);
-		}
-		$$ = 0;
-		scanner_clear_rename();
-              }
-              ;
-
-rename_namewarn : RENAME {
-		    $$ = 1;
-                } 
-                | NAMEWARN {
-                    $$ = 0;
-                };
-
-
-/* ------------------------------------------------------------
-   Feature targeting a symbol name (non-global feature):
-
-     %feature(featurename) name "val";
-     %feature(featurename, val) name;
-
-   where "val" could instead be the other bracket types, that is,
-   { val } or %{ val %} or indeed omitted whereupon it defaults to "1".
-   Or, the global feature which does not target a symbol name:
-
-     %feature(featurename) "val";
-     %feature(featurename, val);
-
-   An empty val (empty string) clears the feature.
-   Any number of feature attributes can optionally be added, for example
-   a non-global feature with 2 attributes:
-
-     %feature(featurename, attrib1="attribval1", attrib2="attribval2") name "val";
-     %feature(featurename, val, attrib1="attribval1", attrib2="attribval2") name;
-   ------------------------------------------------------------ */
-
-                  /* Non-global feature */
-feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbracesemi {
-                    String *val = $7 ? NewString($7) : NewString("1");
-                    new_feature($3, val, 0, $5.id, $5.type, $5.parms, $6.qualifier);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  | FEATURE LPAREN idstring COMMA stringnum RPAREN declarator cpp_const SEMI {
-                    String *val = Len($5) ? $5 : 0;
-                    new_feature($3, val, 0, $7.id, $7.type, $7.parms, $8.qualifier);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  | FEATURE LPAREN idstring featattr RPAREN declarator cpp_const stringbracesemi {
-                    String *val = $8 ? NewString($8) : NewString("1");
-                    new_feature($3, val, $4, $6.id, $6.type, $6.parms, $7.qualifier);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN declarator cpp_const SEMI {
-                    String *val = Len($5) ? $5 : 0;
-                    new_feature($3, val, $6, $8.id, $8.type, $8.parms, $9.qualifier);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-
-                  /* Global feature */
-                  | FEATURE LPAREN idstring RPAREN stringbracesemi {
-                    String *val = $5 ? NewString($5) : NewString("1");
-                    new_feature($3, val, 0, 0, 0, 0, 0);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  | FEATURE LPAREN idstring COMMA stringnum RPAREN SEMI {
-                    String *val = Len($5) ? $5 : 0;
-                    new_feature($3, val, 0, 0, 0, 0, 0);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  | FEATURE LPAREN idstring featattr RPAREN stringbracesemi {
-                    String *val = $6 ? NewString($6) : NewString("1");
-                    new_feature($3, val, $4, 0, 0, 0, 0);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN SEMI {
-                    String *val = Len($5) ? $5 : 0;
-                    new_feature($3, val, $6, 0, 0, 0, 0);
-                    $$ = 0;
-                    scanner_clear_rename();
-                  }
-                  ;
-
-stringbracesemi : stringbrace { $$ = $1; }
-                | SEMI { $$ = 0; }
-                | PARMS LPAREN parms RPAREN SEMI { $$ = $3; } 
-                ;
-
-featattr        : COMMA idstring EQUAL stringnum {
-		  $$ = NewHash();
-		  Setattr($$,"name",$2);
-		  Setattr($$,"value",$4);
-                }
-                | COMMA idstring EQUAL stringnum featattr {
-		  $$ = NewHash();
-		  Setattr($$,"name",$2);
-		  Setattr($$,"value",$4);
-                  set_nextSibling($$,$5);
-                }
-		;
-
-/* %varargs() directive. */
-
-varargs_directive : VARARGS LPAREN varargs_parms RPAREN declarator cpp_const SEMI {
-                 Parm *val;
-		 String *name;
-		 SwigType *t;
-		 if (Namespaceprefix) name = NewStringf("%s::%s", Namespaceprefix, $5.id);
-		 else name = NewString($5.id);
-		 val = $3;
-		 if ($5.parms) {
-		   Setmeta(val,"parms",$5.parms);
-		 }
-		 t = $5.type;
-		 if (!Len(t)) t = 0;
-		 if (t) {
-		   if ($6.qualifier) SwigType_push(t,$6.qualifier);
-		   if (SwigType_isfunction(t)) {
-		     SwigType *decl = SwigType_pop_function(t);
-		     if (SwigType_ispointer(t)) {
-		       String *nname = NewStringf("*%s",name);
-		       Swig_feature_set(Swig_cparse_features(), nname, decl, "feature:varargs", val, 0);
-		       Delete(nname);
-		     } else {
-		       Swig_feature_set(Swig_cparse_features(), name, decl, "feature:varargs", val, 0);
-		     }
-		     Delete(decl);
-		   } else if (SwigType_ispointer(t)) {
-		     String *nname = NewStringf("*%s",name);
-		     Swig_feature_set(Swig_cparse_features(),nname,0,"feature:varargs",val, 0);
-		     Delete(nname);
-		   }
-		 } else {
-		   Swig_feature_set(Swig_cparse_features(),name,0,"feature:varargs",val, 0);
-		 }
-		 Delete(name);
-		 $$ = 0;
-              };
-
-varargs_parms   : parms { $$ = $1; }
-                | NUM_INT COMMA parm { 
-		  int i;
-		  int n;
-		  Parm *p;
-		  n = atoi(Char($1.val));
-		  if (n <= 0) {
-		    Swig_error(cparse_file, cparse_line,"Argument count in %%varargs must be positive.\n");
-		    $$ = 0;
-		  } else {
-		    String *name = Getattr($3, "name");
-		    $$ = Copy($3);
-		    if (name)
-		      Setattr($$, "name", NewStringf("%s%d", name, n));
-		    for (i = 1; i < n; i++) {
-		      p = Copy($3);
-		      name = Getattr(p, "name");
-		      if (name)
-		        Setattr(p, "name", NewStringf("%s%d", name, n-i));
-		      set_nextSibling(p,$$);
-		      Delete($$);
-		      $$ = p;
-		    }
-		  }
-                }
-               ;
-
-
-/* ------------------------------------------------------------
-   %typemap(method) type { ... }
-   %typemap(method) type "..."
-   %typemap(method) type;    - typemap deletion
-   %typemap(method) type1,type2,... = type;    - typemap copy
-   %typemap type1,type2,... = type;            - typemap copy
-   ------------------------------------------------------------ */
-
-typemap_directive :  TYPEMAP LPAREN typemap_type RPAREN tm_list stringbrace {
-		   $$ = 0;
-		   if ($3.method) {
-		     String *code = 0;
-		     $$ = new_node("typemap");
-		     Setattr($$,"method",$3.method);
-		     if ($3.kwargs) {
-		       ParmList *kw = $3.kwargs;
-                       code = remove_block(kw, $6);
-		       Setattr($$,"kwargs", $3.kwargs);
-		     }
-		     code = code ? code : NewString($6);
-		     Setattr($$,"code", code);
-		     Delete(code);
-		     appendChild($$,$5);
-		   }
-	       }
-               | TYPEMAP LPAREN typemap_type RPAREN tm_list SEMI {
-		 $$ = 0;
-		 if ($3.method) {
-		   $$ = new_node("typemap");
-		   Setattr($$,"method",$3.method);
-		   appendChild($$,$5);
-		 }
-	       }
-               | TYPEMAP LPAREN typemap_type RPAREN tm_list EQUAL typemap_parm SEMI {
-		   $$ = 0;
-		   if ($3.method) {
-		     $$ = new_node("typemapcopy");
-		     Setattr($$,"method",$3.method);
-		     Setattr($$,"pattern", Getattr($7,"pattern"));
-		     appendChild($$,$5);
-		   }
-	       }
-               ;
-
-/* typemap method type (lang,method) or (method) */
-
-typemap_type   : kwargs {
-		 Hash *p;
-		 String *name;
-		 p = nextSibling($1);
-		 if (p && (!Getattr(p,"value"))) {
- 		   /* this is the deprecated two argument typemap form */
- 		   Swig_warning(WARN_DEPRECATED_TYPEMAP_LANG,cparse_file, cparse_line,
-				"Specifying the language name in %%typemap is deprecated - use #ifdef SWIG<LANG> instead.\n");
-		   /* two argument typemap form */
-		   name = Getattr($1,"name");
-		   if (!name || (Strcmp(name,typemap_lang))) {
-		     $$.method = 0;
-		     $$.kwargs = 0;
-		   } else {
-		     $$.method = Getattr(p,"name");
-		     $$.kwargs = nextSibling(p);
-		   }
-		 } else {
-		   /* one-argument typemap-form */
-		   $$.method = Getattr($1,"name");
-		   $$.kwargs = p;
-		 }
-                }
-               ;
-
-tm_list        : typemap_parm tm_tail {
-                 $$ = $1;
-		 set_nextSibling($$,$2);
-		}
-               ;
-
-tm_tail        : COMMA typemap_parm tm_tail {
-                 $$ = $2;
-		 set_nextSibling($$,$3);
-                }
-               | empty { $$ = 0;}
-               ;
-
-typemap_parm   : type plain_declarator {
-                  Parm *parm;
-		  SwigType_push($1,$2.type);
-		  $$ = new_node("typemapitem");
-		  parm = NewParmWithoutFileLineInfo($1,$2.id);
-		  Setattr($$,"pattern",parm);
-		  Setattr($$,"parms", $2.parms);
-		  Delete(parm);
-		  /*		  $$ = NewParmWithoutFileLineInfo($1,$2.id);
-				  Setattr($$,"parms",$2.parms); */
-                }
-               | LPAREN parms RPAREN {
-                  $$ = new_node("typemapitem");
-		  Setattr($$,"pattern",$2);
-		  /*		  Setattr($$,"multitype",$2); */
-               }
-               | LPAREN parms RPAREN LPAREN parms RPAREN {
-		 $$ = new_node("typemapitem");
-		 Setattr($$,"pattern", $2);
-		 /*                 Setattr($$,"multitype",$2); */
-		 Setattr($$,"parms",$5);
-               }
-               ;
-
-/* ------------------------------------------------------------
-   %types(parmlist); 
-   %types(parmlist) %{ ... %}
-   ------------------------------------------------------------ */
-
-types_directive : TYPES LPAREN parms RPAREN stringbracesemi {
-                   $$ = new_node("types");
-		   Setattr($$,"parms",$3);
-                   if ($5)
-		     Setattr($$,"convcode",NewString($5));
-               }
-               ;
-
-/* ------------------------------------------------------------
-   %template(name) tname<args>;
-   ------------------------------------------------------------ */
-
-template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN valparms GREATERTHAN SEMI {
-                  Parm *p, *tp;
-		  Node *n;
-		  Node *outer_class = currentOuterClass;
-		  Symtab *tscope = 0;
-		  int     specialized = 0;
-		  int     variadic = 0;
-
-		  $$ = 0;
-
-		  tscope = Swig_symbol_current();          /* Get the current scope */
-
-		  /* If the class name is qualified, we need to create or lookup namespace entries */
-		  if (!inclass) {
-		    $5 = resolve_create_node_scope($5);
-		  }
-		  if (nscope_inner && Strcmp(nodeType(nscope_inner), "class") == 0) {
-		    outer_class	= nscope_inner;
-		  }
-
-		  /*
-		    We use the new namespace entry 'nscope' only to
-		    emit the template node. The template parameters are
-		    resolved in the current 'tscope'.
-
-		    This is closer to the C++ (typedef) behavior.
-		  */
-		  n = Swig_cparse_template_locate($5,$7,tscope);
-
-		  /* Patch the argument types to respect namespaces */
-		  p = $7;
-		  while (p) {
-		    SwigType *value = Getattr(p,"value");
-		    if (!value) {
-		      SwigType *ty = Getattr(p,"type");
-		      if (ty) {
-			SwigType *rty = 0;
-			int reduce = template_reduce;
-			if (reduce || !SwigType_ispointer(ty)) {
-			  rty = Swig_symbol_typedef_reduce(ty,tscope);
-			  if (!reduce) reduce = SwigType_ispointer(rty);
-			}
-			ty = reduce ? Swig_symbol_type_qualify(rty,tscope) : Swig_symbol_type_qualify(ty,tscope);
-			Setattr(p,"type",ty);
-			Delete(ty);
-			Delete(rty);
-		      }
-		    } else {
-		      value = Swig_symbol_type_qualify(value,tscope);
-		      Setattr(p,"value",value);
-		      Delete(value);
-		    }
-
-		    p = nextSibling(p);
-		  }
-
-		  /* Look for the template */
-		  {
-                    Node *nn = n;
-                    Node *linklistend = 0;
-                    Node *linkliststart = 0;
-                    while (nn) {
-                      Node *templnode = 0;
-                      if (Strcmp(nodeType(nn),"template") == 0) {
-                        int nnisclass = (Strcmp(Getattr(nn,"templatetype"),"class") == 0); /* if not a templated class it is a templated function */
-                        Parm *tparms = Getattr(nn,"templateparms");
-                        if (!tparms) {
-                          specialized = 1;
-                        } else if (Getattr(tparms,"variadic") && strncmp(Char(Getattr(tparms,"variadic")), "1", 1)==0) {
-                          variadic = 1;
-                        }
-                        if (nnisclass && !variadic && !specialized && (ParmList_len($7) > ParmList_len(tparms))) {
-                          Swig_error(cparse_file, cparse_line, "Too many template parameters. Maximum of %d.\n", ParmList_len(tparms));
-                        } else if (nnisclass && !specialized && ((ParmList_len($7) < (ParmList_numrequired(tparms) - (variadic?1:0))))) { /* Variadic parameter is optional */
-                          Swig_error(cparse_file, cparse_line, "Not enough template parameters specified. %d required.\n", (ParmList_numrequired(tparms)-(variadic?1:0)) );
-                        } else if (!nnisclass && ((ParmList_len($7) != ParmList_len(tparms)))) {
-                          /* must be an overloaded templated method - ignore it as it is overloaded with a different number of template parameters */
-                          nn = Getattr(nn,"sym:nextSibling"); /* repeat for overloaded templated functions */
-                          continue;
-                        } else {
-			  String *tname = Copy($5);
-                          int def_supplied = 0;
-                          /* Expand the template */
-			  Node *templ = Swig_symbol_clookup($5,0);
-			  Parm *targs = templ ? Getattr(templ,"templateparms") : 0;
-
-                          ParmList *temparms;
-                          if (specialized) temparms = CopyParmList($7);
-                          else temparms = CopyParmList(tparms);
-
-                          /* Create typedef's and arguments */
-                          p = $7;
-                          tp = temparms;
-                          if (!p && ParmList_len(p) != ParmList_len(temparms)) {
-                            /* we have no template parameters supplied in %template for a template that has default args*/
-                            p = tp;
-                            def_supplied = 1;
-                          }
-
-                          while (p) {
-                            String *value = Getattr(p,"value");
-                            if (def_supplied) {
-                              Setattr(p,"default","1");
-                            }
-                            if (value) {
-                              Setattr(tp,"value",value);
-                            } else {
-                              SwigType *ty = Getattr(p,"type");
-                              if (ty) {
-                                Setattr(tp,"type",ty);
-                              }
-                              Delattr(tp,"value");
-                            }
-			    /* fix default arg values */
-			    if (targs) {
-			      Parm *pi = temparms;
-			      Parm *ti = targs;
-			      String *tv = Getattr(tp,"value");
-			      if (!tv) tv = Getattr(tp,"type");
-			      while(pi != tp && ti && pi) {
-				String *name = Getattr(ti,"name");
-				String *value = Getattr(pi,"value");
-				if (!value) value = Getattr(pi,"type");
-				Replaceid(tv, name, value);
-				pi = nextSibling(pi);
-				ti = nextSibling(ti);
-			      }
-			    }
-                            p = nextSibling(p);
-                            tp = nextSibling(tp);
-                            if (!p && tp) {
-                              p = tp;
-                              def_supplied = 1;
-                            } else if (p && !tp) { /* Variadic template - tp < p */
-			      SWIG_WARN_NODE_BEGIN(nn);
-                              Swig_warning(WARN_CPP11_VARIADIC_TEMPLATE,cparse_file, cparse_line,"Only the first variadic template argument is currently supported.\n");
-			      SWIG_WARN_NODE_END(nn);
-                              break;
-                            }
-                          }
-
-                          templnode = copy_node(nn);
-			  update_nested_classes(templnode); /* update classes nested within template */
-                          /* We need to set the node name based on name used to instantiate */
-                          Setattr(templnode,"name",tname);
-			  Delete(tname);
-                          if (!specialized) {
-                            Delattr(templnode,"sym:typename");
-                          } else {
-                            Setattr(templnode,"sym:typename","1");
-                          }
-			  /* for now, nested %template is allowed only in the same scope as the template declaration */
-                          if ($3 && !(nnisclass && ((outer_class && (outer_class != Getattr(nn, "nested:outer")))
-			    ||(extendmode && current_class && (current_class != Getattr(nn, "nested:outer")))))) {
-			    /*
-			       Comment this out for 1.3.28. We need to
-			       re-enable it later but first we need to
-			       move %ignore from using %rename to use
-			       %feature(ignore).
-
-			       String *symname = Swig_name_make(templnode,0,$3,0,0);
-			    */
-			    String *symname = NewString($3);
-                            Swig_cparse_template_expand(templnode,symname,temparms,tscope);
-                            Setattr(templnode,"sym:name",symname);
-                          } else {
-                            static int cnt = 0;
-                            String *nname = NewStringf("__dummy_%d__", cnt++);
-                            Swig_cparse_template_expand(templnode,nname,temparms,tscope);
-                            Setattr(templnode,"sym:name",nname);
-			    Delete(nname);
-                            Setattr(templnode,"feature:onlychildren", "typemap,typemapitem,typemapcopy,typedef,types,fragment");
-			    if ($3) {
-			      Swig_warning(WARN_PARSE_NESTED_TEMPLATE, cparse_file, cparse_line, "Named nested template instantiations not supported. Processing as if no name was given to %%template().\n");
-			    }
-                          }
-                          Delattr(templnode,"templatetype");
-                          Setattr(templnode,"template",nn);
-                          Setfile(templnode,cparse_file);
-                          Setline(templnode,cparse_line);
-                          Delete(temparms);
-			  if (outer_class && nnisclass) {
-			    SetFlag(templnode, "nested");
-			    Setattr(templnode, "nested:outer", outer_class);
-			  }
-                          add_symbols_copy(templnode);
-
-                          if (Strcmp(nodeType(templnode),"class") == 0) {
-
-                            /* Identify pure abstract methods */
-                            Setattr(templnode,"abstracts", pure_abstracts(firstChild(templnode)));
-
-                            /* Set up inheritance in symbol table */
-                            {
-                              Symtab  *csyms;
-                              List *baselist = Getattr(templnode,"baselist");
-                              csyms = Swig_symbol_current();
-                              Swig_symbol_setscope(Getattr(templnode,"symtab"));
-                              if (baselist) {
-                                List *bases = Swig_make_inherit_list(Getattr(templnode,"name"),baselist, Namespaceprefix);
-                                if (bases) {
-                                  Iterator s;
-                                  for (s = First(bases); s.item; s = Next(s)) {
-                                    Symtab *st = Getattr(s.item,"symtab");
-                                    if (st) {
-				      Setfile(st,Getfile(s.item));
-				      Setline(st,Getline(s.item));
-                                      Swig_symbol_inherit(st);
-                                    }
-                                  }
-				  Delete(bases);
-                                }
-                              }
-                              Swig_symbol_setscope(csyms);
-                            }
-
-                            /* Merge in %extend methods for this class.
-			       This only merges methods within %extend for a template specialized class such as
-			         template<typename T> class K {}; %extend K<int> { ... }
-			       The copy_node() call above has already added in the generic %extend methods such as
-			         template<typename T> class K {}; %extend K { ... } */
-
-			    /* !!! This may be broken.  We may have to add the
-			       %extend methods at the beginning of the class */
-                            {
-                              String *stmp = 0;
-                              String *clsname;
-                              Node *am;
-                              if (Namespaceprefix) {
-                                clsname = stmp = NewStringf("%s::%s", Namespaceprefix, Getattr(templnode,"name"));
-                              } else {
-                                clsname = Getattr(templnode,"name");
-                              }
-                              am = Getattr(Swig_extend_hash(),clsname);
-                              if (am) {
-                                Symtab *st = Swig_symbol_current();
-                                Swig_symbol_setscope(Getattr(templnode,"symtab"));
-                                /*			    Printf(stdout,"%s: %s %p %p\n", Getattr(templnode,"name"), clsname, Swig_symbol_current(), Getattr(templnode,"symtab")); */
-                                Swig_extend_merge(templnode,am);
-                                Swig_symbol_setscope(st);
-				Swig_extend_append_previous(templnode,am);
-                                Delattr(Swig_extend_hash(),clsname);
-                              }
-			      if (stmp) Delete(stmp);
-                            }
-
-                            /* Add to classes hash */
-			    if (!classes)
-			      classes = NewHash();
-
-			    if (Namespaceprefix) {
-			      String *temp = NewStringf("%s::%s", Namespaceprefix, Getattr(templnode,"name"));
-			      Setattr(classes,temp,templnode);
-			      Delete(temp);
-			    } else {
-			      String *qs = Swig_symbol_qualifiedscopename(templnode);
-			      Setattr(classes, qs,templnode);
-			      Delete(qs);
-			    }
-                          }
-                        }
-
-                        /* all the overloaded templated functions are added into a linked list */
-                        if (!linkliststart)
-                          linkliststart = templnode;
-                        if (nscope_inner) {
-                          /* non-global namespace */
-                          if (templnode) {
-                            appendChild(nscope_inner,templnode);
-			    Delete(templnode);
-                            if (nscope) $$ = nscope;
-                          }
-                        } else {
-                          /* global namespace */
-                          if (!linklistend) {
-                            $$ = templnode;
-                          } else {
-                            set_nextSibling(linklistend,templnode);
-			    Delete(templnode);
-                          }
-                          linklistend = templnode;
-                        }
-                      }
-                      nn = Getattr(nn,"sym:nextSibling"); /* repeat for overloaded templated functions. If a templated class there will never be a sibling. */
-                    }
-                    update_defaultargs(linkliststart);
-		  }
-	          Swig_symbol_setscope(tscope);
-		  Delete(Namespaceprefix);
-		  Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-                }
-               ;
-
-/* ------------------------------------------------------------
-   %warn "text"
-   %warn(no)
-   ------------------------------------------------------------ */
-
-warn_directive : WARN string {
-		  Swig_warning(0,cparse_file, cparse_line,"%s\n", $2);
-		  $$ = 0;
-               }
-               ;
-
-/* ======================================================================
- *                              C Parsing
- * ====================================================================== */
-
-c_declaration   : c_decl {
-                    $$ = $1; 
-                    if ($$) {
-   		      add_symbols($$);
-                      default_arguments($$);
-   	            }
-                }
-                | c_enum_decl { $$ = $1; }
-                | c_enum_forward_decl { $$ = $1; }
-
-/* An extern C type declaration, disable cparse_cplusplus if needed. */
-
-                | EXTERN string LBRACE {
-		  if (Strcmp($2,"C") == 0) {
-		    cparse_externc = 1;
-		  }
-		} interface RBRACE {
-		  cparse_externc = 0;
-		  if (Strcmp($2,"C") == 0) {
-		    Node *n = firstChild($5);
-		    $$ = new_node("extern");
-		    Setattr($$,"name",$2);
-		    appendChild($$,n);
-		    while (n) {
-		      SwigType *decl = Getattr(n,"decl");
-		      if (SwigType_isfunction(decl) && !Equal(Getattr(n, "storage"), "typedef")) {
-			Setattr(n,"storage","externc");
-		      }
-		      n = nextSibling(n);
-		    }
-		  } else {
-		     Swig_warning(WARN_PARSE_UNDEFINED_EXTERN,cparse_file, cparse_line,"Unrecognized extern type \"%s\".\n", $2);
-		    $$ = new_node("extern");
-		    Setattr($$,"name",$2);
-		    appendChild($$,firstChild($5));
-		  }
-                }
-                | cpp_lambda_decl {
-		  $$ = $1;
-		  SWIG_WARN_NODE_BEGIN($$);
-		  Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line, "Lambda expressions and closures are not fully supported yet.\n");
-		  SWIG_WARN_NODE_END($$);
-		}
-                | USING idcolon EQUAL type plain_declarator SEMI {
-		  /* Convert using statement to a typedef statement */
-		  $$ = new_node("cdecl");
-		  Setattr($$,"type",$4);
-		  Setattr($$,"storage","typedef");
-		  Setattr($$,"name",$2);
-		  Setattr($$,"decl",$5.type);
-		  SetFlag($$,"typealias");
-		  add_symbols($$);
-		}
-                | TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL type plain_declarator SEMI {
-		  /* Convert alias template to a "template" typedef statement */
-		  $$ = new_node("template");
-		  Setattr($$,"type",$8);
-		  Setattr($$,"storage","typedef");
-		  Setattr($$,"name",$6);
-		  Setattr($$,"decl",$9.type);
-		  Setattr($$,"templateparms",$3);
-		  Setattr($$,"templatetype","cdecl");
-		  SetFlag($$,"aliastemplate");
-		  add_symbols($$);
-		}
-                ;
-
-/* ------------------------------------------------------------
-   A C global declaration of some kind (may be variable, function, typedef, etc.)
-   ------------------------------------------------------------ */
-
-c_decl  : storage_class type declarator initializer c_decl_tail {
-              $$ = new_node("cdecl");
-	      if ($4.qualifier) SwigType_push($3.type,$4.qualifier);
-	      Setattr($$,"type",$2);
-	      Setattr($$,"storage",$1);
-	      Setattr($$,"name",$3.id);
-	      Setattr($$,"decl",$3.type);
-	      Setattr($$,"parms",$3.parms);
-	      Setattr($$,"value",$4.val);
-	      Setattr($$,"throws",$4.throws);
-	      Setattr($$,"throw",$4.throwf);
-	      Setattr($$,"noexcept",$4.nexcept);
-	      if ($4.val && $4.type) {
-		/* store initializer type as it might be different to the declared type */
-		SwigType *valuetype = NewSwigType($4.type);
-		if (Len(valuetype) > 0)
-		  Setattr($$,"valuetype",valuetype);
-		else
-		  Delete(valuetype);
-	      }
-	      if (!$5) {
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr($$,"code",code);
-		  Delete(code);
-		}
-	      } else {
-		Node *n = $5;
-		/* Inherit attributes */
-		while (n) {
-		  String *type = Copy($2);
-		  Setattr(n,"type",type);
-		  Setattr(n,"storage",$1);
-		  n = nextSibling(n);
-		  Delete(type);
-		}
-	      }
-	      if ($4.bitfield) {
-		Setattr($$,"bitfield", $4.bitfield);
-	      }
-
-	      /* Look for "::" declarations (ignored) */
-	      if (Strstr($3.id,"::")) {
-                /* This is a special case. If the scope name of the declaration exactly
-                   matches that of the declaration, then we will allow it. Otherwise, delete. */
-                String *p = Swig_scopename_prefix($3.id);
-		if (p) {
-		  if ((Namespaceprefix && Strcmp(p, Namespaceprefix) == 0) ||
-		      (Classprefix && Strcmp(p, Classprefix) == 0)) {
-		    String *lstr = Swig_scopename_last($3.id);
-		    Setattr($$,"name",lstr);
-		    Delete(lstr);
-		    set_nextSibling($$,$5);
-		  } else {
-		    Delete($$);
-		    $$ = $5;
-		  }
-		  Delete(p);
-		} else {
-		  Delete($$);
-		  $$ = $5;
-		}
-	      } else {
-		set_nextSibling($$,$5);
-	      }
-           }
-           /* Alternate function syntax introduced in C++11:
-              auto funcName(int x, int y) -> int; */
-           | storage_class AUTO declarator ARROW cpp_alternate_rettype initializer c_decl_tail {
-              $$ = new_node("cdecl");
-	      if ($6.qualifier) SwigType_push($3.type,$6.qualifier);
-	      Setattr($$,"type",$5);
-	      Setattr($$,"storage",$1);
-	      Setattr($$,"name",$3.id);
-	      Setattr($$,"decl",$3.type);
-	      Setattr($$,"parms",$3.parms);
-	      Setattr($$,"value",$6.val);
-	      Setattr($$,"throws",$6.throws);
-	      Setattr($$,"throw",$6.throwf);
-	      Setattr($$,"noexcept",$6.nexcept);
-	      if (!$7) {
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr($$,"code",code);
-		  Delete(code);
-		}
-	      } else {
-		Node *n = $7;
-		while (n) {
-		  String *type = Copy($5);
-		  Setattr(n,"type",type);
-		  Setattr(n,"storage",$1);
-		  n = nextSibling(n);
-		  Delete(type);
-		}
-	      }
-	      if ($6.bitfield) {
-		Setattr($$,"bitfield", $6.bitfield);
-	      }
-
-	      if (Strstr($3.id,"::")) {
-                String *p = Swig_scopename_prefix($3.id);
-		if (p) {
-		  if ((Namespaceprefix && Strcmp(p, Namespaceprefix) == 0) ||
-		      (Classprefix && Strcmp(p, Classprefix) == 0)) {
-		    String *lstr = Swig_scopename_last($3.id);
-		    Setattr($$,"name",lstr);
-		    Delete(lstr);
-		    set_nextSibling($$,$7);
-		  } else {
-		    Delete($$);
-		    $$ = $7;
-		  }
-		  Delete(p);
-		} else {
-		  Delete($$);
-		  $$ = $7;
-		}
-	      } else {
-		set_nextSibling($$,$7);
-	      }
-           }
-           ;
-
-/* Allow lists of variables and functions to be built up */
-
-c_decl_tail    : SEMI { 
-                   $$ = 0;
-                   Clear(scanner_ccode); 
-               }
-               | COMMA declarator initializer c_decl_tail {
-		 $$ = new_node("cdecl");
-		 if ($3.qualifier) SwigType_push($2.type,$3.qualifier);
-		 Setattr($$,"name",$2.id);
-		 Setattr($$,"decl",$2.type);
-		 Setattr($$,"parms",$2.parms);
-		 Setattr($$,"value",$3.val);
-		 Setattr($$,"throws",$3.throws);
-		 Setattr($$,"throw",$3.throwf);
-		 Setattr($$,"noexcept",$3.nexcept);
-		 if ($3.bitfield) {
-		   Setattr($$,"bitfield", $3.bitfield);
-		 }
-		 if (!$4) {
-		   if (Len(scanner_ccode)) {
-		     String *code = Copy(scanner_ccode);
-		     Setattr($$,"code",code);
-		     Delete(code);
-		   }
-		 } else {
-		   set_nextSibling($$,$4);
-		 }
-	       }
-               | LBRACE { 
-                   skip_balanced('{','}');
-                   $$ = 0;
-               }
-               | error {
-		   $$ = 0;
-		   if (yychar == RPAREN) {
-		       Swig_error(cparse_file, cparse_line, "Unexpected ')'.\n");
-		   } else {
-		       Swig_error(cparse_file, cparse_line, "Syntax error - possibly a missing semicolon.\n");
-		   }
-		   exit(1);
-               }
-              ;
-
-initializer   : def_args { 
-                   $$ = $1; 
-                   $$.qualifier = 0;
-		   $$.throws = 0;
-		   $$.throwf = 0;
-		   $$.nexcept = 0;
-              }
-              | type_qualifier def_args { 
-                   $$ = $2; 
-		   $$.qualifier = $1;
-		   $$.throws = 0;
-		   $$.throwf = 0;
-		   $$.nexcept = 0;
-	      }
-              | exception_specification def_args { 
-		   $$ = $2; 
-                   $$.qualifier = 0;
-		   $$.throws = $1.throws;
-		   $$.throwf = $1.throwf;
-		   $$.nexcept = $1.nexcept;
-              }
-              | type_qualifier exception_specification def_args { 
-                   $$ = $3; 
-                   $$.qualifier = $1;
-		   $$.throws = $2.throws;
-		   $$.throwf = $2.throwf;
-		   $$.nexcept = $2.nexcept;
-              }
-              ;
-
-cpp_alternate_rettype : primitive_type { $$ = $1; }
-              | TYPE_BOOL { $$ = $1; }
-              | TYPE_VOID { $$ = $1; }
-/*
-              | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
-*/
-              | TYPE_RAW { $$ = $1; }
-              | idcolon { $$ = $1; }
-              | decltype { $$ = $1; }
-              ;
-
-/* ------------------------------------------------------------
-   Lambda functions and expressions, such as:
-   auto myFunc = [] { return something; };
-   auto myFunc = [](int x, int y) { return x+y; };
-   auto myFunc = [](int x, int y) -> int { return x+y; };
-   auto myFunc = [](int x, int y) throw() -> int { return x+y; };
-   auto six = [](int x, int y) { return x+y; }(4, 2);
-   ------------------------------------------------------------ */
-cpp_lambda_decl : storage_class AUTO idcolon EQUAL lambda_introducer LPAREN parms RPAREN cpp_const lambda_body lambda_tail {
-		  $$ = new_node("lambda");
-		  Setattr($$,"name",$3);
-		  add_symbols($$);
-	        }
-                | storage_class AUTO idcolon EQUAL lambda_introducer LPAREN parms RPAREN cpp_const ARROW type lambda_body lambda_tail {
-		  $$ = new_node("lambda");
-		  Setattr($$,"name",$3);
-		  add_symbols($$);
-		}
-                | storage_class AUTO idcolon EQUAL lambda_introducer lambda_body lambda_tail {
-		  $$ = new_node("lambda");
-		  Setattr($$,"name",$3);
-		  add_symbols($$);
-		}
-                ;
-
-lambda_introducer : LBRACKET {
-		  skip_balanced('[',']');
-		  $$ = 0;
-	        }
-		;
-
-lambda_body : LBRACE {
-		  skip_balanced('{','}');
-		  $$ = 0;
-		}
-
-lambda_tail :	SEMI {
-		  $$ = 0;
-		}
-		| LPAREN {
-		  skip_balanced('(',')');
-		} SEMI {
-		  $$ = 0;
-		}
-		;
-
-/* ------------------------------------------------------------
-   enum
-   or
-   enum class
-   ------------------------------------------------------------ */
-
-c_enum_key : ENUM {
-		   $$ = (char *)"enum";
-	      }
-	      | ENUM CLASS {
-		   $$ = (char *)"enum class";
-	      }
-	      | ENUM STRUCT {
-		   $$ = (char *)"enum struct";
-	      }
-	      ;
-
-/* ------------------------------------------------------------
-   base enum type (eg. unsigned short)
-   ------------------------------------------------------------ */
-
-c_enum_inherit : COLON type_right {
-                   $$ = $2;
-              }
-              | empty { $$ = 0; }
-              ;
-/* ------------------------------------------------------------
-   enum [class] Name;
-   enum [class] Name [: base_type];
-   ------------------------------------------------------------ */
-
-c_enum_forward_decl : storage_class c_enum_key ename c_enum_inherit SEMI {
-		   SwigType *ty = 0;
-		   int scopedenum = $3 && !Equal($2, "enum");
-		   $$ = new_node("enumforward");
-		   ty = NewStringf("enum %s", $3);
-		   Setattr($$,"enumkey",$2);
-		   if (scopedenum)
-		     SetFlag($$, "scopedenum");
-		   Setattr($$,"name",$3);
-		   Setattr($$,"inherit",$4);
-		   Setattr($$,"type",ty);
-		   Setattr($$,"sym:weak", "1");
-		   add_symbols($$);
-	      }
-              ;
-
-/* ------------------------------------------------------------
-   enum [class] Name [: base_type] { ... };
-   or
-   enum [class] Name [: base_type] { ... } MyEnum [= ...];
- * ------------------------------------------------------------ */
-
-c_enum_decl :  storage_class c_enum_key ename c_enum_inherit LBRACE enumlist RBRACE SEMI {
-		  SwigType *ty = 0;
-		  int scopedenum = $3 && !Equal($2, "enum");
-                  $$ = new_node("enum");
-		  ty = NewStringf("enum %s", $3);
-		  Setattr($$,"enumkey",$2);
-		  if (scopedenum)
-		    SetFlag($$, "scopedenum");
-		  Setattr($$,"name",$3);
-		  Setattr($$,"inherit",$4);
-		  Setattr($$,"type",ty);
-		  appendChild($$,$6);
-		  add_symbols($$);      /* Add to tag space */
-
-		  if (scopedenum) {
-		    Swig_symbol_newscope();
-		    Swig_symbol_setscopename($3);
-		    Delete(Namespaceprefix);
-		    Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		  }
-
-		  add_symbols($6);      /* Add enum values to appropriate enum or enum class scope */
-
-		  if (scopedenum) {
-		    Setattr($$,"symtab", Swig_symbol_popscope());
-		    Delete(Namespaceprefix);
-		    Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		  }
-               }
-	       | storage_class c_enum_key ename c_enum_inherit LBRACE enumlist RBRACE declarator initializer c_decl_tail {
-		 Node *n;
-		 SwigType *ty = 0;
-		 String   *unnamed = 0;
-		 int       unnamedinstance = 0;
-		 int scopedenum = $3 && !Equal($2, "enum");
-
-		 $$ = new_node("enum");
-		 Setattr($$,"enumkey",$2);
-		 if (scopedenum)
-		   SetFlag($$, "scopedenum");
-		 Setattr($$,"inherit",$4);
-		 if ($3) {
-		   Setattr($$,"name",$3);
-		   ty = NewStringf("enum %s", $3);
-		 } else if ($8.id) {
-		   unnamed = make_unnamed();
-		   ty = NewStringf("enum %s", unnamed);
-		   Setattr($$,"unnamed",unnamed);
-                   /* name is not set for unnamed enum instances, e.g. enum { foo } Instance; */
-		   if ($1 && Cmp($1,"typedef") == 0) {
-		     Setattr($$,"name",$8.id);
-                   } else {
-                     unnamedinstance = 1;
-                   }
-		   Setattr($$,"storage",$1);
-		 }
-		 if ($8.id && Cmp($1,"typedef") == 0) {
-		   Setattr($$,"tdname",$8.id);
-                   Setattr($$,"allows_typedef","1");
-                 }
-		 appendChild($$,$6);
-		 n = new_node("cdecl");
-		 Setattr(n,"type",ty);
-		 Setattr(n,"name",$8.id);
-		 Setattr(n,"storage",$1);
-		 Setattr(n,"decl",$8.type);
-		 Setattr(n,"parms",$8.parms);
-		 Setattr(n,"unnamed",unnamed);
-
-                 if (unnamedinstance) {
-		   SwigType *cty = NewString("enum ");
-		   Setattr($$,"type",cty);
-		   SetFlag($$,"unnamedinstance");
-		   SetFlag(n,"unnamedinstance");
-		   Delete(cty);
-                 }
-		 if ($10) {
-		   Node *p = $10;
-		   set_nextSibling(n,p);
-		   while (p) {
-		     SwigType *cty = Copy(ty);
-		     Setattr(p,"type",cty);
-		     Setattr(p,"unnamed",unnamed);
-		     Setattr(p,"storage",$1);
-		     Delete(cty);
-		     p = nextSibling(p);
-		   }
-		 } else {
-		   if (Len(scanner_ccode)) {
-		     String *code = Copy(scanner_ccode);
-		     Setattr(n,"code",code);
-		     Delete(code);
-		   }
-		 }
-
-                 /* Ensure that typedef enum ABC {foo} XYZ; uses XYZ for sym:name, like structs.
-                  * Note that class_rename/yyrename are bit of a mess so used this simple approach to change the name. */
-                 if ($8.id && $3 && Cmp($1,"typedef") == 0) {
-		   String *name = NewString($8.id);
-                   Setattr($$, "parser:makename", name);
-		   Delete(name);
-                 }
-
-		 add_symbols($$);       /* Add enum to tag space */
-		 set_nextSibling($$,n);
-		 Delete(n);
-
-		 if (scopedenum) {
-		   Swig_symbol_newscope();
-		   Swig_symbol_setscopename($3);
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		 }
-
-		 add_symbols($6);      /* Add enum values to appropriate enum or enum class scope */
-
-		 if (scopedenum) {
-		   Setattr($$,"symtab", Swig_symbol_popscope());
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		 }
-
-	         add_symbols(n);
-		 Delete(unnamed);
-	       }
-               ;
-
-c_constructor_decl : storage_class type LPAREN parms RPAREN ctor_end {
-                   /* This is a sick hack.  If the ctor_end has parameters,
-                      and the parms parameter only has 1 parameter, this
-                      could be a declaration of the form:
-
-                         type (id)(parms)
-
-			 Otherwise it's an error. */
-                    int err = 0;
-                    $$ = 0;
-
-		    if ((ParmList_len($4) == 1) && (!Swig_scopename_check($2))) {
-		      SwigType *ty = Getattr($4,"type");
-		      String *name = Getattr($4,"name");
-		      err = 1;
-		      if (!name) {
-			$$ = new_node("cdecl");
-			Setattr($$,"type",$2);
-			Setattr($$,"storage",$1);
-			Setattr($$,"name",ty);
-
-			if ($6.have_parms) {
-			  SwigType *decl = NewStringEmpty();
-			  SwigType_add_function(decl,$6.parms);
-			  Setattr($$,"decl",decl);
-			  Setattr($$,"parms",$6.parms);
-			  if (Len(scanner_ccode)) {
-			    String *code = Copy(scanner_ccode);
-			    Setattr($$,"code",code);
-			    Delete(code);
-			  }
-			}
-			if ($6.defarg) {
-			  Setattr($$,"value",$6.defarg);
-			}
-			Setattr($$,"throws",$6.throws);
-			Setattr($$,"throw",$6.throwf);
-			Setattr($$,"noexcept",$6.nexcept);
-			err = 0;
-		      }
-		    }
-		    if (err) {
-		      Swig_error(cparse_file,cparse_line,"Syntax error in input(2).\n");
-		      exit(1);
-		    }
-                }
-                ;
-
-/* ======================================================================
- *                       C++ Support
- * ====================================================================== */
-
-cpp_declaration : cpp_class_decl {  $$ = $1; }
-                | cpp_forward_class_decl { $$ = $1; }
-                | cpp_template_decl { $$ = $1; }
-                | cpp_using_decl { $$ = $1; }
-                | cpp_namespace_decl { $$ = $1; }
-                | cpp_catch_decl { $$ = 0; }
-                ;
-
-
-/* A simple class/struct/union definition */
-cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
-                   String *prefix;
-                   List *bases = 0;
-		   Node *scope = 0;
-		   String *code;
-		   $<node>$ = new_node("class");
-		   Setline($<node>$,cparse_start_line);
-		   Setattr($<node>$,"kind",$2);
-		   if ($4) {
-		     Setattr($<node>$,"baselist", Getattr($4,"public"));
-		     Setattr($<node>$,"protectedbaselist", Getattr($4,"protected"));
-		     Setattr($<node>$,"privatebaselist", Getattr($4,"private"));
-		   }
-		   Setattr($<node>$,"allows_typedef","1");
-
-		   /* preserve the current scope */
-		   Setattr($<node>$,"prev_symtab",Swig_symbol_current());
-		  
-		   /* If the class name is qualified.  We need to create or lookup namespace/scope entries */
-		   scope = resolve_create_node_scope($3);
-		   /* save nscope_inner to the class - it may be overwritten in nested classes*/
-		   Setattr($<node>$, "nested:innerscope", nscope_inner);
-		   Setattr($<node>$, "nested:nscope", nscope);
-		   Setfile(scope,cparse_file);
-		   Setline(scope,cparse_line);
-		   $3 = scope;
-		   Setattr($<node>$,"name",$3);
-
-		   if (currentOuterClass) {
-		     SetFlag($<node>$, "nested");
-		     Setattr($<node>$, "nested:outer", currentOuterClass);
-		     set_access_mode($<node>$);
-		   }
-		   Swig_features_get(Swig_cparse_features(), Namespaceprefix, Getattr($<node>$, "name"), 0, $<node>$);
-		   /* save yyrename to the class attribute, to be used later in add_symbols()*/
-		   Setattr($<node>$, "class_rename", make_name($<node>$, $3, 0));
-		   Setattr($<node>$, "Classprefix", $3);
-		   Classprefix = NewString($3);
-		   /* Deal with inheritance  */
-		   if ($4)
-		     bases = Swig_make_inherit_list($3,Getattr($4,"public"),Namespaceprefix);
-		   prefix = SwigType_istemplate_templateprefix($3);
-		   if (prefix) {
-		     String *fbase, *tbase;
-		     if (Namespaceprefix) {
-		       fbase = NewStringf("%s::%s", Namespaceprefix,$3);
-		       tbase = NewStringf("%s::%s", Namespaceprefix, prefix);
-		     } else {
-		       fbase = Copy($3);
-		       tbase = Copy(prefix);
-		     }
-		     Swig_name_inherit(tbase,fbase);
-		     Delete(fbase);
-		     Delete(tbase);
-		   }
-                   if (strcmp($2,"class") == 0) {
-		     cplus_mode = CPLUS_PRIVATE;
-		   } else {
-		     cplus_mode = CPLUS_PUBLIC;
-		   }
-		   if (!cparse_cplusplus) {
-		     set_scope_to_global();
-		   }
-		   Swig_symbol_newscope();
-		   Swig_symbol_setscopename($3);
-		   Swig_inherit_base_symbols(bases);
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   cparse_start_line = cparse_line;
-
-		   /* If there are active template parameters, we need to make sure they are
-                      placed in the class symbol table so we can catch shadows */
-
-		   if (template_parameters) {
-		     Parm *tp = template_parameters;
-		     while(tp) {
-		       String *tpname = Copy(Getattr(tp,"name"));
-		       Node *tn = new_node("templateparm");
-		       Setattr(tn,"name",tpname);
-		       Swig_symbol_cadd(tpname,tn);
-		       tp = nextSibling(tp);
-		       Delete(tpname);
-		     }
-		   }
-		   Delete(prefix);
-		   inclass = 1;
-		   currentOuterClass = $<node>$;
-		   if (cparse_cplusplusout) {
-		     /* save the structure declaration to declare it in global scope for C++ to see */
-		     code = get_raw_text_balanced('{', '}');
-		     Setattr($<node>$, "code", code);
-		     Delete(code);
-		   }
-               } cpp_members RBRACE cpp_opt_declarators {
-		   Node *p;
-		   SwigType *ty;
-		   Symtab *cscope;
-		   Node *am = 0;
-		   String *scpname = 0;
-		   (void) $<node>6;
-		   $$ = currentOuterClass;
-		   currentOuterClass = Getattr($$, "nested:outer");
-		   nscope_inner = Getattr($<node>$, "nested:innerscope");
-		   nscope = Getattr($<node>$, "nested:nscope");
-		   Delattr($<node>$, "nested:innerscope");
-		   Delattr($<node>$, "nested:nscope");
-		   if (nscope_inner && Strcmp(nodeType(nscope_inner), "class") == 0) { /* actual parent class for this class */
-		     Node* forward_declaration = Swig_symbol_clookup_no_inherit(Getattr($<node>$,"name"), Getattr(nscope_inner, "symtab"));
-		     if (forward_declaration) {
-		       Setattr($<node>$, "access", Getattr(forward_declaration, "access"));
-		     }
-		     Setattr($<node>$, "nested:outer", nscope_inner);
-		     SetFlag($<node>$, "nested");
-                   }
-		   if (!currentOuterClass)
-		     inclass = 0;
-		   cscope = Getattr($$, "prev_symtab");
-		   Delattr($$, "prev_symtab");
-		   
-		   /* Check for pure-abstract class */
-		   Setattr($$,"abstracts", pure_abstracts($7));
-		   
-		   /* This bit of code merges in a previously defined %extend directive (if any) */
-		   {
-		     String *clsname = Swig_symbol_qualifiedscopename(0);
-		     am = Getattr(Swig_extend_hash(), clsname);
-		     if (am) {
-		       Swig_extend_merge($$, am);
-		       Delattr(Swig_extend_hash(), clsname);
-		     }
-		     Delete(clsname);
-		   }
-		   if (!classes) classes = NewHash();
-		   scpname = Swig_symbol_qualifiedscopename(0);
-		   Setattr(classes, scpname, $$);
-
-		   appendChild($$, $7);
-		   
-		   if (am) 
-		     Swig_extend_append_previous($$, am);
-
-		   p = $9;
-		   if (p && !nscope_inner) {
-		     if (!cparse_cplusplus && currentOuterClass)
-		       appendChild(currentOuterClass, p);
-		     else
-		      appendSibling($$, p);
-		   }
-		   
-		   if (nscope_inner) {
-		     ty = NewString(scpname); /* if the class is declared out of scope, let the declarator use fully qualified type*/
-		   } else if (cparse_cplusplus && !cparse_externc) {
-		     ty = NewString($3);
-		   } else {
-		     ty = NewStringf("%s %s", $2, $3);
-		   }
-		   while (p) {
-		     Setattr(p, "storage", $1);
-		     Setattr(p, "type" ,ty);
-		     if (!cparse_cplusplus && currentOuterClass && (!Getattr(currentOuterClass, "name"))) {
-		       SetFlag(p, "hasconsttype");
-		       SetFlag(p, "feature:immutable");
-		     }
-		     p = nextSibling(p);
-		   }
-		   if ($9 && Cmp($1,"typedef") == 0)
-		     add_typedef_name($$, $9, $3, cscope, scpname);
-		   Delete(scpname);
-
-		   if (cplus_mode != CPLUS_PUBLIC) {
-		   /* we 'open' the class at the end, to allow %template
-		      to add new members */
-		     Node *pa = new_node("access");
-		     Setattr(pa, "kind", "public");
-		     cplus_mode = CPLUS_PUBLIC;
-		     appendChild($$, pa);
-		     Delete(pa);
-		   }
-		   if (currentOuterClass)
-		     restore_access_mode($$);
-		   Setattr($$, "symtab", Swig_symbol_popscope());
-		   Classprefix = Getattr($<node>$, "Classprefix");
-		   Delattr($<node>$, "Classprefix");
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   if (cplus_mode == CPLUS_PRIVATE) {
-		     $$ = 0; /* skip private nested classes */
-		   } else if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag($$, "feature:flatnested")) {
-		     $$ = nested_forward_declaration($1, $2, $3, Copy($3), $9);
-		   } else if (nscope_inner) {
-		     /* this is tricky */
-		     /* we add the declaration in the original namespace */
-		     if (Strcmp(nodeType(nscope_inner), "class") == 0 && cparse_cplusplus && ignore_nested_classes && !GetFlag($$, "feature:flatnested"))
-		       $$ = nested_forward_declaration($1, $2, $3, Copy($3), $9);
-		     appendChild(nscope_inner, $$);
-		     Swig_symbol_setscope(Getattr(nscope_inner, "symtab"));
-		     Delete(Namespaceprefix);
-		     Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		     yyrename = Copy(Getattr($<node>$, "class_rename"));
-		     add_symbols($$);
-		     Delattr($$, "class_rename");
-		     /* but the variable definition in the current scope */
-		     Swig_symbol_setscope(cscope);
-		     Delete(Namespaceprefix);
-		     Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		     add_symbols($9);
-		     if (nscope) {
-		       $$ = nscope; /* here we return recreated namespace tower instead of the class itself */
-		       if ($9) {
-			 appendSibling($$, $9);
-		       }
-		     } else if (!SwigType_istemplate(ty) && template_parameters == 0) { /* for tempalte we need the class itself */
-		       $$ = $9;
-		     }
-		   } else {
-		     Delete(yyrename);
-		     yyrename = 0;
-		     if (!cparse_cplusplus && currentOuterClass) { /* nested C structs go into global scope*/
-		       Node *outer = currentOuterClass;
-		       while (Getattr(outer, "nested:outer"))
-			 outer = Getattr(outer, "nested:outer");
-		       appendSibling(outer, $$);
-		       add_symbols($9);
-		       set_scope_to_global();
-		       Delete(Namespaceprefix);
-		       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		       yyrename = Copy(Getattr($<node>$, "class_rename"));
-		       add_symbols($$);
-		       if (!cparse_cplusplusout)
-			 Delattr($$, "nested:outer");
-		       Delattr($$, "class_rename");
-		       $$ = 0;
-		     } else {
-		       yyrename = Copy(Getattr($<node>$, "class_rename"));
-		       add_symbols($$);
-		       add_symbols($9);
-		       Delattr($$, "class_rename");
-		     }
-		   }
-		   Delete(ty);
-		   Swig_symbol_setscope(cscope);
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   Classprefix = currentOuterClass ? Getattr(currentOuterClass, "Classprefix") : 0;
-	       }
-
-/* An unnamed struct, possibly with a typedef */
-
-             | storage_class cpptype inherit LBRACE {
-	       String *unnamed;
-	       String *code;
-	       unnamed = make_unnamed();
-	       $<node>$ = new_node("class");
-	       Setline($<node>$,cparse_start_line);
-	       Setattr($<node>$,"kind",$2);
-	       if ($3) {
-		 Setattr($<node>$,"baselist", Getattr($3,"public"));
-		 Setattr($<node>$,"protectedbaselist", Getattr($3,"protected"));
-		 Setattr($<node>$,"privatebaselist", Getattr($3,"private"));
-	       }
-	       Setattr($<node>$,"storage",$1);
-	       Setattr($<node>$,"unnamed",unnamed);
-	       Setattr($<node>$,"allows_typedef","1");
-	       if (currentOuterClass) {
-		 SetFlag($<node>$, "nested");
-		 Setattr($<node>$, "nested:outer", currentOuterClass);
-		 set_access_mode($<node>$);
-	       }
-	       Swig_features_get(Swig_cparse_features(), Namespaceprefix, 0, 0, $<node>$);
-	       /* save yyrename to the class attribute, to be used later in add_symbols()*/
-	       Setattr($<node>$, "class_rename", make_name($<node>$,0,0));
-	       if (strcmp($2,"class") == 0) {
-		 cplus_mode = CPLUS_PRIVATE;
-	       } else {
-		 cplus_mode = CPLUS_PUBLIC;
-	       }
-	       Swig_symbol_newscope();
-	       cparse_start_line = cparse_line;
-	       currentOuterClass = $<node>$;
-	       inclass = 1;
-	       Classprefix = 0;
-	       Delete(Namespaceprefix);
-	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	       /* save the structure declaration to make a typedef for it later*/
-	       code = get_raw_text_balanced('{', '}');
-	       Setattr($<node>$, "code", code);
-	       Delete(code);
-	     } cpp_members RBRACE cpp_opt_declarators {
-	       String *unnamed;
-               List *bases = 0;
-	       String *name = 0;
-	       Node *n;
-	       Classprefix = 0;
-	       (void)$<node>5;
-	       $$ = currentOuterClass;
-	       currentOuterClass = Getattr($$, "nested:outer");
-	       if (!currentOuterClass)
-		 inclass = 0;
-	       else
-		 restore_access_mode($$);
-	       unnamed = Getattr($$,"unnamed");
-               /* Check for pure-abstract class */
-	       Setattr($$,"abstracts", pure_abstracts($6));
-	       n = $8;
-	       if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag($$, "feature:flatnested")) {
-		 String *name = n ? Copy(Getattr(n, "name")) : 0;
-		 $$ = nested_forward_declaration($1, $2, 0, name, n);
-		 Swig_symbol_popscope();
-	         Delete(Namespaceprefix);
-		 Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	       } else if (n) {
-	         appendSibling($$,n);
-		 /* If a proper typedef name was given, we'll use it to set the scope name */
-		 name = try_to_find_a_name_for_unnamed_structure($1, n);
-		 if (name) {
-		   String *scpname = 0;
-		   SwigType *ty;
-		   Setattr($$,"tdname",name);
-		   Setattr($$,"name",name);
-		   Swig_symbol_setscopename(name);
-		   if ($3)
-		     bases = Swig_make_inherit_list(name,Getattr($3,"public"),Namespaceprefix);
-		   Swig_inherit_base_symbols(bases);
-
-		     /* If a proper name was given, we use that as the typedef, not unnamed */
-		   Clear(unnamed);
-		   Append(unnamed, name);
-		   if (cparse_cplusplus && !cparse_externc) {
-		     ty = NewString(name);
-		   } else {
-		     ty = NewStringf("%s %s", $2,name);
-		   }
-		   while (n) {
-		     Setattr(n,"storage",$1);
-		     Setattr(n, "type", ty);
-		     if (!cparse_cplusplus && currentOuterClass && (!Getattr(currentOuterClass, "name"))) {
-		       SetFlag(n,"hasconsttype");
-		       SetFlag(n,"feature:immutable");
-		     }
-		     n = nextSibling(n);
-		   }
-		   n = $8;
-
-		   /* Check for previous extensions */
-		   {
-		     String *clsname = Swig_symbol_qualifiedscopename(0);
-		     Node *am = Getattr(Swig_extend_hash(),clsname);
-		     if (am) {
-		       /* Merge the extension into the symbol table */
-		       Swig_extend_merge($$,am);
-		       Swig_extend_append_previous($$,am);
-		       Delattr(Swig_extend_hash(),clsname);
-		     }
-		     Delete(clsname);
-		   }
-		   if (!classes) classes = NewHash();
-		   scpname = Swig_symbol_qualifiedscopename(0);
-		   Setattr(classes,scpname,$$);
-		   Delete(scpname);
-		 } else { /* no suitable name was found for a struct */
-		   Setattr($$, "nested:unnamed", Getattr(n, "name")); /* save the name of the first declarator for later use in name generation*/
-		   while (n) { /* attach unnamed struct to the declarators, so that they would receive proper type later*/
-		     Setattr(n, "nested:unnamedtype", $$);
-		     Setattr(n, "storage", $1);
-		     n = nextSibling(n);
-		   }
-		   n = $8;
-		   Swig_symbol_setscopename("<unnamed>");
-		 }
-		 appendChild($$,$6);
-		 /* Pop the scope */
-		 Setattr($$,"symtab",Swig_symbol_popscope());
-		 if (name) {
-		   Delete(yyrename);
-		   yyrename = Copy(Getattr($<node>$, "class_rename"));
-		   Delete(Namespaceprefix);
-		   Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		   add_symbols($$);
-		   add_symbols(n);
-		   Delattr($$, "class_rename");
-		 }else if (cparse_cplusplus)
-		   $$ = 0; /* ignore unnamed structs for C++ */
-	         Delete(unnamed);
-	       } else { /* unnamed struct w/o declarator*/
-		 Swig_symbol_popscope();
-	         Delete(Namespaceprefix);
-		 Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		 add_symbols($6);
-		 Delete($$);
-		 $$ = $6; /* pass member list to outer class/namespace (instead of self)*/
-	       }
-	       Classprefix = currentOuterClass ? Getattr(currentOuterClass, "Classprefix") : 0;
-              }
-             ;
-
-cpp_opt_declarators :  SEMI { $$ = 0; }
-                    |  declarator initializer c_decl_tail {
-                        $$ = new_node("cdecl");
-                        Setattr($$,"name",$1.id);
-                        Setattr($$,"decl",$1.type);
-                        Setattr($$,"parms",$1.parms);
-			set_nextSibling($$,$3);
-                    }
-                    ;
-/* ------------------------------------------------------------
-   class Name;
-   ------------------------------------------------------------ */
-
-cpp_forward_class_decl : storage_class cpptype idcolon SEMI {
-              if ($1 && (Strcmp($1,"friend") == 0)) {
-		/* Ignore */
-                $$ = 0; 
-	      } else {
-		$$ = new_node("classforward");
-		Setattr($$,"kind",$2);
-		Setattr($$,"name",$3);
-		Setattr($$,"sym:weak", "1");
-		add_symbols($$);
-	      }
-             }
-             ;
-
-/* ------------------------------------------------------------
-   template<...> decl
-   ------------------------------------------------------------ */
-
-cpp_template_decl : TEMPLATE LESSTHAN template_parms GREATERTHAN { 
-		    if (currentOuterClass)
-		      Setattr(currentOuterClass, "template_parameters", template_parameters);
-		    template_parameters = $3; 
-		    parsing_template_declaration = 1;
-		  } cpp_temp_possible {
-			String *tname = 0;
-			int     error = 0;
-
-			/* check if we get a namespace node with a class declaration, and retrieve the class */
-			Symtab *cscope = Swig_symbol_current();
-			Symtab *sti = 0;
-			Node *ntop = $6;
-			Node *ni = ntop;
-			SwigType *ntype = ni ? nodeType(ni) : 0;
-			while (ni && Strcmp(ntype,"namespace") == 0) {
-			  sti = Getattr(ni,"symtab");
-			  ni = firstChild(ni);
-			  ntype = nodeType(ni);
-			}
-			if (sti) {
-			  Swig_symbol_setscope(sti);
-			  Delete(Namespaceprefix);
-			  Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-			  $6 = ni;
-			}
-
-			$$ = $6;
-			if ($$) tname = Getattr($$,"name");
-			
-			/* Check if the class is a template specialization */
-			if (($$) && (Strchr(tname,'<')) && (!is_operator(tname))) {
-			  /* If a specialization.  Check if defined. */
-			  Node *tempn = 0;
-			  {
-			    String *tbase = SwigType_templateprefix(tname);
-			    tempn = Swig_symbol_clookup_local(tbase,0);
-			    if (!tempn || (Strcmp(nodeType(tempn),"template") != 0)) {
-			      SWIG_WARN_NODE_BEGIN(tempn);
-			      Swig_warning(WARN_PARSE_TEMPLATE_SP_UNDEF, Getfile($$),Getline($$),"Specialization of non-template '%s'.\n", tbase);
-			      SWIG_WARN_NODE_END(tempn);
-			      tempn = 0;
-			      error = 1;
-			    }
-			    Delete(tbase);
-			  }
-			  Setattr($$,"specialization","1");
-			  Setattr($$,"templatetype",nodeType($$));
-			  set_nodeType($$,"template");
-			  /* Template partial specialization */
-			  if (tempn && ($3) && ($6)) {
-			    List   *tlist;
-			    String *targs = SwigType_templateargs(tname);
-			    tlist = SwigType_parmlist(targs);
-			    /*			  Printf(stdout,"targs = '%s' %s\n", targs, tlist); */
-			    if (!Getattr($$,"sym:weak")) {
-			      Setattr($$,"sym:typename","1");
-			    }
-			    
-			    if (Len(tlist) != ParmList_len(Getattr(tempn,"templateparms"))) {
-			      Swig_error(Getfile($$),Getline($$),"Inconsistent argument count in template partial specialization. %d %d\n", Len(tlist), ParmList_len(Getattr(tempn,"templateparms")));
-			      
-			    } else {
-
-			    /* This code builds the argument list for the partial template
-			       specialization.  This is a little hairy, but the idea is as
-			       follows:
-
-			       $3 contains a list of arguments supplied for the template.
-			       For example template<class T>.
-
-			       tlist is a list of the specialization arguments--which may be
-			       different.  For example class<int,T>.
-
-			       tp is a copy of the arguments in the original template definition.
-       
-			       The patching algorithm walks through the list of supplied
-			       arguments ($3), finds the position in the specialization arguments
-			       (tlist), and then patches the name in the argument list of the
-			       original template.
-			    */
-
-			    {
-			      String *pn;
-			      Parm *p, *p1;
-			      int i, nargs;
-			      Parm *tp = CopyParmList(Getattr(tempn,"templateparms"));
-			      nargs = Len(tlist);
-			      p = $3;
-			      while (p) {
-				for (i = 0; i < nargs; i++){
-				  pn = Getattr(p,"name");
-				  if (Strcmp(pn,SwigType_base(Getitem(tlist,i))) == 0) {
-				    int j;
-				    Parm *p1 = tp;
-				    for (j = 0; j < i; j++) {
-				      p1 = nextSibling(p1);
-				    }
-				    Setattr(p1,"name",pn);
-				    Setattr(p1,"partialarg","1");
-				  }
-				}
-				p = nextSibling(p);
-			      }
-			      p1 = tp;
-			      i = 0;
-			      while (p1) {
-				if (!Getattr(p1,"partialarg")) {
-				  Delattr(p1,"name");
-				  Setattr(p1,"type", Getitem(tlist,i));
-				} 
-				i++;
-				p1 = nextSibling(p1);
-			      }
-			      Setattr($$,"templateparms",tp);
-			      Delete(tp);
-			    }
-  #if 0
-			    /* Patch the parameter list */
-			    if (tempn) {
-			      Parm *p,*p1;
-			      ParmList *tp = CopyParmList(Getattr(tempn,"templateparms"));
-			      p = $3;
-			      p1 = tp;
-			      while (p && p1) {
-				String *pn = Getattr(p,"name");
-				Printf(stdout,"pn = '%s'\n", pn);
-				if (pn) Setattr(p1,"name",pn);
-				else Delattr(p1,"name");
-				pn = Getattr(p,"type");
-				if (pn) Setattr(p1,"type",pn);
-				p = nextSibling(p);
-				p1 = nextSibling(p1);
-			      }
-			      Setattr($$,"templateparms",tp);
-			      Delete(tp);
-			    } else {
-			      Setattr($$,"templateparms",$3);
-			    }
-  #endif
-			    Delattr($$,"specialization");
-			    Setattr($$,"partialspecialization","1");
-			    /* Create a specialized name for matching */
-			    {
-			      Parm *p = $3;
-			      String *fname = NewString(Getattr($$,"name"));
-			      String *ffname = 0;
-			      ParmList *partialparms = 0;
-
-			      char   tmp[32];
-			      int    i, ilen;
-			      while (p) {
-				String *n = Getattr(p,"name");
-				if (!n) {
-				  p = nextSibling(p);
-				  continue;
-				}
-				ilen = Len(tlist);
-				for (i = 0; i < ilen; i++) {
-				  if (Strstr(Getitem(tlist,i),n)) {
-				    sprintf(tmp,"$%d",i+1);
-				    Replaceid(fname,n,tmp);
-				  }
-				}
-				p = nextSibling(p);
-			      }
-			      /* Patch argument names with typedef */
-			      {
-				Iterator tt;
-				Parm *parm_current = 0;
-				List *tparms = SwigType_parmlist(fname);
-				ffname = SwigType_templateprefix(fname);
-				Append(ffname,"<(");
-				for (tt = First(tparms); tt.item; ) {
-				  SwigType *rtt = Swig_symbol_typedef_reduce(tt.item,0);
-				  SwigType *ttr = Swig_symbol_type_qualify(rtt,0);
-
-				  Parm *newp = NewParmWithoutFileLineInfo(ttr, 0);
-				  if (partialparms)
-				    set_nextSibling(parm_current, newp);
-				  else
-				    partialparms = newp;
-				  parm_current = newp;
-
-				  Append(ffname,ttr);
-				  tt = Next(tt);
-				  if (tt.item) Putc(',',ffname);
-				  Delete(rtt);
-				  Delete(ttr);
-				}
-				Delete(tparms);
-				Append(ffname,")>");
-			      }
-			      {
-				Node *new_partial = NewHash();
-				String *partials = Getattr(tempn,"partials");
-				if (!partials) {
-				  partials = NewList();
-				  Setattr(tempn,"partials",partials);
-				  Delete(partials);
-				}
-				/*			      Printf(stdout,"partial: fname = '%s', '%s'\n", fname, Swig_symbol_typedef_reduce(fname,0)); */
-				Setattr(new_partial, "partialparms", partialparms);
-				Setattr(new_partial, "templcsymname", ffname);
-				Append(partials, new_partial);
-			      }
-			      Setattr($$,"partialargs",ffname);
-			      Swig_symbol_cadd(ffname,$$);
-			    }
-			    }
-			    Delete(tlist);
-			    Delete(targs);
-			  } else {
-			    /* An explicit template specialization */
-			    /* add default args from primary (unspecialized) template */
-			    String *ty = Swig_symbol_template_deftype(tname,0);
-			    String *fname = Swig_symbol_type_qualify(ty,0);
-			    Swig_symbol_cadd(fname,$$);
-			    Delete(ty);
-			    Delete(fname);
-			  }
-			}  else if ($$) {
-			  Setattr($$,"templatetype",nodeType($6));
-			  set_nodeType($$,"template");
-			  Setattr($$,"templateparms", $3);
-			  if (!Getattr($$,"sym:weak")) {
-			    Setattr($$,"sym:typename","1");
-			  }
-			  add_symbols($$);
-			  default_arguments($$);
-			  /* We also place a fully parameterized version in the symbol table */
-			  {
-			    Parm *p;
-			    String *fname = NewStringf("%s<(", Getattr($$,"name"));
-			    p = $3;
-			    while (p) {
-			      String *n = Getattr(p,"name");
-			      if (!n) n = Getattr(p,"type");
-			      Append(fname,n);
-			      p = nextSibling(p);
-			      if (p) Putc(',',fname);
-			    }
-			    Append(fname,")>");
-			    Swig_symbol_cadd(fname,$$);
-			  }
-			}
-			$$ = ntop;
-			Swig_symbol_setscope(cscope);
-			Delete(Namespaceprefix);
-			Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-			if (error || (nscope_inner && Strcmp(nodeType(nscope_inner), "class") == 0)) {
-			  $$ = 0;
-			}
-			if (currentOuterClass)
-			  template_parameters = Getattr(currentOuterClass, "template_parameters");
-			else
-			  template_parameters = 0;
-			parsing_template_declaration = 0;
-                }
-
-		/* Explicit template instantiation */
-                | TEMPLATE cpptype idcolon {
-		  Swig_warning(WARN_PARSE_EXPLICIT_TEMPLATE, cparse_file, cparse_line, "Explicit template instantiation ignored.\n");
-                  $$ = 0; 
-		}
-
-		/* Explicit template instantiation without the translation unit */
-		| EXTERN TEMPLATE cpptype idcolon {
-		  Swig_warning(WARN_PARSE_EXPLICIT_TEMPLATE, cparse_file, cparse_line, "Explicit template instantiation ignored.\n");
-                  $$ = 0; 
-                }
-                ;
-
-cpp_temp_possible:  c_decl {
-		  $$ = $1;
-                }
-                | cpp_class_decl {
-                   $$ = $1;
-                }
-                | cpp_constructor_decl {
-                   $$ = $1;
-                }
-                | cpp_static_assert {
-                   $$ = $1;
-                }
-                | cpp_template_decl {
-		  $$ = 0;
-                }
-                | cpp_forward_class_decl {
-                  $$ = $1;
-                }
-                | cpp_conversion_operator {
-                  $$ = $1;
-                }
-                ;
-
-template_parms  : templateparameters {
-		   /* Rip out the parameter names */
-		  Parm *p = $1;
-		  $$ = $1;
-
-		  while (p) {
-		    String *name = Getattr(p,"name");
-		    if (!name) {
-		      /* Hmmm. Maybe it's a 'class T' parameter */
-		      char *type = Char(Getattr(p,"type"));
-		      /* Template template parameter */
-		      if (strncmp(type,"template<class> ",16) == 0) {
-			type += 16;
-		      }
-		      if ((strncmp(type,"class ",6) == 0) || (strncmp(type,"typename ", 9) == 0)) {
-			char *t = strchr(type,' ');
-			Setattr(p,"name", t+1);
-		      } else 
-                      /* Variadic template args */
-		      if ((strncmp(type,"class... ",9) == 0) || (strncmp(type,"typename... ", 12) == 0)) {
-			char *t = strchr(type,' ');
-			Setattr(p,"name", t+1);
-			Setattr(p,"variadic", "1");
-		      } else {
-			/*
-			 Swig_error(cparse_file, cparse_line, "Missing template parameter name\n");
-			 $$.rparms = 0;
-			 $$.parms = 0;
-			 break; */
-		      }
-		    }
-		    p = nextSibling(p);
-		  }
-                 }
-                 ;
-
-templateparameters : templateparameter templateparameterstail {
-                      set_nextSibling($1,$2);
-                      $$ = $1;
-                   }
-                   | empty { $$ = 0; }
-                   ;
-
-templateparameter : templcpptype {
-		    $$ = NewParmWithoutFileLineInfo(NewString($1), 0);
-                  }
-                  | parm {
-                    $$ = $1;
-                  }
-                  ;
-
-templateparameterstail : COMMA templateparameter templateparameterstail {
-                         set_nextSibling($2,$3);
-                         $$ = $2;
-                       }
-                       | empty { $$ = 0; }
-                       ;
-
-/* Namespace support */
-
-cpp_using_decl : USING idcolon SEMI {
-                  String *uname = Swig_symbol_type_qualify($2,0);
-		  String *name = Swig_scopename_last($2);
-                  $$ = new_node("using");
-		  Setattr($$,"uname",uname);
-		  Setattr($$,"name", name);
-		  Delete(uname);
-		  Delete(name);
-		  add_symbols($$);
-             }
-             | USING NAMESPACE idcolon SEMI {
-	       Node *n = Swig_symbol_clookup($3,0);
-	       if (!n) {
-		 Swig_error(cparse_file, cparse_line, "Nothing known about namespace '%s'\n", $3);
-		 $$ = 0;
-	       } else {
-
-		 while (Strcmp(nodeType(n),"using") == 0) {
-		   n = Getattr(n,"node");
-		 }
-		 if (n) {
-		   if (Strcmp(nodeType(n),"namespace") == 0) {
-		     Symtab *current = Swig_symbol_current();
-		     Symtab *symtab = Getattr(n,"symtab");
-		     $$ = new_node("using");
-		     Setattr($$,"node",n);
-		     Setattr($$,"namespace", $3);
-		     if (current != symtab) {
-		       Swig_symbol_inherit(symtab);
-		     }
-		   } else {
-		     Swig_error(cparse_file, cparse_line, "'%s' is not a namespace.\n", $3);
-		     $$ = 0;
-		   }
-		 } else {
-		   $$ = 0;
-		 }
-	       }
-             }
-             ;
-
-cpp_namespace_decl : NAMESPACE idcolon LBRACE { 
-                Hash *h;
-                $1 = Swig_symbol_current();
-		h = Swig_symbol_clookup($2,0);
-		if (h && ($1 == Getattr(h,"sym:symtab")) && (Strcmp(nodeType(h),"namespace") == 0)) {
-		  if (Getattr(h,"alias")) {
-		    h = Getattr(h,"namespace");
-		    Swig_warning(WARN_PARSE_NAMESPACE_ALIAS, cparse_file, cparse_line, "Namespace alias '%s' not allowed here. Assuming '%s'\n",
-				 $2, Getattr(h,"name"));
-		    $2 = Getattr(h,"name");
-		  }
-		  Swig_symbol_setscope(Getattr(h,"symtab"));
-		} else {
-		  Swig_symbol_newscope();
-		  Swig_symbol_setscopename($2);
-		}
-		Delete(Namespaceprefix);
-		Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-             } interface RBRACE {
-                Node *n = $5;
-		set_nodeType(n,"namespace");
-		Setattr(n,"name",$2);
-                Setattr(n,"symtab", Swig_symbol_popscope());
-		Swig_symbol_setscope($1);
-		$$ = n;
-		Delete(Namespaceprefix);
-		Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-		add_symbols($$);
-             } 
-             | NAMESPACE LBRACE {
-	       Hash *h;
-	       $1 = Swig_symbol_current();
-	       h = Swig_symbol_clookup("    ",0);
-	       if (h && (Strcmp(nodeType(h),"namespace") == 0)) {
-		 Swig_symbol_setscope(Getattr(h,"symtab"));
-	       } else {
-		 Swig_symbol_newscope();
-		 /* we don't use "__unnamed__", but a long 'empty' name */
-		 Swig_symbol_setscopename("    ");
-	       }
-	       Namespaceprefix = 0;
-             } interface RBRACE {
-	       $$ = $4;
-	       set_nodeType($$,"namespace");
-	       Setattr($$,"unnamed","1");
-	       Setattr($$,"symtab", Swig_symbol_popscope());
-	       Swig_symbol_setscope($1);
-	       Delete(Namespaceprefix);
-	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-	       add_symbols($$);
-             }
-             | NAMESPACE identifier EQUAL idcolon SEMI {
-	       /* Namespace alias */
-	       Node *n;
-	       $$ = new_node("namespace");
-	       Setattr($$,"name",$2);
-	       Setattr($$,"alias",$4);
-	       n = Swig_symbol_clookup($4,0);
-	       if (!n) {
-		 Swig_error(cparse_file, cparse_line, "Unknown namespace '%s'\n", $4);
-		 $$ = 0;
-	       } else {
-		 if (Strcmp(nodeType(n),"namespace") != 0) {
-		   Swig_error(cparse_file, cparse_line, "'%s' is not a namespace\n",$4);
-		   $$ = 0;
-		 } else {
-		   while (Getattr(n,"alias")) {
-		     n = Getattr(n,"namespace");
-		   }
-		   Setattr($$,"namespace",n);
-		   add_symbols($$);
-		   /* Set up a scope alias */
-		   Swig_symbol_alias($2,Getattr(n,"symtab"));
-		 }
-	       }
-             }
-             ;
-
-cpp_members  : cpp_member cpp_members {
-                   $$ = $1;
-                   /* Insert cpp_member (including any siblings) to the front of the cpp_members linked list */
-		   if ($$) {
-		     Node *p = $$;
-		     Node *pp =0;
-		     while (p) {
-		       pp = p;
-		       p = nextSibling(p);
-		     }
-		     set_nextSibling(pp,$2);
-		     if ($2)
-		       set_previousSibling($2, pp);
-		   } else {
-		     $$ = $2;
-		   }
-             }
-             | EXTEND LBRACE { 
-	       extendmode = 1;
-	       if (cplus_mode != CPLUS_PUBLIC) {
-		 Swig_error(cparse_file,cparse_line,"%%extend can only be used in a public section\n");
-	       }
-             } cpp_members RBRACE {
-	       extendmode = 0;
-	     } cpp_members {
-	       $$ = new_node("extend");
-	       mark_nodes_as_extend($4);
-	       appendChild($$,$4);
-	       set_nextSibling($$,$7);
-	     }
-             | include_directive { $$ = $1; }
-             | empty { $$ = 0;}
-	     | error {
-	       int start_line = cparse_line;
-	       skip_decl();
-	       Swig_error(cparse_file,start_line,"Syntax error in input(3).\n");
-	       exit(1);
-	       } cpp_members { 
-		 $$ = $3;
-   	     }
-             ;
-
-/* ======================================================================
- *                         C++ Class members
- * ====================================================================== */
-
-/* A class member.  May be data or a function. Static or virtual as well */
-
-cpp_member   : c_declaration { $$ = $1; }
-             | cpp_constructor_decl { 
-                 $$ = $1; 
-		 if (extendmode && current_class) {
-		   String *symname;
-		   symname= make_name($$,Getattr($$,"name"), Getattr($$,"decl"));
-		   if (Strcmp(symname,Getattr($$,"name")) == 0) {
-		     /* No renaming operation.  Set name to class name */
-		     Delete(yyrename);
-		     yyrename = NewString(Getattr(current_class,"sym:name"));
-		   } else {
-		     Delete(yyrename);
-		     yyrename = symname;
-		   }
-		 }
-		 add_symbols($$);
-                 default_arguments($$);
-             }
-             | cpp_destructor_decl { $$ = $1; }
-             | cpp_static_assert { $$ = $1; }
-             | cpp_protection_decl { $$ = $1; }
-             | cpp_swig_directive { $$ = $1; }
-             | cpp_conversion_operator { $$ = $1; }
-             | cpp_forward_class_decl { $$ = $1; }
-	     | cpp_class_decl { $$ = $1; }
-             | storage_class idcolon SEMI { $$ = 0; }
-             | cpp_using_decl { $$ = $1; }
-             | cpp_template_decl { $$ = $1; }
-             | cpp_catch_decl { $$ = 0; }
-             | template_directive { $$ = $1; }
-             | warn_directive { $$ = $1; }
-             | anonymous_bitfield { $$ = 0; }
-             | fragment_directive {$$ = $1; }
-             | types_directive {$$ = $1; }
-             | SEMI { $$ = 0; }
-             ;
-
-/* Possibly a constructor */
-/* Note: the use of 'type' is here to resolve a shift-reduce conflict.  For example:
-            typedef Foo ();
-            typedef Foo (*ptr)();
-*/
-  
-cpp_constructor_decl : storage_class type LPAREN parms RPAREN ctor_end {
-              if (inclass || extendmode) {
-		SwigType *decl = NewStringEmpty();
-		$$ = new_node("constructor");
-		Setattr($$,"storage",$1);
-		Setattr($$,"name",$2);
-		Setattr($$,"parms",$4);
-		SwigType_add_function(decl,$4);
-		Setattr($$,"decl",decl);
-		Setattr($$,"throws",$6.throws);
-		Setattr($$,"throw",$6.throwf);
-		Setattr($$,"noexcept",$6.nexcept);
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr($$,"code",code);
-		  Delete(code);
-		}
-		SetFlag($$,"feature:new");
-		if ($6.defarg)
-		  Setattr($$,"value",$6.defarg);
-	      } else {
-		$$ = 0;
-              }
-              }
-              ;
-
-/* A destructor (hopefully) */
-
-cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end {
-               String *name = NewStringf("%s",$2);
-	       if (*(Char(name)) != '~') Insert(name,0,"~");
-               $$ = new_node("destructor");
-	       Setattr($$,"name",name);
-	       Delete(name);
-	       if (Len(scanner_ccode)) {
-		 String *code = Copy(scanner_ccode);
-		 Setattr($$,"code",code);
-		 Delete(code);
-	       }
-	       {
-		 String *decl = NewStringEmpty();
-		 SwigType_add_function(decl,$4);
-		 Setattr($$,"decl",decl);
-		 Delete(decl);
-	       }
-	       Setattr($$,"throws",$6.throws);
-	       Setattr($$,"throw",$6.throwf);
-	       Setattr($$,"noexcept",$6.nexcept);
-	       if ($6.val)
-	         Setattr($$,"value",$6.val);
-	       add_symbols($$);
-	      }
-
-/* A virtual destructor */
-
-              | VIRTUAL NOT idtemplate LPAREN parms RPAREN cpp_vend {
-		String *name;
-		$$ = new_node("destructor");
-		Setattr($$,"storage","virtual");
-	        name = NewStringf("%s",$3);
-		if (*(Char(name)) != '~') Insert(name,0,"~");
-		Setattr($$,"name",name);
-		Delete(name);
-		Setattr($$,"throws",$7.throws);
-		Setattr($$,"throw",$7.throwf);
-		Setattr($$,"noexcept",$7.nexcept);
-		if ($7.val)
-		  Setattr($$,"value",$7.val);
-		if (Len(scanner_ccode)) {
-		  String *code = Copy(scanner_ccode);
-		  Setattr($$,"code",code);
-		  Delete(code);
-		}
-		{
-		  String *decl = NewStringEmpty();
-		  SwigType_add_function(decl,$5);
-		  Setattr($$,"decl",decl);
-		  Delete(decl);
-		}
-
-		add_symbols($$);
-	      }
-              ;
-
-
-/* C++ type conversion operator */
-cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN parms RPAREN cpp_vend {
-                 $$ = new_node("cdecl");
-                 Setattr($$,"type",$3);
-		 Setattr($$,"name",$2);
-		 Setattr($$,"storage",$1);
-
-		 SwigType_add_function($4,$6);
-		 if ($8.qualifier) {
-		   SwigType_push($4,$8.qualifier);
-		 }
-		 Setattr($$,"decl",$4);
-		 Setattr($$,"parms",$6);
-		 Setattr($$,"conversion_operator","1");
-		 add_symbols($$);
-              }
-               | storage_class CONVERSIONOPERATOR type AND LPAREN parms RPAREN cpp_vend {
-		 SwigType *decl;
-                 $$ = new_node("cdecl");
-                 Setattr($$,"type",$3);
-		 Setattr($$,"name",$2);
-		 Setattr($$,"storage",$1);
-		 decl = NewStringEmpty();
-		 SwigType_add_reference(decl);
-		 SwigType_add_function(decl,$6);
-		 if ($8.qualifier) {
-		   SwigType_push(decl,$8.qualifier);
-		 }
-		 Setattr($$,"decl",decl);
-		 Setattr($$,"parms",$6);
-		 Setattr($$,"conversion_operator","1");
-		 add_symbols($$);
-	       }
-               | storage_class CONVERSIONOPERATOR type LAND LPAREN parms RPAREN cpp_vend {
-		 SwigType *decl;
-                 $$ = new_node("cdecl");
-                 Setattr($$,"type",$3);
-		 Setattr($$,"name",$2);
-		 Setattr($$,"storage",$1);
-		 decl = NewStringEmpty();
-		 SwigType_add_rvalue_reference(decl);
-		 SwigType_add_function(decl,$6);
-		 if ($8.qualifier) {
-		   SwigType_push(decl,$8.qualifier);
-		 }
-		 Setattr($$,"decl",decl);
-		 Setattr($$,"parms",$6);
-		 Setattr($$,"conversion_operator","1");
-		 add_symbols($$);
-	       }
-
-               | storage_class CONVERSIONOPERATOR type pointer AND LPAREN parms RPAREN cpp_vend {
-		 SwigType *decl;
-                 $$ = new_node("cdecl");
-                 Setattr($$,"type",$3);
-		 Setattr($$,"name",$2);
-		 Setattr($$,"storage",$1);
-		 decl = NewStringEmpty();
-		 SwigType_add_pointer(decl);
-		 SwigType_add_reference(decl);
-		 SwigType_add_function(decl,$7);
-		 if ($9.qualifier) {
-		   SwigType_push(decl,$9.qualifier);
-		 }
-		 Setattr($$,"decl",decl);
-		 Setattr($$,"parms",$7);
-		 Setattr($$,"conversion_operator","1");
-		 add_symbols($$);
-	       }
-
-              | storage_class CONVERSIONOPERATOR type LPAREN parms RPAREN cpp_vend {
-		String *t = NewStringEmpty();
-		$$ = new_node("cdecl");
-		Setattr($$,"type",$3);
-		Setattr($$,"name",$2);
-		 Setattr($$,"storage",$1);
-		SwigType_add_function(t,$5);
-		if ($7.qualifier) {
-		  SwigType_push(t,$7.qualifier);
-		}
-		Setattr($$,"decl",t);
-		Setattr($$,"parms",$5);
-		Setattr($$,"conversion_operator","1");
-		add_symbols($$);
-              }
-              ;
-
-/* isolated catch clause. */
-
-cpp_catch_decl : CATCH LPAREN parms RPAREN LBRACE {
-                 skip_balanced('{','}');
-                 $$ = 0;
-               }
-               ;
-
-/* static_assert(bool, const char*); */
-cpp_static_assert : STATIC_ASSERT LPAREN {
-                skip_balanced('(',')');
-                $$ = 0;
-              }
-              ;
-
-/* public: */
-cpp_protection_decl : PUBLIC COLON { 
-                $$ = new_node("access");
-		Setattr($$,"kind","public");
-                cplus_mode = CPLUS_PUBLIC;
-              }
-
-/* private: */
-              | PRIVATE COLON { 
-                $$ = new_node("access");
-                Setattr($$,"kind","private");
-		cplus_mode = CPLUS_PRIVATE;
-	      }
-
-/* protected: */
-
-              | PROTECTED COLON { 
-		$$ = new_node("access");
-		Setattr($$,"kind","protected");
-		cplus_mode = CPLUS_PROTECTED;
-	      }
-              ;
-/* These directives can be included inside a class definition */
-
-cpp_swig_directive: pragma_directive { $$ = $1; }
-
-/* A constant (includes #defines) inside a class */
-             | constant_directive { $$ = $1; }
-
-/* This is the new style rename */
-
-             | name_directive { $$ = $1; }
-
-/* rename directive */
-             | rename_directive { $$ = $1; }
-             | feature_directive { $$ = $1; }
-             | varargs_directive { $$ = $1; }
-             | insert_directive { $$ = $1; }
-             | typemap_directive { $$ = $1; }
-             | apply_directive { $$ = $1; }
-             | clear_directive { $$ = $1; }
-             | echo_directive { $$ = $1; }
-             ;
-
-cpp_end        : cpp_const SEMI {
-	            Clear(scanner_ccode);
-		    $$.val = 0;
-		    $$.throws = $1.throws;
-		    $$.throwf = $1.throwf;
-		    $$.nexcept = $1.nexcept;
-               }
-               | cpp_const EQUAL default_delete SEMI {
-	            Clear(scanner_ccode);
-		    $$.val = $3.val;
-		    $$.throws = $1.throws;
-		    $$.throwf = $1.throwf;
-		    $$.nexcept = $1.nexcept;
-               }
-               | cpp_const LBRACE { 
-		    skip_balanced('{','}'); 
-		    $$.val = 0;
-		    $$.throws = $1.throws;
-		    $$.throwf = $1.throwf;
-		    $$.nexcept = $1.nexcept;
-	       }
-               ;
-
-cpp_vend       : cpp_const SEMI { 
-                     Clear(scanner_ccode);
-                     $$.val = 0;
-                     $$.qualifier = $1.qualifier;
-                     $$.bitfield = 0;
-                     $$.throws = $1.throws;
-                     $$.throwf = $1.throwf;
-                     $$.nexcept = $1.nexcept;
-                }
-               | cpp_const EQUAL definetype SEMI { 
-                     Clear(scanner_ccode);
-                     $$.val = $3.val;
-                     $$.qualifier = $1.qualifier;
-                     $$.bitfield = 0;
-                     $$.throws = $1.throws; 
-                     $$.throwf = $1.throwf; 
-                     $$.nexcept = $1.nexcept; 
-               }
-               | cpp_const LBRACE { 
-                     skip_balanced('{','}');
-                     $$.val = 0;
-                     $$.qualifier = $1.qualifier;
-                     $$.bitfield = 0;
-                     $$.throws = $1.throws; 
-                     $$.throwf = $1.throwf; 
-                     $$.nexcept = $1.nexcept; 
-               }
-               ;
-
-
-anonymous_bitfield :  storage_class anon_bitfield_type COLON expr SEMI { };
-
-/* Equals type_right without the ENUM keyword and cpptype (templates etc.): */
-anon_bitfield_type : primitive_type { $$ = $1;
-                  /* Printf(stdout,"primitive = '%s'\n", $$);*/
-                }
-               | TYPE_BOOL { $$ = $1; }
-               | TYPE_VOID { $$ = $1; }
-/*
-               | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
-*/
-               | TYPE_RAW { $$ = $1; }
-
-               | idcolon {
-		  $$ = $1;
-               }
-               ;
-
-/* ====================================================================== 
- *                       PRIMITIVES
- * ====================================================================== */
-extern_string :  EXTERN string {
-                   if (Strcmp($2,"C") == 0) {
-		     $$ = "externc";
-                   } else if (Strcmp($2,"C++") == 0) {
-		     $$ = "extern";
-		   } else {
-		     Swig_warning(WARN_PARSE_UNDEFINED_EXTERN,cparse_file, cparse_line,"Unrecognized extern type \"%s\".\n", $2);
-		     $$ = 0;
-		   }
-               }
-	       ;
-
-storage_class  : EXTERN { $$ = "extern"; }
-	       | extern_string { $$ = $1; }
-	       | extern_string THREAD_LOCAL { $$ = "thread_local"; }
-	       | extern_string TYPEDEF { $$ = "typedef"; }
-               | STATIC { $$ = "static"; }
-               | TYPEDEF { $$ = "typedef"; }
-               | VIRTUAL { $$ = "virtual"; }
-               | FRIEND { $$ = "friend"; }
-               | EXPLICIT { $$ = "explicit"; }
-               | CONSTEXPR { $$ = "constexpr"; }
-               | EXPLICIT CONSTEXPR { $$ = "explicit constexpr"; }
-               | CONSTEXPR EXPLICIT { $$ = "explicit constexpr"; }
-               | STATIC CONSTEXPR { $$ = "static constexpr"; }
-               | CONSTEXPR STATIC { $$ = "static constexpr"; }
-               | THREAD_LOCAL { $$ = "thread_local"; }
-               | THREAD_LOCAL STATIC { $$ = "static thread_local"; }
-               | STATIC THREAD_LOCAL { $$ = "static thread_local"; }
-               | EXTERN THREAD_LOCAL { $$ = "extern thread_local"; }
-               | THREAD_LOCAL EXTERN { $$ = "extern thread_local"; }
-               | empty { $$ = 0; }
-               ;
-
-/* ------------------------------------------------------------------------------
-   Function parameter lists
-   ------------------------------------------------------------------------------ */
-
-parms          : rawparms {
-                 Parm *p;
-		 $$ = $1;
-		 p = $1;
-                 while (p) {
-		   Replace(Getattr(p,"type"),"typename ", "", DOH_REPLACE_ANY);
-		   p = nextSibling(p);
-                 }
-               }
-    	       ;
-
-rawparms          : parm ptail {
-                  set_nextSibling($1,$2);
-                  $$ = $1;
-		}
-               | empty { $$ = 0; }
-               ;
-
-ptail          : COMMA parm ptail {
-                 set_nextSibling($2,$3);
-		 $$ = $2;
-                }
-               | empty { $$ = 0; }
-               ;
-
-
-parm           : rawtype parameter_declarator {
-                   SwigType_push($1,$2.type);
-		   $$ = NewParmWithoutFileLineInfo($1,$2.id);
-		   Setfile($$,cparse_file);
-		   Setline($$,cparse_line);
-		   if ($2.defarg) {
-		     Setattr($$,"value",$2.defarg);
-		   }
-		}
-
-                | TEMPLATE LESSTHAN cpptype GREATERTHAN cpptype idcolon def_args {
-                  $$ = NewParmWithoutFileLineInfo(NewStringf("template<class> %s %s", $5,$6), 0);
-		  Setfile($$,cparse_file);
-		  Setline($$,cparse_line);
-                  if ($7.val) {
-                    Setattr($$,"value",$7.val);
-                  }
-                }
-                | PERIOD PERIOD PERIOD {
-		  SwigType *t = NewString("v(...)");
-		  $$ = NewParmWithoutFileLineInfo(t, 0);
-		  Setfile($$,cparse_file);
-		  Setline($$,cparse_line);
-		}
-		;
-
-valparms        : rawvalparms {
-                 Parm *p;
-		 $$ = $1;
-		 p = $1;
-                 while (p) {
-		   if (Getattr(p,"type")) {
-		     Replace(Getattr(p,"type"),"typename ", "", DOH_REPLACE_ANY);
-		   }
-		   p = nextSibling(p);
-                 }
-               }
-    	       ;
-
-rawvalparms     : valparm valptail {
-                  set_nextSibling($1,$2);
-                  $$ = $1;
-		}
-               | empty { $$ = 0; }
-               ;
-
-valptail       : COMMA valparm valptail {
-                 set_nextSibling($2,$3);
-		 $$ = $2;
-                }
-               | empty { $$ = 0; }
-               ;
-
-
-valparm        : parm {
-		  $$ = $1;
-		  {
-		    /* We need to make a possible adjustment for integer parameters. */
-		    SwigType *type;
-		    Node     *n = 0;
-
-		    while (!n) {
-		      type = Getattr($1,"type");
-		      n = Swig_symbol_clookup(type,0);     /* See if we can find a node that matches the typename */
-		      if ((n) && (Strcmp(nodeType(n),"cdecl") == 0)) {
-			SwigType *decl = Getattr(n,"decl");
-			if (!SwigType_isfunction(decl)) {
-			  String *value = Getattr(n,"value");
-			  if (value) {
-			    String *v = Copy(value);
-			    Setattr($1,"type",v);
-			    Delete(v);
-			    n = 0;
-			  }
-			}
-		      } else {
-			break;
-		      }
-		    }
-		  }
-
-               }
-               | valexpr {
-                  $$ = NewParmWithoutFileLineInfo(0,0);
-                  Setfile($$,cparse_file);
-		  Setline($$,cparse_line);
-		  Setattr($$,"value",$1.val);
-               }
-               ;
-
-def_args       : EQUAL definetype { 
-                  $$ = $2; 
-		  if ($2.type == T_ERROR) {
-		    Swig_warning(WARN_PARSE_BAD_DEFAULT,cparse_file, cparse_line, "Can't set default argument (ignored)\n");
-		    $$.val = 0;
-		    $$.rawval = 0;
-		    $$.bitfield = 0;
-		    $$.throws = 0;
-		    $$.throwf = 0;
-		    $$.nexcept = 0;
-		  }
-               }
-               | EQUAL definetype LBRACKET expr RBRACKET { 
-		  $$ = $2;
-		  if ($2.type == T_ERROR) {
-		    Swig_warning(WARN_PARSE_BAD_DEFAULT,cparse_file, cparse_line, "Can't set default argument (ignored)\n");
-		    $$ = $2;
-		    $$.val = 0;
-		    $$.rawval = 0;
-		    $$.bitfield = 0;
-		    $$.throws = 0;
-		    $$.throwf = 0;
-		    $$.nexcept = 0;
-		  } else {
-		    $$.val = NewStringf("%s[%s]",$2.val,$4.val); 
-		  }		  
-               }
-               | EQUAL LBRACE {
-		 skip_balanced('{','}');
-		 $$.val = NewString(scanner_ccode);
-		 $$.rawval = 0;
-                 $$.type = T_INT;
-		 $$.bitfield = 0;
-		 $$.throws = 0;
-		 $$.throwf = 0;
-		 $$.nexcept = 0;
-	       }
-               | COLON expr { 
-		 $$.val = 0;
-		 $$.rawval = 0;
-		 $$.type = 0;
-		 $$.bitfield = $2.val;
-		 $$.throws = 0;
-		 $$.throwf = 0;
-		 $$.nexcept = 0;
-	       }
-               | empty {
-                 $$.val = 0;
-                 $$.rawval = 0;
-                 $$.type = T_INT;
-		 $$.bitfield = 0;
-		 $$.throws = 0;
-		 $$.throwf = 0;
-		 $$.nexcept = 0;
-               }
-               ;
-
-parameter_declarator : declarator def_args {
-                 $$ = $1;
-		 $$.defarg = $2.rawval ? $2.rawval : $2.val;
-            }
-            | abstract_declarator def_args {
-              $$ = $1;
-	      $$.defarg = $2.rawval ? $2.rawval : $2.val;
-            }
-            | def_args {
-   	      $$.type = 0;
-              $$.id = 0;
-	      $$.defarg = $1.rawval ? $1.rawval : $1.val;
-            }
-            ;
-
-plain_declarator : declarator {
-                 $$ = $1;
-		 if (SwigType_isfunction($1.type)) {
-		   Delete(SwigType_pop_function($1.type));
-		 } else if (SwigType_isarray($1.type)) {
-		   SwigType *ta = SwigType_pop_arrays($1.type);
-		   if (SwigType_isfunction($1.type)) {
-		     Delete(SwigType_pop_function($1.type));
-		   } else {
-		     $$.parms = 0;
-		   }
-		   SwigType_push($1.type,ta);
-		   Delete(ta);
-		 } else {
-		   $$.parms = 0;
-		 }
-            }
-            | abstract_declarator {
-              $$ = $1;
-	      if (SwigType_isfunction($1.type)) {
-		Delete(SwigType_pop_function($1.type));
-	      } else if (SwigType_isarray($1.type)) {
-		SwigType *ta = SwigType_pop_arrays($1.type);
-		if (SwigType_isfunction($1.type)) {
-		  Delete(SwigType_pop_function($1.type));
-		} else {
-		  $$.parms = 0;
-		}
-		SwigType_push($1.type,ta);
-		Delete(ta);
-	      } else {
-		$$.parms = 0;
-	      }
-            }
-            | empty {
-   	      $$.type = 0;
-              $$.id = 0;
-	      $$.parms = 0;
-	      }
-            ;
-
-
-declarator :  pointer notso_direct_declarator {
-              $$ = $2;
-	      if ($$.type) {
-		SwigType_push($1,$$.type);
-		Delete($$.type);
-	      }
-	      $$.type = $1;
-           }
-           | pointer AND notso_direct_declarator {
-              $$ = $3;
-	      SwigType_add_reference($1);
-              if ($$.type) {
-		SwigType_push($1,$$.type);
-		Delete($$.type);
-	      }
-	      $$.type = $1;
-           }
-           | pointer LAND notso_direct_declarator {
-              $$ = $3;
-	      SwigType_add_rvalue_reference($1);
-              if ($$.type) {
-		SwigType_push($1,$$.type);
-		Delete($$.type);
-	      }
-	      $$.type = $1;
-           }
-           | direct_declarator {
-              $$ = $1;
-	      if (!$$.type) $$.type = NewStringEmpty();
-           }
-           | AND notso_direct_declarator {
-	     $$ = $2;
-	     $$.type = NewStringEmpty();
-	     SwigType_add_reference($$.type);
-	     if ($2.type) {
-	       SwigType_push($$.type,$2.type);
-	       Delete($2.type);
-	     }
-           }
-           | LAND notso_direct_declarator {
-	     /* Introduced in C++11, move operator && */
-             /* Adds one S/R conflict */
-	     $$ = $2;
-	     $$.type = NewStringEmpty();
-	     SwigType_add_rvalue_reference($$.type);
-	     if ($2.type) {
-	       SwigType_push($$.type,$2.type);
-	       Delete($2.type);
-	     }
-           }
-           | idcolon DSTAR notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-
-	     $$ = $3;
-	     SwigType_add_memberpointer(t,$1);
-	     if ($$.type) {
-	       SwigType_push(t,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = t;
-	     } 
-           | pointer idcolon DSTAR notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-	     $$ = $4;
-	     SwigType_add_memberpointer(t,$2);
-	     SwigType_push($1,t);
-	     if ($$.type) {
-	       SwigType_push($1,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = $1;
-	     Delete(t);
-	   }
-           | pointer idcolon DSTAR AND notso_direct_declarator { 
-	     $$ = $5;
-	     SwigType_add_memberpointer($1,$2);
-	     SwigType_add_reference($1);
-	     if ($$.type) {
-	       SwigType_push($1,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = $1;
-	   }
-           | idcolon DSTAR AND notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-	     $$ = $4;
-	     SwigType_add_memberpointer(t,$1);
-	     SwigType_add_reference(t);
-	     if ($$.type) {
-	       SwigType_push(t,$$.type);
-	       Delete($$.type);
-	     } 
-	     $$.type = t;
-	   }
-           
-           /* Variadic versions eg. MyClasses&... myIds */
-           
-           |  pointer PERIOD PERIOD PERIOD notso_direct_declarator {
-              $$ = $5;
-	      if ($$.type) {
-		SwigType_push($1,$$.type);
-		Delete($$.type);
-	      }
-	      $$.type = $1;
-           }
-           | pointer AND PERIOD PERIOD PERIOD notso_direct_declarator {
-              $$ = $6;
-	      SwigType_add_reference($1);
-              if ($$.type) {
-		SwigType_push($1,$$.type);
-		Delete($$.type);
-	      }
-	      $$.type = $1;
-           }
-           | pointer LAND PERIOD PERIOD PERIOD notso_direct_declarator {
-              $$ = $6;
-	      SwigType_add_rvalue_reference($1);
-              if ($$.type) {
-		SwigType_push($1,$$.type);
-		Delete($$.type);
-	      }
-	      $$.type = $1;
-           }
-           | PERIOD PERIOD PERIOD direct_declarator {
-              $$ = $4;
-	      if (!$$.type) $$.type = NewStringEmpty();
-           }
-           | AND PERIOD PERIOD PERIOD notso_direct_declarator {
-	     $$ = $5;
-	     $$.type = NewStringEmpty();
-	     SwigType_add_reference($$.type);
-	     if ($5.type) {
-	       SwigType_push($$.type,$5.type);
-	       Delete($5.type);
-	     }
-           }
-           | LAND PERIOD PERIOD PERIOD notso_direct_declarator {
-	     /* Introduced in C++11, move operator && */
-             /* Adds one S/R conflict */
-	     $$ = $5;
-	     $$.type = NewStringEmpty();
-	     SwigType_add_rvalue_reference($$.type);
-	     if ($5.type) {
-	       SwigType_push($$.type,$5.type);
-	       Delete($5.type);
-	     }
-           }
-           | idcolon DSTAR PERIOD PERIOD PERIOD notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-
-	     $$ = $6;
-	     SwigType_add_memberpointer(t,$1);
-	     if ($$.type) {
-	       SwigType_push(t,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = t;
-	     } 
-           | pointer idcolon DSTAR PERIOD PERIOD PERIOD notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-	     $$ = $7;
-	     SwigType_add_memberpointer(t,$2);
-	     SwigType_push($1,t);
-	     if ($$.type) {
-	       SwigType_push($1,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = $1;
-	     Delete(t);
-	   }
-           | pointer idcolon DSTAR AND PERIOD PERIOD PERIOD notso_direct_declarator { 
-	     $$ = $8;
-	     SwigType_add_memberpointer($1,$2);
-	     SwigType_add_reference($1);
-	     if ($$.type) {
-	       SwigType_push($1,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = $1;
-	   }
-           | pointer idcolon DSTAR LAND PERIOD PERIOD PERIOD notso_direct_declarator { 
-	     $$ = $8;
-	     SwigType_add_memberpointer($1,$2);
-	     SwigType_add_rvalue_reference($1);
-	     if ($$.type) {
-	       SwigType_push($1,$$.type);
-	       Delete($$.type);
-	     }
-	     $$.type = $1;
-	   }
-           | idcolon DSTAR AND PERIOD PERIOD PERIOD notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-	     $$ = $7;
-	     SwigType_add_memberpointer(t,$1);
-	     SwigType_add_reference(t);
-	     if ($$.type) {
-	       SwigType_push(t,$$.type);
-	       Delete($$.type);
-	     } 
-	     $$.type = t;
-	   }
-           | idcolon DSTAR LAND PERIOD PERIOD PERIOD notso_direct_declarator { 
-	     SwigType *t = NewStringEmpty();
-	     $$ = $7;
-	     SwigType_add_memberpointer(t,$1);
-	     SwigType_add_rvalue_reference(t);
-	     if ($$.type) {
-	       SwigType_push(t,$$.type);
-	       Delete($$.type);
-	     } 
-	     $$.type = t;
-	   }
-           ;
-
-notso_direct_declarator : idcolon {
-                /* Note: This is non-standard C.  Template declarator is allowed to follow an identifier */
-                 $$.id = Char($1);
-		 $$.type = 0;
-		 $$.parms = 0;
-		 $$.have_parms = 0;
-                  }
-                  | NOT idcolon {
-                  $$.id = Char(NewStringf("~%s",$2));
-                  $$.type = 0;
-                  $$.parms = 0;
-                  $$.have_parms = 0;
-                  }
-
-/* This generates a shift-reduce conflict with constructors */
-                 | LPAREN idcolon RPAREN {
-                  $$.id = Char($2);
-                  $$.type = 0;
-                  $$.parms = 0;
-                  $$.have_parms = 0;
-                  }
-
-/*
-                  | LPAREN AND idcolon RPAREN {
-                     $$.id = Char($3);
-                     $$.type = 0;
-                     $$.parms = 0;
-                     $$.have_parms = 0;
-                  }
-*/
-/* Technically, this should be LPAREN declarator RPAREN, but we get reduce/reduce conflicts */
-                  | LPAREN pointer notso_direct_declarator RPAREN {
-		    $$ = $3;
-		    if ($$.type) {
-		      SwigType_push($2,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = $2;
-                  }
-                  | LPAREN idcolon DSTAR notso_direct_declarator RPAREN {
-		    SwigType *t;
-		    $$ = $4;
-		    t = NewStringEmpty();
-		    SwigType_add_memberpointer(t,$2);
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-		    }
-                  | notso_direct_declarator LBRACKET RBRACKET { 
-		    SwigType *t;
-		    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,"");
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-                  }
-                  | notso_direct_declarator LBRACKET expr RBRACKET { 
-		    SwigType *t;
-		    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,$3.val);
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-                  }
-                  | notso_direct_declarator LPAREN parms RPAREN {
-		    SwigType *t;
-                    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_function(t,$3);
-		    if (!$$.have_parms) {
-		      $$.parms = $3;
-		      $$.have_parms = 1;
-		    }
-		    if (!$$.type) {
-		      $$.type = t;
-		    } else {
-		      SwigType_push(t, $$.type);
-		      Delete($$.type);
-		      $$.type = t;
-		    }
-		  }
-                  ;
-
-direct_declarator : idcolon {
-                /* Note: This is non-standard C.  Template declarator is allowed to follow an identifier */
-                 $$.id = Char($1);
-		 $$.type = 0;
-		 $$.parms = 0;
-		 $$.have_parms = 0;
-                  }
-                  
-                  | NOT idcolon {
-                  $$.id = Char(NewStringf("~%s",$2));
-                  $$.type = 0;
-                  $$.parms = 0;
-                  $$.have_parms = 0;
-                  }
-
-/* This generate a shift-reduce conflict with constructors */
-/*
-                  | LPAREN idcolon RPAREN {
-                  $$.id = Char($2);
-                  $$.type = 0;
-                  $$.parms = 0;
-                  $$.have_parms = 0;
-                  }
-*/
-/* Technically, this should be LPAREN declarator RPAREN, but we get reduce/reduce conflicts */
-                  | LPAREN pointer direct_declarator RPAREN {
-		    $$ = $3;
-		    if ($$.type) {
-		      SwigType_push($2,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = $2;
-                  }
-                  | LPAREN AND direct_declarator RPAREN {
-                    $$ = $3;
-		    if (!$$.type) {
-		      $$.type = NewStringEmpty();
-		    }
-		    SwigType_add_reference($$.type);
-                  }
-                  | LPAREN LAND direct_declarator RPAREN {
-                    $$ = $3;
-		    if (!$$.type) {
-		      $$.type = NewStringEmpty();
-		    }
-		    SwigType_add_rvalue_reference($$.type);
-                  }
-                  | LPAREN idcolon DSTAR direct_declarator RPAREN {
-		    SwigType *t;
-		    $$ = $4;
-		    t = NewStringEmpty();
-		    SwigType_add_memberpointer(t,$2);
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-		    }
-                  | direct_declarator LBRACKET RBRACKET { 
-		    SwigType *t;
-		    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,"");
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-                  }
-                  | direct_declarator LBRACKET expr RBRACKET { 
-		    SwigType *t;
-		    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,$3.val);
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-                  }
-                  | direct_declarator LPAREN parms RPAREN {
-		    SwigType *t;
-                    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_function(t,$3);
-		    if (!$$.have_parms) {
-		      $$.parms = $3;
-		      $$.have_parms = 1;
-		    }
-		    if (!$$.type) {
-		      $$.type = t;
-		    } else {
-		      SwigType_push(t, $$.type);
-		      Delete($$.type);
-		      $$.type = t;
-		    }
-                 }
-                 /* User-defined string literals. eg.
-                    int operator"" _mySuffix(const char* val, int length) {...} */
-		 /* This produces one S/R conflict. */
-                 | OPERATOR ID LPAREN parms RPAREN {
-		    SwigType *t;
-                    Append($1, " "); /* intervening space is mandatory */
-                    Append($1, Char($2));
-		    $$.id = Char($1);
-		    t = NewStringEmpty();
-		    SwigType_add_function(t,$4);
-		    if (!$$.have_parms) {
-		      $$.parms = $4;
-		      $$.have_parms = 1;
-		    }
-		    if (!$$.type) {
-		      $$.type = t;
-		    } else {
-		      SwigType_push(t, $$.type);
-		      Delete($$.type);
-		      $$.type = t;
-		    }
-		  }
-                  ;
-
-abstract_declarator : pointer {
-		    $$.type = $1;
-                    $$.id = 0;
-		    $$.parms = 0;
-		    $$.have_parms = 0;
-                  }
-                  | pointer direct_abstract_declarator { 
-                     $$ = $2;
-                     SwigType_push($1,$2.type);
-		     $$.type = $1;
-		     Delete($2.type);
-                  }
-                  | pointer AND {
-		    $$.type = $1;
-		    SwigType_add_reference($$.type);
-		    $$.id = 0;
-		    $$.parms = 0;
-		    $$.have_parms = 0;
-		  }
-                  | pointer LAND {
-		    $$.type = $1;
-		    SwigType_add_rvalue_reference($$.type);
-		    $$.id = 0;
-		    $$.parms = 0;
-		    $$.have_parms = 0;
-		  }
-                  | pointer AND direct_abstract_declarator {
-		    $$ = $3;
-		    SwigType_add_reference($1);
-		    if ($$.type) {
-		      SwigType_push($1,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = $1;
-                  }
-                  | pointer LAND direct_abstract_declarator {
-		    $$ = $3;
-		    SwigType_add_rvalue_reference($1);
-		    if ($$.type) {
-		      SwigType_push($1,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = $1;
-                  }
-                  | direct_abstract_declarator {
-		    $$ = $1;
-                  }
-                  | AND direct_abstract_declarator {
-		    $$ = $2;
-		    $$.type = NewStringEmpty();
-		    SwigType_add_reference($$.type);
-		    if ($2.type) {
-		      SwigType_push($$.type,$2.type);
-		      Delete($2.type);
-		    }
-                  }
-                  | LAND direct_abstract_declarator {
-		    $$ = $2;
-		    $$.type = NewStringEmpty();
-		    SwigType_add_rvalue_reference($$.type);
-		    if ($2.type) {
-		      SwigType_push($$.type,$2.type);
-		      Delete($2.type);
-		    }
-                  }
-                  | AND {
-                    $$.id = 0;
-                    $$.parms = 0;
-		    $$.have_parms = 0;
-                    $$.type = NewStringEmpty();
-		    SwigType_add_reference($$.type);
-                  }
-                  | LAND {
-                    $$.id = 0;
-                    $$.parms = 0;
-		    $$.have_parms = 0;
-                    $$.type = NewStringEmpty();
-		    SwigType_add_rvalue_reference($$.type);
-                  }
-                  | idcolon DSTAR { 
-		    $$.type = NewStringEmpty();
-                    SwigType_add_memberpointer($$.type,$1);
-                    $$.id = 0;
-                    $$.parms = 0;
-		    $$.have_parms = 0;
-      	          }
-                  | pointer idcolon DSTAR { 
-		    SwigType *t = NewStringEmpty();
-                    $$.type = $1;
-		    $$.id = 0;
-		    $$.parms = 0;
-		    $$.have_parms = 0;
-		    SwigType_add_memberpointer(t,$2);
-		    SwigType_push($$.type,t);
-		    Delete(t);
-                  }
-                  | pointer idcolon DSTAR direct_abstract_declarator { 
-		    $$ = $4;
-		    SwigType_add_memberpointer($1,$2);
-		    if ($$.type) {
-		      SwigType_push($1,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = $1;
-                  }
-                  ;
-
-direct_abstract_declarator : direct_abstract_declarator LBRACKET RBRACKET { 
-		    SwigType *t;
-		    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,"");
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-                  }
-                  | direct_abstract_declarator LBRACKET expr RBRACKET { 
-		    SwigType *t;
-		    $$ = $1;
-		    t = NewStringEmpty();
-		    SwigType_add_array(t,$3.val);
-		    if ($$.type) {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		    }
-		    $$.type = t;
-                  }
-                  | LBRACKET RBRACKET { 
-		    $$.type = NewStringEmpty();
-		    $$.id = 0;
-		    $$.parms = 0;
-		    $$.have_parms = 0;
-		    SwigType_add_array($$.type,"");
-                  }
-                  | LBRACKET expr RBRACKET { 
-		    $$.type = NewStringEmpty();
-		    $$.id = 0;
-		    $$.parms = 0;
-		    $$.have_parms = 0;
-		    SwigType_add_array($$.type,$2.val);
-		  }
-                  | LPAREN abstract_declarator RPAREN {
-                    $$ = $2;
-		  }
-                  | direct_abstract_declarator LPAREN parms RPAREN {
-		    SwigType *t;
-                    $$ = $1;
-		    t = NewStringEmpty();
-                    SwigType_add_function(t,$3);
-		    if (!$$.type) {
-		      $$.type = t;
-		    } else {
-		      SwigType_push(t,$$.type);
-		      Delete($$.type);
-		      $$.type = t;
-		    }
-		    if (!$$.have_parms) {
-		      $$.parms = $3;
-		      $$.have_parms = 1;
-		    }
-		  }
-                  | LPAREN parms RPAREN {
-                    $$.type = NewStringEmpty();
-                    SwigType_add_function($$.type,$2);
-		    $$.parms = $2;
-		    $$.have_parms = 1;
-		    $$.id = 0;
-                  }
-                  ;
-
-
-pointer    : STAR type_qualifier pointer { 
-             $$ = NewStringEmpty();
-             SwigType_add_pointer($$);
-	     SwigType_push($$,$2);
-	     SwigType_push($$,$3);
-	     Delete($3);
-           }
-           | STAR pointer {
-	     $$ = NewStringEmpty();
-	     SwigType_add_pointer($$);
-	     SwigType_push($$,$2);
-	     Delete($2);
-	   } 
-           | STAR type_qualifier { 
-	     $$ = NewStringEmpty();
-	     SwigType_add_pointer($$);
-	     SwigType_push($$,$2);
-           }
-           | STAR {
-	     $$ = NewStringEmpty();
-	     SwigType_add_pointer($$);
-           }
-           ;
-
-type_qualifier : type_qualifier_raw {
-	          $$ = NewStringEmpty();
-	          if ($1) SwigType_add_qualifier($$,$1);
-               }
-               | type_qualifier_raw type_qualifier {
-		  $$ = $2;
-	          if ($1) SwigType_add_qualifier($$,$1);
-               }
-               ;
-
-type_qualifier_raw :  CONST_QUAL { $$ = "const"; }
-                   |  VOLATILE { $$ = "volatile"; }
-                   |  REGISTER { $$ = 0; }
-                   ;
-
-/* Data type must be a built in type or an identifier for user-defined types
-   This type can be preceded by a modifier. */
-
-type            : rawtype {
-                   $$ = $1;
-                   Replace($$,"typename ","", DOH_REPLACE_ANY);
-                }
-                ;
-
-rawtype        : type_qualifier type_right {
-                   $$ = $2;
-	           SwigType_push($$,$1);
-               }
-               | type_right { $$ = $1; }
-               | type_right type_qualifier {
-		  $$ = $1;
-	          SwigType_push($$,$2);
-	       }
-               | type_qualifier type_right type_qualifier {
-		  $$ = $2;
-	          SwigType_push($$,$3);
-	          SwigType_push($$,$1);
-	       }
-               ;
-
-type_right     : primitive_type { $$ = $1;
-                  /* Printf(stdout,"primitive = '%s'\n", $$);*/
-               }
-               | TYPE_BOOL { $$ = $1; }
-               | TYPE_VOID { $$ = $1; }
-/*
-               | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
-*/
-               | c_enum_key idcolon { $$ = NewStringf("enum %s", $2); }
-               | TYPE_RAW { $$ = $1; }
-
-               | idcolon {
-		  $$ = $1;
-               }
-               | cpptype idcolon { 
-		 $$ = NewStringf("%s %s", $1, $2);
-               }
-               | decltype {
-                 $$ = $1;
-               }
-               ;
-
-decltype       : DECLTYPE LPAREN idcolon RPAREN {
-                 Node *n = Swig_symbol_clookup($3,0);
-                 if (!n) {
-		   Swig_error(cparse_file, cparse_line, "Identifier %s not defined.\n", $3);
-                   $$ = $3;
-                 } else {
-                   $$ = Getattr(n, "type");
-                 }
-               }
-               ;
-
-primitive_type : primitive_type_list {
-		 if (!$1.type) $1.type = NewString("int");
-		 if ($1.us) {
-		   $$ = NewStringf("%s %s", $1.us, $1.type);
-		   Delete($1.us);
-                   Delete($1.type);
-		 } else {
-                   $$ = $1.type;
-		 }
-		 if (Cmp($$,"signed int") == 0) {
-		   Delete($$);
-		   $$ = NewString("int");
-                 } else if (Cmp($$,"signed long") == 0) {
-		   Delete($$);
-                   $$ = NewString("long");
-                 } else if (Cmp($$,"signed short") == 0) {
-		   Delete($$);
-		   $$ = NewString("short");
-		 } else if (Cmp($$,"signed long long") == 0) {
-		   Delete($$);
-		   $$ = NewString("long long");
-		 }
-               }
-               ;
-
-primitive_type_list : type_specifier { 
-                 $$ = $1;
-               }
-               | type_specifier primitive_type_list {
-                    if ($1.us && $2.us) {
-		      Swig_error(cparse_file, cparse_line, "Extra %s specifier.\n", $2.us);
-		    }
-                    $$ = $2;
-                    if ($1.us) $$.us = $1.us;
-		    if ($1.type) {
-		      if (!$2.type) $$.type = $1.type;
-		      else {
-			int err = 0;
-			if ((Cmp($1.type,"long") == 0)) {
-			  if ((Cmp($2.type,"long") == 0) || (Strncmp($2.type,"double",6) == 0)) {
-			    $$.type = NewStringf("long %s", $2.type);
-			  } else if (Cmp($2.type,"int") == 0) {
-			    $$.type = $1.type;
-			  } else {
-			    err = 1;
-			  }
-			} else if ((Cmp($1.type,"short")) == 0) {
-			  if (Cmp($2.type,"int") == 0) {
-			    $$.type = $1.type;
-			  } else {
-			    err = 1;
-			  }
-			} else if (Cmp($1.type,"int") == 0) {
-			  $$.type = $2.type;
-			} else if (Cmp($1.type,"double") == 0) {
-			  if (Cmp($2.type,"long") == 0) {
-			    $$.type = NewString("long double");
-			  } else if (Cmp($2.type,"complex") == 0) {
-			    $$.type = NewString("double complex");
-			  } else {
-			    err = 1;
-			  }
-			} else if (Cmp($1.type,"float") == 0) {
-			  if (Cmp($2.type,"complex") == 0) {
-			    $$.type = NewString("float complex");
-			  } else {
-			    err = 1;
-			  }
-			} else if (Cmp($1.type,"complex") == 0) {
-			  $$.type = NewStringf("%s complex", $2.type);
-			} else {
-			  err = 1;
-			}
-			if (err) {
-			  Swig_error(cparse_file, cparse_line, "Extra %s specifier.\n", $1.type);
-			}
-		      }
-		    }
-               }
-               ; 
-
-
-type_specifier : TYPE_INT { 
-		    $$.type = NewString("int");
-                    $$.us = 0;
-               }
-               | TYPE_SHORT { 
-                    $$.type = NewString("short");
-                    $$.us = 0;
-                }
-               | TYPE_LONG { 
-                    $$.type = NewString("long");
-                    $$.us = 0;
-                }
-               | TYPE_CHAR { 
-                    $$.type = NewString("char");
-                    $$.us = 0;
-                }
-               | TYPE_WCHAR { 
-                    $$.type = NewString("wchar_t");
-                    $$.us = 0;
-                }
-               | TYPE_FLOAT { 
-                    $$.type = NewString("float");
-                    $$.us = 0;
-                }
-               | TYPE_DOUBLE { 
-                    $$.type = NewString("double");
-                    $$.us = 0;
-                }
-               | TYPE_SIGNED { 
-                    $$.us = NewString("signed");
-                    $$.type = 0;
-                }
-               | TYPE_UNSIGNED { 
-                    $$.us = NewString("unsigned");
-                    $$.type = 0;
-                }
-               | TYPE_COMPLEX { 
-                    $$.type = NewString("complex");
-                    $$.us = 0;
-                }
-               | TYPE_NON_ISO_INT8 { 
-                    $$.type = NewString("__int8");
-                    $$.us = 0;
-                }
-               | TYPE_NON_ISO_INT16 { 
-                    $$.type = NewString("__int16");
-                    $$.us = 0;
-                }
-               | TYPE_NON_ISO_INT32 { 
-                    $$.type = NewString("__int32");
-                    $$.us = 0;
-                }
-               | TYPE_NON_ISO_INT64 { 
-                    $$.type = NewString("__int64");
-                    $$.us = 0;
-                }
-               ;
-
-definetype     : { /* scanner_check_typedef(); */ } expr {
-                   $$ = $2;
-		   if ($$.type == T_STRING) {
-		     $$.rawval = NewStringf("\"%(escape)s\"",$$.val);
-		   } else if ($$.type != T_CHAR && $$.type != T_WSTRING && $$.type != T_WCHAR) {
-		     $$.rawval = NewStringf("%s", $$.val);
-		   }
-		   $$.qualifier = 0;
-		   $$.bitfield = 0;
-		   $$.throws = 0;
-		   $$.throwf = 0;
-		   $$.nexcept = 0;
-		   scanner_ignore_typedef();
-                }
-                | default_delete {
-		  $$ = $1;
-		}
-                ;
-
-default_delete : deleted_definition {
-		  $$ = $1;
-		}
-                | explicit_default {
-		  $$ = $1;
-		}
-		;
-
-/* For C++ deleted definition '= delete' */
-deleted_definition : DELETE_KW {
-		  $$.val = NewString("delete");
-		  $$.rawval = 0;
-		  $$.type = T_STRING;
-		  $$.qualifier = 0;
-		  $$.bitfield = 0;
-		  $$.throws = 0;
-		  $$.throwf = 0;
-		  $$.nexcept = 0;
-		}
-		;
-
-/* For C++ explicitly defaulted functions '= default' */
-explicit_default : DEFAULT {
-		  $$.val = NewString("default");
-		  $$.rawval = 0;
-		  $$.type = T_STRING;
-		  $$.qualifier = 0;
-		  $$.bitfield = 0;
-		  $$.throws = 0;
-		  $$.throwf = 0;
-		  $$.nexcept = 0;
-		}
-		;
-
-/* Some stuff for handling enums */
-
-ename          :  identifier { $$ = $1; }
-	       |  empty { $$ = (char *) 0;}
-	       ;
-
-optional_constant_directive : constant_directive { $$ = $1; }
-		           | empty { $$ = 0; }
-		           ;
-
-/* Enum lists - any #define macros (constant directives) within the enum list are ignored. Trailing commas accepted. */
-enumlist       :  enumlist COMMA optional_constant_directive edecl optional_constant_directive {
-		 Node *leftSibling = Getattr($1,"_last");
-		 set_nextSibling(leftSibling,$4);
-		 Setattr($1,"_last",$4);
-		 $$ = $1;
-	       }
-	       | enumlist COMMA optional_constant_directive {
-		 $$ = $1;
-	       }
-	       | optional_constant_directive edecl optional_constant_directive {
-		 Setattr($2,"_last",$2);
-		 $$ = $2;
-	       }
-	       | optional_constant_directive {
-		 $$ = 0;
-	       }
-	       ;
-
-edecl          :  identifier {
-		   SwigType *type = NewSwigType(T_INT);
-		   $$ = new_node("enumitem");
-		   Setattr($$,"name",$1);
-		   Setattr($$,"type",type);
-		   SetFlag($$,"feature:immutable");
-		   Delete(type);
-		 }
-                 | identifier EQUAL etype {
-		   SwigType *type = NewSwigType($3.type == T_BOOL ? T_BOOL : ($3.type == T_CHAR ? T_CHAR : T_INT));
-		   $$ = new_node("enumitem");
-		   Setattr($$,"name",$1);
-		   Setattr($$,"type",type);
-		   SetFlag($$,"feature:immutable");
-		   Setattr($$,"enumvalue", $3.val);
-		   Setattr($$,"value",$1);
-		   Delete(type);
-                 }
-                 ;
-
-etype            : expr {
-                   $$ = $1;
-		   if (($$.type != T_INT) && ($$.type != T_UINT) &&
-		       ($$.type != T_LONG) && ($$.type != T_ULONG) &&
-		       ($$.type != T_LONGLONG) && ($$.type != T_ULONGLONG) &&
-		       ($$.type != T_SHORT) && ($$.type != T_USHORT) &&
-		       ($$.type != T_SCHAR) && ($$.type != T_UCHAR) &&
-		       ($$.type != T_CHAR) && ($$.type != T_BOOL)) {
-		     Swig_error(cparse_file,cparse_line,"Type error. Expecting an integral type\n");
-		   }
-                }
-               ;
-
-/* Arithmetic expressions.  Used for constants, C++ templates, and other cool stuff. */
-
-expr           : valexpr { $$ = $1; }
-               | type {
-		 Node *n;
-		 $$.val = $1;
-		 $$.type = T_INT;
-		 /* Check if value is in scope */
-		 n = Swig_symbol_clookup($1,0);
-		 if (n) {
-                   /* A band-aid for enum values used in expressions. */
-                   if (Strcmp(nodeType(n),"enumitem") == 0) {
-                     String *q = Swig_symbol_qualified(n);
-                     if (q) {
-                       $$.val = NewStringf("%s::%s", q, Getattr(n,"name"));
-                       Delete(q);
-                     }
-                   }
-		 }
-               }
-	       ;
-
-valexpr        : exprnum { $$ = $1; }
-               | string {
-		    $$.val = $1;
-                    $$.type = T_STRING;
-               }
-               | SIZEOF LPAREN type parameter_declarator RPAREN {
-		  SwigType_push($3,$4.type);
-		  $$.val = NewStringf("sizeof(%s)",SwigType_str($3,0));
-		  $$.type = T_ULONG;
-               }
-               | SIZEOF PERIOD PERIOD PERIOD LPAREN type parameter_declarator RPAREN {
-		  SwigType_push($6,$7.type);
-		  $$.val = NewStringf("sizeof...(%s)",SwigType_str($6,0));
-		  $$.type = T_ULONG;
-               }
-               | exprcompound { $$ = $1; }
-	       | wstring {
-		    $$.val = $1;
-		    $$.rawval = NewStringf("L\"%s\"", $$.val);
-                    $$.type = T_WSTRING;
-	       }
-               | CHARCONST {
-		  $$.val = NewString($1);
-		  if (Len($$.val)) {
-		    $$.rawval = NewStringf("'%(escape)s'", $$.val);
-		  } else {
-		    $$.rawval = NewString("'\\0'");
-		  }
-		  $$.type = T_CHAR;
-		  $$.bitfield = 0;
-		  $$.throws = 0;
-		  $$.throwf = 0;
-		  $$.nexcept = 0;
-	       }
-               | WCHARCONST {
-		  $$.val = NewString($1);
-		  if (Len($$.val)) {
-		    $$.rawval = NewStringf("L\'%s\'", $$.val);
-		  } else {
-		    $$.rawval = NewString("L'\\0'");
-		  }
-		  $$.type = T_WCHAR;
-		  $$.bitfield = 0;
-		  $$.throws = 0;
-		  $$.throwf = 0;
-		  $$.nexcept = 0;
-	       }
-
-/* grouping */
-               |  LPAREN expr RPAREN %prec CAST {
-   	            $$.val = NewStringf("(%s)",$2.val);
-		    $$.type = $2.type;
-   	       }
-
-/* A few common casting operations */
-
-               | LPAREN expr RPAREN expr %prec CAST {
-                 $$ = $4;
-		 if ($4.type != T_STRING) {
-		   switch ($2.type) {
-		     case T_FLOAT:
-		     case T_DOUBLE:
-		     case T_LONGDOUBLE:
-		     case T_FLTCPLX:
-		     case T_DBLCPLX:
-		       $$.val = NewStringf("(%s)%s", $2.val, $4.val); /* SwigType_str and decimal points don't mix! */
-		       break;
-		     default:
-		       $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $4.val);
-		       break;
-		   }
-		 }
- 	       }
-               | LPAREN expr pointer RPAREN expr %prec CAST {
-                 $$ = $5;
-		 if ($5.type != T_STRING) {
-		   SwigType_push($2.val,$3);
-		   $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $5.val);
-		 }
- 	       }
-               | LPAREN expr AND RPAREN expr %prec CAST {
-                 $$ = $5;
-		 if ($5.type != T_STRING) {
-		   SwigType_add_reference($2.val);
-		   $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $5.val);
-		 }
- 	       }
-               | LPAREN expr LAND RPAREN expr %prec CAST {
-                 $$ = $5;
-		 if ($5.type != T_STRING) {
-		   SwigType_add_rvalue_reference($2.val);
-		   $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $5.val);
-		 }
- 	       }
-               | LPAREN expr pointer AND RPAREN expr %prec CAST {
-                 $$ = $6;
-		 if ($6.type != T_STRING) {
-		   SwigType_push($2.val,$3);
-		   SwigType_add_reference($2.val);
-		   $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $6.val);
-		 }
- 	       }
-               | LPAREN expr pointer LAND RPAREN expr %prec CAST {
-                 $$ = $6;
-		 if ($6.type != T_STRING) {
-		   SwigType_push($2.val,$3);
-		   SwigType_add_rvalue_reference($2.val);
-		   $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $6.val);
-		 }
- 	       }
-               | AND expr {
-		 $$ = $2;
-                 $$.val = NewStringf("&%s",$2.val);
-	       }
-               | LAND expr {
-		 $$ = $2;
-                 $$.val = NewStringf("&&%s",$2.val);
-	       }
-               | STAR expr {
-		 $$ = $2;
-                 $$.val = NewStringf("*%s",$2.val);
-	       }
-               ;
-
-exprnum        :  NUM_INT { $$ = $1; }
-               |  NUM_FLOAT { $$ = $1; }
-               |  NUM_UNSIGNED { $$ = $1; }
-               |  NUM_LONG { $$ = $1; }
-               |  NUM_ULONG { $$ = $1; }
-               |  NUM_LONGLONG { $$ = $1; }
-               |  NUM_ULONGLONG { $$ = $1; }
-               |  NUM_BOOL { $$ = $1; }
-               ;
-
-exprcompound   : expr PLUS expr {
-		 $$.val = NewStringf("%s+%s", COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr MINUS expr {
-		 $$.val = NewStringf("%s-%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr STAR expr {
-		 $$.val = NewStringf("%s*%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr SLASH expr {
-		 $$.val = NewStringf("%s/%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr MODULO expr {
-		 $$.val = NewStringf("%s%%%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr AND expr {
-		 $$.val = NewStringf("%s&%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr OR expr {
-		 $$.val = NewStringf("%s|%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr XOR expr {
-		 $$.val = NewStringf("%s^%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote($1.type,$3.type);
-	       }
-               | expr LSHIFT expr {
-		 $$.val = NewStringf("%s << %s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote_type($1.type);
-	       }
-               | expr RSHIFT expr {
-		 $$.val = NewStringf("%s >> %s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = promote_type($1.type);
-	       }
-               | expr LAND expr {
-		 $$.val = NewStringf("%s&&%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-               | expr LOR expr {
-		 $$.val = NewStringf("%s||%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-               | expr EQUALTO expr {
-		 $$.val = NewStringf("%s==%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-               | expr NOTEQUALTO expr {
-		 $$.val = NewStringf("%s!=%s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-/* Sadly this causes 2 reduce-reduce conflicts with templates.  FIXME resolve these.
-               | expr GREATERTHAN expr {
-		 $$.val = NewStringf("%s > %s", COMPOUND_EXPR_VAL($1), COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-               | expr LESSTHAN expr {
-		 $$.val = NewStringf("%s < %s", COMPOUND_EXPR_VAL($1), COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-*/
-               | expr GREATERTHANOREQUALTO expr {
-		 $$.val = NewStringf("%s >= %s", COMPOUND_EXPR_VAL($1), COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-               | expr LESSTHANOREQUALTO expr {
-		 $$.val = NewStringf("%s <= %s", COMPOUND_EXPR_VAL($1), COMPOUND_EXPR_VAL($3));
-		 $$.type = cparse_cplusplus ? T_BOOL : T_INT;
-	       }
-	       | expr QUESTIONMARK expr COLON expr %prec QUESTIONMARK {
-		 $$.val = NewStringf("%s?%s:%s", COMPOUND_EXPR_VAL($1), COMPOUND_EXPR_VAL($3), COMPOUND_EXPR_VAL($5));
-		 /* This may not be exactly right, but is probably good enough
-		  * for the purposes of parsing constant expressions. */
-		 $$.type = promote($3.type, $5.type);
-	       }
-               | MINUS expr %prec UMINUS {
-		 $$.val = NewStringf("-%s",$2.val);
-		 $$.type = $2.type;
-	       }
-               | PLUS expr %prec UMINUS {
-                 $$.val = NewStringf("+%s",$2.val);
-		 $$.type = $2.type;
-	       }
-               | NOT expr {
-		 $$.val = NewStringf("~%s",$2.val);
-		 $$.type = $2.type;
-	       }
-               | LNOT expr {
-                 $$.val = NewStringf("!%s",COMPOUND_EXPR_VAL($2));
-		 $$.type = T_INT;
-	       }
-               | type LPAREN {
-		 String *qty;
-                 skip_balanced('(',')');
-		 qty = Swig_symbol_type_qualify($1,0);
-		 if (SwigType_istemplate(qty)) {
-		   String *nstr = SwigType_namestr(qty);
-		   Delete(qty);
-		   qty = nstr;
-		 }
-		 $$.val = NewStringf("%s%s",qty,scanner_ccode);
-		 Clear(scanner_ccode);
-		 $$.type = T_INT;
-		 Delete(qty);
-               }
-               ;
-
-ellipsis      : PERIOD PERIOD PERIOD {
-	        $$ = NewString("...");
-	      }
-	      ;
-
-variadic      : ellipsis {
-	        $$ = $1;
-	      }
-	      | empty {
-	        $$ = 0;
-	      }
-	      ;
-
-inherit        : raw_inherit {
-		 $$ = $1;
-               }
-               ;
-
-raw_inherit     : COLON { inherit_list = 1; } base_list { $$ = $3; inherit_list = 0; }
-                | empty { $$ = 0; }
-                ;
-
-base_list      : base_specifier {
-		   Hash *list = NewHash();
-		   Node *base = $1;
-		   Node *name = Getattr(base,"name");
-		   List *lpublic = NewList();
-		   List *lprotected = NewList();
-		   List *lprivate = NewList();
-		   Setattr(list,"public",lpublic);
-		   Setattr(list,"protected",lprotected);
-		   Setattr(list,"private",lprivate);
-		   Delete(lpublic);
-		   Delete(lprotected);
-		   Delete(lprivate);
-		   Append(Getattr(list,Getattr(base,"access")),name);
-	           $$ = list;
-               }
-
-               | base_list COMMA base_specifier {
-		   Hash *list = $1;
-		   Node *base = $3;
-		   Node *name = Getattr(base,"name");
-		   Append(Getattr(list,Getattr(base,"access")),name);
-                   $$ = list;
-               }
-               ;
-
-base_specifier : opt_virtual {
-		 $<intvalue>$ = cparse_line;
-	       } idcolon variadic {
-		 $$ = NewHash();
-		 Setfile($$,cparse_file);
-		 Setline($$,$<intvalue>2);
-		 Setattr($$,"name",$3);
-		 Setfile($3,cparse_file);
-		 Setline($3,$<intvalue>2);
-                 if (last_cpptype && (Strcmp(last_cpptype,"struct") != 0)) {
-		   Setattr($$,"access","private");
-		   Swig_warning(WARN_PARSE_NO_ACCESS, Getfile($$), Getline($$), "No access specifier given for base class '%s' (ignored).\n", SwigType_namestr($3));
-                 } else {
-		   Setattr($$,"access","public");
-		 }
-		 if ($4)
-		   SetFlag($$, "variadic");
-               }
-	       | opt_virtual access_specifier {
-		 $<intvalue>$ = cparse_line;
-	       } opt_virtual idcolon variadic {
-		 $$ = NewHash();
-		 Setfile($$,cparse_file);
-		 Setline($$,$<intvalue>3);
-		 Setattr($$,"name",$5);
-		 Setfile($5,cparse_file);
-		 Setline($5,$<intvalue>3);
-		 Setattr($$,"access",$2);
-	         if (Strcmp($2,"public") != 0) {
-		   Swig_warning(WARN_PARSE_PRIVATE_INHERIT, Getfile($$), Getline($$), "%s inheritance from base '%s' (ignored).\n", $2, SwigType_namestr($5));
-		 }
-		 if ($6)
-		   SetFlag($$, "variadic");
-               }
-               ;
-
-access_specifier :  PUBLIC { $$ = (char*)"public"; }
-               | PRIVATE { $$ = (char*)"private"; }
-               | PROTECTED { $$ = (char*)"protected"; }
-               ;
-
-templcpptype   : CLASS { 
-                   $$ = (char*)"class"; 
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               | TYPENAME { 
-                   $$ = (char *)"typename"; 
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               | CLASS PERIOD PERIOD PERIOD { 
-                   $$ = (char *)"class..."; 
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               | TYPENAME PERIOD PERIOD PERIOD { 
-                   $$ = (char *)"typename..."; 
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               ;
-
-cpptype        : templcpptype {
-                 $$ = $1;
-               }
-               | STRUCT { 
-                   $$ = (char*)"struct"; 
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               | UNION {
-                   $$ = (char*)"union"; 
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               ;
-
-classkey       : CLASS {
-                   $$ = (char*)"class";
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               | STRUCT {
-                   $$ = (char*)"struct";
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               | UNION {
-                   $$ = (char*)"union";
-		   if (!inherit_list) last_cpptype = $$;
-               }
-               ;
-
-classkeyopt    : classkey {
-		   $$ = $1;
-               }
-               | empty {
-		   $$ = 0;
-               }
-               ;
-
-opt_virtual    : VIRTUAL
-               | empty
-               ;
-
-virt_specifier_seq : OVERRIDE {
-                   $$ = 0;
-	       }
-	       | FINAL {
-                   $$ = 0;
-	       }
-	       | FINAL OVERRIDE {
-                   $$ = 0;
-	       }
-	       | OVERRIDE FINAL {
-                   $$ = 0;
-	       }
-               ;
-
-exception_specification : THROW LPAREN parms RPAREN {
-                    $$.throws = $3;
-                    $$.throwf = NewString("1");
-                    $$.nexcept = 0;
-	       }
-	       | NOEXCEPT {
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = NewString("true");
-	       }
-	       | virt_specifier_seq {
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = 0;
-	       }
-	       | NOEXCEPT virt_specifier_seq {
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = NewString("true");
-	       }
-	       | NOEXCEPT LPAREN expr RPAREN {
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = $3.val;
-	       }
-	       ;	
-
-cpp_const      : type_qualifier {
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = 0;
-                    $$.qualifier = $1;
-               }
-               | exception_specification {
-		    $$ = $1;
-                    $$.qualifier = 0;
-               }
-               | type_qualifier exception_specification {
-		    $$ = $2;
-                    $$.qualifier = $1;
-               }
-               | empty { 
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = 0;
-                    $$.qualifier = 0; 
-               }
-               ;
-
-ctor_end       : cpp_const ctor_initializer SEMI { 
-                    Clear(scanner_ccode); 
-                    $$.have_parms = 0; 
-                    $$.defarg = 0; 
-		    $$.throws = $1.throws;
-		    $$.throwf = $1.throwf;
-		    $$.nexcept = $1.nexcept;
-               }
-               | cpp_const ctor_initializer LBRACE { 
-                    skip_balanced('{','}'); 
-                    $$.have_parms = 0; 
-                    $$.defarg = 0; 
-                    $$.throws = $1.throws;
-                    $$.throwf = $1.throwf;
-                    $$.nexcept = $1.nexcept;
-               }
-               | LPAREN parms RPAREN SEMI { 
-                    Clear(scanner_ccode); 
-                    $$.parms = $2; 
-                    $$.have_parms = 1; 
-                    $$.defarg = 0; 
-		    $$.throws = 0;
-		    $$.throwf = 0;
-		    $$.nexcept = 0;
-               }
-               | LPAREN parms RPAREN LBRACE {
-                    skip_balanced('{','}'); 
-                    $$.parms = $2; 
-                    $$.have_parms = 1; 
-                    $$.defarg = 0; 
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = 0;
-               }
-               | EQUAL definetype SEMI { 
-                    $$.have_parms = 0; 
-                    $$.defarg = $2.val; 
-                    $$.throws = 0;
-                    $$.throwf = 0;
-                    $$.nexcept = 0;
-               }
-               | exception_specification EQUAL default_delete SEMI {
-                    $$.have_parms = 0;
-                    $$.defarg = $3.val;
-                    $$.throws = $1.throws;
-                    $$.throwf = $1.throwf;
-                    $$.nexcept = $1.nexcept;
-               }
-               ;
-
-ctor_initializer : COLON mem_initializer_list
-               | empty
-               ;
-
-mem_initializer_list : mem_initializer
-               | mem_initializer_list COMMA mem_initializer
-               | mem_initializer PERIOD PERIOD PERIOD
-               | mem_initializer_list COMMA mem_initializer PERIOD PERIOD PERIOD
-               ;
-
-mem_initializer : idcolon LPAREN {
-		  skip_balanced('(',')');
-		  Clear(scanner_ccode);
-		}
-                /* Uniform initialization in C++11.
-		   Example:
-                   struct MyStruct {
-                     MyStruct(int x, double y) : x_{x}, y_{y} {}
-                     int x_;
-                     double y_;
-                   };
-                */
-                | idcolon LBRACE {
-		  skip_balanced('{','}');
-		  Clear(scanner_ccode);
-		}
-                ;
-
-less_valparms_greater : LESSTHAN valparms GREATERTHAN {
-                     String *s = NewStringEmpty();
-                     SwigType_add_template(s,$2);
-                     $$ = Char(s);
-		     scanner_last_id(1);
-                }
-		;
-
-/* Identifiers including the C++11 identifiers with special meaning */
-identifier     : ID { $$ = $1; }
-	       | OVERRIDE { $$ = Swig_copy_string("override"); }
-	       | FINAL { $$ = Swig_copy_string("final"); }
-	       ;
-
-idstring       : identifier { $$ = $1; }
-               | default_delete { $$ = Char($1.val); }
-               | string { $$ = Char($1); }
-               ;
-
-idstringopt    : idstring { $$ = $1; }
-               | empty { $$ = 0; }
-               ;
-
-idcolon        : idtemplate idcolontail { 
-                  $$ = 0;
-		  if (!$$) $$ = NewStringf("%s%s", $1,$2);
-      	          Delete($2);
-               }
-               | NONID DCOLON idtemplatetemplate idcolontail {
-		 $$ = NewStringf("::%s%s",$3,$4);
-                 Delete($4);
-               }
-               | idtemplate {
-		 $$ = NewString($1);
-   	       }
-               | NONID DCOLON idtemplatetemplate {
-		 $$ = NewStringf("::%s",$3);
-               }
-               | OPERATOR {
-                 $$ = NewStringf("%s", $1);
-	       }
-               | OPERATOR less_valparms_greater {
-                 $$ = NewStringf("%s%s", $1, $2);
-	       }
-               | NONID DCOLON OPERATOR {
-                 $$ = NewStringf("::%s",$3);
-               }
-               ;
-
-idcolontail    : DCOLON idtemplatetemplate idcolontail {
-                   $$ = NewStringf("::%s%s",$2,$3);
-		   Delete($3);
-               }
-               | DCOLON idtemplatetemplate {
-                   $$ = NewStringf("::%s",$2);
-               }
-               | DCOLON OPERATOR {
-                   $$ = NewStringf("::%s",$2);
-               }
-/*               | DCOLON CONVERSIONOPERATOR {
-                 $$ = NewString($2);                 
-		 } */
-
-               | DCNOT idtemplate {
-		 $$ = NewStringf("::~%s",$2);
-               }
-               ;
-
-
-idtemplate    : identifier {
-		$$ = NewStringf("%s", $1);
-	      }
-	      | identifier less_valparms_greater {
-		$$ = NewStringf("%s%s", $1, $2);
-	      }
-              ;
-
-idtemplatetemplate : idtemplate {
-		$$ = $1;
-	      }
-	      | TEMPLATE identifier less_valparms_greater {
-		$$ = NewStringf("%s%s", $2, $3);
-	      }
-              ;
-
-/* Identifier, but no templates */
-idcolonnt     : identifier idcolontailnt {
-                  $$ = 0;
-		  if (!$$) $$ = NewStringf("%s%s", $1,$2);
-      	          Delete($2);
-               }
-               | NONID DCOLON identifier idcolontailnt {
-		 $$ = NewStringf("::%s%s",$3,$4);
-                 Delete($4);
-               }
-               | identifier {
-		 $$ = NewString($1);
-   	       }     
-               | NONID DCOLON identifier {
-		 $$ = NewStringf("::%s",$3);
-               }
-               | OPERATOR {
-                 $$ = NewString($1);
-	       }
-               | NONID DCOLON OPERATOR {
-                 $$ = NewStringf("::%s",$3);
-               }
-               ;
-
-idcolontailnt   : DCOLON identifier idcolontailnt {
-                   $$ = NewStringf("::%s%s",$2,$3);
-		   Delete($3);
-               }
-               | DCOLON identifier {
-                   $$ = NewStringf("::%s",$2);
-               }
-               | DCOLON OPERATOR {
-                   $$ = NewStringf("::%s",$2);
-               }
-               | DCNOT identifier {
-		 $$ = NewStringf("::~%s",$2);
-               }
-               ;
-
-/* Concatenated strings */
-string         : string STRING { 
-                   $$ = NewStringf("%s%s", $1, $2);
-               }
-               | STRING { $$ = NewString($1);}
-               ; 
-/* Concatenated wide strings: L"str1" L"str2" */
-wstring         : wstring WSTRING {
-                   $$ = NewStringf("%s%s", $1, $2);
-               }
-/* Concatenated wide string and normal string literal: L"str1" "str2" */
-/*not all the compilers support this concatenation mode, so perhaps better to postpone it*/
-               /*| wstring STRING { here $2 comes unescaped, we have to escape it back first via NewStringf("%(escape)s)"
-                   $$ = NewStringf("%s%s", $1, $2);
-	       }*/
-               | WSTRING { $$ = NewString($1);}
-               ;
-
-stringbrace    : string {
-		 $$ = $1;
-               }
-               | LBRACE {
-                  skip_balanced('{','}');
-		  $$ = NewString(scanner_ccode);
-               }
-              | HBLOCK {
-		 $$ = $1;
-              }
-               ;
-
-options        : LPAREN kwargs RPAREN {
-                  Hash *n;
-                  $$ = NewHash();
-                  n = $2;
-                  while(n) {
-                     String *name, *value;
-                     name = Getattr(n,"name");
-                     value = Getattr(n,"value");
-		     if (!value) value = (String *) "1";
-                     Setattr($$,name, value);
-		     n = nextSibling(n);
-		  }
-               }   
-               | empty { $$ = 0; };
-
- 
-/* Keyword arguments */
-kwargs         : idstring EQUAL stringnum {
-		 $$ = NewHash();
-		 Setattr($$,"name",$1);
-		 Setattr($$,"value",$3);
-               }
-               | idstring EQUAL stringnum COMMA kwargs {
-		 $$ = NewHash();
-		 Setattr($$,"name",$1);
-		 Setattr($$,"value",$3);
-		 set_nextSibling($$,$5);
-               }
-               | idstring {
-                 $$ = NewHash();
-                 Setattr($$,"name",$1);
-	       }
-               | idstring COMMA kwargs {
-                 $$ = NewHash();
-                 Setattr($$,"name",$1);
-                 set_nextSibling($$,$3);
-               }
-               | idstring EQUAL stringtype  {
-                 $$ = $3;
-		 Setattr($$,"name",$1);
-               }
-               | idstring EQUAL stringtype COMMA kwargs {
-                 $$ = $3;
-		 Setattr($$,"name",$1);
-		 set_nextSibling($$,$5);
-               }
-               ;
-
-stringnum      : string {
-		 $$ = $1;
-               }
-               | exprnum {
-                 $$ = Char($1.val);
-               }
-               ;
-
-empty          :   ;
-
-%%
-
-SwigType *Swig_cparse_type(String *s) {
-   String *ns;
-   ns = NewStringf("%s;",s);
-   Seek(ns,0,SEEK_SET);
-   scanner_file(ns);
-   top = 0;
-   scanner_next_token(PARSETYPE);
-   yyparse();
-   /*   Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
-   return top;
-}
-
-
-Parm *Swig_cparse_parm(String *s) {
-   String *ns;
-   ns = NewStringf("%s;",s);
-   Seek(ns,0,SEEK_SET);
-   scanner_file(ns);
-   top = 0;
-   scanner_next_token(PARSEPARM);
-   yyparse();
-   /*   Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
-   Delete(ns);
-   return top;
-}
-
-
-ParmList *Swig_cparse_parms(String *s, Node *file_line_node) {
-   String *ns;
-   char *cs = Char(s);
-   if (cs && cs[0] != '(') {
-     ns = NewStringf("(%s);",s);
-   } else {
-     ns = NewStringf("%s;",s);
-   }
-   Setfile(ns, Getfile(file_line_node));
-   Setline(ns, Getline(file_line_node));
-   Seek(ns,0,SEEK_SET);
-   scanner_file(ns);
-   top = 0;
-   scanner_next_token(PARSEPARMS);
-   yyparse();
-   /*   Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
-   return top;
-}
-
diff --git a/dependencies2013/win32/swig/Source/CParse/templ.c b/dependencies2013/win32/swig/Source/CParse/templ.c
deleted file mode 100644
index e575073a..00000000
--- a/dependencies2013/win32/swig/Source/CParse/templ.c
+++ /dev/null
@@ -1,868 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * templ.c
- *
- * Expands a template into a specialized version.   
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-
-static int template_debug = 0;
-
-
-const char *baselists[3];
-
-void SwigType_template_init() {
-  baselists[0] = "baselist";
-  baselists[1] = "protectedbaselist";
-  baselists[2] = "privatebaselist";
-}
-
-
-static void add_parms(ParmList *p, List *patchlist, List *typelist) {
-  while (p) {
-    SwigType *ty = Getattr(p, "type");
-    SwigType *val = Getattr(p, "value");
-    Append(typelist, ty);
-    Append(typelist, val);
-    Append(patchlist, val);
-    p = nextSibling(p);
-  }
-}
-
-void Swig_cparse_debug_templates(int x) {
-  template_debug = x;
-}
-
-/* -----------------------------------------------------------------------------
- * cparse_template_expand()
- *
- * Expands a template node into a specialized version.  This is done by
- * patching typenames and other aspects of the node according to a list of
- * template parameters
- * ----------------------------------------------------------------------------- */
-
-static int cparse_template_expand(Node *n, String *tname, String *rname, String *templateargs, List *patchlist, List *typelist, List *cpatchlist) {
-  static int expanded = 0;
-  int ret;
-  String *nodeType;
-  if (!n)
-    return 0;
-  nodeType = nodeType(n);
-  if (Getattr(n, "error"))
-    return 0;
-
-  if (Equal(nodeType, "template")) {
-    /* Change the node type back to normal */
-    if (!expanded) {
-      expanded = 1;
-      set_nodeType(n, Getattr(n, "templatetype"));
-      ret = cparse_template_expand(n, tname, rname, templateargs, patchlist, typelist, cpatchlist);
-      expanded = 0;
-      return ret;
-    } else {
-      /* Called when template appears inside another template */
-      /* Member templates */
-
-      set_nodeType(n, Getattr(n, "templatetype"));
-      ret = cparse_template_expand(n, tname, rname, templateargs, patchlist, typelist, cpatchlist);
-      set_nodeType(n, "template");
-      return ret;
-    }
-  } else if (Equal(nodeType, "cdecl")) {
-    /* A simple C declaration */
-    SwigType *t, *v, *d;
-    String *code;
-    t = Getattr(n, "type");
-    v = Getattr(n, "value");
-    d = Getattr(n, "decl");
-
-    code = Getattr(n, "code");
-
-    Append(typelist, t);
-    Append(typelist, d);
-    Append(patchlist, v);
-    Append(cpatchlist, code);
-
-    if (Getattr(n, "conversion_operator")) {
-      Append(cpatchlist, Getattr(n, "name"));
-      if (Getattr(n, "sym:name")) {
-	Append(cpatchlist, Getattr(n, "sym:name"));
-      }
-    }
-    if (checkAttribute(n, "storage", "friend")) {
-      String *symname = Getattr(n, "sym:name");
-      if (symname) {
-	String *stripped_name = SwigType_templateprefix(symname);
-	Setattr(n, "sym:name", stripped_name);
-	Delete(stripped_name);
-      }
-      Append(typelist, Getattr(n, "name"));
-    }
-
-    add_parms(Getattr(n, "parms"), cpatchlist, typelist);
-    add_parms(Getattr(n, "throws"), cpatchlist, typelist);
-
-  } else if (Equal(nodeType, "class")) {
-    /* Patch base classes */
-    {
-      int b = 0;
-      for (b = 0; b < 3; ++b) {
-	List *bases = Getattr(n, baselists[b]);
-	if (bases) {
-	  int i;
-	  int ilen = Len(bases);
-	  for (i = 0; i < ilen; i++) {
-	    String *name = Copy(Getitem(bases, i));
-	    Setitem(bases, i, name);
-	    Append(typelist, name);
-	  }
-	}
-      }
-    }
-    /* Patch children */
-    {
-      Node *cn = firstChild(n);
-      while (cn) {
-	cparse_template_expand(cn, tname, rname, templateargs, patchlist, typelist, cpatchlist);
-	cn = nextSibling(cn);
-      }
-    }
-  } else if (Equal(nodeType, "constructor")) {
-    String *name = Getattr(n, "name");
-    if (!(Getattr(n, "templatetype"))) {
-      String *symname;
-      String *stripped_name = SwigType_templateprefix(name);
-      if (Strstr(tname, stripped_name)) {
-	Replaceid(name, stripped_name, tname);
-      }
-      Delete(stripped_name);
-      symname = Getattr(n, "sym:name");
-      if (symname) {
-	stripped_name = SwigType_templateprefix(symname);
-	if (Strstr(tname, stripped_name)) {
-	  Replaceid(symname, stripped_name, tname);
-	}
-	Delete(stripped_name);
-      }
-      if (strchr(Char(name), '<')) {
-	Append(patchlist, Getattr(n, "name"));
-      } else {
-	Append(name, templateargs);
-      }
-      name = Getattr(n, "sym:name");
-      if (name) {
-	if (strchr(Char(name), '<')) {
-	  Clear(name);
-	  Append(name, rname);
-	} else {
-	  String *tmp = Copy(name);
-	  Replace(tmp, tname, rname, DOH_REPLACE_ANY);
-	  Clear(name);
-	  Append(name, tmp);
-	  Delete(tmp);
-	}
-      }
-      /* Setattr(n,"sym:name",name); */
-    }
-    Append(cpatchlist, Getattr(n, "code"));
-    Append(typelist, Getattr(n, "decl"));
-    add_parms(Getattr(n, "parms"), cpatchlist, typelist);
-    add_parms(Getattr(n, "throws"), cpatchlist, typelist);
-  } else if (Equal(nodeType, "destructor")) {
-    String *name = Getattr(n, "name");
-    if (name) {
-      if (strchr(Char(name), '<'))
-        Append(patchlist, Getattr(n, "name"));
-      else
-        Append(name, templateargs);
-    }
-    name = Getattr(n, "sym:name");
-    if (name) {
-      if (strchr(Char(name), '<')) {
-        String *sn = Copy(tname);
-        Setattr(n, "sym:name", sn);
-        Delete(sn);
-      } else {
-        Replace(name, tname, rname, DOH_REPLACE_ANY);
-      }
-    }
-    /* Setattr(n,"sym:name",name); */
-    Append(cpatchlist, Getattr(n, "code"));
-  } else if (Equal(nodeType, "using")) {
-    String *uname = Getattr(n, "uname");
-    if (uname && strchr(Char(uname), '<')) {
-      Append(patchlist, uname);
-    }
-    if (Getattr(n, "namespace")) {
-      /* Namespace link.   This is nasty.  Is other namespace defined? */
-
-    }
-  } else {
-    /* Look for obvious parameters */
-    Node *cn;
-    Append(cpatchlist, Getattr(n, "code"));
-    Append(typelist, Getattr(n, "type"));
-    Append(typelist, Getattr(n, "decl"));
-    add_parms(Getattr(n, "parms"), cpatchlist, typelist);
-    add_parms(Getattr(n, "kwargs"), cpatchlist, typelist);
-    add_parms(Getattr(n, "pattern"), cpatchlist, typelist);
-    add_parms(Getattr(n, "throws"), cpatchlist, typelist);
-    cn = firstChild(n);
-    while (cn) {
-      cparse_template_expand(cn, tname, rname, templateargs, patchlist, typelist, cpatchlist);
-      cn = nextSibling(cn);
-    }
-  }
-  return 0;
-}
-
-static
-String *partial_arg(String *s, String *p) {
-  char *c;
-  char *cp = Char(p);
-  String *prefix;
-  String *newarg;
-
-  /* Find the prefix on the partial argument */
-
-  c = strchr(cp, '$');
-  if (!c) {
-    return Copy(s);
-  }
-  prefix = NewStringWithSize(cp, (int)(c - cp));
-  newarg = Copy(s);
-  Replace(newarg, prefix, "", DOH_REPLACE_ANY | DOH_REPLACE_FIRST);
-  Delete(prefix);
-  return newarg;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cparse_template_expand()
- * ----------------------------------------------------------------------------- */
-
-int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *tscope) {
-  List *patchlist, *cpatchlist, *typelist;
-  String *templateargs;
-  String *tname;
-  String *iname;
-  String *tbase;
-  patchlist = NewList();
-  cpatchlist = NewList();
-  typelist = NewList();
-
-  {
-    String *tmp = NewStringEmpty();
-    if (tparms) {
-      SwigType_add_template(tmp, tparms);
-    }
-    templateargs = Copy(tmp);
-    Delete(tmp);
-  }
-
-  tname = Copy(Getattr(n, "name"));
-  tbase = Swig_scopename_last(tname);
-
-  /* Look for partial specialization matching */
-  if (Getattr(n, "partialargs")) {
-    Parm *p, *tp;
-    ParmList *ptargs = SwigType_function_parms(Getattr(n, "partialargs"), n);
-    p = ptargs;
-    tp = tparms;
-    while (p && tp) {
-      SwigType *ptype;
-      SwigType *tptype;
-      SwigType *partial_type;
-      ptype = Getattr(p, "type");
-      tptype = Getattr(tp, "type");
-      if (ptype && tptype) {
-	partial_type = partial_arg(tptype, ptype);
-	/*      Printf(stdout,"partial '%s' '%s'  ---> '%s'\n", tptype, ptype, partial_type); */
-	Setattr(tp, "type", partial_type);
-	Delete(partial_type);
-      }
-      p = nextSibling(p);
-      tp = nextSibling(tp);
-    }
-    assert(ParmList_len(ptargs) == ParmList_len(tparms));
-    Delete(ptargs);
-  }
-
-  /*
-    Parm *p = tparms;
-    while (p) {
-      Printf(stdout, "tparm: '%s' '%s' '%s'\n", Getattr(p, "name"), Getattr(p, "type"), Getattr(p, "value"));
-      p = nextSibling(p);
-    }
-  */
-
-  /*  Printf(stdout,"targs = '%s'\n", templateargs);
-     Printf(stdout,"rname = '%s'\n", rname);
-     Printf(stdout,"tname = '%s'\n", tname);  */
-  cparse_template_expand(n, tname, rname, templateargs, patchlist, typelist, cpatchlist);
-
-  /* Set the name */
-  {
-    String *name = Getattr(n, "name");
-    if (name) {
-      Append(name, templateargs);
-    }
-    iname = name;
-  }
-
-  /* Patch all of the types */
-  {
-    Parm *tp = Getattr(n, "templateparms");
-    Parm *p = tparms;
-    /*    Printf(stdout,"%s\n", ParmList_str_defaultargs(tp)); */
-
-    if (tp) {
-      Symtab *tsdecl = Getattr(n, "sym:symtab");
-      while (p && tp) {
-	String *name, *value, *valuestr, *tmp, *tmpr;
-	int sz, i;
-	String *dvalue = 0;
-	String *qvalue = 0;
-
-	name = Getattr(tp, "name");
-	value = Getattr(p, "value");
-
-	if (name) {
-	  if (!value)
-	    value = Getattr(p, "type");
-	  qvalue = Swig_symbol_typedef_reduce(value, tsdecl);
-	  dvalue = Swig_symbol_type_qualify(qvalue, tsdecl);
-	  if (SwigType_istemplate(dvalue)) {
-	    String *ty = Swig_symbol_template_deftype(dvalue, tscope);
-	    Delete(dvalue);
-	    dvalue = ty;
-	  }
-
-	  assert(dvalue);
-	  valuestr = SwigType_str(dvalue, 0);
-	  /* Need to patch default arguments */
-	  {
-	    Parm *rp = nextSibling(p);
-	    while (rp) {
-	      String *rvalue = Getattr(rp, "value");
-	      if (rvalue) {
-		Replace(rvalue, name, dvalue, DOH_REPLACE_ID);
-	      }
-	      rp = nextSibling(rp);
-	    }
-	  }
-	  sz = Len(patchlist);
-	  for (i = 0; i < sz; i++) {
-	    String *s = Getitem(patchlist, i);
-	    Replace(s, name, dvalue, DOH_REPLACE_ID);
-	  }
-	  sz = Len(typelist);
-	  for (i = 0; i < sz; i++) {
-	    String *s = Getitem(typelist, i);
-	    /*      Replace(s,name,value, DOH_REPLACE_ID); */
-	    /*      Printf(stdout,"name = '%s', value = '%s', tbase = '%s', iname='%s' s = '%s' --> ", name, dvalue, tbase, iname, s); */
-	    SwigType_typename_replace(s, name, dvalue);
-	    SwigType_typename_replace(s, tbase, iname);
-	    /*      Printf(stdout,"'%s'\n", s); */
-	  }
-
-	  tmp = NewStringf("#%s", name);
-	  tmpr = NewStringf("\"%s\"", valuestr);
-
-	  sz = Len(cpatchlist);
-	  for (i = 0; i < sz; i++) {
-	    String *s = Getitem(cpatchlist, i);
-	    Replace(s, tmp, tmpr, DOH_REPLACE_ID);
-	    Replace(s, name, valuestr, DOH_REPLACE_ID);
-	  }
-	  Delete(tmp);
-	  Delete(tmpr);
-	  Delete(valuestr);
-	  Delete(dvalue);
-	  Delete(qvalue);
-	}
-	p = nextSibling(p);
-	tp = nextSibling(tp);
-	if (!p)
-	  p = tp;
-      }
-    } else {
-      /* No template parameters at all.  This could be a specialization */
-      int i, sz;
-      sz = Len(typelist);
-      for (i = 0; i < sz; i++) {
-	String *s = Getitem(typelist, i);
-	SwigType_typename_replace(s, tbase, iname);
-      }
-    }
-  }
-
-  /* Patch bases */
-  {
-    List *bases = Getattr(n, "baselist");
-    if (bases) {
-      Iterator b;
-      for (b = First(bases); b.item; b = Next(b)) {
-	String *qn = Swig_symbol_type_qualify(b.item, tscope);
-	Clear(b.item);
-	Append(b.item, qn);
-	Delete(qn);
-      }
-    }
-  }
-  Delete(patchlist);
-  Delete(cpatchlist);
-  Delete(typelist);
-  Delete(tbase);
-  Delete(tname);
-  Delete(templateargs);
-
-  /*  set_nodeType(n,"template"); */
-  return 0;
-}
-
-typedef enum { ExactNoMatch = -2, PartiallySpecializedNoMatch = -1, PartiallySpecializedMatch = 1, ExactMatch = 2 } EMatch;
-
-/* -----------------------------------------------------------------------------
- * does_parm_match()
- *
- * Template argument deduction - check if a template type matches a partially specialized 
- * template parameter type. Typedef reduce 'partial_parm_type' to see if it matches 'type'.
- *
- * type - template parameter type to match against
- * partial_parm_type - partially specialized template type - a possible match
- * partial_parm_type_base - base type of partial_parm_type
- * tscope - template scope
- * specialization_priority - (output) contains a value indicating how good the match is 
- *   (higher is better) only set if return is set to PartiallySpecializedMatch or ExactMatch.
- * ----------------------------------------------------------------------------- */
-
-static EMatch does_parm_match(SwigType *type, SwigType *partial_parm_type, const char *partial_parm_type_base, Symtab *tscope, int *specialization_priority) {
-  static const int EXACT_MATCH_PRIORITY = 99999; /* a number bigger than the length of any conceivable type */
-  int matches;
-  int substitutions;
-  EMatch match;
-  SwigType *ty = Swig_symbol_typedef_reduce(type, tscope);
-  String *base = SwigType_base(ty);
-  SwigType *t = Copy(partial_parm_type);
-  substitutions = Replaceid(t, partial_parm_type_base, base); /* eg: Replaceid("p.$1", "$1", "int") returns t="p.int" */
-  matches = Equal(ty, t);
-  *specialization_priority = -1;
-  if (substitutions == 1) {
-    /* we have a non-explicit specialized parameter (in partial_parm_type) because a substitution for $1, $2... etc has taken place */
-    SwigType *tt = Copy(partial_parm_type);
-    int len;
-    /*
-       check for match to partial specialization type, for example, all of the following could match the type in the %template:
-       template <typename T> struct XX {};
-       template <typename T> struct XX<T &> {};         // r.$1
-       template <typename T> struct XX<T const&> {};    // r.q(const).$1
-       template <typename T> struct XX<T *const&> {};   // r.q(const).p.$1
-       %template(XXX) XX<int *const&>;                  // r.q(const).p.int
-
-       where type="r.q(const).p.int" will match either of tt="r.", tt="r.q(const)" tt="r.q(const).p"
-    */
-    Replaceid(tt, partial_parm_type_base, ""); /* remove the $1, $2 etc, eg tt="p.$1" => "p." */
-    len = Len(tt);
-    if (Strncmp(tt, ty, len) == 0) {
-      match = PartiallySpecializedMatch;
-      *specialization_priority = len;
-    } else {
-      match = PartiallySpecializedNoMatch;
-    }
-    Delete(tt);
-  } else {
-    match = matches ? ExactMatch : ExactNoMatch;
-    if (matches)
-      *specialization_priority = EXACT_MATCH_PRIORITY; /* exact matches always take precedence */
-  }
-  /*
-  Printf(stdout, "      does_parm_match %2d %5d [%s] [%s]\n", match, *specialization_priority, type, partial_parm_type);
-  */
-  Delete(t);
-  Delete(base);
-  Delete(ty);
-  return match;
-}
-
-/* -----------------------------------------------------------------------------
- * template_locate()
- *
- * Search for a template that matches name with given parameters.
- * ----------------------------------------------------------------------------- */
-
-static Node *template_locate(String *name, Parm *tparms, Symtab *tscope) {
-  Node *n = 0;
-  String *tname = 0;
-  Node *templ;
-  Symtab *primary_scope = 0;
-  List *possiblepartials = 0;
-  Parm *p;
-  Parm *parms = 0;
-  Parm *targs;
-  ParmList *expandedparms;
-  int *priorities_matrix = 0;
-  int max_possible_partials = 0;
-  int posslen = 0;
-
-  /* Search for primary (unspecialized) template */
-  templ = Swig_symbol_clookup(name, 0);
-
-  if (template_debug) {
-    tname = Copy(name);
-    SwigType_add_template(tname, tparms);
-    Printf(stdout, "\n");
-    Swig_diagnostic(cparse_file, cparse_line, "template_debug: Searching for match to: '%s'\n", tname);
-    Delete(tname);
-    tname = 0;
-  }
-
-  if (templ) {
-    tname = Copy(name);
-    parms = CopyParmList(tparms);
-
-    /* All template specializations must be in the primary template's scope, store the symbol table for this scope for specialization lookups */
-    primary_scope = Getattr(templ, "sym:symtab");
-
-    /* Add default values from primary template */
-    targs = Getattr(templ, "templateparms");
-    expandedparms = Swig_symbol_template_defargs(parms, targs, tscope, primary_scope);
-
-    /* reduce the typedef */
-    p = expandedparms;
-    while (p) {
-      SwigType *ty = Getattr(p, "type");
-      if (ty) {
-	SwigType *nt = Swig_symbol_type_qualify(ty, tscope);
-	Setattr(p, "type", nt);
-	Delete(nt);
-      }
-      p = nextSibling(p);
-    }
-    SwigType_add_template(tname, expandedparms);
-
-    /* Search for an explicit (exact) specialization. Example: template<> class name<int> { ... } */
-    {
-      if (template_debug) {
-	Printf(stdout, "    searching for : '%s' (explicit specialization)\n", tname);
-      }
-      n = Swig_symbol_clookup_local(tname, primary_scope);
-      if (!n) {
-	SwigType *rname = Swig_symbol_typedef_reduce(tname, tscope);
-	if (!Equal(rname, tname)) {
-	  if (template_debug) {
-	    Printf(stdout, "    searching for : '%s' (explicit specialization with typedef reduction)\n", rname);
-	  }
-	  n = Swig_symbol_clookup_local(rname, primary_scope);
-	}
-	Delete(rname);
-      }
-      if (n) {
-	Node *tn;
-	String *nodeType = nodeType(n);
-	if (Equal(nodeType, "template")) {
-	  if (template_debug) {
-	    Printf(stdout, "    explicit specialization found: '%s'\n", Getattr(n, "name"));
-	  }
-	  goto success;
-	}
-	tn = Getattr(n, "template");
-	if (tn) {
-	  if (template_debug) {
-	    Printf(stdout, "    previous instantiation found: '%s'\n", Getattr(n, "name"));
-	  }
-	  n = tn;
-	  goto success;	  /* Previously wrapped by a template instantiation */
-	}
-	Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType(n));
-	Delete(tname);
-	Delete(parms);
-	return 0;	  /* Found a match, but it's not a template of any kind. */
-      }
-    }
-
-    /* Search for partial specializations.
-     * Example: template<typename T> class name<T *> { ... } 
-
-     * There are 3 types of template arguments:
-     * (1) Template type arguments
-     * (2) Template non type arguments
-     * (3) Template template arguments
-     * only (1) is really supported for partial specializations
-     */
-
-    /* Rank each template parameter against the desired template parameters then build a matrix of best matches */
-    possiblepartials = NewList();
-    {
-      char tmp[32];
-      List *partials;
-
-      partials = Getattr(templ, "partials"); /* note that these partial specializations do not include explicit specializations */
-      if (partials) {
-	Iterator pi;
-	int parms_len = ParmList_len(parms);
-	int *priorities_row;
-	max_possible_partials = Len(partials);
-	priorities_matrix = (int *)malloc(sizeof(int) * max_possible_partials * parms_len); /* slightly wasteful allocation for max possible matches */
-	priorities_row = priorities_matrix;
-	for (pi = First(partials); pi.item; pi = Next(pi)) {
-	  Parm *p = parms;
-	  int all_parameters_match = 1;
-	  int i = 1;
-	  Parm *partialparms = Getattr(pi.item, "partialparms");
-	  Parm *pp = partialparms;
-	  String *templcsymname = Getattr(pi.item, "templcsymname");
-	  if (template_debug) {
-	    Printf(stdout, "    checking match: '%s' (partial specialization)\n", templcsymname);
-	  }
-	  if (ParmList_len(partialparms) == parms_len) {
-	    while (p && pp) {
-	      SwigType *t;
-	      sprintf(tmp, "$%d", i);
-	      t = Getattr(p, "type");
-	      if (!t)
-		t = Getattr(p, "value");
-	      if (t) {
-		EMatch match = does_parm_match(t, Getattr(pp, "type"), tmp, tscope, priorities_row + i - 1);
-		if (match < (int)PartiallySpecializedMatch) {
-		  all_parameters_match = 0;
-		  break;
-		}
-	      }
-	      i++;
-	      p = nextSibling(p);
-	      pp = nextSibling(pp);
-	    }
-	    if (all_parameters_match) {
-	      Append(possiblepartials, pi.item);
-	      priorities_row += parms_len;
-	    }
-	  }
-	}
-      }
-    }
-
-    posslen = Len(possiblepartials);
-    if (template_debug) {
-      int i;
-      if (posslen == 0)
-	Printf(stdout, "    matched partials: NONE\n");
-      else if (posslen == 1)
-	Printf(stdout, "    chosen partial: '%s'\n", Getattr(Getitem(possiblepartials, 0), "templcsymname"));
-      else {
-	Printf(stdout, "    possibly matched partials:\n");
-	for (i = 0; i < posslen; i++) {
-	  Printf(stdout, "      '%s'\n", Getattr(Getitem(possiblepartials, i), "templcsymname"));
-	}
-      }
-    }
-
-    if (posslen > 1) {
-      /* Now go through all the possibly matched partial specialization templates and look for a non-ambiguous match.
-       * Exact matches rank the highest and deduced parameters are ranked by how specialized they are, eg looking for
-       * a match to const int *, the following rank (highest to lowest):
-       *   const int * (exact match)
-       *   const T *
-       *   T *
-       *   T
-       *
-       *   An ambiguous example when attempting to match as either specialization could match: %template() X<int *, double *>;
-       *   template<typename T1, typename T2> X class {};  // primary template
-       *   template<typename T1> X<T1, double *> class {}; // specialization (1)
-       *   template<typename T2> X<int *, T2> class {};    // specialization (2)
-       */
-      if (template_debug) {
-	int row, col;
-	int parms_len = ParmList_len(parms);
-	Printf(stdout, "      parameter priorities matrix (%d parms):\n", parms_len);
-	for (row = 0; row < posslen; row++) {
-	  int *priorities_row = priorities_matrix + row*parms_len;
-	  Printf(stdout, "        ");
-	  for (col = 0; col < parms_len; col++) {
-	    Printf(stdout, "%5d ", priorities_row[col]);
-	  }
-	  Printf(stdout, "\n");
-	}
-      }
-      {
-	int row, col;
-	int parms_len = ParmList_len(parms);
-	/* Printf(stdout, "      parameter priorities inverse matrix (%d parms):\n", parms_len); */
-	for (col = 0; col < parms_len; col++) {
-	  int *priorities_col = priorities_matrix + col;
-	  int maxpriority = -1;
-	  /* 
-	     Printf(stdout, "max_possible_partials: %d col:%d\n", max_possible_partials, col);
-	     Printf(stdout, "        ");
-	     */
-	  /* determine the highest rank for this nth parameter */
-	  for (row = 0; row < posslen; row++) {
-	    int *element_ptr = priorities_col + row*parms_len;
-	    int priority = *element_ptr;
-	    if (priority > maxpriority)
-	      maxpriority = priority;
-	    /* Printf(stdout, "%5d ", priority); */
-	  }
-	  /* Printf(stdout, "\n"); */
-	  /* flag all the parameters which equal the highest rank */
-	  for (row = 0; row < posslen; row++) {
-	    int *element_ptr = priorities_col + row*parms_len;
-	    int priority = *element_ptr;
-	    *element_ptr = (priority >= maxpriority) ? 1 : 0;
-	  }
-	}
-      }
-      {
-	int row, col;
-	int parms_len = ParmList_len(parms);
-	Iterator pi = First(possiblepartials);
-	Node *chosenpartials = NewList();
-	if (template_debug)
-	  Printf(stdout, "      priority flags matrix:\n");
-	for (row = 0; row < posslen; row++) {
-	  int *priorities_row = priorities_matrix + row*parms_len;
-	  int highest_count = 0; /* count of highest priority parameters */
-	  for (col = 0; col < parms_len; col++) {
-	    highest_count += priorities_row[col];
-	  }
-	  if (template_debug) {
-	    Printf(stdout, "        ");
-	    for (col = 0; col < parms_len; col++) {
-	      Printf(stdout, "%5d ", priorities_row[col]);
-	    }
-	    Printf(stdout, "\n");
-	  }
-	  if (highest_count == parms_len) {
-	    Append(chosenpartials, pi.item);
-	  }
-	  pi = Next(pi);
-	}
-	if (Len(chosenpartials) > 0) {
-	  /* one or more best match found */
-	  Delete(possiblepartials);
-	  possiblepartials = chosenpartials;
-	  posslen = Len(possiblepartials);
-	} else {
-	  /* no best match found */
-	  Delete(chosenpartials);
-	}
-      }
-    }
-
-    if (posslen > 0) {
-      String *s = Getattr(Getitem(possiblepartials, 0), "templcsymname");
-      n = Swig_symbol_clookup_local(s, primary_scope);
-      if (posslen > 1) {
-	int i;
-	if (n) {
-	  Swig_warning(WARN_PARSE_TEMPLATE_AMBIG, cparse_file, cparse_line, "Instantiation of template '%s' is ambiguous,\n", SwigType_namestr(tname));
-	  Swig_warning(WARN_PARSE_TEMPLATE_AMBIG, Getfile(n), Getline(n), "  instantiation '%s' used,\n", SwigType_namestr(Getattr(n, "name")));
-	}
-	for (i = 1; i < posslen; i++) {
-	  String *templcsymname = Getattr(Getitem(possiblepartials, i), "templcsymname");
-	  Node *ignored_node = Swig_symbol_clookup_local(templcsymname, primary_scope);
-	  assert(ignored_node);
-	  Swig_warning(WARN_PARSE_TEMPLATE_AMBIG, Getfile(ignored_node), Getline(ignored_node), "  instantiation '%s' ignored.\n", SwigType_namestr(Getattr(ignored_node, "name")));
-	}
-      }
-    }
-
-    if (!n) {
-      if (template_debug) {
-	Printf(stdout, "    chosen primary template: '%s'\n", Getattr(templ, "name"));
-      }
-      n = templ;
-    }
-  } else {
-    if (template_debug) {
-      Printf(stdout, "    primary template not found\n");
-    }
-    /* Give up if primary (unspecialized) template not found as specializations will only exist if there is a primary template */
-    n = 0;
-  }
-
-  if (!n) {
-    Swig_error(cparse_file, cparse_line, "Template '%s' undefined.\n", name);
-  } else if (n) {
-    String *nodeType = nodeType(n);
-    if (!Equal(nodeType, "template")) {
-      Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType);
-      n = 0;
-    }
-  }
-success:
-  Delete(tname);
-  Delete(possiblepartials);
-  if ((template_debug) && (n)) {
-    /*
-    Printf(stdout, "Node: %p\n", n);
-    Swig_print_node(n);
-    */
-    Printf(stdout, "    chosen template:'%s'\n", Getattr(n, "name"));
-  }
-  Delete(parms);
-  free(priorities_matrix);
-  return n;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_cparse_template_locate()
- *
- * Search for a template that matches name with given parameters.
- * For templated classes finds the specialized template should there be one.
- * For templated functions finds the unspecialized template even if a specialized
- * template exists.
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_cparse_template_locate(String *name, Parm *tparms, Symtab *tscope) {
-  Node *n = template_locate(name, tparms, tscope);	/* this function does what we want for templated classes */
-
-  if (n) {
-    String *nodeType = nodeType(n);
-    int isclass = 0;
-    assert(Equal(nodeType, "template"));
-    isclass = (Equal(Getattr(n, "templatetype"), "class"));
-    if (!isclass) {
-      /* If not a templated class we must have a templated function.
-         The template found is not necessarily the one we want when dealing with templated
-         functions. We don't want any specialized templated functions as they won't have
-         the default parameters. Let's look for the unspecialized template. Also make sure
-         the number of template parameters is correct as it is possible to overload a
-         templated function with different numbers of template parameters. */
-
-      if (template_debug) {
-	Printf(stdout, "    Not a templated class, seeking most appropriate templated function\n");
-      }
-
-      n = Swig_symbol_clookup_local(name, 0);
-      while (n) {
-	Parm *tparmsfound = Getattr(n, "templateparms");
-	if (ParmList_len(tparms) == ParmList_len(tparmsfound)) {
-	  /* successful match */
-	  break;
-	}
-	/* repeat until we find a match with correct number of templated parameters */
-	n = Getattr(n, "sym:nextSibling");
-      }
-
-      if (!n) {
-	Swig_error(cparse_file, cparse_line, "Template '%s' undefined.\n", name);
-      }
-
-      if ((template_debug) && (n)) {
-	Printf(stdout, "Templated function found: %p\n", n);
-	Swig_print_node(n);
-      }
-    }
-  }
-
-  return n;
-}
diff --git a/dependencies2013/win32/swig/Source/CParse/util.c b/dependencies2013/win32/swig/Source/CParse/util.c
deleted file mode 100644
index 0e2136a4..00000000
--- a/dependencies2013/win32/swig/Source/CParse/util.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * util.c
- *
- * Parsing utilities.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-
-/* -----------------------------------------------------------------------------
- * Swig_cparse_replace_descriptor()
- *
- * Replaces type descriptor string $descriptor() with the SWIG type descriptor
- * string.
- * ----------------------------------------------------------------------------- */
-
-void Swig_cparse_replace_descriptor(String *s) {
-  char tmp[512];
-  String *arg = 0;
-  SwigType *t;
-  char *c = 0;
-
-  while ((c = strstr(Char(s), "$descriptor("))) {
-    char *d = tmp;
-    int level = 0;
-    while (*c) {
-      if (*c == '(')
-	level++;
-      if (*c == ')') {
-	level--;
-	if (level == 0) {
-	  break;
-	}
-      }
-      *d = *c;
-      d++;
-      c++;
-    }
-    *d = 0;
-    arg = NewString(tmp + 12);
-    t = Swig_cparse_type(arg);
-    Delete(arg);
-    arg = 0;
-
-    if (t) {
-      String *mangle;
-      String *descriptor;
-
-      mangle = SwigType_manglestr(t);
-      descriptor = NewStringf("SWIGTYPE%s", mangle);
-      SwigType_remember(t);
-      *d = ')';
-      d++;
-      *d = 0;
-      Replace(s, tmp, descriptor, DOH_REPLACE_ANY);
-      Delete(mangle);
-      Delete(descriptor);
-      Delete(t);
-    } else {
-      Swig_error(Getfile(s), Getline(s), "Bad $descriptor() macro.\n");
-      break;
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cparse_smartptr()
- *
- * Parse the type in smartptr feature and convert into a SwigType.
- * Error out if the parsing fails as this is like a parser syntax error.
- * ----------------------------------------------------------------------------- */
-
-SwigType *Swig_cparse_smartptr(Node *n) {
-    SwigType *smart = 0;
-    String *smartptr = Getattr(n, "feature:smartptr");
-    if (smartptr) {
-      SwigType *cpt = Swig_cparse_type(smartptr);
-      if (cpt) {
-	smart = SwigType_typedef_resolve_all(cpt);
-	Delete(cpt);
-      } else {
-	Swig_error(Getfile(n), Getline(n), "Invalid type (%s) in 'smartptr' feature for class %s.\n", smartptr, SwigType_namestr(Getattr(n, "name")));
-      }
-    }
-    return smart;
-}
-
-/* -----------------------------------------------------------------------------
- * cparse_normalize_void()
- *
- * This function is used to replace arguments of the form (void) with empty
- * arguments in C++
- * ----------------------------------------------------------------------------- */
-
-void cparse_normalize_void(Node *n) {
-  String *decl = Getattr(n, "decl");
-  Parm *parms = Getattr(n, "parms");
-
-  if (SwigType_isfunction(decl)) {
-    if ((ParmList_len(parms) == 1) && (SwigType_type(Getattr(parms, "type")) == T_VOID)) {
-      Replaceall(decl, "f(void).", "f().");
-      Delattr(n, "parms");
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * new_node()
- *
- * Create an empty parse node, setting file and line number information
- * ----------------------------------------------------------------------------- */
-
-Node *new_node(const_String_or_char_ptr tag) {
-  Node *n = NewHash();
-  set_nodeType(n,tag);
-  Setfile(n,cparse_file);
-  Setline(n,cparse_line);
-  return n;
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/README b/dependencies2013/win32/swig/Source/DOH/README
deleted file mode 100644
index 8be5f652..00000000
--- a/dependencies2013/win32/swig/Source/DOH/README
+++ /dev/null
@@ -1,118 +0,0 @@
-DOH  (Dave's Object Hack)
-
-Overview:
----------
-DOH is a small C library that provides a number of simple yet powerful
-data structures. The data structures are built around a dynamic typing
-model in which any given object is allowed to support one or more
-classes of operations.  Furthermore, a simple garbage collection
-scheme and a variety of interesting library methods are available.
-All and all, the operation of DOH makes massive abuse of the C type
-system and would probably make the language purists scream and
-performance addicts run away in horror.  However, I really don't
-care--so there! However, for the rest of us, DOH is actually kind of
-fun to use. This is only a short description of the methods and is no
-way meant to be exhaustive.
-
-Common Operations (for all types)
----------------------------------
-Delete(obj)             Decrease the reference count and destroy if zero
-Copy(obj)               Make a copy of an object.
-Clear(obj)              Clear an object.
-Setscope(obj)           Set scope of an object (guru's only)
-Str(obj)                Create a string representation of obj.
-Data(obj)               Return pointer to raw data in an object
-Char(obj)               Convert to a char *
-Len(obj)                Length of an object
-Hash(obj)               Hash value (used for mapping)
-Cmp(obj1,obj2)          Compare two objects.
-Name(obj)               Return the object name
-First(obj)              Return first object (iterator)
-Next(obj)               Return next object
-Dump(obj,out)           Serialize on out
-Load(in)                Unserialize from in
-First(obj)              Iterator
-Next(iter)              Next iterator
-
-Mapping Operations (for hash table behavior)
---------------------------------------------
-Getattr(hash,key)              Get an attribute
-Setattr(hash,key,value)        Set an attribute
-Delattr(hash,key)              Delete an attribute
-First(hash)                    Get first object (iterator)
-Next(hash)                     Get next object
-GetInt(hash,key)               Get attribute as an 'int'
-SetInt(hash,key,ivalue)        Set attribute as an 'int'
-GetDouble(hash,key)            Get attribute as a 'double'
-SetDouble(hash,key,dvalue)     Set Attribute as a 'double'
-GetChar(hash,key)              Get attribute as a 'char *'
-
-Sequence Operations
--------------------
-Getitem(list,index)             Get an item
-Setitem(list,index,val)         Set an item
-Delitem(list,index)             Delete an item
-Insert(list,index,val)          Insert an item
-Append(list,val)                Append to end
-Push(list,val)                  Insert at beginning
-
-File Operations
----------------
-Read(obj,buffer,len)            Read data
-Write(obj,buffer,len)           Write data
-Getc(obj)                       Get a character
-Putc(ch,obj)                    Put a character
-Ungetc(ch,obj)                  Put character back on input stream
-Seek(obj,offset,whence)         Seek
-Tell(obj)                       Return file pointer
-Delete(obj)                     Decrease the reference count, close file if zero
-
-String Operations
------------------
-Replace(obj, orig, rep, flags)  Replace occurrences of orig with rep.
-Chop(obj)                       Remove trailing whitespace
-
-flags is one of the following:
-     DOH_REPLACE_ANY
-     DOH_REPLACE_NOQUOTE
-     DOH_REPLACE_ID
-     DOH_REPLACE_FIRST
-             
-Callable Operations
--------------------
-Call(obj, args)                 Perform a function call with arguments args.
-
-Miscellaneous library functions
--------------------------------
-NewScope()                      Create a new scope
-DelScope(s)                     Delete scope s
-Readline(in)                    Read a line of input from in
-Printf(out,fmt,...)             Formatted output
-DohEncoding(name, fn)           Register a format encoding for Printf
-
-Currently Available datatypes
-------------------------------
-NewString(char *initial)                            Strings
-NewHash()                                           Hash
-NewList()                                           List
-NewVoid(void *ptr, void (*del)(void *))             Void
-NewFile(char *filename, char *mode, List *newfiles) File
-NewCallable(DOH *(*func)(DOH *, DOH *))             Callable object
-
-
-Odds and ends:
-
-  1.   All objects are of type 'DOH *'
-  2.   When in doubt, see rule (1)
-  3.   In certain cases, DOH performs implicit conversions
-       of 'char *' to an appropriate DOH string representation. 
-       For operations involving files, DOH works with many
-       kinds of objects including FILE *, DOH File objects,
-       and DOH strings.  Don't even ask how this works.
-
-  4.   More complete documentation is forthcoming.
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Source/DOH/base.c b/dependencies2013/win32/swig/Source/DOH/base.c
deleted file mode 100644
index 12351dd0..00000000
--- a/dependencies2013/win32/swig/Source/DOH/base.c
+++ /dev/null
@@ -1,958 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * base.c 
- *
- *     This file contains the function entry points for dispatching methods on
- *     DOH objects.  A number of small utility functions are also included.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-/* -----------------------------------------------------------------------------
- * DohDelete()
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_DEBUG_DELETE
-#define SWIG_DEBUG_DELETE 0
-#endif
-
-void DohDelete(DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-
-  if (!obj)
-    return;
-  if (!DohCheck(b)) {
-#if SWIG_DEBUG_DELETE
-    fputs("DOH: Fatal error. Attempt to delete a non-doh object.\n", stderr);
-    abort();
-#else
-    assert(0);
-#endif
-    return;
-  }
-  if (b->flag_intern)
-    return;
-  assert(b->refcount > 0);
-  b->refcount--;
-  if (b->refcount <= 0) {
-    objinfo = b->type;
-    if (objinfo->doh_del) {
-      (objinfo->doh_del) (b);
-    } else {
-      if (b->data)
-	DohFree(b->data);
-    }
-    DohObjFree(b);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * DohCopy()
- * ----------------------------------------------------------------------------- */
-
-DOH *DohCopy(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-
-  if (!obj)
-    return 0;
-  if (!DohCheck(b)) {
-#if SWIG_DEBUG_DELETE
-    fputs("DOH: Fatal error. Attempt to copy a non-doh object.\n", stderr);
-    abort();
-#else
-    assert(0);
-#endif
-    return 0;
-  }
-  objinfo = b->type;
-  if (objinfo->doh_copy) {
-    DohBase *bc = (DohBase *) (objinfo->doh_copy) (b);
-    if ((bc) && b->meta) {
-      bc->meta = Copy(b->meta);
-    }
-    return (DOH *) bc;
-  }
-  return 0;
-}
-
-void DohIncref(DOH *obj) {
-  Incref(obj);
-}
-
-/* -----------------------------------------------------------------------------
- * DohClear()
- * ----------------------------------------------------------------------------- */
-
-void DohClear(DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_clear)
-    (objinfo->doh_clear) (b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohStr()
- * ----------------------------------------------------------------------------- */
-
-DOH *DohStr(const DOH *obj) {
-  char buffer[512];
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(b)) {
-    objinfo = b->type;
-    if (objinfo->doh_str) {
-      return (objinfo->doh_str) (b);
-    }
-    sprintf(buffer, "<Object '%s' at %p>", objinfo->objname, (void *) b);
-    return NewString(buffer);
-  } else {
-    return NewString(obj);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * DohDump()
- * ----------------------------------------------------------------------------- */
-
-int DohDump(const DOH *obj, DOH *out) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_dump) {
-    return (objinfo->doh_dump) (b, out);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohLen() - Defaults to strlen() if not a DOH object
- * ----------------------------------------------------------------------------- */
-int DohLen(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (!b)
-    return 0;
-  if (DohCheck(b)) {
-    objinfo = b->type;
-    if (objinfo->doh_len) {
-      return (objinfo->doh_len) (b);
-    }
-    return 0;
-  } else {
-    return (int)strlen((char *) obj);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * DohHashVal()
- * ----------------------------------------------------------------------------- */
-
-int DohHashval(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  /* obj is already checked and/or converted into DohBase* */
-  /*  if (DohCheck(b)) */
-  {
-    objinfo = b->type;
-    if (objinfo->doh_hashval) {
-      return (objinfo->doh_hashval) (b);
-    }
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohData()
- * ----------------------------------------------------------------------------- */
-
-void *DohData(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if (objinfo->doh_data) {
-      return (objinfo->doh_data) (b);
-    }
-    return 0;
-  }
-  return (void *) obj;
-}
-
-/* -----------------------------------------------------------------------------
- * RawData()
- * ----------------------------------------------------------------------------- */
-
-static void *RawData(DohBase *b) {
-  DohObjInfo *objinfo = b->type;
-  return (objinfo->doh_data) ? (objinfo->doh_data) (b) : 0;
-}
-
-
-/* -----------------------------------------------------------------------------
- * DohCmp()
- * ----------------------------------------------------------------------------- */
-
-int DohCmp(const DOH *obj1, const DOH *obj2) {
-  DohBase *b1, *b2;
-  DohObjInfo *b1info, *b2info;
-  int c1, c2;
-  b1 = (DohBase *) obj1;
-  b2 = (DohBase *) obj2;
-  c1 = DohCheck(b1);
-  c2 = DohCheck(b2);
-  /* most of the times, obj2 is a plain c string */
-  if (!c1 || !c2) {
-    if ((b1 == 0) && (b2 == 0))
-      return 0;
-    if (b1 && !b2)
-      return 1;
-    if (!b1 && b2)
-      return -1;
-    return strcmp((char *) (c1 ? RawData(b1) : (void *) obj1), (char *) (c2 ? RawData(b2) : (void *) obj2));
-  }
-  b1info = b1->type;
-  b2info = b2->type;
-  if ((b1info == b2info) && (b1info->doh_cmp))
-    return (b1info->doh_cmp) (b1, b2);
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * DohEqual()
- * ----------------------------------------------------------------------------- */
-
-int DohEqual(const DOH *obj1, const DOH *obj2) {
-  DohBase *b1 = (DohBase *) obj1;
-  DohBase *b2 = (DohBase *) obj2;
-  if (!b1) {
-    return !b2;
-  } else if (!b2) {
-    return 0;
-  } else {
-    DohObjInfo *b1info = 0;
-    DohObjInfo *b2info = 0;
-    if (DohCheck(b1)) {
-      b1info = b1->type;
-      if (DohCheck(b2)) {
-	b2info = b2->type;
-      } else {
-	int len = (b1info->doh_len) (b1);
-	char *cobj = (char *) obj2;
-	return len == (int) strlen(cobj) ? (memcmp(RawData(b1), cobj, len) == 0) : 0;
-      }
-    } else if (DohCheck(b2)) {
-      int len = (b2->type->doh_len) (b2);
-      char *cobj = (char *) obj1;
-      return len == (int) strlen(cobj) ? (memcmp(RawData(b2), cobj, len) == 0) : 0;
-    } else {
-      return strcmp((char *) obj1, (char *) obj2) == 0;
-    }
-
-    if (!b1info) {
-      return obj1 == obj2;
-    } else if (b1info == b2info) {
-      return b1info->doh_equal ? (b1info->doh_equal) (b1, b2) : (b1info->doh_cmp ? (b1info->doh_cmp) (b1, b2) == 0 : (b1 == b2));
-    } else {
-      return 0;
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * DohFirst()
- * ----------------------------------------------------------------------------- */
-
-DohIterator DohFirst(DOH *obj) {
-  DohIterator iter;
-  DohBase *b;
-  DohObjInfo *binfo;
-
-  b = (DohBase *) obj;
-  if (DohCheck(b)) {
-    binfo = b->type;
-    if (binfo->doh_first) {
-      return (binfo->doh_first) (b);
-    }
-  }
-  iter.object = 0;
-  iter.item = 0;
-  iter.key = 0;
-  iter._current = 0;
-  iter._index = 0;
-  return iter;
-}
-
-/* -----------------------------------------------------------------------------
- * DohNext()
- * ----------------------------------------------------------------------------- */
-
-DohIterator DohNext(DohIterator iter) {
-  DohIterator niter;
-
-  if (iter.object) {
-    DohBase *b;
-    DohObjInfo *binfo;
-
-    b = (DohBase *) iter.object;
-    binfo = b->type;
-    if (binfo->doh_next) {
-      return (binfo->doh_next) (iter);
-    }
-  }
-  niter = iter;
-  return niter;
-}
-
-/* -----------------------------------------------------------------------------
- * DohIsMapping()
- * ----------------------------------------------------------------------------- */
-int DohIsMapping(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (!DohCheck(b))
-    return 0;
-  objinfo = b->type;
-  if (objinfo->doh_hash)
-    return 1;
-  else
-    return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetattr()
- * ----------------------------------------------------------------------------- */
-
-DOH *DohGetattr(DOH *obj, const DOH *name) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_hash && objinfo->doh_hash->doh_getattr) {
-    DOH *r = (objinfo->doh_hash->doh_getattr) (b, (DOH *) name);
-    return (r == DohNone) ? 0 : r;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetattr()
- * ----------------------------------------------------------------------------- */
-
-int DohSetattr(DOH *obj, const DOH *name, const DOH *value) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_hash && objinfo->doh_hash->doh_setattr) {
-    return (objinfo->doh_hash->doh_setattr) (b, (DOH *) name, (DOH *) value);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohDelattr()
- * ----------------------------------------------------------------------------- */
-
-int DohDelattr(DOH *obj, const DOH *name) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_hash && objinfo->doh_hash->doh_delattr) {
-    return (objinfo->doh_hash->doh_delattr) (b, (DOH *) name);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohCheckattr()
- * ----------------------------------------------------------------------------- */
-
-int DohCheckattr(DOH *obj, const DOH *name, const DOH *value) {
-  DOH *attr = Getattr(obj,name);
-  if (!attr) return 0;
-  return DohEqual(attr,value);
-}
-
-/* -----------------------------------------------------------------------------
- * DohKeys()
- * ----------------------------------------------------------------------------- */
-
-DOH *DohKeys(DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo && objinfo->doh_hash->doh_keys) {
-    return (objinfo->doh_hash->doh_keys) (b);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetInt()
- * ----------------------------------------------------------------------------- */
-
-int DohGetInt(DOH *obj, const DOH *name) {
-  DOH *val;
-  val = Getattr(obj, (DOH *) name);
-  if (!val)
-    return 0;
-  if (DohIsString(val)) {
-    return atoi((char *) Data(val));
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetDouble()
- * ----------------------------------------------------------------------------- */
-
-double DohGetDouble(DOH *obj, const DOH *name) {
-  DOH *val;
-  val = Getattr(obj, (DOH *) name);
-  if (!val)
-    return 0;
-  if (DohIsString(val)) {
-    return atof((char *) Data(val));
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetChar()
- * ----------------------------------------------------------------------------- */
-
-char *DohGetChar(DOH *obj, const DOH *name) {
-  DOH *val;
-  val = Getattr(obj, (DOH *) name);
-  if (!val)
-    return 0;
-  if (DohIsString(val)) {
-    return (char *) Data(val);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetFlagAttr() / DohGetFlag()
- * A flag is unset if the attribute (name) does not exist on the node (obj),
- * or it is set to "0". If the attribute is set to any other value,
- * the flag is set.
- * 
- * DohGetFlag()     returns if the flag is set or not
- * DohGetFlagAttr() returns the flag value if is set, NULL otherwise
- * ----------------------------------------------------------------------------- */
-
-
-DOH *DohGetFlagAttr(DOH *obj, const DOH *name) {
-  DOH *val = Getattr(obj, (DOH *) name);
-  if (!val) {
-    return NULL;
-  } else {
-    const char *cval = Char(val);
-    if (!cval)
-      return val;
-    return (strcmp(cval, "0") != 0) ? val : NULL;
-  }
-}
-
-int DohGetFlag(DOH *obj, const DOH *name) {
-  return DohGetFlagAttr(obj, name) ? 1 : 0;
-}
-
-
-/* -----------------------------------------------------------------------------
- * DohGetVoid()
- * ----------------------------------------------------------------------------- */
-
-void *DohGetVoid(DOH *obj, const DOH *name) {
-  DOH *val;
-  val = Getattr(obj, (DOH *) name);
-  if (!val)
-    return 0;
-  return (void *) Data(val);
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetInt()
- * ----------------------------------------------------------------------------- */
-
-void DohSetInt(DOH *obj, const DOH *name, int value) {
-  DOH *temp;
-  temp = NewStringEmpty();
-  Printf(temp, "%d", value);
-  Setattr(obj, (DOH *) name, temp);
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetDouble()
- * ----------------------------------------------------------------------------- */
-
-void DohSetDouble(DOH *obj, const DOH *name, double value) {
-  DOH *temp;
-  temp = NewStringEmpty();
-  Printf(temp, "%0.17f", value);
-  Setattr(obj, (DOH *) name, temp);
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetChar()
- * ----------------------------------------------------------------------------- */
-
-void DohSetChar(DOH *obj, const DOH *name, char *value) {
-  Setattr(obj, (DOH *) name, NewString(value));
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetFlag()
- * ----------------------------------------------------------------------------- */
-
-void DohSetFlagAttr(DOH *obj, const DOH *name, const DOH *attr) {
-  Setattr(obj, (DOH *) name, attr ? attr : NewString("0"));
-}
-
-void DohSetFlag(DOH *obj, const DOH *name) {
-  Setattr(obj, (DOH *) name, NewString("1"));
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetVoid()
- * ----------------------------------------------------------------------------- */
-
-void DohSetVoid(DOH *obj, const DOH *name, void *value) {
-  Setattr(obj, (DOH *) name, NewVoid(value, 0));
-}
-
-/* -----------------------------------------------------------------------------
- * DohIsSequence()
- * ----------------------------------------------------------------------------- */
-
-int DohIsSequence(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (!DohCheck(b))
-    return 0;
-  objinfo = b->type;
-  if (objinfo->doh_list)
-    return 1;
-  else
-    return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetitem()
- * ----------------------------------------------------------------------------- */
-
-DOH *DohGetitem(DOH *obj, int index) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_list && objinfo->doh_list->doh_getitem) {
-    return (objinfo->doh_list->doh_getitem) (b, index);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetitem()
- * ----------------------------------------------------------------------------- */
-
-int DohSetitem(DOH *obj, int index, const DOH *value) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_list && objinfo->doh_list->doh_setitem) {
-    return (objinfo->doh_list->doh_setitem) (b, index, (DOH *) value);
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * DohDelitem()
- * ----------------------------------------------------------------------------- */
-
-int DohDelitem(DOH *obj, int index) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_list && objinfo->doh_list->doh_delitem) {
-    return (objinfo->doh_list->doh_delitem) (b, index);
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * DohInsertitem()
- * ----------------------------------------------------------------------------- */
-
-int DohInsertitem(DOH *obj, int index, const DOH *value) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_list && objinfo->doh_list->doh_insitem) {
-    return (objinfo->doh_list->doh_insitem) (b, index, (DOH *) value);
-  }
-  return -1;
-}
-
-
-/* -----------------------------------------------------------------------------
- * DohDelslice()
- * ----------------------------------------------------------------------------- */
-
-int DohDelslice(DOH *obj, int sindex, int eindex) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo = b->type;
-  if (objinfo->doh_list && objinfo->doh_list->doh_delslice) {
-    return (objinfo->doh_list->doh_delslice) (b, sindex, eindex);
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * DohIsFile()
- * ----------------------------------------------------------------------------- */
-
-int DohIsFile(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (!DohCheck(b))
-    return 0;
-  objinfo = b->type;
-  if (objinfo->doh_file)
-    return 1;
-  else
-    return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohRead()
- * ----------------------------------------------------------------------------- */
-
-int DohRead(DOH *obj, void *buffer, int length) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if ((objinfo->doh_file) && (objinfo->doh_file->doh_read)) {
-      return (objinfo->doh_file->doh_read) (b, buffer, length);
-    }
-    return -1;
-  }
-  /* Hmmm.  Not a file.  Maybe it's a real FILE */
-  return (int)fread(buffer, 1, length, (FILE *) b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohWrite()
- * ----------------------------------------------------------------------------- */
-
-int DohWrite(DOH *obj, const void *buffer, int length) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if ((objinfo->doh_file) && (objinfo->doh_file->doh_write)) {
-      return (objinfo->doh_file->doh_write) (b, buffer, length);
-    }
-    return -1;
-  }
-  /* Hmmm.  Not a file.  Maybe it's a real FILE */
-  return (int)fwrite(buffer, 1, length, (FILE *) b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohSeek()
- * ----------------------------------------------------------------------------- */
-
-int DohSeek(DOH *obj, long offset, int whence) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if ((objinfo->doh_file) && (objinfo->doh_file->doh_seek)) {
-      return (objinfo->doh_file->doh_seek) (b, offset, whence);
-    }
-    return -1;
-  }
-  return fseek((FILE *) b, offset, whence);
-}
-
-/* -----------------------------------------------------------------------------
- * DohTell()
- * ----------------------------------------------------------------------------- */
-
-long DohTell(DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if ((objinfo->doh_file) && (objinfo->doh_file->doh_tell)) {
-      return (objinfo->doh_file->doh_tell) (b);
-    }
-    return -1;
-  }
-  return ftell((FILE *) b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetc()
- * ----------------------------------------------------------------------------- */
-
-int DohGetc(DOH *obj) {
-  static DOH *lastdoh = 0;
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (obj == lastdoh) {
-    objinfo = b->type;
-    return (objinfo->doh_file->doh_getc) (b);
-  }
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if (objinfo->doh_file->doh_getc) {
-      lastdoh = obj;
-      return (objinfo->doh_file->doh_getc) (b);
-    }
-    return EOF;
-  }
-  return fgetc((FILE *) b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohPutc()
- * ----------------------------------------------------------------------------- */
-
-int DohPutc(int ch, DOH *obj) {
-  static DOH *lastdoh = 0;
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-
-  if (obj == lastdoh) {
-    objinfo = b->type;
-    return (objinfo->doh_file->doh_putc) (b, ch);
-  }
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if (objinfo->doh_file->doh_putc) {
-      lastdoh = obj;
-      return (objinfo->doh_file->doh_putc) (b, ch);
-    }
-    return EOF;
-  }
-  return fputc(ch, (FILE *) b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohUngetc()
- * ----------------------------------------------------------------------------- */
-
-int DohUngetc(int ch, DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if (objinfo->doh_file->doh_ungetc) {
-      return (objinfo->doh_file->doh_ungetc) (b, ch);
-    }
-    return EOF;
-  }
-  return ungetc(ch, (FILE *) b);
-}
-
-/* -----------------------------------------------------------------------------
- * DohClose()
- * ----------------------------------------------------------------------------- */
-
-/*
-int DohClose(DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (DohCheck(obj)) {
-    objinfo = b->type;
-    if (objinfo->doh_file->doh_close) {
-      return (objinfo->doh_file->doh_close) (b);
-    }
-    return 0;
-  }
-  return fclose((FILE *) obj);
-}
-*/
-
-/* -----------------------------------------------------------------------------
- * DohIsString()
- * ----------------------------------------------------------------------------- */
-
-int DohIsString(const DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  DohObjInfo *objinfo;
-  if (!DohCheck(b))
-    return 0;
-  objinfo = b->type;
-  if (objinfo->doh_string)
-    return 1;
-  else
-    return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohReplace()
- * ----------------------------------------------------------------------------- */
-
-int DohReplace(DOH *src, const DOH *token, const DOH *rep, int flags) {
-  DohBase *b = (DohBase *) src;
-  DohObjInfo *objinfo;
-  if (!token)
-    return 0;
-  if (!rep)
-    rep = "";
-  if (DohIsString(src)) {
-    objinfo = b->type;
-    if (objinfo->doh_string->doh_replace) {
-      return (objinfo->doh_string->doh_replace) (b, (DOH *) token, (DOH *) rep, flags);
-    }
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohChop()
- * ----------------------------------------------------------------------------- */
-
-void DohChop(DOH *src) {
-  DohBase *b = (DohBase *) src;
-  DohObjInfo *objinfo;
-  if (DohIsString(src)) {
-    objinfo = b->type;
-    if (objinfo->doh_string->doh_chop) {
-      (objinfo->doh_string->doh_chop) (b);
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetFile()
- * ----------------------------------------------------------------------------- */
-void DohSetfile(DOH *ho, DOH *file) {
-  DohBase *h = (DohBase *) ho;
-  DohObjInfo *objinfo;
-  if (!h)
-    return;
-  objinfo = h->type;
-  if (objinfo->doh_setfile)
-    (objinfo->doh_setfile) (h, file);
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetFile()
- * ----------------------------------------------------------------------------- */
-DOH *DohGetfile(const DOH *ho) {
-  DohBase *h = (DohBase *) ho;
-  DohObjInfo *objinfo;
-  if (!h)
-    return 0;
-  objinfo = h->type;
-  if (objinfo->doh_getfile)
-    return (objinfo->doh_getfile) (h);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetLine()
- * ----------------------------------------------------------------------------- */
-void DohSetline(DOH *ho, int l) {
-  DohBase *h = (DohBase *) ho;
-  DohObjInfo *objinfo;
-  if (!h)
-    return;
-  objinfo = h->type;
-  if (objinfo->doh_setline)
-    (objinfo->doh_setline) (h, l);
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetLine()
- * ----------------------------------------------------------------------------- */
-int DohGetline(const DOH *ho) {
-  DohBase *h = (DohBase *) ho;
-  DohObjInfo *objinfo;
-  if (!h)
-    return 0;
-  objinfo = h->type;
-  if (objinfo->doh_getline)
-    return (objinfo->doh_getline) (h);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetmeta()
- * ----------------------------------------------------------------------------- */
-
-DOH *DohGetmeta(DOH *ho, const DOH *name) {
-  DohBase *h = (DohBase *) ho;
-  if (!DohCheck(ho))
-    return 0;
-  if (!h->meta)
-    return 0;
-  return DohGetattr(h->meta, name);
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetmeta()
- * ----------------------------------------------------------------------------- */
-
-int DohSetmeta(DOH *ho, const DOH *name, const DOH *value) {
-  DohBase *h = (DohBase *) ho;
-  if (!DohCheck(ho))
-    return 0;
-  if (!h->meta)
-    h->meta = NewHash();
-  return DohSetattr(h->meta, name, value);
-}
-
-/* -----------------------------------------------------------------------------
- * DohDelmeta()
- * ----------------------------------------------------------------------------- */
-
-int DohDelmeta(DOH *ho, const DOH *name) {
-  DohBase *h = (DohBase *) ho;
-  if (!DohCheck(ho))
-    return 0;
-  if (!h->meta)
-    return 0;
-  return DohDelattr(h->meta, name);
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetmark()
- * ----------------------------------------------------------------------------- */
-
-void DohSetmark(DOH *ho, int x) {
-  DohBase *h = (DohBase *) ho;
-  h->flag_usermark = x;
-}
-
-int DohGetmark(DOH *ho) {
-  DohBase *h = (DohBase *) ho;
-  return h->flag_usermark;
-}
-
-/* -----------------------------------------------------------------------------
- * DohCall()
- *
- * Invokes a function via DOH.  A Function is represented by a hash table with
- * the following attributes:
- *
- *       "builtin"    -  Pointer to built-in function (if any)
- *
- * (Additional attributes may be added later)
- * 
- * Returns a DOH object with result on success. Returns NULL on error
- * ----------------------------------------------------------------------------- */
-
-DOH *DohCall(DOH *func, DOH *args) {
-  DOH *result;
-  DohFuncPtr_t builtin;
-
-  builtin.p = GetVoid(func, "builtin");
-
-  if (!builtin.p)
-    return 0;
-  result = (*builtin.func) (args);
-  return result;
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/doh.h b/dependencies2013/win32/swig/Source/DOH/doh.h
deleted file mode 100644
index 5a9bae2b..00000000
--- a/dependencies2013/win32/swig/Source/DOH/doh.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * doh.h
- *
- *     This file describes of the externally visible functions in DOH.
- * ----------------------------------------------------------------------------- */
-
-#ifndef _DOH_H
-#define _DOH_H
-
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-
-/* Set the namespace prefix for DOH API functions. This can be used to control
-   visibility of the functions in libraries */
-
-/* Set this macro if you want to change DOH linkage. You would do this if you
-   wanted to hide DOH in a library using a different set of names.  Note: simply
-   change "Doh" to a new name. */
-
-/*
-#define DOH_NAMESPACE(x) Doh ## x
-*/
-
-#ifdef DOH_NAMESPACE
-
-/* Namespace control.  These macros define all of the public API names in DOH */
-
-#define DohCheck           DOH_NAMESPACE(Check)
-#define DohIntern          DOH_NAMESPACE(Intern)
-#define DohDelete          DOH_NAMESPACE(Delete)
-#define DohCopy            DOH_NAMESPACE(Copy)
-#define DohClear           DOH_NAMESPACE(Clear)
-#define DohStr             DOH_NAMESPACE(Str)
-#define DohData            DOH_NAMESPACE(Data)
-#define DohDump            DOH_NAMESPACE(Dump)
-#define DohLen             DOH_NAMESPACE(Len)
-#define DohHashval         DOH_NAMESPACE(Hashval)
-#define DohCmp             DOH_NAMESPACE(Cmp)
-#define DohEqual           DOH_NAMESPACE(Equal)
-#define DohIncref          DOH_NAMESPACE(Incref)
-#define DohCheckattr       DOH_NAMESPACE(Checkattr)
-#define DohSetattr         DOH_NAMESPACE(Setattr)
-#define DohDelattr         DOH_NAMESPACE(Delattr)
-#define DohKeys            DOH_NAMESPACE(Keys)
-#define DohGetInt          DOH_NAMESPACE(GetInt)
-#define DohGetDouble       DOH_NAMESPACE(GetDouble)
-#define DohGetChar         DOH_NAMESPACE(GetChar)
-#define DohSetChar         DOH_NAMESPACE(SetChar)
-#define DohSetInt          DOH_NAMESPACE(SetInt)
-#define DohSetDouble       DOH_NAMESPACE(SetDouble)
-#define DohSetVoid         DOH_NAMESPACE(SetVoid)
-#define DohGetVoid         DOH_NAMESPACE(GetVoid)
-#define DohGetitem         DOH_NAMESPACE(Getitem)
-#define DohSetitem         DOH_NAMESPACE(Setitem)
-#define DohDelitem         DOH_NAMESPACE(Delitem)
-#define DohInsertitem      DOH_NAMESPACE(Insertitem)
-#define DohDelslice        DOH_NAMESPACE(Delslice)
-#define DohWrite           DOH_NAMESPACE(Write)
-#define DohRead            DOH_NAMESPACE(Read)
-#define DohSeek            DOH_NAMESPACE(Seek)
-#define DohTell            DOH_NAMESPACE(Tell)
-#define DohGetc            DOH_NAMESPACE(Getc)
-#define DohPutc            DOH_NAMESPACE(Putc)
-#define DohUngetc          DOH_NAMESPACE(Ungetc)
-#define DohGetline         DOH_NAMESPACE(Getline)
-#define DohSetline         DOH_NAMESPACE(Setline)
-#define DohGetfile         DOH_NAMESPACE(Getfile)
-#define DohSetfile         DOH_NAMESPACE(Setfile)
-#define DohReplace         DOH_NAMESPACE(Replace)
-#define DohChop            DOH_NAMESPACE(Chop)
-#define DohGetmeta         DOH_NAMESPACE(Getmeta)
-#define DohSetmeta         DOH_NAMESPACE(Setmeta)
-#define DohDelmeta         DOH_NAMESPACE(Delmeta)
-#define DohEncoding        DOH_NAMESPACE(Encoding)
-#define DohPrintf          DOH_NAMESPACE(Printf)
-#define DohvPrintf         DOH_NAMESPACE(vPrintf)
-#define DohPrintv          DOH_NAMESPACE(Printv)
-#define DohReadline        DOH_NAMESPACE(Readline)
-#define DohIsMapping       DOH_NAMESPACE(IsMapping)
-#define DohIsSequence      DOH_NAMESPACE(IsSequence)
-#define DohIsString        DOH_NAMESPACE(IsString)
-#define DohIsFile          DOH_NAMESPACE(IsFile)
-#define DohNewString       DOH_NAMESPACE(NewString)
-#define DohNewStringEmpty  DOH_NAMESPACE(NewStringEmpty)
-#define DohNewStringWithSize  DOH_NAMESPACE(NewStringWithSize)
-#define DohNewStringf      DOH_NAMESPACE(NewStringf)
-#define DohStrcmp          DOH_NAMESPACE(Strcmp)
-#define DohStrncmp         DOH_NAMESPACE(Strncmp)
-#define DohStrstr          DOH_NAMESPACE(Strstr)
-#define DohStrchr          DOH_NAMESPACE(Strchr)
-#define DohNewFile         DOH_NAMESPACE(NewFile)
-#define DohNewFileFromFile DOH_NAMESPACE(NewFileFromFile)
-#define DohNewFileFromFd   DOH_NAMESPACE(NewFileFromFd)
-#define DohFileErrorDisplay   DOH_NAMESPACE(FileErrorDisplay)
-#define DohClose           DOH_NAMESPACE(Close)
-#define DohCopyto          DOH_NAMESPACE(Copyto)
-#define DohNewList         DOH_NAMESPACE(NewList)
-#define DohNewHash         DOH_NAMESPACE(NewHash)
-#define DohNewVoid         DOH_NAMESPACE(NewVoid)
-#define DohSplit           DOH_NAMESPACE(Split)
-#define DohSplitLines      DOH_NAMESPACE(SplitLines)
-#define DohNone            DOH_NAMESPACE(None)
-#define DohCall            DOH_NAMESPACE(Call)
-#define DohObjMalloc       DOH_NAMESPACE(ObjMalloc)
-#define DohObjFree         DOH_NAMESPACE(ObjFree)
-#define DohMemoryDebug     DOH_NAMESPACE(MemoryDebug)
-#define DohStringType      DOH_NAMESPACE(StringType)
-#define DohListType        DOH_NAMESPACE(ListType)
-#define DohHashType        DOH_NAMESPACE(HashType)
-#define DohFileType        DOH_NAMESPACE(FileType)
-#define DohVoidType        DOH_NAMESPACE(VoidType)
-#define DohIterator        DOH_NAMESPACE(Iterator)
-#define DohFirst           DOH_NAMESPACE(First)
-#define DohNext            DOH_NAMESPACE(Next)
-#endif
-
-#define DOH_MAJOR_VERSION 0
-#define DOH_MINOR_VERSION 1
-
-typedef void DOH;
-
-/*
- * With dynamic typing, all DOH objects are technically of type 'void *'.
- * However, to clarify the reading of source code, the following symbolic
- * names are used.
- */
-
-#define DOHString          DOH
-#define DOHList            DOH
-#define DOHHash            DOH
-#define DOHFile            DOH
-#define DOHVoid            DOH
-#define DOHString_or_char  DOH
-#define DOHObj_or_char     DOH
-
-typedef const DOHString_or_char * const_String_or_char_ptr;
-typedef const DOHString_or_char * DOHconst_String_or_char_ptr;
-
-#define DOH_BEGIN          -1
-#define DOH_END            -2
-#define DOH_CUR            -3
-#define DOH_CURRENT        -3
-
-/* Iterator objects */
-
-typedef struct {
-  void *key;			/* Current key (if any)       */
-  void *item;			/* Current item               */
-  void *object;			/* Object being iterated over */
-  void *_current;		/* Internal use */
-  int _index;			/* Internal use */
-} DohIterator;
-
-/* Memory management */
-
-#ifndef DohMalloc
-#define DohMalloc malloc
-#endif
-#ifndef DohRealloc
-#define DohRealloc realloc
-#endif
-#ifndef DohFree
-#define DohFree free
-#endif
-
-extern int DohCheck(const DOH *ptr);	/* Check if a DOH object */
-extern void DohIntern(DOH *);	/* Intern an object      */
-
-/* Basic object methods.  Common to most objects */
-
-extern void DohDelete(DOH *obj);	/* Delete an object      */
-extern DOH *DohCopy(const DOH *obj);
-extern void DohClear(DOH *obj);
-extern DOHString *DohStr(const DOH *obj);
-extern void *DohData(const DOH *obj);
-extern int DohDump(const DOH *obj, DOHFile * out);
-extern int DohLen(const DOH *obj);
-extern int DohHashval(const DOH *obj);
-extern int DohCmp(const DOH *obj1, const DOH *obj2);
-extern int DohEqual(const DOH *obj1, const DOH *obj2);
-extern void DohIncref(DOH *obj);
-
-/* Mapping methods */
-
-extern DOH *DohGetattr(DOH *obj, const DOHString_or_char *name);
-extern int DohSetattr(DOH *obj, const DOHString_or_char *name, const DOHObj_or_char * value);
-extern int DohDelattr(DOH *obj, const DOHString_or_char *name);
-extern int DohCheckattr(DOH *obj, const DOHString_or_char *name, const DOHString_or_char *value);
-extern DOH *DohKeys(DOH *obj);
-extern int DohGetInt(DOH *obj, const DOHString_or_char *name);
-extern void DohSetInt(DOH *obj, const DOHString_or_char *name, int);
-extern double DohGetDouble(DOH *obj, const DOHString_or_char *name);
-extern void DohSetDouble(DOH *obj, const DOHString_or_char *name, double);
-extern char *DohGetChar(DOH *obj, const DOHString_or_char *name);
-extern void DohSetChar(DOH *obj, const DOH *name, char *value);
-extern void *DohGetFlagAttr(DOH *obj, const DOHString_or_char *name);
-extern int DohGetFlag(DOH *obj, const DOHString_or_char *name);
-extern void DohSetFlagAttr(DOH *obj, const DOHString_or_char *name, const DOHString_or_char *attr);
-extern void DohSetFlag(DOH *obj, const DOHString_or_char *name);
-extern void *DohGetVoid(DOH *obj, const DOHString_or_char *name);
-extern void DohSetVoid(DOH *obj, const DOHString_or_char *name, void *value);
-
-/* Sequence methods */
-
-extern DOH *DohGetitem(DOH *obj, int index);
-extern int DohSetitem(DOH *obj, int index, const DOHObj_or_char * value);
-extern int DohDelitem(DOH *obj, int index);
-extern int DohInsertitem(DOH *obj, int index, const DOHObj_or_char * value);
-extern int DohDelslice(DOH *obj, int sindex, int eindex);
-
-/* File methods */
-
-extern int DohWrite(DOHFile * obj, const void *buffer, int length);
-extern int DohRead(DOHFile * obj, void *buffer, int length);
-extern int DohSeek(DOHFile * obj, long offset, int whence);
-extern long DohTell(DOHFile * obj);
-extern int DohGetc(DOHFile * obj);
-extern int DohPutc(int ch, DOHFile * obj);
-extern int DohUngetc(int ch, DOHFile * obj);
-
-
-
-/* Iterators */
-extern DohIterator DohFirst(DOH *obj);
-extern DohIterator DohNext(DohIterator x);
-
-/* Positional */
-
-extern int DohGetline(const DOH *obj);
-extern void DohSetline(DOH *obj, int line);
-extern DOH *DohGetfile(const DOH *obj);
-extern void DohSetfile(DOH *obj, DOH *file);
-
-  /* String Methods */
-
-extern int DohReplace(DOHString * src, const DOHString_or_char *token, const DOHString_or_char *rep, int flags);
-extern void DohChop(DOHString * src);
-
-/* Meta-variables */
-extern DOH *DohGetmeta(DOH *, const DOH *);
-extern int DohSetmeta(DOH *, const DOH *, const DOH *value);
-extern int DohDelmeta(DOH *, const DOH *);
-
-  /* Utility functions */
-
-extern void DohEncoding(const char *name, DOH *(*fn) (DOH *s));
-extern int DohPrintf(DOHFile * obj, const char *format, ...);
-extern int DohvPrintf(DOHFile * obj, const char *format, va_list ap);
-extern int DohPrintv(DOHFile * obj, ...);
-extern DOH *DohReadline(DOHFile * in);
-
-  /* Miscellaneous */
-
-extern int DohIsMapping(const DOH *obj);
-extern int DohIsSequence(const DOH *obj);
-extern int DohIsString(const DOH *obj);
-extern int DohIsFile(const DOH *obj);
-
-extern void DohSetMaxHashExpand(int count);
-extern int DohGetMaxHashExpand(void);
-extern void DohSetmark(DOH *obj, int x);
-extern int DohGetmark(DOH *obj);
-
-/* -----------------------------------------------------------------------------
- * Strings.
- * ----------------------------------------------------------------------------- */
-
-extern DOHString *DohNewStringEmpty(void);
-extern DOHString *DohNewString(const DOHString_or_char *c);
-extern DOHString *DohNewStringWithSize(const DOHString_or_char *c, int len);
-extern DOHString *DohNewStringf(const DOHString_or_char *fmt, ...);
-
-extern int DohStrcmp(const DOHString_or_char *s1, const DOHString_or_char *s2);
-extern int DohStrncmp(const DOHString_or_char *s1, const DOHString_or_char *s2, int n);
-extern char *DohStrstr(const DOHString_or_char *s1, const DOHString_or_char *s2);
-extern char *DohStrchr(const DOHString_or_char *s1, int ch);
-
-/* String replacement flags */
-
-#define   DOH_REPLACE_ANY         0x01
-#define   DOH_REPLACE_NOQUOTE     0x02
-#define   DOH_REPLACE_ID          0x04
-#define   DOH_REPLACE_FIRST       0x08
-#define   DOH_REPLACE_ID_BEGIN    0x10
-#define   DOH_REPLACE_ID_END      0x20
-#define   DOH_REPLACE_NUMBER_END  0x40
-
-#define Replaceall(s,t,r)  DohReplace(s,t,r,DOH_REPLACE_ANY)
-#define Replaceid(s,t,r)   DohReplace(s,t,r,DOH_REPLACE_ID)
-
-/* -----------------------------------------------------------------------------
- * Files
- * ----------------------------------------------------------------------------- */
-
-extern DOHFile *DohNewFile(DOH *filename, const char *mode, DOHList *outfiles);
-extern DOHFile *DohNewFileFromFile(FILE *f);
-extern DOHFile *DohNewFileFromFd(int fd);
-extern void DohFileErrorDisplay(DOHString * filename);
-/*
- Deprecated, just use DohDelete
-extern int DohClose(DOH *file);
-*/
-extern int DohCopyto(DOHFile * input, DOHFile * output);
-
-
-/* -----------------------------------------------------------------------------
- * List
- * ----------------------------------------------------------------------------- */
-
-extern DOHList *DohNewList(void);
-extern void DohSortList(DOH *lo, int (*cmp) (const DOH *, const DOH *));
-
-/* -----------------------------------------------------------------------------
- * Hash
- * ----------------------------------------------------------------------------- */
-
-extern DOHHash *DohNewHash(void);
-
-/* -----------------------------------------------------------------------------
- * Void
- * ----------------------------------------------------------------------------- */
-
-extern DOHVoid *DohNewVoid(void *ptr, void (*del) (void *));
-extern DOHList *DohSplit(DOHFile * input, char ch, int nsplits);
-extern DOHList *DohSplitLines(DOHFile * input);
-extern DOH *DohNone;
-
-/* Helper union for converting between function and object pointers. */
-typedef union DohFuncPtr {
-  void* p;
-  DOH *(*func)(DOH *);
-} DohFuncPtr_t;
-
-extern void DohMemoryDebug(void);
-
-#ifndef DOH_LONG_NAMES
-/* Macros to invoke the above functions.  Includes the location of
-   the caller to simplify debugging if something goes wrong */
-
-#define Delete             DohDelete
-#define Copy               DohCopy
-#define Clear              DohClear
-#define Str                DohStr
-#define Dump               DohDump
-#define Getattr            DohGetattr
-#define Setattr            DohSetattr
-#define Delattr            DohDelattr
-#define Checkattr          DohCheckattr
-#define Hashval            DohHashval
-#define Getitem            DohGetitem
-#define Setitem            DohSetitem
-#define Delitem            DohDelitem
-#define Insert             DohInsertitem
-#define Delslice           DohDelslice
-#define Append(s,x)        DohInsertitem(s,DOH_END,x)
-#define Push(s,x)          DohInsertitem(s,DOH_BEGIN,x)
-#define Len                DohLen
-#define Data               DohData
-#define Char               (char *) Data
-#define Cmp                DohCmp
-#define Equal              DohEqual
-#define Setline            DohSetline
-#define Getline            DohGetline
-#define Setfile            DohSetfile
-#define Getfile            DohGetfile
-#define Write              DohWrite
-#define Read               DohRead
-#define Seek               DohSeek
-#define Tell               DohTell
-#define Printf             DohPrintf
-#define Printv             DohPrintv
-#define Getc               DohGetc
-#define Putc               DohPutc
-#define Ungetc             DohUngetc
-
-/* #define StringPutc         DohStringPutc */
-/* #define StringGetc         DohStringGetc */
-/* #define StringUngetc       DohStringUngetc */
-/* #define StringAppend       Append */
-/* #define StringLen          DohStringLen */
-/* #define StringChar         DohStringChar */
-/* #define StringEqual        DohStringEqual */
-
-#define Close              DohClose
-#define vPrintf            DohvPrintf
-#define GetInt             DohGetInt
-#define GetDouble          DohGetDouble
-#define GetChar            DohGetChar
-#define GetVoid            DohGetVoid
-#define GetFlagAttr        DohGetFlagAttr
-#define GetFlag            DohGetFlag
-#define SetInt             DohSetInt
-#define SetDouble          DohSetDouble
-#define SetChar            DohSetattr
-#define SetVoid            DohSetVoid
-#define SetFlagAttr        DohSetFlagAttr
-#define SetFlag            DohSetFlag
-#define UnsetFlag(o,n)     DohSetFlagAttr(o,n,NULL)
-#define ClearFlag(o,n)     DohSetFlagAttr(o,n,"")
-#define Readline           DohReadline
-#define Replace            DohReplace
-#define Chop               DohChop
-#define Getmeta            DohGetmeta
-#define Setmeta            DohSetmeta
-#define Delmeta            DohDelmeta
-#define NewString          DohNewString
-#define NewStringEmpty     DohNewStringEmpty
-#define NewStringWithSize  DohNewStringWithSize
-#define NewStringf         DohNewStringf
-#define NewHash            DohNewHash
-#define NewList            DohNewList
-#define NewFile            DohNewFile
-#define NewFileFromFile    DohNewFileFromFile
-#define NewFileFromFd      DohNewFileFromFd
-#define FileErrorDisplay   DohFileErrorDisplay
-#define Close              DohClose
-#define NewVoid            DohNewVoid
-#define Keys               DohKeys
-#define Strcmp             DohStrcmp
-#define Strncmp            DohStrncmp
-#define Strstr             DohStrstr
-#define Strchr             DohStrchr
-#define Copyto             DohCopyto
-#define Split              DohSplit
-#define SplitLines         DohSplitLines
-#define Setmark            DohSetmark
-#define Getmark            DohGetmark
-#define SetMaxHashExpand   DohSetMaxHashExpand
-#define GetMaxHashExpand   DohGetMaxHashExpand
-#define None               DohNone
-#define Call               DohCall
-#define First              DohFirst
-#define Next               DohNext
-#define Iterator           DohIterator
-#define SortList           DohSortList
-#endif
-
-#ifdef NIL
-#undef NIL
-#endif
-
-#define NIL  (char *) NULL
-
-
-#endif				/* DOH_H */
diff --git a/dependencies2013/win32/swig/Source/DOH/dohint.h b/dependencies2013/win32/swig/Source/DOH/dohint.h
deleted file mode 100644
index c073bd95..00000000
--- a/dependencies2013/win32/swig/Source/DOH/dohint.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * dohint.h
- *
- *     This file describes internally managed objects.
- * ----------------------------------------------------------------------------- */
-
-#ifndef _DOHINT_H
-#define _DOHINT_H
-
-#include "doh.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-#include <stdarg.h>
-
-/* Hash objects */
-typedef struct {
-  DOH *(*doh_getattr) (DOH *obj, DOH *name);	/* Get attribute */
-  int (*doh_setattr) (DOH *obj, DOH *name, DOH *value);	/* Set attribute */
-  int (*doh_delattr) (DOH *obj, DOH *name);	/* Del attribute */
-  DOH *(*doh_keys) (DOH *obj);	/* All keys as a list */
-} DohHashMethods;
-
-/* List objects */
-typedef struct {
-  DOH *(*doh_getitem) (DOH *obj, int index);	/* Get item      */
-  int (*doh_setitem) (DOH *obj, int index, DOH *value);	/* Set item      */
-  int (*doh_delitem) (DOH *obj, int index);	/* Delete item   */
-  int (*doh_insitem) (DOH *obj, int index, DOH *value);	/* Insert item   */
-  int (*doh_delslice) (DOH *obj, int sindex, int eindex);	/* Delete slice  */
-} DohListMethods;
-
-/* File methods */
-typedef struct {
-  int (*doh_read) (DOH *obj, void *buffer, int nbytes);	/* Read bytes */
-  int (*doh_write) (DOH *obj, const void *buffer, int nbytes);	/* Write bytes */
-  int (*doh_putc) (DOH *obj, int ch);	/* Put character */
-  int (*doh_getc) (DOH *obj);	/* Get character */
-  int (*doh_ungetc) (DOH *obj, int ch);	/* Unget character */
-  int (*doh_seek) (DOH *obj, long offset, int whence);	/* Seek */
-  long (*doh_tell) (DOH *obj);	/* Tell */
-  int (*doh_close) (DOH *obj);	/* Close */
-} DohFileMethods;
-
-/* String methods */
-typedef struct {
-  int (*doh_replace) (DOH *obj, const DOHString_or_char *old, const DOHString_or_char *rep, int flags);
-  void (*doh_chop) (DOH *obj);
-} DohStringMethods;
-
-/* -----------------------------------------------------------------------------
- * DohObjInfo
- * ----------------------------------------------------------------------------- */
-
-typedef struct DohObjInfo {
-  const char *objname;		/* Object name        */
-
-  /* Basic object methods */
-  void (*doh_del) (DOH *obj);	/* Delete object      */
-  DOH *(*doh_copy) (DOH *obj);	/* Copy and object    */
-  void (*doh_clear) (DOH *obj);	/* Clear an object    */
-
-  /* I/O methods */
-  DOH *(*doh_str) (DOH *obj);	/* Make a full string */
-  void *(*doh_data) (DOH *obj);	/* Return raw data    */
-  int (*doh_dump) (DOH *obj, DOH *out);	/* Serialize on out   */
-
-  /* Length and hash values */
-  int (*doh_len) (DOH *obj);
-  int (*doh_hashval) (DOH *obj);
-
-  /* Compare */
-  int (*doh_cmp) (DOH *obj1, DOH *obj2);
-
-  /* Equal */
-  int (*doh_equal) (DOH *obj1, DOH *obj2);
-
-  /* Iterators */
-  DohIterator (*doh_first) (DOH *obj);
-  DohIterator (*doh_next) (DohIterator);
-
-  /* Positional */
-  void (*doh_setfile) (DOH *obj, DOHString_or_char *file);
-  DOH *(*doh_getfile) (DOH *obj);
-  void (*doh_setline) (DOH *obj, int line);
-  int (*doh_getline) (DOH *obj);
-
-  DohHashMethods *doh_hash;	/* Hash methods       */
-  DohListMethods *doh_list;	/* List methods       */
-  DohFileMethods *doh_file;	/* File methods       */
-  DohStringMethods *doh_string;	/* String methods     */
-  void *doh_reserved;		/* Reserved           */
-  void *clientdata;		/* User data          */
-} DohObjInfo;
-
-typedef struct {
-  void *data;			/* Data pointer */
-  DohObjInfo *type;
-  void *meta;			/* Meta data */
-  unsigned int flag_intern:1;	/* Interned object */
-  unsigned int flag_marked:1;	/* Mark flag. Used to avoid recursive loops in places */
-  unsigned int flag_user:1;	/* User flag */
-  unsigned int flag_usermark:1;	/* User marked */
-  unsigned int refcount:28;	/* Reference count (max 16 million) */
-} DohBase;
-
-/* Macros for decrefing and increfing (safe for null objects). */
-
-#define Decref(a)         if (a) ((DohBase *) a)->refcount--
-#define Incref(a)         if (a) ((DohBase *) a)->refcount++
-#define Refcount(a)       ((DohBase *) a)->refcount
-
-/* Macros for manipulating objects in a safe manner */
-#define ObjData(a)        ((DohBase *)a)->data
-#define ObjSetMark(a,x)   ((DohBase *)a)->flag_marked = x
-#define ObjGetMark(a)     ((DohBase *)a)->flag_marked
-#define ObjType(a)        ((DohBase *)a)->type
-
-extern DOH *DohObjMalloc(DohObjInfo *type, void *data);	/* Allocate a DOH object */
-extern void DohObjFree(DOH *ptr);	/* Free a DOH object     */
-
-#endif				/* DOHINT_H */
diff --git a/dependencies2013/win32/swig/Source/DOH/file.c b/dependencies2013/win32/swig/Source/DOH/file.c
deleted file mode 100644
index 5c56771d..00000000
--- a/dependencies2013/win32/swig/Source/DOH/file.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * file.c
- *
- *     This file implements a file-like object that can be built around an 
- *     ordinary FILE * or integer file descriptor.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-#ifdef DOH_INTFILE
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-typedef struct {
-  FILE *filep;
-  int fd;
-  int closeondel;
-} DohFile;
-
-/* -----------------------------------------------------------------------------
- * DelFile()
- * ----------------------------------------------------------------------------- */
-
-static void DelFile(DOH *fo) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->closeondel) {
-    if (f->filep) {
-      fclose(f->filep);
-    }
-#ifdef DOH_INTFILE
-    if (f->fd) {
-      close(f->fd);
-    }
-#endif
-  }
-  DohFree(f);
-}
-
-/* -----------------------------------------------------------------------------
- * File_read()
- * ----------------------------------------------------------------------------- */
-
-static int File_read(DOH *fo, void *buffer, int len) {
-  DohFile *f = (DohFile *) ObjData(fo);
-
-  if (f->filep) {
-    return (int)fread(buffer, 1, len, f->filep);
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    return read(f->fd, buffer, len);
-#endif
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * File_write()
- * ----------------------------------------------------------------------------- */
-
-static int File_write(DOH *fo, const void *buffer, int len) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    int ret = (int) fwrite(buffer, 1, len, f->filep);
-    int err = (ret != len) ? ferror(f->filep) : 0;
-    return err ? -1 : ret;
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    return write(f->fd, buffer, len);
-#endif
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * File_seek()
- * ----------------------------------------------------------------------------- */
-
-static int File_seek(DOH *fo, long offset, int whence) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    return fseek(f->filep, offset, whence);
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    return lseek(f->fd, offset, whence);
-#endif
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * File_tell()
- * ----------------------------------------------------------------------------- */
-
-static long File_tell(DOH *fo) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    return ftell(f->filep);
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    return lseek(f->fd, 0, SEEK_CUR);
-#endif
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * File_putc()
- * ----------------------------------------------------------------------------- */
-
-static int File_putc(DOH *fo, int ch) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    return fputc(ch, f->filep);
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    char c;
-    c = (char) ch;
-    return write(f->fd, &c, 1);
-#endif
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * File_getc()
- * ----------------------------------------------------------------------------- */
-
-static int File_getc(DOH *fo) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    return fgetc(f->filep);
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    unsigned char c;
-    if (read(f->fd, &c, 1) < 0)
-      return EOF;
-    return c;
-#endif
-  }
-  return EOF;
-}
-
-/* -----------------------------------------------------------------------------
- * File_ungetc()
- *
- * Put a character back onto the input
- * ----------------------------------------------------------------------------- */
-
-static int File_ungetc(DOH *fo, int ch) {
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    return ungetc(ch, f->filep);
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    /* Not implemented yet */
-#endif
-  }
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * File_close()
- *
- * Close the file
- * ----------------------------------------------------------------------------- */
-
-static int File_close(DOH *fo) {
-  int ret = 0;
-  DohFile *f = (DohFile *) ObjData(fo);
-  if (f->filep) {
-    ret = fclose(f->filep);
-    f->filep = 0;
-  } else if (f->fd) {
-#ifdef DOH_INTFILE
-    ret = close(f->fd);
-    f->fd = 0;
-#endif
-  }
-  return ret;
-}
-
-static DohFileMethods FileFileMethods = {
-  File_read,
-  File_write,
-  File_putc,
-  File_getc,
-  File_ungetc,
-  File_seek,
-  File_tell,
-  File_close,			/* close */
-};
-
-static DohObjInfo DohFileType = {
-  "DohFile",			/* objname      */
-  DelFile,			/* doh_del      */
-  0,				/* doh_copy     */
-  0,				/* doh_clear    */
-  0,				/* doh_str      */
-  0,				/* doh_data     */
-  0,				/* doh_dump     */
-  0,				/* doh_len      */
-  0,				/* doh_hash     */
-  0,				/* doh_cmp      */
-  0,				/* doh_equal    */
-  0,				/* doh_first    */
-  0,				/* doh_next     */
-  0,				/* doh_setfile  */
-  0,				/* doh_getfile  */
-  0,				/* doh_setline  */
-  0,				/* doh_getline  */
-  0,				/* doh_mapping  */
-  0,				/* doh_sequence */
-  &FileFileMethods,		/* doh_file     */
-  0,				/* doh_string   */
-  0,				/* doh_callable */
-  0,				/* doh_position */
-};
-
-/* -----------------------------------------------------------------------------
- * NewFile()
- *
- * Create a new file from a given filename and mode.
- * If newfiles is non-zero, the filename is added to the list of new files.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohNewFile(DOH *filename, const char *mode, DOHList *newfiles) {
-  DohFile *f;
-  FILE *file;
-  char *filen;
-
-  filen = Char(filename);
-  file = fopen(filen, mode);
-  if (!file)
-    return 0;
-
-  f = (DohFile *) DohMalloc(sizeof(DohFile));
-  if (!f) {
-    fclose(file);
-    return 0;
-  }
-  if (newfiles)
-    Append(newfiles, filename);
-  f->filep = file;
-  f->fd = 0;
-  f->closeondel = 1;
-  return DohObjMalloc(&DohFileType, f);
-}
-
-/* -----------------------------------------------------------------------------
- * NewFileFromFile()
- *
- * Create a file object from an already open FILE *.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohNewFileFromFile(FILE *file) {
-  DohFile *f;
-  f = (DohFile *) DohMalloc(sizeof(DohFile));
-  if (!f)
-    return 0;
-  f->filep = file;
-  f->fd = 0;
-  f->closeondel = 0;
-  return DohObjMalloc(&DohFileType, f);
-}
-
-/* -----------------------------------------------------------------------------
- * NewFileFromFd()
- *
- * Create a file object from an already open FILE *.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohNewFileFromFd(int fd) {
-  DohFile *f;
-  f = (DohFile *) DohMalloc(sizeof(DohFile));
-  if (!f)
-    return 0;
-  f->filep = 0;
-  f->fd = fd;
-  f->closeondel = 0;
-  return DohObjMalloc(&DohFileType, f);
-}
-
-/* -----------------------------------------------------------------------------
- * FileErrorDisplay()
- *
- * Display cause of one of the NewFile functions failing.
- * ----------------------------------------------------------------------------- */
-
-void DohFileErrorDisplay(DOHString * filename) {
-  Printf(stderr, "Unable to open file %s: %s\n", filename, strerror(errno));
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/fio.c b/dependencies2013/win32/swig/Source/DOH/fio.c
deleted file mode 100644
index 77419008..00000000
--- a/dependencies2013/win32/swig/Source/DOH/fio.c
+++ /dev/null
@@ -1,599 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * fio.c
- *
- *     This file implements a number of standard I/O operations included
- *     formatted output, readline, and splitting.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-#define OBUFLEN  512
-
-static DOH *encodings = 0;	/* Encoding hash */
-
-/* -----------------------------------------------------------------------------
- * Writen()
- *
- * Writes N characters of output and retries until all characters are
- * written.  This is useful should a write operation encounter a spurious signal.
- * ----------------------------------------------------------------------------- */
-
-static int Writen(DOH *out, void *buffer, int len) {
-  int nw = len, ret;
-  char *cb = (char *) buffer;
-  while (nw) {
-    ret = Write(out, cb, nw);
-    if (ret < 0)
-      return -1;
-    nw = nw - ret;
-    cb += ret;
-  }
-  return len;
-}
-
-/* -----------------------------------------------------------------------------
- * DohEncoding()
- *
- * Registers a new printf encoding method.  An encoder function should accept
- * two file-like objects and operate as a filter.
- * ----------------------------------------------------------------------------- */
-
-void DohEncoding(const char *name, DOH *(*fn) (DOH *s)) {
-  DohFuncPtr_t fp;
-
-  if (!encodings)
-    encodings = NewHash();
-
-  fp.func = fn;
-  Setattr(encodings, (void *) name, NewVoid(fp.p, 0));
-}
-
-/* internal function for processing an encoding */
-static DOH *encode(char *name, DOH *s) {
-  DOH *handle, *ns;
-  DohFuncPtr_t fp;
-  long pos;
-  char *cfmt = strchr(name, ':');
-  DOH *tmp = 0;
-  if (cfmt) {
-    tmp = NewString(cfmt + 1);
-    Append(tmp, s);
-    Setfile(tmp, Getfile((DOH *) s));
-    Setline(tmp, Getline((DOH *) s));
-    *cfmt = '\0';
-  }
-  if (!encodings || !(handle = Getattr(encodings, name))) {
-    return Copy(s);
-  }
-  if (tmp)
-    s = tmp;
-  pos = Tell(s);
-  Seek(s, 0, SEEK_SET);
-
-  fp.p = Data(handle);
-  ns = (*fp.func) (s);
-  assert(pos != -1);
-  (void)Seek(s, pos, SEEK_SET);
-  if (tmp)
-    Delete(tmp);
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * DohvPrintf()
- *
- * DOH implementation of printf.  Output can be directed to any file-like object
- * including bare FILE * objects.  The same formatting codes as printf are
- * recognized with two extensions:
- *
- *       %s          - Prints a "char *" or the string representation of any
- *                     DOH object.  This will implicitly result in a call to
- *                     Str(obj).
- *
- *       %(encoder)* - Filters the output through an encoding function registered
- *                     with DohEncoder().
- *
- * Note: This function is not particularly memory efficient with large strings.
- * It's better to use Dump() or some other method instead.
- * ----------------------------------------------------------------------------- */
-
-int DohvPrintf(DOH *so, const char *format, va_list ap) {
-  static const char *fmt_codes = "dioxXucsSfeEgGpn";
-  int state = 0;
-  const char *p = format;
-  char newformat[256];
-  char obuffer[OBUFLEN];
-  char *fmt = 0;
-  char temp[64];
-  int widthval = 0;
-  int precval = 0;
-  int maxwidth;
-  char *w = 0;
-  int ivalue;
-  double dvalue;
-  void *pvalue;
-  char *stemp;
-  int nbytes = 0;
-  char encoder[128], *ec = 0;
-  int plevel = 0;
-
-  memset(newformat, 0, sizeof(newformat));
-
-  while (*p) {
-    switch (state) {
-    case 0:			/* Ordinary text */
-      if (*p != '%') {
-	Putc(*p, so);
-	nbytes++;
-      } else {
-	fmt = newformat;
-	widthval = 0;
-	precval = 0;
-	*(fmt++) = *p;
-	encoder[0] = 0;
-	state = 10;
-      }
-      break;
-    case 10:			/* Look for a width and precision */
-      if (isdigit((int) *p) && (*p != '0')) {
-	w = temp;
-	*(w++) = *p;
-	*(fmt++) = *p;
-	state = 20;
-      } else if (strchr(fmt_codes, *p)) {
-	/* Got one of the formatting codes */
-	p--;
-	state = 100;
-      } else if (*p == '*') {
-	/* Width field is specified in the format list */
-	widthval = va_arg(ap, int);
-	sprintf(temp, "%d", widthval);
-	for (w = temp; *w; w++) {
-	  *(fmt++) = *w;
-	}
-	state = 30;
-      } else if (*p == '%') {
-	Putc(*p, so);
-	fmt = newformat;
-	nbytes++;
-	state = 0;
-      } else if (*p == '(') {
-	++plevel;
-	ec = encoder;
-	state = 60;
-      } else {
-	*(fmt++) = *p;
-      }
-      break;
-
-    case 20:			/* Hmmm. At the start of a width field */
-      if (isdigit((int) *p)) {
-	*(w++) = *p;
-	*(fmt++) = *p;
-      } else if (strchr(fmt_codes, *p)) {
-	/* Got one of the formatting codes */
-	/* Figure out width */
-	*w = 0;
-	widthval = atoi(temp);
-	p--;
-	state = 100;
-      } else if (*p == '.') {
-	*w = 0;
-	widthval = atoi(temp);
-	w = temp;
-	*(fmt++) = *p;
-	state = 40;
-      } else {
-	/* ??? */
-	*w = 0;
-	widthval = atoi(temp);
-	state = 50;
-      }
-      break;
-
-    case 30:			/* Parsed a width from an argument.  Look for a . */
-      if (*p == '.') {
-	w = temp;
-	*(fmt++) = *p;
-	state = 40;
-      } else if (strchr(fmt_codes, *p)) {
-	/* Got one of the formatting codes */
-	/* Figure out width */
-	p--;
-	state = 100;
-      } else {
-	/* hmmm. Something else. */
-	state = 50;
-      }
-      break;
-
-    case 40:
-      /* Start of precision expected */
-      if (isdigit((int) *p) && (*p != '0')) {
-	*(fmt++) = *p;
-	*(w++) = *p;
-	state = 41;
-      } else if (*p == '*') {
-	/* Precision field is specified in the format list */
-	precval = va_arg(ap, int);
-	sprintf(temp, "%d", precval);
-	for (w = temp; *w; w++) {
-	  *(fmt++) = *w;
-	}
-	state = 50;
-      } else if (strchr(fmt_codes, *p)) {
-	p--;
-	state = 100;
-      } else {
-	*(fmt++) = *p;
-	state = 50;
-      }
-      break;
-    case 41:
-      if (isdigit((int) *p)) {
-	*(fmt++) = *p;
-	*(w++) = *p;
-      } else if (strchr(fmt_codes, *p)) {
-	/* Got one of the formatting codes */
-	/* Figure out width */
-	*w = 0;
-	precval = atoi(temp);
-	p--;
-	state = 100;
-      } else {
-	*w = 0;
-	precval = atoi(temp);
-	*(fmt++) = *p;
-	state = 50;
-      }
-      break;
-      /* Hang out, wait for format specifier */
-    case 50:
-      if (strchr(fmt_codes, *p)) {
-	p--;
-	state = 100;
-      } else {
-	*(fmt++) = *p;
-      }
-      break;
-
-      /* Got an encoding header */
-    case 60:
-      if (*p == '(') {
-	++plevel;
-	*ec = *p;
-	ec++;
-      } else if (*p == ')') {
-	--plevel;
-	if (plevel <= 0) {
-	  *ec = 0;
-	  state = 10;
-	} else {
-	  *ec = *p;
-	  ec++;
-	}
-      } else {
-	*ec = *p;
-	ec++;
-      }
-      break;
-    case 100:
-      /* Got a formatting code */
-      if (widthval < precval)
-	maxwidth = precval;
-      else
-	maxwidth = widthval;
-      if ((*p == 's') || (*p == 'S')) {	/* Null-Terminated string */
-	DOH *doh;
-	DOH *Sval;
-	DOH *enc = 0;
-	doh = va_arg(ap, DOH *);
-	if (DohCheck(doh)) {
-	  /* Is a DOH object. */
-	  if (DohIsString(doh)) {
-	    Sval = doh;
-	  } else {
-	    Sval = Str(doh);
-	  }
-	  if (strlen(encoder)) {
-	    enc = encode(encoder, Sval);
-	    maxwidth = maxwidth + (int)strlen(newformat) + Len(enc);
-	  } else {
-	    maxwidth = maxwidth + (int)strlen(newformat) + Len(Sval);
-	  }
-	  *(fmt++) = 's';
-	  *fmt = 0;
-	  if ((maxwidth + 1) < OBUFLEN) {
-	    stemp = obuffer;
-	  } else {
-	    stemp = (char *) DohMalloc(maxwidth + 1);
-	  }
-	  if (enc) {
-	    nbytes += sprintf(stemp, newformat, Data(enc));
-	  } else {
-	    nbytes += sprintf(stemp, newformat, Data(Sval));
-	  }
-	  if (Writen(so, stemp, (int)strlen(stemp)) < 0)
-	    return -1;
-	  if ((DOH *) Sval != doh) {
-	    Delete(Sval);
-	  }
-	  if (enc)
-	    Delete(enc);
-	  if (*p == 'S') {
-	    Delete(doh);
-	  }
-	  if (stemp != obuffer) {
-	    DohFree(stemp);
-	  }
-	} else {
-	  if (!doh)
-	    doh = (char *) "";
-
-	  if (strlen(encoder)) {
-	    DOH *s = NewString(doh);
-	    Seek(s, 0, SEEK_SET);
-	    enc = encode(encoder, s);
-	    Delete(s);
-	    doh = Char(enc);
-	  } else {
-	    enc = 0;
-	  }
-	  maxwidth = maxwidth + (int)strlen(newformat) + (int)strlen((char *) doh);
-	  *(fmt++) = 's';
-	  *fmt = 0;
-	  if ((maxwidth + 1) < OBUFLEN) {
-	    stemp = obuffer;
-	  } else {
-	    stemp = (char *) DohMalloc(maxwidth + 1);
-	  }
-	  nbytes += sprintf(stemp, newformat, doh);
-	  if (Writen(so, stemp, (int)strlen(stemp)) < 0)
-	    return -1;
-	  if (stemp != obuffer) {
-	    DohFree(stemp);
-	  }
-	  if (enc)
-	    Delete(enc);
-	}
-      } else {
-	*(fmt++) = *p;
-	*fmt = 0;
-	maxwidth = maxwidth + (int)strlen(newformat) + 64;
-
-	/* Only allocate a buffer if it is too big to fit.  Shouldn't have to do
-	   this very often */
-
-	if (maxwidth < OBUFLEN)
-	  stemp = obuffer;
-	else
-	  stemp = (char *) DohMalloc(maxwidth + 1);
-	switch (*p) {
-	case 'd':
-	case 'i':
-	case 'o':
-	case 'u':
-	case 'x':
-	case 'X':
-	case 'c':
-	  ivalue = va_arg(ap, int);
-	  nbytes += sprintf(stemp, newformat, ivalue);
-	  break;
-	case 'f':
-	case 'g':
-	case 'e':
-	case 'E':
-	case 'G':
-	  dvalue = va_arg(ap, double);
-	  nbytes += sprintf(stemp, newformat, dvalue);
-	  break;
-	case 'p':
-	  pvalue = va_arg(ap, void *);
-	  nbytes += sprintf(stemp, newformat, pvalue);
-	  break;
-	default:
-	  break;
-	}
-	if (Writen(so, stemp, (int)strlen(stemp)) < 0)
-	  return -1;
-	if (stemp != obuffer)
-	  DohFree(stemp);
-      }
-      state = 0;
-      break;
-    }
-    p++;
-  }
-  if (state) {
-    int r;
-    *fmt = 0;
-    r = Writen(so, fmt, (int)strlen(fmt));
-    if (r < 0)
-      return -1;
-    nbytes += r;
-  }
-  return nbytes;
-}
-
-/* -----------------------------------------------------------------------------
- * DohPrintf()
- *
- * Variable length argument entry point to Printf
- * ----------------------------------------------------------------------------- */
-
-int DohPrintf(DOH *obj, const char *format, ...) {
-  va_list ap;
-  int ret;
-  va_start(ap, format);
-  ret = DohvPrintf(obj, format, ap);
-  va_end(ap);
-  return ret;
-}
-
-/* -----------------------------------------------------------------------------
- * DohPrintv()
- * 
- * Print a null-terminated variable length list of DOH objects
- * ----------------------------------------------------------------------------- */
-
-int DohPrintv(DOHFile * f, ...) {
-  va_list ap;
-  int ret = 0;
-  DOH *obj;
-  va_start(ap, f);
-  while (1) {
-    obj = va_arg(ap, void *);
-    if ((!obj) || (obj == DohNone))
-      break;
-    if (DohCheck(obj)) {
-      ret += DohDump(obj, f);
-    } else {
-      ret += DohWrite(f, obj, (int)strlen((char *) obj));
-    }
-  }
-  va_end(ap);
-  return ret;
-}
-
-/* ----------------------------------------------------------------------------- 
- * DohCopyto()
- *
- * Copies all of the input from an input stream to an output stream. Returns the
- * number of bytes copied.
- * ----------------------------------------------------------------------------- */
-
-int DohCopyto(DOH *in, DOH *out) {
-  int nbytes = 0, ret;
-  int nwrite = 0, wret;
-  char *cw;
-  char buffer[16384];
-
-  if ((!in) || (!out))
-    return 0;
-  while (1) {
-    ret = Read(in, buffer, 16384);
-    if (ret > 0) {
-      nwrite = ret;
-      cw = buffer;
-      while (nwrite) {
-	wret = Write(out, cw, nwrite);
-	if (wret < 0) {
-	  nbytes = -1;
-	  break;
-	}
-	nwrite = nwrite - wret;
-	cw += wret;
-      }
-      nbytes += ret;
-    } else {
-      break;
-    }
-  }
-  return nbytes;
-}
-
-
-/* -----------------------------------------------------------------------------
- * DohSplit()
- *
- * Split an input stream into a list of strings delimited by the specified
- * character.  Optionally accepts a maximum number of splits to perform.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohSplit(DOH *in, char ch, int nsplits) {
-  DOH *list;
-  DOH *str;
-  int c;
-
-  list = NewList();
-
-  if (DohIsString(in)) {
-    Seek(in, 0, SEEK_SET);
-  }
-
-  while (1) {
-    str = NewStringEmpty();
-    do {
-      c = Getc(in);
-    } while ((c != EOF) && (c == ch));
-    if (c != EOF) {
-      Putc(c, str);
-      while (1) {
-	c = Getc(in);
-	if ((c == EOF) || ((c == ch) && (nsplits != 0)))
-	  break;
-	Putc(c, str);
-      }
-      nsplits--;
-    }
-    Append(list, str);
-    Delete(str);
-    if (c == EOF)
-      break;
-  }
-  return list;
-}
-
-/* -----------------------------------------------------------------------------
- * DohSplitLines()
- *
- * Split an input stream into a list of strings delimited by newline characters.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohSplitLines(DOH *in) {
-  DOH *list;
-  DOH *str;
-  int c = 0;
-
-  list = NewList();
-
-  if (DohIsString(in)) {
-    Seek(in, 0, SEEK_SET);
-  }
-
-  while (c != EOF) {
-    str = NewStringEmpty();
-    while ((c = Getc(in)) != '\n' && c != EOF) {
-      Putc(c, str);
-    }
-    Append(list, str);
-    Delete(str);
-  }
-  return list;
-}
-
-
-/* -----------------------------------------------------------------------------
- * DohReadline()
- *
- * Read a single input line and return it as a string.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohReadline(DOH *in) {
-  char c;
-  int n = 0;
-  DOH *s = NewStringEmpty();
-  while (1) {
-    if (Read(in, &c, 1) < 0) {
-      if (n == 0) {
-	Delete(s);
-	s = 0;
-      }
-      break;
-    }
-    if (c == '\n')
-      break;
-    if (c == '\r')
-      continue;
-    Putc(c, s);
-    n++;
-  }
-  return s;
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/hash.c b/dependencies2013/win32/swig/Source/DOH/hash.c
deleted file mode 100644
index c2bc3dd9..00000000
--- a/dependencies2013/win32/swig/Source/DOH/hash.c
+++ /dev/null
@@ -1,586 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * hash.c
- *
- *     Implements a simple hash table object.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-extern DohObjInfo DohHashType;
-
-/* Hash node */
-typedef struct HashNode {
-  DOH *key;
-  DOH *object;
-  struct HashNode *next;
-} HashNode;
-
-/* Hash object */
-typedef struct Hash {
-  DOH *file;
-  int line;
-  HashNode **hashtable;
-  int hashsize;
-  int nitems;
-} Hash;
-
-/* Key interning structure */
-typedef struct KeyValue {
-  char *cstr;
-  DOH *sstr;
-  struct KeyValue *left;
-  struct KeyValue *right;
-} KeyValue;
-
-static KeyValue *root = 0;
-static int max_expand = 1;
-
-/* Find or create a key in the interned key table */
-static DOH *find_key(DOH *doh_c) {
-  char *c = (char *) doh_c;
-  KeyValue *r, *s;
-  int d = 0;
-  /* OK, sure, we use a binary tree for maintaining interned
-     symbols.  Then we use their hash values for accessing secondary
-     hash tables. */
-  r = root;
-  s = 0;
-  while (r) {
-    s = r;
-    d = strcmp(r->cstr, c);
-    if (d == 0)
-      return r->sstr;
-    if (d < 0)
-      r = r->left;
-    else
-      r = r->right;
-  }
-  /*  fprintf(stderr,"Interning '%s'\n", c); */
-  r = (KeyValue *) DohMalloc(sizeof(KeyValue));
-  r->cstr = (char *) DohMalloc(strlen(c) + 1);
-  strcpy(r->cstr, c);
-  r->sstr = NewString(c);
-  DohIntern(r->sstr);
-  r->left = 0;
-  r->right = 0;
-  if (!s) {
-    root = r;
-  } else {
-    if (d < 0)
-      s->left = r;
-    else
-      s->right = r;
-  }
-  return r->sstr;
-}
-
-#define HASH_INIT_SIZE   7
-
-/* Create a new hash node */
-static HashNode *NewNode(DOH *k, void *obj) {
-  HashNode *hn = (HashNode *) DohMalloc(sizeof(HashNode));
-  hn->key = k;
-  Incref(hn->key);
-  hn->object = obj;
-  Incref(obj);
-  hn->next = 0;
-  return hn;
-}
-
-/* Delete a hash node */
-static void DelNode(HashNode *hn) {
-  Delete(hn->key);
-  Delete(hn->object);
-  DohFree(hn);
-}
-
-/* -----------------------------------------------------------------------------
- * DelHash()
- *
- * Delete a hash table.
- * ----------------------------------------------------------------------------- */
-
-static void DelHash(DOH *ho) {
-  Hash *h = (Hash *) ObjData(ho);
-  HashNode *n, *next;
-  int i;
-
-  for (i = 0; i < h->hashsize; i++) {
-    n = h->hashtable[i];
-    while (n) {
-      next = n->next;
-      DelNode(n);
-      n = next;
-    }
-  }
-  DohFree(h->hashtable);
-  h->hashtable = 0;
-  h->hashsize = 0;
-  DohFree(h);
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_clear()
- *
- * Clear all of the entries in the hash table.
- * ----------------------------------------------------------------------------- */
-
-static void Hash_clear(DOH *ho) {
-  Hash *h = (Hash *) ObjData(ho);
-  HashNode *n, *next;
-  int i;
-
-  for (i = 0; i < h->hashsize; i++) {
-    n = h->hashtable[i];
-    while (n) {
-      next = n->next;
-      DelNode(n);
-      n = next;
-    }
-    h->hashtable[i] = 0;
-  }
-  h->nitems = 0;
-}
-
-/* resize the hash table */
-static void resize(Hash *h) {
-  HashNode *n, *next, **table;
-  int oldsize, newsize;
-  int i, p, hv;
-
-  if (h->nitems < 2 * h->hashsize)
-    return;
-
-  /* Too big. We have to rescale everything now */
-  oldsize = h->hashsize;
-
-  /* Calculate a new size */
-  newsize = 2 * oldsize + 1;
-  p = 3;
-  while (p < (newsize >> 1)) {
-    if (((newsize / p) * p) == newsize) {
-      newsize += 2;
-      p = 3;
-      continue;
-    }
-    p = p + 2;
-  }
-
-  table = (HashNode **) DohMalloc(newsize * sizeof(HashNode *));
-  for (i = 0; i < newsize; i++) {
-    table[i] = 0;
-  }
-
-  /* Walk down the old set of nodes and re-place */
-  h->hashsize = newsize;
-  for (i = 0; i < oldsize; i++) {
-    n = h->hashtable[i];
-    while (n) {
-      hv = Hashval(n->key) % newsize;
-      next = n->next;
-      n->next = table[hv];
-      table[hv] = n;
-      n = next;
-    }
-  }
-  DohFree(h->hashtable);
-  h->hashtable = table;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_setattr()
- *
- * Set an attribute in the hash table.  Deletes the existing entry if it already
- * exists.
- * ----------------------------------------------------------------------------- */
-
-static int Hash_setattr(DOH *ho, DOH *k, DOH *obj) {
-  int hv;
-  HashNode *n, *prev;
-  Hash *h = (Hash *) ObjData(ho);
-
-  if (!obj) {
-    return DohDelattr(ho, k);
-  }
-  if (!DohCheck(k))
-    k = find_key(k);
-  if (!DohCheck(obj)) {
-    obj = NewString((char *) obj);
-    Decref(obj);
-  }
-  hv = (Hashval(k)) % h->hashsize;
-  n = h->hashtable[hv];
-  prev = 0;
-  while (n) {
-    if (Cmp(n->key, k) == 0) {
-      /* Node already exists.  Just replace its contents */
-      if (n->object == obj) {
-	/* Whoa. Same object.  Do nothing */
-	return 1;
-      }
-      Delete(n->object);
-      n->object = obj;
-      Incref(obj);
-      return 1;			/* Return 1 to indicate a replacement */
-    } else {
-      prev = n;
-      n = n->next;
-    }
-  }
-  /* Add this to the table */
-  n = NewNode(k, obj);
-  if (prev)
-    prev->next = n;
-  else
-    h->hashtable[hv] = n;
-  h->nitems++;
-  resize(h);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_getattr()
- *
- * Get an attribute from the hash table. Returns 0 if it doesn't exist.
- * ----------------------------------------------------------------------------- */
-typedef int (*binop) (DOH *obj1, DOH *obj2);
-
-
-static DOH *Hash_getattr(DOH *h, DOH *k) {
-  DOH *obj = 0;
-  Hash *ho = (Hash *) ObjData(h);
-  DOH *ko = DohCheck(k) ? k : find_key(k);
-  int hv = Hashval(ko) % ho->hashsize;
-  DohObjInfo *k_type = ((DohBase*)ko)->type;
-  HashNode *n = ho->hashtable[hv];
-  if (k_type->doh_equal) {
-    binop equal = k_type->doh_equal;
-    while (n) {
-      DohBase *nk = (DohBase *)n->key;
-      if ((k_type == nk->type) && equal(ko, nk)) obj = n->object;
-      n = n->next;
-    }
-  } else {
-    binop cmp = k_type->doh_cmp;
-    while (n) {
-      DohBase *nk = (DohBase *)n->key;
-      if ((k_type == nk->type) && (cmp(ko, nk) == 0)) obj = n->object;
-      n = n->next;
-    }
-  }
-  return obj;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_delattr()
- *
- * Delete an object from the hash table.
- * ----------------------------------------------------------------------------- */
-
-static int Hash_delattr(DOH *ho, DOH *k) {
-  HashNode *n, *prev;
-  int hv;
-  Hash *h = (Hash *) ObjData(ho);
-
-  if (!DohCheck(k))
-    k = find_key(k);
-  hv = Hashval(k) % h->hashsize;
-  n = h->hashtable[hv];
-  prev = 0;
-  while (n) {
-    if (Cmp(n->key, k) == 0) {
-      /* Found it, kill it */
-
-      if (prev) {
-	prev->next = n->next;
-      } else {
-	h->hashtable[hv] = n->next;
-      }
-      DelNode(n);
-      h->nitems--;
-      return 1;
-    }
-    prev = n;
-    n = n->next;
-  }
-  return 0;
-}
-
-static DohIterator Hash_firstiter(DOH *ho) {
-  DohIterator iter;
-  Hash *h = (Hash *) ObjData(ho);
-  iter.object = ho;
-  iter._current = 0;
-  iter.item = 0;
-  iter.key = 0;
-  iter._index = 0;		/* Index in hash table */
-  while ((iter._index < h->hashsize) && !h->hashtable[iter._index])
-    iter._index++;
-
-  if (iter._index >= h->hashsize) {
-    return iter;
-  }
-  iter._current = h->hashtable[iter._index];
-  iter.item = ((HashNode *) iter._current)->object;
-  iter.key = ((HashNode *) iter._current)->key;
-
-  /* Actually save the next slot in the hash.  This makes it possible to
-     delete the item being iterated over without trashing the universe */
-  iter._current = ((HashNode *) iter._current)->next;
-  return iter;
-}
-
-static DohIterator Hash_nextiter(DohIterator iter) {
-  Hash *h = (Hash *) ObjData(iter.object);
-  if (!iter._current) {
-    iter._index++;
-    while ((iter._index < h->hashsize) && !h->hashtable[iter._index]) {
-      iter._index++;
-    }
-    if (iter._index >= h->hashsize) {
-      iter.item = 0;
-      iter.key = 0;
-      iter._current = 0;
-      return iter;
-    }
-    iter._current = h->hashtable[iter._index];
-  }
-  iter.key = ((HashNode *) iter._current)->key;
-  iter.item = ((HashNode *) iter._current)->object;
-
-  /* Store the next node to iterator on */
-  iter._current = ((HashNode *) iter._current)->next;
-  return iter;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_keys()
- *
- * Return a list of keys
- * ----------------------------------------------------------------------------- */
-
-static DOH *Hash_keys(DOH *so) {
-  DOH *keys;
-  Iterator i;
-
-  keys = NewList();
-  for (i = First(so); i.key; i = Next(i)) {
-    Append(keys, i.key);
-  }
-  return keys;
-}
-
-/* -----------------------------------------------------------------------------
- * DohSetMaxHashExpand()
- *
- * Controls how many Hash objects are displayed in full in Hash_str
- * ----------------------------------------------------------------------------- */
-
-void DohSetMaxHashExpand(int count) {
-  max_expand = count;
-}
-
-/* -----------------------------------------------------------------------------
- * DohGetMaxHashExpand()
- *
- * Returns how many Hash objects are displayed in full in Hash_str
- * ----------------------------------------------------------------------------- */
-
-int DohGetMaxHashExpand(void) {
-  return max_expand;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_str()
- *
- * Create a string representation of a hash table (mainly for debugging).
- * ----------------------------------------------------------------------------- */
-
-static DOH *Hash_str(DOH *ho) {
-  int i, j;
-  HashNode *n;
-  DOH *s;
-  static int expanded = 0;
-  static const char *tab = "  ";
-  Hash *h = (Hash *) ObjData(ho);
-
-  s = NewStringEmpty();
-  if (ObjGetMark(ho)) {
-    Printf(s, "Hash(%p)", ho);
-    return s;
-  }
-  if (expanded >= max_expand) {
-    /* replace each hash attribute with a '.' */
-    Printf(s, "Hash(%p) {", ho);
-    for (i = 0; i < h->hashsize; i++) {
-      n = h->hashtable[i];
-      while (n) {
-	Putc('.', s);
-	n = n->next;
-      }
-    }
-    Putc('}', s);
-    return s;
-  }
-  ObjSetMark(ho, 1);
-  Printf(s, "Hash(%p) {\n", ho);
-  for (i = 0; i < h->hashsize; i++) {
-    n = h->hashtable[i];
-    while (n) {
-      for (j = 0; j < expanded + 1; j++)
-	Printf(s, tab);
-      expanded += 1;
-      Printf(s, "'%s' : %s, \n", n->key, n->object);
-      expanded -= 1;
-      n = n->next;
-    }
-  }
-  for (j = 0; j < expanded; j++)
-    Printf(s, tab);
-  Printf(s, "}");
-  ObjSetMark(ho, 0);
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash_len()
- *
- * Return number of entries in the hash table.
- * ----------------------------------------------------------------------------- */
-
-static int Hash_len(DOH *ho) {
-  Hash *h = (Hash *) ObjData(ho);
-  return h->nitems;
-}
-
-/* -----------------------------------------------------------------------------
- * CopyHash()
- *
- * Make a copy of a hash table.  Note: this is a shallow copy.
- * ----------------------------------------------------------------------------- */
-
-static DOH *CopyHash(DOH *ho) {
-  Hash *h, *nh;
-  HashNode *n;
-  DOH *nho;
-
-  int i;
-  h = (Hash *) ObjData(ho);
-  nh = (Hash *) DohMalloc(sizeof(Hash));
-  nh->hashsize = h->hashsize;
-  nh->hashtable = (HashNode **) DohMalloc(nh->hashsize * sizeof(HashNode *));
-  for (i = 0; i < nh->hashsize; i++) {
-    nh->hashtable[i] = 0;
-  }
-  nh->nitems = 0;
-  nh->line = h->line;
-  nh->file = h->file;
-  if (nh->file)
-    Incref(nh->file);
-
-  nho = DohObjMalloc(&DohHashType, nh);
-  for (i = 0; i < h->hashsize; i++) {
-    n = h->hashtable[i];
-    while (n) {
-      Hash_setattr(nho, n->key, n->object);
-      n = n->next;
-    }
-  }
-  return nho;
-}
-
-
-
-static void Hash_setfile(DOH *ho, DOH *file) {
-  DOH *fo;
-  Hash *h = (Hash *) ObjData(ho);
-
-  if (!DohCheck(file)) {
-    fo = NewString(file);
-    Decref(fo);
-  } else
-    fo = file;
-  Incref(fo);
-  Delete(h->file);
-  h->file = fo;
-}
-
-static DOH *Hash_getfile(DOH *ho) {
-  Hash *h = (Hash *) ObjData(ho);
-  return h->file;
-}
-
-static void Hash_setline(DOH *ho, int line) {
-  Hash *h = (Hash *) ObjData(ho);
-  h->line = line;
-}
-
-static int Hash_getline(DOH *ho) {
-  Hash *h = (Hash *) ObjData(ho);
-  return h->line;
-}
-
-/* -----------------------------------------------------------------------------
- * type information
- * ----------------------------------------------------------------------------- */
-
-static DohHashMethods HashHashMethods = {
-  Hash_getattr,
-  Hash_setattr,
-  Hash_delattr,
-  Hash_keys,
-};
-
-DohObjInfo DohHashType = {
-  "Hash",			/* objname */
-  DelHash,			/* doh_del */
-  CopyHash,			/* doh_copy */
-  Hash_clear,			/* doh_clear */
-  Hash_str,			/* doh_str */
-  0,				/* doh_data */
-  0,				/* doh_dump */
-  Hash_len,			/* doh_len */
-  0,				/* doh_hash    */
-  0,				/* doh_cmp */
-  0,				/* doh_equal    */
-  Hash_firstiter,		/* doh_first    */
-  Hash_nextiter,		/* doh_next     */
-  Hash_setfile,			/* doh_setfile */
-  Hash_getfile,			/* doh_getfile */
-  Hash_setline,			/* doh_setline */
-  Hash_getline,			/* doh_getline */
-  &HashHashMethods,		/* doh_mapping */
-  0,				/* doh_sequence */
-  0,				/* doh_file */
-  0,				/* doh_string */
-  0,				/* doh_positional */
-  0,
-};
-
-/* -----------------------------------------------------------------------------
- * NewHash()
- *
- * Create a new hash table.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohNewHash(void) {
-  Hash *h;
-  int i;
-  h = (Hash *) DohMalloc(sizeof(Hash));
-  h->hashsize = HASH_INIT_SIZE;
-  h->hashtable = (HashNode **) DohMalloc(h->hashsize * sizeof(HashNode *));
-  for (i = 0; i < h->hashsize; i++) {
-    h->hashtable[i] = 0;
-  }
-  h->nitems = 0;
-  h->file = 0;
-  h->line = 0;
-  return DohObjMalloc(&DohHashType, h);
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/list.c b/dependencies2013/win32/swig/Source/DOH/list.c
deleted file mode 100644
index 8a96a9a6..00000000
--- a/dependencies2013/win32/swig/Source/DOH/list.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * list.c
- *
- *     Implements a simple list object.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-typedef struct List {
-  int maxitems;			/* Max size  */
-  int nitems;			/* Num items */
-  DOH *file;
-  int line;
-  DOH **items;
-} List;
-
-extern DohObjInfo DohListType;
-
-/* Doubles amount of memory in a list */
-static
-void more(List *l) {
-  l->items = (void **) DohRealloc(l->items, l->maxitems * 2 * sizeof(void *));
-  assert(l->items);
-  l->maxitems *= 2;
-}
-
-/* -----------------------------------------------------------------------------
- * CopyList()
- *
- * Make a shallow copy of a list.
- * ----------------------------------------------------------------------------- */
-static DOH *CopyList(DOH *lo) {
-  List *l, *nl;
-  int i;
-  l = (List *) ObjData(lo);
-  nl = (List *) DohMalloc(sizeof(List));
-  nl->nitems = l->nitems;
-  nl->maxitems = l->maxitems;
-  nl->items = (void **) DohMalloc(l->maxitems * sizeof(void *));
-  for (i = 0; i < l->nitems; i++) {
-    nl->items[i] = l->items[i];
-    Incref(nl->items[i]);
-  }
-  nl->file = l->file;
-  if (nl->file)
-    Incref(nl->file);
-  nl->line = l->line;
-  return DohObjMalloc(&DohListType, nl);
-}
-
-/* -----------------------------------------------------------------------------
- * DelList()
- *
- * Delete a list.
- * ----------------------------------------------------------------------------- */
-
-static void DelList(DOH *lo) {
-  List *l = (List *) ObjData(lo);
-  int i;
-  for (i = 0; i < l->nitems; i++)
-    Delete(l->items[i]);
-  DohFree(l->items);
-  DohFree(l);
-}
-
-/* -----------------------------------------------------------------------------
- * List_clear()
- *
- * Remove all of the list entries, but keep the list object intact.
- * ----------------------------------------------------------------------------- */
-
-static void List_clear(DOH *lo) {
-  List *l = (List *) ObjData(lo);
-  int i;
-  for (i = 0; i < l->nitems; i++) {
-    Delete(l->items[i]);
-  }
-  l->nitems = 0;
-}
-
-/* -----------------------------------------------------------------------------
- * List_insert()
- *
- * Insert an item into the list. If the item is not a DOH object, it is assumed
- * to be a 'char *' and is used to construct an equivalent string object.
- * ----------------------------------------------------------------------------- */
-
-static int List_insert(DOH *lo, int pos, DOH *item) {
-  List *l = (List *) ObjData(lo);
-  int i;
-
-  if (!item)
-    return -1;
-  if (!DohCheck(item)) {
-    item = NewString(item);
-    Decref(item);
-  }
-  if (pos == DOH_END)
-    pos = l->nitems;
-  if (pos < 0)
-    pos = 0;
-  if (pos > l->nitems)
-    pos = l->nitems;
-  if (l->nitems == l->maxitems)
-    more(l);
-  for (i = l->nitems; i > pos; i--) {
-    l->items[i] = l->items[i - 1];
-  }
-  l->items[pos] = item;
-  Incref(item);
-  l->nitems++;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * List_remove()
- *
- * Remove an item from a list.
- * ----------------------------------------------------------------------------- */
-
-static int List_remove(DOH *lo, int pos) {
-  List *l = (List *) ObjData(lo);
-  int i;
-  if (pos == DOH_END)
-    pos = l->nitems - 1;
-  if (pos == DOH_BEGIN)
-    pos = 0;
-  assert(!((pos < 0) || (pos >= l->nitems)));
-  Delete(l->items[pos]);
-  for (i = pos; i < l->nitems - 1; i++) {
-    l->items[i] = l->items[i + 1];
-  }
-  l->nitems--;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * List_len()
- *
- * Return the number of elements in the list
- * ----------------------------------------------------------------------------- */
-
-static int List_len(DOH *lo) {
-  List *l = (List *) ObjData(lo);
-  return l->nitems;
-}
-
-/* -----------------------------------------------------------------------------
- * List_get()
- *
- * Get the nth item from the list.
- * ----------------------------------------------------------------------------- */
-
-static DOH *List_get(DOH *lo, int n) {
-  List *l = (List *) ObjData(lo);
-  if (n == DOH_END)
-    n = l->nitems - 1;
-  if (n == DOH_BEGIN)
-    n = 0;
-  assert(!((n < 0) || (n >= l->nitems)));
-  return l->items[n];
-}
-
-/* -----------------------------------------------------------------------------
- * List_set()
- *
- * Set the nth item in the list replacing any previous item. 
- * ----------------------------------------------------------------------------- */
-
-static int List_set(DOH *lo, int n, DOH *val) {
-  List *l = (List *) ObjData(lo);
-  if (!val)
-    return -1;
-  assert(!((n < 0) || (n >= l->nitems)));
-  if (!DohCheck(val)) {
-    val = NewString(val);
-    Decref(val);
-  }
-  Delete(l->items[n]);
-  l->items[n] = val;
-  Incref(val);
-  Delete(val);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * List_first()
- *
- * Return the first item in the list.
- * ----------------------------------------------------------------------------- */
-
-static DohIterator List_first(DOH *lo) {
-  DohIterator iter;
-  List *l = (List *) ObjData(lo);
-  iter.object = lo;
-  iter._index = 0;
-  iter._current = 0;
-  iter.key = 0;
-  if (l->nitems > 0) {
-    iter.item = l->items[0];
-  } else {
-    iter.item = 0;
-  }
-  return iter;
-}
-
-/* -----------------------------------------------------------------------------
- * List_next()
- * 
- * Return the next item in the list.
- * ----------------------------------------------------------------------------- */
-
-static DohIterator List_next(DohIterator iter) {
-  List *l = (List *) ObjData(iter.object);
-  iter._index = iter._index + 1;
-  if (iter._index >= l->nitems) {
-    iter.item = 0;
-    iter.key = 0;
-  } else {
-    iter.item = l->items[iter._index];
-  }
-  return iter;
-}
-
-/* -----------------------------------------------------------------------------
- * List_str()
- *
- * Create a string representation of the list.
- * ----------------------------------------------------------------------------- */
-static DOH *List_str(DOH *lo) {
-  DOH *s;
-  int i;
-  List *l = (List *) ObjData(lo);
-  s = NewStringEmpty();
-  if (ObjGetMark(lo)) {
-    Printf(s, "List(%p)", lo);
-    return s;
-  }
-  ObjSetMark(lo, 1);
-  Printf(s, "List[ ");
-  for (i = 0; i < l->nitems; i++) {
-    Printf(s, "%s", l->items[i]);
-    if ((i + 1) < l->nitems)
-      Printf(s, ", ");
-  }
-  Printf(s, " ]");
-  ObjSetMark(lo, 0);
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * List_dump()
- *
- * Dump the items to an output stream.
- * ----------------------------------------------------------------------------- */
-
-static int List_dump(DOH *lo, DOH *out) {
-  int nsent = 0;
-  int i, ret;
-  List *l = (List *) ObjData(lo);
-  for (i = 0; i < l->nitems; i++) {
-    ret = Dump(l->items[i], out);
-    if (ret < 0)
-      return -1;
-    nsent += ret;
-  }
-  return nsent;
-}
-
-static void List_setfile(DOH *lo, DOH *file) {
-  DOH *fo;
-  List *l = (List *) ObjData(lo);
-
-  if (!DohCheck(file)) {
-    fo = NewString(file);
-    Decref(fo);
-  } else
-    fo = file;
-  Incref(fo);
-  Delete(l->file);
-  l->file = fo;
-}
-
-static DOH *List_getfile(DOH *lo) {
-  List *l = (List *) ObjData(lo);
-  return l->file;
-}
-
-static void List_setline(DOH *lo, int line) {
-  List *l = (List *) ObjData(lo);
-  l->line = line;
-}
-
-static int List_getline(DOH *lo) {
-  List *l = (List *) ObjData(lo);
-  return l->line;
-}
-
-static DohListMethods ListListMethods = {
-  List_get,
-  List_set,
-  List_remove,
-  List_insert,
-  0,				/* delslice */
-};
-
-DohObjInfo DohListType = {
-  "List",			/* objname */
-  DelList,			/* doh_del */
-  CopyList,			/* doh_copy */
-  List_clear,			/* doh_clear */
-  List_str,			/* doh_str */
-  0,				/* doh_data */
-  List_dump,			/* doh_dump */
-  List_len,			/* doh_len */
-  0,				/* doh_hash    */
-  0,				/* doh_cmp */
-  0,				/* doh_equal    */
-  List_first,			/* doh_first    */
-  List_next,			/* doh_next     */
-  List_setfile,			/* doh_setfile */
-  List_getfile,			/* doh_getfile */
-  List_setline,			/* doh_setline */
-  List_getline,			/* doh_getline */
-  0,				/* doh_mapping */
-  &ListListMethods,		/* doh_sequence */
-  0,				/* doh_file */
-  0,				/* doh_string */
-  0,				/* doh_callable */
-  0,				/* doh_position */
-};
-
-/* -----------------------------------------------------------------------------
- * NewList()
- *
- * Create a new list.
- * ----------------------------------------------------------------------------- */
-
-#define MAXLISTITEMS 8
-
-DOH *DohNewList(void) {
-  List *l;
-  int i;
-  l = (List *) DohMalloc(sizeof(List));
-  l->nitems = 0;
-  l->maxitems = MAXLISTITEMS;
-  l->items = (void **) DohMalloc(l->maxitems * sizeof(void *));
-  for (i = 0; i < MAXLISTITEMS; i++) {
-    l->items[i] = 0;
-  }
-  l->file = 0;
-  l->line = 0;
-  return DohObjMalloc(&DohListType, l);
-}
-
-static int (*List_sort_compare_func) (const DOH *, const DOH *);
-static int List_qsort_compare(const void *a, const void *b) {
-  return List_sort_compare_func(*((DOH **) a), *((DOH **) b));
-}
-
-/* Sort a list */
-void DohSortList(DOH *lo, int (*cmp) (const DOH *, const DOH *)) {
-  List *l = (List *) ObjData(lo);
-  if (cmp) {
-    List_sort_compare_func = cmp;
-  } else {
-    List_sort_compare_func = DohCmp;
-  }
-  qsort(l->items, l->nitems, sizeof(DOH *), List_qsort_compare);
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/memory.c b/dependencies2013/win32/swig/Source/DOH/memory.c
deleted file mode 100644
index b916870d..00000000
--- a/dependencies2013/win32/swig/Source/DOH/memory.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * memory.c
- *
- *     This file implements all of DOH's memory management including allocation
- *     of objects and checking of objects.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-#ifndef DOH_POOL_SIZE
-#define DOH_POOL_SIZE         16384
-#endif
-
-/* Checks stale DOH object use - will use a lot more memory as pool memory is not re-used. */
-/*
-#define DOH_DEBUG_MEMORY_POOLS
-*/
-
-static int PoolSize = DOH_POOL_SIZE;
-
-DOH *DohNone = 0;		/* The DOH None object */
-
-typedef struct pool {
-  DohBase *ptr;			/* Start of pool */
-  int len;			/* Length of pool */
-  int blen;			/* Byte length of pool */
-  int current;			/* Current position for next allocation */
-  char *pbeg;			/* Beg of pool */
-  char *pend;			/* End of pool */
-  struct pool *next;		/* Next pool */
-} Pool;
-
-static DohBase *FreeList = 0;	/* List of free objects */
-static Pool *Pools = 0;
-static int pools_initialized = 0;
-
-/* ----------------------------------------------------------------------
- * CreatePool() - Create a new memory pool 
- * ---------------------------------------------------------------------- */
-
-static void CreatePool() {
-  Pool *p = 0;
-  p = (Pool *) DohMalloc(sizeof(Pool));
-  assert(p);
-  p->ptr = (DohBase *) DohMalloc(sizeof(DohBase) * PoolSize);
-  assert(p->ptr);
-  memset(p->ptr, 0, sizeof(DohBase) * PoolSize);
-  p->len = PoolSize;
-  p->blen = PoolSize * sizeof(DohBase);
-  p->current = 0;
-  p->pbeg = ((char *) p->ptr);
-  p->pend = p->pbeg + p->blen;
-  p->next = Pools;
-  Pools = p;
-}
-
-/* ----------------------------------------------------------------------
- * InitPools() - Initialize the memory allocator
- * ---------------------------------------------------------------------- */
-
-static void InitPools() {
-  if (pools_initialized)
-    return;
-  CreatePool();			/* Create initial pool */
-  pools_initialized = 1;
-  DohNone = NewVoid(0, 0);	/* Create the None object */
-  DohIntern(DohNone);
-}
-
-/* ----------------------------------------------------------------------
- * DohCheck()
- *
- * Returns 1 if an arbitrary pointer is a DOH object.
- * ---------------------------------------------------------------------- */
-
-int DohCheck(const DOH *ptr) {
-  register Pool *p = Pools;
-  register char *cptr = (char *) ptr;
-  while (p) {
-    if ((cptr >= p->pbeg) && (cptr < p->pend)) {
-#ifdef DOH_DEBUG_MEMORY_POOLS
-      DohBase *b = (DohBase *) ptr;
-      int DOH_object_already_deleted = b->type == 0;
-      assert(!DOH_object_already_deleted);
-#endif
-      return 1;
-    }
-    /*
-       pptr = (char *) p->ptr;
-       if ((cptr >= pptr) && (cptr < (pptr+(p->current*sizeof(DohBase))))) return 1; */
-    p = p->next;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * DohIntern()
- * ----------------------------------------------------------------------------- */
-
-void DohIntern(DOH *obj) {
-  DohBase *b = (DohBase *) obj;
-  b->flag_intern = 1;
-}
-
-/* ----------------------------------------------------------------------
- * DohObjMalloc()
- *
- * Allocate memory for a new object.
- * ---------------------------------------------------------------------- */
-
-DOH *DohObjMalloc(DohObjInfo *type, void *data) {
-  DohBase *obj;
-  if (!pools_initialized)
-    InitPools();
-#ifndef DOH_DEBUG_MEMORY_POOLS
-  if (FreeList) {
-    obj = FreeList;
-    FreeList = (DohBase *) obj->data;
-  } else {
-#endif
-    while (Pools->current == Pools->len) {
-      CreatePool();
-    }
-    obj = Pools->ptr + Pools->current;
-    ++Pools->current;
-#ifndef DOH_DEBUG_MEMORY_POOLS
-  }
-#endif
-  obj->type = type;
-  obj->data = data;
-  obj->meta = 0;
-  obj->refcount = 1;
-  obj->flag_intern = 0;
-  obj->flag_marked = 0;
-  obj->flag_user = 0;
-  obj->flag_usermark = 0;
-  return (DOH *) obj;
-}
-
-/* ----------------------------------------------------------------------
- * DohObjFree() - Free a DOH object
- * ---------------------------------------------------------------------- */
-
-void DohObjFree(DOH *ptr) {
-  DohBase *b, *meta;
-  b = (DohBase *) ptr;
-  if (b->flag_intern)
-    return;
-  meta = (DohBase *) b->meta;
-  b->data = (void *) FreeList;
-  b->meta = 0;
-  b->type = 0;
-  b->refcount = 0;
-  FreeList = b;
-  if (meta) {
-    Delete(meta);
-  }
-}
-
-/* ----------------------------------------------------------------------
- * DohMemoryDebug()
- *
- * Display memory usage statistics
- * ---------------------------------------------------------------------- */
-
-void DohMemoryDebug(void) {
-  extern DohObjInfo DohStringType;
-  extern DohObjInfo DohListType;
-  extern DohObjInfo DohHashType;
-
-  Pool *p;
-  int totsize = 0;
-  int totused = 0;
-  int totfree = 0;
-
-  int numstring = 0;
-  int numlist = 0;
-  int numhash = 0;
-
-  printf("Memory statistics:\n\n");
-  printf("Pools:\n");
-
-  p = Pools;
-  while (p) {
-    /* Calculate number of used, free items */
-    int i;
-    int nused = 0, nfree = 0;
-    for (i = 0; i < p->len; i++) {
-      if (p->ptr[i].refcount <= 0)
-	nfree++;
-      else {
-	nused++;
-	if (p->ptr[i].type == &DohStringType)
-	  numstring++;
-	else if (p->ptr[i].type == &DohListType)
-	  numlist++;
-	else if (p->ptr[i].type == &DohHashType)
-	  numhash++;
-      }
-    }
-    printf("    Pool %8p: size = %10d. used = %10d. free = %10d\n", (void *) p, p->len, nused, nfree);
-    totsize += p->len;
-    totused += nused;
-    totfree += nfree;
-    p = p->next;
-  }
-  printf("\n    Total:          size = %10d, used = %10d, free = %10d\n", totsize, totused, totfree);
-
-  printf("\nObject types\n");
-  printf("    Strings   : %d\n", numstring);
-  printf("    Lists     : %d\n", numlist);
-  printf("    Hashes    : %d\n", numhash);
-
-#if 0
-  p = Pools;
-  while (p) {
-    int i;
-    for (i = 0; i < p->len; i++) {
-      if (p->ptr[i].refcount > 0) {
-	if (p->ptr[i].type == &DohStringType) {
-	  Printf(stdout, "%s\n", p->ptr + i);
-	}
-      }
-    }
-    p = p->next;
-  }
-#endif
-
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/string.c b/dependencies2013/win32/swig/Source/DOH/string.c
deleted file mode 100644
index 490198df..00000000
--- a/dependencies2013/win32/swig/Source/DOH/string.c
+++ /dev/null
@@ -1,1170 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * string.c
- *
- *     Implements a string object that supports both sequence operations and
- *     file semantics.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-extern DohObjInfo DohStringType;
-
-typedef struct String {
-  DOH *file;
-  int line;
-  int maxsize;			/* Max size allocated */
-  int len;			/* Current length     */
-  int hashkey;			/* Hash key value     */
-  int sp;			/* Current position   */
-  char *str;			/* String data        */
-} String;
-
-/* -----------------------------------------------------------------------------
- * String_data() - Return as a 'void *'
- * ----------------------------------------------------------------------------- */
-
-static void *String_data(DOH *so) {
-  String *s = (String *) ObjData(so);
-  s->str[s->len] = 0;
-  return (void *) s->str;
-}
-
-/* static char *String_char(DOH *so) {
-  return (char *) String_data(so);
-}
-*/
-
-/* -----------------------------------------------------------------------------
- * String_dump() - Serialize a string onto out
- * ----------------------------------------------------------------------------- */
-
-static int String_dump(DOH *so, DOH *out) {
-  int nsent;
-  int ret;
-  String *s = (String *) ObjData(so);
-  nsent = 0;
-  while (nsent < s->len) {
-    ret = Write(out, s->str + nsent, (s->len - nsent));
-    if (ret < 0)
-      return ret;
-    nsent += ret;
-  }
-  return nsent;
-}
-
-/* -----------------------------------------------------------------------------
- * CopyString() - Copy a string
- * ----------------------------------------------------------------------------- */
-
-static DOH *CopyString(DOH *so) {
-  String *str;
-  String *s = (String *) ObjData(so);
-  str = (String *) DohMalloc(sizeof(String));
-  str->hashkey = s->hashkey;
-  str->sp = s->sp;
-  str->line = s->line;
-  str->file = s->file;
-  if (str->file)
-    Incref(str->file);
-  str->str = (char *) DohMalloc(s->len + 1);
-  memcpy(str->str, s->str, s->len);
-  str->maxsize = s->len;
-  str->len = s->len;
-  str->str[str->len] = 0;
-
-  return DohObjMalloc(&DohStringType, str);
-}
-
-/* -----------------------------------------------------------------------------
- * DelString() - Delete a string
- * ----------------------------------------------------------------------------- */
-
-static void DelString(DOH *so) {
-  String *s = (String *) ObjData(so);
-  DohFree(s->str);
-  DohFree(s);
-}
-
-/* -----------------------------------------------------------------------------
- * DohString_len() - Length of a string
- * ----------------------------------------------------------------------------- */
-
-static int String_len(DOH *so) {
-  String *s = (String *) ObjData(so);
-  return s->len;
-}
-
-
-/* -----------------------------------------------------------------------------
- * String_cmp() - Compare two strings
- * ----------------------------------------------------------------------------- */
-
-static int String_cmp(DOH *so1, DOH *so2) {
-  String *s1, *s2;
-  char *c1, *c2;
-  int maxlen, i;
-  s1 = (String *) ObjData(so1);
-  s2 = (String *) ObjData(so2);
-  maxlen = s1->len;
-  if (s2->len < maxlen)
-    maxlen = s2->len;
-  c1 = s1->str;
-  c2 = s2->str;
-  for (i = maxlen; i; --i, c1++, c2++) {
-    if (*c1 != *c2)
-      break;
-  }
-  if (i != 0) {
-    if (*c1 < *c2)
-      return -1;
-    else
-      return 1;
-  }
-  if (s1->len == s2->len)
-    return 0;
-  if (s1->len > s2->len)
-    return 1;
-  return -1;
-}
-
-/* -----------------------------------------------------------------------------
- * String_equal() - Say if two string are equal
- * ----------------------------------------------------------------------------- */
-
-static int String_equal(DOH *so1, DOH *so2) {
-  String *s1 = (String *) ObjData(so1);
-  String *s2 = (String *) ObjData(so2);
-  register int len = s1->len;
-  if (len != s2->len) {
-    return 0;
-  } else {
-    register char *c1 = s1->str;
-    register char *c2 = s2->str;
-#if 0
-    register int mlen = len >> 2;
-    register int i = mlen;
-    for (; i; --i) {
-      if (*(c1++) != *(c2++))
-	return 0;
-      if (*(c1++) != *(c2++))
-	return 0;
-      if (*(c1++) != *(c2++))
-	return 0;
-      if (*(c1++) != *(c2++))
-	return 0;
-    }
-    for (i = len - (mlen << 2); i; --i) {
-      if (*(c1++) != *(c2++))
-	return 0;
-    }
-    return 1;
-#else
-    return memcmp(c1, c2, len) == 0;
-#endif
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * String_hash() - Compute string hash value
- * ----------------------------------------------------------------------------- */
-
-static int String_hash(DOH *so) {
-  String *s = (String *) ObjData(so);
-  if (s->hashkey >= 0) {
-    return s->hashkey;
-  } else {
-    register char *c = s->str;
-    register unsigned int len = s->len > 50 ? 50 : s->len;
-    register unsigned int h = 0;
-    register unsigned int mlen = len >> 2;
-    register unsigned int i = mlen;
-    for (; i; --i) {
-      h = (h << 5) + *(c++);
-      h = (h << 5) + *(c++);
-      h = (h << 5) + *(c++);
-      h = (h << 5) + *(c++);
-    }
-    for (i = len - (mlen << 2); i; --i) {
-      h = (h << 5) + *(c++);
-    }
-    h &= 0x7fffffff;
-    s->hashkey = (int)h;
-    return h;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * DohString_append() - Append to s
- * ----------------------------------------------------------------------------- */
-
-static void DohString_append(DOH *so, const DOHString_or_char *str) {
-  int oldlen, newlen, newmaxsize, l, sp;
-  char *tc;
-  String *s = (String *) ObjData(so);
-  char *newstr = 0;
-
-  if (DohCheck(str)) {
-    String *ss = (String *) ObjData(str);
-    newstr = (char *) String_data((DOH *) str);
-    l = ss->len;
-  } else {
-    newstr = (char *) (str);
-    l = (int) strlen(newstr);
-  }
-  if (!newstr)
-    return;
-  s->hashkey = -1;
-
-  oldlen = s->len;
-  newlen = oldlen + l + 1;
-  if (newlen >= s->maxsize - 1) {
-    newmaxsize = 2 * s->maxsize;
-    if (newlen >= newmaxsize - 1)
-      newmaxsize = newlen + 1;
-    s->str = (char *) DohRealloc(s->str, newmaxsize);
-    assert(s->str);
-    s->maxsize = newmaxsize;
-  }
-  tc = s->str;
-  memcpy(tc + oldlen, newstr, l + 1);
-  sp = s->sp;
-  if (sp >= oldlen) {
-    int i = oldlen + l - sp;
-    tc += sp;
-    for (; i; --i) {
-      if (*(tc++) == '\n')
-	s->line++;
-    }
-    s->sp = oldlen + l;
-  }
-  s->len += l;
-}
-
-
-/* -----------------------------------------------------------------------------
- * String_clear() - Clear a string
- * ----------------------------------------------------------------------------- */
-
-static void String_clear(DOH *so) {
-  String *s = (String *) ObjData(so);
-  s->hashkey = -1;
-  s->len = 0;
-  *(s->str) = 0;
-  s->sp = 0;
-  s->line = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * String_insert() - Insert a string
- * ----------------------------------------------------------------------------- */
-
-static int String_insert(DOH *so, int pos, DOH *str) {
-  String *s;
-  int len;
-  char *data;
-
-  if (pos == DOH_END) {
-    DohString_append(so, str);
-    return 0;
-  }
-
-
-  s = (String *) ObjData(so);
-  s->hashkey = -1;
-  if (DohCheck(str)) {
-    String *ss = (String *) ObjData(str);
-    data = (char *) String_data(str);
-    len = ss->len;
-  } else {
-    data = (char *) (str);
-    len = (int) strlen(data);
-  }
-
-  if (pos < 0)
-    pos = 0;
-  else if (pos > s->len)
-    pos = s->len;
-
-  /* See if there is room to insert the new data */
-  while (s->maxsize <= s->len + len) {
-    int newsize = 2 * s->maxsize;
-    s->str = (char *) DohRealloc(s->str, newsize);
-    assert(s->str);
-    s->maxsize = newsize;
-  }
-  memmove(s->str + pos + len, s->str + pos, (s->len - pos));
-  memcpy(s->str + pos, data, len);
-  if (s->sp >= pos) {
-    int i;
-
-    for (i = 0; i < len; i++) {
-      if (data[i] == '\n')
-	s->line++;
-    }
-    s->sp += len;
-  }
-  s->len += len;
-  s->str[s->len] = 0;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * String_delitem() - Delete a character
- * ----------------------------------------------------------------------------- */
-
-static int String_delitem(DOH *so, int pos) {
-  String *s = (String *) ObjData(so);
-  s->hashkey = -1;
-  if (pos == DOH_END)
-    pos = s->len - 1;
-  if (pos == DOH_BEGIN)
-    pos = 0;
-  if (s->len == 0)
-    return 0;
-
-  if (s->sp > pos) {
-    s->sp--;
-    assert(s->sp >= 0);
-    if (s->str[pos] == '\n')
-      s->line--;
-  }
-  memmove(s->str + pos, s->str + pos + 1, ((s->len - 1) - pos));
-  s->len--;
-  s->str[s->len] = 0;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * String_delslice() -  Delete a range
- * ----------------------------------------------------------------------------- */
-
-static int String_delslice(DOH *so, int sindex, int eindex) {
-  String *s = (String *) ObjData(so);
-  int size;
-  if (s->len == 0)
-    return 0;
-  s->hashkey = -1;
-  if (eindex == DOH_END)
-    eindex = s->len;
-  if (sindex == DOH_BEGIN)
-    sindex = 0;
-
-  size = eindex - sindex;
-  if (s->sp > sindex) {
-    /* Adjust the file pointer and line count */
-    int i, end;
-    if (s->sp > eindex) {
-      end = eindex;
-      s->sp -= size;
-    } else {
-      end = s->sp;
-      s->sp = sindex;
-    }
-    for (i = sindex; i < end; i++) {
-      if (s->str[i] == '\n')
-	s->line--;
-    }
-    assert(s->sp >= 0);
-  }
-  memmove(s->str + sindex, s->str + eindex, s->len - eindex);
-  s->len -= size;
-  s->str[s->len] = 0;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * String_str() - Returns a string (used by printing commands)
- * ----------------------------------------------------------------------------- */
-
-static DOH *String_str(DOH *so) {
-  String *s = (String *) ObjData(so);
-  s->str[s->len] = 0;
-  return NewString(s->str);
-}
-
-/* -----------------------------------------------------------------------------
- * String_read() - Read data from a string
- * ----------------------------------------------------------------------------- */
-
-static int String_read(DOH *so, void *buffer, int len) {
-  int reallen, retlen;
-  char *cb;
-  String *s = (String *) ObjData(so);
-  if ((s->sp + len) > s->len)
-    reallen = (s->len - s->sp);
-  else
-    reallen = len;
-
-  cb = (char *) buffer;
-  retlen = reallen;
-
-  if (reallen > 0) {
-    memmove(cb, s->str + s->sp, reallen);
-    s->sp += reallen;
-  }
-  return retlen;
-}
-
-/* -----------------------------------------------------------------------------
- * String_write() - Write data to a string
- * ----------------------------------------------------------------------------- */
-static int String_write(DOH *so, const void *buffer, int len) {
-  int newlen;
-  String *s = (String *) ObjData(so);
-  s->hashkey = -1;
-  if (s->sp > s->len)
-    s->sp = s->len;
-  newlen = s->sp + len + 1;
-  if (newlen > s->maxsize) {
-    s->str = (char *) DohRealloc(s->str, newlen);
-    assert(s->str);
-    s->maxsize = newlen;
-    s->len = s->sp + len;
-  }
-  if ((s->sp + len) > s->len)
-    s->len = s->sp + len;
-  memmove(s->str + s->sp, buffer, len);
-  s->sp += len;
-  s->str[s->len] = 0;
-  return len;
-}
-
-/* -----------------------------------------------------------------------------
- * String_seek() - Seek to a new position
- * ----------------------------------------------------------------------------- */
-
-static int String_seek(DOH *so, long offset, int whence) {
-  int pos, nsp, inc;
-  String *s = (String *) ObjData(so);
-  if (whence == SEEK_SET)
-    pos = 0;
-  else if (whence == SEEK_CUR)
-    pos = s->sp;
-  else if (whence == SEEK_END) {
-    pos = s->len;
-    offset = -offset;
-  } else
-    pos = s->sp;
-
-  nsp = pos + offset;
-  if (nsp < 0)
-    nsp = 0;
-  if (s->len > 0 && nsp > s->len)
-    nsp = s->len;
-
-  inc = (nsp > s->sp) ? 1 : -1;
-
-  {
-#if 0
-    register int sp = s->sp;
-    register char *tc = s->str;
-    register int len = s->len;
-    while (sp != nsp) {
-      int prev = sp + inc;
-      if (prev >= 0 && prev <= len && tc[prev] == '\n')
-	s->line += inc;
-      sp += inc;
-    }
-#else
-    register int sp = s->sp;
-    register char *tc = s->str;
-    if (inc > 0) {
-      while (sp != nsp) {
-	if (tc[++sp] == '\n')
-	  ++s->line;
-      }
-    } else {
-      while (sp != nsp) {
-	if (tc[--sp] == '\n')
-	  --s->line;
-      }
-    }
-#endif
-    s->sp = sp;
-  }
-  assert(s->sp >= 0);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * String_tell() - Return current position
- * ----------------------------------------------------------------------------- */
-
-static long String_tell(DOH *so) {
-  String *s = (String *) ObjData(so);
-  return (long) (s->sp);
-}
-
-/* -----------------------------------------------------------------------------
- * String_putc()
- * ----------------------------------------------------------------------------- */
-
-static int String_putc(DOH *so, int ch) {
-  String *s = (String *) ObjData(so);
-  register int len = s->len;
-  register int sp = s->sp;
-  s->hashkey = -1;
-  if (sp >= len) {
-    register int maxsize = s->maxsize;
-    register char *tc = s->str;
-    if (len > (maxsize - 2)) {
-      maxsize *= 2;
-      tc = (char *) DohRealloc(tc, maxsize);
-      assert(tc);
-      s->maxsize = (int) maxsize;
-      s->str = tc;
-    }
-    tc += sp;
-    *tc = (char) ch;
-    *(++tc) = 0;
-    s->len = s->sp = sp + 1;
-  } else {
-    s->str[s->sp++] = (char) ch;
-  }
-  if (ch == '\n')
-    s->line++;
-  return ch;
-}
-
-/* -----------------------------------------------------------------------------
- * String_getc()
- * ----------------------------------------------------------------------------- */
-
-static int String_getc(DOH *so) {
-  int c;
-  String *s = (String *) ObjData(so);
-  if (s->sp >= s->len)
-    c = EOF;
-  else
-    c = (int)(unsigned char) s->str[s->sp++];
-  if (c == '\n')
-    s->line++;
-  return c;
-}
-
-/* -----------------------------------------------------------------------------
- * String_ungetc()
- * ----------------------------------------------------------------------------- */
-
-static int String_ungetc(DOH *so, int ch) {
-  String *s = (String *) ObjData(so);
-  if (ch == EOF)
-    return ch;
-  if (s->sp <= 0)
-    return EOF;
-  s->sp--;
-  if (ch == '\n')
-    s->line--;
-  return ch;
-}
-
-static char *end_quote(char *s) {
-  char *qs;
-  char qc;
-  char *q;
-  char *nl;
-  qc = *s;
-  qs = s;
-  while (1) {
-    q = strpbrk(s + 1, "\"\'");
-    nl = strchr(s + 1, '\n');
-    if (nl && (nl < q)) {
-      /* A new line appears before the end of the string */
-      if (*(nl - 1) == '\\') {
-	s = nl + 1;
-	continue;
-      }
-      /* String was terminated by a newline.  Wing it */
-      return qs;
-    }
-    if (!q && nl) {
-      return qs;
-    }
-    if (!q)
-      return 0;
-    if ((*q == qc) && (*(q - 1) != '\\'))
-      return q;
-    s = q;
-  }
-}
-
-static char *match_simple(char *base, char *s, char *token, int tokenlen) {
-  (void) base;
-  (void) tokenlen;
-  return strstr(s, token);
-}
-
-static char *match_identifier(char *base, char *s, char *token, int tokenlen) {
-  while (s) {
-    s = strstr(s, token);
-    if (!s)
-      return 0;
-    if ((s > base) && (isalnum((int) *(s - 1)) || (*(s - 1) == '_'))) {
-      s += tokenlen;
-      continue;
-    }
-    if (isalnum((int) *(s + tokenlen)) || (*(s + tokenlen) == '_')) {
-      s += tokenlen;
-      continue;
-    }
-    return s;
-  }
-  return 0;
-}
-
-
-static char *match_identifier_begin(char *base, char *s, char *token, int tokenlen) {
-  while (s) {
-    s = strstr(s, token);
-    if (!s)
-      return 0;
-    if ((s > base) && (isalnum((int) *(s - 1)) || (*(s - 1) == '_'))) {
-      s += tokenlen;
-      continue;
-    }
-    return s;
-  }
-  return 0;
-}
-
-static char *match_identifier_end(char *base, char *s, char *token, int tokenlen) {
-  (void) base;
-  while (s) {
-    s = strstr(s, token);
-    if (!s)
-      return 0;
-    if (isalnum((int) *(s + tokenlen)) || (*(s + tokenlen) == '_')) {
-      s += tokenlen;
-      continue;
-    }
-    return s;
-  }
-  return 0;
-}
-
-static char *match_number_end(char *base, char *s, char *token, int tokenlen) {
-  (void) base;
-  while (s) {
-    s = strstr(s, token);
-    if (!s)
-      return 0;
-    if (isdigit((int) *(s + tokenlen))) {
-      s += tokenlen;
-      continue;
-    }
-    return s;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * replace_simple()
- *
- * Replaces count non-overlapping occurrences of token with rep in a string.   
- * ----------------------------------------------------------------------------- */
-
-static int replace_simple(String *str, char *token, char *rep, int flags, int count, char *(*match) (char *, char *, char *, int)) {
-  int tokenlen;			/* Length of the token */
-  int replen;			/* Length of the replacement */
-  int delta, expand = 0;
-  int ic;
-  int rcount = 0;
-  int noquote = 0;
-  char *c, *s, *t, *first;
-  char *q, *q2;
-  register char *base;
-  int i;
-
-  /* Figure out if anything gets replaced */
-  if (!strlen(token))
-    return 0;
-
-  base = str->str;
-  tokenlen = (int)strlen(token);
-  s = (*match) (base, base, token, tokenlen);
-
-  if (!s)
-    return 0;			/* No matches.  Who cares */
-
-  str->hashkey = -1;
-
-  if (flags & DOH_REPLACE_NOQUOTE)
-    noquote = 1;
-
-  /* If we are not replacing inside quotes, we need to do a little extra work */
-  if (noquote) {
-    q = strpbrk(base, "\"\'");
-    if (!q) {
-      noquote = 0;		/* Well, no quotes to worry about. Oh well */
-    } else {
-      while (q && (q < s)) {
-	/* First match was found inside a quote.  Try to find another match */
-	q2 = end_quote(q);
-	if (!q2) {
-	  return 0;
-	}
-	if (q2 > s) {
-	  /* Find next match */
-	  s = (*match) (base, q2 + 1, token, tokenlen);
-	}
-	if (!s)
-	  return 0;		/* Oh well, no matches */
-	q = strpbrk(q2 + 1, "\"\'");
-	if (!q)
-	  noquote = 0;		/* No more quotes */
-      }
-    }
-  }
-
-  first = s;
-  replen = (int)strlen(rep);
-
-  delta = (replen - tokenlen);
-
-  if (delta <= 0) {
-    /* String is either shrinking or staying the same size */
-    /* In this case, we do the replacement in place without memory reallocation */
-    ic = count;
-    t = s;			/* Target of memory copies */
-    while (ic && s) {
-      if (replen) {
-	memcpy(t, rep, replen);
-	t += replen;
-      }
-      rcount++;
-      expand += delta;
-      /* Find the next location */
-      s += tokenlen;
-      if (ic == 1)
-	break;
-      c = (*match) (base, s, token, tokenlen);
-
-      if (noquote) {
-	q = strpbrk(s, "\"\'");
-	if (!q) {
-	  noquote = 0;
-	} else {
-	  while (q && (q < c)) {
-	    /* First match was found inside a quote.  Try to find another match */
-	    q2 = end_quote(q);
-	    if (!q2) {
-	      c = 0;
-	      break;
-	    }
-	    if (q2 > c)
-	      c = (*match) (base, q2 + 1, token, tokenlen);
-	    if (!c)
-	      break;
-	    q = strpbrk(q2 + 1, "\"\'");
-	    if (!q)
-	      noquote = 0;	/* No more quotes */
-	  }
-	}
-      }
-      if (delta) {
-	if (c) {
-	  memmove(t, s, c - s);
-	  t += (c - s);
-	} else {
-	  memmove(t, s, (str->str + str->len) - s + 1);
-	}
-      } else {
-	t += (c - s);
-      }
-      s = c;
-      ic--;
-    }
-    if (s && delta) {
-      memmove(t, s, (str->str + str->len) - s + 1);
-    }
-    str->len += expand;
-    str->str[str->len] = 0;
-    if (str->sp >= str->len)
-      str->sp += expand;	/* Fix the end of file pointer */
-    return rcount;
-  }
-  /* The string is expanding as a result of the replacement */
-  /* Figure out how much expansion is going to occur and allocate a new string */
-  {
-    char *ns;
-    int newsize;
-
-    rcount++;
-    ic = count - 1;
-    s += tokenlen;
-    while (ic && (c = (*match) (base, s, token, tokenlen))) {
-      if (noquote) {
-	q = strpbrk(s, "\"\'");
-	if (!q) {
-	  break;
-	} else {
-	  while (q && (q < c)) {
-	    /* First match was found inside a quote.  Try to find another match */
-	    q2 = end_quote(q);
-	    if (!q2) {
-	      c = 0;
-	      break;
-	    }
-	    if (q2 > c) {
-	      c = (*match) (base, q2 + 1, token, tokenlen);
-	      if (!c)
-		break;
-	    }
-	    q = strpbrk(q2 + 1, "\"\'");
-	    if (!q)
-	      noquote = 0;
-	  }
-	}
-      }
-      if (c) {
-	rcount++;
-	ic--;
-	s = c + tokenlen;
-      } else {
-	break;
-      }
-    }
-
-    expand = delta * rcount;	/* Total amount of expansion for the replacement */
-    newsize = str->maxsize;
-    while ((str->len + expand) >= newsize)
-      newsize *= 2;
-
-    ns = (char *) DohMalloc(newsize);
-    assert(ns);
-    t = ns;
-    s = first;
-
-    /* Copy the first part of the string */
-    if (first > str->str) {
-      memcpy(t, str->str, (first - str->str));
-      t += (first - str->str);
-    }
-    for (i = 0; i < rcount; i++) {
-      memcpy(t, rep, replen);
-      t += replen;
-      s += tokenlen;
-      c = (*match) (base, s, token, tokenlen);
-      if (noquote) {
-	q = strpbrk(s, "\"\'");
-	if (!q) {
-	  noquote = 0;
-	} else {
-	  while (q && (q < c)) {
-	    /* First match was found inside a quote.  Try to find another match */
-	    q2 = end_quote(q);
-	    if (!q2) {
-	      c = 0;
-	      break;
-	    }
-	    if (q2 > c) {
-	      c = (*match) (base, q2 + 1, token, tokenlen);
-	      if (!c)
-		break;
-	    }
-	    q = strpbrk(q2 + 1, "\"\'");
-	    if (!q)
-	      noquote = 0;	/* No more quotes */
-	  }
-	}
-      }
-      if (i < (rcount - 1)) {
-	memcpy(t, s, c - s);
-	t += (c - s);
-      } else {
-	memcpy(t, s, (str->str + str->len) - s + 1);
-      }
-      s = c;
-    }
-    c = str->str;
-    str->str = ns;
-    if (str->sp >= str->len)
-      str->sp += expand;
-    str->len += expand;
-    str->str[str->len] = 0;
-    str->maxsize = newsize;
-    DohFree(c);
-    return rcount;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * String_replace()
- * ----------------------------------------------------------------------------- */
-
-static int String_replace(DOH *stro, const DOHString_or_char *token, const DOHString_or_char *rep, int flags) {
-  int count = -1;
-  String *str = (String *) ObjData(stro);
-
-  if (flags & DOH_REPLACE_FIRST)
-    count = 1;
-
-  if (flags & DOH_REPLACE_ID_END) {
-    return replace_simple(str, Char(token), Char(rep), flags, count, match_identifier_end);
-  } else if (flags & DOH_REPLACE_ID_BEGIN) {
-    return replace_simple(str, Char(token), Char(rep), flags, count, match_identifier_begin);
-  } else if (flags & DOH_REPLACE_ID) {
-    return replace_simple(str, Char(token), Char(rep), flags, count, match_identifier);
-  } else if (flags & DOH_REPLACE_NUMBER_END) {
-    return replace_simple(str, Char(token), Char(rep), flags, count, match_number_end);
-  } else {
-    return replace_simple(str, Char(token), Char(rep), flags, count, match_simple);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * String_chop()
- * ----------------------------------------------------------------------------- */
-
-static void String_chop(DOH *so) {
-  char *c;
-  String *str = (String *) ObjData(so);
-  /* Replace trailing whitespace */
-  c = str->str + str->len - 1;
-  while ((str->len > 0) && (isspace((int) *c))) {
-    if (str->sp >= str->len) {
-      str->sp--;
-      if (*c == '\n')
-	str->line--;
-    }
-    str->len--;
-    c--;
-  }
-  str->str[str->len] = 0;
-  assert(str->sp >= 0);
-  str->hashkey = -1;
-}
-
-static void String_setfile(DOH *so, DOH *file) {
-  DOH *fo;
-  String *str = (String *) ObjData(so);
-
-  if (!DohCheck(file)) {
-    fo = NewString(file);
-    Decref(fo);
-  } else
-    fo = file;
-  Incref(fo);
-  Delete(str->file);
-  str->file = fo;
-}
-
-static DOH *String_getfile(DOH *so) {
-  String *str = (String *) ObjData(so);
-  return str->file;
-}
-
-static void String_setline(DOH *so, int line) {
-  String *str = (String *) ObjData(so);
-  str->line = line;
-}
-
-static int String_getline(DOH *so) {
-  String *str = (String *) ObjData(so);
-  return str->line;
-}
-
-static DohListMethods StringListMethods = {
-  0,				/* doh_getitem */
-  0,				/* doh_setitem */
-  String_delitem,		/* doh_delitem */
-  String_insert,		/* doh_insitem */
-  String_delslice,		/* doh_delslice */
-};
-
-static DohFileMethods StringFileMethods = {
-  String_read,
-  String_write,
-  String_putc,
-  String_getc,
-  String_ungetc,
-  String_seek,
-  String_tell,
-  0,				/* close */
-};
-
-static DohStringMethods StringStringMethods = {
-  String_replace,
-  String_chop,
-};
-
-DohObjInfo DohStringType = {
-  "String",			/* objname */
-  DelString,			/* doh_del */
-  CopyString,			/* doh_copy */
-  String_clear,			/* doh_clear */
-  String_str,			/* doh_str */
-  String_data,			/* doh_data */
-  String_dump,			/* doh_dump */
-  String_len,	    	        /* doh_len */
-  String_hash,			/* doh_hash    */
-  String_cmp,			/* doh_cmp */
-  String_equal,	    	        /* doh_equal */
-  0,				/* doh_first    */
-  0,				/* doh_next     */
-  String_setfile,		/* doh_setfile */
-  String_getfile,		/* doh_getfile */
-  String_setline,		/* doh_setline */
-  String_getline,		/* doh_getline */
-  0,				/* doh_mapping */
-  &StringListMethods,		/* doh_sequence */
-  &StringFileMethods,		/* doh_file */
-  &StringStringMethods,		/* doh_string */
-  0,				/* doh_position */
-  0
-};
-
-
-#define INIT_MAXSIZE  16
-
-/* -----------------------------------------------------------------------------
- * NewString() - Create a new string
- * ----------------------------------------------------------------------------- */
-
-DOHString *DohNewString(const DOHString_or_char *so) {
-  int l = 0, max;
-  String *str;
-  char *s;
-  int hashkey = -1;
-  if (DohCheck(so)) {
-    str = (String *) ObjData(so);
-    s = (char *) String_data((String *) so);
-    l = s ? str->len : 0;
-    hashkey = str->hashkey;
-  } else {
-    s = (char *) so;
-    l = s ? (int) strlen(s) : 0;
-  }
-
-  str = (String *) DohMalloc(sizeof(String));
-  str->hashkey = hashkey;
-  str->sp = 0;
-  str->line = 1;
-  str->file = 0;
-  max = INIT_MAXSIZE;
-  if (s) {
-    if ((l + 1) > max)
-      max = l + 1;
-  }
-  str->str = (char *) DohMalloc(max);
-  str->maxsize = max;
-  if (s) {
-    strcpy(str->str, s);
-    str->len = l;
-    str->sp = l;
-  } else {
-    str->str[0] = 0;
-    str->len = 0;
-  }
-  return DohObjMalloc(&DohStringType, str);
-}
-
-
-/* -----------------------------------------------------------------------------
- * NewStringEmpty() - Create a new string
- * ----------------------------------------------------------------------------- */
-
-DOHString *DohNewStringEmpty(void) {
-  int max = INIT_MAXSIZE;
-  String *str = (String *) DohMalloc(sizeof(String));
-  str->hashkey = 0;
-  str->sp = 0;
-  str->line = 1;
-  str->file = 0;
-  str->str = (char *) DohMalloc(max);
-  str->maxsize = max;
-  str->str[0] = 0;
-  str->len = 0;
-  return DohObjMalloc(&DohStringType, str);
-}
-
-/* -----------------------------------------------------------------------------
- * NewStringWithSize() - Create a new string
- * ----------------------------------------------------------------------------- */
-
-DOHString *DohNewStringWithSize(const DOHString_or_char *so, int len) {
-  int l = 0, max;
-  String *str;
-  char *s;
-  if (DohCheck(so)) {
-    s = (char *) String_data((String *) so);
-  } else {
-    s = (char *) so;
-  }
-
-  str = (String *) DohMalloc(sizeof(String));
-  str->hashkey = -1;
-  str->sp = 0;
-  str->line = 1;
-  str->file = 0;
-  max = INIT_MAXSIZE;
-  if (s) {
-    l = (int) len;
-    if ((l + 1) > max)
-      max = l + 1;
-  }
-  str->str = (char *) DohMalloc(max);
-  str->maxsize = max;
-  if (s) {
-    strncpy(str->str, s, len);
-    str->str[l] = 0;
-    str->len = l;
-    str->sp = l;
-  } else {
-    str->str[0] = 0;
-    str->len = 0;
-  }
-  return DohObjMalloc(&DohStringType, str);
-}
-
-/* -----------------------------------------------------------------------------
- * NewStringf()
- *
- * Create a new string from a list of objects.
- * ----------------------------------------------------------------------------- */
-
-DOHString *DohNewStringf(const DOHString_or_char *fmt, ...) {
-  va_list ap;
-  DOH *r;
-  va_start(ap, fmt);
-  r = NewStringEmpty();
-  DohvPrintf(r, Char(fmt), ap);
-  va_end(ap);
-  return (DOHString *) r;
-}
-
-/* -----------------------------------------------------------------------------
- * Strcmp()
- * Strncmp()
- * Strstr()
- * Strchr()
- *
- * Some utility functions.
- * ----------------------------------------------------------------------------- */
-
-int DohStrcmp(const DOHString_or_char *s1, const DOHString_or_char *s2) {
-  const char *c1 = Char(s1);
-  const char *c2 = Char(s2);
-  return strcmp(c1, c2);
-}
-
-int DohStrncmp(const DOHString_or_char *s1, const DOHString_or_char *s2, int n) {
-  return strncmp(Char(s1), Char(s2), n);
-}
-
-char *DohStrstr(const DOHString_or_char *s1, const DOHString_or_char *s2) {
-  char *p1 = Char(s1);
-  char *p2 = Char(s2);
-  return p1 == 0 || p2 == 0 || *p2 == '\0' ? p1 : strstr(p1, p2);
-}
-
-char *DohStrchr(const DOHString_or_char *s1, int ch) {
-  return strchr(Char(s1), ch);
-}
diff --git a/dependencies2013/win32/swig/Source/DOH/void.c b/dependencies2013/win32/swig/Source/DOH/void.c
deleted file mode 100644
index 6111a8c4..00000000
--- a/dependencies2013/win32/swig/Source/DOH/void.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * void.c
- *
- *     Implements a "void" object that is really just a DOH container around
- *     an arbitrary C object represented as a void *.
- * ----------------------------------------------------------------------------- */
-
-#include "dohint.h"
-
-typedef struct {
-  void *ptr;
-  void (*del) (void *);
-} VoidObj;
-
-/* -----------------------------------------------------------------------------
- * Void_delete()
- *
- * Delete a void object. Invokes the destructor supplied at the time of creation.
- * ----------------------------------------------------------------------------- */
-
-static void Void_delete(DOH *vo) {
-  VoidObj *v = (VoidObj *) ObjData(vo);
-  if (v->del)
-    (*v->del) (v->ptr);
-  DohFree(v);
-}
-
-/* -----------------------------------------------------------------------------
- * Void_copy()
- *
- * Copies a void object.  This is only a shallow copy. The object destruction
- * function is not copied in order to avoid potential double-free problems.
- * ----------------------------------------------------------------------------- */
-
-static DOH *Void_copy(DOH *vo) {
-  VoidObj *v = (VoidObj *) ObjData(vo);
-  return NewVoid(v->ptr, 0);
-}
-
-/* -----------------------------------------------------------------------------
- * Void_data()
- *
- * Returns the void * stored in the object.
- * ----------------------------------------------------------------------------- */
-
-static void *Void_data(DOH *vo) {
-  VoidObj *v = (VoidObj *) ObjData(vo);
-  return v->ptr;
-}
-
-static DohObjInfo DohVoidType = {
-  "VoidObj",			/* objname */
-  Void_delete,			/* doh_del */
-  Void_copy,			/* doh_copy */
-  0,				/* doh_clear */
-  0,				/* doh_str */
-  Void_data,			/* doh_data */
-  0,				/* doh_dump */
-  0,				/* doh_len */
-  0,				/* doh_hash    */
-  0,				/* doh_cmp */
-  0,				/* doh_equal    */
-  0,				/* doh_first    */
-  0,				/* doh_next     */
-  0,				/* doh_setfile */
-  0,				/* doh_getfile */
-  0,				/* doh_setline */
-  0,				/* doh_getline */
-  0,				/* doh_mapping */
-  0,				/* doh_sequence */
-  0,				/* doh_file  */
-  0,				/* doh_string */
-  0,				/* doh_reserved */
-  0,				/* clientdata */
-};
-
-/* -----------------------------------------------------------------------------
- * NewVoid()
- *
- * Creates a new Void object given a void * and an optional destructor function.
- * ----------------------------------------------------------------------------- */
-
-DOH *DohNewVoid(void *obj, void (*del) (void *)) {
-  VoidObj *v;
-  v = (VoidObj *) DohMalloc(sizeof(VoidObj));
-  v->ptr = obj;
-  v->del = del;
-  return DohObjMalloc(&DohVoidType, v);
-}
diff --git a/dependencies2013/win32/swig/Source/Include/swigconfig.h.in b/dependencies2013/win32/swig/Source/Include/swigconfig.h.in
deleted file mode 100644
index cc3d57e1..00000000
--- a/dependencies2013/win32/swig/Source/Include/swigconfig.h.in
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Source/Include/swigconfig.h.in.  Generated from configure.ac by autoheader.  */
-
-/* define if the Boost library is available */
-#undef HAVE_BOOST
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `dld' library (-ldld). */
-#undef HAVE_LIBDLD
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have PCRE library */
-#undef HAVE_PCRE
-
-/* Define if popen is available */
-#undef HAVE_POPEN
-
-/* 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. */
-#undef HAVE_STDLIB_H
-
-/* 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. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `void *', as computed by sizeof. */
-#undef SIZEOF_VOID_P
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Compiler that built SWIG */
-#undef SWIG_CXX
-
-/* Directory for SWIG system-independent libraries */
-#undef SWIG_LIB
-
-/* Directory for SWIG system-independent libraries (Unix install on native
-   Windows) */
-#undef SWIG_LIB_WIN_UNIX
-
-/* Platform that SWIG is built for */
-#undef SWIG_PLATFORM
-
-/* Version number of package */
-#undef VERSION
-
-
-/* Default language */
-#define SWIG_LANG               "-tcl"
-
-/* Deal with attempt by Microsoft to deprecate C standard runtime functions */
-#if defined(_MSC_VER)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
diff --git a/dependencies2013/win32/swig/Source/Include/swigwarn.h b/dependencies2013/win32/swig/Source/Include/swigwarn.h
deleted file mode 100644
index 0b4c7eeb..00000000
--- a/dependencies2013/win32/swig/Source/Include/swigwarn.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigwarn.h
- *
- * SWIG warning message numbers
- * This file serves as the main registry of warning message numbers.  Some of these
- * numbers are used internally in the C/C++ source code of SWIG.   However, some
- * of the numbers are used in SWIG configuration files (swig.swg and others).
- *
- * The numbers are roughly organized into a few different classes by functionality.
- *
- * Even though symbolic constants are used in the SWIG source, this is
- * not always the case in SWIG interface files.  Do not change the
- * numbers in this file.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIGWARN_H_
-#define SWIGWARN_H_
-
-#define WARN_NONE                     0
-
-/* -- Deprecated features -- */
-
-#define WARN_DEPRECATED_EXTERN        101
-#define WARN_DEPRECATED_VAL           102
-#define WARN_DEPRECATED_OUT           103
-#define WARN_DEPRECATED_DISABLEDOC    104
-#define WARN_DEPRECATED_ENABLEDOC     105
-#define WARN_DEPRECATED_DOCONLY       106
-#define WARN_DEPRECATED_STYLE         107
-#define WARN_DEPRECATED_LOCALSTYLE    108
-#define WARN_DEPRECATED_TITLE         109
-#define WARN_DEPRECATED_SECTION       110
-#define WARN_DEPRECATED_SUBSECTION    111
-#define WARN_DEPRECATED_SUBSUBSECTION 112
-#define WARN_DEPRECATED_ADDMETHODS    113
-#define WARN_DEPRECATED_READONLY      114
-#define WARN_DEPRECATED_READWRITE     115
-#define WARN_DEPRECATED_EXCEPT        116
-#define WARN_DEPRECATED_NEW           117
-#define WARN_DEPRECATED_EXCEPT_TM     118
-#define WARN_DEPRECATED_IGNORE_TM     119
-#define WARN_DEPRECATED_OPTC          120
-#define WARN_DEPRECATED_NAME          121
-#define WARN_DEPRECATED_NOEXTERN      122
-#define WARN_DEPRECATED_NODEFAULT     123
-#define WARN_DEPRECATED_TYPEMAP_LANG  124
-#define WARN_DEPRECATED_INPUT_FILE    125
-#define WARN_DEPRECATED_NESTED_WORKAROUND 126
-
-/* -- Preprocessor -- */
-
-#define WARN_PP_MISSING_FILE          201
-#define WARN_PP_EVALUATION            202
-#define WARN_PP_INCLUDEALL_IMPORTALL  203
-#define WARN_PP_CPP_WARNING           204
-#define WARN_PP_CPP_ERROR             205
-#define WARN_PP_UNEXPECTED_TOKENS     206
-
-/* -- C/C++ Parser -- */
-
-#define WARN_PARSE_CLASS_KEYWORD      301
-#define WARN_PARSE_REDEFINED          302
-#define WARN_PARSE_EXTEND_UNDEF       303
-#define WARN_PARSE_UNSUPPORTED_VALUE  304
-#define WARN_PARSE_BAD_VALUE          305
-#define WARN_PARSE_PRIVATE            306
-#define WARN_PARSE_BAD_DEFAULT        307
-#define WARN_PARSE_NAMESPACE_ALIAS    308
-#define WARN_PARSE_PRIVATE_INHERIT    309
-#define WARN_PARSE_TEMPLATE_REPEAT    310
-#define WARN_PARSE_TEMPLATE_PARTIAL   311
-#define WARN_PARSE_UNNAMED_NESTED_CLASS 312
-#define WARN_PARSE_UNDEFINED_EXTERN   313
-#define WARN_PARSE_KEYWORD            314
-#define WARN_PARSE_USING_UNDEF        315
-#define WARN_PARSE_MODULE_REPEAT      316
-#define WARN_PARSE_TEMPLATE_SP_UNDEF  317
-#define WARN_PARSE_TEMPLATE_AMBIG     318
-#define WARN_PARSE_NO_ACCESS          319
-#define WARN_PARSE_EXPLICIT_TEMPLATE  320
-#define WARN_PARSE_BUILTIN_NAME       321
-#define WARN_PARSE_REDUNDANT          322
-#define WARN_PARSE_REC_INHERITANCE    323
-#define WARN_PARSE_NESTED_TEMPLATE    324
-#define WARN_PARSE_NAMED_NESTED_CLASS 325
-#define WARN_PARSE_EXTEND_NAME        326
-
-#define WARN_CPP11_LAMBDA             340
-#define WARN_CPP11_ALIAS_DECLARATION  341  /* redundant now */
-#define WARN_CPP11_ALIAS_TEMPLATE     342  /* redundant now */
-#define WARN_CPP11_VARIADIC_TEMPLATE  343
-
-#define WARN_IGNORE_OPERATOR_NEW        350	/* new */
-#define WARN_IGNORE_OPERATOR_DELETE     351	/* delete */
-#define WARN_IGNORE_OPERATOR_PLUS       352	/* + */
-#define WARN_IGNORE_OPERATOR_MINUS      353	/* - */
-#define WARN_IGNORE_OPERATOR_MUL        354	/* * */
-#define WARN_IGNORE_OPERATOR_DIV        355	/* / */
-#define WARN_IGNORE_OPERATOR_MOD        356	/* % */
-#define WARN_IGNORE_OPERATOR_XOR        357	/* ^ */
-#define WARN_IGNORE_OPERATOR_AND        358	/* & */
-#define WARN_IGNORE_OPERATOR_OR         359	/* | */
-#define WARN_IGNORE_OPERATOR_NOT        360	/* ~ */
-#define WARN_IGNORE_OPERATOR_LNOT       361	/* ! */
-#define WARN_IGNORE_OPERATOR_EQ         362	/* = */
-#define WARN_IGNORE_OPERATOR_LT         363	/* < */
-#define WARN_IGNORE_OPERATOR_GT         364	/* > */
-#define WARN_IGNORE_OPERATOR_PLUSEQ     365	/* += */
-#define WARN_IGNORE_OPERATOR_MINUSEQ    366	/* -= */
-#define WARN_IGNORE_OPERATOR_MULEQ      367	/* *= */
-#define WARN_IGNORE_OPERATOR_DIVEQ      368	/* /= */
-#define WARN_IGNORE_OPERATOR_MODEQ      369	/* %= */
-#define WARN_IGNORE_OPERATOR_XOREQ      370	/* ^= */
-#define WARN_IGNORE_OPERATOR_ANDEQ      371	/* &= */
-#define WARN_IGNORE_OPERATOR_OREQ       372	/* |= */
-#define WARN_IGNORE_OPERATOR_LSHIFT     373	/* << */
-#define WARN_IGNORE_OPERATOR_RSHIFT     374	/* >> */
-#define WARN_IGNORE_OPERATOR_LSHIFTEQ   375	/* <<= */
-#define WARN_IGNORE_OPERATOR_RSHIFTEQ   376	/* >>= */
-#define WARN_IGNORE_OPERATOR_EQUALTO    377	/* == */
-#define WARN_IGNORE_OPERATOR_NOTEQUAL   378	/* != */
-#define WARN_IGNORE_OPERATOR_LTEQUAL    379	/* <= */
-#define WARN_IGNORE_OPERATOR_GTEQUAL    380	/* >= */
-#define WARN_IGNORE_OPERATOR_LAND       381	/* && */
-#define WARN_IGNORE_OPERATOR_LOR        382	/* || */
-#define WARN_IGNORE_OPERATOR_PLUSPLUS   383	/* ++ */
-#define WARN_IGNORE_OPERATOR_MINUSMINUS 384	/* -- */
-#define WARN_IGNORE_OPERATOR_COMMA      385	/* , */
-#define WARN_IGNORE_OPERATOR_ARROWSTAR  386	/* ->* */
-#define WARN_IGNORE_OPERATOR_ARROW      387	/* -> */
-#define WARN_IGNORE_OPERATOR_CALL       388	/* () */
-#define WARN_IGNORE_OPERATOR_INDEX      389	/* [] */
-#define WARN_IGNORE_OPERATOR_UPLUS      390	/* + */
-#define WARN_IGNORE_OPERATOR_UMINUS     391	/* - */
-#define WARN_IGNORE_OPERATOR_UMUL       392	/* * */
-#define WARN_IGNORE_OPERATOR_UAND       393	/* & */
-#define WARN_IGNORE_OPERATOR_NEWARR     394	/* new [] */
-#define WARN_IGNORE_OPERATOR_DELARR     395	/* delete [] */
-#define WARN_IGNORE_OPERATOR_REF        396	/* operator *() */
-
-/* 394-399 are reserved */
-
-/* -- Type system and typemaps -- */
-
-#define WARN_TYPE_UNDEFINED_CLASS     401
-#define WARN_TYPE_INCOMPLETE          402
-#define WARN_TYPE_ABSTRACT            403
-#define WARN_TYPE_REDEFINED           404
-
-#define WARN_TYPEMAP_SOURCETARGET     450
-#define WARN_TYPEMAP_CHARLEAK         451
-#define WARN_TYPEMAP_SWIGTYPE         452
-#define WARN_TYPEMAP_APPLY_UNDEF      453
-#define WARN_TYPEMAP_SWIGTYPELEAK     454
-
-#define WARN_TYPEMAP_IN_UNDEF         460
-#define WARN_TYPEMAP_OUT_UNDEF        461
-#define WARN_TYPEMAP_VARIN_UNDEF      462
-#define WARN_TYPEMAP_VAROUT_UNDEF     463
-#define WARN_TYPEMAP_CONST_UNDEF      464
-#define WARN_TYPEMAP_UNDEF            465
-#define WARN_TYPEMAP_VAR_UNDEF        466
-#define WARN_TYPEMAP_TYPECHECK        467
-#define WARN_TYPEMAP_THROW            468
-#define WARN_TYPEMAP_DIRECTORIN_UNDEF  469
-#define WARN_TYPEMAP_THREAD_UNSAFE     470	/* mostly used in directorout typemaps */
-#define WARN_TYPEMAP_DIRECTOROUT_UNDEF 471
-#define WARN_TYPEMAP_TYPECHECK_UNDEF   472
-#define WARN_TYPEMAP_DIRECTOROUT_PTR   473
-#define WARN_TYPEMAP_OUT_OPTIMAL_IGNORED  474
-#define WARN_TYPEMAP_OUT_OPTIMAL_MULTIPLE 475
-#define WARN_TYPEMAP_INITIALIZER_LIST  476
-#define WARN_TYPEMAP_DIRECTORTHROWS_UNDEF 477
-
-/* -- Fragments -- */
-#define WARN_FRAGMENT_NOT_FOUND       490
-
-/* -- General code generation -- */
-
-#define WARN_LANG_OVERLOAD_DECL       501
-#define WARN_LANG_OVERLOAD_CONSTRUCT  502
-#define WARN_LANG_IDENTIFIER          503
-#define WARN_LANG_RETURN_TYPE         504
-#define WARN_LANG_VARARGS             505
-#define WARN_LANG_VARARGS_KEYWORD     506
-#define WARN_LANG_NATIVE_UNIMPL       507
-#define WARN_LANG_DEREF_SHADOW        508
-#define WARN_LANG_OVERLOAD_SHADOW     509
-#define WARN_LANG_FRIEND_IGNORE       510
-#define WARN_LANG_OVERLOAD_KEYWORD    511
-#define WARN_LANG_OVERLOAD_CONST      512
-#define WARN_LANG_CLASS_UNNAMED       513
-#define WARN_LANG_DIRECTOR_VDESTRUCT  514
-#define WARN_LANG_DISCARD_CONST       515
-#define WARN_LANG_OVERLOAD_IGNORED    516
-#define WARN_LANG_DIRECTOR_ABSTRACT   517
-#define WARN_LANG_PORTABILITY_FILENAME 518
-#define WARN_LANG_TEMPLATE_METHOD_IGNORE 519
-#define WARN_LANG_SMARTPTR_MISSING    520
-#define WARN_LANG_ILLEGAL_DESTRUCTOR  521
-#define WARN_LANG_EXTEND_CONSTRUCTOR  522
-#define WARN_LANG_EXTEND_DESTRUCTOR   523
-
-/* -- Reserved (600-799) -- */
-
-/* -- Language module specific warnings (700 - 899) -- */
-
-/* Feel free to claim any number in this space that's not currently being used. Just make sure you
-   add an entry here */
-
-#define WARN_D_TYPEMAP_CTYPE_UNDEF            700
-#define WARN_D_TYPEMAP_IMTYPE_UNDEF           701
-#define WARN_D_TYPEMAP_DTYPE_UNDEF            702
-#define WARN_D_MULTIPLE_INHERITANCE           703
-#define WARN_D_TYPEMAP_CLASSMOD_UNDEF         704
-#define WARN_D_TYPEMAP_DBODY_UNDEF            705
-#define WARN_D_TYPEMAP_DOUT_UNDEF             706
-#define WARN_D_TYPEMAP_DIN_UNDEF              707
-#define WARN_D_TYPEMAP_DDIRECTORIN_UNDEF      708
-#define WARN_D_TYPEMAP_DCONSTRUCTOR_UNDEF     709
-#define WARN_D_EXCODE_MISSING                 710
-#define WARN_D_CANTHROW_MISSING               711
-#define WARN_D_NO_DIRECTORCONNECT_ATTR        712
-#define WARN_D_NAME_COLLISION                 713
-
-/* please leave 700-719 free for D */
-
-#define WARN_SCILAB_TRUNCATED_NAME            720
-
-/* please leave 720-739 free for Scilab */
-
-#define WARN_PYTHON_INDENT_MISMATCH           740
-
-/* please leave 740-759 free for Python */
-
-#define WARN_RUBY_WRONG_NAME                  801
-#define WARN_RUBY_MULTIPLE_INHERITANCE        802
-
-/* please leave 800-809 free for Ruby */
-
-#define WARN_JAVA_TYPEMAP_JNI_UNDEF           810
-#define WARN_JAVA_TYPEMAP_JTYPE_UNDEF         811
-#define WARN_JAVA_TYPEMAP_JSTYPE_UNDEF        812
-#define WARN_JAVA_MULTIPLE_INHERITANCE        813
-#define WARN_JAVA_TYPEMAP_GETCPTR_UNDEF       814
-#define WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF      815
-#define WARN_JAVA_TYPEMAP_JAVABODY_UNDEF      816
-#define WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF       817
-#define WARN_JAVA_TYPEMAP_JAVAIN_UNDEF        818
-#define WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF    819
-#define WARN_JAVA_TYPEMAP_JAVADIRECTOROUT_UNDEF   820
-#define WARN_JAVA_TYPEMAP_INTERFACECODE_UNDEF 821
-#define WARN_JAVA_COVARIANT_RET               822
-#define WARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF 823
-#define WARN_JAVA_TYPEMAP_DIRECTORIN_NODESC   824
-#define WARN_JAVA_NO_DIRECTORCONNECT_ATTR     825
-#define WARN_JAVA_NSPACE_WITHOUT_PACKAGE      826
-
-/* please leave 810-829 free for Java */
-
-#define WARN_CSHARP_TYPEMAP_CTYPE_UNDEF       830
-#define WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF      831
-#define WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF     832
-#define WARN_CSHARP_MULTIPLE_INHERITANCE      833
-#define WARN_CSHARP_TYPEMAP_GETCPTR_UNDEF     834
-#define WARN_CSHARP_TYPEMAP_CLASSMOD_UNDEF    835
-#define WARN_CSHARP_TYPEMAP_CSBODY_UNDEF      836
-#define WARN_CSHARP_TYPEMAP_CSOUT_UNDEF       837
-#define WARN_CSHARP_TYPEMAP_CSIN_UNDEF        838
-#define WARN_CSHARP_TYPEMAP_CSDIRECTORIN_UNDEF    839
-#define WARN_CSHARP_TYPEMAP_CSDIRECTOROUT_UNDEF   840
-#define WARN_CSHARP_TYPEMAP_INTERFACECODE_UNDEF   841
-#define WARN_CSHARP_COVARIANT_RET             842
-#define WARN_CSHARP_TYPEMAP_CSCONSTRUCT_UNDEF 843
-#define WARN_CSHARP_EXCODE                    844
-#define WARN_CSHARP_CANTHROW                  845
-#define WARN_CSHARP_NO_DIRECTORCONNECT_ATTR   846
-
-/* please leave 830-849 free for C# */
-
-#define WARN_MODULA3_TYPEMAP_TYPE_UNDEF        850
-#define WARN_MODULA3_TYPEMAP_GETCPTR_UNDEF     851
-#define WARN_MODULA3_TYPEMAP_CLASSMOD_UNDEF    852
-#define WARN_MODULA3_TYPEMAP_PTRCONSTMOD_UNDEF 853
-#define WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN   854
-#define WARN_MODULA3_MULTIPLE_INHERITANCE      855
-#define WARN_MODULA3_TYPECONSTRUCTOR_UNKNOWN   856
-#define WARN_MODULA3_UNKNOWN_PRAGMA            857
-#define WARN_MODULA3_BAD_ENUMERATION           858
-#define WARN_MODULA3_DOUBLE_ID                 859
-#define WARN_MODULA3_BAD_IMPORT                860
-
-/* please leave 850-869 free for Modula 3 */
-
-#define WARN_PHP_MULTIPLE_INHERITANCE         870
-#define WARN_PHP_UNKNOWN_PRAGMA               871
-#define WARN_PHP_PUBLIC_BASE                  872
-
-/* please leave 870-889 free for PHP */
-
-#define WARN_GO_NAME_CONFLICT                 890
-
-/* please leave 890-899 free for Go */
-
-/* -- User defined warnings (900 - 999) -- */
-
-#endif
diff --git a/dependencies2013/win32/swig/Source/Makefile.am b/dependencies2013/win32/swig/Source/Makefile.am
deleted file mode 100644
index efa3ac1e..00000000
--- a/dependencies2013/win32/swig/Source/Makefile.am
+++ /dev/null
@@ -1,151 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# subdir-objects generates object files using the directory structure of the source files.
-AUTOMAKE_OPTIONS = foreign nostdinc subdir-objects 1.7.2
-
-SOURCE_DIR=$(top_srcdir)/Source
-BUILD_SOURCE_DIR=$(top_builddir)/Source
-
-SWIG_CXX_DEFS = @SWILL@
-
-AM_CPPFLAGS =	-I$(BUILD_SOURCE_DIR)/Include	\
-		-I$(BUILD_SOURCE_DIR)/CParse	\
-		-I$(SOURCE_DIR)/Include		\
-		-I$(SOURCE_DIR)/DOH		\
-		-I$(SOURCE_DIR)/CParse		\
-		-I$(SOURCE_DIR)/Preprocessor	\
-		-I$(SOURCE_DIR)/Swig		\
-		-I$(SOURCE_DIR)/Modules
-
-AM_CXXFLAGS =	$(SWIG_CXX_DEFS)
-
-AM_YFLAGS = -d
-
-BUILT_SOURCES = CParse/parser.h
-eswig_SOURCES =	CParse/cscanner.c		\
-		CParse/parser.y			\
-		CParse/templ.c			\
-		CParse/util.c			\
-		DOH/base.c			\
-		DOH/file.c			\
-		DOH/fio.c			\
-		DOH/hash.c			\
-		DOH/list.c			\
-		DOH/memory.c			\
-		DOH/string.c			\
-		DOH/void.c			\
-		Modules/allegrocl.cxx		\
-		Modules/allocate.cxx		\
-		Modules/browser.cxx		\
-		Modules/cffi.cxx		\
-		Modules/chicken.cxx		\
-		Modules/clisp.cxx		\
-		Modules/contract.cxx		\
-		Modules/csharp.cxx		\
-		Modules/d.cxx			\
-		Modules/directors.cxx		\
-		Modules/emit.cxx		\
-		Modules/go.cxx			\
-		Modules/guile.cxx		\
-		Modules/interface.cxx		\
-		Modules/java.cxx		\
-		Modules/javascript.cxx		\
-		Modules/lang.cxx		\
-		Modules/lua.cxx			\
-		Modules/main.cxx		\
-		Modules/modula3.cxx		\
-		Modules/module.cxx		\
-		Modules/mzscheme.cxx		\
-		Modules/nested.cxx  \
-		Modules/ocaml.cxx		\
-		Modules/octave.cxx		\
-		Modules/overload.cxx		\
-		Modules/perl5.cxx		\
-		Modules/php.cxx			\
-		Modules/php5.cxx		\
-		Modules/pike.cxx		\
-		Modules/python.cxx		\
-		Modules/r.cxx			\
-		Modules/ruby.cxx		\
-		Modules/s-exp.cxx		\
-		Modules/scilab.cxx		\
-		Modules/swigmain.cxx		\
-		Modules/tcl8.cxx		\
-		Modules/typepass.cxx		\
-		Modules/uffi.cxx		\
-		Modules/utils.cxx		\
-		Modules/xml.cxx			\
-		Preprocessor/cpp.c		\
-		Preprocessor/expr.c		\
-		Swig/cwrap.c			\
-		Swig/deprecate.c		\
-		Swig/error.c			\
-		Swig/extend.c			\
-		Swig/fragment.c			\
-		Swig/getopt.c			\
-		Swig/include.c			\
-		Swig/misc.c			\
-		Swig/naming.c			\
-		Swig/parms.c			\
-		Swig/scanner.c			\
-		Swig/stype.c			\
-		Swig/symbol.c			\
-		Swig/tree.c			\
-		Swig/typeobj.c			\
-		Swig/typemap.c			\
-		Swig/typesys.c			\
-		Swig/wrapfunc.c
-
-bin_PROGRAMS = eswig
-eswig_LDADD   = @SWIGLIBS@
-
-# Override the link stage to avoid using Libtool
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-# The executable is copied to the root directory for installation and running the test-suite.
-# This occurs on each invocation of make and is a step towards providing support for multiple
-# build directories.
-all-local: eswig@EXEEXT@
-	cp -f $(top_builddir)/Source/eswig@EXEEXT@ $(top_builddir)/swig@EXEEXT@
-
-clean-local:
-	rm -f $(top_builddir)/swig@EXEEXT@
-	rm -f core @EXTRA_CLEAN@
-
-distclean-local:
-	rm -f $(top_builddir)/Source/Include/swigconfig.h
-	rm -f $(top_builddir)/Source/Include/stamp-h1
-
-# Beautify the code.
-# Note that this works well on C code, but does some odd joining of lines for C++ code.
-# Compiling with -DNDEBUG and no optimisations will allow one to do a binary diff of the
-# swig executable as a way of checking before and after the 'beautifying'.
-# Single files can be beautified with the beautify-file target, eg: 'make beautify-file INDENTFILE=chosenfile.c'
-
-SWIGTYPEDEFS=-T bool -T File -T DohObjInfo -T Parm -T Language -T List -T Typetab -T ModuleFactory -T ErrorMessageFormat -T Symtab -T Hash -T Scanner -T String -T DohBase -T Node -T String_or_char -T SwigType -T Dispatcher -T Wrapper -T DohStringMethods -T DohFileMethods -T DohListMethods -T DohHashMethods -T DOH -T DohIterator -T ParmList -T FILE -T HashNode -T DOHObj_or_char -T DOHFile -T DOHString -T DOHString_or_char -T UpcallData
-INDENTBAKSDIR=../IndentBaks
-
-beautify:
-	rm -rf $(INDENTBAKSDIR)
-	mkdir $(INDENTBAKSDIR)
-	mkdir $(INDENTBAKSDIR)/CParse
-	mkdir $(INDENTBAKSDIR)/DOH
-	mkdir $(INDENTBAKSDIR)/Modules
-	mkdir $(INDENTBAKSDIR)/Preprocessor
-	mkdir $(INDENTBAKSDIR)/Swig
-	mkdir $(INDENTBAKSDIR)/Include
-	(csources=`find . -name "*.c"` && \
-	hsources=`find . -name "*.h"` && \
-	cxxsources=`find . -name "*.cxx"` && \
-	for file in $$csources $$hsources $$cxxsources; do \
-	  $(MAKE) beautify-file INDENTFILE=$$file; \
-	done; )
-
-beautify-file:
-	test -e $(INDENTBAKSDIR) || (echo $(INDENTBAKSDIR) directory does not exist && exit 1;)
-	test -n "$(INDENTFILE)" || (echo INDENTFILE not defined && exit 1;)
-	test -e $(INDENTFILE) || (echo File does not exist: $(INDENTFILE) && exit 1;)
-	cp $(INDENTFILE) $(INDENTBAKSDIR)/$(INDENTFILE);
-	indent -kr --honour-newlines --line-length160 --indent-level2 --braces-on-func-def-line --leave-optional-blank-lines $(SWIGTYPEDEFS) $(INDENTFILE) -o $(INDENTFILE).tmp;
-	cat $(INDENTFILE).tmp | sed -e 's/const const /const /' > $(INDENTFILE);
-	rm $(INDENTFILE).tmp;
diff --git a/dependencies2013/win32/swig/Source/Modules/README b/dependencies2013/win32/swig/Source/Modules/README
deleted file mode 100644
index 058779d2..00000000
--- a/dependencies2013/win32/swig/Source/Modules/README
+++ /dev/null
@@ -1,9 +0,0 @@
-06/25/2002
-
-This directory contains all of the SWIG language modules.  Many of these
-modules contain code that dates back to SWIG1.0.  The module API has changed
-a lot in the development releases so this is fairly messy.  We're working on
-cleaning it up, but you'll have to bear with us until it's done.
-
--- Dave
-
diff --git a/dependencies2013/win32/swig/Source/Modules/allegrocl.cxx b/dependencies2013/win32/swig/Source/Modules/allegrocl.cxx
deleted file mode 100644
index 77f1319c..00000000
--- a/dependencies2013/win32/swig/Source/Modules/allegrocl.cxx
+++ /dev/null
@@ -1,3242 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * allegrocl.cxx
- *
- * ALLEGROCL language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-
-// #define ALLEGROCL_DEBUG
-// #define ALLEGROCL_WRAP_DEBUG
-// #define ALLEGROCL_TYPE_DEBUG
-// #define ALLEGROCL_CLASS_DEBUG
-
-static const char *usage = "\
-Allegro CL Options (available with -allegrocl)\n\
-     -identifier-converter <type or funcname> - \n\
-                       Specifies the type of conversion to do on C identifiers to convert\n\
-                       them to symbols. There are two built-in converters: 'null' and\n\
-                       'lispify'. The default is 'null'. If you supply a name other\n\
-                       than one of the built-ins, then a function by that name will be\n\
-                       called to convert identifiers to symbols.\n\
-     -[no]cwrap      - Turn on or turn off generation of an intermediate C file when\n\
-                       creating a C interface. By default this is only done for C++ code.\n\
-     -isolate        - Define all SWIG helper functions in a package unique to this\n\
-                       module. Avoids redefinition warnings when loading multiple\n\
-                       SWIGged modules into the same running Allegro CL image.\n\
-";
-
-static File *f_cl = 0;
-String *f_clhead = NewString("");
-String *f_clwrap = NewString("(swig-in-package ())\n\n");
-static File *f_begin;
-static File *f_runtime;
-static File *f_cxx_header = 0;
-static File *f_cxx_wrapper = 0;
-
-static String *module_name = 0;
-static String *swig_package = 0;
-
-static String *identifier_converter = NewString("identifier-convert-null");
-
-static bool CWrap = true;	// generate wrapper file for C code by default. most correct.
-static bool Generate_Wrapper = false;
-static bool unique_swig_package = false;
-
-static SwigType *fwdref_ffi_type = NewString("__SWIGACL_FwdReference");
-
-static String *current_namespace = NewString("");
-static String *current_package = NewString("");
-static Hash *defined_namespace_packages = NewHash();
-static Node *in_class = 0;
-
-static Node *first_linked_type = 0;
-static Hash *defined_foreign_types = NewHash();
-static Hash *defined_foreign_ltypes = NewHash();
-
-static String *anon_type_name = NewString("anontype");
-static int anon_type_count = 0;
-
-// stub
-String *convert_literal(String *num_param, String *type, bool try_to_split = true);
-
-class ALLEGROCL:public Language {
-public:
-  virtual void main(int argc, char *argv[]);
-  virtual int top(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int namespaceDeclaration(Node *n);
-  virtual int constructorHandler(Node *n);
-  virtual int destructorHandler(Node *n);
-  virtual int globalvariableHandler(Node *n);
-  virtual int variableWrapper(Node *n);
-  virtual int constantWrapper(Node *n);
-  virtual int memberfunctionHandler(Node *n);
-  virtual int membervariableHandler(Node *n);
-  virtual int classHandler(Node *n);
-  virtual int emit_one(Node *n);
-  virtual int enumDeclaration(Node *n);
-  virtual int enumvalueDeclaration(Node *n);
-  virtual int typedefHandler(Node *n);
-  virtual int classforwardDeclaration(Node *n);
-  virtual int templateDeclaration(Node *n);
-  virtual int validIdentifier(String *s);
-private:
-  int emit_defun(Node *n, File *f_cl);
-  int emit_dispatch_defun(Node *n);
-  int emit_buffered_defuns(Node *n);
-  int cClassHandler(Node *n);
-  int cppClassHandler(Node *n);
-};
-static ALLEGROCL *allegrocl = 0;
-
-static String *trim(String *str) {
-  char *c = Char(str);
-  while (*c != '\0' && isspace((int) *c))
-    ++c;
-  String *result = NewString(c);
-  Chop(result);
-  return result;
-}
-
-int is_integer(String *s) {
-  char *c = Char(s);
-  if (c[0] == '#' && (c[1] == 'x' || c[1] == 'o'))
-    c += 2;
-
-  while (*c) {
-    if (!isdigit(*c))
-      return 0;
-    c++;
-  }
-  return 1;
-}
-
-String *class_from_class_or_class_ref(String *type) {
-  SwigType *stripped = SwigType_strip_qualifiers(type);
-  if (SwigType_isclass(stripped))
-    return stripped;
-
-  if (SwigType_ispointer(stripped) || SwigType_isreference(stripped)) {
-    // Printf(stderr,"It is a pointer/reference. Is it a class?\n");
-    SwigType_pop(stripped);
-    if (SwigType_isclass(stripped)) {
-      return stripped;
-    }
-  }
-  return 0;
-}
-
-String *lookup_defined_foreign_type(String *k) {
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "Looking up defined type '%s'.\n  Found: '%s'\n", k, Getattr(defined_foreign_types, k));
-#endif
-
-  return Getattr(defined_foreign_types, k);
-}
-
-String *listify_namespace(String *namespaze) {
-  if (Len(namespaze) == 0)
-    return NewString("()");
-  String *result = NewStringf("(\"%s\")", namespaze);
-  Replaceall(result, "::", "\" \"");
-  return result;
-}
-
-String *namespaced_name(Node *n, String *ns = current_namespace) {
-
-  return NewStringf("%s%s%s", ns, (Len(ns) != 0) ? "::" : "", Getattr(n, "sym:name"));
-}
-
-// "Namespace::Nested::Class2::Baz" -> "Baz"
-static String *strip_namespaces(String *str) {
-  return Swig_scopename_last(str);
-}
-
-void add_linked_type(Node *n) {
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "Adding linked node of type: %s(%s) %s(%p)\n\n", nodeType(n), Getattr(n, "storage"), Getattr(n, "name"), n);
-  // Swig_print_node(n);
-#endif
-  if (!first_linked_type) {
-    first_linked_type = n;
-    Setattr(n, "allegrocl:last_linked_type", n);
-  } else {
-    Node *t = Getattr(first_linked_type, "allegrocl:last_linked_type");
-    Setattr(t, "allegrocl:next_linked_type", n);
-    Setattr(first_linked_type, "allegrocl:last_linked_type", n);
-  }
-}
-
-void replace_linked_type(Node *old, Node *new_node) {
-  Node *prev = Getattr(old, "allegrocl:prev_linked_type");
-
-  Setattr(new_node, "allegrocl:next_linked_type", Getattr(old, "allegrocl:next_linked_type"));
-  if (prev)
-    Setattr(prev, "allegrocl:next_linked_type", new_node);
-  Delattr(old, "allegrocl:next_linked_type");
-  Delattr(old, "allegrocl:prev_linked_type");
-
-  // check if we're replacing the first link.
-  if (first_linked_type == old) {
-    first_linked_type = new_node;
-    Setattr(first_linked_type, "allegrocl:last_linked_type", Getattr(old, "allegrocl:last_linked_type"));
-  }
-  // check if we're replacing the last link.
-  if (Getattr(first_linked_type, "allegrocl:last_linked_type") == old)
-    Setattr(first_linked_type, "allegrocl:last_linked_type", new_node);
-}
-
-void insert_linked_type_at(Node *old, Node *new_node, int before = 1) {
-  Node *p = 0;
-
-  if (!first_linked_type) {
-    add_linked_type(new_node);
-    return;
-  }
-
-  if (!before) {
-    Setattr(new_node, "allegrocl:next_linked_type", Getattr(old, "allegrocl:next_linked_type"));
-    Setattr(old, "allegrocl:next_linked_type", new_node);
-    if (Getattr(first_linked_type, "allegrocl:last_linked_type") == old)
-      Setattr(first_linked_type, "allegrocl:last_linked_type", new_node);
-  } else {
-    Node *c = first_linked_type;
-    while (c) {
-      if (c == old) {
-	break;
-      } else {
-	p = c;
-	c = Getattr(c, "allegrocl:next_linked_type");
-      }
-    }
-    if (c == old) {
-      Setattr(new_node, "allegrocl:next_linked_type", c);
-      if (first_linked_type == c) {
-	first_linked_type = new_node;
-	Setattr(first_linked_type, "allegrocl:last_linked_type", Getattr(c, "allegrocl:last_linked_type"));
-	Delattr(c, "allegrocl:last_linked_type");
-      }
-      if (p)
-	Setattr(p, "allegrocl:next_linked_type", new_node);
-    }
-  }
-}
-
-Node *find_linked_type_by_name(String *name) {
-  Node *p = 0;
-  Node *c = first_linked_type;
-
-  // Printf(stderr,"in find_linked_type_by_name '%s'...", name);
-  while (c) {
-    String *key = Getattr(c, "name");
-    if (!Strcmp(key, name)) {
-      break;
-    } else {
-      p = c;
-      c = Getattr(c, "allegrocl:next_linked_type");
-    }
-  }
-  // Printf(stderr,"exit find_linked_type_by_name.\n");
-
-  if (p && c)
-    Setattr(c, "allegrocl:prev_linked_type", p);
-  // Printf(stderr,"find_linked_type_by_name: DONE\n");
-  return c;
-}
-
-Node *get_primary_synonym_of(Node *n) {
-  Node *p = Getattr(n, "allegrocl:synonym-of");
-  Node *prim = n;
-
-  // Printf(stderr, "getting primary synonym of %p\n", n);
-  while (p) {
-    // Printf(stderr, "   found one! %p\n", p);
-    prim = p;
-    p = Getattr(p, "allegrocl:synonym-of");
-  }
-  // Printf(stderr,"get_primary_syn: DONE. returning %s(%p)\n", Getattr(prim,"name"),prim);
-  return prim;
-}
-
-void add_forward_referenced_type(Node *n, int overwrite = 0) {
-  String *k = Getattr(n, "name");
-  String *name = Getattr(n, "sym:name");
-  String *ns = listify_namespace(current_namespace);
-
-  String *val = Getattr(defined_foreign_types, k);
-
-  if (!val || overwrite) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-    Printf(stderr, "Adding forward reference for %s (overwrite=%d)\n", k, overwrite);
-#endif
-    Setattr(defined_foreign_types, Copy(k), NewString("forward-reference"));
-
-    String *mangled_lname_gen = NewStringf("#.(swig-insert-id \"%s\" %s :type :class)", name, ns);
-
-    Setattr(defined_foreign_ltypes, Copy(k), mangled_lname_gen);
-    //    Printf(f_cl, ";; forward reference stub\n"
-    //           "(swig-def-foreign-class \"%s\" (ff:foreign-pointer) (:class ))\n\n"
-    //     , name);
-
-#ifdef ALLEGROCL_CLASS_DEBUG
-    Printf(stderr, "Linking forward reference type = %s(%p)\n", k, n);
-#endif
-    add_linked_type(n);
-  }
-}
-
-void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0,
-			      String *name = 0, String *ns = current_namespace) {
-
-  String *val;
-  String *ns_list = listify_namespace(ns);
-  String *templated = n ? Getattr(n, "template") : 0;
-  String *cDeclName = n ? Getattr(n, "name") : 0;
-
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "IN A-D-F-T. (n=%p, ow=%d, k=%s, name=%s, ns=%s\n", n, overwrite, k, name, ns);
-  Printf(stderr, "    templated = '%p', classDecl = '%p'\n", templated, cDeclName);
-#endif
-  if (n) {
-    if (!name)
-      name = Getattr(n, "sym:name");
-    if (!name)
-      name = strip_namespaces(Getattr(n, "name"));
-    if (templated) {
-      k = namespaced_name(n);
-    } else {
-      String *kind_of_type = Getattr(n, "kind");
-
-      /*
-         For typedefs of the form:
-
-         typedef struct __xxx { ... } xxx;
-
-	 behavior differs between C mode and C++ mode.
-
-	 C Mode:
-         add_defined_foreign_type will be called once via classHandler
-         to define the type for 'struct __xxx' and add the mapping from
-	 'struct __xxx' -> 'xxx'
-
-	 It will also be called once via typedefHandler to add the
-	 mapping 'xxx' -> 'xxx'
-
-	 C++ Mode:
-	 add_defined_foreign_type will be called once via classHandler
-	 to define the type for 'xxx'. it also adds the mapping from
-	 'xxx' -> 'xxx' and also for 'struct xxx' -> 'xxx'
-
-	 In typedefHandler, we again try to add the mapping from
-	 'xxx' -> 'xxx', which already exists. This second mapping
-	 is ignored.
-
-	 Both modes:
-
-         All references to this typedef'd struct will appear in
-         generated lisp code as an objectd of type 'xxx'. For
-         non-typedef'd structs, the classHand mapping will be
-
-           struct __xxx -> (swig-insert-id "__xxx")
-       */
-      // Swig_print_node(n);
-      String *unnamed = Getattr(n, "unnamed");
-      if (kind_of_type && (!Strcmp(kind_of_type, "struct")
-			   || !Strcmp(kind_of_type, "union")) && cDeclName && !unnamed) {
-	k = NewStringf("%s %s", kind_of_type, cDeclName);
-      } else {
-	if (!Strcmp(nodeType(n), "enum") && unnamed) {
-	  name = NewStringf("%s%d", anon_type_name, anon_type_count++);
-	  k = NewStringf("enum %s", name);
-	  Setattr(n, "allegrocl:name", name);
-
-	} else {
-	  k = k ? k : Getattr(n, "name");
-	}
-      }
-    }
-    // Swig_print_node(n);
-  }
-
-  String *tname = SwigType_istemplate_templateprefix(name);
-  if (tname) {
-    String *temp = strip_namespaces(tname);
-    name = NewStringf("%s%s%s", temp, SwigType_templateargs(name), SwigType_templatesuffix(name));
-    Delete(temp);
-    Delete(tname);
-  }
-
-  val = lookup_defined_foreign_type(k);
-
-  int is_fwd_ref = 0;
-  if (val)
-    is_fwd_ref = !Strcmp(val, "forward-reference");
-
-  if (!val || overwrite || is_fwd_ref) {
-#ifdef ALLEGROCL_CLASS_DEBUG
-    Printf(stderr, "Adding defined type '%s' = '%s' '%s' (overwrite=%d, in-class=%d)\n", k, ns, name, overwrite, in_class);
-#endif
-    String *mangled_name_gen = NewStringf("#.(swig-insert-id \"%s\" %s :type :type)", name, ns_list);
-    String *mangled_lname_gen = NewStringf("#.(swig-insert-id \"%s\" %s :type :class)", name, ns_list);
-
-    Setattr(defined_foreign_types, Copy(k), Copy(mangled_name_gen));
-    Setattr(defined_foreign_ltypes, Copy(k), Copy(mangled_lname_gen));
-
-    if (CPlusPlus) {
-      bool cpp_struct = Strstr(k, "struct ") ? true : false;
-      bool cpp_union = Strstr(k, "union ") ? true : false;
-
-      String *cpp_type = 0;
-      if (cpp_struct) {
-	cpp_type = Copy(k);
-	Replaceall(cpp_type, "struct ", "");
-      } else if (cpp_union) {
-	cpp_type = Copy(k);
-	Replaceall(cpp_type, "union ", "");
-      }
-
-      if (cpp_struct || cpp_union) {
-#ifdef ALLEGROCL_CLASS_DEBUG
-	Printf(stderr, " Also adding defined type '%s' = '%s' '%s' (overwrite=%d)\n", cpp_type, ns, name, overwrite);
-#endif
-	Setattr(defined_foreign_types, Copy(cpp_type), Copy(mangled_name_gen));
-	Setattr(defined_foreign_ltypes, Copy(cpp_type), Copy(mangled_lname_gen));
-      }
-    }
-#ifdef ALLEGROCL_CLASS_DEBUG
-    Printf(stderr, "looking to add %s/%s(%p) to linked_type_list...\n", k, name, n);
-#endif
-    if (is_fwd_ref) {
-      // Printf(stderr,"*** 1\n");
-      if (n)
-	add_linked_type(n);
-    } else {
-      // Printf(stderr,"*** 1-a\n");
-      if (SwigType_istemplate(k)) {
-	SwigType *resolved = SwigType_typedef_resolve_all(k);
-	// Printf(stderr,"*** 1-b\n");
-	Node *match = find_linked_type_by_name(resolved);
-	Node *new_node = 0;
-	// Printf(stderr, "*** temp-1\n");
-	if (n) {
-	  new_node = n;
-	} else {
-#ifdef ALLEGROCL_CLASS_DEBUG
-	  Printf(stderr, "Creating a new templateInst:\n");
-	  Printf(stderr, "       name = %s\n", resolved);
-	  Printf(stderr, "   sym:name = %s\n", name);
-	  Printf(stderr, "  real-name = %s\n", k);
-	  Printf(stderr, "       type = %s\n", resolved);
-	  Printf(stderr, "         ns = %s\n\n", ns);
-#endif
-	  new_node = NewHash();
-	  Setattr(new_node, "nodeType", "templateInst");
-	  Setattr(new_node, "name", Copy(resolved));
-	  Setattr(new_node, "sym:name", Copy(name));
-	  Setattr(new_node, "real-name", Copy(k));
-	  Setattr(new_node, "type", Copy(resolved));
-	  Setattr(new_node, "allegrocl:namespace", ns);
-	  Setattr(new_node, "allegrocl:package", ns);
-	}
-
-	if (!match) {
-	  if (!Strcmp(nodeType(new_node), "templateInst") && in_class) {
-	    /* this is an implicit template instantiation found while
-	       walking a class. need to insert this into the
-	       linked_type list before the current class definition */
-#ifdef ALLEGROCL_CLASS_DEBUG
-	    Printf(stderr, "trying to insert a templateInst before a class\n");
-#endif
-	    insert_linked_type_at(in_class, new_node);
-#ifdef ALLEGROCL_CLASS_DEBUG
-	    Printf(stderr, "DID IT!\n");
-#endif
-	  } else {
-	    // Printf(stderr,"*** 3\n");
-	    add_linked_type(new_node);
-	  }
-	  Setattr(new_node, "allegrocl:synonym:is-primary", "1");
-	} else {
-	  // a synonym type was found (held in variable 'match')
-	  // Printf(stderr, "setting primary synonym of %p to %p\n", new_node, match);
-	  if (new_node == match)
-	    Printf(stderr, "Hey-4 * - '%s' is a synonym of iteself!\n", Getattr(new_node, "name"));
-	  Setattr(new_node, "allegrocl:synonym-of", match);
-	  // Printf(stderr,"*** 4\n");
-	  add_linked_type(new_node);
-	}
-      } else {
-	Node *match;
-
-	if (!Strcmp(nodeType(n), "cdecl") && !Strcmp(Getattr(n, "storage"), "typedef")) {
-	  SwigType *type = SwigType_strip_qualifiers(Getattr(n, "type"));
-#ifdef ALLEGROCL_CLASS_DEBUG
-	  Printf(stderr, "Examining typedef '%s' for class references. (%d)\n", type, SwigType_isclass(type));
-#endif
-	  if (SwigType_isclass(type)) {
-#ifdef ALLEGROCL_CLASS_DEBUG
-	    Printf(stderr, "Found typedef of a class '%s'\n", type);
-#endif
-	    /* 
-	       For the following parsed expression:
-
-	       typedef struct __xxx { ... } xxx;
-
-	       if n is of kind "class" (defining the class 'struct __xxx'
-	       then we add n to the linked type list.
-
-	       if n is "cdecl" node of storage "typedef" (to note
-	       that xxx is equivalent to 'struct __xxx' then we don't
-	       want to add this node to the linked type list.
-	     */
-	    String *defined_type = lookup_defined_foreign_type(type);
-	    String *defined_key_type = lookup_defined_foreign_type(k);
-
-	    if ((Strstr(type, "struct ") || Strstr(type, "union "))
-		&& defined_type && !Strcmp(defined_type, defined_key_type)) {
-	      // mark as a synonym but don't add to linked_type list
-	      // Printf(stderr,"*** 4.8\n");
-	      Setattr(n, "allegrocl:synonym", "1");
-	    } else {
-	      SwigType *lookup_type = SwigType_istemplate(type) ? SwigType_typedef_resolve_all(type) : Copy(type);
-	      match = find_linked_type_by_name(lookup_type);
-	      if (match) {
-		Setattr(n, "allegrocl:synonym", "1");
-		Setattr(n, "allegrocl:synonym-of", match);
-		Setattr(n, "real-name", Copy(lookup_type));
-
-		// Printf(stderr, "*** pre-5: found match of '%s'(%p)\n", Getattr(match,"name"),match);
-		// if(n == match) Printf(stderr, "Hey-5 *** setting synonym of %p to %p\n", n, match);
-		// Printf(stderr,"*** 5\n");
-		add_linked_type(n);
-	      } else {
-#ifdef ALLEGROCL_CLASS_DEBUG
-		Printf(stderr, "Creating classfoward node for struct stub in typedef.\n");
-#endif
-		Node *new_node = NewHash();
-		String *symname = Copy(type);
-		Replaceall(symname, "struct ", "");
-		Setattr(new_node, "nodeType", "classforward");
-		Setattr(new_node, "name", Copy(type));
-		Setattr(new_node, "sym:name", symname);
-		Setattr(new_node, "allegrocl:namespace", ns);
-		Setattr(new_node, "allegrocl:package", ns);
-
-		String *mangled_new_name = NewStringf("#.(swig-insert-id \"%s\" %s)", symname, ns_list);
-		String *mangled_new_lname = NewStringf("#.(swig-insert-id \"%s\" %s :type :class)", symname, ns_list);
-		Setattr(defined_foreign_types, Copy(symname), Copy(mangled_new_name));
-		Setattr(defined_foreign_ltypes, Copy(symname), Copy(mangled_new_lname));
-
-		// Printf(stderr,"Weird! Can't find the type!\n");
-		add_forward_referenced_type(new_node);
-		add_linked_type(new_node);
-
-		Setattr(n, "allegrocl:synonym", "1");
-		Setattr(n, "allegrocl:synonym-of", new_node);
-
-		add_linked_type(n);
-	      }
-	      Delete(lookup_type);
-	    }
-	  } else {
-	    // check if it's a pointer or reference to a class.
-	    // Printf(stderr,"Checking if '%s' is a p. or r. to a class\n", type);
-	    String *class_ref = class_from_class_or_class_ref(type);
-	    if (class_ref) {
-	      match = find_linked_type_by_name(class_ref);
-	      Setattr(n, "allegrocl:synonym", "1");
-	      Setattr(n, "allegrocl:synonym-of", match);
-	      add_linked_type(n);
-	    }
-	  }
-	  Delete(type);
-	  // synonym types have already been added.
-	  // Printf(stderr,"*** 10\n");
-	  if (!Getattr(n, "allegrocl:synonym"))
-	    add_linked_type(n);
-	} else if (Getattr(n, "template")) {
-	  // Printf(stderr, "this is a class template node(%s)\n", nodeType(n));
-	  String *resolved = SwigType_typedef_resolve_all(Getattr(n, "name"));
-
-#ifdef ALLEGROCL_CLASS_DEBUG
-	  Printf(stderr, "   looking up %s for linked type match with %s...\n", Getattr(n, "sym:name"), resolved);
-#endif
-	  match = find_linked_type_by_name(resolved);
-	  if (!match) {
-#ifdef ALLEGROCL_CLASS_DEBUG
-	    Printf(stderr, "found no implicit instantiation of %%template node %s(%p)\n", Getattr(n, "name"), n);
-#endif
-	    add_linked_type(n);
-	  } else {
-	    Node *primary = get_primary_synonym_of(match);
-
-	    Setattr(n, "allegrocl:synonym:is-primary", "1");
-	    Delattr(primary, "allegrocl:synonym:is-primary");
-	    if (n == match)
-	      Printf(stderr, "Hey-7 * setting synonym of %p to %p\n (match = %p)", primary, n, match);
-	    Setattr(primary, "allegrocl:synonym-of", n);
-	    // Printf(stderr,"*** 7\n");
-	    add_linked_type(n);
-	  }
-	} else {
-#ifdef ALLEGROCL_CLASS_DEBUG
-	  Printf(stderr, "linking type '%s'(%p)\n", k, n);
-#endif
-	  // Printf(stderr,"*** 8\n");
-	  add_linked_type(n);
-	}
-      }
-    }
-    Delete(mangled_name_gen);
-    Delete(mangled_lname_gen);
-  } else {
-    if (!CPlusPlus || Strcmp(Getattr(n,"kind"),"typedef")) {
-       Swig_warning(WARN_TYPE_REDEFINED, Getfile(n), Getline(n),
-		    "Attempting to store a foreign type that exists: %s (%s)\n",
-		    k, val);
-    } 
-  }
-
-  Delete(ns_list);
-
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "OUT A-D-F-T\n");
-#endif
-}
-
-void note_implicit_template_instantiation(SwigType *t) {
-  // the namespace of the implicit instantiation is not necessarily
-  // current_namespace. Attempt to cull this from the type.
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "culling namespace of '%s' from '%s'\n", t, SwigType_templateprefix(t));
-#endif
-  SwigType *type = Copy(t);
-  SwigType *tok = SwigType_pop(type);
-  String *implicit_ns = SwigType_istemplate(tok) ? Swig_scopename_prefix(SwigType_templateprefix(tok)) : 0;
-  add_defined_foreign_type(0, 0, t, t, implicit_ns ? implicit_ns : current_namespace);
-
-  Delete(type);
-}
-
-String *get_ffi_type(Node *n, SwigType *ty, const_String_or_char_ptr name) {
-  /* lookup defined foreign type.
-     if it exists, it will return a form suitable for placing
-     into lisp code to generate the def-foreign-type name */
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "inside g_f_t: looking up '%s' '%s'\n", ty, name);
-#endif
-
-  String *found_type = lookup_defined_foreign_type(ty);
-
-  if (found_type) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-    Printf(stderr, "found_type '%s'\n", found_type);
-#endif
-    return (Strcmp(found_type, "forward-reference") ? Copy(found_type) : get_ffi_type(n, fwdref_ffi_type, ""));
-  } else {
-    Node *node = NewHash();
-    Setattr(node, "type", ty);
-    Setfile(node, Getfile(n));
-    Setline(node, Getline(n));
-    const String *tm = Swig_typemap_lookup("ffitype", node, name, 0);
-    Delete(node);
-
-    if (tm) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-      Printf(stderr, "g-f-t: found ffitype typemap '%s'\n", tm);
-#endif
-      return NewString(tm);
-    }
-
-    if (SwigType_istemplate(ty)) {
-      note_implicit_template_instantiation(ty);
-      return Copy(lookup_defined_foreign_type(ty));
-    }
-  }
-  return 0;
-}
-
-String *lookup_defined_foreign_ltype(String *l) {
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "Looking up defined ltype '%s'.\n  Found: '%s'\n", l, Getattr(defined_foreign_ltypes, l));
-#endif
-  return Getattr(defined_foreign_ltypes, l);
-}
-
-/* walk type and return string containing lisp version.
-   recursive. */
-String *internal_compose_foreign_type(Node *n, SwigType *ty) {
-
-  SwigType *tok;
-  String *ffiType = NewString("");
-
-  // for a function type, need to walk the parm list.
-  while (Len(ty) != 0) {
-    tok = SwigType_pop(ty);
-
-    if (SwigType_isfunction(tok)) {
-      // Generate Function wrapper
-      Printf(ffiType, "(:function ");
-      // walk parm list
-      List *pl = SwigType_parmlist(tok);
-
-      Printf(ffiType, "(");	// start parm list
-      for (Iterator i = First(pl); i.item; i = Next(i)) {
-	SwigType *f_arg = SwigType_strip_qualifiers(i.item);
-	Printf(ffiType, "%s ", internal_compose_foreign_type(n, f_arg));
-	Delete(f_arg);
-      }
-      Printf(ffiType, ")");	// end parm list.
-
-      // do function return type.
-      Printf(ffiType, " %s)", internal_compose_foreign_type(n, ty));
-      break;
-    } else if (SwigType_ispointer(tok) || SwigType_isreference(tok)) {
-      Printf(ffiType, "(* %s)", internal_compose_foreign_type(n, ty));
-    } else if (SwigType_isarray(tok)) {
-      Printf(ffiType, "(:array %s", internal_compose_foreign_type(n, ty));
-      String *atype = NewString("int");
-      String *dim = convert_literal(SwigType_array_getdim(tok, 0), atype);
-      Delete(atype);
-      if (is_integer(dim)) {
-	Printf(ffiType, " %s)", dim);
-      } else {
-	Printf(ffiType, " #| %s |#)", SwigType_array_getdim(tok, 0));
-      }
-    } else if (SwigType_ismemberpointer(tok)) {
-      // temp
-      Printf(ffiType, "(* %s)", internal_compose_foreign_type(n, ty));
-    } else {
-      String *res = get_ffi_type(n, tok, "");
-      if (res) {
-	Printf(ffiType, "%s", res);
-      } else {
-	SwigType *resolved_type = SwigType_typedef_resolve_all(tok);
-	if (Cmp(resolved_type, tok) != 0) {
-	  res = get_ffi_type(n, resolved_type, "");
-	  if (res) {
-	  } else {
-	    res = internal_compose_foreign_type(n, resolved_type);
-	  }
-	  if (res)
-	    Printf(ffiType, "%s", res);
-	}
-
-	if (!res) {
-	  String *is_struct = 0;
-	  String *tok_remove_text = 0;
-	  String *tok_name = Copy(tok);
-	  String *tok_key = SwigType_str(tok,0);
-	  if ((is_struct = Strstr(tok_key, "struct ")) || Strstr(tok_key, "union ")) {
-	    tok_remove_text = NewString(is_struct ? "struct " : "union ");
-	  }
-
-	  /* be more permissive of opaque types. This is the swig way.
-	     compiles will notice if these types are ultimately not
-	     present. */
-
-	  if(tok_remove_text) {
-	    Replaceall(tok_name,tok_remove_text,"");
-	  }
-	  tok_name = strip_namespaces(tok_name);
-	  Delete(tok_remove_text);
-	  // Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(tok), Getline(tok), "Unable to find definition of '%s', assuming forward reference.\n", tok);
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-	  Printf(stderr, "i-c-f-t: adding forward reference for unknown type '%s'. mapping: %s -> %s\n", tok, tok_key, tok_name);
-#endif
-	  Node *nn = NewHash();
-	  Setattr(nn,"nodeType","classforward");
-	  Setattr(nn,"kind","class");
-	  Setattr(nn,"sym:name",tok_name);
-	  Setattr(nn,"name",tok_key);
-	  Setattr(nn,"allegrocl:package",current_namespace);
-
-	  add_forward_referenced_type(nn, 0);
-	  // tok_name is dangling here, unused. ouch. why?
-	  Printf(ffiType, "%s", get_ffi_type(n, tok, ""), tok_name);
-	}
-      }
-    }
-  }
-  return ffiType;
-}
-
-String *compose_foreign_type(Node *n, SwigType *ty, String * /*id*/ = 0) {
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "compose_foreign_type: ENTER (%s)...\n ", ty);
-  // Printf(stderr, "compose_foreign_type: ENTER (%s)(%s)...\n ", ty, (id ? id : 0));
-  /* String *id_ref = SwigType_str(ty, id);
-  Printf(stderr, "looking up typemap for %s, found '%s'(%p)\n",
-	 id_ref, lookup_res ? Getattr(lookup_res, "code") : 0, lookup_res);
-  if (lookup_res) Swig_print_node(lookup_res);
-  */
-#endif
-
-  /* should we allow named lookups in the typemap here? YES! */
-  /* unnamed lookups should be found in get_ffi_type, called
-     by internal_compose_foreign_type(), below. */
-
-  /* I'm reverting to 'no' for the question above. I can no longer
-     remember why I needed it. If a user needed it, I'll find out
-     as soon as they upgrade. Sigh. -mutandiz 9/16/2008. */
-
-/*
-  if(id && lookup_res) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-    Printf(stderr, "compose_foreign_type: EXIT-1 (%s)\n ", Getattr(lookup_res, "code"));
-#endif
-    return NewString(Getattr(lookup_res, "code"));
-  }
-*/
-
-  SwigType *temp = SwigType_strip_qualifiers(ty);
-  String *res = internal_compose_foreign_type(n, temp);
-  Delete(temp);
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "compose_foreign_type: EXIT (%s)\n ", res);
-#endif
-
-  return res;
-}
-
-void update_package_if_needed(Node *n, File *f = f_clwrap) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "update_package: ENTER... \n");
-  Printf(stderr, "  current_package = '%s'\n", current_package);
-  Printf(stderr, "     node_package = '%s'\n", Getattr(n, "allegrocl:package"));
-  Printf(stderr, "   node(%p) = '%s'\n", n, Getattr(n, "name"));
-#endif
-  String *node_package = Getattr(n, "allegrocl:package");
-  if (Strcmp(current_package, node_package)) {
-    String *lispy_package = listify_namespace(node_package);
-
-    Delete(current_package);
-    current_package = Copy(node_package);
-    Printf(f, "\n(swig-in-package %s)\n", lispy_package);
-    Delete(lispy_package);
-  }
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "update_package: EXIT.\n");
-#endif
-}
-
-static String *mangle_name(Node *n, char const *prefix = "ACL", String *ns = current_namespace) {
-  String *suffix = Getattr(n, "sym:overname");
-  String *pre_mangled_name = NewStringf("%s_%s__%s%s", prefix, ns, Getattr(n, "sym:name"), suffix);
-  String *mangled_name = Swig_name_mangle(pre_mangled_name);
-  Delete(pre_mangled_name);
-  return mangled_name;
-}
-
-/* utilities */
-
-/* remove a pointer from ffitype. non-destructive. 
-   (* :char) ==> :char
-   (* (:array :int 30)) ==> (:array :int 30) */
-String *dereference_ffitype(String *ffitype) {
-   char *start;
-   char *temp = Char(ffitype);
-   String *reduced_type = 0;
-
-   if(temp && temp[0] == '(' && temp[1] == '*') {
-      temp += 2;
-
-      // walk past start of pointer references
-      while(*temp == ' ') temp++;
-      start = temp;
-      // temp = Char(reduced_type);
-      reduced_type = NewString(start);
-      temp = Char(reduced_type);
-      // walk to end of string. remove closing paren
-      while(*temp != '\0') temp++;
-      *(--temp) = '\0';
-   }
-
-   return reduced_type ? reduced_type : Copy(ffitype);
-}
-
-/* returns new string w/ parens stripped */
-String *strip_parens(String *string) {
-  string = Copy(string);
-  Replaceall(string, "(", "");
-  Replaceall(string, ")", "");
-  return string;
-}
-
-int ALLEGROCL::validIdentifier(String *s) {
-#ifdef ALLEGROCL_DEBUG
-	Printf(stderr, "validIdentifier %s\n", s);
-#endif
-
-  char *c = Char(s);
-
-  bool got_dot = false;
-  bool only_dots = true;
-
-  /* Check that s is a valid common lisp symbol. There's a lot of leeway here.
-     A common lisp symbol is essentially any token that's not a number and
-     does not consist of only dots. 
-
-     We are expressly not allowing spaces in identifiers here, but spaces
-     could be added via the identifier converter. */
-  while (*c) {
-    if (*c == '.') {
-      got_dot = true;
-    } else {
-      only_dots = false;
-    }
-    if (!isgraph(*c))
-      return 0;
-    c++;
-  }
-
-  return (got_dot && only_dots) ? 0 : 1;
-}
-
-String *infix_to_prefix(String *val, char split_op, const String *op, String *type) {
-  List *ored = Split(val, split_op, -1);
-
-  // some float hackery
-  if (((split_op == '+') || (split_op == '-')) && Len(ored) == 2 &&
-      (SwigType_type(type) == T_FLOAT || SwigType_type(type) == T_DOUBLE || SwigType_type(type) == T_LONGDOUBLE)) {
-    // check that we're not splitting a float
-    String *possible_result = convert_literal(val, type, false);
-    if (possible_result)
-      return possible_result;
-
-  }
-  // try parsing the split results. if any part fails, kick out.
-  bool part_failed = false;
-  if (Len(ored) > 1) {
-    String *result = NewStringf("(%s", op);
-    for (Iterator i = First(ored); i.item; i = Next(i)) {
-      String *converted = convert_literal(i.item, type);
-      if (converted) {
-	Printf(result, " %s", converted);
-	Delete(converted);
-      } else {
-	part_failed = true;
-	break;
-      }
-    }
-    Printf(result, ")");
-    Delete(ored);
-    return part_failed ? 0 : result;
-  }
-  Delete(ored);
-  return 0;
-}
-
-/* To be called by code generating the lisp interface
-   Will return a containing the literal based on type.
-   Will return null if there are problems.
-
-   try_to_split defaults to true (see stub above).
- */
-String *convert_literal(String *literal, String *type, bool try_to_split) {
-  String *num_param = Copy(literal);
-  String *trimmed = trim(num_param);
-  String *num = strip_parens(trimmed), *res = 0;
-  char *s = Char(num);
-
-  String *ns = listify_namespace(current_namespace);
-
-  // very basic parsing of infix expressions.
-  if (try_to_split && SwigType_type(type) != T_STRING) {
-    if ((res = infix_to_prefix(num, '|', "logior", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '&', "logand", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '^', "logxor", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '*', "*", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '/', "/", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '+', "+", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '-', "-", type)))
-      return res;
-    // if ((res = infix_to_prefix(num, '~', "lognot", type))) return res;
-    //  if( (res = infix_to_prefix(num, '<<', "ash", type)) ) return res;  
-  }
-
-  // unary complement...
-  if (s[0] == '~' && Len(num) >= 2) {
-    String *id = NewString(++s);
-    String *id_conv = convert_literal(id, type, false);
-    Delete(id);
-    if (id_conv) 
-      return NewStringf("(lognot %s)", id_conv);
-    s--;
-  }
-
-  if (SwigType_type(type) == T_FLOAT || SwigType_type(type) == T_DOUBLE || SwigType_type(type) == T_LONGDOUBLE) {
-    // Use CL syntax for float literals 
-    String *oldnum = Copy(num);
-
-    // careful. may be a float identifier or float constant.
-    char *num_start = Char(num);
-    char *num_end = num_start + strlen(num_start) - 1;
-
-    bool is_literal = isdigit(*num_start) || (*num_start == '.');
-
-    String *lisp_exp = 0;
-    if (is_literal) {
-      if (*num_end == 'f' || *num_end == 'F') {
-	lisp_exp = NewString("f");
-      } else {
-	lisp_exp = NewString("d");
-      }
-
-      if (*num_end == 'l' || *num_end == 'L' || *num_end == 'f' || *num_end == 'F') {
-	*num_end = '\0';
-	num_end--;
-      }
-
-      int exponents = Replaceall(num, "e", lisp_exp) + Replaceall(num, "E", lisp_exp);
-
-      if (!exponents)
-	Printf(num, "%s0", lisp_exp);
-
-      if (exponents > 1 || (exponents + Replaceall(num, ".", ".") == 0)) {
-	// Printf(stderr, "Can't parse '%s' as type '%s'.\n", oldnum, type);
-	Delete(num);
-	num = 0;
-      }
-      Delete(lisp_exp);
-    } else {
-      String *id = NewStringf("#.(swig-insert-id \"%s\" %s :type :constant)",
-			      num, ns);
-      Delete(num);
-      num = id;
-    }
-
-    Delete(oldnum);
-    Delete(trimmed);
-    Delete(ns);
-    return num;
-  } else if (SwigType_type(type) == T_CHAR) {
-    /* Use CL syntax for character literals */
-    Delete(num);
-    Delete(trimmed);
-    return NewStringf("#\\%s", num_param);
-  } else if (SwigType_type(type) == T_STRING) {
-    /* Use CL syntax for string literals */
-    Delete(num);
-    Delete(trimmed);
-    return NewStringf("\"%s\"", num_param);
-  } else if (Len(num) >= 1 && (isdigit(s[0]) || s[0] == '+' || s[0] == '-')) {
-    /* use CL syntax for numbers */
-    String *oldnum = Copy(num);
-    int usuffixes = Replaceall(num, "u", "") + Replaceall(num, "U", "");
-    int lsuffixes = Replaceall(num, "l", "") + Replaceall(num, "L", "");
-    if (usuffixes > 1 || lsuffixes > 1) {
-      Printf(stderr, "Weird!! number %s looks invalid.\n", oldnum);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    s = Char(num);
-    if (s[0] == '0' && Len(num) >= 2) {
-      /*octal or hex */
-      res = NewStringf("#%c%s", tolower(s[1]) == 'x' ? 'x' : 'o', s + 2);
-      Delete(num);
-    } else {
-      res = num;
-    }
-    Delete(oldnum);
-    Delete(trimmed);
-    return res;
-  } else if (allegrocl->validIdentifier(num)) {
-    /* convert C/C++ identifiers to CL symbols */
-    res = NewStringf("#.(swig-insert-id \"%s\" %s :type :constant)", num, ns);
-    Delete(num);
-    Delete(trimmed);
-    Delete(ns);
-    return res;
-  } else {
-    Delete(trimmed);
-    return num;
-  }
-}
-
-
-void emit_stub_class(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_stub_class: ENTER... '%s'(%p)\n", Getattr(n, "sym:name"), n);
-  Swig_print_node(n);
-#endif
-
-
-  String *name = Getattr(n, "sym:name");
-
-  if (Getattr(n, "allegrocl:synonym:already-been-stubbed"))
-    return;
-
-  String *tname = SwigType_istemplate_templateprefix(name);
-  if (tname) {
-    String *temp = strip_namespaces(tname);
-    name = NewStringf("%s%s%s", temp, SwigType_templateargs(name), SwigType_templatesuffix(name));
-    Delete(temp);
-    Delete(tname);
-  } else {
-    name = strip_namespaces(name);
-  }
-
-  // Printf(f_clhead, ";; from emit-stub-class\n");
-  update_package_if_needed(n, f_clhead);
-  Printf(f_clhead, ";; class template stub.\n");
-  Printf(f_clhead, "(swig-def-foreign-stub \"%s\")\n", name);
-
-  Setattr(n, "allegrocl:synonym:already-been-stubbed", "1");
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_stub_class: EXIT\n");
-#endif
-}
-
-void emit_synonym(Node *synonym) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_synonym: ENTER... \n");
-#endif
-
-  // Printf(stderr,"in emit_synonym for %s(%p)\n", Getattr(synonym,"name"),synonym);
-  int is_tempInst = !Strcmp(nodeType(synonym), "templateInst");
-  String *synonym_type;
-
-  Node *of = get_primary_synonym_of(synonym);
-
-  if (is_tempInst) {
-    // Printf(stderr, "*** using real-name '%s'\n", Getattr(synonym,"real-name"));
-    synonym_type = Getattr(synonym, "real-name");
-  } else {
-    // Printf(stderr, "*** using name '%s'\n", Getattr(synonym,"name"));
-    synonym_type = Getattr(synonym, "name");
-  }
-
-  String *synonym_ns = listify_namespace(Getattr(synonym, "allegrocl:namespace"));
-  String *syn_ltype, *syn_type, *of_ltype;
-  // String *of_cdeclname = Getattr(of,"allegrocl:classDeclarationName");
-  String *of_ns = Getattr(of, "allegrocl:namespace");
-  String *of_ns_list = listify_namespace(of_ns);
-  // String *of_name = of_cdeclname ? NewStringf("struct %s", Getattr(of,"name")) : NewStringf("%s::%s", of_ns, Getattr(of,"sym:name"));
-  // String *of_name = NewStringf("%s::%s", of_ns, Getattr(of,"sym:name"));
-  String *of_name = namespaced_name(of, of_ns);
-
-  if (CPlusPlus && !Strcmp(nodeType(synonym), "cdecl")) {
-    String *real_name = Getattr(synonym, "real-name");
-    if (!real_name)
-      real_name = NewString("Unknown"); // TODO: fix
-    syn_ltype = NewStringf("#.(swig-insert-id \"%s\" %s :type :class)", strip_namespaces(real_name), synonym_ns);
-    syn_type = NewStringf("#.(swig-insert-id \"%s\" %s :type :type)", strip_namespaces(real_name), synonym_ns);
-  } else {
-    syn_ltype = lookup_defined_foreign_ltype(synonym_type);
-    syn_type = lookup_defined_foreign_type(synonym_type);
-  }
-
-  of_ltype = lookup_defined_foreign_ltype(of_name);
-
-  // Printf(stderr,";; from emit-synonym syn='%s' of_ltype='%s'\n", syn_ltype, of_ltype);
-  if( of_ltype )
-      Printf(f_clhead, "(swig-def-synonym-type %s\n   %s\n   %s)\n", syn_ltype, of_ltype, syn_type);
-
-  Delete(synonym_ns);
-  Delete(of_ns_list);
-  Delete(of_name);
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_synonym: EXIT\n");
-#endif
-}
-
-void emit_full_class(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_full_class: ENTER... \n");
-#endif
-
-  String *name = Getattr(n, "sym:name");
-  String *kind = Getattr(n, "kind");
-
-  // Printf(stderr,"in emit_full_class: '%s'(%p).", Getattr(n,"name"),n);
-  if (Getattr(n, "allegrocl:synonym-of")) {
-    // Printf(stderr,"but it's a synonym of something.\n");
-    update_package_if_needed(n, f_clhead);
-    emit_synonym(n);
-    return;
-  }
-  // collect superclasses
-  String *bases = Getattr(n, "bases");
-  String *supers = NewString("(");
-  if (bases) {
-    int first = 1;
-    for (Iterator i = First(bases); i.item; i = Next(i)) {
-      if (!first)
-	Printf(supers, " ");
-      String *s = lookup_defined_foreign_ltype(Getattr(i.item, "name"));
-      // String *name = Getattr(i.item,"name");
-      if (s) {
-	Printf(supers, "%s", s);
-      } else {
-#ifdef ALLEGROCL_TYPE_DEBUG
-	Printf(stderr, "emit_templ_inst: did not find ltype for base class %s (%s)", Getattr(i.item, "name"), Getattr(n, "allegrocl:namespace"));
-#endif
-      }
-    }
-  } else {
-    Printf(supers, "ff:foreign-pointer");
-  }
-
-  // check for "feature:aclmixins" and add those as well.
-  Printf(supers, " %s)", Getattr(n,"feature:aclmixins"));
-
-  // Walk children to generate type definition.
-  String *slotdefs = NewString("   ");
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "  walking children...\n");
-#endif
-
-  Node *c;
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    String *storage_type = Getattr(c, "storage");
-    if ((!Strcmp(nodeType(c), "cdecl") && (!storage_type || Strcmp(storage_type, "typedef")))) {
-      String *access = Getattr(c, "access");
-
-      // hack. why would decl have a value of "variableHandler" and now "0"?
-      String *childDecl = Getattr(c, "decl");
-      // Printf(stderr,"childDecl = '%s' (%s)\n", childDecl, Getattr(c,"view"));
-      if (!childDecl || !Strcmp(childDecl, "0"))
-	childDecl = NewString("");
-
-      SwigType *childType;
-      String *cname;
-
-      // don't include types for private slots (yet). spr33959.
-      if(access && Strcmp(access,"public")) {
-	      childType = NewStringf("int");
-	      cname = NewString("nil");
-      } else {
-	      childType = NewStringf("%s%s", childDecl, Getattr(c, "type"));
-	      cname = Copy(Getattr(c, "name"));
-      }
-
-      if (!SwigType_isfunction(childType)) {
-	// Printf(slotdefs, ";;; member functions don't appear as slots.\n ");
-	// Printf(slotdefs, ";; ");
-	String *ns = listify_namespace(Getattr(n, "allegrocl:package"));
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-	Printf(stderr, "slot name = '%s' ns = '%s' class-of '%s' and type = '%s'\n", cname, ns, name, childType);
-#endif
-	Printf(slotdefs, "(#.(swig-insert-id \"%s\" %s :type :slot :class \"%s\") %s)", cname, ns, name, compose_foreign_type(n, childType));
-	Delete(ns);
-	if (access && Strcmp(access, "public"))
-	  Printf(slotdefs, " ;; %s member", access);
-
-	Printf(slotdefs, "\n   ");
-      }
-      Delete(childType);
-      Delete(cname);
-    }
-  }
-
-  String *ns_list = listify_namespace(Getattr(n, "allegrocl:namespace"));
-  update_package_if_needed(n, f_clhead);
-  Printf(f_clhead, "(swig-def-foreign-class \"%s\"\n %s\n  (:%s\n%s))\n\n", name, supers, kind, slotdefs);
-
-  Delete(supers);
-  Delete(ns_list);
-
-  Setattr(n, "allegrocl:synonym:already-been-stubbed", "1");
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_full_class: EXIT\n");
-#endif
-
-}
-
-void emit_class(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_class: ENTER... '%s'(%p)\n", Getattr(n, "sym:name"), n);
-#endif
-
-  int is_tempInst = !Strcmp(nodeType(n), "templateInst");
-
-  String *ns_list = listify_namespace(Getattr(n, "allegrocl:namespace"));
-  String *name = Getattr(n, is_tempInst ? "real-name" : "name");
-
-  String *tname = SwigType_istemplate_templateprefix(name);
-  if (tname) {
-    String *temp = strip_namespaces(tname);
-    name = NewStringf("%s%s%s", temp, SwigType_templateargs(name), SwigType_templatesuffix(name));
-    Delete(temp);
-    Delete(tname);
-  } else {
-    name = strip_namespaces(name);
-  }
-
-  if (Getattr(n, "allegrocl:synonym:is-primary")) {
-    // Printf(stderr,"  is primary... ");
-    if (is_tempInst) {
-      emit_stub_class(n);
-    } else {
-      emit_full_class(n);
-    }
-  } else {
-    // Node *primary = Getattr(n,"allegrocl:synonym-of");
-    Node *primary = get_primary_synonym_of(n);
-    if (primary && (primary != n)) {
-      // Printf(stderr,"  emitting synonym... ");
-      emit_stub_class(primary);
-      update_package_if_needed(n, f_clhead);
-      emit_synonym(n);
-    } else {
-      emit_full_class(n);
-    }
-  }
-  // Printf(stderr,"DONE\n");
-  Delete(name);
-  Delete(ns_list);
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_class: EXIT\n");
-#endif
-}
-
-void emit_typedef(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_typedef: ENTER... \n");
-#endif
-
-  String *name;
-  String *sym_name = Getattr(n, "sym:name");
-  String *type = NewStringf("%s%s", Getattr(n, "decl"), Getattr(n, "type"));
-  String *lisp_type = compose_foreign_type(n, type);
-  Delete(type);
-  Node *in_class = Getattr(n, "allegrocl:typedef:in-class");
-
-  // Printf(stderr,"in emit_typedef: '%s'(%p).",Getattr(n,"name"),n);
-  if (Getattr(n, "allegrocl:synonym-of")) {
-    // Printf(stderr," but it's a synonym of something.\n");
-    emit_synonym(n);
-    return;
-  }
-
-  if (in_class) {
-    String *class_name = Getattr(in_class, "name");
-    String *tname = SwigType_istemplate_templateprefix(class_name);
-    if (tname) {
-      String *temp = strip_namespaces(tname);
-      class_name = NewStringf("%s%s%s", temp, SwigType_templateargs(class_name), SwigType_templatesuffix(class_name));
-      Delete(temp);
-      Delete(tname);
-    }
-
-    name = NewStringf("%s__%s", class_name, sym_name);
-    Setattr(n, "allegrocl:in-class", in_class);
-  } else {
-    name = sym_name ? Copy(sym_name) : Copy(Getattr(n, "name"));
-  }
-
-  // leave these in for now. might want to change these to def-foreign-class at some point.
-//  Printf(f_clhead, ";; %s\n", SwigType_typedef_resolve_all(lisp_type));
-  Printf(f_clhead, "(swig-def-foreign-type \"%s\"\n  %s)\n", name, lisp_type);
-
-  Delete(name);
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_typedef: EXIT\n");
-#endif
-}
-
-void emit_enum_type_no_wrap(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_enum_type_no_wrap: ENTER... \n");
-#endif
-
-  String *unnamed = Getattr(n, "unnamed");
-  String *name;
-  //  SwigType *enumtype;
-
-  name = unnamed ? Getattr(n, "allegrocl:name") : Getattr(n, "sym:name");
-  SwigType *tmp = NewStringf("enum %s", unnamed ? unnamed : name);
-
-  Node *node = NewHash();
-  Setattr(node, "type", tmp);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *enumtype = Swig_typemap_lookup("ffitype", node, "", 0);
-  Delete(node);
-
-  Delete(tmp);
-
-  if (name) {
-    String *ns = listify_namespace(current_namespace);
-
-    Printf(f_clhead, "(swig-def-foreign-type \"%s\" %s)\n", name, enumtype);
-    Delete(ns);
-
-    // walk children.
-    Node *c;
-    for (c = firstChild(n); c; c = nextSibling(c)) {
-      if (!Getattr(c, "error")) {
-	String *val = Getattr(c, "enumvalue");
-	if (!val)
-	  val = Getattr(c, "enumvalueex");
-	String *converted_val = convert_literal(val, Getattr(c, "type"));
-	String *valname = Getattr(c, "sym:name");
-
-	if (converted_val) {
-	  Printf(f_clhead, "(swig-defconstant \"%s\" %s)\n", valname, converted_val);
-	  Delete(converted_val);
-	} else {
-	  Swig_warning(WARN_LANG_DISCARD_CONST, Getfile(n), Getline(n), "Unable to parse enum value '%s'. Setting to NIL\n", val);
-	  Printf(f_clhead, "(swig-defconstant \"%s\" nil #| %s |#)\n", valname, val);
-	}
-      }
-    }
-  }
-  Printf(f_clhead, "\n");
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_enum_type_no_wrap: EXIT\n");
-#endif
-
-}
-
-void emit_enum_type(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_enum_type: ENTER... \n");
-#endif
-
-  if (!Generate_Wrapper) {
-    emit_enum_type_no_wrap(n);
-    return;
-  }
-
-  String *unnamed = Getattr(n, "unnamed");
-  String *name;
-  // SwigType *enumtype;
-
-  name = unnamed ? Getattr(n, "allegrocl:name") : Getattr(n, "sym:name");
-  SwigType *tmp = NewStringf("enum %s", unnamed ? unnamed : name);
-
-  Node *node = NewHash();
-  Setattr(node, "type", tmp);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *enumtype = Swig_typemap_lookup("ffitype", node, "", 0);
-  Delete(node);
-
-  Delete(tmp);
-
-  if (name) {
-    String *ns = listify_namespace(current_namespace);
-
-    Printf(f_clhead, "(swig-def-foreign-type \"%s\" %s)\n", name, enumtype);
-    Delete(ns);
-
-    // walk children.
-    Node *c;
-    for(c = firstChild(n); c; c=nextSibling(c)) {
-      String *mangled_name = mangle_name(c, "ACL_ENUM", Getattr(c,"allegrocl:package"));
-      Printf(f_clhead, "(swig-defvar \"%s\" \"%s\" :type :constant :ftype :signed-long)\n", Getattr(c, "sym:name"), mangled_name);
-      Delete(mangled_name);
-    }
-  }
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_enum_type: EXIT\n");
-#endif
-
-}
-
-void emit_default_linked_type(Node *n) {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_default_linked_type: ENTER... \n");
-#endif
-
-  // catchall for non class types.
-  if (!Strcmp(nodeType(n), "classforward")) {
-    Printf(f_clhead, ";; forward referenced stub.\n");
-    Printf(f_clhead, "(swig-def-foreign-class \"%s\" (ff:foreign-pointer) (:class ))\n\n", Getattr(n, "sym:name"));
-  } else if (!Strcmp(nodeType(n), "enum")) {
-    emit_enum_type(n);
-  } else {
-    Printf(stderr, "Don't know how to emit node type '%s' named '%s'\n", nodeType(n), Getattr(n, "name"));
-  }
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_default_linked_type: EXIT\n");
-#endif
-
-}
-
-void dump_linked_types(File *f) {
-  Node *n = first_linked_type;
-  int i = 0;
-  while (n) {
-    Printf(f, "%d: (%p) node '%s' name '%s'\n", i++, n, nodeType(n), Getattr(n, "sym:name"));
-
-    Node *t = Getattr(n, "allegrocl:synonym-of");
-    if (t)
-      Printf(f, "     synonym-of %s(%p)\n", Getattr(t, "name"), t);
-    n = Getattr(n, "allegrocl:next_linked_type");
-  }
-}
-
-void emit_linked_types() {
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_linked_types: ENTER... ");
-#endif
-
-  Node *n = first_linked_type;
-
-  while (n) {
-    String *node_type = nodeType(n);
-
-    // Printf(stderr,"emitting node %s(%p) of type %s.", Getattr(n,"name"),n, nodeType(n));
-    if (!Strcmp(node_type, "class") || !Strcmp(node_type, "templateInst")) {
-      // may need to emit a stub, so it will update the package itself.
-      // Printf(stderr," Passing to emit_class.");
-      emit_class(n);
-    } else if (!Strcmp(nodeType(n), "cdecl")) {
-      // Printf(stderr," Passing to emit_typedef.");
-      update_package_if_needed(n, f_clhead);
-      emit_typedef(n);
-    } else {
-      // Printf(stderr," Passing to default_emitter.");
-      update_package_if_needed(n, f_clhead);
-      emit_default_linked_type(n);
-    }
-
-    n = Getattr(n, "allegrocl:next_linked_type");
-    // Printf(stderr,"returned.\n");
-  }
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_linked_types: EXIT\n");
-#endif
-}
-
-extern "C" Language *swig_allegrocl(void) {
-  return (allegrocl = new ALLEGROCL());
-}
-
-void ALLEGROCL::main(int argc, char *argv[]) {
-  int i;
-
-  Preprocessor_define("SWIGALLEGROCL 1", 0);
-  SWIG_library_directory("allegrocl");
-  SWIG_config_file("allegrocl.swg");
-
-  for (i = 1; i < argc; i++) {
-    if (!strcmp(argv[i], "-identifier-converter")) {
-      char *conv = argv[i + 1];
-
-      if (!conv)
-	Swig_arg_error();
-
-      Swig_mark_arg(i);
-      Swig_mark_arg(i + 1);
-      i++;
-
-      /* check for built-ins */
-      if (!strcmp(conv, "lispify")) {
-	Delete(identifier_converter);
-	identifier_converter = NewString("identifier-convert-lispify");
-      } else if (!strcmp(conv, "null")) {
-	Delete(identifier_converter);
-	identifier_converter = NewString("identifier-convert-null");
-      } else {
-	/* Must be user defined */
-	Delete(identifier_converter);
-	identifier_converter = NewString(conv);
-      }
-    } else if (!strcmp(argv[i], "-cwrap")) {
-      CWrap = true;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-nocwrap")) {
-      CWrap = false;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-isolate")) {
-      unique_swig_package = true;
-      Swig_mark_arg(i);
-    }
-
-    if (!strcmp(argv[i], "-help")) {
-      Printf(stdout, "%s\n", usage);
-    }
-
-  }
-
-  allow_overloading();
-}
-
-int ALLEGROCL::top(Node *n) {
-  module_name = Getattr(n, "name");
-  String *cxx_filename = Getattr(n, "outfile");
-  String *cl_filename = NewString("");
-
-  swig_package = unique_swig_package ? NewStringf("swig.%s", module_name) : NewString("swig");
-
-  Printf(cl_filename, "%s%s.cl", SWIG_output_directory(), module_name);
-
-  f_cl = NewFile(cl_filename, "w", SWIG_output_files());
-  if (!f_cl) {
-    Printf(stderr, "Unable to open %s for writing\n", cl_filename);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Generate_Wrapper = CPlusPlus || CWrap;
-
-  if (Generate_Wrapper) {
-    f_begin = NewFile(cxx_filename, "w", SWIG_output_files());
-    if (!f_begin) {
-      Delete(f_cl);
-      Printf(stderr, "Unable to open %s for writing\n", cxx_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-  } else
-    f_begin = NewString("");
-
-  f_runtime = NewString("");
-  f_cxx_header = f_runtime;
-  f_cxx_wrapper = NewString("");
-
-  Swig_register_filebyname("header", f_cxx_header);
-  Swig_register_filebyname("wrapper", f_cxx_wrapper);
-  Swig_register_filebyname("begin", f_begin);
-  Swig_register_filebyname("runtime", f_runtime);
-  Swig_register_filebyname("lisp", f_clwrap);
-  Swig_register_filebyname("lisphead", f_cl);
-
-  Swig_banner(f_begin);
-
-  Printf(f_runtime, "\n\n#ifndef SWIGALLEGROCL\n#define SWIGALLEGROCL\n#endif\n\n");
-
-  Swig_banner_target_lang(f_cl, ";;");
-
-  Printf(f_cl, "\n"
-	 "(defpackage :%s\n"
-	 "  (:use :common-lisp :ff :excl)\n"
-	 "  (:export #:*swig-identifier-converter* #:*swig-module-name*\n"
-	 "           #:*void* #:*swig-export-list*))\n"
-	 "(in-package :%s)\n\n"
-	 "(eval-when (:compile-toplevel :load-toplevel :execute)\n"
-	 "  (defparameter *swig-identifier-converter* '%s)\n"
-	 "  (defparameter *swig-module-name* :%s))\n\n", swig_package, swig_package, identifier_converter, module_name);
-  Printf(f_cl, "(defpackage :%s\n" "  (:use :common-lisp :%s :ff :excl))\n\n", module_name, swig_package);
-
-  Printf(f_clhead, "(in-package :%s)\n", module_name);
-
-  Language::top(n);
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  dump_linked_types(stderr);
-#endif
-  emit_linked_types();
-
-  Printf(f_clwrap, "\n(cl::in-package :%s)\n", swig_package);
-  Printf(f_clwrap, "\n(macrolet ((swig-do-export ()\n");
-  Printf(f_clwrap, "                 `(dolist (s ',*swig-export-list*)\n");
-  Printf(f_clwrap, "                    (apply #'export s))))\n");
-  Printf(f_clwrap, "   (swig-do-export))\n");
-  Printf(f_clwrap, "\n(setq *swig-export-list* nil)\n");
-
-  Printf(f_cl, "%s\n", f_clhead);
-  Printf(f_cl, "%s\n", f_clwrap);
-
-  Delete(f_cl);
-  Delete(f_clhead);
-  Delete(f_clwrap);
-
-  Dump(f_runtime, f_begin);
-  Printf(f_begin, "%s\n", f_cxx_wrapper);
-
-  Delete(f_runtime);
-  Delete(f_begin);
-  Delete(f_cxx_wrapper);
-
-  // Swig_print_tree(n);
-
-  return SWIG_OK;
-}
-
-/* very shamelessly 'borrowed' from overload.cxx, which
-   keeps the below Swig_overload_rank() code to itself.
-   We don't need a dispatch function in the C++ wrapper
-   code; we want it over on the lisp side. */
-
-#define Swig_overload_rank Allegrocl_swig_overload_rank
-
-#define MAX_OVERLOAD 256
-
-/* Overload "argc" and "argv" */
-// String *argv_template_string;
-// String *argc_template_string;
-
-struct Overloaded {
-  Node *n;			/* Node                               */
-  int argc;			/* Argument count                     */
-  ParmList *parms;		/* Parameters used for overload check */
-  int error;			/* Ambiguity error                    */
-};
-
-/* -----------------------------------------------------------------------------
- * Swig_overload_rank()
- *
- * This function takes an overloaded declaration and creates a list that ranks
- * all overloaded methods in an order that can be used to generate a dispatch 
- * function.
- * Slight difference in the way this function is used by scripting languages and
- * statically typed languages. The script languages call this method via 
- * Swig_overload_dispatch() - where wrappers for all overloaded methods are generated,
- * however sometimes the code can never be executed. The non-scripting languages
- * call this method via Swig_overload_check() for each overloaded method in order
- * to determine whether or not the method should be wrapped. Note the slight
- * difference when overloading methods that differ by const only. The
- * scripting languages will ignore the const method, whereas the non-scripting
- * languages ignore the first method parsed.
- * ----------------------------------------------------------------------------- */
-
-static List *Swig_overload_rank(Node *n, bool script_lang_wrapping) {
-  Overloaded nodes[MAX_OVERLOAD];
-  int nnodes = 0;
-  Node *o = Getattr(n, "sym:overloaded");
-  Node *c;
-
-  if (!o)
-    return 0;
-
-  c = o;
-  while (c) {
-    if (Getattr(c, "error")) {
-      c = Getattr(c, "sym:nextSibling");
-      continue;
-    }
-    /*    if (SmartPointer && Getattr(c,"cplus:staticbase")) {
-       c = Getattr(c,"sym:nextSibling");
-       continue;
-       } */
-
-    /* Make a list of all the declarations (methods) that are overloaded with
-     * this one particular method name */
-    if (Getattr(c, "wrap:name")) {
-      nodes[nnodes].n = c;
-      nodes[nnodes].parms = Getattr(c, "wrap:parms");
-      nodes[nnodes].argc = emit_num_required(nodes[nnodes].parms);
-      nodes[nnodes].error = 0;
-      nnodes++;
-    }
-    c = Getattr(c, "sym:nextSibling");
-  }
-
-  /* Sort the declarations by required argument count */
-  {
-    int i, j;
-    for (i = 0; i < nnodes; i++) {
-      for (j = i + 1; j < nnodes; j++) {
-	if (nodes[i].argc > nodes[j].argc) {
-	  Overloaded t = nodes[i];
-	  nodes[i] = nodes[j];
-	  nodes[j] = t;
-	}
-      }
-    }
-  }
-
-  /* Sort the declarations by argument types */
-  {
-    int i, j;
-    for (i = 0; i < nnodes - 1; i++) {
-      if (nodes[i].argc == nodes[i + 1].argc) {
-	for (j = i + 1; (j < nnodes) && (nodes[j].argc == nodes[i].argc); j++) {
-	  Parm *p1 = nodes[i].parms;
-	  Parm *p2 = nodes[j].parms;
-	  int differ = 0;
-	  int num_checked = 0;
-	  while (p1 && p2 && (num_checked < nodes[i].argc)) {
-	    //    Printf(stdout,"p1 = '%s', p2 = '%s'\n", Getattr(p1,"type"), Getattr(p2,"type"));
-	    if (checkAttribute(p1, "tmap:in:numinputs", "0")) {
-	      p1 = Getattr(p1, "tmap:in:next");
-	      continue;
-	    }
-	    if (checkAttribute(p2, "tmap:in:numinputs", "0")) {
-	      p2 = Getattr(p2, "tmap:in:next");
-	      continue;
-	    }
-	    String *t1 = Getattr(p1, "tmap:typecheck:precedence");
-	    String *t2 = Getattr(p2, "tmap:typecheck:precedence");
-	    if ((!t1) && (!nodes[i].error)) {
-	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[i].n), Getline(nodes[i].n),
-			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
-			   Swig_name_decl(nodes[i].n), SwigType_str(Getattr(p1, "type"), 0));
-	      nodes[i].error = 1;
-	    } else if ((!t2) && (!nodes[j].error)) {
-	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[j].n), Getline(nodes[j].n),
-			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
-			   Swig_name_decl(nodes[j].n), SwigType_str(Getattr(p2, "type"), 0));
-	      nodes[j].error = 1;
-	    }
-	    if (t1 && t2) {
-	      int t1v, t2v;
-	      t1v = atoi(Char(t1));
-	      t2v = atoi(Char(t2));
-	      differ = t1v - t2v;
-	    } else if (!t1 && t2)
-	      differ = 1;
-	    else if (t1 && !t2)
-	      differ = -1;
-	    else if (!t1 && !t2)
-	      differ = -1;
-	    num_checked++;
-	    if (differ > 0) {
-	      Overloaded t = nodes[i];
-	      nodes[i] = nodes[j];
-	      nodes[j] = t;
-	      break;
-	    } else if ((differ == 0) && (Strcmp(t1, "0") == 0)) {
-	      t1 = Getattr(p1, "ltype");
-	      if (!t1) {
-		t1 = SwigType_ltype(Getattr(p1, "type"));
-		if (Getattr(p1, "tmap:typecheck:SWIGTYPE")) {
-		  SwigType_add_pointer(t1);
-		}
-		Setattr(p1, "ltype", t1);
-	      }
-	      t2 = Getattr(p2, "ltype");
-	      if (!t2) {
-		t2 = SwigType_ltype(Getattr(p2, "type"));
-		if (Getattr(p2, "tmap:typecheck:SWIGTYPE")) {
-		  SwigType_add_pointer(t2);
-		}
-		Setattr(p2, "ltype", t2);
-	      }
-
-	      /* Need subtype check here.  If t2 is a subtype of t1, then we need to change the
-	         order */
-
-	      if (SwigType_issubtype(t2, t1)) {
-		Overloaded t = nodes[i];
-		nodes[i] = nodes[j];
-		nodes[j] = t;
-	      }
-
-	      if (Strcmp(t1, t2) != 0) {
-		differ = 1;
-		break;
-	      }
-	    } else if (differ) {
-	      break;
-	    }
-	    if (Getattr(p1, "tmap:in:next")) {
-	      p1 = Getattr(p1, "tmap:in:next");
-	    } else {
-	      p1 = nextSibling(p1);
-	    }
-	    if (Getattr(p2, "tmap:in:next")) {
-	      p2 = Getattr(p2, "tmap:in:next");
-	    } else {
-	      p2 = nextSibling(p2);
-	    }
-	  }
-	  if (!differ) {
-	    /* See if declarations differ by const only */
-	    String *d1 = Getattr(nodes[i].n, "decl");
-	    String *d2 = Getattr(nodes[j].n, "decl");
-	    if (d1 && d2) {
-	      String *dq1 = Copy(d1);
-	      String *dq2 = Copy(d2);
-	      if (SwigType_isconst(d1)) {
-		Delete(SwigType_pop(dq1));
-	      }
-	      if (SwigType_isconst(d2)) {
-		Delete(SwigType_pop(dq2));
-	      }
-	      if (Strcmp(dq1, dq2) == 0) {
-
-		if (SwigType_isconst(d1) && !SwigType_isconst(d2)) {
-		  if (script_lang_wrapping) {
-		    // Swap nodes so that the const method gets ignored (shadowed by the non-const method)
-		    Overloaded t = nodes[i];
-		    nodes[i] = nodes[j];
-		    nodes[j] = t;
-		  }
-		  differ = 1;
-		  if (!nodes[j].error) {
-		    if (script_lang_wrapping) {
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[j].n), Getline(nodes[j].n),
-				   "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[i].n), Getline(nodes[i].n),
-				   "using non-const method %s instead.\n", Swig_name_decl(nodes[i].n));
-		    } else {
-		      if (!Getattr(nodes[j].n, "overload:ignore")) {
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		      }
-		    }
-		  }
-		  nodes[j].error = 1;
-		} else if (!SwigType_isconst(d1) && SwigType_isconst(d2)) {
-		  differ = 1;
-		  if (!nodes[j].error) {
-		    if (script_lang_wrapping) {
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[j].n), Getline(nodes[j].n),
-				   "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[i].n), Getline(nodes[i].n),
-				   "using non-const method %s instead.\n", Swig_name_decl(nodes[i].n));
-		    } else {
-		      if (!Getattr(nodes[j].n, "overload:ignore")) {
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		      }
-		    }
-		  }
-		  nodes[j].error = 1;
-		}
-	      }
-	      Delete(dq1);
-	      Delete(dq2);
-	    }
-	  }
-	  if (!differ) {
-	    if (!nodes[j].error) {
-	      if (script_lang_wrapping) {
-		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[j].n), Getline(nodes[j].n),
-			     "Overloaded method %s effectively ignored,\n", Swig_name_decl(nodes[j].n));
-		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[i].n), Getline(nodes[i].n),
-			     "as it is shadowed by %s.\n", Swig_name_decl(nodes[i].n));
-	      } else {
-		if (!Getattr(nodes[j].n, "overload:ignore")) {
-		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-			       "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-			       "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		}
-	      }
-	      nodes[j].error = 1;
-	    }
-	  }
-	}
-      }
-    }
-  }
-  List *result = NewList();
-  {
-    int i;
-    for (i = 0; i < nnodes; i++) {
-      if (nodes[i].error)
-	Setattr(nodes[i].n, "overload:ignore", "1");
-      Append(result, nodes[i].n);
-      //      Printf(stdout,"[ %d ] %s\n", i, ParmList_errorstr(nodes[i].parms));
-      //      Swig_print_node(nodes[i].n);
-    }
-  }
-  return result;
-}
-
-/* end shameless borrowing */
-
-int any_varargs(ParmList *pl) {
-  Parm *p;
-
-  for (p = pl; p; p = nextSibling(p)) {
-    if (SwigType_isvarargs(Getattr(p, "type")))
-      return 1;
-  }
-
-  return 0;
-}
-
-String *get_lisp_type(Node *n, SwigType *ty, const_String_or_char_ptr name) {
-  Node *node = NewHash();
-  Setattr(node, "type", ty);
-  Setattr(node, "name", name);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *tm = Swig_typemap_lookup("lisptype", node, "", 0);
-  Delete(node);
-
-  return tm ? NewString(tm) : NewString("");
-}
-
-Node *parent_node_skipping_extends(Node *n) {
-  Node *result = n;
-  do {
-    result = parentNode(result);
-  }
-  while (Cmp("extend", nodeType(result)) == 0);
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * emit_num_lin_arguments()
- *
- * Calculate the total number of arguments.   This function is safe for use
- * with multi-argument typemaps which may change the number of arguments in
- * strange ways.
- * ----------------------------------------------------------------------------- */
-
-int emit_num_lin_arguments(ParmList *parms) {
-  Parm *p = parms;
-  int nargs = 0;
-
-  while (p) {
-    // Printf(stderr,"enla: '%s' lin='%p' numinputs='%s'\n", Getattr(p,"name"), Getattr(p,"tmap:lin"), Getattr(p,"tmap:lin:numinputs"));
-    if (Getattr(p, "tmap:lin")) {
-      nargs += GetInt(p, "tmap:lin:numinputs");
-      p = Getattr(p, "tmap:lin:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  /* DB 04/02/2003: Not sure this is necessary with tmap:in:numinputs */
-  /*
-     if (parms && (p = Getattr(parms,"emit:varargs"))) {
-     if (!nextSibling(p)) {
-     nargs--;
-     }
-     }
-   */
-  return nargs;
-}
-
-String *id_converter_type(SwigType const *type) {
-  SwigType *t = Copy(type);
-  String *result = 0;
-
-  if (SwigType_ispointer(t)) {
-    SwigType_pop(t);
-    String *pointee = id_converter_type(t);
-    result = NewStringf("(:* %s)", pointee);
-    Delete(pointee);
-  } else if (SwigType_ismemberpointer(t)) {
-    String *klass = SwigType_parm(t);
-    SwigType_pop(t);
-    String *member = id_converter_type(t);
-    result = NewStringf("(:member \"%s\" %s)", klass, member);
-    Delete(klass);
-    Delete(member);
-  } else if (SwigType_isreference(t)) {
-    SwigType_pop(t);
-    String *referencee = id_converter_type(t);
-    result = NewStringf("(:& %s)", referencee);
-    Delete(referencee);
-  } else if (SwigType_isarray(t)) {
-    String *size = SwigType_parm(t);
-    SwigType_pop(t);
-    String *element_type = id_converter_type(t);
-    result = NewStringf("(:array %s \"%s\")", element_type, size);
-    Delete(size);
-    Delete(element_type);
-  } else if (SwigType_isfunction(t)) {
-    result = NewString("(:function (");
-    String *parmlist_str = SwigType_parm(t);
-    List *parms = SwigType_parmlist(parmlist_str);
-
-    for (Iterator i = First(parms); i.item;) {
-      String *parm = id_converter_type((SwigType *) i.item);
-      Printf(result, "%s", parm);
-      i = Next(i);
-      if (i.item)
-	Printf(result, " ");
-      Delete(parm);
-    }
-    SwigType_pop(t);
-    String *ret = id_converter_type(t);
-    Printf(result, ") %s)", ret);
-
-    Delete(parmlist_str);
-    Delete(parms);
-    Delete(ret);
-  } else if (SwigType_isqualifier(t)) {
-    result = NewString("(:qualified (");
-    String *qualifiers_str = Copy(SwigType_parm(t));	// ?!
-    // Replaceall below SEGVs if we don't put the Copy here...
-    SwigType_pop(t);
-    String *qualifiee = id_converter_type(t);
-
-    Replaceall(qualifiers_str, " ", " :");
-    if (Len(qualifiers_str) > 0)
-      Printf(result, ":");
-    Printf(result, "%s) %s)", qualifiers_str, qualifiee);
-
-    Delete(qualifiers_str);
-    Delete(qualifiee);
-  } else if (SwigType_istemplate(t)) {
-    result = NewStringf("(:template \"%s\")", t);
-  } else {			/* if (SwigType_issimple(t)) */
-
-    if (Strstr(Char(t), "::")) {
-      result = listify_namespace(t);
-    } else {
-      result = NewStringf("\"%s\"", t);
-    }
-  }
-
-  Delete(t);
-  return result;
-}
-
-static ParmList *parmlist_with_names(ParmList *pl) {
-  ParmList *pl2 = CopyParmList(pl);
-  for (Parm *p = pl, *p2 = pl2; p2; p = nextSibling(p), p2 = nextSibling(p2)) {
-    if (!Getattr(p2, "name"))
-      Setattr(p2, "name", Getattr(p2, "lname"));
-    Setattr(p2, "name", strip_namespaces(Getattr(p2, "name")));
-    Setattr(p2, "tmap:ctype", Getattr(p, "tmap:ctype"));
-
-    String *temp = Getattr(p, "tmap:lin");
-    if (temp) {
-      Setattr(p2, "tmap:lin", temp);
-      Setattr(p2, "tmap:lin:next", Getattr(p, "tmap:lin:next"));
-    }
-  }
-  return pl2;
-}
-
-static String *parmlist_str_id_converter(ParmList *pl) {
-  String *result = NewString("");
-  for (Parm *p = pl; p;) {
-    String *lispy_type = id_converter_type(Getattr(p, "type"));
-    Printf(result, "(\"%s\" %s)", Getattr(p, "name"), lispy_type);
-    Delete(lispy_type);
-    if ((p = nextSibling(p)))
-      Printf(result, " ");
-  }
-  return result;
-}
-
-String *collect_others_args(Node *overload) {
-  String *overloaded_from = Getattr(overload, "sym:overloaded");
-  String *others_args = NewString("");
-  int first_overload = 1;
-
-  for (Node *overload2 = overloaded_from; overload2; overload2 = Getattr(overload2, "sym:nextSibling")) {
-    if (overload2 == overload || GetInt(overload2, "overload:ignore"))
-      continue;
-
-    ParmList *opl = parmlist_with_names(Getattr(overload2, "wrap:parms"));
-    String *args = parmlist_str_id_converter(opl);
-    if (!first_overload)
-      Printf(others_args, "\n                           ");
-    Printf(others_args, "(%s)", args);
-    Delete(args);
-    Delete(opl);
-    first_overload = 0;
-  }
-  return others_args;
-}
-
-struct IDargs {
-  String *name;
-  String *type;
-  String *klass;
-  String *arity;
-
-  IDargs():name(0), type(0), klass(0), arity(0) {
-  }
-
-  String *full_quoted_str() {
-    String *result = no_others_quoted_str();
-    if (arity)
-      Printf(result, " :arity %s", arity);
-    return result;
-  }
-
-  String *no_others_quoted_str() {
-    String *result = NewString("");
-    Printf(result, "\"%s\" :type :%s", name, type);
-    if (klass)
-      Printf(result, " :class \"%s\"", klass);
-    return result;
-  }
-
-  String *noname_str(bool include_class = true) {
-    String *result = NewString("");
-    Printf(result, " :type :%s", type);
-    if (klass && include_class)
-      Printf(result, " :class \"%s\"", klass);
-    if (arity)
-      Printf(result, " :arity %s", arity);
-    return result;
-  }
-
-  String *noname_no_others_str(bool include_class = true) {
-    String *result = NewString("");
-    Printf(result, " :type :%s", type);
-    if (klass && include_class)
-      Printf(result, " :class \"%s\"", klass);
-    return result;
-  }
-};
-IDargs *id_converter_arguments(Node *n) {
-  IDargs *result = (IDargs *) GetVoid(n, "allegrocl:id-converter-args");
-  if (!result)
-    result = new IDargs;
-
-  // Base name
-  if (!result->name) {
-    result->name = Getattr(n, "allegrocl:old-sym:name");
-    if (!result->name)
-      result->name = Getattr(n, "sym:name");
-    result->name = Copy(result->name);
-  }
-  // :type
-  if (result->type)
-    Delete(result->type);
-  if (!Getattr(n, "allegrocl:kind"))
-    Setattr(n, "allegrocl:kind", "function");
-  if (Strstr(Getattr(n, "name"), "operator "))
-    Replaceall(Getattr(n, "allegrocl:kind"), "function", "operator");
-  if (Strstr(Getattr(n, "allegrocl:kind"), "variable")) {
-    int name_end = Len(Getattr(n, "sym:name")) - 4;
-    char *str = Char(Getattr(n, "sym:name"));
-    String *get_set = NewString(str + name_end + 1);
-    result->type = Copy(Getattr(n, "allegrocl:kind"));
-    Replaceall(result->type, "variable", "");
-    Printf(result->type, "%ster", get_set);
-    Delete(get_set);
-  } else {
-    result->type = Copy(Getattr(n, "allegrocl:kind"));
-  }
-
-  // :class
-  if (Strstr(result->type, "member ")) {
-    Replaceall(result->type, "member ", "");
-    if (!result->klass) {
-      result->klass = Copy(Getattr(parent_node_skipping_extends(n), "sym:name"));
-    }
-  }
-  // :arity
-  if (Getattr(n, "sym:overloaded")) {
-    if (result->arity)
-      Delete(result->arity);
-    result->arity = NewStringf("%d",
-			       // emit_num_arguments(Getattr(n, "wrap:parms")));
-			       emit_num_lin_arguments(Getattr(n, "wrap:parms")));
-    // Printf(stderr, "got arity of '%s' node '%s' '%p'\n", result->arity, Getattr(n,"name"), Getattr(n,"wrap:parms"));
-  }
-
-  SetVoid(n, "allegrocl:id-converter-args", result);
-  return result;
-}
-
-int ALLEGROCL::emit_buffered_defuns(Node *n) {
-
-  Node *overloaded_from = Getattr(n, "sym:overloaded");
-
-  String *wrap;
-
-  if (!overloaded_from) {
-    wrap = Getattr(n, "allegrocl:lisp-wrap");
-
-    Printf(f_clwrap, "%s\n", wrap);
-    Delattr(n, "allegrocl:lisp-wrap");
-    Delete(wrap);
-  } else {
-    for (Node *overload = overloaded_from; overload; overload = Getattr(overload, "sym:nextSibling")) {
-      String *others_args = collect_others_args(overload);
-      wrap = Getattr(overload, "allegrocl:lisp-wrap");
-
-      Replaceall(wrap, "@@OTHERS-ARGS-GO-HERE@@", others_args);
-//        IDargs* id_args = id_converter_arguments(overload);
-//        Replaceall(id_args->others_args, "@@OTHERS-ARGS-GO-HERE@@", others_args);
-
-      if (!GetInt(overload, "overload:ignore"))
-	Printf(f_clwrap, "%s", wrap);
-
-      Delattr(overload, "allegrocl:lisp-wrap");
-      Delete(wrap);
-    }
-  }
-  return SWIG_OK;
-}
-
-String *dispatching_type(Node *n, Parm *p) {
-  String *result = 0;
-
-  String *parsed = Getattr(p, "type");	//Swig_cparse_type(Getattr(p,"tmap:ctype"));
-  String *cl_t = SwigType_typedef_resolve_all(parsed);
-
-  Node *node = NewHash();
-  Setattr(node, "type", parsed);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *tm = Swig_typemap_lookup("lispclass", node, Getattr(p, "name"), 0);
-  Delete(node);
-
-  if (tm) {
-    result = Copy(tm);
-  } else {
-    String *lookup_type = class_from_class_or_class_ref(parsed);
-    if (lookup_type)
-      result = lookup_defined_foreign_ltype(lookup_type);
-  }
-
-  //  if (!result && SwigType_ispointer(cl_t)) {
-  //    SwigType_pop(cl_t);
-  //    result = lookup_defined_foreign_ltype(cl_t);
-  //  }
-
-  if (!result)
-    result = NewStringf("ff:foreign-pointer");
-
-  // Delete(parsed);
-  Delete(cl_t);
-  return result;
-}
-
-int ALLEGROCL::emit_dispatch_defun(Node *n) {
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_dispatch_defun: ENTER... ");
-#endif
-  List *overloads = Swig_overload_rank(n, true);
-
-  // Printf(stderr,"\ndispatch node=%p\n\n", n);
-  // Swig_print_node(n);
-
-  Node *overloaded_from = Getattr(n,"sym:overloaded");
-  bool include_class = Getattr(overloaded_from, "allegrocl:dispatcher:include-class") ? true : false;
-  String *id_args = id_converter_arguments(n)->noname_no_others_str(include_class);
-  Printf(f_clwrap, "(swig-dispatcher (\"%s\" %s :arities (", Getattr(overloaded_from, "allegrocl:dispatcher:name"), id_args);
-
-  Delattr(overloaded_from, "allegrocl:dispatcher:include-class");
-  Delattr(overloaded_from, "allegrocl:dispatcher:name");
-
-  int last_arity = -1;
-  for (Iterator i = First(overloads); i.item; i = Next(i)) {
-    int arity = emit_num_lin_arguments(Getattr(i.item, "wrap:parms"));
-    if (arity == last_arity)
-      continue;
-
-    Printf(f_clwrap, "%s%d", last_arity == -1 ? "" : " ", arity);
-
-    last_arity = arity;
-  }
-  Printf(f_clwrap, ")))\n");
-
-  Delete(id_args);
-  Delete(overloads);
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_dispatch_defun: EXIT\n");
-#endif
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::emit_defun(Node *n, File *fcl) {
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_defun: ENTER... ");
-#endif
-
-  // avoid name conflicts between smart pointer wrappers and the wrappers for the
-  // actual class.
-  bool smartmemberwrapper = (!Cmp(Getattr(n, "view"), "memberfunctionHandler") &&
-			     Getattr(n,"allocate:smartpointeraccess"));
-
-#ifdef ALLEGROCL_DEBUG
-  int auto_generated = Cmp(Getattr(n, "view"), "globalfunctionHandler");
-  Printf(stderr, "%s%sfunction %s%s%s\n", auto_generated ? "> " : "", Getattr(n, "sym:overloaded")
-	 ? "overloaded " : "", current_namespace, (current_namespace) > 0 ? "::" : "", Getattr(n, "sym:name"));
-  Printf(stderr, "  (view: %s)\n", Getattr(n, "view"));
-  Swig_print_node(n);
-#endif
-
-
-  String *funcname = Getattr(n, "allegrocl:old-sym:name");
-  if (smartmemberwrapper || !funcname)
-    funcname = Getattr(n, "sym:name");
-
-  String *mangled_name = Getattr(n, "wrap:name");
-  ParmList *pl = parmlist_with_names(Getattr(n, "wrap:parms"));
-
-  // attach typemap info.
-  Wrapper *wrap = NewWrapper();
-  Swig_typemap_attach_parms("lin", pl, wrap);
-  // Swig_typemap_attach_parms("ffitype", pl, wrap);
-  Swig_typemap_lookup("lout", n, Swig_cresult_name(), 0);
-
-  SwigType *result_type = Swig_cparse_type(Getattr(n, "tmap:ctype"));
-  // prime the pump, with support for OUTPUT, INOUT typemaps.
-  Printf(wrap->code,
-	 "(cl::let ((ACL_ffresult %s:*void*)\n        ACL_result)\n  $body\n  (cl::if (cl::eq ACL_ffresult %s:*void*)\n    (cl::values-list ACL_result)\n   (cl::values-list (cl::cons ACL_ffresult ACL_result))))",
-	 swig_package, swig_package);
-
-  Parm *p;
-  int largnum = 0, argnum = 0, first = 1;
-  // int varargs=0;
-  if (Generate_Wrapper) {
-    String *extra_parms = id_converter_arguments(n)->noname_str(smartmemberwrapper ? false : true);
-    Node *overloaded_from = Getattr(n,"sym:overloaded");
-    if (overloaded_from) {
-      if(!GetFlag(overloaded_from,"allegrocl:dispatcher:name")) {
-        Setattr(overloaded_from,"allegrocl:dispatcher:name",funcname);
-	Setattr(overloaded_from,"allegrocl:dispatcher:include-class", smartmemberwrapper ? 0 : "1");
-	// Printf(stderr, "   set a:d:name='%s', a:d:i-c='%s'\n", Getattr(n,"allegrocl:dispatcher:name"), Getattr(n,"allegrocl:dispatcher:include-class"));
-      }
-      Printf(fcl, "(swig-defmethod (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms);
-    } else
-      Printf(fcl, "(swig-defun (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms);
-    Delete(extra_parms);
-  }
-  // Just C
-  else {
-    Printf(fcl, "(swig-defun (\"%s\" \"%s\")\n", funcname, Generate_Wrapper ? mangled_name : funcname);
-  }
-
-  //////////////////////////////////////
-  // Lisp foreign call parameter list //
-  //////////////////////////////////////
-  Printf(fcl, "  (");
-
-  /* Special cases */
-
-  if (ParmList_len(pl) == 0) {
-    Printf(fcl, ":void");
-/*  } else if (any_varargs(pl)) {
-    Printf(fcl, "#| varargs |#");
-    varargs=1; */
-  } else {
-    String *largs = NewString("");
-
-    for (p = pl; p; p = nextSibling(p), argnum++, largnum++) {
-      // SwigType *argtype=Getattr(p, "type");
-      SwigType *argtype = Swig_cparse_type(Getattr(p, "tmap:ctype"));
-      SwigType *parmtype = Getattr(p,"type");
-
-      if (!first) {
-	Printf(fcl, "\n   ");
-      }
-
-      /* by default, skip varargs */
-      if (!SwigType_isvarargs(parmtype)) {
-	String *argname = NewStringf("PARM%d_%s", largnum, Getattr(p, "name"));
-
-	// Printf(stderr,"%s\n", Getattr(p,"tmap:lin"));
-	String *ffitype = compose_foreign_type(n, argtype, Getattr(p,"name"));
-	String *deref_ffitype = dereference_ffitype(ffitype);
-	String *lisptype = get_lisp_type(n, parmtype, Getattr(p, "name"));
-
-#ifdef ALLEGROCL_DEBUG
-	Printf(stderr, "lisptype of '%s' '%s' = '%s'\n", parmtype,
-	       Getattr(p, "name"), lisptype);
-#endif
-
-	// while we're walking the parameters, generating LIN
-	// wrapper code...
-	Setattr(p, "lname", NewStringf("SWIG_arg%d", largnum));
-
-	String *parm_code = Getattr(p, "tmap:lin");
-	if (parm_code) {
-	  String *lname = Getattr(p, "lname");
-
-	  Printf(largs, " %s", lname);
-	  Replaceall(parm_code, "$in_fftype", ffitype); // must come before $in
-	  Replaceall(parm_code, "$in", argname);
-	  Replaceall(parm_code, "$out", lname);
-	  Replaceall(parm_code, "$*in_fftype", deref_ffitype);
-	  Replaceall(wrap->code, "$body", parm_code);
-	}
-
-	String *dispatchtype = Getattr(n, "sym:overloaded") ? dispatching_type(n, p) : NewString("");
-
-	// if this parameter has been removed from the C/++ wrapper
-	// it shouldn't be in the lisp wrapper either.
-	if (!checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  Printf(fcl, "(%s %s %s %s %s)",
-		 // parms in the ff wrapper, but not in the lisp wrapper.
-		 (checkAttribute(p, "tmap:lin:numinputs", "0") ? ":p-" : ":p+"), argname, dispatchtype, ffitype, lisptype);
-
-	  first = 0;
-	}
-
-	Delete(argname);
-	Delete(ffitype);
-	Delete(deref_ffitype);
-	Delete(lisptype);
-      }
-    }
-
-    Printf(wrap->locals, "%s", largs);
-  }
-
-  String *lout = Getattr(n, "tmap:lout");
-  Replaceall(lout, "$owner", GetFlag(n, "feature:new") ? "t" : "nil");
-
-  Replaceall(wrap->code, "$body", lout);
-  // $lclass handling.
-  String *lclass = (String *) 0;
-  SwigType *parsed = Swig_cparse_type(Getattr(n, "tmap:ctype"));
-  //  SwigType *cl_t = SwigType_typedef_resolve_all(parsed);
-  SwigType *cl_t = class_from_class_or_class_ref(parsed);
-  String *out_ffitype = compose_foreign_type(n, parsed);
-  String *deref_out_ffitype;
-  String *out_temp = Copy(parsed);
-
-  if (SwigType_ispointer(out_temp)) {
-    SwigType_pop(out_temp);
-    deref_out_ffitype = compose_foreign_type(n, out_temp);
-  } else {
-    deref_out_ffitype = Copy(out_ffitype);
-  }
-
-  Delete(out_temp);
-
-  Delete(parsed);
-
-  if (cl_t) {
-    lclass = lookup_defined_foreign_ltype(cl_t);
-  }
-
-  int ff_foreign_ptr = 0;
-  if (!lclass) {
-    ff_foreign_ptr = 1;
-    lclass = NewStringf("ff:foreign-pointer");
-  }
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "for output wrapping %s: type=%s, ctype=%s\n", Getattr(n, "name"),
-	 Getattr(n, "type"), Swig_cparse_type(Getattr(n, "tmap:ctype")));
-#endif
-
-  if (lclass)
-    Replaceall(wrap->code, "$lclass", lclass);
-  if (out_ffitype)
-    Replaceall(wrap->code, "$out_fftype", out_ffitype);
-  if (deref_out_ffitype)
-    Replaceall(wrap->code, "$*out_fftype", deref_out_ffitype);
-
-  Replaceall(wrap->code, "$body", NewStringf("(swig-ff-call%s)", wrap->locals));
-  String *ldestructor = Copy(lclass);
-  if (ff_foreign_ptr)
-    Replaceall(ldestructor, ldestructor, "cl::identity");
-  else
-    Replaceall(ldestructor, ":type :class", ":type :destructor");
-  Replaceall(wrap->code, "$ldestructor", ldestructor);
-  Delete(ldestructor);
-
-  Printf(fcl, ")\n");		/* finish arg list */
-
-  /////////////////////////////////////////////////////
-  // Lisp foreign call return type and optimizations //
-  /////////////////////////////////////////////////////
-  Printf(fcl, "  (:returning (%s %s)", compose_foreign_type(n, result_type), get_lisp_type(n, Getattr(n, "type"), Swig_cresult_name()));
-
-  for (Iterator option = First(n); option.item; option = Next(option)) {
-    if (Strncmp("feature:ffargs:", option.key, 15))
-      continue;
-    String *option_val = option.item;
-    String *option_name = NewString(Char(option.key) + 14);
-    Replaceall(option_name, "_", "-");
-
-    // TODO: varargs vs call-direct ?
-    Printf(fcl, "\n   %s %s", option_name, option_val);
-
-    Delete(option_name);
-  }
-
-  Printf(fcl, ")\n  %s)\n\n", wrap->code);
-  // Wrapper_print(wrap, stderr);
-
-  Delete(result_type);
-  Delete(mangled_name);
-  Delete(pl);
-  DelWrapper(wrap);
-
-#ifdef ALLEGROCL_WRAP_DEBUG
-  Printf(stderr, "emit_defun: EXIT\n");
-#endif
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::functionWrapper(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-	Printf(stderr, "functionWrapper %s\n", Getattr(n,"name"));
-#endif
-
-
-  ParmList *parms = CopyParmList(Getattr(n, "parms"));
-  Wrapper *f = NewWrapper();
-  SwigType *t = Getattr(n, "type");
-  String *name = Getattr(n, "name");
-
-  String *raw_return_type = Swig_typemap_lookup("ctype", n, "", 0);
-  SwigType *return_type = Swig_cparse_type(raw_return_type);
-  SwigType *resolved = SwigType_typedef_resolve_all(return_type);
-  int is_void_return = (Cmp(resolved, "void") == 0);
-
-  Delete(resolved);
-
-  if (!is_void_return) {
-     String *lresult_init =
-	     NewStringf("= (%s)0",
-			SwigType_str(SwigType_strip_qualifiers(return_type),0));
-     Wrapper_add_localv(f, "lresult",
-			SwigType_lstr(SwigType_ltype(return_type), "lresult"),
-			lresult_init, NIL);
-     Delete(lresult_init);
-  }
-  // Emit all of the local variables for holding arguments.
-  emit_parameter_variables(parms, f);
-
-  // Attach the standard typemaps 
-  Swig_typemap_attach_parms("ctype", parms, f);
-  Swig_typemap_attach_parms("lin", parms, f);
-  emit_attach_parmmaps(parms, f);
-
-  String *mangled = mangle_name(n);
-  Node *overloaded = Getattr(n, "sym:overloaded");
-
-  // Parameter overloading
-  Setattr(n, "wrap:parms", parms);
-  Setattr(n, "wrap:name", mangled);
-
-  if (overloaded) {
-    // emit warnings when overloading is impossible on the lisp side.
-    // basically Swig_overload_check(n), but with script_lang_wrapping
-    // set to true.
-    Delete(Swig_overload_rank(n, true));
-    if (Getattr(n, "overload:ignore")) {
-      // if we're the last overload, make sure to force the emit
-      // of the rest of the overloads before we leave.
-      // Printf(stderr, "ignored overload %s(%p)\n", name, Getattr(n, "sym:nextSibling"));
-      if (!Getattr(n, "sym:nextSibling")) {
-	update_package_if_needed(n);
-	emit_buffered_defuns(n);
-	emit_dispatch_defun(n);
-      }
-      DelWrapper(f);
-      return SWIG_OK;
-    }
-  }
-  // Get number of required and total arguments 
-  int num_arguments = emit_num_arguments(parms);
-  int gencomma = 0;
-
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "Walking parameters for %s '%s'\n", Getattr(n, "allegrocl:kind"), name);
-#endif
-  // Now walk the function parameter list and generate code to get arguments
-  String *name_and_parms = NewStringf("%s (", mangled);
-  int i;
-  Parm *p;
-  for (i = 0, p = parms; i < num_arguments; i++) {
-
-#ifdef ALLEGROCL_DEBUG
-	  String *temp1 = Getattr(p,"tmap:in");
-	  String *temp2 = Getattr(p,"tmap:in:numinputs");
-	  Printf(stderr,"  parm %d: %s, tmap:in='%s', tmap:in:numinputs='%s'\n", i, Getattr(p,"name"), temp1 ? temp1 : "", temp2 ? temp2 : "");
-#endif
-
-    while (p && checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    if (!p)
-      break;
-
-    SwigType *c_parm_type = Swig_cparse_type(Getattr(p, "tmap:ctype"));
-    String *arg = NewStringf("l%s", Getattr(p, "lname"));
-
-    // Emit parameter declaration
-    if (gencomma)
-      Printf(name_and_parms, ", ");
-    String *parm_decl = SwigType_str(c_parm_type, arg);
-    Printf(name_and_parms, "%s", parm_decl);
-#ifdef ALLEGROCL_DEBUG
-    Printf(stderr, "  param: %s\n", parm_decl);
-#endif
-    Delete(parm_decl);
-    gencomma = 1;
-
-    // Emit parameter conversion code
-    String *parm_code = Getattr(p, "tmap:in");
-    //if (!parm_code) {
-    //  Swig_warning(...);
-    //  p = nextSibling(p);
-    /*} else */  {
-      // canThrow(n, "in", p);
-      Replaceall(parm_code, "$input", arg);
-      Setattr(p, "emit:input", arg);
-      Printf(f->code, "%s\n", parm_code);
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Delete(arg);
-  }
-  Printf(name_and_parms, ")");
-
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "   arity = %d(%d)\n", emit_num_lin_arguments(parms), emit_num_lin_arguments(Getattr(n,"wrap:parms")));
-#endif
-
-  // Emit the function definition
-  String *signature = SwigType_str(return_type, name_and_parms);
-  Printf(f->def, "EXPORT %s {", signature);
-  if (CPlusPlus)
-    Printf(f->code, "  try {\n");
-
-  String *actioncode = emit_action(n);
-
-  String *tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode);
-  if (!is_void_return) {
-    if (tm) { 
-      Replaceall(tm, "$result", "lresult");
-      Printf(f->code, "%s\n", tm);
-      Printf(f->code, "    return lresult;\n");
-      Delete(tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number,
-		   "Unable to use return type %s in function %s.\n",
-		   SwigType_str(t, 0), name);
-    }
-  }
-
-  /* See if there is any return cleanup code */
-  if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-    Replaceall(tm, "$source", Swig_cresult_name());
-    Printf(f->code, "%s\n", tm);
-    Delete(tm);
-  }
-
-  emit_return_variable(n, t, f);
-
-  if (CPlusPlus) {
-    Printf(f->code, "  } catch (...) {\n");
-    if (!is_void_return)
-      Printf(f->code, "    return (%s)0;\n",
-	     SwigType_str(SwigType_strip_qualifiers(return_type),0));
-    Printf(f->code, "  }\n");
-  }
-  Printf(f->code, "}\n");
-
-  /* print this when in C mode? make this a command-line arg? */
-  if (Generate_Wrapper)
-    Wrapper_print(f, f_cxx_wrapper);
-
-  String *f_buffer = NewString("");
-
-  emit_defun(n, f_buffer);
-  Setattr(n, "allegrocl:lisp-wrap", f_buffer);
-
-  if (!overloaded || !Getattr(n, "sym:nextSibling")) {
-    update_package_if_needed(n);
-    emit_buffered_defuns(n);
-    // this is the last overload.
-    if (overloaded) {
-      emit_dispatch_defun(n);
-    }
-  }
-
-  DelWrapper(f);
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::namespaceDeclaration(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "namespaceDecl: '%s'(%p) (fc=%p)\n", Getattr(n, "sym:name"), n, firstChild(n));
-#endif
-
-  /* don't wrap a namespace with no contents. package bloat.
-     also, test-suite/namespace_class.i claims an unnamed namespace
-     is 'private' and should not be wrapped. Complying...
-  */
-  if (Getattr(n,"unnamed") || !firstChild(n))
-    return SWIG_OK;
-
-  String *name = Getattr(n, "sym:name");
-
-  String *old_namespace = current_namespace;
-  if (Cmp(current_namespace, "") == 0)
-    current_namespace = NewStringf("%s", name);
-  else
-    current_namespace = NewStringf("%s::%s", current_namespace, name);
-
-  if (!GetInt(defined_namespace_packages, current_namespace)) {
-    SetInt(defined_namespace_packages, current_namespace, 1);
-    String *lispy_namespace = listify_namespace(current_namespace);
-    Printf(f_clhead, "(swig-defpackage %s)\n", lispy_namespace);
-    Delete(lispy_namespace);
-  }
-
-  emit_children(n);
-
-  Delete(current_namespace);
-  current_namespace = old_namespace;
-  return SWIG_OK;
-}
-
-int ALLEGROCL::constructorHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "constructorHandler %s\n", Getattr(n, "name"));
-#endif
-  // Swig_print_node(n);
-  Setattr(n, "allegrocl:kind", "constructor");
-  Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name"));
-
-  // Let SWIG generate a global forwarding function.
-  return Language::constructorHandler(n);
-}
-
-int ALLEGROCL::destructorHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "destructorHandler %s\n", Getattr(n, "name"));
-#endif
-
-  Setattr(n, "allegrocl:kind", "destructor");
-  Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name"));
-
-  // Let SWIG generate a global forwarding function.
-  return Language::destructorHandler(n);
-}
-
-int ALLEGROCL::constantWrapper(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "constantWrapper %s\n", Getattr(n, "name"));
-#endif
-
-  if (Generate_Wrapper) {
-    // Setattr(n,"wrap:name",mangle_name(n, "ACLPP"));
-    String *const_type = Getattr(n, "type");
-
-    String *const_val = 0;
-    String *raw_const = Getattr(n, "value");
-
-    if (SwigType_type(const_type) == T_STRING) {
-      const_val = NewStringf("\"%s\"", raw_const);
-    } else if (SwigType_type(const_type) == T_CHAR) {
-      const_val = NewStringf("'%s'", raw_const);
-    } else {
-      const_val = Copy(raw_const);
-    }
-
-    SwigType_add_qualifier(const_type, "const");
-
-    String *ppcname = NewStringf("ACLppc_%s", Getattr(n, "sym:name"));
-    // Printf(f_runtime, "static const %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val);
-    Printf(f_runtime, "static %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val);
-
-    Setattr(n, "name", ppcname);
-    SetFlag(n, "feature:immutable");
-
-    Delete(const_val);
-    return variableWrapper(n);
-  }
-
-  String *type = Getattr(n, "type");
-  String *value = Getattr(n, "value");
-  String *converted_value = convert_literal(value, type);
-  String *name = Getattr(n, "sym:name");
-
-  Setattr(n, "allegrocl:kind", "constant");
-  Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name"));
-
-#if 0
-  Printf(stdout, "constant %s is of type %s. value: %s\n", name, type, converted_value);
-#endif
-
-  if (converted_value) {
-    Printf(f_clwrap, "(swig-defconstant \"%s\" %s)\n", name, converted_value);
-  } else {
-    Swig_warning(WARN_LANG_DISCARD_CONST, Getfile(n), Getline(n), "Unable to parse constant value '%s'. Setting to NIL\n", value);
-    Printf(f_clwrap, "(swig-defconstant \"%s\" nil #| %s |#)\n", name, value);
-  }
-
-  Delete(converted_value);
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::globalvariableHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "globalvariableHandler %s\n", Getattr(n, "name"));
-#endif
-
-  if (Generate_Wrapper)
-    return Language::globalvariableHandler(n);
-
-  // String *name = Getattr(n, "name");
-  SwigType *type = Getattr(n, "type");
-  SwigType *rtype = SwigType_typedef_resolve_all(type);
-
-  if (SwigType_isclass(rtype)) {
-    SwigType_add_pointer(type);
-    SwigType_add_pointer(rtype);
-  }
-
-  Printf(f_clwrap, "(swig-defvar \"%s\" \"%s\" :type %s)\n",
-	 Getattr(n, "sym:name"), Getattr(n, "sym:name"), ((SwigType_isconst(type)) ? ":constant" : ":variable"));
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::variableWrapper(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "variableWrapper %s\n", Getattr(n, "name"));
-#endif
-  Setattr(n, "allegrocl:kind", "variable");
-  Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name"));
-
-  // Let SWIG generate a get/set function pair.
-  if (Generate_Wrapper)
-    return Language::variableWrapper(n);
-
-  String *name = Getattr(n, "name");
-  SwigType *type = Getattr(n, "type");
-  SwigType *ctype;
-  SwigType *rtype = SwigType_typedef_resolve_all(type);
-
-  String *mangled_name = mangle_name(n);
-
-  int pointer_added = 0;
-
-  if (SwigType_isclass(rtype)) {
-    SwigType_add_pointer(type);
-    SwigType_add_pointer(rtype);
-    pointer_added = 1;
-  }
-
-  ctype = SwigType_str(type, 0);
-
-  // EXPORT <SwigType_str> <mangled_name>;
-  // <SwigType_str> <mangled_name> = <name>;
-  Printf(f_runtime, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, ctype, mangled_name, (pointer_added ? "&" : ""), name);
-
-  Printf(f_cl, "(swig-defvar \"%s\" :type %s)\n", mangled_name, ((SwigType_isconst(type)) ? ":constant" : ":variable"));
-
-  Printf(stderr,"***\n");
-  Delete(mangled_name);
-
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "DONE variable %s\n", Getattr(n, "name"));
-#endif
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::memberfunctionHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "memberfunctionHandler %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name"));
-  Swig_print_node(n);
-#endif
-  Setattr(n, "allegrocl:kind", "member function");
-  Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name"));
-
-  // Let SWIG generate a global forwarding function.
-  return Language::memberfunctionHandler(n);
-}
-
-int ALLEGROCL::membervariableHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "membervariableHandler %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name"));
-#endif
-  Setattr(n, "allegrocl:kind", "member variable");
-  Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name"));
-
-  // Let SWIG generate a get/set function pair.
-  return Language::membervariableHandler(n);
-}
-
-int ALLEGROCL::typedefHandler(Node *n) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "In typedefHandler\n");
-#endif
-
-  SwigType *typedef_type = Getattr(n,"type");
-  // has the side-effect of noting any implicit
-  // template instantiations in type.
-  String *ff_type = compose_foreign_type(n, typedef_type);
-
-  String *sym_name = Getattr(n, "sym:name");
-
-  String *name;
-  String *type_ref;
-
-  if (in_class) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-    Printf(stderr, "  typedef in class '%s'(%p)\n", Getattr(in_class, "sym:name"), in_class);
-#endif
-    Setattr(n, "allegrocl:typedef:in-class", in_class);
-
-    String *class_name = Getattr(in_class, "name");
-    name = NewStringf("%s__%s", class_name, sym_name);
-    type_ref = NewStringf("%s::%s", class_name, sym_name);
-    Setattr(n, "allegrocl:in-class", in_class);
-  } else {
-    name = Copy(sym_name);
-    type_ref = Copy(Getattr(n, "name"));
-  }
-
-  Setattr(n, "allegrocl:namespace", current_namespace);
-
-  String *lookup = lookup_defined_foreign_type(typedef_type);
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "** lookup='%s'(%p), typedef_type='%s', strcmp = '%d' strstr = '%d'\n", lookup, lookup, typedef_type, Strcmp(typedef_type,"void"), Strstr(ff_type,"__SWIGACL_FwdReference"));
-#endif
-
-  if(lookup || (!lookup && Strcmp(typedef_type,"void")) ||
-     (!lookup && Strstr(ff_type,"__SWIGACL_FwdReference"))) {
-	  add_defined_foreign_type(n, 0, type_ref, name);
-  } else {
-     add_forward_referenced_type(n);
-  }
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "Out typedefHandler\n");
-#endif
-
-  Delete(ff_type);
-
-  return SWIG_OK;
-}
-
-// forward referenced classes are added specially to defined_foreign_types
-int ALLEGROCL::classforwardDeclaration(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "classforwardDeclaration %s\n", Getattr(n, "name"));
-#endif
-
-  add_forward_referenced_type(n);
-  return SWIG_OK;
-}
-
-int ALLEGROCL::classHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "classHandler %s::%s\n", current_namespace, Getattr(n, "sym:name"));
-#endif
-
-  int result;
-
-  if (Generate_Wrapper)
-    result = cppClassHandler(n);
-  else
-    result = cClassHandler(n);
-
-  return result;
-}
-
-int ALLEGROCL::cClassHandler(Node *n) {
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "In cClassHandler\n");
-#endif
-  /* Add this structure to the known lisp types */
-  // Printf(stderr, "Adding %s foreign type\n", name);
-  String *ns = listify_namespace(current_namespace);
-
-  add_defined_foreign_type(n);
-
-  Delete(ns);
-
-#ifdef ALLEGROCL_TYPE_DEBUG
-  Printf(stderr, "Out cClassHandler\n");
-#endif
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::cppClassHandler(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "cppClassHandler %s\n", Getattr(n, "name"));
-#endif
-
-  // String *name=Getattr(n, "sym:name");
-  // String *kind = Getattr(n,"kind");
-
-  /* Template instantiation.
-     Careful. 
-     SWIG does not create instantiations of templated classes whenever
-     it sees a templated class reference (say, as a return type, or
-     in a parameter list).
-
-     The %template directive results in a templated class instantiation
-     that will actually be seen by <LANG> :: classHandler().
-
-     In this case, we don't want to error if the type already exists;
-     the point is to force the creation of wrappers for the templated
-     class.
-   */
-  String *templated = Getattr(n, "template");
-  String *t_name;
-  // String *ns = listify_namespace(current_namespace);
-
-  if (templated) {
-    t_name = namespaced_name(n);
-  } else {
-    t_name = Getattr(n, "name");
-  }
-
-  Setattr(n, "allegrocl:namespace", current_namespace);
-
-  /* Add this structure to the known lisp types.
-     Class may contain references to the type currently being
-     defined */
-  if (!templated || !lookup_defined_foreign_type(t_name)) {
-#ifdef ALLEGROCL_CLASS_DEBUG
-    Printf(stderr, "Adding %s foreign type\n", Getattr(n, "sym:name"));
-#endif
-    add_defined_foreign_type(n);
-  } else {
-#ifdef ALLEGROCL_CLASS_DEBUG
-    Printf(stderr, "cppClassHand: type %s already exists. Assuming %%template instantiation for wrapping purposes.\n", Getattr(n, "sym:name"));
-#endif
-    add_defined_foreign_type(n, 1);
-  }
-
-  // Generate slot accessors, constructor, and destructor.
-  Node *prev_class = in_class;
-  in_class = n;
-
-  Node *c;
-  // walk all member variables.
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "   MANUALLY walking class members... \n");
-#endif
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    // ping the types of all children--even protected and private
-    // so their types can be added to the linked_type_list.
-    SwigType *childType = NewStringf("%s%s", Getattr(c, "decl"),
-				     Getattr(c, "type"));
-#ifdef ALLEGROCL_CLASS_DEBUG
-    Printf(stderr, "looking at child '%p' of type '%s' '%d'\n", c, childType, SwigType_isfunction(childType));
-    // Swig_print_node(c);
-#endif
-    if (!SwigType_isfunction(childType))
-      Delete(compose_foreign_type(n, childType));
-
-    Delete(childType);
-  }
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "   MANUAL walk DONE.\n");
-#endif
-
-  // this will walk all necessary methods.
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "   LANGUAGE walk of children...\n");
-#endif
-  Language::classHandler(n);
-#ifdef ALLEGROCL_CLASS_DEBUG
-  Printf(stderr, "   LANGUAGE walk DONE\n");
-#endif
-  in_class = prev_class;
-
-  return SWIG_OK;
-}
-
-int ALLEGROCL::emit_one(Node *n) {
-  // When the current package does not correspond with the current
-  // namespace we need to generate an IN-PACKAGE form, unless the
-  // current node is another namespace node.
-  if (Cmp(nodeType(n), "namespace") != 0 && Cmp(current_package, current_namespace) != 0) {
-    String *lispy_namespace = listify_namespace(current_namespace);
-    Printf(f_clwrap, "(swig-in-package %s)\n", lispy_namespace);
-    Delete(lispy_namespace);
-    Delete(current_package);
-    current_package = NewStringf("%s", current_namespace);
-  }
-
-  Setattr(n, "allegrocl:package", current_package);
-
-  return Language::emit_one(n);
-}
-
-int ALLEGROCL::enumDeclaration(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "enumDeclaration %s\n", Getattr(n, "name"));
-#endif
-
-  if (getCurrentClass() && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  if (Getattr(n, "sym:name")) {
-    add_defined_foreign_type(n);
-  }
-  Node *c;
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    ALLEGROCL::enumvalueDeclaration(c);
-    // since we walk our own children, we need to add
-    // the current package ourselves.
-    Setattr(c, "allegrocl:package", current_package);
-  }
-  return SWIG_OK;
-}
-
-
-int ALLEGROCL::enumvalueDeclaration(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "enumvalueDeclaration %s\n", Getattr(n, "name"));
-#endif
-  /* print this when in C mode? make this a command-line arg? */
-  if (Generate_Wrapper) {
-	  SwigType *enum_type = Copy(Getattr(n,"type"));
-	  String *mangled_name =
-		  mangle_name(n, "ACL_ENUM",
-			      in_class ? Getattr(in_class,"name") :
-			      current_namespace);
-	  
-	  SwigType_add_qualifier(enum_type,"const");
-
-	  String *enum_decl = SwigType_str(enum_type, mangled_name);
-	  Printf(f_cxx_wrapper, "EXPORT %s;\n", enum_decl);
-	  Printf(f_cxx_wrapper, "%s = %s;\n", enum_decl, Getattr(n, "value"));
-
-    Delete(mangled_name);
-    Delete(enum_type);
-    Delete(enum_decl);
-  }
-  return SWIG_OK;
-}
-
-int ALLEGROCL::templateDeclaration(Node *n) {
-#ifdef ALLEGROCL_DEBUG
-  Printf(stderr, "templateDeclaration %s\n", Getattr(n, "name"));
-#endif
-
-  String *type = Getattr(n, "templatetype");
-
-  // Printf(stderr, "tempDecl: %s %s\n", Getattr(n,"name"),
-  //        type);
-  // Swig_print_node(n);
-
-  if (!Strcmp(type, "cdecl")) {
-    SwigType *ty = NewStringf("%s%s", Getattr(n, "decl"),
-			      Getattr(n, "type"));
-    Delete(ty);
-  }
-
-  Delete(type);
-
-  return SWIG_OK;
-}
-
diff --git a/dependencies2013/win32/swig/Source/Modules/allocate.cxx b/dependencies2013/win32/swig/Source/Modules/allocate.cxx
deleted file mode 100644
index 780246f9..00000000
--- a/dependencies2013/win32/swig/Source/Modules/allocate.cxx
+++ /dev/null
@@ -1,965 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * allocate.cxx
- *
- * This module tries to figure out which classes and structures support
- * default constructors and destructors in C++.   There are several rules that
- * define this behavior including pure abstract methods, private sections,
- * and non-default constructors in base classes.  See the ARM or
- * Doc/Manual/SWIGPlus.html for details.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-
-static int virtual_elimination_mode = 0;	/* set to 0 on default */
-
-/* Set virtual_elimination_mode */
-void Wrapper_virtual_elimination_mode_set(int flag) {
-  virtual_elimination_mode = flag;
-}
-
-/* Helper function to assist with abstract class checking.  
-   This is a major hack. Sorry.  */
-
-extern "C" {
-  static String *search_decl = 0;	/* Declarator being searched */
-  static int check_implemented(Node *n) {
-    String *decl;
-    if (!n)
-       return 0;
-    while (n) {
-      if (Strcmp(nodeType(n), "cdecl") == 0) {
-	decl = Getattr(n, "decl");
-	if (SwigType_isfunction(decl)) {
-	  SwigType *decl1 = SwigType_typedef_resolve_all(decl);
-	  SwigType *decl2 = SwigType_pop_function(decl1);
-	  if (Strcmp(decl2, search_decl) == 0) {
-	    if (!GetFlag(n, "abstract")) {
-	      Delete(decl1);
-	      Delete(decl2);
-	      return 1;
-	    }
-	  }
-	  Delete(decl1);
-	  Delete(decl2);
-	}
-      }
-      n = Getattr(n, "csym:nextSibling");
-    }
-    return 0;
-  }
-}
-
-class Allocate:public Dispatcher {
-  Node *inclass;
-  int extendmode;
-
-  /* Checks if a function, n, is the same as any in the base class, ie if the method is polymorphic.
-   * Also checks for methods which will be hidden (ie a base has an identical non-virtual method).
-   * Both methods must have public access for a match to occur. */
-  int function_is_defined_in_bases(Node *n, Node *bases) {
-
-    if (!bases)
-      return 0;
-
-    String *this_decl = Getattr(n, "decl");
-    if (!this_decl)
-       return 0;
-
-    String *name = Getattr(n, "name");
-    String *this_type = Getattr(n, "type");
-    String *resolved_decl = SwigType_typedef_resolve_all(this_decl);
-
-    // Search all base classes for methods with same signature
-    for (int i = 0; i < Len(bases); i++) {
-      Node *b = Getitem(bases, i);
-      Node *base = firstChild(b);
-      while (base) {
-	if (Strcmp(nodeType(base), "extend") == 0) {
-	  // Loop through all the %extend methods
-	  Node *extend = firstChild(base);
-	  while (extend) {
-	    if (function_is_defined_in_bases_seek(n, b, extend, this_decl, name, this_type, resolved_decl)) {
-	      Delete(resolved_decl);
-	      return 1;
-	    }
-	    extend = nextSibling(extend);
-	  }
-	} else if (Strcmp(nodeType(base), "using") == 0) {
-	  // Loop through all the using declaration methods
-	  Node *usingdecl = firstChild(base);
-	  while (usingdecl) {
-	    if (function_is_defined_in_bases_seek(n, b, usingdecl, this_decl, name, this_type, resolved_decl)) {
-	      Delete(resolved_decl);
-	      return 1;
-	    }
-	    usingdecl = nextSibling(usingdecl);
-	  }
-	} else {
-	  // normal methods
-	  if (function_is_defined_in_bases_seek(n, b, base, this_decl, name, this_type, resolved_decl)) {
-	    Delete(resolved_decl);
-	    return 1;
-	  }
-	}
-	base = nextSibling(base);
-      }
-    }
-    Delete(resolved_decl);
-    resolved_decl = 0;
-    for (int j = 0; j < Len(bases); j++) {
-      Node *b = Getitem(bases, j);
-      if (function_is_defined_in_bases(n, Getattr(b, "allbases")))
-	return 1;
-    }
-    return 0;
-  }
-
-  /* Helper function for function_is_defined_in_bases */
-  int function_is_defined_in_bases_seek(Node *n, Node *b, Node *base, String *this_decl, String *name, String *this_type, String *resolved_decl) {
-
-    String *base_decl = Getattr(base, "decl");
-    SwigType *base_type = Getattr(base, "type");
-    if (base_decl && base_type) {
-      if (checkAttribute(base, "name", name) && !GetFlag(b, "feature:ignore") /* whole class is ignored */ ) {
-	if (SwigType_isfunction(resolved_decl) && SwigType_isfunction(base_decl)) {
-	  // We have found a method that has the same name as one in a base class
-	  bool covariant_returntype = false;
-	  bool returntype_match = Strcmp(base_type, this_type) == 0 ? true : false;
-	  bool decl_match = Strcmp(base_decl, this_decl) == 0 ? true : false;
-	  if (returntype_match && decl_match) {
-	    // Exact match - we have found a method with identical signature
-	    // No typedef resolution was done, but skipping it speeds things up slightly
-	  } else {
-	    // Either we have:
-	    //  1) matching methods but are one of them uses a different typedef (return type or parameter) to the one in base class' method
-	    //  2) matching polymorphic methods with covariant return type
-	    //  3) a non-matching method (ie an overloaded method of some sort)
-	    //  4) a matching method which is not polymorphic, ie it hides the base class' method
-
-	    // Check if fully resolved return types match (including
-	    // covariant return types)
-	    if (!returntype_match) {
-	      String *this_returntype = function_return_type(n);
-	      String *base_returntype = function_return_type(base);
-	      returntype_match = Strcmp(this_returntype, base_returntype) == 0 ? true : false;
-	      if (!returntype_match) {
-		covariant_returntype = SwigType_issubtype(this_returntype, base_returntype) ? true : false;
-		returntype_match = covariant_returntype;
-	      }
-	      Delete(this_returntype);
-	      Delete(base_returntype);
-	    }
-	    // The return types must match at this point, for the whole method to match
-	    if (returntype_match && !decl_match) {
-	      // Now need to check the parameter list
-	      // First do an inexpensive parameter count
-	      ParmList *this_parms = Getattr(n, "parms");
-	      ParmList *base_parms = Getattr(base, "parms");
-	      if (ParmList_len(this_parms) == ParmList_len(base_parms)) {
-		// Number of parameters are the same, now check that all the parameters match
-		SwigType *base_fn = NewString("");
-		SwigType *this_fn = NewString("");
-		SwigType_add_function(base_fn, base_parms);
-		SwigType_add_function(this_fn, this_parms);
-		base_fn = SwigType_typedef_resolve_all(base_fn);
-		this_fn = SwigType_typedef_resolve_all(this_fn);
-		if (Strcmp(base_fn, this_fn) == 0) {
-		  // Finally check that the qualifiers match
-		  int base_qualifier = SwigType_isqualifier(resolved_decl);
-		  int this_qualifier = SwigType_isqualifier(base_decl);
-		  if (base_qualifier == this_qualifier) {
-		    decl_match = true;
-		  }
-		}
-		Delete(base_fn);
-		Delete(this_fn);
-	      }
-	    }
-	  }
-	  //Printf(stderr,"look %s %s %d %d\n",base_decl, this_decl, returntype_match, decl_match);
-
-	  if (decl_match && returntype_match) {
-	    // Found an identical method in the base class
-	    bool this_wrapping_protected_members = is_member_director(n) ? true : false;	// This should really check for dirprot rather than just being a director method
-	    bool base_wrapping_protected_members = is_member_director(base) ? true : false;	// This should really check for dirprot rather than just being a director method
-	    bool both_have_public_access = is_public(n) && is_public(base);
-	    bool both_have_protected_access = (is_protected(n) && this_wrapping_protected_members) && (is_protected(base) && base_wrapping_protected_members);
-	    bool both_have_private_access = is_private(n) && is_private(base);
-	    if (checkAttribute(base, "storage", "virtual")) {
-	      // Found a polymorphic method.
-	      // Mark the polymorphic method, in case the virtual keyword was not used.
-	      Setattr(n, "storage", "virtual");
-	      if (!Getattr(b, "feature:interface")) { // interface implementation neither hides nor overrides
-		if (both_have_public_access || both_have_protected_access) {
-		  if (!is_non_public_base(inclass, b))
-		    Setattr(n, "override", base);	// Note C# definition of override, ie access must be the same
-		}
-		else if (!both_have_private_access) {
-		  // Different access
-		  if (this_wrapping_protected_members || base_wrapping_protected_members)
-		    if (!is_non_public_base(inclass, b))
-		      Setattr(n, "hides", base);	// Note C# definition of hiding, ie hidden if access is different
-		}
-	      }
-	      // Try and find the most base's covariant return type
-	      SwigType *most_base_covariant_type = Getattr(base, "covariant");
-	      if (!most_base_covariant_type && covariant_returntype)
-		most_base_covariant_type = function_return_type(base, false);
-
-	      if (!most_base_covariant_type) {
-		// Eliminate the derived virtual method.
-		if (virtual_elimination_mode && !is_member_director(n))
-		  if (both_have_public_access)
-		    if (!is_non_public_base(inclass, b))
-		      if (!Swig_symbol_isoverloaded(n)) {
-			// Don't eliminate if an overloaded method as this hides the method
-			// in the scripting languages: the dispatch function will hide the base method if ignored.
-			SetFlag(n, "feature:ignore");
-		      }
-	      } else {
-		// Some languages need to know about covariant return types
-		Setattr(n, "covariant", most_base_covariant_type);
-	      }
-
-	    } else {
-	      // Found an identical method in the base class, but it is not polymorphic.
-	      if (both_have_public_access || both_have_protected_access)
-		if (!is_non_public_base(inclass, b))
-		  Setattr(n, "hides", base);
-	    }
-	    if (both_have_public_access || both_have_protected_access)
-	      return 1;
-	  }
-	}
-      }
-    }
-    return 0;
-  }
-
-  /* Determines whether the base class, b, is in the list of private
-   * or protected base classes for class n. */
-  bool is_non_public_base(Node *n, Node *b) {
-    bool non_public_base = false;
-    Node *bases = Getattr(n, "privatebases");
-    if (bases) {
-      for (int i = 0; i < Len(bases); i++) {
-	Node *base = Getitem(bases, i);
-	if (base == b)
-	  non_public_base = true;
-      }
-    }
-    bases = Getattr(n, "protectedbases");
-    if (bases) {
-      for (int i = 0; i < Len(bases); i++) {
-	Node *base = Getitem(bases, i);
-	if (base == b)
-	  non_public_base = true;
-      }
-    }
-    return non_public_base;
-  }
-
-  /* Returns the return type for a function. The node n should be a function.
-     If resolve is true the fully returned type is fully resolved.
-     Caller is responsible for deleting returned string. */
-  String *function_return_type(Node *n, bool resolve = true) {
-    String *decl = Getattr(n, "decl");
-    SwigType *type = Getattr(n, "type");
-    String *ty = NewString(type);
-    SwigType_push(ty, decl);
-    if (SwigType_isqualifier(ty))
-      Delete(SwigType_pop(ty));
-    Delete(SwigType_pop_function(ty));
-    if (resolve) {
-      String *unresolved = ty;
-      ty = SwigType_typedef_resolve_all(unresolved);
-      Delete(unresolved);
-    }
-    return ty;
-  }
-
-  /* Checks if a class member is the same as inherited from the class bases */
-  int class_member_is_defined_in_bases(Node *member, Node *classnode) {
-    Node *bases;		/* bases is the closest ancestors of classnode */
-    int defined = 0;
-
-    bases = Getattr(classnode, "allbases");
-    if (!bases)
-      return 0;
-
-    {
-      int old_mode = virtual_elimination_mode;
-      if (is_member_director(classnode, member))
-	virtual_elimination_mode = 0;
-
-      if (function_is_defined_in_bases(member, bases)) {
-	defined = 1;
-      }
-
-      virtual_elimination_mode = old_mode;
-    }
-
-    if (defined)
-      return 1;
-    else
-      return 0;
-  }
-
-  /* Checks to see if a class is abstract through inheritance,
-     and saves the first node that seems to be abstract.
-   */
-  int is_abstract_inherit(Node *n, Node *base = 0, int first = 0) {
-    if (!first && (base == n))
-      return 0;
-    if (!base) {
-      /* Root node */
-      Symtab *stab = Getattr(n, "symtab");	/* Get symbol table for node */
-      Symtab *oldtab = Swig_symbol_setscope(stab);
-      int ret = is_abstract_inherit(n, n, 1);
-      Swig_symbol_setscope(oldtab);
-      return ret;
-    }
-    List *abstracts = Getattr(base, "abstracts");
-    if (abstracts) {
-      int dabstract = 0;
-      int len = Len(abstracts);
-      for (int i = 0; i < len; i++) {
-	Node *nn = Getitem(abstracts, i);
-	String *name = Getattr(nn, "name");
-	if (!name)
-	  continue;
-	if (Strchr(name, '~'))
-	  continue;		/* Don't care about destructors */
-	String *base_decl = Getattr(nn, "decl");
-	if (base_decl)
-	  base_decl = SwigType_typedef_resolve_all(base_decl);
-	if (SwigType_isfunction(base_decl))
-	  search_decl = SwigType_pop_function(base_decl);
-	Node *dn = Swig_symbol_clookup_local_check(name, 0, check_implemented);
-	Delete(search_decl);
-	Delete(base_decl);
-
-	if (!dn) {
-	  List *nabstracts = Getattr(n, "abstracts");
-	  if (!nabstracts) {
-	    nabstracts = NewList();
-	    Setattr(n, "abstracts", nabstracts);
-	    Delete(nabstracts);
-	  }
-	  Append(nabstracts, nn);
-	  if (!Getattr(n, "abstracts:firstnode")) {
-	    Setattr(n, "abstracts:firstnode", nn);
-	  }
-	  dabstract = base != n;
-	}
-      }
-      if (dabstract)
-	return 1;
-    }
-    List *bases = Getattr(base, "allbases");
-    if (!bases)
-      return 0;
-    for (int i = 0; i < Len(bases); i++) {
-      if (is_abstract_inherit(n, Getitem(bases, i))) {
-	return 1;
-      }
-    }
-    return 0;
-  }
-
-
-  /* Grab methods used by smart pointers */
-
-  List *smart_pointer_methods(Node *cls, List *methods, int isconst, String *classname = 0) {
-    if (!methods) {
-      methods = NewList();
-    }
-
-    Node *c = firstChild(cls);
-
-    while (c) {
-      if (Getattr(c, "error") || GetFlag(c, "feature:ignore")) {
-	c = nextSibling(c);
-	continue;
-      }
-      if (!isconst && (Strcmp(nodeType(c), "extend") == 0)) {
-	methods = smart_pointer_methods(c, methods, isconst, Getattr(cls, "name"));
-      } else if (Strcmp(nodeType(c), "cdecl") == 0) {
-	if (!GetFlag(c, "feature:ignore")) {
-	  String *storage = Getattr(c, "storage");
-	  if (!((Cmp(storage, "typedef") == 0))
-	      && !((Cmp(storage, "friend") == 0))) {
-	    String *name = Getattr(c, "name");
-	    String *symname = Getattr(c, "sym:name");
-	    Node *e = Swig_symbol_clookup_local(name, 0);
-	    if (e && is_public(e) && !GetFlag(e, "feature:ignore") && (Cmp(symname, Getattr(e, "sym:name")) == 0)) {
-	      Swig_warning(WARN_LANG_DEREF_SHADOW, Getfile(e), Getline(e), "Declaration of '%s' shadows declaration accessible via operator->(),\n", name);
-	      Swig_warning(WARN_LANG_DEREF_SHADOW, Getfile(c), Getline(c), "previous declaration of '%s'.\n", name);
-	    } else {
-	      /* Make sure node with same name doesn't already exist */
-	      int k;
-	      int match = 0;
-	      for (k = 0; k < Len(methods); k++) {
-		e = Getitem(methods, k);
-		if (Cmp(symname, Getattr(e, "sym:name")) == 0) {
-		  match = 1;
-		  break;
-		}
-		if (!Getattr(e, "sym:name") && (Cmp(name, Getattr(e, "name")) == 0)) {
-		  match = 1;
-		  break;
-		}
-	      }
-	      if (!match) {
-		Node *cc = c;
-		while (cc) {
-		  Node *cp = cc;
-		  if (classname) {
-		    Setattr(cp, "extendsmartclassname", classname);
-		  }
-		  Setattr(cp, "allocate:smartpointeraccess", "1");
-		  /* If constant, we have to be careful */
-		  if (isconst) {
-		    SwigType *decl = Getattr(cp, "decl");
-		    if (decl) {
-		      if (SwigType_isfunction(decl)) {	/* If method, we only add if it's a const method */
-			if (SwigType_isconst(decl)) {
-			  Append(methods, cp);
-			}
-		      } else {
-			Append(methods, cp);
-		      }
-		    } else {
-		      Append(methods, cp);
-		    }
-		  } else {
-		    Append(methods, cp);
-		  }
-		  cc = Getattr(cc, "sym:nextSibling");
-		}
-	      }
-	    }
-	  }
-	}
-      }
-
-      c = nextSibling(c);
-    }
-    /* Look for methods in base classes */
-    {
-      Node *bases = Getattr(cls, "bases");
-      int k;
-      for (k = 0; k < Len(bases); k++) {
-	smart_pointer_methods(Getitem(bases, k), methods, isconst);
-      }
-    }
-    /* Remove protected/private members */
-    {
-      for (int i = 0; i < Len(methods);) {
-	Node *n = Getitem(methods, i);
-	if (!is_public(n)) {
-	  Delitem(methods, i);
-	  continue;
-	}
-	i++;
-      }
-    }
-    return methods;
-  }
-
-  void mark_exception_classes(ParmList *p) {
-    while (p) {
-      SwigType *ty = Getattr(p, "type");
-      SwigType *t = SwigType_typedef_resolve_all(ty);
-      if (SwigType_isreference(t) || SwigType_ispointer(t) || SwigType_isarray(t)) {
-	Delete(SwigType_pop(t));
-      }
-      Node *c = Swig_symbol_clookup(t, 0);
-      if (c) {
-	if (!GetFlag(c, "feature:exceptionclass")) {
-	  SetFlag(c, "feature:exceptionclass");
-	}
-      }
-      p = nextSibling(p);
-      Delete(t);
-    }
-  }
-
-
-  void process_exceptions(Node *n) {
-    ParmList *catchlist = 0;
-    /* 
-       the "catchlist" attribute is used to emit the block
-
-       try {$action;} 
-       catch <list of catches>;
-
-       in emit.cxx
-
-       and is either constructued from the "feature:catches" feature
-       or copied from the node "throws" list.
-     */
-    String *scatchlist = Getattr(n, "feature:catches");
-    if (scatchlist) {
-      catchlist = Swig_cparse_parms(scatchlist, n);
-      if (catchlist) {
-	Setattr(n, "catchlist", catchlist);
-	mark_exception_classes(catchlist);
-	Delete(catchlist);
-      }
-    }
-    ParmList *throws = Getattr(n, "throws");
-    if (throws) {
-      /* if there is no explicit catchlist, we catch everything in the throws list */
-      if (!catchlist) {
-	Setattr(n, "catchlist", throws);
-      }
-      mark_exception_classes(throws);
-    }
-  }
-
-public:
-Allocate():
-  inclass(NULL), extendmode(0) {
-  }
-
-  virtual int top(Node *n) {
-    cplus_mode = PUBLIC;
-    inclass = 0;
-    extendmode = 0;
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-  virtual int importDirective(Node *n) {
-    return emit_children(n);
-  }
-  virtual int includeDirective(Node *n) {
-    return emit_children(n);
-  }
-  virtual int externDeclaration(Node *n) {
-    return emit_children(n);
-  }
-  virtual int namespaceDeclaration(Node *n) {
-    return emit_children(n);
-  }
-  virtual int extendDirective(Node *n) {
-    extendmode = 1;
-    emit_children(n);
-    extendmode = 0;
-    return SWIG_OK;
-  }
-
-  virtual int classDeclaration(Node *n) {
-    Symtab *symtab = Swig_symbol_current();
-    Swig_symbol_setscope(Getattr(n, "symtab"));
-    save_value<Node*> oldInclass(inclass);
-    save_value<AccessMode> oldAcessMode(cplus_mode);
-    save_value<int> oldExtendMode(extendmode);
-    if (Getattr(n, "template"))
-      extendmode = 0;
-    if (!CPlusPlus) {
-      /* Always have default constructors/destructors in C */
-      Setattr(n, "allocate:default_constructor", "1");
-      Setattr(n, "allocate:default_destructor", "1");
-    }
-
-    if (Getattr(n, "allocate:visit"))
-      return SWIG_OK;
-    Setattr(n, "allocate:visit", "1");
-
-    /* Always visit base classes first */
-    {
-      List *bases = Getattr(n, "bases");
-      if (bases) {
-	for (int i = 0; i < Len(bases); i++) {
-	  Node *b = Getitem(bases, i);
-	  classDeclaration(b);
-	}
-      }
-    }
-    inclass = n;
-    String *kind = Getattr(n, "kind");
-    if (Strcmp(kind, "class") == 0) {
-      cplus_mode = PRIVATE;
-    } else {
-      cplus_mode = PUBLIC;
-    }
-
-    emit_children(n);
-
-    /* Check if the class is abstract via inheritance.   This might occur if a class didn't have
-       any pure virtual methods of its own, but it didn't implement all of the pure methods in
-       a base class */
-    if (!Getattr(n, "abstracts") && is_abstract_inherit(n)) {
-      if (((Getattr(n, "allocate:public_constructor") || (!GetFlag(n, "feature:nodefault") && !Getattr(n, "allocate:has_constructor"))))) {
-	if (!GetFlag(n, "feature:notabstract")) {
-	  Node *na = Getattr(n, "abstracts:firstnode");
-	  if (na) {
-	    Swig_warning(WARN_TYPE_ABSTRACT, Getfile(n), Getline(n),
-			 "Class '%s' might be abstract, " "no constructors generated,\n", SwigType_namestr(Getattr(n, "name")));
-	    Swig_warning(WARN_TYPE_ABSTRACT, Getfile(na), Getline(na), "Method %s might not be implemented.\n", Swig_name_decl(na));
-	    if (!Getattr(n, "abstracts")) {
-	      List *abstracts = NewList();
-	      Append(abstracts, na);
-	      Setattr(n, "abstracts", abstracts);
-	      Delete(abstracts);
-	    }
-	  }
-	}
-      }
-    }
-
-    if (!Getattr(n, "allocate:has_constructor")) {
-      /* No constructor is defined.  We need to check a few things */
-      /* If class is abstract.  No default constructor. Sorry */
-      if (Getattr(n, "abstracts")) {
-	Delattr(n, "allocate:default_constructor");
-      }
-      if (!Getattr(n, "allocate:default_constructor")) {
-	/* Check base classes */
-	List *bases = Getattr(n, "allbases");
-	int allows_default = 1;
-
-	for (int i = 0; i < Len(bases); i++) {
-	  Node *n = Getitem(bases, i);
-	  /* If base class does not allow default constructor, we don't allow it either */
-	  if (!Getattr(n, "allocate:default_constructor") && (!Getattr(n, "allocate:default_base_constructor"))) {
-	    allows_default = 0;
-	  }
-	}
-	if (allows_default) {
-	  Setattr(n, "allocate:default_constructor", "1");
-	}
-      }
-    }
-    if (!Getattr(n, "allocate:has_copy_constructor")) {
-      if (Getattr(n, "abstracts")) {
-	Delattr(n, "allocate:copy_constructor");
-      }
-      if (!Getattr(n, "allocate:copy_constructor")) {
-	/* Check base classes */
-	List *bases = Getattr(n, "allbases");
-	int allows_copy = 1;
-
-	for (int i = 0; i < Len(bases); i++) {
-	  Node *n = Getitem(bases, i);
-	  /* If base class does not allow copy constructor, we don't allow it either */
-	  if (!Getattr(n, "allocate:copy_constructor") && (!Getattr(n, "allocate:copy_base_constructor"))) {
-	    allows_copy = 0;
-	  }
-	}
-	if (allows_copy) {
-	  Setattr(n, "allocate:copy_constructor", "1");
-	}
-      }
-    }
-
-    if (!Getattr(n, "allocate:has_destructor")) {
-      /* No destructor was defined */
-      List *bases = Getattr(n, "allbases");
-      int allows_destruct = 1;
-
-      for (int i = 0; i < Len(bases); i++) {
-	Node *n = Getitem(bases, i);
-	/* If base class does not allow default destructor, we don't allow it either */
-	if (!Getattr(n, "allocate:default_destructor") && (!Getattr(n, "allocate:default_base_destructor"))) {
-	  allows_destruct = 0;
-	}
-      }
-      if (allows_destruct) {
-	Setattr(n, "allocate:default_destructor", "1");
-      }
-    }
-
-    if (!Getattr(n, "allocate:has_assign")) {
-      /* No assignment operator was defined */
-      List *bases = Getattr(n, "allbases");
-      int allows_assign = 1;
-
-      for (int i = 0; i < Len(bases); i++) {
-	Node *n = Getitem(bases, i);
-	/* If base class does not allow assignment, we don't allow it either */
-	if (Getattr(n, "allocate:has_assign")) {
-	  allows_assign = !Getattr(n, "allocate:noassign");
-	}
-      }
-      if (!allows_assign) {
-	Setattr(n, "allocate:noassign", "1");
-      }
-    }
-
-    if (!Getattr(n, "allocate:has_new")) {
-      /* No new operator was defined */
-      List *bases = Getattr(n, "allbases");
-      int allows_new = 1;
-
-      for (int i = 0; i < Len(bases); i++) {
-	Node *n = Getitem(bases, i);
-	/* If base class does not allow new operator, we don't allow it either */
-	if (Getattr(n, "allocate:has_new")) {
-	  allows_new = !Getattr(n, "allocate:nonew");
-	}
-      }
-      if (!allows_new) {
-	Setattr(n, "allocate:nonew", "1");
-      }
-    }
-
-    /* Check if base classes allow smart pointers, but might be hidden */
-    if (!Getattr(n, "allocate:smartpointer")) {
-      Node *sp = Swig_symbol_clookup("operator ->", 0);
-      if (sp) {
-	/* Look for parent */
-	Node *p = parentNode(sp);
-	if (Strcmp(nodeType(p), "extend") == 0) {
-	  p = parentNode(p);
-	}
-	if (Strcmp(nodeType(p), "class") == 0) {
-	  if (GetFlag(p, "feature:ignore")) {
-	    Setattr(n, "allocate:smartpointer", Getattr(p, "allocate:smartpointer"));
-	  }
-	}
-      }
-    }
-
-    Swig_interface_propagate_methods(n);
-
-    /* Only care about default behavior.  Remove temporary values */
-    Setattr(n, "allocate:visit", "1");
-    Swig_symbol_setscope(symtab);
-    return SWIG_OK;
-  }
-
-  virtual int accessDeclaration(Node *n) {
-    String *kind = Getattr(n, "kind");
-    if (Cmp(kind, "public") == 0) {
-      cplus_mode = PUBLIC;
-    } else if (Cmp(kind, "private") == 0) {
-      cplus_mode = PRIVATE;
-    } else if (Cmp(kind, "protected") == 0) {
-      cplus_mode = PROTECTED;
-    }
-    return SWIG_OK;
-  }
-
-  virtual int usingDeclaration(Node *n) {
-
-    Node *c = 0;
-    for (c = firstChild(n); c; c = nextSibling(c)) {
-      if (Strcmp(nodeType(c), "cdecl") == 0) {
-	process_exceptions(c);
-
-	if (inclass)
-	  class_member_is_defined_in_bases(c, inclass);
-      }
-    }
-
-    return SWIG_OK;
-  }
-
-  virtual int cDeclaration(Node *n) {
-
-    process_exceptions(n);
-
-    if (inclass) {
-      /* check whether the member node n is defined in class node in class's bases */
-      class_member_is_defined_in_bases(n, inclass);
-
-      /* Check to see if this is a static member or not.  If so, we add an attribute
-         cplus:staticbase that saves the current class */
-
-      if (Swig_storage_isstatic(n)) {
-	Setattr(n, "cplus:staticbase", inclass);
-      }
-
-      String *name = Getattr(n, "name");
-      if (cplus_mode != PUBLIC) {
-	if (Strcmp(name, "operator =") == 0) {
-	  /* Look for a private assignment operator */
-	  if (!GetFlag(n, "deleted"))
-	    Setattr(inclass, "allocate:has_assign", "1");
-	  Setattr(inclass, "allocate:noassign", "1");
-	} else if (Strcmp(name, "operator new") == 0) {
-	  /* Look for a private new operator */
-	  if (!GetFlag(n, "deleted"))
-	    Setattr(inclass, "allocate:has_new", "1");
-	  Setattr(inclass, "allocate:nonew", "1");
-	}
-      } else {
-	if (Strcmp(name, "operator =") == 0) {
-	  if (!GetFlag(n, "deleted"))
-	    Setattr(inclass, "allocate:has_assign", "1");
-	  else
-	    Setattr(inclass, "allocate:noassign", "1");
-	} else if (Strcmp(name, "operator new") == 0) {
-	  if (!GetFlag(n, "deleted"))
-	    Setattr(inclass, "allocate:has_new", "1");
-	  else
-	    Setattr(inclass, "allocate:nonew", "1");
-	}
-	/* Look for smart pointer operator */
-	if ((Strcmp(name, "operator ->") == 0) && (!GetFlag(n, "feature:ignore"))) {
-	  /* Look for version with no parameters */
-	  Node *sn = n;
-	  while (sn) {
-	    if (!Getattr(sn, "parms")) {
-	      SwigType *type = SwigType_typedef_resolve_all(Getattr(sn, "type"));
-	      SwigType_push(type, Getattr(sn, "decl"));
-	      Delete(SwigType_pop_function(type));
-	      SwigType *base = SwigType_base(type);
-	      Node *sc = Swig_symbol_clookup(base, 0);
-	      if ((sc) && (Strcmp(nodeType(sc), "class") == 0)) {
-		if (SwigType_check_decl(type, "p.")) {
-		  /* Need to check if type is a const pointer */
-		  int isconst = 0;
-		  Delete(SwigType_pop(type));
-		  if (SwigType_isconst(type)) {
-		    isconst = !Getattr(inclass, "allocate:smartpointermutable");
-		    Setattr(inclass, "allocate:smartpointerconst", "1");
-		  }
-		  else {
-		    Setattr(inclass, "allocate:smartpointermutable", "1");
-		  }
-		  List *methods = smart_pointer_methods(sc, 0, isconst);
-		  Setattr(inclass, "allocate:smartpointer", methods);
-		  Setattr(inclass, "allocate:smartpointerpointeeclassname", Getattr(sc, "name"));
-		} else {
-		  /* Hmmm.  The return value is not a pointer.  If the type is a value
-		     or reference.  We're going to chase it to see if another operator->()
-		     can be found */
-		  if ((SwigType_check_decl(type, "")) || (SwigType_check_decl(type, "r."))) {
-		    Node *nn = Swig_symbol_clookup("operator ->", Getattr(sc, "symtab"));
-		    if (nn) {
-		      Delete(base);
-		      Delete(type);
-		      sn = nn;
-		      continue;
-		    }
-		  }
-		}
-	      }
-	      Delete(base);
-	      Delete(type);
-	      break;
-	    }
-	  }
-	}
-      }
-    }
-    return SWIG_OK;
-  }
-
-  virtual int constructorDeclaration(Node *n) {
-    if (!inclass)
-      return SWIG_OK;
-    Parm *parms = Getattr(n, "parms");
-
-    process_exceptions(n);
-    if (!extendmode) {
-      if (!ParmList_numrequired(parms)) {
-	/* Class does define a default constructor */
-	/* However, we had better see where it is defined */
-	if (cplus_mode == PUBLIC) {
-	  Setattr(inclass, "allocate:default_constructor", "1");
-	} else if (cplus_mode == PROTECTED) {
-	  Setattr(inclass, "allocate:default_base_constructor", "1");
-	}
-      }
-      /* Class defines some kind of constructor. May or may not be public */
-      Setattr(inclass, "allocate:has_constructor", "1");
-      if (cplus_mode == PUBLIC) {
-	Setattr(inclass, "allocate:public_constructor", "1");
-      }
-    } else {
-      Setattr(inclass, "allocate:has_constructor", "1");
-      Setattr(inclass, "allocate:public_constructor", "1");
-    }
-
-
-    /* See if this is a copy constructor */
-    if (parms && (ParmList_numrequired(parms) == 1)) {
-      /* Look for a few cases. X(const X &), X(X &), X(X *) */
-      int copy_constructor = 0;
-      SwigType *type = Getattr(inclass, "name");
-      String *tn = NewStringf("r.q(const).%s", type);
-      String *cc = SwigType_typedef_resolve_all(tn);
-      SwigType *rt = SwigType_typedef_resolve_all(Getattr(parms, "type"));
-      if (SwigType_istemplate(type)) {
-	String *tmp = Swig_symbol_template_deftype(cc, 0);
-	Delete(cc);
-	cc = tmp;
-	tmp = Swig_symbol_template_deftype(rt, 0);
-	Delete(rt);
-	rt = tmp;
-      }
-      if (Strcmp(cc, rt) == 0) {
-	copy_constructor = 1;
-      } else {
-	Delete(cc);
-	cc = NewStringf("r.%s", Getattr(inclass, "name"));
-	if (Strcmp(cc, Getattr(parms, "type")) == 0) {
-	  copy_constructor = 1;
-	} else {
-	  Delete(cc);
-	  cc = NewStringf("p.%s", Getattr(inclass, "name"));
-	  String *ty = SwigType_strip_qualifiers(Getattr(parms, "type"));
-	  if (Strcmp(cc, ty) == 0) {
-	    copy_constructor = 1;
-	  }
-	  Delete(ty);
-	}
-      }
-      Delete(cc);
-      Delete(rt);
-      Delete(tn);
-
-      if (copy_constructor) {
-	Setattr(n, "copy_constructor", "1");
-	Setattr(inclass, "allocate:has_copy_constructor", "1");
-	if (cplus_mode == PUBLIC) {
-	  Setattr(inclass, "allocate:copy_constructor", "1");
-	} else if (cplus_mode == PROTECTED) {
-	  Setattr(inclass, "allocate:copy_base_constructor", "1");
-	}
-      }
-    }
-    return SWIG_OK;
-  }
-
-  virtual int destructorDeclaration(Node *n) {
-    (void) n;
-    if (!inclass)
-      return SWIG_OK;
-    if (!extendmode) {
-      Setattr(inclass, "allocate:has_destructor", "1");
-      if (cplus_mode == PUBLIC) {
-	Setattr(inclass, "allocate:default_destructor", "1");
-      } else if (cplus_mode == PROTECTED) {
-	Setattr(inclass, "allocate:default_base_destructor", "1");
-      } else if (cplus_mode == PRIVATE) {
-	Setattr(inclass, "allocate:private_destructor", "1");
-      }
-    } else {
-      Setattr(inclass, "allocate:has_destructor", "1");
-      Setattr(inclass, "allocate:default_destructor", "1");
-    }
-    return SWIG_OK;
-  }
-};
-
-void Swig_default_allocators(Node *n) {
-  if (!n)
-    return;
-  Allocate *a = new Allocate;
-  a->top(n);
-  delete a;
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/browser.cxx b/dependencies2013/win32/swig/Source/Modules/browser.cxx
deleted file mode 100644
index 217b40a7..00000000
--- a/dependencies2013/win32/swig/Source/Modules/browser.cxx
+++ /dev/null
@@ -1,421 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * browser.cxx
- *
- * A web-base parse tree browser using SWILL.   This is an optional
- * feature that's normally disabled.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-#ifdef SWIG_SWILL
-extern "C" {
-#include "swill.h"
-} static FILE *out = 0;
-static Node *view_top = 0;
-
-class Browser:public Dispatcher {
-  void show_checkbox(Node *t, Node *n) {
-    int v = 0;
-    if (Getmeta(n, "visible")) {
-      v = 1;
-    }
-    if (v) {
-      Printf(out, "<a name=\"n%p\"></a>[<a href=\"hide.html?node=%p&hn=%p#n%p\">-</a>] ", n, t, n, n);
-    } else {
-      Printf(out, "<a name=\"n%p\"></a>[<a href=\"show.html?node=%p&hn=%p#n%p\">+</a>] ", n, t, n, n);
-    }
-  }
-  void show_attributes(Node *obj) {
-    if (!Getmeta(obj, "visible"))
-      return;
-    String *os = NewString("");
-    String *k;
-    Iterator ki;
-    ki = First(obj);
-    while (ki.key) {
-      k = ki.key;
-      if ((Cmp(k, "nodeType") == 0) || (Cmp(k, "firstChild") == 0) || (Cmp(k, "lastChild") == 0) ||
-	  (Cmp(k, "parentNode") == 0) || (Cmp(k, "nextSibling") == 0) || (Cmp(k, "previousSibling") == 0) || (*(Char(k)) == '$')) {
-	/* Do nothing */
-      } else if (Cmp(k, "parms") == 0) {
-	String *o = NewString("");
-	Printf(o, "%s", ParmList_protostr(Getattr(obj, k)));
-	Replaceall(o, "&", "&amp;");
-	Replaceall(o, "<", "&lt;");
-	Replaceall(o, ">", "&gt;");
-	Printf(os, "<a href=\"data.html?n=%p\">?</a> %-12s - %s\n", Getattr(obj, k), k, o);
-	Delete(o);
-      } else {
-	DOH *o;
-	char *trunc = "";
-	if (DohIsString(Getattr(obj, k))) {
-	  o = Str(Getattr(obj, k));
-	  if (Len(o) > 70) {
-	    trunc = "...";
-	  }
-	  Replaceall(o, "&", "&amp;");
-	  Replaceall(o, "<", "&lt;");
-	  Printf(os, "<a href=\"data.html?n=%p\">?</a> %-12s - \"%(escape)-0.70s%s\"\n", Getattr(obj, k), k, o, trunc);
-	  Delete(o);
-	} else {
-	  Printf(os, "<a href=\"data.html?n=%p\">?</a> %-12s - %p\n", Getattr(obj, k), k, Getattr(obj, k));
-	}
-      }
-      ki = Next(ki);
-    }
-    Printf(out, "<FONT color=\"#660000\"><pre>\n%s</pre></FONT>\n", Char(os));
-    Delete(os);
-  }
-
-public:
-  virtual int emit_one(Node *n) {
-    char *tag = Char(nodeType(n));
-    char *file = Char(Getfile(n));
-    int line = Getline(n);
-    char *name = GetChar(n, "name");
-
-    show_checkbox(view_top, n);
-    Printf(out, "<b><a href=\"index.html?node=%p\">%s</a></b>", n, tag);
-    if (name) {
-      Printf(out, " (%s)", name);
-    }
-    Printf(out, ".  %s:%d\n", file, line);
-    Printf(out, "<br>");
-    Dispatcher::emit_one(n);
-    return SWIG_OK;
-  }
-  virtual int emit_children(Node *n) {
-    if (Getmeta(n, "visible")) {
-      Printf(out, "<blockquote>\n");
-      Dispatcher::emit_children(n);
-      Printf(out, "</blockquote>\n");
-    }
-    return SWIG_OK;
-  }
-  virtual int defaultHandler(Node *n) {
-    show_attributes(n);
-    return SWIG_OK;
-  }
-  virtual int top(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-  virtual int includeDirective(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-  virtual int importDirective(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-  virtual int extendDirective(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-  virtual int classDeclaration(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-  virtual int templateDeclaration(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-  virtual int lambdaDeclaration(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-  virtual int enumDeclaration(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-  virtual int typemapDirective(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-  virtual int namespaceDeclaration(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-  virtual int usingDeclaration(Node *n) {
-    show_attributes(n);
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-};
-
-static int browser_exit = 0;
-static Node *tree_top = 0;
-static Browser *browse = 0;
-
-/* ----------------------------------------------------------------------
- * exit_handler()      - Force the browser to exit
- * ---------------------------------------------------------------------- */
-
-void exit_handler(FILE *f) {
-  browser_exit = 1;
-  Printf(f, "Terminated.\n");
-}
-
-/* ----------------------------------------------------------------------
- * node_handler()      - Generate information about a specific node
- * ---------------------------------------------------------------------- */
-
-static void display(FILE *f, Node *n) {
-  /* Print standard HTML header */
-
-  Printf(f, "<HTML><HEAD><TITLE>SWIG-%s</TITLE></HEAD><BODY BGCOLOR=\"#ffffff\">\n", Swig_package_version());
-  Printf(f, "<b>SWIG-%s</b><br>\n", Swig_package_version());
-  Printf(f, "[ <a href=\"exit.html\">Exit</a> ]");
-  Printf(f, " [ <a href=\"index.html?node=%p\">Top</a> ]", tree_top);
-  if (n != tree_top) {
-    Printf(f, " [ <a href=\"index.html?node=%p\">Up</a> ]", parentNode(n));
-  }
-  Printf(f, " [ <a href=\"symbol.html\">Symbols</a> ]");
-  Printf(f, "<br><hr><p>\n");
-
-  out = f;
-
-  browse->emit_one(n);
-
-  /* Print standard footer */
-  Printf(f, "<br><hr></BODY></HTML>\n");
-
-}
-
-void node_handler(FILE *f) {
-  Node *n = 0;
-  if (!swill_getargs("p(node)", &n)) {
-    n = tree_top;
-  }
-  view_top = n;
-  display(f, n);
-}
-
-
-/* ----------------------------------------------------------------------
- * hide_handler()      - Hide a node 
- * ---------------------------------------------------------------------- */
-
-void hide_handler(FILE *f) {
-  Node *n = 0;
-  if (!swill_getargs("p(hn)", &n)) {
-    n = 0;
-  }
-  if (n) {
-    Delmeta(n, "visible");
-  }
-  node_handler(f);
-}
-
-void show_handler(FILE *f) {
-  Node *n = 0;
-  if (!swill_getargs("p(hn)", &n)) {
-    n = 0;
-  }
-  if (n) {
-    Setmeta(n, "visible", "1");
-  }
-  node_handler(f);
-}
-
-void raw_data(FILE *out, Node *obj) {
-  if (!obj)
-    return;
-  if (DohIsMapping(obj)) {
-    String *k;
-    Iterator ki;
-    String *os = NewString("");
-    Printf(os, "Hash {\n");
-    ki = First(obj);
-    while (ki.key) {
-      k = ki.key;
-      DOH *o;
-      const char *trunc = "";
-      if (DohIsString(Getattr(obj, k))) {
-	o = Str(Getattr(obj, k));
-	if (Len(o) > 70) {
-	  trunc = "...";
-	}
-	Replaceall(o, "<", "&lt;");
-	Printf(os, "    <a href=\"data.html?n=%p\">?</a> %-12s - \"%(escape)-0.70s%s\"\n", Getattr(obj, k), k, o, trunc);
-	Delete(o);
-      } else {
-	Printf(os, "    <a href=\"data.html?n=%p\">?</a> %-12s - %p\n", Getattr(obj, k), k, Getattr(obj, k));
-      }
-      ki = Next(ki);
-    }
-    Printf(os, "}\n");
-    Printf(out, "<FONT color=\"#660000\"><pre>\n%s</pre></FONT>\n", Char(os));
-    Delete(os);
-  } else if (DohIsString(obj)) {
-    String *o = Str(obj);
-    Replaceall(o, "<", "&lt;");
-    Printf(out, "<FONT color=\"#660000\"><pre>\n%s</pre></FONT>\n", Char(o));
-    Delete(o);
-  } else if (DohIsSequence(obj)) {
-    int i;
-    String *os = NewString("");
-    Printf(os, "List [\n");
-    for (i = 0; i < Len(obj); i++) {
-      DOH *o = Getitem(obj, i);
-      const char *trunc = "";
-      if (DohIsString(o)) {
-	String *s = Str(o);
-	if (Len(s) > 70) {
-	  trunc = "...";
-	}
-	Replaceall(o, "<", "&lt;");
-	Printf(os, "    <a href=\"data.html?n=%p\">?</a> [%d] - \"%(escape)-0.70s%s\"\n", o, i, s, trunc);
-	Delete(s);
-      } else {
-	Printf(os, "    <a href=\"data.html?n=%p\">?</a> [%d] - %p\n", o, i, o);
-      }
-    }
-    Printf(os, "\n]\n");
-    Printf(out, "<FONT color=\"#660000\"><pre>\n%s</pre></FONT>\n", Char(os));
-    Delete(os);
-  }
-}
-
-void data_handler(FILE *f) {
-  DOH *n = 0;
-  if (!swill_getargs("p(n)", &n)) {
-    n = 0;
-  }
-  Printf(f, "<HTML><HEAD><TITLE>SWIG-%s</TITLE></HEAD><BODY BGCOLOR=\"#ffffff\">\n", Swig_package_version());
-  Printf(f, "<b>SWIG-%s</b><br>\n", Swig_package_version());
-  Printf(f, "[ <a href=\"exit.html\">Exit</a> ]");
-  Printf(f, " [ <a href=\"index.html?node=%p\">Top</a> ]", tree_top);
-  Printf(f, "<br><hr><p>\n");
-  if (n) {
-    raw_data(f, n);
-  }
-  /* Print standard footer */
-  Printf(f, "<br><hr></BODY></HTML>\n");
-}
-
-void symbol_handler(FILE *f) {
-  Symtab *sym;
-  char *name = 0;
-
-  Printf(f, "<HTML><HEAD><TITLE>SWIG-%s</TITLE></HEAD><BODY BGCOLOR=\"#ffffff\">\n", Swig_package_version());
-  Printf(f, "<b>SWIG-%s</b><br>\n", Swig_package_version());
-  Printf(f, "[ <a href=\"exit.html\">Exit</a> ]");
-  Printf(f, " [ <a href=\"index.html?node=%p\">Top</a> ]", tree_top);
-  Printf(f, " [ <a href=\"symbol.html\">Symbols</a> ]");
-  Printf(f, "<br><hr><p>\n");
-
-  if (!swill_getargs("p(sym)|s(name)", &sym, &name)) {
-    sym = Swig_symbol_getscope("");
-    name = 0;
-  }
-  if (!sym) {
-    Printf(f, "No symbol table specified!\n");
-    return;
-  }
-  {
-    String *q = Swig_symbol_qualifiedscopename(sym);
-    if (!Len(q)) {
-      Printf(f, "<b>Symbol table: :: (global)</b><br>\n");
-    } else {
-      Printf(f, "<b>Symbol table: %s</b><br>\n", q);
-    }
-    Delete(q);
-  }
-
-  fprintf(f, "<p><form action=\"symbol.html\" method=GET>\n");
-  fprintf(f, "Symbol lookup: <input type=text name=name size=40></input><br>\n");
-  fprintf(f, "<input type=hidden name=sym value=\"%p\">\n", sym);
-  fprintf(f, "Submit : <input type=submit></input>\n");
-  fprintf(f, "</form>");
-
-  if (name) {
-    Node *n = Swig_symbol_clookup(name, sym);
-    Printf(f, "Symbol '%s':\n", name);
-    Printf(f, "<blockquote>\n");
-    if (!n) {
-      Printf(f, "Not defined!\n");
-    } else {
-      raw_data(f, n);
-    }
-    Printf(f, "</blockquote>\n");
-  }
-
-  Printf(f, "<p><b>Nested scopes</b><br>\n");
-  Printf(f, "<blockquote><pre>\n");
-  {
-    Hash *h;
-    h = firstChild(sym);
-    while (h) {
-      Printf(f, "<a href=\"symbol.html?sym=%p\">%s</a>\n", h, Getattr(h, "name"));
-      h = nextSibling(h);
-    }
-  }
-  Printf(f, "</pre></blockquote>\n");
-
-  Printf(f, "<p><b>Symbol table contents</b></br>\n");
-  raw_data(f, Getattr(sym, "symtab"));
-  Printf(f, "<br><hr></BODY></HTML>\n");
-
-}
-#endif
-
-void Swig_browser(Node *top, int port) {
-#ifdef SWIG_SWILL
-  int sport;
-  browser_exit = 0;
-
-  /* Initialize the server */
-  sport = swill_init(port);
-  if (sport < 0) {
-    Printf(stderr, "Couldn't open socket on port %d. Sorry.\n", port);
-    return;
-  }
-  browse = new Browser();
-  Setmeta(top, "visible", "1");
-  tree_top = top;
-
-  Printf(stderr, "SWIG: Tree browser listening on port %d\n", sport);
-
-  swill_handle("exit.html", exit_handler, 0);
-  swill_handle("index.html", node_handler, 0);
-  swill_handle("hide.html", hide_handler, 0);
-  swill_handle("show.html", show_handler, 0);
-  swill_handle("data.html", data_handler, 0);
-  swill_handle("symbol.html", symbol_handler, 0);
-  swill_netscape("index.html");
-
-  while (!browser_exit) {
-    swill_serve();
-  }
-  Printf(stderr, "Browser terminated.\n");
-  swill_close();
-  delete browse;
-  return;
-#else
-  (void) top;
-  (void) port;
-#endif
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/cffi.cxx b/dependencies2013/win32/swig/Source/Modules/cffi.cxx
deleted file mode 100644
index bf333881..00000000
--- a/dependencies2013/win32/swig/Source/Modules/cffi.cxx
+++ /dev/null
@@ -1,1186 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * cffi.cxx
- *
- * cffi language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-
-//#define CFFI_DEBUG
-//#define CFFI_WRAP_DEBUG
-
-static const char *usage = "\
-CFFI Options (available with -cffi)\n\
-     -generate-typedef - Use defctype to generate shortcuts according to the\n\
-                         typedefs in the input.\n\
-     -[no]cwrap        - Turn on or turn off generation of an intermediate C\n\
-                         file when creating a C interface. By default this is\n\
-                         only done for C++ code.\n\
-     -[no]swig-lisp    - Turn on or off generation of code for helper lisp\n\
-                         macro, functions, etc. which SWIG uses while\n\
-                         generating wrappers. These macros, functions may still\n\
-                         be used by generated wrapper code.\n\
-";
-
-class CFFI:public Language {
-public:
-  String *f_cl;
-  String *f_clhead;
-  String *f_clwrap;
-  bool CWrap;     // generate wrapper file for C code?  
-  File *f_begin;
-  File *f_runtime;
-  File *f_cxx_header;
-  File *f_cxx_wrapper;
-  File *f_clos;
-
-  String *module;
-  virtual void main(int argc, char *argv[]);
-  virtual int top(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int variableWrapper(Node *n);
-  virtual int constantWrapper(Node *n);
-  //  virtual int classDeclaration(Node *n);
-  virtual int enumDeclaration(Node *n);
-  virtual int typedefHandler(Node *n);
-
-  //c++ specific code
-  virtual int constructorHandler(Node *n);
-  virtual int destructorHandler(Node *n);
-  virtual int memberfunctionHandler(Node *n);
-  virtual int membervariableHandler(Node *n);
-  virtual int classHandler(Node *n);
-
-private:
-  static void checkConstraints(ParmList *parms, Wrapper *f);
-  static void argout(ParmList *parms, Wrapper *f);
-  static String *freearg(ParmList *parms);
-  static void cleanupFunction(Node *n, Wrapper *f, ParmList *parms);
-
-  void emit_defun(Node *n, String *name);
-  void emit_defmethod(Node *n);
-  void emit_initialize_instance(Node *n);
-  void emit_getter(Node *n);
-  void emit_setter(Node *n);
-  void emit_class(Node *n);
-  void emit_struct_union(Node *n, bool un);
-  void emit_export(Node *n, String *name);
-  void emit_inline(Node *n, String *name);
-  String *lispy_name(char *name);
-  String *lispify_name(Node *n, String *ty, const char *flag, bool kw = false);
-  String *convert_literal(String *num_param, String *type, bool try_to_split = true);
-  String *infix_to_prefix(String *val, char split_op, const String *op, String *type);
-  String *strip_parens(String *string);
-  String *trim(String *string);
-  int generate_typedef_flag;
-  bool no_swig_lisp;
-};
-
-void CFFI::main(int argc, char *argv[]) {
-  int i;
-
-  Preprocessor_define("SWIGCFFI 1", 0);
-  SWIG_library_directory("cffi");
-  SWIG_config_file("cffi.swg");
-  generate_typedef_flag = 0;
-  no_swig_lisp = false;
-  CWrap = false;
-  for (i = 1; i < argc; i++) {
-    if (!Strcmp(argv[i], "-help")) {
-      Printf(stdout, "%s\n", usage);
-    } else if (!strcmp(argv[i], "-cwrap")) {
-      CWrap = true;
-      Swig_mark_arg(i);
-    } else if ((Strcmp(argv[i], "-generate-typedef") == 0)) {
-      generate_typedef_flag = 1;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-nocwrap")) {
-      CWrap = false;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-swig-lisp")) {
-      no_swig_lisp = false;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-noswig-lisp")) {
-      no_swig_lisp = true;
-      Swig_mark_arg(i);
-    }
-
-  }
-  f_clhead = NewString("");
-  f_clwrap = NewString("");
-  f_cl = NewString("");
-
-  allow_overloading();
-}
-
-int CFFI::top(Node *n) {
-  File *f_null = NewString("");
-  module = Getattr(n, "name");
-
-  String *cxx_filename = Getattr(n, "outfile");
-  String *lisp_filename = NewString("");
-
-  Printf(lisp_filename, "%s%s.lisp", SWIG_output_directory(), module);
-
-  File *f_lisp = NewFile(lisp_filename, "w", SWIG_output_files());
-  if (!f_lisp) {
-    FileErrorDisplay(lisp_filename);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  if (CPlusPlus || CWrap) {
-    f_begin = NewFile(cxx_filename, "w", SWIG_output_files());
-    if (!f_begin) {
-      Delete(f_lisp);
-      Printf(stderr, "Unable to open %s for writing\n", cxx_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    String *clos_filename = NewString("");
-    Printf(clos_filename, "%s%s-clos.lisp", SWIG_output_directory(), module);
-    f_clos = NewFile(clos_filename, "w", SWIG_output_files());
-    if (!f_clos) {
-      Delete(f_lisp);
-      Printf(stderr, "Unable to open %s for writing\n", cxx_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-  } else {
-    f_begin = NewString("");
-    f_clos = NewString("");
-  }
-
-  f_runtime = NewString("");
-  f_cxx_header = f_runtime;
-  f_cxx_wrapper = NewString("");
-
-  Swig_register_filebyname("header", f_cxx_header);
-  Swig_register_filebyname("wrapper", f_cxx_wrapper);
-  Swig_register_filebyname("begin", f_begin);
-  Swig_register_filebyname("runtime", f_runtime);
-  Swig_register_filebyname("lisphead", f_clhead);
-  if (!no_swig_lisp)
-    Swig_register_filebyname("swiglisp", f_cl);
-  else
-    Swig_register_filebyname("swiglisp", f_null);
-
-  Swig_banner(f_begin);
-
-  Printf(f_runtime, "\n\n#ifndef SWIGCFFI\n#define SWIGCFFI\n#endif\n\n");
-
-  Swig_banner_target_lang(f_lisp, ";;;");
-
-  Language::top(n);
-  Printf(f_lisp, "%s\n", f_clhead);
-  Printf(f_lisp, "%s\n", f_cl);
-  Printf(f_lisp, "%s\n", f_clwrap);
-
-  Delete(f_lisp);
-  Delete(f_cl);
-  Delete(f_clhead);
-  Delete(f_clwrap);
-  Dump(f_runtime, f_begin);
-  Delete(f_runtime);
-  Delete(f_begin);
-  Delete(f_cxx_wrapper);
-  Delete(f_null);
-
-  return SWIG_OK;
-}
-
-int CFFI::classHandler(Node *n) {
-#ifdef CFFI_DEBUG
-  Printf(stderr, "class %s::%s\n", "some namespace",  //current_namespace,
-   Getattr(n, "sym:name"));
-#endif
-  String *name = Getattr(n, "sym:name");
-  String *kind = Getattr(n, "kind");
-
-  // maybe just remove this check and get rid of the else clause below.
-  if (Strcmp(kind, "struct") == 0) {
-    emit_struct_union(n, false);
-    return SWIG_OK;
-  } else if (Strcmp(kind, "union") == 0) {
-    emit_struct_union(n, true);
-    return SWIG_OK;
-  } else if (Strcmp(kind, "class") == 0) {
-    emit_class(n);
-    Language::classHandler(n);
-  } else {
-    Printf(stderr, "Don't know how to deal with %s kind of class yet.\n", kind);
-    Printf(stderr, " (name: %s)\n", name);
-    SWIG_exit(EXIT_FAILURE);
-    return SWIG_OK;
-  }
-
-  return SWIG_OK;
-}
-
-int CFFI::constructorHandler(Node *n) {
-#ifdef CFFI_DEBUG
-  Printf(stderr, "constructor %s\n", Getattr(n, "name"));
-  Printf(stderr, "constructor %s\n and %s and %s", Getattr(n, "kind"), Getattr(n, "sym:name"), Getattr(n, "allegrocl:old-sym:name"));
-#endif
-  Setattr(n, "cffi:constructorfunction", "1");
-  // Let SWIG generate a global forwarding function.
-  return Language::constructorHandler(n);
-}
-
-int CFFI::destructorHandler(Node *n) {
-#ifdef CFFI_DEBUG
-  Printf(stderr, "destructor %s\n", Getattr(n, "name"));
-#endif
-
-  // Let SWIG generate a global forwarding function.
-  return Language::destructorHandler(n);
-}
-
-void CFFI::emit_defmethod(Node *n) {
-  String *args_placeholder = NewStringf("");
-  String *args_call = NewStringf("");
-
-  ParmList *pl = Getattr(n, "parms");
-  int argnum = 0;
-  Node *parent = getCurrentClass();
-  bool first = 0;
-  
-  for (Parm *p = pl; p; p = nextSibling(p), argnum++) {
-    String *argname = Getattr(p, "name");
-    String *ffitype = Swig_typemap_lookup("lispclass", p, "", 0);
-
-    int tempargname = 0;
-
-    if(!first)
-      first = true;
-    else
-      Printf(args_placeholder, " ");
-      
-    if (!argname) {
-      argname = NewStringf("arg%d", argnum);
-      tempargname = 1;
-    } else if (Strcmp(argname, "t") == 0 || Strcmp(argname, "T") == 0) {
-      argname = NewStringf("t-arg%d", argnum);
-      tempargname = 1;
-    }
-    if (Len(ffitype) > 0)
-      Printf(args_placeholder, "(%s %s)", argname, ffitype);
-    else
-      Printf(args_placeholder, "%s", argname);
-
-    if (ffitype && Strcmp(ffitype, lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'classname")) == 0)
-      Printf(args_call, " (ff-pointer %s)", argname);
-    else
-      Printf(args_call, " %s", argname);
-
-    Delete(ffitype);
-
-    if (tempargname)
-      Delete(argname);
-  }
-
-  String *method_name = Getattr(n, "name");
-  int x = Replace(method_name, "operator ", "", DOH_REPLACE_FIRST); //  
-
-  if (x == 1)
-    Printf(f_clos, "(cl:shadow \"%s\")\n", method_name);
-
-  Printf(f_clos, "(cl:defmethod %s (%s)\n  (%s%s))\n\n",
-         lispify_name(n, lispy_name(Char(method_name)), "'method"), args_placeholder,
-         lispify_name(n, Getattr(n, "sym:name"), "'function"), args_call);
-
-}
-
-void CFFI::emit_initialize_instance(Node *n) {
-  String *args_placeholder = NewStringf("");
-  String *args_call = NewStringf("");
-
-  ParmList *pl = Getattr(n, "parms");
-  int argnum = 0;
-  Node *parent = getCurrentClass();
-
-  for (Parm *p = pl; p; p = nextSibling(p), argnum++) {
-    String *argname = Getattr(p, "name");
-    String *ffitype = Swig_typemap_lookup("lispclass", p, "", 0);
-
-    int tempargname = 0;
-    if (!argname) {
-      argname = NewStringf("arg%d", argnum);
-      tempargname = 1;
-    } else if (Strcmp(argname, "t") == 0 || Strcmp(argname, "T") == 0) {
-      argname = NewStringf("t-arg%d", argnum);
-      tempargname = 1;
-    }
-    if (Len(ffitype) > 0)
-      Printf(args_placeholder, " (%s %s)", argname, ffitype);
-    else
-      Printf(args_placeholder, " %s", argname);
-
-    if (ffitype && Strcmp(ffitype, lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'classname")) == 0)
-      Printf(args_call, " (ff-pointer %s)", argname);
-    else
-      Printf(args_call, " %s", argname);
-
-    Delete(ffitype);
-
-    if (tempargname)
-      Delete(argname);
-  }
-
-  Printf(f_clos, "(cl:defmethod initialize-instance :after ((obj %s) &key%s)\n  (setf (slot-value obj 'ff-pointer) (%s%s)))\n\n",
-         lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), args_placeholder,
-         lispify_name(n, Getattr(n, "sym:name"), "'function"), args_call);
-
-}
-
-void CFFI::emit_setter(Node *n) {
-  Node *parent = getCurrentClass();
-  Printf(f_clos, "(cl:defmethod (cl:setf %s) (arg0 (obj %s))\n  (%s (ff-pointer obj) arg0))\n\n",
-         lispify_name(n, Getattr(n, "name"), "'method"),
-         lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function"));
-}
-
-
-void CFFI::emit_getter(Node *n) {
-  Node *parent = getCurrentClass();
-  Printf(f_clos, "(cl:defmethod %s ((obj %s))\n  (%s (ff-pointer obj)))\n\n",
-         lispify_name(n, Getattr(n, "name"), "'method"),
-         lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function"));
-}
-
-int CFFI::memberfunctionHandler(Node *n) {
-  // Let SWIG generate a global forwarding function.
-  Setattr(n, "cffi:memberfunction", "1");
-  return Language::memberfunctionHandler(n);
-}
-
-int CFFI::membervariableHandler(Node *n) {
-  // Let SWIG generate a get/set function pair.
-  Setattr(n, "cffi:membervariable", "1");
-  return Language::membervariableHandler(n);
-}
-
-
-void CFFI::checkConstraints(ParmList *parms, Wrapper *f) {
-  Parm *p = parms;
-  while (p) {
-    String *tm = Getattr(p, "tmap:check");
-    if (!tm) {
-      p = nextSibling(p);
-    } else {
-      tm = Copy(tm);
-      Replaceall(tm, "$input", Getattr(p, "emit:input"));
-      Printv(f->code, tm, "\n\n", NULL);
-      Delete(tm);
-      p = Getattr(p, "tmap:check:next");
-    }
-  }
-}
-
-void CFFI::argout(ParmList *parms, Wrapper *f) {
-  Parm *p = parms;
-  while (p) {
-    String *tm = Getattr(p, "tmap:argout");
-    if (!tm) {
-      p = nextSibling(p);
-    } else {
-      tm = Copy(tm);
-      Replaceall(tm, "$result", Swig_cresult_name());
-      Replaceall(tm, "$input", Getattr(p, "emit:input"));
-      Printv(f->code, tm, "\n", NULL);
-      Delete(tm);
-      p = Getattr(p, "tmap:argout:next");
-    }
-  }
-}
-
-String *CFFI::freearg(ParmList *parms) {
-  String *ret = NewString("");
-  Parm *p = parms;
-  while (p) {
-    String *tm = Getattr(p, "tmap:freearg");
-    if (!tm) {
-      p = nextSibling(p);
-    } else {
-      tm = Copy(tm);
-      Replaceall(tm, "$input", Getattr(p, "emit:input"));
-      Printv(ret, tm, "\n", NULL);
-      Delete(tm);
-      p = Getattr(p, "tmap:freearg:next");
-    }
-  }
-  return ret;
-}
-
-void CFFI::cleanupFunction(Node *n, Wrapper *f, ParmList *parms) {
-  String *cleanup = freearg(parms);
-  Printv(f->code, cleanup, NULL);
-
-  if (GetFlag(n, "feature:new")) {
-    String *tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0);
-    if (tm) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printv(f->code, tm, "\n", NULL);
-      Delete(tm);
-    }
-  }
-
-  Replaceall(f->code, "$cleanup", cleanup);
-  Delete(cleanup);
-
-  Replaceall(f->code, "$symname", Getattr(n, "sym:name"));
-}
-
-int CFFI::functionWrapper(Node *n) {
-
-  ParmList *parms = Getattr(n, "parms");
-  String *iname = Getattr(n, "sym:name");
-  Wrapper *f = NewWrapper();
-
-  String *raw_return_type = Swig_typemap_lookup("ctype", n, "", 0);
-  SwigType *return_type = Swig_cparse_type(raw_return_type);
-  SwigType *resolved = SwigType_typedef_resolve_all(return_type);
-  int is_void_return = (Cmp(resolved, "void") == 0);
-  Delete(resolved);
-
-  if (!is_void_return) {
-    String *lresult_init = NewStringf("lresult = (%s)0", raw_return_type);
-    Wrapper_add_localv(f, "lresult", raw_return_type, lresult_init, NIL);
-    Delete(lresult_init);
-  }
-
-  String *overname = 0;
-  if (Getattr(n, "sym:overloaded")) {
-    overname = Getattr(n, "sym:overname");
-  } else {
-    if (!addSymbol(iname, n)) {
-      DelWrapper(f);
-      return SWIG_ERROR;
-    }
-  }
-
-  String *wname = Swig_name_wrapper(iname);
-  if (overname) {
-    Append(wname, overname);
-  }
-  Setattr(n, "wrap:name", wname);
-
-  // Emit all of the local variables for holding arguments.
-  emit_parameter_variables(parms, f);
-
-  // Attach the standard typemaps 
-  Swig_typemap_attach_parms("ctype", parms, f);
-  emit_attach_parmmaps(parms, f);
-
-  int num_arguments = emit_num_arguments(parms);
-  String *name_and_parms = NewStringf("%s (", wname);
-  int i;
-  Parm *p;
-  int gencomma = 0;
-
-#ifdef CFFI_DEBUG
-  Printf(stderr, "function  -  %s - %d\n", Getattr(n, "name"), num_arguments);
-#endif
-
-  for (i = 0, p = parms; i < num_arguments; i++) {
-
-    while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    SwigType *c_parm_type = Swig_cparse_type(Getattr(p, "tmap:ctype"));
-    String *arg = NewStringf("l%s", Getattr(p, "lname"));
-
-    // Emit parameter declaration
-    if (gencomma)
-      Printf(name_and_parms, ", ");
-    String *parm_decl = SwigType_str(c_parm_type, arg);
-    Printf(name_and_parms, "%s", parm_decl);
-#ifdef CFFI_DEBUG
-    Printf(stderr, "  param: %s\n", parm_decl);
-#endif
-    Delete(parm_decl);
-    gencomma = 1;
-
-    // Emit parameter conversion code
-    String *parm_code = Getattr(p, "tmap:in");
-    {
-      Replaceall(parm_code, "$input", arg);
-      Setattr(p, "emit:input", arg);
-      Printf(f->code, "%s\n", parm_code);
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Delete(arg);
-  }
-  Printf(name_and_parms, ")");
-
-  // Emit the function definition
-  String *signature = SwigType_str(return_type, name_and_parms);
-  Printf(f->def, "EXPORT %s {", signature);
-
-  checkConstraints(parms, f);
-
-  Printf(f->code, "  try {\n");
-
-  String *actioncode = emit_action(n);
-
-  String *result_convert = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode);
-  if (result_convert) {
-    Replaceall(result_convert, "$result", "lresult");
-    Printf(f->code, "%s\n", result_convert);
-  }
-  Delete(result_convert);
-
-  argout(parms, f);
-
-  cleanupFunction(n, f, parms);
-
-  /* See if there is any return cleanup code */
-  String *tm = 0;
-  if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-    Replaceall(tm, "$source", Swig_cresult_name());
-    Printf(f->code, "%s\n", tm);
-    Delete(tm);
-  }
-
-  if (!is_void_return) {
-    Printf(f->code, "    return lresult;\n");
-  }
-
-  emit_return_variable(n, Getattr(n, "type"), f);
-
-  Printf(f->code, "  } catch (...) {\n");
-  if (!is_void_return)
-    Printf(f->code, "    return (%s)0;\n", raw_return_type);
-  Printf(f->code, "  }\n");
-  Printf(f->code, "}\n");
-
-  if (CPlusPlus)
-    Wrapper_print(f, f_runtime);
-
-  if (CPlusPlus) {
-    emit_defun(n, wname);
-    if (Getattr(n, "cffi:memberfunction"))
-      emit_defmethod(n);
-    else if (Getattr(n, "cffi:membervariable")) {
-      if (Getattr(n, "memberget"))
-        emit_getter(n);
-      else if (Getattr(n, "memberset"))
-        emit_setter(n);
-    }
-    else if (Getattr(n, "cffi:constructorfunction")) {
-      emit_initialize_instance(n);
-    }
-  } else
-    emit_defun(n, iname);
-
-  //   if (!overloaded || !Getattr(n, "sym:nextSibling")) {
-  //     update_package_if_needed(n);
-  //     emit_buffered_defuns(n);
-  //     // this is the last overload.
-  //     if (overloaded) {
-  //       emit_dispatch_defun(n);
-  //     }
-  //   }
-
-  Delete(wname);
-  DelWrapper(f);
-
-  return SWIG_OK;
-}
-
-
-void CFFI::emit_defun(Node *n, String *name) {
-  String *func_name = Getattr(n, "sym:name");
-
-  ParmList *pl = Getattr(n, "parms");
-
-  int argnum = 0;
-
-  func_name = lispify_name(n, func_name, "'function");
-
-  emit_inline(n, func_name);
-
-  Printf(f_cl, "\n(cffi:defcfun (\"%s\" %s)", name, func_name);
-  String *ffitype = Swig_typemap_lookup("cout", n, ":pointer", 0);
-
-  Printf(f_cl, " %s", ffitype);
-  Delete(ffitype);
-
-  for (Parm *p = pl; p; p = nextSibling(p), argnum++) {
-
-    if (SwigType_isvarargs(Getattr(p, "type"))) {
-      Printf(f_cl, "\n  %s", NewString("&rest"));
-      continue;
-    }
-
-    String *argname = Getattr(p, "name");
-
-    ffitype = Swig_typemap_lookup("cin", p, "", 0);
-
-    int tempargname = 0;
-    if (!argname) {
-
-      argname = NewStringf("arg%d", argnum);
-      tempargname = 1;
-    } else if (Strcmp(argname, "t") == 0 || Strcmp(argname, "T") == 0) {
-      argname = NewStringf("t_arg%d", argnum);
-      tempargname = 1;
-    }
-
-    Printf(f_cl, "\n  (%s %s)", argname, ffitype);
-
-    Delete(ffitype);
-
-    if (tempargname)
-      Delete(argname);
-  }
-  Printf(f_cl, ")\n");    /* finish arg list */
-
-  emit_export(n, func_name);
-}
-
-
-int CFFI::constantWrapper(Node *n) {
-  String *type = Getattr(n, "type");
-  String *converted_value;
-  if (SwigType_type(type) == T_STRING) {
-    converted_value = NewString(Getattr(n, "rawval"));
-  } else {
-    converted_value = convert_literal(Getattr(n, "value"), type);
-  }
-
-  String *name = lispify_name(n, Getattr(n, "sym:name"), "'constant");
-
-  if (Strcmp(name, "t") == 0 || Strcmp(name, "T") == 0)
-    name = NewStringf("t_var");
-
-  Printf(f_cl, "\n(cl:defconstant %s %s)\n", name, converted_value);
-  Delete(converted_value);
-
-  emit_export(n, name);
-  return SWIG_OK;
-}
-
-int CFFI::variableWrapper(Node *n) {
-  String *var_name = Getattr(n, "sym:name");
-  String *lisp_type = Swig_typemap_lookup("cin", n, "", 0);
-  String *lisp_name = lispify_name(n, var_name, "'variable");
-
-  if (Strcmp(lisp_name, "t") == 0 || Strcmp(lisp_name, "T") == 0)
-    lisp_name = NewStringf("t_var");
-
-  Printf(f_cl, "\n(cffi:defcvar (\"%s\" %s)\n %s)\n", var_name, lisp_name, lisp_type);
-
-  Delete(lisp_type);
-
-  emit_export(n, lisp_name);
-  return SWIG_OK;
-}
-
-int CFFI::typedefHandler(Node *n) {
-  if (generate_typedef_flag && strncmp(Char(Getattr(n, "type")), "enum", 4)) {
-    String *lisp_name = lispify_name(n, Getattr(n, "name"), "'typename");
-    Printf(f_cl, "\n(cffi:defctype %s %s)\n", lisp_name, Swig_typemap_lookup("cin", n, "", 0));
-    emit_export(n, lisp_name);
-  }
-  return Language::typedefHandler(n);
-}
-
-int CFFI::enumDeclaration(Node *n) {
-  if (getCurrentClass() && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  String *name = Getattr(n, "sym:name");
-  bool slot_name_keywords;
-  String *lisp_name = 0;
-  if (name && Len(name) != 0) {
-    lisp_name = lispify_name(n, name, "'enumname");
-    if (GetFlag(n, "feature:bitfield")) {
-      Printf(f_cl, "\n(cffi:defbitfield %s", lisp_name);
-    } else {
-      Printf(f_cl, "\n(cffi:defcenum %s", lisp_name);
-    }
-    slot_name_keywords = true;
-
-    //Registering the enum name to the cin and cout typemaps
-    Parm *pattern = NewParm(name, NULL, n);
-    Swig_typemap_register("cin", pattern, lisp_name, NULL, NULL);
-    Swig_typemap_register("cout", pattern, lisp_name, NULL, NULL);
-    Delete(pattern);
-    //Registering with the kind, i.e., enum
-    pattern = NewParm(NewStringf("enum %s", name), NULL, n);
-    Swig_typemap_register("cin", pattern, lisp_name, NULL, NULL);
-    Swig_typemap_register("cout", pattern, lisp_name, NULL, NULL);
-    Delete(pattern);
-
-  } else {
-    Printf(f_cl, "\n(defanonenum %s", name);
-    slot_name_keywords = false;
-  }
-
-  for (Node *c = firstChild(n); c; c = nextSibling(c)) {
-
-    String *slot_name = lispify_name(c, Getattr(c, "name"), "'enumvalue", slot_name_keywords);
-    String *value = Getattr(c, "enumvalue");
-
-    if (!value || GetFlag(n, "feature:bitfield:ignore_values"))
-      Printf(f_cl, "\n\t%s", slot_name);
-    else {
-      String *type = Getattr(c, "type");
-      String *converted_value = convert_literal(value, type);
-      Printf(f_cl, "\n\t(%s #.%s)", slot_name, converted_value);
-      Delete(converted_value);
-    }
-    Delete(value);
-  }
-
-  Printf(f_cl, ")\n");
-
-  // No need to export keywords
-  if (lisp_name && Len(lisp_name) != 0) {
-    emit_export(n, lisp_name);
-  } else {
-    for (Node *c = firstChild(n); c; c = nextSibling(c))
-      emit_export(c, lispify_name(c, Getattr(c, "name"), "'enumvalue"));
-  }
-
-  return SWIG_OK;
-}
-void CFFI::emit_class(Node *n) {
-
-#ifdef CFFI_WRAP_DEBUG
-  Printf(stderr, "emit_class: ENTER... '%s'(%p)\n", Getattr(n, "sym:name"), n);
-#endif
-
-  String *name = Getattr(n, "sym:name");
-  String *lisp_name = lispify_name(n, lispy_name(Char(name)), "'classname");
-
-  String *bases = Getattr(n, "bases");
-  String *supers = NewString("(");
-  if (bases) {
-    int first = 1;
-    for (Iterator i = First(bases); i.item; i = Next(i)) {
-      if (!first)
-  Printf(supers, " ");
-      String *s = Getattr(i.item, "name");
-      Printf(supers, "%s", lispify_name(i.item, lispy_name(Char(s)), "'classname"));
-    }
-  } else {
-    // Printf(supers,"ff:foreign-pointer");
-  }
-
-  Printf(supers, ")");
-  Printf(f_clos, "\n(cl:defclass %s%s", lisp_name, supers);
-  Printf(f_clos, "\n  ((ff-pointer :reader ff-pointer)))\n\n");
-
-  Parm *pattern = NewParm(Getattr(n, "name"), NULL, n);
-
-  Swig_typemap_register("lispclass", pattern, lisp_name, NULL, NULL);
-  SwigType_add_pointer(Getattr(pattern, "type"));
-  Swig_typemap_register("lispclass", pattern, lisp_name, NULL, NULL);
-  SwigType_add_qualifier(Getattr(pattern, "type"), "const");
-  Swig_typemap_register("lispclass", pattern, lisp_name, NULL, NULL);
-  SwigType_del_pointer(Getattr(pattern, "type"));
-  SwigType_add_reference(Getattr(pattern, "type"));
-  Swig_typemap_register("lispclass", pattern, lisp_name, NULL, NULL);
-
-#ifdef CFFI_WRAP_DEBUG
-  Printf(stderr, "  pattern %s  name %s .. ... %s .\n", pattern, lisp_name);
-#endif
-
-  Delete(pattern);
-
-  // Walk children to generate type definition.
-  String *slotdefs = NewString("   ");
-
-#ifdef CFFI_WRAP_DEBUG
-  Printf(stderr, "  walking children...\n");
-#endif
-
-  Node *c;
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    String *storage_type = Getattr(c, "storage");
-    if ((!Strcmp(nodeType(c), "cdecl") && (!storage_type || Strcmp(storage_type, "typedef")))) {
-      String *access = Getattr(c, "access");
-
-      // hack. why would decl have a value of "variableHandler" and now "0"?
-      String *childDecl = Getattr(c, "decl");
-      // Printf(stderr,"childDecl = '%s' (%s)\n", childDecl, Getattr(c,"view"));
-      if (!Strcmp(childDecl, "0"))
-  childDecl = NewString("");
-
-      SwigType *childType = NewStringf("%s%s", childDecl,
-               Getattr(c, "type"));
-      String *cname = (access && Strcmp(access, "public")) ? NewString("nil") : Copy(Getattr(c, "name"));
-
-      if (!SwigType_isfunction(childType)) {
-  // Printf(slotdefs, ";;; member functions don't appear as slots.\n ");
-  // Printf(slotdefs, ";; ");
-  //        String *ns = listify_namespace(Getattr(n, "cffi:package"));
-  String *ns = NewString("");
-#ifdef CFFI_WRAP_DEBUG
-  Printf(stderr, "slot name = '%s' ns = '%s' class-of '%s' and type = '%s'\n", cname, ns, name, childType);
-#endif
-  Printf(slotdefs, "(#.(swig-insert-id \"%s\" %s :type :slot :class \"%s\") %s)", cname, ns, name, childType);  //compose_foreign_type(childType)
-  Delete(ns);
-  if (access && Strcmp(access, "public"))
-    Printf(slotdefs, " ;; %s member", access);
-
-  Printf(slotdefs, "\n   ");
-      }
-      Delete(childType);
-      Delete(cname);
-    }
-  }
-
-
-  //   String *ns_list = listify_namespace(Getattr(n,"cffi:namespace"));
-  //   update_package_if_needed(n,f_clhead);
-  //   Printf(f_clos, 
-  //          "(swig-def-foreign-class \"%s\"\n %s\n  (:%s\n%s))\n\n", 
-  //          name, supers, kind, slotdefs);
-
-  Delete(supers);
-  //  Delete(ns_list);
-
-  //  Parm *pattern = NewParm(name, NULL, n);
-  // Swig_typemap_register("cin",pattern,lisp_name,NULL,NULL);  
-  //Swig_typemap_register("cout",pattern,lisp_name,NULL,NULL);
-  //Delete(pattern);
-
-#ifdef CFFI_WRAP_DEBUG
-  Printf(stderr, "emit_class: EXIT\n");
-#endif
-}
-
-// Includes structs
-void CFFI::emit_struct_union(Node *n, bool un = false) {
-#ifdef CFFI_DEBUG
-  Printf(stderr, "struct/union %s\n", Getattr(n, "name"));
-  Printf(stderr, "struct/union %s\n and %s", Getattr(n, "kind"), Getattr(n, "sym:name"));
-#endif
-
-  String *name = Getattr(n, "sym:name");
-  String *kind = Getattr(n, "kind");
-
-  if (Strcmp(kind, "struct") != 0 && Strcmp(kind, "union") != 0) {
-    Printf(stderr, "Don't know how to deal with %s kind of class yet.\n", kind);
-    Printf(stderr, " (name: %s)\n", name);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  String *lisp_name = lispify_name(n, name, "'classname");
-
-  //Register the struct/union name to the cin and cout typemaps
-
-  Parm *pattern = NewParm(name, NULL, n);
-  Swig_typemap_register("cin", pattern, lisp_name, NULL, NULL);
-  Swig_typemap_register("cout", pattern, lisp_name, NULL, NULL);
-  Delete(pattern);
-  //Registering with the kind, i.e., struct or union
-  pattern = NewParm(NewStringf("%s %s", kind, name), NULL, n);
-  Swig_typemap_register("cin", pattern, lisp_name, NULL, NULL);
-  Swig_typemap_register("cout", pattern, lisp_name, NULL, NULL);
-  Delete(pattern);
-
-  if (un) {
-    Printf(f_cl, "\n(cffi:defcunion %s", lisp_name);
-  } else
-    Printf(f_cl, "\n(cffi:defcstruct %s", lisp_name);
-
-
-  for (Node *c = firstChild(n); c; c = nextSibling(c)) {
-#ifdef CFFI_DEBUG
-    Printf(stderr, "struct/union %s\n", Getattr(c, "name"));
-    Printf(stderr, "struct/union %s and %s \n", Getattr(c, "kind"), Getattr(c, "sym:name"));
-#endif
-
-    if (Strcmp(nodeType(c), "cdecl")) {
-      //C declaration ignore
-      //        Printf(stderr, "Structure %s has a slot that we can't deal with.\n",
-      //               name);
-      //        Printf(stderr, "nodeType: %s, name: %s, type: %s\n", 
-      //               nodeType(c),
-      //               Getattr(c, "name"),
-      //               Getattr(c, "type"));
-      //       SWIG_exit(EXIT_FAILURE);
-    } else {
-      SwigType *childType = NewStringf("%s%s", Getattr(c, "decl"), Getattr(c, "type"));
-
-      Node *node = NewHash();
-      Setattr(node, "type", childType);
-      Setfile(node, Getfile(n));
-      Setline(node, Getline(n));
-      const String *tm = Swig_typemap_lookup("cin", node, "", 0);
-
-      String *typespec = tm ? NewString(tm) : NewString("");
-
-      String *slot_name = lispify_name(c, Getattr(c, "sym:name"), "'slotname");
-      if (slot_name && (Strcmp(slot_name, "t") == 0 || Strcmp(slot_name, "T") == 0))
-	slot_name = NewStringf("t_var");
-
-      if (SwigType_isarray(childType) && SwigType_array_ndim(childType) == 1) {
-          String *dim = SwigType_array_getdim(childType, 0);
-          Printf(f_cl, "\n\t(%s %s :count %s)", slot_name, typespec, dim);
-          Delete(dim);
-      } else
-          Printf(f_cl, "\n\t(%s %s)", slot_name, typespec);
-
-      Delete(node);
-      Delete(childType);
-      Delete(typespec);
-    }
-  }
-
-  Printf(f_cl, ")\n");
-
-  emit_export(n, lisp_name);
-  for (Node *child = firstChild(n); child; child = nextSibling(child)) {
-    if (!Strcmp(nodeType(child), "cdecl")) {
-      emit_export(child, lispify_name(child, Getattr(child, "sym:name"), "'slotname"));
-    }
-  }
-
-  /* Add this structure to the known lisp types */
-  //Printf(stdout, "Adding %s foreign type\n", name);
-  //  add_defined_foreign_type(name);
-
-}
-
-void CFFI::emit_export(Node *n, String *name) {
-  if (GetInt(n, "feature:export")) {
-    String* package = Getattr(n, "feature:export:package");
-    Printf(f_cl, "\n(cl:export '%s%s%s)\n", name, package ? " " : "",
-                                                  package ? package : "");
-  }
-}
-
-void CFFI::emit_inline(Node *n, String *name) {
-  if (GetInt(n, "feature:inline"))
-    Printf(f_cl, "\n(cl:declaim (cl:inline %s))\n", name);
-}
-
-String *CFFI::lispify_name(Node *n, String *ty, const char *flag, bool kw) {
-  String *intern_func = Getattr(n, "feature:intern_function");
-  if (intern_func) {
-    if (Strcmp(intern_func, "1") == 0)
-      intern_func = NewStringf("swig-lispify");
-    return NewStringf("#.(%s \"%s\" %s%s)", intern_func, ty, flag, kw ? " :keyword" : "");
-  } else if (kw)
-    return NewStringf(":%s", ty);
-  else
-    return ty;
-}
-
-/* utilities */
-/* returns new string w/ parens stripped */
-String *CFFI::strip_parens(String *string) {
-  char *s = Char(string), *p;
-  int len = Len(string);
-  String *res;
-
-  if (len == 0 || s[0] != '(' || s[len - 1] != ')') {
-    return NewString(string);
-  }
-
-  p = (char *) malloc(len - 2 + 1);
-  if (!p) {
-    Printf(stderr, "Malloc failed\n");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  strncpy(p, s + 1, len - 1);
-  p[len - 2] = 0;   /* null terminate */
-
-  res = NewString(p);
-  free(p);
-
-  return res;
-}
-
-String *CFFI::trim(String *str) {
-  char *c = Char(str);
-  while (*c != '\0' && isspace((int) *c))
-    ++c;
-  String *result = NewString(c);
-  Chop(result);
-  return result;
-}
-
-String *CFFI::infix_to_prefix(String *val, char split_op, const String *op, String *type) {
-  List *ored = Split(val, split_op, -1);
-
-  // some float hackery
-  //i don't understand it, if you do then please explain
-  //   if ( ((split_op == '+') || (split_op == '-')) && Len(ored) == 2 &&
-  //        (SwigType_type(type) == T_FLOAT || SwigType_type(type) == T_DOUBLE ||
-  //    SwigType_type(type) == T_LONGDOUBLE) ) {
-  //     // check that we're not splitting a float
-  //     String *possible_result = convert_literal(val, type, false);
-  //     if (possible_result) return possible_result;
-
-  //   }
-
-  // try parsing the split results. if any part fails, kick out.
-  bool part_failed = false;
-  if (Len(ored) > 1) {
-    String *result = NewStringf("(%s", op);
-    for (Iterator i = First(ored); i.item; i = Next(i)) {
-      String *converted = convert_literal(i.item, type);
-      if (converted) {
-  Printf(result, " %s", converted);
-  Delete(converted);
-      } else {
-  part_failed = true;
-  break;
-      }
-    }
-    Printf(result, ")");
-    Delete(ored);
-    return part_failed ? 0 : result;
-  } else {
-    Delete(ored);
-  }
-  return 0;
-}
-
-/* To be called by code generating the lisp interface
-   Will return a String containing the literal based on type.
-   Will return null if there are problems.
-
-   try_to_split defaults to true (see stub above).
-*/
-String *CFFI::convert_literal(String *literal, String *type, bool try_to_split) {
-  String *num_param = Copy(literal);
-  String *trimmed = trim(num_param);
-  String *num = strip_parens(trimmed), *res = 0;
-  Delete(trimmed);
-  char *s = Char(num);
-
-  // very basic parsing of infix expressions.
-  if (try_to_split) {
-    if ((res = infix_to_prefix(num, '|', "cl:logior", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '&', "cl:logand", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '^', "cl:logxor", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '*', "cl:*", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '/', "cl:/", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '+', "cl:+", type)))
-      return res;
-    if ((res = infix_to_prefix(num, '-', "cl:-", type)))
-      return res;
-  }
-
-  if (SwigType_type(type) == T_FLOAT || SwigType_type(type) == T_DOUBLE || SwigType_type(type) == T_LONGDOUBLE) {
-    // Use CL syntax for float literals 
-
-    // careful. may be a float identifier or float constant.
-    char *num_start = Char(num);
-    char *num_end = num_start + strlen(num_start) - 1;
-
-    bool is_literal = isdigit(*num_start) || (*num_start == '.') || (*num_start == '+') || (*num_start == '-');
-
-    String *lisp_exp = 0;
-    if (is_literal) {
-      if (*num_end == 'f' || *num_end == 'F') {
-        lisp_exp = NewString("f");
-      } else {
-        lisp_exp = NewString("d");
-      }
-
-      if (*num_end == 'l' || *num_end == 'L' || *num_end == 'f' || *num_end == 'F') {
-        *num_end = '\0';
-        num_end--;
-      }
-
-      int exponents = Replaceall(num, "e", lisp_exp) + Replaceall(num, "E", lisp_exp);
-
-      if (!exponents)
-        Printf(num, "%s0", lisp_exp);
-
-      if (exponents > 1 || (exponents + Replaceall(num, ".", ".") == 0)) {
-        Delete(num);
-        num = 0;
-      }
-    }
-    return num;
-  } else if (SwigType_type(type) == T_CHAR) {
-    /* Use CL syntax for character literals */
-    String* result = NewStringf("#\\%s", s);
-    Delete(num);
-    return result;
-  } else if (SwigType_type(type) == T_STRING) {
-    /* Use CL syntax for string literals */
-    String* result = NewStringf("\"%s\"", num_param);
-    Delete(num);
-    return result;
-  } else if (SwigType_type(type) == T_INT || SwigType_type(type) == T_UINT) {
-    // Printf(stderr, "Is a T_INT or T_UINT %s, before replaceall\n", s);
-    const char *num_start = Char(num);
-    bool is_literal = isdigit(*num_start) || (*num_start == '.') || (*num_start == '+') || (*num_start == '-');
-    if (is_literal) {
-      Replaceall(num, "u", "");
-      Replaceall(num, "U", "");
-      Replaceall(num, "l", "");
-      Replaceall(num, "L", "");
-    }
-
-    int i, j;
-    if (sscanf(s, "%d >> %d", &i, &j) == 2) {
-      String* result = NewStringf("(cl:ash %d -%d)", i, j);
-      Delete(num);
-      return result;
-    } else if (sscanf(s, "%d << %d", &i, &j) == 2) {
-      String* result = NewStringf("(cl:ash %d %d)", i, j);
-      Delete(num);
-      return result;
-    }
-  }
-
-  if (Len(num) >= 2 && s[0] == '0') { /* octal or hex */
-    if (s[1] == 'x'){
-      Replace(num,"0","#",DOH_REPLACE_FIRST);
-    }
-    else{
-      Replace(num,"0","#o",DOH_REPLACE_FIRST);
-    }
-  }
-  return num;
-}
-
-//less flexible as it does the conversion in C, the lispify name does the conversion in lisp
-String *CFFI::lispy_name(char *name) {
-  bool helper = false;
-  String *new_name = NewString("");
-  for (unsigned int i = 0; i < strlen(name); i++) {
-    if (name[i] == '_' || name[i] == '-') {
-      Printf(new_name, "%c", '-');
-      helper = false;
-    } else if (name[i] >= 'A' && name[i] <= 'Z') {
-      if (helper)
-  Printf(new_name, "%c", '-');
-      Printf(new_name, "%c", ('a' + (name[i] - 'A')));
-      helper = false;
-    } else {
-      helper = true;
-      Printf(new_name, "%c", name[i]);
-    }
-  }
-  return new_name;
-}
-
-extern "C" Language *swig_cffi(void) {
-  return new CFFI();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/chicken.cxx b/dependencies2013/win32/swig/Source/Modules/chicken.cxx
deleted file mode 100644
index 68a42a29..00000000
--- a/dependencies2013/win32/swig/Source/Modules/chicken.cxx
+++ /dev/null
@@ -1,1535 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * chicken.cxx
- *
- * CHICKEN language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-#include <ctype.h>
-
-static const char *usage = "\
-\
-CHICKEN Options (available with -chicken)\n\
-     -closprefix <prefix>   - Prepend <prefix> to all clos identifiers\n\
-     -noclosuses            - Do not (declare (uses ...)) in scheme file\n\
-     -nocollection          - Do not register pointers with chicken garbage\n\
-                              collector and export destructors\n\
-     -nounit                - Do not (declare (unit ...)) in scheme file\n\
-     -proxy                 - Export TinyCLOS class definitions\n\
-     -unhideprimitive       - Unhide the primitive: symbols\n\
-     -useclassprefix        - Prepend the class name to all clos identifiers\n\
-\n";
-
-static char *module = 0;
-static const char *chicken_path = "chicken";
-static int num_methods = 0;
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_header = 0;
-static File *f_wrappers = 0;
-static File *f_init = 0;
-static String *chickentext = 0;
-static String *closprefix = 0;
-static String *swigtype_ptr = 0;
-
-
-static String *f_sym_size = 0;
-
-/* some options */
-static int declare_unit = 1;
-static int no_collection = 0;
-static int clos_uses = 1;
-
-/* C++ Support + Clos Classes */
-static int clos = 0;
-static String *c_class_name = 0;
-static String *class_name = 0;
-static String *short_class_name = 0;
-
-static int in_class = 0;
-static int have_constructor = 0;
-static bool exporting_destructor = false;
-static bool exporting_constructor = false;
-static String *constructor_name = 0;
-static String *member_name = 0;
-
-/* sections of the .scm code */
-static String *scm_const_defs = 0;
-static String *clos_class_defines = 0;
-static String *clos_methods = 0;
-
-/* Some clos options */
-static int useclassprefix = 0;
-static String *clossymnameprefix = 0;
-static int hide_primitive = 1;
-static Hash *primitive_names = 0;
-
-/* Used for overloading constructors */
-static int has_constructor_args = 0;
-static List *constructor_arg_types = 0;
-static String *constructor_dispatch = 0;
-
-static Hash *overload_parameter_lists = 0;
-
-class CHICKEN:public Language {
-public:
-
-  virtual void main(int argc, char *argv[]);
-  virtual int top(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int variableWrapper(Node *n);
-  virtual int constantWrapper(Node *n);
-  virtual int classHandler(Node *n);
-  virtual int memberfunctionHandler(Node *n);
-  virtual int membervariableHandler(Node *n);
-  virtual int constructorHandler(Node *n);
-  virtual int destructorHandler(Node *n);
-  virtual int validIdentifier(String *s);
-  virtual int staticmembervariableHandler(Node *n);
-  virtual int staticmemberfunctionHandler(Node *n);
-  virtual int importDirective(Node *n);
-
-protected:
-  void addMethod(String *scheme_name, String *function);
-  /* Return true iff T is a pointer type */
-  int isPointer(SwigType *t);
-  void dispatchFunction(Node *n);
-
-  String *chickenNameMapping(String *, const_String_or_char_ptr );
-  String *chickenPrimitiveName(String *);
-
-  String *runtimeCode();
-  String *defaultExternalRuntimeFilename();
-  String *buildClosFunctionCall(List *types, const_String_or_char_ptr closname, const_String_or_char_ptr funcname);
-};
-
-/* -----------------------------------------------------------------------
- * swig_chicken()    - Instantiate module
- * ----------------------------------------------------------------------- */
-
-static Language *new_swig_chicken() {
-  return new CHICKEN();
-}
-
-extern "C" {
-  Language *swig_chicken(void) {
-    return new_swig_chicken();
-  }
-}
-
-void CHICKEN::main(int argc, char *argv[]) {
-  int i;
-
-  SWIG_library_directory(chicken_path);
-
-  // Look for certain command line options
-  for (i = 1; i < argc; i++) {
-    if (argv[i]) {
-      if (strcmp(argv[i], "-help") == 0) {
-	fputs(usage, stdout);
-	SWIG_exit(0);
-      } else if (strcmp(argv[i], "-proxy") == 0) {
-	clos = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-closprefix") == 0) {
-	if (argv[i + 1]) {
-	  clossymnameprefix = NewString(argv[i + 1]);
-	  Swig_mark_arg(i);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-useclassprefix") == 0) {
-	useclassprefix = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-unhideprimitive") == 0) {
-	hide_primitive = 0;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nounit") == 0) {
-	declare_unit = 0;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-noclosuses") == 0) {
-	clos_uses = 0;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nocollection") == 0) {
-	no_collection = 1;
-	Swig_mark_arg(i);
-      }
-    }
-  }
-
-  if (!clos)
-    hide_primitive = 0;
-
-  // Add a symbol for this module
-  Preprocessor_define("SWIGCHICKEN 1", 0);
-
-  // Set name of typemaps
-
-  SWIG_typemap_lang("chicken");
-
-  // Read in default typemaps */
-  SWIG_config_file("chicken.swg");
-  allow_overloading();
-}
-
-int CHICKEN::top(Node *n) {
-  String *chicken_filename = NewString("");
-  File *f_scm;
-  String *scmmodule;
-
-  /* Initialize all of the output files */
-  String *outfile = Getattr(n, "outfile");
-
-  f_begin = NewFile(outfile, "w", SWIG_output_files());
-  if (!f_begin) {
-    FileErrorDisplay(outfile);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  f_runtime = NewString("");
-  f_init = NewString("");
-  f_header = NewString("");
-  f_wrappers = NewString("");
-  chickentext = NewString("");
-  closprefix = NewString("");
-  f_sym_size = NewString("");
-  primitive_names = NewHash();
-  overload_parameter_lists = NewHash();
-
-  /* Register file targets with the SWIG file handler */
-  Swig_register_filebyname("header", f_header);
-  Swig_register_filebyname("wrapper", f_wrappers);
-  Swig_register_filebyname("begin", f_begin);
-  Swig_register_filebyname("runtime", f_runtime);
-  Swig_register_filebyname("init", f_init);
-
-  Swig_register_filebyname("chicken", chickentext);
-  Swig_register_filebyname("closprefix", closprefix);
-
-  clos_class_defines = NewString("");
-  clos_methods = NewString("");
-  scm_const_defs = NewString("");
-
-  Swig_banner(f_begin);
-
-  Printf(f_runtime, "\n\n#ifndef SWIGCHICKEN\n#define SWIGCHICKEN\n#endif\n\n");
-
-  if (no_collection)
-    Printf(f_runtime, "#define SWIG_CHICKEN_NO_COLLECTION 1\n");
-
-  Printf(f_runtime, "\n");
-
-  /* Set module name */
-  module = Swig_copy_string(Char(Getattr(n, "name")));
-  scmmodule = NewString(module);
-  Replaceall(scmmodule, "_", "-");
-
-  Printf(f_header, "#define SWIG_init swig_%s_init\n", module);
-  Printf(f_header, "#define SWIG_name \"%s\"\n", scmmodule);
-
-  Printf(f_wrappers, "#ifdef __cplusplus\n");
-  Printf(f_wrappers, "extern \"C\" {\n");
-  Printf(f_wrappers, "#endif\n\n");
-
-  Language::top(n);
-
-  SwigType_emit_type_table(f_runtime, f_wrappers);
-
-  Printf(f_wrappers, "#ifdef __cplusplus\n");
-  Printf(f_wrappers, "}\n");
-  Printf(f_wrappers, "#endif\n");
-
-  Printf(f_init, "C_kontinue (continuation, ret);\n");
-  Printf(f_init, "}\n\n");
-
-  Printf(f_init, "#ifdef __cplusplus\n");
-  Printf(f_init, "}\n");
-  Printf(f_init, "#endif\n");
-
-  Printf(chicken_filename, "%s%s.scm", SWIG_output_directory(), module);
-  if ((f_scm = NewFile(chicken_filename, "w", SWIG_output_files())) == 0) {
-    FileErrorDisplay(chicken_filename);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Swig_banner_target_lang(f_scm, ";;");
-  Printf(f_scm, "\n");
-
-  if (declare_unit)
-    Printv(f_scm, "(declare (unit ", scmmodule, "))\n\n", NIL);
-  Printv(f_scm, "(declare \n",
-	 tab4, "(hide swig-init swig-init-return)\n",
-	 tab4, "(foreign-declare \"C_extern void swig_", module, "_init(C_word,C_word,C_word) C_noret;\"))\n", NIL);
-  Printv(f_scm, "(define swig-init (##core#primitive \"swig_", module, "_init\"))\n", NIL);
-  Printv(f_scm, "(define swig-init-return (swig-init))\n\n", NIL);
-
-  if (clos) {
-    //Printf (f_scm, "(declare (uses tinyclos))\n");
-    //New chicken versions have tinyclos as an egg
-    Printf(f_scm, "(require-extension tinyclos)\n");
-    Replaceall(closprefix, "$module", scmmodule);
-    Printf(f_scm, "%s\n", closprefix);
-    Printf(f_scm, "%s\n", clos_class_defines);
-    Printf(f_scm, "%s\n", clos_methods);
-  } else {
-    Printf(f_scm, "%s\n", scm_const_defs);
-  }
-
-  Printf(f_scm, "%s\n", chickentext);
-
-  Delete(f_scm);
-
-  char buftmp[20];
-  sprintf(buftmp, "%d", num_methods);
-  Replaceall(f_init, "$nummethods", buftmp);
-  Replaceall(f_init, "$symsize", f_sym_size);
-
-  if (hide_primitive)
-    Replaceall(f_init, "$veclength", buftmp);
-  else
-    Replaceall(f_init, "$veclength", "0");
-
-  Delete(chicken_filename);
-  Delete(chickentext);
-  Delete(closprefix);
-  Delete(overload_parameter_lists);
-
-  Delete(clos_class_defines);
-  Delete(clos_methods);
-  Delete(scm_const_defs);
-
-  /* Close all of the files */
-  Delete(primitive_names);
-  Delete(scmmodule);
-  Dump(f_runtime, f_begin);
-  Dump(f_header, f_begin);
-  Dump(f_wrappers, f_begin);
-  Wrapper_pretty_print(f_init, f_begin);
-  Delete(f_header);
-  Delete(f_wrappers);
-  Delete(f_sym_size);
-  Delete(f_init);
-  Delete(f_runtime);
-  Delete(f_begin);
-  return SWIG_OK;
-}
-
-int CHICKEN::functionWrapper(Node *n) {
-
-  String *name = Getattr(n, "name");
-  String *iname = Getattr(n, "sym:name");
-  SwigType *d = Getattr(n, "type");
-  ParmList *l = Getattr(n, "parms");
-
-  Parm *p;
-  int i;
-  String *wname;
-  Wrapper *f;
-  String *mangle = NewString("");
-  String *get_pointers;
-  String *cleanup;
-  String *argout;
-  String *tm;
-  String *overname = 0;
-  String *declfunc = 0;
-  String *scmname;
-  bool any_specialized_arg = false;
-  List *function_arg_types = NewList();
-
-  int num_required;
-  int num_arguments;
-  int have_argout;
-
-  Printf(mangle, "\"%s\"", SwigType_manglestr(d));
-
-  if (Getattr(n, "sym:overloaded")) {
-    overname = Getattr(n, "sym:overname");
-  } else {
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-  }
-
-  f = NewWrapper();
-  wname = NewString("");
-  get_pointers = NewString("");
-  cleanup = NewString("");
-  argout = NewString("");
-  declfunc = NewString("");
-  scmname = NewString(iname);
-  Replaceall(scmname, "_", "-");
-
-  /* Local vars */
-  Wrapper_add_local(f, "resultobj", "C_word resultobj");
-
-  /* Write code to extract function parameters. */
-  emit_parameter_variables(l, f);
-
-  /* Attach the standard typemaps */
-  emit_attach_parmmaps(l, f);
-  Setattr(n, "wrap:parms", l);
-
-  /* Get number of required and total arguments */
-  num_arguments = emit_num_arguments(l);
-  num_required = emit_num_required(l);
-
-  Append(wname, Swig_name_wrapper(iname));
-  if (overname) {
-    Append(wname, overname);
-  }
-  // Check for interrupts
-  Printv(f->code, "C_trace(\"", scmname, "\");\n", NIL);
-
-  Printv(f->def, "static ", "void ", wname, " (C_word argc, C_word closure, C_word continuation", NIL);
-  Printv(declfunc, "void ", wname, "(C_word,C_word,C_word", NIL);
-
-  /* Generate code for argument marshalling */
-  for (i = 0, p = l; i < num_arguments; i++) {
-
-    while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    SwigType *pt = Getattr(p, "type");
-    String *ln = Getattr(p, "lname");
-
-    Printf(f->def, ", C_word scm%d", i + 1);
-    Printf(declfunc, ",C_word");
-
-    /* Look for an input typemap */
-    if ((tm = Getattr(p, "tmap:in"))) {
-      String *parse = Getattr(p, "tmap:in:parse");
-      if (!parse) {
-        String *source = NewStringf("scm%d", i + 1);
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$target", ln);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);	/* Save the location of
-						   the object */
-
-	if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-	  Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	} else {
-	  Replaceall(tm, "$disown", "0");
-	}
-
-	if (i >= num_required)
-	  Printf(get_pointers, "if (argc-2>%i && (%s)) {\n", i, source);
-	Printv(get_pointers, tm, "\n", NIL);
-	if (i >= num_required)
-	  Printv(get_pointers, "}\n", NIL);
-
-	if (clos) {
-	  if (i < num_required) {
-	    if (strcmp("void", Char(pt)) != 0) {
-	      Node *class_node = 0;
-	      String *clos_code = Getattr(p, "tmap:in:closcode");
-	      class_node = classLookup(pt);
-	      if (clos_code && class_node) {
-		String *class_name = NewStringf("<%s>", Getattr(class_node, "sym:name"));
-		Replaceall(class_name, "_", "-");
-		Append(function_arg_types, class_name);
-		Append(function_arg_types, Copy(clos_code));
-		any_specialized_arg = true;
-		Delete(class_name);
-	      } else {
-		Append(function_arg_types, "<top>");
-		Append(function_arg_types, "$input");
-	      }
-	    }
-	  }
-	}
-        Delete(source);
-      }
-
-      p = Getattr(p, "tmap:in:next");
-      continue;
-    } else {
-      Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-      break;
-    }
-  }
-
-  /* finish argument marshalling */
-
-  Printf(f->def, ") {");
-  Printf(declfunc, ")");
-
-  if (num_required != num_arguments) {
-    Append(function_arg_types, "^^##optional$$");
-  }
-
-  /* First check the number of arguments is correct */
-  if (num_arguments != num_required)
-    Printf(f->code, "if (argc-2<%i || argc-2>%i) C_bad_argc(argc,%i);\n", num_required, num_arguments, num_required + 2);
-  else
-    Printf(f->code, "if (argc!=%i) C_bad_argc(argc,%i);\n", num_arguments + 2, num_arguments + 2);
-
-  /* Now piece together the first part of the wrapper function */
-  Printv(f->code, get_pointers, NIL);
-
-  /* Insert constraint checking code */
-  for (p = l; p;) {
-    if ((tm = Getattr(p, "tmap:check"))) {
-      Replaceall(tm, "$target", Getattr(p, "lname"));
-      Printv(f->code, tm, "\n", NIL);
-      p = Getattr(p, "tmap:check:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  /* Insert cleanup code */
-  for (p = l; p;) {
-    if ((tm = Getattr(p, "tmap:freearg"))) {
-      Replaceall(tm, "$source", Getattr(p, "lname"));
-      Printv(cleanup, tm, "\n", NIL);
-      p = Getattr(p, "tmap:freearg:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  /* Insert argument output code */
-  have_argout = 0;
-  for (p = l; p;) {
-    if ((tm = Getattr(p, "tmap:argout"))) {
-
-      if (!have_argout) {
-	have_argout = 1;
-	// Print initial argument output code
-	Printf(argout, "SWIG_Chicken_SetupArgout\n");
-      }
-
-      Replaceall(tm, "$source", Getattr(p, "lname"));
-      Replaceall(tm, "$target", "resultobj");
-      Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-      Replaceall(tm, "$input", Getattr(p, "emit:input"));
-      Printf(argout, "%s", tm);
-      p = Getattr(p, "tmap:argout:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  Setattr(n, "wrap:name", wname);
-
-  /* Emit the function call */
-  String *actioncode = emit_action(n);
-
-  /* Return the function value */
-  if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-    Replaceall(tm, "$source", Swig_cresult_name());
-    Replaceall(tm, "$target", "resultobj");
-    Replaceall(tm, "$result", "resultobj");
-    if (GetFlag(n, "feature:new")) {
-      Replaceall(tm, "$owner", "1");
-    } else {
-      Replaceall(tm, "$owner", "0");
-    }
-
-    Printf(f->code, "%s", tm);
-
-    if (have_argout)
-      Printf(f->code, "\nSWIG_APPEND_VALUE(resultobj);\n");
-
-  } else {
-    Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-  }
-  emit_return_variable(n, d, f);
-
-  /* Insert the argumetn output code */
-  Printv(f->code, argout, NIL);
-
-  /* Output cleanup code */
-  Printv(f->code, cleanup, NIL);
-
-  /* Look to see if there is any newfree cleanup code */
-  if (GetFlag(n, "feature:new")) {
-    if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-    }
-  }
-
-  /* See if there is any return cleanup code */
-  if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-    Replaceall(tm, "$source", Swig_cresult_name());
-    Printf(f->code, "%s\n", tm);
-  }
-
-
-  if (have_argout) {
-    Printf(f->code, "C_kontinue(continuation,C_SCHEME_END_OF_LIST);\n");
-  } else {
-    if (exporting_constructor && clos && hide_primitive) {
-      /* Don't return a proxy, the wrapped CLOS class is the proxy */
-      Printf(f->code, "C_kontinue(continuation,resultobj);\n");
-    } else {
-      // make the continuation the proxy creation function, if one exists
-      Printv(f->code, "{\n",
-	     "C_word func;\n",
-	     "SWIG_Chicken_FindCreateProxy(func, resultobj)\n",
-	     "if (C_swig_is_closurep(func))\n",
-	     "  ((C_proc4)(void *)C_block_item(func, 0))(4,func,continuation,resultobj,C_SCHEME_FALSE);\n",
-	     "else\n", "  C_kontinue(continuation, resultobj);\n", "}\n", NIL);
-    }
-  }
-
-  /* Error handling code */
-#ifdef USE_FAIL
-  Printf(f->code, "fail:\n");
-  Printv(f->code, cleanup, NIL);
-  Printf(f->code, "swig_panic (\"failure in " "'$symname' SWIG function wrapper\");\n");
-#endif
-  Printf(f->code, "}\n");
-
-  /* Substitute the cleanup code */
-  Replaceall(f->code, "$cleanup", cleanup);
-
-  /* Substitute the function name */
-  Replaceall(f->code, "$symname", iname);
-  Replaceall(f->code, "$result", "resultobj");
-
-  /* Dump the function out */
-  Printv(f_wrappers, "static ", declfunc, " C_noret;\n", NIL);
-  Wrapper_print(f, f_wrappers);
-
-  /* Now register the function with the interpreter.   */
-  if (!Getattr(n, "sym:overloaded")) {
-    if (exporting_destructor && !no_collection) {
-      Printf(f_init, "((swig_chicken_clientdata *)(SWIGTYPE%s->clientdata))->destroy = (swig_chicken_destructor) %s;\n", swigtype_ptr, wname);
-    } else {
-      addMethod(scmname, wname);
-    }
-
-    /* Only export if we are not in a class, or if in a class memberfunction */
-    if (!in_class || member_name) {
-      String *method_def;
-      String *clos_name;
-      if (in_class)
-	clos_name = NewString(member_name);
-      else
-	clos_name = chickenNameMapping(scmname, "");
-
-      if (!any_specialized_arg) {
-	method_def = NewString("");
-	Printv(method_def, "(define ", clos_name, " ", chickenPrimitiveName(scmname), ")", NIL);
-      } else {
-	method_def = buildClosFunctionCall(function_arg_types, clos_name, chickenPrimitiveName(scmname));
-      }
-      Printv(clos_methods, method_def, "\n", NIL);
-      Delete(clos_name);
-      Delete(method_def);
-    }
-
-    if (have_constructor && !has_constructor_args && any_specialized_arg) {
-      has_constructor_args = 1;
-      constructor_arg_types = Copy(function_arg_types);
-    }
-  } else {
-    /* add function_arg_types to overload hash */
-    List *flist = Getattr(overload_parameter_lists, scmname);
-    if (!flist) {
-      flist = NewList();
-      Setattr(overload_parameter_lists, scmname, flist);
-    }
-
-    Append(flist, Copy(function_arg_types));
-
-    if (!Getattr(n, "sym:nextSibling")) {
-      dispatchFunction(n);
-    }
-  }
-
-
-  Delete(wname);
-  Delete(get_pointers);
-  Delete(cleanup);
-  Delete(declfunc);
-  Delete(mangle);
-  Delete(function_arg_types);
-  DelWrapper(f);
-  return SWIG_OK;
-}
-
-int CHICKEN::variableWrapper(Node *n) {
-  char *name = GetChar(n, "name");
-  char *iname = GetChar(n, "sym:name");
-  SwigType *t = Getattr(n, "type");
-  ParmList *l = Getattr(n, "parms");
-
-  String *wname = NewString("");
-  String *mangle = NewString("");
-  String *tm;
-  String *tm2 = NewString("");
-  String *argnum = NewString("0");
-  String *arg = NewString("argv[0]");
-  Wrapper *f;
-  String *overname = 0;
-  String *scmname;
-
-  scmname = NewString(iname);
-  Replaceall(scmname, "_", "-");
-
-  Printf(mangle, "\"%s\"", SwigType_manglestr(t));
-
-  if (Getattr(n, "sym:overloaded")) {
-    overname = Getattr(n, "sym:overname");
-  } else {
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-  }
-
-  f = NewWrapper();
-
-  /* Attach the standard typemaps */
-  emit_attach_parmmaps(l, f);
-  Setattr(n, "wrap:parms", l);
-
-  // evaluation function names
-  Append(wname, Swig_name_wrapper(iname));
-  if (overname) {
-    Append(wname, overname);
-  }
-  Setattr(n, "wrap:name", wname);
-
-  // Check for interrupts
-  Printv(f->code, "C_trace(\"", scmname, "\");\n", NIL);
-
-  if (1 || (SwigType_type(t) != T_USER) || (isPointer(t))) {
-
-    Printv(f->def, "static ", "void ", wname, "(C_word, C_word, C_word, C_word) C_noret;\n", NIL);
-    Printv(f->def, "static " "void ", wname, "(C_word argc, C_word closure, " "C_word continuation, C_word value) {\n", NIL);
-
-    Wrapper_add_local(f, "resultobj", "C_word resultobj");
-
-    Printf(f->code, "if (argc!=2 && argc!=3) C_bad_argc(argc,2);\n");
-
-    /* Check for a setting of the variable value */
-    if (!GetFlag(n, "feature:immutable")) {
-      Printf(f->code, "if (argc > 2) {\n");
-      if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-	Replaceall(tm, "$source", "value");
-	Replaceall(tm, "$target", name);
-	Replaceall(tm, "$input", "value");
-	/* Printv(f->code, tm, "\n",NIL); */
-	emit_action_code(n, f->code, tm);
-      } else {
-	Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0));
-      }
-      Printf(f->code, "}\n");
-    }
-
-    String *varname;
-    if (SwigType_istemplate((char *) name)) {
-      varname = SwigType_namestr((char *) name);
-    } else {
-      varname = name;
-    }
-
-    // Now return the value of the variable - regardless
-    // of evaluating or setting.
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-      Replaceall(tm, "$source", varname);
-      Replaceall(tm, "$varname", varname);
-      Replaceall(tm, "$target", "resultobj");
-      Replaceall(tm, "$result", "resultobj");
-      /* Printf(f->code, "%s\n", tm); */
-      emit_action_code(n, f->code, tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-    }
-
-    Printv(f->code, "{\n",
-	   "C_word func;\n",
-	   "SWIG_Chicken_FindCreateProxy(func, resultobj)\n",
-	   "if (C_swig_is_closurep(func))\n",
-	   "  ((C_proc4)(void *)C_block_item(func, 0))(4,func,continuation,resultobj,C_SCHEME_FALSE);\n",
-	   "else\n", "  C_kontinue(continuation, resultobj);\n", "}\n", NIL);
-
-    /* Error handling code */
-#ifdef USE_FAIL
-    Printf(f->code, "fail:\n");
-    Printf(f->code, "swig_panic (\"failure in " "'%s' SWIG wrapper\");\n", proc_name);
-#endif
-    Printf(f->code, "}\n");
-
-    Wrapper_print(f, f_wrappers);
-
-    /* Now register the variable with the interpreter.   */
-    addMethod(scmname, wname);
-
-    if (!in_class || member_name) {
-      String *clos_name;
-      if (in_class)
-	clos_name = NewString(member_name);
-      else
-	clos_name = chickenNameMapping(scmname, "");
-
-      Node *class_node = classLookup(t);
-      String *clos_code = Getattr(n, "tmap:varin:closcode");
-      if (class_node && clos_code && !GetFlag(n, "feature:immutable")) {
-	Replaceall(clos_code, "$input", "(car lst)");
-	Printv(clos_methods, "(define (", clos_name, " . lst) (if (null? lst) (", chickenPrimitiveName(scmname), ") (",
-	       chickenPrimitiveName(scmname), " ", clos_code, ")))\n", NIL);
-      } else {
-	/* Simply re-export the procedure */
-	if (GetFlag(n, "feature:immutable") && GetFlag(n, "feature:constasvar")) {
-	  Printv(clos_methods, "(define ", clos_name, " (", chickenPrimitiveName(scmname), "))\n", NIL);
-	  Printv(scm_const_defs, "(set! ", scmname, " (", scmname, "))\n", NIL);
-	} else {
-	  Printv(clos_methods, "(define ", clos_name, " ", chickenPrimitiveName(scmname), ")\n", NIL);
-	}
-      }
-      Delete(clos_name);
-    }
-  } else {
-    Swig_warning(WARN_TYPEMAP_VAR_UNDEF, input_file, line_number, "Unsupported variable type %s (ignored).\n", SwigType_str(t, 0));
-  }
-
-  Delete(wname);
-  Delete(argnum);
-  Delete(arg);
-  Delete(tm2);
-  Delete(mangle);
-  DelWrapper(f);
-  return SWIG_OK;
-}
-
-/* ------------------------------------------------------------
- * constantWrapper()
- * ------------------------------------------------------------ */
-
-int CHICKEN::constantWrapper(Node *n) {
-
-  char *name = GetChar(n, "name");
-  char *iname = GetChar(n, "sym:name");
-  SwigType *t = Getattr(n, "type");
-  ParmList *l = Getattr(n, "parms");
-  String *value = Getattr(n, "value");
-
-  String *proc_name = NewString("");
-  String *wname = NewString("");
-  String *mangle = NewString("");
-  String *tm;
-  String *tm2 = NewString("");
-  String *source = NewString("");
-  String *argnum = NewString("0");
-  String *arg = NewString("argv[0]");
-  Wrapper *f;
-  String *overname = 0;
-  String *scmname;
-  String *rvalue;
-  SwigType *nctype;
-
-  scmname = NewString(iname);
-  Replaceall(scmname, "_", "-");
-
-  Printf(source, "swig_const_%s", iname);
-  Replaceall(source, "::", "__");
-
-  Printf(mangle, "\"%s\"", SwigType_manglestr(t));
-
-  if (Getattr(n, "sym:overloaded")) {
-    overname = Getattr(n, "sym:overname");
-  } else {
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-  }
-
-  Append(wname, Swig_name_wrapper(iname));
-  if (overname) {
-    Append(wname, overname);
-  }
-
-  nctype = NewString(t);
-  if (SwigType_isconst(nctype)) {
-    Delete(SwigType_pop(nctype));
-  }
-
-  bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0);
-  if (SwigType_type(nctype) == T_STRING) {
-    rvalue = NewStringf("\"%s\"", value);
-  } else if (SwigType_type(nctype) == T_CHAR && !is_enum_item) {
-    rvalue = NewStringf("\'%s\'", value);
-  } else {
-    rvalue = NewString(value);
-  }
-
-  /* Special hook for member pointer */
-  if (SwigType_type(t) == T_MPOINTER) {
-    Printf(f_header, "static %s = %s;\n", SwigType_str(t, source), rvalue);
-  } else {
-    if ((tm = Swig_typemap_lookup("constcode", n, name, 0))) {
-      Replaceall(tm, "$source", rvalue);
-      Replaceall(tm, "$target", source);
-      Replaceall(tm, "$result", source);
-      Replaceall(tm, "$value", rvalue);
-      Printf(f_header, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      return SWIG_NOWRAP;
-    }
-  }
-
-  f = NewWrapper();
-
-  /* Attach the standard typemaps */
-  emit_attach_parmmaps(l, f);
-  Setattr(n, "wrap:parms", l);
-
-  // evaluation function names
-
-  // Check for interrupts
-  Printv(f->code, "C_trace(\"", scmname, "\");\n", NIL);
-
-  if (1 || (SwigType_type(t) != T_USER) || (isPointer(t))) {
-
-    Setattr(n, "wrap:name", wname);
-    Printv(f->def, "static ", "void ", wname, "(C_word, C_word, C_word) C_noret;\n", NIL);
-
-    Printv(f->def, "static ", "void ", wname, "(C_word argc, C_word closure, " "C_word continuation) {\n", NIL);
-
-    Wrapper_add_local(f, "resultobj", "C_word resultobj");
-
-    Printf(f->code, "if (argc!=2) C_bad_argc(argc,2);\n");
-
-    // Return the value of the variable
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-
-      Replaceall(tm, "$source", source);
-      Replaceall(tm, "$varname", source);
-      Replaceall(tm, "$target", "resultobj");
-      Replaceall(tm, "$result", "resultobj");
-      /* Printf(f->code, "%s\n", tm); */
-      emit_action_code(n, f->code, tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-    }
-
-    Printv(f->code, "{\n",
-	   "C_word func;\n",
-	   "SWIG_Chicken_FindCreateProxy(func, resultobj)\n",
-	   "if (C_swig_is_closurep(func))\n",
-	   "  ((C_proc4)(void *)C_block_item(func, 0))(4,func,continuation,resultobj,C_SCHEME_FALSE);\n",
-	   "else\n", "  C_kontinue(continuation, resultobj);\n", "}\n", NIL);
-
-    /* Error handling code */
-#ifdef USE_FAIL
-    Printf(f->code, "fail:\n");
-    Printf(f->code, "swig_panic (\"failure in " "'%s' SWIG wrapper\");\n", proc_name);
-#endif
-    Printf(f->code, "}\n");
-
-    Wrapper_print(f, f_wrappers);
-
-    /* Now register the variable with the interpreter.   */
-    addMethod(scmname, wname);
-
-    if (!in_class || member_name) {
-      String *clos_name;
-      if (in_class)
-	clos_name = NewString(member_name);
-      else
-	clos_name = chickenNameMapping(scmname, "");
-      if (GetFlag(n, "feature:constasvar")) {
-	Printv(clos_methods, "(define ", clos_name, " (", chickenPrimitiveName(scmname), "))\n", NIL);
-	Printv(scm_const_defs, "(set! ", scmname, " (", scmname, "))\n", NIL);
-      } else {
-	Printv(clos_methods, "(define ", clos_name, " ", chickenPrimitiveName(scmname), ")\n", NIL);
-      }
-      Delete(clos_name);
-    }
-
-  } else {
-    Swig_warning(WARN_TYPEMAP_VAR_UNDEF, input_file, line_number, "Unsupported variable type %s (ignored).\n", SwigType_str(t, 0));
-  }
-
-  Delete(wname);
-  Delete(nctype);
-  Delete(proc_name);
-  Delete(argnum);
-  Delete(arg);
-  Delete(tm2);
-  Delete(mangle);
-  Delete(source);
-  Delete(rvalue);
-  DelWrapper(f);
-  return SWIG_OK;
-}
-
-int CHICKEN::classHandler(Node *n) {
-  /* Create new strings for building up a wrapper function */
-  have_constructor = 0;
-  constructor_dispatch = 0;
-  constructor_name = 0;
-
-  c_class_name = NewString(Getattr(n, "sym:name"));
-  class_name = NewString("");
-  short_class_name = NewString("");
-  Printv(class_name, "<", c_class_name, ">", NIL);
-  Printv(short_class_name, c_class_name, NIL);
-  Replaceall(class_name, "_", "-");
-  Replaceall(short_class_name, "_", "-");
-
-  if (!addSymbol(class_name, n))
-    return SWIG_ERROR;
-
-  /* Handle inheritance */
-  String *base_class = NewString("");
-  List *baselist = Getattr(n, "bases");
-  if (baselist && Len(baselist)) {
-    Iterator base = First(baselist);
-    while (base.item) {
-      if (!Getattr(base.item, "feature:ignore"))
-	Printv(base_class, "<", Getattr(base.item, "sym:name"), "> ", NIL);
-      base = Next(base);
-    }
-  }
-
-  Replaceall(base_class, "_", "-");
-
-  String *scmmod = NewString(module);
-  Replaceall(scmmod, "_", "-");
-
-  Printv(clos_class_defines, "(define ", class_name, "\n", "  (make <swig-metaclass-", scmmod, "> 'name \"", short_class_name, "\"\n", NIL);
-  Delete(scmmod);
-
-  if (Len(base_class)) {
-    Printv(clos_class_defines, "    'direct-supers (list ", base_class, ")\n", NIL);
-  } else {
-    Printv(clos_class_defines, "    'direct-supers (list <object>)\n", NIL);
-  }
-
-  Printf(clos_class_defines, "    'direct-slots (list 'swig-this\n");
-
-  String *mangled_classname = Swig_name_mangle(Getattr(n, "sym:name"));
-
-  SwigType *ct = NewStringf("p.%s", Getattr(n, "name"));
-  swigtype_ptr = SwigType_manglestr(ct);
-
-  Printf(f_runtime, "static swig_chicken_clientdata _swig_chicken_clientdata%s = { 0 };\n", mangled_classname);
-  Printv(f_init, "SWIG_TypeClientData(SWIGTYPE", swigtype_ptr, ", (void *) &_swig_chicken_clientdata", mangled_classname, ");\n", NIL);
-  SwigType_remember(ct);
-
-  /* Emit all of the members */
-
-  in_class = 1;
-  Language::classHandler(n);
-  in_class = 0;
-
-  Printf(clos_class_defines, ")))\n\n");
-
-  if (have_constructor) {
-    Printv(clos_methods, "(define-method (initialize (obj ", class_name, ") initargs)\n", "  (swig-initialize obj initargs ", NIL);
-    if (constructor_arg_types) {
-      String *initfunc_name = NewStringf("%s@@SWIG@initmethod", class_name);
-      String *func_call = buildClosFunctionCall(constructor_arg_types, initfunc_name, chickenPrimitiveName(constructor_name));
-      Printf(clos_methods, "%s)\n)\n", initfunc_name);
-      Printf(clos_methods, "(declare (hide %s))\n", initfunc_name);
-      Printf(clos_methods, "%s\n", func_call);
-      Delete(func_call);
-      Delete(initfunc_name);
-      Delete(constructor_arg_types);
-      constructor_arg_types = 0;
-    } else if (constructor_dispatch) {
-      Printf(clos_methods, "%s)\n)\n", constructor_dispatch);
-      Delete(constructor_dispatch);
-      constructor_dispatch = 0;
-    } else {
-      Printf(clos_methods, "%s)\n)\n", chickenPrimitiveName(constructor_name));
-    }
-    Delete(constructor_name);
-    constructor_name = 0;
-  } else {
-    Printv(clos_methods, "(define-method (initialize (obj ", class_name, ") initargs)\n", "  (swig-initialize obj initargs (lambda x #f)))\n", NIL);
-  }
-
-  /* export class initialization function */
-  if (clos) {
-    String *funcname = NewString(mangled_classname);
-    Printf(funcname, "_swig_chicken_setclosclass");
-    String *closfuncname = NewString(funcname);
-    Replaceall(closfuncname, "_", "-");
-
-    Printv(f_wrappers, "static void ", funcname, "(C_word,C_word,C_word,C_word) C_noret;\n",
-	   "static void ", funcname, "(C_word argc, C_word closure, C_word continuation, C_word cl) {\n",
-	   "  C_trace(\"", funcname, "\");\n",
-	   "  if (argc!=3) C_bad_argc(argc,3);\n",
-	   "  swig_chicken_clientdata *cdata = (swig_chicken_clientdata *) SWIGTYPE", swigtype_ptr, "->clientdata;\n",
-	   "  cdata->gc_proxy_create = CHICKEN_new_gc_root();\n",
-	   "  CHICKEN_gc_root_set(cdata->gc_proxy_create, cl);\n", "  C_kontinue(continuation, C_SCHEME_UNDEFINED);\n", "}\n", NIL);
-    addMethod(closfuncname, funcname);
-
-    Printv(clos_methods, "(", chickenPrimitiveName(closfuncname), " (lambda (x lst) (if lst ",
-	   "(cons (make ", class_name, " 'swig-this x) lst) ", "(make ", class_name, " 'swig-this x))))\n\n", NIL);
-    Delete(closfuncname);
-    Delete(funcname);
-  }
-
-  Delete(mangled_classname);
-  Delete(swigtype_ptr);
-  swigtype_ptr = 0;
-
-  Delete(class_name);
-  Delete(short_class_name);
-  Delete(c_class_name);
-  class_name = 0;
-  short_class_name = 0;
-  c_class_name = 0;
-
-  return SWIG_OK;
-}
-
-int CHICKEN::memberfunctionHandler(Node *n) {
-  String *iname = Getattr(n, "sym:name");
-  String *proc = NewString(iname);
-  Replaceall(proc, "_", "-");
-
-  member_name = chickenNameMapping(proc, short_class_name);
-  Language::memberfunctionHandler(n);
-  Delete(member_name);
-  member_name = NULL;
-  Delete(proc);
-
-  return SWIG_OK;
-}
-
-int CHICKEN::staticmemberfunctionHandler(Node *n) {
-  String *iname = Getattr(n, "sym:name");
-  String *proc = NewString(iname);
-  Replaceall(proc, "_", "-");
-
-  member_name = NewStringf("%s-%s", short_class_name, proc);
-  Language::staticmemberfunctionHandler(n);
-  Delete(member_name);
-  member_name = NULL;
-  Delete(proc);
-
-  return SWIG_OK;
-}
-
-int CHICKEN::membervariableHandler(Node *n) {
-  String *iname = Getattr(n, "sym:name");
-  //String *pb = SwigType_typedef_resolve_all(SwigType_base(Getattr(n, "type")));
-
-  Language::membervariableHandler(n);
-
-  String *proc = NewString(iname);
-  Replaceall(proc, "_", "-");
-
-  //Node *class_node = Swig_symbol_clookup(pb, Getattr(n, "sym:symtab"));
-  Node *class_node = classLookup(Getattr(n, "type"));
-
-  //String *getfunc = NewStringf("%s-%s-get", short_class_name, proc);
-  //String *setfunc = NewStringf("%s-%s-set", short_class_name, proc);
-  String *getfunc = Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, c_class_name, iname));
-  Replaceall(getfunc, "_", "-");
-  String *setfunc = Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, c_class_name, iname));
-  Replaceall(setfunc, "_", "-");
-
-  Printv(clos_class_defines, "        (list '", proc, " ':swig-virtual ':swig-get ", chickenPrimitiveName(getfunc), NIL);
-
-  if (!GetFlag(n, "feature:immutable")) {
-    if (class_node) {
-      Printv(clos_class_defines, " ':swig-set (lambda (x y) (", chickenPrimitiveName(setfunc), " x (slot-ref y 'swig-this))))\n", NIL);
-    } else {
-      Printv(clos_class_defines, " ':swig-set ", chickenPrimitiveName(setfunc), ")\n", NIL);
-    }
-  } else {
-    Printf(clos_class_defines, ")\n");
-  }
-
-  Delete(proc);
-  Delete(setfunc);
-  Delete(getfunc);
-  return SWIG_OK;
-}
-
-int CHICKEN::staticmembervariableHandler(Node *n) {
-  String *iname = Getattr(n, "sym:name");
-  String *proc = NewString(iname);
-  Replaceall(proc, "_", "-");
-
-  member_name = NewStringf("%s-%s", short_class_name, proc);
-  Language::staticmembervariableHandler(n);
-  Delete(member_name);
-  member_name = NULL;
-  Delete(proc);
-
-  return SWIG_OK;
-}
-
-int CHICKEN::constructorHandler(Node *n) {
-  have_constructor = 1;
-  has_constructor_args = 0;
-
-
-  exporting_constructor = true;
-  Language::constructorHandler(n);
-  exporting_constructor = false;
-
-  has_constructor_args = 1;
-
-  String *iname = Getattr(n, "sym:name");
-  constructor_name = Swig_name_construct(NSPACE_TODO, iname);
-  Replaceall(constructor_name, "_", "-");
-  return SWIG_OK;
-}
-
-int CHICKEN::destructorHandler(Node *n) {
-
-  if (no_collection)
-    member_name = NewStringf("delete-%s", short_class_name);
-
-  exporting_destructor = true;
-  Language::destructorHandler(n);
-  exporting_destructor = false;
-
-  if (no_collection) {
-    Delete(member_name);
-    member_name = NULL;
-  }
-
-  return SWIG_OK;
-}
-
-int CHICKEN::importDirective(Node *n) {
-  String *modname = Getattr(n, "module");
-  if (modname && clos_uses) {
-
-    // Find the module node for this imported module.  It should be the
-    // first child but search just in case.
-    Node *mod = firstChild(n);
-    while (mod && Strcmp(nodeType(mod), "module") != 0)
-      mod = nextSibling(mod);
-
-    if (mod) {
-      String *name = Getattr(mod, "name");
-      if (name) {
-	Printf(closprefix, "(declare (uses %s))\n", name);
-      }
-    }
-  }
-
-  return Language::importDirective(n);
-}
-
-String *CHICKEN::buildClosFunctionCall(List *types, const_String_or_char_ptr closname, const_String_or_char_ptr funcname) {
-  String *method_signature = NewString("");
-  String *func_args = NewString("");
-  String *func_call = NewString("");
-
-  Iterator arg_type;
-  int arg_count = 0;
-  int optional_arguments = 0;
-
-  for (arg_type = First(types); arg_type.item; arg_type = Next(arg_type)) {
-    if (Strcmp(arg_type.item, "^^##optional$$") == 0) {
-      optional_arguments = 1;
-    } else {
-      Printf(method_signature, " (arg%i %s)", arg_count, arg_type.item);
-      arg_type = Next(arg_type);
-      if (!arg_type.item)
-	break;
-
-      String *arg = NewStringf("arg%i", arg_count);
-      String *access_arg = Copy(arg_type.item);
-
-      Replaceall(access_arg, "$input", arg);
-      Printf(func_args, " %s", access_arg);
-
-      Delete(arg);
-      Delete(access_arg);
-    }
-    arg_count++;
-  }
-
-  if (optional_arguments) {
-    Printf(func_call, "(define-method (%s %s . args) (apply %s %s args))", closname, method_signature, funcname, func_args);
-  } else {
-    Printf(func_call, "(define-method (%s %s) (%s %s))", closname, method_signature, funcname, func_args);
-  }
-
-  Delete(method_signature);
-  Delete(func_args);
-
-  return func_call;
-}
-
-extern "C" {
-
-  /* compares based on non-primitive names */
-  static int compareTypeListsHelper(const DOH *a, const DOH *b, int opt_equal) {
-    List *la = (List *) a;
-    List *lb = (List *) b;
-
-    Iterator ia = First(la);
-    Iterator ib = First(lb);
-
-    while (ia.item && ib.item) {
-      int ret = Strcmp(ia.item, ib.item);
-      if (ret)
-	return ret;
-      ia = Next(Next(ia));
-      ib = Next(Next(ib));
-    } if (opt_equal && ia.item && Strcmp(ia.item, "^^##optional$$") == 0)
-      return 0;
-    if (ia.item)
-      return -1;
-    if (opt_equal && ib.item && Strcmp(ib.item, "^^##optional$$") == 0)
-      return 0;
-    if (ib.item)
-      return 1;
-
-    return 0;
-  }
-
-  static int compareTypeLists(const DOH *a, const DOH *b) {
-    return compareTypeListsHelper(a, b, 0);
-  }
-}
-
-void CHICKEN::dispatchFunction(Node *n) {
-  /* Last node in overloaded chain */
-
-  int maxargs;
-  String *tmp = NewString("");
-  String *dispatch = Swig_overload_dispatch(n, "%s (2+$numargs,closure," "continuation$commaargs);", &maxargs);
-
-  /* Generate a dispatch wrapper for all overloaded functions */
-
-  Wrapper *f = NewWrapper();
-  String *iname = Getattr(n, "sym:name");
-  String *wname = NewString("");
-  String *scmname = NewString(iname);
-  Replaceall(scmname, "_", "-");
-
-  Append(wname, Swig_name_wrapper(iname));
-
-  Printv(f->def, "static void real_", wname, "(C_word, C_word, C_word, C_word) C_noret;\n", NIL);
-
-  Printv(f->def, "static void real_", wname, "(C_word oldargc, C_word closure, C_word continuation, C_word args) {", NIL);
-
-  Wrapper_add_local(f, "argc", "int argc");
-  Printf(tmp, "C_word argv[%d]", maxargs + 1);
-  Wrapper_add_local(f, "argv", tmp);
-  Wrapper_add_local(f, "ii", "int ii");
-  Wrapper_add_local(f, "t", "C_word t = args");
-  Printf(f->code, "if (!C_swig_is_list (args)) {\n");
-  Printf(f->code, "  swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, " "\"Argument #1 must be a list of overloaded arguments\");\n");
-  Printf(f->code, "}\n");
-  Printf(f->code, "argc = C_unfix (C_i_length (args));\n");
-  Printf(f->code, "for (ii = 0; (ii < argc) && (ii < %d); ii++, t = C_block_item (t, 1)) {\n", maxargs);
-  Printf(f->code, "argv[ii] = C_block_item (t, 0);\n");
-  Printf(f->code, "}\n");
-
-  Printv(f->code, dispatch, "\n", NIL);
-  Printf(f->code, "swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE," "\"No matching function for overloaded '%s'\");\n", iname);
-  Printv(f->code, "}\n", NIL);
-  Wrapper_print(f, f_wrappers);
-  addMethod(scmname, wname);
-
-  DelWrapper(f);
-  f = NewWrapper();
-
-  /* varargs */
-  Printv(f->def, "void ", wname, "(C_word, C_word, C_word, ...) C_noret;\n", NIL);
-  Printv(f->def, "void ", wname, "(C_word c, C_word t0, C_word t1, ...) {", NIL);
-  Printv(f->code,
-	 "C_word t2;\n",
-	 "va_list v;\n",
-	 "C_word *a, c2 = c;\n",
-	 "C_save_rest (t1, c2, 2);\n", "a = C_alloc((c-2)*3);\n", "t2 = C_restore_rest (a, C_rest_count (0));\n", "real_", wname, " (3, t0, t1, t2);\n", NIL);
-  Printv(f->code, "}\n", NIL);
-  Wrapper_print(f, f_wrappers);
-
-  /* Now deal with overloaded function when exporting clos */
-  if (clos) {
-    List *flist = Getattr(overload_parameter_lists, scmname);
-    if (flist) {
-      Delattr(overload_parameter_lists, scmname);
-
-      SortList(flist, compareTypeLists);
-
-      String *clos_name;
-      if (have_constructor && !has_constructor_args) {
-	has_constructor_args = 1;
-	constructor_dispatch = NewStringf("%s@SWIG@new@dispatch", short_class_name);
-	clos_name = Copy(constructor_dispatch);
-	Printf(clos_methods, "(declare (hide %s))\n", clos_name);
-      } else if (in_class)
-	clos_name = NewString(member_name);
-      else
-	clos_name = chickenNameMapping(scmname, "");
-
-      Iterator f;
-      List *prev = 0;
-      int all_primitive = 1;
-
-      /* first check for duplicates and an empty call */
-      String *newlist = NewList();
-      for (f = First(flist); f.item; f = Next(f)) {
-	/* check if cur is a duplicate of prev */
-	if (prev && compareTypeListsHelper(f.item, prev, 1) == 0) {
-	  Delete(f.item);
-	} else {
-	  Append(newlist, f.item);
-	  prev = f.item;
-	  Iterator j;
-	  for (j = First(f.item); j.item; j = Next(j)) {
-	    if (Strcmp(j.item, "^^##optional$$") != 0 && Strcmp(j.item, "<top>") != 0)
-	      all_primitive = 0;
-	  }
-	}
-      }
-      Delete(flist);
-      flist = newlist;
-
-      if (all_primitive) {
-	Printf(clos_methods, "(define %s %s)\n", clos_name, chickenPrimitiveName(scmname));
-      } else {
-	for (f = First(flist); f.item; f = Next(f)) {
-	  /* now export clos code for argument */
-	  String *func_call = buildClosFunctionCall(f.item, clos_name, chickenPrimitiveName(scmname));
-	  Printf(clos_methods, "%s\n", func_call);
-	  Delete(f.item);
-	  Delete(func_call);
-	}
-      }
-
-      Delete(clos_name);
-      Delete(flist);
-    }
-  }
-
-  DelWrapper(f);
-  Delete(dispatch);
-  Delete(tmp);
-  Delete(wname);
-}
-
-int CHICKEN::isPointer(SwigType *t) {
-  return SwigType_ispointer(SwigType_typedef_resolve_all(t));
-}
-
-void CHICKEN::addMethod(String *scheme_name, String *function) {
-  String *sym = NewString("");
-  if (clos) {
-    Append(sym, "primitive:");
-  }
-  Append(sym, scheme_name);
-
-  /* add symbol to Chicken internal symbol table */
-  if (hide_primitive) {
-    Printv(f_init, "{\n",
-	   "  C_word *p0 = a;\n", "  *(a++)=C_CLOSURE_TYPE|1;\n", "  *(a++)=(C_word)", function, ";\n", "  C_mutate(return_vec++, (C_word)p0);\n", "}\n", NIL);
-  } else {
-    Printf(f_sym_size, "+C_SIZEOF_INTERNED_SYMBOL(%d)", Len(sym));
-    Printf(f_init, "sym = C_intern (&a, %d, \"%s\");\n", Len(sym), sym);
-    Printv(f_init, "C_mutate ((C_word*)sym+1, (*a=C_CLOSURE_TYPE|1, a[1]=(C_word)", function, ", tmp=(C_word)a, a+=2, tmp));\n", NIL);
-  }
-
-  if (hide_primitive) {
-    Setattr(primitive_names, scheme_name, NewStringf("(vector-ref swig-init-return %i)", num_methods));
-  } else {
-    Setattr(primitive_names, scheme_name, Copy(sym));
-  }
-
-  num_methods++;
-
-  Delete(sym);
-}
-
-String *CHICKEN::chickenPrimitiveName(String *name) {
-  String *value = Getattr(primitive_names, name);
-  if (value)
-    return value;
-  else {
-    Swig_error(input_file, line_number, "Internal Error: attempting to reference non-existant primitive name %s\n", name);
-    return NewString("#f");
-  }
-}
-
-int CHICKEN::validIdentifier(String *s) {
-  char *c = Char(s);
-  /* Check whether we have an R5RS identifier. */
-  /* <identifier> --> <initial> <subsequent>* | <peculiar identifier> */
-  /* <initial> --> <letter> | <special initial> */
-  if (!(isalpha(*c) || (*c == '!') || (*c == '$') || (*c == '%')
-	|| (*c == '&') || (*c == '*') || (*c == '/') || (*c == ':')
-	|| (*c == '<') || (*c == '=') || (*c == '>') || (*c == '?')
-	|| (*c == '^') || (*c == '_') || (*c == '~'))) {
-    /* <peculiar identifier> --> + | - | ... */
-    if ((strcmp(c, "+") == 0)
-	|| strcmp(c, "-") == 0 || strcmp(c, "...") == 0)
-      return 1;
-    else
-      return 0;
-  }
-  /* <subsequent> --> <initial> | <digit> | <special subsequent> */
-  while (*c) {
-    if (!(isalnum(*c) || (*c == '!') || (*c == '$') || (*c == '%')
-	  || (*c == '&') || (*c == '*') || (*c == '/') || (*c == ':')
-	  || (*c == '<') || (*c == '=') || (*c == '>') || (*c == '?')
-	  || (*c == '^') || (*c == '_') || (*c == '~') || (*c == '+')
-	  || (*c == '-') || (*c == '.') || (*c == '@')))
-      return 0;
-    c++;
-  }
-  return 1;
-}
-
-  /* ------------------------------------------------------------
-   * closNameMapping()
-   * Maps the identifier from C++ to the CLOS based on command 
-   * line parameters and such.
-   * If class_name = "" that means the mapping is for a function or
-   * variable not attached to any class.
-   * ------------------------------------------------------------ */
-String *CHICKEN::chickenNameMapping(String *name, const_String_or_char_ptr class_name) {
-  String *n = NewString("");
-
-  if (Strcmp(class_name, "") == 0) {
-    // not part of a class, so no class name to prefix
-    if (clossymnameprefix) {
-      Printf(n, "%s%s", clossymnameprefix, name);
-    } else {
-      Printf(n, "%s", name);
-    }
-  } else {
-    if (useclassprefix) {
-      Printf(n, "%s-%s", class_name, name);
-    } else {
-      if (clossymnameprefix) {
-	Printf(n, "%s%s", clossymnameprefix, name);
-      } else {
-	Printf(n, "%s", name);
-      }
-    }
-  }
-  return n;
-}
-
-String *CHICKEN::runtimeCode() {
-  String *s = Swig_include_sys("chickenrun.swg");
-  if (!s) {
-    Printf(stderr, "*** Unable to open 'chickenrun.swg'\n");
-    s = NewString("");
-  }
-  return s;
-}
-
-String *CHICKEN::defaultExternalRuntimeFilename() {
-  return NewString("swigchickenrun.h");
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/clisp.cxx b/dependencies2013/win32/swig/Source/Modules/clisp.cxx
deleted file mode 100644
index d7f19719..00000000
--- a/dependencies2013/win32/swig/Source/Modules/clisp.cxx
+++ /dev/null
@@ -1,515 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * clisp.cxx
- *
- * clisp language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-static const char *usage = "\
-CLISP Options (available with -clisp)\n\
-     -extern-all       - Create clisp definitions for all the functions and\n\
-                         global variables otherwise only definitions for\n\
-                         externed functions and variables are created.\n\
-     -generate-typedef - Use def-c-type to generate shortcuts according to the\n\
-                         typedefs in the input.\n\
-";
-
-class CLISP:public Language {
-public:
-  File *f_cl;
-  String *module;
-  virtual void main(int argc, char *argv[]);
-  virtual int top(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int variableWrapper(Node *n);
-  virtual int constantWrapper(Node *n);
-  virtual int classDeclaration(Node *n);
-  virtual int enumDeclaration(Node *n);
-  virtual int typedefHandler(Node *n);
-  List *entries;
-private:
-  String *get_ffi_type(Node *n, SwigType *ty);
-  String *convert_literal(String *num_param, String *type);
-  String *strip_parens(String *string);
-  int extern_all_flag;
-  int generate_typedef_flag;
-  int is_function;
-};
-
-void CLISP::main(int argc, char *argv[]) {
-  int i;
-
-  Preprocessor_define("SWIGCLISP 1", 0);
-  SWIG_library_directory("clisp");
-  SWIG_config_file("clisp.swg");
-  generate_typedef_flag = 0;
-  extern_all_flag = 0;
-
-  for (i = 1; i < argc; i++) {
-    if (!strcmp(argv[i], "-help")) {
-      Printf(stdout, "%s\n", usage);
-    } else if ((Strcmp(argv[i], "-extern-all") == 0)) {
-      extern_all_flag = 1;
-      Swig_mark_arg(i);
-    } else if ((Strcmp(argv[i], "-generate-typedef") == 0)) {
-      generate_typedef_flag = 1;
-      Swig_mark_arg(i);
-    }
-  }
-}
-
-int CLISP::top(Node *n) {
-
-  File *f_null = NewString("");
-  module = Getattr(n, "name");
-  String *output_filename;
-  entries = NewList();
-
-  /* Get the output file name */
-  String *outfile = Getattr(n, "outfile");
-
-  if (!outfile) {
-    Printf(stderr, "Unable to determine outfile\n");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  output_filename = NewStringf("%s%s.lisp", SWIG_output_directory(), module);
-
-  f_cl = NewFile(output_filename, "w+", SWIG_output_files());
-  if (!f_cl) {
-    FileErrorDisplay(output_filename);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Swig_register_filebyname("header", f_null);
-  Swig_register_filebyname("begin", f_null);
-  Swig_register_filebyname("runtime", f_null);
-  Swig_register_filebyname("wrapper", f_null);
-
-  String *header = NewString("");
-
-  Swig_banner_target_lang(header, ";;");
-
-  Printf(header, "\n(defpackage :%s\n  (:use :common-lisp :ffi)", module);
-
-  Language::top(n);
-
-  Iterator i;
-
-  long len = Len(entries);
-  if (len > 0) {
-    Printf(header, "\n  (:export");
-  }
-  //else nothing to export
-
-  for (i = First(entries); i.item; i = Next(i)) {
-    Printf(header, "\n\t:%s", i.item);
-  }
-
-  if (len > 0) {
-    Printf(header, ")");
-  }
-
-  Printf(header, ")\n");
-  Printf(header, "\n(in-package :%s)\n", module);
-  Printf(header, "\n(default-foreign-language :stdc)\n");
-
-  len = Tell(f_cl);
-
-  Printf(f_cl, "%s", header);
-
-  long end = Tell(f_cl);
-
-  for (len--; len >= 0; len--) {
-    end--;
-    (void)Seek(f_cl, len, SEEK_SET);
-    int ch = Getc(f_cl);
-    (void)Seek(f_cl, end, SEEK_SET);
-    Putc(ch, f_cl);
-  }
-
-  Seek(f_cl, 0, SEEK_SET);
-  Write(f_cl, Char(header), Len(header));
-
-  Delete(f_cl);
-
-  return SWIG_OK;
-}
-
-
-int CLISP::functionWrapper(Node *n) {
-  is_function = 1;
-  String *storage = Getattr(n, "storage");
-  if (!extern_all_flag && (!storage || (!Swig_storage_isextern(n) && !Swig_storage_isexternc(n))))
-    return SWIG_OK;
-
-  String *func_name = Getattr(n, "sym:name");
-
-  ParmList *pl = Getattr(n, "parms");
-
-  int argnum = 0, first = 1;
-
-  Printf(f_cl, "\n(ffi:def-call-out %s\n\t(:name \"%s\")\n", func_name, func_name);
-
-  Append(entries, func_name);
-
-  if (ParmList_len(pl) != 0) {
-    Printf(f_cl, "\t(:arguments ");
-  }
-  for (Parm *p = pl; p; p = nextSibling(p), argnum++) {
-
-    String *argname = Getattr(p, "name");
-    //    SwigType *argtype;
-
-    String *ffitype = get_ffi_type(n, Getattr(p, "type"));
-
-    int tempargname = 0;
-
-    if (!argname) {
-      argname = NewStringf("arg%d", argnum);
-      tempargname = 1;
-    }
-
-    if (!first) {
-      Printf(f_cl, "\n\t\t");
-    }
-    Printf(f_cl, "(%s %s)", argname, ffitype);
-    first = 0;
-
-    Delete(ffitype);
-
-    if (tempargname)
-      Delete(argname);
-  }
-  if (ParmList_len(pl) != 0) {
-    Printf(f_cl, ")\n");	/* finish arg list */
-  }
-  String *ffitype = get_ffi_type(n, Getattr(n, "type"));
-  if (Strcmp(ffitype, "NIL")) {	//when return type is not nil
-    Printf(f_cl, "\t(:return-type %s)\n", ffitype);
-  }
-  Printf(f_cl, "\t(:library +library-name+))\n");
-
-  return SWIG_OK;
-}
-
-
-int CLISP::constantWrapper(Node *n) {
-  is_function = 0;
-  String *type = Getattr(n, "type");
-  String *converted_value = convert_literal(Getattr(n, "value"), type);
-  String *name = Getattr(n, "sym:name");
-
-  Printf(f_cl, "\n(defconstant %s %s)\n", name, converted_value);
-  Append(entries, name);
-  Delete(converted_value);
-
-  return SWIG_OK;
-}
-
-int CLISP::variableWrapper(Node *n) {
-  is_function = 0;
-  String *storage = Getattr(n, "storage");
-
-  if (!extern_all_flag && (!storage || (!Swig_storage_isextern(n) && !Swig_storage_isexternc(n))))
-    return SWIG_OK;
-
-  String *var_name = Getattr(n, "sym:name");
-  String *lisp_type = get_ffi_type(n, Getattr(n, "type"));
-  Printf(f_cl, "\n(ffi:def-c-var %s\n (:name \"%s\")\n (:type %s)\n", var_name, var_name, lisp_type);
-  Printf(f_cl, "\t(:library +library-name+))\n");
-  Append(entries, var_name);
-
-  Delete(lisp_type);
-  return SWIG_OK;
-}
-
-int CLISP::typedefHandler(Node *n) {
-  if (generate_typedef_flag) {
-    is_function = 0;
-    Printf(f_cl, "\n(ffi:def-c-type %s %s)\n", Getattr(n, "name"), get_ffi_type(n, Getattr(n, "type")));
-  }
-
-  return Language::typedefHandler(n);
-}
-
-int CLISP::enumDeclaration(Node *n) {
-  if (getCurrentClass() && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  is_function = 0;
-  String *name = Getattr(n, "sym:name");
-
-  Printf(f_cl, "\n(ffi:def-c-enum %s ", name);
-
-  for (Node *c = firstChild(n); c; c = nextSibling(c)) {
-
-    String *slot_name = Getattr(c, "name");
-    String *value = Getattr(c, "enumvalue");
-
-    Printf(f_cl, "(%s %s)", slot_name, value);
-
-    Append(entries, slot_name);
-
-    Delete(value);
-  }
-
-  Printf(f_cl, ")\n");
-  return SWIG_OK;
-}
-
-
-// Includes structs
-int CLISP::classDeclaration(Node *n) {
-  is_function = 0;
-  String *name = Getattr(n, "sym:name");
-  String *kind = Getattr(n, "kind");
-
-  if (Strcmp(kind, "struct")) {
-    Printf(stderr, "Don't know how to deal with %s kind of class yet.\n", kind);
-    Printf(stderr, " (name: %s)\n", name);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-
-  Printf(f_cl, "\n(ffi:def-c-struct %s", name);
-
-  Append(entries, NewStringf("make-%s", name));
-
-  for (Node *c = firstChild(n); c; c = nextSibling(c)) {
-
-    if (Strcmp(nodeType(c), "cdecl")) {
-      Printf(stderr, "Structure %s has a slot that we can't deal with.\n", name);
-      Printf(stderr, "nodeType: %s, name: %s, type: %s\n", nodeType(c), Getattr(c, "name"), Getattr(c, "type"));
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    String *temp = Copy(Getattr(c, "decl"));
-    if (temp) {
-      Append(temp, Getattr(c, "type"));	//appending type to the end, otherwise wrong type
-      String *lisp_type = get_ffi_type(n, temp);
-      Delete(temp);
-
-      String *slot_name = Getattr(c, "sym:name");
-      Printf(f_cl, "\n\t(%s %s)", slot_name, lisp_type);
-
-      Append(entries, NewStringf("%s-%s", name, slot_name));
-
-      Delete(lisp_type);
-    }
-  }
-
-  Printf(f_cl, ")\n");
-
-  /* Add this structure to the known lisp types */
-  //Printf(stdout, "Adding %s foreign type\n", name);
-  //  add_defined_foreign_type(name);
-
-  return SWIG_OK;
-}
-
-/* utilities */
-/* returns new string w/ parens stripped */
-String *CLISP::strip_parens(String *string) {
-  char *s = Char(string), *p;
-  int len = Len(string);
-  String *res;
-
-  if (len == 0 || s[0] != '(' || s[len - 1] != ')') {
-    return NewString(string);
-  }
-
-  p = (char *) malloc(len - 2 + 1);
-  if (!p) {
-    Printf(stderr, "Malloc failed\n");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  strncpy(p, s + 1, len - 1);
-  p[len - 2] = 0;		/* null terminate */
-
-  res = NewString(p);
-  free(p);
-
-  return res;
-}
-
-String *CLISP::convert_literal(String *num_param, String *type) {
-  String *num = strip_parens(num_param), *res;
-  char *s = Char(num);
-
-  /* Make sure doubles use 'd' instead of 'e' */
-  if (!Strcmp(type, "double")) {
-    String *updated = Copy(num);
-    if (Replace(updated, "e", "d", DOH_REPLACE_ANY) > 1) {
-      Printf(stderr, "Weird!! number %s looks invalid.\n", num);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Delete(num);
-    return updated;
-  }
-
-  if (SwigType_type(type) == T_CHAR) {
-    /* Use CL syntax for character literals */
-    return NewStringf("#\\%s", num_param);
-  } else if (SwigType_type(type) == T_STRING) {
-    /* Use CL syntax for string literals */
-    return NewStringf("\"%s\"", num_param);
-  }
-
-  if (Len(num) < 2 || s[0] != '0') {
-    return num;
-  }
-
-  /* octal or hex */
-
-  res = NewStringf("#%c%s", s[1] == 'x' ? 'x' : 'o', s + 2);
-  Delete(num);
-
-  return res;
-}
-
-String *CLISP::get_ffi_type(Node *n, SwigType *ty) {
-  Node *node = NewHash();
-  Setattr(node, "type", ty);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *tm = Swig_typemap_lookup("in", node, "", 0);
-  Delete(node);
-
-  if (tm) {
-    return NewString(tm);
-  } else if (SwigType_ispointer(ty)) {
-    SwigType *cp = Copy(ty);
-    SwigType_del_pointer(cp);
-    String *inner_type = get_ffi_type(n, cp);
-
-    if (SwigType_isfunction(cp)) {
-      return inner_type;
-    }
-
-    SwigType *base = SwigType_base(ty);
-    String *base_name = SwigType_str(base, 0);
-
-    String *str;
-    if (!Strcmp(base_name, "int") || !Strcmp(base_name, "float") || !Strcmp(base_name, "short")
-	|| !Strcmp(base_name, "double") || !Strcmp(base_name, "long") || !Strcmp(base_name, "char")) {
-
-      str = NewStringf("(ffi:c-ptr %s)", inner_type);
-    } else {
-      str = NewStringf("(ffi:c-pointer %s)", inner_type);
-    }
-    Delete(base_name);
-    Delete(base);
-    Delete(cp);
-    Delete(inner_type);
-    return str;
-  } else if (SwigType_isarray(ty)) {
-    SwigType *cp = Copy(ty);
-    String *array_dim = SwigType_array_getdim(ty, 0);
-
-    if (!Strcmp(array_dim, "")) {	//dimension less array convert to pointer
-      Delete(array_dim);
-      SwigType_del_array(cp);
-      SwigType_add_pointer(cp);
-      String *str = get_ffi_type(n, cp);
-      Delete(cp);
-      return str;
-    } else {
-      SwigType_pop_arrays(cp);
-      String *inner_type = get_ffi_type(n, cp);
-      Delete(cp);
-
-      int ndim = SwigType_array_ndim(ty);
-      String *dimension;
-      if (ndim == 1) {
-	dimension = array_dim;
-      } else {
-	dimension = array_dim;
-	for (int i = 1; i < ndim; i++) {
-	  array_dim = SwigType_array_getdim(ty, i);
-	  Append(dimension, " ");
-	  Append(dimension, array_dim);
-	  Delete(array_dim);
-	}
-	String *temp = dimension;
-	dimension = NewStringf("(%s)", dimension);
-	Delete(temp);
-      }
-      String *str;
-      if (is_function)
-	str = NewStringf("(ffi:c-ptr (ffi:c-array %s %s))", inner_type, dimension);
-      else
-	str = NewStringf("(ffi:c-array %s %s)", inner_type, dimension);
-
-      Delete(inner_type);
-      Delete(dimension);
-      return str;
-    }
-  } else if (SwigType_isfunction(ty)) {
-    SwigType *cp = Copy(ty);
-    SwigType *fn = SwigType_pop_function(cp);
-    String *args = NewString("");
-    ParmList *pl = SwigType_function_parms(fn, n);
-    if (ParmList_len(pl) != 0) {
-      Printf(args, "(:arguments ");
-    }
-    int argnum = 0, first = 1;
-    for (Parm *p = pl; p; p = nextSibling(p), argnum++) {
-      String *argname = Getattr(p, "name");
-      SwigType *argtype = Getattr(p, "type");
-      String *ffitype = get_ffi_type(n, argtype);
-
-      int tempargname = 0;
-
-      if (!argname) {
-	argname = NewStringf("arg%d", argnum);
-	tempargname = 1;
-      }
-      if (!first) {
-	Printf(args, "\n\t\t");
-      }
-      Printf(args, "(%s %s)", argname, ffitype);
-      first = 0;
-      Delete(ffitype);
-      if (tempargname)
-	Delete(argname);
-    }
-    if (ParmList_len(pl) != 0) {
-      Printf(args, ")\n");	/* finish arg list */
-    }
-    String *ffitype = get_ffi_type(n, cp);
-    String *str = NewStringf("(ffi:c-function %s \t\t\t\t(:return-type %s))", args, ffitype);
-    Delete(fn);
-    Delete(args);
-    Delete(cp);
-    Delete(ffitype);
-    return str;
-  }
-  String *str = SwigType_str(ty, 0);
-  if (str) {
-    char *st = Strstr(str, "struct");
-    if (st) {
-      st += 7;
-      return NewString(st);
-    }
-    char *cl = Strstr(str, "class");
-    if (cl) {
-      cl += 6;
-      return NewString(cl);
-    }
-  }
-  return str;
-}
-
-extern "C" Language *swig_clisp(void) {
-  return new CLISP();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/contract.cxx b/dependencies2013/win32/swig/Source/Modules/contract.cxx
deleted file mode 100644
index 7e0eaf9e..00000000
--- a/dependencies2013/win32/swig/Source/Modules/contract.cxx
+++ /dev/null
@@ -1,358 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * contract.cxx
- *
- * Support for Wrap by Contract in SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-/* Contract structure.  This holds rules about the different kinds of contract sections
-   and their combination rules */
-
-struct contract {
-  const char *section;
-  const char *combiner;
-};
-/* Contract rules.  This table defines what contract sections are recognized as well as
-   how contracts are to combined via inheritance */
-
-static contract Rules[] = {
-  {"require:", "&&"},
-  {"ensure:", "||"},
-  {NULL, NULL}
-};
-
-/* ----------------------------------------------------------------------------
- * class Contracts:
- *
- * This class defines the functions that need to be used in 
- *         "wrap by contract" module.
- * ------------------------------------------------------------------------- */
-
-class Contracts:public Dispatcher {
-  String *make_expression(String *s, Node *n);
-  void substitute_parms(String *s, ParmList *p, int method);
-public:
-  Hash *ContractSplit(Node *n);
-  int emit_contract(Node *n, int method);
-  int cDeclaration(Node *n);
-  int constructorDeclaration(Node *n);
-  int externDeclaration(Node *n);
-  int extendDirective(Node *n);
-  int importDirective(Node *n);
-  int includeDirective(Node *n);
-  int namespaceDeclaration(Node *n);
-  int classDeclaration(Node *n);
-  virtual int top(Node *n);
-};
-
-static int Contract_Mode = 0;	/* contract option */
-static int InClass = 0;		/* Parsing C++ or not */
-static int InConstructor = 0;
-static Node *CurrentClass = 0;
-
-/* Set the contract mode, default is 0 (not open) */
-/* Normally set in main.cxx, when get the "-contracts" option */
-void Swig_contract_mode_set(int flag) {
-  Contract_Mode = flag;
-}
-
-/* Get the contract mode */
-int Swig_contract_mode_get() {
-  return Contract_Mode;
-}
-
-/* Apply contracts */
-void Swig_contracts(Node *n) {
-
-  Contracts *a = new Contracts;
-  a->top(n);
-  delete a;
-}
-
-/* Split the whole contract into preassertion, postassertion and others */
-Hash *Contracts::ContractSplit(Node *n) {
-
-  String *contract = Getattr(n, "feature:contract");
-  Hash *result;
-  if (!contract)
-    return NULL;
-
-  result = NewHash();
-  String *current_section = NewString("");
-  const char *current_section_name = Rules[0].section;
-  List *l = SplitLines(contract);
-
-  Iterator i;
-  for (i = First(l); i.item; i = Next(i)) {
-    int found = 0;
-    if (Strchr(i.item, '{'))
-      continue;
-    if (Strchr(i.item, '}'))
-      continue;
-    for (int j = 0; Rules[j].section; j++) {
-      if (Strstr(i.item, Rules[j].section)) {
-	if (Len(current_section)) {
-	  Setattr(result, current_section_name, current_section);
-	  current_section = Getattr(result, Rules[j].section);
-	  if (!current_section)
-	    current_section = NewString("");
-	}
-	current_section_name = Rules[j].section;
-	found = 1;
-	break;
-      }
-    }
-    if (!found)
-      Append(current_section, i.item);
-  }
-  if (Len(current_section))
-    Setattr(result, current_section_name, current_section);
-  return result;
-}
-
-/* This function looks in base classes and collects contracts found */
-void inherit_contracts(Node *c, Node *n, Hash *contracts, Hash *messages) {
-
-  Node *b, *temp;
-  String *name, *type, *local_decl, *base_decl;
-  List *bases;
-  int found = 0;
-
-  bases = Getattr(c, "bases");
-  if (!bases)
-    return;
-
-  name = Getattr(n, "name");
-  type = Getattr(n, "type");
-  local_decl = Getattr(n, "decl");
-  if (local_decl) {
-    local_decl = SwigType_typedef_resolve_all(local_decl);
-  } else {
-    return;
-  }
-  /* Width first search */
-  for (int i = 0; i < Len(bases); i++) {
-    b = Getitem(bases, i);
-    temp = firstChild(b);
-    while (temp) {
-      base_decl = Getattr(temp, "decl");
-      if (base_decl) {
-	base_decl = SwigType_typedef_resolve_all(base_decl);
-	if ((checkAttribute(temp, "storage", "virtual")) &&
-	    (checkAttribute(temp, "name", name)) && (checkAttribute(temp, "type", type)) && (!Strcmp(local_decl, base_decl))) {
-	  /* Yes, match found. */
-	  Hash *icontracts = Getattr(temp, "contract:rules");
-	  Hash *imessages = Getattr(temp, "contract:messages");
-	  found = 1;
-	  if (icontracts && imessages) {
-	    /* Add inherited contracts and messages to the contract rules above */
-	    int j = 0;
-	    for (j = 0; Rules[j].section; j++) {
-	      String *t = Getattr(contracts, Rules[j].section);
-	      String *s = Getattr(icontracts, Rules[j].section);
-	      if (s) {
-		if (t) {
-		  Insert(t, 0, "(");
-		  Printf(t, ") %s (%s)", Rules[j].combiner, s);
-		  String *m = Getattr(messages, Rules[j].section);
-		  Printf(m, " %s [%s from %s]", Rules[j].combiner, Getattr(imessages, Rules[j].section), Getattr(b, "name"));
-		} else {
-		  Setattr(contracts, Rules[j].section, NewString(s));
-		  Setattr(messages, Rules[j].section, NewStringf("[%s from %s]", Getattr(imessages, Rules[j].section), Getattr(b, "name")));
-		}
-	      }
-	    }
-	  }
-	}
-	Delete(base_decl);
-      }
-      temp = nextSibling(temp);
-    }
-  }
-  Delete(local_decl);
-  if (!found) {
-    for (int j = 0; j < Len(bases); j++) {
-      b = Getitem(bases, j);
-      inherit_contracts(b, n, contracts, messages);
-    }
-  }
-}
-
-/* This function cleans up the assertion string by removing some extraneous characters.
-   Splitting the assertion into pieces */
-
-String *Contracts::make_expression(String *s, Node *n) {
-  String *str_assert, *expr = 0;
-  List *list_assert;
-
-  str_assert = NewString(s);
-  /* Omit all useless characters and split by ; */
-  Replaceall(str_assert, "\n", "");
-  Replaceall(str_assert, "{", "");
-  Replaceall(str_assert, "}", "");
-  Replace(str_assert, " ", "", DOH_REPLACE_ANY | DOH_REPLACE_NOQUOTE);
-  Replace(str_assert, "\t", "", DOH_REPLACE_ANY | DOH_REPLACE_NOQUOTE);
-
-  list_assert = Split(str_assert, ';', -1);
-  Delete(str_assert);
-
-  /* build up new assertion */
-  str_assert = NewString("");
-  Iterator ei;
-
-  for (ei = First(list_assert); ei.item; ei = Next(ei)) {
-    expr = ei.item;
-    if (Len(expr)) {
-      Replaceid(expr, Getattr(n, "name"), Swig_cresult_name());
-      if (Len(str_assert))
-	Append(str_assert, "&&");
-      Printf(str_assert, "(%s)", expr);
-    }
-  }
-  Delete(list_assert);
-  return str_assert;
-}
-
-/* This function substitutes parameter names for argument names in the
-   contract specification.  Note: it is assumed that the wrapper code 
-   uses arg1 for self and arg2..argn for arguments. */
-
-void Contracts::substitute_parms(String *s, ParmList *p, int method) {
-  int argnum = 1;
-  char argname[32];
-
-  if (method) {
-    Replaceid(s, "$self", "arg1");
-    argnum++;
-  }
-  while (p) {
-    sprintf(argname, "arg%d", argnum);
-    String *name = Getattr(p, "name");
-    if (name) {
-      Replaceid(s, name, argname);
-    }
-    argnum++;
-    p = nextSibling(p);
-  }
-}
-
-int Contracts::emit_contract(Node *n, int method) {
-  Hash *contracts;
-  Hash *messages;
-  String *c;
-
-  ParmList *cparms;
-
-  if (!Getattr(n, "feature:contract"))
-    return SWIG_ERROR;
-
-  /* Get contract parameters */
-  cparms = Getmeta(Getattr(n, "feature:contract"), "parms");
-
-  /*  Split contract into preassert & postassert */
-  contracts = ContractSplit(n);
-  if (!contracts)
-    return SWIG_ERROR;
-
-  /* This messages hash is used to hold the error messages that will be displayed on
-     failed contract. */
-
-  messages = NewHash();
-
-  /* Take the different contract expressions and clean them up a bit */
-  Iterator i;
-  for (i = First(contracts); i.item; i = Next(i)) {
-    String *e = make_expression(i.item, n);
-    substitute_parms(e, cparms, method);
-    Setattr(contracts, i.key, e);
-
-    /* Make a string containing error messages */
-    Setattr(messages, i.key, NewString(e));
-  }
-
-  /* If we're in a class. We need to inherit other assertions. */
-  if (InClass) {
-    inherit_contracts(CurrentClass, n, contracts, messages);
-  }
-
-  /* Save information */
-  Setattr(n, "contract:rules", contracts);
-  Setattr(n, "contract:messages", messages);
-
-  /* Okay.  Generate the contract runtime code. */
-
-  if ((c = Getattr(contracts, "require:"))) {
-    Setattr(n, "contract:preassert", NewStringf("SWIG_contract_assert(%s, \"Contract violation: require: %s\");\n", c, Getattr(messages, "require:")));
-  }
-  if ((c = Getattr(contracts, "ensure:"))) {
-    Setattr(n, "contract:postassert", NewStringf("SWIG_contract_assert(%s, \"Contract violation: ensure: %s\");\n", c, Getattr(messages, "ensure:")));
-  }
-  return SWIG_OK;
-}
-
-int Contracts::cDeclaration(Node *n) {
-  int ret = SWIG_OK;
-  String *decl = Getattr(n, "decl");
-
-  /* Not a function.  Don't even bother with it (for now) */
-  if (!SwigType_isfunction(decl))
-    return SWIG_OK;
-
-  if (Getattr(n, "feature:contract"))
-    ret = emit_contract(n, InClass && !Swig_storage_isstatic(n));
-  return ret;
-}
-
-int Contracts::constructorDeclaration(Node *n) {
-  int ret = SWIG_OK;
-  InConstructor = 1;
-  if (Getattr(n, "feature:contract"))
-    ret = emit_contract(n, 0);
-  InConstructor = 0;
-  return ret;
-}
-
-int Contracts::externDeclaration(Node *n) {
-  return emit_children(n);
-}
-
-int Contracts::extendDirective(Node *n) {
-  return emit_children(n);
-}
-
-int Contracts::importDirective(Node *n) {
-  return emit_children(n);
-}
-
-int Contracts::includeDirective(Node *n) {
-  return emit_children(n);
-}
-
-int Contracts::namespaceDeclaration(Node *n) {
-  return emit_children(n);
-}
-
-int Contracts::classDeclaration(Node *n) {
-  int ret = SWIG_OK;
-  int oldInClass = InClass;
-  Node *oldClass = CurrentClass;
-  InClass = 1;
-  CurrentClass = n;
-  emit_children(n);
-  InClass = oldInClass;
-  CurrentClass = oldClass;
-  return ret;
-}
-
-int Contracts::top(Node *n) {
-  emit_children(n);
-  return SWIG_OK;
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/csharp.cxx b/dependencies2013/win32/swig/Source/Modules/csharp.cxx
deleted file mode 100644
index 423c5a45..00000000
--- a/dependencies2013/win32/swig/Source/Modules/csharp.cxx
+++ /dev/null
@@ -1,4570 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * csharp.cxx
- *
- * C# language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include <limits.h>		// for INT_MAX
-#include "cparse.h"
-#include <ctype.h>
-
-/* Hash type used for upcalls from C/C++ */
-typedef DOH UpcallData;
-
-class CSHARP:public Language {
-  static const char *usage;
-  const String *empty_string;
-  const String *public_string;
-  const String *protected_string;
-
-  Hash *swig_types_hash;
-  File *f_begin;
-  File *f_runtime;
-  File *f_runtime_h;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-  File *f_directors;
-  File *f_directors_h;
-  File *f_single_out;
-  List *filenames_list;
-
-  bool proxy_flag;		// Flag for generating proxy classes
-  bool native_function_flag;	// Flag for when wrapping a native function
-  bool enum_constant_flag;	// Flag for when wrapping an enum or constant
-  bool static_flag;		// Flag for when wrapping a static functions or member variables
-  bool variable_wrapper_flag;	// Flag for when wrapping a nonstatic member variable
-  bool wrapping_member_flag;	// Flag for when wrapping a member variable/enum/const
-  bool global_variable_flag;	// Flag for when wrapping a global variable
-  bool old_variable_names;	// Flag for old style variable names in the intermediary class
-  bool generate_property_declaration_flag;	// Flag for generating properties
-
-  String *imclass_name;		// intermediary class name
-  String *module_class_name;	// module class name
-  String *imclass_class_code;	// intermediary class code
-  String *proxy_class_def;
-  String *proxy_class_code;
-  String *interface_class_code; // if %feature("interface") was declared for a class, here goes the interface declaration
-  String *module_class_code;
-  String *proxy_class_name;	// proxy class name
-  String *full_imclass_name;	// fully qualified intermediary class name when using nspace feature, otherwise same as imclass_name
-  String *variable_name;	//Name of a variable being wrapped
-  String *proxy_class_constants_code;
-  String *module_class_constants_code;
-  String *enum_code;
-  String *dllimport;		// DllImport attribute name
-  String *namespce;		// Optional namespace name
-  String *imclass_imports;	//intermediary class imports from %pragma
-  String *module_imports;	//module imports from %pragma
-  String *imclass_baseclass;	//inheritance for intermediary class class from %pragma
-  String *module_baseclass;	//inheritance for module class from %pragma
-  String *imclass_interfaces;	//interfaces for intermediary class class from %pragma
-  String *module_interfaces;	//interfaces for module class from %pragma
-  String *imclass_class_modifiers;	//class modifiers for intermediary class overriden by %pragma
-  String *module_class_modifiers;	//class modifiers for module class overriden by %pragma
-  String *upcasts_code;		//C++ casts for inheritance hierarchies C++ code
-  String *imclass_cppcasts_code;	//C++ casts up inheritance hierarchies intermediary class code
-  String *director_callback_typedefs;	// Director function pointer typedefs for callbacks
-  String *director_callbacks;	// Director callback function pointer member variables
-  String *director_delegate_callback;	// Director callback method that delegates are set to call
-  String *director_delegate_definitions;	// Director delegates definitions in proxy class
-  String *director_delegate_instances;	// Director delegates member variables in proxy class
-  String *director_method_types;	// Director method types
-  String *director_connect_parms;	// Director delegates parameter list for director connect call
-  String *destructor_call;	//C++ destructor call if any
-  String *output_file;		// File name for single file mode. If set all generated code will be written to this file
-
-  // Director method stuff:
-  List *dmethods_seq;
-  Hash *dmethods_table;
-  int n_dmethods;
-  int n_directors;
-  int first_class_dmethod;
-  int curr_class_dmethod;
-  int nesting_depth;
-
-  enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum };
-
-public:
-
-  /* -----------------------------------------------------------------------------
-   * CSHARP()
-   * ----------------------------------------------------------------------------- */
-
-   CSHARP():empty_string(NewString("")),
-      public_string(NewString("public")),
-      protected_string(NewString("protected")),
-      swig_types_hash(NULL),
-      f_begin(NULL),
-      f_runtime(NULL),
-      f_runtime_h(NULL),
-      f_header(NULL),
-      f_wrappers(NULL),
-      f_init(NULL),
-      f_directors(NULL),
-      f_directors_h(NULL),
-      f_single_out(NULL),
-      filenames_list(NULL),
-      proxy_flag(true),
-      native_function_flag(false),
-      enum_constant_flag(false),
-      static_flag(false),
-      variable_wrapper_flag(false),
-      wrapping_member_flag(false),
-      global_variable_flag(false),
-      old_variable_names(false),
-      generate_property_declaration_flag(false),
-      imclass_name(NULL),
-      module_class_name(NULL),
-      imclass_class_code(NULL),
-      proxy_class_def(NULL),
-      proxy_class_code(NULL),
-      interface_class_code(NULL),
-      module_class_code(NULL),
-      proxy_class_name(NULL),
-      full_imclass_name(NULL),
-      variable_name(NULL),
-      proxy_class_constants_code(NULL),
-      module_class_constants_code(NULL),
-      enum_code(NULL),
-      dllimport(NULL),
-      namespce(NULL),
-      imclass_imports(NULL),
-      module_imports(NULL),
-      imclass_baseclass(NULL),
-      module_baseclass(NULL),
-      imclass_interfaces(NULL),
-      module_interfaces(NULL),
-      imclass_class_modifiers(NULL),
-      module_class_modifiers(NULL),
-      upcasts_code(NULL),
-      imclass_cppcasts_code(NULL),
-      director_callback_typedefs(NULL),
-      director_callbacks(NULL),
-      director_delegate_callback(NULL),
-      director_delegate_definitions(NULL),
-      director_delegate_instances(NULL),
-      director_method_types(NULL),
-      director_connect_parms(NULL),
-      destructor_call(NULL),
-      output_file(NULL),
-      dmethods_seq(NULL),
-      dmethods_table(NULL),
-      n_dmethods(0),
-      n_directors(0),
-      first_class_dmethod(0),
-      curr_class_dmethod(0),
-      nesting_depth(0){
-    /* for now, multiple inheritance in directors is disabled, this
-       should be easy to implement though */
-    director_multiple_inheritance = 0;
-    director_language = 1;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getProxyName()
-   *
-   * Test to see if a type corresponds to something wrapped with a proxy class.
-   * Return NULL if not otherwise the proxy class name, fully qualified with
-   * a namespace if the nspace feature is used.
-   * ----------------------------------------------------------------------------- */
-  
-   String *getProxyName(SwigType *t) {
-     String *proxyname = NULL;
-     if (proxy_flag) {
-       Node *n = classLookup(t);
-       if (n) {
-	 proxyname = Getattr(n, "proxyname");
-	 if (!proxyname) {
-	   String *nspace = Getattr(n, "sym:nspace");
-	   String *symname = Copy(Getattr(n, "sym:name"));
-	   if (symname && !GetFlag(n, "feature:flatnested")) {
-	     for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) {
-               if (String* name = Getattr(outer_class, "sym:name")) {
-                 Push(symname, ".");
-                 Push(symname, name);
-               }
-               else
-                 return NULL;
-	     }
-	   }
-	   if (nspace) {
-	     if (namespce)
-	       proxyname = NewStringf("%s.%s.%s", namespce, nspace, symname);
-	     else
-	       proxyname = NewStringf("%s.%s", nspace, symname);
-	   } else {
-	     proxyname = Copy(symname);
-	   }
-	   Setattr(n, "proxyname", proxyname);
-	   Delete(proxyname);
-	   Delete(symname);
-	 }
-       }
-     }
-     return proxyname;
-   }
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-
-    SWIG_library_directory("csharp");
-
-    // Look for certain command line options
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-dllimport") == 0) {
-	  if (argv[i + 1]) {
-	    dllimport = NewString("");
-	    Printf(dllimport, argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-namespace") == 0) {
-	  if (argv[i + 1]) {
-	    namespce = NewString("");
-	    Printf(namespce, argv[i + 1]);
-	    if (Len(namespce) == 0) {
-	      Delete(namespce);
-	      namespce = 0;
-	    }
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if ((strcmp(argv[i], "-noproxy") == 0)) {
-	  Swig_mark_arg(i);
-	  proxy_flag = false;
-	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
-	  Swig_mark_arg(i);
-	  old_variable_names = true;
-	} else if (strcmp(argv[i], "-outfile") == 0) {
-	  if (argv[i + 1]) {
-	    output_file = NewString("");
-	    Printf(output_file, argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  Printf(stdout, "%s\n", usage);
-	}
-      }
-    }
-
-    // Add a symbol to the parser for conditional compilation
-    Preprocessor_define("SWIGCSHARP 1", 0);
-
-    // Add typemap definitions
-    SWIG_typemap_lang("csharp");
-    SWIG_config_file("csharp.swg");
-
-    allow_overloading();
-    Swig_interface_feature_enable();
-  }
-
-  /* ---------------------------------------------------------------------
-   * top()
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-
-    // Get any options set in the module directive
-    Node *optionsnode = Getattr(Getattr(n, "module"), "options");
-
-    if (optionsnode) {
-      if (Getattr(optionsnode, "imclassname"))
-	imclass_name = Copy(Getattr(optionsnode, "imclassname"));
-      /* check if directors are enabled for this module.  note: this 
-       * is a "master" switch, without which no director code will be
-       * emitted.  %feature("director") statements are also required
-       * to enable directors for individual classes or methods.
-       *
-       * use %module(directors="1") modulename at the start of the 
-       * interface file to enable director generation.
-       */
-      if (Getattr(optionsnode, "directors")) {
-	allow_directors();
-      }
-      if (Getattr(optionsnode, "dirprot")) {
-	allow_dirprot();
-      }
-      allow_allprotected(GetFlag(optionsnode, "allprotected"));
-    }
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    if (!outfile) {
-      Printf(stderr, "Unable to determine outfile\n");
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    if (directorsEnabled()) {
-      if (!outfile_h) {
-        Printf(stderr, "Unable to determine outfile_h\n");
-        SWIG_exit(EXIT_FAILURE);
-      }
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    swig_types_hash = NewHash();
-    filenames_list = NewList();
-
-    // Make the intermediary class and module class names. The intermediary class name can be set in the module directive.
-    if (!imclass_name) {
-      imclass_name = NewStringf("%sPINVOKE", Getattr(n, "name"));
-      module_class_name = Copy(Getattr(n, "name"));
-    } else {
-      // Rename the module name if it is the same as intermediary class name - a backwards compatibility solution
-      if (Cmp(imclass_name, Getattr(n, "name")) == 0)
-	module_class_name = NewStringf("%sModule", Getattr(n, "name"));
-      else
-	module_class_name = Copy(Getattr(n, "name"));
-    }
-
-    // module class and intermediary classes are always created
-    if (!addSymbol(imclass_name, n))
-      return SWIG_ERROR;
-    if (!addSymbol(module_class_name, n))
-      return SWIG_ERROR;
-
-    imclass_class_code = NewString("");
-    proxy_class_def = NewString("");
-    proxy_class_code = NewString("");
-    module_class_constants_code = NewString("");
-    imclass_baseclass = NewString("");
-    imclass_interfaces = NewString("");
-    imclass_class_modifiers = NewString("");
-    module_class_code = NewString("");
-    module_baseclass = NewString("");
-    module_interfaces = NewString("");
-    module_imports = NewString("");
-    module_class_modifiers = NewString("");
-    imclass_imports = NewString("");
-    imclass_cppcasts_code = NewString("");
-    director_connect_parms = NewString("");
-    upcasts_code = NewString("");
-    dmethods_seq = NewList();
-    dmethods_table = NewHash();
-    n_dmethods = 0;
-    n_directors = 0;
-    if (!dllimport)
-      dllimport = Copy(module_class_name);
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGCSHARP\n#define SWIGCSHARP\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-
-      /* Emit initial director header and director code: */
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name);
-
-      Printf(f_directors, "\n\n");
-      Printf(f_directors, "/* ---------------------------------------------------\n");
-      Printf(f_directors, " * C++ director class methods\n");
-      Printf(f_directors, " * --------------------------------------------------- */\n\n");
-      if (outfile_h) {
-	String *filename = Swig_file_filename(outfile_h);
-	Printf(f_directors, "#include \"%s\"\n\n", filename);
-	Delete(filename);
-      }
-    }
-
-    Printf(f_runtime, "\n");
-    if (namespce) {
-      String *wrapper_name = NewStringf("");
-      Printf(wrapper_name, "CSharp_%s_%%f", namespce);
-      Swig_name_register("wrapper", wrapper_name);
-      Delete(wrapper_name);
-    }
-    else {
-      Swig_name_register("wrapper", "CSharp_%f");
-    }
-
-    if (old_variable_names) {
-      Swig_name_register("set", "set_%n%v");
-      Swig_name_register("get", "get_%n%v");
-    }
-
-    Printf(f_wrappers, "\n#ifdef __cplusplus\n");
-    Printf(f_wrappers, "extern \"C\" {\n");
-    Printf(f_wrappers, "#endif\n\n");
-
-    /* Emit code */
-    Language::top(n);
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (make it occur before %header section)
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-    // Generate the intermediary class
-    {
-      File *f_im = getOutputFile(SWIG_output_directory(), imclass_name);
-
-      addOpenNamespace(0, f_im);
-
-      if (imclass_imports)
-	Printf(f_im, "%s\n", imclass_imports);
-
-      if (Len(imclass_class_modifiers) > 0)
-	Printf(f_im, "%s ", imclass_class_modifiers);
-      Printf(f_im, "%s ", imclass_name);
-
-      if (imclass_baseclass && *Char(imclass_baseclass))
-	Printf(f_im, ": %s ", imclass_baseclass);
-      if (Len(imclass_interfaces) > 0)
-	Printv(f_im, "implements ", imclass_interfaces, " ", NIL);
-      Printf(f_im, "{\n");
-
-      // Add the intermediary class methods
-      Replaceall(imclass_class_code, "$module", module_class_name);
-      Replaceall(imclass_class_code, "$imclassname", imclass_name);
-      Replaceall(imclass_class_code, "$dllimport", dllimport);
-      Printv(f_im, imclass_class_code, NIL);
-      Printv(f_im, imclass_cppcasts_code, NIL);
-
-      // Finish off the class
-      Printf(f_im, "}\n");
-      addCloseNamespace(0, f_im);
-
-      if (f_im != f_single_out)
-	Delete(f_im);
-      f_im = NULL;
-    }
-
-    // Generate the C# module class
-    {
-      File *f_module = getOutputFile(SWIG_output_directory(), module_class_name);
-
-      addOpenNamespace(0, f_module);
-
-      if (module_imports)
-	Printf(f_module, "%s\n", module_imports);
-
-      if (Len(module_class_modifiers) > 0)
-	Printf(f_module, "%s ", module_class_modifiers);
-      Printf(f_module, "%s ", module_class_name);
-
-      if (module_baseclass && *Char(module_baseclass))
-	Printf(f_module, ": %s ", module_baseclass);
-      if (Len(module_interfaces) > 0)
-	Printv(f_module, "implements ", module_interfaces, " ", NIL);
-      Printf(f_module, "{\n");
-
-      Replaceall(module_class_code, "$module", module_class_name);
-      Replaceall(module_class_constants_code, "$module", module_class_name);
-
-      Replaceall(module_class_code, "$imclassname", imclass_name);
-      Replaceall(module_class_constants_code, "$imclassname", imclass_name);
-
-      Replaceall(module_class_code, "$dllimport", dllimport);
-      Replaceall(module_class_constants_code, "$dllimport", dllimport);
-
-      // Add the wrapper methods
-      Printv(f_module, module_class_code, NIL);
-
-      // Write out all the global constants
-      Printv(f_module, module_class_constants_code, NIL);
-
-      // Finish off the class
-      Printf(f_module, "}\n");
-      addCloseNamespace(0, f_module);
-
-      if (f_module != f_single_out)
-	Delete(f_module);
-      f_module = NULL;
-    }
-
-    if (upcasts_code)
-      Printv(f_wrappers, upcasts_code, NIL);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "}\n");
-    Printf(f_wrappers, "#endif\n");
-
-    // Output a C# type wrapper class for each SWIG type
-    for (Iterator swig_type = First(swig_types_hash); swig_type.key; swig_type = Next(swig_type)) {
-      emitTypeWrapperClass(swig_type.key, swig_type.item);
-    }
-
-    // Check for overwriting file problems on filesystems that are case insensitive
-    Iterator it1;
-    Iterator it2;
-    for (it1 = First(filenames_list); it1.item; it1 = Next(it1)) {
-      String *item1_lower = Swig_string_lower(it1.item);
-      for (it2 = Next(it1); it2.item; it2 = Next(it2)) {
-	String *item2_lower = Swig_string_lower(it2.item);
-	if (it1.item && it2.item) {
-	  if (Strcmp(item1_lower, item2_lower) == 0) {
-	    Swig_warning(WARN_LANG_PORTABILITY_FILENAME, input_file, line_number,
-			 "Portability warning: File %s will be overwritten by %s on case insensitive filesystems such as "
-			 "Windows' FAT32 and NTFS unless the class/module name is renamed\n", it1.item, it2.item);
-	  }
-	}
-	Delete(item2_lower);
-      }
-      Delete(item1_lower);
-    }
-
-    Delete(swig_types_hash);
-    swig_types_hash = NULL;
-    Delete(filenames_list);
-    filenames_list = NULL;
-    Delete(imclass_name);
-    imclass_name = NULL;
-    Delete(imclass_class_code);
-    imclass_class_code = NULL;
-    Delete(proxy_class_def);
-    proxy_class_def = NULL;
-    Delete(proxy_class_code);
-    proxy_class_code = NULL;
-    Delete(module_class_constants_code);
-    module_class_constants_code = NULL;
-    Delete(imclass_baseclass);
-    imclass_baseclass = NULL;
-    Delete(imclass_interfaces);
-    imclass_interfaces = NULL;
-    Delete(imclass_class_modifiers);
-    imclass_class_modifiers = NULL;
-    Delete(module_class_name);
-    module_class_name = NULL;
-    Delete(module_class_code);
-    module_class_code = NULL;
-    Delete(module_baseclass);
-    module_baseclass = NULL;
-    Delete(module_interfaces);
-    module_interfaces = NULL;
-    Delete(module_imports);
-    module_imports = NULL;
-    Delete(module_class_modifiers);
-    module_class_modifiers = NULL;
-    Delete(imclass_imports);
-    imclass_imports = NULL;
-    Delete(imclass_cppcasts_code);
-    imclass_cppcasts_code = NULL;
-    Delete(upcasts_code);
-    upcasts_code = NULL;
-    Delete(dmethods_seq);
-    dmethods_seq = NULL;
-    Delete(dmethods_table);
-    dmethods_table = NULL;
-    Delete(namespce);
-    namespce = NULL;
-    n_dmethods = 0;
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-
-    if (directorsEnabled()) {
-      Dump(f_directors, f_begin);
-      Dump(f_directors_h, f_runtime_h);
-
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-
-      Delete(f_runtime_h);
-      f_runtime_h = NULL;
-      Delete(f_directors);
-      f_directors = NULL;
-      Delete(f_directors_h);
-      f_directors_h = NULL;
-    }
-
-    if (f_single_out) {
-      Dump(f_single_out, f_begin);
-      Delete(f_single_out);
-      f_single_out = NULL;
-    }
-
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitBanner()
-   * ----------------------------------------------------------------------------- */
-
-  void emitBanner(File *f) {
-    Printf(f, "//------------------------------------------------------------------------------\n");
-    Printf(f, "// <auto-generated />\n");
-    Printf(f, "//\n");
-    Swig_banner_target_lang(f, "//");
-    Printf(f, "//------------------------------------------------------------------------------\n\n");
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getOutputFile()
-   *
-   * Prepares a File object by creating the file in the file system and
-   * writing the banner for auto-generated files to it (emitBanner).
-   * If '-outfile' is provided (single file mode) the supplied parameters will
-   * be ignored and the returned file will always be:
-   *  <outdir>/<outfile>
-   * Otherwise the file will be:
-   *  <dir>/<name>.cs
-   * ----------------------------------------------------------------------------- */
-
-  File *getOutputFile(const String *dir, const String *name) {
-    if (output_file) {
-      if (!f_single_out) {
-	String *filen = NewStringf("%s%s", SWIG_output_directory(), output_file);
-	f_single_out = NewFile(filen, "w", SWIG_output_files());
-	if (!f_single_out) {
-	  FileErrorDisplay(filen);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Append(filenames_list, Copy(filen));
-	Delete(filen);
-	filen = NULL;
-
-	emitBanner(f_single_out);
-      }
-      return f_single_out;
-    } else {
-      String *filen = NewStringf("%s%s.cs", dir, name);
-      File *f = NewFile(filen, "w", SWIG_output_files());
-      if (!f) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      emitBanner(f);
-      return f;
-    }
-  }
-
-  /*-----------------------------------------------------------------------
-   * Add new director upcall signature
-   *----------------------------------------------------------------------*/
-
-  UpcallData *addUpcallMethod(String *imclass_method, String *class_method, String *decl, String *overloaded_name) {
-    String *key = NewStringf("%s|%s", imclass_method, decl);
-
-    ++curr_class_dmethod;
-
-    String *class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod);
-    n_dmethods++;
-
-    Hash *new_udata = NewHash();
-    Append(dmethods_seq, new_udata);
-    Setattr(dmethods_table, key, new_udata);
-
-    Setattr(new_udata, "method", Copy(class_method));
-    Setattr(new_udata, "class_methodidx", class_methodidx);
-    Setattr(new_udata, "decl", Copy(decl));
-    Setattr(new_udata, "overname", Copy(overloaded_name));
-
-    Delete(key);
-    return new_udata;
-  }
-
-  /*-----------------------------------------------------------------------
-   * Get director upcall signature
-   *----------------------------------------------------------------------*/
-
-  /*
-     UpcallData * getUpcallMethodData(String *director_class, String *decl) {
-     String             *key = NewStringf("%s|%s", director_class, decl);
-     UpcallData         *udata = Getattr(dmethods_table, key);
-
-     Delete(key);
-     return udata;
-     }
-   */
-
-  /* ----------------------------------------------------------------------
-   * nativeWrapper()
-   * ---------------------------------------------------------------------- */
-
-  virtual int nativeWrapper(Node *n) {
-    String *wrapname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(wrapname, n, imclass_name))
-      return SWIG_ERROR;
-
-    if (Getattr(n, "type")) {
-      Swig_save("nativeWrapper", n, "name", NIL);
-      Setattr(n, "name", wrapname);
-      native_function_flag = true;
-      functionWrapper(n);
-      Swig_restore(n);
-      native_function_flag = false;
-    } else {
-      Swig_error(input_file, line_number, "No return type for %%native method %s.\n", Getattr(n, "wrap:name"));
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * functionWrapper()
-   * ---------------------------------------------------------------------- */
-
-  virtual int functionWrapper(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *c_return_type = NewString("");
-    String *im_return_type = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *body = NewString("");
-    String *im_outattributes = 0;
-    int num_arguments = 0;
-    bool is_void_return;
-    String *overloaded_name = getOverloadedName(n);
-
-    if (!Getattr(n, "sym:overloaded")) {
-      if (!addSymbol(symname, n, imclass_name))
-	return SWIG_ERROR;
-    }
-
-    /*
-       The rest of this function deals with generating the intermediary class wrapper function (that wraps
-       a c/c++ function) and generating the PInvoke c code. Each C# wrapper function has a 
-       matching PInvoke c function call.
-     */
-
-    // A new wrapper function object
-    Wrapper *f = NewWrapper();
-
-    // Make a wrapper name for this function
-    String *wname = Swig_name_wrapper(overloaded_name);
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("ctype", l, f);
-    Swig_typemap_attach_parms("imtype", l, f);
-
-    /* Get return types */
-    if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
-      String *ctypeout = Getattr(n, "tmap:ctype:out");	// the type in the ctype typemap's out attribute overrides the type in the typemap
-      if (ctypeout)
-	tm = ctypeout;
-      Printf(c_return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if ((tm = Swig_typemap_lookup("imtype", n, "", 0))) {
-      String *imtypeout = Getattr(n, "tmap:imtype:out");	// the type in the imtype typemap's out attribute overrides the type in the typemap
-      if (imtypeout)
-	tm = imtypeout;
-      Printf(im_return_type, "%s", tm);
-      im_outattributes = Getattr(n, "tmap:imtype:outattributes");
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    is_void_return = (Cmp(c_return_type, "void") == 0);
-    if (!is_void_return)
-      Wrapper_add_localv(f, "jresult", c_return_type, "jresult", NIL);
-
-    Printv(f->def, " SWIGEXPORT ", c_return_type, " SWIGSTDCALL ", wname, "(", NIL);
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-
-    // Parameter overloading
-    Setattr(n, "wrap:parms", l);
-    Setattr(n, "wrap:name", wname);
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in C#
-    if (Getattr(n, "sym:overloaded")) {
-      // Emit warnings for the few cases that can't be overloaded in C# and give up on generating wrapper
-      Swig_overload_check(n);
-      if (Getattr(n, "overload:ignore")) {
-	DelWrapper(f);
-	return SWIG_OK;
-      }
-    }
-
-    Printv(imclass_class_code, "\n  [global::System.Runtime.InteropServices.DllImport(\"", dllimport, "\", EntryPoint=\"", wname, "\")]\n", NIL);
-
-    if (im_outattributes)
-      Printf(imclass_class_code, "  %s\n", im_outattributes);
-
-    Printf(imclass_class_code, "  public static extern %s %s(", im_return_type, overloaded_name);
-
-
-    /* Get number of required and total arguments */
-    num_arguments = emit_num_arguments(l);
-    int gencomma = 0;
-
-    // Now walk the function parameter list and generate code to get arguments
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-      String *im_param_type = NewString("");
-      String *c_param_type = NewString("");
-      String *arg = NewString("");
-
-      Printf(arg, "j%s", ln);
-
-      /* Get the ctype types of the parameter */
-      if ((tm = Getattr(p, "tmap:ctype"))) {
-	Printv(c_param_type, tm, NIL);
-      } else {
-	Swig_warning(WARN_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Get the intermediary class parameter types of the parameter */
-      if ((tm = Getattr(p, "tmap:imtype"))) {
-	const String *inattributes = Getattr(p, "tmap:imtype:inattributes");
-	Printf(im_param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-      } else {
-	Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to intermediary class method */
-      if (gencomma)
-	Printf(imclass_class_code, ", ");
-      Printf(imclass_class_code, "%s %s", im_param_type, arg);
-
-      // Add parameter to C function
-      Printv(f->def, gencomma ? ", " : "", c_param_type, " ", arg, NIL);
-
-      gencomma = 1;
-
-      // Get typemap for this argument
-      if ((tm = Getattr(p, "tmap:in"))) {
-	canThrow(n, "in", p);
-	Replaceall(tm, "$source", arg);	/* deprecated */
-	Replaceall(tm, "$target", ln);	/* deprecated */
-	Replaceall(tm, "$arg", arg);	/* deprecated? */
-	Replaceall(tm, "$input", arg);
-	Setattr(p, "emit:input", arg);
-	Printf(f->code, "%s\n", tm);
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	p = nextSibling(p);
-      }
-      Delete(im_param_type);
-      Delete(c_param_type);
-      Delete(arg);
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	canThrow(n, "check", p);
-	Replaceall(tm, "$target", Getattr(p, "lname"));	/* deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	canThrow(n, "freearg", p);
-	Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	canThrow(n, "argout", p);
-	Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* deprecated */
-	Replaceall(tm, "$target", Getattr(p, "lname"));	/* deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	Replaceall(tm, "$result", "jresult");
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Look for usage of throws typemap and the canthrow flag
-    ParmList *throw_parm_list = NULL;
-    if ((throw_parm_list = Getattr(n, "catchlist"))) {
-      Swig_typemap_attach_parms("throws", throw_parm_list, f);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  canThrow(n, "throws", p);
-	}
-      }
-    }
-
-    String *null_attribute = 0;
-    // Now write code to make the function call
-    if (!native_function_flag) {
-
-      Swig_director_emit_dynamic_cast(n, f);
-      String *actioncode = emit_action(n);
-
-      /* Return value if necessary  */
-      if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-	canThrow(n, "out", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Replaceall(tm, "$target", "jresult");	/* deprecated */
-	Replaceall(tm, "$result", "jresult");
-
-        if (GetFlag(n, "feature:new"))
-          Replaceall(tm, "$owner", "1");
-        else
-          Replaceall(tm, "$owner", "0");
-
-	Printf(f->code, "%s", tm);
-	null_attribute = Getattr(n, "tmap:out:null");
-	if (Len(tm))
-	  Printf(f->code, "\n");
-      } else {
-	Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(t, 0), Getattr(n, "name"));
-      }
-      emit_return_variable(n, t, f);
-    }
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	canThrow(n, "newfree", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if (!native_function_flag) {
-      if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-	canThrow(n, "ret", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* Finish C function and intermediary class function definitions */
-    Printf(imclass_class_code, ")");
-    Printf(imclass_class_code, ";\n");
-
-    Printf(f->def, ") {");
-
-    if (!is_void_return)
-      Printv(f->code, "    return jresult;\n", NIL);
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", symname);
-
-    /* Contract macro modification */
-    if (Replaceall(f->code, "SWIG_contract_assert(", "SWIG_contract_assert($null, ") > 0) {
-      Setattr(n, "csharp:canthrow", "1");
-    }
-
-    if (!null_attribute)
-      Replaceall(f->code, "$null", "0");
-    else
-      Replaceall(f->code, "$null", null_attribute);
-
-    /* Dump the function out */
-    if (!native_function_flag) {
-      Wrapper_print(f, f_wrappers);
-
-      // Handle %csexception which sets the canthrow attribute
-      if (Getattr(n, "feature:except:canthrow"))
-	Setattr(n, "csharp:canthrow", "1");
-
-      // A very simple check (it is not foolproof) to help typemap/feature writers for
-      // throwing C# exceptions from unmanaged code. It checks for the common methods which
-      // set a pending C# exception... the 'canthrow' typemap/feature attribute must be set
-      // so that code which checks for pending exceptions is added in the C# proxy method.
-      if (!Getattr(n, "csharp:canthrow")) {
-	if (Strstr(f->code, "SWIG_exception")) {
-	  Swig_warning(WARN_CSHARP_CANTHROW, input_file, line_number,
-		       "Unmanaged code contains a call to SWIG_exception and C# code does not handle pending exceptions via the canthrow attribute.\n");
-	} else if (Strstr(f->code, "SWIG_CSharpSetPendingException")) {
-	  Swig_warning(WARN_CSHARP_CANTHROW, input_file, line_number,
-		       "Unmanaged code contains a call to a SWIG_CSharpSetPendingException method and C# code does not handle pending exceptions via the canthrow attribute.\n");
-	}
-      }
-    }
-
-    if (!(proxy_flag && is_wrapping_class()) && !enum_constant_flag) {
-      moduleClassFunctionHandler(n);
-    }
-
-    /* 
-     * Generate the proxy class properties for public member variables.
-     * Not for enums and constants.
-     */
-    if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
-      // Capitalize the first letter in the variable in the getter/setter function name
-      bool getter_flag = Cmp(symname, Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) != 0;
-
-      String *getter_setter_name = NewString("");
-      if (!getter_flag)
-	Printf(getter_setter_name, "set");
-      else
-	Printf(getter_setter_name, "get");
-      Putc(toupper((int) *Char(variable_name)), getter_setter_name);
-      Printf(getter_setter_name, "%s", Char(variable_name) + 1);
-
-      Setattr(n, "proxyfuncname", getter_setter_name);
-      Setattr(n, "imfuncname", symname);
-
-      proxyClassFunctionHandler(n);
-      Delete(getter_setter_name);
-    }
-
-    Delete(c_return_type);
-    Delete(im_return_type);
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(body);
-    Delete(overloaded_name);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * variableWrapper()
-   * ----------------------------------------------------------------------- */
-
-  virtual int variableWrapper(Node *n) {
-    Language::variableWrapper(n);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * globalvariableHandler()
-   * ------------------------------------------------------------------------ */
-
-  virtual int globalvariableHandler(Node *n) {
-
-    generate_property_declaration_flag = true;
-    variable_name = Getattr(n, "sym:name");
-    global_variable_flag = true;
-    int ret = Language::globalvariableHandler(n);
-    global_variable_flag = false;
-    generate_property_declaration_flag = false;
-
-    if (proxy_flag) {
-      Printf(module_class_code, "\n  }\n\n");
-    }
-
-    return ret;
-  }
-  
-  String *getCurrentScopeName(String *nspace) {
-    String *scope = 0;
-    if (nspace || getCurrentClass()) {
-      scope = NewString("");
-      if (nspace)
-	Printf(scope, "%s", nspace);
-      if (Node *cls = getCurrentClass()) {
-	if (Node *outer = Getattr(cls, "nested:outer")) {
-	  String *outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
-	  for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
-	    Push(outerClassesPrefix, ".");
-	    Push(outerClassesPrefix, Getattr(outer, "sym:name"));
-	  }
-	  Printv(scope, nspace ? "." : "", outerClassesPrefix, ".", proxy_class_name, NIL);
-	  Delete(outerClassesPrefix);
-	} else
-	  Printv(scope, nspace ? "." : "", proxy_class_name, NIL);
-      }
-    }
-    return scope;
-  }
-
-  /* ----------------------------------------------------------------------
-   * enumDeclaration()
-   *
-   * C/C++ enums can be mapped in one of 4 ways, depending on the cs:enum feature specified:
-   * 1) Simple enums - simple constant within the proxy class or module class
-   * 2) Typeunsafe enums - simple constant in a C# class (class named after the c++ enum name)
-   * 3) Typesafe enum - typesafe enum pattern (class named after the c++ enum name)
-   * 4) Proper enums - proper C# enum
-   * Anonymous enums always default to 1)
-   * ---------------------------------------------------------------------- */
-
-  virtual int enumDeclaration(Node *n) {
-
-    if (!ImportMode) {
-      if (getCurrentClass() && (cplus_mode != PUBLIC))
-	return SWIG_NOWRAP;
-
-      String *nspace = Getattr(n, "sym:nspace"); // NSpace/getNSpace() only works during Language::enumDeclaration call
-      if (proxy_flag && !is_wrapping_class()) {
-	// Global enums / enums in a namespace
-	assert(!full_imclass_name);
-
-	if (!nspace) {
-	  full_imclass_name = NewStringf("%s", imclass_name);
-	} else {
-	  if (namespce) {
-	    full_imclass_name = NewStringf("%s.%s", namespce, imclass_name);
-	  } else {
-	    full_imclass_name = NewStringf("%s", imclass_name);
-	  }
-	}
-      }
-
-      enum_code = NewString("");
-      String *symname = Getattr(n, "sym:name");
-      String *constants_code = (proxy_flag && is_wrapping_class())? proxy_class_constants_code : module_class_constants_code;
-      EnumFeature enum_feature = decodeEnumFeature(n);
-      String *typemap_lookup_type = Getattr(n, "name");
-
-      if ((enum_feature != SimpleEnum) && symname && typemap_lookup_type) {
-	// Wrap (non-anonymous) C/C++ enum within a typesafe, typeunsafe or proper C# enum
-
-	String *scope = getCurrentScopeName(nspace);
-	if (!addSymbol(symname, n, scope))
-	  return SWIG_ERROR;
-
-	// Pure C# baseclass and interfaces
-	const String *pure_baseclass = typemapLookup(n, "csbase", typemap_lookup_type, WARN_NONE);
-	const String *pure_interfaces = typemapLookup(n, "csinterfaces", typemap_lookup_type, WARN_NONE);
-
-	// Class attributes
-	const String *csattributes = typemapLookup(n, "csattributes", typemap_lookup_type, WARN_NONE);
-	if (csattributes && *Char(csattributes))
-	  Printf(enum_code, "%s\n", csattributes);
-
-	// Emit the enum
-	Printv(enum_code, typemapLookup(n, "csclassmodifiers", typemap_lookup_type, WARN_CSHARP_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers (enum modifiers really)
-	       " ", symname, (*Char(pure_baseclass) || *Char(pure_interfaces)) ? " : " : "", pure_baseclass, ((*Char(pure_baseclass)) && *Char(pure_interfaces)) ?	// Interfaces
-	       ", " : "", pure_interfaces, " {\n", NIL);
-	Delete(scope);
-      } else {
-	// Wrap C++ enum with integers - just indicate start of enum with a comment, no comment for anonymous enums of any sort
-	if (symname && !Getattr(n, "unnamedinstance"))
-	  Printf(constants_code, "  // %s \n", symname);
-      }
-
-      // Emit each enum item
-      Language::enumDeclaration(n);
-
-      if ((enum_feature != SimpleEnum) && symname && typemap_lookup_type) {
-	// Wrap (non-anonymous) C/C++ enum within a typesafe, typeunsafe or proper C# enum
-	// Finish the enum declaration
-	// Typemaps are used to generate the enum definition in a similar manner to proxy classes.
-	Printv(enum_code, (enum_feature == ProperEnum) ? "\n" : typemapLookup(n, "csbody", typemap_lookup_type, WARN_CSHARP_TYPEMAP_CSBODY_UNDEF),	// main body of class
-	       typemapLookup(n, "cscode", typemap_lookup_type, WARN_NONE),	// extra C# code
-	       "}", NIL);
-
-	Replaceall(enum_code, "$csclassname", symname);
-
-	// Substitute $enumvalues - intended usage is for typesafe enums
-	if (Getattr(n, "enumvalues"))
-	  Replaceall(enum_code, "$enumvalues", Getattr(n, "enumvalues"));
-	else
-	  Replaceall(enum_code, "$enumvalues", "");
-
-	if (proxy_flag && is_wrapping_class()) {
-	  // Enums defined within the C++ class are defined within the proxy class
-
-	  // Add extra indentation
-	  Replaceall(enum_code, "\n", "\n  ");
-	  Replaceall(enum_code, "  \n", "\n");
-
-	  Printv(proxy_class_constants_code, "  ", enum_code, "\n\n", NIL);
-	} else {
-	  // Global enums are defined in their own file
-	  String *output_directory = outputDirectory(nspace);
-	  File *f_enum = getOutputFile(output_directory, symname);
-
-	  addOpenNamespace(nspace, f_enum);
-
-	  Printv(f_enum, typemapLookup(n, "csimports", typemap_lookup_type, WARN_NONE), // Import statements
-		 "\n", enum_code, "\n", NIL);
-
-	  addCloseNamespace(nspace, f_enum);
-	  if (f_enum != f_single_out)
-	    Delete(f_enum);
-	  f_enum = NULL;
-	  Delete(output_directory);
-	}
-      } else {
-	// Wrap C++ enum with simple constant
-	Printf(enum_code, "\n");
-	if (proxy_flag && is_wrapping_class())
-	  Printv(proxy_class_constants_code, enum_code, NIL);
-	else
-	  Printv(module_class_constants_code, enum_code, NIL);
-      }
-
-      Delete(enum_code);
-      enum_code = NULL;
-
-      if (proxy_flag && !is_wrapping_class()) {
-	Delete(full_imclass_name);
-	full_imclass_name = 0;
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * enumvalueDeclaration()
-   * ---------------------------------------------------------------------- */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    Swig_require("enumvalueDeclaration", n, "*name", "?value", NIL);
-    String *symname = Getattr(n, "sym:name");
-    String *value = Getattr(n, "value");
-    String *name = Getattr(n, "name");
-    Node *parent = parentNode(n);
-    int unnamedinstance = GetFlag(parent, "unnamedinstance");
-    String *parent_name = Getattr(parent, "name");
-    String *nspace = getNSpace();
-    String *newsymname = 0;
-    String *tmpValue;
-
-    // Strange hack from parent method
-    if (value)
-      tmpValue = NewString(value);
-    else
-      tmpValue = NewString(name);
-    // Note that this is used in enumValue() amongst other places
-    Setattr(n, "value", tmpValue);
-
-    // Deal with enum values that are not int
-    int swigtype = SwigType_type(Getattr(n, "type"));
-    if (swigtype == T_BOOL) {
-      const char *val = Equal(Getattr(n, "enumvalue"), "true") ? "1" : "0";
-      Setattr(n, "enumvalue", val);
-    } else if (swigtype == T_CHAR) {
-      String *val = NewStringf("'%(hexescape)s'", Getattr(n, "enumvalue"));
-      Setattr(n, "enumvalue", val);
-      Delete(val);
-    }
-
-    {
-      EnumFeature enum_feature = decodeEnumFeature(parent);
-
-      if ((enum_feature == SimpleEnum) && GetFlag(parent, "scopedenum")) {
-	newsymname = Swig_name_member(0, Getattr(parent, "sym:name"), symname);
-	symname = newsymname;
-      }
-
-      // Add to language symbol table
-      String *scope = 0;
-      if (unnamedinstance || !parent_name || enum_feature == SimpleEnum) {
-	String *enumClassPrefix = getEnumClassPrefix();
-	if (enumClassPrefix) {
-	  scope = NewString("");
-	  if (nspace)
-	    Printf(scope, "%s.", nspace);
-	  Printf(scope, "%s", enumClassPrefix);
-	} else {
-	  scope = Copy(module_class_name);
-	}
-      } else {
-	scope = getCurrentScopeName(nspace);
-	if (!scope)
-	  scope = Copy(Getattr(parent, "sym:name"));
-	else
-	  Printf(scope, ".%s", Getattr(parent, "sym:name"));
-      }
-      if (!addSymbol(symname, n, scope))
-	return SWIG_ERROR;
-
-      const String *csattributes = Getattr(n, "feature:cs:attributes");
-
-      if ((enum_feature == ProperEnum) && parent_name && !unnamedinstance) {
-	// Wrap (non-anonymous) C/C++ enum with a proper C# enum
-	// Emit the enum item.
-	if (!GetFlag(n, "firstenumitem"))
-	  Printf(enum_code, ",\n");
-
-	if (csattributes)
-	  Printf(enum_code, "  %s\n", csattributes);
-
-	Printf(enum_code, "  %s", symname);
-
-	// Check for the %csconstvalue feature
-	String *value = Getattr(n, "feature:cs:constvalue");
-
-	// Note that the enum value must be a true constant and cannot be set from a PINVOKE call, thus no support for %csconst(0)
-	value = value ? value : Getattr(n, "enumvalue");
-	if (value) {
-	  Printf(enum_code, " = %s", value);
-	}
-      } else {
-	// Wrap C/C++ enums with constant integers or use the typesafe enum pattern
-	SwigType *typemap_lookup_type = parent_name ? parent_name : NewString("enum ");
-	Setattr(n, "type", typemap_lookup_type);
-	const String *tm = typemapLookup(n, "cstype", typemap_lookup_type, WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF);
-
-	String *return_type = Copy(tm);
-	substituteClassname(typemap_lookup_type, return_type);
-        const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-        methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-	if (csattributes)
-	  Printf(enum_code, "  %s\n", csattributes);
-
-	if ((enum_feature == TypesafeEnum) && parent_name && !unnamedinstance) {
-	  // Wrap (non-anonymous) enum using the typesafe enum pattern
-	  if (Getattr(n, "enumvalue")) {
-	    String *value = enumValue(n);
-	    Printf(enum_code, "  %s static readonly %s %s = new %s(\"%s\", %s);\n", methodmods, return_type, symname, return_type, symname, value);
-	    Delete(value);
-	  } else {
-	    Printf(enum_code, "  %s static readonly %s %s = new %s(\"%s\");\n", methodmods, return_type, symname, return_type, symname);
-	  }
-	} else {
-	  // Simple integer constants
-	  // Note these are always generated for anonymous enums, no matter what enum_feature is specified
-	  // Code generated is the same for SimpleEnum and TypeunsafeEnum -> the class it is generated into is determined later
-
-	  // The %csconst feature determines how the constant value is obtained
-	  int const_feature_flag = GetFlag(n, "feature:cs:const");
-
-	  const char *const_readonly = const_feature_flag ? "const" : "static readonly";
-	  String *value = enumValue(n);
-	  Printf(enum_code, "  %s %s %s %s = %s;\n", methodmods, const_readonly, return_type, symname, value);
-	  Delete(value);
-	}
-	Delete(return_type);
-      }
-
-      // Add the enum value to the comma separated list being constructed in the enum declaration.
-      String *enumvalues = Getattr(parent, "enumvalues");
-      if (!enumvalues)
-	Setattr(parent, "enumvalues", Copy(symname));
-      else
-	Printv(enumvalues, ", ", symname, NIL);
-      Delete(scope);
-    }
-
-    Delete(newsymname);
-    Delete(tmpValue);
-    Swig_restore(n);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * constantWrapper()
-   * Used for wrapping constants - #define or %constant.
-   * Also for inline initialised const static primitive type member variables (short, int, double, enums etc).
-   * C# static const variables are generated for these.
-   * If the %csconst(1) feature is used then the C constant value is used to initialise the C# const variable.
-   * If not, a PINVOKE method is generated to get the C constant value for initialisation of the C# const variable.
-   * However, if the %csconstvalue feature is used, it overrides all other ways to generate the initialisation.
-   * Also note that this method might be called for wrapping enum items (when the enum is using %csconst(0)).
-   * ------------------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    SwigType *valuetype = Getattr(n, "valuetype");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    String *return_type = NewString("");
-    String *constants_code = NewString("");
-    Swig_save("constantWrapper", n, "value", NIL);
-    Swig_save("constantWrapper", n, "tmap:ctype:out", "tmap:imtype:out", "tmap:cstype:out", "tmap:out:null", "tmap:imtype:outattributes", "tmap:cstype:outattributes", NIL);
-
-    bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0);
-
-    const String *itemname = (proxy_flag && wrapping_member_flag) ? variable_name : symname;
-    if (!is_enum_item) {
-      String *scope = 0;
-      if (proxy_class_name) {
-	String *nspace = getNSpace();
-	scope = NewString("");
-	if (nspace)
-	  Printf(scope, "%s.", nspace);
-	Printf(scope, "%s", proxy_class_name);
-      } else {
-	scope = Copy(module_class_name);
-      }
-      if (!addSymbol(itemname, n, scope))
-	return SWIG_ERROR;
-      Delete(scope);
-    }
-
-    // The %csconst feature determines how the constant value is obtained
-    int const_feature_flag = GetFlag(n, "feature:cs:const");
-
-    /* Adjust the enum type for the Swig_typemap_lookup.
-     * We want the same jstype typemap for all the enum items so we use the enum type (parent node). */
-    if (is_enum_item) {
-      t = Getattr(parentNode(n), "enumtype");
-      Setattr(n, "type", t);
-    }
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("cstype", l, NULL);
-
-    /* Get C# return types */
-    bool classname_substituted_flag = false;
-
-    if ((tm = Swig_typemap_lookup("cstype", n, "", 0))) {
-      String *cstypeout = Getattr(n, "tmap:cstype:out");	// the type in the cstype typemap's out attribute overrides the type in the typemap
-      if (cstypeout)
-	tm = cstypeout;
-      classname_substituted_flag = substituteClassname(t, tm);
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    // Default (octal) escaping is no good - change to hex escaped value
-    String *hexescaped_value = Getattr(n, "rawvalue") ? NewStringf("%(hexescape)s", Getattr(n, "rawvalue")) : 0;
-    // Add the stripped quotes back in
-    String *new_value = NewString("");
-    if (SwigType_type(t) == T_STRING) {
-      Printf(new_value, "\"%s\"", hexescaped_value ? hexescaped_value : Copy(Getattr(n, "value")));
-      Setattr(n, "value", new_value);
-    } else if (SwigType_type(t) == T_CHAR) {
-      Printf(new_value, "\'%s\'", hexescaped_value ? hexescaped_value : Copy(Getattr(n, "value")));
-      Setattr(n, "value", new_value);
-    }
-
-    const String *outattributes = Getattr(n, "tmap:cstype:outattributes");
-    if (outattributes)
-      Printf(constants_code, "  %s\n", outattributes);
-
-    const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-    methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-    Printf(constants_code, "  %s %s %s %s = ", methodmods, (const_feature_flag ? "const" : "static readonly"), return_type, itemname);
-
-    // Check for the %csconstvalue feature
-    String *value = Getattr(n, "feature:cs:constvalue");
-
-    if (value) {
-      Printf(constants_code, "%s;\n", value);
-    } else if (!const_feature_flag) {
-      // Default enum and constant handling will work with any type of C constant and initialises the C# variable from C through a PINVOKE call.
-
-      if (classname_substituted_flag) {
-	if (SwigType_isenum(t)) {
-	  // This handles wrapping of inline initialised const enum static member variables (not when wrapping enum items - ignored later on)
-	  Printf(constants_code, "(%s)%s.%s();\n", return_type, full_imclass_name, Swig_name_get(getNSpace(), symname));
-	} else {
-	  // This handles function pointers using the %constant directive
-	  Printf(constants_code, "new %s(%s.%s(), false);\n", return_type, full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), symname));
-	}
-      } else {
-	Printf(constants_code, "%s.%s();\n", full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), symname));
-      }
-
-      // Each constant and enum value is wrapped with a separate PInvoke function call
-      SetFlag(n, "feature:immutable");
-      enum_constant_flag = true;
-      variableWrapper(n);
-      enum_constant_flag = false;
-    } else {
-      // Alternative constant handling will use the C syntax to make a true C# constant and hope that it compiles as C# code
-      if (Getattr(n, "wrappedasconstant")) {
-	if (SwigType_type(t) == T_CHAR) {
-	  if (SwigType_type(valuetype) == T_CHAR)
-	    Printf(constants_code, "\'%(hexescape)s\';\n", Getattr(n, "staticmembervariableHandler:value"));
-	  else
-	    Printf(constants_code, "(char)%s;\n", Getattr(n, "staticmembervariableHandler:value"));
-	} else {
-          Printf(constants_code, "%s;\n", Getattr(n, "staticmembervariableHandler:value"));
-	}
-      } else {
-        Printf(constants_code, "%s;\n", Getattr(n, "value"));
-      }
-    }
-
-    // Emit the generated code to appropriate place
-    // Enums only emit the intermediate and PINVOKE methods, so no proxy or module class wrapper methods needed
-    if (!is_enum_item) {
-      if (proxy_flag && wrapping_member_flag)
-	Printv(proxy_class_constants_code, constants_code, NIL);
-      else
-	Printv(module_class_constants_code, constants_code, NIL);
-    }
-    // Cleanup
-    Swig_restore(n);
-    Delete(new_value);
-    Delete(return_type);
-    Delete(constants_code);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * insertDirective()
-   * ----------------------------------------------------------------------------- */
-
-  virtual int insertDirective(Node *n) {
-    int ret = SWIG_OK;
-    String *code = Getattr(n, "code");
-    String *section = Getattr(n, "section");
-    Replaceall(code, "$module", module_class_name);
-    Replaceall(code, "$imclassname", imclass_name);
-    Replaceall(code, "$dllimport", dllimport);
-
-    if (!ImportMode && (Cmp(section, "proxycode") == 0)) {
-      if (proxy_class_code) {
-	Swig_typemap_replace_embedded_typemap(code, n);
-	int offset = Len(code) > 0 && *Char(code) == '\n' ? 1 : 0;
-	Printv(proxy_class_code, Char(code) + offset, "\n", NIL);
-      }
-    } else {
-      ret = Language::insertDirective(n);
-    }
-    return ret;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * pragmaDirective()
-   *
-   * Valid Pragmas:
-   * imclassbase            - base (extends) for the intermediary class
-   * imclassclassmodifiers  - class modifiers for the intermediary class
-   * imclasscode            - text (C# code) is copied verbatim to the intermediary class
-   * imclassimports         - import statements for the intermediary class
-   * imclassinterfaces      - interface (implements) for the intermediary class
-   *
-   * modulebase              - base (extends) for the module class
-   * moduleclassmodifiers    - class modifiers for the module class
-   * modulecode              - text (C# code) is copied verbatim to the module class
-   * moduleimports           - import statements for the module class
-   * moduleinterfaces        - interface (implements) for the module class
-   *
-   * ----------------------------------------------------------------------------- */
-
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *code = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-      if (Strcmp(lang, "csharp") == 0) {
-
-	String *strvalue = NewString(value);
-	Replaceall(strvalue, "\\\"", "\"");
-
-	if (Strcmp(code, "imclassbase") == 0) {
-	  Delete(imclass_baseclass);
-	  imclass_baseclass = Copy(strvalue);
-	} else if (Strcmp(code, "imclassclassmodifiers") == 0) {
-	  Delete(imclass_class_modifiers);
-	  imclass_class_modifiers = Copy(strvalue);
-	} else if (Strcmp(code, "imclasscode") == 0) {
-	  Printf(imclass_class_code, "%s\n", strvalue);
-	} else if (Strcmp(code, "imclassimports") == 0) {
-	  Delete(imclass_imports);
-	  imclass_imports = Copy(strvalue);
-	} else if (Strcmp(code, "imclassinterfaces") == 0) {
-	  Delete(imclass_interfaces);
-	  imclass_interfaces = Copy(strvalue);
-	} else if (Strcmp(code, "modulebase") == 0) {
-	  Delete(module_baseclass);
-	  module_baseclass = Copy(strvalue);
-	} else if (Strcmp(code, "moduleclassmodifiers") == 0) {
-	  Delete(module_class_modifiers);
-	  module_class_modifiers = Copy(strvalue);
-	} else if (Strcmp(code, "modulecode") == 0) {
-	  Printf(module_class_code, "%s\n", strvalue);
-	} else if (Strcmp(code, "moduleimports") == 0) {
-	  Delete(module_imports);
-	  module_imports = Copy(strvalue);
-	} else if (Strcmp(code, "moduleinterfaces") == 0) {
-	  Delete(module_interfaces);
-	  module_interfaces = Copy(strvalue);
-	} else {
-	  Swig_error(input_file, line_number, "Unrecognized pragma.\n");
-	}
-	Delete(strvalue);
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getQualifiedInterfaceName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getQualifiedInterfaceName(Node *n) {
-    String *ret = Getattr(n, "interface:qname");
-    if (!ret) {
-      String *nspace = Getattr(n, "sym:nspace");
-      String *interface_name = Getattr(n, "interface:name");
-      if (nspace) {
-	if (namespce)
-	  ret = NewStringf("%s.%s.%s", namespce, nspace, interface_name);
-	else
-	  ret = NewStringf("%s.%s", nspace, interface_name);
-      } else {
-	ret = Copy(interface_name);
-      }
-      Setattr(n, "interface:qname", ret);
-    }
-    return ret;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getInterfaceName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getInterfaceName(SwigType *t, bool qualified) {
-    String *interface_name = NULL;
-    if (proxy_flag) {
-      Node *n = classLookup(t);
-      if (n && Getattr(n, "interface:name"))
-	interface_name = qualified ? getQualifiedInterfaceName(n) : Getattr(n, "interface:name");
-    }
-    return interface_name;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addInterfaceNameAndUpcasts()
-   * ----------------------------------------------------------------------------- */
-
-  void addInterfaceNameAndUpcasts(SwigType *smart, String *interface_list, String *interface_upcasts, Hash *base_list, String *c_classname) {
-    List *keys = Keys(base_list);
-    for (Iterator it = First(keys); it.item; it = Next(it)) {
-      Node *base = Getattr(base_list, it.item);
-      String *c_baseclass = SwigType_namestr(Getattr(base, "name"));
-      String *interface_name = Getattr(base, "interface:name");
-      if (Len(interface_list))
-	Append(interface_list, ", ");
-      Append(interface_list, interface_name);
-
-      Node *attributes = NewHash();
-      String *interface_code = Copy(typemapLookup(base, "csinterfacecode", Getattr(base, "classtypeobj"), WARN_CSHARP_TYPEMAP_INTERFACECODE_UNDEF, attributes));
-      String *cptr_method_name = 0;
-      if (interface_code) {
-        Replaceall(interface_code, "$interfacename", interface_name);
-	Printv(interface_upcasts, interface_code, NIL);
-	cptr_method_name = Copy(Getattr(attributes, "tmap:csinterfacecode:cptrmethod"));
-      }
-      if (!cptr_method_name)
-	cptr_method_name = NewStringf("%s_GetInterfaceCPtr", interface_name);
-      Replaceall(cptr_method_name, ".", "_");
-      Replaceall(cptr_method_name, "$interfacename", interface_name);
-
-      String *upcast_method_name = Swig_name_member(getNSpace(), proxy_class_name, cptr_method_name);
-      upcastsCode(smart, upcast_method_name, c_classname, c_baseclass);
-
-      Delete(upcast_method_name);
-      Delete(cptr_method_name);
-      Delete(interface_code);
-      Delete(c_baseclass);
-    }
-    Delete(keys);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * upcastsCode()
-   *
-   * Add code for C++ casting to base class
-   * ----------------------------------------------------------------------------- */
-
-  void upcastsCode(SwigType *smart, String *upcast_method_name, String *c_classname, String *c_baseclass) {
-    String *wname = Swig_name_wrapper(upcast_method_name);
-
-    Printv(imclass_cppcasts_code, "\n  [global::System.Runtime.InteropServices.DllImport(\"", dllimport, "\", EntryPoint=\"", wname, "\")]\n", NIL);
-    Printf(imclass_cppcasts_code, "  public static extern global::System.IntPtr %s(global::System.IntPtr jarg1);\n", upcast_method_name);
-
-    Replaceall(imclass_cppcasts_code, "$csclassname", proxy_class_name);
-
-    if (smart) {
-      SwigType *bsmart = Copy(smart);
-      SwigType *rclassname = SwigType_typedef_resolve_all(c_classname);
-      SwigType *rbaseclass = SwigType_typedef_resolve_all(c_baseclass);
-      Replaceall(bsmart, rclassname, rbaseclass);
-      Delete(rclassname);
-      Delete(rbaseclass);
-      String *smartnamestr = SwigType_namestr(smart);
-      String *bsmartnamestr = SwigType_namestr(bsmart);
-      Printv(upcasts_code,
-	  "SWIGEXPORT ", bsmartnamestr, " * SWIGSTDCALL ", wname, "(", smartnamestr, " *jarg1) {\n",
-	  "    return jarg1 ? new ", bsmartnamestr, "(*jarg1) : 0;\n"
-	  "}\n", "\n", NIL);
-      Delete(bsmartnamestr);
-      Delete(smartnamestr);
-      Delete(bsmart);
-    } else {
-      Printv(upcasts_code,
-	  "SWIGEXPORT ", c_baseclass, " * SWIGSTDCALL ", wname, "(", c_classname, " *jarg1) {\n",
-	  "    return (", c_baseclass, " *)jarg1;\n"
-	  "}\n", "\n", NIL);
-    }
-    Delete(wname);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitProxyClassDefAndCPPCasts()
-   * ----------------------------------------------------------------------------- */
-
-  void emitProxyClassDefAndCPPCasts(Node *n) {
-    String *c_classname = SwigType_namestr(Getattr(n, "name"));
-    String *c_baseclass = NULL;
-    String *baseclass = NULL;
-    String *c_baseclassname = NULL;
-    String *interface_list = NewStringEmpty();
-    String *interface_upcasts = NewStringEmpty();
-    SwigType *typemap_lookup_type = Getattr(n, "classtypeobj");
-    bool feature_director = Swig_directorclass(n) ? true : false;
-    bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested");
-    SwigType *smart = Swig_cparse_smartptr(n);
-
-    // Inheritance from pure C# classes
-    Node *attributes = NewHash();
-    const String *pure_baseclass = typemapLookup(n, "csbase", typemap_lookup_type, WARN_NONE, attributes);
-    bool purebase_replace = GetFlag(attributes, "tmap:csbase:replace") ? true : false;
-    bool purebase_notderived = GetFlag(attributes, "tmap:csbase:notderived") ? true : false;
-    Delete(attributes);
-
-    // C++ inheritance
-    if (!purebase_replace) {
-      List *baselist = Getattr(n, "bases");
-      if (baselist) {
-	Iterator base = First(baselist);
-	while (base.item) {
-	  if (!(GetFlag(base.item, "feature:ignore") || Getattr(base.item, "feature:interface"))) {
-	    String *baseclassname = Getattr(base.item, "name");
-	    if (!c_baseclassname) {
-	      c_baseclassname = baseclassname;
-	      baseclass = Copy(getProxyName(baseclassname));
-	      if (baseclass)
-		c_baseclass = SwigType_namestr(baseclassname);
-	    } else {
-	      /* Warn about multiple inheritance for additional base class(es) */
-	      String *proxyclassname = Getattr(n, "classtypeobj");
-	      Swig_warning(WARN_CSHARP_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		  "Warning for %s, base %s ignored. Multiple inheritance is not supported in C#.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
-	    }
-	  }
-	  base = Next(base);
-	}
-      }
-    }
-    Hash *interface_bases = Getattr(n, "interface:bases");
-    if (interface_bases)
-      addInterfaceNameAndUpcasts(smart, interface_list, interface_upcasts, interface_bases, c_classname);
-
-    bool derived = baseclass && getProxyName(c_baseclassname);
-    if (derived && purebase_notderived)
-      pure_baseclass = empty_string;
-    const String *wanted_base = baseclass ? baseclass : pure_baseclass;
-
-    if (purebase_replace) {
-      wanted_base = pure_baseclass;
-      derived = false;
-      Delete(baseclass);
-      baseclass = NULL;
-      if (purebase_notderived)
-        Swig_error(Getfile(n), Getline(n), "The csbase typemap for proxy %s must contain just one of the 'replace' or 'notderived' attributes.\n", typemap_lookup_type);
-    } else if (Len(pure_baseclass) > 0 && Len(baseclass) > 0) {
-      Swig_warning(WARN_CSHARP_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		   "Warning for %s, base %s ignored. Multiple inheritance is not supported in C#. "
-		   "Perhaps you need one of the 'replace' or 'notderived' attributes in the csbase typemap?\n", typemap_lookup_type, pure_baseclass);
-    }
-
-    // Pure C# interfaces
-    const String *pure_interfaces = typemapLookup(n, derived ? "csinterfaces_derived" : "csinterfaces", typemap_lookup_type, WARN_NONE);
-    if (*Char(interface_list) && *Char(pure_interfaces))
-      Append(interface_list, ", ");
-    Append(interface_list, pure_interfaces);
-    // Start writing the proxy class
-    if (!has_outerclass)
-      Printv(proxy_class_def, typemapLookup(n, "csimports", typemap_lookup_type, WARN_NONE),	// Import statements
-	   "\n", NIL);
-
-    // Class attributes
-    const String *csattributes = typemapLookup(n, "csattributes", typemap_lookup_type, WARN_NONE);
-    if (csattributes && *Char(csattributes))
-      Printf(proxy_class_def, "%s\n", csattributes);
-
-    Printv(proxy_class_def, typemapLookup(n, "csclassmodifiers", typemap_lookup_type, WARN_CSHARP_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
-	   " $csclassname",	// Class name and base class
-	   (*Char(wanted_base) || *Char(interface_list)) ? " : " : "", wanted_base, (*Char(wanted_base) && *Char(interface_list)) ?	// Interfaces
-	   ", " : "", interface_list, " {", derived ? typemapLookup(n, "csbody_derived", typemap_lookup_type, WARN_CSHARP_TYPEMAP_CSBODY_UNDEF) :	// main body of class
-	   typemapLookup(n, "csbody", typemap_lookup_type, WARN_CSHARP_TYPEMAP_CSBODY_UNDEF),	// main body of class
-	   NIL);
-
-    // C++ destructor is wrapped by the Dispose method
-    // Note that the method name is specified in a typemap attribute called methodname
-    String *destruct = NewString("");
-    const String *tm = NULL;
-    attributes = NewHash();
-    String *destruct_methodname = NULL;
-    String *destruct_methodmodifiers = NULL;
-    if (derived) {
-      tm = typemapLookup(n, "csdestruct_derived", typemap_lookup_type, WARN_NONE, attributes);
-      destruct_methodname = Getattr(attributes, "tmap:csdestruct_derived:methodname");
-      destruct_methodmodifiers = Getattr(attributes, "tmap:csdestruct_derived:methodmodifiers");
-    } else {
-      tm = typemapLookup(n, "csdestruct", typemap_lookup_type, WARN_NONE, attributes);
-      destruct_methodname = Getattr(attributes, "tmap:csdestruct:methodname");
-      destruct_methodmodifiers = Getattr(attributes, "tmap:csdestruct:methodmodifiers");
-    }
-    if (tm && *Char(tm)) {
-      if (!destruct_methodname) {
-	Swig_error(Getfile(n), Getline(n), "No methodname attribute defined in csdestruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name);
-      }
-      if (!destruct_methodmodifiers) {
-	Swig_error(Getfile(n), Getline(n),
-		   "No methodmodifiers attribute defined in csdestruct%s typemap for %s.\n", (derived ? "_derived" : ""), proxy_class_name);
-      }
-    }
-    // Emit the Finalize and Dispose methods
-    if (tm) {
-      // Finalize method
-      if (*Char(destructor_call)) {
-	Printv(proxy_class_def, typemapLookup(n, "csfinalize", typemap_lookup_type, WARN_NONE), NIL);
-      }
-      // Dispose method
-      Printv(destruct, tm, NIL);
-      if (*Char(destructor_call))
-	Replaceall(destruct, "$imcall", destructor_call);
-      else
-	Replaceall(destruct, "$imcall", "throw new global::System.MethodAccessException(\"C++ destructor does not have public access\")");
-      if (*Char(destruct))
-	Printv(proxy_class_def, "\n  ", destruct_methodmodifiers, " ", derived ? "override" : "virtual", " void ", destruct_methodname, "() ", destruct, "\n",
-	       NIL);
-    }
-    if (*Char(interface_upcasts))
-      Printv(proxy_class_def, interface_upcasts, NIL);
-
-    if (feature_director) {
-      // Generate director connect method
-      // put this in classDirectorEnd ???
-      Printf(proxy_class_code, "  private void SwigDirectorConnect() {\n");
-
-      int i;
-      for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-	UpcallData *udata = Getitem(dmethods_seq, i);
-	String *method = Getattr(udata, "method");
-	String *methid = Getattr(udata, "class_methodidx");
-	String *overname = Getattr(udata, "overname");
-	Printf(proxy_class_code, "    if (SwigDerivedClassHasMethod(\"%s\", swigMethodTypes%s))\n", method, methid);
-	Printf(proxy_class_code, "      swigDelegate%s = new SwigDelegate%s_%s(SwigDirector%s);\n", methid, proxy_class_name, methid, overname);
-      }
-      String *director_connect_method_name = Swig_name_member(getNSpace(), getClassPrefix(), "director_connect");
-      Printf(proxy_class_code, "    %s.%s(swigCPtr", imclass_name, director_connect_method_name);
-      for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-	UpcallData *udata = Getitem(dmethods_seq, i);
-	String *methid = Getattr(udata, "class_methodidx");
-	Printf(proxy_class_code, ", swigDelegate%s", methid);
-      }
-      Printf(proxy_class_code, ");\n");
-      Printf(proxy_class_code, "  }\n");
-
-      if (first_class_dmethod < curr_class_dmethod) {
-	// Only emit if there is at least one director method
-	Printf(proxy_class_code, "\n");
-	Printf(proxy_class_code, "  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {\n");
-	Printf(proxy_class_code,
-	       "    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);\n");
-	Printf(proxy_class_code, "    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(%s));\n", proxy_class_name);
-	/* Could add this code to cover corner case where the GetMethod() returns a method which allows type
-	 * promotion, eg it will return foo(double), if looking for foo(int).
-	 if (hasDerivedMethod) {
-	 hasDerivedMethod = false;
-	 if (methodInfo != null)
-	 {
-	 hasDerivedMethod = true;
-	 ParameterInfo[] parameterArray1 = methodInfo.GetParameters();
-	 for (int i=0; i<methodTypes.Length; i++)
-	 {
-	 if (parameterArray1[0].ParameterType != methodTypes[0])
-	 {
-	 hasDerivedMethod = false;
-	 break;
-	 }
-	 }
-	 }
-	 }
-	 */
-	Printf(proxy_class_code, "    return hasDerivedMethod;\n");
-	Printf(proxy_class_code, "  }\n");
-      }
-
-      if (Len(director_delegate_callback) > 0)
-	Printv(proxy_class_code, director_delegate_callback, NIL);
-      if (Len(director_delegate_definitions) > 0)
-	Printv(proxy_class_code, "\n", director_delegate_definitions, NIL);
-      if (Len(director_delegate_instances) > 0)
-	Printv(proxy_class_code, "\n", director_delegate_instances, NIL);
-      if (Len(director_method_types) > 0)
-	Printv(proxy_class_code, "\n", director_method_types, NIL);
-
-      Delete(director_callback_typedefs);
-      director_callback_typedefs = NULL;
-      Delete(director_callbacks);
-      director_callbacks = NULL;
-      Delete(director_delegate_callback);
-      director_delegate_callback = NULL;
-      Delete(director_delegate_definitions);
-      director_delegate_definitions = NULL;
-      Delete(director_delegate_instances);
-      director_delegate_instances = NULL;
-      Delete(director_method_types);
-      director_method_types = NULL;
-      Delete(director_connect_parms);
-      director_connect_parms = NULL;
-      Delete(director_connect_method_name);
-    }
-
-    Delete(interface_upcasts);
-    Delete(interface_list);
-    Delete(attributes);
-    Delete(destruct);
-
-    // Emit extra user code
-    Printv(proxy_class_def, typemapLookup(n, "cscode", typemap_lookup_type, WARN_NONE),	// extra C# code
-	   "\n", NIL);
-
-    if (derived) {
-      String *upcast_method_name = Swig_name_member(getNSpace(), getClassPrefix(), smart != 0 ? "SWIGSmartPtrUpcast" : "SWIGUpcast");
-      upcastsCode(smart, upcast_method_name, c_classname, c_baseclass);
-      Delete(upcast_method_name);
-    }
-
-    Delete(smart);
-    Delete(baseclass);
-  }
-
-  /* ----------------------------------------------------------------------
-   * emitInterfaceDeclaration()
-   * ---------------------------------------------------------------------- */
-
-  void emitInterfaceDeclaration(Node *n, String *interface_name, File *f_interface) {
-    Printv(f_interface, typemapLookup(n, "csimports", Getattr(n, "classtypeobj"), WARN_NONE), "\n", NIL);
-    Printf(f_interface, "public interface %s", interface_name);
-    if (List *baselist = Getattr(n, "bases")) {
-      String *bases = 0;
-      for (Iterator base = First(baselist); base.item; base = Next(base)) {
-	if (GetFlag(base.item, "feature:ignore") || !Getattr(base.item, "feature:interface"))
-	  continue; // TODO: warn about skipped non-interface bases
-	String *base_iname = Getattr(base.item, "interface:name");
-	if (!bases)
-	  bases = NewStringf(" : %s", base_iname);
-	else {
-	  Append(bases, ", ");
-	  Append(bases, base_iname);
-	}
-      }
-      if (bases) {
-	Printv(f_interface, bases, NIL);
-	Delete(bases);
-      }
-    }
-    Printf(f_interface, " {\n");
-
-    Node *attributes = NewHash();
-    String *interface_code = Copy(typemapLookup(n, "csinterfacecode", Getattr(n, "classtypeobj"), WARN_CSHARP_TYPEMAP_INTERFACECODE_UNDEF, attributes));
-    if (interface_code) {
-      String *interface_declaration = Copy(Getattr(attributes, "tmap:csinterfacecode:declaration"));
-      if (interface_declaration) {
-        Replaceall(interface_declaration, "$interfacename", interface_name);
-	Printv(f_interface, interface_declaration, NIL);
-	Delete(interface_declaration);
-      }
-      Delete(interface_code);
-    }
-  }
-
-  /* ----------------------------------------------------------------------
-   * classHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int classHandler(Node *n) {
-    String *nspace = getNSpace();
-    File *f_proxy = NULL;
-    File *f_interface = NULL;
-    // save class local variables
-    String *old_proxy_class_name = proxy_class_name;
-    String *old_full_imclass_name = full_imclass_name;
-    String *old_destructor_call = destructor_call;
-    String *old_proxy_class_constants_code = proxy_class_constants_code;
-    String *old_proxy_class_def = proxy_class_def;
-    String *old_proxy_class_code = proxy_class_code;
-    bool has_outerclass = Getattr(n, "nested:outer") && !GetFlag(n, "feature:flatnested");
-    String *old_interface_class_code = interface_class_code;
-    interface_class_code = 0;
-
-    if (proxy_flag) {
-      proxy_class_name = NewString(Getattr(n, "sym:name"));
-      String *interface_name = Getattr(n, "feature:interface") ? Getattr(n, "interface:name") : 0;
-      if (Node *outer = Getattr(n, "nested:outer")) {
-	String *outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
-	for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
-	  Push(outerClassesPrefix, ".");
-	  Push(outerClassesPrefix, Getattr(outer, "sym:name"));
-	}
-	String *fnspace = nspace ? NewStringf("%s.%s", nspace, outerClassesPrefix) : outerClassesPrefix;
-	if (!addSymbol(proxy_class_name, n, fnspace))
-	  return SWIG_ERROR;
-	if (interface_name && !addInterfaceSymbol(interface_name, n, fnspace))
-	  return SWIG_ERROR;
-	if (nspace)
-	  Delete(fnspace);
-	Delete(outerClassesPrefix);
-      } else {
-	if (!addSymbol(proxy_class_name, n, nspace))
-	  return SWIG_ERROR;
-	if (interface_name && !addInterfaceSymbol(interface_name, n, nspace))
-	  return SWIG_ERROR;
-      }
-
-      if (!nspace) {
-	full_imclass_name = NewStringf("%s", imclass_name);
-	if (Cmp(proxy_class_name, imclass_name) == 0) {
-	  Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-
-	if (Cmp(proxy_class_name, module_class_name) == 0) {
-	  Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-      } else {
-	if (namespce) {
-	  full_imclass_name = NewStringf("%s.%s", namespce, imclass_name);
-	} else {
-	  full_imclass_name = NewStringf("%s", imclass_name);
-	}
-      }
-
-      if (!has_outerclass) {
-	String *output_directory = outputDirectory(nspace);
-	f_proxy = getOutputFile(output_directory, proxy_class_name);
-
-	addOpenNamespace(nspace, f_proxy);
-        Delete(output_directory);
-      }
-      else
-	++nesting_depth;
-
-      proxy_class_def = NewString("");
-      proxy_class_code = NewString("");
-      destructor_call = NewString("");
-      proxy_class_constants_code = NewString("");
-
-      if (Getattr(n, "feature:interface")) {
-	interface_class_code = NewString("");
-	String *output_directory = outputDirectory(nspace);
-	f_interface = getOutputFile(output_directory, interface_name);
-	addOpenNamespace(nspace, f_interface);
-	emitInterfaceDeclaration(n, interface_name, interface_class_code);
-        Delete(output_directory);
-      }
-    }
-
-    Language::classHandler(n);
-
-    if (proxy_flag) {
-
-      emitProxyClassDefAndCPPCasts(n);
-
-      String *csclazzname = Swig_name_member(getNSpace(), getClassPrefix(), ""); // mangled full proxy class name
-
-      Replaceall(proxy_class_def, "$csclassname", proxy_class_name);
-      Replaceall(proxy_class_code, "$csclassname", proxy_class_name);
-      Replaceall(proxy_class_constants_code, "$csclassname", proxy_class_name);
-      Replaceall(interface_class_code, "$csclassname", proxy_class_name);
-
-      Replaceall(proxy_class_def, "$csclazzname", csclazzname);
-      Replaceall(proxy_class_code, "$csclazzname", csclazzname);
-      Replaceall(proxy_class_constants_code, "$csclazzname", csclazzname);
-      Replaceall(interface_class_code, "$csclazzname", csclazzname);
-
-      Replaceall(proxy_class_def, "$module", module_class_name);
-      Replaceall(proxy_class_code, "$module", module_class_name);
-      Replaceall(proxy_class_constants_code, "$module", module_class_name);
-      Replaceall(interface_class_code, "$module", module_class_name);
-
-      Replaceall(proxy_class_def, "$imclassname", full_imclass_name);
-      Replaceall(proxy_class_code, "$imclassname", full_imclass_name);
-      Replaceall(proxy_class_constants_code, "$imclassname", full_imclass_name);
-      Replaceall(interface_class_code, "$imclassname", full_imclass_name);
-
-      Replaceall(proxy_class_def, "$dllimport", dllimport);
-      Replaceall(proxy_class_code, "$dllimport", dllimport);
-      Replaceall(proxy_class_constants_code, "$dllimport", dllimport);
-      Replaceall(interface_class_code, "$dllimport", dllimport);
-
-      if (!has_outerclass)
-	Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
-      else {
-	Swig_offset_string(proxy_class_def, nesting_depth);
-	Append(old_proxy_class_code, proxy_class_def);
-	Swig_offset_string(proxy_class_code, nesting_depth);
-	Append(old_proxy_class_code, proxy_class_code);
-      }
-
-      // Write out all the constants
-      if (Len(proxy_class_constants_code) != 0) {
-	if (!has_outerclass)
-	  Printv(f_proxy, proxy_class_constants_code, NIL);
-	else {
-	  Swig_offset_string(proxy_class_constants_code, nesting_depth);
-	  Append(old_proxy_class_code, proxy_class_constants_code);
-	}
-      }
-      if (!has_outerclass) {
-	Printf(f_proxy, "}\n");
-	addCloseNamespace(nspace, f_proxy);
-	if (f_proxy != f_single_out)
-	  Delete(f_proxy);
-	f_proxy = NULL;
-      } else {
-	for (int i = 0; i < nesting_depth; ++i)
-	  Append(old_proxy_class_code, "  ");
-	Append(old_proxy_class_code, "}\n\n");
-	--nesting_depth;
-      }
-
-      /* Output the downcast method, if necessary. Note: There's no other really
-         good place to put this code, since Abstract Base Classes (ABCs) can and should have 
-         downcasts, making the constructorHandler() a bad place (because ABCs don't get to
-         have constructors emitted.) */
-      if (GetFlag(n, "feature:csdowncast")) {
-	String *downcast_method = Swig_name_member(getNSpace(), proxy_class_name, "SWIGDowncast");
-	String *wname = Swig_name_wrapper(downcast_method);
-
-	String *norm_name = SwigType_namestr(Getattr(n, "name"));
-
-	Printf(imclass_class_code, "  public final static native %s %s(long cPtrBase, boolean cMemoryOwn);\n", proxy_class_name, downcast_method);
-
-	Wrapper *dcast_wrap = NewWrapper();
-
-	Printf(dcast_wrap->def, "SWIGEXPORT jobject SWIGSTDCALL %s(JNIEnv *jenv, jclass jcls, jlong jCPtrBase, jboolean cMemoryOwn) {", wname);
-	Printf(dcast_wrap->code, "  Swig::Director *director = (Swig::Director *) 0;\n");
-	Printf(dcast_wrap->code, "  jobject jresult = (jobject) 0;\n");
-	Printf(dcast_wrap->code, "  %s *obj = *((%s **)&jCPtrBase);\n", norm_name, norm_name);
-	Printf(dcast_wrap->code, "  if (obj) director = dynamic_cast<Swig::Director *>(obj);\n");
-	Printf(dcast_wrap->code, "  if (director) jresult = director->swig_get_self(jenv);\n");
-	Printf(dcast_wrap->code, "  return jresult;\n");
-	Printf(dcast_wrap->code, "}\n");
-
-	Wrapper_print(dcast_wrap, f_wrappers);
-	DelWrapper(dcast_wrap);
-
-	Delete(norm_name);
-	Delete(wname);
-	Delete(downcast_method);
-      }
-
-      if (f_interface) {
-	Printv(f_interface, interface_class_code, "}\n", NIL);
-	addCloseNamespace(nspace, f_interface);
-	if (f_interface != f_single_out)
-	  Delete(f_interface);
-	f_interface = 0;
-      }
-
-      emitDirectorExtraMethods(n);
-
-      Delete(interface_class_code);
-      interface_class_code = old_interface_class_code;
-      Delete(csclazzname);
-      Delete(proxy_class_name);
-      proxy_class_name = old_proxy_class_name;
-      Delete(full_imclass_name);
-      full_imclass_name = old_full_imclass_name;
-      Delete(destructor_call);
-      destructor_call = old_destructor_call;
-      Delete(proxy_class_constants_code);
-      proxy_class_constants_code = old_proxy_class_constants_code;
-      Delete(proxy_class_def);
-      proxy_class_def = old_proxy_class_def;
-      Delete(proxy_class_code);
-      proxy_class_code = old_proxy_class_code;
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberfunctionHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int memberfunctionHandler(Node *n) {
-    Language::memberfunctionHandler(n);
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
-      Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-      Setattr(n, "imfuncname", intermediary_function_name);
-      proxyClassFunctionHandler(n);
-      Delete(overloaded_name);
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-
-    static_flag = true;
-    Language::staticmemberfunctionHandler(n);
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
-      Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-      Setattr(n, "imfuncname", intermediary_function_name);
-      proxyClassFunctionHandler(n);
-      Delete(overloaded_name);
-    }
-    static_flag = false;
-
-    return SWIG_OK;
-  }
-
-
-  /* -----------------------------------------------------------------------------
-   * proxyClassFunctionHandler()
-   *
-   * Function called for creating a C# wrapper function around a c++ function in the 
-   * proxy class. Used for both static and non-static C++ class functions.
-   * C++ class static functions map to C# static functions.
-   * Two extra attributes in the Node must be available. These are "proxyfuncname" - 
-   * the name of the C# class proxy function, which in turn will call "imfuncname" - 
-   * the intermediary (PInvoke) function name in the intermediary class.
-   * ----------------------------------------------------------------------------- */
-
-  void proxyClassFunctionHandler(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *intermediary_function_name = Getattr(n, "imfuncname");
-    String *proxy_function_name = Getattr(n, "proxyfuncname");
-    String *tm;
-    Parm *p;
-    Parm *last_parm = 0;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    bool setter_flag = false;
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-    bool is_interface = Getattr(parentNode(n), "feature:interface") != 0 
-      && !static_flag && Getattr(n, "interface:owner") == 0;
-
-    if (!proxy_flag)
-      return;
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in C#
-    if (Getattr(n, "overload:ignore"))
-      return;
-
-    // Don't generate proxy method for additional explicitcall method used in directors
-    if (GetFlag(n, "explicitcall"))
-      return;
-
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("in", l, NULL);
-    Swig_typemap_attach_parms("cstype", l, NULL);
-    Swig_typemap_attach_parms("csin", l, NULL);
-
-    /* Get return types */
-    if ((tm = Swig_typemap_lookup("cstype", n, "", 0))) {
-      // Note that in the case of polymorphic (covariant) return types, the method's return type is changed to be the base of the C++ return type
-      SwigType *covariant = Getattr(n, "covariant");
-      String *cstypeout = Getattr(n, "tmap:cstype:out");	// the type in the cstype typemap's out attribute overrides the type in the typemap
-      if (cstypeout)
-	tm = cstypeout;
-      substituteClassname(covariant ? covariant : t, tm);
-      Printf(return_type, "%s", tm);
-      if (covariant)
-	Swig_warning(WARN_CSHARP_COVARIANT_RET, input_file, line_number,
-		     "Covariant return types not supported in C#. Proxy method will return %s.\n", SwigType_str(covariant, 0));
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if (wrapping_member_flag && !enum_constant_flag) {
-      // Properties
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) == 0);
-      if (setter_flag)
-        Swig_typemap_attach_parms("csvarin", l, NULL);
-    }
-
-    /* Start generating the proxy function */
-    const String *outattributes = Getattr(n, "tmap:cstype:outattributes");
-    if (outattributes)
-      Printf(function_code, "  %s\n", outattributes);
-    const String *csattributes = Getattr(n, "feature:cs:attributes");
-    if (csattributes)
-      Printf(function_code, "  %s\n", csattributes);
-    const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-    if (methodmods) {
-      if (is_smart_pointer()) {
-	// Smart pointer classes do not mirror the inheritance hierarchy of the underlying pointer type, so no virtual/override/new required.
-	String *mmods = Copy(methodmods);
-	Replaceall(mmods, "override", "");
-	Replaceall(mmods, "virtual", "");
-	Replaceall(mmods, "new", "");
-	Chop(mmods);		// remove trailing whitespace
-	Printf(function_code, "  %s ", mmods);
-	Delete(mmods);
-      } else {
-	Printf(function_code, "  %s ", methodmods);
-      }
-    } else {
-      methodmods = (is_public(n) ? public_string : protected_string);
-      Printf(function_code, "  %s ", methodmods);
-      if (!is_smart_pointer()) {
-	// Smart pointer classes do not mirror the inheritance hierarchy of the underlying pointer type, so no virtual/override/new required.
-	if (Getattr(n, "override"))
-	    Printf(function_code, "override ");
-	else if (checkAttribute(n, "storage", "virtual"))
-	  Printf(function_code, "virtual ");
-	if (Getattr(n, "hides"))
-	  Printf(function_code, "new ");
-      }
-    }
-    if (static_flag)
-      Printf(function_code, "static ");
-    Printf(function_code, "%s %s(", return_type, proxy_function_name);
-    if (is_interface)
-      Printf(interface_class_code, "  %s %s(", return_type, proxy_function_name);
-    
-
-    Printv(imcall, full_imclass_name, ".$imfuncname(", NIL);
-    if (!static_flag)
-      Printf(imcall, "swigCPtr");
-
-    emit_mark_varargs(l);
-
-    int gencomma = !static_flag;
-
-    /* Output each parameter */
-    for (i = 0, p = l; p; i++) {
-
-      /* Ignored varargs */
-      if (checkAttribute(p, "varargs:ignore", "1")) {
-	p = nextSibling(p);
-	continue;
-      }
-
-      /* Ignored parameters */
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-
-      /* Ignore the 'this' argument for variable wrappers */
-      if (!(variable_wrapper_flag && i == 0)) {
-	SwigType *pt = Getattr(p, "type");
-	String *param_type = NewString("");
-        if (setter_flag)
-          last_parm = p;
-
-	/* Get the C# parameter type */
-	if ((tm = Getattr(p, "tmap:cstype"))) {
-	  substituteClassname(pt, tm);
-	  const String *inattributes = Getattr(p, "tmap:cstype:inattributes");
-	  Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	if (gencomma)
-	  Printf(imcall, ", ");
-
-	String *arg = makeParameterName(n, p, i, setter_flag);
-
-	// Use typemaps to transform type used in C# wrapper function (in proxy class) to type used in PInvoke function (in intermediary class)
-	if ((tm = Getattr(p, "tmap:csin"))) {
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$csinput", arg);
-          String *pre = Getattr(p, "tmap:csin:pre");
-          if (pre) {
-            substituteClassname(pt, pre);
-            Replaceall(pre, "$csinput", arg);
-            if (Len(pre_code) > 0)
-              Printf(pre_code, "\n");
-            Printv(pre_code, pre, NIL);
-          }
-          String *post = Getattr(p, "tmap:csin:post");
-          if (post) {
-            substituteClassname(pt, post);
-            Replaceall(post, "$csinput", arg);
-            if (Len(post_code) > 0)
-              Printf(post_code, "\n");
-            Printv(post_code, post, NIL);
-          }
-          String *terminator = Getattr(p, "tmap:csin:terminator");
-          if (terminator) {
-            substituteClassname(pt, terminator);
-            Replaceall(terminator, "$csinput", arg);
-            if (Len(terminator_code) > 0)
-              Insert(terminator_code, 0, "\n");
-            Insert(terminator_code, 0, terminator);
-          }
-	  Printv(imcall, tm, NIL);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	/* Add parameter to proxy function */
-	if (gencomma >= 2) {
-	  Printf(function_code, ", ");
-	  if (is_interface)
-	    Printf(interface_class_code, ", ");
-	}
-	gencomma = 2;
-	Printf(function_code, "%s %s", param_type, arg);
-	if (is_interface)
-	  Printf(interface_class_code, "%s %s", param_type, arg);
-
-	Delete(arg);
-	Delete(param_type);
-      }
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ")");
-    if (is_interface)
-      Printf(interface_class_code, ");\n");
-
-    // Transform return type used in PInvoke function (in intermediary class) to type used in C# wrapper function (in proxy class)
-    if ((tm = Swig_typemap_lookup("csout", n, "", 0))) {
-      excodeSubstitute(n, tm, "csout", n);
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      bool is_terminator_code = Len(terminator_code) > 0;
-      if (is_pre_code || is_post_code || is_terminator_code) {
-        Replaceall(tm, "\n ", "\n   "); // add extra indentation to code in typemap
-        if (is_post_code) {
-          Insert(tm, 0, "\n    try ");
-          Printv(tm, " finally {\n", post_code, "\n    }", NIL);
-        } else {
-          Insert(tm, 0, "\n    ");
-        }
-        if (is_pre_code) {
-          Insert(tm, 0, pre_code);
-          Insert(tm, 0, "\n");
-        }
-        if (is_terminator_code) {
-          Printv(tm, "\n", terminator_code, NIL);
-        }
-	Insert(tm, 0, "{");
-	Printf(tm, "\n  }");
-      }
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      substituteClassname(t, tm);
-
-      // For director methods: generate code to selectively make a normal polymorphic call or 
-      // an explicit method call - needed to prevent infinite recursion calls in director methods.
-      Node *explicit_n = Getattr(n, "explicitcallnode");
-      if (explicit_n) {
-	String *ex_overloaded_name = getOverloadedName(explicit_n);
-	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), ex_overloaded_name);
-
-	String *ex_imcall = Copy(imcall);
-	Replaceall(ex_imcall, "$imfuncname", ex_intermediary_function_name);
-	Replaceall(imcall, "$imfuncname", intermediary_function_name);
-	String *excode = NewString("");
-	Node *directorNode = Getattr(n, "directorNode");
-	if (directorNode) {
-	  UpcallData *udata = Getattr(directorNode, "upcalldata");
-	  String *methid = Getattr(udata, "class_methodidx");
-
-	  if (!Cmp(return_type, "void"))
-	    Printf(excode, "if (SwigDerivedClassHasMethod(\"%s\", swigMethodTypes%s)) %s; else %s", proxy_function_name, methid, ex_imcall, imcall);
-	  else
-	    Printf(excode, "(SwigDerivedClassHasMethod(\"%s\", swigMethodTypes%s) ? %s : %s)", proxy_function_name, methid, ex_imcall, imcall);
-
-	  Clear(imcall);
-	  Printv(imcall, excode, NIL);
-	} else {
-	  // probably an ignored method or nodirector
-	}
-	Delete(excode);
-	Delete(ex_overloaded_name);
-      } else {
-	Replaceall(imcall, "$imfuncname", intermediary_function_name);
-      }
-      Replaceall(tm, "$imcall", imcall);
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csout typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if (wrapping_member_flag && !enum_constant_flag) {
-      // Properties
-      if (generate_property_declaration_flag) {	// Ensure the declaration is generated just once should the property contain both a set and get
-	// Get the C# variable type - obtained differently depending on whether a setter is required.
-	String *variable_type = return_type;
-	if (setter_flag) {
-	  assert(last_parm);	// (last parameter is the only parameter for properties)
-	  /* Get variable type - ensure the variable name is fully resolved during typemap lookup via the symbol table set in NewParmNode */
-	  SwigType *cvariable_type = Getattr(last_parm, "type");
-	  Parm *variable_parm = NewParmNode(cvariable_type, n);
-	  if ((tm = Swig_typemap_lookup("cstype", variable_parm, "", 0))) {
-	    String *cstypeout = Getattr(variable_parm, "tmap:cstype:out");	// the type in the cstype typemap's out attribute overrides the type in the typemap
-	    if (cstypeout)
-	      tm = cstypeout;
-	    substituteClassname(cvariable_type, tm);
-	    variable_type = tm;
-	  } else {
-	    Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(cvariable_type, 0));
-	  }
-	}
-	const String *csattributes = Getattr(n, "feature:cs:attributes");
-	if (csattributes)
-	  Printf(proxy_class_code, "  %s\n", csattributes);
-	const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-	if (!methodmods)
-	  methodmods = (is_public(n) ? public_string : protected_string);
-	Printf(proxy_class_code, "  %s %s%s %s {", methodmods, static_flag ? "static " : "", variable_type, variable_name);
-      }
-      generate_property_declaration_flag = false;
-
-      if (setter_flag) {
-	// Setter method
-	assert(last_parm);	// (last parameter is the only parameter for properties)
-	SwigType *cvariable_type = Getattr(last_parm, "type");
-	Parm *variable_parm = NewParmNode(cvariable_type, n);
-	if ((tm = Swig_typemap_lookup("csvarin", variable_parm, "", 0))) {
-	  substituteClassname(cvariable_type, tm);
-	  Replaceall(tm, "$csinput", "value");
-	  Replaceall(tm, "$imcall", imcall);
-	  excodeSubstitute(n, tm, "csvarin", variable_parm);
-	  Printf(proxy_class_code, "%s", tm);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarin typemap defined for %s\n", SwigType_str(cvariable_type, 0));
-	}
-      } else {
-	// Getter method
-	if ((tm = Swig_typemap_lookup("csvarout", n, "", 0))) {
-	  if (GetFlag(n, "feature:new"))
-	    Replaceall(tm, "$owner", "true");
-	  else
-	    Replaceall(tm, "$owner", "false");
-	  substituteClassname(t, tm);
-	  Replaceall(tm, "$imcall", imcall);
-	  excodeSubstitute(n, tm, "csvarout", n);
-	  Printf(proxy_class_code, "%s", tm);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarout typemap defined for %s\n", SwigType_str(t, 0));
-	}
-      }
-    } else {
-      // Normal function call
-      Printf(function_code, " %s\n\n", tm ? (const String *) tm : empty_string);
-      Printv(proxy_class_code, function_code, NIL);
-    }
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(terminator_code);
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-  }
-
-  /* ----------------------------------------------------------------------
-   * constructorHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int constructorHandler(Node *n) {
-
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *function_code = NewString("");
-    String *helper_code = NewString(""); // Holds code for the constructor helper method generated only when the csin typemap has code in the pre or post attributes
-    String *helper_args = NewString("");
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-    String *im_return_type = NewString("");
-    bool feature_director = (parentNode(n) && Swig_directorclass(n));
-
-    Language::constructorHandler(n);
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in C#
-    if (Getattr(n, "overload:ignore"))
-      return SWIG_OK;
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *mangled_overname = Swig_name_construct(getNSpace(), overloaded_name);
-      String *imcall = NewString("");
-
-      const String *csattributes = Getattr(n, "feature:cs:attributes");
-      if (csattributes) {
-	Printf(function_code, "  %s\n", csattributes);
-	Printf(helper_code, "  %s\n", csattributes);
-      }
-      const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-      methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-      tm = Getattr(n, "tmap:imtype"); // typemaps were attached earlier to the node
-      String *imtypeout = Getattr(n, "tmap:imtype:out");	// the type in the imtype typemap's out attribute overrides the type in the typemap
-      if (imtypeout)
-	tm = imtypeout;
-      Printf(im_return_type, "%s", tm);
-
-      Printf(function_code, "  %s %s(", methodmods, proxy_class_name);
-      Printf(helper_code, "  static private %s SwigConstruct%s(", im_return_type, proxy_class_name);
-
-      Printv(imcall, full_imclass_name, ".", mangled_overname, "(", NIL);
-
-      /* Attach the non-standard typemaps to the parameter list */
-      Swig_typemap_attach_parms("in", l, NULL);
-      Swig_typemap_attach_parms("cstype", l, NULL);
-      Swig_typemap_attach_parms("csin", l, NULL);
-
-      emit_mark_varargs(l);
-
-      int gencomma = 0;
-
-      /* Output each parameter */
-      for (i = 0, p = l; p; i++) {
-
-	/* Ignored varargs */
-	if (checkAttribute(p, "varargs:ignore", "1")) {
-	  p = nextSibling(p);
-	  continue;
-	}
-
-	/* Ignored parameters */
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	SwigType *pt = Getattr(p, "type");
-	String *param_type = NewString("");
-
-	/* Get the C# parameter type */
-	if ((tm = Getattr(p, "tmap:cstype"))) {
-	  substituteClassname(pt, tm);
-	  const String *inattributes = Getattr(p, "tmap:cstype:inattributes");
-	  Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	if (gencomma)
-	  Printf(imcall, ", ");
-
-	String *arg = makeParameterName(n, p, i, false);
-        String *cshin = 0;
-
-	// Use typemaps to transform type used in C# wrapper function (in proxy class) to type used in PInvoke function (in intermediary class)
-	if ((tm = Getattr(p, "tmap:csin"))) {
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$csinput", arg);
-          String *pre = Getattr(p, "tmap:csin:pre");
-          if (pre) {
-            substituteClassname(pt, pre);
-            Replaceall(pre, "$csinput", arg);
-            if (Len(pre_code) > 0)
-              Printf(pre_code, "\n");
-            Printv(pre_code, pre, NIL);
-          }
-          String *post = Getattr(p, "tmap:csin:post");
-          if (post) {
-            substituteClassname(pt, post);
-            Replaceall(post, "$csinput", arg);
-            if (Len(post_code) > 0)
-              Printf(post_code, "\n");
-            Printv(post_code, post, NIL);
-          }
-          String *terminator = Getattr(p, "tmap:csin:terminator");
-          if (terminator) {
-            substituteClassname(pt, terminator);
-            Replaceall(terminator, "$csinput", arg);
-            if (Len(terminator_code) > 0)
-              Insert(terminator_code, 0, "\n");
-            Insert(terminator_code, 0, terminator);
-          }
-          cshin = Getattr(p, "tmap:csin:cshin");
-          if (cshin)
-            Replaceall(cshin, "$csinput", arg);
-	  Printv(imcall, tm, NIL);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	/* Add parameter to proxy function */
-	if (gencomma) {
-	  Printf(function_code, ", ");
-	  Printf(helper_code, ", ");
-	  Printf(helper_args, ", ");
-        }
-	Printf(function_code, "%s %s", param_type, arg);
-	Printf(helper_code, "%s %s", param_type, arg);
-	Printf(helper_args, "%s", cshin ? cshin : arg);
-	++gencomma;
-
-	Delete(cshin);
-	Delete(arg);
-	Delete(param_type);
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      Printf(imcall, ")");
-
-      Printf(function_code, ")");
-      Printf(helper_code, ")");
-
-      /* Insert the csconstruct typemap, doing the replacement for $directorconnect, as needed */
-      Hash *attributes = NewHash();
-      String *construct_tm = Copy(typemapLookup(n, "csconstruct", Getattr(n, "name"),
-						WARN_CSHARP_TYPEMAP_CSCONSTRUCT_UNDEF, attributes));
-      if (construct_tm) {
-	if (!feature_director) {
-	  Replaceall(construct_tm, "$directorconnect", "");
-	} else {
-	  String *connect_attr = Getattr(attributes, "tmap:csconstruct:directorconnect");
-
-	  if (connect_attr) {
-	    Replaceall(construct_tm, "$directorconnect", connect_attr);
-	  } else {
-	    Swig_warning(WARN_CSHARP_NO_DIRECTORCONNECT_ATTR, input_file, line_number, "\"directorconnect\" attribute missing in %s \"csconstruct\" typemap.\n",
-			 Getattr(n, "name"));
-	    Replaceall(construct_tm, "$directorconnect", "");
-	  }
-	}
-
-	Printv(function_code, " ", construct_tm, NIL);
-      }
-
-      excodeSubstitute(n, function_code, "csconstruct", attributes);
-
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      bool is_terminator_code = Len(terminator_code) > 0;
-      if (is_pre_code || is_post_code || is_terminator_code) {
-        Printf(helper_code, " {\n");
-        if (is_pre_code) {
-          Printv(helper_code, pre_code, "\n", NIL);
-        }
-        if (is_post_code) {
-          Printf(helper_code, "    try {\n");
-          Printv(helper_code, "      return ", imcall, ";\n", NIL);
-          Printv(helper_code, "    } finally {\n", post_code, "\n    }", NIL);
-        } else {
-          Printv(helper_code, "    return ", imcall, ";", NIL);
-        }
-        if (is_terminator_code) {
-          Printv(helper_code, "\n", terminator_code, NIL);
-        }
-        Printf(helper_code, "\n  }\n");
-        String *helper_name = NewStringf("%s.SwigConstruct%s(%s)", proxy_class_name, proxy_class_name, helper_args);
-        String *im_outattributes = Getattr(n, "tmap:imtype:outattributes");
-        if (im_outattributes)
-          Printf(proxy_class_code, "  %s\n", im_outattributes);
-        Printv(proxy_class_code, helper_code, "\n", NIL);
-        Replaceall(function_code, "$imcall", helper_name);
-        Delete(helper_name);
-      } else {
-        Replaceall(function_code, "$imcall", imcall);
-      }
-
-      Printv(proxy_class_code, function_code, "\n", NIL);
-
-      Delete(helper_args);
-      Delete(im_return_type);
-      Delete(pre_code);
-      Delete(post_code);
-      Delete(terminator_code);
-      Delete(construct_tm);
-      Delete(attributes);
-      Delete(overloaded_name);
-      Delete(imcall);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * destructorHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int destructorHandler(Node *n) {
-    Language::destructorHandler(n);
-    String *symname = Getattr(n, "sym:name");
-
-    if (proxy_flag) {
-      Printv(destructor_call, full_imclass_name, ".", Swig_name_destroy(getNSpace(), symname), "(swigCPtr)", NIL);
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * membervariableHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int membervariableHandler(Node *n) {
-
-    generate_property_declaration_flag = true;
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    variable_wrapper_flag = true;
-    Language::membervariableHandler(n);
-    wrapping_member_flag = false;
-    variable_wrapper_flag = false;
-    generate_property_declaration_flag = false;
-
-    Printf(proxy_class_code, "\n  }\n\n");
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmembervariableHandler(Node *n) {
-
-    bool static_const_member_flag = (Getattr(n, "value") == 0);
-
-    generate_property_declaration_flag = true;
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    static_flag = true;
-    Language::staticmembervariableHandler(n);
-    wrapping_member_flag = false;
-    static_flag = false;
-    generate_property_declaration_flag = false;
-
-    if (static_const_member_flag)
-      Printf(proxy_class_code, "\n  }\n\n");
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberconstantHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int memberconstantHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    Language::memberconstantHandler(n);
-    wrapping_member_flag = false;
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getOverloadedName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getOverloadedName(Node *n) {
-
-    /* A C# HandleRef is used for all classes in the SWIG intermediary class.
-     * The intermediary class methods are thus mangled when overloaded to give
-     * a unique name. */
-    String *overloaded_name = NewStringf("%s", Getattr(n, "sym:name"));
-
-    if (Getattr(n, "sym:overloaded")) {
-      Printv(overloaded_name, Getattr(n, "sym:overname"), NIL);
-    }
-
-    return overloaded_name;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * moduleClassFunctionHandler()
-   * ----------------------------------------------------------------------------- */
-
-  void moduleClassFunctionHandler(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    Parm *last_parm = 0;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    int num_arguments = 0;
-    String *overloaded_name = getOverloadedName(n);
-    String *func_name = NULL;
-    bool setter_flag = false;
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("cstype", l, NULL);
-    Swig_typemap_attach_parms("csin", l, NULL);
-
-    /* Get return types */
-    if ((tm = Swig_typemap_lookup("cstype", n, "", 0))) {
-      String *cstypeout = Getattr(n, "tmap:cstype:out");	// the type in the cstype typemap's out attribute overrides the type in the typemap
-      if (cstypeout)
-	tm = cstypeout;
-      substituteClassname(t, tm);
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    /* Change function name for global variables */
-    if (proxy_flag && global_variable_flag) {
-      // Capitalize the first letter in the variable to create the getter/setter function name
-      func_name = NewString("");
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), variable_name)) == 0);
-      if (setter_flag)
-	Printf(func_name, "set");
-      else
-	Printf(func_name, "get");
-      Putc(toupper((int) *Char(variable_name)), func_name);
-      Printf(func_name, "%s", Char(variable_name) + 1);
-      if (setter_flag)
-        Swig_typemap_attach_parms("csvarin", l, NULL);
-    } else {
-      func_name = Copy(Getattr(n, "sym:name"));
-    }
-
-    /* Start generating the function */
-    const String *outattributes = Getattr(n, "tmap:cstype:outattributes");
-    if (outattributes)
-      Printf(function_code, "  %s\n", outattributes);
-    const String *csattributes = Getattr(n, "feature:cs:attributes");
-    if (csattributes)
-      Printf(function_code, "  %s\n", csattributes);
-    const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-    methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-    Printf(function_code, "  %s static %s %s(", methodmods, return_type, func_name);
-    Printv(imcall, imclass_name, ".", overloaded_name, "(", NIL);
-
-    /* Get number of required and total arguments */
-    num_arguments = emit_num_arguments(l);
-
-    bool global_or_member_variable = global_variable_flag || (wrapping_member_flag && !enum_constant_flag);
-    int gencomma = 0;
-
-    /* Output each parameter */
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      /* Ignored parameters */
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *param_type = NewString("");
-      last_parm = p;
-
-      /* Get the C# parameter type */
-      if ((tm = Getattr(p, "tmap:cstype"))) {
-	substituteClassname(pt, tm);
-	const String *inattributes = Getattr(p, "tmap:cstype:inattributes");
-	Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-      } else {
-	Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      if (gencomma)
-	Printf(imcall, ", ");
-
-      String *arg = makeParameterName(n, p, i, global_or_member_variable);
-
-      // Use typemaps to transform type used in C# wrapper function (in proxy class) to type used in PInvoke function (in intermediary class)
-      if ((tm = Getattr(p, "tmap:csin"))) {
-	substituteClassname(pt, tm);
-	Replaceall(tm, "$csinput", arg);
-	String *pre = Getattr(p, "tmap:csin:pre");
-	if (pre) {
-	  substituteClassname(pt, pre);
-	  Replaceall(pre, "$csinput", arg);
-          if (Len(pre_code) > 0)
-            Printf(pre_code, "\n");
-	  Printv(pre_code, pre, NIL);
-	}
-	String *post = Getattr(p, "tmap:csin:post");
-	if (post) {
-	  substituteClassname(pt, post);
-	  Replaceall(post, "$csinput", arg);
-          if (Len(post_code) > 0)
-            Printf(post_code, "\n");
-	  Printv(post_code, post, NIL);
-	}
-        String *terminator = Getattr(p, "tmap:csin:terminator");
-        if (terminator) {
-          substituteClassname(pt, terminator);
-          Replaceall(terminator, "$csinput", arg);
-          if (Len(terminator_code) > 0)
-            Insert(terminator_code, 0, "\n");
-          Insert(terminator_code, 0, terminator);
-        }
-	Printv(imcall, tm, NIL);
-      } else {
-	Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to module class function */
-      if (gencomma >= 2)
-	Printf(function_code, ", ");
-      gencomma = 2;
-      Printf(function_code, "%s %s", param_type, arg);
-
-      p = Getattr(p, "tmap:in:next");
-      Delete(arg);
-      Delete(param_type);
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ")");
-
-    // Transform return type used in PInvoke function (in intermediary class) to type used in C# wrapper function (in module class)
-    if ((tm = Swig_typemap_lookup("csout", n, "", 0))) {
-      excodeSubstitute(n, tm, "csout", n);
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      bool is_terminator_code = Len(terminator_code) > 0;
-      if (is_pre_code || is_post_code || is_terminator_code) {
-        Replaceall(tm, "\n ", "\n   "); // add extra indentation to code in typemap
-        if (is_post_code) {
-          Insert(tm, 0, "\n    try ");
-          Printv(tm, " finally {\n", post_code, "\n    }", NIL);
-        } else {
-          Insert(tm, 0, "\n    ");
-        }
-        if (is_pre_code) {
-          Insert(tm, 0, pre_code);
-          Insert(tm, 0, "\n");
-        }
-        if (is_terminator_code) {
-          Printv(tm, "\n", terminator_code, NIL);
-        }
-	Insert(tm, 0, "{");
-	Printf(tm, "\n  }");
-      }
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      substituteClassname(t, tm);
-      Replaceall(tm, "$imcall", imcall);
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csout typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if (proxy_flag && global_variable_flag) {
-      // Properties
-      if (generate_property_declaration_flag) {	// Ensure the declaration is generated just once should the property contain both a set and get
-	// Get the C# variable type - obtained differently depending on whether a setter is required.
-	String *variable_type = return_type;
-	if (setter_flag) {
-	  p = last_parm;	// (last parameter is the only parameter for properties)
-	  SwigType *pt = Getattr(p, "type");
-	  if ((tm = Getattr(p, "tmap:cstype"))) {
-	    substituteClassname(pt, tm);
-            String *cstypeout = Getattr(p, "tmap:cstype:out");	// the type in the cstype typemap's out attribute overrides the type in the typemap
-	    variable_type = cstypeout ? cstypeout : tm;
-	  } else {
-	    Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarin typemap defined for %s\n", SwigType_str(pt, 0));
-	  }
-	}
-	const String *csattributes = Getattr(n, "feature:cs:attributes");
-	if (csattributes)
-	  Printf(module_class_code, "  %s\n", csattributes);
-	const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
-	if (!methodmods)
-	  methodmods = (is_public(n) ? public_string : protected_string);
-	Printf(module_class_code, "  %s static %s %s {", methodmods, variable_type, variable_name);
-      }
-      generate_property_declaration_flag = false;
-
-      if (setter_flag) {
-	// Setter method
-	p = last_parm;		// (last parameter is the only parameter for properties)
-	SwigType *pt = Getattr(p, "type");
-	if ((tm = Getattr(p, "tmap:csvarin"))) {
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$csinput", "value");
-	  Replaceall(tm, "$imcall", imcall);
-	  excodeSubstitute(n, tm, "csvarin", p);
-	  Printf(module_class_code, "%s", tm);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarin typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-      } else {
-	// Getter method
-	if ((tm = Swig_typemap_lookup("csvarout", n, "", 0))) {
-	  if (GetFlag(n, "feature:new"))
-	    Replaceall(tm, "$owner", "true");
-	  else
-	    Replaceall(tm, "$owner", "false");
-	  substituteClassname(t, tm);
-	  Replaceall(tm, "$imcall", imcall);
-	  excodeSubstitute(n, tm, "csvarout", n);
-	  Printf(module_class_code, "%s", tm);
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarout typemap defined for %s\n", SwigType_str(t, 0));
-	}
-      }
-    } else {
-      // Normal function call
-      Printf(function_code, " %s\n\n", tm ? (const String *) tm : empty_string);
-      Printv(module_class_code, function_code, NIL);
-    }
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(terminator_code);
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-    Delete(func_name);
-  }
-
-  /*----------------------------------------------------------------------
-   * replaceSpecialVariables()
-   *--------------------------------------------------------------------*/
-
-  virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) {
-    (void)method;
-    SwigType *type = Getattr(parm, "type");
-    substituteClassname(type, tm);
-  }
-
-  /*----------------------------------------------------------------------
-   * decodeEnumFeature()
-   * Decode the possible enum features, which are one of:
-   *   %csenum(simple)
-   *   %csenum(typeunsafe) - default
-   *   %csenum(typesafe)
-   *   %csenum(proper)
-   *--------------------------------------------------------------------*/
-
-  EnumFeature decodeEnumFeature(Node *n) {
-    EnumFeature enum_feature = TypeunsafeEnum;
-    String *feature = Getattr(n, "feature:cs:enum");
-    if (feature) {
-      if (Cmp(feature, "simple") == 0)
-	enum_feature = SimpleEnum;
-      else if (Cmp(feature, "typesafe") == 0)
-	enum_feature = TypesafeEnum;
-      else if (Cmp(feature, "proper") == 0)
-	enum_feature = ProperEnum;
-    }
-    return enum_feature;
-  }
-
-  /* -----------------------------------------------------------------------
-   * enumValue()
-   * This method will return a string with an enum value to use in C# generated
-   * code. If the %csconst feature is not used, the string will contain the intermediary
-   * class call to obtain the enum value. The intermediary class and PINVOKE methods to obtain
-   * the enum value will be generated. Otherwise the C/C++ enum value will be used if there
-   * is one and hopefully it will compile as C# code - e.g. 20 as in: enum E{e=20};
-   * The %csconstvalue feature overrides all other ways to generate the constant value.
-   * The caller must delete memory allocated for the returned string.
-   * ------------------------------------------------------------------------ */
-
-  String *enumValue(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-
-    // Check for the %csconstvalue feature
-    String *value = Getattr(n, "feature:cs:constvalue");
-
-    if (!value) {
-      // The %csconst feature determines how the constant value is obtained
-      int const_feature_flag = GetFlag(n, "feature:cs:const");
-
-      if (const_feature_flag) {
-	// Use the C syntax to make a true C# constant and hope that it compiles as C# code
-	value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex"));
-      } else {
-	String *newsymname = 0;
-	if (!getCurrentClass() || !proxy_flag) {
-	  String *enumClassPrefix = getEnumClassPrefix();
-	  if (enumClassPrefix) {
-	    // A global scoped enum
-	    newsymname = Swig_name_member(0, enumClassPrefix, symname);
-	    symname = newsymname;
-	  }
-	}
-
-	// Get the enumvalue from a PINVOKE call
-	if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) {
-	  // Strange hack to change the name
-	  Setattr(n, "name", Getattr(n, "value"));	/* for wrapping of enums in a namespace when emit_action is used */
-	  constantWrapper(n);
-	  value = NewStringf("%s.%s()", full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), symname));
-	} else {
-	  memberconstantHandler(n);
-	  value = NewStringf("%s.%s()", full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), Swig_name_member(0, getEnumClassPrefix(), symname)));
-	}
-      }
-    }
-    return value;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getEnumName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getEnumName(SwigType *t) {
-    Node *enumname = NULL;
-    Node *n = enumLookup(t);
-    if (n) {
-      enumname = Getattr(n, "enumname");
-      if (!enumname) {
-	String *symname = Getattr(n, "sym:name");
-	if (symname) {
-	  // Add in class scope when referencing enum if not a global enum
-	  String *scopename_prefix = Swig_scopename_prefix(Getattr(n, "name"));
-	  String *proxyname = 0;
-	  if (scopename_prefix) {
-	    proxyname = getProxyName(scopename_prefix);
-	  }
-	  if (proxyname) {
-	    enumname = NewStringf("%s.%s", proxyname, symname);
-	  } else {
-	    // global enum or enum in a namespace
-	    String *nspace = Getattr(n, "sym:nspace");
-	    if (nspace) {
-	      if (namespce)
-		enumname = NewStringf("%s.%s.%s", namespce, nspace, symname);
-	      else
-		enumname = NewStringf("%s.%s", nspace, symname);
-	    } else {
-	      enumname = Copy(symname);
-	    }
-	  }
-	  Setattr(n, "enumname", enumname);
-	  Delete(enumname);
-	  Delete(scopename_prefix);
-	}
-      }
-    }
-
-    return enumname;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteClassname()
-   *
-   * Substitute the special variable $csclassname with the proxy class name for classes/structs/unions 
-   * that SWIG knows about. Also substitutes enums with enum name.
-   * Otherwise use the $descriptor name for the C# class name. Note that the $&csclassname substitution
-   * is the same as a $&descriptor substitution, ie one pointer added to descriptor name.
-   * Inputs:
-   *   pt - parameter type
-   *   tm - typemap contents that might contain the special variable to be replaced
-   * Outputs:
-   *   tm - typemap contents complete with the special variable substitution
-   * Return:
-   *   substitution_performed - flag indicating if a substitution was performed
-   * ----------------------------------------------------------------------------- */
-
-  bool substituteClassname(SwigType *pt, String *tm) {
-    bool substitution_performed = false;
-    SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
-    SwigType *strippedtype = SwigType_strip_qualifiers(type);
-
-    if (Strstr(tm, "$csclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      substituteClassnameSpecialVariable(classnametype, tm, "$csclassname");
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$*csclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      Delete(SwigType_pop(classnametype));
-      if (Len(classnametype) > 0) {
-	substituteClassnameSpecialVariable(classnametype, tm, "$*csclassname");
-	substitution_performed = true;
-      }
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$&csclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      SwigType_add_pointer(classnametype);
-      substituteClassnameSpecialVariable(classnametype, tm, "$&csclassname");
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$csinterfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$csinterfacename", true);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$*csinterfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      Delete(SwigType_pop(interfacenametype));
-      if (Len(interfacenametype) > 0) {
-	substituteInterfacenameSpecialVariable(interfacenametype, tm, "$*csinterfacename", true);
-	substitution_performed = true;
-      }
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$&csinterfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      SwigType_add_pointer(interfacenametype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$&csinterfacename", true);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$interfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$interfacename", false);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$*interfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      Delete(SwigType_pop(interfacenametype));
-      if (Len(interfacenametype) > 0) {
-	substituteInterfacenameSpecialVariable(interfacenametype, tm, "$*interfacename", false);
-	substitution_performed = true;
-      }
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$&interfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      SwigType_add_pointer(interfacenametype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$&interfacename", false);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-
-    Delete(strippedtype);
-    Delete(type);
-
-    return substitution_performed;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteClassnameSpecialVariable()
-   * ----------------------------------------------------------------------------- */
-
-  void substituteClassnameSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
-    String *replacementname;
-    if (SwigType_isenum(classnametype)) {
-      String *enumname = getEnumName(classnametype);
-      if (enumname) {
-	replacementname = Copy(enumname);
-      } else {
-	bool anonymous_enum = (Cmp(classnametype, "enum ") == 0);
-	if (anonymous_enum) {
-	  replacementname = NewString("int");
-	} else {
-	  // An unknown enum - one that has not been parsed (neither a C enum forward reference nor a definition) or an ignored enum
-	  replacementname = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
-	  Replace(replacementname, "enum ", "", DOH_REPLACE_ANY);
-	  Setattr(swig_types_hash, replacementname, classnametype);
-	}
-      }
-    } else {
-      String *classname = getProxyName(classnametype); // getProxyName() works for pointers to classes too
-      if (classname) {
-	replacementname = Copy(classname);
-      } else {
-	// use $descriptor if SWIG does not know anything about this type. Note that any typedefs are resolved.
-	replacementname = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
-
-	// Add to hash table so that the type wrapper classes can be created later
-	Setattr(swig_types_hash, replacementname, classnametype);
-      }
-    }
-    Replaceall(tm, classnamespecialvariable, replacementname);
-
-    Delete(replacementname);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteInterfacenameSpecialVariable()
-   * ----------------------------------------------------------------------------- */
-
-  void substituteInterfacenameSpecialVariable(SwigType *interfacenametype, String *tm, const char *interfacenamespecialvariable, bool qualified) {
-
-    String *interfacename = getInterfaceName(interfacenametype, qualified);
-    if (interfacename) {
-      String *replacementname = Copy(interfacename);
-      Replaceall(tm, interfacenamespecialvariable, replacementname);
-      Delete(replacementname);
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitTypeWrapperClass()
-   * ----------------------------------------------------------------------------- */
-
-  void emitTypeWrapperClass(String *classname, SwigType *type) {
-    Node *n = NewHash();
-    Setfile(n, input_file);
-    Setline(n, line_number);
-
-    String *swigtype = NewString("");
-    File *f_swigtype = getOutputFile(SWIG_output_directory(), classname);
-
-    addOpenNamespace(0, f_swigtype);
-
-    // Pure C# baseclass and interfaces
-    const String *pure_baseclass = typemapLookup(n, "csbase", type, WARN_NONE);
-    const String *pure_interfaces = typemapLookup(n, "csinterfaces", type, WARN_NONE);
-
-    // Emit the class
-    Printv(swigtype, typemapLookup(n, "csimports", type, WARN_NONE),	// Import statements
-	   "\n", NIL);
-
-    // Class attributes
-    const String *csattributes = typemapLookup(n, "csattributes", type, WARN_NONE);
-    if (csattributes && *Char(csattributes))
-      Printf(swigtype, "%s\n", csattributes);
-
-    Printv(swigtype, typemapLookup(n, "csclassmodifiers", type, WARN_CSHARP_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
-	   " $csclassname",	// Class name and base class
-	   (*Char(pure_baseclass) || *Char(pure_interfaces)) ? " : " : "", pure_baseclass, ((*Char(pure_baseclass)) && *Char(pure_interfaces)) ?	// Interfaces
-	   ", " : "", pure_interfaces, " {", typemapLookup(n, "csbody", type, WARN_CSHARP_TYPEMAP_CSBODY_UNDEF),	// main body of class
-	   typemapLookup(n, "cscode", type, WARN_NONE),	// extra C# code
-	   "}\n", NIL);
-
-    Replaceall(swigtype, "$csclassname", classname);
-    Replaceall(swigtype, "$module", module_class_name);
-    Replaceall(swigtype, "$imclassname", imclass_name);
-    Replaceall(swigtype, "$dllimport", dllimport);
-
-    // For unknown enums
-    Replaceall(swigtype, "$enumvalues", "");
-
-    Printv(f_swigtype, swigtype, NIL);
-
-    addCloseNamespace(0, f_swigtype);
-    if (f_swigtype != f_single_out)
-      Delete(f_swigtype);
-    f_swigtype = NULL;
-    Delete(swigtype);
-    Delete(n);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * typemapLookup()
-   * n - for input only and must contain info for Getfile(n) and Getline(n) to work
-   * tmap_method - typemap method name
-   * type - typemap type to lookup
-   * warning - warning number to issue if no typemaps found
-   * typemap_attributes - the typemap attributes are attached to this node and will 
-   *   also be used for temporary storage if non null
-   * return is never NULL, unlike Swig_typemap_lookup()
-   * ----------------------------------------------------------------------------- */
-
-  const String *typemapLookup(Node *n, const_String_or_char_ptr tmap_method, SwigType *type, int warning, Node *typemap_attributes = 0) {
-    Node *node = !typemap_attributes ? NewHash() : typemap_attributes;
-    Setattr(node, "type", type);
-    Setfile(node, Getfile(n));
-    Setline(node, Getline(n));
-    const String *tm = Swig_typemap_lookup(tmap_method, node, "", 0);
-    if (!tm) {
-      tm = empty_string;
-      if (warning != WARN_NONE)
-	Swig_warning(warning, Getfile(n), Getline(n), "No %s typemap defined for %s\n", tmap_method, SwigType_str(type, 0));
-    }
-    if (!typemap_attributes)
-      Delete(node);
-    return tm;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * canThrow()
-   * Determine whether the code in the typemap can throw a C# exception.
-   * If so, note it for later when excodeSubstitute() is called.
-   * ----------------------------------------------------------------------------- */
-
-  void canThrow(Node *n, const String *typemap, Node *parameter) {
-    String *canthrow_attribute = NewStringf("tmap:%s:canthrow", typemap);
-    String *canthrow = Getattr(parameter, canthrow_attribute);
-    if (canthrow)
-      Setattr(n, "csharp:canthrow", "1");
-    Delete(canthrow_attribute);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * excodeSubstitute()
-   * If a method can throw a C# exception, additional exception code is added to
-   * check for the pending exception so that it can then throw the exception. The
-   * $excode special variable is replaced by the exception code in the excode
-   * typemap attribute.
-   * ----------------------------------------------------------------------------- */
-
-  void excodeSubstitute(Node *n, String *code, const String *typemap, Node *parameter) {
-    String *excode_attribute = NewStringf("tmap:%s:excode", typemap);
-    String *excode = Getattr(parameter, excode_attribute);
-    if (Getattr(n, "csharp:canthrow")) {
-      int count = Replaceall(code, "$excode", excode);
-      if (count < 1 || !excode) {
-	Swig_warning(WARN_CSHARP_EXCODE, input_file, line_number,
-		     "C# exception may not be thrown - no $excode or excode attribute in '%s' typemap.\n", typemap);
-      }
-    } else {
-      Replaceall(code, "$excode", empty_string);
-    }
-    Delete(excode_attribute);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addOpenNamespace()
-   * ----------------------------------------------------------------------------- */
-
-  void addOpenNamespace(const String *nspace, File *file) {
-    if (namespce || nspace) {
-      Printf(file, "namespace ");
-      if (namespce)
-	Printv(file, namespce, nspace ? "." : "", NIL);
-      if (nspace)
-	Printv(file, nspace, NIL);
-      Printf(file, " {\n");
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addCloseNamespace()
-   * ----------------------------------------------------------------------------- */
-
-  void addCloseNamespace(const String *nspace, File *file) {
-    if (namespce || nspace)
-      Printf(file, "\n}\n");
-  }
-
-  /* -----------------------------------------------------------------------------
-   * outputDirectory()
-   *
-   * Return the directory to use for generating C# classes/enums and create the
-   * subdirectory (does not create if language specific outdir does not exist).
-   * ----------------------------------------------------------------------------- */
-
-  String *outputDirectory(String *nspace) {
-    String *output_directory = Copy(SWIG_output_directory());
-    if (nspace) {
-      String *nspace_subdirectory = Copy(nspace);
-      Replaceall(nspace_subdirectory, ".", SWIG_FILE_DELIMITER);
-      String *newdir_error = Swig_new_subdirectory(output_directory, nspace_subdirectory);
-      if (newdir_error) {
-	Printf(stderr, "%s\n", newdir_error);
-	Delete(newdir_error);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Printv(output_directory, nspace_subdirectory, SWIG_FILE_DELIMITER, 0);
-      Delete(nspace_subdirectory);
-    }
-    return output_directory;
-  }
-
-  /*----------------------------------------------------------------------
-   * Start of director methods
-   *--------------------------------------------------------------------*/
-
-#if 0
-  /*----------------------------------------------------------------------
-   * emitDirectorUpcalls()
-   *--------------------------------------------------------------------*/
-
-  void emitDirectorUpcalls() {
-    if (n_dmethods) {
-      Wrapper *w = NewWrapper();
-      String *dmethod_data = NewString("");
-      int n_methods = 0;
-      Iterator udata_iter;
-
-      udata_iter = First(dmethods_seq);
-      while (udata_iter.item) {
-	UpcallData *udata = udata_iter.item;
-	Printf(dmethod_data, "  { \"%s\", \"%s\" }", Getattr(udata, "imclass_method"), Getattr(udata, "imclass_fdesc"));
-	++n_methods;
-
-	udata_iter = Next(udata_iter);
-
-	if (udata_iter.item)
-	  Putc(',', dmethod_data);
-	Putc('\n', dmethod_data);
-      }
-
-
-      Wrapper_print(w, f_wrappers);
-      Delete(dmethod_data);
-      Delete(swig_module_init);
-      DelWrapper(w);
-    }
-  }
-#endif
-
-  /*----------------------------------------------------------------------
-   * emitDirectorExtraMethods()
-   *
-   * This is where the director connect method is generated.
-   *--------------------------------------------------------------------*/
-  void emitDirectorExtraMethods(Node *n) {
-    if (!Swig_directorclass(n))
-      return;
-
-    // Output the director connect method:
-    String *norm_name = SwigType_namestr(Getattr(n, "name"));
-    String *dirclassname = directorClassName(n);
-    String *swig_director_connect = Swig_name_member(getNSpace(), getClassPrefix(), "director_connect");
-    String *wname = Swig_name_wrapper(swig_director_connect);
-    String *sym_name = Getattr(n, "sym:name");
-    String *qualified_classname = Copy(sym_name);
-    String *nspace = getNSpace();
-    String *dirClassName = directorClassName(n);
-    String *smartptr = Getattr(n, "feature:smartptr");
-    if (!GetFlag(n, "feature:flatnested")) {
-      for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) {
-
-	Push(qualified_classname, ".");
-	Push(qualified_classname, Getattr(outer_class, "sym:name"));
-      }
-    }
-    if (nspace)
-      Insert(qualified_classname, 0, NewStringf("%s.", nspace));
-
-    Printv(imclass_class_code, "\n  [global::System.Runtime.InteropServices.DllImport(\"", dllimport, "\", EntryPoint=\"", wname, "\")]\n", NIL);
-    Printf(imclass_class_code, "  public static extern void %s(global::System.Runtime.InteropServices.HandleRef jarg1", swig_director_connect);
-
-    Wrapper *code_wrap = NewWrapper();
-    Printf(code_wrap->def, "SWIGEXPORT void SWIGSTDCALL %s(void *objarg", wname);
-
-    if (smartptr) {
-      Printf(code_wrap->code, "  %s *obj = (%s *)objarg;\n", smartptr, smartptr);
-      Printf(code_wrap->code, "  // Keep a local instance of the smart pointer around while we are using the raw pointer\n");
-      Printf(code_wrap->code, "  // Avoids using smart pointer specific API.\n");
-      Printf(code_wrap->code, "  %s *director = dynamic_cast<%s *>(obj->operator->());\n", dirClassName, dirClassName);
-    }
-    else {
-      Printf(code_wrap->code, "  %s *obj = (%s *)objarg;\n", norm_name, norm_name);
-      Printf(code_wrap->code, "  %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName);
-    }
-
-    // TODO: if statement not needed?? - Java too
-    Printf(code_wrap->code, "  if (director) {\n");
-    Printf(code_wrap->code, "    director->swig_connect_director(");
-
-    for (int i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *methid = Getattr(udata, "class_methodidx");
-
-      Printf(code_wrap->def, ", ");
-      if (i != first_class_dmethod)
-	Printf(code_wrap->code, ", ");
-      Printf(code_wrap->def, "%s::SWIG_Callback%s_t callback%s", dirclassname, methid, methid);
-      Printf(code_wrap->code, "callback%s", methid);
-      Printf(imclass_class_code, ", %s.SwigDelegate%s_%s delegate%s", qualified_classname, sym_name, methid, methid);
-    }
-
-    Printf(code_wrap->def, ") {\n");
-    Printf(code_wrap->code, ");\n");
-    Printf(imclass_class_code, ");\n");
-    Printf(code_wrap->code, "  }\n");
-    Printf(code_wrap->code, "}\n");
-
-    Wrapper_print(code_wrap, f_wrappers);
-    DelWrapper(code_wrap);
-
-    Delete(wname);
-    Delete(swig_director_connect);
-    Delete(qualified_classname);
-    Delete(dirclassname);
-  }
-
-  /* ---------------------------------------------------------------
-   * classDirectorMethod()
-   *
-   * Emit a virtual director method to pass a method call on to the 
-   * underlying C# object.
-   *
-   * --------------------------------------------------------------- */
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *name = Getattr(n, "name");
-    String *symname = Getattr(n, "sym:name");
-    SwigType *returntype = Getattr(n, "type");
-    String *overloaded_name = getOverloadedName(n);
-    String *storage = Getattr(n, "storage");
-    String *value = Getattr(n, "value");
-    String *decl = Getattr(n, "decl");
-    String *declaration = NewString("");
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-    String *tm;
-    Parm *p;
-    int i;
-    Wrapper *w = NewWrapper();
-    ParmList *l = Getattr(n, "parms");
-    bool is_void = !(Cmp(returntype, "void"));
-    String *qualified_return = 0;
-    bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0")));
-    int status = SWIG_OK;
-    bool output_director = true;
-    String *dirclassname = directorClassName(parent);
-    String *qualified_name = NewStringf("%s::%s", dirclassname, name);
-    SwigType *c_ret_type = NULL;
-    String *jupcall_args = NewString("");
-    String *imclass_dmethod;
-    String *callback_typedef_parms = NewString("");
-    String *delegate_parms = NewString("");
-    String *proxy_method_types = NewString("");
-    String *callback_def = NewString("");
-    String *callback_code = NewString("");
-    String *imcall_args = NewString("");
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    // Kludge Alert: functionWrapper sets sym:overload properly, but it
-    // isn't at this point, so we have to manufacture it ourselves. At least
-    // we're consistent with the sym:overload name in functionWrapper. (?? when
-    // does the overloaded method name get set?)
-
-    imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name));
-
-    qualified_return = SwigType_rcaststr(returntype, "c_result");
-
-    if (!is_void && !ignored_method) {
-      if (!SwigType_isclass(returntype)) {
-	if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) {
-	  String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0));
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL);
-	  Delete(construct_result);
-	} else {
-	  String *base_typename = SwigType_base(returntype);
-	  String *resolved_typename = SwigType_typedef_resolve_all(base_typename);
-	  Symtab *symtab = Getattr(n, "sym:symtab");
-	  Node *typenode = Swig_symbol_clookup(resolved_typename, symtab);
-
-	  if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstracts"))) {
-	    /* initialize pointers to something sane. Same for abstract
-	       classes when a reference is returned. */
-	    Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
-	  } else {
-	    /* If returning a reference, initialize the pointer to a sane
-	       default - if a C# exception occurs, then the pointer returns
-	       something other than a NULL-initialized reference. */
-	    String *non_ref_type = Copy(returntype);
-
-	    /* Remove reference and const qualifiers */
-	    Replaceall(non_ref_type, "r.", "");
-	    Replaceall(non_ref_type, "q(const).", "");
-	    Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL);
-	    Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL);
-
-	    Delete(non_ref_type);
-	  }
-
-	  Delete(base_typename);
-	  Delete(resolved_typename);
-	}
-      } else {
-	SwigType *vt;
-
-	vt = cplus_value_type(returntype);
-	if (!vt) {
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL);
-	} else {
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL);
-	  Delete(vt);
-	}
-      }
-    }
-
-    /* Create the intermediate class wrapper */
-    tm = Swig_typemap_lookup("imtype", n, "", 0);
-    if (tm) {
-      String *imtypeout = Getattr(n, "tmap:imtype:out");	// the type in the imtype typemap's out attribute overrides the type in the typemap
-      if (imtypeout)
-	tm = imtypeout;
-      const String *im_directoroutattributes = Getattr(n, "tmap:imtype:directoroutattributes");
-      if (im_directoroutattributes) {
-	Printf(callback_def, "  %s\n", im_directoroutattributes);
-	if (!ignored_method)
-	  Printf(director_delegate_definitions, "  %s\n", im_directoroutattributes);
-      }
-
-      Printf(callback_def, "  private %s SwigDirector%s(", tm, overloaded_name);
-      if (!ignored_method) {
-	const String *csdirectordelegatemodifiers = Getattr(n, "feature:csdirectordelegatemodifiers");
-	String *modifiers = (csdirectordelegatemodifiers ? NewStringf("%s%s", csdirectordelegatemodifiers, Len(csdirectordelegatemodifiers) > 0 ? " " : "") : NewStringf("public "));
-	Printf(director_delegate_definitions, "  %sdelegate %s", modifiers, tm);
-	Delete(modifiers);
-      }
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(returntype, 0));
-    }
-
-    if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) {
-      if (!is_void && !ignored_method) {
-	String *jretval_decl = NewStringf("%s jresult", c_ret_type);
-	Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL);
-	Delete(jretval_decl);
-      }
-    } else {
-      Swig_warning(WARN_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", 
-	  SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-      output_director = false;
-    }
-
-    Swig_director_parms_fixup(l);
-
-    /* Attach the standard typemaps */
-    Swig_typemap_attach_parms("out", l, 0);
-    Swig_typemap_attach_parms("ctype", l, 0);
-    Swig_typemap_attach_parms("imtype", l, 0);
-    Swig_typemap_attach_parms("cstype", l, 0);
-    Swig_typemap_attach_parms("directorin", l, 0);
-    Swig_typemap_attach_parms("csdirectorin", l, 0);
-    Swig_typemap_attach_parms("directorargout", l, w);
-
-    /* Preamble code */
-    if (!ignored_method)
-      Printf(w->code, "if (!swig_callback%s) {\n", overloaded_name);
-
-    if (!pure_virtual) {
-      String *super_call = Swig_method_call(super, l);
-      if (is_void) {
-	Printf(w->code, "%s;\n", super_call);
-	if (!ignored_method)
-	  Printf(w->code, "return;\n");
-      } else {
-	Printf(w->code, "return %s;\n", super_call);
-      }
-      Delete(super_call);
-    } else {
-      Printf(w->code, " throw Swig::DirectorPureVirtualException(\"%s::%s\");\n", SwigType_namestr(c_classname), SwigType_namestr(name));
-    }
-
-    if (!ignored_method)
-      Printf(w->code, "} else {\n");
-
-    /* Go through argument list, convert from native to C# */
-    for (i = 0, p = l; p; ++i) {
-      /* Is this superfluous? */
-      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = makeParameterName(n, p, i, false);
-      String *c_param_type = NULL;
-      String *c_decl = NewString("");
-      String *arg = NewString("");
-
-      Printf(arg, "j%s", ln);
-
-      /* And add to the upcall args */
-      if (i > 0)
-	Printf(jupcall_args, ", ");
-      Printf(jupcall_args, "%s", arg);
-
-      /* Get parameter's intermediary C type */
-      if ((c_param_type = Getattr(p, "tmap:ctype"))) {
-	String *ctypeout = Getattr(p, "tmap:ctype:out");	// the type in the ctype typemap's out attribute overrides the type in the typemap
-	if (ctypeout)
-	  c_param_type = ctypeout;
-
-	/* Add to local variables */
-	Printf(c_decl, "%s %s", c_param_type, arg);
-	if (!ignored_method)
-	  Wrapper_add_localv(w, arg, c_decl, (!(SwigType_ispointer(pt) || SwigType_isreference(pt)) ? "" : "= 0"), NIL);
-
-	/* Add input marshalling code */
-	if ((tm = Getattr(p, "tmap:directorin"))) {
-
-	  Setattr(p, "emit:directorinput", arg);
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$owner", "0");
-
-	  if (Len(tm))
-	    if (!ignored_method)
-	      Printf(w->code, "%s\n", tm);
-
-	  /* Add C type to callback typedef */
-	  if (i > 0)
-	    Printf(callback_typedef_parms, ", ");
-	  Printf(callback_typedef_parms, "%s", c_param_type);
-
-	  /* Add parameter to the intermediate class code if generating the
-	   * intermediate's upcall code */
-	  if ((tm = Getattr(p, "tmap:imtype"))) {
-
-	    String *imtypeout = Getattr(p, "tmap:imtype:out");	// the type in the imtype typemap's out attribute overrides the type in the typemap
-	    if (imtypeout)
-	      tm = imtypeout;
-            const String *im_directorinattributes = Getattr(p, "tmap:imtype:directorinattributes");
-
-	    String *din = Copy(Getattr(p, "tmap:csdirectorin"));
-
-	    if (din) {
-	      Replaceall(din, "$module", module_class_name);
-	      Replaceall(din, "$imclassname", imclass_name);
-	      substituteClassname(pt, din);
-	      Replaceall(din, "$iminput", ln);
-
-	      // pre and post attribute support
-	      String *pre = Getattr(p, "tmap:csdirectorin:pre");
-	      if (pre) {
-		substituteClassname(pt, pre);
-		Replaceall(pre, "$iminput", ln);
-		if (Len(pre_code) > 0)
-		  Printf(pre_code, "\n");
-		Printv(pre_code, pre, NIL);
-	      }
-	      String *post = Getattr(p, "tmap:csdirectorin:post");
-	      if (post) {
-		substituteClassname(pt, post);
-		Replaceall(post, "$iminput", ln);
-		if (Len(post_code) > 0)
-		  Printf(post_code, "\n");
-		Printv(post_code, post, NIL);
-	      }
-	      String *terminator = Getattr(p, "tmap:csdirectorin:terminator");
-	      if (terminator) {
-		substituteClassname(pt, terminator);
-		Replaceall(terminator, "$iminput", ln);
-		if (Len(terminator_code) > 0)
-		Insert(terminator_code, 0, "\n");
-		Insert(terminator_code, 0, terminator);
-	      }
-
-	      if (i > 0) {
-		Printf(delegate_parms, ", ");
-		Printf(proxy_method_types, ", ");
-		Printf(imcall_args, ", ");
-	      }
-	      Printf(delegate_parms, "%s%s %s", im_directorinattributes ? im_directorinattributes : empty_string, tm, ln);
-
-	      if (Cmp(din, ln)) {
-		Printv(imcall_args, din, NIL);
-	      } else
-		Printv(imcall_args, ln, NIL);
-
-	      /* Get the C# parameter type */
-	      if ((tm = Getattr(p, "tmap:cstype"))) {
-		substituteClassname(pt, tm);
-		if (Strncmp(tm, "ref ", 4) == 0) {
-		  Replace(tm, "ref ", "", DOH_REPLACE_FIRST);
-		  Printf(proxy_method_types, "typeof(%s).MakeByRefType()", tm);
-		} else if (Strncmp(tm, "out ", 4) == 0) {
-		  Replace(tm, "out ", "", DOH_REPLACE_FIRST);
-		  Printf(proxy_method_types, "typeof(%s).MakeByRefType()", tm);
-		} else {
-		  Printf(proxy_method_types, "typeof(%s)", tm);
-		}
-	      } else {
-		Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(pt, 0));
-	      }
-	    } else {
-	      Swig_warning(WARN_CSHARP_TYPEMAP_CSDIRECTORIN_UNDEF, input_file, line_number, "No csdirectorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-		  SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	      output_director = false;
-	    }
-	  } else {
-	    Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s for use in %s::%s (skipping director method)\n", 
-		SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    output_director = false;
-	  }
-
-	  p = Getattr(p, "tmap:directorin:next");
-
-	} else {
-	  Swig_warning(WARN_CSHARP_TYPEMAP_CSDIRECTORIN_UNDEF, input_file, line_number,
-		       "No or improper directorin typemap defined for argument %s for use in %s::%s (skipping director method)\n", 
-		       SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	  p = nextSibling(p);
-	  output_director = false;
-	}
-      } else {
-	Swig_warning(WARN_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", 
-	    SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	output_director = false;
-	p = nextSibling(p);
-      }
-
-      Delete(ln);
-      Delete(arg);
-      Delete(c_decl);
-    }
-
-    /* header declaration, start wrapper definition */
-    String *target;
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Add any exception specifications to the methods in the director class
-    ParmList *throw_parm_list = NULL;
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-	  Printf(w->def, "%s", SwigType_str(Getattr(p, "type"), 0));
-	  Printf(declaration, "%s", SwigType_str(Getattr(p, "type"), 0));
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    /* Finish off the inherited upcall's definition */
-
-    Printf(callback_def, "%s)", delegate_parms);
-    Printf(callback_def, " {\n");
-
-    /* Emit the intermediate class's upcall to the actual class */
-
-    String *upcall = NewStringf("%s(%s)", symname, imcall_args);
-
-    if ((tm = Swig_typemap_lookup("csdirectorout", n, "", 0))) {
-      substituteClassname(returntype, tm);
-      Replaceall(tm, "$cscall", upcall);
-      if (!is_void)
-	Insert(tm, 0, "return ");
-      Replaceall(tm, "\n ", "\n   "); // add extra indentation to code in typemap
-
-      // pre and post attribute support
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      bool is_terminator_code = Len(terminator_code) > 0;
-      if (is_pre_code && is_post_code)
-	Printf(callback_code, "%s\n    try {\n      %s;\n    } finally {\n%s\n    }\n", pre_code, tm, post_code);
-      else if (is_pre_code)
-	Printf(callback_code, "%s\n    %s;\n", pre_code, tm);
-      else if (is_post_code)
-	Printf(callback_code, "    try {\n      %s;\n    } finally {\n%s\n    }\n", tm, post_code);
-      else
-	Printf(callback_code, "    %s;\n", tm);
-      if (is_terminator_code)
-	Printv(callback_code, "\n", terminator_code, NIL);
-    }
-
-    Printf(callback_code, "  }\n");
-    Delete(upcall);
-
-    if (!ignored_method) {
-      if (!is_void)
-	Printf(w->code, "jresult = (%s) ", c_ret_type);
-
-      Printf(w->code, "swig_callback%s(%s);\n", overloaded_name, jupcall_args);
-
-      if (!is_void) {
-	String *jresult_str = NewString("jresult");
-	String *result_str = NewString("c_result");
-
-	/* Copy jresult into c_result... */
-	if ((tm = Swig_typemap_lookup("directorout", n, result_str, w))) {
-	  Replaceall(tm, "$input", jresult_str);
-	  Replaceall(tm, "$result", result_str);
-	  Printf(w->code, "%s\n", tm);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use return type %s used in %s::%s (skipping director method)\n", 
-		       SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	  output_director = false;
-	}
-
-	Delete(jresult_str);
-	Delete(result_str);
-      }
-
-      /* Marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout"))) {
-	  canThrow(n, "directorargout", p);
-	  Replaceall(tm, "$result", "jresult");
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      /* Terminate wrapper code */
-      Printf(w->code, "}\n");
-      if (!is_void)
-	Printf(w->code, "return %s;", qualified_return);
-    }
-
-    Printf(w->code, "}");
-
-    // We expose virtual protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK && output_director) {
-      if (!is_void) {
-	Replaceall(w->code, "$null", qualified_return);
-      } else {
-	Replaceall(w->code, "$null", "");
-      }
-      if (!ignored_method)
-	Printv(director_delegate_callback, "\n", callback_def, callback_code, NIL);
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    if (!ignored_method) {
-      /* Emit the actual upcall through */
-      UpcallData *udata = addUpcallMethod(imclass_dmethod, symname, decl, overloaded_name);
-      String *methid = Getattr(udata, "class_methodidx");
-      Setattr(n, "upcalldata", udata);
-      /*
-      Printf(stdout, "setting upcalldata, nodeType: %s %s::%s %p\n", nodeType(n), classname, Getattr(n, "name"), n);
-      */
-
-      Printf(director_callback_typedefs, "    typedef %s (SWIGSTDCALL* SWIG_Callback%s_t)(", c_ret_type, methid);
-      Printf(director_callback_typedefs, "%s);\n", callback_typedef_parms);
-      Printf(director_callbacks, "    SWIG_Callback%s_t swig_callback%s;\n", methid, overloaded_name);
-
-      Printf(director_delegate_definitions, " SwigDelegate%s_%s(%s);\n", classname, methid, delegate_parms);
-      Printf(director_delegate_instances, "  private SwigDelegate%s_%s swigDelegate%s;\n", classname, methid, methid);
-      Printf(director_method_types, "  private static global::System.Type[] swigMethodTypes%s = new global::System.Type[] { %s };\n", methid, proxy_method_types);
-      Printf(director_connect_parms, "SwigDirector%s%s delegate%s", classname, methid, methid);
-    }
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(terminator_code);
-    Delete(qualified_return);
-    Delete(declaration);
-    Delete(callback_typedef_parms);
-    Delete(delegate_parms);
-    Delete(proxy_method_types);
-    Delete(callback_def);
-    Delete(callback_code);
-    Delete(dirclassname);
-    DelWrapper(w);
-
-    return status;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = parentNode(n);
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *dirclassname = directorClassName(parent);
-    String *sub = NewString("");
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms;
-    int argidx = 0;
-
-    /* Assign arguments to superclass's parameters, if not already done */
-    for (p = superparms; p; p = nextSibling(p)) {
-      String *pname = Getattr(p, "name");
-
-      if (!pname) {
-	pname = NewStringf("arg%d", argidx++);
-	Setattr(p, "name", pname);
-      }
-    }
-
-    // TODO: Is this copy needed?
-    parms = CopyParmList(superparms);
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
-	String *call = Swig_csuperclass_call(0, basetype, superparms);
-
-	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
-	Printf(f_directors, "  swig_init_callbacks();\n");
-	Printf(f_directors, "}\n\n");
-
-	Delete(target);
-	Delete(call);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(supername);
-    Delete(parms);
-    Delete(dirclassname);
-    return Language::classDirectorConstructor(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDefaultConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorDefaultConstructor(Node *n) {
-    String *dirclassname = directorClassName(n);
-    String *classtype = SwigType_namestr(Getattr(n, "name"));
-    Wrapper *w = NewWrapper();
-
-    Printf(w->def, "%s::%s() : %s {", dirclassname, dirclassname, Getattr(n, "director:ctor"));
-    Printf(w->code, "}\n");
-    Wrapper_print(w, f_directors);
-
-    Printf(f_directors_h, "    %s();\n", dirclassname);
-    DelWrapper(w);
-    Delete(classtype);
-    Delete(dirclassname);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * classDirectorInit()
-   * ------------------------------------------------------------ */
-
-  int classDirectorInit(Node *n) {
-    Delete(none_comparison);
-    none_comparison = NewString("");	// not used
-
-    Delete(director_ctor_code);
-    director_ctor_code = NewString("$director_new");
-
-    directorDeclaration(n);
-
-    Printf(f_directors_h, "%s {\n", Getattr(n, "director:decl"));
-    Printf(f_directors_h, "\npublic:\n");
-
-    /* Keep track of the director methods for this class */
-    first_class_dmethod = curr_class_dmethod = n_dmethods;
-
-    director_callback_typedefs = NewString("");
-    director_callbacks = NewString("");
-    director_delegate_callback = NewString("");
-    director_delegate_definitions = NewString("");
-    director_delegate_instances = NewString("");
-    director_method_types = NewString("");
-    director_connect_parms = NewString("");
-
-    return Language::classDirectorInit(n);
-  }
-
-  int classDeclaration(Node *n) {
-    String *old_director_callback_typedefs = director_callback_typedefs;
-    String *old_director_callbacks = director_callbacks;
-    String *old_director_delegate_callback = director_delegate_callback;
-    String *old_director_delegate_definitions = director_delegate_definitions;
-    String *old_director_delegate_instances = director_delegate_instances;
-    String *old_director_method_types = director_method_types;
-    String *old_director_connect_parms = director_connect_parms;
-
-    int ret = Language::classDeclaration(n);
-
-    // these variables are deleted in emitProxyClassDefAndCPPCasts, hence no Delete here
-    director_callback_typedefs = old_director_callback_typedefs;
-    director_callbacks = old_director_callbacks;
-    director_delegate_callback = old_director_delegate_callback;
-    director_delegate_definitions = old_director_delegate_definitions;
-    director_delegate_instances = old_director_delegate_instances;
-    director_method_types = old_director_method_types;
-    director_connect_parms = old_director_connect_parms;
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * classDirectorDestructor()
-   * ---------------------------------------------------------------------- */
-
-  int classDirectorDestructor(Node *n) {
-    Node *current_class = getCurrentClass();
-    String *dirclassname = directorClassName(current_class);
-    Wrapper *w = NewWrapper();
-
-    if (Getattr(n, "throw")) {
-      Printf(f_directors_h, "    virtual ~%s() throw ();\n", dirclassname);
-      Printf(w->def, "%s::~%s() throw () {\n", dirclassname, dirclassname);
-    } else {
-      Printf(f_directors_h, "    virtual ~%s();\n", dirclassname);
-      Printf(w->def, "%s::~%s() {\n", dirclassname, dirclassname);
-    }
-
-    Printv(w->code, "}\n", NIL);
-
-    Wrapper_print(w, f_directors);
-
-    DelWrapper(w);
-    Delete(dirclassname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorEnd()
-   * ------------------------------------------------------------ */
-
-  int classDirectorEnd(Node *n) {
-    int i;
-    String *dirclassname = directorClassName(n);
-
-    Wrapper *w = NewWrapper();
-
-    if (Len(director_callback_typedefs) > 0) {
-      Printf(f_directors_h, "\n%s", director_callback_typedefs);
-    }
-
-    Printf(f_directors_h, "    void swig_connect_director(");
-
-    Printf(w->def, "void %s::swig_connect_director(", dirclassname);
-
-    for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *methid = Getattr(udata, "class_methodidx");
-      String *overname = Getattr(udata, "overname");
-
-      Printf(f_directors_h, "SWIG_Callback%s_t callback%s", methid, overname);
-      Printf(w->def, "SWIG_Callback%s_t callback%s", methid, overname);
-      Printf(w->code, "swig_callback%s = callback%s;\n", overname, overname);
-      if (i != curr_class_dmethod - 1) {
-	Printf(f_directors_h, ", ");
-	Printf(w->def, ", ");
-      }
-    }
-
-    Printf(f_directors_h, ");\n");
-    Printf(w->def, ") {");
-
-
-    if (Len(director_callbacks) > 0) {
-      Printf(f_directors_h, "\nprivate:\n%s", director_callbacks);
-    }
-    Printf(f_directors_h, "    void swig_init_callbacks();\n");
-    Printf(f_directors_h, "};\n\n");
-    Printf(w->code, "}\n\n");
-
-    Printf(w->code, "void %s::swig_init_callbacks() {\n", dirclassname);
-    for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *overname = Getattr(udata, "overname");
-      Printf(w->code, "swig_callback%s = 0;\n", overname);
-    }
-    Printf(w->code, "}");
-
-    Wrapper_print(w, f_directors);
-
-    DelWrapper(w);
-    Delete(dirclassname);
-
-    return Language::classDirectorEnd(n);
-  }
-
-  /* --------------------------------------------------------------------
-   * classDirectorDisown()
-   * ------------------------------------------------------------------*/
-  virtual int classDirectorDisown(Node *n) {
-    (void) n;
-    return SWIG_OK;
-  }
-
-  /*----------------------------------------------------------------------
-   * extraDirectorProtectedCPPMethodsRequired()
-   *--------------------------------------------------------------------*/
-
-  bool extraDirectorProtectedCPPMethodsRequired() const {
-    return false;
-  }
-
-  /*----------------------------------------------------------------------
-   * directorDeclaration()
-   *
-   * Generate the director class's declaration
-   * e.g. "class SwigDirector_myclass : public myclass, public Swig::Director {"
-   *--------------------------------------------------------------------*/
- 
-  void directorDeclaration(Node *n) {
-
-    String *base = Getattr(n, "classtype");
-    String *class_ctor = NewString("Swig::Director()");
-
-    String *dirclassname = directorClassName(n);
-    String *declaration = Swig_class_declaration(n, dirclassname);
-
-    Printf(declaration, " : public %s, public Swig::Director", base);
-
-    // Stash stuff for later.
-    Setattr(n, "director:decl", declaration);
-    Setattr(n, "director:ctor", class_ctor);
-
-    Delete(dirclassname);
-  }
-
-  /*----------------------------------------------------------------------
-   * nestedClassesSupport()
-   *--------------------------------------------------------------------*/
-
-  NestedClassSupport nestedClassesSupport() const {
-    return NCS_Full;
-  }
-};				/* class CSHARP */
-
-/* -----------------------------------------------------------------------------
- * swig_csharp()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_csharp() {
-  return new CSHARP();
-}
-extern "C" Language *swig_csharp(void) {
-  return new_swig_csharp();
-}
-
-/* -----------------------------------------------------------------------------
- * Static member variables
- * ----------------------------------------------------------------------------- */
-
-const char *CSHARP::usage = "\
-C# Options (available with -csharp)\n\
-     -dllimport <dl> - Override DllImport attribute name to <dl>\n\
-     -namespace <nm> - Generate wrappers into C# namespace <nm>\n\
-     -noproxy        - Generate the low-level functional interface instead\n\
-                       of proxy classes\n\
-     -oldvarnames    - Old intermediary method names for variable wrappers\n\
-     -outfile <file> - Write all C# into a single <file> located in the output directory\n\
-\n";
diff --git a/dependencies2013/win32/swig/Source/Modules/d.cxx b/dependencies2013/win32/swig/Source/Modules/d.cxx
deleted file mode 100644
index de7afdab..00000000
--- a/dependencies2013/win32/swig/Source/Modules/d.cxx
+++ /dev/null
@@ -1,4617 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * d.cxx
- *
- * D language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-
-// Hash type used for storing information about director callbacks for a class.
-typedef DOH UpcallData;
-
-class D : public Language {
-  static const char *usage;
-  const String *empty_string;
-  const String *public_string;
-  const String *protected_string;
-
-  /*
-   * Files and file sections containing C/C++ code.
-   */
-  File *f_begin;
-  File *f_runtime;
-  File *f_runtime_h;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-  File *f_directors;
-  File *f_directors_h;
-  List *filenames_list;
-
-  /*
-   * Command line-set modes of operation.
-   */
-  // Whether a single proxy D module is generated or classes and enums are
-  // written to their own files.
-  bool split_proxy_dmodule;
-
-  // The major D version targeted (currently 1 or 2).
-  unsigned short d_version;
-
-  /*
-   * State variables which indicate what is being wrapped at the moment.
-   * This is probably not the most elegant way of handling state, but it has
-   * proven to work in the C# and Java modules.
-   */
-  // Indicates if wrapping a native function.
-  bool native_function_flag;
-
-  // Indicates if wrapping a static functions or member variables
-  bool static_flag;
-
-  // Indicates if wrapping a nonstatic member variable
-  bool variable_wrapper_flag;
-
-  // Indicates if wrapping a member variable/enum/const.
-  bool wrapping_member_flag;
-
-  // Indicates if wrapping a global variable.
-  bool global_variable_flag;
-
-  // Name of a variable being wrapped.
-  String *variable_name;
-
-  /*
-   * Variables temporarily holding the generated C++ code.
-   */
-  // C++ code for the generated wrapper functions for casts up the C++
-  // for inheritance hierarchies.
-  String *upcasts_code;
-
-  // Function pointer typedefs for handling director callbacks on the C++ side.
-  String *director_callback_typedefs;
-
-  // Variables for storing the function pointers to the director callbacks on
-  // the C++ side.
-  String *director_callback_pointers;
-
-  /*
-   * Names of generated D entities.
-   */
-  // The name of the D module containing the interface to the C wrapper.
-  String *im_dmodule_name;
-
-  // The fully qualified name of the wrap D module (package name included).
-  String *im_dmodule_fq_name;
-
-  // The name of the proxy module which exposes the (SWIG) module contents as a
-  // D module.
-  String *proxy_dmodule_name;
-
-  // The fully qualified name of the proxy D module.
-  String *proxy_dmodule_fq_name;
-
-  // Optional: Package the D modules are placed in (set via the -package
-  // command line option).
-  String *package;
-
-  // The directory the generated D module files are written to. Is constructed
-  // from the package path if a target package is set, points to the general
-  // output directory otherwise.
-  String *dmodule_directory;
-
-  // The name of the library which contains the C wrapper (used when generating
-  // the dynamic library loader). Can be overridden via the -wrapperlibrary
-  // command line flag.
-  String *wrap_library_name;
-
-  /*
-   * Variables temporarily holding the generated D code.
-   */
-  // Import statements written to the intermediary D module header set via
-  // %pragma(d) imdmoduleimports.
-  String *im_dmodule_imports;
-
-  // The code for the intermediary D module body.
-  String *im_dmodule_code;
-
-  // Import statements for all proxy modules (the main proxy module and, if in
-  // split proxy module mode, the proxy class modules) from
-  // %pragma(d) globalproxyimports.
-  String *global_proxy_imports;
-
-  // The D code for the main proxy modules. nspace_proxy_dmodules is a hash from
-  // the namespace name as key to an {"imports", "code"}. If the nspace feature
-  // is not active, only proxy_dmodule_imports and proxy_dmodule_code are used,
-  // which contain the code for the root proxy module.
-  //
-  // These variables should not be accessed directly but rather via the
-  // proxy{Imports, Code}Buffer)() helper functions which return the right
-  // buffer for a given namespace. If not in split proxy mode, they contain the
-  // whole proxy code.
-  String *proxy_dmodule_imports;
-  String *proxy_dmodule_code;
-  Hash *nspace_proxy_dmodules;
-
-  // The D code generated for the currently processed enum.
-  String *proxy_enum_code;
-
-  /*
-   * D data for the current proxy class.
-   *
-   * These strings are mainly used to temporarily accumulate code from the
-   * various member handling functions while a single class is processed and are
-   * no longer relevant once that class has been finished, i.e. after
-   * classHandler() has returned.
-   */
-  // The unqualified name of the current proxy class.
-  String *proxy_class_name;
-
-  // The name of the current proxy class, qualified with the name of the
-  // namespace it is in, if any.
-  String *proxy_class_qname;
-
-  // The import directives for the current proxy class. They are written to the
-  // same D module the proxy class is written to.
-  String *proxy_class_imports;
-
-  // Code for enumerations nested in the current proxy class. Is emitted earlier
-  // than the rest of the body to work around forward referencing-issues.
-  String *proxy_class_enums_code;
-
-  // The generated D code making up the body of the current proxy class.
-  String *proxy_class_body_code;
-
-  // D code which is emitted right after the proxy class.
-  String *proxy_class_epilogue_code;
-
-  // The full code for the current proxy class, including the epilogue.
-  String* proxy_class_code;
-
-  // Contains a D call to the function wrapping C++ the destructor of the
-  // current class (if there is a public C++ destructor).
-  String *destructor_call;
-
-  // D code for the director callbacks generated for the current class.
-  String *director_dcallbacks_code;
-
-  /*
-   * Code for dynamically loading the wrapper library on the D side.
-   */
-  // D code which is inserted into the im D module if dynamic linking is used.
-  String *wrapper_loader_code;
-
-  // The D code to bind a function pointer to a library symbol.
-  String *wrapper_loader_bind_command;
-
-  // The cumulated binding commands binding all the functions declared in the
-  // intermediary D module to the C/C++ library symbols.
-  String *wrapper_loader_bind_code;
-
-  /*
-   * Director data.
-   */
-  List *dmethods_seq;
-  Hash *dmethods_table;
-  int n_dmethods;
-  int first_class_dmethod;
-  int curr_class_dmethod;
-
-  /*
-   * SWIG types data.
-   */
-  // Collects information about encountered types SWIG does not know about (e.g.
-  // incomplete types). This is used later to generate type wrapper proxy
-  // classes for the unknown types.
-  Hash *unknown_types;
-
-
-public:
-  /* ---------------------------------------------------------------------------
-   * D::D()
-   * --------------------------------------------------------------------------- */
-   D():empty_string(NewString("")),
-      public_string(NewString("public")),
-      protected_string(NewString("protected")),
-      f_begin(NULL),
-      f_runtime(NULL),
-      f_runtime_h(NULL),
-      f_header(NULL),
-      f_wrappers(NULL),
-      f_init(NULL),
-      f_directors(NULL),
-      f_directors_h(NULL),
-      filenames_list(NULL),
-      split_proxy_dmodule(false),
-      d_version(1),
-      native_function_flag(false),
-      static_flag(false),
-      variable_wrapper_flag(false),
-      wrapping_member_flag(false),
-      global_variable_flag(false),
-      variable_name(NULL),
-      upcasts_code(NULL),
-      director_callback_typedefs(NULL),
-      director_callback_pointers(NULL),
-      im_dmodule_name(NULL),
-      im_dmodule_fq_name(NULL),
-      proxy_dmodule_name(NULL),
-      proxy_dmodule_fq_name(NULL),
-      package(NULL),
-      dmodule_directory(NULL),
-      wrap_library_name(NULL),
-      im_dmodule_imports(NULL),
-      im_dmodule_code(NULL),
-      global_proxy_imports(NULL),
-      proxy_dmodule_imports(NULL),
-      proxy_dmodule_code(NULL),
-      nspace_proxy_dmodules(NULL),
-      proxy_enum_code(NULL),
-      proxy_class_name(NULL),
-      proxy_class_qname(NULL),
-      proxy_class_imports(NULL),
-      proxy_class_enums_code(NULL),
-      proxy_class_body_code(NULL),
-      proxy_class_epilogue_code(NULL),
-      proxy_class_code(NULL),
-      destructor_call(NULL),
-      director_dcallbacks_code(NULL),
-      wrapper_loader_code(NULL),
-      wrapper_loader_bind_command(NULL),
-      wrapper_loader_bind_code(NULL),
-      dmethods_seq(NULL),
-      dmethods_table(NULL),
-      n_dmethods(0),
-      first_class_dmethod(0),
-      curr_class_dmethod(0),
-      unknown_types(NULL) {
-
-    // For now, multiple inheritance with directors is not possible. It should be
-    // easy to implement though.
-    director_multiple_inheritance = 0;
-    director_language = 1;
-
-    // Not used:
-    Delete(none_comparison);
-    none_comparison = NewString("");
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::main()
-   * --------------------------------------------------------------------------- */
-  virtual void main(int argc, char *argv[]) {
-    SWIG_library_directory("d");
-
-    // Look for certain command line options
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if ((strcmp(argv[i], "-d2") == 0)) {
-      	  Swig_mark_arg(i);
-      	  d_version = 2;
-      	} else if (strcmp(argv[i], "-wrapperlibrary") == 0) {
-	  if (argv[i + 1]) {
-	    wrap_library_name = NewString("");
-	    Printf(wrap_library_name, argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-package") == 0) {
-	  if (argv[i + 1]) {
-	    package = NewString("");
-	    Printf(package, argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if ((strcmp(argv[i], "-splitproxy") == 0)) {
-	  Swig_mark_arg(i);
-	  split_proxy_dmodule = true;
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  Printf(stdout, "%s\n", usage);
-	}
-      }
-    }
-
-    // Add a symbol to the parser for conditional compilation
-    Preprocessor_define("SWIGD 1", 0);
-
-    // Also make the target D version available as preprocessor symbol for
-    // use in our library files.
-    String *version_define = NewStringf("SWIG_D_VERSION %u", d_version);
-    Preprocessor_define(version_define, 0);
-    Delete(version_define);
-
-    // Add typemap definitions
-    SWIG_typemap_lang("d");
-    SWIG_config_file("d.swg");
-
-    allow_overloading();
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::top()
-   * --------------------------------------------------------------------------- */
-  virtual int top(Node *n) {
-    // Get any options set in the module directive
-    Node *optionsnode = Getattr(Getattr(n, "module"), "options");
-
-    if (optionsnode) {
-      if (Getattr(optionsnode, "imdmodulename")) {
-	im_dmodule_name = Copy(Getattr(optionsnode, "imdmodulename"));
-      }
-
-      if (Getattr(optionsnode, "directors")) {
-	// Check if directors are enabled for this module. Note: This is a
-	// "master switch", if it is not set, not director code will be emitted
-	// at all. %feature("director") statements are also required to enable
-	// directors for individual classes or methods.
-	//
-	// Use the »directors« attributte of the %module directive to enable
-	// director generation (e.g. »%module(directors="1") modulename«).
-	allow_directors();
-      }
-
-      if (Getattr(optionsnode, "dirprot")) {
-	allow_dirprot();
-      }
-
-      allow_allprotected(GetFlag(optionsnode, "allprotected"));
-    }
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    if (!outfile) {
-      Printf(stderr, "Unable to determine outfile\n");
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    if (directorsEnabled()) {
-      if (!outfile_h) {
-	Printf(stderr, "Unable to determine outfile_h\n");
-	SWIG_exit(EXIT_FAILURE);
-      }
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    unknown_types = NewHash();
-    filenames_list = NewList();
-
-    // Make the package name and the resulting module output path.
-    if (package) {
-      // Append a dot so we can prepend the package variable directly to the
-      // module names in the rest of the code.
-      Printv(package, ".", NIL);
-    } else {
-      // Write the generated D modules to the »root« package by default.
-      package = NewString("");
-    }
-
-    dmodule_directory = Copy(SWIG_output_directory());
-    if (Len(package) > 0) {
-      String *package_directory = Copy(package);
-      Replaceall(package_directory, ".", SWIG_FILE_DELIMITER);
-      Printv(dmodule_directory, package_directory, NIL);
-      Delete(package_directory);
-    }
-
-    // Make the wrap and proxy D module names.
-    // The wrap module name can be set in the module directive.
-    if (!im_dmodule_name) {
-      im_dmodule_name = NewStringf("%s_im", Getattr(n, "name"));
-    }
-    im_dmodule_fq_name = NewStringf("%s%s", package, im_dmodule_name);
-    proxy_dmodule_name = Copy(Getattr(n, "name"));
-    proxy_dmodule_fq_name = NewStringf("%s%s", package, proxy_dmodule_name);
-
-    im_dmodule_code = NewString("");
-    proxy_class_imports = NewString("");
-    proxy_class_enums_code = NewString("");
-    proxy_class_body_code = NewString("");
-    proxy_class_epilogue_code = NewString("");
-    proxy_class_code = NewString("");
-    destructor_call = NewString("");
-    proxy_dmodule_code = NewString("");
-    proxy_dmodule_imports = NewString("");
-    nspace_proxy_dmodules = NewHash();
-    im_dmodule_imports = NewString("");
-    upcasts_code = NewString("");
-    global_proxy_imports = NewString("");
-    wrapper_loader_code = NewString("");
-    wrapper_loader_bind_command = NewString("");
-    wrapper_loader_bind_code = NewString("");
-    dmethods_seq = NewList();
-    dmethods_table = NewHash();
-    n_dmethods = 0;
-
-    // By default, expect the dynamically loaded wrapper library to be named
-    // [lib]<module>_wrap[.so/.dll].
-    if (!wrap_library_name)
-      wrap_library_name = NewStringf("%s_wrap", Getattr(n, "name"));
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGD\n#define SWIGD\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-
-      /* Emit initial director header and director code: */
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", proxy_dmodule_name);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", proxy_dmodule_name);
-
-      Printf(f_directors, "\n\n");
-      Printf(f_directors, "/* ---------------------------------------------------\n");
-      Printf(f_directors, " * C++ director class methods\n");
-      Printf(f_directors, " * --------------------------------------------------- */\n\n");
-      if (outfile_h) {
-	String *filename = Swig_file_filename(outfile_h);
-	Printf(f_directors, "#include \"%s\"\n\n", filename);
-	Delete(filename);
-      }
-    }
-
-    Printf(f_runtime, "\n");
-
-    Swig_name_register("wrapper", "D_%f");
-
-    Printf(f_wrappers, "\n#ifdef __cplusplus\n");
-    Printf(f_wrappers, "extern \"C\" {\n");
-    Printf(f_wrappers, "#endif\n\n");
-
-    // Emit all the wrapper code.
-    Language::top(n);
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (before %header section).
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-
-    // Generate the wrap D module.
-    // TODO: Add support for »static« linking.
-    {
-      String *filen = NewStringf("%s%s.d", dmodule_directory, im_dmodule_name);
-      File *im_d_file = NewFile(filen, "w", SWIG_output_files());
-      if (!im_d_file) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the intermediary class file.
-      emitBanner(im_d_file);
-
-      Printf(im_d_file, "module %s;\n", im_dmodule_fq_name);
-
-      Printv(im_d_file, im_dmodule_imports, "\n", NIL);
-
-      Replaceall(wrapper_loader_code, "$wraplibrary", wrap_library_name);
-      Replaceall(wrapper_loader_code, "$wrapperloaderbindcode", wrapper_loader_bind_code);
-      Replaceall(wrapper_loader_code, "$module", proxy_dmodule_name);
-      Printf(im_d_file, "%s\n", wrapper_loader_code);
-
-      // Add the wrapper function declarations.
-      replaceModuleVariables(im_dmodule_code);
-      Printv(im_d_file, im_dmodule_code, NIL);
-
-      Delete(im_d_file);
-    }
-
-    // Generate the main D proxy module.
-    {
-      String *filen = NewStringf("%s%s.d", dmodule_directory, proxy_dmodule_name);
-      File *proxy_d_file = NewFile(filen, "w", SWIG_output_files());
-      if (!proxy_d_file) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      emitBanner(proxy_d_file);
-
-      Printf(proxy_d_file, "module %s;\n", proxy_dmodule_fq_name);
-      Printf(proxy_d_file, "\nstatic import %s;\n", im_dmodule_fq_name);
-      Printv(proxy_d_file, global_proxy_imports, NIL);
-      Printv(proxy_d_file, proxy_dmodule_imports, NIL);
-      Printv(proxy_d_file, "\n", NIL);
-
-      // Write a D type wrapper class for each SWIG type to the proxy module code.
-      for (Iterator swig_type = First(unknown_types); swig_type.key; swig_type = Next(swig_type)) {
-	writeTypeWrapperClass(swig_type.key, swig_type.item);
-      }
-
-      // Add the proxy functions (and classes, if they are not written to a separate file).
-      replaceModuleVariables(proxy_dmodule_code);
-      Printv(proxy_d_file, proxy_dmodule_code, NIL);
-
-      Delete(proxy_d_file);
-    }
-
-    // Generate the additional proxy modules for nspace support.
-    for (Iterator it = First(nspace_proxy_dmodules); it.key; it = Next(it)) {
-      String *module_name = createLastNamespaceName(it.key);
-
-      String *filename = NewStringf("%s%s.d", outputDirectory(it.key), module_name);
-      File *file = NewFile(filename, "w", SWIG_output_files());
-      if (!file) {
-	FileErrorDisplay(filename);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Delete(filename);
-
-      emitBanner(file);
-
-      Printf(file, "module %s%s.%s;\n", package, it.key, module_name);
-      Printf(file, "\nstatic import %s;\n", im_dmodule_fq_name);
-      Printv(file, global_proxy_imports, NIL);
-      Printv(file, Getattr(it.item, "imports"), NIL);
-      Printv(file, "\n", NIL);
-
-      String *code = Getattr(it.item, "code");
-      replaceModuleVariables(code);
-      Printv(file, code, NIL);
-
-      Delete(file);
-      Delete(module_name);
-    }
-
-    if (upcasts_code)
-      Printv(f_wrappers, upcasts_code, NIL);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "}\n");
-    Printf(f_wrappers, "#endif\n");
-
-    // Check for overwriting file problems on filesystems that are case insensitive
-    Iterator it1;
-    Iterator it2;
-    for (it1 = First(filenames_list); it1.item; it1 = Next(it1)) {
-      String *item1_lower = Swig_string_lower(it1.item);
-      for (it2 = Next(it1); it2.item; it2 = Next(it2)) {
-	String *item2_lower = Swig_string_lower(it2.item);
-	if (it1.item && it2.item) {
-	  if (Strcmp(item1_lower, item2_lower) == 0) {
-	    Swig_warning(WARN_LANG_PORTABILITY_FILENAME, input_file, line_number,
-			 "Portability warning: File %s will be overwritten by %s on case insensitive filesystems such as "
-			 "Windows' FAT32 and NTFS unless the class/module name is renamed\n", it1.item, it2.item);
-	  }
-	}
-	Delete(item2_lower);
-      }
-      Delete(item1_lower);
-    }
-
-    Delete(unknown_types);
-    unknown_types = NULL;
-    Delete(filenames_list);
-    filenames_list = NULL;
-    Delete(im_dmodule_name);
-    im_dmodule_name = NULL;
-    Delete(im_dmodule_fq_name);
-    im_dmodule_fq_name = NULL;
-    Delete(im_dmodule_code);
-    im_dmodule_code = NULL;
-    Delete(proxy_class_imports);
-    proxy_class_imports = NULL;
-    Delete(proxy_class_enums_code);
-    proxy_class_enums_code = NULL;
-    Delete(proxy_class_body_code);
-    proxy_class_body_code = NULL;
-    Delete(proxy_class_epilogue_code);
-    proxy_class_epilogue_code = NULL;
-    Delete(proxy_class_code);
-    proxy_class_code = NULL;
-    Delete(destructor_call);
-    destructor_call = NULL;
-    Delete(proxy_dmodule_name);
-    proxy_dmodule_name = NULL;
-    Delete(proxy_dmodule_fq_name);
-    proxy_dmodule_fq_name = NULL;
-    Delete(proxy_dmodule_code);
-    proxy_dmodule_code = NULL;
-    Delete(proxy_dmodule_imports);
-    proxy_dmodule_imports = NULL;
-    Delete(nspace_proxy_dmodules);
-    nspace_proxy_dmodules = NULL;
-    Delete(im_dmodule_imports);
-    im_dmodule_imports = NULL;
-    Delete(upcasts_code);
-    upcasts_code = NULL;
-    Delete(global_proxy_imports);
-    global_proxy_imports = NULL;
-    Delete(wrapper_loader_code);
-    wrapper_loader_code = NULL;
-    Delete(wrapper_loader_bind_code);
-    wrapper_loader_bind_code = NULL;
-    Delete(wrapper_loader_bind_command);
-    wrapper_loader_bind_command = NULL;
-    Delete(dmethods_seq);
-    dmethods_seq = NULL;
-    Delete(dmethods_table);
-    dmethods_table = NULL;
-    Delete(package);
-    package = NULL;
-    Delete(dmodule_directory);
-    dmodule_directory = NULL;
-    n_dmethods = 0;
-
-    // Merge all the generated C/C++ code and close the output files.
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-
-    if (directorsEnabled()) {
-      Dump(f_directors, f_begin);
-      Dump(f_directors_h, f_runtime_h);
-
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-
-      Delete(f_runtime_h);
-      f_runtime_h = NULL;
-      Delete(f_directors);
-      f_directors = NULL;
-      Delete(f_directors_h);
-      f_directors_h = NULL;
-    }
-
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::insertDirective()
-   * --------------------------------------------------------------------------- */
-  virtual int insertDirective(Node *n) {
-    int ret = SWIG_OK;
-    String *code = Getattr(n, "code");
-    String *section = Getattr(n, "section");
-    replaceModuleVariables(code);
-
-    if (!ImportMode && (Cmp(section, "proxycode") == 0)) {
-      if (proxy_class_body_code) {
-	Swig_typemap_replace_embedded_typemap(code, n);
-	Printv(proxy_class_body_code, code, NIL);
-      }
-    } else {
-      ret = Language::insertDirective(n);
-    }
-    return ret;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::pragmaDirective()
-   *
-   * Valid Pragmas:
-   * imdmodulecode      - text (D code) is copied verbatim to the wrap module
-   * imdmoduleimports   - import statements for the im D module
-   *
-   * proxydmodulecode     - text (D code) is copied verbatim to the proxy module
-   *                        (the main proxy module if in split proxy mode).
-   * globalproxyimports   - import statements inserted into _all_ proxy modules.
-   *
-   * wrapperloadercode    - D code for loading the wrapper library (is copied to
-   *                        the im D module).
-   * wrapperloaderbindcommand - D code for binding a symbol from the wrapper
-   *                        library to the declaration in the im D module.
-   * --------------------------------------------------------------------------- */
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *code = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-      if (Strcmp(lang, "d") == 0) {
-	String *strvalue = NewString(value);
-	Replaceall(strvalue, "\\\"", "\"");
-
-	if (Strcmp(code, "imdmodulecode") == 0) {
-	  Printf(im_dmodule_code, "%s\n", strvalue);
-	} else if (Strcmp(code, "imdmoduleimports") == 0) {
-	  replaceImportTypeMacros(strvalue);
-	  Chop(strvalue);
-	  Printf(im_dmodule_imports, "%s\n", strvalue);
-	} else if (Strcmp(code, "proxydmodulecode") == 0) {
-	  Printf(proxyCodeBuffer(0), "%s\n", strvalue);
-	} else if (Strcmp(code, "globalproxyimports") == 0) {
-	  replaceImportTypeMacros(strvalue);
-	  Chop(strvalue);
-	  Printf(global_proxy_imports, "%s\n", strvalue);
-	} else if (Strcmp(code, "wrapperloadercode") == 0) {
-	  Delete(wrapper_loader_code);
-	  wrapper_loader_code = Copy(strvalue);
-	} else if (Strcmp(code, "wrapperloaderbindcommand") == 0) {
-	  Delete(wrapper_loader_bind_command);
-	  wrapper_loader_bind_command = Copy(strvalue);
-	} else {
-	  Swig_error(input_file, line_number, "Unrecognized pragma.\n");
-	}
-	Delete(strvalue);
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::enumDeclaration()
-   *
-   * Wraps C/C++ enums as D enums.
-   * --------------------------------------------------------------------------- */
-  virtual int enumDeclaration(Node *n) {
-    if (ImportMode)
-      return SWIG_OK;
-
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    proxy_enum_code = NewString("");
-    String *symname = Getattr(n, "sym:name");
-    String *typemap_lookup_type = Getattr(n, "name");
-
-    // Emit the enum declaration.
-    if (typemap_lookup_type) {
-      const String *enummodifiers = lookupCodeTypemap(n, "dclassmodifiers", typemap_lookup_type, WARN_D_TYPEMAP_CLASSMOD_UNDEF);
-      Printv(proxy_enum_code, "\n", enummodifiers, " ", symname, " {\n", NIL);
-    } else {
-      // Handle anonymous enums.
-      Printv(proxy_enum_code, "\nenum {\n", NIL);
-    }
-
-    // Emit each enum item.
-    Language::enumDeclaration(n);
-
-    if (GetFlag(n, "nonempty")) {
-      // Finish the enum.
-      if (typemap_lookup_type) {
-	Printv(proxy_enum_code,
-	  lookupCodeTypemap(n, "dcode", typemap_lookup_type, WARN_NONE), // Extra D code
-	  "\n}\n", NIL);
-      } else {
-	// Handle anonymous enums.
-	Printv(proxy_enum_code, "\n}\n", NIL);
-      }
-      Replaceall(proxy_enum_code, "$dclassname", symname);
-    } else {
-      // D enum declarations must have at least one member to be legal, so emit
-      // an alias to int instead (their ctype/imtype is always int).
-      Delete(proxy_enum_code);
-      proxy_enum_code = NewStringf("\nalias int %s;\n", symname);
-    }
-
-    const String* imports =
-      lookupCodeTypemap(n, "dimports", typemap_lookup_type, WARN_NONE);
-    String* imports_trimmed;
-    if (Len(imports) > 0) {
-      imports_trimmed = Copy(imports);
-      Chop(imports_trimmed);
-      replaceImportTypeMacros(imports_trimmed);
-      Printv(imports_trimmed, "\n", NIL);
-    } else {
-      imports_trimmed = NewString("");
-    }
-
-    if (is_wrapping_class()) {
-      // Enums defined within the C++ class are written into the proxy
-      // class.
-      Printv(proxy_class_imports, imports_trimmed, NIL);
-      Printv(proxy_class_enums_code, proxy_enum_code, NIL);
-    } else {
-      // Write non-anonymous enums to their own file if in split proxy module
-      // mode.
-      if (split_proxy_dmodule && typemap_lookup_type) {
-	assertClassNameValidity(proxy_class_name);
-
-	String *nspace = Getattr(n, "sym:nspace");
-	String *output_directory = outputDirectory(nspace);
-	String *filename = NewStringf("%s%s.d", output_directory, symname);
-	Delete(output_directory);
-
-	File *class_file = NewFile(filename, "w", SWIG_output_files());
-	if (!class_file) {
-	  FileErrorDisplay(filename);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Append(filenames_list, Copy(filename));
-	Delete(filename);
-
-	emitBanner(class_file);
-	if (nspace) {
-	  Printf(class_file, "module %s%s.%s;\n", package, nspace, symname);
-	} else {
-	  Printf(class_file, "module %s%s;\n", package, symname);
-	}
-	Printv(class_file, imports_trimmed, NIL);
-
-	Printv(class_file, proxy_enum_code, NIL);
-
-	Delete(class_file);
-      } else {
-	String *nspace = Getattr(n, "sym:nspace");
-	Printv(proxyImportsBuffer(nspace), imports, NIL);
-	Printv(proxyCodeBuffer(nspace), proxy_enum_code, NIL);
-      }
-    }
-
-    Delete(imports_trimmed);
-
-    Delete(proxy_enum_code);
-    proxy_enum_code = NULL;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::enumvalueDeclaration()
-   * --------------------------------------------------------------------------- */
-  virtual int enumvalueDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    Swig_require("enumvalueDeclaration", n, "*name", "?value", NIL);
-    String *value = Getattr(n, "value");
-    String *name = Getattr(n, "name");
-    Node *parent = parentNode(n);
-    String *tmpValue;
-
-    // Strange hack from parent method.
-    // RESEARCH: What is this doing?
-    if (value)
-      tmpValue = NewString(value);
-    else
-      tmpValue = NewString(name);
-    // Note that this is used in enumValue() amongst other places
-    Setattr(n, "value", tmpValue);
-
-    // Deal with enum values that are not int
-    int swigtype = SwigType_type(Getattr(n, "type"));
-    if (swigtype == T_BOOL) {
-      const char *val = Equal(Getattr(n, "enumvalue"), "true") ? "1" : "0";
-      Setattr(n, "enumvalue", val);
-    } else if (swigtype == T_CHAR) {
-      String *val = NewStringf("'%(escape)s'", Getattr(n, "enumvalue"));
-      Setattr(n, "enumvalue", val);
-      Delete(val);
-    }
-
-    // Emit the enum item.
-    {
-      if (!GetFlag(n, "firstenumitem"))
-	Printf(proxy_enum_code, ",\n");
-
-      Printf(proxy_enum_code, "  %s", Getattr(n, "sym:name"));
-
-      // Check for the %dconstvalue feature
-      String *value = Getattr(n, "feature:d:constvalue");
-
-      // Note that in D, enum values must be compile-time constants. Thus,
-      // %dmanifestconst(0) (getting the enum values at runtime) is not supported.
-      value = value ? value : Getattr(n, "enumvalue");
-      if (value) {
-	Printf(proxy_enum_code, " = %s", value);
-      }
-
-      // Keep track that the currently processed enum has at least one value.
-      SetFlag(parent, "nonempty");
-    }
-
-    Delete(tmpValue);
-    Swig_restore(n);
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::memberfunctionHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int memberfunctionHandler(Node *n) {
-    Language::memberfunctionHandler(n);
-
-    String *overloaded_name = getOverloadedName(n);
-    String *intermediary_function_name =
-      Swig_name_member(getNSpace(), proxy_class_name, overloaded_name);
-    Setattr(n, "imfuncname", intermediary_function_name);
-
-    String *proxy_func_name = Getattr(n, "sym:name");
-    Setattr(n, "proxyfuncname", proxy_func_name);
-    if (split_proxy_dmodule &&
-      Len(Getattr(n, "parms")) == 0 &&
-      Strncmp(proxy_func_name, package, Len(proxy_func_name)) == 0) {
-      // If we are in split proxy mode and the function is named like the
-      // target package, the D compiler is unable to resolve the ambiguity
-      // between the package name and an argument-less function call.
-      // TODO: This might occur with nspace as well, augment the check.
-      Swig_warning(WARN_D_NAME_COLLISION, input_file, line_number,
-	"%s::%s might collide with the package name, consider using %%rename to resolve the ambiguity.\n",
-	proxy_class_name, proxy_func_name);
-    }
-
-    writeProxyClassFunction(n);
-
-    Delete(overloaded_name);
-
-    // For each function, look if we have to alias in the parent class function
-    // for the overload resolution process to work as expected from C++
-    // (http://www.digitalmars.com/d/2.0/function.html#function-inheritance).
-    // For multiple overloads, only emit the alias directive once (for the
-    // last method, »sym:nextSibling« is null then).
-    // Smart pointer classes do not mirror the inheritance hierarchy of the
-    // underlying types, so aliasing the base class methods in is not required
-    // for them.
-    // DMD BUG: We have to emit the alias after the last function becasue
-    // taking a delegate in the overload checking code fails otherwise
-    // (http://d.puremagic.com/issues/show_bug.cgi?id=4860).
-    if (!Getattr(n, "sym:nextSibling") && !is_smart_pointer() &&
-	!areAllOverloadsOverridden(n)) {
-      String *name = Getattr(n, "sym:name");
-      Printf(proxy_class_body_code, "\nalias $dbaseclass.%s %s;\n", name, name);
-    }
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::staticmemberfunctionHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int staticmemberfunctionHandler(Node *n) {
-    static_flag = true;
-
-    Language::staticmemberfunctionHandler(n);
-
-    String *overloaded_name = getOverloadedName(n);
-    String *intermediary_function_name =
-      Swig_name_member(getNSpace(), proxy_class_name, overloaded_name);
-    Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-    Setattr(n, "imfuncname", intermediary_function_name);
-    writeProxyClassFunction(n);
-    Delete(overloaded_name);
-
-    static_flag = false;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::globalvariableHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int globalvariableHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    global_variable_flag = true;
-    int ret = Language::globalvariableHandler(n);
-    global_variable_flag = false;
-
-    return ret;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::membervariableHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int membervariableHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    variable_wrapper_flag = true;
-    Language::membervariableHandler(n);
-    wrapping_member_flag = false;
-    variable_wrapper_flag = false;
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::staticmembervariableHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int staticmembervariableHandler(Node *n) {
-    if (GetFlag(n, "feature:d:manifestconst") != 1) {
-      Delattr(n, "value");
-    }
-
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    static_flag = true;
-    Language::staticmembervariableHandler(n);
-    wrapping_member_flag = false;
-    static_flag = false;
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::memberconstantHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int memberconstantHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    Language::memberconstantHandler(n);
-    wrapping_member_flag = false;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::constructorHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int constructorHandler(Node *n) {
-    Language::constructorHandler(n);
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloadedprocess in D.
-    if (Getattr(n, "overload:ignore")) {
-      return SWIG_OK;
-    }
-
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    String *proxy_constructor_code = NewString("");
-    int i;
-
-    // Holds code for the constructor helper method generated only when the din
-    // typemap has code in the pre or post attributes.
-    String *helper_code = NewString("");
-    String *helper_args = NewString("");
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-    NewString("");
-
-    String *overloaded_name = getOverloadedName(n);
-    String *mangled_overname = Swig_name_construct(getNSpace(), overloaded_name);
-    String *imcall = NewString("");
-
-    const String *methodmods = Getattr(n, "feature:d:methodmodifiers");
-    methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-    // Typemaps were attached earlier to the node, get the return type of the
-    // call to the C++ constructor wrapper.
-    const String *wrapper_return_type = lookupDTypemap(n, "imtype", true);
-
-    String *imtypeout = Getattr(n, "tmap:imtype:out");
-    if (imtypeout) {
-      // The type in the imtype typemap's out attribute overrides the type in
-      // the typemap itself.
-      wrapper_return_type = imtypeout;
-    }
-
-    Printf(proxy_constructor_code, "\n%s this(", methodmods);
-    Printf(helper_code, "static private %s SwigConstruct%s(",
-      wrapper_return_type, proxy_class_name);
-
-    Printv(imcall, im_dmodule_fq_name, ".", mangled_overname, "(", NIL);
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("in", l, NULL);
-    Swig_typemap_attach_parms("dtype", l, NULL);
-    Swig_typemap_attach_parms("din", l, NULL);
-
-    emit_mark_varargs(l);
-
-    int gencomma = 0;
-
-    /* Output each parameter */
-    Parm *p = l;
-    for (i = 0; p; i++) {
-      if (checkAttribute(p, "varargs:ignore", "1")) {
-	// Skip ignored varargs.
-	p = nextSibling(p);
-	continue;
-      }
-
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	// Skip ignored parameters.
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *param_type = NewString("");
-
-      // Get the D parameter type.
-      if ((tm = lookupDTypemap(p, "dtype", true))) {
-	const String *inattributes = Getattr(p, "tmap:dtype:inattributes");
-	Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	  "No dtype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      if (gencomma)
-	Printf(imcall, ", ");
-
-      String *arg = makeParameterName(n, p, i, false);
-      String *parmtype = 0;
-
-      // Get the D code to convert the parameter value to the type used in the
-      // intermediary D module.
-      if ((tm = lookupDTypemap(p, "din"))) {
-	Replaceall(tm, "$dinput", arg);
-	String *pre = Getattr(p, "tmap:din:pre");
-	if (pre) {
-	  replaceClassname(pre, pt);
-	  Replaceall(pre, "$dinput", arg);
-	  if (Len(pre_code) > 0)
-	    Printf(pre_code, "\n");
-	  Printv(pre_code, pre, NIL);
-	}
-	String *post = Getattr(p, "tmap:din:post");
-	if (post) {
-	  replaceClassname(post, pt);
-	  Replaceall(post, "$dinput", arg);
-	  if (Len(post_code) > 0)
-	    Printf(post_code, "\n");
-	  Printv(post_code, post, NIL);
-	}
-	String *terminator = Getattr(p, "tmap:din:terminator");
-	if (terminator) {
-	  replaceClassname(terminator, pt);
-	  Replaceall(terminator, "$dinput", arg);
-	  if (Len(terminator_code) > 0)
-	    Insert(terminator_code, 0, "\n");
-	  Insert(terminator_code, 0, terminator);
-	}
-	parmtype = Getattr(p, "tmap:din:parmtype");
-	if (parmtype)
-	  Replaceall(parmtype, "$dinput", arg);
-	Printv(imcall, tm, NIL);
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_DIN_UNDEF, input_file, line_number,
-	  "No din typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to proxy function */
-      if (gencomma) {
-	Printf(proxy_constructor_code, ", ");
-	Printf(helper_code, ", ");
-	Printf(helper_args, ", ");
-      }
-      Printf(proxy_constructor_code, "%s %s", param_type, arg);
-      Printf(helper_code, "%s %s", param_type, arg);
-      Printf(helper_args, "%s", parmtype ? parmtype : arg);
-      ++gencomma;
-
-      Delete(parmtype);
-      Delete(arg);
-      Delete(param_type);
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Printf(imcall, ")");
-
-    Printf(proxy_constructor_code, ")");
-    Printf(helper_code, ")");
-
-    // Insert the dconstructor typemap (replacing $directorconnect as needed).
-    Hash *attributes = NewHash();
-    String *construct_tm = Copy(lookupCodeTypemap(n, "dconstructor",
-      Getattr(n, "name"), WARN_D_TYPEMAP_DCONSTRUCTOR_UNDEF, attributes));
-    if (construct_tm) {
-      const bool use_director = (parentNode(n) && Swig_directorclass(n));
-      if (!use_director) {
-	Replaceall(construct_tm, "$directorconnect", "");
-      } else {
-	String *connect_attr = Getattr(attributes, "tmap:dconstructor:directorconnect");
-
-	if (connect_attr) {
-	  Replaceall(construct_tm, "$directorconnect", connect_attr);
-	} else {
-	  Swig_warning(WARN_D_NO_DIRECTORCONNECT_ATTR, input_file, line_number,
-	    "\"directorconnect\" attribute missing in %s \"dconstructor\" typemap.\n",
-	    Getattr(n, "name"));
-	  Replaceall(construct_tm, "$directorconnect", "");
-	}
-      }
-
-      Printv(proxy_constructor_code, " ", construct_tm, NIL);
-    }
-
-    replaceExcode(n, proxy_constructor_code, "dconstructor", attributes);
-
-    bool is_pre_code = Len(pre_code) > 0;
-    bool is_post_code = Len(post_code) > 0;
-    bool is_terminator_code = Len(terminator_code) > 0;
-    if (is_pre_code || is_post_code || is_terminator_code) {
-      Printf(helper_code, " {\n");
-      if (is_pre_code) {
-	Printv(helper_code, pre_code, "\n", NIL);
-      }
-      if (is_post_code) {
-	Printf(helper_code, "  try {\n");
-	Printv(helper_code, "    return ", imcall, ";\n", NIL);
-	Printv(helper_code, "  } finally {\n", post_code, "\n    }", NIL);
-      } else {
-	Printv(helper_code, "  return ", imcall, ";", NIL);
-      }
-      if (is_terminator_code) {
-	Printv(helper_code, "\n", terminator_code, NIL);
-      }
-      Printf(helper_code, "\n}\n");
-      String *helper_name = NewStringf("%s.SwigConstruct%s(%s)",
-	proxy_class_name, proxy_class_name, helper_args);
-      Replaceall(proxy_constructor_code, "$imcall", helper_name);
-      Delete(helper_name);
-    } else {
-      Replaceall(proxy_constructor_code, "$imcall", imcall);
-    }
-
-    Printv(proxy_class_body_code, proxy_constructor_code, "\n", NIL);
-
-    Delete(helper_args);
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(terminator_code);
-    Delete(construct_tm);
-    Delete(attributes);
-    Delete(overloaded_name);
-    Delete(imcall);
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::destructorHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int destructorHandler(Node *n) {
-    Language::destructorHandler(n);
-    String *symname = Getattr(n, "sym:name");
-    Printv(destructor_call, im_dmodule_fq_name, ".", Swig_name_destroy(getNSpace(),symname), "(cast(void*)swigCPtr)", NIL);
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classHandler()
-   * --------------------------------------------------------------------------- */
-  virtual int classHandler(Node *n) {
-    String *nspace = getNSpace();
-    File *class_file = NULL;
-
-    proxy_class_name = Copy(Getattr(n, "sym:name"));
-    if (nspace) {
-      proxy_class_qname = NewStringf("%s.%s", nspace, proxy_class_name);
-    } else {
-      proxy_class_qname = Copy(proxy_class_name);
-    }
-
-    if (!addSymbol(proxy_class_name, n, nspace)) {
-      return SWIG_ERROR;
-    }
-
-    assertClassNameValidity(proxy_class_name);
-
-    if (split_proxy_dmodule) {
-      String *output_directory = outputDirectory(nspace);
-      String *filename = NewStringf("%s%s.d", output_directory, proxy_class_name);
-      class_file = NewFile(filename, "w", SWIG_output_files());
-      Delete(output_directory);
-      if (!class_file) {
-	FileErrorDisplay(filename);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filename));
-      Delete(filename);
-
-      emitBanner(class_file);
-      if (nspace) {
-        Printf(class_file, "module %s%s.%s;\n", package, nspace, proxy_class_name);
-      } else {
-        Printf(class_file, "module %s%s;\n", package, proxy_class_name);
-      }
-      Printf(class_file, "\nstatic import %s;\n", im_dmodule_fq_name);
-    }
-
-    Clear(proxy_class_imports);
-    Clear(proxy_class_enums_code);
-    Clear(proxy_class_body_code);
-    Clear(proxy_class_epilogue_code);
-    Clear(proxy_class_code);
-    Clear(destructor_call);
-
-
-    // Traverse the tree for this class, using the *Handler()s to generate code
-    // to the proxy_class_* variables.
-    Language::classHandler(n);
-
-
-    writeProxyClassAndUpcasts(n);
-    writeDirectorConnectWrapper(n);
-
-    Replaceall(proxy_class_code, "$dclassname", proxy_class_name);
-
-    String *dclazzname = Swig_name_member(getNSpace(), proxy_class_name, "");
-    Replaceall(proxy_class_code, "$dclazzname", dclazzname);
-    Delete(dclazzname);
-
-    if (split_proxy_dmodule) {
-      Printv(class_file, global_proxy_imports, NIL);
-      Printv(class_file, proxy_class_imports, NIL);
-
-      replaceModuleVariables(proxy_class_code);
-      Printv(class_file, proxy_class_code, NIL);
-
-      Delete(class_file);
-    } else {
-      Printv(proxyImportsBuffer(getNSpace()), proxy_class_imports, NIL);
-      Printv(proxyCodeBuffer(getNSpace()), proxy_class_code, NIL);
-    }
-
-    Delete(proxy_class_qname);
-    proxy_class_qname = NULL;
-    Delete(proxy_class_name);
-    proxy_class_name = NULL;
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::constantWrapper()
-   *
-   * Used for wrapping constants declared by #define or %constant and also for
-   * (primitive) static member constants initialised inline.
-   *
-   * If the %dmanifestconst feature is used, the C/C++ constant value is used to
-   * initialize a D »const«. If not, a »getter« method is generated which
-   * retrieves the value via a call to the C wrapper. However, if there is a
-   * %dconstvalue specified, it overrides all other settings.
-   * --------------------------------------------------------------------------- */
-  virtual int constantWrapper(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    if (!addSymbol(symname, n))
-      return SWIG_ERROR;
-
-    // The %dmanifestconst feature determines if a D manifest constant
-    // (const/enum) or a getter function is created.
-    if (GetFlag(n, "feature:d:manifestconst") != 1) {
-      // Default constant handling will work with any type of C constant. It
-      // generates a getter function (which is the same as a read only property
-      // in D) which retrieves the value via by calling the C wrapper.
-      // Note that this is only called for global constants, static member
-      // constants are already handled in staticmemberfunctionHandler().
-
-      Swig_save("constantWrapper", n, "value", NIL);
-      Swig_save("constantWrapper", n, "tmap:ctype:out", "tmap:imtype:out", "tmap:dtype:out", "tmap:out:null", "tmap:imtype:outattributes", "tmap:dtype:outattributes", NIL);
-
-      // Add the stripped quotes back in.
-      String *old_value = Getattr(n, "value");
-      SwigType *t = Getattr(n, "type");
-      if (SwigType_type(t) == T_STRING) {
-	Setattr(n, "value", NewStringf("\"%s\"", old_value));
-	Delete(old_value);
-      } else if (SwigType_type(t) == T_CHAR) {
-	Setattr(n, "value", NewStringf("\'%s\'", old_value));
-	Delete(old_value);
-      }
-
-      SetFlag(n, "feature:immutable");
-      int result = globalvariableHandler(n);
-
-      Swig_restore(n);
-      return result;
-    }
-
-    String *constants_code = NewString("");
-    SwigType *t = Getattr(n, "type");
-    SwigType *valuetype = Getattr(n, "valuetype");
-    ParmList *l = Getattr(n, "parms");
-
-    // Attach the non-standard typemaps to the parameter list.
-    Swig_typemap_attach_parms("dtype", l, NULL);
-
-    // Get D return type.
-    String *return_type = NewString("");
-    String *tm;
-    if ((tm = lookupDTypemap(n, "dtype"))) {
-      String *dtypeout = Getattr(n, "tmap:dtype:out");
-      if (dtypeout) {
-	// The type in the out attribute of the typemap overrides the type
-	// in the dtype typemap.
-	tm = dtypeout;
-	replaceClassname(tm, t);
-      }
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	"No dtype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    const String *itemname = wrapping_member_flag ? variable_name : symname;
-
-    String *attributes = Getattr(n, "feature:d:methodmodifiers");
-    if (attributes) {
-      attributes = Copy(attributes);
-    } else {
-      attributes = Copy(is_public(n) ? public_string : protected_string);
-    }
-
-    if (d_version == 1) {
-      if (static_flag) {
-	Printv(attributes, " static", NIL);
-      }
-      Printf(constants_code, "\n%s const %s %s = ", attributes, return_type, itemname);
-    } else {
-      Printf(constants_code, "\n%s enum %s %s = ", attributes, return_type, itemname);
-    }
-    Delete(attributes);
-
-    // Retrive the override value set via %dconstvalue, if any.
-    String *override_value = Getattr(n, "feature:d:constvalue");
-    if (override_value) {
-      Printf(constants_code, "%s;\n", override_value);
-    } else {
-      // Just take the value from the C definition and hope it compiles in D.
-      if (Getattr(n, "wrappedasconstant")) {
-	if (SwigType_type(valuetype) == T_CHAR)
-          Printf(constants_code, "\'%(escape)s\';\n", Getattr(n, "staticmembervariableHandler:value"));
-	else
-          Printf(constants_code, "%s;\n", Getattr(n, "staticmembervariableHandler:value"));
-      } else {
-	// Add the stripped quotes back in.
-	String* value = Getattr(n, "value");
-	if (SwigType_type(t) == T_STRING) {
-	  Printf(constants_code, "\"%s\";\n", value);
-	} else if (SwigType_type(t) == T_CHAR) {
-	  Printf(constants_code, "\'%s\';\n", value);
-	} else {
-	  Printf(constants_code, "%s;\n", value);
-	}
-      }
-    }
-
-    // Emit the generated code to appropriate place.
-    if (wrapping_member_flag) {
-      Printv(proxy_class_body_code, constants_code, NIL);
-    } else {
-      Printv(proxyCodeBuffer(getNSpace()), constants_code, NIL);
-    }
-
-    // Cleanup.
-    Delete(return_type);
-    Delete(constants_code);
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::functionWrapper()
-   *
-   * Generates the C wrapper code for a function and the corresponding
-   * declaration in the wrap D module.
-   * --------------------------------------------------------------------------- */
-  virtual int functionWrapper(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *c_return_type = NewString("");
-    String *im_return_type = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *body = NewString("");
-    int num_arguments = 0;
-    bool is_void_return;
-    String *overloaded_name = getOverloadedName(n);
-
-    if (!Getattr(n, "sym:overloaded")) {
-      if (!addSymbol(Getattr(n, "sym:name"), n))
-	return SWIG_ERROR;
-    }
-
-    // A new wrapper function object
-    Wrapper *f = NewWrapper();
-
-    // Make a wrapper name for this function
-    String *wname = Swig_name_wrapper(overloaded_name);
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("ctype", l, f);
-    Swig_typemap_attach_parms("imtype", l, f);
-
-    /* Get return types */
-    if ((tm = lookupDTypemap(n, "ctype"))) {
-      String *ctypeout = Getattr(n, "tmap:ctype:out");
-      if (ctypeout) {
-	// The type in the ctype typemap's out attribute overrides the type in
-	// the typemap itself.
-	tm = ctypeout;
-      }
-      Printf(c_return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number,
-	"No ctype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if ((tm = lookupDTypemap(n, "imtype"))) {
-      String *imtypeout = Getattr(n, "tmap:imtype:out");
-      if (imtypeout) {
-	// The type in the imtype typemap's out attribute overrides the type in
-	// the typemap itself.
-	tm = imtypeout;
-      }
-      Printf(im_return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_IMTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    is_void_return = (Cmp(c_return_type, "void") == 0);
-    if (!is_void_return)
-      Wrapper_add_localv(f, "jresult", c_return_type, "jresult", NIL);
-
-    Printv(f->def, " SWIGEXPORT ", c_return_type, " ", wname, "(", NIL);
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-
-    // Parameter overloading
-    Setattr(n, "wrap:parms", l);
-    Setattr(n, "wrap:name", wname);
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in D
-    if (Getattr(n, "sym:overloaded")) {
-      // Emit warnings for the few cases that can't be overloaded in D and give up on generating wrapper
-      Swig_overload_check(n);
-      if (Getattr(n, "overload:ignore")) {
-	DelWrapper(f);
-	return SWIG_OK;
-      }
-    }
-
-    // Collect the parameter list for the intermediary D module declaration of
-    // the generated wrapper function.
-    String *im_dmodule_parameters = NewString("(");
-
-    /* Get number of required and total arguments */
-    num_arguments = emit_num_arguments(l);
-    int gencomma = 0;
-
-    // Now walk the function parameter list and generate code to get arguments
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-      String *im_param_type = NewString("");
-      String *c_param_type = NewString("");
-      String *arg = NewString("");
-
-      Printf(arg, "j%s", ln);
-
-      /* Get the ctype types of the parameter */
-      if ((tm = lookupDTypemap(p, "ctype", true))) {
-	Printv(c_param_type, tm, NIL);
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Get the intermediary class parameter types of the parameter */
-      if ((tm = lookupDTypemap(p, "imtype", true))) {
-	const String *inattributes = Getattr(p, "tmap:imtype:inattributes");
-	Printf(im_param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_IMTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to intermediary class method */
-      if (gencomma)
-	Printf(im_dmodule_parameters, ", ");
-      Printf(im_dmodule_parameters, "%s %s", im_param_type, arg);
-
-      // Add parameter to C function
-      Printv(f->def, gencomma ? ", " : "", c_param_type, " ", arg, NIL);
-
-      gencomma = 1;
-
-      // Get typemap for this argument
-      if ((tm = Getattr(p, "tmap:in"))) {
-	canThrow(n, "in", p);
-	Replaceall(tm, "$input", arg);
-	Setattr(p, "emit:input", arg);
-	Printf(f->code, "%s\n", tm);
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	p = nextSibling(p);
-      }
-      Delete(im_param_type);
-      Delete(c_param_type);
-      Delete(arg);
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	canThrow(n, "check", p);
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	canThrow(n, "freearg", p);
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	canThrow(n, "argout", p);
-	Replaceall(tm, "$result", "jresult");
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Look for usage of throws typemap and the canthrow flag
-    ParmList *throw_parm_list = NULL;
-    if ((throw_parm_list = Getattr(n, "catchlist"))) {
-      Swig_typemap_attach_parms("throws", throw_parm_list, f);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  canThrow(n, "throws", p);
-	}
-      }
-    }
-
-    String *null_attribute = 0;
-    // Now write code to make the function call
-    if (!native_function_flag) {
-
-      Swig_director_emit_dynamic_cast(n, f);
-      String *actioncode = emit_action(n);
-
-      /* Return value if necessary  */
-      if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-	canThrow(n, "out", n);
-	Replaceall(tm, "$result", "jresult");
-
-	if (GetFlag(n, "feature:new"))
-	  Replaceall(tm, "$owner", "1");
-	else
-	  Replaceall(tm, "$owner", "0");
-
-	Printf(f->code, "%s", tm);
-	null_attribute = Getattr(n, "tmap:out:null");
-	if (Len(tm))
-	  Printf(f->code, "\n");
-      } else {
-	Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(t, 0), Getattr(n, "name"));
-      }
-      emit_return_variable(n, t, f);
-    }
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	canThrow(n, "newfree", n);
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if (!native_function_flag) {
-      if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-	canThrow(n, "ret", n);
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    // Complete D im parameter list and emit the declaration/binding code.
-    Printv(im_dmodule_parameters, ")", NIL);
-    writeImDModuleFunction(overloaded_name, im_return_type,
-      im_dmodule_parameters, wname);
-    Delete(im_dmodule_parameters);
-
-    // Finish C function header.
-    Printf(f->def, ") {");
-
-    if (!is_void_return)
-      Printv(f->code, "    return jresult;\n", NIL);
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", symname);
-
-    /* Contract macro modification */
-    if (Replaceall(f->code, "SWIG_contract_assert(", "SWIG_contract_assert($null, ") > 0) {
-      Setattr(n, "d:canthrow", "1");
-    }
-
-    if (!null_attribute)
-      Replaceall(f->code, "$null", "0");
-    else
-      Replaceall(f->code, "$null", null_attribute);
-
-    /* Dump the function out */
-    if (!native_function_flag) {
-      Wrapper_print(f, f_wrappers);
-
-      // Handle %exception which sets the canthrow attribute.
-      if (Getattr(n, "feature:except:canthrow")) {
-	Setattr(n, "d:canthrow", "1");
-      }
-
-      // A very simple check (it is not foolproof) to assist typemap writers
-      // with setting the correct features when the want to throw D exceptions
-      // from C++ code. It checks for the common methods which set
-      // a pending D exception and issues a warning if one of them has been found
-      // in the typemap, but the »canthrow« attribute/feature is not set.
-      if (!Getattr(n, "d:canthrow")) {
-	if (Strstr(f->code, "SWIG_exception")) {
-	  Swig_warning(WARN_D_CANTHROW_MISSING, input_file, line_number,
-	  "C code contains a call to SWIG_exception and D code does not handle pending exceptions via the canthrow attribute.\n");
-	} else if (Strstr(f->code, "SWIG_DSetPendingException")) {
-	  Swig_warning(WARN_D_CANTHROW_MISSING, input_file, line_number,
-	  "C code contains a call to a SWIG_DSetPendingException method and D code does not handle pending exceptions via the canthrow attribute.\n");
-	}
-      }
-    }
-
-    // If we are not processing an enum or constant, and we were not generating
-    // a wrapper function which will be accessed via a proxy class, write a
-    // function to the proxy D module.
-    if (!is_wrapping_class()) {
-      writeProxyDModuleFunction(n);
-    }
-
-    // If we are processing a public member variable, write the property-style
-    // member function to the proxy class.
-    if (wrapping_member_flag) {
-      Setattr(n, "proxyfuncname", variable_name);
-      Setattr(n, "imfuncname", symname);
-
-      writeProxyClassFunction(n);
-    }
-
-    Delete(c_return_type);
-    Delete(im_return_type);
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(body);
-    Delete(overloaded_name);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::nativeWrapper()
-   * --------------------------------------------------------------------------- */
-  virtual int nativeWrapper(Node *n) {
-    String *wrapname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(wrapname, n))
-      return SWIG_ERROR;
-
-    if (Getattr(n, "type")) {
-      Swig_save("nativeWrapper", n, "name", NIL);
-      Setattr(n, "name", wrapname);
-      native_function_flag = true;
-      functionWrapper(n);
-      Swig_restore(n);
-      native_function_flag = false;
-    } else {
-      Swig_error(input_file, line_number, "No return type for %%native method %s.\n", Getattr(n, "wrap:name"));
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirector()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirector(Node *n) {
-    String *nspace = Getattr(n, "sym:nspace");
-    proxy_class_name = NewString(Getattr(n, "sym:name"));
-    if (nspace) {
-      proxy_class_qname = NewStringf("%s.%s", nspace, proxy_class_name);
-    } else {
-      proxy_class_qname = Copy(proxy_class_name);
-    }
-
-    int success = Language::classDirector(n);
-
-    Delete(proxy_class_qname);
-    proxy_class_qname = NULL;
-    Delete(proxy_class_name);
-    proxy_class_name = NULL;
-
-    return success;
-  }
-
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorInit()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorInit(Node *n) {
-    Delete(director_ctor_code);
-    director_ctor_code = NewString("$director_new");
-
-    // Write C++ director class declaration, for example:
-    // class SwigDirector_myclass : public myclass, public Swig::Director {
-    String *classname = Swig_class_name(n);
-    String *directorname = directorClassName(n);
-    String *declaration = Swig_class_declaration(n, directorname);
-    const String *base = Getattr(n, "classtype");
-
-    Printf(f_directors_h,
-      "%s : public %s, public Swig::Director {\n", declaration, base);
-    Printf(f_directors_h, "\npublic:\n");
-
-    Delete(declaration);
-    Delete(directorname);
-    Delete(classname);
-
-    // Stash for later.
-    Setattr(n, "director:ctor", NewString("Swig::Director()"));
-
-    // Keep track of the director methods for this class.
-    first_class_dmethod = curr_class_dmethod = n_dmethods;
-
-    director_callback_typedefs = NewString("");
-    director_callback_pointers = NewString("");
-    director_dcallbacks_code = NewString("");
-
-    return Language::classDirectorInit(n);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorMethod()
-   *
-   * Emit a virtual director method to pass a method call on to the
-   * underlying D object.
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorMethod(Node *n, Node *parent, String *super) {
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *name = Getattr(n, "name");
-    String *symname = Getattr(n, "sym:name");
-    SwigType *returntype = Getattr(n, "type");
-    String *overloaded_name = getOverloadedName(n);
-    String *storage = Getattr(n, "storage");
-    String *value = Getattr(n, "value");
-    String *decl = Getattr(n, "decl");
-    String *declaration = NewString("");
-    String *tm;
-    Parm *p;
-    int i;
-    Wrapper *w = NewWrapper();
-    ParmList *l = Getattr(n, "parms");
-    bool is_void = !(Cmp(returntype, "void"));
-    String *qualified_return = 0;
-    bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0")));
-    int status = SWIG_OK;
-    bool output_director = true;
-    String *dirclassname = directorClassName(parent);
-    String *qualified_name = NewStringf("%s::%s", dirclassname, name);
-    SwigType *c_ret_type = NULL;
-    String *dcallback_call_args = NewString("");
-    String *imclass_dmethod;
-    String *callback_typedef_parms = NewString("");
-    String *delegate_parms = NewString("");
-    String *proxy_method_param_list = NewString("");
-    String *proxy_callback_return_type = NewString("");
-    String *callback_def = NewString("");
-    String *callback_code = NewString("");
-    String *imcall_args = NewString("");
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    // Kludge Alert: functionWrapper sets sym:overload properly, but it
-    // isn't at this point, so we have to manufacture it ourselves. At least
-    // we're consistent with the sym:overload name in functionWrapper. (?? when
-    // does the overloaded method name get set?)
-
-    imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), classname, overloaded_name));
-
-    qualified_return = SwigType_rcaststr(returntype, "c_result");
-
-    if (!is_void && !ignored_method) {
-      if (!SwigType_isclass(returntype)) {
-	if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) {
-	  String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0));
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL);
-	  Delete(construct_result);
-	} else {
-	  String *base_typename = SwigType_base(returntype);
-	  String *resolved_typename = SwigType_typedef_resolve_all(base_typename);
-	  Symtab *symtab = Getattr(n, "sym:symtab");
-	  Node *typenode = Swig_symbol_clookup(resolved_typename, symtab);
-
-	  if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstracts"))) {
-	    /* initialize pointers to something sane. Same for abstract
-	       classes when a reference is returned. */
-	    Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
-	  } else {
-	    /* If returning a reference, initialize the pointer to a sane
-	       default - if a D exception occurs, then the pointer returns
-	       something other than a NULL-initialized reference. */
-	    String *non_ref_type = Copy(returntype);
-
-	    /* Remove reference and const qualifiers */
-	    Replaceall(non_ref_type, "r.", "");
-	    Replaceall(non_ref_type, "q(const).", "");
-	    Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL);
-	    Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL);
-
-	    Delete(non_ref_type);
-	  }
-
-	  Delete(base_typename);
-	  Delete(resolved_typename);
-	}
-      } else {
-	SwigType *vt;
-
-	vt = cplus_value_type(returntype);
-	if (!vt) {
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL);
-	} else {
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL);
-	  Delete(vt);
-	}
-      }
-    }
-
-    /* Create the intermediate class wrapper */
-    tm = lookupDTypemap(n, "imtype");
-    if (tm) {
-      String *imtypeout = Getattr(n, "tmap:imtype:out");
-      if (imtypeout) {
-	// The type in the imtype typemap's out attribute overrides the type
-	// in the typemap.
-	tm = imtypeout;
-      }
-      Printf(callback_def, "\nprivate extern(C) %s swigDirectorCallback_%s_%s(void* dObject", tm, classname, overloaded_name);
-      Printv(proxy_callback_return_type, tm, NIL);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_IMTYPE_UNDEF, input_file, line_number,
-	"No imtype typemap defined for %s\n", SwigType_str(returntype, 0));
-    }
-
-    if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) {
-      if (!is_void && !ignored_method) {
-	String *jretval_decl = NewStringf("%s jresult", c_ret_type);
-	Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL);
-	Delete(jretval_decl);
-      }
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number,
-	"No ctype typemap defined for %s for use in %s::%s (skipping director method)\n",
-	SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-      output_director = false;
-    }
-
-    Swig_director_parms_fixup(l);
-
-    // Attach the standard typemaps.
-    Swig_typemap_attach_parms("out", l, 0);
-    Swig_typemap_attach_parms("ctype", l, 0);
-    Swig_typemap_attach_parms("imtype", l, 0);
-    Swig_typemap_attach_parms("dtype", l, 0);
-    Swig_typemap_attach_parms("directorin", l, 0);
-    Swig_typemap_attach_parms("ddirectorin", l, 0);
-    Swig_typemap_attach_parms("directorargout", l, w);
-
-    // Preamble code.
-    if (!ignored_method)
-      Printf(w->code, "if (!swig_callback_%s) {\n", overloaded_name);
-
-    if (!pure_virtual) {
-      String *super_call = Swig_method_call(super, l);
-      if (is_void) {
-	Printf(w->code, "%s;\n", super_call);
-	if (!ignored_method)
-	  Printf(w->code, "return;\n");
-      } else {
-	Printf(w->code, "return %s;\n", super_call);
-      }
-      Delete(super_call);
-    } else {
-      Printf(w->code, " throw Swig::DirectorPureVirtualException(\"%s::%s\");\n", SwigType_namestr(c_classname), SwigType_namestr(name));
-    }
-
-    if (!ignored_method)
-      Printf(w->code, "} else {\n");
-
-    // Go through argument list.
-    for (i = 0, p = l; p; ++i) {
-      /* Is this superfluous? */
-      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = makeParameterName(n, p, i, false);
-      String *c_param_type = NULL;
-      String *c_decl = NewString("");
-      String *arg = NewString("");
-
-      Printf(arg, "j%s", ln);
-
-      // Add each parameter to the D callback invocation arguments.
-      Printf(dcallback_call_args, ", %s", arg);
-
-      /* Get parameter's intermediary C type */
-      if ((c_param_type = lookupDTypemap(p, "ctype", true))) {
-	String *ctypeout = Getattr(p, "tmap:ctype:out");
-	if (ctypeout) {
-	  // The type in the ctype typemap's out attribute overrides the type
-	  // in the typemap itself.
-	  c_param_type = ctypeout;
-	}
-
-	/* Add to local variables */
-	Printf(c_decl, "%s %s", c_param_type, arg);
-	if (!ignored_method)
-	  Wrapper_add_localv(w, arg, c_decl, (!(SwigType_ispointer(pt) || SwigType_isreference(pt)) ? "" : "= 0"), NIL);
-
-	/* Add input marshalling code */
-	if ((tm = Getattr(p, "tmap:directorin"))) {
-
-	  Setattr(p, "emit:directorinput", arg);
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$owner", "0");
-
-	  if (Len(tm))
-	    if (!ignored_method)
-	      Printf(w->code, "%s\n", tm);
-
-	  // Add parameter type to the C typedef for the D callback function.
-	  Printf(callback_typedef_parms, ", %s", c_param_type);
-
-	  /* Add parameter to the intermediate class code if generating the
-	   * intermediate's upcall code */
-	  if ((tm = lookupDTypemap(p, "imtype", true))) {
-	    String *imtypeout = Getattr(p, "tmap:imtype:out");
-	    if (imtypeout) {
-	      // The type in the imtype typemap's out attribute overrides the
-	      // type in the typemap itself.
-	      tm = imtypeout;
-	    }
-	    const String *im_directorinattributes = Getattr(p, "tmap:imtype:directorinattributes");
-
-	    // TODO: Is this copy really needed?
-	    String *din = Copy(lookupDTypemap(p, "ddirectorin", true));
-
-	    if (din) {
-	      Replaceall(din, "$winput", ln);
-
-	      Printf(delegate_parms, ", ");
-	      if (i > 0) {
-		Printf(proxy_method_param_list, ", ");
-		Printf(imcall_args, ", ");
-	      }
-	      Printf(delegate_parms, "%s%s %s", im_directorinattributes ? im_directorinattributes : empty_string, tm, ln);
-
-	      if (Cmp(din, ln)) {
-		Printv(imcall_args, din, NIL);
-	      } else {
-		Printv(imcall_args, ln, NIL);
-	      }
-
-	      Delete(din);
-
-	      // Get the parameter type in the proxy D class (used later when
-	      // generating the overload checking code for the directorConnect
-	      // function).
-	      if ((tm = lookupDTypemap(p, "dtype", true))) {
-		Printf(proxy_method_param_list, "%s", tm);
-	      } else {
-		Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	          "No dtype typemap defined for %s\n", SwigType_str(pt, 0));
-	      }
-	    } else {
-	      Swig_warning(WARN_D_TYPEMAP_DDIRECTORIN_UNDEF, input_file, line_number,
-	        "No ddirectorin typemap defined for %s for use in %s::%s (skipping director method)\n",
-		SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	      output_director = false;
-	    }
-	  } else {
-	    Swig_warning(WARN_D_TYPEMAP_IMTYPE_UNDEF, input_file, line_number,
-	      "No imtype typemap defined for %s for use in %s::%s (skipping director method)\n",
-	      SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    output_director = false;
-	  }
-
-	  p = Getattr(p, "tmap:directorin:next");
-	} else {
-	  Swig_warning(WARN_D_TYPEMAP_DDIRECTORIN_UNDEF, input_file, line_number,
-	    "No or improper directorin typemap defined for argument %s for use in %s::%s (skipping director method)\n",
-	    SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	  p = nextSibling(p);
-	  output_director = false;
-	}
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number,
-	  "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n",
-	  SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	output_director = false;
-	p = nextSibling(p);
-      }
-
-      Delete(arg);
-      Delete(c_decl);
-      Delete(c_param_type);
-      Delete(ln);
-    }
-
-    /* header declaration, start wrapper definition */
-    String *target;
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Add any exception specifications to the methods in the director class
-    ParmList *throw_parm_list = NULL;
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-	  Printf(w->def, "%s", SwigType_str(Getattr(p, "type"), 0));
-	  Printf(declaration, "%s", SwigType_str(Getattr(p, "type"), 0));
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    // Finish the callback function declaraction.
-    Printf(callback_def, "%s)", delegate_parms);
-    Printf(callback_def, " {\n");
-
-    /* Emit the intermediate class's upcall to the actual class */
-
-    String *upcall = NewStringf("(cast(%s)dObject).%s(%s)", classname, symname, imcall_args);
-
-    if (!is_void) {
-      if ((tm = lookupDTypemap(n, "ddirectorout"))) {
-	Replaceall(tm, "$dcall", upcall);
-	Printf(callback_code, "  return %s;\n", tm);
-      }
-    } else {
-      Printf(callback_code, "  %s;\n", upcall);
-    }
-
-    Printf(callback_code, "}\n");
-    Delete(upcall);
-
-    if (!ignored_method) {
-      if (!is_void)
-	Printf(w->code, "jresult = (%s) ", c_ret_type);
-
-      Printf(w->code, "swig_callback_%s(d_object%s);\n", overloaded_name, dcallback_call_args);
-
-      if (!is_void) {
-	String *jresult_str = NewString("jresult");
-	String *result_str = NewString("c_result");
-
-	/* Copy jresult into c_result... */
-	if ((tm = Swig_typemap_lookup("directorout", n, result_str, w))) {
-	  Replaceall(tm, "$input", jresult_str);
-	  Replaceall(tm, "$result", result_str);
-	  Printf(w->code, "%s\n", tm);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use return type %s used in %s::%s (skipping director method)\n",
-		       SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	  output_director = false;
-	}
-
-	Delete(jresult_str);
-	Delete(result_str);
-      }
-
-      /* Marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout"))) {
-	  canThrow(n, "directorargout", p);
-	  Replaceall(tm, "$result", "jresult");
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      /* Terminate wrapper code */
-      Printf(w->code, "}\n");
-      if (!is_void)
-	Printf(w->code, "return %s;", qualified_return);
-    }
-
-    Printf(w->code, "}");
-
-    // We expose virtual protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK && output_director) {
-      if (!is_void) {
-	Replaceall(w->code, "$null", qualified_return);
-      } else {
-	Replaceall(w->code, "$null", "");
-      }
-      if (!ignored_method)
-	Printv(director_dcallbacks_code, callback_def, callback_code, NIL);
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    if (!ignored_method) {
-      // Register the upcall method so that the callback registering code can
-      // be written later.
-
-      // We cannot directly use n here because its »type« attribute does not
-      // the full return type any longer after Language::functionHandler has
-      // returned.
-      String *dp_return_type = lookupDTypemap(n, "dtype");
-      if (dp_return_type) {
-	String *dtypeout = Getattr(n, "tmap:dtype:out");
-	if (dtypeout) {
-	  // The type in the dtype typemap's out attribute overrides the type
-	  // in the typemap itself.
-	  dp_return_type = dtypeout;
-  	replaceClassname(dp_return_type, returntype);
-	}
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	  "No dtype typemap defined for %s\n", SwigType_str(returntype, 0));
-	dp_return_type = NewString("");
-      }
-
-      UpcallData *udata = addUpcallMethod(imclass_dmethod, symname, decl, overloaded_name, dp_return_type, proxy_method_param_list);
-      Delete(dp_return_type);
-
-      // Write the global callback function pointer on the C code.
-      String *methid = Getattr(udata, "class_methodidx");
-
-      Printf(director_callback_typedefs, "    typedef %s (* SWIG_Callback%s_t)", c_ret_type, methid);
-      Printf(director_callback_typedefs, "(void *dobj%s);\n", callback_typedef_parms);
-      Printf(director_callback_pointers, "    SWIG_Callback%s_t swig_callback_%s;\n", methid, overloaded_name);
-
-      // Write the type alias for the callback to the intermediary D module.
-      String *proxy_callback_type = NewString("");
-      String *dirClassName = directorClassName(parent);
-      Printf(proxy_callback_type, "%s_Callback%s", dirClassName, methid);
-      Printf(im_dmodule_code, "alias extern(C) %s function(void*%s) %s;\n", proxy_callback_return_type, delegate_parms, proxy_callback_type);
-      Delete(proxy_callback_type);
-      Delete(dirClassName);
-    }
-
-    Delete(qualified_return);
-    Delete(c_ret_type);
-    Delete(declaration);
-    Delete(callback_typedef_parms);
-    Delete(delegate_parms);
-    Delete(proxy_method_param_list);
-    Delete(callback_def);
-    Delete(callback_code);
-    DelWrapper(w);
-
-    return status;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorConstructor()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorConstructor(Node *n) {
-    Node *parent = parentNode(n);
-    String *decl = Getattr(n, "decl");;
-    String *supername = Swig_class_name(parent);
-    String *dirclassname = directorClassName(parent);
-    String *sub = NewString("");
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms;
-    int argidx = 0;
-
-    /* Assign arguments to superclass's parameters, if not already done */
-    for (p = superparms; p; p = nextSibling(p)) {
-      String *pname = Getattr(p, "name");
-
-      if (!pname) {
-	pname = NewStringf("arg%d", argidx++);
-	Setattr(p, "name", pname);
-      }
-    }
-
-    // TODO: Is this copy needed?
-    parms = CopyParmList(superparms);
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
-	String *call = Swig_csuperclass_call(0, basetype, superparms);
-	String *classtype = SwigType_namestr(Getattr(n, "name"));
-
-	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
-	Printf(f_directors, "  swig_init_callbacks();\n");
-	Printf(f_directors, "}\n\n");
-
-	Delete(classtype);
-	Delete(target);
-	Delete(call);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(supername);
-    Delete(parms);
-    Delete(dirclassname);
-    return Language::classDirectorConstructor(n);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorDefaultConstructor()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorDefaultConstructor(Node *n) {
-    String *dirclassname = directorClassName(n);
-    String *classtype = SwigType_namestr(Getattr(n, "name"));
-    Wrapper *w = NewWrapper();
-
-    Printf(w->def, "%s::%s() : %s {", dirclassname, dirclassname, Getattr(n, "director:ctor"));
-    Printf(w->code, "}\n");
-    Wrapper_print(w, f_directors);
-
-    Printf(f_directors_h, "    %s();\n", dirclassname);
-    DelWrapper(w);
-    Delete(classtype);
-    Delete(dirclassname);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorDestructor()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorDestructor(Node *n) {
-    Node *current_class = getCurrentClass();
-    String *dirclassname = directorClassName(current_class);
-    Wrapper *w = NewWrapper();
-
-    if (Getattr(n, "throw")) {
-      Printf(f_directors_h, "    virtual ~%s() throw ();\n", dirclassname);
-      Printf(w->def, "%s::~%s() throw () {\n", dirclassname, dirclassname);
-    } else {
-      Printf(f_directors_h, "    virtual ~%s();\n", dirclassname);
-      Printf(w->def, "%s::~%s() {\n", dirclassname, dirclassname);
-    }
-
-    Printv(w->code, "}\n", NIL);
-
-    Wrapper_print(w, f_directors);
-
-    DelWrapper(w);
-    Delete(dirclassname);
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorEnd()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorEnd(Node *n) {
-    int i;
-    String *director_classname = directorClassName(n);
-
-    Wrapper *w = NewWrapper();
-
-    if (Len(director_callback_typedefs) > 0) {
-      Printf(f_directors_h, "\n%s", director_callback_typedefs);
-    }
-
-    Printf(f_directors_h, "    void swig_connect_director(void* dobj");
-
-    Printf(w->def, "void %s::swig_connect_director(void* dobj", director_classname);
-    Printf(w->code, "d_object = dobj;");
-
-    for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *methid = Getattr(udata, "class_methodidx");
-      String *overname = Getattr(udata, "overname");
-
-      Printf(f_directors_h, ", SWIG_Callback%s_t callback%s", methid, overname);
-      Printf(w->def, ", SWIG_Callback%s_t callback_%s", methid, overname);
-      Printf(w->code, "swig_callback_%s = callback_%s;\n", overname, overname);
-    }
-
-    Printf(f_directors_h, ");\n");
-    Printf(w->def, ") {");
-
-    Printf(f_directors_h, "\nprivate:\n");
-    Printf(f_directors_h, "    void swig_init_callbacks();\n");
-    Printf(f_directors_h, "    void *d_object;\n");
-    if (Len(director_callback_pointers) > 0) {
-      Printf(f_directors_h, "%s", director_callback_pointers);
-    }
-    Printf(f_directors_h, "};\n\n");
-    Printf(w->code, "}\n\n");
-
-    Printf(w->code, "void %s::swig_init_callbacks() {\n", director_classname);
-    for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *overname = Getattr(udata, "overname");
-      Printf(w->code, "swig_callback_%s = 0;\n", overname);
-    }
-    Printf(w->code, "}");
-
-    Wrapper_print(w, f_directors);
-
-    DelWrapper(w);
-
-    return Language::classDirectorEnd(n);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::classDirectorDisown()
-   * --------------------------------------------------------------------------- */
-  virtual int classDirectorDisown(Node *n) {
-    (void) n;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::replaceSpecialVariables()
-   * --------------------------------------------------------------------------- */
-  virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) {
-    (void)method;
-    SwigType *type = Getattr(parm, "type");
-
-    // Just assume that this goes to the proxy class, we cannot know.
-    replaceClassname(tm, type);
-  }
-
-protected:
-  /* ---------------------------------------------------------------------------
-   * D::extraDirectorProtectedCPPMethodsRequired()
-   * --------------------------------------------------------------------------- */
-  virtual bool extraDirectorProtectedCPPMethodsRequired() const {
-    return false;
-  }
-
-private:
-  /* ---------------------------------------------------------------------------
-   * D::writeImDModuleFunction()
-   *
-   * Writes a function declaration for the given (C) wrapper function to the
-   * intermediary D module.
-   *
-   * d_name - The name the function in the intermediary D module will get.
-   * return type - The return type of the function in the C wrapper.
-   * parameters - The parameter list of the C wrapper function.
-   * wrapper_function_name - The name of the exported function in the C wrapper
-   *                         (usually d_name prefixed by »D_«).
-   * --------------------------------------------------------------------------- */
-  void writeImDModuleFunction(const_String_or_char_ptr d_name,
-    const_String_or_char_ptr return_type, const_String_or_char_ptr parameters,
-    const_String_or_char_ptr wrapper_function_name) {
-
-    // TODO: Add support for static linking here.
-    Printf(im_dmodule_code, "SwigExternC!(%s function%s) %s;\n", return_type,
-      parameters, d_name);
-    Printv(wrapper_loader_bind_code, wrapper_loader_bind_command, NIL);
-    Replaceall(wrapper_loader_bind_code, "$function", d_name);
-    Replaceall(wrapper_loader_bind_code, "$symbol", wrapper_function_name);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::writeProxyClassFunction()
-   *
-   * Creates a D proxy function for a C++ function in the wrapped class. Used
-   * for both static and non-static C++ class functions.
-   *
-   * The Node must contain two extra attributes.
-   *  - "proxyfuncname": The name of the D proxy function.
-   *  - "imfuncname": The corresponding function in the intermediary D module.
-   * --------------------------------------------------------------------------- */
-  void writeProxyClassFunction(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *intermediary_function_name = Getattr(n, "imfuncname");
-    String *proxy_function_name = Getattr(n, "proxyfuncname");
-    String *tm;
-    Parm *p;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    bool setter_flag = false;
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-
-    // Wrappers not wanted for some methods where the parameters cannot be
-    // overloaded in D.
-    if (Getattr(n, "overload:ignore"))
-      return;
-
-    // Don't generate proxy method for additional explicitcall method used in
-    // directors.
-    if (GetFlag(n, "explicitcall"))
-      return;
-
-    // RESEARCH: What is this good for?
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("in", l, NULL);
-    Swig_typemap_attach_parms("dtype", l, NULL);
-    Swig_typemap_attach_parms("din", l, NULL);
-
-    // Get return types.
-    if ((tm = lookupDTypemap(n, "dtype"))) {
-      String *dtypeout = Getattr(n, "tmap:dtype:out");
-      if (dtypeout) {
-	// The type in the dtype typemap's out attribute overrides the type in
-	// the typemap.
-	tm = dtypeout;
-        replaceClassname(tm, t);
-      }
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	"No dtype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if (wrapping_member_flag) {
-      // Check if this is a setter method for a public member.
-      const String *setter_name = Swig_name_set(getNSpace(),
-        Swig_name_member(0, proxy_class_name, variable_name));
-
-      if (Cmp(Getattr(n, "sym:name"), setter_name) == 0) {
-        setter_flag = true;
-      }
-    }
-
-    // Write function modifiers.
-    {
-      String *modifiers;
-
-      const String *mods_override = Getattr(n, "feature:d:methodmodifiers");
-      if (mods_override) {
-	modifiers = Copy(mods_override);
-      } else {
-	modifiers = Copy(is_public(n) ? public_string : protected_string);
-
-	if (Getattr(n, "override")) {
-	  Printf(modifiers, " override");
-	}
-      }
-
-      if (is_smart_pointer()) {
-	// Smart pointer classes do not mirror the inheritance hierarchy of the
-	// underlying pointer type, so no override required.
-	Replaceall(modifiers, "override", "");
-      }
-
-      Chop(modifiers);
-
-      if (static_flag) {
-	Printf(modifiers, " static");
-      }
-
-      Printf(function_code, "%s ", modifiers);
-      Delete(modifiers);
-    }
-
-    // Complete the function declaration up to the parameter list.
-    Printf(function_code, "%s %s(", return_type, proxy_function_name);
-
-    // Write the wrapper function call up to the parameter list.
-    Printv(imcall, im_dmodule_fq_name, ".$imfuncname(", NIL);
-    if (!static_flag) {
-      Printf(imcall, "cast(void*)swigCPtr");
-    }
-
-    String *proxy_param_types = NewString("");
-
-    // Write the parameter list for the proxy function declaration and the
-    // wrapper function call.
-    emit_mark_varargs(l);
-    int gencomma = !static_flag;
-    for (i = 0, p = l; p; i++) {
-      // Ignored varargs.
-      if (checkAttribute(p, "varargs:ignore", "1")) {
-	p = nextSibling(p);
-	continue;
-      }
-
-      // Ignored parameters.
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-
-      // Ignore the 'this' argument for variable wrappers.
-      if (!(variable_wrapper_flag && i == 0)) {
-	String *param_name = makeParameterName(n, p, i, setter_flag);
-	SwigType *pt = Getattr(p, "type");
-
-	// Write the wrapper function call argument.
-	{
-	  if (gencomma) {
-	    Printf(imcall, ", ");
-	  }
-
-	  if ((tm = lookupDTypemap(p, "din", true))) {
-	    Replaceall(tm, "$dinput", param_name);
-	    String *pre = Getattr(p, "tmap:din:pre");
-	    if (pre) {
-	      replaceClassname(pre, pt);
-	      Replaceall(pre, "$dinput", param_name);
-	      if (Len(pre_code) > 0)
-		Printf(pre_code, "\n");
-	      Printv(pre_code, pre, NIL);
-	    }
-	    String *post = Getattr(p, "tmap:din:post");
-	    if (post) {
-	      replaceClassname(post, pt);
-	      Replaceall(post, "$dinput", param_name);
-	      if (Len(post_code) > 0)
-		Printf(post_code, "\n");
-	      Printv(post_code, post, NIL);
-	    }
-	    String *terminator = Getattr(p, "tmap:din:terminator");
-	    if (terminator) {
-	      replaceClassname(terminator, pt);
-	      Replaceall(terminator, "$dinput", param_name);
-	      if (Len(terminator_code) > 0)
-		Insert(terminator_code, 0, "\n");
-	      Insert(terminator_code, 0, terminator);
-	    }
-	    Printv(imcall, tm, NIL);
-	  } else {
-	    Swig_warning(WARN_D_TYPEMAP_DIN_UNDEF, input_file, line_number,
-	      "No din typemap defined for %s\n", SwigType_str(pt, 0));
-	  }
-	}
-
-	// Write the D proxy function parameter.
-	{
-	  String *proxy_type = NewString("");
-
-	  if ((tm = lookupDTypemap(p, "dtype"))) {
-	    const String *inattributes = Getattr(p, "tmap:dtype:inattributes");
-	    Printf(proxy_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-	  } else {
-	    Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	      "No dtype typemap defined for %s\n", SwigType_str(pt, 0));
-	  }
-
-	  if (gencomma >= 2) {
-	    Printf(function_code, ", ");
-	    Printf(proxy_param_types, ", ");
-	  }
-	  gencomma = 2;
-	  Printf(function_code, "%s %s", proxy_type, param_name);
-	  Append(proxy_param_types, proxy_type);
-
-	  Delete(proxy_type);
-	}
-
-	Delete(param_name);
-      }
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ") ");
-
-    if (d_version > 1 && wrapping_member_flag) {
-      Printf(function_code, "@property ");
-    }
-
-    if (wrapMemberFunctionAsDConst(n)) {
-      Printf(function_code, "const ");
-    }
-
-    // Lookup the code used to convert the wrapper return value to the proxy
-    // function return type.
-    if ((tm = lookupDTypemap(n, "dout"))) {
-      replaceExcode(n, tm, "dout", n);
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      bool is_terminator_code = Len(terminator_code) > 0;
-      if (is_pre_code || is_post_code || is_terminator_code) {
-	if (is_post_code) {
-	  Insert(tm, 0, "\n  try ");
-	  Printv(tm, " finally {\n", post_code, "\n  }", NIL);
-	} else {
-	  Insert(tm, 0, "\n  ");
-	}
-	if (is_pre_code) {
-	  Insert(tm, 0, pre_code);
-	  Insert(tm, 0, "\n");
-	}
-	if (is_terminator_code) {
-	  Printv(tm, "\n", terminator_code, NIL);
-	}
-	Insert(tm, 0, "{");
-	Printv(tm, "}", NIL);
-      }
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      replaceClassname(tm, t);
-
-      // For director methods: generate code to selectively make a normal
-      // polymorphic call or an explicit method call. Needed to prevent infinite
-      // recursion when calling director methods.
-      Node *explicit_n = Getattr(n, "explicitcallnode");
-      if (explicit_n && Swig_directorclass(getCurrentClass())) {
-	String *ex_overloaded_name = getOverloadedName(explicit_n);
-	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, ex_overloaded_name);
-
-	String *ex_imcall = Copy(imcall);
-	Replaceall(ex_imcall, "$imfuncname", ex_intermediary_function_name);
-	Replaceall(imcall, "$imfuncname", intermediary_function_name);
-
-	String *excode = NewString("");
-	if (!Cmp(return_type, "void"))
-	  Printf(excode, "if (swigIsMethodOverridden!(%s delegate(%s), %s function(%s), %s)()) %s; else %s",
-	    return_type, proxy_param_types, return_type, proxy_param_types, proxy_function_name, ex_imcall, imcall);
-	else
-	  Printf(excode, "((swigIsMethodOverridden!(%s delegate(%s), %s function(%s), %s)()) ? %s : %s)",
-	    return_type, proxy_param_types, return_type, proxy_param_types, proxy_function_name, ex_imcall, imcall);
-
-	Clear(imcall);
-	Printv(imcall, excode, NIL);
-	Delete(ex_overloaded_name);
-	Delete(excode);
-      } else {
-	Replaceall(imcall, "$imfuncname", intermediary_function_name);
-      }
-      Replaceall(tm, "$imcall", imcall);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_DOUT_UNDEF, input_file, line_number,
-	"No dout typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    Delete(proxy_param_types);
-
-    // The whole function body is now in stored tm (if there was a matching type
-    // map, of course), so simply append it to the code buffer. The braces are
-    // included in the typemap.
-    Printv(function_code, tm, NIL);
-
-    // Write function code buffer to the class code.
-    Printv(proxy_class_body_code, "\n", function_code, "\n", NIL);
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(terminator_code);
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::writeProxyDModuleFunction()
-   * --------------------------------------------------------------------------- */
-  void writeProxyDModuleFunction(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    int num_arguments = 0;
-    String *overloaded_name = getOverloadedName(n);
-    String *func_name = NULL;
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *terminator_code = NewString("");
-
-    // RESEARCH: What is this good for?
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("dtype", l, NULL);
-    Swig_typemap_attach_parms("din", l, NULL);
-
-    /* Get return types */
-    if ((tm = lookupDTypemap(n, "dtype"))) {
-      String *dtypeout = Getattr(n, "tmap:dtype:out");
-      if (dtypeout) {
-	// The type in the dtype typemap's out attribute overrides the type in
-	// the typemap.
-	tm = dtypeout;
-	replaceClassname(tm, t);
-      }
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	"No dtype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    /* Change function name for global variables */
-    if (global_variable_flag) {
-      // RESEARCH: Is the Copy() needed here?
-      func_name = Copy(variable_name);
-    } else {
-      func_name = Copy(Getattr(n, "sym:name"));
-    }
-
-    /* Start generating the function */
-    const String *outattributes = Getattr(n, "tmap:dtype:outattributes");
-    if (outattributes)
-      Printf(function_code, "  %s\n", outattributes);
-
-    const String *methodmods = Getattr(n, "feature:d:methodmodifiers");
-    // TODO: Check if is_public(n) could possibly make any sense here
-    // (private global functions would be useless anyway?).
-    methodmods = methodmods ? methodmods : empty_string;
-
-    Printf(function_code, "\n%s%s %s(", methodmods, return_type, func_name);
-    Printv(imcall, im_dmodule_fq_name, ".", overloaded_name, "(", NIL);
-
-    /* Get number of required and total arguments */
-    num_arguments = emit_num_arguments(l);
-
-    int gencomma = 0;
-
-    /* Output each parameter */
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      /* Ignored parameters */
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *param_type = NewString("");
-
-      // Get the D parameter type.
-      if ((tm = lookupDTypemap(p, "dtype", true))) {
-	const String *inattributes = Getattr(p, "tmap:dtype:inattributes");
-	Printf(param_type, "%s%s", inattributes ? inattributes : empty_string, tm);
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number,
-	  "No dtype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      if (gencomma)
-	Printf(imcall, ", ");
-
-      const bool generating_setter = global_variable_flag || wrapping_member_flag;
-      String *arg = makeParameterName(n, p, i, generating_setter);
-
-      // Get the D code to convert the parameter value to the type used in the
-      // wrapper D module.
-      if ((tm = lookupDTypemap(p, "din", true))) {
-	Replaceall(tm, "$dinput", arg);
-	String *pre = Getattr(p, "tmap:din:pre");
-	if (pre) {
-	  replaceClassname(pre, pt);
-	  Replaceall(pre, "$dinput", arg);
-	  if (Len(pre_code) > 0)
-	    Printf(pre_code, "\n");
-	  Printv(pre_code, pre, NIL);
-	}
-	String *post = Getattr(p, "tmap:din:post");
-	if (post) {
-	  replaceClassname(post, pt);
-	  Replaceall(post, "$dinput", arg);
-	  if (Len(post_code) > 0)
-	    Printf(post_code, "\n");
-	  Printv(post_code, post, NIL);
-	}
-	String *terminator = Getattr(p, "tmap:din:terminator");
-	if (terminator) {
-	  replaceClassname(terminator, pt);
-	  Replaceall(terminator, "$dinput", arg);
-	  if (Len(terminator_code) > 0)
-	    Insert(terminator_code, 0, "\n");
-	  Insert(terminator_code, 0, terminator);
-	}
-	Printv(imcall, tm, NIL);
-      } else {
-	Swig_warning(WARN_D_TYPEMAP_DIN_UNDEF, input_file, line_number,
-	  "No din typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to module class function */
-      if (gencomma >= 2)
-	Printf(function_code, ", ");
-      gencomma = 2;
-      Printf(function_code, "%s %s", param_type, arg);
-
-      p = Getattr(p, "tmap:in:next");
-      Delete(arg);
-      Delete(param_type);
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ") ");
-
-    if (global_variable_flag && (d_version > 1)) {
-      Printf(function_code, "@property ");
-    }
-
-    // Lookup the code used to convert the wrapper return value to the proxy
-    // function return type.
-    if ((tm = lookupDTypemap(n, "dout"))) {
-      replaceExcode(n, tm, "dout", n);
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      bool is_terminator_code = Len(terminator_code) > 0;
-      if (is_pre_code || is_post_code || is_terminator_code) {
-	if (is_post_code) {
-	  Insert(tm, 0, "\n  try ");
-	  Printv(tm, " finally {\n", post_code, "\n  }", NIL);
-	} else {
-	  Insert(tm, 0, "\n  ");
-	}
-	if (is_pre_code) {
-	  Insert(tm, 0, pre_code);
-	  Insert(tm, 0, "\n");
-	}
-	if (is_terminator_code) {
-	  Printv(tm, "\n", terminator_code, NIL);
-	}
-	Insert(tm, 0, " {");
-	Printf(tm, "\n}");
-      }
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      replaceClassname(tm, t);
-      Replaceall(tm, "$imcall", imcall);
-    } else {
-      Swig_warning(WARN_D_TYPEMAP_DOUT_UNDEF, input_file, line_number,
-	"No dout typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    // The whole function code is now stored in tm (if there was a matching
-    // type map, of course), so simply append it to the code buffer.
-    Printf(function_code, "%s\n", tm ? (const String *) tm : empty_string);
-    Printv(proxyCodeBuffer(getNSpace()), function_code, NIL);
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(terminator_code);
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-    Delete(func_name);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::writeProxyClassAndUpcasts()
-   *
-   * Collects all the code fragments generated by the handler function while
-   * traversing the tree from the proxy_class_* variables and writes the
-   * class definition (including any epilogue code) to proxy_class_code.
-   *
-   * Also writes the upcast function to the wrapper layer when processing a
-   * derived class.
-   *
-   * Inputs:
-   *  n – The class node currently processed.
-   * --------------------------------------------------------------------------- */
-  void writeProxyClassAndUpcasts(Node *n) {
-    SwigType *typemap_lookup_type = Getattr(n, "classtypeobj");
-
-    /*
-     * Handle inheriting from D and C++ classes.
-     */
-
-    String *c_classname = SwigType_namestr(Getattr(n, "name"));
-    String *c_baseclass = NULL;
-    Node *basenode = NULL;
-    String *basename = NULL;
-    String *c_baseclassname = NULL;
-
-    // Inheritance from pure D classes.
-    Node *attributes = NewHash();
-    const String *pure_baseclass =
-      lookupCodeTypemap(n, "dbase", typemap_lookup_type, WARN_NONE, attributes);
-    bool purebase_replace = GetFlag(attributes, "tmap:dbase:replace") ? true : false;
-    bool purebase_notderived = GetFlag(attributes, "tmap:dbase:notderived") ? true : false;
-    Delete(attributes);
-
-    // C++ inheritance.
-    if (!purebase_replace) {
-      List *baselist = Getattr(n, "bases");
-      if (baselist) {
-	Iterator base = First(baselist);
-	while (base.item) {
-	  if (!GetFlag(base.item, "feature:ignore")) {
-	    String *baseclassname = Getattr(base.item, "name");
-	    if (!c_baseclassname) {
-	      basenode = base.item;
-	      c_baseclassname = baseclassname;
-	      basename = createProxyName(c_baseclassname);
-	      if (basename)
-		c_baseclass = SwigType_namestr(baseclassname);
-	    } else {
-	      /* Warn about multiple inheritance for additional base class(es) */
-	      String *proxyclassname = Getattr(n, "classtypeobj");
-	      Swig_warning(WARN_D_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		  "Base %s of class %s ignored: multiple inheritance is not supported in D.\n", SwigType_namestr(baseclassname), SwigType_namestr(proxyclassname));
-	    }
-	  }
-	  base = Next(base);
-	}
-      }
-    }
-
-    bool derived = (basename != NULL);
-
-    if (derived && purebase_notderived) {
-      pure_baseclass = empty_string;
-    }
-    const String *wanted_base = basename ? basename : pure_baseclass;
-
-    if (purebase_replace) {
-      wanted_base = pure_baseclass;
-      derived = false;
-      basenode = NULL;
-      Delete(basename);
-      basename = NULL;
-      if (purebase_notderived) {
-	Swig_error(Getfile(n), Getline(n),
-	  "The dbase typemap for proxy %s must contain just one of the 'replace' or 'notderived' attributes.\n",
-	  typemap_lookup_type);
-      }
-    } else if (basename && Len(pure_baseclass) > 0) {
-      Swig_warning(WARN_D_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-	"Warning for %s, base class %s ignored. Multiple inheritance is not supported in D. "
-	"Perhaps you need one of the 'replace' or 'notderived' attributes in the dbase typemap?\n", typemap_lookup_type, pure_baseclass);
-    }
-
-    // Add code to do C++ casting to base class (only for classes in an inheritance hierarchy)
-    if (derived) {
-      writeClassUpcast(n, proxy_class_name, c_classname, c_baseclass);
-    }
-
-    /*
-     * Write needed imports.
-     */
-    // If this class is derived from a C++ class, we need to have the D class
-    // generated for it in scope.
-    if (derived) {
-      requireDType(Getattr(basenode, "sym:nspace"), Getattr(basenode, "sym:name"));
-    }
-
-    // Write any custom import statements to the proxy module header.
-    const String *imports = lookupCodeTypemap(n, "dimports", typemap_lookup_type, WARN_NONE);
-    if (Len(imports) > 0) {
-      String* imports_trimmed = Copy(imports);
-      Chop(imports_trimmed);
-      replaceImportTypeMacros(imports_trimmed);
-      Printv(proxy_class_imports, imports_trimmed, "\n", NIL);
-      Delete(imports_trimmed);
-    }
-
-    /*
-     * Write the proxy class header.
-     */
-    // Class modifiers.
-    const String *modifiers =
-      lookupCodeTypemap(n, "dclassmodifiers", typemap_lookup_type, WARN_D_TYPEMAP_CLASSMOD_UNDEF);
-
-    // User-defined interfaces.
-    const String *interfaces =
-      lookupCodeTypemap(n, derived ? "dinterfaces_derived" : "dinterfaces", typemap_lookup_type, WARN_NONE);
-
-    Printv(proxy_class_code,
-      "\n",
-      modifiers,
-      " $dclassname",
-      (*Char(wanted_base) || *Char(interfaces)) ? " : " : "", wanted_base,
-      (*Char(wanted_base) && *Char(interfaces)) ? ", " : "", interfaces, " {",
-      NIL);
-
-    /*
-     * Write the proxy class body.
-     */
-    String* body = NewString("");
-
-    // Default class body.
-    const String *dbody;
-    if (derived) {
-      dbody = lookupCodeTypemap(n, "dbody_derived", typemap_lookup_type, WARN_D_TYPEMAP_DBODY_UNDEF);
-    } else {
-      dbody = lookupCodeTypemap(n, "dbody", typemap_lookup_type, WARN_D_TYPEMAP_DBODY_UNDEF);
-    }
-
-    Printv(body, dbody, NIL);
-
-    // Destructor and dispose().
-    // If the C++ destructor is accessible (public), it is wrapped by the
-    // dispose() method which is also called by the emitted D constructor. If it
-    // is not accessible, no D destructor is written and the generated dispose()
-    // method throws an exception.
-    // This enables C++ classes with protected or private destructors to be used
-    // in D as it would be used in C++ (GC finalization is a no-op then because
-    // of the empty D destructor) while preventing usage in »scope« variables.
-    // The method name for the dispose() method is specified in a typemap
-    // attribute called »methodname«.
-    const String *tm = NULL;
-
-    String *dispose_methodname;
-    String *dispose_methodmodifiers;
-    attributes = NewHash();
-    if (derived) {
-      tm = lookupCodeTypemap(n, "ddispose_derived", typemap_lookup_type, WARN_NONE, attributes);
-      dispose_methodname = Getattr(attributes, "tmap:ddispose_derived:methodname");
-      dispose_methodmodifiers = Getattr(attributes, "tmap:ddispose_derived:methodmodifiers");
-    } else {
-      tm = lookupCodeTypemap(n, "ddispose", typemap_lookup_type, WARN_NONE, attributes);
-      dispose_methodname = Getattr(attributes, "tmap:ddispose:methodname");
-      dispose_methodmodifiers = Getattr(attributes, "tmap:ddispose:methodmodifiers");
-    }
-
-    if (tm && *Char(tm)) {
-      if (!dispose_methodname) {
-	Swig_error(Getfile(n), Getline(n),
-	  "No methodname attribute defined in the ddispose%s typemap for %s\n",
-	  (derived ? "_derived" : ""), proxy_class_name);
-      }
-      if (!dispose_methodmodifiers) {
-	Swig_error(Getfile(n), Getline(n),
-	  "No methodmodifiers attribute defined in ddispose%s typemap for %s.\n",
-	  (derived ? "_derived" : ""), proxy_class_name);
-      }
-    }
-
-    if (tm) {
-      // Write the destructor if the C++ one is accessible.
-      if (*Char(destructor_call)) {
-	Printv(body,
-	  lookupCodeTypemap(n, "ddestructor", typemap_lookup_type, WARN_NONE), NIL);
-      }
-
-      // Write the dispose() method.
-      String *dispose_code = NewString("");
-      Printv(dispose_code, tm, NIL);
-
-      if (*Char(destructor_call)) {
-	Replaceall(dispose_code, "$imcall", destructor_call);
-      } else {
-	Replaceall(dispose_code, "$imcall", "throw new object.Exception(\"C++ destructor does not have public access\")");
-      }
-
-      if (*Char(dispose_code)) {
-	Printv(body, "\n", dispose_methodmodifiers,
-	  (derived ? " override" : ""), " void ", dispose_methodname, "() ",
-	  dispose_code, "\n", NIL);
-      }
-    }
-
-    if (Swig_directorclass(n)) {
-      // If directors are enabled for the current class, generate the
-      // director connect helper function which is called from the constructor
-      // and write it to the class body.
-      writeDirectorConnectProxy(n);
-    }
-
-    // Write all constants and enumerations first to prevent forward reference
-    // errors.
-    Printv(body, proxy_class_enums_code, NIL);
-
-    // Write the code generated in other methods to the class body.
-    Printv(body, proxy_class_body_code, NIL);
-
-    // Append extra user D code to the class body.
-    Printv(body,
-      lookupCodeTypemap(n, "dcode", typemap_lookup_type, WARN_NONE), "\n", NIL);
-
-    // Write the class body and the curly bracket closing the class definition
-    // to the proxy module.
-    indentCode(body);
-    Replaceall(body, "$dbaseclass", basename);
-    Delete(basename);
-
-    Printv(proxy_class_code, body, "\n}\n", NIL);
-    Delete(body);
-
-    // Write the epilogue code if there is any.
-    Printv(proxy_class_code, proxy_class_epilogue_code, NIL);
-  }
-
-
-  /* ---------------------------------------------------------------------------
-   * D::writeClassUpcast()
-   * --------------------------------------------------------------------------- */
-  void writeClassUpcast(Node *n, const String* d_class_name, String* c_class_name, String* c_base_name) {
-
-    SwigType *smart = Swig_cparse_smartptr(n);
-    String *upcast_name = Swig_name_member(getNSpace(), d_class_name, (smart != 0 ? "SmartPtrUpcast" : "Upcast"));
-    String *upcast_wrapper_name = Swig_name_wrapper(upcast_name);
-
-    writeImDModuleFunction(upcast_name, "void*", "(void* objectRef)",
-      upcast_wrapper_name);
-
-    if (smart) {
-      SwigType *bsmart = Copy(smart);
-      SwigType *rclassname = SwigType_typedef_resolve_all(c_class_name);
-      SwigType *rbaseclass = SwigType_typedef_resolve_all(c_base_name);
-      Replaceall(bsmart, rclassname, rbaseclass);
-      Delete(rclassname);
-      Delete(rbaseclass);
-      String *smartnamestr = SwigType_namestr(smart);
-      String *bsmartnamestr = SwigType_namestr(bsmart);
-      Printv(upcasts_code,
-	"SWIGEXPORT ", bsmartnamestr, " * ", upcast_wrapper_name,
-	  "(", smartnamestr, " *objectRef) {\n",
-	"    return objectRef ? new ", bsmartnamestr, "(*objectRef) : 0;\n"
-	"}\n",
-	"\n", NIL);
-      Delete(bsmartnamestr);
-      Delete(smartnamestr);
-      Delete(bsmart);
-    } else {
-      Printv(upcasts_code,
-	"SWIGEXPORT ", c_base_name, " * ", upcast_wrapper_name,
-	  "(", c_base_name, " *objectRef) {\n",
-	"    return (", c_base_name, " *)objectRef;\n"
-	"}\n",
-	"\n", NIL);
-    }
-
-    Replaceall(upcasts_code, "$cclass", c_class_name);
-    Replaceall(upcasts_code, "$cbaseclass", c_base_name);
-
-    Delete(upcast_name);
-    Delete(upcast_wrapper_name);
-    Delete(smart);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::writeTypeWrapperClass()
-   * --------------------------------------------------------------------------- */
-  void writeTypeWrapperClass(String *classname, SwigType *type) {
-    Node *n = NewHash();
-    Setfile(n, input_file);
-    Setline(n, line_number);
-
-    assertClassNameValidity(classname);
-
-    String* imports_target;
-    String* code_target;
-    File *class_file = NULL;
-    if (split_proxy_dmodule) {
-      String *filename = NewStringf("%s%s.d", dmodule_directory, classname);
-      class_file = NewFile(filename, "w", SWIG_output_files());
-      if (!class_file) {
-	FileErrorDisplay(filename);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filename));
-      Delete(filename);
-
-      emitBanner(class_file);
-      Printf(class_file, "module %s%s;\n", package, classname);
-      Printf(class_file, "\nstatic import %s;\n", im_dmodule_fq_name);
-
-      imports_target = NewString("");
-      code_target = NewString("");
-    } else {
-      imports_target = proxyImportsBuffer(0);
-      code_target = proxyCodeBuffer(0);
-    }
-
-    // Import statements.
-    const String *imports = lookupCodeTypemap(n, "dimports", type, WARN_NONE);
-    if (Len(imports) > 0) {
-      String *imports_trimmed = Copy(imports);
-      Chop(imports_trimmed);
-      replaceImportTypeMacros(imports_trimmed);
-      Printv(imports_target, imports_trimmed, "\n", NIL);
-      Delete(imports_trimmed);
-    }
-
-    // Pure D baseclass and interfaces (no C++ inheritance possible.
-    const String *pure_baseclass = lookupCodeTypemap(n, "dbase", type, WARN_NONE);
-    const String *pure_interfaces = lookupCodeTypemap(n, "dinterfaces", type, WARN_NONE);
-
-    // Emit the class.
-    Printv(code_target,
-      "\n",
-      lookupCodeTypemap(n, "dclassmodifiers", type, WARN_D_TYPEMAP_CLASSMOD_UNDEF),
-      " $dclassname",
-      (*Char(pure_baseclass) || *Char(pure_interfaces)) ? " : " : "", pure_baseclass,
-      ((*Char(pure_baseclass)) && *Char(pure_interfaces)) ? ", " : "", pure_interfaces,
-      " {", NIL);
-
-    String* body = NewString("");
-    Printv(body, lookupCodeTypemap(n, "dbody", type, WARN_D_TYPEMAP_DBODY_UNDEF),
-      lookupCodeTypemap(n, "dcode", type, WARN_NONE), NIL);
-    indentCode(body);
-    Printv(code_target, body, "\n}\n", NIL);
-    Delete(body);
-
-    Replaceall(code_target, "$dclassname", classname);
-
-    if (split_proxy_dmodule) {
-      Printv(class_file, imports_target, NIL);
-      Delete(imports_target);
-
-      replaceModuleVariables(code_target);
-      Printv(class_file, code_target, NIL);
-      Delete(code_target);
-
-      Delete(class_file);
-    }
-
-    Delete(n);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::writeDirectorConnectProxy(Node *classNode)
-   *
-   * Writes the helper method which registers the director callbacks by calling
-   * the director connect function from the D side to the proxy class.
-   * --------------------------------------------------------------------------- */
-  void writeDirectorConnectProxy(Node* classNode) {
-    String *dirClassName = directorClassName(classNode);
-    String *connect_name = Swig_name_member(getNSpace(),
-      proxy_class_name, "director_connect");
-    Printf(proxy_class_body_code, "\nprivate void swigDirectorConnect() {\n");
-
-    int i;
-    for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *method = Getattr(udata, "method");
-      String *overloaded_name = Getattr(udata, "overname");
-      String *return_type = Getattr(udata, "return_type");
-      String *param_list = Getattr(udata, "param_list");
-      String *methid = Getattr(udata, "class_methodidx");
-      Printf(proxy_class_body_code, "  %s.%s_Callback%s callback%s;\n", im_dmodule_fq_name, dirClassName, methid, methid);
-      Printf(proxy_class_body_code, "  if (swigIsMethodOverridden!(%s delegate(%s), %s function(%s), %s)()) {\n", return_type, param_list, return_type, param_list, method);
-      Printf(proxy_class_body_code, "    callback%s = &swigDirectorCallback_%s_%s;\n", methid, proxy_class_name, overloaded_name);
-      Printf(proxy_class_body_code, "  }\n\n");
-    }
-    Printf(proxy_class_body_code, "  %s.%s(cast(void*)swigCPtr, cast(void*)this", im_dmodule_fq_name, connect_name);
-    for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *methid = Getattr(udata, "class_methodidx");
-      Printf(proxy_class_body_code, ", callback%s", methid);
-    }
-    Printf(proxy_class_body_code, ");\n");
-    Printf(proxy_class_body_code, "}\n");
-
-    // Helper function to determine if a method has been overridden in a
-    // subclass of the wrapped class. If not, we just pass null to the
-    // director_connect_function since the method from the C++ class should
-    // be called as usual (see above).
-    // Only emit it if the proxy class has at least one method.
-    if (first_class_dmethod < curr_class_dmethod) {
-      Printf(proxy_class_body_code, "\n");
-      Printf(proxy_class_body_code, "private bool swigIsMethodOverridden(DelegateType, FunctionType, alias fn)() %s{\n", (d_version > 1) ? "const " : "");
-      Printf(proxy_class_body_code, "  DelegateType dg = &fn;\n");
-      Printf(proxy_class_body_code, "  return dg.funcptr != SwigNonVirtualAddressOf!(FunctionType, fn);\n");
-      Printf(proxy_class_body_code, "}\n");
-      Printf(proxy_class_body_code, "\n");
-      Printf(proxy_class_body_code, "private static Function SwigNonVirtualAddressOf(Function, alias fn)() {\n");
-      Printf(proxy_class_body_code, "  return cast(Function) &fn;\n");
-      Printf(proxy_class_body_code, "}\n");
-    }
-
-    if (Len(director_dcallbacks_code) > 0) {
-      Printv(proxy_class_epilogue_code, director_dcallbacks_code, NIL);
-    }
-
-    Delete(director_callback_typedefs);
-    director_callback_typedefs = NULL;
-    Delete(director_callback_pointers);
-    director_callback_pointers = NULL;
-    Delete(director_dcallbacks_code);
-    director_dcallbacks_code = NULL;
-    Delete(dirClassName);
-    Delete(connect_name);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::writeDirectorConnectWrapper()
-   *
-   * Writes the director connect function and the corresponding declaration to
-   * the C++ wrapper respectively the D wrapper.
-   * --------------------------------------------------------------------------- */
-  void writeDirectorConnectWrapper(Node *n) {
-    if (!Swig_directorclass(n))
-      return;
-
-    // Output the director connect method.
-    String *norm_name = SwigType_namestr(Getattr(n, "name"));
-    String *connect_name = Swig_name_member(getNSpace(),
-      proxy_class_name, "director_connect");
-    String *dirClassName = directorClassName(n);
-    Wrapper *code_wrap;
-
-    Printv(wrapper_loader_bind_code, wrapper_loader_bind_command, NIL);
-    Replaceall(wrapper_loader_bind_code, "$function", connect_name);
-    Replaceall(wrapper_loader_bind_code, "$symbol", Swig_name_wrapper(connect_name));
-
-    Printf(im_dmodule_code, "extern(C) void function(void* cObject, void* dObject");
-
-    code_wrap = NewWrapper();
-    Printf(code_wrap->def, "SWIGEXPORT void D_%s(void *objarg, void *dobj", connect_name);
-
-    Printf(code_wrap->code, "  %s *obj = (%s *)objarg;\n", norm_name, norm_name);
-    Printf(code_wrap->code, "  %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName);
-
-    Printf(code_wrap->code, "  if (director) {\n");
-    Printf(code_wrap->code, "    director->swig_connect_director(dobj");
-
-    for (int i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-      UpcallData *udata = Getitem(dmethods_seq, i);
-      String *methid = Getattr(udata, "class_methodidx");
-
-      Printf(code_wrap->def, ", %s::SWIG_Callback%s_t callback%s", dirClassName, methid, methid);
-      Printf(code_wrap->code, ", callback%s", methid);
-      Printf(im_dmodule_code, ", %s_Callback%s callback%s", dirClassName, methid, methid);
-    }
-
-    Printf(code_wrap->def, ") {\n");
-    Printf(code_wrap->code, ");\n");
-    Printf(im_dmodule_code, ") %s;\n", connect_name);
-    Printf(code_wrap->code, "  }\n");
-    Printf(code_wrap->code, "}\n");
-
-    Wrapper_print(code_wrap, f_wrappers);
-    DelWrapper(code_wrap);
-
-    Delete(connect_name);
-    Delete(dirClassName);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::requireDType()
-   *
-   * If the given type is not already in scope in the current module, adds an
-   * import statement for it. The name is considered relative to the global root
-   * package if one is set.
-   *
-   * This is only used for dependencies created in generated code, user-
-   * (i.e. typemap-) specified import statements are handled separately.
-   * --------------------------------------------------------------------------- */
-  void requireDType(const String *nspace, const String *symname) {
-    String *dmodule = createModuleName(nspace, symname);
-
-    if (!inProxyModule(dmodule)) {
-      String *import = createImportStatement(dmodule);
-      Append(import, "\n");
-      if (is_wrapping_class()) {
-	addImportStatement(proxy_class_imports, import);
-      } else {
-	addImportStatement(proxyImportsBuffer(getNSpace()), import);
-      }
-      Delete(import);
-    }
-    Delete(dmodule);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::addImportStatement()
-   *
-   * Adds the given import statement to the given list of import statements if
-   * there is no statement importing that module present yet.
-   * --------------------------------------------------------------------------- */
-  void addImportStatement(String *target, const String *import) const {
-    char *position = Strstr(target, import);
-    if (position) {
-      // If the import statement has been found in the target string, we have to
-      // check if the previous import was static, which would lead to problems
-      // if this import is not.
-      // Thus, we check if the seven characters in front of the occurrence are
-      // »static «. If the import string passed is also static, the checks fail
-      // even if the found statement is also static because the last seven
-      // characters would be part of the previous import statement then.
-
-      if (position - Char(target) < 7) {
-	return;
-      }
-      if (strncmp(position - 7, "static ", 7)) {
-	return;
-      }
-    }
-
-    Printv(target, import, NIL);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::createImportStatement()
-   *
-   * Creates a string containing an import statement for the given module.
-   * --------------------------------------------------------------------------- */
-  String *createImportStatement(const String *dmodule_name,
-    bool static_import = true) const {
-
-    if (static_import) {
-      return NewStringf("static import %s%s;", package, dmodule_name);
-    } else {
-      return NewStringf("import %s%s;", package, dmodule_name);
-    }
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::inProxyModule()
-   *
-   * Determines if the specified proxy type is declared in the currently
-   * processed proxy D module.
-   *
-   * This function is used to determine if fully qualified type names have to
-   * be used (package, module and type name). If the split proxy mode is not
-   * used, this solely depends on whether the type is in the current namespace.
-   * --------------------------------------------------------------------------- */
-  bool inProxyModule(const String *type_name) const {
-    if (!split_proxy_dmodule) {
-      String *nspace = createOuterNamespaceNames(type_name);
-
-      // Check if strings are either both null (no namespace) or are both
-      // non-null and have the same contents. Cannot use Strcmp for this
-      // directly because of its strange way of handling the case where only
-      // one argument is 0 ("<").
-      bool result = !nspace && !getNSpace();
-      if (nspace && getNSpace())
-	result = (Strcmp(nspace, getNSpace()) == 0);
-
-      Delete(nspace);
-      return result;
-    }
-
-    if (!is_wrapping_class()) {
-      return false;
-    }
-
-    return (Strcmp(proxy_class_qname, type_name) == 0);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::addUpcallMethod()
-   *
-   * Adds new director upcall signature.
-   * --------------------------------------------------------------------------- */
-  UpcallData *addUpcallMethod(String *imclass_method, String *class_method,
-    String *decl, String *overloaded_name, String *return_type, String *param_list) {
-
-    String *key = NewStringf("%s|%s", imclass_method, decl);
-
-    ++curr_class_dmethod;
-
-    String *class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod);
-    n_dmethods++;
-
-    Hash *new_udata = NewHash();
-    Append(dmethods_seq, new_udata);
-    Setattr(dmethods_table, key, new_udata);
-
-    Setattr(new_udata, "method", Copy(class_method));
-    Setattr(new_udata, "class_methodidx", class_methodidx);
-    Setattr(new_udata, "decl", Copy(decl));
-    Setattr(new_udata, "overname", Copy(overloaded_name));
-    Setattr(new_udata, "return_type", Copy(return_type));
-    Setattr(new_udata, "param_list", Copy(param_list));
-
-    Delete(key);
-    return new_udata;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::assertClassNameValidity()
-   * --------------------------------------------------------------------------- */
-  void assertClassNameValidity(const String* class_name) const {
-    // TODO: With nspace support, there could arise problems also when not in
-    // split proxy mode, warnings for these should be added.
-    if (split_proxy_dmodule) {
-      if (Cmp(class_name, im_dmodule_name) == 0) {
-	Swig_error(input_file, line_number,
-	  "Class name cannot be equal to intermediary D module name: %s\n",
-	  class_name);
-	SWIG_exit(EXIT_FAILURE);
-      }
-
-      String *nspace = getNSpace();
-      if (nspace) {
-	// Check the root package/outermost namespace (a class A in module
-	// A.B leads to problems if another module A.C is also imported)
-	if (Len(package) > 0) {
-	  String *dotless_package = NewStringWithSize(package, Len(package) - 1);
-	  if (Cmp(class_name, dotless_package) == 0) {
-	    Swig_error(input_file, line_number,
-	      "Class name cannot be the same as the root package it is in: %s\n",
-	      class_name);
-	    SWIG_exit(EXIT_FAILURE);
-	  }
-	  Delete(dotless_package);
-	} else {
-	  String *outer = createFirstNamespaceName(nspace);
-	  if (Cmp(class_name, outer) == 0) {
-	    Swig_error(input_file, line_number,
-	      "Class name cannot be the same as the outermost namespace it is in: %s\n",
-	      class_name);
-	    SWIG_exit(EXIT_FAILURE);
-	  }
-	  Delete(outer);
-	}
-
-	// … and the innermost one (because of the conflict with the main proxy
-	// module named like the namespace).
-	String *inner = createLastNamespaceName(nspace);
-	if (Cmp(class_name, inner) == 0) {
-	  Swig_error(input_file, line_number,
-	    "Class name cannot be the same as the innermost namespace it is in: %s\n",
-	    class_name);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Delete(inner);
-      } else {
-	if (Cmp(class_name, proxy_dmodule_name) == 0) {
-	  Swig_error(input_file, line_number,
-	    "Class name cannot be equal to proxy D module name: %s\n",
-	    class_name);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-      }
-    }
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::getPrimitiveDptype()
-   *
-   * Returns the D proxy type for the passed type if it is a primitive type in
-   * both C and D.
-   * --------------------------------------------------------------------------- */
-  String *getPrimitiveDptype(Node *node, SwigType *type) {
-    SwigType *stripped_type = SwigType_typedef_resolve_all(type);
-
-    // A reference can only be the »outermost element« of a type.
-    bool mutable_ref = false;
-    if (SwigType_isreference(stripped_type)) {
-      SwigType_del_reference(stripped_type);
-
-      if (SwigType_isconst(stripped_type)) {
-	SwigType_del_qualifier(stripped_type);
-      } else {
-	mutable_ref = true;
-      }
-    }
-
-    // Strip all the pointers from the type.
-    int indirection_count = 0;
-    while (SwigType_ispointer(stripped_type)) {
-      ++indirection_count;
-      SwigType_del_pointer(stripped_type);
-    }
-
-    // Now that we got rid of the pointers, see if we are dealing with a
-    // primitive type.
-    String *dtype = 0;
-    if (SwigType_isfunction(stripped_type) && indirection_count > 0) {
-      // type was a function pointer, split it up.
-      SwigType_add_pointer(stripped_type);
-      --indirection_count;
-
-      SwigType *return_type = Copy(stripped_type);
-      SwigType *params_type = SwigType_functionpointer_decompose(return_type);
-      String *return_dtype = getPrimitiveDptype(node, return_type);
-      Delete(return_type);
-      if (!return_dtype) {
-	return 0;
-      }
-
-      List *parms = SwigType_parmlist(params_type);
-      List *param_dtypes = NewList();
-      for (Iterator it = First(parms); it.item; it = Next(it)) {
-	String *current_dtype = getPrimitiveDptype(node, it.item);
-	if (Cmp(current_dtype, "void") == 0) {
-	  // void somefunc(void) is legal syntax in C, but not in D, so simply
-	  // skip the void parameter.
-	  Delete(current_dtype);
-	  continue;
-	}
-	if (!current_dtype) {
-	  Delete(return_dtype);
-	  Delete(param_dtypes);
-	  return 0;
-	}
-	Append(param_dtypes, current_dtype);
-      }
-
-      String *param_list = NewString("");
-      {
-	bool gen_comma = false;
-	for (Iterator it = First(param_dtypes); it.item; it = Next(it)) {
-	  if (gen_comma) {
-	    Append(param_list, ", ");
-	  }
-	  Append(param_list, it.item);
-	  Delete(it.item);
-	  gen_comma = true;
-	}
-      }
-
-      dtype = NewStringf("%s.SwigExternC!(%s function(%s))", im_dmodule_fq_name,
-        return_dtype, param_list);
-      Delete(param_list);
-      Delete(param_dtypes);
-      Delete(return_dtype);
-    } else {
-      Hash *attributes = NewHash();
-      const String *tm =
-	lookupCodeTypemap(node, "dtype", stripped_type, WARN_NONE, attributes);
-      if(!GetFlag(attributes, "tmap:dtype:cprimitive")) {
-	dtype = 0;
-      } else {
-	dtype = Copy(tm);
-
-	// We need to call replaceClassname here with the stripped type to avoid
-	// $dclassname in the enum typemaps being replaced later with the full
-	// type.
-	replaceClassname(dtype, stripped_type);
-      }
-      Delete(attributes);
-    }
-    Delete(stripped_type);
-
-    if (!dtype) {
-      // The type passed is no primitive type.
-      return 0;
-    }
-
-    // The type is ultimately a primitive type, now append the right number of
-    // indirection levels (pointers).
-    for (int i = 0; i < indirection_count; ++i) {
-      Append(dtype, "*");
-    }
-
-    // Add a level of indirection for a mutable reference since it is wrapped
-    // as a pointer.
-    if (mutable_ref) {
-      Append(dtype, "*");
-    }
-
-    return dtype;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::lookupCodeTypemap()
-   *
-   * Looks up a D code fragment for generating the wrapper class for the given
-   * type.
-   *
-   * n - for input only and must contain info for Getfile(n) and Getline(n) to work
-   * tmap_method - typemap method name
-   * type - typemap type to lookup
-   * warning - warning number to issue if no typemaps found
-   * typemap_attributes - the typemap attributes are attached to this node and will
-   *   also be used for temporary storage if non null
-   * return is never NULL, unlike Swig_typemap_lookup()
-   * --------------------------------------------------------------------------- */
-  const String *lookupCodeTypemap(Node *n, const_String_or_char_ptr tmap_method,
-    SwigType *type, int warning, Node *typemap_attributes = 0) const {
-
-    Node *node = !typemap_attributes ? NewHash() : typemap_attributes;
-    Setattr(node, "type", type);
-    Setfile(node, Getfile(n));
-    Setline(node, Getline(n));
-    const String *tm = Swig_typemap_lookup(tmap_method, node, "", 0);
-    if (!tm) {
-      tm = empty_string;
-      if (warning != WARN_NONE) {
-	Swig_warning(warning, Getfile(n), Getline(n),
-	  "No %s typemap defined for %s\n", tmap_method, SwigType_str(type, 0));
-      }
-    }
-    if (!typemap_attributes) {
-      Delete(node);
-    }
-
-    return tm;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::lookupDTypemap()
-   *
-   * Looks up a D typemap for the given node, replacing D-specific special
-   * variables as needed.
-   *
-   * The method parameter specifies the typemap method to use. If attached is
-   * true, the value is just fetched from the tmap:<method> node attribute,
-   * Swig_typemap_lookup is used otherwise.
-   * --------------------------------------------------------------------------- */
-  String *lookupDTypemap(Node *n, const_String_or_char_ptr method, bool attached = false) {
-    String *result = 0;
-
-    if (attached) {
-      String *attr_name = NewStringf("tmap:%s", method);
-      result = Copy(Getattr(n, attr_name));
-      Delete(attr_name);
-    } else {
-      // FIXME: As a workaround for a bug so far only surfacing in the
-      // smart_pointer_const_overload test case, remove the nativepointer
-      // typemap attribute since it seems to be already there from a dout
-      // typemap of a different type in that test.
-      String *np_key = NewStringf("tmap:%s:nativepointer", method);
-      Delattr(n, np_key);
-      Delete(np_key);
-
-      result = Swig_typemap_lookup(method, n, "", 0);
-    }
-
-    if (!result) {
-      return 0;
-    }
-
-    // Check if the passed node actually has type information attached. This
-    // is not the case e.g. in constructorWrapper.
-    SwigType *type = Getattr(n, "type");
-    if (type) {
-      String *np_key = NewStringf("tmap:%s:nativepointer", method);
-      String *np_value = Getattr(n, np_key);
-      Delete(np_key);
-      String *dtype;
-      if (np_value && (dtype = getPrimitiveDptype(n, type))) {
-        // If the typemap in question has a »nativepointer« attribute and we
-        // are dealing with a primitive type, use it instead.
-        result = Copy(np_value);
-        Replaceall(result, "$dtype", dtype);
-      }
-
-      replaceClassname(result, type);
-    }
-
-    return result;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::replaceClassname()
-   *
-   * Replaces the special variable $dclassname with the proxy class name for
-   * classes/structs/unions SWIG knows about. Also substitutes the enumeration
-   * name for non-anonymous enums. Otherwise, $classname is replaced with a
-   * $descriptor(type)-like name.
-   *
-   * $*dclassname and $&classname work like with descriptors (see manual section
-   * 10.4.3), they remove a prointer from respectively add a pointer to the type.
-   *
-   * Inputs:
-   *   tm - String to perform the substitution at (will usually come from a
-   *        typemap.
-   *   pt - The type to substitute for the variables.
-   * Outputs:
-   *   tm - String with the variables substituted.
-   * Return:
-   *   substitution_performed - flag indicating if a substitution was performed
-   * --------------------------------------------------------------------------- */
-  bool replaceClassname(String *tm, SwigType *pt) {
-    bool substitution_performed = false;
-    SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
-    SwigType *strippedtype = SwigType_strip_qualifiers(type);
-
-    if (Strstr(tm, "$dclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      replaceClassnameVariable(tm, "$dclassname", classnametype);
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$*dclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      Delete(SwigType_pop(classnametype));
-      replaceClassnameVariable(tm, "$*dclassname", classnametype);
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$&dclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      SwigType_add_pointer(classnametype);
-      replaceClassnameVariable(tm, "$&dclassname", classnametype);
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-
-    Delete(strippedtype);
-    Delete(type);
-
-    return substitution_performed;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::replaceClassnameVariable()
-   *
-   * See D::replaceClassname().
-   * --------------------------------------------------------------------------- */
-  void replaceClassnameVariable(String *target, const char *variable, SwigType *type) {
-    // TODO: Fix const-correctness of methods called in here and make type const.
-
-    // We make use of the fact that this function is called at least once for
-    // every type encountered which is written to a separate file, which allows
-    // us to handle imports here.
-    // When working in split proxy module mode, each generated proxy class/enum
-    // is written to a separate module. This requires us to add a corresponding
-    // import when a type is used in another generated module. If we are not
-    // working in split proxy module mode, this is not relevant and the
-    // generated module name is discarded.
-    String *type_name;
-
-    if (SwigType_isenum(type)) {
-      // RESEARCH: Make sure that we really cannot get here for anonymous enums.
-      Node *n = enumLookup(type);
-      if (n) {
-	String *enum_name = Getattr(n, "sym:name");
-
-	Node *p = parentNode(n);
-	if (p && !Strcmp(nodeType(p), "class")) {
-	  // This is a nested enum.
-	  String *parent_name = Getattr(p, "sym:name");
-	  String *nspace = Getattr(p, "sym:nspace");
-
-	  // An enum nested in a class is not written to a separate module (this
-	  // would not even be possible in D), so just import the parent.
-	  requireDType(nspace, parent_name);
-
-	  String *module = createModuleName(nspace, parent_name);
-	  if (inProxyModule(module)) {
-	    type_name = NewStringf("%s.%s", parent_name, enum_name);
-	  } else {
-	    type_name = NewStringf("%s%s.%s.%s", package, module, parent_name, enum_name);
-	  }
-	} else {
-	  // A non-nested enum is written to a separate module, import it.
-	  String *nspace = Getattr(n, "sym:nspace");
-	  requireDType(nspace, enum_name);
-
-	  String *module = createModuleName(nspace, enum_name);
-	  if (inProxyModule(module)) {
-	    type_name = Copy(enum_name);
-	  } else {
-	    type_name = NewStringf("%s%s.%s", package, module, enum_name);
-	  }
-	}
-      } else {
-	type_name = NewStringf("int");
-      }
-    } else {
-      Node *n = classLookup(type);
-      if (n) {
-	String *class_name = Getattr(n, "sym:name");
-	String *nspace = Getattr(n, "sym:nspace");
-	requireDType(nspace, class_name);
-
-	String *module = createModuleName(nspace, class_name);
-	if (inProxyModule(module)) {
-	  type_name = Copy(class_name);
-	} else {
-	  type_name = NewStringf("%s%s.%s", package, module, class_name);
-	}
-        Delete(module);
-      } else {
-	// SWIG does not know anything about the type (after resolving typedefs).
-	// Just mangle the type name string like $descriptor(type) would do.
-	String *descriptor = NewStringf("SWIGTYPE%s", SwigType_manglestr(type));
-	requireDType(NULL, descriptor);
-
-	String *module = createModuleName(NULL, descriptor);
-	if (inProxyModule(module)) {
-	  type_name = Copy(descriptor);
-	} else {
-	  type_name = NewStringf("%s%s.%s", package, module, descriptor);
-	}
-	Delete(module);
-
-	// Add to hash table so that a type wrapper class can be created later.
-	Setattr(unknown_types, descriptor, type);
-
-	Delete(descriptor);
-      }
-    }
-
-    Replaceall(target, variable, type_name);
-    Delete(type_name);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::createModuleName()
-   *
-   * Returns a string holding the name of the module to import to bring the
-   * given type in scope.
-   * --------------------------------------------------------------------------- */
-  String *createModuleName(const String *nspace, const String *type_name) const {
-    String *module;
-    if (nspace) {
-      module = NewStringf("%s.", nspace);
-      if (split_proxy_dmodule) {
-	Printv(module, type_name, NIL);
-      } else {
-	String *inner = createLastNamespaceName(nspace);
-	Printv(module, inner, NIL);
-	Delete(inner);
-      }
-    } else {
-      if (split_proxy_dmodule) {
-	module = Copy(type_name);
-      } else {
-	module = Copy(proxy_dmodule_name);
-      }
-    }
-    return module;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::replaceModuleVariables()
-   *
-   * Replaces the $imdmodule and $module variables with their values in the
-   * target string.
-   * --------------------------------------------------------------------------- */
-  void replaceModuleVariables(String *target) const {
-    Replaceall(target, "$imdmodule", im_dmodule_fq_name);
-    Replaceall(target, "$module", proxy_dmodule_name);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::replaceExcode()
-   *
-   * If a C++ method can throw a exception, additional code is added to the
-   * proxy method to check if an exception is pending so that it can be
-   * rethrown on the D side.
-   *
-   * This method replaces the $excode variable with the exception handling code
-   * in the excode typemap attribute if it »canthrow« an exception.
-   * --------------------------------------------------------------------------- */
-  void replaceExcode(Node *n, String *code, const String *typemap, Node *parameter) const {
-    String *excode_attribute = NewStringf("tmap:%s:excode", typemap);
-    String *excode = Getattr(parameter, excode_attribute);
-    if (Getattr(n, "d:canthrow")) {
-      int count = Replaceall(code, "$excode", excode);
-      if (count < 1 || !excode) {
-	Swig_warning(WARN_D_EXCODE_MISSING, input_file, line_number,
-	  "D exception may not be thrown – no $excode or excode attribute in '%s' typemap.\n",
-	  typemap);
-      }
-    } else {
-      Replaceall(code, "$excode", "");
-    }
-    Delete(excode_attribute);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::replaceImportTypeMacros()
-   *
-   * Replaces the $importtype(SomeDClass) macro with an import statement if it
-   * is required to get SomeDClass in scope for the currently generated proxy
-   * D module.
-   * --------------------------------------------------------------------------- */
-  void replaceImportTypeMacros(String *target) const {
-    // Code from replace_embedded_typemap.
-    char *start = 0;
-    while ((start = Strstr(target, "$importtype("))) {
-      char *end = 0;
-      char *param_start = 0;
-      char *param_end = 0;
-      int level = 0;
-      char *c = start;
-      while (*c) {
-	if (*c == '(') {
-	  if (level == 0) {
-	    param_start = c + 1;
-	  }
-	  level++;
-	}
-	if (*c == ')') {
-	  level--;
-	  if (level == 0) {
-	    param_end = c;
-	    end = c + 1;
-	    break;
-	  }
-	}
-	c++;
-      }
-
-      if (end) {
-	String *current_macro = NewStringWithSize(start, (int)(end - start));
-	String *current_param = NewStringWithSize(param_start, (int)(param_end - param_start));
-
-
-	if (inProxyModule(current_param)) {
-	  Replace(target, current_macro, "", DOH_REPLACE_ANY);
-	} else {
-	  String *import = createImportStatement(current_param, false);
-	  Replace(target, current_macro, import, DOH_REPLACE_ANY);
-	  Delete(import);
-	}
-
-	Delete(current_param);
-	Delete(current_macro);
-      } else {
-	String *current_macro = NewStringWithSize(start, (int)(c - start));
-	Swig_error(Getfile(target), Getline(target), "Syntax error in: %s\n", current_macro);
-	Replace(target, current_macro, "<error in $importtype macro>", DOH_REPLACE_ANY);
-	Delete(current_macro);
-      }
-    }
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::getOverloadedName()
-   * --------------------------------------------------------------------------- */
-  String *getOverloadedName(Node *n) const {
-    // A void* parameter is used for all wrapped classes in the wrapper code.
-    // Thus, the wrapper function names for overloaded functions are postfixed
-    // with a counter string to make them unique.
-    String *overloaded_name = Copy(Getattr(n, "sym:name"));
-
-    if (Getattr(n, "sym:overloaded")) {
-      Append(overloaded_name, Getattr(n, "sym:overname"));
-    }
-
-    return overloaded_name;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::createProxyName()
-   *
-   * Returns the D class name if a type corresponds to something wrapped with a
-   * proxy class, NULL otherwise.
-   * --------------------------------------------------------------------------- */
-  String *createProxyName(SwigType *t) {
-    String *proxyname = NULL;
-    Node *n = classLookup(t);
-    if (n) {
-      String *nspace = Getattr(n, "sym:nspace");
-      String *symname = Getattr(n, "sym:name");
-
-      String *module = createModuleName(nspace, symname);
-      if (inProxyModule(module)) {
-	proxyname = Copy(symname);
-      } else {
-	proxyname = NewStringf("%s%s.%s", package, module, symname);
-      }
-    }
-    return proxyname;
-  }
-
-  String *makeParameterName(Node *n, Parm *p, int arg_num, bool setter) const {
-    String *arg = Language::makeParameterName(n, p, arg_num, setter);
-
-    if (split_proxy_dmodule && Strncmp(arg, package, Len(arg)) == 0) {
-      // If we are in split proxy mode and the argument is named like the target
-      // package, we append an underscore to its name to avoid clashes.
-      Append(arg, "_");
-    }
-
-    return arg;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::canThrow()
-   *
-   * Determines whether the code in the typemap can throw a D exception.
-   * If so, note it for later when excodeSubstitute() is called.
-   * --------------------------------------------------------------------------- */
-  void canThrow(Node *n, const String *typemap, Node *parameter) const {
-    String *canthrow_attribute = NewStringf("tmap:%s:canthrow", typemap);
-    String *canthrow = Getattr(parameter, canthrow_attribute);
-    if (canthrow)
-      Setattr(n, "d:canthrow", "1");
-    Delete(canthrow_attribute);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::wrapMemberFunctionAsDConst()
-   *
-   * Determines whether the member function represented by the passed node is
-   * wrapped as D »const« or not.
-   * --------------------------------------------------------------------------- */
-  bool wrapMemberFunctionAsDConst(Node *n) const {
-    if (d_version == 1) return false;
-    if (static_flag) return false; // Never emit »const« for static member functions.
-    return GetFlag(n, "memberget") || SwigType_isconst(Getattr(n, "decl"));
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::areAllOverloadsOverridden()
-   *
-   * Determines whether the class the passed function node belongs to overrides
-   * all the overlaods for the passed function node defined somewhere up the
-   * inheritance hierachy.
-   * --------------------------------------------------------------------------- */
-  bool areAllOverloadsOverridden(Node *n) const {
-    List *base_list = Getattr(parentNode(n), "bases");
-    if (!base_list) {
-      // If the class which contains n is not derived from any other class,
-      // there cannot be any not-overridden overloads.
-      return true;
-    }
-
-    // In case of multiple base classes, skip to the one which has not been
-    // ignored.
-    // RESEARCH: Also emit a warning in case of multiple inheritance here?
-    Iterator it = First(base_list);
-    while (it.item && GetFlag(it.item, "feature:ignore")) {
-      it = Next(it);
-    }
-    Node *base_class = it.item;
-
-    if (!base_class) {
-      // If all base classes have been ignored, there cannot be one either.
-      return true;
-    }
-
-    // We try to find at least a single overload which exists in the base class
-    // so we can progress up the inheritance hierachy even if there have been
-    // new overloads introduced after the topmost class.
-    Node *base_function = NULL;
-    String *symname = Getattr(n, "sym:name");
-    if (symname) {
-      for (Node *tmp = firstChild(base_class); tmp; tmp = nextSibling(tmp)) {
-	String *child_symname = Getattr(tmp, "sym:name");
-	if (child_symname && (Strcmp(child_symname, symname) == 0)) {
-	  base_function = tmp;
-	  break;
-	}
-      }
-    }
-
-    if (!base_function) {
-      // If there is no overload which also exists in the super class, there
-      // cannot be any base class overloads not overridden.
-      return true;
-    }
-
-    size_t base_overload_count = 0;
-    for (Node *tmp = firstSibling(base_function); tmp; tmp = Getattr(tmp, "sym:nextSibling")) {
-      if (is_protected(base_function) &&
-	  !(Swig_director_mode() && Swig_director_protected_mode() && Swig_all_protected_mode())) {
-	// If the base class function is »protected« and were are not in
-	// director mode, it is not emitted to the base class and thus we do
-	// not count it. Otherwise, we would run into issues if the visiblity
-	// of some functions was changed from protected to public in a child
-	// class with the using directive.
-	continue;
-      }
-      ++base_overload_count;
-    }
-
-    return ((base_overload_count <= overridingOverloadCount(n)) &&
-      areAllOverloadsOverridden(base_function));
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::overridingOverloadCount()
-   *
-   * Given a member function node, this function counts how many of the
-   * overloads of the function (including itself) override a function in the
-   * base class.
-   * --------------------------------------------------------------------------- */
-  size_t overridingOverloadCount(Node *n) const {
-    size_t result = 0;
-
-    Node *tmp = firstSibling(n);
-    do {
-      // KLUDGE: We also have to count the function if the access attribute is
-      // not present, since this means that it has been promoted into another
-      // protection level in the base class with the C++ »using« directive, and
-      // is thus taken into account when counting the base class overloads, even
-      // if it is not marked as »override« by the SWIG parser.
-      if (Getattr(n, "override") || !Getattr(n, "access")) {
-	++result;
-      }
-    } while((tmp = Getattr(tmp, "sym:nextSibling")));
-
-    return result;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::firstSibling()
-   *
-   * Returns the first sibling of the passed node.
-   * --------------------------------------------------------------------------- */
-  Node *firstSibling(Node *n) const {
-    Node *result = n;
-    while (Node *tmp = Getattr(result, "sym:previousSibling")) {
-      result = tmp;
-    }
-    return result;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::indentCode()
-   *
-   * Helper function to indent a code (string) by one level.
-   * --------------------------------------------------------------------------- */
-  void indentCode(String* code) const {
-    Replaceall(code, "\n", "\n  ");
-    Replaceall(code, "  \n", "\n");
-    Chop(code);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::emitBanner()
-   * --------------------------------------------------------------------------- */
-  void emitBanner(File *f) const {
-    Printf(f, "/* ----------------------------------------------------------------------------\n");
-    Swig_banner_target_lang(f, " *");
-    Printf(f, " * ----------------------------------------------------------------------------- */\n\n");
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::outputDirectory()
-   *
-   * Returns the directory to write the D modules for the given namespace to and
-   * and creates the subdirectory if it doesn't exist.
-   * --------------------------------------------------------------------------- */
-  String *outputDirectory(String *nspace) {
-    String *output_directory = Copy(dmodule_directory);
-    if (nspace) {
-      String *nspace_subdirectory = Copy(nspace);
-      Replaceall(nspace_subdirectory, ".", SWIG_FILE_DELIMITER);
-      String *newdir_error = Swig_new_subdirectory(output_directory, nspace_subdirectory);
-      if (newdir_error) {
-	Printf(stderr, "%s\n", newdir_error);
-	Delete(newdir_error);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Printv(output_directory, nspace_subdirectory, SWIG_FILE_DELIMITER, 0);
-      Delete(nspace_subdirectory);
-    }
-    return output_directory;
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::proxyCodeBuffer()
-   *
-   * Returns the buffer to write proxy code for the given namespace to.
-   * --------------------------------------------------------------------------- */
-  String *proxyCodeBuffer(String *nspace) {
-    if (!nspace) {
-      return proxy_dmodule_code;
-    }
-
-    Hash *hash = Getattr(nspace_proxy_dmodules, nspace);
-    if (!hash) {
-      hash = NewHash();
-      Setattr(hash, "code", NewString(""));
-      Setattr(hash, "imports", NewString(""));
-      Setattr(nspace_proxy_dmodules, nspace, hash);
-    }
-    return Getattr(hash, "code");
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::proxyCodeBuffer()
-   *
-   * Returns the buffer to write imports for the proxy code for the given
-   * namespace to.
-   * --------------------------------------------------------------------------- */
-  String *proxyImportsBuffer(String *nspace) {
-    if (!nspace) {
-      return proxy_dmodule_imports;
-    }
-
-    Hash *hash = Getattr(nspace_proxy_dmodules, nspace);
-    if (!hash) {
-      hash = NewHash();
-      Setattr(hash, "code", NewString(""));
-      Setattr(hash, "imports", NewString(""));
-      Setattr(nspace_proxy_dmodules, nspace, hash);
-    }
-    return Getattr(hash, "imports");
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::createFirstNamespaceName()
-   *
-   * Returns a new string containing the name of the outermost namespace, e.g.
-   * »A« for the argument »A.B.C«.
-   * --------------------------------------------------------------------------- */
-  String *createFirstNamespaceName(const String *nspace) const {
-    char *tmp = Char(nspace);
-    char *c = tmp;
-    char *co = 0;
-    if (!strstr(c, "."))
-      return 0;
-
-    co = c + Len(nspace);
-
-    while (*c && (c != co)) {
-      if (*c == '.') {
-	break;
-      }
-      c++;
-    }
-    if (!*c || (c == tmp)) {
-      return NULL;
-    }
-    return NewStringWithSize(tmp, (int)(c - tmp));
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::createLastNamespaceName()
-   *
-   * Returns a new string containing the name of the innermost namespace, e.g.
-   * »C« for the argument »A.B.C«.
-   * --------------------------------------------------------------------------- */
-  String *createLastNamespaceName(const String *nspace) const {
-    if (!nspace) return NULL;
-    char *c = Char(nspace);
-    char *cc = c;
-    if (!strstr(c, "."))
-      return NewString(nspace);
-
-    while (*c) {
-      if (*c == '.') {
-	cc = c;
-      }
-      ++c;
-    }
-    return NewString(cc + 1);
-  }
-
-  /* ---------------------------------------------------------------------------
-   * D::createOuterNamespaceNames()
-   *
-   * Returns a new string containing the name of the outer namespace, e.g.
-   * »A.B« for the argument »A.B.C«.
-   * --------------------------------------------------------------------------- */
-  String *createOuterNamespaceNames(const String *nspace) const {
-    if (!nspace) return NULL;
-    char *tmp = Char(nspace);
-    char *c = tmp;
-    char *cc = c;
-    if (!strstr(c, "."))
-      return NULL;
-
-    while (*c) {
-      if (*c == '.') {
-	cc = c;
-      }
-      ++c;
-    }
-    if (cc == tmp) {
-      return NULL;
-    }
-    return NewStringWithSize(tmp, (int)(cc - tmp));
-  }
-};
-
-static Language *new_swig_d() {
-  return new D();
-}
-
-/* -----------------------------------------------------------------------------
- * swig_d()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-extern "C" Language *swig_d(void) {
-  return new_swig_d();
-}
-
-/* -----------------------------------------------------------------------------
- * Usage information displayed at the command line.
- * ----------------------------------------------------------------------------- */
-const char *D::usage = "\
-D Options (available with -d)\n\
-     -d2                  - Generate code for D2/Phobos (default: D1/Tango)\n\
-     -package <pkg>       - Write generated D modules into package <pkg>\n\
-     -splitproxy          - Write each D type to a dedicated file instead of\n\
-                            generating a single proxy D module.\n\
-     -wrapperlibrary <wl> - Set the name of the wrapper library to <wl>\n\
-\n";
diff --git a/dependencies2013/win32/swig/Source/Modules/directors.cxx b/dependencies2013/win32/swig/Source/Modules/directors.cxx
deleted file mode 100644
index 2fdda5a1..00000000
--- a/dependencies2013/win32/swig/Source/Modules/directors.cxx
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * directors.cxx
- *
- * Director support functions.
- * Not all of these may be necessary, and some may duplicate existing functionality
- * in SWIG.  --MR
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-/* Swig_csuperclass_call()
- *
- * Generates a fully qualified method call, including the full parameter list.
- * e.g. "base::method(i, j)"
- *
- */
-
-String *Swig_csuperclass_call(String *base, String *method, ParmList *l) {
-  String *call = NewString("");
-  int arg_idx = 0;
-  Parm *p;
-  if (base) {
-    Printf(call, "%s::", base);
-  }
-  Printf(call, "%s(", method);
-  for (p = l; p; p = nextSibling(p)) {
-    String *pname = Getattr(p, "name");
-    if (!pname && Cmp(Getattr(p, "type"), "void")) {
-      pname = NewString("");
-      Printf(pname, "arg%d", arg_idx++);
-    }
-    if (p != l)
-      Printf(call, ", ");
-    Printv(call, pname, NIL);
-  }
-  Printf(call, ")");
-  return call;
-}
-
-/* Swig_class_declaration()
- *
- * Generate the start of a class/struct declaration.
- * e.g. "class myclass"
- *
- */
-
-String *Swig_class_declaration(Node *n, String *name) {
-  if (!name) {
-    name = Getattr(n, "sym:name");
-  }
-  String *result = NewString("");
-  String *kind = Getattr(n, "kind");
-  Printf(result, "%s %s", kind, name);
-  return result;
-}
-
-String *Swig_class_name(Node *n) {
-  String *name;
-  name = Copy(Getattr(n, "sym:name"));
-  return name;
-}
-
-/* Swig_director_declaration()
- *
- * Generate the full director class declaration, complete with base classes.
- * e.g. "class SwigDirector_myclass : public myclass, public Swig::Director {"
- *
- */
-
-String *Swig_director_declaration(Node *n) {
-  String *classname = Swig_class_name(n);
-  String *directorname = Language::instance()->directorClassName(n);
-  String *base = Getattr(n, "classtype");
-  String *declaration = Swig_class_declaration(n, directorname);
-
-  Printf(declaration, " : public %s, public Swig::Director {\n", base);
-  Delete(classname);
-  Delete(directorname);
-  return declaration;
-}
-
-
-String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms) {
-  String *func;
-  int i = 0;
-  int comma = 0;
-  Parm *p = parms;
-  SwigType *pt;
-  String *nname;
-
-  func = NewString("");
-  nname = SwigType_namestr(name);
-  Printf(func, "%s(", nname);
-  while (p) {
-    String *pname;
-    pt = Getattr(p, "type");
-    if ((SwigType_type(pt) != T_VOID)) {
-      if (comma)
-	Printf(func, ",");
-      pname = Getattr(p, "name");
-      Printf(func, "%s", pname);
-      comma = 1;
-      i++;
-    }
-    p = nextSibling(p);
-  }
-  Printf(func, ")");
-  return func;
-}
-
-/* Swig_method_decl
- *
- * Misnamed and misappropriated!  Taken from SWIG's type string manipulation utilities
- * and modified to generate full (or partial) type qualifiers for method declarations,
- * local variable declarations, and return value casting.  More importantly, it merges
- * parameter type information with actual parameter names to produce a complete method
- * declaration that fully mirrors the original method declaration.
- *
- * There is almost certainly a saner way to do this.
- *
- * This function needs to be cleaned up and possibly split into several smaller 
- * functions.  For instance, attaching default names to parameters should be done in a 
- * separate function.
- *
- */
-
-String *Swig_method_decl(SwigType *rettype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values) {
-  String *result;
-  List *elements;
-  String *element = 0, *nextelement;
-  int is_const = 0;
-  int nelements, i;
-  int is_func = 0;
-  int arg_idx = 0;
-
-  if (id) {
-    result = NewString(Char(id));
-  } else {
-    result = NewString("");
-  }
-
-  elements = SwigType_split(decl);
-  nelements = Len(elements);
-  if (nelements > 0) {
-    element = Getitem(elements, 0);
-  }
-  for (i = 0; i < nelements; i++) {
-    if (i < (nelements - 1)) {
-      nextelement = Getitem(elements, i + 1);
-    } else {
-      nextelement = 0;
-    }
-    if (SwigType_isqualifier(element)) {
-      int skip = 0;
-      DOH *q = 0;
-      if (!strip) {
-	q = SwigType_parm(element);
-	if (!Cmp(q, "const")) {
-	  is_const = 1;
-	  is_func = SwigType_isfunction(nextelement);
-	  if (is_func)
-	    skip = 1;
-	  skip = 1;
-	}
-	if (!skip) {
-	  Insert(result, 0, " ");
-	  Insert(result, 0, q);
-	}
-	Delete(q);
-      }
-    } else if (SwigType_isfunction(element)) {
-      Parm *parm;
-      String *p;
-      Append(result, "(");
-      parm = args;
-      while (parm != 0) {
-	String *type = Getattr(parm, "type");
-	String *name = Getattr(parm, "name");
-	if (!name && Cmp(type, "void")) {
-	  name = NewString("");
-	  Printf(name, "arg%d", arg_idx++);
-	  Setattr(parm, "name", name);
-	}
-	if (!name) {
-	  name = NewString("");
-	}
-	p = SwigType_str(type, name);
-	Append(result, p);
-	String *value = Getattr(parm, "value");
-	if (values && (value != 0)) {
-	  Printf(result, " = %s", value);
-	}
-	parm = nextSibling(parm);
-	if (parm != 0)
-	  Append(result, ", ");
-      }
-      Append(result, ")");
-    } else if (rettype) { // This check is intended for conversion operators to a pointer/reference which needs the pointer/reference ignoring in the declaration
-      if (SwigType_ispointer(element)) {
-	Insert(result, 0, "*");
-	if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
-	  Insert(result, 0, "(");
-	  Append(result, ")");
-	}
-      } else if (SwigType_ismemberpointer(element)) {
-	String *q;
-	q = SwigType_parm(element);
-	Insert(result, 0, "::*");
-	Insert(result, 0, q);
-	if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
-	  Insert(result, 0, "(");
-	  Append(result, ")");
-	}
-	Delete(q);
-      } else if (SwigType_isreference(element)) {
-	Insert(result, 0, "&");
-      } else if (SwigType_isarray(element)) {
-	DOH *size;
-	Append(result, "[");
-	size = SwigType_parm(element);
-	Append(result, size);
-	Append(result, "]");
-	Delete(size);
-      } else {
-	if (Strcmp(element, "v(...)") == 0) {
-	  Insert(result, 0, "...");
-	} else {
-	  String *bs = SwigType_namestr(element);
-	  Insert(result, 0, " ");
-	  Insert(result, 0, bs);
-	  Delete(bs);
-	}
-      }
-    }
-    element = nextelement;
-  }
-
-  Delete(elements);
-
-  if (is_const) {
-    if (is_func) {
-      Append(result, " ");
-      Append(result, "const");
-    } else {
-      Insert(result, 0, "const ");
-    }
-  }
-
-  Chop(result);
-
-  if (rettype) {
-    Insert(result, 0, " ");
-    String *rtype = SwigType_str(rettype, 0);
-    Insert(result, 0, rtype);
-    Delete(rtype);
-  }
-
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_director_emit_dynamic_cast()
- *
- * In order to call protected virtual director methods from the target language, we need
- * to add an extra dynamic_cast to call the public C++ wrapper in the director class. 
- * Also for non-static protected members when the allprotected option is on.
- * ----------------------------------------------------------------------------- */
-void Swig_director_emit_dynamic_cast(Node *n, Wrapper *f) {
-  // TODO: why is the storage element removed in staticmemberfunctionHandler ??
-  if ((!is_public(n) && (is_member_director(n) || GetFlag(n, "explicitcall"))) || 
-      (is_non_virtual_protected_access(n) && !(Swig_storage_isstatic_custom(n, "staticmemberfunctionHandler:storage") || 
-                                               Swig_storage_isstatic(n))
-                                          && !Equal(nodeType(n), "constructor"))) {
-    Node *parent = Getattr(n, "parentNode");
-    String *dirname;
-    String *dirdecl;
-    dirname = Language::instance()->directorClassName(parent);
-    dirdecl = NewStringf("%s *darg = 0", dirname);
-    Wrapper_add_local(f, "darg", dirdecl);
-    Printf(f->code, "darg = dynamic_cast<%s *>(arg1);\n", dirname);
-    Delete(dirname);
-    Delete(dirdecl);
-  }
-}
-
-/* ------------------------------------------------------------
- * Swig_director_parms_fixup()
- *
- * For each parameter in the C++ member function, copy the parameter name
- * to its "lname"; this ensures that Swig_typemap_attach_parms() will do
- * the right thing when it sees strings like "$1" in "directorin" typemaps.
- * ------------------------------------------------------------ */
-
-void Swig_director_parms_fixup(ParmList *parms) {
-  Parm *p;
-  int i;
-  for (i = 0, p = parms; p; p = nextSibling(p), ++i) {
-    String *arg = Getattr(p, "name");
-    String *lname = 0;
-
-    if (!arg && !Equal(Getattr(p, "type"), "void")) {
-      lname = NewStringf("arg%d", i);
-      Setattr(p, "name", lname);
-    } else
-      lname = Copy(arg);
-
-    Setattr(p, "lname", lname);
-    Delete(lname);
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Source/Modules/emit.cxx b/dependencies2013/win32/swig/Source/Modules/emit.cxx
deleted file mode 100644
index 7c2607fc..00000000
--- a/dependencies2013/win32/swig/Source/Modules/emit.cxx
+++ /dev/null
@@ -1,505 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * emit.cxx
- *
- * Useful functions for emitting various pieces of code.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-/* -----------------------------------------------------------------------------
- * emit_return_variable()
- *
- * Emits a variable declaration for a function return value.
- * The variable name is always called result.
- * n => Node of the method being wrapped
- * rt => the return type
- * f => the wrapper to generate code into
- * ----------------------------------------------------------------------------- */
-
-void emit_return_variable(Node *n, SwigType *rt, Wrapper *f) {
-
-  if (!GetFlag(n, "tmap:out:optimal")) {
-    if (rt && (SwigType_type(rt) != T_VOID)) {
-      SwigType *vt = cplus_value_type(rt);
-      SwigType *tt = vt ? vt : rt;
-      SwigType *lt = SwigType_ltype(tt);
-      String *lstr = SwigType_str(lt, Swig_cresult_name());
-      if (SwigType_ispointer(lt)) {
-        Wrapper_add_localv(f, Swig_cresult_name(), lstr, "= 0", NULL);
-      } else {
-        Wrapper_add_local(f, Swig_cresult_name(), lstr);
-      }
-      if (vt) {
-        Delete(vt);
-      }
-      Delete(lt);
-      Delete(lstr);
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * emit_parameter_variables()
- *
- * Emits a list of variable declarations for function parameters.
- * The variable names are always called arg1, arg2, etc...
- * l => the parameter list
- * f => the wrapper to generate code into
- * ----------------------------------------------------------------------------- */
-
-void emit_parameter_variables(ParmList *l, Wrapper *f) {
-
-  Parm *p;
-  String *tm;
-
-  /* Emit function arguments */
-  Swig_cargs(f, l);
-
-  /* Attach typemaps to parameters */
-  /*  Swig_typemap_attach_parms("ignore",l,f); */
-
-  Swig_typemap_attach_parms("default", l, f);
-  Swig_typemap_attach_parms("arginit", l, f);
-
-  /* Apply the arginit and default */
-  p = l;
-  while (p) {
-    tm = Getattr(p, "tmap:arginit");
-    if (tm) {
-      Replace(tm, "$target", Getattr(p, "lname"), DOH_REPLACE_ANY);
-      Printv(f->code, tm, "\n", NIL);
-      p = Getattr(p, "tmap:arginit:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  /* Apply the default typemap */
-  p = l;
-  while (p) {
-    tm = Getattr(p, "tmap:default");
-    if (tm) {
-      Replace(tm, "$target", Getattr(p, "lname"), DOH_REPLACE_ANY);
-      Printv(f->code, tm, "\n", NIL);
-      p = Getattr(p, "tmap:default:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * emit_attach_parmmaps()
- *
- * Attach the standard parameter related typemaps.
- * ----------------------------------------------------------------------------- */
-
-void emit_attach_parmmaps(ParmList *l, Wrapper *f) {
-  Swig_typemap_attach_parms("in", l, f);
-  Swig_typemap_attach_parms("typecheck", l, 0);
-  Swig_typemap_attach_parms("argout", l, f);
-  Swig_typemap_attach_parms("check", l, f);
-  Swig_typemap_attach_parms("freearg", l, f);
-
-  {
-    /* This is compatibility code to deal with the deprecated "ignore" typemap */
-    Parm *p = l;
-    Parm *np;
-    String *tm;
-    while (p) {
-      tm = Getattr(p, "tmap:in");
-      if (tm && checkAttribute(p, "tmap:in:numinputs", "0")) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	np = Getattr(p, "tmap:in:next");
-	while (p && (p != np)) {
-	  /*	  Setattr(p,"ignore","1");    Deprecate */
-	  p = nextSibling(p);
-	}
-      } else if (tm) {
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-  }
-
-  /* Perform a sanity check on "in" and "freearg" typemaps.  These
-     must exactly match to avoid chaos.  If a mismatch occurs, we
-     nuke the freearg typemap */
-
-  {
-    Parm *p = l;
-    Parm *npin, *npfreearg;
-    while (p) {
-      npin = Getattr(p, "tmap:in:next");
-
-      /*
-         if (Getattr(p,"tmap:ignore")) {
-         npin = Getattr(p,"tmap:ignore:next");
-         } else if (Getattr(p,"tmap:in")) {
-         npin = Getattr(p,"tmap:in:next");
-         }
-       */
-
-      if (Getattr(p, "tmap:freearg")) {
-	npfreearg = Getattr(p, "tmap:freearg:next");
-	if (npin != npfreearg) {
-	  while (p != npin) {
-	    Delattr(p, "tmap:freearg");
-	    Delattr(p, "tmap:freearg:next");
-	    p = nextSibling(p);
-	  }
-	}
-      }
-      p = npin;
-    }
-  }
-
-  /* Check for variable length arguments with no input typemap.
-     If no input is defined, we set this to ignore and print a
-     message.
-   */
-  {
-    Parm *p = l;
-    Parm *lp = 0;
-    while (p) {
-      if (!checkAttribute(p, "tmap:in:numinputs", "0")) {
-	lp = p;
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-      if (SwigType_isvarargs(Getattr(p, "type"))) {
-	Swig_warning(WARN_LANG_VARARGS, input_file, line_number, "Variable length arguments discarded.\n");
-	Setattr(p, "tmap:in", "");
-      }
-      lp = 0;
-      p = nextSibling(p);
-    }
-
-    /* Check if last input argument is variable length argument */
-    if (lp) {
-      p = lp;
-      while (p) {
-	if (SwigType_isvarargs(Getattr(p, "type"))) {
-	  Setattr(l, "emit:varargs", lp);
-	  break;
-	}
-	p = nextSibling(p);
-      }
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * emit_num_arguments()
- *
- * Calculate the total number of arguments.   This function is safe for use
- * with multi-argument typemaps which may change the number of arguments in
- * strange ways.
- * ----------------------------------------------------------------------------- */
-
-int emit_num_arguments(ParmList *parms) {
-  Parm *p = parms;
-  int nargs = 0;
-
-  while (p) {
-    if (Getattr(p, "tmap:in")) {
-      nargs += GetInt(p, "tmap:in:numinputs");
-      p = Getattr(p, "tmap:in:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  /* DB 04/02/2003: Not sure this is necessary with tmap:in:numinputs */
-  /*
-     if (parms && (p = Getattr(parms,"emit:varargs"))) {
-     if (!nextSibling(p)) {
-     nargs--;
-     }
-     }
-   */
-  return nargs;
-}
-
-/* -----------------------------------------------------------------------------
- * emit_num_required()
- *
- * Computes the number of required arguments.  This function is safe for
- * use with multi-argument typemaps and knows how to skip over everything
- * properly. Note that parameters with default values are counted unless
- * the compact default args option is on.
- * ----------------------------------------------------------------------------- */
-
-int emit_num_required(ParmList *parms) {
-  Parm *p = parms;
-  int nargs = 0;
-  Parm *first_default_arg = 0;
-  int compactdefargs = ParmList_is_compactdefargs(p);
-
-  while (p) {
-    if (Getattr(p, "tmap:in") && checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    } else {
-      if (Getattr(p, "tmap:default"))
-	break;
-      if (Getattr(p, "value")) {
-	if (!first_default_arg)
-	  first_default_arg = p;
-	if (compactdefargs)
-	  break;
-      }
-      nargs += GetInt(p, "tmap:in:numinputs");
-      if (Getattr(p, "tmap:in")) {
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-  }
-
-  /* Print error message for non-default arguments following default arguments */
-  /* The error message is printed more than once with most language modules, this ought to be fixed */
-  if (first_default_arg) {
-    p = first_default_arg;
-    while (p) {
-      if (Getattr(p, "tmap:in") && checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	if (!Getattr(p, "value") && (!Getattr(p, "tmap:default"))) {
-	  Swig_error(Getfile(p), Getline(p), "Non-optional argument '%s' follows an optional argument.\n", Getattr(p, "name"));
-	}
-	if (Getattr(p, "tmap:in")) {
-	  p = Getattr(p, "tmap:in:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-  }
-
-  /* DB 04/02/2003: Not sure this is necessary with tmap:in:numinputs */
-  /*
-     if (parms && (p = Getattr(parms,"emit:varargs"))) {
-     if (!nextSibling(p)) {
-     nargs--;
-     }
-     }
-   */
-  return nargs;
-}
-
-/* -----------------------------------------------------------------------------
- * emit_isvarargs()
- *
- * Checks if a function is a varargs function
- * ----------------------------------------------------------------------------- */
-
-int emit_isvarargs(ParmList *p) {
-  if (!p)
-    return 0;
-  if (Getattr(p, "emit:varargs"))
-    return 1;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * void emit_mark_vararg_parms()
- *
- * Marks the vararg parameters which are to be ignored.
- * Vararg parameters are marked as ignored if there is no 'in' varargs (...) 
- * typemap.
- * ----------------------------------------------------------------------------- */
-
-void emit_mark_varargs(ParmList *l) {
-  Parm *p = l;
-  while (p) {
-    if (SwigType_isvarargs(Getattr(p, "type")))
-      if (!Getattr(p, "tmap:in"))
-	Setattr(p, "varargs:ignore", "1");
-    p = nextSibling(p);
-  }
-}
-
-#if 0
-/* replace_contract_args.  This function replaces argument names in contract
-   specifications.   Used in conjunction with the %contract directive. */
-
-static void replace_contract_args(Parm *cp, Parm *rp, String *s) {
-  while (cp && rp) {
-    String *n = Getattr(cp, "name");
-    if (n) {
-      Replace(s, n, Getattr(rp, "lname"), DOH_REPLACE_ID);
-    }
-    cp = nextSibling(cp);
-    rp = nextSibling(rp);
-  }
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- * int emit_action_code()
- *
- * Emits action code for a wrapper. Adds in exception handling code (%exception).
- * eaction -> the action code to emit
- * wrappercode -> the emitted code (output)
- * ----------------------------------------------------------------------------- */
-int emit_action_code(Node *n, String *wrappercode, String *eaction) {
-  assert(Getattr(n, "wrap:name"));
-
-  /* Look for except feature (%exception) */
-  String *tm = GetFlagAttr(n, "feature:except");
-  if (tm)
-    tm = Copy(tm);
-  if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
-    if (Strstr(tm, "$")) {
-      Swig_replace_special_variables(n, parentNode(n), tm);
-      Replaceall(tm, "$function", eaction); // deprecated
-      Replaceall(tm, "$action", eaction);
-    }
-    Printv(wrappercode, tm, "\n", NIL);
-    Delete(tm);
-    return 1;
-  } else {
-    Printv(wrappercode, eaction, "\n", NIL);
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * int emit_action()
- *
- * Emits the call to the wrapped function. 
- * Adds in exception specification exception handling and %exception code.
- * ----------------------------------------------------------------------------- */
-String *emit_action(Node *n) {
-  String *actioncode = NewStringEmpty();
-  String *tm;
-  String *action;
-  String *wrap;
-  ParmList *catchlist = Getattr(n, "catchlist");
-
-  /* Look for fragments */
-  {
-    String *fragment = Getattr(n, "feature:fragment");
-    if (fragment) {
-      char *c, *tok;
-      String *t = Copy(fragment);
-      c = Char(t);
-      tok = strtok(c, ",");
-      while (tok) {
-	String *fname = NewString(tok);
-	Setfile(fname, Getfile(n));
-	Setline(fname, Getline(n));
-	Swig_fragment_emit(fname);
-	Delete(fname);
-	tok = strtok(NULL, ",");
-      }
-      Delete(t);
-    }
-  }
-
-  /* Emit wrapper code (if any) */
-  wrap = Getattr(n, "wrap:code");
-  if (wrap && Swig_filebyname("header") != Getattr(n, "wrap:code:done")) {
-    File *f_code = Swig_filebyname("header");
-    if (f_code) {
-      Printv(f_code, wrap, NIL);
-    }
-    Setattr(n, "wrap:code:done", f_code);
-  }
-
-  action = Getattr(n, "feature:action");
-  if (!action)
-    action = Getattr(n, "wrap:action");
-  assert(action != 0);
-
-  /* Emit contract code (if any) */
-  if (Swig_contract_mode_get()) {
-    /* Preassertion */
-    tm = Getattr(n, "contract:preassert");
-    if (Len(tm)) {
-      Printv(actioncode, tm, "\n", NIL);
-    }
-  }
-  /* Exception handling code */
-
-  /* saves action -> eaction for postcatching exception */
-  String *eaction = NewString("");
-
-  /* If we are in C++ mode and there is an exception specification. We're going to
-     enclose the block in a try block */
-  if (catchlist) {
-    Printf(eaction, "try {\n");
-  }
-
-  String *preaction = Getattr(n, "wrap:preaction");
-  if (preaction)
-    Printv(eaction, preaction, NIL);
-
-  Printv(eaction, action, NIL);
-
-  String *postaction = Getattr(n, "wrap:postaction");
-  if (postaction)
-    Printv(eaction, postaction, NIL);
-
-  if (catchlist) {
-    int unknown_catch = 0;
-    int has_varargs = 0;
-    Printf(eaction, "}\n");
-    for (Parm *ep = catchlist; ep; ep = nextSibling(ep)) {
-      String *em = Swig_typemap_lookup("throws", ep, "_e", 0);
-      if (em) {
-        SwigType *et = Getattr(ep, "type");
-        SwigType *etr = SwigType_typedef_resolve_all(et);
-        if (SwigType_isreference(etr) || SwigType_ispointer(etr) || SwigType_isarray(etr)) {
-          Printf(eaction, "catch(%s) {", SwigType_str(et, "_e"));
-        } else if (SwigType_isvarargs(etr)) {
-          Printf(eaction, "catch(...) {");
-          has_varargs = 1;
-        } else {
-          Printf(eaction, "catch(%s) {", SwigType_str(et, "&_e"));
-        }
-        Printv(eaction, em, "\n", NIL);
-        Printf(eaction, "}\n");
-      } else {
-	Swig_warning(WARN_TYPEMAP_THROW, Getfile(n), Getline(n), "No 'throws' typemap defined for exception type '%s'\n", SwigType_str(Getattr(ep, "type"), 0));
-        unknown_catch = 1;
-      }
-    }
-    if (unknown_catch && !has_varargs) {
-      Printf(eaction, "catch(...) { throw; }\n");
-    }
-  }
-
-  /* Look for except typemap (Deprecated) */
-  tm = Swig_typemap_lookup("except", n, Swig_cresult_name(), 0);
-  if (tm) {
-    Setattr(n, "feature:except", tm);
-    tm = 0;
-  }
-
-  /* emit the except feature code */
-  emit_action_code(n, actioncode, eaction);
-
-  Delete(eaction);
-
-  /* Emit contract code (if any) */
-  if (Swig_contract_mode_get()) {
-    /* Postassertion */
-    tm = Getattr(n, "contract:postassert");
-    if (Len(tm)) {
-      Printv(actioncode, tm, "\n", NIL);
-    }
-  }
-
-  return actioncode;
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/go.cxx b/dependencies2013/win32/swig/Source/Modules/go.cxx
deleted file mode 100644
index 884ae906..00000000
--- a/dependencies2013/win32/swig/Source/Modules/go.cxx
+++ /dev/null
@@ -1,6961 +0,0 @@
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * go.cxx
- *
- * Go language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-
-/* ----------------------------------------------------------------------
- * siphash()
- *
- * 64-bit SipHash-2-4 to generate unique id for each module
- * ---------------------------------------------------------------------- */
-
-// An unsigned 64-bit integer that works on a 32-bit host.
-typedef struct {
-  // Assume unsigned long is at least 32 bits.
-  unsigned long hi;
-  unsigned long lo;
-} swig_uint64;
-
-// Rotate v left by bits, which must be <= 32.
-static inline void _rotl(swig_uint64 *v, int bits) {
-  assert(bits <= 32);
-  unsigned long tmp = v->hi;
-  if (bits == 32) {
-    v->hi = v->lo;
-    v->lo = tmp;
-  } else {
-    v->hi = (tmp << bits) | ((0xfffffffful & v->lo) >> (32 - bits));
-    v->lo = (v->lo << bits) | ((0xfffffffful & tmp) >> (32 - bits));
-  }
-}
-
-// dst ^= src
-static inline void _xor(swig_uint64 *dst, swig_uint64 *src) {
-  dst->lo ^= src->lo;
-  dst->hi ^= src->hi;
-}
-
-// dst += src
-static inline void _add(swig_uint64 *dst, swig_uint64 *src) {
-  dst->lo += src->lo;
-  dst->hi += src->hi + ((dst->lo & 0xfffffffful) < (src->lo&0xfffffffful) ? 1 : 0);
-}
-#define SIPROUND                                        \
-  do {                                                  \
-    _add(&v0, &v1); _rotl(&v1, 13); _xor(&v1, &v0); _rotl(&v0, 32); \
-    _add(&v2, &v3); _rotl(&v3, 16); _xor(&v3, &v2); \
-    _add(&v0, &v3); _rotl(&v3, 21); _xor(&v3, &v0); \
-    _add(&v2, &v1); _rotl(&v1, 17); _xor(&v1, &v2); _rotl(&v2, 32); \
-  } while(0)
-
-// Set out to the hash of inc/inlen.
-static void siphash(swig_uint64 *out, const char *inc, unsigned long inlen) {
-  /* "somepseudorandomlygeneratedbytes" */
-  swig_uint64 v0 = {0x736f6d65UL, 0x70736575UL};
-  swig_uint64 v1 = {0x646f7261UL, 0x6e646f6dUL};
-  swig_uint64 v2 = {0x6c796765UL, 0x6e657261UL};
-  swig_uint64 v3 = {0x74656462UL, 0x79746573UL};
-  swig_uint64 b;
-  /* hard-coded k. */
-  swig_uint64 k0 = {0x07060504UL, 0x03020100UL};
-  swig_uint64 k1 = {0x0F0E0D0CUL, 0x0B0A0908UL};
-  int i;
-  const int cROUNDS = 2, dROUNDS = 4;
-  const unsigned char *in = (const unsigned char *)inc;
-  const unsigned char *end = in + inlen - (inlen % 8);
-  int left = inlen & 7;
-  _xor(&v3, &k1); _xor(&v2, &k0); _xor(&v1, &k1); _xor(&v0, &k0);
-  for (; in != end; in += 8) {
-    b.hi = 0; b.lo = 0;
-    for (i = 0; i < 4; i++) {
-      b.lo |= ((unsigned long)in[i]) << (8*i);
-    }
-    for (i = 0; i < 4; i++) {
-      b.hi |= ((unsigned long)in[i+4]) << (8*i);
-    }
-    _xor(&v3, &b);
-    for (i = 0; i < cROUNDS; i++) {
-      SIPROUND;
-    }
-    _xor(&v0, &b);
-  }
-  b.hi = (inlen & 0xff)<<24; b.lo = 0;
-  for (; left; left--) {
-    if (left > 4) {
-      b.hi |= ((unsigned long)in[left-1]) << (8*left-8-32);
-    } else {
-      b.lo |= ((unsigned long)in[left-1]) << (8*left-8);
-    }
-  }
-  _xor(&v3, &b);
-  for(i=0; i<cROUNDS; i++) {
-    SIPROUND;
-  }
-  _xor(&v0, &b); v2.lo ^= 0xff;
-  for(i=0; i<dROUNDS; i++) {
-    SIPROUND;
-  }
-  out->lo = 0; out->hi = 0;
-  _xor(out, &v0); _xor(out, &v1); _xor(out, &v2); _xor(out, &v3);
-}
-#undef SIPROUND
-
-class GO:public Language {
-  static const char *const usage;
-
-  // Go package name.
-  String *package;
-  // SWIG module name.
-  String *module;
-  // Flag for generating cgo input files.
-  bool cgo_flag;
-  // Flag for generating gccgo output.
-  bool gccgo_flag;
-  // Prefix to use with gccgo.
-  String *go_prefix;
-  // -fgo-prefix option.
-  String *prefix_option;
-  // -fgo-pkgpath option.
-  String *pkgpath_option;
-  // Whether to use a shared library.
-  bool use_shlib;
-  // Name of shared library to import.
-  String *soname;
-  // Size in bits of the Go type "int".  0 if not specified.
-  int intgo_type_size;
-
-  /* Output files */
-  File *f_c_begin;
-  File *f_go_begin;
-  File *f_gc_begin;
-
-  /* Output fragments */
-  File *f_c_runtime;
-  File *f_c_header;
-  File *f_c_wrappers;
-  File *f_c_init;
-  File *f_c_directors;
-  File *f_c_directors_h;
-  File *f_go_imports;
-  File *f_go_runtime;
-  File *f_go_header;
-  File *f_go_wrappers;
-  File *f_go_directors;
-  File *f_gc_runtime;
-  File *f_gc_header;
-  File *f_gc_wrappers;
-  File *f_cgo_comment;
-  File *f_cgo_comment_typedefs;
-
-  // True if we imported a module.
-  bool saw_import;
-  // If not NULL, name of import package being processed.
-  String *imported_package;
-  // Build interface methods while handling a class.  This is only
-  // non-NULL when we are handling methods.
-  String *interfaces;
-  // The class node while handling a class.  This is only non-NULL
-  // when we are handling methods.
-  Node *class_node;
-  // The class name while handling a class.  This is only non-NULL
-  // when we are handling methods.  This is the name of the class as
-  // SWIG sees it.
-  String *class_name;
-  // The receiver name while handling a class.  This is only non-NULL
-  // when we are handling methods.  This is the name of the class
-  // as run through goCPointerType.
-  String *class_receiver;
-  // A hash table of method names that we have seen when processing a
-  // class.  This lets us detect base class methods that we don't want
-  // to use.
-  Hash *class_methods;
-  // True when we are generating the wrapper functions for a variable.
-  bool making_variable_wrappers;
-  // True when working with a static member function.
-  bool is_static_member_function;
-  // A hash table of enum types that we have seen but which may not have
-  // been defined.  The index is a SwigType.
-  Hash *undefined_enum_types;
-  // A hash table of types that we have seen but which may not have
-  // been defined.  The index is a SwigType.
-  Hash *undefined_types;
-  // A hash table of classes which were defined.  The index is a Go
-  // type name.
-  Hash *defined_types;
-  // A hash table of all the go_imports already imported. The index is a full
-  // import name e.g. '"runtime"' or '_ "runtime/cgo"' or 'sc "syscall"'.
-  Hash *go_imports;
-  // A unique ID used to make public symbols unique.
-  String *unique_id;
-
-public:
-  GO():package(NULL),
-     module(NULL),
-     cgo_flag(false),
-     gccgo_flag(false),
-     go_prefix(NULL),
-     prefix_option(NULL),
-     pkgpath_option(NULL),
-     use_shlib(false),
-     soname(NULL),
-     intgo_type_size(0),
-     f_c_begin(NULL),
-     f_go_begin(NULL),
-     f_gc_begin(NULL),
-     f_c_runtime(NULL),
-     f_c_header(NULL),
-     f_c_wrappers(NULL),
-     f_c_init(NULL),
-     f_c_directors(NULL),
-     f_c_directors_h(NULL),
-     f_go_imports(NULL),
-     f_go_runtime(NULL),
-     f_go_header(NULL),
-     f_go_wrappers(NULL),
-     f_go_directors(NULL),
-     f_gc_runtime(NULL),
-     f_gc_header(NULL),
-     f_gc_wrappers(NULL),
-     f_cgo_comment(NULL),
-     f_cgo_comment_typedefs(NULL),
-     saw_import(false),
-     imported_package(NULL),
-     interfaces(NULL),
-     class_node(NULL),
-     class_name(NULL),
-     class_receiver(NULL),
-     class_methods(NULL),
-     making_variable_wrappers(false),
-     is_static_member_function(false),
-     undefined_enum_types(NULL),
-     undefined_types(NULL),
-     defined_types(NULL),
-     go_imports(NULL),
-     unique_id(NULL) {
-    director_multiple_inheritance = 1;
-    director_language = 1;
-    director_prot_ctor_code = NewString("_swig_gopanic(\"accessing abstract class or protected constructor\");");
-  }
-
-private:
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-  virtual void main(int argc, char *argv[]) {
-
-    SWIG_library_directory("go");
-    bool display_help = false;
-
-    // Process command line options.
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-package") == 0) {
-	  if (argv[i + 1]) {
-	    package = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-cgo") == 0) {
-	  Swig_mark_arg(i);
-	  cgo_flag = true;
-	} else if (strcmp(argv[i], "-gccgo") == 0) {
-	  Swig_mark_arg(i);
-	  gccgo_flag = true;
-	} else if (strcmp(argv[i], "-go-prefix") == 0) {
-	  if (argv[i + 1]) {
-	    prefix_option = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-go-pkgpath") == 0) {
-	  if (argv[i + 1]) {
-	    pkgpath_option = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-use-shlib") == 0) {
-	  Swig_mark_arg(i);
-	  use_shlib = true;
-	} else if (strcmp(argv[i], "-soname") == 0) {
-	  if (argv[i + 1]) {
-	    soname = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-longsize") == 0) {
-	  // Ignore for backward compatibility.
-	  if (argv[i + 1]) {
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    ++i;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-intgosize") == 0) {
-	  if (argv[i + 1]) {
-	    intgo_type_size = atoi(argv[i + 1]);
-	    if (intgo_type_size != 32 && intgo_type_size != 64) {
-	      Printf(stderr, "-intgosize not 32 or 64\n");
-	      Swig_arg_error();
-	    }
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    ++i;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  display_help = true;
-	  Printf(stdout, "%s\n", usage);
-	}
-      }
-    }
-
-    if (gccgo_flag && !pkgpath_option && !prefix_option) {
-      prefix_option = NewString("go");
-    }
-
-    // Add preprocessor symbol to parser.
-    Preprocessor_define("SWIGGO 1", 0);
-
-    if (cgo_flag) {
-      Preprocessor_define("SWIGGO_CGO 1", 0);
-    }
-
-    if (gccgo_flag) {
-      Preprocessor_define("SWIGGO_GCCGO 1", 0);
-    }
-
-    // This test may be removed in the future, when we can assume that
-    // everybody has upgraded to Go 1.1.  The code below is prepared
-    // for this test to simply be taken out.
-    if (intgo_type_size == 0 && !display_help) {
-      Printf(stderr, "SWIG -go: -intgosize option required but not specified\n");
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    if (intgo_type_size == 32) {
-      Preprocessor_define("SWIGGO_INTGO_SIZE 32", 0);
-    } else if (intgo_type_size == 64) {
-      Preprocessor_define("SWIGGO_INTGO_SIZE 64", 0);
-    } else {
-      Preprocessor_define("SWIGGO_INTGO_SIZE 0", 0);
-    }
-
-    // Add typemap definitions.
-    SWIG_typemap_lang("go");
-    SWIG_config_file("go.swg");
-
-    allow_overloading();
-  }
-
-  /* ---------------------------------------------------------------------
-   * top()
-   *
-   * For 6g/8g, we are going to create the following files:
-   *
-   * 1) A .c or .cxx file compiled with gcc.  This file will contain
-   *    function wrappers.  Each wrapper will take a pointer to a
-   *    struct holding the arguments, unpack them, and call the real
-   *    function.
-   *
-   * 2) A .go file which defines the Go form of all types, and which
-   *    defines Go function wrappers.  Each wrapper will call the C
-   *    function wrapper in the second file.
-   *
-   * 3) A .c file compiled with 6c/8c.  This file will define
-   *    Go-callable C function wrappers.  Each wrapper will use
-   *    cgocall to call the function wrappers in the first file.
-   *
-   * When generating code for gccgo, we don't need the third file, and
-   * the function wrappers in the first file have a different form.
-   *
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-    Node *optionsnode = Getattr(Getattr(n, "module"), "options");
-    if (optionsnode) {
-      if (Getattr(optionsnode, "directors")) {
-	allow_directors();
-      }
-      if (Getattr(optionsnode, "dirprot")) {
-	allow_dirprot();
-      }
-      allow_allprotected(GetFlag(optionsnode, "allprotected"));
-    }
-
-    module = Getattr(n, "name");
-    if (!package) {
-      package = Copy(module);
-    }
-    if (!soname && use_shlib) {
-      soname = Copy(package);
-      Append(soname, ".so");
-    }
-
-    if (gccgo_flag) {
-      String *pref;
-      if (pkgpath_option) {
-	pref = pkgpath_option;
-      } else {
-	pref = prefix_option;
-      }
-      go_prefix = NewString("");
-      for (char *p = Char(pref); *p != '\0'; p++) {
-	if ((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || *p == '.' || *p == '$') {
-	  Putc(*p, go_prefix);
-	} else {
-	  Putc('_', go_prefix);
-	}
-      }
-      if (!pkgpath_option) {
-	Append(go_prefix, ".");
-	Append(go_prefix, getModuleName(package));
-      }
-    }
-
-    // Get filenames.
-
-    String *swig_filename = Getattr(n, "infile");
-    String *c_filename = Getattr(n, "outfile");
-    String *c_filename_h = Getattr(n, "outfile_h");
-
-    String *go_filename = NewString("");
-    Printf(go_filename, "%s%s.go", SWIG_output_directory(), module);
-
-    String *gc_filename = NULL;
-    if (!gccgo_flag) {
-      gc_filename = NewString("");
-      Printf(gc_filename, "%s%s_gc.c", SWIG_output_directory(), module);
-    }
-
-    // Generate a unique ID based on a hash of the SWIG input.
-    swig_uint64 hash = {0, 0};
-    FILE *swig_input = Swig_open(swig_filename);
-    if (swig_input == NULL) {
-      FileErrorDisplay(swig_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    String *swig_input_content = Swig_read_file(swig_input);
-    siphash(&hash, Char(swig_input_content), Len(swig_input_content));
-    Delete(swig_input_content);
-    fclose(swig_input);
-    unique_id = NewString("");
-    Printf(unique_id, "_%s_%08x%08x", getModuleName(package), hash.hi, hash.lo);
-
-    // Open files.
-
-    f_c_begin = NewFile(c_filename, "w", SWIG_output_files());
-    if (!f_c_begin) {
-      FileErrorDisplay(c_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    if (directorsEnabled()) {
-      if (!c_filename_h) {
-	Printf(stderr, "Unable to determine outfile_h\n");
-	SWIG_exit(EXIT_FAILURE);
-      }
-      f_c_directors_h = NewFile(c_filename_h, "w", SWIG_output_files());
-      if (!f_c_directors_h) {
-	FileErrorDisplay(c_filename_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    f_go_begin = NewFile(go_filename, "w", SWIG_output_files());
-    if (!f_go_begin) {
-      FileErrorDisplay(go_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    if (!gccgo_flag && !cgo_flag) {
-      f_gc_begin = NewFile(gc_filename, "w", SWIG_output_files());
-      if (!f_gc_begin) {
-	FileErrorDisplay(gc_filename);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    f_c_runtime = NewString("");
-    f_c_header = NewString("");
-    f_c_wrappers = NewString("");
-    f_c_init = NewString("");
-    f_c_directors = NewString("");
-    f_go_imports = NewString("");
-    f_go_runtime = NewString("");
-    f_go_header = NewString("");
-    f_go_wrappers = NewString("");
-    f_go_directors = NewString("");
-    if (!gccgo_flag && !cgo_flag) {
-      f_gc_runtime = NewString("");
-      f_gc_header = NewString("");
-      f_gc_wrappers = NewString("");
-    }
-    if (cgo_flag) {
-      f_cgo_comment = NewString("");
-      f_cgo_comment_typedefs = NewString("");
-    }
-
-    Swig_register_filebyname("begin", f_c_begin);
-    Swig_register_filebyname("runtime", f_c_runtime);
-    Swig_register_filebyname("header", f_c_header);
-    Swig_register_filebyname("wrapper", f_c_wrappers);
-    Swig_register_filebyname("init", f_c_init);
-    Swig_register_filebyname("director", f_c_directors);
-    Swig_register_filebyname("director_h", f_c_directors_h);
-    Swig_register_filebyname("go_begin", f_go_begin);
-    Swig_register_filebyname("go_imports", f_go_imports);
-    Swig_register_filebyname("go_runtime", f_go_runtime);
-    Swig_register_filebyname("go_header", f_go_header);
-    Swig_register_filebyname("go_wrapper", f_go_wrappers);
-    Swig_register_filebyname("go_director", f_go_directors);
-    if (!gccgo_flag && !cgo_flag) {
-      Swig_register_filebyname("gc_begin", f_gc_begin);
-      Swig_register_filebyname("gc_runtime", f_gc_runtime);
-      Swig_register_filebyname("gc_header", f_gc_header);
-      Swig_register_filebyname("gc_wrapper", f_gc_wrappers);
-    }
-    if (cgo_flag) {
-      Swig_register_filebyname("cgo_comment", f_cgo_comment);
-      Swig_register_filebyname("cgo_comment_typedefs", f_cgo_comment_typedefs);
-    }
-
-    Swig_banner(f_c_begin);
-    if (CPlusPlus) {
-      Printf(f_c_begin, "\n// source: %s\n\n", swig_filename);
-    } else {
-      Printf(f_c_begin, "\n/* source: %s */\n\n", swig_filename);
-    }
-
-    Printf(f_c_runtime, "#define SWIGMODULE %s\n", module);
-    if (gccgo_flag) {
-      Printf(f_c_runtime, "#define SWIGGO_PREFIX %s\n", go_prefix);
-    }
-
-    if (directorsEnabled()) {
-      Printf(f_c_runtime, "#define SWIG_DIRECTORS\n");
-
-      Swig_banner(f_c_directors_h);
-      Printf(f_c_directors_h, "\n// source: %s\n\n", swig_filename);
-
-      Printf(f_c_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module);
-      Printf(f_c_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module);
-      Printf(f_c_directors_h, "class Swig_memory;\n\n");
-
-      Printf(f_c_directors, "\n// C++ director class methods.\n");
-      String *filename = Swig_file_filename(c_filename_h);
-      Printf(f_c_directors, "#include \"%s\"\n\n", filename);
-      Delete(filename);
-    }
-
-    Swig_banner(f_go_begin);
-    Printf(f_go_begin, "\n// source: %s\n", swig_filename);
-
-    if (!gccgo_flag && !cgo_flag && soname) {
-      Swig_banner(f_gc_begin);
-      Printf(f_gc_begin, "\n/* source: %s */\n\n", swig_filename);
-      Printf(f_gc_begin, "\n/* This file should be compiled with 6c/8c.  */\n");
-      Printf(f_gc_begin, "#pragma dynimport _ _ \"%s\"\n", soname);
-    }
-
-    if (cgo_flag) {
-      Printv(f_cgo_comment_typedefs, "/*\n", NULL);
-
-      // The cgo program defines the intgo type after our function
-      // definitions, but we want those definitions to be able to use
-      // intgo also.
-      Printv(f_cgo_comment_typedefs, "#define intgo swig_intgo\n", NULL);
-      Printv(f_cgo_comment_typedefs, "typedef void *swig_voidp;\n", NULL);
-    }
-
-    // Output module initialization code.
-
-    Printf(f_go_begin, "\npackage %s\n\n", getModuleName(package));
-
-    if (gccgo_flag && !cgo_flag) {
-      Printf(f_go_runtime, "func SwigCgocall()\n");
-      Printf(f_go_runtime, "func SwigCgocallDone()\n");
-      Printf(f_go_runtime, "func SwigCgocallBack()\n");
-      Printf(f_go_runtime, "func SwigCgocallBackDone()\n\n");
-    }
-
-    // All the C++ wrappers should be extern "C".
-
-    Printv(f_c_wrappers, "#ifdef __cplusplus\n", "extern \"C\" {\n", "#endif\n\n", NULL);
-
-    // Set up the hash table for types not defined by SWIG.
-
-    undefined_enum_types = NewHash();
-    undefined_types = NewHash();
-    defined_types = NewHash();
-    go_imports = NewHash();
-
-    // Emit code.
-
-    Language::top(n);
-
-    Delete(go_imports);
-
-    // Write out definitions for the types not defined by SWIG.
-
-    if (Len(undefined_enum_types) > 0)
-      Printv(f_go_wrappers, "\n", NULL);
-    for (Iterator p = First(undefined_enum_types); p.key; p = Next(p)) {
-      String *name = p.item;
-      Printv(f_go_wrappers, "type ", name, " int\n", NULL);
-    }
-
-    Printv(f_go_wrappers, "\n", NULL);
-    for (Iterator p = First(undefined_types); p.key; p = Next(p)) {
-      String *ty = goType(NULL, p.key);
-      if (!Getattr(defined_types, ty)) {
-	String *cp = goCPointerType(p.key, false);
-	if (!Getattr(defined_types, cp)) {
-	  Printv(f_go_wrappers, "type ", cp, " uintptr\n", NULL);
-	  Printv(f_go_wrappers, "type ", ty, " interface {\n", NULL);
-	  Printv(f_go_wrappers, "\tSwigcptr() uintptr;\n", NULL);
-	  Printv(f_go_wrappers, "}\n", NULL);
-	  Printv(f_go_wrappers, "func (p ", cp, ") Swigcptr() uintptr {\n", NULL);
-	  Printv(f_go_wrappers, "\treturn uintptr(p)\n", NULL);
-	  Printv(f_go_wrappers, "}\n\n", NULL);
-	}
-	Delete(cp);
-      }
-      Delete(ty);
-    }
-    Delete(undefined_enum_types);
-    Delete(undefined_types);
-    Delete(defined_types);
-
-    /* Write and cleanup */
-
-    Dump(f_c_header, f_c_runtime);
-
-    if (directorsEnabled()) {
-      Printf(f_c_directors_h, "#endif\n");
-      Delete(f_c_directors_h);
-      f_c_directors_h = NULL;
-
-      Dump(f_c_directors, f_c_runtime);
-      Delete(f_c_directors);
-      f_c_directors = NULL;
-    }
-
-    // End the extern "C".
-    Printv(f_c_wrappers, "#ifdef __cplusplus\n", "}\n", "#endif\n\n", NULL);
-
-    if (cgo_flag) {
-      // End the cgo comment.
-      Printv(f_cgo_comment, "#undef intgo\n", NULL);
-      Printv(f_cgo_comment, "*/\n", NULL);
-      Printv(f_cgo_comment, "import \"C\"\n", NULL);
-      Printv(f_cgo_comment, "\n", NULL);
-    }
-
-    Dump(f_c_runtime, f_c_begin);
-    Dump(f_c_wrappers, f_c_begin);
-    Dump(f_c_init, f_c_begin);
-    if (cgo_flag) {
-      Dump(f_cgo_comment_typedefs, f_go_begin);
-      Dump(f_cgo_comment, f_go_begin);
-    }
-    Dump(f_go_imports, f_go_begin);
-    Dump(f_go_header, f_go_begin);
-    Dump(f_go_runtime, f_go_begin);
-    Dump(f_go_wrappers, f_go_begin);
-    if (directorsEnabled()) {
-      Dump(f_go_directors, f_go_begin);
-    }
-    if (!gccgo_flag && !cgo_flag) {
-      Dump(f_gc_header, f_gc_begin);
-      Dump(f_gc_runtime, f_gc_begin);
-      Dump(f_gc_wrappers, f_gc_begin);
-    }
-
-    Delete(f_c_runtime);
-    Delete(f_c_header);
-    Delete(f_c_wrappers);
-    Delete(f_c_init);
-    Delete(f_go_imports);
-    Delete(f_go_runtime);
-    Delete(f_go_header);
-    Delete(f_go_wrappers);
-    Delete(f_go_directors);
-    if (!gccgo_flag && !cgo_flag) {
-      Delete(f_gc_runtime);
-      Delete(f_gc_header);
-      Delete(f_gc_wrappers);
-    }
-    if (cgo_flag) {
-      Delete(f_cgo_comment);
-      Delete(f_cgo_comment_typedefs);
-    }
-
-    Delete(f_c_begin);
-    Delete(f_go_begin);
-    if (!gccgo_flag && !cgo_flag) {
-      Delete(f_gc_begin);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * importDirective()
-   *
-   * Handle a SWIG import statement by generating a Go import
-   * statement.
-   * ------------------------------------------------------------ */
-
-  virtual int importDirective(Node *n) {
-    String *hold_import = imported_package;
-    String *modname = Getattr(n, "module");
-    if (modname) {
-      if (!Getattr(go_imports, modname)) {
-        Setattr(go_imports, modname, modname);
-        Printv(f_go_imports, "import \"", modname, "\"\n", NULL);
-      }
-      imported_package = modname;
-      saw_import = true;
-    }
-    int r = Language::importDirective(n);
-    imported_package = hold_import;
-    return r;
-  }
-
-  /* ----------------------------------------------------------------------
-   * Language::insertDirective()
-   *
-   * If the section is go_imports, store them for later.
-   * ---------------------------------------------------------------------- */
-  virtual int insertDirective(Node *n) {
-    char *section = Char(Getattr(n, "section"));
-    if ((ImportMode && !Getattr(n, "generated")) ||
-        !section || (strcmp(section, "go_imports") != 0)) {
-      return Language::insertDirective(n);
-    }
-
-    char *code = Char(Getattr(n, "code"));
-    char *pch = strtok(code, ",");
-    while (pch != NULL) {
-      // Do not import same thing more than once.
-      if (!Getattr(go_imports, pch)) {
-        Setattr(go_imports, pch, pch);
-        Printv(f_go_imports, "import ", pch, "\n", NULL);
-      }
-      pch = strtok(NULL, ",");
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * functionWrapper()
-   *
-   * Implement a function.
-   * ---------------------------------------------------------------------- */
-
-  virtual int functionWrapper(Node *n) {
-    if (GetFlag(n, "feature:ignore")) {
-      return SWIG_OK;
-    }
-
-    // We don't need explicit calls.
-    if (GetFlag(n, "explicitcall")) {
-      return SWIG_OK;
-    }
-
-    // Don't emit constructors for abstract director classes.  They
-    // will never succeed anyhow.
-    if (Swig_methodclass(n) && Swig_directorclass(n)
-	&& Strcmp(Char(Getattr(n, "wrap:action")), director_prot_ctor_code) == 0) {
-      return SWIG_OK;
-    }
-
-    String *name = Getattr(n, "sym:name");
-    String *nodetype = Getattr(n, "nodeType");
-    bool is_static = is_static_member_function || isStatic(n);
-    bool is_friend = isFriend(n);
-    bool is_ctor_dtor = false;
-
-    SwigType *result = Getattr(n, "type");
-
-    // For some reason SWIG changs the "type" value during the call to
-    // functionWrapper.  We need to remember the type for possible
-    // overload processing.
-    Setattr(n, "go:type", Copy(result));
-
-    String *go_name;
-
-    String *r1 = NULL;
-    if (making_variable_wrappers) {
-      // Change the name of the variable setter and getter functions
-      // to be more Go like.
-
-      bool is_set = Strcmp(Char(name) + Len(name) - 4, "_set") == 0;
-      assert(is_set || Strcmp(Char(name) + Len(name) - 4, "_get") == 0);
-
-      // Start with Set or Get.
-      go_name = NewString(is_set ? "Set" : "Get");
-
-      // If this is a static variable, put in the class name,
-      // capitalized.
-      if (is_static && class_name) {
-	String *ccn = exportedName(class_name);
-	Append(go_name, ccn);
-	Delete(ccn);
-      }
-
-      // Add the rest of the name, capitalized, dropping the _set or
-      // _get.
-      String *c1 = removeClassname(name);
-      String *c2 = exportedName(c1);
-      char *p = Char(c2);
-      int len = Len(p);
-      for (int i = 0; i < len - 4; ++i) {
-	Putc(p[i], go_name);
-      }
-      Delete(c2);
-      Delete(c1);
-
-      if (!checkIgnoredParameters(n, go_name)) {
-	Delete(go_name);
-	return SWIG_NOWRAP;
-      }
-    } else if (Cmp(nodetype, "constructor") == 0) {
-      is_ctor_dtor = true;
-
-      // Change the name of a constructor to be more Go like.  Change
-      // new_ to New, and capitalize the class name.
-      assert(Strncmp(name, "new_", 4) == 0);
-      String *c1 = NewString(Char(name) + 4);
-      String *c2 = exportedName(c1);
-      go_name = NewString("New");
-      Append(go_name, c2);
-      Delete(c2);
-      Delete(c1);
-
-      if (Swig_methodclass(n) && Swig_directorclass(n)) {
-	// The core SWIG code skips the first parameter when
-	// generating the $nondirector_new string.  Recreate the
-	// action in this case.  But don't it if we are using the
-	// special code for an abstract class.
-	String *call = Swig_cppconstructor_call(getClassType(),
-						Getattr(n, "parms"));
-	SwigType *type = Copy(getClassType());
-	SwigType_add_pointer(type);
-	String *cres = Swig_cresult(type, Swig_cresult_name(), call);
-	Setattr(n, "wrap:action", cres);
-      }
-    } else if (Cmp(nodetype, "destructor") == 0) {
-      // No need to emit protected destructors.
-      if (!is_public(n)) {
-	return SWIG_OK;
-      }
-
-      is_ctor_dtor = true;
-
-      // Change the name of a destructor to be more Go like.  Change
-      // delete_ to Delete and capitalize the class name.
-      assert(Strncmp(name, "delete_", 7) == 0);
-      String *c1 = NewString(Char(name) + 7);
-      String *c2 = exportedName(c1);
-      go_name = NewString("Delete");
-      Append(go_name, c2);
-      Delete(c2);
-      Delete(c1);
-
-      result = NewString("void");
-      r1 = result;
-    } else {
-      if (!checkFunctionVisibility(n, NULL)) {
-	return SWIG_OK;
-      }
-
-      go_name = buildGoName(name, is_static, is_friend);
-
-      if (!checkIgnoredParameters(n, go_name)) {
-	Delete(go_name);
-	return SWIG_NOWRAP;
-      }
-    }
-
-    String *overname = NULL;
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      String *scope;
-      if (!class_name || is_static || is_ctor_dtor) {
-	scope = NULL;
-      } else {
-	scope = NewString("swiggoscope.");
-	Append(scope, class_name);
-      }
-      if (!checkNameConflict(go_name, n, scope)) {
-	Delete(go_name);
-	return SWIG_NOWRAP;
-      }
-    }
-
-    String *wname = Swig_name_wrapper(name);
-    if (overname) {
-      Append(wname, overname);
-    }
-    Append(wname, unique_id);
-    Setattr(n, "wrap:name", wname);
-
-    ParmList *parms = Getattr(n, "parms");
-    Setattr(n, "wrap:parms", parms);
-
-    int r = makeWrappers(n, name, go_name, overname, wname, NULL, parms, result, is_static);
-    if (r != SWIG_OK) {
-      return r;
-    }
-
-    if (Getattr(n, "sym:overloaded") && !Getattr(n, "sym:nextSibling")) {
-      String *scope ;
-      if (!class_name || is_static || is_ctor_dtor) {
-	scope = NULL;
-      } else {
-	scope = NewString("swiggoscope.");
-	Append(scope, class_name);
-      }
-      if (!checkNameConflict(go_name, n, scope)) {
-	Delete(go_name);
-	return SWIG_NOWRAP;
-      }
-
-      String *receiver = class_receiver;
-      if (is_static || is_ctor_dtor) {
-	receiver = NULL;
-      }
-      r = makeDispatchFunction(n, go_name, receiver, is_static, NULL, false);
-      if (r != SWIG_OK) {
-	return r;
-      }
-    }
-
-    Delete(wname);
-    Delete(go_name);
-    Delete(r1);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   *
-   * For some reason the language code removes the "storage" attribute
-   * for a static function before calling functionWrapper, which means
-   * that we have no way of knowing whether a function is static or
-   * not.  That makes no sense in the Go context.  Here we note that a
-   * function is static.
-   * ---------------------------------------------------------------------- */
-
-  int staticmemberfunctionHandler(Node *n) {
-    assert(!is_static_member_function);
-    is_static_member_function = true;
-    int r = Language::staticmemberfunctionHandler(n);
-    is_static_member_function = false;
-    return r;
-  }
-
-  /* ----------------------------------------------------------------------
-   * makeWrappers()
-   *
-   * Write out the various function wrappers.
-   * n: The function we are emitting.
-   * name: The function name.
-   * go_name: The name of the function in Go.
-   * overname: The overload string for overloaded function.
-   * wname: The SWIG wrapped name--the name of the C function.
-   * base: A list of the names of base classes, in the case where this
-   *       is is a vritual method not defined in the current class.
-   * parms: The parameters.
-   * result: The result type.
-   * is_static: Whether this is a static method or member.
-   * ---------------------------------------------------------------------- */
-
-  int makeWrappers(Node *n, String *name, String *go_name, String *overname, String *wname, List *base, ParmList *parms, SwigType *result, bool is_static) {
-
-    assert(result);
-
-    int ret = SWIG_OK;
-
-    if (cgo_flag) {
-      int r = makeCgoWrappers(n, go_name, overname, wname, base, parms, result, is_static);
-      if (r != SWIG_OK) {
-	ret = r;
-      }
-    } else {
-      int r = goFunctionWrapper(n, name, go_name, overname, wname, base, parms, result, is_static);
-      if (r != SWIG_OK) {
-	ret = r;
-      }
-
-      if (!gccgo_flag) {
-	r = gcFunctionWrapper(wname);
-	if (r != SWIG_OK) {
-	  ret = r;
-	}
-	r = gccFunctionWrapper(n, base, wname, parms, result);
-	if (r != SWIG_OK) {
-	  ret = r;
-	}
-      } else {
-	r = gccgoFunctionWrapper(n, base, wname, parms, result);
-	if (r != SWIG_OK) {
-	  ret = r;
-	}
-      }
-    }
-
-    if (class_methods) {
-      Setattr(class_methods, Getattr(n, "name"), NewString(""));
-    }
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * struct cgoWrapperInfo
-   *
-   * Information needed by the CGO wrapper functions.
-   * ---------------------------------------------------------------------- */
-
-  struct cgoWrapperInfo {
-    // The function we are generating code for.
-    Node *n;
-    // The name of the Go function.
-    String *go_name;
-    // The overload string for an overloaded function.
-    String *overname;
-    // The name of the C wrapper function.
-    String *wname;
-    // The base classes.
-    List *base;
-    // The parameters.
-    ParmList *parms;
-    // The result type.
-    SwigType *result;
-    // Whether this is a static function, not a class method.
-    bool is_static;
-    // The Go receiver type.
-    String *receiver;
-    // Whether this is a class constructor.
-    bool is_constructor;
-    // Whether this is a class destructor.
-    bool is_destructor;
-  };
-
-  /* ----------------------------------------------------------------------
-   * makeCgoWrappers()
-   *
-   * Write out the wrappers for a function when producing cgo input
-   * files.
-   * ---------------------------------------------------------------------- */
-
-  int makeCgoWrappers(Node *n, String *go_name, String *overname, String *wname, List *base, ParmList *parms, SwigType *result, bool is_static) {
-    Swig_save("makeCgoWrappers", n, "emit:cgotype", "emit:cgotypestruct", NULL);
-
-    cgoWrapperInfo info;
-
-    info.n = n;
-    info.go_name = go_name;
-    info.overname = overname;
-    info.wname = wname;
-    info.base = base;
-    info.parms = parms;
-    info.result = result;
-    info.is_static = is_static;
-
-    info.receiver = class_receiver;
-    if (is_static) {
-      info.receiver = NULL;
-    }
-
-    String *nodetype = Getattr(n, "nodeType");
-    info.is_constructor = Cmp(nodetype, "constructor") == 0;
-    info.is_destructor = Cmp(nodetype, "destructor") == 0;
-    if (info.is_constructor || info.is_destructor) {
-      assert(class_receiver);
-      assert(!base);
-      info.receiver = NULL;
-    }
-
-    int ret = SWIG_OK;
-
-    int r = cgoGoWrapper(&info);
-    if (r != SWIG_OK) {
-      ret = r;
-    }
-
-    r = cgoCommentWrapper(&info);
-    if (r != SWIG_OK) {
-      ret = r;
-    }
-
-    r = cgoGccWrapper(&info);
-    if (r != SWIG_OK) {
-      ret = r;
-    }
-
-    Swig_restore(n);
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * cgoGoWrapper()
-   *
-   * Write out Go code to call a cgo function.  This code will go into
-   * the generated Go output file.
-   * ---------------------------------------------------------------------- */
-  int cgoGoWrapper(const cgoWrapperInfo *info) {
-
-    Wrapper *dummy = initGoTypemaps(info->parms);
-
-    bool add_to_interface = interfaces && !info->is_constructor && !info->is_destructor && !info->is_static && !info->overname && checkFunctionVisibility(info->n, NULL);
-
-    Printv(f_go_wrappers, "func ", NULL);
-
-    Parm *p = info->parms;
-    int pi = 0;
-
-    // Add the receiver first if this is a method.
-    if (info->receiver) {
-      Printv(f_go_wrappers, "(", NULL);
-      if (info->base && info->receiver) {
-	Printv(f_go_wrappers, "_swig_base", NULL);
-      } else {
-	Printv(f_go_wrappers, Getattr(p, "lname"), NULL);
-	p = nextParm(p);
-	++pi;
-      }
-      Printv(f_go_wrappers, " ", info->receiver, ") ", NULL);
-    }
-
-    Printv(f_go_wrappers, info->go_name, NULL);
-    if (info->overname) {
-      Printv(f_go_wrappers, info->overname, NULL);
-    }
-    Printv(f_go_wrappers, "(", NULL);
-
-    // If we are doing methods, add this method to the interface.
-    if (add_to_interface) {
-      Printv(interfaces, "\t", info->go_name, "(", NULL);
-    }
-
-    // Write out the parameters to both the function definition and
-    // the interface.
-
-    String *parm_print = NewString("");
-
-    int parm_count = emit_num_arguments(info->parms);
-    int required_count = emit_num_required(info->parms);
-    int args = 0;
-
-    for (; pi < parm_count; ++pi) {
-      p = getParm(p);
-      if (pi == 0 && info->is_destructor) {
-	String *cl = exportedName(class_name);
-	Printv(parm_print, Getattr(p, "lname"), " ", cl, NULL);
-	Delete(cl);
-	++args;
-      } else {
-	if (args > 0) {
-	  Printv(parm_print, ", ", NULL);
-	}
-	++args;
-	if (pi >= required_count) {
-	  Printv(parm_print, "_swig_args ...interface{}", NULL);
-	  break;
-	}
-	Printv(parm_print, Getattr(p, "lname"), " ", NULL);
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(parm_print, tm, NULL);
-	Delete(tm);
-      }
-      p = nextParm(p);
-    }
-
-    Printv(parm_print, ")", NULL);
-
-    // Write out the result type.
-    if (info->is_constructor) {
-      String *cl = exportedName(class_name);
-      Printv(parm_print, " (_swig_ret ", cl, ")", NULL);
-      Delete(cl);
-    } else {
-      if (SwigType_type(info->result) != T_VOID) {
-	String *tm = goType(info->n, info->result);
-	Printv(parm_print, " (_swig_ret ", tm, ")", NULL);
-	Delete(tm);
-      }
-    }
-
-    Printv(f_go_wrappers, parm_print, NULL);
-    if (add_to_interface) {
-      Printv(interfaces, parm_print, "\n", NULL);
-    }
-
-    // Write out the function body.
-
-    Printv(f_go_wrappers, " {\n", NULL);
-
-    if (parm_count > required_count) {
-      Parm *p = info->parms;
-      int i;
-      for (i = 0; i < required_count; ++i) {
-	p = getParm(p);
-	p = nextParm(p);
-      }
-      for (; i < parm_count; ++i) {
-	p = getParm(p);
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(f_go_wrappers, "\tvar ", Getattr(p, "lname"), " ", tm, "\n", NULL);
-	Printf(f_go_wrappers, "\tif len(_swig_args) > %d {\n", i - required_count);
-	Printf(f_go_wrappers, "\t\t%s = _swig_args[%d].(%s)\n", Getattr(p, "lname"), i - required_count, tm);
-	Printv(f_go_wrappers, "\t}\n", NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-    }
-
-    String *call = NewString("\t");
-
-    String *ret_type = NULL;
-    bool memcpy_ret = false;
-    String *wt = NULL;
-    if (SwigType_type(info->result) != T_VOID) {
-      if (info->is_constructor) {
-	ret_type = exportedName(class_name);
-      } else {
-	ret_type = goImType(info->n, info->result);
-      }
-      Printv(f_go_wrappers, "\tvar swig_r ", ret_type, "\n", NULL);
-
-      bool c_struct_type;
-      Delete(cgoTypeForGoValue(info->n, info->result, &c_struct_type));
-      if (c_struct_type) {
-	memcpy_ret = true;
-      }
-
-      if (memcpy_ret) {
-	Printv(call, "swig_r_p := ", NULL);
-      } else {
-	Printv(call, "swig_r = (", ret_type, ")(", NULL);
-      }
-
-      if (info->is_constructor || goTypeIsInterface(info->n, info->result)) {
-	if (info->is_constructor) {
-	  wt = Copy(class_receiver);
-	} else {
-	  wt = goWrapperType(info->n, info->result, true);
-	}
-	Printv(call, wt, "(", NULL);
-      }
-    }
-
-    Printv(call, "C.", info->wname, "(", NULL);
-
-    args = 0;
-
-    if (parm_count > required_count) {
-      Printv(call, "C.swig_intgo(len(_swig_args))", NULL);
-      ++args;
-    }
-
-    if (info->base && info->receiver) {
-      if (args > 0) {
-	Printv(call, ", ", NULL);
-      }
-      ++args;
-      Printv(call, "C.uintptr_t(_swig_base)", NULL);
-    }
-
-    p = info->parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      if (args > 0) {
-	Printv(call, ", ", NULL);
-      }
-      ++args;
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-
-      String *ivar = NewStringf("_swig_i_%d", i);
-
-      String *goin = goGetattr(p, "tmap:goin");
-      if (goin == NULL) {
-	Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
-	if ((i == 0 && info->is_destructor) || ((i > 0 || !info->receiver || info->base || info->is_constructor) && goTypeIsInterface(p, pt))) {
-	  Printv(f_go_wrappers, ".Swigcptr()", NULL);
-	}
-	Printv(f_go_wrappers, "\n", NULL);
-	Setattr(p, "emit:goinput", ln);
-      } else {
-	String *itm = goImType(p, pt);
-	Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
-	goin = Copy(goin);
-	Replaceall(goin, "$input", ln);
-	Replaceall(goin, "$result", ivar);
-	Printv(f_go_wrappers, goin, "\n", NULL);
-	Delete(goin);
-	Setattr(p, "emit:goinput", ivar);
-      }
-
-      bool c_struct_type;
-      String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
-      if (c_struct_type) {
-	Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
-      } else {
-	Printv(call, "C.", ct, "(", ivar, ")", NULL);
-      }
-      Delete(ct);
-
-      p = nextParm(p);
-    }
-
-    Printv(f_go_wrappers, call, ")", NULL);
-    Delete(call);
-
-    if (wt) {
-      // Close the type conversion to the wrapper type.
-      Printv(f_go_wrappers, ")", NULL);
-    }
-    if (SwigType_type(info->result) != T_VOID && !memcpy_ret) {
-      // Close the type conversion of the return value.
-      Printv(f_go_wrappers, ")", NULL);
-    }
-
-    Printv(f_go_wrappers, "\n", NULL);
-
-    if (memcpy_ret) {
-      Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
-    }
-    if (ret_type) {
-      Delete(ret_type);
-    }
-
-    goargout(info->parms);
-
-    if (SwigType_type(info->result) != T_VOID) {
-
-      Swig_save("cgoGoWrapper", info->n, "type", "tmap:goout", NULL);
-      Setattr(info->n, "type", info->result);
-
-      String *goout = goTypemapLookup("goout", info->n, "swig_r");
-      if (goout == NULL) {
-	Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
-      } else {
-	String *tm = goType(info->n, info->result);
-	Printv(f_go_wrappers, "\tvar swig_r_1 ", tm, "\n", NULL);
-	goout = Copy(goout);
-	Replaceall(goout, "$input", "swig_r");
-	Replaceall(goout, "$result", "swig_r_1");
-	Printv(f_go_wrappers, goout, "\n", NULL);
-	Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
-      }
-
-      Swig_restore(info->n);
-    }
-
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    DelWrapper(dummy);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * cgoCommentWrapper()
-   *
-   * Write out a cgo function to call a C/C++ function.  This code
-   * will go into the cgo comment in the generated Go output file.
-   * ---------------------------------------------------------------------- */
-  int cgoCommentWrapper(const cgoWrapperInfo *info) {
-    String *ret_type;
-    if (SwigType_type(info->result) == T_VOID) {
-      ret_type = NewString("void");
-    } else {
-      bool c_struct_type;
-      ret_type = cgoTypeForGoValue(info->n, info->result, &c_struct_type);
-    }
-
-    Printv(f_cgo_comment, "extern ", ret_type, " ", info->wname, "(", NULL);
-
-    Delete(ret_type);
-
-    int parm_count = emit_num_arguments(info->parms);
-    int required_count = emit_num_required(info->parms);
-    int args = 0;
-
-    if (parm_count > required_count) {
-      Printv(f_cgo_comment, "intgo _swig_args", NULL);
-      ++args;
-    }
-
-    if (info->base && info->receiver) {
-      if (args > 0) {
-	Printv(f_cgo_comment, ", ", NULL);
-      }
-      ++args;
-      Printv(f_cgo_comment, "uintptr_t _swig_base", NULL);
-    }
-
-    Parm *p = info->parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      if (args > 0) {
-	Printv(f_cgo_comment, ", ", NULL);
-      }
-      ++args;
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-
-      bool c_struct_type;
-      String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
-      Printv(f_cgo_comment, ct, " ", ln, NULL);
-      Delete(ct);
-
-      p = nextParm(p);
-    }
-
-    if (args == 0) {
-      Printv(f_cgo_comment, "void", NULL);
-    }
-
-    Printv(f_cgo_comment, ");\n", NULL);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * cgoGccWrapper()
-   *
-   * Write out code to the C/C++ wrapper file.  This code will be
-   * called by the code generated by cgoCommentWrapper.
-   * ---------------------------------------------------------------------- */
-  int cgoGccWrapper(const cgoWrapperInfo *info) {
-    Wrapper *f = NewWrapper();
-
-    Swig_save("cgoGccWrapper", info->n, "parms", NULL);
-
-    ParmList *parms = info->parms;
-
-    Parm *base_parm = NULL;
-    if (info->base && !isStatic(info->n)) {
-      SwigType *base_type = Copy(getClassType());
-      SwigType_add_pointer(base_type);
-      base_parm = NewParm(base_type, NewString("arg1"), info->n);
-      set_nextSibling(base_parm, parms);
-      parms = base_parm;
-    }
-
-    emit_parameter_variables(parms, f);
-    emit_attach_parmmaps(parms, f);
-    int parm_count = emit_num_arguments(parms);
-    int required_count = emit_num_required(parms);
-
-    emit_return_variable(info->n, info->result, f);
-
-    // Start the function definition.
-
-    String *fnname = NewString("");
-    Printv(fnname, info->wname, "(", NULL);
-
-    int args = 0;
-
-    if (parm_count > required_count) {
-      Printv(fnname, "intgo _swig_optargc", NULL);
-      ++args;
-    }
-
-    Parm *p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      if (args > 0) {
-	Printv(fnname, ", ", NULL);
-      }
-      ++args;
-
-      p = getParm(p);
-
-      SwigType *pt = Copy(Getattr(p, "type"));
-      if (SwigType_isarray(pt)) {
-	SwigType_del_array(pt);
-	SwigType_add_pointer(pt);
-      }
-      String *pn = NewStringf("_swig_go_%d", i);
-      String *ct = gcCTypeForGoValue(p, pt, pn);
-      Printv(fnname, ct, NULL);
-      Delete(ct);
-      Delete(pn);
-      Delete(pt);
-
-      p = nextParm(p);
-    }
-      
-    Printv(fnname, ")", NULL);
-
-    if (SwigType_type(info->result) == T_VOID) {
-      Printv(f->def, "void ", fnname, NULL);
-    } else {
-      String *ct = gcCTypeForGoValue(info->n, info->result, fnname);
-      Printv(f->def, ct, NULL);
-      Delete(ct);
-
-      String *ln = NewString("_swig_go_result");
-      ct = gcCTypeForGoValue(info->n, info->result, ln);
-      Wrapper_add_local(f, "_swig_go_result", ct);
-      Delete(ct);
-      Delete(ln);
-    }
-
-    Delete(fnname);
-
-    Printv(f->def, " {\n", NULL);
-
-    // Apply the in typemaps.
-
-    p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      String *tm = Getattr(p, "tmap:in");
-      if (!tm) {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "unable to use type %s as a function argument\n", SwigType_str(Getattr(p, "type"), 0));
-      } else {
-	tm = Copy(tm);
-	String *pn = NewStringf("_swig_go_%d", i);
-	Replaceall(tm, "$input", pn);
-	if (i < required_count) {
-	  Printv(f->code, "\t", tm, "\n", NULL);
-	} else {
-	  Printf(f->code, "\tif (_swig_optargc > %d) {\n", i - required_count);
-	  Printv(f->code, "\t\t", tm, "\n", NULL);
-	  Printv(f->code, "\t}\n", NULL);
-	}
-	Delete(tm);
-	Setattr(p, "emit:input", pn);
-      }
-      p = nextParm(p);
-    }
-
-    Printv(f->code, "\n", NULL);
-
-    // Do the real work of the function.
-
-    checkConstraints(parms, f);
-
-    emitGoAction(info->n, info->base, parms, info->result, f);
-
-    argout(parms, f);
-
-    cleanupFunction(info->n, f, parms);
-
-    if (SwigType_type(info->result) != T_VOID) {
-      Printv(f->code, "\treturn _swig_go_result;\n", NULL);
-    }
-
-    Printv(f->code, "}\n", NULL);
-
-    Wrapper_print(f, f_c_wrappers);
-
-    Swig_restore(info->n);
-
-    DelWrapper(f);
-    if (base_parm) {
-      Delete(base_parm);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * goFunctionWrapper()
-   *
-   * Write out a function wrapper in Go.  When not implementing a
-   * method, the actual code is all in C; here we just declare the C
-   * function.  When implementing a method, we have to call the C
-   * function, because it will have a different name.  If base is not
-   * NULL, then we are being called to forward a virtual method to a
-   * base class.
-   * ---------------------------------------------------------------------- */
-
-  int goFunctionWrapper(Node *n, String *name, String *go_name, String *overname, String *wname, List *base, ParmList *parms, SwigType *result, bool is_static) {
-    Wrapper *dummy = initGoTypemaps(parms);
-
-    int parm_count = emit_num_arguments(parms);
-    int required_count = emit_num_required(parms);
-
-    String *receiver = class_receiver;
-    if (receiver && is_static) {
-      receiver = NULL;
-    }
-
-    String *nodetype = Getattr(n, "nodeType");
-    bool is_constructor = Cmp(nodetype, "constructor") == 0;
-    bool is_destructor = Cmp(nodetype, "destructor") == 0;
-    if (is_constructor || is_destructor) {
-      assert(class_receiver);
-      assert(!base);
-      receiver = NULL;
-    }
-
-    Swig_save("cgoGoWrapper", n, "type", "tmap:goout", NULL);
-    Setattr(n, "type", result);
-
-    String *goout = goTypemapLookup("goout", n, "swig_r");
-
-    Swig_restore(n);
-
-    bool add_to_interface = (interfaces && !is_constructor && !is_destructor && !is_static && !overname && checkFunctionVisibility(n, NULL));
-
-    bool needs_wrapper = (gccgo_flag || receiver || is_constructor || is_destructor || parm_count > required_count);
-
-    bool has_goout = false;
-    if (goout) {
-      has_goout = true;
-    }
-
-    // See whether any of the function parameters are represented by
-    // interface values.  When calling the C++ code, we need to convert
-    // back to a uintptr.
-    Parm *p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      String *ty = Getattr(p, "type");
-      if (goGetattr(p, "tmap:goargout")) {
-	has_goout = true;
-	needs_wrapper = true;
-      } else if (goTypeIsInterface(p, ty) || goGetattr(p, "tmap:goin")) {
-	needs_wrapper = true;
-      }
-
-      if (paramNeedsEscape(p)) {
-	needs_wrapper = true;
-      }
-
-      p = nextParm(p);
-    }
-    if (goTypeIsInterface(n, result) || goout != NULL) {
-      needs_wrapper = true;
-    }
-
-    if (!gccgo_flag) {
-      Printv(f_go_wrappers, "var ", wname, " unsafe.Pointer\n\n", NULL);
-    }
-
-    // If this is a method, first declare the C function we will call.
-    // If we do not need a wrapper, then we will only be writing a
-    // declaration.
-    String *wrapper_name = NULL;
-    if (needs_wrapper) {
-      wrapper_name = buildGoWrapperName(name, overname);
-
-      if (gccgo_flag) {
-	Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL);
-      }
-
-      bool arg = false;
-      Printv(f_go_wrappers, "func ", wrapper_name, "(", NULL);
-      if (parm_count > required_count) {
-	Printv(f_go_wrappers, argName(&arg), " int", NULL);
-      }
-      Parm *p = getParm(parms);
-      int i = 0;
-      if (is_destructor) {
-	if (parm_count > required_count) {
-	  Printv(f_go_wrappers, ", ", NULL);
-	}
-	Printv(f_go_wrappers, argName(&arg), " uintptr", NULL);
-	++i;
-	p = nextParm(p);
-      } else if (receiver && (base || !is_constructor)) {
-	if (parm_count > required_count) {
-	  Printv(f_go_wrappers, ", ", NULL);
-	}
-	Printv(f_go_wrappers, argName(&arg), " ", receiver, NULL);
-	if (!base) {
-	  ++i;
-	  p = nextParm(p);
-	}
-      }
-      for (; i < parm_count; ++i) {
-	p = getParm(p);
-	if (i > 0 || (base && receiver) || parm_count > required_count) {
-	  Printv(f_go_wrappers, ", ", NULL);
-	}
-	String *tm = goWrapperType(p, Getattr(p, "type"), false);
-	Printv(f_go_wrappers, argName(&arg), " ", tm, NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-      Printv(f_go_wrappers, ")", NULL);
-      if (is_constructor) {
-	Printv(f_go_wrappers, " (", argName(&arg), " ", class_receiver, ")", NULL);
-      } else {
-	if (SwigType_type(result) != T_VOID) {
-	  String *tm = goWrapperType(n, result, true);
-	  Printv(f_go_wrappers, " (", argName(&arg), " ", tm, ")", NULL);
-	  Delete(tm);
-	}
-      }
-
-      if (!gccgo_flag) {
-	Printv(f_go_wrappers, " {\n", NULL);
-	if (arg) {
-	  Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&base))\n", NULL);
-	} else {
-	  Printv(f_go_wrappers, "\tvar _swig_p uintptr\n", NULL);
-	}
-	Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", wname, ", _swig_p)\n", NULL);
-	Printv(f_go_wrappers, "\treturn\n", NULL);
-	Printv(f_go_wrappers, "}", NULL);
-      }
-
-      Printv(f_go_wrappers, "\n\n", NULL);
-    }
-
-    // Start defining the Go function.
-
-    if (!needs_wrapper && gccgo_flag) {
-      Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL);
-    }
-
-    Printv(f_go_wrappers, "func ", NULL);
-
-    p = parms;
-    int pi = 0;
-
-    // Add the receiver if this is a method.
-    String *first = NULL;
-    if (receiver) {
-      Printv(f_go_wrappers, "(", NULL);
-      if (base && receiver) {
-	Printv(f_go_wrappers, "_swig_base", NULL);
-	if (first == NULL) {
-	  first = NewString("_swig_base");
-	}
-      } else {
-	Printv(f_go_wrappers, Getattr(p, "lname"), NULL);
-	if (first == NULL) {
-	  first = Copy(Getattr(p, "lname"));
-	}
-	p = nextParm(p);
-	++pi;
-      }
-      Printv(f_go_wrappers, " ", receiver, ") ", NULL);
-    }
-
-    Printv(f_go_wrappers, go_name, NULL);
-    if (overname) {
-      Printv(f_go_wrappers, overname, NULL);
-    }
-    Printv(f_go_wrappers, "(", NULL);
-
-    // If we are doing methods, add this function to the interface.
-    if (add_to_interface) {
-      Printv(interfaces, "\t", go_name, "(", NULL);
-    }
-
-    // Write out the parameters to both the function definition and
-    // the interface.
-
-    String *parm_print = NewString("");
-
-    for (; pi < parm_count; ++pi) {
-      p = getParm(p);
-      if (pi == 0 && is_destructor) {
-	String *cl = exportedName(class_name);
-	Printv(parm_print, Getattr(p, "lname"), " ", cl, NULL);
-	if (first == NULL) {
-	  first = Copy(Getattr(p, "lname"));
-	}
-	Delete(cl);
-      } else {
-	if (pi > (receiver && !base ? 1 : 0)) {
-	  Printv(parm_print, ", ", NULL);
-	}
-	if (pi >= required_count) {
-	  Printv(parm_print, "_swig_args ...interface{}", NULL);
-	  if (first == NULL) {
-	    first = NewString("_swig_args");
-	  }
-	  break;
-	}
-	Printv(parm_print, Getattr(p, "lname"), " ", NULL);
-	if (first == NULL) {
-	  first = Copy(Getattr(p, "lname"));
-	}
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(parm_print, tm, NULL);
-	Delete(tm);
-      }
-      p = nextParm(p);
-    }
-
-    Printv(parm_print, ")", NULL);
-
-    // Write out the result type.
-    if (is_constructor) {
-      String *cl = exportedName(class_name);
-      Printv(parm_print, " (_swig_ret ", cl, ")", NULL);
-      if (first == NULL) {
-	first = NewString("_swig_ret");
-      }
-      Delete(cl);
-    } else {
-      if (SwigType_type(result) != T_VOID) {
-	String *tm = goType(n, result);
-	Printv(parm_print, " (_swig_ret ", tm, ")", NULL);
-	if (first == NULL) {
-	  first = NewString("_swig_ret");
-	}
-	Delete(tm);
-      }
-    }
-
-    Printv(f_go_wrappers, parm_print, NULL);
-    if (add_to_interface) {
-      Printv(interfaces, parm_print, "\n", NULL);
-    }
-
-    // If this is a wrapper, we need to actually call the C function.
-    if (needs_wrapper) {
-      Printv(f_go_wrappers, " {\n", NULL);
-
-      if (parm_count > required_count) {
-	Parm *p = parms;
-	int i;
-	for (i = 0; i < required_count; ++i) {
-	  p = getParm(p);
-	  p = nextParm(p);
-	}
-	for (; i < parm_count; ++i) {
-	  p = getParm(p);
-	  String *tm = goType(p, Getattr(p, "type"));
-	  Printv(f_go_wrappers, "\tvar ", Getattr(p, "lname"), " ", tm, "\n", NULL);
-	  Printf(f_go_wrappers, "\tif len(_swig_args) > %d {\n", i - required_count);
-	  Printf(f_go_wrappers, "\t\t%s = _swig_args[%d].(%s)\n", Getattr(p, "lname"), i - required_count, tm);
-	  Printv(f_go_wrappers, "\t}\n", NULL);
-	  Delete(tm);
-	  p = nextParm(p);
-	}
-      }
-
-      String *call = NewString("");
-
-      bool need_return_var = SwigType_type(result) != T_VOID && ((gccgo_flag && is_constructor) || has_goout);
-      if (need_return_var) {
-	Printv(f_go_wrappers, "\tvar swig_r ", NULL);
-	if (is_constructor) {
-	  String *cl = exportedName(class_name);
-	  Printv(f_go_wrappers, cl, NULL);
-	  Delete(cl);
-	} else {
-	  Printv(f_go_wrappers, goImType(n, result), NULL);
-	}
-	Printv(f_go_wrappers, "\n", NULL);
-      }
-
-      if (gccgo_flag) {
-	if (has_goout || is_constructor) {
-	  Printv(call, "\tfunc() {\n", NULL);
-	}
-	Printv(call, "\tdefer SwigCgocallDone()\n", NULL);
-	Printv(call, "\tSwigCgocall()\n", NULL);
-      }
-
-      Printv(call, "\t", NULL);
-      if (SwigType_type(result) != T_VOID) {
-	if (need_return_var) {
-	  Printv(call, "swig_r = ", NULL);
-	} else {
-	  Printv(call, "return ", NULL);
-	}
-      }
-
-      Printv(call, wrapper_name, "(", NULL);
-
-      if (parm_count > required_count) {
-	Printv(call, "len(_swig_args)", NULL);
-      }
-
-      if (base && receiver) {
-	if (parm_count > required_count) {
-	  Printv(call, ", ", NULL);
-	}
-	Printv(call, "_swig_base", NULL);
-      }
-
-      Parm *p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	if (i > 0 || (base && receiver)
-	    || parm_count > required_count) {
-	  Printv(call, ", ", NULL);
-	}
-
-	SwigType *pt = Getattr(p, "type");
-	String *ln = Getattr(p, "lname");
-
-	String *goin = goGetattr(p, "tmap:goin");
-	if (goin == NULL) {
-	  Printv(call, ln, NULL);
-	  if ((i == 0 && is_destructor) || ((i > 0 || !receiver || base || is_constructor) && goTypeIsInterface(p, pt))) {
-	    Printv(call, ".Swigcptr()", NULL);
-	  }
-	  Setattr(p, "emit:goinput", ln);
-	} else {
-	  String *ivar = NewString("");
-	  Printf(ivar, "_swig_i_%d", i);
-	  String *itm = goImType(p, pt);
-	  Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
-	  goin = Copy(goin);
-	  Replaceall(goin, "$input", ln);
-	  Replaceall(goin, "$result", ivar);
-	  Printv(f_go_wrappers, goin, "\n", NULL);
-	  Delete(goin);
-	  Printv(call, ivar, NULL);
-	  Setattr(p, "emit:goinput", ivar);
-	}
-
-	// If the parameter has an argout or freearg typemap, make
-	// sure that it escapes.
-	if (paramNeedsEscape(p)) {
-	  Printv(f_go_wrappers, "\tif Swig_escape_always_false {\n", NULL);
-	  Printv(f_go_wrappers, "\t\tSwig_escape_val = ", Getattr(p, "emit:goinput"), "\n", NULL);
-	  Printv(f_go_wrappers, "\t}\n", NULL);
-	}
-
-	p = nextParm(p);
-      }
-      Printv(call, ")\n", NULL);
-
-      if (gccgo_flag && (has_goout || is_constructor)) {
-	Printv(call, "\t}()\n", NULL);
-      }
-
-      Printv(f_go_wrappers, call, NULL);
-      Delete(call);
-
-      goargout(parms);
-
-      if (need_return_var) {
-	if (goout == NULL) {
-	  Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
-	} else {
-	  String *tm = goType(n, result);
-	  Printv(f_go_wrappers, "\tvar swig_r_1 ", tm, "\n", NULL);
-	  Replaceall(goout, "$input", "swig_r");
-	  Replaceall(goout, "$result", "swig_r_1");
-	  Printv(f_go_wrappers, goout, "\n", NULL);
-	  Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
-	}
-      }
-
-      Printv(f_go_wrappers, "}\n", NULL);
-    } else if (!gccgo_flag) {
-      // We don't need a wrapper.  If we're using gccgo, the function
-      // declaration is all we need--it has a //extern comment to
-      // GCC-compiled wrapper.  If we're not using gccgo, we need to
-      // call the GCC-compiled wrapper here.
-      Printv(f_go_wrappers, " {\n", NULL);
-      if (first == NULL) {
-	Printv(f_go_wrappers, "\tvar _swig_p uintptr\n", NULL);
-      } else {
-	Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&", first, "))\n", NULL);
-      }
-      Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", wname, ", _swig_p)\n", NULL);
-      Printv(f_go_wrappers, "\treturn\n", NULL);
-      Printv(f_go_wrappers, "}", NULL);
-    }
-
-    Printv(f_go_wrappers, "\n", NULL);
-
-    Delete(wrapper_name);
-    DelWrapper(dummy);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * initGoTypemaps()
-   *
-   * Initialize the typenames for a Go wrapper, returning a dummy
-   * Wrapper*.  Also set consistent names for the parameters.
-   * ---------------------------------------------------------------------- */
-
-  Wrapper* initGoTypemaps(ParmList *parms) {
-    Wrapper *dummy = NewWrapper();
-    emit_attach_parmmaps(parms, dummy);
-
-    Parm *p = parms;
-    int parm_count = emit_num_arguments(parms);
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      Swig_cparm_name(p, i);
-      p = nextParm(p);
-    }
-
-    Swig_typemap_attach_parms("default", parms, dummy);
-    Swig_typemap_attach_parms("gotype", parms, dummy);
-    Swig_typemap_attach_parms("goin", parms, dummy);
-    Swig_typemap_attach_parms("goargout", parms, dummy);
-    Swig_typemap_attach_parms("imtype", parms, dummy);
-
-    return dummy;
-  }
-
-  /* ----------------------------------------------------------------------
-   * argName()
-   *
-   * A helper for goFunctionWrapper to output the first argument name
-   * as "base" and all others as "_".
-   * ---------------------------------------------------------------------- */
-
-  const char *argName(bool *arg) {
-    if (*arg) {
-      return "_";
-    }
-    *arg = true;
-    return "base";
-  }
-
-  /* ----------------------------------------------------------------------
-   * paramNeedsEscape()
-   *
-   * A helper for goFunctionWrapper that returns whether a parameter
-   * needs to explicitly escape.  This is true if the parameter has a
-   * non-empty argout or freearg typemap, because in those cases the
-   * Go argument might be or contain a pointer.  We need to ensure
-   * that that pointer does not point into the stack, which means that
-   * it needs to escape.
-   * ---------------------------------------------------------------------- */
-  bool paramNeedsEscape(Parm *p) {
-    String *argout = Getattr(p, "tmap:argout");
-    String *freearg = Getattr(p, "tmap:freearg");
-    if ((!argout || Len(argout) == 0) && (!freearg || Len(freearg) == 0)) {
-      return false;
-    }
-    // If a C++ type is represented as an interface type in Go, then
-    // we don't care whether it escapes, because we know that the
-    // pointer is a C++ pointer.
-    if (goTypeIsInterface(p, Getattr(p, "type"))) {
-      return false;
-    }
-    return true;
-  }
-
-  /* ----------------------------------------------------------------------
-   * gcFunctionWrapper()
-   *
-   * This is used for 6g/8g, not for gccgo.  Write out the function
-   * redirector that will be compiled with 6c/8c.  This used to write
-   * out a real function wrapper, but that has moved into Go code.
-   * ---------------------------------------------------------------------- */
-
-  int gcFunctionWrapper(String *wname) {
-    Wrapper *f = NewWrapper();
-
-    Printv(f->def, "#pragma dynimport ", wname, " ", wname, " \"\"\n", NULL);
-    Printv(f->def, "#pragma cgo_import_static ", wname, "\n", NULL);
-    Printv(f->def, "extern void ", wname, "(void*);\n", NULL);
-    // Declare this as a uintptr, since it is not a pointer into the
-    // Go heap.
-    // \xc2\xb7 is UTF-8 for U+00B7 which is Unicode 'Middle Dot'
-    Printv(f->def, "uintptr \xc2\xb7", wname, " = (uintptr)", wname, ";\n", NULL);
-
-    Wrapper_print(f, f_gc_wrappers);
-
-    DelWrapper(f);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * gccFunctionWrapper()
-   *
-   * This is used for 6g/8g, not for gccgo.  Write out the function
-   * wrapper which will be compiled with gcc.  If the base parameter
-   * is not NULL, this is calls the base class method rather than
-   * executing the SWIG wrapper code.
-   * ---------------------------------------------------------------------- */
-
-  int gccFunctionWrapper(Node *n, List *base, String *wname, ParmList *parms, SwigType *result) {
-    Wrapper *f = NewWrapper();
-
-    Swig_save("gccFunctionWrapper", n, "parms", NULL);
-
-    Parm *base_parm = NULL;
-    if (base && !isStatic(n)) {
-      SwigType *base_type = Copy(getClassType());
-      SwigType_add_pointer(base_type);
-      base_parm = NewParm(base_type, NewString("arg1"), n);
-      set_nextSibling(base_parm, parms);
-      parms = base_parm;
-    }
-
-    emit_parameter_variables(parms, f);
-    emit_attach_parmmaps(parms, f);
-    int parm_count = emit_num_arguments(parms);
-    int required_count = emit_num_required(parms);
-    bool needs_swigargs = false;
-
-    emit_return_variable(n, result, f);
-
-    // Start the function definition.
-
-    Printv(f->def, "void\n", wname, "(void *swig_v)\n", "{\n", NULL);
-
-    // The single function parameter is a pointer to the real argument
-    // values.  Define the structure that it points to.
-
-    String *swigargs = NewString("\tstruct swigargs {\n");
-
-    if (parm_count > required_count) {
-      needs_swigargs = true;
-      Printv(swigargs, "\t\tintgo _swig_optargc;\n", NULL);
-    }
-
-    Parm *p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-
-      String *ln = Getattr(p, "lname");
-      SwigType *pt = Getattr(p, "type");
-      String *ct = gcCTypeForGoValue(p, pt, ln);
-      Printv(swigargs, "\t\t\t", ct, ";\n", NULL);
-      needs_swigargs = true;
-      Delete(ct);
-
-      String *gn = NewStringf("_swig_go_%d", i);
-      ct = gcCTypeForGoValue(p, pt, gn);
-      Setattr(p, "emit:input", gn);
-      Wrapper_add_local(f, gn, ct);
-      Delete(ct);
-
-      p = nextParm(p);
-    }
-    if (SwigType_type(result) != T_VOID) {
-      Printv(swigargs, "\t\tlong : 0;\n", NULL);
-      String *ln = NewString(Swig_cresult_name());
-      String *ct = gcCTypeForGoValue(n, result, ln);
-      Delete(ln);
-      Printv(swigargs, "\t\t", ct, ";\n", NULL);
-      needs_swigargs = true;
-      Delete(ct);
-
-      ln = NewString("_swig_go_result");
-      ct = gcCTypeForGoValue(n, result, ln);
-      Wrapper_add_local(f, "_swig_go_result", ct);
-      Delete(ct);
-      Delete(ln);
-    }
-    Printv(swigargs, "\t} SWIGSTRUCTPACKED *swig_a = (struct swigargs *) swig_v;\n", NULL);
-
-    // Copy the input arguments out of the structure into the Go local
-    // variables.
-    p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      String *ln = Getattr(p, "lname");
-      String *gn = Getattr(p, "emit:input");
-      Printv(f->code, "\t", gn, " = swig_a->", ln, ";\n", NULL);
-      p = nextParm(p);
-    }
-
-    // Apply the in typemaps.
-    p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      String *tm = Getattr(p, "tmap:in");
-      if (!tm) {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument\n", SwigType_str(Getattr(p, "type"), 0));
-      } else {
-	tm = Copy(tm);
-	String *gn = Getattr(p, "emit:input");
-	Replaceall(tm, "$input", gn);
-	if (i < required_count) {
-	  Printv(f->code, "\t", tm, "\n", NULL);
-	} else {
-	  Printf(f->code, "\tif (swig_a->_swig_optargc > %d) {\n", i - required_count);
-	  Printv(f->code, "\t\t", tm, "\n", NULL);
-	  Printv(f->code, "\t}\n", NULL);
-	}
-	Delete(tm);
-      }
-      p = nextParm(p);
-    }
-
-    Printv(f->code, "\n", NULL);
-
-    // Do the real work of the function.
-
-    checkConstraints(parms, f);
-
-    emitGoAction(n, base, parms, result, f);
-
-    argout(parms, f);
-
-    cleanupFunction(n, f, parms);
-
-    if (needs_swigargs)
-    {
-      Printv(f->locals, swigargs, NULL);
-    }
-
-    Printv(f->code, "}\n", NULL);
-
-    Wrapper_print(f, f_c_wrappers);
-
-    Swig_restore(n);
-
-    Delete(swigargs);
-    DelWrapper(f);
-    Delete(base_parm);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * gccgoFunctionWrapper()
-   *
-   * This is used for gccgo, not 6g/8g.  Write out the function
-   * wrapper which will be compiled with gcc.  If the base parameter
-   * is not NULL, this is calls the base class method rather than
-   * executing the SWIG wrapper code.
-   * ---------------------------------------------------------------------- */
-
-  int gccgoFunctionWrapper(Node *n, List *base, String *wname, ParmList *parms, SwigType *result) {
-    Wrapper *f = NewWrapper();
-
-    Swig_save("gccgoFunctionWrapper", n, "parms", NULL);
-
-    Parm *base_parm = NULL;
-    if (base && !isStatic(n)) {
-      SwigType *base_type = Copy(getClassType());
-      SwigType_add_pointer(base_type);
-      base_parm = NewParm(base_type, NewString("arg1"), n);
-      set_nextSibling(base_parm, parms);
-      parms = base_parm;
-    }
-
-    emit_parameter_variables(parms, f);
-    emit_attach_parmmaps(parms, f);
-    int parm_count = emit_num_arguments(parms);
-    int required_count = emit_num_required(parms);
-
-    emit_return_variable(n, result, f);
-
-    // Start the function definition.
-
-    String *fnname = NewString("");
-    Printv(fnname, "go_", wname, "(", NULL);
-
-    if (parm_count > required_count) {
-      Printv(fnname, "intgo _swig_optargc", NULL);
-    }
-
-    Parm *p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      SwigType *pt = Copy(Getattr(p, "type"));
-      if (SwigType_isarray(pt)) {
-	SwigType_del_array(pt);
-	SwigType_add_pointer(pt);
-      }
-      String *pn = NewString("g");
-      Append(pn, Getattr(p, "lname"));
-      String *ct = gccgoCTypeForGoValue(p, pt, pn);
-      if (i > 0 || parm_count > required_count) {
-	Printv(fnname, ", ", NULL);
-      }
-      Printv(fnname, ct, NULL);
-      Delete(ct);
-      Delete(pn);
-      Delete(pt);
-      p = nextParm(p);
-    }
-
-    Printv(fnname, ")", NULL);
-
-    String *fndef = NewString("");
-    if (SwigType_type(result) == T_VOID) {
-      Printv(fndef, "void ", fnname, NULL);
-    } else {
-      String *ct = gccgoCTypeForGoValue(n, result, fnname);
-      Printv(fndef, ct, NULL);
-      Delete(ct);
-    }
-
-    Printv(f->def, fndef, " __asm__(\"", go_prefix, "_", wname, "\");\n", NULL);
-
-    Printv(f->def, fndef, " {\n", NULL);
-
-    Delete(fnname);
-    Delete(fndef);
-
-    if (SwigType_type(result) != T_VOID) {
-      String *ln = NewString("_swig_go_result");
-      String *ct = gccgoCTypeForGoValue(n, result, ln);
-      Wrapper_add_local(f, "_swig_go_result", ct);
-      Delete(ct);
-      Delete(ln);
-    }
-
-    // Copy the parameters into the variables which hold their values,
-    // applying appropriate transformations.
-
-    p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-
-      String *tm = Getattr(p, "tmap:in");
-      if (!tm) {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number,
-		     "Unable to use type %s as a function argument\n", SwigType_str(Getattr(p, "type"), 0));
-      } else {
-	String *ln = Getattr(p, "lname");
-	String *pn = NewString("g");
-	Append(pn, ln);
-	tm = Copy(tm);
-	Replaceall(tm, "$input", pn);
-	Setattr(p, "emit:input", pn);
-	if (i < required_count) {
-	  Printv(f->code, "  ", tm, "\n", NULL);
-	} else {
-	  Printf(f->code, "  if (_swig_optargc > %d) {\n", i - required_count);
-	  Printv(f->code, "    ", tm, "\n", NULL);
-	  Printv(f->code, "  }\n", NULL);
-	}
-	Delete(tm);
-      }
-
-      p = nextParm(p);
-    }
-
-    Printv(f->code, "\n", NULL);
-
-    // Do the real work of the function.
-
-    checkConstraints(parms, f);
-
-    emitGoAction(n, base, parms, result, f);
-
-    argout(parms, f);
-
-    cleanupFunction(n, f, parms);
-
-    if (SwigType_type(result) != T_VOID) {
-      Printv(f->code, "  return _swig_go_result;\n", NULL);
-    }
-
-    Printv(f->code, "}\n", NULL);
-
-    Wrapper_print(f, f_c_wrappers);
-
-    Swig_restore(n);
-
-    DelWrapper(f);
-    Delete(base_parm);
-
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * checkConstraints()
-   *
-   * Check parameter constraints if any.  This is used for the C/C++
-   * function.  This assumes that each parameter has an "emit:input"
-   * property with the name to use to refer to that parameter.
-   * ----------------------------------------------------------------------- */
-
-  void checkConstraints(ParmList *parms, Wrapper *f) {
-    Parm *p = parms;
-    while (p) {
-      String *tm = Getattr(p, "tmap:check");
-      if (!tm) {
-	p = nextSibling(p);
-      } else {
-	tm = Copy(tm);
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(f->code, tm, "\n\n", NULL);
-	Delete(tm);
-	p = Getattr(p, "tmap:check:next");
-      }
-    }
-  }
-
-  /* -----------------------------------------------------------------------
-   * emitGoAction()
-   *
-   * Emit the action of the function.  This is used for the C/C++ function.
-   * ----------------------------------------------------------------------- */
-
-  void emitGoAction(Node *n, List *base, ParmList *parms, SwigType *result, Wrapper *f) {
-    if (!gccgo_flag && !cgo_flag && SwigType_type(result) != T_VOID) {
-      Wrapper_add_local(f, "swig_stktop", "char *swig_stktop");
-      Printv(f->code, "\tswig_stktop = _swig_topofstack();\n", NULL);
-    }
-    String *actioncode;
-    if (!base || isStatic(n)) {
-      Swig_director_emit_dynamic_cast(n, f);
-      actioncode = emit_action(n);
-    } else {
-      // Call the base class method.
-      actioncode = NewString("");
-
-      String *current = NewString("");
-      if (!gccgo_flag && !cgo_flag) {
-	Printv(current, "swig_a->", NULL);
-      }
-      Printv(current, Getattr(parms, "lname"), NULL);
-
-      int vc = 0;
-      for (Iterator bi = First(base); bi.item; bi = Next(bi)) {
-	Printf(actioncode, "  %s *swig_b%d = (%s *)%s;\n", bi.item, vc, bi.item, current);
-	Delete(current);
-	current = NewString("");
-	Printf(current, "swig_b%d", vc);
-	++vc;
-      }
-
-      String *code = Copy(Getattr(n, "wrap:action"));
-      Replace(code, Getattr(parms, "lname"), current, DOH_REPLACE_ANY | DOH_REPLACE_ID);
-      Delete(current);
-      Printv(actioncode, code, "\n", NULL);
-    }
-
-    Swig_save("emitGoAction", n, "type", "tmap:out", NULL);
-
-    Setattr(n, "type", result);
-
-    String *tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode);
-    if (!tm) {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s\n", SwigType_str(result, 0));
-    } else {
-      Replaceall(tm, "$result", "_swig_go_result");
-      if (GetFlag(n, "feature:new")) {
-	Replaceall(tm, "$owner", "1");
-      } else {
-	Replaceall(tm, "$owner", "0");
-      }
-      Printv(f->code, tm, "\n", NULL);
-      Delete(tm);
-    }
-
-    if (!gccgo_flag && !cgo_flag && SwigType_type(result) != T_VOID) {
-      // If the function called back into the Go code, the stack might
-      // have been copied.  We need to adjust swig_a accordingly here.
-      // This is what cgo does.
-      Printv(f->code, "\tswig_a = (struct swigargs*)((char*)swig_a + (_swig_topofstack() - swig_stktop));\n", NULL);
-      Printv(f->code, "\tswig_a->", Swig_cresult_name(), " = ", "_swig_go_result;\n", NULL);
-    }
-
-    Swig_restore(n);
-  }
-
-  /* -----------------------------------------------------------------------
-   * argout()
-   *
-   * Handle argument output code if any.  This is used for the C/C++
-   * function.  This assumes that each parameter has an "emit:input"
-   * property with the name to use to refer to that parameter.
-   * ----------------------------------------------------------------------- */
-
-  void argout(ParmList *parms, Wrapper *f) {
-    Parm *p = parms;
-    while (p) {
-      String *tm = Getattr(p, "tmap:argout");
-      if (!tm) {
-	p = nextSibling(p);
-      } else {
-	tm = Copy(tm);
-	Replaceall(tm, "$result", Swig_cresult_name());
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(f->code, tm, "\n", NULL);
-	Delete(tm);
-	p = Getattr(p, "tmap:argout:next");
-      }
-    }
-  }
-
-  /* -----------------------------------------------------------------------
-   * goargout()
-   *
-   * Handle Go argument output code if any.  This is used for the Go
-   * function.  This assumes that each parameter has an "emit:goinput"
-   * property with the name to use to refer to that parameter.
-   * ----------------------------------------------------------------------- */
-
-  void goargout(ParmList *parms) {
-    Parm *p = parms;
-    while (p) {
-      String *tm = Getattr(p, "tmap:goargout");
-      if (!tm) {
-	p = nextSibling(p);
-      } else {
-	tm = Copy(tm);
-	Replaceall(tm, "$result", "swig_r");
-	Replaceall(tm, "$input", Getattr(p, "emit:goinput"));
-	Printv(f_go_wrappers, tm, "\n", NULL);
-	Delete(tm);
-	p = Getattr(p, "tmap:goargout:next");
-      }
-    }
-
-    // When using cgo, if we need to memcpy a parameter to pass it to
-    // the C code, the compiler may think that the parameter is not
-    // live during the function call.  If the garbage collector runs
-    // while the C/C++ function is running, the parameter may be
-    // freed.  Force the compiler to see the parameter as live across
-    // the C/C++ function.
-    if (cgo_flag) {
-      int parm_count = emit_num_arguments(parms);
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	bool c_struct_type;
-	Delete(cgoTypeForGoValue(p, Getattr(p, "type"), &c_struct_type));
-	if (c_struct_type) {
-	  Printv(f_go_wrappers, "\tif Swig_escape_always_false {\n", NULL);
-	  Printv(f_go_wrappers, "\t\tSwig_escape_val = ", Getattr(p, "emit:goinput"), "\n", NULL);
-	  Printv(f_go_wrappers, "\t}\n", NULL);
-	}
-	p = nextParm(p);
-      }
-    }
-  }
-
-  /* -----------------------------------------------------------------------
-   * freearg()
-   *
-   * Handle argument cleanup code if any.  This is used for the C/C++
-   * function.  This assumes that each parameter has an "emit:input"
-   * property with the name to use to refer to that parameter.
-   * ----------------------------------------------------------------------- */
-
-  String *freearg(ParmList *parms) {
-    String *ret = NewString("");
-    Parm *p = parms;
-    while (p) {
-      String *tm = Getattr(p, "tmap:freearg");
-      if (!tm) {
-	p = nextSibling(p);
-      } else {
-	tm = Copy(tm);
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(ret, tm, "\n", NULL);
-	Delete(tm);
-	p = Getattr(p, "tmap:freearg:next");
-      }
-    }
-    return ret;
-  }
-
-  /* -----------------------------------------------------------------------
-   * cleanupFunction()
-   *
-   * Final function cleanup code.
-   * ----------------------------------------------------------------------- */
-
-  void cleanupFunction(Node *n, Wrapper *f, ParmList *parms) {
-    String *cleanup = freearg(parms);
-    Printv(f->code, cleanup, NULL);
-
-    if (GetFlag(n, "feature:new")) {
-      String *tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0);
-      if (tm) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printv(f->code, tm, "\n", NULL);
-	Delete(tm);
-      }
-    }
-
-    Replaceall(f->code, "$cleanup", cleanup);
-    Delete(cleanup);
-
-    /* See if there is any return cleanup code */
-    String *tm;
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    Replaceall(f->code, "$symname", Getattr(n, "sym:name"));
-  }
-
-  /* -----------------------------------------------------------------------
-   * variableHandler()
-   *
-   * This exists just to set the making_variable_wrappers flag.
-   * ----------------------------------------------------------------------- */
-
-  virtual int variableHandler(Node *n) {
-    assert(!making_variable_wrappers);
-    making_variable_wrappers = true;
-    int r = Language::variableHandler(n);
-    making_variable_wrappers = false;
-    return r;
-  }
-
-  /* -----------------------------------------------------------------------
-   * constantWrapper()
-   *
-   * Product a const declaration.
-   * ------------------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    SwigType *type = Getattr(n, "type");
-
-    if (!SwigType_issimple(type) && SwigType_type(type) != T_STRING) {
-      return goComplexConstant(n, type);
-    }
-
-    if (Swig_storage_isstatic(n)) {
-      return goComplexConstant(n, type);
-    }
-
-    String *go_name = buildGoName(Getattr(n, "sym:name"), false, false);
-
-    String *tm = goType(n, type);
-    String *value = Getattr(n, "value");
-
-    String *copy = NULL;
-    if (SwigType_type(type) == T_BOOL) {
-      if (Cmp(value, "true") != 0 && Cmp(value, "false") != 0) {
-	return goComplexConstant(n, type);
-      }
-    } else if (SwigType_type(type) == T_STRING || SwigType_type(type) == T_CHAR) {
-      // Backslash sequences are somewhat different in Go and C/C++.
-      if (Strchr(value, '\\') != 0) {
-	return goComplexConstant(n, type);
-      }
-    } else {
-      // Accept a 0x prefix, and strip combinations of u and l
-      // suffixes.  Otherwise accept digits, decimal point, and
-      // exponentiation.  Treat anything else as too complicated to
-      // handle as a Go constant.
-      char *p = Char(value);
-      int len = (int)strlen(p);
-      bool need_copy = false;
-      while (len > 0) {
-	char c = p[len - 1];
-	if (c != 'l' && c != 'L' && c != 'u' && c != 'U') {
-	  break;
-	}
-	--len;
-	need_copy = true;
-      }
-      bool is_hex = false;
-      int i = 0;
-      if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
-	i = 2;
-	is_hex = true;
-      }
-      for (; i < len; ++i) {
-	switch (p[i]) {
-	case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-	  break;
-	case 'a': case 'b': case 'c': case 'd': case 'f': case 'A': case 'B': case 'C': case 'D': case 'F':
-	  if (!is_hex) {
-	    return goComplexConstant(n, type);
-	  }
-	  break;
-	case '.': case 'e': case 'E': case '+': case '-':
-	  break;
-	default:
-	  return goComplexConstant(n, type);
-	}
-      }
-      if (need_copy) {
-	copy = Copy(value);
-	Replaceall(copy, p + len, "");
-	value = copy;
-      }
-    }
-
-    if (!checkNameConflict(go_name, n, NULL)) {
-      Delete(tm);
-      Delete(go_name);
-      Delete(copy);
-      return SWIG_NOWRAP;
-    }
-
-    Printv(f_go_wrappers, "const ", go_name, " ", tm, " = ", NULL);
-    if (SwigType_type(type) == T_STRING) {
-      Printv(f_go_wrappers, "\"", value, "\"", NULL);
-    } else if (SwigType_type(type) == T_CHAR) {
-      Printv(f_go_wrappers, "'", value, "'", NULL);
-    } else {
-      Printv(f_go_wrappers, value, NULL);
-    }
-
-    Printv(f_go_wrappers, "\n", NULL);
-
-    Delete(tm);
-    Delete(go_name);
-    Delete(copy);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * enumDeclaration()
-   *
-   * A C++ enum type turns into a Named go int type.
-   * ---------------------------------------------------------------------- */
-
-  virtual int enumDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    String *name = goEnumName(n);
-    if (Strcmp(name, "int") != 0) {
-      if (!ImportMode || !imported_package) {
-	if (!checkNameConflict(name, n, NULL)) {
-	  Delete(name);
-	  return SWIG_NOWRAP;
-	}
-	Printv(f_go_wrappers, "type ", name, " int\n", NULL);
-      } else {
-	String *nw = NewString("");
-	Printv(nw, getModuleName(imported_package), ".", name, NULL);
-	Setattr(n, "go:enumname", nw);
-      }
-    }
-    Delete(name);
-
-    return Language::enumDeclaration(n);
-  }
-
-  /* -----------------------------------------------------------------------
-   * enumvalueDeclaration()
-   *
-   * Declare a single value of an enum type.  We fetch the value by
-   * calling a C/C++ function.
-   * ------------------------------------------------------------------------ */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    if (!is_public(n)) {
-      return SWIG_OK;
-    }
-
-    Swig_require("enumvalueDeclaration", n, "*sym:name", NIL);
-    Node *parent = parentNode(n);
-
-    if (Getattr(parent, "unnamed")) {
-      Setattr(n, "type", NewString("int"));
-    } else {
-      Setattr(n, "type", Getattr(parent, "enumtype"));
-    }
-
-    if (GetFlag(parent, "scopedenum")) {
-      String *symname = Getattr(n, "sym:name");
-      symname = Swig_name_member(0, Getattr(parent, "sym:name"), symname);
-      Setattr(n, "sym:name", symname);
-      Delete(symname);
-    }
-
-    int ret = goComplexConstant(n, Getattr(n, "type"));
-    Swig_restore(n);
-    return ret;
-  }
-
-  /* -----------------------------------------------------------------------
-   * goComplexConstant()
-   *
-   * Handle a const declaration for something which is not a Go constant.
-   * ------------------------------------------------------------------------ */
-
-  int goComplexConstant(Node *n, SwigType *type) {
-    String *symname = Getattr(n, "sym:name");
-    if (!symname) {
-      symname = Getattr(n, "name");
-    }
-
-    String *varname = buildGoName(symname, true, false);
-
-    if (!checkNameConflict(varname, n, NULL)) {
-      Delete(varname);
-      return SWIG_NOWRAP;
-    }
-
-    String *get = NewString("");
-    Printv(get, Swig_cresult_name(), " = ", NULL);
-
-    String *rawval = Getattr(n, "rawval");
-    if (rawval && Len(rawval)) {
-      if (SwigType_type(type) == T_STRING) {
-        Printv(get, "(char *)", NULL);
-      }
-
-      Printv(get, rawval, NULL);
-    } else {
-      char quote;
-      if (Getattr(n, "wrappedasconstant")) {
-        quote = '\0';
-      } else if (SwigType_type(type) == T_CHAR) {
-        quote = '\'';
-      } else if (SwigType_type(type) == T_STRING) {
-        Printv(get, "(char *)", NULL);
-        quote = '"';
-      } else {
-        quote = '\0';
-      }
-
-      if (quote != '\0') {
-        Printf(get, "%c", quote);
-      }
-
-      Printv(get, Getattr(n, "value"), NULL);
-
-      if (quote != '\0') {
-        Printf(get, "%c", quote);
-      }
-    }
-
-    Printv(get, ";\n", NULL);
-
-    Setattr(n, "wrap:action", get);
-
-    String *sname = Copy(symname);
-    if (class_name) {
-      Append(sname, "_");
-      Append(sname, class_name);
-    }
-
-    String *go_name = NewString("_swig_get");
-    if (class_name) {
-      Append(go_name, class_name);
-      Append(go_name, "_");
-    }
-    Append(go_name, sname);
-
-    String *wname = Swig_name_wrapper(sname);
-    Append(wname, unique_id);
-    Setattr(n, "wrap:name", wname);
-
-    int r = makeWrappers(n, sname, go_name, NULL, wname, NULL, NULL, type, true);
-
-    if (r != SWIG_OK) {
-      return r;
-    }
-
-    String *t = goType(n, type);
-    Printv(f_go_wrappers, "var ", varname, " ", t, " = ", go_name, "()\n", NULL);
-
-    Delete(varname);
-    Delete(t);
-    Delete(go_name);
-    Delete(sname);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   *
-   * For a C++ class, in Go we generate both a struct and an
-   * interface.  The interface will declare all the class public
-   * methods.  We will define all the methods on the struct, so that
-   * the struct meets the interface.  We then expect users of the
-   * class to use the interface.
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-    class_node = n;
-
-    List *baselist = Getattr(n, "bases");
-    bool has_base_classes = baselist && Len(baselist) > 0;
-
-    String *name = Getattr(n, "sym:name");
-
-    String *go_name = exportedName(name);
-
-    if (!checkNameConflict(go_name, n, NULL)) {
-      Delete(go_name);
-      SetFlag(n, "go:conflict");
-      return SWIG_NOWRAP;
-    }
-
-    String *go_type_name = goCPointerType(Getattr(n, "classtypeobj"), true);
-
-    class_name = name;
-    class_receiver = go_type_name;
-    class_methods = NewHash();
-
-    int isdir = GetFlag(n, "feature:director");
-    int isnodir = GetFlag(n, "feature:nodirector");
-    bool is_director = isdir && !isnodir;
-
-    Printv(f_go_wrappers, "type ", go_type_name, " uintptr\n\n", NULL);
-
-    // A method to return the pointer to the C++ class.  This is used
-    // by generated code to convert between the interface and the C++
-    // value.
-    Printv(f_go_wrappers, "func (p ", go_type_name, ") Swigcptr() uintptr {\n", NULL);
-    Printv(f_go_wrappers, "\treturn (uintptr)(p)\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    // A method used as a marker for the class, to avoid invalid
-    // interface conversions when using multiple inheritance.
-    Printv(f_go_wrappers, "func (p ", go_type_name, ") SwigIs", go_name, "() {\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    if (is_director) {
-      // Return the interface passed to the NewDirector function.
-      Printv(f_go_wrappers, "func (p ", go_type_name, ") DirectorInterface() interface{} {\n", NULL);
-      Printv(f_go_wrappers, "\treturn nil\n", NULL);
-      Printv(f_go_wrappers, "}\n\n", NULL);
-    }
-
-    // We have seen a definition for this type.
-    Setattr(defined_types, go_name, go_name);
-    Setattr(defined_types, go_type_name, go_type_name);
-
-    interfaces = NewString("");
-
-    int r = Language::classHandler(n);
-    if (r != SWIG_OK) {
-      return r;
-    }
-
-    if (has_base_classes) {
-      // For each method defined in a base class but not defined in
-      // this class, we need to define the method in this class.  We
-      // can't use anonymous field inheritance because it works
-      // differently in Go and in C++.
-
-      Hash *local = NewHash();
-      for (Node *ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) {
-
-	if (!is_public(ni)) {
-	  continue;
-	}
-
-	String *type = Getattr(ni, "nodeType");
-	if (Cmp(type, "constructor") == 0 || Cmp(type, "destructor") == 0) {
-	  continue;
-	}
-
-	String *cname = Getattr(ni, "sym:name");
-	if (!cname) {
-	  cname = Getattr(ni, "name");
-	}
-	if (cname) {
-	  Setattr(local, cname, NewString(""));
-	}
-      }
-
-      for (Iterator b = First(baselist); b.item; b = Next(b)) {
-	List *bases = NewList();
-	Append(bases, Getattr(b.item, "classtype"));
-	int r = addBase(n, b.item, bases, local);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-	Delete(bases);
-      }
-
-      Delete(local);
-
-      Hash *parents = NewHash();
-      addFirstBaseInterface(n, parents, baselist);
-      int r = addExtraBaseInterfaces(n, parents, baselist);
-      Delete(parents);
-      if (r != SWIG_OK) {
-	return r;
-      }
-    }
-
-    Printv(f_go_wrappers, "type ", go_name, " interface {\n", NULL);
-    Printv(f_go_wrappers, "\tSwigcptr() uintptr\n", NULL);
-    Printv(f_go_wrappers, "\tSwigIs", go_name, "()\n", NULL);
-
-    if (is_director) {
-      Printv(f_go_wrappers, "\tDirectorInterface() interface{}\n", NULL);
-    }
-
-    Append(f_go_wrappers, interfaces);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-    Delete(interfaces);
-
-    interfaces = NULL;
-    class_name = NULL;
-    class_receiver = NULL;
-    class_node = NULL;
-    Delete(class_methods);
-    class_methods = NULL;
-
-    Delete(go_type_name);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * addBase()
-   *
-   * Implement methods and members defined in a parent class for a
-   * child class.
-   * ------------------------------------------------------------ */
-
-  int addBase(Node *n, Node *base, List *bases, Hash *local) {
-    if (GetFlag(base, "feature:ignore")) {
-      return SWIG_OK;
-    }
-
-    for (Node *ni = Getattr(base, "firstChild"); ni; ni = nextSibling(ni)) {
-
-      if (GetFlag(ni, "feature:ignore")) {
-	continue;
-      }
-
-      if (!is_public(ni)) {
-	continue;
-      }
-
-      String *type = Getattr(ni, "nodeType");
-      if (Strcmp(type, "constructor") == 0 || Strcmp(type, "destructor") == 0 || Strcmp(type, "enum") == 0 || Strcmp(type, "using") == 0 || Strcmp(type, "classforward") == 0 || Strcmp(type, "template") == 0) {
-	continue;
-      }
-      String *storage = Getattr(ni, "storage");
-      if (storage && (Strcmp(storage, "typedef") == 0 || Strcmp(storage, "friend") == 0)) {
-	continue;
-      }
-
-      String *mname = Getattr(ni, "sym:name");
-      if (!mname) {
-	continue;
-      }
-
-      String *lname = Getattr(ni, "name");
-      if (Getattr(class_methods, lname)) {
-	continue;
-      }
-      if (Getattr(local, lname)) {
-	continue;
-      }
-      Setattr(local, lname, NewString(""));
-
-      String *ty = NewString(Getattr(ni, "type"));
-      SwigType_push(ty, Getattr(ni, "decl"));
-      String *fullty = SwigType_typedef_resolve_all(ty);
-      bool is_function = SwigType_isfunction(fullty) ? true : false;
-      Delete(ty);
-      Delete(fullty);
-
-      if (is_function) {
-	int r = goBaseMethod(n, bases, ni);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-
-	if (Getattr(ni, "sym:overloaded")) {
-	  for (Node *on = Getattr(ni, "sym:nextSibling"); on; on = Getattr(on, "sym:nextSibling")) {
-	    r = goBaseMethod(n, bases, on);
-	    if (r != SWIG_OK) {
-	      return r;
-	    }
-	  }
-
-	  String *receiver = class_receiver;
-	  bool is_static = isStatic(ni);
-	  if (is_static) {
-	    receiver = NULL;
-	  }
-	  String *go_name = buildGoName(Getattr(ni, "sym:name"), is_static, false);
-	  r = makeDispatchFunction(ni, go_name, receiver, is_static, NULL, false);
-	  Delete(go_name);
-	  if (r != SWIG_OK) {
-	    return r;
-	  }
-	}
-      } else {
-	int r = goBaseVariable(n, bases, ni);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-      }
-    }
-
-    List *baselist = Getattr(base, "bases");
-    if (baselist && Len(baselist) > 0) {
-      for (Iterator b = First(baselist); b.item; b = Next(b)) {
-	List *nb = Copy(bases);
-	Append(nb, Getattr(b.item, "classtype"));
-	int r = addBase(n, b.item, nb, local);
-	Delete(nb);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-      }
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * goBaseMethod()
-   *
-   * Implement a method defined in a parent class for a child class.
-   * ------------------------------------------------------------ */
-
-  int goBaseMethod(Node *method_class, List *bases, Node *method) {
-    String *symname = Getattr(method, "sym:name");
-    if (!validIdentifier(symname)) {
-      return SWIG_OK;
-    }
-
-    String *name = NewString("");
-    Printv(name, Getattr(method_class, "sym:name"), "_", symname, NULL);
-
-    bool is_static = isStatic(method);
-
-    String *go_name = buildGoName(name, is_static, false);
-
-    String *overname = NULL;
-    if (Getattr(method, "sym:overloaded")) {
-      overname = Getattr(method, "sym:overname");
-    }
-    String *wname = Swig_name_wrapper(name);
-    if (overname) {
-      Append(wname, overname);
-    }
-    Append(wname, unique_id);
-
-    String *result = NewString(Getattr(method, "type"));
-    SwigType_push(result, Getattr(method, "decl"));
-    if (SwigType_isqualifier(result)) {
-      Delete(SwigType_pop(result));
-    }
-    Delete(SwigType_pop_function(result));
-
-    // If the base method is imported, wrap:action may not be set.
-    Swig_save("goBaseMethod", method, "wrap:name", "wrap:action", "parms", NULL);
-    Setattr(method, "wrap:name", wname);
-    if (!Getattr(method, "wrap:action")) {
-      if (!is_static) {
-	Swig_MethodToFunction(method, getNSpace(), getClassType(), (Getattr(method, "template") ? SmartPointer : Extend | SmartPointer), NULL, false);
-	// Remove any self parameter that was just added.
-	ParmList *parms = Getattr(method, "parms");
-	if (parms && Getattr(parms, "self")) {
-	  parms = CopyParmList(nextSibling(parms));
-	  Setattr(method, "parms", parms);
-	}
-      } else {
-	String *call = Swig_cfunction_call(Getattr(method, "name"), Getattr(method, "parms"));
-	Setattr(method, "wrap:action", Swig_cresult(Getattr(method, "type"), Swig_cresult_name(), call));
-      }
-    }
-
-    int r = makeWrappers(method, name, go_name, overname, wname, bases, Getattr(method, "parms"), result, is_static);
-
-    Swig_restore(method);
-
-    Delete(result);
-    Delete(go_name);
-    Delete(name);
-
-    return r;
-  }
-
-  /* ------------------------------------------------------------
-   * goBaseVariable()
-   *
-   * Add accessors for a member variable defined in a parent class for
-   * a child class.
-   * ------------------------------------------------------------ */
-
-  int goBaseVariable(Node *var_class, List *bases, Node *var) {
-    if (isStatic(var)) {
-      return SWIG_OK;
-    }
-
-    String *var_name = buildGoName(Getattr(var, "sym:name"), false, false);
-
-    Swig_save("goBaseVariable", var, "type", "wrap:action", NULL);
-
-    // For a pointer type we apparently have to wrap in the decl.
-    SwigType *var_type = NewString(Getattr(var, "type"));
-    SwigType_push(var_type, Getattr(var, "decl"));
-    Setattr(var, "type", var_type);
-
-    SwigType *vt = Copy(var_type);
-
-    int flags = Extend | SmartPointer | use_naturalvar_mode(var);
-    if (isNonVirtualProtectedAccess(var)) {
-      flags |= CWRAP_ALL_PROTECTED_ACCESS;
-    }
-
-    // Copied from Swig_wrapped_member_var_type.
-    if (SwigType_isclass(vt)) {
-      if (flags & CWRAP_NATURAL_VAR) {
-	if (CPlusPlus) {
-	  if (!SwigType_isconst(vt)) {
-	    SwigType_add_qualifier(vt, "const");
-	  }
-	  SwigType_add_reference(vt);
-	}
-      } else {
-	SwigType_add_pointer(vt);
-      }
-    }
-
-    String *mname = Swig_name_member(getNSpace(), Getattr(var_class, "sym:name"), var_name);
-
-    if (is_assignable(var)) {
-      for (Iterator ki = First(var); ki.key; ki = Next(ki)) {
-	if (Strncmp(ki.key, "tmap:", 5) == 0) {
-	  Delattr(var, ki.key);
-	}
-      }
-      Swig_save("goBaseVariableSet", var, "name", "sym:name", "type", NULL);
-
-      String *mname_set = NewString("Set");
-      Append(mname_set, mname);
-
-      String *go_name = NewString("Set");
-      Append(go_name, var_name);
-
-      Swig_MembersetToFunction(var, class_name, flags);
-
-      String *wname = Swig_name_wrapper(mname_set);
-      Append(wname, unique_id);
-      ParmList *parms = NewParm(vt, var_name, var);
-      String *result = NewString("void");
-      int r = makeWrappers(var, mname_set, go_name, NULL, wname, bases, parms, result, false);
-      if (r != SWIG_OK) {
-	return r;
-      }
-      Delete(wname);
-      Delete(parms);
-      Delete(result);
-      Delete(go_name);
-      Delete(mname_set);
-
-      Swig_restore(var);
-      for (Iterator ki = First(var); ki.key; ki = Next(ki)) {
-	if (Strncmp(ki.key, "tmap:", 5) == 0) {
-	  Delattr(var, ki.key);
-	}
-      }
-    }
-
-    Swig_MembergetToFunction(var, class_name, flags);
-
-    String *mname_get = NewString("Get");
-    Append(mname_get, mname);
-
-    String *go_name = NewString("Get");
-    Append(go_name, var_name);
-
-    String *wname = Swig_name_wrapper(mname_get);
-    Append(wname, unique_id);
-
-    int r = makeWrappers(var, mname_get, go_name, NULL, wname, bases, NULL, vt, false);
-    if (r != SWIG_OK) {
-      return r;
-    }
-
-    Delete(wname);
-    Delete(mname_get);
-    Delete(go_name);
-    Delete(mname);
-    Delete(var_name);
-    Delete(var_type);
-    Delete(vt);
-
-    Swig_restore(var);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * addFirstBaseInterface()
-   *
-   * When a C++ class uses multiple inheritance, we can use the C++
-   * pointer for the first base class but not for any subsequent base
-   * classes.  However, the Go interface will match the interface for
-   * all the base classes.  To avoid accidentally treating a class as
-   * a pointer to a base class other than the first one, we use an
-   * isClassname method.  This function adds those methods as
-   * required.
-   *
-   * For convenience when using multiple inheritance, we also add
-   * functions to retrieve the base class pointers.
-   * ------------------------------------------------------------ */
-
-  void addFirstBaseInterface(Node *n, Hash *parents, List *bases) {
-    if (!bases || Len(bases) == 0) {
-      return;
-    }
-    Iterator b = First(bases);
-    if (!GetFlag(b.item, "feature:ignore")) {
-      String *go_name = buildGoName(Getattr(n, "sym:name"), false, false);
-      String *go_type_name = goCPointerType(Getattr(n, "classtypeobj"), true);
-      String *go_base_name = exportedName(Getattr(b.item, "sym:name"));
-      String *go_base_type = goType(n, Getattr(b.item, "classtypeobj"));
-      String *go_base_type_name = goCPointerType(Getattr(b.item, "classtypeobj"), true);
-
-      Printv(f_go_wrappers, "func (p ", go_type_name, ") SwigIs", go_base_name, "() {\n", NULL);
-      Printv(f_go_wrappers, "}\n\n", NULL);
-
-      Printv(interfaces, "\tSwigIs", go_base_name, "()\n", NULL);
-
-      Printv(f_go_wrappers, "func (p ", go_type_name, ") SwigGet", go_base_name, "() ", go_base_type, " {\n", NULL);
-      Printv(f_go_wrappers, "\treturn ", go_base_type_name, "(p.Swigcptr())\n", NULL);
-      Printv(f_go_wrappers, "}\n\n", NULL);
-
-      Printv(interfaces, "\tSwigGet", go_base_name, "() ", go_base_type, "\n", NULL);
-
-      Setattr(parents, go_base_name, NewString(""));
-
-      Delete(go_name);
-      Delete(go_type_name);
-      Delete(go_base_type);
-      Delete(go_base_type_name);
-    }
-
-    addFirstBaseInterface(n, parents, Getattr(b.item, "bases"));
-  }
-
-  /* ------------------------------------------------------------
-   * addExtraBaseInterfaces()
-   *
-   * Add functions to retrieve the base class pointers for all base
-   * classes other than the first.
-   * ------------------------------------------------------------ */
-
-  int addExtraBaseInterfaces(Node *n, Hash *parents, List *bases) {
-    Iterator b = First(bases);
-
-    Node *fb = b.item;
-
-    for (b = Next(b); b.item; b = Next(b)) {
-      if (GetFlag(b.item, "feature:ignore")) {
-	continue;
-      }
-
-      String *go_base_name = exportedName(Getattr(b.item, "sym:name"));
-
-      Swig_save("addExtraBaseInterface", n, "wrap:action", "wrap:name", "wrap:parms", NULL);
-
-      SwigType *type = Copy(Getattr(n, "classtypeobj"));
-      SwigType_add_pointer(type);
-      Parm *parm = NewParm(type, "self", n);
-      Setattr(n, "wrap:parms", parm);
-
-      String *pn = Swig_cparm_name(parm, 0);
-      String *action = NewString("");
-      Printv(action, Swig_cresult_name(), " = (", Getattr(b.item, "classtype"), "*)", pn, ";", NULL);
-      Delete(pn);
-
-      Setattr(n, "wrap:action", action);
-
-      String *name = Copy(class_name);
-      Append(name, "_SwigGet");
-      Append(name, go_base_name);
-
-      String *go_name = NewString("SwigGet");
-      String *c1 = exportedName(go_base_name);
-      Append(go_name, c1);
-      Delete(c1);
-
-      String *wname = Swig_name_wrapper(name);
-      Append(wname, unique_id);
-      Setattr(n, "wrap:name", wname);
-
-      SwigType *result = Copy(Getattr(b.item, "classtypeobj"));
-      SwigType_add_pointer(result);
-
-      int r = makeWrappers(n, name, go_name, NULL, wname, NULL, parm, result,
-			   false);
-      if (r != SWIG_OK) {
-	return r;
-      }
-
-      Swig_restore(n);
-
-      Setattr(parents, go_base_name, NewString(""));
-
-      Delete(go_name);
-      Delete(type);
-      Delete(parm);
-      Delete(action);
-      Delete(result);
-
-      String *ns = NewString("");
-      addParentExtraBaseInterfaces(n, parents, b.item, false, ns);
-      Delete(ns);
-    }
-
-    if (!GetFlag(fb, "feature:ignore")) {
-      String *ns = NewString("");
-      addParentExtraBaseInterfaces(n, parents, fb, true, ns);
-      Delete(ns);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * addParentExtraBaseInterfaces()
-   *
-   * Add functions to retrieve the base class pointers for all base
-   * classes of parents other than the first base class at each level.
-   * ------------------------------------------------------------ */
-
-  void addParentExtraBaseInterfaces(Node *n, Hash *parents, Node *base, bool is_base_first, String *sofar) {
-    List *baselist = Getattr(base, "bases");
-    if (!baselist || Len(baselist) == 0) {
-      return;
-    }
-
-    String *go_this_base_name = exportedName(Getattr(base, "sym:name"));
-
-    String *sf = NewString("");
-    Printv(sf, sofar, ".SwigGet", go_this_base_name, "()", NULL);
-
-    Iterator b = First(baselist);
-
-    if (is_base_first) {
-      if (!b.item) {
-	return;
-      }
-      if (!GetFlag(b.item, "feature:ignore")) {
-	addParentExtraBaseInterfaces(n, parents, b.item, true, sf);
-      }
-
-      b = Next(b);
-    }
-
-    String *go_name = buildGoName(Getattr(n, "sym:name"), false, false);
-    String *go_type_name = goCPointerType(Getattr(n, "classtypeobj"), true);
-
-    for (; b.item; b = Next(b)) {
-      if (GetFlag(b.item, "feature:ignore")) {
-	continue;
-      }
-
-      String *go_base_name = exportedName(Getattr(b.item, "sym:name"));
-
-      if (!Getattr(parents, go_base_name)) {
-	Printv(f_go_wrappers, "func (p ", go_type_name, ") SwigGet", go_base_name, "() ", go_base_name, " {\n", NULL);
-	Printv(f_go_wrappers, "\treturn p", sf, ".SwigGet", go_base_name, "()\n", NULL);
-	Printv(f_go_wrappers, "}\n\n", NULL);
-
-	Printv(interfaces, "\tSwigGet", go_base_name, "() ", go_base_name, "\n", NULL);
-
-	addParentExtraBaseInterfaces(n, parents, b.item, false, sf);
-
-	Setattr(parents, go_base_name, NewString(""));
-      }
-    }
-
-    Delete(go_name);
-    Delete(go_type_name);
-    Delete(go_this_base_name);
-    Delete(sf);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorInit
-   *
-   * Add support for a director class.
-   *
-   * Virtual inheritance is different in Go and C++.  We implement
-   * director classes by defining a new function in Go,
-   * NewDirectorClassname, which takes a empty interface value and
-   * creates an instance of a new child class.  The new child class
-   * refers all methods back to Go.  The Go code checks whether the
-   * value passed to NewDirectorClassname implements that method; if
-   * it does, it calls it, otherwise it calls back into C++.
-   * ------------------------------------------------------------ */
-
-  int classDirectorInit(Node *n) {
-    // Because we use a different function to handle inheritance in
-    // Go, ordinary creations of the object should not create a
-    // director object.
-    Delete(director_ctor_code);
-    director_ctor_code = NewString("$nondirector_new");
-
-    class_node = n;
-
-    String *name = Getattr(n, "sym:name");
-
-    assert(!class_name);
-    class_name = name;
-
-    String *go_name = exportedName(name);
-
-    String *go_type_name = goCPointerType(Getattr(n, "classtypeobj"), true);
-
-    assert(!class_receiver);
-    class_receiver = go_type_name;
-
-    String *director_struct_name = NewString("_swig_Director");
-    Append(director_struct_name, go_name);
-
-    String *cxx_director_name = NewString("SwigDirector_");
-    Append(cxx_director_name, name);
-
-    // The Go type of the director class.
-    Printv(f_go_wrappers, "type ", director_struct_name, " struct {\n", NULL);
-    Printv(f_go_wrappers, "\t", go_type_name, "\n", NULL);
-    Printv(f_go_wrappers, "\tv interface{}\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    Printv(f_go_wrappers, "func (p *", director_struct_name, ") Swigcptr() uintptr {\n", NULL);
-    Printv(f_go_wrappers, "\treturn p.", go_type_name, ".Swigcptr()\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    Printv(f_go_wrappers, "func (p *", director_struct_name, ") SwigIs", go_name, "() {\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    Printv(f_go_wrappers, "func (p *", director_struct_name, ") DirectorInterface() interface{} {\n", NULL);
-    Printv(f_go_wrappers, "\treturn p.v\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    // Start defining the director class.
-    Printv(f_c_directors_h, "class ", cxx_director_name, " : public ", Getattr(n, "classtype"), "\n", NULL);
-    Printv(f_c_directors_h, "{\n", NULL);
-    Printv(f_c_directors_h, " public:\n", NULL);
-
-    Delete(director_struct_name);
-    Delete(cxx_director_name);
-
-    class_methods = NewHash();
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorConstructor
-   *
-   * Emit a constructor for a director class.
-   * ------------------------------------------------------------ */
-
-  int classDirectorConstructor(Node *n) {
-    bool is_ignored = GetFlag(n, "feature:ignore") ? true : false;
-
-    String *name = Getattr(n, "sym:name");
-    if (!name) {
-      assert(is_ignored);
-      name = Getattr(n, "name");
-    }
-
-    String *overname = NULL;
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    }
-
-    String *go_name = exportedName(name);
-
-    ParmList *parms = Getattr(n, "parms");
-    Setattr(n, "wrap:parms", parms);
-
-    String *cn = exportedName(Getattr(parentNode(n), "sym:name"));
-
-    String *go_type_name = goCPointerType(Getattr(parentNode(n), "classtypeobj"), true);
-
-    String *director_struct_name = NewString("_swig_Director");
-    Append(director_struct_name, cn);
-
-    String *fn_name = NewString("_swig_NewDirector");
-    Append(fn_name, cn);
-    Append(fn_name, go_name);
-
-    if (!overname && !is_ignored) {
-      if (!checkNameConflict(fn_name, n, NULL)) {
-	return SWIG_NOWRAP;
-      }
-    }
-
-    String *fn_with_over_name = Copy(fn_name);
-    if (overname) {
-      Append(fn_with_over_name, overname);
-    }
-
-    String *wname = Swig_name_wrapper(fn_name);
-
-    if (overname) {
-      Append(wname, overname);
-    }
-    Append(wname, unique_id);
-    Setattr(n, "wrap:name", wname);
-
-    bool is_static = isStatic(n);
-
-    Wrapper *dummy = NewWrapper();
-    emit_attach_parmmaps(parms, dummy);
-    DelWrapper(dummy);
-
-    Swig_typemap_attach_parms("gotype", parms, NULL);
-    Swig_typemap_attach_parms("goin", parms, NULL);
-    Swig_typemap_attach_parms("goargout", parms, NULL);
-    Swig_typemap_attach_parms("imtype", parms, NULL);
-    int parm_count = emit_num_arguments(parms);
-
-    String *func_name = NewString("NewDirector");
-    Append(func_name, go_name);
-
-    String *func_with_over_name = Copy(func_name);
-    if (overname) {
-      Append(func_with_over_name, overname);
-    }
-
-    SwigType *first_type = NewString("int");
-    Parm *first_parm = NewParm(first_type, "swig_p", n);
-    set_nextSibling(first_parm, parms);
-    Setattr(first_parm, "lname", "p");
-
-    Parm *p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      Swig_cparm_name(p, i);
-      p = nextParm(p);
-    }
-
-    if (!is_ignored) {
-      if (cgo_flag) {
-	Printv(f_cgo_comment, "extern uintptr_t ", wname, "(int", NULL);
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  p = getParm(p);
-	  bool c_struct_type;
-	  String *ct = cgoTypeForGoValue(p, Getattr(p, "type"), &c_struct_type);
-	  Printv(f_cgo_comment, ", ", ct, " ", Getattr(p, "lname"), NULL);
-	  p = nextParm(p);
-	}
-	Printv(f_cgo_comment, ");\n", NULL);
-      } else {
-	// Declare the C++ wrapper.
-
-	if (!gccgo_flag) {
-	  Printv(f_go_wrappers, "var ", wname, " unsafe.Pointer\n\n", NULL);
-	} else {
-	  Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL);
-	}
-
-	Printv(f_go_wrappers, "func ", fn_with_over_name, "(_swig_director int", NULL);
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  p = getParm(p);
-	  String *tm = goWrapperType(p, Getattr(p, "type"), false);
-	  Printv(f_go_wrappers, ", _ ", tm, NULL);
-	  Delete(tm);
-	  p = nextParm(p);
-	}
-
-	Printv(f_go_wrappers, ") (_swig_ret ", go_type_name, ")", NULL);
-
-	if (!gccgo_flag) {
-	  Printv(f_go_wrappers, " {\n", NULL);
-	  Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&_swig_director))\n", NULL);
-	  Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", wname, ", _swig_p)\n", NULL);
-	  Printv(f_go_wrappers, "\treturn\n", NULL);
-	  Printv(f_go_wrappers, "}", NULL);
-	}
-
-	Printv(f_go_wrappers, "\n\n", NULL);
-      }
-
-      // Write out the Go function that calls the wrapper.
-
-      Printv(f_go_wrappers, "func ", func_with_over_name, "(v interface{}", NULL);
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	Printv(f_go_wrappers, ", ", Getattr(p, "lname"), " ", NULL);
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(f_go_wrappers, tm, NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-
-      Printv(f_go_wrappers, ") ", cn, " {\n", NULL);
-
-      Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL);
-
-      if (gccgo_flag && !cgo_flag) {
-	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
-	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
-      }
-
-      String *call = NewString("");
-
-      Printv(call, "\tp.", class_receiver, " = ", NULL);
-      if (cgo_flag) {
-	Printv(call, go_type_name, "(C.", wname, "(C.int(swigDirectorAdd(p))", NULL);
-      } else {
-	Printv(call, fn_with_over_name, "(swigDirectorAdd(p)", NULL);
-      }
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	Printv(call, ", ", NULL);
-
-	p = getParm(p);
-	String *pt = Getattr(p, "type");
-	String *ln = Getattr(p, "lname");
-
-	String *ivar = NewStringf("_swig_i_%d", i);
-
-	String *goin = goGetattr(p, "tmap:goin");
-	if (goin == NULL) {
-	  Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
-	  if (goTypeIsInterface(p, pt)) {
-	    Printv(f_go_wrappers, ".Swigcptr()", NULL);
-	  }
-	  Printv(f_go_wrappers, "\n", NULL);
-	} else {
-	  String *itm = goImType(p, pt);
-	  Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
-	  goin = Copy(goin);
-	  Replaceall(goin, "$input", ln);
-	  Replaceall(goin, "$result", ivar);
-	  Printv(f_go_wrappers, goin, "\n", NULL);
-	  Delete(goin);
-	}
-
-	Setattr(p, "emit:goinput", ivar);
-
-	if (cgo_flag) {
-	  bool c_struct_type;
-	  String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
-	  if (c_struct_type) {
-	    Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
-	  } else {
-	    Printv(call, "C.", ct, "(", ivar, ")", NULL);
-	  }
-	  Delete(ct);
-	} else {
-	  Printv(call, ivar, NULL);
-	}
-	p = nextParm(p);
-      }
-
-      Printv(call, ")", NULL);
-      if (cgo_flag) {
-	Printv(call, ")", NULL);
-      }
-
-      Printv(f_go_wrappers, call, "\n", NULL);
-
-      goargout(parms);
-
-      Printv(f_go_wrappers, "\treturn p\n", NULL);
-      Printv(f_go_wrappers, "}\n\n", NULL);
-
-      SwigType *result = Copy(Getattr(parentNode(n), "classtypeobj"));
-      SwigType_add_pointer(result);
-
-      Swig_save("classDirectorConstructor", n, "wrap:name", "wrap:action", NULL);
-
-      String *dwname = Swig_name_wrapper(name);
-      Append(dwname, unique_id);
-      Setattr(n, "wrap:name", dwname);
-
-      String *action = NewString("");
-      Printv(action, Swig_cresult_name(), " = new SwigDirector_", class_name, "(", NULL);
-      String *pname = Swig_cparm_name(NULL, 0);
-      Printv(action, pname, NULL);
-      Delete(pname);
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	String *pname = Swig_cparm_name(NULL, i + 1);
-	Printv(action, ", ", NULL);
-	if (SwigType_isreference(Getattr(p, "type"))) {
-	  Printv(action, "*", NULL);
-	}
-	Printv(action, pname, NULL);
-	Delete(pname);
-	p = nextParm(p);
-      }
-      Printv(action, ");", NULL);
-      Setattr(n, "wrap:action", action);
-
-      if (cgo_flag) {
-	cgoWrapperInfo info;
-
-	info.n = n;
-	info.go_name = func_name;
-	info.overname = overname;
-	info.wname = wname;
-	info.base = NULL;
-	info.parms = first_parm;
-	info.result = result;
-	info.is_static = false;
-	info.receiver = NULL;
-	info.is_constructor = true;
-	info.is_destructor = false;
-
-	int r = cgoGccWrapper(&info);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-      } else if (!gccgo_flag) {
-	int r = gcFunctionWrapper(wname);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-	r = gccFunctionWrapper(n, NULL, wname, first_parm, result);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-      } else {
-	int r = gccgoFunctionWrapper(n, NULL, wname, first_parm, result);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-      }
-
-      Swig_restore(n);
-
-      Delete(result);
-    }
-
-    String *cxx_director_name = NewString("SwigDirector_");
-    Append(cxx_director_name, class_name);
-
-    String *decl = Swig_method_decl(NULL, Getattr(n, "decl"),
-				    cxx_director_name, first_parm, 0, 0);
-    Printv(f_c_directors_h, "  ", decl, ";\n", NULL);
-    Delete(decl);
-
-    decl = Swig_method_decl(NULL, Getattr(n, "decl"), cxx_director_name, first_parm, 0, 0);
-    Printv(f_c_directors, cxx_director_name, "::", decl, "\n", NULL);
-    Delete(decl);
-
-    Printv(f_c_directors, "    : ", Getattr(parentNode(n), "classtype"), "(", NULL);
-
-    p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      if (i > 0) {
-	Printv(f_c_directors, ", ", NULL);
-      }
-      String *pn = Getattr(p, "name");
-      assert(pn);
-      Printv(f_c_directors, pn, NULL);
-      p = nextParm(p);
-    }
-    Printv(f_c_directors, "),\n", NULL);
-    Printv(f_c_directors, "      go_val(swig_p), swig_mem(0)\n", NULL);
-    Printv(f_c_directors, "{ }\n\n", NULL);
-
-    if (Getattr(n, "sym:overloaded") && !Getattr(n, "sym:nextSibling")) {
-      int r = makeDispatchFunction(n, func_name, cn, is_static, Getattr(parentNode(n), "classtypeobj"), false);
-      if (r != SWIG_OK) {
-	return r;
-      }
-    }
-
-    Delete(cxx_director_name);
-    Delete(go_name);
-    Delete(cn);
-    Delete(go_type_name);
-    Delete(director_struct_name);
-    Delete(fn_name);
-    Delete(fn_with_over_name);
-    Delete(func_name);
-    Delete(func_with_over_name);
-    Delete(wname);
-    Delete(first_type);
-    Delete(first_parm);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDestructor
-   *
-   * Emit a destructor for a director class.
-   * ------------------------------------------------------------ */
-
-  int classDirectorDestructor(Node *n) {
-    if (!is_public(n)) {
-      return SWIG_OK;
-    }
-
-    bool is_ignored = GetFlag(n, "feature:ignore") ? true : false;
-
-    if (!is_ignored) {
-      String *fnname = NewString("DeleteDirector");
-      String *c1 = exportedName(class_name);
-      Append(fnname, c1);
-      Delete(c1);
-
-      String *wname = Swig_name_wrapper(fnname);
-      Append(wname, unique_id);
-
-      Setattr(n, "wrap:name", fnname);
-
-      Swig_DestructorToFunction(n, getNSpace(), getClassType(), CPlusPlus, Extend);
-
-      ParmList *parms = Getattr(n, "parms");
-      Setattr(n, "wrap:parms", parms);
-
-      String *result = NewString("void");
-      int r = makeWrappers(n, fnname, fnname, NULL, wname, NULL, parms, result, isStatic(n));
-      if (r != SWIG_OK) {
-	return r;
-      }
-
-      Delete(result);
-      Delete(fnname);
-      Delete(wname);
-    }
-
-    // Generate the destructor for the C++ director class.  Since the
-    // Go code is keeping a pointer to the C++ object, we need to call
-    // back to the Go code to let it know that the C++ object is gone.
-
-    String *go_name = NewString("Swiggo_DeleteDirector_");
-    Append(go_name, class_name);
-
-    String *cn = exportedName(class_name);
-
-    String *director_struct_name = NewString("_swig_Director");
-    Append(director_struct_name, cn);
-
-    Printv(f_c_directors_h, "  virtual ~SwigDirector_", class_name, "()", NULL);
-
-    String *throws = buildThrow(n);
-    if (throws) {
-      Printv(f_c_directors_h, " ", throws, NULL);
-    }
-
-    Printv(f_c_directors_h, ";\n", NULL);
-
-    String *director_sig = NewString("");
-
-    Printv(director_sig, "SwigDirector_", class_name, "::~SwigDirector_", class_name, "()", NULL);
-
-    if (throws) {
-      Printv(director_sig, " ", throws, NULL);
-      Delete(throws);
-    }
-
-    Printv(director_sig, "\n", NULL);
-    Printv(director_sig, "{\n", NULL);
-
-    if (is_ignored) {
-      Printv(f_c_directors, director_sig, NULL);
-    } else {
-      makeDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
-    }
-
-    Printv(f_c_directors, "  delete swig_mem;\n", NULL);
-
-    Printv(f_c_directors, "}\n\n", NULL);
-
-    Delete(director_sig);
-    Delete(go_name);
-    Delete(cn);
-    Delete(director_struct_name);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * makeDirectorDestructorWrapper
-   *
-   * Emit the function wrapper for the destructor of a director class.
-   * This writes director_sig to f_c_directors and leaves the function
-   * unfinished.
-   * ------------------------------------------------------------ */
-
-  void makeDirectorDestructorWrapper(String *go_name, String *director_struct_name, String *director_sig) {
-    if (cgo_flag) {
-      makeCgoDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
-      return;
-    }
-
-    Printv(f_go_wrappers, "func ", go_name, "(c int) {\n", NULL);
-    if (gccgo_flag) {
-      Printv(f_go_wrappers, "\tSwigCgocallBack()\n", NULL);
-      Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
-    }
-    Printv(f_go_wrappers, "\tswigDirectorLookup(c).(*", director_struct_name, ").", class_receiver, " = 0\n", NULL);
-    Printv(f_go_wrappers, "\tswigDirectorDelete(c)\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    String *wname = NewString("_swiggo_wrap_DeleteDirector_");
-    Append(wname, class_name);
-
-    if (!gccgo_flag) {
-      Printv(f_c_directors, "extern \"C\" void ", wname, "(void*, int);\n", NULL);
-    } else {
-      Printv(f_c_directors, "extern \"C\" void ", wname, "(intgo) __asm__(\"", go_prefix, ".", go_name, "\");\n", NULL);
-    }
-
-    Printv(f_c_directors, director_sig, NULL);
-
-    if (!gccgo_flag) {
-      Printv(f_c_directors, "  struct { intgo p; } SWIGSTRUCTPACKED a;\n", NULL);
-      Printv(f_c_directors, "  a.p = go_val;\n", NULL);
-      Printv(f_c_directors, "  crosscall2(", wname, ", &a, (int) sizeof a);\n", NULL);
-
-      Printv(f_gc_wrappers, "#pragma dynexport ", wname, " ", wname, "\n", NULL);
-      Printv(f_gc_wrappers, "#pragma cgo_export_static ", wname, " ", wname, "\n", NULL);
-      Printv(f_gc_wrappers, "#pragma textflag 7\n", NULL);
-      Printv(f_gc_wrappers, "extern void \xc2\xb7", go_name, "();\n", NULL);
-      Printv(f_gc_wrappers, "void\n", NULL);
-      Printv(f_gc_wrappers, wname, "(void *a, int32 n)\n", NULL);
-      Printv(f_gc_wrappers, "{\n", NULL);
-      Printv(f_gc_wrappers, "\truntime\xc2\xb7" "cgocallback(\xc2\xb7", go_name, ", a, n);\n", NULL);
-      Printv(f_gc_wrappers, "}\n\n", NULL);
-    } else {
-      Printv(f_c_directors, "  ", wname, "(go_val);\n", NULL);
-    }
-
-    Delete(wname);
-  }
-
-  /* ------------------------------------------------------------
-   * makeCgoDirectorDestructorWrapper
-   *
-   * When using cgo, emit the function wrapper for the destructor of a
-   * director class.
-   * ------------------------------------------------------------ */
-
-  void makeCgoDirectorDestructorWrapper(String *go_name, String *director_struct_name, String *director_sig) {
-    String *wname = Copy(go_name);
-    Append(wname, unique_id);
-
-    Printv(f_go_wrappers, "//export ", wname, "\n", NULL);
-    Printv(f_go_wrappers, "func ", wname, "(c int) {\n", NULL);
-    Printv(f_go_wrappers, "\tswigDirectorLookup(c).(*", director_struct_name, ").", class_receiver, " = 0\n", NULL);
-    Printv(f_go_wrappers, "\tswigDirectorDelete(c)\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    Printv(f_c_directors, "extern \"C\" void ", wname, "(intgo);\n", NULL);
-    Printv(f_c_directors, director_sig, NULL);
-    Printv(f_c_directors, "  ", wname, "(go_val);\n", NULL);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorMethod
-   *
-   * Emit a method for a director class, plus its overloads.
-   * ------------------------------------------------------------ */
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    bool is_ignored = GetFlag(n, "feature:ignore") ? true : false;
-
-    // We don't need explicit calls.
-    if (GetFlag(n, "explicitcall")) {
-      return SWIG_OK;
-    }
-
-    String *name = Getattr(n, "sym:name");
-    if (!name) {
-      assert(is_ignored);
-      name = Getattr(n, "name");
-    }
-
-    bool overloaded = Getattr(n, "sym:overloaded") && !Getattr(n, "explicitcallnode");
-    if (!overloaded) {
-      int r = oneClassDirectorMethod(n, parent, super);
-      if (r != SWIG_OK) {
-	return r;
-      }
-    } else {
-      // Handle overloaded methods here, because otherwise we will
-      // reject them in the class_methods hash table.  We need to use
-      // class_methods so that we correctly handle cases where a
-      // function in one class hides a function of the same name in a
-      // parent class.
-      if (!Getattr(class_methods, name)) {
-	for (Node *on = Getattr(n, "sym:overloaded"); on; on = Getattr(on, "sym:nextSibling")) {
-	  // Swig_overload_rank expects wrap:name and wrap:parms to be
-	  // set.
-	  String *wn = Swig_name_wrapper(Getattr(on, "sym:name"));
-	  Append(wn, Getattr(on, "sym:overname"));
-	  Append(wn, unique_id);
-	  Setattr(on, "wrap:name", wn);
-	  Delete(wn);
-	  Setattr(on, "wrap:parms", Getattr(on, "parms"));
-	}
-      }
-
-      int r = oneClassDirectorMethod(n, parent, super);
-      if (r != SWIG_OK) {
-	return r;
-      }
-
-      if (!Getattr(n, "sym:nextSibling"))
-      {
-	// Last overloaded function
-	Node *on = Getattr(n, "sym:overloaded");
-	bool is_static = isStatic(on);
-
-	String *cn = exportedName(Getattr(parent, "sym:name"));
-	String *go_name = buildGoName(name, is_static, false);
-
-	String *director_struct_name = NewString("_swig_Director");
-	Append(director_struct_name, cn);
-
-	int r = makeDispatchFunction(on, go_name, director_struct_name, is_static, director_struct_name, false);
-	if (r != SWIG_OK) {
-	  return r;
-	}
-
-	if (!GetFlag(n, "abstract")) {
-	  String *go_upcall = NewString("Director");
-	  Append(go_upcall, cn);
-	  Append(go_upcall, go_name);
-	  r = makeDispatchFunction(on, go_upcall, director_struct_name, is_static, director_struct_name, true);
-	  if (r != SWIG_OK) {
-	    return r;
-	  }
-	  Delete(go_upcall);
-	}
-
-	Delete(director_struct_name);
-	Delete(go_name);
-	Delete(cn);
-      }
-    }
-    Setattr(class_methods, name, NewString(""));
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * oneClassDirectorMethod
-   *
-   * Emit a method for a director class.
-   * ------------------------------------------------------------ */
-
-  int oneClassDirectorMethod(Node *n, Node *parent, String *super) {
-    String *symname = Getattr(n, "sym:name");
-    if (!checkFunctionVisibility(n, parent)) {
-      return SWIG_OK;
-    }
-
-    bool is_ignored = GetFlag(n, "feature:ignore") ? true : false;
-    bool is_pure_virtual = (Cmp(Getattr(n, "storage"), "virtual") == 0 && Cmp(Getattr(n, "value"), "0") == 0);
-
-    String *name = Getattr(n, "sym:name");
-    if (!name) {
-      assert(is_ignored);
-      name = Getattr(n, "name");
-    }
-
-    String *overname = NULL;
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    }
-
-    String *cn = exportedName(Getattr(parent, "sym:name"));
-
-    String *go_type_name = goCPointerType(Getattr(parent, "classtypeobj"), true);
-
-    String *director_struct_name = NewString("_swig_Director");
-    Append(director_struct_name, cn);
-
-    bool is_static = isStatic(n);
-
-    String *go_name = buildGoName(name, is_static, false);
-
-    ParmList *parms = Getattr(n, "parms");
-    Setattr(n, "wrap:parms", parms);
-
-    Wrapper *dummy = NewWrapper();
-    emit_attach_parmmaps(parms, dummy);
-
-    Swig_typemap_attach_parms("gotype", parms, NULL);
-    Swig_typemap_attach_parms("imtype", parms, NULL);
-    int parm_count = emit_num_arguments(parms);
-
-    SwigType *result = Getattr(n, "type");
-
-    // Save the type for overload processing.
-    Setattr(n, "go:type", result);
-
-    String *interface_name = NewString("_swig_DirectorInterface");
-    Append(interface_name, cn);
-    Append(interface_name, go_name);
-    if (overname) {
-      Append(interface_name, overname);
-    }
-
-    String *callback_name = Copy(director_struct_name);
-    Append(callback_name, "_callback_");
-    Append(callback_name, name);
-    Replace(callback_name, "_swig", "Swig", DOH_REPLACE_FIRST);
-    if (overname) {
-      Append(callback_name, overname);
-    }
-    if (cgo_flag) {
-      Append(callback_name, unique_id);
-    }
-
-    String *upcall_name = Copy(director_struct_name);
-    Append(upcall_name, "_upcall_");
-    Append(upcall_name, go_name);
-
-    String *upcall_wname = Swig_name_wrapper(upcall_name);
-    if (overname) {
-      Append(upcall_wname, overname);
-    }
-    Append(upcall_wname, unique_id);
-
-    String *upcall_gc_name = buildGoWrapperName(upcall_name, overname);
-
-    String *go_with_over_name = Copy(go_name);
-    if (overname) {
-      Append(go_with_over_name, overname);
-    }
-
-    Parm *p = 0;
-    Wrapper *w = NewWrapper();
-
-    Swig_director_parms_fixup(parms);
-
-    Swig_typemap_attach_parms("directorin", parms, w);
-    Swig_typemap_attach_parms("directorargout", parms, w);
-    Swig_typemap_attach_parms("godirectorin", parms, w);
-    Swig_typemap_attach_parms("goin", parms, dummy);
-    Swig_typemap_attach_parms("goargout", parms, dummy);
-
-    DelWrapper(dummy);
-
-    if (!is_ignored) {
-      // We use an interface to see if this method is defined in Go.
-      Printv(f_go_wrappers, "type ", interface_name, " interface {\n", NULL);
-      Printv(f_go_wrappers, "\t", go_with_over_name, "(", NULL);
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	if (i > 0) {
-	  Printv(f_go_wrappers, ", ", NULL);
-	}
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(f_go_wrappers, tm, NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-
-      Printv(f_go_wrappers, ")", NULL);
-
-      if (SwigType_type(result) != T_VOID) {
-	String *tm = goType(n, result);
-	Printv(f_go_wrappers, " ", tm, NULL);
-	Delete(tm);
-      }
-
-      Printv(f_go_wrappers, "\n", NULL);
-      Printv(f_go_wrappers, "}\n\n", NULL);
-
-      if (!GetFlag(n, "abstract")) {
-	if (cgo_flag) {
-	  Printv(f_cgo_comment, "extern ", NULL);
-
-	  if (SwigType_type(result) == T_VOID) {
-	    Printv(f_cgo_comment, "void", NULL);
-	  } else {
-	    bool c_struct_type;
-	    String *ret_type = cgoTypeForGoValue(n, result, &c_struct_type);
-	    Printv(f_cgo_comment, ret_type, NULL);
-	    Delete(ret_type);
-	  }
-
-	  Printv(f_cgo_comment, " ", upcall_wname, "(uintptr_t", NULL);
-
-	  p = parms;
-	  for (int i = 0; i < parm_count; ++i) {
-	    p = getParm(p);
-	    bool c_struct_type;
-	    String *ct = cgoTypeForGoValue(p, Getattr(p, "type"), &c_struct_type);
-	    Printv(f_cgo_comment, ", ", ct, " ", Getattr(p, "lname"), NULL);
-	    p = nextParm(p);
-	  }
-	  Printv(f_cgo_comment, ");\n", NULL);
-	} else {
-	  // Declare the upcall function, which calls the method on
-	  // the parent class.
-
-	  if (!gccgo_flag) {
-	    Printv(f_go_wrappers, "var ", upcall_wname, " unsafe.Pointer\n\n", NULL);
-	  } else {
-	    Printv(f_go_wrappers, "//extern ", go_prefix, "_", upcall_wname, "\n", NULL);
-	  }
-
-	  Printv(f_go_wrappers, "func ", upcall_gc_name, "(_swig_ptr ", go_type_name, NULL);
-
-	  p = parms;
-	  for (int i = 0; i < parm_count; ++i) {
-	    p = getParm(p);
-	    String *tm = goWrapperType(p, Getattr(p, "type"), false);
-	    Printv(f_go_wrappers, ", _ ", tm, NULL);
-	    Delete(tm);
-	    p = nextParm(p);
-	  }
-
-	  Printv(f_go_wrappers, ")", NULL);
-
-	  if (SwigType_type(result) != T_VOID) {
-	    String *tm = goWrapperType(n, result, true);
-	    Printv(f_go_wrappers, " (_swig_ret ", tm, ")", NULL);
-	    Delete(tm);
-	  }
-
-	  if (!gccgo_flag) {
-	    Printv(f_go_wrappers, " {\n", NULL);
-	    Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&_swig_ptr))\n", NULL);
-	    Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", upcall_wname, ", _swig_p)\n", NULL);
-	    Printv(f_go_wrappers, "\treturn\n", NULL);
-	    Printv(f_go_wrappers, "}", NULL);
-	  }
-
-	  Printv(f_go_wrappers, "\n\n", NULL);
-	}
-      }
-
-      // Define the method on the director class in Go.
-
-      Printv(f_go_wrappers, "func (swig_p *", director_struct_name, ") ", go_with_over_name, "(", NULL);
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	if (i > 0) {
-	  Printv(f_go_wrappers, ", ", NULL);
-	}
-	Printv(f_go_wrappers, Getattr(p, "lname"), " ", NULL);
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(f_go_wrappers, tm, NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-
-      Printv(f_go_wrappers, ")", NULL);
-
-      if (SwigType_type(result) != T_VOID) {
-	String *tm = goType(n, result);
-	Printv(f_go_wrappers, " ", tm, NULL);
-	Delete(tm);
-      }
-
-      Printv(f_go_wrappers, " {\n", NULL);
-
-      Printv(f_go_wrappers, "\tif swig_g, swig_ok := swig_p.v.(", interface_name, "); swig_ok {\n", NULL);
-      Printv(f_go_wrappers, "\t\t", NULL);
-      if (SwigType_type(result) != T_VOID) {
-	Printv(f_go_wrappers, "return ", NULL);
-      }
-      Printv(f_go_wrappers, "swig_g.", go_with_over_name, "(", NULL);
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	if (i > 0) {
-	  Printv(f_go_wrappers, ", ", NULL);
-	}
-	Printv(f_go_wrappers, Getattr(p, "lname"), NULL);
-	p = nextParm(p);
-      }
-
-      Printv(f_go_wrappers, ")\n", NULL);
-      if (SwigType_type(result) == T_VOID) {
-	Printv(f_go_wrappers, "\t\treturn\n", NULL);
-      }
-      Printv(f_go_wrappers, "\t}\n", NULL);
-
-      if (GetFlag(n, "abstract")) {
-	Printv(f_go_wrappers, "\tpanic(\"call to pure virtual method\")\n", NULL);
-      } else {
-	String *ret_type = NULL;
-	bool memcpy_ret = false;
-	String *wt = NULL;
-	bool has_goout = false;
-	String *goout = NULL;
-	if (SwigType_type(result) != T_VOID) {
-	  ret_type = goImType(n, result);
-	  Printv(f_go_wrappers, "\tvar swig_r ", ret_type, "\n", NULL);
-	  goout = goTypemapLookup("goout", n, "swig_r");
-	  if (goout) {
-	    has_goout = true;
-	  }
-
-	  if (cgo_flag) {
-	    bool c_struct_type;
-	    Delete(cgoTypeForGoValue(n, result, &c_struct_type));
-	    if (c_struct_type) {
-	      memcpy_ret = true;
-	    }
-	  }
-	}
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  p = getParm(p);
-	  if (goGetattr(p, "tmap:goargout")) {
-	    has_goout = true;
-	  }
-	  p = nextParm(p);
-	}
-
-	String *call = NewString("");
-
-	if (gccgo_flag && !cgo_flag) {
-	  if (has_goout) {
-	    Printv(call, "\tfunc() {\n", NULL);
-	  }
-	  Printv(call, "\tdefer SwigCgocallDone()\n", NULL);
-	  Printv(call, "\tSwigCgocall()\n", NULL);
-	}
-
-	Printv(call, "\t", NULL);
-	if (SwigType_type(result) != T_VOID) {
-	  if (memcpy_ret) {
-	    Printv(call, "swig_r_p := ", NULL);
-	  } else {
-	    Printv(call, "swig_r = ", NULL);
-	    if (cgo_flag) {
-	      Printv(call, "(", ret_type, ")(", NULL);
-	    }
-	  }
-	  if (cgo_flag && goTypeIsInterface(n, result)) {
-	    wt = goWrapperType(n, result, true);
-	    Printv(call, "(", wt, ")(", NULL);
-	  }
-	}
-
-	if (cgo_flag) {
-	  Printv(call, "C.", upcall_wname, NULL);
-	} else {
-	  Printv(call, upcall_gc_name, NULL);
-	}
-	Printv(call, "(", NULL);
-	if (cgo_flag) {
-	  Printv(call, "C.uintptr_t(", NULL);
-	}
-	Printv(call, "swig_p.", go_type_name, NULL);
-	if (cgo_flag) {
-	  Printv(call, ")", NULL);
-	}
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  Printv(call, ", ", NULL);
-	  p = getParm(p);
-	  SwigType *pt = Getattr(p, "type");
-
-	  String *ln = Getattr(p, "lname");
-
-	  String *ivar = NewStringf("_swig_i_%d", i);
-
-	  // This is an ordinary call from Go to C++, so adjust using
-	  // the goin typemap.
-	  String *goin = goGetattr(p, "tmap:goin");
-	  if (goin == NULL) {
-	    Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
-	    if (goTypeIsInterface(p, pt)) {
-	      Printv(f_go_wrappers, ".Swigcptr()", NULL);
-	    }
-	    Printv(f_go_wrappers, "\n", NULL);
-	  } else {
-	    String *itm = goImType(p, pt);
-	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
-	    goin = Copy(goin);
-	    Replaceall(goin, "$input", ln);
-	    Replaceall(goin, "$result", ivar);
-	    Printv(f_go_wrappers, goin, NULL);
-	    Delete(goin);
-	  }
-
-	  Setattr(p, "emit:goinput", ivar);
-
-	  if (cgo_flag) {
-	    bool c_struct_type;
-	    String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
-	    if (c_struct_type) {
-	      Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
-	    } else {
-	      Printv(call, "C.", ct, "(", ivar, ")", NULL);
-	    }
-	  } else {
-	    Printv(call, ivar, NULL);
-	  }
-
-	  p = nextParm(p);
-	}
-
-	Printv(call, ")", NULL);
-
-	if (gccgo_flag && !cgo_flag && has_goout) {
-	  Printv(call, "\n\t}()", NULL);
-	}
-
-	if (cgo_flag) {
-	  if (wt) {
-	    // Close the type conversion to the wrapper type.
-	    Printv(call, ")", NULL);
-	  }
-	  if (SwigType_type(result) != T_VOID && !memcpy_ret) {
-	    // Close the type conversion of the return value.
-	    Printv(call, ")", NULL);
-	  }
-	}
-
-	Printv(call, "\n", NULL);
-
-	Printv(f_go_wrappers, call, NULL);
-	Delete(call);
-
-	if (memcpy_ret) {
-	  Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
-	}
-
-	goargout(parms);
-
-	if (SwigType_type(result) != T_VOID) {
-	  if (goout == NULL) {
-	    Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
-	  } else {
-	    String *tm = goType(n, result);
-	    Printv(f_go_wrappers, "\tvar swig_r_1 ", tm, "\n", NULL);
-	    Replaceall(goout, "$input", "swig_r");
-	    Replaceall(goout, "$result", "swig_r_1");
-	    Printv(f_go_wrappers, goout, "\n", NULL);
-	    Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
-	  }
-	}
-
-	if (ret_type) {
-	  Delete(ret_type);
-	}
-	if (wt) {
-	  Delete(wt);
-	}
-      }
-
-      Printv(f_go_wrappers, "}\n\n", NULL);
-
-      // Define a method in the C++ director class that the C++ upcall
-      // function can call.  This permits an upcall to a protected
-      // method.
-
-      if (!GetFlag(n, "abstract")) {
-	String *upcall_method_name = NewString("_swig_upcall_");
-	Append(upcall_method_name, name);
-	if (overname) {
-	  Append(upcall_method_name, overname);
-	}
-	SwigType *rtype = Getattr(n, "classDirectorMethods:type");
-	String *upcall_decl = Swig_method_decl(rtype, Getattr(n, "decl"), upcall_method_name, parms, 0, 0);
-	Printv(f_c_directors_h, "  ", upcall_decl, " {\n", NULL);
-	Delete(upcall_decl);
-
-	Printv(f_c_directors_h, "    ", NULL);
-	if (SwigType_type(result) != T_VOID) {
-	  Printv(f_c_directors_h, "return ", NULL);
-	}
-
-	String *super_call = Swig_method_call(super, parms);
-	Printv(f_c_directors_h, super_call, ";\n", NULL);
-	Delete(super_call);
-
-	Printv(f_c_directors_h, "  }\n", NULL);
-
-	// Define the C++ function that the Go function calls.
-
-	SwigType *first_type = NULL;
-	Parm *first_parm = parms;
-	if (!is_static) {
-	  first_type = NewString("SwigDirector_");
-	  Append(first_type, class_name);
-	  SwigType_add_pointer(first_type);
-	  first_parm = NewParm(first_type, "p", n);
-	  set_nextSibling(first_parm, parms);
-	}
-
-	Swig_save("classDirectorMethod", n, "wrap:name", "wrap:action", NULL);
-
-	Setattr(n, "wrap:name", upcall_wname);
-
-	String *action = NewString("");
-	if (SwigType_type(result) != T_VOID) {
-	  Printv(action, Swig_cresult_name(), " = (", SwigType_lstr(result, 0), ")", NULL);
-	  if (SwigType_isreference(result)) {
-	    Printv(action, "&", NULL);
-	  }
-	}
-	Printv(action, Swig_cparm_name(NULL, 0), "->", upcall_method_name, "(", NULL);
-
-	p = parms;
-	int i = 0;
-	while (p != NULL) {
-	  if (SwigType_type(Getattr(p, "type")) != T_VOID) {
-	    String *pname = Swig_cparm_name(NULL, i + 1);
-	    if (i > 0) {
-	      Printv(action, ", ", NULL);
-	    }
-
-	    // A parameter whose type is a reference is converted into a
-	    // pointer type by gcCTypeForGoValue.  We are calling a
-	    // function which expects a reference so we need to convert
-	    // back.
-	    if (SwigType_isreference(Getattr(p, "type"))) {
-	      Printv(action, "*", NULL);
-	    }
-
-	    Printv(action, pname, NULL);
-	    Delete(pname);
-	    i++;
-	  }
-	  p = nextSibling(p);
-	}
-	Printv(action, ");", NULL);
-	Setattr(n, "wrap:action", action);
-
-	if (cgo_flag) {
-	  cgoWrapperInfo info;
-
-	  info.n = n;
-	  info.go_name = go_name;
-	  info.overname = overname;
-	  info.wname = upcall_wname;
-	  info.base = NULL;
-	  info.parms = first_parm;
-	  info.result = result;
-	  info.is_static = is_static;
-	  info.receiver = NULL;
-	  info.is_constructor = false;
-	  info.is_destructor = false;
-
-	  int r = cgoGccWrapper(&info);
-	  if (r != SWIG_OK) {
-	    return r;
-	  }
-	} else if (!gccgo_flag) {
-	  // Write the upcall wrapper function.  This is compiled by gc
-	  // and calls the C++ function.
-	  int r = gcFunctionWrapper(upcall_wname);
-	  if (r != SWIG_OK) {
-	    return r;
-	  }
-	  r = gccFunctionWrapper(n, NULL, upcall_wname, first_parm, result);
-	  if (r != SWIG_OK) {
-	    return r;
-	  }
-	} else {
-	  int r = gccgoFunctionWrapper(n, NULL, upcall_wname, first_parm, result);
-	  if (r != SWIG_OK) {
-	    return r;
-	  }
-	}
-
-	Delete(first_type);
-	if (first_parm != parms) {
-	  Delete(first_parm);
-	}
-
-	Swig_restore(n);
-	Delete(upcall_method_name);
-
-	// Define a function that uses the Go director type that other
-	// methods in the Go type can call to get parent methods.
-
-	Printv(f_go_wrappers, "func Director", cn, go_with_over_name, "(p ", cn, NULL);
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  p = getParm(p);
-	  Printv(f_go_wrappers, ", ", Getattr(p, "lname"), " ", NULL);
-	  String *tm = goType(p, Getattr(p, "type"));
-	  Printv(f_go_wrappers, tm, NULL);
-	  Delete(tm);
-	  p = nextParm(p);
-	}
-
-	Printv(f_go_wrappers, ")", NULL);
-
-	if (SwigType_type(result) != T_VOID) {
-	  String *tm = goType(n, result);
-	  Printv(f_go_wrappers, " ", tm, NULL);
-	  Delete(tm);
-	}
-
-	Printv(f_go_wrappers, " {\n", NULL);
-
-	String *ret_type = NULL;
-	bool memcpy_ret = false;
-	String *wt = NULL;
-	String *goout = NULL;
-	if (SwigType_type(result) != T_VOID) {
-	  ret_type = goImType(n, result);
-	  Printv(f_go_wrappers, "\tvar swig_r ", ret_type, "\n", NULL);
-	  goout = goTypemapLookup("goout", n, "swig_r");
-
-	  if (cgo_flag) {
-	    bool c_struct_type;
-	    Delete(cgoTypeForGoValue(n, result, &c_struct_type));
-	    if (c_struct_type) {
-	      memcpy_ret = true;
-	    }
-	  }
-	}
-
-	String *call = NewString("");
-
-	if (gccgo_flag && !cgo_flag) {
-	  if (goout != NULL) {
-	    Printv(call, "\tfunc() {\n", NULL);
-	  }
-	  Printv(call, "\tdefer SwigCgocallDone()\n", NULL);
-	  Printv(call, "\tSwigCgocall()\n", NULL);
-	}
-
-	Printv(call, "\t", NULL);
-	if (SwigType_type(result) != T_VOID) {
-	  if (memcpy_ret) {
-	    Printv(call, "swig_r_p := ", NULL);
-	  } else {
-	    Printv(call, "swig_r = ", NULL);
-	    if (cgo_flag) {
-	      Printv(call, "(", ret_type, ")(", NULL);
-	    }
-	  }
-	  if (cgo_flag && goTypeIsInterface(n, result)) {
-	    wt = goWrapperType(n, result, true);
-	    Printv(call, "(", wt, ")(", NULL);
-	  }
-	}
-
-	if (cgo_flag) {
-	  Printv(call, "C.", upcall_wname, NULL);
-	} else {
-	  Printv(call, upcall_gc_name, NULL);
-	}
-	Printv(call, "(", NULL);
-	if (cgo_flag) {
-	  Printv(call, "C.uintptr_t(", NULL);
-	}
-	Printv(call, "p.(*", director_struct_name, ").", go_type_name, NULL);
-	if (cgo_flag) {
-	  Printv(call, ")", NULL);
-	}
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  Printv(call, ", ", NULL);
-	  p = getParm(p);
-	  SwigType *pt = Getattr(p, "type");
-
-	  String *ivar = NewStringf("_swig_i_%d", i);
-
-	  String *ln = Copy(Getattr(p, "lname"));
-
-	  String *goin = goGetattr(p, "tmap:goin");
-	  if (goin == NULL) {
-	    Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
-	    if (goTypeIsInterface(p, pt)) {
-	      Printv(f_go_wrappers, ".Swigcptr()", NULL);
-	    }
-	    Printv(f_go_wrappers, "\n", NULL);
-	  } else {
-	    String *itm = goImType(p, pt);
-	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
-	    goin = Copy(goin);
-	    Replaceall(goin, "$input", ln);
-	    Replaceall(goin, "$result", ivar);
-	    Printv(f_go_wrappers, goin, NULL);
-	    Delete(goin);
-	  }
-
-	  Setattr(p, "emit:goinput", ivar);
-
-	  if (cgo_flag) {
-	    bool c_struct_type;
-	    String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
-	    if (c_struct_type) {
-	      Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
-	    } else {
-	      Printv(call, "C.", ct, "(", ivar, ")", NULL);
-	    }
-	  } else {
-	    Printv(call, ivar, NULL);
-	  }
-
-	  Delete(ln);
-
-	  p = nextParm(p);
-	}
-
-	Printv(call, ")", NULL);
-
-	if (gccgo_flag && !cgo_flag && goout != NULL) {
-	  Printv(call, "\n\t}()", NULL);
-	}
-
-	if (cgo_flag) {
-	  if (wt) {
-	    // Close the type conversion to the wrapper type.
-	    Printv(call, ")", NULL);
-	  }
-	  if (SwigType_type(result) != T_VOID && !memcpy_ret) {
-	    // Close the type conversion of the return value.
-	    Printv(call, ")", NULL);
-	  }
-	}
-
-	Printv(call, "\n", NULL);
-
-	Printv(f_go_wrappers, call, NULL);
-	Delete(call);
-
-	if (memcpy_ret) {
-	  Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
-	}
-
-	goargout(parms);
-
-	if (SwigType_type(result) != T_VOID) {
-	  if (goout == NULL) {
-	    Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
-	  } else {
-	    String *tm = goType(n, result);
-	    Printv(f_go_wrappers, "\tvar swig_r_1 ", tm, "\n", NULL);
-	    Replaceall(goout, "$input", "swig_r");
-	    Replaceall(goout, "$result", "swig_r_1");
-	    Printv(f_go_wrappers, goout, "\n", NULL);
-	    Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
-	  }
-	}
-
-	Printv(f_go_wrappers, "}\n\n", NULL);
-
-	if (ret_type) {
-	  Delete(ret_type);
-	}
-	if (wt) {
-	  Delete(wt);
-	}
-      }
-
-      // The Go function which invokes the method.  This is called by
-      // the C++ method on the director class.
-
-      if (cgo_flag) {
-	Printv(f_go_wrappers, "//export ", callback_name, "\n", NULL);
-      }
-
-      Printv(f_go_wrappers, "func ", callback_name, "(swig_c int", NULL);
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	String *tm = goWrapperType(p, Getattr(p, "type"), false);
-	Printv(f_go_wrappers, ", ", Getattr(p, "lname"), " ", tm, NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-
-      Printv(f_go_wrappers, ") ", NULL);
-      String *result_wrapper = NULL;
-      if (SwigType_type(result) != T_VOID) {
-	result_wrapper = goWrapperType(n, result, true);
-	Printv(f_go_wrappers, "(swig_result ", result_wrapper, ") ", NULL);
-      }
-      Printv(f_go_wrappers, "{\n", NULL);
-
-      if (is_ignored) {
-	Printv(f_go_wrappers, "\treturn\n", NULL);
-      } else {
-	bool result_is_interface = false;
-	String *goout = NULL;
-	if (SwigType_type(result) != T_VOID) {
-	  result_is_interface = goTypeIsInterface(NULL, result);
-	  Printv(f_go_wrappers, "\tvar swig_r ", NULL);
-	  if (!result_is_interface) {
-	    Printv(f_go_wrappers, goType(n, result), NULL);
-	  } else {
-	    Printv(f_go_wrappers, result_wrapper, NULL);
-	  }
-	  Printv(f_go_wrappers, "\n", NULL);
-	  goout = goTypemapLookup("godirectorout", n, "swig_r");
-	}
-
-	String *call = NewString("");
-	Printv(call, "\t", NULL);
-
-	if (SwigType_type(result) != T_VOID) {
-	  Printv(call, "swig_r = ", NULL);
-	  if (result_is_interface) {
-	    Printv(call, result_wrapper, "(", NULL);
-	  }
-	}
-	Printv(call, "swig_p.", go_with_over_name, "(", NULL);
-
-	String *goincode = NewString("");
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  p = getParm(p);
-	  if (i > 0) {
-	    Printv(call, ", ", NULL);
-	  }
-	  SwigType *pt = Getattr(p, "type");
-
-	  String *ln = NewString("");
-
-	  // If the Go representation is an interface type class, then
-	  // we are receiving a uintptr, and must convert to the
-	  // interface.
-	  bool is_interface = goTypeIsInterface(p, pt);
-	  if (is_interface) {
-	    // Passing is_result as true to goWrapperType gives us the
-	    // name of the Go type we need to convert to an interface.
-	    String *wt = goWrapperType(p, pt, true);
-	    Printv(ln, wt, "(", NULL);
-	    Delete(wt);
-	  }
-
-	  Printv(ln, Getattr(p, "lname"), NULL);
-
-	  if (is_interface) {
-	    Printv(ln, ")", NULL);
-	  }
-
-	  String *goin = goGetattr(p, "tmap:godirectorin");
-	  if (goin == NULL) {
-	    Printv(call, ln, NULL);
-	  } else {
-	    String *ivar = NewString("");
-	    Printf(ivar, "_swig_i_%d", i);
-	    String *itm = goType(p, pt);
-	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
-	    goin = Copy(goin);
-	    Replaceall(goin, "$input", ln);
-	    Replaceall(goin, "$result", ivar);
-	    Printv(goincode, goin, "\n", NULL);
-	    Delete(goin);
-	    Printv(call, ivar, NULL);
-	    Delete(ivar);
-	  }
-
-	  Delete(ln);
-
-	  p = nextParm(p);
-	}
-
-	Printv(call, ")", NULL);
-
-	if (result_is_interface) {
-	  Printv(call, ".Swigcptr())", NULL);
-	}
-	Printv(call, "\n", NULL);
-
-	if (gccgo_flag && !cgo_flag) {
-	  if (goout != NULL) {
-	    Printv(f_go_wrappers, "\tfunc() {\n", NULL);
-	  }
-	  Printv(f_go_wrappers, "\tSwigCgocallBack()\n", NULL);
-	  Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
-	}
-
-	Printv(f_go_wrappers, "\tswig_p := swigDirectorLookup(swig_c).(*", director_struct_name, ")\n", NULL);
-	Printv(f_go_wrappers, goincode, NULL);
-	Printv(f_go_wrappers, call, NULL);
-	Delete(call);
-
-	if (gccgo_flag && !cgo_flag && goout != NULL) {
-	  Printv(f_go_wrappers, "\t}()\n", NULL);
-	}
-
-	if (SwigType_type(result) != T_VOID) {
-	  if (goout == NULL) {
-	    Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
-	  } else {
-	    String *tm = goImType(n, result);
-	    Printv(f_go_wrappers, "\tvar swig_r_1 ", tm, "\n", NULL);
-	    Replaceall(goout, "$input", "swig_r");
-	    Replaceall(goout, "$result", "swig_r_1");
-	    Printv(f_go_wrappers, goout, "\n", NULL);
-	    Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
-	  }
-	}
-      }
-
-      Printv(f_go_wrappers, "}\n\n", NULL);
-
-      Delete(result_wrapper);
-
-      Delete(upcall_wname);
-      Delete(upcall_gc_name);
-      Delete(go_with_over_name);
-    }
-
-    if (!is_ignored || is_pure_virtual) {
-      // Declare the method for the director class.
-
-      SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-      String *decl = Swig_method_decl(rtype, Getattr(n, "decl"), Getattr(n, "name"), parms, 0, 0);
-      Printv(f_c_directors_h, "  virtual ", decl, NULL);
-      Delete(decl);
-
-      String *qname = NewString("");
-      Printv(qname, "SwigDirector_", class_name, "::", Getattr(n, "name"), NULL);
-      decl = Swig_method_decl(rtype, Getattr(n, "decl"), qname, parms, 0, 0);
-      Printv(w->def, decl, NULL);
-      Delete(decl);
-      Delete(qname);
-
-      String *throws = buildThrow(n);
-      if (throws) {
-	Printv(f_c_directors_h, " ", throws, NULL);
-	Printv(w->def, " ", throws, NULL);
-	Delete(throws);
-      }
-
-      Printv(f_c_directors_h, ";\n", NULL);
-
-      Printv(w->def, " {\n", NULL);
-
-      if (SwigType_type(result) != T_VOID) {
-	Wrapper_add_local(w, "c_result", SwigType_lstr(result, "c_result"));
-      }
-
-      if (!is_ignored) {
-	makeDirectorMethodWrapper(n, w, callback_name);
-      } else {
-	assert(is_pure_virtual);
-	Printv(w->code, "  _swig_gopanic(\"call to pure virtual function ", Getattr(parent, "sym:name"), name, "\");\n", NULL);
-	if (SwigType_type(result) != T_VOID) {
-	  String *retstr = SwigType_rcaststr(result, "c_result");
-	  Printv(w->code, "  return ", retstr, ";\n", NULL);
-	  Delete(retstr);
-	}
-      }
-
-      Printv(w->code, "}", NULL);
-
-      Replaceall(w->code, "$symname", symname);
-      Wrapper_print(w, f_c_directors);
-    }
-
-    Delete(cn);
-    Delete(go_type_name);
-    Delete(director_struct_name);
-    Delete(interface_name);
-    Delete(callback_name);
-    Delete(upcall_name);
-    Delete(go_name);
-    DelWrapper(w);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * makeDirectorMethodWrapper
-   *
-   * Emit the function wrapper for a director method.
-   * ------------------------------------------------------------ */
-  void makeDirectorMethodWrapper(Node *n, Wrapper *w, String *callback_name) {
-    if (cgo_flag) {
-      makeCgoDirectorMethodWrapper(n, w, callback_name);
-      return;
-    }
-
-    ParmList *parms = Getattr(n, "wrap:parms");
-    SwigType *result = Getattr(n, "type");
-
-    String *callback_wname = Swig_name_wrapper(callback_name);
-    Append(callback_wname, unique_id);
-
-    if (!gccgo_flag) {
-      Printv(f_c_directors, "extern \"C\" void ", callback_wname, "(void*, int);\n", NULL);
-    } else {
-      Printv(f_c_directors, "extern \"C\" ", NULL);
-
-      String *fnname = NewString("");
-      Printv(fnname, callback_wname, "(int", NULL);
-
-      Parm *p = parms;
-      while (p) {
-	while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	  p = Getattr(p, "tmap:directorin:next");
-	}
-	String *cg = gccgoCTypeForGoValue(p, Getattr(p, "type"),
-					  Getattr(p, "lname"));
-	Printv(fnname, ", ", cg, NULL);
-	Delete(cg);
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      Printv(fnname, ")", NULL);
-
-      if (SwigType_type(result) == T_VOID) {
-	Printv(f_c_directors, "void ", fnname, NULL);
-      } else {
-	String *tm = gccgoCTypeForGoValue(n, result, fnname);
-	Printv(f_c_directors, tm, NULL);
-	Delete(tm);
-      }
-
-      Delete(fnname);
-
-      Printv(f_c_directors, " __asm__(\"", go_prefix, ".", callback_name, "\");\n", NULL);
-    }
-
-    if (!gccgo_flag) {
-      Printv(w->code, "  struct {\n", NULL);
-      Printv(w->code, "    intgo go_val;\n", NULL);
-
-      Parm *p = parms;
-      while (p) {
-	while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	  p = Getattr(p, "tmap:directorin:next");
-	}
-	String *ln = Getattr(p, "lname");
-	String *cg = gcCTypeForGoValue(p, Getattr(p, "type"), ln);
-	Printv(w->code, "      ", cg, ";\n", NULL);
-	Delete(cg);
-	p = Getattr(p, "tmap:directorin:next");
-      }
-      if (SwigType_type(result) != T_VOID) {
-	Printv(w->code, "    long : 0;\n", NULL);
-	String *rname = NewString(Swig_cresult_name());
-	String *cg = gcCTypeForGoValue(n, result, rname);
-	Printv(w->code, "    ", cg, ";\n", NULL);
-	Delete(cg);
-	Delete(rname);
-      }
-
-      Printv(w->code, "  } SWIGSTRUCTPACKED swig_a;\n", NULL);
-      Printv(w->code, "  swig_a.go_val = go_val;\n", NULL);
-
-      p = parms;
-      while (p) {
-	while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	  p = Getattr(p, "tmap:directorin:next");
-	}
-	String *tm = Getattr(p, "tmap:directorin");
-	if (!tm) {
-	  Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file,
-		       line_number, "Unable to use type %s as director method argument\n", SwigType_str(Getattr(p, "type"), 0));
-	} else {
-	  tm = Copy(tm);
-	  String *ln = Getattr(p, "lname");
-	  String *input = NewString("");
-	  Printv(input, "swig_a.", ln, NULL);
-	  Setattr(p, "emit:directorinput", input);
-	  Replaceall(tm, "$input", input);
-	  Replaceall(tm, "$owner", "0");
-	  Delete(input);
-	  Printv(w->code, "\t", tm, "\n", NULL);
-	  Delete(tm);
-	}
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      Printv(w->code, "  crosscall2(", callback_wname, ", &swig_a, (int) sizeof swig_a);\n", NULL);
-
-      /* Marshal outputs */
-      for (p = parms; p;) {
-	String *tm;
-	if ((tm = Getattr(p, "tmap:directorargout"))) {
-	  tm = Copy(tm);
-	  Replaceall(tm, "$result", "jresult");
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  Delete(tm);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      if (SwigType_type(result) != T_VOID) {
-	String *result_str = NewString("c_result");
-	String *tm = Swig_typemap_lookup("directorout", n, result_str, NULL);
-	if (!tm) {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use type %s as director method result\n", SwigType_str(result, 0));
-	} else {
-	  static const String *swig_a_result = NewStringf("swig_a.%s", Swig_cresult_name());
-	  Replaceall(tm, "$input", swig_a_result);
-	  Replaceall(tm, "$result", "c_result");
-	  Printv(w->code, "  ", tm, "\n", NULL);
-	  String *retstr = SwigType_rcaststr(result, "c_result");
-	  Printv(w->code, "  return ", retstr, ";\n", NULL);
-	  Delete(retstr);
-	  Delete(tm);
-	}
-	Delete(result_str);
-      }
-
-      // The C wrapper code which calls the Go function.
-      Printv(f_gc_wrappers, "#pragma dynexport ", callback_wname, " ", callback_wname, "\n", NULL);
-      Printv(f_gc_wrappers, "#pragma cgo_export_static ", callback_wname, " ", callback_wname, "\n", NULL);
-      Printv(f_gc_wrappers, "#pragma textflag 7\n", NULL);
-      Printv(f_gc_wrappers, "extern void \xc2\xb7", callback_name, "();\n", NULL);
-      Printv(f_gc_wrappers, "void\n", NULL);
-      Printv(f_gc_wrappers, callback_wname, "(void *a, int32 n)\n", NULL);
-      Printv(f_gc_wrappers, "{\n", NULL);
-      Printv(f_gc_wrappers, "\truntime\xc2\xb7" "cgocallback(\xc2\xb7", callback_name, ", a, n);\n", NULL);
-      Printv(f_gc_wrappers, "}\n\n", NULL);
-    } else {
-      if (SwigType_type(result) != T_VOID) {
-	String *r = NewString(Swig_cresult_name());
-	String *tm = gccgoCTypeForGoValue(n, result, r);
-	Wrapper_add_local(w, r, tm);
-	Delete(tm);
-	Delete(r);
-      }
-
-      String *args = NewString("");
-
-      Parm *p = parms;
-      while (p) {
-	while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	  p = Getattr(p, "tmap:directorin:next");
-	}
-
-	String *pn = NewString("g");
-	Append(pn, Getattr(p, "lname"));
-	Setattr(p, "emit:directorinput", pn);
-
-	String *tm = gccgoCTypeForGoValue(n, Getattr(p, "type"), pn);
-	Wrapper_add_local(w, pn, tm);
-	Delete(tm);
-
-	tm = Getattr(p, "tmap:directorin");
-	if (!tm) {
-	  Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file,
-		       line_number, "Unable to use type %s as director method argument\n", SwigType_str(Getattr(p, "type"), 0));
-	} else {
-	  tm = Copy(tm);
-	  Replaceall(tm, "$input", pn);
-	  Replaceall(tm, "$owner", 0);
-	  Printv(w->code, "  ", tm, "\n", NULL);
-	  Delete(tm);
-
-	  Printv(args, ", ", pn, NULL);
-	}
-
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      Printv(w->code, "  ", NULL);
-      if (SwigType_type(result) != T_VOID) {
-	Printv(w->code, Swig_cresult_name(), " = ", NULL);
-      }
-      Printv(w->code, callback_wname, "(go_val", args, ");\n", NULL);
-
-      /* Marshal outputs */
-      for (p = parms; p;) {
-	String *tm;
-	if ((tm = Getattr(p, "tmap:directorargout"))) {
-	  tm = Copy(tm);
-	  Replaceall(tm, "$result", "jresult");
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  Delete(tm);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      if (SwigType_type(result) != T_VOID) {
-	String *result_str = NewString("c_result");
-	String *tm = Swig_typemap_lookup("directorout", n, result_str, NULL);
-	if (!tm) {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use type %s as director method result\n", SwigType_str(result, 0));
-	} else {
-	  Replaceall(tm, "$input", Swig_cresult_name());
-	  Replaceall(tm, "$result", "c_result");
-	  Printv(w->code, "  ", tm, "\n", NULL);
-	  String *retstr = SwigType_rcaststr(result, "c_result");
-	  Printv(w->code, "  return ", retstr, ";\n", NULL);
-	  Delete(retstr);
-	  Delete(tm);
-	}
-	Delete(result_str);
-      }
-    }
-
-    Delete(callback_wname);
-  }
-
-  /* ------------------------------------------------------------
-   * makeDirectorMethodWrapper
-   *
-   * Emit the function wrapper for a director method for cgo.
-   * ------------------------------------------------------------ */
-
-  void makeCgoDirectorMethodWrapper(Node *n, Wrapper *w, String *callback_name) {
-    ParmList *parms = Getattr(n, "wrap:parms");
-    SwigType *result = Getattr(n, "type");
-
-    Printv(f_c_directors, "extern \"C\" ", NULL);
-
-    String *fnname = Copy(callback_name);
-    Append(fnname, "(int");
-
-    Parm *p = parms;
-    while (p) {
-      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	p = Getattr(p, "tmap:directorin:next");
-      }
-      String *cg = gcCTypeForGoValue(p, Getattr(p, "type"), Getattr(p, "lname"));
-      Printv(fnname, ", ", cg, NULL);
-      Delete(cg);
-      p = Getattr(p, "tmap:directorin:next");
-    }
-
-    Printv(fnname, ")", NULL);
-
-    if (SwigType_type(result) == T_VOID) {
-      Printv(f_c_directors, "void ", fnname, NULL);
-    } else {
-      String *tm = gcCTypeForGoValue(n, result, fnname);
-      Printv(f_c_directors, tm, NULL);
-      Delete(tm);
-    }
-
-    Delete(fnname);
-
-    Printv(f_c_directors, ";\n", NULL);
-
-    if (SwigType_type(result) != T_VOID) {
-      String *r = NewString(Swig_cresult_name());
-      String *tm = gcCTypeForGoValue(n, result, r);
-      Wrapper_add_local(w, r, tm);
-      Delete(tm);
-      Delete(r);
-    }
-
-    String *args = NewString("");
-
-    p = parms;
-    while (p) {
-      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      String *pn = NewString("swig_");
-      Append(pn, Getattr(p, "lname"));
-      Setattr(p, "emit:directorinput", pn);
-
-      String *tm = gcCTypeForGoValue(p, Getattr(p, "type"), pn);
-      Wrapper_add_local(w, pn, tm);
-      Delete(tm);
-
-      tm = Getattr(p, "tmap:directorin");
-      if (!tm) {
-	Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file,
-		     line_number, "Unable to use type %s as director method argument\n", SwigType_str(Getattr(p, "type"), 0));
-      } else {
-	tm = Copy(tm);
-	Replaceall(tm, "$input", pn);
-	Replaceall(tm, "$owner", 0);
-	Printv(w->code, "  ", tm, "\n", NULL);
-	Delete(tm);
-
-	Printv(args, ", ", pn, NULL);
-      }
-
-      p = Getattr(p, "tmap:directorin:next");
-    }
-
-    Printv(w->code, "  ", NULL);
-    if (SwigType_type(result) != T_VOID) {
-      Printv(w->code, Swig_cresult_name(), " = ", NULL);
-    }
-    Printv(w->code, callback_name, "(go_val", args, ");\n", NULL);
-
-    /* Marshal outputs */
-    for (p = parms; p; ) {
-      String *tm;
-      if ((tm = Getattr(p, "tmap:directorargout"))) {
-	tm = Copy(tm);
-	Replaceall(tm, "$result", "jresult");
-	Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	Printv(w->code, tm, "\n", NULL);
-	Delete(tm);
-	p = Getattr(p, "tmap:directorargout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    if (SwigType_type(result) != T_VOID) {
-      String *result_str = NewString("c_result");
-      String *tm = Swig_typemap_lookup("directorout", n, result_str, NULL);
-      if (!tm) {
-	Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		     "Unable to use type %s as director method result\n", SwigType_str(result, 0));
-      } else {
-	tm = Copy(tm);
-	Replaceall(tm, "$input", Swig_cresult_name());
-	Replaceall(tm, "$result", "c_result");
-	Printv(w->code, "  ", tm, "\n", NULL);
-	String *retstr = SwigType_rcaststr(result, "c_result");
-	Printv(w->code, "  return ", retstr, ";\n", NULL);
-	Delete(retstr);
-	Delete(tm);
-      }
-      Delete(result_str);
-    }
-  }
-
-
-  /* ------------------------------------------------------------
-   * classDirectorEnd
-   *
-   * Complete support for a director class.
-   * ------------------------------------------------------------ */
-
-  int classDirectorEnd(Node *n) {
-    (void) n;
-
-    Printv(f_c_directors_h, " private:\n", NULL);
-    Printv(f_c_directors_h, "  intgo go_val;\n", NULL);
-    Printv(f_c_directors_h, "  Swig_memory *swig_mem;\n", NULL);
-    Printv(f_c_directors_h, "};\n\n", NULL);
-
-    class_name = NULL;
-    class_node = NULL;
-
-    Delete(class_receiver);
-    class_receiver = NULL;
-
-    Delete(class_methods);
-    class_methods = NULL;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDisown
-   *
-   * I think Go does not require a disown method.
-   * ------------------------------------------------------------ */
-
-  int classDirectorDisown(Node *n) {
-    (void) n;
-    return SWIG_OK;
-  }
-
-  /*----------------------------------------------------------------------
-   * buildThrow()
-   *
-   * Build and return a throw clause if needed.
-   *--------------------------------------------------------------------*/
-
-  String *buildThrow(Node *n) {
-    ParmList *throw_parm_list = Getattr(n, "throws");
-    if (!throw_parm_list && !Getattr(n, "throw"))
-      return NULL;
-    String *ret = NewString("throw(");
-    if (throw_parm_list) {
-      Swig_typemap_attach_parms("throws", throw_parm_list, NULL);
-    }
-    bool first = true;
-    for (Parm *p = throw_parm_list; p; p = nextSibling(p)) {
-      if (Getattr(p, "tmap:throws")) {
-	if (first) {
-	  first = false;
-	} else {
-	  Printv(ret, ", ", NULL);
-	}
-	String *s = SwigType_str(Getattr(p, "type"), 0);
-	Printv(ret, s, NULL);
-	Delete(s);
-      }
-    }
-    Printv(ret, ")", NULL);
-    return ret;
-  }
-
-  /*----------------------------------------------------------------------
-   * extraDirectorProtectedCPPMethodsRequired()
-   *
-   * We don't need to check upcall when calling methods.
-   *--------------------------------------------------------------------*/
-
-  bool extraDirectorProtectedCPPMethodsRequired() const {
-    return false;
-  }
-
-  /*----------------------------------------------------------------------
-   * makeDispatchFunction
-   *
-   * Make a dispatch function for an overloaded C++ function.  The
-   * receiver parameter is the receiver for a method, unless is_upcall
-   * is true.  If is_upcall is true, then the receiver parameter is
-   * the type of the first argument to the function.
-   *--------------------------------------------------------------------*/
-
-  int makeDispatchFunction(Node *n, String *go_name, String *receiver, bool is_static, SwigType *director_struct, bool is_upcall) {
-    bool is_director = director_struct ? true : false;
-
-    String *nodetype = Getattr(n, "nodeType");
-    bool is_constructor = Cmp(nodetype, "constructor") == 0;
-    bool is_destructor = Cmp(nodetype, "destructor") == 0;
-
-    bool can_use_receiver = (!is_constructor && !is_destructor && !is_upcall);
-
-    bool use_receiver = (!is_static && can_use_receiver);
-
-    bool add_to_interface = (interfaces && !is_constructor && !is_destructor && !is_static && !is_upcall);
-
-    List *dispatch = Swig_overload_rank(n, false);
-    int nfunc = Len(dispatch);
-
-    SwigType *all_result;
-    bool mismatch;
-    if (is_constructor) {
-      assert(!is_upcall);
-      if (!is_director) {
-	all_result = Copy(Getattr(class_node, "classtypeobj"));
-      } else {
-	all_result = Copy(director_struct);
-      }
-      mismatch = false;
-    } else {
-      all_result = NULL;
-      mismatch = false;
-      bool any_void = false;
-      for (int i = 0; i < nfunc; ++i) {
-	Node *nn = Getitem(dispatch, i);
-	Node *ni = Getattr(nn, "directorNode") ? Getattr(nn, "directorNode") : nn;
-	SwigType *result = Getattr(ni, "go:type");
-	assert(result);
-
-	if (SwigType_type(result) == T_VOID) {
-	  if (all_result) {
-	    mismatch = true;
-	  }
-	  any_void = true;
-	} else {
-	  if (any_void) {
-	    mismatch = true;
-	  } else if (!all_result) {
-	    all_result = Copy(result);
-	  } else if (Cmp(result, all_result) != 0) {
-	    mismatch = true;
-	  }
-	}
-      }
-      if (mismatch) {
-	Delete(all_result);
-	all_result = NULL;
-      } else if (all_result) {
-	;
-      } else {
-	all_result = NewString("void");
-      }
-    }
-
-    Printv(f_go_wrappers, "func ", NULL);
-
-    if (receiver && use_receiver) {
-      Printv(f_go_wrappers, "(p ", receiver, ") ", NULL);
-    }
-
-    Printv(f_go_wrappers, go_name, "(", NULL);
-    if (is_director && is_constructor) {
-      Printv(f_go_wrappers, "abi interface{}, ", NULL);
-      assert(!add_to_interface);
-    }
-    if (is_upcall) {
-      Printv(f_go_wrappers, "p *", receiver, ", ", NULL);
-      assert(!add_to_interface);
-    }
-    Printv(f_go_wrappers, "a ...interface{})", NULL);
-
-    if (add_to_interface) {
-      Printv(interfaces, "\t", go_name, "(a ...interface{})", NULL);
-    }
-
-    if (mismatch) {
-      Printv(f_go_wrappers, " interface{}", NULL);
-      if (add_to_interface) {
-	Printv(interfaces, " interface{}", NULL);
-      }
-    } else if (all_result && SwigType_type(all_result) != T_VOID) {
-      if (is_director && is_constructor) {
-	Printv(f_go_wrappers, " ", receiver, NULL);
-	if (add_to_interface) {
-	  Printv(interfaces, " ", receiver, NULL);
-	}
-      } else {
-	String *tm = goType(n, all_result);
-	Printv(f_go_wrappers, " ", tm, NULL);
-	if (add_to_interface) {
-	  Printv(interfaces, " ", tm, NULL);
-	}
-	Delete(tm);
-      }
-    }
-    Printv(f_go_wrappers, " {\n", NULL);
-    if (add_to_interface) {
-      Printv(interfaces, "\n", NULL);
-    }
-
-    Printv(f_go_wrappers, "\targc := len(a)\n", NULL);
-
-    for (int i = 0; i < nfunc; ++i) {
-      int fn = 0;
-      Node *nn = Getitem(dispatch, i);
-      Node *ni = Getattr(nn, "directorNode") ? Getattr(nn, "directorNode") : nn;
-      Parm *pi = Getattr(ni, "wrap:parms");
-
-      // If we are using a receiver, we want to ignore a leading self
-      // parameter.  Because of the way this is called, there may or
-      // may not be a self parameter at this point.
-      if (use_receiver && pi && Getattr(pi, "self")) {
-	pi = getParm(pi);
-	if (pi) {
-	  pi = nextParm(pi);
-	}
-      }
-
-      int num_required = emit_num_required(pi);
-      int num_arguments = emit_num_arguments(pi);
-      bool varargs = emit_isvarargs(pi) ? true : false;
-
-      if (varargs) {
-	Printf(f_go_wrappers, "\tif argc >= %d {\n", num_required);
-      } else {
-	if (num_required == num_arguments) {
-	  Printf(f_go_wrappers, "\tif argc == %d {\n", num_required);
-	} else {
-	  Printf(f_go_wrappers, "\tif argc >= %d && argc <= %d {\n", num_required, num_arguments);
-	}
-      }
-
-      // Build list of collisions with the same number of arguments.
-      List *coll = NewList();
-      for (int k = i + 1; k < nfunc; ++k) {
-	Node *nnk = Getitem(dispatch, k);
-	Node *nk = Getattr(nnk, "directorNode") ? Getattr(nnk, "directorNode") : nnk;
-	Parm *pk = Getattr(nk, "wrap:parms");
-	if (use_receiver && pk && Getattr(pk, "self")) {
-	  pk = getParm(pk);
-	  if (pk) {
-	    pk = nextParm(pk);
-	  }
-	}
-	int nrk = emit_num_required(pk);
-	int nak = emit_num_arguments(pk);
-	if ((nrk >= num_required && nrk <= num_arguments)
-	    || (nak >= num_required && nak <= num_arguments)
-	    || (nrk <= num_required && nak >= num_arguments)
-	    || (varargs && nrk >= num_required)) {
-	  Append(coll, nk);
-	}
-      }
-
-      int num_braces = 0;
-      if (Len(coll) > 0 && num_arguments > 0) {
-	int j = 0;
-	Parm *pj = pi;
-	while (pj) {
-	  pj = getParm(pj);
-	  if (!pj) {
-	    break;
-	  }
-
-	  // If all the overloads have the same type in this position,
-	  // we can omit the check.
-	  SwigType *tm = goOverloadType(pj, Getattr(pj, "type"));
-	  bool emitcheck = false;
-	  for (int k = 0; k < Len(coll) && !emitcheck; ++k) {
-	    Node *nk = Getitem(coll, k);
-	    Parm *pk = Getattr(nk, "wrap:parms");
-	    if (use_receiver && pk && Getattr(pk, "self")) {
-	      pk = getParm(pk);
-	      if (pk) {
-		pk = nextParm(pk);
-	      }
-	    }
-	    int nak = emit_num_arguments(pk);
-	    if (nak <= j)
-	      continue;
-	    int l = 0;
-	    Parm *pl = pk;
-	    while (pl && l <= j) {
-	      pl = getParm(pl);
-	      if (!pl) {
-		break;
-	      }
-	      if (l == j) {
-		SwigType *tml = goOverloadType(pl, Getattr(pl, "type"));
-		if (Cmp(tm, tml) != 0) {
-		  emitcheck = true;
-		}
-		Delete(tml);
-	      }
-	      pl = nextParm(pl);
-	      ++l;
-	    }
-	  }
-
-	  if (emitcheck) {
-	    if (j >= num_required) {
-	      Printf(f_go_wrappers, "\t\tif argc > %d {\n", j);
-	      ++num_braces;
-	    }
-
-	    fn = i + 1;
-	    Printf(f_go_wrappers, "\t\tif _, ok := a[%d].(%s); !ok {\n", j, tm);
-	    Printf(f_go_wrappers, "\t\t\tgoto check_%d\n", fn);
-	    Printv(f_go_wrappers, "\t\t}\n", NULL);
-	  }
-
-	  Delete(tm);
-
-	  pj = nextParm(pj);
-
-	  ++j;
-	}
-      }
-
-      for (; num_braces > 0; --num_braces) {
-	Printv(f_go_wrappers, "\t\t}\n", NULL);
-      }
-
-      // We may need to generate multiple calls if there are variable
-      // argument lists involved.  Build the start of the call.
-
-      String *start = NewString("");
-
-      SwigType *result = Getattr(ni, "go:type");
-
-      if (is_constructor) {
-	result = all_result;
-      } else if (is_destructor) {
-	result = NULL;
-      }
-
-      if (result && SwigType_type(result) != T_VOID && (!all_result || SwigType_type(all_result) != T_VOID)) {
-	Printv(start, "return ", NULL);
-      }
-
-      bool advance_parm = false;
-
-      if (receiver && use_receiver) {
-	Printv(start, "p.", go_name, NULL);
-      } else if (can_use_receiver && !isStatic(ni) && pi && Getattr(pi, "self")) {
-	// This is an overload of a static function and a non-static
-	// function.
-	assert(num_required > 0);
-	SwigType *tm = goWrapperType(pi, Getattr(pi, "type"), true);
-	String *nm = buildGoName(Getattr(ni, "sym:name"), false, isFriend(ni));
-	Printv(start, "a[0].(", tm, ").", nm, NULL);
-	Delete(nm);
-	Delete(tm);
-	advance_parm = true;
-      } else {
-	Printv(start, go_name, NULL);
-      }
-
-      Printv(start, Getattr(ni, "sym:overname"), "(", NULL);
-
-      bool need_comma = false;
-
-      if (is_director && is_constructor) {
-	Printv(start, "abi", NULL);
-	need_comma = true;
-      }
-      if (is_upcall) {
-	Printv(start, "p", NULL);
-	need_comma = true;
-      }
-      Parm *p = pi;
-      int pn = 0;
-      if (advance_parm) {
-	p = getParm(p);
-	if (p) {
-	  p = nextParm(p);
-	}
-	++pn;
-      }
-      while (pn < num_required) {
-	p = getParm(p);
-
-	if (need_comma) {
-	  Printv(start, ", ", NULL);
-	}
-
-	SwigType *tm = goType(p, Getattr(p, "type"));
-	Printf(start, "a[%d].(%s)", pn, tm);
-	Delete(tm);
-
-	need_comma = true;
-	++pn;
-	p = nextParm(p);
-      }
-
-      String *end = NULL;
-      if (!result || SwigType_type(result) == T_VOID || (all_result && SwigType_type(all_result) == T_VOID)) {
-	end = NewString("");
-	Printv(end, "return", NULL);
-	if (!all_result || SwigType_type(all_result) != T_VOID) {
-	  Printv(end, " 0", NULL);
-	}
-      }
-
-      if (num_required == num_arguments) {
-	Printv(f_go_wrappers, "\t\t", start, ")\n", NULL);
-	if (end) {
-	  Printv(f_go_wrappers, "\t\t", end, "\n", NULL);
-	}
-      } else {
-	Printv(f_go_wrappers, "\t\tswitch argc {\n", NULL);
-	for (int j = num_required; j <= num_arguments; ++j) {
-	  Printf(f_go_wrappers, "\t\tcase %d:\n", j);
-	  Printv(f_go_wrappers, "\t\t\t", start, NULL);
-	  bool nc = need_comma;
-	  for (int k = num_required; k < j; ++k) {
-	    if (nc) {
-	      Printv(f_go_wrappers, ", ", NULL);
-	    }
-	    Printf(f_go_wrappers, "a[%d]", k);
-	    nc = true;
-	  }
-	  Printv(f_go_wrappers, ")\n", NULL);
-	  if (end) {
-	    Printv(f_go_wrappers, "\t\t\t", end, "\n", NULL);
-	  }
-	}
-	Printv(f_go_wrappers, "\t\t}\n", NULL);
-      }
-
-      Printv(f_go_wrappers, "\t}\n", NULL);
-
-      if (fn != 0) {
-	Printf(f_go_wrappers, "check_%d:\n", fn);
-      }
-
-      Delete(coll);
-    }
-
-    Printv(f_go_wrappers, "\tpanic(\"No match for overloaded function call\")\n", NULL);
-    Printv(f_go_wrappers, "}\n\n", NULL);
-
-    Delete(all_result);
-    Delete(dispatch);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * checkFunctionVisibility()
-   *
-   * Return true if we should write out a function based on its
-   * visibility, false otherwise.
-   * ---------------------------------------------------------------------- */
-
-  bool checkFunctionVisibility(Node *n, Node *parent) {
-    // Write out a public function.
-    if (is_public(n))
-      return true;
-    // Don't write out a private function.
-    if (is_private(n))
-      return false;
-    // Write a protected function for a director class in
-    // dirprot_mode.
-    if (parent == NULL) {
-      return false;
-    }
-    if (dirprot_mode() && Swig_directorclass(parent))
-      return true;
-    // Otherwise don't write out a protected function.
-    return false;
-  }
-
-
-  /* ----------------------------------------------------------------------
-   * exportedName()
-   *
-   * Given a C/C++ name, return a name in Go which will be exported.
-   * If the first character is an upper case letter, this returns a
-   * copy of its argment.  If the first character is a lower case
-   * letter, this forces it to upper case.  Otherwise, this prepends
-   * 'X'.
-   * ---------------------------------------------------------------------- */
-
-  String *exportedName(String *name) {
-    String *copy = Copy(name);
-    char c = *Char(copy);
-    if (islower(c)) {
-      char l[2];
-      char u[2];
-      l[0] = c;
-      l[1] = '\0';
-      u[0] = toupper(c);
-      u[1] = '\0';
-      Replace(copy, l, u, DOH_REPLACE_FIRST);
-    } else if (!isalpha(c)) {
-      char l[2];
-      char u[3];
-      l[0] = c;
-      l[1] = '\0';
-      u[0] = 'X';
-      u[1] = c;
-      u[2] = '\0';
-      Replace(copy, l, u, DOH_REPLACE_FIRST);
-    }
-    String *ret = Swig_name_mangle(copy);
-    Delete(copy);
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * removeClassname()
-   *
-   * If the name starts with the current class name, followed by an
-   * underscore, remove it.  If there is no current class name, this
-   * simply returns a copy of the name.  This undoes Swig's way of
-   * recording the class name in a member name.
-   * ---------------------------------------------------------------------- */
-
-  String *removeClassname(String *name) {
-    String *copy = Copy(name);
-    if (class_name) {
-      char *p = Char(name);
-      if (Strncmp(name, class_name, Len(class_name)) == 0 && p[Len(class_name)] == '_') {
-	Replace(copy, class_name, "", DOH_REPLACE_FIRST);
-	Replace(copy, "_", "", DOH_REPLACE_FIRST);
-      }
-    }
-    return copy;
-  }
-
-  /* ----------------------------------------------------------------------
-   * buildGoName()
-   *
-   * Build the name to use for an ordinary function, variable, or
-   * whatever in Go.  The name argument is something like the sym:name
-   * attribute of the node.  If is_static is false, this could be a
-   * method, and the returned name will be the name of the
-   * method--i.e., it will not include the class name.
-   * ---------------------------------------------------------------------- */
-
-  String *buildGoName(String *name, bool is_static, bool is_friend) {
-    String *nw = NewString("");
-    if (is_static && !is_friend && class_name) {
-      String *c1 = exportedName(class_name);
-      Append(nw, c1);
-      Delete(c1);
-    }
-    String *c2 = removeClassname(name);
-    String *c3 = exportedName(c2);
-    Append(nw, c3);
-    Delete(c2);
-    Delete(c3);
-    String *ret = Swig_name_mangle(nw);
-    Delete(nw);
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * buildGoWrapperName()
-   *
-   * Build the name to use for a Go wrapper function.  This is a
-   * function called by the real Go function in order to convert C++
-   * classes from interfaces to pointers, and other such conversions
-   * between the Go type and the C++ type.
-   * ---------------------------------------------------------------------- */
-
-  String *buildGoWrapperName(String *name, String *overname) {
-    String *s1 = NewString("_swig_wrap_");
-    Append(s1, name);
-    String *s2 = Swig_name_mangle(s1);
-    Delete(s1);
-    if (overname) {
-      Append(s2, overname);
-    }
-    return s2;
-  }
-
-  /* ----------------------------------------------------------------------
-   * checkNameConflict()
-   *
-   * Check for a name conflict on the name we are going to use in Go.
-   * These conflicts are likely because of the enforced
-   * capitalization.  When we find one, issue a warning and return
-   * false.  If the name is OK, return true.
-   * ---------------------------------------------------------------------- */
-
-  bool checkNameConflict(String* name, Node* n, const_String_or_char_ptr scope) {
-    Node *lk = symbolLookup(name, scope);
-    if (lk) {
-      String *n1 = Getattr(n, "sym:name");
-      if (!n1) {
-	n1 = Getattr(n, "name");
-      }
-      String *n2 = Getattr(lk, "sym:name");
-      if (!n2) {
-	n2 = Getattr(lk, "name");
-      }
-      Swig_warning(WARN_GO_NAME_CONFLICT, input_file, line_number,
-		   "Ignoring '%s' due to Go name ('%s') conflict with '%s'\n",
-		   n1, name, n2);
-      return false;
-    }
-    bool r = addSymbol(name, n, scope) ? true : false;
-    assert(r);
-    return true;
-  }
-
-  /* ----------------------------------------------------------------------
-   * checkIgnoredParameters()
-   *
-   * If any of the parameters of this function, or the return type,
-   * are ignored due to a name conflict, give a warning and return
-   * false.
-   * ---------------------------------------------------------------------- */
-
-  bool checkIgnoredParameters(Node *n, String *go_name) {
-    ParmList *parms = Getattr(n, "parms");
-    if (parms) {
-      Wrapper *dummy = NewWrapper();
-      emit_attach_parmmaps(parms, dummy);
-      int parm_count = emit_num_arguments(parms);
-      Parm *p = parms;
-
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	if (!checkIgnoredType(n, go_name, Getattr(p, "type"))) {
-	  DelWrapper(dummy);
-	  return false;
-	}
-	p = nextParm(p);
-      }
-
-      DelWrapper(dummy);
-    }
-
-    if (!checkIgnoredType(n, go_name, Getattr(n, "type"))) {
-      return false;
-    }
-
-    return true;
-  }
-
-  /* ----------------------------------------------------------------------
-   * checkIgnoredType()
-   *
-   * If this type is being ignored due to a name conflict, give a
-   * warning and return false.
-   * ---------------------------------------------------------------------- */
-
-  bool checkIgnoredType(Node *n, String *go_name, SwigType *type) {
-    if (hasGoTypemap(n, type)) {
-      return true;
-    }
-
-    SwigType *t = SwigType_typedef_resolve_all(type);
-
-    bool ret = true;
-    bool is_conflict = false;
-    Node *e = Language::enumLookup(t);
-    if (e) {
-      if (GetFlag(e, "go:conflict")) {
-	is_conflict = true;
-      }
-    } else if (SwigType_issimple(t)) {
-      Node *cn = classLookup(t);
-      if (cn) {
-	if (GetFlag(cn, "go:conflict")) {
-	  is_conflict = true;
-	}
-      }
-    } else if (SwigType_ispointer(t) || SwigType_isarray(t) || SwigType_isqualifier(t) || SwigType_isreference(t)) {
-      SwigType *r = Copy(t);
-      if (SwigType_ispointer(r)) {
-	SwigType_del_pointer(r);
-      } else if (SwigType_isarray(r)) {
-	SwigType_del_array(r);
-      } else if (SwigType_isqualifier(r)) {
-	SwigType_del_qualifier(r);
-      } else {
-	SwigType_del_reference(r);
-      }
-
-      if (!checkIgnoredType(n, go_name, r)) {
-	ret = false;
-      }
-
-      Delete(r);
-    }
-
-    if (is_conflict) {
-      String *s = SwigType_str(t, NULL);
-      Swig_warning(WARN_GO_NAME_CONFLICT, input_file, line_number,
-		   "Ignoring '%s' (Go name '%s') due to Go name conflict for parameter or result type '%s'\n",
-		   Getattr(n, "name"), go_name, s);
-      Delete(s);
-      ret = false;
-    }
-
-    Delete(t);
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * goType()
-   *
-   * Given a SWIG type, return a string for the type in Go.
-   * ---------------------------------------------------------------------- */
-
-  String *goType(Node *n, SwigType *type) {
-    return goTypeWithInfo(n, type, false, NULL);
-  }
-
-  /* ----------------------------------------------------------------------
-   * goImType()
-   *
-   * Given a SWIG type, return a string for the intermediate Go type
-   * to pass to C/C++.  This is like goType except that it looks for
-   * an imtype typemap entry first.
-   * ---------------------------------------------------------------------- */
-
-  String *goImType(Node *n, SwigType *type) {
-    return goTypeWithInfo(n, type, true, NULL);
-  }
-
-  /* ----------------------------------------------------------------------
-   * goTypeWithInfo()
-   *
-   * Like goType, but return some more information.
-   *
-   * If use_imtype is true, this look for a imtype typemap entry.
-   *
-   * If the p_is_interface parameter is not NULL, this sets
-   * *p_is_interface to indicate whether this type is going to be
-   * represented by a Go interface type.  These are cases where the Go
-   * code needs to make some adjustments when passing values back and
-   * forth with C/C++.
-   * ---------------------------------------------------------------------- */
-
-  String *goTypeWithInfo(Node *n, SwigType *type, bool use_imtype, bool *p_is_interface) {
-    if (p_is_interface) {
-      *p_is_interface = false;
-    }
-
-    String *ret = NULL;
-    if (use_imtype) {
-      if (n && Cmp(type, Getattr(n, "type")) == 0) {
-	if (Strcmp(Getattr(n, "nodeType"), "parm") == 0) {
-	  ret = Getattr(n, "tmap:imtype");
-	}
-	if (!ret) {
-	  ret = Swig_typemap_lookup("imtype", n, "", NULL);
-	}
-      } else {
-	Parm *p = NewParm(type, "goImType", n);
-	ret = Swig_typemap_lookup("imtype", p, "", NULL);
-	Delete(p);
-      }
-    }
-    if (!ret) {
-      if (n && Cmp(type, Getattr(n, "type")) == 0) {
-	if (Strcmp(Getattr(n, "nodeType"), "parm") == 0) {
-	  ret = Getattr(n, "tmap:gotype");
-	}
-	if (!ret) {
-	  ret = Swig_typemap_lookup("gotype", n, "", NULL);
-	}
-      } else {
-	Parm *p = NewParm(type, "goType", n);
-	ret = Swig_typemap_lookup("gotype", p, "", NULL);
-	Delete(p);
-      }
-    }
-
-    if (ret && Strstr(ret, "$gotypename") != 0) {
-      ret = NULL;
-    }
-
-    if (ret) {
-      return Copy(ret);
-    }
-
-    SwigType *t = SwigType_typedef_resolve_all(type);
-
-    if (SwigType_isenum(t)) {
-      Node *e = Language::enumLookup(t);
-      if (e) {
-	ret = goEnumName(e);
-      } else if (Strcmp(t, "enum ") == 0) {
-	ret = NewString("int");
-      } else {
-	// An unknown enum - one that has not been parsed (neither a C enum forward reference nor a definition) or an ignored enum
-	String *tt = Copy(t);
-	Replace(tt, "enum ", "", DOH_REPLACE_ANY);
-	ret = exportedName(tt);
-	Setattr(undefined_enum_types, t, ret);
-	Delete(tt);
-      }
-    } else if (SwigType_isfunctionpointer(type) || SwigType_isfunction(type)) {
-      ret = NewString("_swig_fnptr");
-    } else if (SwigType_ismemberpointer(type)) {
-      ret = NewString("_swig_memberptr");
-    } else if (SwigType_issimple(t)) {
-      Node *cn = classLookup(t);
-      if (cn) {
-	ret = Getattr(cn, "sym:name");
-	if (!ret) {
-	  ret = Getattr(cn, "name");
-	}
-	ret = exportedName(ret);
-
-	Node *cnmod = Getattr(cn, "module");
-	if (!cnmod || Strcmp(Getattr(cnmod, "name"), module) == 0) {
-	  Setattr(undefined_types, t, t);
-	} else {
-	  String *nw = NewString("");
-	  Printv(nw, getModuleName(Getattr(cnmod, "name")), ".", ret, NULL);
-	  Delete(ret);
-	  ret = nw;
-	}
-      } else {
-	// SWIG does not know about this type.
-	ret = exportedName(t);
-	Setattr(undefined_types, t, t);
-      }
-      if (p_is_interface) {
-	*p_is_interface = true;
-      }
-    } else if (SwigType_ispointer(t) || SwigType_isarray(t)) {
-      SwigType *r = Copy(t);
-      if (SwigType_ispointer(r)) {
-	SwigType_del_pointer(r);
-      } else {
-	SwigType_del_array(r);
-      }
-
-      if (SwigType_type(r) == T_VOID) {
-	ret = NewString("uintptr");
-      } else {
-	bool is_interface;
-	String *base = goTypeWithInfo(n, r, false, &is_interface);
-
-	// At the Go level, an unknown or class type is handled as an
-	// interface wrapping a pointer.  This means that if a
-	// function returns the C type X, we will be wrapping the C
-	// type X*.  In Go we will call that type X.  That means that
-	// if a C function expects X*, we can pass the Go type X.  And
-	// that means that when we see the C type X*, we should use
-	// the Go type X.
-
-	// The is_interface variable tells us this.  However, it will
-	// be true both for the case of X and for the case of X*.  If
-	// r is a pointer here, then we are looking at X**.  There is
-	// really no good way for us to handle that.
-	bool is_pointer_to_pointer = false;
-	if (is_interface) {
-	  SwigType *c = Copy(r);
-	  if (SwigType_isqualifier(c)) {
-	    SwigType_del_qualifier(c);
-	    if (SwigType_ispointer(c) || SwigType_isarray(c)) {
-	      is_pointer_to_pointer = true;
-	    }
-	  }
-	  Delete(c);
-	}
-
-	if (is_interface) {
-	  if (!is_pointer_to_pointer) {
-	    ret = base;
-	    if (p_is_interface) {
-	      *p_is_interface = true;
-	    }
-	  } else {
-	    ret = NewString("uintptr");
-	  }
-	} else {
-	  ret = NewString("*");
-	  Append(ret, base);
-	  Delete(base);
-	}
-      }
-
-      Delete(r);
-    } else if (SwigType_isreference(t)) {
-      SwigType *r = Copy(t);
-      SwigType_del_reference(r);
-
-      // If this is a const reference, and we are looking at a pointer
-      // to it, then we just use the pointer we already have.
-      bool add_pointer = true;
-      if (SwigType_isqualifier(r)) {
-	String *q = SwigType_parm(r);
-	if (Strcmp(q, "const") == 0) {
-	  SwigType *c = Copy(r);
-	  SwigType_del_qualifier(c);
-	  if (SwigType_ispointer(c)) {
-	    add_pointer = false;
-	  }
-	  Delete(c);
-	}
-      }
-      if (add_pointer) {
-	SwigType_add_pointer(r);
-      }
-      ret = goTypeWithInfo(n, r, false, p_is_interface);
-      Delete(r);
-    } else if (SwigType_isqualifier(t)) {
-      SwigType *r = Copy(t);
-      SwigType_del_qualifier(r);
-      ret = goTypeWithInfo(n, r, false, p_is_interface);
-      Delete(r);
-    } else if (SwigType_isvarargs(t)) {
-      ret = NewString("[]interface{}");
-    }
-
-    Delete(t);
-
-    if (!ret) {
-      Swig_warning(WARN_LANG_NATIVE_UNIMPL, input_file, line_number, "No Go typemap defined for %s\n", SwigType_str(type, 0));
-      ret = NewString("uintptr");
-    }
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * cgoTypeForGoValue()
-   *
-   * Given a SWIG type, return a string for the C type to use for the
-   * cgo wrapper code.  This always returns a simple identifier, since
-   * it is used in Go code as C.name.
-   *
-   * This sets *c_struct_type if the C type uses a struct where the Go
-   * type uses a simple type.  This is true for strings and slices.
-   * When this is true the Go code has to jump through unsafe hoops to
-   * pass the type checker.
-   * ---------------------------------------------------------------------- */
-
-  String *cgoTypeForGoValue(Node *n, SwigType *type, bool *c_struct_type) {
-    *c_struct_type = false;
-
-    bool is_interface;
-    String *go_type = goTypeWithInfo(n, type, true, &is_interface);
-    if (is_interface) {
-      Delete(go_type);
-      return NewString("uintptr_t");
-    }
-    if (Strcmp(go_type, "uintptr") == 0) {
-      Delete(go_type);
-      return NewString("uintptr_t");
-    }
-    if (((char*)Char(go_type))[0] == '*') {
-      // Treat all pointers as void*.  There is no meaningful type
-      // checking going on here anyhow, and that lets us avoid
-      // worrying about defining the base type of the pointer.
-      Delete(go_type);
-      return NewString("swig_voidp");
-    }
-
-    // Check for some Go types that are really pointers under the covers.
-    bool is_hidden_pointer = Strncmp(go_type, "func(", 5) == 0 || Strncmp(go_type, "map[", 4) == 0 || Strncmp(go_type, "chan ", 5) == 0;
-
-    Delete(go_type);
-
-    String *ct = Getattr(n, "emit:cgotype");
-    if (ct) {
-      *c_struct_type = Getattr(n, "emit:cgotypestruct") ? true : false;
-      return Copy(ct);
-    }
-
-    String *t = Copy(type);
-    if (SwigType_isarray(t)) {
-      SwigType_del_array(t);
-      SwigType_add_pointer(t);
-    }
-
-    bool add_typedef = true;
-
-    static int count;
-    ++count;
-    ct = NewStringf("swig_type_%d", count);
-
-    String *gct = gcCTypeForGoValue(n, t, ct);
-    Delete(t);
-
-    if (Strncmp(gct, "_gostring_", 10) == 0 || Strncmp(gct, "_goslice_", 9) == 0) {
-      *c_struct_type = true;
-      Setattr(n, "emit:cgotypestruct", type);
-    } else {
-      char *p = Strstr(gct, ct);
-      if (p != NULL && p > (char*)Char(gct) && p[-1] == '*' && p[Len(ct)] == '\0') {
-	// Treat all pointers as void*.  See above.
-	Delete(ct);
-	--count;
-	ct = NewString("swig_voidp");
-	add_typedef = false;
-	if (is_hidden_pointer) {
-	  // A Go type that is really a pointer, like func, map, chan,
-	  // is being represented in C by a pointer.  This is fine,
-	  // but we have to memcpy the type rather than simply
-	  // converting it.
-	  *c_struct_type = true;
-	  Setattr(n, "emit:cgotypestruct", type);
-	}
-      }
-
-      if (Strncmp(gct, "bool ", 5) == 0) {
-	// Change the C++ type bool to the C type _Bool.
-	Replace(gct, "bool", "_Bool", DOH_REPLACE_FIRST);
-      }
-      if (Strncmp(gct, "intgo ", 6) == 0) {
-	// We #define intgo to swig_intgo for the cgo comment.
-	Replace(gct, "intgo", "swig_intgo", DOH_REPLACE_FIRST);
-      }
-      p = Strstr(gct, ct);
-      if (p != NULL && p > (char*)Char(gct) && p[-1] == ' ' && p[Len(ct)] == '\0') {
-	String *q = NewStringWithSize(gct, Len(gct) - Len(ct) - 1);
-	if (validIdentifier(q)) {
-	  // This is a simple type name, and we can use it directly.
-	  Delete(ct);
-	  --count;
-	  ct = q;
-	  add_typedef = false;
-	}
-      }
-    }
-    if (add_typedef) {
-      Printv(f_cgo_comment_typedefs, "typedef ", gct, ";\n", NULL);
-    }
-
-    Setattr(n, "emit:cgotype", ct);
-
-    Delete(gct);
-
-    return Copy(ct);
-  }
-
-  /* ----------------------------------------------------------------------
-   * goWrapperType()
-   *
-   * Given a type, return a string for the type to use for the wrapped
-   * Go function.  This function exists because for a C++ class we
-   * need to convert interface and reference types.
-   * ---------------------------------------------------------------------- */
-
-  String *goWrapperType(Node *n, SwigType *type, bool is_result) {
-    bool is_interface;
-    String *ret = goTypeWithInfo(n, type, true, &is_interface);
-
-    // If this is an interface, we want to pass the real type.
-    if (is_interface) {
-      Delete(ret);
-      if (!is_result) {
-	ret = NewString("uintptr");
-      } else {
-	SwigType *ty = SwigType_typedef_resolve_all(type);
-	while (true) {
-	  if (SwigType_ispointer(ty)) {
-	    SwigType_del_pointer(ty);
-	  } else if (SwigType_isarray(ty)) {
-	    SwigType_del_array(ty);
-	  } else if (SwigType_isreference(ty)) {
-	    SwigType_del_reference(ty);
-	  } else if (SwigType_isqualifier(ty)) {
-	    SwigType_del_qualifier(ty);
-	  } else {
-	    break;
-	  }
-	}
-	assert(SwigType_issimple(ty));
-	String *p = goCPointerType(ty, true);
-	Delete(ty);
-	ret = p;
-      }
-    }
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * goOverloadType()
-   *
-   * Given a type, return the Go type to use when dispatching of
-   * overloaded functions.  This is normally just the usual Go type.
-   * However, for a C++ class, the usual Go type is an interface type.
-   * And if that interface type represents a C++ type that SWIG does
-   * not know about, then the interface type generated for any C++
-   * class will match that interface.  So for that case, we match on
-   * the underlying integer type.
-   *
-   * It has to work this way so that we can handle a derived type of a
-   * %ignore'd type.  It's unlikely that anybody will have a value of
-   * an undefined type, but we support it because it worked in the
-   * past.
-   * ---------------------------------------------------------------------- */
-
-  String *goOverloadType(Node *n, SwigType *type) {
-    SwigType *ty = SwigType_typedef_resolve_all(type);
-    while (true) {
-      if (SwigType_ispointer(ty)) {
-	SwigType_del_pointer(ty);
-      } else if (SwigType_isarray(ty)) {
-	SwigType_del_array(ty);
-      } else if (SwigType_isreference(ty)) {
-	SwigType_del_reference(ty);
-      } else if (SwigType_isqualifier(ty)) {
-	SwigType_del_qualifier(ty);
-      } else {
-	break;
-      }
-    }
-
-    if (Getattr(undefined_types, ty) && !Getattr(defined_types, ty)) {
-      return goWrapperType(n, type, true);
-    }
-
-    return goType(n, type);
-  }
-
-  /* ----------------------------------------------------------------------
-   * goCPointerType()
-   *
-   * Return the name of the Go type to use for the C pointer value.
-   * The regular C type is the name of an interface type which wraps a
-   * pointer whose name is returned by this function.
-   * ---------------------------------------------------------------------- */
-
-  String *goCPointerType(SwigType *type, bool add_to_hash) {
-    SwigType *ty = SwigType_typedef_resolve_all(type);
-    Node *cn = classLookup(ty);
-    String *ex;
-    String *ret;
-    if (!cn) {
-      if (add_to_hash) {
-	Setattr(undefined_types, ty, ty);
-      }
-      ret = NewString("Swigcptr");
-      ex = exportedName(ty);
-      Append(ret, ex);
-    } else {
-      String *cname = Getattr(cn, "sym:name");
-      if (!cname) {
-	cname = Getattr(cn, "name");
-      }
-      ex = exportedName(cname);
-      Node *cnmod = Getattr(cn, "module");
-      if (!cnmod || Strcmp(Getattr(cnmod, "name"), module) == 0) {
-	if (add_to_hash) {
-	  Setattr(undefined_types, ty, ty);
-	}
-	ret = NewString("Swigcptr");
-	Append(ret, ex);
-      } else {
-	ret = NewString("");
-	Printv(ret, getModuleName(Getattr(cnmod, "name")), ".Swigcptr", ex, NULL);
-      }
-    }
-    Delete(ty);
-    Delete(ex);
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * gcCTypeForGoValue()
-   *
-   * Given a type, return the C/C++ type which will be used to catch
-   * the value in Go.  This is the 6g/8g version.
-   * ---------------------------------------------------------------------- */
-
-  String *gcCTypeForGoValue(Node *n, SwigType *type, String *name) {
-    bool is_interface;
-    String *gt = goTypeWithInfo(n, type, true, &is_interface);
-
-    String *tail = NewString("");
-    SwigType *t = SwigType_typedef_resolve_all(type);
-    if (!SwigType_isreference(t)) {
-      while (Strncmp(gt, "*", 1) == 0) {
-	Replace(gt, "*", "", DOH_REPLACE_FIRST);
-	Printv(tail, "*", NULL);
-      }
-    }
-    Delete(t);
-
-    bool is_string = Strcmp(gt, "string") == 0;
-    bool is_slice = Strncmp(gt, "[]", 2) == 0;
-    bool is_function = Strcmp(gt, "_swig_fnptr") == 0;
-    bool is_member = Strcmp(gt, "_swig_memberptr") == 0;
-    bool is_complex64 = Strcmp(gt, "complex64") == 0;
-    bool is_complex128 = Strcmp(gt, "complex128") == 0;
-    bool is_bool = false;
-    bool is_int8 = false;
-    bool is_int16 = false;
-    bool is_int = Strcmp(gt, "int") == 0 || Strcmp(gt, "uint") == 0;
-    bool is_int32 = false;
-    bool is_int64 = false;
-    bool is_float32 = false;
-    bool is_float64 = false;
-
-    bool has_typemap = (n != NULL && Getattr(n, "tmap:gotype") != NULL) || hasGoTypemap(n, type);
-    if (has_typemap) {
-      is_bool = Strcmp(gt, "bool") == 0;
-      is_int8 = Strcmp(gt, "int8") == 0 || Strcmp(gt, "uint8") == 0 || Strcmp(gt, "byte") == 0;
-      is_int16 = Strcmp(gt, "int16") == 0 || Strcmp(gt, "uint16") == 0;
-      is_int32 = Strcmp(gt, "int32") == 0 || Strcmp(gt, "uint32") == 0;
-      is_int64 = Strcmp(gt, "int64") == 0 || Strcmp(gt, "uint64") == 0;
-      is_float32 = Strcmp(gt, "float32") == 0;
-      is_float64 = Strcmp(gt, "float64") == 0;
-    }
-    Delete(gt);
-
-    String *ret;
-    if (is_string) {
-      // Note that we don't turn a reference to a string into a
-      // pointer to a string.  Strings are immutable anyhow.
-      ret = NewString("");
-      Printv(ret, "_gostring_", tail, " ", name, NULL);
-      Delete(tail);
-      return ret;
-    } else if (is_slice) {
-      // Slices are always passed as a _goslice_, whether or not references
-      // are involved.
-      ret = NewString("");
-      Printv(ret, "_goslice_", tail, " ", name, NULL);
-      Delete(tail);
-      return ret;
-    } else if (is_function || is_member) {
-      ret = NewString("");
-      Printv(ret, "void*", tail, " ", name, NULL);
-      Delete(tail);
-      return ret;
-    } else if (is_complex64) {
-      ret = NewString("_Complex float ");
-    } else if (is_complex128) {
-      ret = NewString("_Complex double ");
-    } else if (is_interface) {
-      SwigType *t = SwigType_typedef_resolve_all(type);
-      if (SwigType_ispointer(t)) {
-	SwigType_del_pointer(t);
-      }
-      if (SwigType_isreference(t)) {
-	SwigType_del_reference(t);
-      }
-      SwigType_add_pointer(t);
-      ret = SwigType_lstr(t, name);
-      Delete(t);
-      Delete(tail);
-      return ret;
-    } else {
-      SwigType *t = SwigType_typedef_resolve_all(type);
-      if (!has_typemap && SwigType_isreference(t)) {
-	// A const reference to a known type, or to a pointer, is not
-	// mapped to a pointer.
-	SwigType_del_reference(t);
-	if (SwigType_isqualifier(t)) {
-	  String *q = SwigType_parm(t);
-	  if (Strcmp(q, "const") == 0) {
-	    SwigType_del_qualifier(t);
-	    if (hasGoTypemap(n, t) || SwigType_ispointer(t)) {
-	      if (is_int) {
-		ret = NewString("intgo ");
-		Append(ret, name);
-	      } else if (is_int64) {
-		ret = NewString("long long ");
-		Append(ret, name);
-	      } else {
-		ret = SwigType_lstr(t, name);
-	      }
-	      Delete(q);
-	      Delete(t);
-	      Delete(tail);
-	      return ret;
-	    }
-	  }
-	  Delete(q);
-	}
-      }
-
-      if (Language::enumLookup(t) != NULL) {
-	is_int = true;
-      } else {
-	SwigType *tstripped = SwigType_strip_qualifiers(t);
-	if (SwigType_isenum(tstripped))
-	  is_int = true;
-	Delete(tstripped);
-      }
-
-      Delete(t);
-      if (is_bool) {
-	ret = NewString("bool ");
-      } else if (is_int8) {
-	ret = NewString("char ");
-      } else if (is_int16) {
-	ret = NewString("short ");
-      } else if (is_int) {
-	ret = NewString("intgo ");
-      } else if (is_int32) {
-	ret = NewString("int ");
-      } else if (is_int64) {
-	ret = NewString("long long ");
-      } else if (is_float32) {
-	ret = NewString("float ");
-      } else if (is_float64) {
-	ret = NewString("double ");
-      } else {
-	Delete(tail);
-	return SwigType_lstr(type, name);
-      }
-    }
-
-    Append(ret, tail);
-    if (!has_typemap && SwigType_isreference(type)) {
-      Append(ret, "* ");
-    }
-    Append(ret, name);
-    Delete(tail);
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * gccgoCTypeForGoValue()
-   *
-   * Given a type, return the C/C++ type which will be used to catch
-   * the value in Go.  This is the gccgo version.
-   * ---------------------------------------------------------------------- */
-
-  String *gccgoCTypeForGoValue(Node *n, SwigType *type, String *name) {
-    return gcCTypeForGoValue(n, type, name);
-  }
-
-  /* ----------------------------------------------------------------------
-   * goTypeIsInterface
-   *
-   * Return whether this C++ type is represented as an interface type
-   * in Go.  These types require adjustments in the Go code when
-   * passing them back and forth between Go and C++.
-   * ---------------------------------------------------------------------- */
-
-  bool goTypeIsInterface(Node *n, SwigType *type) {
-    bool is_interface;
-    Delete(goTypeWithInfo(n, type, false, &is_interface));
-    return is_interface;
-  }
-
-  /* ----------------------------------------------------------------------
-   * hasGoTypemap
-   *
-   * Return whether a type has a "gotype" typemap entry.
-   * ---------------------------------------------------------------------- */
-
-  bool hasGoTypemap(Node *n, SwigType *type) {
-    Parm *p = NewParm(type, "test", n);
-    SwigType *tm = Swig_typemap_lookup("gotype", p, "", NULL);
-    Delete(p);
-    if (tm && Strstr(tm, "$gotypename") == 0) {
-      Delete(tm);
-      return true;
-    }
-    Delete(tm);
-    return false;
-  }
-
-  /* ----------------------------------------------------------------------
-   * goEnumName()
-   *
-   * Given an enum node, return a string to use for the enum type in Go.
-   * ---------------------------------------------------------------------- */
-
-  String *goEnumName(Node *n) {
-    String *ret = Getattr(n, "go:enumname");
-    if (ret) {
-      return Copy(ret);
-    }
-
-    if (Equal(Getattr(n, "type"), "enum ")) {
-      return NewString("int");
-    }
-
-    String *type = Getattr(n, "enumtype");
-    assert(type);
-    char *p = Char(type);
-    int len = Len(type);
-    String *s = NewString("");
-    bool capitalize = true;
-    for (int i = 0; i < len; ++i, ++p) {
-      if (*p == ':') {
-	++i;
-	++p;
-	assert(*p == ':');
-	capitalize = true;
-      } else if (capitalize) {
-	Putc(toupper(*p), s);
-	capitalize = false;
-      } else {
-	Putc(*p, s);
-      }
-    }
-
-    ret = Swig_name_mangle(s);
-    Delete(s);
-    return ret;
-  }
-
-
-  /* ----------------------------------------------------------------------
-   * getParm()
-   *
-   * Get the real parameter to use.
-   * ---------------------------------------------------------------------- */
-
-  Parm *getParm(Parm *p) {
-    while (p && checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-    return p;
-  }
-
-  /* ----------------------------------------------------------------------
-   * nextParm()
-   *
-   * Return the next parameter.
-   * ---------------------------------------------------------------------- */
-
-  Parm *nextParm(Parm *p) {
-    if (!p) {
-      return NULL;
-    } else if (Getattr(p, "tmap:in")) {
-      return Getattr(p, "tmap:in:next");
-    } else {
-      return nextSibling(p);
-    }
-  }
-
-  /* ----------------------------------------------------------------------
-   * isStatic
-   *
-   * Return whether a node should be considered as static rather than
-   * as a member.
-   * ---------------------------------------------------------------------- */
-
-  bool isStatic(Node *n) {
-    String *storage = Getattr(n, "storage");
-    return (storage && (Swig_storage_isstatic(n) || Strcmp(storage, "friend") == 0) && (!SmartPointer || !Getattr(n, "allocate:smartpointeraccess")));
-  }
-
-  /* ----------------------------------------------------------------------
-   * isFriend
-   *
-   * Return whether a node is a friend.
-   * ---------------------------------------------------------------------- */
-
-  bool isFriend(Node *n) {
-    String *storage = Getattr(n, "storage");
-    return storage && Strcmp(storage, "friend") == 0;
-  }
-
-  /* ----------------------------------------------------------------------
-   * goGetattr
-   *
-   * Fetch an attribute from a node but return NULL if it is the empty string.
-   * ---------------------------------------------------------------------- */
-  Node *goGetattr(Node *n, const char *name) {
-    Node *ret = Getattr(n, name);
-    if (ret != NULL && Len(ret) == 0) {
-      ret = NULL;
-    }
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * goTypemapLookup
-   *
-   * Look up a typemap but return NULL if it is the empty string.
-   * ---------------------------------------------------------------------- */
-  String *goTypemapLookup(const char *name, Node *node, const char *lname) {
-    String *ret = Swig_typemap_lookup(name, node, lname, NULL);
-    if (ret != NULL && Len(ret) == 0) {
-      ret = NULL;
-    }
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------
-   * getModuleName
-   *
-   * Return the name of a module. This is different from module path:
-   * "some/path/to/module" -> "module".
-   * ---------------------------------------------------------------------- */
-
-  String *getModuleName(String *module_path) {
-    char *suffix = strrchr(Char(module_path), '/');
-    if (suffix == NULL) {
-      return module_path;
-    }
-    return Str(suffix + 1);
-  }
-
-};				/* class GO */
-
-/* -----------------------------------------------------------------------------
- * swig_go()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_go() {
-  return new GO();
-}
-extern "C" Language *swig_go(void) {
-  return new_swig_go();
-}
-
-/* -----------------------------------------------------------------------------
- * Static member variables
- * ----------------------------------------------------------------------------- */
-
-// Usage message.
-const char * const GO::usage = "\
-Go Options (available with -go)\n\
-     -cgo                - Generate cgo input files\n\
-     -gccgo              - Generate code for gccgo rather than 6g/8g\n\
-     -go-pkgpath <p>     - Like gccgo -fgo-pkgpath option\n\
-     -go-prefix <p>      - Like gccgo -fgo-prefix option\n\
-     -intgosize <s>      - Set size of Go int type--32 or 64 bits\n\
-     -package <name>     - Set name of the Go package to <name>\n\
-     -use-shlib          - Force use of a shared library\n\
-     -soname <name>      - Set shared library holding C/C++ code to <name>\n\
-\n";
diff --git a/dependencies2013/win32/swig/Source/Modules/guile.cxx b/dependencies2013/win32/swig/Source/Modules/guile.cxx
deleted file mode 100644
index 7b42ff94..00000000
--- a/dependencies2013/win32/swig/Source/Modules/guile.cxx
+++ /dev/null
@@ -1,1683 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * guile.cxx
- *
- * Guile language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-#include <ctype.h>
-
-// Note string broken in half for compilers that can't handle long strings
-static const char *usage = "\
-Guile Options (available with -guile)\n\
-     -emitsetters            - Emit procedures-with-setters for variables\n\
-                               and structure slots.\n\
-     -emitslotaccessors      - Emit accessor methods for all GOOPS slots\n" "\
-     -exportprimitive        - Add the (export ...) code from scmstub into the\n\
-                               GOOPS file.\n\
-     -goopsprefix <prefix>   - Prepend <prefix> to all goops identifiers\n\
-     -Linkage <lstyle>       - Use linkage protocol <lstyle> (default `simple')\n\
-                               Use `module' for native Guile module linking\n\
-                               (requires Guile >= 1.5.0).  Use `passive' for\n\
-                               passive linking (no C-level module-handling code),\n\
-                               `ltdlmod' for Guile's old dynamic module\n\
-                               convention (Guile <= 1.4), or `hobbit' for hobbit\n\
-                               modules.\n\
-     -onlysetters            - Don't emit traditional getter and setter\n\
-                               procedures for structure slots,\n\
-                               only emit procedures-with-setters.\n\
-     -package <name>         - Set the path of the module to <name>\n\
-                               (default NULL)\n\
-     -prefix <name>          - Use <name> as prefix [default \"gswig_\"]\n\
-     -procdoc <file>         - Output procedure documentation to <file>\n\
-     -procdocformat <format> - Output procedure documentation in <format>;\n\
-                               one of `guile-1.4', `plain', `texinfo'\n\
-     -proxy                  - Export GOOPS class definitions\n\
-     -primsuffix <suffix>    - Name appended to primitive module when exporting\n\
-                               GOOPS classes. (default = \"primitive\")\n\
-     -scmstub                - Output Scheme file with module declaration and\n\
-                               exports; only with `passive' and `simple' linkage\n\
-     -useclassprefix         - Prepend the class name to all goops identifiers\n\
-\n";
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_header = 0;
-static File *f_wrappers = 0;
-static File *f_init = 0;
-
-
-static String *prefix = NewString("gswig_");
-static char *module = 0;
-static String *package = 0;
-static enum {
-  GUILE_LSTYLE_SIMPLE,		// call `SWIG_init()'
-  GUILE_LSTYLE_PASSIVE,		// passive linking (no module code)
-  GUILE_LSTYLE_MODULE,		// native guile module linking (Guile >= 1.4.1)
-  GUILE_LSTYLE_LTDLMOD_1_4,	// old (Guile <= 1.4) dynamic module convention
-  GUILE_LSTYLE_HOBBIT		// use (hobbit4d link)
-} linkage = GUILE_LSTYLE_SIMPLE;
-
-static File *procdoc = 0;
-static bool scmstub = false;
-static String *scmtext;
-static bool goops = false;
-static String *goopstext;
-static String *goopscode;
-static String *goopsexport;
-
-static enum {
-  GUILE_1_4,
-  PLAIN,
-  TEXINFO
-} docformat = GUILE_1_4;
-
-static int emit_setters = 0;
-static int only_setters = 0;
-static int emit_slot_accessors = 0;
-static int struct_member = 0;
-
-static String *beforereturn = 0;
-static String *return_nothing_doc = 0;
-static String *return_one_doc = 0;
-static String *return_multi_doc = 0;
-
-static String *exported_symbols = 0;
-
-static int exporting_destructor = 0;
-static String *swigtype_ptr = 0;
-
-/* GOOPS stuff */
-static String *primsuffix = 0;
-static String *class_name = 0;
-static String *short_class_name = 0;
-static String *goops_class_methods;
-static int in_class = 0;
-static int have_constructor = 0;
-static int useclassprefix = 0;	// -useclassprefix argument
-static String *goopsprefix = 0;	// -goopsprefix argument
-static int primRenamer = 0;	// if (use-modules ((...) :renamer ...) is exported to GOOPS file
-static int exportprimitive = 0;	// -exportprimitive argument
-static String *memberfunction_name = 0;
-
-extern "C" {
-  static int has_classname(Node *class_node) {
-    return Getattr(class_node, "guile:goopsclassname") ? 1 : 0;
-  }
-}
-
-class GUILE:public Language {
-public:
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    int i;
-
-     SWIG_library_directory("guile");
-     SWIG_typemap_lang("guile");
-
-    // Look for certain command line options
-    for (i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage, stdout);
-	  SWIG_exit(EXIT_SUCCESS);
-	} else if (strcmp(argv[i], "-prefix") == 0) {
-	  if (argv[i + 1]) {
-	    prefix = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-package") == 0) {
-	  if (argv[i + 1]) {
-	    package = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-Linkage") == 0 || strcmp(argv[i], "-linkage") == 0) {
-	  if (argv[i + 1]) {
-	    if (0 == strcmp(argv[i + 1], "ltdlmod"))
-	      linkage = GUILE_LSTYLE_LTDLMOD_1_4;
-	    else if (0 == strcmp(argv[i + 1], "hobbit"))
-	      linkage = GUILE_LSTYLE_HOBBIT;
-	    else if (0 == strcmp(argv[i + 1], "simple"))
-	      linkage = GUILE_LSTYLE_SIMPLE;
-	    else if (0 == strcmp(argv[i + 1], "passive"))
-	      linkage = GUILE_LSTYLE_PASSIVE;
-	    else if (0 == strcmp(argv[i + 1], "module"))
-	      linkage = GUILE_LSTYLE_MODULE;
-	    else
-	      Swig_arg_error();
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-procdoc") == 0) {
-	  if (argv[i + 1]) {
-	    procdoc = NewFile(argv[i + 1], "w", SWIG_output_files());
-	    if (!procdoc) {
-	      FileErrorDisplay(argv[i + 1]);
-	      SWIG_exit(EXIT_FAILURE);
-	    }
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-procdocformat") == 0) {
-	  if (strcmp(argv[i + 1], "guile-1.4") == 0)
-	    docformat = GUILE_1_4;
-	  else if (strcmp(argv[i + 1], "plain") == 0)
-	    docformat = PLAIN;
-	  else if (strcmp(argv[i + 1], "texinfo") == 0)
-	    docformat = TEXINFO;
-	  else
-	    Swig_arg_error();
-	  Swig_mark_arg(i);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else if (strcmp(argv[i], "-emit-setters") == 0 || strcmp(argv[i], "-emitsetters") == 0) {
-	  emit_setters = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-only-setters") == 0 || strcmp(argv[i], "-onlysetters") == 0) {
-	  emit_setters = 1;
-	  only_setters = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-emit-slot-accessors") == 0 || strcmp(argv[i], "-emitslotaccessors") == 0) {
-	  emit_slot_accessors = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-scmstub") == 0) {
-	  scmstub = true;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-shadow") == 0) || ((strcmp(argv[i], "-proxy") == 0))) {
-	  goops = true;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-gh") == 0) {
-	  Printf(stderr, "Deprecated command line option: -gh. Wrappers are always generated for the SCM interface. See documentation for more information regarding the deprecated GH interface.\n");
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-scm") == 0) {
-	  Printf(stderr, "Deprecated command line option: -scm. Wrappers are always generated for the SCM interface. See documentation for more information regarding the deprecated GH interface.\n");
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-primsuffix") == 0) {
-	  if (argv[i + 1]) {
-	    primsuffix = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-goopsprefix") == 0) {
-	  if (argv[i + 1]) {
-	    goopsprefix = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-useclassprefix") == 0) {
-	  useclassprefix = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-exportprimitive") == 0) {
-	  exportprimitive = 1;
-	  // should use Swig_warning() here?
-	  Swig_mark_arg(i);
-	}
-      }
-    }
-
-    // set default value for primsuffix
-    if (!primsuffix)
-      primsuffix = NewString("primitive");
-
-    //goops support can only be enabled if passive or module linkage is used
-    if (goops) {
-      if (linkage != GUILE_LSTYLE_PASSIVE && linkage != GUILE_LSTYLE_MODULE) {
-	Printf(stderr, "guile: GOOPS support requires passive or module linkage\n");
-	exit(1);
-      }
-    }
-
-    if (goops) {
-      // -proxy implies -emit-setters
-      emit_setters = 1;
-    }
-
-    if ((linkage == GUILE_LSTYLE_PASSIVE && scmstub) || linkage == GUILE_LSTYLE_MODULE)
-      primRenamer = 1;
-
-    if (exportprimitive && primRenamer) {
-      // should use Swig_warning() ?
-      Printf(stderr, "guile: Warning: -exportprimitive only makes sense with passive linkage without a scmstub.\n");
-    }
-
-    // Make sure `prefix' ends in an underscore
-    if (prefix) {
-      const char *px = Char(prefix);
-      if (px[Len(prefix) - 1] != '_')
-	Printf(prefix, "_");
-    }
-
-    /* Add a symbol for this module */
-    Preprocessor_define("SWIGGUILE 1", 0);
-    /* Read in default typemaps */
-    SWIG_config_file("guile_scm.swg");
-    allow_overloading();
-
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-
-    scmtext = NewString("");
-    Swig_register_filebyname("scheme", scmtext);
-    exported_symbols = NewString("");
-    goopstext = NewString("");
-    Swig_register_filebyname("goops", goopstext);
-    goopscode = NewString("");
-    goopsexport = NewString("");
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGGUILE\n#define SWIGGUILE\n#endif\n\n");
-
-    /* Write out directives and declarations */
-
-    module = Swig_copy_string(Char(Getattr(n, "name")));
-
-    switch (linkage) {
-    case GUILE_LSTYLE_SIMPLE:
-      /* Simple linkage; we have to export the SWIG_init function. The user can
-         rename the function by a #define. */
-      Printf(f_runtime, "#define SWIG_GUILE_INIT_STATIC extern\n");
-      break;
-    default:
-      /* Other linkage; we make the SWIG_init function static */
-      Printf(f_runtime, "#define SWIG_GUILE_INIT_STATIC static\n");
-      break;
-    }
-
-    if (CPlusPlus) {
-      Printf(f_runtime, "extern \"C\" {\n\n");
-    }
-    Printf(f_runtime, "SWIG_GUILE_INIT_STATIC void\nSWIG_init (void);\n");
-    if (CPlusPlus) {
-      Printf(f_runtime, "\n}\n");
-    }
-
-    Printf(f_runtime, "\n");
-
-    Language::top(n);
-
-    /* Close module */
-
-    Printf(f_wrappers, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
-
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-
-    Printf(f_init, "}\n\n");
-    Printf(f_init, "#ifdef __cplusplus\n}\n#endif\n");
-
-    String *module_name = NewString("");
-
-    if (!module)
-      Printv(module_name, "swig", NIL);
-    else {
-      if (package)
-	Printf(module_name, "%s/%s", package, module);
-      else
-	Printv(module_name, module, NIL);
-    }
-    emit_linkage(module_name);
-
-    Delete(module_name);
-
-    if (procdoc) {
-      Delete(procdoc);
-      procdoc = NULL;
-    }
-    Delete(goopscode);
-    Delete(goopsexport);
-    Delete(goopstext);
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  void emit_linkage(String *module_name) {
-    String *module_func = NewString("");
-
-    if (CPlusPlus) {
-      Printf(f_init, "extern \"C\" {\n\n");
-    }
-
-    Printv(module_func, module_name, NIL);
-    Replaceall(module_func, "-", "_");
-
-    switch (linkage) {
-    case GUILE_LSTYLE_SIMPLE:
-      Printf(f_init, "\n/* Linkage: simple */\n");
-      break;
-    case GUILE_LSTYLE_PASSIVE:
-      Printf(f_init, "\n/* Linkage: passive */\n");
-      Replaceall(module_func, "/", "_");
-      Insert(module_func, 0, "scm_init_");
-      Append(module_func, "_module");
-
-      Printf(f_init, "SCM\n%s (void)\n{\n", module_func);
-      Printf(f_init, "  SWIG_init();\n");
-      Printf(f_init, "  return SCM_UNSPECIFIED;\n");
-      Printf(f_init, "}\n");
-      break;
-    case GUILE_LSTYLE_LTDLMOD_1_4:
-      Printf(f_init, "\n/* Linkage: ltdlmod */\n");
-      Replaceall(module_func, "/", "_");
-      Insert(module_func, 0, "scm_init_");
-      Append(module_func, "_module");
-      Printf(f_init, "SCM\n%s (void)\n{\n", module_func);
-      {
-	String *mod = NewString(module_name);
-	Replaceall(mod, "/", " ");
-	Printf(f_init, "    scm_register_module_xxx (\"%s\", (void *) SWIG_init);\n", mod);
-	Printf(f_init, "    return SCM_UNSPECIFIED;\n");
-	Delete(mod);
-      }
-      Printf(f_init, "}\n");
-      break;
-    case GUILE_LSTYLE_MODULE:
-      Printf(f_init, "\n/* Linkage: module */\n");
-      Replaceall(module_func, "/", "_");
-      Insert(module_func, 0, "scm_init_");
-      Append(module_func, "_module");
-
-      Printf(f_init, "static void SWIG_init_helper(void *data)\n");
-      Printf(f_init, "{\n    SWIG_init();\n");
-      if (Len(exported_symbols) > 0)
-	Printf(f_init, "    scm_c_export(%sNULL);", exported_symbols);
-      Printf(f_init, "\n}\n\n");
-
-      Printf(f_init, "SCM\n%s (void)\n{\n", module_func);
-      {
-	String *mod = NewString(module_name);
-	if (goops)
-	  Printv(mod, "-", primsuffix, NIL);
-	Replaceall(mod, "/", " ");
-	Printf(f_init, "    scm_c_define_module(\"%s\",\n", mod);
-	Printf(f_init, "      SWIG_init_helper, NULL);\n");
-	Printf(f_init, "    return SCM_UNSPECIFIED;\n");
-	Delete(mod);
-      }
-      Printf(f_init, "}\n");
-      break;
-    case GUILE_LSTYLE_HOBBIT:
-      Printf(f_init, "\n/* Linkage: hobbit */\n");
-      Replaceall(module_func, "/", "_slash_");
-      Insert(module_func, 0, "scm_init_");
-      Printf(f_init, "SCM\n%s (void)\n{\n", module_func);
-      {
-	String *mod = NewString(module_name);
-	Replaceall(mod, "/", " ");
-	Printf(f_init, "    scm_register_module_xxx (\"%s\", (void *) SWIG_init);\n", mod);
-	Printf(f_init, "    return SCM_UNSPECIFIED;\n");
-	Delete(mod);
-      }
-      Printf(f_init, "}\n");
-      break;
-    default:
-      abort();			// for now
-    }
-
-    if (scmstub) {
-      /* Emit Scheme stub if requested */
-      String *primitive_name = NewString(module_name);
-      if (goops)
-	Printv(primitive_name, "-", primsuffix, NIL);
-
-      String *mod = NewString(primitive_name);
-      Replaceall(mod, "/", " ");
-
-      String *fname = NewStringf("%s%s.scm",
-				 SWIG_output_directory(),
-				 primitive_name);
-      Delete(primitive_name);
-      File *scmstubfile = NewFile(fname, "w", SWIG_output_files());
-      if (!scmstubfile) {
-	FileErrorDisplay(fname);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Delete(fname);
-
-      Swig_banner_target_lang(scmstubfile, ";;;");
-      Printf(scmstubfile, "\n");
-      if (linkage == GUILE_LSTYLE_SIMPLE || linkage == GUILE_LSTYLE_PASSIVE)
-	Printf(scmstubfile, "(define-module (%s))\n\n", mod);
-      Delete(mod);
-      Printf(scmstubfile, "%s", scmtext);
-      if ((linkage == GUILE_LSTYLE_SIMPLE || linkage == GUILE_LSTYLE_PASSIVE)
-	  && Len(exported_symbols) > 0) {
-	String *ex = NewString(exported_symbols);
-	Replaceall(ex, ", ", "\n        ");
-	Replaceall(ex, "\"", "");
-	Chop(ex);
-	Printf(scmstubfile, "\n(export %s)\n", ex);
-	Delete(ex);
-      }
-      Delete(scmstubfile);
-    }
-
-    if (goops) {
-      String *mod = NewString(module_name);
-      Replaceall(mod, "/", " ");
-
-      String *fname = NewStringf("%s%s.scm", SWIG_output_directory(),
-				 module_name);
-      File *goopsfile = NewFile(fname, "w", SWIG_output_files());
-      if (!goopsfile) {
-	FileErrorDisplay(fname);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Delete(fname);
-      Swig_banner_target_lang(goopsfile, ";;;");
-      Printf(goopsfile, "\n");
-      Printf(goopsfile, "(define-module (%s))\n", mod);
-      Printf(goopsfile, "%s\n", goopstext);
-      Printf(goopsfile, "(use-modules (oop goops) (Swig common))\n");
-      if (primRenamer) {
-	Printf(goopsfile, "(use-modules ((%s-%s) :renamer (symbol-prefix-proc 'primitive:)))\n", mod, primsuffix);
-      }
-      Printf(goopsfile, "%s\n(export %s)", goopscode, goopsexport);
-      if (exportprimitive) {
-	String *ex = NewString(exported_symbols);
-	Replaceall(ex, ", ", "\n        ");
-	Replaceall(ex, "\"", "");
-	Chop(ex);
-	Printf(goopsfile, "\n(export %s)", ex);
-	Delete(ex);
-      }
-      Delete(mod);
-      Delete(goopsfile);
-    }
-
-    Delete(module_func);
-    if (CPlusPlus) {
-      Printf(f_init, "\n}\n");
-    }
-  }
-
-  /* Return true iff T is a pointer type */
-
-  int is_a_pointer(SwigType *t) {
-    return SwigType_ispointer(SwigType_typedef_resolve_all(t));
-  }
-
-  /* Report an error handling the given type. */
-
-  void throw_unhandled_guile_type_error(SwigType *d) {
-    Swig_warning(WARN_TYPEMAP_UNDEF, input_file, line_number, "Unable to handle type %s.\n", SwigType_str(d, 0));
-  }
-
-  /* Write out procedure documentation */
-
-  void write_doc(const String *proc_name, const String *signature, const String *doc, const String *signature2 = NULL) {
-    switch (docformat) {
-    case GUILE_1_4:
-      Printv(procdoc, "\f\n", NIL);
-      Printv(procdoc, "(", signature, ")\n", NIL);
-      if (signature2)
-	Printv(procdoc, "(", signature2, ")\n", NIL);
-      Printv(procdoc, doc, "\n", NIL);
-      break;
-    case PLAIN:
-      Printv(procdoc, "\f", proc_name, "\n\n", NIL);
-      Printv(procdoc, "(", signature, ")\n", NIL);
-      if (signature2)
-	Printv(procdoc, "(", signature2, ")\n", NIL);
-      Printv(procdoc, doc, "\n\n", NIL);
-      break;
-    case TEXINFO:
-      Printv(procdoc, "\f", proc_name, "\n", NIL);
-      Printv(procdoc, "@deffn primitive ", signature, "\n", NIL);
-      if (signature2)
-	Printv(procdoc, "@deffnx primitive ", signature2, "\n", NIL);
-      Printv(procdoc, doc, "\n", NIL);
-      Printv(procdoc, "@end deffn\n\n", NIL);
-      break;
-    }
-  }
-
-  /* returns false if the typemap is an empty string */
-  bool handle_documentation_typemap(String *output,
-				    const String *maybe_delimiter, Parm *p, const String *typemap, const String *default_doc, const String *name = NULL) {
-    String *tmp = NewString("");
-    String *tm;
-    if (!(tm = Getattr(p, typemap))) {
-      Printf(tmp, "%s", default_doc);
-      tm = tmp;
-    }
-    bool result = (Len(tm) > 0);
-    if (maybe_delimiter && Len(output) > 0 && Len(tm) > 0) {
-      Printv(output, maybe_delimiter, NIL);
-    }
-    const String *pn = !name ? (const String *) Getattr(p, "name") : name;
-    String *pt = Getattr(p, "type");
-    Replaceall(tm, "$name", pn);	// legacy for $parmname
-    Replaceall(tm, "$type", SwigType_str(pt, 0));
-    /* $NAME is like $name, but marked-up as a variable. */
-    String *ARGNAME = NewString("");
-    if (docformat == TEXINFO)
-      Printf(ARGNAME, "@var{%s}", pn);
-    else
-      Printf(ARGNAME, "%(upper)s", pn);
-    Replaceall(tm, "$NAME", ARGNAME);
-    Replaceall(tm, "$PARMNAME", ARGNAME);
-    Printv(output, tm, NIL);
-    Delete(tmp);
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * Create a function declaration and register it with the interpreter.
-   * ------------------------------------------------------------ */
-
-  virtual int functionWrapper(Node *n) {
-    String *iname = Getattr(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    Parm *p;
-    String *proc_name = 0;
-    char source[256];
-    Wrapper *f = NewWrapper();
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *signature = NewString("");
-    String *doc_body = NewString("");
-    String *returns = NewString("");
-    String *method_signature = NewString("");
-    String *primitive_args = NewString("");
-    Hash *scheme_arg_names = NewHash();
-    int num_results = 1;
-    String *tmp = NewString("");
-    String *tm;
-    int i;
-    int numargs = 0;
-    int numreq = 0;
-    String *overname = 0;
-    int args_passed_as_array = 0;
-    int scheme_argnum = 0;
-    bool any_specialized_arg = false;
-
-    // Make a wrapper name for this
-    String *wname = Swig_name_wrapper(iname);
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-      args_passed_as_array = 1;
-    } else {
-      if (!addSymbol(iname, n)) {
-        DelWrapper(f);
-	return SWIG_ERROR; 
-      }
-    }
-    if (overname) {
-      Append(wname, overname);
-    }
-    Setattr(n, "wrap:name", wname);
-
-    // Build the name for scheme.
-    proc_name = NewString(iname);
-    Replaceall(proc_name, "_", "-");
-
-    /* Emit locals etc. into f->code; figure out which args to ignore */
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    /* Get number of required and total arguments */
-    numargs = emit_num_arguments(l);
-    numreq = emit_num_required(l);
-
-    /* Declare return variable */
-
-    Wrapper_add_local(f, "gswig_result", "SCM gswig_result");
-    Wrapper_add_local(f, "gswig_list_p", "SWIGUNUSED int gswig_list_p = 0");
-
-    /* Open prototype and signature */
-
-    Printv(f->def, "static SCM\n", wname, " (", NIL);
-    if (args_passed_as_array) {
-      Printv(f->def, "int argc, SCM *argv", NIL);
-    }
-    Printv(signature, proc_name, NIL);
-
-    /* Now write code to extract the parameters */
-
-    for (i = 0, p = l; i < numargs; i++) {
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      int opt_p = (i >= numreq);
-
-      // Produce names of source and target
-      if (args_passed_as_array)
-	sprintf(source, "argv[%d]", i);
-      else
-	sprintf(source, "s_%d", i);
-      String *target = Getattr(p, "lname");
-
-      if (!args_passed_as_array) {
-	if (i != 0)
-	  Printf(f->def, ", ");
-	Printf(f->def, "SCM s_%d", i);
-      }
-      if (opt_p) {
-	Printf(f->code, "    if (%s != SCM_UNDEFINED) {\n", source);
-      }
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$target", target);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	Printv(f->code, tm, "\n", NIL);
-
-	SwigType *pb = SwigType_typedef_resolve_all(SwigType_base(pt));
-	SwigType *pn = Getattr(p, "name");
-	String *argname;
-	scheme_argnum++;
-	if (pn && !Getattr(scheme_arg_names, pn))
-	  argname = pn;
-	else {
-	  /* Anonymous arg or re-used argument name -- choose a name that cannot clash */
-	  argname = NewStringf("%%arg%d", scheme_argnum);
-	}
-
-	if (procdoc) {
-	  if (i == numreq) {
-	    /* First optional argument */
-	    Printf(signature, " #:optional");
-	  }
-	  /* Add to signature (arglist) */
-	  handle_documentation_typemap(signature, " ", p, "tmap:in:arglist", "$name", argname);
-	  /* Document the type of the arg in the documentation body */
-	  handle_documentation_typemap(doc_body, ", ", p, "tmap:in:doc", "$NAME is of type <$type>", argname);
-	}
-
-	if (goops) {
-	  if (i < numreq) {
-	    if (strcmp("void", Char(pt)) != 0) {
-	      Node *class_node = Swig_symbol_clookup_check(pb, Getattr(n, "sym:symtab"),
-							   has_classname);
-	      String *goopsclassname = !class_node ? NULL : Getattr(class_node, "guile:goopsclassname");
-	      /* do input conversion */
-	      if (goopsclassname) {
-		Printv(method_signature, " (", argname, " ", goopsclassname, ")", NIL);
-		any_specialized_arg = true;
-	      } else {
-		Printv(method_signature, " ", argname, NIL);
-	      }
-	      Printv(primitive_args, " ", argname, NIL);
-	      Setattr(scheme_arg_names, argname, p);
-	    }
-	  }
-	}
-
-	if (!pn) {
-	  Delete(argname);
-	}
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	throw_unhandled_guile_type_error(pt);
-	p = nextSibling(p);
-      }
-      if (opt_p)
-	Printf(f->code, "    }\n");
-    }
-    if (Len(doc_body) > 0)
-      Printf(doc_body, ".\n");
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-    /* Pass output arguments back to the caller. */
-
-    /* Insert argument output code */
-    String *returns_argout = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	if (procdoc) {
-	  if (handle_documentation_typemap(returns_argout, ", ", p, "tmap:argout:doc", "$NAME (of type $type)")) {
-	    /* A documentation typemap that is not the empty string
-	       indicates that a value is returned to Scheme. */
-	    num_results++;
-	  }
-	}
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    if (exporting_destructor) {
-      /* Mark the destructor's argument as destroyed. */
-      String *tm = NewString("SWIG_Guile_MarkPointerDestroyed($input);");
-      Replaceall(tm, "$input", Getattr(l, "emit:input"));
-      Printv(cleanup, tm, "\n", NIL);
-      Delete(tm);
-    }
-
-    /* Close prototype */
-
-    Printf(f->def, ")\n{\n");
-
-    /* Define the scheme name in C. This define is used by several Guile
-       macros. */
-    Printv(f->def, "#define FUNC_NAME \"", proc_name, "\"", NIL);
-
-    // Now write code to make the function call
-    String *actioncode = emit_action(n);
-
-    // Now have return value, figure out what to do with it.
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$result", "gswig_result");
-      Replaceall(tm, "$target", "gswig_result");
-      Replaceall(tm, "$source", Swig_cresult_name());
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "1");
-      else
-	Replaceall(tm, "$owner", "0");
-      Printv(f->code, tm, "\n", NIL);
-    } else {
-      throw_unhandled_guile_type_error(d);
-    }
-    emit_return_variable(n, d, f);
-
-    // Documentation
-    if ((tm = Getattr(n, "tmap:out:doc"))) {
-      Printv(returns, tm, NIL);
-      if (Len(tm) > 0)
-	num_results = 1;
-      else
-	num_results = 0;
-    } else {
-      String *s = SwigType_str(d, 0);
-      Chop(s);
-      Printf(returns, "<%s>", s);
-      Delete(s);
-      num_results = 1;
-    }
-    Append(returns, returns_argout);
-
-
-    // Dump the argument output code
-    Printv(f->code, outarg, NIL);
-
-    // Dump the argument cleanup code
-    Printv(f->code, cleanup, NIL);
-
-    // Look for any remaining cleanup
-
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printv(f->code, tm, "\n", NIL);
-      }
-    }
-    // Free any memory allocated by the function being wrapped..
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printv(f->code, tm, "\n", NIL);
-    }
-    // Wrap things up (in a manner of speaking)
-
-    if (beforereturn)
-      Printv(f->code, beforereturn, "\n", NIL);
-    Printv(f->code, "return gswig_result;\n", NIL);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", iname);
-    // Undefine the scheme name
-
-    Printf(f->code, "#undef FUNC_NAME\n");
-    Printf(f->code, "}\n");
-
-    Wrapper_print(f, f_wrappers);
-
-    if (!Getattr(n, "sym:overloaded")) {
-      if (numargs > 10) {
-	int i;
-	/* gh_new_procedure would complain: too many args */
-	/* Build a wrapper wrapper */
-	Printv(f_wrappers, "static SCM\n", wname, "_rest (SCM rest)\n", NIL);
-	Printv(f_wrappers, "{\n", NIL);
-	Printf(f_wrappers, "SCM arg[%d];\n", numargs);
-	Printf(f_wrappers, "SWIG_Guile_GetArgs (arg, rest, %d, %d, \"%s\");\n", numreq, numargs - numreq, proc_name);
-	Printv(f_wrappers, "return ", wname, "(", NIL);
-	Printv(f_wrappers, "arg[0]", NIL);
-	for (i = 1; i < numargs; i++)
-	  Printf(f_wrappers, ", arg[%d]", i);
-	Printv(f_wrappers, ");\n", NIL);
-	Printv(f_wrappers, "}\n", NIL);
-	/* Register it */
-	Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, 0, 1, (swig_guile_proc) %s_rest);\n", proc_name, wname);
-      } else if (emit_setters && struct_member && strlen(Char(proc_name)) > 3) {
-	int len = Len(proc_name);
-	const char *pc = Char(proc_name);
-	/* MEMBER-set and MEMBER-get functions. */
-	int is_setter = (pc[len - 3] == 's');
-	if (is_setter) {
-	  Printf(f_init, "SCM setter = ");
-	  struct_member = 2;	/* have a setter */
-	} else
-	  Printf(f_init, "SCM getter = ");
-	/* GOOPS support uses the MEMBER-set and MEMBER-get functions,
-	   so ignore only_setters in this case. */
-	if (only_setters && !goops)
-	  Printf(f_init, "scm_c_make_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname);
-	else
-	  Printf(f_init, "scm_c_define_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname);
-
-	if (!is_setter) {
-	  /* Strip off "-get" */
-	  char *pws_name = (char *) malloc(sizeof(char) * (len - 3));
-	  strncpy(pws_name, pc, len - 3);
-	  pws_name[len - 4] = 0;
-	  if (struct_member == 2) {
-	    /* There was a setter, so create a procedure with setter */
-	    Printf(f_init, "scm_c_define");
-	    Printf(f_init, "(\"%s\", " "scm_make_procedure_with_setter(getter, setter));\n", pws_name);
-	  } else {
-	    /* There was no setter, so make an alias to the getter */
-	    Printf(f_init, "scm_c_define");
-	    Printf(f_init, "(\"%s\", getter);\n", pws_name);
-	  }
-	  Printf(exported_symbols, "\"%s\", ", pws_name);
-	  free(pws_name);
-	}
-      } else {
-	/* Register the function */
-	if (exporting_destructor) {
-	  Printf(f_init, "((swig_guile_clientdata *)(SWIGTYPE%s->clientdata))->destroy = (guile_destructor) %s;\n", swigtype_ptr, wname);
-	  //Printf(f_init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) %s);\n", swigtype_ptr, wname);
-	}
-	Printf(f_init, "scm_c_define_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname);
-      }
-    } else {			/* overloaded function; don't export the single methods */
-      if (!Getattr(n, "sym:nextSibling")) {
-	/* Emit overloading dispatch function */
-
-	int maxargs;
-	String *dispatch = Swig_overload_dispatch(n, "return %s(argc,argv);", &maxargs);
-
-	/* Generate a dispatch wrapper for all overloaded functions */
-
-	Wrapper *df = NewWrapper();
-	String *dname = Swig_name_wrapper(iname);
-
-	Printv(df->def, "static SCM\n", dname, "(SCM rest)\n{\n", NIL);
-	Printf(df->code, "#define FUNC_NAME \"%s\"\n", proc_name);
-	Printf(df->code, "SCM argv[%d];\n", maxargs);
-	Printf(df->code, "int argc = SWIG_Guile_GetArgs (argv, rest, %d, %d, \"%s\");\n", 0, maxargs, proc_name);
-	Printv(df->code, dispatch, "\n", NIL);
-	Printf(df->code, "scm_misc_error(\"%s\", \"No matching method for generic function `%s'\", SCM_EOL);\n", proc_name, iname);
-	Printf(df->code, "#undef FUNC_NAME\n");
-	Printv(df->code, "}\n", NIL);
-	Wrapper_print(df, f_wrappers);
-	Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, 0, 1, (swig_guile_proc) %s);\n", proc_name, dname);
-	DelWrapper(df);
-	Delete(dispatch);
-	Delete(dname);
-      }
-    }
-    Printf(exported_symbols, "\"%s\", ", proc_name);
-
-    if (!in_class || memberfunction_name) {
-      // export wrapper into goops file
-      String *method_def = NewString("");
-      String *goops_name;
-      if (in_class)
-	goops_name = NewString(memberfunction_name);
-      else
-	goops_name = goopsNameMapping(proc_name, "");
-      String *primitive_name = NewString("");
-      if (primRenamer)
-	Printv(primitive_name, "primitive:", proc_name, NIL);
-      else
-	Printv(primitive_name, proc_name, NIL);
-      Replaceall(method_signature, "_", "-");
-      Replaceall(primitive_args, "_", "-");
-      if (!any_specialized_arg) {
-	/* If there would not be any specialized argument in
-	   the method declaration, we simply re-export the
-	   function.  This is a performance optimization. */
-	Printv(method_def, "(define ", goops_name, " ", primitive_name, ")\n", NIL);
-      } else if (numreq == numargs) {
-	Printv(method_def, "(define-method (", goops_name, method_signature, ")\n", NIL);
-	Printv(method_def, "  (", primitive_name, primitive_args, "))\n", NIL);
-      } else {
-	/* Handle optional args. For the rest argument, use a name
-	   that cannot clash. */
-	Printv(method_def, "(define-method (", goops_name, method_signature, " . %args)\n", NIL);
-	Printv(method_def, "  (apply ", primitive_name, primitive_args, " %args))\n", NIL);
-      }
-      if (in_class) {
-	/* Defer method definition till end of class definition. */
-	Printv(goops_class_methods, method_def, NIL);
-      } else {
-	Printv(goopscode, method_def, NIL);
-      }
-      Printf(goopsexport, "%s ", goops_name);
-      Delete(primitive_name);
-      Delete(goops_name);
-      Delete(method_def);
-    }
-
-    if (procdoc) {
-      String *returns_text = NewString("");
-      if (num_results == 0)
-	Printv(returns_text, return_nothing_doc, NIL);
-      else if (num_results == 1)
-	Printv(returns_text, return_one_doc, NIL);
-      else
-	Printv(returns_text, return_multi_doc, NIL);
-      /* Substitute documentation variables */
-      static const char *numbers[] = { "zero", "one", "two", "three",
-	"four", "five", "six", "seven",
-	"eight", "nine", "ten", "eleven",
-	"twelve"
-      };
-      if (num_results <= 12)
-	Replaceall(returns_text, "$num_values", numbers[num_results]);
-      else {
-	String *num_results_str = NewStringf("%d", num_results);
-	Replaceall(returns_text, "$num_values", num_results_str);
-	Delete(num_results_str);
-      }
-      Replaceall(returns_text, "$values", returns);
-      Printf(doc_body, "\n%s", returns_text);
-      write_doc(proc_name, signature, doc_body);
-      Delete(returns_text);
-    }
-
-    Delete(proc_name);
-    Delete(outarg);
-    Delete(cleanup);
-    Delete(signature);
-    Delete(method_signature);
-    Delete(primitive_args);
-    Delete(doc_body);
-    Delete(returns_argout);
-    Delete(returns);
-    Delete(tmp);
-    Delete(scheme_arg_names);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   *
-   * Create a link to a C variable.
-   * This creates a single function PREFIX_var_VARNAME().
-   * This function takes a single optional argument.   If supplied, it means
-   * we are setting this variable to some value.  If omitted, it means we are
-   * simply evaluating this variable.  Either way, we return the variables
-   * value.
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-
-    String *proc_name;
-    Wrapper *f;
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    f = NewWrapper();
-    // evaluation function names
-
-    String *var_name = Swig_name_wrapper(iname);
-
-    // Build the name for scheme.
-    proc_name = NewString(iname);
-    Replaceall(proc_name, "_", "-");
-    Setattr(n, "wrap:name", proc_name);
-
-    if (1 || (SwigType_type(t) != T_USER) || (is_a_pointer(t))) {
-
-      Printf(f->def, "static SCM\n%s(SCM s_0)\n{\n", var_name);
-
-      /* Define the scheme name in C. This define is used by several Guile
-         macros. */
-      Printv(f->def, "#define FUNC_NAME \"", proc_name, "\"", NIL);
-
-      Wrapper_add_local(f, "gswig_result", "SCM gswig_result");
-
-      if (!GetFlag(n, "feature:immutable")) {
-	/* Check for a setting of the variable value */
-	Printf(f->code, "if (s_0 != SCM_UNDEFINED) {\n");
-	if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-	  Replaceall(tm, "$source", "s_0");
-	  Replaceall(tm, "$input", "s_0");
-	  Replaceall(tm, "$target", name);
-	  /* Printv(f->code,tm,"\n",NIL); */
-	  emit_action_code(n, f->code, tm);
-	} else {
-	  throw_unhandled_guile_type_error(t);
-	}
-	Printf(f->code, "}\n");
-      }
-      // Now return the value of the variable (regardless
-      // of evaluating or setting)
-
-      if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-	Replaceall(tm, "$source", name);
-	Replaceall(tm, "$target", "gswig_result");
-	Replaceall(tm, "$result", "gswig_result");
-	/* Printv(f->code,tm,"\n",NIL); */
-	emit_action_code(n, f->code, tm);
-      } else {
-	throw_unhandled_guile_type_error(t);
-      }
-      Printf(f->code, "\nreturn gswig_result;\n");
-      Printf(f->code, "#undef FUNC_NAME\n");
-      Printf(f->code, "}\n");
-
-      Wrapper_print(f, f_wrappers);
-
-      // Now add symbol to the Guile interpreter
-
-      if (!emit_setters || GetFlag(n, "feature:immutable")) {
-	/* Read-only variables become a simple procedure returning the
-	   value; read-write variables become a simple procedure with
-	   an optional argument. */
-
-	if (!goops && GetFlag(n, "feature:constasvar")) {
-	  /* need to export this function as a variable instead of a procedure */
-	  if (scmstub) {
-	    /* export the function in the wrapper, and (set!) it in scmstub */
-	    Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, %d, 0, (swig_guile_proc) %s);\n", proc_name, !GetFlag(n, "feature:immutable"), var_name);
-	    Printf(scmtext, "(set! %s (%s))\n", proc_name, proc_name);
-	  } else {
-	    /* export the variable directly */
-	    Printf(f_init, "scm_c_define(\"%s\", %s(SCM_UNDEFINED));\n", proc_name, var_name);
-	  }
-
-	} else {
-	  /* Export the function as normal */
-	  Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, %d, 0, (swig_guile_proc) %s);\n", proc_name, !GetFlag(n, "feature:immutable"), var_name);
-	}
-
-      } else {
-	/* Read/write variables become a procedure with setter. */
-	Printf(f_init, "{ SCM p = scm_c_define_gsubr(\"%s\", 0, 1, 0, (swig_guile_proc) %s);\n", proc_name, var_name);
-	Printf(f_init, "scm_c_define");
-	Printf(f_init, "(\"%s\", " "scm_make_procedure_with_setter(p, p)); }\n", proc_name);
-      }
-      Printf(exported_symbols, "\"%s\", ", proc_name);
-
-      // export wrapper into goops file
-      if (!in_class) {		// only if the variable is not part of a class
-	String *class_name = SwigType_typedef_resolve_all(SwigType_base(t));
-	String *goops_name = goopsNameMapping(proc_name, "");
-	String *primitive_name = NewString("");
-	if (primRenamer)
-	  Printv(primitive_name, "primitive:", NIL);
-	Printv(primitive_name, proc_name, NIL);
-	/* Simply re-export the procedure */
-	if ((!emit_setters || GetFlag(n, "feature:immutable"))
-	    && GetFlag(n, "feature:constasvar")) {
-	  Printv(goopscode, "(define ", goops_name, " (", primitive_name, "))\n", NIL);
-	} else {
-	  Printv(goopscode, "(define ", goops_name, " ", primitive_name, ")\n", NIL);
-	}
-	Printf(goopsexport, "%s ", goops_name);
-	Delete(primitive_name);
-	Delete(class_name);
-	Delete(goops_name);
-      }
-
-      if (procdoc) {
-	/* Compute documentation */
-	String *signature = NewString("");
-	String *signature2 = NULL;
-	String *doc = NewString("");
-
-	if (GetFlag(n, "feature:immutable")) {
-	  Printv(signature, proc_name, NIL);
-	  if (GetFlag(n, "feature:constasvar")) {
-	    Printv(doc, "Is constant ", NIL);
-	  } else {
-	    Printv(doc, "Returns constant ", NIL);
-	  }
-	  if ((tm = Getattr(n, "tmap:varout:doc"))) {
-	    Printv(doc, tm, NIL);
-	  } else {
-	    String *s = SwigType_str(t, 0);
-	    Chop(s);
-	    Printf(doc, "<%s>", s);
-	    Delete(s);
-	  }
-	} else if (emit_setters) {
-	  Printv(signature, proc_name, NIL);
-	  signature2 = NewString("");
-	  Printv(signature2, "set! (", proc_name, ") ", NIL);
-	  handle_documentation_typemap(signature2, NIL, n, "tmap:varin:arglist", "new-value");
-	  Printv(doc, "Get or set the value of the C variable, \n", NIL);
-	  Printv(doc, "which is of type ", NIL);
-	  handle_documentation_typemap(doc, NIL, n, "tmap:varout:doc", "$1_type");
-	  Printv(doc, ".");
-	} else {
-	  Printv(signature, proc_name, " #:optional ", NIL);
-	  if ((tm = Getattr(n, "tmap:varin:doc"))) {
-	    Printv(signature, tm, NIL);
-	  } else {
-	    String *s = SwigType_str(t, 0);
-	    Chop(s);
-	    Printf(signature, "new-value <%s>", s);
-	    Delete(s);
-	  }
-
-	  Printv(doc, "If NEW-VALUE is provided, " "set C variable to this value.\n", NIL);
-	  Printv(doc, "Returns variable value ", NIL);
-	  if ((tm = Getattr(n, "tmap:varout:doc"))) {
-	    Printv(doc, tm, NIL);
-	  } else {
-	    String *s = SwigType_str(t, 0);
-	    Chop(s);
-	    Printf(doc, "<%s>", s);
-	    Delete(s);
-	  }
-	}
-	write_doc(proc_name, signature, doc, signature2);
-	Delete(signature);
-	if (signature2)
-	  Delete(signature2);
-	Delete(doc);
-      }
-
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAR_UNDEF, input_file, line_number, "Unsupported variable type %s (ignored).\n", SwigType_str(t, 0));
-    }
-    Delete(var_name);
-    Delete(proc_name);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   *
-   * We create a read-only variable.
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    int constasvar = GetFlag(n, "feature:constasvar");
-
-
-    String *proc_name;
-    String *var_name;
-    Wrapper *f;
-    SwigType *nctype;
-    String *tm;
-
-    f = NewWrapper();
-
-    // Make a static variable;
-    var_name = NewStringf("%sconst_%s", prefix, iname);
-
-    // Strip const qualifier from type if present
-
-    nctype = NewString(type);
-    if (SwigType_isconst(nctype)) {
-      Delete(SwigType_pop(nctype));
-    }
-    // Build the name for scheme.
-    proc_name = NewString(iname);
-    Replaceall(proc_name, "_", "-");
-
-    if ((SwigType_type(nctype) == T_USER) && (!is_a_pointer(nctype))) {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      Delete(var_name);
-      DelWrapper(f);
-      return SWIG_NOWRAP;
-    }
-    // See if there's a typemap
-
-    if ((tm = Swig_typemap_lookup("constant", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$value", value);
-      Replaceall(tm, "$target", name);
-      Printv(f_header, tm, "\n", NIL);
-    } else {
-      // Create variable and assign it a value
-      Printf(f_header, "static %s = (%s)(%s);\n", SwigType_str(type, var_name), SwigType_str(type, 0), value);
-    }
-    {
-      /* Hack alert: will cleanup later -- Dave */
-      Node *nn = NewHash();
-      Setfile(nn, Getfile(n));
-      Setline(nn, Getline(n));
-      Setattr(nn, "name", var_name);
-      Setattr(nn, "sym:name", iname);
-      Setattr(nn, "type", nctype);
-      SetFlag(nn, "feature:immutable");
-      if (constasvar) {
-	SetFlag(nn, "feature:constasvar");
-      }
-      variableWrapper(nn);
-      Delete(nn);
-    }
-    Delete(var_name);
-    Delete(nctype);
-    Delete(proc_name);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-  virtual int classDeclaration(Node *n) {
-    String *class_name = NewStringf("<%s>", Getattr(n, "sym:name"));
-    Setattr(n, "guile:goopsclassname", class_name);
-    return Language::classDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-  virtual int classHandler(Node *n) {
-    /* Create new strings for building up a wrapper function */
-    have_constructor = 0;
-
-    class_name = NewString("");
-    short_class_name = NewString("");
-    Printv(class_name, "<", Getattr(n, "sym:name"), ">", NIL);
-    Printv(short_class_name, Getattr(n, "sym:name"), NIL);
-    Replaceall(class_name, "_", "-");
-    Replaceall(short_class_name, "_", "-");
-
-    if (!addSymbol(class_name, n))
-      return SWIG_ERROR;
-
-    /* Handle inheritance */
-    String *base_class = NewString("<");
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist)) {
-      Iterator i = First(baselist);
-      while (i.item) {
-	Printv(base_class, Getattr(i.item, "sym:name"), NIL);
-	i = Next(i);
-	if (i.item) {
-	  Printf(base_class, "> <");
-	}
-      }
-    }
-    Printf(base_class, ">");
-    Replaceall(base_class, "_", "-");
-
-    Printv(goopscode, "(define-class ", class_name, " ", NIL);
-    Printf(goopsexport, "%s ", class_name);
-
-    if (Len(base_class) > 2) {
-      Printv(goopscode, "(", base_class, ")\n", NIL);
-    } else {
-      Printv(goopscode, "(<swig>)\n", NIL);
-    }
-    SwigType *ct = NewStringf("p.%s", Getattr(n, "name"));
-    swigtype_ptr = SwigType_manglestr(ct);
-
-    String *mangled_classname = Swig_name_mangle(Getattr(n, "sym:name"));
-    /* Export clientdata structure */
-    Printf(f_runtime, "static swig_guile_clientdata _swig_guile_clientdata%s = { NULL, SCM_EOL };\n", mangled_classname);
-
-    Printv(f_init, "SWIG_TypeClientData(SWIGTYPE", swigtype_ptr, ", (void *) &_swig_guile_clientdata", mangled_classname, ");\n", NIL);
-    SwigType_remember(ct);
-    Delete(ct);
-
-    /* Emit all of the members */
-    goops_class_methods = NewString("");
-
-    in_class = 1;
-    Language::classHandler(n);
-    in_class = 0;
-
-    Printv(goopscode, "  #:metaclass <swig-metaclass>\n", NIL);
-
-    if (have_constructor)
-      Printv(goopscode, "  #:new-function ", primRenamer ? "primitive:" : "", "new-", short_class_name, "\n", NIL);
-
-    Printf(goopscode, ")\n%s\n", goops_class_methods);
-    Delete(goops_class_methods);
-    goops_class_methods = 0;
-
-
-    /* export class initialization function */
-    if (goops) {
-      /* export the wrapper function */
-      String *funcName = NewString(mangled_classname);
-      Printf(funcName, "_swig_guile_setgoopsclass");
-      String *guileFuncName = NewString(funcName);
-      Replaceall(guileFuncName, "_", "-");
-
-      Printv(f_wrappers, "static SCM ", funcName, "(SCM cl) \n", NIL);
-      Printf(f_wrappers, "#define FUNC_NAME %s\n{\n", guileFuncName);
-      Printv(f_wrappers, "  ((swig_guile_clientdata *)(SWIGTYPE", swigtype_ptr, "->clientdata))->goops_class = cl;\n", NIL);
-      Printf(f_wrappers, "  return SCM_UNSPECIFIED;\n");
-      Printf(f_wrappers, "}\n#undef FUNC_NAME\n\n");
-
-      Printf(f_init, "scm_c_define_gsubr(\"%s\", 1, 0, 0, (swig_guile_proc) %s);\n", guileFuncName, funcName);
-      Printf(exported_symbols, "\"%s\", ", guileFuncName);
-
-      /* export the call to the wrapper function */
-      Printf(goopscode, "(%s%s %s)\n\n", primRenamer ? "primitive:" : "", guileFuncName, class_name);
-
-      Delete(guileFuncName);
-      Delete(funcName);
-    }
-
-    Delete(mangled_classname);
-
-    Delete(swigtype_ptr);
-    swigtype_ptr = 0;
-
-    Delete(class_name);
-    Delete(short_class_name);
-    class_name = 0;
-    short_class_name = 0;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-  int memberfunctionHandler(Node *n) {
-    String *iname = Getattr(n, "sym:name");
-    String *proc = NewString(iname);
-    Replaceall(proc, "_", "-");
-
-    memberfunction_name = goopsNameMapping(proc, short_class_name);
-    Language::memberfunctionHandler(n);
-    Delete(memberfunction_name);
-    memberfunction_name = NULL;
-    Delete(proc);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-  int membervariableHandler(Node *n) {
-    String *iname = Getattr(n, "sym:name");
-
-    if (emit_setters) {
-      struct_member = 1;
-      Printf(f_init, "{\n");
-    }
-
-    Language::membervariableHandler(n);
-
-    if (emit_setters) {
-      Printf(f_init, "}\n");
-      struct_member = 0;
-    }
-
-    String *proc = NewString(iname);
-    Replaceall(proc, "_", "-");
-    String *goops_name = goopsNameMapping(proc, short_class_name);
-
-    /* The slot name is never qualified with the class,
-       even if useclassprefix is true. */
-    Printv(goopscode, "  (", proc, " #:allocation #:virtual", NIL);
-    /* GOOPS (at least in Guile 1.6.3) only accepts closures, not
-       primitive procedures for slot-ref and slot-set. */
-    Printv(goopscode, "\n   #:slot-ref (lambda (obj) (", primRenamer ? "primitive:" : "", short_class_name, "-", proc, "-get", " obj))", NIL);
-    if (!GetFlag(n, "feature:immutable")) {
-      Printv(goopscode, "\n   #:slot-set! (lambda (obj value) (", primRenamer ? "primitive:" : "", short_class_name, "-", proc, "-set", " obj value))", NIL);
-    } else {
-      Printf(goopscode, "\n   #:slot-set! (lambda (obj value) (error \"Immutable slot\"))");
-    }
-    if (emit_slot_accessors) {
-      if (GetFlag(n, "feature:immutable")) {
-	Printv(goopscode, "\n   #:getter ", goops_name, NIL);
-      } else {
-	Printv(goopscode, "\n   #:accessor ", goops_name, NIL);
-      }
-      Printf(goopsexport, "%s ", goops_name);
-    }
-    Printv(goopscode, ")\n", NIL);
-    Delete(proc);
-    Delete(goops_name);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorHandler()
-   * ------------------------------------------------------------ */
-  int constructorHandler(Node *n) {
-    Language::constructorHandler(n);
-    have_constructor = 1;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * destructorHandler()
-   * ------------------------------------------------------------ */
-  virtual int destructorHandler(Node *n) {
-    exporting_destructor = true;
-    Language::destructorHandler(n);
-    exporting_destructor = false;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * pragmaDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *cmd = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-#     define store_pragma(PRAGMANAME)			\
-        if (Strcmp(cmd, #PRAGMANAME) == 0) {		\
-	  if (PRAGMANAME) Delete(PRAGMANAME);		\
-	  PRAGMANAME = value ? NewString(value) : NULL;	\
-	}
-
-      if (Strcmp(lang, "guile") == 0) {
-	store_pragma(beforereturn)
-	    store_pragma(return_nothing_doc)
-	    store_pragma(return_one_doc)
-	    store_pragma(return_multi_doc);
-#     undef store_pragma
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * goopsNameMapping()
-   * Maps the identifier from C++ to the GOOPS based * on command 
-   * line parameters and such.
-   * If class_name = "" that means the mapping is for a function or
-   * variable not attached to any class.
-   * ------------------------------------------------------------ */
-  String *goopsNameMapping(String *name, const_String_or_char_ptr class_name) {
-    String *n = NewString("");
-
-    if (Strcmp(class_name, "") == 0) {
-      // not part of a class, so no class name to prefix
-      if (goopsprefix) {
-	Printf(n, "%s%s", goopsprefix, name);
-      } else {
-	Printf(n, "%s", name);
-      }
-    } else {
-      if (useclassprefix) {
-	Printf(n, "%s-%s", class_name, name);
-      } else {
-	if (goopsprefix) {
-	  Printf(n, "%s%s", goopsprefix, name);
-	} else {
-	  Printf(n, "%s", name);
-	}
-      }
-    }
-    return n;
-  }
-
-
-  /* ------------------------------------------------------------
-   * validIdentifier()
-   * ------------------------------------------------------------ */
-
-  virtual int validIdentifier(String *s) {
-    char *c = Char(s);
-    /* Check whether we have an R5RS identifier.  Guile supports a
-       superset of R5RS identifiers, but it's probably a bad idea to use
-       those. */
-    /* <identifier> --> <initial> <subsequent>* | <peculiar identifier> */
-    /* <initial> --> <letter> | <special initial> */
-    if (!(isalpha(*c) || (*c == '!') || (*c == '$') || (*c == '%')
-	  || (*c == '&') || (*c == '*') || (*c == '/') || (*c == ':')
-	  || (*c == '<') || (*c == '=') || (*c == '>') || (*c == '?')
-	  || (*c == '^') || (*c == '_') || (*c == '~'))) {
-      /* <peculiar identifier> --> + | - | ... */
-      if ((strcmp(c, "+") == 0)
-	  || strcmp(c, "-") == 0 || strcmp(c, "...") == 0)
-	return 1;
-      else
-	return 0;
-    }
-    /* <subsequent> --> <initial> | <digit> | <special subsequent> */
-    while (*c) {
-      if (!(isalnum(*c) || (*c == '!') || (*c == '$') || (*c == '%')
-	    || (*c == '&') || (*c == '*') || (*c == '/') || (*c == ':')
-	    || (*c == '<') || (*c == '=') || (*c == '>') || (*c == '?')
-	    || (*c == '^') || (*c == '_') || (*c == '~') || (*c == '+')
-	    || (*c == '-') || (*c == '.') || (*c == '@')))
-	return 0;
-      c++;
-    }
-    return 1;
-  }
-
-  String *runtimeCode() {
-    String *s;
-    s = Swig_include_sys("guile_scm_run.swg");
-    if (!s) {
-      Printf(stderr, "*** Unable to open 'guile_scm_run.swg");
-      s = NewString("");
-    }
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigguilerun.h");
-  }
-};
-
-/* -----------------------------------------------------------------------------
- * swig_guile()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_guile() {
-  return new GUILE();
-}
-extern "C" Language *swig_guile(void) {
-  return new_swig_guile();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/interface.cxx b/dependencies2013/win32/swig/Source/Modules/interface.cxx
deleted file mode 100644
index f6d4c955..00000000
--- a/dependencies2013/win32/swig/Source/Modules/interface.cxx
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * interface.cxx
- *
- * This module contains support for the interface feature.
- * This feature is used in language modules where the target language does not
- * naturally support C++ style multiple inheritance, but does support inheritance 
- * from multiple interfaces.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-static bool interface_feature_enabled = false;
-
-/* -----------------------------------------------------------------------------
- * collect_interface_methods()
- *
- * Create a list of all the methods from the base classes of class n that are
- * marked as an interface. The resulting list is thus the list of methods that
- * need to be implemented in order for n to be non-abstract.
- * ----------------------------------------------------------------------------- */
-
-static List *collect_interface_methods(Node *n) {
-  List *methods = NewList();
-  if (Hash *bases = Getattr(n, "interface:bases")) {
-    List *keys = Keys(bases);
-    for (Iterator base = First(keys); base.item; base = Next(base)) {
-      Node *cls = Getattr(bases, base.item);
-      if (cls == n)
-	continue;
-      for (Node *child = firstChild(cls); child; child = nextSibling(child)) {
-	if (Cmp(nodeType(child), "cdecl") == 0) {
-	  if (GetFlag(child, "feature:ignore") || Getattr(child, "interface:owner"))
-	    continue; // skip methods propagated to bases
-	  Node *m = Copy(child);
-	  set_nextSibling(m, NIL);
-	  set_previousSibling(m, NIL);
-	  Setattr(m, "interface:owner", cls);
-	  Append(methods, m);
-	}
-      }
-    }
-    Delete(keys);
-  }
-  return methods;
-}
-
-/* -----------------------------------------------------------------------------
- * collect_interface_bases
- * ----------------------------------------------------------------------------- */
-
-static void collect_interface_bases(Hash *bases, Node *n) {
-  if (Getattr(n, "feature:interface")) {
-    String *name = Getattr(n, "interface:name");
-    if (!Getattr(bases, name))
-      Setattr(bases, name, n);
-  }
-
-  if (List *baselist = Getattr(n, "bases")) {
-    for (Iterator base = First(baselist); base.item; base = Next(base)) {
-      if (!GetFlag(base.item, "feature:ignore")) {
-	if (Getattr(base.item, "feature:interface"))
-	  collect_interface_bases(bases, base.item);
-      }
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * collect_interface_base_classes()
- *
- * Create a hash containing all the classes up the inheritance hierarchy
- * marked with feature:interface (including this class n).
- * Stops going up the inheritance chain as soon as a class is found without
- * feature:interface.
- * The idea is to find all the base interfaces that a class must implement.
- * ----------------------------------------------------------------------------- */
-
-static void collect_interface_base_classes(Node *n) {
-  if (Getattr(n, "feature:interface")) {
-    // check all bases are also interfaces
-    if (List *baselist = Getattr(n, "bases")) {
-      for (Iterator base = First(baselist); base.item; base = Next(base)) {
-	if (!GetFlag(base.item, "feature:ignore")) {
-	  if (!Getattr(base.item, "feature:interface")) {
-	    Swig_error(Getfile(n), Getline(n), "Base class '%s' of '%s' is not similarly marked as an interface.\n", SwigType_namestr(Getattr(base.item, "name")), SwigType_namestr(Getattr(n, "name")));
-	    SWIG_exit(EXIT_FAILURE);
-	  }
-	}
-      }
-    }
-  }
-
-  Hash *interface_bases = NewHash();
-  collect_interface_bases(interface_bases, n);
-  if (Len(interface_bases) == 0)
-    Delete(interface_bases);
-  else
-    Setattr(n, "interface:bases", interface_bases);
-}
-
-/* -----------------------------------------------------------------------------
- * process_interface_name()
- * ----------------------------------------------------------------------------- */
-
-static void process_interface_name(Node *n) {
-  if (Getattr(n, "feature:interface")) {
-    String *interface_name = Getattr(n, "feature:interface:name");
-    if (!Len(interface_name)) {
-      Swig_error(Getfile(n), Getline(n), "The interface feature for '%s' is missing the name attribute.\n", SwigType_namestr(Getattr(n, "name")));
-      SWIG_exit(EXIT_FAILURE);
-    }
-    if (Strchr(interface_name, '%')) {
-      String *name = NewStringf(interface_name, Getattr(n, "sym:name"));
-      Setattr(n, "interface:name", name);
-    } else {
-      Setattr(n, "interface:name", interface_name);
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_interface_propagate_methods()
- *
- * Find all the base classes marked as an interface (with feature:interface) for
- * class node n. For each of these, add all of its methods as methods of n so that
- * n is not abstract. If class n is also marked as an interface, it will remain
- * abstract and not have any methods added.
- * ----------------------------------------------------------------------------- */
-
-void Swig_interface_propagate_methods(Node *n) {
-  if (interface_feature_enabled) {
-    process_interface_name(n);
-    collect_interface_base_classes(n);
-    List *methods = collect_interface_methods(n);
-    bool is_interface = Getattr(n, "feature:interface") != 0;
-    for (Iterator mi = First(methods); mi.item; mi = Next(mi)) {
-      if (!is_interface && GetFlag(mi.item, "abstract"))
-	continue;
-      String *this_decl = Getattr(mi.item, "decl");
-      String *this_decl_resolved = SwigType_typedef_resolve_all(this_decl);
-      bool identically_overloaded_method = false; // true when a base class' method is implemented in n
-      if (SwigType_isfunction(this_decl_resolved)) {
-	String *name = Getattr(mi.item, "name");
-	for (Node *child = firstChild(n); child; child = nextSibling(child)) {
-	  if (Getattr(child, "interface:owner"))
-	    break; // at the end of the list are newly appended methods
-	  if (checkAttribute(child, "name", name)) {
-	    String *decl = SwigType_typedef_resolve_all(Getattr(child, "decl"));
-	    identically_overloaded_method = Strcmp(decl, this_decl_resolved) == 0;
-	    Delete(decl);
-	    if (identically_overloaded_method)
-	      break;
-	  }
-	}
-      }
-      Delete(this_decl_resolved);
-      if (!identically_overloaded_method) {
-	// TODO: Fix if the method is overloaded with different arguments / has default args
-	appendChild(n, mi.item);
-      } else {
-	Delete(mi.item);
-      }
-    }
-    Delete(methods);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_interface_feature_enable()
- *
- * Turn on interface feature support
- * ----------------------------------------------------------------------------- */
-
-void Swig_interface_feature_enable() {
-  interface_feature_enabled = true;
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/java.cxx b/dependencies2013/win32/swig/Source/Modules/java.cxx
deleted file mode 100644
index 94696244..00000000
--- a/dependencies2013/win32/swig/Source/Modules/java.cxx
+++ /dev/null
@@ -1,4884 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * java.cxx
- *
- * Java language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include <limits.h>		// for INT_MAX
-#include "cparse.h"
-#include <ctype.h>
-
-/* Hash type used for upcalls from C/C++ */
-typedef DOH UpcallData;
-
-class JAVA:public Language {
-  static const char *usage;
-  const String *empty_string;
-  const String *public_string;
-  const String *protected_string;
-
-  Hash *swig_types_hash;
-  File *f_begin;
-  File *f_runtime;
-  File *f_runtime_h;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-  File *f_directors;
-  File *f_directors_h;
-  List *filenames_list;
-
-  bool proxy_flag;		// Flag for generating proxy classes
-  bool nopgcpp_flag;		// Flag for suppressing the premature garbage collection prevention parameter
-  bool native_function_flag;	// Flag for when wrapping a native function
-  bool enum_constant_flag;	// Flag for when wrapping an enum or constant
-  bool static_flag;		// Flag for when wrapping a static functions or member variables
-  bool variable_wrapper_flag;	// Flag for when wrapping a nonstatic member variable
-  bool wrapping_member_flag;	// Flag for when wrapping a member variable/enum/const
-  bool global_variable_flag;	// Flag for when wrapping a global variable
-  bool old_variable_names;	// Flag for old style variable names in the intermediary class
-  bool member_func_flag;	// flag set when wrapping a member function
-
-  String *imclass_name;		// intermediary class name
-  String *module_class_name;	// module class name
-  String *constants_interface_name;	// constants interface name
-  String *imclass_class_code;	// intermediary class code
-  String *proxy_class_def;
-  String *proxy_class_code;
-  String *interface_class_code; // if %feature("interface") was declared for a class, here goes the interface declaration
-  String *module_class_code;
-  String *proxy_class_name;	// proxy class name
-  String *full_proxy_class_name;// fully qualified proxy class name when using nspace feature, otherwise same as proxy_class_name
-  String *full_imclass_name;	// fully qualified intermediary class name when using nspace feature, otherwise same as imclass_name
-  String *variable_name;	//Name of a variable being wrapped
-  String *proxy_class_constants_code;
-  String *module_class_constants_code;
-  String *enum_code;
-  String *package;		// Optional package name
-  String *jnipackage;		// Package name used in the JNI code
-  String *package_path;		// Package name used internally by JNI (slashes)
-  String *imclass_imports;	//intermediary class imports from %pragma
-  String *module_imports;	//module imports from %pragma
-  String *imclass_baseclass;	//inheritance for intermediary class class from %pragma
-  String *imclass_package;	//package in which to generate the intermediary class
-  String *module_baseclass;	//inheritance for module class from %pragma
-  String *imclass_interfaces;	//interfaces for intermediary class class from %pragma
-  String *module_interfaces;	//interfaces for module class from %pragma
-  String *imclass_class_modifiers;	//class modifiers for intermediary class overriden by %pragma
-  String *module_class_modifiers;	//class modifiers for module class overriden by %pragma
-  String *upcasts_code;		//C++ casts for inheritance hierarchies C++ code
-  String *imclass_cppcasts_code;	//C++ casts up inheritance hierarchies intermediary class code
-  String *imclass_directors;	// Intermediate class director code
-  String *destructor_call;	//C++ destructor call if any
-  String *destructor_throws_clause;	//C++ destructor throws clause if any
-
-  // Director method stuff:
-  List *dmethods_seq;
-  Hash *dmethods_table;
-  int n_dmethods;
-  int n_directors;
-  int first_class_dmethod;
-  int curr_class_dmethod;
-  int nesting_depth;
-
-  enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum };
-
-public:
-
-  /* -----------------------------------------------------------------------------
-   * JAVA()
-   * ----------------------------------------------------------------------------- */
-
-   JAVA():empty_string(NewString("")),
-      public_string(NewString("public")),
-      protected_string(NewString("protected")),
-      swig_types_hash(NULL),
-      f_begin(NULL),
-      f_runtime(NULL),
-      f_runtime_h(NULL),
-      f_header(NULL),
-      f_wrappers(NULL),
-      f_init(NULL),
-      f_directors(NULL),
-      f_directors_h(NULL),
-      filenames_list(NULL),
-      proxy_flag(true),
-      nopgcpp_flag(false),
-      native_function_flag(false),
-      enum_constant_flag(false),
-      static_flag(false),
-      variable_wrapper_flag(false),
-      wrapping_member_flag(false),
-      global_variable_flag(false),
-      old_variable_names(false),
-      member_func_flag(false),
-      imclass_name(NULL),
-      module_class_name(NULL),
-      constants_interface_name(NULL),
-      imclass_class_code(NULL),
-      proxy_class_def(NULL),
-      proxy_class_code(NULL),
-      interface_class_code(NULL),
-      module_class_code(NULL),
-      proxy_class_name(NULL),
-      full_proxy_class_name(NULL),
-      full_imclass_name(NULL),
-      variable_name(NULL),
-      proxy_class_constants_code(NULL),
-      module_class_constants_code(NULL),
-      enum_code(NULL),
-      package(NULL),
-      jnipackage(NULL),
-      package_path(NULL),
-      imclass_imports(NULL),
-      module_imports(NULL),
-      imclass_baseclass(NULL),
-      imclass_package(NULL),
-      module_baseclass(NULL),
-      imclass_interfaces(NULL),
-      module_interfaces(NULL),
-      imclass_class_modifiers(NULL),
-      module_class_modifiers(NULL),
-      upcasts_code(NULL),
-      imclass_cppcasts_code(NULL),
-      imclass_directors(NULL),
-      destructor_call(NULL),
-      destructor_throws_clause(NULL),
-      dmethods_seq(NULL),
-      dmethods_table(NULL),
-      n_dmethods(0),
-      n_directors(0),
-      first_class_dmethod(0),
-      curr_class_dmethod(0),
-      nesting_depth(0){
-    /* for now, multiple inheritance in directors is disabled, this
-       should be easy to implement though */
-    director_multiple_inheritance = 0;
-    director_language = 1;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * constructIntermediateClassName()
-   *
-   * Construct the fully qualified name of the intermidiate class and set
-   * the full_imclass_name attribute accordingly.
-   * ----------------------------------------------------------------------------- */
-  void constructIntermediateClassName(Node *n) {
-    String *nspace = Getattr(n, "sym:nspace");
-
-    if (imclass_package && package)
-      full_imclass_name = NewStringf("%s.%s.%s", package, imclass_package, imclass_name);
-    else if (package && nspace)
-      full_imclass_name = NewStringf("%s.%s", package, imclass_name);
-    else if (imclass_package)
-      full_imclass_name = NewStringf("%s.%s", imclass_package, imclass_name);
-    else
-      full_imclass_name = NewStringf("%s", imclass_name);
-
-    if (nspace && !package) {
-      String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString("<unnamed>");
-      Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n),
-	  "The nspace feature is used on '%s' without -package. "
-	  "The generated code may not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name);
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getProxyName()
-   *
-   * Test to see if a type corresponds to something wrapped with a proxy class.
-   * Return NULL if not otherwise the proxy class name, fully qualified with
-   * package name if the nspace feature is used, unless jnidescriptor is true as
-   * the package name is handled differently (unfortunately for legacy reasons).
-   * ----------------------------------------------------------------------------- */
-  
-   String *getProxyName(SwigType *t, bool jnidescriptor = false) {
-     String *proxyname = NULL;
-     if (proxy_flag) {
-       Node *n = classLookup(t);
-       if (n) {
-	 proxyname = Getattr(n, "proxyname");
-	 if (!proxyname || jnidescriptor) {
-	   String *nspace = Getattr(n, "sym:nspace");
-	   String *symname = Copy(Getattr(n, "sym:name"));
-	   if (symname && !GetFlag(n, "feature:flatnested")) {
-             for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) {
-               if (String* name = Getattr(outer_class, "sym:name")) {
-                 Push(symname, jnidescriptor ? "$" : ".");
-                 Push(symname, name);
-               }
-               else
-                 return NULL;
-             }
-	   }
-	   if (nspace) {
-	     if (package && !jnidescriptor)
-	       proxyname = NewStringf("%s.%s.%s", package, nspace, symname);
-	     else
-	       proxyname = NewStringf("%s.%s", nspace, symname);
-	   } else {
-	     proxyname = Copy(symname);
-	   }
-	   if (!jnidescriptor) {
-	     Setattr(n, "proxyname", proxyname); // Cache it
-	     Delete(proxyname);
-	   }
-	   Delete(symname);
-	 }
-       }
-     }
-     return proxyname;
-   }
-
-  /* -----------------------------------------------------------------------------
-   * makeValidJniName()
-   * ----------------------------------------------------------------------------- */
-
-  String *makeValidJniName(const String *name) {
-    String *valid_jni_name = NewString(name);
-    Replaceall(valid_jni_name, "_", "_1");
-    return valid_jni_name;
-  }
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-
-    SWIG_library_directory("java");
-
-    // Look for certain command line options
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-package") == 0) {
-	  if (argv[i + 1]) {
-	    package = NewString("");
-	    Printf(package, argv[i + 1]);
-	    if (Len(package) == 0) {
-	      Delete(package);
-	      package = 0;
-	    }
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if ((strcmp(argv[i], "-shadow") == 0) || ((strcmp(argv[i], "-proxy") == 0))) {
-	  Printf(stderr, "Deprecated command line option: %s. Proxy classes are now generated by default.\n", argv[i]);
-	  Swig_mark_arg(i);
-	  proxy_flag = true;
-	} else if ((strcmp(argv[i], "-noproxy") == 0)) {
-	  Swig_mark_arg(i);
-	  proxy_flag = false;
-	} else if (strcmp(argv[i], "-nopgcpp") == 0) {
-	  Swig_mark_arg(i);
-	  nopgcpp_flag = true;
-	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
-	  Swig_mark_arg(i);
-	  old_variable_names = true;
-	} else if (strcmp(argv[i], "-jnic") == 0) {
-	  Swig_mark_arg(i);
-	  Printf(stderr, "Deprecated command line option: -jnic. C JNI calling convention now used when -c++ not specified.\n");
-	} else if (strcmp(argv[i], "-nofinalize") == 0) {
-	  Swig_mark_arg(i);
-	  Printf(stderr, "Deprecated command line option: -nofinalize. Use the new javafinalize typemap instead.\n");
-	} else if (strcmp(argv[i], "-jnicpp") == 0) {
-	  Swig_mark_arg(i);
-	  Printf(stderr, "Deprecated command line option: -jnicpp. C++ JNI calling convention now used when -c++ specified.\n");
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  Printf(stdout, "%s\n", usage);
-	}
-      }
-    }
-
-    // Add a symbol to the parser for conditional compilation
-    Preprocessor_define("SWIGJAVA 1", 0);
-
-    // Add typemap definitions
-    SWIG_typemap_lang("java");
-    SWIG_config_file("java.swg");
-
-    allow_overloading();
-    Swig_interface_feature_enable();
-  }
-
-  /* ---------------------------------------------------------------------
-   * top()
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-
-    // Get any options set in the module directive
-    Node *optionsnode = Getattr(Getattr(n, "module"), "options");
-
-    if (optionsnode) {
-      if (Getattr(optionsnode, "jniclassname"))
-	imclass_name = Copy(Getattr(optionsnode, "jniclassname"));
-      /* check if directors are enabled for this module.  note: this 
-       * is a "master" switch, without which no director code will be
-       * emitted.  %feature("director") statements are also required
-       * to enable directors for individual classes or methods.
-       *
-       * use %module(directors="1") modulename at the start of the 
-       * interface file to enable director generation.
-       */
-      if (Getattr(optionsnode, "directors")) {
-	allow_directors();
-      }
-      if (Getattr(optionsnode, "dirprot")) {
-	allow_dirprot();
-      }
-      allow_allprotected(GetFlag(optionsnode, "allprotected"));
-    }
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    if (!outfile) {
-      Printf(stderr, "Unable to determine outfile\n");
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    if (directorsEnabled()) {
-      if (!outfile_h) {
-        Printf(stderr, "Unable to determine outfile_h\n");
-        SWIG_exit(EXIT_FAILURE);
-      }
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    swig_types_hash = NewHash();
-    filenames_list = NewList();
-
-    // Make the intermediary class and module class names. The intermediary class name can be set in the module directive.
-    if (!imclass_name) {
-      imclass_name = NewStringf("%sJNI", Getattr(n, "name"));
-      module_class_name = Copy(Getattr(n, "name"));
-    } else {
-      // Rename the module name if it is the same as intermediary class name - a backwards compatibility solution
-      if (Cmp(imclass_name, Getattr(n, "name")) == 0)
-	module_class_name = NewStringf("%sModule", Getattr(n, "name"));
-      else
-	module_class_name = Copy(Getattr(n, "name"));
-    }
-    constants_interface_name = NewStringf("%sConstants", module_class_name);
-
-    // module class and intermediary classes are always created
-    if (!addSymbol(imclass_name, n))
-      return SWIG_ERROR;
-    if (!addSymbol(module_class_name, n))
-      return SWIG_ERROR;
-
-    imclass_class_code = NewString("");
-    proxy_class_def = NewString("");
-    proxy_class_code = NewString("");
-    module_class_constants_code = NewString("");
-    imclass_baseclass = NewString("");
-    imclass_package = NULL;
-    imclass_interfaces = NewString("");
-    imclass_class_modifiers = NewString("");
-    module_class_code = NewString("");
-    module_baseclass = NewString("");
-    module_interfaces = NewString("");
-    module_imports = NewString("");
-    module_class_modifiers = NewString("");
-    imclass_imports = NewString("");
-    imclass_cppcasts_code = NewString("");
-    imclass_directors = NewString("");
-    upcasts_code = NewString("");
-    dmethods_seq = NewList();
-    dmethods_table = NewHash();
-    n_dmethods = 0;
-    n_directors = 0;
-    jnipackage = NewString("");
-    package_path = NewString("");
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGJAVA\n#define SWIGJAVA\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-
-      /* Emit initial director header and director code: */
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name);
-
-      Printf(f_directors, "\n\n");
-      Printf(f_directors, "/* ---------------------------------------------------\n");
-      Printf(f_directors, " * C++ director class methods\n");
-      Printf(f_directors, " * --------------------------------------------------- */\n\n");
-      if (outfile_h) {
-	String *filename = Swig_file_filename(outfile_h);
-	Printf(f_directors, "#include \"%s\"\n\n", filename);
-	Delete(filename);
-      }
-    }
-
-    Printf(f_runtime, "\n");
-
-    String *wrapper_name = NewString("");
-
-    if (package) {
-      String *jniname = makeValidJniName(package);
-      Printv(jnipackage, jniname, NIL);
-      Delete(jniname);
-      Replaceall(jnipackage, ".", "_");
-      Append(jnipackage, "_");
-      Printv(package_path, package, NIL);
-      Replaceall(package_path, ".", "/");
-    }
-    String *jniname = makeValidJniName(imclass_name);
-    Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, jniname);
-    Delete(jniname);
-
-    Swig_name_register("wrapper", Char(wrapper_name));
-    if (old_variable_names) {
-      Swig_name_register("set", "set_%n%v");
-      Swig_name_register("get", "get_%n%v");
-    }
-
-    Delete(wrapper_name);
-
-    Printf(f_wrappers, "\n#ifdef __cplusplus\n");
-    Printf(f_wrappers, "extern \"C\" {\n");
-    Printf(f_wrappers, "#endif\n\n");
-
-    /* Emit code */
-    Language::top(n);
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (make it occur before %header section)
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-    // Generate the intermediary class
-    {
-      String *filen = NewStringf("%s%s.java", outputDirectory(imclass_package), imclass_name);
-      File *f_im = NewFile(filen, "w", SWIG_output_files());
-      if (!f_im) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the intermediary class file
-      emitBanner(f_im);
-
-      if (imclass_package && package)
-        Printf(f_im, "package %s.%s;", package, imclass_package);
-      else if (imclass_package)
-        Printf(f_im, "package %s;", imclass_package);
-      else if (package)
-        Printf(f_im, "package %s;\n", package);
-
-      if (imclass_imports)
-	Printf(f_im, "%s\n", imclass_imports);
-
-      if (Len(imclass_class_modifiers) > 0)
-	Printf(f_im, "%s ", imclass_class_modifiers);
-      Printf(f_im, "%s ", imclass_name);
-
-      if (imclass_baseclass && *Char(imclass_baseclass))
-	Printf(f_im, "extends %s ", imclass_baseclass);
-      if (Len(imclass_interfaces) > 0)
-	Printv(f_im, "implements ", imclass_interfaces, " ", NIL);
-      Printf(f_im, "{\n");
-
-      // Add the intermediary class methods
-      Replaceall(imclass_class_code, "$module", module_class_name);
-      Replaceall(imclass_class_code, "$imclassname", imclass_name);
-      Printv(f_im, imclass_class_code, NIL);
-      Printv(f_im, imclass_cppcasts_code, NIL);
-      if (Len(imclass_directors) > 0)
-	Printv(f_im, "\n", imclass_directors, NIL);
-
-      if (n_dmethods > 0) {
-	Putc('\n', f_im);
-	Printf(f_im, "  private final static native void swig_module_init();\n");
-	Printf(f_im, "  static {\n");
-	Printf(f_im, "    swig_module_init();\n");
-	Printf(f_im, "  }\n");
-      }
-      // Finish off the class
-      Printf(f_im, "}\n");
-      Delete(f_im);
-    }
-
-    // Generate the Java module class
-    {
-      String *filen = NewStringf("%s%s.java", SWIG_output_directory(), module_class_name);
-      File *f_module = NewFile(filen, "w", SWIG_output_files());
-      if (!f_module) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the module class file
-      emitBanner(f_module);
-
-      if (package)
-	Printf(f_module, "package %s;\n", package);
-
-      if (module_imports)
-	Printf(f_module, "%s\n", module_imports);
-
-      if (Len(module_class_modifiers) > 0)
-	Printf(f_module, "%s ", module_class_modifiers);
-      Printf(f_module, "%s ", module_class_name);
-
-      if (module_baseclass && *Char(module_baseclass))
-	Printf(f_module, "extends %s ", module_baseclass);
-      if (Len(module_interfaces) > 0) {
-	if (Len(module_class_constants_code) != 0)
-	  Printv(f_module, "implements ", constants_interface_name, ", ", module_interfaces, " ", NIL);
-	else
-	  Printv(f_module, "implements ", module_interfaces, " ", NIL);
-      } else {
-	if (Len(module_class_constants_code) != 0)
-	  Printv(f_module, "implements ", constants_interface_name, " ", NIL);
-      }
-      Printf(f_module, "{\n");
-
-      Replaceall(module_class_code, "$module", module_class_name);
-      Replaceall(module_class_constants_code, "$module", module_class_name);
-
-      Replaceall(module_class_code, "$imclassname", imclass_name);
-      Replaceall(module_class_constants_code, "$imclassname", imclass_name);
-
-      // Add the wrapper methods
-      Printv(f_module, module_class_code, NIL);
-
-      // Finish off the class
-      Printf(f_module, "}\n");
-      Delete(f_module);
-    }
-
-    // Generate the Java constants interface
-    if (Len(module_class_constants_code) != 0) {
-      String *filen = NewStringf("%s%s.java", SWIG_output_directory(), constants_interface_name);
-      File *f_module = NewFile(filen, "w", SWIG_output_files());
-      if (!f_module) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the Java constants interface file
-      emitBanner(f_module);
-
-      if (package)
-	Printf(f_module, "package %s;\n", package);
-
-      if (module_imports)
-	Printf(f_module, "%s\n", module_imports);
-
-      Printf(f_module, "public interface %s {\n", constants_interface_name);
-
-      // Write out all the global constants
-      Printv(f_module, module_class_constants_code, NIL);
-
-      // Finish off the Java interface
-      Printf(f_module, "}\n");
-      Delete(f_module);
-    }
-
-    if (upcasts_code)
-      Printv(f_wrappers, upcasts_code, NIL);
-
-    emitDirectorUpcalls();
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "}\n");
-    Printf(f_wrappers, "#endif\n");
-
-    // Output a Java type wrapper class for each SWIG type
-    for (Iterator swig_type = First(swig_types_hash); swig_type.key; swig_type = Next(swig_type)) {
-      emitTypeWrapperClass(swig_type.key, swig_type.item);
-    }
-
-    // Check for overwriting file problems on filesystems that are case insensitive
-    Iterator it1;
-    Iterator it2;
-    for (it1 = First(filenames_list); it1.item; it1 = Next(it1)) {
-      String *item1_lower = Swig_string_lower(it1.item);
-      for (it2 = Next(it1); it2.item; it2 = Next(it2)) {
-	String *item2_lower = Swig_string_lower(it2.item);
-	if (it1.item && it2.item) {
-	  if (Strcmp(item1_lower, item2_lower) == 0) {
-	    Swig_warning(WARN_LANG_PORTABILITY_FILENAME, input_file, line_number,
-			 "Portability warning: File %s will be overwritten by %s on case insensitive filesystems such as "
-			 "Windows' FAT32 and NTFS unless the class/module name is renamed\n", it1.item, it2.item);
-	  }
-	}
-	Delete(item2_lower);
-      }
-      Delete(item1_lower);
-    }
-
-    Delete(swig_types_hash);
-    swig_types_hash = NULL;
-    Delete(filenames_list);
-    filenames_list = NULL;
-    Delete(imclass_name);
-    imclass_name = NULL;
-    Delete(imclass_class_code);
-    imclass_class_code = NULL;
-    Delete(proxy_class_def);
-    proxy_class_def = NULL;
-    Delete(proxy_class_code);
-    proxy_class_code = NULL;
-    Delete(module_class_constants_code);
-    module_class_constants_code = NULL;
-    Delete(imclass_baseclass);
-    imclass_baseclass = NULL;
-    Delete(imclass_package);
-    imclass_package = NULL;
-    Delete(imclass_interfaces);
-    imclass_interfaces = NULL;
-    Delete(imclass_class_modifiers);
-    imclass_class_modifiers = NULL;
-    Delete(module_class_name);
-    module_class_name = NULL;
-    Delete(constants_interface_name);
-    constants_interface_name = NULL;
-    Delete(module_class_code);
-    module_class_code = NULL;
-    Delete(module_baseclass);
-    module_baseclass = NULL;
-    Delete(module_interfaces);
-    module_interfaces = NULL;
-    Delete(module_imports);
-    module_imports = NULL;
-    Delete(module_class_modifiers);
-    module_class_modifiers = NULL;
-    Delete(imclass_imports);
-    imclass_imports = NULL;
-    Delete(imclass_cppcasts_code);
-    imclass_cppcasts_code = NULL;
-    Delete(imclass_directors);
-    imclass_directors = NULL;
-    Delete(upcasts_code);
-    upcasts_code = NULL;
-    Delete(package);
-    package = NULL;
-    Delete(jnipackage);
-    jnipackage = NULL;
-    Delete(package_path);
-    package_path = NULL;
-    Delete(dmethods_seq);
-    dmethods_seq = NULL;
-    Delete(dmethods_table);
-    dmethods_table = NULL;
-    n_dmethods = 0;
-
-    /* Close all of the files */
-    Dump(f_header, f_runtime);
-
-    if (directorsEnabled()) {
-      Dump(f_directors, f_runtime);
-      Dump(f_directors_h, f_runtime_h);
-
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-
-      Delete(f_runtime_h);
-      f_runtime_h = NULL;
-      Delete(f_directors);
-      f_directors = NULL;
-      Delete(f_directors_h);
-      f_directors_h = NULL;
-    }
-
-    Dump(f_wrappers, f_runtime);
-    Wrapper_pretty_print(f_init, f_runtime);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Dump(f_runtime, f_begin);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitBanner()
-   * ----------------------------------------------------------------------------- */
-
-  void emitBanner(File *f) {
-    Printf(f, "/* ----------------------------------------------------------------------------\n");
-    Swig_banner_target_lang(f, " *");
-    Printf(f, " * ----------------------------------------------------------------------------- */\n\n");
-  }
-
-  /*-----------------------------------------------------------------------
-   * Add new director upcall signature
-   *----------------------------------------------------------------------*/
-
-  UpcallData *addUpcallMethod(String *imclass_method, String *class_method, String *imclass_desc, String *class_desc, String *decl) {
-    String *key = NewStringf("%s|%s", imclass_method, decl);
-
-    ++curr_class_dmethod;
-
-    String *imclass_methodidx = NewStringf("%d", n_dmethods);
-    String *class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod);
-    n_dmethods++;
-
-    Hash *new_udata = NewHash();
-    Append(dmethods_seq, new_udata);
-    Setattr(dmethods_table, key, new_udata);
-
-    Setattr(new_udata, "method", Copy(class_method));
-    Setattr(new_udata, "fdesc", Copy(class_desc));
-    Setattr(new_udata, "imclass_method", Copy(imclass_method));
-    Setattr(new_udata, "imclass_fdesc", Copy(imclass_desc));
-    Setattr(new_udata, "imclass_methodidx", imclass_methodidx);
-    Setattr(new_udata, "class_methodidx", class_methodidx);
-    Setattr(new_udata, "decl", Copy(decl));
-
-    Delete(key);
-    return new_udata;
-  }
-
-  /*-----------------------------------------------------------------------
-   * Get director upcall signature
-   *----------------------------------------------------------------------*/
-
-  UpcallData *getUpcallMethodData(String *director_class, String *decl) {
-    String *key = NewStringf("%s|%s", director_class, decl);
-    UpcallData *udata = Getattr(dmethods_table, key);
-
-    Delete(key);
-    return udata;
-  }
-
-  /* ----------------------------------------------------------------------
-   * nativeWrapper()
-   * ---------------------------------------------------------------------- */
-
-  virtual int nativeWrapper(Node *n) {
-    String *wrapname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(wrapname, n, imclass_name))
-      return SWIG_ERROR;
-
-    if (Getattr(n, "type")) {
-      Swig_save("nativeWrapper", n, "name", NIL);
-      Setattr(n, "name", wrapname);
-      native_function_flag = true;
-      functionWrapper(n);
-      Swig_restore(n);
-      native_function_flag = false;
-    } else {
-      Swig_error(input_file, line_number, "No return type for %%native method %s.\n", Getattr(n, "wrap:name"));
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * functionWrapper()
-   * ---------------------------------------------------------------------- */
-
-  virtual int functionWrapper(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *c_return_type = NewString("");
-    String *im_return_type = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *body = NewString("");
-    int num_arguments = 0;
-    int gencomma = 0;
-    bool is_void_return;
-    String *overloaded_name = getOverloadedName(n);
-    String *nondir_args = NewString("");
-    bool is_destructor = (Cmp(Getattr(n, "nodeType"), "destructor") == 0);
-
-    if (!Getattr(n, "sym:overloaded")) {
-      if (!addSymbol(symname, n, imclass_name))
-	return SWIG_ERROR;
-    }
-
-    /*
-       The rest of this function deals with generating the intermediary class wrapper function (that wraps
-       a c/c++ function) and generating the JNI c code. Each Java wrapper function has a 
-       matching JNI c function call.
-     */
-
-    // A new wrapper function object
-    Wrapper *f = NewWrapper();
-
-    // Make a wrapper name for this function
-    String *jniname = makeValidJniName(overloaded_name);
-    String *wname = Swig_name_wrapper(jniname);
-
-    Delete(jniname);
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("jni", l, f);
-    Swig_typemap_attach_parms("jtype", l, f);
-    Swig_typemap_attach_parms("jstype", l, f);
-
-    /* Get return types */
-    if ((tm = Swig_typemap_lookup("jni", n, "", 0))) {
-      Printf(c_return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if ((tm = Swig_typemap_lookup("jtype", n, "", 0))) {
-      Printf(im_return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JTYPE_UNDEF, input_file, line_number, "No jtype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    is_void_return = (Cmp(c_return_type, "void") == 0);
-    if (!is_void_return)
-      Wrapper_add_localv(f, "jresult", c_return_type, "jresult = 0", NIL);
-
-    Printv(f->def, "SWIGEXPORT ", c_return_type, " JNICALL ", wname, "(JNIEnv *jenv, jclass jcls", NIL);
-
-    // Usually these function parameters are unused - The code below ensures
-    // that compilers do not issue such a warning if configured to do so.
-
-    Printv(f->code, "    (void)jenv;\n", NIL);
-    Printv(f->code, "    (void)jcls;\n", NIL);
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-
-    // Parameter overloading
-    Setattr(n, "wrap:parms", l);
-    Setattr(n, "wrap:name", wname);
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in Java
-    if (Getattr(n, "sym:overloaded")) {
-      // Emit warnings for the few cases that can't be overloaded in Java and give up on generating wrapper
-      Swig_overload_check(n);
-      if (Getattr(n, "overload:ignore")) {
-	DelWrapper(f);
-	return SWIG_OK;
-      }
-    }
-
-    Printf(imclass_class_code, "  public final static native %s %s(", im_return_type, overloaded_name);
-
-    num_arguments = emit_num_arguments(l);
-
-    // Now walk the function parameter list and generate code to get arguments
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-      String *im_param_type = NewString("");
-      String *c_param_type = NewString("");
-      String *arg = NewString("");
-
-      Printf(arg, "j%s", ln);
-
-      /* Get the JNI C types of the parameter */
-      if ((tm = Getattr(p, "tmap:jni"))) {
-	Printv(c_param_type, tm, NIL);
-      } else {
-	Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Get the intermediary class parameter types of the parameter */
-      if ((tm = Getattr(p, "tmap:jtype"))) {
-	Printv(im_param_type, tm, NIL);
-      } else {
-	Swig_warning(WARN_JAVA_TYPEMAP_JTYPE_UNDEF, input_file, line_number, "No jtype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to intermediary class method */
-      if (gencomma)
-	Printf(imclass_class_code, ", ");
-      Printf(imclass_class_code, "%s %s", im_param_type, arg);
-
-      // Add parameter to C function
-      Printv(f->def, ", ", c_param_type, " ", arg, NIL);
-
-      ++gencomma;
-
-      // Premature garbage collection prevention parameter
-      if (!is_destructor) {
-	String *pgc_parameter = prematureGarbageCollectionPreventionParameter(pt, p);
-	if (pgc_parameter) {
-	  Printf(imclass_class_code, ", %s %s_", pgc_parameter, arg);
-	  Printf(f->def, ", jobject %s_", arg);
-	  Printf(f->code, "    (void)%s_;\n", arg);
-	}
-      }
-      // Get typemap for this argument
-      if ((tm = Getattr(p, "tmap:in"))) {
-	addThrows(n, "tmap:in", p);
-	Replaceall(tm, "$source", arg);	/* deprecated */
-	Replaceall(tm, "$target", ln);	/* deprecated */
-	Replaceall(tm, "$arg", arg);	/* deprecated? */
-	Replaceall(tm, "$input", arg);
-	Setattr(p, "emit:input", arg);
-
-	Printf(nondir_args, "%s\n", tm);
-
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	p = nextSibling(p);
-      }
-
-      Delete(im_param_type);
-      Delete(c_param_type);
-      Delete(arg);
-    }
-
-    Printv(f->code, nondir_args, NIL);
-    Delete(nondir_args);
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	addThrows(n, "tmap:check", p);
-	Replaceall(tm, "$target", Getattr(p, "lname"));	/* deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	addThrows(n, "tmap:freearg", p);
-	Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	addThrows(n, "tmap:argout", p);
-	Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* deprecated */
-	Replaceall(tm, "$target", Getattr(p, "lname"));	/* deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	Replaceall(tm, "$result", "jresult");
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Get any Java exception classes in the throws typemap
-    ParmList *throw_parm_list = NULL;
-    if ((throw_parm_list = Getattr(n, "catchlist"))) {
-      Swig_typemap_attach_parms("throws", throw_parm_list, f);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  addThrows(n, "tmap:throws", p);
-	}
-      }
-    }
-
-    // Now write code to make the function call
-    if (!native_function_flag) {
-
-      Swig_director_emit_dynamic_cast(n, f);
-      String *actioncode = emit_action(n);
-
-      // Handle exception classes specified in the "except" feature's "throws" attribute
-      addThrows(n, "feature:except", n);
-
-      /* Return value if necessary  */
-      if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-	addThrows(n, "tmap:out", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Replaceall(tm, "$target", "jresult");	/* deprecated */
-	Replaceall(tm, "$result", "jresult");
-
-        if (GetFlag(n, "feature:new"))
-          Replaceall(tm, "$owner", "1");
-        else
-          Replaceall(tm, "$owner", "0");
-
-	Printf(f->code, "%s", tm);
-	if (Len(tm))
-	  Printf(f->code, "\n");
-      } else {
-	Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(t, 0), Getattr(n, "name"));
-      }
-      emit_return_variable(n, t, f);
-    }
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	addThrows(n, "tmap:newfree", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if (!native_function_flag) {
-      if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-	addThrows(n, "tmap:ret", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* Finish C function and intermediary class function definitions */
-    Printf(imclass_class_code, ")");
-    generateThrowsClause(n, imclass_class_code);
-    Printf(imclass_class_code, ";\n");
-
-    Printf(f->def, ") {");
-
-    if (!is_void_return)
-      Printv(f->code, "    return jresult;\n", NIL);
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", symname);
-
-    /* Contract macro modification */
-    Replaceall(f->code, "SWIG_contract_assert(", "SWIG_contract_assert($null, ");
-
-    if (!is_void_return)
-      Replaceall(f->code, "$null", "0");
-    else
-      Replaceall(f->code, "$null", "");
-
-    /* Dump the function out */
-    if (!native_function_flag)
-      Wrapper_print(f, f_wrappers);
-
-    if (!(proxy_flag && is_wrapping_class()) && !enum_constant_flag) {
-      moduleClassFunctionHandler(n);
-    }
-
-    /* 
-     * Generate the proxy class getters/setters for public member variables.
-     * Not for enums and constants.
-     */
-    if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
-      // Capitalize the first letter in the variable to create a JavaBean type getter/setter function name
-      bool getter_flag = Cmp(symname, Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) != 0;
-
-      String *getter_setter_name = NewString("");
-      if (!getter_flag)
-	Printf(getter_setter_name, "set");
-      else
-	Printf(getter_setter_name, "get");
-      Putc(toupper((int) *Char(variable_name)), getter_setter_name);
-      Printf(getter_setter_name, "%s", Char(variable_name) + 1);
-
-      Setattr(n, "proxyfuncname", getter_setter_name);
-      Setattr(n, "imfuncname", symname);
-
-      proxyClassFunctionHandler(n);
-      Delete(getter_setter_name);
-    }
-
-    Delete(c_return_type);
-    Delete(im_return_type);
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(body);
-    Delete(overloaded_name);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * variableWrapper()
-   * ----------------------------------------------------------------------- */
-
-  virtual int variableWrapper(Node *n) {
-    variable_wrapper_flag = true;
-    Language::variableWrapper(n);	/* Default to functions */
-    variable_wrapper_flag = false;
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * globalvariableHandler()
-   * ------------------------------------------------------------------------ */
-
-  virtual int globalvariableHandler(Node *n) {
-
-    variable_name = Getattr(n, "sym:name");
-    global_variable_flag = true;
-    int ret = Language::globalvariableHandler(n);
-    global_variable_flag = false;
-    return ret;
-  }
-
-  String *getCurrentScopeName(String *nspace) {
-    String *scope = 0;
-    if (nspace || getCurrentClass()) {
-      scope = NewString("");
-      if (nspace)
-	Printf(scope, "%s", nspace);
-      if (Node* cls = getCurrentClass()) {
-	if (Node *outer = Getattr(cls, "nested:outer")) {
-	  String *outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
-	  for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
-	    Push(outerClassesPrefix, ".");
-	    Push(outerClassesPrefix, Getattr(outer, "sym:name"));
-	  }
-	  Printv(scope, nspace ? "." : "", outerClassesPrefix, ".", proxy_class_name, NIL);
-	  Delete(outerClassesPrefix);
-	} else
-	  Printv(scope, nspace ? "." : "", proxy_class_name, NIL);
-      }
-    }
-    return scope;
-  }
-
-  /* ----------------------------------------------------------------------
-   * enumDeclaration()
-   *
-   * C/C++ enums can be mapped in one of 4 ways, depending on the java:enum feature specified:
-   * 1) Simple enums - simple constant within the proxy class or module class
-   * 2) Typeunsafe enums - simple constant in a Java class (class named after the c++ enum name)
-   * 3) Typesafe enum - typesafe enum pattern (class named after the c++ enum name)
-   * 4) Proper enums - proper Java enum
-   * Anonymous enums always default to 1)
-   * ---------------------------------------------------------------------- */
-
-  virtual int enumDeclaration(Node *n) {
-
-    if (!ImportMode) {
-      if (getCurrentClass() && (cplus_mode != PUBLIC))
-	return SWIG_NOWRAP;
-
-      String *nspace = Getattr(n, "sym:nspace"); // NSpace/getNSpace() only works during Language::enumDeclaration call
-      if (proxy_flag && !is_wrapping_class()) {
-	// Global enums / enums in a namespace
-	assert(!full_imclass_name);
-	constructIntermediateClassName(n);
-      }
-
-      enum_code = NewString("");
-      String *symname = Getattr(n, "sym:name");
-      String *constants_code = (proxy_flag && is_wrapping_class())? proxy_class_constants_code : module_class_constants_code;
-      EnumFeature enum_feature = decodeEnumFeature(n);
-      String *typemap_lookup_type = Getattr(n, "name");
-
-      if ((enum_feature != SimpleEnum) && symname && typemap_lookup_type) {
-	// Wrap (non-anonymous) C/C++ enum within a typesafe, typeunsafe or proper Java enum
-
-	String *scope = getCurrentScopeName(nspace);
-	if (!addSymbol(symname, n, scope))
-	  return SWIG_ERROR;
-
-	// Pure Java baseclass and interfaces
-	const String *pure_baseclass = typemapLookup(n, "javabase", typemap_lookup_type, WARN_NONE);
-	const String *pure_interfaces = typemapLookup(n, "javainterfaces", typemap_lookup_type, WARN_NONE);
-
-	// Emit the enum
-	Printv(enum_code, typemapLookup(n, "javaclassmodifiers", typemap_lookup_type, WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers (enum modifiers really)
-	       " ", symname, *Char(pure_baseclass) ?	// Bases
-	       " extends " : "", pure_baseclass, *Char(pure_interfaces) ?	// Interfaces
-	       " implements " : "", pure_interfaces, " {\n", NIL);
-	if (proxy_flag && is_wrapping_class())
-	  Replaceall(enum_code, "$static ", "static ");
-	else
-	  Replaceall(enum_code, "$static ", "");
-	Delete(scope);
-      } else {
-	// Wrap C++ enum with integers - just indicate start of enum with a comment, no comment for anonymous enums of any sort
-	if (symname && !Getattr(n, "unnamedinstance"))
-	  Printf(constants_code, "  // %s \n", symname);
-      }
-
-      // Emit each enum item
-      Language::enumDeclaration(n);
-
-      if ((enum_feature != SimpleEnum) && symname && typemap_lookup_type) {
-	// Wrap (non-anonymous) C/C++ enum within a typesafe, typeunsafe or proper Java enum
-	// Finish the enum declaration
-	// Typemaps are used to generate the enum definition in a similar manner to proxy classes.
-	Printv(enum_code, (enum_feature == ProperEnum) ? ";\n" : "", typemapLookup(n, "javabody", typemap_lookup_type, WARN_JAVA_TYPEMAP_JAVABODY_UNDEF),	// main body of class
-	       typemapLookup(n, "javacode", typemap_lookup_type, WARN_NONE),	// extra Java code
-	       "}", NIL);
-
-	Replaceall(enum_code, "$javaclassname", symname);
-
-	// Substitute $enumvalues - intended usage is for typesafe enums
-	if (Getattr(n, "enumvalues"))
-	  Replaceall(enum_code, "$enumvalues", Getattr(n, "enumvalues"));
-	else
-	  Replaceall(enum_code, "$enumvalues", "");
-
-	if (proxy_flag && is_wrapping_class()) {
-	  // Enums defined within the C++ class are defined within the proxy class
-
-	  // Add extra indentation
-	  Replaceall(enum_code, "\n", "\n  ");
-	  Replaceall(enum_code, "  \n", "\n");
-	  if (GetFlag(getCurrentClass(), "feature:interface"))
-	    Printv(interface_class_code, "  ", enum_code, "\n\n", NIL);
-	  else
-	    Printv(proxy_class_constants_code, "  ", enum_code, "\n\n", NIL);
-	} else {
-	  // Global enums are defined in their own file
-	  String *output_directory = outputDirectory(nspace);
-	  String *filen = NewStringf("%s%s.java", output_directory, symname);
-	  File *f_enum = NewFile(filen, "w", SWIG_output_files());
-	  if (!f_enum) {
-	    FileErrorDisplay(filen);
-	    SWIG_exit(EXIT_FAILURE);
-	  }
-	  Append(filenames_list, Copy(filen));
-	  Delete(filen);
-	  filen = NULL;
-
-	  // Start writing out the enum file
-	  emitBanner(f_enum);
-
-	  if (package || nspace) {
-	    Printf(f_enum, "package ");
-	    if (package)
-	      Printv(f_enum, package, nspace ? "." : "", NIL);
-	    if (nspace)
-	      Printv(f_enum, nspace, NIL);
-	    Printf(f_enum, ";\n");
-	  }
-
-	  Printv(f_enum, typemapLookup(n, "javaimports", typemap_lookup_type, WARN_NONE), // Import statements
-		 "\n", enum_code, "\n", NIL);
-
-	  Printf(f_enum, "\n");
-	  Delete(f_enum);
-	  Delete(output_directory);
-	}
-      } else {
-	// Wrap C++ enum with simple constant
-	Printf(enum_code, "\n");
-	if (proxy_flag && is_wrapping_class())
-	  Printv(proxy_class_constants_code, enum_code, NIL);
-	else
-	  Printv(module_class_constants_code, enum_code, NIL);
-      }
-
-      Delete(enum_code);
-      enum_code = NULL;
-
-      if (proxy_flag && !is_wrapping_class()) {
-	Delete(full_imclass_name);
-	full_imclass_name = 0;
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * enumvalueDeclaration()
-   * ---------------------------------------------------------------------- */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    Swig_require("enumvalueDeclaration", n, "*name", "?value", NIL);
-    String *symname = Getattr(n, "sym:name");
-    String *value = Getattr(n, "value");
-    String *name = Getattr(n, "name");
-    Node *parent = parentNode(n);
-    int unnamedinstance = GetFlag(parent, "unnamedinstance");
-    String *parent_name = Getattr(parent, "name");
-    String *nspace = getNSpace();
-    String *newsymname = 0;
-    String *tmpValue;
-
-    // Strange hack from parent method
-    if (value)
-      tmpValue = NewString(value);
-    else
-      tmpValue = NewString(name);
-    // Note that this is used in enumValue() amongst other places
-    Setattr(n, "value", tmpValue);
-
-    // Deal with enum values that are not int
-    int swigtype = SwigType_type(Getattr(n, "type"));
-    if (swigtype == T_BOOL) {
-      const char *val = Equal(Getattr(n, "enumvalue"), "true") ? "1" : "0";
-      Setattr(n, "enumvalue", val);
-    } else if (swigtype == T_CHAR) {
-      String *val = NewStringf("'%(escape)s'", Getattr(n, "enumvalue"));
-      Setattr(n, "enumvalue", val);
-      Delete(val);
-    }
-
-    {
-      EnumFeature enum_feature = decodeEnumFeature(parent);
-
-      if ((enum_feature == SimpleEnum) && GetFlag(parent, "scopedenum")) {
-	newsymname = Swig_name_member(0, Getattr(parent, "sym:name"), symname);
-	symname = newsymname;
-      }
-
-      // Add to language symbol table
-      String *scope = 0;
-      if (unnamedinstance || !parent_name || enum_feature == SimpleEnum) {
-	String *enumClassPrefix = getEnumClassPrefix();
-	if (enumClassPrefix) {
-	  scope = NewString("");
-	  if (nspace)
-	    Printf(scope, "%s.", nspace);
-	  Printf(scope, "%s", enumClassPrefix);
-	} else {
-	  scope = Copy(constants_interface_name);
-	}
-      } else {
-	scope = getCurrentScopeName(nspace);
-	if (!scope)
-	  scope = Copy(Getattr(parent, "sym:name"));
-	else
-	  Printf(scope, ".%s", Getattr(parent, "sym:name"));
-      }
-      if (!addSymbol(symname, n, scope))
-	return SWIG_ERROR;
-
-      if ((enum_feature == ProperEnum) && parent_name && !unnamedinstance) {
-	// Wrap (non-anonymous) C/C++ enum with a proper Java enum
-	// Emit the enum item.
-	if (!GetFlag(n, "firstenumitem"))
-	  Printf(enum_code, ",\n");
-	Printf(enum_code, "  %s", symname);
-	if (Getattr(n, "enumvalue")) {
-	  String *value = enumValue(n);
-	  Printf(enum_code, "(%s)", value);
-	  Delete(value);
-	}
-      } else {
-	// Wrap C/C++ enums with constant integers or use the typesafe enum pattern
-	SwigType *typemap_lookup_type = parent_name ? parent_name : NewString("enum ");
-	Setattr(n, "type", typemap_lookup_type);
-	const String *tm = typemapLookup(n, "jstype", typemap_lookup_type, WARN_JAVA_TYPEMAP_JSTYPE_UNDEF);
-
-	String *return_type = Copy(tm);
-	substituteClassname(typemap_lookup_type, return_type);
-        const String *methodmods = Getattr(n, "feature:java:methodmodifiers");
-        methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-	if ((enum_feature == TypesafeEnum) && parent_name && !unnamedinstance) {
-	  // Wrap (non-anonymous) enum using the typesafe enum pattern
-	  if (Getattr(n, "enumvalue")) {
-	    String *value = enumValue(n);
-	    Printf(enum_code, "  %s final static %s %s = new %s(\"%s\", %s);\n", methodmods, return_type, symname, return_type, symname, value);
-	    Delete(value);
-	  } else {
-	    Printf(enum_code, "  %s final static %s %s = new %s(\"%s\");\n", methodmods, return_type, symname, return_type, symname);
-	  }
-	} else {
-	  // Simple integer constants
-	  // Note these are always generated for anonymous enums, no matter what enum_feature is specified
-	  // Code generated is the same for SimpleEnum and TypeunsafeEnum -> the class it is generated into is determined later
-	  String *value = enumValue(n);
-	  Printf(enum_code, "  %s final static %s %s = %s;\n", methodmods, return_type, symname, value);
-	  Delete(value);
-	}
-	Delete(return_type);
-      }
-
-      // Add the enum value to the comma separated list being constructed in the enum declaration.
-      String *enumvalues = Getattr(parent, "enumvalues");
-      if (!enumvalues)
-	Setattr(parent, "enumvalues", Copy(symname));
-      else
-	Printv(enumvalues, ", ", symname, NIL);
-      Delete(scope);
-    }
-
-    Delete(newsymname);
-    Delete(tmpValue);
-    Swig_restore(n);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * constantWrapper()
-   * Used for wrapping constants - #define or %constant.
-   * Also for inline initialised const static primitive type member variables (short, int, double, enums etc).
-   * Java static final variables are generated for these.
-   * If the %javaconst(1) feature is used then the C constant value is used to initialise the Java final variable.
-   * If not, a JNI method is generated to get the C constant value for initialisation of the Java final variable.
-   * However, if the %javaconstvalue feature is used, it overrides all other ways to generate the initialisation.
-   * Also note that this method might be called for wrapping enum items (when the enum is using %javaconst(0)).
-   * ------------------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    SwigType *valuetype = Getattr(n, "valuetype");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    String *return_type = NewString("");
-    String *constants_code = NewString("");
-    Swig_save("constantWrapper", n, "value", NIL);
-
-    bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0);
-
-    const String *itemname = (proxy_flag && wrapping_member_flag) ? variable_name : symname;
-    if (!is_enum_item) {
-      String *scope = 0;
-      if (proxy_class_name) {
-	String *nspace = getNSpace();
-	scope = NewString("");
-	if (nspace)
-	  Printf(scope, "%s.", nspace);
-	Printf(scope, "%s", proxy_class_name);
-      } else {
-	scope = Copy(constants_interface_name);
-      }
-      if (!addSymbol(itemname, n, scope))
-	return SWIG_ERROR;
-      Delete(scope);
-    }
-
-    // The %javaconst feature determines how the constant value is obtained
-    int const_feature_flag = GetFlag(n, "feature:java:const");
-
-    /* Adjust the enum type for the Swig_typemap_lookup.
-     * We want the same jstype typemap for all the enum items so we use the enum type (parent node). */
-    if (is_enum_item) {
-      t = Getattr(parentNode(n), "enumtype");
-      Setattr(n, "type", t);
-    }
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("jstype", l, NULL);
-
-    /* Get Java return types */
-    bool classname_substituted_flag = false;
-
-    if ((tm = Swig_typemap_lookup("jstype", n, "", 0))) {
-      classname_substituted_flag = substituteClassname(t, tm);
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    // Add the stripped quotes back in
-    String *new_value = NewString("");
-    if (SwigType_type(t) == T_STRING) {
-      Printf(new_value, "\"%s\"", Copy(Getattr(n, "value")));
-      Setattr(n, "value", new_value);
-    } else if (SwigType_type(t) == T_CHAR) {
-      Printf(new_value, "\'%s\'", Copy(Getattr(n, "value")));
-      Setattr(n, "value", new_value);
-    }
-
-    const String *methodmods = Getattr(n, "feature:java:methodmodifiers");
-    methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-    Printf(constants_code, "  %s final static %s %s = ", methodmods, return_type, itemname);
-
-    // Check for the %javaconstvalue feature
-    String *value = Getattr(n, "feature:java:constvalue");
-
-    if (value) {
-      Printf(constants_code, "%s;\n", value);
-    } else if (!const_feature_flag) {
-      // Default enum and constant handling will work with any type of C constant and initialises the Java variable from C through a JNI call.
-
-      if (classname_substituted_flag) {
-	if (SwigType_isenum(t)) {
-	  // This handles wrapping of inline initialised const enum static member variables (not when wrapping enum items - ignored later on)
-	  Printf(constants_code, "%s.swigToEnum(%s.%s());\n", return_type, full_imclass_name, Swig_name_get(getNSpace(), symname));
-	} else {
-	  // This handles function pointers using the %constant directive
-	  Printf(constants_code, "new %s(%s.%s(), false);\n", return_type, full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), symname));
-	}
-      } else {
-	Printf(constants_code, "%s.%s();\n", full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), symname));
-      }
-
-      // Each constant and enum value is wrapped with a separate JNI function call
-      SetFlag(n, "feature:immutable");
-      enum_constant_flag = true;
-      variableWrapper(n);
-      enum_constant_flag = false;
-    } else {
-      // Alternative constant handling will use the C syntax to make a true Java constant and hope that it compiles as Java code
-      if (Getattr(n, "wrappedasconstant")) {
-	if (SwigType_type(valuetype) == T_CHAR)
-          Printf(constants_code, "\'%(escape)s\';\n", Getattr(n, "staticmembervariableHandler:value"));
-	else
-          Printf(constants_code, "%s;\n", Getattr(n, "staticmembervariableHandler:value"));
-      } else {
-        Printf(constants_code, "%s;\n", Getattr(n, "value"));
-      }
-    }
-
-    // Emit the generated code to appropriate place
-    // Enums only emit the intermediate and JNI methods, so no proxy or module class wrapper methods needed
-    if (!is_enum_item) {
-      if (proxy_flag && wrapping_member_flag)
-	Printv(proxy_class_constants_code, constants_code, NIL);
-      else
-	Printv(module_class_constants_code, constants_code, NIL);
-    }
-    // Cleanup
-    Swig_restore(n);
-    Delete(new_value);
-    Delete(return_type);
-    Delete(constants_code);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * insertDirective()
-   * ----------------------------------------------------------------------------- */
-
-  virtual int insertDirective(Node *n) {
-    int ret = SWIG_OK;
-    String *code = Getattr(n, "code");
-    String *section = Getattr(n, "section");
-    Replaceall(code, "$module", module_class_name);
-    Replaceall(code, "$imclassname", imclass_name);
-
-    if (!ImportMode && (Cmp(section, "proxycode") == 0)) {
-      if (proxy_class_code) {
-	Swig_typemap_replace_embedded_typemap(code, n);
-	int offset = Len(code) > 0 && *Char(code) == '\n' ? 1 : 0;
-	Printv(proxy_class_code, Char(code) + offset, "\n", NIL);
-      }
-    } else {
-      ret = Language::insertDirective(n);
-    }
-    return ret;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * pragmaDirective()
-   *
-   * Valid Pragmas:
-   * jniclassbase            - base (extends) for the intermediary class
-   * jniclasspackage         - package in which to generate the intermediary class
-   * jniclassclassmodifiers  - class modifiers for the intermediary class
-   * jniclasscode            - text (java code) is copied verbatim to the intermediary class
-   * jniclassimports         - import statements for the intermediary class
-   * jniclassinterfaces      - interface (implements) for the intermediary class
-   *
-   * modulebase              - base (extends) for the module class
-   * moduleclassmodifiers    - class modifiers for the module class
-   * modulecode              - text (java code) is copied verbatim to the module class
-   * moduleimports           - import statements for the module class
-   * moduleinterfaces        - interface (implements) for the module class
-   *
-   * ----------------------------------------------------------------------------- */
-
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *code = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-      if (Strcmp(lang, "java") == 0) {
-
-	String *strvalue = NewString(value);
-	Replaceall(strvalue, "\\\"", "\"");
-
-	if (Strcmp(code, "jniclassbase") == 0) {
-	  Delete(imclass_baseclass);
-	  imclass_baseclass = Copy(strvalue);
-	} else if (Strcmp(code, "jniclasspackage") == 0) {
-	  Delete(imclass_package);
-	  imclass_package = Copy(strvalue);
-	  String *imclass_class_package_jniname = makeValidJniName(imclass_package);
-	  Printv(jnipackage, imclass_class_package_jniname, NIL);
-	  Delete(imclass_class_package_jniname);
-	  Replaceall(jnipackage, NSPACE_SEPARATOR, "_");
-	  Append(jnipackage, "_");
-
-	  String *wrapper_name = NewString("");
-	  String *imclass_class_jniname = makeValidJniName(imclass_name);
-	  Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, imclass_class_jniname);
-	  Delete(imclass_class_jniname);
-
-	  Swig_name_unregister("wrapper");
-	  Swig_name_register("wrapper", Char(wrapper_name));
-
-	  Delete(wrapper_name);
-	} else if (Strcmp(code, "jniclassclassmodifiers") == 0) {
-	  Delete(imclass_class_modifiers);
-	  imclass_class_modifiers = Copy(strvalue);
-	} else if (Strcmp(code, "jniclasscode") == 0) {
-	  Printf(imclass_class_code, "%s\n", strvalue);
-	} else if (Strcmp(code, "jniclassimports") == 0) {
-	  Delete(imclass_imports);
-	  imclass_imports = Copy(strvalue);
-	} else if (Strcmp(code, "jniclassinterfaces") == 0) {
-	  Delete(imclass_interfaces);
-	  imclass_interfaces = Copy(strvalue);
-	} else if (Strcmp(code, "modulebase") == 0) {
-	  Delete(module_baseclass);
-	  module_baseclass = Copy(strvalue);
-	} else if (Strcmp(code, "moduleclassmodifiers") == 0) {
-	  Delete(module_class_modifiers);
-	  module_class_modifiers = Copy(strvalue);
-	} else if (Strcmp(code, "modulecode") == 0) {
-	  Printf(module_class_code, "%s\n", strvalue);
-	} else if (Strcmp(code, "moduleimports") == 0) {
-	  Delete(module_imports);
-	  module_imports = Copy(strvalue);
-	} else if (Strcmp(code, "moduleinterfaces") == 0) {
-	  Delete(module_interfaces);
-	  module_interfaces = Copy(strvalue);
-	} else if (Strcmp(code, "moduleimport") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use the moduleimports pragma.\n");
-	} else if (Strcmp(code, "moduleinterface") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use the moduleinterfaces pragma.\n");
-	} else if (Strcmp(code, "modulemethodmodifiers") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use %%javamethodmodifiers.\n");
-	} else if (Strcmp(code, "allshadowimport") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javaimports).\n");
-	} else if (Strcmp(code, "allshadowcode") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javacode).\n");
-	} else if (Strcmp(code, "allshadowbase") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javabase).\n");
-	} else if (Strcmp(code, "allshadowinterface") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javainterfaces).\n");
-	} else if (Strcmp(code, "allshadowclassmodifiers") == 0) {
-	  Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javaclassmodifiers).\n");
-	} else if (proxy_flag) {
-	  if (Strcmp(code, "shadowcode") == 0) {
-	    Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javacode).\n");
-	  } else if (Strcmp(code, "shadowimport") == 0) {
-	    Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javaimports).\n");
-	  } else if (Strcmp(code, "shadowbase") == 0) {
-	    Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javabase).\n");
-	  } else if (Strcmp(code, "shadowinterface") == 0) {
-	    Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javainterfaces).\n");
-	  } else if (Strcmp(code, "shadowclassmodifiers") == 0) {
-	    Swig_error(input_file, line_number, "Deprecated pragma. Please use %%typemap(javaclassmodifiers).\n");
-	  } else {
-	    Swig_error(input_file, line_number, "Unrecognized pragma.\n");
-	  }
-	} else {
-	  Swig_error(input_file, line_number, "Unrecognized pragma.\n");
-	}
-	Delete(strvalue);
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getQualifiedInterfaceName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getQualifiedInterfaceName(Node *n) {
-    String *ret = Getattr(n, "interface:qname");
-    if (!ret) {
-      String *nspace = Getattr(n, "sym:nspace");
-      String *symname = Getattr(n, "interface:name");
-      if (nspace) {
-	if (package)
-	  ret = NewStringf("%s.%s.%s", package, nspace, symname);
-	else
-	  ret = NewStringf("%s.%s", nspace, symname);
-      } else {
-	ret = Copy(symname);
-      }
-      Setattr(n, "interface:qname", ret);
-    }
-    return ret;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getInterfaceName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getInterfaceName(SwigType *t, bool qualified) {
-    String *interface_name = NULL;
-    if (proxy_flag) {
-      Node *n = classLookup(t);
-      if (n && Getattr(n, "interface:name"))
-	interface_name = qualified ? getQualifiedInterfaceName(n) : Getattr(n, "interface:name");
-    }
-    return interface_name;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addInterfaceNameAndUpcasts()
-   * ----------------------------------------------------------------------------- */
-
-  void addInterfaceNameAndUpcasts(SwigType *smart, String *interface_list, String *interface_upcasts, Hash *base_list, String *c_classname) {
-    List *keys = Keys(base_list);
-    for (Iterator it = First(keys); it.item; it = Next(it)) {
-      Node *base = Getattr(base_list, it.item);
-      String *c_baseclass = SwigType_namestr(Getattr(base, "name"));
-      String *interface_name = Getattr(base, "interface:name");
-      if (Len(interface_list))
-	Append(interface_list, ", ");
-      Append(interface_list, interface_name);
-
-      Node *attributes = NewHash();
-      String *interface_code = Copy(typemapLookup(base, "javainterfacecode", Getattr(base, "classtypeobj"), WARN_JAVA_TYPEMAP_INTERFACECODE_UNDEF, attributes));
-      String *cptr_method_name = 0;
-      if (interface_code) {
-        Replaceall(interface_code, "$interfacename", interface_name);
-	Printv(interface_upcasts, interface_code, NIL);
-	cptr_method_name = Copy(Getattr(attributes, "tmap:javainterfacecode:cptrmethod"));
-      }
-      if (!cptr_method_name)
-	cptr_method_name = NewStringf("%s_GetInterfaceCPtr", interface_name);
-      Replaceall(cptr_method_name, ".", "_");
-      Replaceall(cptr_method_name, "$interfacename", interface_name);
-
-      String *upcast_method_name = Swig_name_member(getNSpace(), proxy_class_name, cptr_method_name);
-      upcastsCode(smart, upcast_method_name, c_classname, c_baseclass);
-      Delete(upcast_method_name);
-      Delete(cptr_method_name);
-      Delete(interface_code);
-      Delete(c_baseclass);
-    }
-    Delete(keys);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * upcastsCode()
-   *
-   * Add code for C++ casting to base class
-   * ----------------------------------------------------------------------------- */
-
-  void upcastsCode(SwigType *smart, String *upcast_method_name, String *c_classname, String *c_baseclass) {
-    String *jniname = makeValidJniName(upcast_method_name);
-    String *wname = Swig_name_wrapper(jniname);
-    Printf(imclass_cppcasts_code, "  public final static native long %s(long jarg1);\n", upcast_method_name);
-    if (smart) {
-      SwigType *bsmart = Copy(smart);
-      SwigType *rclassname = SwigType_typedef_resolve_all(c_classname);
-      SwigType *rbaseclass = SwigType_typedef_resolve_all(c_baseclass);
-      Replaceall(bsmart, rclassname, rbaseclass);
-      Delete(rclassname);
-      Delete(rbaseclass);
-      String *smartnamestr = SwigType_namestr(smart);
-      String *bsmartnamestr = SwigType_namestr(bsmart);
-      Printv(upcasts_code,
-	  "SWIGEXPORT jlong JNICALL ", wname, "(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n",
-	  "    jlong baseptr = 0;\n"
-	  "    ", smartnamestr, " *argp1;\n"
-	  "    (void)jenv;\n"
-	  "    (void)jcls;\n"
-	  "    argp1 = *(", smartnamestr, " **)&jarg1;\n"
-	  "    *(", bsmartnamestr, " **)&baseptr = argp1 ? new ", bsmartnamestr, "(*argp1) : 0;\n"
-	  "    return baseptr;\n"
-	  "}\n", "\n", NIL);
-      Delete(bsmartnamestr);
-      Delete(smartnamestr);
-      Delete(bsmart);
-    } else {
-      Printv(upcasts_code,
-	  "SWIGEXPORT jlong JNICALL ", wname, "(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n",
-	  "    jlong baseptr = 0;\n"
-	  "    (void)jenv;\n"
-	  "    (void)jcls;\n"
-	  "    *(", c_baseclass, " **)&baseptr = *(", c_classname, " **)&jarg1;\n"
-	  "    return baseptr;\n"
-	  "}\n", "\n", NIL);
-    }
-    Delete(wname);
-    Delete(jniname);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitProxyClassDefAndCPPCasts()
-   * ----------------------------------------------------------------------------- */
-
-  void emitProxyClassDefAndCPPCasts(Node *n) {
-    String *c_classname = SwigType_namestr(Getattr(n, "name"));
-    String *c_baseclass = NULL;
-    String *baseclass = NULL;
-    String *c_baseclassname = NULL;
-    String *interface_list = NewStringEmpty();
-    String *interface_upcasts = NewStringEmpty();
-    SwigType *typemap_lookup_type = Getattr(n, "classtypeobj");
-    bool feature_director = Swig_directorclass(n) ? true : false;
-    bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested");
-    SwigType *smart = Swig_cparse_smartptr(n);
-
-    // Inheritance from pure Java classes
-    Node *attributes = NewHash();
-    const String *pure_baseclass = typemapLookup(n, "javabase", typemap_lookup_type, WARN_NONE, attributes);
-    bool purebase_replace = GetFlag(attributes, "tmap:javabase:replace") ? true : false;
-    bool purebase_notderived = GetFlag(attributes, "tmap:javabase:notderived") ? true : false;
-    Delete(attributes);
-
-    // C++ inheritance
-    if (!purebase_replace) {
-      List *baselist = Getattr(n, "bases");
-      if (baselist) {
-	Iterator base = First(baselist);
-	while (base.item) {
-	  if (!(GetFlag(base.item, "feature:ignore") || Getattr(base.item, "feature:interface"))) {
-	    String *baseclassname = Getattr(base.item, "name");
-	    if (!c_baseclassname) {
-	      c_baseclassname = baseclassname;
-	      baseclass = Copy(getProxyName(baseclassname));
-	      if (baseclass)
-		c_baseclass = SwigType_namestr(baseclassname);
-	    } else {
-	      /* Warn about multiple inheritance for additional base class(es) */
-	      String *proxyclassname = Getattr(n, "classtypeobj");
-	      Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		  "Warning for %s, base %s ignored. Multiple inheritance is not supported in Java.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
-	    }
-	  }
-	  base = Next(base);
-	}
-      }
-    }
-
-    Hash *interface_bases = Getattr(n, "interface:bases");
-    if (interface_bases)
-      addInterfaceNameAndUpcasts(smart, interface_list, interface_upcasts, interface_bases, c_classname);
-
-    bool derived = baseclass && getProxyName(c_baseclassname);
-    if (derived && purebase_notderived)
-      pure_baseclass = empty_string;
-    const String *wanted_base = baseclass ? baseclass : pure_baseclass;
-
-    if (purebase_replace) {
-      wanted_base = pure_baseclass;
-      derived = false;
-      Delete(baseclass);
-      baseclass = NULL;
-      if (purebase_notderived)
-        Swig_error(Getfile(n), Getline(n), "The javabase typemap for proxy %s must contain just one of the 'replace' or 'notderived' attributes.\n", typemap_lookup_type);
-    } else if (Len(pure_baseclass) > 0 && Len(baseclass) > 0) {
-      Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		   "Warning for %s, base %s ignored. Multiple inheritance is not supported in Java. "
-		   "Perhaps you need one of the 'replace' or 'notderived' attributes in the javabase typemap?\n", typemap_lookup_type, pure_baseclass);
-    }
-
-    // Pure Java interfaces
-    const String *pure_interfaces = typemapLookup(n, "javainterfaces", typemap_lookup_type, WARN_NONE);
-    if (*Char(interface_list) && *Char(pure_interfaces))
-      Append(interface_list, ", ");
-    Append(interface_list, pure_interfaces);
-    // Start writing the proxy class
-    if (!has_outerclass) // Import statements
-      Printv(proxy_class_def, typemapLookup(n, "javaimports", typemap_lookup_type, WARN_NONE),"\n", NIL);
-    else
-      Printv(proxy_class_def, "static ", NIL); // C++ nested classes correspond to static java classes
-    Printv(proxy_class_def, typemapLookup(n, "javaclassmodifiers", typemap_lookup_type, WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
-	   " $javaclassname",	// Class name and bases
-	   (*Char(wanted_base)) ? " extends " : "", wanted_base, *Char(interface_list) ?	// Pure Java interfaces
-	   " implements " : "", interface_list, " {", derived ? typemapLookup(n, "javabody_derived", typemap_lookup_type, WARN_JAVA_TYPEMAP_JAVABODY_UNDEF) :	// main body of class
-	   typemapLookup(n, "javabody", typemap_lookup_type, WARN_JAVA_TYPEMAP_JAVABODY_UNDEF),	// main body of class
-	   NIL);
-
-    // C++ destructor is wrapped by the delete method
-    // Note that the method name is specified in a typemap attribute called methodname
-    String *destruct = NewString("");
-    const String *tm = NULL;
-    attributes = NewHash();
-    String *destruct_methodname = NULL;
-    String *destruct_methodmodifiers = NULL;
-    if (derived) {
-      tm = typemapLookup(n, "javadestruct_derived", typemap_lookup_type, WARN_NONE, attributes);
-      destruct_methodname = Getattr(attributes, "tmap:javadestruct_derived:methodname");
-      destruct_methodmodifiers = Getattr(attributes, "tmap:javadestruct_derived:methodmodifiers");
-    } else {
-      tm = typemapLookup(n, "javadestruct", typemap_lookup_type, WARN_NONE, attributes);
-      destruct_methodname = Getattr(attributes, "tmap:javadestruct:methodname");
-      destruct_methodmodifiers = Getattr(attributes, "tmap:javadestruct:methodmodifiers");
-    }
-    if (tm && *Char(tm)) {
-      if (!destruct_methodname) {
-	Swig_error(Getfile(n), Getline(n), "No methodname attribute defined in javadestruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name);
-      }
-      if (!destruct_methodmodifiers) {
-	Swig_error(Getfile(n), Getline(n), "No methodmodifiers attribute defined in javadestruct%s typemap for %s.\n", (derived ? "_derived" : ""), proxy_class_name);
-      }
-    }
-    // Emit the finalize and delete methods
-    if (tm) {
-      // Finalize method
-      if (*Char(destructor_call)) {
-	Printv(proxy_class_def, typemapLookup(n, "javafinalize", typemap_lookup_type, WARN_NONE), NIL);
-      }
-      // delete method
-      Printv(destruct, tm, NIL);
-      if (*Char(destructor_call))
-	Replaceall(destruct, "$jnicall", destructor_call);
-      else
-	Replaceall(destruct, "$jnicall", "throw new UnsupportedOperationException(\"C++ destructor does not have public access\")");
-      if (*Char(destruct))
-	Printv(proxy_class_def, "\n  ", destruct_methodmodifiers, " void ", destruct_methodname, "()", destructor_throws_clause, " ", destruct, "\n", NIL);
-    }
-    if (*Char(interface_upcasts))
-      Printv(proxy_class_def, interface_upcasts, NIL);
-
-    /* Insert directordisconnect typemap, if this class has directors enabled */
-    /* Also insert the swigTakeOwnership and swigReleaseOwnership methods */
-    if (feature_director) {
-      String *destruct_jnicall, *release_jnicall, *take_jnicall;
-      String *changeown_method_name = Swig_name_member(getNSpace(), getClassPrefix(), "change_ownership");
-
-      destruct_jnicall = NewStringf("%s()", destruct_methodname);
-      release_jnicall = NewStringf("%s.%s(this, swigCPtr, false)", full_imclass_name, changeown_method_name);
-      take_jnicall = NewStringf("%s.%s(this, swigCPtr, true)", full_imclass_name, changeown_method_name);
-
-      emitCodeTypemap(n, false, typemap_lookup_type, "directordisconnect", "methodname", destruct_jnicall);
-      emitCodeTypemap(n, false, typemap_lookup_type, "directorowner_release", "methodname", release_jnicall);
-      emitCodeTypemap(n, false, typemap_lookup_type, "directorowner_take", "methodname", take_jnicall);
-
-      Delete(destruct_jnicall);
-      Delete(changeown_method_name);
-      Delete(release_jnicall);
-      Delete(take_jnicall);
-    }
-
-    Delete(interface_upcasts);
-    Delete(interface_list);
-    Delete(attributes);
-    Delete(destruct);
-
-    // Emit extra user code
-    Printv(proxy_class_def, typemapLookup(n, "javacode", typemap_lookup_type, WARN_NONE),	// extra Java code
-	   "\n", NIL);
-
-    if (derived) {
-      String *upcast_method_name = Swig_name_member(getNSpace(), getClassPrefix(), smart != 0 ? "SWIGSmartPtrUpcast" : "SWIGUpcast");
-      upcastsCode(smart, upcast_method_name, c_classname, c_baseclass);
-      Delete(upcast_method_name);
-    }
-
-    Delete(smart);
-    Delete(baseclass);
-  }
-
-  /* ----------------------------------------------------------------------
-   * emitInterfaceDeclaration()
-   * ---------------------------------------------------------------------- */
-
-  void emitInterfaceDeclaration(Node *n, String *interface_name, File *f_interface, String *nspace) {
-    if (package || nspace) {
-      Printf(f_interface, "package ");
-      if (package)
-	Printv(f_interface, package, nspace ? "." : "", NIL);
-      if (nspace)
-	Printv(f_interface, nspace, NIL);
-      Printf(f_interface, ";\n");
-    }
-
-    Printv(f_interface, typemapLookup(n, "javaimports", Getattr(n, "classtypeobj"), WARN_NONE), "\n", NIL);
-    Printf(f_interface, "public interface %s", interface_name);
-    if (List *baselist = Getattr(n, "bases")) {
-      String *bases = 0;
-      for (Iterator base = First(baselist); base.item; base = Next(base)) {
-	if (GetFlag(base.item, "feature:ignore") || !Getattr(base.item, "feature:interface"))
-	  continue; // TODO: warn about skipped non-interface bases
-	String *base_iname = Getattr(base.item, "interface:name");
-	if (!bases)
-	  bases = Copy(base_iname);
-	else {
-	  Append(bases, ", ");
-	  Append(bases, base_iname);
-	}
-      }
-      if (bases) {
-	Printv(f_interface, " extends ", bases, NIL);
-	Delete(bases);
-      }
-    }
-    Printf(f_interface, " {\n");
-
-    Node *attributes = NewHash();
-    String *interface_code = Copy(typemapLookup(n, "javainterfacecode", Getattr(n, "classtypeobj"), WARN_JAVA_TYPEMAP_INTERFACECODE_UNDEF, attributes));
-    if (interface_code) {
-      String *interface_declaration = Copy(Getattr(attributes, "tmap:javainterfacecode:declaration"));
-      if (interface_declaration) {
-        Replaceall(interface_declaration, "$interfacename", interface_name);
-	Printv(f_interface, interface_declaration, NIL);
-	Delete(interface_declaration);
-      }
-      Delete(interface_code);
-    }
-  }
-
-  /* ----------------------------------------------------------------------
-  * classDeclaration()
-  * ---------------------------------------------------------------------- */
-
-  int classDeclaration(Node *n) {
-    return Language::classDeclaration(n);
-  }
-
-  /* ----------------------------------------------------------------------
-  * classHandler()
-  * ---------------------------------------------------------------------- */
-
-  virtual int classHandler(Node *n) {
-    File *f_proxy = NULL;
-    File *f_interface = NULL;
-    String *old_proxy_class_name = proxy_class_name;
-    String *old_full_proxy_class_name = full_proxy_class_name;
-    String *old_full_imclass_name = full_imclass_name;
-    String *old_destructor_call = destructor_call;
-    String *old_destructor_throws_clause = destructor_throws_clause;
-    String *old_proxy_class_constants_code = proxy_class_constants_code;
-    String *old_proxy_class_def = proxy_class_def;
-    String *old_proxy_class_code = proxy_class_code;
-    bool has_outerclass = Getattr(n, "nested:outer") && !GetFlag(n, "feature:flatnested");
-    String *old_interface_class_code = interface_class_code;
-    interface_class_code = 0;
-
-    if (proxy_flag) {
-      proxy_class_name = NewString(Getattr(n, "sym:name"));
-      String *nspace = getNSpace();
-      constructIntermediateClassName(n);
-
-      String *outerClassesPrefix = 0;
-      if (Node *outer = Getattr(n, "nested:outer")) {
-	outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
-	for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
-	  Push(outerClassesPrefix, ".");
-	  Push(outerClassesPrefix, Getattr(outer, "sym:name"));
-	}
-      }
-      if (!nspace) {
-	full_proxy_class_name = outerClassesPrefix ? NewStringf("%s.%s", outerClassesPrefix, proxy_class_name) : NewStringf("%s", proxy_class_name);
-
-	if (Cmp(proxy_class_name, imclass_name) == 0) {
-	  Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-
-	if (Cmp(proxy_class_name, module_class_name) == 0) {
-	  Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-      } else {
-	if (outerClassesPrefix) {
-	  if (package)
-	    full_proxy_class_name = NewStringf("%s.%s.%s.%s", package, nspace, outerClassesPrefix, proxy_class_name);
-	  else
-	    full_proxy_class_name = NewStringf("%s.%s.%s", nspace, outerClassesPrefix, proxy_class_name);
-	} else {
-	  if (package)
-	    full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name);
-	  else
-	    full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
-	}
-      }
-
-      String *interface_name = Getattr(n, "feature:interface") ? Getattr(n, "interface:name") : 0;
-      if (outerClassesPrefix) {
-	String *fnspace = nspace ? NewStringf("%s.%s", nspace, outerClassesPrefix) : outerClassesPrefix;
-	if (!addSymbol(proxy_class_name, n, fnspace))
-	  return SWIG_ERROR;
-	if (interface_name && !addInterfaceSymbol(interface_name, n, fnspace))
-	  return SWIG_ERROR;
-	if (nspace)
-	  Delete(fnspace);
-	Delete(outerClassesPrefix);
-      } else {
-	if (!addSymbol(proxy_class_name, n, nspace))
-	  return SWIG_ERROR;
-	if (interface_name && !addInterfaceSymbol(interface_name, n, nspace))
-	  return SWIG_ERROR;
-      }
-
-      // Each outer proxy class goes into a separate file
-      if (!has_outerclass) {
-	String *output_directory = outputDirectory(nspace);
-	String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name);
-	f_proxy = NewFile(filen, "w", SWIG_output_files());
-	if (!f_proxy) {
-	  FileErrorDisplay(filen);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Append(filenames_list, Copy(filen));
-	Delete(filen);
-	Delete(output_directory);
-
-	// Start writing out the proxy class file
-	emitBanner(f_proxy);
-
-	if (package || nspace) {
-	  Printf(f_proxy, "package ");
-	  if (package)
-	    Printv(f_proxy, package, nspace ? "." : "", NIL);
-	  if (nspace)
-	    Printv(f_proxy, nspace, NIL);
-	  Printf(f_proxy, ";\n");
-	}
-      }
-      else
-	++nesting_depth;
-
-      proxy_class_def = NewString("");
-      proxy_class_code = NewString("");
-      destructor_call = NewString("");
-      destructor_throws_clause = NewString("");
-      proxy_class_constants_code = NewString("");
-
-      if (Getattr(n, "feature:interface")) {
-        interface_class_code = NewString("");
-	String *output_directory = outputDirectory(nspace);
-	String *filen = NewStringf("%s%s.java", output_directory, interface_name);
-	f_interface = NewFile(filen, "w", SWIG_output_files());
-	if (!f_interface) {
-	  FileErrorDisplay(filen);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Append(filenames_list, filen); // file name ownership goes to the list
-	emitBanner(f_interface);
-	emitInterfaceDeclaration(n, interface_name, interface_class_code, nspace);
-	Delete(filen);
-	Delete(output_directory);
-      }
-    }
-
-    Language::classHandler(n);
-
-    if (proxy_flag) {
-      emitProxyClassDefAndCPPCasts(n);
-
-      String *javaclazzname = Swig_name_member(getNSpace(), getClassPrefix(), ""); // mangled full proxy class name
-
-      Replaceall(proxy_class_def, "$javaclassname", proxy_class_name);
-      Replaceall(proxy_class_code, "$javaclassname", proxy_class_name);
-      Replaceall(proxy_class_constants_code, "$javaclassname", proxy_class_name);
-      Replaceall(interface_class_code, "$javaclassname", proxy_class_name);
-
-      Replaceall(proxy_class_def, "$javaclazzname", javaclazzname);
-      Replaceall(proxy_class_code, "$javaclazzname", javaclazzname);
-      Replaceall(proxy_class_constants_code, "$javaclazzname", javaclazzname);
-      Replaceall(interface_class_code, "$javaclazzname", javaclazzname);
-
-      Replaceall(proxy_class_def, "$module", module_class_name);
-      Replaceall(proxy_class_code, "$module", module_class_name);
-      Replaceall(proxy_class_constants_code, "$module", module_class_name);
-      Replaceall(interface_class_code, "$module", module_class_name);
-
-      Replaceall(proxy_class_def, "$imclassname", full_imclass_name);
-      Replaceall(proxy_class_code, "$imclassname", full_imclass_name);
-      Replaceall(proxy_class_constants_code, "$imclassname", full_imclass_name);
-      Replaceall(interface_class_code, "$imclassname", full_imclass_name);
-
-      if (!has_outerclass)
-	Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
-      else {
-	Swig_offset_string(proxy_class_def, nesting_depth);
-	Append(old_proxy_class_code, proxy_class_def);
-	Swig_offset_string(proxy_class_code, nesting_depth);
-	Append(old_proxy_class_code, proxy_class_code);
-      }
-
-      // Write out all the constants
-      if (Len(proxy_class_constants_code) != 0) {
-	if (!has_outerclass)
-	  Printv(f_proxy, proxy_class_constants_code, NIL);
-	else {
-	  Swig_offset_string(proxy_class_constants_code, nesting_depth);
-	  Append(old_proxy_class_code, proxy_class_constants_code);
-	}
-      }
-
-      if (!has_outerclass) {
-	Printf(f_proxy, "}\n");
-        Delete(f_proxy);
-        f_proxy = NULL;
-      } else {
-	for (int i = 0; i < nesting_depth; ++i)
-	  Append(old_proxy_class_code, "  ");
-	Append(old_proxy_class_code, "}\n\n");
-	--nesting_depth;
-      }
-
-      /* Output the downcast method, if necessary. Note: There's no other really
-         good place to put this code, since Abstract Base Classes (ABCs) can and should have 
-         downcasts, making the constructorHandler() a bad place (because ABCs don't get to
-         have constructors emitted.) */
-      if (GetFlag(n, "feature:javadowncast")) {
-	String *downcast_method = Swig_name_member(getNSpace(), getClassPrefix(), "SWIGDowncast");
-	String *jniname = makeValidJniName(downcast_method);
-	String *wname = Swig_name_wrapper(jniname);
-
-	String *norm_name = SwigType_namestr(Getattr(n, "name"));
-
-	Printf(imclass_class_code, "  public final static native %s %s(long cPtrBase, boolean cMemoryOwn);\n", proxy_class_name, downcast_method);
-
-	Wrapper *dcast_wrap = NewWrapper();
-
-	Printf(dcast_wrap->def, "SWIGEXPORT jobject JNICALL %s(JNIEnv *jenv, jclass jcls, jlong jCPtrBase, jboolean cMemoryOwn) {", wname);
-	Printf(dcast_wrap->code, "  Swig::Director *director = (Swig::Director *) 0;\n");
-	Printf(dcast_wrap->code, "  jobject jresult = (jobject) 0;\n");
-	Printf(dcast_wrap->code, "  %s *obj = *((%s **)&jCPtrBase);\n", norm_name, norm_name);
-	Printf(dcast_wrap->code, "  if (obj) director = dynamic_cast<Swig::Director *>(obj);\n");
-	Printf(dcast_wrap->code, "  if (director) jresult = director->swig_get_self(jenv);\n");
-	Printf(dcast_wrap->code, "  return jresult;\n");
-	Printf(dcast_wrap->code, "}\n");
-
-	Wrapper_print(dcast_wrap, f_wrappers);
-	DelWrapper(dcast_wrap);
-
-	Delete(norm_name);
-	Delete(wname);
-	Delete(jniname);
-	Delete(downcast_method);
-      }
-
-      if (f_interface) {
-	Printv(f_interface, interface_class_code, "}\n", NIL);
-	Delete(f_interface);
-	f_interface = 0;
-      }
-
-      emitDirectorExtraMethods(n);
-
-      Delete(interface_class_code);
-      interface_class_code = old_interface_class_code;
-      Delete(javaclazzname);
-      Delete(proxy_class_name);
-      proxy_class_name = old_proxy_class_name;
-      Delete(full_proxy_class_name);
-      full_proxy_class_name = old_full_proxy_class_name;
-      Delete(full_imclass_name);
-      full_imclass_name = old_full_imclass_name;
-      Delete(destructor_call);
-      destructor_call = old_destructor_call;
-      Delete(destructor_throws_clause);
-      destructor_throws_clause = old_destructor_throws_clause;
-      Delete(proxy_class_constants_code);
-      proxy_class_constants_code = old_proxy_class_constants_code;
-      Delete(proxy_class_def);
-      proxy_class_def = old_proxy_class_def;
-      Delete(proxy_class_code);
-      proxy_class_code = old_proxy_class_code;
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberfunctionHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int memberfunctionHandler(Node *n) {
-    member_func_flag = true;
-    Language::memberfunctionHandler(n);
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
-      Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-      Setattr(n, "imfuncname", intermediary_function_name);
-      proxyClassFunctionHandler(n);
-      Delete(overloaded_name);
-    }
-    member_func_flag = false;
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-
-    static_flag = true;
-    member_func_flag = true;
-    Language::staticmemberfunctionHandler(n);
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
-      Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-      Setattr(n, "imfuncname", intermediary_function_name);
-      proxyClassFunctionHandler(n);
-      Delete(overloaded_name);
-    }
-    static_flag = false;
-    member_func_flag = false;
-
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * proxyClassFunctionHandler()
-   *
-   * Function called for creating a Java wrapper function around a c++ function in the 
-   * proxy class. Used for both static and non-static C++ class functions.
-   * C++ class static functions map to Java static functions.
-   * Two extra attributes in the Node must be available. These are "proxyfuncname" - 
-   * the name of the Java class proxy function, which in turn will call "imfuncname" - 
-   * the intermediary (JNI) function name in the intermediary class.
-   * ----------------------------------------------------------------------------- */
-
-  void proxyClassFunctionHandler(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *intermediary_function_name = Getattr(n, "imfuncname");
-    String *proxy_function_name = Getattr(n, "proxyfuncname");
-    String *tm;
-    Parm *p;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    bool setter_flag = false;
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    bool is_interface = Getattr(parentNode(n), "feature:interface") != 0 
-      && !static_flag && Getattr(n, "interface:owner") == 0;
-
-    if (!proxy_flag)
-      return;
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in Java
-    if (Getattr(n, "overload:ignore"))
-      return;
-
-    // Don't generate proxy method for additional explicitcall method used in directors
-    if (GetFlag(n, "explicitcall"))
-      return;
-
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("in", l, NULL);
-    Swig_typemap_attach_parms("jtype", l, NULL);
-    Swig_typemap_attach_parms("jstype", l, NULL);
-    Swig_typemap_attach_parms("javain", l, NULL);
-
-    /* Get return types */
-    if ((tm = Swig_typemap_lookup("jstype", n, "", 0))) {
-      // Note that in the case of polymorphic (covariant) return types, the method's return type is changed to be the base of the C++ return type
-      SwigType *covariant = Getattr(n, "covariant");
-      substituteClassname(covariant ? covariant : t, tm);
-      Printf(return_type, "%s", tm);
-      if (covariant)
-	Swig_warning(WARN_JAVA_COVARIANT_RET, input_file, line_number,
-		     "Covariant return types not supported in Java. Proxy method will return %s.\n", SwigType_str(covariant, 0));
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    if (wrapping_member_flag && !enum_constant_flag) {
-      // For wrapping member variables (Javabean setter)
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) == 0);
-    }
-
-    /* Start generating the proxy function */
-    const String *methodmods = Getattr(n, "feature:java:methodmodifiers");
-    methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-    Printf(function_code, "  %s ", methodmods);
-    if (static_flag)
-      Printf(function_code, "static ");
-    Printf(function_code, "%s %s(", return_type, proxy_function_name);
-    
-    if (is_interface)
-      Printf(interface_class_code, "  %s %s(", return_type, proxy_function_name);
-
-    Printv(imcall, full_imclass_name, ".$imfuncname(", NIL);
-    if (!static_flag) {
-      Printf(imcall, "swigCPtr");
-
-      String *this_type = Copy(getClassType());
-      String *name = NewString("jself");
-      String *qualifier = Getattr(n, "qualifier");
-      if (qualifier)
-	SwigType_push(this_type, qualifier);
-      SwigType_add_pointer(this_type);
-      Parm *this_parm = NewParm(this_type, name, n);
-      Swig_typemap_attach_parms("jtype", this_parm, NULL);
-      Swig_typemap_attach_parms("jstype", this_parm, NULL);
-
-      if (prematureGarbageCollectionPreventionParameter(this_type, this_parm))
-	Printf(imcall, ", this");
-
-      Delete(this_parm);
-      Delete(name);
-      Delete(this_type);
-    }
-
-    emit_mark_varargs(l);
-
-    int gencomma = !static_flag;
-
-    /* Output each parameter */
-    for (i = 0, p = l; p; i++) {
-
-      /* Ignored varargs */
-      if (checkAttribute(p, "varargs:ignore", "1")) {
-	p = nextSibling(p);
-	continue;
-      }
-
-      /* Ignored parameters */
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-
-      /* Ignore the 'this' argument for variable wrappers */
-      if (!(variable_wrapper_flag && i == 0) || static_flag) {
-	SwigType *pt = Getattr(p, "type");
-	String *param_type = NewString("");
-
-	/* Get the Java parameter type */
-	if ((tm = Getattr(p, "tmap:jstype"))) {
-	  substituteClassname(pt, tm);
-	  Printf(param_type, "%s", tm);
-	} else {
-	  Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	if (gencomma)
-	  Printf(imcall, ", ");
-
-	String *arg = makeParameterName(n, p, i, setter_flag);
-
-	// Use typemaps to transform type used in Java proxy wrapper (in proxy class) to type used in JNI function (in intermediary class)
-	if ((tm = Getattr(p, "tmap:javain"))) {
-	  addThrows(n, "tmap:javain", p);
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$javainput", arg);
-          String *pre = Getattr(p, "tmap:javain:pre");
-          if (pre) {
-            substituteClassname(pt, pre);
-            Replaceall(pre, "$javainput", arg);
-            if (Len(pre_code) > 0)
-              Printf(pre_code, "\n");
-            Printv(pre_code, pre, NIL);
-          }
-          String *post = Getattr(p, "tmap:javain:post");
-          if (post) {
-            substituteClassname(pt, post);
-            Replaceall(post, "$javainput", arg);
-            if (Len(post_code) > 0)
-              Printf(post_code, "\n");
-            Printv(post_code, post, NIL);
-          }
-	  Printv(imcall, tm, NIL);
-	} else {
-	  Swig_warning(WARN_JAVA_TYPEMAP_JAVAIN_UNDEF, input_file, line_number, "No javain typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	/* Add parameter to proxy function */
-	if (gencomma >= 2) {
-	  Printf(function_code, ", ");
-	  if (is_interface)
-	    Printf(interface_class_code, ", ");
-	}
-	gencomma = 2;
-	Printf(function_code, "%s %s", param_type, arg);
-	if (is_interface)
-	  Printf(interface_class_code, "%s %s", param_type, arg);
-
-	if (prematureGarbageCollectionPreventionParameter(pt, p)) {
-          String *pgcppname = Getattr(p, "tmap:javain:pgcppname");
-          if (pgcppname) {
-            String *argname = Copy(pgcppname);
-            Replaceall(argname, "$javainput", arg);
-            Printf(imcall, ", %s", argname);
-            Delete(argname);
-          } else {
-            Printf(imcall, ", %s", arg);
-          }
-        }
-
-	Delete(arg);
-	Delete(param_type);
-      }
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ")");
-    if (is_interface)
-      Printf(interface_class_code, ");\n");
-
-    // Transform return type used in JNI function (in intermediary class) to type used in Java wrapper function (in proxy class)
-    if ((tm = Swig_typemap_lookup("javaout", n, "", 0))) {
-      addThrows(n, "tmap:javaout", n);
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      if (is_pre_code || is_post_code) {
-        Replaceall(tm, "\n ", "\n   "); // add extra indentation to code in typemap
-        if (is_post_code) {
-          Insert(tm, 0, "\n    try ");
-          Printv(tm, " finally {\n", post_code, "\n    }", NIL);
-        } else {
-          Insert(tm, 0, "\n    ");
-        }
-        if (is_pre_code) {
-          Insert(tm, 0, pre_code);
-          Insert(tm, 0, "\n");
-        }
-	Insert(tm, 0, "{");
-	Printf(tm, "\n  }");
-      }
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      substituteClassname(t, tm);
-
-      // For director methods: generate code to selectively make a normal polymorphic call or 
-      // an explicit method call - needed to prevent infinite recursion calls in director methods.
-      Node *explicit_n = Getattr(n, "explicitcallnode");
-      if (explicit_n) {
-	String *ex_overloaded_name = getOverloadedName(explicit_n);
-	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), ex_overloaded_name);
-
-	String *ex_imcall = Copy(imcall);
-	Replaceall(ex_imcall, "$imfuncname", ex_intermediary_function_name);
-	Replaceall(imcall, "$imfuncname", intermediary_function_name);
-
-	String *excode = NewString("");
-	if (!Cmp(return_type, "void"))
-	  Printf(excode, "if (getClass() == %s.class) %s; else %s", proxy_class_name, imcall, ex_imcall);
-	else
-	  Printf(excode, "(getClass() == %s.class) ? %s : %s", proxy_class_name, imcall, ex_imcall);
-
-	Clear(imcall);
-	Printv(imcall, excode, NIL);
-	Delete(ex_overloaded_name);
-	Delete(excode);
-      } else {
-	Replaceall(imcall, "$imfuncname", intermediary_function_name);
-      }
-
-      Replaceall(tm, "$jnicall", imcall);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF, input_file, line_number, "No javaout typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    generateThrowsClause(n, function_code);
-    Printf(function_code, " %s\n\n", tm ? (const String *) tm : empty_string);
-    Printv(proxy_class_code, function_code, NIL);
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-  }
-
-  /* ----------------------------------------------------------------------
-   * constructorHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int constructorHandler(Node *n) {
-
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *function_code = NewString("");
-    String *helper_code = NewString(""); // Holds code for the constructor helper method generated only when the javain typemap has code in the pre or post attributes
-    String *helper_args = NewString("");
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *im_return_type = NewString("");
-    bool feature_director = (parentNode(n) && Swig_directorclass(n));
-
-    Language::constructorHandler(n);
-
-    // Wrappers not wanted for some methods where the parameters cannot be overloaded in Java
-    if (Getattr(n, "overload:ignore"))
-      return SWIG_OK;
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *mangled_overname = Swig_name_construct(getNSpace(), overloaded_name);
-      String *imcall = NewString("");
-
-      const String *methodmods = Getattr(n, "feature:java:methodmodifiers");
-      methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-
-      tm = Getattr(n, "tmap:jtype"); // typemaps were attached earlier to the node
-      Printf(im_return_type, "%s", tm);
-
-      Printf(function_code, "  %s %s(", methodmods, proxy_class_name);
-      Printf(helper_code, "  static private %s SwigConstruct%s(", im_return_type, proxy_class_name);
-
-      Printv(imcall, full_imclass_name, ".", mangled_overname, "(", NIL);
-
-      /* Attach the non-standard typemaps to the parameter list */
-      Swig_typemap_attach_parms("in", l, NULL);
-      Swig_typemap_attach_parms("jtype", l, NULL);
-      Swig_typemap_attach_parms("jstype", l, NULL);
-      Swig_typemap_attach_parms("javain", l, NULL);
-
-      emit_mark_varargs(l);
-
-      int gencomma = 0;
-
-      /* Output each parameter */
-      for (i = 0, p = l; p; i++) {
-
-	/* Ignored varargs */
-	if (checkAttribute(p, "varargs:ignore", "1")) {
-	  p = nextSibling(p);
-	  continue;
-	}
-
-	/* Ignored parameters */
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	SwigType *pt = Getattr(p, "type");
-	String *param_type = NewString("");
-
-	/* Get the Java parameter type */
-	if ((tm = Getattr(p, "tmap:jstype"))) {
-	  substituteClassname(pt, tm);
-	  Printf(param_type, "%s", tm);
-	} else {
-	  Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	if (gencomma)
-	  Printf(imcall, ", ");
-
-	String *arg = makeParameterName(n, p, i, false);
-
-	// Use typemaps to transform type used in Java wrapper function (in proxy class) to type used in JNI function (in intermediary class)
-	if ((tm = Getattr(p, "tmap:javain"))) {
-	  addThrows(n, "tmap:javain", p);
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$javainput", arg);
-          String *pre = Getattr(p, "tmap:javain:pre");
-          if (pre) {
-            substituteClassname(pt, pre);
-            Replaceall(pre, "$javainput", arg);
-            if (Len(pre_code) > 0)
-              Printf(pre_code, "\n");
-            Printv(pre_code, pre, NIL);
-          }
-          String *post = Getattr(p, "tmap:javain:post");
-          if (post) {
-            substituteClassname(pt, post);
-            Replaceall(post, "$javainput", arg);
-            if (Len(post_code) > 0)
-              Printf(post_code, "\n");
-            Printv(post_code, post, NIL);
-          }
-	  Printv(imcall, tm, NIL);
-	} else {
-	  Swig_warning(WARN_JAVA_TYPEMAP_JAVAIN_UNDEF, input_file, line_number, "No javain typemap defined for %s\n", SwigType_str(pt, 0));
-	}
-
-	/* Add parameter to proxy function */
-	if (gencomma) {
-	  Printf(function_code, ", ");
-	  Printf(helper_code, ", ");
-	  Printf(helper_args, ", ");
-        }
-	Printf(function_code, "%s %s", param_type, arg);
-	Printf(helper_code, "%s %s", param_type, arg);
-	Printf(helper_args, "%s", arg);
-	++gencomma;
-
-	if (prematureGarbageCollectionPreventionParameter(pt, p)) {
-          String *pgcppname = Getattr(p, "tmap:javain:pgcppname");
-          if (pgcppname) {
-            String *argname = Copy(pgcppname);
-            Replaceall(argname, "$javainput", arg);
-            Printf(imcall, ", %s", argname);
-            Delete(argname);
-          } else {
-            Printf(imcall, ", %s", arg);
-          }
-        }
-
-	Delete(arg);
-	Delete(param_type);
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      Printf(imcall, ")");
-
-      Printf(function_code, ")");
-      Printf(helper_code, ")");
-      generateThrowsClause(n, function_code);
-
-      /* Insert the javaconstruct typemap, doing the replacement for $directorconnect, as needed */
-      Hash *attributes = NewHash();
-      String *construct_tm = Copy(typemapLookup(n, "javaconstruct", Getattr(n, "name"),
-						WARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF, attributes));
-      if (construct_tm) {
-	if (!feature_director) {
-	  Replaceall(construct_tm, "$directorconnect", "");
-	} else {
-	  String *connect_attr = Getattr(attributes, "tmap:javaconstruct:directorconnect");
-
-	  if (connect_attr) {
-	    Replaceall(construct_tm, "$directorconnect", connect_attr);
-	  } else {
-	    Swig_warning(WARN_JAVA_NO_DIRECTORCONNECT_ATTR, input_file, line_number, "\"directorconnect\" attribute missing in %s \"javaconstruct\" typemap.\n",
-			 Getattr(n, "name"));
-	    Replaceall(construct_tm, "$directorconnect", "");
-	  }
-	}
-
-	Printv(function_code, " ", construct_tm, "\n", NIL);
-      }
-
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      if (is_pre_code || is_post_code) {
-        generateThrowsClause(n, helper_code);
-        Printf(helper_code, " {\n");
-        if (is_pre_code) {
-          Printv(helper_code, pre_code, "\n", NIL);
-        }
-        if (is_post_code) {
-          Printf(helper_code, "    try {\n");
-          Printv(helper_code, "      return ", imcall, ";\n", NIL);
-          Printv(helper_code, "    } finally {\n", post_code, "\n    }", NIL);
-        } else {
-          Printv(helper_code, "    return ", imcall, ";", NIL);
-        }
-        Printf(helper_code, "\n  }\n");
-        String *helper_name = NewStringf("%s.SwigConstruct%s(%s)", proxy_class_name, proxy_class_name, helper_args);
-        Printv(proxy_class_code, helper_code, "\n", NIL);
-        Replaceall(function_code, "$imcall", helper_name);
-        Delete(helper_name);
-      } else {
-        Replaceall(function_code, "$imcall", imcall);
-      }
-
-      Printv(proxy_class_code, function_code, "\n", NIL);
-
-      Delete(helper_args);
-      Delete(im_return_type);
-      Delete(pre_code);
-      Delete(post_code);
-      Delete(construct_tm);
-      Delete(attributes);
-      Delete(overloaded_name);
-      Delete(imcall);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * destructorHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int destructorHandler(Node *n) {
-    Language::destructorHandler(n);
-    String *symname = Getattr(n, "sym:name");
-
-    if (proxy_flag) {
-      Printv(destructor_call, full_imclass_name, ".", Swig_name_destroy(getNSpace(), symname), "(swigCPtr)", NIL);
-      generateThrowsClause(n, destructor_throws_clause);
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * membervariableHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int membervariableHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    variable_wrapper_flag = true;
-    Language::membervariableHandler(n);
-    wrapping_member_flag = false;
-    variable_wrapper_flag = false;
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    static_flag = true;
-    Language::staticmembervariableHandler(n);
-    wrapping_member_flag = false;
-    static_flag = false;
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberconstantHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int memberconstantHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    Language::memberconstantHandler(n);
-    wrapping_member_flag = false;
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getOverloadedName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getOverloadedName(Node *n) {
-
-    /* Although JNI functions are designed to handle overloaded Java functions,
-     * a Java long is used for all classes in the SWIG intermediary class.
-     * The intermediary class methods are thus mangled when overloaded to give
-     * a unique name. */
-    String *overloaded_name = NewStringf("%s", Getattr(n, "sym:name"));
-
-    if (Getattr(n, "sym:overloaded")) {
-      Printv(overloaded_name, Getattr(n, "sym:overname"), NIL);
-    }
-
-    return overloaded_name;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * moduleClassFunctionHandler()
-   * ----------------------------------------------------------------------------- */
-
-  void moduleClassFunctionHandler(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *tm;
-    Parm *p;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    int num_arguments = 0;
-    String *overloaded_name = getOverloadedName(n);
-    String *func_name = NULL;
-    bool setter_flag = false;
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("jstype", l, NULL);
-    Swig_typemap_attach_parms("javain", l, NULL);
-
-    /* Get return types */
-    if ((tm = Swig_typemap_lookup("jstype", n, "", 0))) {
-      substituteClassname(t, tm);
-      Printf(return_type, "%s", tm);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    /* Change function name for global variables */
-    if (proxy_flag && global_variable_flag) {
-      // Capitalize the first letter in the variable to create a JavaBean type getter/setter function name
-      func_name = NewString("");
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), variable_name)) == 0);
-      if (setter_flag)
-	Printf(func_name, "set");
-      else
-	Printf(func_name, "get");
-      Putc(toupper((int) *Char(variable_name)), func_name);
-      Printf(func_name, "%s", Char(variable_name) + 1);
-    } else {
-      func_name = Copy(Getattr(n, "sym:name"));
-    }
-
-    /* Start generating the function */
-    const String *methodmods = Getattr(n, "feature:java:methodmodifiers");
-    methodmods = methodmods ? methodmods : (is_public(n) ? public_string : protected_string);
-    Printf(function_code, "  %s static %s %s(", methodmods, return_type, func_name);
-    Printv(imcall, imclass_name, ".", overloaded_name, "(", NIL);
-
-    /* Get number of required and total arguments */
-    num_arguments = emit_num_arguments(l);
-
-    bool global_or_member_variable = global_variable_flag || (wrapping_member_flag && !enum_constant_flag);
-    int gencomma = 0;
-
-    /* Output each parameter */
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      /* Ignored parameters */
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *param_type = NewString("");
-
-      /* Get the Java parameter type */
-      if ((tm = Getattr(p, "tmap:jstype"))) {
-	substituteClassname(pt, tm);
-	Printf(param_type, "%s", tm);
-      } else {
-	Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      if (gencomma)
-	Printf(imcall, ", ");
-
-      String *arg = makeParameterName(n, p, i, global_or_member_variable);
-
-      // Use typemaps to transform type used in Java wrapper function (in proxy class) to type used in JNI function (in intermediary class)
-      if ((tm = Getattr(p, "tmap:javain"))) {
-	addThrows(n, "tmap:javain", p);
-	substituteClassname(pt, tm);
-	Replaceall(tm, "$javainput", arg);
-	String *pre = Getattr(p, "tmap:javain:pre");
-	if (pre) {
-	  substituteClassname(pt, pre);
-	  Replaceall(pre, "$javainput", arg);
-          if (Len(pre_code) > 0)
-            Printf(pre_code, "\n");
-	  Printv(pre_code, pre, NIL);
-	}
-	String *post = Getattr(p, "tmap:javain:post");
-	if (post) {
-	  substituteClassname(pt, post);
-	  Replaceall(post, "$javainput", arg);
-          if (Len(post_code) > 0)
-            Printf(post_code, "\n");
-	  Printv(post_code, post, NIL);
-	}
-	Printv(imcall, tm, NIL);
-      } else {
-	Swig_warning(WARN_JAVA_TYPEMAP_JAVAIN_UNDEF, input_file, line_number, "No javain typemap defined for %s\n", SwigType_str(pt, 0));
-      }
-
-      /* Add parameter to module class function */
-      if (gencomma >= 2)
-	Printf(function_code, ", ");
-      gencomma = 2;
-      Printf(function_code, "%s %s", param_type, arg);
-
-      if (prematureGarbageCollectionPreventionParameter(pt, p)) {
-        String *pgcppname = Getattr(p, "tmap:javain:pgcppname");
-        if (pgcppname) {
-          String *argname = Copy(pgcppname);
-          Replaceall(argname, "$javainput", arg);
-          Printf(imcall, ", %s", argname);
-          Delete(argname);
-        } else {
-          Printf(imcall, ", %s", arg);
-        }
-      }
-
-      p = Getattr(p, "tmap:in:next");
-      Delete(arg);
-      Delete(param_type);
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ")");
-
-    // Transform return type used in JNI function (in intermediary class) to type used in Java wrapper function (in module class)
-    if ((tm = Swig_typemap_lookup("javaout", n, "", 0))) {
-      addThrows(n, "tmap:javaout", n);
-      bool is_pre_code = Len(pre_code) > 0;
-      bool is_post_code = Len(post_code) > 0;
-      if (is_pre_code || is_post_code) {
-        Replaceall(tm, "\n ", "\n   "); // add extra indentation to code in typemap
-        if (is_post_code) {
-          Insert(tm, 0, "\n    try ");
-          Printv(tm, " finally {\n", post_code, "\n    }", NIL);
-        } else {
-          Insert(tm, 0, "\n    ");
-        }
-        if (is_pre_code) {
-          Insert(tm, 0, pre_code);
-          Insert(tm, 0, "\n");
-        }
-	Insert(tm, 0, "{");
-	Printf(tm, "\n  }");
-      }
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      substituteClassname(t, tm);
-      Replaceall(tm, "$jnicall", imcall);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF, input_file, line_number, "No javaout typemap defined for %s\n", SwigType_str(t, 0));
-    }
-
-    generateThrowsClause(n, function_code);
-    Printf(function_code, " %s\n\n", tm ? (const String *) tm : empty_string);
-    Printv(module_class_code, function_code, NIL);
-
-    Delete(pre_code);
-    Delete(post_code);
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-    Delete(func_name);
-  }
-
-  /*----------------------------------------------------------------------
-   * replaceSpecialVariables()
-   *--------------------------------------------------------------------*/
-
-  virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) {
-    (void)method;
-    SwigType *type = Getattr(parm, "type");
-    substituteClassname(type, tm);
-  }
-
-  /*----------------------------------------------------------------------
-   * decodeEnumFeature()
-   * Decode the possible enum features, which are one of:
-   *   %javaenum(simple)
-   *   %javaenum(typeunsafe) - default
-   *   %javaenum(typesafe)
-   *   %javaenum(proper)
-   *--------------------------------------------------------------------*/
-
-  EnumFeature decodeEnumFeature(Node *n) {
-    EnumFeature enum_feature = TypeunsafeEnum;
-    String *feature = Getattr(n, "feature:java:enum");
-    if (feature) {
-      if (Cmp(feature, "simple") == 0)
-	enum_feature = SimpleEnum;
-      else if (Cmp(feature, "typesafe") == 0)
-	enum_feature = TypesafeEnum;
-      else if (Cmp(feature, "proper") == 0)
-	enum_feature = ProperEnum;
-    }
-    return enum_feature;
-  }
-
-  /* -----------------------------------------------------------------------
-   * enumValue()
-   * This method will return a string with an enum value to use in Java generated
-   * code. If the %javaconst feature is not used, the string will contain the intermediary
-   * class call to obtain the enum value. The intermediary class and JNI methods to obtain
-   * the enum value will be generated. Otherwise the C/C++ enum value will be used if there
-   * is one and hopefully it will compile as Java code - e.g. 20 as in: enum E{e=20};
-   * The %javaconstvalue feature overrides all other ways to generate the constant value.
-   * The caller must delete memory allocated for the returned string.
-   * ------------------------------------------------------------------------ */
-
-  String *enumValue(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-
-    // Check for the %javaconstvalue feature
-    String *value = Getattr(n, "feature:java:constvalue");
-
-    if (!value) {
-      // The %javaconst feature determines how the constant value is obtained
-      int const_feature_flag = GetFlag(n, "feature:java:const");
-
-      if (const_feature_flag) {
-	// Use the C syntax to make a true Java constant and hope that it compiles as Java code
-	value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex"));
-      } else {
-	String *newsymname = 0;
-	if (!getCurrentClass() || !proxy_flag) {
-	  String *enumClassPrefix = getEnumClassPrefix();
-	  if (enumClassPrefix) {
-	    // A global scoped enum
-	    newsymname = Swig_name_member(0, enumClassPrefix, symname);
-	    symname = newsymname;
-	  }
-	}
-
-	// Get the enumvalue from a JNI call
-	if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) {
-	  // Strange hack to change the name
-	  Setattr(n, "name", Getattr(n, "value"));	/* for wrapping of enums in a namespace when emit_action is used */
-	  constantWrapper(n);
-	  value = NewStringf("%s.%s()", full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), symname));
-	} else {
-	  memberconstantHandler(n);
-	  value = NewStringf("%s.%s()", full_imclass_name ? full_imclass_name : imclass_name, Swig_name_get(getNSpace(), Swig_name_member(0, getEnumClassPrefix(), symname)));
-	}
-	Delete(newsymname);
-      }
-    }
-    return value;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getEnumName()
-   *
-   * If jnidescriptor is set, inner class names are separated with '$' otherwise a '.'
-   * and the package is also not added to the name.
-   * ----------------------------------------------------------------------------- */
-
-  String *getEnumName(SwigType *t, bool jnidescriptor) {
-    Node *enumname = NULL;
-    Node *n = enumLookup(t);
-    if (n) {
-      enumname = Getattr(n, "enumname");
-      if (!enumname || jnidescriptor) {
-	String *symname = Getattr(n, "sym:name");
-	if (symname) {
-	  // Add in class scope when referencing enum if not a global enum
-	  String *scopename_prefix = Swig_scopename_prefix(Getattr(n, "name"));
-	  String *proxyname = 0;
-	  if (scopename_prefix) {
-	    proxyname = getProxyName(scopename_prefix, jnidescriptor);
-	  }
-	  if (proxyname) {
-	    const char *class_separator = jnidescriptor ? "$" : ".";
-	    enumname = NewStringf("%s%s%s", proxyname, class_separator, symname);
-	  } else {
-	    // global enum or enum in a namespace
-	    String *nspace = Getattr(n, "sym:nspace");
-	    if (nspace) {
-	      if (package && !jnidescriptor)
-		enumname = NewStringf("%s.%s.%s", package, nspace, symname);
-	      else
-		enumname = NewStringf("%s.%s", nspace, symname);
-	    } else {
-	      enumname = Copy(symname);
-	    }
-	  }
-	  if (!jnidescriptor) {
-	    Setattr(n, "enumname", enumname); // Cache it
-	    Delete(enumname);
-	  }
-	  Delete(scopename_prefix);
-	}
-      }
-    }
-
-    return enumname;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteClassname()
-   *
-   * Substitute the special variable $javaclassname with the proxy class name for classes/structs/unions 
-   * that SWIG knows about. Also substitutes enums with enum name.
-   * Otherwise use the $descriptor name for the Java class name. Note that the $&javaclassname substitution
-   * is the same as a $&descriptor substitution, ie one pointer added to descriptor name.
-   * Note that the path separator is a '.' unless jnidescriptor is set.
-   * Inputs:
-   *   pt - parameter type
-   *   tm - typemap contents that might contain the special variable to be replaced
-   *   jnidescriptor - if set, inner class names are separated with '$' otherwise a '/' is used for the path separator
-   * Outputs:
-   *   tm - typemap contents complete with the special variable substitution
-   * Return:
-   *   substitution_performed - flag indicating if a substitution was performed
-   * ----------------------------------------------------------------------------- */
-
-  bool substituteClassname(SwigType *pt, String *tm, bool jnidescriptor = false) {
-    bool substitution_performed = false;
-    SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
-    SwigType *strippedtype = SwigType_strip_qualifiers(type);
-
-    if (Strstr(tm, "$javaclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      substituteClassnameSpecialVariable(classnametype, tm, "$javaclassname", jnidescriptor);
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$*javaclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      Delete(SwigType_pop(classnametype));
-      if (Len(classnametype) > 0) {
-	substituteClassnameSpecialVariable(classnametype, tm, "$*javaclassname", jnidescriptor);
-	substitution_performed = true;
-      }
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$&javaclassname")) {
-      SwigType *classnametype = Copy(strippedtype);
-      SwigType_add_pointer(classnametype);
-      substituteClassnameSpecialVariable(classnametype, tm, "$&javaclassname", jnidescriptor);
-      substitution_performed = true;
-      Delete(classnametype);
-    }
-    if (Strstr(tm, "$javainterfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$javainterfacename", jnidescriptor, true);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$*javainterfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      Delete(SwigType_pop(interfacenametype));
-      if (Len(interfacenametype) > 0) {
-	substituteInterfacenameSpecialVariable(interfacenametype, tm, "$*javainterfacename", jnidescriptor, true);
-	substitution_performed = true;
-      }
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$&javainterfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      SwigType_add_pointer(interfacenametype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$&javainterfacename", jnidescriptor, true);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$interfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$interfacename", jnidescriptor, false);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$*interfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      Delete(SwigType_pop(interfacenametype));
-      if (Len(interfacenametype) > 0) {
-	substituteInterfacenameSpecialVariable(interfacenametype, tm, "$*interfacename", jnidescriptor, false);
-	substitution_performed = true;
-      }
-      Delete(interfacenametype);
-    }
-    if (Strstr(tm, "$&interfacename")) {
-      SwigType *interfacenametype = Copy(strippedtype);
-      SwigType_add_pointer(interfacenametype);
-      substituteInterfacenameSpecialVariable(interfacenametype, tm, "$&interfacename", jnidescriptor, false);
-      substitution_performed = true;
-      Delete(interfacenametype);
-    }
-
-    Delete(strippedtype);
-    Delete(type);
-
-    return substitution_performed;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteClassnameSpecialVariable()
-   * ----------------------------------------------------------------------------- */
-
-  void substituteClassnameSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable, bool jnidescriptor) {
-    String *replacementname;
-
-    if (SwigType_isenum(classnametype)) {
-      String *enumname = getEnumName(classnametype, jnidescriptor);
-      if (enumname) {
-	replacementname = Copy(enumname);
-      } else {
-        bool anonymous_enum = (Cmp(classnametype, "enum ") == 0);
-	if (anonymous_enum) {
-	  replacementname = NewString("int");
-	} else {
-	  // An unknown enum - one that has not been parsed (neither a C enum forward reference nor a definition) or an ignored enum
-	  replacementname = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
-	  Replace(replacementname, "enum ", "", DOH_REPLACE_ANY);
-	  Setattr(swig_types_hash, replacementname, classnametype);
-	}
-      }
-    } else {
-      String *classname = getProxyName(classnametype, jnidescriptor); // getProxyName() works for pointers to classes too
-      if (classname) {
-	replacementname = Copy(classname);
-      } else {
-	// use $descriptor if SWIG does not know anything about this type. Note that any typedefs are resolved.
-	replacementname = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
-
-	// Add to hash table so that the type wrapper classes can be created later
-	Setattr(swig_types_hash, replacementname, classnametype);
-      }
-    }
-    if (jnidescriptor)
-      Replaceall(replacementname,".","/");
-    Replaceall(tm, classnamespecialvariable, replacementname);
-
-    Delete(replacementname);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteInterfacenameSpecialVariable()
-   * ----------------------------------------------------------------------------- */
-
-  void substituteInterfacenameSpecialVariable(SwigType *interfacenametype, String *tm, const char *interfacenamespecialvariable, bool jnidescriptor, bool qualified) {
-
-    String *interfacename = getInterfaceName(interfacenametype/*, jnidescriptor*/, qualified);
-    if (interfacename) {
-      String *replacementname = Copy(interfacename);
-
-      if (jnidescriptor)
-	Replaceall(replacementname,".","/");
-      Replaceall(tm, interfacenamespecialvariable, replacementname);
-
-      Delete(replacementname);
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitTypeWrapperClass()
-   * ----------------------------------------------------------------------------- */
-
-  void emitTypeWrapperClass(String *classname, SwigType *type) {
-    Node *n = NewHash();
-    Setfile(n, input_file);
-    Setline(n, line_number);
-
-    String *swigtype = NewString("");
-    String *filen = NewStringf("%s%s.java", SWIG_output_directory(), classname);
-    File *f_swigtype = NewFile(filen, "w", SWIG_output_files());
-    if (!f_swigtype) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Append(filenames_list, Copy(filen));
-    Delete(filen);
-    filen = NULL;
-
-    // Start writing out the type wrapper class file
-    emitBanner(f_swigtype);
-
-    if (package)
-      Printf(f_swigtype, "package %s;\n", package);
-
-    // Pure Java baseclass and interfaces
-    const String *pure_baseclass = typemapLookup(n, "javabase", type, WARN_NONE);
-    const String *pure_interfaces = typemapLookup(n, "javainterfaces", type, WARN_NONE);
-
-    // Emit the class
-    Printv(swigtype, typemapLookup(n, "javaimports", type, WARN_NONE),	// Import statements
-	   "\n", typemapLookup(n, "javaclassmodifiers", type, WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
-	   " $javaclassname",	// Class name and bases
-	   *Char(pure_baseclass) ? " extends " : "", pure_baseclass, *Char(pure_interfaces) ?	// Interfaces
-	   " implements " : "", pure_interfaces, " {", typemapLookup(n, "javabody", type, WARN_JAVA_TYPEMAP_JAVABODY_UNDEF),	// main body of class
-	   typemapLookup(n, "javacode", type, WARN_NONE),	// extra Java code
-	   "}\n", "\n", NIL);
-
-    Replaceall(swigtype, "$javaclassname", classname);
-    Replaceall(swigtype, "$module", module_class_name);
-    Replaceall(swigtype, "$imclassname", imclass_name);
-
-    // For unknown enums
-    Replaceall(swigtype, "$static ", "");
-    Replaceall(swigtype, "$enumvalues", "");
-
-    Printv(f_swigtype, swigtype, NIL);
-
-    Delete(f_swigtype);
-    Delete(swigtype);
-    Delete(n);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * typemapLookup()
-   * n - for input only and must contain info for Getfile(n) and Getline(n) to work
-   * tmap_method - typemap method name
-   * type - typemap type to lookup
-   * warning - warning number to issue if no typemaps found
-   * typemap_attributes - the typemap attributes are attached to this node and will 
-   *   also be used for temporary storage if non null
-   * return is never NULL, unlike Swig_typemap_lookup()
-   * ----------------------------------------------------------------------------- */
-
-  const String *typemapLookup(Node *n, const_String_or_char_ptr tmap_method, SwigType *type, int warning, Node *typemap_attributes = 0) {
-    Node *node = !typemap_attributes ? NewHash() : typemap_attributes;
-    Setattr(node, "type", type);
-    Setfile(node, Getfile(n));
-    Setline(node, Getline(n));
-    const String *tm = Swig_typemap_lookup(tmap_method, node, "", 0);
-    if (!tm) {
-      tm = empty_string;
-      if (warning != WARN_NONE)
-	Swig_warning(warning, Getfile(n), Getline(n), "No %s typemap defined for %s\n", tmap_method, SwigType_str(type, 0));
-    }
-    if (!typemap_attributes)
-      Delete(node);
-    return tm;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addThrows()
-   *
-   * Adds exception classes to a throws list. The throws list is the list of classes
-   * that will form the Java throws clause. Mainly for checked exceptions.
-   * ----------------------------------------------------------------------------- */
-
-  void addThrows(Node *n, const String *attribute, Node *parameter) {
-    // Get the comma separated exception classes for the throws clause - held in typemap/feature's "throws" attribute
-    String *throws_attribute = NewStringf("%s:throws", attribute);
-    String *throws = Getattr(parameter, throws_attribute);
-
-    if (throws && Len(throws) > 0) {
-      String *throws_list = Getattr(n, "java:throwslist");
-      if (!throws_list) {
-	throws_list = NewList();
-	Setattr(n, "java:throwslist", throws_list);
-      }
-      // Put the exception classes in the throws clause into a temporary List
-      List *temp_classes_list = Split(throws, ',', INT_MAX);
-
-      // Add the exception classes to the node throws list, but don't duplicate if already in list
-      if (temp_classes_list && Len(temp_classes_list) > 0) {
-	for (Iterator cls = First(temp_classes_list); cls.item; cls = Next(cls)) {
-	  String *exception_class = NewString(cls.item);
-	  Replaceall(exception_class, " ", "");	// remove spaces
-	  Replaceall(exception_class, "\t", "");	// remove tabs
-	  if (Len(exception_class) > 0) {
-	    // $javaclassname substitution
-	    SwigType *pt = Getattr(parameter, "type");
-	    substituteClassname(pt, exception_class);
-
-	    // Don't duplicate the Java exception class in the throws clause
-	    bool found_flag = false;
-	    for (Iterator item = First(throws_list); item.item; item = Next(item)) {
-	      if (Strcmp(item.item, exception_class) == 0)
-		found_flag = true;
-	    }
-	    if (!found_flag)
-	      Append(throws_list, exception_class);
-	  }
-	  Delete(exception_class);
-	}
-      }
-      Delete(temp_classes_list);
-    }
-    Delete(throws_attribute);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * generateThrowsClause()
-   *
-   * Generates throws clause for checked exception
-   * ----------------------------------------------------------------------------- */
-
-  void generateThrowsClause(Node *n, String *code) {
-    // Add the throws clause into code
-    List *throws_list = Getattr(n, "java:throwslist");
-    if (throws_list) {
-      Iterator cls = First(throws_list);
-      Printf(code, " throws %s", cls.item);
-      while ((cls = Next(cls)).item)
-	Printf(code, ", %s", cls.item);
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * prematureGarbageCollectionPreventionParameter()
-   *
-   * Get the proxy class name for use in an additional generated parameter. The
-   * additional parameter is added to a native method call purely to prevent 
-   * premature garbage collection of proxy classes which pass their C++ class pointer
-   * in a Java long to the JNI layer.
-   * ----------------------------------------------------------------------------- */
-
-  String *prematureGarbageCollectionPreventionParameter(SwigType *t, Parm *p) {
-    String *pgcpp_java_type = 0;
-    String *jtype = NewString(Getattr(p, "tmap:jtype"));
-
-    // Strip C comments
-    String *stripped_jtype = Swig_strip_c_comments(jtype);
-    if (stripped_jtype) {
-      Delete(jtype);
-      jtype = stripped_jtype;
-    }
-
-    // Remove whitespace
-    Replaceall(jtype, " ", "");
-    Replaceall(jtype, "\t", "");
-
-    if (Cmp(jtype, "long") == 0) {
-      if (proxy_flag) {
-	if (!GetFlag(p, "tmap:jtype:nopgcpp") && !nopgcpp_flag) {
-	  String *interface_name = getInterfaceName(t, true);
-          pgcpp_java_type = interface_name ? interface_name : getProxyName(t);
-          if (!pgcpp_java_type) {
-            // Look for proxy class parameters passed to C++ layer using non-default typemaps, ie not one of above types
-            String *jstype = NewString(Getattr(p, "tmap:jstype"));
-            if (jstype) {
-              Hash *classes = getClassHash();
-              if (classes) {
-                // Strip C comments
-                String *stripped_jstype = Swig_strip_c_comments(jstype);
-                if (stripped_jstype) {
-                  Delete(jstype);
-                  jstype = stripped_jstype;
-                }
-                // Remove whitespace
-                Replaceall(jstype, " ", "");
-                Replaceall(jstype, "\t", "");
-
-                Iterator ki;
-                for (ki = First(classes); ki.key; ki = Next(ki)) {
-                  Node *cls = ki.item;
-                  if (cls && !Getattr(cls, "feature:ignore")) {
-                    String *symname = Getattr(cls, "sym:name");
-                    if (symname && Strcmp(symname, jstype) == 0) {
-                      pgcpp_java_type = symname;
-                    }
-                  }
-                }
-              }
-            }
-            Delete(jstype);
-          }
-	}
-      }
-    }
-    Delete(jtype);
-    return pgcpp_java_type;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * outputDirectory()
-   *
-   * Return the directory to use for generating Java classes/enums and create the
-   * subdirectory (does not create if language specific outdir does not exist).
-   * ----------------------------------------------------------------------------- */
-
-  String *outputDirectory(String *nspace) {
-    String *output_directory = Copy(SWIG_output_directory());
-    if (nspace) {
-      String *nspace_subdirectory = Copy(nspace);
-      Replaceall(nspace_subdirectory, ".", SWIG_FILE_DELIMITER);
-      String *newdir_error = Swig_new_subdirectory(output_directory, nspace_subdirectory);
-      if (newdir_error) {
-	Printf(stderr, "%s\n", newdir_error);
-	Delete(newdir_error);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Printv(output_directory, nspace_subdirectory, SWIG_FILE_DELIMITER, 0);
-      Delete(nspace_subdirectory);
-    }
-    return output_directory;
-  }
-
-  /*----------------------------------------------------------------------
-   * Start of director methods
-   *--------------------------------------------------------------------*/
-
-  /*----------------------------------------------------------------------
-   * getUpcallJNIMethod()
-   *--------------------------------------------------------------------*/
-
-  String *getUpcallJNIMethod(String *descrip) {
-    static struct {
-      char code;
-      const char *method;
-    } upcall_methods[] = {
-      {
-      'B', "CallStaticByteMethod"}, {
-      'C', "CallStaticCharMethod"}, {
-      'D', "CallStaticDoubleMethod"}, {
-      'F', "CallStaticFloatMethod"}, {
-      'I', "CallStaticIntMethod"}, {
-      'J', "CallStaticLongMethod"}, {
-      'L', "CallStaticObjectMethod"}, {
-      'S', "CallStaticShortMethod"}, {
-      'V', "CallStaticVoidMethod"}, {
-      'Z', "CallStaticBooleanMethod"}, {
-      '[', "CallStaticObjectMethod"}
-    };
-
-    char code;
-    int i;
-
-    code = *Char(descrip);
-    for (i = 0; i < (int) (sizeof(upcall_methods) / sizeof(upcall_methods[0])); ++i)
-      if (code == upcall_methods[i].code)
-	return NewString(upcall_methods[i].method);
-    return NULL;
-  }
-
-  /*----------------------------------------------------------------------
-   * emitDirectorUpcalls()
-   *--------------------------------------------------------------------*/
-
-  void emitDirectorUpcalls() {
-    if (n_dmethods) {
-      Wrapper *w = NewWrapper();
-      String *jni_imclass_name = makeValidJniName(imclass_name);
-      String *swig_module_init = NewString("swig_module_init");
-      String *swig_module_init_jni = makeValidJniName(swig_module_init);
-      String *dmethod_data = NewString("");
-      int n_methods = 0;
-      Iterator udata_iter;
-
-      udata_iter = First(dmethods_seq);
-      while (udata_iter.item) {
-	UpcallData *udata = udata_iter.item;
-	Printf(dmethod_data, "  { \"%s\", \"%s\" }", Getattr(udata, "imclass_method"), Getattr(udata, "imclass_fdesc"));
-	++n_methods;
-
-	udata_iter = Next(udata_iter);
-
-	if (udata_iter.item)
-	  Putc(',', dmethod_data);
-	Putc('\n', dmethod_data);
-      }
-
-      Printf(f_runtime, "namespace Swig {\n");
-      Printf(f_runtime, "  namespace {\n");
-      Printf(f_runtime, "    jclass jclass_%s = NULL;\n", imclass_name);
-      Printf(f_runtime, "    jmethodID director_method_ids[%d];\n", n_methods);
-      Printf(f_runtime, "  }\n");
-      Printf(f_runtime, "}\n");
-
-      Printf(w->def, "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls) {", jnipackage, jni_imclass_name, swig_module_init_jni);
-      Printf(w->code, "static struct {\n");
-      Printf(w->code, "  const char *method;\n");
-      Printf(w->code, "  const char *signature;\n");
-      Printf(w->code, "} methods[%d] = {\n", n_methods);
-      Printv(w->code, dmethod_data, NIL);
-      Printf(w->code, "};\n");
-
-      Wrapper_add_local(w, "i", "int i");
-
-      Printf(w->code, "Swig::jclass_%s = (jclass) jenv->NewGlobalRef(jcls);\n", imclass_name);
-      Printf(w->code, "if (!Swig::jclass_%s) return;\n", imclass_name);
-      Printf(w->code, "for (i = 0; i < (int) (sizeof(methods)/sizeof(methods[0])); ++i) {\n");
-      Printf(w->code, "  Swig::director_method_ids[i] = jenv->GetStaticMethodID(jcls, methods[i].method, methods[i].signature);\n");
-      Printf(w->code, "  if (!Swig::director_method_ids[i]) return;\n");
-      Printf(w->code, "}\n");
-
-      Printf(w->code, "}\n");
-
-      Wrapper_print(w, f_wrappers);
-      Delete(dmethod_data);
-      Delete(swig_module_init_jni);
-      Delete(swig_module_init);
-      Delete(jni_imclass_name);
-      DelWrapper(w);
-    }
-  }
-
-  /*----------------------------------------------------------------------
-   * emitDirectorExtraMethods()
-   *
-   * This is where the director connect method is generated.
-   *--------------------------------------------------------------------*/
-  void emitDirectorExtraMethods(Node *n) {
-    if (!Swig_directorclass(n))
-      return;
-
-    // Output the director connect method:
-    String *jni_imclass_name = makeValidJniName(imclass_name);
-    String *norm_name = SwigType_namestr(Getattr(n, "name"));
-    String *swig_director_connect = Swig_name_member(getNSpace(), getClassPrefix(), "director_connect");
-    String *swig_director_connect_jni = makeValidJniName(swig_director_connect);
-    String *smartptr = Getattr(n, "feature:smartptr");
-    String *dirClassName = directorClassName(n);
-    Wrapper *code_wrap;
-
-    Printf(imclass_class_code, "  public final static native void %s(%s obj, long cptr, boolean mem_own, boolean weak_global);\n",
-	   swig_director_connect, full_proxy_class_name);
-
-    code_wrap = NewWrapper();
-    Printf(code_wrap->def,
-	   "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jswig_mem_own, "
-	   "jboolean jweak_global) {\n", jnipackage, jni_imclass_name, swig_director_connect_jni);
-
-    if (smartptr) {
-      Printf(code_wrap->code, "  %s *obj = *((%s **)&objarg);\n", smartptr, smartptr);
-      Printf(code_wrap->code, "  (void)jcls;\n");
-      Printf(code_wrap->code, "  // Keep a local instance of the smart pointer around while we are using the raw pointer\n");
-      Printf(code_wrap->code, "  // Avoids using smart pointer specific API.\n");
-      Printf(code_wrap->code, "  %s *director = dynamic_cast<%s *>(obj->operator->());\n", dirClassName, dirClassName);
-    }
-    else {
-      Printf(code_wrap->code, "  %s *obj = *((%s **)&objarg);\n", norm_name, norm_name);
-      Printf(code_wrap->code, "  (void)jcls;\n");
-      Printf(code_wrap->code, "  %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); 
-    }
-
-    Printf(code_wrap->code, "  if (director) {\n");
-    Printf(code_wrap->code, "    director->swig_connect_director(jenv, jself, jenv->GetObjectClass(jself), "
-	   "(jswig_mem_own == JNI_TRUE), (jweak_global == JNI_TRUE));\n");
-    Printf(code_wrap->code, "  }\n");
-    Printf(code_wrap->code, "}\n");
-
-    Wrapper_print(code_wrap, f_wrappers);
-    DelWrapper(code_wrap);
-
-    Delete(swig_director_connect_jni);
-    Delete(swig_director_connect);
-
-    // Output the swigReleaseOwnership, swigTakeOwnership methods:
-    String *changeown_method_name = Swig_name_member(getNSpace(), getClassPrefix(), "change_ownership");
-    String *changeown_jnimethod_name = makeValidJniName(changeown_method_name);
-
-    Printf(imclass_class_code, "  public final static native void %s(%s obj, long cptr, boolean take_or_release);\n", changeown_method_name, full_proxy_class_name);
-
-    code_wrap = NewWrapper();
-    Printf(code_wrap->def,
-	   "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jtake_or_release) {\n",
-	   jnipackage, jni_imclass_name, changeown_jnimethod_name);
-    Printf(code_wrap->code, "  %s *obj = *((%s **)&objarg);\n", norm_name, norm_name);
-    Printf(code_wrap->code, "  %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName);
-    Printf(code_wrap->code, "  (void)jcls;\n");
-    Printf(code_wrap->code, "  if (director) {\n");
-    Printf(code_wrap->code, "    director->swig_java_change_ownership(jenv, jself, jtake_or_release ? true : false);\n");
-    Printf(code_wrap->code, "  }\n");
-    Printf(code_wrap->code, "}\n");
-
-    Wrapper_print(code_wrap, f_wrappers);
-    DelWrapper(code_wrap);
-
-    Delete(changeown_method_name);
-    Delete(changeown_jnimethod_name);
-    Delete(norm_name);
-    Delete(dirClassName);
-    Delete(jni_imclass_name);
-  }
-
-  /*----------------------------------------------------------------------
-   * emitCodeTypemap()
-   *
-   * Output a code typemap that uses $methodname and $jnicall, as used
-   * in the directordisconnect, director_release and director_take
-   * typemaps.
-   *--------------------------------------------------------------------*/
-
-  void emitCodeTypemap(Node *n, bool derived, SwigType *lookup_type, const String *typemap, const String *methodname, const String *jnicall) {
-    const String *tm = NULL;
-    Node *tmattrs = NewHash();
-    String *lookup_tmname = NewString(typemap);
-    String *method_attr_name;
-    String *method_attr;
-
-    if (derived) {
-      Append(lookup_tmname, "_derived");
-    }
-
-    tm = typemapLookup(n, lookup_tmname, lookup_type, WARN_NONE, tmattrs);
-    method_attr_name = NewStringf("tmap:%s:%s", lookup_tmname, methodname);
-    method_attr = Getattr(tmattrs, method_attr_name);
-
-    if (*Char(tm)) {
-      if (method_attr) {
-	String *codebody = Copy(tm);
-	Replaceall(codebody, "$methodname", method_attr);
-	Replaceall(codebody, "$jnicall", jnicall);
-	Append(proxy_class_def, codebody);
-	Delete(codebody);
-      } else {
-	Swig_error(input_file, line_number, "No %s method name attribute for %s\n", lookup_tmname, proxy_class_name);
-      }
-    } else {
-      Swig_error(input_file, line_number, "No %s typemap for %s\n", lookup_tmname, proxy_class_name);
-    }
-
-    Delete(tmattrs);
-    Delete(lookup_tmname);
-    // Delete(method_attr);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substitutePackagePath()
-   *
-   * Replace $packagepath using the javapackage typemap associated with passed
-   * parm or global package if p is 0. "$packagepath/" is replaced with "" if
-   * no package is set. Note that the path separator is a '/'.
-   * ----------------------------------------------------------------------------- */
-
-  void substitutePackagePath(String *text, Parm *p) {
-    String *pkg_path= 0;
-
-    if (p)
-      pkg_path = Swig_typemap_lookup("javapackage", p, "", 0);
-    if (!pkg_path || Len(pkg_path) == 0)
-      pkg_path = Copy(package_path);
-
-    if (Len(pkg_path) > 0) {
-      Replaceall(pkg_path, ".", "/");
-      Replaceall(text, "$packagepath", pkg_path);
-    } else {
-      Replaceall(text, "$packagepath/", empty_string);
-      Replaceall(text, "$packagepath", empty_string);
-    }
-    Delete(pkg_path);
-  }
-
-  /* ---------------------------------------------------------------
-   * Canonicalize the JNI field descriptor
-   *
-   * Replace the $packagepath and $javaclassname family of special
-   * variables with the desired package and Java proxy name as 
-   * required in the JNI field descriptors.
-   * 
-   * !!SFM!! If $packagepath occurs in the field descriptor, but
-   * package_path isn't set (length == 0), then strip it and the
-   * optional trailing '/' from the resulting name.
-   * 
-   * --------------------------------------------------------------- */
-
-  String *canonicalizeJNIDescriptor(String *descriptor_in, Parm *p) {
-    SwigType *type = Getattr(p, "type");
-    String *descriptor_out = Copy(descriptor_in);
-
-    substituteClassname(type, descriptor_out, true);
-    substitutePackagePath(descriptor_out, p);
-
-    return descriptor_out;
-  }
-
-  /* ---------------------------------------------------------------
-   * classDirectorMethod()
-   *
-   * Emit a virtual director method to pass a method call on to the 
-   * underlying Java object.
-   *
-   * --------------------------------------------------------------- */
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    String *c_classname = Getattr(parent, "name");
-    String *name = Getattr(n, "name");
-    String *symname = Getattr(n, "sym:name");
-    SwigType *returntype = Getattr(n, "type");
-    String *overloaded_name = getOverloadedName(n);
-    String *storage = Getattr(n, "storage");
-    String *value = Getattr(n, "value");
-    String *decl = Getattr(n, "decl");
-    String *declaration = NewString("");
-    String *tm;
-    Parm *p;
-    int i;
-    Wrapper *w = NewWrapper();
-    ParmList *l = Getattr(n, "parms");
-    bool is_void = !(Cmp(returntype, "void"));
-    String *qualified_return = 0;
-    bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0")));
-    int status = SWIG_OK;
-    bool output_director = true;
-    String *dirclassname = directorClassName(parent);
-    String *qualified_name = NewStringf("%s::%s", dirclassname, name);
-    String *jnidesc = NewString("");
-    String *classdesc = NewString("");
-    String *jniret_desc = NewString("");
-    String *classret_desc = NewString("");
-    SwigType *c_ret_type = NULL;
-    String *jupcall_args = NewString("swigjobj");
-    String *imclass_dmethod;
-    String *callback_def = NewString("");
-    String *callback_code = NewString("");
-    String *imcall_args = NewString("");
-    int classmeth_off = curr_class_dmethod - first_class_dmethod;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-    String *qualified_classname = getProxyName(getClassName());
-
-    // Kludge Alert: functionWrapper sets sym:overload properly, but it
-    // isn't at this point, so we have to manufacture it ourselves. At least
-    // we're consistent with the sym:overload name in functionWrapper. (?? when
-    // does the overloaded method name get set?)
-
-    imclass_dmethod = NewStringf("%s", Swig_name_member(getNSpace(), dirclassname, overloaded_name));
-
-    qualified_return = SwigType_rcaststr(returntype, "c_result");
-
-    if (!is_void && (!ignored_method || pure_virtual)) {
-      if (!SwigType_isclass(returntype)) {
-	if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) {
-	  String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0));
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL);
-	  Delete(construct_result);
-	} else {
-	  String *base_typename = SwigType_base(returntype);
-	  String *resolved_typename = SwigType_typedef_resolve_all(base_typename);
-	  Symtab *symtab = Getattr(n, "sym:symtab");
-	  Node *typenode = Swig_symbol_clookup(resolved_typename, symtab);
-
-	  if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstracts"))) {
-	    /* initialize pointers to something sane. Same for abstract
-	       classes when a reference is returned. */
-	    Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
-	  } else {
-	    /* If returning a reference, initialize the pointer to a sane
-	       default - if a Java exception occurs, then the pointer returns
-	       something other than a NULL-initialized reference. */
-	    String *non_ref_type = Copy(returntype);
-
-	    /* Remove reference and const qualifiers */
-	    Replaceall(non_ref_type, "r.", "");
-	    Replaceall(non_ref_type, "q(const).", "");
-	    Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL);
-	    Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL);
-
-	    Delete(non_ref_type);
-	  }
-
-	  Delete(base_typename);
-	  Delete(resolved_typename);
-	}
-      } else {
-	SwigType *vt;
-
-	vt = cplus_value_type(returntype);
-	if (!vt) {
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL);
-	} else {
-	  Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL);
-	  Delete(vt);
-	}
-      }
-    }
-
-    /* Create the intermediate class wrapper */
-    tm = Swig_typemap_lookup("jtype", n, "", 0);
-    if (tm) {
-      Printf(callback_def, "  public static %s %s(%s jself", tm, imclass_dmethod, qualified_classname);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JTYPE_UNDEF, input_file, line_number, "No jtype typemap defined for %s\n", SwigType_str(returntype, 0));
-    }
-
-    String *cdesc = NULL;
-    SwigType *covariant = Getattr(n, "covariant");
-    SwigType *adjustedreturntype = covariant ? covariant : returntype;
-    Parm *adjustedreturntypeparm = NewParmNode(adjustedreturntype, n);
-
-    if (Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)
-	&& (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) {
-
-      // Note that in the case of polymorphic (covariant) return types, the
-      // method's return type is changed to be the base of the C++ return
-      // type
-      String *jnidesc_canon = canonicalizeJNIDescriptor(cdesc, adjustedreturntypeparm);
-      Append(classret_desc, jnidesc_canon);
-      Delete(jnidesc_canon);
-    } else {
-      Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-	  SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-      output_director = false;
-    }
-
-    /* Get the JNI field descriptor for this return type, add the JNI field descriptor
-       to jniret_desc */
-    if ((c_ret_type = Swig_typemap_lookup("jni", n, "", 0))) {
-      Parm *tp = NewParmNode(c_ret_type, n);
-
-      if (!is_void && !ignored_method) {
-	String *jretval_decl = NewStringf("%s jresult", c_ret_type);
-	Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL);
-	Delete(jretval_decl);
-      }
-
-      String *jdesc = NULL;
-      if (Swig_typemap_lookup("directorin", tp, "", 0)
-	  && (jdesc = Getattr(tp, "tmap:directorin:descriptor"))) {
-
-	// Objects marshalled passing a Java class across JNI boundary use jobject - the nouse flag indicates this
-	// We need the specific Java class name instead of the generic 'Ljava/lang/Object;'
-	if (GetFlag(tp, "tmap:directorin:nouse"))
-	  jdesc = cdesc;
-	String *jnidesc_canon = canonicalizeJNIDescriptor(jdesc, tp);
-	Append(jniret_desc, jnidesc_canon);
-	Delete(jnidesc_canon);
-      } else {
-	Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-		     "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-		     SwigType_str(c_ret_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	output_director = false;
-      }
-
-      Delete(tp);
-    } else {
-      Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s for use in %s::%s (skipping director method)\n", 
-	  SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-      output_director = false;
-    }
-
-    Delete(adjustedreturntypeparm);
-
-    Swig_director_parms_fixup(l);
-
-    /* Attach the standard typemaps */
-    Swig_typemap_attach_parms("out", l, 0);
-    Swig_typemap_attach_parms("jni", l, 0);
-    Swig_typemap_attach_parms("jtype", l, 0);
-    Swig_typemap_attach_parms("directorin", l, 0);
-    Swig_typemap_attach_parms("javadirectorin", l, 0);
-    Swig_typemap_attach_parms("directorargout", l, w);
-
-    if (!ignored_method) {
-      /* Add Java environment pointer to wrapper */
-      String *jenvstr = NewString("jenv");
-      String *jobjstr = NewString("swigjobj");
-
-      Wrapper_add_localv(w, "swigjnienv", "JNIEnvWrapper", "swigjnienv(this)", NIL, NIL);
-      Wrapper_add_localv(w, jenvstr, "JNIEnv *", jenvstr, "= swigjnienv.getJNIEnv()", NIL);
-      Wrapper_add_localv(w, jobjstr, "jobject", jobjstr, "= (jobject) NULL", NIL);
-      Delete(jenvstr);
-      Delete(jobjstr);
-
-      /* Preamble code */
-      Printf(w->code, "if (!swig_override[%d]) {\n", classmeth_off);
-    }
-
-    if (!pure_virtual) {
-      String *super_call = Swig_method_call(super, l);
-      if (is_void) {
-	Printf(w->code, "%s;\n", super_call);
-	if (!ignored_method)
-	  Printf(w->code, "return;\n");
-      } else {
-	Printf(w->code, "return %s;\n", super_call);
-      }
-      Delete(super_call);
-    } else {
-      Printf(w->code, "SWIG_JavaThrowException(JNIEnvWrapper(this).getJNIEnv(), SWIG_JavaDirectorPureVirtual, ");
-      Printf(w->code, "\"Attempted to invoke pure virtual method %s::%s.\");\n", SwigType_namestr(c_classname), SwigType_namestr(name));
-
-      /* Make sure that we return something in the case of a pure
-       * virtual method call for syntactical reasons. */
-      if (!is_void)
-	Printf(w->code, "return %s;", qualified_return);
-      else if (!ignored_method)
-	Printf(w->code, "return;\n");
-    }
-
-    if (!ignored_method) {
-      Printf(w->code, "}\n");
-      Printf(w->code, "swigjobj = swig_get_self(jenv);\n");
-      Printf(w->code, "if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {\n");
-    }
-
-    /* Start the Java field descriptor for the intermediate class's upcall (insert jself object) */
-    Parm *tp = NewParmNode(c_classname, n);
-    String *jdesc;
-
-    if ((tm = Swig_typemap_lookup("directorin", tp, "", 0))
-	&& (jdesc = Getattr(tp, "tmap:directorin:descriptor"))) {
-      String *jni_canon = canonicalizeJNIDescriptor(jdesc, tp);
-      Append(jnidesc, jni_canon);
-      Delete(jni_canon);
-      Delete(tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-		   "No or improper directorin typemap for type %s  for use in %s::%s (skipping director method)\n", 
-		   SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-      output_director = false;
-    }
-
-    Delete(tp);
-
-    /* Go through argument list, convert from native to Java */
-    for (i = 0, p = l; p; ++i) {
-      /* Is this superfluous? */
-      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
-	p = Getattr(p, "tmap:directorin:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = makeParameterName(n, p, i, false);
-      String *c_param_type = NULL;
-      String *c_decl = NewString("");
-      String *arg = NewString("");
-
-      Printf(arg, "j%s", ln);
-
-      /* Add various typemap's 'throws' clauses */
-      addThrows(n, "tmap:directorin", p);
-      addThrows(n, "tmap:out", p);
-
-      /* And add to the upcall args */
-      Printf(jupcall_args, ", %s", arg);
-
-      /* Get parameter's intermediary C type */
-      if ((c_param_type = Getattr(p, "tmap:jni"))) {
-	Parm *tp = NewParm(c_param_type, Getattr(p, "name"), n);
-	String *desc_tm = NULL, *jdesc = NULL, *cdesc = NULL;
-
-	/* Add to local variables */
-	Printf(c_decl, "%s %s", c_param_type, arg);
-	if (!ignored_method)
-	  Wrapper_add_localv(w, arg, c_decl, (!(SwigType_ispointer(pt) || SwigType_isreference(pt)) ? "" : "= 0"), NIL);
-
-	/* Add input marshalling code and update JNI field descriptor */
-	if ((desc_tm = Swig_typemap_lookup("directorin", tp, "", 0))
-	    && (jdesc = Getattr(tp, "tmap:directorin:descriptor"))
-	    && (tm = Getattr(p, "tmap:directorin"))
-	    && (cdesc = Getattr(p, "tmap:directorin:descriptor"))) {
-
-	  // Objects marshalled by passing a Java class across the JNI boundary use jobject as the JNI type - 
-	  // the nouse flag indicates this. We need the specific Java class name instead of the generic 'Ljava/lang/Object;'
-	  if (GetFlag(tp, "tmap:directorin:nouse"))
-	    jdesc = cdesc;
-	  String *jni_canon = canonicalizeJNIDescriptor(jdesc, tp);
-	  Append(jnidesc, jni_canon);
-	  Delete(jni_canon);
-
-	  Setattr(p, "emit:directorinput", arg);
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$owner", "0");
-
-	  if (Len(tm))
-	    if (!ignored_method)
-	      Printf(w->code, "%s\n", tm);
-
-	  /* Add parameter to the intermediate class code if generating the
-	   * intermediate's upcall code */
-	  if ((tm = Getattr(p, "tmap:jtype"))) {
-	    String *din = Copy(Getattr(p, "tmap:javadirectorin"));
-            addThrows(n, "tmap:javadirectorin", p);
-
-	    if (din) {
-	      Replaceall(din, "$module", module_class_name);
-	      Replaceall(din, "$imclassname", imclass_name);
-	      substituteClassname(pt, din);
-	      Replaceall(din, "$jniinput", ln);
-
-	      if (i > 0)
-		Printf(imcall_args, ", ");
-	      Printf(callback_def, ", %s %s", tm, ln);
-
-	      if (Cmp(din, ln)) {
-		Printv(imcall_args, din, NIL);
-	      } else
-		Printv(imcall_args, ln, NIL);
-
-	      jni_canon = canonicalizeJNIDescriptor(cdesc, p);
-	      Append(classdesc, jni_canon);
-	      Delete(jni_canon);
-	    } else {
-	      Swig_warning(WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF, input_file, line_number, "No javadirectorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-		  SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	      output_director = false;
-	    }
-	  } else {
-	    Swig_warning(WARN_JAVA_TYPEMAP_JTYPE_UNDEF, input_file, line_number, "No jtype typemap defined for %s for use in %s::%s (skipping director method)\n", 
-		SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    output_director = false;
-	  }
-
-	  p = Getattr(p, "tmap:directorin:next");
-
-	  Delete(desc_tm);
-	} else {
-	  if (!desc_tm) {
-	    Swig_warning(WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF, input_file, line_number,
-			 "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-			 SwigType_str(c_param_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    p = nextSibling(p);
-	  } else if (!jdesc) {
-	    Swig_warning(WARN_JAVA_TYPEMAP_DIRECTORIN_NODESC, input_file, line_number,
-			 "Missing JNI descriptor in directorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-			 SwigType_str(c_param_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    p = Getattr(p, "tmap:directorin:next");
-	  } else if (!tm) {
-	    Swig_warning(WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF, input_file, line_number,
-			 "No or improper directorin typemap defined for argument %s for use in %s::%s (skipping director method)\n", 
-			 SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    p = nextSibling(p);
-	  } else if (!cdesc) {
-	    Swig_warning(WARN_JAVA_TYPEMAP_DIRECTORIN_NODESC, input_file, line_number,
-			 "Missing JNI descriptor in directorin typemap defined for %s for use in %s::%s (skipping director method)\n", 
-			 SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    p = Getattr(p, "tmap:directorin:next");
-	  }
-
-	  output_director = false;
-	}
-
-      } else {
-	Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s for use in %s::%s (skipping director method)\n", 
-	    SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	output_director = false;
-	p = nextSibling(p);
-      }
-
-      Delete(arg);
-      Delete(c_decl);
-      Delete(ln);
-    }
-
-    /* header declaration, start wrapper definition */
-    String *target;
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Add any exception specifications to the methods in the director class
-    // Get any Java exception classes in the throws typemap
-    ParmList *throw_parm_list = NULL;
-
-    // May need to add Java throws clause to director methods if %catches defined
-    // Get any Java exception classes in the throws typemap
-    ParmList *catches_list = Getattr(n, "catchlist");
-    if (catches_list) {
-      Swig_typemap_attach_parms("throws", catches_list, 0);
-      Swig_typemap_attach_parms("directorthrows", catches_list, 0);
-      for (p = catches_list; p; p = nextSibling(p)) {
-	addThrows(n, "tmap:throws", p);
-      }
-    }
-
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list) {
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-	Swig_typemap_attach_parms("directorthrows", throw_parm_list, 0);
-      }
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  // %catches replaces the specified exception specification
-	  if (!catches_list) {
-	    addThrows(n, "tmap:throws", p);
-	  }
-
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-
-	  Printf(w->def, "%s", SwigType_str(Getattr(p, "type"), 0));
-	  Printf(declaration, "%s", SwigType_str(Getattr(p, "type"), 0));
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    /* Emit the intermediate class's upcall to the actual class */
-
-    String *upcall = NewStringf("jself.%s(%s)", symname, imcall_args);
-
-    // Handle exception classes specified in the "except" feature's "throws" attribute
-    addThrows(n, "feature:except", n);
-
-    if (!is_void) {
-      if ((tm = Swig_typemap_lookup("javadirectorout", n, "", 0))) {
-        addThrows(n, "tmap:javadirectorout", n);
-	substituteClassname(returntype, tm);
-	Replaceall(tm, "$javacall", upcall);
-
-	Printf(callback_code, "    return %s;\n", tm);
-      }
-
-      if ((tm = Swig_typemap_lookup("out", n, "", 0)))
-        addThrows(n, "tmap:out", n);
-
-      Delete(tm);
-    } else
-      Printf(callback_code, "    %s;\n", upcall);
-
-    Printf(callback_code, "  }\n");
-    Delete(upcall);
-
-    /* Finish off the inherited upcall's definition */
-    Putc(')', callback_def);
-    generateThrowsClause(n, callback_def);
-    Printf(callback_def, " {\n");
-
-    if (!ignored_method) {
-      /* Emit the actual upcall through */
-      String *imclass_desc = NewStringf("(%s)%s", jnidesc, jniret_desc);
-      String *class_desc = NewStringf("(%s)%s", classdesc, classret_desc);
-      UpcallData *udata = addUpcallMethod(imclass_dmethod, symname, imclass_desc, class_desc, decl);
-      String *methid = Getattr(udata, "imclass_methodidx");
-      String *methop = getUpcallJNIMethod(jniret_desc);
-
-      if (!is_void)
-	Printf(w->code, "jresult = (%s) ", c_ret_type);
-
-      Printf(w->code, "jenv->%s(Swig::jclass_%s, Swig::director_method_ids[%s], %s);\n", methop, imclass_name, methid, jupcall_args);
-
-      // Generate code to handle any Java exception thrown by director delegation
-      directorExceptHandler(n, catches_list ? catches_list : throw_parm_list, w);
-
-      if (!is_void) {
-	String *jresult_str = NewString("jresult");
-	String *result_str = NewString("c_result");
-
-	/* Copy jresult into c_result... */
-	if ((tm = Swig_typemap_lookup("directorout", n, result_str, w))) {
-	  addThrows(n, "tmap:directorout", n);
-	  Replaceall(tm, "$input", jresult_str);
-	  Replaceall(tm, "$result", result_str);
-	  Printf(w->code, "%s\n", tm);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use return type %s used in %s::%s (skipping director method)\n", 
-		       SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	  output_director = false;
-	}
-
-	Delete(jresult_str);
-	Delete(result_str);
-      }
-
-      /* Marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout"))) {
-	  addThrows(n, "tmap:directorargout", p);
-	  Replaceall(tm, "$result", makeParameterName(n, p, i, false));
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      Delete(imclass_desc);
-      Delete(class_desc);
-
-      /* Terminate wrapper code */
-      Printf(w->code, "} else {\n");
-      Printf(w->code, "SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"null upcall object in %s::%s \");\n",
-	     SwigType_namestr(c_classname), SwigType_namestr(name));
-      Printf(w->code, "}\n");
-
-      Printf(w->code, "if (swigjobj) jenv->DeleteLocalRef(swigjobj);\n");
-
-      if (!is_void)
-	Printf(w->code, "return %s;", qualified_return);
-    }
-
-    Printf(w->code, "}");
-
-    // We expose virtual protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK && output_director) {
-      if (!is_void) {
-	Replaceall(w->code, "$null", qualified_return);
-      } else {
-	Replaceall(w->code, "$null", "");
-      }
-      if (!GetFlag(n, "feature:ignore"))
-	Printv(imclass_directors, callback_def, callback_code, NIL);
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    Delete(inline_extra_method);
-    Delete(qualified_return);
-    Delete(jnidesc);
-    Delete(c_ret_type);
-    Delete(jniret_desc);
-    Delete(declaration);
-    Delete(callback_def);
-    Delete(callback_code);
-    DelWrapper(w);
-
-    return status;
-  }
-
-  /* ------------------------------------------------------------
-   * directorExceptHandler()
-   *
-   * Emit code to map Java exceptions back to C++ exceptions when
-   * feature("director:except") is applied to a method node.
-   * This is generated after the Java method upcall.
-   * ------------------------------------------------------------ */
-
-  void directorExceptHandler(Node *n, ParmList *throw_parm_list, Wrapper *w) {
-
-    String *directorexcept = Getattr(n, "feature:director:except");
-    if (!directorexcept) {
-      directorexcept = NewString("");
-      Printf(directorexcept, "jthrowable $error = jenv->ExceptionOccurred();\n");
-      Printf(directorexcept, "if ($error) {\n");
-      Printf(directorexcept, "  jenv->ExceptionClear();$directorthrowshandlers\n");
-      Printf(directorexcept, "  throw Swig::DirectorException(jenv, $error);\n");
-      Printf(directorexcept, "}\n");
-    } else {
-      directorexcept = Copy(directorexcept);
-    }
-
-    // Can explicitly disable director:except by setting to "" or "0"
-    if (Len(directorexcept) > 0 && Cmp(directorexcept, "0") != 0) {
-
-      // Replace $packagepath
-      substitutePackagePath(directorexcept, 0);
-
-      // Replace $directorthrowshandlers with any defined typemap handlers (or nothing)
-      if (Strstr(directorexcept, "$directorthrowshandlers")) {
-	String *directorthrowshandlers_code = NewString("");
-
-	for (Parm *p = throw_parm_list; p; p = nextSibling(p)) {
-	  String *tm = Getattr(p, "tmap:directorthrows");
-
-	  if (tm) {
-	    // replace $packagepath/$javaclassname
-	    String *directorthrows = canonicalizeJNIDescriptor(tm, p);
-	    Printv(directorthrowshandlers_code, directorthrows, NIL);
-	    Delete(directorthrows);
-	  } else {
-	    String *t = Getattr(p,"type");
-	    Swig_warning(WARN_TYPEMAP_DIRECTORTHROWS_UNDEF, Getfile(n), Getline(n), "No directorthrows typemap defined for %s\n", SwigType_str(t, 0));
-	  }
-	}
-	Replaceall(directorexcept, "$directorthrowshandlers", directorthrowshandlers_code);
-	Delete(directorthrowshandlers_code);
-      }
-
-      Replaceall(directorexcept, "$error", "swigerror");
-      Printf(w->code, "    %s\n", directorexcept);
-    }
-    Delete(directorexcept);
-  }
-
-  /* ------------------------------------------------------------
-   * directorPrefixArgs()
-   * ------------------------------------------------------------ */
-
-  void directorPrefixArgs(Node *n) {
-    Parm *p;
-
-    /* Need to prepend 'jenv' to the director constructor's argument list */
-
-    String *jenv_type = NewString("JNIEnv");
-
-    SwigType_add_pointer(jenv_type);
-
-    p = NewParm(jenv_type, NewString("jenv"), n);
-    Setattr(p, "arg:byname", "1");
-    set_nextSibling(p, NULL);
-
-    Setattr(n, "director:prefix_args", p);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = parentNode(n);
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *dirclassname = directorClassName(parent);
-    String *sub = NewString("");
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms;
-    int argidx = 0;
-
-    /* Assign arguments to superclass's parameters, if not already done */
-    for (p = superparms; p; p = nextSibling(p)) {
-      String *pname = Getattr(p, "name");
-
-      if (!pname) {
-	pname = NewStringf("arg%d", argidx++);
-	Setattr(p, "name", pname);
-      }
-    }
-
-    /* insert jenv prefix argument */
-    parms = CopyParmList(superparms);
-
-    String *jenv_type = NewString("JNIEnv");
-    SwigType_add_pointer(jenv_type);
-    p = NewParm(jenv_type, NewString("jenv"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    directorPrefixArgs(n);
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
-	String *call = Swig_csuperclass_call(0, basetype, superparms);
-	String *classtype = SwigType_namestr(Getattr(n, "name"));
-
-	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
-	Printf(f_directors, "}\n\n");
-
-	Delete(classtype);
-	Delete(target);
-	Delete(call);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(supername);
-    Delete(jenv_type);
-    Delete(parms);
-    Delete(dirclassname);
-    return Language::classDirectorConstructor(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDefaultConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorDefaultConstructor(Node *n) {
-    String *classname = Swig_class_name(n);
-    String *classtype = SwigType_namestr(Getattr(n, "name"));
-    String *dirClassName = directorClassName(n);
-    Wrapper *w = NewWrapper();
-
-    Printf(w->def, "%s::%s(JNIEnv *jenv) : %s {", dirClassName, dirClassName, Getattr(n, "director:ctor"));
-    Printf(w->code, "}\n");
-    Wrapper_print(w, f_directors);
-
-    Printf(f_directors_h, "    %s(JNIEnv *jenv);\n", dirClassName);
-    DelWrapper(w);
-    Delete(classtype);
-    Delete(classname);
-    Delete(dirClassName);
-    directorPrefixArgs(n);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * classDirectorInit()
-   * ------------------------------------------------------------ */
-
-  int classDirectorInit(Node *n) {
-    Delete(none_comparison);
-    none_comparison = NewString("");	// not used
-
-    Delete(director_ctor_code);
-    director_ctor_code = NewString("$director_new");
-
-    directorDeclaration(n);
-
-    Printf(f_directors_h, "%s {\n", Getattr(n, "director:decl"));
-    Printf(f_directors_h, "\npublic:\n");
-    Printf(f_directors_h, "    void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global);\n");
-
-    /* Keep track of the director methods for this class */
-    first_class_dmethod = curr_class_dmethod = n_dmethods;
-
-    return Language::classDirectorInit(n);
-  }
-
-  /* ----------------------------------------------------------------------
-   * classDirectorDestructor()
-   * ---------------------------------------------------------------------- */
-
-  int classDirectorDestructor(Node *n) {
-    Node *current_class = getCurrentClass();
-    String *full_classname = Getattr(current_class, "name");
-    String *classname = Swig_class_name(current_class);
-    String *dirClassName = directorClassName(current_class);
-    Wrapper *w = NewWrapper();
-
-    if (Getattr(n, "throw")) {
-      Printf(f_directors_h, "    virtual ~%s() throw ();\n", dirClassName);
-      Printf(w->def, "%s::~%s() throw () {\n", dirClassName, dirClassName);
-    } else {
-      Printf(f_directors_h, "    virtual ~%s();\n", dirClassName);
-      Printf(w->def, "%s::~%s() {\n", dirClassName, dirClassName);
-    }
-
-    /* Ensure that correct directordisconnect typemap's method name is called
-     * here: */
-
-    Node *disconn_attr = NewHash();
-    String *disconn_methodname = NULL;
-
-    typemapLookup(n, "directordisconnect", full_classname, WARN_NONE, disconn_attr);
-    disconn_methodname = Getattr(disconn_attr, "tmap:directordisconnect:methodname");
-
-    Printv(w->code, "  swig_disconnect_director_self(\"", disconn_methodname, "\");\n", "}\n", NIL);
-
-    Wrapper_print(w, f_directors);
-
-    DelWrapper(w);
-    Delete(disconn_attr);
-    Delete(classname);
-    Delete(dirClassName);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorEnd()
-   * ------------------------------------------------------------ */
-
-  int classDirectorEnd(Node *n) {
-    String *full_classname = Getattr(n, "name");
-    String *classname = getProxyName(full_classname, true);
-    String *director_classname = directorClassName(n);
-    String *internal_classname;
-
-    Wrapper *w = NewWrapper();
-
-    if (Len(package_path) > 0)
-      internal_classname = NewStringf("%s/%s", package_path, classname);
-    else
-      internal_classname = NewStringf("%s", classname);
-
-    // If the namespace is multiple levels, the result of getNSpace() will have inserted
-    // .'s to delimit namespaces, so we need to replace those with /'s
-    Replace(internal_classname, NSPACE_SEPARATOR, "/", DOH_REPLACE_ANY);
-
-    Wrapper_add_localv(w, "baseclass", "static jclass baseclass", "= 0", NIL);
-    Printf(w->def, "void %s::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {", director_classname);
-
-    if (first_class_dmethod != curr_class_dmethod) {
-      Printf(w->def, "static struct {\n");
-      Printf(w->def, "const char *mname;\n");
-      Printf(w->def, "const char *mdesc;\n");
-      Printf(w->def, "jmethodID base_methid;\n");
-      Printf(w->def, "} methods[] = {\n");
-
-      for (int i = first_class_dmethod; i < curr_class_dmethod; ++i) {
-	UpcallData *udata = Getitem(dmethods_seq, i);
-
-	Printf(w->def, "{ \"%s\", \"%s\", NULL }", Getattr(udata, "method"), Getattr(udata, "fdesc"));
-	if (i != curr_class_dmethod - 1)
-	  Putc(',', w->def);
-	Putc('\n', w->def);
-      }
-
-      Printf(w->def, "};\n");
-    }
-
-    Printf(w->code, "if (swig_set_self(jenv, jself, swig_mem_own, weak_global)) {\n");
-    Printf(w->code, "if (!baseclass) {\n");
-    Printf(w->code, "baseclass = jenv->FindClass(\"%s\");\n", internal_classname);
-    Printf(w->code, "if (!baseclass) return;\n");
-    Printf(w->code, "baseclass = (jclass) jenv->NewGlobalRef(baseclass);\n");
-    Printf(w->code, "}\n");
-
-    int n_methods = curr_class_dmethod - first_class_dmethod;
-
-    if (n_methods) {
-      /* Emit the swig_overrides() method and the swig_override array */
-      Printf(f_directors_h, "public:\n");
-      Printf(f_directors_h, "    bool swig_overrides(int n) {\n");
-      Printf(f_directors_h, "      return (n < %d ? swig_override[n] : false);\n", n_methods);
-      Printf(f_directors_h, "    }\n");
-      Printf(f_directors_h, "protected:\n");
-      Printf(f_directors_h, "    Swig::BoolArray<%d> swig_override;\n", n_methods);
-
-      /* Emit the code to look up the class's methods, initialize the override array */
-
-      Printf(w->code, "bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);\n");
-      Printf(w->code, "for (int i = 0; i < %d; ++i) {\n", n_methods);
-      Printf(w->code, "  if (!methods[i].base_methid) {\n");
-      Printf(w->code, "    methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);\n");
-      Printf(w->code, "    if (!methods[i].base_methid) return;\n");
-      Printf(w->code, "  }\n");
-      // Generally, derived classes have a mix of overridden and
-      // non-overridden methods and it is worth making a GetMethodID
-      // check during initialization to determine if each method is
-      // overridden, thus avoiding unnecessary calls into Java.
-      //
-      // On the other hand, when derived classes are
-      // expected to override all director methods then the
-      // GetMethodID calls are inefficient, and it is better to let
-      // the director unconditionally call up into Java.  The resulting code
-      // will still behave correctly (though less efficiently) when Java
-      // code doesn't override a given method.
-      //
-      // The assumeoverride feature on a director controls whether or not
-      // overrides are assumed.
-      if (GetFlag(n, "feature:director:assumeoverride")) {
-        Printf(w->code, "  swig_override[i] = derived;\n");
-      } else {
-        Printf(w->code, "  swig_override[i] = false;\n");
-        Printf(w->code, "  if (derived) {\n");
-        Printf(w->code, "    jmethodID methid = jenv->GetMethodID(jcls, methods[i].mname, methods[i].mdesc);\n");
-        Printf(w->code, "    swig_override[i] = (methid != methods[i].base_methid);\n");
-        Printf(w->code, "    jenv->ExceptionClear();\n");
-        Printf(w->code, "  }\n");
-      }
-      Printf(w->code, "}\n");
-    } else {
-      Printf(f_directors_h, "public:\n");
-      Printf(f_directors_h, "    bool swig_overrides(int n) {\n");
-      Printf(f_directors_h, "      return false;\n");
-      Printf(f_directors_h, "    }\n");
-    }
-
-    Printf(f_directors_h, "};\n\n");
-    Printf(w->code, "}\n");
-    Printf(w->code, "}\n");
-
-    Wrapper_print(w, f_directors);
-
-    DelWrapper(w);
-    Delete(internal_classname);
-
-    return Language::classDirectorEnd(n);
-  }
-
-  /* --------------------------------------------------------------------
-   * classDirectorDisown()
-   * ------------------------------------------------------------------*/
-
-  virtual int classDirectorDisown(Node *n) {
-    (void) n;
-    return SWIG_OK;
-  }
-
-  /*----------------------------------------------------------------------
-   * extraDirectorProtectedCPPMethodsRequired()
-   *--------------------------------------------------------------------*/
-
-  bool extraDirectorProtectedCPPMethodsRequired() const {
-    return false;
-  }
-
-  /*----------------------------------------------------------------------
-   * directorDeclaration()
-   *
-   * Generate the director class's declaration
-   * e.g. "class SwigDirector_myclass : public myclass, public Swig::Director {"
-   *--------------------------------------------------------------------*/
-
-  void directorDeclaration(Node *n) {
-    String *base = Getattr(n, "classtype");
-    String *class_ctor = NewString("Swig::Director(jenv)");
-
-    String *directorname = directorClassName(n);
-    String *declaration = Swig_class_declaration(n, directorname);
-
-    Printf(declaration, " : public %s, public Swig::Director", base);
-
-    // Stash stuff for later.
-    Setattr(n, "director:decl", declaration);
-    Setattr(n, "director:ctor", class_ctor);
-  }
-
-  /*----------------------------------------------------------------------
-   * nestedClassesSupport()
-   *--------------------------------------------------------------------*/
-
-  NestedClassSupport nestedClassesSupport() const {
-    return NCS_Full;
-  }
-};				/* class JAVA */
-
-/* -----------------------------------------------------------------------------
- * swig_java()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_java() {
-  return new JAVA();
-}
-extern "C" Language *swig_java(void) {
-  return new_swig_java();
-}
-
-/* -----------------------------------------------------------------------------
- * Static member variables
- * ----------------------------------------------------------------------------- */
-
-const char *JAVA::usage = "\
-Java Options (available with -java)\n\
-     -nopgcpp        - Suppress premature garbage collection prevention parameter\n\
-     -noproxy        - Generate the low-level functional interface instead\n\
-                       of proxy classes\n\
-     -oldvarnames    - Old intermediary method names for variable wrappers\n\
-     -package <name> - Set name of the Java package to <name>\n\
-\n";
diff --git a/dependencies2013/win32/swig/Source/Modules/javascript.cxx b/dependencies2013/win32/swig/Source/Modules/javascript.cxx
deleted file mode 100644
index 4e7a7912..00000000
--- a/dependencies2013/win32/swig/Source/Modules/javascript.cxx
+++ /dev/null
@@ -1,2462 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * javascript.cxx
- *
- * Javascript language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-
-/**
- * Enables extra debugging information in typemaps.
- */
-static bool js_template_enable_debug = false;
-
-#define ERR_MSG_ONLY_ONE_ENGINE_PLEASE "Only one engine can be specified at a time."
-
-// keywords used for state variables
-#define NAME "name"
-#define NAME_MANGLED "name_mangled"
-#define TYPE "type"
-#define TYPE_MANGLED "type_mangled"
-#define WRAPPER_NAME "wrapper"
-#define IS_IMMUTABLE "is_immutable"
-#define IS_STATIC "is_static"
-#define IS_ABSTRACT "is_abstract"
-#define GETTER "getter"
-#define SETTER "setter"
-#define PARENT "parent"
-#define CTOR "ctor"
-#define CTOR_WRAPPERS "ctor_wrappers"
-#define CTOR_DISPATCHERS "ctor_dispatchers"
-#define DTOR "dtor"
-#define ARGCOUNT "wrap:argc"
-#define HAS_TEMPLATES "has_templates"
-#define FORCE_CPP "force_cpp"
-#define RESET true
-
-// keys for global state variables
-#define CREATE_NAMESPACES "create_namespaces"
-#define REGISTER_NAMESPACES "register_namespaces"
-#define INITIALIZER "initializer"
-
-// keys for class scoped state variables
-#define MEMBER_VARIABLES "member_variables"
-#define MEMBER_FUNCTIONS "member_functions"
-#define STATIC_FUNCTIONS "static_functions"
-#define STATIC_VARIABLES "static_variables"
-
-
-/**
- * A convenience class to manage state variables for emitters.
- * The implementation delegates to SWIG Hash DOHs and provides
- * named sub-hashes for class, variable, and function states.
- */
-class JSEmitterState {
-
-public:
-  JSEmitterState();
-  ~JSEmitterState();
-  DOH *globals();
-  DOH *globals(const char *key, DOH *initial = 0);
-  DOH *clazz(bool reset = false);
-  DOH *clazz(const char *key, DOH *initial = 0);
-  DOH *function(bool reset = false);
-  DOH *function(const char *key, DOH *initial = 0);
-  DOH *variable(bool reset = false);
-  DOH *variable(const char *key, DOH *initial = 0);
-  static int IsSet(DOH *val);
-
-private:
-  DOH *getState(const char *key, bool reset = false);
-  Hash *globalHash;
-};
-
-/**
- * A convenience class that wraps a code snippet used as template
- * for code generation.
- */
-class Template {
-
-public:
-  Template(const String *code);
-  Template(const String *code, const String *templateName);
-  Template(const Template & other);
-  ~Template();
-  String *str();
-  Template & replace(const String *pattern, const String *repl);
-  Template & print(DOH *doh);
-  Template & pretty_print(DOH *doh);
-  void operator=(const Template & t);
-  Template & trim();
-
-private:
-  String *code;
-  String *templateName;
-};
-
-/**
- * JSEmitter represents an abstraction of javascript code generators
- * for different javascript engines.
- **/
-class JSEmitter {
-
-protected:
-
-  typedef JSEmitterState State;
-
-  enum MarshallingMode {
-    Setter,
-    Getter,
-    Ctor,
-    Function
-  };
-
-public:
-
-   enum JSEngine {
-     JavascriptCore,
-     V8,
-     NodeJS
-   };
-
-   JSEmitter(JSEngine engine);
-
-   virtual ~ JSEmitter();
-
-  /**
-   * Opens output files and temporary output DOHs.
-   */
-  virtual int initialize(Node *n);
-
-  /**
-   * Writes all collected code into the output file(s).
-   */
-  virtual int dump(Node *n) = 0;
-
-  /**
-   * Cleans up all open output DOHs.
-   */
-  virtual int close() = 0;
-
-  /**
-   * Switches the context for code generation.
-   *
-   * Classes, global variables and global functions may need to
-   * be registered in certain static tables.
-   * This method should be used to switch output DOHs correspondingly.
-   */
-  virtual int switchNamespace(Node *);
-
-  /**
-   * Invoked at the beginning of the classHandler.
-   */
-  virtual int enterClass(Node *);
-
-  /**
-   * Invoked at the end of the classHandler.
-   */
-  virtual int exitClass(Node *) {
-    return SWIG_OK;
-  };
-
-  /**
-   * Invoked at the beginning of the variableHandler.
-   */
-  virtual int enterVariable(Node *);
-
-  /**
-   * Invoked at the end of the variableHandler.
-   */
-  virtual int exitVariable(Node *) {
-    return SWIG_OK;
-  };
-
-  /**
-   * Invoked at the beginning of the functionHandler.
-   */
-  virtual int enterFunction(Node *);
-
-  /**
-   * Invoked at the end of the functionHandler.
-   */
-  virtual int exitFunction(Node *) {
-    return SWIG_OK;
-  };
-
-  /**
-   * Invoked by functionWrapper callback after call to Language::functionWrapper.
-   */
-  virtual int emitWrapperFunction(Node *n);
-
-  /**
-   * Invoked from constantWrapper after call to Language::constantWrapper.
-   **/
-  virtual int emitConstant(Node *n);
-
-  /**
-   * Registers a given code snippet for a given key name.
-   *
-   * This method is called by the fragmentDirective handler
-   * of the JAVASCRIPT language module.
-   **/
-  int registerTemplate(const String *name, const String *code);
-
-  /**
-   * Retrieve the code template registered for a given name.
-   */
-  Template getTemplate(const String *name);
-
-  State & getState();
-
-protected:
-
-  /**
-   * Generates code for a constructor function.
-   */
-  virtual int emitCtor(Node *n);
-
-  /**
-   * Generates code for a destructor function.
-   */
-  virtual int emitDtor(Node *n);
-
-  /**
-   * Generates code for a function.
-   */
-  virtual int emitFunction(Node *n, bool is_member, bool is_static);
-
-  virtual int emitFunctionDispatcher(Node *n, bool /*is_member */ );
-
-  /**
-   * Generates code for a getter function.
-   */
-  virtual int emitGetter(Node *n, bool is_member, bool is_static);
-
-  /**
-   * Generates code for a setter function.
-   */
-  virtual int emitSetter(Node *n, bool is_member, bool is_static);
-
-  virtual void marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) = 0;
-
-  virtual String *emitInputTypemap(Node *n, Parm *params, Wrapper *wrapper, String *arg);
-
-  virtual void marshalOutput(Node *n, ParmList *params, Wrapper *wrapper, String *actioncode, const String *cresult = 0, bool emitReturnVariable = true);
-
-  virtual void emitCleanupCode(Node *n, Wrapper *wrapper, ParmList *params);
-
-  /**
-   * Helper function to retrieve the first parent class node.
-   */
-  Node *getBaseClass(Node *n);
-
-  Parm *skipIgnoredArgs(Parm *p);
-
-  virtual int createNamespace(String *scope);
-
-  virtual Hash *createNamespaceEntry(const char *name, const char *parent);
-
-  virtual int emitNamespaces() = 0;
-
-
-protected:
-
-  JSEngine engine;
-  Hash *templates;
-  State state;
-
-  // contains context specific data (DOHs)
-  // to allow generation of namespace related code
-  // which are switched on namespace change
-  Hash *namespaces;
-  Hash *current_namespace;
-  String *defaultResultName;
-  File *f_wrappers;
-};
-
-/* factory methods for concrete JSEmitters: */
-
-JSEmitter *swig_javascript_create_JSCEmitter();
-JSEmitter *swig_javascript_create_V8Emitter();
-JSEmitter *swig_javascript_create_NodeJSEmitter();
-
-/**********************************************************************
- * JAVASCRIPT: SWIG module implementation
- **********************************************************************/
-
-class JAVASCRIPT:public Language {
-
-public:
-
-  JAVASCRIPT():emitter(NULL) {
-  }
-  ~JAVASCRIPT() {
-    delete emitter;
-  }
-
-  virtual int functionHandler(Node *n);
-  virtual int globalfunctionHandler(Node *n);
-  virtual int variableHandler(Node *n);
-  virtual int globalvariableHandler(Node *n);
-  virtual int staticmemberfunctionHandler(Node *n);
-  virtual int classHandler(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int constantWrapper(Node *n);
-  virtual void main(int argc, char *argv[]);
-  virtual int top(Node *n);
-
-  /**
-   *  Registers all %fragments assigned to section "templates".
-   **/
-  virtual int fragmentDirective(Node *n);
-
-public:
-
-  virtual String *getNSpace() const;
-
-private:
-
-  JSEmitter *emitter;
-};
-
-/* ---------------------------------------------------------------------
- * functionWrapper()
- *
- * Low level code generator for functions
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::functionWrapper(Node *n) {
-
-  // note: the default implementation only prints a message
-  // Language::functionWrapper(n);
-  emitter->emitWrapperFunction(n);
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * functionHandler()
- *
- * Function handler for generating wrappers for functions
- * --------------------------------------------------------------------- */
-int JAVASCRIPT::functionHandler(Node *n) {
-
-  if (GetFlag(n, "isextension") == 1) {
-    SetFlag(n, "ismember");
-  }
-
-  emitter->enterFunction(n);
-  Language::functionHandler(n);
-  emitter->exitFunction(n);
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * globalfunctionHandler()
- *
- * Function handler for generating wrappers for functions
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::globalfunctionHandler(Node *n) {
-  emitter->switchNamespace(n);
-  Language::globalfunctionHandler(n);
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * staticmemberfunctionHandler()
- *
- * Function handler for generating wrappers for static member functions
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::staticmemberfunctionHandler(Node *n) {
-  /*
-   *  Note: storage=static is removed by Language::staticmemberfunctionHandler.
-   *    So, don't rely on that after here. Instead use the state variable which is
-   *    set by JSEmitter::enterFunction().
-   */
-  Language::staticmemberfunctionHandler(n);
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * variableHandler()
- *
- * Function handler for generating wrappers for variables
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::variableHandler(Node *n) {
-
-  emitter->enterVariable(n);
-  Language::variableHandler(n);
-  emitter->exitVariable(n);
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * globalvariableHandler()
- *
- * Function handler for generating wrappers for global variables
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::globalvariableHandler(Node *n) {
-  emitter->switchNamespace(n);
-  Language::globalvariableHandler(n);
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * constantHandler()
- *
- * Function handler for generating wrappers for constants
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::constantWrapper(Node *n) {
-  emitter->switchNamespace(n);
-
-  // Note: callbacks trigger this wrapper handler
-  // TODO: handle callback declarations
-  if (Equal(Getattr(n, "kind"), "function")) {
-    return SWIG_OK;
-  }
-  // TODO: the emitter for constants must be implemented in a cleaner way
-  // currently we treat it like a read-only variable
-  // however, there is a remaining bug with function pointer constants
-  // which could be fixed with a cleaner approach
-  emitter->emitConstant(n);
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * classHandler()
- *
- * Function handler for generating wrappers for class
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::classHandler(Node *n) {
-  emitter->switchNamespace(n);
-
-  emitter->enterClass(n);
-  Language::classHandler(n);
-  emitter->exitClass(n);
-
-  return SWIG_OK;
-}
-
-int JAVASCRIPT::fragmentDirective(Node *n) {
-
-  // catch all fragment directives that have "templates" as location
-  // and register them at the emitter.
-  String *section = Getattr(n, "section");
-
-  if (Equal(section, "templates")) {
-    emitter->registerTemplate(Getattr(n, "value"), Getattr(n, "code"));
-  } else {
-    Swig_fragment_register(n);
-  }
-
-  return SWIG_OK;
-}
-
-String *JAVASCRIPT::getNSpace() const {
-  return Language::getNSpace();
-}
-
-/* ---------------------------------------------------------------------
- * top()
- *
- * Function handler for processing top node of the parse tree
- * Wrapper code generation essentially starts from here
- * --------------------------------------------------------------------- */
-
-int JAVASCRIPT::top(Node *n) {
-  emitter->initialize(n);
-
-  Language::top(n);
-
-  emitter->dump(n);
-  emitter->close();
-
-  return SWIG_OK;
-}
-
-static const char *usage = (char *) "\
-Javascript Options (available with -javascript)\n\
-     -jsc                   - creates a JavascriptCore extension \n\
-     -v8                    - creates a v8 extension \n\
-     -node                  - creates a node.js extension \n\
-     -debug-codetemplates   - generates information about the origin of code templates\n";
-
-
-/* ---------------------------------------------------------------------
- * main()
- *
- * Entry point for the JAVASCRIPT module
- * --------------------------------------------------------------------- */
-
-void JAVASCRIPT::main(int argc, char *argv[]) {
-  // Set javascript subdirectory in SWIG library
-  SWIG_library_directory("javascript");
-
-  int engine = -1;
-
-  for (int i = 1; i < argc; i++) {
-    if (argv[i]) {
-      if (strcmp(argv[i], "-v8") == 0) {
-      	if (engine != -1) {
-	  Printf(stderr, ERR_MSG_ONLY_ONE_ENGINE_PLEASE);
-	  SWIG_exit(-1);
-      	}
-	Swig_mark_arg(i);
-	engine = JSEmitter::V8;
-      } else if (strcmp(argv[i], "-jsc") == 0) {
-      	if (engine != -1) {
-	  Printf(stderr, ERR_MSG_ONLY_ONE_ENGINE_PLEASE);
-	  SWIG_exit(-1);
-      	}
-	Swig_mark_arg(i);
-	engine = JSEmitter::JavascriptCore;
-      } else if (strcmp(argv[i], "-node") == 0) {
-      	if (engine != -1) {
-	  Printf(stderr, ERR_MSG_ONLY_ONE_ENGINE_PLEASE);
-	  SWIG_exit(-1);
-      	}
-	Swig_mark_arg(i);
-	engine = JSEmitter::NodeJS;
-      } else if (strcmp(argv[i], "-debug-codetemplates") == 0) {
-	Swig_mark_arg(i);
-	js_template_enable_debug = true;
-      } else if (strcmp(argv[i], "-help") == 0) {
-	fputs(usage, stdout);
-	return;
-      }
-    }
-  }
-
-  switch (engine) {
-  case JSEmitter::V8:
-    {
-      emitter = swig_javascript_create_V8Emitter();
-      Preprocessor_define("SWIG_JAVASCRIPT_V8 1", 0);
-      SWIG_library_directory("javascript/v8");
-      // V8 API is C++, so output must be C++ compatibile even when wrapping C code
-      if (!cparse_cplusplus) {
-	Swig_cparse_cplusplusout(1);
-      }
-      break;
-    }
-  case JSEmitter::JavascriptCore:
-    {
-      emitter = swig_javascript_create_JSCEmitter();
-      Preprocessor_define("SWIG_JAVASCRIPT_JSC 1", 0);
-      SWIG_library_directory("javascript/jsc");
-      break;
-    }
-  case JSEmitter::NodeJS:
-    {
-      emitter = swig_javascript_create_V8Emitter();
-      Preprocessor_define("SWIG_JAVASCRIPT_V8 1", 0);
-      Preprocessor_define("BUILDING_NODE_EXTENSION 1", 0);
-      SWIG_library_directory("javascript/v8");
-      break;
-    }
-  default:
-    {
-      Printf(stderr, "SWIG Javascript: Unknown engine. Please specify one of '-jsc', '-v8' or '-node'.\n");
-      SWIG_exit(-1);
-      break;
-    }
-  }
-
-  // Add a symbol to the parser for conditional compilation
-  Preprocessor_define("SWIGJAVASCRIPT 1", 0);
-
-  // Add typemap definitions
-  SWIG_typemap_lang("javascript");
-
-  // Set configuration file
-  SWIG_config_file("javascript.swg");
-
-  allow_overloading();
-}
-
-/* -----------------------------------------------------------------------------
- * swig_javascript()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_javascript() {
-  return new JAVASCRIPT();
-}
-
-extern "C" Language *swig_javascript(void) {
-  return new_swig_javascript();
-}
-
-/**********************************************************************
- * Emitter implementations
- **********************************************************************/
-
-/* -----------------------------------------------------------------------------
- * JSEmitter()
- * ----------------------------------------------------------------------------- */
-
-JSEmitter::JSEmitter(JSEmitter::JSEngine engine)
-:  engine(engine), templates(NewHash()), namespaces(NULL), current_namespace(NULL), defaultResultName(NewString("result")), f_wrappers(NULL) {
-}
-
-/* -----------------------------------------------------------------------------
- * ~JSEmitter()
- * ----------------------------------------------------------------------------- */
-
-JSEmitter::~JSEmitter() {
-  Delete(templates);
-}
-
-/* -----------------------------------------------------------------------------
- * JSEmitter::RegisterTemplate() :  Registers a code template
- *
- *  Note: this is used only by JAVASCRIPT::fragmentDirective().
- * ----------------------------------------------------------------------------- */
-
-int JSEmitter::registerTemplate(const String *name, const String *code) {
-  if (!State::IsSet(state.globals(HAS_TEMPLATES))) {
-    SetFlag(state.globals(), HAS_TEMPLATES);
-  }
-  return Setattr(templates, name, code);
-}
-
-/* -----------------------------------------------------------------------------
- * JSEmitter::getTemplate() :  Provides a registered code template
- * ----------------------------------------------------------------------------- */
-
-Template JSEmitter::getTemplate(const String *name) {
-  String *templ = Getattr(templates, name);
-
-  if (!templ) {
-    Printf(stderr, "Could not find template %s\n.", name);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Template t(templ, name);
-  return t;
-}
-
-JSEmitterState & JSEmitter::getState() {
-  return state;
-}
-
-int JSEmitter::initialize(Node * /*n */ ) {
-
-  if (namespaces != NULL) {
-    Delete(namespaces);
-  }
-  namespaces = NewHash();
-  Hash *global_namespace = createNamespaceEntry("exports", 0);
-
-  Setattr(namespaces, "::", global_namespace);
-  current_namespace = global_namespace;
-
-  f_wrappers = NewString("");
-
-  return SWIG_OK;
-}
-
-/* ---------------------------------------------------------------------
- * skipIgnoredArgs()
- * --------------------------------------------------------------------- */
-
-Parm *JSEmitter::skipIgnoredArgs(Parm *p) {
-  while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-    p = Getattr(p, "tmap:in:next");
-  }
-  return p;
-}
-
-/* -----------------------------------------------------------------------------
- * JSEmitter::getBaseClass() :  the node of the base class or NULL
- *
- * Note: the first base class is provided. Multiple inheritance is not
- *       supported.
- * ----------------------------------------------------------------------------- */
-
-Node *JSEmitter::getBaseClass(Node *n) {
-  // retrieve the first base class that is not %ignored
-  List *baselist = Getattr(n, "bases");
-  if (baselist) {
-    Iterator base = First(baselist);
-    while (base.item && GetFlag(base.item, "feature:ignore")) {
-      base = Next(base);
-    }
-    return base.item;
-  }
-  return NULL;
-}
-
- /* -----------------------------------------------------------------------------
-  * JSEmitter::emitWrapperFunction() :  dispatches emitter functions.
-  *
-  * This allows to have small sized, dedicated emitting functions.
-  * All state dependent branching is done here.
-  * ----------------------------------------------------------------------------- */
-
-int JSEmitter::emitWrapperFunction(Node *n) {
-  int ret = SWIG_OK;
-
-  String *kind = Getattr(n, "kind");
-
-  if (kind) {
-
-    if (Equal(kind, "function")
-	// HACK: sneaky.ctest revealed that typedef'd (global) functions must be
-	// detected via the 'view' attribute.
-	|| (Equal(kind, "variable") && Equal(Getattr(n, "view"), "globalfunctionHandler"))
-	) {
-      bool is_member = GetFlag(n, "ismember") != 0 || GetFlag(n, "feature:extend") != 0;
-      bool is_static = GetFlag(state.function(), IS_STATIC) != 0;
-      ret = emitFunction(n, is_member, is_static);
-    } else if (Cmp(kind, "variable") == 0) {
-      bool is_static = GetFlag(state.variable(), IS_STATIC) != 0;
-      // HACK: smartpointeraccessed static variables are not treated as statics
-      if (GetFlag(n, "allocate:smartpointeraccess")) {
-	is_static = false;
-      }
-
-      bool is_member = GetFlag(n, "ismember") != 0;
-      bool is_setter = GetFlag(n, "memberset") != 0 || GetFlag(n, "varset") != 0;
-      bool is_getter = GetFlag(n, "memberget") != 0 || GetFlag(n, "varget") != 0;
-      if (is_setter) {
-	ret = emitSetter(n, is_member, is_static);
-      } else if (is_getter) {
-	ret = emitGetter(n, is_member, is_static);
-      } else {
-	Swig_print_node(n);
-      }
-
-    } else {
-      Printf(stderr, "Warning: unsupported wrapper function type\n");
-      Swig_print_node(n);
-      ret = SWIG_ERROR;
-    }
-  } else {
-    String *view = Getattr(n, "view");
-
-    if (Cmp(view, "constructorHandler") == 0) {
-      ret = emitCtor(n);
-    } else if (Cmp(view, "destructorHandler") == 0) {
-      ret = emitDtor(n);
-    } else {
-      Printf(stderr, "Warning: unsupported wrapper function type");
-      Swig_print_node(n);
-      ret = SWIG_ERROR;
-    }
-  }
-
-  return ret;
-}
-
-int JSEmitter::enterClass(Node *n) {
-  state.clazz(RESET);
-  state.clazz(NAME, Getattr(n, "sym:name"));
-  state.clazz("nspace", current_namespace);
-
-  // Creating a mangled name using the current namespace and the symbol name
-  String *mangled_name = NewString("");
-  Printf(mangled_name, "%s_%s", Getattr(current_namespace, NAME_MANGLED), Getattr(n, "sym:name"));
-  state.clazz(NAME_MANGLED, SwigType_manglestr(mangled_name));
-  Delete(mangled_name);
-
-  state.clazz(TYPE, NewString(Getattr(n, "classtype")));
-
-  String *type = SwigType_manglestr(Getattr(n, "classtypeobj"));
-  String *classtype_mangled = NewString("");
-  Printf(classtype_mangled, "p%s", type);
-  state.clazz(TYPE_MANGLED, classtype_mangled);
-  Delete(type);
-
-  String *ctor_wrapper = NewString("_wrap_new_veto_");
-  Append(ctor_wrapper, state.clazz(NAME));
-  state.clazz(CTOR, ctor_wrapper);
-  state.clazz(CTOR_DISPATCHERS, NewString(""));
-  state.clazz(DTOR, NewString("0"));
-
-  // HACK: assume that a class is abstract
-  // this is resolved by emitCtor (which is only called for non abstract classes)
-  SetFlag(state.clazz(), IS_ABSTRACT);
-
-  return SWIG_OK;
-}
-
-int JSEmitter::enterFunction(Node *n) {
-  state.function(RESET);
-  state.function(NAME, Getattr(n, "sym:name"));
-  if (Equal(Getattr(n, "storage"), "static")) {
-    SetFlag(state.function(), IS_STATIC);
-  }
-  return SWIG_OK;
-}
-
-int JSEmitter::enterVariable(Node *n) {
-  // reset the state information for variables.
-  state.variable(RESET);
-
-  // Retrieve a pure symbol name. Using 'sym:name' as a basis, as it considers %renamings.
-  if (Equal(Getattr(n, "view"), "memberconstantHandler")) {
-    // Note: this is kind of hacky/experimental
-    // For constants/enums 'sym:name' contains e.g., 'Foo_Hello' instead of 'Hello'
-    state.variable(NAME, Getattr(n, "memberconstantHandler:sym:name"));
-  } else {
-    state.variable(NAME, Swig_scopename_last(Getattr(n, "sym:name")));
-  }
-
-  if (Equal(Getattr(n, "storage"), "static")) {
-    SetFlag(state.variable(), IS_STATIC);
-  }
-
-  if (!Language::instance()->is_assignable(n)) {
-    SetFlag(state.variable(), IS_IMMUTABLE);
-  }
-  // FIXME: test "arrays_global" does not compile with that as it is not allowed to assign to char[]
-  if (Equal(Getattr(n, "type"), "a().char")) {
-    SetFlag(state.variable(), IS_IMMUTABLE);
-  }
-
-  return SWIG_OK;
-}
-
-int JSEmitter::emitCtor(Node *n) {
-
-  Wrapper *wrapper = NewWrapper();
-
-  bool is_overloaded = GetFlag(n, "sym:overloaded") != 0;
-
-  Template t_ctor(getTemplate("js_ctor"));
-
-  String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name"));
-  if (is_overloaded) {
-    t_ctor = getTemplate("js_overloaded_ctor");
-    Append(wrap_name, Getattr(n, "sym:overname"));
-  }
-  Setattr(n, "wrap:name", wrap_name);
-  // note: we can remove the is_abstract flag now, as this
-  //       is called for non-abstract classes only.
-  Setattr(state.clazz(), IS_ABSTRACT, 0);
-
-  ParmList *params = Getattr(n, "parms");
-  emit_parameter_variables(params, wrapper);
-  emit_attach_parmmaps(params, wrapper);
-  // HACK: in test-case `ignore_parameter` emit_attach_parmmaps generated an extra line of applied typemaps.
-  // Deleting wrapper->code here, to reset, and as it seemed to have no side effect elsewhere
-  Delete(wrapper->code);
-  wrapper->code = NewString("");
-
-  Printf(wrapper->locals, "%sresult;", SwigType_str(Getattr(n, "type"), 0));
-
-  marshalInputArgs(n, params, wrapper, Ctor, true, false);
-  String *action = emit_action(n);
-  Printv(wrapper->code, action, "\n", 0);
-
-  emitCleanupCode(n, wrapper, params);
-
-  t_ctor.replace("$jswrapper", wrap_name)
-      .replace("$jsmangledtype", state.clazz(TYPE_MANGLED))
-      .replace("$jslocals", wrapper->locals)
-      .replace("$jscode", wrapper->code)
-      .replace("$jsargcount", Getattr(n, ARGCOUNT))
-      .pretty_print(f_wrappers);
-
-  Template t_ctor_case(getTemplate("js_ctor_dispatch_case"));
-  t_ctor_case.replace("$jswrapper", wrap_name)
-      .replace("$jsargcount", Getattr(n, ARGCOUNT));
-  Append(state.clazz(CTOR_DISPATCHERS), t_ctor_case.str());
-
-  DelWrapper(wrapper);
-
-  // create a dispatching ctor
-  if (is_overloaded) {
-    if (!Getattr(n, "sym:nextSibling")) {
-      String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name"));
-      Template t_mainctor(getTemplate("js_ctor_dispatcher"));
-      t_mainctor.replace("$jswrapper", wrap_name)
-	  .replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	  .replace("$jsdispatchcases", state.clazz(CTOR_DISPATCHERS))
-	  .pretty_print(f_wrappers);
-      state.clazz(CTOR, wrap_name);
-    }
-  } else {
-    state.clazz(CTOR, wrap_name);
-  }
-
-  return SWIG_OK;
-}
-
-int JSEmitter::emitDtor(Node *n) {
-
-  String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name"));
-
-  SwigType *type = state.clazz(TYPE);
-  String *p_classtype = SwigType_add_pointer(state.clazz(TYPE));
-  String *ctype = SwigType_lstr(p_classtype, "");
-  String *free = NewString("");
-
-  // (Taken from JSCore implementation.)
-  /* The if (Extend) block was taken from the Ruby implementation.
-   * The problem is that in the case of an %extend to create a destructor for a struct to coordinate automatic memory cleanup with the Javascript collector,
-   * the SWIG function was not being generated. More specifically:
-   struct MyData {
-   %extend {
-   ~MyData() {
-   FreeData($self);
-   }
-   }
-   };
-   %newobject CreateData;
-   struct MyData* CreateData(void);
-   %delobject FreeData;
-   void FreeData(struct MyData* the_data);
-
-   where the use case is something like:
-   var my_data = example.CreateData();
-   my_data = null;
-
-   This function was not being generated:
-   SWIGINTERN void delete_MyData(struct MyData *self){
-   FreeData(self);
-   }
-
-   I don't understand fully why it wasn't being generated. It just seems to happen in the Lua generator.
-   There is a comment about staticmemberfunctionHandler having an inconsistency and I tracked down dome of the SWIGINTERN void delete_*
-   code to that function in the Language base class.
-   The Ruby implementation seems to have an explicit check for if(Extend) and explicitly generates the code, so that's what I'm doing here.
-   The Ruby implementation does other stuff which I omit.
-   */
-  if (Extend) {
-    String *wrap = Getattr(n, "wrap:code");
-    if (wrap) {
-      Printv(f_wrappers, wrap, NIL);
-    }
-  }
-  // HACK: this is only for the v8 emitter. maybe set an attribute wrap:action of node
-  // TODO: generate dtors more similar to other wrappers
-  // EW: I think this is wrong. delete should only be used when new was used to create. If malloc was used, free needs to be used.
-  if (SwigType_isarray(type)) {
-    Printf(free, "delete [] (%s)", ctype);
-  } else {
-    Printf(free, "delete (%s)", ctype);
-  }
-
-  String *destructor_action = Getattr(n, "wrap:action");
-  // Adapted from the JSCore implementation.
-  /* The next challenge is to generate the correct finalize function for JavaScriptCore to call.
-     Originally, it would use this fragment from javascriptcode.swg
-     %fragment ("JS_destructordefn", "templates")
-     %{
-     void _wrap_${classname_mangled}_finalize(JSObjectRef thisObject)
-     {
-     SWIG_PRV_DATA* t = (SWIG_PRV_DATA*)JSObjectGetPrivate(thisObject);
-     if(t && t->swigCMemOwn) free ((${type}*)t->swigCObject);
-     if(t) free(t);
-     }
-     %}
-
-     But for the above example case of %extend to define a destructor on a struct, we need to override the system to not call
-     free ((${type}*)t->swigCObject);
-     and substitute it with what the user has provided.
-     To solve this, I created a variation fragment called JS_destructoroverridedefn:
-     SWIG_PRV_DATA* t = (SWIG_PRV_DATA*)JSObjectGetPrivate(thisObject);
-     if(t && t->swigCMemOwn) {
-     ${type}* arg1 = (${type}*)t->swigCObject;
-     ${destructor_action}
-     }
-     if(t) free(t);
-
-     Based on what I saw in the Lua and Ruby modules, I use Getattr(n, "wrap:action")
-     to decide if the user has a preferred destructor action.
-     Based on that, I decide which fragment to use.
-     And in the case of the custom action, I substitute that action in.
-     I noticed that destructor_action has the form
-     delete_MyData(arg1);
-     The explicit arg1 is a little funny, so I structured the fragment to create a temporary variable called arg1 to make the generation easier.
-     This might suggest this solution misunderstands a more complex case.
-
-     Also, there is a problem where destructor_action is always true for me, even when not requesting %extend as above.
-     So this code doesn't actually quite work as I expect. The end result is that the code still works because
-     destructor_action calls free like the original template. The one caveat is the string in destructor_action casts to char* which is wierd.
-     I think there is a deeper underlying SWIG issue because I don't think it should be char*. However, it doesn't really matter for free.
-
-     Maybe the fix for the destructor_action always true problem is that this is supposed to be embedded in the if(Extend) block above.
-     But I don't fully understand the conditions of any of these things, and since it works for the moment, I don't want to break more stuff.
-   */
-  if (destructor_action) {
-    Template t_dtor = getTemplate("js_dtoroverride");
-    state.clazz(DTOR, wrap_name);
-    t_dtor.replace("${classname_mangled}", state.clazz(NAME_MANGLED))
-	.replace("$jswrapper", wrap_name)
-	.replace("$jsfree", free)
-	.replace("$jstype", ctype);
-
-    t_dtor.replace("${destructor_action}", destructor_action);
-    Wrapper_pretty_print(t_dtor.str(), f_wrappers);
-  } else {
-    Template t_dtor = getTemplate("js_dtor");
-    state.clazz(DTOR, wrap_name);
-    t_dtor.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	.replace("$jswrapper", wrap_name)
-	.replace("$jsfree", free)
-	.replace("$jstype", ctype)
-	.pretty_print(f_wrappers);
-  }
-
-  Delete(p_classtype);
-  Delete(ctype);
-  Delete(free);
-
-  return SWIG_OK;
-}
-
-int JSEmitter::emitGetter(Node *n, bool is_member, bool is_static) {
-  Wrapper *wrapper = NewWrapper();
-  Template t_getter(getTemplate("js_getter"));
-
-  // prepare wrapper name
-  String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name"));
-  Setattr(n, "wrap:name", wrap_name);
-  state.variable(GETTER, wrap_name);
-
-  // prepare local variables
-  ParmList *params = Getattr(n, "parms");
-  emit_parameter_variables(params, wrapper);
-  emit_attach_parmmaps(params, wrapper);
-
-  // prepare code part
-  String *action = emit_action(n);
-  marshalInputArgs(n, params, wrapper, Getter, is_member, is_static);
-  marshalOutput(n, params, wrapper, action);
-
-  emitCleanupCode(n, wrapper, params);
-
-  t_getter.replace("$jswrapper", wrap_name)
-      .replace("$jslocals", wrapper->locals)
-      .replace("$jscode", wrapper->code)
-      .pretty_print(f_wrappers);
-
-  DelWrapper(wrapper);
-
-  return SWIG_OK;
-}
-
-int JSEmitter::emitSetter(Node *n, bool is_member, bool is_static) {
-
-  // skip variables that are immutable
-  if (State::IsSet(state.variable(IS_IMMUTABLE))) {
-    return SWIG_OK;
-  }
-
-  Wrapper *wrapper = NewWrapper();
-
-  Template t_setter(getTemplate("js_setter"));
-
-  // prepare wrapper name
-  String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name"));
-  Setattr(n, "wrap:name", wrap_name);
-  state.variable(SETTER, wrap_name);
-
-  // prepare local variables
-  ParmList *params = Getattr(n, "parms");
-  emit_parameter_variables(params, wrapper);
-  emit_attach_parmmaps(params, wrapper);
-
-  // prepare code part
-  String *action = emit_action(n);
-  marshalInputArgs(n, params, wrapper, Setter, is_member, is_static);
-  Append(wrapper->code, action);
-
-  emitCleanupCode(n, wrapper, params);
-
-  t_setter.replace("$jswrapper", wrap_name)
-      .replace("$jslocals", wrapper->locals)
-      .replace("$jscode", wrapper->code)
-      .pretty_print(f_wrappers);
-
-  DelWrapper(wrapper);
-
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * JSEmitter::emitConstant() :  triggers code generation for constants
- * ----------------------------------------------------------------------------- */
-
-int JSEmitter::emitConstant(Node *n) {
-  // HACK: somehow it happened under Mac OS X that before everything started
-  // a lot of SWIG internal constants were emitted
-  // This didn't happen on other platforms yet...
-  // we ignore those premature definitions
-  if (!State::IsSet(state.globals(HAS_TEMPLATES))) {
-    return SWIG_ERROR;
-  }
-
-  Wrapper *wrapper = NewWrapper();
-  SwigType *type = Getattr(n, "type");
-  String *name = Getattr(n, "name");
-  String *iname = Getattr(n, "sym:name");
-  String *wname = Swig_name_wrapper(name);
-  String *rawval = Getattr(n, "rawval");
-  String *value = rawval ? rawval : Getattr(n, "value");
-
-  // HACK: forcing usage of cppvalue for v8 (which turned out to fix typdef_struct.i, et. al)
-  if (State::IsSet(state.globals(FORCE_CPP)) && Getattr(n, "cppvalue") != NULL) {
-    value = Getattr(n, "cppvalue");
-  }
-
-  Template t_getter(getTemplate("js_getter"));
-
-  // call the variable methods as a constants are
-  // registred in same way
-  enterVariable(n);
-  state.variable(GETTER, wname);
-  // TODO: why do we need this?
-  Setattr(n, "wrap:name", wname);
-
-  // special treatment of member pointers
-  if (SwigType_type(type) == T_MPOINTER) {
-    // TODO: this could go into a code-template
-    String *mpointer_wname = NewString("");
-    Printf(mpointer_wname, "_wrapConstant_%s", iname);
-    Setattr(n, "memberpointer:constant:wrap:name", mpointer_wname);
-    String *str = SwigType_str(type, mpointer_wname);
-    Printf(f_wrappers, "static %s = %s;\n", str, value);
-    Delete(str);
-    value = mpointer_wname;
-  }
-
-  marshalOutput(n, 0, wrapper, NewString(""), value, false);
-
-  t_getter.replace("$jswrapper", wname)
-      .replace("$jslocals", wrapper->locals)
-      .replace("$jscode", wrapper->code)
-      .pretty_print(f_wrappers);
-
-  exitVariable(n);
-
-  DelWrapper(wrapper);
-
-  return SWIG_OK;
-}
-
-int JSEmitter::emitFunction(Node *n, bool is_member, bool is_static) {
-  Wrapper *wrapper = NewWrapper();
-  Template t_function(getTemplate("js_function"));
-
-  bool is_overloaded = GetFlag(n, "sym:overloaded") != 0;
-
-  // prepare the function wrapper name
-  String *iname = Getattr(n, "sym:name");
-  String *wrap_name = Swig_name_wrapper(iname);
-  if (is_overloaded) {
-    t_function = getTemplate("js_overloaded_function");
-    Append(wrap_name, Getattr(n, "sym:overname"));
-  }
-  Setattr(n, "wrap:name", wrap_name);
-  state.function(WRAPPER_NAME, wrap_name);
-
-  // prepare local variables
-  ParmList *params = Getattr(n, "parms");
-  emit_parameter_variables(params, wrapper);
-  emit_attach_parmmaps(params, wrapper);
-
-  // HACK: in test-case `ignore_parameter` emit_attach_parmmaps generates an extra line of applied typemap.
-  // Deleting wrapper->code here fixes the problem, and seems to have no side effect elsewhere
-  Delete(wrapper->code);
-  wrapper->code = NewString("");
-
-  marshalInputArgs(n, params, wrapper, Function, is_member, is_static);
-  String *action = emit_action(n);
-  marshalOutput(n, params, wrapper, action);
-  emitCleanupCode(n, wrapper, params);
-  Replaceall(wrapper->code, "$symname", iname);
-
-  t_function.replace("$jswrapper", wrap_name)
-      .replace("$jslocals", wrapper->locals)
-      .replace("$jscode", wrapper->code)
-      .replace("$jsargcount", Getattr(n, ARGCOUNT))
-      .pretty_print(f_wrappers);
-
-
-  DelWrapper(wrapper);
-
-  return SWIG_OK;
-}
-
-int JSEmitter::emitFunctionDispatcher(Node *n, bool /*is_member */ ) {
-  Wrapper *wrapper = NewWrapper();
-
-  // Generate call list, go to first node
-  Node *sibl = n;
-
-  while (Getattr(sibl, "sym:previousSibling"))
-    sibl = Getattr(sibl, "sym:previousSibling");	// go all the way up
-
-  do {
-    String *siblname = Getattr(sibl, "wrap:name");
-
-    if (siblname) {
-      // handle function overloading
-      Template t_dispatch_case = getTemplate("js_function_dispatch_case");
-      t_dispatch_case.replace("$jswrapper", siblname)
-	  .replace("$jsargcount", Getattr(sibl, ARGCOUNT));
-
-      Append(wrapper->code, t_dispatch_case.str());
-    }
-
-  } while ((sibl = Getattr(sibl, "sym:nextSibling")));
-
-  Template t_function(getTemplate("js_function_dispatcher"));
-
-  // Note: this dispatcher function gets called after the last overloaded function has been created.
-  // At this time, n.wrap:name contains the name of the last wrapper function.
-  // To get a valid function name for the dispatcher function we take the last wrapper name and
-  // substract the extension "sym:overname",
-  String *wrap_name = NewString(Getattr(n, "wrap:name"));
-  String *overname = Getattr(n, "sym:overname");
-
-  Node *methodclass = Swig_methodclass(n);
-  String *class_name = Getattr(methodclass, "sym:name");
-
-  int l1 = Len(wrap_name);
-  int l2 = Len(overname);
-  Delslice(wrap_name, l1 - l2, l1);
-
-  String *new_string = NewStringf("%s_%s", class_name, wrap_name);
-  String *final_wrap_name = Swig_name_wrapper(new_string);
-     
-  Setattr(n, "wrap:name", final_wrap_name);
-  state.function(WRAPPER_NAME, final_wrap_name);
-
-
-
-  t_function.replace("$jslocals", wrapper->locals)
-      .replace("$jscode", wrapper->code);
-
-  // call this here, to replace all variables
-  t_function.replace("$jswrapper", final_wrap_name)
-      .replace("$jsname", state.function(NAME))
-      .pretty_print(f_wrappers);
-
-  // Delete the state variable
-  DelWrapper(wrapper);
-
-  return SWIG_OK;
-}
-
-String *JSEmitter::emitInputTypemap(Node *n, Parm *p, Wrapper *wrapper, String *arg) {
-  // Get input typemap for current param
-  String *tm = Getattr(p, "tmap:in");
-  SwigType *type = Getattr(p, "type");
-
-  if (tm != NULL) {
-    Replaceall(tm, "$input", arg);
-    Setattr(p, "emit:input", arg);
-    // do replacements for built-in variables
-    if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-      Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-    } else {
-      Replaceall(tm, "$disown", "0");
-    }
-    Replaceall(tm, "$symname", Getattr(n, "sym:name"));
-    Printf(wrapper->code, "%s\n", tm);
-  } else {
-    Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0));
-  }
-
-  return tm;
-}
-
-void JSEmitter::marshalOutput(Node *n, ParmList *params, Wrapper *wrapper, String *actioncode, const String *cresult, bool emitReturnVariable) {
-  SwigType *type = Getattr(n, "type");
-  String *tm;
-  Parm *p;
-
-  // adds a declaration for the result variable
-  if (emitReturnVariable)
-    emit_return_variable(n, type, wrapper);
-  // if not given, use default result identifier ('result') for output typemap
-  if (cresult == 0)
-    cresult = defaultResultName;
-
-  tm = Swig_typemap_lookup_out("out", n, cresult, wrapper, actioncode);
-  bool should_own = GetFlag(n, "feature:new") != 0;
-
-  if (tm) {
-    Replaceall(tm, "$objecttype", Swig_scopename_last(SwigType_str(SwigType_strip_qualifiers(type), 0)));
-
-    if (should_own) {
-      Replaceall(tm, "$owner", "SWIG_POINTER_OWN");
-    } else {
-      Replaceall(tm, "$owner", "0");
-    }
-    Append(wrapper->code, tm);
-
-    if (Len(tm) > 0) {
-      Printf(wrapper->code, "\n");
-    }
-  } else {
-    Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name"));
-  }
-
-  if (params) {
-    for (p = params; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(wrapper->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-  }
-
-  Replaceall(wrapper->code, "$result", "jsresult");
-}
-
-void JSEmitter::emitCleanupCode(Node *n, Wrapper *wrapper, ParmList *params) {
-  Parm *p;
-  String *tm;
-
-  for (p = params; p;) {
-    if ((tm = Getattr(p, "tmap:freearg"))) {
-      //addThrows(n, "tmap:freearg", p);
-      Replaceall(tm, "$input", Getattr(p, "emit:input"));
-      Printv(wrapper->code, tm, "\n", NIL);
-      p = Getattr(p, "tmap:freearg:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  if (GetFlag(n, "feature:new")) {
-    tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0);
-    if (tm != NIL) {
-      //addThrows(throws_hash, "newfree", n);
-      Printv(wrapper->code, tm, "\n", NIL);
-    }
-  }
-
-  /* See if there is any return cleanup code */
-  if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-    Printf(wrapper->code, "%s\n", tm);
-    Delete(tm);
-  }
-}
-
-int JSEmitter::switchNamespace(Node *n) {
-  // HACK: somehow this gets called for member functions.
-  // We can safely ignore them, as members are not associated to a namespace (only their class)
-  if (GetFlag(n, "ismember")) {
-    return SWIG_OK;
-  }
-
-  // if nspace is deactivated, everything goes into the global scope
-  if (!GetFlag(n, "feature:nspace")) {
-    current_namespace = Getattr(namespaces, "::");
-    return SWIG_OK;
-  }
-
-// EXPERIMENTAL: we want to use Language::getNSpace() here
-// However, it is not working yet.
-// For namespace functions Language::getNSpace() does not give a valid result
-#if 0
-  JAVASCRIPT *lang = static_cast<JAVASCRIPT*>(Language::instance());
-  String *_nspace = lang->getNSpace();
-  if (!Equal(nspace, _nspace)) {
-    Printf(stdout, "##### Custom vs Language::getNSpace(): %s | %s\n", nspace, _nspace);
-    Swig_print_node(n);
-  }
-#endif
-
-  String *nspace = Getattr(n, "sym:nspace");
-
-  if (nspace == NULL) {
-    // It seems that only classes have 'sym:nspace' set.
-    // We try to get the namespace from the qualified name (i.e., everything before the last '::')
-    nspace = Swig_scopename_prefix(Getattr(n, "name"));
-  }
-
-  // If there is not even a scopename prefix then it must be global scope
-  if (nspace == NULL) {
-    current_namespace = Getattr(namespaces, "::");
-    return SWIG_OK;
-  }
-
-  String *scope = NewString(nspace);
-  // replace "." with "::" that we can use Swig_scopename_last
-  Replaceall(scope, ".", "::");
-
-  // if the scope is not yet registered
-  // create (parent) namespaces recursively
-  if (!Getattr(namespaces, scope)) {
-    createNamespace(scope);
-  }
-  current_namespace = Getattr(namespaces, scope);
-
-  return SWIG_OK;
-}
-
-int JSEmitter::createNamespace(String *scope) {
-
-  String *parent_scope = Swig_scopename_prefix(scope);
-  Hash *parent_namespace;
-  if (parent_scope == 0) {
-    parent_namespace = Getattr(namespaces, "::");
-  } else if (!Getattr(namespaces, parent_scope)) {
-    createNamespace(parent_scope);
-    parent_namespace = Getattr(namespaces, parent_scope);
-  } else {
-    parent_namespace = Getattr(namespaces, parent_scope);
-  }
-  assert(parent_namespace != 0);
-
-  Hash *new_namespace = createNamespaceEntry(Char(scope), Char(Getattr(parent_namespace, "name")));
-  Setattr(namespaces, scope, new_namespace);
-
-  Delete(parent_scope);
-  return SWIG_OK;
-}
-
-Hash *JSEmitter::createNamespaceEntry(const char *_name, const char *parent) {
-  Hash *entry = NewHash();
-  String *name = NewString(_name);
-  Setattr(entry, NAME, Swig_scopename_last(name));
-  Setattr(entry, NAME_MANGLED, Swig_name_mangle(name));
-  Setattr(entry, PARENT, NewString(parent));
-
-  Delete(name);
-  return entry;
-}
-
-/**********************************************************************
- * JavascriptCore: JSEmitter implementation for JavascriptCore engine
- **********************************************************************/
-
-class JSCEmitter:public JSEmitter {
-
-public:
-  JSCEmitter();
-  virtual ~ JSCEmitter();
-  virtual int initialize(Node *n);
-  virtual int dump(Node *n);
-  virtual int close();
-
-protected:
-  virtual int enterVariable(Node *n);
-  virtual int exitVariable(Node *n);
-  virtual int enterFunction(Node *n);
-  virtual int exitFunction(Node *n);
-  virtual int enterClass(Node *n);
-  virtual int exitClass(Node *n);
-  virtual void marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static);
-  virtual Hash *createNamespaceEntry(const char *name, const char *parent);
-  virtual int emitNamespaces();
-
-private:
-
-  String *NULL_STR;
-  String *VETO_SET;
-
-  // output file and major code parts
-  File *f_wrap_cpp;
-  File *f_runtime;
-  File *f_header;
-  File *f_init;
-
-};
-
-JSCEmitter::JSCEmitter()
-:  JSEmitter(JSEmitter::JavascriptCore), NULL_STR(NewString("NULL")), VETO_SET(NewString("JS_veto_set_variable")), f_wrap_cpp(NULL), f_runtime(NULL), f_header(NULL), f_init(NULL) {
-}
-
-JSCEmitter::~JSCEmitter() {
-  Delete(NULL_STR);
-  Delete(VETO_SET);
-}
-
-
-/* ---------------------------------------------------------------------
- * marshalInputArgs()
- *
- * Process all of the arguments passed into the argv array
- * and convert them into C/C++ function arguments using the
- * supplied typemaps.
- * --------------------------------------------------------------------- */
-
-void JSCEmitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) {
-  Parm *p;
-  String *tm;
-
-  // determine an offset index, as members have an extra 'this' argument
-  // except: static members and ctors.
-  int startIdx = 0;
-  if (is_member && !is_static && mode != Ctor) {
-    startIdx = 1;
-  }
-  // store number of arguments for argument checks
-  int num_args = emit_num_arguments(parms) - startIdx;
-  String *argcount = NewString("");
-  Printf(argcount, "%d", num_args);
-  Setattr(n, ARGCOUNT, argcount);
-
-  // process arguments
-  int i = 0;
-  for (p = parms; p; i++) {
-    String *arg = NewString("");
-    String *type = Getattr(p, "type");
-
-    // ignore varargs
-    if (SwigType_isvarargs(type))
-      break;
-
-    switch (mode) {
-    case Getter:
-    case Function:
-      if (is_member && !is_static && i == 0) {
-	Printv(arg, "thisObject", 0);
-      } else {
-	Printf(arg, "argv[%d]", i - startIdx);
-      }
-      break;
-    case Setter:
-      if (is_member && !is_static && i == 0) {
-	Printv(arg, "thisObject", 0);
-      } else {
-	Printv(arg, "value", 0);
-      }
-      break;
-    case Ctor:
-      Printf(arg, "argv[%d]", i);
-      break;
-    default:
-      throw "Illegal state.";
-    }
-    tm = emitInputTypemap(n, p, wrapper, arg);
-    Delete(arg);
-    if (tm) {
-      p = Getattr(p, "tmap:in:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-}
-
-int JSCEmitter::initialize(Node *n) {
-
-  JSEmitter::initialize(n);
-
-  /* Get the output file name */
-  String *outfile = Getattr(n, "outfile");
-
-  /* Initialize I/O */
-  f_wrap_cpp = NewFile(outfile, "w", SWIG_output_files());
-  if (!f_wrap_cpp) {
-    FileErrorDisplay(outfile);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  /* Initialization of members */
-  f_runtime = NewString("");
-  f_init = NewString("");
-  f_header = NewString("");
-
-  state.globals(CREATE_NAMESPACES, NewString(""));
-  state.globals(REGISTER_NAMESPACES, NewString(""));
-  state.globals(INITIALIZER, NewString(""));
-
-  /* Register file targets with the SWIG file handler */
-  Swig_register_filebyname("begin", f_wrap_cpp);
-  Swig_register_filebyname("header", f_header);
-  Swig_register_filebyname("wrapper", f_wrappers);
-  Swig_register_filebyname("runtime", f_runtime);
-  Swig_register_filebyname("init", f_init);
-
-  Swig_banner(f_wrap_cpp);
-
-  return SWIG_OK;
-}
-
-int JSCEmitter::dump(Node *n) {
-  /* Get the module name */
-  String *module = Getattr(n, "name");
-
-  Template initializer_define(getTemplate("js_initializer_define"));
-  initializer_define.replace("$jsname", module).pretty_print(f_header);
-
-  SwigType_emit_type_table(f_runtime, f_wrappers);
-
-  Printv(f_wrap_cpp, f_runtime, "\n", 0);
-  Printv(f_wrap_cpp, f_header, "\n", 0);
-  Printv(f_wrap_cpp, f_wrappers, "\n", 0);
-
-  emitNamespaces();
-
-  // compose the initializer function using a template
-  Template initializer(getTemplate("js_initializer"));
-  initializer.replace("$jsname", module)
-      .replace("$jsregisterclasses", state.globals(INITIALIZER))
-      .replace("$jscreatenamespaces", state.globals(CREATE_NAMESPACES))
-      .replace("$jsregisternamespaces", state.globals(REGISTER_NAMESPACES))
-      .pretty_print(f_init);
-
-  Printv(f_wrap_cpp, f_init, 0);
-
-  return SWIG_OK;
-}
-
-int JSCEmitter::close() {
-  Delete(f_runtime);
-  Delete(f_header);
-  Delete(f_wrappers);
-  Delete(f_init);
-  Delete(namespaces);
-  Delete(f_wrap_cpp);
-  return SWIG_OK;
-}
-
-int JSCEmitter::enterFunction(Node *n) {
-
-  JSEmitter::enterFunction(n);
-
-  return SWIG_OK;
-}
-
-int JSCEmitter::exitFunction(Node *n) {
-  Template t_function = getTemplate("jsc_function_declaration");
-
-  bool is_member = GetFlag(n, "ismember") != 0 || GetFlag(n, "feature:extend") != 0;
-  bool is_overloaded = GetFlag(n, "sym:overloaded") != 0;
-
-  // handle overloaded functions
-  if (is_overloaded) {
-    if (!Getattr(n, "sym:nextSibling")) {
-      //state.function(WRAPPER_NAME, Swig_name_wrapper(Getattr(n, "name")));
-      // create dispatcher
-      emitFunctionDispatcher(n, is_member);
-    } else {
-      //don't register wrappers of overloaded functions in function tables
-      return SWIG_OK;
-    }
-  }
-
-  t_function.replace("$jsname", state.function(NAME))
-      .replace("$jswrapper", state.function(WRAPPER_NAME));
-
-  if (is_member) {
-    if (GetFlag(state.function(), IS_STATIC)) {
-      t_function.pretty_print(state.clazz(STATIC_FUNCTIONS));
-    } else {
-      t_function.pretty_print(state.clazz(MEMBER_FUNCTIONS));
-    }
-  } else {
-    t_function.pretty_print(Getattr(current_namespace, "functions"));
-  }
-
-  return SWIG_OK;
-}
-
-int JSCEmitter::enterVariable(Node *n) {
-  JSEmitter::enterVariable(n);
-  state.variable(GETTER, NULL_STR);
-  state.variable(SETTER, VETO_SET);
-  return SWIG_OK;
-}
-
-int JSCEmitter::exitVariable(Node *n) {
-  Template t_variable(getTemplate("jsc_variable_declaration"));
-  t_variable.replace("$jsname", state.variable(NAME))
-      .replace("$jsgetter", state.variable(GETTER))
-      .replace("$jssetter", state.variable(SETTER));
-
-  if (GetFlag(n, "ismember")) {
-    if (GetFlag(state.variable(), IS_STATIC)
-	|| Equal(Getattr(n, "nodeType"), "enumitem")) {
-      t_variable.pretty_print(state.clazz(STATIC_VARIABLES));
-    } else {
-      t_variable.pretty_print(state.clazz(MEMBER_VARIABLES));
-    }
-  } else {
-    t_variable.pretty_print(Getattr(current_namespace, "values"));
-  }
-
-  return SWIG_OK;
-}
-
-int JSCEmitter::enterClass(Node *n) {
-  JSEmitter::enterClass(n);
-  state.clazz(MEMBER_VARIABLES, NewString(""));
-  state.clazz(MEMBER_FUNCTIONS, NewString(""));
-  state.clazz(STATIC_VARIABLES, NewString(""));
-  state.clazz(STATIC_FUNCTIONS, NewString(""));
-
-  Template t_class_decl = getTemplate("jsc_class_declaration");
-  t_class_decl.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .pretty_print(f_wrappers);
-
-  return SWIG_OK;
-}
-
-int JSCEmitter::exitClass(Node *n) {
-  Template t_class_tables(getTemplate("jsc_class_tables"));
-  t_class_tables.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .replace("$jsclassvariables", state.clazz(MEMBER_VARIABLES))
-      .replace("$jsclassfunctions", state.clazz(MEMBER_FUNCTIONS))
-      .replace("$jsstaticclassfunctions", state.clazz(STATIC_FUNCTIONS))
-      .replace("$jsstaticclassvariables", state.clazz(STATIC_VARIABLES))
-      .pretty_print(f_wrappers);
-
-  /* adds the ctor wrappers at this position */
-  // Note: this is necessary to avoid extra forward declarations.
-  //Append(f_wrappers, state.clazz(CTOR_WRAPPERS));
-
-  // for abstract classes add a vetoing ctor
-  if (GetFlag(state.clazz(), IS_ABSTRACT)) {
-    Template t_veto_ctor(getTemplate("js_veto_ctor"));
-    t_veto_ctor.replace("$jswrapper", state.clazz(CTOR))
-	.replace("$jsname", state.clazz(NAME))
-	.pretty_print(f_wrappers);
-  }
-
-  /* adds a class template statement to initializer function */
-  Template t_classtemplate(getTemplate("jsc_class_definition"));
-
-  /* prepare registration of base class */
-  String *jsclass_inheritance = NewString("");
-  Node *base_class = getBaseClass(n);
-  if (base_class != NULL) {
-    Template t_inherit(getTemplate("jsc_class_inherit"));
-    t_inherit.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	.replace("$jsbaseclassmangled", SwigType_manglestr(Getattr(base_class, "name")))
-	.pretty_print(jsclass_inheritance);
-  } else {
-    Template t_inherit(getTemplate("jsc_class_noinherit"));
-    t_inherit.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	.pretty_print(jsclass_inheritance);
-  }
-
-  t_classtemplate.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .replace("$jsmangledtype", state.clazz(TYPE_MANGLED))
-      .replace("$jsclass_inheritance", jsclass_inheritance)
-      .replace("$jsctor", state.clazz(CTOR))
-      .replace("$jsdtor", state.clazz(DTOR))
-      .pretty_print(state.globals(INITIALIZER));
-  Delete(jsclass_inheritance);
-
-  /* Note: this makes sure that there is a swig_type added for this class */
-  SwigType_remember_clientdata(state.clazz(TYPE_MANGLED), NewString("0"));
-
-  /* adds a class registration statement to initializer function */
-  Template t_registerclass(getTemplate("jsc_class_registration"));
-  t_registerclass.replace("$jsname", state.clazz(NAME))
-      .replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .replace("$jsnspace", Getattr(state.clazz("nspace"), NAME_MANGLED))
-      .pretty_print(state.globals(INITIALIZER));
-
-  return SWIG_OK;
-}
-
-Hash *JSCEmitter::createNamespaceEntry(const char *name, const char *parent) {
-  Hash *entry = JSEmitter::createNamespaceEntry(name, parent);
-  Setattr(entry, "functions", NewString(""));
-  Setattr(entry, "values", NewString(""));
-  return entry;
-}
-
-int JSCEmitter::emitNamespaces() {
-  Iterator it;
-  for (it = First(namespaces); it.item; it = Next(it)) {
-    Hash *entry = it.item;
-    String *name = Getattr(entry, NAME);
-    String *name_mangled = Getattr(entry, NAME_MANGLED);
-    String *parent = Getattr(entry, PARENT);
-    String *parent_mangled = Swig_name_mangle(parent);
-    String *functions = Getattr(entry, "functions");
-    String *variables = Getattr(entry, "values");
-
-    // skip the global namespace which is given by the application
-
-    Template namespace_definition(getTemplate("jsc_nspace_declaration"));
-    namespace_definition.replace("$jsglobalvariables", variables)
-	.replace("$jsglobalfunctions", functions)
-	.replace("$jsnspace", name_mangled)
-	.replace("$jsmangledname", name_mangled)
-	.pretty_print(f_wrap_cpp);
-
-    Template t_createNamespace(getTemplate("jsc_nspace_definition"));
-    t_createNamespace.replace("$jsmangledname", name_mangled);
-    Append(state.globals(CREATE_NAMESPACES), t_createNamespace.str());
-
-    // Don't register 'exports' as namespace. It is return to the application.
-    if (!Equal("exports", name)) {
-      Template t_registerNamespace(getTemplate("jsc_nspace_registration"));
-      t_registerNamespace.replace("$jsmangledname", name_mangled)
-	  .replace("$jsname", name)
-	  .replace("$jsparent", parent_mangled);
-      Append(state.globals(REGISTER_NAMESPACES), t_registerNamespace.str());
-    }
-  }
-
-  return SWIG_OK;
-}
-
-JSEmitter *swig_javascript_create_JSCEmitter() {
-  return new JSCEmitter();
-}
-
-/**********************************************************************
- * V8: JSEmitter implementation for V8 engine
- **********************************************************************/
-
-class V8Emitter:public JSEmitter {
-
-public:
-  V8Emitter();
-
-  virtual ~ V8Emitter();
-  virtual int initialize(Node *n);
-  virtual int dump(Node *n);
-  virtual int close();
-  virtual int enterClass(Node *n);
-  virtual int exitClass(Node *n);
-  virtual int enterVariable(Node *n);
-  virtual int exitVariable(Node *n);
-  virtual int exitFunction(Node *n);
-
-protected:
-  virtual void marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static);
-  virtual int emitNamespaces();
-
-protected:
-  /* built-in parts */
-  String *f_runtime;
-  String *f_header;
-  String *f_init;
-  String *f_post_init;
-
-  /* part for class templates */
-  String *f_class_templates;
-
-  /* parts for initilizer */
-  String *f_init_namespaces;
-  String *f_init_class_templates;
-  String *f_init_wrappers;
-  String *f_init_inheritance;
-  String *f_init_class_instances;
-  String *f_init_static_wrappers;
-  String *f_init_register_classes;
-  String *f_init_register_namespaces;
-
-  // the output cpp file
-  File *f_wrap_cpp;
-
-  String *NULL_STR;
-  String *VETO_SET;
-  String *moduleName;
-
-};
-
-V8Emitter::V8Emitter()
-:  JSEmitter(JSEmitter::V8), NULL_STR(NewString("0")), VETO_SET(NewString("JS_veto_set_variable")) {
-}
-
-V8Emitter::~V8Emitter() {
-  Delete(NULL_STR);
-  Delete(VETO_SET);
-}
-
-int V8Emitter::initialize(Node *n) {
-  JSEmitter::initialize(n);
-
-  moduleName = Getattr(n, "name");
-
-  // Get the output file name
-  String *outfile = Getattr(n, "outfile");
-  f_wrap_cpp = NewFile(outfile, "w", SWIG_output_files());
-  if (!f_wrap_cpp) {
-    FileErrorDisplay(outfile);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  f_runtime = NewString("");
-  f_header = NewString("");
-  f_class_templates = NewString("");
-  f_init = NewString("");
-  f_post_init = NewString("");
-
-  f_init_namespaces = NewString("");
-  f_init_class_templates = NewString("");
-  f_init_wrappers = NewString("");
-  f_init_inheritance = NewString("");
-  f_init_class_instances = NewString("");
-  f_init_static_wrappers = NewString("");
-  f_init_register_classes = NewString("");
-  f_init_register_namespaces = NewString("");
-
-  // note: this is necessary for built-in generation of SWIG runtime code
-  Swig_register_filebyname("begin", f_wrap_cpp);
-  Swig_register_filebyname("runtime", f_runtime);
-  Swig_register_filebyname("header", f_header);
-  Swig_register_filebyname("wrapper", f_wrappers);
-  Swig_register_filebyname("init", f_init);
-  Swig_register_filebyname("post-init", f_post_init);
-
-  state.globals(FORCE_CPP, NewString("1"));
-
-  Swig_banner(f_wrap_cpp);
-
-  return SWIG_OK;
-}
-
-int V8Emitter::dump(Node *n) {
-  /* Get the module name */
-  String *module = Getattr(n, "name");
-
-  Template initializer_define(getTemplate("js_initializer_define"));
-  initializer_define.replace("$jsname", module).pretty_print(f_header);
-
-  SwigType_emit_type_table(f_runtime, f_wrappers);
-
-  Printv(f_wrap_cpp, f_runtime, "\n", 0);
-  Printv(f_wrap_cpp, f_header, "\n", 0);
-  Printv(f_wrap_cpp, f_class_templates, "\n", 0);
-  Printv(f_wrap_cpp, f_wrappers, "\n", 0);
-
-  emitNamespaces();
-
-  // compose the initializer function using a template
-  // filled with sub-parts
-  Template initializer(getTemplate("js_initializer"));
-  initializer.replace("$jsname", moduleName)
-      .replace("$jsv8nspaces", f_init_namespaces)
-      .replace("$jsv8classtemplates", f_init_class_templates)
-      .replace("$jsv8wrappers", f_init_wrappers)
-      .replace("$jsv8inheritance", f_init_inheritance)
-      .replace("$jsv8classinstances", f_init_class_instances)
-      .replace("$jsv8staticwrappers", f_init_static_wrappers)
-      .replace("$jsv8registerclasses", f_init_register_classes)
-      .replace("$jsv8registernspaces", f_init_register_namespaces);
-  Printv(f_init, initializer.str(), 0);
-
-  Printv(f_wrap_cpp, f_init, 0);
-
-  Printv(f_wrap_cpp, f_post_init, 0);
-
-  return SWIG_OK;
-}
-
-int V8Emitter::close() {
-  Delete(f_runtime);
-  Delete(f_header);
-  Delete(f_class_templates);
-  Delete(f_init_namespaces);
-  Delete(f_init_class_templates);
-  Delete(f_init_wrappers);
-  Delete(f_init_inheritance);
-  Delete(f_init_class_instances);
-  Delete(f_init_static_wrappers);
-  Delete(f_init_register_classes);
-  Delete(f_init_register_namespaces);
-  Delete(f_init);
-  Delete(f_post_init);
-  Delete(f_wrap_cpp);
-  return SWIG_OK;
-}
-
-int V8Emitter::enterClass(Node *n) {
-  JSEmitter::enterClass(n);
-
-  // emit declaration of a v8 class template
-  Template t_decl_class(getTemplate("jsv8_declare_class_template"));
-  t_decl_class.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .trim()
-      .pretty_print(f_class_templates);
-
-  return SWIG_OK;
-}
-
-int V8Emitter::exitClass(Node *n) {
-  if (GetFlag(state.clazz(), IS_ABSTRACT)) {
-    Template t_veto_ctor(getTemplate("js_veto_ctor"));
-    t_veto_ctor.replace("$jswrapper", state.clazz(CTOR))
-	.replace("$jsname", state.clazz(NAME))
-	.pretty_print(f_wrappers);
-  }
-
-  /* Note: this makes sure that there is a swig_type added for this class */
-  String *clientData = NewString("");
-  Printf(clientData, "&%s_clientData", state.clazz(NAME_MANGLED));
-
-  /* Note: this makes sure that there is a swig_type added for this class */
-  SwigType_remember_clientdata(state.clazz(TYPE_MANGLED), NewString("0"));
-
-  // emit definition of v8 class template
-  Template t_def_class = getTemplate("jsv8_define_class_template");
-  t_def_class.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .replace("$jsname", state.clazz(NAME))
-      .replace("$jsmangledtype", state.clazz(TYPE_MANGLED))
-      .replace("$jsdtor", state.clazz(DTOR))
-      .trim()
-      .pretty_print(f_init_class_templates);
-
-  Template t_class_instance = getTemplate("jsv8_create_class_instance");
-  t_class_instance.replace("$jsname", state.clazz(NAME))
-      .replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .replace("$jsctor", state.clazz(CTOR))
-      .trim()
-      .pretty_print(f_init_class_instances);
-
-  //  emit inheritance setup
-  Node *baseClass = getBaseClass(n);
-  if (baseClass) {
-    String *base_name = Getattr(baseClass, "name");
-
-    Template t_inherit = getTemplate("jsv8_inherit");
-
-    String *base_name_mangled = SwigType_manglestr(base_name);
-    t_inherit.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	.replace("$jsbaseclass", base_name_mangled)
-	.trim()
-	.pretty_print(f_init_inheritance);
-    Delete(base_name_mangled);
-  }
-  //  emit registeration of class template
-  Template t_register = getTemplate("jsv8_register_class");
-  t_register.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-      .replace("$jsname", state.clazz(NAME))
-      .replace("$jsparent", Getattr(state.clazz("nspace"), NAME_MANGLED))
-      .trim()
-      .pretty_print(f_init_register_classes);
-
-  return SWIG_OK;
-}
-
-int V8Emitter::enterVariable(Node *n) {
-  JSEmitter::enterVariable(n);
-
-  state.variable(GETTER, NULL_STR);
-  state.variable(SETTER, VETO_SET);
-
-  return SWIG_OK;
-}
-
-int V8Emitter::exitVariable(Node *n) {
-  if (GetFlag(n, "ismember")) {
-    if (GetFlag(state.variable(), IS_STATIC) || Equal(Getattr(n, "nodeType"), "enumitem")) {
-      Template t_register = getTemplate("jsv8_register_static_variable");
-      t_register.replace("$jsparent", state.clazz(NAME_MANGLED))
-	  .replace("$jsname", state.variable(NAME))
-	  .replace("$jsgetter", state.variable(GETTER))
-	  .replace("$jssetter", state.variable(SETTER))
-	  .trim()
-	  .pretty_print(f_init_static_wrappers);
-    } else {
-      Template t_register = getTemplate("jsv8_register_member_variable");
-      t_register.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	  .replace("$jsname", state.variable(NAME))
-	  .replace("$jsgetter", state.variable(GETTER))
-	  .replace("$jssetter", state.variable(SETTER))
-	  .trim()
-	  .pretty_print(f_init_wrappers);
-    }
-  } else {
-    // Note: a global variable is treated like a static variable
-    //       with the parent being a nspace object (instead of class object)
-    Template t_register = getTemplate("jsv8_register_static_variable");
-    t_register.replace("$jsparent", Getattr(current_namespace, NAME_MANGLED))
-	.replace("$jsname", state.variable(NAME))
-	.replace("$jsgetter", state.variable(GETTER))
-	.replace("$jssetter", state.variable(SETTER))
-	.trim()
-	.pretty_print(f_init_wrappers);
-  }
-
-  return SWIG_OK;
-}
-
-int V8Emitter::exitFunction(Node *n) {
-  bool is_member = GetFlag(n, "ismember") != 0 || GetFlag(n, "feature:extend") != 0;
-
-  // create a dispatcher for overloaded functions
-  bool is_overloaded = GetFlag(n, "sym:overloaded") != 0;
-  if (is_overloaded) {
-    if (!Getattr(n, "sym:nextSibling")) {
-      //state.function(WRAPPER_NAME, Swig_name_wrapper(Getattr(n, "name")));
-      emitFunctionDispatcher(n, is_member);
-    } else {
-      //don't register wrappers of overloaded functions in function tables
-      return SWIG_OK;
-    }
-  }
-  // register the function at the specific context
-  if (is_member) {
-    if (GetFlag(state.function(), IS_STATIC)) {
-      Template t_register = getTemplate("jsv8_register_static_function");
-      t_register.replace("$jsparent", state.clazz(NAME_MANGLED))
-	  .replace("$jsname", state.function(NAME))
-	  .replace("$jswrapper", state.function(WRAPPER_NAME))
-	  .trim()
-	  .pretty_print(f_init_static_wrappers);
-    } else {
-      Template t_register = getTemplate("jsv8_register_member_function");
-      t_register.replace("$jsmangledname", state.clazz(NAME_MANGLED))
-	  .replace("$jsname", state.function(NAME))
-	  .replace("$jswrapper", state.function(WRAPPER_NAME))
-	  .trim()
-	  .pretty_print(f_init_wrappers);
-    }
-  } else {
-    // Note: a global function is treated like a static function
-    //       with the parent being a nspace object instead of class object
-    Template t_register = getTemplate("jsv8_register_static_function");
-    t_register.replace("$jsparent", Getattr(current_namespace, NAME_MANGLED))
-	.replace("$jsname", state.function(NAME))
-	.replace("$jswrapper", state.function(WRAPPER_NAME))
-	.trim()
-	.pretty_print(f_init_static_wrappers);
-  }
-
-  return SWIG_OK;
-}
-
-void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) {
-  Parm *p;
-  String *tm;
-
-  int startIdx = 0;
-  if (is_member && !is_static && mode != Ctor) {
-    startIdx = 1;
-  }
-  // store number of arguments for argument checks
-  int num_args = emit_num_arguments(parms) - startIdx;
-  String *argcount = NewString("");
-  Printf(argcount, "%d", num_args);
-  Setattr(n, ARGCOUNT, argcount);
-
-  int i = 0;
-  for (p = parms; p; i++) {
-    String *arg = NewString("");
-    String *type = Getattr(p, "type");
-
-    // ignore varargs
-    if (SwigType_isvarargs(type))
-      break;
-
-    switch (mode) {
-    case Getter:
-      if (is_member && !is_static && i == 0) {
-	Printv(arg, "info.Holder()", 0);
-      } else {
-	Printf(arg, "args[%d]", i - startIdx);
-      }
-      break;
-    case Function:
-      if (is_member && !is_static && i == 0) {
-	Printv(arg, "args.Holder()", 0);
-      } else {
-	Printf(arg, "args[%d]", i - startIdx);
-      }
-      break;
-    case Setter:
-      if (is_member && !is_static && i == 0) {
-	Printv(arg, "info.Holder()", 0);
-      } else {
-	Printv(arg, "value", 0);
-      }
-      break;
-    case Ctor:
-      Printf(arg, "args[%d]", i);
-      break;
-    default:
-      throw "Illegal state.";
-    }
-
-    tm = emitInputTypemap(n, p, wrapper, arg);
-    Delete(arg);
-
-    if (tm) {
-      p = Getattr(p, "tmap:in:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-}
-
-int V8Emitter::emitNamespaces() {
-  Iterator it;
-  for (it = First(namespaces); it.item; it = Next(it)) {
-    Hash *entry = it.item;
-    String *name = Getattr(entry, NAME);
-    String *name_mangled = Getattr(entry, NAME_MANGLED);
-    String *parent = Getattr(entry, PARENT);
-    String *parent_mangled = Swig_name_mangle(parent);
-
-    bool do_create = true;
-    bool do_register = true;
-
-    if (Equal(parent, "")) {
-      do_register = false;
-    }
-    // Note: 'exports' is by convention the name of the object where
-    // globals are stored into
-    if (Equal(name, "exports")) {
-      do_create = false;
-    }
-
-    if (do_create) {
-      // create namespace object and register it to the parent scope
-      Template t_create_ns = getTemplate("jsv8_create_namespace");
-      t_create_ns.replace("$jsmangledname", name_mangled)
-	  .trim()
-	  .pretty_print(f_init_namespaces);
-    }
-
-    if (do_register) {
-      Template t_register_ns = getTemplate("jsv8_register_namespace");
-      t_register_ns.replace("$jsmangledname", name_mangled)
-	  .replace("$jsname", name)
-	  .replace("$jsparent", parent_mangled)
-	  .trim();
-
-      // prepend in order to achieve reversed order of registration statements
-      String *tmp_register_stmt = NewString("");
-      t_register_ns.pretty_print(tmp_register_stmt);
-      Insert(f_init_register_namespaces, 0, tmp_register_stmt);
-      Delete(tmp_register_stmt);
-    }
-  }
-
-  return SWIG_OK;
-}
-
-JSEmitter *swig_javascript_create_V8Emitter() {
-  return new V8Emitter();
-}
-
-/**********************************************************************
- * Helper implementations
- **********************************************************************/
-
-JSEmitterState::JSEmitterState()
-:  globalHash(NewHash()) {
-  // initialize sub-hashes
-  Setattr(globalHash, "class", NewHash());
-  Setattr(globalHash, "function", NewHash());
-  Setattr(globalHash, "variable", NewHash());
-}
-
-JSEmitterState::~JSEmitterState() {
-  Delete(globalHash);
-}
-
-DOH *JSEmitterState::getState(const char *key, bool new_key) {
-  if (new_key) {
-    Hash *hash = NewHash();
-    Setattr(globalHash, key, hash);
-  }
-  return Getattr(globalHash, key);
-}
-
-DOH *JSEmitterState::globals() {
-  return globalHash;
-}
-
-DOH *JSEmitterState::globals(const char *key, DOH *initial) {
-  if (initial != 0) {
-    Setattr(globalHash, key, initial);
-  }
-  return Getattr(globalHash, key);
-}
-
-DOH *JSEmitterState::clazz(bool new_key) {
-  return getState("class", new_key);
-}
-
-DOH *JSEmitterState::clazz(const char *key, DOH *initial) {
-  DOH *c = clazz();
-  if (initial != 0) {
-    Setattr(c, key, initial);
-  }
-  return Getattr(c, key);
-}
-
-DOH *JSEmitterState::function(bool new_key) {
-  return getState("function", new_key);
-}
-
-DOH *JSEmitterState::function(const char *key, DOH *initial) {
-  DOH *f = function();
-  if (initial != 0) {
-    Setattr(f, key, initial);
-  }
-  return Getattr(f, key);
-}
-
-DOH *JSEmitterState::variable(bool new_key) {
-  return getState("variable", new_key);
-}
-
-DOH *JSEmitterState::variable(const char *key, DOH *initial) {
-  DOH *v = variable();
-  if (initial != 0) {
-    Setattr(v, key, initial);
-  }
-  return Getattr(v, key);
-}
-
-/*static*/
-int JSEmitterState::IsSet(DOH *val) {
-  if (!val) {
-    return 0;
-  } else {
-    const char *cval = Char(val);
-    if (!cval)
-      return 0;
-    return (strcmp(cval, "0") != 0) ? 1 : 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Template::Template() :  creates a Template class for given template code
- * ----------------------------------------------------------------------------- */
-
-Template::Template(const String *code_) {
-
-  if (!code_) {
-    Printf(stdout, "Template code was null. Illegal input for template.");
-    SWIG_exit(EXIT_FAILURE);
-  }
-  code = NewString(code_);
-  templateName = NewString("");
-}
-
-Template::Template(const String *code_, const String *templateName_) {
-
-  if (!code_) {
-    Printf(stdout, "Template code was null. Illegal input for template.");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  code = NewString(code_);
-  templateName = NewString(templateName_);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Template::~Template() :  cleans up of Template.
- * ----------------------------------------------------------------------------- */
-
-Template::~Template() {
-  Delete(code);
-  Delete(templateName);
-}
-
-/* -----------------------------------------------------------------------------
- * String* Template::str() :  retrieves the current content of the template.
- * ----------------------------------------------------------------------------- */
-
-String *Template::str() {
-  if (js_template_enable_debug) {
-    String *pre_code = NewString("");
-    String *post_code = NewString("");
-    String *debug_code = NewString("");
-    Printf(pre_code, "/* begin fragment(\"%s\") */", templateName);
-    Printf(post_code, "/* end fragment(\"%s\") */", templateName);
-    Printf(debug_code, "%s\n%s\n%s\n", pre_code, code, post_code);
-
-    Delete(code);
-    Delete(pre_code);
-    Delete(post_code);
-
-    code = debug_code;
-  }
-  return code;
-}
-
-Template & Template::trim() {
-  const char *str = Char(code);
-  if (str == 0)
-    return *this;
-
-  int length = Len(code);
-  if (length == 0)
-    return *this;
-
-  int idx;
-  for (idx = 0; idx < length; ++idx) {
-    if (str[idx] != ' ' && str[idx] != '\t' && str[idx] != '\r' && str[idx] != '\n')
-      break;
-  }
-  int start_pos = idx;
-
-  for (idx = length - 1; idx >= start_pos; --idx) {
-    if (str[idx] != ' ' && str[idx] != '\t' && str[idx] != '\r' && str[idx] != '\n')
-      break;
-  }
-  int end_pos = idx;
-
-  int new_length = end_pos - start_pos + 1;
-  char *newstr = new char[new_length + 1];
-  memcpy(newstr, str + start_pos, new_length);
-  newstr[new_length] = 0;
-
-  Delete(code);
-  code = NewString(newstr);
-  delete[]newstr;
-
-  return *this;
-}
-
-/* -----------------------------------------------------------------------------
- * Template&  Template::replace(const String* pattern, const String* repl) :
- *
- *  replaces all occurences of a given pattern with a given replacement.
- *
- *  - pattern:  the pattern to be replaced
- *  - repl:     the replacement string
- *  - returns a reference to the Template to allow chaining of methods.
- * ----------------------------------------------------------------------------- */
-
-Template & Template::replace(const String *pattern, const String *repl) {
-  Replaceall(code, pattern, repl);
-  return *this;
-}
-
-Template & Template::print(DOH *doh) {
-  Printv(doh, str(), 0);
-  return *this;
-}
-
-Template & Template::pretty_print(DOH *doh) {
-  Wrapper_pretty_print(str(), doh);
-  return *this;
-}
-
-Template::Template(const Template & t) {
-  code = NewString(t.code);
-  templateName = NewString(t.templateName);
-}
-
-void Template::operator=(const Template & t) {
-  Delete(code);
-  Delete(templateName);
-  code = NewString(t.code);
-  templateName = NewString(t.templateName);
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/lang.cxx b/dependencies2013/win32/swig/Source/Modules/lang.cxx
deleted file mode 100644
index 4dc39e06..00000000
--- a/dependencies2013/win32/swig/Source/Modules/lang.cxx
+++ /dev/null
@@ -1,3856 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * lang.cxx
- *
- * Language base class functions.  Default C++ handling is also implemented here.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-
-/* default mode settings */
-static int director_mode = 0;
-static int director_protected_mode = 1;
-static int all_protected_mode = 0;
-static int naturalvar_mode = 0;
-Language *Language::this_ = 0;
-
-/* Set director_protected_mode */
-void Wrapper_director_mode_set(int flag) {
-  director_mode = flag;
-}
-
-void Wrapper_director_protected_mode_set(int flag) {
-  director_protected_mode = flag;
-}
-
-void Wrapper_all_protected_mode_set(int flag) {
-  all_protected_mode = flag;
-}
-
-void Wrapper_naturalvar_mode_set(int flag) {
-  naturalvar_mode = flag;
-}
-
-extern "C" {
-  int Swig_director_mode() {
-    return director_mode;
-  }
-  int Swig_director_protected_mode() {
-    return director_protected_mode;
-  }
-  int Swig_all_protected_mode() {
-    return all_protected_mode;
-  }
-  void Language_replace_special_variables(String *method, String *tm, Parm *parm) {
-    Language::instance()->replaceSpecialVariables(method, tm, parm);
-  }
-}
-
-/* Some status variables used during parsing */
-static int InClass = 0; /* Parsing C++ or not */
-static String *ClassName = 0;	/* This is the real name of the current class */
-static String *EnumClassName = 0; /* Enum class name */
-static String *ClassPrefix = 0;	/* Class prefix */
-static String *EnumClassPrefix = 0; /* Prefix for strongly typed enums (including ClassPrefix) */
-static String *NSpace = 0;	/* Namespace for the nspace feature */
-static String *ClassType = 0;	/* Fully qualified type name to use */
-static String *DirectorClassName = 0;	/* Director name of the current class */
-int Abstract = 0;
-int ImportMode = 0;
-int IsVirtual = 0;
-static String *AttributeFunctionGet = 0;
-static String *AttributeFunctionSet = 0;
-static Node *CurrentClass = 0;
-int line_number = 0;
-String *input_file = 0;
-int SmartPointer = 0;
-static Hash *classhash;
-
-extern int GenerateDefault;
-extern int ForceExtern;
-extern int AddExtern;
-
-/* import modes */
-
-#define  IMPORT_MODE     1
-#define  IMPORT_MODULE   2
-
-/* ----------------------------------------------------------------------
- * Dispatcher::emit_one()
- *
- * Dispatch a single node
- * ---------------------------------------------------------------------- */
-
-int Dispatcher::emit_one(Node *n) {
-  int ret = SWIG_OK;
-
-  char *tag = Char(nodeType(n));
-  if (!tag) {
-    /* Printf(stderr,"SWIG: Fatal internal error. Malformed parse tree
-       node!\n"); */
-    return SWIG_OK;
-  }
-
-  /* Do not proceed if marked with an error */
-
-  if (Getattr(n, "error"))
-    return SWIG_OK;
-
-  /* Look for warnings */
-  String *wrn = Getattr(n, "feature:warnfilter");
-  if (wrn)
-    Swig_warnfilter(wrn, 1);
-
-  /* ============================================================
-   * C/C++ parsing
-   * ============================================================ */
-
-  if (strcmp(tag, "extern") == 0) {
-    ret = externDeclaration(n);
-  } else if (strcmp(tag, "cdecl") == 0) {
-    ret = cDeclaration(n);
-  } else if (strcmp(tag, "enum") == 0) {
-    ret = enumDeclaration(n);
-  } else if (strcmp(tag, "enumitem") == 0) {
-    ret = enumvalueDeclaration(n);
-  } else if (strcmp(tag, "enumforward") == 0) {
-    ret = enumforwardDeclaration(n);
-  } else if (strcmp(tag, "class") == 0) {
-    ret = classDeclaration(n);
-  } else if (strcmp(tag, "classforward") == 0) {
-    ret = classforwardDeclaration(n);
-  } else if (strcmp(tag, "constructor") == 0) {
-    ret = constructorDeclaration(n);
-  } else if (strcmp(tag, "destructor") == 0) {
-    ret = destructorDeclaration(n);
-  } else if (strcmp(tag, "access") == 0) {
-    ret = accessDeclaration(n);
-  } else if (strcmp(tag, "using") == 0) {
-    ret = usingDeclaration(n);
-  } else if (strcmp(tag, "namespace") == 0) {
-    ret = namespaceDeclaration(n);
-  } else if (strcmp(tag, "template") == 0) {
-    ret = templateDeclaration(n);
-  } else if (strcmp(tag, "lambda") == 0) {
-    ret = lambdaDeclaration(n);
-  }
-
-  /* ===============================================================
-   *  SWIG directives
-   * =============================================================== */
-
-  else if (strcmp(tag, "top") == 0) {
-    ret = top(n);
-  } else if (strcmp(tag, "extend") == 0) {
-    ret = extendDirective(n);
-  } else if (strcmp(tag, "apply") == 0) {
-    ret = applyDirective(n);
-  } else if (strcmp(tag, "clear") == 0) {
-    ret = clearDirective(n);
-  } else if (strcmp(tag, "constant") == 0) {
-    ret = constantDirective(n);
-  } else if (strcmp(tag, "fragment") == 0) {
-    ret = fragmentDirective(n);
-  } else if (strcmp(tag, "import") == 0) {
-    ret = importDirective(n);
-  } else if (strcmp(tag, "include") == 0) {
-    ret = includeDirective(n);
-  } else if (strcmp(tag, "insert") == 0) {
-    ret = insertDirective(n);
-  } else if (strcmp(tag, "module") == 0) {
-    ret = moduleDirective(n);
-  } else if (strcmp(tag, "native") == 0) {
-    ret = nativeDirective(n);
-  } else if (strcmp(tag, "pragma") == 0) {
-    ret = pragmaDirective(n);
-  } else if (strcmp(tag, "typemap") == 0) {
-    ret = typemapDirective(n);
-  } else if (strcmp(tag, "typemapcopy") == 0) {
-    ret = typemapcopyDirective(n);
-  } else if (strcmp(tag, "typemapitem") == 0) {
-    ret = typemapitemDirective(n);
-  } else if (strcmp(tag, "types") == 0) {
-    ret = typesDirective(n);
-  } else {
-    Swig_error(input_file, line_number, "Unrecognized parse tree node type '%s'\n", tag);
-    ret = SWIG_ERROR;
-  }
-  if (wrn)
-    Swig_warnfilter(wrn, 0);
-  return ret;
-}
-
-/* ----------------------------------------------------------------------
- * Dispatcher::emit_children()
- *
- * Emit all children that match the given type. type = 0 means all types.
- * ---------------------------------------------------------------------- */
-
-int Dispatcher::emit_children(Node *n) {
-  Node *c;
-  char *eo = Char(Getattr(n, "feature:emitonlychildren"));
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    if (eo) {
-      const char *tag = Char(nodeType(c));
-      if (strcmp(tag, "cdecl") == 0) {
-	if (checkAttribute(c, "storage", "typedef"))
-	  tag = "typedef";
-      }
-      if (strstr(eo, tag) == 0) {
-	continue;
-      }
-    }
-    emit_one(c);
-  }
-  return SWIG_OK;
-}
-
-
-/* Stubs for dispatcher class.  We don't do anything by default---up to derived class
-   to fill in traversal code */
-
-int Dispatcher::defaultHandler(Node *) {
-  return SWIG_OK;
-}
-int Dispatcher::extendDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::applyDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::clearDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::constantDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::fragmentDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::importDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::includeDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::insertDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::moduleDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::nativeDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::pragmaDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::typemapDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::typemapitemDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::typemapcopyDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::typesDirective(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::cDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::externDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::enumDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::enumvalueDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::enumforwardDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::classDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::templateDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::lambdaDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::classforwardDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::constructorDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::destructorDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::accessDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::usingDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-int Dispatcher::namespaceDeclaration(Node *n) {
-  return defaultHandler(n);
-}
-
-
-/* Allocators */
-Language::Language():
-none_comparison(NewString("$arg != 0")),
-director_ctor_code(NewString("")),
-director_prot_ctor_code(0),
-symtabs(NewHash()),
-classtypes(NewHash()),
-enumtypes(NewHash()),
-overloading(0),
-multiinput(0),
-cplus_runtime(0),
-directors(0) {
-  symbolAddScope(""); // create top level/global symbol table scope
-  argc_template_string = NewString("argc");
-  argv_template_string = NewString("argv[%d]");
-
-  /* Default director constructor code, passed to Swig_ConstructorToFunction */
-  Printv(director_ctor_code, "if ( $comparison ) { /* subclassed */\n", "  $director_new \n", "} else {\n", "  $nondirector_new \n", "}\n", NIL);
-
-  /*
-     Default director 'protected' constructor code, disabled by
-     default. Each language that needs it, has to define it.
-   */
-  director_prot_ctor_code = 0;
-  director_multiple_inheritance = 1;
-  director_language = 0;
-  assert(!this_);
-  this_ = this;
-}
-
-Language::~Language() {
-  Delete(symtabs);
-  Delete(classtypes);
-  Delete(enumtypes);
-  Delete(director_ctor_code);
-  Delete(none_comparison);
-  this_ = 0;
-}
-
-  /* -----------------------------------------------------------------------------
-   * directorClassName()
-   * ----------------------------------------------------------------------------- */
-
-  String *Language::directorClassName(Node *n) {
-    String *dirclassname;
-    String *nspace = NewString(Getattr(n, "sym:nspace"));
-    const char *attrib = "director:classname";
-    String *classname = getClassPrefix();
-
-    Replace(nspace, NSPACE_SEPARATOR, "_", DOH_REPLACE_ANY);
-    if (Len(nspace) > 0)
-      dirclassname = NewStringf("SwigDirector_%s_%s", nspace, classname);
-    else
-      dirclassname = NewStringf("SwigDirector_%s", classname);
-    Setattr(n, attrib, dirclassname);
-
-    Delete(nspace);
-    return dirclassname;
-  }
-
-/* ----------------------------------------------------------------------
-   emit_one()
-   ---------------------------------------------------------------------- */
-
-int Language::emit_one(Node *n) {
-  int ret;
-  int oldext;
-  if (!n)
-    return SWIG_OK;
-
-  if (GetFlag(n, "feature:ignore")
-      && !Getattr(n, "feature:onlychildren"))
-    return SWIG_OK;
-
-  oldext = Extend;
-  if (Getattr(n, "feature:extend"))
-    Extend = 1;
-
-  line_number = Getline(n);
-  input_file = Getfile(n);
-
-  /*
-     symtab = Getattr(n,"symtab");
-     if (symtab) {
-     symtab = Swig_symbol_setscope(symtab);
-     }
-   */
-  ret = Dispatcher::emit_one(n);
-  /*
-     if (symtab) {
-     Swig_symbol_setscope(symtab);
-     }
-   */
-  Extend = oldext;
-  return ret;
-}
-
-
-static Parm *nonvoid_parms(Parm *p) {
-  if (p) {
-    SwigType *t = Getattr(p, "type");
-    if (SwigType_type(t) == T_VOID)
-      return 0;
-  }
-  return p;
-}
-
-/* -----------------------------------------------------------------------------
- * cplus_value_type()
- *
- * Returns the alternative value type needed in C++ for class value
- * types. When swig is not sure about using a plain $ltype value,
- * since the class doesn't have a default constructor, or it can't be
- * assigned, you will get back 'SwigValueWrapper<type >'.
- *
- * ----------------------------------------------------------------------------- */
-
-SwigType *cplus_value_type(SwigType *t) {
-  return SwigType_alttype(t, 0);
-}
-
-static Node *first_nontemplate(Node *n) {
-  while (n) {
-    if (Strcmp(nodeType(n), "template") != 0)
-      return n;
-    n = Getattr(n, "sym:nextSibling");
-  }
-  return n;
-}
-
-
-
-/* --------------------------------------------------------------------------
- * swig_pragma()
- *
- * Handle swig pragma directives.  
- * -------------------------------------------------------------------------- */
-
-void swig_pragma(char *lang, char *name, char *value) {
-  if (strcmp(lang, "swig") == 0) {
-    if ((strcmp(name, "make_default") == 0) || ((strcmp(name, "makedefault") == 0))) {
-      GenerateDefault = 1;
-    } else if ((strcmp(name, "no_default") == 0) || ((strcmp(name, "nodefault") == 0))) {
-      Swig_warning(WARN_DEPRECATED_NODEFAULT, "SWIG", 1, "dangerous, use %%nodefaultctor, %%nodefaultdtor instead.\n");
-      GenerateDefault = 0;
-    } else if (strcmp(name, "attributefunction") == 0) {
-      String *nvalue = NewString(value);
-      char *s = strchr(Char(nvalue), ':');
-      if (!s) {
-	Swig_error(input_file, line_number, "Bad value for attributefunction. Expected \"fmtget:fmtset\".\n");
-      } else {
-	*s = 0;
-	AttributeFunctionGet = NewString(Char(nvalue));
-	AttributeFunctionSet = NewString(s + 1);
-      }
-      Delete(nvalue);
-    } else if (strcmp(name, "noattributefunction") == 0) {
-      AttributeFunctionGet = 0;
-      AttributeFunctionSet = 0;
-    }
-  }
-}
-
-/* --------------------------------------------------------------------------
- * Language::use_naturalvar_mode()
- *
- * Determine whether to use const ref typemaps instead of pointer typemaps
- * for variable access.
- * -------------------------------------------------------------------------- */
-int Language::use_naturalvar_mode(Node *n) const {
-  if (Getattr(n, "unnamed"))
-    return 0;
-
-  // The naturalvar feature can be attached to either the variable name or the variable's type
-  // naturalvar on the variable name is more specific and overrides naturalvar on the variable's type
-  String *naturalvar = Getattr(n, "feature:naturalvar");
-  bool explicitly_off = naturalvar && Strcmp(naturalvar, "0") == 0;
-  int nvar = GetFlag(n, "feature:naturalvar");
-
-  if (!explicitly_off && !nvar) {
-    /* look for feature in the class */
-    SwigType *ty = Getattr(n, "type");
-    SwigType *fullty = SwigType_typedef_resolve_all(ty);
-    if (SwigType_isclass(fullty)) {
-      SwigType *tys = SwigType_strip_qualifiers(fullty);
-      if (!CPlusPlus) {
-	Replaceall(tys, "struct ", "");
-	Replaceall(tys, "union ", "");
-	Replaceall(tys, "class ", "");
-      }
-      Node *typenode = Swig_symbol_clookup(tys, 0);
-      if (typenode) {
-	naturalvar = Getattr(typenode, "feature:naturalvar");
-	explicitly_off = naturalvar && Strcmp(naturalvar, "0") == 0;
-	nvar = nvar || GetFlag(typenode, "feature:naturalvar");
-      }
-      Delete(tys);
-    }
-    Delete(fullty);
-  }
-  nvar = nvar || naturalvar_mode;
-  return explicitly_off ? 0 : nvar ? CWRAP_NATURAL_VAR : 0;
-}
-
-/* ----------------------------------------------------------------------
- * Language::top()   - Top of parsing tree 
- * ---------------------------------------------------------------------- */
-
-int Language::top(Node *n) {
-  Node *mod = Getattr(n, "module");
-  if (mod) {
-    Node *options = Getattr(mod, "options");
-    if (options) {
-      if (Getattr(options, "naturalvar")) {
-	naturalvar_mode = 1;
-      }
-    }
-  }
-  classhash = Getattr(n, "classes");
-  return emit_children(n);
-}
-
-/* ----------------------------------------------------------------------
- * Language::extendDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::extendDirective(Node *n) {
-  save_value<int> oldam(Extend, CWRAP_EXTEND);
-  save_value<AccessMode> oldmode(cplus_mode, PUBLIC);
-  emit_children(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::applyDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::applyDirective(Node *n) {
-
-  Parm *pattern = Getattr(n, "pattern");
-  Node *c = firstChild(n);
-  while (c) {
-    Parm *apattern = Getattr(c, "pattern");
-    if (ParmList_len(pattern) != ParmList_len(apattern)) {
-      Swig_error(input_file, line_number, "Can't apply (%s) to (%s).  Number of arguments don't match.\n", ParmList_str(pattern), ParmList_str(apattern));
-    } else {
-      if (!Swig_typemap_apply(pattern, apattern)) {
-	Swig_warning(WARN_TYPEMAP_APPLY_UNDEF, input_file, line_number, "Can't apply (%s). No typemaps are defined.\n", ParmList_str(pattern));
-      }
-    }
-    c = nextSibling(c);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::clearDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::clearDirective(Node *n) {
-  Node *p;
-  for (p = firstChild(n); p; p = nextSibling(p)) {
-    ParmList *pattern = Getattr(p, "pattern");
-    Swig_typemap_clear_apply(pattern);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::constantDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::constantDirective(Node *n) {
-
-  if (CurrentClass && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  if (!GetFlag(n, "feature:allowexcept")) {
-    UnsetFlag(n, "feature:except");
-  }
-  if (Getattr(n, "feature:exceptvar")) {
-    Setattr(n, "feature:except", Getattr(n, "feature:exceptvar"));
-  }
-
-  if (!ImportMode) {
-    Swig_require("constantDirective", n, "name", "?value", NIL);
-    String *name = Getattr(n, "name");
-    String *value = Getattr(n, "value");
-    if (!value) {
-      value = Copy(name);
-    } else {
-      /*      if (checkAttribute(n,"type","char")) {
-         value = NewString(value);
-         } else {
-         value = NewStringf("%(escape)s", value);
-         }
-       */
-      Setattr(n, "rawvalue", value);
-      value = NewStringf("%(escape)s", value);
-      if (!Len(value))
-	Append(value, "\\0");
-      /*      Printf(stdout,"'%s' = '%s'\n", name, value); */
-    }
-    Setattr(n, "value", value);
-    this->constantWrapper(n);
-    Swig_restore(n);
-    return SWIG_OK;
-  }
-  return SWIG_NOWRAP;
-}
-
-/* ----------------------------------------------------------------------
- * Language::fragmentDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::fragmentDirective(Node *n) {
-  Swig_fragment_register(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::importDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::importDirective(Node *n) {
-  int oldim = ImportMode;
-  ImportMode = IMPORT_MODE;
-  emit_children(n);
-  ImportMode = oldim;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::includeDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::includeDirective(Node *n) {
-  emit_children(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::insertDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::insertDirective(Node *n) {
-  /* %insert directive */
-  if ((!ImportMode) || Getattr(n, "generated")) {
-    String *code = Getattr(n, "code");
-    String *section = Getattr(n, "section");
-    File *f = 0;
-    if (!section) {		/* %{ ... %} */
-      f = Swig_filebyname("header");
-    } else {
-      f = Swig_filebyname(section);
-    }
-    if (f) {
-      Printf(f, "%s\n", code);
-    } else {
-      Swig_error(input_file, line_number, "Unknown target '%s' for %%insert directive.\n", section);
-    }
-    return SWIG_OK;
-  } else {
-    return SWIG_NOWRAP;
-  }
-}
-
-/* ----------------------------------------------------------------------
- * Language::moduleDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::moduleDirective(Node *n) {
-  (void) n;
-  /* %module directive */
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::nativeDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::nativeDirective(Node *n) {
-  if (!ImportMode) {
-    return nativeWrapper(n);
-  } else {
-    return SWIG_NOWRAP;
-  }
-}
-
-/* ----------------------------------------------------------------------
- * Language::pragmaDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::pragmaDirective(Node *n) {
-  /* %pragma directive */
-  if (!ImportMode) {
-    String *lan = Getattr(n, "lang");
-    String *name = Getattr(n, "name");
-    String *value = Getattr(n, "value");
-    swig_pragma(Char(lan), Char(name), Char(value));
-    /*  pragma(Char(lan),Char(name),Char(value)); */
-    return SWIG_OK;
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::typemapDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::typemapDirective(Node *n) {
-  /* %typemap directive */
-  String *method = Getattr(n, "method");
-  String *code = Getattr(n, "code");
-  Parm *kwargs = Getattr(n, "kwargs");
-  Node *items = firstChild(n);
-  static int namewarn = 0;
-
-
-  if (code && (Strstr(code, "$source") || (Strstr(code, "$target")))) {
-    Swig_warning(WARN_TYPEMAP_SOURCETARGET, Getfile(n), Getline(n), "Deprecated typemap feature ($source/$target).\n");
-    if (!namewarn) {
-      Swig_warning(WARN_TYPEMAP_SOURCETARGET, Getfile(n), Getline(n), "The use of $source and $target in a typemap declaration is deprecated.\n\
-For typemaps related to argument input (in,ignore,default,arginit,check), replace\n\
-$source by $input and $target by $1.   For typemaps related to return values (out,\n\
-argout,ret,except), replace $source by $1 and $target by $result.  See the file\n\
-Doc/Manual/Typemaps.html for complete details.\n");
-      namewarn = 1;
-    }
-  }
-
-  if (Strcmp(method, "except") == 0) {
-    Swig_warning(WARN_DEPRECATED_EXCEPT_TM, Getfile(n), Getline(n), "%%typemap(except) is deprecated. Use the %%exception directive.\n");
-  }
-
-  if (Strcmp(method, "in") == 0) {
-    Hash *k;
-    k = kwargs;
-    while (k) {
-      if (checkAttribute(k, "name", "numinputs")) {
-	if (!multiinput && (GetInt(k, "value") > 1)) {
-	  Swig_error(Getfile(n), Getline(n), "Multiple-input typemaps (numinputs > 1) not supported by this target language module.\n");
-	  return SWIG_ERROR;
-	}
-	break;
-      }
-      k = nextSibling(k);
-    }
-    if (!k) {
-      k = NewHash();
-      Setattr(k, "name", "numinputs");
-      Setattr(k, "value", "1");
-      set_nextSibling(k, kwargs);
-      Setattr(n, "kwargs", k);
-      kwargs = k;
-    }
-  }
-
-  if (Strcmp(method, "ignore") == 0) {
-    Swig_warning(WARN_DEPRECATED_IGNORE_TM, Getfile(n), Getline(n), "%%typemap(ignore) has been replaced by %%typemap(in,numinputs=0).\n");
-
-    Clear(method);
-    Append(method, "in");
-    Hash *k = NewHash();
-    Setattr(k, "name", "numinputs");
-    Setattr(k, "value", "0");
-    set_nextSibling(k, kwargs);
-    Setattr(n, "kwargs", k);
-    kwargs = k;
-  }
-
-  /* Replace $descriptor() macros */
-
-  if (code) {
-    Setfile(code, Getfile(n));
-    Setline(code, Getline(n));
-    Swig_cparse_replace_descriptor(code);
-  }
-
-  while (items) {
-    Parm *pattern = Getattr(items, "pattern");
-    Parm *parms = Getattr(items, "parms");
-
-    if (code) {
-      Swig_typemap_register(method, pattern, code, parms, kwargs);
-    } else {
-      Swig_typemap_clear(method, pattern);
-    }
-    items = nextSibling(items);
-  }
-  return SWIG_OK;
-
-}
-
-/* ----------------------------------------------------------------------
- * Language::typemapcopyDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::typemapcopyDirective(Node *n) {
-  String *method = Getattr(n, "method");
-  Parm *pattern = Getattr(n, "pattern");
-  Node *items = firstChild(n);
-  int nsrc = 0;
-  nsrc = ParmList_len(pattern);
-  while (items) {
-    ParmList *npattern = Getattr(items, "pattern");
-    if (nsrc != ParmList_len(npattern)) {
-      Swig_error(input_file, line_number, "Can't copy typemap. Number of types differ.\n");
-    } else {
-      if (Swig_typemap_copy(method, pattern, npattern) < 0) {
-	Swig_error(input_file, line_number, "Can't copy typemap (%s) %s = %s\n", method, ParmList_str(pattern), ParmList_str(npattern));
-      }
-    }
-    items = nextSibling(items);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::typesDirective()
- * ---------------------------------------------------------------------- */
-
-int Language::typesDirective(Node *n) {
-  Parm *parms = Getattr(n, "parms");
-  String *convcode = Getattr(n, "convcode"); /* optional user supplied conversion code for custom casting */
-  while (parms) {
-    SwigType *t = Getattr(parms, "type");
-    String *v = Getattr(parms, "value");
-    if (!v) {
-      SwigType_remember(t);
-    } else {
-      if (SwigType_issimple(t)) {
-	SwigType_inherit(t, v, 0, convcode);
-      }
-    }
-    parms = nextSibling(parms);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::cDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::cDeclaration(Node *n) {
-
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  SwigType *decl = Getattr(n, "decl");
-  String *storage = Getattr(n, "storage");
-  Node *over;
-  File *f_header = 0;
-  SwigType *ty, *fullty;
-
-  if (Getattr(n, "feature:onlychildren")) {
-    if (GetFlag(n, "feature:ignore")) {
-      return SWIG_NOWRAP;
-    } else {
-      // Found an unignored templated method that has an empty template instantiation (%template())
-      // Ignore it unless it has been %rename'd
-      if (Strncmp(symname, "__dummy_", 8) == 0 && Cmp(storage, "typedef") != 0) {
-	SetFlag(n, "feature:ignore");
-	Swig_warning(WARN_LANG_TEMPLATE_METHOD_IGNORE, input_file, line_number,
-	    "%%template() contains no name. Template method ignored: %s\n", Swig_name_decl(n));
-	return SWIG_NOWRAP;
-      }
-    }
-  }
-
-  /* discards nodes following the access control rules */
-  if (cplus_mode != PUBLIC || !is_public(n)) {
-    /* except for friends, they are not affected by access control */
-    int isfriend = Cmp(storage, "friend") == 0;
-    if (!isfriend) {
-      /* Check what the director needs. If the method is pure virtual, it is always needed.
-       * Also wrap non-virtual protected members if asked for (allprotected mode). */
-      if (!(directorsEnabled() && ((is_member_director(CurrentClass, n) && need_nonpublic_member(n)) || isNonVirtualProtectedAccess(n)))) {
-          return SWIG_NOWRAP;
-      }
-      // Prevent wrapping protected overloaded director methods more than once -
-      // This bit of code is only needed due to the cDeclaration call in classHandler()
-      String *wrapname = NewStringf("nonpublic_%s%s", symname, Getattr(n, "sym:overname"));
-      if (Getattr(CurrentClass, wrapname)) {
-	Delete(wrapname);
-	return SWIG_NOWRAP;
-      }
-      SetFlag(CurrentClass, wrapname);
-      Delete(wrapname);
-    }
-  }
-
-  if (Cmp(storage, "typedef") == 0) {
-    Swig_save("cDeclaration", n, "type", NIL);
-    SwigType *t = Copy(type);
-    if (t) {
-      SwigType_push(t, decl);
-      Setattr(n, "type", t);
-      typedefHandler(n);
-    }
-    Swig_restore(n);
-    return SWIG_OK;
-  }
-
-  /* If in import mode, we proceed no further */
-  if (ImportMode)
-    return SWIG_NOWRAP;
-
-  /* If we're in extend mode and there is code, replace the $descriptor macros */
-  if (Extend) {
-    String *code = Getattr(n, "code");
-    if (code) {
-      Setfile(code, Getfile(n));
-      Setline(code, Getline(n));
-      Swig_cparse_replace_descriptor(code);
-    }
-  }
-
-  /* Overloaded symbol check */
-  over = Swig_symbol_isoverloaded(n);
-  if (!overloading) {
-    if (over)
-      over = first_nontemplate(over);
-    if (over && (over != n)) {
-      Swig_warning(WARN_LANG_OVERLOAD_DECL, input_file, line_number, "Overloaded declaration ignored.  %s\n", Swig_name_decl(n));
-      Swig_warning(WARN_LANG_OVERLOAD_DECL, Getfile(over), Getline(over), "Previous declaration is %s\n", Swig_name_decl(over));
-      return SWIG_NOWRAP;
-    }
-  }
-
-  if (!validIdentifier(symname)) {
-    Swig_warning(WARN_LANG_IDENTIFIER, input_file, line_number, "Can't wrap '%s' unless renamed to a valid identifier.\n", SwigType_namestr(symname));
-    return SWIG_NOWRAP;
-  }
-
-  ty = NewString(type);
-  SwigType_push(ty, decl);
-  fullty = SwigType_typedef_resolve_all(ty);
-  if (SwigType_isfunction(fullty)) {
-    if (!SwigType_isfunction(ty)) {
-      Delete(ty);
-      ty = fullty;
-      fullty = 0;
-      ParmList *parms = SwigType_function_parms(ty, n);
-      Setattr(n, "parms", parms);
-    }
-    /* Transform the node into a 'function' node and emit */
-    if (!CurrentClass) {
-      f_header = Swig_filebyname("header");
-
-      if (AddExtern) {
-	if (f_header) {
-	  if (Swig_storage_isextern(n) || (ForceExtern && !storage)) {
-	    /* we don't need the 'extern' part in the C/C++ declaration,
-	       and it produces some problems when namespace and SUN
-	       Studio is used.
-
-	       Printf(f_header,"extern %s", SwigType_str(ty,name));
-
-	       In fact generating extern declarations is quite error prone and is
-	       no longer the default. Getting it right seems impossible with namespaces
-	       and default arguments and when a method is declared with the various Windows
-	       calling conventions - SWIG doesn't understand Windows (non standard) calling
-	       conventions in the first place, so can't regenerate them.
-	     */
-	    String *str = SwigType_str(ty, name);
-	    Printf(f_header, "%s", str);
-	    Delete(str);
-	    {
-	      DOH *t = Getattr(n, "throws");
-	      if (t) {
-		Printf(f_header, " throw(");
-		while (t) {
-		  Printf(f_header, "%s", Getattr(t, "type"));
-		  t = nextSibling(t);
-		  if (t)
-		    Printf(f_header, ",");
-		}
-		Printf(f_header, ")");
-	      }
-	    }
-	    Printf(f_header, ";\n");
-	  } else if (Swig_storage_isexternc(n)) {
-	    /* here 'extern "C"' is needed */
-	    String *str = SwigType_str(ty, name);
-	    Printf(f_header, "extern \"C\" %s;\n", str);
-	    Delete(str);
-	  }
-	}
-      }
-    }
-    /* This needs to check qualifiers */
-    if (SwigType_isqualifier(ty)) {
-      SwigType *qual = SwigType_pop(ty);
-      Setattr(n, "qualifier", qual);
-      Delete(qual);
-    }
-    Delete(SwigType_pop_function(ty));
-    DohIncref(type);
-    Setattr(n, "type", ty);
-
-    functionHandler(n);
-
-    Setattr(n, "type", type);
-    Delete(ty);
-    Delete(type);
-    return SWIG_OK;
-  } else {
-    /* Some kind of variable declaration */
-    String *declaration = Copy(decl);
-    Delattr(n, "decl");
-    if (!CurrentClass) {
-      if (Swig_storage_isextern(n) || ForceExtern) {
-	if (AddExtern) {
-	  f_header = Swig_filebyname("header");
-	  if (f_header) {
-	    String *str = SwigType_str(ty, name);
-	    Printf(f_header, "%s %s;\n", Getattr(n, "storage"), str);
-	    Delete(str);
-	  }
-	}
-      }
-    }
-    if (!SwigType_ismutable(ty)) {
-      SetFlag(n, "feature:immutable");
-    }
-    /* If an array and elements are const, then read-only */
-    if (SwigType_isarray(ty)) {
-      SwigType *tya = SwigType_array_type(ty);
-      if (SwigType_isconst(tya)) {
-	SetFlag(n, "feature:immutable");
-      }
-      Delete(tya);
-    }
-    DohIncref(type);
-    Setattr(n, "type", ty);
-    variableHandler(n);
-    Setattr(n, "type", type);
-    Setattr(n, "decl", declaration);
-    Delete(ty);
-    Delete(type);
-    Delete(fullty);
-    return SWIG_OK;
-  }
-}
-
-/* ----------------------------------------------------------------------
- * Language::functionHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::functionHandler(Node *n) {
-  String *storage = Getattr(n, "storage");
-  int isfriend = CurrentClass && Cmp(storage, "friend") == 0;
-  int isstatic = CurrentClass && Swig_storage_isstatic(n) && !(SmartPointer && Getattr(n, "allocate:smartpointeraccess"));
-  Parm *p = Getattr(n, "parms");
-  if (GetFlag(n, "feature:del")) {
-    /* the method acts like a delete operator, ie, we need to disown the parameter */
-    if (CurrentClass && !isstatic && !isfriend) {
-      SetFlag(n, "feature:self:disown");
-    } else {
-      if (p)
-	SetFlag(p, "wrap:disown");
-    }
-  }
-  if (!CurrentClass) {
-    globalfunctionHandler(n);
-  } else {
-    if (isstatic) {
-      staticmemberfunctionHandler(n);
-    } else if (isfriend) {
-      int oldInClass = InClass;
-      InClass = 0;
-      globalfunctionHandler(n);
-      InClass = oldInClass;
-    } else {
-      Node *explicit_n = 0;
-      if (directorsEnabled() && is_member_director(CurrentClass, n) && !extraDirectorProtectedCPPMethodsRequired()) {
-	bool virtual_but_not_pure_virtual = (!(Cmp(storage, "virtual")) && (Cmp(Getattr(n, "value"), "0") != 0));
-	if (virtual_but_not_pure_virtual) {
-	  // Add additional wrapper which makes an explicit call to the virtual method (ie not a virtual call)
-	  explicit_n = Copy(n);
-	  String *new_symname = Copy(Getattr(n, "sym:name"));
-	  String *suffix = Getattr(parentNode(n), "sym:name");
-	  Printv(new_symname, "SwigExplicit", suffix, NIL);
-	  Setattr(explicit_n, "sym:name", new_symname);
-	  Delattr(explicit_n, "storage");
-	  Delattr(explicit_n, "override");
-	  Delattr(explicit_n, "hides");
-	  SetFlag(explicit_n, "explicitcall");
-	  Setattr(n, "explicitcallnode", explicit_n);
-	}
-      }
-
-      memberfunctionHandler(n);
-
-      if (explicit_n) {
-	memberfunctionHandler(explicit_n);
-	Delattr(explicit_n, "explicitcall");
-	Delete(explicit_n);
-      }
-    }
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::globalfunctionHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::globalfunctionHandler(Node *n) {
-
-  Swig_require("globalfunctionHandler", n, "name", "sym:name", "type", "?parms", NIL);
-
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  ParmList *parms = Getattr(n, "parms");
-
-  /* Check for callback mode */
-  String *cb = GetFlagAttr(n, "feature:callback");
-  if (cb) {
-    String *cbname = Getattr(n, "feature:callback:name");
-    if (!cbname) {
-      cbname = NewStringf(cb, symname);
-      Setattr(n, "feature:callback:name", cbname);
-    }
-
-    callbackfunctionHandler(n);
-    if (Cmp(cbname, symname) == 0) {
-      Delete(cbname);
-      Swig_restore(n);
-      return SWIG_NOWRAP;
-    }
-    Delete(cbname);
-  }
-  Setattr(n, "parms", nonvoid_parms(parms));
-
-  String *extendname = Getattr(n, "extendname");
-  String *call = Swig_cfunction_call(extendname ? extendname : name, parms);
-  String *cres = Swig_cresult(type, Swig_cresult_name(), call);
-  Setattr(n, "wrap:action", cres);
-  Delete(cres);
-  Delete(call);
-  functionWrapper(n);
-
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::callbackfunctionHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::callbackfunctionHandler(Node *n) {
-  Swig_require("callbackfunctionHandler", n, "name", "*sym:name", "*type", "?value", NIL);
-  String *type = Getattr(n, "type");
-  String *name = Getattr(n, "name");
-  String *parms = Getattr(n, "parms");
-  String *cbname = Getattr(n, "feature:callback:name");
-  String *calltype = NewStringf("(%s (*)(%s))(%s)", SwigType_str(type, 0), ParmList_str(parms), SwigType_namestr(name));
-  SwigType *cbty = Copy(type);
-  SwigType_add_function(cbty, parms);
-  SwigType_add_pointer(cbty);
-
-  Setattr(n, "sym:name", cbname);
-  Setattr(n, "type", cbty);
-  Setattr(n, "value", calltype);
-
-  Node *ns = symbolLookup(cbname);
-  if (!ns)
-    constantWrapper(n);
-
-  Delete(cbty);
-
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::memberfunctionHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::memberfunctionHandler(Node *n) {
-
-  Swig_require("memberfunctionHandler", n, "*name", "*sym:name", "*type", "?parms", "?value", NIL);
-
-  String *storage = Getattr(n, "storage");
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  String *value = Getattr(n, "value");
-  ParmList *parms = Getattr(n, "parms");
-  String *cb = GetFlagAttr(n, "feature:callback");
-
-  if (Cmp(storage, "virtual") == 0) {
-    if (Cmp(value, "0") == 0) {
-      IsVirtual = PURE_VIRTUAL;
-    } else {
-      IsVirtual = PLAIN_VIRTUAL;
-    }
-  } else {
-    IsVirtual = 0;
-  }
-  if (cb) {
-    Node *cbn = NewHash();
-    String *cbname = Getattr(n, "feature:callback:name");
-    if (!cbname) {
-      cbname = NewStringf(cb, symname);
-    }
-
-    SwigType *cbty = Copy(type);
-    SwigType_add_function(cbty, parms);
-    SwigType_add_memberpointer(cbty, ClassName);
-    String *cbvalue = NewStringf("&%s::%s", ClassName, name);
-    Setattr(cbn, "sym:name", cbname);
-    Setattr(cbn, "type", cbty);
-    Setattr(cbn, "value", cbvalue);
-    Setattr(cbn, "name", name);
-    Setfile(cbn, Getfile(n));
-    Setline(cbn, Getline(n));
-
-    memberconstantHandler(cbn);
-    Setattr(n, "feature:callback:name", Swig_name_member(NSpace, ClassPrefix, cbname));
-
-    Delete(cb);
-    Delete(cbn);
-    Delete(cbvalue);
-    Delete(cbty);
-    Delete(cbname);
-    if (Cmp(cbname, symname) == 0) {
-      Swig_restore(n);
-      return SWIG_NOWRAP;
-    }
-  }
-
-  String *fname = Swig_name_member(NSpace, ClassPrefix, symname);
-  if (Extend && SmartPointer) {
-    if (!Getattr(n, "extendsmartclassname")) {
-      Setattr(n, "extendsmartclassname", Getattr(CurrentClass, "allocate:smartpointerpointeeclassname"));
-    }
-  }
-  // Set up the type for the cast to this class for use when wrapping const director (virtual) methods.
-  // Note: protected director methods or when allprotected mode turned on.
-  String *director_type = 0;
-  if (!is_public(n) && (is_member_director(CurrentClass, n) || GetFlag(n, "explicitcall") || isNonVirtualProtectedAccess(n))) {
-    director_type = Copy(DirectorClassName);
-    String *qualifier = Getattr(n, "qualifier");
-    if (qualifier)
-      SwigType_push(director_type, qualifier);
-    SwigType_add_pointer(director_type);
-  }
-
-  int DirectorExtraCall = 0;
-  if (directorsEnabled() && is_member_director(CurrentClass, n) && !SmartPointer)
-    if (extraDirectorProtectedCPPMethodsRequired())
-      DirectorExtraCall = CWRAP_DIRECTOR_TWO_CALLS;
-
-  if (GetFlag(n, "explicitcall"))
-    DirectorExtraCall = CWRAP_DIRECTOR_ONE_CALL;
-
-  int extendmember = GetFlag(n, "isextendmember") ? Extend : 0;
-  int flags = Getattr(n, "template") ? extendmember | SmartPointer : Extend | SmartPointer | DirectorExtraCall;
-  Swig_MethodToFunction(n, NSpace, ClassType, flags, director_type, is_member_director(CurrentClass, n));
-  Setattr(n, "sym:name", fname);
-
-  functionWrapper(n);
-
-  Delete(director_type);
-  Delete(fname);
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::staticmemberfunctionHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::staticmemberfunctionHandler(Node *n) {
-
-  Swig_require("staticmemberfunctionHandler", n, "*name", "*sym:name", "*type", NIL);
-  Swig_save("staticmemberfunctionHandler", n, "storage", NIL);
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  ParmList *parms = Getattr(n, "parms");
-  String *cb = GetFlagAttr(n, "feature:callback");
-  String *cname, *mrename;
-
-  if (!Extend) {
-    Node *sb = Getattr(n, "cplus:staticbase");
-    String *sname = Getattr(sb, "name");
-    if (isNonVirtualProtectedAccess(n))
-      cname = NewStringf("%s::%s", DirectorClassName, name);
-    else
-      cname = NewStringf("%s::%s", sname, name);
-  } else {
-    String *mname = Swig_name_mangle(ClassName);
-    cname = Swig_name_member(NSpace, mname, name);
-    Delete(mname);
-  }
-  mrename = Swig_name_member(NSpace, ClassPrefix, symname);
-
-  if (Extend) {
-    String *code = Getattr(n, "code");
-    String *defaultargs = Getattr(n, "defaultargs");
-    String *mangled = Swig_name_mangle(mrename);
-    Delete(mrename);
-    mrename = mangled;
-
-    if (Getattr(n, "sym:overloaded") && code) {
-      Append(cname, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
-    }
-
-    if (!defaultargs && code) {
-      /* Hmmm. An added static member.  We have to create a little wrapper for this */
-      String *mangled_cname = Swig_name_mangle(cname);
-      Swig_add_extension_code(n, mangled_cname, parms, type, code, CPlusPlus, 0);
-      Setattr(n, "extendname", mangled_cname);
-      Delete(mangled_cname);
-    }
-  }
-
-  Setattr(n, "name", cname);
-  Setattr(n, "sym:name", mrename);
-
-  if (cb) {
-    String *cbname = NewStringf(cb, symname);
-    Setattr(n, "feature:callback:name", Swig_name_member(NSpace, ClassPrefix, cbname));
-    Setattr(n, "feature:callback:staticname", name);
-  }
-  Delattr(n, "storage");
-
-  globalfunctionHandler(n);
-
-  Delete(cname);
-  Delete(mrename);
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::variableHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::variableHandler(Node *n) {
-
-  /* If not a smart-pointer access or added method. We clear
-     feature:except.   There is no way C++ or C would throw
-     an exception merely for accessing a member data.
-
-     Caveat:  Some compilers seem to route attribute access through
-     methods which can generate exceptions.  The feature:allowexcept
-     allows this. Also, the feature:exceptvar can be used to match
-     only variables.
-   */
-  if (!(Extend | SmartPointer)) {
-    if (!GetFlag(n, "feature:allowexcept")) {
-      UnsetFlag(n, "feature:except");
-    }
-    if (Getattr(n, "feature:exceptvar")) {
-      Setattr(n, "feature:except", Getattr(n, "feature:exceptvar"));
-    }
-  }
-
-  if (!CurrentClass) {
-    globalvariableHandler(n);
-  } else {
-    Swig_save("variableHandler", n, "feature:immutable", NIL);
-    if (SmartPointer) {
-      /* If a smart-pointer and it's a constant access, we have to set immutable */
-      if (!Getattr(CurrentClass, "allocate:smartpointermutable")) {
-	SetFlag(n, "feature:immutable");
-      }
-    }
-    if (Swig_storage_isstatic(n) && !(SmartPointer && Getattr(n, "allocate:smartpointeraccess"))) {
-      staticmembervariableHandler(n);
-    } else {
-      membervariableHandler(n);
-    }
-    Swig_restore(n);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::globalvariableHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::globalvariableHandler(Node *n) {
-  variableWrapper(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::membervariableHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::membervariableHandler(Node *n) {
-
-  Swig_require("membervariableHandler", n, "*name", "*sym:name", "*type", NIL);
-  Swig_save("membervariableHandler", n, "parms", NIL);
-
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-
-  if (!AttributeFunctionGet) {
-    String *mname = Swig_name_member(0, ClassPrefix, symname);
-    String *mrename_get = Swig_name_get(NSpace, mname);
-    String *mrename_set = Swig_name_set(NSpace, mname);
-    Delete(mname);
-
-    /* Create a function to set the value of the variable */
-
-    int assignable = is_assignable(n);
-
-    if (SmartPointer) {
-      if (!Getattr(CurrentClass, "allocate:smartpointermutable")) { 
-	assignable = 0;
-      }
-    }
-
-    if (assignable) {
-      int make_set_wrapper = 1;
-      String *tm = 0;
-      String *target = 0;
-      if (!Extend) {
-	if (SmartPointer) {
-	  if (Swig_storage_isstatic(n)) {
-	    Node *sn = Getattr(n, "cplus:staticbase");
-	    String *base = Getattr(sn, "name");
-	    target = NewStringf("%s::%s", base, name);
-	  } else {
-	    String *pname = Swig_cparm_name(0, 0);
-	    target = NewStringf("(*%s)->%s", pname, name);
-	    Delete(pname);
-	  }
-	} else {
-	  String *pname = isNonVirtualProtectedAccess(n) ? NewString("darg") : Swig_cparm_name(0, 0);
-	  target = NewStringf("%s->%s", pname, name);
-	  Delete(pname);
-	}
-
-	// This is an input type typemap lookup and so it should not use Node n
-	// otherwise qualification is done on the parameter name for the setter function
-	Parm *nin = NewParm(type, name, n);
-	tm = Swig_typemap_lookup("memberin", nin, target, 0);
-	Delete(nin);
-      }
-
-      int flags = Extend | SmartPointer | use_naturalvar_mode(n);
-      if (isNonVirtualProtectedAccess(n))
-        flags = flags | CWRAP_ALL_PROTECTED_ACCESS;
-
-      Swig_MembersetToFunction(n, ClassType, flags);
-      Setattr(n, "memberset", "1");
-      if (!Extend) {
-	/* Check for a member in typemap here */
-
-	if (!tm) {
-	  if (SwigType_isarray(type)) {
-	    Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(type, 0));
-	    make_set_wrapper = 0;
-	  }
-	} else {
-	  String *pname0 = Swig_cparm_name(0, 0);
-	  String *pname1 = Swig_cparm_name(0, 1);
-	  Replace(tm, "$source", pname1, DOH_REPLACE_ANY);
-	  Replace(tm, "$target", target, DOH_REPLACE_ANY);
-	  Replace(tm, "$input", pname1, DOH_REPLACE_ANY);
-	  Replace(tm, "$self", pname0, DOH_REPLACE_ANY);
-	  Setattr(n, "wrap:action", tm);
-	  Delete(tm);
-	  Delete(pname0);
-	  Delete(pname1);
-	}
-	Delete(target);
-      }
-      if (make_set_wrapper) {
-	Setattr(n, "sym:name", mrename_set);
-	functionWrapper(n);
-      } else {
-	SetFlag(n, "feature:immutable");
-      }
-      /* Restore parameters */
-      Setattr(n, "type", type);
-      Setattr(n, "name", name);
-      Setattr(n, "sym:name", symname);
-      Delattr(n, "memberset");
-
-      /* Delete all attached typemaps and typemap attributes */
-      Iterator ki;
-      for (ki = First(n); ki.key; ki = Next(ki)) {
-	if (Strncmp(ki.key, "tmap:", 5) == 0)
-	  Delattr(n, ki.key);
-      }
-    }
-    /* Emit get function */
-    {
-      int flags = Extend | SmartPointer | use_naturalvar_mode(n);
-      if (isNonVirtualProtectedAccess(n))
-        flags = flags | CWRAP_ALL_PROTECTED_ACCESS;
-      Swig_MembergetToFunction(n, ClassType, flags);
-      Setattr(n, "sym:name", mrename_get);
-      Setattr(n, "memberget", "1");
-      functionWrapper(n);
-      Delattr(n, "memberget");
-    }
-    Delete(mrename_get);
-    Delete(mrename_set);
-
-  } else {
-
-    /* This code is used to support the attributefunction directive 
-       where member variables are converted automagically to 
-       accessor functions */
-
-#if 0
-    Parm *p;
-    String *gname;
-    SwigType *vty;
-    p = NewParm(type, 0, n);
-    gname = NewStringf(AttributeFunctionGet, symname);
-    if (!Extend) {
-      ActionFunc = Copy(Swig_cmemberget_call(name, type));
-      cpp_member_func(Char(gname), Char(gname), type, 0);
-      Delete(ActionFunc);
-    } else {
-      String *cname = Swig_name_get(NSpace, name);
-      cpp_member_func(Char(cname), Char(gname), type, 0);
-      Delete(cname);
-    }
-    Delete(gname);
-    if (!GetFlag(n, "feature:immutable")) {
-      gname = NewStringf(AttributeFunctionSet, symname);
-      vty = NewString("void");
-      if (!Extend) {
-	ActionFunc = Copy(Swig_cmemberset_call(name, type));
-	cpp_member_func(Char(gname), Char(gname), vty, p);
-	Delete(ActionFunc);
-      } else {
-	String *cname = Swig_name_set(NSpace, name);
-	cpp_member_func(Char(cname), Char(gname), vty, p);
-	Delete(cname);
-      }
-      Delete(gname);
-    }
-    ActionFunc = 0;
-#endif
-  }
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::staticmembervariableHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::staticmembervariableHandler(Node *n) {
-  Swig_require("staticmembervariableHandler", n, "*name", "*sym:name", "*type", "?value", NIL);
-  String *value = Getattr(n, "value");
-  String *classname = !SmartPointer ? (isNonVirtualProtectedAccess(n) ? DirectorClassName : ClassName) : Getattr(CurrentClass, "allocate:smartpointerpointeeclassname");
-
-  if (!value || !Getattr(n, "hasconsttype")) {
-    String *name = Getattr(n, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *cname, *mrename;
-
-    /* Create the variable name */
-    mrename = Swig_name_member(0, ClassPrefix, symname);
-    cname = NewStringf("%s::%s", classname, name);
-
-    Setattr(n, "sym:name", mrename);
-    Setattr(n, "name", cname);
-
-    /* Wrap as an ordinary global variable */
-    variableWrapper(n);
-
-    Delete(mrename);
-    Delete(cname);
-  } else {
-
-    /* This is a C++ static member declaration with an initializer and it's const.
-       Certain C++ compilers optimize this out so that there is no linkage to a
-       memory address.  Example:
-
-       class Foo {
-       public:
-         static const int x = 3;
-       };
-
-       Some discussion of this in section 9.4 of the C++ draft standard.
-
-       Also, we have to manage the case:
-
-       class Foo {
-       public:
-       %extend {
-         static const int x = 3;
-       }
-       };
-
-       in which there's no actual Foo::x variable to refer to. In this case,
-       the best we can do is to wrap the given value verbatim.
-     */
-
-
-    String *name = Getattr(n, "name");
-    String *cname = NewStringf("%s::%s", classname, name);
-    if (Extend) {
-      /* the variable is a synthesized one.
-         There's nothing we can do; we just keep the given value */
-    } else {
-      /* we refer to the value as Foo::x */
-      String *value = SwigType_namestr(cname);
-      Setattr(n, "value", value);
-    }
-
-    SwigType *t1 = SwigType_typedef_resolve_all(Getattr(n, "type"));
-    SwigType *t2 = SwigType_strip_qualifiers(t1);
-    Setattr(n, "type", t2);
-    Delete(t1);
-    Delete(t2);
-    SetFlag(n, "wrappedasconstant");
-    memberconstantHandler(n);
-    Delete(cname);
-  }
-
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-
-/* ----------------------------------------------------------------------
- * Language::externDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::externDeclaration(Node *n) {
-  return emit_children(n);
-}
-
-/* ----------------------------------------------------------------------
- * Language::enumDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::enumDeclaration(Node *n) {
-  if (CurrentClass && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  String *oldNSpace = NSpace;
-  NSpace = Getattr(n, "sym:nspace");
-
-  String *oldEnumClassPrefix = EnumClassPrefix;
-  if (GetFlag(n, "scopedenum")) {
-    assert(Getattr(n, "sym:name"));
-    assert(Getattr(n, "name"));
-    EnumClassPrefix = ClassPrefix ? NewStringf("%s_", ClassPrefix) : NewString("");
-    Printv(EnumClassPrefix, Getattr(n, "sym:name"), NIL);
-    EnumClassName = Copy(Getattr(n, "name"));
-  }
-  if (!ImportMode) {
-    emit_children(n);
-  }
-
-  if (GetFlag(n, "scopedenum")) {
-    Delete(EnumClassName);
-    EnumClassName = 0;
-    Delete(EnumClassPrefix);
-    EnumClassPrefix = oldEnumClassPrefix;
-  }
-  NSpace = oldNSpace;
-
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::enumvalueDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::enumvalueDeclaration(Node *n) {
-  if (CurrentClass && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  Swig_require("enumvalueDeclaration", n, "*name", "*sym:name", "?value", NIL);
-  String *value = Getattr(n, "value");
-  String *name = Getattr(n, "name");
-  String *tmpValue;
-
-  if (value)
-    tmpValue = NewString(value);
-  else
-    tmpValue = NewString(name);
-  Setattr(n, "value", tmpValue);
-
-  Node *parent = parentNode(n);
-  if (GetFlag(parent, "scopedenum")) {
-    String *symname = Swig_name_member(0, Getattr(parent, "sym:name"), Getattr(n, "sym:name"));
-    Setattr(n, "sym:name", symname);
-    Delete(symname);
-  }
-
-  if (!CurrentClass || !cparse_cplusplus) {
-    Setattr(n, "name", tmpValue);	/* for wrapping of enums in a namespace when emit_action is used */
-    constantWrapper(n);
-  } else {
-    memberconstantHandler(n);
-  }
-
-  Delete(tmpValue);
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::enumforwardDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::enumforwardDeclaration(Node *n) {
-  (void) n;
-  if (GetFlag(n, "enumMissing"))
-    enumDeclaration(n); // Generate an empty enum in target language
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------------- 
- * Language::memberconstantHandler()
- * ----------------------------------------------------------------------------- */
-
-int Language::memberconstantHandler(Node *n) {
-
-  Swig_require("memberconstantHandler", n, "*name", "*sym:name", "value", NIL);
-
-  if (!GetFlag(n, "feature:allowexcept")) {
-    UnsetFlag(n, "feature:except");
-  }
-  if (Getattr(n, "feature:exceptvar")) {
-    Setattr(n, "feature:except", Getattr(n, "feature:exceptvar"));
-  }
-
-  String *enumvalue_symname = Getattr(n, "enumvalueDeclaration:sym:name"); // Only set if a strongly typed enum
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-  String *value = Getattr(n, "value");
-
-  String *mrename = Swig_name_member(0, EnumClassPrefix, enumvalue_symname ? enumvalue_symname : symname);
-  Setattr(n, "sym:name", mrename);
-
-  String *new_name = 0;
-  if (Extend)
-    new_name = Copy(value);
-  else if (EnumClassName)
-    new_name = NewStringf("%s::%s", isNonVirtualProtectedAccess(n) ? DirectorClassName : EnumClassName, name);
-  else
-    new_name = NewStringf("%s::%s", isNonVirtualProtectedAccess(n) ? DirectorClassName : ClassName, name);
-  Setattr(n, "name", new_name);
-
-  constantWrapper(n);
-  Delete(mrename);
-  Delete(new_name);
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::typedefHandler() 
- * ---------------------------------------------------------------------- */
-
-int Language::typedefHandler(Node *n) {
-  /* since this is a recurring issue, we are going to remember the
-     typedef pointer, if already it is not a pointer or reference, as
-     in
-
-     typedef void NT;
-     int func(NT *p); 
-
-     see director_basic.i for example.
-   */
-  SwigType *name = Getattr(n, "name");
-  SwigType *decl = Getattr(n, "decl");
-  if (!SwigType_ispointer(decl) && !SwigType_isreference(decl)) {
-    SwigType *pname = Copy(name);
-    SwigType_add_pointer(pname);
-    SwigType_remember(pname);
-    Delete(pname);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorMethod()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorMethod(Node *n, Node *parent, String *super) {
-  (void) n;
-  (void) parent;
-  (void) super;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorConstructor()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorConstructor(Node *n) {
-  (void) n;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorDefaultConstructor()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorDefaultConstructor(Node *n) {
-  (void) n;
-  return SWIG_OK;
-}
-
-static String *vtable_method_id(Node *n) {
-  String *nodeType = Getattr(n, "nodeType");
-  int is_destructor = (Cmp(nodeType, "destructor") == 0);
-  if (is_destructor)
-    return 0;
-  String *name = Getattr(n, "name");
-  String *decl = Getattr(n, "decl");
-  String *local_decl = SwigType_typedef_resolve_all(decl);
-  String *tmp = SwigType_pop_function(local_decl);
-  Delete(local_decl);
-  local_decl = tmp;
-  Node *method_id = NewStringf("%s|%s", name, local_decl);
-  Delete(local_decl);
-  return method_id;
-}
-
-
-/* ----------------------------------------------------------------------
- * Language::unrollVirtualMethods()
- * ---------------------------------------------------------------------- */
-int Language::unrollVirtualMethods(Node *n, Node *parent, List *vm, int default_director, int &virtual_destructor, int protectedbase) {
-  Node *ni;
-  String *nodeType;
-  String *classname;
-  String *decl;
-  bool first_base = false;
-  // recurse through all base classes to build the vtable
-  List *bl = Getattr(n, "bases");
-  if (bl) {
-    Iterator bi;
-    for (bi = First(bl); bi.item; bi = Next(bi)) {
-      if (first_base && !director_multiple_inheritance)
-	break;
-      unrollVirtualMethods(bi.item, parent, vm, default_director, virtual_destructor);
-      first_base = true;
-    }
-  }
-  // recurse through all protected base classes to build the vtable, as needed
-  bl = Getattr(n, "protectedbases");
-  if (bl) {
-    Iterator bi;
-    for (bi = First(bl); bi.item; bi = Next(bi)) {
-      if (first_base && !director_multiple_inheritance)
-	break;
-      unrollVirtualMethods(bi.item, parent, vm, default_director, virtual_destructor, 1);
-      first_base = true;
-    }
-  }
-  // find the methods that need directors
-  classname = Getattr(n, "name");
-  for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) {
-    /* we only need to check the virtual members */
-    nodeType = Getattr(ni, "nodeType");
-    int is_using = (Cmp(nodeType, "using") == 0);
-    Node *nn = is_using ? firstChild(ni) : ni; /* assume there is only one child node for "using" nodes */
-    if (is_using) {
-      if (nn)
-	nodeType = Getattr(nn, "nodeType");
-      else
-	continue; // A private "using" node
-    }
-    if (!checkAttribute(nn, "storage", "virtual"))
-      continue;
-    /* we need to add methods(cdecl) and destructor (to check for throw decl) */
-    int is_destructor = (Cmp(nodeType, "destructor") == 0);
-    if ((Cmp(nodeType, "cdecl") == 0) || is_destructor) {
-      decl = Getattr(nn, "decl");
-      /* extra check for function type and proper access */
-      if (SwigType_isfunction(decl) && (((!protectedbase || dirprot_mode()) && is_public(nn)) || need_nonpublic_member(nn))) {
-	String *name = Getattr(nn, "name");
-	Node *method_id = is_destructor ? NewStringf("~destructor") : vtable_method_id(nn);
-	/* Make sure that the new method overwrites the existing: */
-	int len = Len(vm);
-	const int DO_NOT_REPLACE = -1;
-	int replace = DO_NOT_REPLACE;
-	for (int i = 0; i < len; i++) {
-	  Node *item = Getitem(vm, i);
-	  String *check_vmid = Getattr(item, "vmid");
-
-	  if (Strcmp(method_id, check_vmid) == 0) {
-	    replace = i;
-	    break;
-	  }
-	}
-	/* filling a new method item */
-	String *fqdname = NewStringf("%s::%s", classname, name);
-	Hash *item = NewHash();
-	Setattr(item, "fqdname", fqdname);
-	Node *m = Copy(nn);
-
-	/* Store the complete return type - needed for non-simple return types (pointers, references etc.) */
-	SwigType *ty = NewString(Getattr(m, "type"));
-	SwigType_push(ty, decl);
-	if (SwigType_isqualifier(ty)) {
-	  Delete(SwigType_pop(ty));
-	}
-	Delete(SwigType_pop_function(ty));
-	Setattr(m, "returntype", ty);
-
-	String *mname = NewStringf("%s::%s", Getattr(parent, "name"), name);
-	/* apply the features of the original method found in the base class */
-	Swig_features_get(Swig_cparse_features(), 0, mname, Getattr(m, "decl"), m);
-	Setattr(item, "methodNode", m);
-	Setattr(item, "vmid", method_id);
-	if (replace == DO_NOT_REPLACE)
-	  Append(vm, item);
-	else
-	  Setitem(vm, replace, item);
-	Setattr(nn, "directorNode", m);
-
-	Delete(mname);
-      }
-      if (is_destructor) {
-	virtual_destructor = 1;
-      }
-    }
-  }
-
-  /*
-     We delete all the nodirector methods. This prevents the
-     generation of 'empty' director classes.
-
-     But this has to be done outside the previous 'for'
-     an the recursive loop!.
-   */
-  if (n == parent) {
-    int len = Len(vm);
-    for (int i = 0; i < len; i++) {
-      Node *item = Getitem(vm, i);
-      Node *m = Getattr(item, "methodNode");
-      /* retrieve the director features */
-      int mdir = GetFlag(m, "feature:director");
-      int mndir = GetFlag(m, "feature:nodirector");
-      /* 'nodirector' has precedence over 'director' */
-      int dir = (mdir || mndir) ? (mdir && !mndir) : 1;
-      /* check if the method was found only in a base class */
-      Node *p = Getattr(m, "parentNode");
-      if (p != n) {
-	Node *c = Copy(m);
-	Setattr(c, "parentNode", n);
-	int cdir = GetFlag(c, "feature:director");
-	int cndir = GetFlag(c, "feature:nodirector");
-	dir = (cdir || cndir) ? (cdir && !cndir) : dir;
-	Delete(c);
-      }
-      if (dir) {
-	/* be sure the 'nodirector' feature is disabled  */
-	if (mndir)
-	  Delattr(m, "feature:nodirector");
-      } else {
-	/* or just delete from the vm, since is not a director method */
-	Delitem(vm, i);
-	len--;
-	i--;
-      }
-    }
-  }
-
-  return SWIG_OK;
-}
-
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorDisown()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorDisown(Node *n) {
-  Node *disown = NewHash();
-  String *mrename;
-  String *symname = Getattr(n, "sym:name");
-  mrename = Swig_name_disown(NSpace, symname);
-  String *type = NewString(ClassType);
-  String *name = NewString("self");
-  SwigType_add_pointer(type);
-  Parm *p = NewParm(type, name, n);
-  Delete(name);
-  Delete(type);
-  type = NewString("void");
-  String *action = NewString("");
-  Printv(action, "{\n", "Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);\n", "if (director) director->swig_disown();\n", "}\n", NULL);
-  Setfile(disown, Getfile(n));
-  Setline(disown, Getline(n));
-  Setattr(disown, "wrap:action", action);
-  Setattr(disown, "name", mrename);
-  Setattr(disown, "sym:name", mrename);
-  Setattr(disown, "type", type);
-  Setattr(disown, "parms", p);
-  Delete(action);
-  Delete(mrename);
-  Delete(type);
-  Delete(p);
-
-  functionWrapper(disown);
-  Delete(disown);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorConstructors()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorConstructors(Node *n) {
-  Node *ni;
-  String *nodeType;
-  Node *parent = Swig_methodclass(n);
-  int default_ctor = Getattr(parent, "allocate:default_constructor") ? 1 : 0;
-  int protected_ctor = 0;
-  int constructor = 0;
-
-  /* emit constructors */
-  for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) {
-    nodeType = Getattr(ni, "nodeType");
-    if (Cmp(nodeType, "constructor") == 0) {
-      if (GetFlag(ni, "feature:ignore"))
-        continue;
-
-      Parm *parms = Getattr(ni, "parms");
-      if (is_public(ni)) {
-	/* emit public constructor */
-	classDirectorConstructor(ni);
-	constructor = 1;
-	if (default_ctor)
-	  default_ctor = !ParmList_numrequired(parms);
-      } else {
-	/* emit protected constructor if needed */
-	if (need_nonpublic_ctor(ni)) {
-	  classDirectorConstructor(ni);
-	  constructor = 1;
-	  protected_ctor = 1;
-	  if (default_ctor)
-	    default_ctor = !ParmList_numrequired(parms);
-	}
-      }
-    }
-  }
-  /* emit default constructor if needed */
-  if (!constructor) {
-    if (!default_ctor) {
-      /* we get here because the class has no public, protected or
-         default constructor, therefore, the director class can't be
-         created, ie, is kind of abstract. */
-      Swig_warning(WARN_LANG_DIRECTOR_ABSTRACT, Getfile(n), Getline(n), "Director class '%s' can't be constructed\n", SwigType_namestr(Getattr(n, "name")));
-      return SWIG_OK;
-    }
-    classDirectorDefaultConstructor(n);
-    default_ctor = 1;
-  }
-  /* this is just to support old java behavior, ie, the default
-     constructor is always emitted, even when protected, and not
-     needed, since there is a public constructor already defined.  
-
-     (scottm) This code is needed here to make the director_abstract +
-     test generate compilable code (Example2 in director_abastract.i).
-
-     (mmatus) This is very strange, since swig compiled with gcc3.2.3
-     doesn't need it here....
-   */
-  if (!default_ctor && !protected_ctor) {
-    if (Getattr(parent, "allocate:default_base_constructor")) {
-      classDirectorDefaultConstructor(n);
-    }
-  }
-
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorMethods()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorMethods(Node *n) {
-  Node *vtable = Getattr(n, "vtable");
-
-  int len = Len(vtable);
-  for (int i = 0; i < len; i++) {
-    Node *item = Getitem(vtable, i);
-    String *method = Getattr(item, "methodNode");
-    String *fqdname = Getattr(item, "fqdname");
-    if (GetFlag(method, "feature:nodirector"))
-      continue;
-
-    String *wrn = Getattr(method, "feature:warnfilter");
-    if (wrn)
-      Swig_warnfilter(wrn, 1);
-
-    String *type = Getattr(method, "nodeType");
-    if (!Cmp(type, "destructor")) {
-      classDirectorDestructor(method);
-    } else {
-      Swig_require("classDirectorMethods", method, "*type", NIL);
-      assert(Getattr(method, "returntype"));
-      Setattr(method, "type", Getattr(method, "returntype"));
-      if (classDirectorMethod(method, n, fqdname) == SWIG_OK)
-	SetFlag(item, "director");
-      Swig_restore(method);
-    }
-    if (wrn)
-      Swig_warnfilter(wrn, 0);
-  }
-
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorInit()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorInit(Node *n) {
-  (void) n;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorDestructor()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorDestructor(Node *n) {
-  /* 
-     Always emit the virtual destructor in the declaration and in the
-     compilation unit.  Been explicit here can't make any damage, and
-     can solve some nasty C++ compiler problems.
-   */
-  File *f_directors = Swig_filebyname("director");
-  File *f_directors_h = Swig_filebyname("director_h");
-  if (Getattr(n, "throw")) {
-    Printf(f_directors_h, "    virtual ~%s() throw ();\n", DirectorClassName);
-    Printf(f_directors, "%s::~%s() throw () {\n}\n\n", DirectorClassName, DirectorClassName);
-  } else {
-    Printf(f_directors_h, "    virtual ~%s();\n", DirectorClassName);
-    Printf(f_directors, "%s::~%s() {\n}\n\n", DirectorClassName, DirectorClassName);
-  }
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirectorEnd()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirectorEnd(Node *n) {
-  (void) n;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDirector()
- * ---------------------------------------------------------------------- */
-
-int Language::classDirector(Node *n) {
-  Node *module = Getattr(n, "module");
-  String *classtype = Getattr(n, "classtype");
-  Hash *directormap = 0;
-  if (module) {
-    directormap = Getattr(module, "wrap:directormap");
-    if (directormap == 0) {
-      directormap = NewHash();
-      Setattr(module, "wrap:directormap", directormap);
-    }
-  }
-  List *vtable = NewList();
-  int virtual_destructor = 0;
-  unrollVirtualMethods(n, n, vtable, 0, virtual_destructor);
-
-  // Emit all the using base::member statements for non virtual members (allprotected mode)
-  Node *ni;
-  String *using_protected_members_code = NewString("");
-  for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) {
-    Node *nodeType = Getattr(ni, "nodeType");
-    bool cdeclaration = (Cmp(nodeType, "cdecl") == 0);
-    if (cdeclaration && !GetFlag(ni, "feature:ignore")) {
-      if (isNonVirtualProtectedAccess(ni)) {
-        Node *overloaded = Getattr(ni, "sym:overloaded");
-        // emit the using base::member statement (but only once if the method is overloaded)
-        if (!overloaded || (overloaded && (overloaded == ni)))
-          Printf(using_protected_members_code, "    using %s::%s;\n", SwigType_namestr(ClassName), Getattr(ni, "name"));
-      }
-    }
-  }
-
-  if (virtual_destructor || Len(vtable) > 0) {
-    if (!virtual_destructor) {
-      String *classtype = Getattr(n, "classtype");
-      Swig_warning(WARN_LANG_DIRECTOR_VDESTRUCT, input_file, line_number, "Director base class %s has no virtual destructor.\n", classtype);
-    }
-
-    Setattr(n, "vtable", vtable);
-    if (directormap != 0) {
-      Setattr(directormap, classtype, n);
-    }
-    classDirectorInit(n);
-    classDirectorConstructors(n);
-    classDirectorMethods(n);
-
-    File *f_directors_h = Swig_filebyname("director_h");
-    Printv(f_directors_h, using_protected_members_code, NIL);
-
-    classDirectorEnd(n);
-  }
-  Delete(vtable);
-  Delete(using_protected_members_code);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classDeclaration()
- * ---------------------------------------------------------------------- */
-
-static void addCopyConstructor(Node *n) {
-  Node *cn = NewHash();
-  set_nodeType(cn, "constructor");
-  Setattr(cn, "access", "public");
-  Setfile(cn, Getfile(n));
-  Setline(cn, Getline(n));
-
-  String *cname = Getattr(n, "name");
-  SwigType *type = Copy(cname);
-  String *name = Swig_scopename_last(cname);
-  String *cc = NewStringf("r.q(const).%s", type);
-  String *decl = NewStringf("f(%s).", cc);
-  String *oldname = Getattr(n, "sym:name");
-
-  if (Getattr(n, "allocate:has_constructor")) {
-    // to work properly with '%rename Class', we must look
-    // for any other constructor in the class, which has not been
-    // renamed, and use its name as oldname.
-    Node *c;
-    for (c = firstChild(n); c; c = nextSibling(c)) {
-      const char *tag = Char(nodeType(c));
-      if (strcmp(tag, "constructor") == 0) {
-	String *cname = Getattr(c, "name");
-	String *csname = Getattr(c, "sym:name");
-	String *clast = Swig_scopename_last(cname);
-	if (Equal(csname, clast)) {
-	  oldname = csname;
-	  break;
-	}
-      }
-    }
-  }
-
-  String *symname = Swig_name_make(cn, cname, name, decl, oldname);
-  if (Strcmp(symname, "$ignore") != 0) {
-    Parm *p = NewParm(cc, "other", n);
-
-    Setattr(cn, "name", name);
-    Setattr(cn, "sym:name", symname);
-    SetFlag(cn, "feature:new");
-    Setattr(cn, "decl", decl);
-    Setattr(cn, "parentNode", n);
-    Setattr(cn, "parms", p);
-    Setattr(cn, "copy_constructor", "1");
-
-    Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab"));
-    Node *on = Swig_symbol_add(symname, cn);
-    Swig_features_get(Swig_cparse_features(), Swig_symbol_qualifiedscopename(0), name, decl, cn);
-    Swig_symbol_setscope(oldscope);
-
-    if (on == cn) {
-      Node *access = NewHash();
-      set_nodeType(access, "access");
-      Setattr(access, "kind", "public");
-      appendChild(n, access);
-      appendChild(n, cn);
-      Setattr(n, "has_copy_constructor", "1");
-      Setattr(n, "copy_constructor_decl", decl);
-      Setattr(n, "allocate:copy_constructor", "1");
-      Delete(access);
-    }
-  }
-  Delete(cn);
-  Delete(name);
-  Delete(decl);
-  Delete(symname);
-}
-
-static void addDefaultConstructor(Node *n) {
-  Node *cn = NewHash();
-  set_nodeType(cn, "constructor");
-  Setattr(cn, "access", "public");
-  Setfile(cn, Getfile(n));
-  Setline(cn, Getline(n));
-
-  String *cname = Getattr(n, "name");
-  String *name = Swig_scopename_last(cname);
-  String *decl = NewString("f().");
-  String *oldname = Getattr(n, "sym:name");
-  String *symname = Swig_name_make(cn, cname, name, decl, oldname);
-  if (Strcmp(symname, "$ignore") != 0) {
-    Setattr(cn, "name", name);
-    Setattr(cn, "sym:name", symname);
-    SetFlag(cn, "feature:new");
-    Setattr(cn, "decl", decl);
-    Setattr(cn, "parentNode", n);
-    Setattr(cn, "default_constructor", "1");
-    Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab"));
-    Node *on = Swig_symbol_add(symname, cn);
-    Swig_features_get(Swig_cparse_features(), Swig_symbol_qualifiedscopename(0), name, decl, cn);
-    Swig_symbol_setscope(oldscope);
-
-    if (on == cn) {
-      Node *access = NewHash();
-      set_nodeType(access, "access");
-      Setattr(access, "kind", "public");
-      appendChild(n, access);
-      appendChild(n, cn);
-      Setattr(n, "has_default_constructor", "1");
-      Setattr(n, "allocate:default_constructor", "1");
-      Delete(access);
-    }
-  }
-  Delete(cn);
-  Delete(name);
-  Delete(decl);
-  Delete(symname);
-}
-
-static void addDestructor(Node *n) {
-  Node *cn = NewHash();
-  set_nodeType(cn, "destructor");
-  Setattr(cn, "access", "public");
-  Setfile(cn, Getfile(n));
-  Setline(cn, Getline(n));
-
-  String *cname = Getattr(n, "name");
-  String *name = Swig_scopename_last(cname);
-  Insert(name, 0, "~");
-  String *decl = NewString("f().");
-  String *symname = Swig_name_make(cn, cname, name, decl, 0);
-  if (Strcmp(symname, "$ignore") != 0) {
-    String *possible_nonstandard_symname = NewStringf("~%s", Getattr(n, "sym:name"));
-
-    Setattr(cn, "name", name);
-    Setattr(cn, "sym:name", symname);
-    Setattr(cn, "decl", "f().");
-    Setattr(cn, "parentNode", n);
-
-    Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab"));
-    Node *nonstandard_destructor = Equal(possible_nonstandard_symname, symname) ? 0 : Swig_symbol_clookup(possible_nonstandard_symname, 0);
-    Node *on = Swig_symbol_add(symname, cn);
-    Swig_features_get(Swig_cparse_features(), Swig_symbol_qualifiedscopename(0), name, decl, cn);
-    Swig_symbol_setscope(oldscope);
-
-    if (on == cn) {
-      // SWIG accepts a non-standard named destructor in %extend that uses a typedef for the destructor name
-      // For example: typedef struct X {} XX; %extend X { ~XX() {...} }
-      // Don't add another destructor if a nonstandard one has been declared
-      if (!nonstandard_destructor) {
-	Node *access = NewHash();
-	set_nodeType(access, "access");
-	Setattr(access, "kind", "public");
-	appendChild(n, access);
-	appendChild(n, cn);
-	Setattr(n, "has_destructor", "1");
-	Setattr(n, "allocate:destructor", "1");
-	Delete(access);
-      }
-    }
-    Delete(possible_nonstandard_symname);
-  }
-  Delete(cn);
-  Delete(name);
-  Delete(decl);
-  Delete(symname);
-}
-
-int Language::classDeclaration(Node *n) {
-  String *ochildren = Getattr(n, "feature:onlychildren");
-  if (ochildren) {
-    Setattr(n, "feature:emitonlychildren", ochildren);
-    emit_children(n);
-    Delattr(n, "feature:emitonlychildren");
-    SetFlag(n, "feature:ignore");
-    return SWIG_NOWRAP;
-  }
-
-  // save class local variables for nested classes support
-  int oldInClass = InClass;
-  String *oldClassType = ClassType;
-  String *oldClassPrefix = ClassPrefix;
-  String *oldEnumClassPrefix = EnumClassPrefix;
-  String *oldClassName = ClassName;
-  String *oldDirectorClassName = DirectorClassName;
-  String *oldNSpace = NSpace;
-  Node *oldCurrentClass = CurrentClass;
-  int dir = 0;
-
-  String *kind = Getattr(n, "kind");
-  String *name = Getattr(n, "name");
-  String *tdname = Getattr(n, "tdname");
-  String *unnamed = Getattr(n, "unnamed");
-  String *symname = Getattr(n, "sym:name");
-
-  int strip = CPlusPlus ? 1 : unnamed && tdname;
-
-  if (cplus_mode != PUBLIC)
-    return SWIG_NOWRAP;
-  if (!name) {
-    Swig_warning(WARN_LANG_CLASS_UNNAMED, input_file, line_number, "Can't generate wrappers for unnamed struct/class.\n");
-    return SWIG_NOWRAP;
-  }
-
-  /* Check symbol name for template.   If not renamed. Issue a warning */
-  if (!validIdentifier(symname)) {
-    Swig_warning(WARN_LANG_IDENTIFIER, input_file, line_number, "Can't wrap class %s unless renamed to a valid identifier.\n", SwigType_namestr(symname));
-    return SWIG_NOWRAP;
-  }
-  AccessMode oldAccessMode = cplus_mode;
-  Node *outerClass = Getattr(n, "nested:outer");
-  if (outerClass && oldAccessMode != PUBLIC)
-    return SWIG_NOWRAP;
-  ClassName = Copy(name);
-  ClassPrefix = Copy(symname);
-  if (Cmp(kind, "class") == 0) {
-    cplus_mode = PRIVATE;
-  } else {
-    cplus_mode = PUBLIC;
-  }
-  for (; outerClass; outerClass = Getattr(outerClass, "nested:outer")) {
-    Push(ClassPrefix, "_");
-    Push(ClassPrefix, Getattr(outerClass, "sym:name"));
-  }
-  EnumClassPrefix = Copy(ClassPrefix);
-  if (strip) {
-    ClassType = Copy(name);
-  } else {
-    ClassType = NewStringf("%s %s", kind, name);
-  }
-  Setattr(n, "classtypeobj", Copy(ClassType));
-  Setattr(n, "classtype", SwigType_namestr(ClassType));
-
-  InClass = 1;
-  CurrentClass = n;
-  NSpace = Getattr(n, "sym:nspace");
-  int oldAbstract = Abstract;
-
-  /* Call classHandler() here */
-  if (!ImportMode) {
-    if (directorsEnabled()) {
-      int ndir = GetFlag(n, "feature:director");
-      int nndir = GetFlag(n, "feature:nodirector");
-      /* 'nodirector' has precedence over 'director' */
-      dir = (ndir || nndir) ? (ndir && !nndir) : 0;
-    }
-    int abstract = !dir && abstractClassTest(n);
-    int odefault = (GenerateDefault && !GetFlag(n, "feature:nodefault"));
-
-    /* default constructor */
-    if (!abstract && !GetFlag(n, "feature:nodefaultctor") && odefault) {
-      if (!Getattr(n, "has_constructor") && !Getattr(n, "allocate:has_constructor") && (Getattr(n, "allocate:default_constructor"))) {
-	addDefaultConstructor(n);
-      }
-    }
-    /* copy constructor */
-    if (CPlusPlus && !abstract && GetFlag(n, "feature:copyctor")) {
-      if (!Getattr(n, "has_copy_constructor") && !Getattr(n, "allocate:has_copy_constructor")
-	  && (Getattr(n, "allocate:copy_constructor"))
-	  && (!GetFlag(n, "feature:ignore"))) {
-	addCopyConstructor(n);
-      }
-    }
-    /* default destructor */
-    if (!GetFlag(n, "feature:nodefaultdtor") && odefault) {
-      if (!Getattr(n, "has_destructor") && (!Getattr(n, "allocate:has_destructor"))
-	  && (Getattr(n, "allocate:default_destructor"))
-	  && (!GetFlag(n, "feature:ignore"))) {
-	addDestructor(n);
-      }
-    }
-
-    if (dir) {
-      DirectorClassName = directorClassName(n);
-      classDirector(n);
-    }
-    /* check for abstract after resolving directors */
-
-    Abstract = abstractClassTest(n);
-    classHandler(n);
-  } else {
-    Abstract = abstractClassTest(n);
-    Language::classHandler(n);
-  }
-
-  Abstract = oldAbstract;
-  cplus_mode = oldAccessMode;
-  NSpace = oldNSpace;
-  InClass = oldInClass;
-  CurrentClass = oldCurrentClass;
-  Delete(ClassType);
-  ClassType = oldClassType;
-  Delete(EnumClassPrefix);
-  EnumClassPrefix = oldEnumClassPrefix;
-  Delete(ClassPrefix);
-  ClassPrefix = oldClassPrefix;
-  Delete(ClassName);
-  ClassName = oldClassName;
-  if (dir) {
-    Delete(DirectorClassName);
-  }
-  DirectorClassName = oldDirectorClassName;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::classHandler(Node *n) {
-  save_value<int> oldExtend(Extend);
-  if (Getattr(n, "template"))
-    Extend = 0;
-  bool hasDirector = Swig_directorclass(n) ? true : false;
-
-  /* Emit all of the class members */
-  emit_children(n);
-
-  /* Look for smart pointer handling */
-  if (Getattr(n, "allocate:smartpointer")) {
-    List *methods = Getattr(n, "allocate:smartpointer");
-    cplus_mode = PUBLIC;
-    SmartPointer = CWRAP_SMART_POINTER;
-    if (Getattr(n, "allocate:smartpointerconst") && Getattr(n, "allocate:smartpointermutable")) {
-      SmartPointer |= CWRAP_SMART_POINTER_OVERLOAD;
-    }
-    Iterator c;
-    for (c = First(methods); c.item; c = Next(c)) {
-      emit_one(c.item);
-    }
-    SmartPointer = 0;
-  }
-
-  cplus_mode = PUBLIC;
-
-  /* emit director disown method */
-  if (hasDirector) {
-    classDirectorDisown(n);
-
-    /* Emit additional protected virtual methods - only needed if the language module
-     * codes logic in the C++ layer instead of the director proxy class method - primarily
-     * to catch public use of protected methods by the scripting languages. */
-    if (dirprot_mode() && extraDirectorProtectedCPPMethodsRequired()) {
-      Node *vtable = Getattr(n, "vtable");
-      String *symname = Getattr(n, "sym:name");
-      save_value<AccessMode> old_mode(cplus_mode);
-      cplus_mode = PROTECTED;
-      int len = Len(vtable);
-      for (int i = 0; i < len; i++) {
-	Node *item = Getitem(vtable, i);
-	Node *method = Getattr(item, "methodNode");
-	SwigType *type = Getattr(method, "nodeType");
-	if (Strcmp(type, "cdecl") != 0)
-	  continue;
-	if (GetFlag(method, "feature:ignore"))
-	  continue;
-	String *methodname = Getattr(method, "sym:name");
-	String *wrapname = NewStringf("%s_%s", symname, methodname);
-	if (!symbolLookup(wrapname, "") && (!is_public(method))) {
-	  Node *m = Copy(method);
-	  Setattr(m, "director", "1");
-	  Setattr(m, "parentNode", n);
-	  /*
-	   * There is a bug that needs fixing still... 
-	   * This area of code is creating methods which have not been overridden in a derived class (director methods that are protected in the base)
-	   * If the method is overloaded, then Swig_overload_dispatch() incorrectly generates a call to the base wrapper, _wrap_xxx method
-	   * See director_protected_overloaded.i - Possibly sym:overname needs correcting here.
-	  Printf(stdout, "new method: %s::%s(%s)\n", Getattr(parentNode(m), "name"), Getattr(m, "name"), ParmList_str_defaultargs(Getattr(m, "parms")));
-	  */
-	  cDeclaration(m);
-	  Delete(m);
-	}
-	Delete(wrapname);
-      }
-    }
-  }
-
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::classforwardDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::classforwardDeclaration(Node *n) {
-  (void) n;
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::constructorDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::constructorDeclaration(Node *n) {
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-
-  if (!symname)
-    return SWIG_NOWRAP;
-  if (!CurrentClass)
-    return SWIG_NOWRAP;
-  if (ImportMode)
-    return SWIG_NOWRAP;
-
-  if (Extend) {
-    /* extend default constructor can be safely ignored if there is already one */
-    int num_required = ParmList_numrequired(Getattr(n, "parms"));
-    if ((num_required == 0) && Getattr(CurrentClass, "has_default_constructor")) {
-      return SWIG_NOWRAP;
-    }
-    if ((num_required == 1) && Getattr(CurrentClass, "has_copy_constructor")) {
-      String *ccdecl = Getattr(CurrentClass, "copy_constructor_decl");
-      if (ccdecl && (Strcmp(ccdecl, Getattr(n, "decl")) == 0)) {
-	return SWIG_NOWRAP;
-      }
-    }
-  }
-
-  /* clean protected overloaded constructors, in case they are not needed anymore */
-  Node *over = Swig_symbol_isoverloaded(n);
-  if (over && !Getattr(CurrentClass, "sym:cleanconstructor")) {
-    int dirclass = Swig_directorclass(CurrentClass);
-    Node *nn = over;
-    while (nn) {
-      if (!is_public(nn)) {
-	if (!dirclass || !need_nonpublic_ctor(nn)) {
-	  SetFlag(nn, "feature:ignore");
-	}
-      }
-      nn = Getattr(nn, "sym:nextSibling");
-    }
-    clean_overloaded(over);
-    Setattr(CurrentClass, "sym:cleanconstructor", "1");
-  }
-
-  if ((cplus_mode != PUBLIC)) {
-    /* check only for director classes */
-    if (!Swig_directorclass(CurrentClass) || !need_nonpublic_ctor(n))
-      return SWIG_NOWRAP;
-  }
-
-  /* Name adjustment for %name */
-  Swig_save("constructorDeclaration", n, "sym:name", NIL);
-
-  {
-    String *base = Swig_scopename_last(name);
-    if ((Strcmp(base, symname) == 0) && (Strcmp(symname, ClassPrefix) != 0)) {
-      Setattr(n, "sym:name", ClassPrefix);
-    }
-    Delete(base);
-  }
-
-  /* Only create a constructor if the class is not abstract */
-  if (!Abstract) {
-    Node *over;
-    over = Swig_symbol_isoverloaded(n);
-    if (over)
-      over = first_nontemplate(over);
-    if ((over) && (!overloading)) {
-      /* If the symbol is overloaded.  We check to see if it is a copy constructor.  If so, 
-         we invoke copyconstructorHandler() as a special case. */
-      if (Getattr(n, "copy_constructor") && (!Getattr(CurrentClass, "has_copy_constructor"))) {
-	copyconstructorHandler(n);
-	Setattr(CurrentClass, "has_copy_constructor", "1");
-      } else {
-	if (Getattr(over, "copy_constructor"))
-	  over = Getattr(over, "sym:nextSibling");
-	if (over != n) {
-	  Swig_warning(WARN_LANG_OVERLOAD_CONSTRUCT, input_file, line_number,
-		       "Overloaded constructor ignored.  %s\n", Swig_name_decl(n));
-	  Swig_warning(WARN_LANG_OVERLOAD_CONSTRUCT, Getfile(over), Getline(over),
-		       "Previous declaration is %s\n", Swig_name_decl(over));
-	} else {
-	  constructorHandler(n);
-	}
-      }
-    } else {
-      String *expected_name = ClassName;
-      String *scope = Swig_scopename_check(ClassName) ? Swig_scopename_prefix(ClassName) : 0;
-      String *actual_name = scope ? NewStringf("%s::%s", scope, name) : NewString(name);
-      Delete(scope);
-      if (!Equal(actual_name, expected_name) && !SwigType_istemplate(expected_name) && !SwigType_istemplate(actual_name)) {
-	// Checking templates is skipped but they ought to be checked... they are just somewhat more tricky to check correctly
-	bool illegal_name = true;
-	if (Extend) {
-	  // Check for typedef names used as a constructor name in %extend. This is deprecated except for anonymous
-	  // typedef structs which have had their symbol names adjusted to the typedef name in the parser.
-	  SwigType *name_resolved = SwigType_typedef_resolve_all(actual_name);
-	  SwigType *expected_name_resolved = SwigType_typedef_resolve_all(expected_name);
-
-	  if (!CPlusPlus) {
-	    if (Strncmp(name_resolved, "struct ", 7) == 0)
-	      Replace(name_resolved, "struct ", "", DOH_REPLACE_FIRST);
-	    else if (Strncmp(name_resolved, "union ", 6) == 0)
-	      Replace(name_resolved, "union ", "", DOH_REPLACE_FIRST);
-	  }
-
-	  illegal_name = !Equal(name_resolved, expected_name_resolved);
-	  if (!illegal_name)
-	    Swig_warning(WARN_LANG_EXTEND_CONSTRUCTOR, input_file, line_number, "Use of an illegal constructor name '%s' in %%extend is deprecated, the constructor name should be '%s'.\n", 
-		SwigType_str(Swig_scopename_last(actual_name), 0), SwigType_str(Swig_scopename_last(expected_name), 0));
-	  Delete(name_resolved);
-	  Delete(expected_name_resolved);
-	}
-	if (illegal_name) {
-	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n));
-	  Swig_restore(n);
-	  return SWIG_NOWRAP;
-	}
-      }
-      constructorHandler(n);
-    }
-  }
-  Setattr(CurrentClass, "has_constructor", "1");
-
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * get_director_ctor_code()
- * ---------------------------------------------------------------------- */
-
-static String *get_director_ctor_code(Node *n, String *director_ctor_code, String *director_prot_ctor_code, List *&abstracts) {
-  String *director_ctor = director_ctor_code;
-  int use_director = Swig_directorclass(n);
-  if (use_director) {
-    Node *pn = Swig_methodclass(n);
-    abstracts = Getattr(pn, "abstracts");
-    if (director_prot_ctor_code) {
-      int is_notabstract = GetFlag(pn, "feature:notabstract");
-      int is_abstract = abstracts && !is_notabstract;
-      if (is_protected(n) || is_abstract) {
-	director_ctor = director_prot_ctor_code;
-	abstracts = Copy(abstracts);
-	Delattr(pn, "abstracts");
-      } else {
-	if (is_notabstract) {
-	  abstracts = Copy(abstracts);
-	  Delattr(pn, "abstracts");
-	} else {
-	  abstracts = 0;
-	}
-      }
-    }
-  }
-  return director_ctor;
-}
-
-
-/* ----------------------------------------------------------------------
- * Language::constructorHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::constructorHandler(Node *n) {
-  Swig_require("constructorHandler", n, "?name", "*sym:name", "?type", "?parms", NIL);
-  String *symname = Getattr(n, "sym:name");
-  String *mrename = Swig_name_construct(NSpace, symname);
-  String *nodeType = Getattr(n, "nodeType");
-  int constructor = (!Cmp(nodeType, "constructor"));
-  List *abstracts = 0;
-  String *director_ctor = get_director_ctor_code(n, director_ctor_code,
-						 director_prot_ctor_code,
-						 abstracts);
-  if (!constructor) {
-    /* if not originally a constructor, still handle it as one */
-    Setattr(n, "handled_as_constructor", "1");
-  }
-
-  int extendmember = GetFlag(n, "isextendmember") ? Extend : 0;
-  int flags = Getattr(n, "template") ? extendmember : Extend;
-  Swig_ConstructorToFunction(n, NSpace, ClassType, none_comparison, director_ctor, CPlusPlus, flags, DirectorClassName);
-  Setattr(n, "sym:name", mrename);
-  functionWrapper(n);
-  Delete(mrename);
-  Swig_restore(n);
-  if (abstracts)
-    Setattr(Swig_methodclass(n), "abstracts", abstracts);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::copyconstructorHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::copyconstructorHandler(Node *n) {
-  Swig_require("copyconstructorHandler", n, "?name", "*sym:name", "?type", "?parms", NIL);
-  String *symname = Getattr(n, "sym:name");
-  String *mrename = Swig_name_copyconstructor(NSpace, symname);
-  List *abstracts = 0;
-  String *director_ctor = get_director_ctor_code(n, director_ctor_code,
-						 director_prot_ctor_code,
-						 abstracts);
-  Swig_ConstructorToFunction(n, NSpace, ClassType, none_comparison, director_ctor, CPlusPlus, Getattr(n, "template") ? 0 : Extend, DirectorClassName);
-  Setattr(n, "sym:name", mrename);
-  functionWrapper(n);
-  Delete(mrename);
-  Swig_restore(n);
-  if (abstracts)
-    Setattr(Swig_methodclass(n), "abstracts", abstracts);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::destructorDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::destructorDeclaration(Node *n) {
-
-  if (!CurrentClass)
-    return SWIG_NOWRAP;
-  if (cplus_mode != PUBLIC && !Getattr(CurrentClass, "feature:unref"))
-    return SWIG_NOWRAP;
-  if (ImportMode)
-    return SWIG_NOWRAP;
-
-  Swig_save("destructorDeclaration", n, "name", "sym:name", NIL);
-
-  char *c = GetChar(n, "sym:name");
-  if (c && (*c == '~')) {
-    Setattr(n, "sym:name", c + 1);
-  }
-
-  String *name = Getattr(n, "name");
-  String *symname = Getattr(n, "sym:name");
-
-  if ((Strcmp(name, symname) == 0) || (Strcmp(symname, ClassPrefix) != 0)) {
-    Setattr(n, "sym:name", ClassPrefix);
-  }
-
-  String *expected_name = ClassName;
-  String *scope = Swig_scopename_check(ClassName) ? Swig_scopename_prefix(ClassName) : 0;
-  String *actual_name = scope ? NewStringf("%s::%s", scope, name) : NewString(name);
-  Delete(scope);
-  Replace(actual_name, "~", "", DOH_REPLACE_FIRST);
-  if (!Equal(actual_name, expected_name) && !(Getattr(n, "template"))) {
-    bool illegal_name = true;
-    if (Extend) {
-      // Check for typedef names used as a destructor name in %extend. This is deprecated except for anonymous
-      // typedef structs which have had their symbol names adjusted to the typedef name in the parser.
-      SwigType *name_resolved = SwigType_typedef_resolve_all(actual_name);
-      SwigType *expected_name_resolved = SwigType_typedef_resolve_all(expected_name);
-
-      if (!CPlusPlus) {
-	if (Strncmp(name_resolved, "struct ", 7) == 0)
-	  Replace(name_resolved, "struct ", "", DOH_REPLACE_FIRST);
-	else if (Strncmp(name_resolved, "union ", 6) == 0)
-	  Replace(name_resolved, "union ", "", DOH_REPLACE_FIRST);
-      }
-
-      illegal_name = !Equal(name_resolved, expected_name_resolved);
-      if (!illegal_name)
-	Swig_warning(WARN_LANG_EXTEND_DESTRUCTOR, input_file, line_number, "Use of an illegal destructor name '%s' in %%extend is deprecated, the destructor name should be '%s'.\n", 
-	    SwigType_str(Swig_scopename_last(actual_name), 0), SwigType_str(Swig_scopename_last(expected_name), 0));
-      Delete(name_resolved);
-      Delete(expected_name_resolved);
-    }
-
-    if (illegal_name) {
-      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n));
-      Swig_restore(n);
-      return SWIG_NOWRAP;
-    }
-  }
-  destructorHandler(n);
-
-  Setattr(CurrentClass, "has_destructor", "1");
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::destructorHandler()
- * ---------------------------------------------------------------------- */
-
-int Language::destructorHandler(Node *n) {
-  Swig_require("destructorHandler", n, "?name", "*sym:name", NIL);
-  Swig_save("destructorHandler", n, "type", "parms", NIL);
-
-  String *symname = Getattr(n, "sym:name");
-  String *mrename;
-  char *csymname = Char(symname);
-  if (*csymname == '~')
-    csymname += 1;
-
-  mrename = Swig_name_destroy(NSpace, csymname);
-
-  Swig_DestructorToFunction(n, NSpace, ClassType, CPlusPlus, Extend);
-  Setattr(n, "sym:name", mrename);
-  functionWrapper(n);
-  Delete(mrename);
-  Swig_restore(n);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::accessDeclaration()
- * ---------------------------------------------------------------------- */
-
-int Language::accessDeclaration(Node *n) {
-  String *kind = Getattr(n, "kind");
-  if (Cmp(kind, "public") == 0) {
-    cplus_mode = PUBLIC;
-  } else if (Cmp(kind, "private") == 0) {
-    cplus_mode = PRIVATE;
-  } else if (Cmp(kind, "protected") == 0) {
-    cplus_mode = PROTECTED;
-  }
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::namespaceDeclaration()
- * ----------------------------------------------------------------------------- */
-
-int Language::namespaceDeclaration(Node *n) {
-  if (Getattr(n, "alias"))
-    return SWIG_OK;
-  if (Getattr(n, "unnamed"))
-    return SWIG_OK;
-  emit_children(n);
-  return SWIG_OK;
-}
-
-int Language::validIdentifier(String *s) {
-  char *c = Char(s);
-  while (*c) {
-    if (!(isalnum(*c) || (*c == '_')))
-      return 0;
-    c++;
-  }
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::usingDeclaration()
- * ----------------------------------------------------------------------------- */
-
-int Language::usingDeclaration(Node *n) {
-  if ((cplus_mode == PUBLIC) || (!is_public(n) && dirprot_mode())) {
-    Node *np = Copy(n);
-    Node *c;
-    for (c = firstChild(np); c; c = nextSibling(c)) {
-      /* it seems for some cases this is needed, like A* A::boo() */
-      if (CurrentClass)
-	Setattr(c, "parentNode", CurrentClass);
-      emit_one(c);
-    }
-    Delete(np);
-  }
-  return SWIG_OK;
-}
-
-/* Stubs. Language modules need to implement these */
-
-/* ----------------------------------------------------------------------
- * Language::constantWrapper()
- * ---------------------------------------------------------------------- */
-
-int Language::constantWrapper(Node *n) {
-  String *name = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  String *value = Getattr(n, "value");
-  String *str = SwigType_str(type, name);
-  Printf(stdout, "constantWrapper   : %s = %s\n", str, value);
-  Delete(str);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::variableWrapper()
- * ---------------------------------------------------------------------- */
-
-int Language::variableWrapper(Node *n) {
-  Swig_require("variableWrapper", n, "*name", "*sym:name", "*type", "?parms", "?varset", "?varget", NIL);
-  String *symname = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  String *name = Getattr(n, "name");
-
-  Delattr(n,"varset");
-  Delattr(n,"varget");
-
-  String *newsymname = 0;
-  if (!CurrentClass && EnumClassPrefix) {
-    newsymname = Swig_name_member(0, EnumClassPrefix, symname);
-    symname = newsymname;
-  }
-
-  /* If no way to set variables.  We simply create functions */
-  int assignable = is_assignable(n);
-  int flags = use_naturalvar_mode(n);
-  if (!GetFlag(n, "wrappedasconstant"))
-    flags = flags | Extend;
-
-  if (assignable) {
-    int make_set_wrapper = 1;
-    String *tm = Swig_typemap_lookup("globalin", n, name, 0);
-
-    Swig_VarsetToFunction(n, flags);
-    String *sname = Swig_name_set(NSpace, symname);
-    Setattr(n, "sym:name", sname);
-    Delete(sname);
-
-    if (!tm) {
-      if (SwigType_isarray(type)) {
-	Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(type, 0));
-	make_set_wrapper = 0;
-      }
-    } else {
-      String *pname0 = Swig_cparm_name(0, 0);
-      Replace(tm, "$source", pname0, DOH_REPLACE_ANY);
-      Replace(tm, "$target", name, DOH_REPLACE_ANY);
-      Replace(tm, "$input", pname0, DOH_REPLACE_ANY);
-      Setattr(n, "wrap:action", tm);
-      Delete(tm);
-      Delete(pname0);
-    }
-    if (make_set_wrapper) {
-      Setattr(n, "varset", "1");
-      functionWrapper(n);
-    } else {
-      SetFlag(n, "feature:immutable");
-    }
-    /* Restore parameters */
-    Setattr(n, "sym:name", symname);
-    Setattr(n, "type", type);
-    Setattr(n, "name", name);
-    Delattr(n, "varset");
-
-    /* Delete all attached typemaps and typemap attributes */
-    Iterator ki;
-    for (ki = First(n); ki.key; ki = Next(ki)) {
-      if (Strncmp(ki.key, "tmap:", 5) == 0)
-	Delattr(n, ki.key);
-    }
-  }
-
-  Swig_VargetToFunction(n, flags);
-  String *gname = Swig_name_get(NSpace, symname);
-  Setattr(n, "sym:name", gname);
-  Delete(gname);
-  Setattr(n, "varget", "1");
-  functionWrapper(n);
-  Delattr(n, "varget");
-  Swig_restore(n);
-  Delete(newsymname);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * Language::functionWrapper()
- * ---------------------------------------------------------------------- */
-
-int Language::functionWrapper(Node *n) {
-  String *name = Getattr(n, "sym:name");
-  SwigType *type = Getattr(n, "type");
-  ParmList *parms = Getattr(n, "parms");
-
-  Printf(stdout, "functionWrapper   : %s\n", SwigType_str(type, NewStringf("%s(%s)", name, ParmList_str_defaultargs(parms))));
-  Printf(stdout, "           action : %s\n", Getattr(n, "wrap:action"));
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::nativeWrapper()
- * ----------------------------------------------------------------------------- */
-
-int Language::nativeWrapper(Node *n) {
-  (void) n;
-  return SWIG_OK;
-}
-
-void Language::main(int argc, char *argv[]) {
-  (void) argc;
-  (void) argv;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::addSymbol()
- *
- * Adds a symbol entry into the target language symbol tables.
- * Returns 1 if the symbol is added successfully.
- * Prints an error message and returns 0 if a conflict occurs.
- * The scope is optional for target languages and if supplied must be a fully
- * qualified scope and the symbol s must not contain any scope qualifiers.
- * ----------------------------------------------------------------------------- */
-
-int Language::addSymbol(const String *s, const Node *n, const_String_or_char_ptr scope) {
-  //Printf( stdout, "addSymbol: %s %s\n", s, scope );
-  Hash *symbols = Getattr(symtabs, scope ? scope : "");
-  if (!symbols) {
-    symbols = symbolAddScope(scope);
-  } else {
-    Node *c = Getattr(symbols, s);
-    if (c && (c != n)) {
-      if (scope && Len(scope) > 0)
-	Swig_error(input_file, line_number, "'%s' is multiply defined in the generated target language module in scope '%s'.\n", s, scope);
-      else
-	Swig_error(input_file, line_number, "'%s' is multiply defined in the generated target language module.\n", s);
-      Swig_error(Getfile(c), Getline(c), "Previous declaration of '%s'\n", s);
-      return 0;
-    }
-  }
-  Setattr(symbols, s, n);
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::addInterfaceSymbol()
- *
- * Adds a symbol entry into the target language symbol tables - for the interface
- * feature only.
- * Returns 1 if the symbol is added successfully.
- * The scope is as per addSymbol.
- * ----------------------------------------------------------------------------- */
-
-int Language::addInterfaceSymbol(const String *interface_name, Node *n, const_String_or_char_ptr scope) {
-  if (interface_name) {
-    Node *existing_symbol = symbolLookup(interface_name, scope);
-    if (existing_symbol) {
-      String *proxy_class_name = Getattr(n, "sym:name");
-      Swig_error(input_file, line_number, "The interface feature name '%s' for proxy class '%s' is already defined in the generated target language module in scope '%s'.\n",
-	  interface_name, proxy_class_name, scope);
-      Swig_error(Getfile(existing_symbol), Getline(existing_symbol), "Previous declaration of '%s'\n", interface_name);
-      return 0;
-    }
-    if (!addSymbol(interface_name, n, scope))
-      return 0;
-  }
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::symbolAddScope()
- *
- * Creates a scope (symbols Hash) for given name. This method is auxiliary,
- * you don't have to call it - addSymbols will lazily create scopes automatically.
- * If scope with given name already exists, then do nothing.
- * Returns newly created (or already existing) scope.
- * ----------------------------------------------------------------------------- */
-Hash* Language::symbolAddScope(const_String_or_char_ptr scope) {
-  Hash *symbols = symbolScopeLookup(scope);
-  if(!symbols) {
-    // The order in which the following code is executed is important. In the Language
-    // constructor addScope("") is called to create a top level scope.
-    // Thus we must first add a symbols hash to symtab and only then add pseudo
-    // symbols to the top-level scope.
-
-    // New scope which has not been added by the target language - lazily created.
-    symbols = NewHash();
-    Setattr(symtabs, scope, symbols);
-
-    // Add the new scope as a symbol in the top level scope.
-    // Alternatively the target language must add it in before attempting to add symbols into the scope.
-    const_String_or_char_ptr top_scope = "";
-    Hash *topscope_symbols = Getattr(symtabs, top_scope);
-    Hash *pseudo_symbol = NewHash();
-    Setattr(pseudo_symbol, "sym:scope", "1");
-    Setattr(topscope_symbols, scope, pseudo_symbol);
-  }
-  return symbols;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::symbolScopeLookup()
- *
- * Lookup and returns a symtable (hash) representing given scope. Hash contains
- * all symbols in this scope.
- * ----------------------------------------------------------------------------- */
-Hash* Language::symbolScopeLookup( const_String_or_char_ptr scope ) {
-  Hash *symbols = Getattr(symtabs, scope ? scope : "");
-  return symbols;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::symbolScopePseudoSymbolLookup()
- *
- * For every scope there is a special pseudo-symbol in the top scope (""). It
- * exists solely to detect name clashes. This pseudo symbol may contain a few properties,
- * but more could be added. This is also true for the top level scope ("").
- * It contains a pseudo symbol with name "" (empty). Pseudo symbol contains the
- * following properties:
- *   sym:scope = "1" - a flag that this is a scope pseudo symbol
- *
- * Pseudo symbols are a Hash*, not a Node*.
- * There is no difference from symbolLookup() method except for signature
- * and return type.
- * ----------------------------------------------------------------------------- */
-Hash* Language::symbolScopePseudoSymbolLookup( const_String_or_char_ptr scope )
-{
-  /* Getting top scope */
-  const_String_or_char_ptr top_scope = "";
-  Hash *symbols = Getattr(symtabs, top_scope);
-  return Getattr(symbols, scope);
-}
-
-/* -----------------------------------------------------------------------------
- * Language::dumpSymbols()
- * ----------------------------------------------------------------------------- */
-
-void Language::dumpSymbols() {
-  Printf(stdout, "LANGUAGE SYMBOLS start  =======================================\n");
-
-  Node *table = symtabs;
-  Iterator ki = First(table);
-  while (ki.key) {
-    String *k = ki.key;
-    Printf(stdout, "===================================================\n");
-    Printf(stdout, "%s -\n", k);
-    {
-      Symtab *symtab = Getattr(table, k);
-      Iterator it = First(symtab);
-      while (it.key) {
-	String *symname = it.key;
-	Printf(stdout, "  %s\n", symname);
-	it = Next(it);
-      }
-    }
-    ki = Next(ki);
-  }
-
-  Printf(stdout, "LANGUAGE SYMBOLS finish =======================================\n");
-}
-
-/* -----------------------------------------------------------------------------
- * Language::symbolLookup()
- * ----------------------------------------------------------------------------- */
-
-Node *Language::symbolLookup(const String *s, const_String_or_char_ptr scope) {
-  Hash *symbols = Getattr(symtabs, scope ? scope : "");
-  if (!symbols) {
-    return NULL;
-  }
-  return Getattr(symbols, s);
-}
-
-/* -----------------------------------------------------------------------------
- * Language::classLookup()
- *
- * Tries to locate a class from a type definition
- * ----------------------------------------------------------------------------- */
-
-Node *Language::classLookup(const SwigType *s) const {
-  Node *n = 0;
-
-  /* Look in hash of cached values */
-  n = Getattr(classtypes, s);
-  if (!n) {
-    Symtab *stab = 0;
-    SwigType *ty1 = SwigType_typedef_resolve_all(s);
-    SwigType *ty2 = SwigType_strip_qualifiers(ty1);
-
-    String *base = SwigType_base(ty2);
-
-    Replaceall(base, "class ", "");
-    Replaceall(base, "struct ", "");
-    Replaceall(base, "union ", "");
-
-    if (strncmp(Char(base), "::", 2) == 0) {
-      String *oldbase = base;
-      base = NewString(Char(base) + 2);
-      Delete(oldbase);
-    }
-
-    String *prefix = SwigType_prefix(ty2);
-
-    /* Do a symbol table search on the base type */
-    while (!n) {
-      Hash *nstab;
-      n = Swig_symbol_clookup(base, stab);
-      if (!n)
-	break;
-      if (Strcmp(nodeType(n), "class") == 0)
-	break;
-      n = parentNode(n);
-      if (!n)
-	break;
-      nstab = Getattr(n, "sym:symtab");
-      n = 0;
-      if ((!nstab) || (nstab == stab)) {
-	break;
-      }
-      stab = nstab;
-    }
-    if (n) {
-      /* Found a match.  Look at the prefix.  We only allow
-         the cases where where we want a proxy class for the particular type */
-      bool acceptable_prefix = 
-	(Len(prefix) == 0) ||			      // simple type (pass by value)
-	(Strcmp(prefix, "p.") == 0) ||		      // pointer
-	(Strcmp(prefix, "r.") == 0) ||		      // reference
-	(Strcmp(prefix, "z.") == 0) ||		      // rvalue reference
-	SwigType_prefix_is_simple_1D_array(prefix);   // Simple 1D array (not arrays of pointers/references)
-      // Also accept pointer by const reference, not non-const pointer reference
-      if (!acceptable_prefix && (Strcmp(prefix, "r.p.") == 0)) {
-	Delete(prefix);
-	prefix = SwigType_prefix(ty1);
-	acceptable_prefix = (Strncmp(prefix, "r.q(const", 9) == 0);
-      }
-      if (acceptable_prefix) {
-	SwigType *cs = Copy(s);
-	Setattr(classtypes, cs, n);
-	Delete(cs);
-      } else {
-	n = 0;
-      }
-    }
-    Delete(prefix);
-    Delete(base);
-    Delete(ty2);
-    Delete(ty1);
-  }
-  if (n && (GetFlag(n, "feature:ignore") || Getattr(n, "feature:onlychildren"))) {
-    n = 0;
-  }
-
-  return n;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::enumLookup()
- *
- * Finds and returns the Node containing the enum declaration for the (enum) 
- * type passed in.
- * ----------------------------------------------------------------------------- */
-
-Node *Language::enumLookup(SwigType *s) {
-  Node *n = 0;
-
-  /* Look in hash of cached values */
-  n = Getattr(enumtypes, s);
-  if (!n) {
-    Symtab *stab = 0;
-    SwigType *lt = SwigType_ltype(s);
-    SwigType *ty1 = SwigType_typedef_resolve_all(lt);
-    SwigType *ty2 = SwigType_strip_qualifiers(ty1);
-
-    String *base = SwigType_base(ty2);
-
-    Replaceall(base, "enum ", "");
-    String *prefix = SwigType_prefix(ty2);
-
-    if (strncmp(Char(base), "::", 2) == 0) {
-      String *oldbase = base;
-      base = NewString(Char(base) + 2);
-      Delete(oldbase);
-    }
-
-    /* Look for type in symbol table */
-    while (!n) {
-      Hash *nstab;
-      n = Swig_symbol_clookup(base, stab);
-      if (!n)
-	break;
-      if (Equal(nodeType(n), "enum"))
-	break;
-      if (Equal(nodeType(n), "enumforward") && GetFlag(n, "enumMissing"))
-	break;
-      n = parentNode(n);
-      if (!n)
-	break;
-      nstab = Getattr(n, "sym:symtab");
-      n = 0;
-      if ((!nstab) || (nstab == stab)) {
-	break;
-      }
-      stab = nstab;
-    }
-    if (n) {
-      /* Found a match.  Look at the prefix.  We only allow simple types. */
-      if (Len(prefix) == 0) {	/* Simple type */
-	Setattr(enumtypes, Copy(s), n);
-      } else {
-	n = 0;
-      }
-    }
-    Delete(prefix);
-    Delete(base);
-    Delete(ty2);
-    Delete(ty1);
-    Delete(lt);
-  }
-  if (n && (GetFlag(n, "feature:ignore"))) {
-    n = 0;
-  }
-
-  return n;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::allow_overloading()
- * ----------------------------------------------------------------------------- */
-
-void Language::allow_overloading(int val) {
-  overloading = val;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::allow_multiple_input()
- * ----------------------------------------------------------------------------- */
-
-void Language::allow_multiple_input(int val) {
-  multiinput = val;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::enable_cplus_runtime_mode()
- * ----------------------------------------------------------------------------- */
-
-void Language::enable_cplus_runtime_mode() {
-  cplus_runtime = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::cplus_runtime_mode()
- * ----------------------------------------------------------------------------- */
-
-int Language::cplus_runtime_mode() {
-  return cplus_runtime;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::allow_directors()
- * ----------------------------------------------------------------------------- */
-
-void Language::allow_directors(int val) {
-  directors = val;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::directorsEnabled()
- * ----------------------------------------------------------------------------- */
-
-int Language::directorsEnabled() const {
-  return director_language && CPlusPlus && (directors || director_mode);
-}
-
-/* -----------------------------------------------------------------------------
- * Language::allow_dirprot()
- * ----------------------------------------------------------------------------- */
-
-void Language::allow_dirprot(int val) {
-  director_protected_mode = val;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::allow_allprotected()
- * ----------------------------------------------------------------------------- */
-
-void Language::allow_allprotected(int val) {
-  all_protected_mode = val;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::dirprot_mode()
- * ----------------------------------------------------------------------------- */
-
-int Language::dirprot_mode() const {
-  return directorsEnabled() ? director_protected_mode : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::need_nonpublic_ctor()
- * ----------------------------------------------------------------------------- */
-
-int Language::need_nonpublic_ctor(Node *n) {
-  /* 
-     detects when a protected constructor is needed, which is always
-     the case if 'dirprot' mode is used.  However, if that is not the
-     case, we will try to strictly emit what is minimal to don't break
-     the generated, while preserving compatibility with java, which
-     always try to emit the default constructor.
-
-     rules:
-
-     - when dirprot mode is used, the protected constructors are
-     always needed.
-
-     - the protected default constructor is always needed.
-
-     - if dirprot mode is not used, the protected constructors will be
-     needed only if:
-
-     - there is no any public constructor in the class, and
-     - there is no protected default constructor
-
-     In that case, all the declared protected constructors are
-     needed since we don't know which one to pick up.
-
-     Note: given all the complications here, I am always in favor to
-     always enable 'dirprot', since is the C++ idea of protected
-     members, and use %ignore for the method you don't whan to add in
-     the director class.
-   */
-  if (directorsEnabled()) {
-    if (is_protected(n)) {
-      if (dirprot_mode()) {
-	/* when using dirprot mode, the protected constructors are
-	   always needed */
-	return 1;
-      } else {
-	int is_default_ctor = !ParmList_numrequired(Getattr(n, "parms"));
-	if (is_default_ctor) {
-	  /* the default protected constructor is always needed, for java compatibility */
-	  return 1;
-	} else {
-	  /* check if there is a public constructor */
-	  Node *parent = Swig_methodclass(n);
-	  int public_ctor = Getattr(parent, "allocate:default_constructor")
-	      || Getattr(parent, "allocate:public_constructor");
-	  if (!public_ctor) {
-	    /* if not, the protected constructor will be needed only
-	       if there is no protected default constructor declared */
-	    int no_prot_default_ctor = !Getattr(parent, "allocate:default_base_constructor");
-	    return no_prot_default_ctor;
-	  }
-	}
-      }
-    }
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::need_nonpublic_member()
- * ----------------------------------------------------------------------------- */
-int Language::need_nonpublic_member(Node *n) {
-  if (directorsEnabled() && DirectorClassName) {
-    if (is_protected(n)) {
-      if (dirprot_mode()) {
-	/* when using dirprot mode, the protected members are always needed. */
-	return 1;
-      } else {
-	/* if the method is pure virtual, we need it. */
-	int pure_virtual = (Cmp(Getattr(n, "value"), "0") == 0);
-	return pure_virtual;
-      }
-    }
-  }
-  return 0;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Language::is_smart_pointer()
- * ----------------------------------------------------------------------------- */
-
-int Language::is_smart_pointer() const {
-  return SmartPointer;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::makeParameterName()
- *
- * Inputs: 
- *   n - Node
- *   p - parameter node
- *   arg_num - parameter argument number
- *   setter  - set this flag when wrapping variables
- * Return:
- *   arg - a unique parameter name
- * ----------------------------------------------------------------------------- */
-String *Language::makeParameterName(Node *n, Parm *p, int arg_num, bool setter) const {
-
-  String *arg = 0;
-  String *pn = Getattr(p, "name");
-
-  // Use C parameter name unless it is a duplicate or an empty parameter name
-  int count = 0;
-  ParmList *plist = Getattr(n, "parms");
-  while (plist) {
-    if ((Cmp(pn, Getattr(plist, "name")) == 0))
-      count++;
-    plist = nextSibling(plist);
-  }
-  String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0;
-  arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn);
-
-  if (setter && Cmp(arg, "self") != 0) {
-    // Some languages (C#) insist on calling the input variable "value" while
-    // others (D, Java) could, in principle, use something different but this
-    // would require more work, and so we just use "value" for them too.
-    // For setters the parameter name sometimes includes C++ scope resolution which needs removing.
-    Delete(arg);
-    arg = NewString("value");
-  }
-
-  return arg;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::()
- * ----------------------------------------------------------------------------- */
-
-bool Language::isNonVirtualProtectedAccess(Node *n) const {
-  // Ideally is_non_virtual_protected_access() would contain all this logic, see
-  // comments therein about vtable. 
-  return DirectorClassName && is_non_virtual_protected_access(n);
-}
-
-/* -----------------------------------------------------------------------------
- * Language::extraDirectorProtectedCPPMethodsRequired()
- * ----------------------------------------------------------------------------- */
-
-bool Language::extraDirectorProtectedCPPMethodsRequired() const {
-  return true;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::nestedClassesSupport()
- * ----------------------------------------------------------------------------- */
-
-Language::NestedClassSupport Language::nestedClassesSupport() const {
-  return NCS_Unknown;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::kwargsSupport()
- * ----------------------------------------------------------------------------- */
-
-bool Language::kwargsSupport() const {
-  return false;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::is_wrapping_class()
- * ----------------------------------------------------------------------------- */
-
-int Language::is_wrapping_class() const {
-  return InClass;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::getCurrentClass()
- * ----------------------------------------------------------------------------- */
-
-Node *Language::getCurrentClass() const {
-  return CurrentClass;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::getNSpace()
- * ----------------------------------------------------------------------------- */
-
-String *Language::getNSpace() const {
-  return NSpace;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::getClassName()
- * ----------------------------------------------------------------------------- */
-
-String *Language::getClassName() const {
-  return ClassName;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::getClassPrefix()
- * ----------------------------------------------------------------------------- */
-
-String *Language::getClassPrefix() const {
-  return ClassPrefix;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::getEnumClassPrefix()
- * ----------------------------------------------------------------------------- */
-
-String *Language::getEnumClassPrefix() const {
-  return EnumClassPrefix;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::getClassType()
- * ----------------------------------------------------------------------------- */
-
-String *Language::getClassType() const {
-  return ClassType;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::abstractClassTest()
- * ----------------------------------------------------------------------------- */
-//#define SWIG_DEBUG
-int Language::abstractClassTest(Node *n) {
-  /* check for non public operator new */
-  if (GetFlag(n, "feature:notabstract"))
-    return 0;
-  if (Getattr(n, "allocate:nonew"))
-    return 1;
-
-  // A class cannot be instantiated if one of its bases has a private destructor
-  // Note that if the above does not hold the class can be instantiated if its own destructor is private
-  List *bases = Getattr(n, "bases");
-  if (bases) {
-    for (int i = 0; i < Len(bases); i++) {
-      Node *b = Getitem(bases, i);
-      if (GetFlag(b, "allocate:private_destructor"))
-	return 1;
-    }
-  }
-
-  /* now check for the rest */
-  List *abstracts = Getattr(n, "abstracts");
-  if (!abstracts)
-    return 0;
-  int labs = Len(abstracts);
-#ifdef SWIG_DEBUG
-  List *allbases = Getattr(n, "allbases");
-  Printf(stderr, "testing %s %d %d\n", Getattr(n, "name"), labs, Len(allbases));
-#endif
-  if (!labs)
-    return 0;			/*strange, but need to be fixed */
-  if (abstracts && !directorsEnabled())
-    return 1;
-  if (!GetFlag(n, "feature:director"))
-    return 1;
-
-  Node *dirabstract = 0;
-  Node *vtable = Getattr(n, "vtable");
-  if (vtable) {
-#ifdef SWIG_DEBUG
-    Printf(stderr, "vtable %s %d %d\n", Getattr(n, "name"), Len(vtable), labs);
-#endif
-    for (int i = 0; i < labs; i++) {
-      Node *ni = Getitem(abstracts, i);
-      Node *method_id = vtable_method_id(ni);
-      if (!method_id)
-	continue;
-      bool exists_item = false;
-      int len = Len(vtable);
-      for (int i = 0; i < len; i++) {
-	Node *item = Getitem(vtable, i);
-	String *check_item = Getattr(item, "vmid");
-	if (Strcmp(method_id, check_item) == 0) {
-	  exists_item = true;
-	  break;
-	}
-      }
-#ifdef SWIG_DEBUG
-      Printf(stderr, "method %s %d\n", method_id, exists_item ? 1 : 0);
-#endif
-      Delete(method_id);
-      if (!exists_item) {
-	dirabstract = ni;
-	break;
-      }
-    }
-    if (dirabstract) {
-      if (is_public(dirabstract)) {
-	Swig_warning(WARN_LANG_DIRECTOR_ABSTRACT, Getfile(n), Getline(n),
-		     "Director class '%s' is abstract, abstract method '%s' is not accesible, maybe due to multiple inheritance or 'nodirector' feature\n",
-		     SwigType_namestr(Getattr(n, "name")), Getattr(dirabstract, "name"));
-      } else {
-	Swig_warning(WARN_LANG_DIRECTOR_ABSTRACT, Getfile(n), Getline(n),
-		     "Director class '%s' is abstract, abstract method '%s' is private\n", SwigType_namestr(Getattr(n, "name")), Getattr(dirabstract, "name"));
-      }
-      return 1;
-    }
-  } else {
-    return 1;
-  }
-  return 0;
-}
-
-void Language::setSubclassInstanceCheck(String *nc) {
-  none_comparison = nc;
-}
-
-void Language::setOverloadResolutionTemplates(String *argc, String *argv) {
-  Delete(argc_template_string);
-  argc_template_string = Copy(argc);
-  Delete(argv_template_string);
-  argv_template_string = Copy(argv);
-}
-
-int Language::is_assignable(Node *n) {
-  if (GetFlag(n, "feature:immutable"))
-    return 0;
-  SwigType *type = Getattr(n, "type");
-  Node *cn = 0;
-  SwigType *ftd = SwigType_typedef_resolve_all(type);
-  SwigType *td = SwigType_strip_qualifiers(ftd);
-  if (SwigType_type(td) == T_USER) {
-    cn = Swig_symbol_clookup(td, 0);
-    if (cn) {
-      if ((Strcmp(nodeType(cn), "class") == 0)) {
-	if (Getattr(cn, "allocate:noassign")) {
-	  SetFlag(n, "feature:immutable");
-	  Delete(ftd);
-	  Delete(td);
-	  return 0;
-	}
-      }
-    }
-  }
-  Delete(ftd);
-  Delete(td);
-  return 1;
-}
-
-String *Language::runtimeCode() {
-  return NewString("");
-}
-
-String *Language::defaultExternalRuntimeFilename() {
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Language::replaceSpecialVariables()
- *
- * Language modules should implement this if special variables are to be handled
- * correctly in the $typemap(...) special variable macro.
- * method - typemap method name
- * tm - string containing typemap contents
- * parm - a parameter describing the typemap type to be handled
- * ----------------------------------------------------------------------------- */
-void Language::replaceSpecialVariables(String *method, String *tm, Parm *parm) {
-  (void)method;
-  (void)tm;
-  (void)parm;
-}
-
-Language *Language::instance() {
-  return this_;
-}
-
-Hash *Language::getClassHash() const {
-  return classhash;
-}
-
diff --git a/dependencies2013/win32/swig/Source/Modules/lua.cxx b/dependencies2013/win32/swig/Source/Modules/lua.cxx
deleted file mode 100644
index 80ea47f3..00000000
--- a/dependencies2013/win32/swig/Source/Modules/lua.cxx
+++ /dev/null
@@ -1,2282 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * lua.cxx
- *
- * Lua language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-/* NEW LANGUAGE NOTE:
- * ver001
-   this is simply a copy of tcl8.cxx, which has been renamed
- * ver002
-   all non essential code commented out, program now does virtually nothing
-   it prints to stderr the list of functions to wrap, but does not create
-   the XXX_wrap.c file
- * ver003
-   added back top(), still prints the list of fns to stderr
-   but now creates a rather empty XXX_wrap.c with some basic boilerplate code
- * ver004
-   very basic version of functionWrapper()
-   also uncommented usage_string() to keep compiler happy
-   this will start producing proper looking code soon (I hope)
-   produced the wrapper code, but without any type conversion (in or out)
-   generates a few warning because of no wrappering
-   does not generate SWIG_init()
-   reason for this is that lua.swg is empty
-   we will need to add code into this to make it work
- * ver005/6
-   massive rework, basing work on the pike module instead of tcl
-   (pike module it only 1/3 of the size)(though not as complete)
- * ver007
-   added simple type checking
- * ver008
-   INPUT, OUTPUT, INOUT typemaps handled (though not all types yet)
- * ver009
-   class support: ok for basic types, but methods still TDB
-   (code is VERY messed up & needs to be cleaned)
- * ver010
-   Added support for embedded Lua. Try swig -lua -help for more information
-*/
-
-#include "swigmod.h"
-#include "cparse.h"
-
-/**** Diagnostics:
-  With the #define REPORT(), you can change the amount of diagnostics given
-  This helps me search the parse tree & figure out what is going on inside SWIG
-  (because its not clear or documented)
-*/
-#define REPORT(T,D)		// no info:
-//#define REPORT(T,D)   {Printf(stdout,T"\n");} // only title
-//#define REPORT(T,D)           {Printf(stdout,T" %p\n",n);} // title & pointer
-//#define REPORT(T,D)   {Printf(stdout,T"\n");display_mapping(D);}      // the works
-//#define REPORT(T,D)   {Printf(stdout,T"\n");if(D)Swig_print_node(D);}      // the works
-
-void display_mapping(DOH *d) {
-  if (d == 0 || !DohIsMapping(d))
-    return;
-  for (Iterator it = First(d); it.item; it = Next(it)) {
-    if (DohIsString(it.item))
-      Printf(stdout, "  %s = %s\n", it.key, it.item);
-    else if (DohIsMapping(it.item))
-      Printf(stdout, "  %s = <mapping>\n", it.key);
-    else if (DohIsSequence(it.item))
-      Printf(stdout, "  %s = <sequence>\n", it.key);
-    else
-      Printf(stdout, "  %s = <unknown>\n", it.key);
-  }
-}
-
-extern "C"
-{
-  static int compareByLen(const DOH *f, const DOH *s) {
-    return Len(s) - Len(f);
-  }
-}
-
-
-/* NEW LANGUAGE NOTE:***********************************************
- most of the default options are handled by SWIG
- you can add new ones here
- (though for now I have not bothered)
-NEW LANGUAGE NOTE:END ************************************************/
-static const char *usage = "\
-Lua Options (available with -lua)\n\
-     -elua           - Generates LTR compatible wrappers for smaller devices running elua\n\
-     -eluac          - LTR compatible wrappers in \"crass compress\" mode for elua\n\
-     -elua-emulate   - Emulates behaviour of eLua. Useful only for testing.\n\
-                       Incompatible with -elua/-eluac options.\n\
-     -nomoduleglobal - Do not register the module name as a global variable \n\
-                       but return the module table from calls to require.\n\
-     -no-old-metatable-bindings\n\
-                     - Disable support for old-style bindings name generation, some\n\
-                       old-style members scheme etc.\n\
-     -squash-bases   - Squashes symbols from all inheritance tree of a given class\n\
-                       into itself. Emulates pre-SWIG3.0 inheritance. Insignificantly\n\
-                       speeds things up, but increases memory consumption.\n\
-\n";
-
-static int nomoduleglobal = 0;
-static int elua_ltr = 0;
-static int eluac_ltr = 0;
-static int elua_emulate = 0;
-static int squash_bases = 0;
-/* The new metatable bindings were introduced in SWIG 3.0.0.
- * old_metatable_bindings in v2: 
- *                    1. static methods will be put into the scope their respective class
- *                    belongs to as well as into the class scope itself. (only for classes without %nspace given)
- *                    2. The layout in elua mode is somewhat different
- */
-static int old_metatable_bindings = 1;
-static int old_compatible_names = 1; // This flag can temporarily disable backward compatible names generation if old_metatable_bindings is enabled
-
-/* NEW LANGUAGE NOTE:***********************************************
- To add a new language, you need to derive your class from
- Language and the overload various virtual functions
- (more on this as I figure it out)
-NEW LANGUAGE NOTE:END ************************************************/
-
-class LUA:public Language {
-private:
-
-  File *f_begin;
-  File *f_runtime;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-  File *f_initbeforefunc;
-  String *s_luacode;		// luacode to be called during init
-  String *module;		//name of the module
-
-  // Parameters for current class. NIL if not parsing class
-  int have_constructor;
-  int have_destructor;
-  String *destructor_action;
-  // This variable holds the name of the current class in Lua. Usually it is
-  // the same as C++ class name, but rename directives can change it.
-  String *proxy_class_name;
-  // This is a so calld fully qualified symname - the above proxy class name
-  // prepended with class namespace. If class Lua name is the same as class C++ name,
-  // then it is basically C++ fully qualified name with colons replaced with dots.
-  String *full_proxy_class_name;	
-  // All static methods and/or variables are treated as if they were in the
-  // special C++ namespace $(classname).SwigStatic. This is internal mechanism only
-  // and is not visible to user in any manner. This variable holds the name
-  // of such pseudo-namespace a.k.a the result of above expression evaluation
-  String *class_static_nspace;
-  // This variable holds the name of generated C function that acts as a constructor
-  // for the currently parsed class.
-  String *constructor_name;
-
-  // Many wrappers forward calls to each other, for example staticmembervariableHandler
-  // forwards calls to variableHandler, which, in turn, makes to call to functionWrapper.
-  // In order to access information about whether it is a static member of class or just 
-  // a plain old variable, the current array is kept and used as a 'log' of the call stack.
-  enum TState {
-    NO_CPP,
-    VARIABLE,
-    GLOBAL_FUNC,
-    GLOBAL_VAR,
-    MEMBER_FUNC,
-    CONSTRUCTOR,
-    DESTRUCTOR,
-    MEMBER_VAR,
-    STATIC_FUNC,
-    STATIC_VAR,
-    STATIC_CONST,		// enums and things like static const int x = 5;
-    ENUM_CONST, // This is only needed for backward compatibility in C mode
-
-    STATES_COUNT
-  };
-  bool current[STATES_COUNT];
-
-public:
-
-  /* ---------------------------------------------------------------------
-   * LUA()
-   *
-   * Initialize member data
-   * --------------------------------------------------------------------- */
-
-   LUA():
-      f_begin(0),
-      f_runtime(0),
-      f_header(0),
-      f_wrappers(0),
-      f_init(0),
-      f_initbeforefunc(0),
-      s_luacode(0),
-      module(0),
-      have_constructor(0),
-      have_destructor(0),
-      destructor_action(0),
-      proxy_class_name(0),
-      full_proxy_class_name(0),
-      class_static_nspace(0),
-      constructor_name(0) {
-    for (int i = 0; i < STATES_COUNT; i++)
-      current[i] = false;
-  }
-
-  /* NEW LANGUAGE NOTE:***********************************************
-     This is called to initialise the system & read any command line args
-     most of this is boilerplate code, except the command line args
-     which depends upon what args your code supports
-     NEW LANGUAGE NOTE:END *********************************************** */
-
-  /* ---------------------------------------------------------------------
-   * main()
-   *
-   * Parse command line options and initializes variables.
-   * --------------------------------------------------------------------- */
-
-  virtual void main(int argc, char *argv[]) {
-
-    /* Set location of SWIG library */
-    SWIG_library_directory("lua");
-
-    /* Look for certain command line options */
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-help") == 0) {	// usage flags
-	  fputs(usage, stdout);
-	} else if (strcmp(argv[i], "-nomoduleglobal") == 0) {
-	  nomoduleglobal = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-elua") == 0) {
-	  elua_ltr = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-eluac") == 0) {
-	  eluac_ltr = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-no-old-metatable-bindings") == 0) {
-	  Swig_mark_arg(i);
-	  old_metatable_bindings = 0;
-	} else if (strcmp(argv[i], "-squash-bases") == 0) {
-	  Swig_mark_arg(i);
-	  squash_bases = 1;
-	} else if (strcmp(argv[i], "-elua-emulate") == 0) {
-	  Swig_mark_arg(i);
-	  elua_emulate = 1;
-	}
-      }
-    }
-
-    if (elua_emulate && (eluac_ltr || elua_ltr )) {
-      Printf(stderr, "Cannot have -elua-emulate with either -eluac or -elua\n");
-      Swig_arg_error();
-    }
-
-    // Set elua_ltr if elua_emulate is requested
-    if(elua_emulate)
-      elua_ltr = 1;
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       This is the boilerplate code, setting a few #defines
-       and which lib directory to use
-       the SWIG_library_directory() is also boilerplate code
-       but it always seems to be the first line of code
-       NEW LANGUAGE NOTE:END *********************************************** */
-    /* Add a symbol to the parser for conditional compilation */
-    Preprocessor_define("SWIGLUA 1", 0);
-
-    /* Set language-specific configuration file */
-    SWIG_config_file("lua.swg");
-
-    /* Set typemap language */
-    SWIG_typemap_lang("lua");
-
-    /* Enable overloaded methods support */
-    allow_overloading();
-  }
-
-
-
-
-  /* NEW LANGUAGE NOTE:***********************************************
-     After calling main, SWIG parses the code to wrap (I believe)
-     then calls top()
-     in this is more boilerplate code to set everything up
-     and a call to Language::top()
-     which begins the code generations by calling the member fns
-     after all that is more boilerplate code to close all down
-     (overall there is virtually nothing here that needs to be edited
-     just use as is)
-     NEW LANGUAGE NOTE:END *********************************************** */
-  /* ---------------------------------------------------------------------
-   * top()
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-    /* Get the module name */
-    module = Getattr(n, "name");
-
-    /* Get the output file name */
-    String *outfile = Getattr(n, "outfile");
-
-    /* Open the output file */
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_initbeforefunc = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("initbeforefunc", f_initbeforefunc);
-
-
-    s_luacode = NewString("");
-    Swig_register_filebyname("luacode", s_luacode);
-
-    current[NO_CPP] = true;
-
-    /* Standard stuff for the SWIG runtime section */
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGLUA\n#define SWIGLUA\n#endif\n\n");
-
-    emitLuaFlavor(f_runtime);
-
-    if (nomoduleglobal) {
-      Printf(f_runtime, "#define SWIG_LUA_NO_MODULE_GLOBAL\n");
-    } else {
-      Printf(f_runtime, "#define SWIG_LUA_MODULE_GLOBAL\n");
-    }
-    if (squash_bases)
-      Printf(f_runtime, "#define SWIG_LUA_SQUASH_BASES\n");
-
-    //    if (NoInclude) {
-    //      Printf(f_runtime, "#define SWIG_NOINCLUDE\n");
-    //    }
-
-    Printf(f_runtime, "\n");
-
-    //String *init_name = NewStringf("%(title)s_Init", module);
-    //Printf(f_header, "#define SWIG_init    %s\n", init_name);
-    //Printf(f_header, "#define SWIG_name    \"%s\"\n", module);
-    /* SWIG_import is a special function name for importing within Lua5.1 */
-    //Printf(f_header, "#define SWIG_import  luaopen_%s\n\n", module);
-    Printf(f_header, "#define SWIG_name      \"%s\"\n", module);
-    Printf(f_header, "#define SWIG_init      luaopen_%s\n", module);
-    Printf(f_header, "#define SWIG_init_user luaopen_%s_user\n\n", module);
-    Printf(f_header, "#define SWIG_LUACODE   luaopen_%s_luacode\n", module);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
-
-    /* %init code inclusion, effectively in the SWIG_init function */
-    Printf(f_init, "void SWIG_init_user(lua_State* L)\n{\n");
-    Language::top(n);
-    Printf(f_init, "/* exec Lua code if applicable */\nSWIG_Lua_dostring(L,SWIG_LUACODE);\n");
-    Printf(f_init, "}\n");
-
-    // Done.  Close up the module & write to the wrappers
-    closeNamespaces(f_wrappers);
-    Printf(f_wrappers, "#ifdef __cplusplus\n}\n#endif\n");
-
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       this basically combines several of the strings together
-       and then writes it all to a file
-       NEW LANGUAGE NOTE:END *********************************************** */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-    Dump(f_wrappers, f_begin);
-    Dump(f_initbeforefunc, f_begin);
-    /* for the Lua code it needs to be properly escaped to be added into the C/C++ code */
-    escapeCode(s_luacode);
-    Printf(f_begin, "const char* SWIG_LUACODE=\n  \"%s\";\n\n", s_luacode);
-    Wrapper_pretty_print(f_init, f_begin);
-    /* Close all of the files */
-    Delete(s_luacode);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_initbeforefunc);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    /* Done */
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * importDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int importDirective(Node *n) {
-    return Language::importDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * cDeclaration()
-   * It copies sym:name to lua:name to preserve its original value
-   * ------------------------------------------------------------ */
-
-  virtual int cDeclaration(Node *n) {
-    // class 'Language' is messing with symname in a really heavy way.
-    // Although documentation states that sym:name is a name in
-    // the target language space, it is not true. sym:name and
-    // its derivatives are used in various places, including
-    // behind-the-scene C code generation. The best way is not to
-    // touch it at all.
-    // But we need to know what was the name of function/variable
-    // etc that user desired, that's why we store correct symname
-    // as lua:name
-    String *symname = Getattr(n, "sym:name");
-    if (symname)
-      Setattr(n, "lua:name", symname);
-    return Language::cDeclaration(n);
-  }
-  virtual int constructorDeclaration(Node *n) {
-    Setattr(n, "lua:name", Getattr(n, "sym:name"));
-    return Language::constructorDeclaration(n);
-  }
-  virtual int destructorDeclaration(Node *n) {
-    Setattr(n, "lua:name", Getattr(n, "sym:name"));
-    return Language::destructorDeclaration(n);
-  }
-  /* NEW LANGUAGE NOTE:***********************************************
-     This is it!
-     you get this one right, and most of your work is done
-     but its going to take some file to get it working right
-     quite a bit of this is generally boilerplate code
-     (or stuff I don't understand)
-     that which matters will have extra added comments
-     NEW LANGUAGE NOTE:END *********************************************** */
-  /* ---------------------------------------------------------------------
-   * functionWrapper()
-   *
-   * Create a function declaration and register it with the interpreter.
-   * --------------------------------------------------------------------- */
-
-  /* -----------------------------------------------------------------------
-   * registerMethod()
-   *
-   * Determines wrap name of a method, its scope etc and calls
-   * registerMethod overload with correct arguments
-   * Overloaded variant adds method to the "methods" array of specified lua scope/class
-   * ---------------------------------------------------------------------- */
-
-  void registerMethod(Node *n, bool overwrite = false, String *overwriteLuaScope = 0) {
-    String *symname = Getattr(n, "sym:name");
-    assert(symname);
-
-    if (Getattr(n, "sym:nextSibling"))
-      return;
-
-    // Lua scope. It is not symbol NSpace, it is the actual key to retrieve getCArraysHash.
-    String *luaScope = luaCurrentSymbolNSpace();
-    if (overwrite)
-      luaScope = overwriteLuaScope;
-
-    String *wrapname = 0;
-    String *mrename;
-    if (current[NO_CPP] || !getCurrentClass()) {
-      mrename = symname;
-    } else {
-      assert(!current[NO_CPP]);
-      if (current[STATIC_FUNC] || current[MEMBER_FUNC]) {
-	mrename = Swig_name_member(getNSpace(), getClassPrefix(), symname);
-      } else {
-	mrename = symname;
-      }
-    }
-    wrapname = Swig_name_wrapper(mrename);
-    registerMethod(n, wrapname, luaScope);
-  }
-
-  /* -----------------------------------------------------------------------
-   * registerMethod()
-   *
-   * Add method to the "methods" C array of given namespace/class
-   * ---------------------------------------------------------------------- */
-
-  void registerMethod(Node *n, String* wname, String *luaScope) {
-    assert(n);
-    Hash *nspaceHash = getCArraysHash(luaScope);
-    String *s_ns_methods_tab = Getattr(nspaceHash, "methods");
-    String *lua_name = Getattr(n, "lua:name");
-    if (elua_ltr || eluac_ltr)
-      Printv(s_ns_methods_tab, tab4, "{LSTRKEY(\"", lua_name, "\")", ", LFUNCVAL(", wname, ")", "},\n", NIL);
-    else
-      Printv(s_ns_methods_tab, tab4, "{ \"", lua_name, "\", ", wname, "},\n", NIL);
-    // Add to the metatable if method starts with '__'
-    const char * tn = Char(lua_name);
-    if (tn[0]=='_' && tn[1] == '_' && !eluac_ltr) {
-      String *metatable_tab = Getattr(nspaceHash, "metatable");
-      assert(metatable_tab);
-      if (elua_ltr)
-	Printv(metatable_tab, tab4, "{LSTRKEY(\"", lua_name, "\")", ", LFUNCVAL(", wname, ")", "},\n", NIL);
-      else
-	Printv(metatable_tab, tab4, "{ \"", lua_name, "\", ", wname, "},\n", NIL);
-    }
-  }
-
-  virtual int functionWrapper(Node *n) {
-    REPORT("functionWrapper", n);
-
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    String *lua_name = Getattr(n, "lua:name");
-    assert(lua_name);
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    Parm *p;
-    String *tm;
-    int i;
-    //Printf(stdout,"functionWrapper %s %s %d\n",name,iname,current);
-
-    String *overname = 0;
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!luaAddSymbol(lua_name, n)) {
-	return SWIG_ERROR;
-      }
-    }
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       the wrapper object holds all the wrapper code
-       we need to add a couple of local variables
-       NEW LANGUAGE NOTE:END *********************************************** */
-    Wrapper *f = NewWrapper();
-    Wrapper_add_local(f, "SWIG_arg", "int SWIG_arg = 0");
-
-
-    String *wname = Swig_name_wrapper(iname);
-    if (overname) {
-      Append(wname, overname);
-    }
-    if (current[CONSTRUCTOR]) {
-      if (constructor_name != 0)
-	Delete(constructor_name);
-      constructor_name = Copy(wname);
-    }
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       the format of a lua fn is:
-       static int wrap_XXX(lua_State* L){...}
-       this line adds this into the wrapper code
-       NEW LANGUAGE NOTE:END *********************************************** */
-    Printv(f->def, "static int ", wname, "(lua_State* L) {", NIL);
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       this prints the list of args, eg for a C fn
-       int gcd(int x,int y);
-       it will print
-       int arg1;
-       int arg2;
-       NEW LANGUAGE NOTE:END *********************************************** */
-    /* Write code to extract function parameters. */
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    /* Get number of required and total arguments */
-    int num_arguments = emit_num_arguments(l);
-    int num_required = emit_num_required(l);
-    int varargs = emit_isvarargs(l);
-
-    // Check if we have to ignore arguments that are passed by LUA.
-    // Needed for unary minus, where lua passes two arguments and
-    // we have to ignore the second.
-
-    int args_to_ignore = 0;
-    if (Getattr(n, "lua:ignore_args")) {
-      args_to_ignore = GetInt(n, "lua:ignore_args");
-    }
-
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       from here on in, it gets rather hairy
-       this is the code to convert from the scripting language to C/C++
-       some of the stuff will refer to the typemaps code written in your swig file
-       (lua.swg), and some is done in the code here
-       I suppose you could do all the conversion in C, but it would be a nightmare to do
-       NEW LANGUAGE NOTE:END *********************************************** */
-    /* Generate code for argument marshalling */
-    //    String *description = NewString("");
-    /* NEW LANGUAGE NOTE:***********************************************
-       argument_check is a new feature I added to check types of arguments:
-       eg for int gcd(int,int)
-       I want to check that arg1 & arg2 really are integers
-       NEW LANGUAGE NOTE:END *********************************************** */
-    String *argument_check = NewString("");
-    String *argument_parse = NewString("");
-    String *checkfn = NULL;
-    char source[64];
-    Printf(argument_check, "SWIG_check_num_args(\"%s\",%d,%d)\n", Swig_name_str(n), num_required + args_to_ignore, num_arguments + args_to_ignore);
-
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-
-      /* Look for an input typemap */
-      sprintf(source, "%d", i + 1);
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$target", ln);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-	  Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	} else {
-	  Replaceall(tm, "$disown", "0");
-	}
-	/* NEW LANGUAGE NOTE:***********************************************
-	   look for a 'checkfn' typemap
-	   this an additional parameter added to the in typemap
-	   if found the type will be tested for
-	   this will result in code either in the
-	   argument_check or argument_parse string
-	   NEW LANGUAGE NOTE:END *********************************************** */
-	if ((checkfn = Getattr(p, "tmap:in:checkfn"))) {
-	  if (i < num_required) {
-	    Printf(argument_check, "if(!%s(L,%s))", checkfn, source);
-	  } else {
-	    Printf(argument_check, "if(lua_gettop(L)>=%s && !%s(L,%s))", source, checkfn, source);
-	  }
-	  Printf(argument_check, " SWIG_fail_arg(\"%s\",%s,\"%s\");\n", Swig_name_str(n), source, SwigType_str(pt, 0));
-	}
-	/* NEW LANGUAGE NOTE:***********************************************
-	   lua states the number of arguments passed to a function using the fn
-	   lua_gettop()
-	   we can use this to deal with default arguments
-	   NEW LANGUAGE NOTE:END *********************************************** */
-	if (i < num_required) {
-	  Printf(argument_parse, "%s\n", tm);
-	} else {
-	  Printf(argument_parse, "if(lua_gettop(L)>=%s){%s}\n", source, tm);
-	}
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      } else {
-	/* NEW LANGUAGE NOTE:***********************************************
-	   // why is this code not called when I don't have a typemap?
-	   // instead of giving a warning, no code is generated
-	   NEW LANGUAGE NOTE:END *********************************************** */
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	break;
-      }
-    }
-
-    // add all argcheck code
-    Printv(f->code, argument_check, argument_parse, NIL);
-
-    /* Check for trailing varargs */
-    if (varargs) {
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$input", "varargs");
-	Printv(f->code, tm, "\n", NIL);
-      }
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    String *cleanup = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    String *outarg = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	//          // managing the number of returning variables
-	//        if (numoutputs=Getattr(p,"tmap:argout:numoutputs")){
-	//                      int i=GetInt(p,"tmap:argout:numoutputs");
-	//                      printf("got argout:numoutputs of %d\n",i);
-	//                      returnval+=GetInt(p,"tmap:argout:numoutputs");
-	//        }
-	//        else returnval++;
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$target", Swig_cresult_name());
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Remember C name of the wrapping function
-    Setattr(n, "wrap:name", wname);
-
-    /* Emit the function call */
-    String *actioncode = emit_action(n);
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       FIXME:
-       returns 1 if there is a void return type
-       this is because there is a typemap for void
-       NEW LANGUAGE NOTE:END *********************************************** */
-    // Return value if necessary
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      // managing the number of returning variables
-      //      if (numoutputs=Getattr(tm,"numoutputs")){
-      //              int i=GetInt(tm,"numoutputs");
-      //              printf("return numoutputs %d\n",i);
-      //              returnval+=GetInt(tm,"numoutputs");
-      //      }
-      //        else returnval++;
-      Replaceall(tm, "$source", Swig_cresult_name());
-      if (GetFlag(n, "feature:new")) {
-	Replaceall(tm, "$owner", "1");
-      } else {
-	Replaceall(tm, "$owner", "0");
-      }
-      Printf(f->code, "%s\n", tm);
-      //      returnval++;
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-    }
-    emit_return_variable(n, d, f);
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-    }
-
-
-    /* Close the function */
-    Printv(f->code, "return SWIG_arg;\n", NIL);
-    // add the failure cleanup code:
-    Printv(f->code, "\nif(0) SWIG_fail;\n", NIL);
-    Printv(f->code, "\nfail:\n", NIL);
-    Printv(f->code, "$cleanup", "lua_error(L);\n", NIL);
-    Printv(f->code, "return SWIG_arg;\n", NIL);
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", iname);
-    Replaceall(f->code, "$result", Swig_cresult_name());
-
-    /* Dump the function out */
-    /* in Lua we will not emit the destructor as a wrapper function,
-       Lua will automatically call the destructor when the object is free'd
-       However: you cannot just skip this function as it will not emit
-       any custom destructor (using %extend), as you need to call emit_action()
-       Therefore we go though the whole function, 
-       but do not write the code into the wrapper
-     */
-    if (!current[DESTRUCTOR]) {
-      Wrapper_print(f, f_wrappers);
-    }
-
-    /* NEW LANGUAGE NOTE:***********************************************
-       register the function in SWIG
-       different language mappings seem to use different ideas
-       NEW LANGUAGE NOTE:END *********************************************** */
-    /* Now register the function with the interpreter. */
-    int result = SWIG_OK;
-    if (Getattr(n, "sym:overloaded")) {
-      if (!Getattr(n, "sym:nextSibling")) {
-	result = dispatchFunction(n);
-      }
-    }
-
-    Delete(argument_check);
-    Delete(argument_parse);
-
-    Delete(cleanup);
-    Delete(outarg);
-    //    Delete(description);
-    DelWrapper(f);
-
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * dispatchFunction()
-   *
-   * Emit overloading dispatch function
-   * ------------------------------------------------------------ */
-
-  /* NEW LANGUAGE NOTE:***********************************************
-     This is an extra function used for overloading of functions
-     it checks the args & then calls the relevant fn
-     most of the real work in again typemaps:
-     look for %typecheck(SWIG_TYPECHECK_*) in the .swg file
-     NEW LANGUAGE NOTE:END *********************************************** */
-  int dispatchFunction(Node *n) {
-    //REPORT("dispatchFunction", n);
-    /* Last node in overloaded chain */
-
-    int maxargs;
-    String *tmp = NewString("");
-    String *dispatch = Swig_overload_dispatch(n, "return %s(L);", &maxargs);
-
-    /* Generate a dispatch wrapper for all overloaded functions */
-
-    Wrapper *f = NewWrapper();
-    String *symname = Getattr(n, "sym:name");
-    String *lua_name = Getattr(n, "lua:name");
-    assert(lua_name);
-    String *wname = Swig_name_wrapper(symname);
-
-    //Printf(stdout,"Swig_overload_dispatch %s %s '%s' %d\n",symname,wname,dispatch,maxargs);
-
-    if (!luaAddSymbol(lua_name, n)) {
-      DelWrapper(f);
-      Delete(dispatch);
-      Delete(tmp);
-      return SWIG_ERROR;
-    }
-
-    Printv(f->def, "static int ", wname, "(lua_State* L) {", NIL);
-    Wrapper_add_local(f, "argc", "int argc");
-    Printf(tmp, "int argv[%d]={1", maxargs + 1);
-    for (int i = 1; i <= maxargs; i++) {
-      Printf(tmp, ",%d", i + 1);
-    }
-    Printf(tmp, "}");
-    Wrapper_add_local(f, "argv", tmp);
-    Printf(f->code, "argc = lua_gettop(L);\n");
-
-    Replaceall(dispatch, "$args", "self,args");
-    Printv(f->code, dispatch, "\n", NIL);
-
-    Node *sibl = n;
-    while (Getattr(sibl, "sym:previousSibling"))
-      sibl = Getattr(sibl, "sym:previousSibling");	// go all the way up
-    String *protoTypes = NewString("");
-    do {
-      String *fulldecl = Swig_name_decl(sibl);
-      Printf(protoTypes, "\n\"    %s\\n\"", fulldecl);
-      Delete(fulldecl);
-    } while ((sibl = Getattr(sibl, "sym:nextSibling")));
-    Printf(f->code, "SWIG_Lua_pusherrstring(L,\"Wrong arguments for overloaded function '%s'\\n\"\n"
-	   "\"  Possible C/C++ prototypes are:\\n\"%s);\n", symname, protoTypes);
-    Delete(protoTypes);
-
-    Printf(f->code, "lua_error(L);return 0;\n");
-    Printv(f->code, "}\n", NIL);
-    Wrapper_print(f, f_wrappers);
-
-    // Remember C name of the wrapping function
-    Setattr(n, "wrap:name", wname);
-
-    if (current[CONSTRUCTOR]) {
-      if (constructor_name != 0)
-	Delete(constructor_name);
-      constructor_name = Copy(wname);
-    }
-
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(tmp);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * Add variable to "attributes"  C arrays of given namespace or class.
-   * Input is node. Based on the state of "current" array it determines
-   * the name of the getter function, setter function etc and calls
-   * registerVariable overload with necessary params.
-   * Lua scope could be overwritten. (Used only for backward compatibility)
-   * ------------------------------------------------------------ */
-
-  void registerVariable(Node *n, bool overwrite = false, String *overwriteLuaScope = 0) {
-    int assignable = is_assignable(n);
-    String *symname = Getattr(n, "sym:name");
-    assert(symname);
-
-    // Lua scope. It is not symbol NSpace, it is the actual key to retrieve getCArraysHash.
-    String *luaScope = luaCurrentSymbolNSpace();
-    if (overwrite)
-      luaScope = overwriteLuaScope;
-
-    // Getter and setter
-    String *getName = 0;
-    String *setName = 0;
-    String *mrename = 0;
-    if (current[NO_CPP] || !getCurrentClass()) {
-      // Global variable
-      getName = Swig_name_get(getNSpace(), symname);
-      if (assignable)
-        setName = Swig_name_set(getNSpace(), symname);
-    } else {
-        assert(!current[NO_CPP]);
-        if (current[STATIC_VAR] ) {
-          mrename = Swig_name_member(getNSpace(), getClassPrefix(), symname);
-          getName = Swig_name_get(0, mrename);
-          if (assignable)
-            setName = Swig_name_set(0, mrename);
-        } else if (current[MEMBER_VAR]) {
-          mrename = Swig_name_member(0, getClassPrefix(), symname);
-          getName = Swig_name_get(getNSpace(), mrename);
-          if (assignable)
-            setName = Swig_name_set(getNSpace(), mrename);
-        } else {
-          assert(false);
-        }
-    }
-
-    getName = Swig_name_wrapper(getName);
-    if (setName)
-      setName = Swig_name_wrapper(setName);
-    registerVariable(luaScope, n, getName, setName);
-  }
-
-  /* ------------------------------------------------------------
-   * registerVariable()
-   *
-   * Add variable to the "attributes" (or "get"/"set" in
-   * case of elua_ltr) C arrays of given namespace or class
-   * ------------------------------------------------------------ */
-
-  void registerVariable(String *lua_nspace_or_class_name, Node *n, String *getName, String *setName) {
-    String *unassignable = NewString("SWIG_Lua_set_immutable");
-    if (setName == 0 || GetFlag(n, "feature:immutable")) {
-      setName = unassignable;
-    }
-    Hash *nspaceHash = getCArraysHash(lua_nspace_or_class_name);
-    String *s_ns_methods_tab = Getattr(nspaceHash, "methods");
-    String *s_ns_var_tab = Getattr(nspaceHash, "attributes");
-    String *lua_name = Getattr(n, "lua:name");
-    if (elua_ltr) {
-      String *s_ns_dot_get = Getattr(nspaceHash, "get");
-      String *s_ns_dot_set = Getattr(nspaceHash, "set");
-      Printf(s_ns_dot_get, "%s{LSTRKEY(\"%s\"), LFUNCVAL(%s)},\n", tab4, lua_name, getName);
-      Printf(s_ns_dot_set, "%s{LSTRKEY(\"%s\"), LFUNCVAL(%s)},\n", tab4, lua_name, setName);
-    } else if (eluac_ltr) {
-      Printv(s_ns_methods_tab, tab4, "{LSTRKEY(\"", lua_name, "_get", "\")", ", LFUNCVAL(", getName, ")", "},\n", NIL);
-      Printv(s_ns_methods_tab, tab4, "{LSTRKEY(\"", lua_name, "_set", "\")", ", LFUNCVAL(", setName, ")", "},\n", NIL);
-    } else {
-      Printf(s_ns_var_tab, "%s{ \"%s\", %s, %s },\n", tab4, lua_name, getName, setName);
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-    /* NEW LANGUAGE NOTE:***********************************************
-       Language::variableWrapper(n) will generate two wrapper fns
-       Foo_get & Foo_set by calling functionWrapper()
-       so we will just add these into the variable lists
-       ideally we should not have registered these as functions,
-       only WRT this variable will look into this later.
-       NEW LANGUAGE NOTE:END *********************************************** */
-    //    REPORT("variableWrapper", n);
-    String *lua_name = Getattr(n, "lua:name");
-    assert(lua_name);
-    current[VARIABLE] = true;
-    // let SWIG generate the wrappers
-    int result = Language::variableWrapper(n);
-    
-    // It is impossible to use registerVariable, because sym:name of the Node is currently
-    // in an undefined state - the callees of this function may have modified it.
-    // registerVariable should be used from respective callees.*
-    current[VARIABLE] = false;
-    return result;
-  }
-
-
-  /* ------------------------------------------------------------
-   * Add constant to appropriate C array. constantRecord is an array record.
-   * Actually, in current implementation it is resolved consttab typemap
-   * ------------------------------------------------------------ */
-
-  void registerConstant(String *nspace, String *constantRecord) {
-    Hash *nspaceHash = getCArraysHash(nspace);
-    String *s_const_tab = 0;
-    if (eluac_ltr || elua_ltr)
-      // In elua everything goes to "methods" tab
-      s_const_tab = Getattr(nspaceHash, "methods");
-    else
-      s_const_tab = Getattr(nspaceHash, "constants");
-
-    assert(s_const_tab);
-    Printf(s_const_tab, "    %s,\n", constantRecord);
-
-    if ((eluac_ltr || elua_ltr) && old_metatable_bindings) {
-      s_const_tab = Getattr(nspaceHash, "constants");
-      assert(s_const_tab);
-      Printf(s_const_tab, "    %s,\n", constantRecord);
-    }
-
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    REPORT("constantWrapper", n);
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    String *lua_name = Getattr(n, "lua:name");
-    if (lua_name == 0)
-      lua_name = iname;
-    String *nsname = Copy(iname);
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *tm;
-    String *lua_name_v2 = 0;
-    String *tm_v2 = 0;
-    String *iname_v2 = 0;
-    Node *n_v2 = 0;
-
-    if (!luaAddSymbol(lua_name, n))
-      return SWIG_ERROR;
-
-    Swig_save("lua_constantMember", n, "sym:name", NIL);
-    Setattr(n, "sym:name", lua_name);
-    /* Special hook for member pointer */
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(iname);
-      Printf(f_wrappers, "static %s = %s;\n", SwigType_str(type, wname), value);
-      value = Char(wname);
-    }
-
-    if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", lua_name);
-      Replaceall(tm, "$value", value);
-      Replaceall(tm, "$nsname", nsname);
-      registerConstant(luaCurrentSymbolNSpace(), tm);
-    } else if ((tm = Swig_typemap_lookup("constcode", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", lua_name);
-      Replaceall(tm, "$value", value);
-      Replaceall(tm, "$nsname", nsname);
-      Printf(f_init, "%s\n", tm);
-    } else {
-      Delete(nsname);
-      nsname = 0;
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      Swig_restore(n);
-      return SWIG_NOWRAP;
-    }
-
-    bool make_v2_compatible = old_metatable_bindings && getCurrentClass() && old_compatible_names;
-
-    if (make_v2_compatible) {
-      // Don't do anything for enums in C mode - they are already
-      // wrapped correctly
-      if (CPlusPlus || !current[ENUM_CONST]) {
-	lua_name_v2 = Swig_name_member(0, proxy_class_name, lua_name);
-	iname_v2 = Swig_name_member(0, proxy_class_name, iname);
-        n_v2 = Copy(n);
-        if (!luaAddSymbol(iname_v2, n, getNSpace())) {
-          Swig_restore(n);
-          return SWIG_ERROR;
-        }
-
-        Setattr(n_v2, "sym:name", lua_name_v2);
-        tm_v2 = Swig_typemap_lookup("consttab", n_v2, name, 0);
-        if (tm_v2) {
-          Replaceall(tm_v2, "$source", value);
-          Replaceall(tm_v2, "$target", lua_name_v2);
-          Replaceall(tm_v2, "$value", value);
-          Replaceall(tm_v2, "$nsname", nsname);
-          registerConstant(getNSpace(), tm_v2);
-        } else {
-          tm_v2 = Swig_typemap_lookup("constcode", n_v2, name, 0);
-          if (!tm_v2) {
-            // This can't be.
-            assert(false);
-            Swig_restore(n);
-            return SWIG_ERROR;
-          }
-          Replaceall(tm_v2, "$source", value);
-          Replaceall(tm_v2, "$target", lua_name_v2);
-          Replaceall(tm_v2, "$value", value);
-          Replaceall(tm_v2, "$nsname", nsname);
-          Printf(f_init, "%s\n", tm_v2);
-        }
-        Delete(n_v2);
-      }
-    }
-
-    Swig_restore(n);
-    Delete(nsname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * nativeWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int nativeWrapper(Node *n) {
-    //    REPORT("nativeWrapper", n);
-    String *symname = Getattr(n, "sym:name");
-    String *wrapname = Getattr(n, "wrap:name");
-    if (!luaAddSymbol(wrapname, n))
-      return SWIG_ERROR;
-
-    Hash *nspaceHash = getCArraysHash(getNSpace());
-    String *s_ns_methods_tab = Getattr(nspaceHash, "methods");
-    Printv(s_ns_methods_tab, tab4, "{ \"", symname, "\",", wrapname, "},\n", NIL);
-    //   return Language::nativeWrapper(n); // this does nothing...
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * enumDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    current[STATIC_CONST] = true;
-    current[ENUM_CONST] = true;
-    // There is some slightly specific behaviour with enums. Basically,
-    // their NSpace may be tracked separately. The code below tries to work around
-    // this issue to some degree.
-    // The idea is the same as in classHandler - to drop old names generation if
-    // enum is in class in namespace.
-    const int old_compatible_names_saved = old_compatible_names;
-    if (getNSpace() || ( Getattr(n, "sym:nspace") != 0 && Len(Getattr(n, "sym:nspace")) > 0 ) ) {
-      old_compatible_names = 0;
-    }
-    int result = Language::enumDeclaration(n);
-    current[STATIC_CONST] = false;
-    current[ENUM_CONST] = false;
-    old_compatible_names = old_compatible_names_saved;
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * enumvalueDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    Swig_require("enumvalueDeclaration", n, "*name", "?value", "*sym:name", NIL);
-    String *symname = Getattr(n, "sym:name");
-    String *value = Getattr(n, "value");
-    String *name = Getattr(n, "name");
-    String *tmpValue;
-    Node *parent = parentNode(n);
-
-    if (value)
-      tmpValue = NewString(value);
-    else
-      tmpValue = NewString(name);
-    Setattr(n, "value", tmpValue);
-
-    Setattr(n, "name", tmpValue);	/* for wrapping of enums in a namespace when emit_action is used */
-
-    if (GetFlag(parent, "scopedenum")) {
-      symname = Swig_name_member(0, Getattr(parent, "sym:name"), symname);
-      Setattr(n, "sym:name", symname);
-      Delete(symname);
-    }
-
-    int result = constantWrapper(n);
-
-    Delete(tmpValue);
-    Swig_restore(n);
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classDeclaration(Node *n) {
-    return Language::classDeclaration(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * Helper function that adds record to appropriate C arrays
-   * ------------------------------------------------------------ */
-
-  void registerClass(String *scope, String *wrap_class) {
-    assert(wrap_class);
-    Hash *nspaceHash = getCArraysHash(scope);
-    String *ns_classes = Getattr(nspaceHash, "classes");
-    Printv(ns_classes, "&", wrap_class, ",\n", NIL);
-    if (elua_ltr || eluac_ltr) {
-      String *ns_methods = Getattr(nspaceHash, "methods");
-      Hash *class_hash = getCArraysHash(class_static_nspace);
-      assert(class_hash);
-      String *cls_methods = Getattr(class_hash, "methods:name");
-      assert(cls_methods);
-      Printv(ns_methods, tab4, "{LSTRKEY(\"", proxy_class_name, "\")", ", LROVAL(", cls_methods, ")", "},\n", NIL);
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-    //REPORT("classHandler", n);
-
-    String *mangled_full_proxy_class_name = 0;
-    String *destructor_name = 0;
-    String *nspace = getNSpace();
-
-    constructor_name = 0;
-    have_constructor = 0;
-    have_destructor = 0;
-    destructor_action = 0;
-    assert(class_static_nspace == 0);
-    assert(full_proxy_class_name == 0);
-    assert(proxy_class_name == 0);
-
-    current[NO_CPP] = false;
-
-    proxy_class_name = Getattr(n, "sym:name");
-    // We have to enforce nspace here, because technically we are already
-    // inside class parsing (getCurrentClass != 0), but we should register
-    // class in its parent namespace
-    if (!luaAddSymbol(proxy_class_name, n, nspace))
-      return SWIG_ERROR;
-
-    if (nspace == 0)
-      full_proxy_class_name = NewStringf("%s", proxy_class_name);
-    else
-      full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
-
-    assert(full_proxy_class_name);
-    mangled_full_proxy_class_name = Swig_name_mangle(full_proxy_class_name);
-
-    SwigType *t = Copy(Getattr(n, "name"));
-    SwigType *fr_t = SwigType_typedef_resolve_all(t);	/* Create fully resolved type */
-    SwigType *t_tmp = 0;
-    t_tmp = SwigType_typedef_qualified(fr_t);	// Temporal variable
-    Delete(fr_t);
-    fr_t = SwigType_strip_qualifiers(t_tmp);
-    String *mangled_fr_t = 0;
-    mangled_fr_t = SwigType_manglestr(fr_t);
-    // not sure exactly how this works,
-    // but tcl has a static hashtable of all classes emitted and then only emits code for them once.
-    // this fixes issues in test suites: template_default2 & template_specialization
-
-    // * if i understand correctly, this is a bug.
-    // * consider effect on template_specialization_defarg
-
-    static Hash *emitted = NewHash();
-    if (GetFlag(emitted, mangled_fr_t)) {
-      full_proxy_class_name = 0;
-      proxy_class_name = 0;
-      return SWIG_NOWRAP;
-    }
-    SetFlag(emitted, mangled_fr_t);
-
-    // We treat class T as both 'class' and 'namespace'. All static members, attributes
-    // and constants are considered part of namespace T, all members - part of the 'class'
-    // Now, here is a trick. Static methods, attributes and non-static methods and attributes
-    // are described with same structures - swig_lua_attribute/swig_lua_method. Instead of calling
-    // getCArraysHash(class name) to initialize things for static methods/attributes and then
-    // manually doing same initialization for non-static methods, we call getCArraysHash 2 times:
-    // 1) With name "class name" + "." + "SwigStatic" to initialize static things
-    // 2) With "class name" to initialize non-static things
-    Hash *instance_cls = getCArraysHash(full_proxy_class_name, false);
-    assert(instance_cls);
-    String *s_attr_tab_name = Getattr(instance_cls, "attributes:name");
-    String *s_methods_tab_name = Getattr(instance_cls, "methods:name");
-    SetFlag(instance_cls, "lua:no_namespaces");
-    SetFlag(instance_cls, "lua:no_classes");
-    SetFlag(instance_cls, "lua:class_instance");
-
-    /* There is no use for "constants", "classes" and "namespaces" arrays.
-     * All constants are considered part of static part of class.
-     */
-
-    class_static_nspace = NewStringf("%s%sSwigStatic", full_proxy_class_name, NSPACE_SEPARATOR);
-    Hash *static_cls = getCArraysHash(class_static_nspace, false);
-    assert(static_cls);
-    SetFlag(static_cls, "lua:no_namespaces");
-    SetFlag(static_cls, "lua:class_static");
-
-    // Notifying instance_cls and static_cls hashes about each other
-    Setattr(instance_cls, "lua:class_instance:static_hash", static_cls);
-    Setattr(static_cls, "lua:class_static:instance_hash", instance_cls);
-
-    const int old_compatible_names_saved = old_compatible_names;
-    // If class has %nspace enabled, then generation of backward compatible names
-    // should be disabled
-    if (getNSpace()) {
-      old_compatible_names = 0;
-    }
-
-    /* There is no use for "classes" and "namespaces" arrays. Subclasses are not supported
-     * by SWIG and namespaces couldn't be nested inside classes (C++ Standard)
-     */
-    // Generate normal wrappers
-    Language::classHandler(n);
-
-    old_compatible_names = old_compatible_names_saved;
-
-    SwigType_add_pointer(t);
-
-    // Catch all: eg. a class with only static functions and/or variables will not have 'remembered'
-    String *wrap_class_name = Swig_name_wrapper(NewStringf("class_%s", mangled_full_proxy_class_name));
-    String *wrap_class = NewStringf("&%s", wrap_class_name);
-    SwigType_remember_clientdata(t, wrap_class);
-
-    String *rt = Copy(getClassType());
-    SwigType_add_pointer(rt);
-
-    // Adding class to apropriate namespace
-    registerClass(nspace, wrap_class_name);
-    Hash *nspaceHash = getCArraysHash(nspace);
-
-    // Register the class structure with the type checker
-    //    Printf(f_init,"SWIG_TypeClientData(SWIGTYPE%s, (void *) &_wrap_class_%s);\n", SwigType_manglestr(t), mangled_full_proxy_class_name);
-
-    // emit a function to be called to delete the object 
-    if (have_destructor) {
-      destructor_name = NewStringf("swig_delete_%s", mangled_full_proxy_class_name);
-      Printv(f_wrappers, "static void ", destructor_name, "(void *obj) {\n", NIL);
-      if (destructor_action) {
-	Printv(f_wrappers, SwigType_str(rt, "arg1"), " = (", SwigType_str(rt, 0), ") obj;\n", NIL);
-	Printv(f_wrappers, destructor_action, "\n", NIL);
-      } else {
-	if (CPlusPlus) {
-	  Printv(f_wrappers, "    delete (", SwigType_str(rt, 0), ") obj;\n", NIL);
-	} else {
-	  Printv(f_wrappers, "    free((char *) obj);\n", NIL);
-	}
-      }
-      Printf(f_wrappers, "}\n");
-    }
-    // Wrap constructor wrapper into one more proxy function. It will be used as class namespace __call method, thus
-    // allowing both
-    // Module.ClassName.StaticMethod to access static method/variable/constant
-    // Module.ClassName() to create new object
-    if (have_constructor) {
-      assert(constructor_name);
-      String *constructor_proxy_name = NewStringf("_proxy_%s", constructor_name);
-      Printv(f_wrappers, "static int ", constructor_proxy_name, "(lua_State *L) {\n", NIL);
-      Printv(f_wrappers,
-	     tab4, "assert(lua_istable(L,1));\n",
-	     tab4, "lua_pushcfunction(L,", constructor_name, ");\n",
-	     tab4, "assert(!lua_isnil(L,-1));\n",
-	     tab4, "lua_replace(L,1); /* replace our table with real constructor */\n",
-	     tab4, "lua_call(L,lua_gettop(L)-1,1);\n",
-	     tab4, "return 1;\n}\n", NIL);
-      Delete(constructor_name);
-      constructor_name = constructor_proxy_name;
-      if (elua_ltr) {
-	String *static_cls_metatable_tab = Getattr(static_cls, "metatable");
-	assert(static_cls_metatable_tab);
-	Printf(static_cls_metatable_tab, "    {LSTRKEY(\"__call\"), LFUNCVAL(%s)},\n", constructor_name);
-      } else if (eluac_ltr) {
-	String *ns_methods_tab = Getattr(nspaceHash, "methods");
-	assert(ns_methods_tab);
-	Printv(ns_methods_tab, tab4, "{LSTRKEY(\"", "new_", proxy_class_name, "\")", ", LFUNCVAL(", constructor_name, ")", "},\n", NIL);
-      }
-    }
-    if (have_destructor) {
-      if (eluac_ltr) {
-	String *ns_methods_tab = Getattr(nspaceHash, "methods");
-	assert(ns_methods_tab);
-	Printv(ns_methods_tab, tab4, "{LSTRKEY(\"", "free_", mangled_full_proxy_class_name, "\")", ", LFUNCVAL(", destructor_name, ")", "},\n", NIL);
-      }
-    }
-
-    closeCArraysHash(full_proxy_class_name, f_wrappers);
-    closeCArraysHash(class_static_nspace, f_wrappers);
-
-
-    // Handle inheritance
-    // note: with the idea of class hierarchies spread over multiple modules
-    // cf test-suite: imports.i
-    // it is not possible to just add the pointers to the base classes to the code
-    // (as sometimes these classes are not present)
-    // therefore we instead hold the name of the base class and a null pointer
-    // at runtime: we can query the swig type manager & see if the class exists
-    // if so, we can get the pointer to the base class & replace the null pointer
-    // if the type does not exist, then we cannot...
-    String *base_class = NewString("");
-    String *base_class_names = NewString("");
-
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist)) {
-      Iterator b;
-      int index = 0;
-      b = First(baselist);
-      while (b.item) {
-	String *bname = Getattr(b.item, "name");
-	if ((!bname) || GetFlag(b.item, "feature:ignore") || (!Getattr(b.item, "module"))) {
-	  b = Next(b);
-	  continue;
-	}
-	// stores a null pointer & the name
-	Printf(base_class, "0,");
-	Printf(base_class_names, "\"%s *\",", SwigType_namestr(bname));
-
-	b = Next(b);
-	index++;
-      }
-    }
-    // First, print class static part
-    printCArraysDefinition(class_static_nspace, proxy_class_name, f_wrappers);
-
-    assert(mangled_full_proxy_class_name);
-    assert(base_class);
-    assert(base_class_names);
-    assert(proxy_class_name);
-    assert(full_proxy_class_name);
-    
-    // Then print class isntance part
-    Printv(f_wrappers, "static swig_lua_class *swig_", mangled_full_proxy_class_name, "_bases[] = {", base_class, "0};\n", NIL);
-    Delete(base_class);
-    Printv(f_wrappers, "static const char *swig_", mangled_full_proxy_class_name, "_base_names[] = {", base_class_names, "0};\n", NIL);
-    Delete(base_class_names);
-
-    Printv(f_wrappers, "static swig_lua_class _wrap_class_", mangled_full_proxy_class_name, " = { \"", proxy_class_name, "\", \"", full_proxy_class_name, "\", &SWIGTYPE",
-	   SwigType_manglestr(t), ",", NIL);
-
-    if (have_constructor) {
-      Printv(f_wrappers, constructor_name, NIL);
-      Delete(constructor_name);
-      constructor_name = 0;
-    } else {
-      Printf(f_wrappers, "0");
-    }
-
-    if (have_destructor) {
-      Printv(f_wrappers, ", ", destructor_name, NIL);
-    } else {
-      Printf(f_wrappers, ",0");
-    }
-    Printf(f_wrappers, ", %s, %s, &%s", s_methods_tab_name, s_attr_tab_name, Getattr(static_cls, "cname"));
-    
-    if (!eluac_ltr) {
-      Printf(f_wrappers, ", %s", Getattr(instance_cls,"metatable:name"));
-    }
-    else
-      Printf(f_wrappers, ", 0");
-
-    Printf(f_wrappers, ", swig_%s_bases, swig_%s_base_names };\n\n", mangled_full_proxy_class_name, mangled_full_proxy_class_name);
-
-    current[NO_CPP] = true;
-    Delete(class_static_nspace);
-    class_static_nspace = 0;
-    Delete(mangled_full_proxy_class_name);
-    mangled_full_proxy_class_name = 0;
-    Delete(destructor_name);
-    destructor_name = 0;
-    Delete(full_proxy_class_name);
-    full_proxy_class_name = 0;
-    proxy_class_name = 0;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    String *symname = GetChar(n, "sym:name");
-    //Printf(stdout,"memberfunctionHandler %s %s\n",name,iname);
-
-    // Special case unary minus: LUA passes two parameters for the
-    // wrapper function while we want only one. Tell our
-    // functionWrapper to ignore a parameter.
-
-    if (Cmp(symname, "__unm") == 0) {
-      //Printf(stdout, "unary minus: ignore one argument\n");
-      SetInt(n, "lua:ignore_args", 1);
-    }
-
-    current[MEMBER_FUNC] = true;
-    Language::memberfunctionHandler(n);
-
-    registerMethod(n);
-    current[MEMBER_FUNC] = false;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    //    REPORT("membervariableHandler",n);
-    current[MEMBER_VAR] = true;
-    Language::membervariableHandler(n);
-    registerVariable(n);
-    current[MEMBER_VAR] = false;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorHandler()
-   *
-   * Method for adding C++ member constructor
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-    //    REPORT("constructorHandler", n);
-    current[CONSTRUCTOR] = true;
-    Language::constructorHandler(n);
-    current[CONSTRUCTOR] = false;
-    //constructor_name = NewString(Getattr(n, "sym:name"));
-    have_constructor = 1;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * destructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int destructorHandler(Node *n) {
-    REPORT("destructorHandler", n);
-    current[DESTRUCTOR] = true;
-    Language::destructorHandler(n);
-    current[DESTRUCTOR] = false;
-    have_destructor = 1;
-    destructor_action = Getattr(n, "wrap:action");
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * globalfunctionHandler()
-   *
-   * It can be called:
-   * 1. Usual C/C++ global function.
-   * 2. During class parsing for functions declared/defined as friend
-   * 3. During class parsing from staticmemberfunctionHandler
-   * ---------------------------------------------------------------------- */
-
-  virtual int globalfunctionHandler(Node *n) {
-    bool oldVal = current[NO_CPP];
-    if (!current[STATIC_FUNC])	// If static function, don't switch to NO_CPP
-      current[NO_CPP] = true;
-    const int result = Language::globalfunctionHandler(n);
-    
-    if (!current[STATIC_FUNC]) // Register only if not called from static function handler
-      registerMethod(n);
-    current[NO_CPP] = oldVal;
-    return result;
-  }
-
-  /* ----------------------------------------------------------------------
-   * globalvariableHandler()
-   *
-   * Sets "current" array correctly
-   * ---------------------------------------------------------------------- */
-
-  virtual int globalvariableHandler(Node *n) {
-    bool oldVal = current[NO_CPP];
-    current[GLOBAL_VAR] = true;
-    current[NO_CPP] = true;
-
-    const int result = Language::globalvariableHandler(n);
-    registerVariable(n);
-
-    current[GLOBAL_VAR] = false;
-    current[NO_CPP] = oldVal;
-    return result;
-  }
-
-
-  /* -----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   *
-   * Wrap a static C++ function
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    REPORT("staticmemberfunctionHandler", n);
-    current[STATIC_FUNC] = true;
-
-    const int result = Language::staticmemberfunctionHandler(n);
-    registerMethod(n);
-
-    if (old_metatable_bindings && result == SWIG_OK && old_compatible_names) {
-      Swig_require("lua_staticmemberfunctionHandler", n, "*lua:name", NIL);
-      String *lua_name = Getattr(n, "lua:name");
-      // Although this function uses Swig_name_member, it actually generates the Lua name,
-      // not the C++ name. This is because an earlier version used such a scheme for static function
-      // name generation and we have to maintain backward compatibility.
-      String *compat_name = Swig_name_member(0, proxy_class_name, lua_name);
-      Setattr(n, "lua:name", compat_name);
-      registerMethod(n, true, getNSpace());
-      Delete(compat_name);
-      Swig_restore(n);
-    }
-
-    current[STATIC_FUNC] = false;;
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * memberconstantHandler()
-   *
-   * Create a C++ constant
-   * ------------------------------------------------------------ */
-
-  virtual int memberconstantHandler(Node *n) {
-    REPORT("memberconstantHandler", n);
-    int result = Language::memberconstantHandler(n);
-
-    return result;
-  }
-
-  /* ---------------------------------------------------------------------
-   * staticmembervariableHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    REPORT("staticmembervariableHandler", n);
-    current[STATIC_VAR] = true;
-    //String *symname = Getattr(n, "sym:name");
-    int result = Language::staticmembervariableHandler(n);
-    if (!GetFlag(n, "wrappedasconstant")) {
-      registerVariable(n);
-    }
-
-    if (result == SWIG_OK) {
-      // This will add static member variable to the class namespace with name ClassName_VarName
-      if (old_metatable_bindings && old_compatible_names) {
-	Swig_save("lua_staticmembervariableHandler", n, "lua:name", NIL);
-	String *lua_name = Getattr(n, "lua:name");
-	// Although this function uses Swig_name_member, it actually generates the Lua name,
-	// not the C++ name. This is because an earlier version used such a scheme for static function
-	// name generation and we have to maintain backward compatibility.
-	String *v2_name = Swig_name_member(NIL, proxy_class_name, lua_name);
-	if (!GetFlag(n, "wrappedasconstant")) {
-	  Setattr(n, "lua:name", v2_name);
-          // Registering static var in the class parent nspace
-	  registerVariable(n, true, getNSpace());
-	}
-	// If static member variable was wrapped as a constant, then
-	// constant wrapper has already performed all actions necessary for old_metatable_bindings
-	Delete(v2_name);
-	Swig_restore(n);
-      }
-    }
-    current[STATIC_VAR] = false;
-
-    return result;
-  }
-
-
-  /* ---------------------------------------------------------------------
-   * external runtime generation
-   * --------------------------------------------------------------------- */
-
-  /* This is to support the usage
-     SWIG -external-runtime <filename>
-     The code consists of two functions:
-     String *runtimeCode()  // returns a large string with all the runtimes in
-     String *defaultExternalRuntimeFilename() // returns the default filename
-     I am writing a generic solution, even though SWIG-Lua only has one file right now...
-   */
-  String *runtimeCode() {
-    String *s = NewString("");
-    const char *filenames[] = { "luarun.swg", 0 };	// must be 0 terminated
-
-    emitLuaFlavor(s);
-
-    String *sfile = 0;
-    for (int i = 0; filenames[i] != 0; i++) {
-      sfile = Swig_include_sys(filenames[i]);
-      if (!sfile) {
-	Printf(stderr, "*** Unable to open '%s'\n", filenames[i]);
-      } else {
-	Append(s, sfile);
-	Delete(sfile);
-      }
-    }
-
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigluarun.h");
-  }
-
-  /* ---------------------------------------------------------------------
-   * helpers
-   * --------------------------------------------------------------------- */
-
-  void emitLuaFlavor(String *s) {
-    if (elua_emulate) {
-      Printf(s, "/*This is only emulation!*/\n");
-      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUA\n");
-      Printf(s, "#define SWIG_LUA_ELUA_EMULATE\n");
-    } else if (elua_ltr)
-      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUA\n");
-    else if (eluac_ltr)
-      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUAC\n");
-    else
-      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_LUA\n");
-  }
-
-
-  /* -----------------------------------------------------------------------------
-   * escapeCode()
-   *
-   * This is to convert the string of Lua code into a proper string, which can then be
-   * emitted into the C/C++ code.
-   * Basically is is a lot of search & replacing of odd sequences
-   * ---------------------------------------------------------------------------- */
-
-  void escapeCode(String *str) {
-    //Printf(f_runtime,"/* original luacode:[[[\n%s\n]]]\n*/\n",str);
-    Chop(str);			// trim
-    Replace(str, "\\", "\\\\", DOH_REPLACE_ANY);	// \ to \\ (this must be done first)
-    Replace(str, "\"", "\\\"", DOH_REPLACE_ANY);	// " to \"
-    Replace(str, "\n", "\\n\"\n  \"", DOH_REPLACE_ANY);	// \n to \n"\n" (ie quoting every line)
-    //Printf(f_runtime,"/* hacked luacode:[[[\n%s\n]]]\n*/\n",str);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * rawGetCArraysHash(String *name)
-   *
-   * A small helper to hide impelementation of how CArrays hashes are stored
-   * ---------------------------------------------------------------------------- */
-
-  Hash *rawGetCArraysHash(const_String_or_char_ptr name) {
-    Hash *scope = symbolScopeLookup( name ? name : "" );
-    if(!scope)
-      return 0;
-
-    Hash *carrays_hash = Getattr(scope, "lua:cdata");
-    return carrays_hash;
-  }
-   
-  /* -----------------------------------------------------------------------------
-   * getCArraysHash()
-   *
-   * Each namespace can be described with a hash that stores C arrays
-   * where members of the namespace should be added. All these hashes are stored
-   * inside the symbols table, in pseudo-symbol for every namespace.
-   * nspace could be NULL (NSPACE_TODO), that means functions and variables and classes
-   * that are not in any namespace (this is default for SWIG unless %nspace feature is used).
-   * You can later set some attributes that will affect behaviour of functions that use this hash:
-   * "lua:no_namespaces" will disable "namespaces" array.
-   * "lua:no_classes" will disable "classes" array.
-   * For every component ("attributes", "methods", etc) there are subcomponents:
-   *   XXX:name - name of the C array that stores data for component
-   *   XXX:decl - statement with forward declaration of this array;
-   * Namespace could be automatically registered to its parent if 'reg' == true. This can only be
-   * done during the first call (a.k.a when nspace is created).
-   * ---------------------------------------------------------------------------- */
-
-  Hash *getCArraysHash(String *nspace, bool reg = true) {
-    Hash *scope = symbolScopeLookup(nspace ? nspace : "");
-    if(!scope) {
-      symbolAddScope( nspace ? nspace : "" );
-      scope = symbolScopeLookup(nspace ? nspace : "");
-      assert(scope);
-    }
-    Hash *carrays_hash = Getattr(scope, "lua:cdata");
-    if (carrays_hash != 0)
-      return carrays_hash;
-    carrays_hash = NewHash();
-    String *mangled_name = 0;
-    if (nspace == 0 || Len(nspace) == 0)
-      mangled_name = NewString("SwigModule");
-    else
-      mangled_name = Swig_name_mangle(nspace);
-    String *cname = NewStringf("swig_%s", mangled_name);
-
-    Setattr(carrays_hash, "cname", cname);
-
-    String *attr_tab = NewString("");
-    String *attr_tab_name = NewStringf("swig_%s_attributes", mangled_name);
-    String *attr_tab_decl = NewString("");
-    Printv(attr_tab, "static swig_lua_attribute ", NIL);
-    Printv(attr_tab, attr_tab_name, "[]", NIL);
-    Printv(attr_tab_decl, attr_tab, ";\n", NIL);
-    Printv(attr_tab, " = {\n", NIL);
-    Setattr(carrays_hash, "attributes", attr_tab);
-    Setattr(carrays_hash, "attributes:name", attr_tab_name);
-    Setattr(carrays_hash, "attributes:decl", attr_tab_decl);
-
-    String *methods_tab = NewString("");
-    String *methods_tab_name = NewStringf("swig_%s_methods", mangled_name);
-    String *methods_tab_decl = NewString("");
-    if (elua_ltr || eluac_ltr)	// In this case methods array also acts as namespace rotable
-      Printf(methods_tab, "const LUA_REG_TYPE ");
-    else
-      Printf(methods_tab, "static swig_lua_method ");
-    Printv(methods_tab, methods_tab_name, "[]", NIL);
-    Printv(methods_tab_decl, methods_tab, ";\n", NIL);
-    Printv(methods_tab, "= {\n", NIL);
-    Setattr(carrays_hash, "methods", methods_tab);
-    Setattr(carrays_hash, "methods:name", methods_tab_name);
-    Setattr(carrays_hash, "methods:decl", methods_tab_decl);
-
-    String *const_tab = NewString("");
-    String *const_tab_name = NewStringf("swig_%s_constants", mangled_name);
-    String *const_tab_decl = NewString("");
-    if (elua_ltr || eluac_ltr)	// In this case const array holds rotable with namespace constants
-      Printf(const_tab, "const LUA_REG_TYPE ");
-    else
-      Printf(const_tab, "static swig_lua_const_info ");
-    Printv(const_tab, const_tab_name, "[]", NIL);
-    Printv(const_tab_decl, const_tab, ";", NIL);
-    Printv(const_tab, "= {\n", NIL);
-    Setattr(carrays_hash, "constants", const_tab);
-    Setattr(carrays_hash, "constants:name", const_tab_name);
-    Setattr(carrays_hash, "constants:decl", const_tab_decl);
-
-    String *classes_tab = NewString("");
-    String *classes_tab_name = NewStringf("swig_%s_classes", mangled_name);
-    String *classes_tab_decl = NewString("");
-    Printf(classes_tab, "static swig_lua_class* ");
-    Printv(classes_tab, classes_tab_name, "[]", NIL);
-    Printv(classes_tab_decl, classes_tab, ";", NIL);
-    Printv(classes_tab, "= {\n", NIL);
-    Setattr(carrays_hash, "classes", classes_tab);
-    Setattr(carrays_hash, "classes:name", classes_tab_name);
-    Setattr(carrays_hash, "classes:decl", classes_tab_decl);
-
-    String *namespaces_tab = NewString("");
-    String *namespaces_tab_name = NewStringf("swig_%s_namespaces", mangled_name);
-    String *namespaces_tab_decl = NewString("");
-    Printf(namespaces_tab, "static swig_lua_namespace* ");
-    Printv(namespaces_tab, namespaces_tab_name, "[]", NIL);
-    Printv(namespaces_tab_decl, namespaces_tab, ";", NIL);
-    Printv(namespaces_tab, " = {\n", NIL);
-    Setattr(carrays_hash, "namespaces", namespaces_tab);
-    Setattr(carrays_hash, "namespaces:name", namespaces_tab_name);
-    Setattr(carrays_hash, "namespaces:decl", namespaces_tab_decl);
-
-    if (elua_ltr) {
-      String *get_tab = NewString("");
-      String *get_tab_name = NewStringf("swig_%s_get", mangled_name);
-      String *get_tab_decl = NewString("");
-      Printv(get_tab, "const LUA_REG_TYPE ", get_tab_name, "[]", NIL);
-      Printv(get_tab_decl, get_tab, ";", NIL);
-      Printv(get_tab, " = {\n", NIL);
-      Setattr(carrays_hash, "get", get_tab);
-      Setattr(carrays_hash, "get:name", get_tab_name);
-      Setattr(carrays_hash, "get:decl", get_tab_decl);
-
-      String *set_tab = NewString("");
-      String *set_tab_name = NewStringf("swig_%s_set", mangled_name);
-      String *set_tab_decl = NewString("");
-      Printv(set_tab, "const LUA_REG_TYPE ", set_tab_name, "[]", NIL);
-      Printv(set_tab_decl, set_tab, ";", NIL);
-      Printv(set_tab, " = {\n", NIL);
-      Setattr(carrays_hash, "set", set_tab);
-      Setattr(carrays_hash, "set:name", set_tab_name);
-      Setattr(carrays_hash, "set:decl", set_tab_decl);
-
-    }
-    if (!eluac_ltr) {
-      String *metatable_tab = NewString("");
-      String *metatable_tab_name = NewStringf("swig_%s_meta", mangled_name);
-      String *metatable_tab_decl = NewString("");
-      if (elua_ltr) // In this case const array holds rotable with namespace constants
-	Printf(metatable_tab, "const LUA_REG_TYPE ");
-      else
-	Printf(metatable_tab, "static swig_lua_method ");
-      Printv(metatable_tab, metatable_tab_name, "[]", NIL);
-      Printv(metatable_tab_decl, metatable_tab, ";", NIL);
-      Printv(metatable_tab, " = {\n", NIL);
-      Setattr(carrays_hash, "metatable", metatable_tab);
-      Setattr(carrays_hash, "metatable:name", metatable_tab_name);
-      Setattr(carrays_hash, "metatable:decl", metatable_tab_decl);
-    }
-
-    Setattr(scope, "lua:cdata", carrays_hash);
-    assert(rawGetCArraysHash(nspace));
-
-    if (reg && nspace != 0 && Len(nspace) != 0 && GetFlag(carrays_hash, "lua:no_reg") == 0) {
-      // Split names into components
-      List *components = Split(nspace, '.', -1);
-      String *parent_path = NewString("");
-      int len = Len(components);
-      String *name = Copy(Getitem(components, len - 1));
-      for (int i = 0; i < len - 1; i++) {
-	if (i > 0)
-	  Printv(parent_path, NSPACE_SEPARATOR, NIL);
-	String *item = Getitem(components, i);
-	Printv(parent_path, item, NIL);
-      }
-      Hash *parent = getCArraysHash(parent_path, true);
-      String *namespaces_tab = Getattr(parent, "namespaces");
-      Printv(namespaces_tab, "&", cname, ",\n", NIL);
-      if (elua_ltr || eluac_ltr) {
-	String *methods_tab = Getattr(parent, "methods");
-	Printv(methods_tab, tab4, "{LSTRKEY(\"", name, "\")", ", LROVAL(", methods_tab_name, ")", "},\n", NIL);
-      }
-      Setattr(carrays_hash, "name", name);
-
-      Delete(components);
-      Delete(parent_path);
-    } else if (!reg)		// This namespace shouldn't be registered. Lets remember it.
-      SetFlag(carrays_hash, "lua:no_reg");
-
-    Delete(mangled_name);
-    mangled_name = 0;
-    return carrays_hash;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * closeCArraysHash()
-   *
-   * Functions add end markers {0,0,...,0} to all arrays, prints them to
-   * output and marks hash as closed (lua:closed). Consequent attempts to
-   * close the same hash will result in an error.
-   * closeCArraysHash DOES NOT print structure that describes namespace, it only
-   * prints array. You can use printCArraysDefinition to print structure.
-   * if "lua:no_namespaces" is set, then array for "namespaces" won't be printed
-   * if "lua:no_classes" is set, then array for "classes" won't be printed
-   * ----------------------------------------------------------------------------- */
-
-  void closeCArraysHash(String *nspace, File *output) {
-    Hash *carrays_hash = rawGetCArraysHash(nspace);
-    assert(carrays_hash);
-    assert(GetFlag(carrays_hash, "lua:closed") == 0);
-
-    SetFlag(carrays_hash, "lua:closed");
-
-    // Do arrays describe class instance part or class static part
-    const int is_instance = GetFlag(carrays_hash, "lua:class_instance");
-
-
-    String *attr_tab = Getattr(carrays_hash, "attributes");
-    Printf(attr_tab, "    {0,0,0}\n};\n");
-    Printv(output, attr_tab, NIL);
-
-    String *const_tab = Getattr(carrays_hash, "constants");
-    String *const_tab_name = Getattr(carrays_hash, "constants:name");
-    if (elua_ltr || eluac_ltr)
-      Printv(const_tab, tab4, "{LNILKEY, LNILVAL}\n", "};\n", NIL);
-    else
-      Printf(const_tab, "    {0,0,0,0,0,0}\n};\n");
-    
-    // For the sake of compiling with -Wall -Werror we print constants
-    // only when necessary
-    int need_constants = 0;
-    if ( (elua_ltr || eluac_ltr) && (old_metatable_bindings) )
-      need_constants = 1;
-    else if (!is_instance) // static part need constants tab
-      need_constants = 1;
-
-    if (need_constants)
-      Printv(output, const_tab, NIL);
-
-    if (elua_ltr) {
-      // Put forward declaration of metatable array
-      Printv(output, "extern ", Getattr(carrays_hash, "metatable:decl"), "\n", NIL);
-    }
-    String *methods_tab = Getattr(carrays_hash, "methods");
-    String *metatable_tab_name = Getattr(carrays_hash, "metatable:name");
-    if (elua_ltr || eluac_ltr) {
-      if (old_metatable_bindings)
-	Printv(methods_tab, tab4, "{LSTRKEY(\"const\"), LROVAL(", const_tab_name, ")},\n", NIL);
-      if (elua_ltr) {
-	Printv(methods_tab, tab4, "{LSTRKEY(\"__metatable\"), LROVAL(", metatable_tab_name, ")},\n", NIL);
-      }
-
-      Printv(methods_tab, tab4, "{LSTRKEY(\"__disown\"), LFUNCVAL(SWIG_Lua_class_disown)},\n", NIL);
-      Printv(methods_tab, tab4, "{LNILKEY, LNILVAL}\n};\n", NIL);
-    } else
-      Printf(methods_tab, "    {0,0}\n};\n");
-    Printv(output, methods_tab, NIL);
-
-    if (!GetFlag(carrays_hash, "lua:no_classes")) {
-      String *classes_tab = Getattr(carrays_hash, "classes");
-      Printf(classes_tab, "    0\n};\n");
-      Printv(output, classes_tab, NIL);
-    }
-
-    if (!GetFlag(carrays_hash, "lua:no_namespaces")) {
-      String *namespaces_tab = Getattr(carrays_hash, "namespaces");
-      Printf(namespaces_tab, "    0\n};\n");
-      Printv(output, namespaces_tab, NIL);
-    }
-    if (elua_ltr) {
-      String *get_tab = Getattr(carrays_hash, "get");
-      String *set_tab = Getattr(carrays_hash, "set");
-      Printv(get_tab, tab4, "{LNILKEY, LNILVAL}\n};\n", NIL);
-      Printv(set_tab, tab4, "{LNILKEY, LNILVAL}\n};\n", NIL);
-      Printv(output, get_tab, NIL);
-      Printv(output, set_tab, NIL);
-    }
-
-    // Heuristic whether we need to print metatable or not.
-    // For the sake of compiling with -Wall -Werror we don't print
-    // metatable for static part.
-    int need_metatable = 0;
-    if (eluac_ltr)
-      need_metatable = 0;
-    else if(!is_instance)
-      need_metatable = 0;
-    else
-      need_metatable = 1;
-
-    if (need_metatable) {
-      String *metatable_tab = Getattr(carrays_hash, "metatable");
-      assert(metatable_tab);
-      if (elua_ltr) {
-	String *get_tab_name = Getattr(carrays_hash, "get:name");
-	String *set_tab_name = Getattr(carrays_hash, "set:name");
-
-	if (GetFlag(carrays_hash, "lua:class_instance")) {
-	  Printv(metatable_tab, tab4, "{LSTRKEY(\"__index\"), LFUNCVAL(SWIG_Lua_class_get)},\n", NIL);
-	  Printv(metatable_tab, tab4, "{LSTRKEY(\"__newindex\"), LFUNCVAL(SWIG_Lua_class_set)},\n", NIL);
-	} else {
-	  Printv(metatable_tab, tab4, "{LSTRKEY(\"__index\"), LFUNCVAL(SWIG_Lua_namespace_get)},\n", NIL);
-	  Printv(metatable_tab, tab4, "{LSTRKEY(\"__newindex\"), LFUNCVAL(SWIG_Lua_namespace_set)},\n", NIL);
-	}
-
-	Printv(metatable_tab, tab4, "{LSTRKEY(\"__gc\"), LFUNCVAL(SWIG_Lua_class_destruct)},\n", NIL);
-	Printv(metatable_tab, tab4, "{LSTRKEY(\".get\"), LROVAL(", get_tab_name, ")},\n", NIL);
-	Printv(metatable_tab, tab4, "{LSTRKEY(\".set\"), LROVAL(", set_tab_name, ")},\n", NIL);
-	Printv(metatable_tab, tab4, "{LSTRKEY(\".fn\"), LROVAL(", Getattr(carrays_hash, "methods:name"), ")},\n", NIL);
-
-	if (GetFlag(carrays_hash, "lua:class_instance")) {
-	  String *static_cls = Getattr(carrays_hash, "lua:class_instance:static_hash");
-	  assert(static_cls);
-	  // static_cls is swig_lua_namespace. This structure can't be use with eLua(LTR)
-	  // Instead structure describing its methods isused
-	  String *static_cls_cname = Getattr(static_cls, "methods:name");
-	  assert(static_cls_cname);
-	  Printv(metatable_tab, tab4, "{LSTRKEY(\".static\"), LROVAL(", static_cls_cname, ")},\n", NIL);
-	  // Put forward declaration of this array
-	  Printv(output, "extern ", Getattr(static_cls, "methods:decl"), "\n", NIL);
-	} else if (GetFlag(carrays_hash, "lua:class_static")) {
-	  Hash *instance_cls = Getattr(carrays_hash, "lua:class_static:instance_hash");
-	  assert(instance_cls);
-	  String *instance_cls_metatable_name = Getattr(instance_cls, "metatable:name");
-	  assert(instance_cls_metatable_name);
-	  Printv(metatable_tab, tab4, "{LSTRKEY(\".instance\"), LROVAL(", instance_cls_metatable_name, ")},\n", NIL);
-	}
-
-	Printv(metatable_tab, tab4, "{LNILKEY, LNILVAL}\n};\n", NIL);
-      } else {
-	Printf(metatable_tab, "    {0,0}\n};\n");
-      }
-
-      Printv(output, metatable_tab, NIL);
-    }
-
-    Printv(output, "\n", NIL);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * closeNamespaces()
-   *
-   * Recursively close all non-closed namespaces. Prints data to dataOutput.
-   * ----------------------------------------------------------------------------- */
-
-  void closeNamespaces(File *dataOutput) {
-    // Special handling for empty module.
-    if (symbolScopeLookup("") == 0 || rawGetCArraysHash("") == 0) {
-      // Module is empty. Create hash for global scope in order to have swig_SwigModule
-      // variable in resulting file
-      getCArraysHash(0);
-    }
-    // Because we cant access directly 'symtabs', instead we access
-    // top-level scope and look on all scope pseudo-symbols in it.
-    Hash *top_scope = symbolScopeLookup("");
-    assert(top_scope);
-    Iterator ki = First(top_scope);
-    List *to_close = NewList();
-    while (ki.key) {
-      assert(ki.item);
-      if (Getattr(ki.item, "sym:scope")) {
-        // We have a pseudo symbol. Lets get actual scope for this pseudo symbol
-        Hash *carrays_hash = rawGetCArraysHash(ki.key);
-        assert(carrays_hash);
-        if (GetFlag(carrays_hash, "lua:closed") == 0)
-          Append(to_close, ki.key);
-      }
-      ki = Next(ki);
-    }
-    SortList(to_close, &compareByLen);
-    int len = Len(to_close);
-    for (int i = 0; i < len; i++) {
-      String *key = Getitem(to_close, i);
-      closeCArraysHash(key, dataOutput);
-      Hash *carrays_hash = rawGetCArraysHash(key);
-      String *name = 0;		// name - name of the namespace as it should be visible in Lua
-      if (DohLen(key) == 0)	// This is global module
-	name = module;
-      else
-	name = Getattr(carrays_hash, "name");
-      assert(name);
-      printCArraysDefinition(key, name, dataOutput);
-    }
-    Delete(to_close);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * printCArraysDefinition()
-   *
-   * This function prints to output a definition of namespace in form
-   *   swig_lua_namespace $cname =  { attr_array, methods_array, ... , namespaces_array };
-   * You can call this function as many times as is necessary.
-   * 'name' is a user-visible name that this namespace will have in Lua. It shouldn't
-   * be a fully qualified name, just its own name.
-   * ----------------------------------------------------------------------------- */
-
-  void printCArraysDefinition(String *nspace, String *name, File *output) {
-    Hash *carrays_hash = getCArraysHash(nspace, false);
-
-    String *cname = Getattr(carrays_hash, "cname");	// cname - name of the C structure that describes namespace
-    assert(cname);
-    Printv(output, "static swig_lua_namespace ", cname, " = ", NIL);
-
-    String *null_string = NewString("0");
-    String *attr_tab_name = Getattr(carrays_hash, "attributes:name");
-    String *methods_tab_name = Getattr(carrays_hash, "methods:name");
-    String *const_tab_name = Getattr(carrays_hash, "constants:name");
-    String *classes_tab_name = Getattr(carrays_hash, "classes:name");
-    String *namespaces_tab_name = Getattr(carrays_hash, "namespaces:name");
-    bool has_classes = GetFlag(carrays_hash, "lua:no_classes") == 0;
-    bool has_namespaces = GetFlag(carrays_hash, "lua:no_namespaces") == 0;
-
-    Printv(output, "{\n",
-	   tab4, "\"", name, "\",\n",
-	   tab4, methods_tab_name, ",\n",
-	   tab4, attr_tab_name, ",\n",
-	   tab4, const_tab_name, ",\n",
-	   tab4, (has_classes) ? classes_tab_name : null_string, ",\n",
-	   tab4, (has_namespaces) ? namespaces_tab_name : null_string, "\n};\n", NIL);
-    Delete(null_string);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * luaCurrentSymbolNSpace()
-   *
-   * This function determines actual namespace/scope where any symbol at the
-   * current moment should be placed. It looks at the 'current' array
-   * and depending on where are we - static class member/function,
-   * instance class member/function or just global functions decides
-   * where symbol should be put.
-   * The namespace/scope doesn't depend from symbol, only from 'current'
-   * ----------------------------------------------------------------------------- */
-
-  String *luaCurrentSymbolNSpace() {
-    String *scope = 0;
-    // If ouside class, than NSpace is used.
-    // If inside class, but current[NO_CPP], then this is friend function. It belongs to NSpace
-    if (!getCurrentClass() || current[NO_CPP]) {
-      scope = getNSpace();
-    } else if (current[ENUM_CONST] && !CPlusPlus ) {
-        // Enums in C mode go to NSpace
-        scope = getNSpace();
-    } else {
-      // If inside class, then either class static namespace or class fully qualified name is used
-      assert(!current[NO_CPP]);
-      if (current[STATIC_FUNC] || current[STATIC_VAR] || current[STATIC_CONST]) {
-	scope = class_static_nspace;
-      } else if (current[MEMBER_VAR] || current[CONSTRUCTOR] || current[DESTRUCTOR]
-		 || current[MEMBER_FUNC]) {
-	scope = full_proxy_class_name;
-      } else {			// Friend functions are handled this way
-	scope = class_static_nspace;
-      }
-      assert(scope);
-    }
-    return scope;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * luaAddSymbol()
-   *
-   * Our implementation of addSymbol. Determines scope correctly, then 
-   * forwards to Language::addSymbol
-   * ----------------------------------------------------------------------------- */
-
-  int luaAddSymbol(const String *s, const Node *n) {
-    String *scope = luaCurrentSymbolNSpace();
-    return luaAddSymbol(s, n, scope);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * luaAddSymbol()
-   *
-   * Overload. Enforces given scope. Actually, it simply forwards call to Language::addSymbol
-   * ----------------------------------------------------------------------------- */
-
-  int luaAddSymbol(const String *s, const Node *n, const_String_or_char_ptr scope) {
-    int result = Language::addSymbol(s, n, scope);
-    if (!result)
-      Printf(stderr, "addSymbol(%s to scope %s) failed\n", s, scope);
-    return result;
-  }
-
-};
-
-/* NEW LANGUAGE NOTE:***********************************************
- in order to add you language into swig, you need to make the following changes:
- - write this file (obviously)
- - add into the makefile (not 100% clear on how to do this)
- - edit swigmain.cxx to add your module
- 
-near the top of swigmain.cxx, look for this code & add you own codes
-======= begin change ==========
-extern "C" {
-  Language *swig_tcl(void);
-  Language *swig_python(void);
-  //etc,etc,etc...
-  Language *swig_lua(void);	// this is my code
-}
- 
-  //etc,etc,etc...
- 
-swig_module  modules[] = {
-  {"-guile",     swig_guile,     "Guile"},
-  {"-java",      swig_java,      "Java"},
-  //etc,etc,etc...
-  {"-lua",       swig_lua,       "Lua"},	// this is my code
-  {NULL, NULL, NULL}	// this must come at the end of the list
-};
-======= end change ==========
- 
-This is all that is needed
- 
-NEW LANGUAGE NOTE:END ************************************************/
-
-/* -----------------------------------------------------------------------------
- * swig_lua()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-extern "C" Language *swig_lua(void) {
-  return new LUA();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/main.cxx b/dependencies2013/win32/swig/Source/Modules/main.cxx
deleted file mode 100644
index 12b83b2e..00000000
--- a/dependencies2013/win32/swig/Source/Modules/main.cxx
+++ /dev/null
@@ -1,1376 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * main.cxx
- *
- * Main entry point to the SWIG core.
- * ----------------------------------------------------------------------------- */
-
-#include "swigconfig.h"
-
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#include "swigmod.h"
-
-#include "swigwarn.h"
-#include "cparse.h"
-#include <ctype.h>
-#include <limits.h>		// for INT_MAX
-
-// Global variables
-
-static Language *lang = 0;	// Language method
-int CPlusPlus = 0;
-int Extend = 0;			// Extend flag
-int ForceExtern = 0;		// Force extern mode
-int GenerateDefault = 1;	// Generate default constructors
-int Verbose = 0;
-int AddExtern = 0;
-int NoExcept = 0;
-int SwigRuntime = 0;		// 0 = no option, 1 = -runtime, 2 = -noruntime
-
-/* Suppress warning messages for private inheritance, preprocessor evaluation etc...
-   WARN_PP_EVALUATION            202
-   WARN_PARSE_PRIVATE_INHERIT    309
-   WARN_TYPE_ABSTRACT            403
-   WARN_LANG_OVERLOAD_CONST      512
-   WARN_PARSE_BUILTIN_NAME       321
-   WARN_PARSE_REDUNDANT          322
- */
-#define EXTRA_WARNINGS "202,309,403,512,321,322"
-
-extern "C" {
-  extern String *ModuleName;
-  extern int ignore_nested_classes;
-  extern int kwargs_supported;
-}
-
-/* usage string split into multiple parts otherwise string is too big for some compilers */
-/* naming conventions for commandline options - no underscores, no capital letters, join words together
- * except when using a common prefix, then use '-' to separate, eg the debug-xxx options */
-static const char *usage1 = (const char *) "\
-\nGeneral Options\n\
-     -addextern      - Add extra extern declarations\n\
-     -c++            - Enable C++ processing\n\
-     -co <file>      - Check <file> out of the SWIG library\n\
-     -copyctor       - Automatically generate copy constructors wherever possible\n\
-     -cpperraswarn   - Treat the preprocessor #error statement as #warning (default)\n\
-     -cppext <ext>   - Change file extension of generated C++ files to <ext>\n\
-                       (default is cxx, except for PHP5 which uses cpp)\n\
-     -copyright      - Display copyright notices\n\
-     -debug-classes  - Display information about the classes found in the interface\n\
-     -debug-module <n>- Display module parse tree at stages 1-4, <n> is a csv list of stages\n\
-     -debug-symtabs  - Display symbol tables information\n\
-     -debug-symbols  - Display target language symbols in the symbol tables\n\
-     -debug-csymbols - Display C symbols in the symbol tables\n\
-     -debug-lsymbols - Display target language layer symbols\n\
-     -debug-tags     - Display information about the tags found in the interface\n\
-     -debug-template - Display information for debugging templates\n\
-     -debug-top <n>  - Display entire parse tree at stages 1-4, <n> is a csv list of stages\n\
-     -debug-typedef  - Display information about the types and typedefs in the interface\n\
-     -debug-typemap  - Display typemap debugging information\n\
-     -debug-tmsearch - Display typemap search debugging information\n\
-     -debug-tmused   - Display typemaps used debugging information\n\
-     -directors      - Turn on director mode for all the classes, mainly for testing\n\
-     -dirprot        - Turn on wrapping of protected members for director classes (default)\n\
-     -D<symbol>      - Define a symbol <symbol> (for conditional compilation)\n\
-";
-
-static const char *usage2 = (const char *) "\
-     -E              - Preprocess only, does not generate wrapper code\n\
-     -external-runtime [file] - Export the SWIG runtime stack\n\
-     -fakeversion <v>- Make SWIG fake the program version number to <v>\n\
-     -fcompact       - Compile in compact mode\n\
-     -features <list>- Set global features, where <list> is a comma separated list of\n\
-                       features, eg -features directors,autodoc=1\n\
-                       If no explicit value is given to the feature, a default of 1 is used\n\
-     -fastdispatch   - Enable fast dispatch mode to produce faster overload dispatcher code\n\
-     -Fmicrosoft     - Display error/warning messages in Microsoft format\n\
-     -Fstandard      - Display error/warning messages in commonly used format\n\
-     -fvirtual       - Compile in virtual elimination mode\n\
-     -help           - This output\n\
-     -I-             - Don't search the current directory\n\
-     -I<dir>         - Look for SWIG files in directory <dir>\n\
-     -ignoremissing  - Ignore missing include files\n\
-     -importall      - Follow all #include statements as imports\n\
-     -includeall     - Follow all #include statements\n\
-     -l<ifile>       - Include SWIG library file <ifile>\n\
-";
-
-static const char *usage3 = (const char *) "\
-     -macroerrors    - Report errors inside macros\n\
-     -makedefault    - Create default constructors/destructors (the default)\n\
-     -M              - List all dependencies\n\
-     -MD             - Is equivalent to `-M -MF <file>', except `-E' is not implied\n\
-     -MF <file>      - Generate dependencies into <file> and continue generating wrappers\n\
-     -MM             - List dependencies, but omit files in SWIG library\n\
-     -MMD            - Like `-MD', but omit files in SWIG library\n\
-     -module <name>  - Set module name to <name>\n\
-     -MP             - Generate phony targets for all dependencies\n\
-     -MT <target>    - Set the target of the rule emitted by dependency generation\n\
-     -nocontract     - Turn off contract checking\n\
-     -nocpperraswarn - Do not treat the preprocessor #error statement as #warning\n\
-     -nodefault      - Do not generate default constructors nor default destructors\n\
-     -nodefaultctor  - Do not generate implicit default constructors\n\
-     -nodefaultdtor  - Do not generate implicit default destructors\n\
-     -nodirprot      - Do not wrap director protected members\n\
-     -noexcept       - Do not wrap exception specifiers\n\
-     -nofastdispatch - Disable fast dispatch mode (default)\n\
-     -nopreprocess   - Skip the preprocessor step\n\
-     -notemplatereduce - Disable reduction of the typedefs in templates\n\
-";
-
-static const char *usage4 = (const char *) "\
-     -O              - Enable the optimization options: \n\
-                        -fastdispatch -fvirtual \n\
-     -o <outfile>    - Set name of C/C++ output file to <outfile>\n\
-     -oh <headfile>  - Set name of C++ output header file for directors to <headfile>\n\
-     -outcurrentdir  - Set default output dir to current dir instead of input file's path\n\
-     -outdir <dir>   - Set language specific files output directory to <dir>\n\
-     -pcreversion    - Display PCRE version information\n\
-     -small          - Compile in virtual elimination & compact mode\n\
-     -swiglib        - Report location of SWIG library and exit\n\
-     -templatereduce - Reduce all the typedefs in templates\n\
-     -v              - Run in verbose mode\n\
-     -version        - Display SWIG version number\n\
-     -Wall           - Remove all warning suppression, also implies -Wextra\n\
-     -Wallkw         - Enable keyword warnings for all the supported languages\n\
-     -Werror         - Treat warnings as errors\n\
-     -Wextra         - Adds the following additional warnings: " EXTRA_WARNINGS "\n\
-     -w<list>        - Suppress/add warning messages, eg -w401,+321 - see Warnings.html\n\
-     -xmlout <file>  - Write XML version of the parse tree to <file> after normal processing\n\
-\n\
-Options can also be defined using the SWIG_FEATURES environment variable, for example:\n\
-\n\
-  $ SWIG_FEATURES=\"-Wall\"\n\
-  $ export SWIG_FEATURES\n\
-  $ swig -python interface.i\n\
-\n\
-is equivalent to: \n\
-\n\
-  $ swig -Wall -python interface.i \n\
-\n\
-\n";
-
-// Local variables
-static String *LangSubDir = 0; // Target language library subdirectory
-static String *SwigLib = 0; // Library directory
-static String *SwigLibWinUnix = 0; // Extra library directory on Windows
-static int freeze = 0;
-static String *lang_config = 0;
-static const char *hpp_extension = "h";
-static const char *cpp_extension = "cxx";
-static const char *depends_extension = "d";
-static String *outdir = 0;
-static String *xmlout = 0;
-static int outcurrentdir = 0;
-static int help = 0;
-static int checkout = 0;
-static int cpp_only = 0;
-static int no_cpp = 0;
-static String *outfile_name = 0;
-static String *outfile_name_h = 0;
-static int tm_debug = 0;
-static int dump_symtabs = 0;
-static int dump_symbols = 0;
-static int dump_csymbols = 0;
-static int dump_lang_symbols = 0;
-static int dump_tags = 0;
-static int dump_module = 0;
-static int dump_top = 0;
-static int dump_xml = 0;
-static int browse = 0;
-static int dump_typedef = 0;
-static int dump_classes = 0;
-static int werror = 0;
-static int depend = 0;
-static int depend_only = 0;
-static int depend_phony = 0;
-static int memory_debug = 0;
-static int allkw = 0;
-static DOH *cpps = 0;
-static String *dependencies_file = 0;
-static String *dependencies_target = 0;
-static int external_runtime = 0;
-static String *external_runtime_name = 0;
-enum { STAGE1=1, STAGE2=2, STAGE3=4, STAGE4=8, STAGEOVERFLOW=16 };
-static List *libfiles = 0;
-static List *all_output_files = 0;
-
-/* -----------------------------------------------------------------------------
- * check_extension()
- *
- * Checks the extension of a file to see if we should emit extern declarations.
- * ----------------------------------------------------------------------------- */
-
-static bool check_extension(String *filename) {
-  bool wanted = false;
-  const char *name = Char(filename);
-  if (!name)
-    return 0;
-  String *extension = Swig_file_extension(name);
-  const char *c = Char(extension);
-  if ((strcmp(c, ".c") == 0) ||
-      (strcmp(c, ".C") == 0) || (strcmp(c, ".cc") == 0) || (strcmp(c, ".cxx") == 0) || (strcmp(c, ".c++") == 0) || (strcmp(c, ".cpp") == 0)) {
-    wanted = true;
-  }
-  Delete(extension);
-  return wanted;
-}
-
-/* -----------------------------------------------------------------------------
- * install_opts()
- *
- * Install all command line options as preprocessor symbols
- * ----------------------------------------------------------------------------- */
-
-static void install_opts(int argc, char *argv[]) {
-  int i;
-  int noopt = 0;
-  char *c;
-  for (i = 1; i < (argc - 1); i++) {
-    if (argv[i]) {
-      if ((*argv[i] == '-') && (!isupper(*(argv[i] + 1)))) {
-	String *opt = NewStringf("SWIGOPT%(upper)s", argv[i]);
-	Replaceall(opt, "-", "_");
-	c = Char(opt);
-	noopt = 0;
-	while (*c) {
-	  if (!(isalnum(*c) || (*c == '_'))) {
-	    noopt = 1;
-	    break;
-	  }
-	  c++;
-	}
-	if (((i + 1) < (argc - 1)) && (argv[i + 1]) && (*argv[i + 1] != '-')) {
-	  Printf(opt, " %s", argv[i + 1]);
-	  i++;
-	} else {
-	  Printf(opt, " 1");
-	}
-	if (!noopt) {
-	  /*      Printf(stdout,"%s\n", opt); */
-	  Preprocessor_define(opt, 0);
-	}
-	Delete(opt);
-      }
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * decode_numbers_list()
- *
- * Decode comma separated list into a binary number of the inputs or'd together
- * eg list="1,4" will return (2^0 || 2^3) = 0x1001
- * ----------------------------------------------------------------------------- */
-
-static unsigned int decode_numbers_list(String *numlist) {
-  unsigned int decoded_number = 0;
-  if (numlist) {
-    List *numbers = Split(numlist, ',', INT_MAX);
-    if (numbers && Len(numbers) > 0) {
-      for (Iterator it = First(numbers); it.item; it = Next(it)) {
-        String *numstring = it.item;
-        // TODO: check that it is a number
-        int number = atoi(Char(numstring));
-        if (number > 0 && number <= 16) {
-          decoded_number |= (1 << (number-1));
-        }
-      }
-    }
-  }
-  return decoded_number;
-}
-
-/* -----------------------------------------------------------------------------
- * Sets the output directory for language specific (proxy) files from the
- * C wrapper file if not set and corrects the directory name and adds a trailing
- * file separator if necessary.
- * ----------------------------------------------------------------------------- */
-
-static void configure_outdir(const String *c_wrapper_outfile) {
-
-  // Use the C wrapper file's directory if the output directory has not been set by user
-  if (!outdir || Len(outdir) == 0)
-    outdir = Swig_file_dirname(c_wrapper_outfile);
-
-  Swig_filename_correct(outdir);
-
-  // Add trailing file delimiter if not present in output directory name
-  if (Len(outdir) > 0) {
-    const char *outd = Char(outdir);
-    if (strcmp(outd + strlen(outd) - strlen(SWIG_FILE_DELIMITER), SWIG_FILE_DELIMITER) != 0)
-      Printv(outdir, SWIG_FILE_DELIMITER, NIL);
-  }
-}
-
-/* This function sets the name of the configuration file */
-void SWIG_config_file(const_String_or_char_ptr filename) {
-  lang_config = NewString(filename);
-}
-
-/* Sets the target language subdirectory name */
-void SWIG_library_directory(const char *subdirectory) {
-  LangSubDir = NewString(subdirectory);
-}
-
-// Returns the directory for generating language specific files (non C/C++ files)
-const String *SWIG_output_directory() {
-  assert(outdir);
-  return outdir;
-}
-
-void SWIG_config_cppext(const char *ext) {
-  cpp_extension = ext;
-}
-
-List *SWIG_output_files() {
-  assert(all_output_files);
-  return all_output_files;
-}
-
-void SWIG_setfeature(const char *cfeature, const char *cvalue) {
-  Hash *features_hash = Swig_cparse_features();
-  String *name = NewString("");
-  String *fname = NewString(cfeature);
-  String *fvalue = NewString(cvalue);
-  Swig_feature_set(features_hash, name, 0, fname, fvalue, 0);
-  Delete(name);
-  Delete(fname);
-  Delete(fvalue);
-}
-
-
-void SWIG_setfeatures(const char *c) {
-  char feature[64];
-  char *fb = feature;
-  char *fe = fb + 63;
-  Hash *features_hash = Swig_cparse_features();
-  String *name = NewString("");
-  /* Printf(stderr,"all features %s\n", c); */
-  while (*c) {
-    char *f = fb;
-    String *fname = NewString("feature:");
-    String *fvalue = NewString("");
-    while ((f != fe) && *c != '=' && *c != ',' && *c) {
-      *(f++) = *(c++);
-    }
-    *f = 0;
-    Printf(fname, "%s", feature);
-    if (*c && *(c++) == '=') {
-      char value[64];
-      char *v = value;
-      char *ve = v + 63;
-      while ((v != ve) && *c != ',' && *c && !isspace(*c)) {
-	*(v++) = *(c++);
-      }
-      *v = 0;
-      Printf(fvalue, "%s", value);
-    } else {
-      Printf(fvalue, "1");
-    }
-    /* Printf(stderr,"%s %s\n", fname, fvalue);  */
-    Swig_feature_set(features_hash, name, 0, fname, fvalue, 0);
-    Delete(fname);
-    Delete(fvalue);
-  }
-  Delete(name);
-}
-
-/* This function handles the -external-runtime command option */
-static void SWIG_dump_runtime() {
-  String *outfile;
-  File *runtime;
-  String *s;
-
-  outfile = external_runtime_name;
-  if (!outfile) {
-    outfile = lang->defaultExternalRuntimeFilename();
-    if (!outfile) {
-      Printf(stderr, "*** Please provide a filename for the external runtime\n");
-      SWIG_exit(EXIT_FAILURE);
-    }
-  }
-
-  runtime = NewFile(outfile, "w", SWIG_output_files());
-  if (!runtime) {
-    FileErrorDisplay(outfile);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Swig_banner(runtime);
-  Printf(runtime, "\n");
-
-  s = Swig_include_sys("swiglabels.swg");
-  if (!s) {
-    Printf(stderr, "*** Unable to open 'swiglabels.swg'\n");
-    Delete(runtime);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  Printf(runtime, "%s", s);
-  Delete(s);
-
-  s = Swig_include_sys("swigerrors.swg");
-  if (!s) {
-    Printf(stderr, "*** Unable to open 'swigerrors.swg'\n");
-    Delete(runtime);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  Printf(runtime, "%s", s);
-  Delete(s);
-
-  s = Swig_include_sys("swigrun.swg");
-  if (!s) {
-    Printf(stderr, "*** Unable to open 'swigrun.swg'\n");
-    Delete(runtime);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  Printf(runtime, "%s", s);
-  Delete(s);
-
-  s = lang->runtimeCode();
-  Printf(runtime, "%s", s);
-  Delete(s);
-
-  s = Swig_include_sys("runtime.swg");
-  if (!s) {
-    Printf(stderr, "*** Unable to open 'runtime.swg'\n");
-    Delete(runtime);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  Printf(runtime, "%s", s);
-  Delete(s);
-
-  Delete(runtime);
-  SWIG_exit(EXIT_SUCCESS);
-}
-
-void SWIG_getoptions(int argc, char *argv[]) {
-  int i;
-  // Get options
-  for (i = 1; i < argc; i++) {
-    if (argv[i] && !Swig_check_marked(i)) {
-      if (strncmp(argv[i], "-I-", 3) == 0) {
-	// Don't push/pop directories
-	Swig_set_push_dir(0);
-	Swig_mark_arg(i);
-      } else if (strncmp(argv[i], "-I", 2) == 0) {
-	// Add a new directory search path
-	char *a = Swig_copy_string(argv[i] + 2);
-	Swig_add_directory((DOH *) a);
-	free(a);
-	Swig_mark_arg(i);
-      } else if (strncmp(argv[i], "-D", 2) == 0) {
-	String *d = NewString(argv[i] + 2);
-	Replace(d, "=", " ", DOH_REPLACE_ANY | DOH_REPLACE_FIRST);
-	Preprocessor_define((DOH *) d, 0);
-	Delete(d);
-	// Create a symbol
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-E") == 0) {
-	cpp_only = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nopreprocess") == 0) {
-	no_cpp = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-verbose") == 0) || (strcmp(argv[i], "-v") == 0)) {
-	Verbose = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-c++") == 0) {
-	CPlusPlus = 1;
-	Preprocessor_define((DOH *) "__cplusplus __cplusplus", 0);
-	Swig_cparse_cplusplus(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-c++out") == 0) {
-	// Undocumented
-	Swig_cparse_cplusplusout(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-fcompact") == 0) {
-	Wrapper_compact_print_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-fvirtual") == 0) {
-	Wrapper_virtual_elimination_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-fastdispatch") == 0) {
-	Wrapper_fast_dispatch_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nofastdispatch") == 0) {
-	Wrapper_fast_dispatch_mode_set(0);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-naturalvar") == 0) {
-	Wrapper_naturalvar_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-directors") == 0) {
-	SWIG_setfeature("feature:director", "1");
-	Wrapper_director_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-dirprot") == 0) {
-	Wrapper_director_protected_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nodirprot") == 0) {
-	Wrapper_director_protected_mode_set(0);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-pcreversion") == 0) {
-	String *version = Swig_pcre_version();
-	Printf(stdout, "%s\n", version);
-	Delete(version);
-	Swig_mark_arg(i);
-	SWIG_exit(EXIT_SUCCESS);
-      } else if (strcmp(argv[i], "-small") == 0) {
-	Wrapper_compact_print_mode_set(1);
-	Wrapper_virtual_elimination_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-runtime") == 0) { // Used to also accept -c. removed in swig-1.3.36
-	Swig_mark_arg(i);
-	Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n");
-	SwigRuntime = 1;
-      } else if (strcmp(argv[i], "-noruntime") == 0) {
-	Swig_mark_arg(i);
-	Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n");
-	SwigRuntime = 2;
-      } else if (strcmp(argv[i], "-external-runtime") == 0) {
-	external_runtime = 1;
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  external_runtime_name = NewString(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	}
-      } else if ((strcmp(argv[i], "-make_default") == 0) || (strcmp(argv[i], "-makedefault") == 0)) {
-	GenerateDefault = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-no_default") == 0) || (strcmp(argv[i], "-nodefault") == 0)) {
-	GenerateDefault = 0;
-	Swig_warning(WARN_DEPRECATED_NODEFAULT, "SWIG", 1, "dangerous, use -nodefaultctor, -nodefaultdtor instead.\n");
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-nodefaultctor") == 0)) {
-	SWIG_setfeature("feature:nodefaultctor", "1");
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-nodefaultdtor") == 0)) {
-	SWIG_setfeature("feature:nodefaultdtor", "1");
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-copyctor") == 0)) {
-	SWIG_setfeature("feature:copyctor", "1");
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-noexcept") == 0) {
-	NoExcept = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-noextern") == 0) {
-	Swig_warning(WARN_DEPRECATED_NOEXTERN, "SWIG", 1, "-noextern command line option is deprecated; extern is no longer generated by default.\n");
-	AddExtern = 0;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-addextern") == 0) {
-	AddExtern = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-debug-template") == 0) || (strcmp(argv[i], "-debug_template") == 0) || (strcmp(argv[i], "-show_templates") == 0)) {
-	Swig_cparse_debug_templates(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-templatereduce") == 0) {
-	SWIG_cparse_template_reduce(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-notemplatereduce") == 0) {
-	SWIG_cparse_template_reduce(0);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-macroerrors") == 0) {
-	Swig_cparse_follow_locators(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-swiglib") == 0) {
-	Printf(stdout, "%s\n", SwigLib);
-	if (SwigLibWinUnix)
-	  Printf(stdout, "%s\n", SwigLibWinUnix);
-	SWIG_exit(EXIT_SUCCESS);
-      } else if (strcmp(argv[i], "-o") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  outfile_name = NewString(argv[i + 1]);
-          Swig_filename_correct(outfile_name);
-	  if (!outfile_name_h || !dependencies_file) {
-	    char *ext = strrchr(Char(outfile_name), '.');
-	    String *basename = ext ? NewStringWithSize(Char(outfile_name), (int)(Char(ext) - Char(outfile_name))) : NewString(outfile_name);
-	    if (!dependencies_file) {
-	      dependencies_file = NewStringf("%s.%s", basename, depends_extension);
-	    }
-	    if (!outfile_name_h) {
-	      Printf(basename, ".%s", hpp_extension);
-	      outfile_name_h = NewString(basename);
-	    }
-	    Delete(basename);
-	  }
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-oh") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  outfile_name_h = NewString(argv[i + 1]);
-          Swig_filename_correct(outfile_name_h);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-fakeversion") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  Swig_set_fakeversion(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-version") == 0) {
-	fprintf(stdout, "\nSWIG Version %s\n", Swig_package_version());
-	fprintf(stdout, "\nCompiled with %s [%s]\n", SWIG_CXX, SWIG_PLATFORM);
-	fprintf(stdout, "\nConfigured options: %cpcre\n",
-#ifdef HAVE_PCRE
-		'+'
-#else
-		'-'
-#endif
-	    );
-	fprintf(stdout, "\nPlease see %s for reporting bugs and further information\n", PACKAGE_BUGREPORT);
-	SWIG_exit(EXIT_SUCCESS);
-      } else if (strcmp(argv[i], "-copyright") == 0) {
-	fprintf(stdout, "\nSWIG Version %s\n", Swig_package_version());
-	fprintf(stdout, "Copyright (c) 1995-1998\n");
-	fprintf(stdout, "University of Utah and the Regents of the University of California\n");
-	fprintf(stdout, "Copyright (c) 1998-2005\n");
-	fprintf(stdout, "University of Chicago\n");
-	fprintf(stdout, "Copyright (c) 2005-2006\n");
-	fprintf(stdout, "Arizona Board of Regents (University of Arizona)\n");
-	SWIG_exit(EXIT_SUCCESS);
-      } else if (strncmp(argv[i], "-l", 2) == 0) {
-	// Add a new directory search path
-	Append(libfiles, argv[i] + 2);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-co") == 0) {
-	checkout = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-features") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  SWIG_setfeatures(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-freeze") == 0) {
-	freeze = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-includeall") == 0) {
-	Preprocessor_include_all(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-importall") == 0) {
-	Preprocessor_import_all(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-ignoremissing") == 0) {
-	Preprocessor_ignore_missing(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-cpperraswarn") == 0) {
-	Preprocessor_error_as_warning(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nocpperraswarn") == 0) {
-	Preprocessor_error_as_warning(0);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-cppext") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  SWIG_config_cppext(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if ((strcmp(argv[i], "-debug-typemap") == 0) || (strcmp(argv[i], "-debug_typemap") == 0) || (strcmp(argv[i], "-tm_debug") == 0)) {
-	tm_debug = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-debug-tmsearch") == 0) {
-	Swig_typemap_search_debug_set();
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-debug-tmused") == 0) {
-	Swig_typemap_used_debug_set();
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-module") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  ModuleName = NewString(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-M") == 0) {
-	depend = 1;
-	depend_only = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-MM") == 0) {
-	depend = 2;
-	depend_only = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-MF") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  dependencies_file = NewString(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-MD") == 0) {
-	depend = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-MMD") == 0) {
-	depend = 2;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-MP") == 0) {
-	depend_phony = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-MT") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-          if (!dependencies_target)
-            dependencies_target = NewString(argv[i + 1]);
-          else
-            Printf(dependencies_target, " %s", argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-outdir") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  outdir = NewString(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-outcurrentdir") == 0) {
-	Swig_mark_arg(i);
-	outcurrentdir = 1;
-      } else if (strcmp(argv[i], "-Wall") == 0) {
-	Swig_mark_arg(i);
-	Swig_warnall();
-      } else if (strcmp(argv[i], "-Wallkw") == 0) {
-	allkw = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-Werror") == 0) {
-	werror = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-Wextra") == 0) {
-	Swig_mark_arg(i);
-        Swig_warnfilter(EXTRA_WARNINGS, 0);
-      } else if (strncmp(argv[i], "-w", 2) == 0) {
-	Swig_mark_arg(i);
-	Swig_warnfilter(argv[i] + 2, 1);
-      } else if (strcmp(argv[i], "-debug-symtabs") == 0) {
-	dump_symtabs = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-debug-symbols") == 0) {
-	dump_symbols = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-debug-csymbols") == 0) {
-	dump_csymbols = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-debug-lsymbols") == 0) {
-	dump_lang_symbols = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-debug-tags") == 0) || (strcmp(argv[i], "-dump_tags") == 0)) {
-	dump_tags = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-debug-top") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  String *dump_list = NewString(argv[i + 1]);
-	  dump_top = decode_numbers_list(dump_list);
-          if (dump_top < STAGE1 || dump_top >= STAGEOVERFLOW)
-            Swig_arg_error();
-          else
-            Swig_mark_arg(i + 1);
-          Delete(dump_list);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-debug-module") == 0) {
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  String *dump_list = NewString(argv[i + 1]);
-	  dump_module = decode_numbers_list(dump_list);
-          if (dump_module < STAGE1 || dump_module >= STAGEOVERFLOW)
-            Swig_arg_error();
-          else
-            Swig_mark_arg(i + 1);
-          Delete(dump_list);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if ((strcmp(argv[i], "-dump_tree") == 0) || (strcmp(argv[i], "-dump_top") == 0)) {
-	dump_top |= STAGE4;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-dump_module") == 0) {
-	dump_module |= STAGE4;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-dump_parse_module") == 0) {
-	dump_module |= STAGE1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-dump_parse_top") == 0) {
-	dump_top |= STAGE1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-dump_xml") == 0) {
-	dump_xml = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-xmlout") == 0) {
-	dump_xml = 1;
-	Swig_mark_arg(i);
-	if (argv[i + 1]) {
-	  xmlout = NewString(argv[i + 1]);
-	  Swig_mark_arg(i + 1);
-	} else {
-	  Swig_arg_error();
-	}
-      } else if (strcmp(argv[i], "-nocontract") == 0) {
-	Swig_mark_arg(i);
-	Swig_contract_mode_set(0);
-      } else if (strcmp(argv[i], "-browse") == 0) {
-	browse = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-debug-typedef") == 0) || (strcmp(argv[i], "-dump_typedef") == 0)) {
-	dump_typedef = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-debug-classes") == 0) || (strcmp(argv[i], "-dump_classes") == 0)) {
-	dump_classes = 1;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-debug-memory") == 0) || (strcmp(argv[i], "-dump_memory") == 0)) {
-	memory_debug = 1;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-Fstandard") == 0) {
-	Swig_error_msg_format(EMF_STANDARD);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-Fmicrosoft") == 0) {
-	Swig_error_msg_format(EMF_MICROSOFT);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-O") == 0) {
-	Wrapper_virtual_elimination_mode_set(1);
-	Wrapper_fast_dispatch_mode_set(1);
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-help") == 0) {
-	fputs(usage1, stdout);
-	fputs(usage2, stdout);
-	fputs(usage3, stdout);
-	fputs(usage4, stdout);
-	Swig_mark_arg(i);
-	help = 1;
-      }
-    }
-  }
-}
-
-int SWIG_main(int argc, char *argv[], Language *l) {
-  char *c;
-
-  /* Initialize the SWIG core */
-  Swig_init();
-
-  // Default warning suppression
-  Swig_warnfilter(EXTRA_WARNINGS, 1);
-
-  // Initialize the preprocessor
-  Preprocessor_init();
-
-  lang = l;
-
-  // Set up some default symbols (available in both SWIG interface files
-  // and C files)
-
-  Preprocessor_define((DOH *) "SWIG 1", 0);
-  Preprocessor_define((DOH *) "__STDC__", 0);
-
-  // Set the SWIG version value in format 0xAABBCC from package version expected to be in format A.B.C
-  String *package_version = NewString(PACKAGE_VERSION); /* Note that the fakeversion has not been set at this point */
-  char *token = strtok(Char(package_version), ".");
-  String *vers = NewString("SWIG_VERSION 0x");
-  int count = 0;
-  while (token) {
-    int len = (int)strlen(token);
-    assert(len == 1 || len == 2);
-    Printf(vers, "%s%s", (len == 1) ? "0" : "", token);
-    token = strtok(NULL, ".");
-    count++;
-  }
-  Delete(package_version);
-  assert(count == 3);		// Check version format is correct
-
-  /* Turn on contracts */
-
-  Swig_contract_mode_set(1);
-  Preprocessor_define(vers, 0);
-
-  /* Turn off directors mode */
-  Wrapper_director_mode_set(0);
-  Wrapper_director_protected_mode_set(1);
-
-  // Inform the parser if the nested classes should be ignored unless explicitly told otherwise via feature:flatnested
-  ignore_nested_classes = l->nestedClassesSupport() == Language::NCS_Unknown ? 1 : 0;
-
-  kwargs_supported = l->kwargsSupport() ? 1 : 0;
-
-  // Create Library search directories
-
-  // Check for SWIG_LIB environment variable
-  if ((c = getenv("SWIG_LIB")) == (char *) 0) {
-#if defined(_WIN32)
-    char buf[MAX_PATH];
-    char *p;
-    if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
-      *(p + 1) = '\0';
-      SwigLib = NewStringf("%sLib", buf); // Native windows installation path
-    } else {
-      SwigLib = NewStringf("");	// Unexpected error
-    }
-    if (Len(SWIG_LIB_WIN_UNIX) > 0)
-      SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
-#else
-    SwigLib = NewString(SWIG_LIB);
-#endif
-  } else {
-    SwigLib = NewString(c);
-  }
-
-  libfiles = NewList();
-  all_output_files = NewList();
-
-  /* Check for SWIG_FEATURES environment variable */
-
-  SWIG_getoptions(argc, argv);
-
-  // Define the __cplusplus symbol
-  if (CPlusPlus)
-    Preprocessor_define((DOH *) "__cplusplus __cplusplus", 0);
-
-  // Parse language dependent options
-  lang->main(argc, argv);
-
-  if (help) {
-    Printf(stdout, "\nNote: 'swig -<lang> -help' displays options for a specific target language.\n\n");
-    SWIG_exit(EXIT_SUCCESS);	// Exit if we're in help mode
-  }
-  // Check all of the options to make sure we're cool.
-  // Don't check for an input file if -external-runtime is passed
-  Swig_check_options(external_runtime ? 0 : 1);
-
-  if (CPlusPlus && cparse_cplusplusout) {
-    Printf(stderr, "The -c++out option is for C input but C++ input has been requested via -c++\n");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  install_opts(argc, argv);
-
-  // Add language dependent directory to the search path
-  {
-    String *rl = NewString("");
-    Printf(rl, ".%sswig_lib%s%s", SWIG_FILE_DELIMITER, SWIG_FILE_DELIMITER, LangSubDir);
-    Swig_add_directory(rl);
-    if (SwigLibWinUnix) {
-      rl = NewString("");
-      Printf(rl, "%s%s%s", SwigLibWinUnix, SWIG_FILE_DELIMITER, LangSubDir);
-      Swig_add_directory(rl);
-    }
-    rl = NewString("");
-    Printf(rl, "%s%s%s", SwigLib, SWIG_FILE_DELIMITER, LangSubDir);
-    Swig_add_directory(rl);
-  }
-
-  Swig_add_directory((String *) "." SWIG_FILE_DELIMITER "swig_lib");
-  if (SwigLibWinUnix)
-    Swig_add_directory((String *) SwigLibWinUnix);
-  Swig_add_directory(SwigLib);
-
-  if (Verbose) {
-    Printf(stdout, "Language subdirectory: %s\n", LangSubDir);
-    Printf(stdout, "Search paths:\n");
-    List *sp = Swig_search_path();
-    Iterator s;
-    for (s = First(sp); s.item; s = Next(s)) {
-      Printf(stdout, "   %s\n", s.item);
-    }
-  }
-  // handle the -external-runtime argument
-  if (external_runtime)
-    SWIG_dump_runtime();
-
-  // If we made it this far, looks good. go for it....
-
-  input_file = NewString(argv[argc - 1]);
-  Swig_filename_correct(input_file);
-
-  // If the user has requested to check out a file, handle that
-  if (checkout) {
-    DOH *s;
-    String *outfile = input_file;
-    if (outfile_name)
-      outfile = outfile_name;
-
-    if (Verbose)
-      Printf(stdout, "Handling checkout...\n");
-
-    s = Swig_include(input_file);
-    if (!s) {
-      Printf(stderr, "Unable to locate '%s' in the SWIG library.\n", input_file);
-    } else {
-      FILE *f = Swig_open(outfile);
-      if (f) {
-	fclose(f);
-	Printf(stderr, "File '%s' already exists. Checkout aborted.\n", outfile);
-      } else {
-        File *f_outfile = NewFile(outfile, "w", SWIG_output_files());
-        if (!f_outfile) {
-          FileErrorDisplay(outfile);
-          SWIG_exit(EXIT_FAILURE);
-        } else {
-          if (Verbose)
-            Printf(stdout, "'%s' checked out from the SWIG library.\n", outfile);
-          Printv(f_outfile, s, NIL);
-          Delete(f_outfile);
-        }
-      }
-    }
-  } else {
-    // Run the preprocessor
-    if (Verbose)
-      Printf(stdout, "Preprocessing...\n");
-
-    {
-      int i;
-      String *fs = NewString("");
-      FILE *df = Swig_open(input_file);
-      if (!df) {
-	df = Swig_include_open(input_file);
-	if (!df) {
-	  char *cfile = Char(input_file);
-	  if (cfile && cfile[0] == '-') {
-	    Printf(stderr, "Unable to find option or file '%s', ", input_file);
-	    Printf(stderr, "use 'swig -help' for more information.\n");
-	  } else {
-	    Printf(stderr, "Unable to find file '%s'.\n", input_file);
-	  }
-	  SWIG_exit(EXIT_FAILURE);
-	} else {
-	  Swig_warning(WARN_DEPRECATED_INPUT_FILE, "SWIG", 1, "Use of the include path to find the input file is deprecated and will not work with ccache. Please include the path when specifying the input file.\n"); // so that behaviour is like c/c++ compilers
-	}
-      }
-      if (!no_cpp) {
-	fclose(df);
-	Printf(fs, "%%include <swig.swg>\n");
-	if (allkw) {
-	  Printf(fs, "%%include <allkw.swg>\n");
-	}
-	if (lang_config) {
-	  Printf(fs, "\n%%include <%s>\n", lang_config);
-	}
-	Printf(fs, "%%include(maininput=\"%s\") \"%s\"\n", Swig_filename_escape(input_file), Swig_filename_escape(Swig_last_file()));
-	for (i = 0; i < Len(libfiles); i++) {
-	  Printf(fs, "\n%%include \"%s\"\n", Swig_filename_escape(Getitem(libfiles, i)));
-	}
-	Seek(fs, 0, SEEK_SET);
-	cpps = Preprocessor_parse(fs);
-	Delete(fs);
-      } else {
-	cpps = Swig_read_file(df);
-	fclose(df);
-      }
-      if (Swig_error_count()) {
-	SWIG_exit(EXIT_FAILURE);
-      }
-      if (cpp_only) {
-	Printf(stdout, "%s", cpps);
-	SWIG_exit(EXIT_SUCCESS);
-      }
-      if (depend) {
-	if (!no_cpp) {
-	  String *outfile;
-          File *f_dependencies_file = 0;
-
-	  String *inputfile_filename = outcurrentdir ? Swig_file_filename(input_file): Copy(input_file);
-	  String *basename = Swig_file_basename(inputfile_filename);
-	  if (!outfile_name) {
-	    if (CPlusPlus || lang->cplus_runtime_mode()) {
-	      outfile = NewStringf("%s_wrap.%s", basename, cpp_extension);
-	    } else {
-	      outfile = NewStringf("%s_wrap.c", basename);
-	    }
-	  } else {
-	    outfile = NewString(outfile_name);
-	  }
-	  if (dependencies_file && Len(dependencies_file) != 0) {
-	    f_dependencies_file = NewFile(dependencies_file, "w", SWIG_output_files());
-	    if (!f_dependencies_file) {
-	      FileErrorDisplay(dependencies_file);
-	      SWIG_exit(EXIT_FAILURE);
-	    }
-	  } else if (!depend_only) {
-	    String *filename = NewStringf("%s_wrap.%s", basename, depends_extension);
-	    f_dependencies_file = NewFile(filename, "w", SWIG_output_files());
-	    if (!f_dependencies_file) {
-	      FileErrorDisplay(filename);
-	      SWIG_exit(EXIT_FAILURE);
-	    }
-	  } else
-	    f_dependencies_file = stdout;
-	  if (dependencies_target) {
-	    Printf(f_dependencies_file, "%s: ", dependencies_target);
-	  } else {
-	    Printf(f_dependencies_file, "%s: ", outfile);
-	  }
-	  List *files = Preprocessor_depend();
-	  List *phony_targets = NewList();
-	  for (int i = 0; i < Len(files); i++) {
-            int use_file = 1;
-            if (depend == 2) {
-              if ((Strncmp(Getitem(files, i), SwigLib, Len(SwigLib)) == 0) || (SwigLibWinUnix && (Strncmp(Getitem(files, i), SwigLibWinUnix, Len(SwigLibWinUnix)) == 0)))
-                use_file = 0;
-            }
-            if (use_file) {
-              Printf(f_dependencies_file, "\\\n  %s ", Getitem(files, i));
-              if (depend_phony)
-                Append(phony_targets, Getitem(files, i));
-            }
-	  }
-	  Printf(f_dependencies_file, "\n");
-	  if (depend_phony) {
-	    for (int i = 0; i < Len(phony_targets); i++) {
-	      Printf(f_dependencies_file, "\n%s:\n", Getitem(phony_targets, i));
-	    }
-	  }
-
-	  if (f_dependencies_file != stdout)
-	    Delete(f_dependencies_file);
-	  if (depend_only)
-	    SWIG_exit(EXIT_SUCCESS);
-	  Delete(inputfile_filename);
-	  Delete(basename);
-	  Delete(phony_targets);
-	} else {
-	  Printf(stderr, "Cannot generate dependencies with -nopreprocess\n");
-	  // Actually we could but it would be inefficient when just generating dependencies, as it would be done after Swig_cparse
-	  SWIG_exit(EXIT_FAILURE);
-	}
-      }
-      Seek(cpps, 0, SEEK_SET);
-    }
-
-    /* Register a null file with the file handler */
-    Swig_register_filebyname("null", NewString(""));
-
-    // Pass control over to the specific language interpreter
-    if (Verbose) {
-      fprintf(stdout, "Starting language-specific parse...\n");
-      fflush(stdout);
-    }
-
-    Node *top = Swig_cparse(cpps);
-
-    if (dump_top & STAGE1) {
-      Printf(stdout, "debug-top stage 1\n");
-      Swig_print_tree(top);
-    }
-    if (dump_module & STAGE1) {
-      Printf(stdout, "debug-module stage 1\n");
-      Swig_print_tree(Getattr(top, "module"));
-    }
-    if (!CPlusPlus) {
-      if (Verbose)
-	Printf(stdout, "Processing unnamed structs...\n");
-      Swig_nested_name_unnamed_c_structs(top);
-    }
-    Swig_extend_unused_check();
-
-    if (Verbose) {
-      Printf(stdout, "Processing types...\n");
-    }
-    Swig_process_types(top);
-
-    if (dump_top & STAGE2) {
-      Printf(stdout, "debug-top stage 2\n");
-      Swig_print_tree(top);
-    }
-    if (dump_module & STAGE2) {
-      Printf(stdout, "debug-module stage 2\n");
-      Swig_print_tree(Getattr(top, "module"));
-    }
-
-    if (Verbose) {
-      Printf(stdout, "C++ analysis...\n");
-    }
-    Swig_default_allocators(top);
-
-    if (CPlusPlus) {
-      if (Verbose)
-	Printf(stdout, "Processing nested classes...\n");
-      Swig_nested_process_classes(top);
-    }
-
-    if (dump_top & STAGE3) {
-      Printf(stdout, "debug-top stage 3\n");
-      Swig_print_tree(top);
-    }
-    if (top && (dump_module & STAGE3)) {
-      Printf(stdout, "debug-module stage 3\n");
-      Swig_print_tree(Getattr(top, "module"));
-    }
-
-    if (Verbose) {
-      Printf(stdout, "Generating wrappers...\n");
-    }
-
-    if (top && dump_classes) {
-      Hash *classes = Getattr(top, "classes");
-      if (classes) {
-	Printf(stdout, "Classes\n");
-	Printf(stdout, "------------\n");
-	Iterator ki;
-	for (ki = First(classes); ki.key; ki = Next(ki)) {
-	  Printf(stdout, "%s\n", ki.key);
-	}
-      }
-    }
-
-    if (dump_typedef) {
-      SwigType_print_scope();
-    }
-
-    if (dump_symtabs) {
-      Swig_symbol_print_tables(Swig_symbol_global_scope());
-      Swig_symbol_print_tables_summary();
-    }
-
-    if (dump_symbols) {
-      Swig_symbol_print_symbols();
-    }
-
-    if (dump_csymbols) {
-      Swig_symbol_print_csymbols();
-    }
-
-    if (dump_tags) {
-      Swig_print_tags(top, 0);
-    }
-    if (top) {
-      if (!Getattr(top, "name")) {
-	Printf(stderr, "No module name specified using %%module or -module.\n");
-	SWIG_exit(EXIT_FAILURE);
-      } else {
-	/* Set some filename information on the object */
-	String *infile = scanner_get_main_input_file();
-	if (!infile) {
-	  Printf(stderr, "Missing input file in preprocessed output.\n");
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Setattr(top, "infile", infile); // Note: if nopreprocess then infile is the original input file, otherwise input_file
-	Setattr(top, "inputfile", input_file);
-
-	String *infile_filename = outcurrentdir ? Swig_file_filename(infile): Copy(infile);
-	String *basename = Swig_file_basename(infile_filename);
-	if (!outfile_name) {
-	  if (CPlusPlus || lang->cplus_runtime_mode()) {
-	    Setattr(top, "outfile", NewStringf("%s_wrap.%s", basename, cpp_extension));
-	  } else {
-	    Setattr(top, "outfile", NewStringf("%s_wrap.c", basename));
-	  }
-	} else {
-	  Setattr(top, "outfile", outfile_name);
-	}
-	if (!outfile_name_h) {
-	  Setattr(top, "outfile_h", NewStringf("%s_wrap.%s", basename, hpp_extension));
-	} else {
-	  Setattr(top, "outfile_h", outfile_name_h);
-	}
-	configure_outdir(Getattr(top, "outfile"));
-	if (Swig_contract_mode_get()) {
-	  Swig_contracts(top);
-	}
-
-	// Check the extension for a c/c++ file.  If so, we're going to declare everything we see as "extern"
-	ForceExtern = check_extension(input_file);
-
-	lang->top(top);
-
-	if (browse) {
-	  Swig_browser(top, 0);
-	}
-	Delete(infile_filename);
-	Delete(basename);
-      }
-    }
-    if (dump_lang_symbols) {
-      lang->dumpSymbols();
-    }
-    if (dump_top & STAGE4) {
-      Printf(stdout, "debug-top stage 4\n");
-      Swig_print_tree(top);
-    }
-    if (dump_module & STAGE4) {
-      Printf(stdout, "debug-module stage 4\n");
-      Swig_print_tree(Getattr(top, "module"));
-    }
-    if (dump_xml && top) {
-      delete lang;
-      lang = 0;
-      Swig_print_xml(top, xmlout);
-    }
-    Delete(top);
-  }
-  if (tm_debug)
-    Swig_typemap_debug();
-  if (memory_debug)
-    DohMemoryDebug();
-
-  char *outfiles = getenv("CCACHE_OUTFILES");
-  if (outfiles) {
-    File *f_outfiles = NewFile(outfiles, "w", 0);
-    if (!f_outfiles) {
-      Printf(stderr, "Failed to write list of output files to the filename '%s' specified in CCACHE_OUTFILES environment variable - ", outfiles);
-      FileErrorDisplay(outfiles);
-      SWIG_exit(EXIT_FAILURE);
-    } else {
-      int i;
-      for (i = 0; i < Len(all_output_files); i++)
-        Printf(f_outfiles, "%s\n", Getitem(all_output_files, i));
-      Delete(f_outfiles);
-    }
-  }
-
-  // Deletes
-  Delete(libfiles);
-  Preprocessor_delete();
-
-  while (freeze) {
-  }
-
-  if ((werror) && (Swig_warn_count())) {
-    return Swig_warn_count();
-  }
-
-  delete lang;
-
-  return Swig_error_count();
-}
-
-/* -----------------------------------------------------------------------------
- * SWIG_exit()
- *
- * Cleanup and either freeze or exit
- * ----------------------------------------------------------------------------- */
-
-void SWIG_exit(int exit_code) {
-  while (freeze) {
-  }
-  exit(exit_code);
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/modula3.cxx b/dependencies2013/win32/swig/Source/Modules/modula3.cxx
deleted file mode 100644
index 9983e69d..00000000
--- a/dependencies2013/win32/swig/Source/Modules/modula3.cxx
+++ /dev/null
@@ -1,3931 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * modula3.cxx
- *
- * Modula3 language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-/*
-  Text formatted with
-    indent -sob -br -ce -nut -npsl
-*/
-
-/*
-  Report:
-   - It's not a good concept to use member variables or global variables
-     for passing parameters to functions.
-     It's not a good concept to use functions of superclasses for specific services.
-     E.g. For SWIG this means: Generating accessor functions for member variables
-     is the most common but no general task to be processed in membervariableHandler.
-     Better provide a service function which generates accessor function code
-     and equip this service function with all parameters needed for input (parse node)
-     and output (generated code).
-   - How can I make globalvariableHandler not to generate
-     interface functions to two accessor functions
-     (that don't exist) ?
-   - How can I generate a typemap that turns every C reference argument into
-     its Modula 3 counterpart, that is
-       void test(Complex &z);
-       PROCEDURE test(VAR z:Complex);
-   - neither $*n_mangle nor $*n_type nor $*n_ltype return the type without
-     pointer converted to Modula3 equivalent,
-     $*n_mangle is the variant closest to what I expect
-   - using a typemap like
-         typemap(m3wrapintype) int * %{VAR $1_name: INTEGER%}
-     has the advantages:
-       - one C parameter can be turned into multiple M3 parameters
-       - the argument can be renamed
-   - using typemaps like
-         typemap(m3wrapinmode) int * "VAR"
-         typemap(m3wrapintype) int * "INTEGER"
-     has the advantages:
-       - multiple parameters with same type and default value can be bundled
-       - more conform to the other language modules
-   - Where takes the reduction of multi-typemaps place?
-     How can I preserve all parameters for functions of the intermediary class?
-     The answer is Getattrs(n,"tmap:m3rawintype:next")
-   - Char() can be used to transform a String to (char *)
-     which can be used for output with printf
-   - What is the while (checkAttribute()) loop in functionWrapper good for?
-     Appearently for skipping (numinputs=0) typemaps.
-   - SWIGTYPE const * - typemap is ignored, whereas
-     SWIGTYPE *       - typemap is invoked, why?
-     Had it been (const SWIGTYPE *) instead?
-   - enumeration items should definitely be equipped
-     with its plain numerical value
-     One could add tag 'numvalue' in CParse/parser.y,
-     but it is still possible that someone declares an
-     enumeration using a symbolic constant.
-     I have quickly hacked
-     that the successive number is assigned
-     if "enumvalue" has suffix "+1".
-     The ultimate solution would be to generate a C program
-     which includes the header and outputs all constants.
-     This program might be compiled and run
-     by 'make' or by SWIG and the resulting output is fed back to SWIG.
-   - It's a bad idea to interpret feature value ""
-     'disable feature' because the value ""
-     might be sensible in case of feature:modula3:oldprefix.
-   - What's the difference between "sym:name" and "name" ?
-     "name" is the original name and
-     "sym:name" is probably modified by the user using %rename
-   - Is it possible for 'configure' to find out if m3pp is installed
-     and to invoke it for generated Modula3 files?
-   - It would be better to separate an arguments purpose and its name,
-     because an output variable with name "OUTPUT" is not very descriptive.
-     In case of PLPlot this could be solved by typedefs
-     that assign special purposes to the array types.
-   - Can one interpret $n_basetype as the identifier matched with SWIGTYPE ?
-
-  SWIG's odds:
-   - arguments of type (Node *) for SWIG functions
-     should be most often better (const Node *):
-     Swig_symbol_qualified, Getattr, nodeType, parentNode
-   - unique identifier style instead of
-     NewString, Getattr, firstChild
-   - 'class'.name is qualified,
-     'enum'.name and 'enumitem'.name is not
-   - Swig_symbol_qualified() returns NIL for enumeration nodes
-
-   - Is there a function that creates a C representation of a SWIG type string?
-
-  ToDo:
-   - create WeakRefs only for resources returned by function marked with %newobject
-      -> part of output conversion
-   - clean typemap conception
-      - should a multi-typemap for m3wrapouttype skip the corresponding input parameters?
-        when yes - How to handle inout-arguments? In this case like in-argument.
-   - C++ classes
-   - C++ exceptions
-   - allow for moving RECORD and OBJECT definitions
-     to separate files, with the main type called T
-   - call-back functions
-   - special option: fast access to class members by pointer arithmetic,
-       member offsets can be determined by a C++ program that print them.
-   - emit enumeration definitions when its first item is declared,
-       currently enumerations are emitted at the beginning of the file
-
-  Done:
-   - addThrow should convert the typemap by itself
-      - not possible because routine for attaching mapped types to parameter nodes
-        won't work for the function node
-   - turning error codes into exceptions
-      -> part of output value checking
-   - create WeakRefs for resources allocated by the library
-      -> part of output conversion
-   - TRY..FINALLY..END; can be omitted
-      - if there is no m3wrapfreearg
-      - no exception can be raised in the body (empty RAISES) list
-*/
-
-#include "swigmod.h"
-
-#include <limits.h>		// for INT_MAX
-#include <ctype.h>
-
-#define USAGE_ARG_DIR "m3wrapargdir typemap expect values: in, out, inout\n"
-
-class MODULA3:public Language {
-public:
-  enum block_type { no_block, constant, variable, blocktype, revelation };
-
-private:
-  struct M3File {
-    String *f;
-    Hash *import;
-    block_type bt;
-    /* VC++ 6 doesn't allow the access to 'no_block'
-       if it is a private member of MODULA3 class */
-    M3File():f(NewString("")), import(NewHash()), bt(no_block) {
-    }
-    ~M3File() {
-      Delete(f);
-      Delete(import);
-    }
-
-    /* -----------------------------------------------------------------------------
-     * enterBlock()
-     *
-     * Make sure that a given declaration is written to the right declaration block,
-     * that is constants are written after "CONST" and so on ...
-     * ----------------------------------------------------------------------------- */
-    void enterBlock(block_type newbt) {
-      static const char *ident[] = { "", "\nCONST\n", "\nVAR\n", "\nTYPE\n", "\nREVEAL\n" };
-#ifdef DEBUG
-      if ((bt < 0) || (4 < bt)) {
-	printf("bt %d out of range\n", bt);
-      }
-#endif
-      if (newbt != bt) {
-	Append(f, ident[newbt]);
-	bt = newbt;
-      }
-    }
-
-  };
-
-  static const char *usage;
-  const String *empty_string;
-
-  Hash *swig_types_hash;
-  File *f_begin;
-  File *f_runtime;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-
-  bool proxy_flag;		// Flag for generating proxy classes
-  bool have_default_constructor_flag;
-  bool native_function_flag;	// Flag for when wrapping a native function
-  bool enum_constant_flag;	// Flag for when wrapping an enum or constant
-  bool static_flag;		// Flag for when wrapping a static functions or member variables
-  bool variable_wrapper_flag;	// Flag for when wrapping a nonstatic member variable
-  bool wrapping_member_flag;	// Flag for when wrapping a member variable/enum/const
-  bool global_variable_flag;	// Flag for when wrapping a global variable
-  bool old_variable_names;	// Flag for old style variable names in the intermediary class
-  bool unsafe_module;
-
-  String *m3raw_name;		// raw interface name
-  M3File m3raw_intf;		// raw interface
-  M3File m3raw_impl;		// raw implementation (usually empty)
-  String *m3wrap_name;		// wrapper module
-  M3File m3wrap_intf;
-  M3File m3wrap_impl;
-  String *m3makefile;
-  String *targetlibrary;
-  String *proxy_class_def;
-  String *proxy_class_code;
-  String *proxy_class_name;
-  String *variable_name;	//Name of a variable being wrapped
-  String *variable_type;	//Type of this variable
-  Hash *enumeration_coll;	//Collection of all enumerations.
-  /* The items are nodes with members:
-     "items"  - hash of with key 'itemname' and content 'itemvalue'
-     "max"    - maximum value in item list
-   */
-  String *constant_values;
-  String *constantfilename;
-  String *renamefilename;
-  String *typemapfilename;
-  String *m3raw_imports;	//intermediary class imports from %pragma
-  String *module_imports;	//module imports from %pragma
-  String *m3raw_baseclass;	//inheritance for intermediary class class from %pragma
-  String *module_baseclass;	//inheritance for module class from %pragma
-  String *m3raw_interfaces;	//interfaces for intermediary class class from %pragma
-  String *module_interfaces;	//interfaces for module class from %pragma
-  String *m3raw_class_modifiers;	//class modifiers for intermediary class overriden by %pragma
-  String *m3wrap_modifiers;	//class modifiers for module class overriden by %pragma
-  String *upcasts_code;		//C++ casts for inheritance hierarchies C++ code
-  String *m3raw_cppcasts_code;	//C++ casts up inheritance hierarchies intermediary class code
-  String *destructor_call;	//C++ destructor call if any
-  String *outfile;
-
-  enum type_additions { none, pointer, reference };
-
-public:
-
-  /* -----------------------------------------------------------------------------
-   * MODULA3()
-   * ----------------------------------------------------------------------------- */
-
-MODULA3():
-  empty_string(NewString("")),
-      swig_types_hash(NULL),
-      f_begin(NULL),
-      f_runtime(NULL),
-      f_header(NULL),
-      f_wrappers(NULL),
-      f_init(NULL),
-      proxy_flag(true),
-      have_default_constructor_flag(false),
-      native_function_flag(false),
-      enum_constant_flag(false),
-      static_flag(false),
-      variable_wrapper_flag(false),
-      wrapping_member_flag(false),
-      global_variable_flag(false),
-      old_variable_names(false),
-      unsafe_module(false),
-      m3raw_name(NULL),
-      m3raw_intf(),
-      m3raw_impl(),
-      m3wrap_name(NULL),
-      m3wrap_intf(),
-      m3wrap_impl(),
-      m3makefile(NULL),
-      targetlibrary(NULL),
-      proxy_class_def(NULL),
-      proxy_class_code(NULL),
-      proxy_class_name(NULL),
-      variable_name(NULL),
-      variable_type(NULL),
-      enumeration_coll(NULL),
-      constant_values(NULL),
-      constantfilename(NULL),
-      renamefilename(NULL),
-      typemapfilename(NULL),
-      m3raw_imports(NULL),
-      module_imports(NULL),
-      m3raw_baseclass(NULL),
-      module_baseclass(NULL),
-      m3raw_interfaces(NULL),
-      module_interfaces(NULL),
-      m3raw_class_modifiers(NULL),
-      m3wrap_modifiers(NULL),
-      upcasts_code(NULL),
-      m3raw_cppcasts_code(NULL),
-      destructor_call(NULL),
-      outfile(NULL) {
-  }
-
-  /************** some utility functions ***************/
-
-  /* -----------------------------------------------------------------------------
-   * getMappedType()
-   *
-   * Return the type of 'p' mapped by 'map'.
-   * Print a standard warning if 'p' can't be mapped.
-   * ----------------------------------------------------------------------------- */
-
-  String *getMappedType(Node *p, const char *map) {
-    String *mapattr = NewString("tmap:");
-    Append(mapattr, map);
-
-    String *tm = Getattr(p, mapattr);
-    if (tm == NIL) {
-      Swig_warning(WARN_MODULA3_TYPEMAP_TYPE_UNDEF, input_file, line_number,
-		   "No '%s' typemap defined for type '%s'\n", map, SwigType_str(Getattr(p, "type"), 0));
-    }
-    Delete(mapattr);
-    return tm;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getMappedTypeNew()
-   *
-   * Similar to getMappedType but uses Swig_type_lookup_new.
-   * ----------------------------------------------------------------------------- */
-
-  String *getMappedTypeNew(Node *n, const char *map, const char *lname = "", bool warn = true) {
-    String *tm = Swig_typemap_lookup(map, n, lname, 0);
-    if ((tm == NIL) && warn) {
-      Swig_warning(WARN_MODULA3_TYPEMAP_TYPE_UNDEF, input_file, line_number,
-		   "No '%s' typemap defined for type '%s'\n", map, SwigType_str(Getattr(n, "type"), 0));
-    }
-    return tm;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * attachMappedType()
-   *
-   * Obtain the type mapped by 'map' and attach it to the node
-   * ----------------------------------------------------------------------------- */
-
-  void attachMappedType(Node *n, const char *map, const char *lname = "") {
-    String *tm = Swig_typemap_lookup(map, n, lname, 0);
-    if (tm != NIL) {
-      String *attr = NewStringf("tmap:%s", map);
-      Setattr(n, attr, tm);
-      Delete(attr);
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * skipIgnored()
-   *
-   * Skip all parameters that have 'numinputs=0'
-   * with respect to a given typemap.
-   * ----------------------------------------------------------------------------- */
-
-  Node *skipIgnored(Node *p, const char *map) {
-    String *niattr = NewStringf("tmap:%s:numinputs", map);
-    String *nextattr = NewStringf("tmap:%s:next", map);
-
-    while ((p != NIL) && checkAttribute(p, niattr, "0")) {
-      p = Getattr(p, nextattr);
-    }
-
-    Delete(nextattr);
-    Delete(niattr);
-    return p;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * isInParam()
-   * isOutParam()
-   *
-   * Check if the parameter is intended for input or for output.
-   * ----------------------------------------------------------------------------- */
-
-  bool isInParam(Node *p) {
-    String *dir = Getattr(p, "tmap:m3wrapargdir");
-//printf("dir for %s: %s\n", Char(Getattr(p,"name")), Char(dir));
-    if ((dir == NIL) || (Strcmp(dir, "in") == 0)
-	|| (Strcmp(dir, "inout") == 0)) {
-      return true;
-    } else if (Strcmp(dir, "out") == 0) {
-      return false;
-    } else {
-      printf("%s", USAGE_ARG_DIR);
-      return false;
-    }
-  }
-
-  bool isOutParam(Node *p) {
-    String *dir = Getattr(p, "tmap:m3wrapargdir");
-    if ((dir == NIL) || (Strcmp(dir, "in") == 0)) {
-      return false;
-    } else if ((Strcmp(dir, "out") == 0) || (Strcmp(dir, "inout") == 0)) {
-      return true;
-    } else {
-      printf("%s", USAGE_ARG_DIR);
-      return false;
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * printAttrs()
-   *
-   * For debugging: Show all attributes of a node and their values.
-   * ----------------------------------------------------------------------------- */
-  void printAttrs(Node *n) {
-    Iterator it;
-    for (it = First(n); it.key != NIL; it = Next(it)) {
-      printf("%s = %s\n", Char(it.key), Char(Getattr(n, it.key)));
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * hasPrefix()
-   *
-   * Check if a string have a given prefix.
-   * ----------------------------------------------------------------------------- */
-  bool hasPrefix(const String *str, const String *prefix) {
-    int len_prefix = Len(prefix);
-    return (Len(str) > len_prefix)
-	&& (Strncmp(str, prefix, len_prefix) == 0);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getQualifiedName()
-   *
-   * Return fully qualified identifier of n.
-   * ----------------------------------------------------------------------------- */
-#if 0
-  // Swig_symbol_qualified returns NIL for enumeration nodes
-  String *getQualifiedName(Node *n) {
-    String *qual = Swig_symbol_qualified(n);
-    String *name = Getattr(n, "name");
-    if (hasContent(qual)) {
-      return NewStringf("%s::%s", qual, name);
-    } else {
-      return name;
-    }
-  }
-#else
-  String *getQualifiedName(Node *n) {
-    String *name = Copy(Getattr(n, "name"));
-    n = parentNode(n);
-    while (n != NIL) {
-      const String *type = nodeType(n);
-      if ((Strcmp(type, "class") == 0) || (Strcmp(type, "struct") == 0) || (Strcmp(type, "namespace") == 0)) {
-	String *newname = NewStringf("%s::%s", Getattr(n, "name"), name);
-	Delete(name);
-	//name = newname;
-	// Hmpf, the class name is already qualified.
-	return newname;
-      }
-      n = parentNode(n);
-    }
-    //printf("qualified name: %s\n", Char(name));
-    return name;
-  }
-#endif
-
-  /* -----------------------------------------------------------------------------
-   * nameToModula3()
-   *
-   * Turn usual C identifiers like "this_is_an_identifier"
-   * into usual Modula 3 identifier like "thisIsAnIdentifier"
-   * ----------------------------------------------------------------------------- */
-  String *nameToModula3(const String *sym, bool leadingCap) {
-    int len_sym = Len(sym);
-    char *csym = Char(sym);
-    char *m3sym = new char[len_sym + 1];
-    int i, j;
-    bool cap = leadingCap;
-    for (i = 0, j = 0; j < len_sym; j++) {
-      char c = csym[j];
-      if ((c == '_') || (c == ':')) {
-	cap = true;
-      } else {
-	if (isdigit(c)) {
-	  m3sym[i] = c;
-	  cap = true;
-	} else {
-	  if (cap) {
-	    m3sym[i] = (char)toupper(c);
-	  } else {
-	    m3sym[i] = (char)tolower(c);
-	  }
-	  cap = false;
-	}
-	i++;
-      }
-    }
-    m3sym[i] = 0;
-    String *result = NewString(m3sym);
-    delete[]m3sym;
-    return result;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * capitalizeFirst()
-   *
-   * Make the first character upper case.
-   * ----------------------------------------------------------------------------- */
-  String *capitalizeFirst(const String *str) {
-    return NewStringf("%c%s", toupper(*Char(str)), Char(str) + 1);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * prefixedNameToModula3()
-   *
-   * If feature modula3:oldprefix and modula3:newprefix is present
-   * and the C identifier has leading 'oldprefix'
-   * then it is replaced by the 'newprefix'.
-   * The rest is converted to Modula style.
-   * ----------------------------------------------------------------------------- */
-  String *prefixedNameToModula3(Node *n, const String *sym, bool leadingCap) {
-    String *oldPrefix = Getattr(n, "feature:modula3:oldprefix");
-    String *newPrefix = Getattr(n, "feature:modula3:newprefix");
-    String *result = NewString("");
-    char *short_sym = Char(sym);
-    // if at least one prefix feature is present
-    // the replacement takes place
-    if ((oldPrefix != NIL) || (newPrefix != NIL)) {
-      if ((oldPrefix == NIL) || hasPrefix(sym, oldPrefix)) {
-	short_sym += Len(oldPrefix);
-	if (newPrefix != NIL) {
-	  Append(result, newPrefix);
-	}
-      }
-    }
-    String *suffix = nameToModula3(short_sym, leadingCap || hasContent(newPrefix));
-    Append(result, suffix);
-    Delete(suffix);
-    return result;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * hasContent()
-   *
-   * Check if the string exists and contains something.
-   * ----------------------------------------------------------------------------- */
-  bool hasContent(const String *str) {
-    return (str != NIL) && (Strcmp(str, "") != 0);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * openWriteFile()
-   *
-   * Caution: The file must be freshly allocated and will be destroyed
-   *          by this routine.
-   * ----------------------------------------------------------------------------- */
-
-  File *openWriteFile(String *name) {
-    File *file = NewFile(name, "w", SWIG_output_files());
-    if (!file) {
-      FileErrorDisplay(name);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Delete(name);
-    return file;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * aToL()
-   *
-   * like atol but with additional user warning
-   * ----------------------------------------------------------------------------- */
-
-  long aToL(const String *value) {
-    char *endptr;
-    long numvalue = strtol(Char(value), &endptr, 0);
-    if (*endptr != 0) {
-      Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "The string <%s> does not denote a numeric value.\n", value);
-    }
-    return numvalue;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * strToL()
-   *
-   * like strtol but returns if the conversion was successful
-   * ----------------------------------------------------------------------------- */
-
-  bool strToL(const String *value, long &numvalue) {
-    char *endptr;
-    numvalue = strtol(Char(value), &endptr, 0);
-    return (*endptr == 0);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * evalExpr()
-   *
-   * Evaluate simple expression as they may occur in "enumvalue" attributes.
-   * ----------------------------------------------------------------------------- */
-
-  bool evalExpr(String *value, long &numvalue) {
-    // Split changes file status of String and thus cannot receive 'const' strings
-//printf("evaluate <%s>\n", Char(value));
-    List *summands = Split(value, '+', INT_MAX);
-    Iterator sm = First(summands);
-    numvalue = 0;
-    for (; sm.item != NIL; sm = Next(sm)) {
-      String *smvalue = Getattr(constant_values, sm.item);
-      long smnumvalue;
-      if (smvalue != NIL) {
-	if (!strToL(smvalue, smnumvalue)) {
-//printf("evaluation: abort 0 <%s>\n", Char(smvalue));
-	  return false;
-	}
-      } else {
-	if (!strToL(sm.item, smnumvalue)) {
-//printf("evaluation: abort 1 <%s>\n", Char(sm));
-	  return false;
-	}
-      }
-      numvalue += smnumvalue;
-    }
-//printf("evaluation: return %ld\n", numvalue);
-    return true;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * log2()
-   *
-   * Determine the position of the single bit of a power of two.
-   * Returns true if the given number is a power of two.
-   * ----------------------------------------------------------------------------- */
-
-  bool log2(long n, long &exp) {
-    exp = 0;
-    while (n > 0) {
-      if ((n & 1) != 0) {
-	return n == 1;
-      }
-      exp++;
-      n >>= 1;
-    }
-    return false;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * writeArg
-   *
-   * Write a function argument or RECORD entry definition.
-   * Bundles arguments of same type and default value.
-   * 'name.next==NIL' denotes the end of the entry or argument list.
-   * ----------------------------------------------------------------------------- */
-
-  bool equalNilStr(const String *str0, const String *str1) {
-    if (str0 == NIL) {
-      return (str1 == NIL);
-      //return (str0==NIL) == (str1==NIL);
-    } else {
-      return (str1 != NIL) && (Cmp(str0, str1) == 0);
-      //return Cmp(str0,str1)==0;
-    }
-  }
-
-  struct writeArgState {
-    String *mode, *name, *type, *value;
-    bool hold;
-     writeArgState():mode(NIL), name(NIL), type(NIL), value(NIL), hold(false) {
-    }
-  };
-
-  void writeArg(File *f, writeArgState & state, String *mode, String *name, String *type, String *value) {
-    /* skip the first argument,
-       only store the information for the next call in this case */
-    if (state.name != NIL) {
-      if ((!state.hold) && (state.mode != NIL)) {
-	Printf(f, "%s ", state.mode);
-      }
-      if ((name != NIL) && equalNilStr(state.mode, mode) && equalNilStr(state.type, type) && (state.value == NIL) && (value == NIL)
-	  /* the same expression may have different values
-	     due to side effects of the called function */
-	  /*equalNilStr(state.value,value) */
-	  ) {
-	Printf(f, "%s, ", state.name);
-	state.hold = true;
-      } else {
-	Append(f, state.name);
-	if (state.type != NIL) {
-	  Printf(f, ": %s", state.type);
-	}
-	if (state.value != NIL) {
-	  Printf(f, ":= %s", state.value);
-	}
-	Append(f, ";\n");
-	state.hold = false;
-      }
-    }
-    /* at the next call the current argument will be the previous one */
-    state.mode = mode;
-    state.name = name;
-    state.type = type;
-    state.value = value;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getProxyName()
-   *
-   * Test to see if a type corresponds to something wrapped with a proxy class
-   * Return NULL if not otherwise the proxy class name
-   * ----------------------------------------------------------------------------- */
-
-  String *getProxyName(SwigType *t) {
-    if (proxy_flag) {
-      Node *n = classLookup(t);
-      if (n) {
-	return Getattr(n, "sym:name");
-      }
-    }
-    return NULL;
-  }
-
-  /*************** language processing ********************/
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-
-    SWIG_library_directory("modula3");
-
-    // Look for certain command line options
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-generateconst") == 0) {
-	  if (argv[i + 1]) {
-	    constantfilename = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-generaterename") == 0) {
-	  if (argv[i + 1]) {
-	    renamefilename = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-generatetypemap") == 0) {
-	  if (argv[i + 1]) {
-	    typemapfilename = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-noproxy") == 0) {
-	  Swig_mark_arg(i);
-	  proxy_flag = false;
-	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
-	  Swig_mark_arg(i);
-	  old_variable_names = true;
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  Printf(stdout, "%s\n", usage);
-	}
-      }
-    }
-
-    // Add a symbol to the parser for conditional compilation
-    Preprocessor_define("SWIGMODULA3 1", 0);
-
-    // Add typemap definitions
-    SWIG_typemap_lang("modula3");
-    SWIG_config_file("modula3.swg");
-
-    allow_overloading();
-  }
-
-  /* ---------------------------------------------------------------------
-   * top()
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-    if (hasContent(constantfilename) || hasContent(renamefilename) || hasContent(typemapfilename)) {
-      int result = SWIG_OK;
-      if (hasContent(constantfilename)) {
-	result = generateConstantTop(n) && result;
-      }
-      if (hasContent(renamefilename)) {
-	result = generateRenameTop(n) && result;
-      }
-      if (hasContent(typemapfilename)) {
-	result = generateTypemapTop(n) && result;
-      }
-      return result;
-    } else {
-      return generateM3Top(n);
-    }
-  }
-
-  void scanConstant(File *file, Node *n) {
-    Node *child = firstChild(n);
-    while (child != NIL) {
-      String *constname = NIL;
-      String *type = nodeType(child);
-      if ((Strcmp(type, "enumitem") == 0)
-	  || (Strcmp(type, "constant") == 0)) {
-#if 1
-	constname = getQualifiedName(child);
-#else
-	constname = Getattr(child, "value");
-	if ((!hasContent(constname))
-	    || (('0' <= *Char(constname)) && (*Char(constname) <= '9'))) {
-	  constname = Getattr(child, "name");
-	}
-#endif
-      }
-      if (constname != NIL) {
-	Printf(file, "  printf(\"%%%%constnumeric(%%Lg) %s;\\n\", (long double)%s);\n", constname, constname);
-      }
-      scanConstant(file, child);
-      child = nextSibling(child);
-    }
-  }
-
-  int generateConstantTop(Node *n) {
-    File *file = openWriteFile(NewStringf("%s.c", constantfilename));
-    if (CPlusPlus) {
-      Printf(file, "#include <cstdio>\n");
-    } else {
-      Printf(file, "#include <stdio.h>\n");
-    }
-    Printf(file, "#include \"%s\"\n", input_file);
-    Printf(file, "\n");
-    Printf(file, "int main (int argc, char *argv[]) {\n");
-    Printf(file, "\
-/*This progam must work for floating point numbers and integers.\n\
-  Thus all numbers are converted to double precision floating point format.*/\n");
-    scanConstant(file, n);
-    Printf(file, "  return 0;\n");
-    Printf(file, "}\n");
-    Delete(file);
-    return SWIG_OK;
-  }
-
-  void scanRename(File *file, Node *n) {
-    Node *child = firstChild(n);
-    while (child != NIL) {
-      String *type = nodeType(child);
-      if (Strcmp(type, "cdecl") == 0) {
-	ParmList *p = Getattr(child, "parms");
-	if (p != NIL) {
-	  String *name = getQualifiedName(child);
-	  String *m3name = nameToModula3(name, true);
-	  /*don't know how to get the original C type identifiers */
-	  //String *arguments = createCSignature (child);
-	  Printf(file, "%%rename(\"%s\") %s;\n", m3name, name);
-	  /*Printf(file, "%%rename(\"%s\") %s %s(%s);\n",
-	     m3name, Getattr(n,"type"), name, arguments); */
-	  Delete(name);
-	  Delete(m3name);
-	  //Delete (arguments);
-	}
-      }
-      scanRename(file, child);
-      child = nextSibling(child);
-    }
-  }
-
-  int generateRenameTop(Node *n) {
-    File *file = openWriteFile(NewStringf("%s.i", renamefilename));
-    Printf(file, "\
-/* This file was generated from %s\n\
-   by SWIG with option -generaterename. */\n\
-\n", input_file);
-    scanRename(file, n);
-    Delete(file);
-    return SWIG_OK;
-  }
-
-  void scanTypemap(File *file, Node *n) {
-    Node *child = firstChild(n);
-    while (child != NIL) {
-      String *type = nodeType(child);
-      //printf("nodetype %s\n", Char(type));
-      String *storage = Getattr(child, "storage");
-      if ((Strcmp(type, "class") == 0) || ((Strcmp(type, "cdecl") == 0) && (storage != NIL)
-					   && (Strcmp(storage, "typedef") == 0))) {
-	String *name = getQualifiedName(child);
-	String *m3name = nameToModula3(name, true);
-	Printf(file, "%%typemap(\"m3wrapintype\") %s %%{%s%%}\n", name, m3name);
-	Printf(file, "%%typemap(\"m3rawintype\") %s %%{%s%%}\n", name, m3name);
-	Printf(file, "\n");
-      }
-      scanTypemap(file, child);
-      child = nextSibling(child);
-    }
-  }
-
-  int generateTypemapTop(Node *n) {
-    File *file = openWriteFile(NewStringf("%s.i", typemapfilename));
-    Printf(file, "\
-/* This file was generated from %s\n\
-   by SWIG with option -generatetypemap. */\n\
-\n", input_file);
-    scanTypemap(file, n);
-    Delete(file);
-    return SWIG_OK;
-  }
-
-  int generateM3Top(Node *n) {
-    /* Initialize all of the output files */
-    outfile = Getattr(n, "outfile");
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-
-    m3makefile = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-
-    Swig_register_filebyname("m3rawintf", m3raw_intf.f);
-    Swig_register_filebyname("m3rawimpl", m3raw_impl.f);
-    Swig_register_filebyname("m3wrapintf", m3wrap_intf.f);
-    Swig_register_filebyname("m3wrapimpl", m3wrap_impl.f);
-    Swig_register_filebyname("m3makefile", m3makefile);
-
-    swig_types_hash = NewHash();
-
-    String *name = Getattr(n, "name");
-    // Make the intermediary class and module class names. The intermediary class name can be set in the module directive.
-    Node *optionsnode = Getattr(Getattr(n, "module"), "options");
-    if (optionsnode != NIL) {
-      String *m3raw_name_tmp = Getattr(optionsnode, "m3rawname");
-      if (m3raw_name_tmp != NIL) {
-	m3raw_name = Copy(m3raw_name_tmp);
-      }
-    }
-    if (m3raw_name == NIL) {
-      m3raw_name = NewStringf("%sRaw", name);
-    }
-    Setattr(m3wrap_impl.import, m3raw_name, "");
-
-    m3wrap_name = Copy(name);
-
-    proxy_class_def = NewString("");
-    proxy_class_code = NewString("");
-    m3raw_baseclass = NewString("");
-    m3raw_interfaces = NewString("");
-    m3raw_class_modifiers = NewString("");	// package access only to the intermediary class by default
-    m3raw_imports = NewString("");
-    m3raw_cppcasts_code = NewString("");
-    m3wrap_modifiers = NewString("public");
-    module_baseclass = NewString("");
-    module_interfaces = NewString("");
-    module_imports = NewString("");
-    upcasts_code = NewString("");
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGMODULA3\n#define SWIGMODULA3\n#endif\n\n");
-
-    Swig_name_register("wrapper", "Modula3_%f");
-    if (old_variable_names) {
-      Swig_name_register("set", "set_%n%v");
-      Swig_name_register("get", "get_%n%v");
-    }
-
-    Printf(f_wrappers, "\n#ifdef __cplusplus\n");
-    Printf(f_wrappers, "extern \"C\" {\n");
-    Printf(f_wrappers, "#endif\n\n");
-
-    constant_values = NewHash();
-    scanForConstPragmas(n);
-    enumeration_coll = NewHash();
-    collectEnumerations(enumeration_coll, n);
-
-    /* Emit code */
-    Language::top(n);
-
-    // Generate m3makefile
-    // This will be unnecessary if SWIG is invoked from Quake.
-    {
-      File *file = openWriteFile(NewStringf("%sm3makefile", SWIG_output_directory()));
-
-      Printf(file, "%% automatically generated quake file for %s\n\n", name);
-
-      /* Write the fragments written by '%insert'
-         collected while 'top' processed the parse tree */
-      Printv(file, m3makefile, NIL);
-
-      Printf(file, "import(\"libm3\")\n");
-      //Printf(file, "import_lib(\"%s\",\"/usr/lib\")\n", name);
-      Printf(file, "module(\"%s\")\n", m3raw_name);
-      Printf(file, "module(\"%s\")\n\n", m3wrap_name);
-
-      if (targetlibrary != NIL) {
-	Printf(file, "library(\"%s\")\n", targetlibrary);
-      } else {
-	Printf(file, "library(\"m3%s\")\n", name);
-      }
-      Delete(file);
-    }
-
-    // Generate the raw interface
-    {
-      File *file = openWriteFile(NewStringf("%s%s.i3", SWIG_output_directory(), m3raw_name));
-
-      emitBanner(file);
-
-      Printf(file, "INTERFACE %s;\n\n", m3raw_name);
-
-      emitImportStatements(m3raw_intf.import, file);
-      Printf(file, "\n");
-
-      // Write the interface generated within 'top'
-      Printv(file, m3raw_intf.f, NIL);
-
-      Printf(file, "\nEND %s.\n", m3raw_name);
-      Delete(file);
-    }
-
-    // Generate the raw module
-    {
-      File *file = openWriteFile(NewStringf("%s%s.m3", SWIG_output_directory(), m3raw_name));
-
-      emitBanner(file);
-
-      Printf(file, "MODULE %s;\n\n", m3raw_name);
-
-      emitImportStatements(m3raw_impl.import, file);
-      Printf(file, "\n");
-
-      // will be empty usually
-      Printv(file, m3raw_impl.f, NIL);
-
-      Printf(file, "BEGIN\nEND %s.\n", m3raw_name);
-      Delete(file);
-    }
-
-    // Generate the interface for the comfort wrappers
-    {
-      File *file = openWriteFile(NewStringf("%s%s.i3", SWIG_output_directory(), m3wrap_name));
-
-      emitBanner(file);
-
-      Printf(file, "INTERFACE %s;\n", m3wrap_name);
-
-      emitImportStatements(m3wrap_intf.import, file);
-      Printf(file, "\n");
-
-      {
-	Iterator it = First(enumeration_coll);
-	if (it.key != NIL) {
-	  Printf(file, "TYPE\n");
-	}
-	for (; it.key != NIL; it = Next(it)) {
-	  Printf(file, "\n");
-	  emitEnumeration(file, it.key, it.item);
-	}
-      }
-
-      // Add the wrapper methods
-      Printv(file, m3wrap_intf.f, NIL);
-
-      // Finish off the class
-      Printf(file, "\nEND %s.\n", m3wrap_name);
-      Delete(file);
-    }
-
-    // Generate the wrapper routines implemented in Modula 3
-    {
-      File *file = openWriteFile(NewStringf("%s%s.m3", SWIG_output_directory(), m3wrap_name));
-
-      emitBanner(file);
-
-      if (unsafe_module) {
-	Printf(file, "UNSAFE ");
-      }
-      Printf(file, "MODULE %s;\n\n", m3wrap_name);
-
-      emitImportStatements(m3wrap_impl.import, file);
-      Printf(file, "\n");
-
-      // Add the wrapper methods
-      Printv(file, m3wrap_impl.f, NIL);
-
-      Printf(file, "\nBEGIN\nEND %s.\n", m3wrap_name);
-      Delete(file);
-    }
-
-    if (upcasts_code)
-      Printv(f_wrappers, upcasts_code, NIL);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "}\n");
-    Printf(f_wrappers, "#endif\n");
-
-    // Output a Modula 3 type wrapper class for each SWIG type
-    for (Iterator swig_type = First(swig_types_hash); swig_type.item != NIL; swig_type = Next(swig_type)) {
-      emitTypeWrapperClass(swig_type.key, swig_type.item);
-    }
-
-    Delete(swig_types_hash);
-    swig_types_hash = NULL;
-    Delete(constant_values);
-    constant_values = NULL;
-    Delete(enumeration_coll);
-    enumeration_coll = NULL;
-    Delete(m3raw_name);
-    m3raw_name = NULL;
-    Delete(m3raw_baseclass);
-    m3raw_baseclass = NULL;
-    Delete(m3raw_interfaces);
-    m3raw_interfaces = NULL;
-    Delete(m3raw_class_modifiers);
-    m3raw_class_modifiers = NULL;
-    Delete(m3raw_imports);
-    m3raw_imports = NULL;
-    Delete(m3raw_cppcasts_code);
-    m3raw_cppcasts_code = NULL;
-    Delete(proxy_class_def);
-    proxy_class_def = NULL;
-    Delete(proxy_class_code);
-    proxy_class_code = NULL;
-    Delete(m3wrap_name);
-    m3wrap_name = NULL;
-    Delete(m3wrap_modifiers);
-    m3wrap_modifiers = NULL;
-    Delete(targetlibrary);
-    targetlibrary = NULL;
-    Delete(module_baseclass);
-    module_baseclass = NULL;
-    Delete(module_interfaces);
-    module_interfaces = NULL;
-    Delete(module_imports);
-    module_imports = NULL;
-    Delete(upcasts_code);
-    upcasts_code = NULL;
-    Delete(constantfilename);
-    constantfilename = NULL;
-    Delete(renamefilename);
-    renamefilename = NULL;
-    Delete(typemapfilename);
-    typemapfilename = NULL;
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitBanner()
-   * ----------------------------------------------------------------------------- */
-
-  void emitBanner(File *f) {
-    Printf(f, "(*******************************************************************************\n");
-    Swig_banner_target_lang(f, " *");
-    Printf(f, "*******************************************************************************)\n\n");
-  }
-
-  /* ----------------------------------------------------------------------
-   * nativeWrapper()
-   * ---------------------------------------------------------------------- */
-
-  virtual int nativeWrapper(Node *n) {
-    String *wrapname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(wrapname, n))
-      return SWIG_ERROR;
-
-    if (Getattr(n, "type")) {
-      Swig_save("nativeWrapper", n, "name", NIL);
-      Setattr(n, "name", wrapname);
-      native_function_flag = true;
-      functionWrapper(n);
-      Swig_restore(n);
-      native_function_flag = false;
-    } else {
-      Swig_error(input_file, line_number, "No return type for %%native method %s.\n", Getattr(n, "wrap:name"));
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * functionWrapper()
-   * ---------------------------------------------------------------------- */
-
-  virtual int functionWrapper(Node *n) {
-    String *type = nodeType(n);
-    String *funcType = Getattr(n, "modula3:functype");
-    String *rawname = Getattr(n, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *capname = capitalizeFirst(symname);
-    //String *wname = Swig_name_wrapper(symname);
-
-    //printf("function: %s\n", Char(symname));
-    //printf(" purpose: %s\n", Char(funcType));
-
-    if (Strcmp(type, "cdecl") == 0) {
-      if (funcType == NIL) {
-	// no wrapper needed for plain functions
-	emitM3RawPrototype(n, rawname, symname);
-	emitM3Wrapper(n, symname);
-      } else if (Strcmp(funcType, "method") == 0) {
-	Setattr(n, "modula3:funcname", capname);
-	emitCWrapper(n, capname);
-	emitM3RawPrototype(n, capname, capname);
-	emitM3Wrapper(n, capname);
-      } else if (Strcmp(funcType, "accessor") == 0) {
-	/*
-	 * Generate the proxy class properties for public member variables.
-	 * Not for enums and constants.
-	 */
-	if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
-	  // Capitalize the first letter in the function name
-	  Setattr(n, "proxyfuncname", capname);
-	  Setattr(n, "imfuncname", symname);
-	  if (hasPrefix(capname, "Set")) {
-	    Setattr(n, "modula3:setname", capname);
-	  } else {
-	    Setattr(n, "modula3:getname", capname);
-	  }
-
-	  emitCWrapper(n, capname);
-	  emitM3RawPrototype(n, capname, capname);
-	  emitM3Wrapper(n, capname);
-	  //proxyClassFunctionHandler(n);
-	}
-#ifdef DEBUG
-      } else {
-	Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Function type <%s> unknown.\n", Char(funcType));
-#endif
-      }
-    } else if ((Strcmp(type, "constructor") == 0) || (Strcmp(type, "destructor") == 0)) {
-      emitCWrapper(n, capname);
-      emitM3RawPrototype(n, capname, capname);
-      emitM3Wrapper(n, capname);
-    }
-// a Java relict
-#if 0
-    if (!(proxy_flag && is_wrapping_class()) && !enum_constant_flag) {
-      emitM3Wrapper(n, capname);
-    }
-#endif
-
-    Delete(capname);
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * emitCWrapper()
-   *
-   * Generate the wrapper in C which calls C++ methods.
-   * ---------------------------------------------------------------------- */
-
-  virtual int emitCWrapper(Node *n, const String *wname) {
-    String *rawname = Getattr(n, "name");
-    String *c_return_type = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *body = NewString("");
-    Hash *throws_hash = NewHash();
-    ParmList *l = Getattr(n, "parms");
-    SwigType *t = Getattr(n, "type");
-    String *symname = Getattr(n, "sym:name");
-
-    if (!Getattr(n, "sym:overloaded")) {
-      if (!addSymbol(wname, n)) {
-	return SWIG_ERROR;
-      }
-    }
-    // A new wrapper function object
-    Wrapper *f = NewWrapper();
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("ctype", l, f);
-
-    /* Get return types */
-    {
-      String *tm = getMappedTypeNew(n, "ctype", "");
-      if (tm != NIL) {
-	Printf(c_return_type, "%s", tm);
-      }
-    }
-
-    bool is_void_return = (Cmp(c_return_type, "void") == 0);
-    if (!is_void_return) {
-      Wrapper_add_localv(f, "cresult", c_return_type, "cresult = 0", NIL);
-    }
-
-    Printv(f->def, " SWIGEXPORT ", c_return_type, " ", wname, "(", NIL);
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    // Generate signature and argument conversion for C wrapper
-    {
-      Parm *p;
-      attachParameterNames(n, "tmap:name", "c:wrapname", "m3arg%d");
-      bool gencomma = false;
-      for (p = skipIgnored(l, "in"); p; p = skipIgnored(p, "in")) {
-
-	String *arg = Getattr(p, "c:wrapname");
-	{
-	  /* Get the ctype types of the parameter */
-	  String *c_param_type = getMappedType(p, "ctype");
-	  // Add parameter to C function
-	  Printv(f->def, gencomma ? ", " : "", c_param_type, " ", arg, NIL);
-	  Delete(c_param_type);
-	  gencomma = true;
-	}
-
-	// Get typemap for this argument
-	String *tm = getMappedType(p, "in");
-	if (tm != NIL) {
-	  addThrows(throws_hash, "in", p);
-	  Replaceall(tm, "$input", arg);
-	  Setattr(p, "emit:input", arg);	/*??? */
-	  Printf(f->code, "%s\n", tm);
-	  p = Getattr(p, "tmap:in:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    /* Insert constraint checking code */
-    {
-      Parm *p;
-      for (p = l; p;) {
-	String *tm = Getattr(p, "tmap:check");
-	if (tm != NIL) {
-	  addThrows(throws_hash, "check", p);
-	  Replaceall(tm, "$target", Getattr(p, "lname"));	/* deprecated */
-	  Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	  Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	  Printv(f->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:check:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    /* Insert cleanup code */
-    {
-      Parm *p;
-      for (p = l; p;) {
-	String *tm = Getattr(p, "tmap:freearg");
-	if (tm != NIL) {
-	  addThrows(throws_hash, "freearg", p);
-	  Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* deprecated */
-	  Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	  Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	  Printv(cleanup, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:freearg:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    /* Insert argument output code */
-    {
-      Parm *p;
-      for (p = l; p;) {
-	String *tm = Getattr(p, "tmap:argout");
-	if (tm != NIL) {
-	  addThrows(throws_hash, "argout", p);
-	  Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* deprecated */
-	  Replaceall(tm, "$target", Getattr(p, "lname"));	/* deprecated */
-	  Replaceall(tm, "$arg", Getattr(p, "emit:input"));	/* deprecated? */
-	  Replaceall(tm, "$result", "cresult");
-	  Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	  Printv(outarg, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:argout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    // Get any Modula 3 exception classes in the throws typemap
-    ParmList *throw_parm_list = NULL;
-    if ((throw_parm_list = Getattr(n, "catchlist"))) {
-      Swig_typemap_attach_parms("throws", throw_parm_list, f);
-      Parm *p;
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	addThrows(throws_hash, "throws", p);
-      }
-    }
-
-    Setattr(n, "wrap:name", wname);
-
-    // Now write code to make the function call
-    if (!native_function_flag) {
-      String *actioncode = emit_action(n);
-
-      /* Return value if necessary  */
-      String *tm;
-      if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-	addThrows(throws_hash, "out", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Replaceall(tm, "$target", "cresult");	/* deprecated */
-	Replaceall(tm, "$result", "cresult");
-	Printf(f->code, "%s", tm);
-	if (hasContent(tm))
-	  Printf(f->code, "\n");
-      } else {
-	Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(t, 0), rawname);
-      }
-      emit_return_variable(n, t, f);
-    }
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      String *tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0);
-      if (tm != NIL) {
-	addThrows(throws_hash, "newfree", n);
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if (!native_function_flag) {
-      String *tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0);
-      if (tm != NIL) {
-	Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* Finish C wrapper */
-    Printf(f->def, ") {");
-
-    if (!is_void_return)
-      Printv(f->code, "    return cresult;\n", NIL);
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", symname);
-
-    if (!is_void_return) {
-      Replaceall(f->code, "$null", "0");
-    } else {
-      Replaceall(f->code, "$null", "");
-    }
-
-    /* Dump the function out */
-    if (!native_function_flag) {
-      Wrapper_print(f, f_wrappers);
-    }
-
-    Delete(c_return_type);
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(body);
-    Delete(throws_hash);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * emitM3RawPrototype()
-   *
-   * Generate an EXTERNAL procedure declaration in Modula 3
-   * which is the interface to an existing C routine or a C wrapper.
-   * ---------------------------------------------------------------------- */
-
-  virtual int emitM3RawPrototype(Node *n, const String *cname, const String *m3name) {
-    String *im_return_type = NewString("");
-    //String   *symname = Getattr(n,"sym:name");
-    ParmList *l = Getattr(n, "parms");
-
-    /* Attach the non-standard typemaps to the parameter list. */
-    Swig_typemap_attach_parms("m3rawinmode", l, NULL);
-    Swig_typemap_attach_parms("m3rawintype", l, NULL);
-
-    /* Get return types */
-    bool has_return;
-    {
-      String *tm = getMappedTypeNew(n, "m3rawrettype", "");
-      if (tm != NIL) {
-	Printf(im_return_type, "%s", tm);
-      }
-      has_return = hasContent(tm);
-    }
-
-    /* cname is the original name if 'n' denotes a C function
-       and it is the relabeled name (sym:name) if 'n' denotes a C++ method or similar */
-    m3raw_intf.enterBlock(no_block);
-    Printf(m3raw_intf.f, "\n<* EXTERNAL %s *>\nPROCEDURE %s (", cname, m3name);
-
-    // Generate signature for raw interface
-    {
-      Parm *p;
-      writeArgState state;
-      attachParameterNames(n, "tmap:rawinname", "modula3:rawname", "arg%d");
-      for (p = skipIgnored(l, "m3rawintype"); p; p = skipIgnored(p, "m3rawintype")) {
-
-	/* Get argument passing mode, should be one of VALUE, VAR, READONLY */
-	String *mode = Getattr(p, "tmap:m3rawinmode");
-	String *argname = Getattr(p, "modula3:rawname");
-	String *im_param_type = getMappedType(p, "m3rawintype");
-	addImports(m3raw_intf.import, "m3rawintype", p);
-
-	writeArg(m3raw_intf.f, state, mode, argname, im_param_type, NIL);
-	if (im_param_type != NIL) {
-	  p = Getattr(p, "tmap:m3rawintype:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-      writeArg(m3raw_intf.f, state, NIL, NIL, NIL, NIL);
-    }
-
-    /* Finish M3 raw prototype */
-    Printf(m3raw_intf.f, ")");
-    // neither a C wrapper nor a plain C function may throw an exception
-    //generateThrowsClause(throws_hash, m3raw_intf.f);
-    if (has_return) {
-      Printf(m3raw_intf.f, ": %s", im_return_type);
-    }
-    Printf(m3raw_intf.f, ";\n");
-
-    Delete(im_return_type);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * variableWrapper()
-   * ----------------------------------------------------------------------- */
-
-  virtual int variableWrapper(Node *n) {
-    Language::variableWrapper(n);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * globalvariableHandler()
-   * ----------------------------------------------------------------------- */
-
-  virtual int globalvariableHandler(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    String *tm;
-
-    // Get the variable type
-    if ((tm = getMappedTypeNew(n, "m3wraptype", ""))) {
-      substituteClassname(t, tm);
-    }
-
-    variable_name = Getattr(n, "sym:name");
-    variable_type = Copy(tm);
-
-    // Get the variable type expressed in terms of Modula 3 equivalents of C types
-    if ((tm = getMappedTypeNew(n, "m3rawtype", ""))) {
-      m3raw_intf.enterBlock(no_block);
-      Printf(m3raw_intf.f, "\n<* EXTERNAL *> VAR %s: %s;\n", variable_name, tm);
-    }
-    // Output the property's accessor methods
-    /*
-       global_variable_flag = true;
-       int ret = Language::globalvariableHandler(n);
-       global_variable_flag = false;
-     */
-
-    Printf(m3wrap_impl.f, "\n\n");
-
-    //return ret;
-    return 1;
-  }
-
-  long getConstNumeric(Node *n) {
-    String *constnumeric = Getfeature(n, "constnumeric");
-    String *name = Getattr(n, "name");
-    long numvalue;
-    if (constnumeric == NIL) {
-      Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Feature 'constnumeric' is necessary to obtain value of %s.\n", name);
-      return 0;
-    } else if (!strToL(constnumeric, numvalue)) {
-      Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number,
-		   "The feature 'constnumeric' of %s specifies value <%s> which is not an integer constant.\n", name, constnumeric);
-      return 0;
-    } else {
-      return numvalue;
-    }
-  }
-
-  /* ------------------------------------------------------------------------
-   * generateIntConstant()
-   *
-   * Considers node as an integer constant definition
-   * and generate a Modula 3 constant definition.
-   * ------------------------------------------------------------------------ */
-  void generateIntConstant(Node *n, String *name) {
-    String *value = Getattr(n, "value");
-    String *type = Getfeature(n, "modula3:constint:type");
-    String *conv = Getfeature(n, "modula3:constint:conv");
-
-    if (name == NIL) {
-      name = Getattr(n, "sym:name");
-    }
-
-    long numvalue;
-    bool isSimpleNum = strToL(value, numvalue);
-    if (!isSimpleNum) {
-      numvalue = getConstNumeric(n);
-    }
-
-    String *m3value;
-    if ((conv == NIL) || ((Strcmp(conv, "set:int") != 0) && (Strcmp(conv, "int:set") != 0))) {
-      /* The original value of the constant has precedence over
-         'constnumeric' feature since we like to keep
-         the style (that is the base) of simple numeric constants */
-      if (isSimpleNum) {
-	if (hasPrefix(value, "0x")) {
-	  m3value = NewStringf("16_%s", Char(value) + 2);
-	} else if ((Len(value) > 1) && (*Char(value) == '0')) {
-	  m3value = NewStringf("8_%s", Char(value) + 1);
-	} else {
-	  m3value = Copy(value);
-	}
-	/* If we cannot easily obtain the value of a numeric constant,
-	   we use the results given by a C compiler. */
-      } else {
-	m3value = Copy(Getfeature(n, "constnumeric"));
-      }
-    } else {
-      // if the value can't be converted, it is ignored
-      if (convertInt(numvalue, numvalue, conv)) {
-	m3value = NewStringf("%d", numvalue);
-      } else {
-	m3value = NIL;
-      }
-    }
-
-    if (m3value != NIL) {
-      m3wrap_intf.enterBlock(constant);
-      Printf(m3wrap_intf.f, "%s", name);
-      if (hasContent(type)) {
-	Printf(m3wrap_intf.f, ": %s", type);
-      }
-      Printf(m3wrap_intf.f, " = %s;\n", m3value);
-      Delete(m3value);
-    }
-  }
-
-  /* -----------------------------------------------------------------------
-   * generateSetConstant()
-   *
-   * Considers node as a set constant definition
-   * and generate a Modula 3 constant definition.
-   * ------------------------------------------------------------------------ */
-  void generateSetConstant(Node *n, String *name) {
-    String *value = Getattr(n, "value");
-    String *type = Getfeature(n, "modula3:constset:type");
-    String *setname = Getfeature(n, "modula3:constset:set");
-    String *basename = Getfeature(n, "modula3:constset:base");
-    String *conv = Getfeature(n, "modula3:constset:conv");
-
-    m3wrap_intf.enterBlock(constant);
-
-    Printf(m3wrap_intf.f, "%s", name);
-    if (type != NIL) {
-      Printf(m3wrap_intf.f, ":%s ", type);
-    }
-    Printf(m3wrap_intf.f, " = %s{", setname);
-
-    long numvalue = 0;
-    if (!strToL(value, numvalue)) {
-      numvalue = getConstNumeric(n);
-    }
-    convertInt(numvalue, numvalue, conv);
-
-    bool isIntType = Strcmp(basename, "CARDINAL") == 0;
-    Hash *items = NIL;
-    if (!isIntType) {
-      Hash *enumeration = Getattr(enumeration_coll, basename);
-      if (enumeration == NIL) {
-	Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "There is no enumeration <%s> as needed for the set.\n", setname);
-	isIntType = true;
-      } else {
-	items = Getattr(enumeration, "items");
-      }
-    }
-
-    bool gencomma = false;
-    int bitpos = 0;
-    while (numvalue > 0) {
-      if ((numvalue & 1) != 0) {
-	if (isIntType) {
-	  if (gencomma) {
-	    Printv(m3wrap_intf.f, ",", NIL);
-	  }
-	  gencomma = true;
-	  Printf(m3wrap_intf.f, "%d", bitpos);
-	} else {
-	  char bitval[15];
-	  sprintf(bitval, "%d", bitpos);
-	  String *bitname = Getattr(items, bitval);
-	  if (bitname == NIL) {
-	    Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Enumeration <%s> has no value <%s>.\n", setname, bitval);
-	  } else {
-	    if (gencomma) {
-	      Printv(m3wrap_intf.f, ",", NIL);
-	    }
-	    gencomma = true;
-	    Printf(m3wrap_intf.f, "%s.%s", basename, bitname);
-	  }
-	}
-      }
-      numvalue >>= 1;
-      bitpos++;
-    }
-    Printf(m3wrap_intf.f, "};\n");
-  }
-
-  void generateConstant(Node *n) {
-    // any of the special interpretation disables the default behaviour
-    String *enumitem = Getfeature(n, "modula3:enumitem:name");
-    String *constset = Getfeature(n, "modula3:constset:name");
-    String *constint = Getfeature(n, "modula3:constint:name");
-    if (hasContent(enumitem) || hasContent(constset) || hasContent(constint)) {
-      if (hasContent(constset)) {
-	generateSetConstant(n, constset);
-      }
-      if (hasContent(constint)) {
-	generateIntConstant(n, constint);
-      }
-    } else {
-      String *value = Getattr(n, "value");
-      String *name = Getattr(n, "sym:name");
-      if (name == NIL) {
-	name = Getattr(n, "name");
-      }
-      m3wrap_intf.enterBlock(constant);
-      Printf(m3wrap_intf.f, "%s = %s;\n", name, value);
-    }
-  }
-
-  void emitEnumeration(File *file, String *name, Node *n) {
-    Printf(file, "%s = {", name);
-    int i;
-    bool gencomma = false;
-    int max = aToL(Getattr(n, "max"));
-    Hash *items = Getattr(n, "items");
-    for (i = 0; i <= max; i++) {
-      if (gencomma) {
-	Printf(file, ",");
-      }
-      Printf(file, "\n");
-      gencomma = true;
-      char numstr[15];
-      sprintf(numstr, "%d", i);
-      String *name = Getattr(items, numstr);
-      if (name != NIL) {
-	Printv(file, name, NIL);
-      } else {
-	Printf(file, "Dummy%d", i);
-      }
-    }
-    Printf(file, "\n};\n");
-  }
-
-  /* -----------------------------------------------------------------------
-   * constantWrapper()
-   *
-   * Handles constants and enumeration items.
-   * ------------------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    generateConstant(n);
-    return SWIG_OK;
-  }
-
-#if 0
-// enumerations are handled like constant definitions
-  /* -----------------------------------------------------------------------------
-   * enumDeclaration()
-   * ----------------------------------------------------------------------------- */
-
-  virtual int enumDeclaration(Node *n) {
-    String *symname = nameToModula3(Getattr(n, "sym:name"), true);
-    enumerationStart(symname);
-    int result = Language::enumDeclaration(n);
-    enumerationStop();
-    Delete(symname);
-    return result;
-  }
-#endif
-
-  /* -----------------------------------------------------------------------------
-   * enumvalueDeclaration()
-   * ----------------------------------------------------------------------------- */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    generateConstant(n);
-    /*
-       This call would continue processing in the constantWrapper
-       which cannot handle values like "RED+1".
-       return Language::enumvalueDeclaration(n);
-     */
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * pragmaDirective()
-   *
-   * Valid Pragmas:
-   * imclassbase            - base (extends) for the intermediary class
-   * imclassclassmodifiers  - class modifiers for the intermediary class
-   * imclasscode            - text (Modula 3 code) is copied verbatim to the intermediary class
-   * imclassimports         - import statements for the intermediary class
-   * imclassinterfaces      - interface (implements) for the intermediary class
-   *
-   * modulebase              - base (extends) for the module class
-   * moduleclassmodifiers    - class modifiers for the module class
-   * modulecode              - text (Modula 3 code) is copied verbatim to the module class
-   * moduleimports           - import statements for the module class
-   * moduleinterfaces        - interface (implements) for the module class
-   *
-   * ----------------------------------------------------------------------------- */
-
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *code = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-      if (Strcmp(lang, "modula3") == 0) {
-
-	String *strvalue = NewString(value);
-	Replaceall(strvalue, "\\\"", "\"");
-/*
-        bool isEnumItem = Strcmp(code, "enumitem") == 0;
-        bool isSetItem  = Strcmp(code, "setitem")  == 0;
-*/
-	if (Strcmp(code, "imclassbase") == 0) {
-	  Delete(m3raw_baseclass);
-	  m3raw_baseclass = Copy(strvalue);
-	} else if (Strcmp(code, "imclassclassmodifiers") == 0) {
-	  Delete(m3raw_class_modifiers);
-	  m3raw_class_modifiers = Copy(strvalue);
-	} else if (Strcmp(code, "imclasscode") == 0) {
-	  Printf(m3raw_intf.f, "%s\n", strvalue);
-	} else if (Strcmp(code, "imclassimports") == 0) {
-	  Delete(m3raw_imports);
-	  m3raw_imports = Copy(strvalue);
-	} else if (Strcmp(code, "imclassinterfaces") == 0) {
-	  Delete(m3raw_interfaces);
-	  m3raw_interfaces = Copy(strvalue);
-	} else if (Strcmp(code, "modulebase") == 0) {
-	  Delete(module_baseclass);
-	  module_baseclass = Copy(strvalue);
-	} else if (Strcmp(code, "moduleclassmodifiers") == 0) {
-	  Delete(m3wrap_modifiers);
-	  m3wrap_modifiers = Copy(strvalue);
-	} else if (Strcmp(code, "modulecode") == 0) {
-	  Printf(m3wrap_impl.f, "%s\n", strvalue);
-	} else if (Strcmp(code, "moduleimports") == 0) {
-	  Delete(module_imports);
-	  module_imports = Copy(strvalue);
-	} else if (Strcmp(code, "moduleinterfaces") == 0) {
-	  Delete(module_interfaces);
-	  module_interfaces = Copy(strvalue);
-	} else if (Strcmp(code, "unsafe") == 0) {
-	  unsafe_module = true;
-	} else if (Strcmp(code, "library") == 0) {
-	  if (targetlibrary) {
-	    Delete(targetlibrary);
-	  }
-	  targetlibrary = Copy(strvalue);
-	} else if (Strcmp(code, "enumitem") == 0) {
-	} else if (Strcmp(code, "constset") == 0) {
-	} else if (Strcmp(code, "constint") == 0) {
-	} else if (Strcmp(code, "makesetofenum") == 0) {
-	  m3wrap_intf.enterBlock(blocktype);
-	  Printf(m3wrap_intf.f, "%sSet = SET OF %s;\n", value, value);
-	} else {
-	  Swig_warning(WARN_MODULA3_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", code);
-	}
-	Delete(strvalue);
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  void Setfeature(Node *n, const char *feature, const String *value, bool warn = false) {
-    //printf("tag feature <%s> with value <%s>\n", feature, Char(value));
-    String *attr = NewStringf("feature:%s", feature);
-    if ((Setattr(n, attr, value) != 0) && warn) {
-      Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Feature <%s> of %s did already exist.\n", feature, Getattr(n, "name"));
-    }
-    Delete(attr);
-  }
-
-  String *Getfeature(Node *n, const char *feature) {
-    //printf("retrieve feature <%s> with value <%s>\n", feature, Char(value));
-    String *attr = NewStringf("feature:%s", feature);
-    String *result = Getattr(n, attr);
-    Delete(attr);
-    return result;
-  }
-
-  bool convertInt(long in, long &out, const String *mode) {
-    if ((mode == NIL) || (Strcmp(mode, "int:int") == 0) || (Strcmp(mode, "set:set") == 0)) {
-      out = in;
-      return true;
-    } else if (Strcmp(mode, "set:int") == 0) {
-      return log2(in, out);
-    } else if (Strcmp(mode, "int:set") == 0) {
-      out = 1L << in;
-      return unsigned (in) < (sizeof(out) * 8);
-    } else {
-      Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Unknown integer conversion method <%s>.\n", mode);
-      return false;
-    }
-  }
-
-  void collectEnumerations(Hash *enums, Node *n) {
-    Node *child = firstChild(n);
-    while (child != NIL) {
-      String *name = Getattr(child, "name");
-      const bool isConstant = Strcmp(nodeType(child), "constant") == 0;
-      const bool isEnumItem = Strcmp(nodeType(child), "enumitem") == 0;
-      if (isConstant || isEnumItem) {
-//printf("%s%s name %s\n", isConstant?"constant":"", isEnumItem?"enumitem":"", Char(name));
-	{
-	  String *m3name = Getfeature(child, "modula3:enumitem:name");
-	  String *m3enum = Getfeature(child, "modula3:enumitem:enum");
-	  String *conv = Getfeature(child, "modula3:enumitem:conv");
-
-	  if (m3enum != NIL) {
-//printf("m3enum %s\n", Char(m3enum));
-	    if (m3name == NIL) {
-	      m3name = name;
-	    }
-
-	    long max = -1;
-	    Hash *items;
-	    Hash *enumnode = Getattr(enums, m3enum);
-	    if (enumnode == NIL) {
-	      enumnode = NewHash();
-	      items = NewHash();
-	      Setattr(enumnode, "items", items);
-	      Setattr(enums, m3enum, enumnode);
-	    } else {
-	      String *maxstr = Getattr(enumnode, "max");
-	      if (maxstr != NIL) {
-		max = aToL(maxstr);
-	      }
-	      items = Getattr(enumnode, "items");
-	    }
-	    long numvalue;
-	    String *value = Getattr(child, "value");
-//printf("value: %s\n", Char(value));
-	    if ((value == NIL) || (!strToL(value, numvalue))) {
-	      value = Getattr(child, "enumvalue");
-	      if ((value == NIL) || (!evalExpr(value, numvalue))) {
-		numvalue = getConstNumeric(child);
-	      }
-//printf("constnumeric: %s\n", Char(value));
-	    }
-	    Setattr(constant_values, name, NewStringf("%d", numvalue));
-	    if (convertInt(numvalue, numvalue, conv)) {
-	      String *newvalue = NewStringf("%d", numvalue);
-	      String *oldname = Getattr(items, newvalue);
-	      if (oldname != NIL) {
-		Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "The value <%s> is already assigned to <%s>.\n", value, oldname);
-	      }
-//printf("items %p, set %s = %s\n", items, Char(newvalue), Char(m3name));
-	      Setattr(items, newvalue, m3name);
-	      if (max < numvalue) {
-		max = numvalue;
-	      }
-	      Setattr(enumnode, "max", NewStringf("%d", max));
-	    }
-	  }
-	}
-      }
-
-      collectEnumerations(enums, child);
-      child = nextSibling(child);
-    }
-  }
-
-  enum const_pragma_type { cpt_none, cpt_constint, cpt_constset, cpt_enumitem };
-
-  struct const_id_pattern {
-    String *prefix, *parentEnum;
-  };
-
-  void tagConstants(Node *first, String *parentEnum, const const_id_pattern & pat, const String *pragma, List *convdesc) {
-    Node *n = first;
-    while (n != NIL) {
-      String *name = getQualifiedName(n);
-      bool isConstant = Strcmp(nodeType(n), "constant") == 0;
-      bool isEnumItem = Strcmp(nodeType(n), "enumitem") == 0;
-      if ((isConstant || isEnumItem) && ((pat.prefix == NIL) || (hasPrefix(name, pat.prefix))) && ((pat.parentEnum == NIL) || ((parentEnum != NIL)
-															       &&
-															       (Strcmp
-																(pat.parentEnum, parentEnum)
-																== 0)))) {
-	//printf("tag %s\n", Char(name));
-	String *srctype = Getitem(convdesc, 1);
-	String *relationstr = Getitem(convdesc, 3);
-	List *relationdesc = Split(relationstr, ',', 2);
-
-	// transform name from C to Modula3 style
-	String *srcstyle = NIL;
-	String *newprefix = NIL;
-	{
-	  //printf("name conversion <%s>\n", Char(Getitem(convdesc,2)));
-	  List *namedesc = Split(Getitem(convdesc, 2), ',', INT_MAX);
-	  Iterator nameit = First(namedesc);
-	  for (; nameit.item != NIL; nameit = Next(nameit)) {
-	    List *nameassign = Split(nameit.item, '=', 2);
-	    String *tag = Getitem(nameassign, 0);
-	    String *data = Getitem(nameassign, 1);
-	    //printf("name conv <%s> = <%s>\n", Char(tag), Char(data));
-	    if (Strcmp(tag, "srcstyle") == 0) {
-	      srcstyle = Copy(data);
-	    } else if (Strcmp(tag, "prefix") == 0) {
-	      newprefix = Copy(data);
-	    } else {
-	      Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Unknown name conversion tag <%s> with value <%s>.\n", tag, data);
-	    }
-	    Delete(nameassign);
-	  }
-	  Delete(namedesc);
-	}
-	const char *stem = Char(name);
-	if (pat.prefix != NIL) {
-	  //printf("pat.prefix %s for %s\n", Char(pat.prefix), Char(name));
-	  stem += Len(pat.prefix);
-	}
-	String *newname;
-	if (srcstyle && Strcmp(srcstyle, "underscore") == 0) {
-	  if (newprefix != NIL) {
-	    String *newstem = nameToModula3(stem, true);
-	    newname = NewStringf("%s%s", newprefix, newstem);
-	    Delete(newstem);
-	  } else {
-	    newname = nameToModula3(stem, true);
-	  }
-	} else {
-	  if (srcstyle != NIL) {
-	    Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Unknown C identifier style <%s>.\n", srcstyle);
-	  }
-	  newname = Copy(name);
-	}
-
-	if (Strcmp(pragma, "enumitem") == 0) {
-	  if (Len(relationdesc) != 1) {
-	    Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Expected <enumeration>, got <%s>.\n", relationstr);
-	  }
-	  Setfeature(n, "modula3:enumitem:name", newname, true);
-	  Setfeature(n, "modula3:enumitem:enum", relationstr, true);
-	  Setfeature(n, "modula3:enumitem:conv", NewStringf("%s:int", srctype), true);
-	} else if (Strcmp(pragma, "constint") == 0) {
-	  if (Len(relationdesc) != 1) {
-	    Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Expected <ordinal type>, got <%s>.\n", relationstr);
-	  }
-	  Setfeature(n, "modula3:constint:name", newname, true);
-	  Setfeature(n, "modula3:constint:type", Getitem(relationdesc, 0), true);
-	  Setfeature(n, "modula3:constint:conv", NewStringf("%s:int", srctype), true);
-	} else if (Strcmp(pragma, "constset") == 0) {
-	  if (Len(relationdesc) != 2) {
-	    Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Expected <set type,base type>, got <%s>.\n", relationstr);
-	  }
-	  String *settype = Getitem(relationdesc, 0);
-	  Setfeature(n, "modula3:constset:name", newname, true);
-	  //Setfeature(n,"modula3:constset:type",settype,true);
-	  Setfeature(n, "modula3:constset:set", settype, true);
-	  Setfeature(n, "modula3:constset:base", Getitem(relationdesc, 1), true);
-	  Setfeature(n, "modula3:constset:conv", NewStringf("%s:set", srctype), true);
-	}
-
-	Delete(newname);
-	Delete(relationdesc);
-      }
-
-      if (Strcmp(nodeType(n), "enum") == 0) {
-	//printf("explore enum %s, qualification %s\n", Char(name), Char(Swig_symbol_qualified(n)));
-	tagConstants(firstChild(n), name, pat, pragma, convdesc);
-      } else {
-	tagConstants(firstChild(n), NIL, pat, pragma, convdesc);
-      }
-      n = nextSibling(n);
-    }
-  }
-
-  void scanForConstPragmas(Node *n) {
-    Node *child = firstChild(n);
-    while (child != NIL) {
-      const String *type = nodeType(child);
-      if (Strcmp(type, "pragma") == 0) {
-	const String *lang = Getattr(child, "lang");
-	const String *code = Getattr(child, "name");
-	String *value = Getattr(child, "value");
-
-	if (Strcmp(lang, "modula3") == 0) {
-	  const_pragma_type cpt = cpt_none;
-	  if (Strcmp(code, "constint") == 0) {
-	    cpt = cpt_constint;
-	  } else if (Strcmp(code, "constset") == 0) {
-	    cpt = cpt_constset;
-	  } else if (Strcmp(code, "enumitem") == 0) {
-	    cpt = cpt_enumitem;
-	  }
-	  if (cpt != cpt_none) {
-	    const_id_pattern pat = { NIL, NIL };
-
-	    List *convdesc = Split(value, ';', 4);
-	    List *patterndesc = Split(Getitem(convdesc, 0), ',', INT_MAX);
-	    Iterator patternit;
-	    for (patternit = First(patterndesc); patternit.item != NIL; patternit = Next(patternit)) {
-	      List *patternassign = Split(patternit.item, '=', 2);
-	      String *tag = Getitem(patternassign, 0);
-	      String *data = Getitem(patternassign, 1);
-	      if (Strcmp(tag, "prefix") == 0) {
-		pat.prefix = Copy(data);
-	      } else if (Strcmp(tag, "enum") == 0) {
-		pat.parentEnum = Copy(data);
-	      } else {
-		Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "Unknown identification tag <%s> with value <%s>.\n", tag, data);
-	      }
-	      Delete(patternassign);
-	    }
-	    tagConstants(child, NIL, pat, code, convdesc);
-
-	    Delete(patterndesc);
-	  }
-	}
-      }
-      scanForConstPragmas(child);
-      child = nextSibling(child);
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitProxyClassDefAndCPPCasts()
-   * ----------------------------------------------------------------------------- */
-
-  void emitProxyClassDefAndCPPCasts(Node *n) {
-    String *c_classname = SwigType_namestr(Getattr(n, "name"));
-    String *c_baseclass = NULL;
-    String *baseclass = NULL;
-    String *c_baseclassname = NULL;
-    String *name = Getattr(n, "name");
-
-    /* Deal with inheritance */
-    List *baselist = Getattr(n, "bases");
-    if (baselist) {
-      Iterator base = First(baselist);
-      while (base.item) {
-	if (!GetFlag(base.item, "feature:ignore")) {
-	  String *baseclassname = Getattr(base.item, "name");
-	  if (!c_baseclassname) {
-	    c_baseclassname = baseclassname;
-	    baseclass = Copy(getProxyName(baseclassname));
-	    if (baseclass)
-	      c_baseclass = SwigType_namestr(baseclassname);
-	  } else {
-	    /* Warn about multiple inheritance for additional base class(es) */
-	    String *proxyclassname = Getattr(n, "classtypeobj");
-	    Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		"Warning for %s, base %s ignored. Multiple inheritance is not supported in Modula 3.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
-	  }
-	}
-	base = Next(base);
-      }
-    }
-
-    bool derived = baseclass && getProxyName(c_baseclassname);
-    if (!baseclass)
-      baseclass = NewString("");
-
-    // Inheritance from pure Modula 3 classes
-    const String *pure_baseclass = typemapLookup(n, "m3base", name, WARN_NONE);
-    if (hasContent(pure_baseclass) && hasContent(baseclass)) {
-      Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		   "Warning for %s, base %s ignored. Multiple inheritance is not supported in Modula 3.\n", name, pure_baseclass);
-    }
-    // Pure Modula 3 interfaces
-    const String *pure_interfaces = typemapLookup(n, derived ? "m3interfaces_derived" : "m3interfaces",
-						  name, WARN_NONE);
-
-    // Start writing the proxy class
-    Printv(proxy_class_def, typemapLookup(n, "m3imports", name, WARN_NONE),	// Import statements
-	   "\n", typemapLookup(n, "m3classmodifiers", name, WARN_MODULA3_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
-	   " class $m3classname",	// Class name and bases
-	   (derived || *Char(pure_baseclass) || *Char(pure_interfaces)) ? " : " : "", baseclass, pure_baseclass, ((derived || *Char(pure_baseclass)) && *Char(pure_interfaces)) ?	// Interfaces
-	   ", " : "", pure_interfaces, " {\n", "  private IntPtr swigCPtr;\n",	// Member variables for memory handling
-	   derived ? "" : "  protected bool swigCMemOwn;\n", "\n", "  ", typemapLookup(n, "m3ptrconstructormodifiers", name, WARN_MODULA3_TYPEMAP_PTRCONSTMOD_UNDEF),	// pointer constructor modifiers
-	   " $m3classname(IntPtr cPtr, bool cMemoryOwn) ",	// Constructor used for wrapping pointers
-	   derived ?
-	   ": base($imclassname.$m3classnameTo$baseclass(cPtr), cMemoryOwn) {\n"
-	   : "{\n    swigCMemOwn = cMemoryOwn;\n", "    swigCPtr = cPtr;\n", "  }\n", NIL);
-
-    if (!have_default_constructor_flag) {	// All proxy classes need a constructor
-      Printv(proxy_class_def, "\n", "  protected $m3classname() : this(IntPtr.Zero, false) {\n", "  }\n", NIL);
-    }
-    // C++ destructor is wrapped by the Dispose method
-    // Note that the method name is specified in a typemap attribute called methodname
-    String *destruct = NewString("");
-    const String *tm = NULL;
-    Node *attributes = NewHash();
-    String *destruct_methodname = NULL;
-    if (derived) {
-      tm = typemapLookup(n, "m3destruct_derived", name, WARN_NONE, attributes);
-      destruct_methodname = Getattr(attributes, "tmap:m3destruct_derived:methodname");
-    } else {
-      tm = typemapLookup(n, "m3destruct", name, WARN_NONE, attributes);
-      destruct_methodname = Getattr(attributes, "tmap:m3destruct:methodname");
-    }
-    if (!destruct_methodname) {
-      Swig_error(Getfile(n), Getline(n), "No methodname attribute defined in m3destruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name);
-    }
-    // Emit the Finalize and Dispose methods
-    if (tm) {
-      // Finalize method
-      if (*Char(destructor_call)) {
-	Printv(proxy_class_def, typemapLookup(n, "m3finalize", name, WARN_NONE), NIL);
-      }
-      // Dispose method
-      Printv(destruct, tm, NIL);
-      if (*Char(destructor_call))
-	Replaceall(destruct, "$imcall", destructor_call);
-      else
-	Replaceall(destruct, "$imcall", "throw new MethodAccessException(\"C++ destructor does not have public access\")");
-      if (*Char(destruct))
-	Printv(proxy_class_def, "\n  public ", derived ? "override" : "virtual", " void ", destruct_methodname, "() ", destruct, "\n", NIL);
-    }
-    Delete(attributes);
-    Delete(destruct);
-
-    // Emit various other methods
-    Printv(proxy_class_def, typemapLookup(n, "m3getcptr", name, WARN_MODULA3_TYPEMAP_GETCPTR_UNDEF),	// getCPtr method
-	   typemapLookup(n, "m3code", name, WARN_NONE),	// extra Modula 3 code
-	   "\n", NIL);
-
-    // Substitute various strings into the above template
-    Replaceall(proxy_class_def, "$m3classname", proxy_class_name);
-    Replaceall(proxy_class_code, "$m3classname", proxy_class_name);
-
-    Replaceall(proxy_class_def, "$baseclass", baseclass);
-    Replaceall(proxy_class_code, "$baseclass", baseclass);
-
-    Replaceall(proxy_class_def, "$imclassname", m3raw_name);
-    Replaceall(proxy_class_code, "$imclassname", m3raw_name);
-
-    // Add code to do C++ casting to base class (only for classes in an inheritance hierarchy)
-    if (derived) {
-      Printv(m3raw_cppcasts_code, "\n  [DllImport(\"", m3wrap_name, "\", EntryPoint=\"Modula3_", proxy_class_name, "To", baseclass, "\")]\n", NIL);
-      Printv(m3raw_cppcasts_code, "  public static extern IntPtr ", "$m3classnameTo$baseclass(IntPtr objectRef);\n", NIL);
-
-      Replaceall(m3raw_cppcasts_code, "$m3classname", proxy_class_name);
-      Replaceall(m3raw_cppcasts_code, "$baseclass", baseclass);
-
-      Printv(upcasts_code,
-	     "SWIGEXPORT long Modula3_$imclazznameTo$imbaseclass",
-	     "(long objectRef) {\n",
-	     "    long baseptr = 0;\n" "    *($cbaseclass **)&baseptr = *($cclass **)&objectRef;\n" "    return baseptr;\n" "}\n", "\n", NIL);
-
-      Replaceall(upcasts_code, "$imbaseclass", baseclass);
-      Replaceall(upcasts_code, "$cbaseclass", c_baseclass);
-      Replaceall(upcasts_code, "$imclazzname", proxy_class_name);
-      Replaceall(upcasts_code, "$cclass", c_classname);
-    }
-    Delete(baseclass);
-  }
-
-  /* ----------------------------------------------------------------------
-   * getAttrString()
-   *
-   * If necessary create and return the string
-   * associated with a certain attribute of 'n'.
-   * ---------------------------------------------------------------------- */
-
-  String *getAttrString(Node *n, const char *attr) {
-    String *str = Getattr(n, attr);
-    if (str == NIL) {
-      str = NewString("");
-      Setattr(n, attr, str);
-    }
-    return str;
-  }
-
-  /* ----------------------------------------------------------------------
-   * getMethodDeclarations()
-   *
-   * If necessary create and return the handle
-   * where the methods of the current access can be written to.
-   * 'n' must be a member of a struct or a class.
-   * ---------------------------------------------------------------------- */
-
-  String *getMethodDeclarations(Node *n) {
-    String *acc_str = Getattr(n, "access");
-    String *methodattr;
-    if (acc_str == NIL) {
-      methodattr = NewString("modula3:method:public");
-    } else {
-      methodattr = NewStringf("modula3:method:%s", acc_str);
-    }
-    String *methods = getAttrString(parentNode(n), Char(methodattr));
-    Delete(methodattr);
-    return methods;
-  }
-
-  /* ----------------------------------------------------------------------
-   * classHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int classHandler(Node *n) {
-
-    File *f_proxy = NULL;
-    proxy_class_name = Copy(Getattr(n, "sym:name"));
-    //String *rawname = Getattr(n,"name");
-
-    if (proxy_flag) {
-      if (!addSymbol(proxy_class_name, n))
-	return SWIG_ERROR;
-
-      if (Cmp(proxy_class_name, m3raw_name) == 0) {
-	Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name);
-	SWIG_exit(EXIT_FAILURE);
-      }
-
-      if (Cmp(proxy_class_name, m3wrap_name) == 0) {
-	Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name);
-	SWIG_exit(EXIT_FAILURE);
-      }
-
-      String *filen = NewStringf("%s%s.m3", SWIG_output_directory(), proxy_class_name);
-      f_proxy = NewFile(filen, "w", SWIG_output_files());
-      if (!f_proxy) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Delete(filen);
-      filen = NULL;
-
-      emitBanner(f_proxy);
-
-      Clear(proxy_class_def);
-      Clear(proxy_class_code);
-
-      have_default_constructor_flag = false;
-      destructor_call = NewString("");
-    }
-
-    /* This will invoke memberfunctionHandler, membervariableHandler ...
-       and finally it may invoke functionWrapper
-       for wrappers and member variable accessors.
-       It will invoke Language:constructorDeclaration
-       which decides whether to call MODULA3::constructorHandler */
-    Language::classHandler(n);
-
-    {
-      String *kind = Getattr(n, "kind");
-      if (Cmp(kind, "struct") == 0) {
-	String *entries = NewString("");
-	Node *child;
-	writeArgState state;
-	for (child = firstChild(n); child != NIL; child = nextSibling(child)) {
-	  String *childType = nodeType(child);
-	  if (Strcmp(childType, "cdecl") == 0) {
-	    String *member = Getattr(child, "sym:name");
-	    ParmList *pl = Getattr(child, "parms");
-	    if (pl == NIL) {
-	      // Get the variable type in Modula 3 type equivalents
-	      String *m3ct = getMappedTypeNew(child, "m3rawtype", "");
-
-	      writeArg(entries, state, NIL, member, m3ct, NIL);
-	    }
-	  }
-	}
-	writeArg(entries, state, NIL, NIL, NIL, NIL);
-
-	m3raw_intf.enterBlock(blocktype);
-	Printf(m3raw_intf.f, "%s =\nRECORD\n%sEND;\n", proxy_class_name, entries);
-
-	Delete(entries);
-
-      } else if (Cmp(kind, "class") == 0) {
-	enum access_privilege { acc_public, acc_protected, acc_private };
-	int max_acc = acc_public;
-
-	const char *acc_name[3] = { "public", "protected", "private" };
-	String *methods[3];
-	int acc;
-	for (acc = acc_public; acc <= acc_private; acc++) {
-	  String *methodattr = NewStringf("modula3:method:%s", acc_name[acc]);
-	  methods[acc] = Getattr(n, methodattr);
-	  Delete(methodattr);
-	  max_acc = max_acc > acc ? max_acc : acc;
-	}
-
-	/* Determine the name of the base class */
-	String *baseclassname = NewString("");
-	{
-	  List *baselist = Getattr(n, "bases");
-	  if (baselist) {
-	    /* Look for the first (principal?) base class -
-	       Modula 3 does not support multiple inheritance */
-	    Iterator base = First(baselist);
-	    if (base.item) {
-	      Append(baseclassname, Getattr(base.item, "sym:name"));
-	      base = Next(base);
-	      if (base.item) {
-		Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		    "Warning for %s, base %s ignored. Multiple inheritance is not supported in Modula 3.\n",
-		    proxy_class_name, Getattr(base.item, "name"));
-	      }
-	    }
-	  }
-	}
-
-	/* the private class of the base class and only this
-	   need a pointer to the C++ object */
-	bool need_private = !hasContent(baseclassname);
-	max_acc = need_private ? acc_private : max_acc;
-
-	/* Declare C++ object as abstract pointer in Modula 3 */
-	/* The revelation system does not allow us
-	   to imitate the whole class hierarchy of the C++ library,
-	   but at least we can distinguish between classes of different roots. */
-	if (hasContent(baseclassname)) {
-	  m3raw_intf.enterBlock(blocktype);
-	  Printf(m3raw_intf.f, "%s = %s;\n", proxy_class_name, baseclassname);
-	} else {
-	  m3raw_intf.enterBlock(blocktype);
-	  Printf(m3raw_intf.f, "%s <: ADDRESS;\n", proxy_class_name);
-	  m3raw_impl.enterBlock(revelation);
-	  Printf(m3raw_impl.f, "%s = UNTRACED BRANDED REF RECORD (*Dummy*) END;\n", proxy_class_name);
-	}
-
-	String *superclass;
-	m3wrap_intf.enterBlock(blocktype);
-	if (hasContent(methods[acc_public])) {
-	  superclass = NewStringf("%sPublic", proxy_class_name);
-	} else if (hasContent(baseclassname)) {
-	  superclass = Copy(baseclassname);
-	} else {
-	  superclass = NewString("ROOT");
-	}
-	Printf(m3wrap_intf.f, "%s <: %s;\n", proxy_class_name, superclass);
-	Delete(superclass);
-
-	{
-	  static const char *acc_m3suffix[] = { "Public", "Protected", "Private" };
-	  int acc;
-	  for (acc = acc_public; acc <= acc_private; acc++) {
-	    bool process_private = (acc == acc_private) && need_private;
-	    if (hasContent(methods[acc]) || process_private) {
-	      String *subclass = NewStringf("%s%s", proxy_class_name, acc_m3suffix[acc]);
-	      /*
-	         m3wrap_intf.enterBlock(revelation);
-	         Printf(m3wrap_intf.f, "%s <: %s;\n", proxy_class_name, subclass);
-	       */
-	      if (acc == max_acc) {
-		m3wrap_intf.enterBlock(revelation);
-		Printf(m3wrap_intf.f, "%s =\n", proxy_class_name);
-	      } else {
-		m3wrap_intf.enterBlock(blocktype);
-		Printf(m3wrap_intf.f, "%s =\n", subclass);
-	      }
-	      Printf(m3wrap_intf.f, "%s BRANDED OBJECT\n", baseclassname);
-	      if (process_private) {
-		Setattr(m3wrap_intf.import, m3raw_name, "");
-		Printf(m3wrap_intf.f, "cxxObj:%s.%s;\n", m3raw_name, proxy_class_name);
-	      }
-	      if (hasContent(methods[acc])) {
-		Printf(m3wrap_intf.f, "METHODS\n%s", methods[acc]);
-	      }
-	      if (acc == max_acc) {
-		String *overrides = Getattr(n, "modula3:override");
-		Printf(m3wrap_intf.f, "OVERRIDES\n%s", overrides);
-	      }
-	      Printf(m3wrap_intf.f, "END;\n");
-	      Delete(baseclassname);
-	      baseclassname = subclass;
-	    }
-	  }
-	}
-
-	Delete(methods[acc_public]);
-	Delete(methods[acc_protected]);
-	Delete(methods[acc_private]);
-
-      } else {
-	Swig_warning(WARN_MODULA3_TYPECONSTRUCTOR_UNKNOWN, input_file, line_number, "Unknown type constructor %s\n", kind);
-      }
-    }
-
-    if (proxy_flag) {
-
-      emitProxyClassDefAndCPPCasts(n);
-
-      Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
-
-      Printf(f_proxy, "}\n");
-      Delete(f_proxy);
-      f_proxy = NULL;
-
-      Delete(proxy_class_name);
-      proxy_class_name = NULL;
-      Delete(destructor_call);
-      destructor_call = NULL;
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberfunctionHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int memberfunctionHandler(Node *n) {
-    //printf("begin memberfunctionHandler(%s)\n", Char(Getattr(n,"name")));
-    Setattr(n, "modula3:functype", "method");
-    Language::memberfunctionHandler(n);
-
-    {
-      /* Language::memberfunctionHandler will remove the mapped types
-         that emitM3Wrapper may attach */
-      ParmList *pl = Getattr(n, "parms");
-      Swig_typemap_attach_parms("m3wrapinmode", pl, NULL);
-      Swig_typemap_attach_parms("m3wrapinname", pl, NULL);
-      Swig_typemap_attach_parms("m3wrapintype", pl, NULL);
-      Swig_typemap_attach_parms("m3wrapindefault", pl, NULL);
-      attachParameterNames(n, "tmap:m3wrapinname", "autoname", "arg%d");
-      String *rettype = getMappedTypeNew(n, "m3wrapouttype", "");
-
-      String *methodname = Getattr(n, "sym:name");
-/*
-      if (methodname==NIL) {
-        methodname = Getattr(n,"name");
-      }
-*/
-      String *arguments = createM3Signature(n);
-      String *storage = Getattr(n, "storage");
-      String *overridden = Getattr(n, "override");
-      bool isVirtual = (storage != NIL) && (Strcmp(storage, "virtual") == 0);
-      bool isOverridden = (overridden != NIL)
-	  && (Strcmp(overridden, "1") == 0);
-      if ((!isVirtual) || (!isOverridden)) {
-	{
-	  String *methods = getMethodDeclarations(n);
-	  Printf(methods, "%s(%s)%s%s;%s\n",
-		 methodname, arguments,
-		 hasContent(rettype) ? ": " : "", hasContent(rettype) ? (const String *) rettype : "", isVirtual ? "  (* base method *)" : "");
-	}
-	{
-	  /* this was attached by functionWrapper
-	     invoked by Language::memberfunctionHandler */
-	  String *fname = Getattr(n, "modula3:funcname");
-	  String *overrides = getAttrString(parentNode(n), "modula3:override");
-	  Printf(overrides, "%s := %s;\n", methodname, fname);
-	}
-      }
-    }
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(NSPACE_TODO, proxy_class_name, overloaded_name);
-      Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-      Setattr(n, "imfuncname", intermediary_function_name);
-      proxyClassFunctionHandler(n);
-      Delete(overloaded_name);
-    }
-    //printf("end memberfunctionHandler(%s)\n", Char(Getattr(n,"name")));
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-
-    static_flag = true;
-    Language::staticmemberfunctionHandler(n);
-
-    if (proxy_flag) {
-      String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(NSPACE_TODO, proxy_class_name, overloaded_name);
-      Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
-      Setattr(n, "imfuncname", intermediary_function_name);
-      proxyClassFunctionHandler(n);
-      Delete(overloaded_name);
-    }
-    static_flag = false;
-
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * proxyClassFunctionHandler()
-   *
-   * Function called for creating a Modula 3 wrapper function around a c++ function in the 
-   * proxy class. Used for both static and non-static C++ class functions.
-   * C++ class static functions map to Modula 3 static functions.
-   * Two extra attributes in the Node must be available. These are "proxyfuncname" - 
-   * the name of the Modula 3 class proxy function, which in turn will call "imfuncname" - 
-   * the intermediary (PInvoke) function name in the intermediary class.
-   * ----------------------------------------------------------------------------- */
-
-  void proxyClassFunctionHandler(Node *n) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    Hash *throws_hash = NewHash();
-    String *intermediary_function_name = Getattr(n, "imfuncname");
-    String *proxy_function_name = Getattr(n, "proxyfuncname");
-    String *tm;
-    Parm *p;
-    int i;
-    String *imcall = NewString("");
-    String *return_type = NewString("");
-    String *function_code = NewString("");
-    bool setter_flag = false;
-
-    if (!proxy_flag)
-      return;
-
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("in", l, NULL);
-    Swig_typemap_attach_parms("m3wraptype", l, NULL);
-    Swig_typemap_attach_parms("m3in", l, NULL);
-
-    /* Get return types */
-    if ((tm = getMappedTypeNew(n, "m3wraptype", ""))) {
-      substituteClassname(t, tm);
-      Printf(return_type, "%s", tm);
-    }
-
-    if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
-      // Properties
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, proxy_class_name, variable_name)))
-		     == 0);
-    }
-
-    /* Start generating the proxy function */
-    Printf(function_code, "  %s ", Getattr(n, "feature:modula3:methodmodifiers"));
-    if (static_flag)
-      Printf(function_code, "static ");
-    if (Getattr(n, "override"))
-      Printf(function_code, "override ");
-    else if (checkAttribute(n, "storage", "virtual"))
-      Printf(function_code, "virtual ");
-
-    Printf(function_code, "%s %s(", return_type, proxy_function_name);
-
-    Printv(imcall, m3raw_name, ".", intermediary_function_name, "(", NIL);
-    if (!static_flag)
-      Printv(imcall, "swigCPtr", NIL);
-
-    emit_mark_varargs(l);
-
-    int gencomma = !static_flag;
-
-    /* Output each parameter */
-    for (i = 0, p = l; p; i++) {
-
-      /* Ignored varargs */
-      if (checkAttribute(p, "varargs:ignore", "1")) {
-	p = nextSibling(p);
-	continue;
-      }
-
-      /* Ignored parameters */
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-
-      /* Ignore the 'this' argument for variable wrappers */
-      if (!(variable_wrapper_flag && i == 0)) {
-	SwigType *pt = Getattr(p, "type");
-	String *param_type = NewString("");
-
-	/* Get the Modula 3 parameter type */
-	if ((tm = getMappedType(p, "m3wraptype"))) {
-	  substituteClassname(pt, tm);
-	  Printf(param_type, "%s", tm);
-	}
-
-	if (gencomma)
-	  Printf(imcall, ", ");
-
-	String *arg = variable_wrapper_flag ? NewString("value") : makeParameterName(n,
-										     p,
-										     i);
-
-	// Use typemaps to transform type used in Modula 3 wrapper function (in proxy class) to type used in PInvoke function (in intermediary class)
-	if ((tm = getMappedType(p, "in"))) {
-	  addThrows(throws_hash, "in", p);
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$input", arg);
-	  Printv(imcall, tm, NIL);
-	}
-
-	/* Add parameter to proxy function */
-	if (gencomma >= 2)
-	  Printf(function_code, ", ");
-	gencomma = 2;
-	Printf(function_code, "%s %s", param_type, arg);
-
-	Delete(arg);
-	Delete(param_type);
-      }
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    Printf(imcall, ")");
-    Printf(function_code, ")");
-
-    // Transform return type used in PInvoke function (in intermediary class) to type used in Modula 3 wrapper function (in proxy class)
-    if ((tm = getMappedTypeNew(n, "m3out", ""))) {
-      addThrows(throws_hash, "m3out", n);
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "true");
-      else
-	Replaceall(tm, "$owner", "false");
-      substituteClassname(t, tm);
-      Replaceall(tm, "$imcall", imcall);
-    }
-
-    generateThrowsClause(throws_hash, function_code);
-    Printf(function_code, " %s\n\n", tm ? (const String *) tm : empty_string);
-
-    if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
-      // Properties
-      if (setter_flag) {
-	// Setter method
-	if ((tm = getMappedTypeNew(n, "m3varin", ""))) {
-	  if (GetFlag(n, "feature:new"))
-	    Replaceall(tm, "$owner", "true");
-	  else
-	    Replaceall(tm, "$owner", "false");
-	  substituteClassname(t, tm);
-	  Replaceall(tm, "$imcall", imcall);
-	  Printf(proxy_class_code, "%s", tm);
-	}
-      } else {
-	// Getter method
-	if ((tm = getMappedTypeNew(n, "m3varout", ""))) {
-	  if (GetFlag(n, "feature:new"))
-	    Replaceall(tm, "$owner", "true");
-	  else
-	    Replaceall(tm, "$owner", "false");
-	  substituteClassname(t, tm);
-	  Replaceall(tm, "$imcall", imcall);
-	  Printf(proxy_class_code, "%s", tm);
-	}
-      }
-    } else {
-      // Normal function call
-      Printv(proxy_class_code, function_code, NIL);
-    }
-
-    Delete(function_code);
-    Delete(return_type);
-    Delete(imcall);
-    Delete(throws_hash);
-  }
-
-  /* ----------------------------------------------------------------------
-   * constructorHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int constructorHandler(Node *n) {
-    // this invokes functionWrapper
-    Language::constructorHandler(n);
-
-    if (proxy_flag) {
-      ParmList *l = Getattr(n, "parms");
-
-      Hash *throws_hash = NewHash();
-      String *overloaded_name = getOverloadedName(n);
-      String *imcall = NewString("");
-
-      Printf(proxy_class_code, "  %s %s(", Getattr(n, "feature:modula3:methodmodifiers"), proxy_class_name);
-      Printv(imcall, " : this(", m3raw_name, ".", Swig_name_construct(NSPACE_TODO, overloaded_name), "(", NIL);
-
-      /* Attach the non-standard typemaps to the parameter list */
-      Swig_typemap_attach_parms("in", l, NULL);
-      Swig_typemap_attach_parms("m3wraptype", l, NULL);
-      Swig_typemap_attach_parms("m3in", l, NULL);
-
-      emit_mark_varargs(l);
-
-      int gencomma = 0;
-
-      String *tm;
-      Parm *p = l;
-      int i;
-
-      /* Output each parameter */
-      for (i = 0; p; i++) {
-
-	/* Ignored varargs */
-	if (checkAttribute(p, "varargs:ignore", "1")) {
-	  p = nextSibling(p);
-	  continue;
-	}
-
-	/* Ignored parameters */
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	SwigType *pt = Getattr(p, "type");
-	String *param_type = NewString("");
-
-	/* Get the Modula 3 parameter type */
-	if ((tm = getMappedType(p, "m3wraptype"))) {
-	  substituteClassname(pt, tm);
-	  Printf(param_type, "%s", tm);
-	}
-
-	if (gencomma)
-	  Printf(imcall, ", ");
-
-	String *arg = makeParameterName(n, p, i);
-
-	// Use typemaps to transform type used in Modula 3 wrapper function (in proxy class) to type used in PInvoke function (in intermediary class)
-	if ((tm = getMappedType(p, "in"))) {
-	  addThrows(throws_hash, "in", p);
-	  substituteClassname(pt, tm);
-	  Replaceall(tm, "$input", arg);
-	  Printv(imcall, tm, NIL);
-	}
-
-	/* Add parameter to proxy function */
-	if (gencomma)
-	  Printf(proxy_class_code, ", ");
-	Printf(proxy_class_code, "%s %s", param_type, arg);
-	gencomma = 1;
-
-	Delete(arg);
-	Delete(param_type);
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      Printf(imcall, "), true)");
-
-      Printf(proxy_class_code, ")");
-      Printf(proxy_class_code, "%s", imcall);
-      generateThrowsClause(throws_hash, proxy_class_code);
-      Printf(proxy_class_code, " {\n");
-      Printf(proxy_class_code, "  }\n\n");
-
-      if (!gencomma)		// We must have a default constructor
-	have_default_constructor_flag = true;
-
-      Delete(overloaded_name);
-      Delete(imcall);
-      Delete(throws_hash);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * destructorHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int destructorHandler(Node *n) {
-    Language::destructorHandler(n);
-    String *symname = Getattr(n, "sym:name");
-
-    if (proxy_flag) {
-      Printv(destructor_call, m3raw_name, ".", Swig_name_destroy(NSPACE_TODO, symname), "(swigCPtr)", NIL);
-    }
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * membervariableHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int membervariableHandler(Node *n) {
-    //printf("begin membervariableHandler(%s)\n", Char(Getattr(n,"name")));
-    SwigType *t = Getattr(n, "type");
-    String *tm;
-
-    // Get the variable type
-    if ((tm = getMappedTypeNew(n, "m3wraptype", ""))) {
-      substituteClassname(t, tm);
-    }
-
-    variable_name = Getattr(n, "sym:name");
-    //printf("member variable: %s\n", Char(variable_name));
-
-    // Output the property's field declaration and accessor methods
-    Printf(proxy_class_code, "  public %s %s {", tm, variable_name);
-
-    Setattr(n, "modula3:functype", "accessor");
-    wrapping_member_flag = true;
-    variable_wrapper_flag = true;
-    Language::membervariableHandler(n);
-    wrapping_member_flag = false;
-    variable_wrapper_flag = false;
-
-    Printf(proxy_class_code, "\n  }\n\n");
-
-    {
-      String *methods = getMethodDeclarations(n);
-      String *overrides = getAttrString(parentNode(n), "modula3:override");
-      SwigType *type = Getattr(n, "type");
-      String *m3name = capitalizeFirst(variable_name);
-      //String *m3name    = nameToModula3(variable_name,true);
-      if (!SwigType_isconst(type)) {
-	{
-	  String *inmode = getMappedTypeNew(n, "m3wrapinmode", "", false);
-	  String *intype = getMappedTypeNew(n, "m3wrapintype", "");
-	  Printf(methods, "set%s(%s val:%s);\n", m3name, (inmode != NIL) ? (const String *) inmode : "", intype);
-	}
-	{
-	  /* this was attached by functionWrapper
-	     invoked by Language::memberfunctionHandler */
-	  String *fname = Getattr(n, "modula3:setname");
-	  Printf(overrides, "set%s := %s;\n", m3name, fname);
-	}
-      }
-      {
-	{
-	  String *outtype = getMappedTypeNew(n, "m3wrapouttype", "");
-	  Printf(methods, "get%s():%s;\n", m3name, outtype);
-	}
-	{
-	  /* this was attached by functionWrapper
-	     invoked by Language::memberfunctionHandler */
-	  String *fname = Getattr(n, "modula3:getname");
-	  Printf(overrides, "get%s := %s;\n", m3name, fname);
-	}
-      }
-      Delete(m3name);
-    }
-    //printf("end membervariableHandler(%s)\n", Char(Getattr(n,"name")));
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmembervariableHandler(Node *n) {
-
-    bool static_const_member_flag = (Getattr(n, "value") == 0);
-    if (static_const_member_flag) {
-      SwigType *t = Getattr(n, "type");
-      String *tm;
-
-      // Get the variable type
-      if ((tm = getMappedTypeNew(n, "m3wraptype", ""))) {
-	substituteClassname(t, tm);
-      }
-      // Output the property's field declaration and accessor methods
-      Printf(proxy_class_code, "  public static %s %s {", tm, Getattr(n, "sym:name"));
-    }
-
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    static_flag = true;
-    Language::staticmembervariableHandler(n);
-    wrapping_member_flag = false;
-    static_flag = false;
-
-    if (static_const_member_flag)
-      Printf(proxy_class_code, "\n  }\n\n");
-
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberconstantHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int memberconstantHandler(Node *n) {
-    variable_name = Getattr(n, "sym:name");
-    wrapping_member_flag = true;
-    Language::memberconstantHandler(n);
-    wrapping_member_flag = false;
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * getOverloadedName()
-   * ----------------------------------------------------------------------------- */
-
-  String *getOverloadedName(Node *n) {
-    String *overloaded_name = Copy(Getattr(n, "sym:name"));
-
-    if (Getattr(n, "sym:overloaded")) {
-      Printv(overloaded_name, Getattr(n, "sym:overname"), NIL);
-    }
-
-    return overloaded_name;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitM3Wrapper()
-   * It is also used for set and get methods of global variables.
-   * ----------------------------------------------------------------------------- */
-
-  void emitM3Wrapper(Node *n, const String *func_name) {
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    Hash *throws_hash = NewHash();
-    int num_exceptions = 0;
-    int num_returns = 0;
-    String *rawcall = NewString("");
-    String *reccall = NewString("");
-    String *local_variables = NewString("");
-    String *local_constants = NewString("");
-    String *incheck = NewString("");
-    String *outcheck = NewString("");
-    String *setup = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");	/* don't mix up with 'autark' :-] */
-    String *storeout = NewString("");
-    String *result_name = NewString("");
-    String *return_variables = NewString("");
-    const char *result_return = "ret";
-    String *function_code = NewString("");
-    /*several names for the same function */
-    String *raw_name = Getattr(n, "name");	/*original C function name */
-    //String     *func_name = Getattr(n,"sym:name");  /*final Modula3 name chosen by the user*/
-    bool setter_flag = false;
-    int multiretval = GetFlag(n, "feature:modula3:multiretval");
-
-    if (l) {
-      if (SwigType_type(Getattr(l, "type")) == T_VOID) {
-	l = nextSibling(l);
-      }
-    }
-
-    /* Attach the non-standard typemaps to the parameter list */
-    Swig_typemap_attach_parms("m3wrapargvar", l, NULL);
-    Swig_typemap_attach_parms("m3wrapargconst", l, NULL);
-    Swig_typemap_attach_parms("m3wrapargraw", l, NULL);
-    Swig_typemap_attach_parms("m3wrapargdir", l, NULL);
-    Swig_typemap_attach_parms("m3wrapinmode", l, NULL);
-    Swig_typemap_attach_parms("m3wrapinname", l, NULL);
-    Swig_typemap_attach_parms("m3wrapintype", l, NULL);
-    Swig_typemap_attach_parms("m3wrapindefault", l, NULL);
-    Swig_typemap_attach_parms("m3wrapinconv", l, NULL);
-    Swig_typemap_attach_parms("m3wrapincheck", l, NULL);
-    Swig_typemap_attach_parms("m3wrapoutname", l, NULL);
-    Swig_typemap_attach_parms("m3wrapouttype", l, NULL);
-    Swig_typemap_attach_parms("m3wrapoutconv", l, NULL);
-    Swig_typemap_attach_parms("m3wrapoutcheck", l, NULL);
-
-    attachMappedType(n, "m3wrapretraw");
-    attachMappedType(n, "m3wrapretname");
-    attachMappedType(n, "m3wraprettype");
-    attachMappedType(n, "m3wrapretvar");
-    attachMappedType(n, "m3wrapretconv");
-    attachMappedType(n, "m3wrapretcheck");
-
-    Swig_typemap_attach_parms("m3wrapfreearg", l, NULL);
-
-/*
-    Swig_typemap_attach_parms("m3wrapargvar:throws", l, NULL);
-    Swig_typemap_attach_parms("m3wrapargraw:throws", l, NULL);
-    Swig_typemap_attach_parms("m3wrapinconv:throws", l, NULL);
-    Swig_typemap_attach_parms("m3wrapincheck:throws", l, NULL);
-    Swig_typemap_attach_parms("m3wrapoutconv:throws", l, NULL);
-    Swig_typemap_attach_parms("m3wrapoutcheck:throws", l, NULL);
-
-    attachMappedType(n, "m3wrapretvar:throws");
-    attachMappedType(n, "m3wrapretconv:throws");
-    attachMappedType(n, "m3wrapretcheck:throws");
-
-    Swig_typemap_attach_parms("m3wrapfreearg:throws", l, NULL);
-*/
-
-    /* Attach argument names to the parameter list */
-    /* should be a separate procedure making use of hashes */
-    attachParameterNames(n, "tmap:m3wrapinname", "autoname", "arg%d");
-
-    /* Get return types */
-    String *result_m3rawtype = Copy(getMappedTypeNew(n, "m3rawrettype", ""));
-    String *result_m3wraptype = Copy(getMappedTypeNew(n, "m3wraprettype", ""));
-    bool has_return_raw = hasContent(result_m3rawtype);
-    bool has_return_m3 = hasContent(result_m3wraptype);
-    if (has_return_m3) {
-      num_returns++;
-      //printf("%s: %s\n", Char(func_name),Char(result_m3wraptype));
-    }
-
-    String *arguments = createM3Signature(n);
-
-    /* Create local variables or RECORD fields for return values
-       and determine return type that might result from a converted VAR argument. */
-    {
-      writeArgState state;
-      if (multiretval && has_return_m3) {
-	writeArg(return_variables, state, NIL, NewString(result_return), result_m3wraptype, NIL);
-      }
-
-      Parm *p = skipIgnored(l, "m3wrapouttype");
-      while (p != NIL) {
-
-	String *arg = Getattr(p, "tmap:m3wrapoutname");
-	if (arg == NIL) {
-	  arg = Getattr(p, "name");
-	}
-
-	String *tm = Getattr(p, "tmap:m3wrapouttype");
-	if (tm != NIL) {
-	  if (isOutParam(p)) {
-	    if (!multiretval) {
-	      if (num_returns == 0) {
-		Printv(result_name, arg, NIL);
-		Clear(result_m3wraptype);
-		Printv(result_m3wraptype, tm, NIL);
-	      } else {
-		Swig_warning(WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN, input_file, line_number,
-			     "Typemap m3wrapargdir set to 'out' for %s implies a RETURN value, but the routine %s has already one.\nUse %%multiretval feature.\n",
-			     SwigType_str(Getattr(p, "type"), 0), raw_name);
-	      }
-	    }
-	    num_returns++;
-	    addImports(m3wrap_intf.import, "m3wrapouttype", p);
-	    writeArg(return_variables, state, NIL, arg, tm, NIL);
-	  }
-	  p = skipIgnored(Getattr(p, "tmap:m3wrapouttype:next"), "m3wrapouttype");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-      writeArg(return_variables, state, NIL, NIL, NIL, NIL);
-
-      if (multiretval) {
-	Printv(result_name, Swig_cresult_name(), NIL);
-	Printf(result_m3wraptype, "%sResult", func_name);
-	m3wrap_intf.enterBlock(blocktype);
-	Printf(m3wrap_intf.f, "%s =\nRECORD\n%sEND;\n", result_m3wraptype, return_variables);
-	Printf(local_variables, "%s: %s;\n", result_name, result_m3wraptype);
-      } else {
-	Append(local_variables, return_variables);
-      }
-    }
-
-    /* Declare local constants e.g. for storing argument names. */
-    {
-      Parm *p = l;
-      while (p != NIL) {
-
-	String *arg = Getattr(p, "autoname");
-
-	String *tm = Getattr(p, "tmap:m3wrapargconst");
-	if (tm != NIL) {
-	  addImports(m3wrap_impl.import, "m3wrapargconst", p);
-	  Replaceall(tm, "$input", arg);
-	  Printv(local_constants, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:m3wrapargconst:next");
-	} else {
-	  p = nextSibling(p);
-	}
-
-      }
-    }
-
-    /* Declare local variables e.g. for converted input values. */
-    {
-      String *tm = getMappedTypeNew(n, "m3wrapretvar", "", false);
-      if (tm != NIL) {
-	addImports(m3wrap_impl.import, "m3wrapretvar", n);
-	addThrows(throws_hash, "m3wrapretvar", n);
-	Printv(local_variables, tm, "\n", NIL);
-      }
-
-      Parm *p = l;
-      while (p != NIL) {
-
-	String *arg = Getattr(p, "autoname");
-
-	tm = Getattr(p, "tmap:m3wrapargvar");
-	if (tm != NIL) {
-	  /* exceptions that may be raised but can't be catched,
-	     thus we won't count them in num_exceptions */
-	  addImports(m3wrap_impl.import, "m3wrapargvar", p);
-	  addThrows(throws_hash, "m3wrapargvar", p);
-	  Replaceall(tm, "$input", arg);
-	  Printv(local_variables, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:m3wrapargvar:next");
-	} else {
-	  p = nextSibling(p);
-	}
-
-      }
-    }
-
-    /* Convert input values from Modula 3 to C. */
-    {
-      Parm *p = l;
-      while (p != NIL) {
-
-	String *arg = Getattr(p, "autoname");
-
-	String *tm = Getattr(p, "tmap:m3wrapinconv");
-	if (tm != NIL) {
-	  addImports(m3wrap_impl.import, "m3wrapinconv", p);
-	  num_exceptions += addThrows(throws_hash, "m3wrapinconv", p);
-	  Replaceall(tm, "$input", arg);
-	  Printv(setup, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:m3wrapinconv:next");
-	} else {
-	  p = nextSibling(p);
-	}
-
-      }
-    }
-
-    /* Generate checks for input value integrity. */
-    {
-      Parm *p = l;
-      while (p != NIL) {
-
-	String *arg = Getattr(p, "autoname");
-
-	String *tm = Getattr(p, "tmap:m3wrapincheck");
-	if (tm != NIL) {
-	  addImports(m3wrap_impl.import, "m3wrapincheck", p);
-	  num_exceptions += addThrows(throws_hash, "m3wrapincheck", p);
-	  Replaceall(tm, "$input", arg);
-	  Printv(incheck, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:m3wrapincheck:next");
-	} else {
-	  p = nextSibling(p);
-	}
-
-      }
-    }
-
-    Printv(rawcall, m3raw_name, ".", func_name, "(", NIL);
-    /* Arguments to the raw C function */
-    {
-      bool gencomma = false;
-      Parm *p = l;
-      while (p != NIL) {
-	if (gencomma) {
-	  Printf(rawcall, ", ");
-	}
-	gencomma = true;
-	addImports(m3wrap_impl.import, "m3wrapargraw", p);
-	num_exceptions += addThrows(throws_hash, "m3wrapargraw", p);
-
-	String *arg = Getattr(p, "autoname");
-	String *qualarg = NewString("");
-	if (!isInParam(p)) {
-	  String *tmparg = Getattr(p, "tmap:m3wrapoutname");
-	  if (tmparg != NIL) {
-	    arg = tmparg;
-	  }
-	  if (multiretval /*&& isOutParam(p) - automatically fulfilled */ ) {
-	    Printf(qualarg, "%s.", result_name);
-	  }
-	}
-	Append(qualarg, arg);
-	Setattr(p, "m3outarg", qualarg);
-
-	String *tm = Getattr(p, "tmap:m3wrapargraw");
-	if (tm != NIL) {
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$output", qualarg);
-	  Printv(rawcall, tm, NIL);
-	  p = Getattr(p, "tmap:m3wrapargraw:next");
-	} else {
-	  //Printv(rawcall, Getattr(p,"lname"), NIL);
-	  Printv(rawcall, qualarg, NIL);
-	  p = nextSibling(p);
-	}
-	Delete(qualarg);
-      }
-    }
-    Printf(rawcall, ")");
-
-    /* Check for error codes and integrity of results */
-    {
-      String *tm = getMappedTypeNew(n, "m3wrapretcheck", "", false);
-      if (tm != NIL) {
-	addImports(m3wrap_impl.import, "m3wrapretcheck", n);
-	num_exceptions += addThrows(throws_hash, "m3wrapretcheck", n);
-	Printv(outcheck, tm, "\n", NIL);
-      }
-
-      Parm *p = l;
-      while (p != NIL) {
-	tm = Getattr(p, "tmap:m3wrapoutcheck");
-	if (tm != NIL) {
-	  String *arg = Getattr(p, "autoname");
-	  String *outarg = Getattr(p, "m3outarg");
-	  addImports(m3wrap_impl.import, "m3wrapoutcheck", p);
-	  num_exceptions += addThrows(throws_hash, "m3wrapoutcheck", p);
-	  //substituteClassname(Getattr(p,"type"), tm);
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$output", outarg);
-	  Printv(outcheck, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:m3wrapoutcheck:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    /* Convert the results to Modula 3 data structures and
-       put them in the record prepared for returning */
-    {
-      /* m3wrapretconv is processed
-         when it is clear if there is some output conversion and checking code */
-      Parm *p = l;
-      while (p != NIL) {
-	String *tm = Getattr(p, "tmap:m3wrapoutconv");
-	if (tm != NIL) {
-	  String *arg = Getattr(p, "autoname");
-	  String *outarg = Getattr(p, "m3outarg");
-	  addImports(m3wrap_impl.import, "m3wrapoutconv", n);
-	  num_exceptions += addThrows(throws_hash, "m3wrapoutconv", p);
-	  //substituteClassname(Getattr(p,"type"), tm);
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$output", outarg);
-	  Printf(storeout, "%s := %s;\n", outarg, tm);
-	  p = Getattr(p, "tmap:m3wrapoutconv:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    /* Generate cleanup code */
-    {
-      Parm *p = l;
-      while (p != NIL) {
-	String *tm = Getattr(p, "tmap:m3wrapfreearg");
-	if (tm != NIL) {
-	  String *arg = Getattr(p, "autoname");
-	  String *outarg = Getattr(p, "m3outarg");
-	  addImports(m3wrap_impl.import, "m3wrapfreearg", p);
-	  num_exceptions += addThrows(throws_hash, "m3wrapfreearg", p);
-	  //substituteClassname(Getattr(p,"type"), tm);
-	  Replaceall(tm, "$input", arg);
-	  Replaceall(tm, "$output", outarg);
-	  Printv(cleanup, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:m3wrapfreearg:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-    }
-
-    {
-      /* Currently I don't know how a typemap similar to the original 'out' typemap
-         could help returning the return value. */
-      /* Receive result from call to raw library function */
-      if (!has_return_raw) {
-	/*
-	   rawcall(arg1);
-	   result.val := arg1;
-	   RETURN result;
-	 */
-	/*
-	   rawcall(arg1);
-	   RETURN arg1;
-	 */
-	Printf(reccall, "%s;\n", rawcall);
-
-	if (hasContent(result_name)) {
-	  Printf(outarg, "RETURN %s;\n", result_name);
-	}
-      } else {
-	/*
-	   arg0 := rawcall(arg1);
-	   result.ret := Convert(arg0);
-	   result.val := arg1;
-	   RETURN result;
-	 */
-	/*
-	   arg0 := rawcall();
-	   RETURN Convert(arg0);
-	 */
-	/*
-	   RETURN rawcall();
-	 */
-	String *return_raw = getMappedTypeNew(n, "m3wrapretraw", "", false);
-	String *return_conv = getMappedTypeNew(n, "m3wrapretconv", "", false);
-
-	/* immediate RETURN would skip result checking */
-	if ((hasContent(outcheck) || hasContent(storeout)
-	     || hasContent(cleanup)) && (!hasContent(result_name))
-	    && (return_raw == NIL)) {
-	  Printv(result_name, Swig_cresult_name(), NIL);
-	  Printf(local_variables, "%s: %s;\n", result_name, result_m3wraptype);
-	}
-
-	String *result_lvalue = Copy(result_name);
-	if (multiretval) {
-	  Printf(result_lvalue, ".%s", result_return);
-	}
-	if (return_raw != NIL) {
-	  Printf(reccall, "%s := %s;\n", return_raw, rawcall);
-	} else if (hasContent(result_name)) {
-	  Printf(reccall, "%s := %s;\n", result_lvalue, rawcall);
-	} else {
-	  Printf(outarg, "RETURN %s;\n", rawcall);
-	}
-	if (return_conv != NIL) {
-	  addImports(m3wrap_impl.import, "m3wrapretconv", n);
-	  num_exceptions += addThrows(throws_hash, "m3wrapretconv", n);
-	  if (hasContent(result_name)) {
-	    Printf(reccall, "%s := %s;\n", result_lvalue, return_conv);
-	    Printf(outarg, "RETURN %s;\n", result_name);
-	  } else {
-	    Printf(outarg, "RETURN %s;\n", return_conv);
-	  }
-	} else {
-	  if (hasContent(result_name)) {
-	    Printf(outarg, "RETURN %s;\n", result_name);
-	  }
-	}
-      }
-    }
-
-    /* Create procedure header */
-    {
-      String *header = NewStringf("PROCEDURE %s (%s)",
-				  func_name, arguments);
-
-      if ((num_returns > 0) || multiretval) {
-	Printf(header, ": %s", result_m3wraptype);
-      }
-      generateThrowsClause(throws_hash, header);
-
-      Append(function_code, header);
-
-      m3wrap_intf.enterBlock(no_block);
-      Printf(m3wrap_intf.f, "%s;\n\n", header);
-    }
-
-    {
-      String *body = NewStringf("%s%s%s%s%s",
-				incheck,
-				setup,
-				reccall,
-				outcheck,
-				storeout);
-
-      String *exc_handler;
-      if (hasContent(cleanup) && (num_exceptions > 0)) {
-	exc_handler = NewStringf("TRY\n%sFINALLY\n%sEND;\n", body, cleanup);
-      } else {
-	exc_handler = NewStringf("%s%s", body, cleanup);
-      }
-
-      Printf(function_code, " =\n%s%s%s%sBEGIN\n%s%sEND %s;\n\n",
-	     hasContent(local_constants) ? "CONST\n" : "", local_constants,
-	     hasContent(local_variables) ? "VAR\n" : "", local_variables, exc_handler, outarg, func_name);
-
-      Delete(exc_handler);
-      Delete(body);
-    }
-
-    m3wrap_impl.enterBlock(no_block);
-    if (proxy_flag && global_variable_flag) {
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(NSPACE_TODO, variable_name)) == 0);
-      // Properties
-      if (setter_flag) {
-	// Setter method
-	String *tm = getMappedTypeNew(n, "m3varin", "");
-	if (tm != NIL) {
-	  if (GetFlag(n, "feature:new")) {
-	    Replaceall(tm, "$owner", "true");
-	  } else {
-	    Replaceall(tm, "$owner", "false");
-	  }
-	  substituteClassname(t, tm);
-	  Replaceall(tm, "$rawcall", rawcall);
-	  Replaceall(tm, "$vartype", variable_type);	/* $type is already replaced by some super class */
-	  Replaceall(tm, "$var", variable_name);
-	  Printf(m3wrap_impl.f, "%s", tm);
-	}
-      } else {
-	// Getter method
-	String *tm = getMappedTypeNew(n, "m3varout", "");
-	if (tm != NIL) {
-	  if (GetFlag(n, "feature:new"))
-	    Replaceall(tm, "$owner", "true");
-	  else
-	    Replaceall(tm, "$owner", "false");
-	  substituteClassname(t, tm);
-	  Replaceall(tm, "$rawcall", rawcall);
-	  Replaceall(tm, "$vartype", variable_type);
-	  Replaceall(tm, "$var", variable_name);
-	  Printf(m3wrap_impl.f, "%s", tm);
-	}
-      }
-    } else {
-      // Normal function call
-      Printv(m3wrap_impl.f, function_code, NIL);
-    }
-
-    Delete(arguments);
-    Delete(return_variables);
-    Delete(local_variables);
-    Delete(local_constants);
-    Delete(outarg);
-    Delete(incheck);
-    Delete(outcheck);
-    Delete(setup);
-    Delete(cleanup);
-    Delete(storeout);
-    Delete(function_code);
-    Delete(result_name);
-    Delete(result_m3wraptype);
-    Delete(reccall);
-    Delete(rawcall);
-    Delete(throws_hash);
-  }
-
-  /*----------------------------------------------------------------------
-   * replaceSpecialVariables()
-   *--------------------------------------------------------------------*/
-
-  virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) {
-    (void)method;
-    SwigType *type = Getattr(parm, "type");
-    substituteClassname(type, tm);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * substituteClassname()
-   *
-   * Substitute the special variable $m3classname with the proxy class name for classes/structs/unions 
-   * that SWIG knows about.
-   * Otherwise use the $descriptor name for the Modula 3 class name. Note that the $&m3classname substitution
-   * is the same as a $&descriptor substitution, ie one pointer added to descriptor name.
-   * Inputs:
-   *   pt - parameter type
-   *   tm - typemap contents that might contain the special variable to be replaced
-   * Outputs:
-   *   tm - typemap contents complete with the special variable substitution
-   * Return:
-   *   substitution_performed - flag indicating if a substitution was performed
-   * ----------------------------------------------------------------------------- */
-
-  bool substituteClassname(SwigType *pt, String *tm) {
-    bool substitution_performed = false;
-    if (Strstr(tm, "$m3classname") || Strstr(tm, "$&m3classname")) {
-      String *classname = getProxyName(pt);
-      if (classname) {
-	Replaceall(tm, "$&m3classname", classname);	// getProxyName() works for pointers to classes too
-	Replaceall(tm, "$m3classname", classname);
-      } else {			// use $descriptor if SWIG does not know anything about this type. Note that any typedefs are resolved.
-	String *descriptor = NULL;
-	SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
-
-	if (Strstr(tm, "$&m3classname")) {
-	  SwigType_add_pointer(type);
-	  descriptor = NewStringf("SWIGTYPE%s", SwigType_manglestr(type));
-	  Replaceall(tm, "$&m3classname", descriptor);
-	} else {		// $m3classname
-	  descriptor = NewStringf("SWIGTYPE%s", SwigType_manglestr(type));
-	  Replaceall(tm, "$m3classname", descriptor);
-	}
-
-	// Add to hash table so that the type wrapper classes can be created later
-	Setattr(swig_types_hash, descriptor, type);
-	Delete(descriptor);
-	Delete(type);
-      }
-      substitution_performed = true;
-    }
-    return substitution_performed;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * attachParameterNames()
-   *
-   * Inputs: 
-   *   n      - Node of a function declaration
-   *   tmid   - attribute name for overriding C argument names,
-   *              e.g. "tmap:m3wrapinname",
-   *              don't forget to attach the mapped types before
-   *   nameid - attribute for attaching the names,
-   *              e.g. "modula3:inname"
-   *   fmt    - format for the argument name containing %d
-   *              e.g. "arg%d"
-   * ----------------------------------------------------------------------------- */
-
-  void attachParameterNames(Node *n, const char *tmid, const char *nameid, const char *fmt) {
-    /* Use C parameter name if present and unique,
-       otherwise create an 'arg%d' name */
-    Hash *hash = NewHash();
-    Parm *p = Getattr(n, "parms");
-    int count = 0;
-    while (p != NIL) {
-      String *name = Getattr(p, tmid);
-      if (name == NIL) {
-	name = Getattr(p, "name");
-      }
-      String *newname;
-      if ((!hasContent(name)) || (Getattr(hash, name) != NIL)) {
-	newname = NewStringf(fmt, count);
-      } else {
-	newname = Copy(name);
-      }
-      if (1 == Setattr(hash, newname, "1")) {
-	Swig_warning(WARN_MODULA3_DOUBLE_ID, input_file, line_number, "Argument '%s' twice.\n", newname);
-      }
-      Setattr(p, nameid, newname);
-//      Delete(newname);
-      p = nextSibling(p);
-      count++;
-    }
-    Delete(hash);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * createM3Signature()
-   *
-   * Create signature of M3 wrapper procedure
-   * Call attachParameterNames and attach mapped types before!
-   *   m3wrapintype, m3wrapinmode, m3wrapindefault
-   * ----------------------------------------------------------------------------- */
-
-  String *createM3Signature(Node *n) {
-    String *arguments = NewString("");
-    Parm *p = skipIgnored(Getattr(n, "parms"), "m3wrapintype");
-    writeArgState state;
-    while (p != NIL) {
-
-      /* Get the M3 parameter type */
-      String *tm = getMappedType(p, "m3wrapintype");
-      if (tm != NIL) {
-	if (isInParam(p)) {
-	  addImports(m3wrap_intf.import, "m3wrapintype", p);
-	  addImports(m3wrap_impl.import, "m3wrapintype", p);
-	  String *mode = Getattr(p, "tmap:m3wrapinmode");
-	  String *deflt = Getattr(p, "tmap:m3wrapindefault");
-	  String *arg = Getattr(p, "autoname");
-	  SwigType *pt = Getattr(p, "type");
-	  substituteClassname(pt, tm);	/* do we need this ? */
-
-	  writeArg(arguments, state, mode, arg, tm, deflt);
-	}
-	p = skipIgnored(Getattr(p, "tmap:m3wrapintype:next"), "m3wrapintype");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-    writeArg(arguments, state, NIL, NIL, NIL, NIL);
-    return (arguments);
-  }
-
-/* not used any longer
-    - try SwigType_str if required again */
-#if 0
-  /* -----------------------------------------------------------------------------
-   * createCSignature()
-   *
-   * Create signature of C function
-   * ----------------------------------------------------------------------------- */
-
-  String *createCSignature(Node *n) {
-    String *arguments = NewString("");
-    bool gencomma = false;
-    Node *p;
-    for (p = Getattr(n, "parms"); p != NIL; p = nextSibling(p)) {
-      if (gencomma) {
-	Append(arguments, ",");
-      }
-      gencomma = true;
-      String *type = Getattr(p, "type");
-      String *ctype = getMappedTypeNew(type, "ctype");
-      Append(arguments, ctype);
-    }
-    return arguments;
-  }
-#endif
-
-  /* -----------------------------------------------------------------------------
-   * emitTypeWrapperClass()
-   * ----------------------------------------------------------------------------- */
-
-  void emitTypeWrapperClass(String *classname, SwigType *type) {
-    Node *n = NewHash();
-    Setfile(n, input_file);
-    Setline(n, line_number);
-
-    String *filen = NewStringf("%s%s.m3", SWIG_output_directory(), classname);
-    File *f_swigtype = NewFile(filen, "w", SWIG_output_files());
-    if (!f_swigtype) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    String *swigtype = NewString("");
-
-    // Emit banner name
-    emitBanner(f_swigtype);
-
-    // Pure Modula 3 baseclass and interfaces
-    const String *pure_baseclass = typemapLookup(n, "m3base", type, WARN_NONE);
-    const String *pure_interfaces = typemapLookup(n, "m3interfaces", type, WARN_NONE);
-
-    // Emit the class
-    Printv(swigtype, typemapLookup(n, "m3imports", type, WARN_NONE),	// Import statements
-	   "\n", typemapLookup(n, "m3classmodifiers", type, WARN_MODULA3_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
-	   " class $m3classname",	// Class name and bases
-	   *Char(pure_baseclass) ? " : " : "", pure_baseclass, *Char(pure_interfaces) ?	// Interfaces
-	   " : " : "", pure_interfaces, " {\n", "  private IntPtr swigCPtr;\n", "\n", "  ", typemapLookup(n, "m3ptrconstructormodifiers", type, WARN_MODULA3_TYPEMAP_PTRCONSTMOD_UNDEF),	// pointer constructor modifiers
-	   " $m3classname(IntPtr cPtr, bool bFutureUse) {\n",	// Constructor used for wrapping pointers
-	   "    swigCPtr = cPtr;\n", "  }\n", "\n", "  protected $m3classname() {\n",	// Default constructor
-	   "    swigCPtr = IntPtr.Zero;\n", "  }\n", typemapLookup(n, "m3getcptr", type, WARN_MODULA3_TYPEMAP_GETCPTR_UNDEF),	// getCPtr method
-	   typemapLookup(n, "m3code", type, WARN_NONE),	// extra Modula 3 code
-	   "}\n", "\n", NIL);
-
-    Replaceall(swigtype, "$m3classname", classname);
-    Printv(f_swigtype, swigtype, NIL);
-
-    Delete(f_swigtype);
-    Delete(filen);
-    Delete(swigtype);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * typemapLookup()
-   * n - for input only and must contain info for Getfile(n) and Getline(n) to work
-   * tmap_method - typemap method name
-   * type - typemap type to lookup
-   * warning - warning number to issue if no typemaps found
-   * typemap_attributes - the typemap attributes are attached to this node and will 
-   *   also be used for temporary storage if non null
-   * return is never NULL, unlike Swig_typemap_lookup()
-   * ----------------------------------------------------------------------------- */
-
-  const String *typemapLookup(Node *n, const_String_or_char_ptr tmap_method, SwigType *type, int warning, Node *typemap_attributes = 0) {
-    Node *node = !typemap_attributes ? NewHash() : typemap_attributes;
-    Setattr(node, "type", type);
-    Setfile(node, Getfile(n));
-    Setline(node, Getline(n));
-    const String *tm = Swig_typemap_lookup(tmap_method, node, "", 0);
-    if (!tm) {
-      tm = empty_string;
-      if (warning != WARN_NONE)
-	Swig_warning(warning, Getfile(n), Getline(n), "No %s typemap defined for %s\n", tmap_method, SwigType_str(type, 0));
-    }
-    if (!typemap_attributes)
-      Delete(node);
-    return tm;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addThrows()
-   *
-   * Add all exceptions to a hash that are associated with the 'typemap'.
-   * Return number the number of these exceptions.
-   * ----------------------------------------------------------------------------- */
-
-  int addThrows(Hash *throws_hash, const String *typemap, Node *parameter) {
-    // Get the comma separated throws clause - held in "throws" attribute in the typemap passed in
-    int len = 0;
-    String *throws_attribute = NewStringf("%s:throws", typemap);
-
-    addImports(m3wrap_intf.import, throws_attribute, parameter);
-    addImports(m3wrap_impl.import, throws_attribute, parameter);
-
-    String *throws = getMappedTypeNew(parameter, Char(throws_attribute), "", false);
-    //printf("got exceptions %s for %s\n", Char(throws), Char(throws_attribute));
-
-    if (throws) {
-      // Put the exception classes in the throws clause into a temporary List
-      List *temp_classes_list = Split(throws, ',', INT_MAX);
-      len = Len(temp_classes_list);
-
-      // Add the exception classes to the node throws list, but don't duplicate if already in list
-      if (temp_classes_list /*&& hasContent(temp_classes_list) */ ) {
-	for (Iterator cls = First(temp_classes_list); cls.item != NIL; cls = Next(cls)) {
-	  String *exception_class = NewString(cls.item);
-	  Replaceall(exception_class, " ", "");	// remove spaces
-	  Replaceall(exception_class, "\t", "");	// remove tabs
-	  if (hasContent(exception_class)) {
-	    // $m3classname substitution
-	    SwigType *pt = Getattr(parameter, "type");
-	    substituteClassname(pt, exception_class);
-	    // Don't duplicate the exception class in the throws clause
-	    //printf("add exception %s\n", Char(exception_class));
-	    Setattr(throws_hash, exception_class, "1");
-	  }
-	  Delete(exception_class);
-	}
-      }
-      Delete(temp_classes_list);
-    }
-    Delete(throws_attribute);
-    return len;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * generateThrowsClause()
-   * ----------------------------------------------------------------------------- */
-
-  void generateThrowsClause(Hash *throws_hash, String *code) {
-    // Add the throws clause into code
-    if (Len(throws_hash) > 0) {
-      Iterator cls = First(throws_hash);
-      Printf(code, " RAISES {%s", cls.key);
-      for (cls = Next(cls); cls.key != NIL; cls = Next(cls)) {
-	Printf(code, ", %s", cls.key);
-      }
-      Printf(code, "}");
-    }
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addImports()
-   *
-   * Add all imports that are needed for contents of 'typemap'.
-   * ----------------------------------------------------------------------------- */
-
-  void addImports(Hash *imports_hash, const String *typemap, Node *node) {
-    // Get the comma separated throws clause - held in "throws" attribute in the typemap passed in
-    String *imports_attribute = NewStringf("%s:import", typemap);
-    String *imports = getMappedTypeNew(node, Char(imports_attribute), "", false);
-    //printf("got imports %s for %s\n", Char(imports), Char(imports_attribute));
-
-    if (imports != NIL) {
-      List *import_list = Split(imports, ',', INT_MAX);
-
-      // Add the exception classes to the node imports list, but don't duplicate if already in list
-      if (import_list != NIL) {
-	for (Iterator imp = First(import_list); imp.item != NIL; imp = Next(imp)) {
-	  List *import_pair = Split(imp.item, ' ', 3);
-	  if (Len(import_pair) == 1) {
-	    Setattr(imports_hash, Getitem(import_pair, 0), "");
-	  } else if ((Len(import_pair) == 3)
-		     && Strcmp(Getitem(import_pair, 1), "AS") == 0) {
-	    Setattr(imports_hash, Getitem(import_pair, 0), Getitem(import_pair, 2));
-	  } else {
-	    Swig_warning(WARN_MODULA3_BAD_IMPORT, input_file, line_number,
-			 "Malformed import '%s' for typemap '%s' defined for type '%s'\n", imp, typemap, SwigType_str(Getattr(node, "type"), 0));
-	  }
-	  Delete(import_pair);
-	}
-      }
-      Delete(import_list);
-    }
-    Delete(imports_attribute);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * emitImportStatements()
-   * ----------------------------------------------------------------------------- */
-
-  void emitImportStatements(Hash *imports_hash, String *code) {
-    // Add the imports statements into code
-    Iterator imp = First(imports_hash);
-    while (imp.key != NIL) {
-      Printf(code, "IMPORT %s", imp.key);
-      String *imp_as = imp.item;
-      if (hasContent(imp_as)) {
-	Printf(code, " AS %s", imp_as);
-      }
-      Printf(code, ";\n");
-      imp = Next(imp);
-    }
-  }
-
-};				/* class MODULA3 */
-
-/* -----------------------------------------------------------------------------
- * swig_modula3()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-extern "C" Language *swig_modula3(void) {
-  return new MODULA3();
-}
-
-/* -----------------------------------------------------------------------------
- * Static member variables
- * ----------------------------------------------------------------------------- */
-
-const char *MODULA3::usage = "\
-Modula 3 Options (available with -modula3)\n\
-     -generateconst <file>   - Generate code for computing numeric values of constants\n\
-     -generaterename <file>  - Generate suggestions for %rename\n\
-     -generatetypemap <file> - Generate templates for some basic typemaps\n\
-     -oldvarnames            - Old intermediary method names for variable wrappers\n\
-\n";
-
-/*
-     -generateconst <file> - stem of the .c source file for computing the numeric values of constants\n\
-     -generaterename <file> - stem of the .i source file containing %rename suggestions\n\
-     -generatetypemap <file> - stem of the .i source file containing typemap patterns\n\
-*/
diff --git a/dependencies2013/win32/swig/Source/Modules/module.cxx b/dependencies2013/win32/swig/Source/Modules/module.cxx
deleted file mode 100644
index aa48689a..00000000
--- a/dependencies2013/win32/swig/Source/Modules/module.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * module.cxx
- *
- * This file is responsible for the module system.  
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-struct Module {
-  ModuleFactory fac;
-  char *name;
-  Module *next;
-   Module(const char *n, ModuleFactory f) {
-    fac = f;
-    name = new char[strlen(n) + 1];
-     strcpy(name, n);
-     next = 0;
-  } ~Module() {
-    delete[]name;
-  }
-};
-
-static Module *modules = 0;
-
-/* -----------------------------------------------------------------------------
- * void Swig_register_module()
- *
- * Register a module.
- * ----------------------------------------------------------------------------- */
-
-void Swig_register_module(const char *n, ModuleFactory f) {
-  Module *m = new Module(n, f);
-  m->next = modules;
-  modules = m;
-}
-
-/* -----------------------------------------------------------------------------
- * Language *Swig_find_module()
- *
- * Given a command line option, locates the factory function.
- * ----------------------------------------------------------------------------- */
-
-ModuleFactory Swig_find_module(const char *name) {
-  Module *m = modules;
-  while (m) {
-    if (strcmp(m->name, name) == 0) {
-      return m->fac;
-    }
-    m = m->next;
-  }
-  return 0;
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/mzscheme.cxx b/dependencies2013/win32/swig/Source/Modules/mzscheme.cxx
deleted file mode 100644
index dd3aecc4..00000000
--- a/dependencies2013/win32/swig/Source/Modules/mzscheme.cxx
+++ /dev/null
@@ -1,823 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * mzscheme.cxx
- *
- * Mzscheme language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-#include <ctype.h>
-
-static const char *usage = "\
-Mzscheme Options (available with -mzscheme)\n\
-     -declaremodule                         - Create extension that declares a module\n\
-     -dynamic-load <library>,[library,...]  - Do not link with these libraries, dynamic load\n\
-                                              them\n\
-     -noinit                                - Do not emit scheme_initialize, scheme_reload,\n\
-                                              scheme_module_name functions\n\
-     -prefix <name>                         - Set a prefix <name> to be prepended to all names\n\
-";
-
-static String *fieldnames_tab = 0;
-static String *convert_tab = 0;
-static String *convert_proto_tab = 0;
-static String *struct_name = 0;
-static String *mangled_struct_name = 0;
-
-static String *prefix = 0;
-static bool declaremodule = false;
-static bool noinit = false;
-static String *load_libraries = NULL;
-static String *module = 0;
-static const char *mzscheme_path = "mzscheme";
-static String *init_func_def = 0;
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_header = 0;
-static File *f_wrappers = 0;
-static File *f_init = 0;
-
-// Used for garbage collection
-static int exporting_destructor = 0;
-static String *swigtype_ptr = 0;
-static String *cls_swigtype = 0;
-
-class MZSCHEME:public Language {
-public:
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-
-    int i;
-
-     SWIG_library_directory(mzscheme_path);
-
-    // Look for certain command line options
-    for (i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage, stdout);
-	  SWIG_exit(0);
-	} else if (strcmp(argv[i], "-prefix") == 0) {
-	  if (argv[i + 1]) {
-	    prefix = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-declaremodule") == 0) {
-	  declaremodule = true;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noinit") == 0) {
-	  noinit = true;
-	  Swig_mark_arg(i);
-	}
-	else if (strcmp(argv[i], "-dynamic-load") == 0) {
-	  if (argv[i + 1]) {
-	    Delete(load_libraries);
-	    load_libraries = NewString(argv[i + 1]);
-	    Swig_mark_arg(i++);
-	    Swig_mark_arg(i);
-	  } else {
-	    Swig_arg_error();
-	  }
-	}
-      }
-    }
-
-    // If a prefix has been specified make sure it ends in a '_' (not actually used!)
-    if (prefix) {
-      const char *px = Char(prefix);
-      if (px[Len(prefix) - 1] != '_')
-	Printf(prefix, "_");
-    } else
-      prefix = NewString("swig_");
-
-    // Add a symbol for this module
-
-    Preprocessor_define("SWIGMZSCHEME 1", 0);
-
-    // Set name of typemaps
-
-    SWIG_typemap_lang("mzscheme");
-
-    // Read in default typemaps */
-    SWIG_config_file("mzscheme.swg");
-    allow_overloading();
-
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-
-    init_func_def = NewString("");
-    Swig_register_filebyname("init", init_func_def);
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGMZSCHEME\n#define SWIGMZSCHEME\n#endif\n\n");
-
-    module = Getattr(n, "name");
-
-    Language::top(n);
-
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-    if (!noinit) {
-      if (declaremodule) {
-	Printf(f_init, "#define SWIG_MZSCHEME_CREATE_MENV(env) scheme_primitive_module(scheme_intern_symbol(\"%s\"), env)\n", module);
-      } else {
-	Printf(f_init, "#define SWIG_MZSCHEME_CREATE_MENV(env) (env)\n");
-      }
-      Printf(f_init, "%s\n", Char(init_func_def));
-      if (declaremodule) {
-	Printf(f_init, "\tscheme_finish_primitive_module(menv);\n");
-      }
-      Printf(f_init, "\treturn scheme_void;\n}\n");
-      Printf(f_init, "Scheme_Object *scheme_initialize(Scheme_Env *env) {\n");
-
-      if (load_libraries) {
-	Printf(f_init, "mz_set_dlopen_libraries(\"%s\");\n", load_libraries);
-      }
-
-      Printf(f_init, "\treturn scheme_reload(env);\n");
-      Printf(f_init, "}\n");
-
-      Printf(f_init, "Scheme_Object *scheme_module_name(void) {\n");
-      if (declaremodule) {
-	Printf(f_init, "   return scheme_intern_symbol((char*)\"%s\");\n", module);
-      } else {
-	Printf(f_init, "   return scheme_make_symbol((char*)\"%s\");\n", module);
-      }
-      Printf(f_init, "}\n");
-    }
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * Create a function declaration and register it with the interpreter.
-   * ------------------------------------------------------------ */
-
-  void throw_unhandled_mzscheme_type_error(SwigType *d) {
-    Swig_warning(WARN_TYPEMAP_UNDEF, input_file, line_number, "Unable to handle type %s.\n", SwigType_str(d, 0));
-  }
-
-  /* Return true iff T is a pointer type */
-
-  int
-   is_a_pointer(SwigType *t) {
-    return SwigType_ispointer(SwigType_typedef_resolve_all(t));
-  }
-
-  virtual int functionWrapper(Node *n) {
-    char *iname = GetChar(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    Parm *p;
-
-    Wrapper *f = NewWrapper();
-    String *proc_name = NewString("");
-    String *source = NewString("");
-    String *target = NewString("");
-    String *arg = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *build = NewString("");
-    String *tm;
-    int i = 0;
-    int numargs;
-    int numreq;
-    String *overname = 0;
-
-    if (load_libraries) {
-      ParmList *parms = Getattr(n, "parms");
-      SwigType *type = Getattr(n, "type");
-      String *name = NewString("caller");
-      Setattr(n, "wrap:action", Swig_cresult(type, Swig_cresult_name(), Swig_cfunction_call(name, parms)));
-    }
-
-    // Make a wrapper name for this
-    String *wname = Swig_name_wrapper(iname);
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n)) {
-        DelWrapper(f);
-	return SWIG_ERROR;
-      }
-    }
-    if (overname) {
-      Append(wname, overname);
-    }
-    Setattr(n, "wrap:name", wname);
-
-    // Build the name for Scheme.
-    Printv(proc_name, iname, NIL);
-    Replaceall(proc_name, "_", "-");
-
-    // writing the function wrapper function
-    Printv(f->def, "static Scheme_Object *", wname, " (", NIL);
-    Printv(f->def, "int argc, Scheme_Object **argv", NIL);
-    Printv(f->def, ")\n{", NIL);
-
-    /* Define the scheme name in C. This define is used by several
-       macros. */
-    Printv(f->def, "#define FUNC_NAME \"", proc_name, "\"", NIL);
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    numargs = emit_num_arguments(l);
-    numreq = emit_num_required(l);
-
-    /* Add the holder for the pointer to the function to be opened */
-    if (load_libraries) {
-      Wrapper_add_local(f, "_function_loaded", "static int _function_loaded=(1==0)");
-      Wrapper_add_local(f, "_the_function", "static void *_the_function=NULL");
-      {
-	String *parms = ParmList_protostr(l);
-	String *func = NewStringf("(*caller)(%s)", parms);
-	Wrapper_add_local(f, "caller", SwigType_lstr(d, func));	/*"(*caller)()")); */
-      }
-    }
-
-    // adds local variables
-    Wrapper_add_local(f, "lenv", "int lenv = 1");
-    Wrapper_add_local(f, "values", "Scheme_Object *values[MAXVALUES]");
-
-    if (load_libraries) {
-      Printf(f->code, "if (!_function_loaded) { _the_function=mz_load_function(\"%s\");_function_loaded=(1==1); }\n", iname);
-      Printf(f->code, "if (!_the_function) { scheme_signal_error(\"Cannot load C function '%s'\"); }\n", iname);
-      Printf(f->code, "caller=_the_function;\n");
-    }
-
-    // Now write code to extract the parameters (this is super ugly)
-
-    for (i = 0, p = l; i < numargs; i++) {
-      /* Skip ignored arguments */
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-
-      // Produce names of source and target
-      Clear(source);
-      Clear(target);
-      Clear(arg);
-      Printf(source, "argv[%d]", i);
-      Printf(target, "%s", ln);
-      Printv(arg, Getattr(p, "name"), NIL);
-
-      if (i >= numreq) {
-	Printf(f->code, "if (argc > %d) {\n", i);
-      }
-      // Handle parameter types.
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$target", target);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	// no typemap found
-	// check if typedef and resolve
-	throw_unhandled_mzscheme_type_error(pt);
-	p = nextSibling(p);
-      }
-      if (i >= numreq) {
-	Printf(f->code, "}\n");
-      }
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Pass output arguments back to the caller.
-
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* Deprecated */
-	Replaceall(tm, "$target", Getattr(p, "lname"));	/* Deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Free up any memory allocated for the arguments.
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Now write code to make the function call
-
-    String *actioncode = emit_action(n);
-
-    // Now have return value, figure out what to do with it.
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$target", "values[0]");
-      Replaceall(tm, "$result", "values[0]");
-      if (GetFlag(n, "feature:new"))
-	Replaceall(tm, "$owner", "1");
-      else
-	Replaceall(tm, "$owner", "0");
-      Printv(f->code, tm, "\n", NIL);
-    } else {
-      throw_unhandled_mzscheme_type_error(d);
-    }
-    emit_return_variable(n, d, f);
-
-    // Dump the argument output code
-    Printv(f->code, Char(outarg), NIL);
-
-    // Dump the argument cleanup code
-    Printv(f->code, Char(cleanup), NIL);
-
-    // Look for any remaining cleanup
-
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printv(f->code, tm, "\n", NIL);
-      }
-    }
-    // Free any memory allocated by the function being wrapped..
-
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printv(f->code, tm, "\n", NIL);
-    }
-    // Wrap things up (in a manner of speaking)
-
-    Printv(f->code, tab4, "return SWIG_MzScheme_PackageValues(lenv, values);\n", NIL);
-    Printf(f->code, "#undef FUNC_NAME\n");
-    Printv(f->code, "}\n", NIL);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", iname);
-
-    Wrapper_print(f, f_wrappers);
-
-    if (!Getattr(n, "sym:overloaded")) {
-
-      // Now register the function
-      char temp[256];
-      sprintf(temp, "%d", numargs);
-      if (exporting_destructor) {
-	Printf(init_func_def, "SWIG_TypeClientData(SWIGTYPE%s, (void *) %s);\n", swigtype_ptr, wname);
-      } else {
-	Printf(init_func_def, "scheme_add_global(\"%s\", scheme_make_prim_w_arity(%s,\"%s\",%d,%d),menv);\n", proc_name, wname, proc_name, numreq, numargs);
-      }
-    } else {
-      if (!Getattr(n, "sym:nextSibling")) {
-	/* Emit overloading dispatch function */
-
-	int maxargs;
-	String *dispatch = Swig_overload_dispatch(n, "return %s(argc,argv);", &maxargs);
-
-	/* Generate a dispatch wrapper for all overloaded functions */
-
-	Wrapper *df = NewWrapper();
-	String *dname = Swig_name_wrapper(iname);
-
-	Printv(df->def, "static Scheme_Object *\n", dname, "(int argc, Scheme_Object **argv) {", NIL);
-	Printv(df->code, dispatch, "\n", NIL);
-	Printf(df->code, "scheme_signal_error(\"No matching function for overloaded '%s'\");\n", iname);
-	Printv(df->code, "}\n", NIL);
-	Wrapper_print(df, f_wrappers);
-	Printf(init_func_def, "scheme_add_global(\"%s\", scheme_make_prim_w_arity(%s,\"%s\",%d,%d),menv);\n", proc_name, dname, proc_name, 0, maxargs);
-	DelWrapper(df);
-	Delete(dispatch);
-	Delete(dname);
-      }
-    }
-
-    Delete(proc_name);
-    Delete(source);
-    Delete(target);
-    Delete(arg);
-    Delete(outarg);
-    Delete(cleanup);
-    Delete(build);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   *
-   * Create a link to a C variable.
-   * This creates a single function _wrap_swig_var_varname().
-   * This function takes a single optional argument.   If supplied, it means
-   * we are setting this variable to some value.  If omitted, it means we are
-   * simply evaluating this variable.  Either way, we return the variables
-   * value.
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-
-    String *proc_name = NewString("");
-    String *tm;
-    String *tm2 = NewString("");
-    String *argnum = NewString("0");
-    String *arg = NewString("argv[0]");
-    Wrapper *f;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    f = NewWrapper();
-
-    // evaluation function names
-    String *var_name = Swig_name_wrapper(iname);
-
-    // Build the name for scheme.
-    Printv(proc_name, iname, NIL);
-    Replaceall(proc_name, "_", "-");
-    Setattr(n, "wrap:name", proc_name);
-
-    if ((SwigType_type(t) != T_USER) || (is_a_pointer(t))) {
-
-      Printf(f->def, "static Scheme_Object *%s(int argc, Scheme_Object** argv) {\n", var_name);
-      Printv(f->def, "#define FUNC_NAME \"", proc_name, "\"", NIL);
-
-      Wrapper_add_local(f, "swig_result", "Scheme_Object *swig_result");
-
-      if (!GetFlag(n, "feature:immutable")) {
-	/* Check for a setting of the variable value */
-	Printf(f->code, "if (argc) {\n");
-	if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-	  Replaceall(tm, "$source", "argv[0]");
-	  Replaceall(tm, "$target", name);
-	  Replaceall(tm, "$input", "argv[0]");
-	  /* Printv(f->code, tm, "\n",NIL); */
-	  emit_action_code(n, f->code, tm);
-	} else {
-	  throw_unhandled_mzscheme_type_error(t);
-	}
-	Printf(f->code, "}\n");
-      }
-      // Now return the value of the variable (regardless
-      // of evaluating or setting)
-
-      if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-	Replaceall(tm, "$source", name);
-	Replaceall(tm, "$target", "swig_result");
-	Replaceall(tm, "$result", "swig_result");
-	/* Printf (f->code, "%s\n", tm); */
-	emit_action_code(n, f->code, tm);
-      } else {
-	throw_unhandled_mzscheme_type_error(t);
-      }
-      Printf(f->code, "\nreturn swig_result;\n");
-      Printf(f->code, "#undef FUNC_NAME\n");
-      Printf(f->code, "}\n");
-
-      Wrapper_print(f, f_wrappers);
-
-      // Now add symbol to the MzScheme interpreter
-
-      Printv(init_func_def,
-	     "scheme_add_global(\"", proc_name, "\", scheme_make_prim_w_arity(", var_name, ", \"", proc_name, "\", ", "0", ", ", "1", "), menv);\n", NIL);
-
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAR_UNDEF, input_file, line_number, "Unsupported variable type %s (ignored).\n", SwigType_str(t, 0));
-    }
-    Delete(var_name);
-    Delete(proc_name);
-    Delete(argnum);
-    Delete(arg);
-    Delete(tm2);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *value = Getattr(n, "value");
-
-    String *var_name = NewString("");
-    String *proc_name = NewString("");
-    String *rvalue = NewString("");
-    String *temp = NewString("");
-    String *tm;
-
-    // Make a static variable;
-
-    Printf(var_name, "_wrap_const_%s", Swig_name_mangle(Getattr(n, "sym:name")));
-
-    // Build the name for scheme.
-    Printv(proc_name, iname, NIL);
-    Replaceall(proc_name, "_", "-");
-
-    if ((SwigType_type(type) == T_USER) && (!is_a_pointer(type))) {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      return SWIG_NOWRAP;
-    }
-    // See if there's a typemap
-
-    Printv(rvalue, value, NIL);
-    if ((SwigType_type(type) == T_CHAR) && (is_a_pointer(type) == 1)) {
-      temp = Copy(rvalue);
-      Clear(rvalue);
-      Printv(rvalue, "\"", temp, "\"", NIL);
-    }
-    if ((SwigType_type(type) == T_CHAR) && (is_a_pointer(type) == 0)) {
-      Delete(temp);
-      temp = Copy(rvalue);
-      Clear(rvalue);
-      Printv(rvalue, "'", temp, "'", NIL);
-    }
-    if ((tm = Swig_typemap_lookup("constant", n, name, 0))) {
-      Replaceall(tm, "$source", rvalue);
-      Replaceall(tm, "$value", rvalue);
-      Replaceall(tm, "$target", name);
-      Printf(f_init, "%s\n", tm);
-    } else {
-      // Create variable and assign it a value
-
-      Printf(f_header, "static %s = ", SwigType_lstr(type, var_name));
-      bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0);
-      if ((SwigType_type(type) == T_STRING)) {
-	Printf(f_header, "\"%s\";\n", value);
-      } else if (SwigType_type(type) == T_CHAR && !is_enum_item) {
-	Printf(f_header, "\'%s\';\n", value);
-      } else {
-	Printf(f_header, "%s;\n", value);
-      }
-
-      // Now create a variable declaration
-
-      {
-	/* Hack alert: will cleanup later -- Dave */
-	Node *nn = NewHash();
-	Setfile(nn, Getfile(n));
-	Setline(nn, Getline(n));
-	Setattr(nn, "name", var_name);
-	Setattr(nn, "sym:name", iname);
-	Setattr(nn, "type", type);
-	SetFlag(nn, "feature:immutable");
-	variableWrapper(nn);
-	Delete(nn);
-      }
-    }
-    Delete(proc_name);
-    Delete(rvalue);
-    Delete(temp);
-    return SWIG_OK;
-  }
-
-  virtual int destructorHandler(Node *n) {
-    exporting_destructor = true;
-    Language::destructorHandler(n);
-    exporting_destructor = false;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-  virtual int classHandler(Node *n) {
-    String *mangled_classname = 0;
-    String *real_classname = 0;
-    String *scm_structname = NewString("");
-    SwigType *ctype_ptr = NewStringf("p.%s", getClassType());
-
-    SwigType *t = NewStringf("p.%s", Getattr(n, "name"));
-    swigtype_ptr = SwigType_manglestr(t);
-    Delete(t);
-
-    cls_swigtype = SwigType_manglestr(Getattr(n, "name"));
-
-
-    fieldnames_tab = NewString("");
-    convert_tab = NewString("");
-    convert_proto_tab = NewString("");
-
-    struct_name = Getattr(n, "sym:name");
-    mangled_struct_name = Swig_name_mangle(Getattr(n, "sym:name"));
-
-    Printv(scm_structname, struct_name, NIL);
-    Replaceall(scm_structname, "_", "-");
-
-    real_classname = Getattr(n, "name");
-    mangled_classname = Swig_name_mangle(real_classname);
-
-    Printv(fieldnames_tab, "static const char *_swig_struct_", cls_swigtype, "_field_names[] = { \n", NIL);
-
-    Printv(convert_proto_tab, "static Scheme_Object *_swig_convert_struct_", cls_swigtype, "(", SwigType_str(ctype_ptr, "ptr"), ");\n", NIL);
-
-    Printv(convert_tab, "static Scheme_Object *_swig_convert_struct_", cls_swigtype, "(", SwigType_str(ctype_ptr, "ptr"), ")\n {\n", NIL);
-
-    Printv(convert_tab,
-	   tab4, "Scheme_Object *obj;\n", tab4, "Scheme_Object *fields[_swig_struct_", cls_swigtype, "_field_names_cnt];\n", tab4, "int i = 0;\n\n", NIL);
-
-    /* Generate normal wrappers */
-    Language::classHandler(n);
-
-    Printv(convert_tab, tab4, "obj = scheme_make_struct_instance(", "_swig_struct_type_", cls_swigtype, ", i, fields);\n", NIL);
-    Printv(convert_tab, tab4, "return obj;\n}\n\n", NIL);
-
-    Printv(fieldnames_tab, "};\n", NIL);
-
-    Printv(f_header, "static Scheme_Object *_swig_struct_type_", cls_swigtype, ";\n", NIL);
-
-    Printv(f_header, fieldnames_tab, NIL);
-    Printv(f_header, "#define  _swig_struct_", cls_swigtype, "_field_names_cnt (sizeof(_swig_struct_", cls_swigtype, "_field_names)/sizeof(char*))\n", NIL);
-
-    Printv(f_header, convert_proto_tab, NIL);
-    Printv(f_wrappers, convert_tab, NIL);
-
-    Printv(init_func_def, "_swig_struct_type_", cls_swigtype,
-	   " = SWIG_MzScheme_new_scheme_struct(menv, \"", scm_structname, "\", ",
-	   "_swig_struct_", cls_swigtype, "_field_names_cnt,", "(char**) _swig_struct_", cls_swigtype, "_field_names);\n", NIL);
-
-    Delete(mangled_classname);
-    Delete(swigtype_ptr);
-    swigtype_ptr = 0;
-    Delete(fieldnames_tab);
-    Delete(convert_tab);
-    Delete(ctype_ptr);
-    Delete(convert_proto_tab);
-    struct_name = 0;
-    mangled_struct_name = 0;
-    Delete(cls_swigtype);
-    cls_swigtype = 0;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    Language::membervariableHandler(n);
-
-    if (!is_smart_pointer()) {
-      String *symname = Getattr(n, "sym:name");
-      String *name = Getattr(n, "name");
-      SwigType *type = Getattr(n, "type");
-      String *swigtype = SwigType_manglestr(Getattr(n, "type"));
-      String *tm = 0;
-      String *access_mem = NewString("");
-      SwigType *ctype_ptr = NewStringf("p.%s", Getattr(n, "type"));
-
-      Printv(fieldnames_tab, tab4, "\"", symname, "\",\n", NIL);
-      Printv(access_mem, "(ptr)->", name, NIL);
-      if ((SwigType_type(type) == T_USER) && (!is_a_pointer(type))) {
-	Printv(convert_tab, tab4, "fields[i++] = ", NIL);
-	Printv(convert_tab, "_swig_convert_struct_", swigtype, "((", SwigType_str(ctype_ptr, 0), ")&((ptr)->", name, "));\n", NIL);
-      } else if ((tm = Swig_typemap_lookup("varout", n, access_mem, 0))) {
-	Replaceall(tm, "$result", "fields[i++]");
-	Printv(convert_tab, tm, "\n", NIL);
-      } else
-	Swig_warning(WARN_TYPEMAP_VAR_UNDEF, input_file, line_number, "Unsupported member variable type %s (ignored).\n", SwigType_str(type, 0));
-
-      Delete(access_mem);
-    }
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * validIdentifer()
-   * ------------------------------------------------------------ */
-
-  virtual int validIdentifier(String *s) {
-    char *c = Char(s);
-    /* Check whether we have an R5RS identifier. */
-    /* <identifier> --> <initial> <subsequent>* | <peculiar identifier> */
-    /* <initial> --> <letter> | <special initial> */
-    if (!(isalpha(*c) || (*c == '!') || (*c == '$') || (*c == '%')
-	  || (*c == '&') || (*c == '*') || (*c == '/') || (*c == ':')
-	  || (*c == '<') || (*c == '=') || (*c == '>') || (*c == '?')
-	  || (*c == '^') || (*c == '_') || (*c == '~'))) {
-      /* <peculiar identifier> --> + | - | ... */
-      if ((strcmp(c, "+") == 0)
-	  || strcmp(c, "-") == 0 || strcmp(c, "...") == 0)
-	return 1;
-      else
-	return 0;
-    }
-    /* <subsequent> --> <initial> | <digit> | <special subsequent> */
-    while (*c) {
-      if (!(isalnum(*c) || (*c == '!') || (*c == '$') || (*c == '%')
-	    || (*c == '&') || (*c == '*') || (*c == '/') || (*c == ':')
-	    || (*c == '<') || (*c == '=') || (*c == '>') || (*c == '?')
-	    || (*c == '^') || (*c == '_') || (*c == '~') || (*c == '+')
-	    || (*c == '-') || (*c == '.') || (*c == '@')))
-	return 0;
-      c++;
-    }
-    return 1;
-  }
-
-  String *runtimeCode() {
-    String *s = Swig_include_sys("mzrun.swg");
-    if (!s) {
-      Printf(stderr, "*** Unable to open 'mzrun.swg'\n");
-      s = NewString("");
-    }
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigmzrun.h");
-  }
-};
-
-/* -----------------------------------------------------------------------------
- * swig_mzscheme()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_mzscheme() {
-  return new MZSCHEME();
-}
-extern "C" Language *swig_mzscheme(void) {
-  return new_swig_mzscheme();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/nested.cxx b/dependencies2013/win32/swig/Source/Modules/nested.cxx
deleted file mode 100644
index 0fcd5ad1..00000000
--- a/dependencies2013/win32/swig/Source/Modules/nested.cxx
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * nested.cxx
- *
- * Nested structs support
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-
-// Nested classes processing section
-static Hash *classhash = 0;
-
-static String *make_name(Node *n, String *name, SwigType *decl) {
-  int destructor = name && (*(Char(name)) == '~');
-  if (String *yyrename = Getattr(n, "class_rename")) {
-    String *s = NewString(yyrename);
-    Delattr(n, "class_rename");
-    if (destructor && (*(Char(s)) != '~')) {
-      Insert(s, 0, "~");
-    }
-    return s;
-  }
-
-  if (!name)
-    return 0;
-  return Swig_name_make(n, 0, name, decl, 0);
-}
-
-// C version of add_symbols()
-static void add_symbols_c(Node *n) {
-  String *decl;
-  String *wrn = 0;
-  String *symname = 0;
-  int iscdecl = Cmp(nodeType(n), "cdecl") == 0;
-  Setattr(n, "ismember", "1");
-  Setattr(n, "access", "public");
-  if (Getattr(n, "sym:name"))
-    return;
-  decl = Getattr(n, "decl");
-  if (!SwigType_isfunction(decl)) {
-    String *name = Getattr(n, "name");
-    String *makename = Getattr(n, "parser:makename");
-    if (iscdecl) {
-      String *storage = Getattr(n, "storage");
-      if (Cmp(storage, "typedef") == 0) {
-	Setattr(n, "kind", "typedef");
-      } else {
-	SwigType *type = Getattr(n, "type");
-	String *value = Getattr(n, "value");
-	Setattr(n, "kind", "variable");
-	if (value && Len(value)) {
-	  Setattr(n, "hasvalue", "1");
-	}
-	if (type) {
-	  SwigType *ty;
-	  SwigType *tmp = 0;
-	  if (decl) {
-	    ty = tmp = Copy(type);
-	    SwigType_push(ty, decl);
-	  } else {
-	    ty = type;
-	  }
-	  if (!SwigType_ismutable(ty)) {
-	    SetFlag(n, "hasconsttype");
-	    SetFlag(n, "feature:immutable");
-	  }
-	  if (tmp)
-	    Delete(tmp);
-	}
-	if (!type) {
-	  Printf(stderr, "notype name %s\n", name);
-	}
-      }
-    }
-    Swig_features_get(Swig_cparse_features(), 0, name, 0, n);
-    if (makename) {
-      symname = make_name(n, makename, 0);
-      Delattr(n, "parser:makename");	/* temporary information, don't leave it hanging around */
-    } else {
-      makename = name;
-      symname = make_name(n, makename, 0);
-    }
-
-    if (!symname) {
-      symname = Copy(Getattr(n, "unnamed"));
-    }
-    if (symname) {
-      wrn = Swig_name_warning(n, 0, symname, 0);
-    }
-  } else {
-    String *name = Getattr(n, "name");
-    SwigType *fdecl = Copy(decl);
-    SwigType *fun = SwigType_pop_function(fdecl);
-    if (iscdecl) {
-      Setattr(n, "kind", "function");
-    }
-
-    Swig_features_get(Swig_cparse_features(), 0, name, fun, n);
-
-    symname = make_name(n, name, fun);
-    wrn = Swig_name_warning(n, 0, symname, fun);
-
-    Delete(fdecl);
-    Delete(fun);
-
-  }
-  if (!symname)
-    return;
-  if (GetFlag(n, "feature:ignore")) {
-    /* Only add to C symbol table and continue */
-    Swig_symbol_add(0, n);
-  } else if (strncmp(Char(symname), "$ignore", 7) == 0) {
-    char *c = Char(symname) + 7;
-    SetFlag(n, "feature:ignore");
-    if (strlen(c)) {
-      SWIG_WARN_NODE_BEGIN(n);
-      Swig_warning(0, Getfile(n), Getline(n), "%s\n", c + 1);
-      SWIG_WARN_NODE_END(n);
-    }
-    Swig_symbol_add(0, n);
-  } else {
-    Node *c;
-    if ((wrn) && (Len(wrn))) {
-      String *metaname = symname;
-      if (!Getmeta(metaname, "already_warned")) {
-	SWIG_WARN_NODE_BEGIN(n);
-	Swig_warning(0, Getfile(n), Getline(n), "%s\n", wrn);
-	SWIG_WARN_NODE_END(n);
-	Setmeta(metaname, "already_warned", "1");
-      }
-    }
-    c = Swig_symbol_add(symname, n);
-
-    if (c != n) {
-      /* symbol conflict attempting to add in the new symbol */
-      if (Getattr(n, "sym:weak")) {
-	Setattr(n, "sym:name", symname);
-      } else {
-	String *e = NewStringEmpty();
-	String *en = NewStringEmpty();
-	String *ec = NewStringEmpty();
-	int redefined = Swig_need_redefined_warn(n, c, true);
-	if (redefined) {
-	  Printf(en, "Identifier '%s' redefined (ignored)", symname);
-	  Printf(ec, "previous definition of '%s'", symname);
-	} else {
-	  Printf(en, "Redundant redeclaration of '%s'", symname);
-	  Printf(ec, "previous declaration of '%s'", symname);
-	}
-	if (Cmp(symname, Getattr(n, "name"))) {
-	  Printf(en, " (Renamed from '%s')", SwigType_namestr(Getattr(n, "name")));
-	}
-	Printf(en, ",");
-	if (Cmp(symname, Getattr(c, "name"))) {
-	  Printf(ec, " (Renamed from '%s')", SwigType_namestr(Getattr(c, "name")));
-	}
-	Printf(ec, ".");
-	SWIG_WARN_NODE_BEGIN(n);
-	if (redefined) {
-	  Swig_warning(WARN_PARSE_REDEFINED, Getfile(n), Getline(n), "%s\n", en);
-	  Swig_warning(WARN_PARSE_REDEFINED, Getfile(c), Getline(c), "%s\n", ec);
-	} else {
-	  Swig_warning(WARN_PARSE_REDUNDANT, Getfile(n), Getline(n), "%s\n", en);
-	  Swig_warning(WARN_PARSE_REDUNDANT, Getfile(c), Getline(c), "%s\n", ec);
-	}
-	SWIG_WARN_NODE_END(n);
-	Printf(e, "%s:%d:%s\n%s:%d:%s\n", Getfile(n), Getline(n), en, Getfile(c), Getline(c), ec);
-	Setattr(n, "error", e);
-	Delete(e);
-	Delete(en);
-	Delete(ec);
-      }
-    }
-  }
-  Delete(symname);
-}
-
-/* Strips C-style and C++-style comments from string in-place. */
-static void strip_comments(char *string) {
-  int state = 0;
-  /*
-   * 0 - not in comment
-   * 1 - in c-style comment
-   * 2 - in c++-style comment
-   * 3 - in string
-   * 4 - after reading / not in comments
-   * 5 - after reading * in c-style comments
-   * 6 - after reading \ in strings
-   */
-  char *c = string;
-  while (*c) {
-    switch (state) {
-    case 0:
-      if (*c == '\"')
-	state = 3;
-      else if (*c == '/')
-	state = 4;
-      break;
-    case 1:
-      if (*c == '*')
-	state = 5;
-      *c = ' ';
-      break;
-    case 2:
-      if (*c == '\n')
-	state = 0;
-      else
-	*c = ' ';
-      break;
-    case 3:
-      if (*c == '\"')
-	state = 0;
-      else if (*c == '\\')
-	state = 6;
-      break;
-    case 4:
-      if (*c == '/') {
-	*(c - 1) = ' ';
-	*c = ' ';
-	state = 2;
-      } else if (*c == '*') {
-	*(c - 1) = ' ';
-	*c = ' ';
-	state = 1;
-      } else
-	state = 0;
-      break;
-    case 5:
-      if (*c == '/')
-	state = 0;
-      else
-	state = 1;
-      *c = ' ';
-      break;
-    case 6:
-      state = 3;
-      break;
-    }
-    ++c;
-  }
-}
-
-// Create a %insert with a typedef to make a new name visible to C
-static Node *create_insert(Node *n, bool noTypedef = false) {
-  // format a typedef
-  String *ccode = Getattr(n, "code");
-  Push(ccode, " ");
-  if (noTypedef) {
-    Push(ccode, Getattr(n, "name"));
-    Push(ccode, " ");
-    Push(ccode, Getattr(n, "kind"));
-  } else {
-    Push(ccode, Getattr(n, "kind"));
-    Push(ccode, "typedef ");
-    Append(ccode, " ");
-    Append(ccode, Getattr(n, "tdname"));
-  }
-  Append(ccode, ";");
-
-  /* Strip comments - further code may break in presence of comments. */
-  strip_comments(Char(ccode));
-
-  /* Make all SWIG created typedef structs/unions/classes unnamed else
-     redefinition errors occur - nasty hack alert. */
-  if (!noTypedef) {
-    const char *types_array[3] = { "struct", "union", "class" };
-    for (int i = 0; i < 3; i++) {
-      char *code_ptr = Char(ccode);
-      while (code_ptr) {
-	/* Replace struct name (as in 'struct name {...}' ) with whitespace
-	   name will be between struct and opening brace */
-
-	code_ptr = strstr(code_ptr, types_array[i]);
-	if (code_ptr) {
-	  char *open_bracket_pos;
-	  code_ptr += strlen(types_array[i]);
-	  open_bracket_pos = strchr(code_ptr, '{');
-	  if (open_bracket_pos) {
-	    /* Make sure we don't have something like struct A a; */
-	    char *semi_colon_pos = strchr(code_ptr, ';');
-	    if (!(semi_colon_pos && (semi_colon_pos < open_bracket_pos)))
-	      while (code_ptr < open_bracket_pos)
-		*code_ptr++ = ' ';
-	  }
-	}
-      }
-    }
-  }
-  {
-    /* Remove SWIG directive %constant which may be left in the SWIG created typedefs */
-    char *code_ptr = Char(ccode);
-    while (code_ptr) {
-      code_ptr = strstr(code_ptr, "%constant");
-      if (code_ptr) {
-	char *directive_end_pos = strchr(code_ptr, ';');
-	if (directive_end_pos) {
-	  while (code_ptr <= directive_end_pos)
-	    *code_ptr++ = ' ';
-	}
-      }
-    }
-  }
-  Node *newnode = NewHash();
-  set_nodeType(newnode, "insert");
-  Setfile(newnode, Getfile(n));
-  Setline(newnode, Getline(n));
-  String *code = NewStringEmpty();
-  Wrapper_pretty_print(ccode, code);
-  Setattr(newnode, "code", code);
-  Delete(code);
-  Delattr(n, "code");
-  return newnode;
-}
-
-static void insertNodeAfter(Node *n, Node *c) {
-  Node *g = parentNode(n);
-  set_parentNode(c, g);
-  Node *ns = nextSibling(n);
-  if (Node *outer = Getattr(c, "nested:outer")) {
-    while (ns && outer == Getattr(ns, "nested:outer")) {
-      n = ns;
-      ns = nextSibling(n);
-    }
-  }
-  if (!ns) {
-    set_lastChild(g, c);
-  } else {
-    set_nextSibling(c, ns);
-    set_previousSibling(ns, c);
-  }
-  set_nextSibling(n, c);
-  set_previousSibling(c, n);
-}
-
-void Swig_nested_name_unnamed_c_structs(Node *n) {
-  if (!n)
-    return;
-  if (!classhash)
-    classhash = Getattr(n, "classes");
-  Node *c = firstChild(n);
-  while (c) {
-    Node *next = nextSibling(c);
-    if (String *declName = Getattr(c, "nested:unnamed")) {
-      if (Node *outer = Getattr(c, "nested:outer")) {
-	// generate a name
-	String *name = NewStringf("%s_%s", Getattr(outer, "name"), declName);
-	Delattr(c, "nested:unnamed");
-	// set the name to the class and symbol table
-	Setattr(c, "tdname", name);
-	Setattr(c, "name", name);
-	Swig_symbol_setscope(Getattr(c, "symtab"));
-	Swig_symbol_setscopename(name);
-	// now that we have a name - gather base symbols
-	if (List *publicBases = Getattr(c, "baselist")) {
-	  List *bases = Swig_make_inherit_list(name, publicBases, 0);
-	  Swig_inherit_base_symbols(bases);
-	  Delete(bases);
-	}
-	Setattr(classhash, name, c);
-
-	// Merge the extension into the symbol table
-	if (Node *am = Getattr(Swig_extend_hash(), name)) {
-	  Swig_extend_merge(c, am);
-	  Swig_extend_append_previous(c, am);
-	  Delattr(Swig_extend_hash(), name);
-	}
-	Swig_symbol_popscope();
-
-	// process declarations following this type (assign correct new type)
-	SwigType *ty = Copy(name);
-	Node *decl = nextSibling(c);
-	List *declList = NewList();
-	while (decl && Getattr(decl, "nested:unnamedtype") == c) {
-	  Setattr(decl, "type", ty);
-	  Append(declList, decl);
-	  Delattr(decl, "nested:unnamedtype");
-	  SetFlag(decl, "feature:immutable");
-	  add_symbols_c(decl);
-	  decl = nextSibling(decl);
-	}
-	Delete(ty);
-	Swig_symbol_setscope(Swig_symbol_global_scope());
-	add_symbols_c(c);
-
-	Node *ins = create_insert(c);
-	insertNodeAfter(c, ins);
-	removeNode(c);
-	insertNodeAfter(n, c);
-	Delete(ins);
-	Delattr(c, "nested:outer");
-      } else {
-	// global unnamed struct - ignore it and it's instances
-	SetFlag(c, "feature:ignore");
-	while (next && Getattr(next, "nested:unnamedtype") == c) {
-	  SetFlag(next, "feature:ignore");
-	  next = nextSibling(next);
-	}
-	c = next;
-	continue;
-      }
-    } else if (cparse_cplusplusout) {
-      if (Getattr(c, "nested:outer")) {
-	Node *ins = create_insert(c, true);
-	insertNodeAfter(c, ins);
-	Delete(ins);
-	Delattr(c, "nested:outer");
-      }
-    }
-    // process children
-    Swig_nested_name_unnamed_c_structs(c);
-    c = next;
-  }
-}
-
-static void remove_outer_class_reference(Node *n) {
-  for (Node *c = firstChild(n); c; c = nextSibling(c)) {
-    if (GetFlag(c, "feature:flatnested") || Language::instance()->nestedClassesSupport() == Language::NCS_None) {
-      Delattr(c, "nested:outer");
-      remove_outer_class_reference(c);
-    }
-  }
-}
-
-void Swig_nested_process_classes(Node *n) {
-  if (!n)
-    return;
-  Node *c = firstChild(n);
-  while (c) {
-    Node *next = nextSibling(c);
-    if (!Getattr(c, "templatetype")) {
-      if (GetFlag(c, "nested") && (GetFlag(c, "feature:flatnested") || Language::instance()->nestedClassesSupport() == Language::NCS_None)) {
-	removeNode(c);
-	if (!checkAttribute(c, "access", "public"))
-	  SetFlag(c, "feature:ignore");
-	else if (Strcmp(nodeType(n),"extend") == 0 && Strcmp(nodeType(parentNode(n)),"class") == 0)
-	  insertNodeAfter(parentNode(n), c);
-	else
-	  insertNodeAfter(n, c);
-      }
-      Swig_nested_process_classes(c);
-    }
-    c = next;
-  }
-  remove_outer_class_reference(n);
-}
-
diff --git a/dependencies2013/win32/swig/Source/Modules/ocaml.cxx b/dependencies2013/win32/swig/Source/Modules/ocaml.cxx
deleted file mode 100644
index 73dd14f9..00000000
--- a/dependencies2013/win32/swig/Source/Modules/ocaml.cxx
+++ /dev/null
@@ -1,1832 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * ocaml.cxx
- *
- * Ocaml language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-#include <ctype.h>
-
-static const char *usage = "\
-Ocaml Options (available with -ocaml)\n\
-     -oldvarnames    - Old intermediary method names for variable wrappers\n\
-     -prefix <name>  - Set a prefix <name> to be prepended to all names\n\
-     -suffix <name>  - Deprecated alias for general option -cppext\n\
-     -where          - Emit library location\n\
-\n";
-
-static int classmode = 0;
-static int in_constructor = 0, in_destructor = 0, in_copyconst = 0;
-static int const_enum = 0;
-static int static_member_function = 0;
-static int generate_sizeof = 0;
-static String *prefix = 0;
-static const char *ocaml_path = "ocaml";
-static bool old_variable_names = false;
-static String *classname = 0;
-static String *module = 0;
-static String *init_func_def = 0;
-static String *f_classtemplate = 0;
-static SwigType *name_qualifier_type = 0;
-
-static Hash *seen_enums = 0;
-static Hash *seen_enumvalues = 0;
-static Hash *seen_constructors = 0;
-
-static File *f_header = 0;
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_wrappers = 0;
-static File *f_directors = 0;
-static File *f_directors_h = 0;
-static File *f_init = 0;
-static File *f_mlout = 0;
-static File *f_mliout = 0;
-static File *f_mlbody = 0;
-static File *f_mlibody = 0;
-static File *f_mltail = 0;
-static File *f_mlitail = 0;
-static File *f_enumtypes_type = 0;
-static File *f_enumtypes_value = 0;
-static File *f_class_ctors = 0;
-static File *f_class_ctors_end = 0;
-static File *f_enum_to_int = 0;
-static File *f_int_to_enum = 0;
-
-class OCAML:public Language {
-public:
-
-  OCAML() {
-    director_prot_ctor_code = NewString("");
-    Printv(director_prot_ctor_code,
-	   "if ( $comparison ) { /* subclassed */\n",
-	   "  $director_new \n", "} else {\n", "  failwith(\"accessing abstract class or protected constructor\"); \n", "}\n", NIL);
-    director_multiple_inheritance = 1;
-    director_language = 1;
-  }
- 
-  String *Swig_class_name(Node *n) {
-    String *name;
-    name = Copy(Getattr(n, "sym:name"));
-    return name;
-  }
-
-  void PrintIncludeArg() {
-    Printv(stdout, SWIG_LIB, SWIG_FILE_DELIMITER, ocaml_path, "\n", NIL);
-  }
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    int i;
-
-    prefix = 0;
-
-    SWIG_library_directory(ocaml_path);
-
-    // Look for certain command line options
-    for (i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage, stdout);
-	  SWIG_exit(0);
-	} else if (strcmp(argv[i], "-where") == 0) {
-	  PrintIncludeArg();
-	  SWIG_exit(0);
-	} else if (strcmp(argv[i], "-prefix") == 0) {
-	  if (argv[i + 1]) {
-	    prefix = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-suffix") == 0) {
-	  if (argv[i + 1]) {
-	    Printf(stderr, "swig: warning: -suffix option deprecated.  SWIG 3.0.4 and later provide a -cppext option which should be used instead.\n");
-	    SWIG_config_cppext(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else
-	    Swig_arg_error();
-	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
-	  Swig_mark_arg(i);
-	  old_variable_names = true;
-	}
-      }
-    }
-
-    // If a prefix has been specified make sure it ends in a '_' (not actually used!)
-    if (prefix) {
-      const char *px = Char(prefix);
-      if (px[Len(prefix) - 1] != '_')
-	Printf(prefix, "_");
-    } else
-      prefix = NewString("swig_");
-
-    // Add a symbol for this module
-
-    Preprocessor_define("SWIGOCAML 1", 0);
-    // Set name of typemaps
-
-    SWIG_typemap_lang("ocaml");
-
-    // Read in default typemaps */
-    SWIG_config_file("ocaml.i");
-    allow_overloading();
-
-  }
-
-  /* Swig_director_declaration()
-   *
-   * Generate the full director class declaration, complete with base classes.
-   * e.g. "class SwigDirector_myclass : public myclass, public Swig::Director {"
-   *
-   */
-
-  String *Swig_director_declaration(Node *n) {
-    String *classname = Swig_class_name(n);
-    String *directorname = NewStringf("SwigDirector_%s", classname);
-    String *base = Getattr(n, "classtype");
-    String *declaration = Swig_class_declaration(n, directorname);
-    Printf(declaration, " : public %s, public Swig::Director {\n", base);
-    Delete(classname);
-    Delete(directorname);
-    return declaration;
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   *
-   * Recognize the %module, and capture the module name.
-   * Create the default enum cases.
-   * Set up the named outputs:
-   *
-   *  init
-   *  ml
-   *  mli
-   *  wrapper
-   *  header
-   *  runtime
-   *  directors
-   *  directors_h
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-    /* Set comparison with none for ConstructorToFunction */
-    setSubclassInstanceCheck(NewString("caml_list_nth(args,0) != Val_unit"));
-
-    /* check if directors are enabled for this module.  note: this 
-     * is a "master" switch, without which no director code will be
-     * emitted.  %feature("director") statements are also required
-     * to enable directors for individual classes or methods.
-     *
-     * use %module(directors="1") modulename at the start of the 
-     * interface file to enable director generation.
-     */
-    {
-      Node *module = Getattr(n, "module");
-      if (module) {
-	Node *options = Getattr(module, "options");
-	if (options) {
-	  if (Getattr(options, "directors")) {
-	    allow_directors();
-	  }
-	  if (Getattr(options, "dirprot")) {
-	    allow_dirprot();
-	  }
-	  if (Getattr(options, "sizeof")) {
-	    generate_sizeof = 1;
-	  }
-	}
-      }
-    }
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors = NewString("");
-    f_directors_h = NewString("");
-    f_enumtypes_type = NewString("");
-    f_enumtypes_value = NewString("");
-    init_func_def = NewString("");
-    f_mlbody = NewString("");
-    f_mlibody = NewString("");
-    f_mltail = NewString("");
-    f_mlitail = NewString("");
-    f_class_ctors = NewString("");
-    f_class_ctors_end = NewString("");
-    f_enum_to_int = NewString("");
-    f_int_to_enum = NewString("");
-    f_classtemplate = NewString("");
-
-    module = Getattr(n, "name");
-
-    seen_constructors = NewHash();
-    seen_enums = NewHash();
-    seen_enumvalues = NewHash();
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("init", init_func_def);
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("mli", f_mlibody);
-    Swig_register_filebyname("ml", f_mlbody);
-    Swig_register_filebyname("mlitail", f_mlitail);
-    Swig_register_filebyname("mltail", f_mltail);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-    Swig_register_filebyname("classtemplate", f_classtemplate);
-    Swig_register_filebyname("class_ctors", f_class_ctors);
-
-    if (old_variable_names) {
-      Swig_name_register("set", "%n%v__set__");
-      Swig_name_register("get", "%n%v__get__");
-    }
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGOCAML\n#define SWIGOCAML\n#endif\n\n");
-
-    Printf(f_runtime, "#define SWIG_MODULE \"%s\"\n", module);
-    /* Module name */
-    Printf(f_mlbody, "let module_name = \"%s\"\n", module);
-    Printf(f_mlibody, "val module_name : string\n");
-    Printf(f_enum_to_int,
-	   "let enum_to_int x (v : c_obj) =\n"
-	   "   match v with\n"
-	   "     C_enum _y ->\n"
-	   "     (let y = _y in match (x : c_enum_type) with\n"
-	   "       `unknown -> " "         (match y with\n" "           `Int x -> (Swig.C_int x)\n" "           | _ -> raise (LabelNotFromThisEnum v))\n");
-
-    Printf(f_int_to_enum, "let int_to_enum x y =\n" "    match (x : c_enum_type) with\n" "      `unknown -> C_enum (`Int y)\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-    }
-
-    Printf(f_runtime, "\n");
-
-    /* Produce the enum_to_int and int_to_enum functions */
-
-    Printf(f_enumtypes_type, "open Swig\n" "type c_enum_type = [ \n  `unknown\n");
-    Printf(f_enumtypes_value, "type c_enum_value = [ \n  `Int of int\n");
-    String *mlfile = NewString("");
-    String *mlifile = NewString("");
-
-    Printv(mlfile, module, ".ml", NIL);
-    Printv(mlifile, module, ".mli", NIL);
-
-    String *mlfilen = NewStringf("%s%s", SWIG_output_directory(), mlfile);
-    if ((f_mlout = NewFile(mlfilen, "w", SWIG_output_files())) == 0) {
-      FileErrorDisplay(mlfilen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    String *mlifilen = NewStringf("%s%s", SWIG_output_directory(), mlifile);
-    if ((f_mliout = NewFile(mlifilen, "w", SWIG_output_files())) == 0) {
-      FileErrorDisplay(mlifilen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    Language::top(n);
-
-    Printf(f_enum_to_int, ") | _ -> (C_int (get_int v))\n" "let _ = Callback.register \"%s_enum_to_int\" enum_to_int\n", module);
-    Printf(f_mlibody, "val enum_to_int : c_enum_type -> c_obj -> Swig.c_obj\n");
-
-    Printf(f_int_to_enum, "let _ = Callback.register \"%s_int_to_enum\" int_to_enum\n", module);
-    Printf(f_mlibody, "val int_to_enum : c_enum_type -> int -> c_obj\n");
-    Printf(f_init, "#define SWIG_init f_%s_init\n" "%s" "}\n", module, init_func_def);
-    Printf(f_mlbody, "external f_init : unit -> unit = \"f_%s_init\" ;;\n" "let _ = f_init ()\n", module);
-    Printf(f_enumtypes_type, "]\n");
-    Printf(f_enumtypes_value, "]\n\n" "type c_obj = c_enum_value c_obj_t\n");
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (make it occur before %header section)
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_directors_h, f_header);
-    Dump(f_header, f_begin);
-    Dump(f_directors, f_wrappers);
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    Dump(f_enumtypes_type, f_mlout);
-    Dump(f_enumtypes_value, f_mlout);
-    Dump(f_mlbody, f_mlout);
-    Dump(f_enum_to_int, f_mlout);
-    Dump(f_int_to_enum, f_mlout);
-    Delete(f_int_to_enum);
-    Delete(f_enum_to_int);
-    Dump(f_class_ctors, f_mlout);
-    Dump(f_class_ctors_end, f_mlout);
-    Dump(f_mltail, f_mlout);
-    Delete(f_mlout);
-
-    Dump(f_enumtypes_type, f_mliout);
-    Dump(f_enumtypes_value, f_mliout);
-    Dump(f_mlibody, f_mliout);
-    Dump(f_mlitail, f_mliout);
-    Delete(f_mliout);
-
-    return SWIG_OK;
-  }
-
-  /* Produce an error for the given type */
-  void throw_unhandled_ocaml_type_error(SwigType *d, const char *types) {
-    Swig_warning(WARN_TYPEMAP_UNDEF, input_file, line_number, "Unable to handle type %s (%s).\n", SwigType_str(d, 0), types);
-  }
-
-  /* Return true iff T is a pointer type */
-  int
-   is_a_pointer(SwigType *t) {
-    return SwigType_ispointer(SwigType_typedef_resolve_all(t));
-  }
-
-  /*
-   * Delete one reference from a given type.
-   */
-
-  void oc_SwigType_del_reference(SwigType *t) {
-    char *c = Char(t);
-    if (strncmp(c, "q(", 2) == 0) {
-      Delete(SwigType_pop(t));
-      c = Char(t);
-    }
-    if (strncmp(c, "r.", 2)) {
-      printf("Fatal error. SwigType_del_pointer applied to non-pointer.\n");
-      abort();
-    }
-    Replace(t, "r.", "", DOH_REPLACE_ANY | DOH_REPLACE_FIRST);
-  }
-
-  void oc_SwigType_del_array(SwigType *t) {
-    char *c = Char(t);
-    if (strncmp(c, "q(", 2) == 0) {
-      Delete(SwigType_pop(t));
-      c = Char(t);
-    }
-    if (strncmp(c, "a(", 2) == 0) {
-      Delete(SwigType_pop(t));
-    }
-  }
-
-  /* 
-   * Return true iff T is a reference type 
-   */
-
-  int
-   is_a_reference(SwigType *t) {
-    return SwigType_isreference(SwigType_typedef_resolve_all(t));
-  }
-
-  int
-   is_an_array(SwigType *t) {
-    return SwigType_isarray(SwigType_typedef_resolve_all(t));
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * Create a function declaration and register it with the interpreter.
-   * ------------------------------------------------------------ */
-
-  virtual int functionWrapper(Node *n) {
-    char *iname = GetChar(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    String *return_type_normalized = normalizeTemplatedClassName(d);
-    ParmList *l = Getattr(n, "parms");
-    int director_method = 0;
-    Parm *p;
-
-    Wrapper *f = NewWrapper();
-    String *proc_name = NewString("");
-    String *source = NewString("");
-    String *target = NewString("");
-    String *arg = NewString("");
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *build = NewString("");
-    String *tm;
-    int i = 0;
-    int numargs;
-    int numreq;
-    int newobj = GetFlag(n, "feature:new");
-    String *nodeType = Getattr(n, "nodeType");
-    int destructor = (!Cmp(nodeType, "destructor"));
-    String *overname = 0;
-    bool isOverloaded = Getattr(n, "sym:overloaded") ? true : false;
-
-    // Make a wrapper name for this
-    String *wname = Swig_name_wrapper(iname);
-    if (isOverloaded) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n)) {
-        DelWrapper(f);
-	return SWIG_ERROR;
-      }
-    }
-    if (overname) {
-      Append(wname, overname);
-    }
-    /* Do this to disambiguate functions emitted from different modules */
-    Append(wname, module);
-
-    Setattr(n, "wrap:name", wname);
-
-    // Build the name for Scheme.
-    Printv(proc_name, "_", iname, NIL);
-    String *mangled_name = mangleNameForCaml(proc_name);
-
-    if (classmode && in_constructor) {	// Emit constructor for object
-      String *mangled_name_nounder = NewString((char *) (Char(mangled_name)) + 1);
-      Printf(f_class_ctors_end, "let %s clst = _%s clst\n", mangled_name_nounder, mangled_name_nounder);
-      Printf(f_mlibody, "val %s : c_obj -> c_obj\n", mangled_name_nounder);
-      Delete(mangled_name_nounder);
-    } else if (classmode && in_destructor) {
-      Printf(f_class_ctors, "    \"~\", %s ;\n", mangled_name);
-    } else if (classmode && !in_constructor && !in_destructor && !static_member_function) {
-      String *opname = Copy(Getattr(n, "memberfunctionHandler:sym:name"));
-
-      Replaceall(opname, "operator ", "");
-
-      if (strstr(Char(mangled_name), "__get__")) {
-	String *set_name = Copy(mangled_name);
-	if (!GetFlag(n, "feature:immutable")) {
-	  Replaceall(set_name, "__get__", "__set__");
-	  Printf(f_class_ctors, "    \"%s\", (fun args -> " "if args = (C_list [ raw_ptr ]) then %s args else %s args) ;\n", opname, mangled_name, set_name);
-	  Delete(set_name);
-	} else {
-	  Printf(f_class_ctors, "    \"%s\", (fun args -> " "if args = (C_list [ raw_ptr ]) then %s args else C_void) ;\n", opname, mangled_name);
-	}
-      } else if (strstr(Char(mangled_name), "__set__")) {
-	;			/* Nothing ... handled by the case above */
-      } else {
-	Printf(f_class_ctors, "    \"%s\", %s ;\n", opname, mangled_name);
-      }
-
-      Delete(opname);
-    }
-
-    if (classmode && in_constructor) {
-      Setattr(seen_constructors, mangled_name, "true");
-    }
-    // writing the function wrapper function
-    Printv(f->def, "SWIGEXT CAML_VALUE ", wname, " (", NIL);
-    Printv(f->def, "CAML_VALUE args", NIL);
-    Printv(f->def, ")\n{", NIL);
-
-    /* Define the scheme name in C. This define is used by several
-       macros. */
-    //Printv(f->def, "#define FUNC_NAME \"", mangled_name, "\"", NIL);
-
-    // adds local variables
-    Wrapper_add_local(f, "args", "CAMLparam1(args)");
-    Wrapper_add_local(f, "ret", "SWIG_CAMLlocal2(swig_result,rv)");
-    Wrapper_add_local(f, "_v", "int _v = 0");
-    if (isOverloaded) {
-      Wrapper_add_local(f, "i", "int i");
-      Wrapper_add_local(f, "argc", "int argc = caml_list_length(args)");
-      Wrapper_add_local(f, "argv", "CAML_VALUE *argv");
-
-      Printv(f->code,
-	     "argv = (CAML_VALUE *)malloc( argc * sizeof( CAML_VALUE ) );\n"
-	     "for( i = 0; i < argc; i++ ) {\n" "  argv[i] = caml_list_nth(args,i);\n" "}\n", NIL);
-    }
-    d = SwigType_typedef_qualified(d);
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    numargs = emit_num_arguments(l);
-    numreq = emit_num_required(l);
-
-    Printf(f->code, "swig_result = Val_unit;\n");
-
-    // Now write code to extract the parameters (this is super ugly)
-
-    for (i = 0, p = l; i < numargs; i++) {
-      /* Skip ignored arguments */
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-      pt = SwigType_typedef_qualified(pt);
-
-      // Produce names of source and target
-      Clear(source);
-      Clear(target);
-      Clear(arg);
-      Printf(source, "caml_list_nth(args,%d)", i);
-      Printf(target, "%s", ln);
-      Printv(arg, Getattr(p, "name"), NIL);
-
-      if (i >= numreq) {
-	Printf(f->code, "if (caml_list_length(args) > %d) {\n", i);
-      }
-      // Handle parameter types.
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$target", target);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	// no typemap found
-	// check if typedef and resolve
-	throw_unhandled_ocaml_type_error(pt, "in");
-	p = nextSibling(p);
-      }
-      if (i >= numreq) {
-	Printf(f->code, "}\n");
-      }
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Pass output arguments back to the caller.
-
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "emit:input"));	/* Deprecated */
-	Replaceall(tm, "$target", Getattr(p, "lname"));	/* Deprecated */
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Replaceall(tm, "$ntype", normalizeTemplatedClassName(Getattr(p, "type")));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    // Free up any memory allocated for the arguments.
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* if the object is a director, and the method call originated from its
-     * underlying ocaml object, resolve the call by going up the c++ 
-     * inheritance chain.  otherwise try to resolve the method in ocaml.
-     * without this check an infinite loop is set up between the director and
-     * shadow class method calls.
-     */
-
-    // NOTE: this code should only be inserted if this class is the
-    // base class of a director class.  however, in general we haven't
-    // yet analyzed all classes derived from this one to see if they are
-    // directors.  furthermore, this class may be used as the base of
-    // a director class defined in a completely different module at a
-    // later time, so this test must be included whether or not directorbase
-    // is true.  we do skip this code if directors have not been enabled
-    // at the command line to preserve source-level compatibility with
-    // non-polymorphic swig.  also, if this wrapper is for a smart-pointer
-    // method, there is no need to perform the test since the calling object
-    // (the smart-pointer) and the director object (the "pointee") are
-    // distinct.
-
-    director_method = is_member_director(n) && !is_smart_pointer() && !destructor;
-    if (director_method) {
-      Wrapper_add_local(f, "director", "Swig::Director *director = 0");
-      Printf(f->code, "director = dynamic_cast<Swig::Director *>(arg1);\n");
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      Append(f->code, "upcall = (director);\n");
-    }
-
-    // Now write code to make the function call
-    Swig_director_emit_dynamic_cast(n, f);
-    String *actioncode = emit_action(n);
-
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$source", "swig_result");
-      Replaceall(tm, "$target", "rv");
-      Replaceall(tm, "$result", "rv");
-      Replaceall(tm, "$ntype", return_type_normalized);
-      Printv(f->code, tm, "\n", NIL);
-    } else {
-      throw_unhandled_ocaml_type_error(d, "out");
-    }
-    emit_return_variable(n, d, f);
-
-    // Dump the argument output code
-    Printv(f->code, Char(outarg), NIL);
-
-    // Dump the argument cleanup code
-    Printv(f->code, Char(cleanup), NIL);
-
-    // Look for any remaining cleanup
-
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", "swig_result");
-	Printv(f->code, tm, "\n", NIL);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    // Free any memory allocated by the function being wrapped..
-
-    if ((tm = Swig_typemap_lookup("swig_result", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printv(f->code, tm, "\n", NIL);
-    }
-    // Wrap things up (in a manner of speaking)
-
-    Printv(f->code, tab4, "swig_result = caml_list_append(swig_result,rv);\n", NIL);
-    if (isOverloaded)
-      Printv(f->code, "free(argv);\n", NIL);
-    Printv(f->code, tab4, "CAMLreturn(swig_result);\n", NIL);
-    Printv(f->code, "}\n", NIL);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", iname);
-
-    Wrapper_print(f, f_wrappers);
-
-    if (isOverloaded) {
-      if (!Getattr(n, "sym:nextSibling")) {
-	int maxargs;
-	Wrapper *df = NewWrapper();
-	String *dispatch = Swig_overload_dispatch(n,
-						  "free(argv);\n" "CAMLreturn(%s(args));\n",
-						  &maxargs);
-
-	Wrapper_add_local(df, "_v", "int _v = 0");
-	Wrapper_add_local(df, "argv", "CAML_VALUE *argv");
-
-	/* Undifferentiate name .. this is the dispatch function */
-	wname = Swig_name_wrapper(iname);
-	/* Do this to disambiguate functions emitted from different
-	 * modules */
-	Append(wname, module);
-
-	Printv(df->def,
-	       "SWIGEXT CAML_VALUE ", wname, "(CAML_VALUE args) {\n" "  CAMLparam1(args);\n" "  int i;\n" "  int argc = caml_list_length(args);\n", NIL);
-	Printv(df->code,
-	       "argv = (CAML_VALUE *)malloc( argc * sizeof( CAML_VALUE ) );\n"
-	       "for( i = 0; i < argc; i++ ) {\n" "  argv[i] = caml_list_nth(args,i);\n" "}\n", NIL);
-	Printv(df->code, dispatch, "\n", NIL);
-	Printf(df->code, "failwith(\"No matching function for overloaded '%s'\");\n", iname);
-	Printv(df->code, "}\n", NIL);
-	Wrapper_print(df, f_wrappers);
-
-	DelWrapper(df);
-	Delete(dispatch);
-      }
-    }
-
-    Printf(f_mlbody,
-	   "external %s_f : c_obj list -> c_obj list = \"%s\" ;;\n"
-	   "let %s arg = match %s_f (fnhelper arg) with\n"
-	   "  [] -> C_void\n"
-	   "| [x] -> (if %s then Gc.finalise \n"
-	   "  (fun x -> ignore ((invoke x) \"~\" C_void)) x) ; x\n"
-	   "| lst -> C_list lst ;;\n", mangled_name, wname, mangled_name, mangled_name, newobj ? "true" : "false");
-
-    if (!classmode || in_constructor || in_destructor || static_member_function)
-      Printf(f_mlibody, "val %s : c_obj -> c_obj\n", mangled_name);
-
-    Delete(proc_name);
-    Delete(source);
-    Delete(target);
-    Delete(arg);
-    Delete(outarg);
-    Delete(cleanup);
-    Delete(build);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   *
-   * Create a link to a C variable.
-   * This creates a single function _wrap_swig_var_varname().
-   * This function takes a single optional argument.   If supplied, it means
-   * we are setting this variable to some value.  If omitted, it means we are
-   * simply evaluating this variable.  In the set case we return C_void.
-   *
-   * symname is the name of the variable with respect to C.  This 
-   * may need to differ from the original name in the case of enums.
-   * enumvname is the name of the variable with respect to ocaml.  This
-   * will vary if the variable has been renamed.
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-    char *name = GetChar(n, "feature:symname");
-    String *iname = Getattr(n, "feature:enumvname");
-    String *mname = mangleNameForCaml(iname);
-    SwigType *t = Getattr(n, "type");
-
-    String *proc_name = NewString("");
-    String *tm;
-    String *tm2 = NewString("");
-    String *argnum = NewString("0");
-    String *arg = NewString("SWIG_Field(args,0)");
-    Wrapper *f;
-
-    if (!name) {
-      name = GetChar(n, "name");
-    }
-
-    if (!iname) {
-      iname = Getattr(n, "sym:name");
-      mname = mangleNameForCaml(NewString(iname));
-    }
-
-    if (!iname || !addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    f = NewWrapper();
-
-    // evaluation function names
-    String *var_name = Swig_name_wrapper(iname);
-
-    // Build the name for scheme.
-    Printv(proc_name, iname, NIL);
-    Setattr(n, "wrap:name", proc_name);
-
-    Printf(f->def, "SWIGEXT CAML_VALUE %s(CAML_VALUE args) {\n", var_name);
-    // Printv(f->def, "#define FUNC_NAME \"", proc_name, "\"", NIL);
-
-    Wrapper_add_local(f, "swig_result", "CAML_VALUE swig_result");
-
-    if (!GetFlag(n, "feature:immutable")) {
-      /* Check for a setting of the variable value */
-      Printf(f->code, "if (args != Val_int(0)) {\n");
-      if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-	Replaceall(tm, "$source", "args");
-	Replaceall(tm, "$target", name);
-	Replaceall(tm, "$input", "args");
-	/* Printv(f->code, tm, "\n",NIL); */
-	emit_action_code(n, f->code, tm);
-      } else if ((tm = Swig_typemap_lookup("in", n, name, 0))) {
-	Replaceall(tm, "$source", "args");
-	Replaceall(tm, "$target", name);
-	Replaceall(tm, "$input", "args");
-	Printv(f->code, tm, "\n", NIL);
-      } else {
-	throw_unhandled_ocaml_type_error(t, "varin/in");
-      }
-      Printf(f->code, "}\n");
-    }
-    // Now return the value of the variable (regardless
-    // of evaluating or setting)
-
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-      Replaceall(tm, "$source", name);
-      Replaceall(tm, "$target", "swig_result");
-      Replaceall(tm, "$result", "swig_result");
-      emit_action_code(n, f->code, tm);
-    } else if ((tm = Swig_typemap_lookup("out", n, name, 0))) {
-      Replaceall(tm, "$source", name);
-      Replaceall(tm, "$target", "swig_result");
-      Replaceall(tm, "$result", "swig_result");
-      Printf(f->code, "%s\n", tm);
-    } else {
-      throw_unhandled_ocaml_type_error(t, "varout/out");
-    }
-
-    Printf(f->code, "\nreturn swig_result;\n");
-    Printf(f->code, "}\n");
-
-    Wrapper_print(f, f_wrappers);
-
-    // Now add symbol to the Ocaml interpreter
-
-    if (GetFlag(n, "feature:immutable")) {
-      Printf(f_mlbody, "external _%s : c_obj -> Swig.c_obj = \"%s\" \n", mname, var_name);
-      Printf(f_mlibody, "val _%s : c_obj -> Swig.c_obj\n", iname);
-      if (const_enum) {
-	Printf(f_enum_to_int, " | `%s -> _%s C_void\n", mname, mname);
-	Printf(f_int_to_enum, " if y = (get_int (_%s C_void)) then `%s else\n", mname, mname);
-      }
-    } else {
-      Printf(f_mlbody, "external _%s : c_obj -> c_obj = \"%s\"\n", mname, var_name);
-      Printf(f_mlibody, "external _%s : c_obj -> c_obj = \"%s\"\n", mname, var_name);
-    }
-
-    Delete(var_name);
-    Delete(proc_name);
-    Delete(argnum);
-    Delete(arg);
-    Delete(tm2);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmemberfunctionHandler --
-   * Overridden to set static_member_function 
-   * ------------------------------------------------------------ */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    static_member_function = 1;
-    Language::staticmemberfunctionHandler(n);
-    static_member_function = 0;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   *
-   * The one trick here is that we have to make sure we rename the
-   * constant to something useful that doesn't collide with the
-   * original if any exists.
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *name = Getattr(n, "feature:symname");
-    SwigType *type = Getattr(n, "type");
-    String *value = Getattr(n, "value");
-    SwigType *qname = Getattr(n, "qualified:name");
-    String *rvalue = NewString("");
-    String *temp = 0;
-
-    if (qname)
-      value = qname;
-
-    if (!name) {
-      name = mangleNameForCaml(Getattr(n, "name"));
-      Insert(name, 0, "_swig_wrap_");
-      Setattr(n, "feature:symname", name);
-    }
-    // See if there's a typemap
-
-    Printv(rvalue, value, NIL);
-    if ((SwigType_type(type) == T_CHAR) && (is_a_pointer(type) == 1)) {
-      temp = Copy(rvalue);
-      Clear(rvalue);
-      Printv(rvalue, "\"", temp, "\"", NIL);
-      Delete(temp);
-    }
-    if ((SwigType_type(type) == T_CHAR) && (is_a_pointer(type) == 0)) {
-      temp = Copy(rvalue);
-      Clear(rvalue);
-      Printv(rvalue, "'", temp, "'", NIL);
-      Delete(temp);
-    }
-    // Create variable and assign it a value
-
-    Printf(f_header, "static %s = ", SwigType_lstr(type, name));
-    bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0);
-    if ((SwigType_type(type) == T_STRING)) {
-      Printf(f_header, "\"%s\";\n", value);
-    } else if (SwigType_type(type) == T_CHAR && !is_enum_item) {
-      Printf(f_header, "\'%s\';\n", value);
-    } else {
-      Printf(f_header, "%s;\n", value);
-    }
-
-    SetFlag(n, "feature:immutable");
-    variableWrapper(n);
-    return SWIG_OK;
-  }
-
-  int constructorHandler(Node *n) {
-    int ret;
-
-    in_constructor = 1;
-    ret = Language::constructorHandler(n);
-    in_constructor = 0;
-
-    return ret;
-  }
-
-  /* destructorHandler:
-   * Turn on destructor flag to inform decisions in functionWrapper
-   */
-
-  int destructorHandler(Node *n) {
-    int ret;
-
-    in_destructor = 1;
-    ret = Language::destructorHandler(n);
-    in_destructor = 0;
-
-    return ret;
-  }
-
-  /* copyconstructorHandler:
-   * Turn on constructor and copyconstructor flags for functionWrapper
-   */
-
-  int copyconstructorHandler(Node *n) {
-    int ret;
-
-    in_copyconst = 1;
-    in_constructor = 1;
-    ret = Language::copyconstructorHandler(n);
-    in_constructor = 0;
-    in_copyconst = 0;
-
-    return ret;
-  }
-
-    /**
-     * A simple, somewhat general purpose function for writing to multiple
-     * streams from a source template.  This allows the user to define the
-     * class definition in ways different from the one I have here if they
-     * want to.  It will also make the class definition system easier to
-     * fiddle with when I want to change methods, etc.
-     */
-
-  void Multiwrite(String *s) {
-    char *find_marker = strstr(Char(s), "(*Stream:");
-    while (find_marker) {
-      char *next = strstr(find_marker, "*)");
-      find_marker += strlen("(*Stream:");
-
-      if (next) {
-	int num_chars = (int)(next - find_marker);
-	String *stream_name = NewString(find_marker);
-	Delslice(stream_name, num_chars, Len(stream_name));
-	File *fout = Swig_filebyname(stream_name);
-	if (fout) {
-	  next += strlen("*)");
-	  char *following = strstr(next, "(*Stream:");
-	  find_marker = following;
-	  if (!following)
-	    following = next + strlen(next);
-	  String *chunk = NewString(next);
-	  Delslice(chunk, (int)(following - next), Len(chunk));
-	  Printv(fout, chunk, NIL);
-	}
-      }
-    }
-  }
-
-  bool isSimpleType(String *name) {
-    char *ch = Char(name);
-
-    return !(strchr(ch, '(') || strchr(ch, '<') || strchr(ch, ')') || strchr(ch, '>'));
-  }
-
-  /* We accept all chars in identifiers because we use strings to index
-   * them. */
-  int validIdentifier(String *name) {
-    return Len(name) > 0 ? 1 : 0;
-  }
-
-  /* classHandler
-   * 
-   * Create a "class" definition for ocaml.  I thought quite a bit about
-   * how I should do this part of it, and arrived here, using a function
-   * invocation to select a method, and dispatch.  This can obviously be
-   * done better, but I can't see how, given that I want to support 
-   * overloaded methods, out parameters, and operators.
-   *
-   * I needed a system that would do this:
-   *
-   *  a Be able to call these methods:
-   *   int foo( int x );
-   *   float foo( int x, int &out );
-   *
-   *  b Be typeable, even in the presence of mutually dependent classes.
-   *
-   *  c Support some form of operator invocation.
-   *
-   * (c) I chose strings for the method names so that "+=" would be a
-   * valid method name, and the somewhat natural << (invoke x) "+=" y >>
-   * would work.
-   *
-   * (a) (b) Since the c_obj type exists, it's easy to return C_int in one
-   * case and C_list [ C_float ; C_int ] in the other.  This makes tricky
-   * problems with out parameters disappear; they're simply appended to the
-   * return list.
-   *
-   * (b) Since every item that comes from C++ is the same type, there is no
-   * problem with the following:
-   *
-   * class Foo;
-   * class Bar { Foo *toFoo(); }
-   * class Foo { Bar *toBar(); }
-   *
-   * Since the Objective caml types of Foo and Bar are the same.  Now that
-   * I correctly incorporate SWIG's typechecking, this isn't a big deal.
-   *
-   * The class is in the form of a function returning a c_obj.  The c_obj
-   * is a C_obj containing a function which invokes a method on the
-   * underlying object given its type.
-   *
-   * The name emitted here is normalized before being sent to
-   * Callback.register, because we need this string to look up properly
-   * when the typemap passes the descriptor string.  I've been considering
-   * some, possibly more forgiving method that would do some transformations
-   * on the $descriptor in order to find a potential match.  This is for
-   * later.
-   *
-   * Important things to note:
-   *
-   * We rely on exception handling (BadMethodName) in order to call an
-   * ancestor.  This can be improved.
-   *
-   * The method used to get :classof could be improved to look at the type
-   * info that the base pointer contains.  It's really an error to have a
-   * SWIG-generated object that does not contain type info, since the
-   * existence of the object means that SWIG knows the type.
-   *
-   * :parents could use :classof to tell what class it is and make a better
-   * decision.  This could be nice, (i.e. provide a run-time graph of C++
-   * classes represented);.
-   *
-   * I can't think of a more elegant way of converting a C_obj fun to a
-   * pointer than "operator &"... 
-   *
-   * Added a 'sizeof' that will allow you to do the expected thing.
-   * This should help users to fill buffer structs and the like (as is
-   * typical in windows-styled code).  It's only enabled if you give
-   * %feature(sizeof) and then, only for simple types.
-   *
-   * Overall, carrying the list of methods and base classes has worked well.
-   * It allows me to give the Ocaml user introspection over their objects.
-   */
-
-  int classHandler(Node *n) {
-    String *name = Getattr(n, "name");
-
-    if (!name)
-      return SWIG_OK;
-
-    String *mangled_sym_name = mangleNameForCaml(name);
-    String *this_class_def = NewString(f_classtemplate);
-    String *name_normalized = normalizeTemplatedClassName(name);
-    String *old_class_ctors = f_class_ctors;
-    String *base_classes = NewString("");
-    f_class_ctors = NewString("");
-    bool sizeof_feature = generate_sizeof && isSimpleType(name);
-
-
-    classname = mangled_sym_name;
-    classmode = true;
-    int rv = Language::classHandler(n);
-    classmode = false;
-
-    if (sizeof_feature) {
-      Printf(f_wrappers,
-	     "SWIGEXT CAML_VALUE _wrap_%s_sizeof( CAML_VALUE args ) {\n"
-	     "    CAMLparam1(args);\n" "    CAMLreturn(Val_int(sizeof(%s)));\n" "}\n", mangled_sym_name, name_normalized);
-
-      Printf(f_mlbody, "external __%s_sizeof : unit -> int = " "\"_wrap_%s_sizeof\"\n", classname, mangled_sym_name);
-    }
-
-
-    /* Insert sizeof operator for concrete classes */
-    if (sizeof_feature) {
-      Printv(f_class_ctors, "\"sizeof\" , (fun args -> C_int (__", classname, "_sizeof ())) ;\n", NIL);
-    }
-    /* Handle up-casts in a nice way */
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist)) {
-      Iterator b;
-      b = First(baselist);
-      while (b.item) {
-	String *bname = Getattr(b.item, "name");
-	if (bname) {
-	  String *base_create = NewString("");
-	  Printv(base_create, "(create_class \"", bname, "\")", NIL);
-	  Printv(f_class_ctors, "   \"::", bname, "\", (fun args -> ", base_create, " args) ;\n", NIL);
-	  Printv(base_classes, base_create, " ;\n", NIL);
-	}
-	b = Next(b);
-      }
-    }
-
-    Replaceall(this_class_def, "$classname", classname);
-    Replaceall(this_class_def, "$normalized", name_normalized);
-    Replaceall(this_class_def, "$realname", name);
-    Replaceall(this_class_def, "$baselist", base_classes);
-    Replaceall(this_class_def, "$classbody", f_class_ctors);
-
-    Delete(f_class_ctors);
-    f_class_ctors = old_class_ctors;
-
-    // Actually write out the class definition
-
-    Multiwrite(this_class_def);
-
-    Setattr(n, "ocaml:ctor", classname);
-
-    return rv;
-  }
-
-  String *normalizeTemplatedClassName(String *name) {
-    String *name_normalized = SwigType_typedef_resolve_all(name);
-    bool took_action;
-
-    do {
-      took_action = false;
-
-      if (is_a_pointer(name_normalized)) {
-	SwigType_del_pointer(name_normalized);
-	took_action = true;
-      }
-
-      if (is_a_reference(name_normalized)) {
-	oc_SwigType_del_reference(name_normalized);
-	took_action = true;
-      }
-
-      if (is_an_array(name_normalized)) {
-	oc_SwigType_del_array(name_normalized);
-	took_action = true;
-      }
-    } while (took_action);
-
-    return SwigType_str(name_normalized, 0);
-  }
-
-  /*
-   * Produce the symbol name that ocaml will use when referring to the 
-   * target item.  I wonder if there's a better way to do this:
-   *
-   * I shudder to think about doing it with a hash lookup, but that would
-   * make a couple of things easier:
-   */
-
-  String *mangleNameForCaml(String *s) {
-    String *out = Copy(s);
-    Replaceall(out, " ", "_xx");
-    Replaceall(out, "::", "_xx");
-    Replaceall(out, ",", "_x");
-    Replaceall(out, "+", "_xx_plus");
-    Replaceall(out, "-", "_xx_minus");
-    Replaceall(out, "<", "_xx_ldbrace");
-    Replaceall(out, ">", "_xx_rdbrace");
-    Replaceall(out, "!", "_xx_not");
-    Replaceall(out, "%", "_xx_mod");
-    Replaceall(out, "^", "_xx_xor");
-    Replaceall(out, "*", "_xx_star");
-    Replaceall(out, "&", "_xx_amp");
-    Replaceall(out, "|", "_xx_or");
-    Replaceall(out, "(", "_xx_lparen");
-    Replaceall(out, ")", "_xx_rparen");
-    Replaceall(out, "[", "_xx_lbrace");
-    Replaceall(out, "]", "_xx_rbrace");
-    Replaceall(out, "~", "_xx_bnot");
-    Replaceall(out, "=", "_xx_equals");
-    Replaceall(out, "/", "_xx_slash");
-    Replaceall(out, ".", "_xx_dot");
-    return out;
-  }
-
-  SwigType *fully_qualified_enum_type(Node *n) {
-    Node *parent = 0;
-    String *fully_qualified_name = NewString("");
-    String *parent_type = 0;
-
-    parent = parentNode(n);
-    while (parent) {
-      parent_type = nodeType(parent);
-      if (Getattr(parent, "name")) {
-	String *parent_copy = NewStringf("%s::", Getattr(parent, "name"));
-	if (Cmp(parent_type, "class") == 0 || Cmp(parent_type, "namespace") == 0)
-	  Insert(fully_qualified_name, 0, parent_copy);
-	Delete(parent_copy);
-      }
-      if (!Cmp(parent_type, "class"))
-	break;
-      parent = parentNode(parent);
-    }
-
-    return fully_qualified_name;
-  }
-
-  /* Benedikt Grundmann inspired --> Enum wrap styles */
-
-  int enumvalueDeclaration(Node *n) {
-    String *name = Getattr(n, "name");
-    SwigType *qtype = 0;
-
-    if (name_qualifier_type) {
-      qtype = Copy(name_qualifier_type);
-      Printv(qtype, name, NIL);
-    }
-
-    if (const_enum && qtype && name && !Getattr(seen_enumvalues, name)) {
-      Setattr(seen_enumvalues, name, "true");
-      SetFlag(n, "feature:immutable");
-      Setattr(n, "feature:enumvalue", "1");	// this does not appear to be used
-
-      Setattr(n, "qualified:name", SwigType_namestr(qtype));
-
-      String *evname = SwigType_manglestr(qtype);
-      Insert(evname, 0, "SWIG_ENUM_");
-
-      Setattr(n, "feature:enumvname", name);
-      Setattr(n, "feature:symname", evname);
-      Delete(evname);
-      Printf(f_enumtypes_value, "| `%s\n", name);
-
-      return Language::enumvalueDeclaration(n);
-    } else
-      return SWIG_OK;
-  }
-
-  /* -------------------------------------------------------------------
-   * This function is a bit uglier than it deserves.
-   *
-   * I used to direct lookup the name of the enum.  Now that certain fixes
-   * have been made in other places, the names of enums are now fully
-   * qualified, which is a good thing, overall, but requires me to do
-   * some legwork.
-   *
-   * The other thing that uglifies this function is the varying way that
-   * typedef enum and enum are handled.  I need to produce consistent names,
-   * which means looking up and registering by typedef and enum name. */
-  int enumDeclaration(Node *n) {
-    if (getCurrentClass() && (cplus_mode != PUBLIC))
-      return SWIG_NOWRAP;
-
-    String *name = Getattr(n, "name");
-    if (name) {
-      String *oname = NewString(name);
-      /* name is now fully qualified */
-      String *fully_qualified_name = NewString(name);
-      bool seen_enum = false;
-      if (name_qualifier_type)
-        Delete(name_qualifier_type);
-      char *strip_position;
-      name_qualifier_type = fully_qualified_enum_type(n);
-
-      strip_position = strstr(Char(oname), "::");
-
-      while (strip_position) {
-        strip_position += 2;
-        oname = NewString(strip_position);
-        strip_position = strstr(Char(oname), "::");
-      }
-
-      seen_enum = (Getattr(seen_enums, fully_qualified_name) ? true : false);
-
-      if (!seen_enum) {
-        const_enum = true;
-        Printf(f_enum_to_int, "| `%s -> (match y with\n", oname);
-        Printf(f_int_to_enum, "| `%s -> C_enum (\n", oname);
-        /* * * * A note about enum name resolution * * * *
-         * This code should now work, but I think we can do a bit better.
-         * The problem I'm having is that swig isn't very precise about
-         * typedef name resolution.  My opinion is that SwigType_typedef
-         * resolve_all should *always* return the enum tag if one exists,
-         * rather than the admittedly friendlier enclosing typedef.
-         * 
-         * This would make one of the cases below unnecessary. 
-         * * * */
-        Printf(f_mlbody, "let _ = Callback.register \"%s_marker\" (`%s)\n", fully_qualified_name, oname);
-        if (!strncmp(Char(fully_qualified_name), "enum ", 5)) {
-          String *fq_noenum = NewString(Char(fully_qualified_name) + 5);
-          Printf(f_mlbody,
-                 "let _ = Callback.register \"%s_marker\" (`%s)\n" "let _ = Callback.register \"%s_marker\" (`%s)\n", fq_noenum, oname, fq_noenum, name);
-        }
-
-        Printf(f_enumtypes_type, "| `%s\n", oname);
-        Insert(fully_qualified_name, 0, "enum ");
-        Setattr(seen_enums, fully_qualified_name, n);
-      }
-    }
-
-    int ret = Language::enumDeclaration(n);
-
-    if (const_enum) {
-      Printf(f_int_to_enum, "`Int y)\n");
-      Printf(f_enum_to_int, "| `Int x -> Swig.C_int x\n" "| _ -> raise (LabelNotFromThisEnum v))\n");
-    }
-
-    const_enum = false;
-
-    return ret;
-  }
-
-  /* ----------------------------------------------------------------------------
-   * BEGIN C++ Director Class modifications
-   * ------------------------------------------------------------------------- */
-
-  /*
-   * Modified polymorphism code for Ocaml language module.
-   *
-   * TODO
-   *
-   * Move some boilerplate code generation to Swig_...() functions.
-   *
-   */
-
-  /* ---------------------------------------------------------------
-   * classDirectorMethod()
-   *
-   * Emit a virtual director method to pass a method call on to the 
-   * underlying Python object.
-   *
-   * --------------------------------------------------------------- */
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    int is_void = 0;
-    int is_pointer = 0;
-    String *storage = Getattr(n, "storage");
-    String *value = Getattr(n, "value");
-    String *decl = Getattr(n, "decl");
-    String *returntype = Getattr(n, "type");
-    String *name = Getattr(n, "name");
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *declaration = NewString("");
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *w = NewWrapper();
-    String *tm;
-    String *wrap_args = NewString("");
-    int status = SWIG_OK;
-    int idx;
-    bool pure_virtual = false;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    if (Cmp(storage, "virtual") == 0) {
-      if (Cmp(value, "0") == 0) {
-	pure_virtual = true;
-      }
-    }
-
-    Wrapper_add_local(w, "swig_result", "CAMLparam0();\n" "SWIG_CAMLlocal2(swig_result,args)");
-
-    /* determine if the method returns a pointer */
-    is_pointer = SwigType_ispointer_return(decl);
-    is_void = (!Cmp(returntype, "void") && !is_pointer);
-
-    /* virtual method definition */
-    String *target;
-    String *pclassname = NewStringf("SwigDirector_%s", classname);
-    String *qualified_name = NewStringf("%s::%s", pclassname, name);
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s {", target);
-    Delete(qualified_name);
-    Delete(target);
-    /* header declaration */
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s;", target);
-    Delete(target);
-
-    /* declare method return value 
-     * if the return value is a reference or const reference, a specialized typemap must
-     * handle it, including declaration of c_result ($result).
-     */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL);
-      }
-    }
-
-    if (ignored_method) {
-      if (!pure_virtual) {
-	if (!is_void)
-	  Printf(w->code, "return ");
-	String *super_call = Swig_method_call(super, l);
-	Printf(w->code, "%s;\n", super_call);
-	Delete(super_call);
-      } else {
-	Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\");\n", SwigType_namestr(c_classname),
-	       SwigType_namestr(name));
-      }
-    } else {
-      /* attach typemaps to arguments (C/C++ -> Ocaml) */
-      String *arglist = NewString("");
-
-      Swig_director_parms_fixup(l);
-
-      Swig_typemap_attach_parms("in", l, 0);
-      Swig_typemap_attach_parms("directorin", l, 0);
-      Swig_typemap_attach_parms("directorargout", l, w);
-
-      Parm *p;
-      int num_arguments = emit_num_arguments(l);
-      int i;
-      char source[256];
-
-      int outputs = 0;
-      if (!is_void)
-	outputs++;
-
-      /* build argument list and type conversion string */
-      for (i = 0, idx = 0, p = l; i < num_arguments; i++) {
-
-	while (Getattr(p, "tmap:ignore")) {
-	  p = Getattr(p, "tmap:ignore:next");
-	}
-
-	if (Getattr(p, "tmap:directorargout") != 0)
-	  outputs++;
-
-	String *pname = Getattr(p, "name");
-	String *ptype = Getattr(p, "type");
-
-	Putc(',', arglist);
-	if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-	  Setattr(p, "emit:directorinput", pname);
-	  Replaceall(tm, "$input", pname);
-	  Replaceall(tm, "$owner", "0");
-	  if (Len(tm) == 0)
-	    Append(tm, pname);
-	  Printv(wrap_args, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorin:next");
-	  continue;
-	} else if (Cmp(ptype, "void")) {
-	  /* special handling for pointers to other C++ director classes.
-	   * ideally this would be left to a typemap, but there is currently no
-	   * way to selectively apply the dynamic_cast<> to classes that have
-	   * directors.  in other words, the type "SwigDirector_$1_lname" only exists
-	   * for classes with directors.  we avoid the problem here by checking
-	   * module.wrap::directormap, but it's not clear how to get a typemap to
-	   * do something similar.  perhaps a new default typemap (in addition
-	   * to SWIGTYPE) called DIRECTORTYPE?
-	   */
-	  if (SwigType_ispointer(ptype) || SwigType_isreference(ptype)) {
-	    Node *module = Getattr(parent, "module");
-	    Node *target = Swig_directormap(module, ptype);
-	    sprintf(source, "obj%d", idx++);
-	    String *nonconst = 0;
-	    /* strip pointer/reference --- should move to Swig/stype.c */
-	    String *nptype = NewString(Char(ptype) + 2);
-	    /* name as pointer */
-	    String *ppname = Copy(pname);
-	    if (SwigType_isreference(ptype)) {
-	      Insert(ppname, 0, "&");
-	    }
-	    /* if necessary, cast away const since Python doesn't support it! */
-	    if (SwigType_isconst(nptype)) {
-	      nonconst = NewStringf("nc_tmp_%s", pname);
-	      String *nonconst_i = NewStringf("= const_cast< %s >(%s)", SwigType_lstr(ptype, 0), ppname);
-	      Wrapper_add_localv(w, nonconst, SwigType_lstr(ptype, 0), nonconst, nonconst_i, NIL);
-	      Delete(nonconst_i);
-	      Swig_warning(WARN_LANG_DISCARD_CONST, input_file, line_number,
-			   "Target language argument '%s' discards const in director method %s::%s.\n", SwigType_str(ptype, pname),
-			   SwigType_namestr(c_classname), SwigType_namestr(name));
-	    } else {
-	      nonconst = Copy(ppname);
-	    }
-	    Delete(nptype);
-	    Delete(ppname);
-	    String *mangle = SwigType_manglestr(ptype);
-	    if (target) {
-	      String *director = NewStringf("director_%s", mangle);
-	      Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL);
-	      Wrapper_add_localv(w, source, "CAML_VALUE", source, "= Val_unit", NIL);
-	      Printf(wrap_args, "%s = dynamic_cast<Swig::Director *>(%s);\n", director, nonconst);
-	      Printf(wrap_args, "if (!%s) {\n", director);
-	      Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	      Printf(wrap_args, "} else {\n");
-	      Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
-	      Printf(wrap_args, "}\n");
-	      Delete(director);
-	      Printv(arglist, source, NIL);
-	    } else {
-	      Wrapper_add_localv(w, source, "CAML_VALUE", source, "= Val_unit", NIL);
-	      Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	      //Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE_p_%s, 0);\n", 
-	      //       source, nonconst, base);
-	      Printv(arglist, source, NIL);
-	    }
-	    Delete(mangle);
-	    Delete(nonconst);
-	  } else {
-	    Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-			 "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(ptype, 0),
-			 SwigType_namestr(c_classname), SwigType_namestr(name));
-	    status = SWIG_NOWRAP;
-	    break;
-	  }
-	}
-	p = nextSibling(p);
-      }
-
-      Printv(w->code, "swig_result = Val_unit;\n", 0);
-      Printf(w->code, "args = Val_unit;\n");
-
-      /* wrap complex arguments to values */
-      Printv(w->code, wrap_args, NIL);
-
-      /* pass the method call on to the Python object */
-      Printv(w->code,
-	     "swig_result = caml_swig_alloc(1,C_list);\n" "SWIG_Store_field(swig_result,0,args);\n" "args = swig_result;\n" "swig_result = Val_unit;\n", 0);
-      Printf(w->code, "swig_result = " "callback3(*caml_named_value(\"swig_runmethod\")," "swig_get_self(),copy_string(\"%s\"),args);\n", Getattr(n, "name"));
-      /* exception handling */
-      tm = Swig_typemap_lookup("director:except", n, Swig_cresult_name(), 0);
-      if (!tm) {
-	tm = Getattr(n, "feature:director:except");
-      }
-      if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
-	Printf(w->code, "if (!%s) {\n", Swig_cresult_name());
-	Printf(w->code, "  CAML_VALUE error = *caml_named_value(\"director_except\");\n");
-	Replaceall(tm, "$error", "error");
-	Printv(w->code, Str(tm), "\n", NIL);
-	Printf(w->code, "}\n");
-      }
-
-      /*
-       * Python method may return a simple object, or a tuple.
-       * for in/out aruments, we have to extract the appropriate values from the 
-       * argument list, then marshal everything back to C/C++ (return value and
-       * output arguments).
-       */
-
-      /* marshal return value and other outputs (if any) from value to C/C++ 
-       * type */
-
-      String *cleanup = NewString("");
-      String *outarg = NewString("");
-
-      tm = Swig_typemap_lookup("directorout", n, "c_result", w);
-      if (tm != 0) {
-	Replaceall(tm, "$input", "swig_result");
-	/* TODO check this */
-	if (Getattr(n, "wrap:disown")) {
-	  Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	} else {
-	  Replaceall(tm, "$disown", "0");
-	}
-	Replaceall(tm, "$result", "c_result");
-	Printv(w->code, tm, "\n", NIL);
-      }
-
-      /* marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-	  Replaceall(tm, "$result", "swig_result");
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      Delete(arglist);
-      Delete(cleanup);
-      Delete(outarg);
-    }
-
-    /* any existing helper functions to handle this? */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	/* A little explanation:
-	 * The director_enum test case makes a method whose return type
-	 * is an enum type.  returntype here is "int".  gcc complains
-	 * about an implicit enum conversion, and although i don't strictly
-	 * agree with it, I'm working on fixing the error:
-	 *
-	 * Below is what I came up with.  It's not great but it should
-	 * always essentially work.
-	 */
-	if (!SwigType_isreference(returntype)) {
-	  Printf(w->code, "CAMLreturn_type((%s)c_result);\n", SwigType_lstr(returntype, ""));
-	} else {
-	  Printf(w->code, "CAMLreturn_type(*c_result);\n");
-	}
-      }
-    }
-
-    Printf(w->code, "}\n");
-
-    // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK) {
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    /* clean up */
-    Delete(wrap_args);
-    Delete(pclassname);
-    DelWrapper(w);
-    return status;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *sub = NewString("");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewString("");
-    Printf(classname, "SwigDirector_%s", supername);
-
-    /* insert self parameter */
-    Parm *p, *q;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("CAML_VALUE");
-    p = NewParm(type, NewString("self"), n);
-    q = Copy(p);
-    set_nextSibling(q, superparms);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	Wrapper *w = NewWrapper();
-	String *call;
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-	call = Swig_csuperclass_call(0, basetype, superparms);
-	Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call);
-	Delete(target);
-	Wrapper_print(w, f_directors);
-	Delete(call);
-	DelWrapper(w);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Setattr(n, "parms", q);
-    Language::classDirectorConstructor(n);
-
-    Delete(sub);
-    Delete(classname);
-    Delete(supername);
-    //Delete(parms);        
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDefaultConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorDefaultConstructor(Node *n) {
-    String *classname;
-    classname = Swig_class_name(n);
-
-    /* insert self parameter */
-    Parm *p, *q;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("CAML_VALUE");
-    p = NewParm(type, NewString("self"), n);
-    q = Copy(p);
-    set_nextSibling(p, parms);
-
-    {
-      Wrapper *w = NewWrapper();
-      Printf(w->def, "SwigDirector_%s::SwigDirector_%s(CAML_VALUE self) : Swig::Director(self) { }", classname, classname);
-      Wrapper_print(w, f_directors);
-      DelWrapper(w);
-    }
-    Printf(f_directors_h, "    SwigDirector_%s(CAML_VALUE self);\n", classname);
-    Delete(classname);
-    Setattr(n, "parms", q);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-  int classDirectorInit(Node *n) {
-    String *declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "\n" "%s\n" "public:\n", declaration);
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  int classDirectorEnd(Node *n) {
-    Printf(f_directors_h, "};\n\n");
-    return Language::classDirectorEnd(n);
-  }
-
-  /* ---------------------------------------------------------------------
-   * typedefHandler
-   *
-   * This is here in order to maintain the correct association between
-   * typedef names and enum names. 
-   *
-   * Since I implement enums as polymorphic variant tags, I need to call
-   * back into ocaml to evaluate them.  This requires a string that can
-   * be generated in the typemaps, and also at SWIG time to be the same
-   * string.  The problem that arises is that SWIG variously generates
-   * enum e_name_tag
-   * e_name_tag
-   * e_typedef_name
-   * for
-   * typedef enum e_name_tag { ... } e_typedef_name;
-   * 
-   * Since I need these strings to be consistent, I must maintain a correct
-   * association list between typedef and enum names.
-   * --------------------------------------------------------------------- */
-  int typedefHandler(Node *n) {
-    String *type = Getattr(n, "type");
-    Node *enum_node = type ? Getattr(seen_enums, type) : 0;
-    if (enum_node) {
-      String *name = Getattr(enum_node, "name");
-
-      Printf(f_mlbody, "let _ = Callback.register \"%s_marker\" (`%s)\n", Getattr(n, "name"), name);
-
-    }
-    return SWIG_OK;
-  }
-
-  String *runtimeCode() {
-    String *s = Swig_include_sys("ocaml.swg");
-    if (!s) {
-      Printf(stderr, "*** Unable to open 'ocaml.swg'\n");
-      s = NewString("");
-    }
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigocamlrun.h");
-  }
-};
-
-/* -------------------------------------------------------------------------
- * swig_ocaml()    - Instantiate module
- * ------------------------------------------------------------------------- */
-
-static Language *new_swig_ocaml() {
-  return new OCAML();
-}
-extern "C" Language *swig_ocaml(void) {
-  return new_swig_ocaml();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/octave.cxx b/dependencies2013/win32/swig/Source/Modules/octave.cxx
deleted file mode 100644
index b977609a..00000000
--- a/dependencies2013/win32/swig/Source/Modules/octave.cxx
+++ /dev/null
@@ -1,1564 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * octave.cxx
- *
- * Octave language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-
-static String *global_name = 0;
-static String *op_prefix   = 0;
-
-static const char *usage = "\
-Octave Options (available with -octave)\n\
-     -cppcast        - Enable C++ casting operators (default)\n\
-     -globals <name> - Set <name> used to access C global variables [default: 'cvar']\n\
-                       Use '.' to load C global variables into module namespace\n\
-     -nocppcast      - Disable C++ casting operators\n\
-     -opprefix <str> - Prefix <str> for global operator functions [default: 'op_']\n\
-\n";
-
-
-class OCTAVE:public Language {
-private:
-  File *f_begin;
-  File *f_runtime;
-  File *f_header;
-  File *f_doc;
-  File *f_wrappers;
-  File *f_init;
-  File *f_initbeforefunc;
-  File *f_directors;
-  File *f_directors_h;
-  String *s_global_tab;
-  String *s_members_tab;
-  String *class_name;
-
-  int have_constructor;
-  int have_destructor;
-  String *constructor_name;
-
-  Hash *docs;
-
-  void Octave_begin_function(Node *n, File *f, const_String_or_char_ptr cname, const_String_or_char_ptr wname, bool dld) {
-    if (dld) {
-      String *tname = texinfo_name(n, "std::string()");
-      Printf(f, "SWIG_DEFUN( %s, %s, %s ) {", cname, wname, tname);
-    }
-    else {
-      Printf(f, "static octave_value_list %s (const octave_value_list& args, int nargout) {", wname);
-    }
-  }
-
-public:
-  OCTAVE():
-    f_begin(0),
-    f_runtime(0),
-    f_header(0),
-    f_doc(0),
-    f_wrappers(0),
-    f_init(0),
-    f_initbeforefunc(0),
-    f_directors(0),
-    f_directors_h(0),
-    s_global_tab(0),
-    s_members_tab(0),
-    class_name(0),
-    have_constructor(0),
-    have_destructor(0),
-    constructor_name(0),
-    docs(0)
-  {
-    /* Add code to manage protected constructors and directors */
-    director_prot_ctor_code = NewString("");
-    Printv(director_prot_ctor_code,
-           "if ( $comparison ) { /* subclassed */\n",
-           "  $director_new \n",
-           "} else {\n", "  error(\"accessing abstract class or protected constructor\"); \n", "  SWIG_fail;\n", "}\n", NIL);
-
-    enable_cplus_runtime_mode();
-    allow_overloading();
-    director_multiple_inheritance = 1;
-    director_language = 1;
-    docs = NewHash();
-  }
-
-  virtual void main(int argc, char *argv[]) {
-    int cppcast = 1;
-      
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-        if (strcmp(argv[i], "-help") == 0) {
-          fputs(usage, stdout);
-        } else if (strcmp(argv[i], "-globals") == 0) {
-          if (argv[i + 1]) {
-            global_name = NewString(argv[i + 1]);
-            Swig_mark_arg(i);
-            Swig_mark_arg(i + 1);
-            i++;
-          } else {
-            Swig_arg_error();
-          }
-        } else if (strcmp(argv[i], "-opprefix") == 0) {
-          if (argv[i + 1]) {
-            op_prefix = NewString(argv[i + 1]);
-            Swig_mark_arg(i);
-            Swig_mark_arg(i + 1);
-            i++;
-          } else {
-            Swig_arg_error();
-          }
-        } else if (strcmp(argv[i], "-cppcast") == 0) {
- 	  cppcast = 1;
- 	  Swig_mark_arg(i);
- 	} else if (strcmp(argv[i], "-nocppcast") == 0) {
- 	  cppcast = 0;
- 	  Swig_mark_arg(i);
-        }
-      }
-    }
-
-    if (!global_name)
-      global_name = NewString("cvar");
-    if (!op_prefix)
-      op_prefix = NewString("op_");
-    if(cppcast)
-      Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0);
-
-    SWIG_library_directory("octave");
-    Preprocessor_define("SWIGOCTAVE 1", 0);
-    SWIG_config_file("octave.swg");
-    SWIG_typemap_lang("octave");
-    allow_overloading();
-
-    // Octave API is C++, so output must be C++ compatibile even when wrapping C code
-    if (!cparse_cplusplus)
-      Swig_cparse_cplusplusout(1);
-  }
-
-  virtual int top(Node *n) {
-    {
-      Node *mod = Getattr(n, "module");
-      if (mod) {
-        Node *options = Getattr(mod, "options");
-        if (options) {
-          int dirprot = 0;
-          if (Getattr(options, "dirprot")) {
-            dirprot = 1;
-          }
-          if (Getattr(options, "nodirprot")) {
-            dirprot = 0;
-          }
-          if (Getattr(options, "directors")) {
-            allow_directors();
-            if (dirprot)
-              allow_dirprot();
-          }
-        }
-      }
-    }
-
-    String *module = Getattr(n, "name");
-    String *outfile = Getattr(n, "outfile");
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_header = NewString("");
-    f_doc = NewString("");
-    f_wrappers = NewString("");
-    f_init = NewString("");
-    f_initbeforefunc = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-    s_global_tab = NewString("");
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("doc", f_doc);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("initbeforefunc", f_initbeforefunc);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGOCTAVE\n#define SWIGOCTAVE\n#endif\n\n");
-
-    Printf(f_runtime, "#define SWIG_name_d      \"%s\"\n", module);
-    Printf(f_runtime, "#define SWIG_name        %s\n", module);
-
-    Printf(f_runtime, "\n");
-    Printf(f_runtime, "#define SWIG_global_name      \"%s\"\n", global_name);
-    Printf(f_runtime, "#define SWIG_op_prefix        \"%s\"\n", op_prefix);
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-      Swig_banner(f_directors_h);
-      if (dirprot_mode()) {
-        //      Printf(f_directors_h, "#include <map>\n");
-        //      Printf(f_directors_h, "#include <string>\n\n");
-      }
-    }
-
-    Printf(f_runtime, "\n");
-
-    Printf(s_global_tab, "\nstatic const struct swig_octave_member swig_globals[] = {\n");
-    Printf(f_init, "static bool SWIG_init_user(octave_swig_type* module_ns)\n{\n");
-
-    if (!CPlusPlus)
-      Printf(f_header,"extern \"C\" {\n");
-
-    Language::top(n);
-
-    if (!CPlusPlus)
-      Printf(f_header,"}\n");
-
-    if (Len(docs))
-      emit_doc_texinfo();
-
-    if (directorsEnabled()) {
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-
-    Printf(f_init, "return true;\n}\n");
-    Printf(s_global_tab, "{0,0,0,0,0,0}\n};\n");
-
-    Printv(f_wrappers, s_global_tab, NIL);
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-    Dump(f_doc, f_begin);
-    if (directorsEnabled()) {
-      Dump(f_directors_h, f_begin);
-      Dump(f_directors, f_begin);
-    }
-    Dump(f_wrappers, f_begin);
-    Dump(f_initbeforefunc, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-
-    Delete(s_global_tab);
-    Delete(f_initbeforefunc);
-    Delete(f_init);
-    Delete(f_wrappers);
-    Delete(f_doc);
-    Delete(f_header);
-    Delete(f_directors);
-    Delete(f_directors_h);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    return SWIG_OK;
-  }
-
-  String *texinfo_escape(String *_s) {
-    const char* s=(const char*)Data(_s);
-    while (*s&&(*s=='\t'||*s=='\r'||*s=='\n'||*s==' '))
-      ++s;
-    String *r = NewString("");
-    for (int j=0;s[j];++j) {
-      if (s[j] == '\n') {
-        Append(r, "\\n\\\n");
-      } else if (s[j] == '\r') {
-        Append(r, "\\r");
-      } else if (s[j] == '\t') {
-        Append(r, "\\t");
-      } else if (s[j] == '\\') {
-        Append(r, "\\\\");
-      } else if (s[j] == '\'') {
-        Append(r, "\\\'");
-      } else if (s[j] == '\"') {
-        Append(r, "\\\"");
-      } else
-        Putc(s[j], r);
-    }
-    return r;
-  }
-  void emit_doc_texinfo() {
-    for (Iterator it = First(docs); it.key; it = Next(it)) {
-      String *wrap_name = it.key;
-
-      String *synopsis = Getattr(it.item, "synopsis");
-      String *decl_info = Getattr(it.item, "decl_info");
-      String *cdecl_info = Getattr(it.item, "cdecl_info");
-      String *args_info = Getattr(it.item, "args_info");
-
-      String *doc_str = NewString("");
-      Printv(doc_str, synopsis, decl_info, cdecl_info, args_info, NIL);
-      String *escaped_doc_str = texinfo_escape(doc_str);
-
-      if (Len(doc_str)>0) {
-        Printf(f_doc,"static const char* %s_texinfo = ",wrap_name);
-        Printf(f_doc,"\"-*- texinfo -*-\\n\\\n%s", escaped_doc_str);
-        if (Len(decl_info))
-          Printf(f_doc,"\\n\\\n@end deftypefn");
-        Printf(f_doc,"\";\n");
-      }
-
-      Delete(escaped_doc_str);
-      Delete(doc_str);
-      Delete(wrap_name);
-    }
-    Printf(f_doc,"\n");
-  }
-  bool is_empty_doc_node(Node* n) {
-    if (!n)
-      return true;
-    String *synopsis = Getattr(n, "synopsis");
-    String *decl_info = Getattr(n, "decl_info");
-    String *cdecl_info = Getattr(n, "cdecl_info");
-    String *args_info = Getattr(n, "args_info");
-    return !Len(synopsis) && !Len(decl_info) &&
-      !Len(cdecl_info) && !Len(args_info);
-  }
-  String *texinfo_name(Node* n, const char* defval = "0") {
-    String *tname = NewString("");
-    String *iname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(iname);
-    Node* d = Getattr(docs, wname);
-
-    if (is_empty_doc_node(d))
-      Printf(tname, defval);
-    else
-      Printf(tname, "%s_texinfo", wname);
-
-    return tname;
-  }
-  void process_autodoc(Node *n) {
-    String *iname = Getattr(n, "sym:name");
-    String *name = Getattr(n, "name");
-    String *wname = Swig_name_wrapper(iname);
-    String *str = Getattr(n, "feature:docstring");
-    bool autodoc_enabled = !Cmp(Getattr(n, "feature:autodoc"), "1");
-    Node* d = Getattr(docs, wname);
-    if (!d) {
-      d = NewHash();
-      Setattr(d, "synopsis", NewString(""));
-      Setattr(d, "decl_info", NewString(""));
-      Setattr(d, "cdecl_info", NewString(""));
-      Setattr(d, "args_info", NewString(""));
-      Setattr(docs, wname, d);
-    }
-
-    String *synopsis = Getattr(d, "synopsis");
-    String *decl_info = Getattr(d, "decl_info");
-    //    String *cdecl_info = Getattr(d, "cdecl_info");
-    String *args_info = Getattr(d, "args_info");
-
-    // * couldn't we just emit the docs here?
-
-    if (autodoc_enabled) {
-      String *decl_str = NewString("");
-      String *args_str = NewString("");
-      make_autodocParmList(n, decl_str, args_str);
-      Append(decl_info, "@deftypefn {Loadable Function} ");
-
-      SwigType *type = Getattr(n, "type");
-      if (type && Strcmp(type, "void")) {
-        Node *nn = classLookup(Getattr(n, "type"));
-        String *type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
-        Append(decl_info, "@var{retval} = ");
-        Printf(args_str, "%s@var{retval} is of type %s. ", args_str, type_str);
-        Delete(type_str);
-      }
-
-      Append(decl_info, name);
-      Append(decl_info, " (");
-      Append(decl_info, decl_str);
-      Append(decl_info, ")\n");
-      Append(args_info, args_str);
-      Delete(decl_str);
-      Delete(args_str);
-    }
-
-    if (str && Len(str) > 0) {
-      // strip off {} if necessary
-      char *t = Char(str);
-      if (*t == '{') {
-        Delitem(str, 0);
-        Delitem(str, DOH_END);
-      }
-
-      // emit into synopsis section
-      Append(synopsis, str);
-    }
-  }
-
-  virtual int importDirective(Node *n) {
-    String *modname = Getattr(n, "module");
-    if (modname)
-      Printf(f_init, "if (!SWIG_Octave_LoadModule(\"%s\")) return false;\n", modname);
-    return Language::importDirective(n);
-  }
-
-  const char *get_implicitconv_flag(Node *n) {
-    int conv = 0;
-    if (n && GetFlag(n, "feature:implicitconv")) {
-      conv = 1;
-    }
-    return conv ? "SWIG_POINTER_IMPLICIT_CONV" : "0";
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addMissingParameterNames()
-   *  For functions that have not had nameless parameters set in the Language class.
-   *
-   * Inputs:
-   *   plist - entire parameter list
-   *   arg_offset - argument number for first parameter
-   * Side effects:
-   *   The "lname" attribute in each parameter in plist will be contain a parameter name
-   * ----------------------------------------------------------------------------- */
-
-  void addMissingParameterNames(ParmList *plist, int arg_offset) {
-    Parm *p = plist;
-    int i = arg_offset;
-    while (p) {
-      if (!Getattr(p, "lname")) {
-        String *pname = Swig_cparm_name(p, i);
-        Delete(pname);
-      }
-      i++;
-      p = nextSibling(p);
-    }
-  }
-
-  void make_autodocParmList(Node *n, String *decl_str, String *args_str) {
-    String *pdocs = 0;
-    ParmList *plist = CopyParmList(Getattr(n, "parms"));
-    Parm *p;
-    Parm *pnext;
-    int start_arg_num = is_wrapping_class() ? 1 : 0;
-
-    addMissingParameterNames(plist, start_arg_num); // for $1_name substitutions done in Swig_typemap_attach_parms
-
-    Swig_typemap_attach_parms("in", plist, 0);
-    Swig_typemap_attach_parms("doc", plist, 0);
-
-    for (p = plist; p; p = pnext) {
-
-      String *tm = Getattr(p, "tmap:in");
-      if (tm) {
-        pnext = Getattr(p, "tmap:in:next");
-        if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-          continue;
-        }
-      } else {
-        pnext = nextSibling(p);
-      }
-
-      String *name = 0;
-      String *type = 0;
-      String *value = 0;
-      String *pdoc = Getattr(p, "tmap:doc");
-      if (pdoc) {
-        name = Getattr(p, "tmap:doc:name");
-        type = Getattr(p, "tmap:doc:type");
-        value = Getattr(p, "tmap:doc:value");
-      }
-
-      name = name ? name : Getattr(p, "name");
-      name = name ? name : Getattr(p, "lname");
-      name = Swig_name_make(p, 0, name, 0, 0); // rename parameter if a keyword
-
-      type = type ? type : Getattr(p, "type");
-      value = value ? value : Getattr(p, "value");
-
-      if (SwigType_isvarargs(type))
-        break;
-
-      String *tex_name = NewString("");
-      if (name)
-        Printf(tex_name, "@var{%s}", name);
-      else
-        Printf(tex_name, "@var{?}");
-
-      if (Len(decl_str))
-        Append(decl_str, ", ");
-      Append(decl_str, tex_name);
-
-      if (value) {
-        String *new_value = convertValue(value, Getattr(p, "type"));
-        if (new_value) {
-          value = new_value;
-        } else {
-          Node *lookup = Swig_symbol_clookup(value, 0);
-          if (lookup)
-            value = Getattr(lookup, "sym:name");
-        }
-        Printf(decl_str, " = %s", value);
-      }
-
-      Node *nn = classLookup(Getattr(p, "type"));
-      String *type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
-      Printf(args_str, "%s is of type %s. ", tex_name, type_str);
-
-      Delete(type_str);
-      Delete(tex_name);
-      Delete(name);
-    }
-    if (pdocs)
-      Setattr(n, "feature:pdocs", pdocs);
-    Delete(plist);
-  }
-
-  /* ------------------------------------------------------------
-   * convertValue()
-   *    Check if string v can be an Octave value literal,
-   *    (eg. number or string), or translate it to an Octave literal.
-   * ------------------------------------------------------------ */
-  String *convertValue(String *v, SwigType *t) {
-    if (v && Len(v) > 0) {
-      char fc = (Char(v))[0];
-      if (('0' <= fc && fc <= '9') || '\'' == fc || '"' == fc) {
-        /* number or string (or maybe NULL pointer) */
-        if (SwigType_ispointer(t) && Strcmp(v, "0") == 0)
-          return NewString("None");
-        else
-          return v;
-      }
-      if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0)
-        return SwigType_ispointer(t) ? NewString("nil") : NewString("0");
-      if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0)
-        return NewString("true");
-      if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
-        return NewString("false");
-    }
-    return 0;
-  }
-
-  virtual int functionWrapper(Node *n) {
-    Parm *p;
-    String *tm;
-    int j;
-
-    String *nodeType = Getattr(n, "nodeType");
-    int constructor = (!Cmp(nodeType, "constructor"));
-    int destructor = (!Cmp(nodeType, "destructor"));
-    String *storage = Getattr(n, "storage");
-
-    bool overloaded = !!Getattr(n, "sym:overloaded");
-    bool last_overload = overloaded && !Getattr(n, "sym:nextSibling");
-    String *iname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(iname);
-    String *overname = Copy(wname);
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-
-    if (!overloaded && !addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    if (overloaded)
-      Append(overname, Getattr(n, "sym:overname"));
-
-    if (!overloaded || last_overload)
-      process_autodoc(n);
-
-    Wrapper *f = NewWrapper();
-    Octave_begin_function(n, f->def, iname, overname, !overloaded);
-
-    emit_parameter_variables(l, f);
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    int num_arguments = emit_num_arguments(l);
-    int num_required = emit_num_required(l);
-    int varargs = emit_isvarargs(l);
-    char source[64];
-
-    Printf(f->code, "if (!SWIG_check_num_args(\"%s\",args.length(),%i,%i,%i)) "
-           "{\n SWIG_fail;\n }\n", iname, num_arguments, num_required, varargs);
-
-    if (constructor && num_arguments == 1 && num_required == 1) {
-      if (Cmp(storage, "explicit") == 0) {
-        Node *parent = Swig_methodclass(n);
-        if (GetFlag(parent, "feature:implicitconv")) {
-          String *desc = NewStringf("SWIGTYPE%s", SwigType_manglestr(Getattr(n, "type")));
-          Printf(f->code, "if (SWIG_CheckImplicit(%s)) SWIG_fail;\n", desc);
-          Delete(desc);
-        }
-      }
-    }
-
-    for (j = 0, p = l; j < num_arguments; ++j) {
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-        p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-
-      String *tm = Getattr(p, "tmap:in");
-      if (tm) {
-        if (!tm || checkAttribute(p, "tmap:in:numinputs", "0")) {
-          p = nextSibling(p);
-          continue;
-        }
-
-        sprintf(source, "args(%d)", j);
-        Setattr(p, "emit:input", source);
-
-        Replaceall(tm, "$source", Getattr(p, "emit:input"));
-        Replaceall(tm, "$input", Getattr(p, "emit:input"));
-        Replaceall(tm, "$target", Getattr(p, "lname"));
-
-        if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-          Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-        } else {
-          Replaceall(tm, "$disown", "0");
-        }
-
-        if (Getattr(p, "tmap:in:implicitconv")) {
-          const char *convflag = "0";
-          if (!Getattr(p, "hidden")) {
-            SwigType *ptype = Getattr(p, "type");
-            convflag = get_implicitconv_flag(classLookup(ptype));
-          }
-          Replaceall(tm, "$implicitconv", convflag);
-          Setattr(p, "implicitconv", convflag);
-        }
-
-        String *getargs = NewString("");
-        if (j >= num_required)
-          Printf(getargs, "if (%d<args.length()) {\n%s\n}", j, tm);
-        else
-          Printv(getargs, tm, NIL);
-        Printv(f->code, getargs, "\n", NIL);
-        Delete(getargs);
-
-        p = Getattr(p, "tmap:in:next");
-        continue;
-      } else {
-        Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-        break;
-      }
-    }
-
-    // Check for trailing varargs
-    if (varargs) {
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-        Replaceall(tm, "$input", "varargs");
-        Printv(f->code, tm, "\n", NIL);
-      }
-    }
-
-    // Insert constraint checking code
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-        Replaceall(tm, "$target", Getattr(p, "lname"));
-        Printv(f->code, tm, "\n", NIL);
-        p = Getattr(p, "tmap:check:next");
-      } else {
-        p = nextSibling(p);
-      }
-    }
-
-    // Insert cleanup code
-    String *cleanup = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-        if (Getattr(p, "tmap:freearg:implicitconv")) {
-          const char *convflag = "0";
-          if (!Getattr(p, "hidden")) {
-            SwigType *ptype = Getattr(p, "type");
-            convflag = get_implicitconv_flag(classLookup(ptype));
-          }
-          if (strcmp(convflag, "0") == 0) {
-            tm = 0;
-          }
-        }
-        if (tm && (Len(tm) != 0)) {
-          Replaceall(tm, "$source", Getattr(p, "lname"));
-          Printv(cleanup, tm, "\n", NIL);
-        }
-        p = Getattr(p, "tmap:freearg:next");
-      } else {
-        p = nextSibling(p);
-      }
-    }
-
-    // Insert argument output code
-    String *outarg = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-        Replaceall(tm, "$source", Getattr(p, "lname"));
-        Replaceall(tm, "$target", "_outp");
-        Replaceall(tm, "$result", "_outp");
-        Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-        Replaceall(tm, "$input", Getattr(p, "emit:input"));
-        Printv(outarg, tm, "\n", NIL);
-        p = Getattr(p, "tmap:argout:next");
-      } else {
-        p = nextSibling(p);
-      }
-    }
-
-    int director_method = is_member_director(n) && !is_smart_pointer() && !destructor;
-    if (director_method) {
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      Append(f->code, "upcall = !!dynamic_cast<Swig::Director*>(arg1);\n");
-    }
-
-    Setattr(n, "wrap:name", overname);
-
-    Swig_director_emit_dynamic_cast(n, f);
-    String *actioncode = emit_action(n);
-
-    Wrapper_add_local(f, "_out", "octave_value_list _out");
-    Wrapper_add_local(f, "_outp", "octave_value_list *_outp=&_out");
-    Wrapper_add_local(f, "_outv", "octave_value _outv");
-
-    // Return the function value
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$target", "_outv");
-      Replaceall(tm, "$result", "_outv");
-
-      if (GetFlag(n, "feature:new"))
-        Replaceall(tm, "$owner", "1");
-      else
-        Replaceall(tm, "$owner", "0");
-
-      Printf(f->code, "%s\n", tm);
-      Printf(f->code, "if (_outv.is_defined()) _outp = " "SWIG_Octave_AppendOutput(_outp, _outv);\n");
-      Delete(tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), iname);
-    }
-    emit_return_variable(n, d, f);
-
-    Printv(f->code, outarg, NIL);
-    Printv(f->code, cleanup, NIL);
-
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-        Replaceall(tm, "$source", Swig_cresult_name());
-        Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$result", "_outv");
-      Printf(f->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    Printf(f->code, "return _out;\n");
-    Printf(f->code, "fail:\n");	// we should free locals etc if this happens
-    Printv(f->code, cleanup, NIL);
-    Printf(f->code, "return octave_value_list();\n");
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    Replaceall(f->code, "$symname", iname);
-    Wrapper_print(f, f_wrappers);
-    DelWrapper(f);
-
-    if (last_overload)
-      dispatchFunction(n);
-
-    if (!overloaded || last_overload) {
-      String *tname = texinfo_name(n);
-      Printf(s_global_tab, "{\"%s\",%s,0,0,2,%s},\n", iname, wname, tname);
-      Delete(tname);
-    }
-
-    Delete(overname);
-    Delete(wname);
-    Delete(cleanup);
-    Delete(outarg);
-
-    return SWIG_OK;
-  }
-
-  void dispatchFunction(Node *n) {
-    Wrapper *f = NewWrapper();
-
-    String *iname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(iname);
-    int maxargs;
-    String *dispatch = Swig_overload_dispatch(n, "return %s(args, nargout);", &maxargs);
-    String *tmp = NewString("");
-
-    Octave_begin_function(n, f->def, iname, wname, true);
-    Wrapper_add_local(f, "argc", "int argc = args.length()");
-    Printf(tmp, "octave_value_ref argv[%d]={", maxargs);
-    for (int j = 0; j < maxargs; ++j)
-      Printf(tmp, "%soctave_value_ref(args,%d)", j ? "," : " ", j);
-    Printf(tmp, "}");
-    Wrapper_add_local(f, "argv", tmp);
-    Printv(f->code, dispatch, "\n", NIL);
-    Printf(f->code, "error(\"No matching function for overload\");\n", iname);
-    Printf(f->code, "return octave_value_list();\n");
-    Printv(f->code, "}\n", NIL);
-
-    Wrapper_print(f, f_wrappers);
-    Delete(tmp);
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(wname);
-  }
-
-  virtual int variableWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    String *tm;
-    Wrapper *getf = NewWrapper();
-    Wrapper *setf = NewWrapper();
-
-    String *getname = Swig_name_get(NSPACE_TODO, iname);
-    String *setname = Swig_name_set(NSPACE_TODO, iname);
-
-    String *getwname = Swig_name_wrapper(getname);
-    String *setwname = Swig_name_wrapper(setname);
-
-    Octave_begin_function(n, setf->def, setname, setwname, true);
-    Printf(setf->def, "if (!SWIG_check_num_args(\"%s_set\",args.length(),1,1,0)) return octave_value_list();", iname);
-    if (is_assignable(n)) {
-      Setattr(n, "wrap:name", setname);
-      if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-        Replaceall(tm, "$source", "args(0)");
-        Replaceall(tm, "$target", name);
-        Replaceall(tm, "$input", "args(0)");
-        if (Getattr(n, "tmap:varin:implicitconv")) {
-          Replaceall(tm, "$implicitconv", get_implicitconv_flag(n));
-        }
-        emit_action_code(n, setf->code, tm);
-        Delete(tm);
-      } else {
-        Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0));
-      }
-      Append(setf->code, "fail:\n");
-      Printf(setf->code, "return octave_value_list();\n");
-    } else {
-      Printf(setf->code, "return octave_set_immutable(args,nargout);");
-    }
-    Append(setf->code, "}\n");
-    Wrapper_print(setf, f_wrappers);
-
-    Setattr(n, "wrap:name", getname);
-    int addfail = 0;
-    Octave_begin_function(n, getf->def, getname, getwname, true);
-    Wrapper_add_local(getf, "obj", "octave_value obj");
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-      Replaceall(tm, "$source", name);
-      Replaceall(tm, "$target", "obj");
-      Replaceall(tm, "$result", "obj");
-      addfail = emit_action_code(n, getf->code, tm);
-      Delete(tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-    }
-    Append(getf->code, "  return obj;\n");
-    if (addfail) {
-      Append(getf->code, "fail:\n");
-      Append(getf->code, "  return octave_value_list();\n");
-    }
-    Append(getf->code, "}\n");
-    Wrapper_print(getf, f_wrappers);
-
-    Printf(s_global_tab, "{\"%s\",0,%s,%s,2,0},\n", iname, getwname, setwname);
-
-    Delete(getwname);
-    Delete(setwname);
-    DelWrapper(setf);
-    DelWrapper(getf);
-
-    return SWIG_OK;
-  }
-
-  virtual int constantWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *cppvalue = Getattr(n, "cppvalue");
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(iname);
-      String *str = SwigType_str(type, wname);
-      Printf(f_header, "static %s = %s;\n", str, value);
-      Delete(str);
-      value = wname;
-    }
-    if ((tm = Swig_typemap_lookup("constcode", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", cppvalue ? cppvalue : value);
-      Replaceall(tm, "$nsname", iname);
-      Printf(f_init, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      return SWIG_NOWRAP;
-    }
-
-    return SWIG_OK;
-  }
-
-  virtual int nativeWrapper(Node *n) {
-    return Language::nativeWrapper(n);
-  }
-
-  virtual int enumDeclaration(Node *n) {
-    return Language::enumDeclaration(n);
-  }
-
-  virtual int enumvalueDeclaration(Node *n) {
-    return Language::enumvalueDeclaration(n);
-  }
-
-  virtual int classDeclaration(Node *n) {
-    return Language::classDeclaration(n);
-  }
-
-  virtual int classHandler(Node *n) {
-    have_constructor = 0;
-    have_destructor = 0;
-    constructor_name = 0;
-
-    class_name = Getattr(n, "sym:name");
-
-    if (!addSymbol(class_name, n))
-      return SWIG_ERROR;
-
-    // This is a bug, due to the fact that swig_type -> octave_class mapping
-    // is 1-to-n.
-    static Hash *emitted = NewHash();
-    String *mangled_classname = Swig_name_mangle(Getattr(n, "name"));
-    if (Getattr(emitted, mangled_classname)) {
-      Delete(mangled_classname);
-      return SWIG_NOWRAP;
-    }
-    Setattr(emitted, mangled_classname, "1");
-    Delete(mangled_classname);
-
-    assert(!s_members_tab);
-    s_members_tab = NewString("");
-    Printv(s_members_tab, "static swig_octave_member swig_", class_name, "_members[] = {\n", NIL);
-
-    Language::classHandler(n);
-
-    SwigType *t = Copy(Getattr(n, "name"));
-    SwigType_add_pointer(t);
-
-    // Replace storing a pointer to underlying class with a smart pointer (intended for use with non-intrusive smart pointers)
-    SwigType *smart = Swig_cparse_smartptr(n);
-    String *wrap_class = NewStringf("&_wrap_class_%s", class_name);
-    if (smart) {
-      SwigType_add_pointer(smart);
-      SwigType_remember_clientdata(smart, wrap_class);
-    }
-    //String *wrap_class = NewStringf("&_wrap_class_%s", class_name);
-    SwigType_remember_clientdata(t, wrap_class);
-
-    int use_director = Swig_directorclass(n);
-    if (use_director) {
-      String *nspace = Getattr(n, "sym:nspace");
-      String *cname = Swig_name_disown(nspace, class_name);
-      String *wcname = Swig_name_wrapper(cname);
-      String *cnameshdw = NewStringf("%s_shadow", cname);
-      String *wcnameshdw = Swig_name_wrapper(cnameshdw);
-      Octave_begin_function(n, f_wrappers, cnameshdw, wcnameshdw, true);
-      Printf(f_wrappers, "  if (args.length()!=1) {\n");
-      Printf(f_wrappers, "    error(\"disown takes no arguments\");\n");
-      Printf(f_wrappers, "    return octave_value_list();\n");
-      Printf(f_wrappers, "  }\n");
-      Printf(f_wrappers, "  %s (args, nargout);\n", wcname);
-      Printf(f_wrappers, "  return args;\n");
-      Printf(f_wrappers, "}\n");
-      Printf(s_members_tab, "{\"__disown\",%s,0,0,0,0},\n", wcnameshdw);
-      Delete(wcname);
-      Delete(cname);
-      Delete(wcnameshdw);
-      Delete(cnameshdw);
-    }
-
-    Printf(s_members_tab, "{0,0,0,0,0,0}\n};\n");
-    Printv(f_wrappers, s_members_tab, NIL);
-
-    String *base_class_names = NewString("");
-    String *base_class = NewString("");
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist)) {
-      Iterator b;
-      int index = 0;
-      b = First(baselist);
-      while (b.item) {
-        String *bname = Getattr(b.item, "name");
-        if ((!bname) || GetFlag(b.item, "feature:ignore") || (!Getattr(b.item, "module"))) {
-          b = Next(b);
-          continue;
-        }
-
-        String *bname_mangled = SwigType_manglestr(SwigType_add_pointer(Copy(bname)));
-        Printf(base_class_names, "\"%s\",", bname_mangled);
-        Printf(base_class, "0,");
-        b = Next(b);
-        index++;
-        Delete(bname_mangled);
-      }
-    }
-
-    Printv(f_wrappers, "static const char *swig_", class_name, "_base_names[] = {", base_class_names, "0};\n", NIL);
-    Printv(f_wrappers, "static const swig_type_info *swig_", class_name, "_base[] = {", base_class, "0};\n", NIL);
-    Printv(f_wrappers, "static swig_octave_class _wrap_class_", class_name, " = {\"", class_name, "\", &SWIGTYPE", SwigType_manglestr(t), ",", NIL);
-    Printv(f_wrappers, Swig_directorclass(n) ? "1," : "0,", NIL);
-    if (have_constructor) {
-      String *nspace = Getattr(n, "sym:nspace");
-      String *cname = Swig_name_construct(nspace, constructor_name);
-      String *wcname = Swig_name_wrapper(cname);
-      String *tname = texinfo_name(n);
-      Printf(f_wrappers, "%s,%s,", wcname, tname);
-      Delete(tname);
-      Delete(wcname);
-      Delete(cname);
-    } else
-      Printv(f_wrappers, "0,0,", NIL);
-    if (have_destructor) {
-      String *nspace = Getattr(n, "sym:nspace");
-      String *cname = Swig_name_destroy(nspace, class_name);
-      String *wcname = Swig_name_wrapper(cname);
-      Printf(f_wrappers, "%s,", wcname);
-      Delete(wcname);
-      Delete(cname);
-    } else
-      Printv(f_wrappers, "0", ",", NIL);
-    Printf(f_wrappers, "swig_%s_members,swig_%s_base_names,swig_%s_base };\n\n", class_name, class_name, class_name);
-
-    Delete(base_class);
-    Delete(base_class_names);
-    Delete(smart);
-    Delete(t);
-    Delete(s_members_tab);
-    s_members_tab = 0;
-    class_name = 0;
-
-    return SWIG_OK;
-  }
-
-  virtual int memberfunctionHandler(Node *n) {
-    Language::memberfunctionHandler(n);
-
-    assert(s_members_tab);
-    assert(class_name);
-    String *name = Getattr(n, "name");
-    String *iname = GetChar(n, "sym:name");
-    String *realname = iname ? iname : name;
-    String *wname = Getattr(n, "wrap:name");
-    assert(wname);
-
-    if (!Getattr(n, "sym:nextSibling")) {
-      String *tname = texinfo_name(n);
-      String *rname = Copy(wname);
-      bool overloaded = !!Getattr(n, "sym:overloaded");
-      if (overloaded)
-        Delslice(rname, Len(rname) - Len(Getattr(n, "sym:overname")), DOH_END);
-      Printf(s_members_tab, "{\"%s\",%s,0,0,0,%s},\n",
-             realname, rname, tname);
-      Delete(rname);
-      Delete(tname);
-    }
-
-    return SWIG_OK;
-  }
-
-  virtual int membervariableHandler(Node *n) {
-    Setattr(n, "feature:autodoc", "0");
-
-    Language::membervariableHandler(n);
-
-    assert(s_members_tab);
-    assert(class_name);
-    String *symname = Getattr(n, "sym:name");
-    String *getname = Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname));
-    String *setname = Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname));
-    String *getwname = Swig_name_wrapper(getname);
-    String *setwname = GetFlag(n, "feature:immutable") ? NewString("octave_set_immutable") : Swig_name_wrapper(setname);
-    assert(s_members_tab);
-
-    Printf(s_members_tab, "{\"%s\",0,%s,%s,0,0},\n", symname, getwname, setwname);
-
-    Delete(getname);
-    Delete(setname);
-    Delete(getwname);
-    Delete(setwname);
-    return SWIG_OK;
-  }
-
-  virtual int constructorHandler(Node *n) {
-    have_constructor = 1;
-    if (!constructor_name)
-      constructor_name = NewString(Getattr(n, "sym:name"));
-
-    int use_director = Swig_directorclass(n);
-    if (use_director) {
-      Parm *parms = Getattr(n, "parms");
-      Parm *self;
-      String *name = NewString("self");
-      String *type = NewString("void");
-      SwigType_add_pointer(type);
-      self = NewParm(type, name, n);
-      Delete(type);
-      Delete(name);
-      Setattr(self, "lname", "self_obj");
-      if (parms)
-        set_nextSibling(self, parms);
-      Setattr(n, "parms", self);
-      Setattr(n, "wrap:self", "1");
-      Setattr(n, "hidden", "1");
-      Delete(self);
-    }
-
-    return Language::constructorHandler(n);
-  }
-
-  virtual int destructorHandler(Node *n) {
-    have_destructor = 1;
-    return Language::destructorHandler(n);
-  }
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    Language::staticmemberfunctionHandler(n);
-
-    assert(s_members_tab);
-    assert(class_name);
-    String *name = Getattr(n, "name");
-    String *iname = GetChar(n, "sym:name");
-    String *realname = iname ? iname : name;
-    String *wname = Getattr(n, "wrap:name");
-    assert(wname);
-
-    if (!Getattr(n, "sym:nextSibling")) {
-      String *tname = texinfo_name(n);
-      String *rname = Copy(wname);
-      bool overloaded = !!Getattr(n, "sym:overloaded");
-      if (overloaded)
-        Delslice(rname, Len(rname) - Len(Getattr(n, "sym:overname")), DOH_END);
-      Printf(s_members_tab, "{\"%s\",%s,0,0,1,%s},\n",
-             realname, rname, tname);
-      Delete(rname);
-      Delete(tname);
-    }
-
-    return SWIG_OK;
-  }
-
-  virtual int memberconstantHandler(Node *n) {
-    return Language::memberconstantHandler(n);
-  }
-
-  virtual int staticmembervariableHandler(Node *n) {
-    Setattr(n, "feature:autodoc", "0");
-
-    Language::staticmembervariableHandler(n);
-
-    if (!GetFlag(n, "wrappedasconstant")) {
-      assert(s_members_tab);
-      assert(class_name);
-      String *symname = Getattr(n, "sym:name");
-      String *getname = Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname));
-      String *setname = Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname));
-      String *getwname = Swig_name_wrapper(getname);
-      String *setwname = GetFlag(n, "feature:immutable") ? NewString("octave_set_immutable") : Swig_name_wrapper(setname);
-      assert(s_members_tab);
-
-      Printf(s_members_tab, "{\"%s\",0,%s,%s,1,0},\n", symname, getwname, setwname);
-
-      Delete(getname);
-      Delete(setname);
-      Delete(getwname);
-      Delete(setwname);
-    }
-    return SWIG_OK;
-  }
-
-  int classDirectorInit(Node *n) {
-    String *declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "\n");
-    Printf(f_directors_h, "%s\n", declaration);
-    Printf(f_directors_h, "public:\n");
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  int classDirectorEnd(Node *n) {
-    Printf(f_directors_h, "};\n\n");
-    return Language::classDirectorEnd(n);
-  }
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *sub = NewString("");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewString("");
-    Printf(classname, "SwigDirector_%s", supername);
-
-    // insert self parameter
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("void");
-    SwigType_add_pointer(type);
-    p = NewParm(type, NewString("self"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      // constructor
-      {
-        Wrapper *w = NewWrapper();
-        String *call;
-        String *basetype = Getattr(parent, "classtype");
-        String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-        call = Swig_csuperclass_call(0, basetype, superparms);
-        Printf(w->def, "%s::%s: %s," "\nSwig::Director(static_cast<%s*>(this)) { \n", classname, target, call, basetype);
-        Append(w->def, "}\n");
-        Delete(target);
-        Wrapper_print(w, f_directors);
-        Delete(call);
-        DelWrapper(w);
-      }
-
-      // constructor header
-      {
-        String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-        Printf(f_directors_h, "    %s;\n", target);
-        Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(classname);
-    Delete(supername);
-    Delete(parms);
-    return Language::classDirectorConstructor(n);
-  }
-
-  int classDirectorDefaultConstructor(Node *n) {
-    String *classname = Swig_class_name(n);
-    {
-      Wrapper *w = NewWrapper();
-      Printf(w->def, "SwigDirector_%s::SwigDirector_%s(void* self) :"
-             "\nSwig::Director((octave_swig_type*)self,static_cast<%s*>(this)) { \n", classname, classname, classname);
-      Append(w->def, "}\n");
-      Wrapper_print(w, f_directors);
-      DelWrapper(w);
-    }
-    Printf(f_directors_h, "    SwigDirector_%s(octave_swig_type* self);\n", classname);
-    Delete(classname);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    int is_void = 0;
-    int is_pointer = 0;
-    String *decl = Getattr(n, "decl");
-    String *returntype = Getattr(n, "type");
-    String *name = Getattr(n, "name");
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *declaration = NewString("");
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *w = NewWrapper();
-    String *tm;
-    String *wrap_args = NewString("");
-    String *value = Getattr(n, "value");
-    String *storage = Getattr(n, "storage");
-    bool pure_virtual = false;
-    int status = SWIG_OK;
-    int idx;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    if (Cmp(storage, "virtual") == 0) {
-      if (Cmp(value, "0") == 0) {
-        pure_virtual = true;
-      }
-    }
-
-    // determine if the method returns a pointer
-    is_pointer = SwigType_ispointer_return(decl);
-    is_void = (!Cmp(returntype, "void") && !is_pointer);
-
-    // virtual method definition
-    String *target;
-    String *pclassname = NewStringf("SwigDirector_%s", classname);
-    String *qualified_name = NewStringf("%s::%s", pclassname, name);
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-
-    // header declaration
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Get any exception classes in the throws typemap
-    ParmList *throw_parm_list = 0;
-
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      Parm *p;
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-        Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-        if (Getattr(p, "tmap:throws")) {
-          if (gencomma++) {
-            Append(w->def, ", ");
-            Append(declaration, ", ");
-          }
-          String *str = SwigType_str(Getattr(p, "type"), 0);
-          Append(w->def, str);
-          Append(declaration, str);
-          Delete(str);
-        }
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    // declare method return value
-    // if the return value is a reference or const reference, a specialized typemap must
-    // handle it, including declaration of c_result ($result).
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-        String *cres = SwigType_lstr(returntype, "c_result");
-        Printf(w->code, "%s;\n", cres);
-        Delete(cres);
-      }
-    }
-
-    if (ignored_method) {
-      if (!pure_virtual) {
-        if (!is_void)
-          Printf(w->code, "return ");
-        String *super_call = Swig_method_call(super, l);
-        Printf(w->code, "%s;\n", super_call);
-        Delete(super_call);
-      } else {
-        Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\");\n", SwigType_namestr(c_classname),
-               SwigType_namestr(name));
-      }
-    } else {
-      // attach typemaps to arguments (C/C++ -> Octave)
-      String *parse_args = NewString("");
-
-      Swig_director_parms_fixup(l);
-
-      Swig_typemap_attach_parms("in", l, 0);
-      Swig_typemap_attach_parms("directorin", l, 0);
-      Swig_typemap_attach_parms("directorargout", l, w);
-
-      Parm *p;
-
-      int outputs = 0;
-      if (!is_void)
-        outputs++;
-
-      // build argument list and type conversion string
-      p = l;
-      while (p) {
-        if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-          p = Getattr(p, "tmap:in:next");
-          continue;
-        }
-
-        if (Getattr(p, "tmap:directorargout") != 0)
-          outputs++;
-
-        String *pname = Getattr(p, "name");
-        String *ptype = Getattr(p, "type");
-        Wrapper_add_local(w, "tmpv", "octave_value tmpv");
-
-        if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-          String *parse = Getattr(p, "tmap:directorin:parse");
-          if (!parse) {
-            Setattr(p, "emit:directorinput", "tmpv");
-            Replaceall(tm, "$input", "tmpv");
-            Replaceall(tm, "$owner", "0");
-            Printv(wrap_args, tm, "\n", NIL);
-            Printf(wrap_args, "args.append(tmpv);\n");
-            Putc('O', parse_args);
-          } else {
-            Append(parse_args, parse);
-            Setattr(p, "emit:directorinput", pname);
-            Replaceall(tm, "$input", pname);
-            Replaceall(tm, "$owner", "0");
-            if (Len(tm) == 0)
-              Append(tm, pname);
-          }
-          p = Getattr(p, "tmap:directorin:next");
-          continue;
-        } else if (Cmp(ptype, "void")) {
-          Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-                       "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(ptype, 0),
-                       SwigType_namestr(c_classname), SwigType_namestr(name));
-          status = SWIG_NOWRAP;
-          break;
-        }
-        p = nextSibling(p);
-      }
-
-      String *method_name = Getattr(n, "sym:name");
-
-      Printv(w->code, wrap_args, NIL);
-
-      // emit method invocation
-      Wrapper_add_local(w, "args", "octave_value_list args");
-      Wrapper_add_local(w, "out", "octave_value_list out");
-      Wrapper_add_local(w, "idx", "std::list<octave_value_list> idx");
-      Printf(w->code, "idx.push_back(octave_value_list(\"%s\"));\n", method_name);
-      Printf(w->code, "idx.push_back(args);\n");
-      Printf(w->code, "out=swig_get_self()->subsref(\".(\",idx,%d);\n", outputs);
-
-      String *cleanup = NewString("");
-      String *outarg = NewString("");
-      idx = 0;
-
-      // marshal return value
-      if (!is_void) {
-        Printf(w->code, "if (out.length()<%d) {\n", outputs);
-        Printf(w->code, "Swig::DirectorTypeMismatchException::raise(\"Octave "
-               "method %s.%s failed to return the required number " "of arguments.\");\n", classname, method_name);
-        Printf(w->code, "}\n");
-
-        tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
-        if (tm != 0) {
-          char temp[24];
-          sprintf(temp, "out(%d)", idx);
-          Replaceall(tm, "$input", temp);
-          //    Replaceall(tm, "$argnum", temp);
-          Replaceall(tm, "$disown", Getattr(n, "wrap:disown") ? "SWIG_POINTER_DISOWN" : "0");
-          if (Getattr(n, "tmap:directorout:implicitconv")) {
-            Replaceall(tm, "$implicitconv", get_implicitconv_flag(n));
-          }
-          Replaceall(tm, "$result", "c_result");
-          Printv(w->code, tm, "\n", NIL);
-          Delete(tm);
-        } else {
-          Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-                       "Unable to use return type %s in director method %s::%s (skipping method).\n",
-                       SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-          status = SWIG_ERROR;
-        }
-      }
-      idx++;
-
-      // marshal outputs
-      for (p = l; p;) {
-        if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-          char temp[24];
-          sprintf(temp, "out(%d)", idx);
-          Replaceall(tm, "$result", temp);
-          Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-          Printv(w->code, tm, "\n", NIL);
-          p = Getattr(p, "tmap:directorargout:next");
-        } else {
-          p = nextSibling(p);
-        }
-      }
-
-      Delete(parse_args);
-      Delete(cleanup);
-      Delete(outarg);
-    }
-
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-        String *rettype = SwigType_str(returntype, 0);
-        if (!SwigType_isreference(returntype)) {
-          Printf(w->code, "return (%s) c_result;\n", rettype);
-        } else {
-          Printf(w->code, "return (%s) *c_result;\n", rettype);
-        }
-        Delete(rettype);
-      }
-    }
-
-    Append(w->code, "}\n");
-
-    // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-        Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-    // emit the director method
-    if (status == SWIG_OK) {
-      if (!Getattr(n, "defaultargs")) {
-        Replaceall(w->code, "$symname", symname);
-        Wrapper_print(w, f_directors);
-        Printv(f_directors_h, declaration, NIL);
-        Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-    // clean up
-    Delete(wrap_args);
-    Delete(pclassname);
-    DelWrapper(w);
-    return status;
-  }
-
-  String *runtimeCode() {
-    String *s = NewString("");
-    String *srun = Swig_include_sys("octrun.swg");
-    if (!srun) {
-      Printf(stderr, "*** Unable to open 'octrun.swg'\n");
-    } else {
-      Append(s, srun);
-      Delete(srun);
-    }
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigoctaverun.h");
-  }
-};
-
-extern "C" Language *swig_octave(void) {
-  return new OCTAVE();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/overload.cxx b/dependencies2013/win32/swig/Source/Modules/overload.cxx
deleted file mode 100644
index 330294ef..00000000
--- a/dependencies2013/win32/swig/Source/Modules/overload.cxx
+++ /dev/null
@@ -1,851 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * overload.cxx
- *
- * This file is used to analyze overloaded functions and methods.
- * It looks at signatures and tries to gather information for
- * building a dispatch function.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-#define MAX_OVERLOAD 4096
-
-/* Overload "argc" and "argv" */
-String *argv_template_string;
-String *argc_template_string;
-
-struct Overloaded {
-  Node *n;			/* Node                               */
-  int argc;			/* Argument count                     */
-  ParmList *parms;		/* Parameters used for overload check */
-  int error;			/* Ambiguity error                    */
-  bool implicitconv_function;	/* For ordering implicitconv functions*/
-};
-
-static int fast_dispatch_mode = 0;
-static int cast_dispatch_mode = 0;
-
-/* Set fast_dispatch_mode */
-void Wrapper_fast_dispatch_mode_set(int flag) {
-  fast_dispatch_mode = flag;
-}
-
-void Wrapper_cast_dispatch_mode_set(int flag) {
-  cast_dispatch_mode = flag;
-}
-
-/* -----------------------------------------------------------------------------
- * mark_implicitconv_function()
- *
- * Mark function if it contains an implicitconv type in the parameter list
- * ----------------------------------------------------------------------------- */
-static void mark_implicitconv_function(Overloaded& onode) {
-  Parm *parms = onode.parms;
-  if (parms) {
-    bool is_implicitconv_function = false;
-    Parm *p = parms;
-    while (p) {
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-      if (GetFlag(p, "implicitconv")) {
-	is_implicitconv_function = true;
-	break;
-      }
-      p = nextSibling(p);
-    }
-    if (is_implicitconv_function)
-      onode.implicitconv_function = true;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_overload_rank()
- *
- * This function takes an overloaded declaration and creates a list that ranks
- * all overloaded methods in an order that can be used to generate a dispatch 
- * function.
- * Slight difference in the way this function is used by scripting languages and
- * statically typed languages. The script languages call this method via 
- * Swig_overload_dispatch() - where wrappers for all overloaded methods are generated,
- * however sometimes the code can never be executed. The non-scripting languages
- * call this method via Swig_overload_check() for each overloaded method in order
- * to determine whether or not the method should be wrapped. Note the slight
- * difference when overloading methods that differ by const only. The
- * scripting languages will ignore the const method, whereas the non-scripting
- * languages ignore the first method parsed.
- * ----------------------------------------------------------------------------- */
-
-List *Swig_overload_rank(Node *n, bool script_lang_wrapping) {
-  Overloaded nodes[MAX_OVERLOAD];
-  int nnodes = 0;
-  Node *o = Getattr(n, "sym:overloaded");
-  Node *c;
-
-  if (!o)
-    return 0;
-
-  c = o;
-  while (c) {
-    if (Getattr(c, "error")) {
-      c = Getattr(c, "sym:nextSibling");
-      continue;
-    }
-    /*    if (SmartPointer && Getattr(c,"cplus:staticbase")) {
-       c = Getattr(c,"sym:nextSibling");
-       continue;
-       } */
-
-    /* Make a list of all the declarations (methods) that are overloaded with
-     * this one particular method name */
-    if (Getattr(c, "wrap:name")) {
-      assert(nnodes < MAX_OVERLOAD);
-      nodes[nnodes].n = c;
-      nodes[nnodes].parms = Getattr(c, "wrap:parms");
-      nodes[nnodes].argc = emit_num_required(nodes[nnodes].parms);
-      nodes[nnodes].error = 0;
-      nodes[nnodes].implicitconv_function = false;
-
-      mark_implicitconv_function(nodes[nnodes]);
-      nnodes++;
-    }
-    c = Getattr(c, "sym:nextSibling");
-  }
-
-  /* Sort the declarations by required argument count */
-  {
-    int i, j;
-    for (i = 0; i < nnodes; i++) {
-      for (j = i + 1; j < nnodes; j++) {
-	if (nodes[i].argc > nodes[j].argc) {
-	  Overloaded t = nodes[i];
-	  nodes[i] = nodes[j];
-	  nodes[j] = t;
-	}
-      }
-    }
-  }
-
-  /* Sort the declarations by argument types */
-  {
-    int i, j;
-    for (i = 0; i < nnodes - 1; i++) {
-      if (nodes[i].argc == nodes[i + 1].argc) {
-	for (j = i + 1; (j < nnodes) && (nodes[j].argc == nodes[i].argc); j++) {
-	  Parm *p1 = nodes[i].parms;
-	  Parm *p2 = nodes[j].parms;
-	  int differ = 0;
-	  int num_checked = 0;
-	  while (p1 && p2 && (num_checked < nodes[i].argc)) {
-	    //    Printf(stdout,"p1 = '%s', p2 = '%s'\n", Getattr(p1,"type"), Getattr(p2,"type"));
-	    if (checkAttribute(p1, "tmap:in:numinputs", "0")) {
-	      p1 = Getattr(p1, "tmap:in:next");
-	      continue;
-	    }
-	    if (checkAttribute(p2, "tmap:in:numinputs", "0")) {
-	      p2 = Getattr(p2, "tmap:in:next");
-	      continue;
-	    }
-	    String *t1 = Getattr(p1, "tmap:typecheck:precedence");
-	    String *t2 = Getattr(p2, "tmap:typecheck:precedence");
-	    if ((!t1) && (!nodes[i].error)) {
-	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[i].n), Getline(nodes[i].n),
-			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
-			   Swig_name_decl(nodes[i].n), SwigType_str(Getattr(p1, "type"), 0));
-	      nodes[i].error = 1;
-	    } else if ((!t2) && (!nodes[j].error)) {
-	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[j].n), Getline(nodes[j].n),
-			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
-			   Swig_name_decl(nodes[j].n), SwigType_str(Getattr(p2, "type"), 0));
-	      nodes[j].error = 1;
-	    }
-	    if (t1 && t2) {
-	      int t1v, t2v;
-	      t1v = atoi(Char(t1));
-	      t2v = atoi(Char(t2));
-	      differ = t1v - t2v;
-	    } else if (!t1 && t2)
-	      differ = 1;
-	    else if (t1 && !t2)
-	      differ = -1;
-	    else if (!t1 && !t2)
-	      differ = -1;
-	    num_checked++;
-	    if (differ > 0) {
-	      Overloaded t = nodes[i];
-	      nodes[i] = nodes[j];
-	      nodes[j] = t;
-	      break;
-	    } else if ((differ == 0) && (Strcmp(t1, "0") == 0)) {
-	      t1 = Getattr(p1, "ltype");
-	      if (!t1) {
-		t1 = SwigType_ltype(Getattr(p1, "type"));
-		if (Getattr(p1, "tmap:typecheck:SWIGTYPE")) {
-		  SwigType_add_pointer(t1);
-		}
-		Setattr(p1, "ltype", t1);
-	      }
-	      t2 = Getattr(p2, "ltype");
-	      if (!t2) {
-		t2 = SwigType_ltype(Getattr(p2, "type"));
-		if (Getattr(p2, "tmap:typecheck:SWIGTYPE")) {
-		  SwigType_add_pointer(t2);
-		}
-		Setattr(p2, "ltype", t2);
-	      }
-
-	      /* Need subtype check here.  If t2 is a subtype of t1, then we need to change the
-	         order */
-
-	      if (SwigType_issubtype(t2, t1)) {
-		Overloaded t = nodes[i];
-		nodes[i] = nodes[j];
-		nodes[j] = t;
-	      }
-
-	      if (Strcmp(t1, t2) != 0) {
-		differ = 1;
-		break;
-	      }
-	    } else if (differ) {
-	      break;
-	    }
-	    if (Getattr(p1, "tmap:in:next")) {
-	      p1 = Getattr(p1, "tmap:in:next");
-	    } else {
-	      p1 = nextSibling(p1);
-	    }
-	    if (Getattr(p2, "tmap:in:next")) {
-	      p2 = Getattr(p2, "tmap:in:next");
-	    } else {
-	      p2 = nextSibling(p2);
-	    }
-	  }
-	  if (!differ) {
-	    /* See if declarations differ by const only */
-	    String *d1 = Getattr(nodes[i].n, "decl");
-	    String *d2 = Getattr(nodes[j].n, "decl");
-	    if (d1 && d2) {
-	      String *dq1 = Copy(d1);
-	      String *dq2 = Copy(d2);
-	      if (SwigType_isconst(d1)) {
-		Delete(SwigType_pop(dq1));
-	      }
-	      if (SwigType_isconst(d2)) {
-		Delete(SwigType_pop(dq2));
-	      }
-	      if (Strcmp(dq1, dq2) == 0) {
-
-		if (SwigType_isconst(d1) && !SwigType_isconst(d2)) {
-		  if (script_lang_wrapping) {
-		    // Swap nodes so that the const method gets ignored (shadowed by the non-const method)
-		    Overloaded t = nodes[i];
-		    nodes[i] = nodes[j];
-		    nodes[j] = t;
-		  }
-		  differ = 1;
-		  if (!nodes[j].error) {
-		    if (script_lang_wrapping) {
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[j].n), Getline(nodes[j].n),
-				   "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[i].n), Getline(nodes[i].n),
-				   "using non-const method %s instead.\n", Swig_name_decl(nodes[i].n));
-		    } else {
-		      if (!Getattr(nodes[j].n, "overload:ignore")) {
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		      }
-		    }
-		  }
-		  nodes[j].error = 1;
-		} else if (!SwigType_isconst(d1) && SwigType_isconst(d2)) {
-		  differ = 1;
-		  if (!nodes[j].error) {
-		    if (script_lang_wrapping) {
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[j].n), Getline(nodes[j].n),
-				   "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[i].n), Getline(nodes[i].n),
-				   "using non-const method %s instead.\n", Swig_name_decl(nodes[i].n));
-		    } else {
-		      if (!Getattr(nodes[j].n, "overload:ignore")) {
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		      }
-		    }
-		  }
-		  nodes[j].error = 1;
-		}
-	      }
-	      Delete(dq1);
-	      Delete(dq2);
-	    }
-	  }
-	  if (!differ) {
-	    if (!nodes[j].error) {
-	      if (script_lang_wrapping) {
-		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[j].n), Getline(nodes[j].n),
-			     "Overloaded method %s effectively ignored,\n", Swig_name_decl(nodes[j].n));
-		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[i].n), Getline(nodes[i].n),
-			     "as it is shadowed by %s.\n", Swig_name_decl(nodes[i].n));
-	      } else {
-		if (!Getattr(nodes[j].n, "overload:ignore")) {
-		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-			       "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-			       "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		}
-	      }
-	      nodes[j].error = 1;
-	    }
-	  }
-	}
-      }
-    }
-  }
-  List *result = NewList();
-  {
-    int i;
-    int argc_changed_index = -1;
-    for (i = 0; i < nnodes; i++) {
-      if (nodes[i].error)
-	Setattr(nodes[i].n, "overload:ignore", "1");
-      Append(result, nodes[i].n);
-      // Printf(stdout,"[ %d ] %d    %s\n", i, nodes[i].implicitconv_function, ParmList_errorstr(nodes[i].parms));
-      // Swig_print_node(nodes[i].n);
-      if (i == nnodes-1 || nodes[i].argc != nodes[i+1].argc) {
-	if (argc_changed_index+2 < nnodes && (nodes[argc_changed_index+1].argc == nodes[argc_changed_index+2].argc)) {
-	  // Add additional implicitconv functions in same order as already ranked.
-	  // Consider overloaded functions by argument count... only add additional implicitconv functions if
-	  // the number of functions with the same arg count > 1, ie, only if overloaded by same argument count.
-	  int j;
-	  for (j = argc_changed_index + 1; j <= i; j++) {
-	    if (nodes[j].implicitconv_function) {
-	      SetFlag(nodes[j].n, "implicitconvtypecheckoff");
-	      Append(result, nodes[j].n);
-	      // Printf(stdout,"[ %d ] %d +  %s\n", j, nodes[j].implicitconv_function, ParmList_errorstr(nodes[j].parms));
-	      // Swig_print_node(nodes[j].n);
-	    }
-	  }
-	}
-	argc_changed_index = i;
-      }
-    }
-  }
-  return result;
-}
-
-// /* -----------------------------------------------------------------------------
-//  * print_typecheck()
-//  * ----------------------------------------------------------------------------- */
-
-static bool print_typecheck(String *f, int j, Parm *pj, bool implicitconvtypecheckoff) {
-  char tmp[256];
-  sprintf(tmp, Char(argv_template_string), j);
-  String *tm = Getattr(pj, "tmap:typecheck");
-  if (tm) {
-    tm = Copy(tm);
-    Replaceid(tm, Getattr(pj, "lname"), "_v");
-    String *conv = Getattr(pj, "implicitconv");
-    if (conv && !implicitconvtypecheckoff) {
-      Replaceall(tm, "$implicitconv", conv);
-    } else {
-      Replaceall(tm, "$implicitconv", "0");
-    }
-    Replaceall(tm, "$input", tmp);
-    Printv(f, tm, "\n", NIL);
-    Delete(tm);
-    return true;
-  } else
-    return false;
-}
-
-/* -----------------------------------------------------------------------------
- * ReplaceFormat()
- * ----------------------------------------------------------------------------- */
-
-static String *ReplaceFormat(const_String_or_char_ptr fmt, int j) {
-  String *lfmt = NewString(fmt);
-  char buf[50];
-  sprintf(buf, "%d", j);
-  Replaceall(lfmt, "$numargs", buf);
-  int i;
-  String *commaargs = NewString("");
-  for (i = 0; i < j; i++) {
-    Printv(commaargs, ", ", NIL);
-    Printf(commaargs, Char(argv_template_string), i);
-  }
-  Replaceall(lfmt, "$commaargs", commaargs);
-  return lfmt;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_overload_dispatch()
- *
- * Generate a dispatch function.  argc is assumed to hold the argument count.
- * argv is the argument vector.
- *
- * Note that for C++ class member functions, Swig_overload_dispatch() assumes
- * that argc includes the "self" argument and that the first element of argv[]
- * is the "self" argument. So for a member function:
- *
- *     Foo::bar(int x, int y, int z);
- *
- * the argc should be 4 (not 3!) and the first element of argv[] would be
- * the appropriate scripting language reference to "self". For regular
- * functions (and static class functions) the argc and argv only include
- * the regular function arguments.
- * ----------------------------------------------------------------------------- */
-
-/*
-  Cast dispatch mechanism.
-*/
-String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int *maxargs) {
-  int i, j;
-
-  *maxargs = 1;
-
-  String *f = NewString("");
-  String *sw = NewString("");
-  Printf(f, "{\n");
-  Printf(f, "unsigned long _index = 0;\n");
-  Printf(f, "SWIG_TypeRank _rank = 0; \n");
-
-  /* Get a list of methods ranked by precedence values and argument count */
-  List *dispatch = Swig_overload_rank(n, true);
-  int nfunc = Len(dispatch);
-
-  /* Loop over the functions */
-
-  bool emitcheck = 1;
-  for (i = 0; i < nfunc; i++) {
-    int fn = 0;
-    Node *ni = Getitem(dispatch, i);
-    Parm *pi = Getattr(ni, "wrap:parms");
-    bool implicitconvtypecheckoff = GetFlag(ni, "implicitconvtypecheckoff") != 0;
-    int num_required = emit_num_required(pi);
-    int num_arguments = emit_num_arguments(pi);
-    if (num_arguments > *maxargs)
-      *maxargs = num_arguments;
-
-    if (num_required == num_arguments) {
-      Printf(f, "if (%s == %d) {\n", argc_template_string, num_required);
-    } else {
-      Printf(f, "if ((%s >= %d) && (%s <= %d)) {\n", argc_template_string, num_required, argc_template_string, num_arguments);
-    }
-    Printf(f, "SWIG_TypeRank _ranki = 0;\n");
-    Printf(f, "SWIG_TypeRank _rankm = 0;\n");
-    if (num_arguments)
-      Printf(f, "SWIG_TypeRank _pi = 1;\n");
-
-    /* create a list with the wrappers that collide with the
-       current one based on argument number */
-    List *coll = NewList();
-    for (int k = i + 1; k < nfunc; k++) {
-      Node *nk = Getitem(dispatch, k);
-      Parm *pk = Getattr(nk, "wrap:parms");
-      int nrk = emit_num_required(pk);
-      int nak = emit_num_arguments(pk);
-      if ((nrk >= num_required && nrk <= num_arguments) || (nak >= num_required && nak <= num_arguments) || (nrk <= num_required && nak >= num_arguments))
-	Append(coll, nk);
-    }
-
-    // printf("overload: %s coll=%d\n", Char(Getattr(n, "sym:name")), Len(coll));
-
-    int num_braces = 0;
-    bool test = (num_arguments > 0);
-    if (test) {
-      int need_v = 1;
-      j = 0;
-      Parm *pj = pi;
-      while (pj) {
-	if (checkAttribute(pj, "tmap:in:numinputs", "0")) {
-	  pj = Getattr(pj, "tmap:in:next");
-	  continue;
-	}
-
-	String *tm = Getattr(pj, "tmap:typecheck");
-	if (tm) {
-	  tm = Copy(tm);
-	  /* normalise for comparison later */
-	  Replaceid(tm, Getattr(pj, "lname"), "_v");
-
-	  /* if all the wrappers have the same type check on this
-	     argument we can optimize it out */
-	  for (int k = 0; k < Len(coll) && !emitcheck; k++) {
-	    Node *nk = Getitem(coll, k);
-	    Parm *pk = Getattr(nk, "wrap:parms");
-	    int nak = emit_num_arguments(pk);
-	    if (nak <= j)
-	      continue;
-	    int l = 0;
-	    Parm *pl = pk;
-	    /* finds arg j on the collider wrapper */
-	    while (pl && l <= j) {
-	      if (checkAttribute(pl, "tmap:in:numinputs", "0")) {
-		pl = Getattr(pl, "tmap:in:next");
-		continue;
-	      }
-	      if (l == j) {
-		/* we are at arg j, so we compare the tmaps now */
-		String *tml = Getattr(pl, "tmap:typecheck");
-		/* normalise it before comparing */
-		if (tml)
-		  Replaceid(tml, Getattr(pl, "lname"), "_v");
-		if (!tml || Cmp(tm, tml))
-		  emitcheck = 1;
-		//printf("tmap: %s[%d] (%d) => %s\n\n",
-		//       Char(Getattr(nk, "sym:name")),
-		//       l, emitcheck, tml?Char(tml):0);
-	      }
-	      Parm *pl1 = Getattr(pl, "tmap:in:next");
-	      if (pl1)
-		pl = pl1;
-	      else
-		pl = nextSibling(pl);
-	      l++;
-	    }
-	  }
-
-	  if (emitcheck) {
-	    if (need_v) {
-	      Printf(f, "int _v = 0;\n");
-	      need_v = 0;
-	    }
-	    if (j >= num_required) {
-	      Printf(f, "if (%s > %d) {\n", argc_template_string, j);
-	      num_braces++;
-	    }
-	    String *tmp = NewStringf(argv_template_string, j);
-
-	    String *conv = Getattr(pj, "implicitconv");
-	    if (conv && !implicitconvtypecheckoff) {
-	      Replaceall(tm, "$implicitconv", conv);
-	    } else {
-	      Replaceall(tm, "$implicitconv", "0");
-	    }
-	    Replaceall(tm, "$input", tmp);
-	    Printv(f, "{\n", tm, "}\n", NIL);
-	    Delete(tm);
-	    fn = i + 1;
-	    Printf(f, "if (!_v) goto check_%d;\n", fn);
-	    Printf(f, "_ranki += _v*_pi;\n");
-	    Printf(f, "_rankm += _pi;\n");
-	    Printf(f, "_pi *= SWIG_MAXCASTRANK;\n");
-	  }
-	}
-	if (!Getattr(pj, "tmap:in:SWIGTYPE") && Getattr(pj, "tmap:typecheck:SWIGTYPE")) {
-	  /* we emit  a warning if the argument defines the 'in' typemap, but not the 'typecheck' one */
-	  Swig_warning(WARN_TYPEMAP_TYPECHECK_UNDEF, Getfile(ni), Getline(ni),
-		       "Overloaded method %s with no explicit typecheck typemap for arg %d of type '%s'\n",
-		       Swig_name_decl(n), j, SwigType_str(Getattr(pj, "type"), 0));
-	}
-	Parm *pj1 = Getattr(pj, "tmap:in:next");
-	if (pj1)
-	  pj = pj1;
-	else
-	  pj = nextSibling(pj);
-	j++;
-      }
-    }
-
-    /* close braces */
-    for ( /* empty */ ; num_braces > 0; num_braces--)
-      Printf(f, "}\n");
-
-    Printf(f, "if (!_index || (_ranki < _rank)) {\n");
-    Printf(f, " _rank = _ranki; _index = %d;\n", i + 1);
-    Printf(f, " if (_rank == _rankm) goto dispatch;\n");
-    Printf(f, "}\n");
-    String *lfmt = ReplaceFormat(fmt, num_arguments);
-    Printf(sw, "case %d:\n", i + 1);
-    Printf(sw, Char(lfmt), Getattr(ni, "wrap:name"));
-    Printf(sw, "\n");
-
-    Printf(f, "}\n");		/* braces closes "if" for this method */
-    if (fn)
-      Printf(f, "check_%d:\n\n", fn);
-
-    if (implicitconvtypecheckoff)
-      Delattr(ni, "implicitconvtypecheckoff");
-
-    Delete(lfmt);
-    Delete(coll);
-  }
-  Delete(dispatch);
-  Printf(f, "dispatch:\n");
-  Printf(f, "switch(_index) {\n");
-  Printf(f, "%s", sw);
-  Printf(f, "}\n");
-
-  Printf(f, "}\n");
-  return f;
-}
-
-/*
-  Fast dispatch mechanism, provided by  Salvador Fandi~no Garc'ia (#930586).
-*/
-String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int *maxargs) {
-  int i, j;
-
-  *maxargs = 1;
-
-  String *f = NewString("");
-
-  /* Get a list of methods ranked by precedence values and argument count */
-  List *dispatch = Swig_overload_rank(n, true);
-  int nfunc = Len(dispatch);
-
-  /* Loop over the functions */
-
-  for (i = 0; i < nfunc; i++) {
-    int fn = 0;
-    Node *ni = Getitem(dispatch, i);
-    Parm *pi = Getattr(ni, "wrap:parms");
-    bool implicitconvtypecheckoff = GetFlag(ni, "implicitconvtypecheckoff") != 0;
-    int num_required = emit_num_required(pi);
-    int num_arguments = emit_num_arguments(pi);
-    if (num_arguments > *maxargs)
-      *maxargs = num_arguments;
-
-    if (num_required == num_arguments) {
-      Printf(f, "if (%s == %d) {\n", argc_template_string, num_required);
-    } else {
-      Printf(f, "if ((%s >= %d) && (%s <= %d)) {\n", argc_template_string, num_required, argc_template_string, num_arguments);
-    }
-
-    /* create a list with the wrappers that collide with the
-       current one based on argument number */
-    List *coll = NewList();
-    for (int k = i + 1; k < nfunc; k++) {
-      Node *nk = Getitem(dispatch, k);
-      Parm *pk = Getattr(nk, "wrap:parms");
-      int nrk = emit_num_required(pk);
-      int nak = emit_num_arguments(pk);
-      if ((nrk >= num_required && nrk <= num_arguments) || (nak >= num_required && nak <= num_arguments) || (nrk <= num_required && nak >= num_arguments))
-	Append(coll, nk);
-    }
-
-    // printf("overload: %s coll=%d\n", Char(Getattr(n, "sym:name")), Len(coll));
-
-    int num_braces = 0;
-    bool test = (Len(coll) > 0 && num_arguments);
-    if (test) {
-      int need_v = 1;
-      j = 0;
-      Parm *pj = pi;
-      while (pj) {
-	if (checkAttribute(pj, "tmap:in:numinputs", "0")) {
-	  pj = Getattr(pj, "tmap:in:next");
-	  continue;
-	}
-
-	String *tm = Getattr(pj, "tmap:typecheck");
-	if (tm) {
-	  tm = Copy(tm);
-	  /* normalise for comparison later */
-	  Replaceid(tm, Getattr(pj, "lname"), "_v");
-
-	  /* if all the wrappers have the same type check on this
-	     argument we can optimize it out */
-	  bool emitcheck = 0;
-	  for (int k = 0; k < Len(coll) && !emitcheck; k++) {
-	    Node *nk = Getitem(coll, k);
-	    Parm *pk = Getattr(nk, "wrap:parms");
-	    int nak = emit_num_arguments(pk);
-	    if (nak <= j)
-	      continue;
-	    int l = 0;
-	    Parm *pl = pk;
-	    /* finds arg j on the collider wrapper */
-	    while (pl && l <= j) {
-	      if (checkAttribute(pl, "tmap:in:numinputs", "0")) {
-		pl = Getattr(pl, "tmap:in:next");
-		continue;
-	      }
-	      if (l == j) {
-		/* we are at arg j, so we compare the tmaps now */
-		String *tml = Getattr(pl, "tmap:typecheck");
-		/* normalise it before comparing */
-		if (tml)
-		  Replaceid(tml, Getattr(pl, "lname"), "_v");
-		if (!tml || Cmp(tm, tml))
-		  emitcheck = 1;
-		//printf("tmap: %s[%d] (%d) => %s\n\n",
-		//       Char(Getattr(nk, "sym:name")),
-		//       l, emitcheck, tml?Char(tml):0);
-	      }
-	      Parm *pl1 = Getattr(pl, "tmap:in:next");
-	      if (pl1)
-		pl = pl1;
-	      else
-		pl = nextSibling(pl);
-	      l++;
-	    }
-	  }
-
-	  if (emitcheck) {
-	    if (need_v) {
-	      Printf(f, "int _v = 0;\n");
-	      need_v = 0;
-	    }
-	    if (j >= num_required) {
-	      Printf(f, "if (%s > %d) {\n", argc_template_string, j);
-	      num_braces++;
-	    }
-	    String *tmp = NewStringf(argv_template_string, j);
-
-	    String *conv = Getattr(pj, "implicitconv");
-	    if (conv && !implicitconvtypecheckoff) {
-	      Replaceall(tm, "$implicitconv", conv);
-	    } else {
-	      Replaceall(tm, "$implicitconv", "0");
-	    }
-	    Replaceall(tm, "$input", tmp);
-	    Printv(f, "{\n", tm, "}\n", NIL);
-	    Delete(tm);
-	    fn = i + 1;
-	    Printf(f, "if (!_v) goto check_%d;\n", fn);
-	  }
-	}
-	if (!Getattr(pj, "tmap:in:SWIGTYPE") && Getattr(pj, "tmap:typecheck:SWIGTYPE")) {
-	  /* we emit  a warning if the argument defines the 'in' typemap, but not the 'typecheck' one */
-	  Swig_warning(WARN_TYPEMAP_TYPECHECK_UNDEF, Getfile(ni), Getline(ni),
-		       "Overloaded method %s with no explicit typecheck typemap for arg %d of type '%s'\n",
-		       Swig_name_decl(n), j, SwigType_str(Getattr(pj, "type"), 0));
-	}
-	Parm *pj1 = Getattr(pj, "tmap:in:next");
-	if (pj1)
-	  pj = pj1;
-	else
-	  pj = nextSibling(pj);
-	j++;
-      }
-    }
-
-    /* close braces */
-    for ( /* empty */ ; num_braces > 0; num_braces--)
-      Printf(f, "}\n");
-
-
-    String *lfmt = ReplaceFormat(fmt, num_arguments);
-    Printf(f, Char(lfmt), Getattr(ni, "wrap:name"));
-
-    Printf(f, "}\n");		/* braces closes "if" for this method */
-    if (fn)
-      Printf(f, "check_%d:\n\n", fn);
-
-    if (implicitconvtypecheckoff)
-      Delattr(ni, "implicitconvtypecheckoff");
-
-    Delete(lfmt);
-    Delete(coll);
-  }
-  Delete(dispatch);
-  return f;
-}
-
-String *Swig_overload_dispatch(Node *n, const_String_or_char_ptr fmt, int *maxargs) {
-
-  if (fast_dispatch_mode || GetFlag(n, "feature:fastdispatch")) {
-    return Swig_overload_dispatch_fast(n, fmt, maxargs);
-  }
-
-  int i, j;
-
-  *maxargs = 1;
-
-  String *f = NewString("");
-
-  /* Get a list of methods ranked by precedence values and argument count */
-  List *dispatch = Swig_overload_rank(n, true);
-  int nfunc = Len(dispatch);
-
-  /* Loop over the functions */
-
-  for (i = 0; i < nfunc; i++) {
-    Node *ni = Getitem(dispatch, i);
-    Parm *pi = Getattr(ni, "wrap:parms");
-    bool implicitconvtypecheckoff = GetFlag(ni, "implicitconvtypecheckoff") != 0;
-    int num_required = emit_num_required(pi);
-    int num_arguments = emit_num_arguments(pi);
-    if (GetFlag(n, "wrap:this")) {
-      num_required++;
-      num_arguments++;
-    }
-    if (num_arguments > *maxargs)
-      *maxargs = num_arguments;
-
-    if (num_required == num_arguments) {
-      Printf(f, "if (%s == %d) {\n", argc_template_string, num_required);
-    } else {
-      Printf(f, "if ((%s >= %d) && (%s <= %d)) {\n", argc_template_string, num_required, argc_template_string, num_arguments);
-    }
-
-    if (num_arguments) {
-      Printf(f, "int _v;\n");
-    }
-
-    int num_braces = 0;
-    j = 0;
-    Parm *pj = pi;
-    while (pj) {
-      if (checkAttribute(pj, "tmap:in:numinputs", "0")) {
-	pj = Getattr(pj, "tmap:in:next");
-	continue;
-      }
-      if (j >= num_required) {
-	String *lfmt = ReplaceFormat(fmt, num_arguments);
-	Printf(f, "if (%s <= %d) {\n", argc_template_string, j);
-	Printf(f, Char(lfmt), Getattr(ni, "wrap:name"));
-	Printf(f, "}\n");
-	Delete(lfmt);
-      }
-      if (print_typecheck(f, (GetFlag(n, "wrap:this") ? j + 1 : j), pj, implicitconvtypecheckoff)) {
-	Printf(f, "if (_v) {\n");
-	num_braces++;
-      }
-      if (!Getattr(pj, "tmap:in:SWIGTYPE") && Getattr(pj, "tmap:typecheck:SWIGTYPE")) {
-	/* we emit  a warning if the argument defines the 'in' typemap, but not the 'typecheck' one */
-	Swig_warning(WARN_TYPEMAP_TYPECHECK_UNDEF, Getfile(ni), Getline(ni),
-		     "Overloaded method %s with no explicit typecheck typemap for arg %d of type '%s'\n",
-		     Swig_name_decl(n), j, SwigType_str(Getattr(pj, "type"), 0));
-      }
-      Parm *pk = Getattr(pj, "tmap:in:next");
-      if (pk)
-	pj = pk;
-      else
-	pj = nextSibling(pj);
-      j++;
-    }
-    String *lfmt = ReplaceFormat(fmt, num_arguments);
-    Printf(f, Char(lfmt), Getattr(ni, "wrap:name"));
-    Delete(lfmt);
-    /* close braces */
-    for ( /* empty */ ; num_braces > 0; num_braces--)
-      Printf(f, "}\n");
-    Printf(f, "}\n");		/* braces closes "if" for this method */
-    if (implicitconvtypecheckoff)
-      Delattr(ni, "implicitconvtypecheckoff");
-  }
-  Delete(dispatch);
-  return f;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_overload_check()
- * ----------------------------------------------------------------------------- */
-void Swig_overload_check(Node *n) {
-  Swig_overload_rank(n, false);
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/perl5.cxx b/dependencies2013/win32/swig/Source/Modules/perl5.cxx
deleted file mode 100644
index 406568b1..00000000
--- a/dependencies2013/win32/swig/Source/Modules/perl5.cxx
+++ /dev/null
@@ -1,2509 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * perl5.cxx
- *
- * Perl5 language module for SWIG.
- * ------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-
-static const char *usage = "\
-Perl5 Options (available with -perl5)\n\
-     -compat         - Compatibility mode\n\
-     -const          - Wrap constants as constants and not variables (implies -proxy)\n\
-     -cppcast        - Enable C++ casting operators\n\
-     -nocppcast      - Disable C++ casting operators, useful for generating bugs\n\
-     -nopm           - Do not generate the .pm file\n\
-     -noproxy        - Don't create proxy classes\n\
-     -proxy          - Create proxy classes\n\
-     -static         - Omit code related to dynamic loading\n\
-\n";
-
-static int compat = 0;
-
-static int no_pmfile = 0;
-
-static int export_all = 0;
-
-/*
- * pmfile
- *   set by the -pm flag, overrides the name of the .pm file
- */
-static String *pmfile = 0;
-
-/*
- * module
- *   set by the %module directive, e.g. "Xerces". It will determine
- *   the name of the .pm file, and the dynamic library, and the name
- *   used by any module wanting to %import the module.
- */
-static String *module = 0;
-
-/*
- * namespace_module
- *   the fully namespace qualified name of the module. It will be used
- *   to set the package namespace in the .pm file, as well as the name
- *   of the initialization methods in the glue library. This will be
- *   the same as module, above, unless the %module directive is given
- *   the 'package' option, e.g. %module(package="Foo::Bar") "baz"
- */
-static String       *namespace_module = 0;
-
-/*
- * cmodule
- *   the namespace of the internal glue code, set to the value of
- *   module with a 'c' appended
- */
-static String *cmodule = 0;
-
-/*
- * dest_package
- *   an optional namespace to put all classes into. Specified by using
- *   the %module(package="Foo::Bar") "baz" syntax
- */
-static String       *dest_package = 0;
-
-static String *command_tab = 0;
-static String *constant_tab = 0;
-static String *variable_tab = 0;
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_runtime_h = 0;
-static File *f_header = 0;
-static File *f_wrappers = 0;
-static File *f_directors = 0;
-static File *f_directors_h = 0;
-static File *f_init = 0;
-static File *f_pm = 0;
-static String *pm;		/* Package initialization code */
-static String *magic;		/* Magic variable wrappers     */
-
-static int staticoption = 0;
-
-// controlling verbose output
-static int          verbose = 0;
-
-/* The following variables are used to manage Perl5 classes */
-
-static int blessed = 1;		/* Enable object oriented features */
-static int do_constants = 0;	/* Constant wrapping */
-static List *classlist = 0;	/* List of classes */
-static int have_constructor = 0;
-static int have_destructor = 0;
-static int have_data_members = 0;
-static String *class_name = 0;	/* Name of the class (what Perl thinks it is) */
-static String *real_classname = 0;	/* Real name of C/C++ class */
-static String *fullclassname = 0;
-
-static String *pcode = 0;	/* Perl code associated with each class */
-						  /* static  String   *blessedmembers = 0;     *//* Member data associated with each class */
-static int member_func = 0;	/* Set to 1 when wrapping a member function */
-static String *func_stubs = 0;	/* Function stubs */
-static String *const_stubs = 0;	/* Constant stubs */
-static int num_consts = 0;	/* Number of constants */
-static String *var_stubs = 0;	/* Variable stubs */
-static String *exported = 0;	/* Exported symbols */
-static String *pragma_include = 0;
-static String *additional_perl_code = 0;	/* Additional Perl code from %perlcode %{ ... %} */
-static Hash *operators = 0;
-static int have_operators = 0;
-
-class PERL5:public Language {
-public:
-
-  PERL5():Language () {
-    Clear(argc_template_string);
-    Printv(argc_template_string, "items", NIL);
-    Clear(argv_template_string);
-    Printv(argv_template_string, "ST(%d)", NIL);
-    director_language = 1;
-  }
-
-  /* Test to see if a type corresponds to something wrapped with a shadow class */
-  Node *is_shadow(SwigType *t) {
-    Node *n;
-    n = classLookup(t);
-    /*  Printf(stdout,"'%s' --> '%p'\n", t, n); */
-    if (n) {
-      if (!Getattr(n, "perl5:proxy")) {
-	setclassname(n);
-      }
-      return Getattr(n, "perl5:proxy");
-    }
-    return 0;
-  }
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    int i = 1;
-    int cppcast = 1;
-
-    SWIG_library_directory("perl5");
-
-    for (i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-package") == 0) {
-	  Printv(stderr,
-		 "*** -package is no longer supported\n*** use the directive '%module A::B::C' in your interface file instead\n*** see the Perl section in the manual for details.\n", NIL);
-	  SWIG_exit(EXIT_FAILURE);
-	} else if (strcmp(argv[i], "-interface") == 0) {
-	  Printv(stderr,
-		 "*** -interface is no longer supported\n*** use the directive '%module A::B::C' in your interface file instead\n*** see the Perl section in the manual for details.\n", NIL);
-	  SWIG_exit(EXIT_FAILURE);
-	} else if (strcmp(argv[i], "-exportall") == 0) {
-	  export_all = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-static") == 0) {
-	  staticoption = 1;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-shadow") == 0) || ((strcmp(argv[i], "-proxy") == 0))) {
-	  blessed = 1;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-noproxy") == 0)) {
-	  blessed = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-const") == 0) {
-	  do_constants = 1;
-	  blessed = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nopm") == 0) {
-	  no_pmfile = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-pm") == 0) {
-	  Swig_mark_arg(i);
-	  i++;
-	  pmfile = NewString(argv[i]);
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i],"-v") == 0) {
-	    Swig_mark_arg(i);
-	    verbose++;
-	} else if (strcmp(argv[i], "-cppcast") == 0) {
-	  cppcast = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nocppcast") == 0) {
-	  cppcast = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-compat") == 0) {
-	  compat = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage, stdout);
-	}
-      }
-    }
-
-    if (cppcast) {
-      Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0);
-    }
-
-    Preprocessor_define("SWIGPERL 1", 0);
-    // SWIGPERL5 is deprecated, and no longer documented.
-    Preprocessor_define("SWIGPERL5 1", 0);
-    SWIG_typemap_lang("perl5");
-    SWIG_config_file("perl5.swg");
-    allow_overloading();
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-    /* check if directors are enabled for this module.  note: this 
-     * is a "master" switch, without which no director code will be
-     * emitted.  %feature("director") statements are also required
-     * to enable directors for individual classes or methods.
-     *
-     * use %module(directors="1") modulename at the start of the 
-     * interface file to enable director generation.
-     *
-     * TODO: directors are disallowed in conjunction with many command
-     * line options.  Some of them are probably safe, but it will take 
-     * some effort to validate each one.
-     */
-    {
-      Node *mod = Getattr(n, "module");
-      if (mod) {
-	Node *options = Getattr(mod, "options");
-	if (options) {
-	  int dirprot = 0;
-	  if (Getattr(options, "dirprot"))
-	    dirprot = 1;
-	  if (Getattr(options, "nodirprot"))
-	    dirprot = 0;
-	  if (Getattr(options, "directors")) {
-	    int allow = 1;
-	    if (export_all) {
-	      Printv(stderr, "*** directors are not supported with -exportall\n", NIL);
-	      allow = 0;
-	    }
-	    if (staticoption) {
-	      Printv(stderr, "*** directors are not supported with -static\n", NIL);
-	      allow = 0;
-	    }
-	    if (!blessed) {
-	      Printv(stderr, "*** directors are not supported with -noproxy\n", NIL);
-	      allow = 0;
-	    }
-	    if (no_pmfile) {
-	      Printv(stderr, "*** directors are not supported with -nopm\n", NIL);
-	      allow = 0;
-	    }
-	    if (compat) {
-	      Printv(stderr, "*** directors are not supported with -compat\n", NIL);
-	      allow = 0;
-	    }
-	    if (allow) {
-	      allow_directors();
-	      if (dirprot)
-		allow_dirprot();
-	    }
-	  }
-	}
-      }
-    }
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-
-    if (directorsEnabled()) {
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    classlist = NewList();
-
-    pm = NewString("");
-    func_stubs = NewString("");
-    var_stubs = NewString("");
-    const_stubs = NewString("");
-    exported = NewString("");
-    magic = NewString("");
-    pragma_include = NewString("");
-    additional_perl_code = NewString("");
-
-    command_tab = NewString("static swig_command_info swig_commands[] = {\n");
-    constant_tab = NewString("static swig_constant_info swig_constants[] = {\n");
-    variable_tab = NewString("static swig_variable_info swig_variables[] = {\n");
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGPERL\n#define SWIGPERL\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-    }
-    Printf(f_runtime, "#define SWIG_CASTRANK_MODE\n");
-    Printf(f_runtime, "\n");
-
-    // Is the imported module in another package?  (IOW, does it use the
-    // %module(package="name") option and it's different than the package
-    // of this module.)
-    Node *mod = Getattr(n, "module");
-    Node *options = Getattr(mod, "options");
-    module = Copy(Getattr(n,"name"));
-
-    String *underscore_module = Copy(module);
-    Replaceall(underscore_module,":","_");
-
-    if (verbose > 0) {
-      fprintf(stdout, "top: using namespace_module: %s\n", Char(namespace_module));
-    }
-
-    if (directorsEnabled()) {
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", underscore_module);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", underscore_module);
-      if (dirprot_mode()) {
-	Printf(f_directors_h, "#include <map>\n");
-	Printf(f_directors_h, "#include <string>\n\n");
-      }
-
-      Printf(f_directors, "\n\n");
-      Printf(f_directors, "/* ---------------------------------------------------\n");
-      Printf(f_directors, " * C++ director class methods\n");
-      Printf(f_directors, " * --------------------------------------------------- */\n\n");
-      if (outfile_h) {
-	String *filename = Swig_file_filename(outfile_h);
-	Printf(magic, "#include \"%s\"\n\n", filename);
-	Delete(filename);
-      }
-    }
-
-    if (verbose > 0) {
-      fprintf(stdout, "top: using module: %s\n", Char(module));
-    }
-
-    dest_package = options ? Getattr(options, "package") : 0;
-    if (dest_package) {
-      namespace_module = Copy(dest_package);
-      if (verbose > 0) {
-	fprintf(stdout, "top: Found package: %s\n",Char(dest_package));
-      }
-    } else {
-      namespace_module = Copy(module);
-      if (verbose > 0) {
-	fprintf(stdout, "top: No package found\n");
-      }
-    }
-    /* If we're in blessed mode, change the package name to "packagec" */
-
-    if (blessed) {
-      cmodule = NewStringf("%sc",namespace_module);
-    } else {
-      cmodule = NewString(namespace_module);
-    }
-
-    /* Create a .pm file
-     * Need to strip off any prefixes that might be found in
-     * the module name */
-
-    if (no_pmfile) {
-      f_pm = NewString(0);
-    } else {
-      if (!pmfile) {
-	char *m = Char(module) + Len(module);
-	while (m != Char(module)) {
-	  if (*m == ':') {
-	    m++;
-	    break;
-	  }
-	  m--;
-	}
-	pmfile = NewStringf("%s.pm", m);
-      }
-      String *filen = NewStringf("%s%s", SWIG_output_directory(), pmfile);
-      if ((f_pm = NewFile(filen, "w", SWIG_output_files())) == 0) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Delete(filen);
-      filen = NULL;
-      Swig_register_filebyname("pm", f_pm);
-      Swig_register_filebyname("perl", f_pm);
-    }
-    {
-      String *boot_name = NewStringf("boot_%s", underscore_module);
-      Printf(f_header,"#define SWIG_init    %s\n\n", boot_name);
-      Printf(f_header,"#define SWIG_name   \"%s::%s\"\n", cmodule, boot_name);
-      Printf(f_header,"#define SWIG_prefix \"%s::\"\n", cmodule);
-      Delete(boot_name);
-    }
-
-    Swig_banner_target_lang(f_pm, "#");
-    Printf(f_pm, "\n");
-
-    Printf(f_pm, "package %s;\n", module);
-
-    /* 
-     * If the package option has been given we are placing our
-     *   symbols into some other packages namespace, so we do not
-     *   mess with @ISA or require for that package
-     */
-    if (dest_package) {
-      Printf(f_pm,"use base qw(DynaLoader);\n");
-    } else {
-      Printf(f_pm,"use base qw(Exporter);\n");
-      if (!staticoption) {
-	Printf(f_pm,"use base qw(DynaLoader);\n");
-      }
-    }
-
-    /* Start creating magic code */
-
-    Printv(magic,
-           "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n",
-	   "#ifdef PERL_OBJECT\n",
-	   "#define MAGIC_CLASS _wrap_", underscore_module, "_var::\n",
-	   "class _wrap_", underscore_module, "_var : public CPerlObj {\n",
-	   "public:\n",
-	   "#else\n",
-	   "#define MAGIC_CLASS\n",
-	   "#endif\n",
-	   "SWIGCLASS_STATIC int swig_magic_readonly(pTHX_ SV *SWIGUNUSEDPARM(sv), MAGIC *SWIGUNUSEDPARM(mg)) {\n",
-	   tab4, "MAGIC_PPERL\n", tab4, "croak(\"Value is read-only.\");\n", tab4, "return 0;\n", "}\n", NIL);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
-
-    /* emit wrappers */
-    Language::top(n);
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (make it occur before %header section)
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-
-    String *base = NewString("");
-
-    /* Dump out variable wrappers */
-
-    Printv(magic, "\n\n#ifdef PERL_OBJECT\n", "};\n", "#endif\n", NIL);
-    Printv(magic, "\n#ifdef __cplusplus\n}\n#endif\n", NIL);
-
-    Printf(f_header, "%s\n", magic);
-
-    String *type_table = NewString("");
-
-    /* Patch the type table to reflect the names used by shadow classes */
-    if (blessed) {
-      Iterator cls;
-      for (cls = First(classlist); cls.item; cls = Next(cls)) {
-	String *pname = Getattr(cls.item, "perl5:proxy");
-	if (pname) {
-	  SwigType *type = Getattr(cls.item, "classtypeobj");
-	  if (!type)
-	    continue;		/* If unnamed class, no type will be found */
-	  type = Copy(type);
-
-	  SwigType_add_pointer(type);
-	  String *mangled = SwigType_manglestr(type);
-	  SwigType_remember_mangleddata(mangled, NewStringf("\"%s\"", pname));
-	  Delete(type);
-	  Delete(mangled);
-	}
-      }
-    }
-    SwigType_emit_type_table(f_runtime, type_table);
-
-    Printf(f_wrappers, "%s", type_table);
-    Delete(type_table);
-
-    Printf(constant_tab, "{0,0,0,0,0,0}\n};\n");
-    Printv(f_wrappers, constant_tab, NIL);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n}\n#endif\n");
-
-    Printf(f_init, "\t ST(0) = &PL_sv_yes;\n");
-    Printf(f_init, "\t XSRETURN(1);\n");
-    Printf(f_init, "}\n");
-
-    /* Finish off tables */
-    Printf(variable_tab, "{0,0,0,0}\n};\n");
-    Printv(f_wrappers, variable_tab, NIL);
-
-    Printf(command_tab, "{0,0}\n};\n");
-    Printv(f_wrappers, command_tab, NIL);
-
-
-    Printf(f_pm, "package %s;\n", cmodule);
-
-    if (!staticoption) {
-      Printf(f_pm,"bootstrap %s;\n", module);
-    } else {
-      Printf(f_pm,"package %s;\n", cmodule);
-      Printf(f_pm,"boot_%s();\n", underscore_module);
-    }
-
-    Printf(f_pm, "package %s;\n", module);
-    /* 
-     * If the package option has been given we are placing our
-     *   symbols into some other packages namespace, so we do not
-     *   mess with @EXPORT
-     */
-    if (!dest_package) {
-      Printf(f_pm,"@EXPORT = qw(%s);\n", exported);
-    }
-
-    Printf(f_pm, "%s", pragma_include);
-
-    if (blessed) {
-
-      /*
-       * These methods will be duplicated if package 
-       *   has been specified, so we do not output them
-       */
-      if (!dest_package) {
-	Printv(base, "\n# ---------- BASE METHODS -------------\n\n", "package ", namespace_module, ";\n\n", NIL);
-
-	/* Write out the TIE method */
-
-	Printv(base, "sub TIEHASH {\n", tab4, "my ($classname,$obj) = @_;\n", tab4, "return bless $obj, $classname;\n", "}\n\n", NIL);
-
-	/* Output a CLEAR method.   This is just a place-holder, but by providing it we
-	 * can make declarations such as
-	 *     %$u = ( x => 2, y=>3, z =>4 );
-	 *
-	 * Where x,y,z are the members of some C/C++ object. */
-
-	Printf(base, "sub CLEAR { }\n\n");
-
-	/* Output default firstkey/nextkey methods */
-
-	Printf(base, "sub FIRSTKEY { }\n\n");
-	Printf(base, "sub NEXTKEY { }\n\n");
-
-	/* Output a FETCH method.  This is actually common to all classes */
-	Printv(base,
-	       "sub FETCH {\n",
-	       tab4, "my ($self,$field) = @_;\n", tab4, "my $member_func = \"swig_${field}_get\";\n", tab4, "$self->$member_func();\n", "}\n\n", NIL);
-
-	/* Output a STORE method.   This is also common to all classes (might move to base class) */
-
-	Printv(base,
-	       "sub STORE {\n",
-	       tab4, "my ($self,$field,$newval) = @_;\n",
-	       tab4, "my $member_func = \"swig_${field}_set\";\n", tab4, "$self->$member_func($newval);\n", "}\n\n", NIL);
-
-	/* Output a 'this' method */
-
-	Printv(base, "sub this {\n", tab4, "my $ptr = shift;\n", tab4, "return tied(%$ptr);\n", "}\n\n", NIL);
-
-	Printf(f_pm, "%s", base);
-      }
-
-      /* Emit function stubs for stand-alone functions */
-      Printf(f_pm, "\n# ------- FUNCTION WRAPPERS --------\n\n");
-      Printf(f_pm, "package %s;\n\n", namespace_module);
-      Printf(f_pm, "%s", func_stubs);
-
-      /* Emit package code for different classes */
-      Printf(f_pm, "%s", pm);
-
-      if (num_consts > 0) {
-	/* Emit constant stubs */
-	Printf(f_pm, "\n# ------- CONSTANT STUBS -------\n\n");
-	Printf(f_pm, "package %s;\n\n", namespace_module);
-	Printf(f_pm, "%s", const_stubs);
-      }
-
-      /* Emit variable stubs */
-
-      Printf(f_pm, "\n# ------- VARIABLE STUBS --------\n\n");
-      Printf(f_pm, "package %s;\n\n", namespace_module);
-      Printf(f_pm, "%s", var_stubs);
-    }
-
-    /* Add additional Perl code at the end */
-    Printf(f_pm, "%s", additional_perl_code);
-
-    Printf(f_pm, "1;\n");
-    Delete(f_pm);
-    Delete(base);
-    Delete(dest_package);
-    Delete(underscore_module);
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-
-    if (directorsEnabled()) {
-      Dump(f_directors_h, f_runtime_h);
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-      Dump(f_directors, f_begin);
-    }
-
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_directors);
-    Delete(f_directors_h);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * importDirective(Node *n)
-   * ------------------------------------------------------------ */
-
-  virtual int importDirective(Node *n) {
-    if (blessed) {
-      String *modname = Getattr(n, "module");
-      if (modname) {
-	Printf(f_pm, "require %s;\n", modname);
-      }
-    }
-    return Language::importDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int functionWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *overname = 0;
-    int director_method = 0;
-
-    Parm *p;
-    int i;
-    Wrapper *f;
-    char source[256], temp[256];
-    String *tm;
-    String *cleanup, *outarg;
-    int num_saved = 0;
-    int num_arguments, num_required;
-    int varargs = 0;
-
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n))
-	return SWIG_ERROR;
-    }
-
-    f = NewWrapper();
-    cleanup = NewString("");
-    outarg = NewString("");
-
-    String *wname = Swig_name_wrapper(iname);
-    if (overname) {
-      Append(wname, overname);
-    }
-    Setattr(n, "wrap:name", wname);
-    Printv(f->def, "XS(", wname, ") {\n", "{\n",	/* scope to destroy C++ objects before croaking */
-	   NIL);
-
-    emit_parameter_variables(l, f);
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    num_arguments = emit_num_arguments(l);
-    num_required = emit_num_required(l);
-    varargs = emit_isvarargs(l);
-
-    Wrapper_add_local(f, "argvi", "int argvi = 0");
-
-    /* Check the number of arguments */
-    if (!varargs) {
-      Printf(f->code, "    if ((items < %d) || (items > %d)) {\n", num_required, num_arguments);
-    } else {
-      Printf(f->code, "    if (items < %d) {\n", num_required);
-    }
-    Printf(f->code, "        SWIG_croak(\"Usage: %s\");\n", usage_func(Char(iname), d, l));
-    Printf(f->code, "}\n");
-
-    /* Write code to extract parameters. */
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      /* Skip ignored arguments */
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-
-      /* Produce string representation of source and target arguments */
-      sprintf(source, "ST(%d)", i);
-      String *target = Getattr(p, "lname");
-
-      if (i >= num_required) {
-	Printf(f->code, "    if (items > %d) {\n", i);
-      }
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$target", target);
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);	/* Save input location */
-
-	if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-	  Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	} else {
-	  Replaceall(tm, "$disown", "0");
-	}
-
-	Printf(f->code, "%s\n", tm);
-	p = Getattr(p, "tmap:in:next");
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	p = nextSibling(p);
-      }
-      if (i >= num_required) {
-	Printf(f->code, "    }\n");
-      }
-    }
-
-    if (varargs) {
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-	sprintf(source, "ST(%d)", i);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	Printf(f->code, "if (items >= %d) {\n", i);
-	Printv(f->code, tm, "\n", NIL);
-	Printf(f->code, "}\n");
-      }
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (i = 0, p = l; p; i++) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    num_saved = 0;
-    for (i = 0, p = l; p; i++) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	SwigType *t = Getattr(p, "type");
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$target", "ST(argvi)");
-	Replaceall(tm, "$result", "ST(argvi)");
-	if (is_shadow(t)) {
-	  Replaceall(tm, "$shadow", "SWIG_SHADOW");
-	} else {
-	  Replaceall(tm, "$shadow", "0");
-	}
-
-	String *in = Getattr(p, "emit:input");
-	if (in) {
-	  sprintf(temp, "_saved[%d]", num_saved);
-	  Replaceall(tm, "$arg", temp);
-	  Replaceall(tm, "$input", temp);
-	  Printf(f->code, "_saved[%d] = %s;\n", num_saved, in);
-	  num_saved++;
-	}
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* If there were any saved arguments, emit a local variable for them */
-    if (num_saved) {
-      sprintf(temp, "_saved[%d]", num_saved);
-      Wrapper_add_localv(f, "_saved", "SV *", temp, NIL);
-    }
-
-    director_method = is_member_director(n) && !is_smart_pointer() && 0 != Cmp(nodeType(n), "destructor");
-    if (director_method) {
-      Wrapper_add_local(f, "director", "Swig::Director *director = 0");
-      Append(f->code, "director = SWIG_DIRECTOR_CAST(arg1);\n");
-      if (dirprot_mode() && !is_public(n)) {
-	Printf(f->code, "if (!director || !(director->swig_get_inner(\"%s\"))) {\n", name);
-	Printf(f->code, "SWIG_exception_fail(SWIG_RuntimeError, \"accessing protected member %s\");\n", name);
-	Append(f->code, "}\n");
-      }
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      Printf(f->code, "upcall = director && SvSTASH(SvRV(ST(0))) == gv_stashpv(director->swig_get_class(), 0);\n");
-    }
-
-    /* Emit the function call */
-    if (director_method) {
-      Append(f->code, "try {\n");
-    }
-
-    /* Now write code to make the function call */
-
-    Swig_director_emit_dynamic_cast(n, f);
-    String *actioncode = emit_action(n);
-
-    if (director_method) {
-      Append(actioncode, "} catch (Swig::DirectorException& swig_err) {\n");
-      Append(actioncode, "  sv_setsv(ERRSV, swig_err.getNative());\n");
-      Append(actioncode, "  SWIG_fail;\n");
-      Append(actioncode, "}\n");
-    }
-
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      SwigType *t = Getattr(n, "type");
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$target", "ST(argvi)");
-      Replaceall(tm, "$result", "ST(argvi)");
-      if (is_shadow(t)) {
-	Replaceall(tm, "$shadow", "SWIG_SHADOW");
-      } else {
-	Replaceall(tm, "$shadow", "0");
-      }
-      if (GetFlag(n, "feature:new")) {
-	Replaceall(tm, "$owner", "SWIG_OWNER");
-      } else {
-	Replaceall(tm, "$owner", "0");
-      }
-      Printf(f->code, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-    }
-    emit_return_variable(n, d, f);
-
-    /* If there were any output args, take care of them. */
-
-    Printv(f->code, outarg, NIL);
-
-    /* If there was any cleanup, do that. */
-
-    Printv(f->code, cleanup, NIL);
-
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-    }
-
-    Printv(f->code, "XSRETURN(argvi);\n", "fail:\n", cleanup, "SWIG_croak_null();\n" "}\n" "}\n", NIL);
-
-    /* Add the dXSARGS last */
-
-    Wrapper_add_local(f, "dXSARGS", "dXSARGS");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-    Replaceall(f->code, "$symname", iname);
-
-    /* Dump the wrapper function */
-
-    Wrapper_print(f, f_wrappers);
-
-    /* Now register the function */
-
-    if (!Getattr(n, "sym:overloaded")) {
-      Printf(command_tab, "{\"%s::%s\", %s},\n", cmodule, iname, wname);
-    } else if (!Getattr(n, "sym:nextSibling")) {
-      /* Generate overloaded dispatch function */
-      int maxargs;
-      String *dispatch = Swig_overload_dispatch_cast(n, "PUSHMARK(MARK); SWIG_CALLXS(%s); return;", &maxargs);
-
-      /* Generate a dispatch wrapper for all overloaded functions */
-
-      Wrapper *df = NewWrapper();
-      String *dname = Swig_name_wrapper(iname);
-
-      Printv(df->def, "XS(", dname, ") {\n", NIL);
-
-      Wrapper_add_local(df, "dXSARGS", "dXSARGS");
-      Printv(df->code, dispatch, "\n", NIL);
-      Printf(df->code, "croak(\"No matching function for overloaded '%s'\");\n", iname);
-      Printf(df->code, "XSRETURN(0);\n");
-      Printv(df->code, "}\n", NIL);
-      Wrapper_print(df, f_wrappers);
-      Printf(command_tab, "{\"%s::%s\", %s},\n", cmodule, iname, dname);
-      DelWrapper(df);
-      Delete(dispatch);
-      Delete(dname);
-    }
-    if (!Getattr(n, "sym:nextSibling")) {
-      if (export_all) {
-	Printf(exported, "%s ", iname);
-      }
-
-      /* --------------------------------------------------------------------
-       * Create a stub for this function, provided it's not a member function
-       * -------------------------------------------------------------------- */
-
-      if ((blessed) && (!member_func)) {
-	Printv(func_stubs, "*", iname, " = *", cmodule, "::", iname, ";\n", NIL);
-      }
-
-    }
-    Delete(cleanup);
-    Delete(outarg);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   * ------------------------------------------------------------ */
-  virtual int variableWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    Wrapper *getf, *setf;
-    String *tm;
-    String *getname = Swig_name_get(NSPACE_TODO, iname);
-    String *setname = Swig_name_set(NSPACE_TODO, iname);
-
-    String *get_name = Swig_name_wrapper(getname);
-    String *set_name = Swig_name_wrapper(setname);
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    getf = NewWrapper();
-    setf = NewWrapper();
-
-    /* Create a Perl function for setting the variable value */
-
-    if (!GetFlag(n, "feature:immutable")) {
-      Setattr(n, "wrap:name", set_name);
-      Printf(setf->def, "SWIGCLASS_STATIC int %s(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) {\n", set_name);
-      Printv(setf->code, tab4, "MAGIC_PPERL\n", NIL);
-
-      /* Check for a few typemaps */
-      tm = Swig_typemap_lookup("varin", n, name, 0);
-      if (tm) {
-	Replaceall(tm, "$source", "sv");
-	Replaceall(tm, "$target", name);
-	Replaceall(tm, "$input", "sv");
-	/* Printf(setf->code,"%s\n", tm); */
-	emit_action_code(n, setf->code, tm);
-      } else {
-	Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0));
-	DelWrapper(setf);
-	DelWrapper(getf);
-	return SWIG_NOWRAP;
-      }
-      Printf(setf->code, "fail:\n");
-      Printf(setf->code, "    return 1;\n}\n");
-      Replaceall(setf->code, "$symname", iname);
-      Wrapper_print(setf, magic);
-    }
-
-    /* Now write a function to evaluate the variable */
-    Setattr(n, "wrap:name", get_name);
-    int addfail = 0;
-    Printf(getf->def, "SWIGCLASS_STATIC int %s(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) {\n", get_name);
-    Printv(getf->code, tab4, "MAGIC_PPERL\n", NIL);
-
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-      Replaceall(tm, "$target", "sv");
-      Replaceall(tm, "$result", "sv");
-      Replaceall(tm, "$source", name);
-      if (is_shadow(t)) {
-	Replaceall(tm, "$shadow", "SWIG_SHADOW");
-      } else {
-	Replaceall(tm, "$shadow", "0");
-      }
-      /* Printf(getf->code,"%s\n", tm); */
-      addfail = emit_action_code(n, getf->code, tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-      DelWrapper(setf);
-      DelWrapper(getf);
-      return SWIG_NOWRAP;
-    }
-    Printf(getf->code, "    return 1;\n");
-    if (addfail) {
-      Append(getf->code, "fail:\n");
-      Append(getf->code, "  return 0;\n");
-    }
-    Append(getf->code, "}\n");
-
-
-    Replaceall(getf->code, "$symname", iname);
-    Wrapper_print(getf, magic);
-
-    String *tt = Getattr(n, "tmap:varout:type");
-    if (tt) {
-      tt = NewStringf("&%s", tt);
-    } else {
-      tt = NewString("0");
-    }
-    /* Now add symbol to the PERL interpreter */
-    if (GetFlag(n, "feature:immutable")) {
-      Printv(variable_tab, tab4, "{ \"", cmodule, "::", iname, "\", MAGIC_CLASS swig_magic_readonly, MAGIC_CLASS ", get_name, ",", tt, " },\n", NIL);
-
-    } else {
-      Printv(variable_tab, tab4, "{ \"", cmodule, "::", iname, "\", MAGIC_CLASS ", set_name, ", MAGIC_CLASS ", get_name, ",", tt, " },\n", NIL);
-    }
-
-    /* If we're blessed, try to figure out what to do with the variable
-       1.  If it's a Perl object of some sort, create a tied-hash
-       around it.
-       2.  Otherwise, just hack Perl's symbol table */
-
-    if (blessed) {
-      if (is_shadow(t)) {
-	Printv(var_stubs,
-	       "\nmy %__", iname, "_hash;\n",
-	       "tie %__", iname, "_hash,\"", is_shadow(t), "\", $",
-	       cmodule, "::", iname, ";\n", "$", iname, "= \\%__", iname, "_hash;\n", "bless $", iname, ", ", is_shadow(t), ";\n", NIL);
-      } else {
-	Printv(var_stubs, "*", iname, " = *", cmodule, "::", iname, ";\n", NIL);
-      }
-    }
-    if (export_all)
-      Printf(exported, "$%s ", iname);
-
-    Delete(tt);
-    DelWrapper(setf);
-    DelWrapper(getf);
-    Delete(getname);
-    Delete(setname);
-    Delete(set_name);
-    Delete(get_name);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    /* Special hook for member pointer */
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(iname);
-      Printf(f_wrappers, "static %s = %s;\n", SwigType_str(type, wname), value);
-      value = Char(wname);
-    }
-
-    if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      if (is_shadow(type)) {
-	Replaceall(tm, "$shadow", "SWIG_SHADOW");
-      } else {
-	Replaceall(tm, "$shadow", "0");
-      }
-      Printf(constant_tab, "%s,\n", tm);
-    } else if ((tm = Swig_typemap_lookup("constcode", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      if (is_shadow(type)) {
-	Replaceall(tm, "$shadow", "SWIG_SHADOW");
-      } else {
-	Replaceall(tm, "$shadow", "0");
-      }
-      Printf(f_init, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      return SWIG_NOWRAP;
-    }
-
-    if (blessed) {
-      if (is_shadow(type)) {
-	Printv(var_stubs,
-	       "\nmy %__", iname, "_hash;\n",
-	       "tie %__", iname, "_hash,\"", is_shadow(type), "\", $",
-	       cmodule, "::", iname, ";\n", "$", iname, "= \\%__", iname, "_hash;\n", "bless $", iname, ", ", is_shadow(type), ";\n", NIL);
-      } else if (do_constants) {
-	Printv(const_stubs, "sub ", name, " () { $", cmodule, "::", name, " }\n", NIL);
-	num_consts++;
-      } else {
-	Printv(var_stubs, "*", iname, " = *", cmodule, "::", iname, ";\n", NIL);
-      }
-    }
-    if (export_all) {
-      if (do_constants && !is_shadow(type)) {
-	Printf(exported, "%s ", name);
-      } else {
-	Printf(exported, "$%s ", iname);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * usage_func()
-   * ------------------------------------------------------------ */
-  char *usage_func(char *iname, SwigType *, ParmList *l) {
-    static String *temp = 0;
-    Parm *p;
-    int i;
-
-    if (!temp)
-      temp = NewString("");
-    Clear(temp);
-    Printf(temp, "%s(", iname);
-
-    /* Now go through and print parameters */
-    p = l;
-    i = 0;
-    while (p != 0) {
-      SwigType *pt = Getattr(p, "type");
-      String *pn = Getattr(p, "name");
-      if (!checkAttribute(p,"tmap:in:numinputs","0")) {
-	/* If parameter has been named, use that.   Otherwise, just print a type  */
-	if (SwigType_type(pt) != T_VOID) {
-	  if (Len(pn) > 0) {
-	    Printf(temp, "%s", pn);
-	  } else {
-	    Printf(temp, "%s", SwigType_str(pt, 0));
-	  }
-	}
-	i++;
-	p = nextSibling(p);
-	if (p)
-	  if (!checkAttribute(p,"tmap:in:numinputs","0"))
-	    Putc(',', temp);
-      } else {
-	p = nextSibling(p);
-	if (p)
-	  if ((i > 0) && (!checkAttribute(p,"tmap:in:numinputs","0")))
-	    Putc(',', temp);
-      }
-    }
-    Printf(temp, ");");
-    return Char(temp);
-  }
-
-  /* ------------------------------------------------------------
-   * nativeWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int nativeWrapper(Node *n) {
-    String *name = Getattr(n, "sym:name");
-    String *funcname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(funcname, n))
-      return SWIG_ERROR;
-
-    Printf(command_tab, "{\"%s::%s\", %s},\n", cmodule, name, funcname);
-    if (export_all)
-      Printf(exported, "%s ", name);
-    if (blessed) {
-      Printv(func_stubs, "*", name, " = *", cmodule, "::", name, ";\n", NIL);
-    }
-    return SWIG_OK;
-  }
-
-/* ----------------------------------------------------------------------------
- *                      OBJECT-ORIENTED FEATURES
- *
- * These extensions provide a more object-oriented interface to C++
- * classes and structures.    The code here is based on extensions
- * provided by David Fletcher and Gary Holt.
- *
- * I have generalized these extensions to make them more general purpose
- * and to resolve object-ownership problems.
- *
- * The approach here is very similar to the Python module :
- *       1.   All of the original methods are placed into a single
- *            package like before except that a 'c' is appended to the
- *            package name.
- *
- *       2.   All methods and function calls are wrapped with a new
- *            perl function.   While possibly inefficient this allows
- *            us to catch complex function arguments (which are hard to
- *            track otherwise).
- *
- *       3.   Classes are represented as tied-hashes in a manner similar
- *            to Gary Holt's extension.   This allows us to access
- *            member data.
- *
- *       4.   Stand-alone (global) C functions are modified to take
- *            tied hashes as arguments for complex datatypes (if
- *            appropriate).
- *
- *       5.   Global variables involving a class/struct is encapsulated
- *            in a tied hash.
- *
- * ------------------------------------------------------------------------- */
-
-
-  void setclassname(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    String *fullname;
-    String *actualpackage;
-    Node *clsmodule = Getattr(n, "module");
-
-    if (!clsmodule) {
-      /* imported module does not define a module name.   Oh well */
-      return;
-    }
-
-    /* Do some work on the class name */
-    if (verbose > 0) {
-      String *modulename = Getattr(clsmodule, "name");
-      fprintf(stdout, "setclassname: Found sym:name: %s\n", Char(symname));
-      fprintf(stdout, "setclassname: Found module: %s\n", Char(modulename));
-      fprintf(stdout, "setclassname: No package found\n");
-    }
-
-    if (dest_package) {
-      fullname = NewStringf("%s::%s", namespace_module, symname);
-    } else {
-      actualpackage = Getattr(clsmodule,"name");
-
-      if (verbose > 0) {
-	fprintf(stdout, "setclassname: Found actualpackage: %s\n", Char(actualpackage));
-      }
-      if ((!compat) && (!Strchr(symname,':'))) {
-	fullname = NewStringf("%s::%s",actualpackage,symname);
-      } else {
-	fullname = NewString(symname);
-      }
-    }
-    if (verbose > 0) {
-      fprintf(stdout, "setclassname: setting proxy: %s\n", Char(fullname));
-    }
-    Setattr(n, "perl5:proxy", fullname);
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-  virtual int classDeclaration(Node *n) {
-    /* Do some work on the class name */
-    if (!Getattr(n, "feature:onlychildren")) {
-      if (blessed) {
-	setclassname(n);
-	Append(classlist, n);
-      }
-    }
-
-    return Language::classDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-
-    if (blessed) {
-      have_constructor = 0;
-      have_operators = 0;
-      have_destructor = 0;
-      have_data_members = 0;
-      operators = NewHash();
-
-      class_name = Getattr(n, "sym:name");
-
-      if (!addSymbol(class_name, n))
-	return SWIG_ERROR;
-
-      /* Use the fully qualified name of the Perl class */
-      if (!compat) {
-	fullclassname = NewStringf("%s::%s", namespace_module, class_name);
-      } else {
-	fullclassname = NewString(class_name);
-      }
-      real_classname = Getattr(n, "name");
-      pcode = NewString("");
-      // blessedmembers = NewString("");
-    }
-
-    /* Emit all of the members */
-    Language::classHandler(n);
-
-
-    /* Finish the rest of the class */
-    if (blessed) {
-      /* Generate a client-data entry */
-      SwigType *ct = NewStringf("p.%s", real_classname);
-      Printv(f_init, "SWIG_TypeClientData(SWIGTYPE", SwigType_manglestr(ct), ", (void*) \"", fullclassname, "\");\n", NIL);
-      SwigType_remember(ct);
-      Delete(ct);
-
-      Printv(pm, "\n############# Class : ", fullclassname, " ##############\n", "\npackage ", fullclassname, ";\n", NIL);
-
-      if (have_operators) {
-	Printf(pm, "use overload\n");
-	Iterator ki;
-	for (ki = First(operators); ki.key; ki = Next(ki)) {
-	  char *name = Char(ki.key);
-	  //        fprintf(stderr,"found name: <%s>\n", name);
-	  if (strstr(name, "__eq__")) {
-	    Printv(pm, tab4, "\"==\" => sub { $_[0]->__eq__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__ne__")) {
-	    Printv(pm, tab4, "\"!=\" => sub { $_[0]->__ne__($_[1])},\n",NIL);
-	    // there are no tests for this in operator_overload_runme.pl
-	    // it is likely to be broken
-	    //	  } else if (strstr(name, "__assign__")) {
-	    //	    Printv(pm, tab4, "\"=\" => sub { $_[0]->__assign__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__str__")) {
-	    Printv(pm, tab4, "'\"\"' => sub { $_[0]->__str__()},\n",NIL);
-	  } else if (strstr(name, "__plusplus__")) {
-	    Printv(pm, tab4, "\"++\" => sub { $_[0]->__plusplus__()},\n",NIL);
-	  } else if (strstr(name, "__minmin__")) {
-	    Printv(pm, tab4, "\"--\" => sub { $_[0]->__minmin__()},\n",NIL);
-	  } else if (strstr(name, "__add__")) {
-	    Printv(pm, tab4, "\"+\" => sub { $_[0]->__add__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__sub__")) {
-	    Printv(pm, tab4, "\"-\" => sub {  if( not $_[2] ) { $_[0]->__sub__($_[1]) }\n",NIL);
-	    Printv(pm, tab8, "elsif( $_[0]->can('__rsub__') ) { $_[0]->__rsub__($_[1]) }\n",NIL);
-	    Printv(pm, tab8, "else { die(\"reverse subtraction not supported\") }\n",NIL);
-	    Printv(pm, tab8, "},\n",NIL);
-	  } else if (strstr(name, "__mul__")) {
-	    Printv(pm, tab4, "\"*\" => sub { $_[0]->__mul__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__div__")) {
-	    Printv(pm, tab4, "\"/\" => sub { $_[0]->__div__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__mod__")) {
-	    Printv(pm, tab4, "\"%\" => sub { $_[0]->__mod__($_[1])},\n",NIL);
-	    // there are no tests for this in operator_overload_runme.pl
-	    // it is likely to be broken
-	    //	  } else if (strstr(name, "__and__")) {
-	    //	    Printv(pm, tab4, "\"&\" => sub { $_[0]->__and__($_[1])},\n",NIL);
-
-	    // there are no tests for this in operator_overload_runme.pl
-	    // it is likely to be broken
-	    //	  } else if (strstr(name, "__or__")) {
-	    //	    Printv(pm, tab4, "\"|\" => sub { $_[0]->__or__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__gt__")) {
-	    Printv(pm, tab4, "\">\" => sub { $_[0]->__gt__($_[1])},\n",NIL);
-          } else if (strstr(name, "__ge__")) {
-            Printv(pm, tab4, "\">=\" => sub { $_[0]->__ge__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__not__")) {
-	    Printv(pm, tab4, "\"!\" => sub { $_[0]->__not__()},\n",NIL);
-	  } else if (strstr(name, "__lt__")) {
-	    Printv(pm, tab4, "\"<\" => sub { $_[0]->__lt__($_[1])},\n",NIL);
-          } else if (strstr(name, "__le__")) {
-            Printv(pm, tab4, "\"<=\" => sub { $_[0]->__le__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__pluseq__")) {
-	    Printv(pm, tab4, "\"+=\" => sub { $_[0]->__pluseq__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__mineq__")) {
-	    Printv(pm, tab4, "\"-=\" => sub { $_[0]->__mineq__($_[1])},\n",NIL);
-	  } else if (strstr(name, "__neg__")) {
-	    Printv(pm, tab4, "\"neg\" => sub { $_[0]->__neg__()},\n",NIL);
-	  } else {
-	    fprintf(stderr,"Unknown operator: %s\n", name);
-	  }
-	}
-	Printv(pm, tab4,
-               "\"=\" => sub { my $class = ref($_[0]); $class->new($_[0]) },\n", NIL);
-	Printv(pm, tab4, "\"fallback\" => 1;\n", NIL);
-      }
-      // make use strict happy
-      Printv(pm, "use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);\n", NIL);
-
-      /* If we are inheriting from a base class, set that up */
-
-      Printv(pm, "@ISA = qw(", NIL);
-
-      /* Handle inheritance */
-      List *baselist = Getattr(n, "bases");
-      if (baselist && Len(baselist)) {
-	Iterator b;
-	b = First(baselist);
-	while (b.item) {
-	  String *bname = Getattr(b.item, "perl5:proxy");
-	  if (!bname) {
-	    b = Next(b);
-	    continue;
-	  }
-	  Printv(pm, " ", bname, NIL);
-	  b = Next(b);
-	}
-      }
-
-      /* Module comes last */
-      if (!compat || Cmp(namespace_module, fullclassname)) {
-	Printv(pm, " ", namespace_module, NIL);
-      }
-
-      Printf(pm, " );\n");
-
-      /* Dump out a hash table containing the pointers that we own */
-      Printf(pm, "%%OWNER = ();\n");
-      if (have_data_members || have_destructor)
-	Printf(pm, "%%ITERATORS = ();\n");
-
-      /* Dump out the package methods */
-
-      Printv(pm, pcode, NIL);
-      Delete(pcode);
-
-      /* Output methods for managing ownership */
-
-      String *director_disown;
-      if (Getattr(n, "perl5:directordisown")) {
-	director_disown = NewStringf("%s%s($self);\n", tab4, Getattr(n, "perl5:directordisown"));
-      } else {
-	director_disown = NewString("");
-      }
-      Printv(pm,
-	     "sub DISOWN {\n",
-	     tab4, "my $self = shift;\n",
-	     director_disown,
-	     tab4, "my $ptr = tied(%$self);\n",
-	     tab4, "delete $OWNER{$ptr};\n",
-	     "}\n\n", "sub ACQUIRE {\n", tab4, "my $self = shift;\n", tab4, "my $ptr = tied(%$self);\n", tab4, "$OWNER{$ptr} = 1;\n", "}\n\n", NIL);
-      Delete(director_disown);
-
-      /* Only output the following methods if a class has member data */
-
-      Delete(operators);
-      operators = 0;
-      if (Swig_directorclass(n)) {
-	/* director classes need a way to recover subclass instance attributes */
-	Node *get_attr = NewHash();
-	String *mrename;
-	String *symname = Getattr(n, "sym:name");
-	mrename = Swig_name_disown(NSPACE_TODO, symname);
-	Replaceall(mrename, "disown", "swig_get_attr");
-	String *type = NewString(getClassType());
-	String *name = NewString("self");
-	SwigType_add_pointer(type);
-	Parm *p = NewParm(type, name, n);
-	Delete(name);
-	Delete(type);
-	type = NewString("SV");
-	SwigType_add_pointer(type);
-	String *action = NewString("");
-	Printv(action, "{\n", "  Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);\n",
-	       "  result = sv_newmortal();\n" "  if (director) sv_setsv(result, director->swig_get_self());\n", "}\n", NIL);
-	Setfile(get_attr, Getfile(n));
-	Setline(get_attr, Getline(n));
-	Setattr(get_attr, "wrap:action", action);
-	Setattr(get_attr, "name", mrename);
-	Setattr(get_attr, "sym:name", mrename);
-	Setattr(get_attr, "type", type);
-	Setattr(get_attr, "parms", p);
-	Delete(action);
-	Delete(type);
-	Delete(p);
-
-	member_func = 1;
-	functionWrapper(get_attr);
-	member_func = 0;
-	Delete(get_attr);
-
-	Printv(pm, "sub FETCH {\n", tab4, "my ($self,$field) = @_;\n", tab4, "my $member_func = \"swig_${field}_get\";\n", tab4,
-	       "if (not $self->can($member_func)) {\n", tab8, "my $h = ", cmodule, "::", mrename, "($self);\n", tab8, "return $h->{$field} if $h;\n",
-	       tab4, "}\n", tab4, "return $self->$member_func;\n", "}\n", "\n", "sub STORE {\n", tab4, "my ($self,$field,$newval) = @_;\n", tab4,
-	       "my $member_func = \"swig_${field}_set\";\n", tab4, "if (not $self->can($member_func)) {\n", tab8, "my $h = ", cmodule, "::", mrename,
-	       "($self);\n", tab8, "return $h->{$field} = $newval if $h;\n", tab4, "}\n", tab4, "return $self->$member_func($newval);\n", "}\n", NIL);
-
-	Delete(mrename);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-
-    member_func = 1;
-    Language::memberfunctionHandler(n);
-    member_func = 0;
-
-    if ((blessed) && (!Getattr(n, "sym:nextSibling"))) {
-
-      if (Strstr(symname, "__eq__")) {
-	DohSetInt(operators, "__eq__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__ne__")) {
-	DohSetInt(operators, "__ne__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__assign__")) {
-	DohSetInt(operators, "__assign__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__str__")) {
-	DohSetInt(operators, "__str__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__add__")) {
-	DohSetInt(operators, "__add__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__sub__")) {
-	DohSetInt(operators, "__sub__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__mul__")) {
-	DohSetInt(operators, "__mul__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__div__")) {
-	DohSetInt(operators, "__div__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__mod__")) {
-	DohSetInt(operators, "__mod__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__and__")) {
-	DohSetInt(operators, "__and__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__or__")) {
-	DohSetInt(operators, "__or__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__not__")) {
-	DohSetInt(operators, "__not__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__gt__")) {
-	DohSetInt(operators, "__gt__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__ge__")) {
-	DohSetInt(operators, "__ge__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__lt__")) {
-	DohSetInt(operators, "__lt__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__le__")) {
-	DohSetInt(operators, "__le__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__neg__")) {
-	DohSetInt(operators, "__neg__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__plusplus__")) {
-	DohSetInt(operators, "__plusplus__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__minmin__")) {
-	DohSetInt(operators, "__minmin__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__mineq__")) {
-	DohSetInt(operators, "__mineq__", 1);
-	have_operators = 1;
-      } else if (Strstr(symname, "__pluseq__")) {
-	DohSetInt(operators, "__pluseq__", 1);
-	have_operators = 1;
-      }
-
-      if (Getattr(n, "feature:shadow")) {
-	String *plcode = perlcode(Getattr(n, "feature:shadow"), 0);
-	String *plaction = NewStringf("%s::%s", cmodule, Swig_name_member(NSPACE_TODO, class_name, symname));
-	Replaceall(plcode, "$action", plaction);
-	Delete(plaction);
-	Printv(pcode, plcode, NIL);
-      } else {
-	Printv(pcode, "*", symname, " = *", cmodule, "::", Swig_name_member(NSPACE_TODO, class_name, symname), ";\n", NIL);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   *
-   * Adds an instance member.
-   * ----------------------------------------------------------------------------- */
-
-  virtual int membervariableHandler(Node *n) {
-
-    String *symname = Getattr(n, "sym:name");
-    /* SwigType *t  = Getattr(n,"type"); */
-
-    /* Emit a pair of get/set functions for the variable */
-
-    member_func = 1;
-    Language::membervariableHandler(n);
-    member_func = 0;
-
-    if (blessed) {
-
-      Printv(pcode, "*swig_", symname, "_get = *", cmodule, "::", Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)), ";\n", NIL);
-      Printv(pcode, "*swig_", symname, "_set = *", cmodule, "::", Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)), ";\n", NIL);
-
-      /* Now we need to generate a little Perl code for this */
-
-      /* if (is_shadow(t)) {
-
-       *//* This is a Perl object that we have already seen.  Add an
-         entry to the members list *//*
-         Printv(blessedmembers,
-         tab4, symname, " => '", is_shadow(t), "',\n",
-         NIL);
-
-         }
-       */
-    }
-    have_data_members++;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorDeclaration()
-   *
-   * Emits a blessed constructor for our class.    In addition to our construct
-   * we manage a Perl hash table containing all of the pointers created by
-   * the constructor.   This prevents us from accidentally trying to free
-   * something that wasn't necessarily allocated by malloc or new
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-
-    String *symname = Getattr(n, "sym:name");
-
-    member_func = 1;
-
-    Swig_save("perl5:constructorHandler", n, "parms", NIL);
-    if (Swig_directorclass(n)) {
-      Parm *parms = Getattr(n, "parms");
-      Parm *self;
-      String *name = NewString("self");
-      String *type = NewString("SV");
-      SwigType_add_pointer(type);
-      self = NewParm(type, name, n);
-      Delete(type);
-      Delete(name);
-      Setattr(self, "lname", "O");
-      if (parms)
-	set_nextSibling(self, parms);
-      Setattr(n, "parms", self);
-      Setattr(n, "wrap:self", "1");
-      Setattr(n, "hidden", "1");
-      Delete(self);
-    }
-
-    String *saved_nc = none_comparison;
-    none_comparison = NewStringf("strcmp(SvPV_nolen(ST(0)), \"%s::%s\") != 0", module, class_name);
-    String *saved_director_prot_ctor_code = director_prot_ctor_code;
-    director_prot_ctor_code = NewStringf("if ($comparison) { /* subclassed */\n" "  $director_new\n" "} else {\n"
-					 "SWIG_exception_fail(SWIG_RuntimeError, \"accessing abstract class or protected constructor\");\n" "}\n");
-    Language::constructorHandler(n);
-    Delete(none_comparison);
-    none_comparison = saved_nc;
-    Delete(director_prot_ctor_code);
-    director_prot_ctor_code = saved_director_prot_ctor_code;
-    Swig_restore(n);
-
-    if ((blessed) && (!Getattr(n, "sym:nextSibling"))) {
-      if (Getattr(n, "feature:shadow")) {
-	String *plcode = perlcode(Getattr(n, "feature:shadow"), 0);
-	String *plaction = NewStringf("%s::%s", module, Swig_name_member(NSPACE_TODO, class_name, symname));
-	Replaceall(plcode, "$action", plaction);
-	Delete(plaction);
-	Printv(pcode, plcode, NIL);
-      } else {
-	if ((Cmp(symname, class_name) == 0)) {
-	  /* Emit a blessed constructor  */
-	  Printf(pcode, "sub new {\n");
-	} else {
-	  /* Constructor doesn't match classname so we'll just use the normal name  */
-	  Printv(pcode, "sub ", Swig_name_construct(NSPACE_TODO, symname), " {\n", NIL);
-	}
-
-	const char *pkg = getCurrentClass() && Swig_directorclass(getCurrentClass())? "$_[0]" : "shift";
-	Printv(pcode,
-	       tab4, "my $pkg = ", pkg, ";\n",
-	       tab4, "my $self = ", cmodule, "::", Swig_name_construct(NSPACE_TODO, symname), "(@_);\n", tab4, "bless $self, $pkg if defined($self);\n", "}\n\n", NIL);
-
-	have_constructor = 1;
-      }
-    }
-    member_func = 0;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------ 
-   * destructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int destructorHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    member_func = 1;
-    Language::destructorHandler(n);
-    if (blessed) {
-      if (Getattr(n, "feature:shadow")) {
-	String *plcode = perlcode(Getattr(n, "feature:shadow"), 0);
-	String *plaction = NewStringf("%s::%s", module, Swig_name_member(NSPACE_TODO, class_name, symname));
-	Replaceall(plcode, "$action", plaction);
-	Delete(plaction);
-	Printv(pcode, plcode, NIL);
-      } else {
-	Printv(pcode,
-	       "sub DESTROY {\n",
-	       tab4, "return unless $_[0]->isa('HASH');\n",
-	       tab4, "my $self = tied(%{$_[0]});\n",
-	       tab4, "return unless defined $self;\n",
-	       tab4, "delete $ITERATORS{$self};\n",
-	       tab4, "if (exists $OWNER{$self}) {\n",
-	       tab8, cmodule, "::", Swig_name_destroy(NSPACE_TODO, symname), "($self);\n", tab8, "delete $OWNER{$self};\n", tab4, "}\n}\n\n", NIL);
-	have_destructor = 1;
-      }
-    }
-    member_func = 0;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    member_func = 1;
-    Language::staticmemberfunctionHandler(n);
-    member_func = 0;
-    if ((blessed) && (!Getattr(n, "sym:nextSibling"))) {
-      String *symname = Getattr(n, "sym:name");
-      Printv(pcode, "*", symname, " = *", cmodule, "::", Swig_name_member(NSPACE_TODO, class_name, symname), ";\n", NIL);
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    Language::staticmembervariableHandler(n);
-    if (blessed) {
-      String *symname = Getattr(n, "sym:name");
-      Printv(pcode, "*", symname, " = *", cmodule, "::", Swig_name_member(NSPACE_TODO, class_name, symname), ";\n", NIL);
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberconstantHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberconstantHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    int oldblessed = blessed;
-
-    /* Create a normal constant */
-    blessed = 0;
-    Language::memberconstantHandler(n);
-    blessed = oldblessed;
-
-    if (blessed) {
-      Printv(pcode, "*", symname, " = *", cmodule, "::", Swig_name_member(NSPACE_TODO, class_name, symname), ";\n", NIL);
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * pragma()
-   *
-   * Pragma directive.
-   *
-   * %pragma(perl5) code="String"              # Includes a string in the .pm file
-   * %pragma(perl5) include="file.pl"          # Includes a file in the .pm file
-   * ------------------------------------------------------------ */
-
-  virtual int pragmaDirective(Node *n) {
-    String *lang;
-    String *code;
-    String *value;
-    if (!ImportMode) {
-      lang = Getattr(n, "lang");
-      code = Getattr(n, "name");
-      value = Getattr(n, "value");
-      if (Strcmp(lang, "perl5") == 0) {
-	if (Strcmp(code, "code") == 0) {
-	  /* Dump the value string into the .pm file */
-	  if (value) {
-	    Printf(pragma_include, "%s\n", value);
-	  }
-	} else if (Strcmp(code, "include") == 0) {
-	  /* Include a file into the .pm file */
-	  if (value) {
-	    FILE *f = Swig_include_open(value);
-	    if (!f) {
-	      Swig_error(input_file, line_number, "Unable to locate file %s\n", value);
-	    } else {
-	      char buffer[4096];
-	      while (fgets(buffer, 4095, f)) {
-		Printf(pragma_include, "%s", buffer);
-	      }
-	      fclose(f);
-	    }
-	  }
-	} else {
-	  Swig_error(input_file, line_number, "Unrecognized pragma.\n");
-	}
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * perlcode()     - Output perlcode code into the shadow file
-   * ------------------------------------------------------------ */
-
-  String *perlcode(String *code, const String *indent) {
-    String *out = NewString("");
-    String *temp;
-    char *t;
-    if (!indent)
-      indent = "";
-
-    temp = NewString(code);
-
-    t = Char(temp);
-    if (*t == '{') {
-      Delitem(temp, 0);
-      Delitem(temp, DOH_END);
-    }
-
-    /* Split the input text into lines */
-    List *clist = SplitLines(temp);
-    Delete(temp);
-    int initial = 0;
-    String *s = 0;
-    Iterator si;
-    /* Get the initial indentation */
-
-    for (si = First(clist); si.item; si = Next(si)) {
-      s = si.item;
-      if (Len(s)) {
-	char *c = Char(s);
-	while (*c) {
-	  if (!isspace(*c))
-	    break;
-	  initial++;
-	  c++;
-	}
-	if (*c && !isspace(*c))
-	  break;
-	else {
-	  initial = 0;
-	}
-      }
-    }
-    while (si.item) {
-      s = si.item;
-      if (Len(s) > initial) {
-	char *c = Char(s);
-	c += initial;
-	Printv(out, indent, c, "\n", NIL);
-      } else {
-	Printv(out, "\n", NIL);
-      }
-      si = Next(si);
-    }
-    Delete(clist);
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * insertDirective()
-   * 
-   * Hook for %insert directive.
-   * ------------------------------------------------------------ */
-
-  virtual int insertDirective(Node *n) {
-    String *code = Getattr(n, "code");
-    String *section = Getattr(n, "section");
-
-    if ((!ImportMode) && (Cmp(section, "perl") == 0)) {
-      Printv(additional_perl_code, code, NIL);
-    } else {
-      Language::insertDirective(n);
-    }
-    return SWIG_OK;
-  }
-
-  String *runtimeCode() {
-    String *s = NewString("");
-    String *shead = Swig_include_sys("perlhead.swg");
-    if (!shead) {
-      Printf(stderr, "*** Unable to open 'perlhead.swg'\n");
-    } else {
-      Append(s, shead);
-      Delete(shead);
-    }
-    String *serrors = Swig_include_sys("perlerrors.swg");
-    if (!serrors) {
-      Printf(stderr, "*** Unable to open 'perlerrors.swg'\n");
-    } else {
-      Append(s, serrors);
-      Delete(serrors);
-    }
-    String *srun = Swig_include_sys("perlrun.swg");
-    if (!srun) {
-      Printf(stderr, "*** Unable to open 'perlrun.swg'\n");
-    } else {
-      Append(s, srun);
-      Delete(srun);
-    }
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigperlrun.h");
-  }
-
-  virtual int classDirectorInit(Node *n) {
-    String *declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "\n");
-    Printf(f_directors_h, "%s\n", declaration);
-    Printf(f_directors_h, "public:\n");
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  virtual int classDirectorEnd(Node *n) {
-    if (dirprot_mode()) {
-      /*
-         This implementation uses a std::map<std::string,int>.
-
-         It should be possible to rewrite it using a more elegant way,
-         like copying the Java approach for the 'override' array.
-
-         But for now, this seems to be the least intrusive way.
-       */
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "/* Internal director utilities */\n");
-      Printf(f_directors_h, "public:\n");
-      Printf(f_directors_h, "    bool swig_get_inner(const char *swig_protected_method_name) const {\n");
-      Printf(f_directors_h, "      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);\n");
-      Printf(f_directors_h, "      return (iv != swig_inner.end() ? iv->second : false);\n");
-      Printf(f_directors_h, "    }\n");
-
-      Printf(f_directors_h, "    void swig_set_inner(const char *swig_protected_method_name, bool swig_val) const {\n");
-      Printf(f_directors_h, "      swig_inner[swig_protected_method_name] = swig_val;\n");
-      Printf(f_directors_h, "    }\n");
-      Printf(f_directors_h, "private:\n");
-      Printf(f_directors_h, "    mutable std::map<std::string, bool> swig_inner;\n");
-    }
-    Printf(f_directors_h, "};\n");
-    return Language::classDirectorEnd(n);
-  }
-
-  virtual int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *sub = NewString("");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewString("");
-    Printf(classname, "SwigDirector_%s", supername);
-
-    /* insert self parameter */
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("SV");
-    SwigType_add_pointer(type);
-    p = NewParm(type, NewString("self"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	Wrapper *w = NewWrapper();
-	String *call;
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-	call = Swig_csuperclass_call(0, basetype, superparms);
-	Printf(w->def, "%s::%s: %s, Swig::Director(self) { \n", classname, target, call);
-	Printf(w->def, "   SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype);
-	Append(w->def, "}\n");
-	Delete(target);
-	Wrapper_print(w, f_directors);
-	Delete(call);
-	DelWrapper(w);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(classname);
-    Delete(supername);
-    Delete(parms);
-    return Language::classDirectorConstructor(n);
-  }
-
-  virtual int classDirectorMethod(Node *n, Node *parent, String *super) {
-    int is_void = 0;
-    int is_pointer = 0;
-    String *decl = Getattr(n, "decl");
-    String *name = Getattr(n, "name");
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *declaration = NewString("");
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *w = NewWrapper();
-    String *tm;
-    String *wrap_args = NewString("");
-    String *returntype = Getattr(n, "type");
-    String *value = Getattr(n, "value");
-    String *storage = Getattr(n, "storage");
-    bool pure_virtual = false;
-    int status = SWIG_OK;
-    int idx;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    if (Cmp(storage, "virtual") == 0) {
-      if (Cmp(value, "0") == 0) {
-	pure_virtual = true;
-      }
-    }
-
-    /* determine if the method returns a pointer */
-    is_pointer = SwigType_ispointer_return(decl);
-    is_void = (!Cmp(returntype, "void") && !is_pointer);
-
-    /* virtual method definition */
-    String *target;
-    String *pclassname = NewStringf("SwigDirector_%s", classname);
-    String *qualified_name = NewStringf("%s::%s", pclassname, name);
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    /* header declaration */
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Get any exception classes in the throws typemap
-    ParmList *throw_parm_list = 0;
-
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      Parm *p;
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-	  String *str = SwigType_str(Getattr(p, "type"), 0);
-	  Append(w->def, str);
-	  Append(declaration, str);
-	  Delete(str);
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    /* declare method return value 
-     * if the return value is a reference or const reference, a specialized typemap must
-     * handle it, including declaration of c_result ($result).
-     */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *cres = SwigType_lstr(returntype, "c_result");
-	Printf(w->code, "%s;\n", cres);
-	Delete(cres);
-      }
-      if (!ignored_method) {
-	String *pres = NewStringf("SV *%s", Swig_cresult_name());
-	Wrapper_add_local(w, Swig_cresult_name(), pres);
-	Delete(pres);
-      }
-    }
-
-    if (ignored_method) {
-      if (!pure_virtual) {
-	if (!is_void)
-	  Printf(w->code, "return ");
-	String *super_call = Swig_method_call(super, l);
-	Printf(w->code, "%s;\n", super_call);
-	Delete(super_call);
-      } else {
-	Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\");\n", SwigType_namestr(c_classname),
-	       SwigType_namestr(name));
-      }
-    } else {
-      /* attach typemaps to arguments (C/C++ -> Perl) */
-      String *parse_args = NewString("");
-      String *pstack = NewString("");
-
-      Swig_director_parms_fixup(l);
-
-      /* remove the wrapper 'w' since it was producing spurious temps */
-      Swig_typemap_attach_parms("in", l, 0);
-      Swig_typemap_attach_parms("directorin", l, 0);
-      Swig_typemap_attach_parms("directorargout", l, w);
-
-      Wrapper_add_local(w, "SP", "dSP");
-
-      {
-	String *ptype = Copy(getClassType());
-	SwigType_add_pointer(ptype);
-	String *mangle = SwigType_manglestr(ptype);
-
-	Wrapper_add_local(w, "swigself", "SV *swigself");
-	Printf(w->code, "swigself = SWIG_NewPointerObj(SWIG_as_voidptr(this), SWIGTYPE%s, SWIG_SHADOW);\n", mangle);
-	Printf(w->code, "sv_bless(swigself, gv_stashpv(swig_get_class(), 0));\n");
-	Delete(mangle);
-	Delete(ptype);
-	Append(pstack, "XPUSHs(swigself);\n");
-      }
-
-      Parm *p;
-      char source[256];
-
-      int outputs = 0;
-      if (!is_void)
-	outputs++;
-
-      /* build argument list and type conversion string */
-      idx = 0;
-      p = l;
-      while (p) {
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	/* old style?  caused segfaults without the p!=0 check
-	   in the for() condition, and seems dangerous in the
-	   while loop as well.
-	   while (Getattr(p, "tmap:ignore")) {
-	   p = Getattr(p, "tmap:ignore:next");
-	   }
-	 */
-
-	if (Getattr(p, "tmap:directorargout") != 0)
-	  outputs++;
-
-	String *pname = Getattr(p, "name");
-	String *ptype = Getattr(p, "type");
-
-	if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-	  sprintf(source, "obj%d", idx++);
-	  String *input = NewString(source);
-	  Setattr(p, "emit:directorinput", input);
-	  Replaceall(tm, "$input", input);
-	  Delete(input);
-	  Replaceall(tm, "$owner", "0");
-	  Replaceall(tm, "$shadow", "0");
-	  /* Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL); */
-	  Printv(wrap_args, "SV *", source, ";\n", NIL);
-
-	  Printv(wrap_args, tm, "\n", NIL);
-	  Putc('O', parse_args);
-	  Printv(pstack, "XPUSHs(", source, ");\n", NIL);
-	  p = Getattr(p, "tmap:directorin:next");
-	  continue;
-	} else if (Cmp(ptype, "void")) {
-	  /* special handling for pointers to other C++ director classes.
-	   * ideally this would be left to a typemap, but there is currently no
-	   * way to selectively apply the dynamic_cast<> to classes that have
-	   * directors.  in other words, the type "SwigDirector_$1_lname" only exists
-	   * for classes with directors.  we avoid the problem here by checking
-	   * module.wrap::directormap, but it's not clear how to get a typemap to
-	   * do something similar.  perhaps a new default typemap (in addition
-	   * to SWIGTYPE) called DIRECTORTYPE?
-	   */
-	  if (SwigType_ispointer(ptype) || SwigType_isreference(ptype)) {
-	    Node *module = Getattr(parent, "module");
-	    Node *target = Swig_directormap(module, ptype);
-	    sprintf(source, "obj%d", idx++);
-	    String *nonconst = 0;
-	    /* strip pointer/reference --- should move to Swig/stype.c */
-	    String *nptype = NewString(Char(ptype) + 2);
-	    /* name as pointer */
-	    String *ppname = Copy(pname);
-	    if (SwigType_isreference(ptype)) {
-	      Insert(ppname, 0, "&");
-	    }
-	    /* if necessary, cast away const since Perl doesn't support it! */
-	    if (SwigType_isconst(nptype)) {
-	      nonconst = NewStringf("nc_tmp_%s", pname);
-	      String *nonconst_i = NewStringf("= const_cast< %s >(%s)", SwigType_lstr(ptype, 0), ppname);
-	      Wrapper_add_localv(w, nonconst, SwigType_lstr(ptype, 0), nonconst, nonconst_i, NIL);
-	      Delete(nonconst_i);
-	      Swig_warning(WARN_LANG_DISCARD_CONST, input_file, line_number,
-			   "Target language argument '%s' discards const in director method %s::%s.\n",
-			   SwigType_str(ptype, pname), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    } else {
-	      nonconst = Copy(ppname);
-	    }
-	    Delete(nptype);
-	    Delete(ppname);
-	    String *mangle = SwigType_manglestr(ptype);
-	    if (target) {
-	      String *director = NewStringf("director_%s", mangle);
-	      Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL);
-	      Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL);
-	      Printf(wrap_args, "%s = SWIG_DIRECTOR_CAST(%s);\n", director, nonconst);
-	      Printf(wrap_args, "if (!%s) {\n", director);
-	      Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	      Append(wrap_args, "} else {\n");
-	      Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
-	      Printf(wrap_args, "SvREFCNT_inc((SV *)%s);\n", source);
-	      Append(wrap_args, "}\n");
-	      Delete(director);
-	    } else {
-	      Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL);
-	      Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	      Printf(pstack, "XPUSHs(sv_2mortal(%s));\n", source);
-	    }
-	    Putc('O', parse_args);
-	    Delete(mangle);
-	    Delete(nonconst);
-	  } else {
-	    Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-			 "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(ptype, 0),
-			 SwigType_namestr(c_classname), SwigType_namestr(name));
-	    status = SWIG_NOWRAP;
-	    break;
-	  }
-	}
-	p = nextSibling(p);
-      }
-
-      /* add the method name as a PyString */
-      String *pyname = Getattr(n, "sym:name");
-
-      /* wrap complex arguments to PyObjects */
-      Printv(w->code, wrap_args, NIL);
-
-      /* pass the method call on to the Python object */
-      if (dirprot_mode() && !is_public(n)) {
-	Printf(w->code, "swig_set_inner(\"%s\", true);\n", name);
-      }
-
-      Append(w->code, "ENTER;\n");
-      Append(w->code, "SAVETMPS;\n");
-      Append(w->code, "PUSHMARK(SP);\n");
-      Append(w->code, pstack);
-      Delete(pstack);
-      Append(w->code, "PUTBACK;\n");
-      Printf(w->code, "call_method(\"%s\", G_EVAL | G_SCALAR);\n", pyname);
-
-      if (dirprot_mode() && !is_public(n))
-	Printf(w->code, "swig_set_inner(\"%s\", false);\n", name);
-
-      /* exception handling */
-      tm = Swig_typemap_lookup("director:except", n, Swig_cresult_name(), 0);
-      if (!tm) {
-	tm = Getattr(n, "feature:director:except");
-	if (tm)
-	  tm = Copy(tm);
-      }
-      Append(w->code, "if (SvTRUE(ERRSV)) {\n");
-      Append(w->code, "  PUTBACK;\n  FREETMPS;\n  LEAVE;\n");
-      if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
-	Replaceall(tm, "$error", "ERRSV");
-	Printv(w->code, Str(tm), "\n", NIL);
-      } else {
-	Printf(w->code, "  Swig::DirectorMethodException::raise(ERRSV);\n", classname, pyname);
-      }
-      Append(w->code, "}\n");
-      Delete(tm);
-
-      /*
-       * Python method may return a simple object, or a tuple.
-       * for in/out aruments, we have to extract the appropriate PyObjects from the tuple,
-       * then marshal everything back to C/C++ (return value and output arguments).
-       *
-       */
-
-      /* marshal return value and other outputs (if any) from PyObject to C/C++ type */
-
-      String *cleanup = NewString("");
-      String *outarg = NewString("");
-
-      if (outputs > 1) {
-	Wrapper_add_local(w, "output", "SV *output");
-	Printf(w->code, "if (count != %d) {\n", outputs);
-	Printf(w->code, "  Swig::DirectorTypeMismatchException::raise(\"Perl method %s.%sfailed to return a list.\");\n", classname, pyname);
-	Append(w->code, "}\n");
-      }
-
-      idx = 0;
-
-      /* marshal return value */
-      if (!is_void) {
-	Append(w->code, "SPAGAIN;\n");
-	Printf(w->code, "%s = POPs;\n", Swig_cresult_name());
-	tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
-	if (tm != 0) {
-	  if (outputs > 1) {
-	    Printf(w->code, "output = POPs;\n");
-	    Replaceall(tm, "$input", "output");
-	  } else {
-	    Replaceall(tm, "$input", Swig_cresult_name());
-	  }
-	  char temp[24];
-	  sprintf(temp, "%d", idx);
-	  Replaceall(tm, "$argnum", temp);
-
-	  /* TODO check this */
-	  if (Getattr(n, "wrap:disown")) {
-	    Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	  } else {
-	    Replaceall(tm, "$disown", "0");
-	  }
-	  Replaceall(tm, "$result", "c_result");
-	  Printv(w->code, tm, "\n", NIL);
-	  Delete(tm);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0),
-		       SwigType_namestr(c_classname), SwigType_namestr(name));
-	  status = SWIG_ERROR;
-	}
-      }
-
-      /* marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-	  if (outputs > 1) {
-	    Printf(w->code, "output = POPs;\n");
-	    Replaceall(tm, "$result", "output");
-	  } else {
-	    Replaceall(tm, "$result", Swig_cresult_name());
-	  }
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      Delete(parse_args);
-      Delete(cleanup);
-      Delete(outarg);
-    }
-
-    if (!ignored_method) {
-      Append(w->code, "PUTBACK;\n");
-      Append(w->code, "FREETMPS;\n");
-      Append(w->code, "LEAVE;\n");
-    }
-
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *rettype = SwigType_str(returntype, 0);
-	if (!SwigType_isreference(returntype)) {
-	  Printf(w->code, "return (%s) c_result;\n", rettype);
-	} else {
-	  Printf(w->code, "return (%s) *c_result;\n", rettype);
-	}
-	Delete(rettype);
-      }
-    }
-
-    Append(w->code, "}\n");
-
-    // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK) {
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    /* clean up */
-    Delete(wrap_args);
-    Delete(pclassname);
-    DelWrapper(w);
-    return status;
-  }
-  int classDirectorDisown(Node *n) {
-    int rv;
-    member_func = 1;
-    rv = Language::classDirectorDisown(n);
-    member_func = 0;
-    if (rv == SWIG_OK && Swig_directorclass(n)) {
-      String *symname = Getattr(n, "sym:name");
-      String *disown = Swig_name_disown(NSPACE_TODO, symname);
-      Setattr(n, "perl5:directordisown", NewStringf("%s::%s", cmodule, disown));
-    }
-    return rv;
-  }
-  int classDirectorDestructor(Node *n) {
-    /* TODO: it would be nice if this didn't have to copy the body of Language::classDirectorDestructor() */
-    String *DirectorClassName = directorClassName(getCurrentClass());
-    String *body = NewString("\n");
-
-    String *ptype = Copy(getClassType());
-    SwigType_add_pointer(ptype);
-    String *mangle = SwigType_manglestr(ptype);
-
-    Printv(body, tab4, "dSP;\n", tab4, "SV *self = SWIG_NewPointerObj(SWIG_as_voidptr(this), SWIGTYPE", mangle, ", SWIG_SHADOW);\n", tab4, "\n", tab4,
-	   "sv_bless(self, gv_stashpv(swig_get_class(), 0));\n", tab4, "ENTER;\n", tab4, "SAVETMPS;\n", tab4, "PUSHMARK(SP);\n", tab4,
-	   "XPUSHs(self);\n", tab4, "XPUSHs(&PL_sv_yes);\n", tab4, "PUTBACK;\n", tab4, "call_method(\"DESTROY\", G_EVAL | G_VOID);\n", tab4,
-	   "FREETMPS;\n", tab4, "LEAVE;\n", NIL);
-
-    Delete(mangle);
-    Delete(ptype);
-
-    if (Getattr(n, "throw")) {
-      Printf(f_directors_h, "    virtual ~%s() throw ();\n", DirectorClassName);
-      Printf(f_directors, "%s::~%s() throw () {%s}\n\n", DirectorClassName, DirectorClassName, body);
-    } else {
-      Printf(f_directors_h, "    virtual ~%s();\n", DirectorClassName);
-      Printf(f_directors, "%s::~%s() {%s}\n\n", DirectorClassName, DirectorClassName, body);
-    }
-    return SWIG_OK;
-  }
-};
-
-/* -----------------------------------------------------------------------------
- * swig_perl5()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_perl5() {
-  return new PERL5();
-}
-extern "C" Language *swig_perl5(void) {
-  return new_swig_perl5();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/php.cxx b/dependencies2013/win32/swig/Source/Modules/php.cxx
deleted file mode 100644
index 295039ba..00000000
--- a/dependencies2013/win32/swig/Source/Modules/php.cxx
+++ /dev/null
@@ -1,2846 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * php.cxx
- *
- * PHP language module for SWIG.
- * -----------------------------------------------------------------------------
- */
-
-/* FIXME: PHP5 OO wrapping TODO list:
- *
- * Medium term:
- *
- * Handle default parameters on overloaded methods in PHP where possible.
- *   (Mostly done - just need to handle cases of overloaded methods with
- *   default parameters...)
- *   This is an optimisation - we could handle this case using a PHP
- *   default value, but currently we treat it as we would for a default
- *   value which is a compound C++ expression (i.e. as if we had a
- *   method with two overloaded forms instead of a single method with
- *   a default parameter value).
- *
- * Long term:
- *
- * Sort out locale-dependent behaviour of strtod() - it's harmless unless
- *   SWIG ever sets the locale and DOH/base.c calls atof, so we're probably
- *   OK currently at least.
- */
-
-/*
- * TODO: Replace remaining stderr messages with Swig_error or Swig_warning
- * (may need to add more WARN_PHP_xxx codes...)
- */
-
-#include "swigmod.h"
-
-#include <ctype.h>
-#include <errno.h>
-
-static const char *usage = "\
-PHP Options (available with -php7)\n\
-     -noproxy         - Don't generate proxy classes.\n\
-     -prefix <prefix> - Prepend <prefix> to all class names in PHP wrappers\n\
-\n";
-
-/* The original class wrappers for PHP stored the pointer to the C++ class in
- * the object property _cPtr.  If we use the same name for the member variable
- * which we put the pointer to the C++ class in, then the flat function
- * wrappers will automatically pull it out without any changes being required.
- * FIXME: Isn't using a leading underscore a bit suspect here?
- */
-#define SWIG_PTR "_cPtr"
-
-/* This is the name of the hash where the variables existing only in PHP
- * classes are stored.
- */
-#define SWIG_DATA "_pData"
-
-static int constructors = 0;
-static String *NOTCLASS = NewString("Not a class");
-static Node *classnode = 0;
-static String *module = 0;
-static String *cap_module = 0;
-static String *prefix = 0;
-
-static String *shadow_classname = 0;
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_runtime_h = 0;
-static File *f_h = 0;
-static File *f_phpcode = 0;
-static File *f_directors = 0;
-static File *f_directors_h = 0;
-static String *phpfilename = 0;
-
-static String *s_header;
-static String *s_wrappers;
-static String *s_init;
-static String *r_init;		// RINIT user code
-static String *s_shutdown;	// MSHUTDOWN user code
-static String *r_shutdown;	// RSHUTDOWN user code
-static String *s_vinit;		// varinit initialization code.
-static String *s_vdecl;
-static String *s_cinit;		// consttab initialization code.
-static String *s_oinit;
-static String *s_arginfo;
-static String *s_entry;
-static String *cs_entry;
-static String *all_cs_entry;
-static String *pragma_incl;
-static String *pragma_code;
-static String *pragma_phpinfo;
-static String *s_oowrappers;
-static String *s_fakeoowrappers;
-static String *s_phpclasses;
-
-/* To reduce code size (generated and compiled) we only want to emit each
- * different arginfo once, so we need to track which have been used.
- */
-static Hash *arginfo_used;
-
-/* Variables for using PHP classes */
-static Node *current_class = 0;
-
-static Hash *shadow_get_vars;
-static Hash *shadow_set_vars;
-static Hash *zend_types = 0;
-
-static int shadow = 1;
-
-static bool class_has_ctor = false;
-static String *wrapping_member_constant = NULL;
-
-// These static variables are used to pass some state from Handlers into functionWrapper
-static enum {
-  standard = 0,
-  memberfn,
-  staticmemberfn,
-  membervar,
-  staticmembervar,
-  constructor,
-  directorconstructor
-} wrapperType = standard;
-
-extern "C" {
-  static void (*r_prevtracefunc) (const SwigType *t, String *mangled, String *clientdata) = 0;
-}
-
-static void SwigPHP_emit_resource_registrations() {
-  Iterator ki;
-  bool emitted_default_dtor = false;
-
-  if (!zend_types)
-    return;
-
-  ki = First(zend_types);
-  if (ki.key)
-    Printf(s_oinit, "\n/* Register resource destructors for pointer types */\n");
-  while (ki.key) {
-    DOH *key = ki.key;
-    Node *class_node = ki.item;
-    String *human_name = key;
-    String *rsrc_dtor_name = NULL;
-
-    // write out body
-    if (class_node != NOTCLASS) {
-      String *destructor = Getattr(class_node, "destructor");
-      human_name = Getattr(class_node, "sym:name");
-      if (!human_name)
-        human_name = Getattr(class_node, "name");
-      // Do we have a known destructor for this type?
-      if (destructor) {
-	rsrc_dtor_name = NewStringf("_wrap_destroy%s", key);
-	// Write out custom destructor function
-	Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);
-        Printf(s_wrappers, "  %s(res, SWIGTYPE%s->name);\n", destructor, key);
-	Printf(s_wrappers, "}\n");
-      }
-    }
-
-    if (!rsrc_dtor_name) {
-      rsrc_dtor_name = NewString("_swig_default_rsrc_destroy");
-      if (!emitted_default_dtor) {
-	// Write out custom destructor function
-	Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);
-	Printf(s_wrappers, "  efree(res->ptr);\n");
-	Printf(s_wrappers, "}\n");
-	emitted_default_dtor = true;
-      }
-    }
-
-    // declare le_swig_<mangled> to store php registration
-    Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name);
-
-    // register with php
-    Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex"
-		    "(%s, NULL, SWIGTYPE%s->name, module_number);\n", key, rsrc_dtor_name, key);
-
-    // store php type in class struct
-    Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key);
-
-    Delete(rsrc_dtor_name);
-
-    ki = Next(ki);
-  }
-}
-
-class PHP : public Language {
-public:
-  PHP() {
-    director_language = 1;
-  }
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    SWIG_library_directory("php");
-
-    for (int i = 1; i < argc; i++) {
-      if (strcmp(argv[i], "-prefix") == 0) {
-	if (argv[i + 1]) {
-	  prefix = NewString(argv[i + 1]);
-	  Swig_mark_arg(i);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if ((strcmp(argv[i], "-noshadow") == 0) || (strcmp(argv[i], "-noproxy") == 0)) {
-	shadow = 0;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-help") == 0) {
-	fputs(usage, stdout);
-      }
-    }
-
-    Preprocessor_define("SWIGPHP 1", 0);
-    Preprocessor_define("SWIGPHP7 1", 0);
-    SWIG_typemap_lang("php");
-    SWIG_config_file("php.swg");
-    allow_overloading();
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-
-    String *filen;
-
-    /* Check if directors are enabled for this module. */
-    Node *mod = Getattr(n, "module");
-    if (mod) {
-      Node *options = Getattr(mod, "options");
-      if (options && Getattr(options, "directors")) {
-	allow_directors();
-      }
-    }
-
-    /* Set comparison with null for ConstructorToFunction */
-    setSubclassInstanceCheck(NewString("Z_TYPE_P($arg) != IS_NULL"));
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    /* main output file */
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewStringEmpty();
-
-    /* sections of the output file */
-    s_init = NewStringEmpty();
-    r_init = NewStringEmpty();
-    s_shutdown = NewStringEmpty();
-    r_shutdown = NewStringEmpty();
-    s_header = NewString("/* header section */\n");
-    s_wrappers = NewString("/* wrapper section */\n");
-    /* subsections of the init section */
-    s_vinit = NewStringEmpty();
-    s_vdecl = NewString("/* vdecl subsection */\n");
-    s_cinit = NewString("/* cinit subsection */\n");
-    s_oinit = NewString("/* oinit subsection */\n");
-    pragma_phpinfo = NewStringEmpty();
-    s_phpclasses = NewString("/* PHP Proxy Classes */\n");
-    f_directors_h = NewStringEmpty();
-    f_directors = NewStringEmpty();
-
-    if (directorsEnabled()) {
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", s_init);
-    Swig_register_filebyname("rinit", r_init);
-    Swig_register_filebyname("shutdown", s_shutdown);
-    Swig_register_filebyname("rshutdown", r_shutdown);
-    Swig_register_filebyname("header", s_header);
-    Swig_register_filebyname("wrapper", s_wrappers);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGPHP\n#define SWIGPHP\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-    }
-
-    /* Set the module name */
-    module = Copy(Getattr(n, "name"));
-    cap_module = NewStringf("%(upper)s", module);
-    if (!prefix)
-      prefix = NewStringEmpty();
-
-    Printf(f_runtime, "#define SWIG_PREFIX \"%s\"\n", prefix);
-    Printf(f_runtime, "#define SWIG_PREFIX_LEN %lu\n", (unsigned long)Len(prefix));
-
-    if (directorsEnabled()) {
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", cap_module);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", cap_module);
-
-      String *filename = Swig_file_filename(outfile_h);
-      Printf(f_directors, "\n#include \"%s\"\n\n", filename);
-      Delete(filename);
-    }
-
-    /* PHP module file */
-    filen = NewStringEmpty();
-    Printv(filen, SWIG_output_directory(), module, ".php", NIL);
-    phpfilename = NewString(filen);
-
-    f_phpcode = NewFile(filen, "w", SWIG_output_files());
-    if (!f_phpcode) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    Printf(f_phpcode, "<?php\n\n");
-
-    Swig_banner(f_phpcode);
-
-    Printf(f_phpcode, "\n");
-    Printf(f_phpcode, "// Try to load our extension if it's not already loaded.\n");
-    Printf(f_phpcode, "if (!extension_loaded('%s')) {\n", module);
-    Printf(f_phpcode, "  if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {\n");
-    Printf(f_phpcode, "    if (!dl('php_%s.dll')) return;\n", module);
-    Printf(f_phpcode, "  } else {\n");
-    Printf(f_phpcode, "    // PHP_SHLIB_SUFFIX gives 'dylib' on MacOS X but modules are 'so'.\n");
-    Printf(f_phpcode, "    if (PHP_SHLIB_SUFFIX === 'dylib') {\n");
-    Printf(f_phpcode, "      if (!dl('%s.so')) return;\n", module);
-    Printf(f_phpcode, "    } else {\n");
-    Printf(f_phpcode, "      if (!dl('%s.'.PHP_SHLIB_SUFFIX)) return;\n", module);
-    Printf(f_phpcode, "    }\n");
-    Printf(f_phpcode, "  }\n");
-    Printf(f_phpcode, "}\n\n");
-
-    /* sub-sections of the php file */
-    pragma_code = NewStringEmpty();
-    pragma_incl = NewStringEmpty();
-
-    /* Initialize the rest of the module */
-
-    Printf(s_oinit, "ZEND_INIT_MODULE_GLOBALS(%s, %s_init_globals, NULL);\n", module, module);
-
-    /* start the header section */
-    Printf(s_header, "ZEND_BEGIN_MODULE_GLOBALS(%s)\n", module);
-    Printf(s_header, "const char *error_msg;\n");
-    Printf(s_header, "int error_code;\n");
-    Printf(s_header, "ZEND_END_MODULE_GLOBALS(%s)\n", module);
-    Printf(s_header, "ZEND_DECLARE_MODULE_GLOBALS(%s)\n", module);
-    Printf(s_header, "#define SWIG_ErrorMsg() (%s_globals.error_msg)\n", module);
-    Printf(s_header, "#define SWIG_ErrorCode() (%s_globals.error_code)\n", module);
-
-    /* The following can't go in Lib/php/phprun.swg as it uses SWIG_ErrorMsg(), etc
-     * which has to be dynamically generated as it depends on the module name.
-     */
-    Append(s_header, "#ifdef __GNUC__\n");
-    Append(s_header, "static void SWIG_FAIL(void) __attribute__ ((__noreturn__));\n");
-    Append(s_header, "#endif\n\n");
-    Append(s_header, "static void SWIG_FAIL(void) {\n");
-    Append(s_header, "    zend_error(SWIG_ErrorCode(), \"%s\", SWIG_ErrorMsg());\n");
-    // zend_error() should never return with the parameters we pass, but if it
-    // does, we really don't want to let SWIG_FAIL() return.  This also avoids
-    // a warning about returning from a function marked as "__noreturn__".
-    Append(s_header, "    abort();\n");
-    Append(s_header, "}\n\n");
-
-    Printf(s_header, "static void %s_init_globals(zend_%s_globals *globals ) {\n", module, module);
-    Printf(s_header, "  globals->error_msg = default_error_msg;\n");
-    Printf(s_header, "  globals->error_code = default_error_code;\n");
-    Printf(s_header, "}\n");
-
-    Printf(s_header, "static void SWIG_ResetError(void) {\n");
-    Printf(s_header, "  SWIG_ErrorMsg() = default_error_msg;\n");
-    Printf(s_header, "  SWIG_ErrorCode() = default_error_code;\n");
-    Printf(s_header, "}\n");
-
-    Append(s_header, "\n");
-    Printf(s_header, "ZEND_NAMED_FUNCTION(_wrap_swig_%s_alter_newobject) {\n", module);
-    Append(s_header, "  zval args[2];\n");
-    Append(s_header, "  swig_object_wrapper *value;\n");
-    Append(s_header, "\n");
-    Append(s_header, "  SWIG_ResetError();\n");
-    Append(s_header, "  if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(2, args) != SUCCESS) {\n");
-    Append(s_header, "    WRONG_PARAM_COUNT;\n");
-    Append(s_header, "  }\n");
-    Append(s_header, "\n");
-    Append(s_header, "  value = (swig_object_wrapper *) Z_RES_VAL(args[0]);\n");
-    Append(s_header, "  value->newobject = zval_is_true(&args[1]);\n");
-    Append(s_header, "\n");
-    Append(s_header, "  return;\n");
-    Append(s_header, "}\n");
-    Printf(s_header, "ZEND_NAMED_FUNCTION(_wrap_swig_%s_get_newobject) {\n", module);
-    Append(s_header, "  zval args[1];\n");
-    Append(s_header, "  swig_object_wrapper *value;\n");
-    Append(s_header, "\n");
-    Append(s_header, "  SWIG_ResetError();\n");
-    Append(s_header, "  if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {\n");
-    Append(s_header, "    WRONG_PARAM_COUNT;\n");
-    Append(s_header, "  }\n");
-    Append(s_header, "\n");
-    Append(s_header, "  value = (swig_object_wrapper *) Z_RES_VAL(args[0]);\n");
-    Append(s_header, "  RETVAL_LONG(value->newobject);\n");
-    Append(s_header, "\n");
-    Append(s_header, "  return;\n");
-    Append(s_header, "}\n");
-
-    Printf(s_header, "#define SWIG_name  \"%s\"\n", module);
-    Printf(s_header, "#ifdef __cplusplus\n");
-    Printf(s_header, "extern \"C\" {\n");
-    Printf(s_header, "#endif\n");
-    Printf(s_header, "#include \"php.h\"\n");
-    Printf(s_header, "#include \"php_ini.h\"\n");
-    Printf(s_header, "#include \"ext/standard/info.h\"\n");
-    Printf(s_header, "#include \"php_%s.h\"\n", module);
-    Printf(s_header, "#ifdef __cplusplus\n");
-    Printf(s_header, "}\n");
-    Printf(s_header, "#endif\n\n");
-
-    if (directorsEnabled()) {
-      // Insert director runtime
-      Swig_insert_file("director_common.swg", s_header);
-      Swig_insert_file("director.swg", s_header);
-    }
-
-    /* Create the .h file too */
-    filen = NewStringEmpty();
-    Printv(filen, SWIG_output_directory(), "php_", module, ".h", NIL);
-    f_h = NewFile(filen, "w", SWIG_output_files());
-    if (!f_h) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    Swig_banner(f_h);
-
-    Printf(f_h, "\n");
-    Printf(f_h, "#ifndef PHP_%s_H\n", cap_module);
-    Printf(f_h, "#define PHP_%s_H\n\n", cap_module);
-    Printf(f_h, "extern zend_module_entry %s_module_entry;\n", module);
-    Printf(f_h, "#define phpext_%s_ptr &%s_module_entry\n\n", module, module);
-    Printf(f_h, "#ifdef PHP_WIN32\n");
-    Printf(f_h, "# define PHP_%s_API __declspec(dllexport)\n", cap_module);
-    Printf(f_h, "#else\n");
-    Printf(f_h, "# define PHP_%s_API\n", cap_module);
-    Printf(f_h, "#endif\n\n");
-
-    /* start the arginfo section */
-    s_arginfo = NewString("/* arginfo subsection */\n");
-    arginfo_used = NewHash();
-
-    /* start the function entry section */
-    s_entry = NewString("/* entry subsection */\n");
-
-    /* holds all the per-class function entry sections */
-    all_cs_entry = NewString("/* class entry subsection */\n");
-    cs_entry = NULL;
-
-    Printf(s_entry, "/* Every non-class user visible function must have an entry here */\n");
-    Printf(s_entry, "static zend_function_entry %s_functions[] = {\n", module);
-
-    /* Emit all of the code */
-    Language::top(n);
-
-    SwigPHP_emit_resource_registrations();
-
-    /* start the init section */
-    {
-      String * s_init_old = s_init;
-      s_init = NewString("/* init section */\n");
-      Printv(s_init, "zend_module_entry ", module, "_module_entry = {\n", NIL);
-      Printf(s_init, "    STANDARD_MODULE_HEADER,\n");
-      Printf(s_init, "    \"%s\",\n", module);
-      Printf(s_init, "    %s_functions,\n", module);
-      Printf(s_init, "    PHP_MINIT(%s),\n", module);
-      if (Len(s_shutdown) > 0) {
-	Printf(s_init, "    PHP_MSHUTDOWN(%s),\n", module);
-      } else {
-	Printf(s_init, "    NULL, /* No MSHUTDOWN code */\n");
-      }
-      if (Len(r_init) > 0 || Len(s_vinit) > 0) {
-	Printf(s_init, "    PHP_RINIT(%s),\n", module);
-      } else {
-	Printf(s_init, "    NULL, /* No RINIT code */\n");
-      }
-      if (Len(r_shutdown) > 0) {
-	Printf(s_init, "    PHP_RSHUTDOWN(%s),\n", module);
-      } else {
-	Printf(s_init, "    NULL, /* No RSHUTDOWN code */\n");
-      }
-      if (Len(pragma_phpinfo) > 0) {
-	Printf(s_init, "    PHP_MINFO(%s),\n", module);
-      } else {
-	Printf(s_init, "    NULL, /* No MINFO code */\n");
-      }
-      Printf(s_init, "    NO_VERSION_YET,\n");
-      Printf(s_init, "    STANDARD_MODULE_PROPERTIES\n");
-      Printf(s_init, "};\n");
-      Printf(s_init, "zend_module_entry* SWIG_module_entry = &%s_module_entry;\n\n", module);
-
-      Printf(s_init, "#ifdef __cplusplus\n");
-      Printf(s_init, "extern \"C\" {\n");
-      Printf(s_init, "#endif\n");
-      // We want to write "SWIGEXPORT ZEND_GET_MODULE(%s)" but ZEND_GET_MODULE
-      // in PHP5 has "extern "C" { ... }" around it so we can't do that.
-      Printf(s_init, "SWIGEXPORT zend_module_entry *get_module(void) { return &%s_module_entry; }\n", module);
-      Printf(s_init, "#ifdef __cplusplus\n");
-      Printf(s_init, "}\n");
-      Printf(s_init, "#endif\n\n");
-
-      Printf(s_init, "#define SWIG_php_minit PHP_MINIT_FUNCTION(%s)\n\n", module);
-
-      Printv(s_init, s_init_old, NIL);
-      Delete(s_init_old);
-    }
-
-    /* We have to register the constants before they are (possibly) used
-     * by the pointer typemaps. This all needs re-arranging really as
-     * things are being called in the wrong order
-     */
-
-    //    Printv(s_init,s_resourcetypes,NIL);
-    /* We need this after all classes written out by ::top */
-    Printf(s_oinit, "CG(active_class_entry) = NULL;\n");
-    Printf(s_oinit, "/* end oinit subsection */\n");
-    Printf(s_init, "%s\n", s_oinit);
-
-    /* Constants generated during top call */
-    Printf(s_cinit, "/* end cinit subsection */\n");
-    Printf(s_init, "%s\n", s_cinit);
-    Clear(s_cinit);
-    Delete(s_cinit);
-
-    Printf(s_init, "    return SUCCESS;\n");
-    Printf(s_init, "}\n\n");
-
-    // Now do REQUEST init which holds any user specified %rinit, and also vinit
-    if (Len(r_init) > 0 || Len(s_vinit) > 0) {
-      Printf(f_h, "PHP_RINIT_FUNCTION(%s);\n", module);
-
-      Printf(s_init, "PHP_RINIT_FUNCTION(%s)\n{\n", module);
-      if (Len(r_init) > 0) {
-	Printv(s_init,
-	       "/* rinit section */\n",
-	       r_init, "\n",
-	       NIL);
-      }
-
-      if (Len(s_vinit) > 0) {
-	/* finish our init section which will have been used by class wrappers */
-	Printv(s_init,
-	       "/* vinit subsection */\n",
-	       s_vinit, "\n"
-	       "/* end vinit subsection */\n",
-	       NIL);
-	Clear(s_vinit);
-      }
-      Delete(s_vinit);
-
-      Printf(s_init, "    return SUCCESS;\n");
-      Printf(s_init, "}\n\n");
-    }
-
-    Printf(f_h, "PHP_MINIT_FUNCTION(%s);\n", module);
-
-    if (Len(s_shutdown) > 0) {
-      Printf(f_h, "PHP_MSHUTDOWN_FUNCTION(%s);\n", module);
-
-      Printv(s_init, "PHP_MSHUTDOWN_FUNCTION(", module, ")\n"
-		     "/* shutdown section */\n"
-		     "{\n",
-		     s_shutdown,
-		     "    return SUCCESS;\n"
-		     "}\n\n", NIL);
-    }
-
-    if (Len(r_shutdown) > 0) {
-      Printf(f_h, "PHP_RSHUTDOWN_FUNCTION(%s);\n", module);
-
-      Printf(s_init, "PHP_RSHUTDOWN_FUNCTION(%s)\n{\n", module);
-      Printf(s_init, "/* rshutdown section */\n");
-      Printf(s_init, "%s\n", r_shutdown);
-      Printf(s_init, "    return SUCCESS;\n");
-      Printf(s_init, "}\n\n");
-    }
-
-    if (Len(pragma_phpinfo) > 0) {
-      Printf(f_h, "PHP_MINFO_FUNCTION(%s);\n", module);
-
-      Printf(s_init, "PHP_MINFO_FUNCTION(%s)\n{\n", module);
-      Printf(s_init, "%s", pragma_phpinfo);
-      Printf(s_init, "}\n");
-    }
-
-    Printf(s_init, "/* end init section */\n");
-
-    Printf(f_h, "\n#endif /* PHP_%s_H */\n", cap_module);
-
-    Delete(f_h);
-
-    String *type_table = NewStringEmpty();
-    SwigType_emit_type_table(f_runtime, type_table);
-    Printf(s_header, "%s", type_table);
-    Delete(type_table);
-
-    /* Oh dear, more things being called in the wrong order. This whole
-     * function really needs totally redoing.
-     */
-
-    if (directorsEnabled()) {
-      Dump(f_directors_h, f_runtime_h);
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-      Delete(f_runtime_h);
-    }
-
-    Printf(s_header, "/* end header section */\n");
-    Printf(s_wrappers, "/* end wrapper section */\n");
-    Printf(s_vdecl, "/* end vdecl subsection */\n");
-
-    Dump(f_runtime, f_begin);
-    Printv(f_begin, s_header, NIL);
-    if (directorsEnabled()) {
-      Dump(f_directors, f_begin);
-    }
-    Printv(f_begin, s_vdecl, s_wrappers, NIL);
-    Printv(f_begin, all_cs_entry, "\n\n", s_arginfo, "\n\n", s_entry,
-	" SWIG_ZEND_NAMED_FE(swig_", module, "_alter_newobject,_wrap_swig_", module, "_alter_newobject,NULL)\n"
-	" SWIG_ZEND_NAMED_FE(swig_", module, "_get_newobject,_wrap_swig_", module, "_get_newobject,NULL)\n"
-	" ZEND_FE_END\n};\n\n", NIL);
-    Printv(f_begin, s_init, NIL);
-    Delete(s_header);
-    Delete(s_wrappers);
-    Delete(s_init);
-    Delete(s_vdecl);
-    Delete(all_cs_entry);
-    Delete(s_entry);
-    Delete(s_arginfo);
-    Delete(f_runtime);
-    Delete(f_begin);
-    Delete(arginfo_used);
-
-    Printf(f_phpcode, "%s\n%s\n", pragma_incl, pragma_code);
-    if (s_fakeoowrappers) {
-      Printf(f_phpcode, "abstract class %s {", Len(prefix) ? prefix : module);
-      Printf(f_phpcode, "%s", s_fakeoowrappers);
-      Printf(f_phpcode, "}\n\n");
-      Delete(s_fakeoowrappers);
-      s_fakeoowrappers = NULL;
-    }
-    Printf(f_phpcode, "%s\n?>\n", s_phpclasses);
-    Delete(f_phpcode);
-
-    return SWIG_OK;
-  }
-
-  /* Just need to append function names to function table to register with PHP. */
-  void create_command(String *cname, String *iname, Node *n) {
-    // This is for the single main zend_function_entry record
-    Printf(f_h, "ZEND_NAMED_FUNCTION(%s);\n", iname);
-
-    // We want to only emit each different arginfo once, as that reduces the
-    // size of both the generated source code and the compiled extension
-    // module.  To do this, we name the arginfo to encode the number of
-    // parameters and which (if any) are passed by reference by using a
-    // sequence of 0s (for non-reference) and 1s (for by references).
-    ParmList *l = Getattr(n, "parms");
-    String * arginfo_code = NewStringEmpty();
-    for (Parm *p = l; p; p = Getattr(p, "tmap:in:next")) {
-      /* Ignored parameters */
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	continue;
-      }
-      Append(arginfo_code, GetFlag(p, "tmap:in:byref") ? "1" : "0");
-    }
-
-    if (!GetFlag(arginfo_used, arginfo_code)) {
-      // Not had this one before, so emit it.
-      SetFlag(arginfo_used, arginfo_code);
-      Printf(s_arginfo, "ZEND_BEGIN_ARG_INFO_EX(swig_arginfo_%s, 0, 0, 0)\n", arginfo_code);
-      for (const char * p = Char(arginfo_code); *p; ++p) {
-	Printf(s_arginfo, " ZEND_ARG_PASS_INFO(%c)\n", *p);
-      }
-      Printf(s_arginfo, "ZEND_END_ARG_INFO()\n");
-    }
-
-    String * s = cs_entry;
-    if (!s) s = s_entry;
-    Printf(s, " SWIG_ZEND_NAMED_FE(%(lower)s,%s,swig_arginfo_%s)\n", cname, iname, arginfo_code);
-    Delete(arginfo_code);
-  }
-
-  /* ------------------------------------------------------------
-   * dispatchFunction()
-   * ------------------------------------------------------------ */
-  void dispatchFunction(Node *n) {
-    /* Last node in overloaded chain */
-
-    int maxargs;
-    String *tmp = NewStringEmpty();
-    if (Swig_directorclass(n) && wrapperType == directorconstructor) {
-      /* We have an extra 'this' parameter. */
-      SetFlag(n, "wrap:this");
-    }
-    String *dispatch = Swig_overload_dispatch(n, "%s(INTERNAL_FUNCTION_PARAM_PASSTHRU); return;", &maxargs);
-
-    /* Generate a dispatch wrapper for all overloaded functions */
-
-    Wrapper *f = NewWrapper();
-    String *symname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(symname);
-
-    create_command(symname, wname, n);
-    Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL);
-
-    Wrapper_add_local(f, "argc", "int argc");
-
-    Printf(tmp, "zval argv[%d]", maxargs);
-    Wrapper_add_local(f, "argv", tmp);
-
-    Printf(f->code, "argc = ZEND_NUM_ARGS();\n");
-
-    Printf(f->code, "zend_get_parameters_array_ex(argc, argv);\n");
-
-    Replaceall(dispatch, "$args", "self,args");
-
-    Printv(f->code, dispatch, "\n", NIL);
-
-    Printf(f->code, "SWIG_ErrorCode() = E_ERROR;\n");
-    Printf(f->code, "SWIG_ErrorMsg() = \"No matching function for overloaded '%s'\";\n", symname);
-    Printv(f->code, "SWIG_FAIL();\n", NIL);
-
-    Printv(f->code, "}\n", NIL);
-    Wrapper_print(f, s_wrappers);
-
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(tmp);
-    Delete(wname);
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * ------------------------------------------------------------ */
-
-  /* Helper method for PHP::functionWrapper */
-  bool is_class(SwigType *t) {
-    Node *n = classLookup(t);
-    if (n) {
-      String *r = Getattr(n, "php:proxy");	// Set by classDeclaration()
-      if (!r)
-	r = Getattr(n, "sym:name");	// Not seen by classDeclaration yet, but this is the name
-      if (r)
-	return true;
-    }
-    return false;
-  }
-
-  virtual int functionWrapper(Node *n) {
-    String *name = GetChar(n, "name");
-    String *iname = GetChar(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *nodeType = Getattr(n, "nodeType");
-    int newobject = GetFlag(n, "feature:new");
-    int constructor = (Cmp(nodeType, "constructor") == 0);
-
-    Parm *p;
-    int i;
-    int numopt;
-    String *tm;
-    Wrapper *f;
-
-    String *wname;
-    int overloaded = 0;
-    String *overname = 0;
-
-    if (Cmp(nodeType, "destructor") == 0) {
-      // We just generate the Zend List Destructor and let Zend manage the
-      // reference counting.  There's no explicit destructor, but the user can
-      // just do `$obj = null;' to remove a reference to an object.
-      return CreateZendListDestructor(n);
-    }
-    // Test for overloading;
-    if (Getattr(n, "sym:overloaded")) {
-      overloaded = 1;
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n))
-	return SWIG_ERROR;
-    }
-
-    wname = Swig_name_wrapper(iname);
-    if (overname) {
-      Printf(wname, "%s", overname);
-    }
-
-    f = NewWrapper();
-
-    String *outarg = NewStringEmpty();
-    String *cleanup = NewStringEmpty();
-
-    Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL);
-
-    emit_parameter_variables(l, f);
-    /* Attach standard typemaps */
-
-    emit_attach_parmmaps(l, f);
-    // Not issued for overloaded functions.
-    if (!overloaded) {
-      create_command(iname, wname, n);
-    }
-
-    // wrap:parms is used by overload resolution.
-    Setattr(n, "wrap:parms", l);
-
-    int num_arguments = emit_num_arguments(l);
-    int num_required = emit_num_required(l);
-    numopt = num_arguments - num_required;
-
-    if (wrapperType == directorconstructor)
-      num_arguments++;
-
-    if (num_arguments > 0) {
-      String *args = NewStringEmpty();
-      if (wrapperType == directorconstructor)
-        Wrapper_add_local(f, "arg0", "zval * arg0");
-      Printf(args, "zval args[%d]", num_arguments);
-      Wrapper_add_local(f, "args", args);
-      Delete(args);
-      args = NULL;
-    }
-
-    // This generated code may be called:
-    // 1) as an object method, or
-    // 2) as a class-method/function (without a "this_ptr")
-    // Option (1) has "this_ptr" for "this", option (2) needs it as
-    // first parameter
-
-    // NOTE: possible we ignore this_ptr as a param for native constructor
-
-    Printf(f->code, "SWIG_ResetError();\n");
-
-    if (numopt > 0) {		// membervariable wrappers do not have optional args
-      Wrapper_add_local(f, "arg_count", "int arg_count");
-      Printf(f->code, "arg_count = ZEND_NUM_ARGS();\n");
-      Printf(f->code, "if(arg_count<%d || arg_count>%d ||\n", num_required, num_arguments);
-      Printf(f->code, "   zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)\n");
-      Printf(f->code, "\tWRONG_PARAM_COUNT;\n\n");
-    } else {
-      if (num_arguments == 0) {
-	Printf(f->code, "if(ZEND_NUM_ARGS() != 0) {\n");
-      } else {
-	Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n", num_arguments, num_arguments);
-      }
-      Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n");
-    }
-    if (wrapperType == directorconstructor)
-      Printf(f->code, "arg0 = &args[0];\n  \n");
-
-    /* Now convert from PHP to C variables */
-    // At this point, argcount if used is the number of deliberately passed args
-    // not including this_ptr even if it is used.
-    // It means error messages may be out by argbase with error
-    // reports.  We can either take argbase into account when raising
-    // errors, or find a better way of dealing with _thisptr.
-    // I would like, if objects are wrapped, to assume _thisptr is always
-    // _this and not the first argument.
-    // This may mean looking at Language::memberfunctionHandler
-
-    int limit = num_arguments;
-    if (wrapperType == directorconstructor)
-      limit--;
-    for (i = 0, p = l; i < limit; i++) {
-      String *source;
-
-      /* Skip ignored arguments */
-      //while (Getattr(p,"tmap:ignore")) { p = Getattr(p,"tmap:ignore:next");}
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-
-      if (wrapperType == directorconstructor) {
-	source = NewStringf("args[%d]", i+1);
-      } else {
-	source = NewStringf("args[%d]", i);
-      }
-
-      String *ln = Getattr(p, "lname");
-
-      /* Check if optional */
-      if (i >= num_required) {
-	Printf(f->code, "\tif(arg_count > %d) {\n", i);
-      }
-
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$source", &source);
-	Replaceall(tm, "$target", ln);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	Printf(f->code, "%s\n", tm);
-	if (i == 0 && Getattr(p, "self")) {
-	  Printf(f->code, "\tif(!arg1) SWIG_PHP_Error(E_ERROR, \"this pointer is NULL\");\n");
-	}
-	p = Getattr(p, "tmap:in:next");
-	if (i >= num_required) {
-	  Printf(f->code, "}\n");
-	}
-	continue;
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-      }
-      if (i >= num_required) {
-	Printf(f->code, "\t}\n");
-      }
-      Delete(source);
-    }
-
-    if (is_member_director(n)) {
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      Printf(f->code, "upcall = !Swig::Director::swig_is_overridden_method(\"%s%s\", \"%s\");\n",
-	  prefix, Swig_class_name(Swig_methodclass(n)), name);
-    }
-
-    Swig_director_emit_dynamic_cast(n, f);
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (i = 0, p = l; p; i++) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    bool hasargout = false;
-    for (i = 0, p = l; p; i++) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	hasargout = true;
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	//      Replaceall(tm,"$input",Getattr(p,"lname"));
-	Replaceall(tm, "$target", "return_value");
-	Replaceall(tm, "$result", "return_value");
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    Setattr(n, "wrap:name", wname);
-
-    /* emit function call */
-    String *actioncode = emit_action(n);
-
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$input", Swig_cresult_name());
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$target", "return_value");
-      Replaceall(tm, "$result", "return_value");
-      Replaceall(tm, "$owner", newobject ? "1" : "0");
-      Printf(f->code, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-    }
-    emit_return_variable(n, d, f);
-
-    if (outarg) {
-      Printv(f->code, outarg, NIL);
-    }
-
-    if (cleanup) {
-      Printv(f->code, cleanup, NIL);
-    }
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Printf(f->code, "%s\n", tm);
-	Delete(tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Printf(f->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    Printf(f->code, "thrown:\n");
-    Printf(f->code, "return;\n");
-
-    /* Error handling code */
-    Printf(f->code, "fail:\n");
-    Printv(f->code, cleanup, NIL);
-    Append(f->code, "SWIG_FAIL();\n");
-
-    Printf(f->code, "}\n");
-
-    Replaceall(f->code, "$cleanup", cleanup);
-    Replaceall(f->code, "$symname", iname);
-
-    Wrapper_print(f, s_wrappers);
-    DelWrapper(f);
-    f = NULL;
-
-    if (overloaded && !Getattr(n, "sym:nextSibling")) {
-      dispatchFunction(n);
-    }
-
-    Delete(wname);
-    wname = NULL;
-
-    if (!shadow) {
-      return SWIG_OK;
-    }
-
-    // Handle getters and setters.
-    if (wrapperType == membervar) {
-      const char *p = Char(iname);
-      if (strlen(p) > 4) {
-	p += strlen(p) - 4;
-	String *varname = Getattr(n, "membervariableHandler:sym:name");
-	if (strcmp(p, "_get") == 0) {
-	  Setattr(shadow_get_vars, varname, Getattr(n, "type"));
-	} else if (strcmp(p, "_set") == 0) {
-	  Setattr(shadow_set_vars, varname, iname);
-	}
-      }
-      return SWIG_OK;
-    }
-
-    // Only look at non-overloaded methods and the last entry in each overload
-    // chain (we check the last so that wrap:parms and wrap:name have been set
-    // for them all).
-    if (overloaded && Getattr(n, "sym:nextSibling") != 0)
-      return SWIG_OK;
-
-    if (!s_oowrappers)
-      s_oowrappers = NewStringEmpty();
-
-    if (newobject || wrapperType == memberfn || wrapperType == staticmemberfn || wrapperType == standard || wrapperType == staticmembervar) {
-      bool handle_as_overload = false;
-      String **arg_names;
-      String **arg_values;
-      unsigned char * byref;
-      // Method or static method or plain function.
-      const char *methodname = 0;
-      String *output = s_oowrappers;
-      if (constructor) {
-	class_has_ctor = true;
-	// Skip the Foo:: prefix.
-	char *ptr = strrchr(GetChar(Swig_methodclass(n), "sym:name"), ':');
-	if (ptr) {
-	  ptr++;
-	} else {
-	  ptr = GetChar(Swig_methodclass(n), "sym:name");
-	}
-	if (strcmp(ptr, GetChar(n, "constructorHandler:sym:name")) == 0) {
-	  methodname = "__construct";
-	} else {
-	  // The class has multiple constructors and this one is
-	  // renamed, so this will be a static factory function
-	  methodname = GetChar(n, "constructorHandler:sym:name");
-	}
-      } else if (wrapperType == memberfn) {
-	methodname = Char(Getattr(n, "memberfunctionHandler:sym:name"));
-      } else if (wrapperType == staticmemberfn) {
-	methodname = Char(Getattr(n, "staticmemberfunctionHandler:sym:name"));
-      } else if (wrapperType == staticmembervar) {
-	// Static member variable, wrapped as a function due to PHP limitations.
-	methodname = Char(Getattr(n, "staticmembervariableHandler:sym:name"));
-      } else {			// wrapperType == standard
-	methodname = Char(iname);
-	if (!s_fakeoowrappers)
-	  s_fakeoowrappers = NewStringEmpty();
-	output = s_fakeoowrappers;
-      }
-
-      bool really_overloaded = overloaded ? true : false;
-      int min_num_of_arguments = emit_num_required(l);
-      int max_num_of_arguments = emit_num_arguments(l);
-
-      Hash *ret_types = NewHash();
-      Setattr(ret_types, d, d);
-
-      bool non_void_return = (Cmp(d, "void") != 0);
-
-      if (overloaded) {
-	// Look at all the overloaded versions of this method in turn to
-	// decide if it's really an overloaded method, or just one where some
-	// parameters have default values.
-	Node *o = Getattr(n, "sym:overloaded");
-	while (o) {
-	  if (o == n) {
-	    o = Getattr(o, "sym:nextSibling");
-	    continue;
-	  }
-
-	  SwigType *d2 = Getattr(o, "type");
-	  if (!d2) {
-	    assert(constructor);
-	  } else if (!Getattr(ret_types, d2)) {
-	    Setattr(ret_types, d2, d2);
-	    non_void_return = non_void_return || (Cmp(d2, "void") != 0);
-	  }
-
-	  ParmList *l2 = Getattr(o, "wrap:parms");
-	  int num_arguments = emit_num_arguments(l2);
-	  int num_required = emit_num_required(l2);
-	  if (num_required < min_num_of_arguments)
-	    min_num_of_arguments = num_required;
-
-	  if (num_arguments > max_num_of_arguments) {
-	    max_num_of_arguments = num_arguments;
-	  }
-	  o = Getattr(o, "sym:nextSibling");
-	}
-
-	o = Getattr(n, "sym:overloaded");
-	while (o) {
-	  if (o == n) {
-	    o = Getattr(o, "sym:nextSibling");
-	    continue;
-	  }
-
-	  ParmList *l2 = Getattr(o, "wrap:parms");
-	  Parm *p = l, *p2 = l2;
-	  if (wrapperType == memberfn) {
-	    p = nextSibling(p);
-	    p2 = nextSibling(p2);
-	  }
-	  while (p && p2) {
-	    if (Cmp(Getattr(p, "type"), Getattr(p2, "type")) != 0)
-	      break;
-	    if (Cmp(Getattr(p, "name"), Getattr(p2, "name")) != 0)
-	      break;
-	    String *value = Getattr(p, "value");
-	    String *value2 = Getattr(p2, "value");
-	    if (value && !value2)
-	      break;
-	    if (!value && value2)
-	      break;
-	    if (value) {
-	      if (Cmp(value, value2) != 0)
-		break;
-	    }
-	    p = nextSibling(p);
-	    p2 = nextSibling(p2);
-	  }
-	  if (p && p2)
-	    break;
-	  // One parameter list is a prefix of the other, so check that all
-	  // remaining parameters of the longer list are optional.
-	  if (p2)
-	    p = p2;
-	  while (p && Getattr(p, "value"))
-	    p = nextSibling(p);
-	  if (p)
-	    break;
-	  o = Getattr(o, "sym:nextSibling");
-	}
-	if (!o) {
-	  // This "overloaded method" is really just one with default args.
-	  really_overloaded = false;
-	}
-      }
-
-      if (wrapperType == memberfn) {
-	// Allow for the "this" pointer.
-	--min_num_of_arguments;
-	--max_num_of_arguments;
-      }
-
-      arg_names = (String **) malloc(max_num_of_arguments * sizeof(String *));
-      if (!arg_names) {
-	/* FIXME: How should this be handled?  The rest of SWIG just seems
-	 * to not bother checking for malloc failing! */
-	fprintf(stderr, "Malloc failed!\n");
-	exit(1);
-      }
-      for (i = 0; i < max_num_of_arguments; ++i) {
-	arg_names[i] = NULL;
-      }
-
-      arg_values = (String **) malloc(max_num_of_arguments * sizeof(String *));
-      byref = (unsigned char *) malloc(max_num_of_arguments);
-      if (!arg_values || !byref) {
-	/* FIXME: How should this be handled?  The rest of SWIG just seems
-	 * to not bother checking for malloc failing! */
-	fprintf(stderr, "Malloc failed!\n");
-	exit(1);
-      }
-      for (i = 0; i < max_num_of_arguments; ++i) {
-	arg_values[i] = NULL;
-	byref[i] = false;
-      }
-
-      Node *o;
-      if (overloaded) {
-	o = Getattr(n, "sym:overloaded");
-      } else {
-	o = n;
-      }
-      while (o) {
-	int argno = 0;
-	Parm *p = Getattr(o, "wrap:parms");
-	if (wrapperType == memberfn)
-	  p = nextSibling(p);
-	while (p) {
-	  if (GetInt(p, "tmap:in:numinputs") == 0) {
-	    p = nextSibling(p);
-	    continue;
-	  }
-	  assert(0 <= argno && argno < max_num_of_arguments);
-	  byref[argno] = GetFlag(p, "tmap:in:byref");
-	  String *&pname = arg_names[argno];
-	  const char *pname_cstr = GetChar(p, "name");
-	  // Just get rid of the C++ namespace part for now.
-	  const char *ptr = NULL;
-	  if (pname_cstr && (ptr = strrchr(pname_cstr, ':'))) {
-	    pname_cstr = ptr + 1;
-	  }
-	  if (!pname_cstr) {
-	    // Unnamed parameter, e.g. int foo(int);
-	  } else if (!pname) {
-	    pname = NewString(pname_cstr);
-	  } else {
-	    size_t len = strlen(pname_cstr);
-	    size_t spc = 0;
-	    size_t len_pname = strlen(Char(pname));
-	    while (spc + len <= len_pname) {
-	      if (strncmp(pname_cstr, Char(pname) + spc, len) == 0) {
-		char ch = ((char *) Char(pname))[spc + len];
-		if (ch == '\0' || ch == ' ') {
-		  // Already have this pname_cstr.
-		  pname_cstr = NULL;
-		  break;
-		}
-	      }
-	      char *p = strchr(Char(pname) + spc, ' ');
-	      if (!p)
-		break;
-	      spc = (p + 4) - Char(pname);
-	    }
-	    if (pname_cstr) {
-	      Printf(pname, " or_%s", pname_cstr);
-	    }
-	  }
-	  String *value = NewString(Getattr(p, "value"));
-	  if (Len(value)) {
-	    /* Check that value is a valid constant in PHP (and adjust it if
-	     * necessary, or replace it with "?" if it's just not valid). */
-	    SwigType *type = Getattr(p, "type");
-	    switch (SwigType_type(type)) {
-	      case T_BOOL: {
-		if (Strcmp(value, "true") == 0 || Strcmp(value, "false") == 0)
-		  break;
-		char *p;
-		errno = 0;
-		long n = strtol(Char(value), &p, 0);
-	        Clear(value);
-		if (errno || *p) {
-		  Append(value, "?");
-		} else if (n) {
-		  Append(value, "true");
-		} else {
-		  Append(value, "false");
-		}
-		break;
-	      }
-	      case T_CHAR:
-	      case T_SCHAR:
-	      case T_SHORT:
-	      case T_INT:
-	      case T_LONG:
-	      case T_LONGLONG: {
-		char *p;
-		errno = 0;
-		long n = strtol(Char(value), &p, 0);
-		(void) n;
-		if (errno || *p) {
-		  Clear(value);
-		  Append(value, "?");
-		}
-		break;
-	      }
-	      case T_UCHAR:
-	      case T_USHORT:
-	      case T_UINT:
-	      case T_ULONG:
-	      case T_ULONGLONG: {
-		char *p;
-		errno = 0;
-		unsigned int n = strtoul(Char(value), &p, 0);
-		(void) n;
-		if (errno || *p) {
-		  Clear(value);
-		  Append(value, "?");
-		}
-		break;
-	      }
-	      case T_FLOAT:
-	      case T_DOUBLE:
-	      case T_LONGDOUBLE: {
-		char *p;
-		errno = 0;
-		/* FIXME: strtod is locale dependent... */
-		double val = strtod(Char(value), &p);
-		if (errno || *p) {
-		  Clear(value);
-		  Append(value, "?");
-		} else if (strchr(Char(value), '.') == 0) {
-		  // Ensure value is a double constant, not an integer one.
-		  Append(value, ".0");
-		  double val2 = strtod(Char(value), &p);
-		  if (errno || *p || val != val2) {
-		    Clear(value);
-		    Append(value, "?");
-		  }
-		}
-		break;
-	      }
-	      case T_STRING:
-		if (Len(value) < 2) {
-		  // How can a string (including "" be less than 2 characters?)
-		  Clear(value);
-		  Append(value, "?");
-		} else {
-		  const char *v = Char(value);
-		  if (v[0] != '"' || v[Len(value) - 1] != '"') {
-		    Clear(value);
-		    Append(value, "?");
-		  }
-		  // Strings containing "$" require special handling, but we do
-		  // that later.
-		}
-		break;
-	      case T_VOID:
-		assert(false);
-		break;
-	      case T_POINTER: {
-		const char *v = Char(value);
-		if (v[0] == '(') {
-		  // Handle "(void*)0", "(TYPE*)0", "(char*)NULL", etc.
-		  v += strcspn(v + 1, "*()") + 1;
-		  if (*v == '*') {
-		    do {
-		      v++;
-		      v += strspn(v, " \t");
-		    } while (*v == '*');
-		    if (*v++ == ')') {
-		      v += strspn(v, " \t");
-		      String * old = value;
-		      value = NewString(v);
-		      Delete(old);
-		    }
-		  }
-		}
-		if (Strcmp(value, "NULL") == 0 ||
-		    Strcmp(value, "nullptr") == 0 ||
-		    Strcmp(value, "0") == 0 ||
-		    Strcmp(value, "0L") == 0) {
-		  Clear(value);
-		  Append(value, "null");
-		} else {
-		  Clear(value);
-		  Append(value, "?");
-		}
-		break;
-	      }
-	      default:
-		/* Safe default */
-		Clear(value);
-		Append(value, "?");
-		break;
-	    }
-
-	    if (!arg_values[argno]) {
-	      arg_values[argno] = value;
-	      value = NULL;
-	    } else if (Cmp(arg_values[argno], value) != 0) {
-	      // If a parameter has two different default values in
-	      // different overloaded forms of the function, we can't
-	      // set its default in PHP.  Flag this by setting its
-	      // default to `?'.
-	      Delete(arg_values[argno]);
-	      arg_values[argno] = NewString("?");
-	    }
-	  } else if (arg_values[argno]) {
-	    // This argument already has a default value in another overloaded
-	    // form, but doesn't in this form.  So don't try to do anything
-	    // clever, just let the C wrappers resolve the overload and set the
-	    // default values.
-	    //
-	    // This handling is safe, but I'm wondering if it may be overly
-	    // conservative (FIXME) in some cases.  It seems it's only bad when
-	    // there's an overloaded form with the appropriate number of
-	    // parameters which doesn't want the default value, but I need to
-	    // think about this more.
-	    Delete(arg_values[argno]);
-	    arg_values[argno] = NewString("?");
-	  }
-	  Delete(value);
-	  p = nextSibling(p);
-	  ++argno;
-	}
-	if (!really_overloaded)
-	  break;
-	o = Getattr(o, "sym:nextSibling");
-      }
-
-      /* Clean up any parameters which haven't yet got names, or whose
-       * names clash. */
-      Hash *seen = NewHash();
-      /* We need $this to refer to the current class, so can't allow it
-       * to be used as a parameter. */
-      Setattr(seen, "this", seen);
-      /* We use $r to store the return value, so disallow that as a parameter
-       * name in case the user uses the "call-time pass-by-reference" feature
-       * (it's deprecated and off by default in PHP5, but we want to be
-       * maximally portable).  Similarly we use $c for the classname or new
-       * stdClass object.
-       */
-      Setattr(seen, "r", seen);
-      Setattr(seen, "c", seen);
-
-      for (int argno = 0; argno < max_num_of_arguments; ++argno) {
-	String *&pname = arg_names[argno];
-	if (pname) {
-	  Replaceall(pname, " ", "_");
-	} else {
-	  /* We get here if the SWIG .i file has "int foo(int);" */
-	  pname = NewStringEmpty();
-	  Printf(pname, "arg%d", argno + 1);
-	}
-	// Check if we've already used this parameter name.
-	while (Getattr(seen, pname)) {
-	  // Append "_" to clashing names until they stop clashing...
-	  Printf(pname, "_");
-	}
-	Setattr(seen, Char(pname), seen);
-
-	if (arg_values[argno] && Cmp(arg_values[argno], "?") == 0) {
-	  handle_as_overload = true;
-	}
-      }
-      Delete(seen);
-      seen = NULL;
-
-      String *invoke = NewStringEmpty();
-      String *prepare = NewStringEmpty();
-      String *args = NewStringEmpty();
-
-      if (!handle_as_overload && !(really_overloaded && max_num_of_arguments > min_num_of_arguments)) {
-	Printf(invoke, "%s(", iname);
-	if (wrapperType == memberfn) {
-	  Printf(invoke, "$this->%s", SWIG_PTR);
-	}
-	for (int i = 0; i < max_num_of_arguments; ++i) {
-	  if (i)
-	    Printf(args, ",");
-	  if (i || wrapperType == memberfn)
-	    Printf(invoke, ",");
-	  if (byref[i]) Printf(args, "&");
-	  String *value = arg_values[i];
-	  if (value) {
-	    const char *v = Char(value);
-	    if (v[0] == '"') {
-	      /* In a PHP double quoted string, $ needs to be escaped as \$. */
-	      Replaceall(value, "$", "\\$");
-	    }
-	    Printf(args, "$%s=%s", arg_names[i], value);
-	  } else if (constructor && i >= 1 && i < min_num_of_arguments) {
-	    // We need to be able to call __construct($resource).
-	    Printf(args, "$%s=null", arg_names[i]);
-	  } else {
-	    Printf(args, "$%s", arg_names[i]);
-	  }
-	  Printf(invoke, "$%s", arg_names[i]);
-	}
-	Printf(invoke, ")");
-      } else {
-	int i;
-	for (i = 0; i < min_num_of_arguments; ++i) {
-	  if (i)
-	    Printf(args, ",");
-	  Printf(args, "$%s", arg_names[i]);
-	}
-	String *invoke_args = NewStringEmpty();
-	if (wrapperType == memberfn) {
-	  Printf(invoke_args, "$this->%s", SWIG_PTR);
-	  if (min_num_of_arguments > 0)
-	    Printf(invoke_args, ",");
-	}
-	Printf(invoke_args, "%s", args);
-	if (constructor && min_num_of_arguments > 1) {
-	  // We need to be able to call __construct($resource).
-	  Clear(args);
-	  Printf(args, "$%s", arg_names[0]);
-	  for (i = 1; i < min_num_of_arguments; ++i) {
-	    Printf(args, ",");
-	    Printf(args, "$%s=null", arg_names[i]);
-	  }
-	}
-	bool had_a_case = false;
-	int last_handled_i = i - 1;
-	for (; i < max_num_of_arguments; ++i) {
-	  if (i)
-	    Printf(args, ",");
-	  const char *value = Char(arg_values[i]);
-	  // FIXME: (really_overloaded && handle_as_overload) is perhaps a
-	  // little conservative, but it doesn't hit any cases that it
-	  // shouldn't for Xapian at least (and we need it to handle
-	  // "Enquire::get_mset()" correctly).
-	  bool non_php_default = ((really_overloaded && handle_as_overload) ||
-				  !value || strcmp(value, "?") == 0);
-	  if (non_php_default)
-	    value = "null";
-	  Printf(args, "$%s=%s", arg_names[i], value);
-	  if (non_php_default) {
-	    if (!had_a_case) {
-	      Printf(prepare, "\t\tswitch (func_num_args()) {\n");
-	      had_a_case = true;
-	    }
-	    Printf(prepare, "\t\t");
-	    while (last_handled_i < i) {
-	      Printf(prepare, "case %d: ", ++last_handled_i);
-	    }
-	    if (non_void_return) {
-	      if ((!directorsEnabled() || !Swig_directorclass(n)) && !newobject) {
-		Append(prepare, "$r=");
-	      } else {
-		Printf(prepare, "$this->%s=", SWIG_PTR);
-	      }
-	    }
-	    if (!directorsEnabled() || !Swig_directorclass(n) || !newobject) {
-	      Printf(prepare, "%s(%s); break;\n", iname, invoke_args);
-	    } else if (!i) {
-	      Printf(prepare, "%s($_this%s); break;\n", iname, invoke_args);
-	    } else {
-	      Printf(prepare, "%s($_this, %s); break;\n", iname, invoke_args);
-	    }
-	  }
-	  if (i || wrapperType == memberfn)
-	    Printf(invoke_args, ",");
-	  Printf(invoke_args, "$%s", arg_names[i]);
-	}
-	Printf(prepare, "\t\t");
-	if (had_a_case)
-	  Printf(prepare, "default: ");
-	if (non_void_return) {
-	  if ((!directorsEnabled() || !Swig_directorclass(n)) && !newobject) {
-	    Append(prepare, "$r=");
-	  } else {
-	    Printf(prepare, "$this->%s=", SWIG_PTR);
-	  }
-	}
-
-	if (!directorsEnabled() || !Swig_directorclass(n) || !newobject) {
-	  Printf(prepare, "%s(%s);\n", iname, invoke_args);
-	} else {
-	  Printf(prepare, "%s($_this, %s);\n", iname, invoke_args);
-	}
-	if (had_a_case)
-	  Printf(prepare, "\t\t}\n");
-	Delete(invoke_args);
-	Printf(invoke, "$r");
-      }
-
-      Printf(output, "\n");
-      // If it's a member function or a class constructor...
-      if (wrapperType == memberfn || (constructor && current_class)) {
-	String *acc = NewString(Getattr(n, "access"));
-	// If a base has the same method with public access, then PHP
-	// requires to have it here as public as well
-	Node *bases = Getattr(Swig_methodclass(n), "bases");
-	if (bases && Strcmp(acc, "public") != 0) {
-	  String *warnmsg = 0;
-	  int haspublicbase = 0;
-	  Iterator i = First(bases);
-	  while (i.item) {
-	    Node *j = firstChild(i.item);
-	    while (j) {
-	      String *jname = Getattr(j, "name");
-	      if (!jname || Strcmp(jname, Getattr(n, "name")) != 0) {
-		j = nextSibling(j);
-		continue;
-	      }
-	      if (Strcmp(nodeType(j), "cdecl") == 0) {
-		if (!Getattr(j, "access") || checkAttribute(j, "access", "public")) {
-		  haspublicbase = 1;
-		}
-	      } else if (Strcmp(nodeType(j), "using") == 0 && firstChild(j) && Strcmp(nodeType(firstChild(j)), "cdecl") == 0) {
-		if (!Getattr(firstChild(j), "access") || checkAttribute(firstChild(j), "access", "public")) {
-		  haspublicbase = 1;
-		}
-	      }
-	      if (haspublicbase) {
-		  warnmsg = NewStringf("Modifying the access of '%s::%s' to public, as the base '%s' has it as public as well.\n", Getattr(current_class, "classtype"), Getattr(n, "name"), Getattr(i.item, "classtype"));
-		  break;
-	      }
-	      j = nextSibling(j);
-	    }
-	    i = Next(i);
-	    if (haspublicbase) {
-	      break;
-	    }
-	  }
-	  if (Getattr(n, "access") && haspublicbase) {
-	    Delete(acc);
-	    acc = NewStringEmpty(); // implicitly public
-	    Swig_warning(WARN_PHP_PUBLIC_BASE, input_file, line_number, Char(warnmsg));
-	    Delete(warnmsg);
-	  }
-	}
-
-	if (Cmp(acc, "public") == 0) {
-	  // The default visibility for methods is public, so don't specify
-	  // that explicitly to keep the wrapper size down.
-	  Delete(acc);
-	  acc = NewStringEmpty();
-	} else if (Cmp(acc, "") != 0) {
-	  Append(acc, " ");
-	}
-
-	if (constructor) {
-	  const char * arg0;
-	  if (max_num_of_arguments > 0) {
-	    arg0 = Char(arg_names[0]);
-	  } else {
-	    arg0 = "res";
-	    Delete(args);
-	    args = NewString("$res=null");
-	  }
-	  String *mangled_type = SwigType_manglestr(Getattr(n, "type"));
-	  Printf(output, "\t%sfunction %s(%s) {\n", acc, methodname, args);
-	  Printf(output, "\t\tif (is_resource($%s) && get_resource_type($%s) === '%s') {\n", arg0, arg0, mangled_type);
-	  Printf(output, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg0);
-	  Printf(output, "\t\t\treturn;\n");
-	  Printf(output, "\t\t}\n");
-	} else {
-	  Printf(output, "\t%sfunction %s(%s) {\n", acc, methodname, args);
-	}
-	Delete(acc);
-      } else if (wrapperType == staticmembervar) {
-	// We're called twice for a writable static member variable - first
-	// with "foo_set" and then with "foo_get" - so generate half the
-	// wrapper function each time.
-	//
-	// For a const static member, we only get called once.
-	static bool started = false;
-	if (!started) {
-	  Printf(output, "\tstatic function %s() {\n", methodname);
-	  if (max_num_of_arguments) {
-	    // Setter.
-	    Printf(output, "\t\tif (func_num_args()) {\n");
-	    Printf(output, "\t\t\t%s(func_get_arg(0));\n", iname);
-	    Printf(output, "\t\t\treturn;\n");
-	    Printf(output, "\t\t}\n");
-	    started = true;
-	    goto done;
-	  }
-	}
-	started = false;
-      } else {
-	Printf(output, "\tstatic function %s(%s) {\n", methodname, args);
-      }
-
-      if (!newobject)
-	Printf(output, "%s", prepare);
-      if (constructor) {
-	if (!directorsEnabled() || !Swig_directorclass(n)) {
-	  if (!Len(prepare)) {
-	    if (strcmp(methodname, "__construct") == 0) {
-	      Printf(output, "\t\t$this->%s=%s;\n", SWIG_PTR, invoke);
-	    } else {
-	      String *classname = Swig_class_name(current_class);
-	      Printf(output, "\t\treturn new %s%s(%s);\n", prefix, classname, invoke);
-	    }
-	  }
-	} else {
-	  Node *parent = Swig_methodclass(n);
-	  String *classname = Swig_class_name(parent);
-	  Printf(output, "\t\tif (get_class($this) === '%s%s') {\n", prefix, classname);
-	  Printf(output, "\t\t\t$_this = null;\n");
-	  Printf(output, "\t\t} else {\n");
-	  Printf(output, "\t\t\t$_this = $this;\n");
-	  Printf(output, "\t\t}\n");
-	  if (!Len(prepare)) {
-	    if (num_arguments > 1) {
-	      Printf(output, "\t\t$this->%s=%s($_this, %s);\n", SWIG_PTR, iname, args);
-	    } else {
-	      Printf(output, "\t\t$this->%s=%s($_this);\n", SWIG_PTR, iname);
-	    }
-	  }
-	}
-	Printf(output, "%s", prepare);
-      } else if (!non_void_return && !hasargout) {
-	if (Cmp(invoke, "$r") != 0)
-	  Printf(output, "\t\t%s;\n", invoke);
-      } else if (is_class(d)) {
-	if (Cmp(invoke, "$r") != 0)
-	  Printf(output, "\t\t$r=%s;\n", invoke);
-	if (Len(ret_types) == 1) {
-	  /* If d is abstract we can't create a new wrapper type d. */
-	  Node *d_class = classLookup(d);
-	  int is_abstract = 0;
-	  if (Getattr(d_class, "abstracts")) {
-	    is_abstract = 1;
-	  }
-	  if (newobject || !is_abstract) {
-	    Printf(output, "\t\tif (is_resource($r)) {\n");
-	    if (Getattr(classLookup(Getattr(n, "type")), "module")) {
-	      /*
-	       * _p_Foo -> Foo, _p_ns__Bar -> Bar
-	       * TODO: do this in a more elegant way
-	       */
-	      if (Len(prefix) == 0) {
-		Printf(output, "\t\t\t$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n");
-	      } else {
-		Printf(output, "\t\t\t$c='%s'.substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n", prefix);
-	      }
-	      Printf(output, "\t\t\tif (class_exists($c)) return new $c($r);\n");
-	      Printf(output, "\t\t\treturn new %s%s($r);\n", prefix, Getattr(classLookup(d), "sym:name"));
-	    } else {
-	      Printf(output, "\t\t\t$c = new stdClass();\n");
-	      Printf(output, "\t\t\t$c->" SWIG_PTR " = $r;\n");
-	      Printf(output, "\t\t\treturn $c;\n");
-	    }
-	    Printf(output, "\t\t}\n\t\treturn $r;\n");
-	  } else {
-	    Printf(output, "\t\t$this->%s = $r;\n", SWIG_PTR);
-	    Printf(output, "\t\treturn $this;\n");
-	  }
-	} else {
-	  Printf(output, "\t\tif (!is_resource($r)) return $r;\n");
-	  String *wrapobj = NULL;
-	  String *common = NULL;
-	  Iterator i = First(ret_types);
-	  while (i.item) {
-	    SwigType *ret_type = i.item;
-	    i = Next(i);
-	    String *mangled = NewString("_p");
-	    Printf(mangled, "%s", SwigType_manglestr(ret_type));
-	    Node *class_node = Getattr(zend_types, mangled);
-	    if (!class_node) {
-	      /* This is needed when we're returning a pointer to a type
-	       * rather than returning the type by value or reference. */
-	      Delete(mangled);
-	      mangled = NewString(SwigType_manglestr(ret_type));
-	      class_node = Getattr(zend_types, mangled);
-	      if (!class_node) {
-		// Return type isn't an object, so will be handled by the
-		// !is_resource() check before the switch.
-		continue;
-	      }
-	    }
-	    const char *classname = GetChar(class_node, "sym:name");
-	    if (!classname)
-	      classname = GetChar(class_node, "name");
-	    String * action = NewStringEmpty();
-	    if (classname)
-	      Printf(action, "return new %s%s($r);\n", prefix, classname);
-            else
-	      Printf(action, "return $r;\n");
-	    if (!wrapobj) {
-		wrapobj = NewString("\t\tswitch (get_resource_type($r)) {\n");
-		common = action;
-	    } else {
-		if (common && Cmp(common, action) != 0) {
-		    Delete(common);
-		    common = NULL;
-		}
-	    }
-	    Printf(wrapobj, "\t\t");
-	    if (i.item) {
-	      Printf(wrapobj, "case '%s': ", mangled);
-	    } else {
-	      Printf(wrapobj, "default: ");
-	    }
-	    Printv(wrapobj, action, NIL);
-	    if (action != common) Delete(action);
-	    Delete(mangled);
-	  }
-	  Printf(wrapobj, "\t\t}\n");
-	  if (common) {
-	      // All cases have the same action, so eliminate the switch
-	      // wrapper.
-	      Printf(output, "\t\t%s", common);
-	      Delete(common);
-	  } else {
-	      Printv(output, wrapobj, NIL);
-	  }
-	  Delete(wrapobj);
-	}
-      } else {
-	if (non_void_return) {
-	  Printf(output, "\t\treturn %s;\n", invoke);
-	} else if (Cmp(invoke, "$r") != 0) {
-	  Printf(output, "\t\t%s;\n", invoke);
-	}
-      }
-      Printf(output, "\t}\n");
-
-done:
-      Delete(prepare);
-      Delete(invoke);
-      free(arg_values);
-
-      Delete(args);
-      args = NULL;
-
-      for (int i = 0; i < max_num_of_arguments; ++i) {
-	Delete(arg_names[i]);
-      }
-      free(arg_names);
-      arg_names = NULL;
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * globalvariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int globalvariableHandler(Node *n) {
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    String *tm;
-
-    /* First do the wrappers such as name_set(), name_get()
-     * as provided by the baseclass's implementation of variableWrapper
-     */
-    if (Language::globalvariableHandler(n) == SWIG_NOWRAP) {
-      return SWIG_NOWRAP;
-    }
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    /* First link C variables to PHP */
-
-    tm = Swig_typemap_lookup("varinit", n, name, 0);
-    if (tm) {
-      Replaceall(tm, "$target", name);
-      Printf(s_vinit, "%s\n", tm);
-    } else {
-      Swig_error(input_file, line_number, "Unable to link with type %s\n", SwigType_str(t, 0));
-    }
-
-    /* Now generate PHP -> C sync blocks */
-    /*
-       tm = Swig_typemap_lookup("varin", n, name, 0);
-       if(tm) {
-       Replaceall(tm, "$symname", iname);
-       Printf(f_c->code, "%s\n", tm);
-       } else {
-       Swig_error(input_file, line_number, "Unable to link with type %s\n", SwigType_str(t, 0));
-       }
-     */
-    /* Now generate C -> PHP sync blocks */
-    /*
-       if(!GetFlag(n,"feature:immutable")) {
-
-       tm = Swig_typemap_lookup("varout", n, name, 0);
-       if(tm) {
-       Replaceall(tm, "$symname", iname);
-       Printf(f_php->code, "%s\n", tm);
-       } else {
-       Swig_error(input_file, line_number, "Unable to link with type %s\n", SwigType_str(t, 0));
-       }
-       }
-     */
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *name = GetChar(n, "name");
-    String *iname = GetChar(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    SwigType_remember(type);
-
-    if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      Printf(s_cinit, "%s\n", tm);
-    }
-
-    if (shadow) {
-      String *enumvalue = GetChar(n, "enumvalue");
-      String *set_to = iname;
-
-      if (!enumvalue) {
-	enumvalue = GetChar(n, "enumvalueex");
-      }
-
-      if (enumvalue && *Char(enumvalue)) {
-	// Check for a simple constant expression which is valid in PHP.
-	// If we find one, initialise the const member with it; otherwise
-	// we initialise it using the C/C++ wrapped constant.
-	const char *p;
-	for (p = Char(enumvalue); *p; ++p) {
-	  if (!isdigit((unsigned char)*p) && !strchr(" +-", *p)) {
-	    // FIXME: enhance to handle `<previous_enum> + 1' which is what
-	    // we get for enums that don't have an explicit value set.
-	    break;
-	  }
-	}
-	if (!*p)
-	  set_to = enumvalue;
-      }
-
-      if (wrapping_member_constant) {
-	if (!s_oowrappers)
-	  s_oowrappers = NewStringEmpty();
-	Printf(s_oowrappers, "\n\tconst %s = %s;\n", wrapping_member_constant, set_to);
-      } else {
-	if (!s_fakeoowrappers)
-	  s_fakeoowrappers = NewStringEmpty();
-	Printf(s_fakeoowrappers, "\n\tconst %s = %s;\n", iname, set_to);
-      }
-    }
-
-    return SWIG_OK;
-  }
-
-  /*
-   * PHP::pragma()
-   *
-   * Pragma directive.
-   *
-   * %pragma(php) code="String"         # Includes a string in the .php file
-   * %pragma(php) include="file.php"    # Includes a file in the .php file
-   */
-
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *type = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-      if (Strcmp(lang, "php") == 0 || Strcmp(lang, "php4") == 0) {
-	if (Strcmp(type, "code") == 0) {
-	  if (value) {
-	    Printf(pragma_code, "%s\n", value);
-	  }
-	} else if (Strcmp(type, "include") == 0) {
-	  if (value) {
-	    Printf(pragma_incl, "include '%s';\n", value);
-	  }
-	} else if (Strcmp(type, "phpinfo") == 0) {
-	  if (value) {
-	    Printf(pragma_phpinfo, "%s\n", value);
-	  }
-	} else {
-	  Swig_warning(WARN_PHP_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", type);
-	}
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classDeclaration(Node *n) {
-    if (!Getattr(n, "feature:onlychildren")) {
-      String *symname = Getattr(n, "sym:name");
-      Setattr(n, "php:proxy", symname);
-    }
-
-    return Language::classDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-    constructors = 0;
-    current_class = n;
-
-    if (shadow) {
-      char *rename = GetChar(n, "sym:name");
-
-      if (!addSymbol(rename, n))
-	return SWIG_ERROR;
-      shadow_classname = NewString(rename);
-
-      shadow_get_vars = NewHash();
-      shadow_set_vars = NewHash();
-
-      /* Deal with inheritance */
-      List *baselist = Getattr(n, "bases");
-      if (baselist) {
-	Iterator base = First(baselist);
-	while (base.item && GetFlag(base.item, "feature:ignore")) {
-	  base = Next(base);
-	}
-	base = Next(base);
-	if (base.item) {
-	  /* Warn about multiple inheritance for additional base class(es) */
-	  while (base.item) {
-	    if (GetFlag(base.item, "feature:ignore")) {
-	      base = Next(base);
-	      continue;
-	    }
-	    String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0);
-	    String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0);
-	    Swig_warning(WARN_PHP_MULTIPLE_INHERITANCE, input_file, line_number,
-			 "Warning for %s, base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname);
-	    base = Next(base);
-	  }
-	}
-      }
-    }
-
-    classnode = n;
-    Language::classHandler(n);
-    classnode = 0;
-
-    if (shadow) {
-      List *baselist = Getattr(n, "bases");
-      Iterator ki, base;
-
-      if (baselist) {
-	base = First(baselist);
-	while (base.item && GetFlag(base.item, "feature:ignore")) {
-	  base = Next(base);
-	}
-      } else {
-	base.item = NULL;
-      }
-
-      if (Getattr(n, "abstracts") && !GetFlag(n, "feature:notabstract")) {
-	Printf(s_phpclasses, "abstract ");
-      }
-
-      Printf(s_phpclasses, "class %s%s ", prefix, shadow_classname);
-      String *baseclass = NULL;
-      if (base.item && Getattr(base.item, "module")) {
-	baseclass = Getattr(base.item, "sym:name");
-	if (!baseclass)
-	  baseclass = Getattr(base.item, "name");
-	Printf(s_phpclasses, "extends %s%s ", prefix, baseclass);
-      } else if (GetFlag(n, "feature:exceptionclass")) {
-	Append(s_phpclasses, "extends Exception ");
-      }
-      {
-	Node *node = NewHash();
-	Setattr(node, "type", Getattr(n, "name"));
-	Setfile(node, Getfile(n));
-	Setline(node, Getline(n));
-	String * interfaces = Swig_typemap_lookup("phpinterfaces", node, "", 0);
-	if (interfaces) {
-	  Printf(s_phpclasses, "implements %s ", interfaces);
-	}
-	Delete(node);
-      }
-      Printf(s_phpclasses, "{\n\tpublic $%s=null;\n", SWIG_PTR);
-      if (!baseclass) {
-	// Only store this in the base class (NB !baseclass means we *are*
-	// a base class...)
-	Printf(s_phpclasses, "\tprotected $%s=array();\n", SWIG_DATA);
-      }
-
-      // Write property SET handlers
-      ki = First(shadow_set_vars);
-      if (ki.key) {
-	// This class has setters.
-	Printf(s_phpclasses, "\n\tfunction __set($var,$value) {\n");
-	// FIXME: tune this threshold...
-	if (Len(shadow_set_vars) <= 2) {
-	  // Not many setters, so avoid call_user_func.
-	  for (; ki.key; ki = Next(ki)) {
-	    DOH *key = ki.key;
-	    String *iname = ki.item;
-	    Printf(s_phpclasses, "\t\tif ($var === '%s') return %s($this->%s,$value);\n", key, iname, SWIG_PTR);
-	  }
-	} else {
-	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_set';\n", shadow_classname);
-	  Printf(s_phpclasses, "\t\tif (function_exists($func)) return call_user_func($func,$this->%s,$value);\n", SWIG_PTR);
-	}
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_alter_newobject($this->%s,$value);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\t%s%s::__set($var,$value);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\t$this->%s[$var] = $value;\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      } else {
-	Printf(s_phpclasses, "\n\tfunction __set($var,$value) {\n");
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_alter_newobject($this->%s,$value);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\t%s%s::__set($var,$value);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\t$this->%s[$var] = $value;\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      }
-
-      // Write property GET handlers
-      ki = First(shadow_get_vars);
-      if (ki.key) {
-	// This class has getters.
-	Printf(s_phpclasses, "\n\tfunction __get($var) {\n");
-	int non_class_getters = 0;
-	for (; ki.key; ki = Next(ki)) {
-	  DOH *key = ki.key;
-	  SwigType *d = ki.item;
-	  if (!is_class(d)) {
-	    ++non_class_getters;
-	    continue;
-	  }
-	  Printv(s_phpclasses, "\t\tif ($var === '", key, "') return new ", prefix, Getattr(classLookup(d), "sym:name"), "(", shadow_classname, "_", key, "_get($this->", SWIG_PTR, "));\n", NIL);
-	}
-	// FIXME: tune this threshold...
-	if (non_class_getters <= 2) {
-	  // Not many non-class getters, so avoid call_user_func.
-	  for (ki = First(shadow_get_vars); non_class_getters && ki.key;  ki = Next(ki)) {
-	    DOH *key = ki.key;
-	    SwigType *d = ki.item;
-	    if (is_class(d)) continue;
-	    Printv(s_phpclasses, "\t\tif ($var === '", key, "') return ", shadow_classname, "_", key, "_get($this->", SWIG_PTR, ");\n", NIL);
-	    --non_class_getters;
-	  }
-	} else {
-	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_get';\n", shadow_classname);
-	  Printf(s_phpclasses, "\t\tif (function_exists($func)) return call_user_func($func,$this->%s);\n", SWIG_PTR);
-	}
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_get_newobject($this->%s);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__get($var);\n", prefix, baseclass);
-	} else {
-	  // Reading an unknown property name gives null in PHP.
-	  Printf(s_phpclasses, "\t\treturn $this->%s[$var];\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-
-	/* Create __isset for PHP 5.1 and later; PHP 5.0 will just ignore it. */
-	/* __isset() should return true for read-only properties, so check for
-	 * *_get() not *_set(). */
-	Printf(s_phpclasses, "\n\tfunction __isset($var) {\n");
-	Printf(s_phpclasses, "\t\tif (function_exists('%s_'.$var.'_get')) return true;\n", shadow_classname);
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return true;\n");
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__isset($var);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\treturn array_key_exists($var, $this->%s);\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      } else {
-	Printf(s_phpclasses, "\n\tfunction __get($var) {\n");
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_get_newobject($this->%s);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__get($var);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\treturn $this->%s[$var];\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-	Printf(s_phpclasses, "\n\tfunction __isset($var) {\n");
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return true;\n");
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__isset($var);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\treturn array_key_exists($var, $this->%s);\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      }
-
-      if (!class_has_ctor) {
-	Printf(s_phpclasses, "\tfunction __construct($h) {\n");
-	Printf(s_phpclasses, "\t\t$this->%s=$h;\n", SWIG_PTR);
-	Printf(s_phpclasses, "\t}\n");
-      }
-
-      if (s_oowrappers) {
-	Printf(s_phpclasses, "%s", s_oowrappers);
-	Delete(s_oowrappers);
-	s_oowrappers = NULL;
-      }
-      class_has_ctor = false;
-
-      Printf(s_phpclasses, "}\n\n");
-
-      Delete(shadow_classname);
-      shadow_classname = NULL;
-
-      Delete(shadow_set_vars);
-      shadow_set_vars = NULL;
-      Delete(shadow_get_vars);
-      shadow_get_vars = NULL;
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    wrapperType = memberfn;
-    Language::memberfunctionHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    wrapperType = membervar;
-    Language::membervariableHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    wrapperType = staticmembervar;
-    Language::staticmembervariableHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    wrapperType = staticmemberfn;
-    Language::staticmemberfunctionHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  int abstractConstructorHandler(Node *) {
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-    constructors++;
-    if (Swig_directorclass(n)) {
-      String *name = GetChar(Swig_methodclass(n), "name");
-      String *ctype = GetChar(Swig_methodclass(n), "classtype");
-      String *sname = GetChar(Swig_methodclass(n), "sym:name");
-      String *args = NewStringEmpty();
-      ParmList *p = Getattr(n, "parms");
-      int i;
-
-      for (i = 0; p; p = nextSibling(p), i++) {
-	if (i) {
-	  Printf(args, ", ");
-	}
-	if (Strcmp(GetChar(p, "type"), SwigType_str(GetChar(p, "type"), 0))) {
-	  SwigType *t = Getattr(p, "type");
-	  Printf(args, "%s", SwigType_rcaststr(t, 0));
-	  if (SwigType_isreference(t)) {
-	    Append(args, "*");
-	  }
-	}
-	Printf(args, "arg%d", i+1);
-      }
-
-      /* director ctor code is specific for each class */
-      Delete(director_ctor_code);
-      director_ctor_code = NewStringEmpty();
-      director_prot_ctor_code = NewStringEmpty();
-      Printf(director_ctor_code, "if (Z_TYPE_P(arg0) == IS_NULL) { /* not subclassed */\n");
-      Printf(director_prot_ctor_code, "if (Z_TYPE_P(arg0) == IS_NULL) { /* not subclassed */\n");
-      Printf(director_ctor_code, "  %s = (%s *)new %s(%s);\n", Swig_cresult_name(), ctype, ctype, args);
-      Printf(director_prot_ctor_code, "  SWIG_PHP_Error(E_ERROR, \"accessing abstract class or protected constructor\");\n", name, name, args);
-      if (i) {
-	Insert(args, 0, ", ");
-      }
-      Printf(director_ctor_code, "} else {\n  %s = (%s *)new SwigDirector_%s(arg0%s);\n}\n", Swig_cresult_name(), ctype, sname, args);
-      Printf(director_prot_ctor_code, "} else {\n  %s = (%s *)new SwigDirector_%s(arg0%s);\n}\n", Swig_cresult_name(), ctype, sname, args);
-      Delete(args);
-
-      wrapperType = directorconstructor;
-    } else {
-      wrapperType = constructor;
-    }
-    Language::constructorHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * CreateZendListDestructor()
-   * ------------------------------------------------------------ */
-  //virtual int destructorHandler(Node *n) {
-  //}
-  int CreateZendListDestructor(Node *n) {
-    String *name = GetChar(Swig_methodclass(n), "name");
-    String *iname = GetChar(n, "sym:name");
-    ParmList *l = Getattr(n, "parms");
-
-    String *destructorname = NewStringEmpty();
-    Printf(destructorname, "_%s", Swig_name_wrapper(iname));
-    Setattr(classnode, "destructor", destructorname);
-
-    Wrapper *f = NewWrapper();
-    Printf(f->def, "/* This function is designed to be called by the zend list destructors */\n");
-    Printf(f->def, "/* to typecast and do the actual destruction */\n");
-    Printf(f->def, "static void %s(zend_resource *res, const char *type_name) {\n", destructorname);
-
-    Wrapper_add_localv(f, "value", "swig_object_wrapper *value=(swig_object_wrapper *) res->ptr", NIL);
-    Wrapper_add_localv(f, "ptr", "void *ptr=value->ptr", NIL);
-    Wrapper_add_localv(f, "newobject", "int newobject=value->newobject", NIL);
-
-    emit_parameter_variables(l, f);
-    emit_attach_parmmaps(l, f);
-
-    // Get type of first arg, thing to be destructed
-    // Skip ignored arguments
-    Parm *p = l;
-    //while (Getattr(p,"tmap:ignore")) {p = Getattr(p,"tmap:ignore:next");}
-    while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-    SwigType *pt = Getattr(p, "type");
-
-    Printf(f->code, "  efree(value);\n");
-    Printf(f->code, "  if (! newobject) return; /* can't delete it! */\n");
-    Printf(f->code, "  arg1 = (%s)SWIG_ConvertResourceData(ptr, type_name, SWIGTYPE%s);\n", SwigType_lstr(pt, 0), SwigType_manglestr(pt));
-    Printf(f->code, "  if (! arg1) zend_error(E_ERROR, \"%s resource already free'd\");\n", Char(name));
-
-    Setattr(n, "wrap:name", destructorname);
-
-    String *actioncode = emit_action(n);
-    Append(f->code, actioncode);
-    Delete(actioncode);
-
-    Printf(f->code, "thrown:\n");
-    Append(f->code, "return;\n");
-    Append(f->code, "fail:\n");
-    Append(f->code, "SWIG_FAIL();\n");
-    Printf(f->code, "}\n");
-
-    Wrapper_print(f, s_wrappers);
-    DelWrapper(f);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberconstantHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberconstantHandler(Node *n) {
-    wrapping_member_constant = Getattr(n, "sym:name");
-    Language::memberconstantHandler(n);
-    wrapping_member_constant = NULL;
-    return SWIG_OK;
-  }
-
-  int classDirectorInit(Node *n) {
-    String *declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "%s\n", declaration);
-    Printf(f_directors_h, "public:\n");
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  int classDirectorEnd(Node *n) {
-    Printf(f_directors_h, "};\n");
-    return Language::classDirectorEnd(n);
-  }
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewStringEmpty();
-    Printf(classname, "SwigDirector_%s", supername);
-
-    /* insert self parameter */
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("zval");
-    SwigType_add_pointer(type);
-    p = NewParm(type, NewString("self"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      // There should always be a "self" parameter first.
-      assert(ParmList_len(parms) > 0);
-
-      /* constructor */
-      {
-	Wrapper *w = NewWrapper();
-	String *call;
-	String *basetype = Getattr(parent, "classtype");
-
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-	call = Swig_csuperclass_call(0, basetype, superparms);
-	Printf(w->def, "%s::%s: %s, Swig::Director(self) {", classname, target, call);
-	Append(w->def, "}");
-	Delete(target);
-	Wrapper_print(w, f_directors);
-	Delete(call);
-	DelWrapper(w);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-    return Language::classDirectorConstructor(n);
-  }
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    int is_void = 0;
-    int is_pointer = 0;
-    String *decl = Getattr(n, "decl");
-    String *returntype = Getattr(n, "type");
-    String *name = Getattr(n, "name");
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *declaration = NewStringEmpty();
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *w = NewWrapper();
-    String *tm;
-    String *wrap_args = NewStringEmpty();
-    String *value = Getattr(n, "value");
-    String *storage = Getattr(n, "storage");
-    bool pure_virtual = false;
-    int status = SWIG_OK;
-    int idx;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    if (Cmp(storage, "virtual") == 0) {
-      if (Cmp(value, "0") == 0) {
-	pure_virtual = true;
-      }
-    }
-
-    /* determine if the method returns a pointer */
-    is_pointer = SwigType_ispointer_return(decl);
-    is_void = (Cmp(returntype, "void") == 0 && !is_pointer);
-
-    /* virtual method definition */
-    String *target;
-    String *pclassname = NewStringf("SwigDirector_%s", classname);
-    String *qualified_name = NewStringf("%s::%s", pclassname, name);
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    /* header declaration */
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Get any exception classes in the throws typemap
-    ParmList *throw_parm_list = 0;
-
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      Parm *p;
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-	  String *str = SwigType_str(Getattr(p, "type"), 0);
-	  Append(w->def, str);
-	  Append(declaration, str);
-	  Delete(str);
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    /* declare method return value 
-     * if the return value is a reference or const reference, a specialized typemap must
-     * handle it, including declaration of c_result ($result).
-     */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *cres = SwigType_lstr(returntype, "c_result");
-	Printf(w->code, "%s;\n", cres);
-	Delete(cres);
-      }
-    }
-
-    if (ignored_method) {
-      if (!pure_virtual) {
-	if (!is_void)
-	  Printf(w->code, "return ");
-	String *super_call = Swig_method_call(super, l);
-	Printf(w->code, "%s;\n", super_call);
-	Delete(super_call);
-      } else {
-	Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\");\n", SwigType_namestr(c_classname),
-	    SwigType_namestr(name));
-      }
-    } else {
-      /* attach typemaps to arguments (C/C++ -> PHP) */
-      String *parse_args = NewStringEmpty();
-
-      Swig_director_parms_fixup(l);
-
-      /* remove the wrapper 'w' since it was producing spurious temps */
-      Swig_typemap_attach_parms("in", l, 0);
-      Swig_typemap_attach_parms("directorin", l, 0);
-      Swig_typemap_attach_parms("directorargout", l, w);
-
-      Parm *p;
-
-      int outputs = 0;
-      if (!is_void)
-	outputs++;
-
-      /* build argument list and type conversion string */
-      idx = 0;
-      p = l;
-      while (p) {
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	if (Getattr(p, "tmap:directorargout") != 0)
-	  outputs++;
-
-	String *pname = Getattr(p, "name");
-	String *ptype = Getattr(p, "type");
-
-	if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-	  String *parse = Getattr(p, "tmap:directorin:parse");
-	  if (!parse) {
-	    String *input = NewStringf("&args[%d]", idx++);
-	    Setattr(p, "emit:directorinput", input);
-	    Replaceall(tm, "$input", input);
-	    Delete(input);
-	    Replaceall(tm, "$owner", "0");
-	    Printv(wrap_args, tm, "\n", NIL);
-	    Putc('O', parse_args);
-	  } else {
-	    Append(parse_args, parse);
-	    Setattr(p, "emit:directorinput", pname);
-	    Replaceall(tm, "$input", pname);
-	    Replaceall(tm, "$owner", "0");
-	    if (Len(tm) == 0)
-	      Append(tm, pname);
-	  }
-	  p = Getattr(p, "tmap:directorin:next");
-	  continue;
-	} else if (Cmp(ptype, "void")) {
-	  Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-	      "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(ptype, 0),
-	      SwigType_namestr(c_classname), SwigType_namestr(name));
-	  status = SWIG_NOWRAP;
-	  break;
-	}
-	p = nextSibling(p);
-      }
-
-      /* exception handling */
-      bool error_used_in_typemap = false;
-      tm = Swig_typemap_lookup("director:except", n, Swig_cresult_name(), 0);
-      if (!tm) {
-	tm = Getattr(n, "feature:director:except");
-	if (tm)
-	  tm = Copy(tm);
-      }
-      if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
-	if (Replaceall(tm, "$error", "error")) {
-	  /* Only declare error if it is used by the typemap. */
-	  error_used_in_typemap = true;
-	  Append(w->code, "int error;\n");
-	}
-      } else {
-	Delete(tm);
-	tm = NULL;
-      }
-
-      if (!idx) {
-	Printf(w->code, "zval *args = NULL;\n");
-      } else {
-	Printf(w->code, "zval args[%d];\n", idx);
-      }
-      // typemap_directorout testcase requires that 0 can be assigned to the
-      // variable named after the result of Swig_cresult_name(), so that can't
-      // be a zval - make it a pointer to one instead.
-      Printf(w->code, "zval swig_zval_result, swig_funcname;\n", Swig_cresult_name());
-      Printf(w->code, "zval * SWIGUNUSED %s = &swig_zval_result;\n", Swig_cresult_name());
-      const char * funcname = GetChar(n, "sym:name");
-      Printf(w->code, "ZVAL_STRINGL(&swig_funcname, \"%s\", %d);\n", funcname, strlen(funcname));
-
-      /* wrap complex arguments to zvals */
-      Printv(w->code, wrap_args, NIL);
-
-      if (error_used_in_typemap) {
-	Append(w->code, "error = ");
-      }
-      Append(w->code, "call_user_function(EG(function_table), &swig_self, &swig_funcname,");
-      Printf(w->code, " &swig_zval_result, %d, args);\n", idx);
-
-      if (tm) {
-	Printv(w->code, Str(tm), "\n", NIL);
-	Delete(tm);
-      }
-
-      /* marshal return value from PHP to C/C++ type */
-
-      String *cleanup = NewStringEmpty();
-      String *outarg = NewStringEmpty();
-
-      idx = 0;
-
-      /* marshal return value */
-      if (!is_void) {
-	tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
-	if (tm != 0) {
-	  Replaceall(tm, "$input", Swig_cresult_name());
-	  char temp[24];
-	  sprintf(temp, "%d", idx);
-	  Replaceall(tm, "$argnum", temp);
-
-	  /* TODO check this */
-	  if (Getattr(n, "wrap:disown")) {
-	    Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	  } else {
-	    Replaceall(tm, "$disown", "0");
-	  }
-	  Replaceall(tm, "$result", "c_result");
-	  Printv(w->code, tm, "\n", NIL);
-	  Delete(tm);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-	      "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname),
-	      SwigType_namestr(name));
-	  status = SWIG_ERROR;
-	}
-      }
-
-      /* marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-	  Replaceall(tm, "$result", Swig_cresult_name());
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      Delete(parse_args);
-      Delete(cleanup);
-      Delete(outarg);
-    }
-
-    Append(w->code, "thrown:\n");
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *rettype = SwigType_str(returntype, 0);
-	if (!SwigType_isreference(returntype)) {
-	  Printf(w->code, "return (%s) c_result;\n", rettype);
-	} else {
-	  Printf(w->code, "return (%s) *c_result;\n", rettype);
-	}
-	Delete(rettype);
-      }
-    } else {
-      Append(w->code, "return;\n");
-    }
-
-    Append(w->code, "fail:\n");
-    Append(w->code, "SWIG_FAIL();\n");
-    Append(w->code, "}\n");
-
-    // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewStringEmpty();
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK) {
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    /* clean up */
-    Delete(wrap_args);
-    Delete(pclassname);
-    DelWrapper(w);
-    return status;
-  }
-
-  int classDirectorDisown(Node *) {
-    return SWIG_OK;
-  }
-};				/* class PHP */
-
-static PHP *maininstance = 0;
-
-// We use this function to be able to write out zend_register_list_destructor_ex
-// lines for most things in the type table
-// NOTE: it's a function NOT A PHP::METHOD
-extern "C" {
-static void typetrace(const SwigType *ty, String *mangled, String *clientdata) {
-  Node *class_node;
-  if (!zend_types) {
-    zend_types = NewHash();
-  }
-  // we want to know if the type which reduced to this has a constructor
-  if ((class_node = maininstance->classLookup(ty))) {
-    if (!Getattr(zend_types, mangled)) {
-      // OK it may have been set before by a different SwigType but it would
-      // have had the same underlying class node I think
-      // - it is certainly required not to have different originating class
-      // nodes for the same SwigType
-      Setattr(zend_types, mangled, class_node);
-    }
-  } else {			// a non-class pointer
-    Setattr(zend_types, mangled, NOTCLASS);
-  }
-  if (r_prevtracefunc)
-    (*r_prevtracefunc) (ty, mangled, (String *) clientdata);
-}
-}
-
-/* -----------------------------------------------------------------------------
- * new_swig_php()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_php() {
-  maininstance = new PHP;
-  if (!r_prevtracefunc) {
-    r_prevtracefunc = SwigType_remember_trace(typetrace);
-  } else {
-    Printf(stderr, "php Typetrace vector already saved!\n");
-    assert(0);
-  }
-  return maininstance;
-}
-
-extern "C" Language *swig_php(void) {
-  return new_swig_php();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/php5.cxx b/dependencies2013/win32/swig/Source/Modules/php5.cxx
deleted file mode 100644
index bf3ce4fa..00000000
--- a/dependencies2013/win32/swig/Source/Modules/php5.cxx
+++ /dev/null
@@ -1,2858 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * php5.cxx
- *
- * PHP5 language module for SWIG.
- * -----------------------------------------------------------------------------
- */
-
-/* FIXME: PHP5 OO wrapping TODO list:
- *
- * Medium term:
- *
- * Handle default parameters on overloaded methods in PHP where possible.
- *   (Mostly done - just need to handle cases of overloaded methods with
- *   default parameters...)
- *   This is an optimisation - we could handle this case using a PHP
- *   default value, but currently we treat it as we would for a default
- *   value which is a compound C++ expression (i.e. as if we had a
- *   method with two overloaded forms instead of a single method with
- *   a default parameter value).
- *
- * Long term:
- *
- * Sort out locale-dependent behaviour of strtod() - it's harmless unless
- *   SWIG ever sets the locale and DOH/base.c calls atof, so we're probably
- *   OK currently at least.
- */
-
-/*
- * TODO: Replace remaining stderr messages with Swig_error or Swig_warning
- * (may need to add more WARN_PHP_xxx codes...)
- */
-
-#include "swigmod.h"
-
-#include <ctype.h>
-#include <errno.h>
-
-static const char *usage = "\
-PHP5 Options (available with -php5)\n\
-     -noproxy         - Don't generate proxy classes.\n\
-     -prefix <prefix> - Prepend <prefix> to all class names in PHP wrappers\n\
-\n";
-
-/* The original class wrappers for PHP stored the pointer to the C++ class in
- * the object property _cPtr.  If we use the same name for the member variable
- * which we put the pointer to the C++ class in, then the flat function
- * wrappers will automatically pull it out without any changes being required.
- * FIXME: Isn't using a leading underscore a bit suspect here?
- */
-#define SWIG_PTR "_cPtr"
-
-/* This is the name of the hash where the variables existing only in PHP
- * classes are stored.
- */
-#define SWIG_DATA "_pData"
-
-static int constructors = 0;
-static String *NOTCLASS = NewString("Not a class");
-static Node *classnode = 0;
-static String *module = 0;
-static String *cap_module = 0;
-static String *prefix = 0;
-
-static String *shadow_classname = 0;
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_runtime_h = 0;
-static File *f_h = 0;
-static File *f_phpcode = 0;
-static File *f_directors = 0;
-static File *f_directors_h = 0;
-static String *phpfilename = 0;
-
-static String *s_header;
-static String *s_wrappers;
-static String *s_init;
-static String *r_init;		// RINIT user code
-static String *s_shutdown;	// MSHUTDOWN user code
-static String *r_shutdown;	// RSHUTDOWN user code
-static String *s_vinit;		// varinit initialization code.
-static String *s_vdecl;
-static String *s_cinit;		// consttab initialization code.
-static String *s_oinit;
-static String *s_arginfo;
-static String *s_entry;
-static String *cs_entry;
-static String *all_cs_entry;
-static String *pragma_incl;
-static String *pragma_code;
-static String *pragma_phpinfo;
-static String *s_oowrappers;
-static String *s_fakeoowrappers;
-static String *s_phpclasses;
-
-/* To reduce code size (generated and compiled) we only want to emit each
- * different arginfo once, so we need to track which have been used.
- */
-static Hash *arginfo_used;
-
-/* Variables for using PHP classes */
-static Node *current_class = 0;
-
-static Hash *shadow_get_vars;
-static Hash *shadow_set_vars;
-static Hash *zend_types = 0;
-
-static int shadow = 1;
-
-static bool class_has_ctor = false;
-static String *wrapping_member_constant = NULL;
-
-// These static variables are used to pass some state from Handlers into functionWrapper
-static enum {
-  standard = 0,
-  memberfn,
-  staticmemberfn,
-  membervar,
-  staticmembervar,
-  constructor,
-  directorconstructor
-} wrapperType = standard;
-
-extern "C" {
-  static void (*r_prevtracefunc) (const SwigType *t, String *mangled, String *clientdata) = 0;
-}
-
-static void SwigPHP_emit_resource_registrations() {
-  Iterator ki;
-  bool emitted_default_dtor = false;
-
-  if (!zend_types)
-    return;
-
-  ki = First(zend_types);
-  if (ki.key)
-    Printf(s_oinit, "\n/* Register resource destructors for pointer types */\n");
-  while (ki.key) {
-    DOH *key = ki.key;
-    Node *class_node = ki.item;
-    String *human_name = key;
-    String *rsrc_dtor_name = NULL;
-
-    // write out body
-    if (class_node != NOTCLASS) {
-      String *destructor = Getattr(class_node, "destructor");
-      human_name = Getattr(class_node, "sym:name");
-      if (!human_name)
-        human_name = Getattr(class_node, "name");
-      // Do we have a known destructor for this type?
-      if (destructor) {
-	rsrc_dtor_name = NewStringf("_wrap_destroy%s", key);
-	// Write out custom destructor function
-	Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);
-        Printf(s_wrappers, "  %s(rsrc, SWIGTYPE%s->name TSRMLS_CC);\n", destructor, key);
-	Printf(s_wrappers, "}\n");
-      }
-    }
-
-    if (!rsrc_dtor_name) {
-      rsrc_dtor_name = NewString("_swig_default_rsrc_destroy");
-      if (!emitted_default_dtor) {
-	// Write out custom destructor function
-	Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);
-	Printf(s_wrappers, "  efree(rsrc->ptr);\n");
-	Printf(s_wrappers, "}\n");
-	emitted_default_dtor = true;
-      }
-    }
-
-    // declare le_swig_<mangled> to store php registration
-    Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name);
-
-    // register with php
-    Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex"
-		    "(%s, NULL, (char *)SWIGTYPE%s->name, module_number);\n", key, rsrc_dtor_name, key);
-
-    // store php type in class struct
-    Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key);
-
-    Delete(rsrc_dtor_name);
-
-    ki = Next(ki);
-  }
-}
-
-class PHP5 : public Language {
-  String *emit_action(Node *n) {
-    // Adjust wrap:action to add TSRMLS_CC.
-    String * action = Getattr(n, "wrap:action");
-    if (action) {
-      char * p = Strstr(action, "Swig::DirectorPureVirtualException::raise(\"");
-      if (p) {
-	p += strlen("Swig::DirectorPureVirtualException::raise(\"");
-	p = strchr(p, '"');
-	if (p) {
-	  ++p;
-	  Insert(action, (int)(p - Char(action)), " TSRMLS_CC");
-	}
-      }
-    }
-    return ::emit_action(n);
-  }
-
-public:
-  PHP5() {
-    director_language = 1;
-  }
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    SWIG_library_directory("php5");
-    SWIG_config_cppext("cpp");
-
-    for (int i = 1; i < argc; i++) {
-      if (strcmp(argv[i], "-prefix") == 0) {
-	if (argv[i + 1]) {
-	  prefix = NewString(argv[i + 1]);
-	  Swig_mark_arg(i);
-	  Swig_mark_arg(i + 1);
-	  i++;
-	} else {
-	  Swig_arg_error();
-	}
-      } else if ((strcmp(argv[i], "-noshadow") == 0) || (strcmp(argv[i], "-noproxy") == 0)) {
-	shadow = 0;
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-help") == 0) {
-	fputs(usage, stdout);
-      } else if (strcmp(argv[i], "-make") == 0 ||
-		 strcmp(argv[i], "-withc") == 0 ||
-		 strcmp(argv[i], "-withcxx") == 0) {
-	Printf(stderr, "*** %s is no longer supported.\n", argv[i]);
-	SWIG_exit(EXIT_FAILURE);
-      } else if (strcmp(argv[i], "-phpfull") == 0 ||
-		 strcmp(argv[i], "-withlibs") == 0 ||
-		 strcmp(argv[i], "-withincs") == 0) {
-	Printf(stderr, "*** %s is no longer supported.\n*** We recommend building as a dynamically loadable module.\n", argv[i]);
-	SWIG_exit(EXIT_FAILURE);
-      } else if (strcmp(argv[i], "-dlname") == 0) {
-	Printf(stderr, "*** -dlname is no longer supported.\n*** If you want to change the module name, use -module instead.\n");
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    Preprocessor_define("SWIGPHP 1", 0);
-    // SWIGPHP5 is deprecated, and no longer documented.
-    Preprocessor_define("SWIGPHP5 1", 0);
-    SWIG_typemap_lang("php");
-    SWIG_config_file("php.swg");
-    allow_overloading();
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-
-    String *filen;
-
-    /* Check if directors are enabled for this module. */
-    Node *mod = Getattr(n, "module");
-    if (mod) {
-      Node *options = Getattr(mod, "options");
-      if (options && Getattr(options, "directors")) {
-	allow_directors();
-      }
-    }
-
-    /* Set comparison with null for ConstructorToFunction */
-    setSubclassInstanceCheck(NewString("$arg->type != IS_NULL"));
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    /* main output file */
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewStringEmpty();
-
-    /* sections of the output file */
-    s_init = NewString("/* init section */\n");
-    r_init = NewString("/* rinit section */\n");
-    s_shutdown = NewString("/* shutdown section */\n");
-    r_shutdown = NewString("/* rshutdown section */\n");
-    s_header = NewString("/* header section */\n");
-    s_wrappers = NewString("/* wrapper section */\n");
-    /* subsections of the init section */
-    s_vinit = NewString("/* vinit subsection */\n");
-    s_vdecl = NewString("/* vdecl subsection */\n");
-    s_cinit = NewString("/* cinit subsection */\n");
-    s_oinit = NewString("/* oinit subsection */\n");
-    pragma_phpinfo = NewStringEmpty();
-    s_phpclasses = NewString("/* PHP Proxy Classes */\n");
-    f_directors_h = NewStringEmpty();
-    f_directors = NewStringEmpty();
-
-    if (directorsEnabled()) {
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", s_init);
-    Swig_register_filebyname("rinit", r_init);
-    Swig_register_filebyname("shutdown", s_shutdown);
-    Swig_register_filebyname("rshutdown", r_shutdown);
-    Swig_register_filebyname("header", s_header);
-    Swig_register_filebyname("wrapper", s_wrappers);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGPHP\n#define SWIGPHP\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-    }
-
-    /* Set the module name */
-    module = Copy(Getattr(n, "name"));
-    cap_module = NewStringf("%(upper)s", module);
-    if (!prefix)
-      prefix = NewStringEmpty();
-
-    Printf(f_runtime, "#define SWIG_PREFIX \"%s\"\n", prefix);
-    Printf(f_runtime, "#define SWIG_PREFIX_LEN %lu\n", (unsigned long)Len(prefix));
-
-    if (directorsEnabled()) {
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", cap_module);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", cap_module);
-
-      String *filename = Swig_file_filename(outfile_h);
-      Printf(f_directors, "\n#include \"%s\"\n\n", filename);
-      Delete(filename);
-    }
-
-    /* PHP module file */
-    filen = NewStringEmpty();
-    Printv(filen, SWIG_output_directory(), module, ".php", NIL);
-    phpfilename = NewString(filen);
-
-    f_phpcode = NewFile(filen, "w", SWIG_output_files());
-    if (!f_phpcode) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    Printf(f_phpcode, "<?php\n\n");
-
-    Swig_banner(f_phpcode);
-
-    Printf(f_phpcode, "\n");
-    Printf(f_phpcode, "// Try to load our extension if it's not already loaded.\n");
-    Printf(f_phpcode, "if (!extension_loaded('%s')) {\n", module);
-    Printf(f_phpcode, "  if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {\n");
-    Printf(f_phpcode, "    if (!dl('php_%s.dll')) return;\n", module);
-    Printf(f_phpcode, "  } else {\n");
-    Printf(f_phpcode, "    // PHP_SHLIB_SUFFIX gives 'dylib' on MacOS X but modules are 'so'.\n");
-    Printf(f_phpcode, "    if (PHP_SHLIB_SUFFIX === 'dylib') {\n");
-    Printf(f_phpcode, "      if (!dl('%s.so')) return;\n", module);
-    Printf(f_phpcode, "    } else {\n");
-    Printf(f_phpcode, "      if (!dl('%s.'.PHP_SHLIB_SUFFIX)) return;\n", module);
-    Printf(f_phpcode, "    }\n");
-    Printf(f_phpcode, "  }\n");
-    Printf(f_phpcode, "}\n\n");
-
-    /* sub-sections of the php file */
-    pragma_code = NewStringEmpty();
-    pragma_incl = NewStringEmpty();
-
-    /* Initialize the rest of the module */
-
-    Printf(s_oinit, "ZEND_INIT_MODULE_GLOBALS(%s, %s_init_globals, NULL);\n", module, module);
-
-    /* start the header section */
-    Printf(s_header, "ZEND_BEGIN_MODULE_GLOBALS(%s)\n", module);
-    Printf(s_header, "const char *error_msg;\n");
-    Printf(s_header, "int error_code;\n");
-    Printf(s_header, "ZEND_END_MODULE_GLOBALS(%s)\n", module);
-    Printf(s_header, "ZEND_DECLARE_MODULE_GLOBALS(%s)\n", module);
-    Printf(s_header, "#ifdef ZTS\n");
-    Printf(s_header, "#define SWIG_ErrorMsg() TSRMG(%s_globals_id, zend_%s_globals *, error_msg )\n", module, module);
-    Printf(s_header, "#define SWIG_ErrorCode() TSRMG(%s_globals_id, zend_%s_globals *, error_code )\n", module, module);
-    Printf(s_header, "#else\n");
-    Printf(s_header, "#define SWIG_ErrorMsg() (%s_globals.error_msg)\n", module);
-    Printf(s_header, "#define SWIG_ErrorCode() (%s_globals.error_code)\n", module);
-    Printf(s_header, "#endif\n\n");
-
-    /* The following can't go in Lib/php/phprun.swg as it uses SWIG_ErrorMsg(), etc
-     * which has to be dynamically generated as it depends on the module name.
-     */
-    Append(s_header, "#ifdef __GNUC__\n");
-    Append(s_header, "static void SWIG_FAIL(TSRMLS_D) __attribute__ ((__noreturn__));\n");
-    Append(s_header, "#endif\n\n");
-    Append(s_header, "static void SWIG_FAIL(TSRMLS_D) {\n");
-    Append(s_header, "    zend_error(SWIG_ErrorCode(), \"%s\", SWIG_ErrorMsg());\n");
-    // zend_error() should never return with the parameters we pass, but if it
-    // does, we really don't want to let SWIG_FAIL() return.  This also avoids
-    // a warning about returning from a function marked as "__noreturn__".
-    Append(s_header, "    abort();\n");
-    Append(s_header, "}\n\n");
-
-    Printf(s_header, "static void %s_init_globals(zend_%s_globals *globals ) {\n", module, module);
-    Printf(s_header, "  globals->error_msg = default_error_msg;\n");
-    Printf(s_header, "  globals->error_code = default_error_code;\n");
-    Printf(s_header, "}\n");
-
-    Printf(s_header, "static void SWIG_ResetError(TSRMLS_D) {\n");
-    Printf(s_header, "  SWIG_ErrorMsg() = default_error_msg;\n");
-    Printf(s_header, "  SWIG_ErrorCode() = default_error_code;\n");
-    Printf(s_header, "}\n");
-
-    Append(s_header, "\n");
-    Printf(s_header, "ZEND_NAMED_FUNCTION(_wrap_swig_%s_alter_newobject) {\n", module);
-    Append(s_header, "  zval **args[2];\n");
-    Append(s_header, "  swig_object_wrapper *value;\n");
-    Append(s_header, "  int type;\n");
-    Append(s_header, "\n");
-    Append(s_header, "  SWIG_ResetError(TSRMLS_C);\n");
-    Append(s_header, "  if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(2, args) != SUCCESS) {\n");
-    Append(s_header, "    WRONG_PARAM_COUNT;\n");
-    Append(s_header, "  }\n");
-    Append(s_header, "\n");
-    Append(s_header, "  value = (swig_object_wrapper *) zend_list_find((*args[0])->value.lval, &type);\n");
-    Append(s_header, "  value->newobject = zval_is_true(*args[1]);\n");
-    Append(s_header, "\n");
-    Append(s_header, "  return;\n");
-    Append(s_header, "}\n");
-    Printf(s_header, "ZEND_NAMED_FUNCTION(_wrap_swig_%s_get_newobject) {\n", module);
-    Append(s_header, "  zval **args[1];\n");
-    Append(s_header, "  swig_object_wrapper *value;\n");
-    Append(s_header, "  int type;\n");
-    Append(s_header, "\n");
-    Append(s_header, "  SWIG_ResetError(TSRMLS_C);\n");
-    Append(s_header, "  if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {\n");
-    Append(s_header, "    WRONG_PARAM_COUNT;\n");
-    Append(s_header, "  }\n");
-    Append(s_header, "\n");
-    Append(s_header, "  value = (swig_object_wrapper *) zend_list_find((*args[0])->value.lval, &type);\n");
-    Append(s_header, "  RETVAL_LONG(value->newobject);\n");
-    Append(s_header, "\n");
-    Append(s_header, "  return;\n");
-    Append(s_header, "}\n");
-
-    Printf(s_header, "#define SWIG_name  \"%s\"\n", module);
-    Printf(s_header, "#ifdef __cplusplus\n");
-    Printf(s_header, "extern \"C\" {\n");
-    Printf(s_header, "#endif\n");
-    Printf(s_header, "#include \"php.h\"\n");
-    Printf(s_header, "#include \"php_ini.h\"\n");
-    Printf(s_header, "#include \"ext/standard/info.h\"\n");
-    Printf(s_header, "#include \"php_%s.h\"\n", module);
-    Printf(s_header, "#ifdef __cplusplus\n");
-    Printf(s_header, "}\n");
-    Printf(s_header, "#endif\n\n");
-
-    if (directorsEnabled()) {
-      // Insert director runtime
-      Swig_insert_file("director_common.swg", s_header);
-      Swig_insert_file("director.swg", s_header);
-    }
-
-    /* Create the .h file too */
-    filen = NewStringEmpty();
-    Printv(filen, SWIG_output_directory(), "php_", module, ".h", NIL);
-    f_h = NewFile(filen, "w", SWIG_output_files());
-    if (!f_h) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    Swig_banner(f_h);
-
-    Printf(f_h, "\n");
-    Printf(f_h, "#ifndef PHP_%s_H\n", cap_module);
-    Printf(f_h, "#define PHP_%s_H\n\n", cap_module);
-    Printf(f_h, "extern zend_module_entry %s_module_entry;\n", module);
-    Printf(f_h, "#define phpext_%s_ptr &%s_module_entry\n\n", module, module);
-    Printf(f_h, "#ifdef PHP_WIN32\n");
-    Printf(f_h, "# define PHP_%s_API __declspec(dllexport)\n", cap_module);
-    Printf(f_h, "#else\n");
-    Printf(f_h, "# define PHP_%s_API\n", cap_module);
-    Printf(f_h, "#endif\n\n");
-    Printf(f_h, "#ifdef ZTS\n");
-    Printf(f_h, "#include \"TSRM.h\"\n");
-    Printf(f_h, "#endif\n\n");
-    Printf(f_h, "PHP_MINIT_FUNCTION(%s);\n", module);
-    Printf(f_h, "PHP_MSHUTDOWN_FUNCTION(%s);\n", module);
-    Printf(f_h, "PHP_RINIT_FUNCTION(%s);\n", module);
-    Printf(f_h, "PHP_RSHUTDOWN_FUNCTION(%s);\n", module);
-    Printf(f_h, "PHP_MINFO_FUNCTION(%s);\n\n", module);
-
-    /* start the arginfo section */
-    s_arginfo = NewString("/* arginfo subsection */\n");
-    arginfo_used = NewHash();
-
-    /* start the function entry section */
-    s_entry = NewString("/* entry subsection */\n");
-
-    /* holds all the per-class function entry sections */
-    all_cs_entry = NewString("/* class entry subsection */\n");
-    cs_entry = NULL;
-
-    Printf(s_entry, "/* Every non-class user visible function must have an entry here */\n");
-    Printf(s_entry, "static zend_function_entry %s_functions[] = {\n", module);
-
-    /* start the init section */
-    Append(s_init, "#if ZEND_MODULE_API_NO <= 20090626\n");
-    Append(s_init, "#undef ZEND_MODULE_BUILD_ID\n");
-    Append(s_init, "#define ZEND_MODULE_BUILD_ID (char*)\"API\" ZEND_TOSTR(ZEND_MODULE_API_NO) ZEND_BUILD_TS ZEND_BUILD_DEBUG ZEND_BUILD_SYSTEM ZEND_BUILD_EXTRA\n");
-    Append(s_init, "#endif\n");
-    Printv(s_init, "zend_module_entry ", module, "_module_entry = {\n", NIL);
-    Printf(s_init, "    STANDARD_MODULE_HEADER,\n");
-    Printf(s_init, "    (char*)\"%s\",\n", module);
-    Printf(s_init, "    %s_functions,\n", module);
-    Printf(s_init, "    PHP_MINIT(%s),\n", module);
-    Printf(s_init, "    PHP_MSHUTDOWN(%s),\n", module);
-    Printf(s_init, "    PHP_RINIT(%s),\n", module);
-    Printf(s_init, "    PHP_RSHUTDOWN(%s),\n", module);
-    Printf(s_init, "    PHP_MINFO(%s),\n", module);
-    Printf(s_init, "    NO_VERSION_YET,\n");
-    Printf(s_init, "    STANDARD_MODULE_PROPERTIES\n");
-    Printf(s_init, "};\n");
-    Printf(s_init, "zend_module_entry* SWIG_module_entry = &%s_module_entry;\n\n", module);
-
-    Printf(s_init, "#ifdef __cplusplus\n");
-    Printf(s_init, "extern \"C\" {\n");
-    Printf(s_init, "#endif\n");
-    // We want to write "SWIGEXPORT ZEND_GET_MODULE(%s)" but ZEND_GET_MODULE
-    // in PHP5 has "extern "C" { ... }" around it so we can't do that.
-    Printf(s_init, "SWIGEXPORT zend_module_entry *get_module(void) { return &%s_module_entry; }\n", module);
-    Printf(s_init, "#ifdef __cplusplus\n");
-    Printf(s_init, "}\n");
-    Printf(s_init, "#endif\n\n");
-
-    /* We have to register the constants before they are (possibly) used
-     * by the pointer typemaps. This all needs re-arranging really as
-     * things are being called in the wrong order
-     */
-    Printf(s_init, "#define SWIG_php_minit PHP_MINIT_FUNCTION(%s)\n", module);
-
-    /* Emit all of the code */
-    Language::top(n);
-
-    SwigPHP_emit_resource_registrations();
-    //    Printv(s_init,s_resourcetypes,NIL);
-    /* We need this after all classes written out by ::top */
-    Printf(s_oinit, "CG(active_class_entry) = NULL;\n");
-    Printf(s_oinit, "/* end oinit subsection */\n");
-    Printf(s_init, "%s\n", s_oinit);
-
-    /* Constants generated during top call */
-    Printf(s_cinit, "/* end cinit subsection */\n");
-    Printf(s_init, "%s\n", s_cinit);
-    Clear(s_cinit);
-    Delete(s_cinit);
-
-    Printf(s_init, "    return SUCCESS;\n");
-    Printf(s_init, "}\n\n");
-
-    // Now do REQUEST init which holds any user specified %rinit, and also vinit
-    Printf(s_init, "PHP_RINIT_FUNCTION(%s)\n{\n", module);
-    Printf(s_init, "%s\n", r_init);
-
-    /* finish our init section which will have been used by class wrappers */
-    Printf(s_vinit, "/* end vinit subsection */\n");
-    Printf(s_init, "%s\n", s_vinit);
-    Clear(s_vinit);
-    Delete(s_vinit);
-
-    Printf(s_init, "    return SUCCESS;\n");
-    Printf(s_init, "}\n\n");
-
-    Printv(s_init, "PHP_MSHUTDOWN_FUNCTION(", module, ")\n"
-		   "{\n",
-		   s_shutdown,
-		   "#ifdef ZTS\n"
-		   "    ts_free_id(", module, "_globals_id);\n"
-		   "#endif\n"
-		   "    return SUCCESS;\n"
-		   "}\n\n", NIL);
-
-    Printf(s_init, "PHP_RSHUTDOWN_FUNCTION(%s)\n{\n", module);
-    Printf(s_init, "%s\n", r_shutdown);
-    Printf(s_init, "    return SUCCESS;\n");
-    Printf(s_init, "}\n\n");
-
-    Printf(s_init, "PHP_MINFO_FUNCTION(%s)\n{\n", module);
-    Printf(s_init, "%s", pragma_phpinfo);
-    Printf(s_init, "}\n");
-    Printf(s_init, "/* end init section */\n");
-
-    Printf(f_h, "#endif /* PHP_%s_H */\n", cap_module);
-
-    Delete(f_h);
-
-    String *type_table = NewStringEmpty();
-    SwigType_emit_type_table(f_runtime, type_table);
-    Printf(s_header, "%s", type_table);
-    Delete(type_table);
-
-    /* Oh dear, more things being called in the wrong order. This whole
-     * function really needs totally redoing.
-     */
-
-    if (directorsEnabled()) {
-      Dump(f_directors_h, f_runtime_h);
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-      Delete(f_runtime_h);
-    }
-
-    Printf(s_header, "/* end header section */\n");
-    Printf(s_wrappers, "/* end wrapper section */\n");
-    Printf(s_vdecl, "/* end vdecl subsection */\n");
-
-    Dump(f_runtime, f_begin);
-    Printv(f_begin, s_header, NIL);
-    if (directorsEnabled()) {
-      Dump(f_directors, f_begin);
-    }
-    Printv(f_begin, s_vdecl, s_wrappers, NIL);
-    Printv(f_begin, all_cs_entry, "\n\n", s_arginfo, "\n\n", s_entry,
-	" SWIG_ZEND_NAMED_FE(swig_", module, "_alter_newobject,_wrap_swig_", module, "_alter_newobject,NULL)\n"
-	" SWIG_ZEND_NAMED_FE(swig_", module, "_get_newobject,_wrap_swig_", module, "_get_newobject,NULL)\n"
-	" ZEND_FE_END\n};\n\n", NIL);
-    Printv(f_begin, s_init, NIL);
-    Delete(s_header);
-    Delete(s_wrappers);
-    Delete(s_init);
-    Delete(s_vdecl);
-    Delete(all_cs_entry);
-    Delete(s_entry);
-    Delete(s_arginfo);
-    Delete(f_runtime);
-    Delete(f_begin);
-    Delete(arginfo_used);
-
-    Printf(f_phpcode, "%s\n%s\n", pragma_incl, pragma_code);
-    if (s_fakeoowrappers) {
-      Printf(f_phpcode, "abstract class %s {", Len(prefix) ? prefix : module);
-      Printf(f_phpcode, "%s", s_fakeoowrappers);
-      Printf(f_phpcode, "}\n\n");
-      Delete(s_fakeoowrappers);
-      s_fakeoowrappers = NULL;
-    }
-    Printf(f_phpcode, "%s\n?>\n", s_phpclasses);
-    Delete(f_phpcode);
-
-    return SWIG_OK;
-  }
-
-  /* Just need to append function names to function table to register with PHP. */
-  void create_command(String *cname, String *iname, Node *n) {
-    // This is for the single main zend_function_entry record
-    Printf(f_h, "ZEND_NAMED_FUNCTION(%s);\n", iname);
-
-    // We want to only emit each different arginfo once, as that reduces the
-    // size of both the generated source code and the compiled extension
-    // module.  To do this, we name the arginfo to encode the number of
-    // parameters and which (if any) are passed by reference by using a
-    // sequence of 0s (for non-reference) and 1s (for by references).
-    ParmList *l = Getattr(n, "parms");
-    String * arginfo_code = NewStringEmpty();
-    for (Parm *p = l; p; p = Getattr(p, "tmap:in:next")) {
-      /* Ignored parameters */
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	continue;
-      }
-      Append(arginfo_code, GetFlag(p, "tmap:in:byref") ? "1" : "0");
-    }
-
-    if (!GetFlag(arginfo_used, arginfo_code)) {
-      // Not had this one before, so emit it.
-      SetFlag(arginfo_used, arginfo_code);
-      Printf(s_arginfo, "ZEND_BEGIN_ARG_INFO_EX(swig_arginfo_%s, 0, 0, 0)\n", arginfo_code);
-      for (const char * p = Char(arginfo_code); *p; ++p) {
-	Printf(s_arginfo, " ZEND_ARG_PASS_INFO(%c)\n", *p);
-      }
-      Printf(s_arginfo, "ZEND_END_ARG_INFO()\n");
-    }
-
-    String * s = cs_entry;
-    if (!s) s = s_entry;
-    Printf(s, " SWIG_ZEND_NAMED_FE(%(lower)s,%s,swig_arginfo_%s)\n", cname, iname, arginfo_code);
-    Delete(arginfo_code);
-  }
-
-  /* ------------------------------------------------------------
-   * dispatchFunction()
-   * ------------------------------------------------------------ */
-  void dispatchFunction(Node *n) {
-    /* Last node in overloaded chain */
-
-    int maxargs;
-    String *tmp = NewStringEmpty();
-    if (Swig_directorclass(n) && wrapperType == directorconstructor) {
-      /* We have an extra 'this' parameter. */
-      SetFlag(n, "wrap:this");
-    }
-    String *dispatch = Swig_overload_dispatch(n, "%s(INTERNAL_FUNCTION_PARAM_PASSTHRU); return;", &maxargs);
-
-    /* Generate a dispatch wrapper for all overloaded functions */
-
-    Wrapper *f = NewWrapper();
-    String *symname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(symname);
-
-    create_command(symname, wname, n);
-    Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL);
-
-    Wrapper_add_local(f, "argc", "int argc");
-
-    Printf(tmp, "zval **argv[%d]", maxargs);
-    Wrapper_add_local(f, "argv", tmp);
-
-    Printf(f->code, "argc = ZEND_NUM_ARGS();\n");
-
-    Printf(f->code, "zend_get_parameters_array_ex(argc,argv);\n");
-
-    Replaceall(dispatch, "$args", "self,args");
-
-    Printv(f->code, dispatch, "\n", NIL);
-
-    Printf(f->code, "SWIG_ErrorCode() = E_ERROR;\n");
-    Printf(f->code, "SWIG_ErrorMsg() = \"No matching function for overloaded '%s'\";\n", symname);
-    Printv(f->code, "SWIG_FAIL(TSRMLS_C);\n", NIL);
-
-    Printv(f->code, "}\n", NIL);
-    Wrapper_print(f, s_wrappers);
-
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(tmp);
-    Delete(wname);
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * ------------------------------------------------------------ */
-
-  /* Helper method for PHP5::functionWrapper */
-  bool is_class(SwigType *t) {
-    Node *n = classLookup(t);
-    if (n) {
-      String *r = Getattr(n, "php:proxy");	// Set by classDeclaration()
-      if (!r)
-	r = Getattr(n, "sym:name");	// Not seen by classDeclaration yet, but this is the name
-      if (r)
-	return true;
-    }
-    return false;
-  }
-
-  virtual int functionWrapper(Node *n) {
-    String *name = GetChar(n, "name");
-    String *iname = GetChar(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    String *nodeType = Getattr(n, "nodeType");
-    int newobject = GetFlag(n, "feature:new");
-    int constructor = (Cmp(nodeType, "constructor") == 0);
-
-    Parm *p;
-    int i;
-    int numopt;
-    String *tm;
-    Wrapper *f;
-
-    String *wname;
-    int overloaded = 0;
-    String *overname = 0;
-
-    if (Cmp(nodeType, "destructor") == 0) {
-      // We just generate the Zend List Destructor and let Zend manage the
-      // reference counting.  There's no explicit destructor, but the user can
-      // just do `$obj = null;' to remove a reference to an object.
-      return CreateZendListDestructor(n);
-    }
-    // Test for overloading;
-    if (Getattr(n, "sym:overloaded")) {
-      overloaded = 1;
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n))
-	return SWIG_ERROR;
-    }
-
-    wname = Swig_name_wrapper(iname);
-    if (overname) {
-      Printf(wname, "%s", overname);
-    }
-
-    f = NewWrapper();
-
-    String *outarg = NewStringEmpty();
-    String *cleanup = NewStringEmpty();
-
-    Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL);
-
-    emit_parameter_variables(l, f);
-    /* Attach standard typemaps */
-
-    emit_attach_parmmaps(l, f);
-    // Not issued for overloaded functions.
-    if (!overloaded) {
-      create_command(iname, wname, n);
-    }
-
-    // wrap:parms is used by overload resolution.
-    Setattr(n, "wrap:parms", l);
-
-    int num_arguments = emit_num_arguments(l);
-    int num_required = emit_num_required(l);
-    numopt = num_arguments - num_required;
-
-    if (wrapperType == directorconstructor)
-      num_arguments++;
-
-    if (num_arguments > 0) {
-      String *args = NewStringEmpty();
-      if (wrapperType == directorconstructor)
-        Wrapper_add_local(f, "arg0", "zval *arg0");
-      Printf(args, "zval **args[%d]", num_arguments);
-      Wrapper_add_local(f, "args", args);
-      Delete(args);
-      args = NULL;
-    }
-
-    // This generated code may be called:
-    // 1) as an object method, or
-    // 2) as a class-method/function (without a "this_ptr")
-    // Option (1) has "this_ptr" for "this", option (2) needs it as
-    // first parameter
-
-    // NOTE: possible we ignore this_ptr as a param for native constructor
-
-    Printf(f->code, "SWIG_ResetError(TSRMLS_C);\n");
-
-    if (numopt > 0) {		// membervariable wrappers do not have optional args
-      Wrapper_add_local(f, "arg_count", "int arg_count");
-      Printf(f->code, "arg_count = ZEND_NUM_ARGS();\n");
-      Printf(f->code, "if(arg_count<%d || arg_count>%d ||\n", num_required, num_arguments);
-      Printf(f->code, "   zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)\n");
-      Printf(f->code, "\tWRONG_PARAM_COUNT;\n\n");
-    } else {
-      if (num_arguments == 0) {
-	Printf(f->code, "if(ZEND_NUM_ARGS() != 0) {\n");
-      } else {
-	Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n", num_arguments, num_arguments);
-      }
-      Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n");
-    }
-    if (wrapperType == directorconstructor)
-      Printf(f->code, "arg0 = *args[0];\n  \n");
-
-    /* Now convert from PHP to C variables */
-    // At this point, argcount if used is the number of deliberately passed args
-    // not including this_ptr even if it is used.
-    // It means error messages may be out by argbase with error
-    // reports.  We can either take argbase into account when raising
-    // errors, or find a better way of dealing with _thisptr.
-    // I would like, if objects are wrapped, to assume _thisptr is always
-    // _this and not the first argument.
-    // This may mean looking at Language::memberfunctionHandler
-
-    int limit = num_arguments;
-    if (wrapperType == directorconstructor)
-      limit--;
-    for (i = 0, p = l; i < limit; i++) {
-      String *source;
-
-      /* Skip ignored arguments */
-      //while (Getattr(p,"tmap:ignore")) { p = Getattr(p,"tmap:ignore:next");}
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-
-      if (wrapperType == directorconstructor) {
-	source = NewStringf("args[%d]", i+1);
-      } else {
-	source = NewStringf("args[%d]", i);
-      }
-
-      String *ln = Getattr(p, "lname");
-
-      /* Check if optional */
-      if (i >= num_required) {
-	Printf(f->code, "\tif(arg_count > %d) {\n", i);
-      }
-
-      if ((tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$source", source);
-	Replaceall(tm, "$target", ln);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", source);
-	Printf(f->code, "%s\n", tm);
-	if (i == 0 && Getattr(p, "self")) {
-	  Printf(f->code, "\tif(!arg1) SWIG_PHP_Error(E_ERROR, \"this pointer is NULL\");\n");
-	}
-	p = Getattr(p, "tmap:in:next");
-	if (i >= num_required) {
-	  Printf(f->code, "}\n");
-	}
-	continue;
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-      }
-      if (i >= num_required) {
-	Printf(f->code, "\t}\n");
-      }
-      Delete(source);
-    }
-
-    if (is_member_director(n)) {
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      Printf(f->code, "upcall = !Swig::Director::swig_is_overridden_method((char *)\"%s%s\", (char *)\"%s\" TSRMLS_CC);\n",
-	  prefix, Swig_class_name(Swig_methodclass(n)), name);
-    }
-
-    Swig_director_emit_dynamic_cast(n, f);
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (i = 0, p = l; p; i++) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    bool hasargout = false;
-    for (i = 0, p = l; p; i++) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	hasargout = true;
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	//      Replaceall(tm,"$input",Getattr(p,"lname"));
-	Replaceall(tm, "$target", "return_value");
-	Replaceall(tm, "$result", "return_value");
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    Setattr(n, "wrap:name", wname);
-
-    /* emit function call */
-    String *actioncode = emit_action(n);
-
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$input", Swig_cresult_name());
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$target", "return_value");
-      Replaceall(tm, "$result", "return_value");
-      Replaceall(tm, "$owner", newobject ? "1" : "0");
-      Printf(f->code, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-    }
-    emit_return_variable(n, d, f);
-
-    if (outarg) {
-      Printv(f->code, outarg, NIL);
-    }
-
-    if (cleanup) {
-      Printv(f->code, cleanup, NIL);
-    }
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Printf(f->code, "%s\n", tm);
-	Delete(tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Printf(f->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    Printf(f->code, "thrown:\n");
-    Printf(f->code, "return;\n");
-
-    /* Error handling code */
-    Printf(f->code, "fail:\n");
-    Printv(f->code, cleanup, NIL);
-    Append(f->code, "SWIG_FAIL(TSRMLS_C);\n");
-
-    Printf(f->code, "}\n");
-
-    Replaceall(f->code, "$cleanup", cleanup);
-    Replaceall(f->code, "$symname", iname);
-
-    Wrapper_print(f, s_wrappers);
-    DelWrapper(f);
-    f = NULL;
-
-    if (overloaded && !Getattr(n, "sym:nextSibling")) {
-      dispatchFunction(n);
-    }
-
-    Delete(wname);
-    wname = NULL;
-
-    if (!shadow) {
-      return SWIG_OK;
-    }
-
-    // Handle getters and setters.
-    if (wrapperType == membervar) {
-      const char *p = Char(iname);
-      if (strlen(p) > 4) {
-	p += strlen(p) - 4;
-	String *varname = Getattr(n, "membervariableHandler:sym:name");
-	if (strcmp(p, "_get") == 0) {
-	  Setattr(shadow_get_vars, varname, Getattr(n, "type"));
-	} else if (strcmp(p, "_set") == 0) {
-	  Setattr(shadow_set_vars, varname, iname);
-	}
-      }
-      return SWIG_OK;
-    }
-
-    // Only look at non-overloaded methods and the last entry in each overload
-    // chain (we check the last so that wrap:parms and wrap:name have been set
-    // for them all).
-    if (overloaded && Getattr(n, "sym:nextSibling") != 0)
-      return SWIG_OK;
-
-    if (!s_oowrappers)
-      s_oowrappers = NewStringEmpty();
-
-    if (newobject || wrapperType == memberfn || wrapperType == staticmemberfn || wrapperType == standard || wrapperType == staticmembervar) {
-      bool handle_as_overload = false;
-      String **arg_names;
-      String **arg_values;
-      // Method or static method or plain function.
-      const char *methodname = 0;
-      String *output = s_oowrappers;
-      if (constructor) {
-	class_has_ctor = true;
-	// Skip the Foo:: prefix.
-	char *ptr = strrchr(GetChar(Swig_methodclass(n), "sym:name"), ':');
-	if (ptr) {
-	  ptr++;
-	} else {
-	  ptr = GetChar(Swig_methodclass(n), "sym:name");
-	}
-	if (strcmp(ptr, GetChar(n, "constructorHandler:sym:name")) == 0) {
-	  methodname = "__construct";
-	} else {
-	  // The class has multiple constructors and this one is
-	  // renamed, so this will be a static factory function
-	  methodname = GetChar(n, "constructorHandler:sym:name");
-	}
-      } else if (wrapperType == memberfn) {
-	methodname = Char(Getattr(n, "memberfunctionHandler:sym:name"));
-      } else if (wrapperType == staticmemberfn) {
-	methodname = Char(Getattr(n, "staticmemberfunctionHandler:sym:name"));
-      } else if (wrapperType == staticmembervar) {
-	// Static member variable, wrapped as a function due to PHP limitations.
-	methodname = Char(Getattr(n, "staticmembervariableHandler:sym:name"));
-      } else {			// wrapperType == standard
-	methodname = Char(iname);
-	if (!s_fakeoowrappers)
-	  s_fakeoowrappers = NewStringEmpty();
-	output = s_fakeoowrappers;
-      }
-
-      bool really_overloaded = overloaded ? true : false;
-      int min_num_of_arguments = emit_num_required(l);
-      int max_num_of_arguments = emit_num_arguments(l);
-
-      Hash *ret_types = NewHash();
-      Setattr(ret_types, d, d);
-
-      bool non_void_return = (Cmp(d, "void") != 0);
-
-      if (overloaded) {
-	// Look at all the overloaded versions of this method in turn to
-	// decide if it's really an overloaded method, or just one where some
-	// parameters have default values.
-	Node *o = Getattr(n, "sym:overloaded");
-	while (o) {
-	  if (o == n) {
-	    o = Getattr(o, "sym:nextSibling");
-	    continue;
-	  }
-
-	  SwigType *d2 = Getattr(o, "type");
-	  if (!d2) {
-	    assert(constructor);
-	  } else if (!Getattr(ret_types, d2)) {
-	    Setattr(ret_types, d2, d2);
-	    non_void_return = non_void_return || (Cmp(d2, "void") != 0);
-	  }
-
-	  ParmList *l2 = Getattr(o, "wrap:parms");
-	  int num_arguments = emit_num_arguments(l2);
-	  int num_required = emit_num_required(l2);
-	  if (num_required < min_num_of_arguments)
-	    min_num_of_arguments = num_required;
-
-	  if (num_arguments > max_num_of_arguments) {
-	    max_num_of_arguments = num_arguments;
-	  }
-	  o = Getattr(o, "sym:nextSibling");
-	}
-
-	o = Getattr(n, "sym:overloaded");
-	while (o) {
-	  if (o == n) {
-	    o = Getattr(o, "sym:nextSibling");
-	    continue;
-	  }
-
-	  ParmList *l2 = Getattr(o, "wrap:parms");
-	  Parm *p = l, *p2 = l2;
-	  if (wrapperType == memberfn) {
-	    p = nextSibling(p);
-	    p2 = nextSibling(p2);
-	  }
-	  while (p && p2) {
-	    if (Cmp(Getattr(p, "type"), Getattr(p2, "type")) != 0)
-	      break;
-	    if (Cmp(Getattr(p, "name"), Getattr(p2, "name")) != 0)
-	      break;
-	    String *value = Getattr(p, "value");
-	    String *value2 = Getattr(p2, "value");
-	    if (value && !value2)
-	      break;
-	    if (!value && value2)
-	      break;
-	    if (value) {
-	      if (Cmp(value, value2) != 0)
-		break;
-	    }
-	    p = nextSibling(p);
-	    p2 = nextSibling(p2);
-	  }
-	  if (p && p2)
-	    break;
-	  // One parameter list is a prefix of the other, so check that all
-	  // remaining parameters of the longer list are optional.
-	  if (p2)
-	    p = p2;
-	  while (p && Getattr(p, "value"))
-	    p = nextSibling(p);
-	  if (p)
-	    break;
-	  o = Getattr(o, "sym:nextSibling");
-	}
-	if (!o) {
-	  // This "overloaded method" is really just one with default args.
-	  really_overloaded = false;
-	}
-      }
-
-      if (wrapperType == memberfn) {
-	// Allow for the "this" pointer.
-	--min_num_of_arguments;
-	--max_num_of_arguments;
-      }
-
-      arg_names = (String **) malloc(max_num_of_arguments * sizeof(String *));
-      if (!arg_names) {
-	/* FIXME: How should this be handled?  The rest of SWIG just seems
-	 * to not bother checking for malloc failing! */
-	fprintf(stderr, "Malloc failed!\n");
-	exit(1);
-      }
-      for (i = 0; i < max_num_of_arguments; ++i) {
-	arg_names[i] = NULL;
-      }
-
-      arg_values = (String **) malloc(max_num_of_arguments * sizeof(String *));
-      if (!arg_values) {
-	/* FIXME: How should this be handled?  The rest of SWIG just seems
-	 * to not bother checking for malloc failing! */
-	fprintf(stderr, "Malloc failed!\n");
-	exit(1);
-      }
-      for (i = 0; i < max_num_of_arguments; ++i) {
-	arg_values[i] = NULL;
-      }
-
-      Node *o;
-      if (overloaded) {
-	o = Getattr(n, "sym:overloaded");
-      } else {
-	o = n;
-      }
-      while (o) {
-	int argno = 0;
-	Parm *p = Getattr(o, "wrap:parms");
-	if (wrapperType == memberfn)
-	  p = nextSibling(p);
-	while (p) {
-	  if (GetInt(p, "tmap:in:numinputs") == 0) {
-	    p = nextSibling(p);
-	    continue;
-	  }
-	  assert(0 <= argno && argno < max_num_of_arguments);
-	  String *&pname = arg_names[argno];
-	  const char *pname_cstr = GetChar(p, "name");
-	  // Just get rid of the C++ namespace part for now.
-	  const char *ptr = NULL;
-	  if (pname_cstr && (ptr = strrchr(pname_cstr, ':'))) {
-	    pname_cstr = ptr + 1;
-	  }
-	  if (!pname_cstr) {
-	    // Unnamed parameter, e.g. int foo(int);
-	  } else if (!pname) {
-	    pname = NewString(pname_cstr);
-	  } else {
-	    size_t len = strlen(pname_cstr);
-	    size_t spc = 0;
-	    size_t len_pname = strlen(Char(pname));
-	    while (spc + len <= len_pname) {
-	      if (strncmp(pname_cstr, Char(pname) + spc, len) == 0) {
-		char ch = ((char *) Char(pname))[spc + len];
-		if (ch == '\0' || ch == ' ') {
-		  // Already have this pname_cstr.
-		  pname_cstr = NULL;
-		  break;
-		}
-	      }
-	      char *p = strchr(Char(pname) + spc, ' ');
-	      if (!p)
-		break;
-	      spc = (p + 4) - Char(pname);
-	    }
-	    if (pname_cstr) {
-	      Printf(pname, " or_%s", pname_cstr);
-	    }
-	  }
-	  String *value = NewString(Getattr(p, "value"));
-	  if (Len(value)) {
-	    /* Check that value is a valid constant in PHP (and adjust it if
-	     * necessary, or replace it with "?" if it's just not valid). */
-	    SwigType *type = Getattr(p, "type");
-	    switch (SwigType_type(type)) {
-	      case T_BOOL: {
-		if (Strcmp(value, "true") == 0 || Strcmp(value, "false") == 0)
-		  break;
-		char *p;
-		errno = 0;
-		long n = strtol(Char(value), &p, 0);
-	        Clear(value);
-		if (errno || *p) {
-		  Append(value, "?");
-		} else if (n) {
-		  Append(value, "true");
-		} else {
-		  Append(value, "false");
-		}
-		break;
-	      }
-	      case T_CHAR:
-	      case T_SCHAR:
-	      case T_SHORT:
-	      case T_INT:
-	      case T_LONG:
-	      case T_LONGLONG: {
-		char *p;
-		errno = 0;
-		long n = strtol(Char(value), &p, 0);
-		(void) n;
-		if (errno || *p) {
-		  Clear(value);
-		  Append(value, "?");
-		}
-		break;
-	      }
-	      case T_UCHAR:
-	      case T_USHORT:
-	      case T_UINT:
-	      case T_ULONG:
-	      case T_ULONGLONG: {
-		char *p;
-		errno = 0;
-		unsigned int n = strtoul(Char(value), &p, 0);
-		(void) n;
-		if (errno || *p) {
-		  Clear(value);
-		  Append(value, "?");
-		}
-		break;
-	      }
-	      case T_FLOAT:
-	      case T_DOUBLE:
-	      case T_LONGDOUBLE: {
-		char *p;
-		errno = 0;
-		/* FIXME: strtod is locale dependent... */
-		double val = strtod(Char(value), &p);
-		if (errno || *p) {
-		  Clear(value);
-		  Append(value, "?");
-		} else if (strchr(Char(value), '.') == 0) {
-		  // Ensure value is a double constant, not an integer one.
-		  Append(value, ".0");
-		  double val2 = strtod(Char(value), &p);
-		  if (errno || *p || val != val2) {
-		    Clear(value);
-		    Append(value, "?");
-		  }
-		}
-		break;
-	      }
-	      case T_STRING:
-		if (Len(value) < 2) {
-		  // How can a string (including "" be less than 2 characters?)
-		  Clear(value);
-		  Append(value, "?");
-		} else {
-		  const char *v = Char(value);
-		  if (v[0] != '"' || v[Len(value) - 1] != '"') {
-		    Clear(value);
-		    Append(value, "?");
-		  }
-		  // Strings containing "$" require special handling, but we do
-		  // that later.
-		}
-		break;
-	      case T_VOID:
-		assert(false);
-		break;
-	      case T_POINTER: {
-		const char *v = Char(value);
-		if (v[0] == '(') {
-		  // Handle "(void*)0", "(TYPE*)0", "(char*)NULL", etc.
-		  v += strcspn(v + 1, "*()") + 1;
-		  if (*v == '*') {
-		    do {
-		      v++;
-		      v += strspn(v, " \t");
-		    } while (*v == '*');
-		    if (*v++ == ')') {
-		      v += strspn(v, " \t");
-		      String * old = value;
-		      value = NewString(v);
-		      Delete(old);
-		    }
-		  }
-		}
-		if (Strcmp(value, "NULL") == 0 ||
-		    Strcmp(value, "nullptr") == 0 ||
-		    Strcmp(value, "0") == 0 ||
-		    Strcmp(value, "0L") == 0) {
-		  Clear(value);
-		  Append(value, "null");
-		} else {
-		  Clear(value);
-		  Append(value, "?");
-		}
-		break;
-	      }
-	      default:
-		/* Safe default */
-		Clear(value);
-		Append(value, "?");
-		break;
-	    }
-
-	    if (!arg_values[argno]) {
-	      arg_values[argno] = value;
-	      value = NULL;
-	    } else if (Cmp(arg_values[argno], value) != 0) {
-	      // If a parameter has two different default values in
-	      // different overloaded forms of the function, we can't
-	      // set its default in PHP.  Flag this by setting its
-	      // default to `?'.
-	      Delete(arg_values[argno]);
-	      arg_values[argno] = NewString("?");
-	    }
-	  } else if (arg_values[argno]) {
-	    // This argument already has a default value in another overloaded
-	    // form, but doesn't in this form.  So don't try to do anything
-	    // clever, just let the C wrappers resolve the overload and set the
-	    // default values.
-	    //
-	    // This handling is safe, but I'm wondering if it may be overly
-	    // conservative (FIXME) in some cases.  It seems it's only bad when
-	    // there's an overloaded form with the appropriate number of
-	    // parameters which doesn't want the default value, but I need to
-	    // think about this more.
-	    Delete(arg_values[argno]);
-	    arg_values[argno] = NewString("?");
-	  }
-	  Delete(value);
-	  p = nextSibling(p);
-	  ++argno;
-	}
-	if (!really_overloaded)
-	  break;
-	o = Getattr(o, "sym:nextSibling");
-      }
-
-      /* Clean up any parameters which haven't yet got names, or whose
-       * names clash. */
-      Hash *seen = NewHash();
-      /* We need $this to refer to the current class, so can't allow it
-       * to be used as a parameter. */
-      Setattr(seen, "this", seen);
-      /* We use $r to store the return value, so disallow that as a parameter
-       * name in case the user uses the "call-time pass-by-reference" feature
-       * (it's deprecated and off by default in PHP5, but we want to be
-       * maximally portable).  Similarly we use $c for the classname or new
-       * stdClass object.
-       */
-      Setattr(seen, "r", seen);
-      Setattr(seen, "c", seen);
-
-      for (int argno = 0; argno < max_num_of_arguments; ++argno) {
-	String *&pname = arg_names[argno];
-	if (pname) {
-	  Replaceall(pname, " ", "_");
-	} else {
-	  /* We get here if the SWIG .i file has "int foo(int);" */
-	  pname = NewStringEmpty();
-	  Printf(pname, "arg%d", argno + 1);
-	}
-	// Check if we've already used this parameter name.
-	while (Getattr(seen, pname)) {
-	  // Append "_" to clashing names until they stop clashing...
-	  Printf(pname, "_");
-	}
-	Setattr(seen, Char(pname), seen);
-
-	if (arg_values[argno] && Cmp(arg_values[argno], "?") == 0) {
-	  handle_as_overload = true;
-	}
-      }
-      Delete(seen);
-      seen = NULL;
-
-      String *invoke = NewStringEmpty();
-      String *prepare = NewStringEmpty();
-      String *args = NewStringEmpty();
-
-      if (!handle_as_overload && !(really_overloaded && max_num_of_arguments > min_num_of_arguments)) {
-	Printf(invoke, "%s(", iname);
-	if (wrapperType == memberfn) {
-	  Printf(invoke, "$this->%s", SWIG_PTR);
-	}
-	for (int i = 0; i < max_num_of_arguments; ++i) {
-	  if (i)
-	    Printf(args, ",");
-	  if (i || wrapperType == memberfn)
-	    Printf(invoke, ",");
-	  String *value = arg_values[i];
-	  if (value) {
-	    const char *v = Char(value);
-	    if (v[0] == '"') {
-	      /* In a PHP double quoted string, $ needs to be escaped as \$. */
-	      Replaceall(value, "$", "\\$");
-	    }
-	    Printf(args, "$%s=%s", arg_names[i], value);
-	  } else {
-	    Printf(args, "$%s", arg_names[i]);
-	  }
-	  Printf(invoke, "$%s", arg_names[i]);
-	}
-	Printf(invoke, ")");
-      } else {
-	int i;
-	for (i = 0; i < min_num_of_arguments; ++i) {
-	  if (i)
-	    Printf(args, ",");
-	  Printf(args, "$%s", arg_names[i]);
-	}
-	String *invoke_args = NewStringEmpty();
-	if (wrapperType == memberfn) {
-	  Printf(invoke_args, "$this->%s", SWIG_PTR);
-	  if (min_num_of_arguments > 0)
-	    Printf(invoke_args, ",");
-	}
-	Printf(invoke_args, "%s", args);
-	bool had_a_case = false;
-	int last_handled_i = i - 1;
-	for (; i < max_num_of_arguments; ++i) {
-	  if (i)
-	    Printf(args, ",");
-	  const char *value = Char(arg_values[i]);
-	  // FIXME: (really_overloaded && handle_as_overload) is perhaps a
-	  // little conservative, but it doesn't hit any cases that it
-	  // shouldn't for Xapian at least (and we need it to handle
-	  // "Enquire::get_mset()" correctly).
-	  bool non_php_default = ((really_overloaded && handle_as_overload) ||
-				  !value || strcmp(value, "?") == 0);
-	  if (non_php_default)
-	    value = "null";
-	  Printf(args, "$%s=%s", arg_names[i], value);
-	  if (non_php_default) {
-	    if (!had_a_case) {
-	      Printf(prepare, "\t\tswitch (func_num_args()) {\n");
-	      had_a_case = true;
-	    }
-	    Printf(prepare, "\t\t");
-	    while (last_handled_i < i) {
-	      Printf(prepare, "case %d: ", ++last_handled_i);
-	    }
-	    if (non_void_return) {
-	      if ((!directorsEnabled() || !Swig_directorclass(n)) && !newobject) {
-		Append(prepare, "$r=");
-	      } else {
-		Printf(prepare, "$this->%s=", SWIG_PTR);
-	      }
-	    }
-	    if (!directorsEnabled() || !Swig_directorclass(n) || !newobject) {
-	      Printf(prepare, "%s(%s); break;\n", iname, invoke_args);
-	    } else if (!i) {
-	      Printf(prepare, "%s($_this%s); break;\n", iname, invoke_args);
-	    } else {
-	      Printf(prepare, "%s($_this, %s); break;\n", iname, invoke_args);
-	    }
-	  }
-	  if (i || wrapperType == memberfn)
-	    Printf(invoke_args, ",");
-	  Printf(invoke_args, "$%s", arg_names[i]);
-	}
-	Printf(prepare, "\t\t");
-	if (had_a_case)
-	  Printf(prepare, "default: ");
-	if (non_void_return) {
-	  if ((!directorsEnabled() || !Swig_directorclass(n)) && !newobject) {
-	    Append(prepare, "$r=");
-	  } else {
-	    Printf(prepare, "$this->%s=", SWIG_PTR);
-	  }
-	}
-
-	if (!directorsEnabled() || !Swig_directorclass(n) || !newobject) {
-	  Printf(prepare, "%s(%s);\n", iname, invoke_args);
-	} else {
-	  Printf(prepare, "%s($_this, %s);\n", iname, invoke_args);
-	}
-	if (had_a_case)
-	  Printf(prepare, "\t\t}\n");
-	Delete(invoke_args);
-	Printf(invoke, "$r");
-      }
-
-      Printf(output, "\n");
-      // If it's a member function or a class constructor...
-      if (wrapperType == memberfn || (constructor && current_class)) {
-	String *acc = NewString(Getattr(n, "access"));
-	// If a base has the same method with public access, then PHP
-	// requires to have it here as public as well
-	Node *bases = Getattr(Swig_methodclass(n), "bases");
-	if (bases && Strcmp(acc, "public") != 0) {
-	  String *warnmsg = 0;
-	  int haspublicbase = 0;
-	  Iterator i = First(bases);
-	  while (i.item) {
-	    Node *j = firstChild(i.item);
-	    while (j) {
-	      String *jname = Getattr(j, "name");
-	      if (!jname || Strcmp(jname, Getattr(n, "name")) != 0) {
-		j = nextSibling(j);
-		continue;
-	      }
-	      if (Strcmp(nodeType(j), "cdecl") == 0) {
-		if (!Getattr(j, "access") || checkAttribute(j, "access", "public")) {
-		  haspublicbase = 1;
-		}
-	      } else if (Strcmp(nodeType(j), "using") == 0 && firstChild(j) && Strcmp(nodeType(firstChild(j)), "cdecl") == 0) {
-		if (!Getattr(firstChild(j), "access") || checkAttribute(firstChild(j), "access", "public")) {
-		  haspublicbase = 1;
-		}
-	      }
-	      if (haspublicbase) {
-		  warnmsg = NewStringf("Modifying the access of '%s::%s' to public, as the base '%s' has it as public as well.\n", Getattr(current_class, "classtype"), Getattr(n, "name"), Getattr(i.item, "classtype"));
-		  break;
-	      }
-	      j = nextSibling(j);
-	    }
-	    i = Next(i);
-	    if (haspublicbase) {
-	      break;
-	    }
-	  }
-	  if (Getattr(n, "access") && haspublicbase) {
-	    Delete(acc);
-	    acc = NewStringEmpty(); // implicitly public
-	    Swig_warning(WARN_PHP_PUBLIC_BASE, input_file, line_number, Char(warnmsg));
-	    Delete(warnmsg);
-	  }
-	}
-
-	if (Cmp(acc, "public") == 0) {
-	  // The default visibility for methods is public, so don't specify
-	  // that explicitly to keep the wrapper size down.
-	  Delete(acc);
-	  acc = NewStringEmpty();
-	} else if (Cmp(acc, "") != 0) {
-	  Append(acc, " ");
-	}
-
-	if (constructor) {
-	  const char * arg0;
-	  if (max_num_of_arguments > 0) {
-	    arg0 = Char(arg_names[0]);
-	  } else {
-	    arg0 = "res";
-	    Delete(args);
-	    args = NewString("$res=null");
-	  }
-	  String *mangled_type = SwigType_manglestr(Getattr(n, "type"));
-	  Printf(output, "\t%sfunction %s(%s) {\n", acc, methodname, args);
-	  Printf(output, "\t\tif (is_resource($%s) && get_resource_type($%s) === '%s') {\n", arg0, arg0, mangled_type);
-	  Printf(output, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg0);
-	  Printf(output, "\t\t\treturn;\n");
-	  Printf(output, "\t\t}\n");
-	} else {
-	  Printf(output, "\t%sfunction %s(%s) {\n", acc, methodname, args);
-	}
-	Delete(acc);
-      } else if (wrapperType == staticmembervar) {
-	// We're called twice for a writable static member variable - first
-	// with "foo_set" and then with "foo_get" - so generate half the
-	// wrapper function each time.
-	//
-	// For a const static member, we only get called once.
-	static bool started = false;
-	if (!started) {
-	  Printf(output, "\tstatic function %s() {\n", methodname);
-	  if (max_num_of_arguments) {
-	    // Setter.
-	    Printf(output, "\t\tif (func_num_args()) {\n");
-	    Printf(output, "\t\t\t%s(func_get_arg(0));\n", iname);
-	    Printf(output, "\t\t\treturn;\n");
-	    Printf(output, "\t\t}\n");
-	    started = true;
-	    goto done;
-	  }
-	}
-	started = false;
-      } else {
-	Printf(output, "\tstatic function %s(%s) {\n", methodname, args);
-      }
-
-      if (!newobject)
-	Printf(output, "%s", prepare);
-      if (constructor) {
-	if (!directorsEnabled() || !Swig_directorclass(n)) {
-	  if (!Len(prepare)) {
-	    if (strcmp(methodname, "__construct") == 0) {
-	      Printf(output, "\t\t$this->%s=%s;\n", SWIG_PTR, invoke);
-	    } else {
-	      String *classname = Swig_class_name(current_class);
-	      Printf(output, "\t\treturn new %s%s(%s);\n", prefix, classname, invoke);
-	    }
-	  }
-	} else {
-	  Node *parent = Swig_methodclass(n);
-	  String *classname = Swig_class_name(parent);
-	  Printf(output, "\t\tif (get_class($this) === '%s%s') {\n", prefix, classname);
-	  Printf(output, "\t\t\t$_this = null;\n");
-	  Printf(output, "\t\t} else {\n");
-	  Printf(output, "\t\t\t$_this = $this;\n");
-	  Printf(output, "\t\t}\n");
-	  if (!Len(prepare)) {
-	    if (num_arguments > 1) {
-	      Printf(output, "\t\t$this->%s=%s($_this, %s);\n", SWIG_PTR, iname, args);
-	    } else {
-	      Printf(output, "\t\t$this->%s=%s($_this);\n", SWIG_PTR, iname);
-	    }
-	  }
-	}
-	Printf(output, "%s", prepare);
-      } else if (!non_void_return && !hasargout) {
-	if (Cmp(invoke, "$r") != 0)
-	  Printf(output, "\t\t%s;\n", invoke);
-      } else if (is_class(d)) {
-	if (Cmp(invoke, "$r") != 0)
-	  Printf(output, "\t\t$r=%s;\n", invoke);
-	if (Len(ret_types) == 1) {
-	  /* If d is abstract we can't create a new wrapper type d. */
-	  Node *d_class = classLookup(d);
-	  int is_abstract = 0;
-	  if (Getattr(d_class, "abstracts")) {
-	    is_abstract = 1;
-	  }
-	  if (newobject || !is_abstract) {
-	    Printf(output, "\t\tif (is_resource($r)) {\n");
-	    if (Getattr(classLookup(Getattr(n, "type")), "module")) {
-	      /*
-	       * _p_Foo -> Foo, _p_ns__Bar -> Bar
-	       * TODO: do this in a more elegant way
-	       */
-	      if (Len(prefix) == 0) {
-		Printf(output, "\t\t\t$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n");
-	      } else {
-		Printf(output, "\t\t\t$c='%s'.substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n", prefix);
-	      }
-	      Printf(output, "\t\t\tif (class_exists($c)) return new $c($r);\n");
-	      Printf(output, "\t\t\treturn new %s%s($r);\n", prefix, Getattr(classLookup(d), "sym:name"));
-	    } else {
-	      Printf(output, "\t\t\t$c = new stdClass();\n");
-	      Printf(output, "\t\t\t$c->" SWIG_PTR " = $r;\n");
-	      Printf(output, "\t\t\treturn $c;\n");
-	    }
-	    Printf(output, "\t\t}\n\t\treturn $r;\n");
-	  } else {
-	    Printf(output, "\t\t$this->%s = $r;\n", SWIG_PTR);
-	    Printf(output, "\t\treturn $this;\n");
-	  }
-	} else {
-	  Printf(output, "\t\tif (!is_resource($r)) return $r;\n");
-	  String *wrapobj = NULL;
-	  String *common = NULL;
-	  Iterator i = First(ret_types);
-	  while (i.item) {
-	    SwigType *ret_type = i.item;
-	    i = Next(i);
-	    String *mangled = NewString("_p");
-	    Printf(mangled, "%s", SwigType_manglestr(ret_type));
-	    Node *class_node = Getattr(zend_types, mangled);
-	    if (!class_node) {
-	      /* This is needed when we're returning a pointer to a type
-	       * rather than returning the type by value or reference. */
-	      Delete(mangled);
-	      mangled = NewString(SwigType_manglestr(ret_type));
-	      class_node = Getattr(zend_types, mangled);
-	      if (!class_node) {
-		// Return type isn't an object, so will be handled by the
-		// !is_resource() check before the switch.
-		continue;
-	      }
-	    }
-	    const char *classname = GetChar(class_node, "sym:name");
-	    if (!classname)
-	      classname = GetChar(class_node, "name");
-	    String * action = NewStringEmpty();
-	    if (classname)
-	      Printf(action, "return new %s%s($r);\n", prefix, classname);
-            else
-	      Printf(action, "return $r;\n");
-	    if (!wrapobj) {
-		wrapobj = NewString("\t\tswitch (get_resource_type($r)) {\n");
-		common = action;
-	    } else {
-		if (common && Cmp(common, action) != 0) {
-		    Delete(common);
-		    common = NULL;
-		}
-	    }
-	    Printf(wrapobj, "\t\t");
-	    if (i.item) {
-	      Printf(wrapobj, "case '%s': ", mangled);
-	    } else {
-	      Printf(wrapobj, "default: ");
-	    }
-	    Printv(wrapobj, action, NIL);
-	    if (action != common) Delete(action);
-	    Delete(mangled);
-	  }
-	  Printf(wrapobj, "\t\t}\n");
-	  if (common) {
-	      // All cases have the same action, so eliminate the switch
-	      // wrapper.
-	      Printf(output, "\t\t%s", common);
-	      Delete(common);
-	  } else {
-	      Printv(output, wrapobj, NIL);
-	  }
-	  Delete(wrapobj);
-	}
-      } else {
-	if (non_void_return) {
-	  Printf(output, "\t\treturn %s;\n", invoke);
-	} else if (Cmp(invoke, "$r") != 0) {
-	  Printf(output, "\t\t%s;\n", invoke);
-	}
-      }
-      Printf(output, "\t}\n");
-
-done:
-      Delete(prepare);
-      Delete(invoke);
-      free(arg_values);
-
-      Delete(args);
-      args = NULL;
-
-      for (int i = 0; i < max_num_of_arguments; ++i) {
-	Delete(arg_names[i]);
-      }
-      free(arg_names);
-      arg_names = NULL;
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * globalvariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int globalvariableHandler(Node *n) {
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    String *tm;
-
-    /* First do the wrappers such as name_set(), name_get()
-     * as provided by the baseclass's implementation of variableWrapper
-     */
-    if (Language::globalvariableHandler(n) == SWIG_NOWRAP) {
-      return SWIG_NOWRAP;
-    }
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    /* First link C variables to PHP */
-
-    tm = Swig_typemap_lookup("varinit", n, name, 0);
-    if (tm) {
-      Replaceall(tm, "$target", name);
-      Printf(s_vinit, "%s\n", tm);
-    } else {
-      Swig_error(input_file, line_number, "Unable to link with type %s\n", SwigType_str(t, 0));
-    }
-
-    /* Now generate PHP -> C sync blocks */
-    /*
-       tm = Swig_typemap_lookup("varin", n, name, 0);
-       if(tm) {
-       Replaceall(tm, "$symname", iname);
-       Printf(f_c->code, "%s\n", tm);
-       } else {
-       Swig_error(input_file, line_number, "Unable to link with type %s\n", SwigType_str(t, 0));
-       }
-     */
-    /* Now generate C -> PHP sync blocks */
-    /*
-       if(!GetFlag(n,"feature:immutable")) {
-
-       tm = Swig_typemap_lookup("varout", n, name, 0);
-       if(tm) {
-       Replaceall(tm, "$symname", iname);
-       Printf(f_php->code, "%s\n", tm);
-       } else {
-       Swig_error(input_file, line_number, "Unable to link with type %s\n", SwigType_str(t, 0));
-       }
-       }
-     */
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *name = GetChar(n, "name");
-    String *iname = GetChar(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    SwigType_remember(type);
-
-    if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      Printf(s_cinit, "%s\n", tm);
-    }
-
-    if (shadow) {
-      String *enumvalue = GetChar(n, "enumvalue");
-      String *set_to = iname;
-
-      if (!enumvalue) {
-	enumvalue = GetChar(n, "enumvalueex");
-      }
-
-      if (enumvalue && *Char(enumvalue)) {
-	// Check for a simple constant expression which is valid in PHP.
-	// If we find one, initialise the const member with it; otherwise
-	// we initialise it using the C/C++ wrapped constant.
-	const char *p;
-	for (p = Char(enumvalue); *p; ++p) {
-	  if (!isdigit((unsigned char)*p) && !strchr(" +-", *p)) {
-	    // FIXME: enhance to handle `<previous_enum> + 1' which is what
-	    // we get for enums that don't have an explicit value set.
-	    break;
-	  }
-	}
-	if (!*p)
-	  set_to = enumvalue;
-      }
-
-      if (wrapping_member_constant) {
-	if (!s_oowrappers)
-	  s_oowrappers = NewStringEmpty();
-	Printf(s_oowrappers, "\n\tconst %s = %s;\n", wrapping_member_constant, set_to);
-      } else {
-	if (!s_fakeoowrappers)
-	  s_fakeoowrappers = NewStringEmpty();
-	Printf(s_fakeoowrappers, "\n\tconst %s = %s;\n", iname, set_to);
-      }
-    }
-
-    return SWIG_OK;
-  }
-
-  /*
-   * PHP5::pragma()
-   *
-   * Pragma directive.
-   *
-   * %pragma(php) code="String"         # Includes a string in the .php file
-   * %pragma(php) include="file.php"    # Includes a file in the .php file
-   */
-
-  virtual int pragmaDirective(Node *n) {
-    if (!ImportMode) {
-      String *lang = Getattr(n, "lang");
-      String *type = Getattr(n, "name");
-      String *value = Getattr(n, "value");
-
-      if (Strcmp(lang, "php") == 0 || Strcmp(lang, "php4") == 0) {
-	if (Strcmp(type, "code") == 0) {
-	  if (value) {
-	    Printf(pragma_code, "%s\n", value);
-	  }
-	} else if (Strcmp(type, "include") == 0) {
-	  if (value) {
-	    Printf(pragma_incl, "include '%s';\n", value);
-	  }
-	} else if (Strcmp(type, "phpinfo") == 0) {
-	  if (value) {
-	    Printf(pragma_phpinfo, "%s\n", value);
-	  }
-	} else {
-	  Swig_warning(WARN_PHP_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", type);
-	}
-      }
-    }
-    return Language::pragmaDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classDeclaration(Node *n) {
-    if (!Getattr(n, "feature:onlychildren")) {
-      String *symname = Getattr(n, "sym:name");
-      Setattr(n, "php:proxy", symname);
-    }
-
-    return Language::classDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-    constructors = 0;
-    current_class = n;
-
-    if (shadow) {
-      char *rename = GetChar(n, "sym:name");
-
-      if (!addSymbol(rename, n))
-	return SWIG_ERROR;
-      shadow_classname = NewString(rename);
-
-      shadow_get_vars = NewHash();
-      shadow_set_vars = NewHash();
-
-      /* Deal with inheritance */
-      List *baselist = Getattr(n, "bases");
-      if (baselist) {
-	Iterator base = First(baselist);
-	while (base.item && GetFlag(base.item, "feature:ignore")) {
-	  base = Next(base);
-	}
-	base = Next(base);
-	if (base.item) {
-	  /* Warn about multiple inheritance for additional base class(es) */
-	  while (base.item) {
-	    if (GetFlag(base.item, "feature:ignore")) {
-	      base = Next(base);
-	      continue;
-	    }
-	    String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0);
-	    String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0);
-	    Swig_warning(WARN_PHP_MULTIPLE_INHERITANCE, input_file, line_number,
-			 "Warning for %s, base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname);
-	    base = Next(base);
-	  }
-	}
-      }
-    }
-
-    classnode = n;
-    Language::classHandler(n);
-    classnode = 0;
-
-    if (shadow) {
-      List *baselist = Getattr(n, "bases");
-      Iterator ki, base;
-
-      if (baselist) {
-	base = First(baselist);
-	while (base.item && GetFlag(base.item, "feature:ignore")) {
-	  base = Next(base);
-	}
-      } else {
-	base.item = NULL;
-      }
-
-      if (Getattr(n, "abstracts") && !GetFlag(n, "feature:notabstract")) {
-	Printf(s_phpclasses, "abstract ");
-      }
-
-      Printf(s_phpclasses, "class %s%s ", prefix, shadow_classname);
-      String *baseclass = NULL;
-      if (base.item && Getattr(base.item, "module")) {
-	baseclass = Getattr(base.item, "sym:name");
-	if (!baseclass)
-	  baseclass = Getattr(base.item, "name");
-	Printf(s_phpclasses, "extends %s%s ", prefix, baseclass);
-      } else if (GetFlag(n, "feature:exceptionclass")) {
-	Append(s_phpclasses, "extends Exception ");
-      }
-      {
-	Node *node = NewHash();
-	Setattr(node, "type", Getattr(n, "name"));
-	Setfile(node, Getfile(n));
-	Setline(node, Getline(n));
-	String * interfaces = Swig_typemap_lookup("phpinterfaces", node, "", 0);
-	if (interfaces) {
-	  Printf(s_phpclasses, "implements %s ", interfaces);
-	}
-	Delete(node);
-      }
-      Printf(s_phpclasses, "{\n\tpublic $%s=null;\n", SWIG_PTR);
-      if (!baseclass) {
-	// Only store this in the base class (NB !baseclass means we *are*
-	// a base class...)
-	Printf(s_phpclasses, "\tprotected $%s=array();\n", SWIG_DATA);
-      }
-
-      // Write property SET handlers
-      ki = First(shadow_set_vars);
-      if (ki.key) {
-	// This class has setters.
-	Printf(s_phpclasses, "\n\tfunction __set($var,$value) {\n");
-	// FIXME: tune this threshold...
-	if (Len(shadow_set_vars) <= 2) {
-	  // Not many setters, so avoid call_user_func.
-	  for (; ki.key; ki = Next(ki)) {
-	    DOH *key = ki.key;
-	    String *iname = ki.item;
-	    Printf(s_phpclasses, "\t\tif ($var === '%s') return %s($this->%s,$value);\n", key, iname, SWIG_PTR);
-	  }
-	} else {
-	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_set';\n", shadow_classname);
-	  Printf(s_phpclasses, "\t\tif (function_exists($func)) return call_user_func($func,$this->%s,$value);\n", SWIG_PTR);
-	}
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_alter_newobject($this->%s,$value);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\t%s%s::__set($var,$value);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\t$this->%s[$var] = $value;\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      } else {
-	Printf(s_phpclasses, "\n\tfunction __set($var,$value) {\n");
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_alter_newobject($this->%s,$value);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\t%s%s::__set($var,$value);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\t$this->%s[$var] = $value;\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      }
-
-      // Write property GET handlers
-      ki = First(shadow_get_vars);
-      if (ki.key) {
-	// This class has getters.
-	Printf(s_phpclasses, "\n\tfunction __get($var) {\n");
-	int non_class_getters = 0;
-	for (; ki.key; ki = Next(ki)) {
-	  DOH *key = ki.key;
-	  SwigType *d = ki.item;
-	  if (!is_class(d)) {
-	    ++non_class_getters;
-	    continue;
-	  }
-	  Printv(s_phpclasses, "\t\tif ($var === '", key, "') return new ", prefix, Getattr(classLookup(d), "sym:name"), "(", shadow_classname, "_", key, "_get($this->", SWIG_PTR, "));\n", NIL);
-	}
-	// FIXME: tune this threshold...
-	if (non_class_getters <= 2) {
-	  // Not many non-class getters, so avoid call_user_func.
-	  for (ki = First(shadow_get_vars); non_class_getters && ki.key;  ki = Next(ki)) {
-	    DOH *key = ki.key;
-	    SwigType *d = ki.item;
-	    if (is_class(d)) continue;
-	    Printv(s_phpclasses, "\t\tif ($var === '", key, "') return ", shadow_classname, "_", key, "_get($this->", SWIG_PTR, ");\n", NIL);
-	    --non_class_getters;
-	  }
-	} else {
-	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_get';\n", shadow_classname);
-	  Printf(s_phpclasses, "\t\tif (function_exists($func)) return call_user_func($func,$this->%s);\n", SWIG_PTR);
-	}
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_get_newobject($this->%s);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__get($var);\n", prefix, baseclass);
-	} else {
-	  // Reading an unknown property name gives null in PHP.
-	  Printf(s_phpclasses, "\t\treturn $this->%s[$var];\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-
-	/* Create __isset for PHP 5.1 and later; PHP 5.0 will just ignore it. */
-	/* __isset() should return true for read-only properties, so check for
-	 * *_get() not *_set(). */
-	Printf(s_phpclasses, "\n\tfunction __isset($var) {\n");
-	Printf(s_phpclasses, "\t\tif (function_exists('%s_'.$var.'_get')) return true;\n", shadow_classname);
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return true;\n");
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__isset($var);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\treturn array_key_exists($var, $this->%s);\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      } else {
-	Printf(s_phpclasses, "\n\tfunction __get($var) {\n");
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_get_newobject($this->%s);\n", module, SWIG_PTR);
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__get($var);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\treturn $this->%s[$var];\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-	Printf(s_phpclasses, "\n\tfunction __isset($var) {\n");
-	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return true;\n");
-	if (baseclass) {
-	  Printf(s_phpclasses, "\t\treturn %s%s::__isset($var);\n", prefix, baseclass);
-	} else {
-	  Printf(s_phpclasses, "\t\treturn array_key_exists($var, $this->%s);\n", SWIG_DATA);
-	}
-	Printf(s_phpclasses, "\t}\n");
-      }
-
-      if (!class_has_ctor) {
-	Printf(s_phpclasses, "\tfunction __construct($h) {\n");
-	Printf(s_phpclasses, "\t\t$this->%s=$h;\n", SWIG_PTR);
-	Printf(s_phpclasses, "\t}\n");
-      }
-
-      if (s_oowrappers) {
-	Printf(s_phpclasses, "%s", s_oowrappers);
-	Delete(s_oowrappers);
-	s_oowrappers = NULL;
-      }
-      class_has_ctor = false;
-
-      Printf(s_phpclasses, "}\n\n");
-
-      Delete(shadow_classname);
-      shadow_classname = NULL;
-
-      Delete(shadow_set_vars);
-      shadow_set_vars = NULL;
-      Delete(shadow_get_vars);
-      shadow_get_vars = NULL;
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    wrapperType = memberfn;
-    Language::memberfunctionHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    wrapperType = membervar;
-    Language::membervariableHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    wrapperType = staticmembervar;
-    Language::staticmembervariableHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    wrapperType = staticmemberfn;
-    Language::staticmemberfunctionHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  int abstractConstructorHandler(Node *) {
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-    constructors++;
-    if (Swig_directorclass(n)) {
-      String *name = GetChar(Swig_methodclass(n), "name");
-      String *ctype = GetChar(Swig_methodclass(n), "classtype");
-      String *sname = GetChar(Swig_methodclass(n), "sym:name");
-      String *args = NewStringEmpty();
-      ParmList *p = Getattr(n, "parms");
-      int i;
-
-      for (i = 0; p; p = nextSibling(p), i++) {
-	if (i) {
-	  Printf(args, ", ");
-	}
-	if (Strcmp(GetChar(p, "type"), SwigType_str(GetChar(p, "type"), 0))) {
-	  SwigType *t = Getattr(p, "type");
-	  Printf(args, "%s", SwigType_rcaststr(t, 0));
-	  if (SwigType_isreference(t)) {
-	    Append(args, "*");
-	  }
-	}
-	Printf(args, "arg%d", i+1);
-      }
-
-      /* director ctor code is specific for each class */
-      Delete(director_ctor_code);
-      director_ctor_code = NewStringEmpty();
-      director_prot_ctor_code = NewStringEmpty();
-      Printf(director_ctor_code, "if ( arg0->type == IS_NULL ) { /* not subclassed */\n");
-      Printf(director_prot_ctor_code, "if ( arg0->type == IS_NULL ) { /* not subclassed */\n");
-      Printf(director_ctor_code, "  %s = (%s *)new %s(%s);\n", Swig_cresult_name(), ctype, ctype, args);
-      Printf(director_prot_ctor_code, "  SWIG_PHP_Error(E_ERROR, \"accessing abstract class or protected constructor\");\n", name, name, args);
-      if (i) {
-	Insert(args, 0, ", ");
-      }
-      Printf(director_ctor_code, "} else {\n  %s = (%s *)new SwigDirector_%s(arg0 TSRMLS_CC%s);\n}\n", Swig_cresult_name(), ctype, sname, args);
-      Printf(director_prot_ctor_code, "} else {\n  %s = (%s *)new SwigDirector_%s(arg0 TSRMLS_CC%s);\n}\n", Swig_cresult_name(), ctype, sname, args);
-      Delete(args);
-
-      wrapperType = directorconstructor;
-    } else {
-      wrapperType = constructor;
-    }
-    Language::constructorHandler(n);
-    wrapperType = standard;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * CreateZendListDestructor()
-   * ------------------------------------------------------------ */
-  //virtual int destructorHandler(Node *n) {
-  //}
-  int CreateZendListDestructor(Node *n) {
-    String *name = GetChar(Swig_methodclass(n), "name");
-    String *iname = GetChar(n, "sym:name");
-    ParmList *l = Getattr(n, "parms");
-
-    String *destructorname = NewStringEmpty();
-    Printf(destructorname, "_%s", Swig_name_wrapper(iname));
-    Setattr(classnode, "destructor", destructorname);
-
-    Wrapper *f = NewWrapper();
-    Printf(f->def, "/* This function is designed to be called by the zend list destructors */\n");
-    Printf(f->def, "/* to typecast and do the actual destruction */\n");
-    Printf(f->def, "static void %s(zend_rsrc_list_entry *rsrc, const char *type_name TSRMLS_DC) {\n", destructorname);
-
-    Wrapper_add_localv(f, "value", "swig_object_wrapper *value=(swig_object_wrapper *) rsrc->ptr", NIL);
-    Wrapper_add_localv(f, "ptr", "void *ptr=value->ptr", NIL);
-    Wrapper_add_localv(f, "newobject", "int newobject=value->newobject", NIL);
-
-    emit_parameter_variables(l, f);
-    emit_attach_parmmaps(l, f);
-
-    // Get type of first arg, thing to be destructed
-    // Skip ignored arguments
-    Parm *p = l;
-    //while (Getattr(p,"tmap:ignore")) {p = Getattr(p,"tmap:ignore:next");}
-    while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-    SwigType *pt = Getattr(p, "type");
-
-    Printf(f->code, "  efree(value);\n");
-    Printf(f->code, "  if (! newobject) return; /* can't delete it! */\n");
-    Printf(f->code, "  arg1 = (%s)SWIG_ZTS_ConvertResourceData(ptr,type_name,SWIGTYPE%s TSRMLS_CC);\n", SwigType_lstr(pt, 0), SwigType_manglestr(pt));
-    Printf(f->code, "  if (! arg1) zend_error(E_ERROR, \"%s resource already free'd\");\n", Char(name));
-
-    Setattr(n, "wrap:name", destructorname);
-
-    String *actioncode = emit_action(n);
-    Append(f->code, actioncode);
-    Delete(actioncode);
-
-    Printf(f->code, "thrown:\n");
-    Append(f->code, "return;\n");
-    Append(f->code, "fail:\n");
-    Append(f->code, "SWIG_FAIL(TSRMLS_C);\n");
-    Printf(f->code, "}\n");
-
-    Wrapper_print(f, s_wrappers);
-    DelWrapper(f);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberconstantHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberconstantHandler(Node *n) {
-    wrapping_member_constant = Getattr(n, "sym:name");
-    Language::memberconstantHandler(n);
-    wrapping_member_constant = NULL;
-    return SWIG_OK;
-  }
-
-  int classDirectorInit(Node *n) {
-    String *declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "%s\n", declaration);
-    Printf(f_directors_h, "public:\n");
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  int classDirectorEnd(Node *n) {
-    Printf(f_directors_h, "};\n");
-    return Language::classDirectorEnd(n);
-  }
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewStringEmpty();
-    Printf(classname, "SwigDirector_%s", supername);
-
-    /* insert self parameter */
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("zval");
-    SwigType_add_pointer(type);
-    p = NewParm(type, NewString("self"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      // There should always be a "self" parameter first.
-      assert(ParmList_len(parms) > 0);
-
-      /* constructor */
-      {
-	Wrapper *w = NewWrapper();
-	String *call;
-	String *basetype = Getattr(parent, "classtype");
-
-	// We put TSRMLS_DC after the self parameter in order to cope with
-	// any default parameters.
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-	const char * p = Char(target);
-	const char * comma = strchr(p, ',');
-	int ins = comma ? (int)(comma - p) : Len(target) - 1;
-	Insert(target, ins, " TSRMLS_DC");
-
-	call = Swig_csuperclass_call(0, basetype, superparms);
-	Printf(w->def, "%s::%s: %s, Swig::Director(self TSRMLS_CC) {", classname, target, call);
-	Append(w->def, "}");
-	Delete(target);
-	Wrapper_print(w, f_directors);
-	Delete(call);
-	DelWrapper(w);
-      }
-
-      /* constructor header */
-      {
-	// We put TSRMLS_DC after the self parameter in order to cope with
-	// any default parameters.
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-	const char * p = Char(target);
-	const char * comma = strchr(p, ',');
-	int ins = comma ? (int)(comma - p) : Len(target) - 1;
-	Insert(target, ins, " TSRMLS_DC");
-
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-    return Language::classDirectorConstructor(n);
-  }
-
-  int classDirectorMethod(Node *n, Node *parent, String *super) {
-    int is_void = 0;
-    int is_pointer = 0;
-    String *decl = Getattr(n, "decl");
-    String *returntype = Getattr(n, "type");
-    String *name = Getattr(n, "name");
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *declaration = NewStringEmpty();
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *w = NewWrapper();
-    String *tm;
-    String *wrap_args = NewStringEmpty();
-    String *value = Getattr(n, "value");
-    String *storage = Getattr(n, "storage");
-    bool pure_virtual = false;
-    int status = SWIG_OK;
-    int idx;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-    if (Cmp(storage, "virtual") == 0) {
-      if (Cmp(value, "0") == 0) {
-	pure_virtual = true;
-      }
-    }
-
-    /* determine if the method returns a pointer */
-    is_pointer = SwigType_ispointer_return(decl);
-    is_void = (Cmp(returntype, "void") == 0 && !is_pointer);
-
-    /* virtual method definition */
-    String *target;
-    String *pclassname = NewStringf("SwigDirector_%s", classname);
-    String *qualified_name = NewStringf("%s::%s", pclassname, name);
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    /* header declaration */
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Get any exception classes in the throws typemap
-    ParmList *throw_parm_list = 0;
-
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      Parm *p;
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-	  String *str = SwigType_str(Getattr(p, "type"), 0);
-	  Append(w->def, str);
-	  Append(declaration, str);
-	  Delete(str);
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    Printf(w->code, "TSRMLS_FETCH_FROM_CTX(swig_zts_ctx);\n");
-
-    /* declare method return value 
-     * if the return value is a reference or const reference, a specialized typemap must
-     * handle it, including declaration of c_result ($result).
-     */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *cres = SwigType_lstr(returntype, "c_result");
-	Printf(w->code, "%s;\n", cres);
-	Delete(cres);
-      }
-    }
-
-    if (ignored_method) {
-      if (!pure_virtual) {
-	if (!is_void)
-	  Printf(w->code, "return ");
-	String *super_call = Swig_method_call(super, l);
-	Printf(w->code, "%s;\n", super_call);
-	Delete(super_call);
-      } else {
-	Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\" TSRMLS_CC);\n", SwigType_namestr(c_classname),
-	    SwigType_namestr(name));
-      }
-    } else {
-      /* attach typemaps to arguments (C/C++ -> PHP) */
-      String *parse_args = NewStringEmpty();
-
-      Swig_director_parms_fixup(l);
-
-      /* remove the wrapper 'w' since it was producing spurious temps */
-      Swig_typemap_attach_parms("in", l, 0);
-      Swig_typemap_attach_parms("directorin", l, 0);
-      Swig_typemap_attach_parms("directorargout", l, w);
-
-      Parm *p;
-      char source[256];
-
-      int outputs = 0;
-      if (!is_void)
-	outputs++;
-
-      /* build argument list and type conversion string */
-      idx = 0;
-      p = l;
-      while (p) {
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	if (Getattr(p, "tmap:directorargout") != 0)
-	  outputs++;
-
-	String *pname = Getattr(p, "name");
-	String *ptype = Getattr(p, "type");
-
-	if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-	  String *parse = Getattr(p, "tmap:directorin:parse");
-	  if (!parse) {
-	    sprintf(source, "obj%d", idx++);
-	    String *input = NewStringf("&%s", source);
-	    Setattr(p, "emit:directorinput", input);
-	    Replaceall(tm, "$input", input);
-	    Delete(input);
-	    Replaceall(tm, "$owner", "0");
-	    Printv(wrap_args, "zval ", source, ";\n", NIL);
-	    Printf(wrap_args, "args[%d] = &%s;\n", idx - 1, source);
-	    Printv(wrap_args, "INIT_ZVAL(", source, ");\n", NIL);
-
-	    Printv(wrap_args, tm, "\n", NIL);
-	    Putc('O', parse_args);
-	  } else {
-	    Append(parse_args, parse);
-	    Setattr(p, "emit:directorinput", pname);
-	    Replaceall(tm, "$input", pname);
-	    Replaceall(tm, "$owner", "0");
-	    if (Len(tm) == 0)
-	      Append(tm, pname);
-	  }
-	  p = Getattr(p, "tmap:directorin:next");
-	  continue;
-	} else if (Cmp(ptype, "void")) {
-	  Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-	      "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(ptype, 0),
-	      SwigType_namestr(c_classname), SwigType_namestr(name));
-	  status = SWIG_NOWRAP;
-	  break;
-	}
-	p = nextSibling(p);
-      }
-
-      /* exception handling */
-      bool error_used_in_typemap = false;
-      tm = Swig_typemap_lookup("director:except", n, Swig_cresult_name(), 0);
-      if (!tm) {
-	tm = Getattr(n, "feature:director:except");
-	if (tm)
-	  tm = Copy(tm);
-      }
-      if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
-	if (Replaceall(tm, "$error", "error")) {
-	  /* Only declare error if it is used by the typemap. */
-	  error_used_in_typemap = true;
-	  Append(w->code, "int error;\n");
-	}
-      } else {
-	Delete(tm);
-	tm = NULL;
-      }
-
-      if (!idx) {
-	Printf(w->code, "zval **args = NULL;\n");
-      } else {
-	Printf(w->code, "zval *args[%d];\n", idx);
-      }
-      Printf(w->code, "zval *%s, funcname;\n", Swig_cresult_name());
-      Append(w->code, "if (!swig_self) {\n");
-      Append(w->code, "  SWIG_PHP_Error(E_ERROR, \"this pointer is NULL\");");
-      Append(w->code, "}\n\n");
-      Printf(w->code, "MAKE_STD_ZVAL(%s);\n", Swig_cresult_name());
-      const char * funcname = GetChar(n, "sym:name");
-      Printf(w->code, "ZVAL_STRINGL(&funcname, (char *)\"%s\", %d, 0);\n", funcname, strlen(funcname));
-
-      /* wrap complex arguments to zvals */
-      Printv(w->code, wrap_args, NIL);
-
-      if (error_used_in_typemap) {
-	Append(w->code, "error = ");
-      }
-      Append(w->code, "call_user_function(EG(function_table), (zval**)&swig_self, &funcname,");
-      Printf(w->code, " %s, %d, args TSRMLS_CC);\n", Swig_cresult_name(), idx);
-
-      if (tm) {
-	Printv(w->code, Str(tm), "\n", NIL);
-	Delete(tm);
-      }
-
-      /* marshal return value from PHP to C/C++ type */
-
-      String *cleanup = NewStringEmpty();
-      String *outarg = NewStringEmpty();
-
-      idx = 0;
-
-      /* marshal return value */
-      if (!is_void) {
-	tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
-	if (tm != 0) {
-	  Replaceall(tm, "$input", Swig_cresult_name());
-	  char temp[24];
-	  sprintf(temp, "%d", idx);
-	  Replaceall(tm, "$argnum", temp);
-
-	  /* TODO check this */
-	  if (Getattr(n, "wrap:disown")) {
-	    Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	  } else {
-	    Replaceall(tm, "$disown", "0");
-	  }
-	  Replaceall(tm, "$result", "c_result");
-	  Printv(w->code, tm, "\n", NIL);
-	  Delete(tm);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-	      "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname),
-	      SwigType_namestr(name));
-	  status = SWIG_ERROR;
-	}
-      }
-
-      /* marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-	  Replaceall(tm, "$result", Swig_cresult_name());
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      Printf(w->code, "FREE_ZVAL(%s);\n", Swig_cresult_name());
-
-      Delete(parse_args);
-      Delete(cleanup);
-      Delete(outarg);
-    }
-
-    Append(w->code, "thrown:\n");
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *rettype = SwigType_str(returntype, 0);
-	if (!SwigType_isreference(returntype)) {
-	  Printf(w->code, "return (%s) c_result;\n", rettype);
-	} else {
-	  Printf(w->code, "return (%s) *c_result;\n", rettype);
-	}
-	Delete(rettype);
-      }
-    } else {
-      Append(w->code, "return;\n");
-    }
-
-    Append(w->code, "fail:\n");
-    Append(w->code, "SWIG_FAIL(TSRMLS_C);\n");
-    Append(w->code, "}\n");
-
-    // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewStringEmpty();
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK) {
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    /* clean up */
-    Delete(wrap_args);
-    Delete(pclassname);
-    DelWrapper(w);
-    return status;
-  }
-
-  int classDirectorDisown(Node *) {
-    return SWIG_OK;
-  }
-};				/* class PHP */
-
-static PHP5 *maininstance = 0;
-
-// We use this function to be able to write out zend_register_list_destructor_ex
-// lines for most things in the type table
-// NOTE: it's a function NOT A PHP5::METHOD
-extern "C" {
-static void typetrace(const SwigType *ty, String *mangled, String *clientdata) {
-  Node *class_node;
-  if (!zend_types) {
-    zend_types = NewHash();
-  }
-  // we want to know if the type which reduced to this has a constructor
-  if ((class_node = maininstance->classLookup(ty))) {
-    if (!Getattr(zend_types, mangled)) {
-      // OK it may have been set before by a different SwigType but it would
-      // have had the same underlying class node I think
-      // - it is certainly required not to have different originating class
-      // nodes for the same SwigType
-      Setattr(zend_types, mangled, class_node);
-    }
-  } else {			// a non-class pointer
-    Setattr(zend_types, mangled, NOTCLASS);
-  }
-  if (r_prevtracefunc)
-    (*r_prevtracefunc) (ty, mangled, (String *) clientdata);
-}
-}
-
-/* -----------------------------------------------------------------------------
- * new_swig_php5()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_php5() {
-  maininstance = new PHP5;
-  if (!r_prevtracefunc) {
-    r_prevtracefunc = SwigType_remember_trace(typetrace);
-  } else {
-    Printf(stderr, "php Typetrace vector already saved!\n");
-    assert(0);
-  }
-  return maininstance;
-}
-
-extern "C" Language *swig_php4(void) {
-  Printf(stderr, "*** -php4 is no longer supported.\n"
-		 "*** Either upgrade to PHP5 or use SWIG 1.3.36 or earlier.\n");
-  SWIG_exit(EXIT_FAILURE);
-  return NULL; // To avoid compiler warnings.
-}
-
-extern "C" Language *swig_php5(void) {
-  return new_swig_php5();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/pike.cxx b/dependencies2013/win32/swig/Source/Modules/pike.cxx
deleted file mode 100644
index b8ed4037..00000000
--- a/dependencies2013/win32/swig/Source/Modules/pike.cxx
+++ /dev/null
@@ -1,904 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * pike.cxx
- *
- * Pike language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-/*
- * Notes:
- *
- * - The current approach used for "out" typemaps is inconsistent with
- *   how "out" typemaps are handled by other language modules. Instead
- *   of converting the C/C++ type ($1) to a Pike object type (e.g. a
- *   struct svalue), we're just calling the appropriate push_XXX
- *   (e.g. push_int) to push the return value onto the stack.
- *
- * - Pike classes can't have static member functions or data, so we need
- *   to find some other appropriate mapping for C++ static member functions
- *   and data.
- *
- * - Pike doesn't seem to provide any default way to print the memory
- *   address, etc. for extension objects. Should we do something here?
- *
- */
-
-#include "swigmod.h"
-
-#include <ctype.h>		// for isalnum()
-
-static const char *usage = "\
-Pike Options (available with -pike)\n\
-     [no additional options]\n\
-\n";
-
-class PIKE:public Language {
-private:
-
-  File *f_begin;
-  File *f_runtime;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-  File *f_classInit;
-
-  String *PrefixPlusUnderscore;
-  int current;
-
-  // Wrap modes
-  enum {
-    NO_CPP,
-    MEMBER_FUNC,
-    CONSTRUCTOR,
-    DESTRUCTOR,
-    MEMBER_VAR,
-    CLASS_CONST,
-    STATIC_FUNC,
-    STATIC_VAR
-  };
-
-public:
-
-  /* ---------------------------------------------------------------------
-   * PIKE()
-   *
-   * Initialize member data
-   * --------------------------------------------------------------------- */
-
-   PIKE() {
-    f_begin = 0;
-    f_runtime = 0;
-    f_header = 0;
-    f_wrappers = 0;
-    f_init = 0;
-    f_classInit = 0;
-    PrefixPlusUnderscore = 0;
-    current = NO_CPP;
-  }
-
-  /* ---------------------------------------------------------------------
-   * main()
-   *
-   * Parse command line options and initializes variables.
-   * --------------------------------------------------------------------- */
-  
-   virtual void main(int argc, char *argv[]) {
-
-    /* Set location of SWIG library */
-    SWIG_library_directory("pike");
-
-    /* Look for certain command line options */
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage, stdout);
-	}
-      }
-    }
-
-    /* Add a symbol to the parser for conditional compilation */
-    Preprocessor_define("SWIGPIKE 1", 0);
-
-    /* Set language-specific configuration file */
-    SWIG_config_file("pike.swg");
-
-    /* Set typemap language */
-    SWIG_typemap_lang("pike");
-
-    /* Enable overloaded methods support */
-    allow_overloading();
-  }
-
-  /* ---------------------------------------------------------------------
-   * top()
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-    /* Get the module name */
-    String *module = Getattr(n, "name");
-
-    /* Get the output file name */
-    String *outfile = Getattr(n, "outfile");
-
-    /* Open the output file */
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_classInit = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("classInit", f_classInit);
-
-    /* Standard stuff for the SWIG runtime section */
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGPIKE\n#define SWIGPIKE\n#endif\n\n");
-
-    Printf(f_header, "#define SWIG_init    pike_module_init\n");
-    Printf(f_header, "#define SWIG_name    \"%s\"\n\n", module);
-
-    /* Change naming scheme for constructors and destructors */
-    Swig_name_register("construct", "%n%c_create");
-    Swig_name_register("destroy", "%n%c_destroy");
-
-    /* Current wrap type */
-    current = NO_CPP;
-
-    /* Emit code for children */
-    Language::top(n);
-
-    /* Close the initialization function */
-    Printf(f_init, "}\n");
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-    Dump(f_wrappers, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_classInit);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    /* Done */
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * validIdentifier()
-   * ------------------------------------------------------------ */
-
-  virtual int validIdentifier(String *s) {
-    char *c = Char(s);
-    const char *c0 = c;
-    const char *c1 = c0 + 1;
-    while (*c) {
-      if (*c == '`' && c == c0) {
-	c++;
-	continue;
-      }
-      if ((*c == '+' || *c == '-' || *c == '*' || *c == '/') && c == c1) {
-	c++;
-	continue;
-      }
-      if (!(isalnum(*c) || (*c == '_')))
-	return 0;
-      c++;
-    }
-    return 1;
-  }
-
-  /* ------------------------------------------------------------
-   * importDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int importDirective(Node *n) {
-    String *modname = Getattr(n, "module");
-    if (modname) {
-      Printf(f_init, "pike_require(\"%s\");\n", modname);
-    }
-    return Language::importDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * strip()
-   *
-   * For names that begin with the current class prefix plus an
-   * underscore (e.g. "Foo_enum_test"), return the base function
-   * name (i.e. "enum_test").
-   * ------------------------------------------------------------ */
-
-  String *strip(const DOHconst_String_or_char_ptr name) {
-    String *s = Copy(name);
-    if (Strncmp(name, PrefixPlusUnderscore, Len(PrefixPlusUnderscore)) != 0) {
-      return s;
-    }
-    Replaceall(s, PrefixPlusUnderscore, "");
-    return s;
-  }
-
-  /* ------------------------------------------------------------
-   * add_method()
-   * ------------------------------------------------------------ */
-
-  void add_method(const DOHconst_String_or_char_ptr name, const DOHconst_String_or_char_ptr function, const DOHconst_String_or_char_ptr description) {
-    String *rename = NULL;
-    switch (current) {
-    case NO_CPP:
-      rename = NewString(name);
-      Printf(f_init, "ADD_FUNCTION(\"%s\", %s, tFunc(%s), 0);\n", rename, function, description);
-      break;
-    case STATIC_FUNC:
-    case STATIC_VAR:
-      rename = NewString(name);
-      Printf(f_init, "ADD_FUNCTION(\"%s\", %s, tFunc(%s), 0);\n", rename, function, description);
-      break;
-    case CONSTRUCTOR:
-    case DESTRUCTOR:
-    case MEMBER_FUNC:
-    case MEMBER_VAR:
-      rename = strip(name);
-      Printf(f_classInit, "ADD_FUNCTION(\"%s\", %s, tFunc(%s), 0);\n", rename, function, description);
-      break;
-    case CLASS_CONST: // shouldn't have gotten here for CLASS_CONST nodes
-    default: // what is this?
-      assert(false);
-    }
-    Delete(rename);
-  }
-
-  /* ---------------------------------------------------------------------
-   * functionWrapper()
-   *
-   * Create a function declaration and register it with the interpreter.
-   * --------------------------------------------------------------------- */
-
-  virtual int functionWrapper(Node *n) {
-
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-
-    Parm *p;
-    String *tm;
-    int i;
-
-    String *overname = 0;
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n))
-	return SWIG_ERROR;
-    }
-
-    Wrapper *f = NewWrapper();
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-
-    /* Get number of required and total arguments */
-    int num_arguments = emit_num_arguments(l);
-    int varargs = emit_isvarargs(l);
-
-    /* Which input argument to start with? */
-    int start = (current == MEMBER_FUNC || current == MEMBER_VAR || current == DESTRUCTOR) ? 1 : 0;
-
-    /* Offset to skip over the attribute name */
-    // int offset = (current == MEMBER_VAR) ? 1 : 0;
-    int offset = 0;
-
-    String *wname = Swig_name_wrapper(iname);
-    if (overname) {
-      Append(wname, overname);
-    }
-    Setattr(n, "wrap:name", wname);
-
-    Printv(f->def, "static void ", wname, "(INT32 args) {", NIL);
-
-    /* Generate code for argument marshalling */
-    String *description = NewString("");
-    char source[64];
-    for (i = 0, p = l; i < num_arguments; i++) {
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-
-      if (i < start) {
-	String *lstr = SwigType_lstr(pt, 0);
-	Printf(f->code, "%s = (%s) THIS;\n", ln, lstr);
-	Delete(lstr);
-      } else {
-	/* Look for an input typemap */
-	sprintf(source, "Pike_sp[%d-args]", i - start + offset);
-	if ((tm = Getattr(p, "tmap:in"))) {
-	  Replaceall(tm, "$source", source);
-	  Replaceall(tm, "$target", ln);
-	  Replaceall(tm, "$input", source);
-	  Setattr(p, "emit:input", source);
-	  Printf(f->code, "%s\n", tm);
-	  String *pikedesc = Getattr(p, "tmap:in:pikedesc");
-	  if (pikedesc) {
-	    Printv(description, pikedesc, " ", NIL);
-	  }
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	} else {
-	  Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	  break;
-	}
-      }
-      p = nextSibling(p);
-    }
-
-    /* Check for trailing varargs */
-    if (varargs) {
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$input", "varargs");
-	Printv(f->code, tm, "\n", NIL);
-      }
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    String *cleanup = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Printv(cleanup, tm, "\n", NIL);
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    String *outarg = NewString("");
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$target", "resultobj");
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Emit the function call */
-    String *actioncode = emit_action(n);
-
-    /* Clear the return stack */
-    Printf(actioncode, "pop_n_elems(args);\n");
-
-    /* Return the function value */
-    if (current == CONSTRUCTOR) {
-      Printv(actioncode, "THIS = (void *) ", Swig_cresult_name(), ";\n", NIL);
-      Printv(description, ", tVoid", NIL);
-    } else if (current == DESTRUCTOR) {
-      Printv(description, ", tVoid", NIL);
-    } else {
-      Printv(description, ", ", NIL);
-      if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-        actioncode = 0;
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Replaceall(tm, "$target", "resultobj");
-	Replaceall(tm, "$result", "resultobj");
-	if (GetFlag(n, "feature:new")) {
-	  Replaceall(tm, "$owner", "1");
-	} else {
-	  Replaceall(tm, "$owner", "0");
-	}
-	String *pikedesc = Getattr(n, "tmap:out:pikedesc");
-	if (pikedesc) {
-	  Printv(description, pikedesc, NIL);
-	}
-	Printf(f->code, "%s\n", tm);
-      } else {
-	Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-      }
-    }
-    if (actioncode) {
-      Append(f->code, actioncode);
-      Delete(actioncode);
-    }
-    emit_return_variable(n, d, f);
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-    }
-
-    /* Close the function */
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", iname);
-    Replaceall(f->code, "$result", "resultobj");
-
-    /* Dump the function out */
-    Wrapper_print(f, f_wrappers);
-
-    /* Now register the function with the interpreter. */
-    if (!Getattr(n, "sym:overloaded")) {
-      add_method(iname, wname, description);
-    } else {
-      if (!Getattr(n, "sym:nextSibling")) {
-	dispatchFunction(n);
-      }
-    }
-
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(description);
-    Delete(wname);
-    DelWrapper(f);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * dispatchFunction()
-   *
-   * Emit overloading dispatch function
-   * ------------------------------------------------------------ */
-
-  void dispatchFunction(Node *n) {
-    /* Last node in overloaded chain */
-
-    int maxargs;
-    String *tmp = NewString("");
-    String *dispatch = Swig_overload_dispatch(n, "%s(args); return;", &maxargs);
-
-    /* Generate a dispatch wrapper for all overloaded functions */
-
-    Wrapper *f = NewWrapper();
-    String *symname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(symname);
-
-    Printf(f->def, "static void %s(INT32 args) {", wname);
-
-    Wrapper_add_local(f, "argc", "INT32 argc");
-    Printf(tmp, "struct svalue argv[%d]", maxargs);
-    Wrapper_add_local(f, "argv", tmp);
-    Wrapper_add_local(f, "ii", "INT32 ii");
-
-    Printf(f->code, "argc = args;\n");
-    Printf(f->code, "for (ii = 0; (ii < argc) && (ii < %d); ii++) {\n", maxargs);
-    Printf(f->code, "argv[ii] = Pike_sp[ii-args];\n");
-    Printf(f->code, "}\n");
-
-    Replaceall(dispatch, "$args", "self, args");
-    Printv(f->code, dispatch, "\n", NIL);
-    Printf(f->code, "Pike_error(\"No matching function for overloaded '%s'.\");\n", symname);
-    Printv(f->code, "}\n", NIL);
-
-    Wrapper_print(f, f_wrappers);
-
-    String *description = NewString("");
-    Printf(description, "tAny,");
-    if (current == CONSTRUCTOR || current == DESTRUCTOR) {
-      Printf(description, " tVoid");
-    } else {
-      String *pd = Getattr(n, "tmap:out:pikedesc");
-      if (pd)
-	Printf(description, " %s", pd);
-    }
-    add_method(symname, wname, description);
-    Delete(description);
-
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(tmp);
-    Delete(wname);
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-    return Language::variableWrapper(n);
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-
-    Swig_require("constantWrapper", n, "*sym:name", "type", "value", NIL);
-
-    String *symname = Getattr(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *value = Getattr(n, "value");
-    bool is_enum_item = (Cmp(nodeType(n), "enumitem") == 0);
-
-    if (SwigType_type(type) == T_MPOINTER) {
-      /* Special hook for member pointer */
-      String *wname = Swig_name_wrapper(symname);
-      Printf(f_header, "static %s = %s;\n", SwigType_str(type, wname), value);
-      value = wname;
-    } else if (SwigType_type(type) == T_CHAR && is_enum_item) {
-      type = NewSwigType(T_INT);
-      Setattr(n, "type", type);
-    }
-
-    /* Perform constant typemap substitution */
-    String *tm = Swig_typemap_lookup("constant", n, value, 0);
-    if (tm) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", symname);
-      Replaceall(tm, "$symname", symname);
-      Replaceall(tm, "$value", value);
-      Printf(f_init, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value %s = %s\n", SwigType_str(type, 0), value);
-    }
-
-    Swig_restore(n);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------ 
-   * nativeWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int nativeWrapper(Node *n) {
-    //   return Language::nativeWrapper(n);
-    String *name = Getattr(n, "sym:name");
-    String *wrapname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(wrapname, n))
-      return SWIG_ERROR;
-
-    add_method(name, wrapname, 0);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * enumDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumDeclaration(Node *n) {
-    return Language::enumDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * enumvalueDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    return Language::enumvalueDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classDeclaration(Node *n) {
-    return Language::classDeclaration(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-
-    String *symname = Getattr(n, "sym:name");
-    if (!addSymbol(symname, n))
-      return SWIG_ERROR;
-
-    PrefixPlusUnderscore = NewStringf("%s_", getClassPrefix());
-
-    Printf(f_classInit, "start_new_program();\n");
-
-    /* Handle inheritance */
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist) > 0) {
-      Iterator base = First(baselist);
-      while (base.item) {
-	String *basename = Getattr(base.item, "name");
-	SwigType *basetype = NewString(basename);
-	SwigType_add_pointer(basetype);
-	SwigType_remember(basetype);
-	String *basemangle = SwigType_manglestr(basetype);
-	Printf(f_classInit, "low_inherit((struct program *) SWIGTYPE%s->clientdata, 0, 0, 0, 0, 0);\n", basemangle);
-	Delete(basemangle);
-	Delete(basetype);
-	base = Next(base);
-      }
-    } else {
-      Printf(f_classInit, "ADD_STORAGE(swig_object_wrapper);\n");
-    }
-
-    Language::classHandler(n);
-
-    /* Accessors for member variables */
-    /*
-       List *membervariables = Getattr(n,"membervariables");
-       if (membervariables && Len(membervariables) > 0) {
-       membervariableAccessors(membervariables);
-       }
-     */
-
-    /* Done, close the class and dump its definition to the init function */
-    Printf(f_classInit, "add_program_constant(\"%s\", pr = end_program(), 0);\n", symname);
-    Dump(f_classInit, f_init);
-    Clear(f_classInit);
-
-    SwigType *tt = NewString(symname);
-    SwigType_add_pointer(tt);
-    SwigType_remember(tt);
-    String *tm = SwigType_manglestr(tt);
-    Printf(f_init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) pr);\n", tm);
-    Delete(tm);
-    Delete(tt);
-
-    Delete(PrefixPlusUnderscore);
-    PrefixPlusUnderscore = 0;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   *
-   * Method for adding C++ member function
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    current = MEMBER_FUNC;
-    Language::memberfunctionHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorHandler()
-   *
-   * Method for adding C++ member constructor
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-    current = CONSTRUCTOR;
-    Language::constructorHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * destructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int destructorHandler(Node *n) {
-    current = DESTRUCTOR;
-    Language::destructorHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableAccessors()
-   * ------------------------------------------------------------ */
-
-  void membervariableAccessors(List *membervariables) {
-    String *name;
-    Iterator i;
-    bool need_setter;
-    String *funcname;
-
-    /* If at least one of them is mutable, we need a setter */
-    need_setter = false;
-    i = First(membervariables);
-    while (i.item) {
-      if (!GetFlag(i.item, "feature:immutable")) {
-	need_setter = true;
-	break;
-      }
-      i = Next(i);
-    }
-
-    /* Create a function to set the values of the (mutable) variables */
-    if (need_setter) {
-      Wrapper *wrapper = NewWrapper();
-      String *setter = Swig_name_member(NSPACE_TODO, getClassPrefix(), "`->=");
-      String *wname = Swig_name_wrapper(setter);
-      Printv(wrapper->def, "static void ", wname, "(INT32 args) {", NIL);
-      Printf(wrapper->locals, "char *name = (char *) STR0(Pike_sp[0-args].u.string);\n");
-
-      i = First(membervariables);
-      while (i.item) {
-	if (!GetFlag(i.item, "feature:immutable")) {
-	  name = Getattr(i.item, "name");
-	  funcname = Swig_name_wrapper(Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, getClassPrefix(), name)));
-	  Printf(wrapper->code, "if (!strcmp(name, \"%s\")) {\n", name);
-	  Printf(wrapper->code, "%s(args);\n", funcname);
-	  Printf(wrapper->code, "return;\n");
-	  Printf(wrapper->code, "}\n");
-	  Delete(funcname);
-	}
-	i = Next(i);
-      }
-
-      /* Close the function */
-      Printf(wrapper->code, "pop_n_elems(args);\n");
-      Printf(wrapper->code, "}\n");
-
-      /* Dump wrapper code to the output file */
-      Wrapper_print(wrapper, f_wrappers);
-
-      /* Register it with Pike */
-      String *description = NewString("tStr tFloat, tVoid");
-      add_method("`->=", wname, description);
-      Delete(description);
-
-      /* Clean up */
-      Delete(wname);
-      Delete(setter);
-      DelWrapper(wrapper);
-    }
-
-    /* Create a function to get the values of the (mutable) variables */
-    Wrapper *wrapper = NewWrapper();
-    String *getter = Swig_name_member(NSPACE_TODO, getClassPrefix(), "`->");
-    String *wname = Swig_name_wrapper(getter);
-    Printv(wrapper->def, "static void ", wname, "(INT32 args) {", NIL);
-    Printf(wrapper->locals, "char *name = (char *) STR0(Pike_sp[0-args].u.string);\n");
-
-    i = First(membervariables);
-    while (i.item) {
-      name = Getattr(i.item, "name");
-      funcname = Swig_name_wrapper(Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, getClassPrefix(), name)));
-      Printf(wrapper->code, "if (!strcmp(name, \"%s\")) {\n", name);
-      Printf(wrapper->code, "%s(args);\n", funcname);
-      Printf(wrapper->code, "return;\n");
-      Printf(wrapper->code, "}\n");
-      Delete(funcname);
-      i = Next(i);
-    }
-
-    /* Close the function */
-    Printf(wrapper->code, "pop_n_elems(args);\n");
-    Printf(wrapper->code, "}\n");
-
-    /* Dump wrapper code to the output file */
-    Wrapper_print(wrapper, f_wrappers);
-
-    /* Register it with Pike */
-    String *description = NewString("tStr, tMix");
-    add_method("`->", wname, description);
-    Delete(description);
-
-    /* Clean up */
-    Delete(wname);
-    Delete(getter);
-    DelWrapper(wrapper);
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    List *membervariables = Getattr(getCurrentClass(), "membervariables");
-    if (!membervariables) {
-      membervariables = NewList();
-      Setattr(getCurrentClass(), "membervariables", membervariables);
-    }
-    Append(membervariables, n);
-    current = MEMBER_VAR;
-    Language::membervariableHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   *
-   * Wrap a static C++ function
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    current = STATIC_FUNC;
-    Language::staticmemberfunctionHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberconstantHandler()
-   *
-   * Create a C++ constant
-   * ------------------------------------------------------------ */
-
-  virtual int memberconstantHandler(Node *n) {
-    current = CLASS_CONST;
-    constantWrapper(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------
-   * staticmembervariableHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    current = STATIC_VAR;
-    Language::staticmembervariableHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-};
-
-/* -----------------------------------------------------------------------------
- * swig_pike()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_pike() {
-  return new PIKE();
-}
-extern "C" Language *swig_pike(void) {
-  return new_swig_pike();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/python.cxx b/dependencies2013/win32/swig/Source/Modules/python.cxx
deleted file mode 100644
index a6801fc4..00000000
--- a/dependencies2013/win32/swig/Source/Modules/python.cxx
+++ /dev/null
@@ -1,5786 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * python.cxx
- *
- * Python language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include <limits.h>
-#include "cparse.h"
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#define PYSHADOW_MEMBER  0x2
-#define WARN_PYTHON_MULTIPLE_INH 405
-
-static String *const_code = 0;
-static String *module = 0;
-static String *package = 0;
-static String *mainmodule = 0;
-static String *interface = 0;
-static String *global_name = 0;
-static int shadow = 1;
-static int use_kw = 0;
-static int director_method_index = 0;
-static int builtin = 0;
-
-static File *f_begin = 0;
-static File *f_runtime = 0;
-static File *f_runtime_h = 0;
-static File *f_header = 0;
-static File *f_wrappers = 0;
-static File *f_directors = 0;
-static File *f_directors_h = 0;
-static File *f_init = 0;
-static File *f_shadow_py = 0;
-static String *f_shadow = 0;
-static String *f_shadow_begin = 0;
-static Hash *f_shadow_imports = 0;
-static String *f_shadow_after_begin = 0;
-static String *f_shadow_stubs = 0;
-static Hash *builtin_getset = 0;
-static Hash *builtin_closures = 0;
-static Hash *class_members = 0;
-static File *f_builtins = 0;
-static String *builtin_tp_init = 0;
-static String *builtin_methods = 0;
-static String *builtin_default_unref = 0;
-static String *builtin_closures_code = 0;
-
-static String *methods;
-static String *class_name;
-static String *shadow_indent = 0;
-static int in_class = 0;
-static int classic = 0;
-static int modern = 0;
-static int new_repr = 1;
-static int no_header_file = 0;
-static int max_bases = 0;
-static int builtin_bases_needed = 0;
-
-static int py3 = 0;
-
-/* C++ Support + Shadow Classes */
-
-static int have_constructor;
-static int have_repr;
-static String *real_classname;
-
-/* Thread Support */
-static int threads = 0;
-static int nothreads = 0;
-static int classptr = 0;
-/* Other options */
-static int shadowimport = 1;
-static int buildnone = 0;
-static int nobuildnone = 0;
-static int safecstrings = 0;
-static int dirvtable = 0;
-static int proxydel = 1;
-static int fastunpack = 0;
-static int fastproxy = 0;
-static int fastquery = 0;
-static int fastinit = 0;
-static int olddefs = 0;
-static int modernargs = 0;
-static int aliasobj0 = 0;
-static int castmode = 0;
-static int extranative = 0;
-static int outputtuple = 0;
-static int nortti = 0;
-static int relativeimport = 0;
-
-/* flags for the make_autodoc function */
-enum autodoc_t {
-  AUTODOC_CLASS,
-  AUTODOC_CTOR,
-  AUTODOC_DTOR,
-  AUTODOC_STATICFUNC,
-  AUTODOC_FUNC,
-  AUTODOC_METHOD
-};
-
-
-static const char *usage1 = "\
-Python Options (available with -python)\n\
-     -aliasobj0      - Alias obj0 when using fastunpack, needed for some old typemaps \n\
-     -buildnone      - Use Py_BuildValue(" ") to obtain Py_None (default in Windows)\n\
-     -builtin        - Create new python built-in types, rather than proxy classes, for better performance\n\
-     -castmode       - Enable the casting mode, which allows implicit cast between types in python\n\
-     -classic        - Use classic classes only\n\
-     -classptr       - Generate shadow 'ClassPtr' as in older swig versions\n\
-     -cppcast        - Enable C++ casting operators (default) \n\
-     -dirvtable      - Generate a pseudo virtual table for directors for faster dispatch \n\
-     -extranative    - Return extra native C++ wraps for std containers when possible \n\
-     -fastinit       - Use fast init mechanism for classes (default)\n\
-     -fastunpack     - Use fast unpack mechanism to parse the argument functions \n\
-     -fastproxy      - Use fast proxy mechanism for member methods \n\
-     -fastquery      - Use fast query mechanism for types \n\
-     -globals <name> - Set <name> used to access C global variable [default: 'cvar']\n\
-     -interface <lib>- Set the lib name to <lib>\n\
-     -keyword        - Use keyword arguments\n\
-     -modern         - Use modern python features only, without compatibility code\n\
-     -modernargs     - Use \"modern\" args mechanism to pack/unpack the function arguments\n";
-static const char *usage2 = "\
-     -newrepr        - Use more informative version of __repr__ in proxy classes (default) \n\
-     -newvwm         - New value wrapper mode, use only when everything else fails \n\
-     -noaliasobj0    - Don't generate an obj0 alias when using fastunpack (default) \n\
-     -nobuildnone    - Access Py_None directly (default in non-Windows systems)\n\
-     -nocastmode     - Disable the casting mode (default)\n\
-     -nocppcast      - Disable C++ casting operators, useful for generating bugs\n\
-     -nodirvtable    - Don't use the virtual table feature, resolve the python method each time (default)\n\
-     -noexcept       - No automatic exception handling\n\
-     -noextranative  - Don't use extra native C++ wraps for std containers when possible (default) \n\
-     -nofastinit     - Use traditional init mechanism for classes \n\
-     -nofastunpack   - Use traditional UnpackTuple method to parse the argument functions (default) \n\
-     -nofastproxy    - Use traditional proxy mechanism for member methods (default) \n\
-     -nofastquery    - Use traditional query mechanism for types (default) \n\
-     -noh            - Don't generate the output header file\n\
-     -nomodern       - Don't use modern python features which are not backwards compatible \n\
-     -nomodernargs   - Use classic ParseTuple/CallFunction methods to pack/unpack the function arguments (default) \n";
-static const char *usage3 = "\
-     -noolddefs      - Don't emit the old method definitions even when using fastproxy (default) \n\
-     -nooutputtuple  - Use a PyList for appending output values (default) \n\
-     -noproxy        - Don't generate proxy classes \n\
-     -noproxydel     - Don't generate the redundant __del__ method \n\
-     -noproxyimport  - Don't insert proxy import statements derived from the %import directive \n\
-     -nortti         - Disable the use of the native C++ RTTI with directors\n\
-     -nosafecstrings - Avoid extra strings copies when possible (default)\n\
-     -nothreads      - Disable thread support for the entire interface\n\
-     -olddefs        - Keep the old method definitions even when using fastproxy\n\
-     -oldrepr        - Use shorter and old version of __repr__ in proxy classes\n\
-     -outputtuple    - Use a PyTuple for outputs instead of a PyList (use carefully with legacy interfaces) \n\
-     -proxydel       - Generate a __del__ method even though it is now redundant (default) \n\
-     -relativeimport - Use relative python imports \n\
-     -safecstrings   - Use safer (but slower) C string mapping, generating copies from Python -> C/C++\n\
-     -threads        - Add thread support for all the interface\n\
-     -O              - Enable the following optimization options: \n\
-                         -modern -fastdispatch -nosafecstrings -fvirtual -noproxydel \n\
-                         -fastproxy -fastinit -fastunpack -fastquery -modernargs -nobuildnone \n\
-     -py3            - Generate code with Python 3 specific features:\n\
-                         Function annotation \n\
-\n";
-
-static String *getSlot(Node *n = NULL, const char *key = NULL, String *default_slot = NULL) {
-  static String *zero = NewString("0");
-  String *val = n && key && *key ? Getattr(n, key) : NULL;
-  return val ? val : default_slot ? default_slot : zero;
-}
-
-static void printSlot(File *f, String *slotval, const char *slotname, const char *functype = NULL) {
-  String *slotval_override = 0;
-  if (functype)
-    slotval = slotval_override = NewStringf("(%s) %s", functype, slotval);
-  int len = Len(slotval);
-  int fieldwidth = len > 41 ? (len > 61 ? 0 : 61 - len) : 41 - len;
-  Printf(f, "    %s,%*s/* %s */\n", slotval, fieldwidth, "", slotname);
-  Delete(slotval_override);
-}
-
-static String *getClosure(String *functype, String *wrapper, int funpack = 0) {
-  static const char *functypes[] = {
-    "unaryfunc", "SWIGPY_UNARYFUNC_CLOSURE",
-    "destructor", "SWIGPY_DESTRUCTOR_CLOSURE",
-    "inquiry", "SWIGPY_INQUIRY_CLOSURE",
-    "getiterfunc", "SWIGPY_GETITERFUNC_CLOSURE",
-    "binaryfunc", "SWIGPY_BINARYFUNC_CLOSURE",
-    "ternaryfunc", "SWIGPY_TERNARYFUNC_CLOSURE",
-    "ternarycallfunc", "SWIGPY_TERNARYCALLFUNC_CLOSURE",
-    "lenfunc", "SWIGPY_LENFUNC_CLOSURE",
-    "ssizeargfunc", "SWIGPY_SSIZEARGFUNC_CLOSURE",
-    "ssizessizeargfunc", "SWIGPY_SSIZESSIZEARGFUNC_CLOSURE",
-    "ssizeobjargproc", "SWIGPY_SSIZEOBJARGPROC_CLOSURE",
-    "ssizessizeobjargproc", "SWIGPY_SSIZESSIZEOBJARGPROC_CLOSURE",
-    "objobjargproc", "SWIGPY_OBJOBJARGPROC_CLOSURE",
-    "reprfunc", "SWIGPY_REPRFUNC_CLOSURE",
-    "hashfunc", "SWIGPY_HASHFUNC_CLOSURE",
-    "iternextfunc", "SWIGPY_ITERNEXTFUNC_CLOSURE",
-    NULL
-  };
-
-  static const char *funpack_functypes[] = {
-    "unaryfunc", "SWIGPY_UNARYFUNC_CLOSURE",
-    "destructor", "SWIGPY_DESTRUCTOR_CLOSURE",
-    "inquiry", "SWIGPY_INQUIRY_CLOSURE",
-    "getiterfunc", "SWIGPY_GETITERFUNC_CLOSURE",
-    "ternaryfunc", "SWIGPY_TERNARYFUNC_CLOSURE",
-    "ternarycallfunc", "SWIGPY_TERNARYCALLFUNC_CLOSURE",
-    "lenfunc", "SWIGPY_LENFUNC_CLOSURE",
-    "ssizeargfunc", "SWIGPY_FUNPACK_SSIZEARGFUNC_CLOSURE",
-    "ssizessizeargfunc", "SWIGPY_SSIZESSIZEARGFUNC_CLOSURE",
-    "ssizeobjargproc", "SWIGPY_SSIZEOBJARGPROC_CLOSURE",
-    "ssizessizeobjargproc", "SWIGPY_SSIZESSIZEOBJARGPROC_CLOSURE",
-    "objobjargproc", "SWIGPY_OBJOBJARGPROC_CLOSURE",
-    "reprfunc", "SWIGPY_REPRFUNC_CLOSURE",
-    "hashfunc", "SWIGPY_HASHFUNC_CLOSURE",
-    "iternextfunc", "SWIGPY_ITERNEXTFUNC_CLOSURE",
-    NULL
-  };
-
-  if (!functype)
-    return NULL;
-  char *c = Char(functype);
-  int i;
-  if (funpack) {
-    for (i = 0; funpack_functypes[i] != NULL; i += 2) {
-      if (!strcmp(c, funpack_functypes[i]))
-	return NewStringf("%s(%s)", funpack_functypes[i + 1], wrapper);
-    }
-  } else {
-    for (i = 0; functypes[i] != NULL; i += 2) {
-      if (!strcmp(c, functypes[i]))
-	return NewStringf("%s(%s)", functypes[i + 1], wrapper);
-    }
-  }
-  return NULL;
-}
-
-class PYTHON:public Language {
-public:
-  PYTHON() {
-    /* Add code to manage protected constructors and directors */
-    director_prot_ctor_code = NewString("");
-    Printv(director_prot_ctor_code,
-	   "if ( $comparison ) { /* subclassed */\n",
-	   "  $director_new \n",
-	   "} else {\n", "  SWIG_SetErrorMsg(PyExc_RuntimeError,\"accessing abstract class or protected constructor\"); \n", "  SWIG_fail;\n", "}\n", NIL);
-    director_multiple_inheritance = 1;
-    director_language = 1;
-  }
-  /* ------------------------------------------------------------
-   * Thread Implementation
-   * ------------------------------------------------------------ */
-  int threads_enable(Node *n) const {
-    return threads && !GetFlagAttr(n, "feature:nothread");
-  }
-
-  int initialize_threads(String *f_init) {
-    if (!threads) {
-      return SWIG_OK;
-    }
-    Printf(f_init, "\n");
-    Printf(f_init, "/* Initialize threading */\n");
-    Printf(f_init, "SWIG_PYTHON_INITIALIZE_THREADS;\n");
-
-    return SWIG_OK;
-  }
-
-  virtual void thread_begin_block(Node *n, String *f) {
-    if (!GetFlag(n, "feature:nothreadblock")) {
-      String *bb = Getattr(n, "feature:threadbeginblock");
-      if (bb) {
-	Append(f, bb);
-      } else {
-	Append(f, "SWIG_PYTHON_THREAD_BEGIN_BLOCK;\n");
-      }
-    }
-  }
-
-  virtual void thread_end_block(Node *n, String *f) {
-    if (!GetFlag(n, "feature:nothreadblock")) {
-      String *eb = Getattr(n, "feature:threadendblock");
-      if (eb) {
-	Append(f, eb);
-      } else {
-	Append(f, "SWIG_PYTHON_THREAD_END_BLOCK;\n");
-      }
-    }
-  }
-
-  virtual void thread_begin_allow(Node *n, String *f) {
-    if (!GetFlag(n, "feature:nothreadallow")) {
-      String *bb = Getattr(n, "feature:threadbeginallow");
-      Append(f, "{\n");
-      if (bb) {
-	Append(f, bb);
-      } else {
-	Append(f, "SWIG_PYTHON_THREAD_BEGIN_ALLOW;\n");
-      }
-    }
-  }
-
-  virtual void thread_end_allow(Node *n, String *f) {
-    if (!GetFlag(n, "feature:nothreadallow")) {
-      String *eb = Getattr(n, "feature:threadendallow");
-      Append(f, "\n");
-      if (eb) {
-	Append(f, eb);
-      } else {
-	Append(f, "SWIG_PYTHON_THREAD_END_ALLOW;");
-      }
-      Append(f, "\n}");
-    }
-  }
-
-
-  /* ------------------------------------------------------------
-   * main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    int cppcast = 1;
-
-    SWIG_library_directory("python");
-
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-interface") == 0) {
-	  if (argv[i + 1]) {
-	    interface = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	  /* end added */
-	} else if (strcmp(argv[i], "-globals") == 0) {
-	  if (argv[i + 1]) {
-	    global_name = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if ((strcmp(argv[i], "-shadow") == 0) || ((strcmp(argv[i], "-proxy") == 0))) {
-	  shadow = 1;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-new_repr") == 0) || (strcmp(argv[i], "-newrepr") == 0)) {
-	  new_repr = 1;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-old_repr") == 0) || (strcmp(argv[i], "-oldrepr") == 0)) {
-	  new_repr = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-classptr") == 0) {
-	  classptr = 1;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-noproxy") == 0)) {
-	  shadow = 0;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-noproxyimport") == 0)) {
-	  shadowimport = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-keyword") == 0) {
-	  use_kw = 1;
-	  SWIG_cparse_set_compact_default_args(1);
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-classic") == 0) {
-	  classic = 1;
-	  modernargs = 0;
-	  modern = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-cppcast") == 0) {
-	  cppcast = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nocppcast") == 0) {
-	  cppcast = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-outputtuple") == 0) {
-	  outputtuple = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nooutputtuple") == 0) {
-	  outputtuple = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nortti") == 0) {
-	  nortti = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-threads") == 0) {
-	  threads = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nothreads") == 0) {
-	  /* Turn off thread suppor mode */
-	  nothreads = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-safecstrings") == 0) {
-	  safecstrings = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nosafecstrings") == 0) {
-	  safecstrings = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-buildnone") == 0) {
-	  buildnone = 1;
-	  nobuildnone = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nobuildnone") == 0) {
-	  buildnone = 0;
-	  nobuildnone = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-dirvtable") == 0) {
-	  dirvtable = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nodirvtable") == 0) {
-	  dirvtable = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-fastunpack") == 0) {
-	  fastunpack = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nofastunpack") == 0) {
-	  fastunpack = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-fastproxy") == 0) {
-	  fastproxy = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nofastproxy") == 0) {
-	  fastproxy = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-fastquery") == 0) {
-	  fastquery = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nofastquery") == 0) {
-	  fastquery = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-fastinit") == 0) {
-	  fastinit = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nofastinit") == 0) {
-	  fastinit = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-olddefs") == 0) {
-	  olddefs = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noolddefs") == 0) {
-	  olddefs = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-castmode") == 0) {
-	  castmode = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nocastmode") == 0) {
-	  castmode = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-extranative") == 0) {
-	  extranative = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noextranative") == 0) {
-	  extranative = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-modernargs") == 0) {
-	  modernargs = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nomodernargs") == 0) {
-	  modernargs = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-aliasobj0") == 0) {
-	  aliasobj0 = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noaliasobj0") == 0) {
-	  aliasobj0 = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-proxydel") == 0) {
-	  proxydel = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noproxydel") == 0) {
-	  proxydel = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-modern") == 0) {
-	  classic = 0;
-	  modern = 1;
-	  modernargs = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nomodern") == 0) {
-	  modern = 0;
-	  modernargs = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noh") == 0) {
-	  no_header_file = 1;
-	  Swig_mark_arg(i);
-	} else if ((strcmp(argv[i], "-new_vwm") == 0) || (strcmp(argv[i], "-newvwm") == 0)) {
-	  /* Turn on new value wrapper mpde */
-	  Swig_value_wrapper_mode(1);
-	  no_header_file = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-O") == 0) {
-	  classic = 0;
-	  modern = 1;
-	  safecstrings = 0;
-	  buildnone = 0;
-	  nobuildnone = 1;
-	  classptr = 0;
-	  proxydel = 0;
-	  fastunpack = 1;
-	  fastproxy = 1;
-	  fastinit = 1;
-	  fastquery = 1;
-	  modernargs = 1;
-	  Wrapper_fast_dispatch_mode_set(1);
-	  Wrapper_virtual_elimination_mode_set(1);
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage1, stdout);
-	  fputs(usage2, stdout);
-	  fputs(usage3, stdout);
-	} else if (strcmp(argv[i], "-py3") == 0) {
-	  py3 = 1;
-	  Preprocessor_define("SWIGPYTHON_PY3", 0);
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-builtin") == 0) {
-	  builtin = 1;
-	  Preprocessor_define("SWIGPYTHON_BUILTIN", 0);
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-relativeimport") == 0) {
-	  relativeimport = 1;
-	  Swig_mark_arg(i);
-	}
-
-      }
-    }
-
-    if (py3) {
-      /* force disable features that not compatible with Python 3.x */
-      classic = 0;
-    }
-
-    if (cppcast) {
-      Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0);
-    }
-
-    if (!global_name)
-      global_name = NewString("cvar");
-    Preprocessor_define("SWIGPYTHON 1", 0);
-    SWIG_typemap_lang("python");
-    SWIG_config_file("python.swg");
-    allow_overloading();
-  }
-
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-    /* check if directors are enabled for this module.  note: this 
-     * is a "master" switch, without which no director code will be
-     * emitted.  %feature("director") statements are also required
-     * to enable directors for individual classes or methods.
-     *
-     * use %module(directors="1") modulename at the start of the 
-     * interface file to enable director generation.
-     */
-    String *mod_docstring = NULL;
-    String *moduleimport = NULL;
-    {
-      Node *mod = Getattr(n, "module");
-      if (mod) {
-	Node *options = Getattr(mod, "options");
-	if (options) {
-	  int dirprot = 0;
-	  if (Getattr(options, "dirprot")) {
-	    dirprot = 1;
-	  }
-	  if (Getattr(options, "nodirprot")) {
-	    dirprot = 0;
-	  }
-	  if (Getattr(options, "directors")) {
-	    allow_directors();
-	    if (dirprot)
-	      allow_dirprot();
-	  }
-	  if (Getattr(options, "threads")) {
-	    threads = 1;
-	  }
-	  if (Getattr(options, "castmode")) {
-	    castmode = 1;
-	  }
-	  if (Getattr(options, "nocastmode")) {
-	    castmode = 0;
-	  }
-	  if (Getattr(options, "extranative")) {
-	    extranative = 1;
-	  }
-	  if (Getattr(options, "noextranative")) {
-	    extranative = 0;
-	  }
-	  if (Getattr(options, "outputtuple")) {
-	    outputtuple = 1;
-	  }
-	  if (Getattr(options, "nooutputtuple")) {
-	    outputtuple = 0;
-	  }
-	  mod_docstring = Getattr(options, "docstring");
-	  package = Getattr(options, "package");
-	  moduleimport = Getattr(options, "moduleimport");
-	}
-      }
-    }
-
-    /* Set comparison with none for ConstructorToFunction */
-    setSubclassInstanceCheck(NewString("$arg != Py_None"));
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = !no_header_file ? Getattr(n, "outfile_h") : 0;
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-    builtin_getset = NewHash();
-    builtin_closures = NewHash();
-    builtin_closures_code = NewString("");
-    class_members = NewHash();
-    builtin_methods = NewString("");
-    builtin_default_unref = NewString("delete $self;");
-
-    if (builtin) {
-      f_builtins = NewString("");
-    }
-
-    if (directorsEnabled()) {
-      if (!no_header_file) {
-	f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-	if (!f_runtime_h) {
-	  FileErrorDisplay(outfile_h);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-      } else {
-	f_runtime_h = f_runtime;
-      }
-    }
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-
-    const_code = NewString("");
-    methods = NewString("");
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGPYTHON\n#define SWIGPYTHON\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-    }
-
-    if (nothreads) {
-      Printf(f_runtime, "#define SWIG_PYTHON_NO_THREADS\n");
-    } else if (threads) {
-      Printf(f_runtime, "#define SWIG_PYTHON_THREADS\n");
-    }
-
-    if (safecstrings) {
-      Printf(f_runtime, "#define SWIG_PYTHON_SAFE_CSTRINGS\n");
-    }
-
-    if (buildnone) {
-      Printf(f_runtime, "#define SWIG_PYTHON_BUILD_NONE\n");
-    }
-
-    if (nobuildnone) {
-      Printf(f_runtime, "#define SWIG_PYTHON_NO_BUILD_NONE\n");
-    }
-
-    if (!dirvtable) {
-      Printf(f_runtime, "#define SWIG_PYTHON_DIRECTOR_NO_VTABLE\n");
-    }
-
-    if (outputtuple) {
-      Printf(f_runtime, "#define SWIG_PYTHON_OUTPUT_TUPLE\n");
-    }
-
-    if (nortti) {
-      Printf(f_runtime, "#ifndef SWIG_DIRECTOR_NORTTI\n");
-      Printf(f_runtime, "#define SWIG_DIRECTOR_NORTTI\n");
-      Printf(f_runtime, "#endif\n");
-    }
-
-    if (castmode) {
-      Printf(f_runtime, "#define SWIG_CASTRANK_MODE\n");
-      Printf(f_runtime, "#define SWIG_PYTHON_CAST_MODE\n");
-    }
-
-    if (extranative) {
-      Printf(f_runtime, "#define SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS\n");
-    }
-
-    if (classic) {
-      Printf(f_runtime, "#define SWIG_PYTHON_CLASSIC\n");
-    }
-
-    if (builtin) {
-      Printf(f_runtime, "#define SWIGPYTHON_BUILTIN\n");
-    }
-
-    Printf(f_runtime, "\n");
-
-    Printf(f_header, "#if (PY_VERSION_HEX <= 0x02000000)\n");
-    Printf(f_header, "# if !defined(SWIG_PYTHON_CLASSIC)\n");
-    Printf(f_header, "#  error \"This python version requires swig to be run with the '-classic' option\"\n");
-    Printf(f_header, "# endif\n");
-    Printf(f_header, "#endif\n");
-
-    if (modern) {
-      Printf(f_header, "#if (PY_VERSION_HEX <= 0x02020000)\n");
-      Printf(f_header, "# error \"This python version requires swig to be run with the '-nomodern' option\"\n");
-      Printf(f_header, "#endif\n");
-    }
-
-    if (modernargs) {
-      Printf(f_header, "#if (PY_VERSION_HEX <= 0x02020000)\n");
-      Printf(f_header, "# error \"This python version requires swig to be run with the '-nomodernargs' option\"\n");
-      Printf(f_header, "#endif\n");
-    }
-
-    if (fastunpack) {
-      Printf(f_header, "#ifndef METH_O\n");
-      Printf(f_header, "# error \"This python version requires swig to be run with the '-nofastunpack' option\"\n");
-      Printf(f_header, "#endif\n");
-    }
-
-    if (fastquery) {
-      Printf(f_header, "#ifdef SWIG_TypeQuery\n");
-      Printf(f_header, "# undef SWIG_TypeQuery\n");
-      Printf(f_header, "#endif\n");
-      Printf(f_header, "#define SWIG_TypeQuery SWIG_Python_TypeQuery\n");
-    }
-
-
-    /* Set module name */
-    module = Copy(Getattr(n, "name"));
-    mainmodule = Getattr(n, "name");
-
-    if (directorsEnabled()) {
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module);
-      if (dirprot_mode()) {
-	Printf(f_directors_h, "#include <map>\n");
-	Printf(f_directors_h, "#include <string>\n\n");
-      }
-
-      Printf(f_directors, "\n\n");
-      Printf(f_directors, "/* ---------------------------------------------------\n");
-      Printf(f_directors, " * C++ director class methods\n");
-      Printf(f_directors, " * --------------------------------------------------- */\n\n");
-      if (outfile_h) {
-	String *filename = Swig_file_filename(outfile_h);
-	Printf(f_directors, "#include \"%s\"\n\n", filename);
-	Delete(filename);
-      }
-    }
-
-    /* If shadow classing is enabled, we're going to change the module name to "_module" */
-    String *default_import_code = NewString("");
-    if (shadow) {
-      String *filen = NewStringf("%s%s.py", SWIG_output_directory(), Char(module));
-      // If we don't have an interface then change the module name X to _X
-      if (interface)
-	module = interface;
-      else
-	Insert(module, 0, "_");
-      if ((f_shadow_py = NewFile(filen, "w", SWIG_output_files())) == 0) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Delete(filen);
-      filen = NULL;
-
-      f_shadow = NewString("");
-      f_shadow_begin = NewString("");
-      f_shadow_imports = NewHash();
-      f_shadow_after_begin = NewString("");
-      f_shadow_stubs = NewString("");
-
-      Swig_register_filebyname("shadow", f_shadow);
-      Swig_register_filebyname("python", f_shadow);
-
-      if (mod_docstring) {
-	if (Len(mod_docstring)) {
-	  const char *triple_double = "\"\"\"";
-	  // follow PEP257 rules: https://www.python.org/dev/peps/pep-0257/
-	  // reported by pep257: https://github.com/GreenSteam/pep257
-	  bool multi_line_ds = Strchr(mod_docstring, '\n') != 0;
-	  Printv(f_shadow_after_begin, "\n", triple_double, multi_line_ds ? "\n":"", mod_docstring, multi_line_ds ? "\n":"", triple_double, "\n", NIL);
-	}
-	Delete(mod_docstring);
-	mod_docstring = NULL;
-      }
-
-      Printv(default_import_code, "\nfrom sys import version_info as _swig_python_version_info\n", NULL);
-
-      if (!builtin && fastproxy) {
-	Printv(default_import_code, "if _swig_python_version_info >= (3, 0, 0):\n", NULL);
-	Printf(default_import_code, tab4 "new_instancemethod = lambda func, inst, cls: %s.SWIG_PyInstanceMethod_New(func)\n", module);
-	Printv(default_import_code, "else:\n", NULL);
-	Printv(default_import_code, tab4, "from new import instancemethod as new_instancemethod\n", NULL);
-      }
-
-      /* Import the C-extension module.  This should be a relative import,
-       * since the shadow module may also have been imported by a relative
-       * import, and there is thus no guarantee that the C-extension is on
-       * sys.path.  Relative imports must be explicitly specified from 2.6.0
-       * onwards (implicit relative imports will raise a DeprecationWarning
-       * in 2.6, and fail in 2.7 onwards), but the relative import syntax
-       * isn't available in python 2.4 or earlier, so we have to write some
-       * code conditional on the python version.
-       *
-       * For python 2.7.0 and newer, first determine the shadow wrappers package
-       * based on the __name__ it was given by the importer that loaded it.
-       * Then construct a name for the module based on the package name and the
-       * module name (we know the module name).  Use importlib to try and load 
-       * it.  If an attempt to load the module with importlib fails with an
-       * ImportError then fallback and try and load just the module name from
-       * the global namespace.
-       */
-      Printv(default_import_code, "if _swig_python_version_info >= (2, 7, 0):\n", NULL);
-      Printv(default_import_code, tab4, "def swig_import_helper():\n", NULL);
-      Printv(default_import_code, tab8, "import importlib\n", NULL);
-      Printv(default_import_code, tab8, "pkg = __name__.rpartition('.')[0]\n", NULL);
-      Printf(default_import_code, tab8 "mname = '.'.join((pkg, '%s')).lstrip('.')\n", module);
-      Printv(default_import_code, tab8, "try:\n", NULL);
-      Printv(default_import_code, tab8, tab4, "return importlib.import_module(mname)\n", NULL);
-      Printv(default_import_code, tab8, "except ImportError:\n", NULL);
-      Printf(default_import_code, tab8 tab4 "return importlib.import_module('%s')\n", module);
-      Printf(default_import_code, tab4 "%s = swig_import_helper()\n", module);
-      Printv(default_import_code, tab4, "del swig_import_helper\n", NULL);
-      Printv(default_import_code, "elif _swig_python_version_info >= (2, 6, 0):\n", NULL);
-      Printv(default_import_code, tab4, "def swig_import_helper():\n", NULL);
-      Printv(default_import_code, tab8, "from os.path import dirname\n", NULL);
-      Printv(default_import_code, tab8, "import imp\n", NULL);
-      Printv(default_import_code, tab8, "fp = None\n", NULL);
-      Printv(default_import_code, tab8, "try:\n", NULL);
-      Printf(default_import_code, tab4 tab8 "fp, pathname, description = imp.find_module('%s', [dirname(__file__)])\n", module);
-      Printf(default_import_code, tab8 "except ImportError:\n");
-      /* At here, the module may already loaded, so simply import it. */
-      Printf(default_import_code, tab4 tab8 "import %s\n", module);
-      Printf(default_import_code, tab4 tab8 "return %s\n", module);
-      Printv(default_import_code, tab8 "try:\n", NULL);
-      /* imp.load_module() handles fp being None. */
-      Printf(default_import_code, tab4 tab8 "_mod = imp.load_module('%s', fp, pathname, description)\n", module);
-      Printv(default_import_code, tab8, "finally:\n", NULL);
-      Printv(default_import_code, tab4 tab8 "if fp is not None:\n", NULL);
-      Printv(default_import_code, tab8 tab8, "fp.close()\n", NULL);
-      Printv(default_import_code, tab8, "return _mod\n", NULL);
-      Printf(default_import_code, tab4 "%s = swig_import_helper()\n", module);
-      Printv(default_import_code, tab4, "del swig_import_helper\n", NULL);
-      Printv(default_import_code, "else:\n", NULL);
-      Printf(default_import_code, tab4 "import %s\n", module);
-
-      if (builtin) {
-        /*
-         * Pull in all the attributes from the C module.
-         *
-         * An alternative approach to doing this if/else chain was
-         * proposed by Michael Thon.  Someone braver than I may try it out.
-         * I fear some current swig user may depend on some side effect
-         * of from _foo import *
-         *
-         * for attr in _foo.__all__:
-         *     globals()[attr] = getattr(_foo, attr)
-         * 
-         */
-        Printf(default_import_code, "# pull in all the attributes from %s\n", module);
-        Printv(default_import_code, "if __name__.rpartition('.')[0] != '':\n", NULL);
-        Printv(default_import_code, tab4, "if _swig_python_version_info >= (2, 7, 0):\n", NULL);
-        Printv(default_import_code, tab8, "try:\n", NULL);
-        Printf(default_import_code, tab8 tab4 "from .%s import *\n", module);
-        Printv(default_import_code, tab8 "except ImportError:\n", NULL);
-        Printf(default_import_code, tab8 tab4 "from %s import *\n", module);
-        Printv(default_import_code, tab4, "else:\n", NULL);
-        Printf(default_import_code, tab8 "from %s import *\n", module);
-        Printv(default_import_code, "else:\n", NULL);
-        Printf(default_import_code, tab4 "from %s import *\n", module);
-      }
-
-      /* Delete the _swig_python_version_info symbol since we don't use it elsewhere in the
-       * module. */
-      Printv(default_import_code, "del _swig_python_version_info\n\n", NULL);
-
-      if (modern || !classic) {
-	Printv(f_shadow, "try:\n", tab4, "_swig_property = property\n", "except NameError:\n", tab4, "pass  # Python < 2.2 doesn't have 'property'.\n\n", NULL);
-      }
-
-      /* Need builtins to qualify names like Exception that might also be
-         defined in this module (try both Python 3 and Python 2 names) */
-      Printv(f_shadow, "try:\n", tab4, "import builtins as __builtin__\n", "except ImportError:\n", tab4, "import __builtin__\n", NULL);
-
-      /* if (!modern) */
-      /* always needed, a class can be forced to be no-modern, such as an exception */
-      {
-	// Python-2.2 object hack
-	Printv(f_shadow,
-	       "\n", "def _swig_setattr_nondynamic(self, class_type, name, value, static=1):\n",
-	       tab4, "if (name == \"thisown\"):\n", tab8, "return self.this.own(value)\n",
-	       tab4, "if (name == \"this\"):\n", tab8, "if type(value).__name__ == 'SwigPyObject':\n", tab4, tab8, "self.__dict__[name] = value\n",
-#ifdef USE_THISOWN
-	       tab4, tab8, "if hasattr(value,\"thisown\"):\n", tab8, tab8, "self.__dict__[\"thisown\"] = value.thisown\n", tab4, tab8, "del value.thisown\n",
-#endif
-	       tab4, tab8, "return\n", tab4, "method = class_type.__swig_setmethods__.get(name, None)\n", tab4, "if method:\n", tab4, tab4, "return method(self, value)\n",
-#ifdef USE_THISOWN
-	       tab4, "if (not static) or (name == \"thisown\"):\n",
-#else
-	       tab4, "if (not static):\n",
-#endif
-	       NIL);
-	if (!classic) {
-	  if (!modern)
-	    Printv(f_shadow, tab4, tab4, "if _newclass:\n", tab4, NIL);
-	  Printv(f_shadow, tab4, tab4, "object.__setattr__(self, name, value)\n", NIL);
-	  if (!modern)
-	    Printv(f_shadow, tab4, tab4, "else:\n", tab4, NIL);
-	}
-	if (classic || !modern)
-	  Printv(f_shadow, tab4, tab4, "self.__dict__[name] = value\n", NIL);
-	Printv(f_shadow,
-	       tab4, "else:\n",
-	       tab4, tab4, "raise AttributeError(\"You cannot add attributes to %s\" % self)\n\n",
-	        "\n", "def _swig_setattr(self, class_type, name, value):\n", tab4, "return _swig_setattr_nondynamic(self, class_type, name, value, 0)\n\n", NIL);
-
-	Printv(f_shadow,
-	       "\n", "def _swig_getattr(self, class_type, name):\n",
-	       tab4, "if (name == \"thisown\"):\n", tab8, "return self.this.own()\n",
-	       tab4, "method = class_type.__swig_getmethods__.get(name, None)\n",
-	       tab4, "if method:\n", tab8, "return method(self)\n",
-	       tab4, "raise AttributeError(\"'%s' object has no attribute '%s'\" % (class_type.__name__, name))\n\n", NIL);
-
-	Printv(f_shadow,
-	        "\n", "def _swig_repr(self):\n",
-	       tab4, "try:\n", tab8, "strthis = \"proxy of \" + self.this.__repr__()\n",
-	       tab4, "except __builtin__.Exception:\n", tab8, "strthis = \"\"\n", tab4, "return \"<%s.%s; %s >\" % (self.__class__.__module__, self.__class__.__name__, strthis,)\n\n", NIL);
-
-	if (!classic && !modern) {
-	  Printv(f_shadow,
-		 "try:\n",
-		 tab4, "_object = object\n", tab4, "_newclass = 1\n",
-		 "except __builtin__.Exception:\n",
-		 tab4, "class _object:\n", tab8, "pass\n", tab4, "_newclass = 0\n\n", NIL);
-	}
-      }
-      if (modern) {
-	Printv(f_shadow,  "\n", "def _swig_setattr_nondynamic_method(set):\n", tab4, "def set_attr(self, name, value):\n",
-#ifdef USE_THISOWN
-	       tab4, tab4, "if hasattr(self, name) or (name in (\"this\", \"thisown\")):\n",
-#else
-	       tab4, tab4, "if (name == \"thisown\"):\n", tab8, tab4, "return self.this.own(value)\n", tab4, tab4, "if hasattr(self, name) or (name == \"this\"):\n",
-#endif
-	       tab4, tab4, tab4, "set(self, name, value)\n",
-	       tab4, tab4, "else:\n",
-	       tab4, tab4, tab4, "raise AttributeError(\"You cannot add attributes to %s\" % self)\n", tab4, "return set_attr\n\n\n", NIL);
-      }
-
-      if (directorsEnabled()) {
-	// Try loading weakref.proxy, which is only available in Python 2.1 and higher
-	Printv(f_shadow,
-	       "try:\n", tab4, "import weakref\n", tab4, "weakref_proxy = weakref.proxy\n", "except __builtin__.Exception:\n", tab4, "weakref_proxy = lambda x: x\n", "\n\n", NIL);
-      }
-    }
-    // Include some information in the code
-    Printf(f_header, "\n/*-----------------------------------------------\n              @(target):= %s.so\n\
-  ------------------------------------------------*/\n", module);
-
-    Printf(f_header, "#if PY_VERSION_HEX >= 0x03000000\n");
-    Printf(f_header, "#  define SWIG_init    PyInit_%s\n\n", module);
-    Printf(f_header, "#else\n");
-    Printf(f_header, "#  define SWIG_init    init%s\n\n", module);
-    Printf(f_header, "#endif\n");
-    Printf(f_header, "#define SWIG_name    \"%s\"\n", module);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "extern \"C\" {\n");
-    Printf(f_wrappers, "#endif\n");
-    Append(const_code, "static swig_const_info swig_const_table[] = {\n");
-    Append(methods, "static PyMethodDef SwigMethods[] = {\n");
-
-    /* the method exported for replacement of new.instancemethod in Python 3 */
-    add_pyinstancemethod_new();
-
-    if (builtin) {
-      SwigType *s = NewString("SwigPyObject");
-      SwigType_add_pointer(s);
-      SwigType_remember(s);
-      Delete(s);
-    }
-
-    /* emit code */
-    Language::top(n);
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (make it occur before %header section)
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-
-    /* Close language module */
-    Append(methods, "\t { NULL, NULL, 0, NULL }\n");
-    Append(methods, "};\n");
-    Printf(f_wrappers, "%s\n", methods);
-
-    if (builtin) {
-      Dump(f_builtins, f_wrappers);
-    }
-
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-
-    Append(const_code, "{0, 0, 0, 0.0, 0, 0}};\n");
-    Printf(f_wrappers, "%s\n", const_code);
-    initialize_threads(f_init);
-
-    Printf(f_init, "#if PY_VERSION_HEX >= 0x03000000\n");
-    Printf(f_init, "  return m;\n");
-    Printf(f_init, "#else\n");
-    Printf(f_init, "  return;\n");
-    Printf(f_init, "#endif\n");
-    Printf(f_init, "}\n");
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "}\n");
-    Printf(f_wrappers, "#endif\n");
-
-    if (shadow) {
-      Swig_banner_target_lang(f_shadow_py, "#");
-      if (!modern && !classic) {
-	Printv(f_shadow, "# This file is compatible with both classic and new-style classes.\n", NIL);
-      }
-      if (Len(f_shadow_begin) > 0)
-	Printv(f_shadow_py, "\n", f_shadow_begin, "\n", NIL);
-      if (Len(f_shadow_after_begin) > 0)
-      Printv(f_shadow_py, f_shadow_after_begin, "\n", NIL);
-      if (moduleimport) {
-	Replaceall(moduleimport, "$module", module);
-	Printv(f_shadow_py, "\n", moduleimport, "\n", NIL);
-      } else {
-	Printv(f_shadow_py, default_import_code, NIL);
-      }
-      Printv(f_shadow_py, f_shadow, "\n", NIL);
-      Printv(f_shadow_py, f_shadow_stubs, "\n", NIL);
-      Delete(f_shadow_py);
-    }
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-
-    if (directorsEnabled()) {
-      Dump(f_directors_h, f_runtime_h);
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-      if (f_runtime_h != f_begin)
-	Delete(f_runtime_h);
-      Dump(f_directors, f_begin);
-    }
-
-    Dump(f_wrappers, f_begin);
-    if (builtin && builtin_bases_needed)
-      Printf(f_begin, "static PyTypeObject *builtin_bases[%d];\n\n", max_bases + 2);
-    Wrapper_pretty_print(f_init, f_begin);
-
-    Delete(default_import_code);
-    Delete(f_shadow_after_begin);
-    Delete(f_shadow_imports);
-    Delete(f_shadow_begin);
-    Delete(f_shadow);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_builtins);
-    Delete(f_init);
-    Delete(f_directors);
-    Delete(f_directors_h);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * Emit the wrapper for PyInstanceMethod_New to MethodDef array.
-   * This wrapper is used to implement -fastproxy,
-   * as a replacement of new.instancemethod in Python 3.
-   * ------------------------------------------------------------ */
-  int add_pyinstancemethod_new() {
-    String *name = NewString("SWIG_PyInstanceMethod_New");
-    Printf(methods, "\t { (char *)\"%s\", (PyCFunction)%s, METH_O, NULL},\n", name, name);
-    Delete(name);
-    return 0;
-  }
-
-  /* ------------------------------------------------------------
-   * subpkg_tail()
-   *
-   * Return the name of 'other' package relative to 'base'.
-   *
-   * 1. If 'other' is a sub-package of 'base', returns the 'other' relative to
-   *    'base'.
-   * 2. If 'other' and 'base' are equal, returns empty string "".
-   * 3. In any other case, NULL pointer is returned.
-   *
-   * The 'base' and 'other' are expected to be fully qualified names.
-   *
-   * NOTE: none of 'base' nor 'other' can be null.
-   *
-   * Examples:
-   *
-   *  #  base       other         tail
-   * --  ----       -----         ----
-   *  1  "Foo"      "Foo.Bar" ->  "Bar"
-   *  2	 "Foo"      "Foo."    ->  ""
-   *  3	 "Foo"      "FooB.ar" ->  NULL
-   *  4	 "Foo.Bar"  "Foo.Bar" ->  ""
-   *  5  "Foo.Bar"  "Foo"     ->  NULL
-   *  6  "Foo.Bar"  "Foo.Gez" ->  NULL
-   *
-   *  NOTE: the example #2 is actually a syntax error (at input). I believe
-   *        swig parser prevents us from this case happening here.
-   * ------------------------------------------------------------ */
-
-  static String *subpkg_tail(const String *base, const String *other) {
-    int baselen = Len(base);
-    int otherlen = Len(other);
-
-    if (Strncmp(other, base, baselen) == 0) {
-      if ((baselen < otherlen) && (Char(other))[baselen] == '.') {
-        return NewString((Char(other)) + baselen + 1);
-      } else if (baselen == otherlen) {
-        return NewString("");
-      } else {
-        return 0;
-      }
-    } else {
-      return 0;
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * abs_import_directive_string()
-   *
-   * Return a string containing python code to import module.
-   *
-   * 	pkg     package name or the module being imported
-   * 	mod     module name of the module being imported
-   * 	pfx     optional prefix to module name
-   *
-   * NOTE: keep this function consistent with abs_import_name_string().
-   * ------------------------------------------------------------ */
-
-  static String *abs_import_directive_string(const String *pkg, const String *mod, const char *pfx = "") {
-    String *out = NewString("");
-
-    if (pkg && *Char(pkg)) {
-      Printf(out, "import %s.%s%s\n", pkg, pfx, mod);
-    } else {
-      Printf(out, "import %s%s\n", pfx, mod);
-    }
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * rel_import_directive_string()
-   *
-   * Return a string containing python code to import module that
-   * is potentially within a package.
-   *
-   * 	mainpkg	package name of the module which imports the other module
-   * 	pkg     package name or the module being imported
-   * 	mod     module name of the module being imported
-   * 	pfx     optional prefix to module name
-   *
-   * NOTE: keep this function consistent with rel_import_name_string().
-   * ------------------------------------------------------------ */
-
-  static String *rel_import_directive_string(const String *mainpkg, const String *pkg, const String *mod, const char *pfx = "") {
-
-    /* NOTE: things are not so trivial. This is what we do here (by examples):
-     *
-     * 0. To import module 'foo', which is not in any package, we do absolute
-     *    import:
-     *
-     *       import foo
-     *
-     * 1. To import 'pkg1.pkg2.foo', when mainpkg != "pkg1" and
-     *    mainpkg != "pkg1.pkg2" or when mainpkg is not given we do absolute
-     *    import:
-     *
-     *          import pkg1.pkg2.foo
-     *
-     * 2. To import module pkg1.foo, when mainpkg == "pkg1", we do:
-     *
-     *    - for py3 = 0:
-     *
-     *          import foo
-     *
-     *    - for py3 = 1:
-     *
-     *          from . import foo
-     *
-     * 3. To import "pkg1.pkg2.pkg3.foo", when mainpkg = "pkg1", we do:
-     *
-     *    - for py3 == 0:
-     *
-     *          import pkg2.pkg3.foo
-     *
-     *    - for py3 == 1:
-     *
-     *          from . import pkg2  # [1]
-     *          import pkg1.pkg2.pkg3.foo
-     *
-     * NOTE: [1] is necessary for pkg2.foo to be present in the importing module
-     */
-
-    String *apkg = 0; // absolute (FQDN) package name of pkg
-    String *rpkg = 0; // relative package name
-    int py3_rlen1 = 0; // length of 1st level sub-package name, used by py3
-    String *out = NewString("");
-
-    if (pkg && *Char(pkg)) {
-      if (mainpkg) {
-	String *tail = subpkg_tail(mainpkg, pkg);
-	if (tail) {
-	  if (*Char(tail)) {
-	    rpkg = NewString(tail);
-	    const char *py3_end1 = Strchr(rpkg, '.');
-	    if (!py3_end1)
-	      py3_end1 = (Char(rpkg)) + Len(rpkg);
-	    py3_rlen1 = (int)(py3_end1 - Char(rpkg));
-	  } else {
-	    rpkg = NewString("");
-	  }
-	  Delete(tail);
-	} else {
-	  apkg = NewString(pkg);
-	}
-      } else {
-	apkg = NewString(pkg);
-      }
-    } else {
-      apkg = NewString("");
-    }
-
-    if (apkg) {
-      Printf(out, "import %s%s%s%s\n", apkg, *Char(apkg) ? "." : "", pfx, mod);
-      Delete(apkg);
-    } else {
-      Printf(out, "from sys import version_info as _swig_python_version_info\n");
-      Printf(out, "if _swig_python_version_info >= (2, 7, 0):\n");
-      if (py3_rlen1)
-	Printf(out, tab4 "from . import %.*s\n", py3_rlen1, rpkg);
-      Printf(out, tab4 "from .%s import %s%s\n", rpkg, pfx, mod);
-      Printf(out, "else:\n");
-      Printf(out, tab4 "import %s%s%s%s\n", rpkg, *Char(rpkg) ? "." : "", pfx, mod);
-      Printf(out, "del _swig_python_version_info\n");
-      Delete(rpkg);
-    }
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * import_directive_string()
-   * ------------------------------------------------------------ */
-
-  static String *import_directive_string(const String *mainpkg, const String *pkg, const String *mod, const char *pfx = "") {
-    if (!relativeimport) {
-      return abs_import_directive_string(pkg, mod, pfx);
-    } else {
-      return rel_import_directive_string(mainpkg, pkg, mod, pfx);
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * abs_import_name_string()
-   *
-   * Return a string with the name of a symbol (perhaps imported
-   * from external module by absolute import directive).
-   *
-   * mainpkg  package name of current module
-   * mainmod  module name of current module
-   * pkg      package name of (perhaps other) module
-   * mod      module name of (perhaps other) module
-   * sym      symbol name
-   *
-   * NOTE: mainmod, mod, and sym can't be NULL.
-   * NOTE: keep this function consistent with abs_import_directive_string()
-   * ------------------------------------------------------------ */
-
-  static String *abs_import_name_string(const String *mainpkg, const String *mainmod, const String *pkg, const String *mod, const String *sym) {
-    String *out = NewString("");
-    if (pkg && *Char(pkg)) {
-      if (mainpkg && *Char(mainpkg)) {
-        if (Strcmp(mainpkg,pkg) != 0 || Strcmp(mainmod, mod) != 0) {
-          Printf(out, "%s.%s.", pkg, mod);
-        }
-      } else {
-        Printf(out, "%s.%s.", pkg, mod);
-      }
-    } else if ((mainpkg && *Char(mainpkg)) || Strcmp(mainmod, mod) != 0) {
-      Printf(out, "%s.", mod);
-    }
-    Append(out, sym);
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * rel_import_name_string()
-   *
-   * Return a string with the name of a symbol (perhaps imported
-   * from external module by relative import directive).
-   *
-   * mainpkg  package name of current module
-   * mainmod  module name of current module
-   * pkg      package name of (perhaps other) module
-   * mod      module name of (perhaps other) module
-   * sym      symbol name
-   *
-   * NOTE: mainmod, mod, and sym can't be NULL.
-   * NOTE: keep this function consistent with rel_import_directive_string()
-   * ------------------------------------------------------------ */
-
-  static String *rel_import_name_string(const String *mainpkg, const String *mainmod, const String *pkg, const String *mod, const String *sym) {
-    String *out = NewString("");
-    if (pkg && *Char(pkg)) {
-      String *tail = 0;
-      if (mainpkg)
-        tail = subpkg_tail(mainpkg, pkg);
-      if (!tail)
-        tail = NewString(pkg);
-      if (*Char(tail)) {
-        Printf(out, "%s.%s.", tail, mod);
-      } else if (Strcmp(mainmod, mod) != 0) {
-        Printf(out, "%s.", mod);
-      }
-      Delete(tail);
-    } else if ((mainpkg && *Char(mainpkg)) || Strcmp(mainmod, mod) != 0) {
-      Printf(out, "%s.", mod);
-    }
-    Append(out, sym);
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * import_name_string()
-   * ------------------------------------------------------------ */
-
-  static String *import_name_string(const String *mainpkg, const String *mainmod, const String *pkg, const String *mod, const String *sym) {
-    if (!relativeimport) {
-      return abs_import_name_string(mainpkg,mainmod,pkg,mod,sym);
-    } else {
-      return rel_import_name_string(mainpkg,mainmod,pkg,mod,sym);
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * importDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int importDirective(Node *n) {
-    if (shadow) {
-      String *modname = Getattr(n, "module");
-
-      if (modname) {
-	// Find the module node for this imported module.  It should be the
-	// first child but search just in case.
-	Node *mod = firstChild(n);
-	while (mod && Strcmp(nodeType(mod), "module") != 0)
-	  mod = nextSibling(mod);
-
-	Node *options = Getattr(mod, "options");
-	String *pkg = options ? Getattr(options, "package") : 0;
-	if (shadowimport) {
-	  if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) {
-	    String *_import = import_directive_string(package, pkg, modname, "_");
-	    if (!GetFlagAttr(f_shadow_imports, _import)) {
-	      String *import = import_directive_string(package, pkg, modname);
-	      Printf(builtin ? f_shadow_after_begin : f_shadow, "%s", import);
-	      Delete(import);
-	      SetFlag(f_shadow_imports, _import);
-	    }
-	    Delete(_import);
-	  }
-	}
-      }
-    }
-    return Language::importDirective(n);
-  }
-
-  /* ------------------------------------------------------------
-   * funcCall()
-   *
-   * Emit shadow code to call a function in the extension
-   * module. Using proper argument and calling style for
-   * given node n.
-   * ------------------------------------------------------------ */
-  String *funcCall(String *name, String *parms) {
-    String *str = NewString("");
-
-    Printv(str, module, ".", name, "(", parms, ")", NIL);
-    return str;
-  }
-
-  /* ------------------------------------------------------------
-   * indent_pythoncode()
-   *
-   * Format (indent) Python code.
-   * Remove leading whitespace from 'code' and re-indent using
-   * the indentation string in 'indent'.
-   * ------------------------------------------------------------ */
-
-  String *indent_pythoncode(const String *code, const_String_or_char_ptr indent, String *file, int line, const char *directive_name) {
-    String *out = NewString("");
-    String *temp;
-    char *t;
-    if (!indent)
-      indent = "";
-
-    temp = NewString(code);
-
-    t = Char(temp);
-    if (*t == '{') {
-      Delitem(temp, 0);
-      Delitem(temp, DOH_END);
-    }
-
-    /* Split the input text into lines */
-    List *clist = SplitLines(temp);
-    Delete(temp);
-
-    // Line number within the pythoncode.
-    int py_line = 0;
-
-    String *initial = 0;
-    Iterator si;
-
-    /* Get the initial indentation.  Skip lines which only contain whitespace
-     * and/or a comment, as the indentation of those doesn't matter:
-     *
-     *     A logical line that contains only spaces, tabs, formfeeds and
-     *     possibly a comment, is ignored (i.e., no NEWLINE token is
-     *     generated).
-     *
-     * see:
-     * https://docs.python.org/2/reference/lexical_analysis.html#blank-lines
-     * https://docs.python.org/3/reference/lexical_analysis.html#blank-lines
-     */
-    for (si = First(clist); si.item; si = Next(si), ++py_line) {
-      const char *c = Char(si.item);
-      int i;
-      for (i = 0; isspace((unsigned char)c[i]); i++) {
-	// Scan forward until we find a non-space (which may be a null byte).
-      }
-      char ch = c[i];
-      if (ch && ch != '#') {
-	// Found a line with actual content.
-	initial = NewStringWithSize(c, i);
-	break;
-      }
-      if (ch) {
-	Printv(out, indent, c, NIL);
-      }
-      Putc('\n', out);
-    }
-
-    // Process remaining lines.
-    for ( ; si.item; si = Next(si), ++py_line) {
-      const char *c = Char(si.item);
-      // If no prefixed line was found, the above loop should have completed.
-      assert(initial);
-
-      int i;
-      for (i = 0; isspace((unsigned char)c[i]); i++) {
-	// Scan forward until we find a non-space (which may be a null byte).
-      }
-      char ch = c[i];
-      if (!ch) {
-	// Line is just whitespace - emit an empty line.
-	Putc('\n', out);
-	continue;
-      }
-
-      if (ch == '#') {
-	// Comment - the indentation doesn't matter to python, but try to
-	// adjust the whitespace for the benefit of human readers (though SWIG
-	// currently seems to always remove any whitespace before a '#' before
-	// we get here, in which case we'll just leave the comment at the start
-	// of the line).
-	if (i >= Len(initial)) {
-	  Printv(out, indent, NIL);
-	}
-
-	Printv(out, c + i, "\n", NIL);
-	continue;
-      }
-
-      if (i < Len(initial)) {
-	// There's non-whitespace in the initial prefix of this line.
-	Swig_error(file, line, "Line indented less than expected (line %d of %s) as no line should be indented less than the indentation in line 1\n", py_line, directive_name);
-	Printv(out, indent, c, "\n", NIL);
-      } else {
-	if (memcmp(c, Char(initial), Len(initial)) == 0) {
-	  // Prefix matches initial, so just remove it.
-	  Printv(out, indent, c + Len(initial), "\n", NIL);
-	  continue;
-	}
-	Swig_warning(WARN_PYTHON_INDENT_MISMATCH,
-		     file, line, "Whitespace indentation is inconsistent compared to earlier lines (line %d of %s)\n", py_line, directive_name);
-	// To avoid gratuitously breaking interface files which worked with
-	// SWIG <= 3.0.5, we remove a prefix of the same number of bytes for
-	// lines which start with different whitespace to the line we got
-	// 'initial' from.
-	Printv(out, indent, c + Len(initial), "\n", NIL);
-      }
-    }
-    Delete(clist);
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * indent_docstring()
-   *
-   * Format (indent) a Python docstring.
-   * Remove leading whitespace from 'code' and re-indent using
-   * the indentation string in 'indent'.
-   * ------------------------------------------------------------ */
-
-  String *indent_docstring(const String *code, const_String_or_char_ptr indent) {
-    String *out = NewString("");
-    String *temp;
-    char *t;
-    if (!indent)
-      indent = "";
-
-    temp = NewString(code);
-
-    t = Char(temp);
-    if (*t == '{') {
-      Delitem(temp, 0);
-      Delitem(temp, DOH_END);
-    }
-
-    /* Split the input text into lines */
-    List *clist = SplitLines(temp);
-    Delete(temp);
-
-    Iterator si;
-
-    int truncate_characters_count = INT_MAX;
-    for (si = First(clist); si.item; si = Next(si)) {
-      const char *c = Char(si.item);
-      int i;
-      for (i = 0; isspace((unsigned char)c[i]); i++) {
-	// Scan forward until we find a non-space (which may be a null byte).
-      }
-      char ch = c[i];
-      if (ch) {
-	// Found a line which isn't just whitespace
-	if (i < truncate_characters_count)
-	  truncate_characters_count = i;
-      }
-    }
-
-    if (truncate_characters_count == INT_MAX)
-      truncate_characters_count = 0;
-
-    for (si = First(clist); si.item; si = Next(si)) {
-      const char *c = Char(si.item);
-
-      int i;
-      for (i = 0; isspace((unsigned char)c[i]); i++) {
-	// Scan forward until we find a non-space (which may be a null byte).
-      }
-      char ch = c[i];
-      if (!ch) {
-	// Line is just whitespace - emit an empty line.
-	Putc('\n', out);
-	continue;
-      }
-
-      Printv(out, indent, c + truncate_characters_count, "\n", NIL);
-    }
-    Delete(clist);
-    return out;
-  }
-
-  /* ------------------------------------------------------------
-   * autodoc level declarations
-   * ------------------------------------------------------------ */
-
-  enum autodoc_l {
-    NO_AUTODOC = -2,		// no autodoc
-    STRING_AUTODOC = -1,	// use provided string
-    NAMES_AUTODOC = 0,		// only parameter names
-    TYPES_AUTODOC = 1,		// parameter names and types
-    EXTEND_AUTODOC = 2,		// extended documentation and parameter names
-    EXTEND_TYPES_AUTODOC = 3	// extended documentation and parameter types + names
-  };
-
-
-  autodoc_l autodoc_level(String *autodoc) {
-    autodoc_l dlevel = NO_AUTODOC;
-    char *c = Char(autodoc);
-    if (c) {
-      if (isdigit(c[0])) {
-	dlevel = (autodoc_l) atoi(c);
-      } else {
-	if (strcmp(c, "extended") == 0) {
-	  dlevel = EXTEND_AUTODOC;
-	} else {
-	  dlevel = STRING_AUTODOC;
-	}
-      }
-    }
-    return dlevel;
-  }
-
-
-  /* ------------------------------------------------------------
-   * have_docstring()
-   *
-   * Check if there is a docstring directive and it has text,
-   * or there is an autodoc flag set
-   * ------------------------------------------------------------ */
-
-  bool have_docstring(Node *n) {
-    String *str = Getattr(n, "feature:docstring");
-    return (str && Len(str) > 0) || (Getattr(n, "feature:autodoc") && !GetFlag(n, "feature:noautodoc"));
-  }
-
-  /* ------------------------------------------------------------
-   * docstring()
-   *
-   * Get the docstring text, stripping off {} if necessary,
-   * and enclose in triple double quotes.  If autodoc is also
-   * set then it will build a combined docstring.
-   * ------------------------------------------------------------ */
-
-  String *docstring(Node *n, autodoc_t ad_type, const String *indent, bool use_triple = true) {
-    String *str = Getattr(n, "feature:docstring");
-    bool have_ds = (str && Len(str) > 0);
-    bool have_auto = (Getattr(n, "feature:autodoc") && !GetFlag(n, "feature:noautodoc"));
-    const char *triple_double = use_triple ? "\"\"\"" : "";
-    String *autodoc = NULL;
-    String *doc = NULL;
-
-    if (have_ds) {
-      char *t = Char(str);
-      if (*t == '{') {
-	Delitem(str, 0);
-	Delitem(str, DOH_END);
-      }
-    }
-
-    if (have_auto) {
-      autodoc = make_autodoc(n, ad_type);
-      have_auto = (autodoc && Len(autodoc) > 0);
-    }
-    // If there is more than one line then make docstrings like this:
-    //
-    //      """
-    //      This is line1
-    //      And here is line2 followed by the rest of them
-    //      """
-    //
-    // otherwise, put it all on a single line
-    //
-    if (have_auto && have_ds) {	// Both autodoc and docstring are present
-      doc = NewString("");
-      Printv(doc, triple_double, "\n",
-	     indent_docstring(autodoc, indent), "\n",
-	     indent_docstring(str, indent), indent, triple_double, NIL);
-    } else if (!have_auto && have_ds) {	// only docstring
-      if (Strchr(str, '\n') == 0) {
-	doc = NewStringf("%s%s%s", triple_double, str, triple_double);
-      } else {
-	doc = NewString("");
-	Printv(doc, triple_double, "\n", indent_docstring(str, indent), indent, triple_double, NIL);
-      }
-    } else if (have_auto && !have_ds) {	// only autodoc
-      if (Strchr(autodoc, '\n') == 0) {
-	doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
-      } else {
-	doc = NewString("");
-	Printv(doc, triple_double, "\n", indent_docstring(autodoc, indent), indent, triple_double, NIL);
-      }
-    } else
-      doc = NewString("");
-
-    // Save the generated strings in the parse tree in case they are used later
-    // by post processing tools
-    Setattr(n, "python:docstring", doc);
-    Setattr(n, "python:autodoc", autodoc);
-    return doc;
-  }   
-
-  /* ------------------------------------------------------------
-   * cdocstring()
-   *
-   * Get the docstring text as it would appear in C-language
-   * source code.
-   * ------------------------------------------------------------ */
-
-  String *cdocstring(Node *n, autodoc_t ad_type)
-  {
-    String *ds = docstring(n, ad_type, "", false);
-    Replaceall(ds, "\\", "\\\\");
-    Replaceall(ds, "\"", "\\\"");
-    Replaceall(ds, "\n", "\\n\"\n\t\t\"");
-    return ds;
-  }
-
-  virtual String *makeParameterName(Node *n, Parm *p, int arg_num, bool = false) const {
-    // For the keyword arguments, we want to preserve the names as much as possible,
-    // so we only minimally rename them in Swig_name_make(), e.g. replacing "keyword"
-    // with "_keyword" if they have any name at all.
-    if (check_kwargs(n)) {
-      String *name = Getattr(p, "name");
-      if (name)
-	return Swig_name_make(p, 0, name, 0, 0);
-    }
-
-    // For the other cases use the general function which replaces arguments whose
-    // names clash with keywords with (less useful) "argN".
-    return Language::makeParameterName(n, p, arg_num);
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addMissingParameterNames()
-   *
-   * For functions that have not had nameless parameters set in the Language class.
-   *
-   * Inputs: 
-   *   plist - entire parameter list
-   *   arg_offset - argument number for first parameter
-   * Side effects:
-   *   The "lname" attribute in each parameter in plist will be contain a parameter name
-   * ----------------------------------------------------------------------------- */
-
-  void addMissingParameterNames(Node *n, ParmList *plist, int arg_offset) {
-    Parm *p = plist;
-    int i = arg_offset;
-    while (p) {
-      if (!Getattr(p, "lname")) {
-	String *name = makeParameterName(n, p, i);
-	Setattr(p, "lname", name);
-	Delete(name);
-      }
-      i++;
-      p = nextSibling(p);
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * make_autodocParmList()
-   *
-   * Generate the documentation for the function parameters
-   * Parameters:
-   *    func_annotation: Function annotation support
-   * ------------------------------------------------------------ */
-
-  String *make_autodocParmList(Node *n, bool showTypes, bool calling = false, bool func_annotation = false) {
-
-    String *doc = NewString("");
-    String *pdocs = 0;
-    ParmList *plist = CopyParmList(Getattr(n, "parms"));
-    Parm *p;
-    Parm *pnext;
-
-
-    // Normally we start counting auto-generated argument names from 1, but we should do it from 2
-    // if the first argument is "self", i.e. if we're handling a non-static member function.
-    int arg_num = 1;
-    if (is_wrapping_class()) {
-      if (Cmp(Getattr(n, "storage"), "static") != 0)
-	arg_num++;
-    }
-
-    if (calling)
-      func_annotation = false;
-
-    addMissingParameterNames(n, plist, arg_num); // for $1_name substitutions done in Swig_typemap_attach_parms
-    Swig_typemap_attach_parms("in", plist, 0);
-    Swig_typemap_attach_parms("doc", plist, 0);
-
-    if (Strcmp(ParmList_protostr(plist), "void") == 0) {
-      //No parameters actually
-      return doc;
-    }
-
-    for (p = plist; p; p = pnext, arg_num++) {
-
-      String *tm = Getattr(p, "tmap:in");
-      if (tm) {
-	pnext = Getattr(p, "tmap:in:next");
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  continue;
-	}
-      } else {
-	pnext = nextSibling(p);
-      }
-
-      String *name = 0;
-      String *type = 0;
-      String *value = 0;
-      String *pdoc = Getattr(p, "tmap:doc");
-      if (pdoc) {
-	name = Getattr(p, "tmap:doc:name");
-	type = Getattr(p, "tmap:doc:type");
-	value = Getattr(p, "tmap:doc:value");
-      }
-
-      // Note: the generated name should be consistent with that in kwnames[]
-      String *made_name = 0;
-      if (!name) {
-	name = made_name = makeParameterName(n, p, arg_num);
-      }
-
-      type = type ? type : Getattr(p, "type");
-      value = value ? value : Getattr(p, "value");
-
-      if (SwigType_isvarargs(type)) {
-	Delete(made_name);
-	break;
-      }
-
-      if (Len(doc)) {
-	// add a comma to the previous one if any
-	Append(doc, ", ");
-      }
-
-      // Do the param type too?
-      Node *nn = classLookup(Getattr(p, "type"));
-      String *type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
-      if (showTypes)
-	Printf(doc, "%s ", type_str);
-
-      Append(doc, name);
-      if (pdoc) {
-	if (!pdocs)
-	  // numpydoc style: https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
-	  pdocs = NewString("\nParameters\n----------\n");
-	Printf(pdocs, "%s\n", pdoc);
-      }
-      // Write the function annotation
-      if (func_annotation)
-	Printf(doc, ": '%s'", type_str);
-
-      // Write default value
-      if (value && !calling) {
-	String *new_value = convertValue(value, Getattr(p, "type"));
-	if (new_value)
-	  Printf(doc, "=%s", new_value);
-      }
-      Delete(type_str);
-      Delete(made_name);
-    }
-    if (pdocs)
-      Setattr(n, "feature:pdocs", pdocs);
-    Delete(plist);
-    return doc;
-  }
-
-  /* ------------------------------------------------------------
-   * make_autodoc()
-   *
-   * Build a docstring for the node, using parameter and other
-   * info in the parse tree.  If the value of the autodoc
-   * attribute is "0" then do not include parameter types, if
-   * it is "1" (the default) then do.  If it has some other
-   * value then assume it is supplied by the extension writer
-   * and use it directly.
-   * ------------------------------------------------------------ */
-
-  String *make_autodoc(Node *n, autodoc_t ad_type) {
-    int extended = 0;
-    // If the function is overloaded then this function is called
-    // for the last one.  Rewind to the first so the docstrings are
-    // in order.
-    while (Getattr(n, "sym:previousSibling"))
-      n = Getattr(n, "sym:previousSibling");
-
-    String *doc = NewString("");
-    while (n) {
-      bool showTypes = false;
-      bool skipAuto = false;
-      String *autodoc = Getattr(n, "feature:autodoc");
-      autodoc_l dlevel = autodoc_level(autodoc);
-      switch (dlevel) {
-      case NO_AUTODOC:
-	break;
-      case NAMES_AUTODOC:
-	showTypes = false;
-	break;
-      case TYPES_AUTODOC:
-	showTypes = true;
-	break;
-      case EXTEND_AUTODOC:
-	extended = 1;
-	showTypes = false;
-	break;
-      case EXTEND_TYPES_AUTODOC:
-	extended = 1;
-	showTypes = true;
-	break;
-      case STRING_AUTODOC:
-	Append(doc, autodoc);
-	skipAuto = true;
-	break;
-      }
-
-      if (!skipAuto) {
-	String *symname = Getattr(n, "sym:name");
-	SwigType *type = Getattr(n, "type");
-	String *type_str = NULL;
-
-	if (type) {
-	  if (Strcmp(type, "void") == 0) {
-	    type_str = NULL;
-	  } else {
-	    Node *nn = classLookup(type);
-	    type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
-	  }
-	}
-
-	switch (ad_type) {
-	case AUTODOC_CLASS:
-	  {
-	    // Only do the autodoc if there isn't a docstring for the class
-	    String *str = Getattr(n, "feature:docstring");
-	    if (!str || Len(str) == 0) {
-	      if (builtin) {
-		String *name = Getattr(n, "name");
-		String *rname = add_explicit_scope(SwigType_namestr(name));
-		Printf(doc, "%s", rname);
-		Delete(rname);
-	      } else {
-		if (CPlusPlus) {
-		  Printf(doc, "Proxy of C++ %s class.", real_classname);
-		} else {
-		  Printf(doc, "Proxy of C %s struct.", real_classname);
-		}
-	      }
-	    }
-	  }
-	  break;
-	case AUTODOC_CTOR:
-	  if (Strcmp(class_name, symname) == 0) {
-	    String *paramList = make_autodocParmList(n, showTypes);
-	    Printf(doc, "__init__(");
-	    if (showTypes)
-	      Printf(doc, "%s ", getClassName());
-	    if (Len(paramList))
-	      Printf(doc, "self, %s) -> %s", paramList, class_name);
-	    else
-	      Printf(doc, "self) -> %s", class_name);
-	  } else
-	    Printf(doc, "%s(%s) -> %s", symname, make_autodocParmList(n, showTypes), class_name);
-	  break;
-
-	case AUTODOC_DTOR:
-	  if (showTypes)
-	    Printf(doc, "__del__(%s self)", getClassName());
-	  else
-	    Printf(doc, "__del__(self)");
-	  break;
-
-	case AUTODOC_STATICFUNC:
-	  Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes));
-	  if (type_str)
-	    Printf(doc, " -> %s", type_str);
-	  break;
-
-	case AUTODOC_FUNC:
-	  Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes));
-	  if (type_str)
-	    Printf(doc, " -> %s", type_str);
-	  break;
-
-	case AUTODOC_METHOD:
-	  String *paramList = make_autodocParmList(n, showTypes);
-	  Printf(doc, "%s(", symname);
-	  if (showTypes)
-	    Printf(doc, "%s ", class_name);
-	  if (Len(paramList))
-	    Printf(doc, "self, %s)", paramList);
-	  else
-	    Printf(doc, "self)");
-	  if (type_str)
-	    Printf(doc, " -> %s", type_str);
-	  break;
-	}
-	Delete(type_str);
-      }
-      if (extended) {
-	String *pdocs = Getattr(n, "feature:pdocs");
-	if (pdocs) {
-	  Printv(doc, "\n", pdocs, NULL);
-	}
-      }
-      // if it's overloaded then get the next decl and loop around again
-      n = Getattr(n, "sym:nextSibling");
-      if (n)
-	Append(doc, "\n");
-    }
-
-    return doc;
-  }
-
-  /* ------------------------------------------------------------
-   * convertDoubleValue()
-   *
-   * Check if the given string looks like a decimal floating point constant
-   * and return it if it does, otherwise return NIL.
-   * ------------------------------------------------------------ */
-  String *convertDoubleValue(String *v) {
-    const char *const s = Char(v);
-    char *end;
-
-    double value = strtod(s, &end);
-    (void) value;
-    if (errno != ERANGE && end != s) {
-      // An added complication: at least some versions of strtod() recognize
-      // hexadecimal floating point numbers which don't exist in Python, so
-      // detect them ourselves and refuse to convert them (this can't be done
-      // without loss of precision in general).
-      //
-      // Also don't accept neither "NAN" nor "INFINITY" (both of which
-      // conveniently contain "n").
-      if (strpbrk(s, "xXnN"))
-	return NIL;
-
-      // Disregard optional "f" suffix, it can be just dropped in Python as it
-      // uses doubles for everything anyhow.
-      for (char * p = end; *p != '\0'; ++p) {
-	switch (*p) {
-	  case 'f':
-	  case 'F':
-	    break;
-
-	  default:
-	    return NIL;
-	}
-      }
-
-      // Avoid unnecessary string allocation in the common case when we don't
-      // need to remove any suffix.
-      return *end == '\0' ? v : NewStringWithSize(s, (int)(end - s));
-    }
-
-    return NIL;
-  }
-
-  /* ------------------------------------------------------------
-   * convertValue()
-   *
-   * Check if string v can be a Python value literal or a
-   * constant. Return NIL if it isn't.
-   * ------------------------------------------------------------ */
-  String *convertValue(String *v, SwigType *type) {
-    const char *const s = Char(v);
-    char *end;
-    String *result = NIL;
-    bool fail = false;
-    SwigType *resolved_type = 0;
-
-    // Check if this is a number in any base.
-    long value = strtol(s, &end, 0);
-    (void) value;
-    if (end != s) {
-      if (errno == ERANGE) {
-	// There was an overflow, we could try representing the value as Python
-	// long integer literal, but for now don't bother with it.
-	fail = true;
-      } else {
-	if (*end != '\0') {
-	  // If there is a suffix after the number, we can safely ignore any
-	  // combination of "l" and "u", but not anything else (again, stuff like
-	  // "LL" could be handled, but we don't bother to do it currently).
-	  bool seen_long = false;
-	  for (char * p = end; *p != '\0'; ++p) {
-	    switch (*p) {
-	      case 'l':
-	      case 'L':
-		// Bail out on "LL".
-		if (seen_long) {
-		  fail = true;
-		  break;
-		}
-		seen_long = true;
-		break;
-
-	      case 'u':
-	      case 'U':
-		break;
-
-	      default:
-		// Except that our suffix could actually be the fractional part of
-		// a floating point number, so we still have to check for this.
-		result = convertDoubleValue(v);
-	    }
-	  }
-	}
-
-	if (!fail) {
-	  // Allow integers as the default value for a bool parameter.
-	  resolved_type = SwigType_typedef_resolve_all(type);
-	  if (Cmp(resolved_type, "bool") == 0) {
-	    result = NewString(value ? "True" : "False");
-	  } else {
-	    // Deal with the values starting with 0 first as they can be octal or
-	    // hexadecimal numbers or even pointers.
-	    if (s[0] == '0') {
-	      if (Len(v) == 1) {
-		// This is just a lone 0, but it needs to be represented differently
-		// in Python depending on whether it's a zero or a null pointer.
-		if (SwigType_ispointer(resolved_type))
-		  result = NewString("None");
-		else
-		  result = v;
-	      } else if (s[1] == 'x' || s[1] == 'X') {
-		// This must have been a hex number, we can use it directly in Python,
-		// so nothing to do here.
-	      } else {
-		// This must have been an octal number, we have to change its prefix
-		// to be "0o" in Python 3 only (and as long as we still support Python
-		// 2.5, this can't be done unconditionally).
-		if (py3) {
-		  if (end - s > 1) {
-		    result = NewString("0o");
-		    Append(result, NewStringWithSize(s + 1, (int)(end - s - 1)));
-		  }
-		}
-	      }
-	    }
-
-	    // Avoid unnecessary string allocation in the common case when we don't
-	    // need to remove any suffix.
-	    if (!result)
-	      result = *end == '\0' ? v : NewStringWithSize(s, (int)(end - s));
-	  }
-	}
-      }
-    }
-
-    // Check if this is a floating point number (notice that it wasn't
-    // necessarily parsed as a long above, consider e.g. ".123").
-    if (!fail && !result) {
-      result = convertDoubleValue(v);
-      if (!result) {
-	if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0)
-	  result = NewString("True");
-	else if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
-	  result = NewString("False");
-	else if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0) {
-	  if (!resolved_type)
-	    resolved_type = SwigType_typedef_resolve_all(type);
-	  result = SwigType_ispointer(resolved_type) ? NewString("None") : NewString("0");
-	}
-
-	// This could also be an enum type, default value of which could be
-	// representable in Python if it doesn't include any scope (which could,
-	// but currently is not, translated).
-	else if (!Strchr(s, ':')) {
-	  Node *lookup = Swig_symbol_clookup(v, 0);
-	  if (lookup) {
-	    if (Cmp(Getattr(lookup, "nodeType"), "enumitem") == 0)
-	      result = Getattr(lookup, "sym:name");
-	  }
-	}
-      }
-    }
-
-    Delete(resolved_type);
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * is_representable_as_pyargs()
-   *
-   * Check if the function parameters default argument values
-   * can be represented in Python.
-   *
-   * If this method returns false, the parameters will be translated
-   * to a generic "*args" which allows us to deal with default values
-   * at C++ code level where they can always be handled.
-   * ------------------------------------------------------------ */
-  bool is_representable_as_pyargs(Node *n) {
-    ParmList *plist = CopyParmList(Getattr(n, "parms"));
-    Swig_typemap_attach_parms("default", plist, NULL);
-
-    Parm *p;
-    Parm *pnext;
-
-    for (p = plist; p; p = pnext) {
-      pnext = nextSibling(p);
-      String *tm = Getattr(p, "tmap:in");
-      if (tm) {
-	Parm *in_next = Getattr(p, "tmap:in:next");
-	if (in_next)
-	  pnext = in_next;
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  continue;
-	}
-      }
-
-      // "default" typemap can contain arbitrary C++ code, so while it could, in
-      // principle, be possible to examine it and check if it's just something
-      // simple of the form "$1 = expression" and then use convertValue() to
-      // check if expression can be used in Python, but for now we just
-      // pessimistically give up and prefer to handle this at C++ level only.
-      if (Getattr(p, "tmap:default"))
-	return false;
-
-      if (String *value = Getattr(p, "value")) {
-	String *type = Getattr(p, "type");
-	if (!convertValue(value, type))
-	  return false;
-      }
-    }
-
-    return true;
-  }
-
-
-  /* ------------------------------------------------------------
-   * is_real_overloaded()
-   *
-   * Check if the function is overloaded, but not just have some
-   * siblings generated due to the original function have 
-   * default arguments.
-   * ------------------------------------------------------------ */
-  bool is_real_overloaded(Node *n) {
-    Node *h = Getattr(n, "sym:overloaded");
-    Node *i;
-    if (!h)
-      return false;
-
-    i = Getattr(h, "sym:nextSibling");
-    while (i) {
-      Node *nn = Getattr(i, "defaultargs");
-      if (nn != h) {
-	/* Check if overloaded function has defaultargs and 
-	 * pointed to the first overloaded. */
-	return true;
-      }
-      i = Getattr(i, "sym:nextSibling");
-    }
-
-    return false;
-  }
-
-  /* ------------------------------------------------------------
-   * make_pyParmList()
-   *
-   * Generate parameter list for Python functions or methods,
-   * reuse make_autodocParmList() to do so.
-   * ------------------------------------------------------------ */
-  String *make_pyParmList(Node *n, bool in_class, bool is_calling, int kw) {
-    /* Get the original function for a defaultargs copy, 
-     * see default_arguments() in parser.y. */
-    Node *nn = Getattr(n, "defaultargs");
-    if (nn)
-      n = nn;
-
-    /* We prefer to explicitly list all parameters of the C function in the
-       generated Python code as this makes the function more convenient to use,
-       however in some cases we must replace the real parameters list with just
-       the catch all "*args". This happens when:
-
-	1. The function is overloaded as Python doesn't support this.
-	2. We were explicitly asked to use the "compact" arguments form.
-	3. We were explicitly asked to use default args from C via the "python:cdefaultargs" feature.
-	4. One of the default argument values can't be represented in Python.
-     */
-    if (is_real_overloaded(n) || GetFlag(n, "feature:compactdefaultargs") || GetFlag(n, "feature:python:cdefaultargs") || !is_representable_as_pyargs(n)) {
-      String *parms = NewString("");
-      if (in_class)
-	Printf(parms, "self, ");
-      Printf(parms, "*args");
-      if (kw)
-	Printf(parms, ", **kwargs");
-      return parms;
-    }
-
-    bool funcanno = py3 ? true : false;
-    String *params = NewString("");
-    String *_params = make_autodocParmList(n, false, is_calling, funcanno);
-
-    if (in_class) {
-      Printf(params, "self");
-      if (Len(_params) > 0)
-	Printf(params, ", ");
-    }
-
-    Printv(params, _params, NULL);
-
-    return params;
-  }
-
-  /* ------------------------------------------------------------
-   * have_pythonprepend()
-   *
-   * Check if there is a %pythonprepend directive and it has text
-   * ------------------------------------------------------------ */
-
-  bool have_pythonprepend(Node *n) {
-    String *str = Getattr(n, "feature:pythonprepend");
-    return (str && Len(str) > 0);
-  }
-
-  /* ------------------------------------------------------------
-   * pythonprepend()
-   *
-   * Get the %pythonprepend code, stripping off {} if necessary
-   * ------------------------------------------------------------ */
-
-  String *pythonprepend(Node *n) {
-    String *str = Getattr(n, "feature:pythonprepend");
-    char *t = Char(str);
-    if (*t == '{') {
-      Delitem(str, 0);
-      Delitem(str, DOH_END);
-    }
-    return str;
-  }
-
-  /* ------------------------------------------------------------
-   * have_pythonappend()
-   *
-   * Check if there is a %pythonappend directive and it has text
-   * ------------------------------------------------------------ */
-
-  bool have_pythonappend(Node *n) {
-    String *str = Getattr(n, "feature:pythonappend");
-    if (!str)
-      str = Getattr(n, "feature:addtofunc");
-    return (str && Len(str) > 0);
-  }
-
-  /* ------------------------------------------------------------
-   * pythonappend()
-   *
-   * Get the %pythonappend code, stripping off {} if necessary
-   * ------------------------------------------------------------ */
-
-  String *pythonappend(Node *n) {
-    String *str = Getattr(n, "feature:pythonappend");
-    if (!str)
-      str = Getattr(n, "feature:addtofunc");
-
-    char *t = Char(str);
-    if (*t == '{') {
-      Delitem(str, 0);
-      Delitem(str, DOH_END);
-    }
-    return str;
-  }
-
-  /* ------------------------------------------------------------
-   * have_addtofunc()
-   *
-   * Check if there is a %addtofunc directive and it has text
-   * ------------------------------------------------------------ */
-
-  bool have_addtofunc(Node *n) {
-    return have_pythonappend(n) || have_pythonprepend(n) || have_docstring(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * returnTypeAnnotation()
-   *
-   * Helper function for constructing the function annotation
-   * of the returning type, return a empty string for Python 2.x
-   * ------------------------------------------------------------ */
-  String *returnTypeAnnotation(Node *n) {
-    String *ret = 0;
-    Parm *p = Getattr(n, "parms");
-    String *tm;
-    /* Try to guess the returning type by argout typemap,
-     * however the result may not accurate. */
-    while (p) {
-      if ((tm = Getattr(p, "tmap:argout:match_type"))) {
-	tm = SwigType_str(tm, 0);
-	if (ret)
-	  Printv(ret, ", ", tm, NULL);
-	else
-	  ret = tm;
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-    /* If no argout typemap, then get the returning type from
-     * the function prototype. */
-    if (!ret) {
-      ret = Getattr(n, "type");
-      if (ret)
-	ret = SwigType_str(ret, 0);
-    }
-    return (ret && py3) ? NewStringf(" -> \"%s\"", ret)
-	: NewString("");
-  }
-
-  /* ------------------------------------------------------------
-   * emitFunctionShadowHelper()
-   *
-   * Refactoring some common code out of functionWrapper and
-   * dispatchFunction that writes the proxy code for non-member
-   * functions.
-   * ------------------------------------------------------------ */
-
-  void emitFunctionShadowHelper(Node *n, File *f_dest, String *name, int kw) {
-    String *parms = make_pyParmList(n, false, false, kw);
-    String *callParms = make_pyParmList(n, false, true, kw);
-    /* Make a wrapper function to insert the code into */
-    Printv(f_dest, "\ndef ", name, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
-    if (have_docstring(n))
-      Printv(f_dest, tab4, docstring(n, AUTODOC_FUNC, tab4), "\n", NIL);
-    if (have_pythonprepend(n))
-      Printv(f_dest, indent_pythoncode(pythonprepend(n), tab4, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
-    if (have_pythonappend(n)) {
-      Printv(f_dest, tab4 "val = ", funcCall(name, callParms), "\n", NIL);
-      Printv(f_dest, indent_pythoncode(pythonappend(n), tab4, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL);
-      Printv(f_dest, tab4 "return val\n", NIL);
-    } else {
-      Printv(f_dest, tab4 "return ", funcCall(name, callParms), "\n", NIL);
-    }
-
-    if (!have_addtofunc(n)) {
-      /* If there is no addtofunc directive then just assign from the extension module (for speed up) */
-      Printv(f_dest, name, " = ", module, ".", name, "\n", NIL);
-    }
-  }
-
-
-  /* ------------------------------------------------------------
-   * check_kwargs()
-   *
-   * check if using kwargs is allowed for this Node
-   * ------------------------------------------------------------ */
-
-  int check_kwargs(Node *n) const {
-    return (use_kw || GetFlag(n, "feature:kwargs"))
-	&& !GetFlag(n, "memberset") && !GetFlag(n, "memberget");
-  }
-
-
-
-  /* ------------------------------------------------------------
-   * add_method()
-   * ------------------------------------------------------------ */
-
-  void add_method(String *name, String *function, int kw, Node *n = 0, int funpack= 0, int num_required= -1, int num_arguments = -1) {
-    if (!kw) {
-      if (n && funpack) {
-	if (num_required == 0 && num_arguments == 0) {
-	  Printf(methods, "\t { (char *)\"%s\", (PyCFunction)%s, METH_NOARGS, ", name, function);
-	} else if (num_required == 1 && num_arguments == 1) {
-	  Printf(methods, "\t { (char *)\"%s\", (PyCFunction)%s, METH_O, ", name, function);
-	} else {
-	  Printf(methods, "\t { (char *)\"%s\", %s, METH_VARARGS, ", name, function);
-	}
-      } else {
-	Printf(methods, "\t { (char *)\"%s\", %s, METH_VARARGS, ", name, function);
-      }
-    } else {
-      Printf(methods, "\t { (char *)\"%s\", (PyCFunction) %s, METH_VARARGS | METH_KEYWORDS, ", name, function);
-    }
-
-    if (!n) {
-      Append(methods, "NULL");
-    } else if (have_docstring(n)) {
-      String *ds = cdocstring(n, AUTODOC_FUNC);
-      Printf(methods, "(char *)\"%s\"", ds);
-      Delete(ds);
-    } else if (Getattr(n, "feature:callback")) {
-      Printf(methods, "(char *)\"swig_ptr: %s\"", Getattr(n, "feature:callback:name"));
-    } else {
-      Append(methods, "NULL");
-    }
-
-    Append(methods, "},\n");
-  }
-
-  /* ------------------------------------------------------------
-   * dispatchFunction()
-   * ------------------------------------------------------------ */
-  void dispatchFunction(Node *n, String *linkage, int funpack = 0, bool builtin_self = false, bool builtin_ctor = false, bool director_class = false) {
-    /* Last node in overloaded chain */
-
-    bool add_self = builtin_self && (!builtin_ctor || director_class);
-
-    int maxargs;
-
-    String *tmp = NewString("");
-    String *dispatch;
-    const char *dispatch_code = funpack ? "return %s(self, argc, argv);" : "return %s(self, args);";
-
-    if (castmode) {
-      dispatch = Swig_overload_dispatch_cast(n, dispatch_code, &maxargs);
-    } else {
-      dispatch = Swig_overload_dispatch(n, dispatch_code, &maxargs);
-    }
-
-    /* Generate a dispatch wrapper for all overloaded functions */
-
-    Wrapper *f = NewWrapper();
-    String *symname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(symname);
-
-    Printv(f->def, linkage, builtin_ctor ? "int " : "PyObject *", wname, "(PyObject *self, PyObject *args) {", NIL);
-
-    Wrapper_add_local(f, "argc", "Py_ssize_t argc");
-    Printf(tmp, "PyObject *argv[%d] = {0}", maxargs + 1);
-    Wrapper_add_local(f, "argv", tmp);
-
-    if (!fastunpack) {
-      Wrapper_add_local(f, "ii", "Py_ssize_t ii");
-      if (maxargs - (add_self ? 1 : 0) > 0)
-	Append(f->code, "if (!PyTuple_Check(args)) SWIG_fail;\n");
-      Append(f->code, "argc = args ? PyObject_Length(args) : 0;\n");
-      if (add_self)
-	Append(f->code, "argv[0] = self;\n");
-      Printf(f->code, "for (ii = 0; (ii < %d) && (ii < argc); ii++) {\n", add_self ? maxargs - 1 : maxargs);
-      Printf(f->code, "argv[ii%s] = PyTuple_GET_ITEM(args,ii);\n", add_self ? " + 1" : "");
-      Append(f->code, "}\n");
-      if (add_self)
-	Append(f->code, "argc++;\n");
-    } else {
-      String *iname = Getattr(n, "sym:name");
-      Printf(f->code, "if (!(argc = SWIG_Python_UnpackTuple(args,\"%s\",0,%d,argv%s))) SWIG_fail;\n", iname, maxargs, add_self ? "+1" : "");
-      if (add_self)
-	Append(f->code, "argv[0] = self;\n");
-      else
-	Append(f->code, "--argc;\n");
-    }
-
-    Replaceall(dispatch, "$args", "self, args");
-
-    Printv(f->code, dispatch, "\n", NIL);
-
-    if (GetFlag(n, "feature:python:maybecall")) {
-      Append(f->code, "fail:\n");
-      Append(f->code, "Py_INCREF(Py_NotImplemented);\n");
-      Append(f->code, "return Py_NotImplemented;\n");
-    } else {
-      Node *sibl = n;
-      while (Getattr(sibl, "sym:previousSibling"))
-	sibl = Getattr(sibl, "sym:previousSibling");	// go all the way up
-      String *protoTypes = NewString("");
-      do {
-	String *fulldecl = Swig_name_decl(sibl);
-	Printf(protoTypes, "\n\"    %s\\n\"", fulldecl);
-	Delete(fulldecl);
-      } while ((sibl = Getattr(sibl, "sym:nextSibling")));
-      Append(f->code, "fail:\n");
-      Printf(f->code, "SWIG_SetErrorMsg(PyExc_NotImplementedError,"
-	     "\"Wrong number or type of arguments for overloaded function '%s'.\\n\"" "\n\"  Possible C/C++ prototypes are:\\n\"%s);\n", symname, protoTypes);
-      Printf(f->code, "return %s;\n", builtin_ctor ? "-1" : "0");
-      Delete(protoTypes);
-    }
-    Printv(f->code, "}\n", NIL);
-    Wrapper_print(f, f_wrappers);
-    Node *p = Getattr(n, "sym:previousSibling");
-    if (!builtin_self)
-      add_method(symname, wname, 0, p);
-
-    /* Create a shadow for this function (if enabled and not in a member function) */
-    if (!builtin && (shadow) && (!(shadow & PYSHADOW_MEMBER))) {
-      emitFunctionShadowHelper(n, in_class ? f_shadow_stubs : f_shadow, symname, 0);
-    }
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(tmp);
-    Delete(wname);
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * ------------------------------------------------------------ */
-
-  /*
-    A note about argument marshalling with built-in types.
-    There are three distinct cases for member (non-static) methods:
-
-    1) An ordinary member function.  In this case, the first param in
-    the param list is 'this'.  For builtin types, 'this' is taken from
-    the first argument to the wrapper (usually called 'self); it's not
-    extracted from the second argument (which is usually a tuple).
-
-    2) A constructor for a non-director class.  In this case, the
-    param list doesn't contain an entry for 'this', but the first ('self')
-    argument to the wrapper *does* contain the newly-allocated,
-    uninitialized object.
-
-    3) A constructor for a director class.  In this case, the param
-    list contains a 'self' param, which comes from the first argument
-    to the wrapper function.
-  */
-
-  const char *get_implicitconv_flag(Node *klass) {
-    int conv = 0;
-    if (klass && GetFlag(klass, "feature:implicitconv")) {
-      conv = 1;
-    }
-    return conv ? "SWIG_POINTER_IMPLICIT_CONV" : "0";
-  }
-
-
-  virtual int functionWrapper(Node *n) {
-
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *d = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    Node *parent = Swig_methodclass(n);
-
-    int director_method = 0;
-
-    Parm *p;
-    int i;
-    char source[64];
-    Wrapper *f;
-    String *self_parse;
-    String *parse_args;
-    String *arglist;
-    String *get_pointers;
-    String *cleanup;
-    String *outarg;
-    String *kwargs;
-    String *tm;
-    String *overname = 0;
-
-    int num_required;
-    int num_arguments;
-    int num_fixed_arguments;
-    int tuple_required;
-    int tuple_arguments;
-    int varargs = 0;
-    int allow_kwargs = check_kwargs(n);
-
-    String *nodeType = Getattr(n, "nodeType");
-    int constructor = (!Cmp(nodeType, "constructor"));
-    int destructor = (!Cmp(nodeType, "destructor"));
-    String *storage = Getattr(n, "storage");
-    /* Only the first constructor is handled as init method. Others
-       constructor can be emitted via %rename */
-    int handled_as_init = 0;
-    if (!have_constructor && (constructor || Getattr(n, "handled_as_constructor"))
-	&& ((shadow & PYSHADOW_MEMBER))) {
-      String *nname = Getattr(n, "sym:name");
-      String *sname = Getattr(getCurrentClass(), "sym:name");
-      String *cname = Swig_name_construct(NSPACE_TODO, sname);
-      handled_as_init = (Strcmp(nname, sname) == 0) || (Strcmp(nname, cname) == 0);
-      Delete(cname);
-    }
-    bool builtin_self = builtin && in_class && (constructor || (l && Getattr(l, "self")));
-    bool builtin_ctor = false;
-    if (builtin_self && constructor) {
-      String *class_mname = Getattr(getCurrentClass(), "sym:name");
-      String *mrename = Swig_name_construct(getNSpace(), class_mname);
-      if (Cmp(iname, mrename))
-	builtin_self = false;
-      else
-	builtin_ctor = true;
-    }
-    bool director_class = (getCurrentClass() && Swig_directorclass(getCurrentClass()));
-    bool add_self = builtin_self && (!builtin_ctor || director_class);
-    bool builtin_getter = (builtin && GetFlag(n, "memberget"));
-    bool builtin_setter = (builtin && GetFlag(n, "memberset") && !builtin_getter);
-    bool over_varargs = false;
-    char const *self_param = builtin ? "self" : "SWIGUNUSEDPARM(self)";
-    char const *wrap_return = builtin_ctor ? "int " : "PyObject *";
-    String *linkage = NewString("SWIGINTERN ");
-    String *wrapper_name = Swig_name_wrapper(iname);
-
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n))
-	return SWIG_ERROR;
-    }
-
-    f = NewWrapper();
-    self_parse = NewString("");
-    parse_args = NewString("");
-    arglist = NewString("");
-    get_pointers = NewString("");
-    cleanup = NewString("");
-    outarg = NewString("");
-    kwargs = NewString("");
-
-    int allow_thread = threads_enable(n);
-
-    Wrapper_add_local(f, "resultobj", "PyObject *resultobj = 0");
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(l, f);
-
-    /* Attach the standard typemaps */
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-    /* Get number of required and total arguments */
-    tuple_arguments = num_arguments = emit_num_arguments(l);
-    tuple_required = num_required = emit_num_required(l);
-    if (add_self) {
-      --tuple_arguments;
-      --tuple_required;
-    }
-    num_fixed_arguments = tuple_required;
-    if (((num_arguments == 0) && (num_required == 0)) || ((num_arguments == 1) && (num_required == 1) && Getattr(l, "self")))
-      allow_kwargs = 0;
-    varargs = emit_isvarargs(l);
-
-    String *wname = Copy(wrapper_name);
-    if (overname) {
-      Append(wname, overname);
-    }
-
-    if (!allow_kwargs || overname) {
-      if (!varargs) {
-	Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", PyObject *args) {", NIL);
-      } else {
-	Printv(f->def, linkage, wrap_return, wname, "__varargs__", "(PyObject *", self_param, ", PyObject *args, PyObject *varargs) {", NIL);
-      }
-      if (allow_kwargs) {
-	Swig_warning(WARN_LANG_OVERLOAD_KEYWORD, input_file, line_number, "Can't use keyword arguments with overloaded functions (%s).\n", Swig_name_decl(n));
-	allow_kwargs = 0;
-      }
-    } else {
-      if (varargs) {
-	Swig_warning(WARN_LANG_VARARGS_KEYWORD, input_file, line_number, "Can't wrap varargs with keyword arguments enabled\n");
-	varargs = 0;
-      }
-      Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", PyObject *args, PyObject *kwargs) {", NIL);
-    }
-    if (!builtin || !in_class || tuple_arguments > 0) {
-      if (!allow_kwargs) {
-	Append(parse_args, "    if (!PyArg_ParseTuple(args,(char *)\"");
-      } else {
-	Append(parse_args, "    if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)\"");
-	Append(arglist, ",kwnames");
-      }
-    }
-
-    if (overname) {
-      String *over_varargs_attr = Getattr(n, "python:overvarargs");
-      if (!over_varargs_attr) {
-	for (Node *sibling = n; sibling; sibling = Getattr(sibling, "sym:nextSibling")) {
-	  if (emit_isvarargs(Getattr(sibling, "parms"))) {
-	    over_varargs = true;
-	    break;
-	  }
-	}
-	over_varargs_attr = NewString(over_varargs ? "1" : "0");
-	for (Node *sibling = n; sibling; sibling = Getattr(sibling, "sym:nextSibling"))
-	  Setattr(sibling, "python:overvarargs", over_varargs_attr);
-      }
-      if (Strcmp(over_varargs_attr, "0") != 0)
-	over_varargs = true;
-    }
-
-    int funpack = modernargs && fastunpack && !varargs && !over_varargs && !allow_kwargs;
-    int noargs = funpack && (tuple_required == 0 && tuple_arguments == 0);
-    int onearg = funpack && (tuple_required == 1 && tuple_arguments == 1);
-
-    if (builtin && funpack && !overname && !builtin_ctor && 
-      !(GetFlag(n, "feature:compactdefaultargs") && (tuple_arguments > tuple_required || varargs))) {
-      String *argattr = NewStringf("%d", tuple_arguments);
-      Setattr(n, "python:argcount", argattr);
-      Delete(argattr);
-    }
-
-    /* Generate code for argument marshalling */
-    if (funpack) {
-      if (overname) {
-	if (aliasobj0) {
-	  Append(f->code, "#define obj0 (swig_obj[0])\n");
-	}
-      } else if (num_arguments) {
-	sprintf(source, "PyObject *swig_obj[%d]", num_arguments);
-	Wrapper_add_localv(f, "swig_obj", source, NIL);
-	if (aliasobj0) {
-	  Append(f->code, "#define obj0 (swig_obj[0])\n");
-	}
-      }
-    }
-
-
-    if (constructor && num_arguments == 1 && num_required == 1) {
-      if (Cmp(storage, "explicit") == 0) {
-	if (GetFlag(parent, "feature:implicitconv")) {
-	  String *desc = NewStringf("SWIGTYPE%s", SwigType_manglestr(Getattr(n, "type")));
-	  Printf(f->code, "if (SWIG_CheckImplicit(%s)) SWIG_fail;\n", desc);
-	  Delete(desc);
-	}
-      }
-    }
-
-    if (builtin_ctor && checkAttribute(n, "access", "protected")) {
-      String *tmp_none_comparison = Copy(none_comparison);
-      Replaceall(tmp_none_comparison, "$arg", "self");
-      Printf(self_parse, "if (!(%s)) {\n", tmp_none_comparison);
-      Printv(self_parse, "  SWIG_SetErrorMsg(PyExc_RuntimeError, \"accessing abstract class or protected constructor\");\n  SWIG_fail;\n}\n", NIL);
-      Delete(tmp_none_comparison);
-    }
-
-    int use_parse = 0;
-    Append(kwargs, "{");
-    for (i = 0, p = l; i < num_arguments; i++) {
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-      bool parse_from_tuple = (i > 0 || !add_self);
-      if (SwigType_type(pt) == T_VARARGS) {
-	parse_from_tuple = false;
-	num_fixed_arguments -= atoi(Char(Getattr(p, "tmap:in:numinputs")));
-      }
-      if (!parse_from_tuple)
-	sprintf(source, "self");
-      else if (funpack)
-	sprintf(source, "swig_obj[%d]", add_self && !overname ? i - 1 : i);
-      else
-	sprintf(source, "obj%d", builtin_ctor ? i + 1 : i);
-
-      if (parse_from_tuple) {
-	Putc(',', arglist);
-	if (i == num_required)
-	  Putc('|', parse_args);	/* Optional argument separator */
-      }
-
-      /* Keyword argument handling */
-      if (allow_kwargs && parse_from_tuple) {
-	String *name = makeParameterName(n, p, i + 1);
-	Printf(kwargs, "(char *) \"%s\",", name);
-	Delete(name);
-      }
-
-      /* Look for an input typemap */
-      if ((tm = Getattr(p, "tmap:in"))) {
-	String *parse = Getattr(p, "tmap:in:parse");
-	if (!parse) {
-	  if (builtin_self) {
-	    Replaceall(tm, "$self", "self");
-	  } else if (funpack) {
-	    Replaceall(tm, "$self", "swig_obj[0]");
-	  } else {
-	    Replaceall(tm, "$self", "obj0");
-	  }
-	  Replaceall(tm, "$source", source);
-	  Replaceall(tm, "$target", ln);
-	  Replaceall(tm, "$input", source);
-	  Setattr(p, "emit:input", source);	/* Save the location of the object */
-
-	  if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-	    Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	  } else {
-	    Replaceall(tm, "$disown", "0");
-	  }
-
-	  if (Getattr(p, "tmap:in:implicitconv")) {
-	    const char *convflag = "0";
-	    if (!Getattr(p, "hidden")) {
-	      SwigType *ptype = Getattr(p, "type");
-	      convflag = get_implicitconv_flag(classLookup(ptype));
-	    }
-	    Replaceall(tm, "$implicitconv", convflag);
-	    Setattr(p, "implicitconv", convflag);
-	  }
-
-	  if (parse_from_tuple)
-	    Putc('O', parse_args);
-	  if (!funpack && parse_from_tuple) {
-	    Wrapper_add_localv(f, source, "PyObject *", source, "= 0", NIL);
-	    Printf(arglist, "&%s", source);
-	  }
-	  if (i >= num_required)
-	    Printv(get_pointers, "if (", source, ") {\n", NIL);
-	  Printv(get_pointers, tm, "\n", NIL);
-	  if (i >= num_required)
-	    Printv(get_pointers, "}\n", NIL);
-
-	} else {
-	  use_parse = 1;
-	  Append(parse_args, parse);
-	  if (parse_from_tuple)
-	    Printf(arglist, "&%s", ln);
-	}
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-	break;
-      }
-    }
-
-    /* finish argument marshalling */
-    Append(kwargs, " NULL }");
-    if (allow_kwargs) {
-      Printv(f->locals, "  char *  kwnames[] = ", kwargs, ";\n", NIL);
-    }
-
-    if (builtin && !funpack && in_class && tuple_arguments == 0) {
-      Printf(parse_args, "    if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_exception_fail(SWIG_TypeError, \"%s takes no arguments\");\n", iname);
-    } else if (use_parse || allow_kwargs || !modernargs) {
-      Printf(parse_args, ":%s\"", iname);
-      Printv(parse_args, arglist, ")) SWIG_fail;\n", NIL);
-      funpack = 0;
-    } else {
-      Clear(parse_args);
-      if (funpack) {
-	Clear(f->def);
-	if (overname) {
-	  if (noargs) {
-	    Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {", NIL);
-	  } else {
-	    Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", int nobjs, PyObject **swig_obj) {", NIL);
-	  }
-	  Printf(parse_args, "if ((nobjs < %d) || (nobjs > %d)) SWIG_fail;\n", num_required, num_arguments);
-	} else {
-	  if (noargs) {
-	    Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", PyObject *args) {", NIL);
-	  } else {
-	    Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", PyObject *args) {", NIL);
-	  }
-	  if (onearg && !builtin_ctor) {
-	    Printf(parse_args, "if (!args) SWIG_fail;\n");
-	    Append(parse_args, "swig_obj[0] = args;\n");
-	  } else if (!noargs) {
-	    Printf(parse_args, "if (!SWIG_Python_UnpackTuple(args,\"%s\",%d,%d,swig_obj)) SWIG_fail;\n", iname, num_fixed_arguments, tuple_arguments);
-	  } else if (noargs) {
-	    Printf(parse_args, "if (!SWIG_Python_UnpackTuple(args,\"%s\",%d,%d,0)) SWIG_fail;\n", iname, num_fixed_arguments, tuple_arguments);
-	  }
-	}
-      } else {
-	Printf(parse_args, "if(!PyArg_UnpackTuple(args,(char *)\"%s\",%d,%d", iname, num_fixed_arguments, tuple_arguments);
-	Printv(parse_args, arglist, ")) SWIG_fail;\n", NIL);
-      }
-    }
-
-    /* Now piece together the first part of the wrapper function */
-    Printv(f->code, self_parse, parse_args, get_pointers, NIL);
-
-    /* Check for trailing varargs */
-    if (varargs) {
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-	Replaceall(tm, "$input", "varargs");
-	Printv(f->code, tm, "\n", NIL);
-      }
-    }
-
-    /* Insert constraint checking code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (p = l; p;) {
-      if (!Getattr(p, "tmap:in:parse") && (tm = Getattr(p, "tmap:freearg"))) {
-	if (Getattr(p, "tmap:freearg:implicitconv")) {
-	  const char *convflag = "0";
-	  if (!Getattr(p, "hidden")) {
-	    SwigType *ptype = Getattr(p, "type");
-	    convflag = get_implicitconv_flag(classLookup(ptype));
-	  }
-	  if (strcmp(convflag, "0") == 0) {
-	    tm = 0;
-	  }
-	}
-	if (tm && (Len(tm) != 0)) {
-	  Replaceall(tm, "$source", Getattr(p, "lname"));
-	  Printv(cleanup, tm, "\n", NIL);
-	}
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$target", "resultobj");
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* if the object is a director, and the method call originated from its
-     * underlying python object, resolve the call by going up the c++ 
-     * inheritance chain.  otherwise try to resolve the method in python.  
-     * without this check an infinite loop is set up between the director and 
-     * shadow class method calls.
-     */
-
-    // NOTE: this code should only be inserted if this class is the
-    // base class of a director class.  however, in general we haven't
-    // yet analyzed all classes derived from this one to see if they are
-    // directors.  furthermore, this class may be used as the base of
-    // a director class defined in a completely different module at a
-    // later time, so this test must be included whether or not directorbase
-    // is true.  we do skip this code if directors have not been enabled
-    // at the command line to preserve source-level compatibility with
-    // non-polymorphic swig.  also, if this wrapper is for a smart-pointer
-    // method, there is no need to perform the test since the calling object
-    // (the smart-pointer) and the director object (the "pointee") are
-    // distinct.
-
-    director_method = is_member_director(n) && !is_smart_pointer() && !destructor;
-    if (director_method) {
-      Wrapper_add_local(f, "director", "Swig::Director *director = 0");
-      Append(f->code, "director = SWIG_DIRECTOR_CAST(arg1);\n");
-      if (dirprot_mode() && !is_public(n)) {
-	Printf(f->code, "if (!director || !(director->swig_get_inner(\"%s\"))) {\n", name);
-	Printf(f->code, "SWIG_SetErrorMsg(PyExc_RuntimeError,\"accessing protected member %s\");\n", name);
-	Append(f->code, "SWIG_fail;\n");
-	Append(f->code, "}\n");
-      }
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      if (funpack) {
-	const char *self_parm = builtin_self ? "self" : "swig_obj[0]";
-	Printf(f->code, "upcall = (director && (director->swig_get_self()==%s));\n", self_parm);
-      } else {
-	const char *self_parm = builtin_self ? "self" : "obj0";
-	Printf(f->code, "upcall = (director && (director->swig_get_self()==%s));\n", self_parm);
-      }
-    }
-
-    /* Emit the function call */
-    if (director_method) {
-      Append(f->code, "try {\n");
-    } else {
-      if (allow_thread) {
-	String *preaction = NewString("");
-	thread_begin_allow(n, preaction);
-	Setattr(n, "wrap:preaction", preaction);
-
-	String *postaction = NewString("");
-	thread_end_allow(n, postaction);
-	Setattr(n, "wrap:postaction", postaction);
-      }
-    }
-
-    Setattr(n, "wrap:name", wname);
-
-    Swig_director_emit_dynamic_cast(n, f);
-    String *actioncode = emit_action(n);
-
-    if (director_method) {
-      Append(actioncode, "} catch (Swig::DirectorException&) {\n");
-      Append(actioncode, "  SWIG_fail;\n");
-      Append(actioncode, "}\n");
-    }
-
-    /* This part below still needs cleanup */
-
-    /* Return the function value */
-    tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode);
-
-    if (tm) {
-      if (builtin_self) {
-	Replaceall(tm, "$self", "self");
-      } else if (funpack) {
-	Replaceall(tm, "$self", "swig_obj[0]");
-      } else {
-	Replaceall(tm, "$self", "obj0");
-      }
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Replaceall(tm, "$target", "resultobj");
-      Replaceall(tm, "$result", "resultobj");
-      if (builtin_ctor) {
-	Replaceall(tm, "$owner", "SWIG_BUILTIN_INIT");
-      } else if (handled_as_init) {
-	Replaceall(tm, "$owner", "SWIG_POINTER_NEW");
-      } else {
-	if (GetFlag(n, "feature:new")) {
-	  Replaceall(tm, "$owner", "SWIG_POINTER_OWN");
-	} else {
-	  Replaceall(tm, "$owner", "0");
-	}
-      }
-      // FIXME: this will not try to unwrap directors returned as non-director
-      //        base class pointers!
-
-      /* New addition to unwrap director return values so that the original
-       * python object is returned instead. 
-       */
-#if 1
-      int unwrap = 0;
-      String *decl = Getattr(n, "decl");
-      int is_pointer = SwigType_ispointer_return(decl);
-      int is_reference = SwigType_isreference_return(decl);
-      if (is_pointer || is_reference) {
-	String *type = Getattr(n, "type");
-	//Node *classNode = Swig_methodclass(n);
-	//Node *module = Getattr(classNode, "module");
-	Node *module = Getattr(parent, "module");
-	Node *target = Swig_directormap(module, type);
-	if (target)
-	  unwrap = 1;
-      }
-      if (unwrap) {
-	Wrapper_add_local(f, "director", "Swig::Director *director = 0");
-	Printf(f->code, "director = SWIG_DIRECTOR_CAST(%s);\n", Swig_cresult_name());
-	Append(f->code, "if (director) {\n");
-	Append(f->code, "  resultobj = director->swig_get_self();\n");
-	Append(f->code, "  Py_INCREF(resultobj);\n");
-	Append(f->code, "} else {\n");
-	Printf(f->code, "%s\n", tm);
-	Append(f->code, "}\n");
-      } else {
-	Printf(f->code, "%s\n", tm);
-      }
-#else
-      Printf(f->code, "%s\n", tm);
-#endif
-      Delete(tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name);
-    }
-    emit_return_variable(n, d, f);
-
-    /* Output argument output code */
-    Printv(f->code, outarg, NIL);
-
-    /* Output cleanup code */
-    int need_cleanup = Len(cleanup) != 0;
-    if (need_cleanup) {
-      Printv(f->code, cleanup, NIL);
-    }
-
-    /* Look to see if there is any newfree cleanup code */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printf(f->code, "%s\n", tm);
-	Delete(tm);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    if (director_method) {
-      if ((tm = Swig_typemap_lookup("directorfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$input", Swig_cresult_name());
-	Replaceall(tm, "$result", "resultobj");
-	Printf(f->code, "%s\n", tm);
-	Delete(tm);
-      }
-    }
-
-    if (builtin_ctor)
-      Append(f->code, "    return resultobj == Py_None ? -1 : 0;\n");
-    else
-      Append(f->code, "    return resultobj;\n");
-
-    /* Error handling code */
-
-    Append(f->code, "fail:\n");
-    if (need_cleanup) {
-      Printv(f->code, cleanup, NIL);
-    }
-    if (builtin_ctor)
-      Printv(f->code, "  return -1;\n", NIL);
-    else
-      Printv(f->code, "  return NULL;\n", NIL);
-
-
-    if (funpack) {
-      if (aliasobj0) {
-	Append(f->code, "#if defined(obj0)\n");
-	Append(f->code, "#undef obj0\n");
-	Append(f->code, "#endif\n");
-      }
-    }
-
-
-    Append(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", iname);
-    Replaceall(f->code, "$result", "resultobj");
-
-    if (builtin_self) {
-      Replaceall(f->code, "$self", "self");
-    } else if (funpack) {
-      Replaceall(f->code, "$self", "swig_obj[0]");
-    } else {
-      Replaceall(f->code, "$self", "obj0");
-    }
-
-    /* Dump the function out */
-    Wrapper_print(f, f_wrappers);
-
-    /* If varargs.  Need to emit a varargs stub */
-    if (varargs) {
-      DelWrapper(f);
-      f = NewWrapper();
-      if (funpack) {
-	Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", int nobjs, PyObject **swig_obj) {", NIL);
-      } else {
-	Printv(f->def, linkage, wrap_return, wname, "(PyObject *", self_param, ", PyObject *args) {", NIL);
-      }
-      Wrapper_add_local(f, "resultobj", builtin_ctor ? "int resultobj" : "PyObject *resultobj");
-      Wrapper_add_local(f, "varargs", "PyObject *varargs");
-      Wrapper_add_local(f, "newargs", "PyObject *newargs");
-      if (funpack) {
-	Wrapper_add_local(f, "i", "int i");
-	Printf(f->code, "newargs = PyTuple_New(%d);\n", num_fixed_arguments);
-	Printf(f->code, "for (i = 0; i < %d; ++i) {\n", num_fixed_arguments);
-	Printf(f->code, "  PyTuple_SET_ITEM(newargs, i, swig_obj[i]);\n");
-	Printf(f->code, "  Py_XINCREF(swig_obj[i]);\n");
-	Printf(f->code, "}\n");
-	Printf(f->code, "varargs = PyTuple_New(nobjs > %d ? nobjs - %d : 0);\n", num_fixed_arguments, num_fixed_arguments);
-	Printf(f->code, "for (i = 0; i < nobjs - %d; ++i) {\n", num_fixed_arguments);
-	Printf(f->code, "  PyTuple_SET_ITEM(newargs, i, swig_obj[i + %d]);\n", num_fixed_arguments);
-	Printf(f->code, "  Py_XINCREF(swig_obj[i + %d]);\n", num_fixed_arguments);
-	Printf(f->code, "}\n");
-      } else {
-	Printf(f->code, "newargs = PyTuple_GetSlice(args,0,%d);\n", num_fixed_arguments);
-	Printf(f->code, "varargs = PyTuple_GetSlice(args,%d,PyTuple_Size(args));\n", num_fixed_arguments);
-      }
-      Printf(f->code, "resultobj = %s__varargs__(%s,newargs,varargs);\n", wname, builtin ? "self" : "NULL");
-      Append(f->code, "Py_XDECREF(newargs);\n");
-      Append(f->code, "Py_XDECREF(varargs);\n");
-      Append(f->code, "return resultobj;\n");
-      Append(f->code, "}\n");
-      Wrapper_print(f, f_wrappers);
-    }
-
-    /* Now register the function with the interpreter.   */
-    if (!Getattr(n, "sym:overloaded")) {
-      if (!builtin_self)
-	add_method(iname, wname, allow_kwargs, n, funpack, num_required, num_arguments);
-
-      /* Create a shadow for this function (if enabled and not in a member function) */
-      if (!builtin && (shadow) && (!(shadow & PYSHADOW_MEMBER))) {
-	emitFunctionShadowHelper(n, in_class ? f_shadow_stubs : f_shadow, iname, allow_kwargs);
-      }
-    } else {
-      if (!Getattr(n, "sym:nextSibling")) {
-	dispatchFunction(n, linkage, funpack, builtin_self, builtin_ctor, director_class);
-      }
-    }
-
-    // Put this in tp_init of the PyTypeObject
-    if (builtin_ctor) {
-      if ((director_method || !is_private(n)) && !Getattr(class_members, iname)) {
-	Setattr(class_members, iname, n);
-	if (!builtin_tp_init)
-	  builtin_tp_init = Swig_name_wrapper(iname);
-      }
-    }
-
-    /* If this is a builtin type, create a PyGetSetDef entry for this member variable. */
-    if (builtin) {
-      const char *memname = "__dict__";
-      Hash *h = Getattr(builtin_getset, memname);
-      if (!h) {
-        h = NewHash();
-        Setattr(builtin_getset, memname, h);
-        Delete(h);
-      }
-      Setattr(h, "getter", "SwigPyObject_get___dict__");
-    }
-
-    if (builtin_getter) {
-      String *memname = Getattr(n, "membervariableHandler:sym:name");
-      if (!memname)
-	memname = iname;
-      Hash *h = Getattr(builtin_getset, memname);
-      if (!h) {
-	h = NewHash();
-	Setattr(builtin_getset, memname, h);
-	Delete(h);
-      }
-      Setattr(h, "getter", wrapper_name);
-      Delattr(n, "memberget");
-    }
-    if (builtin_setter) {
-      String *memname = Getattr(n, "membervariableHandler:sym:name");
-      if (!memname)
-	memname = iname;
-      Hash *h = Getattr(builtin_getset, memname);
-      if (!h) {
-	h = NewHash();
-	Setattr(builtin_getset, memname, h);
-	Delete(h);
-      }
-      Setattr(h, "setter", wrapper_name);
-      Delattr(n, "memberset");
-    }
-
-    if (in_class && builtin) {
-      /* Handle operator overloads for builtin types */
-      String *slot = Getattr(n, "feature:python:slot");
-      if (slot) {
-	String *func_type = Getattr(n, "feature:python:slot:functype");
-	String *closure_decl = getClosure(func_type, wrapper_name, overname ? 0 : funpack);
-	String *feature_name = NewStringf("feature:python:%s", slot);
-	String *closure_name = 0;
-	if (closure_decl) {
-	  closure_name = NewStringf("%s_%s_closure", wrapper_name, func_type);
-	  if (!GetFlag(builtin_closures, closure_name))
-	    Printf(builtin_closures_code, "%s /* defines %s */\n\n", closure_decl, closure_name);
-	  SetFlag(builtin_closures, closure_name);
-	  Delete(closure_decl);
-	} else {
-	  closure_name = Copy(wrapper_name);
-	}
-	if (func_type) {
-	  String *s = NewStringf("(%s) %s", func_type, closure_name);
-	  Delete(closure_name);
-	  closure_name = s;
-	}
-	Setattr(parent, feature_name, closure_name);
-	Delete(feature_name);
-	Delete(closure_name);
-      }
-
-      /* Handle comparison operators for builtin types */
-      String *compare = Getattr(n, "feature:python:compare");
-      if (compare) {
-	Hash *richcompare = Getattr(parent, "python:richcompare");
-	assert(richcompare);
-	Setattr(richcompare, compare, wrapper_name);
-      }
-    }
-
-    Delete(self_parse);
-    Delete(parse_args);
-    Delete(linkage);
-    Delete(arglist);
-    Delete(get_pointers);
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(kwargs);
-    Delete(wname);
-    DelWrapper(f);
-    Delete(wrapper_name);
-    return SWIG_OK;
-  }
-
-
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-
-    static int have_globals = 0;
-    String *tm;
-    Wrapper *getf, *setf;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    getf = NewWrapper();
-    setf = NewWrapper();
-
-    /* If this is our first call, add the globals variable to the
-       Python dictionary. */
-
-    if (!have_globals) {
-      Printf(f_init, "\t PyDict_SetItemString(md,(char *)\"%s\", SWIG_globals());\n", global_name);
-      if (builtin)
-	Printf(f_init, "\t SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", global_name);
-      have_globals = 1;
-      if (!builtin && (shadow) && (!(shadow & PYSHADOW_MEMBER))) {
-	Printf(f_shadow_stubs, "%s = %s.%s\n", global_name, module, global_name);
-      }
-    }
-    int assignable = is_assignable(n);
-
-    if (!builtin && shadow && !assignable && !in_class)
-      Printf(f_shadow_stubs, "%s = %s.%s\n", iname, global_name, iname);
-
-    String *getname = Swig_name_get(NSPACE_TODO, iname);
-    String *setname = Swig_name_set(NSPACE_TODO, iname);
-    String *vargetname = NewStringf("Swig_var_%s", getname);
-    String *varsetname = NewStringf("Swig_var_%s", setname);
-
-    /* Create a function for setting the value of the variable */
-    if (assignable) {
-      Setattr(n, "wrap:name", varsetname);
-      if (builtin && in_class) {
-	String *set_wrapper = Swig_name_wrapper(setname);
-	Setattr(n, "pybuiltin:setter", set_wrapper);
-	Delete(set_wrapper);
-      }
-      Printf(setf->def, "SWIGINTERN int %s(PyObject *_val) {", varsetname);
-      if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-	Replaceall(tm, "$source", "_val");
-	Replaceall(tm, "$target", name);
-	Replaceall(tm, "$input", "_val");
-	if (Getattr(n, "tmap:varin:implicitconv")) {
-	  Replaceall(tm, "$implicitconv", get_implicitconv_flag(n));
-	}
-	emit_action_code(n, setf->code, tm);
-	Delete(tm);
-      } else {
-	Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0));
-      }
-      Printv(setf->code, "  return 0;\n", NULL);
-      Append(setf->code, "fail:\n");
-      Printv(setf->code, "  return 1;\n", NULL);
-    } else {
-      /* Is a readonly variable.  Issue an error */
-      if (CPlusPlus) {
-	Printf(setf->def, "SWIGINTERN int %s(PyObject *) {", varsetname);
-      } else {
-	Printf(setf->def, "SWIGINTERN int %s(PyObject *_val SWIGUNUSED) {", varsetname);
-      }
-      Printv(setf->code, "  SWIG_Error(SWIG_AttributeError,\"Variable ", iname, " is read-only.\");\n", "  return 1;\n", NIL);
-    }
-
-    Append(setf->code, "}\n");
-    Wrapper_print(setf, f_wrappers);
-
-    /* Create a function for getting the value of a variable */
-    Setattr(n, "wrap:name", vargetname);
-    if (builtin && in_class) {
-      String *get_wrapper = Swig_name_wrapper(getname);
-      Setattr(n, "pybuiltin:getter", get_wrapper);
-      Delete(get_wrapper);
-    }
-    int addfail = 0;
-    Printf(getf->def, "SWIGINTERN PyObject *%s(void) {", vargetname);
-    Wrapper_add_local(getf, "pyobj", "PyObject *pyobj = 0");
-    if (builtin) {
-      Wrapper_add_local(getf, "self", "PyObject *self = 0");
-      Append(getf->code, "  (void)self;\n");
-    }
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-      Replaceall(tm, "$source", name);
-      Replaceall(tm, "$target", "pyobj");
-      Replaceall(tm, "$result", "pyobj");
-      addfail = emit_action_code(n, getf->code, tm);
-      Delete(tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-    }
-    Append(getf->code, "  return pyobj;\n");
-    if (addfail) {
-      Append(getf->code, "fail:\n");
-      Append(getf->code, "  return NULL;\n");
-    }
-    Append(getf->code, "}\n");
-
-    Wrapper_print(getf, f_wrappers);
-
-    /* Now add this to the variable linking mechanism */
-    Printf(f_init, "\t SWIG_addvarlink(SWIG_globals(),(char *)\"%s\",%s, %s);\n", iname, vargetname, varsetname);
-    if (builtin && shadow && !assignable && !in_class) {
-      Printf(f_init, "\t PyDict_SetItemString(md, (char *)\"%s\", PyObject_GetAttrString(SWIG_globals(), \"%s\"));\n", iname, iname);
-      Printf(f_init, "\t SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", iname);
-    }
-    Delete(vargetname);
-    Delete(varsetname);
-    Delete(getname);
-    Delete(setname);
-    DelWrapper(setf);
-    DelWrapper(getf);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  /* Determine if the node requires the _swigconstant code to be generated */
-  bool needs_swigconstant(Node *n) {
-    SwigType *type = Getattr(n, "type");
-    SwigType *qtype = SwigType_typedef_resolve_all(type);
-    SwigType *uqtype = SwigType_strip_qualifiers(qtype);
-    bool result = false;
-
-    /* Note, that we need special handling for function pointers, as
-     * SwigType_base(fptr) does not return the underlying pointer-to-function
-     * type but the return-type of function. */
-    if(!SwigType_isfunction(uqtype) && !SwigType_isfunctionpointer(uqtype)) {
-      SwigType *basetype = SwigType_base(uqtype);
-      result = SwigType_isclass(basetype) != 0;
-      Delete(basetype);
-    }
-
-    Delete(qtype);
-    Delete(uqtype);
-
-    return result;
-  }
-
-  virtual int constantWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *tm;
-    int have_tm = 0;
-    int have_builtin_symname = 0;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    /* Special hook for member pointer */
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(iname);
-      String *str = SwigType_str(type, wname);
-      Printf(f_header, "static %s = %s;\n", str, value);
-      Delete(str);
-      value = wname;
-    }
-
-    if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      Printf(const_code, "%s,\n", tm);
-      Delete(tm);
-      have_tm = 1;
-    }
-
-
-    if (builtin && in_class && Getattr(n, "pybuiltin:symname")) {
-      have_builtin_symname = 1;
-      Swig_require("builtin_constantWrapper", n, "*sym:name", "pybuiltin:symname", NIL);
-      Setattr(n, "sym:name", Getattr(n, "pybuiltin:symname"));
-    }
-
-    if ((tm = Swig_typemap_lookup("constcode", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      if (needs_swigconstant(n) && !builtin && (shadow) && (!(shadow & PYSHADOW_MEMBER)) && (!in_class || !Getattr(n, "feature:python:callback"))) {
-	// Generate `*_swigconstant()` method which registers the new constant.
-	//
-	// *_swigconstant methods are required for constants of class type.
-	// Class types are registered in shadow file (see *_swigregister). The
-	// instances of class must be created (registered) after the type is
-	// registered, so we can't let SWIG_init() to register constants of
-	// class type (the SWIG_init() is called before shadow classes are
-	// defined and registered).
-        Printf(f_wrappers, "SWIGINTERN PyObject *%s_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", iname);
-        Printf(f_wrappers, tab2 "PyObject *module;\n", tm);
-        Printf(f_wrappers, tab2 "PyObject *d;\n");
-	if (modernargs) {
-	  if (fastunpack) {
-	    Printf(f_wrappers, tab2 "if (!SWIG_Python_UnpackTuple(args,(char *)\"swigconstant\", 1, 1,&module)) return NULL;\n");
-	  } else {
-	    Printf(f_wrappers, tab2 "if (!PyArg_UnpackTuple(args,(char *)\"swigconstant\", 1, 1,&module)) return NULL;\n");
-	  }
-	} else {
-	  Printf(f_wrappers, tab2 "if (!PyArg_ParseTuple(args,(char *)\"O:swigconstant\", &module)) return NULL;\n");
-	}
-        Printf(f_wrappers, tab2 "d = PyModule_GetDict(module);\n");
-        Printf(f_wrappers, tab2 "if (!d) return NULL;\n");
-        Printf(f_wrappers, tab2 "%s\n", tm);
-        Printf(f_wrappers, tab2 "return SWIG_Py_Void();\n");
-        Printf(f_wrappers, "}\n\n\n");
-
-        // Register the method in SwigMethods array
-	String *cname = NewStringf("%s_swigconstant", iname);
-	add_method(cname, cname, 0);
-	Delete(cname);
-      } else {
-        Printf(f_init, "%s\n", tm);
-      }
-      Delete(tm);
-      have_tm = 1;
-    }
-
-    if (have_builtin_symname)
-      Swig_restore(n);
-
-    if (!have_tm) {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      return SWIG_NOWRAP;
-    }
-
-    if (!builtin && (shadow) && (!(shadow & PYSHADOW_MEMBER))) {
-      if (!in_class) {
-	if(needs_swigconstant(n)) {
-	  Printv(f_shadow, "\n",NIL);
-	  Printv(f_shadow, module, ".", iname, "_swigconstant(",module,")\n", NIL);
-	}
-	Printv(f_shadow, iname, " = ", module, ".", iname, "\n", NIL);
-      } else {
-	if (!(Getattr(n, "feature:python:callback"))) {
-	  if(needs_swigconstant(n)) {
-	    Printv(f_shadow_stubs, "\n",NIL);
-	    Printv(f_shadow_stubs, module, ".", iname, "_swigconstant(", module, ")\n", NIL);
-	  }
-	  Printv(f_shadow_stubs, iname, " = ", module, ".", iname, "\n", NIL);
-	}
-      }
-    }
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------ 
-   * nativeWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int nativeWrapper(Node *n) {
-    String *name = Getattr(n, "sym:name");
-    String *wrapname = Getattr(n, "wrap:name");
-
-    if (!addSymbol(wrapname, n))
-      return SWIG_ERROR;
-
-    add_method(name, wrapname, 0);
-    if (!builtin && shadow) {
-      Printv(f_shadow_stubs, name, " = ", module, ".", name, "\n", NIL);
-    }
-    return SWIG_OK;
-  }
-
-
-
-  /* ----------------------------------------------------------------------------
-   * BEGIN C++ Director Class modifications
-   * ------------------------------------------------------------------------- */
-
-  /* C++/Python polymorphism demo code
-   *
-   * TODO
-   *
-   * Move some boilerplate code generation to Swig_...() functions.
-   *
-   */
-
-  /* ---------------------------------------------------------------
-   * classDirectorMethod()
-   *
-   * Emit a virtual director method to pass a method call on to the 
-   * underlying Python object.
-   * ** Moved down due to gcc-2.96 internal error **
-   * --------------------------------------------------------------- */
-
-  int classDirectorMethods(Node *n);
-
-  int classDirectorMethod(Node *n, Node *parent, String *super);
-
-  /* ------------------------------------------------------------
-   * classDirectorConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *sub = NewString("");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewString("");
-    Printf(classname, "SwigDirector_%s", supername);
-
-    /* insert self parameter */
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("PyObject");
-    SwigType_add_pointer(type);
-    p = NewParm(type, NewString("self"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	Wrapper *w = NewWrapper();
-	String *call;
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-	call = Swig_csuperclass_call(0, basetype, superparms);
-	Printf(w->def, "%s::%s: %s, Swig::Director(self) { \n", classname, target, call);
-	Printf(w->def, "   SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype);
-	Append(w->def, "}\n");
-	Delete(target);
-	Wrapper_print(w, f_directors);
-	Delete(call);
-	DelWrapper(w);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(classname);
-    Delete(supername);
-    Delete(parms);
-    return Language::classDirectorConstructor(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDefaultConstructor()
-   * ------------------------------------------------------------ */
-
-  int classDirectorDefaultConstructor(Node *n) {
-    String *classname = Swig_class_name(n);
-    {
-      Node *parent = Swig_methodclass(n);
-      String *basetype = Getattr(parent, "classtype");
-      Wrapper *w = NewWrapper();
-      Printf(w->def, "SwigDirector_%s::SwigDirector_%s(PyObject *self) : Swig::Director(self) { \n", classname, classname);
-      Printf(w->def, "   SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype);
-      Append(w->def, "}\n");
-      Wrapper_print(w, f_directors);
-      DelWrapper(w);
-    }
-    Printf(f_directors_h, "    SwigDirector_%s(PyObject *self);\n", classname);
-    Delete(classname);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * classDirectorInit()
-   * ------------------------------------------------------------ */
-
-  int classDirectorInit(Node *n) {
-    String *declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "\n");
-    Printf(f_directors_h, "%s\n", declaration);
-    Printf(f_directors_h, "public:\n");
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorEnd()
-   * ------------------------------------------------------------ */
-
-  int classDirectorEnd(Node *n) {
-    String *classname = Swig_class_name(n);
-
-    if (dirprot_mode()) {
-      /*
-         This implementation uses a std::map<std::string,int>.
-
-         It should be possible to rewrite it using a more elegant way,
-         like copying the Java approach for the 'override' array.
-
-         But for now, this seems to be the least intrusive way.
-       */
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "/* Internal director utilities */\n");
-      Printf(f_directors_h, "public:\n");
-      Printf(f_directors_h, "    bool swig_get_inner(const char *swig_protected_method_name) const {\n");
-      Printf(f_directors_h, "      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);\n");
-      Printf(f_directors_h, "      return (iv != swig_inner.end() ? iv->second : false);\n");
-      Printf(f_directors_h, "    }\n");
-
-      Printf(f_directors_h, "    void swig_set_inner(const char *swig_protected_method_name, bool swig_val) const {\n");
-      Printf(f_directors_h, "      swig_inner[swig_protected_method_name] = swig_val;\n");
-      Printf(f_directors_h, "    }\n");
-      Printf(f_directors_h, "private:\n");
-      Printf(f_directors_h, "    mutable std::map<std::string, bool> swig_inner;\n");
-
-    }
-    if (director_method_index) {
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)\n");
-      Printf(f_directors_h, "/* VTable implementation */\n");
-      Printf(f_directors_h, "    PyObject *swig_get_method(size_t method_index, const char *method_name) const {\n");
-      Printf(f_directors_h, "      PyObject *method = vtable[method_index];\n");
-      Printf(f_directors_h, "      if (!method) {\n");
-      Printf(f_directors_h, "        swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);\n");
-      Printf(f_directors_h, "        method = PyObject_GetAttr(swig_get_self(), name);\n");
-      Printf(f_directors_h, "        if (!method) {\n");
-      Printf(f_directors_h, "          std::string msg = \"Method in class %s doesn't exist, undefined \";\n", classname);
-      Printf(f_directors_h, "          msg += method_name;\n");
-      Printf(f_directors_h, "          Swig::DirectorMethodException::raise(msg.c_str());\n");
-      Printf(f_directors_h, "        }\n");
-      Printf(f_directors_h, "        vtable[method_index] = method;\n");
-      Printf(f_directors_h, "      }\n");
-      Printf(f_directors_h, "      return method;\n");
-      Printf(f_directors_h, "    }\n");
-      Printf(f_directors_h, "private:\n");
-      Printf(f_directors_h, "    mutable swig::SwigVar_PyObject vtable[%d];\n", director_method_index);
-      Printf(f_directors_h, "#endif\n\n");
-    }
-
-    Printf(f_directors_h, "};\n\n");
-    return Language::classDirectorEnd(n);
-  }
-
-
-  /* ------------------------------------------------------------
-   * classDirectorDisown()
-   * ------------------------------------------------------------ */
-
-  int classDirectorDisown(Node *n) {
-    int result;
-    int oldshadow = shadow;
-    /* disable shadowing */
-    if (shadow)
-      shadow = shadow | PYSHADOW_MEMBER;
-    result = Language::classDirectorDisown(n);
-    shadow = oldshadow;
-    if (shadow) {
-      if (builtin) {
-	String *rname = SwigType_namestr(real_classname);
-	Printf(builtin_methods, "  { \"__disown__\", (PyCFunction) Swig::Director::swig_pyobj_disown< %s >, METH_NOARGS, \"\" },\n", rname);
-	Delete(rname);
-      } else {
-	String *symname = Getattr(n, "sym:name");
-	String *mrename = Swig_name_disown(NSPACE_TODO, symname);	//Getattr(n, "name"));
-	Printv(f_shadow, tab4, "def __disown__(self):\n", NIL);
-#ifdef USE_THISOWN
-	Printv(f_shadow, tab8, "self.thisown = 0\n", NIL);
-#else
-	Printv(f_shadow, tab8, "self.this.disown()\n", NIL);
-#endif
-	Printv(f_shadow, tab8, module, ".", mrename, "(self)\n", NIL);
-	Printv(f_shadow, tab8, "return weakref_proxy(self)\n", NIL);
-	Delete(mrename);
-      }
-    }
-    return result;
-  }
-
-  /* ----------------------------------------------------------------------------
-   * END of C++ Director Class modifications
-   * ------------------------------------------------------------------------- */
-
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classDeclaration(Node *n) {
-    if (shadow && !Getattr(n, "feature:onlychildren")) {
-      Node *mod = Getattr(n, "module");
-      if (mod) {
-	String *modname = Getattr(mod, "name");
-	Node *options = Getattr(mod, "options");
-	String *pkg = options ? Getattr(options, "package") : 0;
-	String *sym = Getattr(n, "sym:name");
-	String *importname = import_name_string(package, mainmodule, pkg, modname, sym);
-	Setattr(n, "python:proxy", importname);
-	Delete(importname);
-      }
-    }
-    int result = Language::classDeclaration(n);
-    return result;
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  String *add_explicit_scope(String *s) {
-    if (!Strstr(s, "::")) {
-      String *ss = NewStringf("::%s", s);
-      Delete(s);
-      s = ss;
-    }
-    return s;
-  }
-
-  void builtin_pre_decl(Node *n) {
-    String *name = Getattr(n, "name");
-    String *rname = add_explicit_scope(SwigType_namestr(name));
-    String *mname = SwigType_manglestr(rname);
-
-    Printf(f_init, "\n/* type '%s' */\n", rname);
-    Printf(f_init, "    builtin_pytype = (PyTypeObject *)&SwigPyBuiltin_%s_type;\n", mname);
-    Printf(f_init, "    builtin_pytype->tp_dict = d = PyDict_New();\n");
-
-    Delete(rname);
-    Delete(mname);
-  }
-
-  void builtin_post_decl(File *f, Node *n) {
-    String *name = Getattr(n, "name");
-    String *pname = Copy(name);
-    SwigType_add_pointer(pname);
-    String *symname = Getattr(n, "sym:name");
-    String *rname = add_explicit_scope(SwigType_namestr(name));
-    String *mname = SwigType_manglestr(rname);
-    String *pmname = SwigType_manglestr(pname);
-    String *templ = NewStringf("SwigPyBuiltin_%s", mname);
-    int funpack = modernargs && fastunpack;
-    static String *tp_new = NewString("PyType_GenericNew");
-
-    Printv(f_init, "  SwigPyBuiltin_SetMetaType(builtin_pytype, metatype);\n", NIL);
-
-    // We can’t statically initialize a structure member with a function defined in another C module
-    // So this is done in the initialization function instead, see https://docs.python.org/2/extending/newtypes.html
-    Printf(f_init, "  builtin_pytype->tp_new = %s;\n", getSlot(n, "feature:python:tp_new", tp_new));
-
-    Printv(f_init, "  builtin_base_count = 0;\n", NIL);
-    List *baselist = Getattr(n, "bases");
-    if (baselist) {
-      int base_count = 0;
-      for (Iterator b = First(baselist); b.item; b = Next(b)) {
-	String *bname = Getattr(b.item, "name");
-	if (!bname || GetFlag(b.item, "feature:ignore"))
-	  continue;
-	base_count++;
-	String *base_name = Copy(bname);
-	SwigType_add_pointer(base_name);
-	String *base_mname = SwigType_manglestr(base_name);
-	Printf(f_init, "  builtin_basetype = SWIG_MangledTypeQuery(\"%s\");\n", base_mname);
-	Printv(f_init, "  if (builtin_basetype && builtin_basetype->clientdata && ((SwigPyClientData *) builtin_basetype->clientdata)->pytype) {\n", NIL);
-	Printv(f_init, "    builtin_bases[builtin_base_count++] = ((SwigPyClientData *) builtin_basetype->clientdata)->pytype;\n", NIL);
-	Printv(f_init, "  } else {\n", NIL);
-	Printf(f_init, "    PyErr_SetString(PyExc_TypeError, \"Could not create type '%s' as base '%s' has not been initialized.\\n\");\n", symname, bname);
-	Printv(f_init, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-	Printv(f_init, "      return NULL;\n", NIL);
-	Printv(f_init, "#else\n", NIL);
-	Printv(f_init, "      return;\n", NIL);
-	Printv(f_init, "#endif\n", NIL);
-	Printv(f_init, "  }\n", NIL);
-	Delete(base_name);
-	Delete(base_mname);
-      }
-      if (base_count > max_bases)
-	max_bases = base_count;
-    }
-    Printv(f_init, "  builtin_bases[builtin_base_count] = NULL;\n", NIL);
-    Printv(f_init, "  SwigPyBuiltin_InitBases(builtin_pytype, builtin_bases);\n", NIL);
-    builtin_bases_needed = 1;
-
-    // Check for non-public destructor, in which case tp_dealloc will issue
-    // a warning and allow the memory to leak.  Any class that doesn't explicitly
-    // have a private/protected destructor has an implicit public destructor.
-    static String *tp_dealloc_bad = NewString("SwigPyBuiltin_BadDealloc");
-
-    String *getset_name = NewStringf("%s_getset", templ);
-    String *methods_name = NewStringf("%s_methods", templ);
-    String *getset_def = NewString("");
-    Printf(getset_def, "SWIGINTERN PyGetSetDef %s[] = {\n", getset_name);
-
-    // All objects have 'this' and 'thisown' attributes
-    Printv(f_init, "PyDict_SetItemString(d, \"this\", this_descr);\n", NIL);
-    Printv(f_init, "PyDict_SetItemString(d, \"thisown\", thisown_descr);\n", NIL);
-
-    // Now, the rest of the attributes
-    for (Iterator member_iter = First(builtin_getset); member_iter.item; member_iter = Next(member_iter)) {
-      String *memname = member_iter.key;
-      Hash *mgetset = member_iter.item;
-      String *getter = Getattr(mgetset, "getter");
-      String *setter = Getattr(mgetset, "setter");
-      const char *getter_closure = getter ? funpack ? "SwigPyBuiltin_FunpackGetterClosure" : "SwigPyBuiltin_GetterClosure" : "0";
-      const char *setter_closure = setter ? funpack ? "SwigPyBuiltin_FunpackSetterClosure" : "SwigPyBuiltin_SetterClosure" : "0";
-      String *gspair = NewStringf("%s_%s_getset", symname, memname);
-      Printf(f, "static SwigPyGetSet %s = { %s, %s };\n", gspair, getter ? getter : "0", setter ? setter : "0");
-      String *entry =
-	  NewStringf("{ (char *) \"%s\", (getter) %s, (setter) %s, (char *)\"%s.%s\", (void *) &%s }\n", memname, getter_closure,
-		     setter_closure, name, memname, gspair);
-      if (GetFlag(mgetset, "static")) {
-	Printf(f, "static PyGetSetDef %s_def = %s;\n", gspair, entry);
-	Printf(f_init, "static_getset = SwigPyStaticVar_new_getset(metatype, &%s_def);\n", gspair);
-	Printf(f_init, "PyDict_SetItemString(d, static_getset->d_getset->name, (PyObject *) static_getset);\n", memname);
-	Printf(f_init, "Py_DECREF(static_getset);\n");
-      } else {
-	Printf(getset_def, "    %s,\n", entry);
-      }
-      Delete(gspair);
-      Delete(entry);
-    }
-    Printv(f, getset_def, "    {NULL, NULL, NULL, NULL, NULL} /* Sentinel */\n", "};\n\n", NIL);
-
-    // Rich compare function
-    Hash *richcompare = Getattr(n, "python:richcompare");
-    String *richcompare_func = NewStringf("%s_richcompare", templ);
-    assert(richcompare);
-    Printf(f, "SWIGINTERN PyObject *\n");
-    Printf(f, "%s(PyObject *self, PyObject *other, int op) {\n", richcompare_func);
-    Printf(f, "  PyObject *result = NULL;\n");
-    if (!funpack) {
-      Printf(f, "  PyObject *tuple = PyTuple_New(1);\n");
-      Printf(f, "  assert(tuple);\n");
-      Printf(f, "  PyTuple_SET_ITEM(tuple, 0, other);\n");
-      Printf(f, "  Py_XINCREF(other);\n");
-    }
-    Iterator rich_iter = First(richcompare);
-    if (rich_iter.item) {
-      Printf(f, "  switch (op) {\n");
-      for (; rich_iter.item; rich_iter = Next(rich_iter))
-	Printf(f, "    case %s : result = %s(self, %s); break;\n", rich_iter.key, rich_iter.item, funpack ? "other" : "tuple");
-      Printv(f, "    default : break;\n", NIL);
-      Printf(f, "  }\n");
-    }
-    Printv(f, "  if (!result) {\n", NIL);
-    Printv(f, "    if (SwigPyObject_Check(self) && SwigPyObject_Check(other)) {\n", NIL);
-    Printv(f, "      result = SwigPyObject_richcompare((SwigPyObject *)self, (SwigPyObject *)other, op);\n", NIL);
-    Printv(f, "    } else {\n", NIL);
-    Printv(f, "      result = Py_NotImplemented;\n", NIL);
-    Printv(f, "      Py_INCREF(result);\n", NIL);
-    Printv(f, "    }\n", NIL);
-    Printv(f, "  }\n", NIL);
-    if (!funpack)
-      Printf(f, "  Py_DECREF(tuple);\n");
-    Printf(f, "  return result;\n");
-    Printf(f, "}\n\n");
-
-    // Methods
-    Printf(f, "SWIGINTERN PyMethodDef %s_methods[] = {\n", templ);
-    Dump(builtin_methods, f);
-    Printf(f, "  { NULL, NULL, 0, NULL } /* Sentinel */\n};\n\n");
-
-    // No instance dict for nondynamic objects
-    if (GetFlag(n, "feature:python:nondynamic"))
-      Setattr(n, "feature:python:tp_setattro", "SWIG_Python_NonDynamicSetAttr");
-
-    Node *mod = Getattr(n, "module");
-    String *modname = mod ? Getattr(mod, "name") : 0;
-    String *quoted_symname;
-    if (package) {
-      if (modname)
-	quoted_symname = NewStringf("\"%s.%s.%s\"", package, modname, symname);
-      else
-	quoted_symname = NewStringf("\"%s.%s\"", package, symname);
-    } else {
-      if (modname)
-	quoted_symname = NewStringf("\"%s.%s\"", modname, symname);
-      else
-	quoted_symname = NewStringf("\"%s\"", symname);
-    }
-    String *quoted_tp_doc_str = NewStringf("\"%s\"", getSlot(n, "feature:python:tp_doc"));
-    String *tp_init = NewString(builtin_tp_init ? Char(builtin_tp_init) : Swig_directorclass(n) ? "0" : "SwigPyBuiltin_BadInit");
-    String *tp_flags = NewString("Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_CHECKTYPES");
-    String *tp_flags_py3 = NewString("Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE");
-
-    static String *tp_basicsize = NewStringf("sizeof(SwigPyObject)");
-    static String *tp_dictoffset_default = NewString("offsetof(SwigPyObject, dict)");
-    static String *tp_hash = NewString("SwigPyObject_hash");
-    String *tp_as_number = NewStringf("&%s_type.as_number", templ);
-    String *tp_as_sequence = NewStringf("&%s_type.as_sequence", templ);
-    String *tp_as_mapping = NewStringf("&%s_type.as_mapping", templ);
-    String *tp_as_buffer = NewStringf("&%s_type.as_buffer", templ);
-
-    Printf(f, "static PyHeapTypeObject %s_type = {\n", templ);
-
-    // PyTypeObject ht_type
-    Printf(f, "  {\n");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    Printv(f, "    PyVarObject_HEAD_INIT(NULL, 0)\n", NIL);
-    Printv(f, "#else\n", NIL);
-    Printf(f, "    PyObject_HEAD_INIT(NULL)\n");
-    printSlot(f, getSlot(), "ob_size");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, quoted_symname, "tp_name");
-    printSlot(f, getSlot(n, "feature:python:tp_basicsize", tp_basicsize), "tp_basicsize");
-    printSlot(f, getSlot(n, "feature:python:tp_itemsize"), "tp_itemsize");
-    printSlot(f, getSlot(n, "feature:python:tp_dealloc", tp_dealloc_bad), "tp_dealloc", "destructor");
-    printSlot(f, getSlot(n, "feature:python:tp_print"), "tp_print", "printfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_getattr"), "tp_getattr", "getattrfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_setattr"), "tp_setattr", "setattrfunc");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_compare"), "tp_compare");
-    Printv(f, "#else\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_compare"), "tp_compare", "cmpfunc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_repr"), "tp_repr", "reprfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_as_number", tp_as_number), "tp_as_number");
-    printSlot(f, getSlot(n, "feature:python:tp_as_sequence", tp_as_sequence), "tp_as_sequence");
-    printSlot(f, getSlot(n, "feature:python:tp_as_mapping", tp_as_mapping), "tp_as_mapping");
-    printSlot(f, getSlot(n, "feature:python:tp_hash", tp_hash), "tp_hash", "hashfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_call"), "tp_call", "ternaryfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_str"), "tp_str", "reprfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_getattro"), "tp_getattro", "getattrofunc");
-    printSlot(f, getSlot(n, "feature:python:tp_setattro"), "tp_setattro", "setattrofunc");
-    printSlot(f, getSlot(n, "feature:python:tp_as_buffer", tp_as_buffer), "tp_as_buffer");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_flags", tp_flags_py3), "tp_flags");
-    Printv(f, "#else\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_flags", tp_flags), "tp_flags");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, quoted_tp_doc_str, "tp_doc");
-    printSlot(f, getSlot(n, "feature:python:tp_traverse"), "tp_traverse", "traverseproc");
-    printSlot(f, getSlot(n, "feature:python:tp_clear"), "tp_clear", "inquiry");
-    printSlot(f, getSlot(n, "feature:python:tp_richcompare", richcompare_func), "tp_richcompare", "richcmpfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_weaklistoffset"), "tp_weaklistoffset");
-    printSlot(f, getSlot(n, "feature:python:tp_iter"), "tp_iter", "getiterfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_iternext"), "tp_iternext", "iternextfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_methods", methods_name), "tp_methods");
-    printSlot(f, getSlot(n, "feature:python:tp_members"), "tp_members");
-    printSlot(f, getSlot(n, "feature:python:tp_getset", getset_name), "tp_getset");
-    printSlot(f, getSlot(n, "feature:python:tp_base"), "tp_base");
-    printSlot(f, getSlot(n, "feature:python:tp_dict"), "tp_dict");
-    printSlot(f, getSlot(n, "feature:python:tp_descr_get"), "tp_descr_get", "descrgetfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_descr_set"), "tp_descr_set", "descrsetfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_dictoffset", tp_dictoffset_default), "tp_dictoffset", "Py_ssize_t");
-    printSlot(f, getSlot(n, "feature:python:tp_init", tp_init), "tp_init", "initproc");
-    printSlot(f, getSlot(n, "feature:python:tp_alloc"), "tp_alloc", "allocfunc");
-    printSlot(f, getSlot(), "tp_new", "newfunc");
-    printSlot(f, getSlot(n, "feature:python:tp_free"), "tp_free", "freefunc");
-    printSlot(f, getSlot(n, "feature:python:tp_is_gc"), "tp_is_gc", "inquiry");
-    printSlot(f, getSlot(n, "feature:python:tp_bases"), "tp_bases", "PyObject *");
-    printSlot(f, getSlot(n, "feature:python:tp_mro"), "tp_mro", "PyObject *");
-    printSlot(f, getSlot(n, "feature:python:tp_cache"), "tp_cache", "PyObject *");
-    printSlot(f, getSlot(n, "feature:python:tp_subclasses"), "tp_subclasses", "PyObject *");
-    printSlot(f, getSlot(n, "feature:python:tp_weaklist"), "tp_weaklist", "PyObject *");
-    printSlot(f, getSlot(n, "feature:python:tp_del"), "tp_del", "destructor");
-    Printv(f, "#if PY_VERSION_HEX >= 0x02060000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_version_tag"), "tp_version_tag", "int");
-    Printv(f, "#endif\n", NIL);
-    Printv(f, "#if PY_VERSION_HEX >= 0x03040000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_finalize"), "tp_finalize", "destructor");
-    Printv(f, "#endif\n", NIL);
-    Printv(f, "#ifdef COUNT_ALLOCS\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_allocs"), "tp_allocs", "Py_ssize_t");
-    printSlot(f, getSlot(n, "feature:python:tp_frees"), "tp_frees", "Py_ssize_t");
-    printSlot(f, getSlot(n, "feature:python:tp_maxalloc"), "tp_maxalloc", "Py_ssize_t");
-    Printv(f, "#if PY_VERSION_HEX >= 0x02050000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_prev"), "tp_prev");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:tp_next"), "tp_next");
-    Printv(f, "#endif\n", NIL);
-    Printf(f, "  },\n");
-
-    // PyAsyncMethods as_async
-    Printv(f, "#if PY_VERSION_HEX >= 0x03050000\n", NIL);
-    Printf(f, "  {\n");
-    printSlot(f, getSlot(n, "feature:python:am_await"), "am_await", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:am_aiter"), "am_aiter", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:am_anext"), "am_anext", "unaryfunc");
-    Printf(f, "  },\n");
-    Printv(f, "#endif\n", NIL);
-
-    // PyNumberMethods as_number
-    Printf(f, "  {\n");
-    printSlot(f, getSlot(n, "feature:python:nb_add"), "nb_add", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_subtract"), "nb_subtract", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_multiply"), "nb_multiply", "binaryfunc");
-    Printv(f, "#if PY_VERSION_HEX < 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_divide"), "nb_divide", "binaryfunc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_remainder"), "nb_remainder", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_divmod"), "nb_divmod", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_power"), "nb_power", "ternaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_negative"), "nb_negative", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_positive"), "nb_positive", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_absolute"), "nb_absolute", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_nonzero"), "nb_nonzero", "inquiry");
-    printSlot(f, getSlot(n, "feature:python:nb_invert"), "nb_invert", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_lshift"), "nb_lshift", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_rshift"), "nb_rshift", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_and"), "nb_and", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_xor"), "nb_xor", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_or"), "nb_or", "binaryfunc");
-    Printv(f, "#if PY_VERSION_HEX < 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_coerce"), "nb_coerce", "coercion");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_int"), "nb_int", "unaryfunc");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_reserved"), "nb_reserved", "void *");
-    Printv(f, "#else\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_long"), "nb_long", "unaryfunc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_float"), "nb_float", "unaryfunc");
-    Printv(f, "#if PY_VERSION_HEX < 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_oct"), "nb_oct", "unaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_hex"), "nb_hex", "unaryfunc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_add"), "nb_inplace_add", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_subtract"), "nb_inplace_subtract", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_multiply"), "nb_inplace_multiply", "binaryfunc");
-    Printv(f, "#if PY_VERSION_HEX < 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_divide"), "nb_inplace_divide", "binaryfunc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_remainder"), "nb_inplace_remainder", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_power"), "nb_inplace_power", "ternaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_lshift"), "nb_inplace_lshift", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_rshift"), "nb_inplace_rshift", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_and"), "nb_inplace_and", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_xor"), "nb_inplace_xor", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_or"), "nb_inplace_or", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_floor_divide"), "nb_floor_divide", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_divide"), "nb_true_divide", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_floor_divide"), "nb_inplace_floor_divide", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_divide"), "nb_inplace_true_divide", "binaryfunc");
-    Printv(f, "#if PY_VERSION_HEX >= 0x02050000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_index"), "nb_index", "unaryfunc");
-    Printv(f, "#endif\n", NIL);
-    Printv(f, "#if PY_VERSION_HEX >= 0x03050000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:nb_matrix_multiply"), "nb_matrix_multiply", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:nb_inplace_matrix_multiply"), "nb_inplace_matrix_multiply", "binaryfunc");
-    Printv(f, "#endif\n", NIL);
-    Printf(f, "  },\n");
-
-    // PyMappingMethods as_mapping;
-    Printf(f, "  {\n");
-    printSlot(f, getSlot(n, "feature:python:mp_length"), "mp_length", "lenfunc");
-    printSlot(f, getSlot(n, "feature:python:mp_subscript"), "mp_subscript", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:mp_ass_subscript"), "mp_ass_subscript", "objobjargproc");
-    Printf(f, "  },\n");
-
-    // PySequenceMethods as_sequence;
-    Printf(f, "  {\n");
-    printSlot(f, getSlot(n, "feature:python:sq_length"), "sq_length", "lenfunc");
-    printSlot(f, getSlot(n, "feature:python:sq_concat"), "sq_concat", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:sq_repeat"), "sq_repeat", "ssizeargfunc");
-    printSlot(f, getSlot(n, "feature:python:sq_item"), "sq_item", "ssizeargfunc");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:was_sq_slice"), "was_sq_slice", "void *");
-    Printv(f, "#else\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:sq_slice"), "sq_slice", "ssizessizeargfunc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:sq_ass_item"), "sq_ass_item", "ssizeobjargproc");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:was_sq_ass_slice"), "was_sq_ass_slice", "void *");
-    Printv(f, "#else\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:sq_ass_slice"), "sq_ass_slice", "ssizessizeobjargproc");
-    Printv(f, "#endif\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:sq_contains"), "sq_contains", "objobjproc");
-    printSlot(f, getSlot(n, "feature:python:sq_inplace_concat"), "sq_inplace_concat", "binaryfunc");
-    printSlot(f, getSlot(n, "feature:python:sq_inplace_repeat"), "sq_inplace_repeat", "ssizeargfunc");
-    Printf(f, "  },\n");
-
-    // PyBufferProcs as_buffer;
-    Printf(f, "  {\n");
-    Printv(f, "#if PY_VERSION_HEX < 0x03000000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:bf_getreadbuffer"), "bf_getreadbuffer", "readbufferproc");
-    printSlot(f, getSlot(n, "feature:python:bf_getwritebuffer"), "bf_getwritebuffer", "writebufferproc");
-    printSlot(f, getSlot(n, "feature:python:bf_getsegcount"), "bf_getsegcount", "segcountproc");
-    printSlot(f, getSlot(n, "feature:python:bf_getcharbuffer"), "bf_getcharbuffer", "charbufferproc");
-    Printv(f, "#endif\n", NIL);
-    Printv(f, "#if PY_VERSION_HEX >= 0x02060000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:bf_getbuffer"), "bf_getbuffer", "getbufferproc");
-    printSlot(f, getSlot(n, "feature:python:bf_releasebuffer"), "bf_releasebuffer", "releasebufferproc");
-    Printv(f, "#endif\n", NIL);
-    Printf(f, "  },\n");
-
-    // PyObject *ht_name, *ht_slots, *ht_qualname;
-    printSlot(f, getSlot(n, "feature:python:ht_name"), "ht_name", "PyObject *");
-    printSlot(f, getSlot(n, "feature:python:ht_slots"), "ht_slots", "PyObject *");
-    Printv(f, "#if PY_VERSION_HEX >= 0x03030000\n", NIL);
-    printSlot(f, getSlot(n, "feature:python:ht_qualname"), "ht_qualname", "PyObject *");
-
-    // struct _dictkeysobject *ht_cached_keys;
-    printSlot(f, getSlot(n, "feature:python:ht_cached_keys"), "ht_cached_keys");
-    Printv(f, "#endif\n", NIL);
-    Printf(f, "};\n\n");
-
-    String *clientdata = NewString("");
-    Printf(clientdata, "&%s_clientdata", templ);
-    SwigType_remember_mangleddata(pmname, clientdata);
-
-    SwigType *smart = Swig_cparse_smartptr(n);
-    if (smart) {
-      SwigType_add_pointer(smart);
-      String *smart_pmname = SwigType_manglestr(smart);
-      SwigType_remember_mangleddata(smart_pmname, clientdata);
-      Delete(smart_pmname);
-    }
-
-    String *clientdata_klass = NewString("0");
-    if (GetFlag(n, "feature:implicitconv")) {
-      Clear(clientdata_klass);
-      Printf(clientdata_klass, "(PyObject *) &%s_type", templ);
-    }
-
-    Printf(f, "SWIGINTERN SwigPyClientData %s_clientdata = {%s, 0, 0, 0, 0, 0, (PyTypeObject *)&%s_type};\n\n", templ, clientdata_klass, templ);
-
-    Printv(f_init, "    if (PyType_Ready(builtin_pytype) < 0) {\n", NIL);
-    Printf(f_init, "      PyErr_SetString(PyExc_TypeError, \"Could not create type '%s'.\");\n", symname);
-    Printv(f_init, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);
-    Printv(f_init, "      return NULL;\n", NIL);
-    Printv(f_init, "#else\n", NIL);
-    Printv(f_init, "      return;\n", NIL);
-    Printv(f_init, "#endif\n", NIL);
-    Printv(f_init, "    }\n", NIL);
-    Printv(f_init, "    Py_INCREF(builtin_pytype);\n", NIL);
-    Printf(f_init, "    PyModule_AddObject(m, \"%s\", (PyObject *)builtin_pytype);\n", symname);
-    Printf(f_init, "    SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", symname);
-    Printv(f_init, "    d = md;\n", NIL);
-
-    Delete(clientdata);
-    Delete(smart);
-    Delete(rname);
-    Delete(pname);
-    Delete(mname);
-    Delete(pmname);
-    Delete(templ);
-    Delete(tp_flags);
-    Delete(tp_flags_py3);
-    Delete(tp_as_buffer);
-    Delete(tp_as_mapping);
-    Delete(tp_as_sequence);
-    Delete(tp_as_number);
-    Delete(quoted_symname);
-    Delete(quoted_tp_doc_str);
-    Delete(tp_init);
-    Delete(clientdata_klass);
-    Delete(richcompare_func);
-    Delete(getset_name);
-    Delete(methods_name);
-  }
-
-  virtual int classHandler(Node *n) {
-    int oldclassic = classic;
-    int oldmodern = modern;
-    File *f_shadow_file = f_shadow;
-    Node *base_node = NULL;
-
-    if (shadow) {
-
-      /* Create new strings for building up a wrapper function */
-      have_constructor = 0;
-      have_repr = 0;
-
-      if (GetFlag(n, "feature:classic")) {
-	classic = 1;
-	modern = 0;
-      }
-      if (GetFlag(n, "feature:modern")) {
-	classic = 0;
-	modern = 1;
-      }
-      if (GetFlag(n, "feature:exceptionclass")) {
-	classic = 1;
-	modern = 0;
-      }
-
-      class_name = Getattr(n, "sym:name");
-      real_classname = Getattr(n, "name");
-
-      if (!addSymbol(class_name, n))
-	return SWIG_ERROR;
-
-      if (builtin) {
-	List *baselist = Getattr(n, "bases");
-	if (baselist && Len(baselist) > 0) {
-	  Iterator b = First(baselist);
-	  base_node = b.item;
-	}
-      }
-
-      shadow_indent = (String *) tab4;
-
-      /* Handle inheritance */
-      String *base_class = NewString("");
-      List *baselist = Getattr(n, "bases");
-      if (baselist && Len(baselist)) {
-	Iterator b;
-	b = First(baselist);
-	while (b.item) {
-	  String *bname = Getattr(b.item, "python:proxy");
-	  bool ignore = GetFlag(b.item, "feature:ignore") ? true : false;
-	  if (!bname || ignore) {
-	    if (!bname && !ignore) {
-	      Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(n), Getline(n),
-			   "Base class '%s' ignored - unknown module name for base. Either import the appropriate module interface file or specify the name of the module in the %%import directive.\n",
-			   SwigType_namestr(Getattr(b.item, "name")));
-	    }
-	    b = Next(b);
-	    continue;
-	  }
-	  Printv(base_class, bname, NIL);
-	  b = Next(b);
-	  if (b.item) {
-            Printv(base_class, ", ", NIL);
-	  }
-	}
-      }
-
-      if (builtin) {
-	Hash *base_richcompare = NULL;
-	Hash *richcompare = NULL;
-	if (base_node)
-	  base_richcompare = Getattr(base_node, "python:richcompare");
-	if (base_richcompare)
-	  richcompare = Copy(base_richcompare);
-	else
-	  richcompare = NewHash();
-	Setattr(n, "python:richcompare", richcompare);
-      }
-
-      /* dealing with abstract base class */
-      String *abcs = Getattr(n, "feature:python:abc");
-      if (py3 && abcs) {
-	if (Len(base_class)) {
-	  Printv(base_class, ", ", NIL);
-	}
-	Printv(base_class, abcs, NIL);
-      }
-
-      if (builtin) {
-	if (have_docstring(n)) {
-	  String *str = cdocstring(n, AUTODOC_CLASS);
-	  Setattr(n, "feature:python:tp_doc", str);
-	  Delete(str);
-	} else {
-	  String *name = Getattr(n, "name");
-	  String *rname = add_explicit_scope(SwigType_namestr(name));
-	  Setattr(n, "feature:python:tp_doc", rname);
-	  Delete(rname);
-	}
-      } else {
-	Printv(f_shadow, "class ", class_name, NIL);
-
-	if (Len(base_class)) {
-	  Printf(f_shadow, "(%s)", base_class);
-	} else {
-	  if (!classic) {
-	    Printf(f_shadow, modern ? "(object)" : "(_object)");
-	  }
-	  if (GetFlag(n, "feature:exceptionclass")) {
-	    Printf(f_shadow, "(Exception)");
-	  }
-	}
-
-	Printf(f_shadow, ":\n");
-	if (have_docstring(n)) {
-	  String *str = docstring(n, AUTODOC_CLASS, tab4);
-	  if (str && Len(str))
-	    Printv(f_shadow, tab4, str, "\n\n", NIL);
-	}
-
-	if (!modern) {
-	  Printv(f_shadow, tab4, "__swig_setmethods__ = {}\n", NIL);
-	  if (Len(base_class)) {
-	    Printv(f_shadow, tab4, "for _s in [", base_class, "]:\n", tab8, "__swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))\n", NIL);
-	  }
-
-	  if (!GetFlag(n, "feature:python:nondynamic")) {
-	    Printv(f_shadow, tab4, "__setattr__ = lambda self, name, value: _swig_setattr(self, ", class_name, ", name, value)\n", NIL);
-	  } else {
-	    Printv(f_shadow, tab4, "__setattr__ = lambda self, name, value: _swig_setattr_nondynamic(self, ", class_name, ", name, value)\n", NIL);
-	  }
-
-	  Printv(f_shadow, tab4, "__swig_getmethods__ = {}\n", NIL);
-	  if (Len(base_class)) {
-	    Printv(f_shadow, tab4, "for _s in [", base_class, "]:\n", tab8, "__swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))\n", NIL);
-	  }
-
-	  Printv(f_shadow, tab4, "__getattr__ = lambda self, name: _swig_getattr(self, ", class_name, ", name)\n", NIL);
-	} else {
-	  Printv(f_shadow, tab4, "thisown = _swig_property(lambda x: x.this.own(), ", "lambda x, v: x.this.own(v), doc='The membership flag')\n", NIL);
-	  /* Add static attribute */
-	  if (GetFlag(n, "feature:python:nondynamic")) {
-	    Printv(f_shadow_file,
-		   tab4, "__setattr__ = _swig_setattr_nondynamic_method(object.__setattr__)\n",
-		   tab4, "class __metaclass__(type):\n", tab4, tab4, "__setattr__ = _swig_setattr_nondynamic_method(type.__setattr__)\n", NIL);
-	  }
-	}
-      }
-    }
-
-    /* Emit all of the members */
-
-    in_class = 1;
-    if (builtin)
-      builtin_pre_decl(n);
-
-    /* Override the shadow file so we can capture its methods */
-    f_shadow = NewString("");
-
-    // Set up type check for director class constructor
-    Clear(none_comparison);
-    if (builtin && Swig_directorclass(n)) {
-      String *p_real_classname = Copy(real_classname);
-      SwigType_add_pointer(p_real_classname);
-      String *mangle = SwigType_manglestr(p_real_classname);
-      String *descriptor = NewStringf("SWIGTYPE%s", mangle);
-      Printv(none_comparison, "self->ob_type != ((SwigPyClientData *)(", descriptor, ")->clientdata)->pytype", NIL);
-      Delete(descriptor);
-      Delete(mangle);
-      Delete(p_real_classname);
-    } else {
-      Printv(none_comparison, "$arg != Py_None", NIL);
-    }
-
-    Language::classHandler(n);
-
-    in_class = 0;
-
-    /* Complete the class */
-    if (shadow) {
-      /* Generate a class registration function */
-      // Replace storing a pointer to underlying class with a smart pointer (intended for use with non-intrusive smart pointers)
-      SwigType *smart = Swig_cparse_smartptr(n);
-      SwigType *ct = Copy(smart ? smart : real_classname);
-      SwigType_add_pointer(ct);
-      SwigType *realct = Copy(real_classname);
-      SwigType_add_pointer(realct);
-      SwigType_remember(realct);
-      if (builtin) {
-	Printv(f_wrappers, builtin_closures_code, NIL);
-	Delete(builtin_closures_code);
-	builtin_closures_code = NewString("");
-	Clear(builtin_closures);
-      } else {
-	Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL);
-	Printv(f_wrappers, "  PyObject *obj;\n", NIL);
-	if (modernargs) {
-	  if (fastunpack) {
-	    Printv(f_wrappers, "  if (!SWIG_Python_UnpackTuple(args,(char *)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL);
-	  } else {
-	    Printv(f_wrappers, "  if (!PyArg_UnpackTuple(args,(char *)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL);
-	  }
-	} else {
-	  Printv(f_wrappers, "  if (!PyArg_ParseTuple(args,(char *)\"O:swigregister\", &obj)) return NULL;\n", NIL);
-	}
-
-	Printv(f_wrappers,
-	       "  SWIG_TypeNewClientData(SWIGTYPE", SwigType_manglestr(ct), ", SWIG_NewClientData(obj));\n", "  return SWIG_Py_Void();\n", "}\n\n", NIL);
-	String *cname = NewStringf("%s_swigregister", class_name);
-	add_method(cname, cname, 0);
-	Delete(cname);
-      }
-      Delete(smart);
-      Delete(ct);
-      Delete(realct);
-      if (!have_constructor) {
-	if (!builtin)
-	  Printv(f_shadow_file, "\n", tab4, "def __init__(self, *args, **kwargs):\n", tab8, "raise AttributeError(\"", "No constructor defined",
-		 (Getattr(n, "abstracts") ? " - class is abstract" : ""), "\")\n", NIL);
-      } else if (fastinit && !builtin) {
-
-	Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL);
-	Printv(f_wrappers, "  return SWIG_Python_InitShadowInstance(args);\n", "}\n\n", NIL);
-	String *cname = NewStringf("%s_swiginit", class_name);
-	add_method(cname, cname, 0);
-	Delete(cname);
-      }
-      if (!have_repr && !builtin) {
-	/* Supply a repr method for this class  */
-	String *rname = SwigType_namestr(real_classname);
-	if (new_repr) {
-	  Printv(f_shadow_file, tab4, "__repr__ = _swig_repr\n", NIL);
-	} else {
-	  Printv(f_shadow_file, tab4, "def __repr__(self):\n", tab8, "return \"<C ", rname, " instance at %p>\" % (self.this,)\n", NIL);
-	}
-	Delete(rname);
-      }
-
-      if (builtin)
-	builtin_post_decl(f_builtins, n);
-
-      if (builtin_tp_init) {
-	Delete(builtin_tp_init);
-	builtin_tp_init = 0;
-      }
-
-      /* Now emit methods */
-      if (!builtin)
-	Printv(f_shadow_file, f_shadow, NIL);
-
-      /* Now the Ptr class */
-      if (classptr && !builtin) {
-	Printv(f_shadow_file, "\nclass ", class_name, "Ptr(", class_name, "):\n", tab4, "def __init__(self, this):\n", NIL);
-	if (!modern) {
-	  Printv(f_shadow_file,
-		 tab8, "try:\n", tab8, tab4, "self.this.append(this)\n",
-		 tab8, "except __builtin__.Exception:\n", tab8, tab4, "self.this = this\n", tab8, "self.this.own(0)\n", tab8, "self.__class__ = ", class_name, "\n\n", NIL);
-	} else {
-	  Printv(f_shadow_file,
-		 tab8, "try:\n", tab8, tab4, "self.this.append(this)\n",
-		 tab8, "except __builtin__.Exception:\n", tab8, tab4, "self.this = this\n", tab8, "self.this.own(0)\n", tab8, "self.__class__ = ", class_name, "\n\n", NIL);
-	}
-      }
-
-      if (!builtin) {
-	if (fastproxy) {
-	  List *shadow_list = Getattr(n, "shadow_methods");
-	  for (int i = 0; i < Len(shadow_list); ++i) {
-	    String *symname = Getitem(shadow_list, i);
-	    Printf(f_shadow_file, "%s.%s = new_instancemethod(%s.%s, None, %s)\n", class_name, symname, module, Swig_name_member(NSPACE_TODO, class_name, symname),
-		   class_name);
-	  }
-	}
-	Printf(f_shadow_file, "%s_swigregister = %s.%s_swigregister\n", class_name, module, class_name);
-	Printf(f_shadow_file, "%s_swigregister(%s)\n", class_name, class_name);
-      }
-
-      shadow_indent = 0;
-      Printf(f_shadow_file, "%s\n", f_shadow_stubs);
-      Clear(f_shadow_stubs);
-    }
-
-    if (builtin) {
-      Clear(class_members);
-      Clear(builtin_getset);
-      Clear(builtin_methods);
-    }
-
-    classic = oldclassic;
-    modern = oldmodern;
-
-    /* Restore shadow file back to original version */
-    Delete(f_shadow);
-    f_shadow = f_shadow_file;
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * functionHandler()  -  Mainly overloaded for callback handling
-   * ------------------------------------------------------------ */
-
-  virtual int functionHandler(Node *n) {
-    String *pcb = GetFlagAttr(n, "feature:python:callback");
-    if (pcb) {
-      if (Strcmp(pcb, "1") == 0) {
-	SetFlagAttr(n, "feature:callback", "%s_cb_ptr");
-      } else {
-	SetFlagAttr(n, "feature:callback", pcb);
-      }
-      autodoc_l dlevel = autodoc_level(Getattr(n, "feature:autodoc"));
-      if (dlevel != NO_AUTODOC && dlevel > TYPES_AUTODOC) {
-	Setattr(n, "feature:autodoc", "1");
-      }
-    }
-    return Language::functionHandler(n);
-  }
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    int oldshadow;
-
-    if (builtin)
-      Swig_save("builtin_memberfunc", n, "python:argcount", NIL);
-
-    /* Create the default member function */
-    oldshadow = shadow;		/* Disable shadowing when wrapping member functions */
-    if (shadow)
-      shadow = shadow | PYSHADOW_MEMBER;
-    Language::memberfunctionHandler(n);
-    shadow = oldshadow;
-
-    if (builtin && in_class) {
-      // Can't use checkAttribute(n, "access", "public") because
-      // "access" attr isn't set on %extend methods
-      if (!checkAttribute(n, "access", "private") && strncmp(Char(symname), "operator ", 9) && !Getattr(class_members, symname)) {
-	String *fullname = Swig_name_member(NSPACE_TODO, class_name, symname);
-	String *wname = Swig_name_wrapper(fullname);
-	Setattr(class_members, symname, n);
-	int argcount = Getattr(n, "python:argcount") ? atoi(Char(Getattr(n, "python:argcount"))) : 2;
-	String *ds = have_docstring(n) ? cdocstring(n, AUTODOC_FUNC) : NewString("");
-	if (check_kwargs(n)) {
-	  Printf(builtin_methods, "  { \"%s\", (PyCFunction) %s, METH_VARARGS|METH_KEYWORDS, (char *) \"%s\" },\n", symname, wname, ds);
-	} else if (argcount == 0) {
-	  Printf(builtin_methods, "  { \"%s\", (PyCFunction) %s, METH_NOARGS, (char *) \"%s\" },\n", symname, wname, ds);
-	} else if (argcount == 1) {
-	  Printf(builtin_methods, "  { \"%s\", (PyCFunction) %s, METH_O, (char *) \"%s\" },\n", symname, wname, ds);
-	} else {
-	  Printf(builtin_methods, "  { \"%s\", (PyCFunction) %s, METH_VARARGS, (char *) \"%s\" },\n", symname, wname, ds);
-	}
-	Delete(fullname);
-	Delete(wname);
-	Delete(ds);
-      }
-    }
-
-    if (builtin)
-      Swig_restore(n);
-
-    if (!Getattr(n, "sym:nextSibling")) {
-      if (shadow && !builtin) {
-	int fproxy = fastproxy;
-	String *fullname = Swig_name_member(NSPACE_TODO, class_name, symname);
-	if (Strcmp(symname, "__repr__") == 0) {
-	  have_repr = 1;
-	}
-	if (Getattr(n, "feature:shadow")) {
-	  String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n), "%feature(\"shadow\")");
-	  String *pyaction = NewStringf("%s.%s", module, fullname);
-	  Replaceall(pycode, "$action", pyaction);
-	  Delete(pyaction);
-	  Printv(f_shadow, pycode, "\n", NIL);
-	  Delete(pycode);
-	  fproxy = 0;
-	} else {
-	  int allow_kwargs = (check_kwargs(n) && !Getattr(n, "sym:overloaded")) ? 1 : 0;
-	  String *parms = make_pyParmList(n, true, false, allow_kwargs);
-	  String *callParms = make_pyParmList(n, true, true, allow_kwargs);
-	  if (!have_addtofunc(n)) {
-	    if (!fastproxy || olddefs) {
-	      Printv(f_shadow, "\n", tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
-	      Printv(f_shadow, tab8, "return ", funcCall(fullname, callParms), "\n", NIL);
-	    }
-	  } else {
-	    Printv(f_shadow, "\n", tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
-	    if (have_docstring(n))
-	      Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL);
-	    if (have_pythonprepend(n)) {
-	      fproxy = 0;
-	      Printv(f_shadow, indent_pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
-	    }
-	    if (have_pythonappend(n)) {
-	      fproxy = 0;
-	      Printv(f_shadow, tab8, "val = ", funcCall(fullname, callParms), "\n", NIL);
-	      Printv(f_shadow, indent_pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL);
-	      Printv(f_shadow, tab8, "return val\n\n", NIL);
-	    } else {
-	      Printv(f_shadow, tab8, "return ", funcCall(fullname, callParms), "\n\n", NIL);
-	    }
-	  }
-	}
-	if (fproxy) {
-	  List *shadow_list = Getattr(getCurrentClass(), "shadow_methods");
-	  if (!shadow_list) {
-	    shadow_list = NewList();
-	    Setattr(getCurrentClass(), "shadow_methods", shadow_list);
-	    Delete(shadow_list);
-	  }
-	  Append(shadow_list, symname);
-	}
-	Delete(fullname);
-      }
-    }
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    if (builtin && in_class) {
-      Swig_save("builtin_memberconstantHandler", n, "pybuiltin:symname", NIL);
-      Setattr(n, "pybuiltin:symname", symname);
-    }
-    Language::staticmemberfunctionHandler(n);
-    if (builtin && in_class) {
-      Swig_restore(n);
-    }
-
-    if (builtin && in_class) {
-      if ((GetFlagAttr(n, "feature:extend") || checkAttribute(n, "access", "public"))
-	  && !Getattr(class_members, symname)) {
-	String *fullname = Swig_name_member(NSPACE_TODO, class_name, symname);
-	String *wname = Swig_name_wrapper(fullname);
-	Setattr(class_members, symname, n);
-	int funpack = modernargs && fastunpack && !Getattr(n, "sym:overloaded");
-	String *pyflags = NewString("METH_STATIC|");
-	int argcount = Getattr(n, "python:argcount") ? atoi(Char(Getattr(n, "python:argcount"))) : 2;
-	if (funpack && argcount == 0)
-	  Append(pyflags, "METH_NOARGS");
-	else if (funpack && argcount == 1)
-	  Append(pyflags, "METH_O");
-	else
-	  Append(pyflags, "METH_VARARGS");
-	if (have_docstring(n)) {
-	  String *ds = cdocstring(n, AUTODOC_STATICFUNC);
-	  Printf(builtin_methods, "  { \"%s\", (PyCFunction) %s, %s, (char *) \"%s\" },\n", symname, wname, pyflags, ds);
-	  Delete(ds);
-	} else {
-	  Printf(builtin_methods, "  { \"%s\", (PyCFunction) %s, %s, \"\" },\n", symname, wname, pyflags);
-	}
-	Delete(fullname);
-	Delete(wname);
-	Delete(pyflags);
-      }
-      return SWIG_OK;
-    }
-
-    if (Getattr(n, "sym:nextSibling")) {
-      return SWIG_OK;
-    }
-
-    if (shadow) {
-      if (!Getattr(n, "feature:python:callback") && have_addtofunc(n)) {
-	int kw = (check_kwargs(n) && !Getattr(n, "sym:overloaded")) ? 1 : 0;
-	String *parms = make_pyParmList(n, false, false, kw);
-	String *callParms = make_pyParmList(n, false, true, kw);
-	Printv(f_shadow, "\n", tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
-	if (have_docstring(n))
-	  Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL);
-	if (have_pythonprepend(n))
-	  Printv(f_shadow, indent_pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
-	if (have_pythonappend(n)) {
-	  Printv(f_shadow, tab8, "val = ", funcCall(Swig_name_member(NSPACE_TODO, class_name, symname), callParms), "\n", NIL);
-	  Printv(f_shadow, indent_pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL);
-	  Printv(f_shadow, tab8, "return val\n\n", NIL);
-	} else {
-	  Printv(f_shadow, tab8, "return ", funcCall(Swig_name_member(NSPACE_TODO, class_name, symname), callParms), "\n\n", NIL);
-	}
-	Printv(f_shadow, tab4, symname, " = staticmethod(", symname, ")\n", NIL);
-      } else {
-	if (!classic) {
-	  if (!modern)
-	    Printv(f_shadow, tab4, "if _newclass:\n", tab4, NIL);
-	  Printv(f_shadow, tab4, symname, " = staticmethod(", module, ".", Swig_name_member(NSPACE_TODO, class_name, symname),
-		 ")\n", NIL);
-	}
-	if (classic || !modern) {
-	  if (!classic)
-	    Printv(f_shadow, tab4, "else:\n", tab4, NIL);
-	  Printv(f_shadow, tab4, symname, " = ", module, ".", Swig_name_member(NSPACE_TODO, class_name, symname), "\n", NIL);
-	}
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    int oldshadow = shadow;
-    int use_director = Swig_directorclass(n);
-
-    /* 
-     * If we're wrapping the constructor of a C++ director class, prepend a new parameter
-     * to receive the scripting language object (e.g. 'self')
-     *
-     */
-    Swig_save("python:constructorHandler", n, "parms", NIL);
-    if (use_director) {
-      Parm *parms = Getattr(n, "parms");
-      Parm *self;
-      String *name = NewString("self");
-      String *type = NewString("PyObject");
-      SwigType_add_pointer(type);
-      self = NewParm(type, name, n);
-      Delete(type);
-      Delete(name);
-      Setattr(self, "lname", "O");
-      if (parms)
-	set_nextSibling(self, parms);
-      Setattr(n, "parms", self);
-      Setattr(n, "wrap:self", "1");
-      Setattr(n, "hidden", "1");
-      Delete(self);
-    }
-
-    if (shadow)
-      shadow = shadow | PYSHADOW_MEMBER;
-    Language::constructorHandler(n);
-    shadow = oldshadow;
-
-    Delattr(n, "wrap:self");
-    Swig_restore(n);
-
-    if (!Getattr(n, "sym:nextSibling")) {
-      if (shadow) {
-	int allow_kwargs = (check_kwargs(n) && (!Getattr(n, "sym:overloaded"))) ? 1 : 0;
-	int handled_as_init = 0;
-	if (!have_constructor) {
-	  String *nname = Getattr(n, "sym:name");
-	  String *sname = Getattr(getCurrentClass(), "sym:name");
-	  String *cname = Swig_name_construct(NSPACE_TODO, sname);
-	  handled_as_init = (Strcmp(nname, sname) == 0) || (Strcmp(nname, cname) == 0);
-	  Delete(cname);
-	}
-
-	if (!have_constructor && handled_as_init) {
-	  if (!builtin) {
-	    if (Getattr(n, "feature:shadow")) {
-	      String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n), "%feature(\"shadow\")");
-	      String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
-	      Replaceall(pycode, "$action", pyaction);
-	      Delete(pyaction);
-	      Printv(f_shadow, pycode, "\n", NIL);
-	      Delete(pycode);
-	    } else {
-	      String *pass_self = NewString("");
-	      Node *parent = Swig_methodclass(n);
-	      String *classname = Swig_class_name(parent);
-	      String *rclassname = Swig_class_name(getCurrentClass());
-	      assert(rclassname);
-
-	      String *parms = make_pyParmList(n, true, false, allow_kwargs);
-	      /* Pass 'self' only if using director */
-	      String *callParms = make_pyParmList(n, false, true, allow_kwargs);
-
-	      if (use_director) {
-		Insert(callParms, 0, "_self, ");
-		Printv(pass_self, tab8, NIL);
-		Printf(pass_self, "if self.__class__ == %s:\n", classname);
-		//Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL);
-		Printv(pass_self, tab8, tab4, "_self = None\n", tab8, "else:\n", tab8, tab4, "_self = self\n", NIL);
-	      }
-
-	      Printv(f_shadow, "\n", tab4, "def __init__(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
-	      if (have_docstring(n))
-		Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL);
-	      if (have_pythonprepend(n))
-		Printv(f_shadow, indent_pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
-	      Printv(f_shadow, pass_self, NIL);
-	      if (fastinit) {
-		Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self, ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL);
-	      } else {
-		Printv(f_shadow,
-		       tab8, "this = ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), "\n",
-		       tab8, "try:\n", tab8, tab4, "self.this.append(this)\n", tab8, "except __builtin__.Exception:\n", tab8, tab4, "self.this = this\n", NIL);
-	      }
-	      if (have_pythonappend(n))
-		Printv(f_shadow, indent_pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n\n", NIL);
-	      Delete(pass_self);
-	    }
-	    have_constructor = 1;
-	  }
-	} else {
-	  /* Hmmm. We seem to be creating a different constructor.  We're just going to create a
-	     function for it. */
-	  if (Getattr(n, "feature:shadow")) {
-	    String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), "", Getfile(n), Getline(n), "%feature(\"shadow\")");
-	    String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
-	    Replaceall(pycode, "$action", pyaction);
-	    Delete(pyaction);
-	    Printv(f_shadow_stubs, pycode, "\n", NIL);
-	    Delete(pycode);
-	  } else {
-	    String *parms = make_pyParmList(n, false, false, allow_kwargs);
-	    String *callParms = make_pyParmList(n, false, true, allow_kwargs);
-
-	    Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
-	    if (have_docstring(n))
-	      Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL);
-	    if (have_pythonprepend(n))
-	      Printv(f_shadow_stubs, indent_pythoncode(pythonprepend(n), tab4, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
-	    String *subfunc = NULL;
-	    /*
-	       if (builtin)
-	       subfunc = Copy(Getattr(getCurrentClass(), "sym:name"));
-	       else
-	     */
-	    subfunc = Swig_name_construct(NSPACE_TODO, symname);
-	    Printv(f_shadow_stubs, tab4, "val = ", funcCall(subfunc, callParms), "\n", NIL);
-#ifdef USE_THISOWN
-	    Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
-#endif
-	    if (have_pythonappend(n))
-	      Printv(f_shadow_stubs, indent_pythoncode(pythonappend(n), tab4, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL);
-	    Printv(f_shadow_stubs, tab4, "return val\n", NIL);
-	    Delete(subfunc);
-	  }
-	}
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * destructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int destructorHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    int oldshadow = shadow;
-
-    if (builtin && in_class) {
-      Node *cls = Swig_methodclass(n);
-      // Use the destructor for the tp_dealloc slot unless a user overrides it with another method
-      if (!Getattr(cls, "feature:python:tp_dealloc")) {
-	Setattr(n, "feature:python:slot", "tp_dealloc");
-	Setattr(n, "feature:python:slot:functype", "destructor");
-      }
-    }
-
-    if (shadow)
-      shadow = shadow | PYSHADOW_MEMBER;
-    //Setattr(n,"emit:dealloc","1");
-    Language::destructorHandler(n);
-    shadow = oldshadow;
-
-    if (shadow) {
-      if (Getattr(n, "feature:shadow")) {
-	String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n), "%feature(\"shadow\")");
-	String *pyaction = NewStringf("%s.%s", module, Swig_name_destroy(NSPACE_TODO, symname));
-	Replaceall(pycode, "$action", pyaction);
-	Delete(pyaction);
-	Printv(f_shadow, pycode, "\n", NIL);
-	Delete(pycode);
-      } else {
-	Printv(f_shadow, tab4, "__swig_destroy__ = ", module, ".", Swig_name_destroy(NSPACE_TODO, symname), "\n", NIL);
-	if (!have_pythonprepend(n) && !have_pythonappend(n)) {
-	  if (proxydel) {
-	    Printv(f_shadow, tab4, "__del__ = lambda self: None\n", NIL);
-	  }
-	  return SWIG_OK;
-	}
-	Printv(f_shadow, tab4, "def __del__(self):\n", NIL);
-	if (have_docstring(n))
-	  Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR, tab8), "\n", NIL);
-	if (have_pythonprepend(n))
-	  Printv(f_shadow, indent_pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
-#ifdef USE_THISOWN
-	Printv(f_shadow, tab8, "try:\n", NIL);
-	Printv(f_shadow, tab8, tab4, "if self.thisown:", module, ".", Swig_name_destroy(NSPACE_TODO, symname), "(self)\n", NIL);
-	Printv(f_shadow, tab8, "except __builtin__.Exception: pass\n", NIL);
-#else
-#endif
-	if (have_pythonappend(n))
-	  Printv(f_shadow, indent_pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL);
-	Printv(f_shadow, tab8, "pass\n", NIL);
-	Printv(f_shadow, "\n", NIL);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-
-    int oldshadow = shadow;
-    if (shadow)
-      shadow = shadow | PYSHADOW_MEMBER;
-    Language::membervariableHandler(n);
-    shadow = oldshadow;
-
-    if (shadow && !builtin) {
-      String *mname = Swig_name_member(NSPACE_TODO, class_name, symname);
-      String *setname = Swig_name_set(NSPACE_TODO, mname);
-      String *getname = Swig_name_get(NSPACE_TODO, mname);
-      int assignable = is_assignable(n);
-      if (!modern) {
-	if (assignable) {
-	  Printv(f_shadow, tab4, "__swig_setmethods__[\"", symname, "\"] = ", module, ".", setname, "\n", NIL);
-	}
-	Printv(f_shadow, tab4, "__swig_getmethods__[\"", symname, "\"] = ", module, ".", getname, "\n", NIL);
-      }
-      if (!classic) {
-	if (!modern)
-	  Printv(f_shadow, tab4, "if _newclass:\n", tab4, NIL);
-	Printv(f_shadow, tab4, symname, " = _swig_property(", module, ".", getname, NIL);
-	if (assignable)
-	  Printv(f_shadow, ", ", module, ".", setname, NIL);
-	Printv(f_shadow, ")\n", NIL);
-      }
-      Delete(mname);
-      Delete(setname);
-      Delete(getname);
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * staticmembervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    Swig_save("builtin_staticmembervariableHandler", n, "builtin_symname", NIL);
-    Language::staticmembervariableHandler(n);
-    Swig_restore(n);
-
-    if (GetFlag(n, "wrappedasconstant"))
-      return SWIG_OK;
-
-    String *symname = Getattr(n, "sym:name");
-
-    if (shadow) {
-      if (!builtin && GetFlag(n, "hasconsttype")) {
-	String *mname = Swig_name_member(NSPACE_TODO, class_name, symname);
-	Printf(f_shadow_stubs, "%s.%s = %s.%s.%s\n", class_name, symname, module, global_name, mname);
-	Delete(mname);
-      } else {
-	String *mname = Swig_name_member(NSPACE_TODO, class_name, symname);
-	String *getname = Swig_name_get(NSPACE_TODO, mname);
-	String *wrapgetname = Swig_name_wrapper(getname);
-	String *vargetname = NewStringf("Swig_var_%s", getname);
-	String *setname = Swig_name_set(NSPACE_TODO, mname);
-	String *wrapsetname = Swig_name_wrapper(setname);
-	String *varsetname = NewStringf("Swig_var_%s", setname);
-
-	Wrapper *f = NewWrapper();
-	Printv(f->def, "SWIGINTERN PyObject *", wrapgetname, "(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(args)) {", NIL);
-	Printv(f->code, "  return ", vargetname, "();\n", NIL);
-	Append(f->code, "}\n");
-	add_method(getname, wrapgetname, 0);
-	Wrapper_print(f, f_wrappers);
-	DelWrapper(f);
-	int assignable = is_assignable(n);
-	if (assignable) {
-	  int funpack = modernargs && fastunpack;
-	  Wrapper *f = NewWrapper();
-	  Printv(f->def, "SWIGINTERN PyObject *", wrapsetname, "(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {", NIL);
-	  Wrapper_add_local(f, "res", "int res");
-	  if (!funpack) {
-	    Wrapper_add_local(f, "value", "PyObject *value");
-	    Append(f->code, "if (!PyArg_ParseTuple(args,(char *)\"O:set\",&value)) return NULL;\n");
-	  }
-	  Printf(f->code, "res = %s(%s);\n", varsetname, funpack ? "args" : "value");
-	  Append(f->code, "return !res ? SWIG_Py_Void() : NULL;\n");
-	  Append(f->code, "}\n");
-	  Wrapper_print(f, f_wrappers);
-	  add_method(setname, wrapsetname, 0, 0, funpack, 1, 1);
-	  DelWrapper(f);
-	}
-	if (!modern && !builtin) {
-	  if (assignable) {
-	    Printv(f_shadow, tab4, "__swig_setmethods__[\"", symname, "\"] = ", module, ".", setname, "\n", NIL);
-	  }
-	  Printv(f_shadow, tab4, "__swig_getmethods__[\"", symname, "\"] = ", module, ".", getname, "\n", NIL);
-	}
-	if (!classic && !builtin) {
-	  if (!modern)
-	    Printv(f_shadow, tab4, "if _newclass:\n", tab4, NIL);
-	  Printv(f_shadow, tab4, symname, " = _swig_property(", module, ".", getname, NIL);
-	  if (assignable)
-	    Printv(f_shadow, ", ", module, ".", setname, NIL);
-	  Printv(f_shadow, ")\n", NIL);
-	}
-	String *getter = Getattr(n, "pybuiltin:getter");
-	String *setter = Getattr(n, "pybuiltin:setter");
-	Hash *h = NULL;
-	if (getter || setter) {
-	  h = Getattr(builtin_getset, symname);
-	  if (!h) {
-	    h = NewHash();
-	    Setattr(h, "static", "1");
-	    Setattr(builtin_getset, symname, h);
-	  }
-	}
-	if (getter)
-	  Setattr(h, "getter", getter);
-	if (setter)
-	  Setattr(h, "setter", setter);
-	if (h)
-	  Delete(h);
-	Delete(mname);
-	Delete(getname);
-	Delete(wrapgetname);
-	Delete(vargetname);
-	Delete(setname);
-	Delete(wrapsetname);
-	Delete(varsetname);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * memberconstantHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberconstantHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    if (builtin && in_class) {
-      Swig_save("builtin_memberconstantHandler", n, "pybuiltin:symname", NIL);
-      Setattr(n, "pybuiltin:symname", symname);
-    }
-    int oldshadow = shadow;
-    if (shadow)
-      shadow = shadow | PYSHADOW_MEMBER;
-    Language::memberconstantHandler(n);
-    shadow = oldshadow;
-
-    if (builtin && in_class) {
-      Swig_restore(n);
-    } else if (shadow) {
-      Printv(f_shadow, tab4, symname, " = ", module, ".", Swig_name_member(NSPACE_TODO, class_name, symname), "\n", NIL);
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * insertDirective()
-   * 
-   * Hook for %insert directive.   We're going to look for special %shadow inserts
-   * as a special case so we can do indenting correctly
-   * ------------------------------------------------------------ */
-
-  virtual int insertDirective(Node *n) {
-    String *code = Getattr(n, "code");
-    String *section = Getattr(n, "section");
-
-    if (!ImportMode && (Cmp(section, "python") == 0 || Cmp(section, "shadow") == 0)) {
-      if (shadow) {
-	String *pycode = indent_pythoncode(code, shadow_indent, Getfile(n), Getline(n), "%pythoncode or %insert(\"python\") block");
-	Printv(f_shadow, pycode, NIL);
-	Delete(pycode);
-      }
-    } else if (!ImportMode && (Cmp(section, "pythonbegin") == 0)) {
-      String *pycode = indent_pythoncode(code, "", Getfile(n), Getline(n), "%pythonbegin or %insert(\"pythonbegin\") block");
-      Printv(f_shadow_begin, pycode, NIL);
-      Delete(pycode);
-    } else {
-      Language::insertDirective(n);
-    }
-    return SWIG_OK;
-  }
-
-  virtual String *runtimeCode() {
-    String *s = NewString("");
-    String *shead = Swig_include_sys("pyhead.swg");
-    if (!shead) {
-      Printf(stderr, "*** Unable to open 'pyhead.swg'\n");
-    } else {
-      Append(s, shead);
-      Delete(shead);
-    }
-    String *serrors = Swig_include_sys("pyerrors.swg");
-    if (!serrors) {
-      Printf(stderr, "*** Unable to open 'pyerrors.swg'\n");
-    } else {
-      Append(s, serrors);
-      Delete(serrors);
-    }
-    String *sthread = Swig_include_sys("pythreads.swg");
-    if (!sthread) {
-      Printf(stderr, "*** Unable to open 'pythreads.swg'\n");
-    } else {
-      Append(s, sthread);
-      Delete(sthread);
-    }
-    String *sapi = Swig_include_sys("pyapi.swg");
-    if (!sapi) {
-      Printf(stderr, "*** Unable to open 'pyapi.swg'\n");
-    } else {
-      Append(s, sapi);
-      Delete(sapi);
-    }
-    String *srun = Swig_include_sys("pyrun.swg");
-    if (!srun) {
-      Printf(stderr, "*** Unable to open 'pyrun.swg'\n");
-    } else {
-      Append(s, srun);
-      Delete(srun);
-    }
-    return s;
-  }
-
-  virtual String *defaultExternalRuntimeFilename() {
-    return NewString("swigpyrun.h");
-  }
-
-  /*----------------------------------------------------------------------
-   * kwargsSupport()
-   *--------------------------------------------------------------------*/
-
-  bool kwargsSupport() const {
-    return true;
-  }
-};
-
-/* ---------------------------------------------------------------
- * classDirectorMethod()
- *
- * Emit a virtual director method to pass a method call on to the 
- * underlying Python object.
- *
- * ** Moved it here due to internal error on gcc-2.96 **
- * --------------------------------------------------------------- */
-int PYTHON::classDirectorMethods(Node *n) {
-  director_method_index = 0;
-  return Language::classDirectorMethods(n);
-}
-
-
-int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) {
-  int is_void = 0;
-  int is_pointer = 0;
-  String *decl = Getattr(n, "decl");
-  String *name = Getattr(n, "name");
-  String *classname = Getattr(parent, "sym:name");
-  String *c_classname = Getattr(parent, "name");
-  String *symname = Getattr(n, "sym:name");
-  String *declaration = NewString("");
-  ParmList *l = Getattr(n, "parms");
-  Wrapper *w = NewWrapper();
-  String *tm;
-  String *wrap_args = NewString("");
-  String *returntype = Getattr(n, "type");
-  String *value = Getattr(n, "value");
-  String *storage = Getattr(n, "storage");
-  bool pure_virtual = false;
-  int status = SWIG_OK;
-  int idx;
-  bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-
-  if (builtin) {
-    // Rename any wrapped parameters called 'self' as the generated code contains a variable with same name
-    Parm *p;
-    for (p = l; p; p = nextSibling(p)) {
-      String *arg = Getattr(p, "name");
-      if (arg && Cmp(arg, "self") == 0)
-	Delattr(p, "name");
-    }
-  }
-
-  if (Cmp(storage, "virtual") == 0) {
-    if (Cmp(value, "0") == 0) {
-      pure_virtual = true;
-    }
-  }
-
-  /* determine if the method returns a pointer */
-  is_pointer = SwigType_ispointer_return(decl);
-  is_void = (!Cmp(returntype, "void") && !is_pointer);
-
-  /* virtual method definition */
-  String *target;
-  String *pclassname = NewStringf("SwigDirector_%s", classname);
-  String *qualified_name = NewStringf("%s::%s", pclassname, name);
-  SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-  target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-  Printf(w->def, "%s", target);
-  Delete(qualified_name);
-  Delete(target);
-  /* header declaration */
-  target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-  Printf(declaration, "    virtual %s", target);
-  Delete(target);
-
-  // Get any exception classes in the throws typemap
-  ParmList *throw_parm_list = 0;
-
-  if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-    Parm *p;
-    int gencomma = 0;
-
-    Append(w->def, " throw(");
-    Append(declaration, " throw(");
-
-    if (throw_parm_list)
-      Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-    for (p = throw_parm_list; p; p = nextSibling(p)) {
-      if (Getattr(p, "tmap:throws")) {
-	if (gencomma++) {
-	  Append(w->def, ", ");
-	  Append(declaration, ", ");
-	}
-	String *str = SwigType_str(Getattr(p, "type"), 0);
-	Append(w->def, str);
-	Append(declaration, str);
-	Delete(str);
-      }
-    }
-
-    Append(w->def, ")");
-    Append(declaration, ")");
-  }
-
-  Append(w->def, " {");
-  Append(declaration, ";\n");
-
-  /* declare method return value 
-   * if the return value is a reference or const reference, a specialized typemap must
-   * handle it, including declaration of c_result ($result).
-   */
-  if (!is_void) {
-    if (!(ignored_method && !pure_virtual)) {
-      String *cres = SwigType_lstr(returntype, "c_result");
-      Printf(w->code, "%s;\n", cres);
-      Delete(cres);
-    }
-  }
-
-  if (builtin) {
-    Printv(w->code, "PyObject *self = NULL;\n", NIL);
-    Printv(w->code, "(void)self;\n", NIL);
-  }
-
-  if (ignored_method) {
-    if (!pure_virtual) {
-      if (!is_void)
-	Printf(w->code, "return ");
-      String *super_call = Swig_method_call(super, l);
-      Printf(w->code, "%s;\n", super_call);
-      Delete(super_call);
-    } else {
-      Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\");\n", SwigType_namestr(c_classname),
-	     SwigType_namestr(name));
-    }
-  } else {
-    /* attach typemaps to arguments (C/C++ -> Python) */
-    String *arglist = NewString("");
-    String *parse_args = NewString("");
-
-    Swig_director_parms_fixup(l);
-
-    /* remove the wrapper 'w' since it was producing spurious temps */
-    Swig_typemap_attach_parms("in", l, 0);
-    Swig_typemap_attach_parms("directorin", l, 0);
-    Swig_typemap_attach_parms("directorargout", l, w);
-
-    Parm *p;
-    char source[256];
-
-    int outputs = 0;
-    if (!is_void)
-      outputs++;
-
-    /* build argument list and type conversion string */
-    idx = 0;
-    p = l;
-    int use_parse = 0;
-    while (p) {
-      if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      }
-
-      /* old style?  caused segfaults without the p!=0 check
-         in the for() condition, and seems dangerous in the
-         while loop as well.
-         while (Getattr(p, "tmap:ignore")) {
-         p = Getattr(p, "tmap:ignore:next");
-         }
-       */
-
-      if (Getattr(p, "tmap:directorargout") != 0)
-	outputs++;
-
-      String *pname = Getattr(p, "name");
-      String *ptype = Getattr(p, "type");
-
-      Putc(',', arglist);
-      if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-	String *parse = Getattr(p, "tmap:directorin:parse");
-	if (!parse) {
-	  sprintf(source, "obj%d", idx++);
-	  String *input = NewString(source);
-	  Setattr(p, "emit:directorinput", input);
-	  Replaceall(tm, "$input", input);
-	  Delete(input);
-	  Replaceall(tm, "$owner", "0");
-	  /* Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); */
-	  Printv(wrap_args, "swig::SwigVar_PyObject ", source, ";\n", NIL);
-
-	  Printv(wrap_args, tm, "\n", NIL);
-	  Printv(arglist, "(PyObject *)", source, NIL);
-	  Putc('O', parse_args);
-	} else {
-	  use_parse = 1;
-	  Append(parse_args, parse);
-	  Setattr(p, "emit:directorinput", pname);
-	  Replaceall(tm, "$input", pname);
-	  Replaceall(tm, "$owner", "0");
-	  if (Len(tm) == 0)
-	    Append(tm, pname);
-	  Append(arglist, tm);
-	}
-	p = Getattr(p, "tmap:directorin:next");
-	continue;
-      } else if (Cmp(ptype, "void")) {
-	/* special handling for pointers to other C++ director classes.
-	 * ideally this would be left to a typemap, but there is currently no
-	 * way to selectively apply the dynamic_cast<> to classes that have
-	 * directors.  in other words, the type "SwigDirector_$1_lname" only exists
-	 * for classes with directors.  we avoid the problem here by checking
-	 * module.wrap::directormap, but it's not clear how to get a typemap to
-	 * do something similar.  perhaps a new default typemap (in addition
-	 * to SWIGTYPE) called DIRECTORTYPE?
-	 */
-	if (SwigType_ispointer(ptype) || SwigType_isreference(ptype)) {
-	  Node *module = Getattr(parent, "module");
-	  Node *target = Swig_directormap(module, ptype);
-	  sprintf(source, "obj%d", idx++);
-	  String *nonconst = 0;
-	  /* strip pointer/reference --- should move to Swig/stype.c */
-	  String *nptype = NewString(Char(ptype) + 2);
-	  /* name as pointer */
-	  String *ppname = Copy(pname);
-	  if (SwigType_isreference(ptype)) {
-	    Insert(ppname, 0, "&");
-	  }
-	  /* if necessary, cast away const since Python doesn't support it! */
-	  if (SwigType_isconst(nptype)) {
-	    nonconst = NewStringf("nc_tmp_%s", pname);
-	    String *nonconst_i = NewStringf("= const_cast< %s >(%s)", SwigType_lstr(ptype, 0), ppname);
-	    Wrapper_add_localv(w, nonconst, SwigType_lstr(ptype, 0), nonconst, nonconst_i, NIL);
-	    Delete(nonconst_i);
-	    Swig_warning(WARN_LANG_DISCARD_CONST, input_file, line_number,
-			 "Target language argument '%s' discards const in director method %s::%s.\n",
-			 SwigType_str(ptype, pname), SwigType_namestr(c_classname), SwigType_namestr(name));
-	  } else {
-	    nonconst = Copy(ppname);
-	  }
-	  Delete(nptype);
-	  Delete(ppname);
-	  String *mangle = SwigType_manglestr(ptype);
-	  if (target) {
-	    String *director = NewStringf("director_%s", mangle);
-	    Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL);
-	    Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL);
-	    Printf(wrap_args, "%s = SWIG_DIRECTOR_CAST(%s);\n", director, nonconst);
-	    Printf(wrap_args, "if (!%s) {\n", director);
-	    Printf(wrap_args, "%s = SWIG_InternalNewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	    Append(wrap_args, "} else {\n");
-	    Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
-	    Printf(wrap_args, "Py_INCREF((PyObject *)%s);\n", source);
-	    Append(wrap_args, "}\n");
-	    Delete(director);
-	    Printv(arglist, source, NIL);
-	  } else {
-	    Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL);
-	    Printf(wrap_args, "%s = SWIG_InternalNewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	    //Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE_p_%s, 0);\n", 
-	    //       source, nonconst, base);
-	    Printv(arglist, source, NIL);
-	  }
-	  Putc('O', parse_args);
-	  Delete(mangle);
-	  Delete(nonconst);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-		       "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(ptype, 0),
-		       SwigType_namestr(c_classname), SwigType_namestr(name));
-	  status = SWIG_NOWRAP;
-	  break;
-	}
-      }
-      p = nextSibling(p);
-    }
-
-    /* add the method name as a PyString */
-    String *pyname = Getattr(n, "sym:name");
-
-    int allow_thread = threads_enable(n);
-
-    if (allow_thread) {
-      thread_begin_block(n, w->code);
-      Append(w->code, "{\n");
-    }
-
-    /* wrap complex arguments to PyObjects */
-    Printv(w->code, wrap_args, NIL);
-
-    /* pass the method call on to the Python object */
-    if (dirprot_mode() && !is_public(n)) {
-      Printf(w->code, "swig_set_inner(\"%s\", true);\n", name);
-    }
-
-
-    Append(w->code, "if (!swig_get_self()) {\n");
-    Printf(w->code, "  Swig::DirectorException::raise(\"'self' uninitialized, maybe you forgot to call %s.__init__.\");\n", classname);
-    Append(w->code, "}\n");
-    Append(w->code, "#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)\n");
-    Printf(w->code, "const size_t swig_method_index = %d;\n", director_method_index++);
-    Printf(w->code, "const char *const swig_method_name = \"%s\";\n", pyname);
-
-    Append(w->code, "PyObject *method = swig_get_method(swig_method_index, swig_method_name);\n");
-    if (Len(parse_args) > 0) {
-      if (use_parse || !modernargs) {
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallFunction(method, (char *)\"(%s)\" %s);\n", Swig_cresult_name(), parse_args, arglist);
-      } else {
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallFunctionObjArgs(method %s, NULL);\n", Swig_cresult_name(), arglist);
-      }
-    } else {
-      if (modernargs) {
-	Append(w->code, "swig::SwigVar_PyObject args = PyTuple_New(0);\n");
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_Call(method, (PyObject *) args, NULL);\n", Swig_cresult_name());
-      } else {
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallFunction(method, NULL, NULL);\n", Swig_cresult_name());
-      }
-    }
-    Append(w->code, "#else\n");
-    if (Len(parse_args) > 0) {
-      if (use_parse || !modernargs) {
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallMethod(swig_get_self(), (char *)\"%s\", (char *)\"(%s)\" %s);\n", Swig_cresult_name(), pyname, parse_args, arglist);
-      } else {
-	Printf(w->code, "swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar((char *)\"%s\");\n", pyname);
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name %s, NULL);\n", Swig_cresult_name(), arglist);
-      }
-    } else {
-      if (!modernargs) {
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallMethod(swig_get_self(), (char *) \"%s\", NULL);\n", Swig_cresult_name(), pyname);
-      } else {
-	Printf(w->code, "swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar((char *)\"%s\");\n", pyname);
-	Printf(w->code, "swig::SwigVar_PyObject %s = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);\n", Swig_cresult_name());
-      }
-    }
-    Append(w->code, "#endif\n");
-
-    if (dirprot_mode() && !is_public(n))
-      Printf(w->code, "swig_set_inner(\"%s\", false);\n", name);
-
-    /* exception handling */
-    tm = Swig_typemap_lookup("director:except", n, Swig_cresult_name(), 0);
-    if (!tm) {
-      tm = Getattr(n, "feature:director:except");
-      if (tm)
-	tm = Copy(tm);
-    }
-    Printf(w->code, "if (!%s) {\n", Swig_cresult_name());
-    Append(w->code, "  PyObject *error = PyErr_Occurred();\n");
-    if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
-      Replaceall(tm, "$error", "error");
-      Printv(w->code, Str(tm), "\n", NIL);
-    } else {
-      Append(w->code, "  if (error) {\n");
-      Printf(w->code, "    Swig::DirectorMethodException::raise(\"Error detected when calling '%s.%s'\");\n", classname, pyname);
-      Append(w->code, "  }\n");
-    }
-    Append(w->code, "}\n");
-    Delete(tm);
-
-    /*
-     * Python method may return a simple object, or a tuple.
-     * for in/out aruments, we have to extract the appropriate PyObjects from the tuple,
-     * then marshal everything back to C/C++ (return value and output arguments).
-     *
-     */
-
-    /* marshal return value and other outputs (if any) from PyObject to C/C++ type */
-
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-
-    if (outputs > 1) {
-      Wrapper_add_local(w, "output", "PyObject *output");
-      Printf(w->code, "if (!PyTuple_Check(%s)) {\n", Swig_cresult_name());
-      Printf(w->code, "  Swig::DirectorTypeMismatchException::raise(\"Python method %s.%sfailed to return a tuple.\");\n", classname, pyname);
-      Append(w->code, "}\n");
-    }
-
-    idx = 0;
-
-    /* marshal return value */
-    if (!is_void) {
-      tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
-      if (tm != 0) {
-	if (outputs > 1) {
-	  Printf(w->code, "output = PyTuple_GetItem(%s, %d);\n", Swig_cresult_name(), idx++);
-	  Replaceall(tm, "$input", "output");
-	} else {
-	  Replaceall(tm, "$input", Swig_cresult_name());
-	}
-	char temp[24];
-	sprintf(temp, "%d", idx);
-	Replaceall(tm, "$argnum", temp);
-
-	/* TODO check this */
-	if (Getattr(n, "wrap:disown")) {
-	  Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	} else {
-	  Replaceall(tm, "$disown", "0");
-	}
-	if (Getattr(n, "tmap:directorout:implicitconv")) {
-	  Replaceall(tm, "$implicitconv", get_implicitconv_flag(n));
-	}
-	Replaceall(tm, "$result", "c_result");
-	Printv(w->code, tm, "\n", NIL);
-	Delete(tm);
-      } else {
-	Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		     "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname),
-		     SwigType_namestr(name));
-	status = SWIG_ERROR;
-      }
-    }
-
-    /* marshal outputs */
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-	if (outputs > 1) {
-	  Printf(w->code, "output = PyTuple_GetItem(%s, %d);\n", Swig_cresult_name(), idx++);
-	  Replaceall(tm, "$result", "output");
-	} else {
-	  Replaceall(tm, "$result", Swig_cresult_name());
-	}
-	Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	Printv(w->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:directorargout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* any existing helper functions to handle this? */
-    if (allow_thread) {
-      Append(w->code, "}\n");
-      thread_end_block(n, w->code);
-    }
-
-    Delete(parse_args);
-    Delete(arglist);
-    Delete(cleanup);
-    Delete(outarg);
-  }
-
-  if (!is_void) {
-    if (!(ignored_method && !pure_virtual)) {
-      String *rettype = SwigType_str(returntype, 0);
-      if (!SwigType_isreference(returntype)) {
-	Printf(w->code, "return (%s) c_result;\n", rettype);
-      } else {
-	Printf(w->code, "return (%s) *c_result;\n", rettype);
-      }
-      Delete(rettype);
-    }
-  }
-
-  Append(w->code, "}\n");
-
-  // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-  String *inline_extra_method = NewString("");
-  if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-    Printv(inline_extra_method, declaration, NIL);
-    String *extra_method_name = NewStringf("%sSwigPublic", name);
-    Replaceall(inline_extra_method, name, extra_method_name);
-    Replaceall(inline_extra_method, ";\n", " {\n      ");
-    if (!is_void)
-      Printf(inline_extra_method, "return ");
-    String *methodcall = Swig_method_call(super, l);
-    Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-    Delete(methodcall);
-    Delete(extra_method_name);
-  }
-
-  /* emit the director method */
-  if (status == SWIG_OK) {
-    if (!Getattr(n, "defaultargs")) {
-      Replaceall(w->code, "$symname", symname);
-      Wrapper_print(w, f_directors);
-      Printv(f_directors_h, declaration, NIL);
-      Printv(f_directors_h, inline_extra_method, NIL);
-    }
-  }
-
-  /* clean up */
-  Delete(wrap_args);
-  Delete(pclassname);
-  DelWrapper(w);
-  return status;
-}
-
-/* -----------------------------------------------------------------------------
- * swig_python()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_python() {
-  return new PYTHON();
-}
-extern "C" Language *swig_python(void) {
-  return new_swig_python();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/r.cxx b/dependencies2013/win32/swig/Source/Modules/r.cxx
deleted file mode 100644
index 74130aac..00000000
--- a/dependencies2013/win32/swig/Source/Modules/r.cxx
+++ /dev/null
@@ -1,2800 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * r.cxx
- *
- * R language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-static const double DEFAULT_NUMBER = .0000123456712312312323;
-
-static String* replaceInitialDash(const String *name)
-{
-  String *retval;
-  if (!Strncmp(name, "_", 1)) {
-    retval = Copy(name);
-    Insert(retval, 0, "s");
-  } else {
-    retval = Copy(name);
-  }
-  return retval;
-}
-
-static String * getRTypeName(SwigType *t, int *outCount = NULL) {
-  String *b = SwigType_base(t);
-  List *els = SwigType_split(t);
-  int count = 0;
-  int i;
-  
-  if(Strncmp(b, "struct ", 7) == 0) 
-    Replace(b, "struct ", "", DOH_REPLACE_FIRST);
-  
-  /* Printf(stdout, "<getRTypeName> %s,base = %s\n", t, b);
-     for(i = 0; i < Len(els); i++) 
-     Printf(stdout, "%d) %s, ", i, Getitem(els,i));
-     Printf(stdout, "\n"); */
-  
-  for(i = 0; i < Len(els); i++) {
-    String *el = Getitem(els, i);
-    if(Strcmp(el, "p.") == 0 || Strncmp(el, "a(", 2) == 0) {
-      count++;
-      Append(b, "Ref");
-    }
-  }
-  if(outCount)
-    *outCount = count;
-  
-  String *tmp = NewString("");
-  char *retName = Char(SwigType_manglestr(t));
-  Insert(tmp, 0, retName);
-  return tmp;
-  
-  /*
-  if(count)
-    return(b);
-  
-  Delete(b);
-  return(NewString(""));
-  */
-}
-
-/*********************
- Tries to get the name of the R class corresponding  to the given type
-  e.g. struct A * is ARef,  struct A**  is  ARefRef.
-  Now handles arrays, i.e. struct A[2]
-****************/
-
-static String *getRClassName(String *retType, int /*addRef*/ = 1, int upRef=0) {
-  String *tmp = NewString("");
-  SwigType *resolved = SwigType_typedef_resolve_all(retType);
-  char *retName = Char(SwigType_manglestr(resolved));
-  if (upRef) {
-    Printf(tmp, "_p%s", retName);
-  } else{
-    Insert(tmp, 0, retName);
-  }
-  
-  return tmp;
-/*
-#if 1
-  List *l = SwigType_split(retType);
-  int n = Len(l);
-  if(!l || n == 0) {
-#ifdef R_SWIG_VERBOSE
-    if (debugMode)
-      Printf(stdout, "SwigType_split return an empty list for %s\n", 
-	     retType);
-#endif
-    return(tmp);
-  }
-  
-  
-  String *el = Getitem(l, n-1);
-  char *ptr = Char(el);
-  if(strncmp(ptr, "struct ", 7) == 0)
-    ptr += 7;
-  
-  Printf(tmp, "%s", ptr);
-  
-  if(addRef) {
-    for(int i = 0; i < n; i++) {
-      if(Strcmp(Getitem(l, i), "p.") == 0 || 
-	 Strncmp(Getitem(l, i), "a(", 2) == 0)
-	Printf(tmp, "Ref");
-    }
-  }
-  
-#else
-  char *retName = Char(SwigType_manglestr(retType));
-  if(!retName)
-    return(tmp);
-  
-  if(addRef) {
-    while(retName && strlen(retName) > 1 && strncmp(retName, "_p", 2) == 0)  {
-      retName += 2;
-      Printf(tmp, "Ref");
-    }
-  }
-  if(retName[0] == '_')
-    retName ++;
-  Insert(tmp, 0, retName);
-#endif
-  
-  return tmp;
-*/
-}
-
-/*********************
- Tries to get the name of the R class corresponding  to the given type
-  e.g. struct A * is ARef,  struct A**  is  ARefRef.
-  Now handles arrays, i.e. struct A[2]
-****************/
-
-static String * getRClassNameCopyStruct(String *retType, int addRef) {
-  String *tmp = NewString("");
-  
-#if 1
-  List *l = SwigType_split(retType);
-  int n = Len(l);
-  if(!l || n == 0) {
-#ifdef R_SWIG_VERBOSE
-    Printf(stdout, "SwigType_split return an empty list for %s\n", retType);
-#endif
-    return(tmp);
-  }
-  
-  
-  String *el = Getitem(l, n-1);
-  char *ptr = Char(el);
-  if(strncmp(ptr, "struct ", 7) == 0)
-    ptr += 7;
-  
-  Printf(tmp, "%s", ptr);
-  
-  if(addRef) {
-    for(int i = 0; i < n; i++) {
-      if(Strcmp(Getitem(l, i), "p.") == 0 || 
-	 Strncmp(Getitem(l, i), "a(", 2) == 0)
-	Printf(tmp, "Ref");
-    }
-  }
-  
-#else
-  char *retName = Char(SwigType_manglestr(retType));
-  if(!retName)
-    return(tmp);
-  
-  if(addRef) {
-    while(retName && strlen(retName) > 1 && 
-	  strncmp(retName, "_p", 2) == 0)  {
-      retName += 2;
-      Printf(tmp, "Ref");
-    }
-  }
-  
-  if(retName[0] == '_')
-    retName ++;
-  Insert(tmp, 0, retName);
-#endif
-
-  return tmp;
-}
-
-
-/*********************************
-  Write the elements of a list to the File*, one element per line.
-  If quote  is true, surround the element with "element".
-  This takes care of inserting a tab in front of each line and also
-  a comma after each element, except the last one.
-**********************************/
-
-static void writeListByLine(List *l, File *out, bool quote = 0) {
-  int i, n = Len(l);
-  for(i = 0; i < n; i++) 
-    Printf(out, "%s%s%s%s%s\n", tab8, 
-	   quote ? "\"" :"",  
-	   Getitem(l, i), 
-	   quote ? "\"" :"", i < n-1 ? "," : "");
-}
-
-
-static const char *usage = "\
-R Options (available with -r)\n\
-     -copystruct      - Emit R code to copy C structs (on by default)\n\
-     -cppcast         - Enable C++ casting operators (default) \n\
-     -debug           - Output debug\n\
-     -dll <name>      - Name of the DLL (without the .dll or .so suffix).\n\
-                        Default is the module name.\n\
-     -gc              - Aggressive garbage collection\n\
-     -memoryprof      - Add memory profile\n\
-     -namespace       - Output NAMESPACE file\n\
-     -no-init-code    - Turn off the generation of the R_init_<pkgname> code\n\
-                        (registration information still generated)\n\
-     -package <name>  - Package name for the PACKAGE argument of the R .Call()\n\
-                        invocations. Default is the module name.\n\
-";
-
-
-
-/************
- Display the help for this module on the screen/console.
-*************/
-static void showUsage() {
-  fputs(usage, stdout);
-}
-
-static bool expandTypedef(SwigType *t) {
-  if (SwigType_isenum(t)) return false;
-  String *prefix = SwigType_prefix(t);
-  if (Strncmp(prefix, "f", 1)) return false;
-  if (Strncmp(prefix, "p.f", 3)) return false;
-  return true;
-}
-
-
-/*****
-      Determine whether  we should add a .copy argument to the S function
-      that wraps/interfaces to the routine that returns the given type.
-*****/
-static int addCopyParameter(SwigType *type) {
-  int ok = 0;
-  ok = Strncmp(type, "struct ", 7) == 0 || Strncmp(type, "p.struct ", 9) == 0;
-  if(!ok) {
-    ok = Strncmp(type, "p.", 2);
-  }
-
-  return(ok);
-}
-
-static void replaceRClass(String *tm, SwigType *type) {
-  String *tmp = getRClassName(type);
-  String *tmp_base = getRClassName(type, 0);
-  String *tmp_ref = getRClassName(type, 1, 1);
-  Replaceall(tm, "$R_class", tmp);
-  Replaceall(tm, "$*R_class", tmp_base);
-  Replaceall(tm, "$&R_class", tmp_ref);
-  Delete(tmp); Delete(tmp_base); Delete(tmp_ref);
-}
-
-static double getNumber(String *value) {
-  double d = DEFAULT_NUMBER;
-  if(Char(value)) {
-    if(sscanf(Char(value), "%lf", &d) != 1)
-      return(DEFAULT_NUMBER);
-  }
-  return(d);
-}
-
-class R : public Language {
-public:
-  R();
-  void registerClass(Node *n);
-  void main(int argc, char *argv[]);
-  int top(Node *n);
-  
-  void dispatchFunction(Node *n);
-  int functionWrapper(Node *n);
-  int constantWrapper(Node *n);
-  int variableWrapper(Node *n);
-
-  int classDeclaration(Node *n);
-  int enumDeclaration(Node *n);
-
-  int membervariableHandler(Node *n);
-
-  int typedefHandler(Node *n);
-  static List *Swig_overload_rank(Node *n,
-			   bool script_lang_wrapping);
-
-  int memberfunctionHandler(Node *n) {
-    if (debugMode)
-      Printf(stdout, "<memberfunctionHandler> %s %s\n", 
-	     Getattr(n, "name"),
-	     Getattr(n, "type"));
-    member_name = Getattr(n, "sym:name");
-    processing_class_member_function = 1;
-    int status = Language::memberfunctionHandler(n);    
-    processing_class_member_function = 0;
-    return status;
-  }
-
-  /* Grab the name of the current class being processed so that we can 
-     deal with members of that class. */
-  int classHandler(Node *n){
-    if(!ClassMemberTable) 
-      ClassMemberTable = NewHash();
-    
-    class_name = Getattr(n, "name");
-    int status = Language::classHandler(n);
-    
-    class_name = NULL;
-    return status;
-  }
-
-  // Not used:
-  String *runtimeCode();
-  
-protected:
-  int addRegistrationRoutine(String *rname, int nargs);
-  int outputRegistrationRoutines(File *out);
-  
-  int outputCommandLineArguments(File *out);
-  int generateCopyRoutines(Node *n); 
-  int DumpCode(Node *n);
-  
-  int OutputMemberReferenceMethod(String *className, int isSet, List *el, File *out);
-  int OutputArrayMethod(String *className, List *el, File *out);
-  int OutputClassMemberTable(Hash *tb, File *out);
-  int OutputClassMethodsTable(File *out);
-  int OutputClassAccessInfo(Hash *tb, File *out);
-  
-  int defineArrayAccessors(SwigType *type);
-  
-  void addNamespaceFunction(String *name) {
-    if(!namespaceFunctions)
-      namespaceFunctions = NewList();
-    Append(namespaceFunctions, name);
-  }
-
-  void addNamespaceMethod(String *name) {
-    if(!namespaceMethods)
-      namespaceMethods = NewList();
-    Append(namespaceMethods, name);
-  }
-  
-  String* processType(SwigType *t, Node *n, int *nargs = NULL);
-  String *createFunctionPointerHandler(SwigType *t, Node *n, int *nargs);
-  int addFunctionPointerProxy(String *name, Node *n, SwigType *t, String *s_paramTypes) {
-    /*XXX Do we need to put the t in there to get the return type later. */
-    if(!functionPointerProxyTable) 
-      functionPointerProxyTable = NewHash();
-    
-    Setattr(functionPointerProxyTable, name, n);
-    
-    Setattr(SClassDefs, name, name);
-    Printv(s_classes, "setClass('", 
-	   name,
-	   "',\n", tab8, 
-	   "prototype = list(parameterTypes = c(", s_paramTypes, "),\n",
-	   tab8, tab8, tab8,
-	   "returnType = '", SwigType_manglestr(t), "'),\n", tab8, 
-	   "contains = 'CRoutinePointer')\n\n##\n", NIL);
-    
-    return SWIG_OK;
-  }
-  
-
-  void addSMethodInfo(String *name, 
-		      String *argType, int nargs);
-  // Simple initialization such as constant strings that can be reused. 
-  void init(); 
-  
-  
-  void addAccessor(String *memberName, Wrapper *f, 
-		   String *name, int isSet = -1);
-  
-  static int getFunctionPointerNumArgs(Node *n, SwigType *tt);
-
-protected: 
-  bool copyStruct;
-  bool memoryProfile;
-  bool aggressiveGc;
-
-  // Strings into which we cumulate the generated code that is to be written
-  //vto the files.
-  String *sfile;
-  String *f_init;
-  String *s_classes;
-  String *f_begin;
-  String *f_runtime;
-  String *f_wrapper;
-  String *s_header;
-  String *f_wrappers;
-  String *s_init;
-  String *s_init_routine;
-  String *s_namespace;
-  
-  // State variables that carry information across calls to functionWrapper() 
-  // from  member accessors and class declarations. 
-  String *opaqueClassDeclaration;
-  int processing_variable;
-  int processing_member_access_function;
-  String *member_name;
-  String *class_name;
-  
-  
-  int processing_class_member_function;
-  List *class_member_functions;
-  List *class_member_set_functions;
-  
-  /* */
-  Hash *ClassMemberTable;
-  Hash *ClassMethodsTable;
-  Hash *SClassDefs;
-  Hash *SMethodInfo;
-  
-  // Information about routines that are generated and to be registered with 
-  // R for dynamic lookup. 
-  Hash *registrationTable;
-  Hash *functionPointerProxyTable;
-  
-  List *namespaceFunctions;
-  List *namespaceMethods;
-  List *namespaceClasses; // Probably can do this from ClassMemberTable.
-  
-  
-  // Store a copy of the command line. 
-  // Need only keep a string that has it formatted. 
-  char **Argv;
-  int    Argc;
-  bool inCPlusMode;
-  
-  // State variables that we remember from the command line settings
-  // potentially that govern the code we generate.
-  String *DllName;
-  String *Rpackage;
-  bool    noInitializationCode;
-  bool    outputNamespaceInfo;
-  
-  String *UnProtectWrapupCode;
-
-  // Static members
-  static bool debugMode;
-};
-
-R::R() :
-  copyStruct(false),
-  memoryProfile(false),
-  aggressiveGc(false),
-  sfile(0),
-  f_init(0),
-  s_classes(0),
-  f_begin(0),
-  f_runtime(0),
-  f_wrapper(0),
-  s_header(0),
-  f_wrappers(0),
-  s_init(0),
-  s_init_routine(0),
-  s_namespace(0),
-  opaqueClassDeclaration(0),
-  processing_variable(0),
-  processing_member_access_function(0),
-  member_name(0),
-  class_name(0),
-  processing_class_member_function(0),
-  class_member_functions(0),
-  class_member_set_functions(0),
-  ClassMemberTable(0),
-  ClassMethodsTable(0),
-  SClassDefs(0),
-  SMethodInfo(0),
-  registrationTable(0),
-  functionPointerProxyTable(0),
-  namespaceFunctions(0),
-  namespaceMethods(0),
-  namespaceClasses(0),
-  Argv(0),
-  Argc(0),
-  inCPlusMode(false),
-  DllName(0),
-  Rpackage(0),
-  noInitializationCode(false),
-  outputNamespaceInfo(false),
-  UnProtectWrapupCode(0) {
-}
-
-bool R::debugMode = false;
-
-int R::getFunctionPointerNumArgs(Node *n, SwigType *tt) {
-  (void) tt;
-  n = Getattr(n, "type");
-  if (debugMode)
-    Printf(stdout, "type: %s\n", n);
-
-  ParmList *parms = Getattr(n, "parms");
-  if (debugMode)
-    Printf(stdout, "parms = %p\n", parms);
-  return ParmList_len(parms);
-}
-
-
-void R::addSMethodInfo(String *name, String *argType, int nargs) {
-  (void) argType;
-  
-  if(!SMethodInfo)
-    SMethodInfo = NewHash();
-  if (debugMode)
-    Printf(stdout, "[addMethodInfo] %s\n", name);
-
-  Hash *tb = Getattr(SMethodInfo, name);
-
-  if(!tb) {
-    tb = NewHash();
-    Setattr(SMethodInfo, name, tb);
-  }
-
-  String *str = Getattr(tb, "max");
-  int max = -1;
-  if(str)
-    max = atoi(Char(str));
-  if(max < nargs) {
-    if(str)  Delete(str);
-    str = NewStringf("%d", max);
-    Setattr(tb, "max", str);
-  }
-}
- 
-/*
-Returns the name of the new routine.
-*/
-String * R::createFunctionPointerHandler(SwigType *t, Node *n, int *numArgs) {
-  String *funName = SwigType_manglestr(t);
-  
-  /* See if we have already processed this one. */
-  if(functionPointerProxyTable && Getattr(functionPointerProxyTable, funName))
-    return funName;
-  
-  if (debugMode)
-    Printf(stdout, "<createFunctionPointerHandler> Defining %s\n",  t);
-  
-  SwigType *rettype = Copy(Getattr(n, "type"));
-  SwigType *funcparams = SwigType_functionpointer_decompose(rettype);
-  String *rtype = SwigType_str(rettype, 0);
-
-  //   ParmList *parms = Getattr(n, "parms");
-  // memory leak
-  ParmList *parms = SwigType_function_parms(SwigType_del_pointer(Copy(t)), n);
-
-
-  if (debugMode) {
-    Printf(stdout, "Type: %s\n", t);
-    Printf(stdout, "Return type: %s\n", SwigType_base(t));
-  }
-  
-  bool isVoidType = Strcmp(rettype, "void") == 0;
-  if (debugMode)
-    Printf(stdout, "%s is void ? %s  (%s)\n", funName, isVoidType ? "yes" : "no", rettype);
-  
-  Wrapper *f = NewWrapper();
-  
-  /* Go through argument list, attach lnames for arguments */
-  int i = 0;
-  Parm *p = parms;
-  for (i = 0; p; p = nextSibling(p), ++i) {
-    String *arg = Getattr(p, "name");
-    String *lname;
-
-    if (!arg && Cmp(Getattr(p, "type"), "void")) {
-      lname = NewStringf("s_arg%d", i+1);
-      Setattr(p, "name", lname);
-    } else
-      lname = arg;
-
-    Setattr(p, "lname", lname);
-  }
-  
-  Swig_typemap_attach_parms("out", parms, f);
-  Swig_typemap_attach_parms("scoerceout", parms, f);
-  Swig_typemap_attach_parms("scheck", parms, f);
-
-  Printf(f->def, "%s %s(", rtype, funName);
-
-  emit_parameter_variables(parms, f);
-  emit_return_variable(n, rettype, f);
-//  emit_attach_parmmaps(parms,f);
-
-  /*  Using weird name and struct to avoid potential conflicts. */
-  Wrapper_add_local(f, "r_swig_cb_data", "RCallbackFunctionData *r_swig_cb_data = R_SWIG_getCallbackFunctionData()");
-  String *lvar = NewString("r_swig_cb_data");
-
-  Wrapper_add_local(f, "r_tmp", "SEXP r_tmp"); // for use in converting arguments to R objects for call.
-  Wrapper_add_local(f, "r_nprotect", "int r_nprotect = 0"); // for use in converting arguments to R objects for call.
-  Wrapper_add_local(f, "r_vmax", "char * r_vmax= 0"); // for use in converting arguments to R objects for call.
-
-  // Add local for error code in return value.  This is not in emit_return_variable because that assumes an out typemap
-  // whereas the type makes are reverse
-  Wrapper_add_local(f, "ecode", "int ecode = 0");
-
-  p = parms;
-  int nargs = ParmList_len(parms);
-  if(numArgs) {
-    *numArgs = nargs;
-    if (debugMode)
-      Printf(stdout, "Setting number of parameters to %d\n", *numArgs);
-  } 
-  String *setExprElements = NewString("");
-  
-  String *s_paramTypes = NewString("");
-  for(i = 0; p; i++) {
-    SwigType *tt = Getattr(p, "type");
-    SwigType *name = Getattr(p, "name");
-    String *tm = Getattr(p, "tmap:out");
-    Printf(f->def,  "%s %s", SwigType_str(tt, 0), name);
-     if(tm) {
-      Replaceall(tm, "$1", name);
-      if (SwigType_isreference(tt)) {
-	String *tmp = NewString("");
-        Append(tmp, "*");
-	Append(tmp, name);
-	Replaceall(tm, tmp, name);
-      }
-      Replaceall(tm, "$result", "r_tmp");
-      replaceRClass(tm, Getattr(p,"type"));
-      Replaceall(tm,"$owner", "R_SWIG_EXTERNAL");
-    } 
-    
-    Printf(setExprElements, "%s\n", tm);
-    Printf(setExprElements, "SETCAR(r_swig_cb_data->el, %s);\n", "r_tmp");
-    Printf(setExprElements, "r_swig_cb_data->el = CDR(r_swig_cb_data->el);\n\n");
-    
-    Printf(s_paramTypes, "'%s'", SwigType_manglestr(tt));
-    
-    
-    p = nextSibling(p);
-    if(p) {
-      Printf(f->def, ", ");
-      Printf(s_paramTypes, ", ");
-    }
-  }
-  
-  Printf(f->def,  ") {\n");
-  
-  Printf(f->code, "Rf_protect(%s->expr = Rf_allocVector(LANGSXP, %d));\n", lvar, nargs + 1);
-  Printf(f->code, "r_nprotect++;\n");
-  Printf(f->code, "r_swig_cb_data->el = r_swig_cb_data->expr;\n\n");
-  
-  Printf(f->code, "SETCAR(r_swig_cb_data->el, r_swig_cb_data->fun);\n");
-  Printf(f->code, "r_swig_cb_data->el = CDR(r_swig_cb_data->el);\n\n");
-  
-  Printf(f->code, "%s\n\n", setExprElements);
-  
-  Printv(f->code, "r_swig_cb_data->retValue = R_tryEval(", 
-	 "r_swig_cb_data->expr,",
-	 " R_GlobalEnv,",
-	 " &r_swig_cb_data->errorOccurred",
-	 ");\n", 
-	 NIL);
-  
-  Printv(f->code, "\n",
-	 "if(r_swig_cb_data->errorOccurred) {\n",
-	 "R_SWIG_popCallbackFunctionData(1);\n",
-	 "Rf_error(\"error in calling R function as a function pointer (",
-	 funName,
-	 ")\");\n",
-	 "}\n",
-	 NIL);
-   
-   
-   
-  if(!isVoidType) {
-    /* Need to deal with the return type of the function pointer, not the function pointer itself. 
-       So build a new node that has the relevant pieces.
-       XXX  Have to be a little more clever so that we can deal with struct A * - the * is getting lost.
-       Is this still true? If so, will a SwigType_push() solve things?
-    */
-    Parm *bbase = NewParmNode(rettype, n);
-    String *returnTM = Swig_typemap_lookup("in", bbase, Swig_cresult_name(), f);
-    if(returnTM) {
-      String *tm = returnTM;
-      Replaceall(tm,"$input", "r_swig_cb_data->retValue");
-      Replaceall(tm,"$target", Swig_cresult_name());
-      replaceRClass(tm, rettype);
-      Replaceall(tm,"$owner", "R_SWIG_EXTERNAL");
-      Replaceall(tm,"$disown","0");
-      Printf(f->code, "%s\n", tm);
-    }
-    Delete(bbase);
-  }
-  
-  Printv(f->code, "R_SWIG_popCallbackFunctionData(1);\n", NIL);
-  Printv(f->code, "\n", UnProtectWrapupCode, NIL);
-
-  if (SwigType_isreference(rettype)) {  
-    Printv(f->code,  "return *", Swig_cresult_name(), ";\n", NIL);
-  } else if(!isVoidType)
-    Printv(f->code,  "return ", Swig_cresult_name(), ";\n", NIL);
-  
-  Printv(f->code, "\n}\n", NIL);
-  Replaceall(f->code, "SWIG_exception_fail", "SWIG_exception_noreturn");
-  
-  /* To coerce correctly in S, we really want to have an extra/intermediate
-     function that handles the scoerceout. 
-     We need to check if any of the argument types have an entry in
-     that map. If none do, the ignore and call the function straight.
-     Otherwise, generate the a marshalling function.
-     Need to be able to find it in S. Or use an entirely generic one
-     that evaluates the expressions.
-     Handle errors in the evaluation of the function by restoring
-     the stack, if there is one in use for this function (i.e. no 
-     userData).
-  */
-  
-  Wrapper_print(f, f_wrapper);
-  
-  addFunctionPointerProxy(funName, n, t, s_paramTypes);
-  Delete(s_paramTypes);
-  Delete(rtype);
-  Delete(rettype);
-  Delete(funcparams);
-  DelWrapper(f);
-  
-  return funName;
-}
-
-void R::init() {
-  UnProtectWrapupCode =  
-    NewStringf("%s", "vmaxset(r_vmax);\nif(r_nprotect)  Rf_unprotect(r_nprotect);\n\n");
-  
-  SClassDefs = NewHash();
-  
-  sfile = NewString("");
-  f_init = NewString("");
-  s_header = NewString("");
-  f_begin = NewString("");
-  f_runtime = NewString("");
-  f_wrapper = NewString("");
-  s_classes = NewString("");
-  s_init = NewString("");
-  s_init_routine = NewString("");
-}
-
-
-
-#if 0
-int R::cDeclaration(Node *n) {
-  SwigType *t = Getattr(n, "type");
-  SwigType *name = Getattr(n, "name");
-  if (debugMode)
-    Printf(stdout, "cDeclaration (%s): %s\n", name, SwigType_lstr(t, 0));
-  return Language::cDeclaration(n);
-}
-#endif
-
-
-/**
-   Method from Language that is called to start the entire
-   processing off, i.e. the generation of the code. 
-   It is called after the input has been read and parsed.
-   Here we open the output streams and generate the code.
-***/
-int R::top(Node *n) {
-  String *module = Getattr(n, "name");
-  if(!Rpackage) 
-    Rpackage = Copy(module);
-  if(!DllName)
-    DllName = Copy(module);
-
-  if(outputNamespaceInfo) {
-    s_namespace = NewString("");
-    Swig_register_filebyname("snamespace", s_namespace);
-    Printf(s_namespace, "useDynLib(%s)\n", DllName);
-  }
-
-  /* Associate the different streams with names so that they can be used in %insert directives by the
-     typemap code. */
-  Swig_register_filebyname("sinit", s_init);
-  Swig_register_filebyname("sinitroutine", s_init_routine);
-
-  Swig_register_filebyname("begin", f_begin);
-  Swig_register_filebyname("runtime", f_runtime);
-  Swig_register_filebyname("init", f_init);
-  Swig_register_filebyname("header", s_header);
-  Swig_register_filebyname("wrapper", f_wrapper);
-  Swig_register_filebyname("s", sfile);
-  Swig_register_filebyname("sclasses", s_classes);
-
-  Swig_banner(f_begin);
-
-  Printf(f_runtime, "\n\n#ifndef SWIGR\n#define SWIGR\n#endif\n\n");
-
-  
-  Swig_banner_target_lang(s_init, "#");
-  outputCommandLineArguments(s_init);
-
-  Printf(f_wrapper, "#ifdef __cplusplus\n");
-  Printf(f_wrapper, "extern \"C\" {\n");
-  Printf(f_wrapper, "#endif\n\n");
-
-  Language::top(n);
-
-  Printf(f_wrapper, "#ifdef __cplusplus\n");
-  Printf(f_wrapper, "}\n");
-  Printf(f_wrapper, "#endif\n");
-
-  String *type_table = NewString("");
-  SwigType_emit_type_table(f_runtime,f_wrapper);
-  Delete(type_table);
-
-  if(ClassMemberTable) {
-    //XXX OutputClassAccessInfo(ClassMemberTable, sfile);
-    Delete(ClassMemberTable);
-    ClassMemberTable = NULL;
-  }
-
-  Printf(f_init,"}\n");
-  if(registrationTable)
-    outputRegistrationRoutines(f_init);
-
-  /* Now arrange to write the 2 files - .S and .c. */
-
-  DumpCode(n);
-
-  Delete(sfile);
-  Delete(s_classes);
-  Delete(s_init);
-  Delete(f_wrapper);
-  Delete(f_init);
-
-  Delete(s_header);
-  Delete(f_runtime);
-  Delete(f_begin);
-
-  return SWIG_OK;
-}
-
-
-/*****************************************************
-  Write the generated code  to the .S and the .c files.
-****************************************************/
-int R::DumpCode(Node *n) {
-  String *output_filename = NewString("");
-  
-  
-  /* The name of the file in which we will generate the S code. */
-  Printf(output_filename, "%s%s.R", SWIG_output_directory(), Rpackage);
-  
-#ifdef R_SWIG_VERBOSE
-  Printf(stdout, "Writing S code to %s\n", output_filename);
-#endif
-  
-  File *scode = NewFile(output_filename, "w", SWIG_output_files());
-  if (!scode) {
-    FileErrorDisplay(output_filename);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  Delete(output_filename);
-  
-  
-  Printf(scode, "%s\n\n", s_init);
-  Printf(scode, "%s\n\n", s_classes);
-  Printf(scode, "%s\n", sfile);
-  
-  Delete(scode);
-  String *outfile = Getattr(n,"outfile");
-  File *runtime = NewFile(outfile,"w", SWIG_output_files());
-  if (!runtime) {
-    FileErrorDisplay(outfile);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  
-  Printf(runtime, "%s", f_begin);
-  Printf(runtime, "%s\n", f_runtime);
-  Printf(runtime, "%s\n", s_header);
-  Printf(runtime, "%s\n", f_wrapper);
-  Printf(runtime, "%s\n", f_init);
-
-  Delete(runtime);
-
-  if(outputNamespaceInfo) {
-    output_filename = NewString("");
-    Printf(output_filename, "%sNAMESPACE", SWIG_output_directory());
-    File *ns = NewFile(output_filename, "w", SWIG_output_files());
-    if (!ns) {
-      FileErrorDisplay(output_filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Delete(output_filename);
-   
-    Printf(ns, "%s\n", s_namespace);
-
-    Printf(ns, "\nexport(\n");
-    writeListByLine(namespaceFunctions, ns);
-    Printf(ns, ")\n");
-    Printf(ns, "\nexportMethods(\n");
-    writeListByLine(namespaceFunctions, ns, 1);
-    Printf(ns, ")\n");
-    Delete(ns);
-    Delete(s_namespace);
-  }
-
-  return SWIG_OK;
-}
-
-
-
-/*
-  We may need to do more.... so this is left as a 
-  stub for the moment.
-*/
-int R::OutputClassAccessInfo(Hash *tb, File *out) {
-  int n = OutputClassMemberTable(tb, out);
-  OutputClassMethodsTable(out);
-  return n;
-}
-
-/************************************************************************
-  Currently this just writes the information collected about the
-  different methods of the C++ classes that have been processed
-  to the console. 
-  This will be used later to define S4 generics and methods.
-**************************************************************************/
-int R::OutputClassMethodsTable(File *) {
-  Hash *tb = ClassMethodsTable;
-  
-  if(!tb)
-    return SWIG_OK;
-  
-  List *keys = Keys(tb);
-  String *key;
-  int i, n = Len(keys);
-  if (debugMode) {
-    for(i = 0; i < n ; i++ ) {
-      key = Getitem(keys, i);
-      Printf(stdout, "%d) %s\n", i, key);
-      List *els = Getattr(tb, key);
-      int nels = Len(els);
-      Printf(stdout, "\t");
-      for(int j = 0; j < nels; j+=2) {
-	Printf(stdout, "%s%s", Getitem(els, j), j < nels - 1 ? ", " : "");
-	Printf(stdout, "%s\n", Getitem(els, j+1));
-      }
-      Printf(stdout, "\n");
-    }
-  }
-
-  return SWIG_OK;
-}
-
-
-/*
-  Iterate over the <class name>_set and <>_get 
-  elements and generate the $ and $<- functions
-  that provide constrained access to the member
-  fields in these elements.
-
-  tb - a hash table that is built up in functionWrapper
-  as we process each membervalueHandler.
-  The entries are indexed by <class name>_set and 
-  <class_name>_get. Each entry is a List *.
-   
-  out - the stram where the code is to be written. This is the S
-  code stream as we generate only S code here..
-*/
-int R::OutputClassMemberTable(Hash *tb, File *out) {
-  List *keys = Keys(tb), *el;
-  
-  String *key;
-  int i, n = Len(keys);
-  /* Loop over all the  <Class>_set and <Class>_get entries in the table. */
-  /* This function checks for names ending in _set - perhaps it should */
-  /* use attributes of some other form, as it potentially clashes with */
-  /* methods ending in _set */
-  if(n && outputNamespaceInfo) {
-    Printf(s_namespace, "exportClasses(");
-  }
-  for(i = 0; i < n; i++) {
-    key = Getitem(keys, i);
-    el = Getattr(tb, key);
-    
-    String *className = Getitem(el, 0);
-    char *ptr = Char(key);
-    int klen = Len(key);
-    int isSet = 0;
-    if (klen > 4) {
-      ptr = &ptr[klen - 4];
-      isSet = strcmp(ptr, "_set") == 0;
-    }
-
-    //        OutputArrayMethod(className, el, out);        
-    OutputMemberReferenceMethod(className, isSet, el, out);
-    
-    if(outputNamespaceInfo) 
-      Printf(s_namespace, "\"%s\"%s", className, i < n-1 ? "," : "");
-  }
-  if(n && outputNamespaceInfo) { 
-    Printf(s_namespace, ")\n");
-  }
-  
-  return n;
-}
-
-/*******************************************************************
- Write the methods for $ or $<- for accessing a member field in an 
- struct or union (or class).
- className - the name of the struct or union (e.g. Bar for struct Bar)
- isSet - a logical value indicating whether the method is for 
-           modifying ($<-) or accessing ($) the member field.
- el - a list of length  2 * # accessible member elements  + 1.
-      The first element is the name of the class. 
-      The other pairs are  member name and the name of the R function to access it.
- out - the stream where we write the code.
-********************************************************************/
-int R::OutputMemberReferenceMethod(String *className, int isSet, 
-				   List *el, File *out) {
-  int numMems = Len(el), j;
-  int varaccessor = 0;
-  if (numMems == 0) 
-    return SWIG_OK;
-  
-  Wrapper *f = NewWrapper(), *attr = NewWrapper();
-  
-  Printf(f->def, "function(x, name%s)", isSet ? ", value" : "");
-  Printf(attr->def, "function(x, i, j, ...%s)", isSet ? ", value" : "");
-  
-  Printf(f->code, "{\n");
-  Printf(f->code, "%saccessorFuns = list(", tab8);
-
-  Node *itemList = NewHash();
-  bool has_prev = false;
-  for(j = 0; j < numMems; j+=3) {
-    String *item = Getitem(el, j);
-    if (Getattr(itemList, item)) 
-      continue;
-    Setattr(itemList, item, "1");
-    
-    String *dup = Getitem(el, j + 1);
-    char *ptr = Char(dup);
-    ptr = &ptr[Len(dup) - 3];
-    
-    if (!strcmp(ptr, "get"))
-      varaccessor++;
-
-    String *pitem;
-    if (!Strcmp(item, "operator ()")) {
-      pitem = NewString("call");
-    } else if (!Strcmp(item, "operator ->")) {
-      pitem = NewString("deref");
-    } else if (!Strcmp(item, "operator +")) {
-      pitem = NewString("add");
-    } else if (!Strcmp(item, "operator -")) {
-      pitem = NewString("sub");
-    } else {
-      pitem = Copy(item);
-    }
-    if (has_prev) 
-      Printf(f->code, ", ");
-    Printf(f->code, "'%s' = %s", pitem, dup);
-    has_prev = true;
-    Delete(pitem);
-  }
-  Delete(itemList);
-  Printf(f->code, ");\n");
-  
-  if (!isSet && varaccessor > 0) {
-    Printf(f->code, "%svaccessors = c(", tab8);
-    int first = 1;
-    for(j = 0; j < numMems; j+=3) {
-      String *item = Getitem(el, j);
-      String *dup = Getitem(el, j + 1);
-      char *ptr = Char(dup);
-      ptr = &ptr[Len(dup) - 3];
-      
-      if (!strcmp(ptr, "get")) {
-	Printf(f->code, "%s'%s'", first ? "" : ", ", item);
-	first = 0;
-      }
-    }
-    Printf(f->code, ");\n");
-  }
-  
-  
-  /*    Printv(f->code, tab8,
-	"idx = pmatch(name, names(accessorFuns))\n",
-	tab8,
-	"if(is.na(idx)) {\n",
-	tab8, tab4, 
-	"stop(\"No ", (isSet ? "modifiable" : "accessible"), " field named \", name, \" in ", className,
-	": fields are \", paste(names(accessorFuns), sep = \", \")", 
-	")", "\n}\n", NIL); */
-  Printv(f->code, ";", tab8,
-	 "idx = pmatch(name, names(accessorFuns));\n",
-	 tab8,
-	 "if(is.na(idx)) \n",
-	 tab8, tab4, NIL);
-  Printf(f->code, "return(callNextMethod(x, name%s));\n",
-	 isSet ? ", value" : "");
-  Printv(f->code, tab8, "f = accessorFuns[[idx]];\n", NIL);
-  if(isSet) {
-    Printv(f->code, tab8, "f(x, value);\n", NIL);
-    Printv(f->code, tab8, "x;\n", NIL); // make certain to return the S value.
-  } else {
-    if (varaccessor) {
-      Printv(f->code, tab8,
-	     "if (is.na(match(name, vaccessors))) function(...){f(x, ...)} else f(x);\n", NIL);
-    } else {
-      Printv(f->code, tab8, "function(...){f(x, ...)};\n", NIL);
-    }
-  }
-  Printf(f->code, "}\n");
-  
-  
-  Printf(out, "# Start of accessor method for %s\n", className);
-  Printf(out, "setMethod('$%s', '_p%s', ",
-	 isSet ? "<-" : "", 
-	 getRClassName(className)); 
-  Wrapper_print(f, out);
-  Printf(out, ");\n");
-  
-  if(isSet) {
-    Printf(out, "setMethod('[[<-', c('_p%s', 'character'),", 
-	   getRClassName(className)); 
-    Insert(f->code, 2, "name = i;\n");
-    Printf(attr->code, "%s", f->code);
-    Wrapper_print(attr, out);
-    Printf(out, ");\n");
-  }
-  
-  DelWrapper(attr);
-  DelWrapper(f);
-  
-  Printf(out, "# end of accessor method for %s\n", className);
-  
-  return SWIG_OK;
-}
-
-/*******************************************************************
- Write the methods for [ or [<- for accessing a member field in an 
- struct or union (or class).
- className - the name of the struct or union (e.g. Bar for struct Bar)
- el - a list of length  2 * # accessible member elements  + 1.
-      The first element is the name of the class. 
-      The other pairs are  member name and the name of the R function to access it.
- out - the stream where we write the code.
-********************************************************************/
-int R::OutputArrayMethod(String *className, List *el, File *out) {
-  int numMems = Len(el), j;
-  
-  if(!el || numMems == 0)
-    return(0);
-  
-  Printf(out, "# start of array methods for %s\n", className);
-  for(j = 0; j < numMems; j+=3) {
-    String *item = Getitem(el, j);
-    String *dup = Getitem(el, j + 1);
-    if (!Strcmp(item, "__getitem__")) {
-      Printf(out, 
-	     "setMethod('[', '_p%s', function(x, i, j, ..., drop =TRUE) ", 
-	     getRClassName(className));
-      Printf(out, "  sapply(i, function (n)  %s(x, as.integer(n-1))))\n\n", dup);
-    }
-    if (!Strcmp(item, "__setitem__")) {
-      Printf(out, "setMethod('[<-', '_p%s', function(x, i, j, ..., value)", 
-	     getRClassName(className));
-      Printf(out, "  sapply(1:length(i), function(n) %s(x, as.integer(i[n]-1), value[n])))\n\n", dup);
-    }
-    
-  }
-  
-  Printf(out, "# end of array methods for %s\n", className);
-  
-  return SWIG_OK;
-}
-
-
-/************************************************************
- Called when a enumeration is to be processed.
- We want to call the R function defineEnumeration().
- tdname is the typedef of the enumeration, i.e. giving its name.
-*************************************************************/
-int R::enumDeclaration(Node *n) {
-  if (getCurrentClass() && (cplus_mode != PUBLIC))
-    return SWIG_NOWRAP;
-
-  String *name = Getattr(n, "name");
-  String *tdname = Getattr(n, "tdname");
-  
-  /* Using name if tdname is empty. */
-  
-  if(Len(tdname) == 0)
-    tdname = name;
-
-
-  if(!tdname || Strcmp(tdname, "") == 0) {
-    Language::enumDeclaration(n);
-    return SWIG_OK;
-  }
-  
-  String *mangled_tdname = SwigType_manglestr(tdname);
-  String *scode = NewString("");
-  
-  Printv(scode, "defineEnumeration('", mangled_tdname, "'", 
-	 ",\n",  tab8, tab8, tab4, ".values = c(\n", NIL);
-  
-  Node *c;
-  int value = -1; // First number is zero
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    //      const char *tag = Char(nodeType(c));
-    //      if (Strcmp(tag,"cdecl") == 0) {        
-    name = Getattr(c, "name");
-    String *val = Getattr(c, "enumvalue");
-    if(val && Char(val)) {
-      int inval = (int) getNumber(val);
-      if(inval == DEFAULT_NUMBER) 
-	value++;
-      else 
-	value = inval;
-    } else
-      value++;
-    
-    Printf(scode, "%s%s%s'%s' = %d%s\n", tab8, tab8, tab8, name, value,
-	   nextSibling(c) ? ", " : "");
-    //      }
-  }
-  
-  Printv(scode, "))", NIL);
-  Printf(sfile, "%s\n", scode);
-  
-  Delete(scode);
-  Delete(mangled_tdname);
-  
-  return SWIG_OK;
-}
-
-
-/*************************************************************
-**************************************************************/
-int R::variableWrapper(Node *n) {
-  String *name = Getattr(n, "sym:name");
-  
-  processing_variable = 1;
-  Language::variableWrapper(n); // Force the emission of the _set and _get function wrappers.
-  processing_variable = 0;
-  
-  
-  SwigType *ty = Getattr(n, "type");
-  int addCopyParam = addCopyParameter(ty);
-  
-  //XXX
-  processType(ty, n);
-  
-  if(!SwigType_isconst(ty)) {
-    Wrapper *f = NewWrapper();
-    Printf(f->def, "%s = \nfunction(value%s)\n{\n", 
-	   name, addCopyParam ? ", .copy = FALSE" : "");
-    Printv(f->code, "if(missing(value)) {\n", 
-	   name, "_get(", addCopyParam ? ".copy" : "", ")\n}", NIL);
-    Printv(f->code, " else {\n", 
-	   name, "_set(value)\n}\n}", NIL);
-    
-    Wrapper_print(f, sfile);
-    DelWrapper(f);
-  } else {
-    Printf(sfile, "%s = %s_get\n", name, name);
-  }
-
-  return SWIG_OK;
-}
-
-
-void R::addAccessor(String *memberName, Wrapper *wrapper, String *name, 
-		    int isSet) {
-  if(isSet < 0) {
-    int n = Len(name);
-    char *ptr = Char(name);
-    if (n>4) {
-      isSet = Strcmp(NewString(&ptr[n-4]), "_set") == 0;
-    }
-  }
-  
-  List *l = isSet ? class_member_set_functions : class_member_functions;
-  
-  if(!l) {
-    l = NewList();
-    if(isSet)
-      class_member_set_functions = l;
-    else
-      class_member_functions = l;
-  }
-  
-  Append(l, memberName);
-  Append(l, name);
-  
-  String *tmp = NewString("");
-  Wrapper_print(wrapper, tmp);
-  Append(l, tmp);
-  // if we could put the wrapper in directly:       Append(l, Copy(sfun));
-  if (debugMode)
-    Printf(stdout, "Adding accessor: %s (%s) => %s\n", memberName, name, tmp);
-}
-
-#define MAX_OVERLOAD 256
-
-struct Overloaded {
-  Node      *n;          /* Node                               */
-  int        argc;       /* Argument count                     */
-  ParmList  *parms;      /* Parameters used for overload check */
-  int        error;      /* Ambiguity error                    */
-};
-
-
-List * R::Swig_overload_rank(Node *n, 
-				 bool script_lang_wrapping) {
-  Overloaded  nodes[MAX_OVERLOAD];
-  int         nnodes = 0;
-  Node *o = Getattr(n,"sym:overloaded");
-
-
-  if (!o) return 0;
-
-  Node *c = o;
-  while (c) {
-    if (Getattr(c,"error")) {
-      c = Getattr(c,"sym:nextSibling");
-      continue;
-    }
-    /*    if (SmartPointer && Getattr(c,"cplus:staticbase")) {
-	  c = Getattr(c,"sym:nextSibling");
-	  continue;
-	  } */
-
-    /* Make a list of all the declarations (methods) that are overloaded with
-     * this one particular method name */
-
-    if (Getattr(c,"wrap:name")) {
-      nodes[nnodes].n = c;
-      nodes[nnodes].parms = Getattr(c,"wrap:parms");
-      nodes[nnodes].argc = emit_num_required(nodes[nnodes].parms);
-      nodes[nnodes].error = 0;
-      nnodes++;
-    }
-    c = Getattr(c,"sym:nextSibling");
-  }
-  
-  /* Sort the declarations by required argument count */
-  {
-    int i,j;
-    for (i = 0; i < nnodes; i++) {
-      for (j = i+1; j < nnodes; j++) {
-	if (nodes[i].argc > nodes[j].argc) {
-	  Overloaded t = nodes[i];
-	  nodes[i] = nodes[j];
-	  nodes[j] = t;
-	}
-      }
-    }
-  }
-
-  /* Sort the declarations by argument types */
-  {
-    int i,j;
-    for (i = 0; i < nnodes-1; i++) {
-      if (nodes[i].argc == nodes[i+1].argc) {
-	for (j = i+1; (j < nnodes) && (nodes[j].argc == nodes[i].argc); j++) {
-	  Parm *p1 = nodes[i].parms;
-	  Parm *p2 = nodes[j].parms;
-	  int   differ = 0;
-	  int   num_checked = 0;
-	  while (p1 && p2 && (num_checked < nodes[i].argc)) {
-	    if (debugMode) {
-	      Printf(stdout,"p1 = '%s', p2 = '%s'\n", Getattr(p1,"type"), Getattr(p2,"type"));
-	    }
-	    if (checkAttribute(p1,"tmap:in:numinputs","0")) {
-	      p1 = Getattr(p1,"tmap:in:next");
-	      continue;
-	    }
-	    if (checkAttribute(p2,"tmap:in:numinputs","0")) {
-	      p2 = Getattr(p2,"tmap:in:next");
-	      continue;
-	    }
-	    String *t1 = Getattr(p1,"tmap:typecheck:precedence");
-	    String *t2 = Getattr(p2,"tmap:typecheck:precedence");
-	    if (debugMode) {
-	      Printf(stdout,"t1 = '%s', t2 = '%s'\n", t1, t2);
-	    }
-	    if ((!t1) && (!nodes[i].error)) {
-	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[i].n), Getline(nodes[i].n),
-			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
-			   Swig_name_decl(nodes[i].n), SwigType_str(Getattr(p1, "type"), 0));
-	      nodes[i].error = 1;
-	    } else if ((!t2) && (!nodes[j].error)) {
-	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[j].n), Getline(nodes[j].n),
-			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
-			   Swig_name_decl(nodes[j].n), SwigType_str(Getattr(p2, "type"), 0));
-	      nodes[j].error = 1;
-	    }
-	    if (t1 && t2) {
-	      int t1v, t2v;
-	      t1v = atoi(Char(t1));
-	      t2v = atoi(Char(t2));
-	      differ = t1v-t2v;
-	    }
-	    else if (!t1 && t2) differ = 1;
-	    else if (t1 && !t2) differ = -1;
-	    else if (!t1 && !t2) differ = -1;
-	    num_checked++;
-	    if (differ > 0) {
-	      Overloaded t = nodes[i];
-	      nodes[i] = nodes[j];
-	      nodes[j] = t;
-	      break;
-	    } else if ((differ == 0) && (Strcmp(t1,"0") == 0)) {
-	      t1 = Getattr(p1,"ltype");
-	      if (!t1) {
-		t1 = SwigType_ltype(Getattr(p1,"type"));
-		if (Getattr(p1,"tmap:typecheck:SWIGTYPE")) {
-		  SwigType_add_pointer(t1);
-		}
-		Setattr(p1,"ltype",t1);
-	      }
-	      t2 = Getattr(p2,"ltype");
-	      if (!t2) {
-		t2 = SwigType_ltype(Getattr(p2,"type"));
-		if (Getattr(p2,"tmap:typecheck:SWIGTYPE")) {
-		  SwigType_add_pointer(t2);
-		}
-		Setattr(p2,"ltype",t2);
-	      }
-
-	      /* Need subtype check here.  If t2 is a subtype of t1, then we need to change the
-                 order */
-
-	      if (SwigType_issubtype(t2,t1)) {
-		Overloaded t = nodes[i];
-		nodes[i] = nodes[j];
-		nodes[j] = t;
-	      }
-
-	      if (Strcmp(t1,t2) != 0) {
-		differ = 1;
-		break;
-	      }
-	    } else if (differ) {
-	      break;
-	    }
-	    if (Getattr(p1,"tmap:in:next")) {
-	      p1 = Getattr(p1,"tmap:in:next");
-	    } else {
-	      p1 = nextSibling(p1);
-	    }
-	    if (Getattr(p2,"tmap:in:next")) {
-	      p2 = Getattr(p2,"tmap:in:next");
-	    } else {
-	      p2 = nextSibling(p2);
-	    }
-	  }
-	  if (!differ) {
-	    /* See if declarations differ by const only */
-	    String *d1 = Getattr(nodes[i].n, "decl");
-	    String *d2 = Getattr(nodes[j].n, "decl");
-	    if (d1 && d2) {
-	      String *dq1 = Copy(d1);
-	      String *dq2 = Copy(d2);
-	      if (SwigType_isconst(d1)) {
-		Delete(SwigType_pop(dq1));
-	      }
-	      if (SwigType_isconst(d2)) {
-		Delete(SwigType_pop(dq2));
-	      }
-	      if (Strcmp(dq1, dq2) == 0) {
-
-		if (SwigType_isconst(d1) && !SwigType_isconst(d2)) {
-		  if (script_lang_wrapping) {
-		    // Swap nodes so that the const method gets ignored (shadowed by the non-const method)
-		    Overloaded t = nodes[i];
-		    nodes[i] = nodes[j];
-		    nodes[j] = t;
-		  }
-		  differ = 1;
-		  if (!nodes[j].error) {
-		    if (script_lang_wrapping) {
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[j].n), Getline(nodes[j].n),
-				   "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[i].n), Getline(nodes[i].n),
-				   "using non-const method %s instead.\n", Swig_name_decl(nodes[i].n));
-		    } else {
-		      if (!Getattr(nodes[j].n, "overload:ignore")) {
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		      }
-		    }
-		  }
-		  nodes[j].error = 1;
-		} else if (!SwigType_isconst(d1) && SwigType_isconst(d2)) {
-		  differ = 1;
-		  if (!nodes[j].error) {
-		    if (script_lang_wrapping) {
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[j].n), Getline(nodes[j].n),
-				   "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		      Swig_warning(WARN_LANG_OVERLOAD_CONST, Getfile(nodes[i].n), Getline(nodes[i].n),
-				   "using non-const method %s instead.\n", Swig_name_decl(nodes[i].n));
-		    } else {
-		      if (!Getattr(nodes[j].n, "overload:ignore")) {
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		      }
-		    }
-		  }
-		  nodes[j].error = 1;
-		}
-	      }
-	      Delete(dq1);
-	      Delete(dq2);
-	    }
-	  }
-	  if (!differ) {
-	    if (!nodes[j].error) {
-	      if (script_lang_wrapping) {
-		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[j].n), Getline(nodes[j].n),
-			     "Overloaded method %s effectively ignored,\n", Swig_name_decl(nodes[j].n));
-		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[i].n), Getline(nodes[i].n),
-			     "as it is shadowed by %s.\n", Swig_name_decl(nodes[i].n));
-	      } else {
-		if (!Getattr(nodes[j].n, "overload:ignore")) {
-		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
-			       "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
-			       "using %s instead.\n", Swig_name_decl(nodes[i].n));
-		}
-	      }
-	      nodes[j].error = 1;
-	    }
-	  }
-	}
-      }
-    }
-  }
-  List *result = NewList();
-  {
-    int i;
-    for (i = 0; i < nnodes; i++) {
-      if (nodes[i].error)
-        Setattr(nodes[i].n, "overload:ignore", "1");
-      Append(result,nodes[i].n);
-      //      Printf(stdout,"[ %d ] %s\n", i, ParmList_errorstr(nodes[i].parms));
-      //      Swig_print_node(nodes[i].n);
-    }
-  }
-  return result;
-}
-
-void R::dispatchFunction(Node *n) {
-  Wrapper *f = NewWrapper();
-  String *symname = Getattr(n, "sym:name");
-  String *nodeType = Getattr(n, "nodeType");
-  bool constructor = (!Cmp(nodeType, "constructor")); 
-
-  String *sfname = NewString(symname);
-
-  if (constructor)
-    Replace(sfname, "new_", "", DOH_REPLACE_FIRST);
-
-  Printf(f->def,
-	 "`%s` <- function(...) {", sfname);
-  if (debugMode) {
-    Swig_print_node(n);
-  }
-  List *dispatch = Swig_overload_rank(n, true);
-  int   nfunc = Len(dispatch);
-  Printv(f->code, 
-	 "argtypes <- mapply(class, list(...));\n",
-	 "argv <- list(...);\n",
-	 "argc <- length(argtypes);\n", NIL );
-
-  Printf(f->code, "# dispatch functions %d\n", nfunc);
-  int cur_args = -1;
-  bool first_compare = true;
-  for (int i=0; i < nfunc; i++) {
-    Node *ni = Getitem(dispatch,i);
-    Parm *pi = Getattr(ni,"wrap:parms");
-    int num_arguments = emit_num_arguments(pi);
-
-    String *overname = Getattr(ni,"sym:overname");      
-    if (cur_args != num_arguments) {
-      if (cur_args != -1) {
-	Printv(f->code, "} else ", NIL);
-      }
-      Printf(f->code, "if (argc == %d) {", num_arguments);
-      cur_args = num_arguments;
-      first_compare = true;
-    }
-    Parm *p;
-    int j;
-    if (num_arguments > 0) {
-      if (!first_compare) {
-	Printv(f->code, " else ", NIL);
-      } else {
-	first_compare = false;
-      }
-      Printv(f->code, "if (", NIL);
-      for (p =pi, j = 0 ; j < num_arguments ; j++) {
-	if (debugMode) {
-	  Swig_print_node(p);
-	}
-	String *tm = Swig_typemap_lookup("rtype", p, "", 0);
-	if(tm) {
-	  replaceRClass(tm, Getattr(p, "type"));
-	}
-
-	String *tmcheck = Swig_typemap_lookup("rtypecheck", p, "", 0);
-	if (tmcheck) {
-	  String *tmp = NewString("");
-	  Printf(tmp, "argv[[%d]]", j+1);
-	  Replaceall(tmcheck, "$arg", tmp);
-	  Printf(tmp, "argtype[%d]", j+1);
-	  Replaceall(tmcheck, "$argtype", tmp);
-	  if (tm) {
-	    Replaceall(tmcheck, "$rtype", tm);
-	  }
-	  if (debugMode) {
-	    Printf(stdout, "<rtypecheck>%s\n", tmcheck);
-	  }
-	  Printf(f->code, "%s(%s)",
-		 j == 0? "" : " && ",
-		 tmcheck);
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-	if (tm) {
-	  if (Strcmp(tm,"numeric")==0) {
-	    Printf(f->code, "%sis.numeric(argv[[%d]])",
-		j == 0 ? "" : " && ",
-		j+1);
-	  }
-	  else if (Strcmp(tm,"integer")==0) {
-	    Printf(f->code, "%s(is.integer(argv[[%d]]) || is.numeric(argv[[%d]]))",
-		j == 0 ? "" : " && ",
-		j+1, j+1);
-	  }
-	  else if (Strcmp(tm,"character")==0) {
-	    Printf(f->code, "%sis.character(argv[[%d]])",
-		j == 0 ? "" : " && ",
-		j+1);
-	  }
-	  else {
-	    Printf(f->code, "%sextends(argtypes[%d], '%s')",
-		j == 0 ? "" : " && ",
-		j+1,
-		tm);
-	  }
-	}
-	if (!SwigType_ispointer(Getattr(p, "type"))) {
-	  Printf(f->code, " && length(argv[[%d]]) == 1",
-	      j+1);
-	}
-	p = Getattr(p, "tmap:in:next");
-      }
-      Printf(f->code, ") { f <- %s%s; }\n", sfname, overname);
-    } else {
-      Printf(f->code, "f <- %s%s; ", sfname, overname);
-    }
-  }
-  if (cur_args != -1) {
-    Printf(f->code, "} else {\n"
-	   "stop(\"cannot find overloaded function for %s with argtypes (\","
-	   "toString(argtypes),\")\");\n"
-	   "}", sfname);
-  }
-  Printv(f->code, ";\nf(...)", NIL);
-  Printv(f->code, ";\n}", NIL);
-  Wrapper_print(f, sfile);
-  Printv(sfile, "# Dispatch function\n", NIL);
-  DelWrapper(f);
-}
-
-/******************************************************************
-
-*******************************************************************/
-int R::functionWrapper(Node *n) {
-  String *fname = Getattr(n, "name");
-  String *iname = Getattr(n, "sym:name");
-  String *type = Getattr(n, "type"); 
-  
-  if (debugMode) {
-    Printf(stdout, 
-	   "<functionWrapper> %s %s %s\n", fname, iname, type);
-  }
-  String *overname = 0;
-  String *nodeType = Getattr(n, "nodeType");
-  bool constructor = (!Cmp(nodeType, "constructor")); 
-  bool destructor = (!Cmp(nodeType, "destructor")); 
-  
-  String *sfname = NewString(iname);
-  
-  if (constructor)
-    Replace(sfname, "new_", "", DOH_REPLACE_FIRST);
-  
-  if (Getattr(n,"sym:overloaded")) {
-    overname = Getattr(n,"sym:overname");      
-    Append(sfname, overname);
-  }
-  
-  if (debugMode) 
-    Printf(stdout, 
-	   "<functionWrapper> processing parameters\n");
-  
-  
-  ParmList *l = Getattr(n, "parms");
-  Parm *p;
-  String *tm;
-  
-  p = l;
-  while(p) {
-    SwigType *resultType = Getattr(p, "type");
-    if (expandTypedef(resultType) && 
-	SwigType_istypedef(resultType)) {
-      SwigType *resolved =
-	SwigType_typedef_resolve_all(resultType);
-      if (expandTypedef(resolved)) {
-	Setattr(p, "type", Copy(resolved));
-      }
-    }
-    p = nextSibling(p);
-  } 
-
-  String *unresolved_return_type = 
-    Copy(type);
-  if (expandTypedef(type) &&
-      SwigType_istypedef(type)) {
-    SwigType *resolved = 
-      SwigType_typedef_resolve_all(type);
-    if (expandTypedef(resolved)) {
-      type = Copy(resolved);
-      Setattr(n, "type", type);
-    }
-  }
-  if (debugMode) 
-    Printf(stdout, "<functionWrapper> unresolved_return_type %s\n",
-	   unresolved_return_type);
-  if(processing_member_access_function) {
-    if (debugMode)
-      Printf(stdout, "<functionWrapper memberAccess> '%s' '%s' '%s' '%s'\n", 
-	     fname, iname, member_name, class_name);
-    
-    if(opaqueClassDeclaration)
-      return SWIG_OK;
-      
-      
-    /* Add the name of this member to a list for this class_name. 
-       We will dump all these at the end. */
-    
-    int n = Len(iname);
-    char *ptr = Char(iname);
-    bool isSet(0);
-    if (n > 4) isSet = Strcmp(NewString(&ptr[n-4]), "_set") == 0;
-    
-    
-    String *tmp = NewString("");
-    Printf(tmp, "%s_%s", class_name, isSet ? "set" : "get");
-    
-    List *memList = Getattr(ClassMemberTable, tmp);
-    if(!memList) {
-      memList = NewList();
-      Append(memList, class_name);
-      Setattr(ClassMemberTable, tmp, memList);
-    }
-    Delete(tmp);
-    Append(memList, member_name);
-    Append(memList, iname);
-  }
-  
-  int i;
-  int nargs;
-  
-  String *wname = Swig_name_wrapper(iname);
-  Replace(wname, "_wrap", "R_swig", DOH_REPLACE_FIRST);
-  if(overname) 
-    Append(wname, overname);
-  Setattr(n,"wrap:name", wname);
-
-  Wrapper *f = NewWrapper();
-  Wrapper *sfun = NewWrapper();
-  
-  int isVoidReturnType = (Strcmp(type, "void") == 0);
-  // Need to use the unresolved return type since 
-  // typedef resolution removes the const which causes a 
-  // mismatch with the function action
-  emit_return_variable(n, unresolved_return_type, f);
-
-  SwigType *rtype = Getattr(n, "type");
-  int addCopyParam = 0;
-
-  if(!isVoidReturnType) 
-    addCopyParam = addCopyParameter(rtype);
-
-
-  // Can we get the nodeType() of the type node! and see if it is a struct.
-  //    int addCopyParam = SwigType_isclass(rtype);
-
-  //    if(addCopyParam)
-  if (debugMode)
-    Printf(stdout, "Adding a .copy argument to %s for %s = %s\n", 
-	   iname, type, addCopyParam ? "yes" : "no");
-
-  Printv(f->def, "SWIGEXPORT SEXP\n", wname, " ( ", NIL);
-
-  Printf(sfun->def, "# Start of %s\n", iname);         
-  Printv(sfun->def, "\n`", sfname, "` = function(", NIL);
-
-  if(outputNamespaceInfo) //XXX Need to be a little more discriminating
-    addNamespaceFunction(iname);
-
-  Swig_typemap_attach_parms("scoercein", l, f);
-  Swig_typemap_attach_parms("scoerceout", l, f);
-  Swig_typemap_attach_parms("scheck", l, f);
-
-  emit_parameter_variables(l, f);
-  emit_attach_parmmaps(l,f);
-  Setattr(n,"wrap:parms",l);
-
-  nargs = emit_num_arguments(l);
-
-  Wrapper_add_local(f, "r_nprotect", "unsigned int r_nprotect = 0");
-  Wrapper_add_localv(f, "r_ans", "SEXP", "r_ans = R_NilValue", NIL);
-  Wrapper_add_localv(f, "r_vmax", "VMAXTYPE", "r_vmax = vmaxget()", NIL);
-
-  String *sargs = NewString("");
-
-
-  String *s_inputTypes = NewString("");
-  String *s_inputMap = NewString("");
-  bool inFirstArg = true;
-  bool inFirstType = true;
-  Parm *curP;
-  for (p =l, i = 0 ; i < nargs ; i++) {
-
-    while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-
-    SwigType *tt = Getattr(p, "type");
-    int nargs = -1;
-    String *funcptr_name = processType(tt, p, &nargs);
-
-    //      SwigType *tp = Getattr(p, "type");
-    String   *name  = Getattr(p,"name");
-    String   *lname  = Getattr(p,"lname");
-
-    // R keyword renaming
-    if (name) {
-      if (Swig_name_warning(p, 0, name, 0)) {
-	name = 0;
-      } else {
-	/* If we have a :: in the parameter name because we are accessing a static member of a class, say, then
-	   we need to remove that prefix. */
-	while (Strstr(name, "::")) {
-	  //XXX need to free.
-	  name = NewStringf("%s", Strchr(name, ':') + 2);
-	  if (debugMode)
-	    Printf(stdout, "+++  parameter name with :: in it %s\n", name);
-	}
-      }
-    }
-    if (!name || Len(name) == 0)
-      name = NewStringf("s_arg%d", i+1);
-
-    name = replaceInitialDash(name);
-
-    if (!Strncmp(name, "arg", 3)) {
-      name = Copy(name);
-      Insert(name, 0, "s_");
-    }
-      
-    if(processing_variable) {
-      name = Copy(name);
-      Insert(name, 0, "s_");
-    }
-
-    if(!Strcmp(name, fname)) {
-      name = Copy(name);
-      Insert(name, 0, "s_");
-    }
-
-    Printf(sargs, "%s, ", name);
-
-    String *tm;
-    if((tm = Getattr(p, "tmap:scoercein"))) {
-      Replaceall(tm, "$input", name);
-      replaceRClass(tm, Getattr(p, "type"));
-
-      if(funcptr_name) {
-	//XXX need to get this to return non-zero
-	if(nargs == -1)
-	  nargs = getFunctionPointerNumArgs(p, tt);
-
-	String *snargs = NewStringf("%d", nargs);
-	Printv(sfun->code, "if(is.function(", name, ")) {", "\n",
-	       "assert('...' %in% names(formals(", name, 
-	       ")) || length(formals(", name, ")) >= ", snargs, ");\n} ", NIL);
-	Delete(snargs);
-
-	Printv(sfun->code, "else {\n",
-	       "if(is.character(", name, ")) {\n",
-	       name, " = getNativeSymbolInfo(", name, ");",
-	       "\n};\n",
-	       "if(is(", name, ", \"NativeSymbolInfo\")) {\n",
-	       name, " = ", name, "$address", ";\n}\n",
-	       "if(is(", name, ", \"ExternalReference\")) {\n",
-	       name, " = ", name, "@ref;\n}\n",
-	       "}; \n",
-	       NIL);
-      } else {
-	Printf(sfun->code, "%s\n", tm);
-      }
-    }
-
-    Printv(sfun->def, inFirstArg ? "" : ", ", name, NIL);
-
-    if ((tm = Getattr(p,"tmap:scheck"))) {
-
-      Replaceall(tm,"$target", lname);
-      Replaceall(tm,"$source", name);
-      Replaceall(tm,"$input", name);
-      replaceRClass(tm, Getattr(p, "type"));
-      Printf(sfun->code,"%s\n",tm);
-    }
-
-
-
-    curP = p;
-    if ((tm = Getattr(p,"tmap:in"))) {
-
-      Replaceall(tm,"$target", lname);
-      Replaceall(tm,"$source", name);
-      Replaceall(tm,"$input", name);
-
-      if (Getattr(p,"wrap:disown") || (Getattr(p,"tmap:in:disown"))) {
-	Replaceall(tm,"$disown","SWIG_POINTER_DISOWN");
-      } else {
-	Replaceall(tm,"$disown","0");
-      }
-
-      if(funcptr_name) {
-	/* have us a function pointer */
-	Printf(f->code, "if(TYPEOF(%s) != CLOSXP) {\n", name);
-	Replaceall(tm,"$R_class", "");
-      } else {
-	replaceRClass(tm, Getattr(p, "type"));
-      }
-
-
-      Printf(f->code,"%s\n",tm);
-      if(funcptr_name) 
-	Printf(f->code, "} else {\n%s = %s;\nR_SWIG_pushCallbackFunctionData(%s, NULL);\n}\n", 
-	       lname, funcptr_name, name);
-      Printv(f->def, inFirstArg ? "" : ", ", "SEXP ", name, NIL);
-      if (Len(name) != 0) 
-	inFirstArg = false;
-      p = Getattr(p,"tmap:in:next");
-
-    } else {
-      p = nextSibling(p);
-    }
-
-
-    tm = Swig_typemap_lookup("rtype", curP, "", 0);
-    if(tm) {
-      replaceRClass(tm, Getattr(curP, "type"));
-    }
-    Printf(s_inputTypes, "%s'%s'", inFirstType ? "" : ", ", tm);
-    Printf(s_inputMap, "%s%s='%s'", inFirstType ? "" : ", ", name, tm);
-    inFirstType = false;
-
-    if(funcptr_name) 
-      Delete(funcptr_name);
-  } /* end of looping over parameters. */
-
-  if(addCopyParam) {
-    Printf(sfun->def, "%s.copy = FALSE", nargs > 0 ? ", " : "");
-    Printf(f->def, "%sSEXP s_swig_copy", nargs > 0 ? ", " : "");
-
-    Printf(sargs, "as.logical(.copy), ");
-  }
-
-  Printv(f->def, ")\n{\n", NIL);
-  Printv(sfun->def, ")\n{\n", NIL);
-
-
-  /* Insert cleanup code */
-  String *cleanup = NewString("");
-  for (p = l; p;) {
-    if ((tm = Getattr(p, "tmap:freearg"))) {
-      Replaceall(tm, "$source", Getattr(p, "lname"));
-      Printv(cleanup, tm, "\n", NIL);
-      p = Getattr(p, "tmap:freearg:next");
-    } else {
-      p = nextSibling(p);
-    }
-  }
-
-  String *outargs = NewString("");
-  int numOutArgs = isVoidReturnType ? -1 : 0;
-  for(p = l, i = 0; p; i++) {
-    if((tm = Getattr(p, "tmap:argout"))) {
-      //       String *lname =  Getattr(p, "lname");
-      numOutArgs++;
-      String *pos = NewStringf("%d", numOutArgs);
-      Replaceall(tm,"$source", Getattr(p, "lname"));
-      Replaceall(tm,"$result", "r_ans");
-      Replaceall(tm,"$n", pos); // The position into which to store the answer.
-      Replaceall(tm,"$arg", Getattr(p, "emit:input"));
-      Replaceall(tm,"$input", Getattr(p, "emit:input"));
-      Replaceall(tm,"$owner", "R_SWIG_EXTERNAL");
-
-
-      Printf(outargs, "%s\n", tm);
-      p = Getattr(p,"tmap:argout:next");
-    } else
-      p = nextSibling(p);
-  }
-
-  String *actioncode = emit_action(n);
-
-  /* Deal with the explicit return value. */
-  if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) { 
-    SwigType *retType = Getattr(n, "type");
-    //Printf(stdout, "Return Value for %s, array? %s\n", retType, SwigType_isarray(retType) ? "yes" : "no");     
-    /*      if(SwigType_isarray(retType)) {
-	    defineArrayAccessors(retType);
-	    } */
-
-
-    Replaceall(tm,"$1", Swig_cresult_name());
-    Replaceall(tm,"$result", "r_ans");
-    replaceRClass(tm, retType);
-
-    if (GetFlag(n,"feature:new")) {
-      Replaceall(tm, "$owner", "R_SWIG_OWNER");
-    } else {
-      Replaceall(tm,"$owner", "R_SWIG_EXTERNAL");
-    }
-
-#if 0
-    if(addCopyParam) {
-      Printf(f->code, "if(LOGICAL(s_swig_copy)[0]) {\n");
-      Printf(f->code, "/* Deal with returning a reference. */\nr_ans = R_NilValue;\n");
-      Printf(f->code, "}\n else {\n");
-    } 
-#endif
-    Printf(f->code, "%s\n", tm);
-#if 0
-    if(addCopyParam) 
-      Printf(f->code, "}\n"); /* end of if(s_swig_copy) ... else { ... } */
-#endif
-
-  } else {
-    Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number,
-		 "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), fname);
-  }
-
-
-  if(Len(outargs)) {
-    Wrapper_add_local(f, "R_OutputValues", "SEXP R_OutputValues");
-
-    String *tmp = NewString("");
-    if(!isVoidReturnType)
-      Printf(tmp, "Rf_protect(r_ans);\n");
-
-    Printf(tmp, "Rf_protect(R_OutputValues = Rf_allocVector(VECSXP,%d));\nr_nprotect += %d;\n", 
-	   numOutArgs + !isVoidReturnType, 
-	   isVoidReturnType ? 1 : 2);
-
-    if(!isVoidReturnType)
-      Printf(tmp, "SET_VECTOR_ELT(R_OutputValues, 0, r_ans);\n");
-    Printf(tmp, "r_ans = R_OutputValues;\n");
-
-    Insert(outargs, 0, tmp);
-    Delete(tmp); 
-
-
-
-    Printv(f->code, outargs, NIL);
-    Delete(outargs);
-
-  }
-
-  /* Output cleanup code */
-  Printv(f->code, cleanup, NIL);
-  Delete(cleanup);
-
-  /* Look to see if there is any newfree cleanup code */
-  if (GetFlag(n, "feature:new")) {
-    if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());	/* deprecated */
-      Printf(f->code, "%s\n", tm);
-    }
-  }
-
-  /* See if there is any return cleanup code */
-  if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-    Replaceall(tm, "$source", Swig_cresult_name());
-    Printf(f->code, "%s\n", tm);
-    Delete(tm);
-  }
-
-  Printv(f->code, UnProtectWrapupCode, NIL);
-
-  /*If the user gave us something to convert the result in  */
-  if ((tm = Swig_typemap_lookup("scoerceout", n, Swig_cresult_name(), sfun))) {
-    Replaceall(tm,"$source","ans");
-    Replaceall(tm,"$result","ans");
-    replaceRClass(tm, Getattr(n, "type"));
-    Chop(tm);
-  }
-
-
-  Printv(sfun->code, ";", (Len(tm) ? "ans = " : ""), ".Call('", wname, 
-	 "', ", sargs, "PACKAGE='", Rpackage, "');\n", NIL);
-  if(Len(tm))
-    {
-      Printf(sfun->code, "%s\n\n", tm); 
-      if (constructor)
-	{ 
-	  String *finalizer = NewString(iname);
-	  Replace(finalizer, "new_", "", DOH_REPLACE_FIRST);
-	  Printf(sfun->code, "reg.finalizer(ans@ref, delete_%s)\n", finalizer);
-	}                                                                      
-      Printf(sfun->code, "ans\n");
-    }
-
-  if (destructor)
-    Printv(f->code, "R_ClearExternalPtr(self);\n", NIL);
-
-  Printv(f->code, "return r_ans;\n}\n", NIL);
-  Printv(sfun->code, "\n}", NIL);
-
-  /* Substitute the function name */
-  Replaceall(f->code,"$symname",iname);
-
-  Wrapper_print(f, f_wrapper);
-  Wrapper_print(sfun, sfile);
-
-  Printf(sfun->code, "\n# End of %s\n", iname);
-  tm = Swig_typemap_lookup("rtype", n, "", 0);
-  if(tm) {
-    SwigType *retType = Getattr(n, "type");
-    replaceRClass(tm, retType);
-  }  
-    
-  Printv(sfile, "attr(`", sfname, "`, 'returnType') = '", 
-	 isVoidReturnType ? "void" : (tm ? tm : ""), 
-	 "'\n", NIL); 
-    
-  if(nargs > 0)
-    Printv(sfile, "attr(`", sfname, "`, \"inputTypes\") = c(",
-	   s_inputTypes, ")\n", NIL);
-  Printv(sfile, "class(`", sfname, "`) = c(\"SWIGFunction\", class('", 
-	 sfname, "'))\n\n", NIL); 
-
-  if (memoryProfile) {
-    Printv(sfile, "memory.profile()\n", NIL);
-  }
-  if (aggressiveGc) {
-    Printv(sfile, "gc()\n", NIL);
-  }
-
-  // Printv(sfile, "setMethod('", name, "', '", name, "', ", iname, ")\n\n\n");
-
-
-
-  /* If we are dealing with a method in an C++ class, then 
-     add the name of the R function and its definition. 
-     XXX need to figure out how to store the Wrapper if possible in the hash/list.
-     Would like to be able to do this so that we can potentially insert
-  */
-  if(processing_member_access_function || processing_class_member_function) {
-    addAccessor(member_name, sfun, iname);
-  }
-
-  if (Getattr(n, "sym:overloaded") &&
-      !Getattr(n, "sym:nextSibling")) {
-    dispatchFunction(n);
-  }
-
-  addRegistrationRoutine(wname, addCopyParam ? nargs +1 : nargs);
-
-  DelWrapper(f);
-  DelWrapper(sfun);
-
-  Delete(sargs);
-  Delete(sfname);
-  return SWIG_OK;
-}
-
-/* ----------------------------------------------------------------------
- * R::constantWrapper()
- * ---------------------------------------------------------------------- */
-
-int R::constantWrapper(Node *n) {
-  (void) n;
-  // TODO
-  return SWIG_OK;
-}
-
-/*****************************************************
- Add the specified routine name to the collection of 
- generated routines that are called from R functions.
- This is used to register the routines with R for 
- resolving symbols.
-
- rname - the name of the routine
- nargs - the number of arguments it expects. 
-******************************************************/
-int R::addRegistrationRoutine(String *rname, int nargs) {
-  if(!registrationTable) 
-    registrationTable = NewHash();
-
-  String *el = 
-    NewStringf("{\"%s\", (DL_FUNC) &%s, %d}", rname, rname, nargs);
-  
-  Setattr(registrationTable, rname, el);
-
-  return SWIG_OK;
-}
-
-/*****************************************************
- Write the registration information to an array and
- create the initialization routine for registering
- these.
-******************************************************/
-int R::outputRegistrationRoutines(File *out) {
-  int i, n;
-  if(!registrationTable) 
-    return(0);
-  if(inCPlusMode) 
-    Printf(out, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n");
-
-  Printf(out, "#include <R_ext/Rdynload.h>\n\n");
-  if(inCPlusMode) 
-    Printf(out, "#ifdef __cplusplus\n}\n#endif\n\n");
-
-  Printf(out, "SWIGINTERN R_CallMethodDef CallEntries[] = {\n");
-    
-  List *keys = Keys(registrationTable);
-  n = Len(keys);
-  for(i = 0; i < n; i++)
-    Printf(out, "   %s,\n", Getattr(registrationTable, Getitem(keys, i)));
-
-  Printf(out, "   {NULL, NULL, 0}\n};\n\n");
-
-  if(!noInitializationCode) {
-    if (inCPlusMode)
-      Printv(out, "extern \"C\" ", NIL);
-    Printf(out, "SWIGEXPORT void R_init_%s(DllInfo *dll) {\n", Rpackage);
-    Printf(out, "%sR_registerRoutines(dll, NULL, CallEntries, NULL, NULL);\n", tab4);
-    if(Len(s_init_routine)) {
-      Printf(out, "\n%s\n", s_init_routine);
-    }
-    Printf(out, "}\n");
-  }
-
-  return n;
-}
-
-
-
-/****************************************************************************
-  Process a struct, union or class declaration in the source code,
-  or an anonymous typedef struct
- 
-*****************************************************************************/
-//XXX What do we need to do here - 
-// Define an S4 class to refer to this.
-
-void R::registerClass(Node *n) {
-  String *name = Getattr(n, "name");    
-  String *kind = Getattr(n, "kind");    
-
-  if (debugMode)
-    Swig_print_node(n);
-  String *sname = NewStringf("_p%s", SwigType_manglestr(name));
-  if(!Getattr(SClassDefs, sname)) {
-    Setattr(SClassDefs, sname, sname);
-    String *base;
-
-    if(Strcmp(kind, "class") == 0) {
-      base = NewString("");
-      List *l = Getattr(n, "bases");
-      if(Len(l)) {
-	Printf(base, "c(");
-	for(int i = 0; i < Len(l); i++) {
-	  registerClass(Getitem(l, i));
-	  Printf(base, "'_p%s'%s", 
-		 SwigType_manglestr(Getattr(Getitem(l, i), "name")), 
-		 i < Len(l)-1 ? ", " : "");                
-	}
-	Printf(base, ")");
-      } else {
-	base = NewString("'C++Reference'");
-      }
-    } else 
-      base = NewString("'ExternalReference'");
-
-    Printf(s_classes, "setClass('%s', contains = %s)\n", sname, base);
-    Delete(base);
-  }
-  
-}
-
-int R::classDeclaration(Node *n) {
-
-  String *name = Getattr(n, "name");    
-  String *kind = Getattr(n, "kind");    
-
-  if (debugMode)
-    Swig_print_node(n);
-  registerClass(n);
-
-    
-  /* If we have a typedef union { ... } U, then we never get to see the typedef
-     via a regular call to typedefHandler. Instead, */
-  if(Getattr(n, "unnamed") && Getattr(n, "storage") && Strcmp(Getattr(n, "storage"), "typedef") == 0
-     && Getattr(n, "tdname") && Strcmp(Getattr(n, "tdname"), name) == 0) {
-    if (debugMode)
-      Printf(stdout, "Typedef in the class declaration for %s\n", name);
-    //        typedefHandler(n);
-  }
-
-  bool opaque = GetFlag(n, "feature:opaque") ? true : false;
-
-  if(opaque)
-    opaqueClassDeclaration = name;
-
-  int status = Language::classDeclaration(n);
-
-  opaqueClassDeclaration = NULL;
-
-
-  // OutputArrayMethod(name, class_member_functions, sfile);        
-  if (class_member_functions)
-    OutputMemberReferenceMethod(name, 0, class_member_functions, sfile);
-  if (class_member_set_functions)
-    OutputMemberReferenceMethod(name, 1, class_member_set_functions, sfile);
-
-  if(class_member_functions) {
-    Delete(class_member_functions);
-    class_member_functions = NULL;
-  }
-  if(class_member_set_functions) {
-    Delete(class_member_set_functions);
-    class_member_set_functions = NULL;
-  }
-  if (Getattr(n, "has_destructor")) {
-    Printf(sfile, "setMethod('delete', '_p%s', function(obj) {delete%s(obj)})\n",
-	   getRClassName(Getattr(n, "name")),
-	   getRClassName(Getattr(n, "name")));
-
-  }
-  if(!opaque && !Strcmp(kind, "struct") && copyStruct) {
-
-    String *def = 
-      NewStringf("setClass(\"%s\",\n%srepresentation(\n", name, tab4);
-    bool firstItem = true;
-
-    for(Node *c = firstChild(n); c; ) {
-      String *elName;
-      String *tp;
-
-      elName = Getattr(c, "name");
- 
-      String *elKind = Getattr(c, "kind");
-      if (!Equal(elKind, "variable")) {
-	c = nextSibling(c);
-	continue;
-      }
-      if (!Len(elName)) {
-	c = nextSibling(c);
-	continue;
-      }
-#if 0
-      tp = getRType(c);
-#else
-      tp = Swig_typemap_lookup("rtype", c, "", 0);
-      if(!tp) {
-	c = nextSibling(c);
-	continue;
-      }
-      if (Strstr(tp, "R_class")) {
-	c = nextSibling(c);
-	continue;
-      }
-      if (Strcmp(tp, "character") &&
-	  Strstr(Getattr(c, "decl"), "p.")) {
-	c = nextSibling(c);
-	continue;
-      }
-
-      if (!firstItem) {
-	Printf(def, ",\n");
-      } 
-      //	    else 
-      //XXX How can we tell if this is already done.
-      //	      SwigType_push(elType, elDecl);
-	    
-	    
-      // returns ""  tp = processType(elType, c, NULL);
-      //	    Printf(stdout, "<classDeclaration> elType %p\n", elType);
-      //	    tp = getRClassNameCopyStruct(Getattr(c, "type"), 1);
-#endif
-      String *elNameT = replaceInitialDash(elName);
-      Printf(def, "%s%s = \"%s\"", tab8, elNameT, tp);
-      firstItem = false;
-      Delete(tp);
-      Delete(elNameT);
-      c = nextSibling(c);
-    }
-    Printf(def, "),\n%scontains = \"RSWIGStruct\")\n", tab8);
-    Printf(s_classes, "%s\n\n# End class %s\n\n", def, name);
-
-    generateCopyRoutines(n);
-
-    Delete(def);
-  }
-
-  return status;
-}
-
-
-
-/***************************************************************
- Create the C routines that copy an S object of the class given
- by the given struct definition in Node *n to the C value
- and also the routine that goes from the C routine to an object
- of this S class.
-****************************************************************/
-/*XXX
-  Clean up the toCRef - make certain the names are correct for the types, etc.
-  in all cases.
-*/
-
-int R::generateCopyRoutines(Node *n) {
-  Wrapper *copyToR = NewWrapper();
-  Wrapper *copyToC = NewWrapper();
-  
-  String *name = Getattr(n, "name");
-  String *tdname = Getattr(n, "tdname");
-  String *kind = Getattr(n, "kind");
-  String *type;
-
-  if(Len(tdname)) {
-    type = Copy(tdname);
-  } else {
-    type = NewStringf("%s %s", kind, name);
-  }
-
-  String *mangledName = SwigType_manglestr(name);
-
-  if (debugMode)
-    Printf(stdout, "generateCopyRoutines:  name = %s, %s\n", name, type);
-
-  Printf(copyToR->def, "CopyToR%s = function(value, obj = new(\"%s\"))\n{\n", 
-	 mangledName, name);
-  Printf(copyToC->def, "CopyToC%s = function(value, obj)\n{\n", 
-	 mangledName);
-
-  Node *c = firstChild(n);
-
-  for(; c; c = nextSibling(c)) {
-    String *elName = Getattr(c, "name");
-    if (!Len(elName)) {
-      continue;
-    }
-    String *elKind = Getattr(c, "kind");
-    if (!Equal(elKind, "variable")) {
-      continue;
-    }
-
-    String *tp = Swig_typemap_lookup("rtype", c, "", 0);
-    if(!tp) {
-      continue;
-    }
-    if (Strstr(tp, "R_class")) {
-      continue;
-    }
-    if (Strcmp(tp, "character") &&
-	Strstr(Getattr(c, "decl"), "p.")) {
-      continue;
-    }
-
-
-    /* The S functions to get and set the member value. */
-    String *elNameT = replaceInitialDash(elName);
-    Printf(copyToR->code, "obj@%s = value$%s;\n", elNameT, elNameT);
-    Printf(copyToC->code, "obj$%s = value@%s;\n", elNameT, elNameT);
-    Delete(elNameT);
-  }
-  Printf(copyToR->code, "obj;\n}\n\n");
-  String *rclassName = getRClassNameCopyStruct(type, 0); // without the Ref.
-  Printf(sfile, "# Start definition of copy functions & methods for %s\n", rclassName);  
-  
-  Wrapper_print(copyToR, sfile);
-  Printf(copyToC->code, "obj\n}\n\n");
-  Wrapper_print(copyToC, sfile);
-  
-  
-  Printf(sfile, "# Start definition of copy methods for %s\n", rclassName);  
-  Printf(sfile, "setMethod('copyToR', '_p_%s', CopyToR%s);\n", rclassName, 
-	 mangledName);
-  Printf(sfile, "setMethod('copyToC', '%s', CopyToC%s);\n\n", rclassName, 
-	 mangledName);
-  
-  Printf(sfile, "# End definition of copy methods for %s\n", rclassName);  
-  Printf(sfile, "# End definition of copy functions & methods for %s\n", rclassName);  
-      
-  String *m = NewStringf("%sCopyToR", name);
-  addNamespaceMethod(m);
-  char *tt = Char(m);  tt[Len(m)-1] = 'C';
-  addNamespaceMethod(m);
-  Delete(m);
-  Delete(rclassName);
-  Delete(mangledName);
-  DelWrapper(copyToR);
-  DelWrapper(copyToC);
-
-  return SWIG_OK;
-}
-
-
-
-/*****
-      Called when there is a typedef to be invoked. 
-
-      XXX Needs to be enhanced or split to handle the case where we have a 
-      typedef within a classDeclaration emission because the struct/union/etc.
-      is anonymous.
-******/
-int R::typedefHandler(Node *n) {
-  SwigType *tp = Getattr(n, "type");
-  String *type = Getattr(n, "type");
-  if (debugMode)
-    Printf(stdout, "<typedefHandler> %s\n", Getattr(n, "name"));
-
-  processType(tp, n);
-
-  if(Strncmp(type, "struct ", 7) == 0) {
-    String *name = Getattr(n, "name");
-    char *trueName = Char(type);
-    trueName += 7;
-    if (debugMode)
-      Printf(stdout, "<typedefHandler> Defining S class %s\n", trueName);
-    Printf(s_classes, "setClass('_p%s', contains = 'ExternalReference')\n", 
-	   SwigType_manglestr(name));
-  }
-
-  return Language::typedefHandler(n);
-}
-
-
-
-/*********************
-  Called when processing a field in a "class", i.e. struct, union or
-  actual class.  We set a state variable so that we can correctly
-  interpret the resulting functionWrapper() call and understand that 
-  it is for a field element.
-**********************/
-int R::membervariableHandler(Node *n) {
-  SwigType *t = Getattr(n, "type");
-  processType(t, n, NULL);
-  processing_member_access_function = 1;
-  member_name = Getattr(n,"sym:name");
-  if (debugMode)
-    Printf(stdout, "<membervariableHandler> name = %s, sym:name = %s\n", 
-	   Getattr(n, "name"), member_name);
-
-  int status(Language::membervariableHandler(n));
-
-  if(!opaqueClassDeclaration && debugMode)
-    Printf(stdout, "<membervariableHandler> %s %s\n", Getattr(n, "name"), Getattr(n, "type"));
-
-  processing_member_access_function = 0;
-  member_name = NULL;
-
-  return status;
-}
-
-
-/*
-  This doesn't seem to get used so leave it out for the moment.
-*/
-String * R::runtimeCode() {
-  String *s = Swig_include_sys("rrun.swg");
-  if (!s) {
-    Printf(stdout, "*** Unable to open 'rrun.swg'\n");
-    s = NewString("");
-  }
-  return s;
-}
-
-
-/**
-   Called when SWIG wants to initialize this 
-   We initialize anythin we want here.
-   Most importantly, tell SWIG where to find the files (e.g. r.swg) for this module.
-   Use Swig_mark_arg() to tell SWIG that it is understood and not to throw an error.
-**/
-void R::main(int argc, char *argv[]) {
-  bool cppcast = true;
-  init();
-  Preprocessor_define("SWIGR 1", 0);
-  SWIG_library_directory("r");
-  SWIG_config_file("r.swg");
-  debugMode = false;
-  copyStruct = true;
-  memoryProfile = false;
-  aggressiveGc = false;
-  inCPlusMode = false;
-  outputNamespaceInfo = false;
-  noInitializationCode = false;
-
-  this->Argc = argc;
-  this->Argv = argv;
-
-  allow_overloading();// can we support this?    
-
-  for(int i = 0; i < argc; i++) {
-    if(strcmp(argv[i], "-package") == 0) {
-      Swig_mark_arg(i);
-      i++;
-      Swig_mark_arg(i);
-      Rpackage = argv[i];
-    } else if(strcmp(argv[i], "-dll") == 0) {
-      Swig_mark_arg(i);
-      i++;
-      Swig_mark_arg(i);
-      DllName = argv[i];
-    } else if(strcmp(argv[i], "-help") == 0) {
-      showUsage();
-    } else if(strcmp(argv[i], "-namespace") == 0) {
-      outputNamespaceInfo = true;
-      Swig_mark_arg(i);
-    } else if(!strcmp(argv[i], "-no-init-code")) {
-      noInitializationCode = true;
-      Swig_mark_arg(i);
-    } else if(!strcmp(argv[i], "-c++")) {
-      inCPlusMode = true;
-      Swig_mark_arg(i);
-      Printf(s_classes, "setClass('C++Reference', contains = 'ExternalReference')\n");
-    } else if(!strcmp(argv[i], "-debug")) {
-      debugMode = true;
-      Swig_mark_arg(i);
-    }  else if (!strcmp(argv[i],"-cppcast")) {
-      cppcast = true;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i],"-nocppcast")) {
-      cppcast = false;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i],"-copystruct")) {
-      copyStruct = true;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-nocopystruct")) {
-      copyStruct = false;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-memoryprof")) {
-      memoryProfile = true;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-nomemoryprof")) {
-      memoryProfile = false;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-aggressivegc")) {
-      aggressiveGc = true;
-      Swig_mark_arg(i);
-    } else if (!strcmp(argv[i], "-noaggressivegc")) {
-      aggressiveGc = false;
-      Swig_mark_arg(i);
-    }
-
-    if (cppcast) {
-      Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0);
-    }
-
-    if (debugMode) {
-      Swig_typemap_search_debug_set();
-      Swig_typemap_used_debug_set();
-      Swig_typemap_register_debug_set();
-      Swig_file_debug_set();
-    }
-    /// copyToR copyToC functions.
-
-  }
-}
-
-/*
-  Could make this work for String or File and then just store the resulting string
-  rather than the collection of arguments and argc.
-*/
-int R::outputCommandLineArguments(File *out)
-{
-  if(Argc < 1 || !Argv || !Argv[0])
-    return(-1);
-
-  Printf(out, "\n##   Generated via the command line invocation:\n##\t");
-  for(int i = 0; i < Argc ; i++) {
-    Printf(out, " %s", Argv[i]);
-  }
-  Printf(out, "\n\n\n");
-
-  return Argc;
-}
-
-
-
-/* How SWIG instantiates an object from this module. 
-   See swigmain.cxx */
-extern "C" 
-Language *swig_r(void) {
-  return new R();
-}
-
-
-
-/*************************************************************************************/
-
-/*
-  Needs to be reworked.
-*/
-String * R::processType(SwigType *t, Node *n, int *nargs) {
-  //XXX Need to handle typedefs, e.g.
-  //  a type which is a typedef  to a function pointer.
-
-  SwigType *tmp = Getattr(n, "tdname");
-  if (debugMode)
-    Printf(stdout, "processType %s (tdname = %s)\n", Getattr(n, "name"), tmp);
-  
-  SwigType *td = t;
-  if (expandTypedef(t) &&
-      SwigType_istypedef(t)) {
-    SwigType *resolved = 
-      SwigType_typedef_resolve_all(t);
-    if (expandTypedef(resolved)) {
-      td = Copy(resolved);
-    }
-  }
-
-  if(!td) {
-    int count = 0;
-    String *b = getRTypeName(t, &count);
-    if(count && b && !Getattr(SClassDefs, b)) {
-      if (debugMode)
-	Printf(stdout, "<processType> Defining class %s\n",  b);
-
-      Printf(s_classes, "setClass('%s', contains = 'ExternalReference')\n", b);       
-      Setattr(SClassDefs, b, b);
-    }
-     
-  }
-
-
-  if(td)
-    t = td;
-
-  if(SwigType_isfunctionpointer(t)) {
-    if (debugMode)
-      Printf(stdout, 
-	     "<processType> Defining pointer handler %s\n",  t);
-       
-    String *tmp = createFunctionPointerHandler(t, n, nargs);
-    return tmp;
-  }
-
-#if 0
-  SwigType_isfunction(t) && SwigType_ispointer(t)
-#endif
-
-    return NULL;
-}
-
-
-
-
-
-
-
-
-
-/*************************************************************************************/
-
-
-
-
-
diff --git a/dependencies2013/win32/swig/Source/Modules/ruby.cxx b/dependencies2013/win32/swig/Source/Modules/ruby.cxx
deleted file mode 100644
index b9ac1154..00000000
--- a/dependencies2013/win32/swig/Source/Modules/ruby.cxx
+++ /dev/null
@@ -1,3497 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * ruby.cxx
- *
- * Ruby language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>		/* for INT_MAX */
-
-#define SWIG_PROTECTED_TARGET_METHODS 1
-
-class RClass {
-private:
-  String *temp;
-
-public:
-  String *name;			/* class name (renamed) */
-  String *cname;		/* original C class/struct name */
-  String *mname;		/* Mangled name */
-
-  /**
-   * The C variable name used in the SWIG-generated wrapper code to refer to
-   * this class; usually it is of the form "SwigClassXXX.klass", where SwigClassXXX
-   * is a swig_class struct instance and klass is a member of that struct.
-   */
-  String *vname;
-
-  /**
-   * The C variable name used in the SWIG-generated wrapper code to refer to
-   * the module that implements this class's methods (when we're trying to
-   * support C++ multiple inheritance). Usually it is of the form
-   * "SwigClassClassName.mImpl", where SwigClassXXX is a swig_class struct instance
-   * and mImpl is a member of that struct.
-   */
-  String *mImpl;
-
-  String *type;
-  String *prefix;
-  String *init;
-
-
-  int constructor_defined;
-  int destructor_defined;
-
-   RClass() {
-    temp = NewString("");
-    name = NewString("");
-    cname = NewString("");
-    mname = NewString("");
-    vname = NewString("");
-    mImpl = NewString("");
-    type = NewString("");
-    prefix = NewString("");
-    init = NewString("");
-    constructor_defined = 0;
-    destructor_defined = 0;
-  }
-  
-  ~RClass() {
-    Delete(name);
-    Delete(cname);
-    Delete(vname);
-    Delete(mImpl);
-    Delete(mname);
-    Delete(type);
-    Delete(prefix);
-    Delete(init);
-    Delete(temp);
-  }
-
-  void set_name(const_String_or_char_ptr cn, const_String_or_char_ptr rn, const_String_or_char_ptr valn) {
-    /* Original C/C++ class (or struct) name */
-    Clear(cname);
-    Append(cname, cn);
-
-    /* Mangled name */
-    Delete(mname);
-    mname = Swig_name_mangle(cname);
-
-    /* Renamed class name */
-    Clear(name);
-    Append(name, valn);
-
-    /* Variable name for the VALUE that refers to the Ruby Class object */
-    Clear(vname);
-    Printf(vname, "SwigClass%s.klass", name);
-
-    /* Variable name for the VALUE that refers to the Ruby Class object */
-    Clear(mImpl);
-    Printf(mImpl, "SwigClass%s.mImpl", name);
-
-    /* Prefix */
-    Clear(prefix);
-    Printv(prefix, (rn ? rn : cn), "_", NIL);
-  }
-
-  char *strip(const_String_or_char_ptr s) {
-    Clear(temp);
-    Append(temp, s);
-    if (Strncmp(s, prefix, Len(prefix)) == 0) {
-      Replaceall(temp, prefix, "");
-    }
-    return Char(temp);
-  }
-};
-
-
-/* flags for the make_autodoc function */
-enum autodoc_t {
-  AUTODOC_CLASS,
-  AUTODOC_CTOR,
-  AUTODOC_DTOR,
-  AUTODOC_STATICFUNC,
-  AUTODOC_FUNC,
-  AUTODOC_METHOD,
-  AUTODOC_GETTER,
-  AUTODOC_SETTER,
-  AUTODOC_NONE
-};
-
-static const char *usage = "\
-Ruby Options (available with -ruby)\n\
-     -autorename     - Enable renaming of classes and methods to follow Ruby coding standards\n\
-     -cppcast        - Enable C++ casting operators (default)\n\
-     -globalmodule   - Wrap everything into the global module\n\
-     -initname <name>- Set entry function to Init_<name> (used by `require')\n\
-     -minherit       - Attempt to support multiple inheritance\n\
-     -noautorename   - Disable renaming of classes and methods (default)\n\
-     -nocppcast      - Disable C++ casting operators, useful for generating bugs\n\
-     -prefix <name>  - Set a prefix <name> to be prepended to all names\n\
-";
-
-
-#define RCLASS(hash, name) (RClass*)(Getattr(hash, name) ? Data(Getattr(hash, name)) : 0)
-#define SET_RCLASS(hash, name, klass) Setattr(hash, name, NewVoid(klass, 0))
-
-
-class RUBY:public Language {
-private:
-
-  String *module;
-  String *modvar;
-  String *feature;
-  String *prefix;
-  int current;
-  Hash *classes;		/* key=cname val=RClass */
-  RClass *klass;		/* Currently processing class */
-  Hash *special_methods;	/* Python style special method name table */
-
-  File *f_directors;
-  File *f_directors_h;
-  File *f_directors_helpers;
-  File *f_begin;
-  File *f_runtime;
-  File *f_runtime_h;
-  File *f_header;
-  File *f_wrappers;
-  File *f_init;
-  File *f_initbeforefunc;
-
-  bool useGlobalModule;
-  bool multipleInheritance;
-
-  // Wrap modes
-  enum WrapperMode {
-    NO_CPP,
-    MEMBER_FUNC,
-    CONSTRUCTOR_ALLOCATE,
-    CONSTRUCTOR_INITIALIZE,
-    DESTRUCTOR,
-    MEMBER_VAR,
-    CLASS_CONST,
-    STATIC_FUNC,
-    STATIC_VAR
-  };
-
-  /* ------------------------------------------------------------
-   * autodoc level declarations
-   * ------------------------------------------------------------ */
-
-  enum autodoc_l {
-    NO_AUTODOC = -2,		// no autodoc
-    STRING_AUTODOC = -1,	// use provided string
-    NAMES_AUTODOC = 0,		// only parameter names
-    TYPES_AUTODOC = 1,		// parameter names and types
-    EXTEND_AUTODOC = 2,		// extended documentation and parameter names
-    EXTEND_TYPES_AUTODOC = 3	// extended documentation and parameter types + names
-  };
-
-  autodoc_t last_mode;
-  String*   last_autodoc;
-
-  autodoc_l autodoc_level(String *autodoc) {
-    autodoc_l dlevel = NO_AUTODOC;
-    char *c = Char(autodoc);
-    if (c) {
-      if (isdigit(c[0])) {
-	dlevel = (autodoc_l) atoi(c);
-      } else {
-	if (strcmp(c, "extended") == 0) {
-	  dlevel = EXTEND_AUTODOC;
-	} else {
-	  dlevel = STRING_AUTODOC;
-	}
-      }
-    }
-    return dlevel;
-  }
-
-
-
-  /* ------------------------------------------------------------
-   * have_docstring()
-   *    Check if there is a docstring directive and it has text,
-   *    or there is an autodoc flag set
-   * ------------------------------------------------------------ */
-
-  bool have_docstring(Node *n) {
-    String *str = Getattr(n, "feature:docstring");
-    return (str && Len(str) > 0) || (Getattr(n, "feature:autodoc") && !GetFlag(n, "feature:noautodoc"));
-  }
-
-  /* ------------------------------------------------------------
-   * docstring()
-   *    Get the docstring text, stripping off {} if necessary,
-   *    and enclose in triple double quotes.  If autodoc is also
-   *    set then it will build a combined docstring.
-   * ------------------------------------------------------------ */
-
-  String *docstring(Node *n, autodoc_t ad_type) {
-
-    String *str = Getattr(n, "feature:docstring");
-    bool have_ds = (str && Len(str) > 0);
-    bool have_auto = (Getattr(n, "feature:autodoc") && !GetFlag(n, "feature:noautodoc"));
-    String *autodoc = NULL;
-    String *doc = NULL;
-
-    if (have_ds) {
-      char *t = Char(str);
-      if (*t == '{') {
-	Delitem(str, 0);
-	Delitem(str, DOH_END);
-      }
-    }
-
-    if (have_auto) {
-      autodoc = make_autodoc(n, ad_type);
-      have_auto = (autodoc && Len(autodoc) > 0);
-    }
-    // If there is more than one line then make docstrings like this:
-    //
-    //      This is line1
-    //      And here is line2 followed by the rest of them
-    //
-    // otherwise, put it all on a single line
-    //
-    if (have_auto && have_ds) {	// Both autodoc and docstring are present
-      doc = NewString("");
-      Printv(doc, "\n", autodoc, "\n", str, NIL);
-    } else if (!have_auto && have_ds) {	// only docstring
-      if (Strchr(str, '\n') == 0) {
-	doc = NewString(str);
-      } else {
-	doc = NewString("");
-	Printv(doc, str, NIL);
-      }
-    } else if (have_auto && !have_ds) {	// only autodoc
-      if (Strchr(autodoc, '\n') == 0) {
-	doc = NewStringf("%s", autodoc);
-      } else {
-	doc = NewString("");
-	Printv(doc, "\n", autodoc, NIL);
-      }
-    } else
-      doc = NewString("");
-
-    // Save the generated strings in the parse tree in case they are used later
-    // by post processing tools
-    Setattr(n, "ruby:docstring", doc);
-    Setattr(n, "ruby:autodoc", autodoc);
-    return doc;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * addMissingParameterNames()
-   *  For functions that have not had nameless parameters set in the Language class.
-   *
-   * Inputs: 
-   *   plist - entire parameter list
-   *   arg_offset - argument number for first parameter
-   * Side effects:
-   *   The "lname" attribute in each parameter in plist will be contain a parameter name
-   * ----------------------------------------------------------------------------- */
-
-  void addMissingParameterNames(ParmList *plist, int arg_offset) {
-    Parm *p = plist;
-    int i = arg_offset;
-    while (p) {
-      if (!Getattr(p, "lname")) {
-	String *pname = Swig_cparm_name(p, i);
-	Delete(pname);
-      }
-      i++;
-      p = nextSibling(p);
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * make_autodocParmList()
-   *   Generate the documentation for the function parameters
-   * ------------------------------------------------------------ */
-
-  String *make_autodocParmList(Node *n, bool showTypes) {
-    String *doc = NewString("");
-    String *pdocs = 0;
-    ParmList *plist = CopyParmList(Getattr(n, "parms"));
-    Parm *p;
-    Parm *pnext;
-    int lines = 0;
-    int start_arg_num = is_wrapping_class() ? 1 : 0;
-    const int maxwidth = 80;
-
-    addMissingParameterNames(plist, start_arg_num); // for $1_name substitutions done in Swig_typemap_attach_parms
-
-    Swig_typemap_attach_parms("in", plist, 0);
-    Swig_typemap_attach_parms("doc", plist, 0);
-
-    if (Strcmp(ParmList_protostr(plist), "void") == 0) {
-      //No parameters actually
-      return doc;
-    }
-
-    for (p = plist; p; p = pnext) {
-
-      String *tm = Getattr(p, "tmap:in");
-      if (tm) {
-	pnext = Getattr(p, "tmap:in:next");
-	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	  continue;
-	}
-      } else {
-	pnext = nextSibling(p);
-      }
-
-      String *name = 0;
-      String *type = 0;
-      String *value = 0;
-      String *pdoc = Getattr(p, "tmap:doc");
-      if (pdoc) {
-	name = Getattr(p, "tmap:doc:name");
-	type = Getattr(p, "tmap:doc:type");
-	value = Getattr(p, "tmap:doc:value");
-      }
-
-      // Note: the generated name should be consistent with that in kwnames[]
-      name = name ? name : Getattr(p, "name");
-      name = name ? name : Getattr(p, "lname");
-      name = Swig_name_make(p, 0, name, 0, 0); // rename parameter if a keyword
-
-      type = type ? type : Getattr(p, "type");
-      value = value ? value : Getattr(p, "value");
-
-      if (SwigType_isvarargs(type))
-	break;
-
-      // Skip the 'self' parameter which in ruby is implicit
-      if ( Cmp(name, "self") == 0 )
-	continue;
-
-      // Make __p parameters just p (as used in STL)
-      Replace( name, "__", "", DOH_REPLACE_FIRST );
-
-      if (Len(doc)) {
-	// add a comma to the previous one if any
-	Append(doc, ", ");
-
-	// Do we need to wrap a long line?
-	if ((Len(doc) - lines * maxwidth) > maxwidth) {
-	  Printf(doc, "\n%s", tab4);
-	  lines += 1;
-	}
-      }
-
-      // Do the param type too?
-      Node *nn = classLookup(Getattr(p, "type"));
-      String *type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
-      if (showTypes)
-	Printf(doc, "%s ", type_str);
-
-      Append(doc, name);
-      if (pdoc) {
-	if (!pdocs)
-	  pdocs = NewString("Parameters:\n");
-	Printf(pdocs, "    %s.\n", pdoc);
-      }
-
-      if (value) {
-	String *new_value = convertValue(value, Getattr(p, "type"));
-	if (new_value) {
-	  value = new_value;
-	} else {
-	  Node *lookup = Swig_symbol_clookup(value, 0);
-	  if (lookup)
-	    value = Getattr(lookup, "sym:name");
-	}
-	Printf(doc, "=%s", value);
-      }
-      Delete(type_str);
-      Delete(name);
-    }
-    if (pdocs)
-      Setattr(n, "feature:pdocs", pdocs);
-    Delete(plist);
-    return doc;
-  }
-
-  /* ------------------------------------------------------------
-   * make_autodoc()
-   *    Build a docstring for the node, using parameter and other
-   *    info in the parse tree.  If the value of the autodoc
-   *    attribute is "0" then do not include parameter types, if
-   *    it is "1" (the default) then do.  If it has some other
-   *    value then assume it is supplied by the extension writer
-   *    and use it directly.
-   * ------------------------------------------------------------ */
-
-  String *make_autodoc(Node *n, autodoc_t ad_type) {
-    int extended = 0;
-    // If the function is overloaded then this funciton is called
-    // for the last one.  Rewind to the first so the docstrings are
-    // in order.
-    while (Getattr(n, "sym:previousSibling"))
-      n = Getattr(n, "sym:previousSibling");
-
-    Node *pn = Swig_methodclass(n);
-    String* super_names = NewString(""); 
-    String* class_name = Getattr(pn, "sym:name") ; 
-
-    if ( !class_name ) {
-      class_name = NewString("");
-    } else {
-      class_name = Copy(class_name);
-      List *baselist = Getattr(pn, "bases");
-      if (baselist && Len(baselist)) {
-	Iterator base = First(baselist);
-	while (base.item && GetFlag(base.item, "feature:ignore")) {
-	  base = Next(base);
-	}
-
-	int count = 0;
-	for ( ;base.item; ++count) {
-	  if ( count ) Append(super_names, ", ");
-	  String *basename = Getattr(base.item, "sym:name");
-
-	  String* basenamestr = NewString(basename);
-	  Node* parent = parentNode(base.item);
-	  while (parent)
-	  {
-	    String *parent_name = Copy( Getattr(parent, "sym:name") );
-	    if ( !parent_name ) {
-	      Node* mod = Getattr(parent, "module");
-	      if ( mod )
-		parent_name = Copy( Getattr(mod, "name") );
-	      if ( parent_name )
-		(Char(parent_name))[0] = (char)toupper((Char(parent_name))[0]);
-	    }
-	    if ( parent_name ) {
-	      Insert(basenamestr, 0, "::");
-	      Insert(basenamestr, 0, parent_name);
-	      Delete(parent_name);
-	    }
-	    parent = parentNode(parent);
-	  }
-
-	  Append(super_names, basenamestr );
-	  Delete(basenamestr);
-	  base = Next(base);
-	}
-      }
-    }
-    String* full_name;
-    if ( module ) {
-      full_name = NewString(module);
-      if (Len(class_name) > 0)
-       	Append(full_name, "::");
-    }
-    else
-      full_name = NewString("");
-    Append(full_name, class_name);
-
-    String* symname = Getattr(n, "sym:name");
-    if ( Getattr( special_methods, symname ) )
-      symname = Getattr( special_methods, symname );
-
-    String* methodName = NewString(full_name);
-    Append(methodName, symname);
-
-
-    // Each overloaded function will try to get documented,
-    // so we keep the name of the last overloaded function and its type.
-    // Documenting just from functionWrapper() is not possible as
-    // sym:name has already been changed to include the class name
-    if ( last_mode == ad_type && Cmp(methodName, last_autodoc) == 0 ) {
-      Delete(full_name);
-      Delete(class_name);
-      Delete(super_names);
-      Delete(methodName);
-      return NewString("");
-    }
-
-
-    last_mode    = ad_type;
-    last_autodoc = Copy(methodName);
-
-    String *doc = NewString("/*\n");
-    int counter = 0;
-    bool skipAuto = false;
-    Node* on = n;
-    for ( ; n; ++counter ) {
-      String *type_str = NULL;
-      skipAuto = false;
-      bool showTypes = false;
-      String *autodoc = Getattr(n, "feature:autodoc");
-      autodoc_l dlevel = autodoc_level(autodoc);
-      switch (dlevel) {
-      case NO_AUTODOC:
-	break;
-      case NAMES_AUTODOC:
-	showTypes = false;
-	break;
-      case TYPES_AUTODOC:
-	showTypes = true;
-	break;
-      case EXTEND_AUTODOC:
-	extended = 1;
-	showTypes = false;
-	break;
-      case EXTEND_TYPES_AUTODOC:
-	extended = 1;
-	showTypes = true;
-	break;
-      case STRING_AUTODOC:
-	skipAuto = true;
-	break;
-      }
-
-      SwigType *type = Getattr(n, "type");
-
-      if (type) {
-	if (Strcmp(type, "void") == 0) {
-	  type_str = NULL;
-	} else {
-	  SwigType *qt = SwigType_typedef_resolve_all(type);
-	  if (SwigType_isenum(qt)) {
-	    type_str = NewString("int");
-	  } else {
-	    Node *nn = classLookup(type);
-	    type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
-	  }
-	}
-      }
-
-      if (counter == 0) {
-	switch (ad_type) {
-	case AUTODOC_CLASS:
-	  Printf(doc, "  Document-class: %s", full_name);
-	  if ( Len(super_names) > 0 )
-	    Printf( doc, " < %s", super_names);
-	  Append(doc, "\n\n");
-	  break;
-	case AUTODOC_CTOR:
- 	  Printf(doc, "  Document-method: %s.new\n\n", full_name);
-	  break;
-
-	case AUTODOC_DTOR:
-	  break;
-
-	case AUTODOC_STATICFUNC:
- 	  Printf(doc, "  Document-method: %s.%s\n\n", full_name, symname);
-	  break;
-
-	case AUTODOC_FUNC:
-	case AUTODOC_METHOD:
-	case AUTODOC_GETTER:
- 	  Printf(doc, "  Document-method: %s.%s\n\n", full_name, symname);
-	  break;
-	case AUTODOC_SETTER:
- 	  Printf(doc, "  Document-method: %s.%s=\n\n", full_name, symname);
-	  break;
-	case AUTODOC_NONE:
-	  break;
-	}
-      }
-
-      if (skipAuto) {
-	if ( counter == 0 ) Printf(doc, "  call-seq:\n");
-	switch( ad_type )
-	  {
-	  case AUTODOC_STATICFUNC:
-	  case AUTODOC_FUNC:
-	  case AUTODOC_METHOD:
-	  case AUTODOC_GETTER:
-	    {
-	      String *paramList = make_autodocParmList(n, showTypes);
-	      if (Len(paramList))
-		Printf(doc, "    %s(%s)", symname, paramList);
-	      else
-		Printf(doc, "    %s", symname);
-	      if (type_str)
-		Printf(doc, " -> %s", type_str);
-	      break;
-	    }
-	  case AUTODOC_SETTER:
-	    {
-	      Printf(doc, "    %s=(x)", symname);
-	      if (type_str)
-	       	Printf(doc, " -> %s", type_str);
-	      break;
-	    }
-	  default:
-	    break;
-	  }
-      } else {
-	switch (ad_type) {
-	case AUTODOC_CLASS:
-	  {
-	    // Only do the autodoc if there isn't a docstring for the class
-	    String *str = Getattr(n, "feature:docstring");
-	    if (counter == 0 && (str == 0 || Len(str) == 0)) {
-	      if (CPlusPlus) {
-		Printf(doc, "  Proxy of C++ %s class", full_name);
-	      } else {
-		Printf(doc, "  Proxy of C %s struct", full_name);
-	      }
-	    }
-	  }
-	  break;
-	case AUTODOC_CTOR:
-	  if (counter == 0)
-	    Printf(doc, "  call-seq:\n");
-	  if (Strcmp(class_name, symname) == 0) {
-	    String *paramList = make_autodocParmList(n, showTypes);
-	    if (Len(paramList))
-	      Printf(doc, "    %s.new(%s)", class_name, paramList);
-	    else
-	      Printf(doc, "    %s.new", class_name);
-	  } else {
-	    Printf(doc, "    %s.new(%s)", class_name, make_autodocParmList(n, showTypes));
-	  }
-	  break;
-
-	case AUTODOC_DTOR:
-	  break;
-
-	case AUTODOC_STATICFUNC:
-	case AUTODOC_FUNC:
-	case AUTODOC_METHOD:
-	case AUTODOC_GETTER:
-	  {
-	    if (counter == 0)
-	      Printf(doc, "  call-seq:\n");
-	    String *paramList = make_autodocParmList(n, showTypes);
-	    if (Len(paramList))
-	      Printf(doc, "    %s(%s)", symname, paramList);
-	    else
-	      Printf(doc, "    %s", symname);
-	    if (type_str)
-	      Printf(doc, " -> %s", type_str);
-	    break;
-	  }
-	case AUTODOC_SETTER:
-	  {
-	    Printf(doc, "  call-seq:\n");
-	    Printf(doc, "    %s=(x)", symname);
-	    if (type_str)
-	      Printf(doc, " -> %s", type_str);
-	    break;
-	  }
-	case AUTODOC_NONE:
-	  break;
-	}
-      }
-
-      // if it's overloaded then get the next decl and loop around again
-      n = Getattr(n, "sym:nextSibling");
-      if (n)
-	Append(doc, "\n");
-      Delete(type_str);
-    }
-
-    Printf(doc, "\n\n");
-    if (!skipAuto) {
-      switch (ad_type) {
-      case AUTODOC_CLASS:
-      case AUTODOC_DTOR:
-	break;
-      case AUTODOC_CTOR:
-	Printf(doc, "Class constructor.\n");
-	break;
-      case AUTODOC_STATICFUNC:
-	Printf(doc, "A class method.\n");
-	break;
-      case AUTODOC_FUNC:
-	Printf(doc, "A module function.\n");
-	break;
-      case AUTODOC_METHOD:
-	Printf(doc, "An instance method.\n");
-	break;
-      case AUTODOC_GETTER:
-	Printf(doc, "Get value of attribute.\n");
-	break;
-      case AUTODOC_SETTER:
-	Printf(doc, "Set new value for attribute.\n");
-	break;
-      case AUTODOC_NONE:
-	break;
-      }
-    }
-
-
-    n = on;
-    while ( n ) {
-      String *autodoc = Getattr(n, "feature:autodoc");
-      autodoc_l dlevel = autodoc_level(autodoc);
-
-      switch (dlevel) {
-      case NO_AUTODOC:
-      case NAMES_AUTODOC:
-      case TYPES_AUTODOC:
-	extended = 0;
-	break;
-      case STRING_AUTODOC:
-	extended = 2;
-	Replaceall( autodoc, "$class", class_name );
-	Printv(doc, autodoc, ".", NIL);
-	break;
-      case EXTEND_AUTODOC:
-      case EXTEND_TYPES_AUTODOC:
-	extended = 1;
-	break;
-      }
-
-
-      if (extended) {
-	String *pdocs = Getattr(n, "feature:pdocs");
-	if (pdocs) {
-	  Printv(doc, "\n\n", pdocs, NULL);
-	  break;
-	}
-	if ( extended == 2 ) break;
-      }
-      n = Getattr(n, "sym:nextSibling");
-    }
-
-    Append(doc, "\n*/\n");
-    Delete(full_name);
-    Delete(class_name);
-    Delete(super_names);
-    Delete(methodName);
-
-    return doc;
-  }
-
-  /* ------------------------------------------------------------
-   * convertValue()
-   *    Check if string v can be a Ruby value literal,
-   *    (eg. number or string), or translate it to a Ruby literal.
-   * ------------------------------------------------------------ */
-  String *convertValue(String *v, SwigType *t) {
-    if (v && Len(v) > 0) {
-      char fc = (Char(v))[0];
-      if (('0' <= fc && fc <= '9') || '\'' == fc || '"' == fc) {
-	/* number or string (or maybe NULL pointer) */
-	if (SwigType_ispointer(t) && Strcmp(v, "0") == 0)
-	  return NewString("None");
-	else
-	  return v;
-      }
-      if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0)
-	return SwigType_ispointer(t) ? NewString("nil") : NewString("0");
-      if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0)
-	return NewString("True");
-      if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
-	return NewString("False");
-    }
-    return 0;
-  }
-
-public:
-
-  /* ---------------------------------------------------------------------
-   * RUBY()
-   *
-   * Initialize member data
-   * --------------------------------------------------------------------- */
-  RUBY() :
-    module(0),
-    modvar(0),
-    feature(0),
-    prefix(0),
-    current(0),
-    classes(0),
-    klass(0),
-    special_methods(0),
-    f_directors(0),
-    f_directors_h(0),
-    f_directors_helpers(0),
-    f_begin(0),
-    f_runtime(0),
-    f_runtime_h(0),
-    f_header(0),
-    f_wrappers(0),
-    f_init(0),
-    f_initbeforefunc(0),
-    useGlobalModule(false),
-    multipleInheritance(false),
-    last_mode(AUTODOC_NONE),
-    last_autodoc(NewString("")) {
-      current = NO_CPP;
-      director_prot_ctor_code = NewString("");
-      Printv(director_prot_ctor_code,
-          "if ( $comparison ) { /* subclassed */\n",
-          "  $director_new \n",
-          "} else {\n", "  rb_raise(rb_eRuntimeError,\"accessing abstract class or protected constructor\"); \n", "  return Qnil;\n", "}\n", NIL);
-      director_multiple_inheritance = 0;
-      director_language = 1;
-    }
-
-  /* ---------------------------------------------------------------------
-   * main()
-   *
-   * Parse command line options and initializes variables.
-   * --------------------------------------------------------------------- */
-  
-  virtual void main(int argc, char *argv[]) {
-
-    int cppcast = 1;
-    int autorename = 0;
-
-    /* Set location of SWIG library */
-    SWIG_library_directory("ruby");
-
-    /* Look for certain command line options */
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-initname") == 0) {
-	  if (argv[i + 1]) {
-	    char *name = argv[i + 1];
-	    feature = NewString(name);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	}
-	else if (strcmp(argv[i], "-feature") == 0) {
-	  fprintf( stderr, "Warning: Ruby -feature option is deprecated, "
-		   "please use -initname instead.\n");
-	  if (argv[i + 1]) {
-	    char *name = argv[i + 1];
-	    feature = NewString(name);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-globalmodule") == 0) {
-	  useGlobalModule = true;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-minherit") == 0) {
-	  multipleInheritance = true;
-	  director_multiple_inheritance = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-cppcast") == 0) {
-	  cppcast = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nocppcast") == 0) {
-	  cppcast = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-autorename") == 0) {
-	  autorename = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-noautorename") == 0) {
-	  autorename = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-prefix") == 0) {
-	  if (argv[i + 1]) {
-	    char *name = argv[i + 1];
-	    prefix = NewString(name);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else {
-	    Swig_arg_error();
-	  }
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  Printf(stdout, "%s\n", usage);
-	}
-      }
-    }
-
-    if (cppcast) {
-      /* Turn on cppcast mode */
-      Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0);
-    }
-
-    if (autorename) {
-      /* Turn on the autorename mode */
-      Preprocessor_define((DOH *) "SWIG_RUBY_AUTORENAME", 0);
-    }
-
-    /* Add a symbol to the parser for conditional compilation */
-    Preprocessor_define("SWIGRUBY 1", 0);
-
-    /* Add typemap definitions */
-    SWIG_typemap_lang("ruby");
-    SWIG_config_file("ruby.swg");
-    allow_overloading();
-  }
-
-  /**
-   * Generate initialization code to define the Ruby module(s),
-   * accounting for nested modules as necessary.
-   */
-  void defineRubyModule() {
-    List *modules = Split(module, ':', INT_MAX);
-    if (modules != 0 && Len(modules) > 0) {
-      String *mv = 0;
-      Iterator m;
-      m = First(modules);
-      while (m.item) {
-	if (Len(m.item) > 0) {
-	  if (mv != 0) {
-	    Printv(f_init, tab4, modvar, " = rb_define_module_under(", modvar, ", \"", m.item, "\");\n", NIL);
-	  } else {
-	    Printv(f_init, tab4, modvar, " = rb_define_module(\"", m.item, "\");\n", NIL);
-	    mv = NewString(modvar);
-	  }
-	}
-	m = Next(m);
-      }
-      Delete(mv);
-      Delete(modules);
-    }
-  }
-
-  void registerMagicMethods() {
-
-    special_methods = NewHash();
-
-    /* Python->Ruby style special method name. */
-    /* Basic */
-    Setattr(special_methods, "__repr__", "inspect");
-    Setattr(special_methods, "__str__", "to_s");
-    Setattr(special_methods, "__cmp__", "<=>");
-    Setattr(special_methods, "__hash__", "hash");
-    Setattr(special_methods, "__nonzero__", "nonzero?");
-
-    /* Callable */
-    Setattr(special_methods, "__call__", "call");
-
-    /* Collection */
-    Setattr(special_methods, "__len__", "length");
-    Setattr(special_methods, "__getitem__", "[]");
-    Setattr(special_methods, "__setitem__", "[]=");
-
-    /* Operators */
-    Setattr(special_methods, "__add__", "+");
-    Setattr(special_methods, "__pos__", "+@");
-    Setattr(special_methods, "__sub__", "-");
-    Setattr(special_methods, "__neg__", "-@");
-    Setattr(special_methods, "__mul__", "*");
-    Setattr(special_methods, "__div__", "/");
-    Setattr(special_methods, "__mod__", "%");
-    Setattr(special_methods, "__lshift__", "<<");
-    Setattr(special_methods, "__rshift__", ">>");
-    Setattr(special_methods, "__and__", "&");
-    Setattr(special_methods, "__or__", "|");
-    Setattr(special_methods, "__xor__", "^");
-    Setattr(special_methods, "__invert__", "~");
-    Setattr(special_methods, "__lt__", "<");
-    Setattr(special_methods, "__le__", "<=");
-    Setattr(special_methods, "__gt__", ">");
-    Setattr(special_methods, "__ge__", ">=");
-    Setattr(special_methods, "__eq__", "==");
-
-    /* Other numeric */
-    Setattr(special_methods, "__divmod__", "divmod");
-    Setattr(special_methods, "__pow__", "**");
-    Setattr(special_methods, "__abs__", "abs");
-    Setattr(special_methods, "__int__", "to_i");
-    Setattr(special_methods, "__float__", "to_f");
-    Setattr(special_methods, "__coerce__", "coerce");
-  }
-
-  /* ---------------------------------------------------------------------
-   * top()
-   * --------------------------------------------------------------------- */
-
-  virtual int top(Node *n) {
-
-    String *mod_docstring = NULL;
-
-    /**
-     * See if any Ruby module options have been specified as options
-     * to the %module directive.
-     */
-    Node *swigModule = Getattr(n, "module");
-    if (swigModule) {
-      Node *options = Getattr(swigModule, "options");
-      if (options) {
-	if (Getattr(options, "directors")) {
-	  allow_directors();
-	}
-	if (Getattr(options, "dirprot")) {
-	  allow_dirprot();
-	}
-	if (Getattr(options, "ruby_globalmodule")) {
-	  useGlobalModule = true;
-	}
-	if (Getattr(options, "ruby_minherit")) {
-	  multipleInheritance = true;
-	  director_multiple_inheritance = 1;
-	}
-	mod_docstring = Getattr(options, "docstring");
-      }
-    }
-
-    /* Set comparison with none for ConstructorToFunction */
-
-
-    setSubclassInstanceCheck(NewStringf("strcmp(rb_obj_classname(self), classname) != 0"));
-    // setSubclassInstanceCheck(NewString("CLASS_OF(self) != cFoo.klass"));
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-    String *outfile_h = Getattr(n, "outfile_h");
-
-    if (!outfile) {
-      Printf(stderr, "Unable to determine outfile\n");
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-    f_directors_h = NewString("");
-    f_directors = NewString("");
-    f_directors_helpers = NewString("");
-    f_initbeforefunc = NewString("");
-
-    if (directorsEnabled()) {
-      if (!outfile_h) {
-        Printf(stderr, "Unable to determine outfile_h\n");
-        SWIG_exit(EXIT_FAILURE);
-      }
-      f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files());
-      if (!f_runtime_h) {
-	FileErrorDisplay(outfile_h);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("director", f_directors);
-    Swig_register_filebyname("director_h", f_directors_h);
-    Swig_register_filebyname("director_helpers", f_directors_helpers);
-    Swig_register_filebyname("initbeforefunc", f_initbeforefunc);
-
-    modvar = 0;
-    current = NO_CPP;
-    klass = 0;
-    classes = NewHash();
-
-    registerMagicMethods();
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGRUBY\n#define SWIGRUBY\n#endif\n\n");
-
-    if (directorsEnabled()) {
-      Printf(f_runtime, "#define SWIG_DIRECTORS\n");
-    }
-
-    Printf(f_runtime, "\n");
-
-    /* typedef void *VALUE */
-    SwigType *value = NewSwigType(T_VOID);
-    SwigType_add_pointer(value);
-    SwigType_typedef(value, "VALUE");
-    Delete(value);
-
-    /* Set module name */
-    set_module(Char(Getattr(n, "name")));
-
-    if (directorsEnabled()) {
-      /* Build a version of the module name for use in a C macro name. */
-      String *module_macro = Copy(module);
-      Replaceall(module_macro, "::", "__");
-
-      Swig_banner(f_directors_h);
-      Printf(f_directors_h, "\n");
-      Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_macro);
-      Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_macro);
-      Printf(f_directors_h, "namespace Swig {\n");
-      Printf(f_directors_h, "  class Director;\n");
-      Printf(f_directors_h, "}\n\n");
-
-      Printf(f_directors_helpers, "/* ---------------------------------------------------\n");
-      Printf(f_directors_helpers, " * C++ director class helpers\n");
-      Printf(f_directors_helpers, " * --------------------------------------------------- */\n\n");
-
-      Printf(f_directors, "\n\n");
-      Printf(f_directors, "/* ---------------------------------------------------\n");
-      Printf(f_directors, " * C++ director class methods\n");
-      Printf(f_directors, " * --------------------------------------------------- */\n\n");
-      if (outfile_h) {
-	String *filename = Swig_file_filename(outfile_h);
-	Printf(f_directors, "#include \"%s\"\n\n", filename);
-	Delete(filename);
-      }
-
-      Delete(module_macro);
-    }
-
-    Printf(f_header, "#define SWIG_init    Init_%s\n", feature);
-    Printf(f_header, "#define SWIG_name    \"%s\"\n\n", module);
-
-    if (mod_docstring) {
-      if (Len(mod_docstring)) {
-	Printf(f_header, "/*\n  Document-module: %s\n\n%s\n*/\n", module, mod_docstring);
-      }
-      Delete(mod_docstring);
-      mod_docstring = NULL;
-    }
-
-    Printf(f_header, "static VALUE %s;\n", modvar);
-
-    /* Start generating the initialization function */
-    String* docs = docstring(n, AUTODOC_CLASS);
-    Printf(f_init, "/*\n%s\n*/", docs );
-    Printv(f_init, "\n", "#ifdef __cplusplus\n", "extern \"C\"\n", "#endif\n", "SWIGEXPORT void Init_", feature, "(void) {\n", "size_t i;\n", "\n", NIL);
-
-    Printv(f_init, tab4, "SWIG_InitRuntime();\n", NIL);
-
-    if (!useGlobalModule)
-      defineRubyModule();
-
-    Printv(f_init, "\n", "SWIG_InitializeModule(0);\n", "for (i = 0; i < swig_module.size; i++) {\n", "SWIG_define_class(swig_module.types[i]);\n", "}\n", NIL);
-    Printf(f_init, "\n");
-
-    /* Initialize code to keep track of objects */
-    Printf(f_init, "SWIG_RubyInitializeTrackings();\n");
-
-    Language::top(n);
-
-    if (directorsEnabled()) {
-      // Insert director runtime into the f_runtime file (make it occur before %header section)
-      Swig_insert_file("director_common.swg", f_runtime);
-      Swig_insert_file("director.swg", f_runtime);
-    }
-
-    /* Finish off our init function */
-    Printf(f_init, "}\n");
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Dump(f_header, f_begin);
-
-    if (directorsEnabled()) {
-      Dump(f_directors_helpers, f_begin);
-      Dump(f_directors, f_begin);
-      Dump(f_directors_h, f_runtime_h);
-      Printf(f_runtime_h, "\n");
-      Printf(f_runtime_h, "#endif\n");
-      Delete(f_runtime_h);
-    }
-
-    Dump(f_wrappers, f_begin);
-    Dump(f_initbeforefunc, f_begin);
-    Wrapper_pretty_print(f_init, f_begin);
-
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_initbeforefunc);
-    Delete(f_runtime);
-    Delete(f_begin);
-
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * importDirective()
-   * ----------------------------------------------------------------------------- */
-
-  virtual int importDirective(Node *n) {
-    String *modname = Getattr(n, "module");
-    if (modname) {
-      if (prefix) {
-	Insert(modname, 0, prefix);
-      }
-
-      List *modules = Split(modname, ':', INT_MAX);
-      if (modules && Len(modules) > 0) {
-	modname = NewString("");
-	String *last = NULL;
-	Iterator m = First(modules);
-	while (m.item) {
-	  if (Len(m.item) > 0) {
-	    if (last) {
-	      Append(modname, "/");
-	    }
-	    Append(modname, m.item);
-	    last = m.item;
-	  }
-	  m = Next(m);
-	}
-	Printf(f_init, "rb_require(\"%s\");\n", modname);
-	Delete(modname);
-      }
-      Delete(modules);
-    }
-    return Language::importDirective(n);
-  }
-
-  /* ---------------------------------------------------------------------
-   * set_module(const char *mod_name)
-   *
-   * Sets the module name.  Does nothing if it's already set (so it can
-   * be overridden as a command line option).
-   *---------------------------------------------------------------------- */
-
-  void set_module(const char *s) {
-    String *mod_name = NewString(s);
-    if (module == 0) {
-      /* Start with the empty string */
-      module = NewString("");
-
-      if (prefix) {
-	Insert(mod_name, 0, prefix);
-      }
-
-      /* Account for nested modules */
-      List *modules = Split(mod_name, ':', INT_MAX);
-      if (modules != 0 && Len(modules) > 0) {
-	String *last = 0;
-	Iterator m = First(modules);
-	while (m.item) {
-	  if (Len(m.item) > 0) {
-	    String *cap = NewString(m.item);
-	    (Char(cap))[0] = (char)toupper((Char(cap))[0]);
-	    if (last != 0) {
-	      Append(module, "::");
-	    }
-	    Append(module, cap);
-	    last = m.item;
-	  }
-	  m = Next(m);
-	}
-	if (last) {
-	  if (feature == 0) {
-	    feature = Copy(last);
-	  }
-	  (Char(last))[0] = (char)toupper((Char(last))[0]);
-	  modvar = NewStringf("m%s", last);
-	}
-      }
-      Delete(modules);
-    }
-    Delete(mod_name);
-  }
-
-  /* --------------------------------------------------------------------------
-   * nativeWrapper()
-   * -------------------------------------------------------------------------- */
-  virtual int nativeWrapper(Node *n) {
-    String *funcname = Getattr(n, "wrap:name");
-    Swig_warning(WARN_LANG_NATIVE_UNIMPL, input_file, line_number, "Adding native function %s not supported (ignored).\n", funcname);
-    return SWIG_NOWRAP;
-  }
-
-  /**
-   * Process the comma-separated list of aliases (if any).
-   */
-  void defineAliases(Node *n, const_String_or_char_ptr iname) {
-    String *aliasv = Getattr(n, "feature:alias");
-    if (aliasv) {
-      List *aliases = Split(aliasv, ',', INT_MAX);
-      if (aliases && Len(aliases) > 0) {
-	Iterator alias = First(aliases);
-	while (alias.item) {
-	  if (Len(alias.item) > 0) {
-	    if (multipleInheritance) {
-	      Printv(klass->init, tab4, "rb_define_alias(", klass->mImpl, ", \"", alias.item, "\", \"", iname, "\");\n", NIL);
-	    } else {
-	      Printv(klass->init, tab4, "rb_define_alias(", klass->vname, ", \"", alias.item, "\", \"", iname, "\");\n", NIL);
-	    }
-	  }
-	  alias = Next(alias);
-	}
-      }
-      Delete(aliases);
-    }
-  }
-
-  /* ---------------------------------------------------------------------
-   * create_command(Node *n, char *iname)
-   *
-   * Creates a new command from a C function.
-   *              iname = Name of function in scripting language
-   *
-   * A note about what "protected" and "private" mean in Ruby:
-   *
-   * A private method is accessible only within the class or its subclasses,
-   * and it is callable only in "function form", with 'self' (implicit or
-   * explicit) as a receiver.
-   *
-   * A protected method is callable only from within its class, but unlike
-   * a private method, it can be called with a receiver other than self, such
-   * as another instance of the same class.
-   * --------------------------------------------------------------------- */
-
-  void create_command(Node *n, const_String_or_char_ptr iname) {
-
-    String *alloc_func = Swig_name_wrapper(iname);
-    String *wname = Swig_name_wrapper(iname);
-    if (CPlusPlus) {
-      Insert(wname, 0, "VALUEFUNC(");
-      Append(wname, ")");
-    }
-    if (current != NO_CPP)
-      iname = klass->strip(iname);
-    if (Getattr(special_methods, iname)) {
-      iname = GetChar(special_methods, iname);
-    }
-
-    String *s = NewString("");
-    String *temp = NewString("");
-
-#ifdef SWIG_PROTECTED_TARGET_METHODS
-    const char *rb_define_method = is_public(n) ? "rb_define_method" : "rb_define_protected_method";
-#else
-    const char *rb_define_method = "rb_define_method";
-#endif
-    switch (current) {
-    case MEMBER_FUNC:
-      {
-	if (multipleInheritance) {
-	  Printv(klass->init, tab4, rb_define_method, "(", klass->mImpl, ", \"", iname, "\", ", wname, ", -1);\n", NIL);
-	} else {
-	  Printv(klass->init, tab4, rb_define_method, "(", klass->vname, ", \"", iname, "\", ", wname, ", -1);\n", NIL);
-	}
-      }
-      break;
-    case CONSTRUCTOR_ALLOCATE:
-      Printv(s, tab4, "rb_define_alloc_func(", klass->vname, ", ", alloc_func, ");\n", NIL);
-      Replaceall(klass->init, "$allocator", s);
-      break;
-    case CONSTRUCTOR_INITIALIZE:
-      Printv(s, tab4, rb_define_method, "(", klass->vname, ", \"initialize\", ", wname, ", -1);\n", NIL);
-      Replaceall(klass->init, "$initializer", s);
-      break;
-    case MEMBER_VAR:
-      Append(temp, iname);
-      /* Check for _set or _get at the end of the name. */
-      if (Len(temp) > 4) {
-	const char *p = Char(temp) + (Len(temp) - 4);
-	if (strcmp(p, "_set") == 0) {
-	  Delslice(temp, Len(temp) - 4, DOH_END);
-	  Append(temp, "=");
-	} else if (strcmp(p, "_get") == 0) {
-	  Delslice(temp, Len(temp) - 4, DOH_END);
-	}
-      }
-      if (multipleInheritance) {
-	Printv(klass->init, tab4, "rb_define_method(", klass->mImpl, ", \"", temp, "\", ", wname, ", -1);\n", NIL);
-      } else {
-	Printv(klass->init, tab4, "rb_define_method(", klass->vname, ", \"", temp, "\", ", wname, ", -1);\n", NIL);
-      }
-      break;
-    case STATIC_FUNC:
-      Printv(klass->init, tab4, "rb_define_singleton_method(", klass->vname, ", \"", iname, "\", ", wname, ", -1);\n", NIL);
-      break;
-    case NO_CPP:
-      if (!useGlobalModule) {
-	Printv(s, tab4, "rb_define_module_function(", modvar, ", \"", iname, "\", ", wname, ", -1);\n", NIL);
-	Printv(f_init, s, NIL);
-      } else {
-	Printv(s, tab4, "rb_define_global_function(\"", iname, "\", ", wname, ", -1);\n", NIL);
-	Printv(f_init, s, NIL);
-      }
-      break;
-    case DESTRUCTOR:
-    case CLASS_CONST:
-    case STATIC_VAR:
-    default:
-      assert(false);		// Should not have gotten here for these types
-    }
-
-    defineAliases(n, iname);
-
-    Delete(temp);
-    Delete(s);
-    Delete(wname);
-    Delete(alloc_func);
-  }
-
-  /* ---------------------------------------------------------------------
-   * applyInputTypemap()
-   *
-   * Look up the appropriate "in" typemap for this parameter (p),
-   * substitute the correct strings for the $target and $input typemap
-   * parameters, and dump the resulting code to the wrapper file.
-   * --------------------------------------------------------------------- */
-
-  Parm *applyInputTypemap(Parm *p, String *ln, String *source, Wrapper *f, String *symname) {
-    String *tm;
-    SwigType *pt = Getattr(p, "type");
-    if ((tm = Getattr(p, "tmap:in"))) {
-      Replaceall(tm, "$target", ln);
-      Replaceall(tm, "$source", source);
-      Replaceall(tm, "$input", source);
-      Replaceall(tm, "$symname", symname);
-
-      if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-	Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-      } else {
-	Replaceall(tm, "$disown", "0");
-      }
-
-      Setattr(p, "emit:input", Copy(source));
-      Printf(f->code, "%s\n", tm);
-      p = Getattr(p, "tmap:in:next");
-    } else {
-      Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-      p = nextSibling(p);
-    }
-    return p;
-  }
-
-  Parm *skipIgnoredArgs(Parm *p) {
-    while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-      p = Getattr(p, "tmap:in:next");
-    }
-    return p;
-  }
-
-  /* ---------------------------------------------------------------------
-   * marshalInputArgs()
-   *
-   * Process all of the arguments passed into the scripting language
-   * method and convert them into C/C++ function arguments using the
-   * supplied typemaps.
-   * --------------------------------------------------------------------- */
-
-  void marshalInputArgs(Node *n, ParmList *l, int numarg, int numreq, String *kwargs, bool allow_kwargs, Wrapper *f) {
-    int i;
-    Parm *p;
-    String *tm;
-    String *source;
-    String *target;
-
-    source = NewString("");
-    target = NewString("");
-
-    bool ctor_director = (current == CONSTRUCTOR_INITIALIZE && Swig_directorclass(n));
-
-    /**
-     * The 'start' value indicates which of the C/C++ function arguments
-     * produced here corresponds to the first value in Ruby's argv[] array.
-     * The value of start is either zero or one. If start is zero, then
-     * the first argument (with name arg1) is based on the value of argv[0].
-     * If start is one, then arg1 is based on the value of argv[1].
-     */
-    int start = (current == MEMBER_FUNC || current == MEMBER_VAR || ctor_director) ? 1 : 0;
-
-    int varargs = emit_isvarargs(l);
-
-    Printf(kwargs, "{ ");
-    for (i = 0, p = l; i < numarg; i++) {
-
-      p = skipIgnoredArgs(p);
-
-      String *pn = Getattr(p, "name");
-      String *ln = Getattr(p, "lname");
-
-      /* Produce string representation of source argument */
-      Clear(source);
-
-      /* First argument is a special case */
-      if (i == 0) {
-	Printv(source, (start == 0) ? "argv[0]" : "self", NIL);
-      } else {
-	Printf(source, "argv[%d]", i - start);
-      }
-
-      /* Produce string representation of target argument */
-      Clear(target);
-      Printf(target, "%s", Char(ln));
-
-      if (i >= (numreq)) {	/* Check if parsing an optional argument */
-	Printf(f->code, "    if (argc > %d) {\n", i - start);
-      }
-
-      /* Record argument name for keyword argument handling */
-      if (Len(pn)) {
-	Printf(kwargs, "\"%s\",", pn);
-      } else {
-	Printf(kwargs, "\"arg%d\",", i + 1);
-      }
-
-      /* Look for an input typemap */
-      p = applyInputTypemap(p, ln, source, f, Getattr(n, "name"));
-      if (i >= numreq) {
-	Printf(f->code, "}\n");
-      }
-    }
-
-    /* Finish argument marshalling */
-    Printf(kwargs, " NULL }");
-    if (allow_kwargs) {
-// kwarg support not implemented
-//      Printv(f->locals, tab4, "const char *kwnames[] = ", kwargs, ";\n", NIL);
-    }
-
-    /* Trailing varargs */
-    if (varargs) {
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-	Clear(source);
-	Printf(source, "argv[%d]", i - start);
-	Replaceall(tm, "$input", source);
-	Setattr(p, "emit:input", Copy(source));
-	Printf(f->code, "if (argc > %d) {\n", i - start);
-	Printv(f->code, tm, "\n", NIL);
-	Printf(f->code, "}\n");
-      }
-    }
-
-    Delete(source);
-    Delete(target);
-  }
-
-  /* ---------------------------------------------------------------------
-   * insertConstraintCheckingCode(ParmList *l, Wrapper *f)
-   *
-   * Checks each of the parameters in the parameter list for a "check"
-   * typemap and (if it finds one) inserts the typemapping code into
-   * the function wrapper.
-   * --------------------------------------------------------------------- */
-
-  void insertConstraintCheckingCode(ParmList *l, Wrapper *f) {
-    Parm *p;
-    String *tm;
-    for (p = l; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-  }
-
-  /* ---------------------------------------------------------------------
-   * insertCleanupCode(ParmList *l, String *cleanup)
-   *
-   * Checks each of the parameters in the parameter list for a "freearg"
-   * typemap and (if it finds one) inserts the typemapping code into
-   * the function wrapper.
-   * --------------------------------------------------------------------- */
-
-  void insertCleanupCode(ParmList *l, String *cleanup) {
-    String *tm;
-    for (Parm *p = l; p;) {
-      if ((tm = Getattr(p, "tmap:freearg"))) {
-	if (Len(tm) != 0) {
-	  Replaceall(tm, "$source", Getattr(p, "lname"));
-	  Printv(cleanup, tm, "\n", NIL);
-	}
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-  }
-
-  /* ---------------------------------------------------------------------
-   * insertArgOutputCode(ParmList *l, String *outarg, int& need_result)
-   *
-   * Checks each of the parameters in the parameter list for a "argout"
-   * typemap and (if it finds one) inserts the typemapping code into
-   * the function wrapper.
-   * --------------------------------------------------------------------- */
-
-  void insertArgOutputCode(ParmList *l, String *outarg, int &need_result) {
-    String *tm;
-    for (Parm *p = l; p;) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-	Replaceall(tm, "$target", "vresult");
-	Replaceall(tm, "$result", "vresult");
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-
-	Printv(outarg, tm, "\n", NIL);
-	need_result += 1;
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-  }
-
-  /* ---------------------------------------------------------------------
-   * validIdentifier()
-   *
-   * Is this a valid identifier in the scripting language?
-   * Ruby method names can include any combination of letters, numbers
-   * and underscores. A Ruby method name may optionally end with
-   * a question mark ("?"), exclamation point ("!") or equals sign ("=").
-   *
-   * Methods whose names end with question marks are, by convention,
-   * predicate methods that return true or false (e.g. Array#empty?).
-   *
-   * Methods whose names end with exclamation points are, by convention,
-   * called bang methods that modify the instance in place (e.g. Array#sort!).
-   *
-   * Methods whose names end with an equals sign are attribute setters
-   * (e.g. Thread#critical=).
-   * --------------------------------------------------------------------- */
-
-  virtual int validIdentifier(String *s) {
-    char *c = Char(s);
-    while (*c) {
-      if (!(isalnum(*c) || (*c == '_') || (*c == '?') || (*c == '!') || (*c == '=')))
-	return 0;
-      c++;
-    }
-    return 1;
-  }
-
-  /* ---------------------------------------------------------------------
-   * functionWrapper()
-   *
-   * Create a function declaration and register it with the interpreter.
-   * --------------------------------------------------------------------- */
-
-  virtual int functionWrapper(Node *n) {
-
-    String *nodeType;
-    bool destructor;
-
-    String *symname = Copy(Getattr(n, "sym:name"));
-    SwigType *t = Getattr(n, "type");
-    ParmList *l = Getattr(n, "parms");
-    int director_method = 0;
-    String *tm;
-
-    int need_result = 0;
-
-    /* Ruby needs no destructor wrapper */
-    if (current == DESTRUCTOR)
-      return SWIG_NOWRAP;
-
-    nodeType = Getattr(n, "nodeType");
-    destructor = (!Cmp(nodeType, "destructor"));
-
-    /* If the C++ class constructor is overloaded, we only want to
-     * write out the "new" singleton method once since it is always
-     * the same. (It's the "initialize" method that will handle the
-     * overloading). */
-
-    if (current == CONSTRUCTOR_ALLOCATE && Swig_symbol_isoverloaded(n) && Getattr(n, "sym:nextSibling") != 0)
-      return SWIG_OK;
-
-    String *overname = 0;
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(symname, n))
-	return SWIG_ERROR;
-    }
-
-    String *cleanup = NewString("");
-    String *outarg = NewString("");
-    String *kwargs = NewString("");
-    Wrapper *f = NewWrapper();
-
-    /* Rename predicate methods */
-    if (GetFlag(n, "feature:predicate")) {
-      Append(symname, "?");
-    }
-
-    /* Rename bang methods */
-    if (GetFlag(n, "feature:bang")) {
-      Append(symname, "!");
-    }
-
-    /* Determine the name of the SWIG wrapper function */
-    String *wname = Swig_name_wrapper(symname);
-    if (overname && current != CONSTRUCTOR_ALLOCATE) {
-      Append(wname, overname);
-    }
-
-    /* Emit arguments */
-    if (current != CONSTRUCTOR_ALLOCATE) {
-      emit_parameter_variables(l, f);
-    }
-
-    /* Attach standard typemaps */
-    if (current != CONSTRUCTOR_ALLOCATE) {
-      emit_attach_parmmaps(l, f);
-    }
-    Setattr(n, "wrap:parms", l);
-
-    /* Get number of arguments */
-    int numarg = emit_num_arguments(l);
-    int numreq = emit_num_required(l);
-    int varargs = emit_isvarargs(l);
-    bool allow_kwargs = GetFlag(n, "feature:kwargs") ? true : false;
-
-    bool ctor_director = (current == CONSTRUCTOR_INITIALIZE && Swig_directorclass(n));
-    int start = (current == MEMBER_FUNC || current == MEMBER_VAR || ctor_director) ? 1 : 0;
-
-    /* Now write the wrapper function itself */
-    if (current == CONSTRUCTOR_ALLOCATE) {
-      Printv(f->def, "SWIGINTERN VALUE\n", NIL);
-      Printf(f->def, "#ifdef HAVE_RB_DEFINE_ALLOC_FUNC\n");
-      Printv(f->def, wname, "(VALUE self)\n", NIL);
-      Printf(f->def, "#else\n");
-      Printv(f->def, wname, "(int argc, VALUE *argv, VALUE self)\n", NIL);
-      Printf(f->def, "#endif\n");
-      Printv(f->def, "{\n", NIL);
-    } else if (current == CONSTRUCTOR_INITIALIZE) {
-      Printv(f->def, "SWIGINTERN VALUE\n", wname, "(int argc, VALUE *argv, VALUE self) {", NIL);
-      if (!varargs) {
-	Printf(f->code, "if ((argc < %d) || (argc > %d)) ", numreq - start, numarg - start);
-      } else {
-	Printf(f->code, "if (argc < %d) ", numreq - start);
-      }
-      Printf(f->code, "{rb_raise(rb_eArgError, \"wrong # of arguments(%%d for %d)\",argc); SWIG_fail;}\n", numreq - start);
-    } else {
-
-      if ( current == NO_CPP )
-	{
-	  String* docs = docstring(n, AUTODOC_FUNC);
-	  Printf(f_wrappers, "%s", docs);
-	  Delete(docs);
-	}
-
-      Printv(f->def, "SWIGINTERN VALUE\n", wname, "(int argc, VALUE *argv, VALUE self) {", NIL);
-      if (!varargs) {
-	Printf(f->code, "if ((argc < %d) || (argc > %d)) ", numreq - start, numarg - start);
-      } else {
-	Printf(f->code, "if (argc < %d) ", numreq - start);
-      }
-      Printf(f->code, "{rb_raise(rb_eArgError, \"wrong # of arguments(%%d for %d)\",argc); SWIG_fail;}\n", numreq - start);
-    }
-
-    /* Now walk the function parameter list and generate code */
-    /* to get arguments */
-    if (current != CONSTRUCTOR_ALLOCATE) {
-      marshalInputArgs(n, l, numarg, numreq, kwargs, allow_kwargs, f);
-    }
-    // FIXME?
-    if (ctor_director) {
-      numarg--;
-      numreq--;
-    }
-
-    /* Insert constraint checking code */
-    insertConstraintCheckingCode(l, f);
-
-    /* Insert cleanup code */
-    insertCleanupCode(l, cleanup);
-
-    /* Insert argument output code */
-    insertArgOutputCode(l, outarg, need_result);
-
-    /* if the object is a director, and the method call originated from its
-     * underlying Ruby object, resolve the call by going up the c++ 
-     * inheritance chain.  otherwise try to resolve the method in Ruby.
-     * without this check an infinite loop is set up between the director and
-     * shadow class method calls.
-     */
-
-    // NOTE: this code should only be inserted if this class is the
-    // base class of a director class.  however, in general we haven't
-    // yet analyzed all classes derived from this one to see if they are
-    // directors.  furthermore, this class may be used as the base of
-    // a director class defined in a completely different module at a
-    // later time, so this test must be included whether or not directorbase
-    // is true.  we do skip this code if directors have not been enabled
-    // at the command line to preserve source-level compatibility with
-    // non-polymorphic swig.  also, if this wrapper is for a smart-pointer
-    // method, there is no need to perform the test since the calling object
-    // (the smart-pointer) and the director object (the "pointee") are
-    // distinct.
-
-    director_method = is_member_director(n) && !is_smart_pointer() && !destructor;
-    if (director_method) {
-      Wrapper_add_local(f, "director", "Swig::Director *director = 0");
-      Printf(f->code, "director = dynamic_cast<Swig::Director *>(arg1);\n");
-      Wrapper_add_local(f, "upcall", "bool upcall = false");
-      Append(f->code, "upcall = (director && (director->swig_get_self() == self));\n");
-    }
-
-    /* Now write code to make the function call */
-    if (current != CONSTRUCTOR_ALLOCATE) {
-      if (current == CONSTRUCTOR_INITIALIZE) {
-	Node *pn = Swig_methodclass(n);
-	String *symname = Getattr(pn, "sym:name");
-	String *action = Getattr(n, "wrap:action");
-	if (directorsEnabled()) {
-	  String *classname = NewStringf("const char *classname SWIGUNUSED = \"%s::%s\"", module, symname);
-	  Wrapper_add_local(f, "classname", classname);
-	}
-	if (action) {
-          SwigType *smart = Swig_cparse_smartptr(pn);
-	  String *result_name = NewStringf("%s%s", smart ? "smart" : "", Swig_cresult_name());
-	  if (smart) {
-	    String *result_var = NewStringf("%s *%s = 0", SwigType_namestr(smart), result_name);
-	    Wrapper_add_local(f, result_name, result_var);
-	    Printf(action, "\n%s = new %s(%s);", result_name, SwigType_namestr(smart), Swig_cresult_name());
-	  }
-	  Printf(action, "\nDATA_PTR(self) = %s;", result_name);
-	  if (GetFlag(pn, "feature:trackobjects")) {
-	    Printf(action, "\nSWIG_RubyAddTracking(%s, self);", result_name);
-	  }
-	  Delete(result_name);
-	  Delete(smart);
-	}
-      }
-
-      /* Emit the function call */
-      if (director_method) {
-	Printf(f->code, "try {\n");
-      }
-
-      Setattr(n, "wrap:name", wname);
-
-      Swig_director_emit_dynamic_cast(n, f);
-      String *actioncode = emit_action(n);
-
-      if (director_method) {
-	Printf(actioncode, "} catch (Swig::DirectorException& e) {\n");
-	Printf(actioncode, "  rb_exc_raise(e.getError());\n");
-	Printf(actioncode, "  SWIG_fail;\n");
-	Printf(actioncode, "}\n");
-      }
-
-      /* Return value if necessary */
-      if (SwigType_type(t) != T_VOID && current != CONSTRUCTOR_INITIALIZE) {
-        need_result = 1;
-        if (GetFlag(n, "feature:predicate")) {
-          Printv(actioncode, tab4, "vresult = (", Swig_cresult_name(), " ? Qtrue : Qfalse);\n", NIL);
-        } else {
-          tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode);
-          actioncode = 0;
-          if (tm) {
-            Replaceall(tm, "$result", "vresult");
-            Replaceall(tm, "$source", Swig_cresult_name());
-            Replaceall(tm, "$target", "vresult");
-
-            if (GetFlag(n, "feature:new"))
-              Replaceall(tm, "$owner", "SWIG_POINTER_OWN");
-            else
-              Replaceall(tm, "$owner", "0");
-
-#if 1
-            // FIXME: this will not try to unwrap directors returned as non-director
-            //        base class pointers!
-
-            /* New addition to unwrap director return values so that the original
-             * Ruby object is returned instead. 
-             */
-            bool unwrap = false;
-            String *decl = Getattr(n, "decl");
-            int is_pointer = SwigType_ispointer_return(decl);
-            int is_reference = SwigType_isreference_return(decl);
-            if (is_pointer || is_reference) {
-              String *type = Getattr(n, "type");
-              Node *parent = Swig_methodclass(n);
-              Node *modname = Getattr(parent, "module");
-              Node *target = Swig_directormap(modname, type);
-              if (target)
-                unwrap = true;
-            }
-            if (unwrap) {
-              Wrapper_add_local(f, "director", "Swig::Director *director = 0");
-              Printf(f->code, "director = dynamic_cast<Swig::Director *>(%s);\n", Swig_cresult_name());
-              Printf(f->code, "if (director) {\n");
-              Printf(f->code, "  vresult = director->swig_get_self();\n");
-              Printf(f->code, "} else {\n");
-              Printf(f->code, "%s\n", tm);
-              Printf(f->code, "}\n");
-              director_method = 0;
-            } else {
-              Printf(f->code, "%s\n", tm);
-            }
-#else
-            Printf(f->code, "%s\n", tm);
-#endif
-            Delete(tm);
-          } else {
-            Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s.\n", SwigType_str(t, 0));
-          }
-        }
-      }
-      if (actioncode) {
-        Append(f->code, actioncode);
-        Delete(actioncode);
-      }
-      emit_return_variable(n, t, f);
-    }
-
-    /* Extra code needed for new and initialize methods */
-    if (current == CONSTRUCTOR_ALLOCATE) {
-      Node *pn = Swig_methodclass(n);
-      SwigType *smart = Swig_cparse_smartptr(pn);
-      if (smart)
-	SwigType_add_pointer(smart);
-      String *classtype = smart ? smart : t;
-      need_result = 1;
-      Printf(f->code, "VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE%s);\n", Char(SwigType_manglestr(classtype)));
-      Printf(f->code, "#ifndef HAVE_RB_DEFINE_ALLOC_FUNC\n");
-      Printf(f->code, "rb_obj_call_init(vresult, argc, argv);\n");
-      Printf(f->code, "#endif\n");
-      Delete(smart);
-    } else if (current == CONSTRUCTOR_INITIALIZE) {
-      need_result = 1;
-    }
-    else
-      {
-	if ( need_result > 1 ) {
-	  if ( SwigType_type(t) == T_VOID )
-	    Printf(f->code, "vresult = rb_ary_new();\n");
-	  else
-	    {
-	      Printf(f->code, "if (vresult == Qnil) vresult = rb_ary_new();\n");
-	      Printf(f->code, "else vresult = SWIG_Ruby_AppendOutput( "
-		     "rb_ary_new(), vresult);\n");
-	    }
-	}
-      }
-
-    /* Dump argument output code; */
-    Printv(f->code, outarg, NIL);
-
-    /* Dump the argument cleanup code */
-    int need_cleanup = (current != CONSTRUCTOR_ALLOCATE) && (Len(cleanup) != 0);
-    if (need_cleanup) {
-      Printv(f->code, cleanup, NIL);
-    }
-
-
-    /* Look for any remaining cleanup.  This processes the %new directive */
-    if (current != CONSTRUCTOR_ALLOCATE && GetFlag(n, "feature:new")) {
-      tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0);
-      if (tm) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printv(f->code, tm, "\n", NIL);
-	Delete(tm);
-      }
-    }
-
-    /* Special processing on return value. */
-    tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0);
-    if (tm) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printv(f->code, tm, NIL);
-      Delete(tm);
-    }
-
-    if (director_method) {
-      if ((tm = Swig_typemap_lookup("directorfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$input", Swig_cresult_name());
-	Replaceall(tm, "$result", "vresult");
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-
-    /* Wrap things up (in a manner of speaking) */
-    if (need_result) {
-      if (current == CONSTRUCTOR_ALLOCATE) {
-	Printv(f->code, tab4, "return vresult;\n", NIL);
-      } else if (current == CONSTRUCTOR_INITIALIZE) {
-	Printv(f->code, tab4, "return self;\n", NIL);
-	Printv(f->code, "fail:\n", NIL);
-	if (need_cleanup) {
-	  Printv(f->code, cleanup, NIL);
-	}
-	Printv(f->code, tab4, "return Qnil;\n", NIL);
-      } else {
-	Wrapper_add_local(f, "vresult", "VALUE vresult = Qnil");
-	Printv(f->code, tab4, "return vresult;\n", NIL);
-	Printv(f->code, "fail:\n", NIL);
-	if (need_cleanup) {
-	  Printv(f->code, cleanup, NIL);
-	}
-	Printv(f->code, tab4, "return Qnil;\n", NIL);
-      }
-    } else {
-      Printv(f->code, tab4, "return Qnil;\n", NIL);
-      Printv(f->code, "fail:\n", NIL);
-      if (need_cleanup) {
-	Printv(f->code, cleanup, NIL);
-      }
-      Printv(f->code, tab4, "return Qnil;\n", NIL);
-    }
-
-    Printf(f->code, "}\n");
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-
-    /* Substitute the function name */
-    Replaceall(f->code, "$symname", symname);
-
-    /* Emit the function */
-    Wrapper_print(f, f_wrappers);
-
-    /* Now register the function with the interpreter */
-    if (!Swig_symbol_isoverloaded(n)) {
-      create_command(n, symname);
-    } else {
-      if (current == CONSTRUCTOR_ALLOCATE) {
-	create_command(n, symname);
-      } else {
-	if (!Getattr(n, "sym:nextSibling"))
-	  dispatchFunction(n);
-      }
-    }
-
-    Delete(kwargs);
-    Delete(cleanup);
-    Delete(outarg);
-    DelWrapper(f);
-    Delete(symname);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * dispatchFunction()
-   * ------------------------------------------------------------ */
-
-  void dispatchFunction(Node *n) {
-    /* Last node in overloaded chain */
-
-    int maxargs;
-    String *tmp = NewString("");
-    String *dispatch = Swig_overload_dispatch(n, "return %s(nargs, args, self);", &maxargs);
-
-    /* Generate a dispatch wrapper for all overloaded functions */
-
-    Wrapper *f = NewWrapper();
-    String *symname = Getattr(n, "sym:name");
-    String *wname = Swig_name_wrapper(symname);
-
-    Printv(f->def, "SWIGINTERN VALUE ", wname, "(int nargs, VALUE *args, VALUE self) {", NIL);
-
-    Wrapper_add_local(f, "argc", "int argc");
-    bool ctor_director = (current == CONSTRUCTOR_INITIALIZE && Swig_directorclass(n));
-    if (current == MEMBER_FUNC || current == MEMBER_VAR || ctor_director) {
-      Printf(tmp, "VALUE argv[%d]", maxargs + 1);
-    } else {
-      Printf(tmp, "VALUE argv[%d]", maxargs);
-    }
-    Wrapper_add_local(f, "argv", tmp);
-    Wrapper_add_local(f, "ii", "int ii");
-
-    if (current == MEMBER_FUNC || current == MEMBER_VAR || ctor_director) {
-      maxargs += 1;
-      Printf(f->code, "argc = nargs + 1;\n");
-      Printf(f->code, "argv[0] = self;\n");
-      Printf(f->code, "if (argc > %d) SWIG_fail;\n", maxargs);
-      Printf(f->code, "for (ii = 1; (ii < argc); ++ii) {\n");
-      Printf(f->code, "argv[ii] = args[ii-1];\n");
-      Printf(f->code, "}\n");
-    } else {
-      Printf(f->code, "argc = nargs;\n");
-      Printf(f->code, "if (argc > %d) SWIG_fail;\n", maxargs);
-      Printf(f->code, "for (ii = 0; (ii < argc); ++ii) {\n");
-      Printf(f->code, "argv[ii] = args[ii];\n");
-      Printf(f->code, "}\n");
-    }
-
-    Replaceall(dispatch, "$args", "nargs, args, self");
-    Printv(f->code, dispatch, "\n", NIL);
-
-
-    
-    // Generate prototype list, go to first node
-    Node *sibl = n;
-
-    while (Getattr(sibl, "sym:previousSibling"))
-      sibl = Getattr(sibl, "sym:previousSibling");	// go all the way up
-
-    // Constructors will be treated specially
-    const bool isCtor = (!Cmp(Getattr(sibl, "nodeType"), "constructor"));
-    const bool isMethod = ( Cmp(Getattr(sibl, "ismember"), "1") == 0 &&
-			    (!isCtor) );
-
-    // Construct real method name
-    String* methodName = NewString("");
-    if ( isMethod ) {
-      // Sometimes a method node has no parent (SF#3034054).
-      // This value is used in an exception message, so just skip the class
-      // name in this case so at least we don't segfault.  This is probably
-      // just working around a problem elsewhere though.
-      Node *parent_node = parentNode(sibl);
-      if (parent_node)
-	Printv( methodName, Getattr(parent_node,"sym:name"), ".", NIL );
-    }
-    Append( methodName, Getattr(sibl,"sym:name" ) );
-    if ( isCtor ) Append( methodName, ".new" ); 
-
-    // Generate prototype list
-    String *protoTypes = NewString("");
-    do {
-      Append( protoTypes, "\n\"    ");
-      if (!isCtor) {
-	SwigType *type = SwigType_str(Getattr(sibl, "type"), NULL);
-	Printv(protoTypes, type, " ", NIL);
-	Delete(type);
-      }
-      Printv(protoTypes, methodName, NIL );
-      Parm* p = Getattr(sibl, "wrap:parms");
-      if (p && (current == MEMBER_FUNC || current == MEMBER_VAR || 
-		ctor_director) )
-	p = nextSibling(p); // skip self
-      Append( protoTypes, "(" );
-      while(p)
-	{
- 	  Append( protoTypes, SwigType_str(Getattr(p,"type"), Getattr(p,"name")) );
-	  if ( ( p = nextSibling(p)) ) Append(protoTypes, ", ");
-	}
-      Append( protoTypes, ")\\n\"" );
-    } while ((sibl = Getattr(sibl, "sym:nextSibling")));
-
-    Append(f->code, "fail:\n");
-    Printf(f->code, "Ruby_Format_OverloadedError( argc, %d, \"%s\", %s);\n", 
-	   maxargs, methodName, protoTypes);
-    Append(f->code, "\nreturn Qnil;\n");
-
-    Delete(methodName);
-    Delete(protoTypes);
-
-    Printv(f->code, "}\n", NIL);
-    Wrapper_print(f, f_wrappers);
-    create_command(n, Char(symname));
-
-    DelWrapper(f);
-    Delete(dispatch);
-    Delete(tmp);
-    Delete(wname);
-  }
-
-  /* ---------------------------------------------------------------------
-   * variableWrapper()
-   * --------------------------------------------------------------------- */
-
-  virtual int variableWrapper(Node *n) {
-    String* docs = docstring(n, AUTODOC_GETTER);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-
-    char *name = GetChar(n, "name");
-    char *iname = GetChar(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-    String *tm;
-    String *getfname, *setfname;
-    Wrapper *getf, *setf;
-
-    getf = NewWrapper();
-    setf = NewWrapper();
-
-    /* create getter */
-    int addfail = 0;
-    String *getname = Swig_name_get(NSPACE_TODO, iname);
-    getfname = Swig_name_wrapper(getname);
-    Setattr(n, "wrap:name", getfname);
-    Printv(getf->def, "SWIGINTERN VALUE\n", getfname, "(", NIL);
-    Printf(getf->def, "VALUE self");
-    Printf(getf->def, ") {");
-    Wrapper_add_local(getf, "_val", "VALUE _val");
-
-    tm = Swig_typemap_lookup("varout", n, name, 0);
-    if (tm) {
-      Replaceall(tm, "$result", "_val");
-      Replaceall(tm, "$target", "_val");
-      Replaceall(tm, "$source", name);
-      /* Printv(getf->code,tm, NIL); */
-      addfail = emit_action_code(n, getf->code, tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-    }
-    Printv(getf->code, tab4, "return _val;\n", NIL);
-    if (addfail) {
-      Append(getf->code, "fail:\n");
-      Append(getf->code, "  return Qnil;\n");
-    }
-    Append(getf->code, "}\n");
-
-    Wrapper_print(getf, f_wrappers);
-
-    if (!is_assignable(n)) {
-      setfname = NewString("NULL");
-    } else {
-      /* create setter */
-      String* docs = docstring(n, AUTODOC_SETTER);
-      Printf(f_wrappers, "%s", docs);
-      Delete(docs);
-
-      String *setname = Swig_name_set(NSPACE_TODO, iname);
-      setfname = Swig_name_wrapper(setname);
-      Setattr(n, "wrap:name", setfname);
-      Printv(setf->def, "SWIGINTERN VALUE\n", setfname, "(VALUE self, ", NIL);
-      Printf(setf->def, "VALUE _val) {");
-      tm = Swig_typemap_lookup("varin", n, name, 0);
-      if (tm) {
-	Replaceall(tm, "$input", "_val");
-	Replaceall(tm, "$source", "_val");
-	Replaceall(tm, "$target", name);
-	/* Printv(setf->code,tm,"\n",NIL); */
-	emit_action_code(n, setf->code, tm);
-      } else {
-	Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s\n", SwigType_str(t, 0));
-      }
-      Printv(setf->code, tab4, "return _val;\n", NIL);
-      Printf(setf->code, "fail:\n");
-      Printv(setf->code, tab4, "return Qnil;\n", NIL);
-      Printf(setf->code, "}\n");
-      Wrapper_print(setf, f_wrappers);
-      Delete(setname);
-    }
-
-    /* define accessor method */
-    if (CPlusPlus) {
-      Insert(getfname, 0, "VALUEFUNC(");
-      Append(getfname, ")");
-      Insert(setfname, 0, "VALUEFUNC(");
-      Append(setfname, ")");
-    }
-
-    String *s = NewString("");
-    switch (current) {
-    case STATIC_VAR:
-      /* C++ class variable */
-      Printv(s, tab4, "rb_define_singleton_method(", klass->vname, ", \"", klass->strip(iname), "\", ", getfname, ", 0);\n", NIL);
-      if (!GetFlag(n, "feature:immutable")) {
-	Printv(s, tab4, "rb_define_singleton_method(", klass->vname, ", \"", klass->strip(iname), "=\", ", setfname, ", 1);\n", NIL);
-      }
-      Printv(klass->init, s, NIL);
-      break;
-    default:
-      /* C global variable */
-      /* wrapped in Ruby module attribute */
-      assert(current == NO_CPP);
-      if (!useGlobalModule) {
-	Printv(s, tab4, "rb_define_singleton_method(", modvar, ", \"", iname, "\", ", getfname, ", 0);\n", NIL);
-	if (!GetFlag(n, "feature:immutable")) {
-	  Printv(s, tab4, "rb_define_singleton_method(", modvar, ", \"", iname, "=\", ", setfname, ", 1);\n", NIL);
-	}
-      } else {
-	Printv(s, tab4, "rb_define_global_method(\"", iname, "\", ", getfname, ", 0);\n", NIL);
-	if (!GetFlag(n, "feature:immutable")) {
-	  Printv(s, tab4, "rb_define_global_method(\"", iname, "=\", ", setfname, ", 1);\n", NIL);
-	}
-      }
-      Printv(f_init, s, NIL);
-      Delete(s);
-      break;
-    }
-    Delete(getname);
-    Delete(getfname);
-    Delete(setfname);
-    DelWrapper(setf);
-    DelWrapper(getf);
-    return SWIG_OK;
-  }
-
-
-  /* ---------------------------------------------------------------------
-   * validate_const_name(char *name)
-   *
-   * Validate constant name.
-   * --------------------------------------------------------------------- */
-
-  char *validate_const_name(char *name, const char *reason) {
-    if (!name || name[0] == '\0')
-      return name;
-
-    if (isupper(name[0]))
-      return name;
-
-    if (islower(name[0])) {
-      name[0] = (char)toupper(name[0]);
-      Swig_warning(WARN_RUBY_WRONG_NAME, input_file, line_number, "Wrong %s name (corrected to `%s')\n", reason, name);
-      return name;
-    }
-
-    Swig_warning(WARN_RUBY_WRONG_NAME, input_file, line_number, "Wrong %s name %s\n", reason, name);
-
-    return name;
-  }
-
-  /* ---------------------------------------------------------------------
-   * constantWrapper()
-   * --------------------------------------------------------------------- */
-
-  virtual int constantWrapper(Node *n) {
-    Swig_require("constantWrapper", n, "*sym:name", "type", "value", NIL);
-
-    char *iname = GetChar(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-
-    if (current == CLASS_CONST) {
-      iname = klass->strip(iname);
-    }
-    validate_const_name(iname, "constant");
-    SetChar(n, "sym:name", iname);
-
-    /* Special hook for member pointer */
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(iname);
-      Printf(f_header, "static %s = %s;\n", SwigType_str(type, wname), value);
-      value = Char(wname);
-    }
-    String *tm = Swig_typemap_lookup("constant", n, value, 0);
-    if (!tm)
-      tm = Swig_typemap_lookup("constcode", n, value, 0);
-    if (tm) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", iname);
-      Replaceall(tm, "$symname", iname);
-      Replaceall(tm, "$value", value);
-      if (current == CLASS_CONST) {
-	if (multipleInheritance) {
-	  Replaceall(tm, "$module", klass->mImpl);
-	  Printv(klass->init, tm, "\n", NIL);
-	} else {
-	  Replaceall(tm, "$module", klass->vname);
-	  Printv(klass->init, tm, "\n", NIL);
-	}
-      } else {
-	if (!useGlobalModule) {
-	  Replaceall(tm, "$module", modvar);
-	} else {
-	  Replaceall(tm, "$module", "rb_cObject");
-	}
-	Printf(f_init, "%s\n", tm);
-      }
-    } else {
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value %s = %s\n", SwigType_str(type, 0), value);
-    }
-    Swig_restore(n);
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------------
-   * classDeclaration() 
-   *
-   * Records information about classes---even classes that might be defined in
-   * other modules referenced by %import.
-   * ----------------------------------------------------------------------------- */
-
-  virtual int classDeclaration(Node *n) {
-    if (!Getattr(n, "feature:onlychildren")) {
-      String *name = Getattr(n, "name");
-      String *symname = Getattr(n, "sym:name");
-
-      String *namestr = SwigType_namestr(name);
-      klass = RCLASS(classes, Char(namestr));
-      if (!klass) {
-	klass = new RClass();
-	String *valid_name = NewString(symname ? symname : namestr);
-	validate_const_name(Char(valid_name), "class");
-	klass->set_name(namestr, symname, valid_name);
-	SET_RCLASS(classes, Char(namestr), klass);
-	Delete(valid_name);
-      }
-      Delete(namestr);
-    }
-    return Language::classDeclaration(n);
-  }
-
-  /**
-   * Process the comma-separated list of mixed-in module names (if any).
-   */
-  void includeRubyModules(Node *n) {
-    String *mixin = Getattr(n, "feature:mixin");
-    if (mixin) {
-      List *modules = Split(mixin, ',', INT_MAX);
-      if (modules && Len(modules) > 0) {
-	Iterator mod = First(modules);
-	while (mod.item) {
-	  if (Len(mod.item) > 0) {
-	    Printf(klass->init, "rb_include_module(%s, rb_eval_string(\"%s\"));\n", klass->vname, mod.item);
-	  }
-	  mod = Next(mod);
-	}
-      }
-      Delete(modules);
-    }
-  }
-
-  void handleBaseClasses(Node *n) {
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist)) {
-      Iterator base = First(baselist);
-      while (base.item && GetFlag(base.item, "feature:ignore")) {
-	base = Next(base);
-      }
-      while (base.item) {
-	String *basename = Getattr(base.item, "name");
-	String *basenamestr = SwigType_namestr(basename);
-	RClass *super = RCLASS(classes, Char(basenamestr));
-	Delete(basenamestr);
-	if (super) {
-	  SwigType *btype = NewString(basename);
-	  SwigType_add_pointer(btype);
-	  SwigType_remember(btype);
-	  SwigType *smart = Swig_cparse_smartptr(base.item);
-	  if (smart) {
-	    SwigType_add_pointer(smart);
-	    SwigType_remember(smart);
-	  }
-	  String *bmangle = SwigType_manglestr(smart ? smart : btype);
-	  if (multipleInheritance) {
-	    Insert(bmangle, 0, "((swig_class *) SWIGTYPE");
-	    Append(bmangle, "->clientdata)->mImpl");
-	    Printv(klass->init, "rb_include_module(", klass->mImpl, ", ", bmangle, ");\n", NIL);
-	  } else {
-	    Insert(bmangle, 0, "((swig_class *) SWIGTYPE");
-	    Append(bmangle, "->clientdata)->klass");
-	    Replaceall(klass->init, "$super", bmangle);
-	  }
-	  Delete(bmangle);
-	  Delete(smart);
-	  Delete(btype);
-	}
-	base = Next(base);
-	while (base.item && GetFlag(base.item, "feature:ignore")) {
-	  base = Next(base);
-	}
-	if (!multipleInheritance) {
-	  /* Warn about multiple inheritance for additional base class(es) */
-	  while (base.item) {
-	    if (GetFlag(base.item, "feature:ignore")) {
-	      base = Next(base);
-	      continue;
-	    }
-	    String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0);
-	    String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0);
-	    Swig_warning(WARN_RUBY_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-			 "Warning for %s, base %s ignored. Multiple inheritance is not supported in Ruby.\n", proxyclassname, baseclassname);
-	    base = Next(base);
-	  }
-	}
-      }
-    }
-  }
-
-  /**
-   * Check to see if a %markfunc was specified.
-   */
-  void handleMarkFuncDirective(Node *n) {
-    String *markfunc = Getattr(n, "feature:markfunc");
-    if (markfunc) {
-      Printf(klass->init, "SwigClass%s.mark = (void (*)(void *)) %s;\n", klass->name, markfunc);
-    } else {
-      Printf(klass->init, "SwigClass%s.mark = 0;\n", klass->name);
-    }
-  }
-
-  /**
-   * Check to see if a %freefunc was specified.
-   */
-  void handleFreeFuncDirective(Node *n) {
-    String *freefunc = Getattr(n, "feature:freefunc");
-    if (freefunc) {
-      Printf(klass->init, "SwigClass%s.destroy = (void (*)(void *)) %s;\n", klass->name, freefunc);
-    } else {
-      if (klass->destructor_defined) {
-	Printf(klass->init, "SwigClass%s.destroy = (void (*)(void *)) free_%s;\n", klass->name, klass->mname);
-      }
-    }
-  }
-
-  /**
-   * Check to see if tracking is enabled for this class.
-   */
-  void handleTrackDirective(Node *n) {
-    int trackObjects = GetFlag(n, "feature:trackobjects");
-    if (trackObjects) {
-      Printf(klass->init, "SwigClass%s.trackObjects = 1;\n", klass->name);
-    } else {
-      Printf(klass->init, "SwigClass%s.trackObjects = 0;\n", klass->name);
-    }
-  }
-
-  /* ----------------------------------------------------------------------
-   * classHandler()
-   * ---------------------------------------------------------------------- */
-
-  virtual int classHandler(Node *n) {
-    String* docs = docstring(n, AUTODOC_CLASS);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    String *name = Getattr(n, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *namestr = SwigType_namestr(name);	// does template expansion
-
-    klass = RCLASS(classes, Char(namestr));
-    assert(klass != 0);
-    Delete(namestr);
-    String *valid_name = NewString(symname);
-    validate_const_name(Char(valid_name), "class");
-
-    Clear(klass->type);
-    Printv(klass->type, Getattr(n, "classtype"), NIL);
-    Printv(f_wrappers, "static swig_class SwigClass", valid_name, ";\n\n", NIL);
-    Printv(klass->init, "\n", tab4, NIL);
-
-    if (!useGlobalModule) {
-      Printv(klass->init, klass->vname, " = rb_define_class_under(", modvar, ", \"", klass->name, "\", $super);\n", NIL);
-    } else {
-      Printv(klass->init, klass->vname, " = rb_define_class(\"", klass->name, 
-	     "\", $super);\n", NIL);
-    }
-
-    if (multipleInheritance) {
-      Printv(klass->init, klass->mImpl, " = rb_define_module_under(", klass->vname, ", \"Impl\");\n", NIL);
-    }
-
-    SwigType *tt = NewString(name);
-    SwigType_add_pointer(tt);
-    SwigType_remember(tt);
-    SwigType *smart = Swig_cparse_smartptr(n);
-    if (smart) {
-      SwigType_add_pointer(smart);
-      SwigType_remember(smart);
-    }
-    String *tm = SwigType_manglestr(smart ? smart : tt);
-    Printf(klass->init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) &SwigClass%s);\n", tm, valid_name);
-    Delete(tm);
-    Delete(smart);
-    Delete(tt);
-    Delete(valid_name);
-
-    includeRubyModules(n);
-
-    Printv(klass->init, "$allocator", NIL);
-    Printv(klass->init, "$initializer", NIL);
-
-    Language::classHandler(n);
-
-    handleBaseClasses(n);
-    handleMarkFuncDirective(n);
-    handleFreeFuncDirective(n);
-    handleTrackDirective(n);
-
-    if (multipleInheritance) {
-      Printv(klass->init, "rb_include_module(", klass->vname, ", ", klass->mImpl, ");\n", NIL);
-    }
-
-    String *s = NewString("");
-    Printv(s, tab4, "rb_undef_alloc_func(", klass->vname, ");\n", NIL);
-    Replaceall(klass->init, "$allocator", s);
-    Replaceall(klass->init, "$initializer", "");
-
-    if (GetFlag(n, "feature:exceptionclass")) {
-      Replaceall(klass->init, "$super", "rb_eRuntimeError");
-    } else {
-      Replaceall(klass->init, "$super", "rb_cObject");
-    }
-    Delete(s);
-
-    Printv(f_init, klass->init, NIL);
-    klass = 0;
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberfunctionHandler()
-   *
-   * Method for adding C++ member function
-   *
-   * By default, we're going to create a function of the form :
-   *
-   *         Foo_bar(this,args)
-   *
-   * Where Foo is the classname, bar is the member name and the this pointer
-   * is explicitly attached to the beginning.
-   *
-   * The renaming only applies to the member function part, not the full
-   * classname.
-   *
-   * --------------------------------------------------------------------- */
-
-  virtual int memberfunctionHandler(Node *n) {
-    current = MEMBER_FUNC;
-
-    String* docs = docstring(n, AUTODOC_METHOD);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    Language::memberfunctionHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------
-   * constructorHandler()
-   *
-   * Method for adding C++ member constructor
-   * -------------------------------------------------------------------- */
-
-  void set_director_ctor_code(Node *n) {
-    /* director ctor code is specific for each class */
-    Delete(director_prot_ctor_code);
-    director_prot_ctor_code = NewString("");
-    Node *pn = Swig_methodclass(n);
-    String *symname = Getattr(pn, "sym:name");
-    String *name = Copy(symname);
-    char *cname = Char(name);
-    if (cname)
-      cname[0] = (char)toupper(cname[0]);
-    Printv(director_prot_ctor_code,
-	   "if ( $comparison ) { /* subclassed */\n",
-	   "  $director_new \n",
-	   "} else {\n", "  rb_raise(rb_eNameError,\"accessing abstract class or protected constructor\"); \n", "  return Qnil;\n", "}\n", NIL);
-    Delete(director_ctor_code);
-    director_ctor_code = NewString("");
-    Printv(director_ctor_code, "if ( $comparison ) { /* subclassed */\n", "  $director_new \n", "} else {\n", "  $nondirector_new \n", "}\n", NIL);
-    Delete(name);
-  }
-
-  virtual int constructorHandler(Node *n) {
-    int use_director = Swig_directorclass(n);
-    if (use_director) {
-      set_director_ctor_code(n);
-    }
-
-    /* First wrap the allocate method */
-    current = CONSTRUCTOR_ALLOCATE;
-    Swig_name_register("construct", "%n%c_allocate");
-
-    Language::constructorHandler(n);
-
-    String* docs = docstring(n, AUTODOC_CTOR);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    /* 
-     * If we're wrapping the constructor of a C++ director class, prepend a new parameter
-     * to receive the scripting language object (e.g. 'self')
-     *
-     */
-    Swig_save("ruby:constructorHandler", n, "parms", NIL);
-    if (use_director) {
-      Parm *parms = Getattr(n, "parms");
-      Parm *self;
-      String *name = NewString("self");
-      String *type = NewString("VALUE");
-      self = NewParm(type, name, n);
-      Delete(type);
-      Delete(name);
-      Setattr(self, "lname", "Qnil");
-      if (parms)
-	set_nextSibling(self, parms);
-      Setattr(n, "parms", self);
-      Setattr(n, "wrap:self", "1");
-      Delete(self);
-    }
-
-    /* Now do the instance initialize method */
-    current = CONSTRUCTOR_INITIALIZE;
-    Swig_name_register("construct", "new_%n%c");
-    Language::constructorHandler(n);
-
-    /* Restore original parameter list */
-    Delattr(n, "wrap:self");
-    Swig_restore(n);
-
-    /* Done */
-    Swig_name_unregister("construct");
-    current = NO_CPP;
-    klass->constructor_defined = 1;
-    return SWIG_OK;
-  }
-
-  virtual int copyconstructorHandler(Node *n) {
-    int use_director = Swig_directorclass(n);
-    if (use_director) {
-      set_director_ctor_code(n);
-    }
-
-    /* First wrap the allocate method */
-    current = CONSTRUCTOR_ALLOCATE;
-    Swig_name_register("construct", "%n%c_allocate");
-
-    return Language::copyconstructorHandler(n);
-  }
-
-
-  /* ---------------------------------------------------------------------
-   * destructorHandler()
-   * -------------------------------------------------------------------- */
-
-  virtual int destructorHandler(Node *n) {
-
-    /* Do no spit free function if user defined his own for this class */
-    Node *pn = Swig_methodclass(n);
-    String *freefunc = Getattr(pn, "feature:freefunc");
-    if (freefunc) return SWIG_OK;
-
-    current = DESTRUCTOR;
-    Language::destructorHandler(n);
-
-    freefunc = NewString("");
-    String *freebody = NewString("");
-    String *pname0 = Swig_cparm_name(0, 0);
-
-    Printv(freefunc, "free_", klass->mname, NIL);
-    Printv(freebody, "SWIGINTERN void\n", freefunc, "(void *self) {\n", NIL);
-    Printv(freebody, tab4, klass->type, " *", pname0, " = (", klass->type, " *)self;\n", NIL);
-    Printv(freebody, tab4, NIL);
-
-    /* Check to see if object tracking is activated for the class
-       that owns this destructor. */
-    if (GetFlag(pn, "feature:trackobjects")) {
-      Printf(freebody, "SWIG_RubyRemoveTracking(%s);\n", pname0);
-      Printv(freebody, tab4, NIL);
-    }
-
-    if (Extend) {
-      String *wrap = Getattr(n, "wrap:code");
-      if (wrap) {
-	Printv(f_wrappers, wrap, NIL);
-      }
-      /*    Printv(freebody, Swig_name_destroy(name), "(", pname0, ")", NIL); */
-      Printv(freebody, Getattr(n, "wrap:action"), "\n", NIL);
-    } else {
-      String *action = Getattr(n, "wrap:action");
-      if (action) {
-	Printv(freebody, action, "\n", NIL);
-      } else {
-	/* In the case swig emits no destroy function. */
-	if (CPlusPlus)
-	  Printf(freebody, "delete %s;\n", pname0);
-	else
-	  Printf(freebody, "free((char*) %s);\n", pname0);
-      }
-    }
-
-    Printv(freebody, "}\n\n", NIL);
-
-    Printv(f_wrappers, freebody, NIL);
-
-    klass->destructor_defined = 1;
-    current = NO_CPP;
-    Delete(freefunc);
-    Delete(freebody);
-    Delete(pname0);
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------
-   * membervariableHandler()
-   *
-   * This creates a pair of functions to set/get the variable of a member.
-   * -------------------------------------------------------------------- */
-
-  virtual int membervariableHandler(Node *n) {
-    String* docs = docstring(n, AUTODOC_GETTER);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    if (is_assignable(n)) {
-      String* docs = docstring(n, AUTODOC_SETTER);
-      Printf(f_wrappers, "%s", docs);
-      Delete(docs);
-    }
-
-    current = MEMBER_VAR;
-    Language::membervariableHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   *
-   * Wrap a static C++ function
-   * ---------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    String* docs = docstring(n, AUTODOC_STATICFUNC);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    current = STATIC_FUNC;
-    Language::staticmemberfunctionHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ----------------------------------------------------------------------
-   * memberconstantHandler()
-   *
-   * Create a C++ constant
-   * --------------------------------------------------------------------- */
-
-  virtual int memberconstantHandler(Node *n) {
-    String* docs = docstring(n, AUTODOC_STATICFUNC);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    current = CLASS_CONST;
-    Language::memberconstantHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------
-   * staticmembervariableHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int staticmembervariableHandler(Node *n) {
-    String* docs = docstring(n, AUTODOC_GETTER);
-    Printf(f_wrappers, "%s", docs);
-    Delete(docs);
-
-    if (is_assignable(n)) {
-      String* docs = docstring(n, AUTODOC_SETTER);
-      Printf(f_wrappers, "%s", docs);
-      Delete(docs);
-    }
-
-    current = STATIC_VAR;
-    Language::staticmembervariableHandler(n);
-    current = NO_CPP;
-    return SWIG_OK;
-  }
-
-  /* C++ director class generation */
-  virtual int classDirector(Node *n) {
-    return Language::classDirector(n);
-  }
-
-  virtual int classDirectorInit(Node *n) {
-    String *declaration;
-    declaration = Swig_director_declaration(n);
-    Printf(f_directors_h, "\n");
-    Printf(f_directors_h, "%s\n", declaration);
-    Printf(f_directors_h, "public:\n");
-    Delete(declaration);
-    return Language::classDirectorInit(n);
-  }
-
-  virtual int classDirectorEnd(Node *n) {
-    Printf(f_directors_h, "};\n\n");
-    return Language::classDirectorEnd(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorConstructor()
-   * ------------------------------------------------------------ */
-
-  virtual int classDirectorConstructor(Node *n) {
-    Node *parent = Getattr(n, "parentNode");
-    String *sub = NewString("");
-    String *decl = Getattr(n, "decl");
-    String *supername = Swig_class_name(parent);
-    String *classname = NewString("");
-    Printf(classname, "SwigDirector_%s", supername);
-
-    /* insert self parameter */
-    Parm *p;
-    ParmList *superparms = Getattr(n, "parms");
-    ParmList *parms = CopyParmList(superparms);
-    String *type = NewString("VALUE");
-    p = NewParm(type, NewString("self"), n);
-    set_nextSibling(p, parms);
-    parms = p;
-
-    if (!Getattr(n, "defaultargs")) {
-      /* constructor */
-      {
-	Wrapper *w = NewWrapper();
-	String *call;
-	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
-	call = Swig_csuperclass_call(0, basetype, superparms);
-	Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call);
-	Delete(target);
-	Wrapper_print(w, f_directors);
-	Delete(call);
-	DelWrapper(w);
-      }
-
-      /* constructor header */
-      {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
-	Printf(f_directors_h, "    %s;\n", target);
-	Delete(target);
-      }
-    }
-
-    Delete(sub);
-    Delete(classname);
-    Delete(supername);
-    Delete(parms);
-    return Language::classDirectorConstructor(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDirectorDefaultConstructor()
-   * ------------------------------------------------------------ */
-
-  virtual int classDirectorDefaultConstructor(Node *n) {
-    String *classname;
-    Wrapper *w;
-    classname = Swig_class_name(n);
-    w = NewWrapper();
-    Printf(w->def, "SwigDirector_%s::SwigDirector_%s(VALUE self) : Swig::Director(self) { }", classname, classname);
-    Wrapper_print(w, f_directors);
-    DelWrapper(w);
-    Printf(f_directors_h, "    SwigDirector_%s(VALUE self);\n", classname);
-    Delete(classname);
-    return Language::classDirectorDefaultConstructor(n);
-  }
-
-  /* ---------------------------------------------------------------
-   * exceptionSafeMethodCall()
-   *
-   * Emit a virtual director method to pass a method call on to the 
-   * underlying Ruby instance.
-   *
-   * --------------------------------------------------------------- */
-
-  void exceptionSafeMethodCall(String *className, Node *n, Wrapper *w, int argc, String *args, bool initstack) {
-    Wrapper *body = NewWrapper();
-    Wrapper *rescue = NewWrapper();
-
-    String *methodName = Getattr(n, "sym:name");
-
-    String *bodyName = NewStringf("%s_%s_body", className, methodName);
-    String *rescueName = NewStringf("%s_%s_rescue", className, methodName);
-    String *depthCountName = NewStringf("%s_%s_call_depth", className, methodName);
-
-    // Check for an exception typemap of some kind
-    String *tm = Swig_typemap_lookup("director:except", n, Swig_cresult_name(), 0);
-    if (!tm) {
-      tm = Getattr(n, "feature:director:except");
-    }
-
-    if ((tm != 0) && (Len(tm) > 0) && (Strcmp(tm, "1") != 0)) {
-      // Declare a global to hold the depth count
-      if (!Getattr(n, "sym:nextSibling")) {
-	Printf(body->def, "static int %s = 0;\n", depthCountName);
-
-	// Function body
-	Printf(body->def, "VALUE %s(VALUE data) {\n", bodyName);
-	Wrapper_add_localv(body, "args", "Swig::body_args *", "args", "= reinterpret_cast<Swig::body_args *>(data)", NIL);
-	Wrapper_add_localv(body, Swig_cresult_name(), "VALUE", Swig_cresult_name(), "= Qnil", NIL);
-	Printf(body->code, "%s++;\n", depthCountName);
-	Printv(body->code, Swig_cresult_name(), " = rb_funcall2(args->recv, args->id, args->argc, args->argv);\n", NIL);
-	Printf(body->code, "%s--;\n", depthCountName);
-	Printv(body->code, "return ", Swig_cresult_name(), ";\n", NIL);
-	Printv(body->code, "}", NIL);
-
-	// Exception handler
-	Printf(rescue->def, "VALUE %s(VALUE args, VALUE error) {\n", rescueName);
-	Replaceall(tm, "$error", "error");
-	Printf(rescue->code, "%s--;\n", depthCountName);
-	Printf(rescue->code, "if (%s == 0) ", depthCountName);
-	Printv(rescue->code, Str(tm), "\n", NIL);
-	Printv(rescue->code, "rb_exc_raise(error);\n", NIL);
-	Printv(rescue->code, "return Qnil;\n", NIL);
-	Printv(rescue->code, "}", NIL);
-      }
-
-      // Main code
-      Wrapper_add_localv(w, "args", "Swig::body_args", "args", NIL);
-      Wrapper_add_localv(w, "status", "int", "status", NIL);
-      Printv(w->code, "args.recv = swig_get_self();\n", NIL);
-      Printf(w->code, "args.id = rb_intern(\"%s\");\n", methodName);
-      Printf(w->code, "args.argc = %d;\n", argc);
-      if (argc > 0) {
-	Printf(w->code, "args.argv = new VALUE[%d];\n", argc);
-	for (int i = 0; i < argc; i++) {
-	  Printf(w->code, "args.argv[%d] = obj%d;\n", i, i);
-	}
-      } else {
-	Printv(w->code, "args.argv = 0;\n", NIL);
-      }
-      Printf(w->code, "%s = rb_protect(PROTECTFUNC(%s), reinterpret_cast<VALUE>(&args), &status);\n", Swig_cresult_name(), bodyName);
-      if ( initstack ) Printf(w->code, "SWIG_RELEASE_STACK;\n");
-      Printf(w->code, "if (status) {\n");
-      Printf(w->code, "VALUE lastErr = rb_gv_get(\"$!\");\n");
-      Printf(w->code, "%s(reinterpret_cast<VALUE>(&args), lastErr);\n", rescueName);
-      Printf(w->code, "}\n");
-      if (argc > 0) {
-	Printv(w->code, "delete [] args.argv;\n", NIL);
-      }
-      // Dump wrapper code
-      Wrapper_print(body, f_directors_helpers);
-      Wrapper_print(rescue, f_directors_helpers);
-    } else {
-      if (argc > 0) {
-	Printf(w->code, "%s = rb_funcall(swig_get_self(), rb_intern(\"%s\"), %d%s);\n", Swig_cresult_name(), methodName, argc, args);
-      } else {
-	Printf(w->code, "%s = rb_funcall(swig_get_self(), rb_intern(\"%s\"), 0, NULL);\n", Swig_cresult_name(), methodName);
-      }
-      if ( initstack ) Printf(w->code, "SWIG_RELEASE_STACK;\n");
-    }
-
-    // Clean up
-    Delete(bodyName);
-    Delete(rescueName);
-    Delete(depthCountName);
-    DelWrapper(body);
-    DelWrapper(rescue);
-  }
-
-  virtual int classDirectorMethod(Node *n, Node *parent, String *super) {
-    int is_void = 0;
-    int is_pointer = 0;
-    String *decl = Getattr(n, "decl");
-    String *name = Getattr(n, "name");
-    String *classname = Getattr(parent, "sym:name");
-    String *c_classname = Getattr(parent, "name");
-    String *symname = Getattr(n, "sym:name");
-    String *declaration = NewString("");
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *w = NewWrapper();
-    String *tm;
-    String *wrap_args = NewString("");
-    String *returntype = Getattr(n, "type");
-    Parm *p;
-    String *value = Getattr(n, "value");
-    String *storage = Getattr(n, "storage");
-    bool pure_virtual = false;
-    int status = SWIG_OK;
-    int idx;
-    bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
-    bool asvoid = checkAttribute( n, "feature:numoutputs", "0") ? true : false;
-    bool initstack = checkAttribute( n, "feature:initstack", "1") ? true : false;
-
-    if (Cmp(storage, "virtual") == 0) {
-      if (Cmp(value, "0") == 0) {
-	pure_virtual = true;
-      }
-    }
-    String *overnametmp = NewString(Getattr(n, "sym:name"));
-    if (Getattr(n, "sym:overloaded")) {
-      Printf(overnametmp, "::%s", Getattr(n, "sym:overname"));
-    }
-
-    /* determine if the method returns a pointer */
-    is_pointer = SwigType_ispointer_return(decl);
-    is_void = (!Cmp(returntype, "void") && !is_pointer);
-
-    /* virtual method definition */
-    String *target;
-    String *pclassname = NewStringf("SwigDirector_%s", classname);
-    String *qualified_name = NewStringf("%s::%s", pclassname, name);
-    SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type");
-    target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0);
-    Printf(w->def, "%s", target);
-    Delete(qualified_name);
-    Delete(target);
-    /* header declaration */
-    target = Swig_method_decl(rtype, decl, name, l, 0, 1);
-    Printf(declaration, "    virtual %s", target);
-    Delete(target);
-
-    // Get any exception classes in the throws typemap
-    ParmList *throw_parm_list = 0;
-
-    if ((throw_parm_list = Getattr(n, "throws")) || Getattr(n, "throw")) {
-      Parm *p;
-      int gencomma = 0;
-
-      Append(w->def, " throw(");
-      Append(declaration, " throw(");
-
-      if (throw_parm_list)
-	Swig_typemap_attach_parms("throws", throw_parm_list, 0);
-      for (p = throw_parm_list; p; p = nextSibling(p)) {
-	if (Getattr(p, "tmap:throws")) {
-	  if (gencomma++) {
-	    Append(w->def, ", ");
-	    Append(declaration, ", ");
-	  }
-
-	  Printf(w->def, "%s", SwigType_str(Getattr(p, "type"), 0));
-	  Printf(declaration, "%s", SwigType_str(Getattr(p, "type"), 0));
-	}
-      }
-
-      Append(w->def, ")");
-      Append(declaration, ")");
-    }
-
-    Append(w->def, " {");
-    Append(declaration, ";\n");
-
-    if (initstack && !(ignored_method && !pure_virtual)) {
-      Append(w->def, "\nSWIG_INIT_STACK;\n");
-    }
-
-    /* declare method return value 
-     * if the return value is a reference or const reference, a specialized typemap must
-     * handle it, including declaration of c_result ($result).
-     */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL);
-      }
-    }
-
-    if (ignored_method) {
-      if (!pure_virtual) {
-	if (!is_void)
-	  Printf(w->code, "return ");
-	String *super_call = Swig_method_call(super, l);
-	Printf(w->code, "%s;\n", super_call);
-	Delete(super_call);
-      } else {
-	Printf(w->code, "Swig::DirectorPureVirtualException::raise(\"Attempted to invoke pure virtual method %s::%s\");\n", SwigType_namestr(c_classname),
-	       SwigType_namestr(name));
-      }
-    } else {
-      /* attach typemaps to arguments (C/C++ -> Ruby) */
-      String *arglist = NewString("");
-
-      Swig_director_parms_fixup(l);
-
-      Swig_typemap_attach_parms("in", l, 0);
-      Swig_typemap_attach_parms("directorin", l, 0);
-      Swig_typemap_attach_parms("directorargout", l, w);
-
-      char source[256];
-
-      int outputs = 0;
-      if (!is_void && !asvoid)
-	outputs++;
-
-      /* build argument list and type conversion string */
-      idx = 0; p = l;
-      while ( p ) {
-
-	if (Getattr(p, "tmap:ignore")) {
-	  p = Getattr(p, "tmap:ignore:next");
-	  continue;
-	}
-
-	if (Getattr(p, "tmap:directorargout") != 0)
-	  outputs++;
-
-	if ( checkAttribute( p, "tmap:in:numinputs", "0") ) {
-	  p = Getattr(p, "tmap:in:next");
-	  continue;
-	}
-
-	String *parameterName = Getattr(p, "name");
-	String *parameterType = Getattr(p, "type");
-
-	Putc(',', arglist);
-	if ((tm = Getattr(p, "tmap:directorin")) != 0) {
-	  sprintf(source, "obj%d", idx++);
-	  String *input = NewString(source);
-	  Setattr(p, "emit:directorinput", input);
-	  Replaceall(tm, "$input", input);
-	  Replaceall(tm, "$owner", "0");
-	  Delete(input);
-	  Printv(wrap_args, tm, "\n", NIL);
-	  Wrapper_add_localv(w, source, "VALUE", source, "= Qnil", NIL);
-	  Printv(arglist, source, NIL);
-	  p = Getattr(p, "tmap:directorin:next");
-	  continue;
-	} else if (Cmp(parameterType, "void")) {
-	  /**
-	   * Special handling for pointers to other C++ director classes.
-	   * Ideally this would be left to a typemap, but there is currently no
-	   * way to selectively apply the dynamic_cast<> to classes that have
-	   * directors.  In other words, the type "SwigDirector_$1_lname" only exists
-	   * for classes with directors.  We avoid the problem here by checking
-	   * module.wrap::directormap, but it's not clear how to get a typemap to
-	   * do something similar.  Perhaps a new default typemap (in addition
-	   * to SWIGTYPE) called DIRECTORTYPE?
-	   */
-	  if (SwigType_ispointer(parameterType) || SwigType_isreference(parameterType)) {
-	    Node *modname = Getattr(parent, "module");
-	    Node *target = Swig_directormap(modname, parameterType);
-	    sprintf(source, "obj%d", idx++);
-	    String *nonconst = 0;
-	    /* strip pointer/reference --- should move to Swig/stype.c */
-	    String *nptype = NewString(Char(parameterType) + 2);
-	    /* name as pointer */
-	    String *ppname = Copy(parameterName);
-	    if (SwigType_isreference(parameterType)) {
-	      Insert(ppname, 0, "&");
-	    }
-	    /* if necessary, cast away const since Ruby doesn't support it! */
-	    if (SwigType_isconst(nptype)) {
-	      nonconst = NewStringf("nc_tmp_%s", parameterName);
-	      String *nonconst_i = NewStringf("= const_cast< %s >(%s)", SwigType_lstr(parameterType, 0), ppname);
-	      Wrapper_add_localv(w, nonconst, SwigType_lstr(parameterType, 0), nonconst, nonconst_i, NIL);
-	      Delete(nonconst_i);
-	      Swig_warning(WARN_LANG_DISCARD_CONST, input_file, line_number,
-			   "Target language argument '%s' discards const in director method %s::%s.\n", SwigType_str(parameterType, parameterName),
-			   SwigType_namestr(c_classname), SwigType_namestr(name));
-	    } else {
-	      nonconst = Copy(ppname);
-	    }
-	    Delete(nptype);
-	    Delete(ppname);
-	    String *mangle = SwigType_manglestr(parameterType);
-	    if (target) {
-	      String *director = NewStringf("director_%s", mangle);
-	      Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL);
-	      Wrapper_add_localv(w, source, "VALUE", source, "= Qnil", NIL);
-	      Printf(wrap_args, "%s = dynamic_cast<Swig::Director *>(%s);\n", director, nonconst);
-	      Printf(wrap_args, "if (!%s) {\n", director);
-	      Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	      Printf(wrap_args, "} else {\n");
-	      Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
-	      Printf(wrap_args, "}\n");
-	      Delete(director);
-	      Printv(arglist, source, NIL);
-	    } else {
-	      Wrapper_add_localv(w, source, "VALUE", source, "= Qnil", NIL);
-	      Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
-	      //Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE_p_%s, 0);\n", 
-	      //       source, nonconst, base);
-	      Printv(arglist, source, NIL);
-	    }
-	    Delete(mangle);
-	    Delete(nonconst);
-	  } else {
-	    Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number,
-			 "Unable to use type %s as a function argument in director method %s::%s (skipping method).\n", SwigType_str(parameterType, 0),
-			 SwigType_namestr(c_classname), SwigType_namestr(name));
-	    status = SWIG_NOWRAP;
-	    break;
-	  }
-	}
-	p = nextSibling(p);
-      }
-
-      /* declare Ruby return value */
-      String *value_result = NewStringf("VALUE SWIGUNUSED %s", Swig_cresult_name());
-      Wrapper_add_local(w, Swig_cresult_name(), value_result);
-      Delete(value_result);
-
-      /* wrap complex arguments to VALUEs */
-      Printv(w->code, wrap_args, NIL);
-
-      /* pass the method call on to the Ruby object */
-      exceptionSafeMethodCall(classname, n, w, idx, arglist, initstack);
-
-      /*
-       * Ruby method may return a simple object, or an Array of objects.
-       * For in/out arguments, we have to extract the appropriate VALUEs from the Array,
-       * then marshal everything back to C/C++ (return value and output arguments).
-       */
-
-      /* Marshal return value and other outputs (if any) from VALUE to C/C++ type */
-
-      String *cleanup = NewString("");
-      String *outarg = NewString("");
-
-      if (outputs > 1) {
-	Wrapper_add_local(w, "output", "VALUE output");
-	Printf(w->code, "if (TYPE(%s) != T_ARRAY) {\n", Swig_cresult_name());
-	Printf(w->code, "Ruby_DirectorTypeMismatchException(\"Ruby method failed to return an array.\");\n");
-	Printf(w->code, "}\n");
-      }
-
-      idx = 0;
-
-      /* Marshal return value */
-      if (!is_void) {
-	tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
-	if (tm != 0) {
-	  if (outputs > 1 && !asvoid ) {
-	    Printf(w->code, "output = rb_ary_entry(%s, %d);\n", Swig_cresult_name(), idx++);
-	    Replaceall(tm, "$input", "output");
-	  } else {
-	    Replaceall(tm, "$input", Swig_cresult_name());
-	  }
-	  /* TODO check this */
-	  if (Getattr(n, "wrap:disown")) {
-	    Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	  } else {
-	    Replaceall(tm, "$disown", "0");
-	  }
-	  Replaceall(tm, "$result", "c_result");
-	  Printv(w->code, tm, "\n", NIL);
-	} else {
-	  Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
-		       "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0),
-		       SwigType_namestr(c_classname), SwigType_namestr(name));
-	  status = SWIG_ERROR;
-	}
-      }
-
-      /* Marshal outputs */
-      for (p = l; p;) {
-	if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
-	  if (outputs > 1) {
-	    Printf(w->code, "output = rb_ary_entry(%s, %d);\n", Swig_cresult_name(), idx++);
-	    Replaceall(tm, "$result", "output");
-	  } else {
-	    Replaceall(tm, "$result", Swig_cresult_name());
-	  }
-	  Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
-	  Printv(w->code, tm, "\n", NIL);
-	  p = Getattr(p, "tmap:directorargout:next");
-	} else {
-	  p = nextSibling(p);
-	}
-      }
-
-      Delete(arglist);
-      Delete(cleanup);
-      Delete(outarg);
-    }
-
-    /* any existing helper functions to handle this? */
-    if (!is_void) {
-      if (!(ignored_method && !pure_virtual)) {
-	String *rettype = SwigType_str(returntype, 0);
-	if (!SwigType_isreference(returntype)) {
-	  Printf(w->code, "return (%s) c_result;\n", rettype);
-	} else {
-	  Printf(w->code, "return (%s) *c_result;\n", rettype);
-	}
-	Delete(rettype);
-      }
-    }
-
-    Printf(w->code, "}\n");
-
-    // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method
-    String *inline_extra_method = NewString("");
-    if (dirprot_mode() && !is_public(n) && !pure_virtual) {
-      Printv(inline_extra_method, declaration, NIL);
-      String *extra_method_name = NewStringf("%sSwigPublic", name);
-      Replaceall(inline_extra_method, name, extra_method_name);
-      Replaceall(inline_extra_method, ";\n", " {\n      ");
-      if (!is_void)
-	Printf(inline_extra_method, "return ");
-      String *methodcall = Swig_method_call(super, l);
-      Printv(inline_extra_method, methodcall, ";\n    }\n", NIL);
-      Delete(methodcall);
-      Delete(extra_method_name);
-    }
-
-    /* emit the director method */
-    if (status == SWIG_OK) {
-      if (!Getattr(n, "defaultargs")) {
-	Replaceall(w->code, "$symname", symname);
-	Wrapper_print(w, f_directors);
-	Printv(f_directors_h, declaration, NIL);
-	Printv(f_directors_h, inline_extra_method, NIL);
-      }
-    }
-
-    /* clean up */
-    Delete(wrap_args);
-    Delete(pclassname);
-    DelWrapper(w);
-    return status;
-  }
-
-  virtual int classDirectorConstructors(Node *n) {
-    return Language::classDirectorConstructors(n);
-  }
-
-  virtual int classDirectorMethods(Node *n) {
-    return Language::classDirectorMethods(n);
-  }
-
-  virtual int classDirectorDisown(Node *n) {
-    return Language::classDirectorDisown(n);
-  }
-
-  String *runtimeCode() {
-    String *s = NewString("");
-    String *shead = Swig_include_sys("rubyhead.swg");
-    if (!shead) {
-      Printf(stderr, "*** Unable to open 'rubyhead.swg'\n");
-    } else {
-      Append(s, shead);
-      Delete(shead);
-    }
-    String *serrors = Swig_include_sys("rubyerrors.swg");
-    if (!serrors) {
-      Printf(stderr, "*** Unable to open 'rubyerrors.swg'\n");
-    } else {
-      Append(s, serrors);
-      Delete(serrors);
-    }
-    String *strack = Swig_include_sys("rubytracking.swg");
-    if (!strack) {
-      Printf(stderr, "*** Unable to open 'rubytracking.swg'\n");
-    } else {
-      Append(s, strack);
-      Delete(strack);
-    }
-    String *sapi = Swig_include_sys("rubyapi.swg");
-    if (!sapi) {
-      Printf(stderr, "*** Unable to open 'rubyapi.swg'\n");
-    } else {
-      Append(s, sapi);
-      Delete(sapi);
-    }
-    String *srun = Swig_include_sys("rubyrun.swg");
-    if (!srun) {
-      Printf(stderr, "*** Unable to open 'rubyrun.swg'\n");
-    } else {
-      Append(s, srun);
-      Delete(srun);
-    }
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigrubyrun.h");
-  }
-
-  /*----------------------------------------------------------------------
-   * kwargsSupport()
-   *--------------------------------------------------------------------*/
-
-  bool kwargsSupport() const {
-    // kwargs support isn't actually implemented, but changing to return false may break something now as it turns on compactdefaultargs
-    return true;
-  }
-};				/* class RUBY */
-
-/* -----------------------------------------------------------------------------
- * swig_ruby()    - Instantiate module
- * ----------------------------------------------------------------------------- */
-
-static Language *new_swig_ruby() {
-  return new RUBY();
-}
-extern "C" Language *swig_ruby(void) {
-  return new_swig_ruby();
-}
-
-
-/*
- * Local Variables:
- * c-basic-offset: 2
- * End:
- */
diff --git a/dependencies2013/win32/swig/Source/Modules/s-exp.cxx b/dependencies2013/win32/swig/Source/Modules/s-exp.cxx
deleted file mode 100644
index fe3b1fac..00000000
--- a/dependencies2013/win32/swig/Source/Modules/s-exp.cxx
+++ /dev/null
@@ -1,402 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * s-exp.cxx
- *
- * A parse tree represented as Lisp s-expressions.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "dohint.h"
-
-static const char *usage = "\
-S-Exp Options (available with -sexp)\n\
-     -typemaplang <lang> - Typemap language\n\n";
-
-//static Node *view_top = 0;
-static File *out = 0;
-
-class Sexp:public Language {
-  int indent_level;
-  DOHHash *print_circle_hash;
-  int print_circle_count;
-  int hanging_parens;
-  bool need_whitespace;
-  bool need_newline;
-
-public:
-  Sexp():
-    indent_level(0),
-    print_circle_hash(0),
-    print_circle_count(0),
-    hanging_parens(0),
-    need_whitespace(0),
-    need_newline(0) {
-  }
-  
-  virtual ~ Sexp() {
-  }
-
-  virtual void main(int argc, char *argv[]) {
-    // Add a symbol to the parser for conditional compilation
-    Preprocessor_define("SWIGSEXP 1", 0);
-
-    SWIG_typemap_lang("sexp");
-    for (int iX = 0; iX < argc; iX++) {
-      if (strcmp(argv[iX], "-typemaplang") == 0) {
-	Swig_mark_arg(iX);
-	iX++;
-	SWIG_typemap_lang(argv[iX]);
-	Swig_mark_arg(iX);
-	continue;
-      }
-      if (strcmp(argv[iX], "-help") == 0) {
-	fputs(usage, stdout);
-      }
-    }
-  }
-
-  /* Top of the parse tree */
-  virtual int top(Node *n) {
-    if (out == 0) {
-      String *outfile = Getattr(n, "outfile");
-      Replaceall(outfile, "_wrap.cxx", ".lisp");
-      Replaceall(outfile, "_wrap.c", ".lisp");
-      out = NewFile(outfile, "w", SWIG_output_files());
-      if (!out) {
-	FileErrorDisplay(outfile);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-    String *f_sink = NewString("");
-    Swig_register_filebyname("header", f_sink);
-    Swig_register_filebyname("wrapper", f_sink);
-    Swig_register_filebyname("begin", f_sink);
-    Swig_register_filebyname("runtime", f_sink);
-    Swig_register_filebyname("init", f_sink);
-
-    Swig_banner_target_lang(out, ";;;");
-
-    Language::top(n);
-    Printf(out, "\n");
-    Printf(out, ";;; Lisp parse tree produced by SWIG\n");
-    print_circle_hash = NewHash();
-    print_circle_count = 0;
-    hanging_parens = 0;
-    need_whitespace = 0;
-    need_newline = 0;
-    Sexp_print_node(n);
-    flush_parens();
-    return SWIG_OK;
-  }
-
-  void print_indent() {
-    int i;
-    for (i = 0; i < indent_level; i++) {
-      Printf(out, " ");
-    }
-  }
-
-  void open_paren(const String *oper) {
-    flush_parens();
-    Printf(out, "(");
-    if (oper)
-      Printf(out, "%s ", oper);
-    indent_level += 2;
-  }
-
-  void close_paren(bool neednewline = false) {
-    hanging_parens++;
-    if (neednewline)
-      print_lazy_whitespace();
-    indent_level -= 2;
-  }
-
-  void flush_parens() {
-    int i;
-    if (hanging_parens) {
-      for (i = 0; i < hanging_parens; i++)
-	Printf(out, ")");
-      hanging_parens = 0;
-      need_newline = true;
-      need_whitespace = true;
-    }
-    if (need_newline) {
-      Printf(out, "\n");
-      print_indent();
-      need_newline = false;
-      need_whitespace = false;
-    } else if (need_whitespace) {
-      Printf(out, " ");
-      need_whitespace = false;
-    }
-  }
-
-  void print_lazy_whitespace() {
-    need_whitespace = 1;
-  }
-
-  void print_lazy_newline() {
-    need_newline = 1;
-  }
-
-  bool internal_key_p(DOH *key) {
-    return ((Cmp(key, "nodeType") == 0)
-	    || (Cmp(key, "firstChild") == 0)
-	    || (Cmp(key, "lastChild") == 0)
-	    || (Cmp(key, "parentNode") == 0)
-	    || (Cmp(key, "nextSibling") == 0)
-	    || (Cmp(key, "previousSibling") == 0)
-	    || (Cmp(key, "csym:nextSibling") == 0)
-	    || (Cmp(key, "csym:previousSibling") == 0)
-	    || (Cmp(key, "typepass:visit") == 0)
-	    || (Cmp(key, "allocate:visit") == 0)
-	    || (*(Char(key)) == '$'));
-  }
-
-  bool boolean_key_p(DOH *key) {
-    return ((Cmp(key, "allocate:default_constructor") == 0)
-	    || (Cmp(key, "allocate:default_destructor") == 0)
-	    || (Cmp(key, "allows_typedef") == 0)
-	    || (Cmp(key, "feature:immutable") == 0));
-  }
-
-  bool list_key_p(DOH *key) {
-    return ((Cmp(key, "parms") == 0)
-	    || (Cmp(key, "baselist") == 0));
-  }
-
-  bool plist_key_p(DOH *key)
-      // true if KEY is the name of data that is a mapping from keys to
-      // values, which should be printed as a plist.
-  {
-    return ((Cmp(key, "typescope") == 0));
-  }
-
-  bool maybe_plist_key_p(DOH *key) {
-    return (Strncmp(key, "tmap:", 5) == 0);
-  }
-
-  bool print_circle(DOH *obj, bool list_p)
-      // We have a complex object, which might be referenced several
-      // times, or even recursively.  Use Lisp's reader notation for
-      // circular structures (#n#, #n=).
-      //
-      // An object can be printed in list-mode or object-mode; LIST_P toggles.
-      // return TRUE if OBJ still needs to be printed
-  {
-    flush_parens();
-    // Following is a silly hack.  It works around the limitation of
-    // DOH's hash tables that only work with string keys!
-    char address[32];
-    sprintf(address, "%p%c", obj, list_p ? 'L' : 'O');
-    DOH *placeholder = Getattr(print_circle_hash, address);
-    if (placeholder) {
-      Printv(out, placeholder, NIL);
-      return false;
-    } else {
-      String *placeholder = NewStringf("#%d#", ++print_circle_count);
-      Setattr(print_circle_hash, address, placeholder);
-      Printf(out, "#%d=", print_circle_count);
-      return true;
-    }
-  }
-
-  void Sexp_print_value_of_key(DOH *value, DOH *key) {
-    if ((Cmp(key, "parms") == 0) || (Cmp(key, "wrap:parms") == 0)
-	|| (Cmp(key, "kwargs") == 0) || (Cmp(key, "pattern") == 0))
-      Sexp_print_parms(value);
-    else if (plist_key_p(key))
-      Sexp_print_plist(value);
-    else if (maybe_plist_key_p(key)) {
-      if (DohIsMapping(value))
-	Sexp_print_plist(value);
-      else
-	Sexp_print_doh(value);
-    } else if (list_key_p(key))
-      Sexp_print_list(value);
-    else if (boolean_key_p(key))
-      Sexp_print_boolean(value);
-    else
-      Sexp_print_doh(value);
-  }
-
-  void Sexp_print_boolean(DOH *obj) {
-    flush_parens();
-    /* See DOH/Doh/base.c, DohGetInt() */
-    if (DohIsString(obj)) {
-      if (atoi(Char(obj)) != 0)
-	Printf(out, "t");
-      else
-	Printf(out, "nil");
-    } else
-      Printf(out, "nil");
-  }
-
-  void Sexp_print_list(DOH *obj) {
-    if (print_circle(obj, true)) {
-      open_paren(NIL);
-      for (; obj; obj = nextSibling(obj)) {
-	Sexp_print_doh(obj);
-	print_lazy_whitespace();
-      }
-      close_paren(true);
-    }
-  }
-
-  void Sexp_print_parms(DOH *obj) {
-    // print it as a list of plists
-    if (print_circle(obj, true)) {
-      open_paren(NIL);
-      for (; obj; obj = nextSibling(obj)) {
-	if (DohIsMapping(obj)) {
-	  Iterator k;
-	  open_paren(NIL);
-	  for (k = First(obj); k.key; k = Next(k)) {
-	    if (!internal_key_p(k.key)) {
-	      DOH *value = Getattr(obj, k.key);
-	      Sexp_print_as_keyword(k.key);
-	      Sexp_print_value_of_key(value, k.key);
-	      print_lazy_whitespace();
-	    }
-	  }
-	  close_paren(true);
-	} else
-	  Sexp_print_doh(obj);
-	print_lazy_whitespace();
-      }
-      close_paren(true);
-    }
-  }
-
-  void Sexp_print_doh(DOH *obj) {
-    flush_parens();
-    if (DohIsString(obj)) {
-      String *o = Str(obj);
-      Replaceall(o, "\\", "\\\\");
-      Replaceall(o, "\"", "\\\"");
-      Printf(out, "\"%s\"", o);
-      Delete(o);
-    } else {
-      if (print_circle(obj, false)) {
-	// Dispatch type
-	if (nodeType(obj)) {
-	  Sexp_print_node(obj);
-	}
-
-	else if (DohIsMapping(obj)) {
-	  Iterator k;
-	  open_paren(NIL);
-	  for (k = First(obj); k.key; k = Next(k)) {
-	    if (!internal_key_p(k.key)) {
-	      DOH *value = Getattr(obj, k.key);
-	      flush_parens();
-	      open_paren(NIL);
-	      Sexp_print_doh(k.key);
-	      Printf(out, " . ");
-	      Sexp_print_value_of_key(value, k.key);
-	      close_paren();
-	    }
-	  }
-	  close_paren();
-	} else if (strcmp(ObjType(obj)->objname, "List") == 0) {
-	  int i;
-	  open_paren(NIL);
-	  for (i = 0; i < Len(obj); i++) {
-	    DOH *item = Getitem(obj, i);
-	    Sexp_print_doh(item);
-	  }
-	  close_paren();
-	} else {
-	  // What is it?
-	  Printf(out, "#<DOH %s %p>", ObjType(obj)->objname, obj);
-	}
-      }
-    }
-  }
-
-  void Sexp_print_as_keyword(const DOH *k) {
-    /* Print key, replacing ":" with "-" because : is CL's package prefix */
-    flush_parens();
-    String *key = NewString(k);
-    Replaceall(key, ":", "-");
-    Replaceall(key, "_", "-");
-    Printf(out, ":%s ", key);
-    Delete(key);
-  }
-
-  void Sexp_print_plist_noparens(DOH *obj) {
-    /* attributes map names to objects */
-    Iterator k;
-    bool first;
-    for (k = First(obj), first = true; k.key; k = Next(k), first = false) {
-      if (!internal_key_p(k.key)) {
-	DOH *value = Getattr(obj, k.key);
-	flush_parens();
-	if (!first) {
-	  Printf(out, " ");
-	}
-	Sexp_print_as_keyword(k.key);
-	/* Print value */
-	Sexp_print_value_of_key(value, k.key);
-      }
-    }
-  }
-
-  void Sexp_print_plist(DOH *obj) {
-    flush_parens();
-    if (print_circle(obj, true)) {
-      open_paren(NIL);
-      Sexp_print_plist_noparens(obj);
-      close_paren();
-    }
-  }
-
-  void Sexp_print_attributes(Node *obj) {
-    Sexp_print_plist_noparens(obj);
-  }
-
-  void Sexp_print_node(Node *obj) {
-    Node *cobj;
-    open_paren(nodeType(obj));
-    /* A node has an attribute list... */
-    Sexp_print_attributes(obj);
-    /* ... and child nodes. */
-    cobj = firstChild(obj);
-    if (cobj) {
-      print_lazy_newline();
-      flush_parens();
-      Sexp_print_as_keyword("children");
-      open_paren(NIL);
-      for (; cobj; cobj = nextSibling(cobj)) {
-	Sexp_print_node(cobj);
-      }
-      close_paren();
-    }
-    close_paren();
-  }
-
-
-  virtual int functionWrapper(Node *n) {
-    ParmList *l = Getattr(n, "parms");
-    Wrapper *f = NewWrapper();
-    emit_attach_parmmaps(l, f);
-    Setattr(n, "wrap:parms", l);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-};
-
-
-static Language *new_swig_sexp() {
-  return new Sexp();
-}
-extern "C" Language *swig_sexp(void) {
-  return new_swig_sexp();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/scilab.cxx b/dependencies2013/win32/swig/Source/Modules/scilab.cxx
deleted file mode 100644
index 5997b587..00000000
--- a/dependencies2013/win32/swig/Source/Modules/scilab.cxx
+++ /dev/null
@@ -1,1136 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * scilab.cxx
- *
- * Scilab language module for SWIG.
- * --------------------------------------------------------------------------*/
-
-#include "swigmod.h"
-
-static const int SCILAB_IDENTIFIER_NAME_CHAR_MAX = 24;
-static const int SCILAB_VARIABLE_NAME_CHAR_MAX = SCILAB_IDENTIFIER_NAME_CHAR_MAX - 4;
-
-static const char *usage = (char *) " \
-Scilab options (available with -scilab)\n \
-     -builder                        - Generate a Scilab builder script\n \
-     -buildercflags <cflags>         - Add <cflags> to the builder compiler flags\n \
-     -builderflagscript <file>       - Set the Scilab script <file> to use by builder to configure the build flags\n \
-     -builderldflags <ldflags>       - Add <ldflags> to the builder linker flags\n \
-     -buildersources <files>         - Add the (comma separated) files <files> to the builder sources\n \
-     -builderverbositylevel <level>  - Set the builder verbosity level to <level> (default 0: off, 2: high)\n \
-     -gatewayxml <gateway_id>        - Generate gateway xml with the given <gateway_id>\n \
-\n";
-
-
-class SCILAB:public Language {
-protected:
-  /* General objects used for holding the strings */
-  File *beginSection;
-  File *runtimeSection;
-  File *headerSection;
-  File *wrappersSection;
-  File *initSection;
-
-  String *variablesCode;
-
-  bool generateBuilder;
-  File *builderFile;
-  String *builderCode;
-  int builderFunctionCount;
-
-  List *sourceFileList;
-  List *cflags;
-  List *ldflags;
-
-  String *verboseBuildLevel;
-  String *buildFlagsScript;
-
-  String *gatewayHeader;
-  String *gatewayHeaderV5;
-  String *gatewayHeaderV6;
-
-  bool createGatewayXML;
-  File *gatewayXMLFile;
-  String *gatewayXML;
-  String *gatewayID;
-  int primitiveID;
-
-  bool createLoader;
-  File *loaderFile;
-  String *loaderScript;
-public:
-
-  /* ------------------------------------------------------------------------
-   * main()
-   * ----------------------------------------------------------------------*/
-
-  virtual void main(int argc, char *argv[]) {
-
-    generateBuilder = false;
-    sourceFileList = NewList();
-    cflags = NewList();
-    ldflags = NewList();
-    verboseBuildLevel = NULL;
-    buildFlagsScript = NULL;
-
-    gatewayHeader = NULL;
-    gatewayHeaderV5 = NULL;
-    gatewayHeaderV6 = NULL;
-
-    createGatewayXML = false;
-    gatewayXML = NULL;
-    gatewayXMLFile = NULL;
-    gatewayID = NULL;
-
-    createLoader = true;
-    loaderFile = NULL;
-    loaderScript = NULL;
-
-    /* Manage command line arguments */
-    for (int argIndex = 1; argIndex < argc; argIndex++) {
-      if (argv[argIndex] != NULL) {
-	if (strcmp(argv[argIndex], "-help") == 0) {
-	  Printf(stdout, "%s\n", usage);
-	} else if (strcmp(argv[argIndex], "-builder") == 0) {
-	  Swig_mark_arg(argIndex);
-	  generateBuilder = true;
-	  createLoader = false;
-	} else if (strcmp(argv[argIndex], "-buildersources") == 0) {
-	  if (argv[argIndex + 1] != NULL) {
-	    Swig_mark_arg(argIndex);
-	    char *sourceFile = strtok(argv[argIndex + 1], ",");
-	    while (sourceFile != NULL) {
-	      Insert(sourceFileList, Len(sourceFileList), sourceFile);
-	      sourceFile = strtok(NULL, ",");
-	    }
-	    Swig_mark_arg(argIndex + 1);
-	  }
-	} else if (strcmp(argv[argIndex], "-buildercflags") == 0) {
-	  Swig_mark_arg(argIndex);
-	  if (argv[argIndex + 1] != NULL) {
-	    Insert(cflags, Len(cflags), argv[argIndex + 1]);
-	    Swig_mark_arg(argIndex + 1);
-	  }
-	} else if (strcmp(argv[argIndex], "-builderldflags") == 0) {
-	  Swig_mark_arg(argIndex);
-	  if (argv[argIndex + 1] != NULL) {
-	    Insert(ldflags, Len(ldflags), argv[argIndex + 1]);
-	    Swig_mark_arg(argIndex + 1);
-	  }
-	} else if (strcmp(argv[argIndex], "-builderverbositylevel") == 0) {
-	  Swig_mark_arg(argIndex);
-	  verboseBuildLevel = NewString(argv[argIndex + 1]);
-	  Swig_mark_arg(argIndex + 1);
-	} else if (strcmp(argv[argIndex], "-builderflagscript") == 0) {
-	  Swig_mark_arg(argIndex);
-	  buildFlagsScript = NewString(argv[argIndex + 1]);
-	  Swig_mark_arg(argIndex + 1);
-	} else if (strcmp(argv[argIndex], "-gatewayxml") == 0) {
-	  Swig_mark_arg(argIndex);
-	  createGatewayXML = true;
-	  gatewayID = NewString(argv[argIndex + 1]);
-	  Swig_mark_arg(argIndex + 1);
-	}
-      }
-    }
-
-    if (verboseBuildLevel == NULL) {
-      verboseBuildLevel = NewString("0");
-    }
-
-    /* Set language-specific subdirectory in SWIG library */
-    SWIG_library_directory("scilab");
-
-    /* Add a symbol to the parser for conditional compilation */
-    Preprocessor_define("SWIGSCILAB 1", 0);
-
-    /* Set scilab configuration file */
-    SWIG_config_file("scilab.swg");
-
-    /* Set typemap for scilab */
-    SWIG_typemap_lang("scilab");
-
-    allow_overloading();
-  }
-
-  /* ------------------------------------------------------------------------
-   * top()
-   * ----------------------------------------------------------------------*/
-
-  virtual int top(Node *node) {
-
-    /* Get the module name */
-    String *gatewayName = Getattr(node, "name");
-
-    // Set library name
-    String *gatewayLibraryName = NewStringf("lib%s", gatewayName);
-
-    /* Get the output file name */
-    String *outputFilename = Getattr(node, "outfile");
-
-    /* Initialize I/O */
-    beginSection = NewFile(outputFilename, "w", SWIG_output_files());
-    if (!beginSection) {
-      FileErrorDisplay(outputFilename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    runtimeSection = NewString("");
-    initSection = NewString("");
-    headerSection = NewString("");
-    wrappersSection = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("begin", beginSection);
-    Swig_register_filebyname("header", headerSection);
-    Swig_register_filebyname("wrapper", wrappersSection);
-    Swig_register_filebyname("runtime", runtimeSection);
-    Swig_register_filebyname("init", initSection);
-
-    /* Output module initialization code */
-    Swig_banner(beginSection);
-
-    Printf(runtimeSection, "\n\n#ifndef SWIGSCILAB\n#define SWIGSCILAB\n#endif\n\n");
-
-    // Gateway header source merged with wrapper source in nobuilder mode
-    if (!generateBuilder)
-      startGatewayHeader(gatewayLibraryName);
-
-    // Create builder file if required
-    if (generateBuilder) {
-      createBuilderFile(outputFilename);
-    }
-
-    // Create gateway XML if required
-    if (createGatewayXML) {
-      createGatewayXMLFile(gatewayName);
-    }
-
-    // Create loader script if required
-    if (createLoader) {
-      createLoaderFile(gatewayLibraryName);
-    }
-
-    // Module initialization function
-    String *gatewayInitFunctionName = NewStringf("%s_Init", gatewayName);
-
-    /* Add initialization function to builder table */
-    addFunctionToScilab(gatewayInitFunctionName, gatewayInitFunctionName);
-
-    // Add helper functions to builder table
-    addHelperFunctions();
-
-    // Open Scilab wrapper variables creation function
-    variablesCode = NewString("");
-    Printf(variablesCode, "int SWIG_CreateScilabVariables(void *_pvApiCtx) {");
-
-    /* Emit code for children */
-    if (CPlusPlus) {
-      Printf(wrappersSection, "extern \"C\" {\n");
-    }
-
-    Language::top(node);
-
-    if (CPlusPlus) {
-      Printf(wrappersSection, "}\n");
-    }
-    // Close Scilab wrapper variables creation function
-    Printf(variablesCode, "  return SWIG_OK;\n}\n");
-
-    // Add Builder footer code and save
-    if (generateBuilder) {
-      saveBuilderFile(gatewayName);
-    }
-
-    /* Close the init function and rename with module name */
-    Printf(initSection, "return 0;\n}\n");
-    Replaceall(initSection, "<module>", gatewayName);
-
-    /* Write all to the wrapper file */
-    SwigType_emit_type_table(runtimeSection, wrappersSection);	// Declare pointer types, ... (Ex: SWIGTYPE_p_p_double)
-
-    // Gateway header source merged with wrapper source in nobuilder mode
-    if (!generateBuilder) {
-      terminateGatewayHeader(gatewayLibraryName);
-      Printv(initSection, gatewayHeader, NIL);
-    }
-
-    Dump(runtimeSection, beginSection);
-    Dump(headerSection, beginSection);
-    Dump(wrappersSection, beginSection);
-    Dump(variablesCode, beginSection);
-    Wrapper_pretty_print(initSection, beginSection);
-
-    if (createGatewayXML) {
-      saveGatewayXMLFile();
-    }
-
-    if (createLoader) {
-      saveLoaderFile(gatewayLibraryName);
-    }
-
-    /* Cleanup files */
-    Delete(runtimeSection);
-    Delete(headerSection);
-    Delete(wrappersSection);
-    Delete(initSection);
-    Delete(beginSection);
-
-    Delete(sourceFileList);
-    Delete(cflags);
-    Delete(ldflags);
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------------------
-   * emitBanner()
-   * ----------------------------------------------------------------------*/
-
-  void emitBanner(File *f) {
-    Printf(f, "// ----------------------------------------------------------------------------\n");
-    Swig_banner_target_lang(f, "// ");
-    Printf(f, "// ----------------------------------------------------------------------------- */\n\n");
-  }
-
-  /* ------------------------------------------------------------------------
-   * functionWrapper()
-   * ----------------------------------------------------------------------*/
-
-  virtual int functionWrapper(Node *node) {
-
-    /* Get some useful attributes of this function */
-    String *functionName = Getattr(node, "sym:name");
-    SwigType *functionReturnType = Getattr(node, "type");
-    ParmList *functionParamsList = Getattr(node, "parms");
-
-    int paramIndex = 0;		// Used for loops over ParmsList
-    Parm *param = NULL;		// Used for loops over ParamsList
-
-    /* Create the wrapper object */
-    Wrapper *wrapper = NewWrapper();
-
-    /* Create the function wrapper name */
-    String *wrapperName = Swig_name_wrapper(functionName);
-
-    /* Deal with overloading */
-    String *overloadedName = Copy(wrapperName);
-    /* Determine whether the function is overloaded or not */
-    bool isOverloaded = ! !Getattr(node, "sym:overloaded");
-    /* Determine whether the function is the last overloaded */
-    bool isLastOverloaded = isOverloaded && !Getattr(node, "sym:nextSibling");
-
-    if (!isOverloaded && !addSymbol(functionName, node)) {
-      DelWrapper(wrapper);
-      return SWIG_ERROR;
-    }
-
-    if (isOverloaded) {
-      Append(overloadedName, Getattr(node, "sym:overname"));
-    }
-
-    /* Write the wrapper function definition (standard Scilab gateway function prototype) */
-    Printv(wrapper->def, "int ", overloadedName, "(SWIG_GatewayParameters) {", NIL);
-
-    /* Emit all of the local variables for holding arguments */
-    // E.g.: double arg1;
-    emit_parameter_variables(functionParamsList, wrapper);
-
-    /* Attach typemaps to the parameter list */
-    // Add local variables used in typemaps (iRows, iCols, ...)
-    emit_attach_parmmaps(functionParamsList, wrapper);
-    Setattr(node, "wrap:parms", functionParamsList);
-
-    /* Check input/output arguments count */
-    int maxInputArguments = emit_num_arguments(functionParamsList);
-    int minInputArguments = emit_num_required(functionParamsList);
-    int minOutputArguments = 0;
-    int maxOutputArguments = 0;
-
-    if (!emit_isvarargs(functionParamsList)) {
-      Printf(wrapper->code, "SWIG_CheckInputArgument(pvApiCtx, $mininputarguments, $maxinputarguments);\n");
-    }
-    else {
-      Printf(wrapper->code, "SWIG_CheckInputArgumentAtLeast(pvApiCtx, $mininputarguments-1);\n");
-    }
-    Printf(wrapper->code, "SWIG_CheckOutputArgument(pvApiCtx, $minoutputarguments, $maxoutputarguments);\n");
-
-    /* Set context */
-    Printf(wrapper->code, "SWIG_Scilab_SetFuncName(fname);\n");
-    Printf(wrapper->code, "SWIG_Scilab_SetApiContext(pvApiCtx);\n");
-
-    /* Write typemaps(in) */
-
-    for (paramIndex = 0, param = functionParamsList; paramIndex < maxInputArguments; ++paramIndex) {
-      // Ignore parameter if the typemap specifies numinputs=0
-      while (checkAttribute(param, "tmap:in:numinputs", "0")) {
-	param = Getattr(param, "tmap:in:next");
-      }
-
-      SwigType *paramType = Getattr(param, "type");
-      String *paramTypemap = Getattr(param, "tmap:in");
-
-      if (paramTypemap) {
-	// Replace $input by the position on Scilab stack
-	String *source = NewString("");
-	Printf(source, "%d", paramIndex + 1);
-	Setattr(param, "emit:input", source);
-	Replaceall(paramTypemap, "$input", Getattr(param, "emit:input"));
-
-	if (Getattr(param, "wrap:disown") || (Getattr(param, "tmap:in:disown"))) {
-	  Replaceall(paramTypemap, "$disown", "SWIG_POINTER_DISOWN");
-	} else {
-	  Replaceall(paramTypemap, "$disown", "0");
-	}
-
-	if (paramIndex >= minInputArguments) {	/* Optional input argument management */
-	  Printf(wrapper->code, "if (SWIG_NbInputArgument(pvApiCtx) > %d) {\n%s\n}\n", paramIndex, paramTypemap);
-	} else {
-	  Printf(wrapper->code, "%s\n", paramTypemap);
-	}
-	param = Getattr(param, "tmap:in:next");
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(paramType, 0));
-	break;
-      }
-    }
-
-    /* TODO write constraints */
-
-    Setattr(node, "wrap:name", overloadedName);
-
-    /* Emit the function call */
-    Swig_director_emit_dynamic_cast(node, wrapper);
-    String *functionActionCode = emit_action(node);
-
-    /* Insert the return variable */
-    emit_return_variable(node, functionReturnType, wrapper);
-
-    /* Return the function value if necessary */
-    String *functionReturnTypemap = Swig_typemap_lookup_out("out", node, Swig_cresult_name(), wrapper, functionActionCode);
-    if (functionReturnTypemap) {
-      // Result is actually the position of output value on stack
-      if (Len(functionReturnTypemap) > 0) {
-	Printf(wrapper->code, "SWIG_Scilab_SetOutputPosition(%d);\n", 1);
-      }
-      Replaceall(functionReturnTypemap, "$result", "1");
-
-      if (GetFlag(node, "feature:new")) {
-	Replaceall(functionReturnTypemap, "$owner", "1");
-      } else {
-	Replaceall(functionReturnTypemap, "$owner", "0");
-      }
-
-      Printf(wrapper->code, "%s\n", functionReturnTypemap);
-
-      /* If the typemap is not empty, the function return one more argument than the typemaps gives */
-      if (Len(functionReturnTypemap) > 0) {
-	minOutputArguments++;
-	maxOutputArguments++;
-      }
-      Delete(functionReturnTypemap);
-
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(functionReturnType, 0),
-		   functionName);
-    }
-
-    /* Write typemaps(out) */
-    for (param = functionParamsList; param;) {
-      String *paramTypemap = Getattr(param, "tmap:argout");
-      if (paramTypemap) {
-	minOutputArguments++;
-	maxOutputArguments++;
-	Printf(wrapper->code, "SWIG_Scilab_SetOutputPosition(%d);\n", minOutputArguments);
-	String *result = NewString("");
-	Printf(result, "%d", minOutputArguments);
-	Replaceall(paramTypemap, "$result", result);
-	Printf(wrapper->code, "%s\n", paramTypemap);
-	Delete(paramTypemap);
-	param = Getattr(param, "tmap:argout:next");
-      } else {
-	param = nextSibling(param);
-      }
-    }
-    /* Add cleanup code */
-    for (param = functionParamsList; param;) {
-      String *tm;
-      if ((tm = Getattr(param, "tmap:freearg"))) {
-	if (tm && (Len(tm) != 0)) {
-	  Replaceall(tm, "$source", Getattr(param, "lname"));
-	  Printf(wrapper->code, "%s\n", tm);
-	}
-	param = Getattr(param, "tmap:freearg:next");
-      } else {
-	param = nextSibling(param);
-      }
-    }
-
-    /* See if there is any return cleanup code */
-    String *tm;
-    if ((tm = Swig_typemap_lookup("ret", node, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(wrapper->code, "%s\n", tm);
-      Delete(tm);
-    }
-
-    /* Close the function(ok) */
-    Printv(wrapper->code, "return SWIG_OK;\n", NIL);
-    Printv(wrapper->code, "}\n", NIL);
-
-    /* Add the failure cleanup code */
-    /* TODO */
-
-    /* Final substititions if applicable */
-    Replaceall(wrapper->code, "$symname", functionName);
-
-    /* Set CheckInputArgument and CheckOutputArgument input arguments */
-    /* In Scilab there is always one output even if not defined */
-    if (minOutputArguments == 0) {
-      maxOutputArguments = 1;
-    }
-    String *argnumber = NewString("");
-    Printf(argnumber, "%d", minInputArguments);
-    Replaceall(wrapper->code, "$mininputarguments", argnumber);
-
-    argnumber = NewString("");
-    Printf(argnumber, "%d", maxInputArguments);
-    Replaceall(wrapper->code, "$maxinputarguments", argnumber);
-
-    argnumber = NewString("");
-    Printf(argnumber, "%d", minOutputArguments);
-    Replaceall(wrapper->code, "$minoutputarguments", argnumber);
-
-    argnumber = NewString("");
-    Printf(argnumber, "%d", maxOutputArguments);
-    Replaceall(wrapper->code, "$maxoutputarguments", argnumber);
-
-    /* Dump the function out */
-    Wrapper_print(wrapper, wrappersSection);
-
-    String *scilabFunctionName = checkIdentifierName(functionName, SCILAB_IDENTIFIER_NAME_CHAR_MAX);
-
-    /* Update builder.sce contents */
-    if (isLastOverloaded) {
-      addFunctionToScilab(scilabFunctionName, wrapperName);
-      dispatchFunction(node);
-    }
-
-    if (!isOverloaded) {
-      addFunctionToScilab(scilabFunctionName, wrapperName);
-    }
-
-    /* tidy up */
-    Delete(overloadedName);
-    Delete(wrapperName);
-    DelWrapper(wrapper);
-
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * dispatchFunction()
-   * ----------------------------------------------------------------------- */
-
-  void dispatchFunction(Node *node) {
-    Wrapper *wrapper = NewWrapper();
-
-    String *functionName = Getattr(node, "sym:name");
-    String *wrapperName = Swig_name_wrapper(functionName);
-    int maxargs = 0;
-
-    /* Generate the dispatch function */
-    String *dispatch = Swig_overload_dispatch(node, "return %s(SWIG_GatewayArguments);", &maxargs);
-    String *tmp = NewString("");
-
-    Printv(wrapper->def, "int ", wrapperName, "(SWIG_GatewayParameters) {\n", NIL);
-
-    /* Get the number of the parameters */
-    Wrapper_add_local(wrapper, "argc", "int argc = SWIG_NbInputArgument(pvApiCtx)");
-    Printf(tmp, "int argv[%d] = {", maxargs);
-    for (int j = 0; j < maxargs; ++j) {
-      Printf(tmp, "%s%d", j ? "," : " ", j + 1);
-    }
-    Printf(tmp, "}");
-    Wrapper_add_local(wrapper, "argv", tmp);
-
-    Printf(wrapper->code, "SWIG_Scilab_SetApiContext(pvApiCtx);\n");
-
-    /* Dump the dispatch function */
-    Printv(wrapper->code, dispatch, "\n", NIL);
-    Printf(wrapper->code, "Scierror(999, _(\"No matching function for overload\"));\n");
-    Printf(wrapper->code, "return SWIG_ERROR;\n");
-    Printv(wrapper->code, "}\n", NIL);
-    Wrapper_print(wrapper, wrappersSection);
-
-    Delete(tmp);
-    DelWrapper(wrapper);
-    Delete(dispatch);
-    Delete(wrapperName);
-  }
-
-  /* -----------------------------------------------------------------------
-   * variableWrapper()
-   * ----------------------------------------------------------------------- */
-
-  virtual int variableWrapper(Node *node) {
-
-    /* Get information about variable */
-    String *origVariableName = Getattr(node, "name");	// Ex: Shape::nshapes
-    String *variableName = Getattr(node, "sym:name");	// Ex; Shape_nshapes (can be used for function names, ...)
-
-    // Variable names can have SCILAB_VARIABLE_NAME_CHAR_MAX because of suffixes "_get" or "_set" added to function
-    String *scilabVariableName = checkIdentifierName(variableName, SCILAB_VARIABLE_NAME_CHAR_MAX);
-
-    /* Manage GET function */
-    Wrapper *getFunctionWrapper = NewWrapper();
-    String *getFunctionName = Swig_name_get(NSPACE_TODO, variableName);
-    String *scilabGetFunctionName = Swig_name_get(NSPACE_TODO, scilabVariableName);
-
-    Setattr(node, "wrap:name", getFunctionName);
-    Printv(getFunctionWrapper->def, "int ", getFunctionName, "(SWIG_GatewayParameters) {\n", NIL);
-
-    /* Check the number of input and output */
-    Printf(getFunctionWrapper->def, "SWIG_CheckInputArgument(pvApiCtx, 0, 0);\n");
-    Printf(getFunctionWrapper->def, "SWIG_CheckOutputArgument(pvApiCtx, 1, 1);\n");
-    Printf(getFunctionWrapper->def, "SWIG_Scilab_SetApiContext(pvApiCtx);\n");
-
-    String *varoutTypemap = Swig_typemap_lookup("varout", node, origVariableName, 0);
-    if (varoutTypemap != NULL) {
-      Printf(getFunctionWrapper->code, "SWIG_Scilab_SetOutputPosition(%d);\n", 1);
-      Replaceall(varoutTypemap, "$value", origVariableName);
-      Replaceall(varoutTypemap, "$result", "1");
-      emit_action_code(node, getFunctionWrapper->code, varoutTypemap);
-      Delete(varoutTypemap);
-    }
-    Append(getFunctionWrapper->code, "return SWIG_OK;\n");
-    Append(getFunctionWrapper->code, "}\n");
-    Wrapper_print(getFunctionWrapper, wrappersSection);
-
-    /* Add function to builder table */
-    addFunctionToScilab(scilabGetFunctionName, getFunctionName);
-
-    /* Manage SET function */
-    if (is_assignable(node)) {
-      Wrapper *setFunctionWrapper = NewWrapper();
-      String *setFunctionName = Swig_name_set(NSPACE_TODO, variableName);
-      String *scilabSetFunctionName = Swig_name_set(NSPACE_TODO, scilabVariableName);
-
-      Setattr(node, "wrap:name", setFunctionName);
-      Printv(setFunctionWrapper->def, "int ", setFunctionName, "(SWIG_GatewayParameters) {\n", NIL);
-
-      /* Check the number of input and output */
-      Printf(setFunctionWrapper->def, "SWIG_CheckInputArgument(pvApiCtx, 1, 1);\n");
-      Printf(setFunctionWrapper->def, "SWIG_CheckOutputArgument(pvApiCtx, 1, 1);\n");
-      Printf(setFunctionWrapper->def, "SWIG_Scilab_SetApiContext(pvApiCtx);\n");
-
-      String *varinTypemap = Swig_typemap_lookup("varin", node, origVariableName, 0);
-      if (varinTypemap != NULL) {
-	Replaceall(varinTypemap, "$input", "1");
-	emit_action_code(node, setFunctionWrapper->code, varinTypemap);
-	Delete(varinTypemap);
-      }
-      Append(setFunctionWrapper->code, "return SWIG_OK;\n");
-      Append(setFunctionWrapper->code, "}\n");
-      Wrapper_print(setFunctionWrapper, wrappersSection);
-
-      /* Add function to builder table */
-      addFunctionToScilab(scilabSetFunctionName, setFunctionName);
-
-      DelWrapper(setFunctionWrapper);
-    }
-    DelWrapper(getFunctionWrapper);
-
-    return SWIG_OK;
-  }
-
-  /* -----------------------------------------------------------------------
-   * constantWrapper()
-   * ----------------------------------------------------------------------- */
-
-  virtual int constantWrapper(Node *node) {
-
-    /* Get the useful information from the node */
-    String *nodeName = Getattr(node, "name");
-    SwigType *type = Getattr(node, "type");
-    String *constantName = Getattr(node, "sym:name");
-    String *rawValue = Getattr(node, "rawval");
-    String *constantValue = rawValue ? rawValue : Getattr(node, "value");
-    String *constantTypemap = NULL;
-
-    // If feature scilab:const enabled, constants & enums are wrapped to Scilab variables
-    if (GetFlag(node, "feature:scilab:const")) {
-      bool isConstant = ((SwigType_issimple(type)) || (SwigType_type(type) == T_STRING));
-      bool isEnum = (Cmp(nodeType(node), "enumitem") == 0);
-
-      if (isConstant || isEnum) {
-	if (isEnum) {
-	  Setattr(node, "type", "double");
-	  constantValue = Getattr(node, "value");
-	}
-
-	constantTypemap = Swig_typemap_lookup("scilabconstcode", node, nodeName, 0);
-	if (constantTypemap != NULL) {
-	  String *scilabConstantName = checkIdentifierName(constantName, SCILAB_IDENTIFIER_NAME_CHAR_MAX);
-
-	  Setattr(node, "wrap:name", constantName);
-	  Replaceall(constantTypemap, "$result", scilabConstantName);
-	  Replaceall(constantTypemap, "$value", constantValue);
-
-	  emit_action_code(node, variablesCode, constantTypemap);
-	  Delete(constantTypemap);
-	  return SWIG_OK;
-	}
-      }
-    }
-
-    /* Create variables for member pointer constants, not supported by typemaps (like Python wrapper does) */
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(constantName);
-      String *str = SwigType_str(type, wname);
-      Printf(headerSection, "static %s = %s;\n", str, constantValue);
-      Delete(str);
-      constantValue = wname;
-    }
-    // Constant names can have SCILAB_VARIABLE_NAME_CHAR_MAX because of suffixes "_get" added to function
-    String *scilabConstantName = checkIdentifierName(constantName, SCILAB_VARIABLE_NAME_CHAR_MAX);
-
-    /* Create GET function to get the constant value */
-    Wrapper *getFunctionWrapper = NewWrapper();
-    String *getFunctionName = Swig_name_get(NSPACE_TODO, constantName);
-    String *scilabGetFunctionName = Swig_name_get(NSPACE_TODO, scilabConstantName);
-    Setattr(node, "wrap:name", getFunctionName);
-    Printv(getFunctionWrapper->def, "int ", getFunctionName, "(SWIG_GatewayParameters) {\n", NIL);
-
-    /* Check the number of input and output */
-    Printf(getFunctionWrapper->def, "SWIG_CheckInputArgument(pvApiCtx, 0, 0);\n");
-    Printf(getFunctionWrapper->def, "SWIG_CheckOutputArgument(pvApiCtx, 1, 1);\n");
-    Printf(getFunctionWrapper->def, "SWIG_Scilab_SetApiContext(pvApiCtx);\n");
-
-    constantTypemap = Swig_typemap_lookup("constcode", node, nodeName, 0);
-    if (constantTypemap != NULL) {
-      Printf(getFunctionWrapper->code, "SWIG_Scilab_SetOutputPosition(%d);\n", 1);
-      Replaceall(constantTypemap, "$value", constantValue);
-      Replaceall(constantTypemap, "$result", "1");
-      emit_action_code(node, getFunctionWrapper->code, constantTypemap);
-      Delete(constantTypemap);
-    }
-
-    /* Dump the wrapper function */
-    Append(getFunctionWrapper->code, "return SWIG_OK;\n");
-    Append(getFunctionWrapper->code, "}\n");
-    Wrapper_print(getFunctionWrapper, wrappersSection);
-
-    /* Add the function to Scilab  */
-    addFunctionToScilab(scilabGetFunctionName, getFunctionName);
-
-    DelWrapper(getFunctionWrapper);
-
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------
-   * enumvalueDeclaration()
-   * --------------------------------------------------------------------- */
-
-  virtual int enumvalueDeclaration(Node *node) {
-    static int iPreviousEnumValue = 0;
-
-    if (GetFlag(node, "feature:scilab:const")) {
-      // Compute the "absolute" value of enum if needed
-      // (most of time enum values are a linked list of relative values)
-      String *enumValue = Getattr(node, "enumvalue");
-      String *enumValueEx = Getattr(node, "enumvalueex");
-
-      // First enum value ?
-      String *firstenumitem = Getattr(node, "firstenumitem");
-      if (firstenumitem) {
-	if (enumValue) {
-	  // Value is in 'enumvalue'
-	  iPreviousEnumValue = atoi(Char(enumValue));
-	} else if (enumValueEx) {
-	  // Or value is in 'enumValueEx'
-	  iPreviousEnumValue = atoi(Char(enumValueEx));
-
-	  enumValue = NewString("");
-	  Printf(enumValue, "%d", iPreviousEnumValue);
-	  Setattr(node, "enumvalue", enumValue);
-	}
-      } else if (!enumValue && enumValueEx) {
-	// Value is not specified, set it by incrementing last value
-	enumValue = NewString("");
-	Printf(enumValue, "%d", ++iPreviousEnumValue);
-	Setattr(node, "enumvalue", enumValue);
-      }
-      // Enums in Scilab are mapped to double
-      Setattr(node, "type", "double");
-    }
-
-    return Language::enumvalueDeclaration(node);
-  }
-
-  /* ---------------------------------------------------------------------
-   * membervariableHandler()
-   * --------------------------------------------------------------------- */
-  virtual int membervariableHandler(Node *node) {
-    checkMemberIdentifierName(node, SCILAB_VARIABLE_NAME_CHAR_MAX);
-    return Language::membervariableHandler(node);
-  }
-
-  /* -----------------------------------------------------------------------
-   * checkIdentifierName()
-   * Truncates (and displays a warning) for too long identifier names
-   * (applies on functions, variables, constants...)
-   * (Scilab identifiers names are limited to 24 chars max)
-   * ----------------------------------------------------------------------- */
-
-  String *checkIdentifierName(String *name, int char_size_max) {
-    String *scilabIdentifierName;
-    if (Len(name) > char_size_max) {
-      scilabIdentifierName = DohNewStringWithSize(name, char_size_max);
-      Swig_warning(WARN_SCILAB_TRUNCATED_NAME, input_file, line_number,
-		   "Identifier name '%s' exceeds 24 characters and has been truncated to '%s'.\n", name, scilabIdentifierName);
-    } else
-      scilabIdentifierName = name;
-    return scilabIdentifierName;
-  }
-
-  /* -----------------------------------------------------------------------
-   * checkMemberIdentifierName()
-   * Truncates (and displays a warning) too long member identifier names
-   * (applies on members of structs, classes...)
-   * (Scilab identifiers names are limited to 24 chars max)
-   * ----------------------------------------------------------------------- */
-
-  void checkMemberIdentifierName(Node *node, int char_size_max) {
-
-    String *memberName = Getattr(node, "sym:name");
-
-    Node *containerNode = parentNode(node);
-    String *containerName = Getattr(containerNode, "sym:name");
-
-    int lenContainerName = Len(containerName);
-    int lenMemberName = Len(memberName);
-
-    if (lenContainerName + lenMemberName + 1 > char_size_max) {
-      int lenScilabMemberName = char_size_max - lenContainerName - 1;
-
-      if (lenScilabMemberName > 0) {
-	String *scilabMemberName = DohNewStringWithSize(memberName, lenScilabMemberName);
-	Setattr(node, "sym:name", scilabMemberName);
-	Swig_warning(WARN_SCILAB_TRUNCATED_NAME, input_file, line_number,
-		     "Wrapping functions names for member '%s.%s' will exceed 24 characters, "
-		     "so member name has been truncated to '%s'.\n", containerName, memberName, scilabMemberName);
-      } else
-	Swig_error(input_file, line_number,
-		   "Wrapping functions names for member '%s.%s' will exceed 24 characters, "
-		   "please rename the container of member '%s'.\n", containerName, memberName, containerName);
-    }
-  }
-
-
-
-  /* -----------------------------------------------------------------------
-   * addHelperFunctions()
-   * ----------------------------------------------------------------------- */
-
-  void addHelperFunctions() {
-    addFunctionToScilab("SWIG_this", "SWIG_this");
-    addFunctionToScilab("SWIG_ptr", "SWIG_ptr");
-  }
-
-  /* -----------------------------------------------------------------------
-   * addFunctionToScilab()
-   * Declare a wrapped function in Scilab (builder, gateway, XML, ...)
-   * ----------------------------------------------------------------------- */
-
-  void addFunctionToScilab(const_String_or_char_ptr scilabFunctionName, const_String_or_char_ptr wrapperFunctionName) {
-    if (!generateBuilder)
-      addFunctionInGatewayHeader(scilabFunctionName, wrapperFunctionName);
-
-    if (generateBuilder) {
-      addFunctionInScriptTable(scilabFunctionName, wrapperFunctionName, builderCode);
-    }
-
-    if (createLoader) {
-      addFunctionInLoader(scilabFunctionName);
-    }
-
-    if (gatewayXMLFile) {
-      Printf(gatewayXML, "<PRIMITIVE gatewayId=\"%s\" primitiveId=\"%d\" primitiveName=\"%s\"/>\n", gatewayID, primitiveID++, scilabFunctionName);
-    }
-  }
-
-
-  /* -----------------------------------------------------------------------
-   * createBuilderCode()
-   * ----------------------------------------------------------------------- */
-
-  void createBuilderFile(String *outputFilename) {
-    String *builderFilename = NewStringf("builder.sce");
-    builderFile = NewFile(builderFilename, "w", SWIG_output_files());
-    if (!builderFile) {
-      FileErrorDisplay(builderFilename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    emitBanner(builderFile);
-
-    builderFunctionCount = 0;
-    builderCode = NewString("");
-    Printf(builderCode, "mode(-1);\n");
-    Printf(builderCode, "lines(0);\n");	/* Useful for automatic tests */
-
-    // Scilab needs to be in the build directory
-    Printf(builderCode, "originaldir = pwd();\n");
-    Printf(builderCode, "builddir = get_absolute_file_path('builder.sce');\n");
-    Printf(builderCode, "cd(builddir);\n");
-
-    Printf(builderCode, "ilib_verbose(%s);\n", verboseBuildLevel);
-
-    Printf(builderCode, "libs = [];\n");
-
-    // Flags from command line arguments
-    Printf(builderCode, "cflags = \"\";\n");
-    for (int i = 0; i < Len(cflags); i++) {
-      String *cflag = Getitem(cflags, i);
-      Printf(builderCode, "cflags = cflags + \" %s\";\n", cflag);
-    }
-
-    if (Len(ldflags) > 0) {
-      for (int i = 0; i < Len(ldflags); i++) {
-	String *ldflag = Getitem(ldflags, i);
-	if (i == 0) {
-	  Printf(builderCode, "ldflags = \"%s\";\n", ldflag);
-	} else {
-	  Printf(builderCode, "ldflags = ldflags + \" %s\";\n", ldflag);
-	}
-      }
-    } else {
-      Printf(builderCode, "ldflags = \"\";\n");
-    }
-
-    // External script to set flags
-    if (buildFlagsScript) {
-      Printf(builderCode, "exec(\"%s\");\n", buildFlagsScript);
-      Printf(builderCode, "cflags = cflags + getCompilationFlags();\n");
-      Printf(builderCode, "ldflags = ldflags + getLinkFlags();\n");
-    }
-    // Additional sources
-    Insert(sourceFileList, 0, outputFilename);
-    for (int i = 0; i < Len(sourceFileList); i++) {
-      String *sourceFile = Getitem(sourceFileList, i);
-      if (i == 0) {
-	Printf(builderCode, "files = \"%s\";\n", sourceFile);
-      } else {
-	Printf(builderCode, "files($ + 1) = \"%s\";\n", sourceFile);
-      }
-    }
-
-    Printf(builderCode, "table = [");
-  }
-
-  /* -----------------------------------------------------------------------
-   * addFunctionInBuilderCode()
-   * Add a function wrapper in the function table of generated builder script
-   * ----------------------------------------------------------------------- */
-
-  void addFunctionInScriptTable(const_String_or_char_ptr scilabFunctionName, const_String_or_char_ptr wrapperFunctionName, String *scriptCode) {
-    if (++builderFunctionCount % 10 == 0) {
-      Printf(scriptCode, "];\ntable = [table;");
-    }
-    Printf(scriptCode, "\"%s\",\"%s\";", scilabFunctionName, wrapperFunctionName);
-  }
-
-  /* -----------------------------------------------------------------------
-   * saveBuilderFile()
-   * ----------------------------------------------------------------------- */
-
-  void saveBuilderFile(String *gatewayName) {
-    Printf(builderCode, "];\n");
-    Printf(builderCode, "ierr = 0;\n");
-    Printf(builderCode, "if ~isempty(table) then\n");
-    Printf(builderCode, "  ierr = execstr(\"ilib_build(''%s'', table, files, libs, [], ldflags, cflags);\", 'errcatch');\n", gatewayName);
-    Printf(builderCode, "  if ierr <> 0 then\n");
-    Printf(builderCode, "    err_msg = lasterror();\n");
-    Printf(builderCode, "  end\n");
-    Printf(builderCode, "end\n");
-    Printf(builderCode, "cd(originaldir);\n");
-    Printf(builderCode, "if ierr <> 0 then\n");
-    Printf(builderCode, "  error(ierr, err_msg);\n");
-    Printf(builderCode, "end\n");
-    Printv(builderFile, builderCode, NIL);
-    Delete(builderFile);
-  }
-
-  /* -----------------------------------------------------------------------
-   * createGatewayXMLFile()
-   * This XML file is used by Scilab in the context of internal modules
-   * ----------------------------------------------------------------------- */
-
-  void createGatewayXMLFile(String *gatewayName) {
-    String *gatewayXMLFilename = NewStringf("%s_gateway.xml", gatewayName);
-    gatewayXMLFile = NewFile(gatewayXMLFilename, "w", SWIG_output_files());
-    if (!gatewayXMLFile) {
-      FileErrorDisplay(gatewayXMLFilename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    // Add a slightly modified SWIG banner to the gateway XML ("--modify" is illegal in XML)
-    gatewayXML = NewString("");
-    Printf(gatewayXML, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
-    Printf(gatewayXML, "<!--\n");
-    Printf(gatewayXML, "This file was automatically generated by SWIG (http://www.swig.org).\n");
-    Printf(gatewayXML, "Version %s\n", Swig_package_version());
-    Printf(gatewayXML, "\n");
-    Printf(gatewayXML, "Do not make changes to this file unless you know what you are doing - modify\n");
-    Printf(gatewayXML, "the SWIG interface file instead.\n");
-    Printf(gatewayXML, "-->\n");
-    Printf(gatewayXML, "<GATEWAY name=\"%s\">\n", gatewayName);
-
-    primitiveID = 1;
-  }
-
-  /* -----------------------------------------------------------------------
-   * saveGatewayXMLFile()
-   * ----------------------------------------------------------------------- */
-
-  void saveGatewayXMLFile() {
-    Printf(gatewayXML, "</GATEWAY>\n");
-    Printv(gatewayXMLFile, gatewayXML, NIL);
-    Delete(gatewayXMLFile);
-  }
-
-  /* -----------------------------------------------------------------------
-   * startGatewayHeader()
-   * Start the gateway header
-   * ----------------------------------------------------------------------- */
-  void startGatewayHeader(String *gatewayLibraryName) {
-    gatewayHeader = NewString("");
-    Printf(gatewayHeader, "\n");
-
-    gatewayHeaderV6 = NewString("");
-    Printf(gatewayHeaderV6, "#include \"c_gateway_prototype.h\"\n");
-    Printf(gatewayHeaderV6, "#include \"addfunction.h\"\n");
-    Printf(gatewayHeaderV6, "\n");
-    Printf(gatewayHeaderV6, "#define MODULE_NAME L\"%s\"\n", gatewayLibraryName);
-    Printf(gatewayHeaderV6, "#ifdef __cplusplus\n");
-    Printf(gatewayHeaderV6, "extern \"C\"\n");
-    Printf(gatewayHeaderV6, "#endif\n");
-    Printf(gatewayHeaderV6, "int %s(wchar_t *pwstFuncName) {\n", gatewayLibraryName);
-    Printf(gatewayHeaderV6, "\n");
-  }
-
-  /* -----------------------------------------------------------------------
-   * addFunctionInGatewayHeader()
-   * Add a function in the gateway header
-   * ----------------------------------------------------------------------- */
-
-  void addFunctionInGatewayHeader(const_String_or_char_ptr scilabFunctionName, const_String_or_char_ptr wrapperFunctionName) {
-    if (gatewayHeaderV5 == NULL) {
-      gatewayHeaderV5 = NewString("");
-      Printf(gatewayHeaderV5, "static GenericTable Tab[] = {\n");
-    } else
-      Printf(gatewayHeaderV5, ",\n");
-    Printf(gatewayHeaderV5, " {(Myinterfun)sci_gateway, (GT)%s, (char *)\"%s\"}", wrapperFunctionName, scilabFunctionName);
-
-    Printf(gatewayHeaderV6, "if (wcscmp(pwstFuncName, L\"%s\") == 0) { addCStackFunction((wchar_t *)L\"%s\", &%s, (wchar_t *)MODULE_NAME); }\n", scilabFunctionName, scilabFunctionName, wrapperFunctionName);
-  }
-
-  /* -----------------------------------------------------------------------
-   * terminateGatewayHeader()
-   * Terminates the gateway header
-   * ----------------------------------------------------------------------- */
-
-  void terminateGatewayHeader(String *gatewayLibraryName) {
-    Printf(gatewayHeaderV5, "};\n");
-    Printf(gatewayHeaderV5, "\n");
-    Printf(gatewayHeaderV5, "#ifdef __cplusplus\n");
-    Printf(gatewayHeaderV5, "extern \"C\" {\n");
-    Printf(gatewayHeaderV5, "#endif\n");
-    Printf(gatewayHeaderV5, "int C2F(%s)() {\n", gatewayLibraryName);
-    Printf(gatewayHeaderV5, "  Rhs = Max(0, Rhs);\n");
-    Printf(gatewayHeaderV5, "  if (*(Tab[Fin-1].f) != NULL) {\n");
-    Printf(gatewayHeaderV5, "    if(pvApiCtx == NULL) {\n");
-    Printf(gatewayHeaderV5, "      pvApiCtx = (StrCtx *)MALLOC(sizeof(StrCtx));\n");
-    Printf(gatewayHeaderV5, "    }\n");
-    Printf(gatewayHeaderV5, "    pvApiCtx->pstName = (char *)Tab[Fin-1].name;\n");
-    Printf(gatewayHeaderV5, "    (*(Tab[Fin-1].f))(Tab[Fin-1].name,(GatefuncH)Tab[Fin-1].F);\n");
-    Printf(gatewayHeaderV5, "  }\n");
-    Printf(gatewayHeaderV5, "  return 0;\n");
-    Printf(gatewayHeaderV5, "}\n");
-    Printf(gatewayHeaderV5, "\n");
-    Printf(gatewayHeaderV5, "#ifdef __cplusplus\n");
-    Printf(gatewayHeaderV5, "}\n");
-    Printf(gatewayHeaderV5, "#endif\n");
-
-    Printf(gatewayHeaderV6, "return 1;\n");
-    Printf(gatewayHeaderV6, "};\n");
-
-    Printf(gatewayHeader, "#if SWIG_SCILAB_VERSION >= 600\n");
-    Printv(gatewayHeader, gatewayHeaderV6, NIL);
-    Printf(gatewayHeader, "#else\n");
-    Printv(gatewayHeader, gatewayHeaderV5, NIL);
-    Printf(gatewayHeader, "#endif\n");
-  }
-
-
-  /* -----------------------------------------------------------------------
-   * createLoaderScriptFile()
-   * Creates the loader script file (loader.sce)
-   * ----------------------------------------------------------------------- */
-
-  void createLoaderFile(String *gatewayLibraryName) {
-    String *loaderFilename = NewString("loader.sce");
-    loaderFile = NewFile(loaderFilename, "w", SWIG_output_files());
-    if (!loaderFile) {
-      FileErrorDisplay(loaderFilename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-    emitBanner(loaderFile);
-
-    loaderScript = NewString("");
-    Printf(loaderScript, "%s_path = get_absolute_file_path('loader.sce');\n", gatewayLibraryName);
-    Printf(loaderScript, "[bOK, ilib] = c_link('%s');\n", gatewayLibraryName);
-    Printf(loaderScript, "if bOK then\n");
-    Printf(loaderScript, "  ulink(ilib);\n");
-    Printf(loaderScript, "end\n");
-    Printf(loaderScript, "list_functions = [..\n");
-  }
-
-  /* -----------------------------------------------------------------------
-   * addFunctionInLoaderScript()
-   * Add a function in the loader script table
-   * ----------------------------------------------------------------------- */
-
-  void addFunctionInLoader(const_String_or_char_ptr scilabFunctionName) {
-    Printf(loaderScript, "  '%s'; ..\n", scilabFunctionName);
-  }
-
-  /* -----------------------------------------------------------------------
-   * saveLoaderScriptFile()
-   * Terminates and saves the loader script
-   * ----------------------------------------------------------------------- */
-
-  void saveLoaderFile(String *gatewayLibraryName) {
-    Printf(loaderScript, "];\n");
-    Printf(loaderScript, "addinter(fullfile(%s_path, '%s' + getdynlibext()), '%s', list_functions);\n",
-	   gatewayLibraryName, gatewayLibraryName, gatewayLibraryName);
-    Printf(loaderScript, "clear %s_path;\n", gatewayLibraryName);
-    Printf(loaderScript, "clear bOK;\n");
-    Printf(loaderScript, "clear ilib;\n");
-    Printf(loaderScript, "clear list_functions;\n");
-    Printv(loaderFile, loaderScript, NIL);
-
-    Delete(loaderFile);
-  }
-
-};
-
-extern "C" Language *swig_scilab(void) {
-  return new SCILAB();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/swigmain.cxx b/dependencies2013/win32/swig/Source/Modules/swigmain.cxx
deleted file mode 100644
index 397677fc..00000000
--- a/dependencies2013/win32/swig/Source/Modules/swigmain.cxx
+++ /dev/null
@@ -1,210 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigmain.cxx
- *
- * Simplified Wrapper and Interface Generator  (SWIG)
- *
- * This file is the main entry point to SWIG.  It collects the command
- * line options, registers built-in language modules, and instantiates
- * a module for code generation.   If adding new language modules
- * to SWIG, you would modify this file.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include <ctype.h>
-
-/* Module factories.  These functions are used to instantiate
-   the built-in language modules.    If adding a new language
-   module to SWIG, place a similar function here. Make sure
-   the function has "C" linkage.  This is required so that modules
-   can be dynamically loaded in future versions. */
-
-extern "C" {
-  Language *swig_tcl(void);
-  Language *swig_python(void);
-  Language *swig_perl5(void);
-  Language *swig_ruby(void);
-  Language *swig_guile(void);
-  Language *swig_modula3(void);
-  Language *swig_mzscheme(void);
-  Language *swig_java(void);
-  Language *swig_php(void);
-  Language *swig_php4(void);
-  Language *swig_php5(void);
-  Language *swig_ocaml(void);
-  Language *swig_octave(void);
-  Language *swig_pike(void);
-  Language *swig_sexp(void);
-  Language *swig_xml(void);
-  Language *swig_chicken(void);
-  Language *swig_csharp(void);
-  Language *swig_allegrocl(void);
-  Language *swig_lua(void);
-  Language *swig_clisp(void);
-  Language *swig_cffi(void);
-  Language *swig_uffi(void);
-  Language *swig_r(void);
-  Language *swig_scilab(void);
-  Language *swig_go(void);
-  Language *swig_d(void);
-  Language *swig_javascript(void);
-}
-
-struct swig_module {
-  const char *name;
-  ModuleFactory fac;
-  const char *help;
-};
-
-/* Association of command line options to language modules.
-   Place an entry for new language modules here, keeping the
-   list sorted alphabetically. */
-
-static swig_module modules[] = {
-  {"-allegrocl", swig_allegrocl, "ALLEGROCL"},
-  {"-chicken", swig_chicken, "CHICKEN"},
-  {"-clisp", swig_clisp, "CLISP"},
-  {"-cffi", swig_cffi, "CFFI"},
-  {"-csharp", swig_csharp, "C#"},
-  {"-d", swig_d, "D"},
-  {"-go", swig_go, "Go"},
-  {"-guile", swig_guile, "Guile"},
-  {"-java", swig_java, "Java"},
-  {"-javascript", swig_javascript, "Javascript"},
-  {"-lua", swig_lua, "Lua"},
-  {"-modula3", swig_modula3, "Modula 3"},
-  {"-mzscheme", swig_mzscheme, "Mzscheme"},
-  {"-ocaml", swig_ocaml, "Ocaml"},
-  {"-octave", swig_octave, "Octave"},
-  {"-perl", swig_perl5, "Perl"},
-  {"-perl5", swig_perl5, 0},
-  {"-php", swig_php5, 0},
-  {"-php4", swig_php4, 0},
-  {"-php5", swig_php5, "PHP5"},
-  {"-php7", swig_php, "PHP7"},
-  {"-pike", swig_pike, "Pike"},
-  {"-python", swig_python, "Python"},
-  {"-r", swig_r, "R (aka GNU S)"},
-  {"-ruby", swig_ruby, "Ruby"},
-  {"-scilab", swig_scilab, "Scilab"},
-  {"-sexp", swig_sexp, "Lisp S-Expressions"},
-  {"-tcl", swig_tcl, "Tcl"},
-  {"-tcl8", swig_tcl, 0},
-  {"-uffi", swig_uffi, "Common Lisp / UFFI"},
-  {"-xml", swig_xml, "XML"},
-  {NULL, NULL, NULL}
-};
-
-#ifdef MACSWIG
-#include <console.h>
-#include <SIOUX.h>
-#endif
-
-#ifndef SWIG_LANG
-#define SWIG_LANG "-python"
-#endif
-
-//-----------------------------------------------------------------
-// main()
-//
-// Main program.    Initializes the files and starts the parser.
-//-----------------------------------------------------------------
-
-void SWIG_merge_envopt(const char *env, int oargc, char *oargv[], int *nargc, char ***nargv) {
-  if (!env) {
-    *nargc = oargc;
-    *nargv = oargv;
-    return;
-  }
-
-  int argc = 1;
-  int arge = oargc + 1024;
-  char **argv = (char **) malloc(sizeof(char *) * (arge));
-  char *buffer = (char *) malloc(2048);
-  char *b = buffer;
-  char *be = b + 1023;
-  const char *c = env;
-  while ((b != be) && *c && (argc < arge)) {
-    while (isspace(*c) && *c)
-      ++c;
-    if (*c) {
-      argv[argc] = b;
-      ++argc;
-    }
-    while ((b != be) && *c && !isspace(*c)) {
-      *(b++) = *(c++);
-    }
-    *b++ = 0;
-  }
-
-  argv[0] = oargv[0];
-  for (int i = 1; (i < oargc) && (argc < arge); ++i, ++argc) {
-    argv[argc] = oargv[i];
-  }
-
-  *nargc = argc;
-  *nargv = argv;
-}
-
-int main(int margc, char **margv) {
-  int i;
-  Language *dl = 0;
-  ModuleFactory fac = 0;
-
-  int argc;
-  char **argv;
-
-  SWIG_merge_envopt(getenv("SWIG_FEATURES"), margc, margv, &argc, &argv);
-
-#ifdef MACSWIG
-  SIOUXSettings.asktosaveonclose = false;
-  argc = ccommand(&argv);
-#endif
-
-  /* Register built-in modules */
-  for (i = 0; modules[i].name; i++) {
-    Swig_register_module(modules[i].name, modules[i].fac);
-  }
-
-  Swig_init_args(argc, argv);
-
-  /* Get options */
-  for (i = 1; i < argc; i++) {
-    if (argv[i]) {
-      fac = Swig_find_module(argv[i]);
-      if (fac) {
-	dl = (fac) ();
-	Swig_mark_arg(i);
-      } else if (strcmp(argv[i], "-nolang") == 0) {
-	dl = new Language;
-	Swig_mark_arg(i);
-      } else if ((strcmp(argv[i], "-help") == 0) || (strcmp(argv[i], "--help") == 0)) {
-	if (strcmp(argv[i], "--help") == 0)
-	  strcpy(argv[i], "-help");
-	Printf(stdout, "Target Language Options\n");
-	for (int j = 0; modules[j].name; j++) {
-	  if (modules[j].help) {
-	    Printf(stdout, "     %-15s - Generate %s wrappers\n", modules[j].name, modules[j].help);
-	  }
-	}
-	// Swig_mark_arg not called as the general -help options also need to be displayed later on
-      }
-    }
-  }
-  if (!dl) {
-    fac = Swig_find_module(SWIG_LANG);
-    if (fac) {
-      dl = (fac) ();
-    }
-  }
-
-  int res = SWIG_main(argc, argv, dl);
-
-  return res;
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/swigmod.h b/dependencies2013/win32/swig/Source/Modules/swigmod.h
deleted file mode 100644
index 34763cc0..00000000
--- a/dependencies2013/win32/swig/Source/Modules/swigmod.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigmod.h
- *
- * Main header file for SWIG modules.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_SWIGMOD_H_
-#define SWIG_SWIGMOD_H_
-
-#include "swig.h"
-#include "preprocessor.h"
-#include "swigwarn.h"
-
-#define NOT_VIRTUAL     0
-#define PLAIN_VIRTUAL   1
-#define PURE_VIRTUAL    2
-
-extern String *input_file;
-extern int line_number;
-extern int start_line;
-extern int CPlusPlus;		// C++ mode
-extern int Extend;		// Extend mode
-extern int Verbose;
-extern int IsVirtual;
-extern int ImportMode;
-extern int NoExcept;		// -no_except option
-extern int Abstract;		// abstract base class
-extern int SmartPointer;	// smart pointer methods being emitted
-extern int SwigRuntime;
-
-/* Overload "argc" and "argv" */
-extern String *argv_template_string;
-extern String *argc_template_string;
-
-/* Miscellaneous stuff */
-
-#define  tab2   "  "
-#define  tab4   "    "
-#define  tab8   "        "
-
-class Dispatcher {
-public:
-
-  Dispatcher ():cplus_mode(PUBLIC) {
-  }
-  virtual ~ Dispatcher () {
-  }
-
-  virtual int emit_one(Node *n);
-  virtual int emit_children(Node *n);
-  virtual int defaultHandler(Node *n);
-
-  /* Top of the parse tree */
-  virtual int top(Node *n) = 0;
-
-  /* SWIG directives */
-
-  virtual int applyDirective(Node *n);
-  virtual int clearDirective(Node *n);
-  virtual int constantDirective(Node *n);
-  virtual int extendDirective(Node *n);
-  virtual int fragmentDirective(Node *n);
-  virtual int importDirective(Node *n);
-  virtual int includeDirective(Node *n);
-  virtual int insertDirective(Node *n);
-  virtual int moduleDirective(Node *n);
-  virtual int nativeDirective(Node *n);
-  virtual int pragmaDirective(Node *n);
-  virtual int typemapDirective(Node *n);
-  virtual int typemapitemDirective(Node *n);
-  virtual int typemapcopyDirective(Node *n);
-  virtual int typesDirective(Node *n);
-
-  /* C/C++ parsing */
-
-  virtual int cDeclaration(Node *n);
-  virtual int externDeclaration(Node *n);
-  virtual int enumDeclaration(Node *n);
-  virtual int enumvalueDeclaration(Node *n);
-  virtual int enumforwardDeclaration(Node *n);
-  virtual int classDeclaration(Node *n);
-  virtual int classforwardDeclaration(Node *n);
-  virtual int constructorDeclaration(Node *n);
-  virtual int destructorDeclaration(Node *n);
-  virtual int accessDeclaration(Node *n);
-  virtual int usingDeclaration(Node *n);
-  virtual int namespaceDeclaration(Node *n);
-  virtual int templateDeclaration(Node *n);
-  virtual int lambdaDeclaration(Node *n);
-
-  enum AccessMode { PUBLIC, PRIVATE, PROTECTED };
-
-protected:
-  AccessMode cplus_mode;
-};
-
-/* ----------------------------------------------------------------------------
- * class language:
- *
- * This class defines the functions that need to be supported by the
- * scripting language being used.    The translator calls these virtual
- * functions to output different types of code for different languages.
- * ------------------------------------------------------------------------- */
-
-class Language:public Dispatcher {
-public:
-  Language();
-  virtual ~Language();
-  virtual int emit_one(Node *n);
-
-  String *directorClassName(Node *n);
-
-  /* Parse command line options */
-
-  virtual void main(int argc, char *argv[]);
-
-  /* Top of the parse tree */
-
-  virtual int top(Node *n);
-
-  /* SWIG directives */
-
-
-  virtual int applyDirective(Node *n);
-  virtual int clearDirective(Node *n);
-  virtual int constantDirective(Node *n);
-  virtual int extendDirective(Node *n);
-  virtual int fragmentDirective(Node *n);
-  virtual int importDirective(Node *n);
-  virtual int includeDirective(Node *n);
-  virtual int insertDirective(Node *n);
-  virtual int moduleDirective(Node *n);
-  virtual int nativeDirective(Node *n);
-  virtual int pragmaDirective(Node *n);
-  virtual int typemapDirective(Node *n);
-  virtual int typemapcopyDirective(Node *n);
-  virtual int typesDirective(Node *n);
-
-  /* C/C++ parsing */
-
-  virtual int cDeclaration(Node *n);
-  virtual int externDeclaration(Node *n);
-  virtual int enumDeclaration(Node *n);
-  virtual int enumvalueDeclaration(Node *n);
-  virtual int enumforwardDeclaration(Node *n);
-  virtual int classDeclaration(Node *n);
-  virtual int classforwardDeclaration(Node *n);
-  virtual int constructorDeclaration(Node *n);
-  virtual int destructorDeclaration(Node *n);
-  virtual int accessDeclaration(Node *n);
-  virtual int namespaceDeclaration(Node *n);
-  virtual int usingDeclaration(Node *n);
-
-  /* Function handlers */
-
-  virtual int functionHandler(Node *n);
-  virtual int globalfunctionHandler(Node *n);
-  virtual int memberfunctionHandler(Node *n);
-  virtual int staticmemberfunctionHandler(Node *n);
-  virtual int callbackfunctionHandler(Node *n);
-
-  /* Variable handlers */
-
-  virtual int variableHandler(Node *n);
-  virtual int globalvariableHandler(Node *n);
-  virtual int membervariableHandler(Node *n);
-  virtual int staticmembervariableHandler(Node *n);
-
-  /* C++ handlers */
-
-  virtual int memberconstantHandler(Node *n);
-  virtual int constructorHandler(Node *n);
-  virtual int copyconstructorHandler(Node *n);
-  virtual int destructorHandler(Node *n);
-  virtual int classHandler(Node *n);
-
-  /* Miscellaneous */
-
-  virtual int typedefHandler(Node *n);
-
-  /* Low-level code generation */
-
-  virtual int constantWrapper(Node *n);
-  virtual int variableWrapper(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int nativeWrapper(Node *n);
-
-  /* C++ director class generation */
-  virtual int classDirector(Node *n);
-  virtual int classDirectorInit(Node *n);
-  virtual int classDirectorEnd(Node *n);
-  virtual int unrollVirtualMethods(Node *n, Node *parent, List *vm, int default_director, int &virtual_destructor, int protectedbase = 0);
-  virtual int classDirectorConstructor(Node *n);
-  virtual int classDirectorDefaultConstructor(Node *n);
-  virtual int classDirectorMethod(Node *n, Node *parent, String *super);
-  virtual int classDirectorConstructors(Node *n);
-  virtual int classDirectorDestructor(Node *n);
-  virtual int classDirectorMethods(Node *n);
-  virtual int classDirectorDisown(Node *n);
-
-  /* Miscellaneous */
-  virtual int validIdentifier(String *s);	/* valid identifier? */
-  virtual int addSymbol(const String *s, const Node *n, const_String_or_char_ptr scope = "");	/* Add symbol        */
-  virtual int addInterfaceSymbol(const String *interface_name, Node *n, const_String_or_char_ptr scope = "");
-  virtual void dumpSymbols();
-  virtual Node *symbolLookup(const String *s, const_String_or_char_ptr scope = ""); /* Symbol lookup */
-  virtual Hash* symbolAddScope(const_String_or_char_ptr scope);
-  virtual Hash* symbolScopeLookup(const_String_or_char_ptr scope);
-  virtual Hash* symbolScopePseudoSymbolLookup(const_String_or_char_ptr scope);
-  virtual Node *classLookup(const SwigType *s) const; /* Class lookup      */
-  virtual Node *enumLookup(SwigType *s);	/* Enum lookup       */
-  virtual int abstractClassTest(Node *n);	/* Is class really abstract? */
-  virtual int is_assignable(Node *n);	/* Is variable assignable? */
-  virtual String *runtimeCode();	/* returns the language specific runtime code */
-  virtual String *defaultExternalRuntimeFilename();	/* the default filename for the external runtime */
-  virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm); /* Language specific special variable substitutions for $typemap() */
-
-  /* Runtime is C++ based, so extern "C" header section */
-  void enable_cplus_runtime_mode();
-
-  /* Returns the cplus_runtime mode */
-  int cplus_runtime_mode();
-
-  /* Allow director related code generation */
-  void allow_directors(int val = 1);
-
-  /* Return true if directors are enabled */
-  int directorsEnabled() const;
-
-  /* Allow director protected members related code generation */
-  void allow_dirprot(int val = 1);
-
-  /* Allow all protected members code generation (for directors) */
-  void allow_allprotected(int val = 0);
-
-  /* Returns the dirprot mode */
-  int dirprot_mode() const;
-
-  /* Check if the non public constructor is  needed (for directors) */
-  int need_nonpublic_ctor(Node *n);
-
-  /* Check if the non public member is  needed (for directors) */
-  int need_nonpublic_member(Node *n);
-
-  /* Set none comparison string */
-  void setSubclassInstanceCheck(String *s);
-
-  /* Set overload variable templates argc and argv */
-  void setOverloadResolutionTemplates(String *argc, String *argv);
-
-  /* Language instance is a singleton - get instance */
-  static Language* instance();
-
-protected:
-  /* Allow multiple-input typemaps */
-  void allow_multiple_input(int val = 1);
-
-  /* Allow overloaded functions */
-  void allow_overloading(int val = 1);
-
-  /* Wrapping class query */
-  int is_wrapping_class() const;
-
-  /* Return the node for the current class */
-  Node *getCurrentClass() const;
-
-  /* Return C++ mode */
-  int getCPlusMode() const;
-
-  /* Return the namespace for the class/enum - the nspace feature */
-  String *getNSpace() const;
-
-  /* Return the real name of the current class */
-  String *getClassName() const;
-
-  /* Return the classes hash */
-  Hash *getClassHash() const;
-
-  /* Return the current class prefix */
-  String *getClassPrefix() const;
-
-  /* Return the current enum class prefix */
-  String *getEnumClassPrefix() const;
-
-  /* Fully qualified type name to use */
-  String *getClassType() const;
-
-  /* Return true if the current method is part of a smart-pointer */
-  int is_smart_pointer() const;
-
-  /* Return the name to use for the given parameter. */
-  virtual String *makeParameterName(Node *n, Parm *p, int arg_num, bool setter = false) const;
-
-  /* Some language modules require additional wrappers for virtual methods not declared in sub-classes */
-  virtual bool extraDirectorProtectedCPPMethodsRequired() const;
-
-public:
-  enum NestedClassSupport {
-    NCS_None, // Target language does not have an equivalent to nested classes
-    NCS_Full, // Target language does have an equivalent to nested classes and is fully implemented
-    NCS_Unknown // Target language may or may not have an equivalent to nested classes. If it does, it has not been implemented yet.
-  };
-  /* Does target language support nested classes? Default is NCS_Unknown. 
-    If NCS_Unknown is returned, then the nested classes will be ignored unless 
-    %feature "flatnested" is applied to them, in which case they will appear in global space.
-    If the target language does not support the notion of class
-    nesting, the language module should return NCS_None from this function, and 
-    the nested classes will be moved to the global scope (like implicit global %feature "flatnested").
-  */
-  virtual NestedClassSupport nestedClassesSupport() const;
-
-  /* Returns true if the target language supports key word arguments (kwargs) */
-  virtual bool kwargsSupport() const;
-
-protected:
-  /* Identifies if a protected members that are generated when the allprotected option is used.
-     This does not include protected virtual methods as they are turned on with the dirprot option. */
-  bool isNonVirtualProtectedAccess(Node *n) const;
-
-  /* Identify if a wrapped global or member variable n should use the naturalvar feature */
-  int use_naturalvar_mode(Node *n) const;
-
-  /* Director subclass comparison test */
-  String *none_comparison;
-
-  /* Director constructor "template" code */
-  String *director_ctor_code;
-
-  /* Director 'protected' constructor "template" code */
-  String *director_prot_ctor_code;
-
-  /* Director allows multiple inheritance */
-  int director_multiple_inheritance;
-
-  /* Director language module */
-  int director_language;
-
-private:
-  Hash *symtabs; /* symbol tables */
-  Hash *classtypes;
-  Hash *enumtypes;
-  int overloading;
-  int multiinput;
-  int cplus_runtime;
-  int directors;
-  static Language *this_;
-};
-
-int SWIG_main(int, char **, Language *);
-void emit_parameter_variables(ParmList *l, Wrapper *f);
-void emit_return_variable(Node *n, SwigType *rt, Wrapper *f);
-void SWIG_exit(int);		/* use EXIT_{SUCCESS,FAILURE} */
-void SWIG_config_file(const_String_or_char_ptr );
-const String *SWIG_output_directory();
-void SWIG_config_cppext(const char *ext);
-void Swig_print_xml(Node *obj, String *filename);
-
-/* get the list of generated files */
-List *SWIG_output_files();
-
-void SWIG_library_directory(const char *);
-int emit_num_arguments(ParmList *);
-int emit_num_required(ParmList *);
-int emit_isvarargs(ParmList *);
-void emit_attach_parmmaps(ParmList *, Wrapper *f);
-void emit_mark_varargs(ParmList *l);
-String *emit_action(Node *n);
-int emit_action_code(Node *n, String *wrappercode, String *action);
-void Swig_overload_check(Node *n);
-String *Swig_overload_dispatch(Node *n, const_String_or_char_ptr fmt, int *);
-String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int *);
-String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int *);
-List *Swig_overload_rank(Node *n, bool script_lang_wrapping);
-SwigType *cplus_value_type(SwigType *t);
-
-/* directors.cxx start */
-String *Swig_csuperclass_call(String *base, String *method, ParmList *l);
-String *Swig_class_declaration(Node *n, String *name);
-String *Swig_class_name(Node *n);
-String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms);
-String *Swig_method_decl(SwigType *rtype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values);
-String *Swig_director_declaration(Node *n);
-void Swig_director_emit_dynamic_cast(Node *n, Wrapper *f);
-void Swig_director_parms_fixup(ParmList *parms);
-/* directors.cxx end */
-
-extern "C" {
-  void SWIG_typemap_lang(const char *);
-  typedef Language *(*ModuleFactory) (void);
-} 
-
-void Swig_register_module(const char *name, ModuleFactory fac);
-ModuleFactory Swig_find_module(const char *name);
-
-/* Utilities */
-
-int is_public(Node *n);
-int is_private(Node *n);
-int is_protected(Node *n);
-int is_member_director(Node *parentnode, Node *member);
-int is_member_director(Node *member);
-int is_non_virtual_protected_access(Node *n); /* Check if the non-virtual protected members are required (for directors) */
-
-void Wrapper_virtual_elimination_mode_set(int);
-void Wrapper_fast_dispatch_mode_set(int);
-void Wrapper_cast_dispatch_mode_set(int);
-void Wrapper_naturalvar_mode_set(int);
-
-void clean_overloaded(Node *n);
-
-extern "C" {
-  const char *Swig_to_string(DOH *object, int count = -1);
-  const char *Swig_to_string_with_location(DOH *object, int count = -1);
-  void Swig_print(DOH *object, int count = -1);
-  void Swig_print_with_location(DOH *object, int count = -1);
-}
-
-/* Contracts */
-void Swig_contracts(Node *n);
-void Swig_contract_mode_set(int flag);
-int Swig_contract_mode_get();
-
-/* Browser */
-void Swig_browser(Node *n, int);
-void Swig_default_allocators(Node *n);
-void Swig_process_types(Node *n);
-
-/* Nested classes */
-void Swig_nested_process_classes(Node *n);
-void Swig_nested_name_unnamed_c_structs(Node *n);
-
-/* Interface feature */
-void Swig_interface_feature_enable();
-void Swig_interface_propagate_methods(Node *n);
-
-/* Miscellaneous */
-template <class T> class save_value {
-  T _value;
-  T& _value_ptr;
-  save_value(const save_value&);
-  save_value& operator=(const save_value&);
-
-public:
-  save_value(T& value) : _value(value), _value_ptr(value) {}
-  save_value(T& value, T new_val) : _value(value), _value_ptr(value) { value = new_val; }
-  ~save_value() { _value_ptr = _value; }
-};
-
-#endif
diff --git a/dependencies2013/win32/swig/Source/Modules/tcl8.cxx b/dependencies2013/win32/swig/Source/Modules/tcl8.cxx
deleted file mode 100644
index 1227af79..00000000
--- a/dependencies2013/win32/swig/Source/Modules/tcl8.cxx
+++ /dev/null
@@ -1,1314 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * tcl8.cxx
- *
- * Tcl8 language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-
-static const char *usage = "\
-Tcl 8 Options (available with -tcl)\n\
-     -itcl           - Enable ITcl support\n\
-     -nosafe         - Leave out SafeInit module function.\n\
-     -prefix <name>  - Set a prefix <name> to be prepended to all names\n\
-     -namespace      - Build module into a Tcl 8 namespace\n\
-     -pkgversion     - Set package version\n\n";
-
-static String *cmd_tab = 0;	/* Table of command names    */
-static String *var_tab = 0;	/* Table of global variables */
-static String *const_tab = 0;	/* Constant table            */
-static String *methods_tab = 0;	/* Methods table             */
-static String *attr_tab = 0;	/* Attribute table           */
-static String *prefix = 0;
-static String *module = 0;
-static int namespace_option = 0;
-static String *init_name = 0;
-static String *ns_name = 0;
-static int have_constructor;
-static String *constructor_name;
-static int have_destructor;
-static int have_base_classes;
-static String *destructor_action = 0;
-static String *version = (String *) "0.0";
-static String *class_name = 0;
-
-static int have_attributes;
-static int have_methods;
-static int nosafe = 0;
-
-static File *f_header = 0;
-static File *f_wrappers = 0;
-static File *f_init = 0;
-static File *f_begin = 0;
-static File *f_runtime = 0;
-
-
-//  Itcl support
-static int itcl = 0;
-static File *f_shadow = 0;
-static File *f_shadow_stubs = 0;
-
-static String *constructor = 0;
-static String *destructor = 0;
-static String *base_classes = 0;
-static String *base_class_init = 0;
-static String *methods = 0;
-static String *imethods = 0;
-static String *attributes = 0;
-static String *attribute_traces = 0;
-static String *iattribute_traces = 0;
-
-
-
-class TCL8:public Language {
-public:
-
-  /* ------------------------------------------------------------
-   * TCL8::main()
-   * ------------------------------------------------------------ */
-
-  virtual void main(int argc, char *argv[]) {
-    int cppcast = 1;
-
-     SWIG_library_directory("tcl");
-
-    for (int i = 1; i < argc; i++) {
-      if (argv[i]) {
-	if (strcmp(argv[i], "-prefix") == 0) {
-	  if (argv[i + 1]) {
-	    prefix = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  } else
-	     Swig_arg_error();
-	} else if (strcmp(argv[i], "-pkgversion") == 0) {
-	  if (argv[i + 1]) {
-	    version = NewString(argv[i + 1]);
-	    Swig_mark_arg(i);
-	    Swig_mark_arg(i + 1);
-	    i++;
-	  }
-	} else if (strcmp(argv[i], "-namespace") == 0) {
-	  namespace_option = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-itcl") == 0) {
-	  itcl = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nosafe") == 0) {
-	  nosafe = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-cppcast") == 0) {
-	  cppcast = 1;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-nocppcast") == 0) {
-	  cppcast = 0;
-	  Swig_mark_arg(i);
-	} else if (strcmp(argv[i], "-help") == 0) {
-	  fputs(usage, stdout);
-	}
-      }
-    }
-
-    if (cppcast) {
-      Preprocessor_define((DOH *) "SWIG_CPLUSPLUS_CAST", 0);
-    }
-
-    Preprocessor_define("SWIGTCL 1", 0);
-    // SWIGTCL8 is deprecated, and no longer documented.
-    Preprocessor_define("SWIGTCL8 1", 0);
-    SWIG_typemap_lang("tcl8");
-    SWIG_config_file("tcl8.swg");
-    allow_overloading();
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-
-    /* Initialize all of the output files */
-    String *outfile = Getattr(n, "outfile");
-
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
-      FileErrorDisplay(outfile);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
-
-    /* Register file targets with the SWIG file handler */
-    Swig_register_filebyname("header", f_header);
-    Swig_register_filebyname("wrapper", f_wrappers);
-    Swig_register_filebyname("begin", f_begin);
-    Swig_register_filebyname("runtime", f_runtime);
-    Swig_register_filebyname("init", f_init);
-
-    /* Initialize some variables for the object interface */
-
-    cmd_tab = NewString("");
-    var_tab = NewString("");
-    methods_tab = NewString("");
-    const_tab = NewString("");
-
-    Swig_banner(f_begin);
-
-    Printf(f_runtime, "\n\n#ifndef SWIGTCL\n#define SWIGTCL\n#endif\n\n");
-
-    /* Set the module name, namespace, and prefix */
-
-    module = NewStringf("%(lower)s", Getattr(n, "name"));
-    init_name = NewStringf("%(title)s_Init", module);
-
-    ns_name = prefix ? Copy(prefix) : Copy(module);
-    if (prefix)
-      Append(prefix, "_");
-
-
-    /* If shadow classing is enabled, we're going to change the module name to "_module" */
-    if (itcl) {
-      String *filen;
-      filen = NewStringf("%s%s.itcl", SWIG_output_directory(), module);
-
-      Insert(module, 0, "_");
-
-      if ((f_shadow = NewFile(filen, "w", SWIG_output_files())) == 0) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      f_shadow_stubs = NewString("");
-
-      Swig_register_filebyname("shadow", f_shadow);
-      Swig_register_filebyname("itcl", f_shadow);
-
-      Swig_banner_target_lang(f_shadow, "#");
-
-      Printv(f_shadow, "\npackage require Itcl\n\n", NIL);
-      Delete(filen);
-    }
-
-    /* Generate some macros used throughout code generation */
-
-    Printf(f_header, "#define SWIG_init    %s\n", init_name);
-    Printf(f_header, "#define SWIG_name    \"%s\"\n", module);
-    if (namespace_option) {
-      Printf(f_header, "#define SWIG_prefix  \"%s::\"\n", ns_name);
-      Printf(f_header, "#define SWIG_namespace \"%s\"\n\n", ns_name);
-    } else {
-      Printf(f_header, "#define SWIG_prefix  \"%s\"\n", prefix);
-    }
-    Printf(f_header, "#define SWIG_version \"%s\"\n", version);
-
-    Printf(cmd_tab, "\nstatic swig_command_info swig_commands[] = {\n");
-    Printf(var_tab, "\nstatic swig_var_info swig_variables[] = {\n");
-    Printf(const_tab, "\nstatic swig_const_info swig_constants[] = {\n");
-
-    Printf(f_wrappers, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
-
-    /* Start emitting code */
-    Language::top(n);
-
-    /* Done.  Close up the module */
-    Printv(cmd_tab, tab4, "{0, 0, 0}\n", "};\n", NIL);
-    Printv(var_tab, tab4, "{0,0,0,0}\n", "};\n", NIL);
-    Printv(const_tab, tab4, "{0,0,0,0,0,0}\n", "};\n", NIL);
-
-    Printv(f_wrappers, cmd_tab, var_tab, const_tab, NIL);
-
-    /* Dump the pointer equivalency table */
-    SwigType_emit_type_table(f_runtime, f_wrappers);
-
-    Printf(f_wrappers, "#ifdef __cplusplus\n}\n#endif\n");
-
-    /* Close the init function and quit */
-    Printf(f_init, "return TCL_OK;\n}\n");
-
-    if (!nosafe) {
-      Printf(f_init, "SWIGEXPORT int %(title)s_SafeInit(Tcl_Interp *interp) {\n", module);
-      Printf(f_init, "    return SWIG_init(interp);\n");
-      Printf(f_init, "}\n");
-    }
-
-    if (itcl) {
-      Printv(f_shadow, f_shadow_stubs, "\n", NIL);
-      Delete(f_shadow);
-    }
-
-    /* Close all of the files */
-    Dump(f_runtime, f_begin);
-    Printv(f_begin, f_header, f_wrappers, NIL);
-    Wrapper_pretty_print(f_init, f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_init);
-    Delete(f_runtime);
-    Delete(f_begin);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * functionWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int functionWrapper(Node *n) {
-    String *name = Getattr(n, "name");	/* Like to get rid of this */
-    String *iname = Getattr(n, "sym:name");
-    SwigType *type = Getattr(n, "type");
-    ParmList *parms = Getattr(n, "parms");
-    String *overname = 0;
-
-    Parm *p;
-    int i;
-    String *tm;
-    Wrapper *f;
-    String *incode, *cleanup, *outarg, *argstr, *args;
-    int num_arguments = 0;
-    int num_required = 0;
-    int varargs = 0;
-
-    char source[64];
-
-    if (Getattr(n, "sym:overloaded")) {
-      overname = Getattr(n, "sym:overname");
-    } else {
-      if (!addSymbol(iname, n))
-	return SWIG_ERROR;
-    }
-
-    incode = NewString("");
-    cleanup = NewString("");
-    outarg = NewString("");
-    argstr = NewString("\"");
-    args = NewString("");
-
-    f = NewWrapper();
-
-#ifdef SWIG_USE_RESULTOBJ
-    Wrapper_add_local(f, "resultobj", "Tcl_Obj *resultobj = NULL");
-#endif
-
-
-    String *wname = Swig_name_wrapper(iname);
-    if (overname) {
-      Append(wname, overname);
-    }
-    Setattr(n, "wrap:name", wname);
-
-    Printv(f->def, "SWIGINTERN int\n ", wname, "(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {", NIL);
-
-    // Emit all of the local variables for holding arguments.
-    emit_parameter_variables(parms, f);
-
-    /* Attach standard typemaps */
-    emit_attach_parmmaps(parms, f);
-    Setattr(n, "wrap:parms", parms);
-
-    /* Get number of require and total arguments */
-    num_arguments = emit_num_arguments(parms);
-    num_required = emit_num_required(parms);
-    varargs = emit_isvarargs(parms);
-
-    /* Unmarshal parameters */
-
-    for (i = 0, p = parms; i < num_arguments; i++) {
-      /* Skip ignored arguments */
-
-      while (checkAttribute(p, "tmap:in:numinputs", "0")) {
-	p = Getattr(p, "tmap:in:next");
-      }
-
-      SwigType *pt = Getattr(p, "type");
-      String *ln = Getattr(p, "lname");
-
-      /* Produce string representations of the source and target arguments */
-      sprintf(source, "objv[%d]", i + 1);
-
-      if (i == num_required)
-	Putc('|', argstr);
-      if ((tm = Getattr(p, "tmap:in"))) {
-	String *parse = Getattr(p, "tmap:in:parse");
-	if (!parse) {
-	  Replaceall(tm, "$target", ln);
-	  Replaceall(tm, "$source", source);
-	  Replaceall(tm, "$input", source);
-	  Setattr(p, "emit:input", source);
-
-	  if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
-	    Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
-	  } else {
-	    Replaceall(tm, "$disown", "0");
-	  }
-
-	  Putc('o', argstr);
-	  Printf(args, ",(void *)0");
-	  if (i >= num_required) {
-	    Printf(incode, "if (objc > %d) {\n", i + 1);
-	  }
-	  Printf(incode, "%s\n", tm);
-	  if (i >= num_required) {
-	    Printf(incode, "}\n");
-	  }
-	} else {
-	  Printf(argstr, "%s", parse);
-	  Printf(args, ",&%s", ln);
-	  if (Strcmp(parse, "p") == 0) {
-	    SwigType *lt = SwigType_ltype(pt);
-	    SwigType_remember(pt);
-	    if (Cmp(lt, "p.void") == 0) {
-	      Printf(args, ",(void *)0");
-	    } else {
-	      Printf(args, ",SWIGTYPE%s", SwigType_manglestr(pt));
-	    }
-	    Delete(lt);
-	  }
-	}
-	p = Getattr(p, "tmap:in:next");
-	continue;
-      } else {
-	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
-      }
-      p = nextSibling(p);
-    }
-
-    if (!varargs) {
-      Putc(':', argstr);
-    } else {
-      Putc(';', argstr);
-      /* If variable length arguments we need to emit the in typemap here */
-      if (p && (tm = Getattr(p, "tmap:in"))) {
-	sprintf(source, "objv[%d]", i + 1);
-	Printf(incode, "if (objc > %d) {\n", i);
-	Replaceall(tm, "$input", source);
-	Printv(incode, tm, "\n", NIL);
-	Printf(incode, "}\n");
-      }
-    }
-
-    Printf(argstr, "%s\"", usage_string(Char(iname), type, parms));
-
-    Printv(f->code, "if (SWIG_GetArgs(interp, objc, objv,", argstr, args, ") == TCL_ERROR) SWIG_fail;\n", NIL);
-
-    Printv(f->code, incode, NIL);
-
-    /* Insert constraint checking code */
-    for (p = parms; p;) {
-      if ((tm = Getattr(p, "tmap:check"))) {
-	Replaceall(tm, "$target", Getattr(p, "lname"));
-	Printv(f->code, tm, "\n", NIL);
-	p = Getattr(p, "tmap:check:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert cleanup code */
-    for (i = 0, p = parms; p; i++) {
-      if (!checkAttribute(p, "tmap:in:numinputs", "0")
-	  && !Getattr(p, "tmap:in:parse") && (tm = Getattr(p, "tmap:freearg"))) {
-	if (Len(tm) != 0) {
-	  Replaceall(tm, "$source", Getattr(p, "lname"));
-	  Printv(cleanup, tm, "\n", NIL);
-	}
-	p = Getattr(p, "tmap:freearg:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Insert argument output code */
-    for (i = 0, p = parms; p; i++) {
-      if ((tm = Getattr(p, "tmap:argout"))) {
-	Replaceall(tm, "$source", Getattr(p, "lname"));
-#ifdef SWIG_USE_RESULTOBJ
-	Replaceall(tm, "$target", "resultobj");
-	Replaceall(tm, "$result", "resultobj");
-#else
-	Replaceall(tm, "$target", "(Tcl_GetObjResult(interp))");
-	Replaceall(tm, "$result", "(Tcl_GetObjResult(interp))");
-#endif
-	Replaceall(tm, "$arg", Getattr(p, "emit:input"));
-	Replaceall(tm, "$input", Getattr(p, "emit:input"));
-	Printv(outarg, tm, "\n", NIL);
-	p = Getattr(p, "tmap:argout:next");
-      } else {
-	p = nextSibling(p);
-      }
-    }
-
-    /* Now write code to make the function call */
-    String *actioncode = emit_action(n);
-
-    /* Need to redo all of this code (eventually) */
-
-    /* Return value if necessary  */
-    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-#ifdef SWIG_USE_RESULTOBJ
-      Replaceall(tm, "$target", "resultobj");
-      Replaceall(tm, "$result", "resultobj");
-#else
-      Replaceall(tm, "$target", "(Tcl_GetObjResult(interp))");
-      Replaceall(tm, "$result", "(Tcl_GetObjResult(interp))");
-#endif
-      if (GetFlag(n, "feature:new")) {
-	Replaceall(tm, "$owner", "SWIG_POINTER_OWN");
-      } else {
-	Replaceall(tm, "$owner", "0");
-      }
-      Printf(f->code, "%s\n", tm);
-    } else {
-      Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), name);
-    }
-    emit_return_variable(n, type, f);
-
-    /* Dump output argument code */
-    Printv(f->code, outarg, NIL);
-
-    /* Dump the argument cleanup code */
-    Printv(f->code, cleanup, NIL);
-
-    /* Look for any remaining cleanup */
-    if (GetFlag(n, "feature:new")) {
-      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
-	Replaceall(tm, "$source", Swig_cresult_name());
-	Printf(f->code, "%s\n", tm);
-      }
-    }
-
-    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
-      Replaceall(tm, "$source", Swig_cresult_name());
-      Printf(f->code, "%s\n", tm);
-    }
-#ifdef SWIG_USE_RESULTOBJ
-    Printv(f->code, "if (resultobj) Tcl_SetObjResult(interp, resultobj);\n", NIL);
-#endif
-    Printv(f->code, "return TCL_OK;\n", NIL);
-    Printv(f->code, "fail:\n", cleanup, "return TCL_ERROR;\n", NIL);
-    Printv(f->code, "}\n", NIL);
-
-    /* Substitute the cleanup code */
-    Replaceall(f->code, "$cleanup", cleanup);
-    Replaceall(f->code, "$symname", iname);
-
-    /* Dump out the function */
-    Wrapper_print(f, f_wrappers);
-
-    if (!Getattr(n, "sym:overloaded")) {
-      /* Register the function with Tcl */
-      Printv(cmd_tab, tab4, "{ SWIG_prefix \"", iname, "\", (swig_wrapper_func) ", Swig_name_wrapper(iname), ", NULL},\n", NIL);
-    } else {
-      if (!Getattr(n, "sym:nextSibling")) {
-	/* Emit overloading dispatch function */
-
-	int maxargs;
-	String *dispatch = Swig_overload_dispatch(n, "return %s(clientData, interp, objc, argv - 1);", &maxargs);
-
-	/* Generate a dispatch wrapper for all overloaded functions */
-
-	Wrapper *df = NewWrapper();
-	String *dname = Swig_name_wrapper(iname);
-
-	Printv(df->def, "SWIGINTERN int\n", dname, "(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {", NIL);
-	Printf(df->code, "Tcl_Obj *CONST *argv = objv+1;\n");
-	Printf(df->code, "int argc = objc-1;\n");
-	Printv(df->code, dispatch, "\n", NIL);
-	Node *sibl = n;
-	while (Getattr(sibl, "sym:previousSibling"))
-	  sibl = Getattr(sibl, "sym:previousSibling");	// go all the way up
-	String *protoTypes = NewString("");
-	do {
-	  String *fulldecl = Swig_name_decl(sibl);
-	  Printf(protoTypes, "\n\"    %s\\n\"", fulldecl);
-	  Delete(fulldecl);
-	} while ((sibl = Getattr(sibl, "sym:nextSibling")));
-	Printf(df->code, "Tcl_SetResult(interp,(char *) "
-	       "\"Wrong number or type of arguments for overloaded function '%s'.\\n\""
-	       "\n\"  Possible C/C++ prototypes are:\\n\"%s, TCL_STATIC);\n", iname, protoTypes);
-	Delete(protoTypes);
-	Printf(df->code, "return TCL_ERROR;\n");
-	Printv(df->code, "}\n", NIL);
-	Wrapper_print(df, f_wrappers);
-	Printv(cmd_tab, tab4, "{ SWIG_prefix \"", iname, "\", (swig_wrapper_func) ", dname, ", NULL},\n", NIL);
-	DelWrapper(df);
-	Delete(dispatch);
-	Delete(dname);
-      }
-    }
-
-    Delete(incode);
-    Delete(cleanup);
-    Delete(outarg);
-    Delete(argstr);
-    Delete(args);
-    DelWrapper(f);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * variableWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int variableWrapper(Node *n) {
-
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    SwigType *t = Getattr(n, "type");
-
-    String *setname = 0;
-    String *setfname = 0;
-    Wrapper *setf = 0, *getf = 0;
-    int readonly = 0;
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-
-    /* Create a function for getting a variable */
-    int addfail = 0;
-    getf = NewWrapper();
-    String *getname = Swig_name_get(NSPACE_TODO, iname);
-    String *getfname = Swig_name_wrapper(getname);
-    Setattr(n, "wrap:name", getfname);
-    Printv(getf->def, "SWIGINTERN const char *", getfname, "(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, char *name1, char *name2, int flags) {", NIL);
-    Wrapper_add_local(getf, "value", "Tcl_Obj *value = 0");
-    if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
-      Replaceall(tm, "$source", name);
-      Replaceall(tm, "$target", "value");
-      Replaceall(tm, "$result", "value");
-      /* Printf(getf->code, "%s\n",tm); */
-      addfail = emit_action_code(n, getf->code, tm);
-      Printf(getf->code, "if (value) {\n");
-      Printf(getf->code, "Tcl_SetVar2(interp,name1,name2,Tcl_GetStringFromObj(value,NULL), flags);\n");
-      Printf(getf->code, "Tcl_DecrRefCount(value);\n");
-      Printf(getf->code, "}\n");
-      Printf(getf->code, "return NULL;\n");
-      if (addfail) {
-	Append(getf->code, "fail:\n");
-	Printf(getf->code, "return \"%s\";\n", iname);
-      }
-      Printf(getf->code, "}\n");
-      Wrapper_print(getf, f_wrappers);
-    } else {
-      Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
-      DelWrapper(getf);
-      return SWIG_NOWRAP;
-    }
-    DelWrapper(getf);
-
-    /* Try to create a function setting a variable */
-    if (is_assignable(n)) {
-      setf = NewWrapper();
-      setname = Swig_name_set(NSPACE_TODO, iname);
-      setfname = Swig_name_wrapper(setname);
-      Setattr(n, "wrap:name", setfname);
-      if (setf) {
-        Printv(setf->def, "SWIGINTERN const char *", setfname,
-	     "(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, char *name1, char *name2 SWIGUNUSED, int flags) {", NIL);
-        Wrapper_add_local(setf, "value", "Tcl_Obj *value = 0");
-        Wrapper_add_local(setf, "name1o", "Tcl_Obj *name1o = 0");
-
-        if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
-	  Replaceall(tm, "$source", "value");
-	  Replaceall(tm, "$target", name);
-	  Replaceall(tm, "$input", "value");
-	  Printf(setf->code, "name1o = Tcl_NewStringObj(name1,-1);\n");
-	  Printf(setf->code, "value = Tcl_ObjGetVar2(interp, name1o, 0, flags);\n");
-	  Printf(setf->code, "Tcl_DecrRefCount(name1o);\n");
-	  Printf(setf->code, "if (!value) SWIG_fail;\n");
-	  /* Printf(setf->code,"%s\n", tm); */
-	  emit_action_code(n, setf->code, tm);
-	  Printf(setf->code, "return NULL;\n");
-	  Printf(setf->code, "fail:\n");
-	  Printf(setf->code, "return \"%s\";\n", iname);
-	  Printf(setf->code, "}\n");
-	  Wrapper_print(setf, f_wrappers);
-        } else {
-	  Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0));
-	  readonly = 1;
-        }
-      }
-      DelWrapper(setf);
-    } else {
-      readonly = 1;
-    }
-
-
-    Printv(var_tab, tab4, "{ SWIG_prefix \"", iname, "\", 0, (swig_variable_func) ", getfname, ",", NIL);
-    if (readonly) {
-      static int readonlywrap = 0;
-      if (!readonlywrap) {
-	Wrapper *ro = NewWrapper();
-	Printf(ro->def,
-	       "SWIGINTERN const char *swig_readonly(ClientData clientData SWIGUNUSED, Tcl_Interp *interp SWIGUNUSED, char *name1 SWIGUNUSED, char *name2 SWIGUNUSED, int flags SWIGUNUSED) {");
-	Printv(ro->code, "return \"Variable is read-only\";\n", "}\n", NIL);
-	Wrapper_print(ro, f_wrappers);
-	readonlywrap = 1;
-	DelWrapper(ro);
-      }
-      Printf(var_tab, "(swig_variable_func) swig_readonly},\n");
-    } else {
-      Printv(var_tab, "(swig_variable_func) ", setfname, "},\n", NIL);
-    }
-    Delete(getfname);
-    Delete(setfname);
-    Delete(setname);
-    Delete(getname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int constantWrapper(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = Getattr(n, "sym:name");
-    String *nsname = !namespace_option ? Copy(iname) : NewStringf("%s::%s", ns_name, iname);
-    SwigType *type = Getattr(n, "type");
-    String *rawval = Getattr(n, "rawval");
-    String *value = rawval ? rawval : Getattr(n, "value");
-    String *tm;
-
-    if (!addSymbol(iname, n))
-      return SWIG_ERROR;
-    if (namespace_option)
-      Setattr(n, "sym:name", nsname);
-
-    /* Special hook for member pointer */
-    if (SwigType_type(type) == T_MPOINTER) {
-      String *wname = Swig_name_wrapper(iname);
-      Printf(f_wrappers, "static %s = %s;\n", SwigType_str(type, wname), value);
-      value = Char(wname);
-    }
-
-    if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      Replaceall(tm, "$nsname", nsname);
-      Printf(const_tab, "%s,\n", tm);
-    } else if ((tm = Swig_typemap_lookup("constcode", n, name, 0))) {
-      Replaceall(tm, "$source", value);
-      Replaceall(tm, "$target", name);
-      Replaceall(tm, "$value", value);
-      Replaceall(tm, "$nsname", nsname);
-      Printf(f_init, "%s\n", tm);
-    } else {
-      Delete(nsname);
-      Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
-      return SWIG_NOWRAP;
-    }
-    Delete(nsname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * nativeWrapper()
-   * ------------------------------------------------------------ */
-
-  virtual int nativeWrapper(Node *n) {
-    String *name = Getattr(n, "sym:name");
-    String *funcname = Getattr(n, "wrap:name");
-    if (!addSymbol(funcname, n))
-      return SWIG_ERROR;
-
-    Printf(f_init, "\t Tcl_CreateObjCommand(interp, SWIG_prefix \"%s\", (swig_wrapper_func) %s, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);\n", name,
-	   funcname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int classHandler(Node *n) {
-    static Hash *emitted = NewHash();
-    String *mangled_classname = 0;
-    String *real_classname = 0;
-
-    have_constructor = 0;
-    have_destructor = 0;
-    destructor_action = 0;
-    constructor_name = 0;
-
-    if (itcl) {
-      constructor = NewString("");
-      destructor = NewString("");
-      base_classes = NewString("");
-      base_class_init = NewString("");
-      methods = NewString("");
-      imethods = NewString("");
-      attributes = NewString("");
-      attribute_traces = NewString("");
-      iattribute_traces = NewString("");
-
-      have_base_classes = 0;
-      have_methods = 0;
-      have_attributes = 0;
-    }
-
-    class_name = Getattr(n, "sym:name");
-    if (!addSymbol(class_name, n))
-      return SWIG_ERROR;
-
-    real_classname = Getattr(n, "name");
-    mangled_classname = Swig_name_mangle(real_classname);
-
-    if (Getattr(emitted, mangled_classname))
-      return SWIG_NOWRAP;
-    Setattr(emitted, mangled_classname, "1");
-
-    attr_tab = NewString("");
-    Printf(attr_tab, "static swig_attribute swig_");
-    Printv(attr_tab, mangled_classname, "_attributes[] = {\n", NIL);
-
-    methods_tab = NewStringf("");
-    Printf(methods_tab, "static swig_method swig_");
-    Printv(methods_tab, mangled_classname, "_methods[] = {\n", NIL);
-
-    /* Generate normal wrappers */
-    Language::classHandler(n);
-
-    SwigType *t = Copy(Getattr(n, "name"));
-    SwigType_add_pointer(t);
-
-    // Catch all: eg. a class with only static functions and/or variables will not have 'remembered'
-    // SwigType_remember(t);
-    String *wrap_class = NewStringf("&_wrap_class_%s", mangled_classname);
-    SwigType_remember_clientdata(t, wrap_class);
-
-    String *rt = Copy(getClassType());
-    SwigType_add_pointer(rt);
-
-    // Register the class structure with the type checker
-    /*    Printf(f_init,"SWIG_TypeClientData(SWIGTYPE%s, (void *) &_wrap_class_%s);\n", SwigType_manglestr(t), mangled_classname); */
-    if (have_destructor) {
-      Printv(f_wrappers, "SWIGINTERN void swig_delete_", class_name, "(void *obj) {\n", NIL);
-      if (destructor_action) {
-	Printv(f_wrappers, SwigType_str(rt, "arg1"), " = (", SwigType_str(rt, 0), ") obj;\n", NIL);
-	Printv(f_wrappers, destructor_action, "\n", NIL);
-      } else {
-	if (CPlusPlus) {
-	  Printv(f_wrappers, "    delete (", SwigType_str(rt, 0), ") obj;\n", NIL);
-	} else {
-	  Printv(f_wrappers, "    free((char *) obj);\n", NIL);
-	}
-      }
-      Printf(f_wrappers, "}\n");
-    }
-
-    Printf(methods_tab, "    {0,0}\n};\n");
-    Printv(f_wrappers, methods_tab, NIL);
-
-    Printf(attr_tab, "    {0,0,0}\n};\n");
-    Printv(f_wrappers, attr_tab, NIL);
-
-    /* Handle inheritance */
-
-    String *base_class = NewString("");
-    String *base_class_names = NewString("");
-
-    if (itcl) {
-      base_classes = NewString("");
-    }
-
-    List *baselist = Getattr(n, "bases");
-    if (baselist && Len(baselist)) {
-      Iterator b;
-      int index = 0;
-      b = First(baselist);
-      while (b.item) {
-	String *bname = Getattr(b.item, "name");
-	if ((!bname) || GetFlag(b.item, "feature:ignore") || (!Getattr(b.item, "module"))) {
-	  b = Next(b);
-	  continue;
-	}
-	if (itcl) {
-	  have_base_classes = 1;
-	  Printv(base_classes, bname, " ", NIL);
-	  Printv(base_class_init, "    ", bname, "Ptr::constructor $ptr\n", NIL);
-	}
-	String *bmangle = Swig_name_mangle(bname);
-	//      Printv(f_wrappers,"extern swig_class _wrap_class_", bmangle, ";\n", NIL);
-	//      Printf(base_class,"&_wrap_class_%s",bmangle);
-	Printf(base_class, "0");
-	Printf(base_class_names, "\"%s *\",", SwigType_namestr(bname));
-	/* Put code to register base classes in init function */
-
-	//Printf(f_init,"/* Register base : %s */\n", bmangle);
-	//Printf(f_init,"swig_%s_bases[%d] = (swig_class *) SWIG_TypeQuery(\"%s *\")->clientdata;\n",  mangled_classname, index, SwigType_namestr(bname));
-	b = Next(b);
-	index++;
-	Putc(',', base_class);
-	Delete(bmangle);
-      }
-    }
-
-    if (itcl) {
-      String *ptrclass = NewString("");
-
-      // First, build the pointer base class
-      Printv(ptrclass, "itcl::class ", class_name, "Ptr {\n", NIL);
-      if (have_base_classes)
-	Printv(ptrclass, "  inherit ", base_classes, "\n", NIL);
-
-      //  Define protected variables for SWIG object pointer
-      Printv(ptrclass, "  protected variable swigobj\n", "  protected variable thisown\n", NIL);
-
-      //  Define public variables
-      if (have_attributes) {
-	Printv(ptrclass, attributes, NIL);
-
-	// base class swig_getset was being called for complex inheritance trees
-	if (namespace_option) {
-
-	  Printv(ptrclass, "  protected method ", class_name, "_swig_getset {var name1 name2 op} {\n", NIL);
-
-	  Printv(ptrclass,
-		 "    switch -exact -- $op {\n",
-		 "      r {set $var [", ns_name, "::", class_name, "_[set var]_get $swigobj]}\n",
-		 "      w {", ns_name, "::", class_name, "_${var}_set $swigobj [set $var]}\n", "    }\n", "  }\n", NIL);
-	} else {
-	  Printv(ptrclass,
-		 "  protected method ", class_name, "_swig_getset {var name1 name2 op} {\n",
-		 "    switch -exact -- $op {\n",
-		 "      r {set $var [", class_name, "_[set var]_get $swigobj]}\n",
-		 "      w {", class_name, "_${var}_set $swigobj [set $var]}\n", "    }\n", "  }\n", NIL);
-	}
-      }
-      //  Add the constructor, which may include
-      //  calls to base class class constructors
-
-      Printv(ptrclass, "  constructor { ptr } {\n", NIL);
-      if (have_base_classes) {
-	Printv(ptrclass, base_class_init, NIL);
-	Printv(ptrclass, "  } {\n", NIL);
-      }
-
-      Printv(ptrclass, "    set swigobj $ptr\n", "    set thisown 0\n", NIL);
-
-      if (have_attributes) {
-	Printv(ptrclass, attribute_traces, NIL);
-      }
-      Printv(ptrclass, "  }\n", NIL);
-
-
-      //  Add destructor
-      Printv(ptrclass, "  destructor {\n",
-	     "    set d_func delete_", class_name, "\n",
-	     "    if { $thisown && ([info command $d_func] != \"\") } {\n" "      $d_func $swigobj\n", "    }\n", "  }\n", NIL);
-
-      //  Add methods
-      if (have_methods) {
-	Printv(ptrclass, imethods, NIL);
-      };
-
-      //  Close out the pointer class
-      Printv(ptrclass, "}\n\n", NIL);
-      Printv(f_shadow, ptrclass, NIL);
-      // pointer class end
-
-
-      //  Create the "real" class.
-      Printv(f_shadow, "itcl::class ", class_name, " {\n", NIL);
-      Printv(f_shadow, "  inherit ", class_name, "Ptr\n", NIL);
-
-      //  If we have a constructor, then use it.
-      //  If not, then we must have an abstract class without
-      //  any constructor.  So we create a class constructor
-      //  which will fail for this class (but not for inherited
-      //  classes).  Note that the constructor must fail before
-      //  calling the ptrclass constructor.
-
-      if (have_constructor) {
-	Printv(f_shadow, constructor, NIL);
-      } else {
-	Printv(f_shadow, "  constructor { } {\n", NIL);
-	Printv(f_shadow, "    # This constructor will fail if called directly\n", NIL);
-	Printv(f_shadow, "    if { [info class] == \"::", class_name, "\" } {\n", NIL);
-	Printv(f_shadow, "      error \"No constructor for class ", class_name, (Getattr(n, "abstracts") ? " - class is abstract" : ""), "\"\n", NIL);
-	Printv(f_shadow, "    }\n", NIL);
-	Printv(f_shadow, "  }\n", NIL);
-      }
-
-      Printv(f_shadow, "}\n\n", NIL);
-    }
-
-    Printv(f_wrappers, "static swig_class *swig_", mangled_classname, "_bases[] = {", base_class, "0};\n", NIL);
-    Printv(f_wrappers, "static const char * swig_", mangled_classname, "_base_names[] = {", base_class_names, "0};\n", NIL);
-    Delete(base_class);
-    Delete(base_class_names);
-
-    Printv(f_wrappers, "static swig_class _wrap_class_", mangled_classname, " = { \"", class_name, "\", &SWIGTYPE", SwigType_manglestr(t), ",", NIL);
-
-    if (have_constructor) {
-      Printf(f_wrappers, "%s", Swig_name_wrapper(Swig_name_construct(NSPACE_TODO, constructor_name)));
-      Delete(constructor_name);
-      constructor_name = 0;
-    } else {
-      Printf(f_wrappers, "0");
-    }
-    if (have_destructor) {
-      Printv(f_wrappers, ", swig_delete_", class_name, NIL);
-    } else {
-      Printf(f_wrappers, ",0");
-    }
-    Printv(f_wrappers, ", swig_", mangled_classname, "_methods, swig_", mangled_classname, "_attributes, swig_", mangled_classname, "_bases,",
-	   "swig_", mangled_classname, "_base_names, &swig_module, SWIG_TCL_HASHTABLE_INIT };\n", NIL);
-
-    if (!itcl) {
-      Printv(cmd_tab, tab4, "{ SWIG_prefix \"", class_name, "\", (swig_wrapper_func) SWIG_ObjectConstructor, (ClientData)&_wrap_class_", mangled_classname,
-	     "},\n", NIL);
-    };
-
-    Delete(t);
-    Delete(mangled_classname);
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * memberfunctionHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int memberfunctionHandler(Node *n) {
-    String *name = Getattr(n, "name");
-    String *iname = GetChar(n, "sym:name");
-
-    String *realname, *rname;
-
-    Language::memberfunctionHandler(n);
-
-    realname = iname ? iname : name;
-    rname = Swig_name_wrapper(Swig_name_member(NSPACE_TODO, class_name, realname));
-    if (!Getattr(n, "sym:nextSibling")) {
-      Printv(methods_tab, tab4, "{\"", realname, "\", ", rname, "}, \n", NIL);
-    }
-
-    if (itcl) {
-      ParmList *l = Getattr(n, "parms");
-      Parm *p = 0;
-      String *pname = NewString("");
-
-      // Add this member to our class handler function
-      Printv(imethods, tab2, "method ", realname, " [list ", NIL);
-
-      int pnum = 0;
-      for (p = l; p; p = nextSibling(p)) {
-
-	String *pn = Getattr(p, "name");
-	String *dv = Getattr(p, "value");
-	SwigType *pt = Getattr(p, "type");
-
-	Printv(pname, ",(", pt, ")", NIL);
-	Clear(pname);
-
-	/* Only print an argument if not void */
-	if (Cmp(pt, "void") != 0) {
-	  if (Len(pn) > 0) {
-	    Printv(pname, pn, NIL);
-	  } else {
-	    Printf(pname, "p%d", pnum);
-	  }
-
-	  if (Len(dv) > 0) {
-	    String *defval = NewString(dv);
-	    if (namespace_option) {
-	      Insert(defval, 0, "::");
-	      Insert(defval, 0, ns_name);
-	    }
-	    if (Strncmp(dv, "(", 1) == 0) {
-	      Insert(defval, 0, "$");
-	      Replaceall(defval, "(", "");
-	      Replaceall(defval, ")", "");
-	    }
-	    Printv(imethods, "[list ", pname, " ", defval, "] ", NIL);
-	  } else {
-	    Printv(imethods, pname, " ", NIL);
-	  }
-	}
-	++pnum;
-      }
-      Printv(imethods, "] ", NIL);
-
-      if (namespace_option) {
-	Printv(imethods, "{ ", ns_name, "::", class_name, "_", realname, " $swigobj", NIL);
-      } else {
-	Printv(imethods, "{ ", class_name, "_", realname, " $swigobj", NIL);
-      };
-
-      pnum = 0;
-      for (p = l; p; p = nextSibling(p)) {
-
-	String *pn = Getattr(p, "name");
-	SwigType *pt = Getattr(p, "type");
-	Clear(pname);
-
-	/* Only print an argument if not void */
-	if (Cmp(pt, "void") != 0) {
-	  if (Len(pn) > 0) {
-	    Printv(pname, pn, NIL);
-	  } else {
-	    Printf(pname, "p%d", pnum);
-	  }
-	  Printv(imethods, " $", pname, NIL);
-	}
-	++pnum;
-      }
-      Printv(imethods, " }\n", NIL);
-      have_methods = 1;
-    }
-
-    Delete(rname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * membervariableHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int membervariableHandler(Node *n) {
-    String *symname = Getattr(n, "sym:name");
-    String *rname;
-
-    Language::membervariableHandler(n);
-    Printv(attr_tab, tab4, "{ \"-", symname, "\",", NIL);
-    rname = Swig_name_wrapper(Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)));
-    Printv(attr_tab, rname, ", ", NIL);
-    Delete(rname);
-    if (!GetFlag(n, "feature:immutable")) {
-      rname = Swig_name_wrapper(Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)));
-      Printv(attr_tab, rname, "},\n", NIL);
-      Delete(rname);
-    } else {
-      Printf(attr_tab, "0 },\n");
-    }
-
-    if (itcl) {
-      Printv(attributes, "  public variable ", symname, "\n", NIL);
-
-      Printv(attribute_traces, "    trace variable ", symname, " rw [list ", class_name, "_swig_getset ", symname, "]\n", NIL);
-      Printv(attribute_traces, "    set ", symname, "\n", NIL);
-
-      have_attributes = 1;
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int constructorHandler(Node *n) {
-    Language::constructorHandler(n);
-
-    if (itcl) {
-      String *name = Getattr(n, "name");
-      String *iname = GetChar(n, "sym:name");
-
-      String *realname;
-
-      ParmList *l = Getattr(n, "parms");
-      Parm *p = 0;
-
-      String *pname = NewString("");
-
-      realname = iname ? iname : name;
-
-      if (!have_constructor) {
-	// Add this member to our class handler function
-	Printf(constructor, "  constructor { ");
-
-	//  Add parameter list
-	int pnum = 0;
-	for (p = l; p; p = nextSibling(p)) {
-
-	  SwigType *pt = Getattr(p, "type");
-	  String *pn = Getattr(p, "name");
-	  String *dv = Getattr(p, "value");
-	  Clear(pname);
-
-	  /* Only print an argument if not void */
-	  if (Cmp(pt, "void") != 0) {
-	    if (Len(pn) > 0) {
-	      Printv(pname, pn, NIL);
-	    } else {
-	      Printf(pname, "p%d", pnum);
-	    }
-
-	    if (Len(dv) > 0) {
-	      Printv(constructor, "{", pname, " {", dv, "} } ", NIL);
-	    } else {
-	      Printv(constructor, pname, " ", NIL);
-	    }
-	  }
-	  ++pnum;
-	}
-	Printf(constructor, "} { \n");
-
-	// [BRE] 08/17/00 Added test to see if we are instantiating this object
-	// type, or, if this constructor is being called as part of the itcl
-	// inheritance hierarchy.
-	// In the former case, we need to call the C++ constructor, in the
-	// latter we don't, or we end up with two C++ objects.
-	// Check to see if we are instantiating a 'realname' or something 
-	// derived from it.
-	//
-	Printv(constructor, "    if { [string equal -nocase \"", realname, "\" \"[namespace tail [info class]]\" ] } {\n", NIL);
-
-	// Call to constructor wrapper and parent Ptr class
-	// [BRE] add -namespace/-prefix support
-
-	if (namespace_option) {
-	  Printv(constructor, "      ", realname, "Ptr::constructor [", ns_name, "::new_", realname, NIL);
-	} else {
-	  Printv(constructor, "      ", realname, "Ptr::constructor [new_", realname, NIL);
-	}
-
-	pnum = 0;
-	for (p = l; p; p = nextSibling(p)) {
-
-	  SwigType *pt = Getattr(p, "type");
-	  String *pn = Getattr(p, "name");
-	  Clear(pname);
-
-	  /* Only print an argument if not void */
-	  if (Cmp(pt, "void") != 0) {
-	    if (Len(pn) > 0) {
-	      Printv(pname, pn, NIL);
-	    } else {
-	      Printf(pname, "p%d", pnum);
-	    }
-	    Printv(constructor, " $", pname, NIL);
-	  }
-	  ++pnum;
-	}
-
-	Printv(constructor, "]\n", "    }\n", "  } {\n", "    set thisown 1\n", "  }\n", NIL);
-      }
-    }
-
-    if (!have_constructor)
-      constructor_name = NewString(Getattr(n, "sym:name"));
-    have_constructor = 1;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * destructorHandler()
-   * ------------------------------------------------------------ */
-
-  virtual int destructorHandler(Node *n) {
-    Language::destructorHandler(n);
-    have_destructor = 1;
-    destructor_action = Getattr(n, "wrap:action");
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * validIdentifier()
-   * ------------------------------------------------------------ */
-
-  virtual int validIdentifier(String *s) {
-    if (Strchr(s, ' '))
-      return 0;
-    return 1;
-  }
-
-  /* ------------------------------------------------------------
-   * usage_string()
-   * ------------------------------------------------------------ */
-
-  char *usage_string(char *iname, SwigType *, ParmList *l) {
-    static String *temp = 0;
-    Parm *p;
-    int i, numopt, pcount;
-
-    if (!temp)
-      temp = NewString("");
-    Clear(temp);
-    if (namespace_option) {
-      Printf(temp, "%s::%s ", ns_name, iname);
-    } else {
-      Printf(temp, "%s ", iname);
-    }
-    /* Now go through and print parameters */
-    i = 0;
-    pcount = emit_num_arguments(l);
-    numopt = pcount - emit_num_required(l);
-    for (p = l; p; p = nextSibling(p)) {
-
-      SwigType *pt = Getattr(p, "type");
-      String *pn = Getattr(p, "name");
-      /* Only print an argument if not ignored */
-      if (!checkAttribute(p, "tmap:in:numinputs", "0")) {
-	if (i >= (pcount - numopt))
-	  Putc('?', temp);
-	if (Len(pn) > 0) {
-	  Printf(temp, "%s", pn);
-	} else {
-	  Printf(temp, "%s", SwigType_str(pt, 0));
-	}
-	if (i >= (pcount - numopt))
-	  Putc('?', temp);
-	Putc(' ', temp);
-	i++;
-      }
-    }
-    return Char(temp);
-  }
-
-  String *runtimeCode() {
-    String *s = NewString("");
-    String *serrors = Swig_include_sys("tclerrors.swg");
-    if (!serrors) {
-      Printf(stderr, "*** Unable to open 'tclerrors.swg'\n");
-    } else {
-      Append(s, serrors);
-      Delete(serrors);
-    }
-    String *sapi = Swig_include_sys("tclapi.swg");
-    if (!sapi) {
-      Printf(stderr, "*** Unable to open 'tclapi.swg'\n");
-    } else {
-      Append(s, sapi);
-      Delete(sapi);
-    }
-    String *srun = Swig_include_sys("tclrun.swg");
-    if (!srun) {
-      Printf(stderr, "*** Unable to open 'tclrun.swg'\n");
-    } else {
-      Append(s, srun);
-      Delete(srun);
-    }
-
-    return s;
-  }
-
-  String *defaultExternalRuntimeFilename() {
-    return NewString("swigtclrun.h");
-  }
-};
-
-/* ----------------------------------------------------------------------
- * swig_tcl()    - Instantiate module
- * ---------------------------------------------------------------------- */
-
-static Language *new_swig_tcl() {
-  return new TCL8();
-}
-extern "C" Language *swig_tcl(void) {
-  return new_swig_tcl();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/typepass.cxx b/dependencies2013/win32/swig/Source/Modules/typepass.cxx
deleted file mode 100644
index bf8028c2..00000000
--- a/dependencies2013/win32/swig/Source/Modules/typepass.cxx
+++ /dev/null
@@ -1,1294 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * typepass.cxx
- *
- * This module builds all of the internal type information by collecting
- * typedef declarations as well as registering classes, structures, and unions.
- * This information is needed to correctly handle shadow classes and other
- * advanced features.   This phase of compilation is also used to perform
- * type-expansion.  All types are fully qualified with namespace prefixes
- * and other information needed for compilation.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-#include "cparse.h"
-
-struct normal_node {
-  Symtab *symtab;
-  Hash *typescope;
-  List *normallist;
-  normal_node *next;
-};
-
-static normal_node *patch_list = 0;
-
-/* Singleton class - all non-static methods in this class are private */
-class TypePass:private Dispatcher {
-  Node *inclass;
-  Node *module;
-  int importmode;
-  String *nsname;
-  String *nssymname;
-  Hash *classhash;
-  List *normalize;
-
-  TypePass() :
-    inclass(0),
-    module(0),
-    importmode(0),
-    nsname(0),
-    nssymname(0),
-    classhash(0),
-    normalize(0) {
-  }
-
-  /* Normalize a type. Replaces type with fully qualified version */
-  void normalize_type(SwigType *ty) {
-    SwigType *qty;
-    if (CPlusPlus) {
-      Replaceall(ty, "struct ", "");
-      Replaceall(ty, "union ", "");
-      Replaceall(ty, "class ", "");
-    }
-
-    qty = SwigType_typedef_qualified(ty);
-    /*    Printf(stdout,"%s --> %s\n", ty, qty); */
-    Clear(ty);
-    Append(ty, qty);
-    Delete(qty);
-  }
-
-  /* Normalize a parameter list */
-
-  void normalize_parms(ParmList *p) {
-    while (p) {
-      SwigType *ty = Getattr(p, "type");
-      normalize_type(ty);
-      /* This is a check for a function type */
-      {
-	SwigType *qty = SwigType_typedef_resolve_all(ty);
-	if (SwigType_isfunction(qty)) {
-	  SwigType_add_pointer(ty);
-	}
-	Delete(qty);
-      }
-
-      String *value = Getattr(p, "value");
-      if (value) {
-	Node *n = Swig_symbol_clookup(value, 0);
-	if (n) {
-	  String *q = Swig_symbol_qualified(n);
-	  if (q && Len(q)) {
-	    String *vb = Swig_scopename_last(value);
-	    Clear(value);
-	    Printf(value, "%s::%s", SwigType_namestr(q), vb);
-	    Delete(q);
-	  }
-	}
-      }
-      if (value && SwigType_istemplate(value)) {
-	String *nv = SwigType_namestr(value);
-	Setattr(p, "value", nv);
-      }
-      p = nextSibling(p);
-    }
-  }
-
-  void normalize_later(ParmList *p) {
-    while (p) {
-      SwigType *ty = Getattr(p, "type");
-      Append(normalize, ty);
-      p = nextSibling(p);
-    }
-  }
-
-  /* Walk through entries in normalize list and patch them up */
-  void normalize_list() {
-    Hash *currentsym = Swig_symbol_current();
-
-    normal_node *nn = patch_list;
-    normal_node *np;
-    while (nn) {
-      Swig_symbol_setscope(nn->symtab);
-      SwigType_set_scope(nn->typescope);
-      Iterator t;
-      for (t = First(nn->normallist); t.item; t = Next(t)) {
-	normalize_type(t.item);
-      }
-      Delete(nn->normallist);
-      np = nn->next;
-      delete(nn);
-      nn = np;
-    }
-    Swig_symbol_setscope(currentsym);
-  }
-
-  /* generate C++ inheritance type-relationships */
-  void cplus_inherit_types_impl(Node *first, Node *cls, String *clsname, const char *bases, const char *baselist, int ispublic, String *cast = 0) {
-
-    if (first == cls)
-      return;			/* The Marcelo check */
-    if (!cls)
-      cls = first;
-    List *alist = 0;
-    List *ilist = Getattr(cls, bases);
-    if (!ilist) {
-      List *nlist = Getattr(cls, baselist);
-      if (nlist) {
-	int len = Len(nlist);
-	int i;
-	for (i = 0; i < len; i++) {
-	  Node *bcls = 0;
-	  int clsforward = 0;
-	  String *bname = Getitem(nlist, i);
-	  String *sname = bname;
-	  String *tname = 0;
-
-	  /* Try to locate the base class.   We look in the symbol table and we chase 
-	     typedef declarations to get to the base class if necessary */
-	  Symtab *st = Getattr(cls, "sym:symtab");
-
-	  if (SwigType_istemplate(bname)) {
-	    tname = SwigType_typedef_resolve_all(bname);
-	    sname = tname;
-	  }
-	  while (1) {
-	    String *qsname = SwigType_typedef_qualified(sname);
-	    bcls = Swig_symbol_clookup(qsname, st);
-	    Delete(qsname);
-	    if (bcls) {
-	      if (Strcmp(nodeType(bcls), "class") != 0) {
-		/* Not a class.   The symbol could be a typedef. */
-		if (checkAttribute(bcls, "storage", "typedef")) {
-		  SwigType *decl = Getattr(bcls, "decl");
-		  if (!decl || !(Len(decl))) {
-		    sname = Getattr(bcls, "type");
-		    st = Getattr(bcls, "sym:symtab");
-		    if (SwigType_istemplate(sname)) {
-		      if (tname)
-			Delete(tname);
-		      tname = SwigType_typedef_resolve_all(sname);
-		      sname = tname;
-		    }
-		    continue;
-		  }
-		  // A case when both outer and nested classes inherit from the same parent. Constructor may be found instead of the class itself.
-		} else if (GetFlag(cls, "nested") && checkAttribute(bcls, "nodeType", "constructor")) {
-		  bcls = Getattr(bcls, "parentNode");
-		  if (Getattr(bcls, "typepass:visit")) {
-		    if (!Getattr(bcls, "feature:onlychildren")) {
-		      if (!ilist)
-			ilist = alist = NewList();
-		      Append(ilist, bcls);
-		    } else {
-		      Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bname), Getline(bname), "Base class '%s' has no name as it is an empty template instantiated with '%%template()'. Ignored.\n", SwigType_namestr(bname));
-		      Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bcls), Getline(bcls), "The %%template directive must be written before '%s' is used as a base class and be declared with a name.\n", SwigType_namestr(bname));
-		    }
-		  }
-		  break;
-		}
-		if (Strcmp(nodeType(bcls), "classforward") != 0) {
-		  Swig_error(Getfile(bname), Getline(bname), "'%s' is not a valid base class.\n", SwigType_namestr(bname));
-		  Swig_error(Getfile(bcls), Getline(bcls), "See definition of '%s'.\n", SwigType_namestr(bname));
-		} else {
-		  Swig_warning(WARN_TYPE_INCOMPLETE, Getfile(bname), Getline(bname), "Base class '%s' is incomplete.\n", SwigType_namestr(bname));
-		  Swig_warning(WARN_TYPE_INCOMPLETE, Getfile(bcls), Getline(bcls), "Only forward declaration '%s' was found.\n", SwigType_namestr(bname));
-		  clsforward = 1;
-		}
-		bcls = 0;
-	      } else {
-		if (Getattr(bcls, "typepass:visit")) {
-		  if (!Getattr(bcls, "feature:onlychildren")) {
-		    if (!ilist)
-		      ilist = alist = NewList();
-		    Append(ilist, bcls);
-		  } else {
-		    Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bname), Getline(bname), "Base class '%s' has no name as it is an empty template instantiated with '%%template()'. Ignored.\n", SwigType_namestr(bname));
-		    Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bcls), Getline(bcls), "The %%template directive must be written before '%s' is used as a base class and be declared with a name.\n", SwigType_namestr(bname));
-		  }
-		} else {
-		  Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bname), Getline(bname), "Base class '%s' undefined.\n", SwigType_namestr(bname));
-		  Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bcls), Getline(bcls), "'%s' must be defined before it is used as a base class.\n", SwigType_namestr(bname));
-		}
-	      }
-	    }
-	    break;
-	  }
-
-	  if (tname)
-	    Delete(tname);
-	  if (!bcls) {
-	    if (!clsforward && !GetFlag(cls, "feature:ignore")) {
-	      if (ispublic && !Getmeta(bname, "already_warned")) {
-		Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bname), Getline(bname), "Nothing known about base class '%s'. Ignored.\n", SwigType_namestr(bname));
-		if (Strchr(bname, '<')) {
-		  Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bname), Getline(bname), "Maybe you forgot to instantiate '%s' using %%template.\n", SwigType_namestr(bname));
-		}
-		Setmeta(bname, "already_warned", "1");
-	      }
-	    }
-	    SwigType_inherit(clsname, bname, cast, 0);
-	  }
-	}
-      }
-      if (ilist) {
-	Setattr(cls, bases, ilist);
-      }
-    }
-    if (alist)
-      Delete(alist);
-
-    if (!ilist)
-      return;
-    int len = Len(ilist);
-    int i;
-    for (i = 0; i < len; i++) {
-      Node *n = Getitem(ilist, i);
-      String *bname = Getattr(n, "name");
-      Node *bclass = n;		/* Getattr(n,"class"); */
-      Hash *scopes = Getattr(bclass, "typescope");
-      SwigType_inherit(clsname, bname, cast, 0);
-      if (ispublic && !GetFlag(bclass, "feature:ignore")) {
-	String *smartptr = Getattr(first, "feature:smartptr");
-	if (smartptr) {
-	  SwigType *smart = Swig_cparse_smartptr(first);
-	  if (smart) {
-	    /* Record a (fake) inheritance relationship between smart pointer
-	       and smart pointer to base class, so that smart pointer upcasts
-	       are automatically generated. */
-	    SwigType *bsmart = Copy(smart);
-	    SwigType *rclsname = SwigType_typedef_resolve_all(clsname);
-	    SwigType *rbname = SwigType_typedef_resolve_all(bname);
-	    int replace_count = Replaceall(bsmart, rclsname, rbname);
-	    if (replace_count == 0) {
-	      // If no replacement made, it will be because rclsname is fully resolved, but the
-	      // type in the smartptr feature used a typedef or not fully resolved name.
-	      String *firstname = Getattr(first, "name");
-	      Replaceall(bsmart, firstname, rbname);
-	    }
-	    Delete(rclsname);
-	    Delete(rbname);
-	    String *smartnamestr = SwigType_namestr(smart);
-	    String *bsmartnamestr = SwigType_namestr(bsmart);
-	    /* construct casting code */
-	    String *convcode = NewStringf("\n    *newmemory = SWIG_CAST_NEW_MEMORY;\n    return (void *) new %s(*(%s *)$from);\n", bsmartnamestr, smartnamestr);
-	    Delete(bsmartnamestr);
-	    Delete(smartnamestr);
-	    /* setup inheritance relationship between smart pointer templates */
-	    SwigType_inherit(smart, bsmart, 0, convcode);
-	    if (!GetFlag(bclass, "feature:smartptr"))
-	      Swig_warning(WARN_LANG_SMARTPTR_MISSING, Getfile(first), Getline(first), "Base class '%s' of '%s' is not similarly marked as a smart pointer.\n", SwigType_namestr(Getattr(bclass, "name")), SwigType_namestr(Getattr(first, "name")));
-	    Delete(convcode);
-	    Delete(bsmart);
-	  }
-	  Delete(smart);
-	} else {
-	  if (GetFlag(bclass, "feature:smartptr"))
-	    Swig_warning(WARN_LANG_SMARTPTR_MISSING, Getfile(first), Getline(first), "Derived class '%s' of '%s' is not similarly marked as a smart pointer.\n", SwigType_namestr(Getattr(first, "name")), SwigType_namestr(Getattr(bclass, "name")));
-	}
-      }
-      if (!importmode) {
-	String *btype = Copy(bname);
-	SwigType_add_pointer(btype);
-	SwigType_remember(btype);
-	Delete(btype);
-      }
-      if (scopes) {
-	SwigType_inherit_scope(scopes);
-      }
-      /* Set up inheritance in the symbol table */
-      Symtab *st = Getattr(cls, "symtab");
-      Symtab *bst = Getattr(bclass, "symtab");
-      if (st == bst) {
-	Swig_warning(WARN_PARSE_REC_INHERITANCE, Getfile(cls), Getline(cls), "Recursive scope inheritance of '%s'.\n", SwigType_namestr(Getattr(cls, "name")));
-	continue;
-      }
-      Symtab *s = Swig_symbol_current();
-      Swig_symbol_setscope(st);
-      Swig_symbol_inherit(bst);
-      Swig_symbol_setscope(s);
-
-      /* Recursively hit base classes */
-      String *namestr = SwigType_namestr(Getattr(bclass, "name"));
-      String *newcast = NewStringf("(%s *)%s", namestr, cast);
-      Delete(namestr);
-      cplus_inherit_types_impl(first, bclass, clsname, bases, baselist, ispublic, newcast);
-      Delete(newcast);
-    }
-  }
-
-  void append_list(List *lb, List *la) {
-    if (la && lb) {
-      for (Iterator bi = First(la); bi.item; bi = Next(bi)) {
-	Append(lb, bi.item);
-      }
-    }
-  }
-
-  void cplus_inherit_types(Node *first, Node *cls, String *clsname, String *cast = 0) {
-    cplus_inherit_types_impl(first, cls, clsname, "bases", "baselist", 1, cast);
-    cplus_inherit_types_impl(first, cls, clsname, "protectedbases", "protectedbaselist", 0, cast);
-    cplus_inherit_types_impl(first, cls, clsname, "privatebases", "privatebaselist", 0, cast);
-
-    if (!cls)
-      cls = first;
-
-    List *allbases = NewList();
-    append_list(allbases, Getattr(cls, "bases"));
-    append_list(allbases, Getattr(cls, "protectedbases"));
-    append_list(allbases, Getattr(cls, "privatebases"));
-    if (Len(allbases)) {
-      Setattr(cls, "allbases", allbases);
-    }
-    Delete(allbases);
-  }
-
-  /* ------------------------------------------------------------
-   * top()
-   * ------------------------------------------------------------ */
-
-  virtual int top(Node *n) {
-    importmode = 0;
-    module = Getattr(n, "module");
-    inclass = 0;
-    normalize = 0;
-    nsname = 0;
-    nssymname = 0;
-    classhash = Getattr(n, "classes");
-    emit_children(n);
-    normalize_list();
-    SwigType_set_scope(0);
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * moduleDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int moduleDirective(Node *n) {
-    if (!module) {
-      module = n;
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * importDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int importDirective(Node *n) {
-    String *oldmodule = module;
-    int oldimport = importmode;
-    importmode = 1;
-    module = 0;
-    emit_children(n);
-    importmode = oldimport;
-    module = oldmodule;
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * includeDirective()
-   * externDirective()
-   * extendDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int includeDirective(Node *n) {
-    return emit_children(n);
-  }
-  virtual int externDeclaration(Node *n) {
-    return emit_children(n);
-  }
-  virtual int extendDirective(Node *n) {
-    return emit_children(n);
-  }
-
-  /* ------------------------------------------------------------
-   * classDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classDeclaration(Node *n) {
-    String *name = Getattr(n, "name");
-    String *tdname = Getattr(n, "tdname");
-    String *unnamed = Getattr(n, "unnamed");
-    String *storage = Getattr(n, "storage");
-    String *kind = Getattr(n, "kind");
-    save_value<Node*> oldinclass(inclass);
-    List *olist = normalize;
-    Symtab *symtab;
-    String *nname = 0;
-    String *fname = 0;
-    String *scopename = 0;
-    String *template_default_expanded = 0;
-
-    normalize = NewList();
-
-    if (name) {
-      if (SwigType_istemplate(name)) {
-	// We need to fully resolve the name and expand default template parameters to make templates work correctly */
-	Node *cn;
-	SwigType *resolved_name = SwigType_typedef_resolve_all(name);
-	SwigType *deftype_name = Swig_symbol_template_deftype(resolved_name, 0);
-	fname = Copy(resolved_name);
-	if (!Equal(resolved_name, deftype_name))
-	  template_default_expanded = Copy(deftype_name);
-	if (!Equal(fname, name) && (cn = Swig_symbol_clookup_local(fname, 0))) {
-	  if ((n == cn)
-	      || (Strcmp(nodeType(cn), "template") == 0)
-	      || (Getattr(cn, "feature:onlychildren") != 0)
-	      || (Getattr(n, "feature:onlychildren") != 0)) {
-	    Swig_symbol_cadd(fname, n);
-	    if (template_default_expanded)
-	      Swig_symbol_cadd(template_default_expanded, n);
-	    SwigType_typedef_class(fname);
-	    scopename = Copy(fname);
-	  } else {
-	    Swig_warning(WARN_TYPE_REDEFINED, Getfile(n), Getline(n), "Template '%s' was already wrapped,\n", SwigType_namestr(name));
-	    Swig_warning(WARN_TYPE_REDEFINED, Getfile(cn), Getline(cn), "previous wrap of '%s'.\n", SwigType_namestr(Getattr(cn, "name")));
-	    scopename = 0;
-	  }
-	} else {
-	  Swig_symbol_cadd(fname, n);
-	  SwigType_typedef_class(fname);
-	  scopename = Copy(fname);
-	}
-	Delete(deftype_name);
-	Delete(resolved_name);
-      } else {
-	if ((CPlusPlus) || (unnamed)) {
-	  SwigType_typedef_class(name);
-	} else {
-	  SwigType_typedef_class(NewStringf("%s %s", kind, name));
-	}
-	scopename = Copy(name);
-      }
-    } else {
-      scopename = 0;
-    }
-
-    Setattr(n, "typepass:visit", "1");
-
-    /* Need to set up a typedef if unnamed */
-    if (unnamed && tdname && (Cmp(storage, "typedef") == 0)) {
-      SwigType_typedef(unnamed, tdname);
-    }
-    // name of the outer class should already be patched to contain its outer classes names, but not to contain namespaces
-    // namespace name (if present) is added after processing child nodes
-    if (Getattr(n, "nested:outer") && name) {
-      String *outerName = Getattr(Getattr(n, "nested:outer"), "name");
-      name = NewStringf("%s::%s", outerName, name);
-      Setattr(n, "name", name);
-      if (tdname) {
-	tdname = NewStringf("%s::%s", outerName, tdname);
-	Setattr(n, "tdname", tdname);
-      }
-    }
-
-    if (nsname && name) {
-      nname = NewStringf("%s::%s", nsname, name);
-      String *tdname = Getattr(n, "tdname");
-      if (tdname) {
-	tdname = NewStringf("%s::%s", nsname, tdname);
-	Setattr(n, "tdname", tdname);
-      }
-    }
-    if (nssymname) {
-      if (GetFlag(n, "feature:nspace"))
-	Setattr(n, "sym:nspace", nssymname);
-    }
-    SwigType_new_scope(scopename);
-    SwigType_attach_symtab(Getattr(n, "symtab"));
-
-    /* Inherit type definitions into the class */
-    if (name && !(GetFlag(n, "nested") && !checkAttribute(n, "access", "public") && 
-      (GetFlag(n, "feature:flatnested") || Language::instance()->nestedClassesSupport() == Language::NCS_None))) {
-      cplus_inherit_types(n, 0, nname ? nname : (fname ? fname : name));
-    }
-
-    inclass = n;
-    symtab = Swig_symbol_setscope(Getattr(n, "symtab"));
-    emit_children(n);
-    Swig_symbol_setscope(symtab);
-
-    Hash *ts = SwigType_pop_scope();
-    Setattr(n, "typescope", ts);
-    Delete(ts);
-    Setattr(n, "module", module);
-
-    // When a fully qualified templated type with default parameters is used in the parsed code, 
-    // the following additional symbols and scopes are needed for successful lookups
-    if (template_default_expanded) {
-      Swig_symbol_alias(template_default_expanded, Getattr(n, "symtab"));
-      SwigType_scope_alias(template_default_expanded, Getattr(n, "typescope"));
-    }
-
-    /* Normalize deferred types */
-    {
-      normal_node *nn = new normal_node();
-      nn->normallist = normalize;
-      nn->symtab = Getattr(n, "symtab");
-      nn->next = patch_list;
-      nn->typescope = Getattr(n, "typescope");
-      patch_list = nn;
-    }
-
-    normalize = olist;
-
-    /* If in a namespace, patch the class name */
-    if (nname) {
-      Setattr(n, "name", nname);
-      Delete(nname);
-    }
-    Delete(fname);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * templateDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int templateDeclaration(Node *n) {
-    String *name = Getattr(n, "name");
-    String *ttype = Getattr(n, "templatetype");
-    if (Strcmp(ttype, "class") == 0) {
-      String *rname = SwigType_typedef_resolve_all(name);
-      SwigType_typedef_class(rname);
-      Delete(rname);
-    } else if (Strcmp(ttype, "classforward") == 0) {
-      String *rname = SwigType_typedef_resolve_all(name);
-      SwigType_typedef_class(rname);
-      Delete(rname);
-      /*      SwigType_typedef_class(name); */
-    } else if (Strcmp(ttype, "cdecl") == 0) {
-      String *rname = SwigType_typedef_resolve_all(name);
-      SwigType_typedef_class(rname);
-      Delete(rname);
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * lambdaDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int lambdaDeclaration(Node *) {
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * classforwardDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int classforwardDeclaration(Node *n) {
-
-    /* Can't do inside a C struct because it breaks C nested structure wrapping */
-    if ((!inclass) || (CPlusPlus)) {
-      String *name = Getattr(n, "name");
-      SwigType_typedef_class(name);
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * namespaceDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int namespaceDeclaration(Node *n) {
-    Symtab *symtab;
-    String *name = Getattr(n, "name");
-    String *alias = Getattr(n, "alias");
-    List *olist = normalize;
-    normalize = NewList();
-    if (alias) {
-      Typetab *ts = Getattr(n, "typescope");
-      if (!ts) {
-	/* Create an empty scope for the alias */
-	Node *ns = Getattr(n, "namespace");
-	SwigType_scope_alias(name, Getattr(ns, "typescope"));
-	ts = Getattr(ns, "typescope");
-	Setattr(n, "typescope", ts);
-      }
-      /* Namespace alias */
-      return SWIG_OK;
-    } else {
-      if (name) {
-	Node *nn = Swig_symbol_clookup(name, n);
-	Hash *ts = 0;
-	if (nn)
-	  ts = Getattr(nn, "typescope");
-	if (!ts) {
-	  SwigType_new_scope(name);
-	  SwigType_attach_symtab(Getattr(n, "symtab"));
-	} else {
-	  SwigType_set_scope(ts);
-	}
-      }
-      String *oldnsname = nsname;
-      String *oldnssymname = nssymname;
-      nsname = Swig_symbol_qualified(Getattr(n, "symtab"));
-      nssymname = Swig_symbol_qualified_language_scopename(Getattr(n, "symtab"));
-      symtab = Swig_symbol_setscope(Getattr(n, "symtab"));
-      emit_children(n);
-      Swig_symbol_setscope(symtab);
-
-      if (name) {
-	Hash *ts = SwigType_pop_scope();
-	Setattr(n, "typescope", ts);
-	Delete(ts);
-      }
-
-      /* Normalize deferred types */
-      {
-	normal_node *nn = new normal_node();
-	nn->normallist = normalize;
-	nn->symtab = Getattr(n, "symtab");
-	nn->next = patch_list;
-	nn->typescope = Getattr(n, "typescope");
-	patch_list = nn;
-      }
-      normalize = olist;
-
-      Delete(nssymname);
-      nssymname = oldnssymname;
-      Delete(nsname);
-      nsname = oldnsname;
-      return SWIG_OK;
-    }
-  }
-
-  /* ------------------------------------------------------------
-   * cDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int cDeclaration(Node *n) {
-    if (NoExcept) {
-      Delattr(n, "throws");
-    }
-
-    /* Normalize types. */
-    SwigType *ty = Getattr(n, "type");
-    if (!ty) {
-      return SWIG_OK;
-    }
-    normalize_type(ty);
-    SwigType *decl = Getattr(n, "decl");
-    if (decl) {
-      normalize_type(decl);
-    }
-    normalize_parms(Getattr(n, "parms"));
-    normalize_parms(Getattr(n, "throws"));
-    if (GetFlag(n, "conversion_operator")) {
-      /* The call to the operator in the generated wrapper must be fully qualified in order to compile */
-      SwigType *name = Getattr(n, "name");
-      SwigType *qualifiedname = Swig_symbol_string_qualify(name, 0);
-      Clear(name);
-      Append(name, qualifiedname);
-      Delete(qualifiedname);
-    }
-
-    if (checkAttribute(n, "storage", "typedef")) {
-      String *name = Getattr(n, "name");
-      ty = Getattr(n, "type");
-      decl = Getattr(n, "decl");
-      SwigType *t = Copy(ty);
-      {
-	/* If the typename is qualified, make sure the scopename is fully qualified when making a typedef */
-	if (Swig_scopename_check(t) && strncmp(Char(t), "::", 2)) {
-	  String *base, *prefix, *qprefix;
-	  base = Swig_scopename_last(t);
-	  prefix = Swig_scopename_prefix(t);
-	  qprefix = SwigType_typedef_qualified(prefix);
-	  Delete(t);
-	  t = NewStringf("%s::%s", qprefix, base);
-	  Delete(base);
-	  Delete(prefix);
-	  Delete(qprefix);
-	}
-      }
-      SwigType_push(t, decl);
-      if (CPlusPlus) {
-	Replaceall(t, "struct ", "");
-	Replaceall(t, "union ", "");
-	Replaceall(t, "class ", "");
-      }
-      SwigType_typedef(t, name);
-    }
-    /* If namespaces are active.  We need to patch the name with a namespace prefix */
-    if (nsname && !inclass) {
-      String *name = Getattr(n, "name");
-      if (name) {
-	String *nname = NewStringf("%s::%s", nsname, name);
-	Setattr(n, "name", nname);
-	Delete(nname);
-      }
-    }
-    clean_overloaded(n);
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * constructorDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int constructorDeclaration(Node *n) {
-    if (NoExcept) {
-      Delattr(n, "throws");
-    }
-
-    normalize_parms(Getattr(n, "parms"));
-    normalize_parms(Getattr(n, "throws"));
-
-    clean_overloaded(n);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * destructorDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int destructorDeclaration(Node *) {
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * constantDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int constantDirective(Node *n) {
-    SwigType *ty = Getattr(n, "type");
-    if (ty) {
-      Setattr(n, "type", SwigType_typedef_qualified(ty));
-    }
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * enumDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumDeclaration(Node *n) {
-    String *name = Getattr(n, "name");
-
-    if (name) {
-      String *scope = 0;
-
-      // Add a typedef to the type table so that we can use 'enum Name' as well as just 'Name'
-      if (nsname || inclass) {
-
-	// But first correct the name and tdname to contain the fully qualified scopename
-	if (nsname && inclass) {
-	  scope = NewStringf("%s::%s", nsname, Getattr(inclass, "name"));
-	} else if (nsname) {
-	  scope = NewStringf("%s", nsname);
-	} else if (inclass) {
-	  scope = NewStringf("%s", Getattr(inclass, "name"));
-	}
-
-	String *nname = NewStringf("%s::%s", scope, name);
-	Setattr(n, "name", nname);
-
-	String *tdname = Getattr(n, "tdname");
-	if (tdname) {
-	  tdname = NewStringf("%s::%s", scope, tdname);
-	  Setattr(n, "tdname", tdname);
-	}
-
-	SwigType *t = NewStringf("enum %s", nname);
-	SwigType_typedef(t, name);
-      } else {
-	SwigType *t = NewStringf("enum %s", name);
-	SwigType_typedef(t, name);
-      }
-      Delete(scope);
-    }
-
-    String *tdname = Getattr(n, "tdname");
-    String *unnamed = Getattr(n, "unnamed");
-    String *storage = Getattr(n, "storage");
-
-    // Construct enumtype - for declaring an enum of this type with SwigType_ltype() etc
-    String *enumtype = 0;
-    if (unnamed && tdname && (Cmp(storage, "typedef") == 0)) {
-      enumtype = Copy(Getattr(n, "tdname"));
-    } else if (name) {
-      enumtype = NewStringf("%s%s", CPlusPlus ? "" : "enum ", Getattr(n, "name"));
-    } else {
-      // anonymous enums
-      enumtype = Copy(Getattr(n, "type"));
-    }
-    Setattr(n, "enumtype", enumtype);
-
-    if (nssymname) {
-      if (GetFlag(n, "feature:nspace"))
-	Setattr(n, "sym:nspace", nssymname);
-    }
-
-    // This block of code is for dealing with %ignore on an enum item where the target language
-    // attempts to use the C enum value in the target language itself and expects the previous enum value
-    // to be one more than the previous value... the previous enum item might not exist if it is ignored!
-    // - It sets the first non-ignored enum item with the "firstenumitem" attribute.
-    // - It adds an enumvalue attribute if the previous enum item is ignored
-    {
-      Node *c;
-      int count = 0;
-      String *previous = 0;
-      bool previous_ignored = false;
-      bool firstenumitem = false;
-      for (c = firstChild(n); c; c = nextSibling(c)) {
-	assert(strcmp(Char(nodeType(c)), "enumitem") == 0);
-
-	bool reset;
-	String *enumvalue = Getattr(c, "enumvalue");
-	if (GetFlag(c, "feature:ignore") || !Getattr(c, "sym:name")) {
-	  reset = enumvalue ? true : false;
-	  previous_ignored = true;
-	} else {
-	  if (!enumvalue && previous_ignored) {
-	    if (previous)
-	      Setattr(c, "enumvalue", NewStringf("(%s) + %d", previous, count+1));
-	    else
-	      Setattr(c, "enumvalue", NewStringf("%d", count));
-	    SetFlag(c, "virtenumvalue"); // identify enumvalue as virtual, ie not from the parsed source
-	  }
-	  if (!firstenumitem) {
-	    SetFlag(c, "firstenumitem");
-	    firstenumitem = true;
-	  }
-	  reset = true;
-	  previous_ignored = false;
-	}
-	if (reset) {
-	  previous = enumvalue ? enumvalue : Getattr(c, "name");
-	  count = 0;
-	} else {
-	  count++;
-	}
-      }
-    }
-
-    emit_children(n);
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * enumvalueDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumvalueDeclaration(Node *n) {
-    String *name = Getattr(n, "name");
-    String *value = Getattr(n, "value");
-    String *scopedenum = Getattr(parentNode(n), "scopedenum");
-    if (!value)
-      value = name;
-    if (Strcmp(value, name) == 0) {
-      String *new_value;
-      if ((nsname || inclass || scopedenum) && cparse_cplusplus) {
-	new_value = NewStringf("%s::%s", SwigType_namestr(Swig_symbol_qualified(n)), value);
-      } else {
-	new_value = NewString(value);
-      }
-      if ((nsname || inclass || scopedenum) && !cparse_cplusplus) {
-	String *cppvalue = NewStringf("%s::%s", SwigType_namestr(Swig_symbol_qualified(n)), value);
-	Setattr(n, "cppvalue", cppvalue); /* for target languages that always generate C++ code even when wrapping C code */
-      }
-      Setattr(n, "value", new_value);
-      Delete(new_value);
-    }
-    Node *next = nextSibling(n);
-
-    // Make up an enumvalue if one was not specified in the parsed code (not designed to be used on enum items and %ignore - enumvalue will be set instead)
-    if (!GetFlag(n, "feature:ignore")) {
-      if (Getattr(n, "_last") && !Getattr(n, "enumvalue")) {	// Only the first enum item has _last set (Note: first non-ignored enum item has firstenumitem set)
-	Setattr(n, "enumvalueex", "0");
-      }
-      if (next && !Getattr(next, "enumvalue")) {
-	Setattr(next, "enumvalueex", NewStringf("%s + 1", Getattr(n, "sym:name")));
-      }
-    }
-
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * enumforwardDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int enumforwardDeclaration(Node *n) {
-
-    // Use enumDeclaration() to do all the hard work.
-    // Note that no children can be emitted in a forward declaration as there aren't any.
-    int result = enumDeclaration(n);
-    if (result == SWIG_OK) {
-      // Detect when the real enum matching the forward enum declaration has not been parsed/declared
-      SwigType *ty = SwigType_typedef_resolve_all(Getattr(n, "type"));
-      Replaceall(ty, "enum ", "");
-      Node *nn = Swig_symbol_clookup(ty, 0);
-
-      String *nodetype = nn ? nodeType(nn) : 0;
-      if (nodetype) {
-	if (Equal(nodetype, "enumforward")) {
-	  SetFlag(nn, "enumMissing");
-	} // if a real enum was declared this would be an "enum" node type
-      }
-      Delete(ty);
-    }
-    return result;
-  }
-
-#ifdef DEBUG_OVERLOADED
-  static void show_overloaded(Node *n) {
-    Node *c = Getattr(n, "sym:overloaded");
-    Node *checkoverloaded = c;
-    Printf(stdout, "-------------------- overloaded start %s sym:overloaded():%p -------------------------------\n", Getattr(n, "name"), c);
-    while (c) {
-      if (Getattr(c, "error")) {
-        c = Getattr(c, "sym:nextSibling");
-        continue;
-      }
-      if (Getattr(c, "sym:overloaded") != checkoverloaded) {
-        Printf(stdout, "sym:overloaded error c:%p checkoverloaded:%p\n", c, checkoverloaded);
-        Swig_print_node(c);
-        exit (1);
-      }
-
-      String *decl = Strcmp(nodeType(c), "using") == 0 ? NewString("------") : Getattr(c, "decl");
-      Printf(stdout, "  show_overloaded %s::%s(%s)          [%s] nodeType:%s\n", parentNode(c) ? Getattr(parentNode(c), "name") : "NOPARENT", Getattr(c, "name"), decl, Getattr(c, "sym:overname"), nodeType(c));
-      if (!Getattr(c, "sym:overloaded")) {
-        Printf(stdout, "sym:overloaded error.....%p\n", c);
-        Swig_print_node(c);
-        exit (1);
-      }
-      c = Getattr(c, "sym:nextSibling");
-    }
-    Printf(stdout, "-------------------- overloaded end   %s -------------------------------\n", Getattr(n, "name"));
-  }
-#endif
-
-  /* ------------------------------------------------------------
-   * usingDeclaration()
-   * ------------------------------------------------------------ */
-
-  virtual int usingDeclaration(Node *n) {
-    if (Getattr(n, "namespace")) {
-      /* using namespace id */
-
-      /* For a namespace import.   We set up inheritance in the type system */
-      Node *ns = Getattr(n, "node");
-      if (ns) {
-	Typetab *ts = Getattr(ns, "typescope");
-	if (ts) {
-	  SwigType_using_scope(ts);
-	}
-      }
-      return SWIG_OK;
-    } else {
-      Node *ns;
-      /* using id */
-      Symtab *stab = Getattr(n, "sym:symtab");
-      if (stab) {
-	String *uname = Getattr(n, "uname");
-	ns = Swig_symbol_clookup(uname, stab);
-	if (!ns && SwigType_istemplate(uname)) {
-	  String *tmp = Swig_symbol_template_deftype(uname, 0);
-	  if (!Equal(tmp, uname)) {
-	    ns = Swig_symbol_clookup(tmp, stab);
-	  }
-	  Delete(tmp);
-	}
-      } else {
-	ns = 0;
-      }
-      if (!ns) {
-	if (is_public(n)) {
-	  Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(n), Getline(n), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(n, "uname")));
-	}
-      } else {
-	/* Only a single symbol is being used.  There are only a few symbols that
-	   we actually care about.  These are typedef, class declarations, and enum */
-	String *ntype = nodeType(ns);
-	if (Strcmp(ntype, "cdecl") == 0) {
-	  if (checkAttribute(ns, "storage", "typedef")) {
-	    /* A typedef declaration */
-	    String *uname = Getattr(n, "uname");
-	    SwigType_typedef_using(uname);
-	  } else {
-	    /* A normal C declaration. */
-	    if ((inclass) && (!GetFlag(n, "feature:ignore")) && (Getattr(n, "sym:name"))) {
-	      Node *c = ns;
-	      Node *unodes = 0, *last_unodes = 0;
-	      int ccount = 0;
-	      String *symname = Getattr(n, "sym:name");
-	      while (c) {
-		if (Strcmp(nodeType(c), "cdecl") == 0) {
-		  if (!(Swig_storage_isstatic(c)
-			|| checkAttribute(c, "storage", "typedef")
-			|| checkAttribute(c, "storage", "friend")
-			|| (Getattr(c, "feature:extend") && !Getattr(c, "code"))
-			|| GetFlag(c, "feature:ignore"))) {
-
-		    /* Don't generate a method if the method is overridden in this class, 
-		     * for example don't generate another m(bool) should there be a Base::m(bool) :
-		     * struct Derived : Base { 
-		     *   void m(bool);
-		     *   using Base::m;
-		     * };
-		     */
-		    String *csymname = Getattr(c, "sym:name");
-		    if (!csymname || (Strcmp(csymname, symname) == 0)) {
-		      {
-			String *decl = Getattr(c, "decl");
-			Node *over = Getattr(n, "sym:overloaded");
-			int match = 0;
-			while (over) {
-			  String *odecl = Getattr(over, "decl");
-			  if (Cmp(decl, odecl) == 0) {
-			    match = 1;
-			    break;
-			  }
-			  over = Getattr(over, "sym:nextSibling");
-			}
-			if (match) {
-			  c = Getattr(c, "csym:nextSibling");
-			  continue;
-			}
-		      }
-		      Node *nn = copyNode(c);
-		      Delattr(nn, "access");	// access might be different from the method in the base class
-		      Setattr(nn, "access", Getattr(n, "access"));
-		      if (!Getattr(nn, "sym:name"))
-			Setattr(nn, "sym:name", symname);
-
-		      if (!GetFlag(nn, "feature:ignore")) {
-			ParmList *parms = CopyParmList(Getattr(c, "parms"));
-			int is_pointer = SwigType_ispointer_return(Getattr(nn, "decl"));
-			int is_void = checkAttribute(nn, "type", "void") && !is_pointer;
-			Setattr(nn, "parms", parms);
-			Delete(parms);
-			if (Getattr(n, "feature:extend")) {
-			  String *ucode = is_void ? NewStringf("{ self->%s(", Getattr(n, "uname")) : NewStringf("{ return self->%s(", Getattr(n, "uname"));
-
-			  for (ParmList *p = parms; p;) {
-			    Append(ucode, Getattr(p, "name"));
-			    p = nextSibling(p);
-			    if (p)
-			      Append(ucode, ",");
-			  }
-			  Append(ucode, "); }");
-			  Setattr(nn, "code", ucode);
-			  Delete(ucode);
-			}
-			ParmList *throw_parm_list = Getattr(c, "throws");
-			if (throw_parm_list)
-			  Setattr(nn, "throws", CopyParmList(throw_parm_list));
-			ccount++;
-			if (!last_unodes) {
-			  last_unodes = nn;
-			  unodes = nn;
-			} else {
-			  Setattr(nn, "previousSibling", last_unodes);
-			  Setattr(last_unodes, "nextSibling", nn);
-			  Setattr(nn, "sym:previousSibling", last_unodes);
-			  Setattr(last_unodes, "sym:nextSibling", nn);
-			  Setattr(nn, "sym:overloaded", unodes);
-			  Setattr(unodes, "sym:overloaded", unodes);
-			  last_unodes = nn;
-			}
-		      } else {
-			Delete(nn);
-		      }
-		    }
-		  }
-		}
-		c = Getattr(c, "csym:nextSibling");
-	      }
-	      if (unodes) {
-		set_firstChild(n, unodes);
-		if (ccount > 1) {
-		  if (!Getattr(n, "sym:overloaded")) {
-		    Setattr(n, "sym:overloaded", n);
-		    Setattr(n, "sym:overname", "_SWIG_0");
-		  }
-		}
-	      }
-
-	      /* Hack the parse tree symbol table for overloaded methods. Replace the "using" node with the
-	       * list of overloaded methods we have just added in as child nodes to the "using" node.
-	       * The node will still exist, it is just the symbol table linked list of overloaded methods
-	       * which is hacked. */
-	      if (Getattr(n, "sym:overloaded")) {
-		int cnt = 0;
-#ifdef DEBUG_OVERLOADED
-		Node *debugnode = n;
-		show_overloaded(n);
-#endif
-		if (!firstChild(n)) {
-		  // Remove from overloaded list ('using' node does not actually end up adding in any methods)
-		  Node *ps = Getattr(n, "sym:previousSibling");
-		  Node *ns = Getattr(n, "sym:nextSibling");
-		  if (ps) {
-		    Setattr(ps, "sym:nextSibling", ns);
-		  }
-		  if (ns) {
-		    Setattr(ns, "sym:previousSibling", ps);
-		  }
-		} else {
-		  // The 'using' node results in methods being added in - slot in the these methods here 
-		  Node *ps = Getattr(n, "sym:previousSibling");
-		  Node *ns = Getattr(n, "sym:nextSibling");
-		  Node *fc = firstChild(n);
-		  Node *pp = fc;
-
-		  Node *firstoverloaded = Getattr(n, "sym:overloaded");
-		  if (firstoverloaded == n) {
-		    // This 'using' node we are cutting out was the first node in the overloaded list. 
-		    // Change the first node in the list to its first sibling
-		    Delattr(firstoverloaded, "sym:overloaded");
-		    Node *nnn = Getattr(firstoverloaded, "sym:nextSibling");
-		    firstoverloaded = fc;
-		    while (nnn) {
-		      Setattr(nnn, "sym:overloaded", firstoverloaded);
-		      nnn = Getattr(nnn, "sym:nextSibling");
-		    }
-		  }
-		  while (pp) {
-		    Node *ppn = Getattr(pp, "sym:nextSibling");
-		    Setattr(pp, "sym:overloaded", firstoverloaded);
-		    Setattr(pp, "sym:overname", NewStringf("%s_%d", Getattr(n, "sym:overname"), cnt++));
-		    if (ppn)
-		      pp = ppn;
-		    else
-		      break;
-		  }
-		  if (ps) {
-		    Setattr(ps, "sym:nextSibling", fc);
-		    Setattr(fc, "sym:previousSibling", ps);
-		  }
-		  if (ns) {
-		    Setattr(ns, "sym:previousSibling", pp);
-		    Setattr(pp, "sym:nextSibling", ns);
-		  }
-#ifdef DEBUG_OVERLOADED
-		  debugnode = firstoverloaded;
-#endif
-		}
-		Delattr(n, "sym:previousSibling");
-		Delattr(n, "sym:nextSibling");
-		Delattr(n, "sym:overloaded");
-		Delattr(n, "sym:overname");
-#ifdef DEBUG_OVERLOADED
-		show_overloaded(debugnode);
-#endif
-		clean_overloaded(n);	// Needed?
-	      }
-	    }
-	  }
-	} else if ((Strcmp(ntype, "class") == 0) || ((Strcmp(ntype, "classforward") == 0))) {
-	  /* We install the using class name as kind of a typedef back to the original class */
-	  String *uname = Getattr(n, "uname");
-	  /* Import into current type scope */
-	  SwigType_typedef_using(uname);
-	} else if (Strcmp(ntype, "enum") == 0) {
-	  SwigType_typedef_using(Getattr(n, "uname"));
-	} else if (Strcmp(ntype, "template") == 0) {
-	  /*
-	  Printf(stdout, "usingDeclaration template %s --- %s\n", Getattr(n, "name"), Getattr(n, "uname"));
-	  SwigType_typedef_using(Getattr(n, "uname"));
-	  */
-	}
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * typemapDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int typemapDirective(Node *n) {
-    if (inclass || nsname) {
-      Node *items = firstChild(n);
-      while (items) {
-	Parm *pattern = Getattr(items, "pattern");
-	Parm *parms = Getattr(items, "parms");
-	normalize_later(pattern);
-	normalize_later(parms);
-	items = nextSibling(items);
-      }
-    }
-    return SWIG_OK;
-  }
-
-
-  /* ------------------------------------------------------------
-   * typemapcopyDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int typemapcopyDirective(Node *n) {
-    if (inclass || nsname) {
-      Node *items = firstChild(n);
-      ParmList *pattern = Getattr(n, "pattern");
-      normalize_later(pattern);
-      while (items) {
-	ParmList *npattern = Getattr(items, "pattern");
-	normalize_later(npattern);
-	items = nextSibling(items);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * applyDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int applyDirective(Node *n) {
-    if (inclass || nsname) {
-      ParmList *pattern = Getattr(n, "pattern");
-      normalize_later(pattern);
-      Node *items = firstChild(n);
-      while (items) {
-	Parm *apattern = Getattr(items, "pattern");
-	normalize_later(apattern);
-	items = nextSibling(items);
-      }
-    }
-    return SWIG_OK;
-  }
-
-  /* ------------------------------------------------------------
-   * clearDirective()
-   * ------------------------------------------------------------ */
-
-  virtual int clearDirective(Node *n) {
-    if (inclass || nsname) {
-      Node *p;
-      for (p = firstChild(n); p; p = nextSibling(p)) {
-	ParmList *pattern = Getattr(p, "pattern");
-	normalize_later(pattern);
-      }
-    }
-    return SWIG_OK;
-  }
-
-public:
-  static void pass(Node *n) {
-    TypePass t;
-    t.top(n);
-  }
-};
-
-void Swig_process_types(Node *n) {
-  if (!n)
-    return;
-  TypePass::pass(n);
-}
-
diff --git a/dependencies2013/win32/swig/Source/Modules/uffi.cxx b/dependencies2013/win32/swig/Source/Modules/uffi.cxx
deleted file mode 100644
index d56ed3b1..00000000
--- a/dependencies2013/win32/swig/Source/Modules/uffi.cxx
+++ /dev/null
@@ -1,404 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * uffi.cxx
- *
- * Uffi language module for SWIG.
- * ----------------------------------------------------------------------------- */
-
-// TODO: remove remnants of lisptype
-
-#include "swigmod.h"
-
-static const char *usage = "\
-UFFI Options (available with -uffi)\n\
-     -identifier-converter <type or funcname> - \n\
-                       Specifies the type of conversion to do on C identifiers\n\
-                       to convert them to symbols. There are two built-in\n\
-                       converters: 'null' and 'lispify'. The default is\n\
-                       'null'. If you supply a name other than one of the\n\
-                       built-ins, then a function by that name will be\n\
-                       called to convert identifiers to symbols.\n\
-";
-
-class UFFI:public Language {
-public:
-
-  virtual void main(int argc, char *argv[]);
-  virtual int top(Node *n);
-  virtual int functionWrapper(Node *n);
-  virtual int constantWrapper(Node *n);
-  virtual int classHandler(Node *n);
-  virtual int membervariableHandler(Node *n);
-
-};
-
-static File *f_cl = 0;
-
-static struct {
-  int count;
-  String **entries;
-} defined_foreign_types;
-
-static String *identifier_converter = NewString("identifier-convert-null");
-
-static int any_varargs(ParmList *pl) {
-  Parm *p;
-
-  for (p = pl; p; p = nextSibling(p)) {
-    if (SwigType_isvarargs(Getattr(p, "type")))
-      return 1;
-  }
-
-  return 0;
-}
-
-
-/* utilities */
-/* returns new string w/ parens stripped */
-static String *strip_parens(String *string) {
-  char *s = Char(string), *p;
-  int len = Len(string);
-  String *res;
-
-  if (len == 0 || s[0] != '(' || s[len - 1] != ')') {
-    return NewString(string);
-  }
-
-  p = (char *) malloc(len - 2 + 1);
-  if (!p) {
-    Printf(stderr, "Malloc failed\n");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  strncpy(p, s + 1, len - 1);
-  p[len - 2] = 0;		/* null terminate */
-
-  res = NewString(p);
-  free(p);
-
-  return res;
-}
-
-
-static String *convert_literal(String *num_param, String *type) {
-  String *num = strip_parens(num_param), *res;
-  char *s = Char(num);
-
-  /* Make sure doubles use 'd' instead of 'e' */
-  if (!Strcmp(type, "double")) {
-    String *updated = Copy(num);
-    if (Replace(updated, "e", "d", DOH_REPLACE_ANY) > 1) {
-      Printf(stderr, "Weird!! number %s looks invalid.\n", num);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Delete(num);
-    return updated;
-  }
-
-  if (SwigType_type(type) == T_CHAR) {
-    /* Use CL syntax for character literals */
-    return NewStringf("#\\%s", num_param);
-  } else if (SwigType_type(type) == T_STRING) {
-    /* Use CL syntax for string literals */
-    return NewStringf("\"%s\"", num_param);
-  }
-
-  if (Len(num) < 2 || s[0] != '0') {
-    return num;
-  }
-
-  /* octal or hex */
-
-  res = NewStringf("#%c%s", s[1] == 'x' ? 'x' : 'o', s + 2);
-  Delete(num);
-
-  return res;
-}
-
-static void add_defined_foreign_type(String *type) {
-  if (!defined_foreign_types.count) {
-    /* Make fresh */
-    defined_foreign_types.count = 1;
-    defined_foreign_types.entries = (String **) malloc(sizeof(String *));
-  } else {
-    /* make room */
-    defined_foreign_types.count++;
-    defined_foreign_types.entries = (String **)
-	realloc(defined_foreign_types.entries, defined_foreign_types.count * sizeof(String *));
-  }
-
-  if (!defined_foreign_types.entries) {
-    Printf(stderr, "Out of memory\n");
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  /* Fill in the new data */
-  defined_foreign_types.entries[defined_foreign_types.count - 1] = Copy(type);
-
-}
-
-
-static String *get_ffi_type(Node *n, SwigType *ty, const_String_or_char_ptr name) {
-  Node *node = NewHash();
-  Setattr(node, "type", ty);
-  Setattr(node, "name", name);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *tm = Swig_typemap_lookup("ffitype", node, "", 0);
-  Delete(node);
-
-  if (tm) {
-    return NewString(tm);
-  } else {
-    SwigType *tr = SwigType_typedef_resolve_all(ty);
-    char *type_reduced = Char(tr);
-    int i;
-
-    //Printf(stdout,"convert_type %s\n", ty);
-    if (SwigType_isconst(tr)) {
-      SwigType_pop(tr);
-      type_reduced = Char(tr);
-    }
-
-    if (SwigType_ispointer(type_reduced) || SwigType_isarray(ty) || !strncmp(type_reduced, "p.f", 3)) {
-      return NewString(":pointer-void");
-    }
-
-    for (i = 0; i < defined_foreign_types.count; i++) {
-      if (!Strcmp(ty, defined_foreign_types.entries[i])) {
-	return NewStringf("#.(%s \"%s\" :type :type)", identifier_converter, ty);
-      }
-    }
-
-    if (!Strncmp(type_reduced, "enum ", 5)) {
-      return NewString(":int");
-    }
-
-    Printf(stderr, "Unsupported data type: %s (was: %s)\n", type_reduced, ty);
-    SWIG_exit(EXIT_FAILURE);
-  }
-  return 0;
-}
-
-static String *get_lisp_type(Node *n, SwigType *ty, const_String_or_char_ptr name) {
-  Node *node = NewHash();
-  Setattr(node, "type", ty);
-  Setattr(node, "name", name);
-  Setfile(node, Getfile(n));
-  Setline(node, Getline(n));
-  const String *tm = Swig_typemap_lookup("lisptype", node, "", 0);
-  Delete(node);
-
-  return tm ? NewString(tm) : NewString("");
-}
-
-void UFFI::main(int argc, char *argv[]) {
-  int i;
-
-  Preprocessor_define("SWIGUFFI 1", 0);
-  SWIG_library_directory("uffi");
-  SWIG_config_file("uffi.swg");
-
-
-  for (i = 1; i < argc; i++) {
-    if (!strcmp(argv[i], "-identifier-converter")) {
-      char *conv = argv[i + 1];
-
-      if (!conv)
-	Swig_arg_error();
-
-      Swig_mark_arg(i);
-      Swig_mark_arg(i + 1);
-      i++;
-
-      /* check for built-ins */
-      if (!strcmp(conv, "lispify")) {
-	Delete(identifier_converter);
-	identifier_converter = NewString("identifier-convert-lispify");
-      } else if (!strcmp(conv, "null")) {
-	Delete(identifier_converter);
-	identifier_converter = NewString("identifier-convert-null");
-      } else {
-	/* Must be user defined */
-	Delete(identifier_converter);
-	identifier_converter = NewString(conv);
-      }
-    }
-
-    if (!strcmp(argv[i], "-help")) {
-      Printf(stdout, "%s\n", usage);
-    }
-  }
-}
-
-int UFFI::top(Node *n) {
-  String *module = Getattr(n, "name");
-  String *output_filename = NewString("");
-  File *f_null = NewString("");
-
-  Printf(output_filename, "%s%s.cl", SWIG_output_directory(), module);
-
-
-  f_cl = NewFile(output_filename, "w", SWIG_output_files());
-  if (!f_cl) {
-    FileErrorDisplay(output_filename);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Swig_register_filebyname("header", f_null);
-  Swig_register_filebyname("begin", f_null);
-  Swig_register_filebyname("runtime", f_null);
-  Swig_register_filebyname("wrapper", f_cl);
-
-  Swig_banner_target_lang(f_cl, ";;");
-
-  Printf(f_cl, "\n"
-	 ";; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; package: %s -*-\n\n(defpackage :%s\n  (:use :common-lisp :uffi))\n\n(in-package :%s)\n",
-	 module, module, module);
-  Printf(f_cl, "(eval-when (compile load eval)\n  (defparameter *swig-identifier-converter* '%s))\n", identifier_converter);
-
-  Language::top(n);
-
-  Delete(f_cl);			// Delete the handle, not the file
-  Delete(f_null);
-
-  return SWIG_OK;
-}
-
-int UFFI::functionWrapper(Node *n) {
-  String *funcname = Getattr(n, "sym:name");
-  ParmList *pl = Getattr(n, "parms");
-  Parm *p;
-  int argnum = 0, first = 1;
-//  int varargs = 0;
-
-  //Language::functionWrapper(n);
-
-  Printf(f_cl, "(swig-defun \"%s\"\n", funcname);
-  Printf(f_cl, "  (");
-
-  /* Special cases */
-
-  if (ParmList_len(pl) == 0) {
-    Printf(f_cl, ":void");
-  } else if (any_varargs(pl)) {
-    Printf(f_cl, "#| varargs |#");
-//    varargs = 1;
-  } else {
-    for (p = pl; p; p = nextSibling(p), argnum++) {
-      String *argname = Getattr(p, "name");
-      SwigType *argtype = Getattr(p, "type");
-      String *ffitype = get_ffi_type(n, argtype, argname);
-      String *lisptype = get_lisp_type(n, argtype, argname);
-      int tempargname = 0;
-
-      if (!argname) {
-	argname = NewStringf("arg%d", argnum);
-	tempargname = 1;
-      }
-
-      if (!first) {
-	Printf(f_cl, "\n   ");
-      }
-      Printf(f_cl, "(%s %s %s)", argname, ffitype, lisptype);
-      first = 0;
-
-      Delete(ffitype);
-      Delete(lisptype);
-      if (tempargname)
-	Delete(argname);
-
-    }
-  }
-  Printf(f_cl, ")\n");		/* finish arg list */
-  Printf(f_cl, "  :returning %s\n"
-	 //"  :strings-convert t\n"
-	 //"  :call-direct %s\n"
-	 //"  :optimize-for-space t"
-	 ")\n", get_ffi_type(n, Getattr(n, "type"), Swig_cresult_name())
-	 //,varargs ? "nil"  : "t"
-      );
-
-
-  return SWIG_OK;
-}
-
-int UFFI::constantWrapper(Node *n) {
-  String *type = Getattr(n, "type");
-  String *converted_value = convert_literal(Getattr(n, "value"), type);
-  String *name = Getattr(n, "sym:name");
-
-#if 0
-  Printf(stdout, "constant %s is of type %s. value: %s\n", name, type, converted_value);
-#endif
-
-  Printf(f_cl, "(swig-defconstant \"%s\" %s)\n", name, converted_value);
-
-  Delete(converted_value);
-
-  return SWIG_OK;
-}
-
-// Includes structs
-int UFFI::classHandler(Node *n) {
-
-  String *name = Getattr(n, "sym:name");
-  String *kind = Getattr(n, "kind");
-  Node *c;
-
-  if (Strcmp(kind, "struct")) {
-    Printf(stderr, "Don't know how to deal with %s kind of class yet.\n", kind);
-    Printf(stderr, " (name: %s)\n", name);
-    SWIG_exit(EXIT_FAILURE);
-  }
-
-  Printf(f_cl, "(swig-def-struct \"%s\"\n \n", name);
-
-  for (c = firstChild(n); c; c = nextSibling(c)) {
-    SwigType *type = Getattr(c, "type");
-    SwigType *decl = Getattr(c, "decl");
-    type = Copy(type);
-    SwigType_push(type, decl);
-    String *lisp_type;
-
-    if (Strcmp(nodeType(c), "cdecl")) {
-      Printf(stderr, "Structure %s has a slot that we can't deal with.\n", name);
-      Printf(stderr, "nodeType: %s, name: %s, type: %s\n", nodeType(c), Getattr(c, "name"), Getattr(c, "type"));
-      SWIG_exit(EXIT_FAILURE);
-    }
-
-
-    /* Printf(stdout, "Converting %s in %s\n", type, name); */
-    lisp_type = get_ffi_type(n, type, Getattr(c, "sym:name"));
-
-    Printf(f_cl, "  (#.(%s \"%s\" :type :slot) %s)\n", identifier_converter, Getattr(c, "sym:name"), lisp_type);
-
-    Delete(lisp_type);
-  }
-
-  // Language::classHandler(n);
-
-  Printf(f_cl, " )\n");
-
-  /* Add this structure to the known lisp types */
-  //Printf(stdout, "Adding %s foreign type\n", name);
-  add_defined_foreign_type(name);
-
-  return SWIG_OK;
-}
-
-int UFFI::membervariableHandler(Node *n) {
-  Language::membervariableHandler(n);
-  return SWIG_OK;
-}
-
-
-extern "C" Language *swig_uffi(void) {
-  return new UFFI();
-}
diff --git a/dependencies2013/win32/swig/Source/Modules/utils.cxx b/dependencies2013/win32/swig/Source/Modules/utils.cxx
deleted file mode 100644
index a91ebe09..00000000
--- a/dependencies2013/win32/swig/Source/Modules/utils.cxx
+++ /dev/null
@@ -1,218 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * utils.cxx
- *
- * Various utility functions.
- * ----------------------------------------------------------------------------- */
-
-#include <swigmod.h>
-
-int is_public(Node *n) {
-  String *access = Getattr(n, "access");
-  return !access || !Cmp(access, "public");
-}
-
-int is_private(Node *n) {
-  String *access = Getattr(n, "access");
-  return access && !Cmp(access, "private");
-}
-
-int is_protected(Node *n) {
-  String *access = Getattr(n, "access");
-  return access && !Cmp(access, "protected");
-}
-
-static int is_member_director_helper(Node *parentnode, Node *member) {
-  int parent_nodirector = GetFlag(parentnode, "feature:nodirector");
-  if (parent_nodirector)
-    return 0;
-  int parent_director = Swig_director_mode() && GetFlag(parentnode, "feature:director");
-  int cdecl_director = parent_director || GetFlag(member, "feature:director");
-  int cdecl_nodirector = GetFlag(member, "feature:nodirector");
-  return cdecl_director && !cdecl_nodirector && !GetFlag(member, "feature:extend");
-}
-
-int is_member_director(Node *parentnode, Node *member) {
-  if (parentnode && checkAttribute(member, "storage", "virtual")) {
-    return is_member_director_helper(parentnode, member);
-  } else {
-    return 0;
-  }
-}
-
-int is_member_director(Node *member) {
-  return is_member_director(Getattr(member, "parentNode"), member);
-}
-
-// Identifies the additional protected members that are generated when the allprotected option is used.
-// This does not include protected virtual methods as they are turned on with the dirprot option.
-int is_non_virtual_protected_access(Node *n) {
-  int result = 0;
-  if (Swig_director_mode() && Swig_director_protected_mode() && Swig_all_protected_mode() && is_protected(n) && !checkAttribute(n, "storage", "virtual")) {
-    Node *parentNode = Getattr(n, "parentNode");
-    // When vtable is empty, the director class does not get emitted, so a check for an empty vtable should be done.
-    // However, vtable is set in Language and so is not yet set when methods in Typepass call clean_overloaded()
-    // which calls is_non_virtual_protected_access. So commented out below.
-    // Moving the director vtable creation into into Typepass should solve this problem.
-    if (is_member_director_helper(parentNode, n) /* && Getattr(parentNode, "vtable")*/)
-      result = 1;
-  }
-  return result;
-}
-
-/* Clean overloaded list.  Removes templates, ignored, and errors */
-
-void clean_overloaded(Node *n) {
-  Node *nn = Getattr(n, "sym:overloaded");
-  Node *first = 0;
-  while (nn) {
-    String *ntype = nodeType(nn);
-    if ((GetFlag(nn, "feature:ignore")) ||
-	(Getattr(nn, "error")) ||
-	(Strcmp(ntype, "template") == 0) ||
-	((Strcmp(ntype, "cdecl") == 0) && is_protected(nn) && !is_member_director(nn) && !is_non_virtual_protected_access(n))) {
-      /* Remove from overloaded list */
-      Node *ps = Getattr(nn, "sym:previousSibling");
-      Node *ns = Getattr(nn, "sym:nextSibling");
-      if (ps) {
-	Setattr(ps, "sym:nextSibling", ns);
-      }
-      if (ns) {
-	Setattr(ns, "sym:previousSibling", ps);
-      }
-      Delattr(nn, "sym:previousSibling");
-      Delattr(nn, "sym:nextSibling");
-      Delattr(nn, "sym:overloaded");
-      nn = ns;
-      continue;
-    } else {
-      if (!first)
-	first = nn;
-      Setattr(nn, "sym:overloaded", first);
-    }
-    nn = Getattr(nn, "sym:nextSibling");
-  }
-  if (!first || (first && !Getattr(first, "sym:nextSibling"))) {
-    if (Getattr(n, "sym:overloaded"))
-      Delattr(n, "sym:overloaded");
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_set_max_hash_expand()
- *
- * Controls how many Hash objects are displayed when displaying nested Hash objects.
- * Makes DohSetMaxHashExpand an externally callable function (for debugger).
- * ----------------------------------------------------------------------------- */
-
-void Swig_set_max_hash_expand(int count) {
-  SetMaxHashExpand(count);
-}
-
-extern "C" {
-
-/* -----------------------------------------------------------------------------
- * Swig_get_max_hash_expand()
- *
- * Returns how many Hash objects are displayed when displaying nested Hash objects.
- * Makes DohGetMaxHashExpand an externally callable function (for debugger).
- * ----------------------------------------------------------------------------- */
-
-int Swig_get_max_hash_expand() {
-  return GetMaxHashExpand();
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_to_doh_string()
- *
- * DOH version of Swig_to_string()
- * ----------------------------------------------------------------------------- */
-
-static String *Swig_to_doh_string(DOH *object, int count) {
-  int old_count = Swig_get_max_hash_expand();
-  if (count >= 0)
-    Swig_set_max_hash_expand(count);
-
-  String *debug_string = object ? NewStringf("%s", object) : NewString("NULL");
-
-  Swig_set_max_hash_expand(old_count);
-  return debug_string;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_to_doh_string_with_location()
- *
- * DOH version of Swig_to_string_with_location()
- * ----------------------------------------------------------------------------- */
-
-static String *Swig_to_doh_string_with_location(DOH *object, int count) {
-  int old_count = Swig_get_max_hash_expand();
-  if (count >= 0)
-    Swig_set_max_hash_expand(count);
-
-  String *debug_string = Swig_stringify_with_location(object);
-
-  Swig_set_max_hash_expand(old_count);
-  return debug_string;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_to_string()
- *
- * Swig debug - return C string representation of any DOH type.
- * Nested Hash types expand count is value of Swig_get_max_hash_expand when count<0
- * Note: leaks memory.
- * ----------------------------------------------------------------------------- */
-
-const char *Swig_to_string(DOH *object, int count) {
-  return Char(Swig_to_doh_string(object, count));
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_to_string_with_location()
- *
- * Swig debug - return C string representation of any DOH type, within [] brackets
- * for Hash and List types, prefixed by line and file information.
- * Nested Hash types expand count is value of Swig_get_max_hash_expand when count<0
- * Note: leaks memory.
- * ----------------------------------------------------------------------------- */
-
-const char *Swig_to_string_with_location(DOH *object, int count) {
-  return Char(Swig_to_doh_string_with_location(object, count));
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_print()
- *
- * Swig debug - display string representation of any DOH type.
- * Nested Hash types expand count is value of Swig_get_max_hash_expand when count<0
- * ----------------------------------------------------------------------------- */
-
-void Swig_print(DOH *object, int count) {
-  String *output = Swig_to_doh_string(object, count);
-  Printf(stdout, "%s\n", output);
-  Delete(output);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_to_string_with_location()
- *
- * Swig debug - display string representation of any DOH type, within [] brackets
- * for Hash and List types, prefixed by line and file information.
- * Nested Hash types expand count is value of Swig_get_max_hash_expand when count<0
- * ----------------------------------------------------------------------------- */
-
-void Swig_print_with_location(DOH *object, int count) {
-  String *output = Swig_to_doh_string_with_location(object, count);
-  Printf(stdout, "%s\n", output);
-  Delete(output);
-}
-
-} // extern "C"
-
diff --git a/dependencies2013/win32/swig/Source/Modules/xml.cxx b/dependencies2013/win32/swig/Source/Modules/xml.cxx
deleted file mode 100644
index 5f090561..00000000
--- a/dependencies2013/win32/swig/Source/Modules/xml.cxx
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * xml.cxx
- *
- * An Xml parse tree generator.
- * ----------------------------------------------------------------------------- */
-
-#include "swigmod.h"
-
-static const char *usage = "\
-XML Options (available with -xml)\n\
-     -xmllang <lang> - Typedef language\n\
-     -xmllite        - More lightweight version of XML\n\
-     ------\n\
-     deprecated (use -o): -xml <output.xml> - Use <output.xml> as output file (extension .xml mandatory)\n";
-
-static File *out = 0;
-static int xmllite = 0;
-
-
-class XML:public Language {
-public:
-
-  int indent_level;
-  long id;
-
-  XML() :indent_level(0) , id(0) {
-  }
-  
-  virtual ~ XML() {
-  }
-
-  virtual void main(int argc, char *argv[]) {
-    SWIG_typemap_lang("xml");
-    for (int iX = 0; iX < argc; iX++) {
-      if (strcmp(argv[iX], "-xml") == 0) {
-	char *extension = 0;
-	if (iX + 1 >= argc)
-	  continue;
-	extension = argv[iX + 1] + strlen(argv[iX + 1]) - 4;
-	if (strcmp(extension, ".xml"))
-	  continue;
-	iX++;
-	Swig_mark_arg(iX);
-	String *outfile = NewString(argv[iX]);
-	out = NewFile(outfile, "w", SWIG_output_files());
-	if (!out) {
-	  FileErrorDisplay(outfile);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	continue;
-      }
-      if (strcmp(argv[iX], "-xmllang") == 0) {
-	Swig_mark_arg(iX);
-	iX++;
-	SWIG_typemap_lang(argv[iX]);
-	Swig_mark_arg(iX);
-	continue;
-      }
-      if (strcmp(argv[iX], "-help") == 0) {
-	fputs(usage, stdout);
-      }
-      if (strcmp(argv[iX], "-xmllite") == 0) {
-	Swig_mark_arg(iX);
-	xmllite = 1;
-      }
-    }
-
-    // Add a symbol to the parser for conditional compilation
-    Preprocessor_define("SWIGXML 1", 0);
-  }
-
-  /* Top of the parse tree */
-
-  virtual int top(Node *n) {
-    if (out == 0) {
-      String *outfile = Getattr(n, "outfile");
-      String *ext = Swig_file_extension(outfile);
-      // If there's an extension, ext will include the ".".
-      Delslice(outfile, Len(outfile) - Len(ext), DOH_END);
-      Delete(ext);
-      Append(outfile, ".xml");
-      out = NewFile(outfile, "w", SWIG_output_files());
-      if (!out) {
-	FileErrorDisplay(outfile);
-	SWIG_exit(EXIT_FAILURE);
-      }
-    }
-    Printf(out, "<?xml version=\"1.0\" ?> \n");
-    Xml_print_tree(n);
-    return SWIG_OK;
-  }
-
-  void print_indent(int l) {
-    int i;
-    for (i = 0; i < indent_level; i++) {
-      Printf(out, " ");
-    }
-    if (l) {
-      Printf(out, " ");
-    }
-  }
-
-  void Xml_print_tree(DOH *obj) {
-    while (obj) {
-      Xml_print_node(obj);
-      obj = nextSibling(obj);
-    }
-  }
-
-  void Xml_print_attributes(Node *obj) {
-    String *k;
-    indent_level += 4;
-    print_indent(0);
-    Printf(out, "<attributelist id=\"%ld\" addr=\"%p\" >\n", ++id, obj);
-    indent_level += 4;
-    Iterator ki;
-    ki = First(obj);
-    while (ki.key) {
-      k = ki.key;
-      if ((Cmp(k, "nodeType") == 0)
-	  || (Cmp(k, "firstChild") == 0)
-	  || (Cmp(k, "lastChild") == 0)
-	  || (Cmp(k, "parentNode") == 0)
-	  || (Cmp(k, "nextSibling") == 0)
-	  || (Cmp(k, "previousSibling") == 0)
-	  || (*(Char(k)) == '$')) {
-	/* Do nothing */
-      } else if (Cmp(k, "module") == 0) {
-	Xml_print_module(Getattr(obj, k));
-      } else if (Cmp(k, "baselist") == 0) {
-	Xml_print_baselist(Getattr(obj, k));
-      } else if (!xmllite && Cmp(k, "typescope") == 0) {
-	Xml_print_typescope(Getattr(obj, k));
-      } else if (!xmllite && Cmp(k, "typetab") == 0) {
-	Xml_print_typetab(Getattr(obj, k));
-      } else if (Cmp(k, "kwargs") == 0) {
-	Xml_print_kwargs(Getattr(obj, k));
-      } else if (Cmp(k, "parms") == 0 || Cmp(k, "pattern") == 0) {
-	Xml_print_parmlist(Getattr(obj, k));
-      } else if (Cmp(k, "catchlist") == 0 || Cmp(k, "templateparms") == 0) {
-	Xml_print_parmlist(Getattr(obj, k), Char(k));
-      } else {
-	DOH *o;
-	print_indent(0);
-	if (DohIsString(Getattr(obj, k))) {
-	  String *ck = NewString(k);
-	  o = Str(Getattr(obj, k));
-	  Replaceall(ck, ":", "_");
-	  Replaceall(ck, "<", "&lt;");
-	  /* Do first to avoid aliasing errors. */
-	  Replaceall(o, "&", "&amp;");
-	  Replaceall(o, "<", "&lt;");
-	  Replaceall(o, "\"", "&quot;");
-	  Replaceall(o, "\\", "\\\\");
-	  Replaceall(o, "\n", "&#10;");
-	  Printf(out, "<attribute name=\"%s\" value=\"%s\" id=\"%ld\" addr=\"%p\" />\n", ck, o, ++id, o);
-	  Delete(o);
-	  Delete(ck);
-	} else {
-	  o = Getattr(obj, k);
-	  String *ck = NewString(k);
-	  Replaceall(ck, ":", "_");
-	  Printf(out, "<attribute name=\"%s\" value=\"%p\" id=\"%ld\" addr=\"%p\" />\n", ck, o, ++id, o);
-	  Delete(ck);
-	}
-      }
-      ki = Next(ki);
-    }
-    indent_level -= 4;
-    print_indent(0);
-    Printf(out, "</attributelist >\n");
-    indent_level -= 4;
-  }
-
-  void Xml_print_node(Node *obj) {
-    Node *cobj;
-
-    print_indent(0);
-    Printf(out, "<%s id=\"%ld\" addr=\"%p\" >\n", nodeType(obj), ++id, obj);
-    Xml_print_attributes(obj);
-    cobj = firstChild(obj);
-    if (cobj) {
-      indent_level += 4;
-      Printf(out, "\n");
-      Xml_print_tree(cobj);
-      indent_level -= 4;
-    } else {
-      print_indent(1);
-      Printf(out, "\n");
-    }
-    print_indent(0);
-    Printf(out, "</%s >\n", nodeType(obj));
-  }
-
-
-  void Xml_print_parmlist(ParmList *p, const char* markup = "parmlist") {
-
-    print_indent(0);
-    Printf(out, "<%s id=\"%ld\" addr=\"%p\" >\n", markup, ++id, p);
-    indent_level += 4;
-    while (p) {
-      print_indent(0);
-      Printf(out, "<parm id=\"%ld\">\n", ++id);
-      Xml_print_attributes(p);
-      print_indent(0);
-      Printf(out, "</parm >\n");
-      p = nextSibling(p);
-    }
-    indent_level -= 4;
-    print_indent(0);
-    Printf(out, "</%s >\n", markup);
-  }
-
-  void Xml_print_baselist(List *p) {
-
-    print_indent(0);
-    Printf(out, "<baselist id=\"%ld\" addr=\"%p\" >\n", ++id, p);
-    indent_level += 4;
-    Iterator s;
-    for (s = First(p); s.item; s = Next(s)) {
-      print_indent(0);
-      String *item_name = Xml_escape_string(s.item);
-      Printf(out, "<base name=\"%s\" id=\"%ld\" addr=\"%p\" />\n", item_name, ++id, s.item);
-      Delete(item_name);
-    }
-    indent_level -= 4;
-    print_indent(0);
-    Printf(out, "</baselist >\n");
-  }
-
-  String *Xml_escape_string(String *str) {
-    String *escaped_str = 0;
-    if (str) {
-      escaped_str = NewString(str);
-      Replaceall(escaped_str, "&", "&amp;");
-      Replaceall(escaped_str, "<", "&lt;");
-      Replaceall(escaped_str, "\"", "&quot;");
-      Replaceall(escaped_str, "\\", "\\\\");
-      Replaceall(escaped_str, "\n", "&#10;");
-    }
-    return escaped_str;
-  }
-
-  void Xml_print_module(Node *p) {
-
-    print_indent(0);
-    Printf(out, "<attribute name=\"module\" value=\"%s\" id=\"%ld\" addr=\"%p\" />\n", Getattr(p, "name"), ++id, p);
-  }
-
-  void Xml_print_kwargs(Hash *p) {
-    Xml_print_hash(p, "kwargs");
-  }
-
-  void Xml_print_typescope(Hash *p) {
-
-    Xml_print_hash(p, "typescope");
-  }
-
-  void Xml_print_typetab(Hash *p) {
-
-    Xml_print_hash(p, "typetab");
-  }
-
-
-  void Xml_print_hash(Hash *p, const char *markup) {
-
-    print_indent(0);
-    Printf(out, "<%s id=\"%ld\" addr=\"%p\" >\n", markup, ++id, p);
-    Xml_print_attributes(p);
-    indent_level += 4;
-    Iterator n = First(p);
-    while (n.key) {
-      print_indent(0);
-      Printf(out, "<%ssitem id=\"%ld\" addr=\"%p\" >\n", markup, ++id, n.item);
-      Xml_print_attributes(n.item);
-      print_indent(0);
-      Printf(out, "</%ssitem >\n", markup);
-      n = Next(n);
-    }
-    indent_level -= 4;
-    print_indent(0);
-    Printf(out, "</%s >\n", markup);
-  }
-
-};
-
-/* -----------------------------------------------------------------------------
- * Swig_print_xml
- *
- * Dump an XML version of the parse tree.  This is different from using the -xml
- * language module normally as it allows the real language module to process the
- * tree first, possibly stuffing in new attributes, so the XML that is output ends
- * up being a post-processing version of the tree.
- * ----------------------------------------------------------------------------- */
-
-void Swig_print_xml(DOH *obj, String *filename) {
-  XML xml;
-  xmllite = 1;
-
-  if (!filename) {
-    out = stdout;
-  } else {
-    out = NewFile(filename, "w", SWIG_output_files());
-    if (!out) {
-      FileErrorDisplay(filename);
-      SWIG_exit(EXIT_FAILURE);
-    }
-  }
-
-  Printf(out, "<?xml version=\"1.0\" ?> \n");
-  xml.Xml_print_tree(obj);
-}
-
-static Language *new_swig_xml() {
-  return new XML();
-}
-extern "C" Language *swig_xml(void) {
-  return new_swig_xml();
-}
diff --git a/dependencies2013/win32/swig/Source/Preprocessor/cpp.c b/dependencies2013/win32/swig/Source/Preprocessor/cpp.c
deleted file mode 100644
index 12d27c31..00000000
--- a/dependencies2013/win32/swig/Source/Preprocessor/cpp.c
+++ /dev/null
@@ -1,2042 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * cpp.c
- *
- * An implementation of a C preprocessor plus some support for additional
- * SWIG directives.
- *
- * - SWIG directives such as %include, %extern, and %import are handled
- * - A new macro %define ... %enddef can be used for multiline macros
- * - No preprocessing is performed in %{ ... %} blocks
- * - Lines beginning with %# are stripped down to #... and passed through.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "preprocessor.h"
-#include <ctype.h>
-
-static Hash *cpp = 0;		/* C preprocessor data */
-static int include_all = 0;	/* Follow all includes */
-static int ignore_missing = 0;
-static int import_all = 0;	/* Follow all includes, but as %import statements */
-static int imported_depth = 0;	/* Depth of %imported files */
-static int single_include = 1;	/* Only include each file once */
-static Hash *included_files = 0;
-static List *dependencies = 0;
-static Scanner *id_scan = 0;
-static int error_as_warning = 0;	/* Understand the cpp #error directive as a special #warning */
-static int expand_defined_operator = 0;
-static int macro_level = 0;
-static int macro_start_line = 0;
-static const String * macro_start_file = 0;
-
-/* Test a character to see if it starts an identifier */
-#define isidentifier(c) ((isalpha(c)) || (c == '_') || (c == '$'))
-
-/* Test a character to see if it valid in an identifier (after the first letter) */
-#define isidchar(c) ((isalnum(c)) || (c == '_') || (c == '$'))
-
-static DOH *Preprocessor_replace(DOH *);
-
-/* Skip whitespace */
-static void skip_whitespace(String *s, String *out) {
-  int c;
-  while ((c = Getc(s)) != EOF) {
-    if (!isspace(c)) {
-      Ungetc(c, s);
-      break;
-    } else if (out)
-      Putc(c, out);
-  }
-}
-
-/* Skip to a specified character taking line breaks into account */
-static int skip_tochar(String *s, int ch, String *out) {
-  int c;
-  while ((c = Getc(s)) != EOF) {
-    if (out)
-      Putc(c, out);
-    if (c == ch)
-      break;
-    if (c == '\\') {
-      c = Getc(s);
-      if ((c != EOF) && (out))
-	Putc(c, out);
-    }
-  }
-  if (c == EOF)
-    return -1;
-  return 0;
-}
-
-static void copy_location(const DOH *s1, DOH *s2) {
-  Setfile(s2, Getfile((DOH *) s1));
-  Setline(s2, Getline((DOH *) s1));
-}
-
-static String *cpp_include(const_String_or_char_ptr fn, int sysfile) {
-  String *s = sysfile ? Swig_include_sys(fn) : Swig_include(fn);
-  if (s && single_include) {
-    String *file = Getfile(s);
-    if (Getattr(included_files, file)) {
-      Delete(s);
-      return 0;
-    }
-    Setattr(included_files, file, file);
-  }
-  if (!s) {
-    if (ignore_missing) {
-      Swig_warning(WARN_PP_MISSING_FILE, Getfile(fn), Getline(fn), "Unable to find '%s'\n", fn);
-    } else {
-      Swig_error(Getfile(fn), Getline(fn), "Unable to find '%s'\n", fn);
-    }
-  } else {
-    String *lf;
-    Seek(s, 0, SEEK_SET);
-    if (!dependencies) {
-      dependencies = NewList();
-    }
-    lf = Copy(Swig_last_file());
-    Append(dependencies, lf);
-    Delete(lf);
-  }
-  return s;
-}
-
-List *Preprocessor_depend(void) {
-  return dependencies;
-}
-
-/* -----------------------------------------------------------------------------
- * void Preprocessor_cpp_init() - Initialize the preprocessor
- * ----------------------------------------------------------------------------- */
-static String *kpp_args = 0;
-static String *kpp_define = 0;
-static String *kpp_defined = 0;
-static String *kpp_elif = 0;
-static String *kpp_else = 0;
-static String *kpp_endif = 0;
-static String *kpp_expanded = 0;
-static String *kpp_if = 0;
-static String *kpp_ifdef = 0;
-static String *kpp_ifndef = 0;
-static String *kpp_name = 0;
-static String *kpp_swigmacro = 0;
-static String *kpp_symbols = 0;
-static String *kpp_undef = 0;
-static String *kpp_value = 0;
-static String *kpp_varargs = 0;
-static String *kpp_error = 0;
-static String *kpp_warning = 0;
-static String *kpp_line = 0;
-static String *kpp_include = 0;
-static String *kpp_pragma = 0;
-static String *kpp_level = 0;
-
-static String *kpp_dline = 0;
-static String *kpp_ddefine = 0;
-static String *kpp_dinclude = 0;
-static String *kpp_dimport = 0;
-static String *kpp_dbeginfile = 0;
-static String *kpp_dextern = 0;
-
-static String *kpp_LINE = 0;
-static String *kpp_FILE = 0;
-
-static String *kpp_hash_if = 0;
-static String *kpp_hash_elif = 0;
-
-void Preprocessor_init(void) {
-  Hash *s;
-
-  kpp_args = NewString("args");
-  kpp_define = NewString("define");
-  kpp_defined = NewString("defined");
-  kpp_else = NewString("else");
-  kpp_elif = NewString("elif");
-  kpp_endif = NewString("endif");
-  kpp_expanded = NewString("*expanded*");
-  kpp_if = NewString("if");
-  kpp_ifdef = NewString("ifdef");
-  kpp_ifndef = NewString("ifndef");
-  kpp_name = NewString("name");
-  kpp_swigmacro = NewString("swigmacro");
-  kpp_symbols = NewString("symbols");
-  kpp_undef = NewString("undef");
-  kpp_value = NewString("value");
-  kpp_error = NewString("error");
-  kpp_warning = NewString("warning");
-  kpp_pragma = NewString("pragma");
-  kpp_level = NewString("level");
-  kpp_line = NewString("line");
-  kpp_include = NewString("include");
-  kpp_varargs = NewString("varargs");
-
-  kpp_dinclude = NewString("%include");
-  kpp_dimport = NewString("%import");
-  kpp_dbeginfile = NewString("%beginfile");
-  kpp_dextern = NewString("%extern");
-  kpp_ddefine = NewString("%define");
-  kpp_dline = NewString("%line");
-
-
-  kpp_LINE = NewString("__LINE__");
-  kpp_FILE = NewString("__FILE__");
-
-  kpp_hash_if = NewString("#if");
-  kpp_hash_elif = NewString("#elif");
-
-  cpp = NewHash();
-  s = NewHash();
-  Setattr(cpp, kpp_symbols, s);
-  Delete(s);
-  Preprocessor_expr_init();	/* Initialize the expression evaluator */
-  included_files = NewHash();
-
-  id_scan = NewScanner();
-
-}
-
-void Preprocessor_delete(void) {
-  Delete(kpp_args);
-  Delete(kpp_define);
-  Delete(kpp_defined);
-  Delete(kpp_else);
-  Delete(kpp_elif);
-  Delete(kpp_endif);
-  Delete(kpp_expanded);
-  Delete(kpp_if);
-  Delete(kpp_ifdef);
-  Delete(kpp_ifndef);
-  Delete(kpp_name);
-  Delete(kpp_swigmacro);
-  Delete(kpp_symbols);
-  Delete(kpp_undef);
-  Delete(kpp_value);
-  Delete(kpp_error);
-  Delete(kpp_warning);
-  Delete(kpp_pragma);
-  Delete(kpp_level);
-  Delete(kpp_line);
-  Delete(kpp_include);
-  Delete(kpp_varargs);
-
-  Delete(kpp_dinclude);
-  Delete(kpp_dimport);
-  Delete(kpp_dbeginfile);
-  Delete(kpp_dextern);
-  Delete(kpp_ddefine);
-  Delete(kpp_dline);
-
-  Delete(kpp_LINE);
-  Delete(kpp_FILE);
-
-  Delete(kpp_hash_if);
-  Delete(kpp_hash_elif);
-
-  Delete(cpp);
-  Delete(included_files);
-  Preprocessor_expr_delete();
-  DelScanner(id_scan);
-
-  Delete(dependencies);
-
-  Delete(Swig_add_directory(0));
-}
-
-/* -----------------------------------------------------------------------------
- * void Preprocessor_include_all() - Instruct preprocessor to include all files
- * ----------------------------------------------------------------------------- */
-void Preprocessor_include_all(int a) {
-  include_all = a;
-}
-
-void Preprocessor_import_all(int a) {
-  import_all = a;
-}
-
-void Preprocessor_ignore_missing(int a) {
-  ignore_missing = a;
-}
-
-void Preprocessor_error_as_warning(int a) {
-  error_as_warning = a;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Preprocessor_define()
- *
- * Defines a new C preprocessor symbol.   swigmacro specifies whether or not the macro has
- * SWIG macro semantics.
- * ----------------------------------------------------------------------------- */
-
-
-String *Macro_vararg_name(const_String_or_char_ptr str, const_String_or_char_ptr line) {
-  String *argname;
-  String *varargname;
-  char *s, *dots;
-
-  argname = Copy(str);
-  s = Char(argname);
-  dots = strchr(s, '.');
-  if (!dots) {
-    Delete(argname);
-    return NULL;
-  }
-
-  if (strcmp(dots, "...") != 0) {
-    Swig_error(Getfile(line), Getline(line), "Illegal macro argument name '%s'\n", str);
-    Delete(argname);
-    return NULL;
-  }
-  if (dots == s) {
-    varargname = NewString("__VA_ARGS__");
-  } else {
-    *dots = '\0';
-    varargname = NewString(s);
-  }
-  Delete(argname);
-  return varargname;
-}
-
-Hash *Preprocessor_define(const_String_or_char_ptr _str, int swigmacro) {
-  String *macroname = 0, *argstr = 0, *macrovalue = 0, *file = 0, *s = 0;
-  Hash *macro = 0, *symbols = 0, *m1;
-  List *arglist = 0;
-  int c, line;
-  int varargs = 0;
-  String *str;
-
-  assert(cpp);
-  assert(_str);
-
-  /* First make sure that string is actually a string */
-  if (DohCheck(_str)) {
-    s = Copy(_str);
-    copy_location(_str, s);
-    str = s;
-  } else {
-    str = NewString((char *) _str);
-  }
-  Seek(str, 0, SEEK_SET);
-  line = Getline(str);
-  file = Getfile(str);
-
-  /* Skip over any leading whitespace */
-  skip_whitespace(str, 0);
-
-  /* Now look for a macro name */
-  macroname = NewStringEmpty();
-  copy_location(str, macroname);
-  while ((c = Getc(str)) != EOF) {
-    if (c == '(') {
-      argstr = NewStringEmpty();
-      copy_location(str, argstr);
-      /* It is a macro.  Go extract its argument string */
-      while ((c = Getc(str)) != EOF) {
-	if (c == ')')
-	  break;
-	else
-	  Putc(c, argstr);
-      }
-      if (c != ')') {
-	Swig_error(Getfile(argstr), Getline(argstr), "Missing \')\' in macro parameters\n");
-	goto macro_error;
-      }
-      break;
-    } else if (isidchar(c) || (c == '%')) {
-      Putc(c, macroname);
-    } else if (isspace(c)) {
-      break;
-    } else if (c == '\\') {
-      c = Getc(str);
-      if (c != '\n') {
-	Ungetc(c, str);
-	Ungetc('\\', str);
-	break;
-      }
-    } else {
-      Ungetc(c, str);
-      break;
-    }
-  }
-  if (!swigmacro)
-    skip_whitespace(str, 0);
-  macrovalue = NewStringEmpty();
-  copy_location(str, macrovalue);
-  while ((c = Getc(str)) != EOF) {
-    Putc(c, macrovalue);
-  }
-
-  /* If there are any macro arguments, convert into a list */
-  if (argstr) {
-    String *argname, *varargname;
-    arglist = NewList();
-    Seek(argstr, 0, SEEK_SET);
-    argname = NewStringEmpty();
-    while ((c = Getc(argstr)) != EOF) {
-      if (c == ',') {
-	varargname = Macro_vararg_name(argname, argstr);
-	if (varargname) {
-	  Delete(varargname);
-	  Swig_error(Getfile(argstr), Getline(argstr), "Variable length macro argument must be last parameter\n");
-	} else {
-	  Append(arglist, argname);
-	}
-	Delete(argname);
-	argname = NewStringEmpty();
-      } else if (isidchar(c) || (c == '.')) {
-	Putc(c, argname);
-      } else if (!(isspace(c) || (c == '\\'))) {
-	Delete(argname);
-	Swig_error(Getfile(argstr), Getline(argstr), "Illegal character in macro argument name\n");
-	goto macro_error;
-      }
-    }
-    if (Len(argname)) {
-      /* Check for varargs */
-      varargname = Macro_vararg_name(argname, argstr);
-      if (varargname) {
-	Append(arglist, varargname);
-	Delete(varargname);
-	varargs = 1;
-      } else {
-	Append(arglist, argname);
-      }
-    }
-    Delete(argname);
-  }
-
-  if (!swigmacro) {
-    Replace(macrovalue, "\\\n", " ", DOH_REPLACE_NOQUOTE);
-  }
-
-  /* Look for special # substitutions.   We only consider # that appears
-     outside of quotes and comments */
-
-  {
-    int state = 0;
-    char *cc = Char(macrovalue);
-    while (*cc) {
-      switch (state) {
-      case 0:
-	if (*cc == '#')
-	  *cc = '\001';
-	else if (*cc == '/')
-	  state = 10;
-	else if (*cc == '\'')
-	  state = 20;
-	else if (*cc == '\"')
-	  state = 30;
-	break;
-      case 10:
-	if (*cc == '*')
-	  state = 11;
-	else if (*cc == '/')
-	  state = 15;
-	else {
-	  state = 0;
-	  cc--;
-	}
-	break;
-      case 11:
-	if (*cc == '*')
-	  state = 12;
-	break;
-      case 12:
-	if (*cc == '/')
-	  state = 0;
-	else if (*cc != '*')
-	  state = 11;
-	break;
-      case 15:
-	if (*cc == '\n')
-	  state = 0;
-	break;
-      case 20:
-	if (*cc == '\'')
-	  state = 0;
-	if (*cc == '\\')
-	  state = 21;
-	break;
-      case 21:
-	state = 20;
-	break;
-      case 30:
-	if (*cc == '\"')
-	  state = 0;
-	if (*cc == '\\')
-	  state = 31;
-	break;
-      case 31:
-	state = 30;
-	break;
-      default:
-	break;
-      }
-      cc++;
-    }
-  }
-
-  /* Get rid of whitespace surrounding # */
-  /*  Replace(macrovalue,"#","\001",DOH_REPLACE_NOQUOTE); */
-  while (strstr(Char(macrovalue), "\001 ")) {
-    Replace(macrovalue, "\001 ", "\001", DOH_REPLACE_ANY);
-  }
-  while (strstr(Char(macrovalue), " \001")) {
-    Replace(macrovalue, " \001", "\001", DOH_REPLACE_ANY);
-  }
-  /* Replace '##' with a special token */
-  Replace(macrovalue, "\001\001", "\002", DOH_REPLACE_ANY);
-  /* Replace '#@' with a special token */
-  Replace(macrovalue, "\001@", "\004", DOH_REPLACE_ANY);
-  /* Replace '##@' with a special token */
-  Replace(macrovalue, "\002@", "\005", DOH_REPLACE_ANY);
-
-  /* Go create the macro */
-  macro = NewHash();
-  Setattr(macro, kpp_name, macroname);
-
-  if (arglist) {
-    Setattr(macro, kpp_args, arglist);
-    Delete(arglist);
-    if (varargs) {
-      Setattr(macro, kpp_varargs, "1");
-    }
-  }
-  Setattr(macro, kpp_value, macrovalue);
-  Setline(macro, line);
-  Setfile(macro, file);
-  if (swigmacro) {
-    Setattr(macro, kpp_swigmacro, "1");
-  }
-  symbols = Getattr(cpp, kpp_symbols);
-  if ((m1 = Getattr(symbols, macroname))) {
-    if (!Checkattr(m1, kpp_value, macrovalue)) {
-      Swig_error(Getfile(macroname), Getline(macroname), "Macro '%s' redefined,\n", macroname);
-      Swig_error(Getfile(m1), Getline(m1), "previous definition of '%s'.\n", macroname);
-      goto macro_error;
-    }
-  } else {
-    Setattr(symbols, macroname, macro);
-    Delete(macro);
-  }
-
-  Delete(macroname);
-  Delete(macrovalue);
-
-  Delete(str);
-  Delete(argstr);
-  return macro;
-
-macro_error:
-  Delete(str);
-  Delete(argstr);
-  Delete(arglist);
-  Delete(macroname);
-  Delete(macrovalue);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Preprocessor_undef()
- *
- * Undefines a macro.
- * ----------------------------------------------------------------------------- */
-void Preprocessor_undef(const_String_or_char_ptr str) {
-  Hash *symbols;
-  assert(cpp);
-  symbols = Getattr(cpp, kpp_symbols);
-  Delattr(symbols, str);
-}
-
-/* -----------------------------------------------------------------------------
- * find_args()
- *
- * Isolates macro arguments and returns them in a list.   For each argument,
- * leading and trailing whitespace is stripped (ala K&R, pg. 230).
- * ----------------------------------------------------------------------------- */
-static List *find_args(String *s, int ismacro, String *macro_name) {
-  List *args;
-  String *str;
-  int c, level;
-  long pos;
-
-  /* Create a new list */
-  args = NewList();
-  copy_location(s, args);
-
-  /* First look for a '(' */
-  pos = Tell(s);
-  skip_whitespace(s, 0);
-
-  /* Now see if the next character is a '(' */
-  c = Getc(s);
-  if (c != '(') {
-    /* Not a macro, bail out now! */
-    assert(pos != -1);
-    (void)Seek(s, pos, SEEK_SET);
-    Delete(args);
-    return 0;
-  }
-  c = Getc(s);
-  /* Okay.  This appears to be a macro so we will start isolating arguments */
-  while (c != EOF) {
-    if (isspace(c)) {
-      skip_whitespace(s, 0);	/* Skip leading whitespace */
-      c = Getc(s);
-    }
-    str = NewStringEmpty();
-    copy_location(s, str);
-    level = 0;
-    while (c != EOF) {
-      if (c == '\"') {
-	Putc(c, str);
-	skip_tochar(s, '\"', str);
-	c = Getc(s);
-	continue;
-      } else if (c == '\'') {
-	Putc(c, str);
-	skip_tochar(s, '\'', str);
-	c = Getc(s);
-	continue;
-      }
-      if ((c == ',') && (level == 0))
-	break;
-      if ((c == ')') && (level == 0))
-	break;
-      Putc(c, str);
-      if (c == '(')
-	level++;
-      if (c == ')')
-	level--;
-      c = Getc(s);
-    }
-    if (level > 0) {
-      goto unterm;
-    }
-    Chop(str);
-    if (Len(args) || Len(str))
-      Append(args, str);
-    Delete(str);
-
-    /*    if (Len(str) && (c != ')'))
-       Append(args,str); */
-
-    if (c == ')')
-      return args;
-    c = Getc(s);
-  }
-unterm:
-  if (ismacro)
-    Swig_error(Getfile(args), Getline(args), "Unterminated call invoking macro '%s'\n", macro_name);
-  else
-    Swig_error(Getfile(args), Getline(args), "Unterminated call to '%s'\n", macro_name);
-  return args;
-}
-
-/* -----------------------------------------------------------------------------
- * DOH *get_filename()
- *
- * Read a filename from str.   A filename can be enclosed in quotes, angle brackets,
- * or bare.
- * ----------------------------------------------------------------------------- */
-
-static String *get_filename(String *str, int *sysfile) {
-  String *fn;
-  int c;
-
-  fn = NewStringEmpty();
-  copy_location(str, fn);
-  c = Getc(str);
-  *sysfile = 0;
-  if (c == '\"') {
-    while (((c = Getc(str)) != EOF) && (c != '\"'))
-      Putc(c, fn);
-  } else if (c == '<') {
-    *sysfile = 1;
-    while (((c = Getc(str)) != EOF) && (c != '>'))
-      Putc(c, fn);
-  } else {
-    String *preprocessed_str;
-    Putc(c, fn);
-    while (((c = Getc(str)) != EOF) && (!isspace(c)))
-      Putc(c, fn);
-    if (isspace(c))
-      Ungetc(c, str);
-    preprocessed_str = Preprocessor_replace(fn);
-    Seek(preprocessed_str, 0, SEEK_SET);
-    Delete(fn);
-
-    fn = NewStringEmpty();
-    copy_location(preprocessed_str, fn);
-    c = Getc(preprocessed_str);
-    if (c == '\"') {
-      while (((c = Getc(preprocessed_str)) != EOF) && (c != '\"'))
-	Putc(c, fn);
-    } else if (c == '<') {
-      *sysfile = 1;
-      while (((c = Getc(preprocessed_str)) != EOF) && (c != '>'))
-	Putc(c, fn);
-    } else {
-      fn = Copy(preprocessed_str);
-    }
-    Delete(preprocessed_str);
-  }
-  Swig_filename_unescape(fn);
-  Swig_filename_correct(fn);
-  Seek(fn, 0, SEEK_SET);
-  return fn;
-}
-
-static String *get_options(String *str) {
-  int c;
-  c = Getc(str);
-  if (c == '(') {
-    String *opt;
-    int level = 1;
-    opt = NewString("(");
-    while (((c = Getc(str)) != EOF)) {
-      Putc(c, opt);
-      if (c == ')') {
-	level--;
-	if (!level)
-	  return opt;
-      }
-      if (c == '(')
-	level++;
-    }
-    Delete(opt);
-    return 0;
-  } else {
-    Ungetc(c, str);
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * expand_macro()
- *
- * Perform macro expansion and return a new string.  Returns NULL if some sort
- * of error occurred.
- * name - name of the macro
- * args - arguments passed to the macro
- * line_file - only used for line/file name when reporting errors
- * ----------------------------------------------------------------------------- */
-
-static String *expand_macro(String *name, List *args, String *line_file) {
-  String *ns;
-  DOH *symbols, *macro, *margs, *mvalue, *temp, *tempa, *e;
-  int i, l;
-  int isvarargs = 0;
-
-  symbols = Getattr(cpp, kpp_symbols);
-  if (!symbols)
-    return 0;
-
-  /* See if the name is actually defined */
-  macro = Getattr(symbols, name);
-  if (!macro)
-    return 0;
-
-  if (macro_level == 0) {
-    /* Store the start of the macro should the macro contain __LINE__ and __FILE__ for expansion */
-    macro_start_line = Getline(args ? args : line_file);
-    macro_start_file = Getfile(args ? args : line_file);
-  }
-  macro_level++;
-
-  if (Getattr(macro, kpp_expanded)) {
-    ns = NewStringEmpty();
-    Append(ns, name);
-    if (args) {
-      int lenargs = Len(args);
-      if (lenargs)
-	Putc('(', ns);
-      for (i = 0; i < lenargs; i++) {
-	Append(ns, Getitem(args, i));
-	if (i < (lenargs - 1))
-	  Putc(',', ns);
-      }
-      if (i)
-	Putc(')', ns);
-    }
-    macro_level--;
-    return ns;
-  }
-
-  /* Get macro arguments and value */
-  mvalue = Getattr(macro, kpp_value);
-  assert(mvalue);
-  margs = Getattr(macro, kpp_args);
-
-  if (args && Getattr(macro, kpp_varargs)) {
-    isvarargs = 1;
-    /* Variable length argument macro.  We need to collect all of the extra arguments into a single argument */
-    if (Len(args) >= (Len(margs) - 1)) {
-      int i;
-      int vi, na;
-      String *vararg = NewStringEmpty();
-      vi = Len(margs) - 1;
-      na = Len(args);
-      for (i = vi; i < na; i++) {
-	Append(vararg, Getitem(args, i));
-	if ((i + 1) < na) {
-	  Append(vararg, ",");
-	}
-      }
-      /* Remove arguments */
-      for (i = vi; i < na; i++) {
-	Delitem(args, vi);
-      }
-      Append(args, vararg);
-      Delete(vararg);
-    }
-  }
-  /* If there are arguments, see if they match what we were given */
-  if (args && (margs) && (Len(margs) != Len(args))) {
-    if (Len(margs) > (1 + isvarargs))
-      Swig_error(macro_start_file, macro_start_line, "Macro '%s' expects %d arguments\n", name, Len(margs) - isvarargs);
-    else if (Len(margs) == (1 + isvarargs))
-      Swig_error(macro_start_file, macro_start_line, "Macro '%s' expects 1 argument\n", name);
-    else
-      Swig_error(macro_start_file, macro_start_line, "Macro '%s' expects no arguments\n", name);
-    macro_level--;
-    return 0;
-  }
-
-  /* If the macro expects arguments, but none were supplied, we leave it in place */
-  if (!args && (margs) && Len(margs) > 0) {
-    macro_level--;
-    return NewString(name);
-  }
-
-  /* Copy the macro value */
-  ns = Copy(mvalue);
-  copy_location(mvalue, ns);
-
-  /* Tag the macro as being expanded.   This is to avoid recursion in
-     macro expansion */
-
-  temp = NewStringEmpty();
-  tempa = NewStringEmpty();
-  if (args && margs) {
-    l = Len(margs);
-    for (i = 0; i < l; i++) {
-      DOH *arg, *aname;
-      String *reparg;
-      arg = Getitem(args, i);	/* Get an argument value */
-      reparg = Preprocessor_replace(arg);
-      aname = Getitem(margs, i);	/* Get macro argument name */
-      if (strstr(Char(ns), "\001")) {
-	/* Try to replace a quoted version of the argument */
-	Clear(temp);
-	Clear(tempa);
-	Printf(temp, "\001%s", aname);
-	Printf(tempa, "\"%s\"", arg);
-	Replace(ns, temp, tempa, DOH_REPLACE_ID_END);
-      }
-      if (strstr(Char(ns), "\002")) {
-	/* Look for concatenation tokens */
-	Clear(temp);
-	Clear(tempa);
-	Printf(temp, "\002%s", aname);
-	Append(tempa, "\002\003");
-	Replace(ns, temp, tempa, DOH_REPLACE_ID_END);
-	Clear(temp);
-	Clear(tempa);
-	Printf(temp, "%s\002", aname);
-	Append(tempa, "\003\002");
-	Replace(ns, temp, tempa, DOH_REPLACE_ID_BEGIN);
-      }
-
-      /* Non-standard macro expansion.   The value `x` is replaced by a quoted
-         version of the argument except that if the argument is already quoted
-         nothing happens */
-
-      if (strchr(Char(ns), '`')) {
-	String *rep;
-	char *c;
-	Clear(temp);
-	Printf(temp, "`%s`", aname);
-	c = Char(arg);
-	if (*c == '\"') {
-	  rep = arg;
-	} else {
-	  Clear(tempa);
-	  Printf(tempa, "\"%s\"", arg);
-	  rep = tempa;
-	}
-	Replace(ns, temp, rep, DOH_REPLACE_ANY);
-      }
-
-      /* Non-standard mangle expansions.  
-         The #@Name is replaced by mangle_arg(Name). */
-      if (strstr(Char(ns), "\004")) {
-	String *marg = Swig_string_mangle(arg);
-	Clear(temp);
-	Printf(temp, "\004%s", aname);
-	Replace(ns, temp, marg, DOH_REPLACE_ID_END);
-	Delete(marg);
-      }
-      if (strstr(Char(ns), "\005")) {
-	String *marg = Swig_string_mangle(arg);
-	Clear(temp);
-	Clear(tempa);
-	Printf(temp, "\005%s", aname);
-	Printf(tempa, "\"%s\"", marg);
-	Replace(ns, temp, tempa, DOH_REPLACE_ID_END);
-	Delete(marg);
-      }
-
-      if (isvarargs && i == l - 1 && Len(arg) == 0) {
-	/* Zero length varargs macro argument.   We search for commas that might appear before and nuke them */
-	char *a, *s, *t, *name;
-	int namelen;
-	s = Char(ns);
-	name = Char(aname);
-	namelen = Len(aname);
-	a = strstr(s, name);
-	while (a) {
-	  char ca = a[namelen + 1];
-	  if (!isidchar((int) ca)) {
-	    /* Matched the entire vararg name, not just a prefix */
-	    t = a - 1;
-	    if (*t == '\002') {
-	      t--;
-	      while (t >= s) {
-		if (isspace((int) *t))
-		  t--;
-		else if (*t == ',') {
-		  *t = ' ';
-		} else
-		  break;
-	      }
-	    }
-	  }
-	  a = strstr(a + namelen, name);
-	}
-      }
-      /*      Replace(ns, aname, arg, DOH_REPLACE_ID); */
-      Replace(ns, aname, reparg, DOH_REPLACE_ID);	/* Replace expanded args */
-      Replace(ns, "\003", arg, DOH_REPLACE_ANY);	/* Replace unexpanded arg */
-      Delete(reparg);
-    }
-  }
-  Replace(ns, "\002", "", DOH_REPLACE_ANY);	/* Get rid of concatenation tokens */
-  Replace(ns, "\001", "#", DOH_REPLACE_ANY);	/* Put # back (non-standard C) */
-  Replace(ns, "\004", "#@", DOH_REPLACE_ANY);	/* Put # back (non-standard C) */
-
-  /* Expand this macro even further */
-  Setattr(macro, kpp_expanded, "1");
-
-  e = Preprocessor_replace(ns);
-
-  Delattr(macro, kpp_expanded);
-  Delete(ns);
-
-  if (Getattr(macro, kpp_swigmacro)) {
-    String *g;
-    String *f = NewStringEmpty();
-    Seek(e, 0, SEEK_SET);
-    copy_location(macro, e);
-    g = Preprocessor_parse(e);
-
-#if 0
-    /* Drop the macro in place, but with a marker around it */
-    Printf(f, "/*@%s,%d,%s@*/%s/*@@*/", Getfile(macro), Getline(macro), name, g);
-#else
-    /* Use simplified around markers to properly count lines in cscanner.c */
-    if (strchr(Char(g), '\n')) {
-      Printf(f, "/*@SWIG:%s,%d,%s@*/%s/*@SWIG@*/", Getfile(macro), Getline(macro), name, g);
-#if 0
-      Printf(f, "/*@SWIG:%s@*/%s/*@SWIG@*/", name, g);
-#endif
-    } else {
-      Append(f, g);
-    }
-#endif
-
-    Delete(g);
-    Delete(e);
-    e = f;
-  }
-  macro_level--;
-  Delete(temp);
-  Delete(tempa);
-  return e;
-}
-
-/* -----------------------------------------------------------------------------
- * DOH *Preprocessor_replace(DOH *s)
- *
- * Performs a macro substitution on a string s.  Returns a new string with
- * substitutions applied.   This function works by walking down s and looking
- * for identifiers.   When found, a check is made to see if they are macros
- * which are then expanded.
- * ----------------------------------------------------------------------------- */
-
-/* #define SWIG_PUT_BUFF  */
-
-static DOH *Preprocessor_replace(DOH *s) {
-  DOH *ns, *symbols, *m;
-  int c, i, state = 0;
-  String *id = NewStringEmpty();
-
-  assert(cpp);
-  symbols = Getattr(cpp, kpp_symbols);
-
-  ns = NewStringEmpty();
-  copy_location(s, ns);
-  Seek(s, 0, SEEK_SET);
-
-  /* Try to locate identifiers in s and replace them with macro replacements */
-  while ((c = Getc(s)) != EOF) {
-    switch (state) {
-    case 0:
-      if (isidentifier(c)) {
-	Clear(id);
-	Putc(c, id);
-	state = 4;
-      } else if (c == '%') {
-	Clear(id);
-	Putc(c, id);
-	state = 2;
-      } else if (c == '#') {
-	Clear(id);
-	Putc(c, id);
-	state = 4;
-      } else if (c == '\"') {
-	Putc(c, ns);
-	skip_tochar(s, '\"', ns);
-      } else if (c == '\'') {
-	Putc(c, ns);
-	skip_tochar(s, '\'', ns);
-      } else if (c == '/') {
-	Putc(c, ns);
-	state = 10;
-      } else if (c == '\\') {
-	Putc(c, ns);
-	c = Getc(s);
-	if (c == '\n') {
-	  Putc(c, ns);
-	} else {
-	  Ungetc(c, s);
-	}
-      } else if (c == '\n') {
-	Putc(c, ns);
-	expand_defined_operator = 0;
-      } else {
-	Putc(c, ns);
-      }
-      break;
-    case 2:
-      /* Found '%#' */
-      if (c == '#') {
-	Putc(c, id);
-	state = 4;
-      } else {
-	Ungetc(c, s);
-	state = 4;
-      }
-      break;
-    case 4:			/* An identifier */
-      if (isidchar(c)) {
-	Putc(c, id);
-	state = 4;
-      } else {
-	/* We found the end of a valid identifier */
-	Ungetc(c, s);
-	/* See if this is the special "defined" operator */
-       	if (Equal(kpp_defined, id)) {
-	  if (expand_defined_operator) {
-	    int lenargs = 0;
-	    DOH *args = 0;
-	    /* See whether or not a parenthesis has been used */
-	    skip_whitespace(s, 0);
-	    c = Getc(s);
-	    if (c == '(') {
-	      Ungetc(c, s);
-	      args = find_args(s, 0, kpp_defined);
-	    } else if (isidchar(c)) {
-	      DOH *arg = NewStringEmpty();
-	      args = NewList();
-	      Putc(c, arg);
-	      while (((c = Getc(s)) != EOF)) {
-		if (!isidchar(c)) {
-		  Ungetc(c, s);
-		  break;
-		}
-		Putc(c, arg);
-	      }
-	      if (Len(arg))
-		Append(args, arg);
-	      Delete(arg);
-	    } else {
-	      Seek(s, -1, SEEK_CUR);
-	    }
-	    lenargs = Len(args);
-	    if ((!args) || (!lenargs)) {
-	      /* This is not a defined() operator. */
-	      Append(ns, id);
-	      state = 0;
-	      break;
-	    }
-	    for (i = 0; i < lenargs; i++) {
-	      DOH *o = Getitem(args, i);
-	      if (!Getattr(symbols, o)) {
-		break;
-	      }
-	    }
-	    if (i < lenargs)
-	      Putc('0', ns);
-	    else
-	      Putc('1', ns);
-	    Delete(args);
-	  } else {
-	    Append(ns, id);
-	  }
-	  state = 0;
-	  break;
-	} else if (Equal(kpp_LINE, id)) {
-	  Printf(ns, "%d", macro_level > 0 ? macro_start_line : Getline(s));
-	  state = 0;
-	  break;
-	} else if (Equal(kpp_FILE, id)) {
-	  String *fn = Copy(macro_level > 0 ? macro_start_file : Getfile(s));
-	  Replaceall(fn, "\\", "\\\\");
-	  Printf(ns, "\"%s\"", fn);
-	  Delete(fn);
-	  state = 0;
-	  break;
-	} else if (Equal(kpp_hash_if, id) || Equal(kpp_hash_elif, id)) {
-	  expand_defined_operator = 1;
-	  Append(ns, id);
-	  /*
-	} else if (Equal("%#if", id) || Equal("%#ifdef", id)) {
-	  Swig_warning(998, Getfile(s), Getline(s), "Found: %s preprocessor directive.\n", id);
-	  Append(ns, id);
-	} else if (Equal("#ifdef", id) || Equal("#ifndef", id)) {
-	  Swig_warning(998, Getfile(s), Getline(s), "The %s preprocessor directive does not work in macros, try #if instead.\n", id);
-	  Append(ns, id);
-	  */
-	} else if ((m = Getattr(symbols, id))) {
-	  /* See if the macro is defined in the preprocessor symbol table */
-	  DOH *args = 0;
-	  DOH *e;
-	  int macro_additional_lines = 0;
-	  /* See if the macro expects arguments */
-	  if (Getattr(m, kpp_args)) {
-	    /* Yep.  We need to go find the arguments and do a substitution */
-	    int line = Getline(s);
-	    args = find_args(s, 1, id);
-	    macro_additional_lines = Getline(s) - line;
-	    assert(macro_additional_lines >= 0);
-	    if (!Len(args)) {
-	      Delete(args);
-	      args = 0;
-	    }
-	  } else {
-	    args = 0;
-	  }
-	  e = expand_macro(id, args, s);
-	  if (e) {
-	    Append(ns, e);
-	  }
-	  while (macro_additional_lines--) {
-	    Putc('\n', ns);
-	  }
-	  Delete(e);
-	  Delete(args);
-	} else {
-	  Append(ns, id);
-	}
-	state = 0;
-      }
-      break;
-    case 10:
-      if (c == '/')
-	state = 11;
-      else if (c == '*')
-	state = 12;
-      else {
-	Ungetc(c, s);
-	state = 0;
-	break;
-      }
-      Putc(c, ns);
-      break;
-    case 11:
-      /* in C++ comment */
-      Putc(c, ns);
-      if (c == '\n') {
-	expand_defined_operator = 0;
-	state = 0;
-      }
-      break;
-    case 12:
-      /* in C comment */
-      Putc(c, ns);
-      if (c == '*')
-	state = 13;
-      break;
-    case 13:
-      Putc(c, ns);
-      if (c == '/')
-	state = 0;
-      else if (c != '*')
-	state = 12;
-      break;
-    default:
-      state = 0;
-      break;
-    }
-  }
-
-  /* Identifier at the end */
-  if (state == 2 || state == 4) {
-    /* See if this is the special "defined" operator */
-    if (Equal(kpp_defined, id)) {
-      Swig_error(Getfile(s), Getline(s), "No arguments given to defined()\n");
-    } else if (Equal(kpp_LINE, id)) {
-      Printf(ns, "%d", macro_level > 0 ? macro_start_line : Getline(s));
-    } else if (Equal(kpp_FILE, id)) {
-      String *fn = Copy(macro_level > 0 ? macro_start_file : Getfile(s));
-      Replaceall(fn, "\\", "\\\\");
-      Printf(ns, "\"%s\"", fn);
-      Delete(fn);
-    } else if (Getattr(symbols, id)) {
-      DOH *e;
-      /* Yes.  There is a macro here */
-      /* See if the macro expects arguments */
-      e = expand_macro(id, 0, s);
-      if (e)
-	Append(ns, e);
-      Delete(e);
-    } else {
-      Append(ns, id);
-    }
-  }
-  Delete(id);
-  return ns;
-}
-
-
-/* -----------------------------------------------------------------------------
- * int checkpp_id(DOH *s)
- *
- * Checks the string s to see if it contains any unresolved identifiers.  This
- * function contains the heuristic that determines whether or not a macro
- * definition passes through the preprocessor as a constant declaration.
- * ----------------------------------------------------------------------------- */
-static int checkpp_id(DOH *s) {
-  int c;
-  int hastok = 0;
-  Scanner *scan = id_scan;
-
-  Seek(s, 0, SEEK_SET);
-
-  Scanner_clear(scan);
-  s = Copy(s);
-  Seek(s, SEEK_SET, 0);
-  Scanner_push(scan, s);
-  while ((c = Scanner_token(scan))) {
-    hastok = 1;
-    if ((c == SWIG_TOKEN_ID) || (c == SWIG_TOKEN_LBRACE) || (c == SWIG_TOKEN_RBRACE))
-      return 1;
-  }
-  if (!hastok)
-    return 1;
-  return 0;
-}
-
-/* addline().  Utility function for adding lines to a chunk */
-static void addline(DOH *s1, DOH *s2, int allow) {
-  if (allow) {
-    Append(s1, s2);
-  } else {
-    char *c = Char(s2);
-    while (*c) {
-      if (*c == '\n')
-	Putc('\n', s1);
-      c++;
-    }
-  }
-}
-
-static void add_chunk(DOH *ns, DOH *chunk, int allow) {
-  DOH *echunk;
-  Seek(chunk, 0, SEEK_SET);
-  if (allow) {
-    echunk = Preprocessor_replace(chunk);
-    addline(ns, echunk, allow);
-    Delete(echunk);
-  } else {
-    addline(ns, chunk, 0);
-  }
-  Clear(chunk);
-}
-
-/*
-  push/pop_imported(): helper functions for defining and undefining
-  SWIGIMPORTED (when %importing a file).
- */
-static void push_imported() {
-  if (imported_depth == 0) {
-    Preprocessor_define("SWIGIMPORTED 1", 0);
-  }
-  ++imported_depth;
-}
-
-static void pop_imported() {
-  --imported_depth;
-  if (imported_depth == 0) {
-    Preprocessor_undef("SWIGIMPORTED");
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Preprocessor_parse()
- *
- * Parses the string s.  Returns a new string containing the preprocessed version.
- *
- * Parsing rules :
- *       1.  Lines starting with # are C preprocessor directives
- *       2.  Macro expansion inside strings is not allowed
- *       3.  All code inside false conditionals is changed to blank lines
- *       4.  Code in %{, %} is not parsed because it may need to be
- *           included inline (with all preprocessor directives included).
- * ----------------------------------------------------------------------------- */
-
-String *Preprocessor_parse(String *s) {
-  String *ns;			/* New string containing the preprocessed text */
-  String *chunk, *decl;
-  Hash *symbols;
-  String *id = 0, *value = 0, *comment = 0;
-  int i, state, e, c;
-  int start_line = 0;
-  int allow = 1;
-  int level = 0;
-  int dlevel = 0;
-  int filelevel = 0;
-  int mask = 0;
-  int start_level = 0;
-  int cpp_lines = 0;
-  int cond_lines[256];
-
-  /* Blow away all carriage returns */
-  Replace(s, "\015", "", DOH_REPLACE_ANY);
-
-  ns = NewStringEmpty();	/* Return result */
-
-  decl = NewStringEmpty();
-  id = NewStringEmpty();
-  value = NewStringEmpty();
-  comment = NewStringEmpty();
-  chunk = NewStringEmpty();
-  copy_location(s, chunk);
-  copy_location(s, ns);
-  symbols = Getattr(cpp, kpp_symbols);
-
-  state = 0;
-  while ((c = Getc(s)) != EOF) {
-    switch (state) {
-    case 0:			/* Initial state - in first column */
-      /* Look for C preprocessor directives.   Otherwise, go directly to state 1 */
-      if (c == '#') {
-	copy_location(s, chunk);
-	add_chunk(ns, chunk, allow);
-	cpp_lines = 1;
-	state = 40;
-      } else if (isspace(c)) {
-	Putc(c, chunk);
-	skip_whitespace(s, chunk);
-      } else {
-	state = 1;
-	Ungetc(c, s);
-      }
-      break;
-    case 1:			/* Non-preprocessor directive */
-      /* Look for SWIG directives */
-      if (c == '%') {
-	state = 100;
-	break;
-      }
-      Putc(c, chunk);
-      if (c == '\n')
-	state = 0;
-      else if (c == '\"') {
-	start_line = Getline(s);
-	if (skip_tochar(s, '\"', chunk) < 0) {
-	  Swig_error(Getfile(s), start_line, "Unterminated string constant\n");
-	}
-      } else if (c == '\'') {
-	start_line = Getline(s);
-	if (skip_tochar(s, '\'', chunk) < 0) {
-	  Swig_error(Getfile(s), start_line, "Unterminated character constant\n");
-	}
-      } else if (c == '/')
-	state = 30;		/* Comment */
-      break;
-
-    case 30:			/* Possibly a comment string of some sort */
-      start_line = Getline(s);
-      Putc(c, chunk);
-      if (c == '/')
-	state = 31;
-      else if (c == '*')
-	state = 32;
-      else
-	state = 1;
-      break;
-    case 31:
-      Putc(c, chunk);
-      if (c == '\n')
-	state = 0;
-      break;
-    case 32:
-      Putc(c, chunk);
-      if (c == '*')
-	state = 33;
-      break;
-    case 33:
-      Putc(c, chunk);
-      if (c == '/')
-	state = 1;
-      else if (c != '*')
-	state = 32;
-      break;
-
-    case 40:			/* Start of a C preprocessor directive */
-      if (c == '\n') {
-	Putc('\n', chunk);
-	state = 0;
-      } else if (isspace(c)) {
-	state = 40;
-      } else {
-	/* Got the start of a preprocessor directive */
-	Ungetc(c, s);
-	Clear(id);
-	copy_location(s, id);
-	state = 41;
-      }
-      break;
-
-    case 41:			/* Build up the name of the preprocessor directive */
-      if ((isspace(c) || (!isalpha(c)))) {
-	Clear(value);
-	Clear(comment);
-	if (c == '\n') {
-	  Ungetc(c, s);
-	  state = 50;
-	} else {
-	  state = 42;
-	  if (!isspace(c)) {
-	    Ungetc(c, s);
-	  }
-	}
-
-	copy_location(s, value);
-	break;
-      }
-      Putc(c, id);
-      break;
-
-    case 42:			/* Strip any leading space before preprocessor value */
-      if (isspace(c)) {
-	if (c == '\n') {
-	  Ungetc(c, s);
-	  state = 50;
-	}
-	break;
-      }
-      state = 43;
-      /* FALL THRU */
-
-    case 43:
-      /* Get preprocessor value */
-      if (c == '\n') {
-	Ungetc(c, s);
-	state = 50;
-      } else if (c == '/') {
-	state = 45;
-      } else if (c == '\"') {
-	Putc(c, value);
-	skip_tochar(s, '\"', value);
-      } else if (c == '\'') {
-	Putc(c, value);
-	skip_tochar(s, '\'', value);
-      } else {
-	Putc(c, value);
-	if (c == '\\')
-	  state = 44;
-      }
-      break;
-
-    case 44:
-      if (c == '\n') {
-	Putc(c, value);
-	cpp_lines++;
-      } else {
-	Ungetc(c, s);
-      }
-      state = 43;
-      break;
-
-      /* States 45-48 are used to remove, but retain comments from macro values.  The comments
-         will be placed in the output in an alternative form */
-
-    case 45:
-      if (c == '/')
-	state = 46;
-      else if (c == '*')
-	state = 47;
-      else if (c == '\n') {
-	Putc('/', value);
-	Ungetc(c, s);
-	state = 50;
-      } else {
-	Putc('/', value);
-	Putc(c, value);
-	state = 43;
-      }
-      break;
-    case 46: /* in C++ comment */
-      if (c == '\n') {
-	Ungetc(c, s);
-	state = 50;
-      } else
-	Putc(c, comment);
-      break;
-    case 47: /* in C comment */
-      if (c == '*')
-	state = 48;
-      else
-	Putc(c, comment);
-      break;
-    case 48:
-      if (c == '/')
-	state = 43;
-      else if (c == '*')
-	Putc(c, comment);
-      else {
-	Putc('*', comment);
-	Putc(c, comment);
-	state = 47;
-      }
-      break;
-    case 50:
-      /* Check for various preprocessor directives */
-      Chop(value);
-      if (Equal(id, kpp_define)) {
-	if (allow) {
-	  DOH *m, *v, *v1;
-	  Seek(value, 0, SEEK_SET);
-	  m = Preprocessor_define(value, 0);
-	  if ((m) && !(Getattr(m, kpp_args))) {
-	    v = Copy(Getattr(m, kpp_value));
-	    copy_location(m, v);
-	    if (Len(v)) {
-	      Swig_error_silent(1);
-	      v1 = Preprocessor_replace(v);
-	      Swig_error_silent(0);
-	      /*              Printf(stdout,"checking '%s'\n", v1); */
-	      if (!checkpp_id(v1)) {
-		if (Len(comment) == 0)
-		  Printf(ns, "%%constant %s = %s;\n", Getattr(m, kpp_name), v1);
-		else
-		  Printf(ns, "%%constant %s = %s; /*%s*/\n", Getattr(m, kpp_name), v1, comment);
-		cpp_lines--;
-	      }
-	      Delete(v1);
-	    }
-	    Delete(v);
-	  }
-	}
-      } else if (Equal(id, kpp_undef)) {
-	if (allow)
-	  Preprocessor_undef(value);
-      } else if (Equal(id, kpp_ifdef)) {
-	cond_lines[level] = Getline(id);
-	level++;
-	if (allow) {
-	  start_level = level;
-	  if (Len(value) > 0) {
-	    /* See if the identifier is in the hash table */
-	    if (!Getattr(symbols, value))
-	      allow = 0;
-	  } else {
-	    Swig_error(Getfile(s), Getline(id), "Missing identifier for #ifdef.\n");
-	    allow = 0;
-	  }
-	  mask = 1;
-	}
-      } else if (Equal(id, kpp_ifndef)) {
-	cond_lines[level] = Getline(id);
-	level++;
-	if (allow) {
-	  start_level = level;
-	  if (Len(value) > 0) {
-	    /* See if the identifier is in the hash table */
-	    if (Getattr(symbols, value))
-	      allow = 0;
-	  } else {
-	    Swig_error(Getfile(s), Getline(id), "Missing identifier for #ifndef.\n");
-	    allow = 0;
-	  }
-	  mask = 1;
-	}
-      } else if (Equal(id, kpp_else)) {
-	if (level <= 0) {
-	  Swig_error(Getfile(s), Getline(id), "Misplaced #else.\n");
-	} else {
-	  cond_lines[level - 1] = Getline(id);
-	  if (Len(value) != 0)
-	    Swig_warning(WARN_PP_UNEXPECTED_TOKENS, Getfile(s), Getline(id), "Unexpected tokens after #else directive.\n");
-	  if (allow) {
-	    allow = 0;
-	    mask = 0;
-	  } else if (level == start_level) {
-	    allow = 1 * mask;
-	  }
-	}
-      } else if (Equal(id, kpp_endif)) {
-	level--;
-	if (level < 0) {
-	  Swig_error(Getfile(id), Getline(id), "Extraneous #endif.\n");
-	  level = 0;
-	} else {
-	  if (level < start_level) {
-	    if (Len(value) != 0)
-	      Swig_warning(WARN_PP_UNEXPECTED_TOKENS, Getfile(s), Getline(id), "Unexpected tokens after #endif directive.\n");
-	    allow = 1;
-	    start_level--;
-	  }
-	}
-      } else if (Equal(id, kpp_if)) {
-	cond_lines[level] = Getline(id);
-	level++;
-	if (allow) {
-	  int val;
-	  String *sval;
-	  expand_defined_operator = 1;
-	  sval = Preprocessor_replace(value);
-	  start_level = level;
-	  Seek(sval, 0, SEEK_SET);
-	  /*      Printf(stdout,"Evaluating '%s'\n", sval); */
-	  if (Len(sval) > 0) {
-	    val = Preprocessor_expr(sval, &e);
-	    if (e) {
-	      const char *msg = Preprocessor_expr_error();
-	      Seek(value, 0, SEEK_SET);
-	      Swig_warning(WARN_PP_EVALUATION, Getfile(value), Getline(value), "Could not evaluate expression '%s'\n", value);
-	      if (msg)
-		Swig_warning(WARN_PP_EVALUATION, Getfile(value), Getline(value), "Error: '%s'\n", msg);
-	      allow = 0;
-	    } else {
-	      if (val == 0)
-		allow = 0;
-	    }
-	  } else {
-	    Swig_error(Getfile(s), Getline(id), "Missing expression for #if.\n");
-	    allow = 0;
-	  }
-	  expand_defined_operator = 0;
-	  mask = 1;
-	}
-      } else if (Equal(id, kpp_elif)) {
-	if (level == 0) {
-	  Swig_error(Getfile(s), Getline(id), "Misplaced #elif.\n");
-	} else {
-	  cond_lines[level - 1] = Getline(id);
-	  if (allow) {
-	    allow = 0;
-	    mask = 0;
-	  } else if (level == start_level) {
-	    int val;
-	    String *sval;
-	    expand_defined_operator = 1;
-	    sval = Preprocessor_replace(value);
-	    Seek(sval, 0, SEEK_SET);
-	    if (Len(sval) > 0) {
-	      val = Preprocessor_expr(sval, &e);
-	      if (e) {
-		const char *msg = Preprocessor_expr_error();
-		Seek(value, 0, SEEK_SET);
-		Swig_warning(WARN_PP_EVALUATION, Getfile(value), Getline(value), "Could not evaluate expression '%s'\n", value);
-		if (msg)
-		  Swig_warning(WARN_PP_EVALUATION, Getfile(value), Getline(value), "Error: '%s'\n", msg);
-		allow = 0;
-	      } else {
-		if (val)
-		  allow = 1 * mask;
-		else
-		  allow = 0;
-	      }
-	    } else {
-	      Swig_error(Getfile(s), Getline(id), "Missing expression for #elif.\n");
-	      allow = 0;
-	    }
-	    expand_defined_operator = 0;
-	  }
-	}
-      } else if (Equal(id, kpp_warning)) {
-	if (allow) {
-	  Swig_warning(WARN_PP_CPP_WARNING, Getfile(s), Getline(id), "CPP #warning, \"%s\".\n", value);
-	}
-      } else if (Equal(id, kpp_error)) {
-	if (allow) {
-	  if (error_as_warning) {
-	    Swig_warning(WARN_PP_CPP_ERROR, Getfile(s), Getline(id), "CPP #error \"%s\".\n", value);
-	  } else {
-	    Swig_error(Getfile(s), Getline(id), "CPP #error \"%s\". Use the -cpperraswarn option to continue swig processing.\n", value);
-	  }
-	}
-      } else if (Equal(id, kpp_line)) {
-      } else if (Equal(id, kpp_include)) {
-	if (((include_all) || (import_all)) && (allow)) {
-	  String *s1, *s2, *fn;
-	  String *dirname;
-	  int sysfile = 0;
-	  if (include_all && import_all) {
-	    Swig_warning(WARN_PP_INCLUDEALL_IMPORTALL, Getfile(s), Getline(id), "Both includeall and importall are defined: using includeall.\n");
-	    import_all = 0;
-	  }
-	  Seek(value, 0, SEEK_SET);
-	  fn = get_filename(value, &sysfile);
-	  s1 = cpp_include(fn, sysfile);
-	  if (s1) {
-	    if (include_all)
-	      Printf(ns, "%%includefile \"%s\" %%beginfile\n", Swig_filename_escape(Swig_last_file()));
-	    else if (import_all) {
-	      Printf(ns, "%%importfile \"%s\" %%beginfile\n", Swig_filename_escape(Swig_last_file()));
-	      push_imported();
-	    }
-
-	    /* See if the filename has a directory component */
-	    dirname = Swig_file_dirname(Swig_last_file());
-	    if (sysfile || !Len(dirname)) {
-	      Delete(dirname);
-	      dirname = 0;
-	    }
-	    if (dirname) {
-	      int len = Len(dirname);
-	      Delslice(dirname, len - 1, len); /* Kill trailing directory delimiter */
-	      Swig_push_directory(dirname);
-	    }
-	    s2 = Preprocessor_parse(s1);
-	    addline(ns, s2, allow);
-	    Append(ns, "%endoffile");
-	    if (dirname) {
-	      Swig_pop_directory();
-	    }
-	    if (import_all) {
-	      pop_imported();
-	    }
-	    Delete(s2);
-	    Delete(dirname);
-	    Delete(s1);
-	  }
-	  Delete(fn);
-	}
-      } else if (Equal(id, kpp_pragma)) {
-	if (Strncmp(value, "SWIG ", 5) == 0) {
-	  char *c = Char(value) + 5;
-	  while (*c && (isspace((int) *c)))
-	    c++;
-	  if (*c) {
-	    if (strncmp(c, "nowarn=", 7) == 0) {
-	      String *val = NewString(c + 7);
-	      String *nowarn = Preprocessor_replace(val);
-	      Swig_warnfilter(nowarn, 1);
-	      Delete(nowarn);
-	      Delete(val);
-	    } else if (strncmp(c, "cpperraswarn=", 13) == 0) {
-	      error_as_warning = atoi(c + 13);
-	    } else {
-              Swig_error(Getfile(s), Getline(id), "Unknown SWIG pragma: %s\n", c);
-            }
-	  }
-	}
-      } else if (Equal(id, kpp_level)) {
-	Swig_error(Getfile(s), Getline(id), "cpp debug: level = %d, startlevel = %d\n", level, start_level);
-      } else if (Equal(id, "")) {
-	/* Null directive */
-      } else {
-	/* Ignore unknown preprocessor directives which are inside an inactive
-	 * conditional (github issue #394). */
-	if (allow)
-	  Swig_error(Getfile(s), Getline(id), "Unknown SWIG preprocessor directive: %s (if this is a block of target language code, delimit it with %%{ and %%})\n", id);
-      }
-      for (i = 0; i < cpp_lines; i++)
-	Putc('\n', ns);
-      state = 0;
-      break;
-
-      /* SWIG directives  */
-    case 100:
-      /* %{,%} block  */
-      if (c == '{') {
-	start_line = Getline(s);
-	copy_location(s, chunk);
-	add_chunk(ns, chunk, allow);
-	Putc('%', chunk);
-	Putc(c, chunk);
-	state = 105;
-      }
-      /* %#cpp -  an embedded C preprocessor directive (we strip off the %)  */
-      else if (c == '#') {
-	add_chunk(ns, chunk, allow);
-	Putc(c, chunk);
-	state = 107;
-      } else if (isidentifier(c)) {
-	Clear(decl);
-	Putc('%', decl);
-	Putc(c, decl);
-	state = 110;
-      } else {
-	Putc('%', chunk);
-	Putc(c, chunk);
-	state = 1;
-      }
-      break;
-
-    case 105:
-      Putc(c, chunk);
-      if (c == '%')
-	state = 106;
-      break;
-
-    case 106:
-      Putc(c, chunk);
-      if (c == '}') {
-	state = 1;
-	addline(ns, chunk, allow);
-	Clear(chunk);
-	copy_location(s, chunk);
-      } else {
-	state = 105;
-      }
-      break;
-
-    case 107:
-      Putc(c, chunk);
-      if (c == '\n') {
-	addline(ns, chunk, allow);
-	Clear(chunk);
-	state = 0;
-      } else if (c == '\\') {
-	state = 108;
-      }
-      break;
-
-    case 108:
-      Putc(c, chunk);
-      state = 107;
-      break;
-
-    case 110:
-      if (!isidchar(c)) {
-	Ungetc(c, s);
-	/* Look for common SWIG directives  */
-	if (Equal(decl, kpp_dinclude) || Equal(decl, kpp_dimport) || Equal(decl, kpp_dextern)) {
-	  /* Got some kind of file inclusion directive, eg: %import(option1="value1") "filename" */
-	  if (allow) {
-	    DOH *s1, *s2, *fn, *opt;
-	    String *options_whitespace = NewStringEmpty();
-	    String *filename_whitespace = NewStringEmpty();
-	    int sysfile = 0;
-
-	    if (Equal(decl, kpp_dextern)) {
-	      Swig_warning(WARN_DEPRECATED_EXTERN, Getfile(s), Getline(s), "%%extern is deprecated. Use %%import instead.\n");
-	      Clear(decl);
-	      Append(decl, "%%import");
-	    }
-	    skip_whitespace(s, options_whitespace);
-	    opt = get_options(s);
-
-	    skip_whitespace(s, filename_whitespace);
-	    fn = get_filename(s, &sysfile);
-	    s1 = cpp_include(fn, sysfile);
-	    if (s1) {
-	      String *dirname;
-	      copy_location(s, chunk);
-	      add_chunk(ns, chunk, allow);
-	      Printf(ns, "%sfile%s%s%s\"%s\" %%beginfile\n", decl, options_whitespace, opt, filename_whitespace, Swig_filename_escape(Swig_last_file()));
-	      if (Equal(decl, kpp_dimport)) {
-		push_imported();
-	      }
-	      dirname = Swig_file_dirname(Swig_last_file());
-	      if (sysfile || !Len(dirname)) {
-		Delete(dirname);
-		dirname = 0;
-	      }
-	      if (dirname) {
-		int len = Len(dirname);
-		Delslice(dirname, len - 1, len); /* Kill trailing directory delimiter */
-		Swig_push_directory(dirname);
-	      }
-	      s2 = Preprocessor_parse(s1);
-	      if (dirname) {
-		Swig_pop_directory();
-	      }
-	      if (Equal(decl, kpp_dimport)) {
-		pop_imported();
-	      }
-	      addline(ns, s2, allow);
-	      Append(ns, "%endoffile");
-	      Delete(s2);
-	      Delete(dirname);
-	      Delete(s1);
-	    }
-	    Delete(fn);
-	    Delete(filename_whitespace);
-	    Delete(options_whitespace);
-	  }
-	  state = 1;
-	} else if (Equal(decl, kpp_dbeginfile)) {
-          /* Got an internal directive marking the beginning of an included file: %beginfile ... %endoffile */
-          filelevel++;
-          start_line = Getline(s);
-          copy_location(s, chunk);
-          add_chunk(ns, chunk, allow);
-          Append(chunk, decl);
-          state = 120;
-	} else if (Equal(decl, kpp_dline)) {
-	  /* Got a line directive  */
-	  state = 1;
-	} else if (Equal(decl, kpp_ddefine)) {
-	  /* Got a define directive  */
-	  dlevel++;
-	  copy_location(s, chunk);
-	  add_chunk(ns, chunk, allow);
-	  Clear(value);
-	  copy_location(s, value);
-	  state = 150;
-	} else {
-	  Append(chunk, decl);
-	  state = 1;
-	}
-      } else {
-	Putc(c, decl);
-      }
-      break;
-
-      /* Searching for the end of a %beginfile block */
-    case 120:
-      Putc(c, chunk);
-      if (c == '%') {
-        const char *bf = "beginfile";
-        const char *ef = "endoffile";
-        char statement[10];
-        int i = 0;
-        for (i = 0; i < 9;) {
-          c = Getc(s);
-          Putc(c, chunk);
-          statement[i++] = (char)c;
-	  if (strncmp(statement, bf, i) && strncmp(statement, ef, i))
-	    break;
-	}
-	c = Getc(s);
-	Ungetc(c, s);
-        if ((i == 9) && (isspace(c))) {
-	  if (strncmp(statement, bf, i) == 0) {
-	    ++filelevel;
-	  } else if (strncmp(statement, ef, i) == 0) {
-            --filelevel;
-            if (!filelevel) {
-              /* Reached end of included file */
-              addline(ns, chunk, allow);
-              Clear(chunk);
-              copy_location(s, chunk);
-              state = 1;
-            }
-          }
-        }
-      }
-      break;
-
-      /* Searching for the end of a %define statement  */
-    case 150:
-      Putc(c, value);
-      if (c == '%') {
-	const char *ed = "enddef";
-	const char *df = "define";
-	char statement[7];
-	int i = 0;
-	for (i = 0; i < 6;) {
-	  c = Getc(s);
-	  Putc(c, value);
-	  statement[i++] = (char)c;
-	  if (strncmp(statement, ed, i) && strncmp(statement, df, i))
-	    break;
-	}
-	c = Getc(s);
-	Ungetc(c, s);
-	if ((i == 6) && (isspace(c))) {
-	  if (strncmp(statement, df, i) == 0) {
-	    ++dlevel;
-	  } else {
-	    if (strncmp(statement, ed, i) == 0) {
-	      --dlevel;
-	      if (!dlevel) {
-		/* Got the macro  */
-		for (i = 0; i < 7; i++) {
-		  Delitem(value, DOH_END);
-		}
-		if (allow) {
-		  Seek(value, 0, SEEK_SET);
-		  Preprocessor_define(value, 1);
-		}
-		addline(ns, value, 0);
-		state = 0;
-	      }
-	    }
-	  }
-	}
-      }
-      break;
-    default:
-      Printf(stderr, "cpp: Invalid parser state %d\n", state);
-      abort();
-      break;
-    }
-  }
-  while (level > 0) {
-    Swig_error(Getfile(s), cond_lines[level - 1], "Missing #endif for conditional starting here\n");
-    level--;
-  }
-  if (state == 120) {
-    Swig_error(Getfile(s), start_line, "Missing %%endoffile for file inclusion block starting here\n");
-  }
-  if (state == 150) {
-    Seek(value, 0, SEEK_SET);
-    Swig_error(Getfile(s), Getline(value), "Missing %%enddef for macro starting here\n", Getline(value));
-  }
-  if ((state >= 105) && (state < 107)) {
-    Swig_error(Getfile(s), start_line, "Unterminated %%{ ... %%} block\n");
-  }
-  if ((state >= 30) && (state < 40)) {
-    Swig_error(Getfile(s), start_line, "Unterminated comment\n");
-  }
-
-  copy_location(s, chunk);
-  add_chunk(ns, chunk, allow);
-
-  /*  DelScope(scp); */
-  Delete(decl);
-  Delete(id);
-  Delete(value);
-  Delete(comment);
-  Delete(chunk);
-
-  return ns;
-}
diff --git a/dependencies2013/win32/swig/Source/Preprocessor/expr.c b/dependencies2013/win32/swig/Source/Preprocessor/expr.c
deleted file mode 100644
index 6d22c8c5..00000000
--- a/dependencies2013/win32/swig/Source/Preprocessor/expr.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * expr.c
- *
- * Integer arithmetic expression evaluator used to handle expressions
- * encountered during preprocessing.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "preprocessor.h"
-
-static Scanner *scan = 0;
-
-typedef struct {
-  int op;
-  long value;
-  String *svalue;
-} exprval;
-
-#define  EXPR_TOP      1
-#define  EXPR_VALUE    2
-#define  EXPR_OP       3
-#define  EXPR_GROUP    4
-#define  EXPR_UMINUS   100
-
-static exprval stack[256];	/* Parsing stack       */
-static int sp = 0;		/* Stack pointer       */
-static int prec[256];		/* Precedence rules    */
-static int expr_init = 0;	/* Initialization flag */
-static const char *errmsg = 0;	/* Parsing error       */
-
-/* Initialize the precedence table for various operators.  Low values have higher precedence */
-static void init_precedence() {
-  prec[SWIG_TOKEN_NOT] = 10;
-  prec[EXPR_UMINUS] = 10;
-  prec[SWIG_TOKEN_STAR] = 20;
-  prec[SWIG_TOKEN_SLASH] = 20;
-  prec[SWIG_TOKEN_PERCENT] = 20;
-  prec[SWIG_TOKEN_PLUS] = 30;
-  prec[SWIG_TOKEN_MINUS] = 30;
-  prec[SWIG_TOKEN_LSHIFT] = 40;
-  prec[SWIG_TOKEN_RSHIFT] = 40;
-  prec[SWIG_TOKEN_AND] = 50;
-  prec[SWIG_TOKEN_XOR] = 60;
-  prec[SWIG_TOKEN_OR] = 70;
-  prec[SWIG_TOKEN_EQUALTO] = 80;
-  prec[SWIG_TOKEN_NOTEQUAL] = 80;
-  prec[SWIG_TOKEN_LESSTHAN] = 80;
-  prec[SWIG_TOKEN_GREATERTHAN] = 80;
-  prec[SWIG_TOKEN_LTEQUAL] = 80;
-  prec[SWIG_TOKEN_GTEQUAL] = 80;
-  prec[SWIG_TOKEN_LNOT] = 90;
-  prec[SWIG_TOKEN_LAND] = 100;
-  prec[SWIG_TOKEN_LOR] = 110;
-  expr_init = 1;
-}
-
-#define UNARY_OP(token) (((token) == SWIG_TOKEN_NOT) || \
-			 ((token) == SWIG_TOKEN_LNOT) || \
-			 ((token) == EXPR_UMINUS))
-
-/* Reduce a single operator on the stack */
-/* return 0 on failure, 1 on success */
-static int reduce_op() {
-  long op_token = stack[sp - 1].value;
-  assert(sp > 0);
-  assert(stack[sp - 1].op == EXPR_OP);
-  /* do some basic checking first: */
-  if (stack[sp].op != EXPR_VALUE) {
-    errmsg = "Right-hand side is not value";
-    return 0;
-  }
-  if (UNARY_OP(op_token)) {
-    if (stack[sp].svalue) {
-      errmsg = "Syntax error: attempt to apply unary operator to string";
-      return 0;
-    }
-  } else {
-    /* binary operator: */
-    if (sp == 1) {
-      /* top of stack: don't attempt to use sp-2! */
-      errmsg = "Missing left-hand side for binary operator";
-      return 0;
-    }
-    if (stack[sp].op != EXPR_VALUE) {
-      errmsg = "Left-hand side of binary operator is not a value";
-      return 0;
-    }
-    if ((!stack[sp - 2].svalue) != (!stack[sp].svalue)) {
-      errmsg = "Can't mix strings and integers in expression";
-      return 0;
-    }
-  }
-  if (stack[sp].svalue) {
-    /* A binary string expression */
-    switch (stack[sp - 1].value) {
-    case SWIG_TOKEN_EQUALTO:
-      stack[sp - 2].value = (Strcmp(stack[sp - 2].svalue, stack[sp].svalue) == 0);
-      Delete(stack[sp - 2].svalue);
-      Delete(stack[sp].svalue);
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_NOTEQUAL:
-      stack[sp - 2].value = (Strcmp(stack[sp - 2].svalue, stack[sp].svalue) != 0);
-      Delete(stack[sp - 2].svalue);
-      Delete(stack[sp].svalue);
-      sp -= 2;
-      break;
-    default:
-      errmsg = "Syntax error: bad binary operator for strings";
-      return 0;
-      break;
-    }
-  } else {
-    switch (op_token) {
-    case SWIG_TOKEN_STAR:
-      stack[sp - 2].value = stack[sp - 2].value * stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_EQUALTO:
-      stack[sp - 2].value = stack[sp - 2].value == stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_NOTEQUAL:
-      stack[sp - 2].value = stack[sp - 2].value != stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_PLUS:
-      stack[sp - 2].value = stack[sp - 2].value + stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_MINUS:
-      stack[sp - 2].value = stack[sp - 2].value - stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_AND:
-      stack[sp - 2].value = stack[sp - 2].value & stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_LAND:
-      stack[sp - 2].value = stack[sp - 2].value && stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_OR:
-      stack[sp - 2].value = stack[sp - 2].value | stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_LOR:
-      stack[sp - 2].value = stack[sp - 2].value || stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_XOR:
-      stack[sp - 2].value = stack[sp - 2].value ^ stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_LESSTHAN:
-      stack[sp - 2].value = stack[sp - 2].value < stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_GREATERTHAN:
-      stack[sp - 2].value = stack[sp - 2].value > stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_LTEQUAL:
-      stack[sp - 2].value = stack[sp - 2].value <= stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_GTEQUAL:
-      stack[sp - 2].value = stack[sp - 2].value >= stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_NOT:
-      stack[sp - 1].value = ~stack[sp].value;
-      sp--;
-      break;
-    case SWIG_TOKEN_LNOT:
-      stack[sp - 1].value = !stack[sp].value;
-      sp--;
-      break;
-    case EXPR_UMINUS:
-      stack[sp - 1].value = -stack[sp].value;
-      sp--;
-      break;
-    case SWIG_TOKEN_SLASH:
-      stack[sp - 2].value = stack[sp - 2].value / stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_PERCENT:
-      stack[sp - 2].value = stack[sp - 2].value % stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_LSHIFT:
-      stack[sp - 2].value = stack[sp - 2].value << stack[sp].value;
-      sp -= 2;
-      break;
-    case SWIG_TOKEN_RSHIFT:
-      stack[sp - 2].value = stack[sp - 2].value >> stack[sp].value;
-      sp -= 2;
-      break;
-    default:
-      errmsg = "Syntax error: bad operator";
-      return 0;
-      break;
-    }
-  }
-  stack[sp].op = EXPR_VALUE;
-  stack[sp].svalue = 0;		/* ensure it's not a string! */
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Preprocessor_expr_init()
- *
- * Initialize the expression evaluator
- * ----------------------------------------------------------------------------- */
-
-void Preprocessor_expr_init(void) {
-  if (!expr_init)
-    init_precedence();
-  if (!scan)
-    scan = NewScanner();
-}
-
-void Preprocessor_expr_delete(void) {
-  DelScanner(scan);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Tokenizer 
- * ----------------------------------------------------------------------------- */
-
-static int expr_token(Scanner * s) {
-  int t;
-  while (1) {
-    t = Scanner_token(s);
-    if (!((t == SWIG_TOKEN_BACKSLASH) || (t == SWIG_TOKEN_ENDLINE) || (t == SWIG_TOKEN_COMMENT)))
-      break;
-  }
-  return t;
-}
-
-/* -----------------------------------------------------------------------------
- * Preprocessor_expr()
- *
- * Evaluates an arithmetic expression.  Returns the result and sets an error code.
- * ----------------------------------------------------------------------------- */
-
-int Preprocessor_expr(DOH *s, int *error) {
-  int token = 0;
-  int op = 0;
-
-  sp = 0;
-  assert(s);
-  assert(scan);
-
-  Seek(s, 0, SEEK_SET);
-  /* Printf(stdout,"evaluating : '%s'\n", s); */
-  *error = 0;
-  Scanner_clear(scan);
-  Scanner_push(scan, s);
-
-  /* Put initial state onto the stack */
-  stack[sp].op = EXPR_TOP;
-  stack[sp].value = 0;
-
-  while (1) {
-    /* Look at the top of the stack */
-    switch (stack[sp].op) {
-    case EXPR_TOP:
-      /* An expression.   Can be a number or another expression enclosed in parens */
-      token = expr_token(scan);
-      if (!token) {
-	errmsg = "Expected an expression";
-	*error = 1;
-	return 0;
-      }
-      if ((token == SWIG_TOKEN_INT) || (token == SWIG_TOKEN_UINT) || (token == SWIG_TOKEN_LONG) || (token == SWIG_TOKEN_ULONG)) {
-	/* A number.  Reduce EXPR_TOP to an EXPR_VALUE */
-	char *c = Char(Scanner_text(scan));
-	stack[sp].value = (long) strtol(c, 0, 0);
-	stack[sp].svalue = 0;
-	/*        stack[sp].value = (long) atol(Char(Scanner_text(scan))); */
-	stack[sp].op = EXPR_VALUE;
-      } else if (token == SWIG_TOKEN_PLUS) {
-      } else if ((token == SWIG_TOKEN_MINUS) || (token == SWIG_TOKEN_LNOT) || (token == SWIG_TOKEN_NOT)) {
-	if (token == SWIG_TOKEN_MINUS)
-	  token = EXPR_UMINUS;
-	stack[sp].value = token;
-	stack[sp++].op = EXPR_OP;
-	stack[sp].op = EXPR_TOP;
-	stack[sp].svalue = 0;
-      } else if (token == SWIG_TOKEN_LPAREN) {
-	stack[sp++].op = EXPR_GROUP;
-	stack[sp].op = EXPR_TOP;
-	stack[sp].value = 0;
-	stack[sp].svalue = 0;
-      } else if (token == SWIG_TOKEN_ENDLINE) {
-      } else if (token == SWIG_TOKEN_STRING) {
-	stack[sp].svalue = NewString(Scanner_text(scan));
-	stack[sp].op = EXPR_VALUE;
-      } else if (token == SWIG_TOKEN_ID) {
-	stack[sp].value = 0;
-	stack[sp].svalue = 0;
-	stack[sp].op = EXPR_VALUE;
-      } else
-	goto syntax_error;
-      break;
-    case EXPR_VALUE:
-      /* A value is on the stack.   We may reduce or evaluate depending on what the next token is */
-      token = expr_token(scan);
-      if (!token) {
-	/* End of input. Might have to reduce if an operator is on stack */
-	while (sp > 0) {
-	  if (stack[sp - 1].op == EXPR_OP) {
-	    if (!reduce_op())
-	      goto reduce_error;
-	  } else if (stack[sp - 1].op == EXPR_GROUP) {
-	    errmsg = "Missing \')\'";
-	    *error = 1;
-	    return 0;
-	  } else
-	    goto syntax_error;
-	}
-	return stack[sp].value;
-      }
-      /* Token must be an operator */
-      switch (token) {
-      case SWIG_TOKEN_STAR:
-      case SWIG_TOKEN_EQUALTO:
-      case SWIG_TOKEN_NOTEQUAL:
-      case SWIG_TOKEN_PLUS:
-      case SWIG_TOKEN_MINUS:
-      case SWIG_TOKEN_AND:
-      case SWIG_TOKEN_LAND:
-      case SWIG_TOKEN_OR:
-      case SWIG_TOKEN_LOR:
-      case SWIG_TOKEN_XOR:
-      case SWIG_TOKEN_LESSTHAN:
-      case SWIG_TOKEN_GREATERTHAN:
-      case SWIG_TOKEN_LTEQUAL:
-      case SWIG_TOKEN_GTEQUAL:
-      case SWIG_TOKEN_SLASH:
-      case SWIG_TOKEN_PERCENT:
-      case SWIG_TOKEN_LSHIFT:
-      case SWIG_TOKEN_RSHIFT:
-	if ((sp == 0) || (stack[sp - 1].op == EXPR_GROUP)) {
-	  /* No possibility of reduce. Push operator and expression */
-	  sp++;
-	  stack[sp].op = EXPR_OP;
-	  stack[sp].value = token;
-	  sp++;
-	  stack[sp].op = EXPR_TOP;
-	  stack[sp].value = 0;
-	} else {
-	  if (stack[sp - 1].op != EXPR_OP)
-	    goto syntax_error_expected_operator;
-	  op = stack[sp - 1].value;	/* Previous operator */
-
-	  /* Now, depending on the precedence relationship between the last operator and the current
-	     we will reduce or push */
-
-	  if (prec[op] <= prec[token]) {
-	    /* Reduce the previous operator */
-	    if (!reduce_op())
-	      goto reduce_error;
-	  }
-	  sp++;
-	  stack[sp].op = EXPR_OP;
-	  stack[sp].value = token;
-	  sp++;
-	  stack[sp].op = EXPR_TOP;
-	  stack[sp].value = 0;
-	}
-	break;
-      case SWIG_TOKEN_RPAREN:
-	if (sp == 0)
-	  goto extra_rparen;
-
-	/* Might have to reduce operators first */
-	while ((sp > 0) && (stack[sp - 1].op == EXPR_OP)) {
-	  if (!reduce_op())
-	    goto reduce_error;
-	}
-	if ((sp == 0) || (stack[sp - 1].op != EXPR_GROUP))
-	  goto extra_rparen;
-	stack[sp - 1].op = EXPR_VALUE;
-	stack[sp - 1].value = stack[sp].value;
-	sp--;
-	break;
-      default:
-	goto syntax_error_expected_operator;
-	break;
-      }
-      break;
-
-    default:
-      fprintf(stderr, "Internal error in expression evaluator.\n");
-      abort();
-    }
-  }
-
-syntax_error:
-  errmsg = "Syntax error";
-  *error = 1;
-  return 0;
-
-syntax_error_expected_operator:
-  errmsg = "Syntax error: expected operator";
-  *error = 1;
-  return 0;
-
-reduce_error:
-  /*  errmsg has been set by reduce_op */
-  *error = 1;
-  return 0;
-
-extra_rparen:
-  errmsg = "Extra \')\'";
-  *error = 1;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Preprocessor_expr_error()
- *
- * Return error message set by the evaluator (if any)
- * ----------------------------------------------------------------------------- */
-
-const char *Preprocessor_expr_error() {
-  return errmsg;
-}
diff --git a/dependencies2013/win32/swig/Source/Preprocessor/preprocessor.h b/dependencies2013/win32/swig/Source/Preprocessor/preprocessor.h
deleted file mode 100644
index 4c24f48d..00000000
--- a/dependencies2013/win32/swig/Source/Preprocessor/preprocessor.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * preprocessor.h
- *
- * SWIG preprocessor module.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_PREPROCESSOR_H_
-#define SWIG_PREPROCESSOR_H_
-
-#include "swigwarn.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-  extern int Preprocessor_expr(String *s, int *error);
-  extern const char *Preprocessor_expr_error(void);
-  extern Hash *Preprocessor_define(const_String_or_char_ptr str, int swigmacro);
-  extern void Preprocessor_undef(const_String_or_char_ptr name);
-  extern void Preprocessor_init(void);
-  extern void Preprocessor_delete(void);
-  extern String *Preprocessor_parse(String *s);
-  extern void Preprocessor_include_all(int);
-  extern void Preprocessor_import_all(int);
-  extern void Preprocessor_ignore_missing(int);
-  extern void Preprocessor_error_as_warning(int);
-  extern List *Preprocessor_depend(void);
-  extern void Preprocessor_expr_init(void);
-  extern void Preprocessor_expr_delete(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/dependencies2013/win32/swig/Source/README b/dependencies2013/win32/swig/Source/README
deleted file mode 100644
index 814ec45b..00000000
--- a/dependencies2013/win32/swig/Source/README
+++ /dev/null
@@ -1,25 +0,0 @@
-SWIG Source directory
-
- Source/DOH          -  A core set of basic datatypes including
-                        strings, lists, hashes, and files.  Used
-                        extensively by the rest of SWIG.
-
- Source/Swig         -  Swig core. Type-system, utility functions.
-
- Source/Preprocessor -  SWIG C Preprocessor
-
- Source/CParse       -  SWIG C Parser (still messy)
-
- Source/Modules      -  Language modules.
-
- Source/Include      -  Include files.
-
-Historic directories which may be in CVS, but have been removed:
-
- Source/Modules1.1   -  Old SWIG-1.1 modules. Empty.
-
- Source/LParse       -  Experimental parser.  Officially dead
-                        as CParse is more capable.
-
- Source/SWIG1.1      -  Old SWIG1.1 core. Completely empty now.
-
diff --git a/dependencies2013/win32/swig/Source/Swig/cwrap.c b/dependencies2013/win32/swig/Source/Swig/cwrap.c
deleted file mode 100644
index 9da4e082..00000000
--- a/dependencies2013/win32/swig/Source/Swig/cwrap.c
+++ /dev/null
@@ -1,1637 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * cwrap.c
- *
- * This file defines a variety of wrapping rules for C/C++ handling including
- * the naming of local variables, calling conventions, and so forth.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-
-static const char *cresult_variable_name = "result";
-
-static Parm *nonvoid_parms(Parm *p) {
-  if (p) {
-    SwigType *t = Getattr(p, "type");
-    if (SwigType_type(t) == T_VOID)
-      return 0;
-  }
-  return p;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cresult_name_set()
- *
- * Change the name of the variable used to hold the return value from C/C++ wrapper functions
- * from the default "result".
- * ----------------------------------------------------------------------------- */
-
-void Swig_cresult_name_set(const char *new_name) {
-  cresult_variable_name = new_name;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cresult_name()
- *
- * Get the name of the variable used to hold the return value from C/C++ wrapper functions
- * ----------------------------------------------------------------------------- */
-
-const char *Swig_cresult_name(void) {
-  return cresult_variable_name;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cparm_name()
- *
- * Generates a name for the ith argument in an argument list
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cparm_name(Parm *p, int i) {
-  String *name = NewStringf("arg%d", i + 1);
-  if (p) {
-    Setattr(p, "lname", name);
-  }
-
-  return name;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_clocal()
- *
- * Creates a string that declares a C local variable type.  Converts references
- * and user defined types to pointers.
- * ----------------------------------------------------------------------------- */
-
-static String *Swig_clocal(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr value) {
-  String *decl;
-
-  decl = NewStringEmpty();
-
-  switch (SwigType_type(t)) {
-  case T_REFERENCE:
-    if (value) {
-      String *lstrname = SwigType_lstr(t, name);
-      String *lstr = SwigType_lstr(t, 0);
-      Printf(decl, "%s = (%s) &%s_defvalue", lstrname, lstr, name);
-      Delete(lstrname);
-      Delete(lstr);
-    } else {
-      String *lstrname = SwigType_lstr(t, name);
-      Printf(decl, "%s = 0", lstrname);
-      Delete(lstrname);
-    }
-    break;
-  case T_RVALUE_REFERENCE:
-    if (value) {
-      String *lstrname = SwigType_lstr(t, name);
-      String *lstr = SwigType_lstr(t, 0);
-      Printf(decl, "%s = (%s) &%s_defrvalue", lstrname, lstr, name);
-      Delete(lstrname);
-      Delete(lstr);
-    } else {
-      String *lstrname = SwigType_lstr(t, name);
-      Printf(decl, "%s = 0", lstrname);
-      Delete(lstrname);
-    }
-    break;
-  case T_VOID:
-    break;
-  case T_VARARGS:
-    Printf(decl, "void *%s = 0", name);
-    break;
-
-  default:
-    if (value) {
-      String *lcaststr = SwigType_lcaststr(t, value);
-      String *lstr = SwigType_lstr(t, 0);
-      String *lstrn = SwigType_lstr(t, name);
-      Printf(decl, "%s = (%s) %s", lstrn, lstr, lcaststr);
-      Delete(lcaststr);
-      Delete(lstr);
-      Delete(lstrn);
-    } else {
-      String *lstrname = SwigType_lstr(t, name);
-      Append(decl, lstrname);
-      Delete(lstrname);
-    }
-  }
-  return decl;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_wrapped_var_convert()
- *
- * Converts a member variable for use in the get and set wrapper methods.
- * This function only converts user defined types to pointers.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_wrapped_var_type(SwigType *t, int varcref) {
-  SwigType *ty;
-
-  if (!Strstr(t, "enum $unnamed")) {
-    ty = Copy(t);
-  } else {
-    /* Change the type for unnamed enum instance variables */
-    ty = NewString("int");
-  }
-
-  if (SwigType_isclass(t)) {
-    if (varcref) {
-      if (cparse_cplusplus) {
-	if (!SwigType_isconst(ty))
-	  SwigType_add_qualifier(ty, "const");
-	SwigType_add_reference(ty);
-      } else {
-	return Copy(ty);
-      }
-    } else {
-      SwigType_add_pointer(ty);
-    }
-  }
-  return ty;
-}
-
-String *Swig_wrapped_member_var_type(SwigType *t, int varcref) {
-  SwigType *ty;
-
-  if (!Strstr(t, "enum $unnamed")) {
-    ty = Copy(t);
-  } else {
-    /* Change the type for unnamed enum instance variables */
-    ty = NewString("int");
-  }
-  if (SwigType_isclass(t)) {
-    if (varcref) {
-      if (cparse_cplusplus) {
-	if (!SwigType_isconst(ty))
-	  SwigType_add_qualifier(ty, "const");
-	SwigType_add_reference(ty);
-      } else {
-	return Copy(ty);
-      }
-    } else {
-      SwigType_add_pointer(ty);
-    }
-  }
-  return ty;
-}
-
-
-static String *Swig_wrapped_var_deref(SwigType *t, const_String_or_char_ptr name, int varcref) {
-  if (SwigType_isclass(t)) {
-    if (varcref) {
-      if (cparse_cplusplus) {
-	return NewStringf("*%s", name);
-      } else {
-	return NewStringf("%s", name);
-      }
-    } else {
-      return NewStringf("*%s", name);
-    }
-  } else {
-    return SwigType_rcaststr(t, name);
-  }
-}
-
-static String *Swig_wrapped_var_assign(SwigType *t, const_String_or_char_ptr name, int varcref) {
-  if (SwigType_isclass(t)) {
-    if (varcref) {
-      return NewStringf("%s", name);
-    } else {
-      return NewStringf("&%s", name);
-    }
-  } else {
-    return SwigType_lcaststr(t, name);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cargs()
- *
- * Emit all of the local variables for a list of parameters.  Returns the
- * number of parameters.
- * Default values for the local variables are only emitted if the compact default
- * argument behaviour is required.
- * ----------------------------------------------------------------------------- */
-int Swig_cargs(Wrapper *w, ParmList *p) {
-  int i = 0;
-  int compactdefargs = ParmList_is_compactdefargs(p);
-
-  while (p != 0) {
-    String *lname = Swig_cparm_name(p, i);
-    SwigType *pt = Getattr(p, "type");
-    if ((SwigType_type(pt) != T_VOID)) {
-      String *local = 0;
-      String *type = Getattr(p, "type");
-      /* default values only emitted if in compact default args mode */
-      String *pvalue = (compactdefargs) ? Getattr(p, "value") : 0;
-
-      /* When using compactdefaultargs, the code generated initialises a variable via a constructor call that accepts the
-       * default value as a parameter. The default constructor is not called and therefore SwigValueWrapper is not needed. */
-      SwigType *altty = pvalue ? 0 : SwigType_alttype(type, 0);
-
-      int tycode = SwigType_type(type);
-      if (tycode == T_REFERENCE) {
-	if (pvalue) {
-	  SwigType *tvalue;
-	  String *defname, *defvalue, *rvalue, *qvalue;
-	  rvalue = SwigType_typedef_resolve_all(pvalue);
-	  qvalue = SwigType_typedef_qualified(rvalue);
-	  defname = NewStringf("%s_defvalue", lname);
-	  tvalue = Copy(type);
-	  SwigType_del_reference(tvalue);
-	  tycode = SwigType_type(tvalue);
-	  if (tycode != T_USER) {
-	    /* plain primitive type, we copy the def value */
-	    String *lstr = SwigType_lstr(tvalue, defname);
-	    defvalue = NewStringf("%s = %s", lstr, qvalue);
-	    Delete(lstr);
-	  } else {
-	    /* user type, we copy the reference value */
-	    String *str = SwigType_str(type, defname);
-	    defvalue = NewStringf("%s = %s", str, qvalue);
-	    Delete(str);
-	  }
-	  Wrapper_add_localv(w, defname, defvalue, NIL);
-	  Delete(tvalue);
-	  Delete(rvalue);
-	  Delete(qvalue);
-	  Delete(defname);
-	  Delete(defvalue);
-	}
-      } else if (tycode == T_RVALUE_REFERENCE) {
-	if (pvalue) {
-	  SwigType *tvalue;
-	  String *defname, *defvalue, *rvalue, *qvalue;
-	  rvalue = SwigType_typedef_resolve_all(pvalue);
-	  qvalue = SwigType_typedef_qualified(rvalue);
-	  defname = NewStringf("%s_defrvalue", lname);
-	  tvalue = Copy(type);
-	  SwigType_del_rvalue_reference(tvalue);
-	  tycode = SwigType_type(tvalue);
-	  if (tycode != T_USER) {
-	    /* plain primitive type, we copy the the def value */
-	    String *lstr = SwigType_lstr(tvalue, defname);
-	    defvalue = NewStringf("%s = %s", lstr, qvalue);
-	    Delete(lstr);
-	  } else {
-	    /* user type, we copy the reference value */
-	    String *str = SwigType_str(type, defname);
-	    defvalue = NewStringf("%s = %s", str, qvalue);
-	    Delete(str);
-	  }
-	  Wrapper_add_localv(w, defname, defvalue, NIL);
-	  Delete(tvalue);
-	  Delete(rvalue);
-	  Delete(qvalue);
-	  Delete(defname);
-	  Delete(defvalue);
-	}
-      } else if (!pvalue && ((tycode == T_POINTER) || (tycode == T_STRING) || (tycode == T_WSTRING))) {
-	pvalue = (String *) "0";
-      }
-      if (!altty) {
-	local = Swig_clocal(pt, lname, pvalue);
-      } else {
-	local = Swig_clocal(altty, lname, pvalue);
-	Delete(altty);
-      }
-      Wrapper_add_localv(w, lname, local, NIL);
-      Delete(local);
-      i++;
-    }
-    Delete(lname);
-    p = nextSibling(p);
-  }
-  return (i);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cresult()
- *
- * This function generates the C code needed to set the result of a C
- * function call.  
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr decl) {
-  String *fcall;
-
-  fcall = NewStringEmpty();
-  switch (SwigType_type(t)) {
-  case T_VOID:
-    break;
-  case T_REFERENCE:
-    {
-      String *lstr = SwigType_lstr(t, 0);
-      Printf(fcall, "%s = (%s) &", name, lstr);
-      Delete(lstr);
-    }
-    break;
-  case T_RVALUE_REFERENCE:
-    {
-      String *const_lvalue_str;
-      String *lstr = SwigType_lstr(t, 0);
-      SwigType *tt = Copy(t);
-      SwigType_del_rvalue_reference(tt);
-      SwigType_add_qualifier(tt, "const");
-      SwigType_add_reference(tt);
-      const_lvalue_str = SwigType_rcaststr(tt, 0);
-
-      Printf(fcall, "%s = (%s) &%s", name, lstr, const_lvalue_str);
-
-      Delete(const_lvalue_str);
-      Delete(tt);
-      Delete(lstr);
-    }
-    break;
-  case T_USER:
-    Printf(fcall, "%s = ", name);
-    break;
-
-  default:
-    /* Normal return value */
-    {
-      String *lstr = SwigType_lstr(t, 0);
-      Printf(fcall, "%s = (%s)", name, lstr);
-      Delete(lstr);
-    }
-    break;
-  }
-
-  /* Now print out function call */
-  Append(fcall, decl);
-
-  /* A sick hack */
-  {
-    char *c = Char(decl) + Len(decl) - 1;
-    if (!((*c == ';') || (*c == '}')))
-      Append(fcall, ";");
-  }
-
-  return fcall;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cfunction_call()
- *
- * Creates a string that calls a C function using the local variable rules
- * defined above.
- *
- *    name(arg0, arg1, arg2, ... argn)
- *
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms) {
-  String *func;
-  int i = 0;
-  int comma = 0;
-  Parm *p = parms;
-  String *nname;
-
-  func = NewStringEmpty();
-  nname = SwigType_namestr(name);
-
-  /*
-     SWIGTEMPLATEDISAMBIGUATOR is compiler dependent (swiglabels.swg),
-     - SUN Studio 9 requires 'template', 
-     - gcc-3.4 forbids the use of 'template'.
-     the rest seems not caring very much,
-   */
-  if (SwigType_istemplate(name)) {
-    String *prefix = Swig_scopename_prefix(nname);
-    if (!prefix || Len(prefix) == 0) {
-      Printf(func, "%s(", nname);
-    } else {
-      String *last = Swig_scopename_last(nname);
-      Printf(func, "%s::SWIGTEMPLATEDISAMBIGUATOR %s(", prefix, last);
-      Delete(last);
-    }
-    Delete(prefix);
-  } else {
-    Printf(func, "%s(", nname);
-  }
-  Delete(nname);
-
-  while (p) {
-    SwigType *pt = Getattr(p, "type");
-    if ((SwigType_type(pt) != T_VOID)) {
-      SwigType *rpt = SwigType_typedef_resolve_all(pt);
-      String *pname = Swig_cparm_name(p, i);
-      String *rcaststr = SwigType_rcaststr(rpt, pname);
-
-      if (comma) {
-	Printv(func, ",", rcaststr, NIL);
-      } else {
-	Append(func, rcaststr);
-      }
-      Delete(rpt);
-      Delete(pname);
-      Delete(rcaststr);
-      comma = 1;
-      i++;
-    }
-    p = nextSibling(p);
-  }
-  Append(func, ")");
-  return func;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cmethod_call()
- *
- * Generates a string that calls a C++ method from a list of parameters.
- * 
- *    arg0->name(arg1, arg2, arg3, ..., argn)
- *
- * self is an argument that defines how to handle the first argument. Normally,
- * it should be set to "this->".  With C++ proxy classes enabled, it could be
- * set to "(*this)->" or some similar sequence.
- * ----------------------------------------------------------------------------- */
-
-static String *Swig_cmethod_call(const_String_or_char_ptr name, ParmList *parms, const_String_or_char_ptr self, String *explicit_qualifier, SwigType *director_type) {
-  String *func, *nname;
-  int i = 0;
-  Parm *p = parms;
-  SwigType *pt;
-  int comma = 0;
-
-  func = NewStringEmpty();
-  if (!p)
-    return func;
-
-  if (!self)
-    self = "(this)->";
-  Append(func, self);
-
-  if (SwigType_istemplate(name) && (strncmp(Char(name), "operator ", 9) == 0)) {
-    /* fix for template + operators and compilers like gcc 3.3.5 */
-    String *tprefix = SwigType_templateprefix(name);
-    nname = tprefix;
-  } else {
-    nname = SwigType_namestr(name);
-  }
-
-  if (director_type) {
-    const char *pname = "darg";
-    String *rcaststr = SwigType_rcaststr(director_type, pname);
-    Replaceall(func, "this", rcaststr);
-    Delete(rcaststr);
-  } else {
-    pt = Getattr(p, "type");
-
-    /* If the method is invoked through a dereferenced pointer, we don't add any casts
-       (needed for smart pointers).  Otherwise, we cast to the appropriate type */
-
-    if (Strstr(func, "*this")) {
-      String *pname = Swig_cparm_name(p, 0);
-      Replaceall(func, "this", pname);
-      Delete(pname);
-    } else {
-      String *pname = Swig_cparm_name(p, 0);
-      String *rcaststr = SwigType_rcaststr(pt, pname);
-      Replaceall(func, "this", rcaststr);
-      Delete(rcaststr);
-      Delete(pname);
-    }
-
-    /*
-       SWIGTEMPLATEDESIMBUAGATOR is compiler dependent (swiglabels.swg),
-       - SUN Studio 9 requires 'template', 
-       - gcc-3.4 forbids the use of 'template' (correctly implementing the ISO C++ standard)
-       the others don't seem to care,
-     */
-    if (SwigType_istemplate(name))
-      Printf(func, "SWIGTEMPLATEDISAMBIGUATOR ");
-
-    if (explicit_qualifier) {
-      Printv(func, explicit_qualifier, "::", NIL);
-    }
-  }
-
-  Printf(func, "%s(", nname);
-
-  i++;
-  p = nextSibling(p);
-  while (p) {
-    pt = Getattr(p, "type");
-    if ((SwigType_type(pt) != T_VOID)) {
-      String *pname = Swig_cparm_name(p, i);
-      String *rcaststr = SwigType_rcaststr(pt, pname);
-      if (comma)
-	Append(func, ",");
-      Append(func, rcaststr);
-      Delete(rcaststr);
-      Delete(pname);
-      comma = 1;
-      i++;
-    }
-    p = nextSibling(p);
-  }
-  Append(func, ")");
-  Delete(nname);
-  return func;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cconstructor_call()
- *
- * Creates a string that calls a C constructor function.
- *
- *      calloc(1,sizeof(name));
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cconstructor_call(const_String_or_char_ptr name) {
-  DOH *func;
-
-  func = NewStringEmpty();
-  Printf(func, "calloc(1, sizeof(%s))", name);
-  return func;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_cppconstructor_call()
- *
- * Creates a string that calls a C function using the local variable rules
- * defined above.
- *
- *    name(arg0, arg1, arg2, ... argn)
- *
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cppconstructor_base_call(const_String_or_char_ptr name, ParmList *parms, int skip_self) {
-  String *func;
-  String *nname;
-  int i = 0;
-  int comma = 0;
-  Parm *p = parms;
-  SwigType *pt;
-  if (skip_self) {
-    if (p)
-      p = nextSibling(p);
-    i++;
-  }
-  nname = SwigType_namestr(name);
-  func = NewStringEmpty();
-  Printf(func, "new %s(", nname);
-  while (p) {
-    pt = Getattr(p, "type");
-    if ((SwigType_type(pt) != T_VOID)) {
-      String *rcaststr = 0;
-      String *pname = 0;
-      if (comma)
-	Append(func, ",");
-      if (!Getattr(p, "arg:byname")) {
-	pname = Swig_cparm_name(p, i);
-	i++;
-      } else {
-        pname = Getattr(p, "value");
-	if (pname)
-	  pname = Copy(pname);
-	else
-	  pname = Copy(Getattr(p, "name"));
-      }
-      rcaststr = SwigType_rcaststr(pt, pname);
-      Append(func, rcaststr);
-      Delete(rcaststr);
-      comma = 1;
-      Delete(pname);
-    }
-    p = nextSibling(p);
-  }
-  Append(func, ")");
-  Delete(nname);
-  return func;
-}
-
-String *Swig_cppconstructor_call(const_String_or_char_ptr name, ParmList *parms) {
-  return Swig_cppconstructor_base_call(name, parms, 0);
-}
-
-String *Swig_cppconstructor_nodirector_call(const_String_or_char_ptr name, ParmList *parms) {
-  return Swig_cppconstructor_base_call(name, parms, 1);
-}
-
-String *Swig_cppconstructor_director_call(const_String_or_char_ptr name, ParmList *parms) {
-  return Swig_cppconstructor_base_call(name, parms, 0);
-}
-
-/* -----------------------------------------------------------------------------
- * recursive_flag_search()
- *
- * This function searches for the class attribute 'attr' in the class
- * 'n' or recursively in its bases.
- *
- * If you define SWIG_FAST_REC_SEARCH, the method will set the found
- * 'attr' in the target class 'n'. If not, the method will set the
- * 'noattr' one. This prevents of having to navigate the entire
- * hierarchy tree everytime, so, it is an O(1) method...  or something
- * like that. However, it populates all the parsed classes with the
- * 'attr' and/or 'noattr' attributes.
- *
- * If you undefine the SWIG_FAST_REC_SEARCH no attribute will be set
- * while searching. This could be slower for large projects with very
- * large hierarchy trees... or maybe not. But it will be cleaner. 
- *
- * Maybe later a swig option can be added to switch at runtime.
- *
- * ----------------------------------------------------------------------------- */
-
-/* #define SWIG_FAST_REC_SEARCH 1 */
-static String *recursive_flag_search(Node *n, const String *attr, const String *noattr) {
-  String *f = 0;
-  n = Swig_methodclass(n);
-  if (GetFlag(n, noattr)) {
-    return 0;
-  }
-  f = GetFlagAttr(n, attr);
-  if (f) {
-    return f;
-  } else {
-    List *bl = Getattr(n, "bases");
-    if (bl) {
-      Iterator bi;
-      for (bi = First(bl); bi.item; bi = Next(bi)) {
-	f = recursive_flag_search(bi.item, attr, noattr);
-	if (f) {
-#ifdef SWIG_FAST_REC_SEARCH
-	  SetFlagAttr(n, attr, f);
-#endif
-	  return f;
-	}
-      }
-    }
-  }
-#ifdef SWIG_FAST_REC_SEARCH
-  SetFlag(n, noattr);
-#endif
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_unref_call()
- *
- * Find the "feature:unref" call, if any.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_unref_call(Node *n) {
-  String *unref = recursive_flag_search(n, "feature:unref", "feature:nounref");
-  if (unref) {
-    String *pname = Swig_cparm_name(0, 0);
-    unref = NewString(unref);
-    Replaceall(unref, "$this", pname);
-    Replaceall(unref, "$self", pname);
-    Delete(pname);
-  }
-  return unref;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_ref_call()
- *
- * Find the "feature:ref" call, if any.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_ref_call(Node *n, const String *lname) {
-  String *ref = recursive_flag_search(n, "feature:ref", "feature:noref");
-  if (ref) {
-    ref = NewString(ref);
-    Replaceall(ref, "$this", lname);
-    Replaceall(ref, "$self", lname);
-  }
-  return ref;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cdestructor_call()
- *
- * Creates a string that calls a C destructor function.
- *
- *      free((char *) arg0);
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cdestructor_call(Node *n) {
-  Node *cn = Swig_methodclass(n);
-  String *unref = Swig_unref_call(cn);
-
-  if (unref) {
-    return unref;
-  } else {
-    String *pname = Swig_cparm_name(0, 0);
-    String *call = NewStringf("free((char *) %s);", pname);
-    Delete(pname);
-    return call;
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_cppdestructor_call()
- *
- * Creates a string that calls a C destructor function.
- *
- *      delete arg1;
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cppdestructor_call(Node *n) {
-  Node *cn = Swig_methodclass(n);
-  String *unref = Swig_unref_call(cn);
-  if (unref) {
-    return unref;
-  } else {
-    String *pname = Swig_cparm_name(0, 0);
-    String *call = NewStringf("delete %s;", pname);
-    Delete(pname);
-    return call;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_cmemberset_call()
- *
- * Generates a string that sets the name of a member in a C++ class or C struct.
- *
- *        arg0->name = arg1
- *
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref) {
-  String *func;
-  String *pname0 = Swig_cparm_name(0, 0);
-  String *pname1 = Swig_cparm_name(0, 1);
-  func = NewStringEmpty();
-  if (!self)
-    self = NewString("(this)->");
-  else
-    self = NewString(self);
-  Replaceall(self, "this", pname0);
-  if (SwigType_type(type) != T_ARRAY) {
-    if (!Strstr(type, "enum $unnamed")) {
-      String *dref = Swig_wrapped_var_deref(type, pname1, varcref);
-      int extra_cast = 0;
-      if (cparse_cplusplusout) {
-	/* Required for C nested structs compiled as C++ as a duplicate of the nested struct is put into the global namespace.
-	 * We could improve this by adding the extra casts just for nested structs rather than all structs. */
-	String *base = SwigType_base(type);
-	extra_cast = SwigType_isclass(base);
-	Delete(base);
-      }
-      if (extra_cast) {
-	String *lstr;
-	SwigType *ptype = Copy(type);
-	SwigType_add_pointer(ptype);
-	lstr = SwigType_lstr(ptype, 0);
-	Printf(func, "if (%s) *(%s)&%s%s = %s", pname0, lstr, self, name, dref);
-	Delete(lstr);
-	Delete(ptype);
-      } else {
-        Printf(func, "if (%s) %s%s = %s", pname0, self, name, dref);
-      }
-      Delete(dref);
-    } else {
-      Printf(func, "if (%s && sizeof(int) == sizeof(%s%s)) *(int*)(void*)&(%s%s) = %s", pname0, self, name, self, name, pname1);
-    }
-  }
-  Delete(self);
-  Delete(pname0);
-  Delete(pname1);
-  return (func);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_cmemberget_call()
- *
- * Generates a string that sets the name of a member in a C++ class or C struct.
- *
- *        arg0->name
- *
- * ----------------------------------------------------------------------------- */
-
-String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref) {
-  String *func;
-  String *call;
-  String *pname0 = Swig_cparm_name(0, 0);
-  if (!self)
-    self = NewString("(this)->");
-  else
-    self = NewString(self);
-  Replaceall(self, "this", pname0);
-  func = NewStringEmpty();
-  call = Swig_wrapped_var_assign(t, "", varcref);
-  Printf(func, "%s (%s%s)", call, self, name);
-  Delete(self);
-  Delete(call);
-  Delete(pname0);
-  return func;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_replace_special_variables()
- *
- * Replaces special variables with a value from the supplied node
- * ----------------------------------------------------------------------------- */
-void Swig_replace_special_variables(Node *n, Node *parentnode, String *code) {
-  Node *parentclass = parentnode;
-  String *overloaded = Getattr(n, "sym:overloaded");
-  Replaceall(code, "$name", Getattr(n, "name"));
-  Replaceall(code, "$symname", Getattr(n, "sym:name"));
-  Replaceall(code, "$wrapname", Getattr(n, "wrap:name"));
-  Replaceall(code, "$overname", overloaded ? Char(Getattr(n, "sym:overname")) : "");
-
-  if (Strstr(code, "$decl")) {
-    String *decl = Swig_name_decl(n);
-    Replaceall(code, "$decl", decl);
-    Delete(decl);
-  }
-  if (Strstr(code, "$fulldecl")) {
-    String *fulldecl = Swig_name_fulldecl(n);
-    Replaceall(code, "$fulldecl", fulldecl);
-    Delete(fulldecl);
-  }
-
-  if (parentclass && !Equal(nodeType(parentclass), "class"))
-    parentclass = 0;
-  if (Strstr(code, "$parentclasssymname")) {
-    String *parentclasssymname = 0;
-    if (parentclass)
-      parentclasssymname = Getattr(parentclass, "sym:name");
-    Replaceall(code, "$parentclasssymname", parentclasssymname ? parentclasssymname : "");
-  }
-  if (Strstr(code, "$parentclassname")) {
-    String *parentclassname = 0;
-    if (parentclass)
-      parentclassname = Getattr(parentclass, "name");
-    Replaceall(code, "$parentclassname", parentclassname ? SwigType_str(parentclassname, "") : "");
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * extension_code()
- *
- * Generates an extension function (a function defined in %extend)
- *
- *        return_type function_name(parms) code
- *
- * ----------------------------------------------------------------------------- */
-static String *extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self) {
-  String *parms_str = cplusplus ? ParmList_str_defaultargs(parms) : ParmList_str(parms);
-  String *sig = NewStringf("%s(%s)", function_name, (cplusplus || Len(parms_str)) ? parms_str : "void");
-  String *rt_sig = SwigType_str(return_type, sig);
-  String *body = NewStringf("SWIGINTERN %s", rt_sig);
-  Printv(body, code, "\n", NIL);
-  if (Strstr(body, "$")) {
-    Swig_replace_special_variables(n, parentNode(parentNode(n)), body);
-    if (self)
-      Replaceall(body, "$self", self);
-  }
-  Delete(parms_str);
-  Delete(sig);
-  Delete(rt_sig);
-  return body;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_add_extension_code()
- *
- * Generates an extension function (a function defined in %extend) and
- * adds it to the "wrap:code" attribute of a node
- *
- * See also extension_code()
- *
- * ----------------------------------------------------------------------------- */
-int Swig_add_extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self) {
-  String *body = extension_code(n, function_name, parms, return_type, code, cplusplus, self);
-  Setattr(n, "wrap:code", body);
-  Delete(body);
-  return SWIG_OK;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_MethodToFunction(Node *n)
- *
- * Converts a C++ method node to a function accessor function.
- * ----------------------------------------------------------------------------- */
-
-int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *classname, int flags, SwigType *director_type, int is_director) {
-  String *name;
-  ParmList *parms;
-  SwigType *type;
-  Parm *p;
-  String *self = 0;
-  int is_smart_pointer_overload = 0;
-  String *qualifier = Getattr(n, "qualifier");
-  String *directorScope = NewString(nspace);
-
-  Replace(directorScope, NSPACE_SEPARATOR, "_", DOH_REPLACE_ANY);
-  
-  /* If smart pointer without const overload or mutable method, change self dereferencing */
-  if (flags & CWRAP_SMART_POINTER) {
-    if (flags & CWRAP_SMART_POINTER_OVERLOAD) {
-      if (qualifier && strncmp(Char(qualifier), "q(const)", 8) == 0) {
-        self = NewString("(*(this))->");
-        is_smart_pointer_overload = 1;
-      }
-      else if (Swig_storage_isstatic(n)) {
-	String *cname = Getattr(n, "extendsmartclassname") ? Getattr(n, "extendsmartclassname") : classname;
-	String *ctname = SwigType_namestr(cname);
-        self = NewStringf("(*(%s const *)this)->", ctname);
-        is_smart_pointer_overload = 1;
-	Delete(ctname);
-      }
-      else {
-        self = NewString("(*this)->");
-      }
-    } else {
-      self = NewString("(*this)->");
-    }
-  }
-
-  /* If node is a member template expansion, we don't allow added code */
-  if (Getattr(n, "templatetype"))
-    flags &= ~(CWRAP_EXTEND);
-
-  name = Getattr(n, "name");
-  parms = CopyParmList(nonvoid_parms(Getattr(n, "parms")));
-
-  type = NewString(classname);
-  if (qualifier) {
-    SwigType_push(type, qualifier);
-  }
-  SwigType_add_pointer(type);
-  p = NewParm(type, "self", n);
-  Setattr(p, "self", "1");
-  Setattr(p, "hidden","1");
-  /*
-     Disable the 'this' ownership in 'self' to manage inplace
-     operations like:
-
-     A& A::operator+=(int i) { ...; return *this;}
-
-     Here the 'self' parameter ownership needs to be disabled since
-     there could be two objects sharing the same 'this' pointer: the
-     input and the result one. And worse, the pointer could be deleted
-     in one of the objects (input), leaving the other (output) with
-     just a seg. fault to happen.
-
-     To avoid the previous problem, use
-
-     %feature("self:disown") *::operator+=;
-     %feature("new") *::operator+=;
-
-     These two lines just transfer the ownership of the 'this' pointer
-     from the input to the output wrapping object.
-
-     This happens in python, but may also happen in other target
-     languages.
-   */
-  if (GetFlag(n, "feature:self:disown")) {
-    Setattr(p, "wrap:disown", "1");
-  }
-  set_nextSibling(p, parms);
-  Delete(type);
-
-  /* Generate action code for the access */
-  if (!(flags & CWRAP_EXTEND)) {
-    String *explicit_qualifier = 0;
-    String *call = 0;
-    String *cres = 0;
-    String *explicitcall_name = 0;
-    int pure_virtual = !(Cmp(Getattr(n, "storage"), "virtual")) && !(Cmp(Getattr(n, "value"), "0"));
-
-    /* Call the explicit method rather than allow for a polymorphic call */
-    if ((flags & CWRAP_DIRECTOR_TWO_CALLS) || (flags & CWRAP_DIRECTOR_ONE_CALL)) {
-      String *access = Getattr(n, "access");
-      if (access && (Cmp(access, "protected") == 0)) {
-	/* If protected access (can only be if a director method) then call the extra public accessor method (language module must provide this) */
-	String *explicit_qualifier_tmp = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname"));
-	explicitcall_name = NewStringf("%sSwigPublic", name);
-        if (Len(directorScope) > 0)
-	  explicit_qualifier = NewStringf("SwigDirector_%s_%s", directorScope, explicit_qualifier_tmp);
-        else
-	  explicit_qualifier = NewStringf("SwigDirector_%s", explicit_qualifier_tmp);
-	Delete(explicit_qualifier_tmp);
-      } else {
-	explicit_qualifier = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname"));
-      }
-    }
-
-    call = Swig_cmethod_call(explicitcall_name ? explicitcall_name : name, p, self, explicit_qualifier, director_type);
-    cres = Swig_cresult(Getattr(n, "type"), Swig_cresult_name(), call);
-
-    if (pure_virtual && is_director && (flags & CWRAP_DIRECTOR_TWO_CALLS)) {
-      String *qualifier = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname"));
-      Delete(cres);
-      cres = NewStringf("Swig::DirectorPureVirtualException::raise(\"%s::%s\");", qualifier, name);
-      Delete(qualifier);
-    }
-
-    if (flags & CWRAP_DIRECTOR_TWO_CALLS) {
-      /* Create two method calls, one to call the explicit method, the other a normal polymorphic function call */
-      String *cres_both_calls = NewStringf("");
-      String *call_extra = Swig_cmethod_call(name, p, self, 0, director_type);
-      String *cres_extra = Swig_cresult(Getattr(n, "type"), Swig_cresult_name(), call_extra);
-      Printv(cres_both_calls, "if (upcall) {\n", cres, "\n", "} else {", cres_extra, "\n}", NIL);
-      Setattr(n, "wrap:action", cres_both_calls);
-      Delete(cres_extra);
-      Delete(call_extra);
-      Delete(cres_both_calls);
-    } else {
-      Setattr(n, "wrap:action", cres);
-    }
-
-    Delete(explicitcall_name);
-    Delete(call);
-    Delete(cres);
-    Delete(explicit_qualifier);
-  } else {
-    /* Methods with default arguments are wrapped with additional methods for each default argument,
-     * however, only one extra %extend method is generated. */
-
-    String *defaultargs = Getattr(n, "defaultargs");
-    String *code = Getattr(n, "code");
-    String *cname = Getattr(n, "extendsmartclassname") ? Getattr(n, "extendsmartclassname") : classname;
-    String *membername = Swig_name_member(nspace, cname, name);
-    String *mangled = Swig_name_mangle(membername);
-    int is_smart_pointer = flags & CWRAP_SMART_POINTER;
-
-    type = Getattr(n, "type");
-
-    /* Check if the method is overloaded.   If so, and it has code attached, we append an extra suffix
-       to avoid a name-clash in the generated wrappers.  This allows overloaded methods to be defined
-       in C. */
-    if (Getattr(n, "sym:overloaded") && code) {
-      Append(mangled, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
-    }
-
-    /* See if there is any code that we need to emit */
-    if (!defaultargs && code && !is_smart_pointer) {
-      Swig_add_extension_code(n, mangled, p, type, code, cparse_cplusplus, "self");
-    }
-    if (is_smart_pointer) {
-      int i = 0;
-      Parm *pp = p;
-      String *func = NewStringf("%s(", mangled);
-      String *cres;
-
-      if (!Swig_storage_isstatic(n)) {
-	String *pname = Swig_cparm_name(pp, i);
-	String *ctname = SwigType_namestr(cname);
-	String *fadd = 0;
-	if (is_smart_pointer_overload) {
-	  String *nclassname = SwigType_namestr(classname);
-	  fadd = NewStringf("(%s const *)((%s const *)%s)->operator ->()", ctname, nclassname, pname);
-	  Delete(nclassname);
-	}
-	else {
-	  fadd = NewStringf("(%s*)(%s)->operator ->()", ctname, pname);
-	}
-	Append(func, fadd);
-	Delete(ctname);
-	Delete(fadd);
-	Delete(pname);
-	pp = nextSibling(pp);
-	if (pp)
-	  Append(func, ",");
-      } else {
-	pp = nextSibling(pp);
-      }
-      ++i;
-      while (pp) {
-	SwigType *pt = Getattr(pp, "type");
-	if ((SwigType_type(pt) != T_VOID)) {
-	  String *pname = Swig_cparm_name(pp, i++);
-	  String *rcaststr = SwigType_rcaststr(pt, pname);
-	  Append(func, rcaststr);
-	  Delete(rcaststr);
-	  Delete(pname);
-	  pp = nextSibling(pp);
-	  if (pp)
-	    Append(func, ",");
-	}
-      }
-      Append(func, ")");
-      cres = Swig_cresult(Getattr(n, "type"), Swig_cresult_name(), func);
-      Setattr(n, "wrap:action", cres);
-      Delete(cres);
-    } else {
-      String *call = Swig_cfunction_call(mangled, p);
-      String *cres = Swig_cresult(Getattr(n, "type"), Swig_cresult_name(), call);
-      Setattr(n, "wrap:action", cres);
-      Delete(call);
-      Delete(cres);
-    }
-
-    Delete(membername);
-    Delete(mangled);
-  }
-  Setattr(n, "parms", p);
-  Delete(p);
-  Delete(self);
-  Delete(parms);
-  Delete(directorScope);
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_methodclass()
- *
- * This function returns the class node for a given method or class.
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_methodclass(Node *n) {
-  Node *nodetype = nodeType(n);
-  if (Cmp(nodetype, "class") == 0)
-    return n;
-  return GetFlag(n, "feature:extend") ? parentNode(parentNode(n)) : parentNode(n);
-}
-
-int Swig_directorclass(Node *n) {
-  Node *classNode = Swig_methodclass(n);
-  assert(classNode != 0);
-  return (Getattr(classNode, "vtable") != 0);
-}
-
-Node *Swig_directormap(Node *module, String *type) {
-  int is_void = !Cmp(type, "void");
-  if (!is_void && module) {
-    /* ?? follow the inheritance hierarchy? */
-
-    String *base = SwigType_base(type);
-
-    Node *directormap = Getattr(module, "wrap:directormap");
-    if (directormap)
-      return Getattr(directormap, base);
-  }
-  return 0;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_ConstructorToFunction()
- *
- * This function creates a C wrapper for a C constructor function. 
- * ----------------------------------------------------------------------------- */
-
-int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String *classname, String *none_comparison, String *director_ctor, int cplus, int flags, String *directorname) {
-  Parm *p;
-  ParmList *directorparms;
-  SwigType *type;
-  int use_director = Swig_directorclass(n);
-  ParmList *parms = CopyParmList(nonvoid_parms(Getattr(n, "parms")));
-  /* Prepend the list of prefix_args (if any) */
-  Parm *prefix_args = Getattr(n, "director:prefix_args");
-  if (prefix_args != NIL) {
-    Parm *p2, *p3;
-
-    directorparms = CopyParmList(prefix_args);
-    for (p = directorparms; nextSibling(p); p = nextSibling(p));
-    for (p2 = parms; p2; p2 = nextSibling(p2)) {
-      p3 = CopyParm(p2);
-      set_nextSibling(p, p3);
-      Delete(p3);
-      p = p3;
-    }
-  } else
-    directorparms = parms;
-
-  type = NewString(classname);
-  SwigType_add_pointer(type);
-
-  if (flags & CWRAP_EXTEND) {
-    /* Constructors with default arguments are wrapped with additional constructor methods for each default argument,
-     * however, only one extra %extend method is generated. */
-    String *call;
-    String *cres;
-    String *defaultargs = Getattr(n, "defaultargs");
-    String *code = Getattr(n, "code");
-    String *membername = Swig_name_construct(nspace, classname);
-    String *mangled = Swig_name_mangle(membername);
-
-    /* Check if the constructor is overloaded.   If so, and it has code attached, we append an extra suffix
-       to avoid a name-clash in the generated wrappers.  This allows overloaded constructors to be defined
-       in C. */
-    if (Getattr(n, "sym:overloaded") && code) {
-      Append(mangled, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
-    }
-
-    /* See if there is any code that we need to emit */
-    if (!defaultargs && code) {
-      Swig_add_extension_code(n, mangled, parms, type, code, cparse_cplusplus, "self");
-    }
-
-    call = Swig_cfunction_call(mangled, parms);
-    cres = Swig_cresult(type, Swig_cresult_name(), call);
-    Setattr(n, "wrap:action", cres);
-    Delete(cres);
-    Delete(call);
-    Delete(membername);
-    Delete(mangled);
-  } else {
-    if (cplus) {
-      /* if a C++ director class exists, create it rather than the original class */
-      if (use_director) {
-	Node *parent = Swig_methodclass(n);
-	int abstract = Getattr(parent, "abstracts") != 0;
-	String *action = NewStringEmpty();
-	String *tmp_none_comparison = Copy(none_comparison);
-	String *director_call;
-	String *nodirector_call;
-
-	Replaceall(tmp_none_comparison, "$arg", "arg1");
-
-	director_call = Swig_cppconstructor_director_call(directorname, directorparms);
-	nodirector_call = Swig_cppconstructor_nodirector_call(classname, parms);
-
-	if (abstract) {
-	  /* whether or not the abstract class has been subclassed in python,
-	   * create a director instance (there's no way to create a normal
-	   * instance).  if any of the pure virtual methods haven't been
-	   * implemented in the target language, calls to those methods will
-	   * generate Swig::DirectorPureVirtualException exceptions.
-	   */
-	  String *cres = Swig_cresult(type, Swig_cresult_name(), director_call);
-	  Append(action, cres);
-	  Delete(cres);
-	} else {
-	  /* (scottm): The code for creating a new director is now a string
-	     template that gets passed in via the director_ctor argument.
-
-	     $comparison : an 'if' comparison from none_comparison
-	     $director_new: Call new for director class
-	     $nondirector_new: Call new for non-director class
-	   */
-	  String *cres;
-	  Append(action, director_ctor);
-	  Replaceall(action, "$comparison", tmp_none_comparison);
-
-	  cres = Swig_cresult(type, Swig_cresult_name(), director_call);
-	  Replaceall(action, "$director_new", cres);
-	  Delete(cres);
-
-	  cres = Swig_cresult(type, Swig_cresult_name(), nodirector_call);
-	  Replaceall(action, "$nondirector_new", cres);
-	  Delete(cres);
-	}
-	Setattr(n, "wrap:action", action);
-	Delete(tmp_none_comparison);
-	Delete(action);
-      } else {
-	String *call = Swig_cppconstructor_call(classname, parms);
-	String *cres = Swig_cresult(type, Swig_cresult_name(), call);
-	Setattr(n, "wrap:action", cres);
-	Delete(cres);
-	Delete(call);
-      }
-    } else {
-      String *call = Swig_cconstructor_call(classname);
-      String *cres = Swig_cresult(type, Swig_cresult_name(), call);
-      Setattr(n, "wrap:action", cres);
-      Delete(cres);
-      Delete(call);
-    }
-  }
-  Setattr(n, "type", type);
-  Setattr(n, "parms", parms);
-  Delete(type);
-  if (directorparms != parms)
-    Delete(directorparms);
-  Delete(parms);
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_DestructorToFunction()
- *
- * This function creates a C wrapper for a destructor function.
- * ----------------------------------------------------------------------------- */
-
-int Swig_DestructorToFunction(Node *n, const_String_or_char_ptr nspace, String *classname, int cplus, int flags) {
-  SwigType *type;
-  Parm *p;
-
-  type = NewString(classname);
-  SwigType_add_pointer(type);
-  p = NewParm(type, "self", n);
-  Setattr(p, "self", "1");
-  Setattr(p, "hidden", "1");
-  Setattr(p, "wrap:disown", "1");
-  Delete(type);
-  type = NewString("void");
-
-  if (flags & CWRAP_EXTEND) {
-    String *cres;
-    String *call;
-    String *membername, *mangled, *code;
-    membername = Swig_name_destroy(nspace, classname);
-    mangled = Swig_name_mangle(membername);
-    code = Getattr(n, "code");
-    if (code) {
-      Swig_add_extension_code(n, mangled, p, type, code, cparse_cplusplus, "self");
-    }
-    call = Swig_cfunction_call(mangled, p);
-    cres = NewStringf("%s;", call);
-    Setattr(n, "wrap:action", cres);
-    Delete(membername);
-    Delete(mangled);
-    Delete(call);
-    Delete(cres);
-  } else {
-    if (cplus) {
-      String *call = Swig_cppdestructor_call(n);
-      String *cres = NewStringf("%s", call);
-      Setattr(n, "wrap:action", cres);
-      Delete(call);
-      Delete(cres);
-    } else {
-      String *call = Swig_cdestructor_call(n);
-      String *cres = NewStringf("%s", call);
-      Setattr(n, "wrap:action", cres);
-      Delete(call);
-      Delete(cres);
-    }
-  }
-  Setattr(n, "type", type);
-  Setattr(n, "parms", p);
-  Delete(type);
-  Delete(p);
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_MembersetToFunction()
- *
- * This function creates a C wrapper for setting a structure member.
- * ----------------------------------------------------------------------------- */
-
-int Swig_MembersetToFunction(Node *n, String *classname, int flags) {
-  String *name;
-  ParmList *parms;
-  Parm *p;
-  SwigType *t;
-  SwigType *ty;
-  SwigType *type;
-  SwigType *void_type = NewString("void");
-  String *self = 0;
-
-  int varcref = flags & CWRAP_NATURAL_VAR;
-
-  if (flags & CWRAP_SMART_POINTER) {
-    self = NewString("(*this)->");
-  }
-  if (flags & CWRAP_ALL_PROTECTED_ACCESS) {
-    self = NewStringf("darg->");
-  }
-
-  name = Getattr(n, "name");
-  type = Getattr(n, "type");
-
-  t = NewString(classname);
-  SwigType_add_pointer(t);
-  parms = NewParm(t, "self", n);
-  Setattr(parms, "self", "1");
-  Setattr(parms, "hidden","1");
-  Delete(t);
-
-  ty = Swig_wrapped_member_var_type(type, varcref);
-  p = NewParm(ty, name, n);
-  Setattr(parms, "hidden", "1");
-  set_nextSibling(parms, p);
-
-  /* If the type is a pointer or reference.  We mark it with a special wrap:disown attribute */
-  if (SwigType_check_decl(type, "p.")) {
-    Setattr(p, "wrap:disown", "1");
-  }
-  Delete(p);
-
-  if (flags & CWRAP_EXTEND) {
-    String *call;
-    String *cres;
-    String *code = Getattr(n, "code");
-
-    String *sname = Swig_name_set(0, name);
-    String *membername = Swig_name_member(0, classname, sname);
-    String *mangled = Swig_name_mangle(membername);
-
-    if (code) {
-      /* I don't think this ever gets run - WSF */
-      Swig_add_extension_code(n, mangled, parms, void_type, code, cparse_cplusplus, "self");
-    }
-    call = Swig_cfunction_call(mangled, parms);
-    cres = NewStringf("%s;", call);
-    Setattr(n, "wrap:action", cres);
-
-    Delete(cres);
-    Delete(call);
-    Delete(mangled);
-    Delete(membername);
-    Delete(sname);
-  } else {
-    String *call = Swig_cmemberset_call(name, type, self, varcref);
-    String *cres = NewStringf("%s;", call);
-    Setattr(n, "wrap:action", cres);
-    Delete(call);
-    Delete(cres);
-  }
-  Setattr(n, "type", void_type);
-  Setattr(n, "parms", parms);
-  Delete(parms);
-  Delete(ty);
-  Delete(void_type);
-  Delete(self);
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_MembergetToFunction()
- *
- * This function creates a C wrapper for getting a structure member.
- * ----------------------------------------------------------------------------- */
-
-int Swig_MembergetToFunction(Node *n, String *classname, int flags) {
-  String *name;
-  ParmList *parms;
-  SwigType *t;
-  SwigType *ty;
-  SwigType *type;
-  String *self = 0;
-
-  int varcref = flags & CWRAP_NATURAL_VAR;
-
-  if (flags & CWRAP_SMART_POINTER) {
-    if (Swig_storage_isstatic(n)) {
-      Node *sn = Getattr(n, "cplus:staticbase");
-      String *base = Getattr(sn, "name");
-      self = NewStringf("%s::", base);
-    } else if (flags & CWRAP_SMART_POINTER_OVERLOAD) {
-      String *nclassname = SwigType_namestr(classname);
-      self = NewStringf("(*(%s const *)this)->", nclassname);
-      Delete(nclassname);
-    } else {
-      self = NewString("(*this)->");
-    }
-  }
-  if (flags & CWRAP_ALL_PROTECTED_ACCESS) {
-    self = NewStringf("darg->");
-  }
-
-  name = Getattr(n, "name");
-  type = Getattr(n, "type");
-
-  t = NewString(classname);
-  SwigType_add_pointer(t);
-  parms = NewParm(t, "self", n);
-  Setattr(parms, "self", "1");
-  Setattr(parms, "hidden","1");
-  Delete(t);
-
-  ty = Swig_wrapped_member_var_type(type, varcref);
-  if (flags & CWRAP_EXTEND) {
-    String *call;
-    String *cres;
-    String *code = Getattr(n, "code");
-
-    String *gname = Swig_name_get(0, name);
-    String *membername = Swig_name_member(0, classname, gname);
-    String *mangled = Swig_name_mangle(membername);
-
-    if (code) {
-      /* I don't think this ever gets run - WSF */
-      Swig_add_extension_code(n, mangled, parms, ty, code, cparse_cplusplus, "self");
-    }
-    call = Swig_cfunction_call(mangled, parms);
-    cres = Swig_cresult(ty, Swig_cresult_name(), call);
-    Setattr(n, "wrap:action", cres);
-
-    Delete(cres);
-    Delete(call);
-    Delete(mangled);
-    Delete(membername);
-    Delete(gname);
-  } else {
-    String *call = Swig_cmemberget_call(name, type, self, varcref);
-    String *cres = Swig_cresult(ty, Swig_cresult_name(), call);
-    Setattr(n, "wrap:action", cres);
-    Delete(call);
-    Delete(cres);
-  }
-  Setattr(n, "type", ty);
-  Setattr(n, "parms", parms);
-  Delete(parms);
-  Delete(ty);
-
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_VarsetToFunction()
- *
- * This function creates a C wrapper for setting a global variable or static member
- * variable.
- * ----------------------------------------------------------------------------- */
-
-int Swig_VarsetToFunction(Node *n, int flags) {
-  String *name, *nname;
-  ParmList *parms;
-  SwigType *type, *ty;
-
-  int varcref = flags & CWRAP_NATURAL_VAR;
-
-  name = Getattr(n, "name");
-  type = Getattr(n, "type");
-  nname = SwigType_namestr(name);
-  ty = Swig_wrapped_var_type(type, varcref);
-  parms = NewParm(ty, name, n);
-
-  if (flags & CWRAP_EXTEND) {
-    String *sname = Swig_name_set(0, name);
-    String *mangled = Swig_name_mangle(sname);
-    String *call = Swig_cfunction_call(mangled, parms);
-    String *cres = NewStringf("%s;", call);
-    Setattr(n, "wrap:action", cres);
-    Delete(cres);
-    Delete(call);
-    Delete(mangled);
-    Delete(sname);
-  } else {
-    if (!Strstr(type, "enum $unnamed")) {
-      String *pname = Swig_cparm_name(0, 0);
-      String *dref = Swig_wrapped_var_deref(type, pname, varcref);
-      String *call = NewStringf("%s = %s;", nname, dref);
-      Setattr(n, "wrap:action", call);
-      Delete(call);
-      Delete(dref);
-      Delete(pname);
-    } else {
-      String *pname = Swig_cparm_name(0, 0);
-      String *call = NewStringf("if (sizeof(int) == sizeof(%s)) *(int*)(void*)&(%s) = %s;", nname, nname, pname);
-      Setattr(n, "wrap:action", call);
-      Delete(pname);
-      Delete(call);
-    }
-  }
-  Setattr(n, "type", "void");
-  Setattr(n, "parms", parms);
-  Delete(parms);
-  Delete(ty);
-  Delete(nname);
-  return SWIG_OK;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_VargetToFunction()
- *
- * This function creates a C wrapper for getting a global variable or static member
- * variable.
- * ----------------------------------------------------------------------------- */
-
-int Swig_VargetToFunction(Node *n, int flags) {
-  String *cres, *call;
-  String *name;
-  SwigType *type;
-  SwigType *ty = 0;
-
-  int varcref = flags & CWRAP_NATURAL_VAR;
-
-  name = Getattr(n, "name");
-  type = Getattr(n, "type");
-  ty = Swig_wrapped_var_type(type, varcref);
-
-  if (flags & CWRAP_EXTEND) {
-    String *sname = Swig_name_get(0, name);
-    String *mangled = Swig_name_mangle(sname);
-    call = Swig_cfunction_call(mangled, 0);
-    cres = Swig_cresult(ty, Swig_cresult_name(), call);
-    Setattr(n, "wrap:action", cres);
-    Delete(mangled);
-    Delete(sname);
-  } else {
-    String *nname = 0;
-    if (Equal(nodeType(n), "constant")) {
-      String *rawval = Getattr(n, "rawval");
-      String *value = rawval ? rawval : Getattr(n, "value");
-      nname = NewStringf("(%s)", value);
-    } else {
-      nname = SwigType_namestr(name);
-    }
-    call = Swig_wrapped_var_assign(type, nname, varcref);
-    cres = Swig_cresult(ty, Swig_cresult_name(), call);
-    Setattr(n, "wrap:action", cres);
-    Delete(nname);
-  }
-
-  Setattr(n, "type", ty);
-  Delattr(n, "parms");
-  Delete(cres);
-  Delete(call);
-  Delete(ty);
-  return SWIG_OK;
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/deprecate.c b/dependencies2013/win32/swig/Source/Swig/deprecate.c
deleted file mode 100644
index 08dc06a6..00000000
--- a/dependencies2013/win32/swig/Source/Swig/deprecate.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * deprecate.c
- *
- * The functions in this file are SWIG core functions that are deprecated 
- * or which do not fit in nicely with everything else.  Generally this means
- * that the function and/or API needs to be changed in some future release.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-
-/* ---------------------------------------------------------------------
- * ParmList_is_compactdefargs()
- *
- * Returns 1 if the parameter list passed in is marked for compact argument
- * handling (by the "compactdefargs" attribute). Otherwise returns 0.
- * ---------------------------------------------------------------------- */
-
-/* Discussion:
-
-  "compactdefargs" is a property set by the Parser to indicate special
-  handling of default arguments.   This property seems to be something that
-  is associated with functions and methods rather than low-level ParmList
-  objects.   Therefore, I don't like the fact that this special purpose
-  feature is bolted onto the side of ParmList objects.
-
-  Proposed solution:
-
-     1. "compactdefargs" should be a feature set on function/method nodes
-        instead of ParmList objects.  For example, if you have a function,
-        you would check the function node to see if the parameters are
-        to be handled in this way.
-
-
-  Difficulties:
-
-     1. This is used by functions in cwrap.c and emit.cxx, none of which
-        are passed information about the function/method node.   We might
-        have to change the API of those functions to make this work correctly.
-        For example:
-
-           int emit_num_required(ParmList *parms)
-
-        might become
-
-           int emit_num_required(ParmList *parms, int compactargs)
-
-*/
-
-int ParmList_is_compactdefargs(ParmList *p) {
-  int compactdefargs = 0;
-
-  if (p) {
-    compactdefargs = Getattr(p, "compactdefargs") ? 1 : 0;
-
-    /* The "compactdefargs" attribute should only be set on the first parameter in the list.
-     * However, sometimes an extra parameter is inserted at the beginning of the parameter list,
-     * so we check the 2nd parameter too. */
-    if (!compactdefargs) {
-      Parm *nextparm = nextSibling(p);
-      compactdefargs = (nextparm && Getattr(nextparm, "compactdefargs")) ? 1 : 0;
-    }
-  }
-
-  return compactdefargs;
-}
-
-/* ---------------------------------------------------------------------
- * ParmList_errorstr()
- *
- * Generate a prototype string suitable for use in error/warning messages.
- * Similar to ParmList_protostr() but is also aware of hidden parameters.
- * ---------------------------------------------------------------------- */
-
-/* Discussion.  This function is used to generate error messages, but take 
-   into account that there might be a hidden parameter.  Although this involves
-   parameter lists, it really isn't a core feature of swigparm.h or parms.c.
-   This is because the "hidden" attribute of parameters is added elsewhere (cwrap.c).
-
-   For now, this function is placed here because it doesn't really seem to fit in
-   with the parms.c interface.
- 
-*/
-
-String *ParmList_errorstr(ParmList *p) {
-  String *out = NewStringEmpty();
-  while (p) {
-    if (Getattr(p,"hidden")) {
-      p = nextSibling(p);
-    } else {
-      String *pstr = SwigType_str(Getattr(p, "type"), 0);
-      Append(out, pstr);
-      p = nextSibling(p);
-      if (p) {
-	Append(out, ",");
-      }
-      Delete(pstr);
-    }
-  }
-  return out;
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/error.c b/dependencies2013/win32/swig/Source/Swig/error.c
deleted file mode 100644
index 2c93cfb2..00000000
--- a/dependencies2013/win32/swig/Source/Swig/error.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * error.c
- *
- * Error handling functions.   These are used to issue warnings and
- * error messages.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include <stdarg.h>
-#include <ctype.h>
-
-/* -----------------------------------------------------------------------------
- * Commentary on the warning filter.
- *
- * The warning filter is a string of numbers prefaced by (-) or (+) to
- * indicate whether or not a warning message is displayed.  For example:
- *
- *      "-304-201-140+210+201"
- *
- * The filter string is scanned left to right and the first occurrence
- * of a warning number is used to determine printing behavior.
- *
- * The same number may appear more than once in the string.  For example, in the 
- * above string, "201" appears twice.  This simply means that warning 201
- * was disabled after it was previously enabled.  This may only be temporary
- * setting--the first number may be removed later in which case the warning
- * is reenabled.
- * ----------------------------------------------------------------------------- */
-
-#if defined(_WIN32)
-#  define  DEFAULT_ERROR_MSG_FORMAT EMF_MICROSOFT
-#else
-#  define  DEFAULT_ERROR_MSG_FORMAT EMF_STANDARD
-#endif
-static ErrorMessageFormat msg_format = DEFAULT_ERROR_MSG_FORMAT;
-static int silence = 0;		/* Silent operation */
-static String *filter = 0;	/* Warning filter */
-static int warnall = 0;
-static int nwarning = 0;
-static int nerrors = 0;
-
-static int init_fmt = 0;
-static char wrn_wnum_fmt[64];
-static char wrn_nnum_fmt[64];
-static char err_line_fmt[64];
-static char err_eof_fmt[64];
-static char diag_line_fmt[64];
-static char diag_eof_fmt[64];
-
-static String *format_filename(const_String_or_char_ptr filename);
-
-/* -----------------------------------------------------------------------------
- * Swig_warning()
- *
- * Issue a warning message on stderr.
- * ----------------------------------------------------------------------------- */
-
-void Swig_warning(int wnum, const_String_or_char_ptr filename, int line, const char *fmt, ...) {
-  String *out;
-  char *msg;
-  int wrn = 1;
-  va_list ap;
-  if (silence)
-    return;
-  if (!init_fmt)
-    Swig_error_msg_format(DEFAULT_ERROR_MSG_FORMAT);
-
-  va_start(ap, fmt);
-
-  out = NewStringEmpty();
-  vPrintf(out, fmt, ap);
-
-  msg = Char(out);
-  if (isdigit((unsigned char) *msg)) {
-    unsigned long result = strtoul(msg, &msg, 10);
-    if (msg != Char(out)) {
-      msg++;
-      wnum = result;
-    }
-  }
-
-  /* Check in the warning filter */
-  if (filter) {
-    char temp[32];
-    char *c;
-    char *f = Char(filter);
-    sprintf(temp, "%d", wnum);
-    while (*f != '\0' && (c = strstr(f, temp))) {
-      if (*(c - 1) == '-') {
-	wrn = 0;		/* Warning disabled */
-        break;
-      }
-      if (*(c - 1) == '+') {
-	wrn = 1;		/* Warning enabled */
-        break;
-      }
-      f += strlen(temp);
-    }
-  }
-  if (warnall || wrn) {
-    String *formatted_filename = format_filename(filename);
-    if (wnum) {
-      Printf(stderr, wrn_wnum_fmt, formatted_filename, line, wnum);
-    } else {
-      Printf(stderr, wrn_nnum_fmt, formatted_filename, line);
-    }
-    Printf(stderr, "%s", msg);
-    nwarning++;
-    Delete(formatted_filename);
-  }
-  Delete(out);
-  va_end(ap);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_error()
- *
- * Issue an error message on stderr.
- * ----------------------------------------------------------------------------- */
-
-void Swig_error(const_String_or_char_ptr filename, int line, const char *fmt, ...) {
-  va_list ap;
-  String *formatted_filename = NULL;
-
-  if (silence)
-    return;
-  if (!init_fmt)
-    Swig_error_msg_format(DEFAULT_ERROR_MSG_FORMAT);
-
-  va_start(ap, fmt);
-  formatted_filename = format_filename(filename);
-  if (line > 0) {
-    Printf(stderr, err_line_fmt, formatted_filename, line);
-  } else {
-    Printf(stderr, err_eof_fmt, formatted_filename);
-  }
-  vPrintf(stderr, fmt, ap);
-  va_end(ap);
-  nerrors++;
-  Delete(formatted_filename);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_error_count()
- *
- * Returns number of errors received.
- * ----------------------------------------------------------------------------- */
-
-int Swig_error_count(void) {
-  return nerrors;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_error_silent()
- *
- * Set silent flag
- * ----------------------------------------------------------------------------- */
-
-void Swig_error_silent(int s) {
-  silence = s;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_warnfilter()
- *
- * Takes a comma separate list of warning numbers and puts in the filter.
- * ----------------------------------------------------------------------------- */
-
-void Swig_warnfilter(const_String_or_char_ptr wlist, int add) {
-  char *c;
-  char *cw;
-  String *s;
-  if (!filter)
-    filter = NewStringEmpty();
-
-  s = NewString("");
-  Clear(s);
-  cw = Char(wlist);
-  while (*cw != '\0') {
-    if (*cw != ' ') {
-      Putc(*cw, s);
-    }
-    ++cw;
-  }
-  c = Char(s);
-  c = strtok(c, ", ");
-  while (c) {
-    if (isdigit((int) *c) || (*c == '+') || (*c == '-')) {
-      /* Even if c is a digit, the rest of the string might not be, eg in the case of typemap 
-       * warnings (a bit odd really), eg: %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK_MSG) */
-      if (add) {
-	Insert(filter, 0, c);
-	if (isdigit((int) *c)) {
-	  Insert(filter, 0, "-");
-	}
-      } else {
-	char *temp = (char *)malloc(sizeof(char)*strlen(c) + 2);
-	if (isdigit((int) *c)) {
-	  sprintf(temp, "-%s", c);
-	} else {
-	  strcpy(temp, c);
-	}
-	Replace(filter, temp, "", DOH_REPLACE_FIRST);
-        free(temp);
-      }
-    }
-    c = strtok(NULL, ", ");
-  }
-  Delete(s);
-}
-
-void Swig_warnall(void) {
-  warnall = 1;
-}
-
-
-/* ----------------------------------------------------------------------------- 
- * Swig_warn_count()
- *
- * Return the number of warnings
- * ----------------------------------------------------------------------------- */
-
-int Swig_warn_count(void) {
-  return nwarning;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_error_msg_format()
- *
- * Set the type of error/warning message display
- * ----------------------------------------------------------------------------- */
-
-void Swig_error_msg_format(ErrorMessageFormat format) {
-  const char *error = "Error";
-  const char *warning = "Warning";
-
-  const char *fmt_eof = 0;
-  const char *fmt_line = 0;
-
-  /* here 'format' could be directly a string instead of an enum, but
-     by now a switch is used to translated into one. */
-  switch (format) {
-  case EMF_MICROSOFT:
-    fmt_line = "%s(%d) ";
-    fmt_eof = "%s(999999) ";	/* Is there a special character for EOF? Just use a large number. */
-    break;
-  case EMF_STANDARD:
-  default:
-    fmt_line = "%s:%d";
-    fmt_eof = "%s:EOF";
-  }
-
-  sprintf(wrn_wnum_fmt, "%s: %s %%d: ", fmt_line, warning);
-  sprintf(wrn_nnum_fmt, "%s: %s: ", fmt_line, warning);
-  sprintf(err_line_fmt, "%s: %s: ", fmt_line, error);
-  sprintf(err_eof_fmt, "%s: %s: ", fmt_eof, error);
-  sprintf(diag_line_fmt, "%s: ", fmt_line);
-  sprintf(diag_eof_fmt, "%s: ", fmt_eof);
-
-  msg_format = format;
-  init_fmt = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * format_filename()
- *
- * Remove double backslashes in Windows filename paths for display
- * ----------------------------------------------------------------------------- */
-static String *format_filename(const_String_or_char_ptr filename) {
-  String *formatted_filename = NewString(filename);
-#if defined(_WIN32)
-  Replaceall(formatted_filename, "\\\\", "\\");
-#endif
-  return formatted_filename;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_stringify_with_location()
- *
- * Return a string representation of any DOH object with line and file location
- * information in the appropriate error message format. The string representation
- * is enclosed within [] brackets after the line and file information.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_stringify_with_location(DOH *object) {
-  String *str = NewStringEmpty();
-
-  if (!init_fmt)
-    Swig_error_msg_format(DEFAULT_ERROR_MSG_FORMAT);
-
-  if (object) {
-    int line = Getline(object);
-    String *formatted_filename = format_filename(Getfile(object));
-    if (line > 0) {
-      Printf(str, diag_line_fmt, formatted_filename, line);
-    } else {
-      Printf(str, diag_eof_fmt, formatted_filename);
-    }
-    if (Len(object) == 0) {
-      Printf(str, "[EMPTY]");
-    } else {
-      Printf(str, "[%s]", object);
-    }
-    Delete(formatted_filename);
-  } else {
-    Printf(str, "[NULL]");
-  }
-
-  return str;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_diagnostic()
- *
- * Issue a diagnostic message on stdout.
- * ----------------------------------------------------------------------------- */
-
-void Swig_diagnostic(const_String_or_char_ptr filename, int line, const char *fmt, ...) {
-  va_list ap;
-  String *formatted_filename = NULL;
-
-  if (!init_fmt)
-    Swig_error_msg_format(DEFAULT_ERROR_MSG_FORMAT);
-
-  va_start(ap, fmt);
-  formatted_filename = format_filename(filename);
-  if (line > 0) {
-    Printf(stdout, diag_line_fmt, formatted_filename, line);
-  } else {
-    Printf(stdout, diag_eof_fmt, formatted_filename);
-  }
-  vPrintf(stdout, fmt, ap);
-  va_end(ap);
-  Delete(formatted_filename);
-}
-
diff --git a/dependencies2013/win32/swig/Source/Swig/extend.c b/dependencies2013/win32/swig/Source/Swig/extend.c
deleted file mode 100644
index 30097b43..00000000
--- a/dependencies2013/win32/swig/Source/Swig/extend.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * extend.c
- *
- * Extensions support (%extend)
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-
-static Hash *extendhash = 0;     /* Hash table of added methods */
-
-/* -----------------------------------------------------------------------------
- * Swig_extend_hash()
- *
- * Access the extend hash
- * ----------------------------------------------------------------------------- */
-Hash *Swig_extend_hash(void) {
-  if (!extendhash)
-    extendhash = NewHash();
-  return extendhash;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_extend_merge()
- *
- * Extension merge.  This function is used to handle the %extend directive
- * when it appears before a class definition.   To handle this, the %extend
- * actually needs to take precedence.  Therefore, we will selectively nuke symbols
- * from the current symbol table, replacing them with the added methods.
- * ----------------------------------------------------------------------------- */
-
-void Swig_extend_merge(Node *cls, Node *am) {
-  Node *n;
-  Node *csym;
-
-  n = firstChild(am);
-  while (n) {
-    String *symname;
-    if (Strcmp(nodeType(n),"constructor") == 0) {
-      symname = Getattr(n,"sym:name");
-      if (symname) {
-	if (Strcmp(symname,Getattr(n,"name")) == 0) {
-	  /* If the name and the sym:name of a constructor are the same,
-             then it hasn't been renamed.  However---the name of the class
-             itself might have been renamed so we need to do a consistency
-             check here */
-	  if (Getattr(cls,"sym:name")) {
-	    Setattr(n,"sym:name", Getattr(cls,"sym:name"));
-	  }
-	}
-      } 
-    }
-
-    symname = Getattr(n,"sym:name");
-    DohIncref(symname);
-    if ((symname) && (!Getattr(n,"error"))) {
-      /* Remove node from its symbol table */
-      Swig_symbol_remove(n);
-      csym = Swig_symbol_add(symname,n);
-      if (csym != n) {
-	/* Conflict with previous definition.  Nuke previous definition */
-	String *e = NewStringEmpty();
-	String *en = NewStringEmpty();
-	String *ec = NewStringEmpty();
-	Printf(ec,"Identifier '%s' redefined by %%extend (ignored),",symname);
-	Printf(en,"%%extend definition of '%s'.",symname);
-	SWIG_WARN_NODE_BEGIN(n);
-	Swig_warning(WARN_PARSE_REDEFINED,Getfile(csym),Getline(csym),"%s\n",ec);
-	Swig_warning(WARN_PARSE_REDEFINED,Getfile(n),Getline(n),"%s\n",en);
-	SWIG_WARN_NODE_END(n);
-	Printf(e,"%s:%d:%s\n%s:%d:%s\n",Getfile(csym),Getline(csym),ec, 
-	       Getfile(n),Getline(n),en);
-	Setattr(csym,"error",e);
-	Delete(e);
-	Delete(en);
-	Delete(ec);
-	Swig_symbol_remove(csym);              /* Remove class definition */
-	Swig_symbol_add(symname,n);            /* Insert extend definition */
-      }
-    }
-    n = nextSibling(n);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_extend_append_previous()
- * ----------------------------------------------------------------------------- */
-
-void Swig_extend_append_previous(Node *cls, Node *am) {
-  Node *n, *ne;
-  Node *pe = 0;
-  Node *ae = 0;
-
-  if (!am) return;
-  
-  n = firstChild(am);
-  while (n) {
-    ne = nextSibling(n);
-    set_nextSibling(n,0);
-    /* typemaps and fragments need to be prepended */
-    if (((Cmp(nodeType(n),"typemap") == 0) || (Cmp(nodeType(n),"fragment") == 0)))  {
-      if (!pe) pe = new_node("extend");
-      appendChild(pe, n);
-    } else {
-      if (!ae) ae = new_node("extend");
-      appendChild(ae, n);
-    }    
-    n = ne;
-  }
-  if (pe) prependChild(cls,pe);
-  if (ae) appendChild(cls,ae);
-}
- 
-
-/* -----------------------------------------------------------------------------
- * Swig_extend_unused_check()
- *
- * Check for unused %extend.  Special case, don't report unused
- * extensions for templates
- * ----------------------------------------------------------------------------- */
- 
-void Swig_extend_unused_check(void) {
-  Iterator ki;
-
-  if (!extendhash) return;
-  for (ki = First(extendhash); ki.key; ki = Next(ki)) {
-    if (!Strchr(ki.key,'<')) {
-      SWIG_WARN_NODE_BEGIN(ki.item);
-      Swig_warning(WARN_PARSE_EXTEND_UNDEF,Getfile(ki.item), Getline(ki.item), "%%extend defined for an undeclared class %s.\n", SwigType_namestr(ki.key));
-      SWIG_WARN_NODE_END(ki.item);
-    }
-  }
-}
-
diff --git a/dependencies2013/win32/swig/Source/Swig/fragment.c b/dependencies2013/win32/swig/Source/Swig/fragment.c
deleted file mode 100644
index 5b30e86e..00000000
--- a/dependencies2013/win32/swig/Source/Swig/fragment.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * fragment.c
- *
- * This file manages named code fragments.  Code fragments are typically
- * used to hold helper-code that may or may not be included in the wrapper
- * file (depending on what features are actually used in the interface).
- *
- * By using fragments, it's possible to greatly reduce the amount of
- * wrapper code and to generate cleaner wrapper files. 
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "swigwarn.h"
-#include "cparse.h"
-
-static Hash *fragments = 0;
-static Hash *looking_fragments = 0;
-static int debug = 0;
-
-
-/* -----------------------------------------------------------------------------
- * Swig_fragment_register()
- *
- * Add a fragment. Use the original Node*, so, if something needs to be
- * changed, lang.cxx doesn't nedd to be touched again.
- * ----------------------------------------------------------------------------- */
-
-void Swig_fragment_register(Node *fragment) {
-  if (Getattr(fragment, "emitonly")) {
-    Swig_fragment_emit(fragment);
-    return;
-  } else {
-    String *name = Copy(Getattr(fragment, "value"));
-    String *type = Getattr(fragment, "type");
-    if (type) {
-      SwigType *rtype = SwigType_typedef_resolve_all(type);
-      String *mangle = Swig_string_mangle(type);
-      Append(name, mangle);
-      Delete(mangle);
-      Delete(rtype);
-      if (debug)
-	Printf(stdout, "register fragment %s %s\n", name, type);
-    }
-    if (!fragments) {
-      fragments = NewHash();
-    }
-    if (!Getattr(fragments, name)) {
-      String *section = Copy(Getattr(fragment, "section"));
-      String *ccode = Copy(Getattr(fragment, "code"));
-      Hash *kwargs = Getattr(fragment, "kwargs");
-      Setmeta(ccode, "section", section);
-      if (kwargs) {
-	Setmeta(ccode, "kwargs", kwargs);
-      }
-      Setfile(ccode, Getfile(fragment));
-      Setline(ccode, Getline(fragment));
-      /* Replace $descriptor() macros */
-      Swig_cparse_replace_descriptor(ccode);
-      Setattr(fragments, name, ccode);
-      if (debug)
-	Printf(stdout, "registering fragment %s %s\n", name, section);
-      Delete(section);
-      Delete(ccode);
-    }
-    Delete(name);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_fragment_emit()
- *
- * Emit a fragment
- * ----------------------------------------------------------------------------- */
-
-static
-char *char_index(char *str, char c) {
-  while (*str && (c != *str))
-    ++str;
-  return (c == *str) ? str : 0;
-}
-
-void Swig_fragment_emit(Node *n) {
-  String *code;
-  char *pc, *tok;
-  String *t;
-  String *mangle = 0;
-  String *name = 0;
-  String *type = 0;
-
-  name = Getattr(n, "value");
-  if (!name) {
-    name = n;
-  }
-
-  if (!fragments) {
-    Swig_warning(WARN_FRAGMENT_NOT_FOUND, Getfile(n), Getline(n), "Fragment '%s' not found.\n", name);
-    return;
-  }
-
-  type = Getattr(n, "type");
-  if (type) {
-    mangle = Swig_string_mangle(type);
-  }
-
-  if (debug)
-    Printf(stdout, "looking fragment %s %s\n", name, type);
-  t = Copy(name);
-  tok = Char(t);
-  pc = char_index(tok, ',');
-  if (pc)
-    *pc = 0;
-  while (tok) {
-    String *name = NewString(tok);
-    if (mangle)
-      Append(name, mangle);
-    if (looking_fragments && Getattr(looking_fragments, name)) {
-      return;
-    }
-    code = Getattr(fragments, name);
-    if (debug)
-      Printf(stdout, "looking subfragment %s\n", name);
-    if (code && (Strcmp(code, "ignore") != 0)) {
-      String *section = Getmeta(code, "section");
-      Hash *nn = Getmeta(code, "kwargs");
-      if (!looking_fragments)
-	looking_fragments = NewHash();
-      Setattr(looking_fragments, name, "1");
-      while (nn) {
-	if (Equal(Getattr(nn, "name"), "fragment")) {
-	  if (debug)
-	    Printf(stdout, "emitting fragment %s %s\n", nn, type);
-	  Setfile(nn, Getfile(n));
-	  Setline(nn, Getline(n));
-	  Swig_fragment_emit(nn);
-	}
-	nn = nextSibling(nn);
-      }
-      if (section) {
-	File *f = Swig_filebyname(section);
-	if (!f) {
-	  Swig_error(Getfile(code), Getline(code), "Bad section '%s' in %%fragment declaration for code fragment '%s'\n", section, name);
-	} else {
-	  if (debug)
-	    Printf(stdout, "emitting subfragment %s %s\n", name, section);
-	  if (debug)
-	    Printf(f, "/* begin fragment %s */\n", name);
-	  Printf(f, "%s\n", code);
-	  if (debug)
-	    Printf(f, "/* end fragment %s */\n\n", name);
-	  Setattr(fragments, name, "ignore");
-	  Delattr(looking_fragments, name);
-	}
-      }
-    } else if (!code && type) {
-      SwigType *rtype = SwigType_typedef_resolve_all(type);
-      if (!Equal(type, rtype)) {
-	String *name = Copy(Getattr(n, "value"));
-	String *mangle = Swig_string_mangle(type);
-	Append(name, mangle);
-	Setfile(name, Getfile(n));
-	Setline(name, Getline(n));
-	Swig_fragment_emit(name);
-	Delete(mangle);
-	Delete(name);
-      }
-      Delete(rtype);
-    }
-
-    if (!code) {
-      Swig_warning(WARN_FRAGMENT_NOT_FOUND, Getfile(n), Getline(n), "Fragment '%s' not found.\n", name);
-    }
-    tok = pc ? pc + 1 : 0;
-    if (tok) {
-      pc = char_index(tok, ',');
-      if (pc)
-	*pc = 0;
-    }
-    Delete(name);
-  }
-  Delete(t);
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/getopt.c b/dependencies2013/win32/swig/Source/Swig/getopt.c
deleted file mode 100644
index 74076a5f..00000000
--- a/dependencies2013/win32/swig/Source/Swig/getopt.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * getopt.c
- *
- * Handles the parsing of command line options.  This is particularly nasty
- * compared to other utilities given that command line options can potentially
- * be read by many different modules within SWIG.  Thus, in order to make sure
- * there are no unrecognized options, each module is required to "mark"
- * the options that it uses.  Afterwards, we can make a quick scan to make
- * sure there are no unmarked options.
- * 
- * TODO: 
- *     - This module needs to be modified so that it doesn't call exit().
- *       Should have cleaner error handling in general.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-
-static char **args;
-static int numargs;
-static int *marked;
-
-/* -----------------------------------------------------------------------------
- * Swig_init_args()
- * 
- * Initialize the argument list handler.
- * ----------------------------------------------------------------------------- */
-
-void Swig_init_args(int argc, char **argv) {
-  int i;
-  assert(argc > 0);
-  assert(argv);
-
-  numargs = argc;
-  args = argv;
-  marked = (int *) malloc(numargs * sizeof(int));
-  for (i = 0; i < argc; i++) {
-    marked[i] = 0;
-  }
-  marked[0] = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_mark_arg()
- * 
- * Marks an argument as being parsed.
- * ----------------------------------------------------------------------------- */
-
-void Swig_mark_arg(int n) {
-  assert(marked);
-  assert((n >= 0) && (n < numargs));
-  marked[n] = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_check_marked()
- *
- * Checks to see if argument has been picked up.
- * ----------------------------------------------------------------------------- */
-
-int Swig_check_marked(int n) {
-  assert((n >= 0) && (n < numargs));
-  return marked[n];
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_check_options()
- * 
- * Checkers for unprocessed command line options and errors.
- * ----------------------------------------------------------------------------- */
-
-void Swig_check_options(int check_input) {
-  int error = 0;
-  int i;
-  int max = check_input ? numargs - 1 : numargs;
-  assert(marked);
-  for (i = 1; i < max; i++) {
-    if (!marked[i]) {
-      Printf(stderr, "swig error : Unrecognized option %s\n", args[i]);
-      error = 1;
-    }
-  }
-  if (error) {
-    Printf(stderr, "Use 'swig -help' for available options.\n");
-    exit(1);
-  }
-  if (check_input && marked[numargs - 1]) {
-    Printf(stderr, "Must specify an input file. Use -help for available options.\n");
-    exit(1);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_arg_error()
- * 
- * Generates a generic error message and exits.
- * ----------------------------------------------------------------------------- */
-
-void Swig_arg_error(void) {
-  Printf(stderr, "SWIG : Unable to parse command line options.\n");
-  Printf(stderr, "Use 'swig -help' for available options.\n");
-  exit(1);
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/include.c b/dependencies2013/win32/swig/Source/Swig/include.c
deleted file mode 100644
index 94df338f..00000000
--- a/dependencies2013/win32/swig/Source/Swig/include.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * include.c
- *
- * The functions in this file are used to manage files in the SWIG library.
- * General purpose functions for opening, including, and retrieving pathnames
- * are provided.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-
-static List   *directories = 0;	        /* List of include directories */
-static String *lastpath = 0;	        /* Last file that was included */
-static List   *pdirectories = 0;        /* List of pushed directories  */
-static int     dopush = 1;		/* Whether to push directories */
-static int file_debug = 0;
-
-/* This functions determine whether to push/pop dirs in the preprocessor */
-void Swig_set_push_dir(int push) {
-  dopush = push;
-}
-
-int Swig_get_push_dir(void) {
-  return dopush;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_add_directory()
- *
- * Adds a directory to the SWIG search path.
- * ----------------------------------------------------------------------------- */
-
-List *Swig_add_directory(const_String_or_char_ptr dirname) {
-  String *adirname;
-  if (!directories)
-    directories = NewList();
-  assert(directories);
-  if (dirname) {
-    adirname = NewString(dirname);
-    Append(directories,adirname);
-    Delete(adirname);
-  }
-  return directories;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_push_directory()
- *
- * Inserts a directory at the front of the SWIG search path.  This is used by
- * the preprocessor to grab files in the same directory as other included files.
- * ----------------------------------------------------------------------------- */
-
-void Swig_push_directory(const_String_or_char_ptr dirname) {
-  String *pdirname;
-  if (!Swig_get_push_dir())
-    return;
-  if (!pdirectories)
-    pdirectories = NewList();
-  assert(pdirectories);
-  pdirname = NewString(dirname);
-  assert(pdirname);
-  Insert(pdirectories,0,pdirname);
-  Delete(pdirname);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_pop_directory()
- *
- * Pops a directory off the front of the SWIG search path.  This is used by
- * the preprocessor.
- * ----------------------------------------------------------------------------- */
-
-void Swig_pop_directory(void) {
-  if (!Swig_get_push_dir())
-    return;
-  if (!pdirectories)
-    return;
-  Delitem(pdirectories, 0);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_last_file()
- * 
- * Returns the full pathname of the last file opened. 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_last_file(void) {
-  assert(lastpath);
-  return lastpath;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_search_path_any() 
- * 
- * Returns a list of the current search paths.
- * ----------------------------------------------------------------------------- */
-
-static List *Swig_search_path_any(int syspath) {
-  String *filename;
-  List   *slist;
-  int     i, ilen;
-
-  slist = NewList();
-  assert(slist);
-  filename = NewStringEmpty();
-  assert(filename);
-#ifdef MACSWIG
-  Printf(filename, "%s", SWIG_FILE_DELIMITER);
-#else
-  Printf(filename, ".%s", SWIG_FILE_DELIMITER);
-#endif
-  Append(slist, filename);
-  Delete(filename);
-  
-  /* If there are any pushed directories.  Add them first */
-  if (pdirectories) {
-    ilen = Len(pdirectories);
-    for (i = 0; i < ilen; i++) {
-      filename = NewString(Getitem(pdirectories,i));
-      Append(filename,SWIG_FILE_DELIMITER);
-      Append(slist,filename);
-      Delete(filename);
-    }
-  }
-  /* Add system directories next */
-  ilen = Len(directories);
-  for (i = 0; i < ilen; i++) {
-    filename = NewString(Getitem(directories,i));
-    Append(filename,SWIG_FILE_DELIMITER);
-    if (syspath) {
-      /* If doing a system include, put the system directories first */
-      Insert(slist,i,filename);
-    } else {
-      /* Otherwise, just put the system directories after the pushed directories (if any) */
-      Append(slist,filename);
-    }
-    Delete(filename);
-  }
-  return slist;
-}
-
-List *Swig_search_path() {
-  return Swig_search_path_any(0);
-}
-
-
-
-/* -----------------------------------------------------------------------------
- * Swig_open()
- *
- * open a file, optionally looking for it in the include path.  Returns an open  
- * FILE * on success.
- * ----------------------------------------------------------------------------- */
-
-static FILE *Swig_open_file(const_String_or_char_ptr name, int sysfile, int use_include_path) {
-  FILE *f;
-  String *filename;
-  List *spath = 0;
-  char *cname;
-  int i, ilen, nbytes;
-  char bom[3];
-
-  if (!directories)
-    directories = NewList();
-  assert(directories);
-
-  cname = Char(name);
-  filename = NewString(cname);
-  assert(filename);
-  if (file_debug) {
-    Printf(stdout, "  Open: %s\n", filename);
-  }
-  f = fopen(Char(filename), "r");
-  if (!f && use_include_path) {
-    spath = Swig_search_path_any(sysfile);
-    ilen = Len(spath);
-    for (i = 0; i < ilen; i++) {
-      Clear(filename);
-      Printf(filename, "%s%s", Getitem(spath, i), cname);
-      f = fopen(Char(filename), "r");
-      if (f)
-	break;
-    }
-    Delete(spath);
-  }
-  if (f) {
-    Delete(lastpath);
-    lastpath = filename;
-
-    /* Skip the UTF-8 BOM if it's present */
-    nbytes = (int)fread(bom, 1, 3, f);
-    if (nbytes == 3 && bom[0] == (char)0xEF && bom[1] == (char)0xBB && bom[2] == (char)0xBF) {
-      /* skip */
-    } else {
-      fseek(f, 0, SEEK_SET);
-    }
-  }
-  return f;
-}
-
-/* Open a file - searching the include paths to find it */
-FILE *Swig_include_open(const_String_or_char_ptr name) {
-  return Swig_open_file(name, 0, 1);
-}
-
-/* Open a file - does not use include paths to find it */
-FILE *Swig_open(const_String_or_char_ptr name) {
-  return Swig_open_file(name, 0, 0);
-}
-
-
-
-/* -----------------------------------------------------------------------------
- * Swig_read_file()
- * 
- * Reads data from an open FILE * and returns it as a string.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_read_file(FILE *f) {
-  int len;
-  char buffer[4096];
-  String *str = NewStringEmpty();
-
-  assert(str);
-  while (fgets(buffer, 4095, f)) {
-    Append(str, buffer);
-  }
-  len = Len(str);
-  /* Add a newline if not present on last line -- the preprocessor seems to 
-   * rely on \n and not EOF terminating lines */
-  if (len) {
-    char *cstr = Char(str);
-    if (cstr[len - 1] != '\n') {
-      Append(str, "\n");
-    }
-  }
-  return str;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_include()
- *
- * Opens a file and returns it as a string.
- * ----------------------------------------------------------------------------- */
-
-static String *Swig_include_any(const_String_or_char_ptr name, int sysfile) {
-  FILE *f;
-  String *str;
-  String *file;
-
-  f = Swig_open_file(name, sysfile, 1);
-  if (!f)
-    return 0;
-  str = Swig_read_file(f);
-  fclose(f);
-  Seek(str, 0, SEEK_SET);
-  file = Copy(Swig_last_file());
-  Setfile(str, file);
-  Delete(file);
-  Setline(str, 1);
-  return str;
-}
-
-String *Swig_include(const_String_or_char_ptr name) {
-  return Swig_include_any(name, 0);
-}
-
-String *Swig_include_sys(const_String_or_char_ptr name) {
-  return Swig_include_any(name, 1);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_insert_file()
- *
- * Copies the contents of a file into another file
- * ----------------------------------------------------------------------------- */
-
-int Swig_insert_file(const_String_or_char_ptr filename, File *outfile) {
-  char buffer[4096];
-  int nbytes;
-  FILE *f = Swig_include_open(filename);
-
-  if (!f)
-    return -1;
-  while ((nbytes = Read(f, buffer, 4096)) > 0) {
-    Write(outfile, buffer, nbytes);
-  }
-  fclose(f);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_register_filebyname()
- *
- * Register a "named" file with the core.  Named files can become targets
- * for %insert directives and other SWIG operations.  This function takes
- * the place of the f_header, f_wrapper, f_init, and other global variables
- * in SWIG1.1
- * ----------------------------------------------------------------------------- */
-
-static Hash *named_files = 0;
-
-void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile) {
-  if (!named_files)
-    named_files = NewHash();
-  Setattr(named_files, filename, outfile);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_filebyname()
- *
- * Get a named file
- * ----------------------------------------------------------------------------- */
-
-File *Swig_filebyname(const_String_or_char_ptr filename) {
-  if (!named_files)
-    return 0;
-  return Getattr(named_files, filename);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_file_extension()
- *
- * Returns the extension of a file
- * ----------------------------------------------------------------------------- */
-
-String *Swig_file_extension(const_String_or_char_ptr filename) {
-  String *name = Swig_file_filename(filename);
-  const char *c = strrchr(Char(name), '.');
-  String *extension = c ? NewString(c) : NewString("");
-  Delete(name);
-  return extension;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_file_basename()
- *
- * Returns the filename with the extension removed.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_file_basename(const_String_or_char_ptr filename) {
-  String *extension = Swig_file_extension(filename);
-  String *basename = NewStringWithSize(filename, Len(filename) - Len(extension));
-  Delete(extension);
-  return basename;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_file_filename()
- *
- * Return the file name with any leading path stripped off
- * ----------------------------------------------------------------------------- */
-String *Swig_file_filename(const_String_or_char_ptr filename) {
-  const char *delim = SWIG_FILE_DELIMITER;
-  const char *c = strrchr(Char(filename), *delim);
-  return c ? NewString(c + 1) : NewString(filename);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_file_dirname()
- *
- * Return the name of the directory associated with a file
- * ----------------------------------------------------------------------------- */
-String *Swig_file_dirname(const_String_or_char_ptr filename) {
-  const char *delim = SWIG_FILE_DELIMITER;
-  const char *c = strrchr(Char(filename), *delim);
-  return c ? NewStringWithSize(filename, (int)(c - Char(filename) + 1)) : NewString("");
-}
-
-/*
- * Swig_file_debug()
- */
-void Swig_file_debug_set() {
-  file_debug = 1;
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/misc.c b/dependencies2013/win32/swig/Source/Swig/misc.c
deleted file mode 100644
index 91f05c0a..00000000
--- a/dependencies2013/win32/swig/Source/Swig/misc.c
+++ /dev/null
@@ -1,1501 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * misc.c
- *
- * Miscellaneous functions that don't really fit anywhere else.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#include <direct.h>
-#ifndef S_ISDIR
-#define S_ISDIR(mode) (((mode) & S_IFDIR) == S_IFDIR)
-#endif
-#endif
-
-static char *fake_version = 0;
-
-/* -----------------------------------------------------------------------------
- * Swig_copy_string()
- *
- * Duplicate a NULL-terminate string given as a char *.
- * ----------------------------------------------------------------------------- */
-
-char *Swig_copy_string(const char *s) {
-  char *c = 0;
-  if (s) {
-    c = (char *) malloc(strlen(s) + 1);
-    strcpy(c, s);
-  }
-  return c;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_set_fakeversion()
- *
- * Version string override
- * ----------------------------------------------------------------------------- */
-
-void Swig_set_fakeversion(const char *version) {
-  fake_version = Swig_copy_string(version);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_package_version()
- *
- * Return the package string containing the version number
- * ----------------------------------------------------------------------------- */
-
-const char *Swig_package_version(void) {
-  return fake_version ? fake_version : PACKAGE_VERSION;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_banner()
- *
- * Emits the SWIG identifying banner for the C/C++ wrapper file.
- * ----------------------------------------------------------------------------- */
-
-void Swig_banner(File *f) {
-  Printf(f, "/* ----------------------------------------------------------------------------\n\
- * This file was automatically generated by SWIG (http://www.swig.org).\n\
- * Version %s\n\
- *\n\
- * This file is not intended to be easily readable and contains a number of\n\
- * coding conventions designed to improve portability and efficiency. Do not make\n\
- * changes to this file unless you know what you are doing--modify the SWIG\n\
- * interface file instead.\n", Swig_package_version());
-  /* String too long for ISO compliance */
-  Printf(f, " * ----------------------------------------------------------------------------- */\n");
-
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_banner_target_lang()
- *
- * Emits a SWIG identifying banner in the target language
- * ----------------------------------------------------------------------------- */
-
-void Swig_banner_target_lang(File *f, const_String_or_char_ptr commentchar) {
-  Printf(f, "%s This file was automatically generated by SWIG (http://www.swig.org).\n", commentchar);
-  Printf(f, "%s Version %s\n", commentchar, Swig_package_version());
-  Printf(f, "%s\n", commentchar);
-  Printf(f, "%s Do not make changes to this file unless you know what you are doing--modify\n", commentchar);
-  Printf(f, "%s the SWIG interface file instead.\n", commentchar);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_strip_c_comments()
- *
- * Return a new string with C comments stripped from the input string. NULL is
- * returned if there aren't any comments.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_strip_c_comments(const String *s) {
-  const char *c = Char(s);
-  const char *comment_begin = 0;
-  const char *comment_end = 0;
-  String *stripped = 0;
-
-  while (*c) {
-    if (!comment_begin && *c == '/') {
-      ++c;
-      if (!*c)
-        break;
-      if (*c == '*')
-        comment_begin = c-1;
-    } else if (comment_begin && !comment_end && *c == '*') {
-      ++c;
-      if (*c == '/') {
-        comment_end = c;
-        break;
-      }
-    }
-    ++c;
-  }
-
-  if (comment_begin && comment_end) {
-    int size = (int)(comment_begin - Char(s));
-    String *stripmore = 0;
-    stripped = NewStringWithSize(s, size);
-    Printv(stripped, comment_end + 1, NIL);
-    do {
-      stripmore = Swig_strip_c_comments(stripped);
-      if (stripmore) {
-        Delete(stripped);
-        stripped = stripmore;
-      }
-    } while (stripmore);
-  }
-  return stripped;
-}
-
-/* -----------------------------------------------------------------------------
- * is_directory()
- * ----------------------------------------------------------------------------- */
-static int is_directory(String *directory) {
-  int last = Len(directory) - 1;
-  int statres;
-  struct stat st;
-  char *dir = Char(directory);
-  if (dir[last] == SWIG_FILE_DELIMITER[0]) {
-    /* remove trailing slash - can cause S_ISDIR to fail on Windows, at least */
-    dir[last] = 0;
-    statres = stat(dir, &st);
-    dir[last] = SWIG_FILE_DELIMITER[0];
-  } else {
-    statres = stat(dir, &st);
-  }
-  return (statres == 0 && S_ISDIR(st.st_mode));
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_new_subdirectory()
- *
- * Create the subdirectory only if the basedirectory already exists as a directory.
- * basedirectory can be empty to indicate current directory but not NULL.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_new_subdirectory(String *basedirectory, String *subdirectory) {
-  String *error = 0;
-  int current_directory = Len(basedirectory) == 0;
-
-  if (current_directory || is_directory(basedirectory)) {
-    Iterator it;
-    String *dir = NewString(basedirectory);
-    List *subdirs = Split(subdirectory, SWIG_FILE_DELIMITER[0], INT_MAX);
-
-    for (it = First(subdirs); it.item; it = Next(it)) {
-      int result;
-      String *subdirectory = it.item;
-      Printf(dir, "%s", subdirectory);
-#ifdef _WIN32
-      result = _mkdir(Char(dir));
-#else
-      result = mkdir(Char(dir), 0777);
-#endif
-      if (result != 0 && errno != EEXIST) {
-	error = NewStringf("Cannot create directory %s: %s", dir, strerror(errno));
-	break;
-      }
-      if (!is_directory(dir)) {
-	error = NewStringf("Cannot create directory %s: it may already exist but not be a directory", dir);
-	break;
-      }
-      Printf(dir, SWIG_FILE_DELIMITER);
-    }
-  } else {
-    error = NewStringf("Cannot create subdirectory %s under the base directory %s. Either the base does not exist as a directory or it is not readable.", subdirectory, basedirectory);
-  }
-  return error;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_filename_correct()
- *
- * Corrects filename paths by removing duplicate delimiters and on non-unix
- * systems use the correct delimiter across the whole name.
- * ----------------------------------------------------------------------------- */
-
-void Swig_filename_correct(String *filename) {
-  int network_path = 0;
-  if (Len(filename) >= 2) {
-    const char *fname = Char(filename);
-    if (fname[0] == '\\' && fname[1] == '\\')
-      network_path = 1;
-    if (fname[0] == '/' && fname[1] == '/')
-      network_path = 1;
-  }
-#if defined(_WIN32) || defined(MACSWIG)
-  /* accept Unix path separator on non-Unix systems */
-  Replaceall(filename, "/", SWIG_FILE_DELIMITER);
-#endif
-#if defined(__CYGWIN__)
-  /* accept Windows path separator in addition to Unix path separator */
-  Replaceall(filename, "\\", SWIG_FILE_DELIMITER);
-#endif
-  /* remove all duplicate file name delimiters */
-  while (Replaceall(filename, SWIG_FILE_DELIMITER SWIG_FILE_DELIMITER, SWIG_FILE_DELIMITER)) {
-  }
-  /* Network paths can start with a double slash on Windows - unremove the duplicate slash we just removed */
-  if (network_path)
-    Insert(filename, 0, SWIG_FILE_DELIMITER);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_filename_escape()
- *
- * Escapes backslashes in filename - for Windows
- * ----------------------------------------------------------------------------- */
-
-String *Swig_filename_escape(String *filename) {
-  String *adjusted_filename = Copy(filename);
-  Swig_filename_correct(adjusted_filename);
-#if defined(_WIN32)		/* Note not on Cygwin else filename is displayed with double '/' */
-  Replaceall(adjusted_filename, "\\", "\\\\");
-#endif
-  return adjusted_filename;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_filename_unescape()
- *
- * Remove double backslash escaping in filename - for Windows
- * ----------------------------------------------------------------------------- */
-
-void Swig_filename_unescape(String *filename) {
-  (void)filename;
-#if defined(_WIN32)
-  Replaceall(filename, "\\\\", "\\");
-#endif
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_storage_isextern()
- *
- * Determine if the storage class specifier is extern (but not externc)
- * ----------------------------------------------------------------------------- */
-
-int Swig_storage_isextern(Node *n) {
-  const String *storage = Getattr(n, "storage");
-  return storage ? Strcmp(storage, "extern") == 0 || Strncmp(storage, "extern ", 7) == 0 : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_storage_isexternc()
- *
- * Determine if the storage class specifier is externc (but not plain extern)
- * ----------------------------------------------------------------------------- */
-
-int Swig_storage_isexternc(Node *n) {
-  const String *storage = Getattr(n, "storage");
-  return storage ? Strcmp(storage, "externc") == 0 || Strncmp(storage, "externc ", 8) == 0 : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_storage_isstatic_custom()
- *
- * Determine if the storage class specifier is static
- * ----------------------------------------------------------------------------- */
-
-int Swig_storage_isstatic_custom(Node *n, const_String_or_char_ptr storage_name) {
-  const String *storage = Getattr(n, storage_name);
-  return storage ? Strncmp(storage, "static", 6) == 0 : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_storage_isstatic()
- *
- * Determine if the storage class specifier is static
- * ----------------------------------------------------------------------------- */
-
-int Swig_storage_isstatic(Node *n) {
-  return Swig_storage_isstatic_custom(n, "storage");
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_escape()
- *
- * Takes a string object and produces a string with escape codes added to it.
- * Octal escaping is used.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_escape(String *s) {
-  String *ns;
-  int c;
-  ns = NewStringEmpty();
-
-  while ((c = Getc(s)) != EOF) {
-    if (c == '\n') {
-      Printf(ns, "\\n");
-    } else if (c == '\r') {
-      Printf(ns, "\\r");
-    } else if (c == '\t') {
-      Printf(ns, "\\t");
-    } else if (c == '\\') {
-      Printf(ns, "\\\\");
-    } else if (c == '\'') {
-      Printf(ns, "\\'");
-    } else if (c == '\"') {
-      Printf(ns, "\\\"");
-    } else if (c == ' ') {
-      Putc(c, ns);
-    } else if (!isgraph(c)) {
-      if (c < 0)
-	c += UCHAR_MAX + 1;
-      Printf(ns, "\\%o", c);
-    } else {
-      Putc(c, ns);
-    }
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_hexescape()
- *
- * Takes a string object and produces a string with escape codes added to it.
- * Hex escaping is used.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_hexescape(String *s) {
-  String *ns;
-  int c;
-  ns = NewStringEmpty();
-
-  while ((c = Getc(s)) != EOF) {
-    if (c == '\n') {
-      Printf(ns, "\\n");
-    } else if (c == '\r') {
-      Printf(ns, "\\r");
-    } else if (c == '\t') {
-      Printf(ns, "\\t");
-    } else if (c == '\\') {
-      Printf(ns, "\\\\");
-    } else if (c == '\'') {
-      Printf(ns, "\\'");
-    } else if (c == '\"') {
-      Printf(ns, "\\\"");
-    } else if (c == ' ') {
-      Putc(c, ns);
-    } else if (!isgraph(c)) {
-      if (c < 0)
-	c += UCHAR_MAX + 1;
-      Printf(ns, "\\x%X", c);
-    } else {
-      Putc(c, ns);
-    }
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_upper()
- *
- * Takes a string object and returns a copy that is uppercase
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_upper(String *s) {
-  String *ns;
-  int c;
-  ns = NewStringEmpty();
-
-  Seek(s, 0, SEEK_SET);
-  while ((c = Getc(s)) != EOF) {
-    Putc(toupper(c), ns);
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_lower()
- *
- * Takes a string object and returns a copy that is lowercase
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_lower(String *s) {
-  String *ns;
-  int c;
-  ns = NewStringEmpty();
-
-  Seek(s, 0, SEEK_SET);
-  while ((c = Getc(s)) != EOF) {
-    Putc(tolower(c), ns);
-  }
-  return ns;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_string_title()
- *
- * Takes a string object and returns a copy that is lowercase with first letter
- * capitalized
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_title(String *s) {
-  String *ns;
-  int first = 1;
-  int c;
-  ns = NewStringEmpty();
-
-  Seek(s, 0, SEEK_SET);
-  while ((c = Getc(s)) != EOF) {
-    Putc(first ? toupper(c) : tolower(c), ns);
-    first = 0;
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_ccase()
- *
- * Takes a string object and returns a copy that is lowercase with the first
- * letter capitalized and the one following '_', which are removed.
- *
- *      camel_case -> CamelCase
- *      camelCase  -> CamelCase
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_ccase(String *s) {
-  String *ns;
-  int first = 1;
-  int c;
-  ns = NewStringEmpty();
-
-  Seek(s, 0, SEEK_SET);
-  while ((c = Getc(s)) != EOF) {
-    if (c == '_') {
-      first = 1;
-      continue;
-    }
-    Putc(first ? toupper(c) : c, ns);
-    first = 0;
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_lccase()
- *
- * Takes a string object and returns a copy with the character after
- * each '_' capitalised, and the '_' removed.  The first character is
- * also forced to lowercase.
- *
- *      camel_case -> camelCase
- *      CamelCase  -> camelCase
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_lccase(String *s) {
-  String *ns;
-  int first = 1;
-  int after_underscore = 0;
-  int c;
-  ns = NewStringEmpty();
-
-  Seek(s, 0, SEEK_SET);
-  while ((c = Getc(s)) != EOF) {
-    if (c == '_') {
-      after_underscore = 1;
-      continue;
-    }
-    if (first) {
-      Putc(tolower(c), ns);
-      first = 0;
-    } else {
-      Putc(after_underscore ? toupper(c) : c, ns);
-    }
-    after_underscore = 0;
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_ucase()
- *
- * This is the reverse case of ccase, ie
- *
- *      CamelCase -> camel_case
- *      get2D     -> get_2d
- *      asFloat2  -> as_float2
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_ucase(String *s) {
-  String *ns;
-  int c;
-  int lastC = 0;
-  int nextC = 0;
-  int underscore = 0;
-  ns = NewStringEmpty();
-
-  /* We insert a underscore when:
-     1. Lower case char followed by upper case char
-     getFoo > get_foo; getFOo > get_foo; GETFOO > getfoo
-     2. Number proceded by char and not end of string
-     get2D > get_2d; get22D > get_22d; GET2D > get_2d
-     but:
-     asFloat2 > as_float2
-  */
-
-  Seek(s, 0, SEEK_SET);
-
-  while ((c = Getc(s)) != EOF) {
-    nextC = Getc(s); Ungetc(nextC, s);
-    if (isdigit(c) && isalpha(lastC) && nextC != EOF)
-      underscore = 1;
-    else if (isupper(c) && isalpha(lastC) && !isupper(lastC))
-      underscore = 1;
-
-    lastC = c;
-
-    if (underscore) {
-      Putc('_', ns);
-      underscore = 0;
-    }
-
-    Putc(tolower(c), ns);
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_first_upper()
- *
- * Make the first character in the string uppercase, leave all the 
- * rest the same.  This is used by the Ruby module to provide backwards
- * compatibility with the old way of naming classes and constants.  For
- * more info see the Ruby documentation.
- *
- *      firstUpper -> FirstUpper 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_first_upper(String *s) {
-  String *ns = NewStringEmpty();
-  char *cs = Char(s);
-  if (cs && cs[0] != 0) {
-    Putc(toupper((int)cs[0]), ns);
-    Append(ns, cs + 1);
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_first_lower()
- *
- * Make the first character in the string lowercase, leave all the 
- * rest the same.  This is used by the Ruby module to provide backwards
- * compatibility with the old way of naming classes and constants.  For
- * more info see the Ruby documentation.
- *
- *      firstLower -> FirstLower 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_first_lower(String *s) {
-  String *ns = NewStringEmpty();
-  char *cs = Char(s);
-  if (cs && cs[0] != 0) {
-    Putc(tolower((int)cs[0]), ns);
-    Append(ns, cs + 1);
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_schemify()
- *
- * Replace underscores with dashes, to make identifiers look nice to Schemers.
- *
- *      under_scores -> under-scores
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_schemify(String *s) {
-  String *ns = NewString(s);
-  Replaceall(ns, "_", "-");
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_typecode()
- *
- * Takes a string with possible type-escapes in it and replaces them with
- * real C datatypes.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_typecode(String *s) {
-  String *ns;
-  int c;
-  String *tc;
-  ns = NewStringEmpty();
-  while ((c = Getc(s)) != EOF) {
-    if (c == '`') {
-      String *str = 0;
-      tc = NewStringEmpty();
-      while ((c = Getc(s)) != EOF) {
-	if (c == '`')
-	  break;
-	Putc(c, tc);
-      }
-      str = SwigType_str(tc, 0);
-      Append(ns, str);
-      Delete(str);
-    } else {
-      Putc(c, ns);
-      if (c == '\'') {
-	while ((c = Getc(s)) != EOF) {
-	  Putc(c, ns);
-	  if (c == '\'')
-	    break;
-	  if (c == '\\') {
-	    c = Getc(s);
-	    Putc(c, ns);
-	  }
-	}
-      } else if (c == '\"') {
-	while ((c = Getc(s)) != EOF) {
-	  Putc(c, ns);
-	  if (c == '\"')
-	    break;
-	  if (c == '\\') {
-	    c = Getc(s);
-	    Putc(c, ns);
-	  }
-	}
-      }
-    }
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_mangle()
- * 
- * Take a string and mangle it by stripping all non-valid C identifier
- * characters.
- *
- * This routine skips unnecessary blank spaces, therefore mangling
- * 'char *' and 'char*', 'std::pair<int, int >' and
- * 'std::pair<int,int>', produce the same result.
- *
- * However, note that 'long long' and 'long_long' produce different
- * mangled strings.
- *
- * The mangling method still is not 'perfect', for example std::pair and
- * std_pair return the same mangling. This is just a little better
- * than before, but it seems to be enough for most of the purposes.
- *
- * Having a perfect mangling will break some examples and code which
- * assume, for example, that A::get_value will be mangled as
- * A_get_value. 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_mangle(const String *s) {
-#if 0
-  /* old mangling, not suitable for using in macros */
-  String *t = Copy(s);
-  char *c = Char(t);
-  while (*c) {
-    if (!isalnum(*c))
-      *c = '_';
-    c++;
-  }
-  return t;
-#else
-  String *result = NewStringEmpty();
-  int space = 0;
-  int state = 0;
-  char *pc, *cb;
-  String *b = Copy(s);
-  if (SwigType_istemplate(b)) {
-    String *st = Swig_symbol_template_deftype(b, 0);
-    String *sq = Swig_symbol_type_qualify(st, 0);
-    String *t = SwigType_namestr(sq);
-    Delete(st);
-    Delete(sq);
-    Delete(b);
-    b = t;
-  }
-  pc = cb = Char(b);
-  while (*pc) {
-    char c = *pc;
-    if (isalnum((int) c) || (c == '_')) {
-      state = 1;
-      if (space && (space == state)) {
-	Append(result, "_SS_");
-      }
-      space = 0;
-      Printf(result, "%c", (int) c);
-
-    } else {
-      if (isspace((int) c)) {
-	space = state;
-	++pc;
-	continue;
-      } else {
-	state = 3;
-	space = 0;
-      }
-      switch (c) {
-      case '.':
-	if ((cb != pc) && (*(pc - 1) == 'p')) {
-	  Append(result, "_");
-	  ++pc;
-	  continue;
-	} else {
-	  c = 'f';
-	}
-	break;
-      case ':':
-	if (*(pc + 1) == ':') {
-	  Append(result, "_");
-	  ++pc;
-	  ++pc;
-	  continue;
-	}
-	break;
-      case '*':
-	c = 'm';
-	break;
-      case '&':
-	c = 'A';
-	break;
-      case '<':
-	c = 'l';
-	break;
-      case '>':
-	c = 'g';
-	break;
-      case '=':
-	c = 'e';
-	break;
-      case ',':
-	c = 'c';
-	break;
-      case '(':
-	c = 'p';
-	break;
-      case ')':
-	c = 'P';
-	break;
-      case '[':
-	c = 'b';
-	break;
-      case ']':
-	c = 'B';
-	break;
-      case '^':
-	c = 'x';
-	break;
-      case '|':
-	c = 'o';
-	break;
-      case '~':
-	c = 'n';
-	break;
-      case '!':
-	c = 'N';
-	break;
-      case '%':
-	c = 'M';
-	break;
-      case '?':
-	c = 'q';
-	break;
-      case '+':
-	c = 'a';
-	break;
-      case '-':
-	c = 's';
-	break;
-      case '/':
-	c = 'd';
-	break;
-      default:
-	break;
-      }
-      if (isalpha((int) c)) {
-	Printf(result, "_S%c_", (int) c);
-      } else {
-	Printf(result, "_S%02X_", (int) c);
-      }
-    }
-    ++pc;
-  }
-  Delete(b);
-  return result;
-#endif
-}
-
-String *Swig_string_emangle(String *s) {
-  return Swig_string_mangle(s);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_scopename_prefix()
- *
- * Take a qualified name like "A::B::C" and return the scope name.
- * In this case, "A::B".   Returns NULL if there is no base.
- * ----------------------------------------------------------------------------- */
-
-void Swig_scopename_split(const String *s, String **rprefix, String **rlast) {
-  char *tmp = Char(s);
-  char *c = tmp;
-  char *cc = c;
-  char *co = 0;
-  if (!strstr(c, "::")) {
-    *rprefix = 0;
-    *rlast = Copy(s);
-  }
-
-  co = strstr(cc, "operator ");
-  if (co) {
-    if (co == cc) {
-      *rprefix = 0;
-      *rlast = Copy(s);
-      return;
-    } else {
-      *rprefix = NewStringWithSize(cc, (int)(co - cc - 2));
-      *rlast = NewString(co);
-      return;
-    }
-  }
-  while (*c) {
-    if ((*c == ':') && (*(c + 1) == ':')) {
-      cc = c;
-      c += 2;
-    } else {
-      if (*c == '<') {
-	int level = 1;
-	c++;
-	while (*c && level) {
-	  if (*c == '<')
-	    level++;
-	  if (*c == '>')
-	    level--;
-	  c++;
-	}
-      } else {
-	c++;
-      }
-    }
-  }
-
-  if (cc != tmp) {
-    *rprefix = NewStringWithSize(tmp, (int)(cc - tmp));
-    *rlast = NewString(cc + 2);
-    return;
-  } else {
-    *rprefix = 0;
-    *rlast = Copy(s);
-  }
-}
-
-
-String *Swig_scopename_prefix(const String *s) {
-  char *tmp = Char(s);
-  char *c = tmp;
-  char *cc = c;
-  char *co = 0;
-  if (!strstr(c, "::"))
-    return 0;
-  co = strstr(cc, "operator ");
-
-  if (co) {
-    if (co == cc) {
-      return 0;
-    } else {
-      String *prefix = NewStringWithSize(cc, (int)(co - cc - 2));
-      return prefix;
-    }
-  }
-  while (*c) {
-    if ((*c == ':') && (*(c + 1) == ':')) {
-      cc = c;
-      c += 2;
-    } else {
-      if (*c == '<') {
-	int level = 1;
-	c++;
-	while (*c && level) {
-	  if (*c == '<')
-	    level++;
-	  if (*c == '>')
-	    level--;
-	  c++;
-	}
-      } else {
-	c++;
-      }
-    }
-  }
-
-  if (cc != tmp) {
-    return NewStringWithSize(tmp, (int)(cc - tmp));
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_scopename_last()
- *
- * Take a qualified name like "A::B::C" and returns the last.  In this
- * case, "C". 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_scopename_last(const String *s) {
-  char *tmp = Char(s);
-  char *c = tmp;
-  char *cc = c;
-  char *co = 0;
-  if (!strstr(c, "::"))
-    return NewString(s);
-
-  co = strstr(cc, "operator ");
-  if (co) {
-    return NewString(co);
-  }
-
-
-  while (*c) {
-    if ((*c == ':') && (*(c + 1) == ':')) {
-      c += 2;
-      cc = c;
-    } else {
-      if (*c == '<') {
-	int level = 1;
-	c++;
-	while (*c && level) {
-	  if (*c == '<')
-	    level++;
-	  if (*c == '>')
-	    level--;
-	  c++;
-	}
-      } else {
-	c++;
-      }
-    }
-  }
-  return NewString(cc);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_scopename_first()
- *
- * Take a qualified name like "A::B::C" and returns the first scope name.
- * In this case, "A".   Returns NULL if there is no base.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_scopename_first(const String *s) {
-  char *tmp = Char(s);
-  char *c = tmp;
-  char *co = 0;
-  if (!strstr(c, "::"))
-    return 0;
-
-  co = strstr(c, "operator ");
-  if (co) {
-    if (co == c) {
-      return 0;
-    }
-  } else {
-    co = c + Len(s);
-  }
-
-  while (*c && (c != co)) {
-    if ((*c == ':') && (*(c + 1) == ':')) {
-      break;
-    } else {
-      if (*c == '<') {
-	int level = 1;
-	c++;
-	while (*c && level) {
-	  if (*c == '<')
-	    level++;
-	  if (*c == '>')
-	    level--;
-	  c++;
-	}
-      } else {
-	c++;
-      }
-    }
-  }
-  if (*c && (c != tmp)) {
-    return NewStringWithSize(tmp, (int)(c - tmp));
-  } else {
-    return 0;
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_scopename_suffix()
- *
- * Take a qualified name like "A::B::C" and returns the suffix.
- * In this case, "B::C".   Returns NULL if there is no suffix.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_scopename_suffix(const String *s) {
-  char *tmp = Char(s);
-  char *c = tmp;
-  char *co = 0;
-  if (!strstr(c, "::"))
-    return 0;
-
-  co = strstr(c, "operator ");
-  if (co) {
-    if (co == c)
-      return 0;
-  }
-  while (*c) {
-    if ((*c == ':') && (*(c + 1) == ':')) {
-      break;
-    } else {
-      if (*c == '<') {
-	int level = 1;
-	c++;
-	while (*c && level) {
-	  if (*c == '<')
-	    level++;
-	  if (*c == '>')
-	    level--;
-	  c++;
-	}
-      } else {
-	c++;
-      }
-    }
-  }
-  if (*c && (c != tmp)) {
-    return NewString(c + 2);
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_scopename_check()
- *
- * Checks to see if a name is qualified with a scope name, examples:
- *   foo            -> 0
- *   ::foo          -> 1
- *   foo::bar       -> 1
- *   foo< ::bar >   -> 0
- * ----------------------------------------------------------------------------- */
-
-int Swig_scopename_check(const String *s) {
-  char *c = Char(s);
-  char *co = strstr(c, "operator ");
-
-  if (co) {
-    if (co == c)
-      return 0;
-  }
-  if (!strstr(c, "::"))
-    return 0;
-  while (*c) {
-    if ((*c == ':') && (*(c + 1) == ':')) {
-      return 1;
-    } else {
-      if (*c == '<') {
-	int level = 1;
-	c++;
-	while (*c && level) {
-	  if (*c == '<')
-	    level++;
-	  if (*c == '>')
-	    level--;
-	  c++;
-	}
-      } else {
-	c++;
-      }
-    }
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_command()
- *
- * Executes a external command via popen with the string as a command
- * line parameter. For example:
- *
- *  Printf(stderr,"%(command:sed 's/[a-z]/\U\\1/' <<<)s","hello") -> Hello
- * ----------------------------------------------------------------------------- */
-#if defined(HAVE_POPEN)
-#  if defined(_MSC_VER)
-#    define popen _popen
-#    define pclose _pclose
-#  else
-extern FILE *popen(const char *command, const char *type);
-extern int pclose(FILE *stream);
-#  endif
-#else
-#  if defined(_MSC_VER)
-#    define HAVE_POPEN 1
-#    define popen _popen
-#    define pclose _pclose
-#  endif
-#endif
-
-String *Swig_string_command(String *s) {
-  String *res = NewStringEmpty();
-#if defined(HAVE_POPEN)
-  if (Len(s)) {
-    char *command = Char(s);
-    FILE *fp = popen(command, "r");
-    if (fp) {
-      char buffer[1025];
-      while (fscanf(fp, "%1024s", buffer) != EOF) {
-	Append(res, buffer);
-      }
-      pclose(fp);
-    } else {
-      Swig_error("SWIG", Getline(s), "Command encoder fails attempting '%s'.\n", s);
-      exit(1);
-    }
-  }
-#endif
-  return res;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_string_strip()
- *
- * Strip given prefix from identifiers 
- *
- *  Printf(stderr,"%(strip:[wx])s","wxHello") -> Hello
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_strip(String *s) {
-  String *ns;
-  if (!Len(s)) {
-    ns = NewString(s);
-  } else {
-    const char *cs = Char(s);
-    const char *ce = Strchr(cs, ']');
-    if (*cs != '[' || !ce) {
-      ns = NewString(s);
-    } else {
-      String *fmt = NewStringf("%%.%ds", ce-cs-1);
-      String *prefix = NewStringf(fmt, cs+1);
-      if (0 == Strncmp(ce+1, prefix, Len(prefix))) {
-        ns = NewString(ce+1+Len(prefix));
-      } else {
-        ns = NewString(ce+1);
-      }
-    }
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_rstrip()
- *
- * Strip given suffix from identifiers 
- *
- *  Printf(stderr,"%(rstrip:[Cls])s","HelloCls") -> Hello
- * ----------------------------------------------------------------------------- */
-
-String *Swig_string_rstrip(String *s) {
-  String *ns;
-  int len = Len(s);
-  if (!len) {
-    ns = NewString(s);
-  } else {
-    const char *cs = Char(s);
-    const char *ce = Strchr(cs, ']');
-    if (*cs != '[' || !ce) {
-      ns = NewString(s);
-    } else {
-      String *fmt = NewStringf("%%.%ds", ce-cs-1);
-      String *suffix = NewStringf(fmt, cs+1);
-      int suffix_len = Len(suffix);
-      if (0 == Strncmp(cs+len-suffix_len, suffix, suffix_len)) {
-	int copy_len = len-suffix_len-(ce+1-cs);
-        ns = NewStringWithSize(ce+1, copy_len);
-      } else {
-        ns = NewString(ce+1);
-      }
-    }
-  }
-  return ns;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_offset_string()
- *
- * Insert number tabs before each new line in s
- * ----------------------------------------------------------------------------- */
-
-void Swig_offset_string(String *s, int number) {
-  char *res, *p, *end, *start;
-  /* count a number of lines in s */
-  int lines = 1;
-  int len = Len(s);
-  if (len == 0)
-    return;
-  start = strchr(Char(s), '\n');
-  while (start) {
-    ++lines;
-    start = strchr(start + 1, '\n');
-  }
-  /* do not count pending new line */
-  if ((Char(s))[len-1] == '\n')
-    --lines;
-  /* allocate a temporary storage for a padded string */
-  res = (char*)malloc(len + lines * number * 2 + 1);
-  res[len + lines * number * 2] = 0;
-
-  /* copy lines to res, prepending tabs to each line */
-  p = res; /* output pointer */
-  start = Char(s); /* start of a current line */
-  end = strchr(start, '\n'); /* end of a current line */
-  while (end) {
-    memset(p, ' ', number*2);
-    p += number*2;
-    memcpy(p, start, end - start + 1);
-    p += end - start + 1;
-    start = end + 1;
-    end = strchr(start, '\n');
-  }
-  /* process the last line */
-  if (*start) {
-    memset(p, ' ', number*2);
-    p += number*2;
-    strcpy(p, start);
-  }
-  /* replace 's' contents with 'res' */
-  Clear(s);
-  Append(s, res);
-  free(res);
-}
-
-
-#ifdef HAVE_PCRE
-#include <pcre.h>
-
-static int split_regex_pattern_subst(String *s, String **pattern, String **subst, const char **input)
-{
-  const char *pats, *pate;
-  const char *subs, *sube;
-
-  /* Locate the search pattern */
-  const char *p = Char(s);
-  if (*p++ != '/') goto err_out;
-  pats = p;
-  p = strchr(p, '/');
-  if (!p) goto err_out;
-  pate = p;
-
-  /* Locate the substitution string */
-  subs = ++p;
-  p = strchr(p, '/');
-  if (!p) goto err_out;
-  sube = p;
-
-  *pattern = NewStringWithSize(pats, (int)(pate - pats));
-  *subst   = NewStringWithSize(subs, (int)(sube - subs));
-  *input   = p + 1;
-  return 1;
-
-err_out:
-  Swig_error("SWIG", Getline(s), "Invalid regex substitution: '%s'.\n", s);
-  exit(1);
-}
-
-/* This function copies len characters from src to dst, possibly applying case conversions to them: if convertCase is 1, to upper case and if it is -1, to lower
- * case. If convertNextOnly is 1, only a single character is converted (and convertCase is reset), otherwise all of them are. */
-static void copy_with_maybe_case_conversion(String *dst, const char *src, int len, int *convertCase, int convertNextOnly)
-{
-  /* Deal with the trivial cases first. */
-  if (!len)
-    return;
-
-  if (!*convertCase) {
-      Write(dst, src, len);
-      return;
-  }
-
-  /* If we must convert only the first character, do it and write the rest at once. */
-  if (convertNextOnly) {
-    int src_char = *src;
-    Putc(*convertCase == 1 ? toupper(src_char) : tolower(src_char), dst);
-    *convertCase = 0;
-    if (len > 1) {
-      Write(dst, src + 1, len - 1);
-    }
-  } else {
-    /* We need to convert all characters. */
-    int i;
-    for (i = 0; i < len; i++, src++) {
-      int src_char = *src;
-      Putc(*convertCase == 1 ? toupper(src_char) : tolower(src_char), dst);
-    }
-  }
-}
-
-String *replace_captures(int num_captures, const char *input, String *subst, int captures[], String *pattern, String *s)
-{
-  int convertCase = 0, convertNextOnly = 0;
-  String *result = NewStringEmpty();
-  const char *p = Char(subst);
-
-  while (*p) {
-    /* Copy part without substitutions */
-    const char *q = strchr(p, '\\');
-    if (!q) {
-      copy_with_maybe_case_conversion(result, p, (int)strlen(p), &convertCase, convertNextOnly);
-      break;
-    }
-    copy_with_maybe_case_conversion(result, p, (int)(q - p), &convertCase, convertNextOnly);
-    p = q + 1;
-
-    /* Handle substitution */
-    if (*p == '\0') {
-      Putc('\\', result);
-    } else if (isdigit((unsigned char)*p)) {
-      int group = *p++ - '0';
-      if (group < num_captures) {
-	int l = captures[group*2], r = captures[group*2 + 1];
-	if (l != -1) {
-	  copy_with_maybe_case_conversion(result, input + l, r - l, &convertCase, convertNextOnly);
-	}
-      } else {
-	Swig_error("SWIG", Getline(s), "PCRE capture replacement failed while matching \"%s\" using \"%s\" - request for group %d is greater than the number of captures %d.\n",
-	    Char(pattern), input, group, num_captures-1);
-      }
-    } else {
-	/* Handle Perl-like case conversion escapes. */
-	switch (*p) {
-	case 'u':
-	  convertCase = 1;
-	  convertNextOnly = 1;
-	  break;
-	case 'U':
-	  convertCase = 1;
-	  convertNextOnly = 0;
-	  break;
-	case 'l':
-	  convertCase = -1;
-	  convertNextOnly = 1;
-	  break;
-	case 'L':
-	  convertCase = -1;
-	  convertNextOnly = 0;
-	  break;
-	case 'E':
-	  convertCase = 0;
-	  break;
-	default:
-	  Swig_error("SWIG", Getline(s), "Unrecognized escape character '%c' in the replacement string \"%s\".\n",
-	      *p, Char(subst));
-	}
-	p++;
-    }
-  }
-
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_string_regex()
- *
- * Executes a regular expression substitution. For example:
- *
- *   Printf(stderr,"gsl%(regex:/GSL_(.*)_/\\1/)s", "GSL_Hello_") -> gslHello
- * ----------------------------------------------------------------------------- */
-String *Swig_string_regex(String *s) {
-  const int pcre_options = 0;
-
-  String *res = 0;
-  pcre *compiled_pat = 0;
-  const char *pcre_error, *input;
-  int pcre_errorpos;
-  String *pattern = 0, *subst = 0;
-  int captures[30];
-
-  if (split_regex_pattern_subst(s, &pattern, &subst, &input)) {
-    int rc;
-
-    compiled_pat = pcre_compile(
-          Char(pattern), pcre_options, &pcre_error, &pcre_errorpos, NULL);
-    if (!compiled_pat) {
-      Swig_error("SWIG", Getline(s), "PCRE compilation failed: '%s' in '%s':%i.\n",
-          pcre_error, Char(pattern), pcre_errorpos);
-      exit(1);
-    }
-    rc = pcre_exec(compiled_pat, NULL, input, (int)strlen(input), 0, 0, captures, 30);
-    if (rc >= 0) {
-      res = replace_captures(rc, input, subst, captures, pattern, s);
-    } else if (rc != PCRE_ERROR_NOMATCH) {
-      Swig_error("SWIG", Getline(s), "PCRE execution failed: error %d while matching \"%s\" using \"%s\".\n",
-	rc, Char(pattern), input);
-      exit(1);
-    }
-  }
-
-  DohDelete(pattern);
-  DohDelete(subst);
-  pcre_free(compiled_pat);
-  return res ? res : NewStringEmpty();
-}
-
-String *Swig_pcre_version(void) {
-  return NewStringf("PCRE Version: %s", pcre_version());
-}
-
-#else
-
-String *Swig_string_regex(String *s) {
-  Swig_error("SWIG", Getline(s), "PCRE regex support not enabled in this SWIG build.\n");
-  exit(1);
-}
-
-String *Swig_pcre_version(void) {
-  return NewStringf("PCRE not used");
-}
-
-#endif
-
-/* -----------------------------------------------------------------------------
- * Swig_init()
- *
- * Initialize the SWIG core
- * ----------------------------------------------------------------------------- */
-
-void Swig_init() {
-  /* Set some useful string encoding methods */
-  DohEncoding("escape", Swig_string_escape);
-  DohEncoding("hexescape", Swig_string_hexescape);
-  DohEncoding("upper", Swig_string_upper);
-  DohEncoding("lower", Swig_string_lower);
-  DohEncoding("title", Swig_string_title);
-  DohEncoding("ctitle", Swig_string_ccase);
-  DohEncoding("lctitle", Swig_string_lccase);
-  DohEncoding("utitle", Swig_string_ucase);
-  DohEncoding("typecode", Swig_string_typecode);
-  DohEncoding("mangle", Swig_string_emangle);
-  DohEncoding("command", Swig_string_command);
-  DohEncoding("schemify", Swig_string_schemify);
-  DohEncoding("strip", Swig_string_strip);
-  DohEncoding("rstrip", Swig_string_rstrip);
-  DohEncoding("regex", Swig_string_regex);
-
-  /* aliases for the case encoders */
-  DohEncoding("uppercase", Swig_string_upper);
-  DohEncoding("lowercase", Swig_string_lower);
-  DohEncoding("camelcase", Swig_string_ccase);
-  DohEncoding("lowercamelcase", Swig_string_lccase);
-  DohEncoding("undercase", Swig_string_ucase);
-  DohEncoding("firstuppercase", Swig_string_first_upper);
-  DohEncoding("firstlowercase", Swig_string_first_lower);
-
-  /* Initialize typemaps */
-  Swig_typemap_init();
-
-  /* Initialize symbol table */
-  Swig_symbol_init();
-
-  /* Initialize type system */
-  SwigType_typesystem_init();
-
-  /* Initialize template system */
-  SwigType_template_init();
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/naming.c b/dependencies2013/win32/swig/Source/Swig/naming.c
deleted file mode 100644
index ce1dbe80..00000000
--- a/dependencies2013/win32/swig/Source/Swig/naming.c
+++ /dev/null
@@ -1,1732 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * naming.c
- *
- * Functions for generating various kinds of names during code generation.
- *
- * Swig_name_register is used to register a format string for generating names.
- * The format string makes use of the following format specifiers:
- *
- * %c - class name is substituted
- * %f - function name is substituted
- * %m - member name is substituted
- * %n - namespace is substituted
- * %v - variable name is substituted
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-#include <ctype.h>
-
-/* Hash table containing naming data */
-
-static Hash *naming_hash = 0;
-
-#if 0
-#define SWIG_DEBUG
-#endif
-
-/* -----------------------------------------------------------------------------
- * Swig_name_register()
- *
- * Register a new naming format.
- * ----------------------------------------------------------------------------- */
-
-void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format) {
-  if (!naming_hash)
-    naming_hash = NewHash();
-  Setattr(naming_hash, method, format);
-}
-
-void Swig_name_unregister(const_String_or_char_ptr method) {
-  if (naming_hash) {
-    Delattr(naming_hash, method);
-  }
-}
-
-/* Return naming format for the specified method or the default format if none was explicitly registered */
-static String* get_naming_format_for(const char *method, const char *def_format) {
-  String* f = naming_hash ? Getattr(naming_hash, method) : NULL;
-
-  return f ? Copy(f) : NewString(def_format);
-}
-
-static int name_mangle(String *r) {
-  char *c;
-  int special;
-  special = 0;
-  Replaceall(r, "::", "_");
-  c = Char(r);
-  while (*c) {
-    if (!isalnum((int) *c) && (*c != '_')) {
-      special = 1;
-      switch (*c) {
-      case '+':
-	*c = 'a';
-	break;
-      case '-':
-	*c = 's';
-	break;
-      case '*':
-	*c = 'm';
-	break;
-      case '/':
-	*c = 'd';
-	break;
-      case '<':
-	*c = 'l';
-	break;
-      case '>':
-	*c = 'g';
-	break;
-      case '=':
-	*c = 'e';
-	break;
-      case ',':
-	*c = 'c';
-	break;
-      case '(':
-	*c = 'p';
-	break;
-      case ')':
-	*c = 'P';
-	break;
-      case '[':
-	*c = 'b';
-	break;
-      case ']':
-	*c = 'B';
-	break;
-      case '^':
-	*c = 'x';
-	break;
-      case '&':
-	*c = 'A';
-	break;
-      case '|':
-	*c = 'o';
-	break;
-      case '~':
-	*c = 'n';
-	break;
-      case '!':
-	*c = 'N';
-	break;
-      case '%':
-	*c = 'M';
-	break;
-      case '.':
-	*c = 'f';
-	break;
-      case '?':
-	*c = 'q';
-	break;
-      default:
-	*c = '_';
-	break;
-      }
-    }
-    c++;
-  }
-  if (special)
-    Append(r, "___");
-  return special;
-}
-
-/* -----------------------------------------------------------------------------
- * replace_nspace()
- *
- * Mangles in the namespace from nspace by replacing %n in name if nspace feature required.
- * ----------------------------------------------------------------------------- */
-
-static void replace_nspace(String *name, const_String_or_char_ptr nspace) {
-  if (nspace) {
-    String *namspace = NewStringf("%s_", nspace);
-    Replaceall(namspace, NSPACE_SEPARATOR, "_");
-    Replace(name, "%n", namspace, DOH_REPLACE_ANY);
-    Delete(namspace);
-  } else {
-    Replace(name, "%n", "", DOH_REPLACE_ANY);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_mangle()
- *
- * Converts all of the non-identifier characters of a string to underscores.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_mangle(const_String_or_char_ptr s) {
-#if 0
-  String *r = NewString(s);
-  name_mangle(r);
-  return r;
-#else
-  return Swig_string_mangle(s);
-#endif
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_wrapper()
- *
- * Returns the name of a wrapper function.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_wrapper(const_String_or_char_ptr fname) {
-  String *r = get_naming_format_for("wrapper", "_wrap_%f");
-
-  Replace(r, "%f", fname, DOH_REPLACE_ANY);
-  name_mangle(r);
-  return r;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_name_member()
- *
- * Returns the name of a class method.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_ptr classname, const_String_or_char_ptr membername) {
-  String *r;
-  String *rclassname;
-  char *cname;
-
-  rclassname = SwigType_namestr(classname);
-  r = get_naming_format_for("member", "%n%c_%m");
-  cname = Char(rclassname);
-  if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) {
-    cname = strchr(cname, ' ') + 1;
-  }
-  replace_nspace(r, nspace);
-  Replace(r, "%c", cname, DOH_REPLACE_ANY);
-  Replace(r, "%m", membername, DOH_REPLACE_ANY);
-  /*  name_mangle(r); */
-  Delete(rclassname);
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_get()
- *
- * Returns the name of the accessor function used to get a variable.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_get(const_String_or_char_ptr nspace, const_String_or_char_ptr vname) {
-  String *r = get_naming_format_for("get", "%n%v_get");
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_name_get:  '%s'\n", vname);
-#endif
-
-  replace_nspace(r, nspace);
-  Replace(r, "%v", vname, DOH_REPLACE_ANY);
-  /* name_mangle(r); */
-  return r;
-}
-
-/* ----------------------------------------------------------------------------- 
- * Swig_name_set()
- *
- * Returns the name of the accessor function used to set a variable.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_set(const_String_or_char_ptr nspace, const_String_or_char_ptr vname) {
-  String *r = get_naming_format_for("set", "%n%v_set");
-
-  replace_nspace(r, nspace);
-  Replace(r, "%v", vname, DOH_REPLACE_ANY);
-  /* name_mangle(r); */
-  return r;
-}
-
-/* Common implementation of all Swig_name_<special-method>() functions below. */
-static String *make_full_name_for(const char *method, const char *def_format, const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
-  String *r;
-  String *rclassname;
-  char *cname;
-
-  rclassname = SwigType_namestr(classname);
-  r = get_naming_format_for(method, def_format);
-
-  cname = Char(rclassname);
-  if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) {
-    cname = strchr(cname, ' ') + 1;
-  }
-
-  replace_nspace(r, nspace);
-  Replace(r, "%c", cname, DOH_REPLACE_ANY);
-  Delete(rclassname);
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_construct()
- *
- * Returns the name of the accessor function used to create an object.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
-  return make_full_name_for("construct", "new_%n%c", nspace, classname);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_name_copyconstructor()
- *
- * Returns the name of the accessor function used to copy an object.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_copyconstructor(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
-  return make_full_name_for("copy", "copy_%n%c", nspace, classname);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_destroy()
- *
- * Returns the name of the accessor function used to destroy an object.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_destroy(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
-  return make_full_name_for("destroy", "delete_%n%c", nspace, classname);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_name_disown()
- *
- * Returns the name of the accessor function used to disown an object.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_disown(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
-  return make_full_name_for("disown", "disown_%n%c", nspace, classname);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_name_object_set()
- *
- * Sets an object associated with a name and optional declarators. 
- * ----------------------------------------------------------------------------- */
-
-void Swig_name_object_set(Hash *namehash, String *name, SwigType *decl, DOH *object) {
-  DOH *n;
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_name_object_set:  '%s', '%s'\n", name, decl);
-#endif
-  n = Getattr(namehash, name);
-  if (!n) {
-    n = NewHash();
-    Setattr(namehash, name, n);
-    Delete(n);
-  }
-  /* Add an object based on the declarator value */
-  if (!decl) {
-    Setattr(n, "start", object);
-  } else {
-    SwigType *cd = Copy(decl);
-    Setattr(n, cd, object);
-    Delete(cd);
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_name_object_get()
- *
- * Return an object associated with an optional class prefix, name, and 
- * declarator.   This function operates according to name matching rules
- * described for the %rename directive in the SWIG manual.
- * ----------------------------------------------------------------------------- */
-
-static DOH *get_object(Hash *n, String *decl) {
-  DOH *rn = 0;
-  if (!n)
-    return 0;
-  if (decl) {
-    rn = Getattr(n, decl);
-  } else {
-    rn = Getattr(n, "start");
-  }
-  return rn;
-}
-
-static DOH *name_object_get(Hash *namehash, String *tname, SwigType *decl, SwigType *ncdecl) {
-  DOH *rn = 0;
-  Hash *n = Getattr(namehash, tname);
-  if (n) {
-    rn = get_object(n, decl);
-    if ((!rn) && ncdecl)
-      rn = get_object(n, ncdecl);
-    if (!rn)
-      rn = get_object(n, 0);
-  }
-  return rn;
-}
-
-DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *decl) {
-  String *tname = NewStringEmpty();
-  DOH *rn = 0;
-  char *ncdecl = 0;
-
-  if (!namehash)
-    return 0;
-
-  /* DB: This removed to more tightly control feature/name matching */
-  /*  if ((decl) && (SwigType_isqualifier(decl))) {
-     ncdecl = strchr(Char(decl),'.');
-     ncdecl++;
-     }
-   */
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_name_object_get:  '%s' '%s', '%s'\n", prefix, name, decl);
-#endif
-
-
-  /* Perform a class-based lookup (if class prefix supplied) */
-  if (prefix) {
-    if (Len(prefix)) {
-      Printf(tname, "%s::%s", prefix, name);
-      rn = name_object_get(namehash, tname, decl, ncdecl);
-      if (!rn) {
-	String *cls = Swig_scopename_last(prefix);
-	if (!Equal(cls, prefix)) {
-	  Clear(tname);
-	  Printf(tname, "*::%s::%s", cls, name);
-	  rn = name_object_get(namehash, tname, decl, ncdecl);
-	}
-	Delete(cls);
-      }
-      /* Lookup a name within a templated-based class */
-      if (!rn) {
-	String *t_name = SwigType_istemplate_templateprefix(prefix);
-	if (t_name) {
-	  Clear(tname);
-	  Printf(tname, "%s::%s", t_name, name);
-	  rn = name_object_get(namehash, tname, decl, ncdecl);
-	  Delete(t_name);
-	}
-      }
-      /* Lookup a template-based name within a class */
-      if (!rn) {
-	String *t_name = SwigType_istemplate_templateprefix(name);
-	if (t_name)
-	  rn = Swig_name_object_get(namehash, prefix, t_name, decl);
-	Delete(t_name);
-      }
-    }
-    /* A wildcard-based class lookup */
-    if (!rn) {
-      Clear(tname);
-      Printf(tname, "*::%s", name);
-      rn = name_object_get(namehash, tname, decl, ncdecl);
-    }
-  } else {
-    /* Lookup in the global namespace only */
-    Clear(tname);
-    Printf(tname, "::%s", name);
-    rn = name_object_get(namehash, tname, decl, ncdecl);
-  }
-  /* Catch-all */
-  if (!rn) {
-    rn = name_object_get(namehash, name, decl, ncdecl);
-  }
-  if (!rn && Swig_scopename_check(name)) {
-    String *nprefix = NewStringEmpty();
-    String *nlast = NewStringEmpty();
-    Swig_scopename_split(name, &nprefix, &nlast);
-    rn = name_object_get(namehash, nlast, decl, ncdecl);
-    Delete(nlast);
-    Delete(nprefix);
-  }
-
-  Delete(tname);
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_name_object_get:  found %d\n", rn ? 1 : 0);
-#endif
-
-  return rn;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_object_inherit()
- *
- * Implements name-based inheritance scheme. 
- * ----------------------------------------------------------------------------- */
-
-void Swig_name_object_inherit(Hash *namehash, String *base, String *derived) {
-  Iterator ki;
-  Hash *derh;
-  String *bprefix;
-  String *dprefix;
-  char *cbprefix;
-  int plen;
-
-  if (!namehash)
-    return;
-
-  /* Temporary hash holding all the entries we add while we iterate over
-     namehash itself as we can't modify the latter while iterating over it. */
-  derh = NULL;
-  bprefix = NewStringf("%s::", base);
-  dprefix = NewStringf("%s::", derived);
-  cbprefix = Char(bprefix);
-  plen = (int)strlen(cbprefix);
-  for (ki = First(namehash); ki.key; ki = Next(ki)) {
-    char *k = Char(ki.key);
-    if (strncmp(k, cbprefix, plen) == 0) {
-      /* Copy, adjusting name, this element to the derived hash. */
-      Iterator oi;
-      String *nkey = NewStringf("%s%s", dprefix, k + plen);
-      Hash *n = ki.item;
-      Hash *newh;
-
-      /* Don't overwrite an existing value for the derived class, if any. */
-      newh = Getattr(namehash, nkey);
-      if (!newh) {
-	if (!derh)
-	  derh = NewHash();
-
-	newh = NewHash();
-	Setattr(derh, nkey, newh);
-	Delete(newh);
-      }
-      for (oi = First(n); oi.key; oi = Next(oi)) {
-	if (!Getattr(newh, oi.key)) {
-	  String *ci = Copy(oi.item);
-	  Setattr(newh, oi.key, ci);
-	  Delete(ci);
-	}
-      }
-      Delete(nkey);
-    }
-  }
-
-  /* Merge the contents of derived hash into the main hash. */
-  if (derh) {
-    for (ki = First(derh); ki.key; ki = Next(ki)) {
-      Setattr(namehash, ki.key, ki.item);
-    }
-  }
-
-  Delete(bprefix);
-  Delete(dprefix);
-  Delete(derh);
-}
-
-/* -----------------------------------------------------------------------------
- * merge_features()
- *
- * Given a hash, this function merges the features in the hash into the node.
- * ----------------------------------------------------------------------------- */
-
-static void merge_features(Hash *features, Node *n) {
-  Iterator ki;
-
-  if (!features)
-    return;
-  for (ki = First(features); ki.key; ki = Next(ki)) {
-    String *ci = Copy(ki.item);
-    Setattr(n, ki.key, ci);
-    Delete(ci);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_features_get()
- *
- * Attaches any features in the features hash to the node that matches
- * the declaration, decl.
- * ----------------------------------------------------------------------------- */
-
-static void features_get(Hash *features, const String *tname, SwigType *decl, SwigType *ncdecl, Node *node) {
-  Node *n = Getattr(features, tname);
-#ifdef SWIG_DEBUG
-  Printf(stdout, "  features_get: %s\n", tname);
-#endif
-  if (n) {
-    merge_features(get_object(n, 0), node);
-    if (ncdecl)
-      merge_features(get_object(n, ncdecl), node);
-    merge_features(get_object(n, decl), node);
-  }
-}
-
-void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl, Node *node) {
-  char *ncdecl = 0;
-  String *rdecl = 0;
-  String *rname = 0;
-  if (!features)
-    return;
-
-  /* MM: This removed to more tightly control feature/name matching */
-  /*
-     if ((decl) && (SwigType_isqualifier(decl))) {
-     ncdecl = strchr(Char(decl),'.');
-     ncdecl++;
-     }
-   */
-
-  /* very specific hack for template constructors/destructors */
-  if (name && SwigType_istemplate(name)) {
-    String *nodetype = nodeType(node);
-    if (nodetype && (Equal(nodetype, "constructor") || Equal(nodetype, "destructor"))) {
-      String *nprefix = NewStringEmpty();
-      String *nlast = NewStringEmpty();
-      String *tprefix;
-      Swig_scopename_split(name, &nprefix, &nlast);
-      tprefix = SwigType_templateprefix(nlast);
-      Delete(nlast);
-      if (Len(nprefix)) {
-	Append(nprefix, "::");
-	Append(nprefix, tprefix);
-	Delete(tprefix);
-	rname = nprefix;
-      } else {
-	rname = tprefix;
-	Delete(nprefix);
-      }
-      rdecl = Copy(decl);
-      Replaceall(rdecl, name, rname);
-      decl = rdecl;
-      name = rname;
-    }
-  }
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_features_get: '%s' '%s' '%s'\n", prefix, name, decl);
-#endif
-
-  /* Global features */
-  features_get(features, "", 0, 0, node);
-  if (name) {
-    String *tname = NewStringEmpty();
-    /* add features for 'root' template */
-    String *dname = SwigType_istemplate_templateprefix(name);
-    if (dname) {
-      features_get(features, dname, decl, ncdecl, node);
-    }
-    /* Catch-all */
-    features_get(features, name, decl, ncdecl, node);
-    /* Perform a class-based lookup (if class prefix supplied) */
-    if (prefix) {
-      /* A class-generic feature */
-      if (Len(prefix)) {
-	Printf(tname, "%s::", prefix);
-	features_get(features, tname, decl, ncdecl, node);
-      }
-      /* A wildcard-based class lookup */
-      Clear(tname);
-      Printf(tname, "*::%s", name);
-      features_get(features, tname, decl, ncdecl, node);
-      /* A specific class lookup */
-      if (Len(prefix)) {
-	/* A template-based class lookup */
-	String *tprefix = SwigType_istemplate_templateprefix(prefix);
-	if (tprefix) {
-	  Clear(tname);
-	  Printf(tname, "%s::%s", tprefix, name);
-	  features_get(features, tname, decl, ncdecl, node);
-	}
-	Clear(tname);
-	Printf(tname, "%s::%s", prefix, name);
-	features_get(features, tname, decl, ncdecl, node);
-	Delete(tprefix);
-      }
-    } else {
-      /* Lookup in the global namespace only */
-      Clear(tname);
-      Printf(tname, "::%s", name);
-      features_get(features, tname, decl, ncdecl, node);
-    }
-    Delete(tname);
-    Delete(dname);
-  }
-  if (name && SwigType_istemplate(name)) {
-    /* add features for complete template type */
-    String *dname = Swig_symbol_template_deftype(name, 0);
-    if (!Equal(dname, name)) {
-      Swig_features_get(features, prefix, dname, decl, node);
-    }
-    Delete(dname);
-  }
-
-  if (rname)
-    Delete(rname);
-  if (rdecl)
-    Delete(rdecl);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_feature_set()
- *
- * Sets a feature name and value. Also sets optional feature attributes as
- * passed in by featureattribs. Optional feature attributes are given a full name
- * concatenating the feature name plus ':' plus the attribute name.
- * ----------------------------------------------------------------------------- */
-
-void Swig_feature_set(Hash *features, const_String_or_char_ptr name, SwigType *decl, const_String_or_char_ptr featurename, const_String_or_char_ptr value, Hash *featureattribs) {
-  Hash *n;
-  Hash *fhash;
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_feature_set: '%s' '%s' '%s' '%s'\n", name, decl, featurename, value);
-#endif
-
-  n = Getattr(features, name);
-  if (!n) {
-    n = NewHash();
-    Setattr(features, name, n);
-    Delete(n);
-  }
-  if (!decl) {
-    fhash = Getattr(n, "start");
-    if (!fhash) {
-      fhash = NewHash();
-      Setattr(n, "start", fhash);
-      Delete(fhash);
-    }
-  } else {
-    fhash = Getattr(n, decl);
-    if (!fhash) {
-      String *cdecl_ = Copy(decl);
-      fhash = NewHash();
-      Setattr(n, cdecl_, fhash);
-      Delete(cdecl_);
-      Delete(fhash);
-    }
-  }
-  if (value) {
-    Setattr(fhash, featurename, value);
-  } else {
-    Delattr(fhash, featurename);
-  }
-
-  {
-    /* Add in the optional feature attributes */
-    Hash *attribs = featureattribs;
-    while (attribs) {
-      String *attribname = Getattr(attribs, "name");
-      String *featureattribname = NewStringf("%s:%s", featurename, attribname);
-      if (value) {
-	String *attribvalue = Getattr(attribs, "value");
-	Setattr(fhash, featureattribname, attribvalue);
-      } else {
-	Delattr(fhash, featureattribname);
-      }
-      attribs = nextSibling(attribs);
-      Delete(featureattribname);
-    }
-  }
-
-  if (name && SwigType_istemplate(name)) {
-    String *dname = Swig_symbol_template_deftype(name, 0);
-    if (Strcmp(dname, name)) {
-      Swig_feature_set(features, dname, decl, featurename, value, featureattribs);
-    }
-    Delete(dname);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * The rename/namewarn engine
- *
- * Code below was in parser.y for a while
- * ----------------------------------------------------------------------------- */
-
-static Hash *namewarn_hash = 0;
-static Hash *name_namewarn_hash() {
-  if (!namewarn_hash)
-    namewarn_hash = NewHash();
-  return namewarn_hash;
-}
-
-static Hash *rename_hash = 0;
-static Hash *name_rename_hash() {
-  if (!rename_hash)
-    rename_hash = NewHash();
-  return rename_hash;
-}
-
-static List *namewarn_list = 0;
-static List *name_namewarn_list() {
-  if (!namewarn_list)
-    namewarn_list = NewList();
-  return namewarn_list;
-}
-
-static List *rename_list = 0;
-static List *name_rename_list() {
-  if (!rename_list)
-    rename_list = NewList();
-  return rename_list;
-}
-
-/* -----------------------------------------------------------------------------
- * int need_name_warning(Node *n)
- *
- * Detects if a node needs name warnings 
- *
- * ----------------------------------------------------------------------------- */
-
-static int need_name_warning(Node *n) {
-  int need = 1;
-  /* 
-     We don't use name warnings for:
-     - class forwards, no symbol is generated at the target language.
-     - template declarations, only for real instances using %template(name).
-     - typedefs, have no effect at the target language.
-     - using declarations and using directives, have no effect at the target language.
-   */
-  if (checkAttribute(n, "nodeType", "classforward")) {
-    need = 0;
-  } else if (checkAttribute(n, "nodeType", "using")) {
-    need = 0;
-  } else if (checkAttribute(n, "storage", "typedef")) {
-    need = 0;
-  } else if (Getattr(n, "hidden")) {
-    need = 0;
-  } else if (Getattr(n, "ignore")) {
-    need = 0;
-  } else if (Getattr(n, "templatetype")) {
-    need = 0;
-  } else if (GetFlag(n, "parsing_template_declaration")) {
-    need = 0;
-  }
-  return need;
-}
-
-/* -----------------------------------------------------------------------------
- * int Swig_need_redefined_warn()
- *
- * Detects when a redefined object needs a warning
- * 
- * ----------------------------------------------------------------------------- */
-
-static int nodes_are_equivalent(Node *a, Node *b, int a_inclass) {
-  /* they must have the same type */
-  String *ta = nodeType(a);
-  String *tb = nodeType(b);
-  if (!Equal(ta, tb)) {
-    if (!(Equal(ta, "using") && Equal(tb, "cdecl"))) {
-      return 0;
-    }
-  }
-
-  if (Cmp(ta, "cdecl") == 0) {
-    /* both cdecl case */
-    /* typedef */
-    String *a_storage = Getattr(a, "storage");
-    String *b_storage = Getattr(b, "storage");
-
-    if ((Cmp(a_storage, "typedef") == 0)
-	|| (Cmp(b_storage, "typedef") == 0)) {
-      if (Cmp(a_storage, b_storage) == 0) {
-	String *a_type = (Getattr(a, "type"));
-	String *b_type = (Getattr(b, "type"));
-	if (Cmp(a_type, b_type) == 0)
-	  return 1;
-      }
-      return 0;
-    }
-
-    /* static functions */
-    if (Swig_storage_isstatic(a) || Swig_storage_isstatic(b)) {
-      if (Cmp(a_storage, b_storage) != 0)
-	return 0;
-    }
-
-    /* friend methods */
-
-    if (!a_inclass || (Cmp(a_storage, "friend") == 0)) {
-      /* check declaration */
-
-      String *a_decl = (Getattr(a, "decl"));
-      String *b_decl = (Getattr(b, "decl"));
-      if (Cmp(a_decl, b_decl) == 0) {
-	/* check return type */
-	String *a_type = (Getattr(a, "type"));
-	String *b_type = (Getattr(b, "type"));
-	if (Cmp(a_type, b_type) == 0) {
-	  /* check parameters */
-	  Parm *ap = (Getattr(a, "parms"));
-	  Parm *bp = (Getattr(b, "parms"));
-	  while (ap && bp) {
-	    SwigType *at = Getattr(ap, "type");
-	    SwigType *bt = Getattr(bp, "type");
-	    if (Cmp(at, bt) != 0)
-	      return 0;
-	    ap = nextSibling(ap);
-	    bp = nextSibling(bp);
-	  }
-	  if (ap || bp) {
-	    return 0;
-	  } else {
-	    Node *a_template = Getattr(a, "template");
-	    Node *b_template = Getattr(b, "template");
-	    /* Not equivalent if one is a template instantiation (via %template) and the other is a non-templated function */
-	    if ((a_template && !b_template) || (!a_template && b_template))
-	      return 0;
-	  }
-	  return 1;
-	}
-      }
-    }
-  } else if (Equal(ta, "using")) {
-    /* using and cdecl case */
-    String *b_storage = Getattr(b, "storage");
-    if (Equal(b_storage, "typedef")) {
-      String *a_name = Getattr(a, "name");
-      String *b_name = Getattr(b, "name");
-      if (Equal(a_name, b_name))
-	return 1;
-    }
-  } else {
-    /* both %constant case */
-    String *a_storage = Getattr(a, "storage");
-    String *b_storage = Getattr(b, "storage");
-    if ((Cmp(a_storage, "%constant") == 0)
-	|| (Cmp(b_storage, "%constant") == 0)) {
-      if (Cmp(a_storage, b_storage) == 0) {
-	String *a_type = (Getattr(a, "type"));
-	String *b_type = (Getattr(b, "type"));
-	if ((Cmp(a_type, b_type) == 0)
-	    && (Cmp(Getattr(a, "value"), Getattr(b, "value")) == 0))
-	  return 1;
-      }
-      return 0;
-    }
-    if (Equal(ta, "template") && Equal(tb, "template")) {
-      if (Cmp(a_storage, "friend") == 0 || Cmp(b_storage, "friend") == 0)
-	return 1;
-    }
-  }
-  return 0;
-}
-
-int Swig_need_redefined_warn(Node *a, Node *b, int InClass) {
-  String *a_name = Getattr(a, "name");
-  String *b_name = Getattr(b, "name");
-  String *a_symname = Getattr(a, "sym:name");
-  String *b_symname = Getattr(b, "sym:name");
-  /* always send a warning if a 'rename' is involved */
-  if ((a_symname && !Equal(a_symname, a_name))
-      || (b_symname && !Equal(b_symname, b_name))) {
-    if (!Equal(a_name, b_name)) {
-      return 1;
-    }
-  }
-
-
-  return !nodes_are_equivalent(a, b, InClass);
-}
-
-
-/* -----------------------------------------------------------------------------
- * int Swig_need_protected(Node* n)
- *
- * Detects when we need to fully register the protected member.
- * This is basically any protected members when the allprotected mode is set.
- * Otherwise we take just the protected virtual methods and non-static methods 
- * (potentially virtual methods) as well as constructors/destructors.
- * Also any "using" statements in a class may potentially be virtual.
- * ----------------------------------------------------------------------------- */
-
-int Swig_need_protected(Node *n) {
-  String *nodetype = nodeType(n);
-  if (checkAttribute(n, "access", "protected")) {
-    if ((Equal(nodetype, "cdecl"))) {
-      if (Swig_director_mode() && Swig_director_protected_mode() && Swig_all_protected_mode()) {
-        return 1;
-      }
-      if (SwigType_isfunction(Getattr(n, "decl"))) {
-        String *storage = Getattr(n, "storage");
-        /* The function is declared virtual, or it has no storage. This eliminates typedef, static etc. */
-        return !storage || Equal(storage, "virtual");
-      }
-    } else if (Equal(nodetype, "constructor") || Equal(nodetype, "destructor")) {
-      return 1;
-    } else if (Equal(nodetype, "using") && !Getattr(n, "namespace")) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * void name_nameobj_add()
- *
- * Add nameobj (rename/namewarn)
- * 
- * ----------------------------------------------------------------------------- */
-
-static List *make_attrlist(const char *ckey) {
-  List *list = NewList();
-  const char *cattr = strchr(ckey, '$');
-  if (cattr) {
-    String *nattr;
-    const char *rattr = strchr(++cattr, '$');
-    while (rattr) {
-      nattr = NewStringWithSize(cattr, (int)(rattr - cattr));
-      Append(list, nattr);
-      Delete(nattr);
-      cattr = rattr + 1;
-      rattr = strchr(cattr, '$');
-    }
-    nattr = NewString(cattr);
-    Append(list, nattr);
-    Delete(nattr);
-  } else {
-    Append(list, "nodeType");
-  }
-  return list;
-}
-
-static void name_object_attach_keys(const char *keys[], Hash *nameobj) {
-  Node *kw = nextSibling(nameobj);
-  List *matchlist = 0;
-  while (kw) {
-    Node *next = nextSibling(kw);
-    String *kname = Getattr(kw, "name");
-    char *ckey = kname ? Char(kname) : 0;
-    if (ckey) {
-      const char **rkey;
-      int isnotmatch = 0;
-      int isregexmatch = 0;
-      if ((strncmp(ckey, "match", 5) == 0)
-	  || (isnotmatch = (strncmp(ckey, "notmatch", 8) == 0))
-	  || (isregexmatch = (strncmp(ckey, "regexmatch", 10) == 0))
-	  || (isnotmatch = isregexmatch = (strncmp(ckey, "notregexmatch", 13) == 0))) {
-	Hash *mi = NewHash();
-	List *attrlist = make_attrlist(ckey);
-	if (!matchlist)
-	  matchlist = NewList();
-	Setattr(mi, "value", Getattr(kw, "value"));
-	Setattr(mi, "attrlist", attrlist);
-	if (isnotmatch)
-	  SetFlag(mi, "notmatch");
-	if (isregexmatch)
-	  SetFlag(mi, "regexmatch");
-	Delete(attrlist);
-	Append(matchlist, mi);
-	Delete(mi);
-	removeNode(kw);
-      } else {
-	for (rkey = keys; *rkey != 0; ++rkey) {
-	  if (strcmp(ckey, *rkey) == 0) {
-	    Setattr(nameobj, *rkey, Getattr(kw, "value"));
-	    removeNode(kw);
-	  }
-	}
-      }
-    }
-    kw = next;
-  }
-  if (matchlist) {
-    Setattr(nameobj, "matchlist", matchlist);
-    Delete(matchlist);
-  }
-}
-
-static void name_nameobj_add(Hash *name_hash, List *name_list, String *prefix, String *name, SwigType *decl, Hash *nameobj) {
-  String *nname = 0;
-  if (name && Len(name)) {
-    String *target_fmt = Getattr(nameobj, "targetfmt");
-    nname = prefix ? NewStringf("%s::%s", prefix, name) : NewString(name);
-    if (target_fmt) {
-      String *tmp = NewStringf(target_fmt, nname);
-      Delete(nname);
-      nname = tmp;
-    }
-  }
-
-  if (!nname || !Len(nname) || Getattr(nameobj, "fullname") ||	/* any of these options trigger a 'list' nameobj */
-      Getattr(nameobj, "sourcefmt") || Getattr(nameobj, "matchlist") || Getattr(nameobj, "regextarget")) {
-    if (decl)
-      Setattr(nameobj, "decl", decl);
-    if (nname && Len(nname))
-      Setattr(nameobj, "targetname", nname);
-    /* put the new nameobj at the beginnig of the list, such that the
-       last inserted rule take precedence */
-    Insert(name_list, 0, nameobj);
-  } else {
-    /* here we add an old 'hash' nameobj, simple and fast */
-    Swig_name_object_set(name_hash, nname, decl, nameobj);
-  }
-  Delete(nname);
-}
-
-/* -----------------------------------------------------------------------------
- * int name_match_nameobj()
- *
- * Apply and check the nameobj's math list to the node
- * 
- * ----------------------------------------------------------------------------- */
-
-static DOH *get_lattr(Node *n, List *lattr) {
-  DOH *res = 0;
-  int ilen = Len(lattr);
-  int i;
-  for (i = 0; n && (i < ilen); ++i) {
-    String *nattr = Getitem(lattr, i);
-    res = Getattr(n, nattr);
-#ifdef SWIG_DEBUG
-    if (!res) {
-      Printf(stdout, "missing %s %s %s\n", nattr, Getattr(n, "name"), Getattr(n, "member"));
-    } else {
-      Printf(stdout, "lattr %d %s %s\n", i, nattr, DohIsString(res) ? res : Getattr(res, "name"));
-    }
-#endif
-    n = res;
-  }
-  return res;
-}
-
-#ifdef HAVE_PCRE
-#include <pcre.h>
-
-static int name_regexmatch_value(Node *n, String *pattern, String *s) {
-  pcre *compiled_pat;
-  const char *err;
-  int errpos;
-  int rc;
-
-  compiled_pat = pcre_compile(Char(pattern), 0, &err, &errpos, NULL);
-  if (!compiled_pat) {
-    Swig_error("SWIG", Getline(n),
-               "Invalid regex \"%s\": compilation failed at %d: %s\n",
-               Char(pattern), errpos, err);
-    exit(1);
-  }
-
-  rc = pcre_exec(compiled_pat, NULL, Char(s), Len(s), 0, 0, NULL, 0);
-  pcre_free(compiled_pat);
-
-  if (rc == PCRE_ERROR_NOMATCH)
-    return 0;
-
-  if (rc < 0 ) {
-    Swig_error("SWIG", Getline(n),
-               "Matching \"%s\" against regex \"%s\" failed: %d\n",
-               Char(s), Char(pattern), rc);
-    exit(1);
-  }
-
-  return 1;
-}
-
-#else /* !HAVE_PCRE */
-
-static int name_regexmatch_value(Node *n, String *pattern, String *s) {
-  (void)pattern;
-  (void)s;
-  Swig_error("SWIG", Getline(n),
-             "PCRE regex matching is not available in this SWIG build.\n");
-  exit(1);
-}
-
-#endif /* HAVE_PCRE/!HAVE_PCRE */
-
-static int name_match_value(String *mvalue, String *value) {
-#if defined(SWIG_USE_SIMPLE_MATCHOR)
-  int match = 0;
-  char *cvalue = Char(value);
-  char *cmvalue = Char(mvalue);
-  char *sep = strchr(cmvalue, '|');
-  while (sep && !match) {
-    match = strncmp(cvalue, cmvalue, sep - cmvalue) == 0;
-#ifdef SWIG_DEBUG
-    Printf(stdout, "match_value: %s %s %d\n", cvalue, cmvalue, match);
-#endif
-    cmvalue = sep + 1;
-    sep = strchr(cmvalue, '|');
-  }
-  if (!match) {
-    match = strcmp(cvalue, cmvalue) == 0;
-#ifdef SWIG_DEBUG
-    Printf(stdout, "match_value: %s %s %d\n", cvalue, cmvalue, match);
-#endif
-  }
-  return match;
-#else
-  return Equal(mvalue, value);
-#endif
-}
-
-static int name_match_nameobj(Hash *rn, Node *n) {
-  int match = 1;
-  List *matchlist = Getattr(rn, "matchlist");
-#ifdef SWIG_DEBUG
-  Printf(stdout, "name_match_nameobj: %s\n", Getattr(n, "name"));
-#endif
-  if (matchlist) {
-    int ilen = Len(matchlist);
-    int i;
-    for (i = 0; match && (i < ilen); ++i) {
-      Node *mi = Getitem(matchlist, i);
-      List *lattr = Getattr(mi, "attrlist");
-      String *nval = get_lattr(n, lattr);
-      int notmatch = GetFlag(mi, "notmatch");
-      int regexmatch = GetFlag(mi, "regexmatch");
-      match = 0;
-      if (nval) {
-	String *kwval = Getattr(mi, "value");
-	match = regexmatch ? name_regexmatch_value(n, kwval, nval)
-	    : name_match_value(kwval, nval);
-#ifdef SWIG_DEBUG
-	Printf(stdout, "val %s %s %d %d \n", nval, kwval, match, ilen);
-#endif
-      }
-      if (notmatch)
-	match = !match;
-    }
-  }
-#ifdef SWIG_DEBUG
-  Printf(stdout, "name_match_nameobj: %d\n", match);
-#endif
-  return match;
-}
-
-/* -----------------------------------------------------------------------------
- * Hash *name_nameobj_lget()
- *
- * Get a nameobj (rename/namewarn) from the list of filters
- * 
- * ----------------------------------------------------------------------------- */
-
-static Hash *name_nameobj_lget(List *namelist, Node *n, String *prefix, String *name, String *decl) {
-  Hash *res = 0;
-  if (namelist) {
-    int len = Len(namelist);
-    int i;
-    int match = 0;
-    for (i = 0; !match && (i < len); i++) {
-      Hash *rn = Getitem(namelist, i);
-      String *rdecl = Getattr(rn, "decl");
-      if (rdecl && (!decl || !Equal(rdecl, decl))) {
-	continue;
-      } else if (name_match_nameobj(rn, n)) {
-	String *tname = Getattr(rn, "targetname");
-	if (tname) {
-	  String *sfmt = Getattr(rn, "sourcefmt");
-	  String *sname = 0;
-	  int fullname = GetFlag(rn, "fullname");
-	  int regextarget = GetFlag(rn, "regextarget");
-	  if (sfmt) {
-	    if (fullname && prefix) {
-	      String *pname = NewStringf("%s::%s", prefix, name);
-	      sname = NewStringf(sfmt, pname);
-	      Delete(pname);
-	    } else {
-	      sname = NewStringf(sfmt, name);
-	    }
-	  } else {
-	    if (fullname && prefix) {
-	      sname = NewStringf("%s::%s", prefix, name);
-	    } else {
-	      sname = name;
-	      DohIncref(name);
-	    }
-	  }
-	  match = regextarget ? name_regexmatch_value(n, tname, sname)
-	    : name_match_value(tname, sname);
-	  Delete(sname);
-	} else {
-	  /* Applying the renaming rule may fail if it contains a %(regex)s expression that doesn't match the given name. */
-	  String *sname = NewStringf(Getattr(rn, "name"), name);
-	  if (sname) {
-	    if (Len(sname))
-	      match = 1;
-	    Delete(sname);
-	  }
-	}
-      }
-      if (match) {
-	res = rn;
-	break;
-      }
-    }
-  }
-  return res;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_namewarn_add
- *
- * Add a namewarn objects
- * 
- * ----------------------------------------------------------------------------- */
-
-void Swig_name_namewarn_add(String *prefix, String *name, SwigType *decl, Hash *namewrn) {
-  const char *namewrn_keys[] = { "rename", "error", "fullname", "sourcefmt", "targetfmt", 0 };
-  name_object_attach_keys(namewrn_keys, namewrn);
-  name_nameobj_add(name_namewarn_hash(), name_namewarn_list(), prefix, name, decl, namewrn);
-}
-
-/* -----------------------------------------------------------------------------
- * Hash *name_namewarn_get()
- *
- * Return the namewarn object, if there is one.
- * 
- * ----------------------------------------------------------------------------- */
-
-static Hash *name_namewarn_get(Node *n, String *prefix, String *name, SwigType *decl) {
-  if (!namewarn_hash && !namewarn_list)
-    return 0;
-  if (n) {
-    /* Return in the obvious cases */
-    if (!name || !need_name_warning(n)) {
-      return 0;
-    } else {
-      String *access = Getattr(n, "access");
-      int is_public = !access || Equal(access, "public");
-      if (!is_public && !Swig_need_protected(n)) {
-	return 0;
-      }
-    }
-  }
-  if (name) {
-    /* Check to see if the name is in the hash */
-    Hash *wrn = Swig_name_object_get(name_namewarn_hash(), prefix, name, decl);
-    if (wrn && !name_match_nameobj(wrn, n))
-      wrn = 0;
-    if (!wrn) {
-      wrn = name_nameobj_lget(name_namewarn_list(), n, prefix, name, decl);
-    }
-    if (wrn && Getattr(wrn, "error")) {
-      if (n) {
-	Swig_error(Getfile(n), Getline(n), "%s\n", Getattr(wrn, "name"));
-      } else {
-	Swig_error(cparse_file, cparse_line, "%s\n", Getattr(wrn, "name"));
-      }
-    }
-    return wrn;
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * String *Swig_name_warning()
- *
- * Return the name warning, if there is one.
- * 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_warning(Node *n, String *prefix, String *name, SwigType *decl) {
-  Hash *wrn = name_namewarn_get(n, prefix, name, decl);
-  return (name && wrn) ? Getattr(wrn, "name") : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_name_rename_add()
- *
- * Manage the rename objects
- * 
- * ----------------------------------------------------------------------------- */
-
-static void single_rename_add(String *prefix, String *name, SwigType *decl, Hash *newname) {
-  name_nameobj_add(name_rename_hash(), name_rename_list(), prefix, name, decl, newname);
-}
-
-/* Add a new rename. Works much like new_feature including default argument handling. */
-void Swig_name_rename_add(String *prefix, String *name, SwigType *decl, Hash *newname, ParmList *declaratorparms) {
-
-  ParmList *declparms = declaratorparms;
-
-  const char *rename_keys[] = { "fullname", "sourcefmt", "targetfmt", "continue", "regextarget", 0 };
-  name_object_attach_keys(rename_keys, newname);
-
-  /* Add the name */
-  single_rename_add(prefix, name, decl, newname);
-
-  /* Add extra names if there are default parameters in the parameter list */
-  if (decl) {
-    int constqualifier = SwigType_isconst(decl);
-    while (declparms) {
-      if (ParmList_has_defaultargs(declparms)) {
-
-	/* Create a parameter list for the new rename by copying all
-	   but the last (defaulted) parameter */
-	ParmList *newparms = CopyParmListMax(declparms,ParmList_len(declparms)-1);
-
-	/* Create new declaration - with the last parameter removed */
-	SwigType *newdecl = Copy(decl);
-	Delete(SwigType_pop_function(newdecl));	/* remove the old parameter list from newdecl */
-	SwigType_add_function(newdecl, newparms);
-	if (constqualifier)
-	  SwigType_add_qualifier(newdecl, "const");
-
-	single_rename_add(prefix, name, newdecl, newname);
-	declparms = newparms;
-	Delete(newdecl);
-      } else {
-	declparms = 0;
-      }
-    }
-  }
-}
-
-
-/* Create a name applying rename/namewarn if needed */
-static String *apply_rename(String *newname, int fullname, String *prefix, String *name) {
-  String *result = 0;
-  if (newname && Len(newname)) {
-    if (Strcmp(newname, "$ignore") == 0) {
-      result = Copy(newname);
-    } else {
-      char *cnewname = Char(newname);
-      if (cnewname) {
-	int destructor = name && (*(Char(name)) == '~');
-	String *fmt = newname;
-	/* use name as a fmt, but avoid C++ "%" and "%=" operators */
-	if (Len(newname) > 1 && strchr(cnewname, '%') && !(strcmp(cnewname, "%=") == 0)) {
-	  if (fullname && prefix) {
-	    result = NewStringf(fmt, prefix, name);
-	  } else {
-	    result = NewStringf(fmt, name);
-	  }
-	} else {
-	  result = Copy(newname);
-	}
-	if (destructor && result && (*(Char(result)) != '~')) {
-	  Insert(result, 0, "~");
-	}
-      }
-    }
-  }
-
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * String *Swig_name_make()
- *
- * Make a name after applying all the rename/namewarn objects
- * 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, SwigType *decl, String *oldname) {
-  String *nname = 0;
-  String *result = 0;
-  String *name = NewString(cname);
-  Hash *wrn = 0;
-  String *rdecl = 0;
-  String *rname = 0;
-
-  /* very specific hack for template constructors/destructors */
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_name_make: looking for %s %s %s %s\n", prefix, name, decl, oldname);
-#endif
-
-  if (name && n && SwigType_istemplate(name)) {
-    String *nodetype = nodeType(n);
-    if (nodetype && (Equal(nodetype, "constructor") || Equal(nodetype, "destructor"))) {
-      String *nprefix = NewStringEmpty();
-      String *nlast = NewStringEmpty();
-      String *tprefix;
-      Swig_scopename_split(name, &nprefix, &nlast);
-      tprefix = SwigType_templateprefix(nlast);
-      Delete(nlast);
-      if (Len(nprefix)) {
-	Append(nprefix, "::");
-	Append(nprefix, tprefix);
-	Delete(tprefix);
-	rname = nprefix;
-      } else {
-	rname = tprefix;
-	Delete(nprefix);
-      }
-      rdecl = Copy(decl);
-      Replaceall(rdecl, name, rname);
-#ifdef SWIG_DEBUG
-      Printf(stdout, "SWIG_name_make: use new name %s %s : %s %s\n", name, decl, rname, rdecl);
-#endif
-      decl = rdecl;
-      Delete(name);
-      name = rname;
-    }
-  }
-
-  if (rename_hash || rename_list || namewarn_hash || namewarn_list) {
-    Hash *rn = Swig_name_object_get(name_rename_hash(), prefix, name, decl);
-    if (!rn || !name_match_nameobj(rn, n)) {
-      rn = name_nameobj_lget(name_rename_list(), n, prefix, name, decl);
-      if (rn) {
-	String *sfmt = Getattr(rn, "sourcefmt");
-	int fullname = GetFlag(rn, "fullname");
-	if (fullname && prefix) {
-	  String *sname = NewStringf("%s::%s", prefix, name);
-	  Delete(name);
-	  name = sname;
-	  prefix = 0;
-	}
-	if (sfmt) {
-	  String *sname = NewStringf(sfmt, name);
-	  Delete(name);
-	  name = sname;
-	}
-      }
-    }
-    if (rn) {
-      String *newname = Getattr(rn, "name");
-      int fullname = GetFlag(rn, "fullname");
-      result = apply_rename(newname, fullname, prefix, name);
-    }
-    if (result && !Equal(result, name)) {
-      /* operators in C++ allow aliases, we look for them */
-      char *cresult = Char(result);
-      if (cresult && (strncmp(cresult, "operator ", 9) == 0)) {
-	String *nresult = Swig_name_make(n, prefix, result, decl, oldname);
-	if (!Equal(nresult, result)) {
-	  Delete(result);
-	  result = nresult;
-	} else {
-	  Delete(nresult);
-	}
-      }
-    }
-    nname = result ? result : name;
-    wrn = name_namewarn_get(n, prefix, nname, decl);
-    if (wrn) {
-      String *rename = Getattr(wrn, "rename");
-      if (rename) {
-	String *msg = Getattr(wrn, "name");
-	int fullname = GetFlag(wrn, "fullname");
-	if (result)
-	  Delete(result);
-	result = apply_rename(rename, fullname, prefix, name);
-	if ((msg) && (Len(msg))) {
-	  if (!Getmeta(nname, "already_warned")) {
-	    if (n) {
-	      SWIG_WARN_NODE_BEGIN(n);
-	      Swig_warning(0, Getfile(n), Getline(n), "%s\n", msg);
-	      SWIG_WARN_NODE_END(n);
-	    } else {
-	      Swig_warning(0, Getfile(name), Getline(name), "%s\n", msg);
-	    }
-	    Setmeta(nname, "already_warned", "1");
-	  }
-	}
-      }
-    }
-  }
-  if (!result || !Len(result)) {
-    if (result)
-      Delete(result);
-    if (oldname) {
-      result = NewString(oldname);
-    } else {
-      result = NewString(cname);
-    }
-  }
-  Delete(name);
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_name_make: result  '%s' '%s'\n", cname, result);
-#endif
-
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * void Swig_name_inherit()
- *
- * Inherit namewarn, rename, and feature objects
- * 
- * ----------------------------------------------------------------------------- */
-
-void Swig_name_inherit(String *base, String *derived) {
-  /*  Printf(stdout,"base = '%s', derived = '%s'\n", base, derived); */
-  Swig_name_object_inherit(name_rename_hash(), base, derived);
-  Swig_name_object_inherit(name_namewarn_hash(), base, derived);
-  Swig_name_object_inherit(Swig_cparse_features(), base, derived);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_inherit_base_symbols()
- * ----------------------------------------------------------------------------- */
-
-void Swig_inherit_base_symbols(List *bases) {
-  if (bases) {
-    Iterator s;
-    for (s = First(bases); s.item; s = Next(s)) {
-      Symtab *st = Getattr(s.item, "symtab");
-      if (st) {
-	Setfile(st, Getfile(s.item));
-	Setline(st, Getline(s.item));
-	Swig_symbol_inherit(st);
-      }
-    }
-    Delete(bases);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_make_inherit_list()
- * ----------------------------------------------------------------------------- */
-
-List *Swig_make_inherit_list(String *clsname, List *names, String *Namespaceprefix) {
-  int i, ilen;
-  String *derived;
-  List *bases = NewList();
-
-  if (Namespaceprefix)
-    derived = NewStringf("%s::%s", Namespaceprefix, clsname);
-  else
-    derived = NewString(clsname);
-
-  ilen = Len(names);
-  for (i = 0; i < ilen; i++) {
-    String *base;
-    String *n = Getitem(names, i);
-    /* Try to figure out where this symbol is */
-    Node *s = Swig_symbol_clookup(n, 0);
-    if (s) {
-      while (s && (Strcmp(nodeType(s), "class") != 0)) {
-	/* Not a class.  Could be a typedef though. */
-	String *storage = Getattr(s, "storage");
-	if (storage && (Strcmp(storage, "typedef") == 0)) {
-	  String *nn = Getattr(s, "type");
-	  s = Swig_symbol_clookup(nn, Getattr(s, "sym:symtab"));
-	} else {
-	  break;
-	}
-      }
-      if (s && ((Strcmp(nodeType(s), "class") == 0) || (Strcmp(nodeType(s), "template") == 0))) {
-	String *q = Swig_symbol_qualified(s);
-	Append(bases, s);
-	if (q) {
-	  base = NewStringf("%s::%s", q, Getattr(s, "name"));
-	  Delete(q);
-	} else {
-	  base = NewString(Getattr(s, "name"));
-	}
-      } else {
-	base = NewString(n);
-      }
-    } else {
-      base = NewString(n);
-    }
-    if (base) {
-      Swig_name_inherit(base, derived);
-      Delete(base);
-    }
-  }
-  return bases;
-}
-
-
-/* -----------------------------------------------------------------------------
- * void Swig_name_str()
- *
- * Return a stringified version of a C/C++ symbol from a node.
- * The node passed in is expected to be a function, constructor, destructor or
- * variable. Some example return values:
- *   "MyNameSpace::MyTemplate<MyNameSpace::ABC >::~MyTemplate"
- *   "MyNameSpace::ABC::ABC"
- *   "MyNameSpace::ABC::constmethod"
- *   "MyNameSpace::ABC::variablename"
- * 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_str(Node *n) {
-  String *qname;
-  String *qualifier = Swig_symbol_qualified(n);
-  String *name = Swig_scopename_last(Getattr(n, "name"));
-  if (qualifier)
-    qualifier = SwigType_namestr(qualifier);
-
-  /* Very specific hack for template constructors/destructors */
-  if (SwigType_istemplate(name)) {
-    String *nodetype = nodeType(n);
-    if (nodetype && (Equal(nodetype, "constructor") || Equal(nodetype, "destructor"))) {
-      String *nprefix = NewStringEmpty();
-      String *nlast = NewStringEmpty();
-      String *tprefix;
-      Swig_scopename_split(name, &nprefix, &nlast);
-      tprefix = SwigType_templateprefix(nlast);
-      Delete(nlast);
-      Delete(name);
-      name = tprefix;
-    }
-  }
-
-  qname = NewString("");
-  if (qualifier && Len(qualifier) > 0)
-    Printf(qname, "%s::", qualifier);
-  Printf(qname, "%s", SwigType_str(name, 0));
-
-  Delete(name);
-  Delete(qualifier);
-
-  return qname;
-}
-
-/* -----------------------------------------------------------------------------
- * void Swig_name_decl()
- *
- * Return a stringified version of a C/C++ declaration without the return type.
- * The node passed in is expected to be a function, constructor, destructor or
- * variable. Some example return values:
- *   "MyNameSpace::MyTemplate<MyNameSpace::ABC >::~MyTemplate()"
- *   "MyNameSpace::ABC::ABC(int,double)"
- *   "MyNameSpace::ABC::constmethod(int) const"
- *   "MyNameSpace::ABC::variablename"
- * 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_decl(Node *n) {
-  String *qname;
-  String *decl;
-
-  qname = Swig_name_str(n);
-
-  if (checkAttribute(n, "kind", "variable"))
-    decl = NewStringf("%s", qname);
-  else
-    decl = NewStringf("%s(%s)%s", qname, ParmList_errorstr(Getattr(n, "parms")), SwigType_isconst(Getattr(n, "decl")) ? " const" : "");
-
-  Delete(qname);
-
-  return decl;
-}
-
-/* -----------------------------------------------------------------------------
- * void Swig_name_fulldecl()
- *
- * Return a stringified version of a C/C++ declaration including the return type.
- * The node passed in is expected to be a function, constructor or destructor.
- * Some example return values:
- *   "MyNameSpace::MyTemplate<MyNameSpace::ABC >::~MyTemplate()"
- *   "MyNameSpace::ABC::ABC(int,double)"
- *   "int * MyNameSpace::ABC::constmethod(int) const"
- * 
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_fulldecl(Node *n) {
-  String *decl = Swig_name_decl(n);
-  String *type = Getattr(n, "type");
-  String *nodetype = nodeType(n);
-  String *fulldecl;
-  /* add on the return type */
-  if (nodetype && (Equal(nodetype, "constructor") || Equal(nodetype, "destructor"))) {
-    fulldecl = decl;
-  } else {
-    String *t = SwigType_str(type, 0);
-    fulldecl = NewStringf("%s %s", t, decl);
-    Delete(decl);
-    Delete(t);
-  }
-  return fulldecl;
-}
-
diff --git a/dependencies2013/win32/swig/Source/Swig/parms.c b/dependencies2013/win32/swig/Source/Swig/parms.c
deleted file mode 100644
index bec1e63f..00000000
--- a/dependencies2013/win32/swig/Source/Swig/parms.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * parms.c
- *
- * Parameter list class.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-
-/* ------------------------------------------------------------------------
- * NewParm()
- *
- * Create a new parameter from datatype 'type' and name 'name' copying
- * the file and line number from the Node from_node.
- * ------------------------------------------------------------------------ */
-
-Parm *NewParm(SwigType *type, const_String_or_char_ptr name, Node *from_node) {
-  Parm *p = NewParmWithoutFileLineInfo(type, name);
-  Setfile(p, Getfile(from_node));
-  Setline(p, Getline(from_node));
-  return p;
-}
-
-/* ------------------------------------------------------------------------
- * NewParmWithoutFileLineInfo()
- *
- * Create a new parameter from datatype 'type' and name 'name' without any
- * file / line numbering information.
- * ------------------------------------------------------------------------ */
-
-Parm *NewParmWithoutFileLineInfo(SwigType *type, const_String_or_char_ptr name) {
-  Parm *p = NewHash();
-  set_nodeType(p, "parm");
-  if (type) {
-    SwigType *ntype = Copy(type);
-    Setattr(p, "type", ntype);
-    Delete(ntype);
-  }
-  Setattr(p, "name", name);
-  return p;
-}
-
-/* ------------------------------------------------------------------------
- * NewParmNode()
- *
- * Create a new parameter from datatype 'type' and name and symbol table as
- * well as file and line number from the 'from_node'.
- * The resulting Parm will be similar to a Node used for typemap lookups.
- * ------------------------------------------------------------------------ */
-
-Parm *NewParmNode(SwigType *type, Node *from_node) {
-  Parm *p = NewParm(type, Getattr(from_node, "name"), from_node);
-  Setattr(p, "sym:symtab", Getattr(from_node, "sym:symtab"));
-  return p;
-}
-
-/* ------------------------------------------------------------------------
- * CopyParm()
- * ------------------------------------------------------------------------ */
-
-Parm *CopyParm(Parm *p) {
-  Parm *np = NewHash();
-  Iterator ki;
-  for (ki = First(p); ki.key; ki = Next(ki)) {
-    if (DohIsString(ki.item)) {
-      DOH *c = Copy(ki.item);
-      Setattr(np,ki.key,c);
-      Delete(c);
-    }
-  }
-  Setfile(np, Getfile(p));
-  Setline(np, Getline(p));
-  return np;
-}
-
-/* ------------------------------------------------------------------
- * CopyParmListMax()
- * CopyParmList()
- * ------------------------------------------------------------------ */
-
-ParmList *CopyParmListMax(ParmList *p, int count) {
-  Parm *np;
-  Parm *pp = 0;
-  Parm *fp = 0;
-
-  if (!p)
-    return 0;
-
-  while (p) {
-    if (count == 0) break;
-    np = CopyParm(p);
-    if (pp) {
-      set_nextSibling(pp, np);
-      Delete(np);
-    } else {
-      fp = np;
-    }
-    pp = np;
-    p = nextSibling(p);
-    count--;
-  }
-  return fp;
-}
-
-ParmList *CopyParmList(ParmList *p) {
-  return CopyParmListMax(p,-1);
-}
-
-/* -----------------------------------------------------------------------------
- * int ParmList_numrequired().  Return number of required arguments
- * ----------------------------------------------------------------------------- */
-
-int ParmList_numrequired(ParmList *p) {
-  int i = 0;
-  while (p) {
-    SwigType *t = Getattr(p, "type");
-    String *value = Getattr(p, "value");
-    if (value)
-      return i;
-    if (!(SwigType_type(t) == T_VOID))
-      i++;
-    else
-      break;
-    p = nextSibling(p);
-  }
-  return i;
-}
-
-/* -----------------------------------------------------------------------------
- * int ParmList_len()
- * ----------------------------------------------------------------------------- */
-
-int ParmList_len(ParmList *p) {
-  int i = 0;
-  while (p) {
-    i++;
-    p = nextSibling(p);
-  }
-  return i;
-}
-
-/* ---------------------------------------------------------------------
- * get_empty_type()
- * ---------------------------------------------------------------------- */
-
-static SwigType *get_empty_type() {
-  return NewStringEmpty();
-}
-
-/* ---------------------------------------------------------------------
- * ParmList_str()
- *
- * Generates a string of parameters
- * ---------------------------------------------------------------------- */
-
-String *ParmList_str(ParmList *p) {
-  String *out = NewStringEmpty();
-  while (p) {
-    String *type = Getattr(p, "type");
-    String *pstr = SwigType_str(type ? type : get_empty_type(), Getattr(p, "name"));
-    Append(out, pstr);
-    p = nextSibling(p);
-    if (p) {
-      Append(out, ",");
-    }
-    Delete(pstr);
-  }
-  return out;
-}
-
-/* ---------------------------------------------------------------------
- * ParmList_str_defaultargs()
- *
- * Generates a string of parameters including default arguments
- * ---------------------------------------------------------------------- */
-
-String *ParmList_str_defaultargs(ParmList *p) {
-  String *out = NewStringEmpty();
-  while (p) {
-    String *value = Getattr(p, "value");
-    String *type = Getattr(p, "type");
-    String *pstr = SwigType_str(type ? type : get_empty_type(), Getattr(p, "name"));
-    Append(out, pstr);
-    if (value) {
-      Printf(out, "=%s", value);
-    }
-    p = nextSibling(p);
-    if (p) {
-      Append(out, ",");
-    }
-    Delete(pstr);
-  }
-  return out;
-}
-
-/* -----------------------------------------------------------------------------
- * ParmList_str_multibrackets()
- *
- * Generates a string of parameters including default arguments adding brackets
- * if more than one parameter
- * ----------------------------------------------------------------------------- */
-
-String *ParmList_str_multibrackets(ParmList *p) {
-  String *out;
-  String *parm_str = ParmList_str_defaultargs(p);
-  if (ParmList_len(p) > 1)
-    out = NewStringf("(%s)", parm_str);
-  else
-    out = NewStringf("%s", parm_str);
-  Delete(parm_str);
-  return out;
-}
-
-/* ---------------------------------------------------------------------
- * ParmList_protostr()
- *
- * Generate a prototype string.
- * ---------------------------------------------------------------------- */
-
-String *ParmList_protostr(ParmList *p) {
-  String *out = NewStringEmpty();
-  while (p) {
-    String *type = Getattr(p, "type");
-    String *pstr = SwigType_str(type ? type : get_empty_type(), 0);
-    Append(out, pstr);
-    p = nextSibling(p);
-    if (p) {
-      Append(out, ",");
-    }
-    Delete(pstr);
-  }
-  return out;
-}
-
-/* ---------------------------------------------------------------------
- * ParmList_has_defaultargs()
- *
- * Returns 1 if the parameter list passed in is has one or more default
- * arguments. Otherwise returns 0.
- * ---------------------------------------------------------------------- */
-
-int ParmList_has_defaultargs(ParmList *p) {
-  while (p) {
-    if (Getattr(p, "value")) {
-      return 1;
-    }
-    p = nextSibling(p);
-  }
-  return 0;
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/scanner.c b/dependencies2013/win32/swig/Source/Swig/scanner.c
deleted file mode 100644
index 227a1d00..00000000
--- a/dependencies2013/win32/swig/Source/Swig/scanner.c
+++ /dev/null
@@ -1,1792 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * scanner.c
- *
- * This file implements a general purpose C/C++ compatible lexical scanner.
- * This scanner isn't intended to be plugged directly into a parser built
- * with yacc. Rather, it contains a lot of generic code that could be used
- * to easily construct yacc-compatible scanners.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include <ctype.h>
-
-extern String *cparse_file;
-extern int cparse_line;
-extern int cparse_cplusplus;
-extern int cparse_start_line;
-
-struct Scanner {
-  String *text;			/* Current token value */
-  List   *scanobjs;		/* Objects being scanned */
-  String *str;			/* Current object being scanned */
-  char   *idstart;		/* Optional identifier start characters */
-  int     nexttoken;		/* Next token to be returned */
-  int     start_line;		/* Starting line of certain declarations */
-  int     line;
-  int     yylen;	        /* Length of text pushed into text */
-  String *file;
-  String *error;                /* Last error message (if any) */
-  int     error_line;           /* Error line number */
-  int     freeze_line;          /* Suspend line number updates */
-  List   *brackets;             /* Current level of < > brackets on each level */
-};
-
-typedef struct Locator {
-  String         *filename;
-  int             line_number;
-  struct Locator *next;
-} Locator;
-static int follow_locators = 0;
-
-static void brackets_push(Scanner *);
-static void brackets_clear(Scanner *);
-
-/* -----------------------------------------------------------------------------
- * NewScanner()
- *
- * Create a new scanner object
- * ----------------------------------------------------------------------------- */
-
-Scanner *NewScanner(void) {
-  Scanner *s;
-  s = (Scanner *) malloc(sizeof(Scanner));
-  s->line = 1;
-  s->file = 0;
-  s->nexttoken = -1;
-  s->start_line = 1;
-  s->yylen = 0;
-  s->idstart = NULL;
-  s->scanobjs = NewList();
-  s->text = NewStringEmpty();
-  s->str = 0;
-  s->error = 0;
-  s->error_line = 0;
-  s->freeze_line = 0;
-  s->brackets = NewList();
-  brackets_push(s);
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * DelScanner()
- *
- * Delete a scanner object.
- * ----------------------------------------------------------------------------- */
-
-void DelScanner(Scanner *s) {
-  assert(s);
-  Delete(s->scanobjs);
-  Delete(s->brackets);
-  Delete(s->text);
-  Delete(s->file);
-  Delete(s->error);
-  Delete(s->str);
-  free(s->idstart);
-  free(s); 
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_clear()
- *
- * Clear the contents of a scanner object.
- * ----------------------------------------------------------------------------- */
-
-void Scanner_clear(Scanner *s) {
-  assert(s);
-  Delete(s->str);
-  Clear(s->text);
-  Clear(s->scanobjs);
-  brackets_clear(s);
-  Delete(s->error);
-  s->str = 0;
-  s->error = 0;
-  s->line = 1;
-  s->nexttoken = -1;
-  s->start_line = 0;
-  s->yylen = 0;
-  /* Should these be cleared too?
-  s->idstart;
-  s->file;
-  s->error_line;
-  s->freeze_line;
-  */
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_push()
- *
- * Push some new text into the scanner.  The scanner will start parsing this text
- * immediately before returning to the old text.
- * ----------------------------------------------------------------------------- */
-
-void Scanner_push(Scanner *s, String *txt) {
-  assert(s && txt);
-  Push(s->scanobjs, txt);
-  if (s->str) {
-    Setline(s->str,s->line);
-    Delete(s->str);
-  }
-  s->str = txt;
-  DohIncref(s->str);
-  s->line = Getline(txt);
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_pushtoken()
- *
- * Push a token into the scanner.  This token will be returned on the next
- * call to Scanner_token().
- * ----------------------------------------------------------------------------- */
-
-void Scanner_pushtoken(Scanner *s, int nt, const_String_or_char_ptr val) {
-  assert(s);
-  assert((nt >= 0) && (nt < SWIG_MAXTOKENS));
-  s->nexttoken = nt;
-  if ( Char(val) != Char(s->text) ) {
-    Clear(s->text);
-    Append(s->text,val);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_set_location()
- *
- * Set the file and line number location of the scanner.
- * ----------------------------------------------------------------------------- */
-
-void Scanner_set_location(Scanner *s, String *file, int line) {
-  Setline(s->str, line);
-  Setfile(s->str, file);
-  s->line = line;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_file()
- *
- * Get the current file.
- * ----------------------------------------------------------------------------- */
-
-String *Scanner_file(Scanner *s) {
-  return Getfile(s->str);
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_line()
- *
- * Get the current line number
- * ----------------------------------------------------------------------------- */
-int Scanner_line(Scanner *s) {
-  return s->line;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_start_line()
- *
- * Get the line number on which the current token starts
- * ----------------------------------------------------------------------------- */
-int Scanner_start_line(Scanner *s) {
-  return s->start_line;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_idstart()
- *
- * Change the set of additional characters that can be used to start an identifier.
- * ----------------------------------------------------------------------------- */
-
-void Scanner_idstart(Scanner *s, const char *id) {
-  free(s->idstart);
-  s->idstart = Swig_copy_string(id);
-}
-
-/* -----------------------------------------------------------------------------
- * nextchar()
- * 
- * Returns the next character from the scanner or 0 if end of the string.
- * ----------------------------------------------------------------------------- */
-static char nextchar(Scanner *s) {
-  int nc;
-  if (!s->str)
-    return 0;
-  while ((nc = Getc(s->str)) == EOF) {
-    Delete(s->str);
-    s->str = 0;
-    Delitem(s->scanobjs, 0);
-    if (Len(s->scanobjs) == 0)
-      return 0;
-    s->str = Getitem(s->scanobjs, 0);
-    s->line = Getline(s->str);
-    DohIncref(s->str);
-  }
-  if ((nc == '\n') && (!s->freeze_line)) 
-    s->line++;
-  Putc(nc,s->text);
-  return (char)nc;
-}
-
-/* -----------------------------------------------------------------------------
- * set_error() 
- *
- * Sets error information on the scanner.
- * ----------------------------------------------------------------------------- */
-
-static void set_error(Scanner *s, int line, const_String_or_char_ptr msg) {
-  s->error_line = line;
-  s->error = NewString(msg);
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_errmsg()
- * Scanner_errline()
- *
- * Returns error information (if any)
- * ----------------------------------------------------------------------------- */
-
-String *Scanner_errmsg(Scanner *s) {
-  return s->error;
-}
-
-int Scanner_errline(Scanner *s) {
-  return s->error_line;
-}
-
-/* -----------------------------------------------------------------------------
- * freeze_line()
- *
- * Freezes the current line number.
- * ----------------------------------------------------------------------------- */
-
-static void freeze_line(Scanner *s, int val) {
-  s->freeze_line = val;
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_count()
- *
- * Returns the number of brackets at the current depth.
- * A syntax error with unbalanced ) brackets will result in a NULL pointer return.
- * ----------------------------------------------------------------------------- */
-static int *brackets_count(Scanner *s) {
-  int *count;
-  if (Len(s->brackets) > 0)
-    count = (int *)Data(Getitem(s->brackets, 0));
-  else
-    count = 0;
-  return count;
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_clear()
- *
- * Resets the current depth and clears all brackets.
- * Usually called at the end of statements;
- * ----------------------------------------------------------------------------- */
-static void brackets_clear(Scanner *s) {
-  Clear(s->brackets);
-  brackets_push(s); /* base bracket count should always be created */
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_increment()
- *
- * Increases the number of brackets at the current depth.
- * Usually called when a single '<' is found.
- * ----------------------------------------------------------------------------- */
-static void brackets_increment(Scanner *s) {
-  int *count = brackets_count(s);
-  if (count)
-    (*count)++;
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_decrement()
- *
- * Decreases the number of brackets at the current depth.
- * Usually called when a single '>' is found.
- * ----------------------------------------------------------------------------- */
-static void brackets_decrement(Scanner *s) {
-  int *count = brackets_count(s);
-  if (count)
-    (*count)--;
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_reset()
- *
- * Sets the number of '<' brackets back to zero. Called at the point where
- * it is no longer possible to have a matching closing >> pair for a template.
- * ----------------------------------------------------------------------------- */
-static void brackets_reset(Scanner *s) {
-  int *count = brackets_count(s);
-  if (count)
-    *count = 0;
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_push()
- *
- * Increases the depth of brackets.
- * Usually called when '(' is found.
- * ----------------------------------------------------------------------------- */
-static void brackets_push(Scanner *s) {
-  int *newInt = (int *)malloc(sizeof(int));
-  *newInt = 0;
-  Push(s->brackets, NewVoid(newInt, free));
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_pop()
- *
- * Decreases the depth of brackets.
- * Usually called when ')' is found.
- * ----------------------------------------------------------------------------- */
-static void brackets_pop(Scanner *s) {
-  if (Len(s->brackets) > 0) /* protect against unbalanced ')' brackets */
-    Delitem(s->brackets, 0);
-}
-
-/* -----------------------------------------------------------------------------
- * brackets_allow_shift()
- *
- * Return 1 to allow shift (>>), or 0 if (>>) should be split into (> >).
- * This is for C++11 template syntax for closing templates.
- * ----------------------------------------------------------------------------- */
-static int brackets_allow_shift(Scanner *s) {
-  int *count = brackets_count(s);
-  return !count || (*count <= 0);
-}
-
-/* -----------------------------------------------------------------------------
- * retract()
- *
- * Retract n characters
- * ----------------------------------------------------------------------------- */
-static void retract(Scanner *s, int n) {
-  int i, l;
-  char *str;
-
-  str = Char(s->text);
-  l = Len(s->text);
-  assert(n <= l);
-  for (i = 0; i < n; i++) {
-    if (str[l - 1] == '\n') {
-      if (!s->freeze_line) s->line--;
-    }
-    (void)Seek(s->str, -1, SEEK_CUR);
-    Delitem(s->text, DOH_END);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * get_escape()
- * 
- * Get escape sequence.  Called when a backslash is found in a string
- * ----------------------------------------------------------------------------- */
-
-static void get_escape(Scanner *s) {
-  int result = 0;
-  int state = 0;
-  int c;
-
-  while (1) {
-    c = nextchar(s);
-    if (c == 0)
-      break;
-    switch (state) {
-    case 0:
-      if (c == 'n') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\n");
-	return;
-      }
-      if (c == 'r') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\r");
-	return;
-      }
-      if (c == 't') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\t");
-	return;
-      }
-      if (c == 'a') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\a");
-	return;
-      }
-      if (c == 'b') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\b");
-	return;
-      }
-      if (c == 'f') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\f");
-	return;
-      }
-      if (c == '\\') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\\");
-	return;
-      }
-      if (c == 'v') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\v");
-	return;
-      }
-      if (c == 'e') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\033");
-	return;
-      }
-      if (c == '\'') {
-	Delitem(s->text, DOH_END);
-	Append(s->text,"\'");
-	return;
-      }
-      if (c == '\"') {
-	Delitem(s->text, DOH_END);	
-	Append(s->text,"\"");
-	return;
-      }
-      if (c == '\n') {
-	Delitem(s->text, DOH_END);
-	return;
-      }
-      if (isdigit(c)) {
-	state = 10;
-	result = (c - '0');
-	Delitem(s->text, DOH_END);
-      } else if (c == 'x') {
-	state = 20;
-	Delitem(s->text, DOH_END);
-      } else {
-	char tmp[3];
-	tmp[0] = '\\';
-	tmp[1] = (char)c;
-	tmp[2] = 0;
-	Delitem(s->text, DOH_END);
-	Append(s->text, tmp);
-	return;
-      }
-      break;
-    case 10:
-      if (!isdigit(c)) {
-	retract(s,1);
-	Putc((char)result,s->text);
-	return;
-      }
-      result = (result << 3) + (c - '0');
-      Delitem(s->text, DOH_END);
-      break;
-    case 20:
-      if (!isxdigit(c)) {
-	retract(s,1);
-	Putc((char)result, s->text);
-	return;
-      }
-      if (isdigit(c))
-	result = (result << 4) + (c - '0');
-      else
-	result = (result << 4) + (10 + tolower(c) - 'a');
-      Delitem(s->text, DOH_END);
-      break;
-    }
-  }
-  return;
-}
-
-/* -----------------------------------------------------------------------------
- * look()
- *
- * Return the raw value of the next token.
- * ----------------------------------------------------------------------------- */
-
-static int look(Scanner *s) {
-  int state = 0;
-  int c = 0;
-  String *str_delimiter = 0;
-
-  Clear(s->text);
-  s->start_line = s->line;
-  Setfile(s->text, Getfile(s->str));
-
-
-  while (1) {
-    switch (state) {
-    case 0:
-      if ((c = nextchar(s)) == 0)
-	return (0);
-
-      /* Process delimiters */
-
-      if (c == '\n') {
-	return SWIG_TOKEN_ENDLINE;
-      } else if (!isspace(c)) {
-	retract(s, 1);
-	state = 1000;
-	Clear(s->text);
-	Setline(s->text, s->line);
-	Setfile(s->text, Getfile(s->str));
-      }
-      break;
-
-    case 1000:
-      if ((c = nextchar(s)) == 0)
-        return (0);
-      if (c == '%')
-	state = 4;		/* Possibly a SWIG directive */
-      
-      /* Look for possible identifiers or unicode/delimiter strings */
-      else if ((isalpha(c)) || (c == '_') ||
-	       (s->idstart && strchr(s->idstart, c))) {
-	state = 7;
-      }
-
-      /* Look for single character symbols */
-
-      else if (c == '(') {
-        brackets_push(s);
-	return SWIG_TOKEN_LPAREN;
-      }
-      else if (c == ')') {
-        brackets_pop(s);
-	return SWIG_TOKEN_RPAREN;
-      }
-      else if (c == ';') {
-        brackets_clear(s);
-	return SWIG_TOKEN_SEMI;
-      }
-      else if (c == ',')
-	return SWIG_TOKEN_COMMA;
-      else if (c == '*')
-	state = 220;
-      else if (c == '}')
-	return SWIG_TOKEN_RBRACE;
-      else if (c == '{') {
-        brackets_reset(s);
-	return SWIG_TOKEN_LBRACE;
-      }
-      else if (c == '=')
-	state = 33;
-      else if (c == '+')
-	state = 200;
-      else if (c == '-')
-	state = 210;
-      else if (c == '&')
-	state = 31;
-      else if (c == '|')
-	state = 32;
-      else if (c == '^')
-	state = 230;
-      else if (c == '<')
-	state = 60;
-      else if (c == '>')
-	state = 61;
-      else if (c == '~')
-	return SWIG_TOKEN_NOT;
-      else if (c == '!')
-	state = 3;
-      else if (c == '\\')
-	return SWIG_TOKEN_BACKSLASH;
-      else if (c == '[')
-	return SWIG_TOKEN_LBRACKET;
-      else if (c == ']')
-	return SWIG_TOKEN_RBRACKET;
-      else if (c == '@')
-	return SWIG_TOKEN_AT;
-      else if (c == '$')
-	state = 75;
-      else if (c == '#')
-	return SWIG_TOKEN_POUND;
-      else if (c == '?')
-	return SWIG_TOKEN_QUESTION;
-
-      /* Look for multi-character sequences */
-
-      else if (c == '/') {
-	state = 1;		/* Comment (maybe)  */
-	s->start_line = s->line;
-      }
-
-      else if (c == ':')
-	state = 5;		/* maybe double colon */
-      else if (c == '0')
-	state = 83;		/* An octal or hex value */
-      else if (c == '\"') {
-	state = 2;              /* A string constant */
-	s->start_line = s->line;
-	Clear(s->text);
-      }
-      else if (c == '\'') {
-	s->start_line = s->line;
-	Clear(s->text);
-	state = 9;		/* A character constant */
-      } else if (c == '`') {
-	s->start_line = s->line;
-	Clear(s->text);
-	state = 900;
-      }
-
-      else if (c == '.')
-	state = 100;		/* Maybe a number, maybe just a period */
-      else if (isdigit(c))
-	state = 8;		/* A numerical value */
-      else
-	state = 99;		/* An error */
-      break;
-
-    case 1:			/*  Comment block */
-      if ((c = nextchar(s)) == 0)
-	return (0);
-      if (c == '/') {
-	state = 10;		/* C++ style comment */
-	Clear(s->text);
-	Setline(s->text, Getline(s->str));
-	Setfile(s->text, Getfile(s->str));
-	Append(s->text, "//");
-      } else if (c == '*') {
-	state = 11;		/* C style comment */
-	Clear(s->text);
-	Setline(s->text, Getline(s->str));
-	Setfile(s->text, Getfile(s->str));
-	Append(s->text, "/*");
-      } else if (c == '=') {
-	return SWIG_TOKEN_DIVEQUAL;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_SLASH;
-      }
-      break;
-    case 10:			/* C++ style comment */
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '\n') {
-	retract(s,1);
-	return SWIG_TOKEN_COMMENT;
-      } else {
-	state = 10;
-      }
-      break;
-    case 11:			/* C style comment block */
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '*') {
-	state = 12;
-      } else {
-	state = 11;
-      }
-      break;
-    case 12:			/* Still in C style comment */
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '*') {
-	state = 12;
-      } else if (c == '/') {
-	return SWIG_TOKEN_COMMENT;
-      } else {
-	state = 11;
-      }
-      break;
-
-    case 2:			/* Processing a string */
-      if (!str_delimiter) {
-	state=20;
-	break;
-      }
-      
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated string\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      else if (c == '(') {
-	state = 20;
-      }
-      else {
-	char temp[2] = { 0, 0 };
-	temp[0] = c;
-	Append( str_delimiter, temp );
-      }
-    
-      break;
-
-    case 20:			/* Inside the string */
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated string\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      
-      if (!str_delimiter) { /* Ordinary string: "value" */
-	if (c == '\"') {
-	  Delitem(s->text, DOH_END);
-	  return SWIG_TOKEN_STRING;
-	} else if (c == '\\') {
-	  Delitem(s->text, DOH_END);
-	  get_escape(s);
-	}
-      } else {             /* Custom delimiter string: R"XXXX(value)XXXX" */
-	if (c==')') {
-	  int i=0;
-	  String *end_delimiter = NewStringEmpty();
-	  while ((c = nextchar(s)) != 0 && c!='\"') {
-	    char temp[2] = { 0, 0 };
-	    temp[0] = c;
-	    Append( end_delimiter, temp );
-	    i++;
-	  }
-	  
-	  if (Strcmp( str_delimiter, end_delimiter )==0) {
-	    Delete( end_delimiter ); /* Correct end delimiter )XXXX" occured */
-	    Delete( str_delimiter );
-	    str_delimiter = 0;
-	    return SWIG_TOKEN_STRING;
-	  } else {                   /* Incorrect end delimiter occured */
-	    retract( s, i );
-	    Delete( end_delimiter );
-	  }
-	}
-      }
-      
-      break;
-
-    case 3:			/* Maybe a not equals */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_LNOT;
-      else if (c == '=')
-	return SWIG_TOKEN_NOTEQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_LNOT;
-      }
-      break;
-
-    case 31:			/* AND or Logical AND or ANDEQUAL */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_AND;
-      else if (c == '&')
-	return SWIG_TOKEN_LAND;
-      else if (c == '=')
-	return SWIG_TOKEN_ANDEQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_AND;
-      }
-      break;
-
-    case 32:			/* OR or Logical OR */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_OR;
-      else if (c == '|')
-	return SWIG_TOKEN_LOR;
-      else if (c == '=')
-	return SWIG_TOKEN_OREQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_OR;
-      }
-      break;
-
-    case 33:			/* EQUAL or EQUALTO */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_EQUAL;
-      else if (c == '=')
-	return SWIG_TOKEN_EQUALTO;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_EQUAL;
-      }
-      break;
-
-    case 4:			/* A wrapper generator directive (maybe) */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_PERCENT;
-      if (c == '{') {
-	state = 40;		/* Include block */
-	Clear(s->text);
-	Setline(s->text, Getline(s->str));
-	Setfile(s->text, Getfile(s->str));
-	s->start_line = s->line;
-      } else if (s->idstart && strchr(s->idstart, '%') &&
-	         ((isalpha(c)) || (c == '_'))) {
-	state = 7;
-      } else if (c == '=') {
-	return SWIG_TOKEN_MODEQUAL;
-      } else if (c == '}') {
-	Swig_error(cparse_file, cparse_line, "Syntax error. Extraneous '%%}'\n");
-	exit(1);
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_PERCENT;
-      }
-      break;
-
-    case 40:			/* Process an include block */
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated block\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '%')
-	state = 41;
-      break;
-    case 41:			/* Still processing include block */
-      if ((c = nextchar(s)) == 0) {
-	set_error(s,s->start_line,"Unterminated code block");
-	return 0;
-      }
-      if (c == '}') {
-	Delitem(s->text, DOH_END);
-	Delitem(s->text, DOH_END);
-	Seek(s->text,0,SEEK_SET);
-	return SWIG_TOKEN_CODEBLOCK;
-      } else {
-	state = 40;
-      }
-      break;
-
-    case 5:			/* Maybe a double colon */
-
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_COLON;
-      if (c == ':')
-	state = 50;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_COLON;
-      }
-      break;
-
-    case 50:			/* DCOLON, DCOLONSTAR */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_DCOLON;
-      else if (c == '*')
-	return SWIG_TOKEN_DCOLONSTAR;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_DCOLON;
-      }
-      break;
-
-    case 60:			/* shift operators */
-      if ((c = nextchar(s)) == 0) {
-	brackets_increment(s);
-	return SWIG_TOKEN_LESSTHAN;
-      }
-      if (c == '<')
-	state = 240;
-      else if (c == '=')
-	return SWIG_TOKEN_LTEQUAL;
-      else {
-	retract(s, 1);
-	brackets_increment(s);
-	return SWIG_TOKEN_LESSTHAN;
-      }
-      break;
-    case 61:
-      if ((c = nextchar(s)) == 0) {
-        brackets_decrement(s);
-	return SWIG_TOKEN_GREATERTHAN;
-      }
-      if (c == '>' && brackets_allow_shift(s))
-	state = 250;
-      else if (c == '=')
-	return SWIG_TOKEN_GTEQUAL;
-      else {
-	retract(s, 1);
-        brackets_decrement(s);
-	return SWIG_TOKEN_GREATERTHAN;
-      }
-      break;
-    
-    case 7:			/* Identifier or true/false or unicode/custom delimiter string */
-      if (c == 'R') { /* Possibly CUSTOM DELIMITER string */
-	state = 72;
-	break;
-      }
-      else if (c == 'L') { /* Probably identifier but may be a wide string literal */
-	state = 77;
-	break;
-      }
-      else if (c != 'u' && c != 'U') { /* Definitely an identifier */
-	state = 70;
-	break;
-      }
-      
-      if ((c = nextchar(s)) == 0) {
-	state = 76;
-      }
-      else if (c == '\"') { /* Definitely u, U or L string */
-	retract(s, 1);
-	state = 1000;
-      }
-      else if (c == 'R') { /* Possibly CUSTOM DELIMITER u, U, L string */
-	state = 73;
-      }
-      else if (c == '8') { /* Possibly u8 string */
-	state = 71;
-      }
-      else {
-	retract(s, 1);   /* Definitely an identifier */
-	state = 70;
-      }
-      break;
-
-    case 70:			/* Identifier */
-      if ((c = nextchar(s)) == 0)
-	state = 76;
-      else if (isalnum(c) || (c == '_') || (c == '$')) {
-	state = 70;
-      } else {
-	retract(s, 1);
-	state = 76;
-      }
-      break;
-    
-    case 71:			/* Possibly u8 string */
-      if ((c = nextchar(s)) == 0) {
-	state = 76;
-      }
-      else if (c=='\"') {
-	retract(s, 1); /* Definitely u8 string */
-	state = 1000;
-      }
-      else if (c=='R') {
-	state = 74; /* Possibly CUSTOM DELIMITER u8 string */
-      }
-      else {
-	retract(s, 2); /* Definitely an identifier. Retract 8" */
-	state = 70;
-      }
-      
-      break;
-
-    case 72:			/* Possibly CUSTOM DELIMITER string */
-    case 73:
-    case 74:
-      if ((c = nextchar(s)) == 0) {
-	state = 76;
-      }
-      else if (c=='\"') {
-	retract(s, 1); /* Definitely custom delimiter u, U or L string */
-	str_delimiter = NewStringEmpty();
-	state = 1000;
-      }
-      else {
-	if (state==72) {
-	  retract(s, 1); /* Definitely an identifier. Retract ? */
-	}
-	else if (state==73) {
-	  retract(s, 2); /* Definitely an identifier. Retract R? */
-	}
-	else if (state==74) {
-	  retract(s, 3); /* Definitely an identifier. Retract 8R? */
-	}
-	state = 70;
-      }
-      
-      break;
-
-    case 75:			/* Special identifier $ */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_DOLLAR;
-      if (isalnum(c) || (c == '_') || (c == '*') || (c == '&')) {
-	state = 70;
-      } else {
-	retract(s,1);
-	if (Len(s->text) == 1) return SWIG_TOKEN_DOLLAR;
-	state = 76;
-      }
-      break;
-
-    case 76:			/* Identifier or true/false */
-      if (cparse_cplusplus) {
-	if (Strcmp(s->text, "true") == 0)
-	  return SWIG_TOKEN_BOOL;
-	else if (Strcmp(s->text, "false") == 0)
-	  return SWIG_TOKEN_BOOL;
-	}
-      return SWIG_TOKEN_ID;
-      break;
-
-    case 77: /*identifier or wide string literal*/
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_ID;
-      else if (c == '\"') {
-	s->start_line = s->line;
-	Clear(s->text);
-	state = 78;
-      }
-      else if (c == '\'') {
-	s->start_line = s->line;
-	Clear(s->text);
-	state = 79;
-      }
-      else if (isalnum(c) || (c == '_') || (c == '$'))
-	state = 7;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_ID;
-      }
-    break;
-
-    case 78:			/* Processing a wide string literal*/
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated wide string\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '\"') {
-	Delitem(s->text, DOH_END);
-	return SWIG_TOKEN_WSTRING;
-      } else if (c == '\\') {
-	if ((c = nextchar(s)) == 0) {
-	  Swig_error(cparse_file, cparse_start_line, "Unterminated wide string\n");
-	  return SWIG_TOKEN_ERROR;
-	}
-      }
-      break;
-
-    case 79:			/* Processing a wide char literal */
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated wide character constant\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '\'') {
-	Delitem(s->text, DOH_END);
-	return (SWIG_TOKEN_WCHAR);
-      } else if (c == '\\') {
-	if ((c = nextchar(s)) == 0) {
-	  Swig_error(cparse_file, cparse_start_line, "Unterminated wide character literal\n");
-	  return SWIG_TOKEN_ERROR;
-	}
-      }
-      break;
-
-    case 8:			/* A numerical digit */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_INT;
-      if (c == '.') {
-	state = 81;
-      } else if ((c == 'e') || (c == 'E')) {
-	state = 82;
-      } else if ((c == 'f') || (c == 'F')) {
-	Delitem(s->text, DOH_END);
-	return SWIG_TOKEN_FLOAT;
-      } else if (isdigit(c)) {
-	state = 8;
-      } else if ((c == 'l') || (c == 'L')) {
-	state = 87;
-      } else if ((c == 'u') || (c == 'U')) {
-	state = 88;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_INT;
-      }
-      break;
-    case 81:			/* A floating pointer number of some sort */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_DOUBLE;
-      if (isdigit(c))
-	state = 81;
-      else if ((c == 'e') || (c == 'E'))
-	state = 820;
-      else if ((c == 'f') || (c == 'F')) {
-	Delitem(s->text, DOH_END);
-	return SWIG_TOKEN_FLOAT;
-      } else if ((c == 'l') || (c == 'L')) {
-	Delitem(s->text, DOH_END);
-	return SWIG_TOKEN_DOUBLE;
-      } else {
-	retract(s, 1);
-	return (SWIG_TOKEN_DOUBLE);
-      }
-      break;
-    case 82:
-      if ((c = nextchar(s)) == 0) {
-	retract(s, 1);
-	return SWIG_TOKEN_INT;
-      }
-      if ((isdigit(c)) || (c == '-') || (c == '+'))
-	state = 86;
-      else {
-	retract(s, 2);
-	return (SWIG_TOKEN_INT);
-      }
-      break;
-    case 820:
-      /* Like case 82, but we've seen a decimal point. */
-      if ((c = nextchar(s)) == 0) {
-	retract(s, 1);
-	return SWIG_TOKEN_DOUBLE;
-      }
-      if ((isdigit(c)) || (c == '-') || (c == '+'))
-	state = 86;
-      else {
-	retract(s, 2);
-	return (SWIG_TOKEN_DOUBLE);
-      }
-      break;
-    case 83:
-      /* Might be a hexadecimal or octal number */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_INT;
-      if (isdigit(c))
-	state = 84;
-      else if ((c == 'x') || (c == 'X'))
-	state = 85;
-      else if (c == '.')
-	state = 81;
-      else if ((c == 'l') || (c == 'L')) {
-	state = 87;
-      } else if ((c == 'u') || (c == 'U')) {
-	state = 88;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_INT;
-      }
-      break;
-    case 84:
-      /* This is an octal number */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_INT;
-      if (isdigit(c))
-	state = 84;
-      else if ((c == 'l') || (c == 'L')) {
-	state = 87;
-      } else if ((c == 'u') || (c == 'U')) {
-	state = 88;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_INT;
-      }
-      break;
-    case 85:
-      /* This is an hex number */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_INT;
-      if (isxdigit(c))
-	state = 85;
-      else if ((c == 'l') || (c == 'L')) {
-	state = 87;
-      } else if ((c == 'u') || (c == 'U')) {
-	state = 88;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_INT;
-      }
-      break;
-
-    case 86:
-      /* Rest of floating point number */
-
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_DOUBLE;
-      if (isdigit(c))
-	state = 86;
-      else if ((c == 'f') || (c == 'F')) {
-	Delitem(s->text, DOH_END);
-	return SWIG_TOKEN_FLOAT;
-      } else if ((c == 'l') || (c == 'L')) {
-	Delitem(s->text, DOH_END);
-	return SWIG_TOKEN_DOUBLE;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_DOUBLE;
-      }
-      break;
-
-    case 87:
-      /* A long integer of some sort */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_LONG;
-      if ((c == 'u') || (c == 'U')) {
-	return SWIG_TOKEN_ULONG;
-      } else if ((c == 'l') || (c == 'L')) {
-	state = 870;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_LONG;
-      }
-      break;
-
-      /* A long long integer */
-
-    case 870:
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_LONGLONG;
-      if ((c == 'u') || (c == 'U')) {
-	return SWIG_TOKEN_ULONGLONG;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_LONGLONG;
-      }
-
-      /* An unsigned number */
-    case 88:
-
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_UINT;
-      if ((c == 'l') || (c == 'L')) {
-	state = 880;
-      } else {
-	retract(s, 1);
-	return SWIG_TOKEN_UINT;
-      }
-      break;
-
-      /* Possibly an unsigned long long or unsigned long */
-    case 880:
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_ULONG;
-      if ((c == 'l') || (c == 'L'))
-	return SWIG_TOKEN_ULONGLONG;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_ULONG;
-      }
-
-      /* A character constant */
-    case 9:
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated character constant\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '\'') {
-	Delitem(s->text, DOH_END);
-	return (SWIG_TOKEN_CHAR);
-      } else if (c == '\\') {
-	Delitem(s->text, DOH_END);
-	get_escape(s);
-      }
-      break;
-
-      /* A period or maybe a floating point number */
-
-    case 100:
-      if ((c = nextchar(s)) == 0)
-	return (0);
-      if (isdigit(c))
-	state = 81;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_PERIOD;
-      }
-      break;
-
-    case 200:			/* PLUS, PLUSPLUS, PLUSEQUAL */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_PLUS;
-      else if (c == '+')
-	return SWIG_TOKEN_PLUSPLUS;
-      else if (c == '=')
-	return SWIG_TOKEN_PLUSEQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_PLUS;
-      }
-      break;
-
-    case 210:			/* MINUS, MINUSMINUS, MINUSEQUAL, ARROW */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_MINUS;
-      else if (c == '-')
-	return SWIG_TOKEN_MINUSMINUS;
-      else if (c == '=')
-	return SWIG_TOKEN_MINUSEQUAL;
-      else if (c == '>')
-	state = 211;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_MINUS;
-      }
-      break;
-
-    case 211:			/* ARROW, ARROWSTAR */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_ARROW;
-      else if (c == '*')
-	return SWIG_TOKEN_ARROWSTAR;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_ARROW;
-      }
-      break;
-
-
-    case 220:			/* STAR, TIMESEQUAL */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_STAR;
-      else if (c == '=')
-	return SWIG_TOKEN_TIMESEQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_STAR;
-      }
-      break;
-
-    case 230:			/* XOR, XOREQUAL */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_XOR;
-      else if (c == '=')
-	return SWIG_TOKEN_XOREQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_XOR;
-      }
-      break;
-
-    case 240:			/* LSHIFT, LSEQUAL */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_LSHIFT;
-      else if (c == '=')
-	return SWIG_TOKEN_LSEQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_LSHIFT;
-      }
-      break;
-
-    case 250:			/* RSHIFT, RSEQUAL */
-      if ((c = nextchar(s)) == 0)
-	return SWIG_TOKEN_RSHIFT;
-      else if (c == '=')
-	return SWIG_TOKEN_RSEQUAL;
-      else {
-	retract(s, 1);
-	return SWIG_TOKEN_RSHIFT;
-      }
-      break;
-
-
-      /* An illegal character */
-
-      /* Reverse string */
-    case 900:
-      if ((c = nextchar(s)) == 0) {
-	Swig_error(cparse_file, cparse_start_line, "Unterminated character constant\n");
-	return SWIG_TOKEN_ERROR;
-      }
-      if (c == '`') {
-	Delitem(s->text, DOH_END);
-	return (SWIG_TOKEN_RSTRING);
-      }
-      break;
-
-    default:
-      return SWIG_TOKEN_ILLEGAL;
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_token()
- *
- * Real entry point to return the next token. Returns 0 if at end of input.
- * ----------------------------------------------------------------------------- */
-
-int Scanner_token(Scanner *s) {
-  int t;
-  Delete(s->error);
-  if (s->nexttoken >= 0) {
-    t = s->nexttoken;
-    s->nexttoken = -1;
-    return t;
-  }
-  s->start_line = 0;
-  t = look(s);
-  if (!s->start_line) {
-    Setline(s->text,s->line);
-  } else {
-    Setline(s->text,s->start_line);
-  }
-  return t;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_text()
- *
- * Return the lexene associated with the last returned token.
- * ----------------------------------------------------------------------------- */
-
-String *Scanner_text(Scanner *s) {
-  return s->text;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_skip_line()
- *
- * Skips to the end of a line
- * ----------------------------------------------------------------------------- */
-
-void Scanner_skip_line(Scanner *s) {
-  char c;
-  int done = 0;
-  Clear(s->text);
-  Setfile(s->text, Getfile(s->str));
-  Setline(s->text, s->line);
-  while (!done) {
-    if ((c = nextchar(s)) == 0)
-      return;
-    if (c == '\\') {
-      nextchar(s);
-    } else if (c == '\n') {
-      done = 1;
-    }
-  }
-  return;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_skip_balanced()
- *
- * Skips a piece of code enclosed in begin/end symbols such as '{...}' or
- * (...).  Ignores symbols inside comments or strings.
- * ----------------------------------------------------------------------------- */
-
-int Scanner_skip_balanced(Scanner *s, int startchar, int endchar) {
-  char c;
-  int num_levels = 1;
-  int state = 0;
-  char temp[2] = { 0, 0 };
-  String *locator = 0;
-  temp[0] = (char) startchar;
-  Clear(s->text);
-  Setfile(s->text, Getfile(s->str));
-  Setline(s->text, s->line);
-
-  Append(s->text, temp);
-  while (num_levels > 0) {
-    if ((c = nextchar(s)) == 0) {
-      Delete(locator);
-      return -1;
-    }
-    switch (state) {
-    case 0:
-      if (c == startchar)
-	num_levels++;
-      else if (c == endchar)
-	num_levels--;
-      else if (c == '/')
-	state = 10;
-      else if (c == '\"')
-	state = 20;
-      else if (c == '\'')
-	state = 30;
-      break;
-    case 10:
-      if (c == '/')
-	state = 11;
-      else if (c == '*')
-	state = 12;
-      else if (c == startchar) {
-	state = 0;
-	num_levels++;
-      }
-      else
-	state = 0;
-      break;
-    case 11:
-      if (c == '\n')
-	state = 0;
-      else
-	state = 11;
-      break;
-    case 12: /* first character inside C comment */
-      if (c == '*')
-	state = 14;
-      else if (c == '@')
-	state = 40;
-      else
-	state = 13;
-      break;
-    case 13:
-      if (c == '*')
-	state = 14;
-      break;
-    case 14: /* possible end of C comment */
-      if (c == '*')
-	state = 14;
-      else if (c == '/')
-	state = 0;
-      else
-	state = 13;
-      break;
-    case 20:
-      if (c == '\"')
-	state = 0;
-      else if (c == '\\')
-	state = 21;
-      break;
-    case 21:
-      state = 20;
-      break;
-    case 30:
-      if (c == '\'')
-	state = 0;
-      else if (c == '\\')
-	state = 31;
-      break;
-    case 31:
-      state = 30;
-      break;
-    /* 40-45 SWIG locator checks - a C comment with contents starting: @SWIG */
-    case 40:
-      state = (c == 'S') ? 41 : (c == '*') ? 14 : 13;
-      break;
-    case 41:
-      state = (c == 'W') ? 42 : (c == '*') ? 14 : 13;
-      break;
-    case 42:
-      state = (c == 'I') ? 43 : (c == '*') ? 14 : 13;
-      break;
-    case 43:
-      state = (c == 'G') ? 44 : (c == '*') ? 14 : 13;
-      if (c == 'G') {
-	Delete(locator);
-	locator = NewString("/*@SWIG");
-      }
-      break;
-    case 44:
-      if (c == '*')
-	state = 45;
-      Putc(c, locator);
-      break;
-    case 45: /* end of SWIG locator in C comment */
-      if (c == '/') {
-	state = 0;
-	Putc(c, locator);
-	Scanner_locator(s, locator);
-      } else {
-	/* malformed locator */
-	state = (c == '*') ? 14 : 13;
-      }
-      break;
-    default:
-      break;
-    }
-  }
-  Delete(locator);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Scanner_get_raw_text_balanced()
- *
- * Returns raw text between 2 braces, does not change scanner state in any way
- * ----------------------------------------------------------------------------- */
-
-String *Scanner_get_raw_text_balanced(Scanner *s, int startchar, int endchar) {
-  String *result = 0;
-  char c;
-  int old_line = s->line;
-  String *old_text = Copy(s->text);
-  long position = Tell(s->str);
-
-  int num_levels = 1;
-  int state = 0;
-  char temp[2] = { 0, 0 };
-  temp[0] = (char) startchar;
-  Clear(s->text);
-  Setfile(s->text, Getfile(s->str));
-  Setline(s->text, s->line);
-  Append(s->text, temp);
-  while (num_levels > 0) {
-    if ((c = nextchar(s)) == 0) {
-      Clear(s->text);
-      Append(s->text, old_text);
-      Delete(old_text);
-      s->line = old_line;
-      return 0;
-    }
-    switch (state) {
-    case 0:
-      if (c == startchar)
-	num_levels++;
-      else if (c == endchar)
-	num_levels--;
-      else if (c == '/')
-	state = 10;
-      else if (c == '\"')
-	state = 20;
-      else if (c == '\'')
-	state = 30;
-      break;
-    case 10:
-      if (c == '/')
-	state = 11;
-      else if (c == '*')
-	state = 12;
-      else if (c == startchar) {
-	state = 0;
-	num_levels++;
-      }
-      else
-	state = 0;
-      break;
-    case 11:
-      if (c == '\n')
-	state = 0;
-      else
-	state = 11;
-      break;
-    case 12: /* first character inside C comment */
-      if (c == '*')
-	state = 14;
-      else
-	state = 13;
-      break;
-    case 13:
-      if (c == '*')
-	state = 14;
-      break;
-    case 14: /* possible end of C comment */
-      if (c == '*')
-	state = 14;
-      else if (c == '/')
-	state = 0;
-      else
-	state = 13;
-      break;
-    case 20:
-      if (c == '\"')
-	state = 0;
-      else if (c == '\\')
-	state = 21;
-      break;
-    case 21:
-      state = 20;
-      break;
-    case 30:
-      if (c == '\'')
-	state = 0;
-      else if (c == '\\')
-	state = 31;
-      break;
-    case 31:
-      state = 30;
-      break;
-    default:
-      break;
-    }
-  }
-  Seek(s->str, position, SEEK_SET);
-  result = Copy(s->text);
-  Clear(s->text);
-  Append(s->text, old_text);
-  Delete(old_text);
-  s->line = old_line;
-  return result;
-}
-/* -----------------------------------------------------------------------------
- * Scanner_isoperator()
- *
- * Returns 0 or 1 depending on whether or not a token corresponds to a C/C++
- * operator.
- * ----------------------------------------------------------------------------- */
-
-int Scanner_isoperator(int tokval) {
-  if (tokval >= 100) return 1;
-  return 0;
-}
-
-/* ----------------------------------------------------------------------
- * locator()
- *
- * Support for locator strings. These are strings of the form
- * @SWIG:filename,line,id@ emitted by the SWIG preprocessor.  They
- * are primarily used for macro line number reporting.
- * We just use the locator to mark when to activate/deactivate linecounting.
- * ---------------------------------------------------------------------- */
-
-
-void Scanner_locator(Scanner *s, String *loc) {
-  static Locator *locs = 0;
-  static int expanding_macro = 0;
-
-  if (!follow_locators) {
-    if (Equal(loc, "/*@SWIG@*/")) {
-      /* End locator. */
-      if (expanding_macro)
-	--expanding_macro;
-    } else {
-      /* Begin locator. */
-      ++expanding_macro;
-    }
-    /* Freeze line number processing in Scanner */
-    freeze_line(s,expanding_macro);
-  } else {
-    int c;
-    Locator *l;
-    (void)Seek(loc, 7, SEEK_SET);
-    c = Getc(loc);
-    if (c == '@') {
-      /* Empty locator.  We pop the last location off */
-      if (locs) {
-	Scanner_set_location(s, locs->filename, locs->line_number);
-	cparse_file = locs->filename;
-	cparse_line = locs->line_number;
-	l = locs->next;
-	free(locs);
-	locs = l;
-      }
-      return;
-    }
-
-    /* We're going to push a new location */
-    l = (Locator *) malloc(sizeof(Locator));
-    l->filename = cparse_file;
-    l->line_number = cparse_line;
-    l->next = locs;
-    locs = l;
-
-    /* Now, parse the new location out of the locator string */
-    {
-      String *fn = NewStringEmpty();
-      /*      Putc(c, fn); */
-      
-      while ((c = Getc(loc)) != EOF) {
-	if ((c == '@') || (c == ','))
-	  break;
-	Putc(c, fn);
-      }
-      cparse_file = Swig_copy_string(Char(fn));
-      Clear(fn);
-      cparse_line = 1;
-      /* Get the line number */
-      while ((c = Getc(loc)) != EOF) {
-	if ((c == '@') || (c == ','))
-	  break;
-	Putc(c, fn);
-      }
-      cparse_line = atoi(Char(fn));
-      Clear(fn);
-      
-      /* Get the rest of it */
-      while ((c = Getc(loc)) != EOF) {
-	if (c == '@')
-	  break;
-	Putc(c, fn);
-      }
-      /*  Swig_diagnostic(cparse_file, cparse_line, "Scanner_set_location\n"); */
-      Scanner_set_location(s, cparse_file, cparse_line);
-      Delete(fn);
-    }
-  }
-}
-
-void Swig_cparse_follow_locators(int v) {
-   follow_locators = v;
-}
-
-
diff --git a/dependencies2013/win32/swig/Source/Swig/stype.c b/dependencies2013/win32/swig/Source/Swig/stype.c
deleted file mode 100644
index a5722274..00000000
--- a/dependencies2013/win32/swig/Source/Swig/stype.c
+++ /dev/null
@@ -1,1302 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * stype.c
- *
- * This file provides general support for datatypes that are encoded in
- * the form of simple strings.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-#include <ctype.h>
-
-/* -----------------------------------------------------------------------------
- * Synopsis
- *
- * The purpose of this module is to provide a general purpose type representation
- * based on simple text strings. 
- *
- * General idea:
- *
- * Types are represented by a base type (e.g., "int") and a collection of
- * type operators applied to the base (e.g., pointers, arrays, etc...).
- *
- * Encoding:
- *
- * Types are encoded as strings of type constructors such as follows:
- *
- *        String Encoding                 C Example
- *        ---------------                 ---------
- *        p.p.int                         int **
- *        a(300).a(400).int               int [300][400]
- *        p.q(const).char                 char const *
- *
- * All type constructors are denoted by a trailing '.':
- * 
- *  'p.'                = Pointer (*)
- *  'r.'                = Reference (&)
- *  'z.'                = Rvalue reference (&&)
- *  'a(n).'             = Array of size n  [n]
- *  'f(..,..).'         = Function with arguments  (args)
- *  'q(str).'           = Qualifier (such as const or volatile) (const, volatile)
- *  'm(qual).'          = Pointer to member (qual::*)
- *
- * The encoding follows the order that you might describe a type in words.
- * For example "p.a(200).int" is "A pointer to array of int's" and
- * "p.q(const).char" is "a pointer to a const char".
- *
- * This representation of types is fairly convenient because ordinary string
- * operations can be used for type manipulation. For example, a type could be
- * formed by combining two strings such as the following:
- *
- *        "p.p." + "a(400).int" = "p.p.a(400).int"
- *
- * Similarly, one could strip a 'const' declaration from a type doing something
- * like this:
- *
- *        Replace(t,"q(const).","",DOH_REPLACE_ANY)
- *
- * For the most part, this module tries to minimize the use of special
- * characters (*, [, <, etc...) in its type encoding.  One reason for this
- * is that SWIG might be extended to encode data in formats such as XML
- * where you might want to do this:
- * 
- *      <function>
- *         <type>p.p.int</type>
- *         ...
- *      </function>
- *
- * Or alternatively,
- *
- *      <function type="p.p.int" ...>blah</function>
- *
- * In either case, it's probably best to avoid characters such as '&', '*', or '<'.
- *
- * Why not use C syntax?  Well, C syntax is fairly complicated to parse
- * and not particularly easy to manipulate---especially for adding, deleting and
- * composing type constructors.  The string representation presented here makes
- * this pretty easy.
- *
- * Why not use a bunch of nested data structures?  Are you kidding? How
- * would that be easier to use than a few simple string operations? 
- * ----------------------------------------------------------------------------- */
-
-
-SwigType *NewSwigType(int t) {
-  switch (t) {
-  case T_BOOL:
-    return NewString("bool");
-    break;
-  case T_INT:
-    return NewString("int");
-    break;
-  case T_UINT:
-    return NewString("unsigned int");
-    break;
-  case T_SHORT:
-    return NewString("short");
-    break;
-  case T_USHORT:
-    return NewString("unsigned short");
-    break;
-  case T_LONG:
-    return NewString("long");
-    break;
-  case T_ULONG:
-    return NewString("unsigned long");
-    break;
-  case T_FLOAT:
-    return NewString("float");
-    break;
-  case T_DOUBLE:
-    return NewString("double");
-    break;
-  case T_COMPLEX:
-    return NewString("complex");
-    break;
-  case T_CHAR:
-    return NewString("char");
-    break;
-  case T_SCHAR:
-    return NewString("signed char");
-    break;
-  case T_UCHAR:
-    return NewString("unsigned char");
-    break;
-  case T_STRING: {
-      SwigType *t = NewString("char");
-      SwigType_add_qualifier(t, "const");
-      SwigType_add_pointer(t);
-      return t;
-      break;
-    }
-  case T_WCHAR:
-    return NewString("wchar_t");
-    break;
-  case T_WSTRING: {
-    SwigType *t = NewString("wchar_t");
-    SwigType_add_pointer(t);
-    return t;
-    break;
-  }
-  case T_LONGLONG:
-    return NewString("long long");
-    break;
-  case T_ULONGLONG:
-    return NewString("unsigned long long");
-    break;
-  case T_VOID:
-    return NewString("void");
-    break;
-  case T_AUTO:
-    return NewString("auto");
-    break;
-  default:
-    break;
-  }
-  return NewStringEmpty();
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_push()
- *
- * Push a type constructor onto the type
- * ----------------------------------------------------------------------------- */
-
-void SwigType_push(SwigType *t, String *cons) {
-  if (!cons)
-    return;
-  if (!Len(cons))
-    return;
-
-  if (Len(t)) {
-    char *c = Char(cons);
-    if (c[strlen(c) - 1] != '.')
-      Insert(t, 0, ".");
-  }
-  Insert(t, 0, cons);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_ispointer_return()
- *
- * Testing functions for querying a raw datatype
- * ----------------------------------------------------------------------------- */
-
-int SwigType_ispointer_return(const SwigType *t) {
-  char *c;
-  int idx;
-  if (!t)
-    return 0;
-  c = Char(t);
-  idx = (int)strlen(c) - 4;
-  if (idx >= 0) {
-    return (strcmp(c + idx, ").p.") == 0);
-  }
-  return 0;
-}
-
-int SwigType_isreference_return(const SwigType *t) {
-  char *c;
-  int idx;
-  if (!t)
-    return 0;
-  c = Char(t);
-  idx = (int)strlen(c) - 4;
-  if (idx >= 0) {
-    return (strcmp(c + idx, ").r.") == 0);
-  }
-  return 0;
-}
-
-int SwigType_isconst(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "q(", 2) == 0) {
-    String *q = SwigType_parm(t);
-    if (strstr(Char(q), "const")) {
-      Delete(q);
-      return 1;
-    }
-    Delete(q);
-  }
-  /* Hmmm. Might be const through a typedef */
-  if (SwigType_issimple(t)) {
-    int ret;
-    SwigType *td = SwigType_typedef_resolve(t);
-    if (td) {
-      ret = SwigType_isconst(td);
-      Delete(td);
-      return ret;
-    }
-  }
-  return 0;
-}
-
-int SwigType_ismutable(const SwigType *t) {
-  int r;
-  SwigType *qt = SwigType_typedef_resolve_all(t);
-  if (SwigType_isreference(qt) || SwigType_isrvalue_reference(qt) || SwigType_isarray(qt)) {
-    Delete(SwigType_pop(qt));
-  }
-  r = SwigType_isconst(qt);
-  Delete(qt);
-  return r ? 0 : 1;
-}
-
-int SwigType_isenum(const SwigType *t) {
-  char *c = Char(t);
-  if (!t)
-    return 0;
-  if (strncmp(c, "enum ", 5) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-int SwigType_issimple(const SwigType *t) {
-  char *c = Char(t);
-  if (!t)
-    return 0;
-  while (*c) {
-    if (*c == '<') {
-      int nest = 1;
-      c++;
-      while (*c && nest) {
-	if (*c == '<')
-	  nest++;
-	if (*c == '>')
-	  nest--;
-	c++;
-      }
-      c--;
-    }
-    if (*c == '.')
-      return 0;
-    c++;
-  }
-  return 1;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_default_create()
- *
- * Create the default type for this datatype. This takes a type and strips it
- * down to a generic form first by resolving all typedefs.
- *
- * Rules:
- *     Pointers:              p.SWIGTYPE
- *     References:            r.SWIGTYPE
- *     Arrays no dimension:   a().SWIGTYPE
- *     Arrays with dimension: a(ANY).SWIGTYPE
- *     Member pointer:        m(CLASS).SWIGTYPE
- *     Function pointer:      f(ANY).SWIGTYPE
- *     Enums:                 enum SWIGTYPE
- *     Types:                 SWIGTYPE
- *
- * Examples (also see SwigType_default_deduce):
- *
- *  int [2][4]
- *    a(2).a(4).int
- *    a(ANY).a(ANY).SWIGTYPE
- *
- *  struct A {};
- *  typedef A *Aptr;
- *  Aptr const &
- *    r.q(const).Aptr
- *    r.q(const).p.SWIGTYPE
- *
- *  enum E {e1, e2};
- *  enum E const &
- *    r.q(const).enum E
- *    r.q(const).enum SWIGTYPE
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_default_create(const SwigType *ty) {
-  SwigType *r = 0;
-  List *l;
-  Iterator it;
-  int numitems;
-
-  if (!SwigType_isvarargs(ty)) {
-    SwigType *t = SwigType_typedef_resolve_all(ty);
-    r = NewStringEmpty();
-    l = SwigType_split(t);
-    numitems = Len(l);
-
-    if (numitems >= 1) {
-      String *last_subtype = Getitem(l, numitems-1);
-      if (SwigType_isenum(last_subtype))
-	Setitem(l, numitems-1, NewString("enum SWIGTYPE"));
-      else
-	Setitem(l, numitems-1, NewString("SWIGTYPE"));
-    }
-
-    for (it = First(l); it.item; it = Next(it)) {
-      String *subtype = it.item;
-      if (SwigType_isarray(subtype)) {
-	if (Equal(subtype, "a()."))
-	  Append(r, NewString("a()."));
-	else
-	  Append(r, NewString("a(ANY)."));
-      } else if (SwigType_isfunction(subtype)) {
-	Append(r, NewString("f(ANY).SWIGTYPE"));
-	break;
-      } else if (SwigType_ismemberpointer(subtype)) {
-	Append(r, NewString("m(CLASS).SWIGTYPE"));
-	break;
-      } else {
-	Append(r, subtype);
-      }
-    }
-
-    Delete(l);
-    Delete(t);
-  }
-
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_default_deduce()
- *
- * This function implements type deduction used in the typemap matching rules
- * and is very close to the type deduction used in partial template class
- * specialization matching in that the most specialized type is always chosen.
- * SWIGTYPE is used as the generic type. The basic idea is to repeatedly call
- * this function to find a deduced type unless until nothing matches.
- *
- * The type t must have already been converted to the default type via a call to
- * SwigType_default_create() before calling this function.
- *
- * Example deductions (matching the examples described in SwigType_default_create),
- * where the most specialized matches are highest in the list:
- *
- *    a(ANY).a(ANY).SWIGTYPE
- *    a(ANY).a().SWIGTYPE
- *    a(ANY).p.SWIGTYPE
- *    a(ANY).SWIGTYPE
- *    a().SWIGTYPE
- *    p.SWIGTYPE
- *    SWIGTYPE
- *
- *    r.q(const).p.SWIGTYPE
- *    r.q(const).SWIGTYPE
- *    r.SWIGTYPE
- *    SWIGTYPE
- *
- *    r.q(const).enum SWIGTYPE
- *    r.enum SWIGTYPE
- *    r.SWIGTYPE
- *    SWIGTYPE
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_default_deduce(const SwigType *t) {
-  SwigType *r = NewStringEmpty();
-  List *l;
-  Iterator it;
-  int numitems;
-
-  l = SwigType_split(t);
-
-  numitems = Len(l);
-  if (numitems >= 1) {
-    String *last_subtype = Getitem(l, numitems-1);
-    int is_enum = SwigType_isenum(last_subtype);
-
-    if (numitems >=2 ) {
-      String *subtype = Getitem(l, numitems-2); /* last but one */
-      if (SwigType_isarray(subtype)) {
-	if (is_enum) {
-	  /* enum deduction, enum SWIGTYPE => SWIGTYPE */
-	  Setitem(l, numitems-1, NewString("SWIGTYPE"));
-	} else {
-	  /* array deduction, a(ANY). => a(). => p. */
-	  String *deduced_subtype = 0;
-	  if (Strcmp(subtype, "a().") == 0) {
-	    deduced_subtype = NewString("p.");
-	  } else if (Strcmp(subtype, "a(ANY).") == 0) {
-	    deduced_subtype = NewString("a().");
-	  } else {
-	    assert(0);
-	  }
-	  Setitem(l, numitems-2, deduced_subtype);
-	}
-      } else if (SwigType_ismemberpointer(subtype)) {
-	/* member pointer deduction, m(CLASS). => p. */
-	Setitem(l, numitems-2, NewString("p."));
-      } else if (is_enum && !SwigType_isqualifier(subtype)) {
-	/* enum deduction, enum SWIGTYPE => SWIGTYPE */
-	Setitem(l, numitems-1, NewString("SWIGTYPE"));
-      } else {
-	/* simple type deduction, eg, r.p.p. => r.p. */
-	/* also function pointers eg, p.f(ANY). => p. */
-	Delitem(l, numitems-2);
-      }
-    } else {
-      if (is_enum) {
-	/* enum deduction, enum SWIGTYPE => SWIGTYPE */
-	Setitem(l, numitems-1, NewString("SWIGTYPE"));
-      } else {
-	/* delete the only item, we are done with deduction */
-	Delitem(l, 0);
-      }
-    }
-  } else {
-    assert(0);
-  }
-
-  for (it = First(l); it.item; it = Next(it)) {
-    Append(r, it.item);
-  }
-
-  if (Len(r) == 0) {
-    Delete(r);
-    r = 0;
-  }
-
-  Delete(l);
-  return r;
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_namestr()
- *
- * Returns a string of the base type.  Takes care of template expansions
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_namestr(const SwigType *t) {
-  String *r;
-  String *suffix;
-  List *p;
-  int i, sz;
-  char *d = Char(t);
-  char *c = strstr(d, "<(");
-
-  if (!c || !strstr(c + 2, ")>"))
-    return NewString(t);
-
-  r = NewStringWithSize(d, (int)(c - d));
-  if (*(c - 1) == '<')
-    Putc(' ', r);
-  Putc('<', r);
-
-  p = SwigType_parmlist(c + 1);
-  sz = Len(p);
-  for (i = 0; i < sz; i++) {
-    String *str = SwigType_str(Getitem(p, i), 0);
-    /* Avoid creating a <: token, which is the same as [ in C++ - put a space after '<'. */
-    if (i == 0 && Len(str))
-      Putc(' ', r);
-    Append(r, str);
-    if ((i + 1) < sz)
-      Putc(',', r);
-    Delete(str);
-  }
-  Putc(' ', r);
-  Putc('>', r);
-  suffix = SwigType_templatesuffix(t);
-  if (Len(suffix) > 0) {
-    String *suffix_namestr = SwigType_namestr(suffix);
-    Append(r, suffix_namestr);
-    Delete(suffix_namestr);
-  } else {
-    Append(r, suffix);
-  }
-  Delete(suffix);
-  Delete(p);
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_str()
- *
- * Create a C string representation of a datatype.
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_str(const SwigType *s, const_String_or_char_ptr id) {
-  String *result;
-  String *element = 0;
-  String *nextelement;
-  String *forwardelement;
-  List *elements;
-  int nelements, i;
-
-  if (id) {
-    /* stringify the id expanding templates, for example when the id is a fully qualified templated class name */
-    String *id_str = NewString(id); /* unfortunate copy due to current const limitations */
-    result = SwigType_str(id_str, 0);
-    Delete(id_str);
-  } else {
-    result = NewStringEmpty();
-  }
-
-  elements = SwigType_split(s);
-  nelements = Len(elements);
-
-  if (nelements > 0) {
-    element = Getitem(elements, 0);
-  }
-  /* Now, walk the type list and start emitting */
-  for (i = 0; i < nelements; i++) {
-    if (i < (nelements - 1)) {
-      nextelement = Getitem(elements, i + 1);
-      forwardelement = nextelement;
-      if (SwigType_isqualifier(nextelement)) {
-	if (i < (nelements - 2))
-	  forwardelement = Getitem(elements, i + 2);
-      }
-    } else {
-      nextelement = 0;
-      forwardelement = 0;
-    }
-    if (SwigType_isqualifier(element)) {
-      DOH *q = 0;
-      q = SwigType_parm(element);
-      Insert(result, 0, " ");
-      Insert(result, 0, q);
-      Delete(q);
-    } else if (SwigType_ispointer(element)) {
-      Insert(result, 0, "*");
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-    } else if (SwigType_ismemberpointer(element)) {
-      String *q;
-      q = SwigType_parm(element);
-      Insert(result, 0, "::*");
-      Insert(result, 0, q);
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-      Delete(q);
-    } else if (SwigType_isreference(element)) {
-      Insert(result, 0, "&");
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-    } else if (SwigType_isrvalue_reference(element)) {
-      Insert(result, 0, "&&");
-      if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-    } else if (SwigType_isarray(element)) {
-      DOH *size;
-      Append(result, "[");
-      size = SwigType_parm(element);
-      Append(result, size);
-      Append(result, "]");
-      Delete(size);
-    } else if (SwigType_isfunction(element)) {
-      DOH *parms, *p;
-      int j, plen;
-      Append(result, "(");
-      parms = SwigType_parmlist(element);
-      plen = Len(parms);
-      for (j = 0; j < plen; j++) {
-	p = SwigType_str(Getitem(parms, j), 0);
-	Append(result, p);
-	if (j < (plen - 1))
-	  Append(result, ",");
-      }
-      Append(result, ")");
-      Delete(parms);
-    } else {
-      if (strcmp(Char(element), "v(...)") == 0) {
-	Insert(result, 0, "...");
-      } else {
-	String *bs = SwigType_namestr(element);
-	Insert(result, 0, " ");
-	Insert(result, 0, bs);
-	Delete(bs);
-      }
-    }
-    element = nextelement;
-  }
-  Delete(elements);
-  Chop(result);
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_ltype(const SwigType *ty)
- *
- * Create a locally assignable type
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_ltype(const SwigType *s) {
-  String *result;
-  String *element;
-  SwigType *td, *tc = 0;
-  List *elements;
-  int nelements, i;
-  int firstarray = 1;
-  int notypeconv = 0;
-
-  result = NewStringEmpty();
-  tc = Copy(s);
-  /* Nuke all leading qualifiers */
-  while (SwigType_isqualifier(tc)) {
-    Delete(SwigType_pop(tc));
-  }
-  if (SwigType_issimple(tc)) {
-    /* Resolve any typedef definitions */
-    SwigType *tt = Copy(tc);
-    td = 0;
-    while ((td = SwigType_typedef_resolve(tt))) {
-      if (td && (SwigType_isconst(td) || SwigType_isarray(td) || SwigType_isreference(td) || SwigType_isrvalue_reference(td))) {
-	/* We need to use the typedef type */
-	Delete(tt);
-	break;
-      } else if (td) {
-	Delete(tt);
-	tt = td;
-      }
-    }
-    if (td) {
-      Delete(tc);
-      tc = td;
-    }
-  }
-  elements = SwigType_split(tc);
-  nelements = Len(elements);
-
-  /* Now, walk the type list and start emitting */
-  for (i = 0; i < nelements; i++) {
-    element = Getitem(elements, i);
-    /* when we see a function, we need to preserve the following types */
-    if (SwigType_isfunction(element)) {
-      notypeconv = 1;
-    }
-    if (SwigType_isqualifier(element)) {
-      /* Do nothing. Ignore */
-    } else if (SwigType_ispointer(element)) {
-      Append(result, element);
-      firstarray = 0;
-    } else if (SwigType_ismemberpointer(element)) {
-      Append(result, element);
-      firstarray = 0;
-    } else if (SwigType_isreference(element)) {
-      if (notypeconv) {
-	Append(result, element);
-      } else {
-	Append(result, "p.");
-      }
-      firstarray = 0;
-    } else if (SwigType_isrvalue_reference(element)) {
-      if (notypeconv) {
-	Append(result, element);
-      } else {
-	Append(result, "p.");
-      }
-      firstarray = 0;
-    } else if (SwigType_isarray(element) && firstarray) {
-      if (notypeconv) {
-	Append(result, element);
-      } else {
-	Append(result, "p.");
-      }
-      firstarray = 0;
-    } else if (SwigType_isenum(element)) {
-      int anonymous_enum = (Cmp(element, "enum ") == 0);
-      if (notypeconv || !anonymous_enum) {
-	Append(result, element);
-      } else {
-	Append(result, "int");
-      }
-    } else {
-      Append(result, element);
-    }
-  }
-  Delete(elements);
-  Delete(tc);
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_lstr(DOH *s, DOH *id)
- *
- * Produces a type-string that is suitable as a lvalue in an expression.
- * That is, a type that can be freely assigned a value without violating
- * any C assignment rules.
- *
- *      -   Qualifiers such as 'const' and 'volatile' are stripped.
- *      -   Arrays are converted into a *single* pointer (i.e.,
- *          double [][] becomes double *).
- *      -   References are converted into a pointer.
- *      -   Typedef names that refer to read-only types will be replaced
- *          with an equivalent assignable version.
- * -------------------------------------------------------------------- */
-
-String *SwigType_lstr(const SwigType *s, const_String_or_char_ptr id) {
-  String *result;
-  SwigType *tc;
-
-  tc = SwigType_ltype(s);
-  result = SwigType_str(tc, id);
-  Delete(tc);
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_rcaststr()
- *
- * Produces a casting string that maps the type returned by lstr() to the real 
- * datatype printed by str().
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_rcaststr(const SwigType *s, const_String_or_char_ptr name) {
-  String *result, *cast;
-  String *element = 0;
-  String *nextelement;
-  String *forwardelement;
-  SwigType *td, *tc = 0;
-  const SwigType *rs;
-  List *elements;
-  int nelements, i;
-  int clear = 1;
-  int firstarray = 1;
-  int isreference = 0;
-  int isfunction = 0;
-
-  result = NewStringEmpty();
-
-  if (SwigType_isconst(s)) {
-    tc = Copy(s);
-    Delete(SwigType_pop(tc));
-    rs = tc;
-  } else {
-    rs = s;
-  }
-
-  if ((SwigType_isconst(rs) || SwigType_isarray(rs) || SwigType_isreference(rs) || SwigType_isrvalue_reference(rs))) {
-    td = 0;
-  } else {
-    td = SwigType_typedef_resolve(rs);
-  }
-
-  if (td) {
-    if ((SwigType_isconst(td) || SwigType_isarray(td) || SwigType_isreference(td) || SwigType_isrvalue_reference(td))) {
-      elements = SwigType_split(td);
-    } else {
-      elements = SwigType_split(rs);
-    }
-    Delete(td);
-  } else {
-    elements = SwigType_split(rs);
-  }
-  nelements = Len(elements);
-  if (nelements > 0) {
-    element = Getitem(elements, 0);
-  }
-  /* Now, walk the type list and start emitting */
-  for (i = 0; i < nelements; i++) {
-    if (i < (nelements - 1)) {
-      nextelement = Getitem(elements, i + 1);
-      forwardelement = nextelement;
-      if (SwigType_isqualifier(nextelement)) {
-	if (i < (nelements - 2))
-	  forwardelement = Getitem(elements, i + 2);
-      }
-    } else {
-      nextelement = 0;
-      forwardelement = 0;
-    }
-    if (SwigType_isqualifier(element)) {
-      DOH *q = 0;
-      q = SwigType_parm(element);
-      Insert(result, 0, " ");
-      Insert(result, 0, q);
-      Delete(q);
-      clear = 0;
-    } else if (SwigType_ispointer(element)) {
-      Insert(result, 0, "*");
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-      firstarray = 0;
-    } else if (SwigType_ismemberpointer(element)) {
-      String *q;
-      Insert(result, 0, "::*");
-      q = SwigType_parm(element);
-      Insert(result, 0, q);
-      Delete(q);
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-      firstarray = 0;
-    } else if (SwigType_isreference(element)) {
-      Insert(result, 0, "&");
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-      if (!isfunction)
-	isreference = 1;
-    } else if (SwigType_isrvalue_reference(element)) {
-      Insert(result, 0, "&&");
-      if ((forwardelement) && ((SwigType_isfunction(forwardelement) || (SwigType_isarray(forwardelement))))) {
-	Insert(result, 0, "(");
-	Append(result, ")");
-      }
-      if (!isfunction)
-	isreference = 1;
-      clear = 0;
-    } else if (SwigType_isarray(element)) {
-      DOH *size;
-      if (firstarray && !isreference) {
-	Append(result, "(*)");
-	firstarray = 0;
-      } else {
-	Append(result, "[");
-	size = SwigType_parm(element);
-	Append(result, size);
-	Append(result, "]");
-	Delete(size);
-	clear = 0;
-      }
-    } else if (SwigType_isfunction(element)) {
-      DOH *parms, *p;
-      int j, plen;
-      Append(result, "(");
-      parms = SwigType_parmlist(element);
-      plen = Len(parms);
-      for (j = 0; j < plen; j++) {
-	p = SwigType_str(Getitem(parms, j), 0);
-	Append(result, p);
-	Delete(p);
-	if (j < (plen - 1))
-	  Append(result, ",");
-      }
-      Append(result, ")");
-      Delete(parms);
-      isfunction = 1;
-    } else {
-      String *bs = SwigType_namestr(element);
-      Insert(result, 0, " ");
-      Insert(result, 0, bs);
-      Delete(bs);
-    }
-    element = nextelement;
-  }
-  Delete(elements);
-  if (clear) {
-    cast = NewStringEmpty();
-  } else {
-    cast = NewStringf("(%s)", result);
-  }
-  if (name) {
-    if (isreference) {
-      Append(cast, "*");
-    }
-    Append(cast, name);
-  }
-  Delete(result);
-  Delete(tc);
-  return cast;
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_lcaststr()
- *
- * Casts a variable from the real type to the local datatype.
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_lcaststr(const SwigType *s, const_String_or_char_ptr name) {
-  String *result;
-
-  result = NewStringEmpty();
-
-  if (SwigType_isarray(s)) {
-    String *lstr = SwigType_lstr(s, 0);
-    Printf(result, "(%s)%s", lstr, name);
-    Delete(lstr);
-  } else if (SwigType_isreference(s)) {
-    String *str = SwigType_str(s, 0);
-    Printf(result, "(%s)", str);
-    Delete(str);
-    if (name)
-      Append(result, name);
-  } else if (SwigType_isrvalue_reference(s)) {
-    String *str = SwigType_str(s, 0);
-    Printf(result, "(%s)", str);
-    Delete(str);
-    if (name)
-      Append(result, name);
-  } else if (SwigType_isqualifier(s)) {
-    String *lstr = SwigType_lstr(s, 0);
-    Printf(result, "(%s)%s", lstr, name);
-    Delete(lstr);
-  } else {
-    if (name)
-      Append(result, name);
-  }
-  return result;
-}
-
-#if 0
-/* Alternative implementation for manglestr_default. Mangling is similar to the original
-   except for a few subtle differences for example in templates:
-    namespace foo {
-      template<class T> class bar {};
-      typedef int Integer;
-      void test2(bar<Integer *> *x);
-    }
-    Mangling is more consistent and changes from 
-    _p_foo__barT_int_p_t to 
-    _p_foo__barT_p_int_t.
-*/
-static void mangle_stringcopy(String *destination, const char *source, int count) {
-  while (count-- > 0) {
-    char newc = '_';
-    if (!(*source == '.' || *source == ':' || *source == ' '))
-      newc = *source;
-    /* TODO: occasionally '*' or numerics need converting to '_', eg in array dimensions and template expressions */
-    Putc(newc, destination);
-    source++;
-  }
-}
-
-static void mangle_subtype(String *mangled, SwigType *s);
-
-/* -----------------------------------------------------------------------------
- * mangle_namestr()
- *
- * Mangles a type taking care of template expansions. Similar to SwigType_namestr().
- * The type may include a trailing '.', for example "p."
- * ----------------------------------------------------------------------------- */
-
-static void mangle_namestr(String *mangled, SwigType *t) {
-  int length = Len(t);
-  if (SwigType_isqualifier(t)) {
-    Append(mangled, "q_");
-    mangle_stringcopy(mangled, Char(t)+2, length-4);
-    Append(mangled, "__");
-  } else if (SwigType_ismemberpointer(t)) {
-    Append(mangled, "m_");
-    mangle_stringcopy(mangled, Char(t)+2, length-4);
-    Append(mangled, "__");
-  } else if (SwigType_isarray(t)) {
-    Append(mangled, "a_");
-    mangle_stringcopy(mangled, Char(t)+2, length-4);
-    Append(mangled, "__");
-  } else if (SwigType_isfunction(t)) {
-    List *p = SwigType_parmlist(t);
-    int sz = Len(p);
-    int i;
-    Append(mangled, "f_");
-    for (i = 0; i < sz; i++) {
-      mangle_subtype(mangled, Getitem(p, i));
-      Putc('_', mangled);
-    }
-    Append(mangled, (sz > 0) ? "_" : "__");
-  } else if (SwigType_isvarargs(t)) {
-    Append(mangled, "___");
-  } else {
-    char *d = Char(t);
-    char *c = strstr(d, "<(");
-    if (!c || !strstr(c + 2, ")>")) {
-      /* not a template type */
-      mangle_stringcopy(mangled, Char(t), Len(t));
-    } else {
-      /* a template type */
-      String *suffix;
-      List *p;
-      int i, sz;
-      mangle_stringcopy(mangled, d, c-d);
-      Putc('T', mangled);
-      Putc('_', mangled);
-
-      p = SwigType_parmlist(c + 1);
-      sz = Len(p);
-      for (i = 0; i < sz; i++) {
-	mangle_subtype(mangled, Getitem(p, i));
-	Putc('_', mangled);
-      }
-      Putc('t', mangled);
-      suffix = SwigType_templatesuffix(t);
-      if (Len(suffix) > 0) {
-	mangle_namestr(mangled, suffix);
-      } else {
-	Append(mangled, suffix);
-      }
-      Delete(suffix);
-      Delete(p);
-    }
-  }
-}
-
-static void mangle_subtype(String *mangled, SwigType *s) {
-  List *elements;
-  int nelements, i;
-
-  assert(s);
-  elements = SwigType_split(s);
-  nelements = Len(elements);
-  for (i = 0; i < nelements; i++) {
-    SwigType *element = Getitem(elements, i);
-    mangle_namestr(mangled, element);
-  }
-  Delete(elements);
-}
-
-static String *manglestr_default(const SwigType *s) {
-  String *mangled = NewString("_");
-  SwigType *sr = SwigType_typedef_resolve_all(s);
-  SwigType *sq = SwigType_typedef_qualified(sr);
-  SwigType *ss = SwigType_remove_global_scope_prefix(sq);
-  SwigType *type = ss;
-  SwigType *lt;
-
-  if (SwigType_istemplate(ss)) {
-    SwigType *ty = Swig_symbol_template_deftype(ss, 0);
-    Delete(ss);
-    ss = ty;
-    type = ss;
-  }
-
-  lt = SwigType_ltype(type);
-
-  Replace(lt, "struct ", "", DOH_REPLACE_ANY);
-  Replace(lt, "class ", "", DOH_REPLACE_ANY);
-  Replace(lt, "union ", "", DOH_REPLACE_ANY);
-  Replace(lt, "enum ", "", DOH_REPLACE_ANY);
-
-  mangle_subtype(mangled, lt);
-
-  Delete(ss);
-  Delete(sq);
-  Delete(sr);
-
-  return mangled;
-}
-
-#else
-
-static String *manglestr_default(const SwigType *s) {
-  char *c;
-  String *result = 0;
-  String *base = 0;
-  SwigType *lt;
-  SwigType *sr = SwigType_typedef_resolve_all(s);
-  SwigType *sq = SwigType_typedef_qualified(sr);
-  SwigType *ss = SwigType_remove_global_scope_prefix(sq);
-  SwigType *type = ss;
-
-  if (SwigType_istemplate(ss)) {
-    SwigType *ty = Swig_symbol_template_deftype(ss, 0);
-    Delete(ss);
-    ss = ty;
-    type = ss;
-  }
-
-  lt = SwigType_ltype(type);
-  result = SwigType_prefix(lt);
-  base = SwigType_base(lt);
-
-  c = Char(result);
-  while (*c) {
-    if (!isalnum((int) *c))
-      *c = '_';
-    c++;
-  }
-  if (SwigType_istemplate(base)) {
-    String *b = SwigType_namestr(base);
-    Delete(base);
-    base = b;
-  }
-
-  Replace(base, "struct ", "", DOH_REPLACE_ANY);	/* This might be problematic */
-  Replace(base, "class ", "", DOH_REPLACE_ANY);
-  Replace(base, "union ", "", DOH_REPLACE_ANY);
-  Replace(base, "enum ", "", DOH_REPLACE_ANY);
-
-  c = Char(base);
-  while (*c) {
-    if (*c == '<')
-      *c = 'T';
-    else if (*c == '>')
-      *c = 't';
-    else if (*c == '*')
-      *c = 'p';
-    else if (*c == '[')
-      *c = 'a';
-    else if (*c == ']')
-      *c = 'A';
-    else if (*c == '&')
-      *c = 'R';
-    else if (*c == '(')
-      *c = 'f';
-    else if (*c == ')')
-      *c = 'F';
-    else if (!isalnum((int) *c))
-      *c = '_';
-    c++;
-  }
-  Append(result, base);
-  Insert(result, 0, "_");
-  Delete(lt);
-  Delete(base);
-  Delete(ss);
-  Delete(sq);
-  Delete(sr);
-  return result;
-}
-#endif
-
-String *SwigType_manglestr(const SwigType *s) {
-#if 0
-  /* Debugging checks to ensure a proper SwigType is passed in and not a stringified type */
-  String *angle = Strstr(s, "<");
-  if (angle && Strncmp(angle, "<(", 2) != 0)
-    Printf(stderr, "SwigType_manglestr error: %s\n", s);
-  else if (Strstr(s, "*") || Strstr(s, "&") || Strstr(s, "["))
-    Printf(stderr, "SwigType_manglestr error: %s\n", s);
-#endif
-  return manglestr_default(s);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_typename_replace()
- *
- * Replaces a typename in a type with something else.  Needed for templates.
- * ----------------------------------------------------------------------------- */
-
-void SwigType_typename_replace(SwigType *t, String *pat, String *rep) {
-  String *nt;
-  int i, ilen;
-  List *elem;
-
-  if (!Strstr(t, pat))
-    return;
-
-  if (Equal(t, pat)) {
-    Replace(t, pat, rep, DOH_REPLACE_ANY);
-    return;
-  }
-  nt = NewStringEmpty();
-  elem = SwigType_split(t);
-  ilen = Len(elem);
-  for (i = 0; i < ilen; i++) {
-    String *e = Getitem(elem, i);
-    if (SwigType_issimple(e)) {
-      if (Equal(e, pat)) {
-	/* Replaces a type of the form 'pat' with 'rep<args>' */
-	Replace(e, pat, rep, DOH_REPLACE_ANY);
-      } else if (SwigType_istemplate(e)) {
-	/* Replaces a type of the form 'pat<args>' with 'rep' */
-	if (Equal(e, pat)) {
-	  String *repbase = SwigType_templateprefix(rep);
-	  Replace(e, pat, repbase, DOH_REPLACE_ID | DOH_REPLACE_FIRST);
-	  Delete(repbase);
-	}
-	{
-	  String *tsuffix;
-	  List *tparms = SwigType_parmlist(e);
-	  int j, jlen;
-	  String *nt = SwigType_templateprefix(e);
-	  Append(nt, "<(");
-	  jlen = Len(tparms);
-	  for (j = 0; j < jlen; j++) {
-	    SwigType_typename_replace(Getitem(tparms, j), pat, rep);
-	    Append(nt, Getitem(tparms, j));
-	    if (j < (jlen - 1))
-	      Putc(',', nt);
-	  }
-	  tsuffix = SwigType_templatesuffix(e);
-	  Printf(nt, ")>%s", tsuffix);
-	  Delete(tsuffix);
-	  Clear(e);
-	  Append(e, nt);
-	  Delete(nt);
-	  Delete(tparms);
-	}
-      } else if (Swig_scopename_check(e)) {
-	String *first, *rest;
-	first = Swig_scopename_first(e);
-	rest = Swig_scopename_suffix(e);
-	SwigType_typename_replace(rest, pat, rep);
-	SwigType_typename_replace(first, pat, rep);
-	Clear(e);
-	Printv(e, first, "::", rest, NIL);
-	Delete(first);
-	Delete(rest);
-      }
-    } else if (SwigType_isfunction(e)) {
-      int j, jlen;
-      List *fparms = SwigType_parmlist(e);
-      Clear(e);
-      Append(e, "f(");
-      jlen = Len(fparms);
-      for (j = 0; j < jlen; j++) {
-	SwigType_typename_replace(Getitem(fparms, j), pat, rep);
-	Append(e, Getitem(fparms, j));
-	if (j < (jlen - 1))
-	  Putc(',', e);
-      }
-      Append(e, ").");
-      Delete(fparms);
-    } else if (SwigType_isarray(e)) {
-      Replace(e, pat, rep, DOH_REPLACE_ID);
-    }
-    Append(nt, e);
-  }
-  Clear(t);
-  Append(t, nt);
-  Delete(nt);
-  Delete(elem);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_remove_global_scope_prefix()
- *
- * Removes the unary scope operator (::) prefix indicating global scope in all 
- * components of the type
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_remove_global_scope_prefix(const SwigType *t) {
-  SwigType *result;
-  const char *type = Char(t);
-  if (strncmp(type, "::", 2) == 0)
-    type += 2;
-  result = NewString(type);
-  Replaceall(result, ".::", ".");
-  Replaceall(result, "(::", "(");
-  Replaceall(result, "enum ::", "enum ");
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_check_decl()
- *
- * Checks type declarators for a match
- * ----------------------------------------------------------------------------- */
-
-int SwigType_check_decl(const SwigType *ty, const SwigType *decl) {
-  SwigType *t, *t1, *t2;
-  int r;
-  t = SwigType_typedef_resolve_all(ty);
-  t1 = SwigType_strip_qualifiers(t);
-  t2 = SwigType_prefix(t1);
-  r = Equal(t2, decl);
-  Delete(t);
-  Delete(t1);
-  Delete(t2);
-  return r == 1;
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/swig.h b/dependencies2013/win32/swig/Source/Swig/swig.h
deleted file mode 100644
index f25f0993..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swig.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swig.h
- *
- * Header file for the SWIG core.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIGCORE_H_
-#define SWIGCORE_H_
-
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "doh.h"
-
-/* Status codes */
-
-#define SWIG_OK         1
-#define SWIG_ERROR      0
-#define SWIG_NOWRAP     0
-
-/* Global macros */
-#define NSPACE_SEPARATOR "." /* Namespace separator for the nspace feature - this should be changed to a target language configurable variable */
-#define NSPACE_TODO 0 /* Languages that still need to implement and test the nspace feature use this */
-
-/* Short names for common data types */
-
-  typedef DOH String;
-  typedef DOH Hash;
-  typedef DOH List;
-  typedef DOH String_or_char;
-  typedef DOH File;
-  typedef DOH Parm;
-  typedef DOH ParmList;
-  typedef DOH Node;
-  typedef DOH Symtab;
-  typedef DOH Typetab;
-  typedef DOH SwigType;
-
-/* --- Legacy DataType interface.  These type codes are provided solely 
-       for backwards compatibility with older modules --- */
-
-/* --- The ordering of type values is used to determine type-promotion 
-       in the parser.  Do not change */
-
-/* Numeric types */
-
-#define   T_BOOL       1
-#define   T_SCHAR      2
-#define   T_UCHAR      3
-#define   T_SHORT      4
-#define   T_USHORT     5
-#define   T_ENUM       6
-#define   T_INT        7
-#define   T_UINT       8
-#define   T_LONG       9
-#define   T_ULONG      10
-#define   T_LONGLONG   11
-#define   T_ULONGLONG  12
-#define   T_FLOAT      20
-#define   T_DOUBLE     21
-#define   T_LONGDOUBLE 22
-#define   T_FLTCPLX    23
-#define   T_DBLCPLX    24
-#define   T_NUMERIC    25
-#define   T_AUTO       26
-
-#define   T_COMPLEX    T_DBLCPLX
-
-/* non-numeric */
-
-#define   T_CHAR       29
-#define   T_WCHAR      30
-#define   T_USER       31
-#define   T_VOID       32
-#define   T_STRING     33
-#define   T_POINTER    34
-#define   T_REFERENCE  35
-#define   T_ARRAY      36
-#define   T_FUNCTION   37
-#define   T_MPOINTER   38
-#define   T_VARARGS    39
-#define   T_RVALUE_REFERENCE  40
-#define   T_WSTRING    41
-
-#define   T_SYMBOL     98
-#define   T_ERROR      99
-
-
-
-/* --- File interface --- */
-
-#include "swigfile.h"
-
-/* --- Command line parsing --- */
-
-#include "swigopt.h"
-
-/* --- Scanner Interface --- */
-
-#include "swigscan.h"
-
-/* --- Functions for manipulating the string-based type encoding --- */
-
-  extern SwigType *NewSwigType(int typecode);
-  extern SwigType *SwigType_del_element(SwigType *t);
-  extern SwigType *SwigType_add_pointer(SwigType *t);
-  extern SwigType *SwigType_add_memberpointer(SwigType *t, const_String_or_char_ptr qual);
-  extern SwigType *SwigType_del_memberpointer(SwigType *t);
-  extern SwigType *SwigType_del_pointer(SwigType *t);
-  extern SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size);
-  extern SwigType *SwigType_del_array(SwigType *t);
-  extern SwigType *SwigType_pop_arrays(SwigType *t);
-  extern SwigType *SwigType_add_reference(SwigType *t);
-  extern SwigType *SwigType_del_reference(SwigType *t);
-  extern SwigType *SwigType_add_rvalue_reference(SwigType *t);
-  extern SwigType *SwigType_del_rvalue_reference(SwigType *t);
-  extern SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual);
-  extern SwigType *SwigType_del_qualifier(SwigType *t);
-  extern SwigType *SwigType_add_function(SwigType *t, ParmList *parms);
-  extern SwigType *SwigType_add_template(SwigType *t, ParmList *parms);
-  extern SwigType *SwigType_pop_function(SwigType *t);
-  extern ParmList *SwigType_function_parms(const SwigType *t, Node *file_line_node);
-  extern List *SwigType_split(const SwigType *t);
-  extern String *SwigType_pop(SwigType *t);
-  extern void SwigType_push(SwigType *t, String *s);
-  extern List *SwigType_parmlist(const SwigType *p);
-  extern String *SwigType_parm(const SwigType *p);
-  extern String *SwigType_str(const SwigType *s, const_String_or_char_ptr id);
-  extern String *SwigType_lstr(const SwigType *s, const_String_or_char_ptr id);
-  extern String *SwigType_rcaststr(const SwigType *s, const_String_or_char_ptr id);
-  extern String *SwigType_lcaststr(const SwigType *s, const_String_or_char_ptr id);
-  extern String *SwigType_manglestr(const SwigType *t);
-  extern SwigType *SwigType_ltype(const SwigType *t);
-  extern int SwigType_ispointer(const SwigType *t);
-  extern int SwigType_ispointer_return(const SwigType *t);
-  extern int SwigType_isfunctionpointer(const SwigType *t);
-  extern int SwigType_ismemberpointer(const SwigType *t);
-  extern int SwigType_isreference(const SwigType *t);
-  extern int SwigType_isreference_return(const SwigType *t);
-  extern int SwigType_isrvalue_reference(const SwigType *t);
-  extern int SwigType_isarray(const SwigType *t);
-  extern int SwigType_prefix_is_simple_1D_array(const SwigType *t);
-  extern int SwigType_isfunction(const SwigType *t);
-  extern int SwigType_isqualifier(const SwigType *t);
-  extern int SwigType_isconst(const SwigType *t);
-  extern int SwigType_issimple(const SwigType *t);
-  extern int SwigType_ismutable(const SwigType *t);
-  extern int SwigType_isvarargs(const SwigType *t);
-  extern int SwigType_istemplate(const SwigType *t);
-  extern int SwigType_isenum(const SwigType *t);
-  extern int SwigType_check_decl(const SwigType *t, const_String_or_char_ptr decl);
-  extern SwigType *SwigType_strip_qualifiers(const SwigType *t);
-  extern SwigType *SwigType_strip_single_qualifier(const SwigType *t);
-  extern SwigType *SwigType_functionpointer_decompose(SwigType *t);
-  extern String *SwigType_base(const SwigType *t);
-  extern String *SwigType_namestr(const SwigType *t);
-  extern String *SwigType_templateprefix(const SwigType *t);
-  extern String *SwigType_templatesuffix(const SwigType *t);
-  extern String *SwigType_istemplate_templateprefix(const SwigType *t);
-  extern String *SwigType_istemplate_only_templateprefix(const SwigType *t);
-  extern String *SwigType_templateargs(const SwigType *t);
-  extern String *SwigType_prefix(const SwigType *t);
-  extern int SwigType_array_ndim(const SwigType *t);
-  extern String *SwigType_array_getdim(const SwigType *t, int n);
-  extern void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep);
-  extern SwigType *SwigType_array_type(const SwigType *t);
-  extern SwigType *SwigType_default_create(const SwigType *ty);
-  extern SwigType *SwigType_default_deduce(const SwigType *t);
-  extern void SwigType_typename_replace(SwigType *t, String *pat, String *rep);
-  extern SwigType *SwigType_remove_global_scope_prefix(const SwigType *t);
-  extern SwigType *SwigType_alttype(const SwigType *t, int ltmap);
-
-/* --- Type-system managment --- */
-  extern void SwigType_typesystem_init(void);
-  extern int SwigType_typedef(const SwigType *type, const_String_or_char_ptr name);
-  extern int SwigType_typedef_class(const_String_or_char_ptr name);
-  extern int SwigType_typedef_using(const_String_or_char_ptr qname);
-  extern void SwigType_inherit(String *subclass, String *baseclass, String *cast, String *conversioncode);
-  extern int SwigType_issubtype(const SwigType *subtype, const SwigType *basetype);
-  extern void SwigType_scope_alias(String *aliasname, Typetab *t);
-  extern void SwigType_using_scope(Typetab *t);
-  extern void SwigType_new_scope(const_String_or_char_ptr name);
-  extern void SwigType_inherit_scope(Typetab *scope);
-  extern Typetab *SwigType_pop_scope(void);
-  extern Typetab *SwigType_set_scope(Typetab *h);
-  extern void SwigType_print_scope(void);
-  extern SwigType *SwigType_typedef_resolve(const SwigType *t);
-  extern SwigType *SwigType_typedef_resolve_all(const SwigType *t);
-  extern SwigType *SwigType_typedef_qualified(const SwigType *t);
-  extern int SwigType_istypedef(const SwigType *t);
-  extern int SwigType_isclass(const SwigType *t);
-  extern void SwigType_attach_symtab(Symtab *syms);
-  extern void SwigType_remember(const SwigType *t);
-  extern void SwigType_remember_clientdata(const SwigType *t, const_String_or_char_ptr clientdata);
-  extern void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr clientdata);
-  extern void (*SwigType_remember_trace(void (*tf) (const SwigType *, String *, String *))) (const SwigType *, String *, String *);
-  extern void SwigType_emit_type_table(File *f_headers, File *f_table);
-  extern int SwigType_type(const SwigType *t);
-
-/* --- Symbol table module --- */
-
-  extern void Swig_symbol_print_tables(Symtab *symtab);
-  extern void Swig_symbol_print_tables_summary(void);
-  extern void Swig_symbol_print_symbols(void);
-  extern void Swig_symbol_print_csymbols(void);
-  extern void Swig_symbol_init(void);
-  extern void Swig_symbol_setscopename(const_String_or_char_ptr name);
-  extern String *Swig_symbol_getscopename(void);
-  extern String *Swig_symbol_qualifiedscopename(Symtab *symtab);
-  extern String *Swig_symbol_qualified_language_scopename(Symtab *symtab);
-  extern Symtab *Swig_symbol_newscope(void);
-  extern Symtab *Swig_symbol_setscope(Symtab *);
-  extern Symtab *Swig_symbol_getscope(const_String_or_char_ptr symname);
-  extern Symtab *Swig_symbol_global_scope(void);
-  extern Symtab *Swig_symbol_current(void);
-  extern Symtab *Swig_symbol_popscope(void);
-  extern Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *node);
-  extern void Swig_symbol_cadd(const_String_or_char_ptr symname, Node *node);
-  extern Node *Swig_symbol_clookup(const_String_or_char_ptr symname, Symtab *tab);
-  extern Node *Swig_symbol_clookup_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *));
-  extern Node *Swig_symbol_clookup_no_inherit(const_String_or_char_ptr name, Symtab *n);
-  extern Symtab *Swig_symbol_cscope(const_String_or_char_ptr symname, Symtab *tab);
-  extern Node *Swig_symbol_clookup_local(const_String_or_char_ptr symname, Symtab *tab);
-  extern Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *));
-  extern String *Swig_symbol_qualified(Node *node);
-  extern Node *Swig_symbol_isoverloaded(Node *node);
-  extern void Swig_symbol_remove(Node *node);
-  extern void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *tab);
-  extern void Swig_symbol_inherit(Symtab *tab);
-  extern SwigType *Swig_symbol_type_qualify(const SwigType *ty, Symtab *tab);
-  extern String *Swig_symbol_string_qualify(String *s, Symtab *tab);
-  extern SwigType *Swig_symbol_typedef_reduce(const SwigType *ty, Symtab *tab);
-
-  extern ParmList *Swig_symbol_template_defargs(Parm *parms, Parm *targs, Symtab *tscope, Symtab *tsdecl);
-  extern SwigType *Swig_symbol_template_deftype(const SwigType *type, Symtab *tscope);
-  extern SwigType *Swig_symbol_template_param_eval(const SwigType *p, Symtab *symtab);
-
-/* --- Parameters and Parameter Lists --- */
-
-#include "swigparm.h"
-
-extern String    *ParmList_errorstr(ParmList *);
-extern int        ParmList_is_compactdefargs(ParmList *p);
-
-/* --- Parse tree support --- */
-
-#include "swigtree.h"
-
-/* -- Wrapper function Object */
-
-#include "swigwrap.h"
-
-/* --- Naming functions --- */
-
-  extern void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format);
-  extern void Swig_name_unregister(const_String_or_char_ptr method);
-  extern String *Swig_name_mangle(const_String_or_char_ptr s);
-  extern String *Swig_name_wrapper(const_String_or_char_ptr fname);
-  extern String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_ptr classname, const_String_or_char_ptr membername);
-  extern String *Swig_name_get(const_String_or_char_ptr nspace, const_String_or_char_ptr vname);
-  extern String *Swig_name_set(const_String_or_char_ptr nspace, const_String_or_char_ptr vname);
-  extern String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_char_ptr classname);
-  extern String *Swig_name_copyconstructor(const_String_or_char_ptr nspace, const_String_or_char_ptr classname);
-  extern String *Swig_name_destroy(const_String_or_char_ptr nspace, const_String_or_char_ptr classname);
-  extern String *Swig_name_disown(const_String_or_char_ptr nspace, const_String_or_char_ptr classname);
-
-  extern void Swig_naming_init(void);
-  extern void Swig_name_namewarn_add(String *prefix, String *name, SwigType *decl, Hash *namewrn);
-  extern void Swig_name_rename_add(String *prefix, String *name, SwigType *decl, Hash *namewrn, ParmList *declaratorparms);
-  extern void Swig_name_inherit(String *base, String *derived);
-  extern List *Swig_make_inherit_list(String *clsname, List *names, String *Namespaceprefix);
-  extern void Swig_inherit_base_symbols(List *bases);
-  extern int Swig_need_protected(Node *n);
-  extern int Swig_need_redefined_warn(Node *a, Node *b, int InClass);
-
-  extern String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, SwigType *decl, String *oldname);
-  extern String *Swig_name_warning(Node *n, String *prefix, String *name, SwigType *decl);
-  extern String *Swig_name_str(Node *n);
-  extern String *Swig_name_decl(Node *n);
-  extern String *Swig_name_fulldecl(Node *n);
-
-/* --- parameterized rename functions --- */
-
-  extern void Swig_name_object_set(Hash *namehash, String *name, SwigType *decl, DOH *object);
-  extern DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *decl);
-  extern void Swig_name_object_inherit(Hash *namehash, String *base, String *derived);
-  extern void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl, Node *n);
-  extern void Swig_feature_set(Hash *features, const_String_or_char_ptr name, SwigType *decl, const_String_or_char_ptr featurename, const_String_or_char_ptr value, Hash *featureattribs);
-
-/* --- Misc --- */
-  extern char *Swig_copy_string(const char *c);
-  extern void Swig_set_fakeversion(const char *version);
-  extern const char *Swig_package_version(void);
-  extern void Swig_banner(File *f);
-  extern void Swig_banner_target_lang(File *f, const_String_or_char_ptr commentchar);
-  extern String *Swig_strip_c_comments(const String *s);
-  extern String *Swig_new_subdirectory(String *basedirectory, String *subdirectory);
-  extern void Swig_filename_correct(String *filename);
-  extern String *Swig_filename_escape(String *filename);
-  extern void Swig_filename_unescape(String *filename);
-  extern int Swig_storage_isextern(Node *n);
-  extern int Swig_storage_isexternc(Node *n);
-  extern int Swig_storage_isstatic_custom(Node *n, const_String_or_char_ptr storage);
-  extern int Swig_storage_isstatic(Node *n);
-  extern String *Swig_string_escape(String *s);
-  extern String *Swig_string_mangle(const String *s);
-  extern void Swig_scopename_split(const String *s, String **prefix, String **last);
-  extern String *Swig_scopename_prefix(const String *s);
-  extern String *Swig_scopename_last(const String *s);
-  extern String *Swig_scopename_first(const String *s);
-  extern String *Swig_scopename_suffix(const String *s);
-  extern int Swig_scopename_check(const String *s);
-  extern String *Swig_string_lower(String *s);
-  extern String *Swig_string_upper(String *s);
-  extern String *Swig_string_title(String *s);
-  extern void Swig_offset_string(String *s, int number);
-  extern String *Swig_pcre_version(void);
-  extern void Swig_init(void);
-  extern int Swig_value_wrapper_mode(int mode);
-
-  typedef enum { EMF_STANDARD, EMF_MICROSOFT } ErrorMessageFormat;
-
-  extern void Swig_warning(int num, const_String_or_char_ptr filename, int line, const char *fmt, ...);
-  extern void Swig_error(const_String_or_char_ptr filename, int line, const char *fmt, ...);
-  extern int Swig_error_count(void);
-  extern void Swig_error_silent(int s);
-  extern void Swig_warnfilter(const_String_or_char_ptr wlist, int val);
-  extern void Swig_warnall(void);
-  extern int Swig_warn_count(void);
-  extern void Swig_error_msg_format(ErrorMessageFormat format);
-  extern void Swig_diagnostic(const_String_or_char_ptr filename, int line, const char *fmt, ...);
-  extern String *Swig_stringify_with_location(DOH *object);
-
-/* --- C Wrappers --- */
-  extern void Swig_cresult_name_set(const char *new_name);
-  extern const char *Swig_cresult_name(void);
-  extern String *Swig_cparm_name(Parm *p, int i);
-  extern String *Swig_wrapped_var_type(SwigType *t, int varcref);
-  extern int Swig_cargs(Wrapper *w, ParmList *l);
-  extern String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr decl);
-
-  extern String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms);
-  extern String *Swig_cconstructor_call(const_String_or_char_ptr name);
-  extern String *Swig_cppconstructor_call(const_String_or_char_ptr name, ParmList *parms);
-  extern String *Swig_unref_call(Node *n);
-  extern String *Swig_ref_call(Node *n, const String *lname);
-  extern String *Swig_cdestructor_call(Node *n);
-  extern String *Swig_cppdestructor_call(Node *n);
-  extern String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref);
-  extern String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref);
-
-  extern int Swig_add_extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self);
-  extern void Swig_replace_special_variables(Node *n, Node *parentnode, String *code);
-
-/* --- Transformations --- */
-
-  extern int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *classname, int flags, SwigType *director_type, int is_director);
-  extern int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String *classname, String *none_comparison, String *director_ctor, int cplus, int flags, String *directorname);
-  extern int Swig_DestructorToFunction(Node *n, const_String_or_char_ptr nspace, String *classname, int cplus, int flags);
-  extern int Swig_MembersetToFunction(Node *n, String *classname, int flags);
-  extern int Swig_MembergetToFunction(Node *n, String *classname, int flags);
-  extern int Swig_VargetToFunction(Node *n, int flags);
-  extern int Swig_VarsetToFunction(Node *n, int flags);
-
-#define  CWRAP_EXTEND                 0x01
-#define  CWRAP_SMART_POINTER          0x02
-#define  CWRAP_NATURAL_VAR            0x04
-#define  CWRAP_DIRECTOR_ONE_CALL      0x08
-#define  CWRAP_DIRECTOR_TWO_CALLS     0x10
-#define  CWRAP_ALL_PROTECTED_ACCESS   0x20
-#define  CWRAP_SMART_POINTER_OVERLOAD 0x40
-
-/* --- Director Helpers --- */
-  extern Node *Swig_methodclass(Node *n);
-  extern int Swig_directorclass(Node *n);
-  extern Node *Swig_directormap(Node *n, String *type);
-
-/* --- Legacy Typemap API (somewhat simplified, ha!) --- */
-
-  extern void Swig_typemap_init(void);
-  extern void Swig_typemap_register(const_String_or_char_ptr tmap_method, ParmList *pattern, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs);
-  extern int Swig_typemap_copy(const_String_or_char_ptr tmap_method, ParmList *srcpattern, ParmList *pattern);
-  extern void Swig_typemap_clear(const_String_or_char_ptr tmap_method, ParmList *pattern);
-  extern int Swig_typemap_apply(ParmList *srcpat, ParmList *destpat);
-  extern void Swig_typemap_clear_apply(ParmList *pattern);
-  extern void Swig_typemap_replace_embedded_typemap(String *s, Node *file_line_node);
-  extern void Swig_typemap_debug(void);
-  extern void Swig_typemap_search_debug_set(void);
-  extern void Swig_typemap_used_debug_set(void);
-  extern void Swig_typemap_register_debug_set(void);
-
-  extern String *Swig_typemap_lookup(const_String_or_char_ptr tmap_method, Node *n, const_String_or_char_ptr lname, Wrapper *f);
-  extern String *Swig_typemap_lookup_out(const_String_or_char_ptr tmap_method, Node *n, const_String_or_char_ptr lname, Wrapper *f, String *actioncode);
-
-  extern void Swig_typemap_attach_parms(const_String_or_char_ptr tmap_method, ParmList *parms, Wrapper *f);
-
-/* --- Code fragment support --- */
-
-  extern void Swig_fragment_register(Node *fragment);
-  extern void Swig_fragment_emit(String *name);
-  extern void Swig_fragment_clear(String *section);
-
-/* --- Extension support --- */
-
-  extern Hash *Swig_extend_hash(void);
-  extern void Swig_extend_merge(Node *cls, Node *am);
-  extern void Swig_extend_append_previous(Node *cls, Node *am);
-  extern void Swig_extend_unused_check(void);
-
-/* hacks defined in C++ ! */
-  extern int Swig_director_mode(void);
-  extern int Swig_director_protected_mode(void);
-  extern int Swig_all_protected_mode(void);
-  extern void Wrapper_director_mode_set(int);
-  extern void Wrapper_director_protected_mode_set(int);
-  extern void Wrapper_all_protected_mode_set(int);
-  extern void Language_replace_special_variables(String *method, String *tm, Parm *parm);
-  extern void Swig_print(DOH *object, int count);
-  extern void Swig_print_with_location(DOH *object, int count);
-
-
-/* -- template init -- */
-  extern void SwigType_template_init(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/dependencies2013/win32/swig/Source/Swig/swigfile.h b/dependencies2013/win32/swig/Source/Swig/swigfile.h
deleted file mode 100644
index f12b3308..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swigfile.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigfile.h
- *
- * File handling functions in the SWIG core
- * ----------------------------------------------------------------------------- */
-
-extern List   *Swig_add_directory(const_String_or_char_ptr dirname);
-extern void    Swig_push_directory(const_String_or_char_ptr dirname);
-extern void    Swig_pop_directory(void);
-extern String *Swig_last_file(void);
-extern List   *Swig_search_path(void);
-extern FILE   *Swig_include_open(const_String_or_char_ptr name);
-extern FILE   *Swig_open(const_String_or_char_ptr name);
-extern String *Swig_read_file(FILE *f); 
-extern String *Swig_include(const_String_or_char_ptr name);
-extern String *Swig_include_sys(const_String_or_char_ptr name);
-extern int     Swig_insert_file(const_String_or_char_ptr name, File *outfile);
-extern void    Swig_set_push_dir(int dopush);
-extern int     Swig_get_push_dir(void);
-extern void    Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile);
-extern File   *Swig_filebyname(const_String_or_char_ptr filename);
-extern String *Swig_file_extension(const_String_or_char_ptr filename);
-extern String *Swig_file_basename(const_String_or_char_ptr filename);
-extern String *Swig_file_filename(const_String_or_char_ptr filename);
-extern String *Swig_file_dirname(const_String_or_char_ptr filename);
-extern void   Swig_file_debug_set();
-
-/* Delimiter used in accessing files and directories */
-
-#if defined(MACSWIG)
-#  define SWIG_FILE_DELIMITER ":"
-#elif defined(_WIN32)
-#  define SWIG_FILE_DELIMITER "\\"
-#else
-#  define SWIG_FILE_DELIMITER "/"
-#endif
diff --git a/dependencies2013/win32/swig/Source/Swig/swigopt.h b/dependencies2013/win32/swig/Source/Swig/swigopt.h
deleted file mode 100644
index 543bfb81..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swigopt.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigopt.h
- *
- * Header file for the SWIG command line processing functions
- * ----------------------------------------------------------------------------- */
-
- extern void  Swig_init_args(int argc, char **argv);
- extern void  Swig_mark_arg(int n);
- extern int   Swig_check_marked(int n);
- extern void  Swig_check_options(int check_input);
- extern void  Swig_arg_error(void);
diff --git a/dependencies2013/win32/swig/Source/Swig/swigparm.h b/dependencies2013/win32/swig/Source/Swig/swigparm.h
deleted file mode 100644
index 368b4d26..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swigparm.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigparm.h
- *
- * Functions related to the handling of function/method parameters and
- * parameter lists.  
- * ----------------------------------------------------------------------------- */
-
-/* Individual parameters */
-extern Parm      *NewParm(SwigType *type, const_String_or_char_ptr name, Node *from_node);
-extern Parm      *NewParmWithoutFileLineInfo(SwigType *type, const_String_or_char_ptr name);
-extern Parm      *NewParmNode(SwigType *type, Node *from_node);
-extern Parm      *CopyParm(Parm *p);
-
-/* Parameter lists */
-extern ParmList  *CopyParmList(ParmList *);
-extern ParmList  *CopyParmListMax(ParmList *, int count);
-extern int        ParmList_len(ParmList *);
-extern int        ParmList_numrequired(ParmList *);
-extern int        ParmList_has_defaultargs(ParmList *p);
-
-/* Output functions */
-extern String    *ParmList_str(ParmList *);
-extern String    *ParmList_str_defaultargs(ParmList *);
-extern String    *ParmList_str_multibrackets(ParmList *);
-extern String    *ParmList_protostr(ParmList *);
-
-
diff --git a/dependencies2013/win32/swig/Source/Swig/swigscan.h b/dependencies2013/win32/swig/Source/Swig/swigscan.h
deleted file mode 100644
index 6a181f86..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swigscan.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigscan.h
- *
- * C/C++ scanner. 
- * ----------------------------------------------------------------------------- */
-
-typedef struct Scanner Scanner;
-
-extern Scanner     *NewScanner(void);
-extern void         DelScanner(Scanner *);
-extern void         Scanner_clear(Scanner *);
-extern void         Scanner_push(Scanner *, String *);
-extern void         Scanner_pushtoken(Scanner *, int, const_String_or_char_ptr value);
-extern int          Scanner_token(Scanner *);
-extern String      *Scanner_text(Scanner *);
-extern void         Scanner_skip_line(Scanner *);
-extern int          Scanner_skip_balanced(Scanner *, int startchar, int endchar);
-extern String      *Scanner_get_raw_text_balanced(Scanner *, int startchar, int endchar);
-extern void         Scanner_set_location(Scanner *, String *file, int line);
-extern String      *Scanner_file(Scanner *);
-extern int          Scanner_line(Scanner *);
-extern int          Scanner_start_line(Scanner *);
-extern void         Scanner_idstart(Scanner *, const char *idchar);
-extern String      *Scanner_errmsg(Scanner *);
-extern int          Scanner_errline(Scanner *);
-extern int          Scanner_isoperator(int tokval);
-extern void         Scanner_locator(Scanner *, String *loc);
-
-/* Note: Tokens in range 100+ are for C/C++ operators */
-
-#define   SWIG_MAXTOKENS          200
-#define   SWIG_TOKEN_LPAREN       1        /* ( */
-#define   SWIG_TOKEN_RPAREN       2        /* ) */
-#define   SWIG_TOKEN_SEMI         3        /* ; */
-#define   SWIG_TOKEN_LBRACE       4        /* { */
-#define   SWIG_TOKEN_RBRACE       5        /* } */
-#define   SWIG_TOKEN_LBRACKET     6        /* [ */
-#define   SWIG_TOKEN_RBRACKET     7        /* ] */
-#define   SWIG_TOKEN_BACKSLASH    8        /* \ */
-#define   SWIG_TOKEN_ENDLINE      9        /* \n */
-#define   SWIG_TOKEN_STRING       10       /* "str" */
-#define   SWIG_TOKEN_POUND        11       /* # */
-#define   SWIG_TOKEN_COLON        12       /* : */
-#define   SWIG_TOKEN_DCOLON       13       /* :: */
-#define   SWIG_TOKEN_DCOLONSTAR   14       /* ::* */
-#define   SWIG_TOKEN_ID           15       /* identifer */
-#define   SWIG_TOKEN_FLOAT        16       /* 3.1415F */
-#define   SWIG_TOKEN_DOUBLE       17       /* 3.1415 */
-#define   SWIG_TOKEN_INT          18       /* 314 */
-#define   SWIG_TOKEN_UINT         19       /* 314U */
-#define   SWIG_TOKEN_LONG         20       /* 314L */
-#define   SWIG_TOKEN_ULONG        21       /* 314UL */
-#define   SWIG_TOKEN_CHAR         22       /* 'charconst' */
-#define   SWIG_TOKEN_PERIOD       23       /* . */
-#define   SWIG_TOKEN_AT           24       /* @ */
-#define   SWIG_TOKEN_DOLLAR       25       /* $ */
-#define   SWIG_TOKEN_CODEBLOCK    26       /* %{ ... %} ... */
-#define   SWIG_TOKEN_RSTRING      27       /* `charconst` */
-#define   SWIG_TOKEN_LONGLONG     28       /* 314LL */
-#define   SWIG_TOKEN_ULONGLONG    29       /* 314ULL */
-#define   SWIG_TOKEN_QUESTION     30       /* ? */
-#define   SWIG_TOKEN_COMMENT      31       /* C or C++ comment */
-#define   SWIG_TOKEN_BOOL         32       /* true or false */
-#define   SWIG_TOKEN_WSTRING      33       /* L"str" */
-#define   SWIG_TOKEN_WCHAR        34       /* L'c' */
-
-#define   SWIG_TOKEN_ILLEGAL      99
-#define   SWIG_TOKEN_ERROR        -1
-
-#define   SWIG_TOKEN_COMMA        101      /* , */
-#define   SWIG_TOKEN_STAR         102      /* * */
-#define   SWIG_TOKEN_TIMES        102      /* * */
-#define   SWIG_TOKEN_EQUAL        103      /* = */
-#define   SWIG_TOKEN_EQUALTO      104      /* == */
-#define   SWIG_TOKEN_NOTEQUAL     105      /* != */
-#define   SWIG_TOKEN_PLUS         106      /* + */
-#define   SWIG_TOKEN_MINUS        107      /* - */
-#define   SWIG_TOKEN_AND          108      /* & */
-#define   SWIG_TOKEN_LAND         109      /* && */
-#define   SWIG_TOKEN_OR           110      /* | */
-#define   SWIG_TOKEN_LOR          111      /* || */
-#define   SWIG_TOKEN_XOR          112      /* ^ */
-#define   SWIG_TOKEN_LESSTHAN     113      /* < */
-#define   SWIG_TOKEN_GREATERTHAN  114      /* > */
-#define   SWIG_TOKEN_LTEQUAL      115      /* <= */
-#define   SWIG_TOKEN_GTEQUAL      116      /* >= */
-#define   SWIG_TOKEN_NOT          117      /* ~ */
-#define   SWIG_TOKEN_LNOT         118      /* ! */
-#define   SWIG_TOKEN_SLASH        119      /* / */
-#define   SWIG_TOKEN_DIVIDE       119      /* / */
-#define   SWIG_TOKEN_PERCENT      120      /* % */
-#define   SWIG_TOKEN_MODULO       120      /* % */
-#define   SWIG_TOKEN_LSHIFT       121      /* << */
-#define   SWIG_TOKEN_RSHIFT       122      /* >> */
-#define   SWIG_TOKEN_PLUSPLUS     123      /* ++ */
-#define   SWIG_TOKEN_MINUSMINUS   124      /* -- */
-#define   SWIG_TOKEN_PLUSEQUAL    125      /* += */
-#define   SWIG_TOKEN_MINUSEQUAL   126      /* -= */
-#define   SWIG_TOKEN_TIMESEQUAL   127      /* *= */
-#define   SWIG_TOKEN_DIVEQUAL     128      /* /= */
-#define   SWIG_TOKEN_ANDEQUAL     129      /* &= */
-#define   SWIG_TOKEN_OREQUAL      130      /* |= */
-#define   SWIG_TOKEN_XOREQUAL     131      /* ^= */
-#define   SWIG_TOKEN_LSEQUAL      132      /* <<= */
-#define   SWIG_TOKEN_RSEQUAL      133      /* >>= */
-#define   SWIG_TOKEN_MODEQUAL     134      /* %= */
-#define   SWIG_TOKEN_ARROW        135      /* -> */
-#define   SWIG_TOKEN_ARROWSTAR    136      /* ->* */
diff --git a/dependencies2013/win32/swig/Source/Swig/swigtree.h b/dependencies2013/win32/swig/Source/Swig/swigtree.h
deleted file mode 100644
index acd0e5e9..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swigtree.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigtree.h
- *
- * These functions are used to access and manipulate the SWIG parse tree.
- * The structure of this tree is modeled directly after XML-DOM.  The attribute 
- * and function names are meant to be similar.
- * ----------------------------------------------------------------------------- */
-
-/* Macros to traverse the DOM tree */
-
-#define  nodeType(x)               Getattr(x,"nodeType")
-#define  parentNode(x)             Getattr(x,"parentNode")
-#define  previousSibling(x)        Getattr(x,"previousSibling")
-#define  nextSibling(x)            Getattr(x,"nextSibling")
-#define  firstChild(x)             Getattr(x,"firstChild")
-#define  lastChild(x)              Getattr(x,"lastChild")
-
-/* Macros to set up the DOM tree (mostly used by the parser) */
-
-#define  set_nodeType(x,v)         Setattr(x,"nodeType",v)
-#define  set_parentNode(x,v)       Setattr(x,"parentNode",v)
-#define  set_previousSibling(x,v)  Setattr(x,"previousSibling",v)
-#define  set_nextSibling(x,v)      Setattr(x,"nextSibling",v)
-#define  set_firstChild(x,v)       Setattr(x,"firstChild",v)
-#define  set_lastChild(x,v)        Setattr(x,"lastChild",v)
-
-/* Utility functions */
-
-extern int    checkAttribute(Node *obj, const_String_or_char_ptr name, const_String_or_char_ptr value);
-extern void   appendChild(Node *node, Node *child);
-extern void   prependChild(Node *node, Node *child);
-extern void   removeNode(Node *node);
-extern Node  *copyNode(Node *node);
-extern void   appendSibling(Node *node, Node *child);
-
-/* Node restoration/restore functions */
-
-extern void  Swig_require(const char *ns, Node *node, ...);
-extern void  Swig_save(const char *ns, Node *node, ...);
-extern void  Swig_restore(Node *node);
-
-/* Debugging of parse trees */
-
-extern void Swig_print_tags(File *obj, Node *root);
-extern void Swig_print_tree(Node *obj);
-extern void Swig_print_node(Node *obj);
diff --git a/dependencies2013/win32/swig/Source/Swig/swigwrap.h b/dependencies2013/win32/swig/Source/Swig/swigwrap.h
deleted file mode 100644
index e44cb534..00000000
--- a/dependencies2013/win32/swig/Source/Swig/swigwrap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * swigwrap.h
- *
- * Functions related to wrapper objects.
- * ----------------------------------------------------------------------------- */
-
-typedef struct Wrapper {
-    Hash *localh;
-    String *def;
-    String *locals;
-    String *code;
-} Wrapper;
-
-extern Wrapper *NewWrapper(void);
-extern void     DelWrapper(Wrapper *w);
-extern void     Wrapper_compact_print_mode_set(int flag);
-extern void     Wrapper_pretty_print(String *str, File *f);
-extern void     Wrapper_compact_print(String *str, File *f);
-extern void     Wrapper_print(Wrapper *w, File *f);
-extern int      Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl);
-extern int      Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...);
-extern int      Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name);
-extern char    *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl);
-extern char    *Wrapper_new_localv(Wrapper *w, const_String_or_char_ptr name, ...);
diff --git a/dependencies2013/win32/swig/Source/Swig/symbol.c b/dependencies2013/win32/swig/Source/Swig/symbol.c
deleted file mode 100644
index c548a067..00000000
--- a/dependencies2013/win32/swig/Source/Swig/symbol.c
+++ /dev/null
@@ -1,2081 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * symbol.c
- *
- * This file implements the SWIG symbol table.  See details below.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "swigwarn.h"
-#include <ctype.h>
-
-/* #define SWIG_DEBUG*/
-/* -----------------------------------------------------------------------------
- * Synopsis
- *
- * This module provides symbol table management for all of SWIG.  In previous
- * releases, the management of symbols was rather haphazard.  This module tries
- * to correct that.
- *
- * All symbols are associated with simple identifiers.  For example, here are some
- * declarations that generate symbol table entries:
- *
- *  decl                                    symbol
- *  --------------                          ------------
- *  void foo(int);                          foo
- *  int  x;                                 x
- *  typedef int *blah;                      blah
- *
- * Associated with each symbol is a Hash table that can contain any set of
- * attributes that make sense for that object.  For example:
- *
- *  typedef int *blah;             ---->    "name" : 'blah'
- *                                          "type" : 'int'
- *                                          "decl" : 'p.'
- *                                       "storage" : 'typedef'          
- * 
- * In some cases, the symbol table needs to manage overloaded entries.  For instance,
- * overloaded functions.  In this case, a linked list is built.  The "sym:nextSibling"
- * attribute is reserved to hold a link to the next entry.  For example:
- *
- * int foo(int);            --> "name" : "foo"         "name" : "foo"
- * int foo(int,double);         "type" : "int"         "type" : "int" 
- *                              "decl" : "f(int)."     "decl" : "f(int,double)."
- *                               ...                    ...
- *                   "sym:nextSibling" :  --------> "sym:nextSibling": --------> ...
- *
- * When more than one symbol has the same name, the symbol declarator is 
- * used to detect duplicates.  For example, in the above case, foo(int) and
- * foo(int,double) are different because their "decl" attribute is different.
- * However, if a third declaration "foo(int)" was made, it would generate a 
- * conflict (due to having a declarator that matches a previous entry).
- *
- * Structures and classes:
- *
- * C/C++ symbol tables are normally managed in a few different spaces.  The
- * most visible namespace is reserved for functions, variables, typedef, enum values
- * and such.  In C, a separate tag-space is reserved for 'struct name', 'class name',
- * and 'union name' declarations.   In SWIG, a single namespace is used for everything
- * this means that certain incompatibilities will arise with some C programs. For instance:
- *
- *        struct Foo {
- *             ...
- *        }
- *
- *        int Foo();       // Error. Name clash.  Works in C though 
- * 
- * Due to the unified namespace for structures, special handling is performed for
- * the following:
- *
- *        typedef struct Foo {
- *
- *        } Foo;
- * 
- * In this case, the symbol table contains an entry for the structure itself.  The
- * typedef is left out of the symbol table.
- *
- * Target language vs C:
- *
- * The symbol tables are normally managed *in the namespace of the target language*.
- * This means that name-collisions can be resolved using %rename and related 
- * directives.   A quirk of this is that sometimes the symbol tables need to
- * be used for C type resolution as well.  To handle this, each symbol table
- * also has a C-symbol table lurking behind the scenes.  This is used to locate 
- * symbols in the C namespace.  However, this symbol table is not used for error 
- * reporting nor is it used for anything else during code generation.
- *
- * Symbol table structure:
- *
- * Symbol tables themselves are a special kind of node that is organized just like
- * a normal parse tree node.  Symbol tables are organized in a tree that can be
- * traversed using the SWIG-DOM API. The following attributes names are reserved.
- *
- *     name           -- Name of the scope defined by the symbol table (if any)
- *                       This name is the C-scope name and is not affected by
- *                       %renaming operations
- *     symtab         -- Hash table mapping identifiers to nodes.
- *     csymtab        -- Hash table mapping C identifiers to nodes.
- *
- * Reserved attributes on symbol objects:
- *
- * When a symbol is placed in the symbol table, the following attributes
- * are set:
- *       
- *     sym:name             -- Symbol name
- *     sym:nextSibling      -- Next symbol (if overloaded)
- *     sym:previousSibling  -- Previous symbol (if overloaded)
- *     sym:symtab           -- Symbol table object holding the symbol
- *     sym:overloaded       -- Set to the first symbol if overloaded
- *
- * These names are modeled after XML namespaces.  In particular, every attribute 
- * pertaining to symbol table management is prefaced by the "sym:" prefix.   
- *
- * An example dump of the parse tree showing symbol table entries for the 
- * following code should clarify this:
- *
- *   namespace OuterNamespace {
- *       namespace InnerNamespace {
- *           class Class {
- *           };
- *           struct Struct {
- *               int Var;
- *           };
- *       }
- *    }
- *
- *   +++ namespace ----------------------------------------
- *   | sym:name     - "OuterNamespace"
- *   | symtab       - 0xa064bf0
- *   | sym:symtab   - 0xa041690
- *   | sym:overname - "__SWIG_0"
- *  
- *         +++ namespace ----------------------------------------
- *         | sym:name     - "InnerNamespace"
- *         | symtab       - 0xa064cc0
- *         | sym:symtab   - 0xa064bf0
- *         | sym:overname - "__SWIG_0"
- *  
- *               +++ class ----------------------------------------
- *               | sym:name     - "Class"
- *               | symtab       - 0xa064d80
- *               | sym:symtab   - 0xa064cc0
- *               | sym:overname - "__SWIG_0"
- *               | 
- *               +++ class ----------------------------------------
- *               | sym:name     - "Struct"
- *               | symtab       - 0xa064f00
- *               | sym:symtab   - 0xa064cc0
- *               | sym:overname - "__SWIG_0"
- *  
- *                     +++ cdecl ----------------------------------------
- *                     | sym:name     - "Var"
- *                     | sym:symtab   - 0xa064f00
- *                     | sym:overname - "__SWIG_0"
- *                     | 
- *  
- *
- * Each class and namespace has its own scope and thus a new symbol table (sym)
- * is created. The sym attribute is only set for the first entry in the symbol
- * table. The sym:symtab entry points to the symbol table in which the symbol
- * exists, so for example, Struct is in the scope OuterNamespace::InnerNamespace
- * so sym:symtab points to this symbol table (0xa064cc0).
- *
- * ----------------------------------------------------------------------------- */
-
-static Hash *current = 0;	/* The current symbol table hash */
-static Hash *ccurrent = 0;	/* The current c symbol table hash */
-static Hash *current_symtab = 0;	/* Current symbol table node */
-static Hash *symtabs = 0;	/* Hash of all symbol tables by fully-qualified name */
-static Hash *global_scope = 0;	/* Global scope */
-
-static int use_inherit = 1;
-
-/* common attribute keys, to avoid calling find_key all the times */
-
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_print_tables()
- *
- * Debug display of symbol tables
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_print_tables(Symtab *symtab) {
-  if (!symtab)
-    symtab = current_symtab;
-
-  Printf(stdout, "SYMBOL TABLES start  =======================================\n");
-  Swig_print_tree(symtab);
-  Printf(stdout, "SYMBOL TABLES finish =======================================\n");
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_print_tables_summary()
- *
- * Debug summary display of all symbol tables by fully-qualified name 
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_print_tables_summary(void) {
-  Printf(stdout, "SYMBOL TABLES SUMMARY start  =======================================\n");
-  Swig_print_node(symtabs);
-  Printf(stdout, "SYMBOL TABLES SUMMARY finish =======================================\n");
-}
-
-/* -----------------------------------------------------------------------------
- * symbol_print_symbols()
- * ----------------------------------------------------------------------------- */
-
-static void symbol_print_symbols(const char *symboltabletype) {
-  Node *table = symtabs;
-  Iterator ki = First(table);
-  while (ki.key) {
-    String *k = ki.key;
-    Printf(stdout, "===================================================\n");
-    Printf(stdout, "%s -\n", k);
-    {
-      Symtab *symtab = Getattr(Getattr(table, k), symboltabletype);
-      Iterator it = First(symtab);
-      while (it.key) {
-	String *symname = it.key;
-	Printf(stdout, "  %s (%s)\n", symname, nodeType(it.item));
-	/*
-	Printf(stdout, "  %s - %p (%s)\n", symname, it.item, Getattr(it.item, "name"));
-	*/
-	it = Next(it);
-      }
-    }
-    ki = Next(ki);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_print_symbols()
- *
- * Debug display of all the target language symbols
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_print_symbols(void) {
-  Printf(stdout, "SYMBOLS start  =======================================\n");
-  symbol_print_symbols("symtab");
-  Printf(stdout, "SYMBOLS finish =======================================\n");
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_print_csymbols()
- *
- * Debug display of all the C symbols
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_print_csymbols(void) {
-  Printf(stdout, "CSYMBOLS start  =======================================\n");
-  symbol_print_symbols("csymtab");
-  Printf(stdout, "CSYMBOLS finish =======================================\n");
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_init()
- *
- * Create a new symbol table object
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_init(void) {
-
-  current = NewHash();
-  current_symtab = NewHash();
-  ccurrent = NewHash();
-  set_nodeType(current_symtab, "symboltable");
-  Setattr(current_symtab, "symtab", current);
-  Delete(current);
-  Setattr(current_symtab, "csymtab", ccurrent);
-  Delete(ccurrent);
-
-  /* Set the global scope */
-  symtabs = NewHash();
-  Setattr(symtabs, "", current_symtab);
-  Delete(current_symtab);
-  global_scope = current_symtab;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_setscopename()
- *
- * Set the C scopename of the current symbol table.
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_setscopename(const_String_or_char_ptr name) {
-  String *qname;
-  /* assert(!Getattr(current_symtab,"name")); */
-  Setattr(current_symtab, "name", name);
-
-  /* Set nested scope in parent */
-
-  qname = Swig_symbol_qualifiedscopename(current_symtab);
-
-  /* Save a reference to this scope */
-  Setattr(symtabs, qname, current_symtab);
-  Delete(qname);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_getscopename()
- *
- * Get the C scopename of the current symbol table
- * ----------------------------------------------------------------------------- */
-
-String *Swig_symbol_getscopename(void) {
-  return Getattr(current_symtab, "name");
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_getscope()
- *
- * Given a fully qualified C scopename, this function returns a symbol table
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_getscope(const_String_or_char_ptr name) {
-  if (!symtabs)
-    return 0;
-  if (Equal("::", (const_String_or_char_ptr ) name))
-    name = "";
-  return Getattr(symtabs, name);
-}
-
-/* ----------------------------------------------------------------------------- 
- * Swig_symbol_qualifiedscopename()
- *
- * Get the fully qualified C scopename of a symbol table.  Note, this only pertains
- * to the C/C++ scope name.  It is not affected by renaming.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_symbol_qualifiedscopename(Symtab *symtab) {
-  String *result = 0;
-  Hash *parent;
-  String *name;
-  if (!symtab)
-    symtab = current_symtab;
-  parent = Getattr(symtab, "parentNode");
-  if (parent) {
-    result = Swig_symbol_qualifiedscopename(parent);
-  }
-  name = Getattr(symtab, "name");
-  if (name) {
-    if (!result) {
-      result = NewStringEmpty();
-    }
-    if (Len(result)) {
-      Printv(result, "::", name, NIL);
-    } else {
-      Append(result, name);
-    }
-  }
-  return result;
-}
-
-/* ----------------------------------------------------------------------------- 
- * Swig_symbol_qualified_language_scopename()
- *
- * Get the fully qualified C scopename of a symbol table but using a language
- * specific separator for the scopenames. Basically the same as
- * Swig_symbol_qualifiedscopename() but using the different separator.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_symbol_qualified_language_scopename(Symtab *n) {
-  /* TODO: fix for %rename to work */
-  String *result = Swig_symbol_qualifiedscopename(n);
-  Replaceall(result, "::", NSPACE_SEPARATOR);
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_newscope()
- *
- * Create a new scope.  Returns the newly created scope.
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_newscope(void) {
-  Hash *n;
-  Hash *hsyms, *h;
-
-  hsyms = NewHash();
-  h = NewHash();
-
-  set_nodeType(h, "symboltable");
-  Setattr(h, "symtab", hsyms);
-  Delete(hsyms);
-  set_parentNode(h, current_symtab);
-
-  n = lastChild(current_symtab);
-  if (!n) {
-    set_firstChild(current_symtab, h);
-  } else {
-    set_nextSibling(n, h);
-    Delete(h);
-  }
-  set_lastChild(current_symtab, h);
-  current = hsyms;
-  ccurrent = NewHash();
-  Setattr(h, "csymtab", ccurrent);
-  Delete(ccurrent);
-  current_symtab = h;
-  return h;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_setscope()
- *
- * Set the current scope.  Returns the previous current scope.
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_setscope(Symtab *sym) {
-  Symtab *ret = current_symtab;
-  current_symtab = sym;
-  current = Getattr(sym, "symtab");
-  assert(current);
-  ccurrent = Getattr(sym, "csymtab");
-  assert(ccurrent);
-  return ret;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_popscope()
- *
- * Pop out of the current scope.  Returns the popped scope and sets the
- * scope to the parent scope.
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_popscope(void) {
-  Hash *h = current_symtab;
-  current_symtab = Getattr(current_symtab, "parentNode");
-  assert(current_symtab);
-  current = Getattr(current_symtab, "symtab");
-  assert(current);
-  ccurrent = Getattr(current_symtab, "csymtab");
-  assert(ccurrent);
-  return h;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_global_scope()
- *
- * Return the symbol table for the global scope.
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_global_scope(void) {
-  return global_scope;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_current()
- *
- * Return the current symbol table.
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_current(void) {
-  return current_symtab;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_alias()
- *
- * Makes an alias for a symbol in the global symbol table.
- * Primarily for namespace aliases such as 'namespace X = Y;'.
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *s) {
-  String *qname = Swig_symbol_qualifiedscopename(current_symtab);
-  if (qname) {
-    Printf(qname, "::%s", aliasname);
-  } else {
-    qname = NewString(aliasname);
-  }
-  if (!Getattr(symtabs, qname)) {
-    Setattr(symtabs, qname, s);
-  }
-  Delete(qname);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_inherit()
- *
- * Inherit symbols from another scope. Primarily for C++ inheritance and
- * for using directives, such as 'using namespace X;'
- * but not for using declarations, such as 'using A;'.
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_inherit(Symtab *s) {
-  int i, ilen;
-  List *inherit = Getattr(current_symtab, "inherit");
-  if (!inherit) {
-    inherit = NewList();
-    Setattr(current_symtab, "inherit", inherit);
-    Delete(inherit);
-  }
-
-  if (s == current_symtab) {
-    Swig_warning(WARN_PARSE_REC_INHERITANCE, Getfile(s), Getline(s), "Recursive scope inheritance of '%s'.\n", Getattr(s, "name"));
-    return;
-  }
-  assert(s != current_symtab);
-  ilen = Len(inherit);
-  for (i = 0; i < ilen; i++) {
-    Node *n = Getitem(inherit, i);
-    if (n == s)
-      return;			/* Already inherited */
-  }
-  Append(inherit, s);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_cadd()
- *
- * Adds a node to the C symbol table only.
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_cadd(const_String_or_char_ptr name, Node *n) {
-  Node *append = 0;
-  Node *cn;
-  /* There are a few options for weak symbols.  A "weak" symbol 
-     is any symbol that can be replaced by another symbol in the C symbol
-     table.  An example would be a forward class declaration.  A forward
-     class sits in the symbol table until a real class declaration comes along.
-
-     Certain symbols are marked as "sym:typename".  These are important 
-     symbols related to the C++ type-system and take precedence in the C
-     symbol table.  An example might be code like this:
-
-     template<class T> T foo(T x);
-     int foo(int);
-
-     In this case, the template is marked with "sym:typename" so that it
-     stays in the C symbol table (so that it can be expanded using %template).
-   */
-
-  if (!name)
-    return;
-
-  if (SwigType_istemplate(name)) {
-    String *cname = NewString(name);
-    String *dname = Swig_symbol_template_deftype(cname, 0);
-    if (!Equal(dname, name)) {
-      Swig_symbol_cadd(dname, n);
-    }
-    Delete(dname);
-    Delete(cname);
-  }
-#ifdef SWIG_DEBUG
-  Printf(stderr, "symbol_cadd %s %p\n", name, n);
-#endif
-  cn = Getattr(ccurrent, name);
-
-  if (cn && (Getattr(cn, "sym:typename"))) {
-    /* The node in the C symbol table is a typename.  Do nothing */
-    /* We might append the symbol at the end */
-    append = n;
-  } else if (cn && (Getattr(cn, "sym:weak"))) {
-    /* The node in the symbol table is weak. Replace it */
-    if (checkAttribute(cn, "nodeType", "template")
-	&& checkAttribute(cn, "templatetype", "classforward")) {
-      /* The node is a template classforward declaration, and the
-         default template parameters here take precedence. */
-      ParmList *pc = Getattr(cn, "templateparms");
-      ParmList *pn = Getattr(n, "templateparms");
-#ifdef SWIG_DEBUG
-      Printf(stderr, "found template classforward %s\n", Getattr(cn, "name"));
-#endif
-      while (pc && pn) {
-	String *value = Getattr(pc, "value");
-	if (value) {
-#ifdef SWIG_DEBUG
-	  Printf(stderr, "add default template value %s %s\n", Getattr(pc, "name"), value);
-#endif
-	  Setattr(pn, "value", value);
-	}
-	pc = nextSibling(pc);
-	pn = nextSibling(pn);
-      }
-      Setattr(n, "templateparms", Getattr(cn, "templateparms"));
-    }
-    Setattr(ccurrent, name, n);
-
-  } else if (cn && (Getattr(n, "sym:weak"))) {
-    /* The node being added is weak.  Don't worry about it */
-  } else if (cn && (Getattr(n, "sym:typename"))) {
-    /* The node being added is a typename.  We definitely add it */
-    Setattr(ccurrent, name, n);
-    append = cn;
-  } else if (cn && (Checkattr(cn, "nodeType", "templateparm"))) {
-    Swig_error(Getfile(n), Getline(n), "Declaration of '%s' shadows template parameter,\n", name);
-    Swig_error(Getfile(cn), Getline(cn), "previous template parameter declaration '%s'.\n", name);
-    return;
-  } else if (cn) {
-    append = n;
-  } else if (!cn) {
-    /* No conflict. Add the symbol */
-    Setattr(ccurrent, name, n);
-  }
-
-  /* Multiple entries in the C symbol table.   We append to to the symbol table */
-  if (append) {
-    Node *fn, *pn = 0;
-    cn = Getattr(ccurrent, name);
-    fn = cn;
-    while (fn) {
-      pn = fn;
-      if (fn == append) {
-	/* already added. Bail */
-	return;
-      }
-      fn = Getattr(fn, "csym:nextSibling");
-    }
-    if (pn) {
-      Setattr(pn, "csym:nextSibling", append);
-    }
-  }
-
-  /* Special typedef handling.  When a typedef node is added to the symbol table, we
-     might have to add a type alias.   This would occur if the typedef mapped to another
-     scope in the system.  For example:
-
-     class Foo {
-     };
-
-     typedef Foo OtherFoo;
-
-     In this case, OtherFoo becomes an alias for Foo. */
-
-  {
-    Node *td = n;
-    while (td && Checkattr(td, "nodeType", "cdecl") && Checkattr(td, "storage", "typedef")) {
-      SwigType *type;
-      Node *td1;
-      type = Copy(Getattr(td, "type"));
-      SwigType_push(type, Getattr(td, "decl"));
-      td1 = Swig_symbol_clookup(type, 0);
-
-      /* Fix pathetic case #1214313:
-
-         class Foo
-         {
-         };
-
-         typedef Foo FooBar;
-
-         class CBaz
-         {
-         public:
-         typedef FooBar Foo;
-         };
-
-         ie, when Foo -> FooBar -> Foo, jump one scope up when possible.
-
-       */
-      if (td1 && Checkattr(td1, "storage", "typedef")) {
-	String *st = Getattr(td1, "type");
-	String *sn = Getattr(td, "name");
-	if (st && sn && Equal(st, sn)) {
-	  Symtab *sc = Getattr(current_symtab, "parentNode");
-	  if (sc)
-	    td1 = Swig_symbol_clookup(type, sc);
-	}
-      }
-
-      Delete(type);
-      if (td1 == td)
-	break;
-      td = td1;
-      if (td) {
-	Symtab *st = Getattr(td, "symtab");
-	if (st) {
-	  Swig_symbol_alias(Getattr(n, "name"), st);
-	  break;
-	}
-      }
-    }
-  }
-}
-
-/* ----------------------------------------------------------------------------- 
- * Swig_symbol_add()
- *
- * Adds a node to the symbol table.  Returns the node itself if successfully
- * added.  Otherwise, it returns the symbol table entry of the conflicting node.
- *
- * Also places the symbol in a behind-the-scenes C symbol table.  This is needed
- * for namespace support, type resolution, and other issues.
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *n) {
-  Hash *c, *cn, *cl = 0;
-  SwigType *decl, *ndecl;
-  String *cstorage, *nstorage;
-  int nt = 0, ct = 0;
-  int pn = 0;
-  int u1 = 0, u2 = 0;
-  String *name, *overname;
-
-  /* See if the node has a name.  If so, we place in the C symbol table for this
-     scope. We don't worry about overloading here---the primary purpose of this
-     is to record information for type/name resolution for later. Conflicts
-     in C namespaces are errors, but these will be caught by the C++ compiler
-     when compiling the wrapper code */
-
-
-  /* There are a few options for weak symbols.  A "weak" symbol 
-     is any symbol that can be replaced by another symbol in the C symbol
-     table.  An example would be a forward class declaration.  A forward
-     class sits in the symbol table until a real class declaration comes along.
-
-     Certain symbols are marked as "sym:typename".  These are important 
-     symbols related to the C++ type-system and take precedence in the C
-     symbol table.  An example might be code like this:
-
-     template<class T> T foo(T x);
-     int foo(int);
-
-     In this case, the template is marked with "sym:typename" so that it
-     stays in the C symbol table (so that it can be expanded using %template).
-   */
-
-  name = Getattr(n, "name");
-  if (name && Len(name)) {
-    Swig_symbol_cadd(name, n);
-  }
-
-  /* No symbol name defined.  We return. */
-  if (!symname) {
-    Setattr(n, "sym:symtab", current_symtab);
-    return n;
-  }
-
-  /* If node is ignored. We don't proceed any further */
-  if (GetFlag(n, "feature:ignore"))
-    return n;
-
-  /* See if the symbol already exists in the table */
-  c = Getattr(current, symname);
-
-  /* Check for a weak symbol.  A weak symbol is allowed to be in the
-     symbol table, but is silently overwritten by other symbols.  An example
-     would be a forward class declaration.  For instance:
-
-     class Foo;
-
-     In this case, "Foo" sits in the symbol table.  However, the
-     definition of Foo would replace the entry if it appeared later. */
-
-  if (c && Getattr(c, "sym:weak")) {
-    c = 0;
-  }
-  if (c) {
-    /* There is a symbol table conflict.  There are a few cases to consider here:
-       (1) A conflict between a class/enum and a typedef declaration is okay.
-       In this case, the symbol table entry is set to the class/enum declaration
-       itself, not the typedef.   
-
-       (2) A conflict between namespaces is okay--namespaces are open
-
-       (3) Otherwise, overloading is only allowed for functions
-     */
-
-    /* Check for namespaces */
-    String *ntype = Getattr(n, "nodeType");
-    if ((Equal(ntype, Getattr(c, "nodeType"))) && ((Equal(ntype, "namespace")))) {
-      Node *cl, *pcl = 0;
-      cl = c;
-      while (cl) {
-	pcl = cl;
-	cl = Getattr(cl, "sym:nextSibling");
-      }
-      Setattr(pcl, "sym:nextSibling", n);
-      Setattr(n, "sym:symtab", current_symtab);
-      Setattr(n, "sym:name", symname);
-      Setattr(n, "sym:previousSibling", pcl);
-      return n;
-    }
-    if (Getattr(n, "allows_typedef"))
-      nt = 1;
-    if (Getattr(c, "allows_typedef"))
-      ct = 1;
-    if (nt || ct) {
-      Node *td, *other;
-      String *s;
-      /* At least one of the nodes allows typedef overloading.  Make sure that
-         both don't--this would be a conflict */
-
-      if (nt && ct)
-	return c;
-
-      /* Figure out which node allows the typedef */
-      if (nt) {
-	td = n;
-	other = c;
-      } else {
-	td = c;
-	other = n;
-      }
-      /* Make sure the other node is a typedef */
-      s = Getattr(other, "storage");
-      if (!s || (!Equal(s, "typedef")))
-	return c;		/* No.  This is a conflict */
-
-      /* Hmmm.  This appears to be okay.  Make sure the symbol table refers to the allow_type node */
-
-      if (td != c) {
-	Setattr(current, symname, td);
-	Setattr(td, "sym:symtab", current_symtab);
-	Setattr(td, "sym:name", symname);
-      }
-      return n;
-    }
-
-    decl = Getattr(c, "decl");
-    ndecl = Getattr(n, "decl");
-
-    {
-      String *nt1, *nt2;
-      nt1 = Getattr(n, "nodeType");
-      if (Equal(nt1, "template"))
-	nt1 = Getattr(n, "templatetype");
-      nt2 = Getattr(c, "nodeType");
-      if (Equal(nt2, "template"))
-	nt2 = Getattr(c, "templatetype");
-      if (Equal(nt1, "using"))
-	u1 = 1;
-      if (Equal(nt2, "using"))
-	u2 = 1;
-
-      if ((!Equal(nt1, nt2)) && !(u1 || u2))
-	return c;
-    }
-    if (!(u1 || u2)) {
-      if ((!SwigType_isfunction(decl)) || (!SwigType_isfunction(ndecl))) {
-	/* Symbol table conflict */
-	return c;
-      }
-    }
-
-    /* Hmmm. Declarator seems to indicate that this is a function */
-    /* Look at storage class to see if compatible */
-    cstorage = Getattr(c, "storage");
-    nstorage = Getattr(n, "storage");
-
-    /* If either one is declared as typedef, forget it. We're hosed */
-    if (Cmp(cstorage, "typedef") == 0) {
-      return c;
-    }
-    if (Cmp(nstorage, "typedef") == 0) {
-      return c;
-    }
-
-    /* Okay. Walk down the list of symbols and see if we get a declarator match */
-    {
-      String *nt = Getattr(n, "nodeType");
-      int n_template = Equal(nt, "template") && Checkattr(n, "templatetype", "cdecl");
-      int n_plain_cdecl = Equal(nt, "cdecl");
-      cn = c;
-      pn = 0;
-      while (cn) {
-	decl = Getattr(cn, "decl");
-	if (!(u1 || u2)) {
-	  if (Cmp(ndecl, decl) == 0) {
-	    /* Declarator conflict */
-	    /* Now check we don't have a non-templated function overloaded by a templated function with same params,
-	     * eg void foo(); template<typename> void foo(); */
-	    String *cnt = Getattr(cn, "nodeType");
-	    int cn_template = Equal(cnt, "template") && Checkattr(cn, "templatetype", "cdecl");
-	    int cn_plain_cdecl = Equal(cnt, "cdecl");
-	    if (!((n_template && cn_plain_cdecl) || (cn_template && n_plain_cdecl))) {
-	      /* found a conflict */
-	      return cn;
-	    }
-	  }
-	}
-	cl = cn;
-	cn = Getattr(cn, "sym:nextSibling");
-	pn++;
-      }
-    }
-    /* Well, we made it this far.  Guess we can drop the symbol in place */
-    Setattr(n, "sym:symtab", current_symtab);
-    Setattr(n, "sym:name", symname);
-    /* Printf(stdout,"%s %p\n", Getattr(n,"sym:overname"), current_symtab); */
-    assert(!Getattr(n, "sym:overname"));
-    overname = NewStringf("__SWIG_%d", pn);
-    Setattr(n, "sym:overname", overname);
-    /*Printf(stdout,"%s %s %s\n", symname, Getattr(n,"decl"), Getattr(n,"sym:overname")); */
-    Setattr(cl, "sym:nextSibling", n);
-    Setattr(n, "sym:previousSibling", cl);
-    Setattr(cl, "sym:overloaded", c);
-    Setattr(n, "sym:overloaded", c);
-    Delete(overname);
-    return n;
-  }
-
-  /* No conflict.  Just add it */
-  Setattr(n, "sym:symtab", current_symtab);
-  Setattr(n, "sym:name", symname);
-  /* Printf(stdout,"%s\n", Getattr(n,"sym:overname")); */
-  overname = NewStringf("__SWIG_%d", pn);
-  Setattr(n, "sym:overname", overname);
-  Delete(overname);
-  /* Printf(stdout,"%s %s %s\n", symname, Getattr(n,"decl"), Getattr(n,"sym:overname")); */
-  Setattr(current, symname, n);
-  return n;
-}
-
-/* -----------------------------------------------------------------------------
- * symbol_lookup()
- *
- * Internal function to handle fully qualified symbol table lookups.  This
- * works from the symbol table supplied in symtab and unwinds its way out
- * towards the global scope. 
- *
- * This function operates in the C namespace, not the target namespace.
- *
- * The check function is an optional callback that can be used to verify a particular
- * symbol match.   This is only used in some of the more exotic parts of SWIG. For instance,
- * verifying that a class hierarchy implements all pure virtual methods.
- * ----------------------------------------------------------------------------- */
-
-static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (Node *n)) {
-  Node *n;
-  List *inherit;
-  Hash *sym = Getattr(symtab, "csymtab");
-  if (Getmark(symtab))
-    return 0;
-  Setmark(symtab, 1);
-
-  n = Getattr(sym, name);
-
-#ifdef SWIG_DEBUG
-  Printf(stderr, "symbol_look %s %p %p %s\n", name, n, symtab, Getattr(symtab, "name"));
-#endif
-
-  if (n) {
-    /* if a check-function is defined.  Call it to determine a match */
-    if (check) {
-      int c = check(n);
-      if (c == 1) {
-	Setmark(symtab, 0);
-	return n;
-      }
-      if (c < 0) {
-	/* Terminate the search right away */
-	Setmark(symtab, 0);
-	return 0;
-      }
-    } else {
-      Setmark(symtab, 0);
-      return n;
-    }
-  }
-
-  if (!n && SwigType_istemplate(name)) {
-    String *dname = 0;
-    Setmark(symtab, 0);
-    dname = Swig_symbol_template_deftype(name, symtab);
-    if (!Equal(dname, name)) {
-      n = _symbol_lookup(dname, symtab, check);
-    }
-    Delete(dname);
-    if (n)
-      return n;
-    Setmark(symtab, 1);
-  }
-
-  inherit = Getattr(symtab, "inherit");
-  if (inherit && use_inherit) {
-    int i, len;
-    len = Len(inherit);
-    for (i = 0; i < len; i++) {
-      n = _symbol_lookup(name, Getitem(inherit, i), check);
-      if (n) {
-	Setmark(symtab, 0);
-	return n;
-      }
-    }
-  }
-
-  Setmark(symtab, 0);
-  return 0;
-}
-
-static Node *symbol_lookup(const_String_or_char_ptr name, Symtab *symtab, int (*check) (Node *n)) {
-  Node *n = 0;
-  if (DohCheck(name)) {
-    n = _symbol_lookup(name, symtab, check);
-  } else {
-    String *sname = NewString(name);
-    n = _symbol_lookup(sname, symtab, check);
-    Delete(sname);
-  }
-  return n;
-}
-
-
-
-/* -----------------------------------------------------------------------------
- * symbol_lookup_qualified()
- * ----------------------------------------------------------------------------- */
-
-static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symtab, const String *prefix, int local, int (*checkfunc) (Node *n)) {
-  /* This is a little funky, we search by fully qualified names */
-
-  if (!symtab)
-    return 0;
-  if (!prefix) {
-    Node *n;
-    String *bname;
-    String *prefix;
-    Swig_scopename_split(name, &prefix, &bname);
-    n = symbol_lookup_qualified(bname, symtab, prefix, local, checkfunc);
-    Delete(bname);
-    Delete(prefix);
-    return n;
-  } else {
-    Symtab *st;
-    Node *n = 0;
-    /* Make qualified name of current scope */
-    String *qalloc = 0;
-    String *qname = Swig_symbol_qualifiedscopename(symtab);
-    const String *cqname;
-    if (qname) {
-      if (Len(qname)) {
-	if (prefix && Len(prefix)) {
-	  Printv(qname, "::", prefix, NIL);
-	}
-      } else {
-	Append(qname, prefix);
-      }
-      qalloc = qname;
-      cqname = qname;
-    } else {
-      cqname = prefix;
-    }
-    st = Getattr(symtabs, cqname);
-    /* Found a scope match */
-    if (st) {
-      if (!name) {
-	if (qalloc)
-	  Delete(qalloc);
-	return st;
-      }
-      n = symbol_lookup(name, st, checkfunc);
-    }
-    if (qalloc)
-      Delete(qalloc);
-
-    if (!n) {
-      if (!local) {
-	Node *pn = Getattr(symtab, "parentNode");
-	if (pn)
-	  n = symbol_lookup_qualified(name, pn, prefix, local, checkfunc);
-
-	/* Check inherited scopes */
-	if (!n) {
-	  List *inherit = Getattr(symtab, "inherit");
-	  if (inherit && use_inherit) {
-	    int i, len;
-	    len = Len(inherit);
-	    for (i = 0; i < len; i++) {
-	      Node *prefix_node = symbol_lookup(prefix, Getitem(inherit, i), checkfunc);
-	      if (prefix_node) {
-		Node *prefix_symtab = Getattr(prefix_node, "symtab");
-		if (prefix_symtab) {
-		  n = symbol_lookup(name, prefix_symtab, checkfunc);
-		  break;
-		}
-	      }
-	    }
-	  }
-	}
-      } else {
-	n = 0;
-      }
-    }
-    return n;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_clookup()
- *
- * Look up a symbol in the symbol table.   This uses the C name, not scripting
- * names.   Note: If we come across a using declaration, we follow it to
- * to get the real node. Any using directives are also followed (but this is
- * implemented in symbol_lookup()).
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_clookup(const_String_or_char_ptr name, Symtab *n) {
-  Hash *hsym = 0;
-  Node *s = 0;
-
-  if (!n) {
-    hsym = current_symtab;
-  } else {
-    if (!Checkattr(n, "nodeType", "symboltable")) {
-      n = Getattr(n, "sym:symtab");
-    }
-    assert(n);
-    if (n) {
-      hsym = n;
-    }
-  }
-
-  if (Swig_scopename_check(name)) {
-    char *cname = Char(name);
-    if (strncmp(cname, "::", 2) == 0) {
-      String *nname = NewString(cname + 2);
-      if (Swig_scopename_check(nname)) {
-	s = symbol_lookup_qualified(nname, global_scope, 0, 0, 0);
-      } else {
-	s = symbol_lookup(nname, global_scope, 0);
-      }
-      Delete(nname);
-    } else {
-      String *prefix = Swig_scopename_prefix(name);
-      if (prefix) {
-	s = symbol_lookup_qualified(name, hsym, 0, 0, 0);
-	Delete(prefix);
-	if (!s) {
-	  return 0;
-	}
-      }
-    }
-  }
-  if (!s) {
-    while (hsym) {
-      s = symbol_lookup(name, hsym, 0);
-      if (s)
-	break;
-      hsym = Getattr(hsym, "parentNode");
-      if (!hsym)
-	break;
-    }
-  }
-
-  if (!s) {
-    return 0;
-  }
-  /* Check if s is a 'using' node */
-  while (s && Checkattr(s, "nodeType", "using")) {
-    String *uname = Getattr(s, "uname");
-    Symtab *un = Getattr(s, "sym:symtab");
-    Node *ss = (!Equal(name, uname) || (un != n)) ? Swig_symbol_clookup(uname, un) : 0;	/* avoid infinity loop */
-    if (!ss) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
-    }
-    s = ss;
-  }
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_clookup_check()
- *
- * This function is identical to Swig_symbol_clookup() except that it
- * accepts a callback function that is invoked to determine a symbol match.
- * The purpose of this function is to support complicated algorithms that need
- * to examine multiple definitions of the same symbol that might appear in an
- * inheritance hierarchy. 
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_clookup_check(const_String_or_char_ptr name, Symtab *n, int (*checkfunc) (Node *n)) {
-  Hash *hsym = 0;
-  Node *s = 0;
-
-  if (!n) {
-    hsym = current_symtab;
-  } else {
-    if (!Checkattr(n, "nodeType", "symboltable")) {
-      n = Getattr(n, "sym:symtab");
-    }
-    assert(n);
-    if (n) {
-      hsym = n;
-    }
-  }
-
-  if (Swig_scopename_check(name)) {
-    char *cname = Char(name);
-    if (strncmp(cname, "::", 2) == 0) {
-      String *nname = NewString(cname + 2);
-      if (Swig_scopename_check(nname)) {
-	s = symbol_lookup_qualified(nname, global_scope, 0, 0, checkfunc);
-      } else {
-	s = symbol_lookup(nname, global_scope, checkfunc);
-      }
-      Delete(nname);
-    } else {
-      String *prefix = Swig_scopename_prefix(name);
-      if (prefix) {
-	s = symbol_lookup_qualified(name, hsym, 0, 0, checkfunc);
-	Delete(prefix);
-	if (!s) {
-	  return 0;
-	}
-      }
-    }
-  }
-  if (!s) {
-    while (hsym) {
-      s = symbol_lookup(name, hsym, checkfunc);
-      if (s)
-	break;
-      hsym = Getattr(hsym, "parentNode");
-      if (!hsym)
-	break;
-    }
-  }
-  if (!s) {
-    return 0;
-  }
-  /* Check if s is a 'using' node */
-  while (s && Checkattr(s, "nodeType", "using")) {
-    Node *ss;
-    ss = Swig_symbol_clookup(Getattr(s, "uname"), Getattr(s, "sym:symtab"));
-    if (!ss && !checkfunc) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
-    }
-    s = ss;
-  }
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_clookup_local()
- *
- * Same as Swig_symbol_clookup but parent nodes are not searched, that is, just
- * this symbol table is searched.
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_clookup_local(const_String_or_char_ptr name, Symtab *n) {
-  Hash *hsym;
-  Node *s = 0;
-
-  if (!n) {
-    hsym = current_symtab;
-  } else {
-    if (!Checkattr(n, "nodeType", "symboltable")) {
-      n = Getattr(n, "sym:symtab");
-    }
-    assert(n);
-    hsym = n;
-  }
-
-  if (Swig_scopename_check(name)) {
-    char *cname = Char(name);
-    if (strncmp(cname, "::", 2) == 0) {
-      String *nname = NewString(cname + 2);
-      if (Swig_scopename_check(nname)) {
-	s = symbol_lookup_qualified(nname, global_scope, 0, 0, 0);
-      } else {
-	s = symbol_lookup(nname, global_scope, 0);
-      }
-      Delete(nname);
-    } else {
-      s = symbol_lookup_qualified(name, hsym, 0, 0, 0);
-    }
-  }
-  if (!s) {
-    s = symbol_lookup(name, hsym, 0);
-  }
-  if (!s)
-    return 0;
-  /* Check if s is a 'using' node */
-  while (s && Checkattr(s, "nodeType", "using")) {
-    Node *ss = Swig_symbol_clookup_local(Getattr(s, "uname"), Getattr(s, "sym:symtab"));
-    if (!ss) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
-    }
-    s = ss;
-  }
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_clookup_local_check()
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n, int (*checkfunc) (Node *)) {
-  Hash *hsym;
-  Node *s = 0;
-
-  if (!n) {
-    hsym = current_symtab;
-  } else {
-    if (!Checkattr(n, "nodeType", "symboltable")) {
-      n = Getattr(n, "sym:symtab");
-    }
-    assert(n);
-    hsym = n;
-  }
-
-  if (Swig_scopename_check(name)) {
-    char *cname = Char(name);
-    if (strncmp(cname, "::", 2) == 0) {
-      String *nname = NewString(cname + 2);
-      if (Swig_scopename_check(nname)) {
-	s = symbol_lookup_qualified(nname, global_scope, 0, 0, checkfunc);
-      } else {
-	s = symbol_lookup(nname, global_scope, checkfunc);
-      }
-      Delete(nname);
-    } else {
-      s = symbol_lookup_qualified(name, hsym, 0, 0, checkfunc);
-    }
-  }
-  if (!s) {
-    s = symbol_lookup(name, hsym, checkfunc);
-  }
-  if (!s)
-    return 0;
-  /* Check if s is a 'using' node */
-  while (s && Checkattr(s, "nodeType", "using")) {
-    Node *ss = Swig_symbol_clookup_local_check(Getattr(s, "uname"), Getattr(s, "sym:symtab"), checkfunc);
-    if (!ss && !checkfunc) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
-    }
-    s = ss;
-  }
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_clookup_no_inherit()
- *
- * Symbol lookup like Swig_symbol_clookup but does not follow using declarations.
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_clookup_no_inherit(const_String_or_char_ptr name, Symtab *n) {
-  Node *s = 0;
-  assert(use_inherit==1);
-  use_inherit = 0;
-  s = Swig_symbol_clookup(name, n);
-  use_inherit = 1;
-  return s;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_cscope()
- *
- * Look up a scope name.
- * ----------------------------------------------------------------------------- */
-
-Symtab *Swig_symbol_cscope(const_String_or_char_ptr name, Symtab *symtab) {
-  char *cname = Char(name);
-  if (strncmp(cname, "::", 2) == 0)
-    return symbol_lookup_qualified(0, global_scope, name, 0, 0);
-  return symbol_lookup_qualified(0, symtab, name, 0, 0);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_remove()
- *
- * Remove a symbol. If the symbol is an overloaded function and the symbol removed
- * is not the last in the list of overloaded functions, then the overloaded
- * names (sym:overname attribute) are changed to start from zero, eg __SWIG_0.
- * ----------------------------------------------------------------------------- */
-
-void Swig_symbol_remove(Node *n) {
-  Symtab *symtab;
-  String *symname;
-  String *overname;
-  Node *symprev;
-  Node *symnext;
-  Node *fixovername = 0;
-  symtab = Getattr(n, "sym:symtab");	/* Get symbol table object */
-  symtab = Getattr(symtab, "symtab");	/* Get actual hash table of symbols */
-  symname = Getattr(n, "sym:name");
-  symprev = Getattr(n, "sym:previousSibling");
-  symnext = Getattr(n, "sym:nextSibling");
-
-  /* If previous symbol, just fix the links */
-  if (symprev) {
-    if (symnext) {
-      Setattr(symprev, "sym:nextSibling", symnext);
-      fixovername = symprev;	/* fix as symbol to remove is somewhere in the middle of the linked list */
-    } else {
-      Delattr(symprev, "sym:nextSibling");
-    }
-  } else {
-    /* If no previous symbol, see if there is a next symbol */
-    if (symnext) {
-      Setattr(symtab, symname, symnext);
-      fixovername = symnext;	/* fix as symbol to remove is at head of linked list */
-    } else {
-      if (symname)
-	Delattr(symtab, symname);
-    }
-  }
-  if (symnext) {
-    if (symprev) {
-      Setattr(symnext, "sym:previousSibling", symprev);
-    } else {
-      Delattr(symnext, "sym:previousSibling");
-    }
-  }
-  Delattr(n, "sym:symtab");
-  Delattr(n, "sym:previousSibling");
-  Delattr(n, "sym:nextSibling");
-  Delattr(n, "csym:nextSibling");
-  Delattr(n, "sym:overname");
-  Delattr(n, "csym:previousSibling");
-  Delattr(n, "sym:overloaded");
-  n = 0;
-
-  if (fixovername) {
-    Node *nn = fixovername;
-    Node *head = fixovername;
-    int pn = 0;
-
-    /* find head of linked list */
-    while (nn) {
-      head = nn;
-      nn = Getattr(nn, "sym:previousSibling");
-    }
-
-    /* adjust all the sym:overname strings to start from 0 and increment by one */
-    nn = head;
-    while (nn) {
-      assert(Getattr(nn, "sym:overname"));
-      Delattr(nn, "sym:overname");
-      overname = NewStringf("__SWIG_%d", pn);
-      Setattr(nn, "sym:overname", overname);
-      Delete(overname);
-      pn++;
-      nn = Getattr(nn, "sym:nextSibling");
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_qualified()
- *
- * Return the qualified name of a symbol
- * ----------------------------------------------------------------------------- */
-
-String *Swig_symbol_qualified(Node *n) {
-  Hash *symtab;
-  if (Checkattr(n, "nodeType", "symboltable")) {
-    symtab = n;
-  } else {
-    symtab = Getattr(n, "sym:symtab");
-  }
-  if (!symtab)
-    return NewStringEmpty();
-#ifdef SWIG_DEBUG
-  Printf(stderr, "symbol_qscope %s %p %s\n", Getattr(n, "name"), symtab, Getattr(symtab, "name"));
-#endif
-  return Swig_symbol_qualifiedscopename(symtab);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_isoverloaded()
- * 
- * Check if a symbol is overloaded.  Returns the first symbol if so.
- * ----------------------------------------------------------------------------- */
-
-Node *Swig_symbol_isoverloaded(Node *n) {
-  return Getattr(n, "sym:overloaded");
-}
-
-/* -----------------------------------------------------------------------------
- * symbol_template_qualify()
- *
- * Internal function to create a fully qualified type name for templates
- * ----------------------------------------------------------------------------- */
-
-/* This cache produces problems with OSS, don't active it */
-/* #define SWIG_TEMPLATE_QUALIFY_CACHE */
-static SwigType *symbol_template_qualify(const SwigType *e, Symtab *st) {
-  String *tprefix, *tsuffix;
-  SwigType *qprefix;
-  List *targs;
-  Node *tempn;
-  Symtab *tscope;
-  Iterator ti;
-#ifdef SWIG_TEMPLATE_QUALIFY_CACHE
-  static Hash *qualify_cache = 0;
-  String *scopetype = st ? NewStringf("%s::%s", Getattr(st, "name"), e)
-      : NewStringf("%s::%s", Swig_symbol_getscopename(), e);
-  if (!qualify_cache) {
-    qualify_cache = NewHash();
-  }
-  if (scopetype) {
-    String *cres = Getattr(qualify_cache, scopetype);
-    if (cres) {
-      Delete(scopetype);
-      return Copy(cres);
-    }
-  }
-#endif
-
-  tprefix = SwigType_templateprefix(e);
-  tsuffix = SwigType_templatesuffix(e);
-  qprefix = Swig_symbol_type_qualify(tprefix, st);
-  targs = SwigType_parmlist(e);
-  tempn = Swig_symbol_clookup_local(tprefix, st);
-  tscope = tempn ? Getattr(tempn, "sym:symtab") : 0;
-  Append(qprefix, "<(");
-  for (ti = First(targs); ti.item;) {
-    String *vparm;
-    String *qparm = Swig_symbol_type_qualify(ti.item, st);
-    if (tscope && (tscope != st)) {
-      String *ty = Swig_symbol_type_qualify(qparm, tscope);
-      Delete(qparm);
-      qparm = ty;
-    }
-
-    vparm = Swig_symbol_template_param_eval(qparm, st);
-    Append(qprefix, vparm);
-    ti = Next(ti);
-    if (ti.item) {
-      Putc(',', qprefix);
-    }
-    Delete(qparm);
-    Delete(vparm);
-  }
-  Append(qprefix, ")>");
-  Append(qprefix, tsuffix);
-  Delete(tprefix);
-  Delete(tsuffix);
-  Delete(targs);
-#ifdef SWIG_DEBUG
-  Printf(stderr, "symbol_temp_qual %s %s\n", e, qprefix);
-#endif
-#ifdef SWIG_TEMPLATE_QUALIFY_CACHE
-  Setattr(qualify_cache, scopetype, qprefix);
-  Delete(scopetype);
-#endif
-
-  return qprefix;
-}
-
-
-static int symbol_no_constructor(Node *n) {
-  return !Checkattr(n, "nodeType", "constructor");
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_type_qualify()
- *
- * Create a fully qualified type name
- * Note: Does not resolve a constructor if passed in as the 'type'.
- * ----------------------------------------------------------------------------- */
-
-SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) {
-  List *elements;
-  String *result = NewStringEmpty();
-  int i, len;
-  char *c = Char(t);
-  if (strncmp(c, "::", 2) == 0) {
-    Append(result, t);
-    return result;
-  }
-
-  elements = SwigType_split(t);
-
-  len = Len(elements);
-  for (i = 0; i < len; i++) {
-    String *e = Getitem(elements, i);
-    if (SwigType_issimple(e)) {
-      /* Note: the unary scope operator (::) is being removed from the template parameters here. */
-      Node *n = Swig_symbol_clookup_check(e, st, symbol_no_constructor);
-      if (n) {
-	String *name = Getattr(n, "name");
-	Clear(e);
-	Append(e, name);
-#ifdef SWIG_DEBUG
-	Printf(stderr, "symbol_qual_ei %d %s %s %p\n", i, name, e, st);
-#endif
-	if (!Swig_scopename_check(name)) {
-	  String *qname = Swig_symbol_qualified(n);
-	  if (qname && Len(qname)) {
-	    Insert(e, 0, "::");
-	    Insert(e, 0, qname);
-	  }
-#ifdef SWIG_DEBUG
-	  Printf(stderr, "symbol_qual_sc %d %s %s %p\n", i, qname, e, st);
-#endif
-	  Delete(qname);
-	}
-      } else if (SwigType_istemplate(e)) {
-	SwigType *ty = symbol_template_qualify(e, st);
-	Clear(e);
-	Append(e, ty);
-	Delete(ty);
-      }
-      if (strncmp(Char(e), "::", 2) == 0) {
-	Delitem(e, 0);
-	Delitem(e, 0);
-      }
-      Append(result, e);
-    } else if (SwigType_isfunction(e)) {
-      List *parms = SwigType_parmlist(e);
-      String *s = NewString("f(");
-      Iterator pi = First(parms);
-      while (pi.item) {
-	String *pf = Swig_symbol_type_qualify(pi.item, st);
-	Append(s, pf);
-	pi = Next(pi);
-	if (pi.item) {
-	  Append(s, ",");
-	}
-	Delete(pf);
-      }
-      Append(s, ").");
-      Append(result, s);
-      Delete(parms);
-      Delete(s);
-    } else {
-      Append(result, e);
-    }
-  }
-  Delete(elements);
-#ifdef SWIG_DEBUG
-  Printf(stderr, "symbol_qualify %s %s %p %s\n", t, result, st, st ? Getattr(st, "name") : 0);
-#endif
-
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_template_reduce()
- * Resolves template parameter types
- * For example:
- *   typedef int Int;
- *   typedef Int Integer;
- * with input:
- *   Foo<(Int,Integer)> 
- * returns:
- *   Foo<(int,int)>
- * ----------------------------------------------------------------------------- */
-
-static
-SwigType *Swig_symbol_template_reduce(SwigType *qt, Symtab *ntab) {
-  Parm *p;
-  String *templateargs = SwigType_templateargs(qt);
-  List *parms = SwigType_parmlist(templateargs);
-  Iterator pi = First(parms);
-  String *tprefix = SwigType_templateprefix(qt);
-  String *tsuffix = SwigType_templatesuffix(qt);
-  String *qprefix = SwigType_typedef_qualified(tprefix);
-  Append(qprefix, "<(");
-  while ((p = pi.item)) {
-    String *np;
-    String *tp = Swig_symbol_typedef_reduce(p, ntab);
-    String *qp = Swig_symbol_type_qualify(tp, ntab);
-    Node *n = Swig_symbol_clookup(qp, ntab);
-    if (n) {
-      String *qual = Swig_symbol_qualified(n);
-      np = Copy(Getattr(n, "name"));
-      Delete(tp);
-      tp = np;
-      if (qual && Len(qual)) {
-	Insert(np, 0, "::");
-	Insert(np, 0, qual);
-      }
-      Delete(qual);
-    } else {
-      np = qp;
-    }
-    Append(qprefix, np);
-    pi = Next(pi);
-    if (pi.item) {
-      Append(qprefix, ",");
-    }
-    Delete(qp);
-    Delete(tp);
-  }
-  Append(qprefix, ")>");
-  Append(qprefix, tsuffix);
-  Delete(parms);
-  Delete(tprefix);
-  Delete(tsuffix);
-  Delete(templateargs);
-  return qprefix;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_typedef_reduce()
- *
- * Chase a typedef through symbol tables looking for a match.
- * ----------------------------------------------------------------------------- */
-
-SwigType *Swig_symbol_typedef_reduce(const SwigType *ty, Symtab *tab) {
-  SwigType *prefix, *base;
-  Node *n;
-  String *nt;
-
-  base = SwigType_base(ty);
-  prefix = SwigType_prefix(ty);
-
-  n = Swig_symbol_clookup(base, tab);
-  if (!n) {
-    if (SwigType_istemplate(ty)) {
-      SwigType *qt = Swig_symbol_template_reduce(base, tab);
-      Append(prefix, qt);
-      Delete(qt);
-#ifdef SWIG_DEBUG
-      Printf(stderr, "symbol_reduce (a) %s %s\n", ty, prefix);
-#endif
-      Delete(base);
-      return prefix;
-    } else {
-      Delete(prefix);
-#ifdef SWIG_DEBUG
-      Printf(stderr, "symbol_reduce (b) %s %s\n", ty, ty);
-#endif
-      return Copy(ty);
-    }
-  }
-  nt = Getattr(n, "nodeType");
-  if (Equal(nt, "using")) {
-    String *uname = Getattr(n, "uname");
-    if (uname) {
-      n = Swig_symbol_clookup(base, Getattr(n, "sym:symtab"));
-      if (!n) {
-	Delete(base);
-	Delete(prefix);
-#ifdef SWIG_DEBUG
-	Printf(stderr, "symbol_reduce (c) %s %s\n", ty, ty);
-#endif
-	return Copy(ty);
-      }
-    }
-  }
-  if (Equal(nt, "cdecl")) {
-    String *storage = Getattr(n, "storage");
-    if (storage && (Equal(storage, "typedef"))) {
-      SwigType *decl;
-      SwigType *rt;
-      SwigType *qt;
-      Symtab *ntab;
-      SwigType *nt = Copy(Getattr(n, "type"));
-
-      /* Fix for case 'typedef struct Hello hello;' */
-      {
-	const char *dclass[3] = { "struct ", "union ", "class " };
-	int i;
-	char *c = Char(nt);
-	for (i = 0; i < 3; i++) {
-	  if (strstr(c, dclass[i]) == c) {
-	    Replace(nt, dclass[i], "", DOH_REPLACE_FIRST);
-	  }
-	}
-      }
-      decl = Getattr(n, "decl");
-      if (decl) {
-	SwigType_push(nt, decl);
-      }
-      SwigType_push(nt, prefix);
-      Delete(base);
-      Delete(prefix);
-      ntab = Getattr(n, "sym:symtab");
-      rt = Swig_symbol_typedef_reduce(nt, ntab);
-      qt = Swig_symbol_type_qualify(rt, ntab);
-      if (SwigType_istemplate(qt)) {
-	SwigType *qtr = Swig_symbol_template_reduce(qt, ntab);
-	Delete(qt);
-	qt = qtr;
-      }
-      Delete(nt);
-      Delete(rt);
-#ifdef SWIG_DEBUG
-      Printf(stderr, "symbol_reduce (d) %s %s\n", qt, ty);
-#endif
-      return qt;
-    }
-  }
-  Delete(base);
-  Delete(prefix);
-#ifdef SWIG_DEBUG
-  Printf(stderr, "symbol_reduce (e) %s %s\n", ty, ty);
-#endif
-  return Copy(ty);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_string_qualify()
- *
- * This function takes a string and looks for identifiers.  Identifiers are
- * then qualified according to scope rules.  This function is used in a number
- * of settings including expression evaluation, scoping of conversion operators,
- * and so forth.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_symbol_string_qualify(String *s, Symtab *st) {
-  int have_id = 0;
-  String *id = NewStringEmpty();
-  String *r = NewStringEmpty();
-  char *c = Char(s);
-  int first_char = 1;
-  while (*c) {
-    if (isalpha((int) *c) || (*c == '_') || (*c == ':') || (*c == '~' && first_char) || (isdigit((int) *c) && !first_char)) {
-      Putc(*c, id);
-      have_id = 1;
-    } else {
-      if (have_id) {
-	String *qid = Swig_symbol_type_qualify(id, st);
-	Append(r, qid);
-	Clear(id);
-	Delete(qid);
-	have_id = 0;
-      }
-      Putc(*c, r);
-    }
-    first_char = (*c == ':');
-    c++;
-  }
-  if (have_id) {
-    String *qid = Swig_symbol_type_qualify(id, st);
-    Append(r, qid);
-    Delete(qid);
-  }
-  Delete(id);
-  return r;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_template_defargs()
- *
- * Apply default arg from generic template default args 
- * Returns a parameter list which contains missing default arguments (if any)
- * Note side effects: parms will also contain the extra parameters in its list
- * (but only if non-zero).
- * ----------------------------------------------------------------------------- */
-
-
-ParmList *Swig_symbol_template_defargs(Parm *parms, Parm *targs, Symtab *tscope, Symtab *tsdecl) {
-  ParmList *expandedparms = parms;
-  if (Len(parms) < Len(targs)) {
-    Parm *lp = parms;
-    Parm *p = lp;
-    Parm *tp = targs;
-    while (p && tp) {
-      p = nextSibling(p);
-      tp = nextSibling(tp);
-      if (p)
-	lp = p;
-    }
-    while (tp) {
-      String *value = Getattr(tp, "value");
-      if (value) {
-	Parm *cp;
-	Parm *ta = targs;
-	Parm *p = parms;
-	SwigType *nt = Swig_symbol_string_qualify(value, tsdecl);
-	SwigType *ntq = 0;
-#ifdef SWIG_DEBUG
-	Printf(stderr, "value %s %s %s\n", value, nt, tsdecl ? Getattr(tsdecl, "name") : tsdecl);
-#endif
-	while (p && ta) {
-	  String *name = Getattr(ta, "name");
-	  String *pvalue = Getattr(p, "value");
-	  String *value = pvalue ? pvalue : Getattr(p, "type");
-	  String *ttq = Swig_symbol_type_qualify(value, tscope);
-	  /* value = SwigType_typedef_resolve_all(value); */
-	  Replaceid(nt, name, ttq);
-	  p = nextSibling(p);
-	  ta = nextSibling(ta);
-	  Delete(ttq);
-	}
-	ntq = Swig_symbol_type_qualify(nt, tsdecl);
-	if (SwigType_istemplate(ntq)) {
-	  String *ty = Swig_symbol_template_deftype(ntq, tscope);
-	  Delete(ntq);
-	  ntq = ty;
-	}
-	cp = NewParmWithoutFileLineInfo(ntq, 0);
-	if (lp) {
-	  set_nextSibling(lp, cp);
-	  Delete(cp);
-	} else {
-	  expandedparms = cp;
-	}
-	lp = cp;
-	tp = nextSibling(tp);
-	Delete(nt);
-	Delete(ntq);
-      } else {
-	tp = 0;
-      }
-    }
-  }
-  return expandedparms;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_symbol_template_deftype()
- *
- * Apply default args to generic template type
- * ----------------------------------------------------------------------------- */
-
-#define SWIG_TEMPLATE_DEFTYPE_CACHE
-SwigType *Swig_symbol_template_deftype(const SwigType *type, Symtab *tscope) {
-  String *result = NewStringEmpty();
-  List *elements = SwigType_split(type);
-  int len = Len(elements);
-  int i;
-#ifdef SWIG_TEMPLATE_DEFTYPE_CACHE
-  static Hash *s_cache = 0;
-  Hash *scope_cache;
-  /* The lookup depends on the current scope and potential namespace qualification.
-     Looking up x in namespace y is not the same as looking up x::y in outer scope.
-     -> we use a 2-level hash: first scope and then symbol. */
-  String *scope_name = tscope
-      ? Swig_symbol_qualifiedscopename(tscope)
-      : Swig_symbol_qualifiedscopename(current_symtab);
-  String *type_name = tscope
-      ? NewStringf("%s::%s", Getattr(tscope, "name"), type)
-      : NewStringf("%s::%s", Swig_symbol_getscopename(), type);
-  if (!scope_name) scope_name = NewString("::");
-  if (!s_cache) {
-    s_cache = NewHash();
-  }
-  scope_cache = Getattr(s_cache, scope_name);
-  if (scope_cache) {
-    String *cres = Getattr(scope_cache, type_name);
-    if (cres) {
-      Append(result, cres);
-#ifdef SWIG_DEBUG
-      Printf(stderr, "cached deftype %s(%s) -> %s\n", type, scope_name, result);
-#endif
-      Delete(type_name);
-      Delete(scope_name);
-      return result;
-    }
-  } else {
-      scope_cache = NewHash();
-      Setattr(s_cache, scope_name, scope_cache);
-      Delete(scope_name);
-  }
-#endif
-
-#ifdef SWIG_DEBUG
-  Printf(stderr, "finding deftype %s\n", type);
-#endif
-
-  for (i = 0; i < len; i++) {
-    String *e = Getitem(elements, i);
-    if (SwigType_isfunction(e)) {
-      String *s = NewString("f(");
-      List *parms = SwigType_parmlist(e);
-      Iterator pi = First(parms);
-      while (pi.item) {
-	String *pf = SwigType_istemplate(e) ? Swig_symbol_template_deftype(pi.item, tscope)
-	    : Swig_symbol_type_qualify(pi.item, tscope);
-	Append(s, pf);
-	pi = Next(pi);
-	if (pi.item) {
-	  Append(s, ",");
-	}
-	Delete(pf);
-      }
-      Append(s, ").");
-      Append(result, s);
-      Delete(s);
-      Delete(parms);
-    } else if (SwigType_istemplate(e)) {
-      String *prefix = SwigType_prefix(e);
-      String *base = SwigType_base(e);
-      String *tprefix = SwigType_templateprefix(base);
-      String *targs = SwigType_templateargs(base);
-      String *tsuffix = SwigType_templatesuffix(base);
-      ParmList *tparms = SwigType_function_parms(targs, 0);
-      Node *tempn = Swig_symbol_clookup_local(tprefix, tscope);
-      if (!tempn && tsuffix && Len(tsuffix)) {
-	tempn = Swig_symbol_clookup(tprefix, 0);
-      }
-#ifdef SWIG_DEBUG
-      Printf(stderr, "deftype type %s %s %d\n", e, tprefix, (long) tempn);
-#endif
-      if (tempn) {
-	ParmList *tnargs = Getattr(tempn, "templateparms");
-        ParmList *expandedparms;
-	Parm *p;
-	Symtab *tsdecl = Getattr(tempn, "sym:symtab");
-
-#ifdef SWIG_DEBUG
-	Printf(stderr, "deftype type %s %s %s\n", tprefix, targs, tsuffix);
-#endif
-	Append(tprefix, "<(");
-	expandedparms = Swig_symbol_template_defargs(tparms, tnargs, tscope, tsdecl);
-	p = expandedparms;
-	tscope = tsdecl;
-	while (p) {
-	  SwigType *ptype = Getattr(p, "type");
-	  SwigType *ttr = ptype ? ptype : Getattr(p, "value");
-	  SwigType *ttf = Swig_symbol_type_qualify(ttr, tscope);
-	  SwigType *ttq = Swig_symbol_template_param_eval(ttf, tscope);
-#ifdef SWIG_DEBUG
-	  Printf(stderr, "arg type %s\n", ttq);
-#endif
-	  if (SwigType_istemplate(ttq)) {
-	    SwigType *ttd = Swig_symbol_template_deftype(ttq, tscope);
-	    Delete(ttq);
-	    ttq = ttd;
-#ifdef SWIG_DEBUG
-	    Printf(stderr, "arg deftype %s\n", ttq);
-#endif
-	  }
-	  Append(tprefix, ttq);
-	  p = nextSibling(p);
-	  if (p)
-	    Putc(',', tprefix);
-	  Delete(ttf);
-	  Delete(ttq);
-	}
-	Append(tprefix, ")>");
-	Append(tprefix, tsuffix);
-	Append(prefix, tprefix);
-#ifdef SWIG_DEBUG
-	Printf(stderr, "deftype %s %s \n", type, tprefix);
-#endif
-	Append(result, prefix);
-      } else {
-	Append(result, e);
-      }
-      Delete(prefix);
-      Delete(base);
-      Delete(tprefix);
-      Delete(tsuffix);
-      Delete(targs);
-      Delete(tparms);
-    } else {
-      Append(result, e);
-    }
-  }
-  Delete(elements);
-#ifdef SWIG_TEMPLATE_DEFTYPE_CACHE
-  Setattr(scope_cache, type_name, result);
-  Delete(type_name);
-#endif
-
-  return result;
-}
-
-SwigType *Swig_symbol_template_param_eval(const SwigType *p, Symtab *symtab) {
-  String *value = Copy(p);
-  Node *lastnode = 0;
-  while (1) {
-    Node *n = Swig_symbol_clookup(value, symtab);
-    if (n == lastnode)
-      break;
-    lastnode = n;
-    if (n) {
-      String *nt = Getattr(n, "nodeType");
-      if (Equal(nt, "enumitem")) {
-	/* An enum item.   Generate a fully qualified name */
-	String *qn = Swig_symbol_qualified(n);
-	if (qn && Len(qn)) {
-	  Append(qn, "::");
-	  Append(qn, Getattr(n, "name"));
-	  Delete(value);
-	  value = qn;
-	  continue;
-	} else {
-	  Delete(qn);
-	  break;
-	}
-      } else if ((Equal(nt, "cdecl"))) {
-	String *nv = Getattr(n, "value");
-	if (nv) {
-	  Delete(value);
-	  value = Copy(nv);
-	  continue;
-	}
-      }
-    }
-    break;
-  }
-  return value;
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/tree.c b/dependencies2013/win32/swig/Source/Swig/tree.c
deleted file mode 100644
index 78c04dc9..00000000
--- a/dependencies2013/win32/swig/Source/Swig/tree.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * tree.c
- *
- * This file provides some general purpose functions for manipulating
- * parse trees.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include <stdarg.h>
-#include <assert.h>
-
-/* -----------------------------------------------------------------------------
- * Swig_print_tags()
- *
- * Dump the tag structure of a parse tree to standard output
- * ----------------------------------------------------------------------------- */
-
-void Swig_print_tags(DOH *obj, DOH *root) {
-  DOH *croot, *newroot;
-  DOH *cobj;
-
-  if (!root)
-    croot = NewStringEmpty();
-  else
-    croot = root;
-
-  while (obj) {
-    Swig_diagnostic(Getfile(obj), Getline(obj), "%s . %s\n", croot, nodeType(obj));
-    cobj = firstChild(obj);
-    if (cobj) {
-      newroot = NewStringf("%s . %s", croot, nodeType(obj));
-      Swig_print_tags(cobj, newroot);
-      Delete(newroot);
-    }
-    obj = nextSibling(obj);
-  }
-  if (!root)
-    Delete(croot);
-}
-
-static int indent_level = 0;
-
-static void print_indent(int l) {
-  int i;
-  for (i = 0; i < indent_level; i++) {
-    fputc(' ', stdout);
-  }
-  if (l) {
-    fputc('|', stdout);
-    fputc(' ', stdout);
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_print_node(Node *n)
- * ----------------------------------------------------------------------------- */
-
-void Swig_print_node(Node *obj) {
-  Iterator ki;
-  Node *cobj;
-
-  print_indent(0);
-  Printf(stdout, "+++ %s - %p ----------------------------------------\n", nodeType(obj), obj);
-  ki = First(obj);
-  while (ki.key) {
-    String *k = ki.key;
-    if ((Cmp(k, "nodeType") == 0) || (Cmp(k, "firstChild") == 0) || (Cmp(k, "lastChild") == 0) ||
-	(Cmp(k, "parentNode") == 0) || (Cmp(k, "nextSibling") == 0) || (Cmp(k, "previousSibling") == 0) || (*(Char(k)) == '$')) {
-      /* Do nothing */
-    } else if (Cmp(k, "parms") == 0 || Cmp(k, "wrap:parms") == 0) {
-      print_indent(2);
-      Printf(stdout, "%-12s - %s\n", k, ParmList_str_defaultargs(Getattr(obj, k)));
-    } else {
-      DOH *o;
-      const char *trunc = "";
-      print_indent(2);
-      if (DohIsString(Getattr(obj, k))) {
-	o = Str(Getattr(obj, k));
-	if (Len(o) > 80) {
-	  trunc = "...";
-	}
-	Printf(stdout, "%-12s - \"%(escape)-0.80s%s\"\n", k, o, trunc);
-	Delete(o);
-      } else {
-	Printf(stdout, "%-12s - %p\n", k, Getattr(obj, k));
-      }
-    }
-    ki = Next(ki);
-  }
-  cobj = firstChild(obj);
-  if (cobj) {
-    indent_level += 6;
-    Printf(stdout, "\n");
-    Swig_print_tree(cobj);
-    indent_level -= 6;
-  } else {
-    print_indent(1);
-    Printf(stdout, "\n");
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_print_tree()
- *
- * Dump the tree structure of a parse tree to standard output
- * ----------------------------------------------------------------------------- */
-
-void Swig_print_tree(DOH *obj) {
-  while (obj) {
-    Swig_print_node(obj);
-    obj = nextSibling(obj);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * appendChild()
- *
- * Appends a new child to a node
- * ----------------------------------------------------------------------------- */
-
-void appendChild(Node *node, Node *chd) {
-  Node *lc;
-
-  if (!chd)
-    return;
-
-  lc = lastChild(node);
-  if (!lc) {
-    set_firstChild(node, chd);
-  } else {
-    set_nextSibling(lc, chd);
-    set_previousSibling(chd, lc);
-  }
-  while (chd) {
-    lc = chd;
-    set_parentNode(chd, node);
-    chd = nextSibling(chd);
-  }
-  set_lastChild(node, lc);
-}
-
-/* -----------------------------------------------------------------------------
- * prependChild()
- *
- * Prepends a new child to a node
- * ----------------------------------------------------------------------------- */
-
-void prependChild(Node *node, Node *chd) {
-  Node *fc;
-
-  if (!chd)
-    return;
-
-  fc = firstChild(node);
-  if (fc) {
-    set_nextSibling(chd, fc);
-    set_previousSibling(fc, chd);
-  }
-  set_firstChild(node, chd);
-  while (chd) {
-    set_parentNode(chd, node);
-    chd = nextSibling(chd);
-  }
-}
-
-void appendSibling(Node *node, Node *chd) {
-  Node *parent;
-  Node *lc = node;
-  while (nextSibling(lc))
-    lc = nextSibling(lc);
-  set_nextSibling(lc, chd);
-  set_previousSibling(chd, lc);
-  parent = parentNode(node);
-  if (parent) {
-    while (chd) {
-      lc = chd;
-      set_parentNode(chd, parent);
-      chd = nextSibling(chd);
-    }
-    set_lastChild(parent, lc);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * removeNode()
- *
- * Removes a node from the parse tree.  Detaches it from its parent's child list.
- * ----------------------------------------------------------------------------- */
-
-void removeNode(Node *n) {
-  Node *parent;
-  Node *prev;
-  Node *next;
-
-  parent = parentNode(n);
-  if (!parent) return;
-
-  prev = previousSibling(n);
-  next = nextSibling(n);
-  if (prev) {
-    set_nextSibling(prev, next);
-  } else {
-    if (parent) {
-      set_firstChild(parent, next);
-    }
-  }
-  if (next) {
-    set_previousSibling(next, prev);
-  } else {
-    if (parent) {
-      set_lastChild(parent, prev);
-    }
-  }
-
-  /* Delete attributes */
-  Delattr(n,"parentNode");
-  Delattr(n,"nextSibling");
-  Delattr(n,"prevSibling");
-}
-
-/* -----------------------------------------------------------------------------
- * copyNode()
- *
- * Copies a node, but only copies simple attributes (no lists, hashes).
- * ----------------------------------------------------------------------------- */
-
-Node *copyNode(Node *n) {
-  Iterator ki;
-  Node *c = NewHash();
-  for (ki = First(n); ki.key; ki = Next(ki)) {
-    if (DohIsString(ki.item)) {
-      Setattr(c, ki.key, Copy(ki.item));
-    }
-  }
-  Setfile(c, Getfile(n));
-  Setline(c, Getline(n));
-  return c;
-}
-
-/* -----------------------------------------------------------------------------
- * checkAttribute()
- * ----------------------------------------------------------------------------- */
-
-int checkAttribute(Node *n, const_String_or_char_ptr name, const_String_or_char_ptr value) {
-  String *v = Getattr(n, name);
-  return v ? Equal(v, value) : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_require()
- * ns   - namespace for the view name for saving any attributes under
- * n    - node
- * ...  - list of attribute names of type char*
- * This method checks that the attribute names exist in the node n and asserts if
- * not. Assert will only occur unless the attribute is optional. An attribute is
- * optional if it is prefixed by ?, eg "?value". If the attribute name is prefixed
- * by * or ?, eg "*value" then a copy of the attribute is saved. The saved
- * attributes will be restored on a subsequent call to Swig_restore(). All the
- * saved attributes are saved in the view namespace (prefixed by ns).
- * This function can be called more than once with different namespaces.
- * ----------------------------------------------------------------------------- */
-
-void Swig_require(const char *ns, Node *n, ...) {
-  va_list ap;
-  char *name;
-  DOH *obj;
-
-  va_start(ap, n);
-  name = va_arg(ap, char *);
-  while (name) {
-    int newref = 0;
-    int opt = 0;
-    if (*name == '*') {
-      newref = 1;
-      name++;
-    } else if (*name == '?') {
-      newref = 1;
-      opt = 1;
-      name++;
-    }
-    obj = Getattr(n, name);
-    if (!opt && !obj) {
-      Swig_error(Getfile(n), Getline(n), "Fatal error (Swig_require).  Missing attribute '%s' in node '%s'.\n", name, nodeType(n));
-      assert(obj);
-    }
-    if (!obj)
-      obj = DohNone;
-    if (newref) {
-      /* Save a copy of the attribute */
-      Setattr(n, NewStringf("%s:%s", ns, name), obj);
-    }
-    name = va_arg(ap, char *);
-  }
-  va_end(ap);
-
-  /* Save the view */
-  {
-    String *view = Getattr(n, "view");
-    if (view) {
-      if (Strcmp(view, ns) != 0) {
-	Setattr(n, NewStringf("%s:view", ns), view);
-	Setattr(n, "view", NewString(ns));
-      }
-    } else {
-      Setattr(n, "view", NewString(ns));
-    }
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_save()
- * Same as Swig_require(), but all attribute names are optional and all attributes
- * are saved, ie behaves as if all the attribute names were prefixed by ?.
- * ----------------------------------------------------------------------------- */
-
-void Swig_save(const char *ns, Node *n, ...) {
-  va_list ap;
-  char *name;
-  DOH *obj;
-
-  va_start(ap, n);
-  name = va_arg(ap, char *);
-  while (name) {
-    if (*name == '*') {
-      name++;
-    } else if (*name == '?') {
-      name++;
-    }
-    obj = Getattr(n, name);
-    if (!obj)
-      obj = DohNone;
-
-    /* Save a copy of the attribute */
-    if (Setattr(n, NewStringf("%s:%s", ns, name), obj)) {
-      Printf(stderr, "Swig_save('%s','%s'): Warning, attribute '%s' was already saved.\n", ns, nodeType(n), name);
-    }
-    name = va_arg(ap, char *);
-  }
-  va_end(ap);
-
-  /* Save the view */
-  {
-    String *view = Getattr(n, "view");
-    if (view) {
-      if (Strcmp(view, ns) != 0) {
-	Setattr(n, NewStringf("%s:view", ns), view);
-	Setattr(n, "view", NewString(ns));
-      }
-    } else {
-      Setattr(n, "view", NewString(ns));
-    }
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_restore()
- * Restores attributes saved by a previous call to Swig_require() or Swig_save().
- * ----------------------------------------------------------------------------- */
-
-void Swig_restore(Node *n) {
-  String *temp;
-  int len;
-  List *l;
-  String *ns;
-  Iterator ki;
-
-  ns = Getattr(n, "view");
-  assert(ns);
-
-  l = NewList();
-
-  temp = NewStringf("%s:", ns);
-  len = Len(temp);
-
-  for (ki = First(n); ki.key; ki = Next(ki)) {
-    if (Strncmp(temp, ki.key, len) == 0) {
-      Append(l, ki.key);
-    }
-  }
-  for (ki = First(l); ki.item; ki = Next(ki)) {
-    DOH *obj = Getattr(n, ki.item);
-    Setattr(n, Char(ki.item) + len, obj);
-    Delattr(n, ki.item);
-  }
-  Delete(l);
-  Delete(temp);
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/typemap.c b/dependencies2013/win32/swig/Source/Swig/typemap.c
deleted file mode 100644
index 8970c719..00000000
--- a/dependencies2013/win32/swig/Source/Swig/typemap.c
+++ /dev/null
@@ -1,2113 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * typemap.c
- *
- * A somewhat generalized implementation of SWIG1.1 typemaps.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-#include <ctype.h>
-
-#if 0
-#define SWIG_DEBUG
-#endif
-
-static int typemap_search_debug = 0;
-static int typemaps_used_debug = 0;
-static int typemap_register_debug = 0;
-static int in_typemap_search_multi = 0;
-
-static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper *f, Node *file_line_node);
-
-/* -----------------------------------------------------------------------------
- * Typemaps are stored in a collection of nested hash tables.  Something like
- * this:
- *
- * [ type ]
- *    +-------- [ name ]
- *    +-------- [ name ]
- *    
- * Each hash table [ type ] or [ name ] then contains references to the
- * different typemap methods.    These are referenced by names such as
- * "tmap:in", "tmap:out", "tmap:argout", and so forth.
- *
- * The object corresponding to a specific typemap method has the following attributes:
- *
- *    "type"    -  Typemap type
- *    "pname"   -  Parameter name
- *    "code"    -  Typemap code
- *    "source"  -  Source directive (%apply or %typemap) for the typemap
- *    "locals"  -  Local variables (if any)
- *    "kwargs"  -  Typemap attributes
- * 
- * Example for a typemap method named "in":
- *   %typemap(in, warning="987:my warning", noblock=1) int &my_int (int tmp) "$1 = $input;"
- *
- *    "type"    -  r.int
- *    "pname"   -  my_int
- *    "code"    -  $1 = $input;
- *    "source"  -  typemap(in) int &my_int
- *    "locals"  -  int tmp
- *    "kwargs"  -  warning="987:my typemap warning", foo=123
- * 
- * ----------------------------------------------------------------------------- */
-
-static Hash *typemaps;
-
-static Hash *get_typemap(const SwigType *type) {
-  Hash *tm = 0;
-  SwigType *dtype = 0;
-  SwigType *hashtype;
-
-  if (SwigType_istemplate(type)) {
-    String *ty = Swig_symbol_template_deftype(type, 0);
-    dtype = Swig_symbol_type_qualify(ty, 0);
-    type = dtype;
-    Delete(ty);
-  }
-
-  /* remove unary scope operator (::) prefix indicating global scope for looking up in the hashmap */
-  hashtype = SwigType_remove_global_scope_prefix(type);
-  tm = Getattr(typemaps, hashtype);
-
-  Delete(dtype);
-  Delete(hashtype);
-
-  return tm;
-}
-
-static void set_typemap(const SwigType *type, Hash **tmhash) {
-  SwigType *hashtype = 0;
-  Hash *new_tm = 0;
-  assert(*tmhash == 0);
-  if (SwigType_istemplate(type)) {
-    SwigType *rty = SwigType_typedef_resolve_all(type);
-    String *ty = Swig_symbol_template_deftype(rty, 0);
-    String *tyq = Swig_symbol_type_qualify(ty, 0);
-    hashtype = SwigType_remove_global_scope_prefix(tyq);
-    *tmhash = Getattr(typemaps, hashtype);
-    Delete(rty);
-    Delete(tyq);
-    Delete(ty);
-  } else {
-    hashtype = SwigType_remove_global_scope_prefix(type);
-  }
-
-  if (!*tmhash) {
-    /* this type has not been seen before even after resolving template parameter types */
-    new_tm = NewHash();
-    *tmhash = new_tm;
-  }
-
-  /* note that the unary scope operator (::) prefix indicating global scope has been removed from the type */
-  Setattr(typemaps, hashtype, *tmhash);
-
-  Delete(hashtype);
-  Delete(new_tm);
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_init()
- *
- * Initialize the typemap system
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_init() {
-  typemaps = NewHash();
-}
-
-static String *typemap_method_name(const_String_or_char_ptr tmap_method) {
-  static Hash *names = 0;
-  String *s;
-  /* Due to "interesting" object-identity semantics of DOH,
-     we have to make sure that we only intern strings without object
-     identity into the hash table.
-
-     (typemap_attach_kwargs calls typemap_method_name several times with
-     the "same" String *tmap_method (i.e., same object identity) but differing
-     string values.)
-
-     Most other callers work around this by using char* rather than
-     String *.
-     -- mkoeppe, Jun 17, 2003
-   */
-  const char *method_without_object_identity = Char(tmap_method);
-  if (!names)
-    names = NewHash();
-  s = Getattr(names, method_without_object_identity);
-  if (s)
-    return s;
-  s = NewStringf("tmap:%s", tmap_method);
-  Setattr(names, method_without_object_identity, s);
-  Delete(s);
-  return s;
-}
-
-/* ----------------------------------------------------------------------------- 
- * typemap_register()
- *
- * Internal implementation for Swig_typemap_register()
- * ----------------------------------------------------------------------------- */
-
-static void typemap_register(const_String_or_char_ptr tmap_method, ParmList *parms, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs, String *source_directive) {
-  Hash *tm;
-  Hash *tm1;
-  Hash *tm2;
-  Parm *np;
-  String *tm_method;
-  SwigType *type;
-  String *pname;
-  if (!parms)
-    return;
-
-  if (typemap_register_debug) {
-      Printf(stdout, "Registering - %s\n", tmap_method);
-      Swig_print_node(parms);
-  }
-
-  tm_method = typemap_method_name(tmap_method);
-
-  /* Register the first type in the parameter list */
-
-  type = Getattr(parms, "type");
-  pname = Getattr(parms, "name");
-
-  /* See if this type has been seen before */
-  tm = get_typemap(type);
-  if (!tm) {
-    set_typemap(type, &tm);
-  }
-  if (pname) {
-    /* See if parameter has been seen before */
-    tm1 = Getattr(tm, pname);
-    if (!tm1) {
-      tm1 = NewHash();
-      Setattr(tm, pname, tm1);
-      Delete(tm1);
-    }
-    tm = tm1;
-  }
-
-  /* Now see if this typemap method has been seen before */
-  tm2 = Getattr(tm, tm_method);
-  if (!tm2) {
-    tm2 = NewHash();
-    Setattr(tm, tm_method, tm2);
-    Delete(tm2);
-  }
-
-  /* For a multi-argument typemap, the typemap code and information
-     is really only stored in the last argument.  However, to
-     make this work, we perform a really neat trick using
-     the typemap method name.
-
-     For example, consider this typemap
-
-     %typemap(in) (int foo, int *bar, char *blah[]) {
-     ...
-     }
-
-     To store it, we look at typemaps for the following:
-
-     typemap method            type-name
-     ----------------------------------------------
-     "in"                      int foo
-     "in-int+foo:"             int *bar
-     "in-int+foo:-p.int+bar:   char *blah[]
-
-     Notice how the typemap method name expands to encode information about
-     previous arguments.        
-
-   */
-
-  np = nextSibling(parms);
-  if (np) {
-    /* Make an entirely new typemap method key */
-    String *multi_tmap_method = NewStringf("%s-%s+%s:", tmap_method, type, pname);
-
-    /* Now reregister on the remaining arguments */
-    typemap_register(multi_tmap_method, np, code, locals, kwargs, source_directive);
-
-    Delete(multi_tmap_method);
-  } else {
-    ParmList *clocals = CopyParmList(locals);
-    ParmList *ckwargs = CopyParmList(kwargs);
-
-    Setfile(tm2, Getfile(code));
-    Setline(tm2, Getline(code));
-    Setattr(tm2, "code", code);
-    Setattr(tm2, "type", type);
-    Setattr(tm2, "source", source_directive);
-    if (pname) {
-      Setattr(tm2, "pname", pname);
-    }
-    Setattr(tm2, "locals", clocals);
-    Setattr(tm2, "kwargs", ckwargs);
-
-    Delete(clocals);
-    Delete(ckwargs);
-  }
-}
-
-/* ----------------------------------------------------------------------------- 
- * Swig_typemap_register()
- *
- * Add a new, possibly multi-argument, typemap
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_register(const_String_or_char_ptr tmap_method, ParmList *parms, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs) {
-  String *parms_str = ParmList_str_multibrackets(parms);
-  String *source_directive = NewStringf("typemap(%s) %s", tmap_method, parms_str);
-
-  typemap_register(tmap_method, parms, code, locals, kwargs, source_directive);
-
-  Delete(source_directive);
-  Delete(parms_str);
-}
-
-/* -----------------------------------------------------------------------------
- * typemap_get()
- *
- * Retrieve typemap information.
- * ----------------------------------------------------------------------------- */
-
-static Hash *typemap_get(SwigType *type, const_String_or_char_ptr name) {
-  Hash *tm, *tm1;
-  tm = get_typemap(type);
-  if (!tm) {
-    return 0;
-  }
-  if ((name) && Len(name)) {
-    tm1 = Getattr(tm, name);
-    return tm1;
-  }
-  return tm;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_copy()
- *
- * Copy a typemap
- * ----------------------------------------------------------------------------- */
-
-int Swig_typemap_copy(const_String_or_char_ptr tmap_method, ParmList *srcparms, ParmList *parms) {
-  Hash *tm = 0;
-  String *tm_method;
-  Parm *p;
-  String *pname;
-  SwigType *ptype;
-  String *tm_methods, *multi_tmap_method;
-  if (ParmList_len(parms) != ParmList_len(srcparms))
-    return -1;
-
-  tm_method = typemap_method_name(tmap_method);
-  p = srcparms;
-  tm_methods = NewString(tm_method);
-  while (p) {
-    ptype = Getattr(p, "type");
-    pname = Getattr(p, "name");
-
-    /* Lookup the type */
-    tm = typemap_get(ptype, pname);
-    if (!tm)
-      break;
-
-    tm = Getattr(tm, tm_methods);
-    if (!tm)
-      break;
-
-    /* Got a match.  Look for next typemap */
-    multi_tmap_method = NewStringf("%s-%s+%s:", tm_methods, ptype, pname);
-    Delete(tm_methods);
-    tm_methods = multi_tmap_method;
-    p = nextSibling(p);
-  }
-  Delete(tm_methods);
-
-  if (!p && tm) {
-    /* Got some kind of match */
-    String *parms_str = ParmList_str_multibrackets(parms);
-    String *srcparms_str = ParmList_str_multibrackets(srcparms);
-    String *source_directive = NewStringf("typemap(%s) %s = %s", tmap_method, parms_str, srcparms_str);
-
-    typemap_register(tmap_method, parms, Getattr(tm, "code"), Getattr(tm, "locals"), Getattr(tm, "kwargs"), source_directive);
-
-    Delete(source_directive);
-    Delete(srcparms_str);
-    Delete(parms_str);
-    return 0;
-  }
-
-  /* Not found */
-  return -1;
-
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_clear()
- *
- * Delete a multi-argument typemap
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_clear(const_String_or_char_ptr tmap_method, ParmList *parms) {
-  SwigType *type;
-  String *name;
-  Parm *p;
-  String *multi_tmap_method;
-  Hash *tm = 0;
-
-  /* This might not work */
-  multi_tmap_method = NewString(tmap_method);
-  p = parms;
-  while (p) {
-    type = Getattr(p, "type");
-    name = Getattr(p, "name");
-    tm = typemap_get(type, name);
-    if (!tm)
-      return;
-    p = nextSibling(p);
-    if (p)
-      Printf(multi_tmap_method, "-%s+%s:", type, name);
-  }
-  if (tm) {
-    tm = Getattr(tm, typemap_method_name(multi_tmap_method));
-    if (tm) {
-      Delattr(tm, "code");
-      Delattr(tm, "locals");
-      Delattr(tm, "kwargs");
-    }
-  }
-  Delete(multi_tmap_method);
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_apply()
- *
- * Multi-argument %apply directive.  This is pretty horrible so I sure hope
- * it works.
- * ----------------------------------------------------------------------------- */
-
-static int count_args(String *s) {
-  /* Count up number of arguments */
-  int na = 0;
-  char *c = Char(s);
-  while (*c) {
-    if (*c == '+')
-      na++;
-    c++;
-  }
-  return na;
-}
-
-int Swig_typemap_apply(ParmList *src, ParmList *dest) {
-  String *ssig, *dsig;
-  Parm *p, *np, *lastp, *dp, *lastdp = 0;
-  int narg = 0;
-  SwigType *type = 0, *name;
-  Hash *tm, *sm;
-  int match = 0;
-
-  /*  Printf(stdout,"apply : %s --> %s\n", ParmList_str(src), ParmList_str(dest)); */
-
-  /* Create type signature of source */
-  ssig = NewStringEmpty();
-  dsig = NewStringEmpty();
-  p = src;
-  dp = dest;
-  lastp = 0;
-  while (p) {
-    lastp = p;
-    lastdp = dp;
-    np = nextSibling(p);
-    if (np) {
-      Printf(ssig, "-%s+%s:", Getattr(p, "type"), Getattr(p, "name"));
-      Printf(dsig, "-%s+%s:", Getattr(dp, "type"), Getattr(dp, "name"));
-      narg++;
-    }
-    p = np;
-    dp = nextSibling(dp);
-  }
-
-  /* make sure a typemap node exists for the last destination node */
-  type = Getattr(lastdp, "type");
-  tm = get_typemap(type);
-  if (!tm) {
-    set_typemap(type, &tm);
-  }
-  name = Getattr(lastdp, "name");
-  if (name) {
-    Hash *tm1 = Getattr(tm, name);
-    if (!tm1) {
-      tm1 = NewHash();
-      Setattr(tm, NewString(name), tm1);
-      Delete(tm1);
-    }
-    tm = tm1;
-  }
-
-  /* This is a little nasty.  We need to go searching for all possible typemaps in the
-     source and apply them to the target */
-
-  type = Getattr(lastp, "type");
-  name = Getattr(lastp, "name");
-
-  /* See if there is a matching typemap in this scope */
-  sm = typemap_get(type, name);
-
-  /* if there is not matching, look for a typemap in the
-     original typedef, if any, like in:
-
-     typedef unsigned long size_t;
-     ...
-     %apply(size_t) {my_size};  ==>  %apply(unsigned long) {my_size};
-   */
-  if (!sm) {
-    SwigType *ntype = SwigType_typedef_resolve(type);
-    if (ntype && (Cmp(ntype, type) != 0)) {
-      sm = typemap_get(ntype, name);
-    }
-    Delete(ntype);
-  }
-
-  if (sm) {
-    /* Got a typemap.  Need to only merge attributes for methods that match our signature */
-    Iterator ki;
-    match = 1;
-    for (ki = First(sm); ki.key; ki = Next(ki)) {
-      /* Check for a signature match with the source signature */
-      if ((count_args(ki.key) == narg) && (Strstr(ki.key, ssig))) {
-	String *oldm;
-	/* A typemap we have to copy */
-	String *nkey = Copy(ki.key);
-	Replace(nkey, ssig, dsig, DOH_REPLACE_ANY);
-
-	/* Make sure the typemap doesn't already exist in the target map */
-
-	oldm = Getattr(tm, nkey);
-	if (!oldm || (!Getattr(tm, "code"))) {
-	  String *code;
-	  ParmList *locals;
-	  ParmList *kwargs;
-	  Hash *sm1 = ki.item;
-
-	  code = Getattr(sm1, "code");
-	  locals = Getattr(sm1, "locals");
-	  kwargs = Getattr(sm1, "kwargs");
-	  if (code) {
-	    String *src_str = ParmList_str_multibrackets(src);
-	    String *dest_str = ParmList_str_multibrackets(dest);
-	    String *source_directive = NewStringf("apply %s { %s }", src_str, dest_str);
-
-	    Replace(nkey, dsig, "", DOH_REPLACE_ANY);
-	    Replace(nkey, "tmap:", "", DOH_REPLACE_ANY);
-	    typemap_register(nkey, dest, code, locals, kwargs, source_directive);
-
-	    Delete(source_directive);
-	    Delete(dest_str);
-	    Delete(src_str);
-	  }
-	}
-	Delete(nkey);
-      }
-    }
-  }
-  Delete(ssig);
-  Delete(dsig);
-  return match;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_clear_apply()
- *
- * %clear directive.   Clears all typemaps for a type (in the current scope only).    
- * ----------------------------------------------------------------------------- */
-
-/* Multi-argument %clear directive */
-void Swig_typemap_clear_apply(Parm *parms) {
-  String *tsig;
-  Parm *p, *np, *lastp;
-  int narg = 0;
-  Hash *tm;
-  String *name;
-
-  /* Create a type signature of the parameters */
-  tsig = NewStringEmpty();
-  p = parms;
-  lastp = 0;
-  while (p) {
-    lastp = p;
-    np = nextSibling(p);
-    if (np) {
-      Printf(tsig, "-%s+%s:", Getattr(p, "type"), Getattr(p, "name"));
-      narg++;
-    }
-    p = np;
-  }
-  tm = get_typemap(Getattr(lastp, "type"));
-  if (!tm) {
-    Delete(tsig);
-    return;
-  }
-  name = Getattr(lastp, "name");
-  if (name) {
-    tm = Getattr(tm, name);
-  }
-  if (tm) {
-    /* Clear typemaps that match our signature */
-    Iterator ki, ki2;
-    char *ctsig = Char(tsig);
-    for (ki = First(tm); ki.key; ki = Next(ki)) {
-      char *ckey = Char(ki.key);
-      if (strncmp(ckey, "tmap:", 5) == 0) {
-	int na = count_args(ki.key);
-	if ((na == narg) && strstr(ckey, ctsig)) {
-	  Hash *h = ki.item;
-	  for (ki2 = First(h); ki2.key; ki2 = Next(ki2)) {
-	    Delattr(h, ki2.key);
-	  }
-	}
-      }
-    }
-  }
-  Delete(tsig);
-}
-
-/* Internal function to strip array dimensions. */
-static SwigType *strip_arrays(SwigType *type) {
-  SwigType *t;
-  int ndim;
-  int i;
-  t = Copy(type);
-  ndim = SwigType_array_ndim(t);
-  for (i = 0; i < ndim; i++) {
-    SwigType_array_setdim(t, i, "ANY");
-  }
-  return t;
-}
-
-static void debug_search_result_display(Node *tm) {
-  if (tm)
-    Printf(stdout, "  Using: %%%s\n", Getattr(tm, "source"));
-  else
-    Printf(stdout, "  None found\n");
-}
-
-/* -----------------------------------------------------------------------------
- * typemap_search_helper()
- *
- * Helper function for typemap_search to see if there is a type match in the typemap
- * tm. A match is sought in this order:
- * %typemap(tm_method) ctype cqualifiedname
- * %typemap(tm_method) ctype cname
- * %typemap(tm_method) ctype 
- * ----------------------------------------------------------------------------- */
-
-static Hash *typemap_search_helper(int debug_display, Hash *tm, const String *tm_method, SwigType *ctype, const String *cqualifiedname, const String *cname, Hash **backup) {
-  Hash *result = 0;
-  Hash *tm1;
-  if (debug_display && cqualifiedname)
-    Printf(stdout, "  Looking for: %s\n", SwigType_str(ctype, cqualifiedname));
-  if (tm && cqualifiedname) {
-    tm1 = Getattr(tm, cqualifiedname);
-    if (tm1) {
-      result = Getattr(tm1, tm_method);	/* See if there is a type - qualified name match */
-      if (result && Getattr(result, "code"))
-	goto ret_result;
-      if (result)
-	*backup = result;
-    }
-  }
-  if (debug_display && cname)
-    Printf(stdout, "  Looking for: %s\n", SwigType_str(ctype, cname));
-  if (tm && cname) {
-    tm1 = Getattr(tm, cname);
-    if (tm1) {
-      result = Getattr(tm1, tm_method);	/* See if there is a type - name match */
-      if (result && Getattr(result, "code"))
-	goto ret_result;
-      if (result)
-	*backup = result;
-    }
-  }
-  if (debug_display)
-    Printf(stdout, "  Looking for: %s\n", SwigType_str(ctype, 0));
-  if (tm) {
-    result = Getattr(tm, tm_method);	/* See if there is simply a type without name match */
-    if (result && Getattr(result, "code"))
-      goto ret_result;
-    if (result)
-      *backup = result;
-  }
-ret_result:
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * typemap_search()
- *
- * Search for a typemap match. This is where the typemap pattern matching rules 
- * are implemented... tries to find the most specific typemap that includes a 
- * 'code' attribute.
- * ----------------------------------------------------------------------------- */
-
-static Hash *typemap_search(const_String_or_char_ptr tmap_method, SwigType *type, const_String_or_char_ptr name, const_String_or_char_ptr qualifiedname, SwigType **matchtype, Node *node) {
-  Hash *result = 0;
-  Hash *tm;
-  Hash *backup = 0;
-  SwigType *primitive = 0;
-  SwigType *ctype = 0;
-  SwigType *ctype_unstripped = 0;
-  int isarray;
-  const String *cname = 0;
-  const String *cqualifiedname = 0;
-  String *tm_method = typemap_method_name(tmap_method);
-  int debug_display = (in_typemap_search_multi == 0) && typemap_search_debug;
-
-  if ((name) && Len(name))
-    cname = name;
-  if ((qualifiedname) && Len(qualifiedname))
-    cqualifiedname = qualifiedname;
-
-  if (debug_display) {
-    String *typestr = SwigType_str(type, cqualifiedname ? cqualifiedname : cname);
-    Swig_diagnostic(Getfile(node), Getline(node), "Searching for a suitable '%s' typemap for: %s\n", tmap_method, typestr);
-    Delete(typestr);
-  }
-  ctype = Copy(type);
-  ctype_unstripped = Copy(ctype);
-  while (ctype) {
-    /* Try to get an exact type-match */
-    tm = get_typemap(ctype);
-    result = typemap_search_helper(debug_display, tm, tm_method, ctype, cqualifiedname, cname, &backup);
-    if (result && Getattr(result, "code"))
-      goto ret_result;
-
-    {
-      /* Look for the type reduced to just the template prefix - for templated types without the template parameter list being specified */
-      SwigType *template_prefix = SwigType_istemplate_only_templateprefix(ctype);
-      if (template_prefix) {
-	tm = get_typemap(template_prefix);
-	result = typemap_search_helper(debug_display, tm, tm_method, template_prefix, cqualifiedname, cname, &backup);
-	Delete(template_prefix);
-	if (result && Getattr(result, "code"))
-	  goto ret_result;
-      }
-    }
-
-    /* look for [ANY] arrays */
-    isarray = SwigType_isarray(ctype);
-    if (isarray) {
-      /* If working with arrays, strip away all of the dimensions and replace with "ANY".
-	 See if that generates a match */
-      SwigType *noarrays = strip_arrays(ctype);
-      tm = get_typemap(noarrays);
-      result = typemap_search_helper(debug_display, tm, tm_method, noarrays, cqualifiedname, cname, &backup);
-      Delete(noarrays);
-      if (result && Getattr(result, "code"))
-	goto ret_result;
-    }
-
-    /* No match so far - try with a qualifier stripped (strip one qualifier at a time until none remain)
-     * The order of stripping in SwigType_strip_single_qualifier is used to provide some sort of consistency
-     * with the default (SWIGTYPE) typemap matching rules for the first qualifier to be stripped. */
-    {
-      SwigType *oldctype = ctype;
-      ctype = SwigType_strip_single_qualifier(oldctype);
-      if (!Equal(ctype, oldctype)) {
-	Delete(oldctype);
-	continue;
-      }
-      Delete(oldctype);
-    }
-
-    /* Once all qualifiers are stripped try resolve a typedef */
-    {
-      SwigType *oldctype = ctype;
-      ctype = SwigType_typedef_resolve(ctype_unstripped);
-      Delete(oldctype);
-      ctype_unstripped = Copy(ctype);
-    }
-  }
-
-  /* Hmmm. Well, no match seems to be found at all. See if there is some kind of default (SWIGTYPE) mapping */
-
-  primitive = SwigType_default_create(type);
-  while (primitive) {
-    tm = get_typemap(primitive);
-    result = typemap_search_helper(debug_display, tm, tm_method, primitive, cqualifiedname, cname, &backup);
-    if (result && Getattr(result, "code"))
-      goto ret_result;
-
-    {
-      SwigType *nprim = SwigType_default_deduce(primitive);
-      Delete(primitive);
-      primitive = nprim;
-    }
-  }
-  if (ctype != type) {
-    Delete(ctype);
-    ctype = 0;
-  }
-  result = backup;
-
-ret_result:
-  Delete(primitive);
-  if (matchtype)
-    *matchtype = Copy(ctype);
-  Delete(ctype);
-  Delete(ctype_unstripped);
-  return result;
-}
-
-
-/* -----------------------------------------------------------------------------
- * typemap_search_multi()
- *
- * Search for a multi-argument typemap.
- * ----------------------------------------------------------------------------- */
-
-static Hash *typemap_search_multi(const_String_or_char_ptr tmap_method, ParmList *parms, int *nmatch) {
-  SwigType *type;
-  SwigType *mtype = 0;
-  String *name;
-  String *multi_tmap_method;
-  Hash *tm;
-  Hash *tm1 = 0;
-
-  if (!parms) {
-    *nmatch = 0;
-    return 0;
-  }
-  type = Getattr(parms, "type");
-  name = Getattr(parms, "name");
-
-  /* Try to find a match on the first type */
-  tm = typemap_search(tmap_method, type, name, 0, &mtype, parms);
-  if (tm) {
-    if (mtype && SwigType_isarray(mtype)) {
-      Setattr(parms, "tmap:match", mtype);
-    }
-    Delete(mtype);
-    multi_tmap_method = NewStringf("%s-%s+%s:", tmap_method, type, name);
-    in_typemap_search_multi++;
-    tm1 = typemap_search_multi(multi_tmap_method, nextSibling(parms), nmatch);
-    in_typemap_search_multi--;
-    if (tm1)
-      tm = tm1;
-    if (Getattr(tm, "code")) {
-      *(nmatch) = *nmatch + 1;
-      if (typemap_search_debug && tm1 && (in_typemap_search_multi == 0)) {
-	Printf(stdout, "  Multi-argument typemap found...\n");
-      }
-    } else {
-      tm = 0;
-    }
-    Delete(multi_tmap_method);
-  }
-
-  if (typemap_search_debug && (in_typemap_search_multi == 0))
-    debug_search_result_display(tm);
-  if (typemaps_used_debug && (in_typemap_search_multi == 0) && tm) {
-    String *typestr = SwigType_str(type, name);
-    Swig_diagnostic(Getfile(parms), Getline(parms), "Typemap for %s (%s) : %%%s\n", typestr, tmap_method, Getattr(tm, "source"));
-    assert(Getfile(parms) && Len(Getfile(parms)) > 0); /* Missing file and line numbering information */
-    Delete(typestr);
-  }
-
-  return tm;
-}
-
-
-/* -----------------------------------------------------------------------------
- * typemap_replace_vars()
- *
- * Replaces typemap variables on a string.  index is the $n variable.
- * type and pname are the type and parameter name.
- * ----------------------------------------------------------------------------- */
-
-static void replace_local_types(ParmList *p, const String *name, const String *rep) {
-  SwigType *t;
-  while (p) {
-    t = Getattr(p, "type");
-    Replace(t, name, rep, DOH_REPLACE_ANY);
-    p = nextSibling(p);
-  }
-}
-
-static int check_locals(ParmList *p, const char *s) {
-  while (p) {
-    char *c = GetChar(p, "type");
-    if (strstr(c, s))
-      return 1;
-    p = nextSibling(p);
-  }
-  return 0;
-}
-
-static int typemap_replace_vars(String *s, ParmList *locals, SwigType *type, SwigType *rtype, String *pname, String *lname, int index) {
-  char var[512];
-  char *varname;
-  SwigType *ftype;
-  int bare_substitution_count = 0;
-
-  Replaceall(s, "$typemap", "$TYPEMAP"); /* workaround for $type substitution below */
-
-  ftype = SwigType_typedef_resolve_all(type);
-
-  if (!pname)
-    pname = lname;
-  {
-    Parm *p;
-    int rep = 0;
-    p = locals;
-    while (p) {
-      if (Strchr(Getattr(p, "type"), '$'))
-	rep = 1;
-      p = nextSibling(p);
-    }
-    if (!rep)
-      locals = 0;
-  }
-
-  sprintf(var, "$%d_", index);
-  varname = &var[strlen(var)];
-
-  /* If the original datatype was an array. We're going to go through and substitute
-     its array dimensions */
-
-  if (SwigType_isarray(type) || SwigType_isarray(ftype)) {
-    String *size;
-    int ndim;
-    int i;
-    if (SwigType_array_ndim(type) != SwigType_array_ndim(ftype))
-      type = ftype;
-    ndim = SwigType_array_ndim(type);
-    size = NewStringEmpty();
-    for (i = 0; i < ndim; i++) {
-      String *dim = SwigType_array_getdim(type, i);
-      if (index == 1) {
-	char t[32];
-	sprintf(t, "$dim%d", i);
-	Replace(s, t, dim, DOH_REPLACE_ANY);
-	replace_local_types(locals, t, dim);
-      }
-      sprintf(varname, "dim%d", i);
-      Replace(s, var, dim, DOH_REPLACE_ANY);
-      replace_local_types(locals, var, dim);
-      if (Len(size))
-	Putc('*', size);
-      Append(size, dim);
-      Delete(dim);
-    }
-    sprintf(varname, "size");
-    Replace(s, var, size, DOH_REPLACE_ANY);
-    replace_local_types(locals, var, size);
-    Delete(size);
-  }
-
-  /* Parameter name substitution */
-  if (index == 1) {
-    Replace(s, "$parmname", pname, DOH_REPLACE_ANY);
-  }
-  strcpy(varname, "name");
-  Replace(s, var, pname, DOH_REPLACE_ANY);
-
-  /* Type-related stuff */
-  {
-    SwigType *star_type, *amp_type, *base_type, *lex_type;
-    SwigType *ltype, *star_ltype, *amp_ltype;
-    String *mangle, *star_mangle, *amp_mangle, *base_mangle, *base_name, *base_type_str;
-    String *descriptor, *star_descriptor, *amp_descriptor;
-    String *ts;
-    char *sc;
-
-    sc = Char(s);
-
-    if (strstr(sc, "type") || check_locals(locals, "type")) {
-      /* Given type : $type */
-      ts = SwigType_str(type, 0);
-      if (index == 1) {
-	Replace(s, "$type", ts, DOH_REPLACE_ANY);
-	replace_local_types(locals, "$type", type);
-      }
-      strcpy(varname, "type");
-      Replace(s, var, ts, DOH_REPLACE_ANY);
-      replace_local_types(locals, var, type);
-      Delete(ts);
-      sc = Char(s);
-    }
-    if (strstr(sc, "ltype") || check_locals(locals, "ltype")) {
-      /* Local type:  $ltype */
-      ltype = SwigType_ltype(type);
-      ts = SwigType_str(ltype, 0);
-      if (index == 1) {
-	Replace(s, "$ltype", ts, DOH_REPLACE_ANY);
-	replace_local_types(locals, "$ltype", ltype);
-      }
-      strcpy(varname, "ltype");
-      Replace(s, var, ts, DOH_REPLACE_ANY);
-      replace_local_types(locals, var, ltype);
-      Delete(ts);
-      Delete(ltype);
-      sc = Char(s);
-    }
-    if (strstr(sc, "mangle") || strstr(sc, "descriptor")) {
-      /* Mangled type */
-
-      mangle = SwigType_manglestr(type);
-      if (index == 1)
-	Replace(s, "$mangle", mangle, DOH_REPLACE_ANY);
-      strcpy(varname, "mangle");
-      Replace(s, var, mangle, DOH_REPLACE_ANY);
-
-      descriptor = NewStringf("SWIGTYPE%s", mangle);
-
-      if (index == 1)
-	if (Replace(s, "$descriptor", descriptor, DOH_REPLACE_ANY))
-	  SwigType_remember(type);
-
-      strcpy(varname, "descriptor");
-      if (Replace(s, var, descriptor, DOH_REPLACE_ANY))
-	SwigType_remember(type);
-
-      Delete(descriptor);
-      Delete(mangle);
-    }
-
-    /* One pointer level removed */
-    /* This creates variables of the form
-       $*n_type
-       $*n_ltype
-     */
-
-    if (SwigType_ispointer(ftype) || (SwigType_isarray(ftype)) || (SwigType_isreference(ftype)) || (SwigType_isrvalue_reference(ftype))) {
-      if (!(SwigType_isarray(type) || SwigType_ispointer(type) || SwigType_isreference(type) || SwigType_isrvalue_reference(type))) {
-	star_type = Copy(ftype);
-      } else {
-	star_type = Copy(type);
-      }
-      if (!(SwigType_isreference(star_type) || SwigType_isrvalue_reference(star_type))) {
-	if (SwigType_isarray(star_type)) {
-	  SwigType_del_element(star_type);
-	} else {
-	  SwigType_del_pointer(star_type);
-	}
-	ts = SwigType_str(star_type, 0);
-	if (index == 1) {
-	  Replace(s, "$*type", ts, DOH_REPLACE_ANY);
-	  replace_local_types(locals, "$*type", star_type);
-	}
-	sprintf(varname, "$*%d_type", index);
-	Replace(s, varname, ts, DOH_REPLACE_ANY);
-	replace_local_types(locals, varname, star_type);
-	Delete(ts);
-      } else {
-	SwigType_del_element(star_type);
-      }
-      star_ltype = SwigType_ltype(star_type);
-      ts = SwigType_str(star_ltype, 0);
-      if (index == 1) {
-	Replace(s, "$*ltype", ts, DOH_REPLACE_ANY);
-	replace_local_types(locals, "$*ltype", star_ltype);
-      }
-      sprintf(varname, "$*%d_ltype", index);
-      Replace(s, varname, ts, DOH_REPLACE_ANY);
-      replace_local_types(locals, varname, star_ltype);
-      Delete(ts);
-      Delete(star_ltype);
-
-      star_mangle = SwigType_manglestr(star_type);
-      if (index == 1)
-	Replace(s, "$*mangle", star_mangle, DOH_REPLACE_ANY);
-
-      sprintf(varname, "$*%d_mangle", index);
-      Replace(s, varname, star_mangle, DOH_REPLACE_ANY);
-
-      star_descriptor = NewStringf("SWIGTYPE%s", star_mangle);
-      if (index == 1)
-	if (Replace(s, "$*descriptor", star_descriptor, DOH_REPLACE_ANY))
-	  SwigType_remember(star_type);
-      sprintf(varname, "$*%d_descriptor", index);
-      if (Replace(s, varname, star_descriptor, DOH_REPLACE_ANY))
-	SwigType_remember(star_type);
-
-      Delete(star_descriptor);
-      Delete(star_mangle);
-      Delete(star_type);
-    } else {
-      /* TODO: Signal error if one of the $* substitutions is
-         requested */
-    }
-    /* One pointer level added */
-    amp_type = Copy(type);
-    SwigType_add_pointer(amp_type);
-    ts = SwigType_str(amp_type, 0);
-    if (index == 1) {
-      Replace(s, "$&type", ts, DOH_REPLACE_ANY);
-      replace_local_types(locals, "$&type", amp_type);
-    }
-    sprintf(varname, "$&%d_type", index);
-    Replace(s, varname, ts, DOH_REPLACE_ANY);
-    replace_local_types(locals, varname, amp_type);
-    Delete(ts);
-
-    amp_ltype = SwigType_ltype(type);
-    SwigType_add_pointer(amp_ltype);
-    ts = SwigType_str(amp_ltype, 0);
-
-    if (index == 1) {
-      Replace(s, "$&ltype", ts, DOH_REPLACE_ANY);
-      replace_local_types(locals, "$&ltype", amp_ltype);
-    }
-    sprintf(varname, "$&%d_ltype", index);
-    Replace(s, varname, ts, DOH_REPLACE_ANY);
-    replace_local_types(locals, varname, amp_ltype);
-    Delete(ts);
-    Delete(amp_ltype);
-
-    amp_mangle = SwigType_manglestr(amp_type);
-    if (index == 1)
-      Replace(s, "$&mangle", amp_mangle, DOH_REPLACE_ANY);
-    sprintf(varname, "$&%d_mangle", index);
-    Replace(s, varname, amp_mangle, DOH_REPLACE_ANY);
-
-    amp_descriptor = NewStringf("SWIGTYPE%s", amp_mangle);
-    if (index == 1)
-      if (Replace(s, "$&descriptor", amp_descriptor, DOH_REPLACE_ANY))
-	SwigType_remember(amp_type);
-    sprintf(varname, "$&%d_descriptor", index);
-    if (Replace(s, varname, amp_descriptor, DOH_REPLACE_ANY))
-      SwigType_remember(amp_type);
-
-    Delete(amp_descriptor);
-    Delete(amp_mangle);
-    Delete(amp_type);
-
-    /* Base type */
-    if (SwigType_isarray(type)) {
-      base_type = Copy(type);
-      Delete(SwigType_pop_arrays(base_type));
-    } else {
-      base_type = SwigType_base(type);
-    }
-
-    base_type_str = SwigType_str(base_type, 0);
-    base_name = SwigType_namestr(base_type_str);
-    if (index == 1) {
-      Replace(s, "$basetype", base_name, DOH_REPLACE_ANY);
-      replace_local_types(locals, "$basetype", base_name);
-    }
-    strcpy(varname, "basetype");
-    Replace(s, var, base_type_str, DOH_REPLACE_ANY);
-    replace_local_types(locals, var, base_name);
-
-    base_mangle = SwigType_manglestr(base_type);
-    if (index == 1)
-      Replace(s, "$basemangle", base_mangle, DOH_REPLACE_ANY);
-    strcpy(varname, "basemangle");
-    Replace(s, var, base_mangle, DOH_REPLACE_ANY);
-    Delete(base_mangle);
-    Delete(base_name);
-    Delete(base_type_str);
-    Delete(base_type);
-
-    lex_type = SwigType_base(rtype);
-    if (index == 1)
-      Replace(s, "$lextype", lex_type, DOH_REPLACE_ANY);
-    strcpy(varname, "lextype");
-    Replace(s, var, lex_type, DOH_REPLACE_ANY);
-    Delete(lex_type);
-  }
-
-  /* Replace any $n. with (&n)-> */
-  {
-    char temp[64];
-    sprintf(var, "$%d.", index);
-    sprintf(temp, "(&$%d)->", index);
-    Replace(s, var, temp, DOH_REPLACE_ANY);
-  }
-
-  /* Replace the bare $n variable */
-  sprintf(var, "$%d", index);
-  bare_substitution_count = Replace(s, var, lname, DOH_REPLACE_NUMBER_END);
-  Delete(ftype);
-  return bare_substitution_count;
-}
-
-/* ------------------------------------------------------------------------
- * static typemap_locals()
- *
- * Takes a string, a parameter list and a wrapper function argument and
- * creates the local variables.
- * ------------------------------------------------------------------------ */
-
-static void typemap_locals(String *s, ParmList *l, Wrapper *f, int argnum) {
-  Parm *p;
-  char *new_name;
-
-  p = l;
-  while (p) {
-    SwigType *pt = Getattr(p, "type");
-    SwigType *at = SwigType_alttype(pt, 1);
-    String *pn = Getattr(p, "name");
-    String *value = Getattr(p, "value");
-    if (at)
-      pt = at;
-    if (pn) {
-      if (Len(pn) > 0) {
-	String *str;
-	int isglobal = 0;
-
-	str = NewStringEmpty();
-
-	if (strncmp(Char(pn), "_global_", 8) == 0) {
-	  isglobal = 1;
-	}
-
-	/* If the user gave us $type as the name of the local variable, we'll use
-	   the passed datatype instead */
-
-	if ((argnum >= 0) && (!isglobal)) {
-	  Printf(str, "%s%d", pn, argnum);
-	} else {
-	  Append(str, pn);
-	}
-	if (isglobal && Wrapper_check_local(f, str)) {
-	  p = nextSibling(p);
-	  Delete(str);
-	  if (at)
-	    Delete(at);
-	  continue;
-	}
-	if (value) {
-	  String *pstr = SwigType_str(pt, str);
-	  new_name = Wrapper_new_localv(f, str, pstr, "=", value, NIL);
-	  Delete(pstr);
-	} else {
-	  String *pstr = SwigType_str(pt, str);
-	  new_name = Wrapper_new_localv(f, str, pstr, NIL);
-	  Delete(pstr);
-	}
-	if (!isglobal) {
-	  /* Substitute  */
-	  Replace(s, pn, new_name, DOH_REPLACE_ID | DOH_REPLACE_NOQUOTE);
-	}
-	Delete(str);
-      }
-    }
-    p = nextSibling(p);
-    if (at)
-      Delete(at);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * typemap_warn()
- *
- * If any warning message is attached to this parameter's "tmap:<method>:warning"
- * attribute, return the warning message (special variables will need expanding
- * before displaying the warning).
- * ----------------------------------------------------------------------------- */
-
-static String *typemap_warn(const_String_or_char_ptr tmap_method, Parm *p) {
-  String *temp = NewStringf("%s:warning", tmap_method);
-  String *w = Getattr(p, typemap_method_name(temp));
-  Delete(temp);
-  return w ? Copy(w) : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_lookup()
- *
- * Attach one or more typemaps to a node and optionally generate the typemap contents
- * into the wrapper.
- *
- * Looks for a typemap matching the given type and name and attaches the typemap code
- * and any typemap attributes to the provided node.
- *
- * The node should contain the "type" and "name" attributes for the typemap match on.
- * input. The typemap code and typemap attribute values are attached onto the node
- * prefixed with "tmap:". For example with tmap_method="in", the typemap code can be retrieved 
- * with a call to Getattr(node, "tmap:in") (this is also the string returned) and the 
- * "noblock" attribute can be retrieved with a call to Getattr(node, "tmap:in:noblock").
- *
- * tmap_method - typemap method, eg "in", "out", "newfree"
- * node        - the node to attach the typemap and typemap attributes to
- * lname       - name of variable to substitute $1, $2 etc for
- * f           - wrapper code to generate into if non null
- * actioncode  - code to generate into f before the out typemap code, unless
- *              the optimal attribute is set in the out typemap in which case
- *              $1 in the out typemap will be replaced  by the code in actioncode.
- * ----------------------------------------------------------------------------- */
-
-static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, Node *node, const_String_or_char_ptr lname, Wrapper *f, String *actioncode) {
-  SwigType *type;
-  SwigType *mtype = 0;
-  String *pname;
-  String *qpname = 0;
-  String *noscope_pname = 0;
-  Hash *tm = 0;
-  String *s = 0;
-  String *sdef = 0;
-  String *warning = 0;
-  ParmList *locals;
-  ParmList *kw;
-  char temp[256];
-  String *symname;
-  String *cname = 0;
-  String *clname = 0;
-  char *cmethod = Char(tmap_method);
-  int optimal_attribute = 0;
-  int optimal_substitution = 0;
-  int delete_optimal_attribute = 0;
-  int num_substitutions = 0;
-  SwigType *matchtype = 0;
-
-  type = Getattr(node, "type");
-  if (!type)
-    return sdef;
-
-  /* Special hook (hack!). Check for the 'ref' feature and add code it contains to any 'newfree' typemap code.
-   * We could choose to put this hook into a number of different typemaps, not necessarily 'newfree'... 
-   * Rather confusingly 'newfree' is used to release memory and the 'ref' feature is used to add in memory references - yuck! */
-  if (Cmp(tmap_method, "newfree") == 0) {
-    String *base = SwigType_base(type);
-    Node *typenode = Swig_symbol_clookup(base, 0);
-    if (typenode)
-      sdef = Swig_ref_call(typenode, lname);
-    Delete(base);
-  }
-
-  pname = Getattr(node, "name");
-  noscope_pname = Copy(pname);
-
-  if (pname && Getattr(node, "sym:symtab")) {
-    /* Add on a qualified name search for any symbol in the symbol table, for example:
-     * struct Foo {
-     *   int *foo(int bar)   ->  Foo::foo
-     * };
-     * Note that if node is a parameter (Parm *) then there will be no symbol table attached to the Parm *.
-     */
-    String *qsn;
-    if (Swig_scopename_check(pname)) {
-      /* sometimes pname is qualified, so we remove all the scope for the lookup */
-      Delete(noscope_pname);
-      noscope_pname = Swig_scopename_last(pname);
-      /*
-      Printf(stdout, "Removed scope: %s => %s\n", pname, noscope_pname);
-      */
-    }
-    qsn = Swig_symbol_qualified(node);
-    if (qsn && Len(qsn)) {
-      qpname = NewStringf("%s::%s", qsn, noscope_pname);
-      Delete(qsn);
-    }
-  }
-
-  tm = typemap_search(tmap_method, type, noscope_pname, qpname, &mtype, node);
-  if (typemap_search_debug)
-    debug_search_result_display(tm);
-  if (typemaps_used_debug && tm) {
-    String *typestr = SwigType_str(type, qpname ? qpname : pname);
-    Swig_diagnostic(Getfile(node), Getline(node), "Typemap for %s (%s) : %%%s\n", typestr, tmap_method, Getattr(tm, "source"));
-    assert(Getfile(node) && Len(Getfile(node)) > 0); /* Missing file and line numbering information */
-    Delete(typestr);
-  }
-
-  Delete(qpname);
-  qpname = 0;
-  Delete(noscope_pname);
-  noscope_pname = 0;
-
-  if (!tm)
-    return sdef;
-
-  s = Getattr(tm, "code");
-  if (!s)
-    return sdef;
-
-  /* Empty typemap. No match */
-  if (Cmp(s, "pass") == 0)
-    return sdef;
-
-  s = Copy(s);			/* Make a local copy of the typemap code */
-
-  /* Look in the "out" typemap for the "optimal" attribute */
-  if (Cmp(cmethod, "out") == 0) {
-    kw = Getattr(tm, "kwargs");
-    while (kw) {
-      if (Cmp(Getattr(kw, "name"), "optimal") == 0) {
-	optimal_attribute = GetFlag(kw, "value");
-	break;
-      }
-      kw = nextSibling(kw);
-    }
-  }
-  
-  if (optimal_attribute) {
-    /* Note: "out" typemap is the only typemap that will have the "optimal" attribute set.
-     * If f and actioncode are NULL, then the caller is just looking to attach the "out" attributes
-     * ie, not use the typemap code, otherwise both f and actioncode must be non null. */
-    if (actioncode) {
-      const String *result_equals = NewStringf("%s = ", Swig_cresult_name());
-      clname = Copy(actioncode);
-      /* check that the code in the typemap can be used in this optimal way.
-       * The code should be in the form "result = ...;\n". We need to extract
-       * the "..." part. This may not be possible for various reasons, eg
-       * code added by %exception. This optimal code generation is bit of a
-       * hack and circumvents the normal requirement for a temporary variable 
-       * to hold the result returned from a wrapped function call.
-       */
-      if (Strncmp(clname, result_equals, 9) == 0) {
-        int numreplacements = Replace(clname, result_equals, "", DOH_REPLACE_ID_BEGIN);
-        if (numreplacements == 1) {
-          numreplacements = Replace(clname, ";\n", "", DOH_REPLACE_ID_END);
-          if (numreplacements == 1) {
-            if (Strchr(clname, ';') == 0) {
-              lname = clname;
-              actioncode = 0;
-              optimal_substitution = 1;
-            }
-          }
-        }
-      }
-      if (!optimal_substitution) {
-	Swig_warning(WARN_TYPEMAP_OUT_OPTIMAL_IGNORED, Getfile(node), Getline(node), "Method %s usage of the optimal attribute ignored\n", Swig_name_decl(node));
-	Swig_warning(WARN_TYPEMAP_OUT_OPTIMAL_IGNORED, Getfile(s), Getline(s), "in the out typemap as the following cannot be used to generate optimal code: %s\n", clname);
-	delete_optimal_attribute = 1;
-      }
-    } else {
-      assert(!f);
-    }
-  }
-
-  if (actioncode) {
-    assert(f);
-    Append(f->code, actioncode);
-  }
-
-  /* emit local variables declared in typemap, eg emit declarations for aa and bb in:
-   * %typemap(in) foo (int aa, int bb) "..." */
-  locals = Getattr(tm, "locals");
-  if (locals)
-    locals = CopyParmList(locals);
-
-  if (pname) {
-    if (SwigType_istemplate(pname)) {
-      cname = SwigType_namestr(pname);
-      pname = cname;
-    }
-  }
-  if (SwigType_istemplate((char *) lname)) {
-    clname = SwigType_namestr((char *) lname);
-    lname = clname;
-  }
-
-  matchtype = mtype && SwigType_isarray(mtype) ? mtype : type;
-  num_substitutions = typemap_replace_vars(s, locals, matchtype, type, pname, (char *) lname, 1);
-  if (optimal_substitution && num_substitutions > 1) {
-    Swig_warning(WARN_TYPEMAP_OUT_OPTIMAL_MULTIPLE, Getfile(node), Getline(node), "Multiple calls to %s might be generated due to\n", Swig_name_decl(node));
-    Swig_warning(WARN_TYPEMAP_OUT_OPTIMAL_MULTIPLE, Getfile(s), Getline(s), "optimal attribute usage in the out typemap.\n");
-  }
-
-  if (locals && f) {
-    typemap_locals(s, locals, f, -1);
-  }
-
-  {
-    ParmList *parm_sublist = NewParmWithoutFileLineInfo(type, pname);
-    Setattr(parm_sublist, "lname", lname);
-    replace_embedded_typemap(s, parm_sublist, f, tm);
-    Delete(parm_sublist);
-  }
-
-  /* Attach kwargs - ie the typemap attributes */
-  kw = Getattr(tm, "kwargs");
-  while (kw) {
-    String *value = Copy(Getattr(kw, "value"));
-    String *kwtype = Getattr(kw, "type");
-    char *ckwname = Char(Getattr(kw, "name"));
-    {
-      /* Expand special variables in typemap attributes. */
-      SwigType *ptype = Getattr(node, "type");
-      String *pname = Getattr(node, "name");
-      SwigType *mtype = Getattr(node, "tmap:match");
-      SwigType *matchtype = mtype ? mtype : ptype;
-      ParmList *parm_sublist;
-      typemap_replace_vars(value, NULL, matchtype, ptype, pname, (char *)lname, 1);
-
-      /* Expand special variable macros (embedded typemaps) in typemap attributes. */
-      parm_sublist = NewParmWithoutFileLineInfo(ptype, pname);
-      Setattr(parm_sublist, "lname", lname);
-      replace_embedded_typemap(value, parm_sublist, NULL, tm);
-      Delete(parm_sublist);
-    }
-    if (kwtype) {
-      String *mangle = Swig_string_mangle(kwtype);
-      Append(value, mangle);
-      Delete(mangle);
-    }
-    sprintf(temp, "%s:%s", cmethod, ckwname);
-    Setattr(node, typemap_method_name(temp), value);
-    Delete(value);
-    kw = nextSibling(kw);
-  }
-
-  if (delete_optimal_attribute)
-    Delattr(node, "tmap:out:optimal");
-
-  Replace(s, "$name", pname, DOH_REPLACE_ANY);
-
-  symname = Getattr(node, "sym:name");
-  if (symname)
-    Replace(s, "$symname", symname, DOH_REPLACE_ANY);
-
-  Setattr(node, typemap_method_name(tmap_method), s);
-  if (locals) {
-    sprintf(temp, "%s:locals", cmethod);
-    Setattr(node, typemap_method_name(temp), locals);
-    Delete(locals);
-  }
-
-  if (Checkattr(tm, "type", "SWIGTYPE")) {
-    sprintf(temp, "%s:SWIGTYPE", cmethod);
-    Setattr(node, typemap_method_name(temp), "1");
-  }
-
-  /* Print warnings, if any */
-  warning = typemap_warn(cmethod, node);
-  if (warning) {
-    typemap_replace_vars(warning, 0, matchtype, type, pname, (char *) lname, 1);
-    Replace(warning, "$name", pname, DOH_REPLACE_ANY);
-    if (symname)
-      Replace(warning, "$symname", symname, DOH_REPLACE_ANY);
-    Swig_warning(0, Getfile(node), Getline(node), "%s\n", warning);
-    Delete(warning);
-  }
-
-  /* Look for code fragments */
-  {
-    String *fragment;
-    sprintf(temp, "%s:fragment", cmethod);
-    fragment = Getattr(node, typemap_method_name(temp));
-    if (fragment) {
-      String *fname = Copy(fragment);
-      Setfile(fname, Getfile(node));
-      Setline(fname, Getline(node));
-      Swig_fragment_emit(fname);
-      Delete(fname);
-    }
-  }
-
-  Delete(cname);
-  Delete(clname);
-  Delete(mtype);
-  if (sdef) {			/* put 'ref' and 'newfree' codes together */
-    String *p = NewStringf("%s\n%s", sdef, s);
-    Delete(s);
-    Delete(sdef);
-    s = p;
-  }
-  Delete(actioncode);
-  return s;
-}
-
-String *Swig_typemap_lookup_out(const_String_or_char_ptr tmap_method, Node *node, const_String_or_char_ptr lname, Wrapper *f, String *actioncode) {
-  assert(actioncode);
-  assert(Cmp(tmap_method, "out") == 0);
-  return Swig_typemap_lookup_impl(tmap_method, node, lname, f, actioncode);
-}
-
-String *Swig_typemap_lookup(const_String_or_char_ptr tmap_method, Node *node, const_String_or_char_ptr lname, Wrapper *f) {
-  return Swig_typemap_lookup_impl(tmap_method, node, lname, f, 0);
-}
-
-/* -----------------------------------------------------------------------------
- * typemap_attach_kwargs()
- *
- * If this hash (tm) contains a linked list of parameters under its "kwargs"
- * attribute, add keys for each of those named keyword arguments to this
- * parameter for later use.
- * For example, attach the typemap attributes to firstp (first parameter in parameter list):
- * %typemap(in, foo="xyz") ...
- * A new attribute called "tmap:in:foo" with value "xyz" is attached to firstp.
- * Also expands special variables and special variable macros in the typemap attributes.
- * ----------------------------------------------------------------------------- */
-
-static void typemap_attach_kwargs(Hash *tm, const_String_or_char_ptr tmap_method, Parm *firstp, int nmatch) {
-  String *temp = NewStringEmpty();
-  Parm *kw = Getattr(tm, "kwargs");
-  while (kw) {
-    String *value = Copy(Getattr(kw, "value"));
-    String *type = Getattr(kw, "type");
-    int i;
-    Parm *p = firstp;
-    /* Expand special variables */
-    for (i = 0; i < nmatch; i++) {
-      SwigType *type = Getattr(p, "type");
-      String *pname = Getattr(p, "name");
-      String *lname = Getattr(p, "lname");
-      SwigType *mtype = Getattr(p, "tmap:match");
-      SwigType *matchtype = mtype ? mtype : type;
-      typemap_replace_vars(value, NULL, matchtype, type, pname, lname, i + 1);
-      p = nextSibling(p);
-    }
-
-    /* Expand special variable macros (embedded typemaps).
-     * Special variable are expanded first above as they might be used in the special variable macros.
-     * For example: $typemap(imtype, $2_type). */
-    p = firstp;
-    for (i = 0; i < nmatch; i++) {
-      SwigType *type = Getattr(p, "type");
-      String *pname = Getattr(p, "name");
-      String *lname = Getattr(p, "lname");
-      ParmList *parm_sublist = NewParmWithoutFileLineInfo(type, pname);
-      Setattr(parm_sublist, "lname", lname);
-      replace_embedded_typemap(value, parm_sublist, NULL, tm);
-      p = nextSibling(p);
-    }
-    if (type) {
-      Hash *v = NewHash();
-      Setattr(v, "type", type);
-      Setattr(v, "value", value);
-      Delete(value);
-      value = v;
-    }
-    Clear(temp);
-    Printf(temp, "%s:%s", tmap_method, Getattr(kw, "name"));
-    Setattr(firstp, typemap_method_name(temp), value);
-    Delete(value);
-    kw = nextSibling(kw);
-  }
-  Clear(temp);
-  Printf(temp, "%s:match_type", tmap_method);
-  Setattr(firstp, typemap_method_name(temp), Getattr(tm, "type"));
-  Delete(temp);
-}
-
-static void typemap_emit_code_fragments(const_String_or_char_ptr tmap_method, Parm *p) {
-  String *temp = NewStringf("%s:fragment", tmap_method);
-  String *f = Getattr(p, typemap_method_name(temp));
-  if (f) {
-    String *fname = Copy(f);
-    Setfile(fname, Getfile(p));
-    Setline(fname, Getline(p));
-    Swig_fragment_emit(fname);
-    Delete(fname);
-  }
-  Delete(temp);
-}
-
-static String *typemap_get_option(Hash *tm, const_String_or_char_ptr name) {
-  Parm *kw = Getattr(tm, "kwargs");
-  while (kw) {
-    String *kname = Getattr(kw, "name");
-    if (Equal(kname, name)) {
-      return Getattr(kw, "value");
-    }
-    kw = nextSibling(kw);
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_attach_parms()
- *
- * Given a parameter list, this function attaches all of the typemaps and typemap
- * attributes to the parameter for each type in the parameter list. 
- *
- * This function basically provides the typemap code and typemap attribute values as
- * attributes on each parameter prefixed with "tmap:". For example with tmap_method="in", the typemap
- * code can be retrieved for the first parameter with a call to Getattr(parm, "tmap:in")
- * and the "numinputs" attribute can be retrieved with a call to Getattr(parm, "tmap:in:numinputs").
- *
- * tmap_method - typemap method, eg "in", "out", "newfree"
- * parms       - parameter list to attach each typemap and all typemap attributes
- * f           - wrapper code to generate into if non null
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_attach_parms(const_String_or_char_ptr tmap_method, ParmList *parms, Wrapper *f) {
-  Parm *p, *firstp;
-  Hash *tm;
-  int nmatch = 0;
-  int i;
-  String *s;
-  String *warning = 0;
-  ParmList *locals;
-  int argnum = 0;
-  char temp[256];
-  char *cmethod = Char(tmap_method);
-  String *kwmatch = 0;
-  p = parms;
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_typemap_attach_parms:  %s\n", tmap_method);
-#endif
-
-  while (p) {
-    argnum++;
-    nmatch = 0;
-#ifdef SWIG_DEBUG
-    Printf(stdout, "parms:  %s %s %s\n", tmap_method, Getattr(p, "name"), Getattr(p, "type"));
-#endif
-    tm = typemap_search_multi(tmap_method, p, &nmatch);
-#ifdef SWIG_DEBUG
-    if (tm)
-      Printf(stdout, "found:  %s\n", tm);
-#endif
-    if (!tm) {
-      p = nextSibling(p);
-      continue;
-    }
-    /*
-       Check if the typemap requires to match the type of another
-       typemap, for example:
-
-       %typemap(in) SWIGTYPE * (int var) {...}
-       %typemap(freearg,match="in") SWIGTYPE * {if (var$argnum) ...}
-
-       here, the freearg typemap requires the "in" typemap to match,
-       or the 'var$argnum' variable will not exist.
-     */
-    kwmatch = typemap_get_option(tm, "match");
-    if (kwmatch) {
-      String *tmname = NewStringf("tmap:%s", kwmatch);
-      String *tmin = Getattr(p, tmname);
-      Delete(tmname);
-#ifdef SWIG_DEBUG
-      if (tm)
-	Printf(stdout, "matching:  %s\n", kwmatch);
-#endif
-      if (tmin) {
-	String *tmninp = NewStringf("tmap:%s:numinputs", kwmatch);
-	String *ninp = Getattr(p, tmninp);
-	Delete(tmninp);
-	if (ninp && Equal(ninp, "0")) {
-	  p = nextSibling(p);
-	  continue;
-	} else {
-	  SwigType *typetm = Getattr(tm, "type");
-	  String *temp = NewStringf("tmap:%s:match_type", kwmatch);
-	  SwigType *typein = Getattr(p, temp);
-	  Delete(temp);
-	  if (!Equal(typein, typetm)) {
-	    p = nextSibling(p);
-	    continue;
-	  } else {
-	    int nnmatch;
-	    Hash *tmapin = typemap_search_multi(kwmatch, p, &nnmatch);
-	    String *tmname = Getattr(tm, "pname");
-	    String *tnname = Getattr(tmapin, "pname");
-	    if (!(tmname && tnname && Equal(tmname, tnname)) && !(!tmname && !tnname)) {
-	      p = nextSibling(p);
-	      continue;
-	    }
-	  }
-
-	}
-      } else {
-	p = nextSibling(p);
-	continue;
-      }
-    }
-
-    s = Getattr(tm, "code");
-    if (!s) {
-      p = nextSibling(p);
-      continue;
-    }
-#ifdef SWIG_DEBUG
-    if (s)
-      Printf(stdout, "code:  %s\n", s);
-#endif
-
-    /* Empty typemap. No match */
-    if (Cmp(s, "pass") == 0) {
-      p = nextSibling(p);
-      continue;
-    }
-
-    s = Copy(s);
-    locals = Getattr(tm, "locals");
-    if (locals)
-      locals = CopyParmList(locals);
-    firstp = p;
-#ifdef SWIG_DEBUG
-    Printf(stdout, "nmatch:  %d\n", nmatch);
-#endif
-    for (i = 0; i < nmatch; i++) {
-      SwigType *type = Getattr(p, "type");
-      String *pname = Getattr(p, "name");
-      String *lname = Getattr(p, "lname");
-      SwigType *mtype = Getattr(p, "tmap:match");
-      SwigType *matchtype = mtype ? mtype : type;
-
-      typemap_replace_vars(s, locals, matchtype, type, pname, lname, i + 1);
-      if (mtype)
-	Delattr(p, "tmap:match");
-
-      if (Checkattr(tm, "type", "SWIGTYPE")) {
-	sprintf(temp, "%s:SWIGTYPE", cmethod);
-	Setattr(p, typemap_method_name(temp), "1");
-      }
-      p = nextSibling(p);
-    }
-
-    if (locals && f) {
-      typemap_locals(s, locals, f, argnum);
-    }
-
-    replace_embedded_typemap(s, firstp, f, tm);
-
-    /* Attach attributes to object */
-#ifdef SWIG_DEBUG
-    Printf(stdout, "attach: %s %s %s\n", Getattr(firstp, "name"), typemap_method_name(tmap_method), s);
-#endif
-    Setattr(firstp, typemap_method_name(tmap_method), s);	/* Code object */
-
-    if (locals) {
-      sprintf(temp, "%s:locals", cmethod);
-      Setattr(firstp, typemap_method_name(temp), locals);
-      Delete(locals);
-    }
-
-    /* Attach a link to the next parameter.  Needed for multimaps */
-    sprintf(temp, "%s:next", cmethod);
-    Setattr(firstp, typemap_method_name(temp), p);
-
-    /* Attach kwargs */
-    typemap_attach_kwargs(tm, tmap_method, firstp, nmatch);
-
-    /* Replace the argument number */
-    sprintf(temp, "%d", argnum);
-    Replace(s, "$argnum", temp, DOH_REPLACE_ANY);
-
-    /* Print warnings, if any */
-    warning = typemap_warn(tmap_method, firstp);
-    if (warning) {
-      SwigType *type = Getattr(firstp, "type");
-      String *pname = Getattr(firstp, "name");
-      String *lname = Getattr(firstp, "lname");
-      SwigType *mtype = Getattr(firstp, "tmap:match");
-      SwigType *matchtype = mtype ? mtype : type;
-      typemap_replace_vars(warning, 0, matchtype, type, pname, lname, 1);
-      Replace(warning, "$argnum", temp, DOH_REPLACE_ANY);
-      Swig_warning(0, Getfile(firstp), Getline(firstp), "%s\n", warning);
-      Delete(warning);
-    }
-
-    /* Look for code fragments */
-    typemap_emit_code_fragments(tmap_method, firstp);
-
-    /* increase argnum to consider numinputs */
-    argnum += nmatch - 1;
-    Delete(s);
-#ifdef SWIG_DEBUG
-    Printf(stdout, "res: %s %s %s\n", Getattr(firstp, "name"), typemap_method_name(tmap_method), Getattr(firstp, typemap_method_name(tmap_method)));
-#endif
-
-  }
-#ifdef SWIG_DEBUG
-  Printf(stdout, "Swig_typemap_attach_parms: end\n");
-#endif
-
-}
-
-/* Splits the arguments of an embedded typemap */
-static List *split_embedded_typemap(String *s) {
-  List *args = 0;
-  char *c, *start;
-  int level = 0;
-  int angle_level = 0;
-  int leading = 1;
-
-  args = NewList();
-  c = strchr(Char(s), '(');
-  assert(c);
-  c++;
-
-  start = c;
-  while (*c) {
-    if (*c == '\"') {
-      c++;
-      while (*c) {
-	if (*c == '\\') {
-	  c++;
-	} else {
-	  if (*c == '\"')
-	    break;
-	}
-	c++;
-      }
-    }
-    if ((level == 0) && angle_level == 0 && ((*c == ',') || (*c == ')'))) {
-      String *tmp = NewStringWithSize(start, (int)(c - start));
-      Append(args, tmp);
-      Delete(tmp);
-      start = c + 1;
-      leading = 1;
-      if (*c == ')')
-	break;
-      c++;
-      continue;
-    }
-    if (*c == '(')
-      level++;
-    if (*c == ')')
-      level--;
-    if (*c == '<')
-      angle_level++;
-    if (*c == '>')
-      angle_level--;
-    if (isspace((int) *c) && leading)
-      start++;
-    if (!isspace((int) *c))
-      leading = 0;
-    c++;
-  }
-  return args;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_replace_embedded_typemap()
- *
- * For special variable macro $typemap(...) expansion outside of typemaps.
- * Only limited usage works as most typemap special variables ($1, $input etc)
- * are not expanded correctly outside of typemaps.
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_replace_embedded_typemap(String *s, Node *file_line_node) {
-  Setfile(s, Getfile(file_line_node));
-  Setline(s, Getline(file_line_node));
-  Replaceall(s, "$typemap", "$TYPEMAP");
-  replace_embedded_typemap(s, 0, 0, file_line_node);
-}
-
-/* -----------------------------------------------------------------------------
- * replace_embedded_typemap()
- *
- * This function replaces the special variable macro $typemap(...) with typemap
- * code. The general form of $typemap is as follows:
- *
- *   $typemap(method, typelist, var1=value, var2=value, ...)
- *
- * where varx parameters are optional and undocumented; they were used in an earlier version of $typemap.
- * A search is made using the typemap matching rules of form:
- *
- *   %typemap(method) typelist {...}
- *
- * and if found will substitute in the typemap contents, making appropriate variable replacements.
- *
- * For example:
- *   $typemap(in, int)			     # simple usage matching %typemap(in) int { ... }
- *   $typemap(in, int b)		     # simple usage matching %typemap(in) int b { ... } or above %typemap
- *   $typemap(in, (Foo<int, bool> a, int b)) # multi-argument typemap matching %typemap(in) (Foo<int, bool> a, int b) {...}
- * ----------------------------------------------------------------------------- */
-
-static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper *f, Node *file_line_node) {
-  char *start = 0;
-  while ((start = strstr(Char(s), "$TYPEMAP("))) { /* note $typemap capitalisation to $TYPEMAP hack */
-
-    /* Gather the parameters */
-    char *end = 0, *c;
-    int level = 0;
-    String *dollar_typemap;
-    int syntax_error = 1;
-    c = start;
-    while (*c) {
-      if (*c == '(')
-	level++;
-      if (*c == ')') {
-	level--;
-	if (level == 0) {
-	  end = c + 1;
-	  break;
-	}
-      }
-      c++;
-    }
-    if (end) {
-      dollar_typemap = NewStringWithSize(start, (int)((end - start)));
-      syntax_error = 0;
-    } else {
-      dollar_typemap = NewStringWithSize(start, (int)((c - start)));
-    }
-
-    if (!syntax_error) {
-      List *l;
-      String *tmap_method;
-      Hash *vars;
-      syntax_error = 1;
-
-      /* Split apart each parameter in $typemap(...) */
-      l = split_embedded_typemap(dollar_typemap);
-
-      if (Len(l) >= 2) {
-	ParmList *to_match_parms;
-	tmap_method = Getitem(l, 0);
-
-	/* the second parameter might contain multiple sub-parameters for multi-argument 
-	 * typemap matching, so split these parameters apart */
-	to_match_parms = Swig_cparse_parms(Getitem(l, 1), file_line_node);
-	if (to_match_parms) {
-	  Parm *p = to_match_parms;
-	  Parm *sub_p = parm_sublist;
-	  String *empty_string = NewStringEmpty(); 
-	  String *lname = empty_string;
-	  while (p) {
-	    if (sub_p) {
-	      lname = Getattr(sub_p, "lname");
-	      sub_p = nextSibling(sub_p);
-	    }
-	    Setattr(p, "lname", lname);
-	    p = nextSibling(p);
-	  }
-	  Delete(empty_string);
-	}
-
-	/* process optional extra parameters - the variable replacements (undocumented) */
-	vars = NewHash();
-	{
-	  int i, ilen;
-	  ilen = Len(l);
-	  for (i = 2; i < ilen; i++) {
-	    String *parm = Getitem(l, i);
-	    char *eq = strchr(Char(parm), '=');
-	    char *c = Char(parm);
-	    if (eq && (eq - c > 0)) {
-	      String *name = NewStringWithSize(c, (int)(eq - c));
-	      String *value = NewString(eq + 1);
-	      Insert(name, 0, "$");
-	      Setattr(vars, name, value);
-	    } else {
-	      to_match_parms = 0; /* error - variable replacement parameters must be of form varname=value */
-	    }
-	  }
-	}
-
-	/* Perform a typemap search */
-	if (to_match_parms) {
-	  static int already_substituting = 0;
-	  String *tm;
-	  String *attr;
-	  int match = 0;
-#ifdef SWIG_DEBUG
-	  Printf(stdout, "Swig_typemap_attach_parms:  embedded\n");
-#endif
-	  if (already_substituting < 10) {
-	    already_substituting++;
-	    if ((in_typemap_search_multi == 0) && typemap_search_debug) {
-	      String *dtypemap = NewString(dollar_typemap);
-	      Replaceall(dtypemap, "$TYPEMAP", "$typemap");
-	      Printf(stdout, "  Containing: %s\n", dtypemap);
-	      Delete(dtypemap);
-	    }
-	    Swig_typemap_attach_parms(tmap_method, to_match_parms, f);
-	    already_substituting--;
-
-	    /* Look for the typemap code */
-	    attr = NewStringf("tmap:%s", tmap_method);
-	    tm = Getattr(to_match_parms, attr);
-	    if (tm) {
-	      Printf(attr, "%s", ":next");
-	      /* fail if multi-argument lookup requested in $typemap(...) and the lookup failed */
-	      if (!Getattr(to_match_parms, attr)) {
-		/* Replace parameter variables */
-		Iterator ki;
-		for (ki = First(vars); ki.key; ki = Next(ki)) {
-		  Replace(tm, ki.key, ki.item, DOH_REPLACE_ANY);
-		}
-		/* offer the target language module the chance to make special variable substitutions */
-		Language_replace_special_variables(tmap_method, tm, to_match_parms);
-		/* finish up - do the substitution */
-		Replace(s, dollar_typemap, tm, DOH_REPLACE_ANY);
-		Delete(tm);
-		match = 1;
-	      }
-	    }
-
-	    if (!match) {
-	      String *dtypemap = NewString(dollar_typemap);
-	      Replaceall(dtypemap, "$TYPEMAP", "$typemap");
-	      Swig_error(Getfile(s), Getline(s), "No typemap found for %s\n", dtypemap);
-	      Delete(dtypemap);
-	    }
-	    Delete(attr);
-	  } else {
-	    /* Simple recursive call check to prevent infinite recursion - this strategy only allows a limited 
-	     * number of calls by a embedded typemaps to other embedded typemaps though */
-	    String *dtypemap = NewString(dollar_typemap);
-	    Replaceall(dtypemap, "$TYPEMAP", "$typemap");
-	    Swig_error(Getfile(s), Getline(s), "Likely recursive $typemap calls containing %s. Use -debug-tmsearch to debug.\n", dtypemap);
-	    Delete(dtypemap);
-	  }
-	  syntax_error = 0;
-	}
-	Delete(vars);
-      }
-      Delete(l);
-    }
-
-    if (syntax_error) {
-      String *dtypemap = NewString(dollar_typemap);
-      Replaceall(dtypemap, "$TYPEMAP", "$typemap");
-      Swig_error(Getfile(s), Getline(s), "Syntax error in: %s\n", dtypemap);
-      Delete(dtypemap);
-    }
-    Replace(s, dollar_typemap, "<error in embedded typemap>", DOH_REPLACE_ANY);
-    Delete(dollar_typemap);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_debug()
- *
- * Display all typemaps
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_debug() {
-  int nesting_level = 2;
-  Printf(stdout, "---[ typemaps ]--------------------------------------------------------------\n");
-  Swig_print(typemaps, nesting_level);
-  Printf(stdout, "-----------------------------------------------------------------------------\n");
-}
-
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_search_debug_set()
- *
- * Turn on typemap searching debug display
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_search_debug_set(void) {
-  typemap_search_debug = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_used_debug_set()
- *
- * Turn on typemaps used debug display
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_used_debug_set(void) {
-  typemaps_used_debug = 1;
-}
-
-/* -----------------------------------------------------------------------------
- * Swig_typemap_register_debug_set()
- *
- * Turn on typemaps used debug display
- * ----------------------------------------------------------------------------- */
-
-void Swig_typemap_register_debug_set(void) {
-  typemap_register_debug = 1;
-}
-
diff --git a/dependencies2013/win32/swig/Source/Swig/typeobj.c b/dependencies2013/win32/swig/Source/Swig/typeobj.c
deleted file mode 100644
index b2832b6a..00000000
--- a/dependencies2013/win32/swig/Source/Swig/typeobj.c
+++ /dev/null
@@ -1,1254 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * typeobj.c
- *
- * This file provides functions for constructing, manipulating, and testing
- * type objects.   Type objects are merely the raw low-level representation
- * of C++ types.   They do not incorporate high-level type system features
- * like typedef, namespaces, etc.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include <ctype.h>
-#include <limits.h>
-
-/* -----------------------------------------------------------------------------
- * Synopsis
- *
- * This file provides a collection of low-level functions for constructing and
- * manipulating C++ data types.   In SWIG, C++ datatypes are encoded as simple
- * text strings.  This representation is compact, easy to debug, and easy to read.
- *
- * General idea:
- *
- * Types are represented by a base type (e.g., "int") and a collection of
- * type operators applied to the base (e.g., pointers, arrays, etc...).
- *
- * Encoding:
- *
- * Types are encoded as strings of type constructors such as follows:
- *
- *        String Encoding                 C Example
- *        ---------------                 ---------
- *        p.p.int                         int **
- *        a(300).a(400).int               int [300][400]
- *        p.q(const).char                 char const *
- *
- * All type constructors are denoted by a trailing '.':
- * 
- *  'p.'                = Pointer (*)
- *  'r.'                = Reference (&)
- *  'z.'                = Rvalue reference (&&)
- *  'a(n).'             = Array of size n  [n]
- *  'f(..,..).'         = Function with arguments  (args)
- *  'q(str).'           = Qualifier (such as const or volatile) (const, volatile)
- *  'm(qual).'          = Pointer to member (qual::*)
- *
- *  The complete type representation for varargs is:
- *  'v(...)'
- *
- * The encoding follows the order that you might describe a type in words.
- * For example "p.a(200).int" is "A pointer to array of int's" and
- * "p.q(const).char" is "a pointer to a const char".
- *
- * This representation of types is fairly convenient because ordinary string
- * operations can be used for type manipulation. For example, a type could be
- * formed by combining two strings such as the following:
- *
- *        "p.p." + "a(400).int" = "p.p.a(400).int"
- *
- * For C++, typenames may be parameterized using <(...)>.  Here are some
- * examples:
- *
- *       String Encoding                  C++ Example
- *       ---------------                  ------------
- *       p.vector<(int)>                  vector<int> *
- *       r.foo<(int,p.double)>            foo<int,double *> &
- *
- * Contents of this file:
- *
- * Most of this functions in this file pertain to the low-level manipulation
- * of type objects.   There are constructor functions like this:
- *
- *       SwigType_add_pointer()
- *       SwigType_add_reference()
- *       SwigType_add_rvalue_reference()
- *       SwigType_add_array()
- *
- * These are used to build new types.  There are also functions to undo these
- * operations.  For example:
- *
- *       SwigType_del_pointer()
- *       SwigType_del_reference()
- *       SwigType_del_rvalue_reference()
- *       SwigType_del_array()
- *
- * In addition, there are query functions
- *
- *       SwigType_ispointer()
- *       SwigType_isreference()
- *       SwigType_isrvalue_reference()
- *       SwigType_isarray()
- *
- * Finally, there are some data extraction functions that can be used to
- * extract array dimensions, template arguments, and so forth.
- * 
- * It is very important for developers to realize that the functions in this
- * module do *NOT* incorporate higher-level type system features like typedef.
- * For example, you could have C code like this:
- *
- *        typedef  int  *intptr;
- *       
- * In this case, a SwigType of type 'intptr' will be treated as a simple type and
- * functions like SwigType_ispointer() will evaluate as false.  It is strongly
- * advised that developers use the TypeSys_* interface to check types in a more
- * reliable manner.
- * ----------------------------------------------------------------------------- */
-
-
-/* -----------------------------------------------------------------------------
- * NewSwigType()
- *
- * Constructs a new type object.   Eventually, it would be nice for this function
- * to accept an initial value in the form a C/C++ abstract type (currently unimplemented).
- * ----------------------------------------------------------------------------- */
-
-#ifdef NEW
-SwigType *NewSwigType(const_String_or_char_ptr initial) {
-  return NewString(initial);
-}
-
-#endif
-
-/* The next few functions are utility functions used in the construction and 
-   management of types */
-
-/* -----------------------------------------------------------------------------
- * static element_size()
- *
- * This utility function finds the size of a single type element in a type string.
- * Type elements are always delimited by periods, but may be nested with
- * parentheses.  A nested element is always handled as a single item.
- *
- * Returns the integer size of the element (which can be used to extract a 
- * substring, to chop the element off, or for other purposes).
- * ----------------------------------------------------------------------------- */
-
-static int element_size(char *c) {
-  int nparen;
-  char *s = c;
-  while (*c) {
-    if (*c == '.') {
-      c++;
-      return (int) (c - s);
-    } else if (*c == '(') {
-      nparen = 1;
-      c++;
-      while (*c) {
-	if (*c == '(')
-	  nparen++;
-	if (*c == ')') {
-	  nparen--;
-	  if (nparen == 0)
-	    break;
-	}
-	c++;
-      }
-    }
-    if (*c)
-      c++;
-  }
-  return (int) (c - s);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_del_element()
- *
- * Deletes one type element from the type.  
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_del_element(SwigType *t) {
-  int sz = element_size(Char(t));
-  Delslice(t, 0, sz);
-  return t;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_pop()
- * 
- * Pop one type element off the type.
- * Example: t in:  q(const).p.Integer
- *          t out: p.Integer
- *	   result: q(const).
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_pop(SwigType *t) {
-  SwigType *result;
-  char *c;
-  int sz;
-
-  c = Char(t);
-  if (!*c)
-    return 0;
-
-  sz = element_size(c);
-  result = NewStringWithSize(c, sz);
-  Delslice(t, 0, sz);
-  c = Char(t);
-  if (*c == '.') {
-    Delitem(t, 0);
-  }
-  return result;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_parm()
- *
- * Returns the parameter of an operator as a string
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_parm(const SwigType *t) {
-  char *start, *c;
-  int nparens = 0;
-
-  c = Char(t);
-  while (*c && (*c != '(') && (*c != '.'))
-    c++;
-  if (!*c || (*c == '.'))
-    return 0;
-  c++;
-  start = c;
-  while (*c) {
-    if (*c == ')') {
-      if (nparens == 0)
-	break;
-      nparens--;
-    } else if (*c == '(') {
-      nparens++;
-    }
-    c++;
-  }
-  return NewStringWithSize(start, (int) (c - start));
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_split()
- *
- * Splits a type into its component parts and returns a list of string.
- * ----------------------------------------------------------------------------- */
-
-List *SwigType_split(const SwigType *t) {
-  String *item;
-  List *list;
-  char *c;
-  int len;
-
-  c = Char(t);
-  list = NewList();
-  while (*c) {
-    len = element_size(c);
-    item = NewStringWithSize(c, len);
-    Append(list, item);
-    Delete(item);
-    c = c + len;
-    if (*c == '.')
-      c++;
-  }
-  return list;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_parmlist()
- *
- * Splits a comma separated list of parameters into its component parts
- * The input is expected to contain the parameter list within () brackets
- * Returns 0 if no argument list in the input, ie there are no round brackets ()
- * Returns an empty List if there are no parameters in the () brackets
- * For example:
- *
- *     Foo(std::string,p.f().Bar<(int,double)>)
- *
- * returns 2 elements in the list:
- *    std::string
- *    p.f().Bar<(int,double)>
- * ----------------------------------------------------------------------------- */
- 
-List *SwigType_parmlist(const String *p) {
-  String *item = 0;
-  List *list;
-  char *c;
-  char *itemstart;
-  int size;
-
-  assert(p);
-  c = Char(p);
-  while (*c && (*c != '(') && (*c != '.'))
-    c++;
-  if (!*c)
-    return 0;
-  assert(*c != '.'); /* p is expected to contain sub elements of a type */
-  c++;
-  list = NewList();
-  itemstart = c;
-  while (*c) {
-    if (*c == ',') {
-      size = (int) (c - itemstart);
-      item = NewStringWithSize(itemstart, size);
-      Append(list, item);
-      Delete(item);
-      itemstart = c + 1;
-    } else if (*c == '(') {
-      int nparens = 1;
-      c++;
-      while (*c) {
-	if (*c == '(')
-	  nparens++;
-	if (*c == ')') {
-	  nparens--;
-	  if (nparens == 0)
-	    break;
-	}
-	c++;
-      }
-    } else if (*c == ')') {
-      break;
-    }
-    if (*c)
-      c++;
-  }
-  size = (int) (c - itemstart);
-  if (size > 0) {
-    item = NewStringWithSize(itemstart, size);
-    Append(list, item);
-  }
-  Delete(item);
-  return list;
-}
-
-/* -----------------------------------------------------------------------------
- *                                 Pointers
- *
- * SwigType_add_pointer()
- * SwigType_del_pointer()
- * SwigType_ispointer()
- *
- * Add, remove, and test if a type is a pointer.  The deletion and query
- * functions take into account qualifiers (if any).
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_pointer(SwigType *t) {
-  Insert(t, 0, "p.");
-  return t;
-}
-
-SwigType *SwigType_del_pointer(SwigType *t) {
-  char *c, *s;
-  c = Char(t);
-  s = c;
-  /* Skip qualifiers, if any */
-  if (strncmp(c, "q(", 2) == 0) {
-    c = strchr(c, '.');
-    assert(c);
-    c++;
-  }
-  if (strncmp(c, "p.", 2)) {
-    printf("Fatal error. SwigType_del_pointer applied to non-pointer.\n");
-    abort();
-  }
-  Delslice(t, 0, (int)((c - s) + 2));
-  return t;
-}
-
-int SwigType_ispointer(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  /* Skip qualifiers, if any */
-  if (strncmp(c, "q(", 2) == 0) {
-    c = strchr(c, '.');
-    if (!c)
-      return 0;
-    c++;
-  }
-  if (strncmp(c, "p.", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- *                                 References
- *
- * SwigType_add_reference()
- * SwigType_del_reference()
- * SwigType_isreference()
- *
- * Add, remove, and test if a type is a reference.  The deletion and query
- * functions take into account qualifiers (if any).
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_reference(SwigType *t) {
-  Insert(t, 0, "r.");
-  return t;
-}
-
-SwigType *SwigType_del_reference(SwigType *t) {
-  char *c = Char(t);
-  int check = strncmp(c, "r.", 2);
-  assert(check == 0);
-  Delslice(t, 0, 2);
-  return t;
-}
-
-int SwigType_isreference(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "r.", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- *                                 Rvalue References
- *
- * SwigType_add_rvalue_reference()
- * SwigType_del_rvalue_reference()
- * SwigType_isrvalue_reference()
- *
- * Add, remove, and test if a type is a rvalue reference.  The deletion and query
- * functions take into account qualifiers (if any).
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_rvalue_reference(SwigType *t) {
-  Insert(t, 0, "z.");
-  return t;
-}
-
-SwigType *SwigType_del_rvalue_reference(SwigType *t) {
-  char *c = Char(t);
-  int check = strncmp(c, "z.", 2);
-  assert(check == 0);
-  Delslice(t, 0, 2);
-  return t;
-}
-
-int SwigType_isrvalue_reference(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "z.", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- *                                  Qualifiers
- *
- * SwigType_add_qualifier()
- * SwigType_del_qualifier()
- * SwigType_is_qualifier()
- *
- * Adds type qualifiers like "const" and "volatile".   When multiple qualifiers
- * are added to a type, they are combined together into a single qualifier.
- * Repeated qualifications have no effect.  Moreover, the order of qualifications
- * is alphabetical---meaning that "const volatile" and "volatile const" are
- * stored in exactly the same way as "q(const volatile)".
- * 'qual' can be a list of multiple qualifiers in any order, separated by spaces.
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) {
-  List *qlist;
-  String *allq, *newq;
-  int i, sz;
-  const char *cqprev = 0;
-  const char *c = Char(t);
-  const char *cqual = Char(qual);
-
-  /* if 't' has no qualifiers and 'qual' is a single qualifier, simply add it */
-  if ((strncmp(c, "q(", 2) != 0) && (strstr(cqual, " ") == 0)) {
-    String *temp = NewStringf("q(%s).", cqual);
-    Insert(t, 0, temp);
-    Delete(temp);
-    return t;
-  }
-
-  /* create string of all qualifiers */
-  if (strncmp(c, "q(", 2) == 0) {
-    allq = SwigType_parm(t);
-    Append(allq, " ");
-    SwigType_del_element(t);     /* delete old qualifier list from 't' */
-  } else {
-    allq = NewStringEmpty();
-  }
-  Append(allq, qual);
-
-  /* create list of all qualifiers from string */
-  qlist = Split(allq, ' ', INT_MAX);
-  Delete(allq);
-
-  /* sort in alphabetical order */
-  SortList(qlist, Strcmp);
-
-  /* create new qualifier string from unique elements of list */
-  sz = Len(qlist);
-  newq = NewString("q(");
-  for (i = 0; i < sz; ++i) {
-    String *q = Getitem(qlist, i);
-    const char *cq = Char(q);
-    if (cqprev == 0 || strcmp(cqprev, cq) != 0) {
-      if (i > 0) {
-        Append(newq, " ");
-      }
-      Append(newq, q);
-      cqprev = cq;
-    }
-  }
-  Append(newq, ").");
-  Delete(qlist);
-
-  /* replace qualifier string with new one */
-  Insert(t, 0, newq);
-  Delete(newq);
-  return t;
-}
-
-SwigType *SwigType_del_qualifier(SwigType *t) {
-  char *c = Char(t);
-  int check = strncmp(c, "q(", 2);
-  assert(check == 0);
-  Delslice(t, 0, element_size(c));
-  return t;
-}
-
-int SwigType_isqualifier(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "q(", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- *                                Function Pointers
- * ----------------------------------------------------------------------------- */
-
-int SwigType_isfunctionpointer(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "p.f(", 4) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_functionpointer_decompose
- *
- * Decompose the function pointer into the parameter list and the return type
- * t - input and on completion contains the return type
- * returns the function's parameters
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_functionpointer_decompose(SwigType *t) {
-  String *p;
-  assert(SwigType_isfunctionpointer(t));
-  p = SwigType_pop(t);
-  Delete(p);
-  p = SwigType_pop(t);
-  return p;
-}
-
-/* -----------------------------------------------------------------------------
- *                                Member Pointers
- *
- * SwigType_add_memberpointer()
- * SwigType_del_memberpointer()
- * SwigType_ismemberpointer()
- *
- * Add, remove, and test for C++ pointer to members.
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_memberpointer(SwigType *t, const_String_or_char_ptr name) {
-  String *temp = NewStringf("m(%s).", name);
-  Insert(t, 0, temp);
-  Delete(temp);
-  return t;
-}
-
-SwigType *SwigType_del_memberpointer(SwigType *t) {
-  char *c = Char(t);
-  int check = strncmp(c, "m(", 2);
-  assert(check == 0);
-  Delslice(t, 0, element_size(c));
-  return t;
-}
-
-int SwigType_ismemberpointer(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "m(", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- *                                    Arrays
- *
- * SwigType_add_array()
- * SwigType_del_array()
- * SwigType_isarray()
- *
- * Utility functions:
- *
- * SwigType_array_ndim()        - Calculate number of array dimensions.
- * SwigType_array_getdim()      - Get array dimension
- * SwigType_array_setdim()      - Set array dimension
- * SwigType_array_type()        - Return array type
- * SwigType_pop_arrays()        - Remove all arrays
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size) {
-  String *temp = NewString("a(");
-  Append(temp, size);
-  Append(temp, ").");
-  Insert(t, 0, temp);
-  Delete(temp);
-  return t;
-}
-
-SwigType *SwigType_del_array(SwigType *t) {
-  char *c = Char(t);
-  int check = strncmp(c, "a(", 2);
-  assert(check == 0);
-  Delslice(t, 0, element_size(c));
-  return t;
-}
-
-int SwigType_isarray(const SwigType *t) {
-  char *c;
-  if (!t)
-    return 0;
-  c = Char(t);
-  if (strncmp(c, "a(", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-/*
- * SwigType_prefix_is_simple_1D_array
- *
- * Determine if the type is a 1D array type that is treated as a pointer within SWIG
- * eg Foo[], Foo[3] return true, but Foo[3][3], Foo*[], Foo*[3], Foo**[] return false
- */
-int SwigType_prefix_is_simple_1D_array(const SwigType *t) {
-  char *c = Char(t);
-
-  if (c && (strncmp(c, "a(", 2) == 0)) {
-    c = strchr(c, '.');
-    if (c)
-      return (*(++c) == 0);
-  }
-  return 0;
-}
-
-
-/* Remove all arrays */
-SwigType *SwigType_pop_arrays(SwigType *t) {
-  String *ta;
-  assert(SwigType_isarray(t));
-  ta = NewStringEmpty();
-  while (SwigType_isarray(t)) {
-    SwigType *td = SwigType_pop(t);
-    Append(ta, td);
-    Delete(td);
-  }
-  return ta;
-}
-
-/* Return number of array dimensions */
-int SwigType_array_ndim(const SwigType *t) {
-  int ndim = 0;
-  char *c = Char(t);
-
-  while (c && (strncmp(c, "a(", 2) == 0)) {
-    c = strchr(c, '.');
-    if (c) {
-      c++;
-      ndim++;
-    }
-  }
-  return ndim;
-}
-
-/* Get nth array dimension */
-String *SwigType_array_getdim(const SwigType *t, int n) {
-  char *c = Char(t);
-  while (c && (strncmp(c, "a(", 2) == 0) && (n > 0)) {
-    c = strchr(c, '.');
-    if (c) {
-      c++;
-      n--;
-    }
-  }
-  if (n == 0) {
-    String *dim = SwigType_parm(c);
-    if (SwigType_istemplate(dim)) {
-      String *ndim = SwigType_namestr(dim);
-      Delete(dim);
-      dim = ndim;
-    }
-
-    return dim;
-  }
-
-  return 0;
-}
-
-/* Replace nth array dimension */
-void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep) {
-  String *result = 0;
-  char temp;
-  char *start;
-  char *c = Char(t);
-
-  start = c;
-  if (strncmp(c, "a(", 2))
-    abort();
-
-  while (c && (strncmp(c, "a(", 2) == 0) && (n > 0)) {
-    c = strchr(c, '.');
-    if (c) {
-      c++;
-      n--;
-    }
-  }
-  if (n == 0) {
-    temp = *c;
-    *c = 0;
-    result = NewString(start);
-    Printf(result, "a(%s)", rep);
-    *c = temp;
-    c = strchr(c, '.');
-    Append(result, c);
-  }
-  Clear(t);
-  Append(t, result);
-  Delete(result);
-}
-
-/* Return base type of an array */
-SwigType *SwigType_array_type(const SwigType *ty) {
-  SwigType *t;
-  t = Copy(ty);
-  while (SwigType_isarray(t)) {
-    Delete(SwigType_pop(t));
-  }
-  return t;
-}
-
-
-/* -----------------------------------------------------------------------------
- *                                    Functions
- *
- * SwigType_add_function()
- * SwigType_del_function()
- * SwigType_isfunction()
- * SwigType_pop_function()
- *
- * Add, remove, and test for function types.
- * ----------------------------------------------------------------------------- */
-
-/* Returns the function type, t, constructed from the parameters, parms */
-SwigType *SwigType_add_function(SwigType *t, ParmList *parms) {
-  String *pstr;
-  Parm *p;
-
-  Insert(t, 0, ").");
-  pstr = NewString("f(");
-  for (p = parms; p; p = nextSibling(p)) {
-    if (p != parms)
-      Putc(',', pstr);
-    Append(pstr, Getattr(p, "type"));
-  }
-  Insert(t, 0, pstr);
-  Delete(pstr);
-  return t;
-}
-
-SwigType *SwigType_pop_function(SwigType *t) {
-  SwigType *f = 0;
-  SwigType *g = 0;
-  char *c = Char(t);
-  if (strncmp(c, "q(", 2) == 0) {
-    f = SwigType_pop(t);
-    c = Char(t);
-  }
-  if (strncmp(c, "f(", 2)) {
-    printf("Fatal error. SwigType_pop_function applied to non-function.\n");
-    abort();
-  }
-  g = SwigType_pop(t);
-  if (f)
-    SwigType_push(g, f);
-  Delete(f);
-  return g;
-}
-
-int SwigType_isfunction(const SwigType *t) {
-  char *c;
-  if (!t) {
-    return 0;
-  }
-  c = Char(t);
-  if (strncmp(c, "q(", 2) == 0) {
-    /* Might be a 'const' function.  Try to skip over the 'const' */
-    c = strchr(c, '.');
-    if (c)
-      c++;
-    else
-      return 0;
-  }
-  if (strncmp(c, "f(", 2) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-/* Create a list of parameters from the type t, using the file_line_node Node for 
- * file and line numbering for the parameters */
-ParmList *SwigType_function_parms(const SwigType *t, Node *file_line_node) {
-  List *l = SwigType_parmlist(t);
-  Hash *p, *pp = 0, *firstp = 0;
-  Iterator o;
-
-  for (o = First(l); o.item; o = Next(o)) {
-    p = file_line_node ? NewParm(o.item, 0, file_line_node) : NewParmWithoutFileLineInfo(o.item, 0);
-    if (!firstp)
-      firstp = p;
-    if (pp) {
-      set_nextSibling(pp, p);
-      Delete(p);
-    }
-    pp = p;
-  }
-  Delete(l);
-  return firstp;
-}
-
-int SwigType_isvarargs(const SwigType *t) {
-  if (Strcmp(t, "v(...)") == 0)
-    return 1;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- *                                    Templates
- *
- * SwigType_add_template()
- *
- * Template handling.
- * ----------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * SwigType_add_template()
- *
- * Adds a template to a type.   This template is encoded in the SWIG type
- * mechanism and produces a string like this:
- *
- *  vector<int *> ----> "vector<(p.int)>"
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_add_template(SwigType *t, ParmList *parms) {
-  Parm *p;
-
-  Append(t, "<(");
-  for (p = parms; p; p = nextSibling(p)) {
-    String *v;
-    if (Getattr(p, "default"))
-      continue;
-    if (p != parms)
-      Append(t, ",");
-    v = Getattr(p, "value");
-    if (v) {
-      Append(t, v);
-    } else {
-      Append(t, Getattr(p, "type"));
-    }
-  }
-  Append(t, ")>");
-  return t;
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_templateprefix()
- *
- * Returns the prefix before the first template definition.
- * Returns the type unmodified if not a template.
- * For example:
- *
- *     Foo<(p.int)>::bar  =>  Foo
- *     r.q(const).Foo<(p.int)>::bar => r.q(const).Foo
- *     Foo => Foo
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_templateprefix(const SwigType *t) {
-  const char *s = Char(t);
-  const char *c = strstr(s, "<(");
-  return c ? NewStringWithSize(s, (int)(c - s)) : NewString(s);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_templatesuffix()
- *
- * Returns text after a template substitution.  Used to handle scope names
- * for example:
- *
- *        Foo<(p.int)>::bar
- *
- * returns "::bar"
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_templatesuffix(const SwigType *t) {
-  const char *c;
-  c = Char(t);
-  while (*c) {
-    if ((*c == '<') && (*(c + 1) == '(')) {
-      int nest = 1;
-      c++;
-      while (*c && nest) {
-	if (*c == '<')
-	  nest++;
-	if (*c == '>')
-	  nest--;
-	c++;
-      }
-      return NewString(c);
-    }
-    c++;
-  }
-  return NewStringEmpty();
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_istemplate_templateprefix()
- *
- * Combines SwigType_istemplate and SwigType_templateprefix efficiently into one function.
- * Returns the prefix before the first template definition.
- * Returns NULL if not a template.
- * For example:
- *
- *     Foo<(p.int)>::bar  =>  Foo
- *     r.q(const).Foo<(p.int)>::bar => r.q(const).Foo
- *     Foo => NULL
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_istemplate_templateprefix(const SwigType *t) {
-  const char *s = Char(t);
-  const char *c = strstr(s, "<(");
-  return c ? NewStringWithSize(s, (int)(c - s)) : 0;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_istemplate_only_templateprefix()
- *
- * Similar to SwigType_istemplate_templateprefix() but only returns the template
- * prefix if the type is just the template and not a subtype/symbol within the template.
- * Returns NULL if not a template or is a template with a symbol within the template.
- * For example:
- *
- *     Foo<(p.int)>  =>  Foo
- *     Foo<(p.int)>::bar  =>  NULL
- *     r.q(const).Foo<(p.int)> => r.q(const).Foo
- *     r.q(const).Foo<(p.int)>::bar => NULL
- *     Foo => NULL
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_istemplate_only_templateprefix(const SwigType *t) {
-  int len = Len(t);
-  const char *s = Char(t);
-  if (len >= 4 && strcmp(s + len - 2, ")>") == 0) {
-    const char *c = strstr(s, "<(");
-    return c ? NewStringWithSize(s, (int)(c - s)) : 0;
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_templateargs()
- *
- * Returns the template arguments
- * For example:
- *
- *     Foo<(p.int)>::bar
- *
- * returns "<(p.int)>"
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_templateargs(const SwigType *t) {
-  const char *c;
-  const char *start;
-  c = Char(t);
-  while (*c) {
-    if ((*c == '<') && (*(c + 1) == '(')) {
-      int nest = 1;
-      start = c;
-      c++;
-      while (*c && nest) {
-	if (*c == '<')
-	  nest++;
-	if (*c == '>')
-	  nest--;
-	c++;
-      }
-      return NewStringWithSize(start, (int)(c - start));
-    }
-    c++;
-  }
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_istemplate()
- *
- * Tests a type to see if it includes template parameters
- * ----------------------------------------------------------------------------- */
-
-int SwigType_istemplate(const SwigType *t) {
-  char *ct = Char(t);
-  ct = strstr(ct, "<(");
-  if (ct && (strstr(ct + 2, ")>")))
-    return 1;
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_base()
- *
- * This function returns the base of a type.  For example, if you have a
- * type "p.p.int", the function would return "int".
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_base(const SwigType *t) {
-  char *c;
-  char *lastop = 0;
-  c = Char(t);
-
-  lastop = c;
-
-  /* Search for the last type constructor separator '.' */
-  while (*c) {
-    if (*c == '.') {
-      if (*(c + 1)) {
-	lastop = c + 1;
-      }
-      c++;
-      continue;
-    }
-    if (*c == '<') {
-      /* Skip over template---it's part of the base name */
-      int ntemp = 1;
-      c++;
-      while ((*c) && (ntemp > 0)) {
-	if (*c == '>')
-	  ntemp--;
-	else if (*c == '<')
-	  ntemp++;
-	c++;
-      }
-      if (ntemp)
-	break;
-      continue;
-    }
-    if (*c == '(') {
-      /* Skip over params */
-      int nparen = 1;
-      c++;
-      while ((*c) && (nparen > 0)) {
-	if (*c == '(')
-	  nparen++;
-	else if (*c == ')')
-	  nparen--;
-	c++;
-      }
-      if (nparen)
-	break;
-      continue;
-    }
-    c++;
-  }
-  return NewString(lastop);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_prefix()
- *
- * Returns the prefix of a datatype.  For example, the prefix of the
- * type "p.p.int" is "p.p.".
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_prefix(const SwigType *t) {
-  char *c, *d;
-  String *r = 0;
-
-  c = Char(t);
-  d = c + strlen(c);
-
-  /* Check for a type constructor */
-  if ((d > c) && (*(d - 1) == '.'))
-    d--;
-
-  while (d > c) {
-    d--;
-    if (*d == '>') {
-      int nest = 1;
-      d--;
-      while ((d > c) && (nest)) {
-	if (*d == '>')
-	  nest++;
-	if (*d == '<')
-	  nest--;
-	d--;
-      }
-    }
-    if (*d == ')') {
-      /* Skip over params */
-      int nparen = 1;
-      d--;
-      while ((d > c) && (nparen)) {
-	if (*d == ')')
-	  nparen++;
-	if (*d == '(')
-	  nparen--;
-	d--;
-      }
-    }
-
-    if (*d == '.') {
-      char t = *(d + 1);
-      *(d + 1) = 0;
-      r = NewString(c);
-      *(d + 1) = t;
-      return r;
-    }
-  }
-  return NewStringEmpty();
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_strip_qualifiers()
- * 
- * Strip all qualifiers from a type and return a new type
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_strip_qualifiers(const SwigType *t) {
-  static Hash *memoize_stripped = 0;
-  SwigType *r;
-  List *l;
-  Iterator ei;
-
-  if (!memoize_stripped)
-    memoize_stripped = NewHash();
-  r = Getattr(memoize_stripped, t);
-  if (r)
-    return Copy(r);
-
-  l = SwigType_split(t);
-  r = NewStringEmpty();
-
-  for (ei = First(l); ei.item; ei = Next(ei)) {
-    if (SwigType_isqualifier(ei.item))
-      continue;
-    Append(r, ei.item);
-  }
-  Delete(l);
-  {
-    String *key, *value;
-    key = Copy(t);
-    value = Copy(r);
-    Setattr(memoize_stripped, key, value);
-    Delete(key);
-    Delete(value);
-  }
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_strip_single_qualifier()
- * 
- * If the type contains a qualifier, strip one qualifier and return a new type.
- * The left most qualifier is stripped first (when viewed as C source code) but
- * this is the equivalent to the right most qualifier using SwigType notation.
- * Example: 
- *    r.q(const).p.q(const).int => r.q(const).p.int
- *    r.q(const).p.int          => r.p.int
- *    r.p.int                   => r.p.int
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_strip_single_qualifier(const SwigType *t) {
-  static Hash *memoize_stripped = 0;
-  SwigType *r = 0;
-  List *l;
-  int numitems;
-
-  if (!memoize_stripped)
-    memoize_stripped = NewHash();
-  r = Getattr(memoize_stripped, t);
-  if (r)
-    return Copy(r);
-
-  l = SwigType_split(t);
-
-  numitems = Len(l);
-  if (numitems >= 2) {
-    int item;
-    /* iterate backwards from last but one item */
-    for (item = numitems - 2; item >= 0; --item) {
-      String *subtype = Getitem(l, item);
-      if (SwigType_isqualifier(subtype)) {
-	Iterator it;
-	Delitem(l, item);
-	r = NewStringEmpty();
-	for (it = First(l); it.item; it = Next(it)) {
-	  Append(r, it.item);
-	}
-	break;
-      }
-    }
-  }
-  if (!r)
-    r = Copy(t);
-
-  Delete(l);
-  {
-    String *key, *value;
-    key = Copy(t);
-    value = Copy(r);
-    Setattr(memoize_stripped, key, value);
-    Delete(key);
-    Delete(value);
-  }
-  return r;
-}
-
diff --git a/dependencies2013/win32/swig/Source/Swig/typesys.c b/dependencies2013/win32/swig/Source/Swig/typesys.c
deleted file mode 100644
index e11fc781..00000000
--- a/dependencies2013/win32/swig/Source/Swig/typesys.c
+++ /dev/null
@@ -1,2189 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * typesys.c
- *
- * SWIG type system management.   These functions are used to manage
- * the C++ type system including typenames, typedef, type scopes, 
- * inheritance, and namespaces.   Generation of support code for the
- * run-time type checker is also handled here.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include "cparse.h"
-
-/* -----------------------------------------------------------------------------
- * Synopsis
- *
- * The purpose of this module is to manage type names and scoping issues related
- * to the C++ type system.   The primary use is tracking typenames through typedef
- * and inheritance. 
- *
- * New typenames are introduced by typedef, class, and enum declarations.
- * Each type is declared in a scope.  This is either the global scope, a
- * class, or a namespace.  For example:
- *
- *  typedef int A;         // Typename A, in global scope
- *  namespace Foo {
- *    typedef int A;       // Typename A, in scope Foo::
- *  }
- *  class Bar {            // Typename Bar, in global scope
- *    typedef int A;       // Typename A, in scope Bar::
- *  }
- *
- * To manage scopes, the type system is constructed as a tree of hash tables.  Each 
- * hash table contains the following attributes:
- *
- *    "name"            -  Scope name
- *    "qname"           -  Fully qualified typename
- *    "typetab"         -  Type table containing typenames and typedef information
- *    "symtab"          -  Hash table of symbols defined in a scope
- *    "inherit"         -  List of inherited scopes       
- *    "parent"          -  Parent scope
- * 
- * Typedef information is stored in the "typetab" hash table.  For example,
- * if you have these declarations:
- *
- *      typedef int A;
- *      typedef A B;
- *      typedef B *C;
- *
- * typetab is built as follows:
- *
- *      "A"     : "int"
- *      "B"     : "A"
- *      "C"     : "p.B"
- *
- * To resolve a type back to its root type, one repeatedly expands on the type base.
- * For example:
- *
- *     C *[40]   ---> a(40).p.C       (string type representation, see stype.c)
- *               ---> a(40).p.p.B     (C --> p.B)
- *               ---> a(40).p.p.A     (B --> A)
- *               ---> a(40).p.p.int   (A --> int)
- *
- * For inheritance, SWIG tries to resolve types back to the base class. For instance, if
- * you have this:
- *
- *     class Foo {
- *     public:
- *        typedef int Integer;
- *     };
- *
- *     class Bar : public Foo {
- *           void blah(Integer x);
- *     };
- *
- * The argument type of Bar::blah will be set to Foo::Integer.   
- *
- * The scope-inheritance mechanism is used to manage C++ namespace aliases.
- * For example, if you have this:
- *
- *    namespace Foo {
- *         typedef int Integer;
- *    }
- *
- *   namespace F = Foo;
- *
- * In this case, "F::" is defined as a scope that "inherits" from Foo.  Internally,
- * "F::" will merely be an empty scope that refers to Foo.  SWIG will never 
- * place new type information into a namespace alias---attempts to do so
- * will generate a warning message (in the parser) and will place information into 
- * Foo instead.
- *
- *----------------------------------------------------------------------------- */
-
-static Typetab *current_scope = 0;	/* Current type scope                           */
-static Hash *current_typetab = 0;	/* Current type table                           */
-static Hash *current_symtab = 0;	/* Current symbol table                         */
-static Typetab *global_scope = 0;	/* The global scope                             */
-static Hash *scopes = 0;	/* Hash table containing fully qualified scopes */
-
-/* Performance optimization */
-#define SWIG_TYPEDEF_RESOLVE_CACHE 
-static Hash *typedef_resolve_cache = 0;
-static Hash *typedef_all_cache = 0;
-static Hash *typedef_qualified_cache = 0;
-
-static Typetab *SwigType_find_scope(Typetab *s, const SwigType *nameprefix);
-
-/* common attribute keys, to avoid calling find_key all the times */
-
-/* 
-   Enable this one if your language fully support SwigValueWrapper<T>.
-   
-   Leaving at '0' keeps the old swig behavior, which is not
-   always safe, but is well known.
-
-   Setting at '1' activates the new scheme, which is always safe but
-   it requires all the typemaps to be ready for that.
-  
-*/
-static int value_wrapper_mode = 0;
-int Swig_value_wrapper_mode(int mode) {
-  value_wrapper_mode = mode;
-  return mode;
-}
-
-
-static void flush_cache() {
-  typedef_resolve_cache = 0;
-  typedef_all_cache = 0;
-  typedef_qualified_cache = 0;
-}
-
-/* Initialize the scoping system */
-
-void SwigType_typesystem_init() {
-  if (global_scope)
-    Delete(global_scope);
-  if (scopes)
-    Delete(scopes);
-
-  current_scope = NewHash();
-  global_scope = current_scope;
-
-  Setattr(current_scope, "name", "");	/* No name for global scope */
-  current_typetab = NewHash();
-  Setattr(current_scope, "typetab", current_typetab);
-
-  current_symtab = 0;
-  scopes = NewHash();
-  Setattr(scopes, "", current_scope);
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_typedef()
- *
- * Defines a new typedef in the current scope. Returns -1 if the type name is 
- * already defined.  
- * ----------------------------------------------------------------------------- */
-
-int SwigType_typedef(const SwigType *type, const_String_or_char_ptr name) {
-  if (Getattr(current_typetab, name))
-    return -1;			/* Already defined */
-  if (Strcmp(type, name) == 0) {	/* Can't typedef a name to itself */
-    return 0;
-  }
-
-  /* Check if 'type' is already a scope.  If so, we create an alias in the type
-     system for it.  This is needed to make strange nested scoping problems work
-     correctly.  */
-  {
-    Typetab *t = SwigType_find_scope(current_scope, type);
-    if (t) {
-      SwigType_new_scope(name);
-      SwigType_inherit_scope(t);
-      SwigType_pop_scope();
-    }
-  }
-  Setattr(current_typetab, name, type);
-  flush_cache();
-  return 0;
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_typedef_class()
- *
- * Defines a class in the current scope. 
- * ----------------------------------------------------------------------------- */
-
-int SwigType_typedef_class(const_String_or_char_ptr name) {
-  String *cname;
-  /*  Printf(stdout,"class : '%s'\n", name); */
-  if (Getattr(current_typetab, name))
-    return -1;			/* Already defined */
-  cname = NewString(name);
-  Setmeta(cname, "class", "1");
-  Setattr(current_typetab, cname, cname);
-  Delete(cname);
-  flush_cache();
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_scope_name()
- *
- * Returns the qualified scope name of a type table
- * ----------------------------------------------------------------------------- */
-
-String *SwigType_scope_name(Typetab *ttab) {
-  String *qname = NewString(Getattr(ttab, "name"));
-  ttab = Getattr(ttab, "parent");
-  while (ttab) {
-    String *pname = Getattr(ttab, "name");
-    if (Len(pname)) {
-      Insert(qname, 0, "::");
-      Insert(qname, 0, pname);
-    }
-    ttab = Getattr(ttab, "parent");
-  }
-  return qname;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_new_scope()
- *
- * Creates a new scope
- * ----------------------------------------------------------------------------- */
-
-void SwigType_new_scope(const_String_or_char_ptr name) {
-  Typetab *s;
-  Hash *ttab;
-  String *qname;
-
-  if (!name) {
-    name = "<unnamed>";
-  }
-  s = NewHash();
-  Setattr(s, "name", name);
-  Setattr(s, "parent", current_scope);
-  ttab = NewHash();
-  Setattr(s, "typetab", ttab);
-
-  /* Build fully qualified name and */
-  qname = SwigType_scope_name(s);
-  Setattr(scopes, qname, s);
-  Setattr(s, "qname", qname);
-  Delete(qname);
-
-  current_scope = s;
-  current_typetab = ttab;
-  current_symtab = 0;
-  flush_cache();
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_inherit_scope()
- *
- * Makes the current scope inherit from another scope.  This is used for both
- * C++ class inheritance, namespaces, and namespace aliases.
- * ----------------------------------------------------------------------------- */
-
-void SwigType_inherit_scope(Typetab *scope) {
-  List *inherits;
-  int i, len;
-  inherits = Getattr(current_scope, "inherit");
-  if (!inherits) {
-    inherits = NewList();
-    Setattr(current_scope, "inherit", inherits);
-    Delete(inherits);
-  }
-  assert(scope != current_scope);
-
-  len = Len(inherits);
-  for (i = 0; i < len; i++) {
-    Node *n = Getitem(inherits, i);
-    if (n == scope)
-      return;
-  }
-  Append(inherits, scope);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_scope_alias()
- *
- * Creates a scope-alias.
- * ----------------------------------------------------------------------------- */
-
-void SwigType_scope_alias(String *aliasname, Typetab *ttab) {
-  String *q;
-  /*  Printf(stdout,"alias: '%s' '%p'\n", aliasname, ttab); */
-  q = SwigType_scope_name(current_scope);
-  if (Len(q)) {
-    Append(q, "::");
-  }
-  Append(q, aliasname);
-  Setattr(scopes, q, ttab);
-  flush_cache();
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_using_scope()
- *
- * Import another scope into this scope.
- * ----------------------------------------------------------------------------- */
-
-void SwigType_using_scope(Typetab *scope) {
-  SwigType_inherit_scope(scope);
-  {
-    List *ulist;
-    int i, len;
-    ulist = Getattr(current_scope, "using");
-    if (!ulist) {
-      ulist = NewList();
-      Setattr(current_scope, "using", ulist);
-      Delete(ulist);
-    }
-    assert(scope != current_scope);
-    len = Len(ulist);
-    for (i = 0; i < len; i++) {
-      Typetab *n = Getitem(ulist, i);
-      if (n == scope)
-	return;
-    }
-    Append(ulist, scope);
-  }
-  flush_cache();
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_pop_scope()
- *
- * Pop off the last scope and perform a merge operation.  Returns the hash
- * table for the scope that was popped off.
- * ----------------------------------------------------------------------------- */
-
-Typetab *SwigType_pop_scope() {
-  Typetab *t, *old = current_scope;
-  t = Getattr(current_scope, "parent");
-  if (!t)
-    t = global_scope;
-  current_scope = t;
-  current_typetab = Getattr(t, "typetab");
-  current_symtab = Getattr(t, "symtab");
-  flush_cache();
-  return old;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_set_scope()
- *
- * Set the scope.  Returns the old scope.
- * ----------------------------------------------------------------------------- */
-
-Typetab *SwigType_set_scope(Typetab *t) {
-  Typetab *old = current_scope;
-  if (!t)
-    t = global_scope;
-  current_scope = t;
-  current_typetab = Getattr(t, "typetab");
-  current_symtab = Getattr(t, "symtab");
-  flush_cache();
-  return old;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_attach_symtab()
- *
- * Attaches a symbol table to a type scope
- * ----------------------------------------------------------------------------- */
-
-void SwigType_attach_symtab(Symtab *sym) {
-  Setattr(current_scope, "symtab", sym);
-  current_symtab = sym;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_print_scope()
- *
- * Debugging function for printing out current scope
- * ----------------------------------------------------------------------------- */
-
-void SwigType_print_scope(void) {
-  Hash *ttab;
-  Iterator i, j;
-
-  Printf(stdout, "SCOPES start  =======================================\n");
-  for (i = First(scopes); i.key; i = Next(i)) {
-    Printf(stdout, "-------------------------------------------------------------\n");
-    ttab = Getattr(i.item, "typetab");
-
-    Printf(stdout, "Type scope '%s' (%p)\n", i.key, i.item);
-    {
-      List *inherit = Getattr(i.item, "inherit");
-      if (inherit) {
-	Iterator j;
-	for (j = First(inherit); j.item; j = Next(j)) {
-	  Printf(stdout, "    Inherits from '%s' (%p)\n", Getattr(j.item, "qname"), j.item);
-	}
-      }
-    }
-    for (j = First(ttab); j.key; j = Next(j)) {
-      Printf(stdout, "%40s -> %s\n", j.key, j.item);
-    }
-  }
-  Printf(stdout, "SCOPES finish =======================================\n");
-}
-
-static Typetab *SwigType_find_scope(Typetab *s, const SwigType *nameprefix) {
-  Typetab *ss;
-  Typetab *s_orig = s;
-  String *nnameprefix = 0;
-  static int check_parent = 1;
-
-  if (Getmark(s))
-    return 0;
-  Setmark(s, 1);
-
-  if (SwigType_istemplate(nameprefix)) {
-    nnameprefix = SwigType_typedef_resolve_all(nameprefix);
-    nameprefix = nnameprefix;
-  }
-
-  ss = s;
-  while (ss) {
-    String *full;
-    String *qname = Getattr(ss, "qname");
-    if (qname) {
-      full = NewStringf("%s::%s", qname, nameprefix);
-    } else {
-      full = NewString(nameprefix);
-    }
-    if (Getattr(scopes, full)) {
-      s = Getattr(scopes, full);
-    } else {
-      s = 0;
-    }
-    Delete(full);
-    if (s) {
-      if (nnameprefix)
-	Delete(nnameprefix);
-      Setmark(s_orig, 0);
-      return s;
-    }
-    if (!s) {
-      /* Check inheritance */
-      List *inherit;
-      inherit = Getattr(ss, "using");
-      if (inherit) {
-	Typetab *ttab;
-	int i, len;
-	len = Len(inherit);
-	for (i = 0; i < len; i++) {
-	  int oldcp = check_parent;
-	  ttab = Getitem(inherit, i);
-	  check_parent = 0;
-	  s = SwigType_find_scope(ttab, nameprefix);
-	  check_parent = oldcp;
-	  if (s) {
-	    if (nnameprefix)
-	      Delete(nnameprefix);
-	    Setmark(s_orig, 0);
-	    return s;
-	  }
-	}
-      }
-    }
-    if (!check_parent)
-      break;
-    ss = Getattr(ss, "parent");
-  }
-  if (nnameprefix)
-    Delete(nnameprefix);
-  Setmark(s_orig, 0);
-  return 0;
-}
-
-/* ----------------------------------------------------------------------------- 
- * typedef_resolve()
- *
- * Resolves a typedef and returns a new type string.  Returns 0 if there is no
- * typedef mapping.  base is a name without qualification.
- * Internal function.
- * ----------------------------------------------------------------------------- */
-
-static Typetab *resolved_scope = 0;
-
-/* Internal function */
-
-static SwigType *_typedef_resolve(Typetab *s, String *base, int look_parent) {
-  Hash *ttab;
-  SwigType *type = 0;
-  List *inherit;
-  Typetab *parent;
-
-  /* if (!s) return 0; *//* now is checked bellow */
-  /* Printf(stdout,"Typetab %s : %s\n", Getattr(s,"name"), base);  */
-
-  if (!Getmark(s)) {
-    Setmark(s, 1);
-
-    ttab = Getattr(s, "typetab");
-    type = Getattr(ttab, base);
-    if (type) {
-      resolved_scope = s;
-      Setmark(s, 0);
-    } else {
-      /* Hmmm. Not found in my scope.  It could be in an inherited scope */
-      inherit = Getattr(s, "inherit");
-      if (inherit) {
-	int i, len;
-	len = Len(inherit);
-	for (i = 0; i < len; i++) {
-	  type = _typedef_resolve(Getitem(inherit, i), base, 0);
-	  if (type) {
-	    Setmark(s, 0);
-	    break;
-	  }
-	}
-      }
-      if (!type) {
-	/* Hmmm. Not found in my scope.  check parent */
-	if (look_parent) {
-	  parent = Getattr(s, "parent");
-	  type = parent ? _typedef_resolve(parent, base, 1) : 0;
-	}
-      }
-      Setmark(s, 0);
-    }
-  }
-  return type;
-}
-
-/* ----------------------------------------------------------------------------- 
- * template_parameters_resolve()
- *
- * For use with templates only. The template parameters are resolved. If none
- * of the parameters can be resolved, zero is returned.
- * ----------------------------------------------------------------------------- */
-
-static String *template_parameters_resolve(const String *base) {
-  List *tparms;
-  String *suffix;
-  String *type;
-  int i, sz;
-  int rep = 0;
-  type = SwigType_templateprefix(base);
-  suffix = SwigType_templatesuffix(base);
-  Append(type, "<(");
-  tparms = SwigType_parmlist(base);
-  sz = Len(tparms);
-  for (i = 0; i < sz; i++) {
-    SwigType *tpr;
-    SwigType *tp = Getitem(tparms, i);
-    if (!rep) {
-      tpr = SwigType_typedef_resolve(tp);
-    } else {
-      tpr = 0;
-    }
-    if (tpr) {
-      Append(type, tpr);
-      Delete(tpr);
-      rep = 1;
-    } else {
-      Append(type, tp);
-    }
-    if ((i + 1) < sz)
-      Append(type, ",");
-  }
-  Append(type, ")>");
-  Append(type, suffix);
-  Delete(suffix);
-  Delete(tparms);
-  if (!rep) {
-    Delete(type);
-    type = 0;
-  }
-  return type;
-}
-
-static SwigType *typedef_resolve(Typetab *s, String *base) {
-  return _typedef_resolve(s, base, 1);
-}
-
-
-/* ----------------------------------------------------------------------------- 
- * SwigType_typedef_resolve()
- * ----------------------------------------------------------------------------- */
-
-/* #define SWIG_DEBUG */
-SwigType *SwigType_typedef_resolve(const SwigType *t) {
-  String *base;
-  String *type = 0;
-  String *r = 0;
-  Typetab *s;
-  Hash *ttab;
-  String *namebase = 0;
-  String *nameprefix = 0, *rnameprefix = 0;
-  int newtype = 0;
-
-  resolved_scope = 0;
-
-#ifdef SWIG_TYPEDEF_RESOLVE_CACHE
-  if (!typedef_resolve_cache) {
-    typedef_resolve_cache = NewHash();
-  }
-  r = Getattr(typedef_resolve_cache, t);
-  if (r) {
-    resolved_scope = Getmeta(r, "scope");
-    return Copy(r);
-  }
-#endif
-
-  base = SwigType_base(t);
-
-#ifdef SWIG_DEBUG
-  Printf(stdout, "base = '%s' t='%s'\n", base, t);
-#endif
-
-  if (SwigType_issimple(base)) {
-    s = current_scope;
-    ttab = current_typetab;
-    if (strncmp(Char(base), "::", 2) == 0) {
-      s = global_scope;
-      ttab = Getattr(s, "typetab");
-      Delitem(base, 0);
-      Delitem(base, 0);
-    }
-    /* Do a quick check in the local scope */
-    type = Getattr(ttab, base);
-    if (type) {
-      resolved_scope = s;
-    }
-    if (!type) {
-      /* Didn't find in this scope.   We need to do a little more searching */
-      if (Swig_scopename_check(base)) {
-	/* A qualified name. */
-	Swig_scopename_split(base, &nameprefix, &namebase);
-#ifdef SWIG_DEBUG
-	Printf(stdout, "nameprefix = '%s'\n", nameprefix);
-#endif
-	if (nameprefix) {
-	  rnameprefix = SwigType_typedef_resolve(nameprefix);
-	  if(rnameprefix != NULL) {
-#ifdef SWIG_DEBUG
-	    Printf(stdout, "nameprefix '%s' is a typedef to '%s'\n", nameprefix, rnameprefix);
-#endif
-	    type = Copy(namebase);
-	    Insert(type, 0, "::");
-	    Insert(type, 0, rnameprefix);
-	    if (strncmp(Char(type), "::", 2) == 0) {
-	      Delitem(type, 0);
-	      Delitem(type, 0);
-	    }
-	    newtype = 1;
-	  } else {
-	    /* Name had a prefix on it.   See if we can locate the proper scope for it */
-	    String *rnameprefix = template_parameters_resolve(nameprefix);
-	    nameprefix = rnameprefix ? Copy(rnameprefix) : nameprefix;
-	    Delete(rnameprefix);
-	    s = SwigType_find_scope(s, nameprefix);
-
-	    /* Couldn't locate a scope for the type.  */
-	    if (!s) {
-	      Delete(base);
-	      Delete(namebase);
-	      Delete(nameprefix);
-	      r = 0;
-	      goto return_result;
-	    }
-	    /* Try to locate the name starting in the scope */
-#ifdef SWIG_DEBUG
-	    Printf(stdout, "namebase = '%s'\n", namebase);
-#endif
-	    type = typedef_resolve(s, namebase);
-	    if (type && resolved_scope) {
-	      /* we need to look for the resolved type, this will also
-	         fix the resolved_scope if 'type' and 'namebase' are
-	         declared in different scopes */
-	      String *rtype = 0;
-	      rtype = typedef_resolve(resolved_scope, type);
-	      if (rtype)
-	        type = rtype;
-	    }
-#ifdef SWIG_DEBUG
-	    Printf(stdout, "%s type = '%s'\n", Getattr(s, "name"), type);
-#endif
-	    if ((type) && (!Swig_scopename_check(type)) && resolved_scope) {
-	      Typetab *rtab = resolved_scope;
-	      String *qname = Getattr(resolved_scope, "qname");
-	      /* If qualified *and* the typename is defined from the resolved scope, we qualify */
-	      if ((qname) && typedef_resolve(resolved_scope, type)) {
-	        type = Copy(type);
-	        Insert(type, 0, "::");
-	        Insert(type, 0, qname);
-#ifdef SWIG_DEBUG
-	        Printf(stdout, "qual %s \n", type);
-#endif
-	        newtype = 1;
-	      }
-	      resolved_scope = rtab;
-	    }
-	  }
-	} else {
-	  /* Name is unqualified. */
-	  type = typedef_resolve(s, base);
-	}
-      } else {
-	/* Name is unqualified. */
-	type = typedef_resolve(s, base);
-      }
-    }
-
-    if (type && (Equal(base, type))) {
-      if (newtype)
-	Delete(type);
-      Delete(base);
-      Delete(namebase);
-      Delete(nameprefix);
-      r = 0;
-      goto return_result;
-    }
-
-    /* If the type is a template, and no typedef was found, we need to check the
-       template arguments one by one to see if they can be resolved. */
-
-    if (!type && SwigType_istemplate(base)) {
-      newtype = 1;
-      type = template_parameters_resolve(base);
-    }
-    if (namebase)
-      Delete(namebase);
-    if (nameprefix)
-      Delete(nameprefix);
-  } else {
-    if (SwigType_isfunction(base)) {
-      List *parms;
-      int i, sz;
-      int rep = 0;
-      type = NewString("f(");
-      newtype = 1;
-      parms = SwigType_parmlist(base);
-      sz = Len(parms);
-      for (i = 0; i < sz; i++) {
-	SwigType *tpr;
-	SwigType *tp = Getitem(parms, i);
-	if (!rep) {
-	  tpr = SwigType_typedef_resolve(tp);
-	} else {
-	  tpr = 0;
-	}
-	if (tpr) {
-	  Append(type, tpr);
-	  Delete(tpr);
-	  rep = 1;
-	} else {
-	  Append(type, tp);
-	}
-	if ((i + 1) < sz)
-	  Append(type, ",");
-      }
-      Append(type, ").");
-      Delete(parms);
-      if (!rep) {
-	Delete(type);
-	type = 0;
-      }
-    } else if (SwigType_ismemberpointer(base)) {
-      String *rt;
-      String *mtype = SwigType_parm(base);
-      rt = SwigType_typedef_resolve(mtype);
-      if (rt) {
-	type = NewStringf("m(%s).", rt);
-	newtype = 1;
-	Delete(rt);
-      }
-      Delete(mtype);
-    } else {
-      type = 0;
-    }
-  }
-  r = SwigType_prefix(t);
-  if (!type) {
-    if (r && Len(r)) {
-      char *cr = Char(r);
-      if ((strstr(cr, "f(") || (strstr(cr, "m(")))) {
-	SwigType *rt = SwigType_typedef_resolve(r);
-	if (rt) {
-	  Delete(r);
-	  Append(rt, base);
-	  Delete(base);
-	  r = rt;
-	  goto return_result;
-	}
-      }
-    }
-    Delete(r);
-    Delete(base);
-    r = 0;
-    goto return_result;
-  }
-  Delete(base);
-
-  /* If 'type' is an array, then the right-most qualifier in 'r' should
-     be added to 'type' after the array qualifier, so that given
-       a(7).q(volatile).double myarray     // typedef volatile double[7] myarray;
-     the type
-       q(const).myarray                    // const myarray
-     becomes
-       a(7).q(const volatile).double       // const volatile double[7]
-     and NOT
-       q(const).a(7).q(volatile).double    // non-sensical type
-  */
-  if (r && Len(r) && SwigType_isarray(type)) {
-    List *r_elem;
-    String *r_qual;
-    int r_sz;
-    r_elem = SwigType_split(r);
-    r_sz = Len(r_elem);
-    r_qual = Getitem(r_elem, r_sz-1);
-    if (SwigType_isqualifier(r_qual)) {
-      String *new_r;
-      String *new_type;
-      List *type_elem;
-      String *type_qual;
-      String *r_qual_arg;
-      int i, type_sz;
-
-      type_elem = SwigType_split(type);
-      type_sz = Len(type_elem);
-
-      for (i = 0; i < type_sz; ++i) {
-        String *e = Getitem(type_elem, i);
-        if (!SwigType_isarray(e))
-          break;
-      }
-      type_qual = Copy(Getitem(type_elem, i));
-      r_qual_arg = SwigType_parm(r_qual);
-      SwigType_add_qualifier(type_qual, r_qual_arg);
-      Delete(r_qual_arg);
-      Setitem(type_elem, i, type_qual);
-
-      new_r = NewStringEmpty();
-      for (i = 0; i < r_sz-1; ++i) {
-        Append(new_r, Getitem(r_elem, i));
-      }
-      new_type = NewStringEmpty();
-      for (i = 0; i < type_sz; ++i) {
-        Append(new_type, Getitem(type_elem, i));
-      }
-#ifdef SWIG_DEBUG
-      Printf(stdout, "r+type='%s%s' new_r+new_type='%s%s'\n", r, type, new_r, new_type);
-#endif
-
-      Delete(r);
-      r = new_r;
-      newtype = 1;
-      type = new_type;
-      Delete(type_elem);
-    }
-    Delete(r_elem);
-  }
-
-  Append(r, type);
-  if (newtype) {
-    Delete(type);
-  }
-
-return_result:
-#ifdef SWIG_TYPEDEF_RESOLVE_CACHE
-  {
-    String *key = NewString(t);
-    if (r) {
-      SwigType *r1;
-      Setattr(typedef_resolve_cache, key, r);
-      Setmeta(r, "scope", resolved_scope);
-      r1 = Copy(r);
-      Delete(r);
-      r = r1;
-    }
-    Delete(key);
-  }
-#endif
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_typedef_resolve_all()
- *
- * Fully resolve a type down to its most basic datatype
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_typedef_resolve_all(const SwigType *t) {
-  SwigType *n;
-  SwigType *r;
-  int count = 0;
-
-  /* Check to see if the typedef resolve has been done before by checking the cache */
-  if (!typedef_all_cache) {
-    typedef_all_cache = NewHash();
-  }
-  r = Getattr(typedef_all_cache, t);
-  if (r) {
-    return Copy(r);
-  }
-
-  /* Recursively resolve the typedef */
-  r = NewString(t);
-  while ((n = SwigType_typedef_resolve(r))) {
-    Delete(r);
-    r = n;
-    if (++count >= 512) {
-      Swig_error(Getfile(t), Getline(t), "Recursive typedef detected resolving '%s' to '%s' to '%s' and so on...\n", SwigType_str(t, 0), SwigType_str(SwigType_typedef_resolve(t), 0), SwigType_str(SwigType_typedef_resolve(SwigType_typedef_resolve(t)), 0));
-      break;
-    }
-  }
-
-  /* Add the typedef to the cache for next time it is looked up */
-  {
-    String *key;
-    SwigType *rr = Copy(r);
-    key = NewString(t);
-    Setattr(typedef_all_cache, key, rr);
-    Delete(key);
-    Delete(rr);
-  }
-  return r;
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_typedef_qualified()
- *
- * Given a type declaration, this function tries to fully qualify it according to
- * typedef scope rules.
- * If the unary scope operator (::) is used as a prefix to the type to denote global
- * scope, it is left in place.
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_typedef_qualified(const SwigType *t) {
-  List *elements;
-  String *result;
-  int i, len;
-
-  if (!typedef_qualified_cache)
-    typedef_qualified_cache = NewHash();
-  result = Getattr(typedef_qualified_cache, t);
-  if (result) {
-    String *rc = Copy(result);
-    return rc;
-  }
-
-  result = NewStringEmpty();
-  elements = SwigType_split(t);
-  len = Len(elements);
-  for (i = 0; i < len; i++) {
-    String *ty = 0;
-    String *e = Getitem(elements, i);
-    if (SwigType_issimple(e)) {
-      if (!SwigType_istemplate(e)) {
-	String *isenum = 0;
-	if (SwigType_isenum(e)) {
-	  isenum = NewString("enum ");
-	  ty = NewString(Char(e) + 5);
-	  e = ty;
-	}
-	resolved_scope = 0;
-	if (typedef_resolve(current_scope, e) && resolved_scope) {
-	  /* resolved_scope contains the scope that actually resolved the symbol */
-	  String *qname = Getattr(resolved_scope, "qname");
-	  if (qname) {
-	    Insert(e, 0, "::");
-	    Insert(e, 0, qname);
-	  }
-	} else {
-	  if (Swig_scopename_check(e)) {
-	    String *qlast;
-	    String *qname;
-	    Swig_scopename_split(e, &qname, &qlast);
-	    if (qname) {
-	      String *tqname = SwigType_typedef_qualified(qname);
-	      Clear(e);
-	      Printf(e, "%s::%s", tqname, qlast);
-	      Delete(qname);
-	      Delete(tqname);
-	    }
-	    Delete(qlast);
-
-	    /* Automatic template instantiation might go here??? */
-	  } else {
-	    /* It's a bare name.  It's entirely possible, that the
-	       name is part of a namespace. We'll check this by unrolling
-	       out of the current scope */
-
-	    Typetab *cs = current_scope;
-	    while (cs) {
-	      String *qs = SwigType_scope_name(cs);
-	      if (Len(qs)) {
-		Append(qs, "::");
-	      }
-	      Append(qs, e);
-	      if (Getattr(scopes, qs)) {
-		Clear(e);
-		Append(e, qs);
-		Delete(qs);
-		break;
-	      }
-	      Delete(qs);
-	      cs = Getattr(cs, "parent");
-	    }
-	  }
-	}
-	if (isenum) {
-	  Insert(e, 0, isenum);
-	  Delete(isenum);
-	}
-      } else {
-	/* Template.  We need to qualify template parameters as well as the template itself */
-	String *tprefix, *qprefix;
-	String *tsuffix;
-	Iterator pi;
-	Parm *p;
-	List *parms;
-	ty = Swig_symbol_template_deftype(e, current_symtab);
-	/*
-	String *dt = Swig_symbol_template_deftype(e, current_symtab);
-	ty = Swig_symbol_type_qualify(dt, 0);
-	*/
-	e = ty;
-	parms = SwigType_parmlist(e);
-	tprefix = SwigType_templateprefix(e);
-	tsuffix = SwigType_templatesuffix(e);
-	qprefix = SwigType_typedef_qualified(tprefix);
-	Append(qprefix, "<(");
-	pi = First(parms);
-	while ((p = pi.item)) {
-	  String *qt = SwigType_typedef_qualified(p);
-	  if (Equal(qt, p)) {	/*  && (!Swig_scopename_check(qt))) */
-	    /* No change in value.  It is entirely possible that the parameter is an integer value.
-	       If there is a symbol table associated with this scope, we're going to check for this */
-
-	    if (current_symtab) {
-	      Node *lastnode = 0;
-	      String *value = Copy(p);
-	      while (1) {
-		Node *n = Swig_symbol_clookup(value, current_symtab);
-		if (n == lastnode)
-		  break;
-		lastnode = n;
-		if (n) {
-		  char *ntype = Char(nodeType(n));
-		  if (strcmp(ntype, "enumitem") == 0) {
-		    /* An enum item.   Generate a fully qualified name */
-		    String *qn = Swig_symbol_qualified(n);
-		    if (Len(qn)) {
-		      Append(qn, "::");
-		      Append(qn, Getattr(n, "name"));
-		      Delete(value);
-		      value = qn;
-		      continue;
-		    } else {
-		      Delete(qn);
-		      break;
-		    }
-		  } else if ((strcmp(ntype, "cdecl") == 0) && (Getattr(n, "value"))) {
-		    Delete(value);
-		    value = Copy(Getattr(n, "value"));
-		    continue;
-		  }
-		}
-		break;
-	      }
-	      Append(qprefix, value);
-	      Delete(value);
-	    } else {
-	      Append(qprefix, p);
-	    }
-	  } else {
-	    Append(qprefix, qt);
-	  }
-	  Delete(qt);
-	  pi = Next(pi);
-	  if (pi.item) {
-	    Append(qprefix, ",");
-	  }
-	}
-	Append(qprefix, ")>");
-	Append(qprefix, tsuffix);
-	Delete(tsuffix);
-	Clear(e);
-	Append(e, qprefix);
-	Delete(tprefix);
-	Delete(qprefix);
-	Delete(parms);
-	/*
-	Delete(dt);
-	*/
-      }
-      Append(result, e);
-      Delete(ty);
-    } else if (SwigType_isfunction(e)) {
-      List *parms = SwigType_parmlist(e);
-      String *s = NewString("f(");
-      Iterator pi;
-      pi = First(parms);
-      while (pi.item) {
-	String *pq = SwigType_typedef_qualified(pi.item);
-	Append(s, pq);
-	Delete(pq);
-	pi = Next(pi);
-	if (pi.item) {
-	  Append(s, ",");
-	}
-      }
-      Append(s, ").");
-      Append(result, s);
-      Delete(s);
-      Delete(parms);
-    } else if (SwigType_isarray(e)) {
-      String *ndim;
-      String *dim = SwigType_parm(e);
-      ndim = Swig_symbol_string_qualify(dim, 0);
-      Printf(result, "a(%s).", ndim);
-      Delete(dim);
-      Delete(ndim);
-    } else {
-      Append(result, e);
-    }
-  }
-  Delete(elements);
-  {
-    String *key, *cresult;
-    key = NewString(t);
-    cresult = NewString(result);
-    Setattr(typedef_qualified_cache, key, cresult);
-    Delete(key);
-    Delete(cresult);
-  }
-  return result;
-}
-
-/* ----------------------------------------------------------------------------- 
- * SwigType_istypedef()
- *
- * Checks a typename to see if it is a typedef.
- * ----------------------------------------------------------------------------- */
-
-int SwigType_istypedef(const SwigType *t) {
-  String *type;
-
-  type = SwigType_typedef_resolve(t);
-  if (type) {
-    Delete(type);
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_typedef_using()
- *
- * Processes a 'using' declaration to import types from one scope into another.
- * Name is a qualified name like A::B.
- * ----------------------------------------------------------------------------- */
-
-int SwigType_typedef_using(const_String_or_char_ptr name) {
-  String *base;
-  String *td;
-  String *prefix;
-  Typetab *s;
-  Typetab *tt = 0;
-
-  String *defined_name = 0;
-
-  /*  Printf(stdout,"using %s\n", name); */
-
-  if (!Swig_scopename_check(name))
-    return -1;			/* Not properly qualified */
-  base = Swig_scopename_last(name);
-
-  /* See if the base is already defined in this scope */
-  if (Getattr(current_typetab, base)) {
-    Delete(base);
-    return -1;
-  }
-
-  /* See if the using name is a scope */
-  /*  tt = SwigType_find_scope(current_scope,name);
-     Printf(stdout,"tt = %p, name = '%s'\n", tt, name); */
-
-  /* We set up a typedef  B --> A::B */
-  Setattr(current_typetab, base, name);
-
-  /* Find the scope name where the symbol is defined */
-  td = SwigType_typedef_resolve(name);
-  /*  Printf(stdout,"td = '%s' %p\n", td, resolved_scope); */
-  if (resolved_scope) {
-    defined_name = Getattr(resolved_scope, "qname");
-    if (defined_name) {
-      defined_name = Copy(defined_name);
-      Append(defined_name, "::");
-      Append(defined_name, base);
-      /*  Printf(stdout,"defined_name = '%s'\n", defined_name); */
-      tt = SwigType_find_scope(current_scope, defined_name);
-    }
-  }
-  if (td)
-    Delete(td);
-
-
-  /* Figure out the scope the using directive refers to */
-  {
-    prefix = Swig_scopename_prefix(name);
-    if (prefix) {
-      s = SwigType_find_scope(current_scope, prefix);
-      if (s) {
-	Hash *ttab = Getattr(s, "typetab");
-	if (!Getattr(ttab, base) && defined_name) {
-	  Setattr(ttab, base, defined_name);
-	}
-      }
-    }
-  }
-
-  if (tt) {
-    /* Using directive had its own scope.  We need to create a new scope for it */
-    SwigType_new_scope(base);
-    SwigType_inherit_scope(tt);
-    SwigType_pop_scope();
-  }
-
-  if (defined_name)
-    Delete(defined_name);
-  Delete(prefix);
-  Delete(base);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_isclass()
- *
- * Determines if a type defines a class or not.   A class is defined by
- * its type-table entry maps to itself.  Note: a pointer to a class is not
- * a class.
- * ----------------------------------------------------------------------------- */
-
-int SwigType_isclass(const SwigType *t) {
-  SwigType *qty, *qtys;
-  int isclass = 0;
-
-  qty = SwigType_typedef_resolve_all(t);
-  qtys = SwigType_strip_qualifiers(qty);
-  if (SwigType_issimple(qtys)) {
-    String *td = SwigType_typedef_resolve(qtys);
-    if (td) {
-      Delete(td);
-    }
-    if (resolved_scope) {
-      isclass = 1;
-    }
-    /* Hmmm. Not a class.  If a template, it might be uninstantiated */
-    if (!isclass) {
-      String *tp = SwigType_istemplate_templateprefix(qtys);
-      if (tp && Strcmp(tp, t) != 0) {
-	isclass = SwigType_isclass(tp);
-      }
-      Delete(tp);
-    }
-  }
-  Delete(qty);
-  Delete(qtys);
-  return isclass;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_type()
- *
- * Returns an integer code describing the datatype.  This is only used for
- * compatibility with SWIG1.1 language modules and is likely to go away once
- * everything is based on typemaps.
- * ----------------------------------------------------------------------------- */
-
-int SwigType_type(const SwigType *t) {
-  char *c;
-  /* Check for the obvious stuff */
-  c = Char(t);
-
-  if (strncmp(c, "p.", 2) == 0) {
-    if (SwigType_type(c + 2) == T_CHAR)
-      return T_STRING;
-    else if (SwigType_type(c + 2) == T_WCHAR)
-      return T_WSTRING;
-    else
-      return T_POINTER;
-  }
-  if (strncmp(c, "a(", 2) == 0)
-    return T_ARRAY;
-  if (strncmp(c, "r.", 2) == 0)
-    return T_REFERENCE;
-  if (strncmp(c, "z.", 2) == 0)
-    return T_RVALUE_REFERENCE;
-  if (strncmp(c, "m(", 2) == 0)
-    return T_MPOINTER;
-  if (strncmp(c, "q(", 2) == 0) {
-    while (*c && (*c != '.'))
-      c++;
-    if (*c)
-      return SwigType_type(c + 1);
-    return T_ERROR;
-  }
-  if (strncmp(c, "f(", 2) == 0)
-    return T_FUNCTION;
-
-  /* Look for basic types */
-  if (strcmp(c, "int") == 0)
-    return T_INT;
-  if (strcmp(c, "long") == 0)
-    return T_LONG;
-  if (strcmp(c, "short") == 0)
-    return T_SHORT;
-  if (strcmp(c, "unsigned") == 0)
-    return T_UINT;
-  if (strcmp(c, "unsigned short") == 0)
-    return T_USHORT;
-  if (strcmp(c, "unsigned long") == 0)
-    return T_ULONG;
-  if (strcmp(c, "unsigned int") == 0)
-    return T_UINT;
-  if (strcmp(c, "char") == 0)
-    return T_CHAR;
-  if (strcmp(c, "signed char") == 0)
-    return T_SCHAR;
-  if (strcmp(c, "unsigned char") == 0)
-    return T_UCHAR;
-  if (strcmp(c, "wchar_t") == 0)
-    return T_WCHAR;
-  if (strcmp(c, "float") == 0)
-    return T_FLOAT;
-  if (strcmp(c, "double") == 0)
-    return T_DOUBLE;
-  if (strcmp(c, "long double") == 0)
-    return T_LONGDOUBLE;
-  if (!cparse_cplusplus && (strcmp(c, "float complex") == 0))
-    return T_FLTCPLX;
-  if (!cparse_cplusplus && (strcmp(c, "double complex") == 0))
-    return T_DBLCPLX;
-  if (!cparse_cplusplus && (strcmp(c, "complex") == 0))
-    return T_COMPLEX;
-  if (strcmp(c, "void") == 0)
-    return T_VOID;
-  if (strcmp(c, "bool") == 0)
-    return T_BOOL;
-  if (strcmp(c, "long long") == 0)
-    return T_LONGLONG;
-  if (strcmp(c, "unsigned long long") == 0)
-    return T_ULONGLONG;
-  if (strncmp(c, "enum ", 5) == 0)
-    return T_INT;
-  if (strcmp(c, "auto") == 0)
-    return T_AUTO;
-
-  if (strcmp(c, "v(...)") == 0)
-    return T_VARARGS;
-  /* Hmmm. Unknown type */
-  if (SwigType_istypedef(t)) {
-    int r;
-    SwigType *nt = SwigType_typedef_resolve(t);
-    r = SwigType_type(nt);
-    Delete(nt);
-    return r;
-  }
-  return T_USER;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_alttype()
- *
- * Returns the alternative value type needed in C++ for class value
- * types. When swig is not sure about using a plain $ltype value,
- * since the class doesn't have a default constructor, or it can't be
- * assigned, you will get back 'SwigValueWrapper<type >'.
- *
- * This is the default behavior unless:
- *
- *  1.- swig detects a default_constructor and 'setallocate:default_constructor'
- *      attribute.
- *
- *  2.- swig doesn't mark 'type' as non-assignable.
- *
- *  3.- the user specifies that the value wrapper is not needed by using
- *      %feature("novaluewrapper") like so:
- *
- *        %feature("novaluewrapper") MyOpaqueClass;
- *        class MyOpaqueClass;
- *
- * The user can also force the use of the value wrapper with
- * %feature("valuewrapper").
- * ----------------------------------------------------------------------------- */
-
-SwigType *SwigType_alttype(const SwigType *t, int local_tmap) {
-  Node *n;
-  SwigType *w = 0;
-  int use_wrapper = 0;
-  SwigType *td = 0;
-
-  if (!cparse_cplusplus)
-    return 0;
-
-  if (value_wrapper_mode == 0) {
-    /* old partial use of SwigValueTypes, it can fail for opaque types */
-    if (local_tmap)
-      return 0;
-    if (SwigType_isclass(t)) {
-      SwigType *ftd = SwigType_typedef_resolve_all(t);
-      td = SwigType_strip_qualifiers(ftd);
-      Delete(ftd);
-      n = Swig_symbol_clookup(td, 0);
-      if (n) {
-	if (GetFlag(n, "feature:valuewrapper")) {
-	  use_wrapper = 1;
-	} else {
-	  if (Checkattr(n, "nodeType", "class")
-	      && (!Getattr(n, "allocate:default_constructor")
-		  || (Getattr(n, "allocate:noassign")))) {
-	    use_wrapper = !GetFlag(n, "feature:novaluewrapper") || GetFlag(n, "feature:nodefault");
-	  }
-	}
-      } else {
-	if (SwigType_issimple(td) && SwigType_istemplate(td)) {
-	  use_wrapper = !n || !GetFlag(n, "feature:novaluewrapper");
-	}
-      }
-    }
-  } else {
-    /* safe use of SwigValueTypes, it can fail with some typemaps */
-    SwigType *ftd = SwigType_typedef_resolve_all(t);
-    td = SwigType_strip_qualifiers(ftd);
-    Delete(ftd);
-    if (SwigType_type(td) == T_USER) {
-      use_wrapper = 1;
-      n = Swig_symbol_clookup(td, 0);
-      if (n) {
-	if ((Checkattr(n, "nodeType", "class")
-	     && !Getattr(n, "allocate:noassign")
-	     && (Getattr(n, "allocate:default_constructor")))
-	    || (GetFlag(n, "feature:novaluewrapper"))) {
-	  use_wrapper = GetFlag(n, "feature:valuewrapper");
-	}
-      }
-    }
-  }
-
-  if (use_wrapper) {
-    /* Need a space before the type in case it starts "::" (since the <:
-     * token is a digraph for [ in C++.  Also need a space after the
-     * type in case it ends with ">" since then we form the token ">>".
-     */
-    w = NewStringf("SwigValueWrapper< %s >", td);
-  }
-  Delete(td);
-  return w;
-}
-
-/* ----------------------------------------------------------------------------
- *                         * * * WARNING * * *                            ***
- *                                                                        ***
- * Don't even think about modifying anything below this line unless you   ***
- * are completely on top of *EVERY* subtle aspect of the C++ type system  ***
- * and you are prepared to suffer endless hours of agony trying to        ***
- * debug the SWIG run-time type checker after you break it.               ***
- * ------------------------------------------------------------------------- */
-
-/* -----------------------------------------------------------------------------
- * SwigType_remember()
- *
- * This function "remembers" a datatype that was used during wrapper code generation
- * so that a type-checking table can be generated later on. It is up to the language
- * modules to actually call this function--it is not done automatically.
- *
- * Type tracking is managed through two separate hash tables.  The hash 'r_mangled'
- * is mapping between mangled type names (used in the target language) and 
- * fully-resolved C datatypes used in the source input.   The second hash 'r_resolved'
- * is the inverse mapping that maps fully-resolved C datatypes to all of the mangled
- * names in the scripting languages.  For example, consider the following set of
- * typedef declarations:
- *
- *      typedef double Real;
- *      typedef double Float;
- *      typedef double Point[3];
- *
- * Now, suppose that the types 'double *', 'Real *', 'Float *', 'double[3]', and
- * 'Point' were used in an interface file and "remembered" using this function.
- * The hash tables would look like this:
- *
- * r_mangled {
- *   _p_double : [ p.double, a(3).double ]
- *   _p_Real   : [ p.double ]
- *   _p_Float  : [ p.double ]
- *   _Point    : [ a(3).double ]
- *
- * r_resolved {
- *   p.double     : [ _p_double, _p_Real, _p_Float ]
- *   a(3).double  : [ _p_double, _Point ]
- * }
- *
- * Together these two hash tables can be used to determine type-equivalency between
- * mangled typenames.  To do this, we view the two hash tables as a large graph and
- * compute the transitive closure.
- * ----------------------------------------------------------------------------- */
-
-static Hash *r_mangled = 0;	/* Hash mapping mangled types to fully resolved types */
-static Hash *r_resolved = 0;	/* Hash mapping resolved types to mangled types       */
-static Hash *r_ltype = 0;	/* Hash mapping mangled names to their local c type   */
-static Hash *r_clientdata = 0;	/* Hash mapping resolved types to client data         */
-static Hash *r_mangleddata = 0;	/* Hash mapping mangled types to client data         */
-static Hash *r_remembered = 0;	/* Hash of types we remembered already */
-
-static void (*r_tracefunc) (const SwigType *t, String *mangled, String *clientdata) = 0;
-
-void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr clientdata) {
-  if (!r_mangleddata) {
-    r_mangleddata = NewHash();
-  }
-  Setattr(r_mangleddata, mangled, clientdata);
-}
-
-
-void SwigType_remember_clientdata(const SwigType *t, const_String_or_char_ptr clientdata) {
-  String *mt;
-  SwigType *lt;
-  Hash *h;
-  SwigType *fr;
-  SwigType *qr;
-  String *tkey;
-  String *cd;
-  Hash *lthash;
-
-  if (!r_mangled) {
-    r_mangled = NewHash();
-    r_resolved = NewHash();
-    r_ltype = NewHash();
-    r_clientdata = NewHash();
-    r_remembered = NewHash();
-  }
-
-  {
-    String *last;
-    last = Getattr(r_remembered, t);
-    if (last && (Cmp(last, clientdata) == 0))
-      return;
-  }
-
-  tkey = Copy(t);
-  cd = clientdata ? NewString(clientdata) : NewStringEmpty();
-  Setattr(r_remembered, tkey, cd);
-  Delete(tkey);
-  Delete(cd);
-
-  mt = SwigType_manglestr(t);	/* Create mangled string */
-
-  if (r_tracefunc) {
-    (*r_tracefunc) (t, mt, (String *) clientdata);
-  }
-
-  if (SwigType_istypedef(t)) {
-    lt = Copy(t);
-  } else {
-    lt = SwigType_ltype(t);
-  }
-
-  lthash = Getattr(r_ltype, mt);
-  if (!lthash) {
-    lthash = NewHash();
-    Setattr(r_ltype, mt, lthash);
-  }
-  Setattr(lthash, lt, "1");
-  Delete(lt);
-
-  fr = SwigType_typedef_resolve_all(t);	/* Create fully resolved type */
-  qr = SwigType_typedef_qualified(fr);
-  Delete(fr);
-
-  /* Added to deal with possible table bug */
-  fr = SwigType_strip_qualifiers(qr);
-  Delete(qr);
-
-  /*Printf(stdout,"t = '%s'\n", t);
-     Printf(stdout,"fr= '%s'\n\n", fr); */
-
-  if (t) {
-    char *ct = Char(t);
-    if (strchr(ct, '<') && !(strstr(ct, "<("))) {
-      Printf(stdout, "Bad template type passed to SwigType_remember: %s\n", t);
-      assert(0);
-    }
-  }
-
-  h = Getattr(r_mangled, mt);
-  if (!h) {
-    h = NewHash();
-    Setattr(r_mangled, mt, h);
-    Delete(h);
-  }
-  Setattr(h, fr, mt);
-
-  h = Getattr(r_resolved, fr);
-  if (!h) {
-    h = NewHash();
-    Setattr(r_resolved, fr, h);
-    Delete(h);
-  }
-  Setattr(h, mt, fr);
-
-  if (clientdata) {
-    String *cd = Getattr(r_clientdata, fr);
-    if (cd) {
-      if (Strcmp(clientdata, cd) != 0) {
-	Printf(stderr, "*** Internal error. Inconsistent clientdata for type '%s'\n", SwigType_str(fr, 0));
-	Printf(stderr, "*** '%s' != '%s'\n", clientdata, cd);
-	assert(0);
-      }
-    } else {
-      String *cstr = NewString(clientdata);
-      Setattr(r_clientdata, fr, cstr);
-      Delete(cstr);
-    }
-  }
-
-  /* If the remembered type is a reference, we also remember the pointer version.
-     This is to prevent odd problems with mixing pointers and references--especially
-     when different functions are using different typenames (via typedef). */
-
-  if (SwigType_isreference(t)) {
-    SwigType *tt = Copy(t);
-    SwigType_del_reference(tt);
-    SwigType_add_pointer(tt);
-    SwigType_remember_clientdata(tt, clientdata);
-  } else if (SwigType_isrvalue_reference(t)) {
-    SwigType *tt = Copy(t);
-    SwigType_del_rvalue_reference(tt);
-    SwigType_add_pointer(tt);
-    SwigType_remember_clientdata(tt, clientdata);
-  }
-}
-
-void SwigType_remember(const SwigType *ty) {
-  SwigType_remember_clientdata(ty, 0);
-}
-
-void (*SwigType_remember_trace(void (*tf) (const SwigType *, String *, String *))) (const SwigType *, String *, String *) {
-  void (*o) (const SwigType *, String *, String *) = r_tracefunc;
-  r_tracefunc = tf;
-  return o;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_equivalent_mangle()
- *
- * Return a list of all of the mangled typenames that are equivalent to another
- * mangled name.   This works as follows: For each fully qualified C datatype
- * in the r_mangled hash entry, we collect all of the mangled names from the
- * r_resolved hash and combine them together in a list (removing duplicate entries).
- * ----------------------------------------------------------------------------- */
-
-List *SwigType_equivalent_mangle(String *ms, Hash *checked, Hash *found) {
-  List *l;
-  Hash *h;
-  Hash *ch;
-  Hash *mh;
-
-  if (found) {
-    h = found;
-  } else {
-    h = NewHash();
-  }
-  if (checked) {
-    ch = checked;
-  } else {
-    ch = NewHash();
-  }
-  if (Getattr(ch, ms))
-    goto check_exit;		/* Already checked this type */
-  Setattr(h, ms, "1");
-  Setattr(ch, ms, "1");
-  mh = Getattr(r_mangled, ms);
-  if (mh) {
-    Iterator ki;
-    ki = First(mh);
-    while (ki.key) {
-      Hash *rh;
-      if (Getattr(ch, ki.key)) {
-	ki = Next(ki);
-	continue;
-      }
-      Setattr(ch, ki.key, "1");
-      rh = Getattr(r_resolved, ki.key);
-      if (rh) {
-	Iterator rk;
-	rk = First(rh);
-	while (rk.key) {
-	  Setattr(h, rk.key, "1");
-	  SwigType_equivalent_mangle(rk.key, ch, h);
-	  rk = Next(rk);
-	}
-      }
-      ki = Next(ki);
-    }
-  }
-check_exit:
-  if (!found) {
-    l = Keys(h);
-    Delete(h);
-    Delete(ch);
-    return l;
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_clientdata_collect()
- *
- * Returns the clientdata field for a mangled type-string.
- * ----------------------------------------------------------------------------- */
-
-static
-String *SwigType_clientdata_collect(String *ms) {
-  Hash *mh;
-  String *clientdata = 0;
-
-  if (r_mangleddata) {
-    clientdata = Getattr(r_mangleddata, ms);
-    if (clientdata)
-      return clientdata;
-  }
-
-  mh = Getattr(r_mangled, ms);
-  if (mh) {
-    Iterator ki;
-    ki = First(mh);
-    while (ki.key) {
-      clientdata = Getattr(r_clientdata, ki.key);
-      if (clientdata)
-	break;
-      ki = Next(ki);
-    }
-  }
-  return clientdata;
-}
-
-
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_inherit()
- *
- * Record information about inheritance.  We keep a hash table that keeps
- * a mapping between base classes and all of the classes that are derived
- * from them.
- *
- * subclass is a hash that maps base-classes to all of the classes derived from them.
- *
- * derived - name of derived class
- * base - name of base class
- * cast - additional casting code when casting from derived to base
- * conversioncode - if set, overrides the default code in the function when casting
- *                from derived to base
- * ----------------------------------------------------------------------------- */
-
-static Hash *subclass = 0;
-static Hash *conversions = 0;
-
-void SwigType_inherit(String *derived, String *base, String *cast, String *conversioncode) {
-  Hash *h;
-  String *dd = 0;
-  String *bb = 0;
-  if (!subclass)
-    subclass = NewHash();
-
-  /* Printf(stdout,"'%s' --> '%s'  '%s'\n", derived, base, cast); */
-
-  if (SwigType_istemplate(derived)) {
-    String *ty = SwigType_typedef_resolve_all(derived);
-    dd = SwigType_typedef_qualified(ty);
-    derived = dd;
-    Delete(ty);
-  }
-  if (SwigType_istemplate(base)) {
-    String *ty = SwigType_typedef_resolve_all(base);
-    bb = SwigType_typedef_qualified(ty);
-    base = bb;
-    Delete(ty);
-  }
-
-  /* Printf(stdout,"'%s' --> '%s'  '%s'\n", derived, base, cast); */
-
-  h = Getattr(subclass, base);
-  if (!h) {
-    h = NewHash();
-    Setattr(subclass, base, h);
-    Delete(h);
-  }
-  if (!Getattr(h, derived)) {
-    Hash *c = NewHash();
-    if (cast)
-      Setattr(c, "cast", cast);
-    if (conversioncode)
-      Setattr(c, "convcode", conversioncode);
-    Setattr(h, derived, c);
-    Delete(c);
-  }
-
-  Delete(dd);
-  Delete(bb);
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_issubtype()
- *
- * Determines if a t1 is a subtype of t2, ie, is t1 derived from t2
- * ----------------------------------------------------------------------------- */
-
-int SwigType_issubtype(const SwigType *t1, const SwigType *t2) {
-  SwigType *ft1, *ft2;
-  String *b1, *b2;
-  Hash *h;
-  int r = 0;
-
-  if (!subclass)
-    return 0;
-
-  ft1 = SwigType_typedef_resolve_all(t1);
-  ft2 = SwigType_typedef_resolve_all(t2);
-  b1 = SwigType_base(ft1);
-  b2 = SwigType_base(ft2);
-
-  h = Getattr(subclass, b2);
-  if (h) {
-    if (Getattr(h, b1)) {
-      r = 1;
-    }
-  }
-  Delete(ft1);
-  Delete(ft2);
-  Delete(b1);
-  Delete(b2);
-  /* Printf(stdout, "issubtype(%s,%s) --> %d\n", t1, t2, r); */
-  return r;
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_inherit_equiv()
- *
- * Modify the type table to handle C++ inheritance
- * ----------------------------------------------------------------------------- */
-
-void SwigType_inherit_equiv(File *out) {
-  String *ckey;
-  String *prefix, *base;
-  String *mprefix, *mkey;
-  Hash *sub;
-  Hash *rh;
-  List *rlist;
-  Iterator rk, bk, ck;
-
-  if (!conversions)
-    conversions = NewHash();
-  if (!subclass)
-    subclass = NewHash();
-
-  rk = First(r_resolved);
-  while (rk.key) {
-    /* rkey is a fully qualified type.  We strip all of the type constructors off of it just to get the base */
-    base = SwigType_base(rk.key);
-    /* Check to see whether the base is recorded in the subclass table */
-    sub = Getattr(subclass, base);
-    Delete(base);
-    if (!sub) {
-      rk = Next(rk);
-      continue;
-    }
-
-    /* This type has subclasses.  We now need to walk through these subtypes and generate pointer conversion functions */
-
-    rh = Getattr(r_resolved, rk.key);
-    rlist = NewList();
-    for (ck = First(rh); ck.key; ck = Next(ck)) {
-      Append(rlist, ck.key);
-    }
-    /*    Printf(stdout,"rk.key = '%s'\n", rk.key);
-       Printf(stdout,"rh = %p '%s'\n", rh,rh); */
-
-    bk = First(sub);
-    while (bk.key) {
-      prefix = SwigType_prefix(rk.key);
-      Append(prefix, bk.key);
-      /*      Printf(stdout,"set %p = '%s' : '%s'\n", rh, SwigType_manglestr(prefix),prefix); */
-      mprefix = SwigType_manglestr(prefix);
-      Setattr(rh, mprefix, prefix);
-      mkey = SwigType_manglestr(rk.key);
-      ckey = NewStringf("%s+%s", mprefix, mkey);
-      if (!Getattr(conversions, ckey)) {
-	String *convname = NewStringf("%sTo%s", mprefix, mkey);
-	String *lkey = SwigType_lstr(rk.key, 0);
-	String *lprefix = SwigType_lstr(prefix, 0);
-        Hash *subhash = Getattr(sub, bk.key);
-        String *convcode = Getattr(subhash, "convcode");
-        if (convcode) {
-          char *newmemoryused = Strstr(convcode, "newmemory"); /* see if newmemory parameter is used in order to avoid unused parameter warnings */
-          String *fn = Copy(convcode);
-          Replaceall(fn, "$from", "x");
-          Printf(out, "static void *%s(void *x, int *%s) {", convname, newmemoryused ? "newmemory" : "SWIGUNUSEDPARM(newmemory)");
-          Printf(out, "%s", fn);
-        } else {
-          String *cast = Getattr(subhash, "cast");
-          Printf(out, "static void *%s(void *x, int *SWIGUNUSEDPARM(newmemory)) {", convname);
-          Printf(out, "\n    return (void *)((%s) ", lkey);
-          if (cast)
-            Printf(out, "%s", cast);
-          Printf(out, " ((%s) x));\n", lprefix);
-        }
-	Printf(out, "}\n");
-	Setattr(conversions, ckey, convname);
-	Delete(ckey);
-	Delete(lkey);
-	Delete(lprefix);
-
-	/* This inserts conversions for typedefs */
-	{
-	  Hash *r = Getattr(r_resolved, prefix);
-	  if (r) {
-	    Iterator rrk;
-	    rrk = First(r);
-	    while (rrk.key) {
-	      Iterator rlk;
-	      String *rkeymangle;
-
-	      /* Make sure this name equivalence is not due to inheritance */
-	      if (Cmp(prefix, Getattr(r, rrk.key)) == 0) {
-		rkeymangle = Copy(mkey);
-		ckey = NewStringf("%s+%s", rrk.key, rkeymangle);
-		if (!Getattr(conversions, ckey)) {
-		  Setattr(conversions, ckey, convname);
-		}
-		Delete(ckey);
-		for (rlk = First(rlist); rlk.item; rlk = Next(rlk)) {
-		  ckey = NewStringf("%s+%s", rrk.key, rlk.item);
-		  Setattr(conversions, ckey, convname);
-		  Delete(ckey);
-		}
-		Delete(rkeymangle);
-		/* This is needed to pick up other alternative names for the same type.
-		   Needed to make templates work */
-		Setattr(rh, rrk.key, rrk.item);
-	      }
-	      rrk = Next(rrk);
-	    }
-	  }
-	}
-	Delete(convname);
-      }
-      Delete(prefix);
-      Delete(mprefix);
-      Delete(mkey);
-      bk = Next(bk);
-    }
-    rk = Next(rk);
-    Delete(rlist);
-  }
-}
-
-/* Helper function to sort the mangled list */
-static int SwigType_compare_mangled(const DOH *a, const DOH *b) {
-  return strcmp((char *) Data(a), (char *) Data(b));
-}
-
-/* -----------------------------------------------------------------------------
- * SwigType_get_sorted_mangled_list()
- *
- * Returns the sorted list of mangled type names that should be exported into the
- * wrapper file.
- * ----------------------------------------------------------------------------- */
-List *SwigType_get_sorted_mangled_list() {
-  List *l = Keys(r_mangled);
-  SortList(l, SwigType_compare_mangled);
-  return l;
-}
-
-
-/* -----------------------------------------------------------------------------
- * SwigType_type_table()
- *
- * Generate the type-table for the type-checker.
- * ----------------------------------------------------------------------------- */
-
-void SwigType_emit_type_table(File *f_forward, File *f_table) {
-  Iterator ki;
-  String *types, *table, *cast, *cast_init, *cast_temp;
-  Hash *imported_types;
-  List *mangled_list;
-  List *table_list = NewList();
-  int i = 0;
-
-  if (!r_mangled) {
-    r_mangled = NewHash();
-    r_resolved = NewHash();
-  }
-
-  Printf(f_table, "\n/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */\n\n");
-
-  SwigType_inherit_equiv(f_table);
-
-   /*#define DEBUG 1*/
-#ifdef DEBUG
-  Printf(stdout, "---r_mangled---\n");
-  Printf(stdout, "%s\n", r_mangled);
-
-  Printf(stdout, "---r_resolved---\n");
-  Printf(stdout, "%s\n", r_resolved);
-
-  Printf(stdout, "---r_ltype---\n");
-  Printf(stdout, "%s\n", r_ltype);
-
-  Printf(stdout, "---subclass---\n");
-  Printf(stdout, "%s\n", subclass);
-
-  Printf(stdout, "---conversions---\n");
-  Printf(stdout, "%s\n", conversions);
-
-  Printf(stdout, "---r_clientdata---\n");
-  Printf(stdout, "%s\n", r_clientdata);
-
-#endif
-  table = NewStringEmpty();
-  types = NewStringEmpty();
-  cast = NewStringEmpty();
-  cast_init = NewStringEmpty();
-  imported_types = NewHash();
-
-  Printf(table, "static swig_type_info *swig_type_initial[] = {\n");
-  Printf(cast_init, "static swig_cast_info *swig_cast_initial[] = {\n");
-
-  Printf(f_forward, "\n/* -------- TYPES TABLE (BEGIN) -------- */\n\n");
-
-  mangled_list = SwigType_get_sorted_mangled_list();
-  for (ki = First(mangled_list); ki.item; ki = Next(ki)) {
-    List *el;
-    Iterator ei;
-    SwigType *lt;
-    SwigType *rt = 0;
-    String *nt;
-    String *ln;
-    String *rn;
-    const String *cd;
-    Hash *lthash;
-    Iterator ltiter;
-    Hash *nthash;
-
-    cast_temp = NewStringEmpty();
-
-    Printv(types, "static swig_type_info _swigt_", ki.item, " = {", NIL);
-    Append(table_list, ki.item);
-    Printf(cast_temp, "static swig_cast_info _swigc_%s[] = {", ki.item);
-    i++;
-
-    cd = SwigType_clientdata_collect(ki.item);
-    if (!cd)
-      cd = "0";
-
-    lthash = Getattr(r_ltype, ki.item);
-    nt = 0;
-    nthash = NewHash();
-    ltiter = First(lthash);
-    while (ltiter.key) {
-      lt = ltiter.key;
-      rt = SwigType_typedef_resolve_all(lt);
-      /* we save the original type and the fully resolved version */
-      ln = SwigType_lstr(lt, 0);
-      rn = SwigType_lstr(rt, 0);
-      if (Equal(ln, rn)) {
-        Setattr(nthash, ln, "1");
-      } else {
-	Setattr(nthash, rn, "1");
-	Setattr(nthash, ln, "1");
-      }
-      if (SwigType_istemplate(rt)) {
-        String *dt = Swig_symbol_template_deftype(rt, 0);
-        String *dn = SwigType_lstr(dt, 0);
-        if (!Equal(dn, rn) && !Equal(dn, ln)) {
-          Setattr(nthash, dn, "1");
-        }
-        Delete(dt);
-        Delete(dn);
-      }
-
-      ltiter = Next(ltiter);
-    }
-
-    /* now build nt */
-    ltiter = First(nthash);
-    nt = 0;
-    while (ltiter.key) {
-      if (nt) {
-	 Printf(nt, "|%s", ltiter.key);
-      } else {
-	 nt = NewString(ltiter.key);
-      }
-      ltiter = Next(ltiter);
-    }
-    Delete(nthash);
-
-    Printf(types, "\"%s\", \"%s\", 0, 0, (void*)%s, 0};\n", ki.item, nt, cd);
-
-    el = SwigType_equivalent_mangle(ki.item, 0, 0);
-    for (ei = First(el); ei.item; ei = Next(ei)) {
-      String *ckey;
-      String *conv;
-      ckey = NewStringf("%s+%s", ei.item, ki.item);
-      conv = Getattr(conversions, ckey);
-      if (conv) {
-	Printf(cast_temp, "  {&_swigt_%s, %s, 0, 0},", ei.item, conv);
-      } else {
-	Printf(cast_temp, "  {&_swigt_%s, 0, 0, 0},", ei.item);
-      }
-      Delete(ckey);
-
-      if (!Getattr(r_mangled, ei.item) && !Getattr(imported_types, ei.item)) {
-	Printf(types, "static swig_type_info _swigt_%s = {\"%s\", 0, 0, 0, 0, 0};\n", ei.item, ei.item);
-	Append(table_list, ei.item);
-
-	Printf(cast, "static swig_cast_info _swigc_%s[] = {{&_swigt_%s, 0, 0, 0},{0, 0, 0, 0}};\n", ei.item, ei.item);
-	i++;
-
-	Setattr(imported_types, ei.item, "1");
-      }
-    }
-    Delete(el);
-    Printf(cast, "%s{0, 0, 0, 0}};\n", cast_temp);
-    Delete(cast_temp);
-    Delete(nt);
-    Delete(rt);
-  }
-  /* print the tables in the proper order */
-  SortList(table_list, SwigType_compare_mangled);
-  i = 0;
-  for (ki = First(table_list); ki.item; ki = Next(ki)) {
-    Printf(f_forward, "#define SWIGTYPE%s swig_types[%d]\n", ki.item, i++);
-    Printf(table, "  &_swigt_%s,\n", ki.item);
-    Printf(cast_init, "  _swigc_%s,\n", ki.item);
-  }
-  if (i == 0) {
-    /* empty arrays are not allowed by ISO C */
-    Printf(table, "  NULL\n");
-    Printf(cast_init, "  NULL\n");
-  }
-
-  Delete(table_list);
-
-  Delete(mangled_list);
-
-  Printf(table, "};\n");
-  Printf(cast_init, "};\n");
-  Printf(f_table, "%s\n", types);
-  Printf(f_table, "%s\n", table);
-  Printf(f_table, "%s\n", cast);
-  Printf(f_table, "%s\n", cast_init);
-  Printf(f_table, "\n/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */\n\n");
-
-  Printf(f_forward, "static swig_type_info *swig_types[%d];\n", i + 1);
-  Printf(f_forward, "static swig_module_info swig_module = {swig_types, %d, 0, 0, 0, 0};\n", i);
-  Printf(f_forward, "#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)\n");
-  Printf(f_forward, "#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)\n");
-  Printf(f_forward, "\n/* -------- TYPES TABLE (END) -------- */\n\n");
-
-  Delete(types);
-  Delete(table);
-  Delete(cast);
-  Delete(cast_init);
-  Delete(imported_types);
-}
diff --git a/dependencies2013/win32/swig/Source/Swig/wrapfunc.c b/dependencies2013/win32/swig/Source/Swig/wrapfunc.c
deleted file mode 100644
index 29a59cc4..00000000
--- a/dependencies2013/win32/swig/Source/Swig/wrapfunc.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/* ----------------------------------------------------------------------------- 
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * wrapfunc.c
- *
- * This file defines a object for creating wrapper functions.  Primarily
- * this is used for convenience since it allows pieces of a wrapper function
- * to be created in a piecemeal manner.
- * ----------------------------------------------------------------------------- */
-
-#include "swig.h"
-#include <ctype.h>
-
-static int Compact_mode = 0;	/* set to 0 on default */
-static int Max_line_size = 128;
-
-/* -----------------------------------------------------------------------------
- * NewWrapper()
- *
- * Create a new wrapper function object.
- * ----------------------------------------------------------------------------- */
-
-Wrapper *NewWrapper(void) {
-  Wrapper *w;
-  w = (Wrapper *) malloc(sizeof(Wrapper));
-  w->localh = NewHash();
-  w->locals = NewStringEmpty();
-  w->code = NewStringEmpty();
-  w->def = NewStringEmpty();
-  return w;
-}
-
-/* -----------------------------------------------------------------------------
- * DelWrapper()
- *
- * Delete a wrapper function object.
- * ----------------------------------------------------------------------------- */
-
-void DelWrapper(Wrapper *w) {
-  Delete(w->localh);
-  Delete(w->locals);
-  Delete(w->code);
-  Delete(w->def);
-  free(w);
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_compact_print_mode_set()
- *
- * Set compact_mode.
- * ----------------------------------------------------------------------------- */
-
-void Wrapper_compact_print_mode_set(int flag) {
-  Compact_mode = flag;
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_pretty_print()
- *
- * Formats a wrapper function and fixes up the indentation.
- * ----------------------------------------------------------------------------- */
-
-void Wrapper_pretty_print(String *str, File *f) {
-  String *ts;
-  int level = 0;
-  int c, i;
-  int empty = 1;
-  int indent = 2;
-  int plevel = 0;
-  int label = 0;
-
-  ts = NewStringEmpty();
-  Seek(str, 0, SEEK_SET);
-  while ((c = Getc(str)) != EOF) {
-    if (c == '\"') {
-      Putc(c, ts);
-      while ((c = Getc(str)) != EOF) {
-	if (c == '\\') {
-	  Putc(c, ts);
-	  c = Getc(str);
-	}
-	Putc(c, ts);
-	if (c == '\"')
-	  break;
-      }
-      empty = 0;
-    } else if (c == '\'') {
-      Putc(c, ts);
-      while ((c = Getc(str)) != EOF) {
-	if (c == '\\') {
-	  Putc(c, ts);
-	  c = Getc(str);
-	}
-	Putc(c, ts);
-	if (c == '\'')
-	  break;
-      }
-      empty = 0;
-    } else if (c == ':') {
-      Putc(c, ts);
-      if ((c = Getc(str)) == '\n') {
-	if (!empty && !strchr(Char(ts), '?'))
-	  label = 1;
-      }
-      Ungetc(c, str);
-    } else if (c == '(') {
-      Putc(c, ts);
-      plevel += indent;
-      empty = 0;
-    } else if (c == ')') {
-      Putc(c, ts);
-      plevel -= indent;
-      empty = 0;
-    } else if (c == '{') {
-      Putc(c, ts);
-      Putc('\n', ts);
-      for (i = 0; i < level; i++)
-	Putc(' ', f);
-      Printf(f, "%s", ts);
-      Clear(ts);
-      level += indent;
-      while ((c = Getc(str)) != EOF) {
-	if (!isspace(c)) {
-	  Ungetc(c, str);
-	  break;
-	}
-      }
-      empty = 0;
-    } else if (c == '}') {
-      if (!empty) {
-	Putc('\n', ts);
-	for (i = 0; i < level; i++)
-	  Putc(' ', f);
-	Printf(f, "%s", ts);
-	Clear(ts);
-      }
-      level -= indent;
-      Putc(c, ts);
-      empty = 0;
-    } else if (c == '\n') {
-      Putc(c, ts);
-      empty = 0;
-      if (!empty) {
-	int slevel = level;
-	if (label && (slevel >= indent))
-	  slevel -= indent;
-	if ((Char(ts))[0] != '#') {
-	  for (i = 0; i < slevel; i++)
-	    Putc(' ', f);
-	}
-	Printf(f, "%s", ts);
-	for (i = 0; i < plevel; i++)
-	  Putc(' ', f);
-      }
-      Clear(ts);
-      label = 0;
-      empty = 1;
-    } else if (c == '/') {
-      empty = 0;
-      Putc(c, ts);
-      c = Getc(str);
-      if (c != EOF) {
-	Putc(c, ts);
-	if (c == '/') {		/* C++ comment */
-	  while ((c = Getc(str)) != EOF) {
-	    if (c == '\n') {
-	      Ungetc(c, str);
-	      break;
-	    }
-	    Putc(c, ts);
-	  }
-	} else if (c == '*') {	/* C comment */
-	  int endstar = 0;
-	  while ((c = Getc(str)) != EOF) {
-	    if (endstar && c == '/') {	/* end of C comment */
-	      Putc(c, ts);
-	      break;
-	    }
-	    endstar = (c == '*');
-	    Putc(c, ts);
-	    if (c == '\n') {	/* multi-line C comment. Could be improved slightly. */
-	      for (i = 0; i < level; i++)
-		Putc(' ', ts);
-	    }
-	  }
-	}
-      }
-    } else {
-      if (!empty || !isspace(c)) {
-	Putc(c, ts);
-	empty = 0;
-      }
-    }
-  }
-  if (!empty)
-    Printf(f, "%s", ts);
-  Delete(ts);
-  Printf(f, "\n");
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_compact_print()
- *
- * Formats a wrapper function and fixes up the indentation.
- * Print out in compact format, with Compact enabled.
- * ----------------------------------------------------------------------------- */
-
-void Wrapper_compact_print(String *str, File *f) {
-  String *ts, *tf;		/*temp string & temp file */
-  int level = 0;
-  int c, i;
-  int empty = 1;
-  int indent = 2;
-
-  ts = NewStringEmpty();
-  tf = NewStringEmpty();
-  Seek(str, 0, SEEK_SET);
-
-  while ((c = Getc(str)) != EOF) {
-    if (c == '\"') {		/* string 1 */
-      empty = 0;
-      Putc(c, ts);
-      while ((c = Getc(str)) != EOF) {
-	if (c == '\\') {
-	  Putc(c, ts);
-	  c = Getc(str);
-	}
-	Putc(c, ts);
-	if (c == '\"')
-	  break;
-      }
-    } else if (c == '\'') {	/* string 2 */
-      empty = 0;
-      Putc(c, ts);
-      while ((c = Getc(str)) != EOF) {
-	if (c == '\\') {
-	  Putc(c, ts);
-	  c = Getc(str);
-	}
-	Putc(c, ts);
-	if (c == '\'')
-	  break;
-      }
-    } else if (c == '{') {	/* start of {...} */
-      empty = 0;
-      Putc(c, ts);
-      if (Len(tf) == 0) {
-	for (i = 0; i < level; i++)
-	  Putc(' ', tf);
-      } else if ((Len(tf) + Len(ts)) < Max_line_size) {
-	Putc(' ', tf);
-      } else {
-	Putc('\n', tf);
-	Printf(f, "%s", tf);
-	Clear(tf);
-	for (i = 0; i < level; i++)
-	  Putc(' ', tf);
-      }
-      Append(tf, ts);
-      Clear(ts);
-      level += indent;
-      while ((c = Getc(str)) != EOF) {
-	if (!isspace(c)) {
-	  Ungetc(c, str);
-	  break;
-	}
-      }
-    } else if (c == '}') {	/* end of {...} */
-      empty = 0;
-      if (Len(tf) == 0) {
-	for (i = 0; i < level; i++)
-	  Putc(' ', tf);
-      } else if ((Len(tf) + Len(ts)) < Max_line_size) {
-	Putc(' ', tf);
-      } else {
-	Putc('\n', tf);
-	Printf(f, "%s", tf);
-	Clear(tf);
-	for (i = 0; i < level; i++)
-	  Putc(' ', tf);
-      }
-      Append(tf, ts);
-      Putc(c, tf);
-      Clear(ts);
-      level -= indent;
-    } else if (c == '\n') {	/* line end */
-      while ((c = Getc(str)) != EOF) {
-	if (!isspace(c))
-	  break;
-      }
-      if (c == '#') {
-	Putc('\n', ts);
-      } else if (c == '}') {
-	Putc(' ', ts);
-      } else if ((c != EOF) || (Len(ts) != 0)) {
-	if (Len(tf) == 0) {
-	  for (i = 0; i < level; i++)
-	    Putc(' ', tf);
-	} else if ((Len(tf) + Len(ts)) < Max_line_size) {
-	  Putc(' ', tf);
-	} else {
-	  Putc('\n', tf);
-	  Printf(f, "%s", tf);
-	  Clear(tf);
-	  for (i = 0; i < level; i++)
-	    Putc(' ', tf);
-	}
-	Append(tf, ts);
-	Clear(ts);
-      }
-      Ungetc(c, str);
-
-      empty = 1;
-    } else if (c == '/') {	/* comment */
-      empty = 0;
-      c = Getc(str);
-      if (c != EOF) {
-	if (c == '/') {		/* C++ comment */
-	  while ((c = Getc(str)) != EOF) {
-	    if (c == '\n') {
-	      Ungetc(c, str);
-	      break;
-	    }
-	  }
-	} else if (c == '*') {	/* C comment */
-	  int endstar = 0;
-	  while ((c = Getc(str)) != EOF) {
-	    if (endstar && c == '/') {	/* end of C comment */
-	      break;
-	    }
-	    endstar = (c == '*');
-	  }
-	} else {
-	  Putc('/', ts);
-	  Putc(c, ts);
-	}
-      }
-    } else if (c == '#') {	/* Preprocessor line */
-      Putc('#', ts);
-      while ((c = Getc(str)) != EOF) {
-	Putc(c, ts);
-	if (c == '\\') {	/* Continued line of the same PP */
-	  c = Getc(str);
-	  if (c == '\n')
-	    Putc(c, ts);
-	  else
-	    Ungetc(c, str);
-	} else if (c == '\n')
-	  break;
-      }
-      if (!empty) {
-	Append(tf, "\n");
-      }
-      Append(tf, ts);
-      Printf(f, "%s", tf);
-      Clear(tf);
-      Clear(ts);
-      for (i = 0; i < level; i++)
-	Putc(' ', tf);
-      empty = 1;
-    } else {
-      if (!empty || !isspace(c)) {
-	Putc(c, ts);
-	empty = 0;
-      }
-    }
-  }
-  if (!empty) {
-    Append(tf, ts);
-  }
-  if (Len(tf) != 0)
-    Printf(f, "%s", tf);
-  Delete(ts);
-  Delete(tf);
-  Printf(f, "\n");
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_print()
- *
- * Print out a wrapper function.  Does pretty or compact printing as well.
- * ----------------------------------------------------------------------------- */
-
-void Wrapper_print(Wrapper *w, File *f) {
-  String *str;
-
-  str = NewStringEmpty();
-  Printf(str, "%s\n", w->def);
-  Printf(str, "%s\n", w->locals);
-  Printf(str, "%s\n", w->code);
-  if (Compact_mode == 1)
-    Wrapper_compact_print(str, f);
-  else
-    Wrapper_pretty_print(str, f);
-
-  Delete(str);
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_add_local()
- *
- * Adds a new local variable declaration to a function. Returns -1 if already
- * present (which may or may not be okay to the caller).
- * ----------------------------------------------------------------------------- */
-
-int Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl) {
-  /* See if the local has already been declared */
-  if (Getattr(w->localh, name)) {
-    return -1;
-  }
-  Setattr(w->localh, name, decl);
-  Printf(w->locals, "%s;\n", decl);
-  return 0;
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_add_localv()
- *
- * Same as add_local(), but allows a NULL terminated list of strings to be
- * used as a replacement for decl.   This saves the caller the trouble of having
- * to manually construct the 'decl' string before calling.
- * ----------------------------------------------------------------------------- */
-
-int Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...) {
-  va_list ap;
-  int ret;
-  String *decl;
-  DOH *obj;
-  decl = NewStringEmpty();
-  va_start(ap, name);
-
-  obj = va_arg(ap, void *);
-  while (obj) {
-    Append(decl, obj);
-    Putc(' ', decl);
-    obj = va_arg(ap, void *);
-  }
-  va_end(ap);
-
-  ret = Wrapper_add_local(w, name, decl);
-  Delete(decl);
-  return ret;
-}
-
-/* -----------------------------------------------------------------------------
- * Wrapper_check_local()
- *
- * Check to see if a local name has already been declared
- * ----------------------------------------------------------------------------- */
-
-int Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name) {
-  if (Getattr(w->localh, name)) {
-    return 1;
-  }
-  return 0;
-}
-
-/* ----------------------------------------------------------------------------- 
- * Wrapper_new_local()
- *
- * Adds a new local variable with a guarantee that a unique local name will be
- * used.  Returns the name that was actually selected.
- * ----------------------------------------------------------------------------- */
-
-char *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl) {
-  int i;
-  String *nname = NewString(name);
-  String *ndecl = NewString(decl);
-  char *ret;
-
-  i = 0;
-
-  while (Wrapper_check_local(w, nname)) {
-    Clear(nname);
-    Printf(nname, "%s%d", name, i);
-    i++;
-  }
-  Replace(ndecl, name, nname, DOH_REPLACE_ID);
-  Setattr(w->localh, nname, ndecl);
-  Printf(w->locals, "%s;\n", ndecl);
-  ret = Char(nname);
-  Delete(nname);
-  Delete(ndecl);
-  return ret;			/* Note: nname should still exists in the w->localh hash */
-}
-
-
-/* -----------------------------------------------------------------------------
- * Wrapper_new_localv()
- *
- * Same as add_local(), but allows a NULL terminated list of strings to be
- * used as a replacement for decl.   This saves the caller the trouble of having
- * to manually construct the 'decl' string before calling.
- * ----------------------------------------------------------------------------- */
-
-char *Wrapper_new_localv(Wrapper *w, const_String_or_char_ptr name, ...) {
-  va_list ap;
-  char *ret;
-  String *decl;
-  DOH *obj;
-  decl = NewStringEmpty();
-  va_start(ap, name);
-
-  obj = va_arg(ap, void *);
-  while (obj) {
-    Append(decl, obj);
-    Putc(' ', decl);
-    obj = va_arg(ap, void *);
-  }
-  va_end(ap);
-
-  ret = Wrapper_new_local(w, name, decl);
-  Delete(decl);
-  return ret;
-}
diff --git a/dependencies2013/win32/swig/TODO b/dependencies2013/win32/swig/TODO
deleted file mode 100644
index 01d9a8d7..00000000
--- a/dependencies2013/win32/swig/TODO
+++ /dev/null
@@ -1,373 +0,0 @@
-SWIG TO-DO
-
------------------------------------------------------------------------------
-
-****    = High Priority
-***     = Implement if possible.
-**      = Will implement if time.
-*       = Implement if bored (or deemed necessary).
-
-defer   = Implement in next version
-
-CORE:
-
-****   Add support for nested classes.   The type system should be
-defer  ready to go.  The primary obstacle lies in the target language
-       modules (which were never programmed with nested classes in
-       mind).  There are also issues with nested C structures.  For
-       example:
-
-             struct Foo {
-                 struct {
-                     int x,y;
-                 } z;
-             };
-
-       This is one of the last remaining "hard" problems in the SWIG
-       core, but it is important that we solve it.
-
-***    "Nested" typemaps. The basic idea is similar to allowing one to 
-       use $descriptor(T) for any T, rather than just $descriptor
-       for the type currently being typemapped.
-
-       In short (ha!), given a previously defined typemap:
-
-       %typemap(in) Foo {
-           // whatever it takes to initialize $1 from $input
-       }
-
-       it would be possible to inline its code inside another typemap. 
-       While the syntax is still to be defined, the use would be
-       along the lines of:
-
-       template <class T> class vector {
-           %typemap(in) vector<T> {
-               ...
-               for (int i=0; i<N; i++) {
-                   PyObject* x = ... // i-th element
-                   $typemap(in, T, x, $1[i]);
-               }
-               ...
-           }
-           ...
-       }
-
-       i.e., when $typemap(in,Foo,x,y) is encountered, it will
-       be replaced by the code for %typemap(in) Foo; in the latter,
-       x will be replaced for $input and y will be replaced for $1. 
-       As in the case above, x and y themselves might need to be 
-       expanded before or after being substituted in the typemap code.
-       Also, $typemap(what,Foo,x,y,z,...) will be used in case of 
-       multi-arguments typemaps. The same will hold for "out" typemaps
-       and all the others.
-
-       Comment by mkoeppe:  
-
-	  I think we need to be careful to keep the syntax readable.
-	  I would like to get a syntax that is close to that of
-	  typemap definitions.  So consider this typemap:
-
-		 %typemap(in) int { ... }
-
-	  I would like to refer to this typemap like this:
-
-		 $typemap(in, input=x) int = foo;
-
-	  Here $input would be replaced by the given keyword argument
-	  x, and $1 would be replaced by foo.
-
-	  This syntax would extend easily to multi-typemaps:
-
-		 %typemap(in) ( int FIRST, double SECOND ) { ... }
-
-	      -> $typemap(in, input=x) 
-	      	    ( int FIRST = foo, double SECOND = bar );
-
-	  The advantage of this syntax would be that the formal
-	  arguments (int FIRST, double SECOND) are close to the
-	  actual arguments (foo, bar).
-
-	Comment by beazley
-
-               $typemap(in, input=x) int = foo;
-
-        is a little bit hard to parse in terms of variable substitution.
-        I'm considering something like this:
-
-               $typemap(in,1=int foo, input=x)
-
-       Note: This is partially implemented in the new Unified Typemap
-       Library(python,tcl,ruby and perl) via %fragments and the
-       SWIG_From/SWIG_AsVal methdos.
-
-***    Implement $fail special variable substitution in wrappers. Used
-       to properly transfer control out of a wrapper function while
-       reclaiming resources.
-
-       Note: Implemented in languages that uses the UTL via the
-       'SWIG_fail' macro.
-
-***    Rewrite declaration annotation to better unify %rename and related
-       directives.  Add a selector mechanism that allows specific parse tree
-       nodes to be identified.  For example:
-
-             %feature("foo", nodetype="class") Foo { ... some code ... };
-
-       Consider use of wildcards.   Namespace/nested scope support in
-       %feature is currently weak.  It works, but is fragile.  Consider
-       an implementation that is better integrated with symbol table
-       management.  Continue to consolidate SWIG directives to %feature.
-
-       Note: Initial implementation in the %rename directive.
-
-***    Add more intelligent information related to object ownership.
-       SWIG should be able to automatically strip ownership from
-       objects when they are assigned to pointer variables and structure
-       members as well as stored in a container (i.e., an array of pointers).
-
-       [ Partially finished for Ruby/Perl/Tcl/Python. ]
-
-**     Restoration of the documentation system.
-       [ Partially done for Python. ]
-              
-
-**     Restoration of Objective-C support.
-
-**     Unification of symbol tables and type system scopes.  In a sense
-       they capture the same information so it is not necessary to have
-       both.  The existence of two symbol management systems is mostly
-       historical.
-
-Build
------
-
-Library
--------
-
-****   Add more support for the C++ standard library.  std::complex and other
-       core datatypes.   Refine support for STL vector.   Add more STL objects.
-
-       [ Partially finished for Python. ]
-
-****   Continue to expand the set of recognized typemaps.
-
-Windows
--------
-
-All language modules
---------------------
-
-Python
-------
-
-***    Ability to wrap certain classes as Python built-in types.
-
-Perl
-----
-
-****   Rewrite runtime pointer type checking to better integrate
-       shadow classes.   Creation of shadow classes should be done
-       in C instead of Perl.   This will fix a number of problems
-       related to typemaps and reduce the amount of Perl wrapper code.
-
-****   Create tests for existing support for operator overloading
-
-Tcl
----
-
-Ruby
-----
-
-****   The "Resource Management in Proxies" section of the "SWIG and C++"
-       chapter discusses how proxies' ownership of their associated C++
-       object can change, and the use of the special disown() and
-       acquire() methods to change this ownership status. Need to
-       address this for Ruby as well.
-
-***    Add support for keyword arguments (by collecting them in a hash?).
-
-Java
-----
-
-
-C#
---
-
-PHP
----
-
-****   Look at moving to using the UTL.
-
-**     When returning wrapped objects via alternate constructors if that
-       pointer value already exists "out there" as a resource we should
-       use the same resource, we can't have multiple ref-counted resources
-       mapping to the same object in case it gets twice destroyed.  And check
-       if ref count destroying is even working, see smart_pointer_rename
-
-*      Work out how classes without even inherited constructors should
-       interact with the php "new <class>" notation.
-       See: abstract_inherit_wrap.cpptest
-
-**     Look at pass by point and passby ref,
-       Make sometype** to be auto allocated
-       Make sometype& and sometype* to be autoallocated IF THEY ARE NOT
-       ALREADY swigtype wrapped.
-
-*      Review to see what else is missing!
-
-Guile
------
-
-**     Maybe rename slot setters from CLASS-SLOT-set to CLASS-SLOT-set!
-       to match Scheme convention for naming of mutators.
-
-**     Support keyword args.
-
-**     Director Support!
-
-**     Cleaner handling of multiple values.
-       Use a typemap keyword argument "numoutputs" of "out" and
-       "argout" to indicate how many values are returned.
-
-**     Make SWIG's types first-class by using a separate smob type for
-       SWIG type descriptors; enable reflection on types.  (Maybe
-       GOOPS metaclasses?)
-
-**     Provide a clean way to construct type predicates.
-
-**     In GOOPS mode, maybe make overloaded functions methods. 
-
-**     Increase the safety of destructor functions.  John Lenz suggests:
-
-	  I think the best way of doing this would be to use %feature to mark  
-	  which classes allow for "normal" <swig> smobs to be deleted explicitly.
-
-	  We separate pointers into two classes, those that can be deleted from  
-	  scheme and those that can't.  The pointers that can be deleted use the
-	  <collectable-swig> smob and those that can not be deleted use the  
-	  <swig> smob.  A user can specify which type of each object they want  
-	  with %newobject and the CONSUMED typemap.
-
-	  By default, the exported destructor will only accept <collectable-swig>  
-	  smobs, because by definition, collectable-swig smobs are those that can  
-	  be deleted from scheme.  This allows for the user to implement  
-	  protection.  In the interface file, the user has complete control over  
-	  which objects can and can not be deleted, and can guarantee that  
-	  objects that should not be deleted can not be deleted, and that objects  
-	  that should eventually be deleted will be garbage collected.
-
-	  This protection can then be overridden with a %feature directive,  
-	  something like
-
-	  %feature("guile_allow_destroy_all","1") Foo::~Foo;
-
-	  I don't know what word we want to use, guile_allow_destroy_all is kinda  
-	  bad.  This feature would then allow for a <swig Foo *> smob to be  
-	  deleted by passing it to the destructor.  This would allow users to  
-	  maintain the protection on other classes, only manually overriding the  
-	  protection on the classes that need it.
-
-
-Mzscheme
---------
-
-**     Port list-vector.i and pointer-in-out.i from Guile.
-
-**     Add shadow class support for the Swindle system. 
-
-Pike
-----
-
-*      Decide how to handle global variables (probably using something
-       like the Python module's cvar). Affects Examples/pike/simple.
-
-*      Decide how to handle static class member functions and member
-       variables.
-
-*      Should investigate the possibility of generating .cmod files
-       in addition to straight C/C++ code for extensions.
-
-Common Lisp
------------
-
-*      Random thoughts by mkoeppe on supporting Common Lisp implementations:
-
-       There are many different Foreign Function Interfaces (FFI) for
-       the various CL implementations.  Probably SWIG should interface
-       to UFFI, a least-common-denominator FFI that supports many
-       implementations.
-
-       Via the s-expression SWIG module we can export SWIG's parse
-       tree and import it into CL.  It remains to check if all
-       relevant information is dumped (for instance, the type
-       information).  Experimental code is available to generate
-       low-level UFFI declarations from this parse tree.
-
-       However, for wrapping C++, we also need to create C wrappers
-       because most FFIs cannot directly import C++.  A CL SWIG module
-       could be exporting both these wrappers and UFFI declarations.
-       I have experimental code (not checked in yet) that does this.
-
-       This is fine for generating low-level wrappers. But how do we
-       support user typemaps (like converting lists and vectors to C
-       arrays on input)?  We have to generate Lisp code that does the
-       conversion and then calls the low-level wrapper.  If we
-       generate Lisp code, it should be beautiful and readable.
-       Therefore, we need at least a Lisp pretty printer.  A Lisp
-       pretty printer works best when the Lisp program is represented
-       not as text but as Lisp data.  Moreover, typemap writers will
-       feel very much constrained by SWIG's capabilities for
-       generating wrapper code, when compared to writing Lisp macros.
-       Thus we would need half a re-implementation of Lisp in SWIG to
-       make users happy.
-
-       The solution could be the following:
-
-**     Build a SWIG library (again) and load it into a Common Lisp
-       implementation.
-
-       The FFI declarations could be written manually, or this could
-       be bootstrapped via the s-expression module or the primitive
-       UFFI wrappers.  This should be easy because SWIG's API is quite
-       simple. 
-
-       The embedded SWIG would be driven by a CL program.  High-level
-       typemaps would be written as Lisp programs that generate Lisp
-       code.
-
-ALLEGROCL
------
-These first three will remove most of the warnings from most of the
-remaining checkpartial tests that are failing.
-****  Throws typemap support
-****  const typemaps
-****  long long typemaps
-
-Ocaml
------
-**     I've been working with my camlp4 module and type information
-       from the compiler.  When I'm done, the user will have access
-       to type inference when writing code, when the inference is
-       unambiguous.  This allows the user to write x = _foo 1.0
-       instead of x = get_float (_foo (C_float 1.0)).  It's not as
-       easy as it sounds, because O'caml doesn't keep type information
-       at run time, and doesn't really have a mechanism for doing what
-       I need.  However, it's possible to write a preprocessor that
-       inserts correct type info at compile time.
-
-       That having been said, the program must compile for type info
-       to be available, so I need to attend to a lot of details;  The
-       program must compile both with and without type augmentation.
-       
-Xml
----
-
-
-Documentation
--------------
-
-****   Extending SWIG (and internals).
-
-***    Perl, Python, Tcl modules.
-
-***    add section for Perl module support for operator overloading
diff --git a/dependencies2013/win32/swig/Tools/brew-install b/dependencies2013/win32/swig/Tools/brew-install
deleted file mode 100644
index 408ae13b..00000000
--- a/dependencies2013/win32/swig/Tools/brew-install
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Wrapper around 'brew install' emitting a message every minute if the command is still running.
-# This is used on Travis to ensure the install isn't killed when there is no output over a long period (10 minutes).
-# Usage: brew-install package, where package is the name of the package for brew to install.
-
-seconds=0
-minutes=0
-brew install $1 &
-while true; do
-  ps -p$! 2>& 1>/dev/null
-  if [ $? = 0 ]; then
-    if [ $seconds = 60 ]; then
-      let seconds=0
-      let minutes=minutes+1
-      echo "brew install $1 still running ($minutes min)"
-    fi
-    sleep 1
-    let seconds=seconds+1
-  else
-    break
-  fi
-done
-wait $!
-exit $?
diff --git a/dependencies2013/win32/swig/Tools/capitalize b/dependencies2013/win32/swig/Tools/capitalize
deleted file mode 100644
index a8330d16..00000000
--- a/dependencies2013/win32/swig/Tools/capitalize
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# usage: capitalize word
-# write word to stdout w/ first character upcased
-first_char=`echo $1 | sed 's/^\(.\).*/\1/' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
-echo ${first_char}`echo $1 | sed 's/^.//'`
diff --git a/dependencies2013/win32/swig/Tools/check-include-path.pike b/dependencies2013/win32/swig/Tools/check-include-path.pike
deleted file mode 100644
index 2bfb2b90..00000000
--- a/dependencies2013/win32/swig/Tools/check-include-path.pike
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * This is a helper script to identify the proper include path
- * for Pike header files. It should be run with the full path
- * to the Pike executable as its single argument, e.g.
- *
- *     pike check-include-path.pike /usr/local/bin/pike
- *
- * and its output should be the correct path to the header
- * files, e.g.
- *
- *     /usr/local/pike/7.2.239/include/pike
- *
- */
-
-int main(int argc, array(string) argv)
-{
-    string prefix = replace(argv[1], "/bin/pike", "");
-    write(prefix + "/pike/" + __MAJOR__ + "." + __MINOR__ + "." + __BUILD__ + "/include/pike");
-    return 0;
-}
diff --git a/dependencies2013/win32/swig/Tools/config/ac_compile_warnings.m4 b/dependencies2013/win32/swig/Tools/config/ac_compile_warnings.m4
deleted file mode 100644
index 7e4239a3..00000000
--- a/dependencies2013/win32/swig/Tools/config/ac_compile_warnings.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl @synopsis AC_COMPILE_WARNINGS
-dnl
-dnl Set the maximum warning verbosity according to C and C++ compiler used.
-dnl Currently supports g++ and gcc.
-dnl
-dnl The compiler options are always added CFLAGS and CXXFLAGS even if
-dnl these are overridden at configure time. Removing the maximum warning
-dnl flags can be removed with --without-maximum-compile-warnings. For example:
-dnl
-dnl   ./configure --without-maximum-compile-warnings CFLAGS= CXXFLAGS=
-dnl
-dnl @category Misc
-dnl @author Loic Dachary <loic@senga.org>
-dnl @author William Fulton <wsf@fultondesigns.co.uk>
-dnl @version 2005-04-29
-dnl @license GPLWithACException
-
-AC_DEFUN([AC_COMPILE_WARNINGS], [
-AC_MSG_CHECKING([maximum warning verbosity option])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_PROG_CXX])
-
-  AC_ARG_WITH([maximum-compile-warnings], 
-              AS_HELP_STRING([--without-maximum-compile-warnings],
-                             [Disable maximum warning verbosity]),
-              [ac_compile_warnings_on="$withval"],
-              [ac_compile_warnings_on=""])
-
-  if test x"$ac_compile_warnings_on" = xno
-  then
-    ac_compile_warnings_msg=no
-  else
-    if test -n "$CXX"
-    then
-      if test "$GXX" = "yes"
-      then
-        ac_compile_warnings_opt='-Wall -W -ansi -pedantic'
-      fi
-      CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
-      ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
-    fi
-
-  if test -n "$CC"
-  then
-    if test "$GCC" = "yes"
-    then
-      ac_compile_warnings_opt='-Wall -W -ansi -pedantic'
-    fi
-    CFLAGS="$CFLAGS $ac_compile_warnings_opt"
-    ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
-  fi
-  fi
-  AC_MSG_RESULT([$ac_compile_warnings_msg])
-  unset ac_compile_warnings_msg
-  unset ac_compile_warnings_opt
-])
diff --git a/dependencies2013/win32/swig/Tools/config/ac_define_dir.m4 b/dependencies2013/win32/swig/Tools/config/ac_define_dir.m4
deleted file mode 100644
index fc81b098..00000000
--- a/dependencies2013/win32/swig/Tools/config/ac_define_dir.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-dnl
-dnl This macro sets VARNAME to the expansion of the DIR variable,
-dnl taking care of fixing up ${prefix} and such.
-dnl
-dnl VARNAME is then offered as both an output variable and a C
-dnl preprocessor symbol.
-dnl
-dnl Example:
-dnl
-dnl    AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
-dnl
-dnl @category Misc
-dnl @author Stepan Kasal <kasal@ucw.cz>
-dnl @author Andreas Schwab <schwab@suse.de>
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @author Alexandre Oliva
-dnl @version 2005-07-29
-dnl @license AllPermissive
-
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
-
diff --git a/dependencies2013/win32/swig/Tools/config/ax_boost_base.m4 b/dependencies2013/win32/swig/Tools/config/ax_boost_base.m4
deleted file mode 100644
index f3279f2b..00000000
--- a/dependencies2013/win32/swig/Tools/config/ax_boost_base.m4
+++ /dev/null
@@ -1,285 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 26
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-    [use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ])],
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
-        [
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64)
-        libsubdirs="lib64 libx32 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE([AC_CANONICAL_HOST])
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ],[
-        ])
-    AC_LANG_POP([C++])
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-        BOOST_CPPFLAGS=
-        BOOST_LDFLAGS=
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-                dnl if nothing found search for layout used in Windows distributions
-                if test -z "$BOOST_CPPFLAGS"; then
-                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
-                        BOOST_CPPFLAGS="-I$ac_boost_path"
-                    fi
-                fi
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ],[
-            ])
-        AC_LANG_POP([C++])
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-        else
-            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse([$3], , :, [$3])
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-        # execute ACTION-IF-FOUND (if present):
-        ifelse([$2], , :, [$2])
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
diff --git a/dependencies2013/win32/swig/Tools/config/ax_compare_version.m4 b/dependencies2013/win32/swig/Tools/config/ax_compare_version.m4
deleted file mode 100644
index 74dc0fdd..00000000
--- a/dependencies2013/win32/swig/Tools/config/ax_compare_version.m4
+++ /dev/null
@@ -1,177 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   This macro compares two version strings. Due to the various number of
-#   minor-version numbers that can exist, and the fact that string
-#   comparisons are not compatible with numeric comparisons, this is not
-#   necessarily trivial to do in a autoconf script. This macro makes doing
-#   these comparisons easy.
-#
-#   The six basic comparisons are available, as well as checking equality
-#   limited to a certain number of minor-version levels.
-#
-#   The operator OP determines what type of comparison to do, and can be one
-#   of:
-#
-#    eq  - equal (test A == B)
-#    ne  - not equal (test A != B)
-#    le  - less than or equal (test A <= B)
-#    ge  - greater than or equal (test A >= B)
-#    lt  - less than (test A < B)
-#    gt  - greater than (test A > B)
-#
-#   Additionally, the eq and ne operator can have a number after it to limit
-#   the test to that number of minor versions.
-#
-#    eq0 - equal up to the length of the shorter version
-#    ne0 - not equal up to the length of the shorter version
-#    eqN - equal up to N sub-version levels
-#    neN - not equal up to N sub-version levels
-#
-#   When the condition is true, shell commands ACTION-IF-TRUE are run,
-#   otherwise shell commands ACTION-IF-FALSE are run. The environment
-#   variable 'ax_compare_version' is always set to either 'true' or 'false'
-#   as well.
-#
-#   Examples:
-#
-#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
-#
-#   would both be true.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
-#
-#   would both be false.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
-#
-#   would be true because it is only comparing two minor versions.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
-#
-#   would be true because it is only comparing the lesser number of minor
-#   versions of the two values.
-#
-#   Note: The characters that separate the version numbers do not matter. An
-#   empty string is the same as version 0. OP is evaluated by autoconf, not
-#   configure, so must be a string, not a variable.
-#
-#   The author would like to acknowledge Guido Draheim whose advice about
-#   the m4_case and m4_ifvaln functions make this macro only include the
-#   portions necessary to perform the specific comparison specified by the
-#   OP argument in the final configure script.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 11
-
-dnl #########################################################################
-AC_DEFUN([AX_COMPARE_VERSION], [
-  AC_REQUIRE([AC_PROG_AWK])
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
-  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
-  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-  dnl # then the first line is used to determine if the condition is true.
-  dnl # The sed right after the echo is to remove any indented white space.
-  m4_case(m4_tolower($2),
-  [lt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [gt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [le],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],
-  [ge],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],[
-    dnl Split the operator from the subversion count if present.
-    m4_bmatch(m4_substr($2,2),
-    [0],[
-      # A count of zero means use the length of the shorter version.
-      # Determine the number of characters in A and B.
-      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
-      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
-
-      # Set A to no more than B's length and B to no more than A's length.
-      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
-    ],
-    [[0-9]+],[
-      # A count greater than zero means use only that many subversions
-      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-    ],
-    [.+],[
-      AC_WARNING(
-        [illegal OP numeric parameter: $2])
-    ],[])
-
-    # Pad zeros at end of numbers to make same length.
-    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-    B="$B`echo $A | sed 's/./0/g'`"
-    A="$ax_compare_version_tmp_A"
-
-    # Check for equality or inequality as necessary.
-    m4_case(m4_tolower(m4_substr($2,0,2)),
-    [eq],[
-      test "x$A" = "x$B" && ax_compare_version=true
-    ],
-    [ne],[
-      test "x$A" != "x$B" && ax_compare_version=true
-    ],[
-      AC_WARNING([illegal OP parameter: $2])
-    ])
-  ])
-
-  AS_VAR_POPDEF([A])dnl
-  AS_VAR_POPDEF([B])dnl
-
-  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-  if test "$ax_compare_version" = "true" ; then
-    m4_ifvaln([$4],[$4],[:])dnl
-    m4_ifvaln([$5],[else $5])dnl
-  fi
-]) dnl AX_COMPARE_VERSION
diff --git a/dependencies2013/win32/swig/Tools/config/ax_cxx_compile_stdcxx_11.m4 b/dependencies2013/win32/swig/Tools/config/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644
index 138ca2ac..00000000
--- a/dependencies2013/win32/swig/Tools/config/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,121 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [nostop])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXXFLAGS to enable support.
-#   CXX11FLAGS will also contain any necessary switches to enable support.
-#   HAVE_CXX11_COMPILER will additionally be set to yes if there is support.
-#   If the second argument is not specified, errors out if no mode that
-#   supports C++11 baseline syntax can be found. The first argument, if
-#   specified, indicates whether you insist on an extended mode
-#   (e.g. -std=gnu++11) or a strict conformance mode (e.g. -std=c++11).
-#   If neither is specified, you get whatever works, with preference for an
-#   extended mode.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2012 William Fulton <wsf@fultondesigns.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);
-])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-  m4_if([$1], [], [],
-        [$1], [ext], [],
-        [$1], [noext], [],
-        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  m4_if([$2], [], [],
-        [$2], [nostop], [],
-        [m4_fatal([invalid argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  AC_LANG_ASSERT([C++])dnl
-  ac_success=no
-  CXX11FLAGS=
-  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-  ax_cv_cxx_compile_cxx11,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-    [ax_cv_cxx_compile_cxx11=yes],
-    [ax_cv_cxx_compile_cxx11=no])])
-  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$1], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++11 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        CXX11FLAGS=$switch
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$1], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=c++11 -std=c++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        CXX11FLAGS=$switch
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  if test x$ac_success = xno; then
-    if test x$2 != xnostop; then
-      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-    fi
-  else
-    HAVE_CXX11_COMPILER=yes
-  fi
-])
diff --git a/dependencies2013/win32/swig/Tools/config/ax_path_generic.m4 b/dependencies2013/win32/swig/Tools/config/ax_path_generic.m4
deleted file mode 100644
index f77fc78d..00000000
--- a/dependencies2013/win32/swig/Tools/config/ax_path_generic.m4
+++ /dev/null
@@ -1,164 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_path_generic.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PATH_GENERIC(LIBRARY,[MINIMUM-VERSION,[SED-EXPR-EXTRACTOR]],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],[CONFIG-SCRIPTS],[CFLAGS-ARG],[LIBS-ARG])
-#
-# DESCRIPTION
-#
-#   Runs the LIBRARY-config script and defines LIBRARY_CFLAGS and
-#   LIBRARY_LIBS unless the user had predefined them in the environment.
-#
-#   The script must support `--cflags' and `--libs' args. If MINIMUM-VERSION
-#   is specified, the script must also support the `--version' arg. If the
-#   `--with-library-[exec-]prefix' arguments to ./configure are given, it
-#   must also support `--prefix' and `--exec-prefix'. Prefereable use
-#   CONFIG-SCRIPTS as config script, CFLAGS-ARG instead of `--cflags` and
-#   LIBS-ARG instead of `--libs`, if given.
-#
-#   The SED-EXPR-EXTRACTOR parameter representes the expression used in sed
-#   to extract the version number. Use it if your 'foo-config --version'
-#   dumps something like 'Foo library v1.0.0 (alfa)' instead of '1.0.0'.
-#
-#   The macro respects LIBRARY_CONFIG, LIBRARY_CFLAGS and LIBRARY_LIBS
-#   variables. If the first one is defined, it specifies the name of the
-#   config script to use. If the latter two are defined, the script is not
-#   ran at all and their values are used instead (if only one of them is
-#   defined, the empty value of the remaining one is still used).
-#
-#   Example:
-#
-#     AX_PATH_GENERIC(Foo, 1.0.0)
-#
-#   would run `foo-config --version' and check that it is at least 1.0.0, if
-#   successful the following variables would be defined and substituted:
-#
-#     FOO_CFLAGS to `foo-config --cflags`
-#     FOO_LIBS   to `foo-config --libs`
-#
-#   Example:
-#
-#     AX_PATH_GENERIC([Bar],,,[
-#        AC_MSG_ERROR([Cannot find Bar library])
-#     ])
-#
-#   would check for bar-config program, defining and substituting the
-#   following variables:
-#
-#     BAR_CFLAGS to `bar-config --cflags`
-#     BAR_LIBS   to `bar-config --libs`
-#
-#   Example:
-#
-#     ./configure BAZ_LIBS=/usr/lib/libbaz.a
-#
-#   would link with a static version of baz library even if `baz-config
-#   --libs` returns just "-lbaz" that would normally result in using the
-#   shared library.
-#
-#   This macro is a rearranged version of AC_PATH_GENERIC from Angus Lees.
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 13
-
-AU_ALIAS([AC_PATH_GENERIC], [AX_PATH_GENERIC])
-AC_DEFUN([AX_PATH_GENERIC],[
-  AC_REQUIRE([AC_PROG_SED])
-
-  dnl we're going to need uppercase and lowercase versions of the
-  dnl string `LIBRARY'
-  pushdef([UP],   translit([$1], [a-z], [A-Z]))dnl
-  pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
-
-  AC_ARG_WITH(DOWN-prefix,[AS_HELP_STRING([--with-]DOWN[-prefix=PREFIX], [Prefix where $1 is installed (optional)])],
-    DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="")
-  AC_ARG_WITH(DOWN-exec-prefix,[AS_HELP_STRING([--with-]DOWN[-exec-prefix=EPREFIX], [Exec prefix where $1 is installed (optional)])],
-    DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="")
-
-  AC_ARG_VAR(UP[]_CONFIG, [config script used for $1])
-  AC_ARG_VAR(UP[]_CFLAGS, [CFLAGS used for $1])
-  AC_ARG_VAR(UP[]_LIBS,   [LIBS used for $1])
-
-  AS_IF([test x"$UP[]_CFLAGS" != x -o x"$UP[]_LIBS" != x],[
-    dnl Don't run config script at all, use user-provided values instead.
-    AC_SUBST(UP[]_CFLAGS)
-    AC_SUBST(UP[]_LIBS)
-    :
-    $4
-  ],[
-    AS_IF([test x$DOWN[]_config_exec_prefix != x],[
-      DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix"
-      AS_IF([test x${UP[]_CONFIG+set} != xset],[
-	UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config
-      ])
-    ])
-    AS_IF([test x$DOWN[]_config_prefix != x],[
-      DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix"
-      AS_IF([test x${UP[]_CONFIG+set} != xset],[
-	UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config
-      ])
-    ])
-
-    AC_PATH_PROGS(UP[]_CONFIG,[$6 DOWN-config],[no])
-    AS_IF([test "$UP[]_CONFIG" = "no"],[
-      :
-      $5
-    ],[
-      dnl Get the CFLAGS from LIBRARY-config script
-      AS_IF([test x"$7" = x],[
-	UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`"
-      ],[
-	UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args $7`"
-      ])
-
-      dnl Get the LIBS from LIBRARY-config script
-      AS_IF([test x"$8" = x],[
-	UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`"
-      ],[
-	UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args $8`"
-      ])
-
-      AS_IF([test x"$2" != x],[
-	dnl Check for provided library version
-	AS_IF([test x"$3" != x],[
-	  dnl Use provided sed expression
-	  DOWN[]_version="`$UP[]_CONFIG $DOWN[]_config_args --version | $SED -e $3`"
-	],[
-	  DOWN[]_version="`$UP[]_CONFIG $DOWN[]_config_args --version | $SED -e 's/^\ *\(.*\)\ *$/\1/'`"
-	])
-
-	AC_MSG_CHECKING([for $1 ($DOWN[]_version) >= $2])
-	AX_COMPARE_VERSION($DOWN[]_version,[ge],[$2],[
-	  AC_MSG_RESULT([yes])
-
-	  AC_SUBST(UP[]_CFLAGS)
-	  AC_SUBST(UP[]_LIBS)
-	  :
-	  $4
-	],[
-	  AC_MSG_RESULT([no])
-	  :
-	  $5
-	])
-      ],[
-	AC_SUBST(UP[]_CFLAGS)
-	AC_SUBST(UP[]_LIBS)
-	:
-	$4
-      ])
-    ])
-  ])
-
-  popdef([UP])
-  popdef([DOWN])
-])
diff --git a/dependencies2013/win32/swig/Tools/config/compile b/dependencies2013/win32/swig/Tools/config/compile
deleted file mode 100644
index a85b723c..00000000
--- a/dependencies2013/win32/swig/Tools/config/compile
+++ /dev/null
@@ -1,347 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/dependencies2013/win32/swig/Tools/config/config.guess b/dependencies2013/win32/swig/Tools/config/config.guess
deleted file mode 100644
index 16592509..00000000
--- a/dependencies2013/win32/swig/Tools/config/config.guess
+++ /dev/null
@@ -1,1441 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
-
-timestamp='2015-08-20'
-
-# 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# 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.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# 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
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2015 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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-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
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	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 ; 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)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# 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/[-_].*//' | cut -d. -f1,2`
-		;;
-	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}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	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 ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*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.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    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 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	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 ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	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
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	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 ;;
-	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 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	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 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	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
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	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
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$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 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	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 ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		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 ;;
-    *: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
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    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 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	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 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	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 ;;
-    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 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	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 i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	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/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	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="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${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-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	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-${LIBC}"; exit; }
-	;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	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 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	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
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	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 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	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 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 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	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 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	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; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { 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; } ;;
-    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 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	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 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	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 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	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 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	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 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    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
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	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 ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  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
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/dependencies2013/win32/swig/Tools/config/config.sub b/dependencies2013/win32/swig/Tools/config/config.sub
deleted file mode 100644
index 1acc966a..00000000
--- a/dependencies2013/win32/swig/Tools/config/config.sub
+++ /dev/null
@@ -1,1813 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
-
-timestamp='2015-08-20'
-
-# 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# 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.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# 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.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2015 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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# 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* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-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 | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-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/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# 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/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | 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-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| 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.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		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
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-        asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		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
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | 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
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		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
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		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
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	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 | 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-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	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
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		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
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# 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|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# 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* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -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* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -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* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -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|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/dependencies2013/win32/swig/Tools/config/missing b/dependencies2013/win32/swig/Tools/config/missing
deleted file mode 100644
index f62bbae3..00000000
--- a/dependencies2013/win32/swig/Tools/config/missing
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2013-10-28.13; # UTC
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/dependencies2013/win32/swig/Tools/config/ylwrap b/dependencies2013/win32/swig/Tools/config/ylwrap
deleted file mode 100644
index 7c2d927f..00000000
--- a/dependencies2013/win32/swig/Tools/config/ylwrap
+++ /dev/null
@@ -1,247 +0,0 @@
-#! /bin/sh
-# ylwrap - wrapper for lex/yacc invocations.
-
-scriptversion=2013-01-12.17; # UTC
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-#
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-get_dirname ()
-{
-  case $1 in
-    */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
-    # Otherwise,  we want the empty string (not ".").
-  esac
-}
-
-# guard FILE
-# ----------
-# The CPP macro used to guard inclusion of FILE.
-guard ()
-{
-  printf '%s\n' "$1"                                                    \
-    | sed                                                               \
-        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
-        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'                        \
-        -e 's/__*/_/g'
-}
-
-# quote_for_sed [STRING]
-# ----------------------
-# Return STRING (or stdin) quoted to be used as a sed pattern.
-quote_for_sed ()
-{
-  case $# in
-    0) cat;;
-    1) printf '%s\n' "$1";;
-  esac \
-    | sed -e 's|[][\\.*]|\\&|g'
-}
-
-case "$1" in
-  '')
-    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
-    exit 1
-    ;;
-  --basedir)
-    basedir=$2
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-
-Wrapper for lex/yacc invocations, renaming files as desired.
-
-  INPUT is the input file
-  OUTPUT is one file PROG generates
-  DESIRED is the file we actually want instead of OUTPUT
-  PROGRAM is program to run
-  ARGS are passed to PROG
-
-Any number of OUTPUT,DESIRED pairs may be used.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v|--v*)
-    echo "ylwrap $scriptversion"
-    exit $?
-    ;;
-esac
-
-
-# The input.
-input=$1
-shift
-# We'll later need for a correct munging of "#line" directives.
-input_sub_rx=`get_dirname "$input" | quote_for_sed`
-case $input in
-  [\\/]* | ?:[\\/]*)
-    # Absolute path; do nothing.
-    ;;
-  *)
-    # Relative path.  Make it absolute.
-    input=`pwd`/$input
-    ;;
-esac
-input_rx=`get_dirname "$input" | quote_for_sed`
-
-# Since DOS filename conventions don't allow two dots,
-# the DOS version of Bison writes out y_tab.c instead of y.tab.c
-# and y_tab.h instead of y.tab.h. Test to see if this is the case.
-y_tab_nodot=false
-if test -f y_tab.c || test -f y_tab.h; then
-  y_tab_nodot=true
-fi
-
-# The parser itself, the first file, is the destination of the .y.c
-# rule in the Makefile.
-parser=$1
-
-# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
-# instance, we rename #include "y.tab.h" into #include "parse.h"
-# during the conversion from y.tab.c to parse.c.
-sed_fix_filenames=
-
-# Also rename header guards, as Bison 2.7 for instance uses its header
-# guard in its implementation file.
-sed_fix_header_guards=
-
-while test $# -ne 0; do
-  if test x"$1" = x"--"; then
-    shift
-    break
-  fi
-  from=$1
-  # Handle y_tab.c and y_tab.h output by DOS
-  if $y_tab_nodot; then
-    case $from in
-      "y.tab.c") from=y_tab.c;;
-      "y.tab.h") from=y_tab.h;;
-    esac
-  fi
-  shift
-  to=$1
-  shift
-  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
-  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
-done
-
-# The program to run.
-prog=$1
-shift
-# Make any relative path in $prog absolute.
-case $prog in
-  [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog=`pwd`/$prog ;;
-esac
-
-dirname=ylwrap$$
-do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
-trap "ret=129; $do_exit" 1
-trap "ret=130; $do_exit" 2
-trap "ret=141; $do_exit" 13
-trap "ret=143; $do_exit" 15
-mkdir $dirname || exit 1
-
-cd $dirname
-
-case $# in
-  0) "$prog" "$input" ;;
-  *) "$prog" "$@" "$input" ;;
-esac
-ret=$?
-
-if test $ret -eq 0; then
-  for from in *
-  do
-    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
-    if test -f "$from"; then
-      # If $2 is an absolute path name, then just use that,
-      # otherwise prepend '../'.
-      case $to in
-        [\\/]* | ?:[\\/]*) target=$to;;
-        *) target=../$to;;
-      esac
-
-      # Do not overwrite unchanged header files to avoid useless
-      # recompilations.  Always update the parser itself: it is the
-      # destination of the .y.c rule in the Makefile.  Divert the
-      # output of all other files to a temporary file so we can
-      # compare them to existing versions.
-      if test $from != $parser; then
-        realtarget=$target
-        target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
-      fi
-
-      # Munge "#line" or "#" directives.  Don't let the resulting
-      # debug information point at an absolute srcdir.  Use the real
-      # output file name, not yy.lex.c for instance.  Adjust the
-      # include guards too.
-      sed -e "/^#/!b"                           \
-          -e "s|$input_rx|$input_sub_rx|"       \
-          -e "$sed_fix_filenames"               \
-          -e "$sed_fix_header_guards"           \
-        "$from" >"$target" || ret=$?
-
-      # Check whether files must be updated.
-      if test "$from" != "$parser"; then
-        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-          echo "$to is unchanged"
-          rm -f "$target"
-        else
-          echo "updating $to"
-          mv -f "$target" "$realtarget"
-        fi
-      fi
-    else
-      # A missing file is only an error for the parser.  This is a
-      # blatant hack to let us support using "yacc -d".  If -d is not
-      # specified, don't fail when the header file is "missing".
-      if test "$from" = "$parser"; then
-        ret=1
-      fi
-    fi
-  done
-fi
-
-# Remove the directory.
-cd ..
-rm -rf $dirname
-
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/dependencies2013/win32/swig/Tools/convertpath b/dependencies2013/win32/swig/Tools/convertpath
deleted file mode 100644
index 0cc8b74b..00000000
--- a/dependencies2013/win32/swig/Tools/convertpath
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Unix to Windows path conversion in a script.
-# Useful for avoiding backslash quoting difficulties in Makefiles.
-# Acts as a much dumbed down cygpath tool mainly for use on MinGW.
-
-usage()
-{
-  cat <<EOF
-Usage: $0 [-m|-u|-w|-h] [path]...
-
-Convert Windows and Unix paths
-
-  -m  Convert Unix path to mixed path (full paths, MinGW MSYS only)
-  -u  Convert forward slashes to backslashes in the paths (relative paths only)
-  -w  Convert backslashes to forward slashes in the paths (relative paths only)
-EOF
-}
-
-option="$1"
-case "$option" in
-  -m) shift
-      case $MACHTYPE in
-        # This echo converts unix to mixed paths. Then zap unexpected trailing space on old versions of MinGW.
-        *-msys) echo `cmd //c echo "$@" | sed -e "s/[ ]*$//"`;;
-        *) echo "The -m option is only supported on MinGW MSYS" 1>&2; exit 1 ;;
-      esac ;;
-  -u) shift; echo $@ | sed -e 's,\\,/,g' ;;
-  -w) shift; echo $@ | sed -e 's,/,\\,g' ;;
-  -h) shift; usage; ;;
-  *) usage; exit 1 ;;
-esac
-
-exit 0
diff --git a/dependencies2013/win32/swig/Tools/javascript/javascript.cxx b/dependencies2013/win32/swig/Tools/javascript/javascript.cxx
deleted file mode 100644
index 5e7cc0b2..00000000
--- a/dependencies2013/win32/swig/Tools/javascript/javascript.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include "js_shell.h"
-
-void print_usage() {
-  std::cout << "javascript [-i] [-jsc|-v8] [-l module] <js-file>" << std::endl;
-}
-
-int main(int argc, char* argv[]) {
-
-#if defined(JAVASCRIPT_INTERPRETER_STOP)
-  std::cout << "Attach your Debugger and press any key to continue" << std::endl;
-  std::cin.get();
-#endif
-
-  std::string scriptPath = "";
-
-  bool interactive = false;
-  JSShell* shell = 0;
-
-  std::vector<std::string> modulePath;
-  modulePath.push_back(".");
-
-  for (int idx = 1; idx < argc; ++idx) {
-    if(strcmp(argv[idx], "-v8") == 0) {
-      shell = JSShell::Create(JSShell::V8);
-    } else if(strcmp(argv[idx], "-jsc") == 0) {
-      shell = JSShell::Create(JSShell::JSC);
-    } else if(strcmp(argv[idx], "-i") == 0) {
-      interactive = true;
-    } else if(strcmp(argv[idx], "-L") == 0) {
-      modulePath.push_back(argv[++idx]);
-    } else {
-      scriptPath = argv[idx];
-    }
-  }
-
-  if (shell == 0) {
-    shell = JSShell::Create();
-  }
-
-  shell->setModulePath(modulePath);
-
-  bool failed = false;
-
-  if(interactive) {
-    failed = !(shell->RunShell());
-  } else {
-    failed = !(shell->RunScript(scriptPath));
-  }
-
-  if (failed) {
-    delete shell;
-    printf("FAIL: Error during execution of script.\n");
-    return 1;
-  }
-
-  delete shell;
-
-  return 0;
-}
diff --git a/dependencies2013/win32/swig/Tools/javascript/js_shell.cxx b/dependencies2013/win32/swig/Tools/javascript/js_shell.cxx
deleted file mode 100644
index 539b83d6..00000000
--- a/dependencies2013/win32/swig/Tools/javascript/js_shell.cxx
+++ /dev/null
@@ -1,156 +0,0 @@
-#include "js_shell.h"
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef __GNUC__
-#ifdef __APPLE__
-#define LIBRARY_EXT ".bundle"
-#else
-#define LIBRARY_EXT ".so"
-#endif
-#include <dlfcn.h>
-#define LOAD_LIBRARY(name) dlopen(name, RTLD_LAZY)
-#define CLOSE_LIBRARY(handle) dlclose(handle)
-#define LIBRARY_ERROR dlerror
-#define LIBRARYFILE(name) std::string("lib").append(name).append(LIBRARY_EXT)
-#else
-#error "implement dll loading"
-#endif
-
-
-JSShell::~JSShell() {
-
-  for(std::vector<HANDLE>::iterator it = loaded_modules.begin();
-    it != loaded_modules.end(); ++it) {
-      HANDLE handle = *it;
-      CLOSE_LIBRARY(handle);
-  }
-
-}
-
-// TODO: this could be done more intelligent...
-// - can we achieve source file relative loading?
-// - better path resolution
-std::string JSShell::LoadModule(const std::string& name, HANDLE* library) {
-
-  // works only for posix like OSs
-  size_t pathIdx = name.find_last_of("/");
-
-  std::string lib_name;
-  std::string module_name;
-
-  if (pathIdx == std::string::npos) {
-    module_name = name;
-    lib_name = std::string(name).append(LIBRARY_EXT);
-  } else {
-    std::string path = name.substr(0, pathIdx+1);
-    module_name = name.substr(pathIdx+1);
-    lib_name = path.append(module_name).append(LIBRARY_EXT);
-  }
-
-  std::string lib_path;
-  HANDLE handle = 0;
-
-  for (int i = 0; i < module_path.size(); ++i) {
-    lib_path = module_path[i] + "/" + lib_name;
-    if (access( lib_path.c_str(), F_OK ) != -1) {
-      handle = LOAD_LIBRARY(lib_path.c_str());
-    }
-  }
-
-  if(handle == 0) {
-    std::cerr << "Could not find module " << lib_path << ":"
-              << std::endl << LIBRARY_ERROR() << std::endl;
-    return 0;
-  }
-
-  loaded_modules.push_back(handle);
-
-  *library = handle;
-
-  return module_name;
-}
-
-bool JSShell::RunScript(const std::string& scriptPath) {
-  std::string source = ReadFile(scriptPath);
-  if(!InitializeEngine()) return false;
-
-  // Node.js compatibility: make `print` available as `console.log()`
-  ExecuteScript("var console = {}; console.log = print;", "<console>");
-
-  if(!ExecuteScript(source, scriptPath)) {
-    return false;
-  }
-
-  return DisposeEngine();
-}
-
-bool JSShell::RunShell() {
-
-  if(!InitializeEngine()) return false;
-
-  static const int kBufferSize = 1024;
-  while (true) {
-    char buffer[kBufferSize];
-    printf("> ");
-    char* str = fgets(buffer, kBufferSize, stdin);
-    if (str == NULL) break;
-    std::string source(str);
-    ExecuteScript(source, "(shell)");
-  }
-  printf("\n");
-  return true;
-}
-
-std::string JSShell::ReadFile(const std::string& fileName)
-{
-  std::string script;
-
-  std::ifstream file(fileName.c_str());
-  if (file.is_open()) {
-    while ( file.good() ) {
-      std::string line;
-      getline(file, line);
-      script.append(line);
-      script.append("\n");
-    }
-    file.close();
-  } else {
-    std::cout << "Unable to open file " << fileName << "." << std::endl;
-  }
-
-  return script;
-}
-
-#ifdef ENABLE_JSC
-extern JSShell* JSCShell_Create();
-#endif
-#ifdef ENABLE_V8
-extern JSShell* V8Shell_Create();
-#endif
-
-typedef JSShell*(*ShellFactory)();
-
-static ShellFactory js_shell_factories[2] = {
-#ifdef ENABLE_JSC
-JSCShell_Create,
-#else
-0,
-#endif
-#ifdef ENABLE_V8
-V8Shell_Create,
-#else
-0,
-#endif
-};
-
-JSShell *JSShell::Create(Engine engine) {
-  if(js_shell_factories[engine] == 0) {
-    throw "Engine not available.";
-  }
-  return js_shell_factories[engine]();
-}
diff --git a/dependencies2013/win32/swig/Tools/javascript/js_shell.h b/dependencies2013/win32/swig/Tools/javascript/js_shell.h
deleted file mode 100644
index 1e2466b9..00000000
--- a/dependencies2013/win32/swig/Tools/javascript/js_shell.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef JS_SHELL_H
-#define JS_SHELL_H
-
-#include <vector>
-#include <string>
-
-typedef void* HANDLE;
-typedef void* MODULE;
-
-class JSShell {
-
-public:
-  enum Engine {
-    JSC = 0,
-    V8
-  };
-
-public:
-
-  JSShell() {}
-
-  virtual ~JSShell() = 0;
-
-  static JSShell* Create(Engine engine = JSC);
-
-  std::string LoadModule(const std::string& name, HANDLE* library);
-
-  virtual bool RunScript(const std::string& scriptPath);
-
-  virtual bool RunShell();
-
-  void setModulePath(const std::vector<std::string>& modulePath) {
-    module_path = modulePath;
-  }
-
-protected:
-
-  virtual bool InitializeEngine() = 0;
-
-  virtual bool ExecuteScript(const std::string& source, const std::string& scriptPath) = 0;
-
-  virtual bool DisposeEngine() = 0;
-
-  static std::string ReadFile(const std::string& fileName);
-
-protected:
-
-  std::vector<HANDLE> loaded_modules;
-  std::vector<std::string> module_path;
-
-};
-
-#endif // JS_SHELL_H
diff --git a/dependencies2013/win32/swig/Tools/javascript/jsc_shell.cxx b/dependencies2013/win32/swig/Tools/javascript/jsc_shell.cxx
deleted file mode 100644
index 292c4042..00000000
--- a/dependencies2013/win32/swig/Tools/javascript/jsc_shell.cxx
+++ /dev/null
@@ -1,233 +0,0 @@
-#include <JavaScriptCore/JavaScript.h>
-
-#include "js_shell.h"
-
-#include <iostream>
-#include <stdio.h>
-
-#ifdef __GNUC__
-#include <dlfcn.h>
-#define LOAD_SYMBOL(handle, name) dlsym(handle, name)
-#else
-#error "implement dll loading"
-#endif
-
-class JSCShell: public JSShell {
-
-typedef int (*JSCIntializer)(JSGlobalContextRef context, JSObjectRef *module);
-
-public:
-
-  JSCShell() {};
-
-  virtual ~JSCShell();
-
-protected:
-
-  virtual bool InitializeEngine();
-
-  virtual bool ExecuteScript(const std::string& source, const std::string& scriptPath);
-
-  virtual bool DisposeEngine();
-
-private:
-
-  JSObjectRef Import(const std::string &moduleName);
-
-  static JSValueRef Print(JSContextRef context, JSObjectRef object, JSObjectRef globalobj, size_t argc, const JSValueRef args[], JSValueRef* ex);
-
-  static JSValueRef Require(JSContextRef context, JSObjectRef object, JSObjectRef globalobj, size_t argc, const JSValueRef args[], JSValueRef* ex);
-
-  static bool RegisterFunction(JSGlobalContextRef context, JSObjectRef object, const char* functionName, JSObjectCallAsFunctionCallback cbFunction);
-
-  static void PrintError(JSContextRef, JSValueRef);
-
-private:
-
-  JSGlobalContextRef context;
-};
-
-JSCShell::~JSCShell() {
-  if(context != 0) {
-    JSGlobalContextRelease(context);
-    context = 0;
-  }
-}
-
-bool JSCShell::InitializeEngine() {
-  if(context != 0) {
-    JSGlobalContextRelease(context);
-    context = 0;
-  }
-  // TODO: check for initialization errors
-  context = JSGlobalContextCreate(NULL);
-  if(context == 0) return false;
-  JSObjectRef globalObject = JSContextGetGlobalObject(context);
-
-  // store this for later use
-  JSClassDefinition __shell_classdef__ = JSClassDefinition();
-
-  JSClassRef __shell_class__ = JSClassCreate(&__shell_classdef__);
-  JSObjectRef __shell__ = JSObjectMake(context, __shell_class__, 0);
-  bool success = JSObjectSetPrivate(__shell__, (void*) (long) this);
-  if (!success) {
-    std::cerr << "Could not register the shell in the Javascript context" << std::endl;
-    return false;
-  }
-  JSStringRef shellKey = JSStringCreateWithUTF8CString("__shell__");
-  JSObjectSetProperty(context, globalObject, shellKey, __shell__, kJSPropertyAttributeReadOnly, NULL);
-  JSStringRelease(shellKey);
-
-  JSCShell::RegisterFunction(context, globalObject, "print", JSCShell::Print);
-  JSCShell::RegisterFunction(context, globalObject, "require", JSCShell::Require);
-
-  return true;
-}
-
-bool JSCShell::ExecuteScript(const std::string& source, const std::string& scriptPath) {
-  JSStringRef jsScript;
-  JSStringRef sourceURL;
-  JSValueRef ex;
-  jsScript = JSStringCreateWithUTF8CString(source.c_str());
-  sourceURL = JSStringCreateWithUTF8CString(scriptPath.c_str());
-  JSValueRef jsResult = JSEvaluateScript(context, jsScript, 0, sourceURL, 0, &ex);
-  JSStringRelease(jsScript);
-  if (jsResult == NULL && ex != NULL) {
-      JSCShell::PrintError(context, ex);
-      return false;
-  }
-  return true;
-}
-
-bool JSCShell::DisposeEngine() {
-  JSGlobalContextRelease(context);
-  context = 0;
-  return true;
-}
-
-JSValueRef JSCShell::Print(JSContextRef context, JSObjectRef object,
-                           JSObjectRef globalobj, size_t argc,
-                           const JSValueRef args[], JSValueRef* ex) {
-  if (argc > 0)
-  {
-    JSStringRef string = JSValueToStringCopy(context, args[0], NULL);
-    size_t numChars = JSStringGetMaximumUTF8CStringSize(string);
-    char *stringUTF8 = new char[numChars];
-    JSStringGetUTF8CString(string, stringUTF8, numChars);
-    printf("%s\n", stringUTF8);
-
-    delete[] stringUTF8;
-  }
-
-  return JSValueMakeUndefined(context);
-}
-
-// Attention: this feature should not create too high expectations.
-// It is only capable of loading things relative to the execution directory
-// and not relative to the parent script.
-JSValueRef JSCShell::Require(JSContextRef context, JSObjectRef object,
-                           JSObjectRef globalObj, size_t argc,
-                           const JSValueRef args[], JSValueRef* ex) {
-  JSObjectRef module;
-
-  JSStringRef shellKey = JSStringCreateWithUTF8CString("__shell__");
-  JSValueRef shellAsVal = JSObjectGetProperty(context, globalObj, shellKey, NULL);
-  JSStringRelease(shellKey);
-  JSObjectRef shell = JSValueToObject(context, shellAsVal, 0);
-  JSCShell *_this = (JSCShell*) (long) JSObjectGetPrivate(shell);
-
-  if (argc > 0)
-  {
-    JSStringRef string = JSValueToStringCopy(context, args[0], NULL);
-    size_t numChars = JSStringGetMaximumUTF8CStringSize(string);
-    char *stringUTF8 = new char[numChars];
-    JSStringGetUTF8CString(string, stringUTF8, numChars);
-
-    std::string modulePath(stringUTF8);
-    module = _this->Import(modulePath);
-
-    delete[] stringUTF8;
-  }
-
-  if (module) {
-    return module;
-  } else {
-    printf("Ooops.\n");
-    return JSValueMakeUndefined(context);
-  }
-}
-
-JSObjectRef JSCShell::Import(const std::string& module_path) {
-
-  HANDLE library;
-  std::string module_name = LoadModule(module_path, &library);
-
-  if (library == 0) {
-    printf("Could not load module.");
-    return 0;
-  }
-
-  std::string symname = std::string(module_name).append("_initialize");
-
-  JSCIntializer init_function = reinterpret_cast<JSCIntializer>((long) LOAD_SYMBOL(library, symname.c_str()));
-  if(init_function == 0) {
-    printf("Could not find module's initializer function.");
-    return 0;
-  }
-
-  JSObjectRef module;
-  init_function(context, &module);
-
-  return module;
-}
-
-bool JSCShell::RegisterFunction(JSGlobalContextRef context, JSObjectRef object,
-                        const char* functionName, JSObjectCallAsFunctionCallback callback) {
-    JSStringRef js_functionName = JSStringCreateWithUTF8CString(functionName);
-    JSObjectSetProperty(context, object, js_functionName,
-                        JSObjectMakeFunctionWithCallback(context, js_functionName, callback),
-                        kJSPropertyAttributeNone, NULL);
-    JSStringRelease(js_functionName);
-    return true;
-}
-
-void JSCShell::PrintError(JSContextRef ctx, JSValueRef err) {
-  char *buffer;
-  size_t length;
-
-  JSStringRef string = JSValueToStringCopy(ctx, err, 0);
-  length = JSStringGetLength(string);
-  buffer   = new char[length+1];
-  JSStringGetUTF8CString(string, buffer, length+1);
-  std::string errMsg(buffer);
-  JSStringRelease(string);
-  delete[] buffer;
-
-  JSObjectRef errObj = JSValueToObject(ctx, err, 0);
-
-  if(errObj == 0) {
-    std::cerr << errMsg << std::endl;
-    return;
-  }
-
-  JSStringRef sourceURLKey = JSStringCreateWithUTF8CString("sourceURL");
-  JSStringRef sourceURLStr = JSValueToStringCopy(ctx, JSObjectGetProperty(ctx, errObj, sourceURLKey, 0), 0);
-  length = JSStringGetLength(sourceURLStr);
-  buffer   = new char[length+1];
-  JSStringGetUTF8CString(sourceURLStr, buffer, length+1);
-  std::string sourceURL(buffer);
-  delete[] buffer;
-  JSStringRelease(sourceURLStr);
-  JSStringRelease(sourceURLKey);
-
-  JSStringRef lineKey = JSStringCreateWithUTF8CString("line");
-  JSValueRef jsLine = JSObjectGetProperty(ctx, errObj, lineKey, 0);
-  int line = (int) JSValueToNumber(ctx, jsLine, 0);
-  JSStringRelease(lineKey);
-
-  std::cerr << sourceURL << ":" << line << ":" << errMsg << std::endl;
-}
-
-JSShell* JSCShell_Create() {
-  return new JSCShell();
-}
diff --git a/dependencies2013/win32/swig/Tools/javascript/v8_shell.cxx b/dependencies2013/win32/swig/Tools/javascript/v8_shell.cxx
deleted file mode 100644
index 5001bc25..00000000
--- a/dependencies2013/win32/swig/Tools/javascript/v8_shell.cxx
+++ /dev/null
@@ -1,388 +0,0 @@
-#include <assert.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <v8.h>
-#include <vector>
-
-#include "js_shell.h"
-
-typedef int (*V8ExtensionInitializer) (v8::Handle<v8::Object> module);
-
-// Note: these typedefs and defines are used to deal with  v8 API changes since version 3.19.00
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
-typedef v8::Handle<v8::Value> SwigV8ReturnValue;
-typedef v8::Arguments SwigV8Arguments;
-typedef v8::AccessorInfo SwigV8PropertyCallbackInfo;
-#define SWIGV8_RETURN(val) return scope.Close(val)
-#define SWIGV8_RETURN_INFO(val, info) return scope.Close(val)
-#else
-typedef void SwigV8ReturnValue;
-typedef v8::FunctionCallbackInfo<v8::Value> SwigV8Arguments;
-typedef v8::PropertyCallbackInfo<v8::Value> SwigV8PropertyCallbackInfo;
-#define SWIGV8_RETURN(val) args.GetReturnValue().Set(val); return
-#define SWIGV8_RETURN_INFO(val, info) info.GetReturnValue().Set(val); return
-#endif
-
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032117)
-#define SWIGV8_HANDLESCOPE() v8::HandleScope scope
-#define SWIGV8_HANDLESCOPE_ESC() v8::HandleScope scope
-#define SWIGV8_ESCAPE(val) return scope.Close(val)
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032318)
-#define SWIGV8_HANDLESCOPE() v8::HandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_HANDLESCOPE_ESC() v8::HandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_ESCAPE(val) return scope.Close(val)
-#else
-#define SWIGV8_HANDLESCOPE() v8::HandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_HANDLESCOPE_ESC() v8::EscapableHandleScope scope(v8::Isolate::GetCurrent());
-#define SWIGV8_ESCAPE(val) return scope.Escape(val)
-#endif
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032318)
-#define SWIGV8_CURRENT_CONTEXT() v8::Context::GetCurrent()
-#define SWIGV8_STRING_NEW(str) v8::String::New(str)
-#define SWIGV8_FUNCTEMPLATE_NEW(func) v8::FunctionTemplate::New(func)
-#define SWIGV8_OBJECT_NEW() v8::Object::New()
-#define SWIGV8_EXTERNAL_NEW(val) v8::External::New(val)
-#define SWIGV8_UNDEFINED() v8::Undefined()
-#else
-#define SWIGV8_CURRENT_CONTEXT() v8::Isolate::GetCurrent()->GetCurrentContext()
-#define SWIGV8_STRING_NEW(str) v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), str)
-#define SWIGV8_FUNCTEMPLATE_NEW(func) v8::FunctionTemplate::New(v8::Isolate::GetCurrent(), func)
-#define SWIGV8_OBJECT_NEW() v8::Object::New(v8::Isolate::GetCurrent())
-#define SWIGV8_EXTERNAL_NEW(val) v8::External::New(v8::Isolate::GetCurrent(), val)
-#define SWIGV8_UNDEFINED() v8::Undefined(v8::Isolate::GetCurrent())
-#endif
-
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-typedef v8::Persistent<v8::Context> SwigV8Context;
-#else
-typedef v8::Local<v8::Context> SwigV8Context;
-#endif
-
-class V8Shell: public JSShell {
-
-public:
-  V8Shell();
-
-  virtual ~V8Shell();
-
-  virtual bool RunScript(const std::string &scriptPath);
-
-  virtual bool RunShell();
-
-
-protected:
-
-  virtual bool InitializeEngine();
-
-  virtual bool ExecuteScript(const std::string &source, const std::string &scriptPath);
-
-  virtual bool DisposeEngine();
-
-private:
-
-  v8::Handle<v8::Value> Import(const std::string &moduleName);
-
-  SwigV8Context CreateShellContext();
-
-  void ReportException(v8::TryCatch *handler);
-
-  static SwigV8ReturnValue Print(const SwigV8Arguments &args);
-
-  static SwigV8ReturnValue Require(const SwigV8Arguments &args);
-
-  static SwigV8ReturnValue Quit(const SwigV8Arguments &args);
-
-  static SwigV8ReturnValue Version(const SwigV8Arguments &args);
-
-  static const char* ToCString(const v8::String::Utf8Value &value);
-
-};
-
-#ifdef __GNUC__
-#include <dlfcn.h>
-#define LOAD_SYMBOL(handle, name) dlsym(handle, name)
-#else
-#error "implement dll loading"
-#endif
-
-V8Shell::V8Shell() {}
-
-V8Shell::~V8Shell() {}
-
-bool V8Shell::RunScript(const std::string &scriptPath) {
-  std::string source = ReadFile(scriptPath);
-
-  v8::Isolate *isolate = v8::Isolate::New();
-  v8::Isolate::Scope isolate_scope(isolate);
-
-  SWIGV8_HANDLESCOPE();
-
-  SwigV8Context context = CreateShellContext();
-
-  if (context.IsEmpty()) {
-      printf("Could not create context.\n");
-      return false;
-  }
-
-  context->Enter();
-
-  // Store a pointer to this shell for later use
-
-  v8::Handle<v8::Object> global = context->Global();
-  v8::Local<v8::External> __shell__ = SWIGV8_EXTERNAL_NEW((void*) (long) this);
-
-  global->SetHiddenValue(SWIGV8_STRING_NEW("__shell__"), __shell__);
-
-  // Node.js compatibility: make `print` available as `console.log()`
-  ExecuteScript("var console = {}; console.log = print;", "<console>");
-
-  bool success = ExecuteScript(source, scriptPath);
-
-  // Cleanup
-
-  context->Exit();
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-    context.Dispose();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-    context.Dispose(v8::Isolate::GetCurrent());
-#else
-//    context.Dispose();
-#endif
-
-//  v8::V8::Dispose();
-
-  return success;
-}
-
-bool V8Shell::RunShell() {
-  SWIGV8_HANDLESCOPE();
-
-  SwigV8Context context = CreateShellContext();
-
-  if (context.IsEmpty()) {
-      printf("Could not create context.\n");
-      return false;
-  }
-
-  context->Enter();
-
-  v8::Context::Scope context_scope(context);
-
-  ExecuteScript("var console = {}; console.log = print;", "<console>");
-
-  static const int kBufferSize = 1024;
-  while (true) {
-    char buffer[kBufferSize];
-    printf("> ");
-    char *str = fgets(buffer, kBufferSize, stdin);
-    if (str == NULL) break;
-    std::string source(str);
-    ExecuteScript(source, "(shell)");
-  }
-  printf("\n");
-
-  // Cleanup
-
-  context->Exit();
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-    context.Dispose();
-#elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-    context.Dispose(v8::Isolate::GetCurrent());
-#else
-//    context.Dispose();
-#endif
-
-//  v8::V8::Dispose();
-
-  return true;
-}
-
-
-bool V8Shell::InitializeEngine() {
-  return true;
-}
-
-bool V8Shell::ExecuteScript(const std::string &source, const std::string &name) {
-  SWIGV8_HANDLESCOPE();
-
-  v8::TryCatch try_catch;
-  v8::Handle<v8::Script> script = v8::Script::Compile(SWIGV8_STRING_NEW(source.c_str()), SWIGV8_STRING_NEW(name.c_str()));
-
-  // Stop if script is empty
-  if (script.IsEmpty()) {
-    // Print errors that happened during compilation.
-    ReportException(&try_catch);
-    return false;
-  }
-
-  v8::Handle<v8::Value> result = script->Run();
-
-  // Print errors that happened during execution.
-  if (try_catch.HasCaught()) {
-    ReportException(&try_catch);
-    return false;
-  } else {
-    return true;
-  }
-}
-
-bool V8Shell::DisposeEngine() {
-  return true;
-}
-
-SwigV8Context V8Shell::CreateShellContext() {
-  // Create a template for the global object.
-  v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New();
-
-  // Bind global functions
-  global->Set(SWIGV8_STRING_NEW("print"), SWIGV8_FUNCTEMPLATE_NEW(V8Shell::Print));
-  global->Set(SWIGV8_STRING_NEW("quit"), SWIGV8_FUNCTEMPLATE_NEW(V8Shell::Quit));
-  global->Set(SWIGV8_STRING_NEW("require"), SWIGV8_FUNCTEMPLATE_NEW(V8Shell::Require));
-  global->Set(SWIGV8_STRING_NEW("version"), SWIGV8_FUNCTEMPLATE_NEW(V8Shell::Version));
-
-#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031900)
-  SwigV8Context context = v8::Context::New(NULL, global);
-  return context;
-#else
-  SwigV8Context context = v8::Context::New(v8::Isolate::GetCurrent(), NULL, global);
-  return context;
-#endif
-}
-
-v8::Handle<v8::Value> V8Shell::Import(const std::string &module_path)
-{
-  SWIGV8_HANDLESCOPE_ESC();
-
-  HANDLE library;
-  std::string module_name = LoadModule(module_path, &library);
-
-  std::string symname = std::string(module_name).append("_initialize");
-
-  V8ExtensionInitializer init_function = reinterpret_cast<V8ExtensionInitializer>((long) LOAD_SYMBOL(library, symname.c_str()));
-
-  if(init_function == 0) {
-    printf("Could not find initializer function.");
-
-    return SWIGV8_UNDEFINED();
-  }
-
-  v8::Local<v8::Object> module = SWIGV8_OBJECT_NEW();
-  init_function(module);
-
-  SWIGV8_ESCAPE(module);
-}
-
-SwigV8ReturnValue V8Shell::Print(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-
-  bool first = true;
-  for (int i = 0; i < args.Length(); i++) {
-
-    if (first) {
-      first = false;
-    } else {
-      printf(" ");
-    }
-    v8::String::Utf8Value str(args[i]);
-    const char *cstr = V8Shell::ToCString(str);
-    printf("%s", cstr);
-  }
-  printf("\n");
-  fflush(stdout);
-
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-
-SwigV8ReturnValue V8Shell::Require(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-
-  if (args.Length() != 1) {
-    printf("Illegal arguments for `require`");
-  };
-
-  v8::String::Utf8Value str(args[0]);
-  const char *cstr = V8Shell::ToCString(str);
-  std::string moduleName(cstr);
-
-  v8::Local<v8::Object> global = SWIGV8_CURRENT_CONTEXT()->Global();
-
-  v8::Local<v8::Value> hidden = global->GetHiddenValue(SWIGV8_STRING_NEW("__shell__"));
-  v8::Local<v8::External> __shell__ = v8::Local<v8::External>::Cast(hidden);
-  V8Shell *_this = (V8Shell *) (long) __shell__->Value();
-
-  v8::Handle<v8::Value> module = _this->Import(moduleName);
-
-  SWIGV8_RETURN(module);
-}
-
-SwigV8ReturnValue V8Shell::Quit(const SwigV8Arguments &args) {
-  SWIGV8_HANDLESCOPE();
-
-  int exit_code = args[0]->Int32Value();
-  fflush(stdout);
-  fflush(stderr);
-  exit(exit_code);
-
-  SWIGV8_RETURN(SWIGV8_UNDEFINED());
-}
-
-SwigV8ReturnValue V8Shell::Version(const SwigV8Arguments &args) {
-    SWIGV8_HANDLESCOPE();
-    SWIGV8_RETURN(SWIGV8_STRING_NEW(v8::V8::GetVersion()));
-}
-
-void V8Shell::ReportException(v8::TryCatch *try_catch) {
-  SWIGV8_HANDLESCOPE();
-
-  v8::String::Utf8Value exception(try_catch->Exception());
-  const char *exception_string = V8Shell::ToCString(exception);
-  v8::Handle<v8::Message> message = try_catch->Message();
-  if (message.IsEmpty()) {
-    // V8 didn't provide any extra information about this error; just
-    // print the exception.
-    printf("%s\n", exception_string);
-  } else {
-    // Print (filename):(line number): (message).
-    v8::String::Utf8Value filename(message->GetScriptResourceName());
-    const char *filename_string = V8Shell::ToCString(filename);
-    int linenum = message->GetLineNumber();
-    printf("%s:%i: %s\n", filename_string, linenum, exception_string);
-    // Print line of source code.
-    v8::String::Utf8Value sourceline(message->GetSourceLine());
-    const char *sourceline_string = V8Shell::ToCString(sourceline);
-    printf("%s\n", sourceline_string);
-    // Print wavy underline (GetUnderline is deprecated).
-    int start = message->GetStartColumn();
-    for (int i = 0; i < start; i++) {
-      printf(" ");
-    }
-    int end = message->GetEndColumn();
-    for (int i = start; i < end; i++) {
-      printf("^");
-    }
-    printf("\n");
-    v8::String::Utf8Value stack_trace(try_catch->StackTrace());
-    if (stack_trace.length() > 0) {
-      const char *stack_trace_string = V8Shell::ToCString(stack_trace);
-      printf("%s\n", stack_trace_string);
-    }
-  }
-}
-
-// Extracts a C string from a V8 Utf8Value.
-const char *V8Shell::ToCString(const v8::String::Utf8Value &value) {
-  return *value ? *value : "<string conversion failed>";
-}
-
-JSShell *V8Shell_Create() {
-  return new V8Shell();
-}
diff --git a/dependencies2013/win32/swig/Tools/mkdist.py b/dependencies2013/win32/swig/Tools/mkdist.py
deleted file mode 100644
index 11a0dd6c..00000000
--- a/dependencies2013/win32/swig/Tools/mkdist.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-
-# This script builds a swig-x.y.z distribution.
-# Usage: mkdist.py version branch, where version should be x.y.z and branch is normally 'master'
-
-import sys
-import string
-import os
-import subprocess
-
-def failed():
-  print "mkdist.py failed to complete"
-  sys.exit(2)
-
-
-try:
-   version = sys.argv[1]
-   dirname = "swig-" + version
-   branch = sys.argv[2]
-except:
-   print "Usage: mkdist.py version branch, where version should be x.y.z and branch is normally 'master'"
-   sys.exit(1)
-
-if sys.version_info[0:2] < (2, 7):
-   print "Error: Python 2.7 is required"
-   sys.exit(3)
-
-
-# Check name matches normal unix conventions
-if string.lower(dirname) != dirname:
-  print "directory name ("+dirname+") should be in lowercase"
-  sys.exit(3)
-
-# If directory and tarball exist, remove it
-print "Removing ", dirname
-os.system("rm -rf "+dirname)
-
-print "Removing "+dirname+".tar if exists"
-os.system("rm -f "+dirname+".tar.gz")
-
-print "Removing "+dirname+".tar.gz if exists"
-os.system("rm -f "+dirname+".tar")
-
-# Grab the code from git
-
-print "Checking git repository is in sync with remote repository"
-os.system("git remote update origin") == 0 or failed()
-command = ["git", "status", "--porcelain", "-uno"]
-out = subprocess.check_output(command)
-if out.strip() != "":
-  print "Local git repository has modifications"
-  print " ".join(command)
-  print out
-  sys.exit(3)
-
-command = ["git", "log", "--oneline", branch + "..origin/" + branch]
-out = subprocess.check_output(command)
-if out.strip() != "":
-  print "Remote repository has additional modifications to local repository"
-  print " ".join(command)
-  print out
-  sys.exit(3)
-
-command = ["git", "log", "--oneline", "origin/" + branch + ".." + branch]
-out = subprocess.check_output(command)
-if out.strip() != "":
-  print "Local repository has modifications not pushed to the remote repository"
-  print "These should be pushed and checked that they pass Continuous Integration testing before continuing"
-  print " ".join(command)
-  print out
-  sys.exit(3)
-
-print "Tagging release"
-tag = "'rel-" + version + "'"
-os.system("git tag -a -m " + tag + " " + tag) == 0 or failed()
-
-outdir = os.path.basename(os.getcwd()) + "/" + dirname + "/"
-print "Grabbing tagged release git repository using 'git archive' into " + outdir
-os.system("(cd .. && git archive --prefix=" + outdir + " " + tag + " . | tar -xf -)") == 0 or failed()
-
-# Go build the system
-
-print "Building system"
-os.system("cd "+dirname+" && ./autogen.sh") == 0 or failed()
-os.system("cd "+dirname+"/Source/CParse && bison -y -d parser.y && mv y.tab.c parser.c && mv y.tab.h parser.h") == 0 or failed()
-os.system("cd "+dirname+" && make -f Makefile.in libfiles srcdir=./") == 0 or failed()
-
-# Remove autoconf files
-os.system("find "+dirname+" -name autom4te.cache -exec rm -rf {} \\;")
-
-# Build documentation
-print "Building html documentation"
-os.system("cd "+dirname+"/Doc/Manual && make all clean-baks") == 0 or failed()
-
-# Build the tar-ball
-os.system("tar -cf "+dirname+".tar "+dirname) == 0 or failed()
-os.system("gzip "+dirname+".tar") == 0 or failed()
-
-print "Finished building "+dirname+".tar.gz"
-
diff --git a/dependencies2013/win32/swig/Tools/mkrelease.py b/dependencies2013/win32/swig/Tools/mkrelease.py
deleted file mode 100644
index ec9a2b76..00000000
--- a/dependencies2013/win32/swig/Tools/mkrelease.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-
-# This script builds the SWIG source tarball, creates the Windows executable and the Windows zip package
-# and uploads them both to SF ready for release. Also uploaded are the release notes.
-import sys
-import string
-import os
-
-def failed(message):
-  if message == "":
-    print "mkrelease.py failed to complete"
-  else:
-    print message
-  sys.exit(2)
-
-try:
-   version = sys.argv[1]
-   branch = sys.argv[2]
-   username = sys.argv[3]
-except:
-   print "Usage: python mkrelease.py version branch username"
-   print "where version should be x.y.z and username is your SF username"
-   sys.exit(1)
-
-print "Looking for rsync"
-os.system("which rsync") and failed("rsync not installed/found. Please install.")
-
-print "Making source tarball"
-os.system("python ./mkdist.py " + version + " " + branch) and failed("")
-
-print "Build Windows package"
-os.system("./mkwindows.sh " + version) and failed("")
-
-print "Uploading to SourceForge"
-
-swig_dir_sf = username + ",swig@frs.sourceforge.net:/home/frs/project/s/sw/swig/swig/swig-" + version + "/"
-swigwin_dir_sf = username + ",swig@frs.sourceforge.net:/home/frs/project/s/sw/swig/swigwin/swigwin-" + version + "/"
-
-# If a file with 'readme' in the name exists in the same folder as the zip/tarball, it gets automatically displayed as the release notes by SF
-full_readme_file = "readme-" + version + ".txt"
-os.system("rm -f " + full_readme_file)
-os.system("cat swig-" + version + "/README " + "swig-" + version + "/CHANGES.current " + "swig-" + version + "/RELEASENOTES " + "> " + full_readme_file)
-
-os.system("rsync --archive --verbose -P --times -e ssh " + "swig-" + version + ".tar.gz " + full_readme_file + " " + swig_dir_sf) and failed("")
-os.system("rsync --archive --verbose -P --times -e ssh " + "swigwin-" + version + ".zip " + full_readme_file + " " + swigwin_dir_sf) and failed("")
-
-print "Finished"
-
-print "Now log in to SourceForge and set the operating systems applicable to the newly uploaded tarball and zip file. Also remember to do a 'git push --tags'."
diff --git a/dependencies2013/win32/swig/Tools/mkwindows.sh b/dependencies2013/win32/swig/Tools/mkwindows.sh
deleted file mode 100644
index 0651bbd6..00000000
--- a/dependencies2013/win32/swig/Tools/mkwindows.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-# Build Windows distribution (swigwin-2.0.x.zip) from source tarball (swig-2.0.x.tar.gz)
-# Requires running in either:
-# - MinGW environment
-# - Linux using MinGW cross compiler
-# - Cygwin using MinGW compiler
-
-# path to zip program
-zip=
-
-# options for configure
-extraconfigureoptions=
-compileflags="-O2 -Wall -Wextra"
-
-if test x$1 != x; then
-    version=$1
-    if test x$2 != x; then
-        zip=$2;
-        echo zip: $zip;
-    fi
-else
-    echo "Usage: mkwindows.sh version [zip]"
-    echo "       Build SWIG Windows distribution from source tarball. Works on Cygwin, MinGW or Linux"
-    echo "       version should be 2.0.x"
-    echo "       zip is full path to zip program - default is /c/cygwin/bin/zip on MinGW, zip on Linux and Cygwin"
-    exit 1
-fi
-
-uname=`uname -a`
-mingw=`echo "$uname" | grep -i mingw`
-linux=`echo "$uname" | grep -i linux`
-cygwin=`echo "$uname" | grep -i cygwin`
-if test "$mingw"; then
-  echo "Building native Windows executable on MinGW";
-  if test x$zip = x; then
-    zip=/c/cygwin/bin/zip
-  fi
-else 
-  if test "$linux"; then
-    echo "Building native Windows executable on Linux"
-    if test x$zip = x; then
-      zip=zip
-    fi
-    echo "Checking that mingw 32-bit gcc is installed/available"
-    if test -n "`which i686-w64-mingw32-gcc`" ; then
-      i686-w64-mingw32-gcc --version || exit 1
-      i686-w64-mingw32-g++ --version || exit 1
-      extraconfigureoptions="--host=i686-w64-mingw32 --build=i686-linux"
-      # Statically link so that libstdc++-6.dll and libgcc_s_sjlj-1.dll don't have to be shipped
-      compileflags="$compileflags -static-libgcc -static-libstdc++"
-    elif test -n "`which i586-mingw32msvc-gcc`" ; then
-      i586-mingw32msvc-gcc --version || exit 1
-      i586-mingw32msvc-g++ --version || exit 1
-      extraconfigureoptions="--host=i586-mingw32msvc --build=i686-linux"
-    else
-      echo "Could not detect mingw gcc - please install mingw-w64 package."
-      exit 1;
-    fi
-  else 
-    if test "$cygwin"; then
-      echo "Building native Windows executable on Cygwin"
-      if test x$zip = x; then
-        zip=zip
-      fi
-      compileflags="$compileflags -mno-cygwin"
-    else
-      echo "Unknown platform. Requires either Linux or MinGW."
-      exit 1;
-    fi
-  fi
-fi
-
-export CFLAGS="$compileflags"
-export CXXFLAGS="$compileflags"
-
-swigbasename=swig-$version
-swigwinbasename=swigwin-$version
-tarball=$swigbasename.tar.gz
-pcre_tarball=`ls pcre-*.tar.*`
-
-if ! test -f "$pcre_tarball"; then
-  echo "Could not find PCRE tarball. Please download a PCRE source tarball from http://www.pcre.org"
-  echo "and place in the same directory as the SWIG tarball."
-  exit 1
-fi
-
-if test -f "$tarball"; then
-    builddir=build-$version
-    if test -e $builddir; then
-      echo "Deleting directory $builddir..."
-      rm -rf $builddir
-    fi
-    echo "Creating directory $builddir..."
-    mkdir $builddir
-    cd $builddir
-    echo "Unzipping tarball..."
-    tar -zxf ../$tarball
-    sleep 2 # fix strange not finding newly created directory
-    if test -d $swigbasename; then
-      mv $swigbasename $swigwinbasename
-      tar -zxf ../$tarball
-      cd $swigbasename
-      (cd ../.. && cp $pcre_tarball $builddir/$swigbasename)
-      echo Running: Tools/pcre-build.sh $extraconfigureoptions
-      ./Tools/pcre-build.sh $extraconfigureoptions
-      echo Running: ./configure $extraconfigureoptions --without-alllang
-      ./configure $extraconfigureoptions --without-alllang
-      echo "Compiling (quietly)..."
-      make > build.log
-      echo "Simple check to see if swig.exe runs..."
-      env LD_LIBRARY_PATH= PATH= ./swig.exe -version || exit 1
-      echo "Simple check to see if ccache-swig.exe runs..."
-      env LD_LIBRARY_PATH= PATH= ./CCache/ccache-swig.exe -V || exit 1
-      echo "Creating $swigwinbasename.zip..."
-      cd ..
-      cp $swigbasename/swig.exe $swigwinbasename
-      cp $swigbasename/CCache/ccache-swig.exe $swigwinbasename/CCache
-      cp $swigbasename/Lib/swigwarn.swg $swigwinbasename/Lib
-      sleep 2 # fix strange not finding swig.exe
-      echo "Unzip into a directory of your choice. Please read the README file as well as Doc\Manual\Windows.html for installation instructions." > swig_windows_zip_comments.txt
-      rm -f ../$swigwinbasename.zip
-      $zip -q -r -9 -z < swig_windows_zip_comments.txt ../$swigwinbasename.zip $swigwinbasename
-      rm -f swig_windows_zip_comments.txt
-      echo "Cleaning up..."
-      cd ..
-      rm -rf $builddir
-      echo "Finished building $swigwinbasename.zip"
-    else
-      echo "Expecting tarball to create directory: $swigbasename but it does not exist"
-      exit 1
-    fi
-else
-    echo tarball missing: $tarball 
-    exit 1
-fi
-
-exit 0
diff --git a/dependencies2013/win32/swig/Tools/nuget-install.cmd b/dependencies2013/win32/swig/Tools/nuget-install.cmd
deleted file mode 100644
index 08caea7e..00000000
--- a/dependencies2013/win32/swig/Tools/nuget-install.cmd
+++ /dev/null
@@ -1,28 +0,0 @@
-rem Workaround 'nuget install' not being reliable by retrying a few times
-
-@echo off
-rem initiate the retry number
-set errorCode=1
-set retryNumber=0
-set maxRetries=5
-
-:RESTORE
-nuget install %*
-
-rem problem?
-IF ERRORLEVEL %errorCode% GOTO :RETRY
-
-rem everything is fine!
-GOTO :EXIT
-
-:RETRY
-@echo Oops, nuget restore exited with code %errorCode% - let us try again!
-set /a retryNumber=%retryNumber%+1
-IF %reTryNumber% LSS %maxRetries% (GOTO :RESTORE)
-IF %retryNumber% EQU %maxRetries% (GOTO :ERR)
-
-:ERR
-@echo Sorry, we tried restoring nuget packages for %maxRetries% times and all attempts were unsuccessful!
-EXIT /B 1
-
-:EXIT
diff --git a/dependencies2013/win32/swig/Tools/obs-buildlogs.py b/dependencies2013/win32/swig/Tools/obs-buildlogs.py
deleted file mode 100644
index eaf0f613..00000000
--- a/dependencies2013/win32/swig/Tools/obs-buildlogs.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import subprocess
-import argparse
-import glob
-
-def remove_old_files():
-  files = glob.glob("*.log")
-  for file in files:
-    os.remove(file)
-
-def download():
-  repos = subprocess.Popen(['osc', 'repositories'], stdout=subprocess.PIPE)
-  for line in repos.stdout:
-    command = ['osc', 'buildlog', '--last'] + line.split()
-    filename = "-".join(line.split()) + ".log"
-    print "Downloading logs using: {}".format(" ".join(command))
-    buildlog = subprocess.Popen(command, stdout=subprocess.PIPE)
-
-    print("Writing log to {}".format(filename))
-    file = open(filename, "w")
-    if buildlog.stderr != None:
-      print("Errors: {}".format(buildlog.stderr))
-    for log_line in buildlog.stdout:
-      file.write(log_line)
-
-  print("Finished")
-
-parser = argparse.ArgumentParser(description="Download OpenBuild logs using osc. All the logs for each architecture from the last completed builds are downloaded and stored as .log files. Must be run from a working copy that is already checked out, eg after running obs-update.")
-args = parser.parse_args()
-
-remove_old_files()
-download()
diff --git a/dependencies2013/win32/swig/Tools/obs-update b/dependencies2013/win32/swig/Tools/obs-update
deleted file mode 100644
index 2a7a48cf..00000000
--- a/dependencies2013/win32/swig/Tools/obs-update
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Update SWIG tarball on openSUSE Build Service to contain the latest from master
-# Requires the openSUSE Build Service command-line tool (osc)
-# See http://openbuildservice.org/download/
-# And these packages: obs-service-tar_scm obs-service-recompress obs-service-set_version
-
-# Results appear at https://build.opensuse.org/package/show/home:kwk:swig/swig-raw
-
-set -e
-set -x
-
-rm -rf home-kwk-swig/swig-raw
-mkdir -p home-kwk-swig
-cd home-kwk-swig
-# check out 'swig-raw'
-osc co -o swig-raw home:kwk:swig swig-raw
-cd swig-raw
-# remove existing tarball
-osc rm swig*tar.bz2
-# fetch latest master branch from git and create tarball
-osc service disabledrun
-# add new tarball
-osc addremove
-# check changes into build service, triggers build
-osc ci
diff --git a/dependencies2013/win32/swig/Tools/pcre-build.sh b/dependencies2013/win32/swig/Tools/pcre-build.sh
deleted file mode 100644
index 92f645da..00000000
--- a/dependencies2013/win32/swig/Tools/pcre-build.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-pcre_subdir=pcre/pcre-swig-install
-pcre_install_dir=`pwd`/$pcre_subdir
-
-usage() {
-  echo "Helper script to build PCRE as a static library from a tarball just for use during the"
-  echo "SWIG build. It does not install PCRE for global use on your system."
-  echo "Usage: pcre-build.sh [--help] [args]"
-  echo "  args   - optional additional arguments passed on to the PCRE configure script (leave out"
-  echo "         unless you are an expert at configure)"
-  echo "  --help - Display this help information."
-  echo "Instructions:"
-  echo "  - Download the latest PCRE source tarball from http://www.pcre.org and place in the"
-  echo "    directory that you will configure and build SWIG."
-  echo "  - Run this script in the same directory that you intend to configure and build SWIG in."
-  echo "    This will configure and build PCRE as a static library."
-  echo "  - Afterwards run the SWIG configure script which will then find and use the PCRE static"
-  echo "    libraries in the $pcre_subdir subdirectory."
-  exit 0
-}
-
-bail() {
-  echo $1 >&2
-  exit 1
-}
-
-if test "$1" = "-h" -o "$1" = "-help" -o "$1" = "--help" ; then
-  usage
-fi
-
-if test -f "pcre-build.sh" ; then
-  echo "Error: this script should not be run in the Tools directory" >&2
-  echo ""
-  usage
-fi
-
-echo "Looking for PCRE tarball..."
-rm -rf pcre
-pcre_tarball=`ls pcre-*.tar*`
-test -n "$pcre_tarball" || bail "Could not find tarball matching pattern: pcre-*.tar*"
-test -f "$pcre_tarball" || bail "Could not find a single PCRE tarball. Found: $pcre_tarball"
-
-echo "Extracting tarball: $pcre_tarball"
-tar -xf $pcre_tarball || bail "Could not untar $pcre_tarball"
-pcre_dir=`echo $pcre_tarball | sed -e "s/\.tar.*//"`
-echo "Configuring PCRE in directory: pcre"
-mv $pcre_dir pcre || bail "Could not create pcre directory"
-cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE configure failed"
-echo "Building PCRE..."
-${MAKE:-make} -s || bail "Could not build PCRE"
-echo "Installing PCRE locally to $pcre_install_dir..."
-${MAKE:-make} -s install || bail "Could not install PCRE"
-echo ""
-echo "The SWIG configure script can now be run, whereupon PCRE will automatically be detected and used from $pcre_install_dir/bin/pcre-config."
diff --git a/dependencies2013/win32/swig/Tools/pyname_patch.py b/dependencies2013/win32/swig/Tools/pyname_patch.py
deleted file mode 100644
index f8f436c3..00000000
--- a/dependencies2013/win32/swig/Tools/pyname_patch.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env python
-"""
-From SWIG 1.3.37 we deprecated all SWIG symbols that start with Py,
-since they are inappropriate and discouraged in Python documentation
-(from http://www.python.org/doc/2.5.2/api/includes.html):
-
-"All user visible names defined by Python.h (except those defined by the included
-standard headers) have one of the prefixes "Py" or "_Py". Names beginning with
-"_Py" are for internal use by the Python implementation and should not be used
-by extension writers. Structure member names do not have a reserved prefix.
-
-Important: user code should never define names that begin with "Py" or "_Py".
-This confuses the reader, and jeopardizes the portability of the user code to
-future Python versions, which may define additional names beginning with one
-of these prefixes."
-
-This file is a simple script used for change all of these symbols, for user code
-or SWIG itself. 
-"""
-import re
-from shutil import copyfile
-import sys
-
-symbols = [
-        #(old name, new name)
-        ("PySequence_Base", "SwigPySequence_Base"),
-        ("PySequence_Cont", "SwigPySequence_Cont"),
-        ("PySwigIterator_T", "SwigPyIterator_T"),
-        ("PyPairBoolOutputIterator", "SwigPyPairBoolOutputIterator"),
-        ("PySwigIterator", "SwigPyIterator"),
-        ("PySwigIterator_T", "SwigPyIterator_T"),
-        ("PyMapIterator_T", "SwigPyMapIterator_T"),
-        ("PyMapKeyIterator_T", "SwigPyMapKeyIterator_T"),
-        ("PyMapValueIterator_T", "SwigPyMapValueITerator_T"),
-        ("PyObject_ptr", "SwigPtr_PyObject"),
-        ("PyObject_var", "SwigVar_PyObject"),
-        ("PyOper", "SwigPyOper"),
-        ("PySeq", "SwigPySeq"),
-        ("PySequence_ArrowProxy", "SwigPySequence_ArrowProxy"),
-        ("PySequence_Cont", "SwigPySequence_Cont"),
-        ("PySequence_InputIterator", "SwigPySequence_InputIterator"),
-        ("PySequence_Ref", "SwigPySequence_Ref"),
-        ("PySwigClientData", "SwigPyClientData"),
-        ("PySwigClientData_Del", "SwigPyClientData_Del"),
-        ("PySwigClientData_New", "SwigPyClientData_New"),
-        ("PySwigIterator", "SwigPyIterator"),
-        ("PySwigIteratorClosed_T", "SwigPyIteratorClosed_T"),
-        ("PySwigIteratorOpen_T", "SwigPyIteratorOpen_T"),
-        ("PySwigIterator_T", "SwigPyIterator_T"),
-        ("PySwigObject", "SwigPyObject"),
-        ("PySwigObject_Check", "SwigPyObject_Check"),
-        ("PySwigObject_GetDesc", "SwigPyObject_GetDesc"),
-        ("PySwigObject_New", "SwigPyObject_New"),
-        ("PySwigObject_acquire", "SwigPyObject_acquire"),
-        ("PySwigObject_append", "SwigPyObject_append"),
-        ("PySwigObject_as_number", "SwigPyObject_as_number"),
-        ("PySwigObject_compare", "SwigPyObject_compare"),
-        ("PySwigObject_dealloc", "SwigPyObject_dealloc"),
-        ("PySwigObject_disown", "SwigPyObject_disown"),
-        ("PySwigObject_format", "SwigPyObject_format"),
-        ("PySwigObject_getattr", "SwigPyObject_getattr"),
-        ("PySwigObject_hex", "SwigPyObject_hex"),
-        ("PySwigObject_long", "SwigPyObject_long"),
-        ("PySwigObject_next", "SwigPyObject_next"),
-        ("PySwigObject_oct", "SwigPyObject_oct"),
-        ("PySwigObject_own", "SwigPyObject_own"),
-        ("PySwigObject_print", "SwigPyObject_print"),
-        ("PySwigObject_repr", "SwigPyObject_repr"),
-        ("PySwigObject_richcompare", "SwigPyObject_richcompare"),
-        ("PySwigObject_str", "SwigPyObject_str"),
-        ("PySwigObject_type", "SwigPyObject_type"),
-        ("PySwigPacked", "SwigPyPacked"),
-        ("PySwigPacked_Check", "SwigPyPacked_Check"),
-        ("PySwigPacked_New", "SwigPyPacked_New"),
-        ("PySwigPacked_UnpackData", "SwigPyPacked_UnpackData"),
-        ("PySwigPacked_compare", "SwigPyPacked_compare"),
-        ("PySwigPacked_dealloc", "SwigPyPacked_dealloc"),
-        ("PySwigPacked_print", "SwigPyPacked_print"),
-        ("PySwigPacked_repr", "SwigPyPacked_repr"),
-        ("PySwigPacked_str", "SwigPyPacked_str"),
-        ("PySwigPacked_type", "SwigPyPacked_type"),
-        ("pyseq", "swigpyseq"),
-        ("pyswigobject_type", "swigpyobject_type"),
-        ("pyswigpacked_type", "swigpypacked_type"),
-    ]
-
-res = [(re.compile("\\b(%s)\\b"%oldname), newname) for oldname, newname in symbols]
-
-def patch_file(fn):
-    newf = []
-    changed = False
-    for line in open(fn):
-        for r, newname in res:
-            line, n = r.subn(newname, line)
-            if n>0:
-                changed = True
-        newf.append(line)
-
-    if changed:
-        copyfile(fn, fn+".bak")
-        f = open(fn, "w")
-        f.write("".join(newf))
-        f.close()
-    return changed
-
-def main(fns):
-    for fn in fns:
-        try:
-            if patch_file(fn):
-                print "Patched file", fn
-        except IOError:
-            print "Error occurred during patching", fn
-    return
-
-if __name__=="__main__":
-    if len(sys.argv) > 1:
-        main(sys.argv[1:])
-    else:
-        print "Patch your interface file for SWIG's Py* symbol name deprecation."
-        print "Usage:"
-        print "    %s files..."%sys.argv[0]
-
-        
diff --git a/dependencies2013/win32/swig/Tools/setup.py.tmpl b/dependencies2013/win32/swig/Tools/setup.py.tmpl
deleted file mode 100644
index 0bfcde2f..00000000
--- a/dependencies2013/win32/swig/Tools/setup.py.tmpl
+++ /dev/null
@@ -1,139 +0,0 @@
-#!@PYTHON@
-'''A setup.py script with better SWIG support.  To use it, either
-rename it to setup.py.in and have it pe processed by your configure
-script (you will need to define @PYTHON@), or replace the @*@ strings
-by hand.
-
-Copyright 2001,  Anthony Joseph Seward'''
-
-
-from distutils.core import setup, Extension
-
-###############################################################################
-##      Start of better Swig support
-###############################################################################
-from distutils.command.build_ext import build_ext
-import os
-import string
-class build_swig_ext(build_ext):
-    '''Better swig support for Distutils'''
-
-    ## __ Tell Distutils about the options
-    user_options = build_ext.user_options
-    boolean_options = build_ext.boolean_options
-
-    user_options.append(
-        ('swig-doc=', None,
-         'what type of documentation should SWIG produce (default: none)')
-        )
-    user_options.append(
-        ('swig-inc=', None,
-         'a list of directories to add to the SWIG include path'
-         +  "(separated by ':')(default: SWIG)")
-        )
-    user_options.append(
-        ('swig-shadow', None,
-         'have SWIG create shadow classes'
-         + ' (also adds docstrings to the shadow classes')
-        )
-
-    boolean_options.append('swig-shadow')
-
-    def initialize_options(self):
-        '''Initialize the new options after the inherited ones'''
-        build_ext.initialize_options(self)
-        self.swig_doc = 'none'
-        self.swig_inc = 'SWIG'
-        self.swig_shadow = None        
-    
-    def swig_sources(self, sources):
-        """Override the definition of 'swig_sources' in build_ext.  This
-        is essentially the same function but with better swig support.
-        I will now quote the original docstring:
-
-          Walk the list of source files in 'sources', looking for SWIG
-          interface (.i) files.  Run SWIG on all that are found, and
-          return a modified 'sources' list with SWIG source files replaced
-          by the generated C (or C++) files.
-        """
-
-        new_sources = []
-        swig_sources = []
-        swig_targets = {}
-
-        # XXX this drops generated C/C++ files into the source tree, which
-        # is fine for developers who want to distribute the generated
-        # source -- but there should be an option to put SWIG output in
-        # the temp dir.
-
-        if self.swig_cpp:
-            target_ext = '.cpp'
-        else:
-            target_ext = '.c'
-
-        for source in sources:
-            (base, ext) = os.path.splitext(source)
-            if ext == ".i":             # SWIG interface file
-                new_sources.append(base + target_ext)
-                swig_sources.append(source)
-                swig_targets[source] = new_sources[-1]
-            else:
-                new_sources.append(source)
-
-        if not swig_sources:
-            return new_sources
-
-        includes = self.swig_inc
-        if type(includes) is type(''):
-            includes = string.split(includes, ':')
-            includes = map(lambda x: '-I'+x, includes)
-            includes = string.join(includes)
-        
-        swig = self.find_swig()
-##        swig_cmd = [swig, "-python", "-d%s" % self.swig_doc,  includes]
-        swig_cmd = [swig, '-v', '-python', '-d%s' % self.swig_doc,  includes]
-        if self.swig_cpp:
-            swig_cmd.append('-c++')
-
-        if self.swig_shadow:
-            swig_cmd.append('-shadow')
-## swig1.1            swig_cmd.append('-docstring')
-
-        for source in swig_sources:
-            target = swig_targets[source]
-            self.announce('swigging %s to %s' % (source, target))
-            self.spawn(swig_cmd + ['-o', target, source])
-
-        return new_sources
-
-    # swig_sources ()
-###############################################################################
-##      End of improved swig support
-###############################################################################
-
-package = '@PACKAGE@'
-version = '@VERSION@'
-include_dirs = ['@top_srcdir@']
-lib_dirs = ['@top_srcdir@/@PACKAGE@']
-libraries = ['@PACKAGE@', 'stdc++']
-
-setup(name = package,
-      version = version,
-      description = '',
-      author = '',
-      author_email = '',
-      url = 'http://',
-
-      cmdclass = {'build_ext': build_swig_ext},
-      ext_modules = [Extension(package+'cmodule',
-                               [package+'.i'],
-                               include_dirs=include_dirs,
-                               library_dirs=lib_dirs,
-                               libraries=libraries,
-                               )],
-      options = {'build_ext':
-                 {'swig_doc': 'html',
-                  'swig_cpp': not None,
-                  'swig_shadow': not None}
-                 }
-      )
diff --git a/dependencies2013/win32/swig/Tools/swig.gdb b/dependencies2013/win32/swig/Tools/swig.gdb
deleted file mode 100644
index 61872c5d..00000000
--- a/dependencies2013/win32/swig/Tools/swig.gdb
+++ /dev/null
@@ -1,41 +0,0 @@
-# User-defined commands for easier debugging of SWIG in gdb
-#
-# This file can be "included" into your main .gdbinit file using:
-# source swig.gdb
-# or otherwise paste the contents into .gdbinit
-#
-# Note all user defined commands can be seen using:
-# (gdb) show user
-# The documentation for each command can be easily viewed, for example:
-# (gdb) help swigprint
-
-define swigprint
-    if ($argc == 2)
-        set $expand_count = $arg1
-    else
-        set $expand_count = -1
-    end
-    Printf "%s\n", Swig_to_string($arg0, $expand_count)
-end
-document swigprint
-Displays any SWIG DOH object
-Usage: swigprint swigobject [hashexpandcount]
-  swigobject      - The object to display.
-  hashexpandcount - Number of nested Hash types to expand (default is 1). See Swig_set_max_hash_expand() to change default.
-end
-
-
-define locswigprint
-    if ($argc == 2)
-        set $expand_count = $arg1
-    else
-        set $expand_count = -1
-    end
-    Printf "%s\n", Swig_to_string_with_location($arg0, $expand_count)
-end
-document locswigprint
-Displays any SWIG DOH object prefixed with file and line location
-Usage: locswigprint swigobject [hashexpandcount]
-  swigobject      - The object to display.
-  hashexpandcount - Number of nested Hash types to expand (default is 1). See Swig_set_max_hash_expand() to change default.
-end
diff --git a/dependencies2013/win32/swig/Tools/testflags.py b/dependencies2013/win32/swig/Tools/testflags.py
deleted file mode 100644
index 564bc91e..00000000
--- a/dependencies2013/win32/swig/Tools/testflags.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env python
-
-def get_cflags(language, std, compiler):
-    if std == None or len(std) == 0:
-        std = "gnu89"
-    c_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wdeclaration-after-statement -Wmissing-field-initializers"
-    cflags = {
-        "csharp":"-Werror " + c_common,
-             "d":"-Werror " + c_common,
-            "go":"-Werror " + c_common + " -Wno-declaration-after-statement",
-         "guile":"-Werror " + c_common,
-          "java":"-Werror " + c_common,
-    "javascript":"-Werror " + c_common,
-           "lua":"-Werror " + c_common,
-        "octave":"-Werror " + c_common,
-         "perl5":"-Werror " + c_common,
-           "php":"-Werror " + c_common,
-          "php5":"-Werror " + c_common,
-        "python":"-Werror " + c_common,
-             "r":"-Werror " + c_common,
-          "ruby":"-Werror " + c_common,
-        "scilab":"-Werror " + c_common,
-           "tcl":"-Werror " + c_common,
-    }
-    if compiler == 'clang':
-        cflags["guile"] += " -Wno-attributes" # -Wno-attributes is for clang LLVM 3.5 and bdw-gc < 7.5 used by guile
-
-    if language not in cflags:
-        raise RuntimeError("{} is not a supported language".format(language))
-
-    return cflags[language]
-
-def get_cxxflags(language, std, compiler):
-    if std == None or len(std) == 0:
-        std = "c++98"
-    cxx_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wmissing-field-initializers"
-    cxxflags = {
-        "csharp":"-Werror " + cxx_common,
-             "d":"-Werror " + cxx_common,
-            "go":"-Werror " + cxx_common,
-         "guile":"-Werror " + cxx_common,
-          "java":"-Werror " + cxx_common,
-    "javascript":"-Werror " + cxx_common + " -Wno-error=unused-function", # Until overload_rename is fixed for node
-           "lua":"-Werror " + cxx_common,
-        "octave":"-Werror " + cxx_common,
-         "perl5":"-Werror " + cxx_common,
-           "php":"-Werror " + cxx_common,
-          "php5":"-Werror " + cxx_common,
-        "python":"-Werror " + cxx_common,
-             "r":"-Werror " + cxx_common,
-          "ruby":"-Werror " + cxx_common,
-        "scilab":"-Werror " + cxx_common,
-           "tcl":"-Werror " + cxx_common,
-    }
-    if compiler == 'clang':
-        cxxflags["guile"] += " -Wno-attributes" # -Wno-attributes is for clang LLVM 3.5 and bdw-gc < 7.5 used by guile
-
-    if language not in cxxflags:
-        raise RuntimeError("{} is not a supported language".format(language))
-
-    return cxxflags[language]
-
-import argparse
-parser = argparse.ArgumentParser(description="Display CFLAGS or CXXFLAGS to use for testing the SWIG examples and test-suite.")
-parser.add_argument('-l', '--language', required=True, help='set language to show flags for')
-flags = parser.add_mutually_exclusive_group(required=True)
-flags.add_argument('-c', '--cflags', action='store_true', default=False, help='show CFLAGS')
-flags.add_argument('-x', '--cxxflags', action='store_true', default=False, help='show CXXFLAGS')
-parser.add_argument('-s', '--std', required=False, help='language standard flags for the -std= option')
-parser.add_argument('-C', '--compiler', required=False, help='compiler used (clang or gcc)')
-args = parser.parse_args()
-
-if args.cflags:
-    get_flags = get_cflags
-elif args.cxxflags:
-    get_flags = get_cxxflags
-else:
-    parser.print_help()
-    exit(1)
-
-print(get_flags(args.language, args.std, args.compiler))
diff --git a/dependencies2013/win32/swig/Tools/travis-linux-install.sh b/dependencies2013/win32/swig/Tools/travis-linux-install.sh
deleted file mode 100644
index 2510a791..00000000
--- a/dependencies2013/win32/swig/Tools/travis-linux-install.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-set -e # exit on failure (same as -o errexit)
-
-lsb_release -a
-sudo apt-get -qq update
-
-if [[ "$CC" == gcc-5 ]]; then
-	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-	sudo apt-get -qq update
-	sudo apt-get install -qq g++-5
-elif [[ "$CC" == gcc-6 ]]; then
-	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-	sudo apt-get -qq update
-	sudo apt-get install -qq g++-6
-fi
-
-sudo apt-get -qq install libboost-dev
-
-WITHLANG=$SWIGLANG
-
-case "$SWIGLANG" in
-	"")     ;;
-	"csharp")
-		sudo apt-get -qq install mono-devel
-		;;
-	"d")
-		wget http://downloads.dlang.org/releases/2014/dmd_2.066.0-0_amd64.deb
-		sudo dpkg -i dmd_2.066.0-0_amd64.deb
-		;;
-	"go")
-		;;
-	"javascript")
-		case "$ENGINE" in
-			"node")
-				sudo add-apt-repository -y ppa:chris-lea/node.js
-				sudo apt-get -qq update
-				sudo apt-get install -qq nodejs rlwrap
-				sudo npm install -g node-gyp
-				;;
-			"jsc")
-				sudo apt-get install -qq libwebkitgtk-dev
-				;;
-			"v8")
-				sudo apt-get install -qq libv8-dev
-				;;
-		esac
-		;;
-	"guile")
-		sudo apt-get -qq install guile-2.0-dev
-		;;
-	"lua")
-		if [[ -z "$VER" ]]; then
-			sudo apt-get -qq install lua5.2 liblua5.2-dev
-		else
-			sudo add-apt-repository -y ppa:ubuntu-cloud-archive/mitaka-staging
-			sudo apt-get -qq update
-			sudo apt-get -qq install lua${VER} liblua${VER}-dev
-		fi
-		;;
-	"ocaml")
-		# configure also looks for ocamldlgen, but this isn't packaged.  But it isn't used by default so this doesn't matter.
-		sudo apt-get -qq install ocaml ocaml-findlib
-		;;
-	"octave")
-		if [[ -z "$VER" ]]; then
-			sudo apt-get -qq install liboctave-dev
-		else
-			sudo add-apt-repository -y ppa:kwwette/octaves
-			sudo apt-get -qq update
-			sudo apt-get -qq install liboctave${VER}-dev
-		fi
-		;;
-	"php5")
-		sudo apt-get -qq install php5-cli php5-dev
-		;;
-	"php")
-		sudo add-apt-repository -y ppa:ondrej/php
-		sudo apt-get -qq update
-		sudo apt-get -qq install php$VER-cli php$VER-dev
-		;;
-	"python")
-		pip install pep8
-		if [[ "$PY3" ]]; then
-			sudo apt-get install -qq python3-dev
-		fi
-		WITHLANG=$SWIGLANG$PY3
-		if [[ "$VER" ]]; then
-			sudo add-apt-repository -y ppa:fkrull/deadsnakes
-			sudo apt-get -qq update
-			sudo apt-get -qq install python${VER}-dev
-			WITHLANG=$SWIGLANG$PY3=$SWIGLANG$VER
-		fi
-		;;
-	"r")
-		sudo apt-get -qq install r-base
-		;;
-	"ruby")
-		if [[ "$VER" ]]; then
-			rvm install $VER
-		fi
-		;;
-	"scilab")
-		sudo apt-get -qq install scilab
-		;;
-	"tcl")
-		sudo apt-get -qq install tcl-dev
-		;;
-esac
-
-set +e # turn off exit on failure (same as +o errexit)
diff --git a/dependencies2013/win32/swig/Tools/travis-osx-install.sh b/dependencies2013/win32/swig/Tools/travis-osx-install.sh
deleted file mode 100644
index 85183722..00000000
--- a/dependencies2013/win32/swig/Tools/travis-osx-install.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e # exit on failure (same as -o errexit)
-
-sw_vers
-brew update
-brew list
-# brew install pcre # Travis Xcode-7.3 has pcre
-# brew install boost
-
-WITHLANG=$SWIGLANG
-
-case "$SWIGLANG" in
-	"csharp")
-		brew install mono
-		;;
-	"guile")
-		Tools/brew-install guile
-		;;
-	"lua")
-		brew install lua
-		;;
-	"python")
-		WITHLANG=$SWIGLANG$PY3
-		if [[ "$PY3" ]]; then
-			brew install python3
-			brew list -v python3
-		fi
-		;;
-esac
-
-# Workaround for https://github.com/travis-ci/travis-ci/issues/6522
-set +e # turn off exit on failure (same as +o errexit)
diff --git a/dependencies2013/win32/swig/Tools/vcfilter b/dependencies2013/win32/swig/Tools/vcfilter
deleted file mode 100644
index 05daefd8..00000000
--- a/dependencies2013/win32/swig/Tools/vcfilter
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# This is a simple utility for Cygwin/Mingw which is useful when running the SWIG
-# test-suite through Visual Studio. If the output from the test-suite is piped
-# through this utility, it will filter the junk that the compiler outputs to stdout.
-# Typical usage: make check | vcfilter
-
-# dos2unix needed for ^ and $ to work.
-2>&1 dos2unix | grep -v -e "\.cxx$" -e "\.c$" -e "^   Creating library" -e "^Generating Code"
-
diff --git a/dependencies2013/win32/swig/Win/README.txt b/dependencies2013/win32/swig/Win/README.txt
deleted file mode 100644
index 4bdb9e1d..00000000
--- a/dependencies2013/win32/swig/Win/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Please see the Doc/Manual/Windows.html file in the main manual for instructions for using and installing SWIG on Windows including running the examples.
diff --git a/dependencies2013/win32/swig/aclocal.m4 b/dependencies2013/win32/swig/aclocal.m4
deleted file mode 100644
index 49ef37dc..00000000
--- a/dependencies2013/win32/swig/aclocal.m4
+++ /dev/null
@@ -1,1158 +0,0 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-
-# This file 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.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-#
-# This file 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 macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([Tools/config/ac_compile_warnings.m4])
-m4_include([Tools/config/ac_define_dir.m4])
-m4_include([Tools/config/ax_boost_base.m4])
-m4_include([Tools/config/ax_compare_version.m4])
-m4_include([Tools/config/ax_cxx_compile_stdcxx_11.m4])
-m4_include([Tools/config/ax_path_generic.m4])
diff --git a/dependencies2013/win32/swig/appveyor.yml b/dependencies2013/win32/swig/appveyor.yml
deleted file mode 100644
index d7be4a3d..00000000
--- a/dependencies2013/win32/swig/appveyor.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-platform:
-- x86
-- x64
-
-environment:
-  matrix:
-  - SWIGLANG: csharp
-    VSVER: 12
-  - SWIGLANG: csharp
-    VSVER: 14
-  - SWIGLANG: java
-    VSVER: 14
-  - SWIGLANG: python
-    VSVER: 14
-    VER: 27
-  - SWIGLANG: python
-    VSVER: 14
-    VER: 35
-    PY3: 1
-
-install:
-- date /T & time /T
-- set PATH=C:\cygwin\bin;%PATH%
-- set CYGWIN=nodosfilewarning
-- git clone -q --depth=1 --single-branch --branch cccl-1.0 git://github.com/swig/cccl.git C:\cccl-1.0
-- bash -c "cp C:/cccl-1.0/cccl /usr/bin"
-- ps: >-
-    If ($env:Platform -Match "x86") {
-      $env:PCRE_PLATFORM="Win32"
-      $env:JAVA_HOME="C:/Program Files (x86)/Java/jdk1.8.0"
-      $env:VCVARS_PLATFORM="x86"
-      $env:LANG_PLATFORM=""
-    } Else {
-      $env:PCRE_PLATFORM="x64"
-      $env:JAVA_HOME="C:/Program Files/Java/jdk1.8.0"
-      $env:VCVARS_PLATFORM="amd64"
-      $env:LANG_PLATFORM="-x64"
-    }
-- ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
-- echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%"
-- call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
-- Tools\nuget-install.cmd pcre -Verbosity detailed -Version 8.33.0.1 -OutputDirectory C:\pcre
-- set PCRE_ROOT=C:/pcre/pcre.8.33.0.1/build/native
-- set PATH=C:\Python%VER%%LANG_PLATFORM%;%PATH%
-- python -V
-- bash -c "which python"
-- bash -c "python -V"
-- bash -c "which cl.exe"
-- bash -c "cl.exe /? 2>&1 | head -n 2"
-- bash -c "which csc.exe"
-- bash -c "csc.exe /? | head -n 2"
-- bash -c "which cccl"
-- bash -c "cccl --version"
-- make --version
-- uname -a
-
-build_script:
-- set CCCL_OPTIONS=--cccl-muffle /W3
-- set CHECK_OPTIONS=CSHARPOPTIONS=-platform:%Platform%
-  # Open dummy file descriptor to fix error on cygwin: ./configure: line 560: 0: Bad file descriptor
-- bash -c "exec 0</dev/null && ./autogen.sh && time ./configure --disable-dependency-tracking --disable-ccache CC=cccl CXX=cccl CFLAGS='-O2' CXXFLAGS='-O2' LDFLAGS='--cccl-link /LTCG' PCRE_CFLAGS='-I%PCRE_ROOT%/include -DPCRE_STATIC' PCRE_LIBS='-L%PCRE_ROOT%/lib/v110/%PCRE_PLATFORM%/Release/static/utf8 -lpcre8' --without-perl5 --without-go --with-boost=C:/Libraries/boost || cat config.log"
-- bash -c "time make -s"
-
-test_script:
-- set CCCL_OPTIONS=--cccl-muffle /W3 /EHsc
-# (Warning below is fixed in newer versions of Python (2.7.9)) '_hypot' : recursive on all control paths, function will cause runtime stack overflow
-- ps: >-
-    If ("$env:SWIGLANG$env:VER" -Match "python27") {
-      $env:CCCL_OPTIONS="$env:CCCL_OPTIONS /wd4717"
-    }
-- .\swig.exe -version
-- bash -c "file ./swig.exe"
-- bash -c "time make -k check-%SWIGLANG%-version"
-- bash -c "time make -k check-%SWIGLANG%-examples %CHECK_OPTIONS%"
-- bash -c "time make -k check-%SWIGLANG%-test-suite %CHECK_OPTIONS%"
-
-# Do not build on tags (GitHub only)
-skip_tags: true
diff --git a/dependencies2013/win32/swig/autogen.sh b/dependencies2013/win32/swig/autogen.sh
deleted file mode 100644
index 97916d9f..00000000
--- a/dependencies2013/win32/swig/autogen.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-# Bootstrap the development environment - add extra files needed to run configure. 
-# Note autoreconf should do what this file achieves, but it has a bug when working with automake!
-# The latest config.guess and config.sub should be copied into Tools/config.
-# This script will ensure the latest is copied from your autotool installation.
-
-set -e
-set -x
-test -d Tools/config || mkdir Tools/config
-${ACLOCAL-aclocal} -I Tools/config
-${AUTOHEADER-autoheader}
-${AUTOMAKE-automake} --add-missing --copy --force-missing
-${AUTOCONF-autoconf}
-cd CCache && ${AUTORECONF-autoreconf}
diff --git a/dependencies2013/win32/swig/configure.ac b/dependencies2013/win32/swig/configure.ac
deleted file mode 100644
index 4e8abde5..00000000
--- a/dependencies2013/win32/swig/configure.ac
+++ /dev/null
@@ -1,3139 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl The macros which aren't shipped with the autotools are stored in the
-dnl Tools/config directory in .m4 files.
-
-AC_INIT([swig],[3.0.12],[http://www.swig.org])
-
-dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED
-dnl     definition below can be removed
-AC_PREREQ(2.58)
-
-AC_CONFIG_SRCDIR([Source/Swig/swig.h])
-AC_CONFIG_AUX_DIR([Tools/config])
-AC_CONFIG_HEADERS([Source/Include/swigconfig.h])
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE
-
-dnl Some extra defines for the config file
-AH_BOTTOM([
-/* Default language */
-#define SWIG_LANG               "-tcl"
-
-/* Deal with attempt by Microsoft to deprecate C standard runtime functions */
-#if defined(_MSC_VER)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-])
-
-dnl Check for programs that a user requires to build SWIG
-AC_PROG_CC
-AC_PROG_CXX
-AC_EXEEXT
-AC_OBJEXT
-AM_PROG_CC_C_O  # Needed for subdir-objects in AUTOMAKE_OPTIONS
-
-AC_COMPILE_WARNINGS # Increase warning levels
-
-AC_DEFINE_UNQUOTED(SWIG_CXX, ["$CXX"], [Compiler that built SWIG])
-AC_DEFINE_UNQUOTED(SWIG_PLATFORM, ["$host"], [Platform that SWIG is built for])
-
-dnl Checks for header files.
-AC_HEADER_STDC
-
-dnl Look for popen
-AC_ARG_WITH(popen, AS_HELP_STRING([--without-popen], [Disable popen]), with_popen="$withval")
-if test x"${with_popen}" = xno ; then
-AC_MSG_NOTICE([Disabling popen])
-else
-AC_CHECK_FUNC(popen, AC_DEFINE(HAVE_POPEN, 1, [Define if popen is available]), AC_MSG_NOTICE([Disabling popen]))
-fi
-
-dnl PCRE
-
-dnl AX_PATH_GENERIC() relies on AC_PROG_SED() but it is defined only in
-dnl autoconf 2.60 so trivially predefine it ourselves for the older versions
-m4_ifdef([AC_PROG_SED],, [AC_DEFUN([AC_PROG_SED], [AC_PATH_PROG([SED], sed)])])
-
-AC_ARG_WITH([pcre],
-  [AS_HELP_STRING([--without-pcre],
-                  [Disable support for regular expressions using PCRE])],
-  [],
-  [with_pcre=yes])
-
-AC_MSG_CHECKING([whether to enable PCRE support])
-AC_MSG_RESULT([$with_pcre])
-
-dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
-if test x"${with_pcre}" = xyes ; then
-  AC_MSG_CHECKING([whether to use local PCRE])
-  local_pcre_config=no
-  if test -z $PCRE_CONFIG; then
-    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
-      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
-      local_pcre_config=$PCRE_CONFIG
-    fi
-  fi
-  AC_MSG_RESULT([$local_pcre_config])
-fi
-AS_IF([test "x$with_pcre" != xno],
-  [AX_PATH_GENERIC([pcre],
-    [], dnl Minimal version of PCRE we need -- accept any
-    [], dnl custom sed script for version parsing is not needed
-    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
-     LIBS="$LIBS $PCRE_LIBS"
-     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
-    ],
-    [AC_MSG_FAILURE([
-        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
-        library package. This dependency is needed for configure to complete,
-        Either:
-        - Install the PCRE developer package on your system (preferred approach).
-        - Download the PCRE source tarball, build and install on your system
-          as you would for any package built from source distribution.
-        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
-          link against. Run 'Tools/pcre-build.sh --help' for instructions.
-          (quite easy and does not require privileges to install PCRE on your system)
-        - Use configure --without-pcre to disable regular expressions support in SWIG
-          (not recommended).])
-    ])
-  ])
-
-
-dnl CCache
-AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes])
-AC_MSG_CHECKING([whether to enable ccache-swig])
-AC_MSG_RESULT([$enable_ccache])
-
-if test "$enable_ccache" = yes; then
-  AC_CONFIG_SUBDIRS(CCache)
-  ENABLE_CCACHE=1
-fi
-AC_SUBST(ENABLE_CCACHE)
-
-
-echo ""
-echo "Checking packages required for SWIG developers."
-echo "Note : None of the following packages are required for users to compile and install SWIG from the distributed tarball"
-echo ""
-
-AC_PROG_YACC
-
-echo ""
-echo "Checking for installed target languages and other information in order to compile and run"
-echo "the examples and test-suite invoked by 'make check'."
-echo "Note : None of the following packages are required for users to compile and install SWIG from the distributed tarball"
-echo ""
-
-dnl Some test cases require Boost
-AX_BOOST_BASE(,,,)
-AC_SUBST(BOOST_CPPFLAGS)
-
-dnl How to specify include directories that may be system directories.
-# -I should not be used on system directories (GCC)
-if test "$GCC" = yes; then
-    ISYSTEM="-isystem "
-else
-    ISYSTEM="-I"
-fi
-AC_MSG_NOTICE(ISYSTEM: $ISYSTEM)
-
-dnl Info for building shared libraries ... in order to run the examples
-
-# SO is the extension of shared libraries (including the dot!)
-AC_MSG_CHECKING(SO)
-if test -z "$SO"
-then
-	case $host in
-	*-*-hp*) SO=.sl;;
-	*-*-darwin*) SO=.bundle;;
-	*-*-cygwin* | *-*-mingw*) SO=.dll;;
-	*) SO=.so;;
-	esac
-fi
-AC_MSG_RESULT($SO)
-
-# LDSHARED is the ld *command* used to create shared library
-# -- "ld" on SunOS 4.x.x, "ld -G" on SunOS 5.x, "ld -shared" on IRIX 5
-# (Shared libraries in this instance are shared modules to be loaded into
-# Python, as opposed to building Python itself as a shared library.)
-AC_MSG_CHECKING(LDSHARED)
-if test -z "$LDSHARED"
-then
-	case $host in
-	*-*-aix*) LDSHARED="\$(srcdir)/ld_so_aix \$(CC)";;
-	*-*-cygwin* | *-*-mingw*)
-            if test "$GCC" = yes; then
-                LDSHARED="$CC -shared"
-            else
-                if test "cl" = $CC ;  then
-                    # Microsoft Visual C++ (MSVC)
-                    LDSHARED="$CC -nologo -LD"
-                else
-                    # Unknown compiler try gcc approach
-                    LDSHARED="$CC -shared"
-                fi
-            fi ;;
-	*-*-irix5*) LDSHARED="ld -shared";;
-	*-*-irix6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
-	*-*-sunos4*) LDSHARED="ld";;
-	*-*-solaris*) LDSHARED="ld -G";;
-	*-*-hp*) LDSHARED="ld -b";;
-	*-*-osf*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
-	*-sequent-sysv4) LDSHARED="ld -G";;
-	*-*-next*)
-		if test "$ns_dyld"
-		then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
-		else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r'
-		fi
-                if test "$with_next_framework" ; then
-		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
-		fi ;;
-	*-*-linux*) LDSHARED="gcc -shared";;
-	*-*-dgux*) LDSHARED="ld -G";;
-	*-*-freebsd3*) LDSHARED="gcc -shared";;
-	*-*-freebsd* | *-*-openbsd*) LDSHARED="ld -Bshareable";;
-	*-*-netbsd*)
-		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
-		then
-			LDSHARED="cc -shared"
-		else
-			LDSHARED="ld -Bshareable"
-		fi;;
-	*-sco-sysv*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
-	*-*-darwin*) LDSHARED="cc -bundle -undefined suppress -flat_namespace";;
-	*)	LDSHARED="ld";;
-	esac
-fi
-AC_MSG_RESULT($LDSHARED)
-# CXXSHARED is the ld *command* used to create C++ shared library
-# -- "ld" on SunOS 4.x.x, "ld -G" on SunOS 5.x, "ld -shared" on IRIX 5
-# (Shared libraries in this instance are shared modules to be loaded into
-# Python, as opposed to building Python itself as a shared library.)
-AC_MSG_CHECKING(CXXSHARED)
-if test -z "$CXXSHARED"
-then
-	CXXSHARED="$LDSHARED"
-fi
-AC_MSG_RESULT($CXXSHARED)
-
-#
-AC_MSG_CHECKING(TRYLINKINGWITHCXX)
-if test -z "$TRYLINKINGWITHCXX"
-then
-	case $host in
-	*-*-solaris*) if test "$GCC" = yes
-             then TRYLINKINGWITHCXX="CXXSHARED= $CXX -Wl,-G"
-             else TRYLINKINGWITHCXX="CXXSHARED= $CXX -G -L/opt/SUNWspro/lib -lCrun -lCstd"
-             fi;;
-        *-*-hp*) TRYLINKINGWITHCXX="CXXSHARED= $CXX +z ";;
-        *-*-darwin*) TRYLINKINGWITHCXX="CXXSHARED= $CXX -bundle -undefined suppress -flat_namespace";;
-        *-*-cygwin* | *-*-mingw*)
-            if test "$GCC" = yes; then
-                TRYLINKINGWITHCXX="CXXSHARED= $CXX -shared "
-            else
-                if test "cl" = $CXX ;  then
-                    # Microsoft Visual C++ (MSVC)
-                    TRYLINKINGWITHCXX="CXXSHARED= $CXX -nologo -LD"
-                else
-                    TRYLINKINGWITHCXX="#unknown Windows compiler"
-                fi
-            fi ;;
-        *)       TRYLINKINGWITHCXX="CXXSHARED= $CXX -shared ";;
-        esac
-fi
-AC_MSG_RESULT($TRYLINKINGWITHCXX)
-# CCSHARED are the C *flags* used to create objects to go into a shared
-# library (module) -- this is only needed for a few systems
-AC_MSG_CHECKING(CCSHARED)
-if test -z "$CCSHARED"
-then
-	case $host in
-	*-*-hp*) if test "$GCC" = yes
-		 then CCSHARED="-fpic"
-		 else CCSHARED="+z"
-		 fi;;
-	s390x*-*-*) CCSHARED="-fpic" ;;
-	s390*-*-*) CCSHARED="-fPIC" ;;
-	*-*-linux*) CCSHARED="-fpic";;
-	*-*-freebsd* | *-*-openbsd*) CCSHARED="-fpic";;
-	*-*-netbsd*) CCSHARED="-fPIC";;
-	*-sco-sysv*) CCSHARED="-KPIC -dy -Bdynamic";;
-	*-*-irix6*)  case $CC in
-		   *gcc*) CCSHARED="-shared";;
-		   *) CCSHARED="";;
-		   esac;;
-	esac
-fi
-AC_MSG_RESULT($CCSHARED)
-
-# RPATH is the path used to look for shared library files.
-AC_MSG_CHECKING(RPATH)
-if test -z "$RPATH"
-then
-	case $host in
-	*-*-solaris*) RPATH='-R. -R$(exec_prefix)/lib';;
-        *-*-irix*) RPATH='-rpath .:$(exec_prefix)/lib';;
-	*-*-linux*) RPATH='-Xlinker -rpath $(exec_prefix)/lib -Xlinker -rpath .';;
-	*)	RPATH='';;
-	esac
-fi
-AC_MSG_RESULT($RPATH)
-
-# LINKFORSHARED are the flags passed to the $(CC) command that links
-# the a few executables -- this is only needed for a few systems
-
-AC_MSG_CHECKING(LINKFORSHARED)
-if test -z "$LINKFORSHARED"
-then
-	case $host in
-	*-*-aix*)	LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
-	*-*-hp*)
-	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
-	*-*-linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
-	*-*-next*) LINKFORSHARED="-u libsys_s";;
-	*-sco-sysv*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
-	*-*-irix6*) LINKFORSHARED="-all";;
-	esac
-fi
-AC_MSG_RESULT($LINKFORSHARED)
-
-# Optional CFLAGS used to silence/enhance compiler warnings on some platforms.
-AC_MSG_CHECKING(PLATCFLAGS)
-case $host in
-  *-*-solaris*) if test "$GCC" = yes
-    then PLATCFLAGS=
-    else PLATCFLAGS=
-      #    else PLATCFLAGS="-errtags=yes" # Need more work as C examples use ld for linking
-    fi;;
-  *) PLATCFLAGS=
-esac
-AC_MSG_RESULT($PLATCFLAGS)
-
-# Add switch if necessary to enable C++11 support - just for tests
-AC_ARG_ENABLE([cpp11-testing], AS_HELP_STRING([--enable-cpp11-testing], [enable C++11 testing if supported by compiler (default disabled)]), [enable_cpp11_testing=$enableval], [enable_cpp11_testing=no])
-AC_MSG_CHECKING([whether to enable C++11 testing])
-AC_MSG_RESULT([$enable_cpp11_testing])
-
-PLATCXXFLAGS="$PLATCFLAGS"
-if test x"$enable_cpp11_testing" = xyes; then
-  AC_LANG_PUSH([C++])
-  CXXFLAGS_SAVED=$CXXFLAGS
-  CXXFLAGS=
-  AX_CXX_COMPILE_STDCXX_11([noext], [nostop])
-  CXXFLAGS=$CXXFLAGS_SAVED
-  AC_LANG_POP([C++])
-  if test x"$CXX11FLAGS" != x; then
-    PLATCXXFLAGS="$CXX11FLAGS $PLATCXXFLAGS"
-  fi
-  AC_MSG_CHECKING([for C++11 enabled compiler])
-  if test x"$HAVE_CXX11_COMPILER" = x; then
-    AC_MSG_RESULT([no])
-  else
-    AC_MSG_RESULT([$HAVE_CXX11_COMPILER])
-  fi
-fi
-
-# On darwin 10.7,10.8,10.9 using clang++, need to ensure using
-# libc++ for tests and examples to run under mono. May affect
-# other language targets as well - problem is a Mac OS X incompatibility
-# between libraries depending on libstdc++ and libc++.
-CLANGXX=
-$CXX -v 2>&1 | grep -i clang >/dev/null && CLANGXX=yes
-case $host in
-  *-*-darwin11* | *-*-darwin12* |*-*-darwin13*  ) if test "$CLANGXX" = "yes";
-    then PLATCXXFLAGS="$PLATCXXFLAGS -stdlib=libc++"
-    fi;;
-  *) ;;
-esac
-
-# Set info about shared libraries.
-AC_SUBST(SO)
-AC_SUBST(LDSHARED)
-AC_SUBST(CCSHARED)
-AC_SUBST(CXXSHARED)
-AC_SUBST(TRYLINKINGWITHCXX)
-AC_SUBST(RPATH)
-AC_SUBST(PLATCFLAGS)
-AC_SUBST(PLATCXXFLAGS)
-AC_SUBST(HAVE_CXX11_COMPILER)
-AC_SUBST(LINKFORSHARED)
-
-# This variation is needed on OS-X because there is no (apparent) consistency in shared library naming.
-# Sometimes .bundle works, but sometimes .so is needed.  It depends on the target language
-
-AC_SUBST(PYTHON_SO)
-case $host in
-   *-*-mingw*) PYTHON_SO=.pyd;;
-   *-*-darwin*) PYTHON_SO=.so;;
-   *) PYTHON_SO=$SO;;
-esac
-
-AC_SUBST(TCL_SO)
-case $host in
-   *-*-darwin*) TCL_SO=.dylib;;
-   *) TCL_SO=$SO;;
-esac
-
-AC_SUBST(GUILE_SO)
-case $host in
-   *-*-darwin*) GUILE_SO=.so;;
-   *) GUILE_SO=$SO;;
-esac
-
-AC_SUBST(PHP_SO)
-case $host in
-   *-*-darwin*) PHP_SO=.so;;
-   *) PHP_SO=$SO;;
-esac
-
-AC_SUBST(PHP5_SO)
-PHP5_SO=$PHP_SO
-
-AC_SUBST(MZSCHEME_SO)
-case $host in
-   *) MZSCHEME_SO=.so;;
-esac
-
-AC_SUBST(LUA_SO)
-case $host in
-   *-*-darwin*) LUA_SO=.so;;
-   *) LUA_SO=$SO;;
-esac
-
-# Check for specific libraries.   Used for SWIG examples
-AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
-AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
-
-dnl The following three libraries (nsl,inet,socket) are needed on Sequent,
-dnl and must be checked for in this order since each library depends on the
-dnl preceding one.
-dnl
-dnl Most SVR4 platforms will need -lsocket and -lnsl.  However on SGI IRIX 5,
-dnl these exist but are broken, so we use AC_SEARCH_LIBS which will only try
-dnl the library if the function isn't already available without it.
-AC_SEARCH_LIBS(t_open, nsl) # SVR4
-AC_SEARCH_LIBS(gethostbyname, inet) # Sequent
-AC_SEARCH_LIBS(socket, socket) # SVR4 sockets
-
-AC_CHECK_LIB(swill, swill_init, [SWIGLIBS="-lswill $LIBS" SWILL="-DSWIG_SWILL"])
-AC_SUBST(SWIGLIBS)
-AC_SUBST(SWILL)
-
-# check for --with-libm=...
-AC_SUBST(LIBM)
-LIBM=-lm
-AC_ARG_WITH(libm, [  --with-libm=STRING      math library], [
-if test "$withval" != yes
-then LIBM=$withval
-else AC_MSG_ERROR([proper usage is --with-libm=STRING])
-fi])
-AC_CHECK_LIB(ieee, main, [LIBM="-lieee $LIBM"])
-AC_CHECK_LIB(crypt,crypt, [LIBCRYPT="-lcrypt"])
-AC_SUBST(LIBCRYPT)
-
-# check for --with-libc=...
-AC_SUBST(LIBC)
-AC_ARG_WITH(libc, [  --with-libc=STRING      C library], [
-if test "$withval" != yes
-then LIBC=$withval
-else AC_MSG_ERROR([proper usage is --with-libc=STRING])
-fi])
-
-#--------------------------------------------------------------------
-# Target languages
-#--------------------------------------------------------------------
-
-AC_ARG_WITH(alllang, AS_HELP_STRING([--without-alllang], [Disable all languages]), with_alllang="$withval")
-
-if test "$with_alllang" = "no"; then
-  alllang_default=no
-else
-  alllang_default=yes
-fi
-
-AC_CHECK_PROGS(PKGCONFIG, [pkg-config])
-
-#--------------------------------------------------------------------
-# Look for Tcl
-#--------------------------------------------------------------------
-
-TCLINCLUDE=
-TCLLIB=
-TCLPACKAGE=
-
-AC_ARG_WITH(tclconfig, AS_HELP_STRING([--without-tcl], [Disable Tcl])
-AS_HELP_STRING([--with-tclconfig=path], [Set location of tclConfig.sh]), [with_tclconfig="$withval"], [with_tclconfig=])
-AC_ARG_WITH(tcl,
- [  --with-tcl=path         Set location of Tcl package],[
-	TCLPACKAGE="$withval"], [TCLPACKAGE="$alllang_default"])
-AC_ARG_WITH(tclincl,[  --with-tclincl=path     Set location of Tcl include directory],[
-	TCLINCLUDE="$ISYSTEM$withval"], [TCLINCLUDE=])
-AC_ARG_WITH(tcllib,[  --with-tcllib=path      Set location of Tcl library directory],[
-	TCLLIB="-L$withval"], [TCLLIB=])
-
-# First, check for "--without-tcl" or "--with-tcl=no".
-if test x"${TCLPACKAGE}" = xno; then
-AC_MSG_NOTICE([Disabling Tcl])
-else
-AC_MSG_CHECKING([for Tcl configuration])
-# First check to see if --with-tclconfig was specified.
-if test x"${with_tclconfig}" != x ; then
-   if test -f "${with_tclconfig}/tclConfig.sh" ; then
-      TCLCONFIG=`(cd ${with_tclconfig}; pwd)`
-   else
-      AC_MSG_ERROR([${with_tcl} directory does not contain tclConfig.sh])
-   fi
-fi
-# check in a few common install locations
-if test x"${TCLCONFIG}" = x ; then
-    for i in `ls -d -r /usr/lib*/ 2>/dev/null` \
-	     `ls -d -r /usr/lib*/tcl*/ 2>/dev/null` \
-	     `ls -d -r /usr/local/lib*/ 2>/dev/null` \
-	     `ls -d -r /usr/local/lib*/tcl*/ 2>/dev/null` ; do
-	if test -f $i"tclConfig.sh" ; then
-	    TCLCONFIG=`(cd $i; pwd)`
-	    break
-	fi
-    done
-fi
-if test x"${TCLCONFIG}" = x ; then
-    AC_MSG_RESULT(no)
-else
-    AC_MSG_RESULT(found $TCLCONFIG/tclConfig.sh)
-    . $TCLCONFIG/tclConfig.sh
-    if test -z "$TCLINCLUDE"; then
-        TCLINCLUDE=`echo $TCL_INCLUDE_SPEC | sed "s/-I/$ISYSTEM/"`
-    fi
-    if test -z "$TCLLIB"; then
-        TCLLIB=$TCL_LIB_SPEC
-    fi
-fi
-
-if test -z "$TCLINCLUDE"; then
-   if test "x$TCLPACKAGE" != xyes; then
-	TCLINCLUDE="$ISYSTEM$TCLPACKAGE/include"
-   fi
-fi
-
-if test -z "$TCLLIB"; then
-   if test "x$TCLPACKAGE" != xyes; then
-	TCLLIB="-L$TCLPACKAGE/lib -ltcl"
-   fi
-fi
-
-AC_MSG_CHECKING(for Tcl header files)
-if test -z "$TCLINCLUDE"; then
-AC_TRY_CPP([#include <tcl.h>], , TCLINCLUDE="")
-if test -z "$TCLINCLUDE"; then
-	dirs="/usr/local/include /usr/include /opt/local/include"
-	for i in $dirs ; do
-		if test -r $i/tcl.h; then
-			AC_MSG_RESULT($i)
-			TCLINCLUDE="$ISYSTEM$i"
-			break
-		fi
-	done
-fi
-if test -z "$TCLINCLUDE"; then
-    	AC_MSG_RESULT(not found)
-fi
-else
-        AC_MSG_RESULT($TCLINCLUDE)
-fi
-
-AC_MSG_CHECKING(for Tcl library)
-if test -z "$TCLLIB"; then
-dirs="/usr/local/lib /usr/lib /opt/local/lib"
-for i in $dirs ; do
-	if test -r $i/libtcl.a; then
-	    AC_MSG_RESULT($i)
-	    TCLLIB="-L$i -ltcl"
-	    break
-	fi
-done
-if test -z "$TCLLIB"; then
-	AC_MSG_RESULT(not found)
-fi
-else
-AC_MSG_RESULT($TCLLIB)
-fi
-
-# Cygwin (Windows) needs the library for dynamic linking
-case $host in
-*-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";;
-*)TCLDYNAMICLINKING="";;
-esac
-
-case $host in
-*-*-darwin*)
-    TCLLDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace'
-    TCLCXXSHARED='$(CXX) -dynamiclib -undefined suppress -flat_namespace'
-    ;;
-*)
-    TCLLDSHARED='$(LDSHARED)'
-    TCLCXXSHARED='$(CXXSHARED)'
-    ;;
-esac
-
-fi
-
-AC_SUBST(TCLINCLUDE)
-AC_SUBST(TCLLIB)
-AC_SUBST(TCLDYNAMICLINKING)
-AC_SUBST(TCLLDSHARED)
-AC_SUBST(TCLCXXSHARED)
-
-#----------------------------------------------------------------
-# Look for Python
-#----------------------------------------------------------------
-
-PYINCLUDE=
-PYLIB=
-PYLINK=
-PYPACKAGE=
-
-AC_ARG_WITH(python, AS_HELP_STRING([--without-python], [Disable Python])
-AS_HELP_STRING([--with-python=path], [Set location of Python executable]),[ PYBIN="$withval"], [PYBIN="$alllang_default"])
-
-# First, check for "--without-python" or "--with-python=no".
-if test x"${PYBIN}" = xno; then
-  AC_MSG_NOTICE([Disabling Python])
-else
-  # First figure out the name of the Python executable
-  if test "x$PYBIN" = xyes; then
-    AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
-  else
-    PYTHON="$PYBIN"
-  fi
-
-  PYVER=0
-  if test -n "$PYTHON"; then
-    AC_MSG_CHECKING([for $PYTHON major version number])
-    PYVER=`($PYTHON -c "import sys; sys.stdout.write(sys.version[[0]])") 2>/dev/null`
-    AC_MSG_RESULT($PYVER)
-    if test -z "$PYVER"; then
-      PYVER=0
-    else
-      AC_MSG_CHECKING(for Python os.name)
-      PYOSNAME=`($PYTHON -c "import sys, os; sys.stdout.write(os.name)")`
-      AC_MSG_RESULT($PYOSNAME)
-    fi
-  fi
-
-  if test $PYVER -eq 1 -o $PYVER -eq 2; then
-    AC_MSG_CHECKING(for Python prefix)
-    PYPREFIX=`($PYTHON -c "import sys; sys.stdout.write(sys.prefix)") 2>/dev/null`
-    AC_MSG_RESULT($PYPREFIX)
-    AC_MSG_CHECKING(for Python exec-prefix)
-    PYEPREFIX=`($PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)") 2>/dev/null`
-    AC_MSG_RESULT($PYEPREFIX)
-
-    if test x"$PYOSNAME" = x"nt"; then
-      # Windows installations are quite different to posix installations
-      PYPREFIX=`echo "$PYPREFIX" | sed -e 's,\\\\,/,g'` # Forward slashes are easier to use and even work on Windows most of the time
-      PYTHON_SO=.pyd
-
-      AC_MSG_CHECKING(for Python header files)
-      if test -r $PYPREFIX/include/Python.h; then
-        PYINCLUDE="-I$PYPREFIX/include"
-      fi
-      AC_MSG_RESULT($PYINCLUDE)
-
-      AC_MSG_CHECKING(for Python library directory)
-      if test -d $PYPREFIX/libs; then
-        PYLIB=$PYPREFIX/libs
-        PYLINKFILE=`ls $PYLIB/python*.lib | grep "python[[0-9]][[0-9]]\.lib"`
-        if test -r "$PYLINKFILE"; then
-          PYLINK=-l`basename $PYLINKFILE | sed -e 's/\.lib$//'`
-        else
-          PYLIB=
-        fi
-      fi
-    else
-      # Note: I could not think of a standard way to get the version string from different versions.
-      # This trick pulls it out of the file location for a standard library file.
-
-      AC_MSG_CHECKING(for Python version)
-
-      # Need to do this hack since autoconf replaces __file__ with the name of the configure file
-      filehack="file__"
-      PYVERSION=`($PYTHON -c "import sys,string,operator,os.path; sys.stdout.write(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")`
-      AC_MSG_RESULT($PYVERSION)
-
-      # Find the directory for libraries this is necessary to deal with
-      # platforms that can have apps built for multiple archs: e.g. x86_64
-      AC_MSG_CHECKING(for Python lib dir)
-      PYLIBDIR=`($PYTHON -c "import sys; sys.stdout.write(sys.lib)") 2>/dev/null`
-      if test -z "$PYLIBDIR"; then
-        # Fedora patch Python to add sys.lib, for other distros we assume "lib".
-        PYLIBDIR="lib"
-      fi
-      AC_MSG_RESULT($PYLIBDIR)
-
-      # Set the include directory
-
-      AC_MSG_CHECKING(for Python header files)
-      if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
-        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
-      fi
-      if test -z "$PYINCLUDE"; then
-        if test -r $PYPREFIX/include/Py/Python.h; then
-          PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/$PYLIBDIR/python/lib"
-        fi
-      fi
-      AC_MSG_RESULT($PYINCLUDE)
-
-      # Set the library directory blindly.   This probably won't work with older versions
-      AC_MSG_CHECKING(for Python library directory)
-      dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR"
-      for i in $dirs; do
-        if test -d $PYEPREFIX/$PYLIBDIR/$i; then
-          PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
-          break
-        fi
-      done
-
-      PYLINK="-l$PYVERSION"
-    fi
-
-    if test -z "$PYLIB"; then
-      AC_MSG_RESULT(Not found)
-    else
-      AC_MSG_RESULT($PYLIB)
-    fi
-    AC_MSG_CHECKING(for Python library)
-    if test -z "$PYLINK"; then
-      AC_MSG_RESULT(Not found)
-    else
-      AC_MSG_RESULT($PYLINK)
-    fi
-  fi
-
-  # Cygwin (Windows) needs the library for dynamic linking
-  case $host in
-  *-*-cygwin* | *-*-mingw*)
-    PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK"
-    DEFS="-DUSE_DL_IMPORT $DEFS"
-    ;;
-  *)PYTHONDYNAMICLINKING="";;
-  esac
-fi
-
-AC_SUBST(PYINCLUDE)
-AC_SUBST(PYLIB)
-AC_SUBST(PYLINK)
-AC_SUBST(PYTHONDYNAMICLINKING)
-
-
-#----------------------------------------------------------------
-# Look for Python 3.x
-#----------------------------------------------------------------
-
-PY3INCLUDE=
-PY3LIB=
-PY3LINK=
-PY3PACKAGE=
-
-AC_ARG_WITH(python3, AS_HELP_STRING([--without-python3], [Disable Python 3.x support])
-AS_HELP_STRING([--with-python3=path], [Set location of Python 3.x executable]),[ PY3BIN="$withval"], [PY3BIN="$alllang_default"])
-
-# First, check for "--without-python3" or "--with-python3=no".
-if test x"${PY3BIN}" = xno; then
-  AC_MSG_NOTICE([Disabling Python 3.x support])
-else
-  if test -z "$PYVER"; then
-    PYVER=0
-  fi
-  if test "x$PY3BIN" = xyes; then
-    if test x"$PYOSNAME" = x"nt" -a $PYVER -ge 3; then
-      PYTHON3="$PYTHON"
-    else
-      for py_ver in 3 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 ""; do
-        AC_CHECK_PROGS(PYTHON3, [python$py_ver])
-        if test -n "$PYTHON3"; then
-          AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config])
-          if test -n "$PY3CONFIG"; then
-            break
-          fi
-        fi
-      done
-    fi
-  else
-    PYTHON3="$PY3BIN"
-    AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config])
-  fi
-
-  if test -n "$PYTHON3"; then
-    AC_MSG_CHECKING([for $PYTHON3 major version number])
-    PYVER=`($PYTHON3 -c "import sys; sys.stdout.write(sys.version[[0]])") 2>/dev/null`
-    AC_MSG_RESULT($PYVER)
-    if test -z "$PYVER"; then
-      PYVER=0
-    fi
-  fi
-
-  if test $PYVER -ge 3; then
-    AC_MSG_CHECKING(for Python 3.x os.name)
-    PY3OSNAME=`($PYTHON3 -c "import sys, os; sys.stdout.write(os.name)")`
-    AC_MSG_RESULT($PY3OSNAME)
-
-    if test x"$PY3OSNAME" = x"nt"; then
-      # Windows installations are quite different to posix installations
-      # There is no python-config to use
-      AC_MSG_CHECKING(for Python 3.x prefix)
-      PY3PREFIX=`($PYTHON3 -c "import sys; sys.stdout.write(sys.prefix)") 2>/dev/null`
-      AC_MSG_RESULT($PY3PREFIX)
-      PY3PREFIX=`echo "$PY3PREFIX" | sed -e 's,\\\\,/,g'` # Forward slashes are easier to use and even work on Windows most of the time
-      PYTHON_SO=.pyd
-
-      AC_MSG_CHECKING(for Python 3.x header files)
-      if test -r $PY3PREFIX/include/Python.h; then
-        PY3INCLUDE="-I$PY3PREFIX/include"
-      fi
-      AC_MSG_RESULT($PY3INCLUDE)
-
-      AC_MSG_CHECKING(for Python 3.x library directory)
-      if test -d $PY3PREFIX/libs; then
-        PY3LIB=$PY3PREFIX/libs
-        PY3LINKFILE=`ls $PY3LIB/python*.lib | grep "python[[0-9]][[0-9]]\.lib"`
-        if test -r "$PY3LINKFILE"; then
-          PY3LINK=-l`basename $PY3LINKFILE | sed -e 's/\.lib$//'`
-        else
-          PY3LIB=
-        fi
-      fi
-      if test -z "$PY3LIB"; then
-        AC_MSG_RESULT([Not found])
-      else
-        AC_MSG_RESULT($PY3LIB)
-      fi
-      AC_MSG_CHECKING([for Python 3.x library])
-      if test -z "$PY3LINK"; then
-        AC_MSG_RESULT(Not found)
-      else
-        AC_MSG_RESULT($PY3LINK)
-      fi
-    elif test -n "$PY3CONFIG"; then
-      AC_MSG_CHECKING([for Python 3.x prefix])
-      PY3PREFIX=`($PY3CONFIG --prefix) 2>/dev/null`
-      AC_MSG_RESULT($PY3PREFIX)
-      AC_MSG_CHECKING(for Python 3.x exec-prefix)
-      PY3EPREFIX=`($PY3CONFIG --exec-prefix) 2>/dev/null`
-      AC_MSG_RESULT($PY3EPREFIX)
-
-      # Note: I could not think of a standard way to get the version string from different versions.
-      # This trick pulls it out of the file location for a standard library file.
-
-      AC_MSG_CHECKING([for Python 3.x version])
-
-      # Need to do this hack since autoconf replaces __file__ with the name of the configure file
-      filehack="file__"
-      PY3VERSION=`($PYTHON3 -c "import string,operator,os.path; print(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")`
-      AC_MSG_RESULT($PY3VERSION)
-
-      # Find the directory for libraries this is necessary to deal with
-      # platforms that can have apps built for multiple archs: e.g. x86_64
-      AC_MSG_CHECKING([for Python 3.x lib dir])
-      PY3LIBDIR=`($PYTHON3 -c "import sys; print(sys.lib)") 2>/dev/null`
-      if test -z "$PY3LIBDIR"; then
-        # some dists don't have sys.lib  so the best we can do is assume lib
-        PY3LIBDIR="lib"
-      fi
-      AC_MSG_RESULT($PY3LIBDIR)
-
-      # Set the include directory
-
-      AC_MSG_CHECKING([for Python 3.x header files])
-      PY3INCLUDE=`($PY3CONFIG --includes) 2>/dev/null`
-      AC_MSG_RESULT($PY3INCLUDE)
-
-      # Set the library directory blindly.   This probably won't work with older versions
-      AC_MSG_CHECKING([for Python 3.x library directory])
-      dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR"
-      for i in $dirs; do
-        if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then
-          PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i"
-          break
-        fi
-      done
-      if test -z "$PY3LIB"; then
-        AC_MSG_RESULT([Not found])
-      else
-        AC_MSG_RESULT($PY3LIB)
-      fi
-
-      PY3LINK="-l$PY3VERSION"
-
-      AC_MSG_CHECKING([for Python 3.x library])
-      if test -z "$PY3LINK"; then
-        AC_MSG_RESULT(Not found)
-      else
-        AC_MSG_RESULT($PY3LINK)
-      fi
-    fi
-  fi
-
-  # Cygwin (Windows) needs the library for dynamic linking
-  case $host in
-  *-*-cygwin* | *-*-mingw*)
-    PYTHON3DYNAMICLINKING="-L$PY3LIB $PY3LINK"
-    DEFS="-DUSE_DL_IMPORT $DEFS"
-    ;;
-  *)PYTHON3DYNAMICLINKING="";;
-  esac
-
-  AC_SUBST(PY3INCLUDE)
-  AC_SUBST(PY3LIB)
-  AC_SUBST(PY3LINK)
-  AC_SUBST(PYTHON3DYNAMICLINKING)
-fi
-
-if test -n "$PYINCLUDE" || test -n "$PY3INCLUDE" ; then
-  AC_CHECK_PROGS(PEP8, pep8)
-  if test -n "$PEP8"; then
-    AC_MSG_CHECKING(pep8 version)
-    pep8_version=`$PEP8 --version 2>/dev/null`
-    AC_MSG_RESULT($pep8_version)
-  fi
-fi
-
-#----------------------------------------------------------------
-# Look for Perl5
-#----------------------------------------------------------------
-
-PERLBIN=
-
-AC_ARG_WITH(perl5, AS_HELP_STRING([--without-perl5], [Disable Perl5])
-AS_HELP_STRING([--with-perl5=path], [Set location of Perl5 executable]),[ PERLBIN="$withval"], [PERLBIN="$alllang_default"])
-
-# First, check for "--without-perl5" or "--with-perl5=no".
-if test x"${PERLBIN}" = xno; then
-AC_MSG_NOTICE([Disabling Perl5])
-PERL=
-else
-
-# First figure out what the name of Perl5 is
-
-if test "x$PERLBIN" = xyes; then
-AC_CHECK_PROGS(PERL, perl perl5.6.1 perl5.6.0 perl5.004 perl5.003 perl5.002 perl5.001 perl5 perl)
-else
-PERL="$PERLBIN"
-fi
-
-
-# This could probably be simplified as for all platforms and all versions of Perl the following apparently should be run to get the compilation options:
-# perl -MExtUtils::Embed -e ccopts
-AC_MSG_CHECKING(for Perl5 header files)
-if test -n "$PERL"; then
-	PERL5DIR=`($PERL -MConfig -le 'print $Config{archlibexp}') 2>/dev/null`
-	if test -n "$PERL5DIR" ; then
-		dirs="$PERL5DIR $PERL5DIR/CORE"
-		PERL5EXT=none
-		for i in $dirs; do
-			if test -r $i/perl.h; then
-				AC_MSG_RESULT($i)
-				PERL5EXT="$i"
-				break
-			fi
-		done
-		if test "$PERL5EXT" = none; then
-			PERL5EXT="$PERL5DIR/CORE"
-			AC_MSG_RESULT(could not locate perl.h...using $PERL5EXT)
-		fi
-
-		AC_MSG_CHECKING(for Perl5 library)
-		PERL5LIB=`($PERL -e 'use Config; $_=$Config{libperl}; s/^lib//; s/$Config{_a}$//; s/\.$Config{so}.*//; print $_, "\n"') 2>/dev/null`
-		if test -z "$PERL5LIB" ; then
-			AC_MSG_RESULT(not found)
-		else
-			AC_MSG_RESULT($PERL5LIB)
-		fi
-    AC_MSG_CHECKING(for Perl5 ccflags)
- 		PERL5CCFLAGS=`($PERL -e 'use Config; print $Config{ccflags}, "\n"' | sed "s/-Wdeclaration-after-statement//" | sed "s/-I/$ISYSTEM/") 2>/dev/null`
- 		if test -z "$PERL5CCFLAGS" ; then
- 			AC_MSG_RESULT(not found)
- 		else
- 			AC_MSG_RESULT($PERL5CCFLAGS)
- 		fi
-    AC_MSG_CHECKING(for Perl5 ccdlflags)
-    PERL5CCDLFLAGS=`($PERL -e 'use Config; print $Config{ccdlflags}, "\n"') 2>/dev/null`
-    if test -z "$PERL5CCDLFLAGS" ; then
-      AC_MSG_RESULT(not found)
-      else
-      AC_MSG_RESULT($PERL5CCDLFLAGS)
-    fi
-    AC_MSG_CHECKING(for Perl5 cccdlflags)
-    PERL5CCCDLFLAGS=`($PERL -e 'use Config; print $Config{cccdlflags}, "\n"') 2>/dev/null`
-    if test -z "$PERL5CCCDLFLAGS" ; then
-      AC_MSG_RESULT(not found)
-      else
-      AC_MSG_RESULT($PERL5CCCDLFLAGS)
-    fi
-    AC_MSG_CHECKING(for Perl5 ldflags)
-    PERL5LDFLAGS=`($PERL -e 'use Config; print $Config{ldflags}, "\n"') 2>/dev/null`
-    if test -z "$PERL5LDFLAGS" ; then
-      AC_MSG_RESULT(not found)
-      else
-      AC_MSG_RESULT($PERL5LDFLAGS)
-    fi
-    AC_MSG_CHECKING(for Perl5 Test::More module) # For test-suite
-    PERL5TESTMORE=`($PERL -e 'use Test::More; print "good";') 2>/dev/null`
-    if test -z "$PERL5TESTMORE" ; then
-      AC_MSG_RESULT(not found)
-      else
-      AC_MSG_RESULT(found)
-    fi
-	else
-		AC_MSG_RESULT(unable to determine perl5 configuration)
-		PERL5EXT=$PERL5DIR
-	fi
-else
-       	AC_MSG_RESULT(could not figure out how to run perl5)
-fi
-
-# Cygwin (Windows) needs the library for dynamic linking
-case $host in
-*-*-cygwin* | *-*-mingw*) PERL5DYNAMICLINKING="-L$PERL5EXT -l$PERL5LIB";;
-*)PERL5DYNAMICLINKING="";;
-esac
-fi
-
-AC_SUBST(PERL)
-AC_SUBST(PERL5EXT)
-AC_SUBST(PERL5DYNAMICLINKING)
-AC_SUBST(PERL5LIB)
-AC_SUBST(PERL5CCFLAGS)
-AC_SUBST(PERL5CCDLFLAGS)
-AC_SUBST(PERL5CCCDLFLAGS)
-AC_SUBST(PERL5LDFLAGS)
-
-#----------------------------------------------------------------
-# Look for Octave
-#----------------------------------------------------------------
-
-OCTAVEBIN=
-OCTAVE_SO=.oct
-
-AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave])
-AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN="$alllang_default"])
-
-# Check for "--without-octave" or "--with-octave=no".
-if test x"${OCTAVEBIN}" = xno; then
-   AC_MSG_NOTICE([Disabling Octave])
-   OCTAVE=
-
-# Check for Octave; prefer command-line program "octave-cli" to (in newer versions) GUI program "octave"
-elif test "x$OCTAVEBIN" = xyes; then
-   AC_PATH_PROG(OCTAVE, [octave-cli octave])
-
-else
-   OCTAVE="$OCTAVEBIN"
-fi
-
-# Check if Octave works
-if test -n "$OCTAVE"; then
-   AC_MSG_CHECKING([if ${OCTAVE} works])
-   AS_IF([test "x`${OCTAVE} --version 2>/dev/null | sed -n -e '1p' | sed -n -e '/Octave, version/p'`" != x],[
-      AC_MSG_RESULT([yes])
-   ],[
-      AC_MSG_NOTICE([no, disabling Octave])
-      OCTAVE=
-   ])
-fi
-
-# Check for required Octave helper program "mkoctfile"
-if test -n "$OCTAVE"; then
-   AC_MSG_CHECKING([for mkoctfile])
-   mkoctfile=["`echo $OCTAVE | sed -e 's|[a-z][a-z-]*$|mkoctfile|;t;s|[a-z][a-z-]*\(-[0-9][0-9.+]*\)$|mkoctfile\1|;t'`"]
-   AC_MSG_RESULT([${mkoctfile}])
-   AC_MSG_CHECKING([if ${mkoctfile} works])
-   AS_IF([test "x`${mkoctfile} --version 2>/dev/null | sed -n -e '1p' | sed -n -e '/mkoctfile, version/p'`" != x],[
-      AC_MSG_RESULT([yes])
-   ],[
-      AC_MSG_NOTICE([no, disabling Octave])
-      OCTAVE=
-   ])
-fi
-
-# Check for Octave preprocessor/compiler/linker flags
-if test -n "$OCTAVE"; then
-
-   AC_MSG_CHECKING([for Octave preprocessor flags])
-   OCTAVE_CPPFLAGS=
-   for var in CPPFLAGS INCFLAGS ALL_CXXFLAGS; do
-      for flag in `env - ${mkoctfile} -p ${var}`; do
-         case ${flag} in
-            -D*|-I*) OCTAVE_CPPFLAGS="${OCTAVE_CPPFLAGS} ${flag}";;
-            *) ;;
-         esac
-      done
-   done
-   AC_MSG_RESULT([$OCTAVE_CPPFLAGS])
-
-   AC_MSG_CHECKING([for Octave compiler flags])
-   OCTAVE_CXXFLAGS=
-   for var in CXX ALL_CXXFLAGS; do
-      for flag in `env - ${mkoctfile} -p ${var}`; do
-         case ${flag} in
-            -std=*|-g*|-W*) OCTAVE_CXXFLAGS="${OCTAVE_CXXFLAGS} ${flag}";;
-            *) ;;
-         esac
-      done
-   done
-   save_CXXFLAGS="${CXXFLAGS}"
-   CXXFLAGS="-Werror -O0"
-   AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([],[])
-   ],[
-      OCTAVE_CXXFLAGS="${OCTAVE_CXXFLAGS} -O0"
-   ])
-   CXXFLAGS="${save_CXXFLAGS}"
-   AC_MSG_RESULT([$OCTAVE_CXXFLAGS])
-
-   AC_MSG_CHECKING([for Octave linker flags])
-   OCTAVE_LDFLAGS=
-   for var in RDYNAMIC_FLAG LFLAGS RLD_FLAG OCTAVE_LIBS LIBS; do
-     OCTAVE_LDFLAGS="${OCTAVE_LDFLAGS} "`env - ${mkoctfile} -p ${var}`
-   done
-   AC_MSG_RESULT([$OCTAVE_LDFLAGS])
-
-fi
-
-# Check for Octave options
-if test -n "$OCTAVE"; then
-   for octave_opt in --no-window-system --silent --norc --no-history; do
-      AC_MSG_CHECKING([if Octave option '${octave_opt}' is supported])
-      octave_out=`${OCTAVE} ${octave_opt} /dev/null 2>&1 | sed -n '1p' | sed -n '/unrecognized/p'`
-      AS_IF([test "x${octave_out}" = x],[
-         AC_MSG_RESULT([yes])
-         OCTAVE="${OCTAVE} ${octave_opt}"
-      ],[
-         AC_MSG_RESULT([no])
-      ])
-   done
-fi
-
-AC_SUBST(OCTAVE)
-AC_SUBST(OCTAVE_SO)
-AC_SUBST(OCTAVE_CPPFLAGS)
-AC_SUBST(OCTAVE_CXXFLAGS)
-AC_SUBST(OCTAVE_LDFLAGS)
-
-#----------------------------------------------------------------
-# Look for Scilab
-#----------------------------------------------------------------
-
-AC_ARG_WITH(scilab, AS_HELP_STRING([--without-scilab], [Disable Scilab])
-AS_HELP_STRING([--with-scilab=path], [Set location of Scilab executable]),[SCILABBIN="$withval"], [SCILABBIN="$alllang_default"])
-AC_ARG_WITH(scilab-inc, [  --with-scilab-inc=path  Set location of Scilab include directory], [SCILABINCDIR="$withval"], [SCILABINCDIR=""])
-
-# First, check for "--without-scilab" or "--with-scilab=no".
-if test x"${SCILABBIN}" = xno; then
-  AC_MSG_NOTICE([Disabling Scilab])
-  SCILAB=
-else
-  # Check for Scilab executable
-  if test "x$SCILABBIN" = xyes; then
-    AC_CHECK_PROGS(SCILAB, scilab)
-  else
-    AC_MSG_CHECKING(for scilab)
-    if test -f "$SCILABBIN"; then
-      AC_MSG_RESULT($SCILABBIN)
-      SCILAB="$SCILABBIN"
-    else
-      AC_MSG_RESULT(not found)
-    fi
-  fi
-
-  if test -n "$SCILAB"; then
-    # Check for Scilab version (needs api_scilab so needs version 5.3.3 or higher)
-    SCILAB_FULL_VERSION=`$SCILAB -version | head -1 | sed -e 's|Scilab version \"\(.*\)\"|\1|g'`
-
-    AC_MSG_CHECKING(Scilab version is 5.3.3 or higher)
-    SCILAB_MAJOR_VERSION=`echo $SCILAB_FULL_VERSION | cut -d. -f1`
-    SCILAB_MINOR_VERSION=`echo $SCILAB_FULL_VERSION | cut -d. -f2`
-    SCILAB_MAINTENANCE_VERSION=`echo $SCILAB_FULL_VERSION | cut -d. -f3`
-    SCILAB_VERSION="$SCILAB_MAJOR_VERSION$SCILAB_MINOR_VERSION$SCILAB_MAINTENANCE_VERSION"
-
-    if test $SCILAB_VERSION -ge 533; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      SCILAB=
-    fi
-
-    if test -n "$SCILAB"; then
-      # Set Scilab startup options depending on version
-      AC_MSG_CHECKING(for Scilab startup options)
-      SCILABOPT="-nwni -nb"
-      if test $SCILAB_VERSION -ge 540; then
-        SCILABOPT+=" -noatomsautoload"
-      fi
-      AC_MSG_RESULT($SCILABOPT)
-
-      # Check for Scilab header files
-      AC_MSG_CHECKING(for Scilab header files)
-      if test "$SCILABINCDIR" != ""; then
-        dirs="$SCILABINCDIR"
-      elif test -n "$PKGCONFIG"; then
-        dirs=`$PKGCONFIG scilab --cflags-only-I | sed -e 's/-I//g'`
-      else
-        dirs=""
-      fi
-      for i in $dirs; do
-        if test -r $i/api_scilab.h; then
-          AC_MSG_RESULT($i)
-          SCILABINCLUDE="-I$i"
-          break
-        fi
-        if test -r $i/scilab/api_scilab.h; then
-          AC_MSG_RESULT($i/scilab)
-          SCILABINCLUDE="-I$i/scilab"
-          break
-        fi
-      done
-      if test "$SCILABINCLUDE" = "" ; then
-        AC_MSG_RESULT(not found)
-        SCILAB=
-      fi
-    fi
-  fi
-fi
-
-AC_SUBST(SCILAB)
-AC_SUBST(SCILABINCLUDE)
-AC_SUBST(SCILABOPT)
-
-
-#----------------------------------------------------------------
-# Look for java
-#----------------------------------------------------------------
-
-AC_ARG_WITH(java, AS_HELP_STRING([--without-java], [Disable Java])
-AS_HELP_STRING([--with-java=path], [Set location of java executable]),[JAVABIN="$withval"], [JAVABIN="$alllang_default"])
-AC_ARG_WITH(javac, [  --with-javac=path       Set location of javac executable],[JAVACBIN="$withval"], [JAVACBIN=])
-
-# First, check for "--without-java" or "--with-java=no".
-if test x"${JAVABIN}" = xno; then
-AC_MSG_NOTICE([Disabling Java])
-JAVA=
-else
-
-dnl Detect everything we need for Java: java for running Java tests, javac for
-dnl compiling them and C headers for compiling C code.
-dnl
-dnl If JAVA_HOME is defined and contains everything needed, as it's supposed to,
-dnl just use it. Otherwise try to locate the necessary files in the path.
-case $host in
-  *-*-cygwin*)
-    dnl Ensure that JAVA_HOME is in the form we can use, it's typically set to Windows path by the installer.
-    if test -n "$JAVA_HOME"; then
-      JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
-    fi
-    ;;
-  *-*-mingw*)
-    if test -n "$JAVA_HOME"; then
-      JAVA_HOME=`${srcdir}/Tools/convertpath -u "$JAVA_HOME"`
-    fi
-    ;;
-  *-*-darwin*)
-    dnl Under OS X JAVA_HOME is not set by default, try to use the system default JRE.
-    if test -z "$JAVA_HOME" -a -x /usr/libexec/java_home; then
-      JAVA_HOME=`/usr/libexec/java_home`
-    fi
-    dnl The JAVA_HOME doesn't contain the JDK headers though, but they seem to
-    dnl always be in the same location, according to Apple JNI documentation.
-    JAVA_OSX_STD_INCDIR="/System/Library/Frameworks/JavaVM.framework/Headers"
-    if test -r "$JAVA_OSX_STD_INCDIR/jni.h"; then
-      JAVA_HOME_INCDIR=$JAVA_OSX_STD_INCDIR
-    fi
-    ;;
-esac
-
-AC_MSG_CHECKING(for java JDK)
-if test -n "$JAVA_HOME"; then
-  dnl Don't complain about missing executables/headers if they had been
-  dnl explicitly overridden from the command line, but otherwise verify that we
-  dnl have everything we need.
-  java_home_ok=1
-  if test -z "$JAVABIN" -a ! -x "$JAVA_HOME/bin/java"; then
-    AC_MSG_WARN([No java executable under JAVA_HOME.])
-    java_home_ok=0
-  fi
-  if test -z "$JAVACBIN" -a ! -x "$JAVA_HOME/bin/javac"; then
-    AC_MSG_WARN([No javac executable under JAVA_HOME.])
-    java_home_ok=0
-  fi
-
-  dnl By default the headers are under JAVA_HOME/include, but OS X is special
-  dnl and defines JAVA_HOME_INCDIR differently above.
-  if test -z "$JAVA_HOME_INCDIR"; then
-    JAVA_HOME_INCDIR="$JAVA_HOME/include"
-  fi
-  if test -z "$JAVAINCDIR" -a ! -r "$JAVA_HOME_INCDIR/jni.h"; then
-    AC_MSG_WARN([No java headers under JAVA_HOME (does it point to a JDK and not just JRE?).])
-    java_home_ok=0
-  fi
-  if test "$java_home_ok" = 1; then
-    AC_MSG_RESULT([found (in $JAVA_HOME)])
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN([JAVA_HOME ($JAVA_HOME) is defined but does not point to a complete JDK installation, ignoring it.])
-    JAVA_HOME=
-  fi
-else
-  AC_MSG_RESULT([no (JAVA_HOME is not defined)])
-fi
-
-if test "x$JAVABIN" = xyes; then
-  if test -n "$JAVA_HOME"; then
-    JAVA="$JAVA_HOME/bin/java"
-  else
-    AC_CHECK_PROGS(JAVA, java kaffe guavac)
-  fi
-else
-  JAVA="$JAVABIN"
-fi
-
-if test -z "$JAVACBIN"; then
-  if test -n "$JAVA_HOME"; then
-    JAVAC="$JAVA_HOME/bin/javac"
-  else
-    AC_CHECK_PROGS(JAVAC, javac)
-  fi
-else
-  JAVAC="$JAVACBIN"
-fi
-
-AC_MSG_CHECKING(for java include file jni.h)
-AC_ARG_WITH(javaincl, [  --with-javaincl=path    Set location of Java include directory], [JAVAINCDIR="$withval"], [JAVAINCDIR=])
-
-JAVAINC=""
-if test -z "$JAVAINCDIR" ; then
-  if test -n "$JAVA_HOME"; then
-    JAVAINCDIR="$JAVA_HOME_INCDIR"
-    JAVAINC=-I\"$JAVAINCDIR\"
-  else
-    JAVAINCDIR="/usr/j2sdk*/include /usr/local/j2sdk*/include /usr/jdk*/include /usr/local/jdk*/include /opt/j2sdk*/include /opt/jdk*/include /usr/java/include /usr/java/j2sdk*/include /usr/java/jdk*/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/lib/java/include /usr/lib/jvm/java*/include /usr/lib64/jvm/java*/include /usr/include/kaffe /usr/local/include/kaffe /usr/include"
-
-    # Add in default installation directory on Windows for Cygwin
-    case $host in
-    *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files*/Java/jdk*/include d:/Program*Files*/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
-    *-*-darwin*) JAVAINCDIR="$JAVA_OSX_STD_INCDIR $JAVAINCDIR";;
-    *);;
-    esac
-
-    for d in $JAVAINCDIR ; do
-      if test -r "$d/jni.h" ; then
-	JAVAINCDIR=$d
-	JAVAINC=-I\"$d\"
-	break
-      fi
-    done
-  fi
-else
-  if test -r "$JAVAINCDIR/jni.h" ; then
-    JAVAINC=-I\"$JAVAINCDIR\"
-  fi
-fi
-
-if test "$JAVAINC" = "" ; then
-  AC_MSG_RESULT(not found)
-else
-  AC_MSG_RESULT($JAVAINC)
-  # now look for <arch>/jni_md.h
-  AC_MSG_CHECKING(for java include file jni_md.h)
-  JAVAMDDIR=`find "$JAVAINCDIR" -follow -name jni_md.h -print`
-  if test "$JAVAMDDIR" = "" ; then
-    AC_MSG_RESULT(not found)
-  else
-    JAVAMDDIR=-I\"`dirname "$JAVAMDDIR" | tail -1`\"
-    AC_MSG_RESULT($JAVAMDDIR)
-    JAVAINC="${JAVAINC} ${JAVAMDDIR}"
-  fi
-fi
-
-case $host in
-*-*-cygwin*)
-        # TODO: Only use this flag if the compiler supports it, later versions of gcc no longer have it
-        GCC_MNO_CYGWIN=" -mno-cygwin"
-        ;;
-*)
-        GCC_MNO_CYGWIN=""
-        ;;
-esac
-
-# java.exe on Cygwin requires the Windows standard (Pascal) calling convention as it is a normal Windows executable and not a Cygwin built executable
-case $host in
-*-*-cygwin* | *-*-mingw*)
-    if test "$GCC" = yes; then
-        JAVADYNAMICLINKING="$GCC_MNO_CYGWIN -mthreads -Wl,--add-stdcall-alias"
-        JAVACFLAGS="$GCC_MNO_CYGWIN -mthreads"
-    else
-        JAVADYNAMICLINKING=""
-        JAVACFLAGS=""
-    fi ;;
-*-*-darwin*)
-        JAVADYNAMICLINKING="-dynamiclib -framework JavaVM"
-        JAVACFLAGS=""
-        ;;
-*)
-        JAVADYNAMICLINKING=""
-        JAVACFLAGS=""
-        ;;
-esac
-
-# Java on Windows platforms including Cygwin doesn't use libname.dll, rather name.dll when loading dlls
-case $host in
-*-*-cygwin* | *-*-mingw*) JAVALIBRARYPREFIX="";;
-*)JAVALIBRARYPREFIX="lib";;
-esac
-
-# Java on Mac OS X tweaks
-case $host in
-*-*-darwin*)
-    JAVASO=".jnilib"
-    JAVALDSHARED='$(CC)'
-    JAVACXXSHARED='$(CXX)'
-    ;;
-*)
-    JAVASO=$SO
-    JAVALDSHARED='$(LDSHARED)'
-    JAVACXXSHARED='$(CXXSHARED)'
-    ;;
-esac
-fi
-
-# Quote for spaces in path to executables
-if test -n "$JAVA"; then
-  JAVA=\"$JAVA\"
-fi
-if test -n "$JAVAC"; then
-  JAVAC=\"$JAVAC\"
-fi
-
-# Turned off due to spurious warnings in later versions of openjdk-1.8
-# JAVAFLAGS=-Xcheck:jni
-
-AC_SUBST(JAVA)
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAINC)
-AC_SUBST(JAVADYNAMICLINKING)
-AC_SUBST(JAVALIBRARYPREFIX)
-AC_SUBST(JAVASO)
-AC_SUBST(JAVALDSHARED)
-AC_SUBST(JAVACXXSHARED)
-AC_SUBST(JAVAFLAGS)
-AC_SUBST(JAVACFLAGS)
-
-#----------------------------------------------------------------
-# Look for Javascript
-#----------------------------------------------------------------
-AC_ARG_WITH(javascript, AS_HELP_STRING([--without-javascript], [Disable Javascript]), [with_javascript="$withval"], [with_javascript="$alllang_default"])
-
-# First, check for "--without-javascript" or "--with-javascript=no".
-if test x"${with_javascript}" = xno; then
-  AC_MSG_NOTICE([Disabling Javascript])
-  JAVASCRIPT=
-else
-  JAVASCRIPT=1
-
-  #----------------------------------------------------------------
-  # General Javascript settings shared by JSC and V8
-  #----------------------------------------------------------------
-
-  case $host in
-  *-*-darwin*)
-    JSSO=".dylib"
-    # HACK: didn't manage to get dynamic module loading working with a g++ compiled interpreter
-    JSINTERPRETERCXX='c++'
-    JSINTERPRETERLINKFLAGS='-g -Wl,-search_paths_first -Wl,-headerpad_max_install_names'
-    ;;
-  *)
-    JSSO=$SO
-    JSINTERPRETERCXX='$(CXX)'
-    JSINTERPRETERLINKFLAGS='-ldl'
-    ;;
-  esac
-
-  #----------------------------------------------------------------
-  # Look for Node.js which is the default Javascript engine
-  #----------------------------------------------------------------
-
-  AC_CHECK_PROGS(NODEJS, [nodejs node])
-
-  if test -n "$NODEJS"; then
-    # node-gyp is needed to run the test-suite/examples
-    AC_CHECK_PROGS(NODEGYP, node-gyp)
-    if test -z "$NODEGYP"; then
-      NODEJS=
-    fi
-  fi
-
-  #----------------------------------------------------------------
-  # Look for JavascriptCore (Webkit) settings (JSCOREINCDIR, JSCOREDYNAMICLINKING)
-  #----------------------------------------------------------------
-
-  # check for include files
-  AC_MSG_CHECKING(for JavaScriptCore/JavaScript.h)
-  AC_ARG_WITH(jscoreinc, [  --with-jscinc=path      Set location of Javascript include directory], [JSCOREINCDIR="$withval"], [JSCOREINCDIR=])
-
-  JSCOREVERSION=
-
-  if test -z "$JSCOREINCDIR"; then
-    JSCOREINCDIR="/usr/include/ /usr/local/include/"
-
-    # Add in default directory for JavaScriptCore headers for Linux and Mac OS X
-    case $host in
-    *-*-linux*)
-      JSCOREINCDIR="/usr/include/webkit-1.0/ /usr/include/webkitgtk-1.0/ /usr/local/include/webkit-1.0/JavaScriptCore/ $JSCOREINCDIR"
-      ;;
-    *-*-darwin*)
-      JSCOREINCDIR="/System/Library/Frameworks/JavaScriptCore.framework/Headers/ $JSCOREINCDIR"
-      ;;
-    *)
-      ;;
-    esac
-  fi
-
-  for d in $JSCOREINCDIR ; do
-    if test -r "$d/JavaScriptCore/JavaScript.h" || test -r "$d/JavaScript.h" ; then
-      AC_MSG_RESULT($d)
-      JSCOREINCDIR=$d
-      JSCOREINC=-I\"$d\"
-      break
-    fi
-  done
-
-  if test "$JSCOREINC" = "" ; then
-    AC_MSG_RESULT(not found)
-  fi
-
-  # check for JavaScriptCore/Webkit libraries
-  AC_ARG_WITH(jscorelib,[  --with-jsclib=path      Set location of the JavaScriptCore/Webkit library directory],[JSCORELIB="-L$withval"], [JSCORELIB=])
-
-  if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then
-    AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
-    if pkg-config javascriptcoregtk-1.0; then
-      JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0`
-      JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0`
-    fi
-    if test -z "$JSCORELIB"; then
-      AC_MSG_RESULT(not found)
-      JSCENABLED=
-    else
-      AC_MSG_RESULT([$JSCORELIB])
-      JSCOREDYNAMICLINKING="$JSCORELIB"
-      JSCENABLED=1
-    fi
-  fi
-
-  #----------------------------------------------------------------
-  # Look for V8 settings (JSV8INCDIR, JSV8DYNAMICLINKING)
-  #----------------------------------------------------------------
-
-  # check for include files
-  AC_MSG_CHECKING(for V8 Javascript v8.h)
-  AC_ARG_WITH(jsv8inc, [  --with-jsv8inc=path     Set location of Javascript v8 include directory], [JSV8INCDIR="$withval"])
-
-  # if not include dir is specified we try to find
-  if test -z "$JSV8INCDIR"; then
-    # Add in default directory for JavaScriptCore headers for Linux and Mac OS X
-    case $host in
-    *-*-linux*)
-      JSV8INCDIR="/usr/include /usr/local/include/ $JSV8INCDIR"
-      ;;
-    *-*-darwin*)
-      JSV8INCDIR="$JSV8INCDIR"
-      ;;
-    *)
-      ;;
-    esac
-  fi
-
-  for d in $JSV8INCDIR ; do
-    if test -r "$d/v8.h" ; then
-      JSV8INCDIR=$d
-      JSV8INC=-I\"$d\"
-      break
-    fi
-  done
-
-  if test "$JSV8INC" = "" ; then
-    AC_MSG_RESULT(not found)
-  else
-    AC_MSG_RESULT($JSV8INCDIR)
-  fi
-
-  # check for V8 library
-  AC_MSG_CHECKING(for V8 Javascript library)
-  AC_ARG_WITH(jsv8lib,[  --with-jsv8lib=path     Set location of V8 Javascript library directory],[JSV8LIBDIR="$withval"], [JSV8LIB=])
-
-  v8libdirs="$JSV8LIBDIR /usr/lib64/ /usr/local/lib64/ /usr/lib/ /usr/local/lib/"
-  for d in $v8libdirs ; do
-    if test -r $d/libv8$JSSO; then
-      JSV8LIBDIR=$d
-      JSV8LIB="-L$d -lv8"
-      break
-    fi
-  done
-
-  if test "$JSV8LIB" = "" ; then
-    AC_MSG_RESULT(not found)
-    JSV8ENABLED=
-  else
-    AC_MSG_RESULT($JSV8LIBDIR)
-    JSV8ENABLED=1
-  fi
-
-
-  # linking options
-  case $host in
-  *-*-darwin*)
-    JSV8DYNAMICLINKING="$JSV8LIB"
-    ;;
-  *-*-linux*)
-    JSV8DYNAMICLINKING="$JSV8LIB"
-    ;;
-  *)
-    JSV8DYNAMICLINKING=""
-    ;;
-  esac
-
-fi
-
-AC_SUBST(JSINTERPRETERCXX)
-AC_SUBST(JSINTERPRETERLINKFLAGS)
-
-AC_SUBST(JSCOREINC)
-AC_SUBST(JSCOREDYNAMICLINKING)
-AC_SUBST(JSCOREVERSION)
-AC_SUBST(JSV8INC)
-AC_SUBST(JSV8DYNAMICLINKING)
-
-AC_SUBST(JSCENABLED)
-AC_SUBST(JSV8ENABLED)
-
-AC_SUBST(NODEJS)
-AC_SUBST(NODEGYP)
-
-#----------------------------------------------------------------
-# Look for gcj
-#----------------------------------------------------------------
-
-AC_ARG_WITH(gcj, AS_HELP_STRING([--without-gcj], [Disable GCJ])
-AS_HELP_STRING([--with-gcj=path], [Set location of gcj executable]),[GCJBIN="$withval"], [GCJBIN="$alllang_default"])
-AC_ARG_WITH(gcjh, [  --with-gcjh=path        Set location of gcjh executable],[GCJHBIN="$withval"], [GCJHBIN=])
-
-# First, check for "--without-gcj" or "--with-gcj=no".
-if test x"${GCJBIN}" = xno; then
-  AC_MSG_NOTICE([Disabling GCJ])
-else
-  if test "x$GCJBIN" = xyes; then
-    AC_CHECK_PROGS(GCJ, gcj)
-  else
-    GCJ="$GCJBIN"
-  fi
-
-  if test -z "$GCJCBIN"; then
-    AC_CHECK_PROGS(GCJH, gcjh)
-  else
-    GCJH="$GCJHBIN"
-  fi
-fi
-
-AC_SUBST(GCJ)
-AC_SUBST(GCJH)
-
-#----------------------------------------------------------------
-# Look for Android
-#----------------------------------------------------------------
-
-AC_ARG_WITH(android, AS_HELP_STRING([--without-android], [Disable Android])
-AS_HELP_STRING([--with-android=path], [Set location of android executable]),[ANDROIDBIN="$withval"], [ANDROIDBIN="$alllang_default"])
-AC_ARG_WITH(adb, [  --with-adb=path         Set location of adb executable - Android Debug Bridge],[ADBBIN="$withval"], [ADBBIN=])
-AC_ARG_WITH(ant, [  --with-ant=path         Set location of ant executable for Android],[ANTBIN="$withval"], [ANTBIN=])
-AC_ARG_WITH(ndk-build, [  --with-ndk-build=path   Set location of Android ndk-build executable],[NDKBUILDBIN="$withval"], [NDKBUILDBIN=])
-
-# First, check for "--without-android" or "--with-android=no".
-if test x"${ANDROIDBIN}" = xno; then
-  AC_MSG_NOTICE([Disabling Android])
-  ANDROID=
-else
-  if test "x$ANDROIDBIN" = xyes; then
-    AC_CHECK_PROGS(ANDROID, android)
-  else
-    ANDROID="$ANDROIDBIN"
-  fi
-
-  if test -z "$ADBBIN"; then
-    AC_CHECK_PROGS(ADB, adb)
-  else
-    ADB="$ADBBIN"
-  fi
-
-  if test -z "$ANTBIN"; then
-    AC_CHECK_PROGS(ANT, ant)
-  else
-    ANT="$ANTBIN"
-  fi
-
-  if test -z "$NDKBUILDBIN"; then
-    AC_CHECK_PROGS(NDKBUILD, ndk-build)
-  else
-    NDKBUILD="$NDKBUILDBIN"
-  fi
-fi
-
-AC_SUBST(ANDROID)
-AC_SUBST(ADB)
-AC_SUBST(ANT)
-AC_SUBST(NDKBUILD)
-
-#----------------------------------------------------------------
-# Look for Guile
-#----------------------------------------------------------------
-
-GUILE=
-GUILE_CFLAGS=
-GUILE_LIBS=
-
-AC_ARG_WITH(guile-config, AS_HELP_STRING([--without-guile], [Disable Guile])
-AS_HELP_STRING([--with-guile-config=path], [Set location of guile-config]),[ GUILE_CONFIG="$withval"], [GUILE_CONFIG=])
-AC_ARG_WITH(guile,[  --with-guile=path       Set location of Guile executable],[
-	GUILE="$withval"], [GUILE="$alllang_default"])
-AC_ARG_WITH(guile-cflags,[  --with-guile-cflags=cflags   Set cflags required to compile against Guile],[
-	GUILE_CFLAGS="$withval"])
-AC_ARG_WITH(guile-libs,[  --with-guile-libs=ldflags    Set ldflags needed to link with Guile],[
-	GUILE_LIBS="$withval"])
-
-# First, check for "--without-guile" or "--with-guile=no".
-if test x"${GUILE}" = xno; then
-  AC_MSG_NOTICE([Disabling Guile])
-else
-  if test -z "$GUILE_CONFIG" ; then
-    AC_PATH_PROG(GUILE_CONFIG, guile-config)
-  fi
-  if test -n "$GUILE_CONFIG" ; then
-    if test x"$GUILE" = xyes; then
-      AC_MSG_CHECKING([for guile bindir])
-      guile_bindir="`$GUILE_CONFIG info bindir`"
-      AC_MSG_RESULT([$guile_bindir])
-      GUILE=$guile_bindir/guile
-      if ! test -f "$GUILE" ; then
-	GUILE=
-        AC_PATH_PROG(GUILE, guile)
-      fi
-    fi
-
-    if test -f "$GUILE" ; then
-      AC_MSG_CHECKING([for guile version])
-      guile_version=`$GUILE -c '(display (effective-version))'`
-      AC_MSG_RESULT([$guile_version])
-      AC_MSG_CHECKING([for guile version >= 1.8])
-      guile_good_version=`$GUILE -c '(if (>= (string->number (effective-version)) 1.8) (display "yes") (display "no"))'`
-      AC_MSG_RESULT([$guile_good_version])
-      if test x"$guile_good_version" != xyes ; then
-        GUILE=
-      fi
-    fi
-
-    if test -z "$GUILE_CFLAGS" ; then
-      AC_MSG_CHECKING([for guile compile flags])
-      GUILE_CFLAGS="`$GUILE_CONFIG compile`" # Note that this can sometimes be empty
-      AC_MSG_RESULT([$GUILE_CFLAGS])
-    fi
-
-    if test -z "$GUILE_LIBS" ; then
-      AC_MSG_CHECKING([for guile link flags])
-      GUILE_LIBS="`$GUILE_CONFIG link`"
-      AC_MSG_RESULT([$GUILE_LIBS])
-    fi
-  fi
-fi
-
-AC_SUBST(GUILE)
-AC_SUBST(GUILE_CFLAGS)
-AC_SUBST(GUILE_LIBS)
-
-#----------------------------------------------------------------
-# Look for MzScheme
-#----------------------------------------------------------------
-
-AC_ARG_WITH(mzscheme, AS_HELP_STRING([--without-mzscheme], [Disable MzScheme])
-AS_HELP_STRING([--with-mzscheme=path], [Set location of MzScheme executable]),[ MZSCHEMEBIN="$withval"], [MZSCHEMEBIN="$alllang_default"])
-AC_ARG_WITH(mzc, AS_HELP_STRING([--with-mzc=path], [Set location of MzScheme's mzc]), [ MZCBIN="$withval"], [MZCBIN=])
-
-# First, check for "--without-mzscheme" or "--with-mzscheme=no".
-if test x"${MZSCHEMEBIN}" = xno; then
-  AC_MSG_NOTICE([Disabling MzScheme])
-  MZC=
-else
-  if test "x$MZSCHEMEBIN" = xyes; then
-     AC_PATH_PROG(MZSCHEME, mzscheme)
-  else
-     MZSCHEME="$MZSCHEMEBIN"
-  fi
-
-  if test -z "$MZCBIN"; then
-     AC_PATH_PROG(MZC, mzc)
-  fi
-
-  if test -n "$MZSCHEME"; then
-    AC_MSG_CHECKING(for MzScheme dynext object)
-    MZDYNOBJ=`$MZSCHEME --eval '(begin (require dynext/link) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (printf "~a" x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null`
-    if test -f "$MZDYNOBJ"; then
-      :
-    else
-      # older versions (3.72 approx and earlier)
-      MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null`
-    fi
-    if test -f "$MZDYNOBJ"; then
-      AC_MSG_RESULT($MZDYNOBJ)
-    else
-      AC_MSG_RESULT(not found)
-      MZDYNOBJ=""
-    fi
-  fi
-fi
-AC_SUBST(MZDYNOBJ)
-
-#----------------------------------------------------------------
-# Look for Ruby
-#----------------------------------------------------------------
-
-RUBYBIN=
-
-AC_ARG_WITH(ruby, AS_HELP_STRING([--without-ruby], [Disable Ruby])
-AS_HELP_STRING([--with-ruby=path], [Set location of Ruby executable]),[ RUBYBIN="$withval"], [RUBYBIN="$alllang_default"])
-
-# First, check for "--without-ruby" or "--with-ruby=no".
-RUBYSO=$SO
-if test x"${RUBYBIN}" = xno; then
-AC_MSG_NOTICE([Disabling Ruby])
-RUBY=
-else
-
-# First figure out what the name of Ruby is
-
-if test "x$RUBYBIN" = xyes; then
-	AC_CHECK_PROGS(RUBY, ruby)
-else
-	RUBY="$RUBYBIN"
-fi
-
-AC_MSG_CHECKING(for Ruby header files)
-if test -n "$RUBY"; then
-        # Try Ruby1.9+ first
-        RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || $rubyhdrdir') 2>/dev/null`
-        RUBYARCHHDRDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyarchhdrdir"]] || $rubyarchhdrdir') 2>/dev/null`
-	if test x"$RUBYDIR" = x"" || test x"$RUBYDIR" = x"nil"; then
-		RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
-        else
-                RUBYARCH=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]] || $arch') 2>/dev/null`
-        fi
-	if test x"$RUBYDIR" != x""; then
-		dirs="$RUBYDIR"
-		RUBYINCLUDE=
-		for i in $dirs; do
-			if test -r $i/ruby.h; then
-				if test x"$RUBYARCH" = x""; then
-					RUBYINCLUDE="-I$i"
-				elif test -n "$RUBYARCHHDRDIR"; then
-					RUBYINCLUDE="-I$i -I$RUBYARCHHDRDIR"
-				else
-					RUBYINCLUDE="-I$i -I$i/$RUBYARCH"
-				fi
-				AC_MSG_RESULT($RUBYINCLUDE)
-				break
-			fi
-		done
-		if test x"$RUBYINCLUDE" = x""; then
-			AC_MSG_RESULT(could not locate ruby.h)
-		fi
-
-		# Find library and path for linking.
-		AC_MSG_CHECKING(for Ruby library)
-		RUBYLIB=""
-		rb_archlibdir=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["archlibdir"]]') 2>/dev/null`
-		rb_libdir=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["libdir"]]') 2>/dev/null`
-		rb_bindir=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["bindir"]]') 2>/dev/null`
-		dirs="$dirs $rb_archlibdir $rb_libdir $rb_bindir"
-
-        rb_libruby=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["LIBRUBY_A"]]') 2>/dev/null`
-        RUBYLINK=`($RUBY -rrbconfig -e '
-            c = RbConfig::CONFIG
-            if c.has_key? "LIBRUBYARG_STATIC" # 1.8.x
-                if c[["LIBRUBY"]] == c[["LIBRUBY_A"]]
-                    link = c[["LIBRUBYARG_STATIC"]]
-                else
-                    link = c[["LIBRUBYARG_SHARED"]]
-                end
-            else # 1.6.x
-                link = "-l" + c[["RUBY_INSTALL_NAME"]]
-            end
-
-            # Get the target Ruby was built for
-            target = c[["target"]]
-
-            if target == "i386-pc-mswin32"
-              # Need to change msvcrt-ruby*.lib to -lmsvcrt-ruby*
-              ext = File.extname(link)
-              # Get index that counts backwards from end of string
-              index = -1 - ext.size
-              # Strip off the extension
-              link = link.slice(0..index)
-              puts "-l#{link}"
-            else
-              puts link
-            end') 2>/dev/null`
-
-		if test "$rb_libruby" != ""; then
-			for i in $dirs; do
-				if (test -r $i/$rb_libruby;) then
-					RUBYLIB="$i"
-					break
-				fi
-			done
-		fi
-		if test "$RUBYLIB" = ""; then
-			RUBYLIB="$RUBYDIR"
-			AC_MSG_RESULT(not found... using $RUBYDIR)
-		else
-			AC_MSG_RESULT($RUBYLINK in $RUBYLIB)
-		fi
-	else
-		AC_MSG_RESULT(unable to determine ruby configuration)
-	fi
-
-	case $host in
-		*-*-mingw*) ;; # do nothing, the default windows libraries are already included
-		*) RUBYLINK="$RUBYLINK `($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["LIBS"]]') 2>/dev/null`";;
-	esac
-
-	RUBYCCDLFLAGS=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["CCDLFLAGS"]]') 2>/dev/null`
-	RUBYSO=.`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["DLEXT"]]') 2>/dev/null`
-else
-	AC_MSG_RESULT(could not figure out how to run ruby)
-fi
-
-case $host in
-*-*-cygwin* | *-*-mingw*)	RUBYDYNAMICLINKING="-L$RUBYLIB $RUBYLINK";;
-*)		RUBYDYNAMICLINKING="";;
-esac
-fi
-
-AC_SUBST(RUBYINCLUDE)
-AC_SUBST(RUBYLIB)
-AC_SUBST(RUBYLINK)
-AC_SUBST(RUBYCCDLFLAGS)
-AC_SUBST(RUBYSO)
-AC_SUBST(RUBYDYNAMICLINKING)
-
-#-------------------------------------------------------------------------
-# Look for PHP5
-#-------------------------------------------------------------------------
-
-PHP5BIN=
-
-AC_ARG_WITH(php5, AS_HELP_STRING([--without-php5], [Disable PHP5])
-AS_HELP_STRING([--with-php5=path], [Set location of PHP5 executable]),[ PHP5BIN="$withval"], [PHP5BIN="$alllang_default"])
-
-# First, check for "--without-php5" or "--with-php5=no".
-if test x"${PHP5BIN}" = xno; then
-    AC_MSG_NOTICE([Disabling PHP5])
-    PHP5=
-else
-    if test "x$PHP5BIN" = xyes; then
-      AC_CHECK_PROGS(PHP5, [php5 php])
-    else
-      PHP5=$PHP5BIN
-    fi
-
-    if test -n "$PHP5"; then
-      AC_MSG_CHECKING(for PHP5 header files)
-      dnl /usr/bin/php5 -> /usr/bin/php-config5
-      case $PHP5 in
-        *5)
-          PHP5CONFIG=`echo "$PHP5"|sed 's/5$/-config5/'` ;;
-        *)
-          PHP5CONFIG=$PHP5-config ;;
-      esac
-      php5_version=`$PHP5CONFIG --version 2>/dev/null`
-      case $php5_version in
-      5*)
-        PHP5INC=`$PHP5CONFIG --includes 2>/dev/null`
-        if test -n "$PHP5INC"; then
-          AC_MSG_RESULT($PHP5INC)
-        else
-          AC_MSG_RESULT(not found)
-        fi
-        ;;
-      "")
-        AC_MSG_RESULT([could not find $PHP5CONFIG or obtain PHP5 version from it]) ;;
-      *)
-        AC_MSG_RESULT([found PHP $php_version - not PHP 5]) ;;
-      esac
-    fi
-fi
-AC_SUBST(PHP5)
-AC_SUBST(PHP5INC)
-
-#-------------------------------------------------------------------------
-# Look for PHP7
-#-------------------------------------------------------------------------
-
-PHPBIN=
-
-AC_ARG_WITH(php, AS_HELP_STRING([--without-php], [Disable PHP])
-AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHPBIN="$withval"], [PHPBIN="$alllang_default"])
-
-# First, check for "--without-php" or "--with-php=no".
-if test x"${PHPBIN}" = xno; then
-    AC_MSG_NOTICE([Disabling PHP])
-    PHP=
-else
-    if test "x$PHPBIN" = xyes; then
-      AC_CHECK_PROGS(PHP, [php7.1 php7.0 php])
-    else
-      PHP=$PHPBIN
-    fi
-
-    if test -n "$PHP"; then
-      AC_MSG_CHECKING(for PHP header files)
-      dnl /usr/bin/php7.0 -> /usr/bin/php-config7.0
-      case $PHP in
-        *7.*)
-          PHPCONFIG=`echo "$PHP"|sed 's/7\...*$/-config&/'` ;;
-        *)
-          PHPCONFIG=$PHP-config ;;
-      esac
-      php_version=`$PHPCONFIG --version 2>/dev/null`
-      case $php_version in
-      7.*)
-        PHPINC=`$PHPCONFIG --includes 2>/dev/null`
-        if test -n "$PHPINC"; then
-          AC_MSG_RESULT($PHPINC)
-        else
-          AC_MSG_RESULT(not found)
-        fi
-        ;;
-      "")
-        AC_MSG_RESULT([could not find $PHPCONFIG or obtain PHP version from it]) ;;
-      *)
-        AC_MSG_RESULT([found PHP $php_version - not PHP 7]) ;;
-      esac
-    fi
-fi
-AC_SUBST(PHP)
-AC_SUBST(PHPINC)
-
-#----------------------------------------------------------------
-# Look for ocaml
-#----------------------------------------------------------------
-
-AC_ARG_WITH(ocaml, AS_HELP_STRING([--without-ocaml], [Disable OCaml]), [with_ocaml="$withval"], [with_ocaml="$alllang_default"])
-AC_ARG_WITH(ocamlc,[  --with-ocamlc=path      Set location of ocamlc executable],[ OCAMLC="$withval"], [OCAMLC=])
-AC_ARG_WITH(ocamldlgen,[  --with-ocamldlgen=path  Set location of ocamldlgen],[ OCAMLDLGEN="$withval" ], [OCAMLDLGEN=])
-AC_ARG_WITH(ocamlfind,[  --with-ocamlfind=path   Set location of ocamlfind],[OCAMLFIND="$withval"],[OCAMLFIND=])
-AC_ARG_WITH(ocamlmktop,[  --with-ocamlmktop=path  Set location of ocamlmktop executable],[ OCAMLMKTOP="$withval"], [OCAMLMKTOP=])
-AC_ARG_WITH(camlp4,[  --with-camlp4=path  Set location of camlp4 executable],[ CAMLP4="$withval"], [CAMLP4=])
-
-# First, check for "--without-ocaml" or "--with-ocaml=no".
-if test x"${with_ocaml}" = xno; then
-    AC_MSG_NOTICE([Disabling OCaml])
-    OCAMLC=
-else
-    AC_MSG_CHECKING(for Ocaml DL load generator)
-    if test -z "$OCAMLDLGEN"; then
-	AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen)
-    fi
-
-    AC_MSG_CHECKING(for Ocaml package tool)
-	if test -z "$OCAMLFIND"; then
-	AC_CHECK_PROGS(OCAMLFIND, ocamlfind)
-    fi
-
-    AC_MSG_CHECKING(for Ocaml compiler)
-	if test -z "$OCAMLC"; then
-	AC_CHECK_PROGS(OCAMLC, ocamlc)
-    fi
-
-    AC_MSG_CHECKING(for Ocaml toplevel creator)
-    if test -z "$OCAMLMKTOP"; then
-	AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop)
-    fi
-
-    AC_MSG_CHECKING(for Ocaml Pre-Processor-Pretty-Printer)
-    if test -z "$CAMLP4"; then
-	AC_CHECK_PROGS(CAMLP4, camlp4)
-    fi
-fi # Disabling ocaml
-
-AC_SUBST(OCAMLC)
-AC_SUBST(OCAMLDLGEN)
-AC_SUBST(OCAMLFIND)
-AC_SUBST(OCAMLMKTOP)
-AC_SUBST(CAMLP4)
-
-#----------------------------------------------------------------
-# Look for Pike
-#----------------------------------------------------------------
-
-# Identify the name of the Pike executable
-# Priority: configure option, automatic search
-PIKEBIN=
-AC_ARG_WITH(pike, AS_HELP_STRING([--without-pike], [Disable Pike])
-AS_HELP_STRING([--with-pike=path], [Set location of Pike executable]),[PIKEBIN="$withval"], [PIKEBIN="$alllang_default"])
-
-# First, check for "--without-pike" or "--with-pike=no".
-if test x"${PIKEBIN}" = xno; then
-    AC_MSG_NOTICE([Disabling Pike])
-    PIKEBIN=
-else
-
-if test "x$PIKEBIN" = xyes; then
-	AC_CHECK_PROGS(PIKE, pike pike7.8 pike7.6 pike7.4 pike7.2)
-else
-	PIKE="$PIKEBIN"
-fi
-
-
-# Check for pike-config
-# Priority: configure option, guessed from $PIKE, search from list
-AC_ARG_WITH(pike-config, AS_HELP_STRING([--with-pike-config=path],
-  	[Set location of pike-config script]),
-  [PIKECONFIG="$withval"], [PIKECONFIG=""])
-
-if test -z "$PIKECONFIG" -a -n "$PIKE"; then
-	AC_CHECK_PROGS(PIKECONFIG, $PIKE-config pike-config \
-		pike7.6-config pike7.4-config pike7.2-config)
-fi
-
-# Check for a --with-pikeincl option to configure
-# Priority: configure option, info from $PIKECONFIG, guessed by pike script
-AC_ARG_WITH(pikeincl, AS_HELP_STRING([--with-pikeincl=path],
-	[Set location of Pike include directory]),
-  [PIKEINCLUDE="-I$withval"], [PIKEINCLUDE=])
-
-if test -n "$PIKE"; then
-      AC_MSG_CHECKING([for Pike header files])
-      if test -z "$PIKEINCLUDE" -a -n "$PIKECONFIG"; then
-        PIKEINCLUDE=`$PIKECONFIG --cflags`
-      fi
-      if test -z "$PIKEINCLUDE" -a -n "$PIKE"; then
-        PIKEINCLUDE=`$PIKE -x cflags`
-        if test -z "$PIKEINCLUDE"; then
-          PIKEPATH=`which $PIKE`
-          PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH`
-          PIKEINCLUDE="-I$PIKEINCLUDE"
-        fi
-      fi
-
-      if test -z "$PIKEINCLUDE"; then
-        AC_MSG_RESULT(not found)
-      else
-        AC_MSG_RESULT($PIKEINCLUDE)
-      fi
-fi
-fi
-
-AC_SUBST(PIKEINCLUDE)
-AC_SUBST(PIKECCDLFLAGS)		dnl XXX: where is this used/defined?
-AC_SUBST(PIKEDYNAMICLINKING)	dnl XXX: where is this used/defined?
-
-#----------------------------------------------------------------
-# Look for CHICKEN
-#----------------------------------------------------------------
-
-CHICKEN=
-CHICKEN_CONFIG=
-CHICKENHOME=
-CHICKENOPTS=
-CHICKENLIB=
-
-
-AC_ARG_WITH(chicken, AS_HELP_STRING([--without-chicken], [Disable CHICKEN])
-AS_HELP_STRING([--with-chicken=path], [Set location of CHICKEN executable]),[ CHICKENBIN="$withval"], [CHICKENBIN="$alllang_default"])
-
-# First, check for "--without-chicken" or "--with-chicken=no".
-if test x"${CHICKENBIN}" = xno; then
-AC_MSG_NOTICE([Disabling CHICKEN])
-else
-
-if test "x$CHICKENBIN" = xyes; then
-AC_CHECK_PROGS(CHICKEN, chicken)
-else
-CHICKEN="$CHICKENBIN"
-fi
-
-AC_ARG_WITH(chickencsc,[  --with-chickencsc=path  Set location of csc executable],[ CHICKEN_CSC="$withval"], [CHICKEN_CSC=])
-
-if test -z "$CHICKEN_CSC"; then
-  AC_CHECK_PROGS(CHICKEN_CSC, csc)
-  # Both the Microsoft C# compiler and chicken have an executable called csc, so check that this csc is really the chicken one
-  if test -n "$CHICKEN_CSC" ; then
-    AC_MSG_CHECKING(whether csc is the chicken compiler)
-    $CHICKEN_CSC -version 2>/dev/null | grep "chicken" > /dev/null || CHICKEN_CSC=""
-    if test -z "$CHICKEN_CSC"; then
-      AC_MSG_RESULT(no)
-    else
-      AC_MSG_RESULT(yes)
-    fi
-  fi
-fi
-
-AC_ARG_WITH(chickencsi,[  --with-chickencsi=path  Set location of csi executable],[ CHICKEN_CSI="$withval"], [CHICKEN_CSI=])
-
-if test -z "$CHICKEN_CSI"; then
-AC_CHECK_PROGS(CHICKEN_CSI, csi)
-fi
-
-if test -n "$CHICKEN_CSC" ; then
-
-  AC_ARG_WITH(chickenopts,[  --with-chickenopts=args Set compiler options for static CHICKEN generated code],[
-	CHICKENOPTS="$withval"], [CHICKENOPTS=])
-  AC_ARG_WITH(chickensharedlib,[  --with-chickensharedlib=args    Set linker options for shared CHICKEN generated code],[
-	CHICKENSHAREDLIB="$withval"], [CHICKENSHAREDLIB=])
-  AC_ARG_WITH(chickenlib,[  --with-chickenlib=args  Set linker options for static CHICKEN generated code],[
-	CHICKENLIB="$withval"], [CHICKENLIB=])
-
-  AC_MSG_CHECKING(for compiler options for static CHICKEN generated code)
-  if test -z "$CHICKENOPTS"; then
-        CHICKENOPTS="`$CHICKEN_CSC -cflags`"
-  else
-        CHICKENOPTS="`$CHICKEN_CSC -cflags` $CHICKENOPTS"
-  fi
-  if test -z "$CHICKENOPTS"; then
-        AC_MSG_RESULT(not found)
-  else
-        AC_MSG_RESULT($CHICKENOPTS)
-  fi
-
-  AC_MSG_CHECKING(for linker options for shared CHICKEN generated code)
-  if test -z "$CHICKENSHAREDLIB"; then
-        CHICKENSHAREDLIB="`$CHICKEN_CSC -shared -libs`"
-  else
-        CHICKENSHAREDLIB="`$CHICKEN_CSC -shared -libs` $CHICKENSHAREDLIB"
-  fi
-  if test -z "$CHICKENSHAREDLIB"; then
-  	AC_MSG_RESULT(not found)
-  else
-        AC_MSG_RESULT($CHICKENSHAREDLIB)
-  fi
-
-  AC_MSG_CHECKING(for linker options for static CHICKEN generated code)
-  if test -z "$CHICKENLIB"; then
-        CHICKENLIB="`$CHICKEN_CSC -libs`"
-  else
-        CHICKENLIB="`$CHICKEN_CSC -libs` $CHICKENLIB"
-  fi
-  if test -z "$CHICKENLIB"; then
-  	AC_MSG_RESULT(not found)
-  else
-        AC_MSG_RESULT($CHICKENLIB)
-  fi
-
-fi # have CHICKEN_CONFIG
-fi # Check for --without-chicken
-
-AC_SUBST(CHICKEN)
-AC_SUBST(CHICKEN_CSC)
-AC_SUBST(CHICKEN_CSI)
-AC_SUBST(CHICKENOPTS)
-AC_SUBST(CHICKENLIB)
-AC_SUBST(CHICKENSHAREDLIB)
-
-#----------------------------------------------------------------
-# Look for C#
-#----------------------------------------------------------------
-
-AC_ARG_WITH(csharp, AS_HELP_STRING([--without-csharp], [Disable CSharp]), [with_csharp="$withval"], [with_csharp="$alllang_default"])
-AC_ARG_WITH(cil-interpreter, [  --with-cil-interpreter=path     Set location of CIL interpreter for CSharp],[CSHARPBIN="$withval"], [CSHARPBIN=])
-AC_ARG_WITH(csharp-compiler, [  --with-csharp-compiler=path     Set location of CSharp compiler],[CSHARPCOMPILERBIN="$withval"], [CSHARPCOMPILERBIN=])
-
-# First, check for "--without-csharp" or "--with-csharp=no".
-if test x"${with_csharp}" = xno; then
-AC_MSG_NOTICE([Disabling CSharp])
-CSHARPCOMPILER=
-else
-
-if test -z "$CSHARPCOMPILERBIN" ; then
-  case $host in
-  *-*-cygwin* | *-*-mingw*)
-    # prefer Mono gmcs (.NET 2.0) over mcs (.NET 1.1) - note mcs-1.2.3 has major pinvoke bug
-    AC_CHECK_PROGS(CSHARPCOMPILER, csc mono-csc gmcs mcs cscc)
-    if test -n "$CSHARPCOMPILER" && test "$CSHARPCOMPILER" = "csc" ; then
-      AC_MSG_CHECKING(whether csc is the Microsoft CSharp compiler)
-      csc 2>/dev/null | grep "C#" > /dev/null || CSHARPCOMPILER=""
-      if test -z "$CSHARPCOMPILER" ; then
-        AC_MSG_RESULT(no)
-        AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc)
-      else
-        AC_MSG_RESULT(yes)
-      fi
-    fi
-    ;;
-  *)AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc);;
-  esac
-else
-  CSHARPCOMPILER="$CSHARPCOMPILERBIN"
-fi
-
-CSHARPCONVERTPATH="Tools/convertpath -u"
-if test -z "$CSHARPBIN" ; then
-  CSHARPCILINTERPRETER=""
-  CSHARPCILINTERPRETER_FLAGS=""
-  if test "cscc" = "$CSHARPCOMPILER" ; then
-    AC_CHECK_PROGS(CSHARPCILINTERPRETER, ilrun)
-  else
-    if test "mcs" = "$CSHARPCOMPILER"; then
-      # Check that mcs is the C# compiler and not the Unix mcs utility by examining the output of 'mcs --version'
-      # The Mono compiler should emit: Mono C# compiler version a.b.c.d
-      csharp_version_raw=`(mcs --version) 2>/dev/null`
-      csharp_version_searched=`(mcs --version | sed -e "/C#/b" -e "/Mono/b" -e d) 2>/dev/null` # return string if contains 'Mono' or 'C#'
-      CSHARPCOMPILER=""
-      if test -n "$csharp_version_raw" ; then
-        if test "$csharp_version_raw" = "$csharp_version_searched" ; then
-          CSHARPCOMPILER="mcs"
-        fi
-      fi
-      if test "mcs" != "$CSHARPCOMPILER" ; then
-        echo "mcs is not a working Mono C# compiler"
-      fi
-    fi
-    if test "mcs" = "$CSHARPCOMPILER" || test "gmcs" = "$CSHARPCOMPILER" || test "mono-csc" = "$CSHARPCOMPILER"; then
-        AC_CHECK_PROGS(CSHARPCILINTERPRETER, mono) # Mono JIT
-        CSHARPCILINTERPRETER_FLAGS="--debug"
-    else
-      if test "csc" = "$CSHARPCOMPILER"; then
-          CSHARPCONVERTPATH="Tools/convertpath -w"
-      fi
-    fi
-  fi
-else
-  CSHARPCILINTERPRETER="$CSHARPBIN"
-fi
-
-# Cygwin requires the Windows standard (Pascal) calling convention as it is a Windows executable and not a Cygwin built executable
-case $host in
-*-*-cygwin* | *-*-mingw*)
-    if test "$GCC" = yes; then
-        CSHARPDYNAMICLINKING="$GCC_MNO_CYGWIN -mthreads -Wl,--add-stdcall-alias"
-        CSHARPCFLAGS="$GCC_MNO_CYGWIN -mthreads"
-    else
-        CSHARPDYNAMICLINKING=""
-        CSHARPCFLAGS=""
-    fi ;;
-*)
-        CSHARPDYNAMICLINKING=""
-        CSHARPCFLAGS=""
-        ;;
-esac
-
-# CSharp on Windows platforms including Cygwin doesn't use libname.dll, rather name.dll when loading dlls
-case $host in
-*-*-cygwin* | *-*-mingw*) CSHARPLIBRARYPREFIX="";;
-*)CSHARPLIBRARYPREFIX="lib";;
-esac
-
-# C#/Mono on Mac OS X tweaks
-case $host in
-*-*-darwin*)
-    CSHARPSO=".so"
-    ;;
-*)
-    CSHARPSO=$SO
-    ;;
-esac
-fi
-
-AC_SUBST(CSHARPCILINTERPRETER_FLAGS)
-AC_SUBST(CSHARPCILINTERPRETER)
-AC_SUBST(CSHARPCONVERTPATH)
-AC_SUBST(CSHARPCOMPILER)
-AC_SUBST(CSHARPDYNAMICLINKING)
-AC_SUBST(CSHARPLIBRARYPREFIX)
-AC_SUBST(CSHARPCFLAGS)
-AC_SUBST(CSHARPSO)
-
-#----------------------------------------------------------------
-# Look for Lua
-#----------------------------------------------------------------
-
-LUABIN=
-LUAINCLUDE=
-LUALIB=
-LUADYNAMICLOADLIB=
-LUAFLAGS=
-LUALINK=
-# note: if LUABIN is empty then lua tests will not be done
-# LUABIN will be cleared if certain dependencies cannot be found
-
-AC_ARG_WITH(lua, AS_HELP_STRING([--without-lua], [Disable Lua])
-AS_HELP_STRING([--with-lua=path], [Set location of Lua executable]),[ LUABIN="$withval"], [LUABIN="$alllang_default"])
-AC_ARG_WITH(luaincl,[  --with-luaincl=path     Set location of Lua include directory],[
-	LUAINCLUDE="$withval"], [LUAINCLUDE=])
-AC_ARG_WITH(lualib,[  --with-lualib=path      Set location of Lua library directory],[
-	LUALIB="$withval"], [LUALIB=])
-
-# First, check for "--without-lua" or "--with-lua=no".
-if test x"${LUABIN}" = xno; then
-AC_MSG_NOTICE([Disabling Lua])
-else
-
-# can we find lua?
-if test "x$LUABIN" = xyes; then
-   # We look for a versioned Lua binary first, as there can be
-   # multiple versions of Lua installed on some systems (like Debian).
-   # The search order should match the include-file and library search
-   # orders below (a Lua shared library built for one version may not
-   # work with a Lua binary of a different version).
-   AC_PATH_PROGS(LUABIN, [lua5.4 lua5.3 lua5.2 lua5.1 lua])
-fi
-
-# check version: we need Lua 5.x
-if test "$LUABIN"; then
-  AC_MSG_CHECKING(Lua version)
-  # if version 5.x
-  LUAV5=`$LUABIN -e 'if string.sub(_VERSION,5,5)=="5" then print "1" end'`
-  # if not version 5.0
-  LUAV51=`$LUABIN -e 'if string.sub(_VERSION,5,7)~="5.0" then print "1" end'`
-
-  if test -z "$LUAV5"; then
-    AC_MSG_WARN(Not Lua 5.x, SWIG does not support this version of Lua)
-    LUABIN=""
-  elif test -z "$LUAV51"; then
-    AC_MSG_RESULT(Lua 5.0.x)
-  else
-    AC_MSG_RESULT(Lua 5.1 or later)
-  fi
-fi
-
-if test "$LUABIN"; then
-  AC_MSG_CHECKING(whether Lua dynamic loading is enabled)
-  # using Lua to check Lua
-  # lua 5.0 & 5.1 have different fn names
-  if test -z "$LUAV51"; then
-    LUADYNAMICLOADLIB=`$LUABIN -e '_,_,c=loadlib("no_such_lib","") if c~="absent" then print "1" end'`
-  else
-    LUADYNAMICLOADLIB=`$LUABIN -e '_,_,c=package.loadlib("no_such_lib","") if c~="absent" then print "1" end'`
-  fi
-
-  if test -z "$LUADYNAMICLOADLIB"; then
-    AC_MSG_RESULT(no)
-  else
-    AC_MSG_RESULT(yes)
-  fi
-
-  # look for the header files & set LUAFLAGS accordingly
-  # will clear LUABIN if not present
-  if test -n "$LUAINCLUDE"; then
-    AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="$ISYSTEM$LUAINCLUDE"],[LUABIN=])
-  else
-    LUA_OK="1"
-    CFLAGS_SAVED=$CFLAGS
-    CFLAGS= # Use empty CFLAGS to avoid failure: "present but cannot be compiled"
-    AC_CHECK_HEADER([lua.h],[LUAFLAGS=""],[LUA_OK=""])
-    CFLAGS=$CFLAGS_SAVED
-    # if we didn't get it, going to have to look elsewhere (the hard way)
-    if test -z "$LUA_OK"; then
-      AC_MSG_CHECKING(for lua.h in other locations)
-      # note: Debian/Ubuntu seem to like /usr/include/lua5.1/lua.h
-      # The ordering of the include directories to search should match
-      # the ordering of libraries to search in the library test below.
-      inc=/usr/include
-      dirs="$inc/lua5.4 $inc/lua5.3 $inc/lua5.2 $inc/lua5.1 $inc/lua51 $inc/lua5.0 $inc/lua50 /usr/local/include"
-      for i in $dirs; do
-        #echo "$i"
-        if test -r $i/lua.h; then
-          AC_MSG_RESULT($i/lua.h)
-          LUAFLAGS="$ISYSTEM$i"
-          break
-        fi
-      done
-      if test -z "$LUAFLAGS"; then
-        AC_MSG_RESULT(not found)
-        LUABIN="" # clear the bin
-      fi
-    fi
-  fi
-
-  # look for the library files & set LUALINK accordingly
-  # will clear LUABIN if not present
-  lua_save_LIBS=$LIBS # the code seems to disrupt LIBS, so saving
-
-  if test -n "$LUALIB"; then
-    AC_CHECK_FILE($LUALIB/liblua.a,[LUALINK="-L$LUALIB -llua"],[LUABIN=])
-  else
-    AC_SEARCH_LIBS(lua_close, [lua lua5.4 lua5.3 lua5.2 lua5.1 lua51 lua5.0 lua50], [LUALINK="-l$ac_lib"],[LUABIN=])
-  fi
-
-  # adding lualib for lua 5.0
-  if test -z "$LUAV51"; then # extra for lua 5.0
-    LUALINK="$LUALINK -llualib"
-  fi
-
-  LIBS=$lua_save_LIBS	# restore LIBS
-fi
-
-fi # if not disabled
-
-AC_SUBST(LUADYNAMICLINKING)
-AC_SUBST(LUAFLAGS)
-AC_SUBST(LUALINK)
-AC_SUBST(LUABIN)
-
-#----------------------------------------------------------------
-# Look for Allegro Common Lisp
-#----------------------------------------------------------------
-
-ALLEGROCLBIN=
-
-AC_ARG_WITH(allegrocl, AS_HELP_STRING([--without-allegrocl], [Disable Allegro CL])
-AS_HELP_STRING([--with-allegrocl=path], [Set location of Allegro CL executable (alisp)]),[ ALLEGROCLBIN="$withval"], [ALLEGROCLBIN="$alllang_default"])
-
-# First, check for "--without-allegrocl" or "--with-allegrocl=no".
-if test x"${ALLEGROCLBIN}" = xno; then
-AC_MSG_NOTICE([Disabling Allegro CL])
-ALLEGROCLBIN=
-else
-
-# can we find allegrocl?
-if test "x$ALLEGROCLBIN" = xyes; then
-   AC_PATH_PROG(ALLEGROCLBIN, alisp)
-fi
-fi
-
-AC_SUBST(ALLEGROCLBIN)
-
-#----------------------------------------------------------------
-# Look for GNU CLISP
-#----------------------------------------------------------------
-
-CLISPBIN=
-
-AC_ARG_WITH(clisp, AS_HELP_STRING([--without-clisp], [Disable CLISP])
-AS_HELP_STRING([--with-clisp=path], [Set location of CLISP executable (clisp)]),[ CLISPBIN="$withval"], [CLISPBIN="$alllang_default"])
-
-# First, check for "--without-clisp" or "--with-clisp=no".
-if test x"${CLISPBIN}" = xno; then
-AC_MSG_NOTICE([Disabling CLISP])
-CLISPBIN=
-else
-
-# can we find clisp?
-if test "x$CLISPBIN" = xyes; then
-   AC_PATH_PROG(CLISPBIN, clisp)
-fi
-fi
-
-AC_SUBST(CLISPBIN)
-
-#----------------------------------------------------------------
-# Look for GNU R
-#----------------------------------------------------------------
-
-RBIN=
-
-AC_ARG_WITH(r, AS_HELP_STRING([--without-r], [Disable R])
-AS_HELP_STRING([--with-r=path], [Set location of R executable (r)]),[ RBIN="$withval"], [RBIN="$alllang_default"])
-
-# First, check for "--without-r" or "--with-r=no".
-if test x"${RBIN}" = xno; then
-AC_MSG_NOTICE([Disabling R])
-RBIN=
-else
-
-# can we find R?
-if test "x$RBIN" = xyes; then
-   AC_PATH_PROG(RBIN, R)
-fi
-fi
-
-AC_SUBST(RBIN)
-
-#----------------------------------------------------------------
-# Look for Go compilers
-#----------------------------------------------------------------
-
-AC_ARG_WITH(go, AS_HELP_STRING([--without-go], [Disable Go])
-AS_HELP_STRING([--with-go=path], [Set location of Go compiler]),[GOBIN="$withval"], [GOBIN="$alllang_default"])
-
-if test x"${GOBIN}" = xno; then
-  AC_MSG_NOTICE([Disabling Go])
-  GO=
-  GOC=
-  GO1=false
-  GO12=false
-  GO13=false
-  GO15=false
-  GOGCC=false
-  GCCGO=
-  GOOPT=
-  GCCGOOPT=
-  GOVERSIONOPTION=
-else
-
-  if test "x$GOBIN" = xyes; then
-    AC_CHECK_PROGS(GO, go)
-  else
-    GO="$GOBIN"
-  fi
-
-  GOGCC=false
-  GCCGO=
-  GO1=false
-  GO12=false
-  GO13=false
-  GO15=false
-  GOOPT=
-  GCCGOOPT=
-  GOVERSIONOPTION=
-
-  if test -n "$GO" ; then
-    GO1=true
-    GOVERSIONOPTION=version
-    go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
-    case "$go_version" in
-    go1 | go1.[[01234]]*)
-      GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
-      ;;
-    *)
-      GOC=compile
-      ;;
-    esac
-    AC_MSG_CHECKING([whether go version is too old])
-    case $go_version in
-    go1.1* | go1.0* | go1 )
-      AC_MSG_RESULT([yes - minimum version is 1.2])
-      GO=
-      GOOPT="-intgosize 32"
-      ;;
-    *)
-      AC_MSG_RESULT([no])
-      case "$(go env GOARCH)" in
-      amd64 | arm64 | ppc64*)
-        GOOPT="-intgosize 64"
-	;;
-      *)
-        GOOPT="-intgosize 32"
-	;;
-      esac
-      ;;
-    esac
-    case $go_version in
-    go1.0* | go1 | go1.1*)
-      GOOPT="$GOOPT -use-shlib"
-      ;;
-    go1.2*)
-      GO12=true
-      ;;
-    go1.3* | go1.4*)
-      GO13=true
-      ;;
-    *)
-      GO15=true
-      ;;
-    esac
-  fi
-
-  AC_CHECK_PROGS(GCCGO, gccgo)
-
-  if test -n "$GCCGO" ; then
-    if $GCCGO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
-      AC_MSG_CHECKING([whether gccgo version is too old])
-      go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
-      if test "x$go_version" = x; then
-        AC_MSG_RESULT([could not determine gccgo version])
-        GCCGO=
-      elif test "$go_version" -lt 470; then
-        AC_MSG_RESULT([yes - minimum version is 4.7.0])
-        GCCGO=
-      else
-        AC_MSG_RESULT([no])
-        if test "$go_version" -lt 480; then
-          GCCGOOPT="-intgosize 32"
-        else
-          AC_CHECK_SIZEOF([void *], [4])
-          if test "$ac_cv_sizeof_void_p" = "8"; then
-            GCCGOOPT="-intgosize 64"
-          else
-            GCCGOOPT="-intgosize 32"
-          fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-AC_SUBST(GOGCC)
-AC_SUBST(GCCGO)
-AC_SUBST(GO)
-AC_SUBST(GOC)
-AC_SUBST(GO1)
-AC_SUBST(GO12)
-AC_SUBST(GO13)
-AC_SUBST(GO15)
-AC_SUBST(GOOPT)
-AC_SUBST(GCCGOOPT)
-AC_SUBST(GOVERSIONOPTION)
-
-#----------------------------------------------------------------
-# Look for D
-#----------------------------------------------------------------
-
-AC_ARG_WITH(d, AS_HELP_STRING([--without-d], [Disable D]), [with_d="$withval"], [with_d="$alllang_default"])
-AC_ARG_WITH(d1-compiler, [  --with-d1-compiler=path  Set location of D1/Tango compiler (DMD compatible)],[D1COMPILERBIN="$withval"], [D1COMPILERBIN=])
-AC_ARG_WITH(d2-compiler, [  --with-d2-compiler=path  Set location of D2 compiler (DMD compatible)],[D2COMPILERBIN="$withval"], [D2COMPILERBIN=])
-
-
-# First, check for "--without-d" or "--with-d=no".
-if test x"${with_d}" = xno; then
-  AC_MSG_NOTICE([Disabling D])
-  D1COMPILER=
-  D2COMPILER=
-else
-  old_ac_ext=$ac_ext
-  ac_ext=d
-
-  if test -z "$D1COMPILERBIN" ; then
-    AC_CHECK_PROGS(D1COMPILER, dmd ldmd gdmd)
-
-    if test -n "$D1COMPILER" ; then
-      AC_MSG_CHECKING(whether the D1/Tango compiler works)
-      cat > conftest.$ac_ext <<_ACEOF
-import tango.io.Stdout;
-void main() {
-}
-_ACEOF
-      rm -f conftest.$ac_objext
-      AS_IF(
-        [_AC_DO_STDERR($D1COMPILER conftest.$ac_ext) && test ! -s conftest.err && test -s conftest.$ac_objext],
-        [AC_MSG_RESULT([yes])],
-        [_AC_MSG_LOG_CONFTEST AC_MSG_RESULT([no])
-        D1COMPILER=]
-      )
-      rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-  else
-    D1COMPILER="$D1COMPILERBIN"
-  fi
-
-  if test -z "$D2COMPILERBIN" ; then
-    AC_CHECK_PROGS(D2COMPILER, dmd gdmd)
-
-    if test -n "$D2COMPILER" ; then
-      AC_MSG_CHECKING(whether the D2 compiler works)
-      cat > conftest.$ac_ext <<_ACEOF
-import std.algorithm;
-void main() {
-}
-_ACEOF
-      rm -f conftest.$ac_objext
-      AS_IF(
-        [_AC_DO_STDERR($D2COMPILER conftest.$ac_ext) && test ! -s conftest.err && test -s conftest.$ac_objext],
-        [AC_MSG_RESULT([yes])],
-        [_AC_MSG_LOG_CONFTEST AC_MSG_RESULT([no])
-        D2COMPILER=]
-      )
-      rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-  else
-    D2COMPILER="$D2COMPILERBIN"
-  fi
-
-  ac_ext=$old_ac_ext
-fi
-
-if test -n "$D1COMPILER"; then
-  DDEFAULTVERSION=1
-elif test -n "$D2COMPILER"; then
-  DDEFAULTVERSION=2
-fi
-
-# Do not prefix library file names with "lib" on Windows.
-case $host in
-*-*-cygwin* | *-*-mingw*) DLIBPREFIX="";;
-*)DLIBPREFIX="lib";;
-esac
-
-AC_SUBST(D1COMPILER)
-AC_SUBST(D2COMPILER)
-AC_SUBST(DDEFAULTVERSION)
-AC_SUBST(DLIBPREFIX)
-
-#----------------------------------------------------------------
-# Determine which languages to use for examples/test-suite
-#----------------------------------------------------------------
-
-SKIP_TCL=
-if test -z "$TCLINCLUDE" || test -z "$TCLLIB" ; then
-    SKIP_TCL="1"
-fi
-AC_SUBST(SKIP_TCL)
-
-
-SKIP_PERL5=
-if test -z "$PERL" || test -z "$PERL5EXT" || test -z "$PERL5TESTMORE"; then
-    SKIP_PERL5="1"
-fi
-AC_SUBST(SKIP_PERL5)
-
-
-SKIP_OCTAVE=
-if test -z "$OCTAVE" ; then
-    SKIP_OCTAVE="1"
-fi
-AC_SUBST(SKIP_OCTAVE)
-
-
-SKIP_PYTHON=
-if (test -z "$PYINCLUDE" || test -z "$PYLINK") &&
-   (test -z "$PY3INCLUDE" || test -z "$PY3LINK") ; then
-    SKIP_PYTHON="1"
-fi
-AC_SUBST(SKIP_PYTHON)
-
-SKIP_PYTHON3=
-if test -z "$PY3INCLUDE" || test -z "$PY3LINK" ; then
-    SKIP_PYTHON3="1"
-fi
-AC_SUBST(SKIP_PYTHON3)
-
-SKIP_JAVA=
-if test -z "$JAVA" || test -z "$JAVAC" || test -z "$JAVAINC" ; then
-    SKIP_JAVA="1"
-fi
-AC_SUBST(SKIP_JAVA)
-
-SKIP_JAVASCRIPT=
-if test -z "$JAVASCRIPT" || ( test -z "$NODEJS" && test -z "$JSCENABLED" && test -z "$JSV8ENABLED" ) ; then
-    SKIP_JAVASCRIPT="1"
-fi
-AC_SUBST(SKIP_JAVASCRIPT)
-
-SKIP_GUILE=
-if test -z "$GUILE" || test -z "$GUILE_LIBS" ; then
-    SKIP_GUILE="1"
-fi
-AC_SUBST(SKIP_GUILE)
-
-
-SKIP_MZSCHEME=
-if test -z "$MZC" || test -z "$MZDYNOBJ" ; then
-    SKIP_MZSCHEME="1"
-fi
-AC_SUBST(SKIP_MZSCHEME)
-
-
-SKIP_RUBY=
-if test -z "$RUBY" || test -z "$RUBYINCLUDE" || test -z "$RUBYLIB" ; then
-    SKIP_RUBY="1"
-fi
-AC_SUBST(SKIP_RUBY)
-
-
-SKIP_PHP=
-if test -z "$PHP" || test -z "$PHPINC" ; then
-    SKIP_PHP="1"
-fi
-AC_SUBST(SKIP_PHP)
-
-
-SKIP_PHP5=
-if test -z "$PHP5" || test -z "$PHP5INC" ; then
-    SKIP_PHP5="1"
-fi
-AC_SUBST(SKIP_PHP5)
-
-
-SKIP_OCAML=
-if test -z "$OCAMLC" ; then
-    SKIP_OCAML="1"
-fi
-AC_SUBST(SKIP_OCAML)
-
-
-SKIP_PIKE=
-if test -z "$PIKE" || test -z "$PIKEINCLUDE" ; then
-    SKIP_PIKE="1"
-fi
-AC_SUBST(SKIP_PIKE)
-
-
-SKIP_CHICKEN=
-if test -z "$CHICKEN_CSC" || test -z "$CHICKEN"; then
-    SKIP_CHICKEN="1"
-fi
-AC_SUBST(SKIP_CHICKEN)
-
-
-SKIP_CSHARP=
-if test -z "$CSHARPCOMPILER" ; then
-    SKIP_CSHARP="1"
-else
-    if test "cscc" = "$CSHARPCOMPILER" && test -z "$CSHARPCILINTERPRETER" ; then
-      SKIP_CSHARP="1"
-    fi
-fi
-AC_SUBST(SKIP_CSHARP)
-
-SKIP_MODULA3="1" # Always skipped!
-AC_SUBST(SKIP_MODULA3)
-
-SKIP_LUA=
-# we need LUABIN & dynamic loading
-if test -z "$LUABIN" || test -z "$LUADYNAMICLOADLIB"; then
-    SKIP_LUA="1"
-fi
-AC_SUBST(SKIP_LUA)
-
-SKIP_ALLEGROCL=
-if test -z "$ALLEGROCLBIN" ; then
-    SKIP_ALLEGROCL="1"
-fi
-AC_SUBST(SKIP_ALLEGROCL)
-
-SKIP_CLISP=
-if test -z "$CLISPBIN" ; then
-    SKIP_CLISP="1"
-fi
-AC_SUBST(SKIP_CLISP)
-
-SKIP_R=
-if test -z "$RBIN" ; then
-    SKIP_R="1"
-fi
-AC_SUBST(SKIP_R)
-
-SKIP_CFFI=
-#if test -z "$CFFIBIN" ; then
-    SKIP_CFFI="1"
-#fi
-AC_SUBST(SKIP_CFFI)
-
-SKIP_UFFI=
-#if test -z "$UFFIBIN" ; then
-    SKIP_UFFI="1"
-#fi
-AC_SUBST(SKIP_UFFI)
-
-SKIP_SCILAB=
-if test -z "$SCILAB"; then
-    SKIP_SCILAB="1"
-fi
-AC_SUBST(SKIP_SCILAB)
-
-SKIP_GO=
-if test -z "$GO" ; then
-    SKIP_GO="1"
-fi
-AC_SUBST(SKIP_GO)
-
-SKIP_D=
-if test -z "$DDEFAULTVERSION" ; then
-    SKIP_D="1"
-fi
-AC_SUBST(SKIP_D)
-
-#----------------------------------------------------------------
-# Additional language dependencies
-#----------------------------------------------------------------
-SKIP_GCJ=
-if test -z "$GCJ" || test -z "$GCJH" ; then
-  SKIP_GCJ="1"
-else
-  if test "$GCC" != yes; then
-    SKIP_GCJ="1"
-  fi
-fi
-AC_SUBST(SKIP_GCJ)
-
-
-SKIP_ANDROID=
-if test -z "$ANDROID" || test -z "$ADB" || test -z "$ANT" || test -z "$NDKBUILD" ; then
-    SKIP_ANDROID="1"
-fi
-AC_SUBST(SKIP_ANDROID)
-
-
-
-#----------------------------------------------------------------
-# Miscellaneous
-#----------------------------------------------------------------
-
-ABS_SRCDIR=`(cd ${srcdir} && pwd)`
-
-dnl Under Cygwin, we may need native absolute path as it is used by SWIG, which
-dnl may be a native, and not a Cygwin, program (this is the case when it's
-dnl built using MinGW or cccl compiler in Cygwin environment). However it may,
-dnl although this is probably more rare, also be built as a Cygwin program.
-dnl Using "mixed" path like we do here allows the path to work in both cases.
-case $host in
-  *-*-mingw* ) ABS_SRCDIR=`${srcdir}/Tools/convertpath -m $ABS_SRCDIR` ;;
-  *-*-cygwin* ) ABS_SRCDIR=`cygpath --mixed $ABS_SRCDIR` ;;
-esac
-
-# Root directory
-ROOT_DIR=`pwd`
-case $host in
-*-*-cygwin*)
-  # Translate path for native Windows compilers for use with 'make check'
-  if (cygpath --mixed $ROOT_DIR) >/dev/null 2>/dev/null; then
-    ROOT_DIR=`cygpath --mixed $ROOT_DIR`
-  fi
-  ;;
-esac
-
-case $host in
-*-*-cygwin* | *-*-mingw*)
-  # Extra files generated by some Windows compilers
-  EXTRA_CLEAN="*.stackdump *.exp *.lib *.pdb *.ilk"
-  ;;
-esac
-
-AC_SUBST(ROOT_DIR)
-AC_SUBST(EXTRA_CLEAN)
-AC_SUBST(ac_aux_dir)
-
-# Configure SWIG_LIB path
-
-AC_ARG_WITH(swiglibdir,[  --with-swiglibdir=DIR   Put SWIG system-independent libraries into DIR.],
-  [swig_lib="$withval"], [swig_lib="${datadir}/swig/${PACKAGE_VERSION}"])
-SWIG_LIB_INSTALL=${swig_lib}
-AC_SUBST(SWIG_LIB_INSTALL)
-AC_DEFINE_DIR(SWIG_LIB, swig_lib, [Directory for SWIG system-independent libraries])
-
-case $build in
-  # Windows does not understand unix directories. Convert into a windows directory with drive letter.
-  *-*-mingw*) SWIG_LIB_WIN_UNIX=`${srcdir}/Tools/convertpath -m $SWIG_LIB`;;
-  *-*-cygwin*) SWIG_LIB_WIN_UNIX=`cygpath --mixed "$SWIG_LIB"`;;
-  *) SWIG_LIB_WIN_UNIX="";;
-esac
-AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)])
-
-SWIG_LIB_PREINST=$ABS_SRCDIR/Lib
-AC_SUBST(SWIG_LIB_PREINST)
-
-dnl For testing purposes, clear SWIG_LIB when building SWIG in the source
-dnl directory under Windows because it is supposed to work without SWIG_LIB
-dnl being set. Otherwise it always needs to be set.
-SWIG_LIB_SET="env SWIG_LIB=\$(SWIG_LIB_DIR)"
-if test "${srcdir}" = "."; then
-    AC_EGREP_CPP([yes],
-    [#ifdef _WIN32
-     yes
-    #endif
-    ], [SWIG_LIB_SET="env SWIG_LIB="], [])
-fi
-AC_SUBST(SWIG_LIB_SET)
-
-AC_CONFIG_FILES([
-    Makefile
-    swig.spec
-    Examples/Makefile
-    Examples/d/example.mk
-    Examples/xml/Makefile
-    Examples/test-suite/errors/Makefile
-    Examples/test-suite/chicken/Makefile
-    Examples/test-suite/csharp/Makefile
-    Examples/test-suite/d/Makefile
-    Examples/test-suite/guile/Makefile
-    Examples/test-suite/java/Makefile
-    Examples/test-suite/javascript/Makefile
-    Examples/test-suite/mzscheme/Makefile
-    Examples/test-suite/ocaml/Makefile
-    Examples/test-suite/octave/Makefile
-    Examples/test-suite/perl5/Makefile
-    Examples/test-suite/php/Makefile
-    Examples/test-suite/php5/Makefile
-    Examples/test-suite/pike/Makefile
-    Examples/test-suite/python/Makefile
-    Examples/test-suite/ruby/Makefile
-    Examples/test-suite/scilab/Makefile
-    Examples/test-suite/tcl/Makefile
-    Examples/test-suite/lua/Makefile
-    Examples/test-suite/allegrocl/Makefile
-    Examples/test-suite/clisp/Makefile
-    Examples/test-suite/cffi/Makefile
-    Examples/test-suite/uffi/Makefile
-    Examples/test-suite/r/Makefile
-    Examples/test-suite/go/Makefile
-    Source/Makefile
-    Tools/javascript/Makefile
-])
-AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig])
-AC_CONFIG_FILES([CCache/ccache_swig_config.h])
-
-#--------------------------------------------------------------------
-# Building Examples/ out of source directory
-#--------------------------------------------------------------------
-
-# If building out of source tree, replicate Examples/ source tree in
-# build directory, and copy over Makefiles from source directory.
-# Prefix each Makefile with a header which sets SRCDIR to the relative
-# source directory, and provides a rule for updating the Makefile from
-# its original source.
-AC_CONFIG_COMMANDS([Examples],[
-  if test "x${srcdir}" != "x." ; then
-    AC_MSG_NOTICE([generating Examples build tree])
-    for mkfile in `cd ${srcdir} && find Examples/ -type f -name Makefile`; do
-      dir=`dirname ${mkfile}`
-      d=${dir}
-      reldir=""
-      while test "x$d" != "x." ; do
-        d=`dirname $d`
-        reldir="${reldir}../"
-      done
-      relsrcdir=${reldir}${srcdir}/
-      AS_MKDIR_P([${dir}])
-      cat <<EOF >${mkfile}
-# DO NOT EDIT: instead edit ${relsrcdir}${mkfile}
-# and run (cd ${reldir} && ./config.status) to regenerate
-TOP_BUILDDIR_TO_TOP_SRCDIR = ${srcdir}/
-SRCDIR = ${relsrcdir}${dir}/
-
-EOF
-      cat ${srcdir}/${mkfile} >>${mkfile}
-    done
-  fi
-])
-
-#--------------------------------------------------------------------
-
-AC_OUTPUT
-
-langs=""
-test -n "$SKIP_ALLEGROCL"	|| langs="${langs}allegrocl "
-test -n "$SKIP_CFFI"		|| langs="${langs}cffi "
-test -n "$SKIP_CHICKEN"		|| langs="${langs}chicken "
-test -n "$SKIP_CLISP"		|| langs="${langs}clisp "
-test -n "$SKIP_CSHARP"		|| langs="${langs}csharp "
-test -n "$SKIP_D"		|| langs="${langs}d "
-test -n "$SKIP_GO"		|| langs="${langs}go "
-test -n "$SKIP_GUILE"		|| langs="${langs}guile "
-test -n "$SKIP_JAVA"		|| langs="${langs}java "
-test -n "$SKIP_JAVASCRIPT"	|| langs="${langs}javascript "
-test -n "$SKIP_LUA"		|| langs="${langs}lua "
-test -n "$SKIP_MODULA3"		|| langs="${langs}modula3 "
-test -n "$SKIP_MZSCHEME"	|| langs="${langs}mzscheme "
-test -n "$SKIP_OCAML"		|| langs="${langs}ocaml "
-test -n "$SKIP_OCTAVE"		|| langs="${langs}octave "
-test -n "$SKIP_PERL5"		|| langs="${langs}perl5 "
-test -n "$SKIP_PHP"		|| langs="${langs}php "
-test -n "$SKIP_PHP5"		|| langs="${langs}php5 "
-test -n "$SKIP_PIKE"		|| langs="${langs}pike "
-test -n "$SKIP_PYTHON"		|| langs="${langs}python "
-test -n "$SKIP_R"		|| langs="${langs}r "
-test -n "$SKIP_RUBY"		|| langs="${langs}ruby "
-test -n "$SKIP_SCILAB"		|| langs="${langs}scilab "
-test -n "$SKIP_TCL"		|| langs="${langs}tcl "
-test -n "$SKIP_UFFI"		|| langs="${langs}uffi "
-
-echo "
-The SWIG test-suite and examples are configured for the following languages:
-$langs
-"
-
-dnl configure.ac ends here
diff --git a/dependencies2013/win32/swig/preinst-swig.in b/dependencies2013/win32/swig/preinst-swig.in
deleted file mode 100644
index ac00602b..00000000
--- a/dependencies2013/win32/swig/preinst-swig.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Convenience script for running SWIG before it is installed.
-# Intended for ad-hoc usage and not by the test-suite or examples.
-
-builddir=`dirname "$0"`
-SWIG_LIB='@SWIG_LIB_PREINST@'
-export SWIG_LIB
-exec "$builddir/swig" "$@"
diff --git a/dependencies2013/win32/swig/swig.spec.in b/dependencies2013/win32/swig/swig.spec.in
deleted file mode 100644
index 9229274c..00000000
--- a/dependencies2013/win32/swig/swig.spec.in
+++ /dev/null
@@ -1,70 +0,0 @@
-# You can build the package from Git using something like:
-# tar -czf swig-@PACKAGE_VERSION@.tar.gz swig-@PACKAGE_VERSION@ && rpmbuild -tb swig-@PACKAGE_VERSION@.tar.gz
-# @configure_input@
-
-%define ver          @PACKAGE_VERSION@
-%define rel          1
-%define prefix       /usr
-%define home_page    http://www.swig.org
-%define docprefix    %{prefix}/share
-
-######################################################################
-# Usually, nothing needs to be changed below here between releases
-######################################################################
-Summary: Simplified Wrapper and Interface Generator
-Name: swig
-Version: %{ver}
-Release: %{rel}
-URL: %{home_page}
-Source0: %{name}-%{version}.tar.gz
-License: BSD
-Group: Development/Tools
-BuildRoot: %{_tmppath}/%{name}-root
-
-%description
-SWIG is a software development tool that connects programs written in C and C++
-with a variety of high-level programming languages. SWIG is primarily used with
-common scripting languages such as Perl, Python, Tcl/Tk, and Ruby, however the
-list of supported languages also includes non-scripting languages such as Java,
-OCAML and C#. Also several interpreted and compiled Scheme implementations
-(Guile, MzScheme, Chicken) are supported. SWIG is most commonly used to create
-high-level interpreted or compiled programming environments, user interfaces,
-and as a tool for testing and prototyping C/C++ software. SWIG can also export
-its parse tree in the form of XML and Lisp s-expressions. 
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-# so we can build package from Git source too
-[ ! -r configure ] && ./autogen.sh
-%configure
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,root,root)
-%doc ANNOUNCE CHANGES INSTALL LICENSE LICENSE-GPL LICENSE-UNIVERSITIES README RELEASENOTES
-%doc Doc/*
-%{_bindir}/*
-%{prefix}/share/*
-
-%changelog
-* Thu Sep 16 2004 Marcelo Matus <mmatus@acms.arizona.edu>
-- Small fixes needed after removing the runtime package
-* Tue Jul 20 2004 William Fulton <wsf@fultondesigns.co.uk>
-- Update for SWIG-1.3.22 - Removed runtime package
-* Wed Mar 03 2004 Robert H De Vries
-- Update to work with Fedora Core 1 rpm 4.2.1
-* Wed Jul 24 2002 Sam Liddicott <sam@liddicott.com>
-- Added runtime package of runtime libs
-* Mon Sep 10 2001 Tony Seward <anthony.seward@ieee.org>
-- Merge Red Hat's and Dustin Mitchell's .spec files.
-- Install all of the examples in the documentation directory.
-- Auto create the list of installed files.
diff --git a/dependencies2013/win32/swig/vms/aaareadme.txt b/dependencies2013/win32/swig/vms/aaareadme.txt
deleted file mode 100644
index 52746a7e..00000000
--- a/dependencies2013/win32/swig/vms/aaareadme.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Port on OpenVMS 7.3 using CC 6.5 and CXX 6.5
-
-
-Building procedure:
-$ @logicals
-$ @build_all
-
-the logicals swig_root is defined by the procedure logicals.com.
-The logicals.com procedure can be invoke with an optional argument
-for the define command, for example:
-$ @logicals "/system/exec"
-
-
-genbuild.py is the python program use to generate all the procedures in the
-[vms.scripts] directory.
-
-
-jf.pieronne@laposte.net
diff --git a/dependencies2013/win32/swig/vms/build_end.com b/dependencies2013/win32/swig/vms/build_end.com
deleted file mode 100644
index 10330227..00000000
--- a/dependencies2013/win32/swig/vms/build_end.com
+++ /dev/null
@@ -1,21 +0,0 @@
-$ set def swig_root:[vms]
-$
-$ file = f$search("swig_root:[vms.o_alpha]*.obj")
-$ newobj = 0 
-$ if file .nes. ""
-$ then
-$    v = f$verify(1)
-$    library/replace swig_root:[vms.o_alpha]swig.olb swig_root:[vms.o_alpha]*.obj
-$    delete swig_root:[vms.o_alpha]*.obj;*
-$    v = f$verify(v)
-$    newobj = 1
-$ endif
-$ file = f$search("swig_root:[vms]swig.exe")
-$ if file .eqs. "" .or. newobj
-$ then
-$    v = f$verify(1)
-$    cxxlink/exe=swig_root:[vms]swig.exe -
-	/repo=swig_root:[source.modules1_1.cxx_repository] -
-        swig_root:[vms.o_alpha]swig.olb/include=swigmain
-$    v = f$verify(v)
-$ endif
diff --git a/dependencies2013/win32/swig/vms/build_init.com b/dependencies2013/win32/swig/vms/build_init.com
deleted file mode 100644
index 9a1992dc..00000000
--- a/dependencies2013/win32/swig/vms/build_init.com
+++ /dev/null
@@ -1,13 +0,0 @@
-$ set def swig_root:[vms]
-$
-$ swiglib = "swig_root:[vms.o_alpha]swig.olb
-$
-$ if (f$search("swig_root:[vms]o_alpha.dir") .eqs. "") then $ -
-	create/dir swig_root:[vms.o_alpha]
-$
-$ copy swigconfig.h [-.source.include]
-$ copy swigver.h [-.source.include]
-$
-$ if (f$search("''swiglib'") .eqs. "") then $ -
-          library/create/object 'swiglib'
-$
diff --git a/dependencies2013/win32/swig/vms/build_swig.com b/dependencies2013/win32/swig/vms/build_swig.com
deleted file mode 100644
index 5570db0b..00000000
--- a/dependencies2013/win32/swig/vms/build_swig.com
+++ /dev/null
@@ -1 +0,0 @@
-$ @swig_root:[vms.scripts]build_all
diff --git a/dependencies2013/win32/swig/vms/genbuild.py b/dependencies2013/win32/swig/vms/genbuild.py
deleted file mode 100644
index df18ce3e..00000000
--- a/dependencies2013/win32/swig/vms/genbuild.py
+++ /dev/null
@@ -1,155 +0,0 @@
-import os.path, string, posix, pyvms
-#
-#
-
-IDIR = ['swig_root:[source.swig]', 'swig_root:[source.doh.include]',
-        'swig_root:[source.include]', 'swig_root:[source.preprocessor]'] 
-
-def new_file(fg, dirname):
-    global IDIR
-    fn = 'swig_root:[vms.scripts]compil_' + os.path.basename(dirname) + '.com'
-    print >> fg, '$ @' + fn
-    f = open(fn, 'w')
-    print >> f, '$!'
-    print >> f, '$! Generated by genbuild.py'
-    print >> f, '$!'
-    print >> f, '$ libname = "swig_root:[vms.o_alpha]swig.olb"'
-    print >> f, '$'
-    print >> f, '$ set default', pyvms.crtl_to_vms(dirname)[0][0]
-    print >> f, '$'
-    print >> f, "$ idir := ", IDIR[0]
-    for i in range(1, len(IDIR)):
-        print >> f, '$ idir = idir + ",' + IDIR[i] + '"'
-    print >> f, '$'
-    print >> f, "$ iflags = \"/include=(''idir', sys$disk:[])\""
-    print >> f, '$ oflags = \"/object=swig_root:[vms.o_alpha]'
-    print >> f, "$ cflags = \"''oflags'''iflags'''dflags'\""
-    print >> f, "$ cxxflags = \"''oflags'''iflags'''dflags'\""
-    print >> f, '$'
-    return f
-
-
-def end_file(f):
-    print >>f,"""$ exit
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 = Source file
-$! P4 - P8  What it depends on
-$
-$ modname = f$parse(p3,,,"name")
-$ set noon
-$ set message/nofacility/noident/noseverity/notext
-$ libr/lis=swig_root:[vms]swiglib.tmp/full/width=132/only='modname' 'libname'
-$ set message/facility/ident/severity/text
-$ on error then exit
-$ open/read swigtmp swig_root:[vms]swiglib.tmp
-$! skip header
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$!
-$
-$ read/end=module_not_found swigtmp r
-$ modfound = 1
-$ Time = f$cvtime(f$extract(49, 20, r))
-$ goto end_search_module
-$ module_not_found:
-$ modfound = 0
-$
-$ end_search_module:
-$ close swigtmp
-$ delete swig_root:[vms]swiglib.tmp;*
-$
-$ if modfound .eq. 0 then $ goto Makeit
-$
-$! Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(1)
-$ 'P2' 'P3'
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE"""
-
-
-def listRep(args, dirname, filenames):
-    fg = args[0]
-    first = 1
-    for fn in filenames:
-        if fn[-2:] == '.c':
-            if first:
-                first = 0
-                fc = new_file(fg, dirname)
-
-            cstr = "\"cc ''cflags'\" "
-            line = "$ call make swig_root:[vms.o_alpha]"
-            line += fn[:-1] + 'obj -'
-            print >> fc, line
-            line = "\t" + cstr + fn
-            print >> fc, line
-        elif fn[-4:] == '.cxx':
-            if first:
-                first = 0
-                fc = new_file(fg, dirname)
-
-            cstr = "\"cxx ''cxxflags'\" "
-            line = "$ call make swig_root:[vms.o_alpha]"
-            line += fn[:-3] + 'obj -'
-            print >> fc, line
-            line = "\t" + cstr + fn
-            print >> fc, line
-    if first == 0:
-        end_file(fc)
-        fc.close()
-#
-def genbuild(f, dir):
-    os.path.walk(dir, listRep, (f,))
-    cmd = 'set default swig_root:[vms]'
-#
-f = open('swig_root:[vms.scripts]build_all.com','w')
-print >> f, '$!'
-print >> f, '$! Generated by genbuild.py'
-print >> f, '$!'
-print >> f, '$ set default swig_root:[vms]'
-print >> f, '$'
-print >> f, '$ @swig_root:[vms]build_init'
-#
-genbuild(f, '/swig_root/source')
-print >> f, '$'
-print >> f, '$ set default swig_root:[vms]'
-print >> f, '$'
-print >> f, '$ @swig_root:[vms]build_end'
-f.close
diff --git a/dependencies2013/win32/swig/vms/logicals.com b/dependencies2013/win32/swig/vms/logicals.com
deleted file mode 100644
index 20da9d49..00000000
--- a/dependencies2013/win32/swig/vms/logicals.com
+++ /dev/null
@@ -1,18 +0,0 @@
-$!
-$!
-$!
-$ proc = f$environment("PROCEDURE")
-$ proc = f$parse(proc,"sys$disk:[]",,,"NO_CONCEAL")
-$ cur_dev = f$parse(proc,,,"DEVICE","SYNTAX_ONLY")
-$ cur_dir = f$parse(proc,,,"DIRECTORY","SYNTAX_ONLY")
-$ cur_dir = f$extract(1,f$length(cur_dir)-2,cur_dir)
-$ cur_dir = cur_dir - "["
-$ cur_dir = cur_dir - "]"
-$ cur_dir = cur_dir - "<"
-$ cur_dir = cur_dir - ">"
-$
-$! remove trealing .VMS
-$ root_dir = f$extract(0,f$length(cur_dir)-4,cur_dir)
-$
-$ define 'p1' /trans=concealed swig_root 'cur_dev'['root_dir'.]
-
diff --git a/dependencies2013/win32/swig/vms/scripts/build_all.com b/dependencies2013/win32/swig/vms/scripts/build_all.com
deleted file mode 100644
index d4119834..00000000
--- a/dependencies2013/win32/swig/vms/scripts/build_all.com
+++ /dev/null
@@ -1,15 +0,0 @@
-$!
-$! Generated by genbuild.py
-$!
-$ set default swig_root:[vms]
-$
-$ @swig_root:[vms]build_init
-$ @swig_root:[vms.scripts]compil_cparse.com
-$ @swig_root:[vms.scripts]compil_doh.com
-$ @swig_root:[vms.scripts]compil_modules1_1.com
-$ @swig_root:[vms.scripts]compil_preprocessor.com
-$ @swig_root:[vms.scripts]compil_swig.com
-$
-$ set default swig_root:[vms]
-$
-$ @swig_root:[vms]build_end
diff --git a/dependencies2013/win32/swig/vms/scripts/compil_cparse.com b/dependencies2013/win32/swig/vms/scripts/compil_cparse.com
deleted file mode 100644
index 4f78f410..00000000
--- a/dependencies2013/win32/swig/vms/scripts/compil_cparse.com
+++ /dev/null
@@ -1,98 +0,0 @@
-$!
-$! Generated by genbuild.py
-$!
-$ libname = "swig_root:[vms.o_alpha]swig.olb"
-$
-$ set default SWIG_ROOT:[SOURCE.CPARSE]
-$
-$ idir :=  swig_root:[source.swig]
-$ idir = idir + ",swig_root:[source.doh.include]"
-$ idir = idir + ",swig_root:[source.include]"
-$ idir = idir + ",swig_root:[source.preprocessor]"
-$
-$ iflags = "/include=(''idir', sys$disk:[])"
-$ oflags = "/object=swig_root:[vms.o_alpha]
-$ cflags = "''oflags'''iflags'''dflags'"
-$ cxxflags = "''oflags'''iflags'''dflags'"
-$
-$ call make swig_root:[vms.o_alpha]cscanner.obj -
-	"cc ''cflags'" cscanner.c
-$ call make swig_root:[vms.o_alpha]parser.obj -
-	"cc ''cflags'" parser.c
-$ call make swig_root:[vms.o_alpha]templ.obj -
-	"cc ''cflags'" templ.c
-$ call make swig_root:[vms.o_alpha]util.obj -
-	"cc ''cflags'" util.c
-$ exit
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 = Source file
-$! P4 - P8  What it depends on
-$
-$ modname = f$parse(p3,,,"name")
-$ set noon
-$ set message/nofacility/noident/noseverity/notext
-$ libr/lis=swig_root:[vms]swiglib.tmp/full/width=132/only='modname' 'libname'
-$ set message/facility/ident/severity/text
-$ on error then exit
-$ open/read swigtmp swig_root:[vms]swiglib.tmp
-$! skip header
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$!
-$
-$ read/end=module_not_found swigtmp r
-$ modfound = 1
-$ Time = f$cvtime(f$extract(49, 20, r))
-$ goto end_search_module
-$ module_not_found:
-$ modfound = 0
-$
-$ end_search_module:
-$ close swigtmp
-$ delete swig_root:[vms]swiglib.tmp;*
-$
-$ if modfound .eq. 0 then $ goto Makeit
-$
-$! Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(1)
-$ 'P2' 'P3'
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
diff --git a/dependencies2013/win32/swig/vms/scripts/compil_doh.com b/dependencies2013/win32/swig/vms/scripts/compil_doh.com
deleted file mode 100644
index 6d4ae89a..00000000
--- a/dependencies2013/win32/swig/vms/scripts/compil_doh.com
+++ /dev/null
@@ -1,106 +0,0 @@
-$!
-$! Generated by genbuild.py
-$!
-$ libname = "swig_root:[vms.o_alpha]swig.olb"
-$
-$ set default SWIG_ROOT:[SOURCE.DOH.DOH]
-$
-$ idir :=  swig_root:[source.swig]
-$ idir = idir + ",swig_root:[source.doh.include]"
-$ idir = idir + ",swig_root:[source.include]"
-$ idir = idir + ",swig_root:[source.preprocessor]"
-$
-$ iflags = "/include=(''idir', sys$disk:[])"
-$ oflags = "/object=swig_root:[vms.o_alpha]
-$ cflags = "''oflags'''iflags'''dflags'"
-$ cxxflags = "''oflags'''iflags'''dflags'"
-$
-$ call make swig_root:[vms.o_alpha]base.obj -
-	"cc ''cflags'" base.c
-$ call make swig_root:[vms.o_alpha]file.obj -
-	"cc ''cflags'" file.c
-$ call make swig_root:[vms.o_alpha]fio.obj -
-	"cc ''cflags'" fio.c
-$ call make swig_root:[vms.o_alpha]hash.obj -
-	"cc ''cflags'" hash.c
-$ call make swig_root:[vms.o_alpha]list.obj -
-	"cc ''cflags'" list.c
-$ call make swig_root:[vms.o_alpha]memory.obj -
-	"cc ''cflags'" memory.c
-$ call make swig_root:[vms.o_alpha]string.obj -
-	"cc ''cflags'" string.c
-$ call make swig_root:[vms.o_alpha]void.obj -
-	"cc ''cflags'" void.c
-$ exit
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 = Source file
-$! P4 - P8  What it depends on
-$
-$ modname = f$parse(p3,,,"name")
-$ set noon
-$ set message/nofacility/noident/noseverity/notext
-$ libr/lis=swig_root:[vms]swiglib.tmp/full/width=132/only='modname' 'libname'
-$ set message/facility/ident/severity/text
-$ on error then exit
-$ open/read swigtmp swig_root:[vms]swiglib.tmp
-$! skip header
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$!
-$
-$ read/end=module_not_found swigtmp r
-$ modfound = 1
-$ Time = f$cvtime(f$extract(49, 20, r))
-$ goto end_search_module
-$ module_not_found:
-$ modfound = 0
-$
-$ end_search_module:
-$ close swigtmp
-$ delete swig_root:[vms]swiglib.tmp;*
-$
-$ if modfound .eq. 0 then $ goto Makeit
-$
-$! Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(1)
-$ 'P2' 'P3'
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
diff --git a/dependencies2013/win32/swig/vms/scripts/compil_modules1_1.com b/dependencies2013/win32/swig/vms/scripts/compil_modules1_1.com
deleted file mode 100644
index c570dfe5..00000000
--- a/dependencies2013/win32/swig/vms/scripts/compil_modules1_1.com
+++ /dev/null
@@ -1,132 +0,0 @@
-$!
-$! Generated by genbuild.py
-$!
-$ libname = "swig_root:[vms.o_alpha]swig.olb"
-$
-$ set default SWIG_ROOT:[SOURCE.MODULES1_1]
-$
-$ idir :=  swig_root:[source.swig]
-$ idir = idir + ",swig_root:[source.doh.include]"
-$ idir = idir + ",swig_root:[source.include]"
-$ idir = idir + ",swig_root:[source.preprocessor]"
-$
-$ iflags = "/include=(''idir', sys$disk:[])"
-$ oflags = "/object=swig_root:[vms.o_alpha]
-$ cflags = "''oflags'''iflags'''dflags'"
-$ cxxflags = "''oflags'''iflags'''dflags'"
-$
-$ call make swig_root:[vms.o_alpha]allocate.obj -
-	"cxx ''cxxflags'" allocate.cxx
-$ call make swig_root:[vms.o_alpha]browser.obj -
-	"cxx ''cxxflags'" browser.cxx
-$ call make swig_root:[vms.o_alpha]contract.obj -
-	"cxx ''cxxflags'" contract.cxx
-$ call make swig_root:[vms.o_alpha]emit.obj -
-	"cxx ''cxxflags'" emit.cxx
-$ call make swig_root:[vms.o_alpha]guile.obj -
-	"cxx ''cxxflags'" guile.cxx
-$ call make swig_root:[vms.o_alpha]java.obj -
-	"cxx ''cxxflags'" java.cxx
-$ call make swig_root:[vms.o_alpha]lang.obj -
-	"cxx ''cxxflags'" lang.cxx
-$ call make swig_root:[vms.o_alpha]main.obj -
-	"cxx ''cxxflags'" main.cxx
-$ call make swig_root:[vms.o_alpha]module.obj -
-	"cxx ''cxxflags'" module.cxx
-$ call make swig_root:[vms.o_alpha]mzscheme.obj -
-	"cxx ''cxxflags'" mzscheme.cxx
-$ call make swig_root:[vms.o_alpha]ocaml.obj -
-	"cxx ''cxxflags'" ocaml.cxx
-$ call make swig_root:[vms.o_alpha]overload.obj -
-	"cxx ''cxxflags'" overload.cxx
-$ call make swig_root:[vms.o_alpha]perl5.obj -
-	"cxx ''cxxflags'" perl5.cxx
-$ call make swig_root:[vms.o_alpha]php4.obj -
-	"cxx ''cxxflags'" php4.cxx
-$ call make swig_root:[vms.o_alpha]pike.obj -
-	"cxx ''cxxflags'" pike.cxx
-$ call make swig_root:[vms.o_alpha]python.obj -
-	"cxx ''cxxflags'" python.cxx
-$ call make swig_root:[vms.o_alpha]ruby.obj -
-	"cxx ''cxxflags'" ruby.cxx
-$ call make swig_root:[vms.o_alpha]swigmain.obj -
-	"cxx ''cxxflags'" swigmain.cxx
-$ call make swig_root:[vms.o_alpha]tcl8.obj -
-	"cxx ''cxxflags'" tcl8.cxx
-$ call make swig_root:[vms.o_alpha]typepass.obj -
-	"cxx ''cxxflags'" typepass.cxx
-$ call make swig_root:[vms.o_alpha]xml.obj -
-	"cxx ''cxxflags'" xml.cxx
-$ exit
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 = Source file
-$! P4 - P8  What it depends on
-$
-$ modname = f$parse(p3,,,"name")
-$ set noon
-$ set message/nofacility/noident/noseverity/notext
-$ libr/lis=swig_root:[vms]swiglib.tmp/full/width=132/only='modname' 'libname'
-$ set message/facility/ident/severity/text
-$ on error then exit
-$ open/read swigtmp swig_root:[vms]swiglib.tmp
-$! skip header
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$!
-$
-$ read/end=module_not_found swigtmp r
-$ modfound = 1
-$ Time = f$cvtime(f$extract(49, 20, r))
-$ goto end_search_module
-$ module_not_found:
-$ modfound = 0
-$
-$ end_search_module:
-$ close swigtmp
-$ delete swig_root:[vms]swiglib.tmp;*
-$
-$ if modfound .eq. 0 then $ goto Makeit
-$
-$! Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(1)
-$ 'P2' 'P3'
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
diff --git a/dependencies2013/win32/swig/vms/scripts/compil_preprocessor.com b/dependencies2013/win32/swig/vms/scripts/compil_preprocessor.com
deleted file mode 100644
index f95961e8..00000000
--- a/dependencies2013/win32/swig/vms/scripts/compil_preprocessor.com
+++ /dev/null
@@ -1,94 +0,0 @@
-$!
-$! Generated by genbuild.py
-$!
-$ libname = "swig_root:[vms.o_alpha]swig.olb"
-$
-$ set default SWIG_ROOT:[SOURCE.PREPROCESSOR]
-$
-$ idir :=  swig_root:[source.swig]
-$ idir = idir + ",swig_root:[source.doh.include]"
-$ idir = idir + ",swig_root:[source.include]"
-$ idir = idir + ",swig_root:[source.preprocessor]"
-$
-$ iflags = "/include=(''idir', sys$disk:[])"
-$ oflags = "/object=swig_root:[vms.o_alpha]
-$ cflags = "''oflags'''iflags'''dflags'"
-$ cxxflags = "''oflags'''iflags'''dflags'"
-$
-$ call make swig_root:[vms.o_alpha]cpp.obj -
-	"cc ''cflags'" cpp.c
-$ call make swig_root:[vms.o_alpha]expr.obj -
-	"cc ''cflags'" expr.c
-$ exit
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 = Source file
-$! P4 - P8  What it depends on
-$
-$ modname = f$parse(p3,,,"name")
-$ set noon
-$ set message/nofacility/noident/noseverity/notext
-$ libr/lis=swig_root:[vms]swiglib.tmp/full/width=132/only='modname' 'libname'
-$ set message/facility/ident/severity/text
-$ on error then exit
-$ open/read swigtmp swig_root:[vms]swiglib.tmp
-$! skip header
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$!
-$
-$ read/end=module_not_found swigtmp r
-$ modfound = 1
-$ Time = f$cvtime(f$extract(49, 20, r))
-$ goto end_search_module
-$ module_not_found:
-$ modfound = 0
-$
-$ end_search_module:
-$ close swigtmp
-$ delete swig_root:[vms]swiglib.tmp;*
-$
-$ if modfound .eq. 0 then $ goto Makeit
-$
-$! Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(1)
-$ 'P2' 'P3'
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
diff --git a/dependencies2013/win32/swig/vms/scripts/compil_swig.com b/dependencies2013/win32/swig/vms/scripts/compil_swig.com
deleted file mode 100644
index 103e275f..00000000
--- a/dependencies2013/win32/swig/vms/scripts/compil_swig.com
+++ /dev/null
@@ -1,122 +0,0 @@
-$!
-$! Generated by genbuild.py
-$!
-$ libname = "swig_root:[vms.o_alpha]swig.olb"
-$
-$ set default SWIG_ROOT:[SOURCE.SWIG]
-$
-$ idir :=  swig_root:[source.swig]
-$ idir = idir + ",swig_root:[source.doh.include]"
-$ idir = idir + ",swig_root:[source.include]"
-$ idir = idir + ",swig_root:[source.preprocessor]"
-$
-$ iflags = "/include=(''idir', sys$disk:[])"
-$ oflags = "/object=swig_root:[vms.o_alpha]
-$ cflags = "''oflags'''iflags'''dflags'"
-$ cxxflags = "''oflags'''iflags'''dflags'"
-$
-$ call make swig_root:[vms.o_alpha]cwrap.obj -
-	"cc ''cflags'" cwrap.c
-$ call make swig_root:[vms.o_alpha]error.obj -
-	"cc ''cflags'" error.c
-$ call make swig_root:[vms.o_alpha]fragment.obj -
-	"cc ''cflags'" fragment.c
-$ call make swig_root:[vms.o_alpha]getopt.obj -
-	"cc ''cflags'" getopt.c
-$ call make swig_root:[vms.o_alpha]include.obj -
-	"cc ''cflags'" include.c
-$ call make swig_root:[vms.o_alpha]misc.obj -
-	"cc ''cflags'" misc.c
-$ call make swig_root:[vms.o_alpha]naming.obj -
-	"cc ''cflags'" naming.c
-$ call make swig_root:[vms.o_alpha]parms.obj -
-	"cc ''cflags'" parms.c
-$ call make swig_root:[vms.o_alpha]scanner.obj -
-	"cc ''cflags'" scanner.c
-$ call make swig_root:[vms.o_alpha]stype.obj -
-	"cc ''cflags'" stype.c
-$ call make swig_root:[vms.o_alpha]symbol.obj -
-	"cc ''cflags'" symbol.c
-$ call make swig_root:[vms.o_alpha]tree.obj -
-	"cc ''cflags'" tree.c
-$ call make swig_root:[vms.o_alpha]typemap.obj -
-	"cc ''cflags'" typemap.c
-$ call make swig_root:[vms.o_alpha]typesys.obj -
-	"cc ''cflags'" typesys.c
-$ call make swig_root:[vms.o_alpha]warn.obj -
-	"cc ''cflags'" warn.c
-$ call make swig_root:[vms.o_alpha]wrapfunc.obj -
-	"cc ''cflags'" wrapfunc.c
-$ exit
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 = Source file
-$! P4 - P8  What it depends on
-$
-$ modname = f$parse(p3,,,"name")
-$ set noon
-$ set message/nofacility/noident/noseverity/notext
-$ libr/lis=swig_root:[vms]swiglib.tmp/full/width=132/only='modname' 'libname'
-$ set message/facility/ident/severity/text
-$ on error then exit
-$ open/read swigtmp swig_root:[vms]swiglib.tmp
-$! skip header
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$ read swigtmp r
-$!
-$
-$ read/end=module_not_found swigtmp r
-$ modfound = 1
-$ Time = f$cvtime(f$extract(49, 20, r))
-$ goto end_search_module
-$ module_not_found:
-$ modfound = 0
-$
-$ end_search_module:
-$ close swigtmp
-$ delete swig_root:[vms]swiglib.tmp;*
-$
-$ if modfound .eq. 0 then $ goto Makeit
-$
-$! Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(1)
-$ 'P2' 'P3'
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
diff --git a/dependencies2013/win32/swig/vms/swigconfig.h b/dependencies2013/win32/swig/vms/swigconfig.h
deleted file mode 100644
index 3ee08640..00000000
--- a/dependencies2013/win32/swig/vms/swigconfig.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-/* Note that this file has changed. TODO Get the latest from the original version. */
diff --git a/dependencies2015.zip b/dependencies2015.zip
index 62400de4..fb7702b3 100644
Binary files a/dependencies2015.zip and b/dependencies2015.zip differ
diff --git a/dependencies2017.zip b/dependencies2017.zip
index 920a3cc7..9808c15a 100644
Binary files a/dependencies2017.zip and b/dependencies2017.zip differ
diff --git a/plugins/win-agora/Agora/ExtendAudioFrameObserver.cpp b/plugins/win-agora/Agora/ExtendAudioFrameObserver.cpp
index beb6e38f..1321748a 100644
--- a/plugins/win-agora/Agora/ExtendAudioFrameObserver.cpp
+++ b/plugins/win-agora/Agora/ExtendAudioFrameObserver.cpp
@@ -63,38 +63,35 @@ bool CExtendAudioFrameObserver::onRecordAudioFrame(AudioFrame& audioFrame)
 {
 	if (!pPlayerData || !pCircleBuffer)
 		return false;
-	
+
 	SIZE_T nSize = audioFrame.channels*audioFrame.samples * audioFrame.bytesPerSample;
 	unsigned int datalen = 0;
 	pCircleBuffer->readBuffer(this->pPlayerData, nSize, &datalen);
 
-/*	TCHAR szBuf[MAX_PATH] = { 0 };
-	if (nSize > datalen){
-		_stprintf_s(szBuf, MAX_PATH, _T("*************** nSize=%d datalen=%d \n"), nSize, datalen);
-		OutputDebugString(szBuf);
-	}	
-	else{
-		_stprintf_s(szBuf, MAX_PATH, _T("############## nSize=%d datalen=%d \n"), nSize, datalen);
-		OutputDebugString(szBuf);
-	}
-	*/
-	if (nSize > 0 && datalen == nSize)
-	{
-		//int nMixLen = datalen > nSize ? nSize : datalen;
-		int len = datalen / sizeof(int16_t);
-		for (int i = 0; i < len; i++){
-			int16_t* buffer = (int16_t*)(audioFrame.buffer) + i*sizeof(int16_t);
-			int16_t* obsbuffer = (int16_t*)(pPlayerData)+i*sizeof(int16_t);
-			int mix = *buffer + *obsbuffer;
-			if (mix > 32767)
-				*obsbuffer = 32767;
-			else if (mix < -32768)
-				*obsbuffer = -32768;
-			else
-				*obsbuffer = mix;
-		}
-		memcpy(audioFrame.buffer, pPlayerData, datalen);
-	}
+ if (nSize > 0 && datalen == nSize)
+ {
+     if (agora_sdk_captrue_mic_audio) {
+
+         //int nMixLen = datalen > nSize ? nSize : datalen;
+         int len = datalen / sizeof(int16_t);
+         for (int i = 0; i < len; i++) {
+             int16_t* buffer = (int16_t*)(audioFrame.buffer) + i * sizeof(int16_t);
+             int16_t* obsbuffer = (int16_t*)(pPlayerData)+i * sizeof(int16_t);
+             int mix = *buffer + *obsbuffer;
+             if (mix > 32767)
+                 *obsbuffer = 32767;
+             else if (mix < -32768)
+                 *obsbuffer = -32768;
+             else
+                 *obsbuffer = mix;
+         }
+         memcpy(audioFrame.buffer, pPlayerData, datalen);
+
+     }
+     else
+         memcpy(audioFrame.buffer, pPlayerData, datalen);
+ }
+	/**/
 	
 	return true;
 }
diff --git a/plugins/win-agora/Agora/ExtendAudioFrameObserver.hpp b/plugins/win-agora/Agora/ExtendAudioFrameObserver.hpp
index 893295e2..34643940 100644
--- a/plugins/win-agora/Agora/ExtendAudioFrameObserver.hpp
+++ b/plugins/win-agora/Agora/ExtendAudioFrameObserver.hpp
@@ -12,7 +12,7 @@ class CExtendAudioFrameObserver :
 	LPBYTE pPlayerData;
 	int    nPlayerDataLen;
 	bool   bDebug;
-
+	bool agora_sdk_captrue_mic_audio = false;
 	virtual bool onRecordAudioFrame(AudioFrame& audioFrame);
 	virtual bool onPlaybackAudioFrame(AudioFrame& audioFrame);
 	virtual bool onMixedAudioFrame(AudioFrame& audioFrame);
diff --git a/plugins/win-agora/Agora/ExtendVideoFrameObserver.cpp b/plugins/win-agora/Agora/ExtendVideoFrameObserver.cpp
index 77fd30c4..6bcf2286 100644
--- a/plugins/win-agora/Agora/ExtendVideoFrameObserver.cpp
+++ b/plugins/win-agora/Agora/ExtendVideoFrameObserver.cpp
@@ -4,57 +4,95 @@
 //#include <timeapi.h>
 #include <stdio.h>
 
+
+static unsigned char imageBuffer[1920 * 1080 * 4] = { 0 };
+pthread_mutex_t buffer_mutex;
 CExtendVideoFrameObserver::CExtendVideoFrameObserver()
 {
-	m_lpImageBuffer = new BYTE[0x800000];
+    //	m_lpImageBuffer = new BYTE[0x800000];
+
+    m_RenderWidth = 0;
+    m_RenderHeight = 0;
 
-//	m_lpRenderBuffer = new BYTE[0x800000];
+    pthread_mutexattr_t attr;
+    pthread_mutex_init_value(&buffer_mutex);
 
-	m_RenderWidth = 0;
-	m_RenderHeight = 0;
+    pthread_mutexattr_init(&attr);
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+    pthread_mutex_init(&buffer_mutex, &attr);
 }
 
 
 CExtendVideoFrameObserver::~CExtendVideoFrameObserver()
 {
-	delete[] m_lpImageBuffer;
-	m_lpImageBuffer = NULL;
-//	delete[] m_lpRenderBuffer;
-//	m_lpRenderBuffer = NULL;
+    pthread_mutex_destroy(&buffer_mutex);
+}
+
+int CExtendVideoFrameObserver::_PrintObserverVideoFrame(VideoFrame* frame)
+{
+    unsigned char* srcBuffer = imageBuffer;
+    for (int planeNum = 0; planeNum < 3; ++planeNum) {
+        int width = (planeNum ? (frame->width + 1) / 2 : frame->width);
+        int height;
+        switch (frame->type) {
+        case FRAME_TYPE_YUV420:
+            height = (planeNum ? (frame->height + 1) / 2 : frame->height);
+            break;
+            //     case FRAME_TYPE_YUV422:
+            //         height = frame->height;
+            //         break;
+        default:
+            height = (planeNum ? (frame->height + 1) / 2 : frame->height);
+            break;
+        }
+
+        agora::media::IVideoFrame::PLANE_TYPE plane_type = static_cast<agora::media::IVideoFrame::PLANE_TYPE>(planeNum);
+        unsigned char* plane_buffer = NULL;
+        int stride = frame->yStride;
+        if (planeNum == 0) {
+            plane_buffer = (unsigned char*)frame->yBuffer;
+            stride = frame->yStride;
+        }
+
+        else if (planeNum == 1) {
+            plane_buffer = (unsigned char*)frame->uBuffer;
+            stride = frame->uStride;
+        }
+        else if (planeNum == 2) {
+            plane_buffer = (unsigned char*)frame->vBuffer;
+            stride = frame->vStride;
+        }
+
+        for (int y = 0; y < height; y++) {
+            memcpy_s(plane_buffer, width, srcBuffer, width);
+            plane_buffer += stride;
+            srcBuffer += width;
+        }
+    }
+    return 0;
 }
 
 int timeinc = 0;
 bool CExtendVideoFrameObserver::onCaptureVideoFrame(VideoFrame& videoFrame)
 {
-	if ((int*)m_lpImageBuffer == (int*)0xfeeefeee){
-		m_lpImageBuffer = NULL;
-		return false;
-	}
-
-	if (!m_lpImageBuffer)
-		return false;
-		
-	SIZE_T nBufferSize = 0x800000;
-	int nUvLen = videoFrame.height * videoFrame.width / 4;
-	int nYLen = nUvLen * 4;
-
-	m_lpY = m_lpImageBuffer;
-	m_lpU = m_lpImageBuffer + nUvLen * 4;
-	m_lpV = m_lpImageBuffer + 5 * nUvLen;
-
-	memcpy_s(videoFrame.yBuffer, nYLen, m_lpY, nYLen);
-	videoFrame.yStride = videoFrame.width;
-	
-	memcpy_s(videoFrame.uBuffer, nUvLen, m_lpU, nUvLen);
-	videoFrame.uStride = videoFrame.width/2;
+    int size = videoFrame.yStride * videoFrame.height * 3 / 2;
+    int bufSize = 0;
+    pthread_mutex_lock(&buffer_mutex);
+    if (videoFrame.yStride == videoFrame.width) {
+        int nUvLen = videoFrame.height * videoFrame.width / 4;
+        int nYLen = nUvLen * 4;
 
-	memcpy_s(videoFrame.vBuffer, nUvLen, m_lpV, nUvLen);
-	videoFrame.vStride = videoFrame.width/2;
-
-	videoFrame.type = FRAME_TYPE_YUV420;
-	videoFrame.rotation = 0;
-	videoFrame.renderTimeMs = GetTickCount();
-	return true;
+        memcpy_s(videoFrame.yBuffer, nYLen, imageBuffer, nYLen);
+        memcpy_s(videoFrame.uBuffer, nUvLen, imageBuffer + nYLen, nUvLen);
+        memcpy_s(videoFrame.vBuffer, nUvLen, imageBuffer + nYLen + nUvLen, nUvLen);
+    }
+    else {
+        _PrintObserverVideoFrame(&videoFrame);
+    }
+    pthread_mutex_unlock(&buffer_mutex);
+    videoFrame.renderTimeMs = GetTickCount();
+    return true;
 }
 
 bool CExtendVideoFrameObserver::onRenderVideoFrame(unsigned int uid, VideoFrame& videoFrame)
@@ -67,4 +105,11 @@ void CExtendVideoFrameObserver::setVideoResolution(int w, int h)
 {
 	m_resolutionX = w;
 	m_resolutionY = h;
+}
+
+void CExtendVideoFrameObserver::pushBackVideoFrame(void* buffer, int size)
+{
+    pthread_mutex_lock(&buffer_mutex);
+    memcpy_s(imageBuffer, size, buffer, size);
+    pthread_mutex_unlock(&buffer_mutex);
 }
\ No newline at end of file
diff --git a/plugins/win-agora/Agora/ExtendVideoFrameObserver.hpp b/plugins/win-agora/Agora/ExtendVideoFrameObserver.hpp
index b83badb3..3dee7819 100644
--- a/plugins/win-agora/Agora/ExtendVideoFrameObserver.hpp
+++ b/plugins/win-agora/Agora/ExtendVideoFrameObserver.hpp
@@ -1,29 +1,27 @@
 #pragma once
 #include "Agora/IAgoraMediaEngine.h"
-#include <windows.h>
+#include <Windows.h>
+#include "util/threading.h"
 
 class CExtendVideoFrameObserver :
-	public agora::media::IVideoFrameObserver
+    public agora::media::IVideoFrameObserver
 {
 public:
-	CExtendVideoFrameObserver();
-	~CExtendVideoFrameObserver();
+    CExtendVideoFrameObserver();
+    ~CExtendVideoFrameObserver();
 
-	virtual bool onCaptureVideoFrame(VideoFrame& videoFrame);
-	virtual bool onRenderVideoFrame(unsigned int uid, VideoFrame& videoFrame);
+    virtual bool onCaptureVideoFrame(VideoFrame& videoFrame);
+    virtual bool onRenderVideoFrame(unsigned int uid, VideoFrame& videoFrame);
 
-	void setVideoResolution(int w, int h);
-	LPBYTE				m_lpImageBuffer;
-	LPBYTE				m_lpRenderBuffer;
-	int					m_RenderWidth;
-	int					m_RenderHeight;
-    
+    void setVideoResolution(int w, int h);
+    int					m_RenderWidth;
+    int					m_RenderHeight;
+
+    void pushBackVideoFrame(void* buffer, int size);
 private:
-	LPBYTE				m_lpY;
-	LPBYTE				m_lpU;
-	LPBYTE				m_lpV;
+    int   _PrintObserverVideoFrame(VideoFrame* frame);
+    int                m_resolutionX;
+    int                m_resolutionY;
 
-	int                m_resolutionX;
-	int                m_resolutionY;
 };
 
diff --git a/plugins/win-agora/Agora/agorartcengine.cpp b/plugins/win-agora/Agora/agorartcengine.cpp
index 8d751500..030dc826 100644
--- a/plugins/win-agora/Agora/agorartcengine.cpp
+++ b/plugins/win-agora/Agora/agorartcengine.cpp
@@ -118,11 +118,10 @@ AgoraRtcEngine::AgoraRtcEngine()
 
 AgoraRtcEngine::~AgoraRtcEngine()
 {
-    if(m_rtcEngine.get()) {
-        auto re = m_rtcEngine.get();
-        m_rtcEngine.release();
-        re->release();
-    }
+	if (m_rtcEngine){
+		m_rtcEngine->release();
+		m_rtcEngine = NULL;
+	}
 }
 
 bool AgoraRtcEngine::InitEngine(std::string appid)
@@ -176,7 +175,7 @@ int AgoraRtcEngine::setLocalVideoMirrorMode(VIDEO_MIRROR_MODE_TYPE mirrorMode)
 bool AgoraRtcEngine::enableLocalRender(bool bEnable)
 {
 	int ret = -1;
-	AParameter apm(*m_rtcEngine.get());
+	AParameter apm(*m_rtcEngine);
 
 	if (bEnable)
 		ret = apm->setParameters("{\"che.video.local.render\":true}");
@@ -199,7 +198,7 @@ void AgoraRtcEngine::stopPreview()
 void* AgoraRtcEngine::AgoraVideoObserver_Create()
 {
 	agora::util::AutoPtr< agora::media::IMediaEngine> mediaEngine;
-	mediaEngine.queryInterface(m_rtcEngine.get(), agora::AGORA_IID_MEDIA_ENGINE);
+	mediaEngine.queryInterface(m_rtcEngine, agora::AGORA_IID_MEDIA_ENGINE);
 
 	if (mediaEngine.get() == nullptr)
 		return nullptr;
@@ -225,7 +224,7 @@ void AgoraRtcEngine::AgoraVideoObserver_Destroy(void* data)
 	}
 
 	agora::util::AutoPtr< agora::media::IMediaEngine> mediaEngine;
-	mediaEngine.queryInterface(m_rtcEngine.get(), agora::AGORA_IID_MEDIA_ENGINE);
+	mediaEngine.queryInterface(m_rtcEngine, agora::AGORA_IID_MEDIA_ENGINE);
 
 	if (mediaEngine.get() == nullptr)
 		return;
@@ -234,37 +233,6 @@ void AgoraRtcEngine::AgoraVideoObserver_Destroy(void* data)
 	mediaEngine->release();
 }
 
-static void Cut_I420(uint8_t* Src, int x, int y, int srcWidth, int srcHeight, uint8_t* Dst, int desWidth, int desHeight)//ͼƬ��λ�òü�    
-{
-	//�õ�Bͼ������A������    
-	int nIndex = 0;
-	int BPosX = x;//��    
-	int BPosY = y;//��    
-	for (int i = 0; i < desHeight; i++)//    
-	{
-		memcpy(Dst + desWidth * i, Src + (srcWidth*BPosY) + BPosX + nIndex, desWidth);
-		nIndex += (srcWidth);
-	}
-
-	nIndex = 0;
-	uint8_t *pVSour = Src + srcWidth * srcHeight * 5 / 4;
-	uint8_t *pVDest = Dst + desWidth * desHeight * 5 / 4;
-	for (int i = 0; i < desHeight / 2; i++)//    
-	{
-		memcpy(pVDest + desWidth / 2 * i, pVSour + (srcWidth / 2 * BPosY / 2) + BPosX / 2 + nIndex, desWidth / 2);
-		nIndex += (srcWidth / 2);
-	}
-
-	nIndex = 0;
-	uint8_t *pUSour = Src + srcWidth * srcHeight;
-	uint8_t *pUDest = Dst + desWidth * desHeight;
-	for (int i = 0; i < desHeight / 2; i++)//    
-	{
-		memcpy(pUDest + desWidth / 2 * i, pUSour + (srcWidth / 2 * BPosY / 2) + BPosX / 2 + nIndex, desWidth / 2);
-		nIndex += (srcWidth / 2);
-	}
-}
-
 bool  AgoraRtcEngine::AgoraVideoObserver_Encode(void* data, struct encoder_frame* frame, struct encoder_packet* packet, bool *receive_packet)
 {
 	//Cut_I420(frame->frames[0], )
@@ -274,13 +242,13 @@ bool  AgoraRtcEngine::AgoraVideoObserver_Encode(void* data, struct encoder_frame
 void* AgoraRtcEngine::AgoraAudioObserver_Create()
 {
 	agora::util::AutoPtr< agora::media::IMediaEngine> mediaEngine;
-	mediaEngine.queryInterface(m_rtcEngine.get(), agora::AGORA_IID_MEDIA_ENGINE);
+	mediaEngine.queryInterface(m_rtcEngine, agora::AGORA_IID_MEDIA_ENGINE);
 
 	if (mediaEngine.get() == nullptr)
 		return nullptr;
 
 	std::unique_ptr<CExtendAudioFrameObserver> audioObserver(new CExtendAudioFrameObserver);
-
+	audioObserver->agora_sdk_captrue_mic_audio = agora_sdk_captrue_mic_audio;
 	if (mediaEngine->registerAudioFrameObserver(audioObserver.get()))
 	{
 		mediaEngine->release();
@@ -296,7 +264,7 @@ void AgoraRtcEngine::AgoraAudioObserver_Destroy(void* data)
 	CExtendAudioFrameObserver* audioObserver = static_cast<CExtendAudioFrameObserver*>(data);
 
 	agora::util::AutoPtr< agora::media::IMediaEngine> mediaEngine;
-	mediaEngine.queryInterface(m_rtcEngine.get(), agora::AGORA_IID_MEDIA_ENGINE);
+	mediaEngine.queryInterface(m_rtcEngine, agora::AGORA_IID_MEDIA_ENGINE);
 
 	if (mediaEngine.get() == nullptr)
 		return;
@@ -330,7 +298,7 @@ bool AgoraRtcEngine::enableExtendPlayDevice(bool bEnable)
 {
 	int ret = 0;
 
-	AParameter apm(*m_rtcEngine.get());
+	AParameter apm(*m_rtcEngine);
 
 	if (bEnable)
 		ret = apm->setParameters("{\"che.audio.external_render\":true}");
@@ -342,7 +310,7 @@ bool AgoraRtcEngine::enableExtendPlayDevice(bool bEnable)
 
 bool AgoraRtcEngine::setExternalAudioSource(bool bEnabled, int nSampleRate, int nChannels)
 {
-	RtcEngineParameters rep(m_rtcEngine.get());
+	RtcEngineParameters rep(m_rtcEngine);
 
 	int nRet = rep.setExternalAudioSource(bEnabled, nSampleRate, nChannels);
 
@@ -351,7 +319,7 @@ bool AgoraRtcEngine::setExternalAudioSource(bool bEnabled, int nSampleRate, int
 
 bool AgoraRtcEngine::setRecordingAudioFrameParameters(int nSampleRate, int nChannels, int nSamplesPerCall)
 {
-	RtcEngineParameters rep(m_rtcEngine.get());
+	RtcEngineParameters rep(m_rtcEngine);
 	int ret = rep.setRecordingAudioFrameParameters(nSampleRate, nChannels,  RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, nSamplesPerCall);
 	return ret == 0 ? true : false;
 }
@@ -403,25 +371,12 @@ int AgoraRtcEngine::setupRemoteVideo(unsigned int uid, void* view)
     return m_rtcEngine->setupRemoteVideo(canvas);
 }
 
-int AgoraRtcEngine::ConfigPublisher(const PublisherConfiguration& config)
-{
-	return m_rtcEngine->configPublisher(config);
-}
 
-int AgoraRtcEngine::SetVideoCompositingLayout(const VideoCompositingLayout& sei)
-{
-	return m_rtcEngine->setVideoCompositingLayout(sei);
-}
-
-int AgoraRtcEngine::ClearVideoCompositingLayout()
-{
-	return m_rtcEngine->clearVideoCompositingLayout();
-}
 
 bool AgoraRtcEngine::keepPreRotation(bool bRotate)
 {
 	int ret = -1;
-	AParameter apm(m_rtcEngine.get());
+	AParameter apm(m_rtcEngine);
 	if (bRotate)
 		ret = apm->setParameters("{\"che.video.keep_prerotation\":true}");
 	else
@@ -432,7 +387,7 @@ bool AgoraRtcEngine::keepPreRotation(bool bRotate)
 
 bool AgoraRtcEngine::setVideoProfileEx(int nWidth, int nHeight, int nFrameRate, int nBitRate)
 {
-	IRtcEngine2 *lpRtcEngine2 = (IRtcEngine2 *)m_rtcEngine.get();
+	IRtcEngine2 *lpRtcEngine2 = (IRtcEngine2 *)m_rtcEngine;
 	int nRet = lpRtcEngine2->setVideoProfileEx(nWidth, nHeight, nFrameRate, nBitRate);
 
 	return nRet == 0 ? true : false;
@@ -440,7 +395,7 @@ bool AgoraRtcEngine::setVideoProfileEx(int nWidth, int nHeight, int nFrameRate,
 
 bool AgoraRtcEngine::enableLocalCameara(bool bEnable)
 {
-	AParameter apm(*m_rtcEngine.get());
+	AParameter apm(*m_rtcEngine);
 	int ret = -1;
 	if (!apm.get()) return false;
 
@@ -455,129 +410,9 @@ bool AgoraRtcEngine::enableLocalCameara(bool bEnable)
 ///////////////////////////////////////////////////////////////////////////////////////
 //agora device
 ///////////////////////////////////////////////////////////////////////////////////////
-// QVariantMap AgoraRtcEngine::getRecordingDeviceList()
-// {
-//     QVariantMap devices;
-//     QVariantList names, guids;
-//     AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
-//     if (!audioDeviceManager)
-//         return devices;
-// 
-//     agora::util::AutoPtr<IAudioDeviceCollection> spCollection(audioDeviceManager->enumerateRecordingDevices());
-//     if (!spCollection)
-//         return devices;
-// 	char name[MAX_DEVICE_ID_LENGTH], guid[MAX_DEVICE_ID_LENGTH];
-//     int count = spCollection->getCount();
-//     if (count > 0)
-//     {
-//         for (int i = 0; i < count; i++)
-//         {
-//             if (!spCollection->getDevice(i, name, guid))
-//             {
-//                 names.push_back(name);
-//                 guids.push_back(guid);
-//             }
-//         }
-//         devices.insert("name", names);
-//         devices.insert("guid", guids);
-//         devices.insert("length", names.length());
-//     }
-//     return devices;
-// }
-
-// QVariantMap AgoraRtcEngine::getPlayoutDeviceList()
-// {
-//     QVariantMap devices;
-//     QVariantList names, guids;
-//     AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
-//     if (!audioDeviceManager)
-//         return devices;
-// 
-//     agora::util::AutoPtr<IAudioDeviceCollection> spCollection(audioDeviceManager->enumeratePlaybackDevices());
-//     if (!spCollection)
-//         return devices;
-// 	char name[MAX_DEVICE_ID_LENGTH], guid[MAX_DEVICE_ID_LENGTH];
-//     int count = spCollection->getCount();
-//     if (count > 0)
-//     {
-//         for (int i = 0; i < count; i++)
-//         {
-//             if (!spCollection->getDevice(i, name, guid))
-//             {
-//                 names.push_back(name);
-//                 guids.push_back(guid);
-//             }
-//         }
-//         devices.insert("name", names);
-//         devices.insert("guid", guids);
-//         devices.insert("length", names.length());
-//     }
-//     return devices;
-// }
-// 
-// QVariantMap AgoraRtcEngine::getVideoDeviceList()
-// {
-//     QVariantMap devices;
-//     QVariantList names, guids;
-//     AVideoDeviceManager videoDeviceManager(m_rtcEngine.get());
-//     if (!videoDeviceManager)
-//         return devices;
-// 
-//     agora::util::AutoPtr<IVideoDeviceCollection> spCollection(videoDeviceManager->enumerateVideoDevices());
-//     if (!spCollection)
-//         return devices;
-// 	char name[MAX_DEVICE_ID_LENGTH], guid[MAX_DEVICE_ID_LENGTH];
-//     int count = spCollection->getCount();
-//     if (count > 0)
-//     {
-//         for (int i = 0; i < count; i++)
-//         {
-//             if (!spCollection->getDevice(i, name, guid))
-//             {
-//                 names.push_back(name);
-//                 guids.push_back(guid);
-//             }
-//         }
-//         devices.insert("name", names);
-//         devices.insert("guid", guids);
-//         devices.insert("length", names.length());
-//     }
-//     return devices;
-// }
-// 
-// int AgoraRtcEngine::setRecordingDevice(const QString& guid)
-// {
-//     if (guid.isEmpty())
-//         return -1;
-//     AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
-//     if (!audioDeviceManager)
-//         return -1;
-//     return audioDeviceManager->setRecordingDevice(guid.toUtf8().data());
-// }
-// 
-// int AgoraRtcEngine::setPlayoutDevice(const QString& guid)
-// {
-//     if (guid.isEmpty())
-//         return -1;
-//     AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
-//     if (!audioDeviceManager)
-//         return -1;
-//     return audioDeviceManager->setPlaybackDevice(guid.toUtf8().data());
-// }
-// 
-// int AgoraRtcEngine::setVideoDevice(const QString& guid)
-// {
-//     if (guid.isEmpty())
-//         return -1;
-//     AVideoDeviceManager videoDeviceManager(m_rtcEngine.get());
-//     if (!videoDeviceManager)
-//         return -1;
-//     return videoDeviceManager->setDevice(guid.toUtf8().data());
-// }
-
 int AgoraRtcEngine::getRecordingDeviceVolume()
 {
-    AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
+    AAudioDeviceManager audioDeviceManager(m_rtcEngine);
     if (!audioDeviceManager)
         return 0;
     int vol = 0;
@@ -588,7 +423,7 @@ int AgoraRtcEngine::getRecordingDeviceVolume()
 
 int AgoraRtcEngine::getPalyoutDeviceVolume()
 {
-    AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
+    AAudioDeviceManager audioDeviceManager(m_rtcEngine);
     if (!audioDeviceManager)
         return 0;
     int vol = 0;
@@ -599,15 +434,21 @@ int AgoraRtcEngine::getPalyoutDeviceVolume()
 
 int AgoraRtcEngine::setRecordingDeviceVolume(int volume)
 {
-    AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
+    AAudioDeviceManager audioDeviceManager(m_rtcEngine);
     if (!audioDeviceManager)
         return -1;
     return audioDeviceManager->setRecordingDeviceVolume(volume);
 }
 
+void  AgoraRtcEngine::EnableAgoraCaptureMicAudio(bool bCapture)
+{
+	if (m_audioObserver)
+	m_audioObserver->agora_sdk_captrue_mic_audio = bCapture;
+}
+
 int AgoraRtcEngine::setPalyoutDeviceVolume(int volume)
 {
-    AAudioDeviceManager audioDeviceManager(m_rtcEngine.get());
+    AAudioDeviceManager audioDeviceManager(m_rtcEngine);
     if (!audioDeviceManager)
         return -1;
     return audioDeviceManager->setPlaybackDeviceVolume(volume);
@@ -615,7 +456,7 @@ int AgoraRtcEngine::setPalyoutDeviceVolume(int volume)
 
 int AgoraRtcEngine::testMicrophone(bool start, int interval)
 {
-    agora::rtc::AAudioDeviceManager dm(m_rtcEngine.get());
+    agora::rtc::AAudioDeviceManager dm(m_rtcEngine);
     if (!dm)
         return -1;
     if (start)
@@ -626,7 +467,7 @@ int AgoraRtcEngine::testMicrophone(bool start, int interval)
 
 int AgoraRtcEngine::testSpeaker(bool start)
 {
-    agora::rtc::AAudioDeviceManager dm(m_rtcEngine.get());
+    agora::rtc::AAudioDeviceManager dm(m_rtcEngine);
     if (!dm)
         return -1;
     if (start)
@@ -634,21 +475,6 @@ int AgoraRtcEngine::testSpeaker(bool start)
     else
         return dm->stopPlaybackDeviceTest();
 }
-// 
-// int AgoraRtcEngine::testCamera(bool start, QWidget* view)
-// {
-//     agora::rtc::AVideoDeviceManager dm(m_rtcEngine.get());
-//     if (!dm)
-//         return -1;
-// 
-//     if (start)
-//     {
-// 		agora::rtc::view_t v = reinterpret_cast<agora::rtc::view_t>(view->winId());
-//         return dm->startDeviceTest(v);
-//     }
-//     else
-//         return dm->stopDeviceTest();
-// }
 
 void AgoraRtcEngine::joinedChannelSuccess(const char* channel, unsigned int uid, int elapsed)
 {
@@ -673,3 +499,10 @@ int AgoraRtcEngine::EnableWebSdkInteroperability(bool enabled)
 	RtcEngineParameters rep(*m_rtcEngine);
 	return rep.enableWebSdkInteroperability(true);
 }
+
+void AgoraRtcEngine::pushVideoFrame(struct encoder_frame* frame)
+{
+	if (agora_out_cx && agora_out_cy && agora_out_cx == frame->linesize[0]){
+		m_videoObserver->pushBackVideoFrame(frame->data[0], agora_out_cx*agora_out_cy * 3 / 2);
+	}
+}
\ No newline at end of file
diff --git a/plugins/win-agora/Agora/agorartcengine.hpp b/plugins/win-agora/Agora/agorartcengine.hpp
index f02e3d1e..07b8d60a 100644
--- a/plugins/win-agora/Agora/agorartcengine.hpp
+++ b/plugins/win-agora/Agora/agorartcengine.hpp
@@ -24,10 +24,10 @@ static const char *agora_signals[] = {
 
 class AgoraRtcEngine
 {
-   // Q_OBJECT
+	// Q_OBJECT
 public:
-    explicit AgoraRtcEngine();
-    ~AgoraRtcEngine();
+	explicit AgoraRtcEngine();
+	~AgoraRtcEngine();
 	static AgoraRtcEngine* GetInstance();
 	static void ReleaseInstance();
 
@@ -46,7 +46,7 @@ class AgoraRtcEngine
 
 	int joinChannel(const std::string& key, const std::string& channel, unsigned uid);
 	int leaveChannel();
-	
+
 	bool  keepPreRotation(bool bRotate);
 	bool  setVideoProfileEx(int nWidth, int nHeight, int nFrameRate, int nBitRate);
 	bool  enableLocalCameara(bool bEnable);
@@ -54,7 +54,7 @@ class AgoraRtcEngine
 	void* AgoraVideoObserver_Create();
 	void  AgoraVideoObserver_Destroy(void* data);
 	bool  AgoraVideoObserver_Encode(void* data, struct encoder_frame* frame,
-	    struct encoder_packet* packet, bool *receive_packet);
+	struct encoder_packet* packet, bool *receive_packet);
 
 	bool setRecordingAudioFrameParameters(int nSampleRate, int nChannels, int nSamplesPerCall);
 	bool setExternalAudioSource(bool bEnabled, int nSampleRate, int nChannels);
@@ -63,11 +63,7 @@ class AgoraRtcEngine
 	void* AgoraAudioObserver_Create();
 	void  AgoraAudioObserver_Destroy(void* data);
 	bool  AgoraAudioObserver_Encode(void* data, struct encoder_frame* frame,
-	    struct encoder_packet* packet, bool *receive_packet);
-
-	int ConfigPublisher(const PublisherConfiguration& config);
-	int SetVideoCompositingLayout(const VideoCompositingLayout& sei);
-	int ClearVideoCompositingLayout();
+	struct encoder_packet* packet, bool *receive_packet);
 
 	int AddPublishStreamUrl(const char *url, bool transcodingEnabled);
 	int RemovePublishStreamUrl(const char *url);
@@ -82,26 +78,28 @@ class AgoraRtcEngine
 	int testMicrophone(bool start, int interval);
 	int testSpeaker(bool start);
 
+	void EnableAgoraCaptureMicAudio(bool bCapture);
+
 	obs_service_t* agoraService;
 	bool bInit = false;
 	int setupRemoteVideo(unsigned int uid, void* view);
-    agora::rtc::IRtcEngine* getRtcEngine() {return m_rtcEngine.get();}
+	agora::rtc::IRtcEngine* getRtcEngine() { return m_rtcEngine; }//.get();}
 
 	int agora_fps = 15;
 	int agora_out_cx = 640;
 	int agora_out_cy = 360;
 	int agora_video_bitrate = 500;
-	
-    void joinedChannelSuccess(const char* channel, unsigned int uid, int elapsed);
-	
+	bool agora_sdk_captrue_mic_audio = false;
+	void joinedChannelSuccess(const char* channel, unsigned int uid, int elapsed);
+
 	int audioChannel = 2;
 	int sampleRate = 44100;
-//public slots:
+	void pushVideoFrame(struct encoder_frame* frame);
 private:
-    friend class AgoraRtcEngineEvent;
+	friend class AgoraRtcEngineEvent;
 private:
-    std::unique_ptr<agora::rtc::IRtcEngine> m_rtcEngine;
-    std::unique_ptr<agora::rtc::IRtcEngineEventHandler> m_eventHandler;
+	agora::rtc::IRtcEngine* m_rtcEngine;
+	std::unique_ptr<agora::rtc::IRtcEngineEventHandler> m_eventHandler;
 	static char* m_appid;
 	static AgoraRtcEngine* m_agoraEngine;
 	
diff --git a/plugins/win-agora/agora-service.cpp b/plugins/win-agora/agora-service.cpp
index 388f26b6..b4208f43 100644
--- a/plugins/win-agora/agora-service.cpp
+++ b/plugins/win-agora/agora-service.cpp
@@ -15,6 +15,7 @@ struct agora_data
 	int audio_channel, sample_rate;
 	agora::rtc::CLIENT_ROLE_TYPE client_role;
 	std::string log_path;
+	bool  agora_sdk_capture_mic_audio;
 };
 
 const char * AgoraService_GetName(void *type_data)
@@ -54,16 +55,24 @@ void AgoraService_Update(void *data, obs_data_t *settings)
 
 	service->sample_rate = obs_data_get_int(settings, "agora_sample_rate");
 	service->audio_channel = obs_data_get_int(settings, "agora_audio_channel");//
-	agora::rtc::CLIENT_ROLE_TYPE role = (agora::rtc::CLIENT_ROLE_TYPE)obs_data_get_int(settings, "agora_client_role");
+
+	
+	bool agora_sdk_capture_mic_audio = obs_data_get_bool(settings, "agora_sdk_capture_mic_audio");
+	AgoraRtcEngine::GetInstance()->agora_sdk_captrue_mic_audio = agora_sdk_capture_mic_audio;
 	
-	//��ɫ
+	if (!AgoraRtcEngine::GetInstance()->bInit && service->agora_sdk_capture_mic_audio != agora_sdk_capture_mic_audio){//�Ѿ���ʼ��
+		AgoraRtcEngine::GetInstance()->EnableAgoraCaptureMicAudio(agora_sdk_capture_mic_audio);
+	}
+
+	agora::rtc::CLIENT_ROLE_TYPE role = (agora::rtc::CLIENT_ROLE_TYPE)obs_data_get_int(settings, "agora_client_role");	
+	//role
 	if (AgoraRtcEngine::GetInstance()->bInit && service->client_role != role){//�Ѿ���ʼ��
 		AgoraRtcEngine::GetInstance()->setClientRole(role);
 	}
 	service->client_role = role;
 
 	std::string path = obs_data_get_string(settings, "agora_log_path");
-	//��־·��
+	//log
 	if (AgoraRtcEngine::GetInstance()->bInit
 		/*&& !service->log_path.empty()*/
 		&& service->log_path != path){
diff --git a/plugins/win-agora/agora-yuv-encoder.cpp b/plugins/win-agora/agora-yuv-encoder.cpp
index e0a47601..61f12e5f 100644
--- a/plugins/win-agora/agora-yuv-encoder.cpp
+++ b/plugins/win-agora/agora-yuv-encoder.cpp
@@ -17,71 +17,26 @@ static void AgoraYUV_Destroy(void* data)
 	AgoraRtcEngine::GetInstance()->AgoraVideoObserver_Destroy(data);
 }
 
-static void Cut_I420(uint8_t* Src, int x, int y, int srcWidth, int srcHeight, uint8_t* Dst, int desWidth, int desHeight)//ͼƬ��λ�òü�    
-{
-	//�õ�Bͼ������A������    
-	int nIndex = 0;
-	int BPosX = x;//��    
-	int BPosY = y;//��    
-	for (int i = 0; i < desHeight; i++)//    
-	{
-		memcpy(Dst + desWidth * i, Src + (srcWidth*BPosY) + BPosX + nIndex, desWidth);
-		nIndex += (srcWidth);
-	}
-
-	nIndex = 0;
-	uint8_t *pVSour = Src + srcWidth * srcHeight * 5 / 4;
-	uint8_t *pVDest = Dst + desWidth * desHeight * 5 / 4;
-	for (int i = 0; i < desHeight / 2; i++)//    %
-	{
-		memcpy(pVDest + desWidth / 2 * i, pVSour + (srcWidth / 2 * BPosY / 2) + BPosX / 2 + nIndex, desWidth / 2);
-		nIndex += (srcWidth / 2);
-	}
-
-	nIndex = 0;
-	uint8_t *pUSour = Src + srcWidth * srcHeight;
-	uint8_t *pUDest = Dst + desWidth * desHeight;
-	for (int i = 0; i < desHeight / 2; i++)//    
-	{
-		memcpy(pUDest + desWidth / 2 * i, pUSour + (srcWidth / 2 * BPosY / 2) + BPosX / 2 + nIndex, desWidth / 2);
-		nIndex += (srcWidth / 2);
-	}
-}
-
 static bool AgoraYUV_Encode(void* data, struct encoder_frame* frame,
 struct encoder_packet* packet, bool *receive_packet)
 {
-	CExtendVideoFrameObserver* videoObserver = static_cast<CExtendVideoFrameObserver*>(data);
-	AgoraRtcEngine* agora = AgoraRtcEngine::GetInstance();
+//	CExtendVideoFrameObserver* videoObserver = static_cast<CExtendVideoFrameObserver*>(data);
+//	AgoraRtcEngine* agora = AgoraRtcEngine::GetInstance();
+
+	AgoraRtcEngine::GetInstance()->pushVideoFrame(frame);
+//	if (agora->agora_out_cx && agora->agora_out_cy && agora->agora_out_cx == frame->linesize[0])
+//	{
 
-	if (agora->agora_out_cx && agora->agora_out_cy && agora->agora_out_cx == frame->linesize[0])
-	{
-		memcpy(videoObserver->m_lpImageBuffer, frame->data[0], agora->agora_out_cx *agora->agora_out_cy * 3 / 2);
-	}
+//		//memcpy(videoObserver->m_lpImageBuffer, frame->data[0], agora->agora_out_cx *agora->agora_out_cy * 3 / 2);
+//	}
 	return true;
 }
 
 static void AgoraYUV_GetDefaults(obs_data_t *settings)
 {
-
+	UNREFERENCED_PARAMETER(settings);
 }
 
-
-// static obs_properties_t *AgoraPCM_GetProperties(void *)
-// {
-// // 	obs_properties_t *props = obs_properties_create();
-
-// // 
-
-// // 	obs_properties_add_int(props, "bitrate",
-
-// // 		obs_module_text("Bitrate"), 96, 192, 32);
-
-// 
-// 	return props;
-// }
-
-
 static bool AgoraYUV_GetExtraData(void *data, uint8_t **extra_data, size_t *size)
 {
 	CExtendAudioFrameObserver *enc = static_cast<CExtendAudioFrameObserver *>(data);
@@ -91,7 +46,7 @@ static bool AgoraYUV_GetExtraData(void *data, uint8_t **extra_data, size_t *size
 
 static void AgoraYUV_GetVideoInfo(void *, struct audio_convert_info *info)
 {
-
+	UNREFERENCED_PARAMETER(info);
 }
 
 
diff --git a/readme.zh.md b/readme.zh.md
index c0968fea..b7f6625f 100644
--- a/readme.zh.md
+++ b/readme.zh.md
@@ -2,17 +2,17 @@
 
 *English: [English](README.md)*
 
-* 编译基于win32(x86)
-* agora sdk版本2.2.1
+* 编译基于win32(x86)，也支持x64
+* agora sdk版本2.9.0
 * obs stduio 版本21.1
 
 ## 编译环境
 
 * CMake 2.8.12以上
-* vs2013
-* QT 5.8(可选，如果不需要界面，可以不需要QT。默认是有界面的)
+* vs2015
+* QT 5.9.2(可选，如果不需要界面，可以不需要QT。默认是有界面的。任何适配对应的visual stduio版本的QT)
 
-配好环境，CMake上选择源码路径和生成路径，编译器选择vs2013，编译即可生成vs解决方案。
+配好环境，CMake上选择源码路径和生成路径，编译器选择vs2015，编译即可生成vs解决方案。
 
     
 ## 使用CMake-gui 构建vs项目：
@@ -22,10 +22,10 @@
 * 设置windows环境变量：
     * DepsPath 
 
-          **解压dedependencies2013.zip** 之后的目录下有个win32文件夹，作为路径。(vs2015对应dedependencies2015.zip，vs2017对应dedependencies2017.zip) 
+          **解压dedependencies2015.zip** 之后的目录下有个win32或者win64文件夹，作为路径。(vs2015对应dedependencies2013.zip，vs2017对应dedependencies2017.zip) 。dedependencies2013目前不支持win64。
     * QTDir
 
-           QT 5.8 目录下的msvc2013。其他5.0以上版本的QT也可以，只要支持对应的vs版本即可。比如：QT5.8对应的vs2013的版本应该选择msvc2013。QT 5.9对应的vs2015是msvc_2015。
+           QT 5.8 目录下的msvc2013。其他5.0以上版本的QT也可以，只要支持对应的vs版本即可。比如：QT5.8对应的vs2013的版本应该选择msvc2013。QT 5.9.2对应的vs2015是msvc_2015。
     * 取消 ENABLE\_SCRIPTING
                
            如果不需要使用python或者lua脚本调用obs库接口，可以取消。